From 9e4d8e7dfee11e151144ac47d4bbc9cbdccba6e0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 May 2019 15:00:26 +0200
Subject: [PATCH 0001/3235] document settingDefaults

---
 docs/settings.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/settings.md b/docs/settings.md
index 1ba8981f84..30818625d2 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -51,6 +51,17 @@ Settings are the different options a user may set or experience in the applicati
 }
 ```
 
+Settings that support the config level can be set in the config file under the `settingDefaults` key (note that the "theme" setting is special cased to the `default_theme` in the config file):
+```
+{
+  ...
+  settingDefaults: {
+    settingName: true
+  },
+  ...
+}
+```
+
 ### Getting values for a setting
 
 After importing `SettingsStore`, simply make a call to `SettingsStore.getValue`. The `roomId` parameter should always 

From 702a8ff4a947adba2f859f9e063655d8d3652b44 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 8 Dec 2019 01:01:19 +0000
Subject: [PATCH 0002/3235] Change ref handling in TextualBody to prevent it
 parsing generated nodes Remove unused paths

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                              |  5 ++--
 .../views/context_menus/MessageContextMenu.js |  2 +-
 src/components/views/messages/TextualBody.js  | 29 ++++++++++---------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 2b7384a5aa..9cf3994ff4 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -394,6 +394,7 @@ class TextHighlighter extends BaseHighlighter {
  * opts.stripReplyFallback: optional argument specifying the event is a reply and so fallback needs removing
  * opts.returnString: return an HTML string rather than JSX elements
  * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
+ * opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString)
  */
 export function bodyToHtml(content, highlights, opts={}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
@@ -476,8 +477,8 @@ export function bodyToHtml(content, highlights, opts={}) {
     });
 
     return isDisplayedWithHtml ?
-        <span key="body" className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
-        <span key="body" className={className} dir="auto">{ strippedBody }</span>;
+        <span key="body" ref={opts.ref} className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
+        <span key="body" ref={opts.ref} className={className} dir="auto">{ strippedBody }</span>;
 }
 
 /**
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index efbfc4322f..2084a67cdc 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -422,7 +422,7 @@ module.exports = createReactClass({
             </MenuItem>
         );
 
-        if (this.props.eventTileOps && this.props.eventTileOps.getInnerText) {
+        if (this.props.eventTileOps) { // this event is rendered using TextuaLBody
             quoteButton = (
                 <MenuItem className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
                     { _t('Quote') }
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 2680c13512..fdfa351df3 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
@@ -86,6 +86,10 @@ module.exports = createReactClass({
         return successful;
     },
 
+    componentWillMount: function() {
+        this._content = createRef();
+    },
+
     componentDidMount: function() {
         this._unmounted = false;
         if (!this.props.editState) {
@@ -94,13 +98,13 @@ module.exports = createReactClass({
     },
 
     _applyFormatting() {
-        this.activateSpoilers(this.refs.content.children);
+        this.activateSpoilers([this._content.current]);
 
         // pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
         // are still sent as plaintext URLs. If these are ever pillified in the composer,
         // we should be pillify them here by doing the linkifying BEFORE the pillifying.
-        pillifyLinks(this.refs.content.children, this.props.mxEvent);
-        HtmlUtils.linkifyElement(this.refs.content);
+        pillifyLinks([this._content.current], this.props.mxEvent);
+        HtmlUtils.linkifyElement(this._content.current);
         this.calculateUrlPreview();
 
         if (this.props.mxEvent.getContent().format === "org.matrix.custom.html") {
@@ -163,7 +167,8 @@ module.exports = createReactClass({
         //console.info("calculateUrlPreview: ShowUrlPreview for %s is %s", this.props.mxEvent.getId(), this.props.showUrlPreview);
 
         if (this.props.showUrlPreview) {
-            let links = this.findLinks(this.refs.content.children);
+            // pass only the first child which is the event tile otherwise this recurses on edited events
+            let links = this.findLinks([this._content.current]);
             if (links.length) {
                 // de-dup the links (but preserve ordering)
                 const seen = new Set();
@@ -325,10 +330,6 @@ module.exports = createReactClass({
                     global.localStorage.removeItem("hide_preview_" + this.props.mxEvent.getId());
                 }
             },
-
-            getInnerText: () => {
-                return this.refs.content.innerText;
-            },
         };
     },
 
@@ -424,6 +425,7 @@ module.exports = createReactClass({
             disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'),
             // Part of Replies fallback support
             stripReplyFallback: stripReply,
+            ref: this._content,
         });
         if (this.props.replacingEventId) {
             body = [body, this._renderEditedMarker()];
@@ -450,15 +452,14 @@ module.exports = createReactClass({
 
         switch (content.msgtype) {
             case "m.emote":
-                const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
                 return (
-                    <span ref="content" className="mx_MEmoteBody mx_EventTile_content">
+                    <span className="mx_MEmoteBody mx_EventTile_content">
                         *&nbsp;
                         <span
                             className="mx_MEmoteBody_sender"
                             onClick={this.onEmoteSenderClick}
                         >
-                            { name }
+                            { mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender() }
                         </span>
                         &nbsp;
                         { body }
@@ -467,14 +468,14 @@ module.exports = createReactClass({
                 );
             case "m.notice":
                 return (
-                    <span ref="content" className="mx_MNoticeBody mx_EventTile_content">
+                    <span className="mx_MNoticeBody mx_EventTile_content">
                         { body }
                         { widgets }
                     </span>
                 );
             default: // including "m.text"
                 return (
-                    <span ref="content" className="mx_MTextBody mx_EventTile_content">
+                    <span className="mx_MTextBody mx_EventTile_content">
                         { body }
                         { widgets }
                     </span>

From 0d537ecbb3e9cb59084e468fec0499b8ee6afe7a Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 2 Dec 2019 17:27:12 +0000
Subject: [PATCH 0003/3235] Add bridge info tab

---
 .../settings/tabs/room/BridgeSettingsTab.js   | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 src/components/views/settings/tabs/room/BridgeSettingsTab.js

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
new file mode 100644
index 0000000000..732d7b2947
--- /dev/null
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -0,0 +1,128 @@
+/*
+Copyright 2019 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 {_t} from "../../../../../languageHandler";
+import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import Pill from "../../../elements/Pill";
+import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
+
+const BRIDGE_EVENT_TYPES = [
+    "uk.half-shot.bridge",
+    // m.bridge
+];
+
+export default class BridgeSettingsTab extends React.Component {
+    static propTypes = {
+        roomId: PropTypes.string.isRequired,
+    };
+
+    constructor() {
+        super();
+
+        this.state = {
+        };
+    }
+
+    componentWillMount() {
+
+    }
+
+    _renderBridgeCard(event, room) {
+        const content = event.getContent();
+        if (!content || !content.channel || !content.protocol) {
+            return null;
+        }
+        const protocolName = content.protocol.displayname || content.protocol.id;
+        const channelName = content.channel.displayname || content.channel.id;
+        const networkName = content.network ? " on " + (content.network.displayname || content.network.id) : "";
+        let status = null;
+        if (content.status === "active") {
+            status = (<p> Status: <b>Active</b> </p>);
+        } else if (content.status === "disabled") {
+            status = (<p> Status: <b>Disabled</b> </p>);
+        }
+
+        let creator = null;
+        if (content.creator) {
+            creator = (<p>
+                This bridge was provisioned by <Pill
+                    type={Pill.TYPE_USER_MENTION}
+                    room={room}
+                    url={makeUserPermalink(content.creator)}
+                    shouldShowPillAvatar={true}
+                />
+            </p>);
+        }
+
+        const bot = (<p>
+            The bridge is managed by the <Pill
+            type={Pill.TYPE_USER_MENTION}
+            room={room}
+            url={makeUserPermalink(event.getSender())}
+            shouldShowPillAvatar={true}
+            /> bot user.</p>
+        );
+
+        const chanAndNetworkInfo = (
+            <p> Bridged into {channelName}{networkName}, on {protocolName}</p>
+        );
+
+        return (<li key={event.stateKey}>
+            <div>
+                <h3>{channelName}{networkName} ({protocolName})</h3>
+                <details>
+                    {status}
+                    {creator}
+                    {bot}
+                    {chanAndNetworkInfo}
+                </details>
+            </div>
+        </li>);
+    }
+
+    static getBridgeStateEvents(roomId) {
+        const client = MatrixClientPeg.get();
+        const roomState = (client.getRoom(roomId)).currentState;
+
+        const bridgeEvents = Array.concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
+            Object.values(roomState.events[typeName] || {}),
+        ));
+
+        return bridgeEvents;
+    }
+
+    render() {
+        // This settings tab will only be invoked if the following function returns more
+        // than 0 events, so no validation is needed at this stage.
+        const bridgeEvents = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId);
+        const client = MatrixClientPeg.get();
+        const room = client.getRoom(this.props.roomId);
+
+        return (
+            <div className="mx_SettingsTab">
+                <div className="mx_SettingsTab_heading">{_t("Bridge Info")}</div>
+                <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
+                    <p> Below is a list of bridges connected to this room. </p>
+                    <ul className="mx_RoomSettingsDialog_BridgeList">
+                        { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
+                    </ul>
+                </div>
+            </div>
+        );
+    }
+}

From 7c35b16f4d272b048e23ecd969e0f7aea5e44983 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 2 Dec 2019 17:27:23 +0000
Subject: [PATCH 0004/3235] Add bridge tab button

---
 src/components/views/dialogs/RoomSettingsDialog.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 740dc4d2c2..b262a1f078 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -24,6 +24,7 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
+import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
@@ -52,6 +53,7 @@ export default class RoomSettingsDialog extends React.Component {
 
     _getTabs() {
         const tabs = [];
+        const shouldShowBridgeIcon = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
 
         tabs.push(new Tab(
             _td("General"),
@@ -73,6 +75,15 @@ export default class RoomSettingsDialog extends React.Component {
             "mx_RoomSettingsDialog_rolesIcon",
             <NotificationSettingsTab roomId={this.props.roomId} />,
         ));
+
+        if (shouldShowBridgeIcon) {
+            tabs.push(new Tab(
+                _td("Bridge Info"),
+                "mx_RoomSettingsDialog_bridgesIcon",
+                <BridgeSettingsTab roomId={this.props.roomId} />,
+            ));
+        }
+
         tabs.push(new Tab(
             _td("Advanced"),
             "mx_RoomSettingsDialog_warningIcon",

From 626ab17ed38e9c8c11dd9accb70d38be7439f1ac Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 2 Dec 2019 17:27:31 +0000
Subject: [PATCH 0005/3235] Styling

---
 .../views/dialogs/_RoomSettingsDialog.scss    | 17 +++++++
 res/img/feather-customised/bridge.svg         | 50 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 res/img/feather-customised/bridge.svg

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 723eb237ad..8e648e8881 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -29,6 +29,11 @@ limitations under the License.
     mask-image: url('$(res)/img/feather-customised/users-sm.svg');
 }
 
+.mx_RoomSettingsDialog_bridgesIcon::before {
+    // This icon is pants, please improve :)
+    mask-image: url('$(res)/img/feather-customised/bridge.svg');
+}
+
 .mx_RoomSettingsDialog_warningIcon::before {
     mask-image: url('$(res)/img/feather-customised/warning-triangle.svg');
 }
@@ -42,3 +47,15 @@ limitations under the License.
     padding-left: 40px;
     padding-right: 80px;
 }
+
+
+.mx_RoomSettingsDialog_BridgeList {
+    padding: 0;
+}
+
+.mx_RoomSettingsDialog_BridgeList li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    border-bottom: 1px solid $panel-divider-color;
+}
\ No newline at end of file
diff --git a/res/img/feather-customised/bridge.svg b/res/img/feather-customised/bridge.svg
new file mode 100644
index 0000000000..f8f3468155
--- /dev/null
+++ b/res/img/feather-customised/bridge.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.487504 5.7341776"
+   height="5.7341776mm"
+   width="5.487504mm">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(14.166523,-96.032669)"
+     id="layer1">
+    <rect
+       y="99.461258"
+       x="-10.861272"
+       height="2.0555882"
+       width="1.9322528"
+       id="rect831-6"
+       style="fill:none;stroke:#b8bec9;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    <path
+       id="path883"
+       d="m -11.98427,98.338257 1.122998,1.122998"
+       style="fill:#b8bec9;fill-opacity:1;stroke:#b8bec9;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       y="-98.338257"
+       x="11.98427"
+       height="2.0555882"
+       width="1.9322529"
+       id="rect831-6-7"
+       style="fill:none;stroke:#b8bec9;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+  </g>
+</svg>

From 2bc6e2e3326250fb55ebf3b4662fd42602db1ecf Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 2 Dec 2019 17:27:38 +0000
Subject: [PATCH 0006/3235] Add the one string I bothered to i18n

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 182c761c5f..74ac452bb1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -725,6 +725,7 @@
     "Room version:": "Room version:",
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
+    "Bridge Info": "Bridge Info",
     "Room Addresses": "Room Addresses",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "URL Previews": "URL Previews",

From 9f2ccdf913dce10170a7d2465a2f97ac0936d77e Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Wed, 4 Dec 2019 15:02:36 +0000
Subject: [PATCH 0007/3235] Add support for displaying avatars and links in
 bridge info

---
 .../settings/tabs/room/BridgeSettingsTab.js   | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 732d7b2947..459f11277c 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -20,6 +20,8 @@ import {_t} from "../../../../../languageHandler";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
 import Pill from "../../../elements/Pill";
 import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
+import BaseAvatar from "../../../avatars/BaseAvatar";
+import { ContentRepo } from "matrix-js-sdk";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -47,9 +49,10 @@ export default class BridgeSettingsTab extends React.Component {
         if (!content || !content.channel || !content.protocol) {
             return null;
         }
+        const { channel, network } = content;
         const protocolName = content.protocol.displayname || content.protocol.id;
-        const channelName = content.channel.displayname || content.channel.id;
-        const networkName = content.network ? " on " + (content.network.displayname || content.network.id) : "";
+        const channelName = channel.displayname || channel.id;
+        const networkName = network ? network.displayname || network.id : "";
         let status = null;
         if (content.status === "active") {
             status = (<p> Status: <b>Active</b> </p>);
@@ -78,13 +81,41 @@ export default class BridgeSettingsTab extends React.Component {
             /> bot user.</p>
         );
 
+        const channelLink = channel.external_url ? (<a target="_blank" href={channel.external_url}>{channelName}</a>) : channelName;
+        const networkLink = network && network.external_url ? (<a target="_blank" href={network.external_url}>{networkName}</a>)
+                            : networkName;
+
         const chanAndNetworkInfo = (
-            <p> Bridged into {channelName}{networkName}, on {protocolName}</p>
+            <p> Bridged into {channelLink} {networkLink}, on {protocolName}</p>
         );
 
+        let networkIcon = null;
+        if (networkName && network.avatar) {
+            const avatarUrl = ContentRepo.getHttpUriForMxc(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                network.avatar, 32, 32, "crop",
+            );
+            networkIcon = <BaseAvatar width={32} height={32} resizeMethod='crop'
+                            name={ networkName } idName={ networkName }
+                            url={ avatarUrl } />;
+        }
+
+        let channelIcon = null;
+        if (channel.avatar) {
+            const avatarUrl = ContentRepo.getHttpUriForMxc(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                channel.avatar, 32, 32, "crop",
+            );
+            console.log(channel.avatar);
+            channelIcon = <BaseAvatar width={32} height={32} resizeMethod='crop'
+                            name={ networkName } idName={ networkName }
+                            url={ avatarUrl } />;
+        }
+
         return (<li key={event.stateKey}>
             <div>
-                <h3>{channelName}{networkName} ({protocolName})</h3>
+                <h3>{channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}</h3>
+                <p> Connected via {protocolName} </p>
                 <details>
                     {status}
                     {creator}

From ce21ce8bbea93c9a2b48b0c0c6f341f4360d375b Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 5 Dec 2019 00:28:29 +0000
Subject: [PATCH 0008/3235] Lint

---
 .../views/settings/tabs/room/BridgeSettingsTab.js     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 459f11277c..031e2651c3 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -80,10 +80,15 @@ export default class BridgeSettingsTab extends React.Component {
             shouldShowPillAvatar={true}
             /> bot user.</p>
         );
+        let channelLink = channelName;
+        if (channel.external_url) {
+            channelLink = <a target="_blank" href={channel.external_url}>{channelName}</a>;
+        }
 
-        const channelLink = channel.external_url ? (<a target="_blank" href={channel.external_url}>{channelName}</a>) : channelName;
-        const networkLink = network && network.external_url ? (<a target="_blank" href={network.external_url}>{networkName}</a>)
-                            : networkName;
+        let networkLink = networkName;
+        if (network && network.external_url) {
+            networkLink = <a target="_blank" href={network.external_url}>{networkName}</a>;
+        }
 
         const chanAndNetworkInfo = (
             <p> Bridged into {channelLink} {networkLink}, on {protocolName}</p>

From d9943754f7c936fae5643ae6c16205d99467d9f9 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 9 Dec 2019 13:28:16 +0000
Subject: [PATCH 0009/3235] Remove `status` as it's no longer part of the MSC

---
 .../views/settings/tabs/room/BridgeSettingsTab.js          | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 031e2651c3..a165a1db44 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -53,12 +53,6 @@ export default class BridgeSettingsTab extends React.Component {
         const protocolName = content.protocol.displayname || content.protocol.id;
         const channelName = channel.displayname || channel.id;
         const networkName = network ? network.displayname || network.id : "";
-        let status = null;
-        if (content.status === "active") {
-            status = (<p> Status: <b>Active</b> </p>);
-        } else if (content.status === "disabled") {
-            status = (<p> Status: <b>Disabled</b> </p>);
-        }
 
         let creator = null;
         if (content.creator) {
@@ -122,7 +116,6 @@ export default class BridgeSettingsTab extends React.Component {
                 <h3>{channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}</h3>
                 <p> Connected via {protocolName} </p>
                 <details>
-                    {status}
                     {creator}
                     {bot}
                     {chanAndNetworkInfo}

From 7ee5f7ba38e25cf5774e03008ba375c7d5e3f791 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 9 Dec 2019 13:28:43 +0000
Subject: [PATCH 0010/3235] Add feature flag

---
 src/components/views/dialogs/RoomSettingsDialog.js | 4 +++-
 src/i18n/strings/en_EN.json                        | 3 ++-
 src/settings/Settings.js                           | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index b262a1f078..2952439076 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -28,6 +28,7 @@ import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
+import SettingsStore from "../settings/SettingsStore";
 
 export default class RoomSettingsDialog extends React.Component {
     static propTypes = {
@@ -53,7 +54,8 @@ export default class RoomSettingsDialog extends React.Component {
 
     _getTabs() {
         const tabs = [];
-        const shouldShowBridgeIcon = BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
+        const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state");
+        const shouldShowBridgeIcon = featureFlag && BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
 
         tabs.push(new Tab(
             _td("General"),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 74ac452bb1..14ba96fa4a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1932,5 +1932,6 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "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",
+    "Show info about bridges in room settings": "Show info about bridges in room settings"
 }
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b02ab82400..94cc5b587d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -154,6 +154,12 @@ export const SETTINGS = {
         displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
         default: false,
     },
+    "feature_bridge_state": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Show info about bridges in room settings"),
+        default: false,
+    },
     "useCiderComposer": {
         displayName: _td("Use the new, faster, composer for writing messages"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,

From 6225e402ccdf7781cc6062c339265d63da455fc9 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 9 Dec 2019 13:54:21 +0000
Subject: [PATCH 0011/3235] i18n'ed all over the plaace

---
 .../views/dialogs/RoomSettingsDialog.js       |  2 +-
 .../settings/tabs/room/BridgeSettingsTab.js   | 58 ++++++++++++-------
 src/i18n/strings/en_EN.json                   | 10 +++-
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 2952439076..9ac2b17f23 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -28,7 +28,7 @@ import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
-import SettingsStore from "../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 
 export default class RoomSettingsDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index a165a1db44..82382e7828 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -52,28 +52,31 @@ export default class BridgeSettingsTab extends React.Component {
         const { channel, network } = content;
         const protocolName = content.protocol.displayname || content.protocol.id;
         const channelName = channel.displayname || channel.id;
-        const networkName = network ? network.displayname || network.id : "";
+        const networkName = network ? network.displayname || network.id : protocolName;
 
         let creator = null;
         if (content.creator) {
-            creator = (<p>
-                This bridge was provisioned by <Pill
-                    type={Pill.TYPE_USER_MENTION}
-                    room={room}
-                    url={makeUserPermalink(content.creator)}
-                    shouldShowPillAvatar={true}
-                />
-            </p>);
+            const pill = <Pill
+                type={Pill.TYPE_USER_MENTION}
+                room={room}
+                url={makeUserPermalink(content.creator)}
+                shouldShowPillAvatar={true}
+            />;
+            creator = (<p>{
+                _t("This bridge was provisioned by %(pill)s", {
+                    pill,
+                })
+            } </p>);
         }
 
-        const bot = (<p>
-            The bridge is managed by the <Pill
-            type={Pill.TYPE_USER_MENTION}
-            room={room}
-            url={makeUserPermalink(event.getSender())}
-            shouldShowPillAvatar={true}
-            /> bot user.</p>
-        );
+        const bot = (<p> {_t("This bridge is managed by the %(pill)s bot user.", {
+            pill: <Pill
+                type={Pill.TYPE_USER_MENTION}
+                room={room}
+                url={makeUserPermalink(event.getSender())}
+                shouldShowPillAvatar={true}
+                />,
+        })} </p>);
         let channelLink = channelName;
         if (channel.external_url) {
             channelLink = <a target="_blank" href={channel.external_url}>{channelName}</a>;
@@ -85,7 +88,11 @@ export default class BridgeSettingsTab extends React.Component {
         }
 
         const chanAndNetworkInfo = (
-            <p> Bridged into {channelLink} {networkLink}, on {protocolName}</p>
+            (_t("Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s", {
+                channelLink,
+                networkLink,
+                protocolName,
+            }))
         );
 
         let networkIcon = null;
@@ -111,14 +118,21 @@ export default class BridgeSettingsTab extends React.Component {
                             url={ avatarUrl } />;
         }
 
+        const heading = _t("Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s", {
+            channelIcon,
+            channelName,
+            networkName,
+            networkIcon,
+        });
+
         return (<li key={event.stateKey}>
             <div>
-                <h3>{channelIcon} {channelName} {networkName ? ` on ${networkName}` : ""} {networkIcon}</h3>
-                <p> Connected via {protocolName} </p>
+                <h3> {heading} </h3>
+                <p>{_t("Connected via %(protocolName)s", { protocolName })}</p>
                 <details>
                     {creator}
                     {bot}
-                    {chanAndNetworkInfo}
+                    <p>{chanAndNetworkInfo}</p>
                 </details>
             </div>
         </li>);
@@ -146,7 +160,7 @@ export default class BridgeSettingsTab extends React.Component {
             <div className="mx_SettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Bridge Info")}</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <p> Below is a list of bridges connected to this room. </p>
+                    <p>{ _t("Below is a list of bridges connected to this room.") }</p>
                     <ul className="mx_RoomSettingsDialog_BridgeList">
                         { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
                     </ul>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 14ba96fa4a..b76310ec27 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -342,6 +342,7 @@
     "Send verification requests in direct message, including a new verification UX in the member panel.": "Send verification requests in direct message, including a new verification UX in the member panel.",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
+    "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
@@ -725,7 +726,13 @@
     "Room version:": "Room version:",
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
+    "This bridge was provisioned by %(pill)s": "This bridge was provisioned by %(pill)s",
+    "This bridge is managed by the %(pill)s bot user.": "This bridge is managed by the %(pill)s bot user.",
+    "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s": "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s",
+    "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s": "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s",
+    "Connected via %(protocolName)s": "Connected via %(protocolName)s",
     "Bridge Info": "Bridge Info",
+    "Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",
     "Room Addresses": "Room Addresses",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "URL Previews": "URL Previews",
@@ -1932,6 +1939,5 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "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",
-    "Show info about bridges in room settings": "Show info about bridges in room settings"
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From 25f5cca8a9708721fedb0974624b36ea239323fd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:35:15 -0700
Subject: [PATCH 0012/3235] Remove unused jenkins.sh

---
 jenkins.sh | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100755 jenkins.sh

diff --git a/jenkins.sh b/jenkins.sh
deleted file mode 100755
index 70bc12e42d..0000000000
--- a/jenkins.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 10
-
-set -x
-
-scripts/fetchdep.sh matrix-org matrix-js-sdk
-
-pushd matrix-js-sdk
-yarn link
-yarn install
-popd
-
-yarn link matrix-js-sdk
-
-# install the other dependencies
-yarn install
-
-# run the mocha tests
-yarn test --no-colors
-
-# run eslint
-yarn lintall -f checkstyle -o eslint.xml || true
-
-# re-run the linter, excluding any files known to have errors or warnings.
-yarn lintwithexclusions
-
-# lint styles
-yarn stylelint
-
-# delete the old tarball, if it exists
-rm -f matrix-react-sdk-*.tgz
-
-# build our tarball
-yarn pack

From c02beb9ba30aebb81c294783197b06e9bb651708 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:35:28 -0700
Subject: [PATCH 0013/3235] Copy typescript configs from js-sdk

---
 tsconfig.json | 19 ++++++++++++++
 tslint.json   | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 tsconfig.json
 create mode 100644 tslint.json

diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..ec1531e429
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "target": "es2016",
+    "noImplicitAny": false,
+    "sourceMap": false,
+    "outDir": "./lib",
+    "declaration": true,
+    "types": [
+      "node"
+    ]
+  },
+  "include": [
+    "./src/**/*.ts"
+  ]
+}
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 0000000000..fc234117fc
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,72 @@
+{
+  "rules": {
+    "class-name": false,
+    "comment-format": [
+      true
+    ],
+    "curly": false,
+    "eofline": false,
+    "forin": false,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "label-position": true,
+    "max-line-length": false,
+    "member-access": false,
+    "member-ordering": [
+      true,
+      "static-after-instance",
+      "variables-before-functions"
+    ],
+    "no-arg": true,
+    "no-bitwise": false,
+    "no-console": false,
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-variable": true,
+    "no-empty": false,
+    "no-eval": true,
+    "no-inferrable-types": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": false,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "quotemark": false,
+    "radix": true,
+    "semicolon": [
+      "always"
+    ],
+    "triple-equals": [],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ]
+  }
+}

From 97af0403e5e0133ba4838c0190395bc4e27ccd31 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:37:14 -0700
Subject: [PATCH 0014/3235] Upgrade to babel@7 and support typescript

This breaks the tests
---
 .babelrc                 | 33 ++++++++++--------
 .buildkite/pipeline.yaml | 34 ++++++++++++++++---
 karma.conf.js            |  2 +-
 package.json             | 73 +++++++++++++++++++---------------------
 4 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/.babelrc b/.babelrc
index abe7e1ef3f..3710e20a37 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,20 +1,25 @@
 {
+    "sourceMaps": "inline",
     "presets": [
-        "react",
-        "es2015",
-        "es2016"
+        ["@babel/preset-env", {
+            "targets": {
+                "browsers": [
+                    "last 2 versions"
+                ],
+                "node": 12
+            },
+            "modules": "commonjs"
+        }],
+        "@babel/preset-typescript",
+        "@babel/preset-flow",
+        "@babel/preset-react"
     ],
     "plugins": [
-        [
-            "transform-builtin-extend",
-            {
-                "globals": ["Error"]
-            }
-        ],
-        "transform-class-properties",
-        "transform-object-rest-spread",
-        "transform-runtime",
-        "add-module-exports",
-        "syntax-dynamic-import"
+        "@babel/plugin-proposal-numeric-separator",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-transform-flow-comments",
+        "@babel/plugin-syntax-dynamic-import",
+        "@babel/plugin-transform-runtime"
     ]
 }
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index be0d5e404c..8bbcdf78a4 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,13 +1,39 @@
 steps:
-  - label: ":eslint: Lint"
+  - label: ":eslint: JS Lint"
     command:
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh"
-      - "yarn lintwithexclusions"
-      - "yarn stylelint"
+      - "yarn lint:js"
     plugins:
       - docker#v3.0.1:
-          image: "node:10"
+          image: "node:12"
+
+  - label: ":eslint: TS Lint"
+    command:
+      - "echo '--- Install js-sdk'"
+      - "./scripts/ci/install-deps.sh"
+      - "yarn lint:ts"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:12"
+
+  - label: ":eslint: Types Lint"
+    command:
+      - "echo '--- Install js-sdk'"
+      - "./scripts/ci/install-deps.sh"
+      - "yarn lint:types"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:12"
+
+  - label: "🛠 Build"
+    command:
+      - "echo '--- Install js-sdk'"
+      - "./scripts/ci/install-deps.sh"
+      - "yarn build"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:12"
 
   - label: ":chains: End-to-End Tests"
     agents:
diff --git a/karma.conf.js b/karma.conf.js
index d55be049bb..92e4e0e886 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -8,7 +8,7 @@ var fs = require('fs');
  * to build everything; however it's the easiest way to load our dependencies
  * from node_modules.
  *
- * If you run karma in multi-run mode (with `yarn test-multi`), it will watch
+ * If you run karma in multi-run mode (with `yarn test:multi`), it will watch
  * the tests for changes, and webpack will rebuild using a cache. This is much quicker
  * than a clean rebuild.
  */
diff --git a/package.json b/package.json
index 2f35ab7750..3b6e571d0c 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,7 @@
     "url": "https://github.com/matrix-org/matrix-react-sdk"
   },
   "license": "Apache-2.0",
-  "main": "lib/index.js",
   "files": [
-    ".babelrc",
-    ".eslintrc.js",
     "CHANGELOG.md",
     "CONTRIBUTING.rst",
     "LICENSE",
@@ -19,14 +16,11 @@
     "code_style.md",
     "git-revision.txt",
     "header",
-    "jenkins.sh",
-    "karma.conf.js",
     "lib",
     "package.json",
-    "release.sh",
     "scripts",
+    "docs",
     "src",
-    "test",
     "res"
   ],
   "bin": {
@@ -34,32 +28,33 @@
     "matrix-gen-i18n": "scripts/gen-i18n.js",
     "matrix-prune-i18n": "scripts/prune-i18n.js"
   },
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
   "scripts": {
-    "reskindex": "node scripts/reskindex.js -h header",
-    "reskindex:watch": "node scripts/reskindex.js -h header -w",
-    "rethemendex": "res/css/rethemendex.sh",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-    "build": "yarn reskindex && yarn start:init",
-    "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
     "emoji-data-strip": "node scripts/emoji-data-strip.js",
-    "start": "yarn start:init && yarn start:all",
-    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn build:watch\" \"yarn reskindex:watch\"",
-    "start:init": "babel src -d lib --source-maps --copy-files",
-    "lint": "eslint src/",
-    "lintall": "eslint src/ test/",
-    "lintwithexclusions": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
-    "stylelint": "stylelint 'res/css/**/*.scss'",
+    "reskindex": "node scripts/reskindex.js -h header",
+    "reskindex:watch": "node scripts/reskindex.js -h header -w",
+    "rethemendex": "res/css/rethemendex.sh",
     "clean": "rimraf lib",
-    "prepare": "yarn clean && yarn build && git rev-parse HEAD > git-revision.txt",
+    "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
+    "build:compile": "yarn reskindex && babel src -s -d lib --verbose --extensions \".ts,.js\"",
+    "build:types": "tsc --emitDeclarationOnly",
+    "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
+    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
+    "start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
+    "lint": "yarn lint:types && yarn lint:ts && yarn lint:js && yarn lint:style",
+    "lint:js": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
+    "lint:ts": "tslint --project ./tsconfig.json -t stylish",
+    "lint:types": "tsc --noEmit",
+    "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "karma start --single-run=true --browsers VectorChromeHeadless",
-    "test-multi": "karma start",
-    "e2etests": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:multi": "karma start",
+    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-runtime": "^6.26.0",
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
@@ -115,20 +110,20 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^10.0.1",
-    "babel-loader": "^7.1.5",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-builtin-extend": "^1.1.2",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-es2016": "^6.24.1",
-    "babel-preset-es2017": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
+    "@babel/cli": "^7.7.5",
+    "@babel/core": "^7.7.5",
+    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-numeric-separator": "^7.7.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-transform-flow-comments": "^7.7.4",
+    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/preset-env": "^7.7.6",
+    "@babel/preset-flow": "^7.7.4",
+    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-typescript": "^7.7.4",
+    "@babel/register": "^7.7.4",
+    "@babel/runtime": "^7.7.6",
+    "babel-eslint": "^10.0.3",
     "chokidar": "^2.1.2",
     "concurrently": "^4.0.1",
     "eslint": "^5.12.0",
@@ -163,6 +158,8 @@
     "stylelint": "^9.10.1",
     "stylelint-config-standard": "^18.2.0",
     "stylelint-scss": "^3.9.0",
+    "tslint": "^5.20.1",
+    "typescript": "^3.7.3",
     "walk": "^2.3.9",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1"

From a5dadda63b30f30e74faf841de1b9bbb961fff33 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:37:32 -0700
Subject: [PATCH 0015/3235] Convert SdkConfig to TypeScript as a proof of
 concept

---
 src/ScalarAuthClient.js            |  2 +-
 src/{SdkConfig.js => SdkConfig.ts} | 32 ++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)
 rename src/{SdkConfig.js => SdkConfig.ts} (70%)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 92f0ff6340..c67f49ba26 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -20,10 +20,10 @@ import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 const request = require('browser-request');
 
-const SdkConfig = require('./SdkConfig');
 const MatrixClientPeg = require('./MatrixClientPeg');
 
 import * as Matrix from 'matrix-js-sdk';
+import SdkConfig from "./SdkConfig";
 
 // The version of the integration manager API we're intending to work with
 const imApiVersion = "1.1";
diff --git a/src/SdkConfig.js b/src/SdkConfig.ts
similarity index 70%
rename from src/SdkConfig.js
rename to src/SdkConfig.ts
index eb18dad453..8177a6c5b8 100644
--- a/src/SdkConfig.js
+++ b/src/SdkConfig.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export const DEFAULTS = {
+export interface ConfigOptions {
+    [key: string]: any;
+}
+
+export const DEFAULTS: ConfigOptions = {
     // URL to a page we show in an iframe to configure integrations
     integrations_ui_url: "https://scalar.vector.im/",
     // Base URL to the REST interface of the integrations server
@@ -23,30 +28,37 @@ export const DEFAULTS = {
     bug_report_endpoint_url: null,
 };
 
-class SdkConfig {
-    static get() {
-        return global.mxReactSdkConfig || {};
+export default class SdkConfig {
+    private static instance: ConfigOptions;
+
+    private static setInstance(i: ConfigOptions) {
+        SdkConfig.instance = i;
+
+        // For debugging purposes
+        (<any>window).mxReactSdkConfig = i;
     }
 
-    static put(cfg) {
+    static get() {
+        return SdkConfig.instance || {};
+    }
+
+    static put(cfg: ConfigOptions) {
         const defaultKeys = Object.keys(DEFAULTS);
         for (let i = 0; i < defaultKeys.length; ++i) {
             if (cfg[defaultKeys[i]] === undefined) {
                 cfg[defaultKeys[i]] = DEFAULTS[defaultKeys[i]];
             }
         }
-        global.mxReactSdkConfig = cfg;
+        SdkConfig.setInstance(cfg);
     }
 
     static unset() {
-        global.mxReactSdkConfig = undefined;
+        SdkConfig.setInstance({});
     }
 
-    static add(cfg) {
+    static add(cfg: ConfigOptions) {
         const liveConfig = SdkConfig.get();
         const newConfig = Object.assign({}, liveConfig, cfg);
         SdkConfig.put(newConfig);
     }
 }
-
-module.exports = SdkConfig;

From ff584d1644f4bb4e17149c0d05f9b2e1e32fd5ca Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:38:12 -0700
Subject: [PATCH 0016/3235] yarn.lock changes for upgrade

---
 yarn.lock | 2014 ++++++++++++++++++++++++-----------------------------
 1 file changed, 919 insertions(+), 1095 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 85deedbfec..6c05ab5933 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,22 @@
 # yarn lockfile v1
 
 
+"@babel/cli@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.5.tgz#25702cc65418efc06989af3727897b9f4c8690b6"
+  integrity sha512-y2YrMGXM3NUyu1Myg0pxg+Lx6g8XhEyvLHYNRwTBV6fDek3H7Io6b7N/LXscLs4HWn4HxMdy7f2rM1rTMp2mFg==
+  dependencies:
+    commander "^4.0.1"
+    convert-source-map "^1.1.0"
+    fs-readdir-recursive "^1.1.0"
+    glob "^7.0.0"
+    lodash "^4.17.13"
+    make-dir "^2.1.0"
+    slash "^2.0.0"
+    source-map "^0.5.0"
+  optionalDependencies:
+    chokidar "^2.1.8"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -29,6 +45,26 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
+  integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
@@ -39,6 +75,75 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/helper-annotate-as-pure@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
+  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
+  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-builder-react-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66"
+  integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==
+  dependencies:
+    "@babel/types" "^7.7.4"
+    esutils "^2.0.0"
+
+"@babel/helper-call-delegate@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
+  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-create-class-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d"
+  integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+
+"@babel/helper-create-regexp-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
+  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
+  dependencies:
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.6.0"
+
+"@babel/helper-define-map@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
+  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    lodash "^4.17.13"
+
+"@babel/helper-explode-assignable-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
+  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
+  dependencies:
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-function-name@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
@@ -55,6 +160,87 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-hoist-variables@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
+  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-member-expression-to-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
+  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-module-imports@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
+  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
+  integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
+  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-plugin-utils@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
+
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
+  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
+  dependencies:
+    lodash "^4.17.13"
+
+"@babel/helper-remap-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
+  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-wrap-function" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-replace-supers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
+  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-simple-access@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
+  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
+  dependencies:
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-split-export-declaration@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
@@ -62,6 +248,16 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-wrap-function@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
+  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helpers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
@@ -85,6 +281,553 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
   integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
 
+"@babel/parser@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
+  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
+
+"@babel/plugin-proposal-async-generator-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
+  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+
+"@babel/plugin-proposal-class-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
+  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-proposal-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
+  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+
+"@babel/plugin-proposal-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
+  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+
+"@babel/plugin-proposal-numeric-separator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.7.4.tgz#7819a17445f4197bb9575e5750ed349776da858a"
+  integrity sha512-CG605v7lLpVgVldSY6kxsN9ui1DxFOyepBfuX2AzU2TNriMAYApoU55mrGw9Jr4TlrTzPCG10CL8YXyi+E/iPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.7.4"
+
+"@babel/plugin-proposal-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
+  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
+  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
+  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-async-generators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
+  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
+  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-flow@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b"
+  integrity sha512-2AMAWl5PsmM5KPkB22cvOkUyWk6MjUaqhHNU5nSPUl/ns3j5qLfw2SuYP5RbVZ0tfLvePr4zUScbICtDP2CUNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
+  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec"
+  integrity sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.7.4.tgz#39818f8042a09d4c6248d85d82555369da4da5c4"
+  integrity sha512-vmlUUBlLuFnbpaR+1kKIdo62xQEN+THWbtAHSEilo+0rHl2dKKCn6GLUVKpI848wL/T0ZPQgAy8asRJ9yYEjog==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
+  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
+  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-top-level-await@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
+  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-typescript@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b"
+  integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-arrow-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
+  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
+  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+
+"@babel/plugin-transform-block-scoped-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
+  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-block-scoping@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
+  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.13"
+
+"@babel/plugin-transform-classes@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
+  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-define-map" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
+  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-destructuring@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
+  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-dotall-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
+  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-duplicate-keys@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
+  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-exponentiation-operator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
+  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-flow-comments@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.7.4.tgz#663be88fc101b982975bdac4eefc15ba475b3368"
+  integrity sha512-e3nHGPo/wQcQMmNAHyqaM3Cl8dNKLognPi1RPmObnuVwyI6gHAQJtW6sg5HiNP4LBGRlPW8Npihm0/EzS/1Pzw==
+  dependencies:
+    "@babel/generator" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.7.4"
+
+"@babel/plugin-transform-flow-strip-types@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.7.4.tgz#cc73f85944782df1d77d80977bc097920a8bf31a"
+  integrity sha512-w9dRNlHY5ElNimyMYy0oQowvQpwt/PRHI0QS98ZJCTZU2bvSnKXo5zEiD5u76FBPigTm8TkqzmnUTg16T7qbkA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.7.4"
+
+"@babel/plugin-transform-for-of@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
+  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
+  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
+  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-member-expression-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
+  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-modules-amd@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c"
+  integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-commonjs@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345"
+  integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.7.4"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-systemjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
+  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
+"@babel/plugin-transform-modules-umd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
+  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
+  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+
+"@babel/plugin-transform-new-target@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
+  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-object-super@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
+  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+
+"@babel/plugin-transform-parameters@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
+  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
+  dependencies:
+    "@babel/helper-call-delegate" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-property-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
+  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-display-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz#9f2b80b14ebc97eef4a9b29b612c58ed9c0d10dd"
+  integrity sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-jsx-self@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz#81b8fbfd14b2215e8f1c2c3adfba266127b0231c"
+  integrity sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
+
+"@babel/plugin-transform-react-jsx-source@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz#8994b1bf6014b133f5a46d3b7d1ee5f5e3e72c10"
+  integrity sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
+
+"@babel/plugin-transform-react-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.4.tgz#d91205717fae4e2f84d020cd3057ec02a10f11da"
+  integrity sha512-LixU4BS95ZTEAZdPaIuyg/k8FiiqN9laQ0dMHB4MlpydHY53uQdWCUrwjLr5o6ilS6fAgZey4Q14XBjl5tL6xw==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
+
+"@babel/plugin-transform-regenerator@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9"
+  integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==
+  dependencies:
+    regenerator-transform "^0.14.0"
+
+"@babel/plugin-transform-reserved-words@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
+  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-runtime@^7.7.6":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61"
+  integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    resolve "^1.8.1"
+    semver "^5.5.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
+  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
+  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-sticky-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
+  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+
+"@babel/plugin-transform-template-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
+  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-typeof-symbol@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
+  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-typescript@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636"
+  integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.7.4"
+
+"@babel/plugin-transform-unicode-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
+  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/preset-env@^7.7.6":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
+  integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
+    "@babel/plugin-proposal-json-strings" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-syntax-top-level-await" "^7.7.4"
+    "@babel/plugin-transform-arrow-functions" "^7.7.4"
+    "@babel/plugin-transform-async-to-generator" "^7.7.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
+    "@babel/plugin-transform-block-scoping" "^7.7.4"
+    "@babel/plugin-transform-classes" "^7.7.4"
+    "@babel/plugin-transform-computed-properties" "^7.7.4"
+    "@babel/plugin-transform-destructuring" "^7.7.4"
+    "@babel/plugin-transform-dotall-regex" "^7.7.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
+    "@babel/plugin-transform-for-of" "^7.7.4"
+    "@babel/plugin-transform-function-name" "^7.7.4"
+    "@babel/plugin-transform-literals" "^7.7.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
+    "@babel/plugin-transform-modules-amd" "^7.7.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
+    "@babel/plugin-transform-modules-umd" "^7.7.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
+    "@babel/plugin-transform-new-target" "^7.7.4"
+    "@babel/plugin-transform-object-super" "^7.7.4"
+    "@babel/plugin-transform-parameters" "^7.7.4"
+    "@babel/plugin-transform-property-literals" "^7.7.4"
+    "@babel/plugin-transform-regenerator" "^7.7.5"
+    "@babel/plugin-transform-reserved-words" "^7.7.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
+    "@babel/plugin-transform-spread" "^7.7.4"
+    "@babel/plugin-transform-sticky-regex" "^7.7.4"
+    "@babel/plugin-transform-template-literals" "^7.7.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
+    "@babel/plugin-transform-unicode-regex" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    browserslist "^4.6.0"
+    core-js-compat "^3.4.7"
+    invariant "^2.2.2"
+    js-levenshtein "^1.1.3"
+    semver "^5.5.0"
+
+"@babel/preset-flow@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.7.4.tgz#99c1349b6fd7132783196de181e6b32d0949427e"
+  integrity sha512-6LbUqcHD8BcRtXMOp5bc5nJeU8RlKh6q5U8TgZeCrf9ebBdW8Wyy5ujAUnbJfmzQ56Kkq5XtwErC/5+5RHyFYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.7.4"
+
+"@babel/preset-react@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
+  integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.7.4"
+    "@babel/plugin-transform-react-jsx" "^7.7.4"
+    "@babel/plugin-transform-react-jsx-self" "^7.7.4"
+    "@babel/plugin-transform-react-jsx-source" "^7.7.4"
+
+"@babel/preset-typescript@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a"
+  integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.7.4"
+
+"@babel/register@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128"
+  integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA==
+  dependencies:
+    find-cache-dir "^2.0.0"
+    lodash "^4.17.13"
+    make-dir "^2.1.0"
+    pirates "^4.0.0"
+    source-map-support "^0.5.16"
+
 "@babel/runtime@^7.1.2":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b"
@@ -92,6 +835,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.7.6":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
+  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -574,11 +1324,6 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -586,14 +1331,6 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -630,19 +1367,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -682,11 +1412,6 @@ array-uniq@^1.0.1, array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -746,7 +1471,7 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-each@^1.0.0, async-each@^1.0.1:
+async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
@@ -796,63 +1521,7 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
   integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
 
-babel-cli@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
-  integrity sha1-UCq1SHTX24itALiHoGODzgPQAvE=
-  dependencies:
-    babel-core "^6.26.0"
-    babel-polyfill "^6.26.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    commander "^2.11.0"
-    convert-source-map "^1.5.0"
-    fs-readdir-recursive "^1.0.0"
-    glob "^7.1.2"
-    lodash "^4.17.4"
-    output-file-sync "^1.1.2"
-    path-is-absolute "^1.0.1"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-    v8flags "^2.1.1"
-  optionalDependencies:
-    chokidar "^1.6.1"
-
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.26.0, babel-core@^6.26.3:
-  version "6.26.3"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.1"
-    debug "^2.6.9"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.8"
-    slash "^1.0.0"
-    source-map "^0.5.7"
-
-babel-eslint@^10.0.1:
+babel-eslint@^10.0.3:
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
   integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
@@ -864,593 +1533,14 @@ babel-eslint@^10.0.1:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
+  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
   dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
+    object.assign "^4.1.0"
 
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-builder-react-jsx@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
-  integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    esutils "^2.0.2"
-
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-define-map@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
-  dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-regex@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
-  dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-loader@^7.1.5:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68"
-  integrity sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==
-  dependencies:
-    find-cache-dir "^1.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-add-module-exports@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25"
-  integrity sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=
-
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
-
-babel-plugin-syntax-class-properties@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
-  integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
-
-babel-plugin-syntax-dynamic-import@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
-
-babel-plugin-syntax-flow@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-  integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=
-
-babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
-
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
-
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
-
-babel-plugin-transform-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-builtin-extend@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-builtin-extend/-/babel-plugin-transform-builtin-extend-1.1.2.tgz#5e96fecf58b8fa1ed74efcad88475b2af3c9116e"
-  integrity sha1-Xpb+z1i4+h7XTvytiEdbKvPJEW4=
-  dependencies:
-    babel-runtime "^6.2.0"
-    babel-template "^6.3.0"
-
-babel-plugin-transform-class-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
-  integrity sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-plugin-transform-es2015-classes@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-computed-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-destructuring@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-for-of@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
-  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-umd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-object-super@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
-  dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
-  dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-flow-strip-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-  integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=
-  dependencies:
-    babel-plugin-syntax-flow "^6.18.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-object-rest-spread@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
-
-babel-plugin-transform-react-display-name@^6.23.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
-  integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-  integrity sha1-322AqdomEqEh5t3XVYvL7PBuY24=
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-source@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-  integrity sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
-  integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM=
-  dependencies:
-    babel-helper-builder-react-jsx "^6.24.1"
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-regenerator@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
-  dependencies:
-    regenerator-transform "^0.10.0"
-
-babel-plugin-transform-runtime@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
-  integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-polyfill@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
-  dependencies:
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    regenerator-runtime "^0.10.5"
-
-babel-preset-es2015@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
-  integrity sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-    babel-plugin-transform-es2015-classes "^6.24.1"
-    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.24.1"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.24.1"
-    babel-plugin-transform-es2015-parameters "^6.24.1"
-    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-    babel-plugin-transform-regenerator "^6.24.1"
-
-babel-preset-es2016@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz#f900bf93e2ebc0d276df9b8ab59724ebfd959f8b"
-  integrity sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=
-  dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.24.1"
-
-babel-preset-es2017@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz#597beadfb9f7f208bcfd8a12e9b2b29b8b2f14d1"
-  integrity sha1-WXvq37n38gi8/YoS6bKym4svFNE=
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.24.1"
-
-babel-preset-flow@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-  integrity sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=
-  dependencies:
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-
-babel-preset-react@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
-  integrity sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=
-  dependencies:
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.23.0"
-    babel-plugin-transform-react-jsx "^6.24.1"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-preset-flow "^6.23.0"
-
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
-  dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
-
-babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -1458,47 +1548,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.24.1, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -1622,15 +1671,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -1733,6 +1773,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@^4.6.0, browserslist@^4.8.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
+  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
+  dependencies:
+    caniuse-lite "^1.0.30001015"
+    electron-to-chromium "^1.3.322"
+    node-releases "^1.1.42"
+
 browserslist@^4.8.0:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789"
@@ -1786,6 +1835,11 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -1885,7 +1939,7 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001012:
+caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015:
   version "1.0.30001015"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
   integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
@@ -1905,7 +1959,7 @@ chain-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
   integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
 
-chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1914,17 +1968,6 @@ chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, ch
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 character-entities-html4@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
@@ -1950,23 +1993,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chokidar@^2.0.2, chokidar@^2.1.2:
+chokidar@^2.0.2, chokidar@^2.1.2, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2129,11 +2156,16 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.12.1, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+commander@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
+  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2229,7 +2261,7 @@ content-type@^1.0.2, content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2258,12 +2290,20 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+core-js-compat@^3.4.7:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.5.0.tgz#5a11a619a9e9dd2dcf1c742b2060bc4a2143e5b6"
+  integrity sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==
+  dependencies:
+    browserslist "^4.8.2"
+    semver "^6.3.0"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0:
   version "2.6.10"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
   integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
@@ -2411,7 +2451,7 @@ date-names@^0.1.11:
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2524,13 +2564,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
-  dependencies:
-    repeating "^2.0.0"
-
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -2564,6 +2597,11 @@ diff@3.5.0, diff@^3.5.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -2684,7 +2722,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.317:
+electron-to-chromium@^1.3.317, electron-to-chromium@^1.3.322:
   version "1.3.322"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
   integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
@@ -2893,7 +2931,7 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3073,7 +3111,7 @@ estree-walker@^0.6.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
-esutils@^2.0.2:
+esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -3123,13 +3161,6 @@ execall@^1.0.0:
   dependencies:
     clone-regexp "^1.0.0"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -3143,13 +3174,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
@@ -3211,13 +3235,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3337,27 +3354,11 @@ file-saver@^1.3.3:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
 filesize@3.5.6:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
   integrity sha1-X9mPPqyU7JUW747VeC+thKAaCho=
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -3388,16 +3389,7 @@ finalhandler@1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
-find-cache-dir@^2.1.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -3414,7 +3406,7 @@ find-up@4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -3500,18 +3492,11 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.0.0"
 
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
 foreachasync@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
@@ -3569,7 +3554,7 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.6.0"
 
-fs-readdir-recursive@^1.0.0:
+fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
   integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
@@ -3589,7 +3574,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.0.0, fsevents@^1.2.7:
+fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
   integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
@@ -3691,21 +3676,6 @@ gfm.css@^1.1.1:
   resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
   integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3754,7 +3724,7 @@ glob@^5.0.14:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3807,11 +3777,6 @@ globals@^11.1.0, globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-
 globby@^9.0.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -3838,7 +3803,7 @@ gonzales-pe@^4.2.3:
   dependencies:
     minimist "1.1.x"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -3861,13 +3826,6 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -3980,14 +3938,6 @@ hoist-non-react-statics@^3.3.0:
   dependencies:
     react-is "^16.7.0"
 
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -4388,18 +4338,6 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-equal@^1.5.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.1.tgz#74fafde5060fcaf187041c05f11f0b9f020bb9b3"
@@ -4436,23 +4374,11 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -4475,13 +4401,6 @@ is-generator-function@^1.0.7:
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
   integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -4528,13 +4447,6 @@ is-number-object@^1.0.3:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
   integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -4542,11 +4454,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -4569,16 +4476,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -4787,16 +4684,16 @@ jquery@^3.3.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
   integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
+js-levenshtein@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
+  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
 js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -4810,11 +4707,6 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -4850,11 +4742,6 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -5219,14 +5106,7 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -5295,11 +5175,6 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
   integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
 
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
 mathml-tag-names@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
@@ -5417,25 +5292,6 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -5733,6 +5589,11 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -5749,7 +5610,7 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.41:
+node-releases@^1.1.41, node-releases@^1.1.42:
   version "1.1.42"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
   integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==
@@ -5774,7 +5635,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -5912,14 +5773,6 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -5997,7 +5850,7 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -6010,15 +5863,6 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
-  integrity sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=
-  dependencies:
-    graceful-fs "^4.1.4"
-    mkdirp "^0.5.1"
-    object-assign "^4.1.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6124,16 +5968,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6191,7 +6025,7 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
@@ -6261,12 +6095,12 @@ pify@^4.0.0, pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+pirates@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
-    find-up "^2.1.0"
+    node-modules-regexp "^1.0.0"
 
 pkg-dir@^3.0.0:
   version "3.0.0"
@@ -6410,11 +6244,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
 pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
@@ -6425,7 +6254,7 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-private@^0.1.6, private@^0.1.8:
+private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -6600,15 +6429,6 @@ raf@^3.1.0:
   dependencies:
     performance-now "^2.1.0"
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6803,7 +6623,7 @@ readable-stream@^3.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@^2.0.0, readdirp@^2.2.1:
+readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -6842,16 +6662,18 @@ redux@^3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
-regenerate@^1.2.1:
+regenerate-unicode-properties@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
+  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -6862,22 +6684,13 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
   integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
 
-regenerator-transform@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
-  integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
+regenerator-transform@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
+  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
   dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -6891,14 +6704,17 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+regexpu-core@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
   dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.1.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
 registry-auth-token@4.0.0:
   version "4.0.0"
@@ -6908,15 +6724,15 @@ registry-auth-token@4.0.0:
     rc "^1.2.8"
     safe-buffer "^5.0.1"
 
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+regjsgen@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -6980,18 +6796,11 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
 replace-ext@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
@@ -7088,7 +6897,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.8.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -7334,11 +7143,6 @@ sinon@^5.0.7:
     supports-color "^5.4.0"
     type-detect "^4.0.8"
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -7561,14 +7365,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-support@~0.5.12:
+source-map-support@^0.5.16, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -7581,7 +7378,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -7970,11 +7767,6 @@ supports-color@6.1.0, supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -8108,11 +7900,6 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -8173,11 +7960,6 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
-
 trim-trailing-lines@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
@@ -8193,11 +7975,37 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tslint@^5.20.1:
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
+  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^4.0.1"
+    glob "^7.1.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
+tsutils@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
+
 tsutils@^3.17.1:
   version "3.17.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -8252,6 +8060,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
+  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
+
 ua-parser-js@^0.7.18:
   version "0.7.20"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
@@ -8275,6 +8088,29 @@ unhomoglyph@^1.0.2:
   resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.3.tgz#8d3551622b57754e10a831bf81442d7f15d1ddfd"
   integrity sha512-PC/OAHE8aiTK0Gfmy0PxOlePazRn+BeCM1r4kFtkHgEnkJZgJoI7yD2yUEjsfSdLXKU1FSt/EcIZvNoKazYUTw==
 
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
+  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
+  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+
 unified@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
@@ -8427,11 +8263,6 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
-
 useragent@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
@@ -8474,13 +8305,6 @@ v8-compile-cache@2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
   integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
 
-v8flags@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=
-  dependencies:
-    user-home "^1.1.1"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"

From 59ddefdb8fe904d133a7266e01b6c79b5ff86c26 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:39:01 -0700
Subject: [PATCH 0017/3235] Disable tests for new TypeScript build

We're switching to Jest anyways, and getting these things to run is basically impossible at the moment.
---
 .buildkite/pipeline.yaml | 106 +++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 8bbcdf78a4..632ab7adca 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -53,59 +53,59 @@ steps:
           image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
           propagate-environment: true
 
-  - label: ":karma: Tests"
-    agents:
-      # We use a medium sized instance instead of the normal small ones because
-      # webpack loves to gorge itself on resources.
-      queue: "medium"
-    command:
-      # Install chrome
-      - "echo '--- Installing Chrome'"
-      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-      - "apt-get update"
-      - "apt-get install -y google-chrome-stable"
-      # Run tests
-      # TODO: Remove hacky chmod for BuildKite
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
-      - "echo '--- Installing Dependencies'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '+++ Running Tests'"
-      - "./scripts/ci/unit-tests.sh"
-    env:
-      CHROME_BIN: "/usr/bin/google-chrome-stable"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"
-          propagate-environment: true
-
-  - label: "🔧 Riot Tests"
-    agents:
-      # We use a medium sized instance instead of the normal small ones because
-      # webpack loves to gorge itself on resources.
-      queue: "medium"
-    command:
-      # Install chrome
-      - "echo '--- Installing Chrome'"
-      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-      - "apt-get update"
-      - "apt-get install -y google-chrome-stable"
-      # Run tests
-      # TODO: Remove hacky chmod for BuildKite
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
-      - "echo '--- Installing Dependencies'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '+++ Running Tests'"
-      - "./scripts/ci/riot-unit-tests.sh"
-    env:
-      CHROME_BIN: "/usr/bin/google-chrome-stable"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"
-          propagate-environment: true
+#  - label: ":karma: Tests"
+#    agents:
+#      # We use a medium sized instance instead of the normal small ones because
+#      # webpack loves to gorge itself on resources.
+#      queue: "medium"
+#    command:
+#      # Install chrome
+#      - "echo '--- Installing Chrome'"
+#      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
+#      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
+#      - "apt-get update"
+#      - "apt-get install -y google-chrome-stable"
+#      # Run tests
+#      # TODO: Remove hacky chmod for BuildKite
+#      - "chmod +x ./scripts/ci/*.sh"
+#      - "chmod +x ./scripts/*"
+#      - "echo '--- Installing Dependencies'"
+#      - "./scripts/ci/install-deps.sh"
+#      - "echo '+++ Running Tests'"
+#      - "./scripts/ci/unit-tests.sh"
+#    env:
+#      CHROME_BIN: "/usr/bin/google-chrome-stable"
+#    plugins:
+#      - docker#v3.0.1:
+#          image: "node:10"
+#          propagate-environment: true
+#
+#  - label: "🔧 Riot Tests"
+#    agents:
+#      # We use a medium sized instance instead of the normal small ones because
+#      # webpack loves to gorge itself on resources.
+#      queue: "medium"
+#    command:
+#      # Install chrome
+#      - "echo '--- Installing Chrome'"
+#      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
+#      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
+#      - "apt-get update"
+#      - "apt-get install -y google-chrome-stable"
+#      # Run tests
+#      # TODO: Remove hacky chmod for BuildKite
+#      - "chmod +x ./scripts/ci/*.sh"
+#      - "chmod +x ./scripts/*"
+#      - "echo '--- Installing Dependencies'"
+#      - "./scripts/ci/install-deps.sh"
+#      - "echo '+++ Running Tests'"
+#      - "./scripts/ci/riot-unit-tests.sh"
+#    env:
+#      CHROME_BIN: "/usr/bin/google-chrome-stable"
+#    plugins:
+#      - docker#v3.0.1:
+#          image: "node:10"
+#          propagate-environment: true
 
   - label: "🌐 i18n"
     command:

From f5264db0282c40227c66a5a503145d4b4a69e17b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 14:44:46 -0700
Subject: [PATCH 0018/3235] Disable end-to-end tests too

They rely on a working riot-web build, which this is not.
---
 .buildkite/pipeline.yaml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 632ab7adca..e4a0e5dd4a 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -35,24 +35,24 @@ steps:
       - docker#v3.0.1:
           image: "node:12"
 
-  - label: ":chains: End-to-End Tests"
-    agents:
-      # We use a xlarge sized instance instead of the normal small ones because
-      # e2e tests otherwise take +-8min
-      queue: "xlarge"
-    command:
-      # TODO: Remove hacky chmod for BuildKite
-      - "echo '--- Setup'"
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
-      - "./scripts/ci/end-to-end-tests.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
-          propagate-environment: true
-
+#  - label: ":chains: End-to-End Tests"
+#    agents:
+#      # We use a xlarge sized instance instead of the normal small ones because
+#      # e2e tests otherwise take +-8min
+#      queue: "xlarge"
+#    command:
+#      # TODO: Remove hacky chmod for BuildKite
+#      - "echo '--- Setup'"
+#      - "chmod +x ./scripts/ci/*.sh"
+#      - "chmod +x ./scripts/*"
+#      - "echo '--- Install js-sdk'"
+#      - "./scripts/ci/install-deps.sh"
+#      - "./scripts/ci/end-to-end-tests.sh"
+#    plugins:
+#      - docker#v3.0.1:
+#          image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
+#          propagate-environment: true
+#
 #  - label: ":karma: Tests"
 #    agents:
 #      # We use a medium sized instance instead of the normal small ones because

From 225695ab5c8f597252bf4b793ce88e2f22d73766 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 19:33:08 -0700
Subject: [PATCH 0019/3235] Fix exports for rate limited functions and
 MatrixClientPeg

MatrixClientPeg in particular doesn't work very well with this.
---
 src/MatrixClientPeg.js                   | 5 +++--
 src/components/structures/RoomView.js    | 2 +-
 src/components/views/rooms/MemberList.js | 4 ++--
 src/components/views/rooms/RoomList.js   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 51ac7acb37..4d293b7e34 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -48,7 +48,7 @@ interface MatrixClientCreds {
  * This module provides a singleton instance of this class so the 'current'
  * Matrix Client object is available easily.
  */
-class MatrixClientPeg {
+class _MatrixClientPeg {
     constructor() {
         this.matrixClient = null;
         this._justRegisteredUserId = null;
@@ -245,6 +245,7 @@ class MatrixClientPeg {
 }
 
 if (!global.mxMatrixClientPeg) {
-    global.mxMatrixClientPeg = new MatrixClientPeg();
+    global.mxMatrixClientPeg = new _MatrixClientPeg();
 }
 export default global.mxMatrixClientPeg;
+export const MatrixClientPeg = global.mxMatrixClientPeg;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d78c9923c2..2f8d274866 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -887,7 +887,7 @@ module.exports = createReactClass({
 
     // rate limited because a power level change will emit an event for every
     // member in the room.
-    _updateRoomMembers: new rate_limited_func(function(dueToMember) {
+    _updateRoomMembers: rate_limited_func(function(dueToMember) {
         // a member state changed in this room
         // refresh the conf call notification state
         this._updateConfCallNotification();
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 0805c0342c..05464b43c9 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -23,9 +23,9 @@ import SdkConfig from '../../../SdkConfig';
 import dis from '../../../dispatcher';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {isValid3pidInvite} from "../../../RoomInvite";
+import rate_limited_func from "../../../ratelimitedfunc";
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const sdk = require('../../../index');
-const rate_limited_func = require('../../../ratelimitedfunc');
 const CallHandler = require("../../../CallHandler");
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
@@ -187,7 +187,7 @@ module.exports = createReactClass({
         }
     },
 
-    _updateList: new rate_limited_func(function() {
+    _updateList: rate_limited_func(function() {
         this._updateListNow();
     }, 500),
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 80a03e7a73..210c9394dc 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -27,7 +27,7 @@ const MatrixClientPeg = require("../../../MatrixClientPeg");
 const CallHandler = require('../../../CallHandler');
 const dis = require("../../../dispatcher");
 const sdk = require('../../../index');
-const rate_limited_func = require('../../../ratelimitedfunc');
+import rate_limited_func from "../../../ratelimitedfunc";
 import * as Rooms from '../../../Rooms';
 import DMRoomMap from '../../../utils/DMRoomMap';
 const Receipt = require('../../../utils/Receipt');
@@ -384,7 +384,7 @@ module.exports = createReactClass({
         this._delayedRefreshRoomList();
     },
 
-    _delayedRefreshRoomList: new rate_limited_func(function() {
+    _delayedRefreshRoomList: rate_limited_func(function() {
         this.refreshRoomList();
     }, 500),
 

From 20a615396b0a0ad5c0e748c8ee8b935263179a6f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Dec 2019 19:31:52 -0700
Subject: [PATCH 0020/3235] Implementation of new potential skinning mechanism
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With a switch to Only One Webpack™ we need a way to help developers generate the component index without a concurrent watch task. The best way to do this is to have developers import their components, but how do they do that when we support skins? The answer in this commit is to change skinning.

Skinning now expects to receive your list of overrides instead of the react-sdk+branded components. For Riot this means we send over *only* the Vector components and not Vector+react-sdk.

Components can then be annotated with the `replaceComponent` decorator to have them be skinnable. The decorator must take a string with the dot path of the component because we can't reliably calculate it ourselves, sadly.

The decorator does a call to `getComponent` which is where the important part of the branded components not including the react-sdk is important: if the branded app includes the react-sdk then the decorator gets executed before the skin has finished loading, leading to all kinds of fun errors. This is also why the skinner lazily loads the react-sdk components to avoid importing them too early, breaking the app.

The decorator will end up receiving null for a component because of the getComponent loop mentioned: the require() call is still in progress when the decorator is called, therefore we can't error out. All usages of getComponent() within the app are safe to not need such an error (the return won't be null, and developers shouldn't use getComponent() after this commit anyways).

The AuthPage, being a prominent component, has been converted to demonstrate this working. Changes to riot-web are required to have this work.

The reskindex script has also been altered to reflect these skinning changes - it no longer should set the react-sdk as a parent. The eventual end goal is to get rid of `getComponent()` entirely as it'll be easily replaced by imports.
---
 .babelrc                                      |  1 +
 .eslintrc.js                                  |  1 +
 package.json                                  |  1 +
 scripts/reskindex.js                          | 15 +----------
 src/Skinner.js                                | 26 +++++++++++++++----
 .../structures/auth/ForgotPassword.js         |  2 +-
 src/components/structures/auth/Login.js       |  2 +-
 .../structures/auth/PostRegistration.js       |  2 +-
 .../structures/auth/Registration.js           |  2 +-
 src/components/structures/auth/SoftLogout.js  |  2 +-
 src/components/views/auth/AuthPage.js         | 16 ++++++------
 src/components/views/auth/Welcome.js          |  2 +-
 src/utils/replaceComponent.ts                 | 22 ++++++++++++++++
 yarn.lock                                     | 16 ++++++++++++
 14 files changed, 77 insertions(+), 33 deletions(-)
 create mode 100644 src/utils/replaceComponent.ts

diff --git a/.babelrc b/.babelrc
index 3710e20a37..29cd99f8c4 100644
--- a/.babelrc
+++ b/.babelrc
@@ -15,6 +15,7 @@
         "@babel/preset-react"
     ],
     "plugins": [
+        ["@babel/plugin-proposal-decorators", { "legacy": true }],
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
diff --git a/.eslintrc.js b/.eslintrc.js
index 81c3752301..0721c1c8d2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -25,6 +25,7 @@ module.exports = {
     parserOptions: {
         ecmaFeatures: {
             jsx: true,
+            legacyDecorators: true,
         }
     },
     rules: {
diff --git a/package.json b/package.json
index 3b6e571d0c..99e4983d60 100644
--- a/package.json
+++ b/package.json
@@ -113,6 +113,7 @@
     "@babel/cli": "^7.7.5",
     "@babel/core": "^7.7.5",
     "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.7.4",
     "@babel/plugin-proposal-numeric-separator": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
     "@babel/plugin-transform-flow-comments": "^7.7.4",
diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 833151a298..3919295078 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -19,7 +19,6 @@ function reskindex() {
     prevFiles = files;
 
     var header = args.h || args.header;
-    var packageJson = JSON.parse(fs.readFileSync('./package.json'));
 
     var strm = fs.createWriteStream(componentIndexTmp);
 
@@ -34,19 +33,7 @@ function reskindex() {
     strm.write(" * so you'd just be trying to swim upstream like a salmon.\n");
     strm.write(" * You are not a salmon.\n");
     strm.write(" */\n\n");
-
-    if (packageJson['matrix-react-parent']) {
-        const parentIndex = packageJson['matrix-react-parent'] +
-              '/lib/component-index';
-        strm.write(
-`let components = require('${parentIndex}').components;
-if (!components) {
-    throw new Error("'${parentIndex}' didn't export components");
-}
-`);
-    } else {
-        strm.write("let components = {};\n");
-    }
+    strm.write("let components = {};\n");
 
     for (var i = 0; i < files.length; ++i) {
         var file = files[i].replace('.js', '');
diff --git a/src/Skinner.js b/src/Skinner.js
index 1fe12f85ab..7235d55937 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -28,15 +28,31 @@ class Skinner {
                 " b) A component has called getComponent at the root level",
             );
         }
-        let comp = this.components[name];
-        // XXX: Temporarily also try 'views.' as we're currently
-        // leaving the 'views.' off views.
+
+        const doLookup = (components) => {
+            if (!components) return null;
+            let comp = components[name];
+            // XXX: Temporarily also try 'views.' as we're currently
+            // leaving the 'views.' off views.
+            if (!comp) {
+                comp = components['views.' + name];
+            }
+            return comp;
+        };
+
+        // Check the skin first
+        let comp = doLookup(this.components);
+
+        // If that failed, check against our own components
         if (!comp) {
-            comp = this.components['views.'+name];
+            // Lazily load our own components because they might end up calling .getComponent()
+            comp = doLookup(require("./component-index").components);
         }
 
+        // Just return nothing instead of erroring - the consumer should be smart enough to
+        // handle this at this point.
         if (!comp) {
-            throw new Error("No such component: "+name);
+            return null;
         }
 
         // components have to be functions.
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 6f68293caa..ada7d4449b 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -26,6 +26,7 @@ import SdkConfig from "../../../SdkConfig";
 import PasswordReset from "../../../PasswordReset";
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from 'classnames';
+import AuthPage from "../../views/auth/AuthPage";
 
 // Phases
 // Show controls to configure server details
@@ -367,7 +368,6 @@ module.exports = createReactClass({
     },
 
     render: function() {
-        const AuthPage = sdk.getComponent("auth.AuthPage");
         const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
 
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index b2e9d3e7cd..ade417d156 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -26,6 +26,7 @@ import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
+import AuthPage from "../../views/auth/AuthPage";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -608,7 +609,6 @@ module.exports = createReactClass({
 
     render: function() {
         const Loader = sdk.getComponent("elements.Spinner");
-        const AuthPage = sdk.getComponent("auth.AuthPage");
         const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const loader = this.isBusy() ? <div className="mx_Login_loader"><Loader /></div> : null;
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index 760163585d..a77b4d0d56 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -20,6 +20,7 @@ import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
+import AuthPage from "../../views/auth/AuthPage";
 
 module.exports = createReactClass({
     displayName: 'PostRegistration',
@@ -59,7 +60,6 @@ module.exports = createReactClass({
     render: function() {
         const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
         const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
-        const AuthPage = sdk.getComponent('auth.AuthPage');
         const AuthHeader = sdk.getComponent('auth.AuthHeader');
         const AuthBody = sdk.getComponent("auth.AuthBody");
         return (
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 3578d745f5..69f34f764a 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -30,6 +30,7 @@ import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDisc
 import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
 import MatrixClientPeg from "../../../MatrixClientPeg";
+import AuthPage from "../../views/auth/AuthPage";
 
 // Phases
 // Show controls to configure server details
@@ -576,7 +577,6 @@ module.exports = createReactClass({
     render: function() {
         const AuthHeader = sdk.getComponent('auth.AuthHeader');
         const AuthBody = sdk.getComponent("auth.AuthBody");
-        const AuthPage = sdk.getComponent('auth.AuthPage');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let errorText;
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 585b4bfe67..da19a852f6 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -24,6 +24,7 @@ import Modal from '../../../Modal';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import {sendLoginRequest} from "../../../Login";
 import url from 'url';
+import AuthPage from "../../views/auth/AuthPage";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -284,7 +285,6 @@ export default class SoftLogout extends React.Component {
     }
 
     render() {
-        const AuthPage = sdk.getComponent("auth.AuthPage");
         const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.js
index 41098c9d6c..8448df9ac8 100644
--- a/src/components/views/auth/AuthPage.js
+++ b/src/components/views/auth/AuthPage.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,22 +17,21 @@ limitations under the License.
 */
 
 import React from 'react';
-import createReactClass from 'create-react-class';
 import sdk from '../../../index';
+import {replaceComponent} from "../../../utils/replaceComponent";
 
-module.exports = createReactClass({
-    displayName: 'AuthPage',
-
-    render: function() {
+@replaceComponent("views.auth.AuthPage")
+export default class AuthPage extends React.PureComponent {
+    render() {
         const AuthFooter = sdk.getComponent('auth.AuthFooter');
 
         return (
             <div className="mx_AuthPage">
                 <div className="mx_AuthPage_modal">
-                    { this.props.children }
+                    {this.props.children}
                 </div>
                 <AuthFooter />
             </div>
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 9cc398329d..a110631033 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -17,10 +17,10 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
+import AuthPage from "./AuthPage";
 
 export default class Welcome extends React.PureComponent {
     render() {
-        const AuthPage = sdk.getComponent("auth.AuthPage");
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
 
diff --git a/src/utils/replaceComponent.ts b/src/utils/replaceComponent.ts
new file mode 100644
index 0000000000..1775c42294
--- /dev/null
+++ b/src/utils/replaceComponent.ts
@@ -0,0 +1,22 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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';
+
+export function replaceComponent(name: string, origComponent: React.Component) {
+    return () => sdk.getComponent(name) || origComponent;
+}
diff --git a/yarn.lock b/yarn.lock
index 6c05ab5933..4e1be061bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -303,6 +303,15 @@
     "@babel/helper-create-class-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-proposal-decorators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b"
+  integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-decorators" "^7.7.4"
+
 "@babel/plugin-proposal-dynamic-import@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
@@ -358,6 +367,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-decorators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b"
+  integrity sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-dynamic-import@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"

From 18f81d80dbab2ac1b9bac9f8c1e2177e669c19b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Dec 2019 13:43:48 +0000
Subject: [PATCH 0021/3235] Initial jest stuff. Blocked on Babel 7

---
 package.json                                  |    6 +-
 test/components/structures/GroupView-test.js  |    2 -
 .../structures/MessagePanel-test.js           |    1 -
 test/components/structures/auth/Login-test.js |    1 -
 .../structures/auth/Registration-test.js      |    1 -
 .../dialogs/InteractiveAuthDialog-test.js     |    1 -
 .../elements/MemberEventListSummary-test.js   |    1 -
 .../views/groups/GroupMemberList-test.js      |    2 -
 .../components/views/rooms/MemberList-test.js |    1 -
 .../views/rooms/MessageComposerInput-test.js  |    1 -
 test/components/views/rooms/RoomList-test.js  |    1 -
 .../views/rooms/RoomSettings-test.js          |    1 -
 test/i18n-test/languageHandler-test.js        |    1 -
 test/notifications/ContentRules-test.js       |    4 -
 test/stores/RoomViewStore-test.js             |    1 -
 test/test-utils.js                            |   20 -
 test/utils/MegolmExportEncryption-test.js     |    4 -
 test/utils/permalinks/Permalinks-test.js      |    1 -
 yarn.lock                                     | 1171 ++++++++++++++++-
 19 files changed, 1144 insertions(+), 77 deletions(-)

diff --git a/package.json b/package.json
index 2f35ab7750..e3af86b488 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,7 @@
     "stylelint": "stylelint 'res/css/**/*.scss'",
     "clean": "rimraf lib",
     "prepare": "yarn clean && yarn build && git rev-parse HEAD > git-revision.txt",
-    "test": "karma start --single-run=true --browsers VectorChromeHeadless",
-    "test-multi": "karma start",
+    "test": "jest --testMatch **/*-test.js",
     "e2etests": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
@@ -118,6 +117,7 @@
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
     "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-builtin-extend": "^1.1.2",
@@ -142,7 +142,7 @@
     "expect": "^24.1.0",
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
-    "jest-mock": "^23.2.0",
+    "jest": "^23.2.0",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index b0768d3911..1319e312fb 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -61,8 +61,6 @@ describe('GroupView', function() {
     };
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
-
         httpBackend = new MockHttpBackend();
 
         Matrix.request(httpBackend.requestFn);
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 7c52512bc2..cd0a0bfcd7 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -75,7 +75,6 @@ describe('MessagePanel', function() {
     let sandbox = null;
 
     beforeEach(function() {
-        test_utils.beforeEach(this);
         sandbox = test_utils.stubClient();
         client = MatrixClientPeg.get();
         client.credentials = {userId: '@me:here'};
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 6a7982dd47..7a4041f0bc 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -32,7 +32,6 @@ describe('Login', function() {
     let parentDiv;
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
     });
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 9c125adacc..0ed304f2df 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -32,7 +32,6 @@ describe('Registration', function() {
     let parentDiv;
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
     });
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 5f90e0f21c..5ceba1037b 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -36,7 +36,6 @@ describe('InteractiveAuthDialog', function() {
     let sandbox;
 
     beforeEach(function() {
-        test_utils.beforeEach(this);
         sandbox = test_utils.stubClient(sandbox);
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index a31cbdebb5..ab69ae10be 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -88,7 +88,6 @@ describe('MemberEventListSummary', function() {
     };
 
     beforeEach(function(done) {
-        testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 3922610644..6ebdbbd320 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -70,8 +70,6 @@ describe("GroupMemberList", function() {
     };
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
-
         httpBackend = new MockHttpBackend();
 
         Matrix.request(httpBackend.requestFn);
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index 9a1439c2f7..2a275e1895 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -38,7 +38,6 @@ describe('MemberList', () => {
     let defaultUsers = [];
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
         sandbox = TestUtils.stubClient(sandbox);
         client = MatrixClientPeg.get();
         client.hasLazyLoadMembersEnabled = () => false;
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 60380eecd2..687bbac926 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -29,7 +29,6 @@ xdescribe('MessageComposerInput', () => {
         room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
 
     beforeEach(function() {
-        testUtils.beforeEach(this);
         sandbox = testUtils.stubClient(sandbox);
         client = MatrixClientPeg.get();
         client.credentials = {userId: '@me:domain.com'};
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 68168fcf29..cea2105480 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -45,7 +45,6 @@ describe('RoomList', () => {
     let myOtherMember;
 
     beforeEach(function() {
-        TestUtils.beforeEach(this);
         sandbox = TestUtils.stubClient(sandbox);
         client = MatrixClientPeg.get();
         client.credentials = {userId: myUserId};
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 1c0bfd95dc..2608eb488a 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -36,7 +36,6 @@
 //     }
 //
 //     beforeEach(function(done) {
-//         testUtils.beforeEach(this);
 //         sandbox = testUtils.stubClient();
 //         client = MatrixClientPeg.get();
 //         client.credentials = {userId: '@me:domain.com'};
diff --git a/test/i18n-test/languageHandler-test.js b/test/i18n-test/languageHandler-test.js
index 8f21638703..244fe99000 100644
--- a/test/i18n-test/languageHandler-test.js
+++ b/test/i18n-test/languageHandler-test.js
@@ -8,7 +8,6 @@ describe('languageHandler', function() {
     let sandbox;
 
     beforeEach(function(done) {
-        testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
diff --git a/test/notifications/ContentRules-test.js b/test/notifications/ContentRules-test.js
index b58667fee9..3bf0a0426d 100644
--- a/test/notifications/ContentRules-test.js
+++ b/test/notifications/ContentRules-test.js
@@ -58,10 +58,6 @@ var USERNAME_RULE = {
 
 
 describe("ContentRules", function() {
-    beforeEach(function() {
-        test_utils.beforeEach(this);
-    });
-
     describe("parseContentRules", function() {
         it("should handle there being no keyword rules", function() {
             var rules = { 'global': { 'content': [
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 77dfb37b0a..3762125cd9 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -13,7 +13,6 @@ describe('RoomViewStore', function() {
     let sandbox;
 
     beforeEach(function() {
-        testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
         peg.get().credentials = { userId: "@test:example.com" };
 
diff --git a/test/test-utils.js b/test/test-utils.js
index 64704fc610..9e8768ae71 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -11,26 +11,6 @@ import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';
 const MatrixEvent = jssdk.MatrixEvent;
 
-/**
- * Perform common actions before each test case, e.g. printing the test case
- * name to stdout.
- * @param {Mocha.Context} context  The test context
- */
-export function beforeEach(context) {
-    const desc = context.currentTest.fullTitle();
-
-    console.log();
-
-    // this puts a mark in the chrome devtools timeline, which can help
-    // figure out what's been going on.
-    if (console.timeStamp) {
-        console.timeStamp(desc);
-    }
-
-    console.log(desc);
-    console.log(new Array(1 + desc.length).join("="));
-}
-
 export function getRenderer() {
     // Old: ReactTestUtils.createRenderer();
     return new ShallowRenderer();
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index fbd945ced6..b411cf3a56 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -74,10 +74,6 @@ describe('MegolmExportEncryption', function() {
         }
     });
 
-    beforeEach(function() {
-        testUtils.beforeEach(this);
-    });
-
     describe('decrypt', function() {
         it('should handle missing header', function() {
             const input=stringToArray(`-----`);
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 32a42a7728..2f58afc380 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -69,7 +69,6 @@ describe('Permalinks', function() {
     let sandbox;
 
     beforeEach(function() {
-        testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
         peg.get().credentials = { userId: "@test:example.com" };
     });
diff --git a/yarn.lock b/yarn.lock
index 85deedbfec..a84fe7b76f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
   integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
@@ -475,6 +475,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+abab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -488,12 +493,30 @@ accepts@~1.3.4:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+acorn-globals@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
 acorn-jsx@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn@^6.0.7, acorn@^6.2.1:
+acorn-walk@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+
+acorn@^5.5.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
   integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
@@ -554,7 +577,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -610,6 +633,13 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
+  dependencies:
+    default-require-extensions "^1.0.0"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -652,6 +682,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -756,7 +791,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.5.0, async@^2.6.2:
+async@^2.1.4, async@^2.5.0, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -827,7 +862,7 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.26.0, babel-core@^6.26.3:
+babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
@@ -864,7 +899,7 @@ babel-eslint@^10.0.1:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-generator@^6.26.0:
+babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
@@ -1000,6 +1035,14 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-jest@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
+  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
+  dependencies:
+    babel-plugin-istanbul "^4.1.6"
+    babel-preset-jest "^23.2.0"
+
 babel-loader@^7.1.5:
   version "7.1.5"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68"
@@ -1028,6 +1071,21 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-istanbul@^4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
+
+babel-plugin-jest-hoist@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
+
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -1058,7 +1116,7 @@ babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
   integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
 
-babel-plugin-syntax-object-rest-spread@^6.8.0:
+babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
@@ -1425,6 +1483,14 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
+babel-preset-jest@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
+  dependencies:
+    babel-plugin-jest-hoist "^23.2.0"
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+
 babel-preset-react@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
@@ -1458,7 +1524,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
@@ -1469,7 +1535,7 @@ babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
@@ -1484,7 +1550,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
@@ -1664,11 +1730,23 @@ browser-encrypt-attachment@^0.3.0:
   resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
   integrity sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw=
 
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+
 browser-request@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
+
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -1749,6 +1827,13 @@ bs58@^4.0.1:
   dependencies:
     base-x "^3.0.2"
 
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
@@ -1890,6 +1975,13 @@ caniuse-lite@^1.0.30001012:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
   integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
 
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+  dependencies:
+    rsvp "^3.3.3"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2012,6 +2104,11 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2082,6 +2179,11 @@ clone-regexp@^1.0.0:
     is-regexp "^1.0.0"
     is-supported-regexp-flag "^1.0.0"
 
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -2129,7 +2231,7 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.11.0, commander@^2.20.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2229,7 +2331,7 @@ content-type@^1.0.2, content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2372,6 +2474,18 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  dependencies:
+    cssom "0.3.x"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2396,6 +2510,15 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 date-fns@^1.30.1:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
@@ -2447,7 +2570,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2467,6 +2590,13 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
+  dependencies:
+    strip-bom "^2.0.0"
+
 define-properties@^1.1.2, define-properties@^1.1.3, define-properties@~1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2536,6 +2666,11 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -2559,7 +2694,7 @@ diff-sequences@^24.9.0:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
   integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
-diff@3.5.0, diff@^3.5.0:
+diff@3.5.0, diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -2639,6 +2774,13 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -2831,7 +2973,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -2854,6 +2996,23 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7.
     string.prototype.trimleft "^2.1.0"
     string.prototype.trimright "^2.1.0"
 
+es-abstract@^1.17.0-next.1:
+  version "1.17.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
+  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
+
 es-get-iterator@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
@@ -2898,6 +3057,18 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@^1.9.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-google@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
@@ -3034,6 +3205,11 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -3058,7 +3234,7 @@ esrever@^0.2.0:
   resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8"
   integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g=
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3103,6 +3279,13 @@ except@^0.1.3:
   dependencies:
     indexof "0.0.1"
 
+exec-sh@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -3123,6 +3306,11 @@ execall@^1.0.0:
   dependencies:
     clone-regexp "^1.0.0"
 
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -3170,6 +3358,18 @@ expect@^1.20.2:
     object-keys "^1.0.9"
     tmatch "^2.0.1"
 
+expect@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
+  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
+  dependencies:
+    ansi-styles "^3.2.0"
+    jest-diff "^23.6.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+
 expect@^24.1.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
@@ -3269,6 +3469,13 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
 fbemitter@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
@@ -3342,6 +3549,14 @@ filename-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
   integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
 filesize@3.5.6:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
@@ -3414,6 +3629,14 @@ find-up@4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -3597,6 +3820,14 @@ fsevents@^1.0.0, fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
+fsevents@^1.2.3:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.10.tgz#47252793be8a625a5f96dfaa1c88547f4b20595a"
+  integrity sha512-Dw5DScF/8AWhWzWRbnQrFJfeR/TOJZjRr9Du9kfmd8t234ICcVeDBlauFl/jVcE5ZewhlPoCFvIqp0SE3kAVxA==
+  dependencies:
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
+
 fsevents@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
@@ -3754,7 +3985,7 @@ glob@^5.0.14:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3848,6 +4079,22 @@ growl@1.10.5:
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
   integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.3:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3880,6 +4127,11 @@ has-cors@1.1.0:
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
   integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -4007,6 +4259,13 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
@@ -4154,6 +4413,14 @@ import-local@2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4341,6 +4608,13 @@ is-callable@^1.0.4, is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-ci@^1.0.10:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+  dependencies:
+    ci-info "^1.5.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4470,6 +4744,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
+
 is-generator-function@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
@@ -4628,6 +4907,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
 is-weakmap@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.0.tgz#88bd0b8ec3a5724477637d58ed96cb00552593fd"
@@ -4725,6 +5009,155 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+istanbul-api@^1.3.1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.1"
+    istanbul-lib-hook "^1.2.2"
+    istanbul-lib-instrument "^1.10.2"
+    istanbul-lib-report "^1.1.5"
+    istanbul-lib-source-maps "^1.2.6"
+    istanbul-reports "^1.5.1"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
+
+istanbul-lib-hook@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.1"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
+  dependencies:
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
+  dependencies:
+    throat "^4.0.0"
+
+jest-cli@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
+  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    import-local "^1.0.0"
+    is-ci "^1.0.10"
+    istanbul-api "^1.3.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
+    jest-changed-files "^23.4.2"
+    jest-config "^23.6.0"
+    jest-environment-jsdom "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve-dependencies "^23.6.0"
+    jest-runner "^23.6.0"
+    jest-runtime "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    jest-watcher "^23.4.0"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    node-notifier "^5.2.1"
+    prompts "^0.1.9"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
+    slash "^1.0.0"
+    string-length "^2.0.0"
+    strip-ansi "^4.0.0"
+    which "^1.2.12"
+    yargs "^11.0.0"
+
+jest-config@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
+  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^23.6.0"
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^23.4.0"
+    jest-environment-node "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^23.6.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.6.0"
+
+jest-diff@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
+  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
 jest-diff@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
@@ -4735,11 +5168,96 @@ jest-diff@^24.9.0:
     jest-get-type "^24.9.0"
     pretty-format "^24.9.0"
 
+jest-docblock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
+  dependencies:
+    detect-newline "^2.1.0"
+
+jest-each@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
+  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
+  dependencies:
+    chalk "^2.0.1"
+    pretty-format "^23.6.0"
+
+jest-environment-jsdom@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
+  dependencies:
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+    jsdom "^11.5.1"
+
+jest-environment-node@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
+  dependencies:
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+
+jest-get-type@^22.1.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
+
 jest-get-type@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
   integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
 
+jest-haste-map@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
+  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    invariant "^2.2.4"
+    jest-docblock "^23.2.0"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
+
+jest-jasmine2@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
+  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
+  dependencies:
+    babel-traverse "^6.0.0"
+    chalk "^2.0.1"
+    co "^4.6.0"
+    expect "^23.6.0"
+    is-generator-fn "^1.0.0"
+    jest-diff "^23.6.0"
+    jest-each "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    pretty-format "^23.6.0"
+
+jest-leak-detector@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
+  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
+  dependencies:
+    pretty-format "^23.6.0"
+
+jest-matcher-utils@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
+  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
 jest-matcher-utils@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
@@ -4750,6 +5268,17 @@ jest-matcher-utils@^24.9.0:
     jest-get-type "^24.9.0"
     pretty-format "^24.9.0"
 
+jest-message-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
+  dependencies:
+    "@babel/code-frame" "^7.0.0-beta.35"
+    chalk "^2.0.1"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
+    stack-utils "^1.0.1"
+
 jest-message-util@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
@@ -4769,11 +5298,140 @@ jest-mock@^23.2.0:
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
   integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
+jest-regex-util@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
+
 jest-regex-util@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
   integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
 
+jest-resolve-dependencies@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
+  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
+  dependencies:
+    jest-regex-util "^23.3.0"
+    jest-snapshot "^23.6.0"
+
+jest-resolve@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
+  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
+  dependencies:
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    realpath-native "^1.0.0"
+
+jest-runner@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
+  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
+  dependencies:
+    exit "^0.1.2"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-docblock "^23.2.0"
+    jest-haste-map "^23.6.0"
+    jest-jasmine2 "^23.6.0"
+    jest-leak-detector "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-runtime "^23.6.0"
+    jest-util "^23.4.0"
+    jest-worker "^23.2.0"
+    source-map-support "^0.5.6"
+    throat "^4.0.0"
+
+jest-runtime@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
+  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^4.1.6"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    realpath-native "^1.0.0"
+    slash "^1.0.0"
+    strip-bom "3.0.0"
+    write-file-atomic "^2.1.0"
+    yargs "^11.0.0"
+
+jest-serializer@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
+
+jest-snapshot@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
+  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
+  dependencies:
+    babel-types "^6.0.0"
+    chalk "^2.0.1"
+    jest-diff "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-resolve "^23.6.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^23.6.0"
+    semver "^5.5.0"
+
+jest-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
+  dependencies:
+    callsites "^2.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    jest-message-util "^23.4.0"
+    mkdirp "^0.5.1"
+    slash "^1.0.0"
+    source-map "^0.6.0"
+
+jest-validate@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
+  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    leven "^2.1.0"
+    pretty-format "^23.6.0"
+
+jest-watcher@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
+
+jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
+  dependencies:
+    merge-stream "^1.0.1"
+
 jest-worker@^24.6.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
@@ -4782,6 +5440,14 @@ jest-worker@^24.6.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
+jest@^23.2.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
+  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
+  dependencies:
+    import-local "^1.0.0"
+    jest-cli "^23.6.0"
+
 jquery@^3.3.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -4797,7 +5463,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4810,6 +5476,38 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsdom@^11.5.1:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^5.5.3"
+    acorn-globals "^4.1.0"
+    array-equal "^1.0.0"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle "^1.0.0"
+    data-urls "^1.0.0"
+    domexception "^1.0.1"
+    escodegen "^1.9.1"
+    html-encoding-sniffer "^1.0.2"
+    left-pad "^1.3.0"
+    nwsapi "^2.0.7"
+    parse5 "4.0.0"
+    pn "^1.1.0"
+    request "^2.87.0"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.3.4"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^5.2.0"
+    xml-name-validator "^3.0.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -5015,6 +5713,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+kleur@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
+  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
+
 known-css-properties@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
@@ -5027,6 +5730,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -5049,6 +5757,17 @@ linkifyjs@^2.1.6:
     react "^16.4.2"
     react-dom "^16.4.2"
 
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5141,6 +5860,11 @@ lodash.mergewith@^4.6.1:
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -5251,6 +5975,13 @@ make-fetch-happen@5.0.0:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -5407,6 +6138,13 @@ meow@^5.0.0:
     trim-newlines "^2.0.0"
     yargs-parser "^10.0.0"
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5417,7 +6155,12 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-micromatch@^2.1.5:
+merge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
@@ -5500,7 +6243,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -5525,7 +6268,7 @@ minimist@1.1.x:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
   integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
 
-minimist@1.2.0, minimist@^1.2.0, "minimist@~ 1.2.0":
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -5666,7 +6409,7 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -5704,6 +6447,11 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
 node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -5733,6 +6481,17 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
+node-notifier@^5.2.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -5841,6 +6600,11 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
+nwsapi@^2.0.7:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -5912,6 +6676,14 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5966,7 +6738,7 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.2:
+optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -6134,6 +6906,13 @@ parse-glob@^3.0.4:
     is-extglob "^1.0.0"
     is-glob "^2.0.0"
 
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6147,6 +6926,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -6181,6 +6965,13 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6206,7 +6997,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.6:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -6218,6 +7009,15 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6251,6 +7051,11 @@ picomatch@^2.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
   integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
 
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -6261,6 +7066,18 @@ pify@^4.0.0, pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -6280,6 +7097,11 @@ pluralizers@^0.1.7:
   resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
   integrity sha512-mw6AejUiCaMQ6uPN9ObjJDTnR5AnBSmnHHy3uVTbxrSFSxO5scfwpTs8Dxyb6T2v7GSulhvOq+pm9y+hXUvtOA==
 
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
 png-chunks-extract@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d"
@@ -6415,6 +7237,14 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+pretty-format@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
 pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
@@ -6465,6 +7295,14 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prompts@^0.1.9:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
+  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
+  dependencies:
+    kleur "^2.0.1"
+    sisteransi "^0.1.1"
+
 prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -6489,6 +7327,11 @@ psl@^1.1.24:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.5.0.tgz#47fd1292def7fdb1e138cd78afa8814cebcf7b13"
   integrity sha512-4vqUjKi2huMu1OJiLhi3jN6jeeKvMZdI1tYgi/njW5zV52jNLgSAZSdN16m9bJFe61/cT8ulmw4qFitV9QRsEA==
 
+psl@^1.1.28:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110"
+  integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -6536,7 +7379,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -6755,6 +7598,14 @@ react@^16.4.2, react@^16.9.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -6763,6 +7614,15 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -6819,6 +7679,13 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
+realpath-native@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
+  dependencies:
+    util.promisify "^1.0.0"
+
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
@@ -6997,7 +7864,23 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request@^2.88.0:
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -7088,6 +7971,11 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
 resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
@@ -7158,6 +8046,11 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -7206,6 +8099,22 @@ samsam@1.3.0:
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
   integrity sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==
 
+sane@^2.0.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+  dependencies:
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.18.0"
+  optionalDependencies:
+    fsevents "^1.2.3"
+
 sanitize-html@^1.18.4:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz#f6effdf55dd398807171215a62bfc21811bacf85"
@@ -7316,6 +8225,11 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -7334,6 +8248,11 @@ sinon@^5.0.7:
     supports-color "^5.4.0"
     type-detect "^4.0.8"
 
+sisteransi@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -7568,7 +8487,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.12:
+source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -7581,7 +8500,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -7702,6 +8621,11 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -7745,6 +8669,14 @@ streamroller@^1.0.6:
     fs-extra "^7.0.1"
     lodash "^4.17.14"
 
+string-length@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
+  dependencies:
+    astral-regex "^1.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
@@ -7846,11 +8778,18 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-bom@^3.0.0:
+strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -7975,6 +8914,13 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
+supports-color@^3.1.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
+  dependencies:
+    has-flag "^1.0.0"
+
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -7999,6 +8945,11 @@ symbol-observable@^1.0.3:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
 tabbable@^1.0.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.3.tgz#0e4ee376f3631e42d7977a074dbd2b3827843081"
@@ -8056,6 +9007,17 @@ terser@^4.1.0, terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+test-exclude@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
 text-encoding-utf-8@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
@@ -8066,6 +9028,11 @@ text-table@0.2.0, text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+throat@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -8098,6 +9065,11 @@ tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -8155,6 +9127,14 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+tough-cookie@^2.3.3, tough-cookie@^2.3.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -8163,6 +9143,13 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
 tree-kill@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
@@ -8257,6 +9244,14 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
   integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
 
+uglify-js@^3.1.4:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
+  integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==
+  dependencies:
+    commander "~2.20.3"
+    source-map "~0.6.1"
+
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -8445,6 +9440,14 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util.promisify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
+
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -8543,6 +9546,13 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
 walk@^2.3.9:
   version "2.3.14"
   resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
@@ -8550,6 +9560,13 @@ walk@^2.3.9:
   dependencies:
     foreachasync "^3.0.0"
 
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -8557,6 +9574,14 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
 watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -8566,6 +9591,11 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
 webpack-cli@^3.1.1:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
@@ -8644,6 +9674,13 @@ what-input@^5.2.6:
   resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.6.tgz#ac6f003bf8d3592a0031dea7a03565469b00020b"
   integrity sha512-a0BcI5YR7xp87vSzGcbN0IszJKpUQuTmrZaTSQBl7TLDIdKj6rDhluQ7b/7lYGG81gWDvkySsEvwv4BW5an9kg==
 
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
 whatwg-fetch@>=0.10.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
@@ -8659,6 +9696,29 @@ whatwg-fetch@^1.1.1:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
   integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk=
 
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 which-boxed-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
@@ -8685,7 +9745,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -8738,6 +9798,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@^2.1.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -8745,6 +9814,13 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
+ws@^5.2.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  dependencies:
+    async-limiter "~1.0.0"
+
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -8759,6 +9835,11 @@ x-is-string@^0.1.0:
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
   integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
@@ -8769,6 +9850,11 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -8807,6 +9893,13 @@ yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@13.2.4:
   version "13.2.4"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
@@ -8824,6 +9917,24 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+yargs@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"

From ffa2ac172c2d7dabeeb9d94f3c2a67bea04d5c6f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 15 Dec 2019 14:09:41 +0000
Subject: [PATCH 0022/3235] delint

---
 test/components/structures/auth/Login-test.js        | 1 -
 test/components/structures/auth/Registration-test.js | 1 -
 test/utils/MegolmExportEncryption-test.js            | 1 -
 3 files changed, 3 deletions(-)

diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 7a4041f0bc..d06e754e3e 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -21,7 +21,6 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import sdk from 'matrix-react-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
-import * as TestUtils from '../../../test-utils';
 import {mkServerConfig} from "../../../test-utils";
 
 const Login = sdk.getComponent(
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 0ed304f2df..ad82597f8b 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -21,7 +21,6 @@ import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
 import sdk from 'matrix-react-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
-import * as TestUtils from '../../../test-utils';
 import {mkServerConfig} from "../../../test-utils";
 
 const Registration = sdk.getComponent(
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index b411cf3a56..a1dae391e6 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import * as MegolmExportEncryption from '../../src/utils/MegolmExportEncryption';
 
-import * as testUtils from '../test-utils';
 import expect from 'expect';
 
 const TEST_VECTORS=[

From 6ad31fe0232c9471bdf60b7172509e123a46d4cd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Dec 2019 11:12:48 +0000
Subject: [PATCH 0023/3235] 30 test failures to go :D

---
 package.json                                  |   3 +-
 test/DecryptionFailureTracker-test.js         |   2 -
 test/PhasedRollOut-test.js                    |   1 -
 test/ScalarAuthClient-test.js                 |  38 +-
 test/Terms-test.js                            |  95 ++---
 test/UserActivity-test.js                     |   1 -
 test/all-tests.js                             |   7 -
 test/autocomplete/QueryMatcher-test.js        |   2 -
 test/components/structures/GroupView-test.js  |   5 +-
 .../structures/MessagePanel-test.js           |   9 +-
 test/components/structures/auth/Login-test.js |   7 +-
 .../structures/auth/Registration-test.js      |   7 +-
 .../dialogs/InteractiveAuthDialog-test.js     |  16 +-
 .../elements/MemberEventListSummary-test.js   |  11 +-
 .../views/groups/GroupMemberList-test.js      |   5 +-
 .../components/views/rooms/MemberList-test.js |   7 +-
 .../views/rooms/MessageComposerInput-test.js  |  90 ++---
 test/components/views/rooms/RoomList-test.js  |   7 +-
 .../views/rooms/RoomSettings-test.js          | 375 +++++++++---------
 test/editor/caret-test.js                     |   1 -
 test/editor/deserialize-test.js               |   1 -
 test/editor/diff-test.js                      |   1 -
 test/editor/history-test.js                   |   1 -
 test/editor/model-test.js                     |   1 -
 test/editor/position-test.js                  |   1 -
 test/editor/range-test.js                     |   1 -
 test/editor/serialize-test.js                 |   1 -
 test/i18n-test/languageHandler-test.js        |   8 +-
 test/stores/RoomViewStore-test.js             |  11 +-
 test/test-utils.js                            |  76 ++--
 test/utils/MegolmExportEncryption-test.js     |  21 +-
 test/utils/permalinks/Permalinks-test.js      |   9 +-
 yarn.lock                                     | 312 +++------------
 33 files changed, 424 insertions(+), 709 deletions(-)
 delete mode 100644 test/all-tests.js

diff --git a/package.json b/package.json
index e3af86b488..b21b2cedac 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,6 @@
     "eslint-plugin-react": "^7.7.0",
     "eslint-plugin-react-hooks": "^2.0.1",
     "estree-walker": "^0.5.0",
-    "expect": "^24.1.0",
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
     "jest": "^23.2.0",
@@ -158,11 +157,11 @@
     "react-test-renderer": "^16.9.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
-    "sinon": "^5.0.7",
     "source-map-loader": "^0.2.3",
     "stylelint": "^9.10.1",
     "stylelint-config-standard": "^18.2.0",
     "stylelint-scss": "^3.9.0",
+    "subtle": "^0.1.8",
     "walk": "^2.3.9",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1"
diff --git a/test/DecryptionFailureTracker-test.js b/test/DecryptionFailureTracker-test.js
index baa0545f77..7a6a42ef55 100644
--- a/test/DecryptionFailureTracker-test.js
+++ b/test/DecryptionFailureTracker-test.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-
 import { DecryptionFailure, DecryptionFailureTracker } from '../src/DecryptionFailureTracker';
 
 import { MatrixEvent } from 'matrix-js-sdk';
diff --git a/test/PhasedRollOut-test.js b/test/PhasedRollOut-test.js
index 600b9051f7..f02411d78d 100644
--- a/test/PhasedRollOut-test.js
+++ b/test/PhasedRollOut-test.js
@@ -11,7 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import {phasedRollOutExpiredForUser} from '../src/PhasedRollOut';
 
 const OFFSET = 6000000;
diff --git a/test/ScalarAuthClient-test.js b/test/ScalarAuthClient-test.js
index 7e944189a6..28ca914f00 100644
--- a/test/ScalarAuthClient-test.js
+++ b/test/ScalarAuthClient-test.js
@@ -14,43 +14,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-
-import sinon from 'sinon';
-
 import ScalarAuthClient from '../src/ScalarAuthClient';
 import MatrixClientPeg from '../src/MatrixClientPeg';
 import { stubClient } from './test-utils';
 
 describe('ScalarAuthClient', function() {
-    let clientSandbox;
-
     beforeEach(function() {
-        sinon.stub(window.localStorage, 'getItem').withArgs('mx_scalar_token').returns('brokentoken');
-        clientSandbox = stubClient();
-    });
-
-    afterEach(function() {
-        clientSandbox.restore();
-        sinon.restore();
+        window.localStorage.getItem = jest.fn((arg) => {
+            if (arg === "mx_scalar_token") return "brokentoken";
+        });
+        stubClient();
     });
 
     it('should request a new token if the old one fails', async function() {
         const sac = new ScalarAuthClient();
 
-        sac._getAccountName = sinon.stub();
-        sac._getAccountName.withArgs('brokentoken').rejects({
-            message: "Invalid token",
+        sac._getAccountName = jest.fn((arg) => {
+            switch (arg) {
+                case "brokentoken":
+                    return Promise.reject({
+                        message: "Invalid token",
+                    });
+                case "wokentoken":
+                    return Promise.resolve(MatrixClientPeg.get().getUserId());
+            }
         });
-        sac._getAccountName.withArgs('wokentoken').resolves(MatrixClientPeg.get().getUserId());
 
-        MatrixClientPeg.get().getOpenIdToken = sinon.stub().resolves('this is your openid token');
+        MatrixClientPeg.get().getOpenIdToken = jest.fn().mockResolvedValue('this is your openid token');
 
-        sac.exchangeForScalarToken = sinon.stub().withArgs('this is your openid token').resolves('wokentoken');
+        sac.exchangeForScalarToken = jest.fn((arg) => {
+            if (arg === "this is your openid token") return Promise.resolve("wokentoken");
+        });
 
         await sac.connect();
 
-        expect(sac.exchangeForScalarToken.calledWith('this is your openid token')).toBeTruthy();
+        expect(sac.exchangeForScalarToken).toBeCalledWith('this is your openid token');
         expect(sac.scalarToken).toEqual('wokentoken');
     });
 });
diff --git a/test/Terms-test.js b/test/Terms-test.js
index 3fc7b56e42..71daafddfe 100644
--- a/test/Terms-test.js
+++ b/test/Terms-test.js
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-
-import sinon from 'sinon';
-
 import * as Matrix from 'matrix-js-sdk';
 
 import { startTermsFlow, Service } from '../src/Terms';
@@ -44,107 +40,100 @@ const IM_SERVICE_ONE = new Service(Matrix.SERVICE_TYPES.IM, 'https://imone.test'
 const IM_SERVICE_TWO = new Service(Matrix.SERVICE_TYPES.IM, 'https://imtwo.test', 'a token token');
 
 describe('Terms', function() {
-    let sandbox;
-
     beforeEach(function() {
-        sandbox = stubClient();
-    });
-
-    afterEach(function() {
-        sandbox.restore();
+        stubClient();
     });
 
     it('should prompt for all terms & services if no account data', async function() {
-        MatrixClientPeg.get().getAccountData = sinon.stub().returns(null);
-        MatrixClientPeg.get().getTerms = sinon.stub().returns({
+        MatrixClientPeg.get().getAccountData = jest.fn().mockReturnValue(null);
+        MatrixClientPeg.get().getTerms = jest.fn().mockReturnValue({
             policies: {
                 "policy_the_first": POLICY_ONE,
             },
         });
-        const interactionCallback = sinon.stub().resolves([]);
+        const interactionCallback = jest.fn().mockResolvedValue([]);
         await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
-        console.log("interaction callback calls", interactionCallback.getCall(0));
+        console.log("interaction callback calls", interactionCallback.mock.calls[0]);
 
-        expect(interactionCallback.calledWith([
+        expect(interactionCallback).toBeCalledWith([
             {
                 service: IM_SERVICE_ONE,
                 policies: {
                     policy_the_first: POLICY_ONE,
                 },
             },
-        ])).toBeTruthy();
+        ], []);
     });
 
     it('should not prompt if all policies are signed in account data', async function() {
-        MatrixClientPeg.get().getAccountData = sinon.stub().returns({
-            getContent: sinon.stub().returns({
+        MatrixClientPeg.get().getAccountData = jest.fn().mockReturnValue({
+            getContent: jest.fn().mockReturnValue({
                 accepted: ["http://example.com/one"],
             }),
         });
-        MatrixClientPeg.get().getTerms = sinon.stub().returns({
+        MatrixClientPeg.get().getTerms = jest.fn().mockReturnValue({
             policies: {
                 "policy_the_first": POLICY_ONE,
             },
         });
-        MatrixClientPeg.get().agreeToTerms = sinon.stub();
+        MatrixClientPeg.get().agreeToTerms = jest.fn();
 
-        const interactionCallback = sinon.spy();
+        const interactionCallback = jest.fn();
         await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
-        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.mock.calls[0]);
 
-        expect(interactionCallback.called).toBeFalsy();
-        expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+        expect(interactionCallback).not.toHaveBeenCalled();
+        expect(MatrixClientPeg.get().agreeToTerms).toBeCalledWith(
             Matrix.SERVICE_TYPES.IM,
             'https://imone.test',
             'a token token',
             ["http://example.com/one"],
-        )).toBeTruthy();
+        );
     });
 
     it("should prompt for only terms that aren't already signed", async function() {
-        MatrixClientPeg.get().getAccountData = sinon.stub().returns({
-            getContent: sinon.stub().returns({
+        MatrixClientPeg.get().getAccountData = jest.fn().mockReturnValue({
+            getContent: jest.fn().mockReturnValue({
                 accepted: ["http://example.com/one"],
             }),
         });
-        MatrixClientPeg.get().getTerms = sinon.stub().returns({
+        MatrixClientPeg.get().getTerms = jest.fn().mockReturnValue({
             policies: {
                 "policy_the_first": POLICY_ONE,
                 "policy_the_second": POLICY_TWO,
             },
         });
-        MatrixClientPeg.get().agreeToTerms = sinon.stub();
+        MatrixClientPeg.get().agreeToTerms = jest.fn();
 
-        const interactionCallback = sinon.stub().resolves(["http://example.com/one", "http://example.com/two"]);
+        const interactionCallback = jest.fn().mockResolvedValue(["http://example.com/one", "http://example.com/two"]);
         await startTermsFlow([IM_SERVICE_ONE], interactionCallback);
-        console.log("interactionCallback call", interactionCallback.getCall(0).args);
-        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+        console.log("interactionCallback call", interactionCallback.mock.calls[0]);
+        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.mock.calls[0]);
 
-        expect(interactionCallback.calledWith([
+        expect(interactionCallback).toBeCalledWith([
             {
                 service: IM_SERVICE_ONE,
                 policies: {
                     policy_the_second: POLICY_TWO,
                 },
             },
-        ])).toBeTruthy();
-        expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+        ], ["http://example.com/one"]);
+        expect(MatrixClientPeg.get().agreeToTerms).toBeCalledWith(
             Matrix.SERVICE_TYPES.IM,
             'https://imone.test',
             'a token token',
             ["http://example.com/one", "http://example.com/two"],
-        )).toBeTruthy();
+        );
     });
 
     it("should prompt for only services with un-agreed policies", async function() {
-        MatrixClientPeg.get().getAccountData = sinon.stub().returns({
-            getContent: sinon.stub().returns({
+        MatrixClientPeg.get().getAccountData = jest.fn().mockReturnValue({
+            getContent: jest.fn().mockReturnValue({
                 accepted: ["http://example.com/one"],
             }),
         });
 
-        MatrixClientPeg.get().getTerms = sinon.stub();
-        MatrixClientPeg.get().getTerms.callsFake((serviceType, baseUrl, accessToken) => {
+        MatrixClientPeg.get().getTerms = jest.fn((serviceType, baseUrl, accessToken) => {
             switch (baseUrl) {
                 case 'https://imone.test':
                     return {
@@ -161,35 +150,35 @@ describe('Terms', function() {
             }
         });
 
-        MatrixClientPeg.get().agreeToTerms = sinon.stub();
+        MatrixClientPeg.get().agreeToTerms = jest.fn();
 
-        const interactionCallback = sinon.stub().resolves(["http://example.com/one", "http://example.com/two"]);
+        const interactionCallback = jest.fn().mockResolvedValue(["http://example.com/one", "http://example.com/two"]);
         await startTermsFlow([IM_SERVICE_ONE, IM_SERVICE_TWO], interactionCallback);
-        console.log("getTerms call 0", MatrixClientPeg.get().getTerms.getCall(0).args);
-        console.log("getTerms call 1", MatrixClientPeg.get().getTerms.getCall(1).args);
-        console.log("interactionCallback call", interactionCallback.getCall(0).args);
-        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+        // console.log("getTerms call 0", MatrixClientPeg.get().getTerms.getCall(0).args);
+        // console.log("getTerms call 1", MatrixClientPeg.get().getTerms.getCall(1).args);
+        // console.log("interactionCallback call", interactionCallback.getCall(0).args);
+        // console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
 
-        expect(interactionCallback.calledWith([
+        expect(interactionCallback).toBeCalledWith([
             {
                 service: IM_SERVICE_TWO,
                 policies: {
                     policy_the_second: POLICY_TWO,
                 },
             },
-        ])).toBeTruthy();
-        expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+        ], ["http://example.com/one"]);
+        expect(MatrixClientPeg.get().agreeToTerms).toBeCalledWith(
             Matrix.SERVICE_TYPES.IM,
             'https://imone.test',
             'a token token',
             ["http://example.com/one"],
-        )).toBeTruthy();
-        expect(MatrixClientPeg.get().agreeToTerms.calledWith(
+        );
+        expect(MatrixClientPeg.get().agreeToTerms).toBeCalledWith(
             Matrix.SERVICE_TYPES.IM,
             'https://imtwo.test',
             'a token token',
             ["http://example.com/two"],
-        )).toBeTruthy();
+        );
     });
 });
 
diff --git a/test/UserActivity-test.js b/test/UserActivity-test.js
index 6c684d25e9..a30df527ae 100644
--- a/test/UserActivity-test.js
+++ b/test/UserActivity-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import lolex from 'lolex';
 import jest from 'jest-mock';
 import EventEmitter from 'events';
diff --git a/test/all-tests.js b/test/all-tests.js
deleted file mode 100644
index 1d4d36ebfd..0000000000
--- a/test/all-tests.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// all-tests.js
-//
-// Our master test file: uses the webpack require API to find our test files
-// and run them
-
-const context = require.context('.', true, /-test\.jsx?$/);
-context.keys().forEach(context);
diff --git a/test/autocomplete/QueryMatcher-test.js b/test/autocomplete/QueryMatcher-test.js
index 864e1da81d..03f28eb984 100644
--- a/test/autocomplete/QueryMatcher-test.js
+++ b/test/autocomplete/QueryMatcher-test.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-
 import QueryMatcher from '../../src/autocomplete/QueryMatcher';
 
 const OBJECTS = [
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index 1319e312fb..57531a427c 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -17,14 +17,13 @@ limitations under the License.
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import expect from 'expect';
 
 import MockHttpBackend from 'matrix-mock-request';
 import MatrixClientPeg from '../../../src/MatrixClientPeg';
-import sdk from 'matrix-react-sdk';
+import sdk from '../../skinned-sdk';
 import Matrix from 'matrix-js-sdk';
 
-import * as TestUtils from 'test-utils';
+import * as TestUtils from '../../test-utils';
 const { waitForUpdate } = TestUtils;
 
 const GroupView = sdk.getComponent('structures.GroupView');
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index cd0a0bfcd7..88abaf6735 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -23,10 +23,9 @@ import ReactDOM from "react-dom";
 import PropTypes from "prop-types";
 const TestUtils = require('react-dom/test-utils');
 const expect = require('expect');
-import sinon from 'sinon';
 import { EventEmitter } from "events";
 
-const sdk = require('matrix-react-sdk');
+import sdk from '../../skinned-sdk';
 
 const MessagePanel = sdk.getComponent('structures.MessagePanel');
 import MatrixClientPeg from '../../../src/MatrixClientPeg';
@@ -72,15 +71,14 @@ describe('MessagePanel', function() {
     const clock = mockclock.clock();
     const realSetTimeout = window.setTimeout;
     const events = mkEvents();
-    let sandbox = null;
 
     beforeEach(function() {
-        sandbox = test_utils.stubClient();
+        test_utils.stubClient();
         client = MatrixClientPeg.get();
         client.credentials = {userId: '@me:here'};
 
         // HACK: We assume all settings want to be disabled
-        SettingsStore.getValue = sinon.stub().returns(false);
+        SettingsStore.getValue = jest.fn().returns(false);
         SettingsStore.getValue.withArgs('showDisplaynameChanges').returns(true);
 
         // This option clobbers the duration of all animations to be 1ms
@@ -94,7 +92,6 @@ describe('MessagePanel', function() {
         delete Velocity.mock;
 
         clock.uninstall();
-        sandbox.restore();
     });
 
     function mkEvents() {
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index d06e754e3e..3520672cbe 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -14,12 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-import sinon from 'sinon';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import sdk from 'matrix-react-sdk';
+import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
 import {mkServerConfig} from "../../../test-utils";
 
@@ -36,7 +34,6 @@ describe('Login', function() {
     });
 
     afterEach(function() {
-        sinon.restore();
         ReactDOM.unmountComponentAtNode(parentDiv);
         parentDiv.remove();
     });
@@ -72,7 +69,7 @@ describe('Login', function() {
     });
 
     it('should show form without change server link when custom URLs disabled', function() {
-        sinon.stub(SdkConfig, "get").returns({
+        jest.spyOn(SdkConfig, "get").returns({
             disable_custom_urls: true,
         });
 
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index ad82597f8b..12f736640e 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -14,12 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
-import sinon from 'sinon';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import sdk from 'matrix-react-sdk';
+import sdk from '../../../skinned-sdk';
 import SdkConfig from '../../../../src/SdkConfig';
 import {mkServerConfig} from "../../../test-utils";
 
@@ -36,7 +34,6 @@ describe('Registration', function() {
     });
 
     afterEach(function() {
-        sinon.restore();
         ReactDOM.unmountComponentAtNode(parentDiv);
         parentDiv.remove();
     });
@@ -61,7 +58,7 @@ describe('Registration', function() {
     });
 
     it('should show form when custom URLs disabled', function() {
-        sinon.stub(SdkConfig, "get").returns({
+        jest.spyOn(SdkConfig, "get").returns({
             disable_custom_urls: true,
         });
 
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 5ceba1037b..fe7f538d7d 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -14,14 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-dom/test-utils';
-import sinon from 'sinon';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
 
-import sdk from 'matrix-react-sdk';
+import sdk from '../../../skinned-sdk';
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 
 import * as test_utils from '../../../test-utils';
@@ -33,10 +31,9 @@ const InteractiveAuthDialog = sdk.getComponent(
 
 describe('InteractiveAuthDialog', function() {
     let parentDiv;
-    let sandbox;
 
     beforeEach(function() {
-        sandbox = test_utils.stubClient(sandbox);
+        test_utils.stubClient();
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
     });
@@ -44,12 +41,11 @@ describe('InteractiveAuthDialog', function() {
     afterEach(function() {
         ReactDOM.unmountComponentAtNode(parentDiv);
         parentDiv.remove();
-        sandbox.restore();
     });
 
     it('Should successfully complete a password flow', function() {
-        const onFinished = sinon.spy();
-        const doRequest = sinon.stub().returns(Promise.resolve({a: 1}));
+        const onFinished = jest.fn();
+        const doRequest = jest.fn().mockResolvedValue({a: 1});
 
         // tell the stub matrixclient to return a real userid
         const client = MatrixClientPeg.get();
@@ -108,8 +104,8 @@ describe('InteractiveAuthDialog', function() {
             // let the request complete
             return sleep(1);
         }).then(() => {
-            expect(onFinished.callCount).toEqual(1);
-            expect(onFinished.calledWithExactly(true, {a: 1})).toBe(true);
+            expect(onFinished).toBeCalledTimes(1);
+            expect(onFinished).toBeCalledWith(true, {a: 1});
         });
     });
 });
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index ab69ae10be..e068a8e749 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -1,8 +1,7 @@
-import expect from 'expect';
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ShallowRenderer from "react-test-renderer/shallow";
-import sdk from 'matrix-react-sdk';
+import sdk from '../../../skinned-sdk';
 import * as languageHandler from '../../../../src/languageHandler';
 import * as testUtils from '../../../test-utils';
 
@@ -12,8 +11,6 @@ const MemberEventListSummary = testUtils.wrapInMatrixClientContext(
 );
 
 describe('MemberEventListSummary', function() {
-    let sandbox;
-
     // Generate dummy event tiles for use in simulating an expanded MELS
     const generateTiles = (events) => {
         return events.map((e) => {
@@ -88,7 +85,7 @@ describe('MemberEventListSummary', function() {
     };
 
     beforeEach(function(done) {
-        sandbox = testUtils.stubClient();
+        testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
         languageHandler.setMissingEntryGenerator(function(key) {
@@ -96,10 +93,6 @@ describe('MemberEventListSummary', function() {
         });
     });
 
-    afterEach(function() {
-        sandbox.restore();
-    });
-
     it('renders expanded events if there are less than props.threshold', function() {
         const events = generateEvents([
             {userId: "@user_1:some.domain", prevMembership: "leave", membership: "join"},
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 6ebdbbd320..08f0f781ac 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -17,14 +17,13 @@ limitations under the License.
 import React from "react";
 import ReactDOM from "react-dom";
 import ReactTestUtils from "react-dom/test-utils";
-import expect from "expect";
 
 import MockHttpBackend from "matrix-mock-request";
 import MatrixClientPeg from "../../../../src/MatrixClientPeg";
-import sdk from "matrix-react-sdk";
+import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
-import * as TestUtils from "test-utils";
+import * as TestUtils from "../../../test-utils";
 const { waitForUpdate } = TestUtils;
 
 const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index 2a275e1895..bc12041398 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -1,10 +1,9 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import expect from 'expect';
 import lolex from 'lolex';
 
-import * as TestUtils from 'test-utils';
+import * as TestUtils from '../../../test-utils';
 
 import sdk from '../../../../src/index';
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
@@ -26,7 +25,6 @@ describe('MemberList', () => {
     }
 
     let parentDiv = null;
-    let sandbox = null;
     let client = null;
     let root = null;
     let clock = null;
@@ -38,7 +36,7 @@ describe('MemberList', () => {
     let defaultUsers = [];
 
     beforeEach(function() {
-        sandbox = TestUtils.stubClient(sandbox);
+        TestUtils.stubClient();
         client = MatrixClientPeg.get();
         client.hasLazyLoadMembersEnabled = () => false;
 
@@ -115,7 +113,6 @@ describe('MemberList', () => {
             parentDiv.remove();
             parentDiv = null;
         }
-        sandbox.restore();
 
         clock.uninstall();
 
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 687bbac926..defdb8c69c 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -1,10 +1,8 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import expect from 'expect';
-import sinon from 'sinon';
 import * as testUtils from '../../../test-utils';
-import sdk from 'matrix-react-sdk';
+import sdk from '../../../skinned-sdk';
 const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import {sleep} from "../../../../src/utils/promise";
@@ -23,13 +21,12 @@ function addTextToDraft(text) {
 
 xdescribe('MessageComposerInput', () => {
     let parentDiv = null,
-        sandbox = null,
         client = null,
         mci = null,
         room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
 
     beforeEach(function() {
-        sandbox = testUtils.stubClient(sandbox);
+        testUtils.stubClient();
         client = MatrixClientPeg.get();
         client.credentials = {userId: '@me:domain.com'};
 
@@ -54,7 +51,6 @@ xdescribe('MessageComposerInput', () => {
                 parentDiv.remove();
                 parentDiv = null;
             }
-            sandbox.restore();
             done();
         });
     });
@@ -75,66 +71,66 @@ xdescribe('MessageComposerInput', () => {
     });
 
     it('should not send messages when composer is empty', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(true);
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
-        expect(spy.calledOnce).toEqual(false, 'should not send message');
+        expect(spy).not.toBeCalled();
     });
 
     it('should not change content unnecessarily on RTE -> Markdown conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(true);
         addTextToDraft('a');
         mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('a');
     });
 
     it('should not change content unnecessarily on Markdown -> RTE conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('a');
         mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('a');
     });
 
     it('should send emoji messages when rich text is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(true);
         addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true, 'should send message');
     });
 
     it('should send emoji messages when Markdown is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true, 'should send message');
     });
 
     // FIXME
     // it('should convert basic Markdown to rich text correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
+    //     const spy = jest.spyOn(client, 'sendHtmlMessage');
     //     mci.enableRichtext(false);
     //     addTextToDraft('*abc*');
     //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
+    //     mci.handleReturn(jest.fn());
     //     console.error(spy.args[0][2]);
     //     expect(spy.args[0][2]).toContain('<em>abc');
     // });
     //
     // it('should convert basic rich text to Markdown correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
+    //     const spy = jest.spyOn(client, 'sendHtmlMessage');
     //     mci.enableRichtext(true);
     //     process.nextTick(() => {
     //
@@ -142,43 +138,43 @@ xdescribe('MessageComposerInput', () => {
     //     mci.handleKeyCommand('italic');
     //     addTextToDraft('abc');
     //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
+    //     mci.handleReturn(jest.fn());
     //     expect(['_abc_', '*abc*']).toContain(spy.args[0][1]);
     // });
 
     it('should insert formatting characters in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         mci.handleKeyCommand('italic');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
         expect(['__', '**']).toContain(spy.args[0][1].body);
     });
 
     it('should not entity-encode " in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('"');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('"');
     });
 
     it('should escape characters without other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('\\*escaped\\*');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('*escaped*');
     });
 
     it('should escape characters with other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('\\*escaped\\* *italic*');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('\\*escaped\\* *italic*');
@@ -186,20 +182,20 @@ xdescribe('MessageComposerInput', () => {
     });
 
     it('should not convert -_- into a horizontal rule in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('-_-');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('-_-');
     });
 
     it('should not strip <del> tags in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('<del>striked-out</del>');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('<del>striked-out</del>');
@@ -207,30 +203,30 @@ xdescribe('MessageComposerInput', () => {
     });
 
     it('should not strike-through ~~~ in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('~~~striked-out~~~');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('~~~striked-out~~~');
     });
 
     it('should not mark single unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
     });
 
     it('should not mark two unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.calledOnce).toEqual(true);
         expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
@@ -238,7 +234,7 @@ xdescribe('MessageComposerInput', () => {
 
     it('should strip tab-completed mentions so that only the display name is sent in the plain body in Markdown mode', () => {
         // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(false);
         mci.setDisplayedCompletion({
             completion: 'Some Member',
@@ -246,7 +242,7 @@ xdescribe('MessageComposerInput', () => {
             href: `https://matrix.to/#/@some_member:domain.bla`,
         });
 
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.args[0][1].body).toEqual(
             'Some Member',
@@ -260,7 +256,7 @@ xdescribe('MessageComposerInput', () => {
 
     it('should strip tab-completed mentions so that only the display name is sent in the plain body in RTE mode', () => {
         // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         mci.enableRichtext(true);
         mci.setDisplayedCompletion({
             completion: 'Some Member',
@@ -268,7 +264,7 @@ xdescribe('MessageComposerInput', () => {
             href: `https://matrix.to/#/@some_member:domain.bla`,
         });
 
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.args[0][1].body).toEqual('Some Member');
         expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">Some Member</a>');
@@ -276,12 +272,12 @@ xdescribe('MessageComposerInput', () => {
 
     it('should not strip non-tab-completed mentions when manually typing MD', () => {
         // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         // Markdown mode enabled
         mci.enableRichtext(false);
         addTextToDraft('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
 
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.args[0][1].body).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
         expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">My Not-Tab-Completed Mention</a>');
@@ -289,12 +285,12 @@ xdescribe('MessageComposerInput', () => {
 
     it('should not strip arbitrary typed (i.e. not tab-completed) MD links', () => {
         // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
+        const spy = jest.spyOn(client, 'sendMessage');
         // Markdown mode enabled
         mci.enableRichtext(false);
         addTextToDraft('[Click here](https://some.lovely.url)');
 
-        mci.handleReturn(sinon.stub());
+        mci.handleReturn(jest.fn());
 
         expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
         expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index cea2105480..446abede3d 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -1,10 +1,9 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import expect from 'expect';
 import lolex from 'lolex';
 
-import * as TestUtils from 'test-utils';
+import * as TestUtils from '../../../test-utils';
 
 import sdk from '../../../../src/index';
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
@@ -31,7 +30,6 @@ describe('RoomList', () => {
     }
 
     let parentDiv = null;
-    let sandbox = null;
     let client = null;
     let root = null;
     const myUserId = '@me:domain';
@@ -45,7 +43,7 @@ describe('RoomList', () => {
     let myOtherMember;
 
     beforeEach(function() {
-        sandbox = TestUtils.stubClient(sandbox);
+        TestUtils.stubClient();
         client = MatrixClientPeg.get();
         client.credentials = {userId: myUserId};
         //revert this to prototype method as the test-utils monkey-patches this to return a hardcoded value
@@ -111,7 +109,6 @@ describe('RoomList', () => {
             parentDiv.remove();
             parentDiv = null;
         }
-        sandbox.restore();
 
         clock.uninstall();
 
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 2608eb488a..7b7c554a2c 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -1,190 +1,187 @@
 // TODO: Rewrite room settings tests for dialog support
-// import React from 'react';
-// import ReactDOM from 'react-dom';
-// import expect from 'expect';
-// import jest from 'jest-mock';
-// import * as testUtils from '../../../test-utils';
-// import sdk from 'matrix-react-sdk';
-// const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
-// import MatrixClientPeg from '../../../../src/MatrixClientPeg';
-// import SettingsStore from '../../../../src/settings/SettingsStore';
-//
-//
-// describe('RoomSettings', () => {
-//     let parentDiv = null;
-//     let sandbox = null;
-//     let client = null;
-//     let roomSettings = null;
-//     const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
-//
-//     function expectSentStateEvent(roomId, eventType, expectedEventContent) {
-//         let found = false;
-//         for (const call of client.sendStateEvent.mock.calls) {
-//             const [
-//                 actualRoomId,
-//                 actualEventType,
-//                 actualEventContent,
-//             ] = call.slice(0, 3);
-//
-//             if (roomId === actualRoomId && actualEventType === eventType) {
-//                 expect(actualEventContent).toEqual(expectedEventContent);
-//                 found = true;
-//                 break;
-//             }
-//         }
-//         expect(found).toBe(true);
-//     }
-//
-//     beforeEach(function(done) {
-//         sandbox = testUtils.stubClient();
-//         client = MatrixClientPeg.get();
-//         client.credentials = {userId: '@me:domain.com'};
-//
-//         client.setRoomName = jest.fn().mockReturnValue(Promise.resolve());
-//         client.setRoomTopic = jest.fn().mockReturnValue(Promise.resolve());
-//         client.setRoomDirectoryVisibility = jest.fn().mockReturnValue(Promise.resolve());
-//
-//         // Covers any room state event (e.g. name, avatar, topic)
-//         client.sendStateEvent = jest.fn().mockReturnValue(Promise.resolve());
-//
-//         // Covers room tagging
-//         client.setRoomTag = jest.fn().mockReturnValue(Promise.resolve());
-//         client.deleteRoomTag = jest.fn().mockReturnValue(Promise.resolve());
-//
-//         // Covers any setting in the SettingsStore
-//         // (including local client settings not stored via matrix)
-//         SettingsStore.setValue = jest.fn().mockReturnValue(Promise.resolve());
-//
-//         parentDiv = document.createElement('div');
-//         document.body.appendChild(parentDiv);
-//
-//         const gatherWrappedRef = (r) => {roomSettings = r;};
-//
-//         // get use wrappedRef because we're using wrapInMatrixClientContext
-//         ReactDOM.render(
-//             <WrappedRoomSettings
-//                 wrappedRef={gatherWrappedRef}
-//                 room={room}
-//             />,
-//             parentDiv,
-//             done,
-//         );
-//     });
-//
-//     afterEach((done) => {
-//         if (parentDiv) {
-//             ReactDOM.unmountComponentAtNode(parentDiv);
-//             parentDiv.remove();
-//             parentDiv = null;
-//         }
-//         sandbox.restore();
-//         done();
-//     });
-//
-//     it('should not set when no setting is changed', (done) => {
-//         roomSettings.save().then(() => {
-//             expect(client.sendStateEvent).not.toHaveBeenCalled();
-//             expect(client.setRoomTag).not.toHaveBeenCalled();
-//             expect(client.deleteRoomTag).not.toHaveBeenCalled();
-//             done();
-//         });
-//     });
-//
-//     // XXX: Apparently we do call SettingsStore.setValue
-//     xit('should not settings via the SettingsStore when no setting is changed', (done) => {
-//         roomSettings.save().then(() => {
-//             expect(SettingsStore.setValue).not.toHaveBeenCalled();
-//             done();
-//         });
-//     });
-//
-//     it('should set room name when it has changed', (done) => {
-//         const name = "My Room Name";
-//         roomSettings.setName(name);
-//
-//         roomSettings.save().then(() => {
-//             expect(client.setRoomName.mock.calls[0].slice(0, 2))
-//                 .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', name]);
-//
-//             done();
-//         });
-//     });
-//
-//     it('should set room topic when it has changed', (done) => {
-//         const topic = "this is a topic";
-//         roomSettings.setTopic(topic);
-//
-//         roomSettings.save().then(() => {
-//             expect(client.setRoomTopic.mock.calls[0].slice(0, 2))
-//                 .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', topic]);
-//
-//             done();
-//         });
-//     });
-//
-//     it('should set history visibility when it has changed', (done) => {
-//         const historyVisibility = "translucent";
-//         roomSettings.setState({
-//             history_visibility: historyVisibility,
-//         });
-//
-//         roomSettings.save().then(() => {
-//             expectSentStateEvent(
-//                 "!DdJkzRliezrwpNebLk:matrix.org",
-//                 "m.room.history_visibility", {history_visibility: historyVisibility},
-//             );
-//             done();
-//         });
-//     });
-//
-//     // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
-//     xit('should set room directory publicity when set to true', (done) => {
-//         const isRoomPublished = true;
-//         roomSettings.setState({
-//             isRoomPublished,
-//         }, () => {
-//             roomSettings.save().then(() => {
-//                 expect(client.setRoomDirectoryVisibility.calls[0].arguments.slice(0, 2))
-//                     .toEqual("!DdJkzRliezrwpNebLk:matrix.org", isRoomPublished ? "public" : "private");
-//                 done();
-//             });
-//         });
-//     });
-//
-//     it('should set power levels when changed', (done) => {
-//         roomSettings.onPowerLevelsChanged(42, "invite");
-//
-//         roomSettings.save().then(() => {
-//             expectSentStateEvent(
-//                 "!DdJkzRliezrwpNebLk:matrix.org",
-//                 "m.room.power_levels", { invite: 42 },
-//             );
-//             done();
-//         });
-//     });
-//
-//     it('should set event power levels when changed', (done) => {
-//         roomSettings.onPowerLevelsChanged(42, "event_levels_m.room.message");
-//
-//         roomSettings.save().then(() => {
-//             // We expect all state events to be set to the state_default (50)
-//             // See powerLevelDescriptors in RoomSettings
-//             expectSentStateEvent(
-//                 "!DdJkzRliezrwpNebLk:matrix.org",
-//                 "m.room.power_levels", {
-//                     events: {
-//                         'm.room.message': 42,
-//                         'm.room.avatar': 50,
-//                         'm.room.name': 50,
-//                         'm.room.canonical_alias': 50,
-//                         'm.room.history_visibility': 50,
-//                         'm.room.power_levels': 50,
-//                         'm.room.topic': 50,
-//                         'im.vector.modular.widgets': 50,
-//                     },
-//                 },
-//             );
-//             done();
-//         });
-//     });
-// });
+import React from 'react';
+import ReactDOM from 'react-dom';
+import jest from 'jest-mock';
+import * as testUtils from '../../../test-utils';
+import sdk from '../../../skinned-sdk';
+const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
+import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import SettingsStore from '../../../../src/settings/SettingsStore';
+
+
+describe.skip('RoomSettings', () => {
+    let parentDiv = null;
+    let client = null;
+    let roomSettings = null;
+    const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
+
+    function expectSentStateEvent(roomId, eventType, expectedEventContent) {
+        let found = false;
+        for (const call of client.sendStateEvent.mock.calls) {
+            const [
+                actualRoomId,
+                actualEventType,
+                actualEventContent,
+            ] = call.slice(0, 3);
+
+            if (roomId === actualRoomId && actualEventType === eventType) {
+                expect(actualEventContent).toEqual(expectedEventContent);
+                found = true;
+                break;
+            }
+        }
+        expect(found).toBe(true);
+    }
+
+    beforeEach(function(done) {
+        testUtils.stubClient();
+        client = MatrixClientPeg.get();
+        client.credentials = {userId: '@me:domain.com'};
+
+        client.setRoomName = jest.fn().mockReturnValue(Promise.resolve());
+        client.setRoomTopic = jest.fn().mockReturnValue(Promise.resolve());
+        client.setRoomDirectoryVisibility = jest.fn().mockReturnValue(Promise.resolve());
+
+        // Covers any room state event (e.g. name, avatar, topic)
+        client.sendStateEvent = jest.fn().mockReturnValue(Promise.resolve());
+
+        // Covers room tagging
+        client.setRoomTag = jest.fn().mockReturnValue(Promise.resolve());
+        client.deleteRoomTag = jest.fn().mockReturnValue(Promise.resolve());
+
+        // Covers any setting in the SettingsStore
+        // (including local client settings not stored via matrix)
+        SettingsStore.setValue = jest.fn().mockReturnValue(Promise.resolve());
+
+        parentDiv = document.createElement('div');
+        document.body.appendChild(parentDiv);
+
+        const gatherWrappedRef = (r) => {roomSettings = r;};
+
+        // get use wrappedRef because we're using wrapInMatrixClientContext
+        ReactDOM.render(
+            <WrappedRoomSettings
+                wrappedRef={gatherWrappedRef}
+                room={room}
+            />,
+            parentDiv,
+            done,
+        );
+    });
+
+    afterEach((done) => {
+        if (parentDiv) {
+            ReactDOM.unmountComponentAtNode(parentDiv);
+            parentDiv.remove();
+            parentDiv = null;
+        }
+        done();
+    });
+
+    it('should not set when no setting is changed', (done) => {
+        roomSettings.save().then(() => {
+            expect(client.sendStateEvent).not.toHaveBeenCalled();
+            expect(client.setRoomTag).not.toHaveBeenCalled();
+            expect(client.deleteRoomTag).not.toHaveBeenCalled();
+            done();
+        });
+    });
+
+    // XXX: Apparently we do call SettingsStore.setValue
+    xit('should not settings via the SettingsStore when no setting is changed', (done) => {
+        roomSettings.save().then(() => {
+            expect(SettingsStore.setValue).not.toHaveBeenCalled();
+            done();
+        });
+    });
+
+    it('should set room name when it has changed', (done) => {
+        const name = "My Room Name";
+        roomSettings.setName(name);
+
+        roomSettings.save().then(() => {
+            expect(client.setRoomName.mock.calls[0].slice(0, 2))
+                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', name]);
+
+            done();
+        });
+    });
+
+    it('should set room topic when it has changed', (done) => {
+        const topic = "this is a topic";
+        roomSettings.setTopic(topic);
+
+        roomSettings.save().then(() => {
+            expect(client.setRoomTopic.mock.calls[0].slice(0, 2))
+                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', topic]);
+
+            done();
+        });
+    });
+
+    it('should set history visibility when it has changed', (done) => {
+        const historyVisibility = "translucent";
+        roomSettings.setState({
+            history_visibility: historyVisibility,
+        });
+
+        roomSettings.save().then(() => {
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.history_visibility", {history_visibility: historyVisibility},
+            );
+            done();
+        });
+    });
+
+    // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
+    xit('should set room directory publicity when set to true', (done) => {
+        const isRoomPublished = true;
+        roomSettings.setState({
+            isRoomPublished,
+        }, () => {
+            roomSettings.save().then(() => {
+                expect(client.setRoomDirectoryVisibility.calls[0].arguments.slice(0, 2))
+                    .toEqual("!DdJkzRliezrwpNebLk:matrix.org", isRoomPublished ? "public" : "private");
+                done();
+            });
+        });
+    });
+
+    it('should set power levels when changed', (done) => {
+        roomSettings.onPowerLevelsChanged(42, "invite");
+
+        roomSettings.save().then(() => {
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.power_levels", { invite: 42 },
+            );
+            done();
+        });
+    });
+
+    it('should set event power levels when changed', (done) => {
+        roomSettings.onPowerLevelsChanged(42, "event_levels_m.room.message");
+
+        roomSettings.save().then(() => {
+            // We expect all state events to be set to the state_default (50)
+            // See powerLevelDescriptors in RoomSettings
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.power_levels", {
+                    events: {
+                        'm.room.message': 42,
+                        'm.room.avatar': 50,
+                        'm.room.name': 50,
+                        'm.room.canonical_alias': 50,
+                        'm.room.history_visibility': 50,
+                        'm.room.power_levels': 50,
+                        'm.room.topic': 50,
+                        'im.vector.modular.widgets': 50,
+                    },
+                },
+            );
+            done();
+        });
+    });
+});
diff --git a/test/editor/caret-test.js b/test/editor/caret-test.js
index 9da28bff95..f0c171c7c9 100644
--- a/test/editor/caret-test.js
+++ b/test/editor/caret-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import {getLineAndNodePosition} from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
 import {createPartCreator} from "./mock";
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index ae25e45126..1c58a6c40b 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import {parseEvent} from "../../src/editor/deserialize";
 import {createPartCreator} from "./mock";
 
diff --git a/test/editor/diff-test.js b/test/editor/diff-test.js
index ebcb058baa..4637206b27 100644
--- a/test/editor/diff-test.js
+++ b/test/editor/diff-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import {diffDeletion, diffAtCaret} from "../../src/editor/diff";
 
 describe('editor/diff', function() {
diff --git a/test/editor/history-test.js b/test/editor/history-test.js
index 4f227f74dd..e54c1e7ea9 100644
--- a/test/editor/history-test.js
+++ b/test/editor/history-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import HistoryManager, {MAX_STEP_LENGTH} from "../../src/editor/history";
 
 describe('editor/history', function() {
diff --git a/test/editor/model-test.js b/test/editor/model-test.js
index c5f2a2ef12..826dde3d68 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import EditorModel from "../../src/editor/model";
 import {createPartCreator} from "./mock";
 
diff --git a/test/editor/position-test.js b/test/editor/position-test.js
index 7ac4284c60..90f40c21a7 100644
--- a/test/editor/position-test.js
+++ b/test/editor/position-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import EditorModel from "../../src/editor/model";
 import {createPartCreator} from "./mock";
 
diff --git a/test/editor/range-test.js b/test/editor/range-test.js
index 468cb60c76..53fb6cb765 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import EditorModel from "../../src/editor/model";
 import {createPartCreator} from "./mock";
 
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index 2e7712e6e6..7517e46437 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import EditorModel from "../../src/editor/model";
 import {htmlSerializeIfNeeded} from "../../src/editor/serialize";
 import {createPartCreator} from "./mock";
diff --git a/test/i18n-test/languageHandler-test.js b/test/i18n-test/languageHandler-test.js
index 244fe99000..36dc4bed87 100644
--- a/test/i18n-test/languageHandler-test.js
+++ b/test/i18n-test/languageHandler-test.js
@@ -5,18 +5,12 @@ import * as languageHandler from '../../src/languageHandler';
 const testUtils = require('../test-utils');
 
 describe('languageHandler', function() {
-    let sandbox;
-
     beforeEach(function(done) {
-        sandbox = testUtils.stubClient();
+        testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
     });
 
-    afterEach(function() {
-        sandbox.restore();
-    });
-
     it('translates a string to german', function() {
         languageHandler.setLanguage('de').then(function() {
             const translated = languageHandler._t('Rooms');
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 3762125cd9..249af84885 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -1,8 +1,5 @@
-import expect from 'expect';
-
 import RoomViewStore from '../../src/stores/RoomViewStore';
 
-
 import peg from '../../src/MatrixClientPeg';
 
 import * as testUtils from '../test-utils';
@@ -10,20 +7,14 @@ import * as testUtils from '../test-utils';
 const dispatch = testUtils.getDispatchForStore(RoomViewStore);
 
 describe('RoomViewStore', function() {
-    let sandbox;
-
     beforeEach(function() {
-        sandbox = testUtils.stubClient();
+        testUtils.stubClient();
         peg.get().credentials = { userId: "@test:example.com" };
 
         // Reset the state of the store
         RoomViewStore.reset();
     });
 
-    afterEach(function() {
-        sandbox.restore();
-    });
-
     it('can be used to view a room by ID and join', function(done) {
         peg.get().joinRoom = (roomAddress) => {
             expect(roomAddress).toBe("!randomcharacters:aser.ver");
diff --git a/test/test-utils.js b/test/test-utils.js
index 9e8768ae71..407791e9c3 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,6 +1,5 @@
 "use strict";
 
-import sinon from 'sinon';
 import React from 'react';
 import PropTypes from 'prop-types';
 import peg from '../src/MatrixClientPeg';
@@ -27,8 +26,6 @@ export function getRenderer() {
  * @returns {sinon.Sandbox}; remember to call sandbox.restore afterwards.
  */
 export function stubClient() {
-    const sandbox = sinon.sandbox.create();
-
     const client = createTestClient();
 
     // stub out the methods in MatrixClientPeg
@@ -37,12 +34,11 @@ export function stubClient() {
     // so we do this for each method
     const methods = ['get', 'unset', 'replaceUsingCreds'];
     for (let i = 0; i < methods.length; i++) {
-        sandbox.stub(peg, methods[i]);
+        peg[methods[i]] = jest.spyOn(peg, methods[i]);
     }
     // MatrixClientPeg.get() is called a /lot/, so implement it with our own
     // fast stub function rather than a sinon stub
     peg.get = function() { return client; };
-    return sandbox;
 }
 
 /**
@@ -52,27 +48,27 @@ export function stubClient() {
  */
 export function createTestClient() {
     return {
-        getHomeserverUrl: sinon.stub(),
-        getIdentityServerUrl: sinon.stub(),
-        getDomain: sinon.stub().returns("matrix.rog"),
-        getUserId: sinon.stub().returns("@userId:matrix.rog"),
+        getHomeserverUrl: jest.fn(),
+        getIdentityServerUrl: jest.fn(),
+        getDomain: jest.fn().mockReturnValue("matrix.rog"),
+        getUserId: jest.fn().mockReturnValue("@userId:matrix.rog"),
 
-        getPushActionsForEvent: sinon.stub(),
-        getRoom: sinon.stub().returns(mkStubRoom()),
-        getRooms: sinon.stub().returns([]),
-        getVisibleRooms: sinon.stub().returns([]),
-        getGroups: sinon.stub().returns([]),
-        loginFlows: sinon.stub(),
-        on: sinon.stub(),
-        removeListener: sinon.stub(),
-        isRoomEncrypted: sinon.stub().returns(false),
-        peekInRoom: sinon.stub().returns(Promise.resolve(mkStubRoom())),
+        getPushActionsForEvent: jest.fn(),
+        getRoom: jest.fn().mockReturnValue(mkStubRoom()),
+        getRooms: jest.fn().mockReturnValue([]),
+        getVisibleRooms: jest.fn().mockReturnValue([]),
+        getGroups: jest.fn().mockReturnValue([]),
+        loginFlows: jest.fn(),
+        on: jest.fn(),
+        removeListener: jest.fn(),
+        isRoomEncrypted: jest.fn().mockReturnValue(false),
+        peekInRoom: jest.fn().mockResolvedValue(mkStubRoom()),
 
-        paginateEventTimeline: sinon.stub().returns(Promise.resolve()),
-        sendReadReceipt: sinon.stub().returns(Promise.resolve()),
-        getRoomIdForAlias: sinon.stub().returns(Promise.resolve()),
-        getRoomDirectoryVisibility: sinon.stub().returns(Promise.resolve()),
-        getProfileInfo: sinon.stub().returns(Promise.resolve({})),
+        paginateEventTimeline: jest.fn().mockResolvedValue(undefined),
+        sendReadReceipt: jest.fn().mockResolvedValue(undefined),
+        getRoomIdForAlias: jest.fn().mockResolvedValue(undefined),
+        getRoomDirectoryVisibility: jest.fn().mockResolvedValue(undefined),
+        getProfileInfo: jest.fn().mockResolvedValue({}),
         getAccountData: (type) => {
             return mkEvent({
                 type,
@@ -81,9 +77,9 @@ export function createTestClient() {
             });
         },
         mxcUrlToHttp: (mxc) => 'http://this.is.a.url/',
-        setAccountData: sinon.stub(),
-        sendTyping: sinon.stub().returns(Promise.resolve({})),
-        sendMessage: () => Promise.resolve({}),
+        setAccountData: jest.fn(),
+        sendTyping: jest.fn().mockResolvedValue({}),
+        sendMessage: () => jest.fn().mockResolvedValue({}),
         getSyncState: () => "SYNCING",
         generateClientSecret: () => "t35tcl1Ent5ECr3T",
         isGuest: () => false,
@@ -214,15 +210,15 @@ export function mkStubRoom(roomId = null) {
     const stubTimeline = { getEvents: () => [] };
     return {
         roomId,
-        getReceiptsForEvent: sinon.stub().returns([]),
-        getMember: sinon.stub().returns({
+        getReceiptsForEvent: jest.fn().mockReturnValue([]),
+        getMember: jest.fn().mockReturnValue({
             userId: '@member:domain.bla',
             name: 'Member',
             roomId: roomId,
             getAvatarUrl: () => 'mxc://avatar.url/image.png',
         }),
-        getMembersWithMembership: sinon.stub().returns([]),
-        getJoinedMembers: sinon.stub().returns([]),
+        getMembersWithMembership: jest.fn().mockReturnValue([]),
+        getJoinedMembers: jest.fn().mockReturnValue([]),
         getPendingEvents: () => [],
         getLiveTimeline: () => stubTimeline,
         getUnfilteredTimelineSet: () => null,
@@ -231,12 +227,12 @@ export function mkStubRoom(roomId = null) {
         getVersion: () => '1',
         shouldUpgradeToVersion: () => null,
         getMyMembership: () => "join",
-        maySendMessage: sinon.stub().returns(true),
+        maySendMessage: jest.fn().mockReturnValue(true),
         currentState: {
-            getStateEvents: sinon.stub(),
-            mayClientSendStateEvent: sinon.stub().returns(true),
-            maySendStateEvent: sinon.stub().returns(true),
-            maySendEvent: sinon.stub().returns(true),
+            getStateEvents: jest.fn(),
+            mayClientSendStateEvent: jest.fn().mockReturnValue(true),
+            maySendStateEvent: jest.fn().mockReturnValue(true),
+            maySendEvent: jest.fn().mockReturnValue(true),
             members: [],
         },
         tags: {
@@ -244,9 +240,9 @@ export function mkStubRoom(roomId = null) {
                 order: 0.5,
             },
         },
-        setBlacklistUnverifiedDevices: sinon.stub(),
-        on: sinon.stub(),
-        removeListener: sinon.stub(),
+        setBlacklistUnverifiedDevices: jest.fn(),
+        on: jest.fn(),
+        removeListener: jest.fn(),
     };
 }
 
@@ -295,7 +291,7 @@ export function wrapInMatrixClientContext(WrappedComponent) {
 /**
  * Call fn before calling componentDidUpdate on a react component instance, inst.
  * @param {React.Component} inst an instance of a React component.
- * @param {integer} updates Number of updates to wait for. (Defaults to 1.)
+ * @param {number} updates Number of updates to wait for. (Defaults to 1.)
  * @returns {Promise} promise that resolves when componentDidUpdate is called on
  *                    given component instance.
  */
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index a1dae391e6..0973f75a31 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -16,9 +16,7 @@ limitations under the License.
 
 "use strict";
 
-import * as MegolmExportEncryption from '../../src/utils/MegolmExportEncryption';
-
-import expect from 'expect';
+import SubtleCrypto from 'subtle';
 
 const TEST_VECTORS=[
     [
@@ -58,19 +56,22 @@ const TEST_VECTORS=[
         "bWnSXS9oymiqwUIGs08sXI33ZA==\n" +
         "-----END MEGOLM SESSION DATA-----",
     ],
-]
-;
+];
 
 function stringToArray(s) {
     return new TextEncoder().encode(s).buffer;
 }
 
 describe('MegolmExportEncryption', function() {
-    before(function() {
-        // if we don't have subtlecrypto, go home now
-        if (!window.crypto.subtle && !window.crypto.webkitSubtle) {
-            this.skip();
-        }
+    let MegolmExportEncryption;
+
+    beforeAll(() => {
+        window.crypto = { subtle: SubtleCrypto };
+        MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption");
+    });
+
+    afterAll(() => {
+        window.crypto = undefined;
     });
 
     describe('decrypt', function() {
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 2f58afc380..05be3a6e5b 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import expect from 'expect';
 import peg from '../../../src/MatrixClientPeg';
 import {
     makeGroupPermalink,
@@ -66,17 +65,11 @@ function mockRoom(roomId, members, serverACL) {
 }
 
 describe('Permalinks', function() {
-    let sandbox;
-
     beforeEach(function() {
-        sandbox = testUtils.stubClient();
+        testUtils.stubClient();
         peg.get().credentials = { userId: "@test:example.com" };
     });
 
-    afterEach(function() {
-        sandbox.restore();
-    });
-
     it('should pick no candidate servers when the room has no members', function() {
         const room = mockRoom("!fake:example.org", []);
         const creator = new RoomPermalinkCreator(room);
diff --git a/yarn.lock b/yarn.lock
index a84fe7b76f..61a8c49591 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -125,42 +125,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
-  dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
-
-"@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
-
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
-  dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -174,42 +138,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.6.0.tgz#ec7670432ae9c8eb710400d112c201a362d83393"
-  integrity sha512-w4/WHG7C4WWFyE5geCieFJF6MZkbW4VAriol5KlmQXpAQdxvV0p26sqNZOW6Qyw6Y0l9K4g+cHvvczR2sEEpqg==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/formatio@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
-  integrity sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==
-  dependencies:
-    samsam "1.3.0"
-
-"@sinonjs/formatio@^3.2.1":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c"
-  integrity sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==
-  dependencies:
-    "@sinonjs/commons" "^1"
-    "@sinonjs/samsam" "^3.1.0"
-
-"@sinonjs/samsam@^3.1.0":
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz#46682efd9967b259b81136b9f120fd54585feb4a"
-  integrity sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==
-  dependencies:
-    "@sinonjs/commons" "^1.3.0"
-    array-from "^2.1.1"
-    lodash "^4.17.15"
-
-"@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
-
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -224,26 +152,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-
-"@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
 "@types/json-schema@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -259,11 +167,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
   integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
@@ -285,18 +188,6 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
-"@types/yargs-parser@*":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
-  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
-
-"@types/yargs@^13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380"
-  integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@typescript-eslint/experimental-utils@^2.5.0":
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
@@ -592,7 +483,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
@@ -692,11 +583,6 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-from@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
-  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-
 array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
@@ -1649,6 +1535,11 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
+bluebird@^2.9.27:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
+
 bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2689,12 +2580,7 @@ diff-match-patch@^1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-
-diff@3.5.0, diff@^3.2.0, diff@^3.5.0:
+diff@3.5.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -2813,6 +2699,13 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+ecc-jsbn@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.0.1.tgz#970577ba31b4976fb1889a298cb7451d896c466d"
+  integrity sha1-lwV3ujG0l2+xiJopjLdFHYlsRm0=
+  dependencies:
+    jsbn "git+https://github.com/rynomad/jsbn.git"
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2821,6 +2714,12 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+"ecc-qj@git+https://github.com/rynomad/ecc.git":
+  version "0.0.1"
+  resolved "git+https://github.com/rynomad/ecc.git#a8c599363dab87a5c95274338d863233f00f7c4a"
+  dependencies:
+    nan "^1.6.2"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3370,18 +3269,6 @@ expect@^23.6.0:
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
-expect@^24.1.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
-  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-styles "^3.2.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.9.0"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4947,11 +4834,6 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5158,16 +5040,6 @@ jest-diff@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
-jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
 jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
@@ -5205,11 +5077,6 @@ jest-get-type@^22.1.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
   integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
-
 jest-haste-map@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
@@ -5258,16 +5125,6 @@ jest-matcher-utils@^23.6.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.6.0"
 
-jest-matcher-utils@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
@@ -5279,20 +5136,6 @@ jest-message-util@^23.4.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
-
 jest-mock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
@@ -5303,11 +5146,6 @@ jest-regex-util@^23.3.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
   integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
-jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
-
 jest-resolve-dependencies@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
@@ -5471,6 +5309,10 @@ js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+"jsbn@git+https://github.com/rynomad/jsbn.git":
+  version "0.0.0"
+  resolved "git+https://github.com/rynomad/jsbn.git#bb522b0124f75424f89d49446c40a87111942c7b"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5592,11 +5434,6 @@ jsx-ast-utils@^2.2.3:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
-just-extend@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
-  integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
-
 karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -5830,11 +5667,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -5898,16 +5730,11 @@ loglevel@^1.6.4:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
   integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
-lolex@4.2, lolex@^4.1.0:
+lolex@4.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
   integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==
 
-lolex@^2.4.2:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
-  integrity sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==
-
 longest-streak@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
@@ -6368,6 +6195,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+nan@^1.6.2:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515"
+  integrity sha1-GpzSdVYJdm9cKR5BlPzjn94oZRU=
+
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -6419,17 +6251,6 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^1.3.3:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.2.tgz#b6d29af10e48b321b307e10e065199338eeb2652"
-  integrity sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==
-  dependencies:
-    "@sinonjs/formatio" "^3.2.1"
-    "@sinonjs/text-encoding" "^0.7.1"
-    just-extend "^4.0.2"
-    lolex "^4.1.0"
-    path-to-regexp "^1.7.0"
-
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -6447,6 +6268,11 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-forge@^0.6.20:
+  version "0.6.49"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.49.tgz#f1ee95d5d74623938fe19d698aa5a26d54d2f60f"
+  integrity sha1-8e6V1ddGI5OP4Z1piqWibVTS9g8=
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -7002,13 +6828,6 @@ path-parse@^1.0.5, path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -7109,6 +6928,13 @@ png-chunks-extract@^1.0.0:
   dependencies:
     crc-32 "^0.3.0"
 
+polyfill-promise@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/polyfill-promise/-/polyfill-promise-4.0.1.tgz#f8448dc27c3b967d5f67fc060f56ed64e2286b49"
+  integrity sha1-+ESNwnw7ln1fZ/wGD1btZOIoa0k=
+  dependencies:
+    bluebird "^2.9.27"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -7245,16 +7071,6 @@ pretty-format@^23.6.0:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -7536,7 +7352,7 @@ react-immutable-proptypes@^2.1.0:
   resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
   integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
 
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -8094,11 +7910,6 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-samsam@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
-  integrity sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==
-
 sane@^2.0.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
@@ -8235,24 +8046,16 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-sinon@^5.0.7:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-5.1.1.tgz#19c59810ffb733ea6e76a28b94a71fc4c2f523b8"
-  integrity sha512-h/3uHscbt5pQNxkf7Y/Lb9/OM44YNCicHakcq73ncbrIS8lXg+ZGOZbtuU+/km4YnyiCYfQQEwANaReJz7KDfw==
-  dependencies:
-    "@sinonjs/formatio" "^2.0.0"
-    diff "^3.5.0"
-    lodash.get "^4.4.2"
-    lolex "^2.4.2"
-    nise "^1.3.3"
-    supports-color "^5.4.0"
-    type-detect "^4.0.8"
-
 sisteransi@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
   integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
+sjcl@^1.0.3:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a"
+  integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -8888,6 +8691,18 @@ stylelint@^9.10.1:
     svg-tags "^1.0.0"
     table "^5.0.0"
 
+subtle@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/subtle/-/subtle-0.1.8.tgz#0c12599b9cf13127eda11626510cd8f24f878916"
+  integrity sha1-DBJZm5zxMSftoRYmUQzY8k+HiRY=
+  dependencies:
+    ecc-jsbn "0.0.1"
+    node-forge "^0.6.20"
+    polyfill-promise "^4.0.1"
+    sjcl "^1.0.3"
+  optionalDependencies:
+    ecc-qj "git+https://github.com/rynomad/ecc.git"
+
 sugarss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
@@ -8928,7 +8743,7 @@ supports-color@^4.5.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -9216,11 +9031,6 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8, type-detect@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
 type-is@~1.6.17:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"

From 0041dae664c04809981975116959057446cb534d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Dec 2019 11:55:01 +0000
Subject: [PATCH 0024/3235] 26 test failures to go :D

---
 package.json                                  |  2 +
 .../structures/MessagePanel-test.js           |  5 ++-
 test/components/structures/auth/Login-test.js |  2 +-
 .../structures/auth/Registration-test.js      |  2 +-
 test/stores/RoomViewStore-test.js             |  2 +-
 test/utils/MegolmExportEncryption-test.js     | 24 ++++++++++-
 yarn.lock                                     | 43 +++++++++++++++++--
 7 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b21b2cedac..f3f10a86ca 100644
--- a/package.json
+++ b/package.json
@@ -154,6 +154,7 @@
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "mocha": "^5.0.5",
+    "node-webcrypto-shim": "^0.0.1",
     "react-test-renderer": "^16.9.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
@@ -163,6 +164,7 @@
     "stylelint-scss": "^3.9.0",
     "subtle": "^0.1.8",
     "walk": "^2.3.9",
+    "webcrypto": "^0.1.1",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1"
   }
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 88abaf6735..c64ae9680a 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -78,8 +78,9 @@ describe('MessagePanel', function() {
         client.credentials = {userId: '@me:here'};
 
         // HACK: We assume all settings want to be disabled
-        SettingsStore.getValue = jest.fn().returns(false);
-        SettingsStore.getValue.withArgs('showDisplaynameChanges').returns(true);
+        SettingsStore.getValue = jest.fn((arg) => {
+            return arg === "showDisplaynameChanges";
+        });
 
         // This option clobbers the duration of all animations to be 1ms
         // which makes unit testing a lot simpler (the animation doesn't
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 3520672cbe..7ca210ff93 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -69,7 +69,7 @@ describe('Login', function() {
     });
 
     it('should show form without change server link when custom URLs disabled', function() {
-        jest.spyOn(SdkConfig, "get").returns({
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
             disable_custom_urls: true,
         });
 
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index 12f736640e..bf26763a79 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -58,7 +58,7 @@ describe('Registration', function() {
     });
 
     it('should show form when custom URLs disabled', function() {
-        jest.spyOn(SdkConfig, "get").returns({
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
             disable_custom_urls: true,
         });
 
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 249af84885..1d92a02562 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -27,7 +27,7 @@ describe('RoomViewStore', function() {
     });
 
     it('can be used to view a room by alias and join', function(done) {
-        peg.get().getRoomIdForAlias.returns(Promise.resolve({room_id: "!randomcharacters:aser.ver"}));
+        peg.get().getRoomIdForAlias.mockResolvedValue({room_id: "!randomcharacters:aser.ver"});
         peg.get().joinRoom = (roomAddress) => {
             expect(roomAddress).toBe("#somealias2:aser.ver");
             done();
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 0973f75a31..0df68c8bfb 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -16,7 +16,27 @@ limitations under the License.
 
 "use strict";
 
-import SubtleCrypto from 'subtle';
+import webcrypto from "node-webcrypto-shim";
+import {TextEncoder} from "util";
+import crypto from "crypto";
+
+function getRandomValues(buf) {
+    if (!(buf instanceof Uint8Array)) {
+        throw new TypeError('expected Uint8Array');
+    }
+    if (buf.length > 65536) {
+        const e = new Error();
+        e.code = 22;
+        e.message = 'Failed to execute \'getRandomValues\' on \'Crypto\': The ' +
+            'ArrayBufferView\'s byte length (' + buf.length + ') exceeds the ' +
+            'number of bytes of entropy available via this API (65536).';
+        e.name = 'QuotaExceededError';
+        throw e;
+    }
+    const bytes = crypto.randomBytes(buf.length);
+    buf.set(bytes);
+    return buf;
+}
 
 const TEST_VECTORS=[
     [
@@ -66,7 +86,7 @@ describe('MegolmExportEncryption', function() {
     let MegolmExportEncryption;
 
     beforeAll(() => {
-        window.crypto = { subtle: SubtleCrypto };
+        window.crypto = { ...webcrypto, getRandomValues };
         MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption");
     });
 
diff --git a/yarn.lock b/yarn.lock
index 61a8c49591..44b630ea89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2343,7 +2343,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-crypto-browserify@^3.11.0:
+crypto-browserify@^3.10.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
@@ -2562,6 +2562,11 @@ detect-newline@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
+detect-node@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -6200,7 +6205,7 @@ nan@^1.6.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515"
   integrity sha1-GpzSdVYJdm9cKR5BlPzjn94oZRU=
 
-nan@^2.12.1:
+nan@^2.12.1, nan@^2.13.2:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -6341,6 +6346,23 @@ node-releases@^1.1.41:
   dependencies:
     semver "^6.3.0"
 
+node-webcrypto-ossl@^1.0.31:
+  version "1.0.48"
+  resolved "https://registry.yarnpkg.com/node-webcrypto-ossl/-/node-webcrypto-ossl-1.0.48.tgz#640e9547f8ae1d0becc8374a65e1d0e11ab385ea"
+  integrity sha512-MWUkQ/5wrs7lpAr+fhsLMfjdxKGd3dQFVqWbNMkyYyCMRW8E7ScailqtCZYDLTnJtU6B+91rXxCJNyZvbYaSOg==
+  dependencies:
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    tslib "^1.9.3"
+    webcrypto-core "^0.1.26"
+
+node-webcrypto-shim@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/node-webcrypto-shim/-/node-webcrypto-shim-0.0.1.tgz#674167cfb688c3a9cc5b1650b89b11395080f31a"
+  integrity sha512-8MBE1nDPpJ5IMM48K98EZ6UZavN/Y3P2SKkmux9Pr8RkQNCy3ahVOayjSE8g6/EGpN5w6nT+Vj9RvZ8iXY6HxQ==
+  dependencies:
+    node-webcrypto-ossl "^1.0.31"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -8995,7 +9017,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
@@ -9401,6 +9423,21 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+webcrypto-core@^0.1.26:
+  version "0.1.26"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-0.1.26.tgz#977e5cdd9173db6ac8b18414d66ee3759a8b1024"
+  integrity sha512-BZVgJZkkHyuz8loKvsaOKiBDXDpmMZf5xG4QAOlSeYdXlFUl9c1FRrVnAXcOdb4fTHMG+TRu81odJwwSfKnWTA==
+  dependencies:
+    tslib "^1.7.1"
+
+webcrypto@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/webcrypto/-/webcrypto-0.1.1.tgz#63316e5ecbce6ce965ab5f259c2faa62c3e782b4"
+  integrity sha512-BAvoatS38TbHdyt42ECLroi27NmDh5iea5l5rHC6nZTZjlbJlndrT0FoIiEq7fmPHpmNtP0lMFKVMEKZQFIrGA==
+  dependencies:
+    crypto-browserify "^3.10.0"
+    detect-node "^2.0.3"
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"

From eb5ebaf7547ddcc16e5500081b135862aab33b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Mon, 16 Dec 2019 12:19:22 +0000
Subject: [PATCH 0025/3235] Translated using Weblate (French)

Currently translated at 100.0% (2001 of 2001 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f4e2a86e77..96f2337229 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2008,5 +2008,12 @@
     "Hide verified sessions": "Masquer les sessions vérifiées",
     "%(count)s verified sessions|other": "%(count)s sessions vérifiées",
     "%(count)s verified sessions|one": "1 session vérifiée",
-    "Close preview": "Fermer l’aperçu"
+    "Close preview": "Fermer l’aperçu",
+    "This user has not verified all of their devices.": "Cet utilisateur n'a pas vérifié tous ses appareils.",
+    "You have not verified this user. This user has verified all of their devices.": "Vous n'avez pas vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.",
+    "You have verified this user. This user has verified all of their devices.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Certains utilisateurs dans ce salon chiffré n’ont pas été vérifiés par vous ou n’ont pas vérifié leurs propres appareils.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.",
+    "Language Dropdown": "Sélection de la langue",
+    "Country Dropdown": "Sélection du pays"
 }

From b8faaa23c12003c174631ebd01a403a0b1af64e1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 16 Dec 2019 16:06:43 -0700
Subject: [PATCH 0026/3235] Remove irrelevant targets

---
 .babelrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.babelrc b/.babelrc
index 3710e20a37..7e50f4a757 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,8 +5,7 @@
             "targets": {
                 "browsers": [
                     "last 2 versions"
-                ],
-                "node": 12
+                ]
             },
             "modules": "commonjs"
         }],

From 434570eca962d5894627a3acb799ff618cdc61b0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 16 Dec 2019 16:07:58 -0700
Subject: [PATCH 0027/3235] Explain why MatrixClientPeg is the way it is

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

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 4d293b7e34..46debab731 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -247,5 +247,10 @@ class _MatrixClientPeg {
 if (!global.mxMatrixClientPeg) {
     global.mxMatrixClientPeg = new _MatrixClientPeg();
 }
+
+// We export both because the syntax is slightly different with
+// our babel changes. We maintain both for backwards compatibility
+// and for babel to be happy.
+// TODO: Convert this to a single export
 export default global.mxMatrixClientPeg;
 export const MatrixClientPeg = global.mxMatrixClientPeg;

From 0a9985fb489dc33863f03cb883d00589827f013c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 16 Dec 2019 16:10:11 -0700
Subject: [PATCH 0028/3235] Rename decorator for clarity

---
 src/components/views/auth/AuthPage.js                      | 4 ++--
 src/utils/{replaceComponent.ts => replaceableComponent.ts} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/utils/{replaceComponent.ts => replaceableComponent.ts} (89%)

diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.js
index 8448df9ac8..bfac6514e2 100644
--- a/src/components/views/auth/AuthPage.js
+++ b/src/components/views/auth/AuthPage.js
@@ -18,9 +18,9 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
-import {replaceComponent} from "../../../utils/replaceComponent";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-@replaceComponent("views.auth.AuthPage")
+@replaceableComponent("views.auth.AuthPage")
 export default class AuthPage extends React.PureComponent {
     render() {
         const AuthFooter = sdk.getComponent('auth.AuthFooter');
diff --git a/src/utils/replaceComponent.ts b/src/utils/replaceableComponent.ts
similarity index 89%
rename from src/utils/replaceComponent.ts
rename to src/utils/replaceableComponent.ts
index 1775c42294..a52d71ba6d 100644
--- a/src/utils/replaceComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -17,6 +17,6 @@ limitations under the License.
 import React from 'react';
 import sdk from '../index';
 
-export function replaceComponent(name: string, origComponent: React.Component) {
+export function replaceableComponent(name: string, origComponent: React.Component) {
     return () => sdk.getComponent(name) || origComponent;
 }

From 9865ce899bdf75c6e28e068b740e94ca762e373c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 16 Dec 2019 16:34:46 -0700
Subject: [PATCH 0029/3235] Add a bunch of docs

We're making an assumption here that the decorator is actually all over the app when it's not.
---
 README.md                         |  1 +
 docs/skinning.md                  | 71 +++++++++++++++++++++++++++++++
 src/utils/replaceableComponent.ts | 18 ++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 docs/skinning.md

diff --git a/README.md b/README.md
index 1265c2bd77..aefbeb9964 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
 
   * After creating a new component you must run `yarn reskindex` to regenerate
     the `component-index.js` for the SDK (used in future for skinning)
+    <!-- TODO: Remove this once this approach to skinning is replaced -->
 
   * The view's CSS file MUST have the same name (e.g. view/rooms/MessageTile.css).
     CSS for matrix-react-sdk currently resides in
diff --git a/docs/skinning.md b/docs/skinning.md
new file mode 100644
index 0000000000..229bc78372
--- /dev/null
+++ b/docs/skinning.md
@@ -0,0 +1,71 @@
+# Skinning
+
+The react-sdk can be skinned to replace presentation components, CSS, or
+other relevant parts of the SDK. Typically consumers will replace entire
+components and get the ability for custom CSS as a result.
+
+This doc isn't exhaustive on how skinning works, though it should cover
+some of the more complicated parts such as component replacement.
+
+## Loading a skin
+
+1. Generate a `component-index.js` (preferably using the tools that the react-sdk
+exposes). This can typically be done with a npm script like `"reskindex -h src/header"`.
+2. In your app's entry point, add something like this code:
+   ```javascript
+   import {loadSkin} from "matrix-react-sdk";
+   loadSkin(import("component-index").components);
+   // The rest of your imports go under this.
+   ```
+3. Import the remainder of the SDK and bootstrap your app.
+
+It is extremely important that you **do not** import anything else from the
+SDK prior to loading your skin as otherwise the skin might not work. Loading
+the skin should be one of the first things your app does, if not the very
+first thing.
+
+Additionally, **do not** provide `loadSkin` with the react-sdk components
+themselves otherwise the app might explode. The SDK is already aware of its
+components and doesn't need to be told.
+
+## Replacing components
+
+Components that replace the react-sdk ones MUST have a `replaces` static
+key on the component's class to describe which component it overrides. For
+example, if your `VectorAuthPage` component is meant to replace the react-sdk
+`AuthPage` component then you'd add `static replaces = 'views.auth.AuthPage';`
+to the `VectorAuthPage` class.
+
+Other than that, the skin just needs to be loaded normally as mentioned above.
+Consumers of the SDK likely will not be interested in the rest of this section.
+
+### SDK developer notes
+
+Components in the react-sdk MUST be decorated with the `@replaceableComponent`
+function. For components that can't use the decorator, they must use a
+variation that provides similar functionality. The decorator gives consumers
+an opportunity to load skinned components by abusing import ordering and 
+behaviour.
+
+Decorators are executed at import time which is why we can abuse the import
+ordering behaviour: importing `loadSkin` doesn't trigger any components to
+be imported, allowing the consumer to specify a skin. When the consumer does
+import a component (for example, `MatrixChat`), it starts to pull in all the
+components via `import` statements. When the components get pulled in the
+decorator checks with the skinned components to see if it should be replacing
+the component being imported. The decorator then effectively replaces the
+components when needed by specifying the skinned component as an override for
+the SDK's component, which should in theory override critical functions like
+`render()` and lifecycle event handlers. 
+
+The decorator also means that older usage of `getComponent()` is no longer
+required because components should be replaced by the decorator. Eventually
+the react-sdk should only have one usage of `getComponent()`: the decorator.
+
+The decorator assumes that if `getComponent()` returns null that there is
+no skinned version of the component and continues on using the SDK's component.
+In previous versions of the SDK, the function would throw an error instead
+because it also expected the skin to list the SDK's components as well, however
+that is no longer possible due to the above.
+
+In short, components should always be `import`ed.
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index a52d71ba6d..4777e2f395 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -17,6 +17,24 @@ limitations under the License.
 import React from 'react';
 import sdk from '../index';
 
+/**
+ * Replaces a component with a skinned version if a skinned version exists.
+ * This decorator should only be applied to components which can be skinned. For
+ * the react-sdk this means all components should be decorated with this.
+ *
+ * The decoration works by assuming the skin has been loaded prior to the
+ * decorator being called. If that's not the case, the developer will find
+ * out quickly through various amounts of errors and explosions.
+ *
+ * For a bit more detail on how this works, see docs/skinning.md
+ * @param {string} name The dot-path name of the component being replaced.
+ * @param {React.Component} origComponent The component that can be replaced
+ * with a skinned version. If no skinned version is available, this component
+ * will be used.
+ */
 export function replaceableComponent(name: string, origComponent: React.Component) {
+    // Decorators return a function to override the class (origComponent). This
+    // ultimately assumes that `getComponent()` won't throw an error and instead
+    // return a falsey value like `null` when the skin doesn't have a component.
     return () => sdk.getComponent(name) || origComponent;
 }

From 284a1fdde797e55e2a465a81a270a55a385d7aec Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 17 Dec 2019 03:40:47 +0000
Subject: [PATCH 0030/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1998 of 1998 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 829af63542..cea6d8d70d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2008,5 +2008,12 @@
     "Secure your encrypted messages with a passphrase": "使用密碼保護您的加密訊息",
     "Storing secrets...": "正在儲存秘密……",
     "Unable to set up secret storage": "無法設定秘密儲存空間",
-    "Close preview": "關閉預覽"
+    "Close preview": "關閉預覽",
+    "This user has not verified all of their devices.": "這個使用者尚未驗證所有裝置。",
+    "You have not verified this user. This user has verified all of their devices.": "您尚未驗證此使用者。此使用者已驗證所有裝置。",
+    "You have verified this user. This user has verified all of their devices.": "您已驗證此使用者。此使用者已驗證所有裝置。",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "在此已加密的聊天室中的某些使用者尚未被您驗證，或是他們尚未驗證他們的裝置。",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "在此已加密的聊天室中的所有使用者已被您驗證，他們也已驗證所有裝置。",
+    "Language Dropdown": "語言下拉式選單",
+    "Country Dropdown": "國家下拉式選單"
 }

From a7a7a9cb2349d58d252624e48c31dc91d885fdd5 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 17 Dec 2019 05:48:28 +0000
Subject: [PATCH 0031/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1998 of 1998 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0b094d86af..0faf20937b 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2009,5 +2009,12 @@
     "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
     "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
     "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biztonsági tárolót fogunk használni, hogy tárolhassuk a kereszt-aláíráshoz tartozó azonosítót titkosított formában, amivel más eszközöket és üzenet kulcsokat lehet ellenőrizni. Védd a titkosított üzenetekhez való hozzáférést jelmondattal és azt tartsd titokban.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz."
+    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
+    "This user has not verified all of their devices.": "Ez a felhasználó még ellenőrizte az összes eszközét.",
+    "You have not verified this user. This user has verified all of their devices.": "Ezt a felhasználót még nem ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.",
+    "You have verified this user. This user has verified all of their devices.": "Ezt a felhasználót ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Néhány felhasználót még nem ellenőriztél ebben a titkosított szobában vagy még ők nem ellenőrizték az összes eszközüket.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Minden felhasználót ellenőriztél ebben a titkosított szobában és ők ellenőrizték az összes eszközüket.",
+    "Language Dropdown": "Nyelvválasztó lenyíló menü",
+    "Country Dropdown": "Ország lenyíló menü"
 }

From ab3fb6581b9b662da21750100565d29f1dd18c22 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 11:24:37 +0000
Subject: [PATCH 0032/3235] Down to 7 test failures

---
 __mocks__/browser-request.js                  | 16 ++++
 __mocks__/imageMock.js                        |  1 +
 package.json                                  |  8 +-
 src/utils/MegolmExportEncryption.js           |  2 +-
 test/Terms-test.js                            |  8 +-
 test/components/structures/GroupView-test.js  | 12 +--
 .../structures/MessagePanel-test.js           |  4 +-
 .../dialogs/InteractiveAuthDialog-test.js     |  6 +-
 .../elements/MemberEventListSummary-test.js   | 26 +++---
 .../views/groups/GroupMemberList-test.js      |  4 +-
 test/i18n-test/languageHandler-test.js        |  3 +
 test/mock-clock.js                            |  2 +-
 test/utils/MegolmExportEncryption-test.js     | 28 ++----
 yarn.lock                                     | 93 +++++++++++--------
 14 files changed, 122 insertions(+), 91 deletions(-)
 create mode 100644 __mocks__/browser-request.js
 create mode 100644 __mocks__/imageMock.js

diff --git a/__mocks__/browser-request.js b/__mocks__/browser-request.js
new file mode 100644
index 0000000000..45f83a1763
--- /dev/null
+++ b/__mocks__/browser-request.js
@@ -0,0 +1,16 @@
+const en = require("../src/i18n/strings/en_EN");
+
+module.exports = jest.fn((opts, cb) => {
+    if (opts.url.endsWith("languages.json")) {
+        cb(undefined, {status: 200}, JSON.stringify({
+            "en": {
+                "fileName": "en_EN.json",
+                "label": "English",
+            },
+        }));
+    } else if (opts.url.endsWith("en_EN.json")) {
+        cb(undefined, {status: 200}, JSON.stringify(en));
+    } else {
+        cb(undefined, {status: 404}, "");
+    }
+});
diff --git a/__mocks__/imageMock.js b/__mocks__/imageMock.js
new file mode 100644
index 0000000000..474ac702b4
--- /dev/null
+++ b/__mocks__/imageMock.js
@@ -0,0 +1 @@
+module.exports = "image-file-stub";
diff --git a/package.json b/package.json
index f3f10a86ca..6424f28ac8 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
+    "@peculiar/webcrypto": "^1.0.22",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
@@ -154,7 +155,6 @@
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "mocha": "^5.0.5",
-    "node-webcrypto-shim": "^0.0.1",
     "react-test-renderer": "^16.9.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
@@ -164,8 +164,12 @@
     "stylelint-scss": "^3.9.0",
     "subtle": "^0.1.8",
     "walk": "^2.3.9",
-    "webcrypto": "^0.1.1",
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1"
+  },
+  "jest": {
+    "moduleNameMapper": {
+      "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"
+    }
   }
 }
diff --git a/src/utils/MegolmExportEncryption.js b/src/utils/MegolmExportEncryption.js
index 2f2fc4cca7..bc9af8db78 100644
--- a/src/utils/MegolmExportEncryption.js
+++ b/src/utils/MegolmExportEncryption.js
@@ -130,7 +130,7 @@ export async function decryptMegolmKeyFile(data, password) {
  * @param {String} data
  * @param {String} password
  * @param {Object=} options
- * @param {Nunber=} options.kdf_rounds Number of iterations to perform of the
+ * @param {Number=} options.kdf_rounds Number of iterations to perform of the
  *    key-derivation function.
  * @return {Promise<ArrayBuffer>} promise for encrypted output
  */
diff --git a/test/Terms-test.js b/test/Terms-test.js
index 71daafddfe..e644e0dbbb 100644
--- a/test/Terms-test.js
+++ b/test/Terms-test.js
@@ -154,10 +154,10 @@ describe('Terms', function() {
 
         const interactionCallback = jest.fn().mockResolvedValue(["http://example.com/one", "http://example.com/two"]);
         await startTermsFlow([IM_SERVICE_ONE, IM_SERVICE_TWO], interactionCallback);
-        // console.log("getTerms call 0", MatrixClientPeg.get().getTerms.getCall(0).args);
-        // console.log("getTerms call 1", MatrixClientPeg.get().getTerms.getCall(1).args);
-        // console.log("interactionCallback call", interactionCallback.getCall(0).args);
-        // console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.getCall(0).args);
+        console.log("getTerms call 0", MatrixClientPeg.get().getTerms.mock.calls[0]);
+        console.log("getTerms call 1", MatrixClientPeg.get().getTerms.mock.calls[1]);
+        console.log("interactionCallback call", interactionCallback.mock.calls[0]);
+        console.log("agreeToTerms call", MatrixClientPeg.get().agreeToTerms.mock.calls[0]);
 
         expect(interactionCallback).toBeCalledWith([
             {
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index 57531a427c..31e7c26c9a 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -191,13 +191,13 @@ describe('GroupView', function() {
             const name = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_name');
             const nameElement = ReactDOM.findDOMNode(name);
             expect(nameElement).toBeTruthy();
-            expect(nameElement.innerText).toContain('The name of a community');
-            expect(nameElement.innerText).toContain(groupId);
+            expect(nameElement.textContent).toContain('The name of a community');
+            expect(nameElement.textContent).toContain(groupId);
 
             const shortDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_shortDesc');
             const shortDescElement = ReactDOM.findDOMNode(shortDesc);
             expect(shortDescElement).toBeTruthy();
-            expect(shortDescElement.innerText).toBe('This is a community');
+            expect(shortDescElement.textContent).toBe('This is a community');
         });
 
         httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
@@ -217,7 +217,7 @@ describe('GroupView', function() {
             const longDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_groupDesc');
             const longDescElement = ReactDOM.findDOMNode(longDesc);
             expect(longDescElement).toBeTruthy();
-            expect(longDescElement.innerText).toBe('This is a LONG description.');
+            expect(longDescElement.textContent).toBe('This is a LONG description.');
             expect(longDescElement.innerHTML).toBe('<div dir="auto">This is a <b>LONG</b> description.</div>');
         });
 
@@ -331,7 +331,7 @@ describe('GroupView', function() {
             const roomDetailListRoomNameElement = ReactDOM.findDOMNode(roomDetailListRoomName);
 
             expect(roomDetailListRoomNameElement).toBeTruthy();
-            expect(roomDetailListRoomNameElement.innerText).toEqual('Some room name');
+            expect(roomDetailListRoomNameElement.textContent).toEqual('Some room name');
         });
 
         httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
@@ -362,7 +362,7 @@ describe('GroupView', function() {
             const shortDesc = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_GroupView_header_shortDesc');
             const shortDescElement = ReactDOM.findDOMNode(shortDesc);
             expect(shortDescElement).toBeTruthy();
-            expect(shortDescElement.innerText).toBe('This is a community');
+            expect(shortDescElement.textContent).toBe('This is a community');
         });
 
         httpBackend.when('GET', '/groups/' + groupIdEncoded + '/summary').respond(200, summaryResponse);
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index c64ae9680a..5d70554b07 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -31,8 +31,8 @@ const MessagePanel = sdk.getComponent('structures.MessagePanel');
 import MatrixClientPeg from '../../../src/MatrixClientPeg';
 import Matrix from 'matrix-js-sdk';
 
-const test_utils = require('test-utils');
-const mockclock = require('mock-clock');
+const test_utils = require('../../test-utils');
+const mockclock = require('../../mock-clock');
 
 import Velocity from 'velocity-animate';
 
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index fe7f538d7d..b047d6073b 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -91,8 +91,8 @@ describe('InteractiveAuthDialog', function() {
             expect(submitNode.disabled).toBe(false);
             ReactTestUtils.Simulate.submit(formNode, {});
 
-            expect(doRequest.callCount).toEqual(1);
-            expect(doRequest.calledWithMatch({
+            expect(doRequest).toHaveBeenCalledTimes(1);
+            expect(doRequest).toBeCalledWith(expect.objectContaining({
                 session: "sess",
                 type: "m.login.password",
                 password: "s3kr3t",
@@ -100,7 +100,7 @@ describe('InteractiveAuthDialog', function() {
                     type: "m.id.user",
                     user: "@user:id",
                 },
-            })).toBe(true);
+            }));
             // let the request complete
             return sleep(1);
         }).then(() => {
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index e068a8e749..3f4c7da951 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -157,7 +157,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe("user_1 joined and left and joined");
     });
@@ -193,7 +193,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe("user_1 joined and left 7 times");
     });
@@ -241,7 +241,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 was unbanned, joined and left 7 times and was invited",
@@ -294,7 +294,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 was unbanned, joined and left 2 times, was banned, " +
@@ -353,7 +353,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 and one other were unbanned, joined and left 2 times and were banned",
@@ -391,7 +391,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_0 and 19 others were unbanned, joined and left 2 times and were banned",
@@ -442,7 +442,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_2 was unbanned and joined and left 2 times, user_1 was unbanned, " +
@@ -516,7 +516,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 was invited, was banned, joined, rejected their invitation, left, " +
@@ -563,7 +563,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 and one other rejected their invitations and " +
@@ -599,7 +599,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 rejected their invitation 2 times",
@@ -627,7 +627,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1 and user_2 joined 2 times",
@@ -654,7 +654,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_1, user_2 and one other joined",
@@ -679,7 +679,7 @@ describe('MemberEventListSummary', function() {
         const summary = ReactTestUtils.findRenderedDOMComponentWithClass(
             instance, "mx_EventListSummary_summary",
         );
-        const summaryText = summary.innerText;
+        const summaryText = summary.textContent;
 
         expect(summaryText).toBe(
             "user_0, user_1 and 18 others joined",
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 08f0f781ac..2b20ce0067 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -112,7 +112,7 @@ describe("GroupMemberList", function() {
             const memberList = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList_joined");
             const memberListElement = ReactDOM.findDOMNode(memberList);
             expect(memberListElement).toBeTruthy();
-            expect(memberListElement.innerText).toBe("Test");
+            expect(memberListElement.textContent).toBe("Test");
         });
 
         httpBackend.when("GET", "/groups/" + groupIdEncoded + "/summary").respond(200, summaryResponse);
@@ -132,7 +132,7 @@ describe("GroupMemberList", function() {
             const memberList = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList_joined");
             const memberListElement = ReactDOM.findDOMNode(memberList);
             expect(memberListElement).toBeTruthy();
-            expect(memberListElement.innerText).toBe("Failed to load group members");
+            expect(memberListElement.textContent).toBe("Failed to load group members");
         });
 
         httpBackend.when("GET", "/groups/" + groupIdEncoded + "/summary").respond(200, summaryResponse);
diff --git a/test/i18n-test/languageHandler-test.js b/test/i18n-test/languageHandler-test.js
index 36dc4bed87..fa6969b715 100644
--- a/test/i18n-test/languageHandler-test.js
+++ b/test/i18n-test/languageHandler-test.js
@@ -9,6 +9,9 @@ describe('languageHandler', function() {
         testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
+        languageHandler.setMissingEntryGenerator(function(key) {
+            return key.split('|', 2)[1];
+        });
     });
 
     it('translates a string to german', function() {
diff --git a/test/mock-clock.js b/test/mock-clock.js
index 103e186c1f..d9eac1a0e1 100644
--- a/test/mock-clock.js
+++ b/test/mock-clock.js
@@ -25,7 +25,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * jasmine-core and exposed as a standalone module. The interface is just the
  * same as that of jasmine.clock. For example:
  *
- *    var mock_clock = require("mock-clock").clock();
+ *    var mock_clock = require("../../mock-clock").clock();
  *    mock_clock.install();
  *    setTimeout(function() {
  *        timerCallback();
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 0df68c8bfb..b3a9782ce6 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -16,26 +16,14 @@ limitations under the License.
 
 "use strict";
 
-import webcrypto from "node-webcrypto-shim";
 import {TextEncoder} from "util";
-import crypto from "crypto";
+import nodeCrypto from "crypto";
+import { Crypto } from "@peculiar/webcrypto";
+
+const webCrypto = new Crypto();
 
 function getRandomValues(buf) {
-    if (!(buf instanceof Uint8Array)) {
-        throw new TypeError('expected Uint8Array');
-    }
-    if (buf.length > 65536) {
-        const e = new Error();
-        e.code = 22;
-        e.message = 'Failed to execute \'getRandomValues\' on \'Crypto\': The ' +
-            'ArrayBufferView\'s byte length (' + buf.length + ') exceeds the ' +
-            'number of bytes of entropy available via this API (65536).';
-        e.name = 'QuotaExceededError';
-        throw e;
-    }
-    const bytes = crypto.randomBytes(buf.length);
-    buf.set(bytes);
-    return buf;
+    return nodeCrypto.randomFillSync(buf);
 }
 
 const TEST_VECTORS=[
@@ -86,7 +74,8 @@ describe('MegolmExportEncryption', function() {
     let MegolmExportEncryption;
 
     beforeAll(() => {
-        window.crypto = { ...webcrypto, getRandomValues };
+        // window.crypto = { subtle: crypto.subtle, getRandomValues };
+        window.crypto = { subtle: webCrypto.subtle, getRandomValues };
         MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption");
     });
 
@@ -130,7 +119,8 @@ cissyYBxjsfsAn
             });
         });
 
-        it('should decrypt a range of inputs', function(done) {
+        // TODO find a subtlecrypto shim which doesn't break this test
+        it.skip('should decrypt a range of inputs', function(done) {
             function next(i) {
                 if (i >= TEST_VECTORS.length) {
                     done();
diff --git a/yarn.lock b/yarn.lock
index 44b630ea89..1aa34972f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -138,6 +138,33 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@peculiar/asn1-schema@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.3.tgz#e55ff9e98a1cf31832629aabacf85be3edf13a48"
+  integrity sha512-Tfgj9eNJ6cTKEtEuidKenLHMx/Q5M8KEE9hnohHqvdpqHJXWYr5RlT3GjAHPjGXy5+mr7sSfuXfzE6aAkEGN7A==
+  dependencies:
+    asn1js "^2.0.22"
+    tslib "^1.9.3"
+
+"@peculiar/json-schema@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.6.tgz#134096ede59cf502e9acbdb24cbe55eb97ad2fe9"
+  integrity sha512-A8DM0ueA+LUqD/HuNPHDd8yMkhbRmnV0iosxyB/uOV1cfiKlCKXDeqkzHTOZpveRI05iCjZxqkPZ2+Nnw1wB4A==
+  dependencies:
+    tslib "^1.10.0"
+
+"@peculiar/webcrypto@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.22.tgz#9dae652fce6bacd9df15bc91965797cee33adf67"
+  integrity sha512-NP6H6ZGXUvJnQJCWzUgnRcQv+9nMCNwLUDhTwOxRUwPFvtHauMOl0oPTKUjbhInCMaE55gJqB4yc0YKbde6Exw==
+  dependencies:
+    "@peculiar/asn1-schema" "^1.0.3"
+    "@peculiar/json-schema" "^1.1.6"
+    asn1js "^2.0.26"
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
+    webcrypto-core "^1.0.17"
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -644,6 +671,13 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+asn1js@^2.0.22, asn1js@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251"
+  integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ==
+  dependencies:
+    pvutils latest
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -2343,7 +2377,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-crypto-browserify@^3.10.0, crypto-browserify@^3.11.0:
+crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
@@ -2562,11 +2596,6 @@ detect-newline@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
-detect-node@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -6205,7 +6234,7 @@ nan@^1.6.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515"
   integrity sha1-GpzSdVYJdm9cKR5BlPzjn94oZRU=
 
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -6346,23 +6375,6 @@ node-releases@^1.1.41:
   dependencies:
     semver "^6.3.0"
 
-node-webcrypto-ossl@^1.0.31:
-  version "1.0.48"
-  resolved "https://registry.yarnpkg.com/node-webcrypto-ossl/-/node-webcrypto-ossl-1.0.48.tgz#640e9547f8ae1d0becc8374a65e1d0e11ab385ea"
-  integrity sha512-MWUkQ/5wrs7lpAr+fhsLMfjdxKGd3dQFVqWbNMkyYyCMRW8E7ScailqtCZYDLTnJtU6B+91rXxCJNyZvbYaSOg==
-  dependencies:
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    tslib "^1.9.3"
-    webcrypto-core "^0.1.26"
-
-node-webcrypto-shim@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/node-webcrypto-shim/-/node-webcrypto-shim-0.0.1.tgz#674167cfb688c3a9cc5b1650b89b11395080f31a"
-  integrity sha512-8MBE1nDPpJ5IMM48K98EZ6UZavN/Y3P2SKkmux9Pr8RkQNCy3ahVOayjSE8g6/EGpN5w6nT+Vj9RvZ8iXY6HxQ==
-  dependencies:
-    node-webcrypto-ossl "^1.0.31"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -7222,6 +7234,18 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pvtsutils@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.9.tgz#0eb6106f27878ccaa55e7dfbf6bd2c75af461dee"
+  integrity sha512-/kDsuCKPqJuIzn37w6+iN+TiSrN+zrwPEd7FjT61oNbRvceGdsS94fMEWZ4/h6QZU5EZhBMiV+79IYedroP/Yw==
+  dependencies:
+    tslib "^1.10.0"
+
+pvutils@latest:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
+  integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
+
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
@@ -9017,7 +9041,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
@@ -9423,20 +9447,13 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webcrypto-core@^0.1.26:
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-0.1.26.tgz#977e5cdd9173db6ac8b18414d66ee3759a8b1024"
-  integrity sha512-BZVgJZkkHyuz8loKvsaOKiBDXDpmMZf5xG4QAOlSeYdXlFUl9c1FRrVnAXcOdb4fTHMG+TRu81odJwwSfKnWTA==
+webcrypto-core@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.17.tgz#a9354bc0b1ba6735e882f4137ede2c4366e6ad9b"
+  integrity sha512-7jxTLgtM+TahBPErx/Dd2XvxFDfWJrHxjVeTSvIa4LSgiYrmCPlC2INiAMAfb8MbtHiwJKKqF5sPS0AWNjBbXw==
   dependencies:
-    tslib "^1.7.1"
-
-webcrypto@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/webcrypto/-/webcrypto-0.1.1.tgz#63316e5ecbce6ce965ab5f259c2faa62c3e782b4"
-  integrity sha512-BAvoatS38TbHdyt42ECLroi27NmDh5iea5l5rHC6nZTZjlbJlndrT0FoIiEq7fmPHpmNtP0lMFKVMEKZQFIrGA==
-  dependencies:
-    crypto-browserify "^3.10.0"
-    detect-node "^2.0.3"
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"

From e6d8487302609a0f1148bfd1199e40a765d572ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 11:47:01 +0000
Subject: [PATCH 0033/3235] Fix more tests

---
 package.json                                  |  12 +-
 .../views/settings/KeyBackupPanel.js          |   2 +-
 .../elements/MemberEventListSummary-test.js   |   7 +-
 .../views/groups/GroupMemberList-test.js      |   1 +
 .../components/views/rooms/MemberList-test.js |   2 +-
 test/components/views/rooms/RoomList-test.js  |   4 +-
 .../views/rooms/RoomSettings-test.js          |   3 +-
 test/i18n-test/languageHandler-test.js        |   4 +-
 test/setupTests.js                            |   4 +
 test/stores/RoomViewStore-test.js             |   4 +-
 yarn.lock                                     | 883 +-----------------
 11 files changed, 42 insertions(+), 884 deletions(-)
 create mode 100644 test/setupTests.js

diff --git a/package.json b/package.json
index 6424f28ac8..05129cb7c0 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
     "git-revision.txt",
     "header",
     "jenkins.sh",
-    "karma.conf.js",
     "lib",
     "package.json",
     "release.sh",
@@ -143,18 +142,8 @@
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
     "jest": "^23.2.0",
-    "karma": "^4.0.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-cli": "^1.0.1",
-    "karma-logcapture-reporter": "0.0.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "^0.0.31",
-    "karma-summary-reporter": "^1.5.1",
-    "karma-webpack": "^4.0.0-beta.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
-    "mocha": "^5.0.5",
     "react-test-renderer": "^16.9.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
@@ -168,6 +157,7 @@
     "webpack-cli": "^3.1.1"
   },
   "jest": {
+    "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"
     }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 559b1e0ba1..5f0b2ea55d 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,7 +21,7 @@ import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import SettingsStore from '../../../../lib/settings/SettingsStore';
+import SettingsStore from '../../../settings/SettingsStore';
 import { accessSecretStorage } from '../../../CrossSigningManager';
 
 export default class KeyBackupPanel extends React.PureComponent {
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 3f4c7da951..a68c39eeeb 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -84,13 +84,8 @@ describe('MemberEventListSummary', function() {
         return eventsForUsers;
     };
 
-    beforeEach(function(done) {
+    beforeEach(function() {
         testUtils.stubClient();
-
-        languageHandler.setLanguage('en').then(done);
-        languageHandler.setMissingEntryGenerator(function(key) {
-            return key.split('|', 2)[1];
-        });
     });
 
     it('renders expanded events if there are less than props.threshold', function() {
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 2b20ce0067..fd96c9f331 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -24,6 +24,7 @@ import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
 import * as TestUtils from "../../../test-utils";
+import * as languageHandler from "../../../../src/languageHandler";
 const { waitForUpdate } = TestUtils;
 
 const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index bc12041398..06b596691d 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -5,7 +5,7 @@ import lolex from 'lolex';
 
 import * as TestUtils from '../../../test-utils';
 
-import sdk from '../../../../src/index';
+import sdk from '../../../skinned-sdk';
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 
 import {Room, RoomMember, User} from 'matrix-js-sdk';
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 446abede3d..737ac579f4 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -5,7 +5,7 @@ import lolex from 'lolex';
 
 import * as TestUtils from '../../../test-utils';
 
-import sdk from '../../../../src/index';
+import sdk from '../../../skinned-sdk';
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import { DragDropContext } from 'react-beautiful-dnd';
 
@@ -177,7 +177,7 @@ describe('RoomList', () => {
 
     function itDoesCorrectOptimisticUpdatesForDraggedRoomTiles() {
         // TODO: Re-enable dragging tests when we support dragging again.
-        xdescribe('does correct optimistic update when dragging from', () => {
+        describe.skip('does correct optimistic update when dragging from', () => {
             it('rooms to people', () => {
                 expectCorrectMove(undefined, 'im.vector.fake.direct');
             });
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 7b7c554a2c..a89508fe98 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -4,12 +4,13 @@ import ReactDOM from 'react-dom';
 import jest from 'jest-mock';
 import * as testUtils from '../../../test-utils';
 import sdk from '../../../skinned-sdk';
-const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
 import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 import SettingsStore from '../../../../src/settings/SettingsStore';
 
 
 describe.skip('RoomSettings', () => {
+    const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
+
     let parentDiv = null;
     let client = null;
     let roomSettings = null;
diff --git a/test/i18n-test/languageHandler-test.js b/test/i18n-test/languageHandler-test.js
index fa6969b715..7968186e9e 100644
--- a/test/i18n-test/languageHandler-test.js
+++ b/test/i18n-test/languageHandler-test.js
@@ -9,9 +9,7 @@ describe('languageHandler', function() {
         testUtils.stubClient();
 
         languageHandler.setLanguage('en').then(done);
-        languageHandler.setMissingEntryGenerator(function(key) {
-            return key.split('|', 2)[1];
-        });
+        languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
     });
 
     it('translates a string to german', function() {
diff --git a/test/setupTests.js b/test/setupTests.js
new file mode 100644
index 0000000000..9c2d16a8df
--- /dev/null
+++ b/test/setupTests.js
@@ -0,0 +1,4 @@
+import * as languageHandler from "../src/languageHandler";
+
+languageHandler.setLanguage('en');
+languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 1d92a02562..83ec3d9c2e 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -16,7 +16,7 @@ describe('RoomViewStore', function() {
     });
 
     it('can be used to view a room by ID and join', function(done) {
-        peg.get().joinRoom = (roomAddress) => {
+        peg.get().joinRoom = async (roomAddress) => {
             expect(roomAddress).toBe("!randomcharacters:aser.ver");
             done();
         };
@@ -28,7 +28,7 @@ describe('RoomViewStore', function() {
 
     it('can be used to view a room by alias and join', function(done) {
         peg.get().getRoomIdForAlias.mockResolvedValue({room_id: "!randomcharacters:aser.ver"});
-        peg.get().joinRoom = (roomAddress) => {
+        peg.get().joinRoom = async (roomAddress) => {
             expect(roomAddress).toBe("#somealias2:aser.ver");
             done();
         };
diff --git a/yarn.lock b/yarn.lock
index 1aa34972f2..7ea9ea5b24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -403,14 +403,6 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -439,11 +431,6 @@ acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
   integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -490,11 +477,6 @@ another-json@^0.2.0:
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw=
 
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
 ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -543,14 +525,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 append-transform@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
@@ -640,11 +614,6 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -711,7 +680,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.1.4, async@^2.5.0, async@^2.6.2:
+async@^2.1.4, async@^2.5.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -1485,11 +1454,6 @@ babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 bail@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
@@ -1507,21 +1471,11 @@ base-x@^3.0.2:
   dependencies:
     safe-buffer "^5.0.1"
 
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1542,13 +1496,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1559,22 +1506,12 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
 bluebird@^2.9.27:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
   integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
 
-bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -1589,22 +1526,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@^1.16.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1638,13 +1559,6 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1672,11 +1586,6 @@ browser-resolve@^1.11.3:
   dependencies:
     resolve "1.1.7"
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -1759,24 +1668,6 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -1801,11 +1692,6 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
 cacache@^12.0.0, cacache@^12.0.2:
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
@@ -1861,11 +1747,6 @@ caller-path@^2.0.0:
   dependencies:
     caller-callsite "^2.0.0"
 
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -1922,7 +1803,7 @@ chain-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
   integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
 
-chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2002,21 +1883,6 @@ chokidar@^2.0.2, chokidar@^2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
-  optionalDependencies:
-    fsevents "~2.1.1"
-
 chownr@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
@@ -2087,15 +1953,6 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 clone-regexp@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f"
@@ -2139,11 +1996,6 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-colors@^1.1.0, colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2151,11 +2003,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
 commander@^2.11.0, commander@^2.20.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2176,26 +2023,11 @@ commonmark@^0.28.1:
     minimist "~ 1.2.0"
     string.prototype.repeat "^0.2.0"
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2226,16 +2058,6 @@ concurrently@^4.0.1:
     tree-kill "^1.2.1"
     yargs "^12.0.5"
 
-connect@^3.6.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -2251,7 +2073,7 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-type@^1.0.2, content-type@~1.0.4:
+content-type@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
@@ -2263,11 +2085,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1,
   dependencies:
     safe-buffer "~5.1.1"
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2418,11 +2235,6 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
-
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -2449,31 +2261,26 @@ date-fns@^1.30.1:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-format@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
 date-names@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.1.0, debug@~3.1.0:
+debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
+debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2561,11 +2368,6 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2596,11 +2398,6 @@ detect-newline@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
-
 diff-dom@^4.1.3:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-4.1.6.tgz#ecd20f4b34703d777b7956790fc7e28e5ff3fece"
@@ -2614,7 +2411,7 @@ diff-match-patch@^1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff@3.5.0, diff@^3.2.0:
+diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -2661,16 +2458,6 @@ dom-helpers@^3.2.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-dom-serialize@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -2754,11 +2541,6 @@ ecc-jsbn@~0.1.1:
   dependencies:
     nan "^1.6.2"
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
 electron-to-chromium@^1.3.317:
   version "1.3.322"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
@@ -2802,11 +2584,6 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -2821,46 +2598,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
-  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
-engine.io@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
-  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
-
 enhanced-resolve@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
@@ -2879,11 +2616,6 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
-
 entities@^1.1.1, "entities@~ 1.1.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -2980,12 +2712,12 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3187,11 +2919,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
-  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
-
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@@ -3504,26 +3231,6 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -3637,13 +3344,6 @@ focus-visible@^5.0.2:
   resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.0.2.tgz#4fae9cf40458b73c10701c9774c462e3ccd53caf"
   integrity sha512-zT2fj/bmOgEBjqGbURGlowTmCwsIs3bRDMr/sFZz8Ly7VkEiwuCn9swNTL3pPuf8Oua2de7CLuKdnuNajWdDsQ==
 
-follow-redirects@^1.0.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f"
-  integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==
-  dependencies:
-    debug "^3.0.0"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3690,22 +3390,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-access@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
-  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
-  dependencies:
-    null-check "^1.0.0"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -3749,11 +3433,6 @@ fsevents@^1.2.3:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3866,13 +3545,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -3883,18 +3555,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^5.0.14:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -3990,16 +3650,11 @@ gonzales-pe@^4.2.3:
   dependencies:
     minimist "1.1.x"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -4036,18 +3691,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
@@ -4127,11 +3770,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
 highlight.js@^9.15.8:
   version "9.16.2"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
@@ -4209,17 +3847,6 @@ http-cache-semantics@^3.8.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
@@ -4228,15 +3855,6 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy@^1.13.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
-  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4502,13 +4120,6 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
@@ -4689,7 +4300,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -4747,11 +4358,6 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -4873,23 +4479,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -5443,13 +5037,6 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5468,98 +5055,6 @@ jsx-ast-utils@^2.2.3:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
-karma-chrome-launcher@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
-  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
-  dependencies:
-    fs-access "^1.0.0"
-    which "^1.2.1"
-
-karma-cli@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-1.0.1.tgz#ae6c3c58a313a1d00b45164c455b9b86ce17f960"
-  integrity sha1-rmw8WKMTodALRRZMRVubhs4X+WA=
-  dependencies:
-    resolve "^1.1.6"
-
-karma-logcapture-reporter@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz#bf1b0b1c915e0de295a15fe2f0179d4281bacddc"
-  integrity sha1-vxsLHJFeDeKVoV/i8BedQoG6zdw=
-
-karma-mocha@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-1.3.0.tgz#eeaac7ffc0e201eb63c467440d2b69c7cf3778bf"
-  integrity sha1-7qrH/8DiAetjxGdEDStpx883eL8=
-  dependencies:
-    minimist "1.2.0"
-
-karma-sourcemap-loader@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
-  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
-  dependencies:
-    graceful-fs "^4.1.2"
-
-karma-spec-reporter@^0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz#4830dc7148a155c7d7a186e632339a0d80fadec3"
-  integrity sha1-SDDccUihVcfXoYbmMjOaDYD63sM=
-  dependencies:
-    colors "^1.1.2"
-
-karma-summary-reporter@^1.5.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma-summary-reporter/-/karma-summary-reporter-1.7.1.tgz#ff751e6e3950a3b3f2ae96a39b10fdc87938c4db"
-  integrity sha512-1I1njfSKFwogQrfDDyjyXKUeysYdD7SXoXBz2o7oK7RpiGsteyBoV3+6J5qFLcT0D8VGxLzYCsU0BbyeeHIl0g==
-  dependencies:
-    chalk "^1.1.3 || 2.x"
-
-karma-webpack@^4.0.0-beta.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.2.tgz#23219bd95bdda853e3073d3874d34447c77bced0"
-  integrity sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==
-  dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.1.0"
-    neo-async "^2.6.1"
-    schema-utils "^1.0.0"
-    source-map "^0.7.3"
-    webpack-dev-middleware "^3.7.0"
-
-karma@^4.0.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.1.tgz#6d9aaab037a31136dc074002620ee11e8c2e32ab"
-  integrity sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^3.0.2"
-    chokidar "^3.0.0"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.14"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5748,17 +5243,6 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log4js@^4.0.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
-  dependencies:
-    date-format "^2.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.0"
-    rfdc "^1.1.4"
-    streamroller "^1.0.6"
-
 loglevel@^1.6.4:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
@@ -5789,14 +5273,6 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lru-cache@4.1.x:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5944,11 +5420,6 @@ mdast-util-compact@^1.0.0:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -6072,18 +5543,13 @@ mime-db@1.42.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
   integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
-mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.25"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
   integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
   dependencies:
     mime-db "1.42.0"
 
-mime@^2.3.1, mime@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
-
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -6104,7 +5570,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6178,30 +5644,13 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
-mocha@^5.0.5:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6270,11 +5719,6 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
 neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6400,7 +5844,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
+normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -6445,11 +5889,6 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-null-check@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
-
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -6475,11 +5914,6 @@ object-assign@^4.1.0, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -6569,13 +6003,6 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6791,25 +6218,6 @@ parse5@4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -6899,11 +6307,6 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
-  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7167,11 +6570,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
 psl@^1.1.24:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.5.0.tgz#47fd1292def7fdb1e138cd78afa8814cebcf7b13"
@@ -7246,11 +6644,6 @@ pvutils@latest:
   resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
   integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
 
-qjobs@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
 qr.js@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
@@ -7263,11 +6656,6 @@ qrcode-react@^0.1.16:
   dependencies:
     qr.js "0.0.0"
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
 qs@^6.5.2, qs@^6.6.0:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
@@ -7329,21 +6717,6 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.0, range-parser@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -7534,13 +6907,6 @@ readdirp@^2.0.0, readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
-  dependencies:
-    picomatch "^2.0.4"
-
 realpath-native@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
@@ -7788,11 +7154,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
 reselect@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
@@ -7838,7 +7199,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -7863,11 +7224,6 @@ retry@^0.10.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rfdc@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
-  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
-
 rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -7875,7 +7231,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -8050,11 +7406,6 @@ setimmediate@^1.0.4, setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -8063,13 +7414,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8243,52 +7587,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    engine.io-client "~3.2.0"
-    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
-  dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
-
 socks-proxy-agent@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
@@ -8359,11 +7657,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 spawn-command@^0.0.2-1:
   version "0.0.2-1"
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
@@ -8465,11 +7758,6 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
 stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -8507,17 +7795,6 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
-  dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
-
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
@@ -8756,13 +8033,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@6.1.0, supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
@@ -8919,7 +8189,7 @@ tmatch@^2.0.1:
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
   integrity sha1-DFYkbzPzDaG409colauvFmYPOM8=
 
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
@@ -8931,11 +8201,6 @@ tmpl@1.0.x:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -8966,13 +8231,6 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -8983,11 +8241,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
 tough-cookie@^2.3.3, tough-cookie@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -9077,14 +8330,6 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.17:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
 type-of@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972"
@@ -9108,11 +8353,6 @@ uglify-js@^3.1.4:
     commander "~2.20.3"
     source-map "~0.6.1"
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
 unherit@^1.0.4:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449"
@@ -9214,16 +8454,6 @@ unist-util-visit@^1.1.0:
   dependencies:
     unist-util-visit-parents "^2.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -9283,14 +8513,6 @@ user-home@^1.1.1:
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
   integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
 
-useragent@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -9318,11 +8540,6 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
 uuid@^3.3.2:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
@@ -9397,11 +8614,6 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
@@ -9477,25 +8689,6 @@ webpack-cli@^3.1.1:
     v8-compile-cache "2.0.3"
     yargs "13.2.4"
 
-webpack-dev-middleware@^3.7.0:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
 webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
@@ -9609,7 +8802,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -9685,15 +8878,6 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
-  dependencies:
-    async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
-
 x-is-string@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
@@ -9704,11 +8888,6 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
-
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -9724,11 +8903,6 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -9817,11 +8991,6 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"

From 802092bf9a6196324a9cc579735b6e6d2d74c704 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 11:53:18 +0000
Subject: [PATCH 0034/3235] All tests passing locally. We no longer need Chrome
 in buildkite

---
 .buildkite/pipeline.yaml          | 10 +---------
 test/stores/RoomViewStore-test.js | 15 ++++++++-------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index be0d5e404c..8630271ce0 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -27,18 +27,12 @@ steps:
           image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
           propagate-environment: true
 
-  - label: ":karma: Tests"
+  - label: ":jest: Tests"
     agents:
       # We use a medium sized instance instead of the normal small ones because
       # webpack loves to gorge itself on resources.
       queue: "medium"
     command:
-      # Install chrome
-      - "echo '--- Installing Chrome'"
-      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-      - "apt-get update"
-      - "apt-get install -y google-chrome-stable"
       # Run tests
       # TODO: Remove hacky chmod for BuildKite
       - "chmod +x ./scripts/ci/*.sh"
@@ -47,8 +41,6 @@ steps:
       - "./scripts/ci/install-deps.sh"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/unit-tests.sh"
-    env:
-      CHROME_BIN: "/usr/bin/google-chrome-stable"
     plugins:
       - docker#v3.0.1:
           image: "node:10"
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index 83ec3d9c2e..f227ae69ab 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -27,13 +27,7 @@ describe('RoomViewStore', function() {
     });
 
     it('can be used to view a room by alias and join', function(done) {
-        peg.get().getRoomIdForAlias.mockResolvedValue({room_id: "!randomcharacters:aser.ver"});
-        peg.get().joinRoom = async (roomAddress) => {
-            expect(roomAddress).toBe("#somealias2:aser.ver");
-            done();
-        };
-
-        RoomViewStore.addListener(() => {
+        const token = RoomViewStore.addListener(() => {
             // Wait until the room alias has resolved and the room ID is
             if (!RoomViewStore.isRoomLoading()) {
                 expect(RoomViewStore.getRoomId()).toBe("!randomcharacters:aser.ver");
@@ -42,6 +36,13 @@ describe('RoomViewStore', function() {
             }
         });
 
+        peg.get().getRoomIdForAlias.mockResolvedValue({room_id: "!randomcharacters:aser.ver"});
+        peg.get().joinRoom = async (roomAddress) => {
+            token.remove(); // stop RVS listener
+            expect(roomAddress).toBe("#somealias2:aser.ver");
+            done();
+        };
+
         dispatch({ action: 'view_room', room_alias: '#somealias2:aser.ver' });
     });
 });

From c3415d21217c0e1e6ca802345b8428dc49b4cb34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 12:09:01 +0000
Subject: [PATCH 0035/3235] delint

---
 test/components/views/elements/MemberEventListSummary-test.js | 1 -
 test/components/views/groups/GroupMemberList-test.js          | 1 -
 test/test-utils.js                                            | 2 --
 3 files changed, 4 deletions(-)

diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index a68c39eeeb..7b40916dda 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -2,7 +2,6 @@ import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ShallowRenderer from "react-test-renderer/shallow";
 import sdk from '../../../skinned-sdk';
-import * as languageHandler from '../../../../src/languageHandler';
 import * as testUtils from '../../../test-utils';
 
 // Give MELS a matrixClient in its child context
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index fd96c9f331..2b20ce0067 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -24,7 +24,6 @@ import sdk from "../../../skinned-sdk";
 import Matrix from "matrix-js-sdk";
 
 import * as TestUtils from "../../../test-utils";
-import * as languageHandler from "../../../../src/languageHandler";
 const { waitForUpdate } = TestUtils;
 
 const GroupMemberList = sdk.getComponent("views.groups.GroupMemberList");
diff --git a/test/test-utils.js b/test/test-utils.js
index 407791e9c3..13248c2851 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -22,8 +22,6 @@ export function getRenderer() {
  * TODO: once the components are updated to get their MatrixClients from
  * the react context, we can get rid of this and just inject a test client
  * via the context instead.
- *
- * @returns {sinon.Sandbox}; remember to call sandbox.restore afterwards.
  */
 export function stubClient() {
     const client = createTestClient();

From 386d6ec055c2229dd1642785a4aaad8f4522c20d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 12:16:40 +0000
Subject: [PATCH 0036/3235] we don't need to install riot-web for react-sdk
 unit tests

---
 .buildkite/pipeline.yaml |   2 +-
 karma.conf.js            | 228 ---------------------------------------
 scripts/ci/unit-tests.sh |  10 --
 3 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 karma.conf.js
 delete mode 100755 scripts/ci/unit-tests.sh

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 8630271ce0..e3770f53c7 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -40,7 +40,7 @@ steps:
       - "echo '--- Installing Dependencies'"
       - "./scripts/ci/install-deps.sh"
       - "echo '+++ Running Tests'"
-      - "./scripts/ci/unit-tests.sh"
+      - "yarn test"
     plugins:
       - docker#v3.0.1:
           image: "node:10"
diff --git a/karma.conf.js b/karma.conf.js
deleted file mode 100644
index d55be049bb..0000000000
--- a/karma.conf.js
+++ /dev/null
@@ -1,228 +0,0 @@
-// karma.conf.js - the config file for karma, which runs our tests.
-
-var path = require('path');
-var fs = require('fs');
-
-/*
- * We use webpack to build our tests. It's a pain to have to wait for webpack
- * to build everything; however it's the easiest way to load our dependencies
- * from node_modules.
- *
- * If you run karma in multi-run mode (with `yarn test-multi`), it will watch
- * the tests for changes, and webpack will rebuild using a cache. This is much quicker
- * than a clean rebuild.
- */
-
-// the name of the test file. By default, a special file which runs all tests.
-//
-// TODO: this could be a pattern, and karma would run each file, with a
-// separate webpack bundle for each file. But then we get a separate instance
-// of the sdk, and each of the dependencies, for each test file, and everything
-// gets very confused. Can we persuade webpack to put all of the dependencies
-// in a 'common' bundle?
-//
-var testFile = process.env.KARMA_TEST_FILE || 'test/all-tests.js';
-
-
-process.env.PHANTOMJS_BIN = 'node_modules/.bin/phantomjs';
-
-function fileExists(name) {
-    try {
-        fs.statSync(name);
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-
-// try find the gemini-scrollbar css in an version-agnostic way
-var gsCss = 'node_modules/gemini-scrollbar/gemini-scrollbar.css';
-if (!fileExists(gsCss)) {
-    gsCss = 'node_modules/react-gemini-scrollbar/'+gsCss;
-}
-
-
-module.exports = function (config) {
-    config.set({
-        // frameworks to use
-        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-        frameworks: ['mocha'],
-
-        // list of files / patterns to load in the browser
-        files: [
-            testFile,
-            gsCss,
-
-            // some images to reduce noise from the tests
-            {pattern: 'test/img/*', watched: false, included: false,
-             served: true, nocache: false},
-            // translation files
-            {pattern: 'src/i18n/strings/*', watcheed: false, included: false, served: true},
-            {pattern: 'test/i18n/*', watched: false, included: false, served: true},
-        ],
-
-        proxies: {
-            // redirect img links to the karma server
-            "/img/": "/base/test/img/",
-            // special languages.json file for the tests
-            "/i18n/languages.json": "/base/test/i18n/languages.json",
-            // and redirect i18n requests
-            "/i18n/": "/base/src/i18n/strings/",
-        },
-
-        // list of files to exclude
-        //
-        // This doesn't work. It turns out that it's webpack which does the
-        // watching of the /test directory (karma only watches `testFile`
-        // itself). Webpack watches the directory so that it can spot
-        // new tests, which is fair enough; unfortunately it triggers a rebuild
-        // every time a lockfile is created in that directory, and there
-        // doesn't seem to be any way to tell webpack to ignore particular
-        // files in a watched directory.
-        //
-        // exclude: [
-        //     '**/.#*'
-        // ],
-
-        // preprocess matching files before serving them to the browser
-        // available preprocessors:
-        // https://npmjs.org/browse/keyword/karma-preprocessor
-        preprocessors: {
-            'test/**/*.js': ['webpack', 'sourcemap']
-        },
-
-        // test results reporter to use
-        // possible values: 'dots', 'progress'
-        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['logcapture', 'spec', 'summary'],
-
-        specReporter: {
-            suppressErrorSummary: false, // do print error summary
-            suppressFailed: false, // do print information about failed tests
-            suppressPassed: false, // do print information about passed tests
-            showSpecTiming: true, // print the time elapsed for each spec
-        },
-
-        client: {
-            captureLogs: true,
-        },
-
-        // web server port
-        port: 9876,
-
-        // enable / disable colors in the output (reporters and logs)
-        colors: true,
-
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR ||
-        // config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-        //
-        // This is strictly for logs that would be generated by the browser itself and we
-        // don't want to log about missing images, which are emitted on LOG_WARN.
-        logLevel: config.LOG_ERROR,
-
-        // enable / disable watching file and executing tests whenever any file
-        // changes
-        autoWatch: true,
-
-        // start these browsers
-        // available browser launchers:
-        // https://npmjs.org/browse/keyword/karma-launcher
-        browsers: [
-            'Chrome',
-            //'PhantomJS',
-            //'ChromeHeadless',
-        ],
-
-        customLaunchers: {
-            'VectorChromeHeadless': {
-                base: 'Chrome',
-                flags: [
-                    '--no-sandbox',
-                    // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
-                    '--headless',
-                    '--disable-gpu',
-                    // Without a remote debugging port, Google Chrome exits immediately.
-                    '--remote-debugging-port=9222',
-                ],
-            }
-        },
-
-        // Continuous Integration mode
-        // if true, Karma captures browsers, runs the tests and exits
-        // singleRun: false,
-
-        // Concurrency level
-        // how many browser should be started simultaneous
-        concurrency: Infinity,
-
-        webpack: {
-            module: {
-                rules: [
-                    {
-                        test: /\.js$/, loader: "babel-loader",
-                        include: [path.resolve('./src'),
-                                  path.resolve('./test'),
-                                 ]
-                    },
-                    {
-                        test: /\.(gif|png|svg|ttf|woff2)$/,
-                        loader: 'file-loader',
-                    },
-                ],
-                noParse: [
-                    // for cross platform compatibility use [\\\/] as the path separator
-                    // this ensures that the regex trips on both Windows and *nix
-
-                    // don't parse the languages within highlight.js. They
-                    // cause stack overflows
-                    // (https://github.com/webpack/webpack/issues/1721), and
-                    // there is no need for webpack to parse them - they can
-                    // just be included as-is.
-                    /highlight\.js[\\\/]lib[\\\/]languages/,
-
-                    // olm takes ages for webpack to process, and it's already heavily
-                    // optimised, so there is little to gain by us uglifying it.
-                    /olm[\\\/](javascript[\\\/])?olm\.js$/,
-
-                    // also disable parsing for sinon, because it
-                    // tries to do voodoo with 'require' which upsets
-                    // webpack (https://github.com/webpack/webpack/issues/304)
-                    /sinon[\\\/]pkg[\\\/]sinon\.js$/,
-                ],
-            },
-            resolve: {
-                alias: {
-                    // alias any requires to the react module to the one in our
-                    // path, otherwise we tend to get the react source included
-                    // twice when using `npm link` / `yarn link`.
-                    react: path.resolve('./node_modules/react'),
-
-                    'matrix-react-sdk': path.resolve('test/skinned-sdk.js'),
-                    'sinon': 'sinon/pkg/sinon.js',
-                },
-                modules: [
-                    path.resolve('./test'),
-                    "node_modules"
-                ],
-            },
-            devtool: 'inline-source-map',
-            externals: {
-                // Don't try to bundle electron: leave it as a commonjs dependency
-                // (the 'commonjs' here means it will output a 'require')
-                "electron": "commonjs electron",
-            },
-            // make sure we're flagged as development to avoid wasting time optimising
-            mode: 'development',
-        },
-
-        webpackMiddleware: {
-            stats: {
-                // don't fill the console up with a mahoosive list of modules
-                chunks: false,
-            },
-        },
-
-        browserNoActivityTimeout: 15000,
-    });
-};
diff --git a/scripts/ci/unit-tests.sh b/scripts/ci/unit-tests.sh
deleted file mode 100755
index 5b86190963..0000000000
--- a/scripts/ci/unit-tests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-# script which is run by the CI build (after `yarn test`).
-#
-# clones riot-web develop and runs the tests against our version of react-sdk.
-
-set -ev
-
-scripts/ci/build.sh
-yarn test

From f06a94388fbfa5f190c9b907e01c75ec20aef80b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 12:22:11 +0000
Subject: [PATCH 0037/3235] fix yarn test for bashy things

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

diff --git a/package.json b/package.json
index 05129cb7c0..688839e3f8 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "stylelint": "stylelint 'res/css/**/*.scss'",
     "clean": "rimraf lib",
     "prepare": "yarn clean && yarn build && git rev-parse HEAD > git-revision.txt",
-    "test": "jest --testMatch **/*-test.js",
+    "test": "jest --testMatch '**/*-test.js'",
     "e2etests": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {

From bcba9a3e5081573c53fd135117749cafc68f0be3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 12:23:51 +0000
Subject: [PATCH 0038/3235] fix yarn test for bashy things v2

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

diff --git a/package.json b/package.json
index 688839e3f8..a06c8dbcd3 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "stylelint": "stylelint 'res/css/**/*.scss'",
     "clean": "rimraf lib",
     "prepare": "yarn clean && yarn build && git rev-parse HEAD > git-revision.txt",
-    "test": "jest --testMatch '**/*-test.js'",
+    "test": "jest",
     "e2etests": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
@@ -157,6 +157,7 @@
     "webpack-cli": "^3.1.1"
   },
   "jest": {
+    "testMatch": ["**/*-test.js"],
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"

From 409a111b02c548cfe1fa1ecee3104972bfb408cb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 12:42:47 +0000
Subject: [PATCH 0039/3235] wait additional tick

---
 package.json                                 | 2 +-
 test/components/structures/GroupView-test.js | 2 +-
 test/utils/MegolmExportEncryption-test.js    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a06c8dbcd3..aa2cba73fa 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "webpack-cli": "^3.1.1"
   },
   "jest": {
-    "testMatch": ["**/*-test.js"],
+    "testMatch": ["test/**/*-test.js"],
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index 31e7c26c9a..5f7e000aac 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -302,7 +302,7 @@ describe('GroupView', function() {
 
     it('should show a RoomDetailList after a successful /summary & /rooms (no rooms returned)', function() {
         const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 4).then(() => {
+        const prom = waitForUpdate(groupView, 5).then(() => {
             const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList');
             const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList);
             expect(roomDetailListElement).toBeTruthy();
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index b3a9782ce6..1fd305b0a6 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -74,7 +74,6 @@ describe('MegolmExportEncryption', function() {
     let MegolmExportEncryption;
 
     beforeAll(() => {
-        // window.crypto = { subtle: crypto.subtle, getRandomValues };
         window.crypto = { subtle: webCrypto.subtle, getRandomValues };
         MegolmExportEncryption = require("../../src/utils/MegolmExportEncryption");
     });

From a2246374f12cb159f1e81d4a279d99f820b99711 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 13:05:18 +0000
Subject: [PATCH 0040/3235] correct testMatch so it doesn't try run js-sdk
 tests

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

diff --git a/package.json b/package.json
index aa2cba73fa..33fd5a3236 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "webpack-cli": "^3.1.1"
   },
   "jest": {
-    "testMatch": ["test/**/*-test.js"],
+    "testMatch": ["<rootDir>/test/**/*-test.js"],
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"

From b9e22f8141599d48a7155ef23eab053e1768c1f9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 13:11:30 +0000
Subject: [PATCH 0041/3235] add delay

---
 test/components/views/dialogs/InteractiveAuthDialog-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index b047d6073b..610ad7c9f5 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -103,7 +103,7 @@ describe('InteractiveAuthDialog', function() {
             }));
             // let the request complete
             return sleep(1);
-        }).then(() => {
+        }).then(sleep(1)).then(() => {
             expect(onFinished).toBeCalledTimes(1);
             expect(onFinished).toBeCalledWith(true, {a: 1});
         });

From 2e8d66fa3635c6f7bd97be1362d4f5f86f42865b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 16:54:59 +0000
Subject: [PATCH 0042/3235] Null-guard member mention pills for rooms you have
 left (notif panel)

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

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 12830488b1..a065602f68 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -127,7 +127,7 @@ const Pill = createReactClass({
             }
                 break;
             case Pill.TYPE_USER_MENTION: {
-                const localMember = nextProps.room.getMember(resourceId);
+                const localMember = nextProps.room ? nextProps.room.getMember(resourceId) : undefined;
                 member = localMember;
                 if (!localMember) {
                     member = new RoomMember(null, resourceId);

From 937b32663c49c7cd69c211b83df52e56a61b352f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 17:26:12 +0000
Subject: [PATCH 0043/3235] Migrate away from Legacy React Contexts

---
 src/components/structures/EmbeddedPage.js     |   8 +-
 src/components/structures/LeftPanel.js        |   5 -
 src/components/structures/LoggedInView.js     |  55 ++-
 src/components/structures/MatrixChat.js       |  10 -
 src/components/structures/MyGroups.js         |   9 +-
 src/components/structures/RightPanel.js       |  18 +-
 src/components/structures/RoomDirectory.js    |  11 +-
 src/components/structures/RoomView.js         |  99 ++---
 src/components/structures/TagPanel.js         |  21 +-
 src/components/views/avatars/BaseAvatar.js    |  10 +-
 .../avatars/MemberStatusMessageAvatar.js      |   4 +-
 .../GroupInviteTileContextMenu.js             |   4 +-
 .../context_menus/StatusMessageContextMenu.js |   4 +-
 .../views/context_menus/TagTileContextMenu.js |   8 +-
 src/components/views/dialogs/BaseDialog.js    |  73 ++-
 .../views/dialogs/BugReportDialog.js          |   4 +-
 .../views/dialogs/DeactivateAccountDialog.js  |   4 +-
 .../views/dialogs/DevtoolsDialog.js           | 131 +++---
 .../views/dialogs/ReportEventDialog.js        |   4 +-
 .../views/elements/EditableTextContainer.js   |   6 +-
 src/components/views/elements/Flair.js        |  13 +-
 src/components/views/elements/Pill.js         |  34 +-
 src/components/views/elements/ReplyThread.js  |  17 +-
 .../views/elements/SyntaxHighlight.js         |   4 +-
 src/components/views/elements/TagTile.js      |  10 +-
 .../views/groups/GroupInviteTile.js           |  10 +-
 .../views/groups/GroupMemberInfo.js           |  12 +-
 .../views/groups/GroupMemberTile.js           |   8 +-
 src/components/views/groups/GroupRoomInfo.js  |   8 +-
 src/components/views/groups/GroupRoomTile.js  |   8 +-
 src/components/views/groups/GroupTile.js      |   9 +-
 .../views/groups/GroupUserSettings.js         |   9 +-
 src/components/views/messages/MFileBody.js    |  10 +-
 src/components/views/messages/MImageBody.js   |  20 +-
 .../views/messages/MessageActionBar.js        |  10 +-
 .../views/messages/SenderProfile.js           |  14 +-
 src/components/views/right_panel/UserInfo.js  | 414 +++++++++---------
 .../room_settings/RelatedGroupSettings.js     |  11 +-
 .../views/rooms/BasicMessageComposer.js       |   4 +-
 .../views/rooms/EditMessageComposer.js        |  17 +-
 src/components/views/rooms/EventTile.js       |  23 +-
 src/components/views/rooms/MemberInfo.js      |  79 ++--
 src/components/views/rooms/MessageComposer.js |   8 +-
 .../views/rooms/MessageComposerInput.js       |   4 +-
 src/components/views/rooms/ReplyPreview.js    |   4 +-
 .../views/rooms/SendMessageComposer.js        |  16 +-
 .../views/rooms/SlateMessageComposer.js       |   8 +-
 src/components/views/settings/DevicesPanel.js |   4 +-
 .../views/settings/DevicesPanelEntry.js       |   4 +-
 .../tabs/room/GeneralRoomSettingsTab.js       |  21 +-
 .../tabs/user/FlairUserSettingsTab.js         |  17 -
 .../MatrixClientContext.js}                   |  18 +-
 src/contexts/RoomContext.js                   |  25 ++
 .../structures/MessagePanel-test.js           |  23 +-
 test/test-utils.js                            |  17 +-
 55 files changed, 651 insertions(+), 750 deletions(-)
 rename src/{utils/withLegacyMatrixClient.js => contexts/MatrixClientContext.js} (51%)
 create mode 100644 src/contexts/RoomContext.js

diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index ecc01a443d..63767255e2 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -26,8 +26,8 @@ import sanitizeHtml from 'sanitize-html';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 import MatrixClientPeg from '../../MatrixClientPeg';
-import { MatrixClient } from 'matrix-js-sdk';
 import classnames from 'classnames';
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 export default class EmbeddedPage extends React.PureComponent {
     static propTypes = {
@@ -39,9 +39,7 @@ export default class EmbeddedPage extends React.PureComponent {
         scrollbar: PropTypes.bool,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
+    static contextType = MatrixClientContext;
 
     constructor(props) {
         super(props);
@@ -104,7 +102,7 @@ export default class EmbeddedPage extends React.PureComponent {
 
     render() {
         // HACK: Workaround for the context's MatrixClient not updating.
-        const client = this.context.matrixClient || MatrixClientPeg.get();
+        const client = this.context || MatrixClientPeg.get();
         const isGuest = client ? client.isGuest() : true;
         const className = this.props.className;
         const classes = classnames({
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a0ad2b5c81..dd842be1ac 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -19,7 +19,6 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { MatrixClient } from 'matrix-js-sdk';
 import { Key } from '../../Keyboard';
 import sdk from '../../index';
 import dis from '../../dispatcher';
@@ -39,10 +38,6 @@ const LeftPanel = createReactClass({
         collapsed: PropTypes.bool.isRequired,
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    },
-
     getInitialState: function() {
         return {
             searchFilter: '',
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index df2eebd7c9..7261af3bf0 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -38,6 +38,7 @@ import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
 import ResizeHandle from '../views/elements/ResizeHandle';
 import {Resizer, CollapseDistributor} from '../../resizer';
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -77,21 +78,6 @@ const LoggedInView = createReactClass({
         // and lots and lots of other stuff.
     },
 
-    childContextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-        authCache: PropTypes.object,
-    },
-
-    getChildContext: function() {
-        return {
-            matrixClient: this._matrixClient,
-            authCache: {
-                auth: {},
-                lastUpdate: 0,
-            },
-        };
-    },
-
     getInitialState: function() {
         return {
             // use compact timeline view
@@ -631,21 +617,30 @@ const LoggedInView = createReactClass({
         }
 
         return (
-            <div onPaste={this._onPaste} onKeyDown={this._onReactKeyDown} className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers} onMouseDown={this._onMouseDown} onMouseUp={this._onMouseUp}>
-                { topBar }
-                <ToastContainer />
-                <DragDropContext onDragEnd={this._onDragEnd}>
-                    <div ref={this._setResizeContainerRef} className={bodyClasses}>
-                        <LeftPanel
-                            resizeNotifier={this.props.resizeNotifier}
-                            collapsed={this.props.collapseLhs || false}
-                            disabled={this.props.leftDisabled}
-                        />
-                        <ResizeHandle />
-                        { pageElement }
-                    </div>
-                </DragDropContext>
-            </div>
+            <MatrixClientContext.Provider value={this._matrixClient}>
+                <div
+                    onPaste={this._onPaste}
+                    onKeyDown={this._onReactKeyDown}
+                    className='mx_MatrixChat_wrapper'
+                    aria-hidden={this.props.hideToSRUsers}
+                    onMouseDown={this._onMouseDown}
+                    onMouseUp={this._onMouseUp}
+                >
+                    { topBar }
+                    <ToastContainer />
+                    <DragDropContext onDragEnd={this._onDragEnd}>
+                        <div ref={this._setResizeContainerRef} className={bodyClasses}>
+                            <LeftPanel
+                                resizeNotifier={this.props.resizeNotifier}
+                                collapsed={this.props.collapseLhs || false}
+                                disabled={this.props.leftDisabled}
+                            />
+                            <ResizeHandle />
+                            { pageElement }
+                        </div>
+                    </DragDropContext>
+                </div>
+            </MatrixClientContext.Provider>
         );
     },
 });
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 82a682f9ab..d9ff16d2f8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -150,16 +150,6 @@ export default createReactClass({
         makeRegistrationUrl: PropTypes.func.isRequired,
     },
 
-    childContextTypes: {
-        appConfig: PropTypes.object,
-    },
-
-    getChildContext: function() {
-        return {
-            appConfig: this.props.config,
-        };
-    },
-
     getInitialState: function() {
         const s = {
             // the master view we are showing.
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 63ae14ba09..d957e76dfb 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -17,12 +17,11 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../index';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 export default createReactClass({
     displayName: 'MyGroups',
@@ -34,8 +33,8 @@ export default createReactClass({
         };
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     componentWillMount: function() {
@@ -47,7 +46,7 @@ export default createReactClass({
     },
 
     _fetch: function() {
-        this.context.matrixClient.getJoinedGroups().then((result) => {
+        this.context.getJoinedGroups().then((result) => {
             this.setState({groups: result.groups, error: null});
         }, (err) => {
             if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 1745c9d7dc..7bd3172faa 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -23,13 +23,13 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import sdk from '../../index';
 import dis from '../../dispatcher';
-import { MatrixClient } from 'matrix-js-sdk';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
 import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 export default class RightPanel extends React.Component {
     static get propTypes() {
@@ -40,14 +40,10 @@ export default class RightPanel extends React.Component {
         };
     }
 
-    static get contextTypes() {
-        return {
-            matrixClient: PropTypes.instanceOf(MatrixClient),
-        };
-    }
+    static contextType = MatrixClientContext;
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.state = {
             phase: this._getPhaseFromProps(),
             isUserPrivilegedInGroup: null,
@@ -93,15 +89,15 @@ export default class RightPanel extends React.Component {
 
     componentWillMount() {
         this.dispatcherRef = dis.register(this.onAction);
-        const cli = this.context.matrixClient;
+        const cli = this.context;
         cli.on("RoomState.members", this.onRoomStateMember);
         this._initGroupStore(this.props.groupId);
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
-        if (this.context.matrixClient) {
-            this.context.matrixClient.removeListener("RoomState.members", this.onRoomStateMember);
+        if (this.context) {
+            this.context.removeListener("RoomState.members", this.onRoomStateMember);
         }
         this._unregisterGroupStore(this.props.groupId);
     }
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 2c885f7eb2..cec016c3cf 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -30,6 +30,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 160;
@@ -65,16 +66,6 @@ module.exports = createReactClass({
         };
     },
 
-    childContextTypes: {
-        matrixClient: PropTypes.object,
-    },
-
-    getChildContext: function() {
-        return {
-            matrixClient: MatrixClientPeg.get(),
-        };
-    },
-
     componentWillMount: function() {
         this._unmounted = false;
         this.nextBatch = null;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 739519a2b3..8d59e42c3e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -28,7 +28,6 @@ import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {Room} from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
 import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks';
 
@@ -55,6 +54,7 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import WidgetUtils from '../../utils/WidgetUtils';
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
+import RoomContext from "../../contexts/RoomContext";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -66,12 +66,6 @@ if (DEBUG) {
     debuglog = console.log.bind(console);
 }
 
-const RoomContext = PropTypes.shape({
-    canReact: PropTypes.bool.isRequired,
-    canReply: PropTypes.bool.isRequired,
-    room: PropTypes.instanceOf(Room),
-});
-
 module.exports = createReactClass({
     displayName: 'RoomView',
     propTypes: {
@@ -169,21 +163,6 @@ module.exports = createReactClass({
         };
     },
 
-    childContextTypes: {
-        room: RoomContext,
-    },
-
-    getChildContext: function() {
-        const {canReact, canReply, room} = this.state;
-        return {
-            room: {
-                canReact,
-                canReply,
-                room,
-            },
-        };
-    },
-
     componentWillMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("Room", this.onRoom);
@@ -1989,45 +1968,47 @@ module.exports = createReactClass({
             : null;
 
         return (
-            <main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref={this._roomView}>
-                <ErrorBoundary>
-                    <RoomHeader
-                        room={this.state.room}
-                        searchInfo={searchInfo}
-                        oobData={this.props.oobData}
-                        inRoom={myMembership === 'join'}
-                        onSearchClick={this.onSearchClick}
-                        onSettingsClick={this.onSettingsClick}
-                        onPinnedClick={this.onPinnedClick}
-                        onCancelClick={(aux && !hideCancel) ? this.onCancelClick : null}
-                        onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
-                        onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
-                        e2eStatus={this.state.e2eStatus}
-                    />
-                    <MainSplit
-                        panel={rightPanel}
-                        resizeNotifier={this.props.resizeNotifier}
-                    >
-                        <div className={fadableSectionClasses}>
-                            {auxPanel}
-                            <div className="mx_RoomView_timeline">
-                                {topUnreadMessagesBar}
-                                {jumpToBottom}
-                                {messagePanel}
-                                {searchResultsPanel}
-                            </div>
-                            <div className={statusBarAreaClass}>
-                                <div className="mx_RoomView_statusAreaBox">
-                                    <div className="mx_RoomView_statusAreaBox_line"></div>
-                                    {statusBar}
+            <RoomContext.Provider value={this.state}>
+                <main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref={this._roomView}>
+                    <ErrorBoundary>
+                        <RoomHeader
+                            room={this.state.room}
+                            searchInfo={searchInfo}
+                            oobData={this.props.oobData}
+                            inRoom={myMembership === 'join'}
+                            onSearchClick={this.onSearchClick}
+                            onSettingsClick={this.onSettingsClick}
+                            onPinnedClick={this.onPinnedClick}
+                            onCancelClick={(aux && !hideCancel) ? this.onCancelClick : null}
+                            onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
+                            onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
+                            e2eStatus={this.state.e2eStatus}
+                        />
+                        <MainSplit
+                            panel={rightPanel}
+                            resizeNotifier={this.props.resizeNotifier}
+                        >
+                            <div className={fadableSectionClasses}>
+                                {auxPanel}
+                                <div className="mx_RoomView_timeline">
+                                    {topUnreadMessagesBar}
+                                    {jumpToBottom}
+                                    {messagePanel}
+                                    {searchResultsPanel}
                                 </div>
+                                <div className={statusBarAreaClass}>
+                                    <div className="mx_RoomView_statusAreaBox">
+                                        <div className="mx_RoomView_statusAreaBox_line" />
+                                        {statusBar}
+                                    </div>
+                                </div>
+                                {previewBar}
+                                {messageComposer}
                             </div>
-                            {previewBar}
-                            {messageComposer}
-                        </div>
-                    </MainSplit>
-                </ErrorBoundary>
-            </main>
+                        </MainSplit>
+                    </ErrorBoundary>
+                </main>
+            </RoomContext.Provider>
         );
     },
 });
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index a758092dc8..081796cb85 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
@@ -28,12 +26,13 @@ import { _t } from '../../languageHandler';
 
 import { Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 const TagPanel = createReactClass({
     displayName: 'TagPanel',
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState() {
@@ -45,8 +44,8 @@ const TagPanel = createReactClass({
 
     componentWillMount: function() {
         this.unmounted = false;
-        this.context.matrixClient.on("Group.myMembership", this._onGroupMyMembership);
-        this.context.matrixClient.on("sync", this._onClientSync);
+        this.context.on("Group.myMembership", this._onGroupMyMembership);
+        this.context.on("sync", this._onClientSync);
 
         this._tagOrderStoreToken = TagOrderStore.addListener(() => {
             if (this.unmounted) {
@@ -58,13 +57,13 @@ const TagPanel = createReactClass({
             });
         });
         // This could be done by anything with a matrix client
-        dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
+        dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
     },
 
     componentWillUnmount() {
         this.unmounted = true;
-        this.context.matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
-        this.context.matrixClient.removeListener("sync", this._onClientSync);
+        this.context.removeListener("Group.myMembership", this._onGroupMyMembership);
+        this.context.removeListener("sync", this._onClientSync);
         if (this._filterStoreToken) {
             this._filterStoreToken.remove();
         }
@@ -72,7 +71,7 @@ const TagPanel = createReactClass({
 
     _onGroupMyMembership() {
         if (this.unmounted) return;
-        dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
+        dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
     },
 
     _onClientSync(syncState, prevState) {
@@ -81,7 +80,7 @@ const TagPanel = createReactClass({
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
         if (reconnected) {
             // Load joined groups
-            dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
+            dis.dispatch(GroupActions.fetchJoinedGroups(this.context));
         }
     },
 
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 82db78615e..51375eb3fa 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -19,10 +19,10 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { MatrixClient } from 'matrix-js-sdk';
 import AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 module.exports = createReactClass({
     displayName: 'BaseAvatar',
@@ -40,8 +40,8 @@ module.exports = createReactClass({
         defaultToInitialLetter: PropTypes.bool, // true to add default url
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getDefaultProps: function() {
@@ -59,12 +59,12 @@ module.exports = createReactClass({
 
     componentDidMount() {
         this.unmounted = false;
-        this.context.matrixClient.on('sync', this.onClientSync);
+        this.context.on('sync', this.onClientSync);
     },
 
     componentWillUnmount() {
         this.unmounted = true;
-        this.context.matrixClient.removeListener('sync', this.onClientSync);
+        this.context.removeListener('sync', this.onClientSync);
     },
 
     componentWillReceiveProps: function(nextProps) {
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index ed73dd33b9..245d869419 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -38,8 +38,8 @@ export default class MemberStatusMessageAvatar extends React.Component {
         resizeMethod: 'crop',
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             hasStatus: this.hasStatus,
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 3feffbc0d9..3c0fd081b4 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -31,8 +31,8 @@ export default class GroupInviteTileContextMenu extends React.Component {
         onFinished: PropTypes.func,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this._onClickReject = this._onClickReject.bind(this);
     }
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index 441220c95e..31ba788ec7 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -27,8 +27,8 @@ export default class StatusMessageContextMenu extends React.Component {
         user: PropTypes.object,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             message: this.comittedStatusMessage,
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 1af0c9ae66..388d8aaf3d 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -17,12 +17,12 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
 import sdk from '../../../index';
 import {MenuItem} from "../../structures/ContextMenu";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export default class TagTileContextMenu extends React.Component {
     static propTypes = {
@@ -31,9 +31,7 @@ export default class TagTileContextMenu extends React.Component {
         onFinished: PropTypes.func.isRequired,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
+    static contextType = MatrixClientContext;
 
     constructor() {
         super();
@@ -51,7 +49,7 @@ export default class TagTileContextMenu extends React.Component {
     }
 
     _onRemoveClick() {
-        dis.dispatch(TagOrderActions.removeTag(this.context.matrixClient, this.props.tag));
+        dis.dispatch(TagOrderActions.removeTag(this.context, this.props.tag));
         this.props.onFinished();
     }
 
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 6ba0b322c4..a9f7fbf4b3 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -22,12 +22,11 @@ import FocusLock from 'react-focus-lock';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { MatrixClient } from 'matrix-js-sdk';
-
 import { Key } from '../../../Keyboard';
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 /**
  * Basic container for modal dialogs.
@@ -84,16 +83,6 @@ export default createReactClass({
         };
     },
 
-    childContextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    },
-
-    getChildContext: function() {
-        return {
-            matrixClient: this._matrixClient,
-        };
-    },
-
     componentWillMount() {
         this._matrixClient = MatrixClientPeg.get();
     },
@@ -122,36 +111,38 @@ export default createReactClass({
         }
 
         return (
-            <FocusLock
-                returnFocus={true}
-                lockProps={{
-                    onKeyDown: this._onKeyDown,
-                    role: "dialog",
-                    ["aria-labelledby"]: "mx_BaseDialog_title",
-                    // This should point to a node describing the dialog.
-                    // If we were about to completely follow this recommendation we'd need to
-                    // make all the components relying on BaseDialog to be aware of it.
-                    // So instead we will use the whole content as the description.
-                    // Description comes first and if the content contains more text,
-                    // AT users can skip its presentation.
-                    ["aria-describedby"]: this.props.contentId,
-                }}
-                className={classNames({
-                    [this.props.className]: true,
-                    'mx_Dialog_fixedWidth': this.props.fixedWidth,
-                })}
-            >
-                <div className={classNames('mx_Dialog_header', {
-                    'mx_Dialog_headerWithButton': !!this.props.headerButton,
-                })}>
-                    <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
-                        { this.props.title }
+            <MatrixClientContext.Provider value={this._matrixClient}>
+                <FocusLock
+                    returnFocus={true}
+                    lockProps={{
+                        onKeyDown: this._onKeyDown,
+                        role: "dialog",
+                        ["aria-labelledby"]: "mx_BaseDialog_title",
+                        // This should point to a node describing the dialog.
+                        // If we were about to completely follow this recommendation we'd need to
+                        // make all the components relying on BaseDialog to be aware of it.
+                        // So instead we will use the whole content as the description.
+                        // Description comes first and if the content contains more text,
+                        // AT users can skip its presentation.
+                        ["aria-describedby"]: this.props.contentId,
+                    }}
+                    className={classNames({
+                        [this.props.className]: true,
+                        'mx_Dialog_fixedWidth': this.props.fixedWidth,
+                    })}
+                >
+                    <div className={classNames('mx_Dialog_header', {
+                        'mx_Dialog_headerWithButton': !!this.props.headerButton,
+                    })}>
+                        <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
+                            { this.props.title }
+                        </div>
+                        { this.props.headerButton }
+                        { cancelButton }
                     </div>
-                    { this.props.headerButton }
-                    { cancelButton }
-                </div>
-                { this.props.children }
-            </FocusLock>
+                    { this.props.children }
+                </FocusLock>
+            </MatrixClientContext.Provider>
         );
     },
 });
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index a3c4ad96ee..91d2bb5213 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -25,8 +25,8 @@ import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 
 export default class BugReportDialog extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.state = {
             sendLogs: true,
             busy: false,
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 703ecaf092..fc7669e1fe 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -25,8 +25,8 @@ import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
 
 export default class DeactivateAccountDialog extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this._onOk = this._onOk.bind(this);
         this._onCancel = this._onCancel.bind(this);
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 9327e1e54e..c9ed71466d 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -16,23 +16,19 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Room } from "matrix-js-sdk";
+
 import sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
 import Field from "../elements/Field";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
-class DevtoolsComponent extends React.Component {
-    static contextTypes = {
-        roomId: PropTypes.string.isRequired,
-    };
-}
-
-class GenericEditor extends DevtoolsComponent {
+class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this._onChange = this._onChange.bind(this);
         this.onBack = this.onBack.bind(this);
     }
@@ -67,12 +63,15 @@ class SendCustomEvent extends GenericEditor {
 
     static propTypes = {
         onBack: PropTypes.func.isRequired,
+        room: PropTypes.instanceOf(Room).isRequired,
         forceStateEvent: PropTypes.bool,
         inputs: PropTypes.object,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    static contextType = MatrixClientContext;
+
+    constructor(props) {
+        super(props);
         this._send = this._send.bind(this);
 
         const {eventType, stateKey, evContent} = Object.assign({
@@ -91,11 +90,11 @@ class SendCustomEvent extends GenericEditor {
     }
 
     send(content) {
-        const cli = MatrixClientPeg.get();
+        const cli = this.context;
         if (this.state.isStateEvent) {
-            return cli.sendStateEvent(this.context.roomId, this.state.eventType, content, this.state.stateKey);
+            return cli.sendStateEvent(this.props.room.roomId, this.state.eventType, content, this.state.stateKey);
         } else {
-            return cli.sendEvent(this.context.roomId, this.state.eventType, content);
+            return cli.sendEvent(this.props.room.roomId, this.state.eventType, content);
         }
     }
 
@@ -154,13 +153,16 @@ class SendAccountData extends GenericEditor {
     static getLabel() { return _t('Send Account Data'); }
 
     static propTypes = {
+        room: PropTypes.instanceOf(Room).isRequired,
         isRoomAccountData: PropTypes.bool,
         forceMode: PropTypes.bool,
         inputs: PropTypes.object,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    static contextType = MatrixClientContext;
+
+    constructor(props) {
+        super(props);
         this._send = this._send.bind(this);
 
         const {eventType, evContent} = Object.assign({
@@ -177,9 +179,9 @@ class SendAccountData extends GenericEditor {
     }
 
     send(content) {
-        const cli = MatrixClientPeg.get();
+        const cli = this.context;
         if (this.state.isRoomAccountData) {
-            return cli.setRoomAccountData(this.context.roomId, this.state.eventType, content);
+            return cli.setRoomAccountData(this.props.room.roomId, this.state.eventType, content);
         }
         return cli.setAccountData(this.state.eventType, content);
     }
@@ -234,7 +236,7 @@ class SendAccountData extends GenericEditor {
 const INITIAL_LOAD_TILES = 20;
 const LOAD_TILES_STEP_SIZE = 50;
 
-class FilteredList extends React.Component {
+class FilteredList extends React.PureComponent {
     static propTypes = {
         children: PropTypes.any,
         query: PropTypes.string,
@@ -247,8 +249,8 @@ class FilteredList extends React.Component {
         return children.filter((child) => child.key.toLowerCase().includes(lcQuery));
     }
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             filteredChildren: FilteredList.filterChildren(this.props.children, this.props.query),
@@ -305,19 +307,20 @@ class FilteredList extends React.Component {
     }
 }
 
-class RoomStateExplorer extends DevtoolsComponent {
+class RoomStateExplorer extends React.PureComponent {
     static getLabel() { return _t('Explore Room State'); }
 
-
     static propTypes = {
         onBack: PropTypes.func.isRequired,
+        room: PropTypes.instanceOf(Room).isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    static contextType = MatrixClientContext;
 
-        const room = MatrixClientPeg.get().getRoom(this.context.roomId);
-        this.roomStateEvents = room.currentState.events;
+    constructor(props) {
+        super(props);
+
+        this.roomStateEvents = this.props.room.currentState.events;
 
         this.onBack = this.onBack.bind(this);
         this.editEv = this.editEv.bind(this);
@@ -373,7 +376,7 @@ class RoomStateExplorer extends DevtoolsComponent {
     render() {
         if (this.state.event) {
             if (this.state.editing) {
-                return <SendCustomEvent forceStateEvent={true} onBack={this.onBack} inputs={{
+                return <SendCustomEvent room={this.props.room} forceStateEvent={true} onBack={this.onBack} inputs={{
                     eventType: this.state.event.getType(),
                     evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
                     stateKey: this.state.event.getStateKey(),
@@ -442,15 +445,18 @@ class RoomStateExplorer extends DevtoolsComponent {
     }
 }
 
-class AccountDataExplorer extends DevtoolsComponent {
+class AccountDataExplorer extends React.PureComponent {
     static getLabel() { return _t('Explore Account Data'); }
 
     static propTypes = {
         onBack: PropTypes.func.isRequired,
+        room: PropTypes.instanceOf(Room).isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    static contextType = MatrixClientContext;
+
+    constructor(props) {
+        super(props);
 
         this.onBack = this.onBack.bind(this);
         this.editEv = this.editEv.bind(this);
@@ -467,11 +473,10 @@ class AccountDataExplorer extends DevtoolsComponent {
     }
 
     getData() {
-        const cli = MatrixClientPeg.get();
         if (this.state.isRoomAccountData) {
-            return cli.getRoom(this.context.roomId).accountData;
+            return this.props.room.accountData;
         }
-        return cli.store.accountData;
+        return this.context.store.accountData;
     }
 
     onViewSourceClick(event) {
@@ -505,10 +510,14 @@ class AccountDataExplorer extends DevtoolsComponent {
     render() {
         if (this.state.event) {
             if (this.state.editing) {
-                return <SendAccountData isRoomAccountData={this.state.isRoomAccountData} onBack={this.onBack} inputs={{
-                    eventType: this.state.event.getType(),
-                    evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
-                }} forceMode={true} />;
+                return <SendAccountData
+                    room={this.props.room}
+                    isRoomAccountData={this.state.isRoomAccountData}
+                    onBack={this.onBack}
+                    inputs={{
+                        eventType: this.state.event.getType(),
+                        evContent: JSON.stringify(this.state.event.getContent(), null, '\t'),
+                    }} forceMode={true} />;
             }
 
             return <div className="mx_ViewSource">
@@ -553,17 +562,20 @@ class AccountDataExplorer extends DevtoolsComponent {
     }
 }
 
-class ServersInRoomList extends DevtoolsComponent {
+class ServersInRoomList extends React.PureComponent {
     static getLabel() { return _t('View Servers in Room'); }
 
     static propTypes = {
         onBack: PropTypes.func.isRequired,
+        room: PropTypes.instanceOf(Room).isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    static contextType = MatrixClientContext;
 
-        const room = MatrixClientPeg.get().getRoom(this.context.roomId);
+    constructor(props) {
+        super(props);
+
+        const room = this.props.room;
         const servers = new Set();
         room.currentState.getStateEvents("m.room.member").forEach(ev => servers.add(ev.getSender().split(":")[1]));
         this.servers = Array.from(servers).map(s =>
@@ -602,19 +614,14 @@ const Entries = [
     ServersInRoomList,
 ];
 
-export default class DevtoolsDialog extends React.Component {
-    static childContextTypes = {
-        roomId: PropTypes.string.isRequired,
-        // client: PropTypes.instanceOf(MatixClient),
-    };
-
+export default class DevtoolsDialog extends React.PureComponent {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
         onFinished: PropTypes.func.isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.onBack = this.onBack.bind(this);
         this.onCancel = this.onCancel.bind(this);
 
@@ -627,10 +634,6 @@ export default class DevtoolsDialog extends React.Component {
         this._unmounted = true;
     }
 
-    getChildContext() {
-        return { roomId: this.props.roomId };
-    }
-
     _setMode(mode) {
         return () => {
             this.setState({ mode });
@@ -654,15 +657,17 @@ export default class DevtoolsDialog extends React.Component {
         let body;
 
         if (this.state.mode) {
-            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" />
-                <this.state.mode onBack={this.onBack} />
-            </div>;
+            body = <MatrixClientContext.Consumer>
+                {(cli) => <React.Fragment>
+                    <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" />
+                    <this.state.mode onBack={this.onBack} room={cli.getRoom(this.props.roomId)} />
+                </React.Fragment>}
+            </MatrixClientContext.Consumer>;
         } else {
             const classes = "mx_DevTools_RoomStateExplorer_button";
-            body = <div>
+            body = <React.Fragment>
                 <div>
                     <div className="mx_DevTools_label_left">{ _t('Toolbox') }</div>
                     <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
@@ -679,7 +684,7 @@ export default class DevtoolsDialog extends React.Component {
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.onCancel}>{ _t('Cancel') }</button>
                 </div>
-            </div>;
+            </React.Fragment>;
         }
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 394e5ad47d..af140f6e18 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -30,8 +30,8 @@ export default class ReportEventDialog extends PureComponent {
         onFinished: PropTypes.func.isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             reason: "",
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 5cba98470c..3d656e6b79 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -25,13 +25,13 @@ import sdk from '../../../index';
  * Parent components should supply an 'onSubmit' callback which returns a
  * promise; a spinner is shown until the promise resolves.
  *
- * The parent can also supply a 'getIntialValue' callback, which works in a
+ * The parent can also supply a 'getInitialValue' callback, which works in a
  * similarly asynchronous way. If this is not provided, the initial value is
  * taken from the 'initialValue' property.
  */
 export default class EditableTextContainer extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this._unmounted = false;
         this.state = {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 0b9dabeae6..ef208bbea9 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import {MatrixClient} from 'matrix-js-sdk';
 import FlairStore from '../../../stores/FlairStore';
 import dis from '../../../dispatcher';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 
 class FlairAvatar extends React.Component {
@@ -40,7 +41,7 @@ class FlairAvatar extends React.Component {
     }
 
     render() {
-        const httpUrl = this.context.matrixClient.mxcUrlToHttp(
+        const httpUrl = this.context.mxcUrlToHttp(
             this.props.groupProfile.avatarUrl, 16, 16, 'scale', false);
         const tooltip = this.props.groupProfile.name ?
             `${this.props.groupProfile.name} (${this.props.groupProfile.groupId})`:
@@ -62,9 +63,7 @@ FlairAvatar.propTypes = {
     }),
 };
 
-FlairAvatar.contextTypes = {
-    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-};
+FlairAvatar.contextType = MatrixClientContext;
 
 export default class Flair extends React.Component {
     constructor() {
@@ -92,7 +91,7 @@ export default class Flair extends React.Component {
         for (const groupId of groups) {
             let groupProfile = null;
             try {
-                groupProfile = await FlairStore.getGroupProfileCached(this.context.matrixClient, groupId);
+                groupProfile = await FlairStore.getGroupProfileCached(this.context, groupId);
             } catch (err) {
                 console.error('Could not get profile for group', groupId, err);
             }
@@ -134,6 +133,4 @@ Flair.propTypes = {
     groups: PropTypes.arrayOf(PropTypes.string),
 };
 
-Flair.contextTypes = {
-    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-};
+Flair.contextType = MatrixClientContext;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index a065602f68..99005de03b 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -20,12 +20,13 @@ import createReactClass from 'create-react-class';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import classNames from 'classnames';
-import { Room, RoomMember, MatrixClient } from 'matrix-js-sdk';
+import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { getDisplayAliasForRoom } from '../../../Rooms';
 import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
@@ -66,17 +67,6 @@ const Pill = createReactClass({
         isSelected: PropTypes.bool,
     },
 
-
-    childContextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    },
-
-    getChildContext() {
-        return {
-            matrixClient: this._matrixClient,
-        };
-    },
-
     getInitialState() {
         return {
             // ID/alias of the room/user
@@ -276,15 +266,17 @@ const Pill = createReactClass({
         });
 
         if (this.state.pillType) {
-            return this.props.inMessage ?
-                <a className={classes} href={href} onClick={onClick} title={resource} data-offset-key={this.props.offsetKey}>
-                    { avatar }
-                    { linkText }
-                </a> :
-                <span className={classes} title={resource} data-offset-key={this.props.offsetKey}>
-                    { avatar }
-                    { linkText }
-                </span>;
+            return <MatrixClientContext.Provider value={this._matrixClient}>
+                { this.props.inMessage ?
+                    <a className={classes} href={href} onClick={onClick} title={resource} data-offset-key={this.props.offsetKey}>
+                        { avatar }
+                        { linkText }
+                    </a> :
+                    <span className={classes} title={resource} data-offset-key={this.props.offsetKey}>
+                        { avatar }
+                        { linkText }
+                    </span> }
+            </MatrixClientContext.Provider>;
         } else {
             // Deliberately render nothing if the URL isn't recognised
             return null;
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 55fd028980..e7832efca7 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -21,10 +21,11 @@ import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import dis from '../../../dispatcher';
 import {wantsDateSeparator} from '../../../DateUtils';
-import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk';
 import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
 import escapeHtml from "escape-html";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 // This component does no cycle detection, simply because the only way to make such a cycle would be to
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
@@ -38,12 +39,10 @@ export default class ReplyThread extends React.Component {
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-    };
+    static contextType = MatrixClientContext;
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             // The loaded events to be rendered as linear-replies
@@ -187,7 +186,7 @@ export default class ReplyThread extends React.Component {
 
     componentWillMount() {
         this.unmounted = false;
-        this.room = this.context.matrixClient.getRoom(this.props.parentEv.getRoomId());
+        this.room = this.context.getRoom(this.props.parentEv.getRoomId());
         this.room.on("Room.redaction", this.onRoomRedaction);
         // same event handler as Room.redaction as for both we just do forceUpdate
         this.room.on("Room.redactionCancelled", this.onRoomRedaction);
@@ -259,7 +258,7 @@ export default class ReplyThread extends React.Component {
         try {
             // ask the client to fetch the event we want using the context API, only interface to do so is to ask
             // for a timeline with that event, but once it is loaded we can use findEventById to look up the ev map
-            await this.context.matrixClient.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId);
+            await this.context.getEventTimeline(this.room.getUnfilteredTimelineSet(), eventId);
         } catch (e) {
             // if it fails catch the error and return early, there's no point trying to find the event in this case.
             // Return null as it is falsey and thus should be treated as an error (as the event cannot be resolved).
@@ -300,7 +299,7 @@ export default class ReplyThread extends React.Component {
         } else if (this.state.loadedEv) {
             const ev = this.state.loadedEv;
             const Pill = sdk.getComponent('elements.Pill');
-            const room = this.context.matrixClient.getRoom(ev.getRoomId());
+            const room = this.context.getRoom(ev.getRoomId());
             header = <blockquote className="mx_ReplyThread">
                 {
                     _t('<a>In reply to</a> <pill>', {}, {
diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.js
index 82b5ae572c..bce65cf1a9 100644
--- a/src/components/views/elements/SyntaxHighlight.js
+++ b/src/components/views/elements/SyntaxHighlight.js
@@ -24,8 +24,8 @@ export default class SyntaxHighlight extends React.Component {
         children: PropTypes.node,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this._ref = this._ref.bind(this);
     }
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 767980f0a0..c57d973086 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -20,7 +20,6 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
@@ -31,6 +30,7 @@ import FlairStore from '../../../stores/FlairStore';
 import GroupStore from '../../../stores/GroupStore';
 import TagOrderStore from '../../../stores/TagOrderStore';
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents
 // a thing to click on for the user to filter the visible rooms in the RoomList to:
@@ -46,8 +46,8 @@ export default createReactClass({
         tag: PropTypes.string,
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState() {
@@ -81,7 +81,7 @@ export default createReactClass({
     _onFlairStoreUpdated() {
         if (this.unmounted) return;
         FlairStore.getGroupProfileCached(
-            this.context.matrixClient,
+            this.context,
             this.props.tag,
         ).then((profile) => {
             if (this.unmounted) return;
@@ -145,7 +145,7 @@ export default createReactClass({
         const name = profile.name || this.props.tag;
         const avatarHeight = 40;
 
-        const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
+        const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
         ) : null;
 
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index a21b091145..c0d0d9eafe 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -19,13 +19,13 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 // XXX this class copies a lot from RoomTile.js
 export default createReactClass({
@@ -35,8 +35,8 @@ export default createReactClass({
         group: PropTypes.object.isRequired,
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState: function() {
@@ -58,7 +58,7 @@ export default createReactClass({
     onMouseEnter: function() {
         const state = {hover: true};
         // Only allow non-guests to access the context menu
-        if (!this.context.matrixClient.isGuest()) {
+        if (!this.context.isGuest()) {
             state.badgeHover = true;
         }
         this.setState(state);
@@ -118,7 +118,7 @@ export default createReactClass({
 
         const groupName = this.props.group.name || this.props.group.groupId;
         const httpAvatarUrl = this.props.group.avatarUrl ?
-            this.context.matrixClient.mxcUrlToHttp(this.props.group.avatarUrl, 24, 24) : null;
+            this.context.mxcUrlToHttp(this.props.group.avatarUrl, 24, 24) : null;
 
         const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
 
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 3dac90fc35..eb90cdc0f8 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
@@ -26,12 +25,13 @@ import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 import GroupStore from '../../../stores/GroupStore';
 import AccessibleButton from '../elements/AccessibleButton';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 module.exports = createReactClass({
     displayName: 'GroupMemberInfo',
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     propTypes: {
@@ -85,7 +85,7 @@ module.exports = createReactClass({
     _onKick: function() {
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         Modal.createDialog(ConfirmUserActionDialog, {
-            matrixClient: this.context.matrixClient,
+            matrixClient: this.context,
             groupMember: this.props.groupMember,
             action: this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community'),
             title: this.state.isUserInvited ? _t('Disinvite this user from community?')
@@ -95,7 +95,7 @@ module.exports = createReactClass({
                 if (!proceed) return;
 
                 this.setState({removingUser: true});
-                this.context.matrixClient.removeUserFromGroup(
+                this.context.removeUserFromGroup(
                     this.props.groupId, this.props.groupMember.userId,
                 ).then(() => {
                     // return to the user list
@@ -171,7 +171,7 @@ module.exports = createReactClass({
         const avatarUrl = this.props.groupMember.avatarUrl;
         let avatarElement;
         if (avatarUrl) {
-            const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800);
+            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
             avatarElement = (<div className="mx_MemberInfo_avatar">
                             <img src={httpUrl} />
                         </div>);
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index c4b41d23ce..7a9ba9289b 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -19,10 +19,10 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupMemberType } from '../../../groups';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export default createReactClass({
     displayName: 'GroupMemberTile',
@@ -36,8 +36,8 @@ export default createReactClass({
         return {};
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     onClick: function(e) {
@@ -53,7 +53,7 @@ export default createReactClass({
         const EntityTile = sdk.getComponent('rooms.EntityTile');
 
         const name = this.props.member.displayname || this.props.member.userId;
-        const avatarUrl = this.context.matrixClient.mxcUrlToHttp(
+        const avatarUrl = this.context.mxcUrlToHttp(
             this.props.member.avatarUrl,
             36, 36, 'crop',
         );
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index f9f7324e23..d5b8759a67 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -17,18 +17,18 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import GroupStore from '../../../stores/GroupStore';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 module.exports = createReactClass({
     displayName: 'GroupRoomInfo',
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     propTypes: {
@@ -206,7 +206,7 @@ module.exports = createReactClass({
         const avatarUrl = this.state.groupRoom.avatarUrl;
         let avatarElement;
         if (avatarUrl) {
-            const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800);
+            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
             avatarElement = (<div className="mx_MemberInfo_avatar">
                             <img src={httpUrl} />
                         </div>);
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index ae325d4796..527e65d30c 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -17,10 +17,10 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import {MatrixClient} from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 const GroupRoomTile = createReactClass({
     displayName: 'GroupRoomTile',
@@ -41,7 +41,7 @@ const GroupRoomTile = createReactClass({
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const avatarUrl = this.context.matrixClient.mxcUrlToHttp(
+        const avatarUrl = this.context.mxcUrlToHttp(
             this.props.groupRoom.avatarUrl,
             36, 36, 'crop',
         );
@@ -66,9 +66,7 @@ const GroupRoomTile = createReactClass({
     },
 });
 
-GroupRoomTile.contextTypes = {
-    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-};
+GroupRoomTile.contextType = MatrixClientContext;
 
 
 export default GroupRoomTile;
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 3b64c10a1e..a6447cdf14 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -22,6 +22,7 @@ import { Draggable, Droppable } from 'react-beautiful-dnd';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import FlairStore from '../../../stores/FlairStore';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 function nop() {}
 
@@ -37,8 +38,8 @@ const GroupTile = createReactClass({
         draggable: PropTypes.bool,
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState() {
@@ -56,7 +57,7 @@ const GroupTile = createReactClass({
     },
 
     componentWillMount: function() {
-        FlairStore.getGroupProfileCached(this.context.matrixClient, this.props.groupId).then((profile) => {
+        FlairStore.getGroupProfileCached(this.context, this.props.groupId).then((profile) => {
             this.setState({profile});
         }).catch((err) => {
             console.error('Error whilst getting cached profile for GroupTile', err);
@@ -80,7 +81,7 @@ const GroupTile = createReactClass({
         const descElement = this.props.showDescription ?
             <div className="mx_GroupTile_desc">{ profile.shortDescription }</div> :
             <div />;
-        const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
+        const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop") : null;
 
         let avatarElement = (
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 3cd5731b99..297c0fbd30 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -15,17 +15,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import sdk from '../../../index';
-import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export default createReactClass({
     displayName: 'GroupUserSettings',
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState() {
@@ -36,7 +35,7 @@ export default createReactClass({
     },
 
     componentWillMount: function() {
-        this.context.matrixClient.getJoinedGroups().then((result) => {
+        this.context.getJoinedGroups().then((result) => {
             this.setState({groups: result.groups || [], error: null});
         }, (err) => {
             console.error(err);
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 552b1108d2..6045ec0571 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -26,6 +26,7 @@ import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
 import request from 'browser-request';
 import Modal from '../../../Modal';
+import SdkConfig from "../../../SdkConfig";
 
 
 // A cached tinted copy of require("../../../../res/img/download.svg")
@@ -214,10 +215,6 @@ module.exports = createReactClass({
         tileShape: PropTypes.string,
     },
 
-    contextTypes: {
-        appConfig: PropTypes.object,
-    },
-
     /**
      * Extracts a human readable label for the file attachment to use as
      * link text.
@@ -360,8 +357,9 @@ module.exports = createReactClass({
 
             // If the attachment is encryped then put the link inside an iframe.
             let renderer_url = DEFAULT_CROSS_ORIGIN_RENDERER;
-            if (this.context.appConfig && this.context.appConfig.cross_origin_renderer_url) {
-                renderer_url = this.context.appConfig.cross_origin_renderer_url;
+            const appConfig = SdkConfig.get();
+            if (appConfig && appConfig.cross_origin_renderer_url) {
+                renderer_url = appConfig.cross_origin_renderer_url;
             }
             renderer_url += "?origin=" + encodeURIComponent(window.location.origin);
             return (
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 427056203d..dbe6636c6b 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 
 import MFileBody from './MFileBody';
 import Modal from '../../../Modal';
@@ -26,6 +25,7 @@ import sdk from '../../../index';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export default class MImageBody extends React.Component {
     static propTypes = {
@@ -39,9 +39,7 @@ export default class MImageBody extends React.Component {
         maxImageHeight: PropTypes.number,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
+    static contextType = MatrixClientContext;
 
     constructor(props) {
         super(props);
@@ -71,7 +69,7 @@ export default class MImageBody extends React.Component {
 
     componentWillMount() {
         this.unmounted = false;
-        this.context.matrixClient.on('sync', this.onClientSync);
+        this.context.on('sync', this.onClientSync);
     }
 
     // FIXME: factor this out and aplpy it to MVideoBody and MAudioBody too!
@@ -174,7 +172,7 @@ export default class MImageBody extends React.Component {
         if (content.file !== undefined) {
             return this.state.decryptedUrl;
         } else {
-            return this.context.matrixClient.mxcUrlToHttp(content.url);
+            return this.context.mxcUrlToHttp(content.url);
         }
     }
 
@@ -198,7 +196,7 @@ export default class MImageBody extends React.Component {
             // special case to return clientside sender-generated thumbnails for SVGs, if any,
             // given we deliberately don't thumbnail them serverside to prevent
             // billion lol attacks and similar
-            return this.context.matrixClient.mxcUrlToHttp(
+            return this.context.mxcUrlToHttp(
                 content.info.thumbnail_url,
                 thumbWidth,
                 thumbHeight,
@@ -221,7 +219,7 @@ export default class MImageBody extends React.Component {
                 pixelRatio === 1.0 ||
                 (!info || !info.w || !info.h || !info.size)
             ) {
-                return this.context.matrixClient.mxcUrlToHttp(content.url, thumbWidth, thumbHeight);
+                return this.context.mxcUrlToHttp(content.url, thumbWidth, thumbHeight);
             } else {
                 // we should only request thumbnails if the image is bigger than 800x600
                 // (or 1600x1200 on retina) otherwise the image in the timeline will just
@@ -242,7 +240,7 @@ export default class MImageBody extends React.Component {
                     // image is too large physically and bytewise to clutter our timeline so
                     // we ask for a thumbnail, despite knowing that it will be max 800x600
                     // despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
-                    return this.context.matrixClient.mxcUrlToHttp(
+                    return this.context.mxcUrlToHttp(
                         content.url,
                         thumbWidth,
                         thumbHeight,
@@ -251,7 +249,7 @@ export default class MImageBody extends React.Component {
                     // download the original image otherwise, so we can scale it client side
                     // to take pixelRatio into account.
                     // ( no width/height means we want the original image)
-                    return this.context.matrixClient.mxcUrlToHttp(
+                    return this.context.mxcUrlToHttp(
                         content.url,
                     );
                 }
@@ -308,7 +306,7 @@ export default class MImageBody extends React.Component {
 
     componentWillUnmount() {
         this.unmounted = true;
-        this.context.matrixClient.removeListener('sync', this.onClientSync);
+        this.context.removeListener('sync', this.onClientSync);
         this._afterComponentWillUnmount();
 
         if (this.state.decryptedUrl) {
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 81e806cf62..29ade3cb3f 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -25,7 +25,7 @@ import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
-import {RoomContext} from "../../structures/RoomView";
+import RoomContext from "../../../contexts/RoomContext";
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -117,9 +117,7 @@ export default class MessageActionBar extends React.PureComponent {
         onFocusChange: PropTypes.func,
     };
 
-    static contextTypes = {
-        room: RoomContext,
-    };
+    static contextType = RoomContext;
 
     componentDidMount() {
         this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
@@ -164,12 +162,12 @@ export default class MessageActionBar extends React.PureComponent {
         let editButton;
 
         if (isContentActionable(this.props.mxEvent)) {
-            if (this.context.room.canReact) {
+            if (this.context.canReact) {
                 reactButton = (
                     <ReactButton mxEvent={this.props.mxEvent} reactions={this.props.reactions} onFocusChange={this.onFocusChange} />
                 );
             }
-            if (this.context.room.canReply) {
+            if (this.context.canReply) {
                 replyButton = <AccessibleButton
                     className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
                     title={_t("Reply")}
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 89f4c61b27..f7da1029e1 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -17,11 +17,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import {MatrixClient} from 'matrix-js-sdk';
 import Flair from '../elements/Flair.js';
 import FlairStore from '../../../stores/FlairStore';
 import { _t } from '../../../languageHandler';
 import {getUserNameColorClass} from '../../../utils/FormattingUtils';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 export default createReactClass({
     displayName: 'SenderProfile',
@@ -31,8 +31,8 @@ export default createReactClass({
         onClick: PropTypes.func,
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     getInitialState() {
@@ -47,18 +47,18 @@ export default createReactClass({
         this._updateRelatedGroups();
 
         FlairStore.getPublicisedGroupsCached(
-            this.context.matrixClient, this.props.mxEvent.getSender(),
+            this.context, this.props.mxEvent.getSender(),
         ).then((userGroups) => {
             if (this.unmounted) return;
             this.setState({userGroups});
         });
 
-        this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents);
+        this.context.on('RoomState.events', this.onRoomStateEvents);
     },
 
     componentWillUnmount() {
         this.unmounted = true;
-        this.context.matrixClient.removeListener('RoomState.events', this.onRoomStateEvents);
+        this.context.removeListener('RoomState.events', this.onRoomStateEvents);
     },
 
     onRoomStateEvents(event) {
@@ -71,7 +71,7 @@ export default createReactClass({
 
     _updateRelatedGroups() {
         if (this.unmounted) return;
-        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
+        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
         if (!room) return;
 
         const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index d1d7aa0371..e952f8fad9 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useMemo, useState, useEffect} from 'react';
+import React, {useCallback, useMemo, useState, useEffect, useContext} from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
@@ -37,9 +37,9 @@ import MultiInviter from "../../../utils/MultiInviter";
 import GroupStore from "../../../stores/GroupStore";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import E2EIcon from "../rooms/E2EIcon";
-import withLegacyMatrixClient from "../../../utils/withLegacyMatrixClient";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {textualPowerLevel} from '../../../Roles';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -203,7 +203,9 @@ function DevicesSection({devices, userId, loading}) {
     );
 }
 
-const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, isIgnored, canInvite, devices}) => {
+const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
+    const cli = useContext(MatrixClientContext);
+
     let ignoreButton = null;
     let insertPillButton = null;
     let inviteUserButton = null;
@@ -336,7 +338,7 @@ const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, i
             </div>
         </div>
     );
-});
+};
 
 const _warnSelfDemote = async () => {
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
@@ -404,7 +406,9 @@ const useRoomPowerLevels = (cli, room) => {
     return powerLevels;
 };
 
-const RoomKickButton = withLegacyMatrixClient(({matrixClient: cli, member, startUpdating, stopUpdating}) => {
+const RoomKickButton = ({member, startUpdating, stopUpdating}) => {
+    const cli = useContext(MatrixClientContext);
+
     const onKick = async () => {
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         const {finished} = Modal.createTrackedDialog(
@@ -444,9 +448,11 @@ const RoomKickButton = withLegacyMatrixClient(({matrixClient: cli, member, start
     return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onKick}>
         { kickLabel }
     </AccessibleButton>;
-});
+};
+
+const RedactMessagesButton = ({member}) => {
+    const cli = useContext(MatrixClientContext);
 
-const RedactMessagesButton = withLegacyMatrixClient(({matrixClient: cli, member}) => {
     const onRedactAllMessages = async () => {
         const {roomId, userId} = member;
         const room = cli.getRoom(roomId);
@@ -517,9 +523,11 @@ const RedactMessagesButton = withLegacyMatrixClient(({matrixClient: cli, member}
     return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onRedactAllMessages}>
         { _t("Remove recent messages") }
     </AccessibleButton>;
-});
+};
+
+const BanToggleButton = ({member, startUpdating, stopUpdating}) => {
+    const cli = useContext(MatrixClientContext);
 
-const BanToggleButton = withLegacyMatrixClient(({matrixClient: cli, member, startUpdating, stopUpdating}) => {
     const onBanOrUnban = async () => {
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         const {finished} = Modal.createTrackedDialog(
@@ -573,207 +581,206 @@ const BanToggleButton = withLegacyMatrixClient(({matrixClient: cli, member, star
     return <AccessibleButton className={classes} onClick={onBanOrUnban}>
         { label }
     </AccessibleButton>;
-});
+};
 
-const MuteToggleButton = withLegacyMatrixClient(
-    ({matrixClient: cli, member, room, powerLevels, startUpdating, stopUpdating}) => {
-        const isMuted = _isMuted(member, powerLevels);
-        const onMuteToggle = async () => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            const roomId = member.roomId;
-            const target = member.userId;
+const MuteToggleButton = ({member, room, powerLevels, startUpdating, stopUpdating}) => {
+    const cli = useContext(MatrixClientContext);
 
-            // if muting self, warn as it may be irreversible
-            if (target === cli.getUserId()) {
-                try {
-                    if (!(await _warnSelfDemote())) return;
-                } catch (e) {
-                    console.error("Failed to warn about self demotion: ", e);
-                    return;
-                }
+    const isMuted = _isMuted(member, powerLevels);
+    const onMuteToggle = async () => {
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const roomId = member.roomId;
+        const target = member.userId;
+
+        // if muting self, warn as it may be irreversible
+        if (target === cli.getUserId()) {
+            try {
+                if (!(await _warnSelfDemote())) return;
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
+                return;
             }
+        }
 
-            const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-            if (!powerLevelEvent) return;
+        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+        if (!powerLevelEvent) return;
 
-            const powerLevels = powerLevelEvent.getContent();
-            const levelToSend = (
-                (powerLevels.events ? powerLevels.events["m.room.message"] : null) ||
-                powerLevels.events_default
-            );
-            let level;
-            if (isMuted) { // unmute
-                level = levelToSend;
-            } else { // mute
-                level = levelToSend - 1;
-            }
-            level = parseInt(level);
+        const powerLevels = powerLevelEvent.getContent();
+        const levelToSend = (
+            (powerLevels.events ? powerLevels.events["m.room.message"] : null) ||
+            powerLevels.events_default
+        );
+        let level;
+        if (isMuted) { // unmute
+            level = levelToSend;
+        } else { // mute
+            level = levelToSend - 1;
+        }
+        level = parseInt(level);
 
-            if (!isNaN(level)) {
-                startUpdating();
-                cli.setPowerLevel(roomId, target, level, powerLevelEvent).then(() => {
-                    // NO-OP; rely on the m.room.member event coming down else we could
-                    // get out of sync if we force setState here!
-                    console.log("Mute toggle success");
-                }, function(err) {
-                    console.error("Mute error: " + err);
-                    Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, {
-                        title: _t("Error"),
-                        description: _t("Failed to mute user"),
-                    });
-                }).finally(() => {
-                    stopUpdating();
+        if (!isNaN(level)) {
+            startUpdating();
+            cli.setPowerLevel(roomId, target, level, powerLevelEvent).then(() => {
+                // NO-OP; rely on the m.room.member event coming down else we could
+                // get out of sync if we force setState here!
+                console.log("Mute toggle success");
+            }, function(err) {
+                console.error("Mute error: " + err);
+                Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, {
+                    title: _t("Error"),
+                    description: _t("Failed to mute user"),
                 });
-            }
+            }).finally(() => {
+                stopUpdating();
+            });
+        }
+    };
+
+    const classes = classNames("mx_UserInfo_field", {
+        mx_UserInfo_destructive: !isMuted,
+    });
+
+    const muteLabel = isMuted ? _t("Unmute") : _t("Mute");
+    return <AccessibleButton className={classes} onClick={onMuteToggle}>
+        { muteLabel }
+    </AccessibleButton>;
+};
+
+const RoomAdminToolsContainer = ({room, children, member, startUpdating, stopUpdating, powerLevels}) => {
+    const cli = useContext(MatrixClientContext);
+    let kickButton;
+    let banButton;
+    let muteButton;
+    let redactButton;
+
+    const editPowerLevel = (
+        (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
+        powerLevels.state_default
+    );
+
+    const me = room.getMember(cli.getUserId());
+    const isMe = me.userId === member.userId;
+    const canAffectUser = member.powerLevel < me.powerLevel || isMe;
+
+    if (canAffectUser && me.powerLevel >= powerLevels.kick) {
+        kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
+    }
+    if (me.powerLevel >= powerLevels.redact) {
+        redactButton = (
+            <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
+        );
+    }
+    if (canAffectUser && me.powerLevel >= powerLevels.ban) {
+        banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
+    }
+    if (canAffectUser && me.powerLevel >= editPowerLevel) {
+        muteButton = (
+            <MuteToggleButton
+                member={member}
+                room={room}
+                powerLevels={powerLevels}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}
+            />
+        );
+    }
+
+    if (kickButton || banButton || muteButton || redactButton || children) {
+        return <GenericAdminToolsContainer>
+            { muteButton }
+            { kickButton }
+            { banButton }
+            { redactButton }
+            { children }
+        </GenericAdminToolsContainer>;
+    }
+
+    return <div />;
+};
+
+const GroupAdminToolsSection = ({children, groupId, groupMember, startUpdating, stopUpdating}) => {
+    const cli = useContext(MatrixClientContext);
+
+    const [isPrivileged, setIsPrivileged] = useState(false);
+    const [isInvited, setIsInvited] = useState(false);
+
+    // Listen to group store changes
+    useEffect(() => {
+        let unmounted = false;
+
+        const onGroupStoreUpdated = () => {
+            if (unmounted) return;
+            setIsPrivileged(GroupStore.isUserPrivileged(groupId));
+            setIsInvited(GroupStore.getGroupInvitedMembers(groupId).some(
+                (m) => m.userId === groupMember.userId,
+            ));
         };
 
-        const classes = classNames("mx_UserInfo_field", {
-            mx_UserInfo_destructive: !isMuted,
-        });
+        GroupStore.registerListener(groupId, onGroupStoreUpdated);
+        onGroupStoreUpdated();
+        // Handle unmount
+        return () => {
+            unmounted = true;
+            GroupStore.unregisterListener(onGroupStoreUpdated);
+        };
+    }, [groupId, groupMember.userId]);
 
-        const muteLabel = isMuted ? _t("Unmute") : _t("Mute");
-        return <AccessibleButton className={classes} onClick={onMuteToggle}>
-            { muteLabel }
-        </AccessibleButton>;
-    },
-);
+    if (isPrivileged) {
+        const _onKick = async () => {
+            const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
+            const {finished} = Modal.createDialog(ConfirmUserActionDialog, {
+                matrixClient: cli,
+                groupMember,
+                action: isInvited ? _t('Disinvite') : _t('Remove from community'),
+                title: isInvited ? _t('Disinvite this user from community?')
+                    : _t('Remove this user from community?'),
+                danger: true,
+            });
 
-const RoomAdminToolsContainer = withLegacyMatrixClient(
-    ({matrixClient: cli, room, children, member, startUpdating, stopUpdating, powerLevels}) => {
-        let kickButton;
-        let banButton;
-        let muteButton;
-        let redactButton;
+            const [proceed] = await finished;
+            if (!proceed) return;
 
-        const editPowerLevel = (
-            (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
-            powerLevels.state_default
+            startUpdating();
+            cli.removeUserFromGroup(groupId, groupMember.userId).then(() => {
+                // return to the user list
+                dis.dispatch({
+                    action: "view_user",
+                    member: null,
+                });
+            }).catch((e) => {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
+                    title: _t('Error'),
+                    description: isInvited ?
+                        _t('Failed to withdraw invitation') :
+                        _t('Failed to remove user from community'),
+                });
+                console.log(e);
+            }).finally(() => {
+                stopUpdating();
+            });
+        };
+
+        const kickButton = (
+            <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={_onKick}>
+                { isInvited ? _t('Disinvite') : _t('Remove from community') }
+            </AccessibleButton>
         );
 
-        const me = room.getMember(cli.getUserId());
-        const isMe = me.userId === member.userId;
-        const canAffectUser = member.powerLevel < me.powerLevel || isMe;
+        // No make/revoke admin API yet
+        /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
+        giveModButton = <AccessibleButton className="mx_UserInfo_field" onClick={this.onModToggle}>
+            {giveOpLabel}
+        </AccessibleButton>;*/
 
-        if (canAffectUser && me.powerLevel >= powerLevels.kick) {
-            kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
-        }
-        if (me.powerLevel >= powerLevels.redact) {
-            redactButton = (
-                <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
-            );
-        }
-        if (canAffectUser && me.powerLevel >= powerLevels.ban) {
-            banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
-        }
-        if (canAffectUser && me.powerLevel >= editPowerLevel) {
-            muteButton = (
-                <MuteToggleButton
-                    member={member}
-                    room={room}
-                    powerLevels={powerLevels}
-                    startUpdating={startUpdating}
-                    stopUpdating={stopUpdating}
-                />
-            );
-        }
+        return <GenericAdminToolsContainer>
+            { kickButton }
+            { children }
+        </GenericAdminToolsContainer>;
+    }
 
-        if (kickButton || banButton || muteButton || redactButton || children) {
-            return <GenericAdminToolsContainer>
-                { muteButton }
-                { kickButton }
-                { banButton }
-                { redactButton }
-                { children }
-            </GenericAdminToolsContainer>;
-        }
-
-        return <div />;
-    },
-);
-
-const GroupAdminToolsSection = withLegacyMatrixClient(
-    ({matrixClient: cli, children, groupId, groupMember, startUpdating, stopUpdating}) => {
-        const [isPrivileged, setIsPrivileged] = useState(false);
-        const [isInvited, setIsInvited] = useState(false);
-
-        // Listen to group store changes
-        useEffect(() => {
-            let unmounted = false;
-
-            const onGroupStoreUpdated = () => {
-                if (unmounted) return;
-                setIsPrivileged(GroupStore.isUserPrivileged(groupId));
-                setIsInvited(GroupStore.getGroupInvitedMembers(groupId).some(
-                    (m) => m.userId === groupMember.userId,
-                ));
-            };
-
-            GroupStore.registerListener(groupId, onGroupStoreUpdated);
-            onGroupStoreUpdated();
-            // Handle unmount
-            return () => {
-                unmounted = true;
-                GroupStore.unregisterListener(onGroupStoreUpdated);
-            };
-        }, [groupId, groupMember.userId]);
-
-        if (isPrivileged) {
-            const _onKick = async () => {
-                const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
-                const {finished} = Modal.createDialog(ConfirmUserActionDialog, {
-                    matrixClient: cli,
-                    groupMember,
-                    action: isInvited ? _t('Disinvite') : _t('Remove from community'),
-                    title: isInvited ? _t('Disinvite this user from community?')
-                        : _t('Remove this user from community?'),
-                    danger: true,
-                });
-
-                const [proceed] = await finished;
-                if (!proceed) return;
-
-                startUpdating();
-                cli.removeUserFromGroup(groupId, groupMember.userId).then(() => {
-                    // return to the user list
-                    dis.dispatch({
-                        action: "view_user",
-                        member: null,
-                    });
-                }).catch((e) => {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
-                        title: _t('Error'),
-                        description: isInvited ?
-                            _t('Failed to withdraw invitation') :
-                            _t('Failed to remove user from community'),
-                    });
-                    console.log(e);
-                }).finally(() => {
-                    stopUpdating();
-                });
-            };
-
-            const kickButton = (
-                <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={_onKick}>
-                    { isInvited ? _t('Disinvite') : _t('Remove from community') }
-                </AccessibleButton>
-            );
-
-            // No make/revoke admin API yet
-            /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
-            giveModButton = <AccessibleButton className="mx_UserInfo_field" onClick={this.onModToggle}>
-                {giveOpLabel}
-            </AccessibleButton>;*/
-
-            return <GenericAdminToolsContainer>
-                { kickButton }
-                { children }
-            </GenericAdminToolsContainer>;
-        }
-
-        return <div />;
-    },
-);
+    return <div />;
+};
 
 const GroupMember = PropTypes.shape({
     userId: PropTypes.string.isRequired,
@@ -849,7 +856,9 @@ function useRoomPermissions(cli, room, user) {
     return roomPermissions;
 }
 
-const PowerLevelSection = withLegacyMatrixClient(({matrixClient: cli, user, room, roomPermissions, powerLevels}) => {
+const PowerLevelSection = ({user, room, roomPermissions, powerLevels}) => {
+    const cli = useContext(MatrixClientContext);
+
     const [isEditing, setEditing] = useState(false);
     if (room && user.roomId) { // is in room
         if (isEditing) {
@@ -876,9 +885,11 @@ const PowerLevelSection = withLegacyMatrixClient(({matrixClient: cli, user, room
     } else {
         return null;
     }
-});
+};
+
+const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => {
+    const cli = useContext(MatrixClientContext);
 
-const PowerLevelEditor = withLegacyMatrixClient(({matrixClient: cli, user, room, roomPermissions, onFinished}) => {
     const [isUpdating, setIsUpdating] = useState(false);
     const [selectedPowerLevel, setSelectedPowerLevel] = useState(parseInt(user.powerLevel, 10));
     const [isDirty, setIsDirty] = useState(false);
@@ -982,10 +993,11 @@ const PowerLevelEditor = withLegacyMatrixClient(({matrixClient: cli, user, room,
             {buttonOrSpinner}
         </div>
     );
-});
+};
+
+const UserInfo = ({user, groupId, roomId, onClose}) => {
+    const cli = useContext(MatrixClientContext);
 
-// cli is injected by withLegacyMatrixClient
-const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, roomId, onClose}) => {
     // Load room if we are given a room id and memoize it
     const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]);
 
@@ -1320,7 +1332,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
             </AutoHideScrollbar>
         </div>
     );
-});
+};
 
 UserInfo.propTypes = {
     user: PropTypes.oneOfType([
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index c30f446f41..20118f4f44 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -16,11 +16,12 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 const GROUP_ID_REGEX = /\+\S+:\S+/;
 
@@ -31,9 +32,7 @@ export default class RelatedGroupSettings extends React.Component {
         relatedGroupsEvent: PropTypes.instanceOf(MatrixEvent),
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
+    static contextType = MatrixClientContext;
 
     static defaultProps = {
         canSetRelatedGroups: false,
@@ -49,7 +48,7 @@ export default class RelatedGroupSettings extends React.Component {
     }
 
     updateGroups(newGroupsList) {
-        this.context.matrixClient.sendStateEvent(this.props.roomId, 'm.room.related_groups', {
+        this.context.sendStateEvent(this.props.roomId, 'm.room.related_groups', {
             groups: newGroupsList,
         }, '').catch((err) => {
             console.error(err);
@@ -99,7 +98,7 @@ export default class RelatedGroupSettings extends React.Component {
     };
 
     render() {
-        const localDomain = this.context.matrixClient.getDomain();
+        const localDomain = this.context.getDomain();
         const EditableItemList = sdk.getComponent('elements.EditableItemList');
         return <div>
             <EditableItemList
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index c7659e89fb..df4e549784 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -80,8 +80,8 @@ export default class BasicMessageEditor extends React.Component {
         initialCaret: PropTypes.object, // See DocumentPosition in editor/model.js
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.state = {
             autoComplete: null,
         };
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 34b2d92590..94ef00183e 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -31,6 +31,7 @@ import classNames from 'classnames';
 import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
 import {Key} from "../../../Keyboard";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 function _isReply(mxEvent) {
     const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -105,12 +106,10 @@ export default class EditMessageComposer extends React.Component {
         editState: PropTypes.instanceOf(EditorStateTransfer).isRequired,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-    };
+    static contextType = MatrixClientContext;
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.model = null;
         this._editorRef = null;
 
@@ -124,7 +123,7 @@ export default class EditMessageComposer extends React.Component {
     };
 
     _getRoom() {
-        return this.context.matrixClient.getRoom(this.props.editState.getEvent().getRoomId());
+        return this.context.getRoom(this.props.editState.getEvent().getRoomId());
     }
 
     _onKeyDown = (event) => {
@@ -190,7 +189,7 @@ export default class EditMessageComposer extends React.Component {
         if (this._isContentModified(newContent)) {
             const roomId = editedEvent.getRoomId();
             this._cancelPreviousPendingEdit();
-            this.context.matrixClient.sendMessage(roomId, editContent);
+            this.context.sendMessage(roomId, editContent);
         }
 
         // close the event editing and focus composer
@@ -205,7 +204,7 @@ export default class EditMessageComposer extends React.Component {
             previousEdit.status === EventStatus.QUEUED ||
             previousEdit.status === EventStatus.NOT_SENT
         )) {
-            this.context.matrixClient.cancelPendingEvent(previousEdit);
+            this.context.cancelPendingEvent(previousEdit);
         }
     }
 
@@ -232,7 +231,7 @@ export default class EditMessageComposer extends React.Component {
     _createEditorModel() {
         const {editState} = this.props;
         const room = this._getRoom();
-        const partCreator = new PartCreator(room, this.context.matrixClient);
+        const partCreator = new PartCreator(room, this.context);
         let parts;
         if (editState.hasEditorState()) {
             // if restoring state from a previous editor,
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 988482df7f..784c4071aa 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -31,10 +31,11 @@ const TextForEvent = require('../../../TextForEvent');
 
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
-import {EventStatus, MatrixClient} from 'matrix-js-sdk';
+import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 const ObjectUtils = require('../../../ObjectUtils');
 
@@ -222,8 +223,8 @@ module.exports = createReactClass({
         };
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     componentWillMount: function() {
@@ -237,7 +238,7 @@ module.exports = createReactClass({
 
     componentDidMount: function() {
         this._suppressReadReceiptAnimation = false;
-        const client = this.context.matrixClient;
+        const client = this.context;
         client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.props.mxEvent.on("Event.decrypted", this._onDecrypted);
         if (this.props.showReactions) {
@@ -262,7 +263,7 @@ module.exports = createReactClass({
     },
 
     componentWillUnmount: function() {
-        const client = this.context.matrixClient;
+        const client = this.context;
         client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
         if (this.props.showReactions) {
@@ -291,7 +292,7 @@ module.exports = createReactClass({
             return;
         }
 
-        const verified = await this.context.matrixClient.isEventSenderVerified(mxEvent);
+        const verified = await this.context.isEventSenderVerified(mxEvent);
         this.setState({
             verified: verified,
         }, () => {
@@ -349,11 +350,11 @@ module.exports = createReactClass({
     },
 
     shouldHighlight: function() {
-        const actions = this.context.matrixClient.getPushActionsForEvent(this.props.mxEvent);
+        const actions = this.context.getPushActionsForEvent(this.props.mxEvent);
         if (!actions || !actions.tweaks) { return false; }
 
         // don't show self-highlights from another of our clients
-        if (this.props.mxEvent.getSender() === this.context.matrixClient.credentials.userId) {
+        if (this.props.mxEvent.getSender() === this.context.credentials.userId) {
             return false;
         }
 
@@ -461,7 +462,7 @@ module.exports = createReactClass({
         // Cancel any outgoing key request for this event and resend it. If a response
         // is received for the request with the required keys, the event could be
         // decrypted successfully.
-        this.context.matrixClient.cancelAndResendEventRoomKeyRequest(this.props.mxEvent);
+        this.context.cancelAndResendEventRoomKeyRequest(this.props.mxEvent);
     },
 
     onPermalinkClicked: function(e) {
@@ -494,7 +495,7 @@ module.exports = createReactClass({
             }
         }
 
-        if (this.context.matrixClient.isRoomEncrypted(ev.getRoomId())) {
+        if (this.context.isRoomEncrypted(ev.getRoomId())) {
             // else if room is encrypted
             // and event is being encrypted or is not_sent (Unknown Devices/Network Error)
             if (ev.status === EventStatus.ENCRYPTING) {
@@ -741,7 +742,7 @@ module.exports = createReactClass({
 
         switch (this.props.tileShape) {
             case 'notif': {
-                const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
+                const room = this.context.getRoom(this.props.mxEvent.getRoomId());
                 return (
                     <div className={classes}>
                         <div className="mx_EventTile_roomName">
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 1a2c8e2212..cb8c5b8d49 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -31,7 +31,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
@@ -48,7 +47,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import E2EIcon from "./E2EIcon";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import MatrixClientPeg from "../../../MatrixClientPeg";
-import {EventTimeline} from "matrix-js-sdk";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 module.exports = createReactClass({
     displayName: 'MemberInfo',
@@ -76,13 +75,13 @@ module.exports = createReactClass({
         };
     },
 
-    contextTypes: {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
+    statics: {
+        contextType: MatrixClientContext,
     },
 
     componentWillMount: function() {
         this._cancelDeviceList = null;
-        const cli = this.context.matrixClient;
+        const cli = this.context;
 
         // only display the devices list if our client supports E2E
         this._enableDevices = cli.isCryptoEnabled();
@@ -112,7 +111,7 @@ module.exports = createReactClass({
     },
 
     componentWillUnmount: function() {
-        const client = this.context.matrixClient;
+        const client = this.context;
         if (client) {
             client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             client.removeListener("Room", this.onRoom);
@@ -131,7 +130,7 @@ module.exports = createReactClass({
     },
 
     _checkIgnoreState: function() {
-        const isIgnoring = this.context.matrixClient.isUserIgnored(this.props.member.userId);
+        const isIgnoring = this.context.isUserIgnored(this.props.member.userId);
         this.setState({isIgnoring: isIgnoring});
     },
 
@@ -163,7 +162,7 @@ module.exports = createReactClass({
 
             // Promise.resolve to handle transition from static result to promise; can be removed
             // in future
-            Promise.resolve(this.context.matrixClient.getStoredDevicesForUser(userId)).then((devices) => {
+            Promise.resolve(this.context.getStoredDevicesForUser(userId)).then((devices) => {
                 this.setState({
                     devices: devices,
                     e2eStatus: this._getE2EStatus(devices),
@@ -197,7 +196,7 @@ module.exports = createReactClass({
     onRoomReceipt: function(receiptEvent, room) {
         // because if we read a notification, it will affect notification count
         // only bother updating if there's a receipt from us
-        if (findReadReceiptFromUserId(receiptEvent, this.context.matrixClient.credentials.userId)) {
+        if (findReadReceiptFromUserId(receiptEvent, this.context.credentials.userId)) {
             this.forceUpdate();
         }
     },
@@ -242,7 +241,7 @@ module.exports = createReactClass({
         let cancelled = false;
         this._cancelDeviceList = function() { cancelled = true; };
 
-        const client = this.context.matrixClient;
+        const client = this.context;
         const self = this;
         client.downloadKeys([member.userId], true).then(() => {
             return client.getStoredDevicesForUser(member.userId);
@@ -267,7 +266,7 @@ module.exports = createReactClass({
     },
 
     onIgnoreToggle: function() {
-        const ignoredUsers = this.context.matrixClient.getIgnoredUsers();
+        const ignoredUsers = this.context.getIgnoredUsers();
         if (this.state.isIgnoring) {
             const index = ignoredUsers.indexOf(this.props.member.userId);
             if (index !== -1) ignoredUsers.splice(index, 1);
@@ -275,7 +274,7 @@ module.exports = createReactClass({
             ignoredUsers.push(this.props.member.userId);
         }
 
-        this.context.matrixClient.setIgnoredUsers(ignoredUsers).then(() => {
+        this.context.setIgnoredUsers(ignoredUsers).then(() => {
             return this.setState({isIgnoring: !this.state.isIgnoring});
         });
     },
@@ -293,7 +292,7 @@ module.exports = createReactClass({
                 if (!proceed) return;
 
                 this.setState({ updating: this.state.updating + 1 });
-                this.context.matrixClient.kick(
+                this.context.kick(
                     this.props.member.roomId, this.props.member.userId,
                     reason || undefined,
                 ).then(function() {
@@ -329,11 +328,11 @@ module.exports = createReactClass({
                 this.setState({ updating: this.state.updating + 1 });
                 let promise;
                 if (this.props.member.membership === 'ban') {
-                    promise = this.context.matrixClient.unban(
+                    promise = this.context.unban(
                         this.props.member.roomId, this.props.member.userId,
                     );
                 } else {
-                    promise = this.context.matrixClient.ban(
+                    promise = this.context.ban(
                         this.props.member.roomId, this.props.member.userId,
                         reason || undefined,
                     );
@@ -360,7 +359,7 @@ module.exports = createReactClass({
 
     onRedactAllMessages: async function() {
         const {roomId, userId} = this.props.member;
-        const room = this.context.matrixClient.getRoom(roomId);
+        const room = this.context.getRoom(roomId);
         if (!room) {
             return;
         }
@@ -414,7 +413,7 @@ module.exports = createReactClass({
             console.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`);
             await Promise.all(eventsToRedact.map(async event => {
                 try {
-                    await this.context.matrixClient.redactEvent(roomId, event.getId());
+                    await this.context.redactEvent(roomId, event.getId());
                 } catch (err) {
                     // log and swallow errors
                     console.error("Could not redact", event.getId());
@@ -446,11 +445,11 @@ module.exports = createReactClass({
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
-        const room = this.context.matrixClient.getRoom(roomId);
+        const room = this.context.getRoom(roomId);
         if (!room) return;
 
         // if muting self, warn as it may be irreversible
-        if (target === this.context.matrixClient.getUserId()) {
+        if (target === this.context.getUserId()) {
             try {
                 if (!(await this._warnSelfDemote())) return;
             } catch (e) {
@@ -478,7 +477,7 @@ module.exports = createReactClass({
 
         if (!isNaN(level)) {
             this.setState({ updating: this.state.updating + 1 });
-            this.context.matrixClient.setPowerLevel(roomId, target, level, powerLevelEvent).then(
+            this.context.setPowerLevel(roomId, target, level, powerLevelEvent).then(
                 function() {
                     // NO-OP; rely on the m.room.member event coming down else we could
                     // get out of sync if we force setState here!
@@ -500,13 +499,13 @@ module.exports = createReactClass({
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
-        const room = this.context.matrixClient.getRoom(roomId);
+        const room = this.context.getRoom(roomId);
         if (!room) return;
 
         const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
         if (!powerLevelEvent) return;
 
-        const me = room.getMember(this.context.matrixClient.credentials.userId);
+        const me = room.getMember(this.context.credentials.userId);
         if (!me) return;
 
         const defaultLevel = powerLevelEvent.getContent().users_default;
@@ -515,7 +514,7 @@ module.exports = createReactClass({
         // toggle the level
         const newLevel = this.state.isTargetMod ? defaultLevel : modLevel;
         this.setState({ updating: this.state.updating + 1 });
-        this.context.matrixClient.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then(
+        this.context.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then(
             function() {
                 // NO-OP; rely on the m.room.member event coming down else we could
                 // get out of sync if we force setState here!
@@ -550,7 +549,7 @@ module.exports = createReactClass({
             danger: true,
             onFinished: (accepted) => {
                 if (!accepted) return;
-                this.context.matrixClient.deactivateSynapseUser(this.props.member.userId).catch(e => {
+                this.context.deactivateSynapseUser(this.props.member.userId).catch(e => {
                     console.error("Failed to deactivate user");
                     console.error(e);
 
@@ -566,7 +565,7 @@ module.exports = createReactClass({
 
     _applyPowerChange: function(roomId, target, powerLevel, powerLevelEvent) {
         this.setState({ updating: this.state.updating + 1 });
-        this.context.matrixClient.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
+        this.context.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
             function() {
                 // NO-OP; rely on the m.room.member event coming down else we could
                 // get out of sync if we force setState here!
@@ -587,7 +586,7 @@ module.exports = createReactClass({
     onPowerChange: async function(powerLevel) {
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
-        const room = this.context.matrixClient.getRoom(roomId);
+        const room = this.context.getRoom(roomId);
         if (!room) return;
 
         const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
@@ -598,7 +597,7 @@ module.exports = createReactClass({
             return;
         }
 
-        const myUserId = this.context.matrixClient.getUserId();
+        const myUserId = this.context.getUserId();
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
         // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
@@ -650,9 +649,9 @@ module.exports = createReactClass({
 
     _calculateOpsPermissions: async function(member) {
         let canDeactivate = false;
-        if (this.context.matrixClient) {
+        if (this.context) {
             try {
-                canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
+                canDeactivate = await this.context.isSynapseAdministrator();
             } catch (e) {
                 console.error(e);
             }
@@ -665,13 +664,13 @@ module.exports = createReactClass({
             },
             muted: false,
         };
-        const room = this.context.matrixClient.getRoom(member.roomId);
+        const room = this.context.getRoom(member.roomId);
         if (!room) return defaultPerms;
 
         const powerLevels = room.currentState.getStateEvents("m.room.power_levels", "");
         if (!powerLevels) return defaultPerms;
 
-        const me = room.getMember(this.context.matrixClient.credentials.userId);
+        const me = room.getMember(this.context.credentials.userId);
         if (!me) return defaultPerms;
 
         const them = member;
@@ -738,7 +737,7 @@ module.exports = createReactClass({
         const avatarUrl = member.getMxcAvatarUrl();
         if (!avatarUrl) return;
 
-        const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl);
+        const httpUrl = this.context.mxcUrlToHttp(avatarUrl);
         const ImageView = sdk.getComponent("elements.ImageView");
         const params = {
             src: httpUrl,
@@ -797,7 +796,7 @@ module.exports = createReactClass({
     },
 
     _renderUserOptions: function() {
-        const cli = this.context.matrixClient;
+        const cli = this.context;
         const member = this.props.member;
 
         let ignoreButton = null;
@@ -905,9 +904,9 @@ module.exports = createReactClass({
         let synapseDeactivateButton;
         let spinner;
 
-        if (this.props.member.userId !== this.context.matrixClient.credentials.userId) {
+        if (this.props.member.userId !== this.context.credentials.userId) {
             // TODO: Immutable DMs replaces a lot of this
-            const dmRoomMap = new DMRoomMap(this.context.matrixClient);
+            const dmRoomMap = new DMRoomMap(this.context);
             // dmRooms will not include dmRooms that we have been invited into but did not join.
             // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room.
             // XXX: we potentially want DMs we have been invited to, to also show up here :L
@@ -918,7 +917,7 @@ module.exports = createReactClass({
 
             const tiles = [];
             for (const roomId of dmRooms) {
-                const room = this.context.matrixClient.getRoom(roomId);
+                const room = this.context.getRoom(roomId);
                 if (room) {
                     const myMembership = room.getMyMembership();
                     // not a DM room if we have are not joined
@@ -1064,12 +1063,12 @@ module.exports = createReactClass({
             }
         }
 
-        const room = this.context.matrixClient.getRoom(this.props.member.roomId);
+        const room = this.context.getRoom(this.props.member.roomId);
         const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
         const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
 
         const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
-        const hsUrl = this.context.matrixClient.baseUrl;
+        const hsUrl = this.context.baseUrl;
         let showPresence = true;
         if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
             showPresence = enablePresenceByHsUrl[hsUrl];
@@ -1108,7 +1107,7 @@ module.exports = createReactClass({
                 </div>
             </div>;
 
-            const isEncrypted = this.context.matrixClient.isRoomEncrypted(this.props.member.roomId);
+            const isEncrypted = this.context.isRoomEncrypted(this.props.member.roomId);
             if (this.state.e2eStatus && isEncrypted) {
                 e2eIconElement = (<E2EIcon status={this.state.e2eStatus} isUser={true} />);
             }
@@ -1117,7 +1116,7 @@ module.exports = createReactClass({
         const avatarUrl = this.props.member.getMxcAvatarUrl();
         let avatarElement;
         if (avatarUrl) {
-            const httpUrl = this.context.matrixClient.mxcUrlToHttp(avatarUrl, 800, 800);
+            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
             avatarElement = <div className="mx_MemberInfo_avatar">
                 <img src={httpUrl} />
             </div>;
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 580e3b0d81..06e6834bec 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -107,8 +107,8 @@ class UploadButton extends React.Component {
         roomId: PropTypes.string.isRequired,
     }
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.onUploadClick = this.onUploadClick.bind(this);
         this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
 
@@ -165,8 +165,8 @@ class UploadButton extends React.Component {
 }
 
 export default class MessageComposer extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this.onEvent = this.onEvent.bind(this);
         this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a5d8492d99..3d462647c8 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -141,8 +141,8 @@ export default class MessageComposerInput extends React.Component {
     autocomplete: Autocomplete;
     historyManager: SlateComposerHistoryManager;
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
 
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index caf8feeea2..af2ea640f5 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -35,8 +35,8 @@ export default class ReplyPreview extends React.Component {
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
     };
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.unmounted = false;
 
         this.state = {
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index af25155588..af7177ebc7 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -26,7 +26,6 @@ import {
     unescapeMessage,
 } from '../../../editor/serialize';
 import {CommandPartCreator} from '../../../editor/parts';
-import {MatrixClient} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
 import ReplyPreview from "./ReplyPreview";
 import RoomViewStore from '../../../stores/RoomViewStore';
@@ -40,6 +39,7 @@ import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
 import {Key} from "../../../Keyboard";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -89,12 +89,10 @@ export default class SendMessageComposer extends React.Component {
         permalinkCreator: PropTypes.object.isRequired,
     };
 
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-    };
+    static contextType = MatrixClientContext;
 
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.model = null;
         this._editorRef = null;
         this.currentlyComposedEditorState = null;
@@ -245,7 +243,7 @@ export default class SendMessageComposer extends React.Component {
             const isReply = !!RoomViewStore.getQuotingEvent();
             const {roomId} = this.props.room;
             const content = createMessageContent(this.model, this.props.permalinkCreator);
-            this.context.matrixClient.sendMessage(roomId, content);
+            this.context.sendMessage(roomId, content);
             if (isReply) {
                 // Clear reply_to_event as we put the message into the queue
                 // if the send fails, retry will handle resending.
@@ -273,7 +271,7 @@ export default class SendMessageComposer extends React.Component {
     }
 
     componentWillMount() {
-        const partCreator = new CommandPartCreator(this.props.room, this.context.matrixClient);
+        const partCreator = new CommandPartCreator(this.props.room, this.context);
         const parts = this._restoreStoredEditorState(partCreator) || [];
         this.model = new EditorModel(parts, partCreator);
         this.dispatcherRef = dis.register(this.onAction);
@@ -361,7 +359,7 @@ export default class SendMessageComposer extends React.Component {
             // from Finder) but more images copied from a different website
             // / word processor etc.
             ContentMessages.sharedInstance().sendContentListToRoom(
-                Array.from(clipboardData.files), this.props.room.roomId, this.context.matrixClient,
+                Array.from(clipboardData.files), this.props.room.roomId, this.context,
             );
         }
     }
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
index ebd9017d73..2b68e0d338 100644
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ b/src/components/views/rooms/SlateMessageComposer.js
@@ -137,8 +137,8 @@ class UploadButton extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
     }
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this.onUploadClick = this.onUploadClick.bind(this);
         this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
 
@@ -193,8 +193,8 @@ class UploadButton extends React.Component {
 }
 
 export default class SlateMessageComposer extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
         this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
         this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this);
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index cb5db10be4..cdde53b44b 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -25,8 +25,8 @@ import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 
 export default class DevicesPanel extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this.state = {
             devices: undefined,
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 98ba29471d..533c15976b 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -23,8 +23,8 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import {formatDate} from '../../../DateUtils';
 
 export default class DevicesPanelEntry extends React.Component {
-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);
 
         this._unmounted = false;
         this.onDeviceToggled = this.onDeviceToggled.bind(this);
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 5d707fcf16..2e718b0b69 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -18,22 +18,19 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
 import sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import {MatrixClient} from "matrix-js-sdk";
 import dis from "../../../../../dispatcher";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
+import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 export default class GeneralRoomSettingsTab extends React.Component {
-    static childContextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
-
     static propTypes = {
         roomId: PropTypes.string.isRequired,
     };
 
+    static contextType = MatrixClientContext;
+
     constructor() {
         super();
 
@@ -42,14 +39,8 @@ export default class GeneralRoomSettingsTab extends React.Component {
         };
     }
 
-    getChildContext() {
-        return {
-            matrixClient: MatrixClientPeg.get(),
-        };
-    }
-
     componentWillMount() {
-        MatrixClientPeg.get().getRoomDirectoryVisibility(this.props.roomId).then((result => {
+        this.context.getRoomDirectoryVisibility(this.props.roomId).then((result => {
             this.setState({isRoomPublished: result.visibility === 'public'});
         }));
     }
@@ -59,7 +50,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const newValue = !valueBefore;
         this.setState({isRoomPublished: newValue});
 
-        MatrixClientPeg.get().setRoomDirectoryVisibility(
+        this.context.setRoomDirectoryVisibility(
             this.props.roomId,
             newValue ? 'public' : 'private',
         ).catch(() => {
@@ -80,7 +71,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
         const UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
 
-        const client = MatrixClientPeg.get();
+        const client = this.context;
         const room = client.getRoom(this.props.roomId);
 
         const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
index 0063a9a981..26e0033233 100644
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
@@ -17,25 +17,8 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
 
 export default class FlairUserSettingsTab extends React.Component {
-    static childContextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient),
-    };
-
-    constructor() {
-        super();
-    }
-
-    getChildContext() {
-        return {
-            matrixClient: MatrixClientPeg.get(),
-        };
-    }
-
     render() {
         return (
             <div className="mx_SettingsTab">
diff --git a/src/utils/withLegacyMatrixClient.js b/src/contexts/MatrixClientContext.js
similarity index 51%
rename from src/utils/withLegacyMatrixClient.js
rename to src/contexts/MatrixClientContext.js
index af6a930a88..54a23ca132 100644
--- a/src/utils/withLegacyMatrixClient.js
+++ b/src/contexts/MatrixClientContext.js
@@ -14,18 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
+import { createContext } from "react";
 
-// Higher Order Component to allow use of legacy MatrixClient React Context
-// in Functional Components which do not otherwise support legacy React Contexts
-export default (Component) => class extends React.PureComponent {
-    static contextTypes = {
-        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
-    };
-
-    render() {
-        return <Component {...this.props} matrixClient={this.context.matrixClient} />;
-    }
-};
+const MatrixClientContext = createContext(undefined);
+MatrixClientContext.displayName = "MatrixClientContext";
+export default MatrixClientContext;
diff --git a/src/contexts/RoomContext.js b/src/contexts/RoomContext.js
new file mode 100644
index 0000000000..8613be195c
--- /dev/null
+++ b/src/contexts/RoomContext.js
@@ -0,0 +1,25 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 { createContext } from "react";
+
+const RoomContext = createContext({
+    canReact: undefined,
+    canReply: undefined,
+    room: undefined,
+});
+RoomContext.displayName = "RoomContext";
+export default RoomContext;
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 7c52512bc2..b7c7b4a396 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -36,27 +36,14 @@ const test_utils = require('test-utils');
 const mockclock = require('mock-clock');
 
 import Velocity from 'velocity-animate';
+import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
+import RoomContext from "../../../src/contexts/RoomContext";
 
 let client;
 const room = new Matrix.Room();
 
 // wrap MessagePanel with a component which provides the MatrixClient in the context.
 const WrappedMessagePanel = createReactClass({
-    childContextTypes: {
-        matrixClient: PropTypes.object,
-        room: PropTypes.object,
-    },
-
-    getChildContext: function() {
-        return {
-            matrixClient: client,
-            room: {
-                canReact: true,
-                canReply: true,
-            },
-        };
-    },
-
     getInitialState: function() {
         return {
             resizeNotifier: new EventEmitter(),
@@ -64,7 +51,11 @@ const WrappedMessagePanel = createReactClass({
     },
 
     render: function() {
-        return <MessagePanel room={room} {...this.props} resizeNotifier={this.state.resizeNotifier} />;
+        return <MatrixClientContext.Provider value={client}>
+            <RoomContext.Provider value={{ canReact: true, canReply: true }}>
+                <MessagePanel room={room} {...this.props} resizeNotifier={this.state.resizeNotifier} />
+            </RoomContext.Provider>
+        </MatrixClientContext.Provider>;
     },
 });
 
diff --git a/test/test-utils.js b/test/test-utils.js
index 64704fc610..047b727251 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -9,6 +9,7 @@ import jssdk from 'matrix-js-sdk';
 import {makeType} from "../src/utils/TypeUtils";
 import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';
+import MatrixClientContext from "../src/contexts/MatrixClientContext";
 const MatrixEvent = jssdk.MatrixEvent;
 
 /**
@@ -291,22 +292,16 @@ export function getDispatchForStore(store) {
 
 export function wrapInMatrixClientContext(WrappedComponent) {
     class Wrapper extends React.Component {
-        static childContextTypes = {
-            matrixClient: PropTypes.object,
-        }
+        constructor(props) {
+            super(props);
 
-        getChildContext() {
-            return {
-                matrixClient: this._matrixClient,
-            };
-        }
-
-        componentWillMount() {
             this._matrixClient = peg.get();
         }
 
         render() {
-            return <WrappedComponent ref={this.props.wrappedRef} {...this.props} />;
+            return <MatrixClientContext.Provider value={this._matrixClient}>
+                <WrappedComponent ref={this.props.wrappedRef} {...this.props} />
+            </MatrixClientContext.Provider>;
         }
     }
     return Wrapper;

From da4d72b3c455452d1b2782dd1957ee47b36c81d6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 17:34:03 +0000
Subject: [PATCH 0044/3235] delint

---
 src/components/views/elements/Flair.js            | 1 -
 src/components/views/groups/GroupTile.js          | 1 -
 src/components/views/right_panel/UserInfo.js      | 2 --
 src/components/views/rooms/EditMessageComposer.js | 1 -
 test/test-utils.js                                | 1 -
 5 files changed, 6 deletions(-)

diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index ef208bbea9..0af772466b 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -18,7 +18,6 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixClient} from 'matrix-js-sdk';
 import FlairStore from '../../../stores/FlairStore';
 import dis from '../../../dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index a6447cdf14..f3d7418a44 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import {MatrixClient} from 'matrix-js-sdk';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index e952f8fad9..793a06bbaf 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -857,8 +857,6 @@ function useRoomPermissions(cli, room, user) {
 }
 
 const PowerLevelSection = ({user, room, roomPermissions, powerLevels}) => {
-    const cli = useContext(MatrixClientContext);
-
     const [isEditing, setEditing] = useState(false);
     if (room && user.roomId) { // is in room
         if (isEditing) {
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 94ef00183e..43f378a1e0 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -26,7 +26,6 @@ import {findEditableEvent} from '../../../utils/EventUtils';
 import {parseEvent} from '../../../editor/deserialize';
 import {PartCreator} from '../../../editor/parts';
 import EditorStateTransfer from '../../../utils/EditorStateTransfer';
-import {MatrixClient} from 'matrix-js-sdk';
 import classNames from 'classnames';
 import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
diff --git a/test/test-utils.js b/test/test-utils.js
index 047b727251..5c8c7f8a10 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -2,7 +2,6 @@
 
 import sinon from 'sinon';
 import React from 'react';
-import PropTypes from 'prop-types';
 import peg from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher';
 import jssdk from 'matrix-js-sdk';

From f3ca4c0b7cf04d5d6d0a3bbf5b7204211bf1d65a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 17:54:19 +0000
Subject: [PATCH 0045/3235] fix tests

---
 .../views/elements/MemberEventListSummary-test.js           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index a31cbdebb5..a25b2cb945 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -115,7 +115,8 @@ describe('MemberEventListSummary', function() {
 
         const renderer = new ShallowRenderer();
         renderer.render(<MemberEventListSummary {...props} />);
-        const result = renderer.getRenderOutput();
+        const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper
+        const result = wrapper.props.children[0];
 
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,
@@ -137,7 +138,8 @@ describe('MemberEventListSummary', function() {
 
         const renderer = new ShallowRenderer();
         renderer.render(<MemberEventListSummary {...props} />);
-        const result = renderer.getRenderOutput();
+        const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper
+        const result = wrapper.props.children[0];
 
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,

From 513ec30ef1fad097095fb65c0d0d29be3dcba5e3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Dec 2019 18:02:45 +0000
Subject: [PATCH 0046/3235] Fix tests v2

---
 test/components/views/elements/MemberEventListSummary-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index a25b2cb945..906ba45711 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -116,7 +116,7 @@ describe('MemberEventListSummary', function() {
         const renderer = new ShallowRenderer();
         renderer.render(<MemberEventListSummary {...props} />);
         const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper
-        const result = wrapper.props.children[0];
+        const result = wrapper.props.children;
 
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,
@@ -139,7 +139,7 @@ describe('MemberEventListSummary', function() {
         const renderer = new ShallowRenderer();
         renderer.render(<MemberEventListSummary {...props} />);
         const wrapper = renderer.getRenderOutput(); // matrix cli context wrapper
-        const result = wrapper.props.children[0];
+        const result = wrapper.props.children;
 
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,

From d35b01b63a5ed1f5d0da79f8872500ef6a7fedbc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Dec 2019 15:40:19 +0000
Subject: [PATCH 0047/3235] Get rid of stripped-emoji.json in favour of an
 in-memory single truth source

---
 package.json                                  |  1 -
 scripts/emoji-data-strip.js                   | 30 -------
 src/HtmlUtils.js                              | 23 +-----
 src/autocomplete/EmojiProvider.js             | 36 ++++----
 src/autocomplete/QueryMatcher.js              |  1 +
 .../views/emojipicker/EmojiPicker.js          | 46 +----------
 .../views/emojipicker/QuickReactions.js       |  8 +-
 .../views/rooms/BasicMessageComposer.js       |  5 +-
 .../views/rooms/MessageComposerInput.js       |  4 +-
 src/emoji.js                                  | 82 +++++++++++++++++++
 src/stripped-emoji.json                       |  1 -
 11 files changed, 115 insertions(+), 122 deletions(-)
 delete mode 100644 scripts/emoji-data-strip.js
 create mode 100644 src/emoji.js
 delete mode 100644 src/stripped-emoji.json

diff --git a/package.json b/package.json
index 8688fe42e6..7ef14e6635 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
     "build": "yarn reskindex && yarn start:init",
     "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
-    "emoji-data-strip": "node scripts/emoji-data-strip.js",
     "start": "yarn start:init && yarn start:all",
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn build:watch\" \"yarn reskindex:watch\"",
     "start:init": "babel src -d lib --source-maps --copy-files",
diff --git a/scripts/emoji-data-strip.js b/scripts/emoji-data-strip.js
deleted file mode 100644
index 1c3738cab1..0000000000
--- a/scripts/emoji-data-strip.js
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-
-// This generates src/stripped-emoji.json as used by the EmojiProvider autocomplete
-// provider.
-
-const EMOJIBASE = require('emojibase-data/en/compact.json');
-
-const fs = require('fs');
-
-const output = EMOJIBASE.map(
-    (datum) => {
-        const newDatum = {
-            name: datum.annotation,
-            shortname: `:${datum.shortcodes[0]}:`,
-            category: datum.group,
-            emoji_order: datum.order,
-        };
-        if (datum.shortcodes.length > 1) {
-            newDatum.aliases = datum.shortcodes.slice(1).map(s => `:${s}:`);
-        }
-        if (datum.emoticon) {
-            newDatum.aliases_ascii = [ datum.emoticon ];
-        }
-        return newDatum;
-    }
-);
-
-// Write to a file in src. Changes should be checked into git. This file is copied by
-// babel using --copy-files
-fs.writeFileSync('./src/stripped-emoji.json', JSON.stringify(output));
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 2b7384a5aa..7cdff26a21 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -32,9 +32,9 @@ import classNames from 'classnames';
 import MatrixClientPeg from './MatrixClientPeg';
 import url from 'url';
 
-import EMOJIBASE from 'emojibase-data/en/compact.json';
 import EMOJIBASE_REGEX from 'emojibase-regex';
 import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
+import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
 
 linkifyMatrix(linkify);
 
@@ -58,8 +58,6 @@ const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/;
 
 const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
 
-const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
-
 /*
  * Return true if the given string contains emoji
  * Uses a much, much simpler regex than emojibase's so will give false
@@ -71,21 +69,6 @@ function mightContainEmoji(str) {
     return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
 }
 
-/**
- * Find emoji data in emojibase by character.
- *
- * @param {String} char The emoji character
- * @return {Object} The emoji data
- */
-export function findEmojiData(char) {
-    // Check against both the char and the char with an empty variation selector
-    // appended because that's how emojibase stores its base emojis which have
-    // variations.
-    // See also https://github.com/vector-im/riot-web/issues/9785.
-    const emptyVariation = char + VARIATION_SELECTOR;
-    return EMOJIBASE.find(e => e.unicode === char || e.unicode === emptyVariation);
-}
-
 /**
  * Returns the shortcode for an emoji character.
  *
@@ -93,7 +76,7 @@ export function findEmojiData(char) {
  * @return {String} The shortcode (such as :thumbup:)
  */
 export function unicodeToShortcode(char) {
-    const data = findEmojiData(char);
+    const data = getEmojiFromUnicode(char);
     return (data && data.shortcodes ? `:${data.shortcodes[0]}:` : '');
 }
 
@@ -105,7 +88,7 @@ export function unicodeToShortcode(char) {
  */
 export function shortcodeToUnicode(shortcode) {
     shortcode = shortcode.slice(1, shortcode.length - 1);
-    const data = EMOJIBASE.find(e => e.shortcodes && e.shortcodes.includes(shortcode));
+    const data = SHORTCODE_TO_EMOJI.get(shortcode);
     return data ? data.unicode : null;
 }
 
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 1e39593022..7e30c8ca6a 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -2,6 +2,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ import SettingsStore from "../settings/SettingsStore";
 import { shortcodeToUnicode } from '../HtmlUtils';
 
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-import EmojiData from '../stripped-emoji.json';
+import EMOJIBASE from 'emojibase-data/en/compact.json';
 
 const LIMIT = 20;
 
@@ -38,19 +39,15 @@ const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|:[+-\\w]*:?)$', '
 // XXX: it's very unclear why we bother with this generated emojidata file.
 // all it means is that we end up bloating the bundle with precomputed stuff
 // which would be trivial to calculate and cache on demand.
-const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sort(
-    (a, b) => {
-        if (a.category === b.category) {
-            return a.emoji_order - b.emoji_order;
-        }
-        return a.category - b.category;
-    },
-).map((a, index) => {
+const EMOJI_SHORTNAMES = EMOJIBASE.sort((a, b) => {
+    if (a.group === b.group) {
+        return a.order - b.order;
+    }
+    return a.group - b.group;
+}).map((emoji, index) => {
     return {
-        name: a.name,
-        shortname: a.shortname,
-        aliases: a.aliases ? a.aliases.join(' ') : '',
-        aliases_ascii: a.aliases_ascii ? a.aliases_ascii.join(' ') : '',
+        emoji,
+        shortname: `:${emoji.shortcodes[0]}:`,
         // Include the index so that we can preserve the original order
         _orderBy: index,
     };
@@ -69,12 +66,16 @@ export default class EmojiProvider extends AutocompleteProvider {
     constructor() {
         super(EMOJI_REGEX);
         this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
-            keys: ['aliases_ascii', 'shortname', 'aliases'],
+            keys: ['emoji.emoticon', 'shortname'],
+            funcs: [
+            //     (o) => `:${o.emoji.shortcodes[0]}:`, // shortname
+                (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases
+            ],
             // For matching against ascii equivalents
             shouldMatchWordsOnly: false,
         });
         this.nameMatcher = new QueryMatcher(EMOJI_SHORTNAMES, {
-            keys: ['name'],
+            keys: ['emoji.annotation'],
             // For removing punctuation
             shouldMatchWordsOnly: true,
         });
@@ -96,7 +97,7 @@ export default class EmojiProvider extends AutocompleteProvider {
 
             const sorters = [];
             // make sure that emoticons come first
-            sorters.push((c) => score(matchedString, c.aliases_ascii));
+            sorters.push((c) => score(matchedString, c.emoji.emoticon || ""));
 
             // then sort by score (Infinity if matchedString not in shortname)
             sorters.push((c) => score(matchedString, c.shortname));
@@ -110,8 +111,7 @@ export default class EmojiProvider extends AutocompleteProvider {
             sorters.push((c) => c._orderBy);
             completions = _sortBy(_uniq(completions), sorters);
 
-            completions = completions.map((result) => {
-                const { shortname } = result;
+            completions = completions.map(({shortname}) => {
                 const unicode = shortcodeToUnicode(shortname);
                 return {
                     completion: unicode,
diff --git a/src/autocomplete/QueryMatcher.js b/src/autocomplete/QueryMatcher.js
index a28d3003cf..ef1605e7a6 100644
--- a/src/autocomplete/QueryMatcher.js
+++ b/src/autocomplete/QueryMatcher.js
@@ -71,6 +71,7 @@ export default class QueryMatcher {
             }
 
             for (const keyValue of keyValues) {
+                if (!keyValue) continue; // skip falsy keyValues
                 const key = stripDiacritics(keyValue).toLowerCase();
                 if (!this._items.has(key)) {
                     this._items.set(key, []);
diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index 0ec11c2b38..4d49b25100 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -16,54 +16,12 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import EMOJIBASE from 'emojibase-data/en/compact.json';
 
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 import * as recent from './recent';
-
-const EMOJIBASE_CATEGORY_IDS = [
-    "people", // smileys
-    "people", // actually people
-    "control", // modifiers and such, not displayed in picker
-    "nature",
-    "foods",
-    "places",
-    "activity",
-    "objects",
-    "symbols",
-    "flags",
-];
-
-const DATA_BY_CATEGORY = {
-    "people": [],
-    "nature": [],
-    "foods": [],
-    "places": [],
-    "activity": [],
-    "objects": [],
-    "symbols": [],
-    "flags": [],
-};
-const DATA_BY_EMOJI = {};
-
-const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
-EMOJIBASE.forEach(emoji => {
-    if (emoji.unicode.includes(VARIATION_SELECTOR)) {
-        // Clone data into variation-less version
-        emoji = Object.assign({}, emoji, {
-            unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""),
-        });
-    }
-    DATA_BY_EMOJI[emoji.unicode] = emoji;
-    const categoryId = EMOJIBASE_CATEGORY_IDS[emoji.group];
-    if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
-        DATA_BY_CATEGORY[categoryId].push(emoji);
-    }
-    // This is used as the string to match the query against when filtering emojis.
-    emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
-});
+import {DATA_BY_CATEGORY, getEmojiFromUnicode} from "../../../emoji";
 
 export const CATEGORY_HEADER_HEIGHT = 22;
 export const EMOJI_HEIGHT = 37;
@@ -91,7 +49,7 @@ class EmojiPicker extends React.Component {
 
         // Convert recent emoji characters to emoji data, removing unknowns.
         this.recentlyUsed = recent.get()
-            .map(unicode => DATA_BY_EMOJI[unicode])
+            .map(unicode => getEmojiFromUnicode(unicode))
             .filter(data => !!data);
         this.memoizedDataByCategory = {
             recent: this.recentlyUsed,
diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js
index 8444fb2d9c..e4419e9f3a 100644
--- a/src/components/views/emojipicker/QuickReactions.js
+++ b/src/components/views/emojipicker/QuickReactions.js
@@ -19,15 +19,15 @@ import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import { findEmojiData } from '../../../HtmlUtils';
+import {getEmojiFromUnicode} from "../../../emoji";
 
+// We use the variation-selector Heart in Quick Reactions for some reason
 const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => {
-    const data = findEmojiData(emoji);
+    const data = getEmojiFromUnicode(emoji);
     if (!data) {
         throw new Error(`Emoji ${emoji} doesn't exist in emojibase`);
     }
-    // Prefer our unicode value for quick reactions (which does not have
-    // variation selectors).
+    // Prefer our unicode value for quick reactions as we sometimes use variation selectors.
     return Object.assign({}, data, { unicode: emoji });
 });
 
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index c7659e89fb..b550644470 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -34,11 +34,11 @@ import {parsePlainTextMessage} from '../../../editor/deserialize';
 import {renderModel} from '../../../editor/render';
 import {Room} from 'matrix-js-sdk';
 import TypingStore from "../../../stores/TypingStore";
-import EMOJIBASE from 'emojibase-data/en/compact.json';
 import SettingsStore from "../../../settings/SettingsStore";
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
 import sdk from '../../../index';
 import {Key} from "../../../Keyboard";
+import {EMOTICON_TO_EMOJI} from "../../../emoji";
 
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
 
@@ -108,7 +108,8 @@ export default class BasicMessageEditor extends React.Component {
         const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text);
         if (emoticonMatch) {
             const query = emoticonMatch[1].toLowerCase().replace("-", "");
-            const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false);
+            const data = EMOTICON_TO_EMOJI.get(query);
+
             if (data) {
                 const {partCreator} = model;
                 const hasPrecedingSpace = emoticonMatch[0][0] === " ";
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index a5d8492d99..dc8e8e439f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -48,7 +48,6 @@ import Markdown from '../../../Markdown';
 import MessageComposerStore from '../../../stores/MessageComposerStore';
 import ContentMessages from '../../../ContentMessages';
 
-import EMOJIBASE from 'emojibase-data/en/compact.json';
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
 
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
@@ -61,6 +60,7 @@ import AccessibleButton from '../elements/AccessibleButton';
 import {findEditableEvent} from '../../../utils/EventUtils';
 import SlateComposerHistoryManager from "../../../SlateComposerHistoryManager";
 import TypingStore from "../../../stores/TypingStore";
+import {EMOTICON_TO_EMOJI} from "../../../emoji";
 
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
 
@@ -464,7 +464,7 @@ export default class MessageComposerInput extends React.Component {
                 const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset));
                 if (emoticonMatch) {
                     const query = emoticonMatch[1].toLowerCase().replace("-", "");
-                    const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false);
+                    const data = EMOTICON_TO_EMOJI.get(query);
 
                     // only perform replacement if we found a match, otherwise we would be not letting user type
                     if (data) {
diff --git a/src/emoji.js b/src/emoji.js
new file mode 100644
index 0000000000..7b7a9c1bfe
--- /dev/null
+++ b/src/emoji.js
@@ -0,0 +1,82 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 EMOJIBASE from 'emojibase-data/en/compact.json';
+
+export const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
+
+// The unicode is stored without the variant selector
+const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode
+export const EMOTICON_TO_EMOJI = new Map();
+export const SHORTCODE_TO_EMOJI = new Map();
+
+export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(unicode.replace(VARIATION_SELECTOR, ""));
+
+const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
+    "people", // smileys
+    "people", // actually people
+    "control", // modifiers and such, not displayed in picker
+    "nature",
+    "foods",
+    "places",
+    "activity",
+    "objects",
+    "symbols",
+    "flags",
+];
+
+export const DATA_BY_CATEGORY = {
+    "people": [],
+    "nature": [],
+    "foods": [],
+    "places": [],
+    "activity": [],
+    "objects": [],
+    "symbols": [],
+    "flags": [],
+};
+
+// Store various mappings from unicode/emoticon/shortcode to the Emoji objects
+EMOJIBASE.forEach(emoji => {
+    if (emoji.unicode.includes(VARIATION_SELECTOR)) {
+        // Clone data into variation-less version
+        emoji = Object.assign({}, emoji, {
+            unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""),
+        });
+    }
+
+    const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
+    if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
+        DATA_BY_CATEGORY[categoryId].push(emoji);
+    }
+    // This is used as the string to match the query against when filtering emojis
+    emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
+
+    // Add mapping from unicode to Emoji object
+    UNICODE_TO_EMOJI.set(emoji.unicode, emoji);
+
+    if (emoji.emoticon) {
+        // Add mapping from emoticon to Emoji object
+        EMOTICON_TO_EMOJI.set(emoji.emoticon, emoji);
+    }
+
+    if (emoji.shortcodes) {
+        // Add mapping from each shortcode to Emoji object
+        emoji.shortcodes.forEach(shortcode => {
+            SHORTCODE_TO_EMOJI.set(shortcode, emoji);
+        });
+    }
+});
diff --git a/src/stripped-emoji.json b/src/stripped-emoji.json
deleted file mode 100644
index 9d4308d24e..0000000000
--- a/src/stripped-emoji.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"name":"grinning face","shortname":":gleeful:","category":0,"emoji_order":1},{"name":"grinning face with big eyes","shortname":":glad:","category":0,"emoji_order":2,"aliases":[":smile:"]},{"name":"grinning face with smiling eyes","shortname":":happy:","category":0,"emoji_order":3},{"name":"beaming face with smiling eyes","shortname":":blissful:","category":0,"emoji_order":4,"aliases":[":grin:"],"aliases_ascii":[":D"]},{"name":"grinning squinting face","shortname":":amused:","category":0,"emoji_order":5,"aliases":[":laugh:",":lol:"],"aliases_ascii":["xD"]},{"name":"grinning face with sweat","shortname":":embarassed:","category":0,"emoji_order":6},{"name":"rolling on the floor laughing","shortname":":entertained:","category":0,"emoji_order":7,"aliases":[":rofl:"],"aliases_ascii":[":'D"]},{"name":"face with tears of joy","shortname":":joyful:","category":0,"emoji_order":8,"aliases":[":haha:"],"aliases_ascii":[":')"]},{"name":"slightly smiling face","shortname":":pleased:","category":0,"emoji_order":9,"aliases_ascii":[":)"]},{"name":"upside-down face","shortname":":ecstatic:","category":0,"emoji_order":10,"aliases":[":upside_down:"]},{"name":"winking face","shortname":":coy:","category":0,"emoji_order":11,"aliases":[":wink:"],"aliases_ascii":[";)"]},{"name":"smiling face with smiling eyes","shortname":":blush:","category":0,"emoji_order":12,"aliases_ascii":[":>"]},{"name":"smiling face with halo","shortname":":innocent:","category":0,"emoji_order":13,"aliases":[":halo:"],"aliases_ascii":["o:)"]},{"name":"smiling face with hearts","shortname":":love:","category":0,"emoji_order":14},{"name":"smiling face with heart-eyes","shortname":":lovestruck:","category":0,"emoji_order":15},{"name":"star-struck","shortname":":starstruck:","category":0,"emoji_order":16},{"name":"face blowing a kiss","shortname":":flirty:","category":0,"emoji_order":17,"aliases_ascii":[":x"]},{"name":"kissing face","shortname":":kiss:","category":0,"emoji_order":18},{"name":"smiling face","shortname":":relaxed:","category":0,"emoji_order":20},{"name":"kissing face with closed eyes","shortname":":loving_kiss:","category":0,"emoji_order":21,"aliases_ascii":[":*"]},{"name":"kissing face with smiling eyes","shortname":":happy_kiss:","category":0,"emoji_order":22},{"name":"face savoring food","shortname":":yum:","category":0,"emoji_order":23,"aliases":[":savour:"]},{"name":"face with tongue","shortname":":playful:","category":0,"emoji_order":24,"aliases":[":tongue_out:"],"aliases_ascii":[":p"]},{"name":"winking face with tongue","shortname":":mischievous:","category":0,"emoji_order":25,"aliases_ascii":[";p"]},{"name":"zany face","shortname":":crazy:","category":0,"emoji_order":26},{"name":"squinting face with tongue","shortname":":facetious:","category":0,"emoji_order":27,"aliases":[":lmao:"],"aliases_ascii":["xp"]},{"name":"money-mouth face","shortname":":pretentious:","category":0,"emoji_order":28,"aliases":[":money_mouth:"]},{"name":"hugging face","shortname":":hugging:","category":0,"emoji_order":29},{"name":"face with hand over mouth","shortname":":gasp:","category":0,"emoji_order":30},{"name":"shushing face","shortname":":shushing:","category":0,"emoji_order":31},{"name":"thinking face","shortname":":curious:","category":0,"emoji_order":32,"aliases":[":thinking:"],"aliases_ascii":[":l"]},{"name":"zipper-mouth face","shortname":":silenced:","category":0,"emoji_order":33,"aliases":[":zipper_mouth:"],"aliases_ascii":[":z"]},{"name":"face with raised eyebrow","shortname":":contempt:","category":0,"emoji_order":34},{"name":"neutral face","shortname":":indifferent:","category":0,"emoji_order":35,"aliases":[":neutral:"],"aliases_ascii":[":|"]},{"name":"expressionless face","shortname":":apathetic:","category":0,"emoji_order":36,"aliases":[":expressionless:"]},{"name":"face without mouth","shortname":":vacant:","category":0,"emoji_order":37,"aliases":[":no_mouth:"],"aliases_ascii":[":#"]},{"name":"smirking face","shortname":":cocky:","category":0,"emoji_order":38,"aliases":[":smirk:"],"aliases_ascii":[":j"]},{"name":"unamused face","shortname":":unamused:","category":0,"emoji_order":39,"aliases_ascii":[":?"]},{"name":"face with rolling eyes","shortname":":disbelief:","category":0,"emoji_order":40},{"name":"grimacing face","shortname":":grimaced:","category":0,"emoji_order":41,"aliases_ascii":["8D"]},{"name":"lying face","shortname":":lying:","category":0,"emoji_order":42},{"name":"relieved face","shortname":":relieved:","category":0,"emoji_order":43},{"name":"pensive face","shortname":":pensive:","category":0,"emoji_order":44},{"name":"sleepy face","shortname":":sleepy:","category":0,"emoji_order":45},{"name":"drooling face","shortname":":drooling:","category":0,"emoji_order":46},{"name":"sleeping face","shortname":":exhausted:","category":0,"emoji_order":47,"aliases":[":sleeping:"]},{"name":"face with medical mask","shortname":":ill:","category":0,"emoji_order":48,"aliases":[":mask:"]},{"name":"face with thermometer","shortname":":sick:","category":0,"emoji_order":49},{"name":"face with head-bandage","shortname":":injured:","category":0,"emoji_order":50},{"name":"nauseated face","shortname":":nauseated:","category":0,"emoji_order":51,"aliases_ascii":["%("]},{"name":"face vomiting","shortname":":vomiting:","category":0,"emoji_order":52},{"name":"sneezing face","shortname":":sneezing:","category":0,"emoji_order":53},{"name":"hot face","shortname":":overheating:","category":0,"emoji_order":54},{"name":"cold face","shortname":":freezing:","category":0,"emoji_order":55},{"name":"woozy face","shortname":":woozy:","category":0,"emoji_order":56,"aliases_ascii":[":&"]},{"name":"dizzy face","shortname":":dizzy:","category":0,"emoji_order":57,"aliases_ascii":["xo"]},{"name":"exploding head","shortname":":shocked:","category":0,"emoji_order":58,"aliases":[":exploding_head:"]},{"name":"cowboy hat face","shortname":":cowboy:","category":0,"emoji_order":59},{"name":"partying face","shortname":":partying:","category":0,"emoji_order":60,"aliases":[":celebrating:"]},{"name":"smiling face with sunglasses","shortname":":confident:","category":0,"emoji_order":61,"aliases_ascii":["8)"]},{"name":"nerd face","shortname":":nerd:","category":0,"emoji_order":62,"aliases_ascii":[":B"]},{"name":"face with monocle","shortname":":monocle:","category":0,"emoji_order":63},{"name":"confused face","shortname":":confused:","category":0,"emoji_order":64,"aliases_ascii":[":/"]},{"name":"worried face","shortname":":worried:","category":0,"emoji_order":65},{"name":"slightly frowning face","shortname":":cheerless:","category":0,"emoji_order":66},{"name":"frowning face","shortname":":sad:","category":0,"emoji_order":68,"aliases":[":frowning:"],"aliases_ascii":[":("]},{"name":"face with open mouth","shortname":":surprised:","category":0,"emoji_order":69},{"name":"hushed face","shortname":":hushed:","category":0,"emoji_order":70},{"name":"astonished face","shortname":":astonished:","category":0,"emoji_order":71,"aliases_ascii":[":o"]},{"name":"flushed face","shortname":":flushed:","category":0,"emoji_order":72,"aliases_ascii":[":$"]},{"name":"pleading face","shortname":":pleading:","category":0,"emoji_order":73},{"name":"frowning face with open mouth","shortname":":bored:","category":0,"emoji_order":74},{"name":"anguished face","shortname":":anguished:","category":0,"emoji_order":75,"aliases":[":wtf:"],"aliases_ascii":[":s"]},{"name":"fearful face","shortname":":fearful:","category":0,"emoji_order":76},{"name":"anxious face with sweat","shortname":":cold_sweat:","category":0,"emoji_order":77,"aliases":[":anxious:",":frustrated:"]},{"name":"sad but relieved face","shortname":":hopeful:","category":0,"emoji_order":78},{"name":"crying face","shortname":":upset:","category":0,"emoji_order":79,"aliases":[":cry:"],"aliases_ascii":[":'("]},{"name":"loudly crying face","shortname":":distressed:","category":0,"emoji_order":80,"aliases":[":sob:"],"aliases_ascii":[":'o"]},{"name":"face screaming in fear","shortname":":frightened:","category":0,"emoji_order":81,"aliases":[":scream:"],"aliases_ascii":["Dx"]},{"name":"confounded face","shortname":":confounded:","category":0,"emoji_order":82,"aliases_ascii":["x("]},{"name":"persevering face","shortname":":persevered:","category":0,"emoji_order":83},{"name":"disappointed face","shortname":":disappointed:","category":0,"emoji_order":84},{"name":"downcast face with sweat","shortname":":shamed:","category":0,"emoji_order":85,"aliases_ascii":[":<"]},{"name":"weary face","shortname":":weary:","category":0,"emoji_order":86,"aliases_ascii":["D:"]},{"name":"tired face","shortname":":tired:","category":0,"emoji_order":87,"aliases_ascii":[":c"]},{"name":"yawning face","shortname":":yawn:","category":0,"emoji_order":88},{"name":"face with steam from nose","shortname":":annoyed:","category":0,"emoji_order":89,"aliases":[":hrmph:"]},{"name":"pouting face","shortname":":enraged:","category":0,"emoji_order":90,"aliases":[":pout:"],"aliases_ascii":[">:/"]},{"name":"angry face","shortname":":angry:","category":0,"emoji_order":91},{"name":"face with symbols on mouth","shortname":":censored:","category":0,"emoji_order":92,"aliases_ascii":[":@"]},{"name":"smiling face with horns","shortname":":imp:","category":0,"emoji_order":93,"aliases_ascii":[">:)"]},{"name":"angry face with horns","shortname":":angry_imp:","category":0,"emoji_order":94,"aliases_ascii":[">:("]},{"name":"skull","shortname":":skull:","category":0,"emoji_order":95},{"name":"skull and crossbones","shortname":":crossbones:","category":0,"emoji_order":97},{"name":"pile of poo","shortname":":poop:","category":0,"emoji_order":98},{"name":"clown face","shortname":":clown:","category":0,"emoji_order":99},{"name":"ogre","shortname":":ogre:","category":0,"emoji_order":100,"aliases_ascii":[">0)"]},{"name":"goblin","shortname":":goblin:","category":0,"emoji_order":101},{"name":"ghost","shortname":":ghost:","category":0,"emoji_order":102},{"name":"alien","shortname":":alien:","category":0,"emoji_order":103},{"name":"alien monster","shortname":":alien_monster:","category":0,"emoji_order":104,"aliases":[":space_invader:"]},{"name":"robot","shortname":":robot:","category":0,"emoji_order":105},{"name":"grinning cat","shortname":":smiling_cat:","category":0,"emoji_order":106},{"name":"grinning cat with smiling eyes","shortname":":grinning_cat:","category":0,"emoji_order":107},{"name":"cat with tears of joy","shortname":":joyful_cat:","category":0,"emoji_order":108},{"name":"smiling cat with heart-eyes","shortname":":lovestruck_cat:","category":0,"emoji_order":109},{"name":"cat with wry smile","shortname":":smirking_cat:","category":0,"emoji_order":110},{"name":"kissing cat","shortname":":kissing_cat:","category":0,"emoji_order":111,"aliases_ascii":[":3"]},{"name":"weary cat","shortname":":weary_cat:","category":0,"emoji_order":112},{"name":"crying cat","shortname":":crying_cat:","category":0,"emoji_order":113},{"name":"pouting cat","shortname":":pouting_cat:","category":0,"emoji_order":114},{"name":"see-no-evil monkey","shortname":":see_no_evil:","category":0,"emoji_order":115},{"name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":0,"emoji_order":116},{"name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":0,"emoji_order":117},{"name":"kiss mark","shortname":":kiss_lips:","category":0,"emoji_order":118},{"name":"love letter","shortname":":love_letter:","category":0,"emoji_order":119},{"name":"heart with arrow","shortname":":cupid:","category":0,"emoji_order":120},{"name":"heart with ribbon","shortname":":heart_ribbon:","category":0,"emoji_order":121},{"name":"sparkling heart","shortname":":sparkling_heart:","category":0,"emoji_order":122},{"name":"growing heart","shortname":":heartpulse:","category":0,"emoji_order":123},{"name":"beating heart","shortname":":heartbeat:","category":0,"emoji_order":124},{"name":"revolving hearts","shortname":":revolving_hearts:","category":0,"emoji_order":125},{"name":"two hearts","shortname":":two_hearts:","category":0,"emoji_order":126},{"name":"heart decoration","shortname":":heart_decoration:","category":0,"emoji_order":127},{"name":"heart exclamation","shortname":":heart_exclamation:","category":0,"emoji_order":129},{"name":"broken heart","shortname":":broken_heart:","category":0,"emoji_order":130,"aliases_ascii":["</3"]},{"name":"red heart","shortname":":heart:","category":0,"emoji_order":132,"aliases_ascii":["<3"]},{"name":"orange heart","shortname":":orange_heart:","category":0,"emoji_order":133},{"name":"yellow heart","shortname":":yellow_heart:","category":0,"emoji_order":134},{"name":"green heart","shortname":":green_heart:","category":0,"emoji_order":135},{"name":"blue heart","shortname":":blue_heart:","category":0,"emoji_order":136},{"name":"purple heart","shortname":":purple_heart:","category":0,"emoji_order":137},{"name":"brown heart","shortname":":brown_heart:","category":0,"emoji_order":138},{"name":"black heart","shortname":":black_heart:","category":0,"emoji_order":139},{"name":"white heart","shortname":":white_heart:","category":0,"emoji_order":140},{"name":"hundred points","shortname":":100:","category":0,"emoji_order":141},{"name":"anger symbol","shortname":":anger:","category":0,"emoji_order":142},{"name":"collision","shortname":":boom:","category":0,"emoji_order":143,"aliases":[":collision:"]},{"name":"dizzy","shortname":":dizzy_star:","category":0,"emoji_order":144},{"name":"sweat droplets","shortname":":sweat_drops:","category":0,"emoji_order":145},{"name":"dashing away","shortname":":dash:","category":0,"emoji_order":146},{"name":"hole","shortname":":hole:","category":0,"emoji_order":148},{"name":"bomb","shortname":":bomb:","category":0,"emoji_order":149},{"name":"speech balloon","shortname":":speech:","category":0,"emoji_order":150},{"name":"eye in speech bubble","shortname":":eye_bubble:","category":0,"emoji_order":151},{"name":"left speech bubble","shortname":":left_speech:","category":0,"emoji_order":156},{"name":"right anger bubble","shortname":":right_anger_speech:","category":0,"emoji_order":158},{"name":"thought balloon","shortname":":thought:","category":0,"emoji_order":159},{"name":"zzz","shortname":":zzz:","category":0,"emoji_order":160},{"name":"waving hand","shortname":":wave:","category":1,"emoji_order":161},{"name":"raised back of hand","shortname":":raised_backhand:","category":1,"emoji_order":167},{"name":"hand with fingers splayed","shortname":":splayed_hand:","category":1,"emoji_order":174},{"name":"raised hand","shortname":":raised_hand:","category":1,"emoji_order":180},{"name":"vulcan salute","shortname":":vulcan:","category":1,"emoji_order":186},{"name":"OK hand","shortname":":ok_hand:","category":1,"emoji_order":192},{"name":"pinching hand","shortname":":pinch:","category":1,"emoji_order":198},{"name":"victory hand","shortname":":victory:","category":1,"emoji_order":205},{"name":"crossed fingers","shortname":":fingers_crossed:","category":1,"emoji_order":211},{"name":"love-you gesture","shortname":":love_you_gesture:","category":1,"emoji_order":217},{"name":"sign of the horns","shortname":":metal:","category":1,"emoji_order":223,"aliases_ascii":["\\m/"]},{"name":"call me hand","shortname":":call_me:","category":1,"emoji_order":229},{"name":"backhand index pointing left","shortname":":point_left:","category":1,"emoji_order":235},{"name":"backhand index pointing right","shortname":":point_right:","category":1,"emoji_order":241},{"name":"backhand index pointing up","shortname":":backhand_point_up:","category":1,"emoji_order":247},{"name":"middle finger","shortname":":middle_finger:","category":1,"emoji_order":253},{"name":"backhand index pointing down","shortname":":point_down:","category":1,"emoji_order":259},{"name":"index pointing up","shortname":":point_up:","category":1,"emoji_order":266},{"name":"thumbs up","shortname":":thumbsup:","category":1,"emoji_order":272,"aliases":[":+1:",":yes:"]},{"name":"thumbs down","shortname":":thumbsdown:","category":1,"emoji_order":278,"aliases":[":-1:",":no:"]},{"name":"raised fist","shortname":":fist:","category":1,"emoji_order":284},{"name":"oncoming fist","shortname":":punch:","category":1,"emoji_order":290},{"name":"left-facing fist","shortname":":left_facing_fist:","category":1,"emoji_order":296},{"name":"right-facing fist","shortname":":right_facing_fist:","category":1,"emoji_order":302},{"name":"clapping hands","shortname":":clap:","category":1,"emoji_order":308},{"name":"raising hands","shortname":":raised_hands:","category":1,"emoji_order":314},{"name":"open hands","shortname":":open_hands:","category":1,"emoji_order":320},{"name":"palms up together","shortname":":palms_up:","category":1,"emoji_order":326},{"name":"handshake","shortname":":handshake:","category":1,"emoji_order":332},{"name":"folded hands","shortname":":pray:","category":1,"emoji_order":333},{"name":"writing hand","shortname":":writing_hand:","category":1,"emoji_order":340},{"name":"nail polish","shortname":":nail_care:","category":1,"emoji_order":346},{"name":"selfie","shortname":":selfie:","category":1,"emoji_order":352},{"name":"flexed biceps","shortname":":muscle:","category":1,"emoji_order":358,"aliases":[":right_bicep:"]},{"name":"mechanical arm","shortname":":mech_arm:","category":1,"emoji_order":364},{"name":"mechanical leg","shortname":":mech_leg:","category":1,"emoji_order":365},{"name":"leg","shortname":":leg:","category":1,"emoji_order":366},{"name":"foot","shortname":":foot:","category":1,"emoji_order":372},{"name":"ear","shortname":":ear:","category":1,"emoji_order":378},{"name":"ear with hearing aid","shortname":":hearing_aid:","category":1,"emoji_order":384},{"name":"nose","shortname":":nose:","category":1,"emoji_order":390},{"name":"brain","shortname":":brain:","category":1,"emoji_order":396},{"name":"tooth","shortname":":tooth:","category":1,"emoji_order":397},{"name":"bone","shortname":":bone:","category":1,"emoji_order":398},{"name":"eyes","shortname":":eyes:","category":1,"emoji_order":399},{"name":"eye","shortname":":eye:","category":1,"emoji_order":401},{"name":"tongue","shortname":":tongue:","category":1,"emoji_order":402},{"name":"mouth","shortname":":lips:","category":1,"emoji_order":403},{"name":"baby","shortname":":baby:","category":1,"emoji_order":404},{"name":"child","shortname":":child:","category":1,"emoji_order":410},{"name":"boy","shortname":":boy:","category":1,"emoji_order":416},{"name":"girl","shortname":":girl:","category":1,"emoji_order":422},{"name":"person","shortname":":adult:","category":1,"emoji_order":428},{"name":"person: blond hair","shortname":":blond_person:","category":1,"emoji_order":434},{"name":"man","shortname":":man:","category":1,"emoji_order":440},{"name":"man: beard","shortname":":bearded_person:","category":1,"emoji_order":446},{"name":"man: blond hair","shortname":":blond_man:","category":1,"emoji_order":452},{"name":"man: red hair","shortname":":red_haired_man:","category":1,"emoji_order":464},{"name":"man: curly hair","shortname":":curly_haired_man:","category":1,"emoji_order":470},{"name":"man: white hair","shortname":":white_haired_man:","category":1,"emoji_order":476},{"name":"man: bald","shortname":":bald_man:","category":1,"emoji_order":482},{"name":"woman","shortname":":woman:","category":1,"emoji_order":488},{"name":"woman: blond hair","shortname":":blond_woman:","category":1,"emoji_order":494},{"name":"woman: red hair","shortname":":red_haired_woman:","category":1,"emoji_order":506},{"name":"woman: curly hair","shortname":":curly_haired_woman:","category":1,"emoji_order":512},{"name":"woman: white hair","shortname":":white_haired_woman:","category":1,"emoji_order":518},{"name":"woman: bald","shortname":":bald_woman:","category":1,"emoji_order":524},{"name":"older person","shortname":":older_adult:","category":1,"emoji_order":530},{"name":"old man","shortname":":older_man:","category":1,"emoji_order":536},{"name":"old woman","shortname":":older_woman:","category":1,"emoji_order":542},{"name":"person frowning","shortname":":person_frowning:","category":1,"emoji_order":548},{"name":"man frowning","shortname":":man_frowning:","category":1,"emoji_order":554},{"name":"woman frowning","shortname":":woman_frowning:","category":1,"emoji_order":566},{"name":"person pouting","shortname":":person_pouting:","category":1,"emoji_order":578},{"name":"man pouting","shortname":":man_pouting:","category":1,"emoji_order":584},{"name":"woman pouting","shortname":":woman_pouting:","category":1,"emoji_order":596},{"name":"person gesturing NO","shortname":":person_gesturing_no:","category":1,"emoji_order":608},{"name":"man gesturing NO","shortname":":man_gesturing_no:","category":1,"emoji_order":614},{"name":"woman gesturing NO","shortname":":woman_gesturing_no:","category":1,"emoji_order":626},{"name":"person gesturing OK","shortname":":person_gesturing_ok:","category":1,"emoji_order":638},{"name":"man gesturing OK","shortname":":man_gesturing_ok:","category":1,"emoji_order":644},{"name":"woman gesturing OK","shortname":":woman_gesturing_ok:","category":1,"emoji_order":656},{"name":"person tipping hand","shortname":":person_tipping_hand:","category":1,"emoji_order":668},{"name":"man tipping hand","shortname":":man_tipping_hand:","category":1,"emoji_order":674},{"name":"woman tipping hand","shortname":":woman_tipping_hand:","category":1,"emoji_order":686},{"name":"person raising hand","shortname":":person_raising_hand:","category":1,"emoji_order":698},{"name":"man raising hand","shortname":":man_raising_hand:","category":1,"emoji_order":704},{"name":"woman raising hand","shortname":":woman_raising_hand:","category":1,"emoji_order":716},{"name":"deaf person","shortname":":person_deaf:","category":1,"emoji_order":728},{"name":"deaf man","shortname":":man_deaf:","category":1,"emoji_order":734},{"name":"deaf woman","shortname":":woman_deaf:","category":1,"emoji_order":746},{"name":"person bowing","shortname":":person_bowing:","category":1,"emoji_order":758},{"name":"man bowing","shortname":":man_bowing:","category":1,"emoji_order":764},{"name":"woman bowing","shortname":":woman_bowing:","category":1,"emoji_order":776},{"name":"person facepalming","shortname":":person_facepalming:","category":1,"emoji_order":788},{"name":"man facepalming","shortname":":man_facepalming:","category":1,"emoji_order":794},{"name":"woman facepalming","shortname":":woman_facepalming:","category":1,"emoji_order":806},{"name":"person shrugging","shortname":":person_shrugging:","category":1,"emoji_order":818},{"name":"man shrugging","shortname":":man_shrugging:","category":1,"emoji_order":824},{"name":"woman shrugging","shortname":":woman_shrugging:","category":1,"emoji_order":836},{"name":"man health worker","shortname":":man_health_worker:","category":1,"emoji_order":848},{"name":"woman health worker","shortname":":woman_health_worker:","category":1,"emoji_order":860},{"name":"man student","shortname":":man_student:","category":1,"emoji_order":872},{"name":"woman student","shortname":":woman_student:","category":1,"emoji_order":878},{"name":"man teacher","shortname":":man_teacher:","category":1,"emoji_order":884},{"name":"woman teacher","shortname":":woman_teacher:","category":1,"emoji_order":890},{"name":"man judge","shortname":":man_judge:","category":1,"emoji_order":896},{"name":"woman judge","shortname":":woman_judge:","category":1,"emoji_order":908},{"name":"man farmer","shortname":":man_farmer:","category":1,"emoji_order":920},{"name":"woman farmer","shortname":":woman_farmer:","category":1,"emoji_order":926},{"name":"man cook","shortname":":man_cook:","category":1,"emoji_order":932},{"name":"woman cook","shortname":":woman_cook:","category":1,"emoji_order":938},{"name":"man mechanic","shortname":":man_mechanic:","category":1,"emoji_order":944},{"name":"woman mechanic","shortname":":woman_mechanic:","category":1,"emoji_order":950},{"name":"man factory worker","shortname":":man_factory_worker:","category":1,"emoji_order":956},{"name":"woman factory worker","shortname":":woman_factory_worker:","category":1,"emoji_order":962},{"name":"man office worker","shortname":":man_office_worker:","category":1,"emoji_order":968},{"name":"woman office worker","shortname":":woman_office_worker:","category":1,"emoji_order":974},{"name":"man scientist","shortname":":man_scientist:","category":1,"emoji_order":980},{"name":"woman scientist","shortname":":woman_scientist:","category":1,"emoji_order":986},{"name":"man technologist","shortname":":man_technologist:","category":1,"emoji_order":992},{"name":"woman technologist","shortname":":woman_technologist:","category":1,"emoji_order":998},{"name":"man singer","shortname":":man_singer:","category":1,"emoji_order":1004},{"name":"woman singer","shortname":":woman_singer:","category":1,"emoji_order":1010},{"name":"man artist","shortname":":man_artist:","category":1,"emoji_order":1016},{"name":"woman artist","shortname":":woman_artist:","category":1,"emoji_order":1022},{"name":"man pilot","shortname":":man_pilot:","category":1,"emoji_order":1028},{"name":"woman pilot","shortname":":woman_pilot:","category":1,"emoji_order":1040},{"name":"man astronaut","shortname":":man_astronaut:","category":1,"emoji_order":1052},{"name":"woman astronaut","shortname":":woman_astronaut:","category":1,"emoji_order":1058},{"name":"man firefighter","shortname":":man_firefighter:","category":1,"emoji_order":1064},{"name":"woman firefighter","shortname":":woman_firefighter:","category":1,"emoji_order":1070},{"name":"police officer","shortname":":police_officer:","category":1,"emoji_order":1076},{"name":"man police officer","shortname":":man_police_officer:","category":1,"emoji_order":1082},{"name":"woman police officer","shortname":":woman_police_officer:","category":1,"emoji_order":1094},{"name":"detective","shortname":":detective:","category":1,"emoji_order":1107},{"name":"man detective","shortname":":man_detective:","category":1,"emoji_order":1113},{"name":"woman detective","shortname":":woman_detective:","category":1,"emoji_order":1127},{"name":"guard","shortname":":guard:","category":1,"emoji_order":1141},{"name":"man guard","shortname":":man_guard:","category":1,"emoji_order":1147},{"name":"woman guard","shortname":":woman_guard:","category":1,"emoji_order":1159},{"name":"construction worker","shortname":":construction_worker:","category":1,"emoji_order":1171},{"name":"man construction worker","shortname":":man_construction_worker:","category":1,"emoji_order":1177},{"name":"woman construction worker","shortname":":woman_construction_worker:","category":1,"emoji_order":1189},{"name":"prince","shortname":":prince:","category":1,"emoji_order":1201},{"name":"princess","shortname":":princess:","category":1,"emoji_order":1207},{"name":"person wearing turban","shortname":":person_turban:","category":1,"emoji_order":1213},{"name":"man wearing turban","shortname":":man_turban:","category":1,"emoji_order":1219},{"name":"woman wearing turban","shortname":":woman_turban:","category":1,"emoji_order":1231},{"name":"man with Chinese cap","shortname":":man_chinese_cap:","category":1,"emoji_order":1243},{"name":"woman with headscarf","shortname":":woman_headscarf:","category":1,"emoji_order":1249},{"name":"man in tuxedo","shortname":":man_tuxedo:","category":1,"emoji_order":1255},{"name":"bride with veil","shortname":":bride_veil:","category":1,"emoji_order":1261},{"name":"pregnant woman","shortname":":pregnant_woman:","category":1,"emoji_order":1267},{"name":"breast-feeding","shortname":":breast_feeding:","category":1,"emoji_order":1273},{"name":"baby angel","shortname":":baby_angel:","category":1,"emoji_order":1279},{"name":"Santa Claus","shortname":":santa:","category":1,"emoji_order":1285},{"name":"Mrs. Claus","shortname":":mrs_claus:","category":1,"emoji_order":1291},{"name":"superhero","shortname":":hero:","category":1,"emoji_order":1297,"aliases":[":superhero:"]},{"name":"man superhero","shortname":":man_hero:","category":1,"emoji_order":1303},{"name":"woman superhero","shortname":":woman_hero:","category":1,"emoji_order":1315},{"name":"supervillain","shortname":":villain:","category":1,"emoji_order":1327,"aliases":[":supervillain:"]},{"name":"man supervillain","shortname":":man_villain:","category":1,"emoji_order":1333},{"name":"woman supervillain","shortname":":woman_villain:","category":1,"emoji_order":1345},{"name":"mage","shortname":":mage:","category":1,"emoji_order":1357},{"name":"man mage","shortname":":man_mage:","category":1,"emoji_order":1363,"aliases_ascii":[":{>"]},{"name":"woman mage","shortname":":woman_mage:","category":1,"emoji_order":1375},{"name":"fairy","shortname":":fairy:","category":1,"emoji_order":1387},{"name":"man fairy","shortname":":man_fairy:","category":1,"emoji_order":1393},{"name":"woman fairy","shortname":":woman_fairy:","category":1,"emoji_order":1405},{"name":"vampire","shortname":":vampire:","category":1,"emoji_order":1417,"aliases_ascii":[":E"]},{"name":"man vampire","shortname":":man_vampire:","category":1,"emoji_order":1423},{"name":"woman vampire","shortname":":woman_vampire:","category":1,"emoji_order":1435},{"name":"merperson","shortname":":merperson:","category":1,"emoji_order":1447},{"name":"merman","shortname":":merman:","category":1,"emoji_order":1453},{"name":"mermaid","shortname":":mermaid:","category":1,"emoji_order":1465},{"name":"elf","shortname":":elf:","category":1,"emoji_order":1477},{"name":"man elf","shortname":":man_elf:","category":1,"emoji_order":1483},{"name":"woman elf","shortname":":woman_elf:","category":1,"emoji_order":1495},{"name":"genie","shortname":":genie:","category":1,"emoji_order":1507},{"name":"man genie","shortname":":man_genie:","category":1,"emoji_order":1508},{"name":"woman genie","shortname":":woman_genie:","category":1,"emoji_order":1510},{"name":"zombie","shortname":":zombie:","category":1,"emoji_order":1512,"aliases_ascii":["8#"]},{"name":"man zombie","shortname":":man_zombie:","category":1,"emoji_order":1513},{"name":"woman zombie","shortname":":woman_zombie:","category":1,"emoji_order":1515},{"name":"person getting massage","shortname":":person_getting_massage:","category":1,"emoji_order":1517},{"name":"man getting massage","shortname":":man_getting_face_massage:","category":1,"emoji_order":1523},{"name":"woman getting massage","shortname":":woman_getting_face_massage:","category":1,"emoji_order":1535},{"name":"person getting haircut","shortname":":person_getting_haircut:","category":1,"emoji_order":1547},{"name":"man getting haircut","shortname":":man_getting_haircut:","category":1,"emoji_order":1553},{"name":"woman getting haircut","shortname":":woman_getting_haircut:","category":1,"emoji_order":1565},{"name":"person walking","shortname":":person_walking:","category":1,"emoji_order":1577},{"name":"man walking","shortname":":man_walking:","category":1,"emoji_order":1583},{"name":"woman walking","shortname":":woman_walking:","category":1,"emoji_order":1595},{"name":"person standing","shortname":":person_standing:","category":1,"emoji_order":1607},{"name":"man standing","shortname":":man_standing:","category":1,"emoji_order":1613},{"name":"woman standing","shortname":":woman_standing:","category":1,"emoji_order":1625},{"name":"person kneeling","shortname":":person_kneeling:","category":1,"emoji_order":1637},{"name":"man kneeling","shortname":":man_kneeling:","category":1,"emoji_order":1643},{"name":"woman kneeling","shortname":":woman_kneeling:","category":1,"emoji_order":1655},{"name":"man with probing cane","shortname":":man_probing_cane:","category":1,"emoji_order":1667},{"name":"woman with probing cane","shortname":":woman_probing_cane:","category":1,"emoji_order":1673},{"name":"man in motorized wheelchair","shortname":":man_motor_wheelchair:","category":1,"emoji_order":1679},{"name":"woman in motorized wheelchair","shortname":":woman_motor_wheelchair:","category":1,"emoji_order":1685},{"name":"man in manual wheelchair","shortname":":man_wheelchair:","category":1,"emoji_order":1691},{"name":"woman in manual wheelchair","shortname":":woman_wheelchair:","category":1,"emoji_order":1697},{"name":"person running","shortname":":person_running:","category":1,"emoji_order":1703},{"name":"man running","shortname":":man_running:","category":1,"emoji_order":1709},{"name":"woman running","shortname":":woman_running:","category":1,"emoji_order":1721},{"name":"woman dancing","shortname":":dancer:","category":1,"emoji_order":1733,"aliases":[":woman_dancing:"]},{"name":"man dancing","shortname":":man_dancing:","category":1,"emoji_order":1739},{"name":"man in suit levitating","shortname":":levitate:","category":1,"emoji_order":1746},{"name":"people with bunny ears","shortname":":people_bunny_ears_partying:","category":1,"emoji_order":1752},{"name":"men with bunny ears","shortname":":men_bunny_ears_partying:","category":1,"emoji_order":1753},{"name":"women with bunny ears","shortname":":women_bunny_ears_partying:","category":1,"emoji_order":1755},{"name":"person in steamy room","shortname":":person_steamy_room:","category":1,"emoji_order":1757},{"name":"man in steamy room","shortname":":man_steamy_room:","category":1,"emoji_order":1763},{"name":"woman in steamy room","shortname":":woman_steamy_room:","category":1,"emoji_order":1775},{"name":"person climbing","shortname":":person_climbing:","category":1,"emoji_order":1787},{"name":"man climbing","shortname":":man_climbing:","category":1,"emoji_order":1793},{"name":"woman climbing","shortname":":woman_climbing:","category":1,"emoji_order":1805},{"name":"person fencing","shortname":":person_fencing:","category":1,"emoji_order":1817},{"name":"horse racing","shortname":":horse_racing:","category":1,"emoji_order":1818},{"name":"skier","shortname":":skier:","category":1,"emoji_order":1825},{"name":"snowboarder","shortname":":snowboarder:","category":1,"emoji_order":1826},{"name":"person golfing","shortname":":person_golfing:","category":1,"emoji_order":1833},{"name":"man golfing","shortname":":man_golfing:","category":1,"emoji_order":1839},{"name":"woman golfing","shortname":":woman_golfing:","category":1,"emoji_order":1853},{"name":"person surfing","shortname":":person_surfing:","category":1,"emoji_order":1867},{"name":"man surfing","shortname":":man_surfing:","category":1,"emoji_order":1873},{"name":"woman surfing","shortname":":woman_surfing:","category":1,"emoji_order":1885},{"name":"person rowing boat","shortname":":person_rowing_boat:","category":1,"emoji_order":1897},{"name":"man rowing boat","shortname":":man_rowing_boat:","category":1,"emoji_order":1903},{"name":"woman rowing boat","shortname":":woman_rowing_boat:","category":1,"emoji_order":1915},{"name":"person swimming","shortname":":person_swimming:","category":1,"emoji_order":1927},{"name":"man swimming","shortname":":man_swimming:","category":1,"emoji_order":1933},{"name":"woman swimming","shortname":":woman_swimming:","category":1,"emoji_order":1945},{"name":"person bouncing ball","shortname":":person_bouncing_ball:","category":1,"emoji_order":1958},{"name":"man bouncing ball","shortname":":man_bouncing_ball:","category":1,"emoji_order":1964},{"name":"woman bouncing ball","shortname":":woman_bouncing_ball:","category":1,"emoji_order":1978},{"name":"person lifting weights","shortname":":person_lifting_weights:","category":1,"emoji_order":1993},{"name":"man lifting weights","shortname":":man_lifting_weights:","category":1,"emoji_order":1999},{"name":"woman lifting weights","shortname":":woman_lifting_weights:","category":1,"emoji_order":2013},{"name":"person biking","shortname":":person_biking:","category":1,"emoji_order":2027},{"name":"man biking","shortname":":man_biking:","category":1,"emoji_order":2033},{"name":"woman biking","shortname":":woman_biking:","category":1,"emoji_order":2045},{"name":"person mountain biking","shortname":":person_mountain_biking:","category":1,"emoji_order":2057},{"name":"man mountain biking","shortname":":man_mountain_biking:","category":1,"emoji_order":2063},{"name":"woman mountain biking","shortname":":woman_mountain_biking:","category":1,"emoji_order":2075},{"name":"person cartwheeling","shortname":":person_cartwheel:","category":1,"emoji_order":2087},{"name":"man cartwheeling","shortname":":man_cartwheeling:","category":1,"emoji_order":2093},{"name":"woman cartwheeling","shortname":":woman_cartwheeling:","category":1,"emoji_order":2105},{"name":"people wrestling","shortname":":people_wrestling:","category":1,"emoji_order":2117},{"name":"men wrestling","shortname":":men_wrestling:","category":1,"emoji_order":2118},{"name":"women wrestling","shortname":":women_wrestling:","category":1,"emoji_order":2120},{"name":"person playing water polo","shortname":":person_water_polo:","category":1,"emoji_order":2122},{"name":"man playing water polo","shortname":":man_water_polo:","category":1,"emoji_order":2128},{"name":"woman playing water polo","shortname":":woman_water_polo:","category":1,"emoji_order":2140},{"name":"person playing handball","shortname":":person_handball:","category":1,"emoji_order":2152},{"name":"man playing handball","shortname":":man_handball:","category":1,"emoji_order":2158},{"name":"woman playing handball","shortname":":woman_handball:","category":1,"emoji_order":2170},{"name":"person juggling","shortname":":person_juggling:","category":1,"emoji_order":2182},{"name":"man juggling","shortname":":man_juggling:","category":1,"emoji_order":2188},{"name":"woman juggling","shortname":":woman_juggling:","category":1,"emoji_order":2200},{"name":"person in lotus position","shortname":":person_lotus_position:","category":1,"emoji_order":2212},{"name":"man in lotus position","shortname":":man_lotus_position:","category":1,"emoji_order":2218},{"name":"woman in lotus position","shortname":":woman_lotus_position:","category":1,"emoji_order":2230},{"name":"person taking bath","shortname":":bath:","category":1,"emoji_order":2242},{"name":"person in bed","shortname":":in_bed:","category":1,"emoji_order":2248},{"name":"people holding hands","shortname":":holding_hands_people:","category":1,"emoji_order":2254},{"name":"women holding hands","shortname":":holding_hands_ww:","category":1,"emoji_order":2270},{"name":"woman and man holding hands","shortname":":holding_hands_mw:","category":1,"emoji_order":2286,"aliases":[":holding_hands_wm:"]},{"name":"men holding hands","shortname":":holding_hands_mm:","category":1,"emoji_order":2312},{"name":"kiss","shortname":":couple:","category":1,"emoji_order":2328},{"name":"kiss: woman, man","shortname":":kiss_mw:","category":1,"emoji_order":2329,"aliases":[":kiss_wm:"]},{"name":"kiss: man, man","shortname":":kiss_mm:","category":1,"emoji_order":2331},{"name":"kiss: woman, woman","shortname":":kiss_ww:","category":1,"emoji_order":2333},{"name":"couple with heart","shortname":":couple_heart:","category":1,"emoji_order":2335},{"name":"couple with heart: woman, man","shortname":":couple_mw:","category":1,"emoji_order":2336,"aliases":[":couple_wm:"]},{"name":"couple with heart: man, man","shortname":":couple_mm:","category":1,"emoji_order":2338},{"name":"couple with heart: woman, woman","shortname":":couple_ww:","category":1,"emoji_order":2340},{"name":"family","shortname":":family:","category":1,"emoji_order":2342},{"name":"family: man, woman, boy","shortname":":family_mwb:","category":1,"emoji_order":2343},{"name":"family: man, woman, girl","shortname":":family_mwg:","category":1,"emoji_order":2344},{"name":"family: man, woman, girl, boy","shortname":":family_mwgb:","category":1,"emoji_order":2345},{"name":"family: man, woman, boy, boy","shortname":":family_mwbb:","category":1,"emoji_order":2346},{"name":"family: man, woman, girl, girl","shortname":":family_mwgg:","category":1,"emoji_order":2347},{"name":"family: man, man, boy","shortname":":family_mmb:","category":1,"emoji_order":2348},{"name":"family: man, man, girl","shortname":":family_mmg:","category":1,"emoji_order":2349},{"name":"family: man, man, girl, boy","shortname":":family_mmgb:","category":1,"emoji_order":2350},{"name":"family: man, man, boy, boy","shortname":":family_mmbb:","category":1,"emoji_order":2351},{"name":"family: man, man, girl, girl","shortname":":family_mmgg:","category":1,"emoji_order":2352},{"name":"family: woman, woman, boy","shortname":":family_wwb:","category":1,"emoji_order":2353},{"name":"family: woman, woman, girl","shortname":":family_wwg:","category":1,"emoji_order":2354},{"name":"family: woman, woman, girl, boy","shortname":":family_wwgb:","category":1,"emoji_order":2355},{"name":"family: woman, woman, boy, boy","shortname":":family_wwbb:","category":1,"emoji_order":2356},{"name":"family: woman, woman, girl, girl","shortname":":family_wwgg:","category":1,"emoji_order":2357},{"name":"family: man, boy","shortname":":family_mb:","category":1,"emoji_order":2358},{"name":"family: man, boy, boy","shortname":":family_mbb:","category":1,"emoji_order":2359},{"name":"family: man, girl","shortname":":family_mg:","category":1,"emoji_order":2360},{"name":"family: man, girl, boy","shortname":":family_mgb:","category":1,"emoji_order":2361},{"name":"family: man, girl, girl","shortname":":family_mgg:","category":1,"emoji_order":2362},{"name":"family: woman, boy","shortname":":family_wb:","category":1,"emoji_order":2363},{"name":"family: woman, boy, boy","shortname":":family_wbb:","category":1,"emoji_order":2364},{"name":"family: woman, girl","shortname":":family_wg:","category":1,"emoji_order":2365},{"name":"family: woman, girl, boy","shortname":":family_wgb:","category":1,"emoji_order":2366},{"name":"family: woman, girl, girl","shortname":":family_wgg:","category":1,"emoji_order":2367},{"name":"speaking head","shortname":":speaking_head:","category":1,"emoji_order":2369},{"name":"bust in silhouette","shortname":":bust_silhouette:","category":1,"emoji_order":2370},{"name":"busts in silhouette","shortname":":busts_silhouette:","category":1,"emoji_order":2371},{"name":"footprints","shortname":":footprints:","category":1,"emoji_order":2372},{"name":"light skin tone","shortname":":tone_light:","category":2,"emoji_order":2373,"aliases":[":tone1:"]},{"name":"medium-light skin tone","shortname":":tone_medium_light:","category":2,"emoji_order":2374,"aliases":[":tone2:"]},{"name":"medium skin tone","shortname":":tone_medium:","category":2,"emoji_order":2375,"aliases":[":tone3:"]},{"name":"medium-dark skin tone","shortname":":tone_medium_dark:","category":2,"emoji_order":2376,"aliases":[":tone4:"]},{"name":"dark skin tone","shortname":":tone_dark:","category":2,"emoji_order":2377,"aliases":[":tone5:"]},{"name":"red hair","shortname":":red_hair:","category":2,"emoji_order":2378},{"name":"curly hair","shortname":":curly_hair:","category":2,"emoji_order":2379},{"name":"white hair","shortname":":white_hair:","category":2,"emoji_order":2380},{"name":"bald","shortname":":bald:","category":2,"emoji_order":2381},{"name":"monkey face","shortname":":monkey_face:","category":3,"emoji_order":2382},{"name":"monkey","shortname":":monkey:","category":3,"emoji_order":2383},{"name":"gorilla","shortname":":gorilla:","category":3,"emoji_order":2384},{"name":"orangutan","shortname":":orangutan:","category":3,"emoji_order":2385},{"name":"dog face","shortname":":dog_face:","category":3,"emoji_order":2386},{"name":"dog","shortname":":dog:","category":3,"emoji_order":2387},{"name":"guide dog","shortname":":guide_dog:","category":3,"emoji_order":2388},{"name":"service dog","shortname":":service_dog:","category":3,"emoji_order":2389},{"name":"poodle","shortname":":poodle:","category":3,"emoji_order":2390},{"name":"wolf","shortname":":wolf_face:","category":3,"emoji_order":2391},{"name":"fox","shortname":":fox_face:","category":3,"emoji_order":2392},{"name":"raccoon","shortname":":raccoon:","category":3,"emoji_order":2393},{"name":"cat face","shortname":":cat_face:","category":3,"emoji_order":2394},{"name":"cat","shortname":":cat:","category":3,"emoji_order":2395},{"name":"lion","shortname":":lion_face:","category":3,"emoji_order":2396},{"name":"tiger face","shortname":":tiger_face:","category":3,"emoji_order":2397},{"name":"tiger","shortname":":tiger:","category":3,"emoji_order":2398},{"name":"leopard","shortname":":leopard:","category":3,"emoji_order":2399},{"name":"horse face","shortname":":horse_face:","category":3,"emoji_order":2400},{"name":"horse","shortname":":horse:","category":3,"emoji_order":2401},{"name":"unicorn","shortname":":unicorn_face:","category":3,"emoji_order":2402},{"name":"zebra","shortname":":zebra:","category":3,"emoji_order":2403},{"name":"deer","shortname":":deer:","category":3,"emoji_order":2404},{"name":"cow face","shortname":":cow_face:","category":3,"emoji_order":2405},{"name":"ox","shortname":":ox:","category":3,"emoji_order":2406},{"name":"water buffalo","shortname":":water_buffalo:","category":3,"emoji_order":2407},{"name":"cow","shortname":":cow:","category":3,"emoji_order":2408},{"name":"pig face","shortname":":pig_face:","category":3,"emoji_order":2409},{"name":"pig","shortname":":pig:","category":3,"emoji_order":2410},{"name":"boar","shortname":":boar:","category":3,"emoji_order":2411},{"name":"pig nose","shortname":":pig_nose:","category":3,"emoji_order":2412},{"name":"ram","shortname":":ram:","category":3,"emoji_order":2413},{"name":"ewe","shortname":":sheep:","category":3,"emoji_order":2414},{"name":"goat","shortname":":goat:","category":3,"emoji_order":2415},{"name":"camel","shortname":":camel:","category":3,"emoji_order":2416},{"name":"two-hump camel","shortname":":two_hump_camel:","category":3,"emoji_order":2417},{"name":"llama","shortname":":llama:","category":3,"emoji_order":2418},{"name":"giraffe","shortname":":giraffe:","category":3,"emoji_order":2419},{"name":"elephant","shortname":":elephant:","category":3,"emoji_order":2420},{"name":"rhinoceros","shortname":":rhino:","category":3,"emoji_order":2421},{"name":"hippopotamus","shortname":":hippo:","category":3,"emoji_order":2422},{"name":"mouse face","shortname":":mouse_face:","category":3,"emoji_order":2423},{"name":"mouse","shortname":":mouse:","category":3,"emoji_order":2424},{"name":"rat","shortname":":rat:","category":3,"emoji_order":2425},{"name":"hamster","shortname":":hamster_face:","category":3,"emoji_order":2426},{"name":"rabbit face","shortname":":rabbit_face:","category":3,"emoji_order":2427},{"name":"rabbit","shortname":":rabbit:","category":3,"emoji_order":2428},{"name":"chipmunk","shortname":":chipmunk:","category":3,"emoji_order":2430},{"name":"hedgehog","shortname":":hedgehog:","category":3,"emoji_order":2431},{"name":"bat","shortname":":bat:","category":3,"emoji_order":2432},{"name":"bear","shortname":":bear_face:","category":3,"emoji_order":2433},{"name":"koala","shortname":":koala_face:","category":3,"emoji_order":2434},{"name":"panda","shortname":":panda_face:","category":3,"emoji_order":2435},{"name":"sloth","shortname":":sloth:","category":3,"emoji_order":2436},{"name":"otter","shortname":":otter:","category":3,"emoji_order":2437},{"name":"skunk","shortname":":skunk:","category":3,"emoji_order":2438},{"name":"kangaroo","shortname":":kangaroo:","category":3,"emoji_order":2439},{"name":"badger","shortname":":badger:","category":3,"emoji_order":2440},{"name":"paw prints","shortname":":feet:","category":3,"emoji_order":2441},{"name":"turkey","shortname":":turkey:","category":3,"emoji_order":2442},{"name":"chicken","shortname":":chicken:","category":3,"emoji_order":2443},{"name":"rooster","shortname":":rooster:","category":3,"emoji_order":2444},{"name":"hatching chick","shortname":":hatching_chick:","category":3,"emoji_order":2445},{"name":"baby chick","shortname":":baby_chick:","category":3,"emoji_order":2446},{"name":"front-facing baby chick","shortname":":hatched_chick:","category":3,"emoji_order":2447},{"name":"bird","shortname":":bird:","category":3,"emoji_order":2448},{"name":"penguin","shortname":":penguin:","category":3,"emoji_order":2449},{"name":"dove","shortname":":dove:","category":3,"emoji_order":2451},{"name":"eagle","shortname":":eagle:","category":3,"emoji_order":2452},{"name":"duck","shortname":":duck:","category":3,"emoji_order":2453},{"name":"swan","shortname":":swan:","category":3,"emoji_order":2454},{"name":"owl","shortname":":owl:","category":3,"emoji_order":2455},{"name":"flamingo","shortname":":flamingo:","category":3,"emoji_order":2456},{"name":"peacock","shortname":":peacock:","category":3,"emoji_order":2457},{"name":"parrot","shortname":":parrot:","category":3,"emoji_order":2458},{"name":"frog","shortname":":frog_face:","category":3,"emoji_order":2459},{"name":"crocodile","shortname":":crocodile:","category":3,"emoji_order":2460},{"name":"turtle","shortname":":turtle:","category":3,"emoji_order":2461},{"name":"lizard","shortname":":lizard:","category":3,"emoji_order":2462},{"name":"snake","shortname":":snake:","category":3,"emoji_order":2463},{"name":"dragon face","shortname":":dragon_face:","category":3,"emoji_order":2464},{"name":"dragon","shortname":":dragon:","category":3,"emoji_order":2465},{"name":"sauropod","shortname":":sauropod:","category":3,"emoji_order":2466},{"name":"T-Rex","shortname":":trex:","category":3,"emoji_order":2467},{"name":"spouting whale","shortname":":spouting_whale:","category":3,"emoji_order":2468},{"name":"whale","shortname":":whale:","category":3,"emoji_order":2469},{"name":"dolphin","shortname":":dolphin:","category":3,"emoji_order":2470},{"name":"fish","shortname":":fish:","category":3,"emoji_order":2471},{"name":"tropical fish","shortname":":tropical_fish:","category":3,"emoji_order":2472},{"name":"blowfish","shortname":":blowfish:","category":3,"emoji_order":2473},{"name":"shark","shortname":":shark:","category":3,"emoji_order":2474},{"name":"octopus","shortname":":octopus:","category":3,"emoji_order":2475},{"name":"spiral shell","shortname":":shell:","category":3,"emoji_order":2476},{"name":"snail","shortname":":snail:","category":3,"emoji_order":2477},{"name":"butterfly","shortname":":butterfly:","category":3,"emoji_order":2478},{"name":"bug","shortname":":bug:","category":3,"emoji_order":2479},{"name":"ant","shortname":":ant:","category":3,"emoji_order":2480},{"name":"honeybee","shortname":":bee:","category":3,"emoji_order":2481},{"name":"lady beetle","shortname":":beetle:","category":3,"emoji_order":2482},{"name":"cricket","shortname":":cricket:","category":3,"emoji_order":2483},{"name":"spider","shortname":":spider:","category":3,"emoji_order":2485},{"name":"spider web","shortname":":spider_web:","category":3,"emoji_order":2487},{"name":"scorpion","shortname":":scorpion:","category":3,"emoji_order":2488},{"name":"mosquito","shortname":":mosquito:","category":3,"emoji_order":2489},{"name":"microbe","shortname":":microbe:","category":3,"emoji_order":2490,"aliases":[":germ:"]},{"name":"bouquet","shortname":":bouquet:","category":3,"emoji_order":2491},{"name":"cherry blossom","shortname":":cherry_blossom:","category":3,"emoji_order":2492},{"name":"white flower","shortname":":white_flower:","category":3,"emoji_order":2493},{"name":"rosette","shortname":":rosette:","category":3,"emoji_order":2495},{"name":"rose","shortname":":rose:","category":3,"emoji_order":2496},{"name":"wilted flower","shortname":":wilted_rose:","category":3,"emoji_order":2497},{"name":"hibiscus","shortname":":hibiscus:","category":3,"emoji_order":2498},{"name":"sunflower","shortname":":sunflower:","category":3,"emoji_order":2499},{"name":"blossom","shortname":":blossom:","category":3,"emoji_order":2500},{"name":"tulip","shortname":":tulip:","category":3,"emoji_order":2501},{"name":"seedling","shortname":":seedling:","category":3,"emoji_order":2502},{"name":"evergreen tree","shortname":":evergreen_tree:","category":3,"emoji_order":2503},{"name":"deciduous tree","shortname":":deciduous_tree:","category":3,"emoji_order":2504},{"name":"palm tree","shortname":":palm_tree:","category":3,"emoji_order":2505},{"name":"cactus","shortname":":cactus:","category":3,"emoji_order":2506},{"name":"sheaf of rice","shortname":":ear_of_rice:","category":3,"emoji_order":2507},{"name":"herb","shortname":":herb:","category":3,"emoji_order":2508},{"name":"shamrock","shortname":":shamrock:","category":3,"emoji_order":2510},{"name":"four leaf clover","shortname":":four_leaf_clover:","category":3,"emoji_order":2511},{"name":"maple leaf","shortname":":maple_leaf:","category":3,"emoji_order":2512},{"name":"fallen leaf","shortname":":fallen_leaf:","category":3,"emoji_order":2513},{"name":"leaf fluttering in wind","shortname":":leaves:","category":3,"emoji_order":2514},{"name":"grapes","shortname":":grapes:","category":4,"emoji_order":2515},{"name":"melon","shortname":":melon:","category":4,"emoji_order":2516},{"name":"watermelon","shortname":":watermelon:","category":4,"emoji_order":2517},{"name":"tangerine","shortname":":tangerine:","category":4,"emoji_order":2518},{"name":"lemon","shortname":":lemon:","category":4,"emoji_order":2519},{"name":"banana","shortname":":banana:","category":4,"emoji_order":2520},{"name":"pineapple","shortname":":pineapple:","category":4,"emoji_order":2521},{"name":"mango","shortname":":mango:","category":4,"emoji_order":2522},{"name":"red apple","shortname":":apple:","category":4,"emoji_order":2523},{"name":"green apple","shortname":":green_apple:","category":4,"emoji_order":2524},{"name":"pear","shortname":":pear:","category":4,"emoji_order":2525},{"name":"peach","shortname":":peach:","category":4,"emoji_order":2526},{"name":"cherries","shortname":":cherries:","category":4,"emoji_order":2527},{"name":"strawberry","shortname":":strawberry:","category":4,"emoji_order":2528},{"name":"kiwi fruit","shortname":":kiwi:","category":4,"emoji_order":2529},{"name":"tomato","shortname":":tomato:","category":4,"emoji_order":2530},{"name":"coconut","shortname":":coconut:","category":4,"emoji_order":2531},{"name":"avocado","shortname":":avocado:","category":4,"emoji_order":2532},{"name":"eggplant","shortname":":eggplant:","category":4,"emoji_order":2533},{"name":"potato","shortname":":potato:","category":4,"emoji_order":2534},{"name":"carrot","shortname":":carrot:","category":4,"emoji_order":2535},{"name":"ear of corn","shortname":":corn:","category":4,"emoji_order":2536},{"name":"hot pepper","shortname":":hot_pepper:","category":4,"emoji_order":2538},{"name":"cucumber","shortname":":cucumber:","category":4,"emoji_order":2539},{"name":"leafy green","shortname":":leafy_green:","category":4,"emoji_order":2540},{"name":"broccoli","shortname":":broccoli:","category":4,"emoji_order":2541},{"name":"garlic","shortname":":garlic:","category":4,"emoji_order":2542},{"name":"onion","shortname":":onion:","category":4,"emoji_order":2543},{"name":"mushroom","shortname":":mushroom:","category":4,"emoji_order":2544},{"name":"peanuts","shortname":":peanuts:","category":4,"emoji_order":2545},{"name":"chestnut","shortname":":chestnut:","category":4,"emoji_order":2546},{"name":"bread","shortname":":bread:","category":4,"emoji_order":2547},{"name":"croissant","shortname":":croissant:","category":4,"emoji_order":2548},{"name":"baguette bread","shortname":":french_bread:","category":4,"emoji_order":2549},{"name":"pretzel","shortname":":pretzel:","category":4,"emoji_order":2550},{"name":"bagel","shortname":":bagel:","category":4,"emoji_order":2551},{"name":"pancakes","shortname":":pancakes:","category":4,"emoji_order":2552},{"name":"waffle","shortname":":waffle:","category":4,"emoji_order":2553},{"name":"cheese wedge","shortname":":cheese:","category":4,"emoji_order":2554},{"name":"meat on bone","shortname":":meat_on_bone:","category":4,"emoji_order":2555},{"name":"poultry leg","shortname":":poultry_leg:","category":4,"emoji_order":2556},{"name":"cut of meat","shortname":":cut_of_meat:","category":4,"emoji_order":2557},{"name":"bacon","shortname":":bacon:","category":4,"emoji_order":2558},{"name":"hamburger","shortname":":hamburger:","category":4,"emoji_order":2559},{"name":"french fries","shortname":":fries:","category":4,"emoji_order":2560},{"name":"pizza","shortname":":pizza:","category":4,"emoji_order":2561},{"name":"hot dog","shortname":":hotdog:","category":4,"emoji_order":2562},{"name":"sandwich","shortname":":sandwich:","category":4,"emoji_order":2563},{"name":"taco","shortname":":taco:","category":4,"emoji_order":2564},{"name":"burrito","shortname":":burrito:","category":4,"emoji_order":2565},{"name":"stuffed flatbread","shortname":":stuffed_flatbread:","category":4,"emoji_order":2566},{"name":"falafel","shortname":":falafel:","category":4,"emoji_order":2567},{"name":"egg","shortname":":egg:","category":4,"emoji_order":2568},{"name":"cooking","shortname":":cooking:","category":4,"emoji_order":2569},{"name":"shallow pan of food","shortname":":shallow_pan_of_food:","category":4,"emoji_order":2570},{"name":"pot of food","shortname":":stew:","category":4,"emoji_order":2571},{"name":"bowl with spoon","shortname":":bowl_spoon:","category":4,"emoji_order":2572},{"name":"green salad","shortname":":salad:","category":4,"emoji_order":2573},{"name":"popcorn","shortname":":popcorn:","category":4,"emoji_order":2574},{"name":"butter","shortname":":butter:","category":4,"emoji_order":2575},{"name":"salt","shortname":":salt:","category":4,"emoji_order":2576},{"name":"canned food","shortname":":canned_food:","category":4,"emoji_order":2577},{"name":"bento box","shortname":":bento:","category":4,"emoji_order":2578},{"name":"rice cracker","shortname":":rice_cracker:","category":4,"emoji_order":2579},{"name":"rice ball","shortname":":rice_ball:","category":4,"emoji_order":2580},{"name":"cooked rice","shortname":":rice:","category":4,"emoji_order":2581},{"name":"curry rice","shortname":":curry:","category":4,"emoji_order":2582},{"name":"steaming bowl","shortname":":ramen:","category":4,"emoji_order":2583},{"name":"spaghetti","shortname":":spaghetti:","category":4,"emoji_order":2584},{"name":"roasted sweet potato","shortname":":sweet_potato:","category":4,"emoji_order":2585},{"name":"oden","shortname":":oden:","category":4,"emoji_order":2586},{"name":"sushi","shortname":":sushi:","category":4,"emoji_order":2587},{"name":"fried shrimp","shortname":":fried_shrimp:","category":4,"emoji_order":2588},{"name":"fish cake with swirl","shortname":":fish_cake:","category":4,"emoji_order":2589},{"name":"moon cake","shortname":":moon_cake:","category":4,"emoji_order":2590},{"name":"dango","shortname":":dango:","category":4,"emoji_order":2591},{"name":"dumpling","shortname":":dumpling:","category":4,"emoji_order":2592},{"name":"fortune cookie","shortname":":fortune_cookie:","category":4,"emoji_order":2593},{"name":"takeout box","shortname":":takeout_box:","category":4,"emoji_order":2594},{"name":"crab","shortname":":crab:","category":4,"emoji_order":2595},{"name":"lobster","shortname":":lobster:","category":4,"emoji_order":2596},{"name":"shrimp","shortname":":shrimp:","category":4,"emoji_order":2597},{"name":"squid","shortname":":squid:","category":4,"emoji_order":2598},{"name":"oyster","shortname":":oyster:","category":4,"emoji_order":2599},{"name":"soft ice cream","shortname":":icecream:","category":4,"emoji_order":2600},{"name":"shaved ice","shortname":":shaved_ice:","category":4,"emoji_order":2601},{"name":"ice cream","shortname":":ice_cream:","category":4,"emoji_order":2602},{"name":"doughnut","shortname":":doughnut:","category":4,"emoji_order":2603},{"name":"cookie","shortname":":cookie:","category":4,"emoji_order":2604},{"name":"birthday cake","shortname":":birthday:","category":4,"emoji_order":2605},{"name":"shortcake","shortname":":cake:","category":4,"emoji_order":2606},{"name":"cupcake","shortname":":cupcake:","category":4,"emoji_order":2607},{"name":"pie","shortname":":pie:","category":4,"emoji_order":2608},{"name":"chocolate bar","shortname":":chocolate_bar:","category":4,"emoji_order":2609},{"name":"candy","shortname":":candy:","category":4,"emoji_order":2610},{"name":"lollipop","shortname":":lollipop:","category":4,"emoji_order":2611},{"name":"custard","shortname":":custard:","category":4,"emoji_order":2612},{"name":"honey pot","shortname":":honey_pot:","category":4,"emoji_order":2613},{"name":"baby bottle","shortname":":baby_bottle:","category":4,"emoji_order":2614},{"name":"glass of milk","shortname":":milk:","category":4,"emoji_order":2615},{"name":"hot beverage","shortname":":coffee:","category":4,"emoji_order":2616},{"name":"teacup without handle","shortname":":tea:","category":4,"emoji_order":2617},{"name":"sake","shortname":":sake:","category":4,"emoji_order":2618},{"name":"bottle with popping cork","shortname":":champagne:","category":4,"emoji_order":2619},{"name":"wine glass","shortname":":wine_glass:","category":4,"emoji_order":2620},{"name":"cocktail glass","shortname":":cocktail:","category":4,"emoji_order":2621},{"name":"tropical drink","shortname":":tropical_drink:","category":4,"emoji_order":2622},{"name":"beer mug","shortname":":beer:","category":4,"emoji_order":2623},{"name":"clinking beer mugs","shortname":":beers:","category":4,"emoji_order":2624},{"name":"clinking glasses","shortname":":champagne_glass:","category":4,"emoji_order":2625},{"name":"tumbler glass","shortname":":tumbler_glass:","category":4,"emoji_order":2626},{"name":"cup with straw","shortname":":cup_straw:","category":4,"emoji_order":2627},{"name":"beverage box","shortname":":beverage_box:","category":4,"emoji_order":2628,"aliases":[":juice_box:"]},{"name":"mate","shortname":":mate:","category":4,"emoji_order":2629,"aliases":[":yerba_mate:"]},{"name":"ice","shortname":":ice:","category":4,"emoji_order":2630},{"name":"chopsticks","shortname":":chopsticks:","category":4,"emoji_order":2631},{"name":"fork and knife with plate","shortname":":fork_knife_plate:","category":4,"emoji_order":2633},{"name":"fork and knife","shortname":":utensils:","category":4,"emoji_order":2634},{"name":"spoon","shortname":":spoon:","category":4,"emoji_order":2635},{"name":"kitchen knife","shortname":":knife:","category":4,"emoji_order":2636},{"name":"amphora","shortname":":amphora:","category":4,"emoji_order":2637},{"name":"globe showing Europe-Africa","shortname":":earth_africa:","category":5,"emoji_order":2638},{"name":"globe showing Americas","shortname":":earth_americas:","category":5,"emoji_order":2639},{"name":"globe showing Asia-Australia","shortname":":earth_asia:","category":5,"emoji_order":2640},{"name":"globe with meridians","shortname":":globe:","category":5,"emoji_order":2641},{"name":"world map","shortname":":map:","category":5,"emoji_order":2643},{"name":"map of Japan","shortname":":japan:","category":5,"emoji_order":2644},{"name":"compass","shortname":":compass:","category":5,"emoji_order":2645},{"name":"snow-capped mountain","shortname":":snowy_mountain:","category":5,"emoji_order":2647},{"name":"mountain","shortname":":mountain:","category":5,"emoji_order":2649},{"name":"volcano","shortname":":volcano:","category":5,"emoji_order":2650},{"name":"mount fuji","shortname":":mount_fuji:","category":5,"emoji_order":2651},{"name":"camping","shortname":":camping:","category":5,"emoji_order":2653},{"name":"beach with umbrella","shortname":":beach:","category":5,"emoji_order":2655},{"name":"desert","shortname":":desert:","category":5,"emoji_order":2657},{"name":"desert island","shortname":":island:","category":5,"emoji_order":2659},{"name":"national park","shortname":":park:","category":5,"emoji_order":2661},{"name":"stadium","shortname":":stadium:","category":5,"emoji_order":2663},{"name":"classical building","shortname":":classical_building:","category":5,"emoji_order":2665},{"name":"building construction","shortname":":construction_site:","category":5,"emoji_order":2667},{"name":"brick","shortname":":brick:","category":5,"emoji_order":2668},{"name":"houses","shortname":":homes:","category":5,"emoji_order":2670},{"name":"derelict house","shortname":":house_abandoned:","category":5,"emoji_order":2672},{"name":"house","shortname":":house:","category":5,"emoji_order":2673},{"name":"house with garden","shortname":":house_garden:","category":5,"emoji_order":2674},{"name":"office building","shortname":":office:","category":5,"emoji_order":2675},{"name":"Japanese post office","shortname":":ja_post_office:","category":5,"emoji_order":2676},{"name":"post office","shortname":":post_office:","category":5,"emoji_order":2677},{"name":"hospital","shortname":":hospital:","category":5,"emoji_order":2678},{"name":"bank","shortname":":bank:","category":5,"emoji_order":2679},{"name":"hotel","shortname":":hotel:","category":5,"emoji_order":2680},{"name":"love hotel","shortname":":love_hotel:","category":5,"emoji_order":2681},{"name":"convenience store","shortname":":convenience_store:","category":5,"emoji_order":2682},{"name":"school","shortname":":school:","category":5,"emoji_order":2683},{"name":"department store","shortname":":department_store:","category":5,"emoji_order":2684},{"name":"factory","shortname":":factory:","category":5,"emoji_order":2685},{"name":"Japanese castle","shortname":":japanese_castle:","category":5,"emoji_order":2686},{"name":"castle","shortname":":castle:","category":5,"emoji_order":2687,"aliases":[":european_castle:"]},{"name":"wedding","shortname":":wedding:","category":5,"emoji_order":2688},{"name":"Tokyo tower","shortname":":tokyo_tower:","category":5,"emoji_order":2689},{"name":"Statue of Liberty","shortname":":statue_of_liberty:","category":5,"emoji_order":2690},{"name":"church","shortname":":church:","category":5,"emoji_order":2691},{"name":"mosque","shortname":":mosque:","category":5,"emoji_order":2692},{"name":"hindu temple","shortname":":hindu_temple:","category":5,"emoji_order":2693},{"name":"synagogue","shortname":":synagogue:","category":5,"emoji_order":2694},{"name":"shinto shrine","shortname":":shinto_shrine:","category":5,"emoji_order":2696},{"name":"kaaba","shortname":":kaaba:","category":5,"emoji_order":2697},{"name":"fountain","shortname":":fountain:","category":5,"emoji_order":2698},{"name":"tent","shortname":":tent:","category":5,"emoji_order":2699},{"name":"foggy","shortname":":foggy:","category":5,"emoji_order":2700},{"name":"night with stars","shortname":":night_stars:","category":5,"emoji_order":2701},{"name":"cityscape","shortname":":cityscape:","category":5,"emoji_order":2703},{"name":"sunrise over mountains","shortname":":sunrise_over_mountains:","category":5,"emoji_order":2704},{"name":"sunrise","shortname":":sunrise:","category":5,"emoji_order":2705},{"name":"cityscape at dusk","shortname":":dusk:","category":5,"emoji_order":2706},{"name":"sunset","shortname":":sunset:","category":5,"emoji_order":2707},{"name":"bridge at night","shortname":":bridge_at_night:","category":5,"emoji_order":2708},{"name":"hot springs","shortname":":hotsprings:","category":5,"emoji_order":2710},{"name":"carousel horse","shortname":":carousel_horse:","category":5,"emoji_order":2711},{"name":"ferris wheel","shortname":":ferris_wheel:","category":5,"emoji_order":2712},{"name":"roller coaster","shortname":":roller_coaster:","category":5,"emoji_order":2713},{"name":"barber pole","shortname":":barber:","category":5,"emoji_order":2714},{"name":"circus tent","shortname":":circus_tent:","category":5,"emoji_order":2715},{"name":"locomotive","shortname":":steam_locomotive:","category":5,"emoji_order":2716},{"name":"railway car","shortname":":railway_car:","category":5,"emoji_order":2717},{"name":"high-speed train","shortname":":bullettrain_side:","category":5,"emoji_order":2718},{"name":"bullet train","shortname":":bullettrain:","category":5,"emoji_order":2719},{"name":"train","shortname":":train:","category":5,"emoji_order":2720},{"name":"metro","shortname":":metro:","category":5,"emoji_order":2721},{"name":"light rail","shortname":":light_rail:","category":5,"emoji_order":2722},{"name":"station","shortname":":station:","category":5,"emoji_order":2723},{"name":"tram","shortname":":tram:","category":5,"emoji_order":2724},{"name":"monorail","shortname":":monorail:","category":5,"emoji_order":2725},{"name":"mountain railway","shortname":":mountain_railway:","category":5,"emoji_order":2726},{"name":"tram car","shortname":":tram_car:","category":5,"emoji_order":2727},{"name":"bus","shortname":":bus:","category":5,"emoji_order":2728},{"name":"oncoming bus","shortname":":oncoming_bus:","category":5,"emoji_order":2729},{"name":"trolleybus","shortname":":trolleybus:","category":5,"emoji_order":2730},{"name":"minibus","shortname":":minibus:","category":5,"emoji_order":2731},{"name":"ambulance","shortname":":ambulance:","category":5,"emoji_order":2732},{"name":"fire engine","shortname":":fire_engine:","category":5,"emoji_order":2733},{"name":"police car","shortname":":police_car:","category":5,"emoji_order":2734},{"name":"oncoming police car","shortname":":oncoming_police_car:","category":5,"emoji_order":2735},{"name":"taxi","shortname":":taxi:","category":5,"emoji_order":2736},{"name":"oncoming taxi","shortname":":oncoming_taxi:","category":5,"emoji_order":2737},{"name":"automobile","shortname":":red_car:","category":5,"emoji_order":2738},{"name":"oncoming automobile","shortname":":oncoming_automobile:","category":5,"emoji_order":2739},{"name":"sport utility vehicle","shortname":":blue_car:","category":5,"emoji_order":2740},{"name":"delivery truck","shortname":":truck:","category":5,"emoji_order":2741},{"name":"articulated lorry","shortname":":lorry:","category":5,"emoji_order":2742},{"name":"tractor","shortname":":tractor:","category":5,"emoji_order":2743},{"name":"racing car","shortname":":race_car:","category":5,"emoji_order":2745},{"name":"motorcycle","shortname":":motorcycle:","category":5,"emoji_order":2747},{"name":"motor scooter","shortname":":motor_scooter:","category":5,"emoji_order":2748},{"name":"manual wheelchair","shortname":":wheelchair:","category":5,"emoji_order":2749},{"name":"motorized wheelchair","shortname":":motor_wheelchair:","category":5,"emoji_order":2750},{"name":"auto rickshaw","shortname":":auto_rickshaw:","category":5,"emoji_order":2751},{"name":"bicycle","shortname":":bike:","category":5,"emoji_order":2752},{"name":"kick scooter","shortname":":scooter:","category":5,"emoji_order":2753},{"name":"skateboard","shortname":":skateboard:","category":5,"emoji_order":2754},{"name":"bus stop","shortname":":bus_stop:","category":5,"emoji_order":2755},{"name":"motorway","shortname":":motorway:","category":5,"emoji_order":2757},{"name":"railway track","shortname":":railway_track:","category":5,"emoji_order":2759},{"name":"oil drum","shortname":":oil_drum:","category":5,"emoji_order":2761},{"name":"fuel pump","shortname":":fuel_pump:","category":5,"emoji_order":2762},{"name":"police car light","shortname":":rotating_light:","category":5,"emoji_order":2763,"aliases":[":police_light:"]},{"name":"horizontal traffic light","shortname":":traffic_light:","category":5,"emoji_order":2764},{"name":"vertical traffic light","shortname":":vertical_traffic_light:","category":5,"emoji_order":2765},{"name":"stop sign","shortname":":stop_sign:","category":5,"emoji_order":2766,"aliases":[":octagonal_sign:"]},{"name":"construction","shortname":":construction:","category":5,"emoji_order":2767},{"name":"anchor","shortname":":anchor:","category":5,"emoji_order":2768},{"name":"sailboat","shortname":":sailboat:","category":5,"emoji_order":2769},{"name":"canoe","shortname":":canoe:","category":5,"emoji_order":2770},{"name":"speedboat","shortname":":speedboat:","category":5,"emoji_order":2771},{"name":"passenger ship","shortname":":cruise_ship:","category":5,"emoji_order":2773},{"name":"ferry","shortname":":ferry:","category":5,"emoji_order":2775},{"name":"motor boat","shortname":":motorboat:","category":5,"emoji_order":2777},{"name":"ship","shortname":":ship:","category":5,"emoji_order":2778},{"name":"airplane","shortname":":airplane:","category":5,"emoji_order":2780},{"name":"small airplane","shortname":":small_airplane:","category":5,"emoji_order":2782},{"name":"airplane departure","shortname":":airplane_departure:","category":5,"emoji_order":2783},{"name":"airplane arrival","shortname":":airplane_arriving:","category":5,"emoji_order":2784},{"name":"parachute","shortname":":parachute:","category":5,"emoji_order":2785},{"name":"seat","shortname":":seat:","category":5,"emoji_order":2786},{"name":"helicopter","shortname":":helicopter:","category":5,"emoji_order":2787},{"name":"suspension railway","shortname":":suspension_railway:","category":5,"emoji_order":2788},{"name":"mountain cableway","shortname":":mountain_cableway:","category":5,"emoji_order":2789},{"name":"aerial tramway","shortname":":aerial_tramway:","category":5,"emoji_order":2790},{"name":"satellite","shortname":":satellite:","category":5,"emoji_order":2792},{"name":"rocket","shortname":":rocket:","category":5,"emoji_order":2793},{"name":"flying saucer","shortname":":flying_saucer:","category":5,"emoji_order":2794},{"name":"bellhop bell","shortname":":bellhop:","category":5,"emoji_order":2796},{"name":"luggage","shortname":":luggage:","category":5,"emoji_order":2797},{"name":"hourglass done","shortname":":hourglass:","category":5,"emoji_order":2798},{"name":"hourglass not done","shortname":":hourglass_flowing:","category":5,"emoji_order":2799},{"name":"watch","shortname":":watch:","category":5,"emoji_order":2800},{"name":"alarm clock","shortname":":alarm_clock:","category":5,"emoji_order":2801},{"name":"stopwatch","shortname":":stopwatch:","category":5,"emoji_order":2803},{"name":"timer clock","shortname":":timer:","category":5,"emoji_order":2805},{"name":"mantelpiece clock","shortname":":clock:","category":5,"emoji_order":2807},{"name":"twelve o’clock","shortname":":clock12:","category":5,"emoji_order":2808},{"name":"twelve-thirty","shortname":":clock1230:","category":5,"emoji_order":2809},{"name":"one o’clock","shortname":":clock1:","category":5,"emoji_order":2810},{"name":"one-thirty","shortname":":clock130:","category":5,"emoji_order":2811},{"name":"two o’clock","shortname":":clock2:","category":5,"emoji_order":2812},{"name":"two-thirty","shortname":":clock230:","category":5,"emoji_order":2813},{"name":"three o’clock","shortname":":clock3:","category":5,"emoji_order":2814},{"name":"three-thirty","shortname":":clock330:","category":5,"emoji_order":2815},{"name":"four o’clock","shortname":":clock4:","category":5,"emoji_order":2816},{"name":"four-thirty","shortname":":clock430:","category":5,"emoji_order":2817},{"name":"five o’clock","shortname":":clock5:","category":5,"emoji_order":2818},{"name":"five-thirty","shortname":":clock530:","category":5,"emoji_order":2819},{"name":"six o’clock","shortname":":clock6:","category":5,"emoji_order":2820},{"name":"six-thirty","shortname":":clock630:","category":5,"emoji_order":2821},{"name":"seven o’clock","shortname":":clock7:","category":5,"emoji_order":2822},{"name":"seven-thirty","shortname":":clock730:","category":5,"emoji_order":2823},{"name":"eight o’clock","shortname":":clock8:","category":5,"emoji_order":2824},{"name":"eight-thirty","shortname":":clock830:","category":5,"emoji_order":2825},{"name":"nine o’clock","shortname":":clock9:","category":5,"emoji_order":2826},{"name":"nine-thirty","shortname":":clock930:","category":5,"emoji_order":2827},{"name":"ten o’clock","shortname":":clock10:","category":5,"emoji_order":2828},{"name":"ten-thirty","shortname":":clock1030:","category":5,"emoji_order":2829},{"name":"eleven o’clock","shortname":":clock11:","category":5,"emoji_order":2830},{"name":"eleven-thirty","shortname":":clock1130:","category":5,"emoji_order":2831},{"name":"new moon","shortname":":new_moon:","category":5,"emoji_order":2832},{"name":"waxing crescent moon","shortname":":waxing_crescent_moon:","category":5,"emoji_order":2833},{"name":"first quarter moon","shortname":":first_quarter_moon:","category":5,"emoji_order":2834},{"name":"waxing gibbous moon","shortname":":waxing_gibbous_moon:","category":5,"emoji_order":2835},{"name":"full moon","shortname":":full_moon:","category":5,"emoji_order":2836},{"name":"waning gibbous moon","shortname":":waning_gibbous_moon:","category":5,"emoji_order":2837},{"name":"last quarter moon","shortname":":last_quarter_moon:","category":5,"emoji_order":2838},{"name":"waning crescent moon","shortname":":waning_crescent_moon:","category":5,"emoji_order":2839},{"name":"crescent moon","shortname":":crescent_moon:","category":5,"emoji_order":2840},{"name":"new moon face","shortname":":new_moon_face:","category":5,"emoji_order":2841},{"name":"first quarter moon face","shortname":":first_quarter_moon_face:","category":5,"emoji_order":2842},{"name":"last quarter moon face","shortname":":last_quarter_moon_face:","category":5,"emoji_order":2843},{"name":"thermometer","shortname":":thermometer:","category":5,"emoji_order":2845},{"name":"sun","shortname":":sun:","category":5,"emoji_order":2847},{"name":"full moon face","shortname":":full_moon_face:","category":5,"emoji_order":2848},{"name":"sun with face","shortname":":sun_face:","category":5,"emoji_order":2849},{"name":"ringed planet","shortname":":ringed_planet:","category":5,"emoji_order":2850,"aliases":[":saturn:"]},{"name":"star","shortname":":star:","category":5,"emoji_order":2851},{"name":"glowing star","shortname":":star2:","category":5,"emoji_order":2852,"aliases":[":glowing_star:"]},{"name":"shooting star","shortname":":star3:","category":5,"emoji_order":2853,"aliases":[":shooting_star:"]},{"name":"milky way","shortname":":milky_way:","category":5,"emoji_order":2854},{"name":"cloud","shortname":":cloud:","category":5,"emoji_order":2856},{"name":"sun behind cloud","shortname":":partly_sunny:","category":5,"emoji_order":2857},{"name":"cloud with lightning and rain","shortname":":storm:","category":5,"emoji_order":2859},{"name":"sun behind small cloud","shortname":":overcast:","category":5,"emoji_order":2861},{"name":"sun behind large cloud","shortname":":cloudy:","category":5,"emoji_order":2863},{"name":"sun behind rain cloud","shortname":":sunshower:","category":5,"emoji_order":2865},{"name":"cloud with rain","shortname":":rain:","category":5,"emoji_order":2867},{"name":"cloud with snow","shortname":":snow:","category":5,"emoji_order":2869},{"name":"cloud with lightning","shortname":":lightning:","category":5,"emoji_order":2871},{"name":"tornado","shortname":":tornado:","category":5,"emoji_order":2873},{"name":"fog","shortname":":fog:","category":5,"emoji_order":2875},{"name":"wind face","shortname":":wind_face:","category":5,"emoji_order":2877},{"name":"cyclone","shortname":":cyclone:","category":5,"emoji_order":2878},{"name":"rainbow","shortname":":rainbow:","category":5,"emoji_order":2879},{"name":"closed umbrella","shortname":":closed_umbrella:","category":5,"emoji_order":2880},{"name":"umbrella","shortname":":umbrella:","category":5,"emoji_order":2882},{"name":"umbrella with rain drops","shortname":":umbrella_rain:","category":5,"emoji_order":2883},{"name":"umbrella on ground","shortname":":beach_umbrella:","category":5,"emoji_order":2885},{"name":"high voltage","shortname":":zap:","category":5,"emoji_order":2886,"aliases":[":high_voltage:"]},{"name":"snowflake","shortname":":snowflake:","category":5,"emoji_order":2888},{"name":"snowman","shortname":":snowy_snowman:","category":5,"emoji_order":2890},{"name":"snowman without snow","shortname":":snowman:","category":5,"emoji_order":2891},{"name":"comet","shortname":":comet:","category":5,"emoji_order":2893},{"name":"fire","shortname":":fire:","category":5,"emoji_order":2894},{"name":"droplet","shortname":":droplet:","category":5,"emoji_order":2895},{"name":"water wave","shortname":":ocean:","category":5,"emoji_order":2896},{"name":"jack-o-lantern","shortname":":jack_o_lantern:","category":6,"emoji_order":2897},{"name":"Christmas tree","shortname":":christmas_tree:","category":6,"emoji_order":2898,"aliases":[":xmas_tree:"]},{"name":"fireworks","shortname":":fireworks:","category":6,"emoji_order":2899},{"name":"sparkler","shortname":":sparkler:","category":6,"emoji_order":2900},{"name":"firecracker","shortname":":firecracker:","category":6,"emoji_order":2901},{"name":"sparkles","shortname":":sparkles:","category":6,"emoji_order":2902},{"name":"balloon","shortname":":balloon:","category":6,"emoji_order":2903},{"name":"party popper","shortname":":tada:","category":6,"emoji_order":2904,"aliases":[":party:"]},{"name":"confetti ball","shortname":":confetti_ball:","category":6,"emoji_order":2905},{"name":"tanabata tree","shortname":":tanabata_tree:","category":6,"emoji_order":2906},{"name":"pine decoration","shortname":":bamboo:","category":6,"emoji_order":2907,"aliases":[":pine_decor:"]},{"name":"Japanese dolls","shortname":":dolls:","category":6,"emoji_order":2908},{"name":"carp streamer","shortname":":carp_streamer:","category":6,"emoji_order":2909},{"name":"wind chime","shortname":":wind_chime:","category":6,"emoji_order":2910},{"name":"moon viewing ceremony","shortname":":moon_ceremony:","category":6,"emoji_order":2911,"aliases":[":rice_scene:"]},{"name":"red envelope","shortname":":red_envelope:","category":6,"emoji_order":2912},{"name":"ribbon","shortname":":ribbon:","category":6,"emoji_order":2913},{"name":"wrapped gift","shortname":":gift:","category":6,"emoji_order":2914},{"name":"reminder ribbon","shortname":":reminder_ribbon:","category":6,"emoji_order":2916},{"name":"admission tickets","shortname":":tickets:","category":6,"emoji_order":2918,"aliases":[":admission:"]},{"name":"ticket","shortname":":ticket:","category":6,"emoji_order":2919},{"name":"military medal","shortname":":military_medal:","category":6,"emoji_order":2921},{"name":"trophy","shortname":":trophy:","category":6,"emoji_order":2922},{"name":"sports medal","shortname":":medal:","category":6,"emoji_order":2923},{"name":"1st place medal","shortname":":first_place:","category":6,"emoji_order":2924},{"name":"2nd place medal","shortname":":second_place:","category":6,"emoji_order":2925},{"name":"3rd place medal","shortname":":third_place:","category":6,"emoji_order":2926},{"name":"soccer ball","shortname":":soccer:","category":6,"emoji_order":2927},{"name":"baseball","shortname":":baseball:","category":6,"emoji_order":2928},{"name":"softball","shortname":":softball:","category":6,"emoji_order":2929},{"name":"basketball","shortname":":basketball:","category":6,"emoji_order":2930},{"name":"volleyball","shortname":":volleyball:","category":6,"emoji_order":2931},{"name":"american football","shortname":":football:","category":6,"emoji_order":2932},{"name":"rugby football","shortname":":rugby:","category":6,"emoji_order":2933},{"name":"tennis","shortname":":tennis:","category":6,"emoji_order":2934},{"name":"flying disc","shortname":":flying_disc:","category":6,"emoji_order":2935},{"name":"bowling","shortname":":bowling:","category":6,"emoji_order":2936},{"name":"cricket game","shortname":":cricket_game:","category":6,"emoji_order":2937},{"name":"field hockey","shortname":":field_hockey:","category":6,"emoji_order":2938},{"name":"ice hockey","shortname":":hockey:","category":6,"emoji_order":2939},{"name":"lacrosse","shortname":":lacrosse:","category":6,"emoji_order":2940},{"name":"ping pong","shortname":":ping_pong:","category":6,"emoji_order":2941},{"name":"badminton","shortname":":badminton:","category":6,"emoji_order":2942},{"name":"boxing glove","shortname":":boxing_glove:","category":6,"emoji_order":2943},{"name":"martial arts uniform","shortname":":gi:","category":6,"emoji_order":2944,"aliases":[":martial_arts_uniform:"]},{"name":"goal net","shortname":":goal:","category":6,"emoji_order":2945},{"name":"flag in hole","shortname":":golf:","category":6,"emoji_order":2946},{"name":"ice skate","shortname":":ice_skate:","category":6,"emoji_order":2948},{"name":"fishing pole","shortname":":fishing_pole:","category":6,"emoji_order":2949},{"name":"diving mask","shortname":":diving_mask:","category":6,"emoji_order":2950,"aliases":[":scuba_mask:"]},{"name":"running shirt","shortname":":running_shirt:","category":6,"emoji_order":2951},{"name":"skis","shortname":":ski:","category":6,"emoji_order":2952},{"name":"sled","shortname":":sled:","category":6,"emoji_order":2953},{"name":"curling stone","shortname":":curling_stone:","category":6,"emoji_order":2954},{"name":"direct hit","shortname":":dart:","category":6,"emoji_order":2955},{"name":"yo-yo","shortname":":yoyo:","category":6,"emoji_order":2956},{"name":"kite","shortname":":kite:","category":6,"emoji_order":2957},{"name":"pool 8 ball","shortname":":8ball:","category":6,"emoji_order":2958},{"name":"crystal ball","shortname":":crystal_ball:","category":6,"emoji_order":2959},{"name":"nazar amulet","shortname":":nazar_amulet:","category":6,"emoji_order":2960},{"name":"video game","shortname":":video_game:","category":6,"emoji_order":2961},{"name":"joystick","shortname":":joystick:","category":6,"emoji_order":2963},{"name":"slot machine","shortname":":slot_machine:","category":6,"emoji_order":2964},{"name":"game die","shortname":":game_die:","category":6,"emoji_order":2965},{"name":"puzzle piece","shortname":":jigsaw:","category":6,"emoji_order":2966,"aliases":[":puzzle_piece:"]},{"name":"teddy bear","shortname":":teddy_bear:","category":6,"emoji_order":2967},{"name":"spade suit","shortname":":spades:","category":6,"emoji_order":2969},{"name":"heart suit","shortname":":hearts:","category":6,"emoji_order":2971},{"name":"diamond suit","shortname":":diamonds:","category":6,"emoji_order":2973},{"name":"club suit","shortname":":clubs:","category":6,"emoji_order":2975},{"name":"chess pawn","shortname":":chess_pawn:","category":6,"emoji_order":2977},{"name":"joker","shortname":":black_joker:","category":6,"emoji_order":2978},{"name":"mahjong red dragon","shortname":":mahjong:","category":6,"emoji_order":2979},{"name":"flower playing cards","shortname":":flower_cards:","category":6,"emoji_order":2980},{"name":"performing arts","shortname":":performing_arts:","category":6,"emoji_order":2981},{"name":"framed picture","shortname":":frame_photo:","category":6,"emoji_order":2983},{"name":"artist palette","shortname":":art:","category":6,"emoji_order":2984,"aliases":[":palette:"]},{"name":"thread","shortname":":spool:","category":6,"emoji_order":2985},{"name":"yarn","shortname":":yarn:","category":6,"emoji_order":2986},{"name":"glasses","shortname":":glasses:","category":7,"emoji_order":2987},{"name":"sunglasses","shortname":":sunglasses:","category":7,"emoji_order":2989},{"name":"goggles","shortname":":goggles:","category":7,"emoji_order":2990},{"name":"lab coat","shortname":":lab_coat:","category":7,"emoji_order":2991},{"name":"safety vest","shortname":":safety_vest:","category":7,"emoji_order":2992},{"name":"necktie","shortname":":necktie:","category":7,"emoji_order":2993,"aliases":[":tie:"]},{"name":"t-shirt","shortname":":shirt:","category":7,"emoji_order":2994},{"name":"jeans","shortname":":jeans:","category":7,"emoji_order":2995},{"name":"scarf","shortname":":scarf:","category":7,"emoji_order":2996},{"name":"gloves","shortname":":gloves:","category":7,"emoji_order":2997},{"name":"coat","shortname":":coat:","category":7,"emoji_order":2998},{"name":"socks","shortname":":socks:","category":7,"emoji_order":2999},{"name":"dress","shortname":":dress:","category":7,"emoji_order":3000},{"name":"kimono","shortname":":kimono:","category":7,"emoji_order":3001},{"name":"sari","shortname":":sari:","category":7,"emoji_order":3002},{"name":"one-piece swimsuit","shortname":":one_piece_swimsuit:","category":7,"emoji_order":3003},{"name":"briefs","shortname":":briefs:","category":7,"emoji_order":3004},{"name":"shorts","shortname":":shorts:","category":7,"emoji_order":3005},{"name":"bikini","shortname":":bikini:","category":7,"emoji_order":3006},{"name":"woman’s clothes","shortname":":blouse:","category":7,"emoji_order":3007,"aliases":[":womans_clothes:"]},{"name":"purse","shortname":":purse:","category":7,"emoji_order":3008},{"name":"handbag","shortname":":handbag:","category":7,"emoji_order":3009},{"name":"clutch bag","shortname":":pouch:","category":7,"emoji_order":3010,"aliases":[":clutch_bag:"]},{"name":"shopping bags","shortname":":shopping_bags:","category":7,"emoji_order":3012},{"name":"backpack","shortname":":backpack:","category":7,"emoji_order":3013},{"name":"man’s shoe","shortname":":dress_shoe:","category":7,"emoji_order":3014,"aliases":[":mans_shoe:"]},{"name":"running shoe","shortname":":sneaker:","category":7,"emoji_order":3015,"aliases":[":athletic_shoe:"]},{"name":"hiking boot","shortname":":hiking_boot:","category":7,"emoji_order":3016},{"name":"flat shoe","shortname":":flat_shoe:","category":7,"emoji_order":3017},{"name":"high-heeled shoe","shortname":":high_heel:","category":7,"emoji_order":3018},{"name":"woman’s sandal","shortname":":womans_sandal:","category":7,"emoji_order":3019},{"name":"ballet shoes","shortname":":ballet_shoes:","category":7,"emoji_order":3020},{"name":"woman’s boot","shortname":":womans_boot:","category":7,"emoji_order":3021},{"name":"crown","shortname":":crown:","category":7,"emoji_order":3022},{"name":"woman’s hat","shortname":":womans_hat:","category":7,"emoji_order":3023},{"name":"top hat","shortname":":top_hat:","category":7,"emoji_order":3024},{"name":"graduation cap","shortname":":graduation_cap:","category":7,"emoji_order":3025},{"name":"billed cap","shortname":":billed_cap:","category":7,"emoji_order":3026},{"name":"rescue worker’s helmet","shortname":":helmet_cross:","category":7,"emoji_order":3028},{"name":"prayer beads","shortname":":prayer_beads:","category":7,"emoji_order":3029},{"name":"lipstick","shortname":":lipstick:","category":7,"emoji_order":3030},{"name":"ring","shortname":":ring:","category":7,"emoji_order":3031},{"name":"gem stone","shortname":":gem:","category":7,"emoji_order":3032},{"name":"muted speaker","shortname":":mute:","category":7,"emoji_order":3033,"aliases":[":no_sound:"]},{"name":"speaker low volume","shortname":":speaker:","category":7,"emoji_order":3034,"aliases":[":low_sound:"]},{"name":"speaker medium volume","shortname":":sound:","category":7,"emoji_order":3035},{"name":"speaker high volume","shortname":":loud_sound:","category":7,"emoji_order":3036},{"name":"loudspeaker","shortname":":loudspeaker:","category":7,"emoji_order":3037},{"name":"megaphone","shortname":":megaphone:","category":7,"emoji_order":3038},{"name":"postal horn","shortname":":postal_horn:","category":7,"emoji_order":3039},{"name":"bell","shortname":":bell:","category":7,"emoji_order":3040},{"name":"bell with slash","shortname":":no_bell:","category":7,"emoji_order":3041},{"name":"musical score","shortname":":musical_score:","category":7,"emoji_order":3042},{"name":"musical note","shortname":":musical_note:","category":7,"emoji_order":3043},{"name":"musical notes","shortname":":musical_notes:","category":7,"emoji_order":3044},{"name":"studio microphone","shortname":":studio_microphone:","category":7,"emoji_order":3046},{"name":"level slider","shortname":":level_slider:","category":7,"emoji_order":3048},{"name":"control knobs","shortname":":control_knobs:","category":7,"emoji_order":3050},{"name":"microphone","shortname":":microphone:","category":7,"emoji_order":3051},{"name":"headphone","shortname":":headphones:","category":7,"emoji_order":3052},{"name":"radio","shortname":":radio:","category":7,"emoji_order":3053},{"name":"saxophone","shortname":":saxophone:","category":7,"emoji_order":3054},{"name":"guitar","shortname":":guitar:","category":7,"emoji_order":3055},{"name":"musical keyboard","shortname":":musical_keyboard:","category":7,"emoji_order":3056},{"name":"trumpet","shortname":":trumpet:","category":7,"emoji_order":3057},{"name":"violin","shortname":":violin:","category":7,"emoji_order":3058},{"name":"banjo","shortname":":banjo:","category":7,"emoji_order":3059},{"name":"drum","shortname":":drum:","category":7,"emoji_order":3060},{"name":"mobile phone","shortname":":mobile:","category":7,"emoji_order":3061,"aliases":[":iphone:",":android:"]},{"name":"mobile phone with arrow","shortname":":mobile_calling:","category":7,"emoji_order":3062},{"name":"telephone","shortname":":telephone:","category":7,"emoji_order":3064},{"name":"telephone receiver","shortname":":telephone_receiver:","category":7,"emoji_order":3065},{"name":"pager","shortname":":pager:","category":7,"emoji_order":3066},{"name":"fax machine","shortname":":fax:","category":7,"emoji_order":3067},{"name":"battery","shortname":":battery:","category":7,"emoji_order":3068},{"name":"electric plug","shortname":":electric_plug:","category":7,"emoji_order":3069},{"name":"laptop computer","shortname":":laptop:","category":7,"emoji_order":3070},{"name":"desktop computer","shortname":":desktop:","category":7,"emoji_order":3072,"aliases":[":computer:"]},{"name":"printer","shortname":":printer:","category":7,"emoji_order":3074},{"name":"keyboard","shortname":":keyboard:","category":7,"emoji_order":3076},{"name":"computer mouse","shortname":":computer_mouse:","category":7,"emoji_order":3078},{"name":"trackball","shortname":":trackball:","category":7,"emoji_order":3080},{"name":"computer disk","shortname":":minidisc:","category":7,"emoji_order":3081},{"name":"floppy disk","shortname":":floppy_disk:","category":7,"emoji_order":3082},{"name":"optical disk","shortname":":cd:","category":7,"emoji_order":3083,"aliases":[":disk:"]},{"name":"dvd","shortname":":dvd:","category":7,"emoji_order":3084},{"name":"abacus","shortname":":abacus:","category":7,"emoji_order":3085},{"name":"movie camera","shortname":":movie_camera:","category":7,"emoji_order":3086},{"name":"film frames","shortname":":film_frames:","category":7,"emoji_order":3088},{"name":"film projector","shortname":":projector:","category":7,"emoji_order":3090},{"name":"clapper board","shortname":":clapper:","category":7,"emoji_order":3091},{"name":"television","shortname":":tv:","category":7,"emoji_order":3092},{"name":"camera","shortname":":camera:","category":7,"emoji_order":3093},{"name":"camera with flash","shortname":":camera_flash:","category":7,"emoji_order":3094},{"name":"video camera","shortname":":video_camera:","category":7,"emoji_order":3095},{"name":"videocassette","shortname":":vhs:","category":7,"emoji_order":3096},{"name":"magnifying glass tilted left","shortname":":mag:","category":7,"emoji_order":3097},{"name":"magnifying glass tilted right","shortname":":mag_right:","category":7,"emoji_order":3098},{"name":"candle","shortname":":candle:","category":7,"emoji_order":3100},{"name":"light bulb","shortname":":bulb:","category":7,"emoji_order":3101,"aliases":[":light_bulb:"]},{"name":"flashlight","shortname":":flashlight:","category":7,"emoji_order":3102},{"name":"red paper lantern","shortname":":red_lantern:","category":7,"emoji_order":3103},{"name":"diya lamp","shortname":":diya_lamp:","category":7,"emoji_order":3104},{"name":"notebook with decorative cover","shortname":":decorative_notebook:","category":7,"emoji_order":3105},{"name":"closed book","shortname":":closed_book:","category":7,"emoji_order":3106},{"name":"open book","shortname":":book:","category":7,"emoji_order":3107},{"name":"green book","shortname":":green_book:","category":7,"emoji_order":3108},{"name":"blue book","shortname":":blue_book:","category":7,"emoji_order":3109},{"name":"orange book","shortname":":orange_book:","category":7,"emoji_order":3110},{"name":"books","shortname":":books:","category":7,"emoji_order":3111},{"name":"notebook","shortname":":notebook:","category":7,"emoji_order":3112},{"name":"ledger","shortname":":ledger:","category":7,"emoji_order":3113},{"name":"page with curl","shortname":":page_curl:","category":7,"emoji_order":3114},{"name":"scroll","shortname":":scroll:","category":7,"emoji_order":3115},{"name":"page facing up","shortname":":page_facing_up:","category":7,"emoji_order":3116},{"name":"newspaper","shortname":":newspaper:","category":7,"emoji_order":3117},{"name":"rolled-up newspaper","shortname":":rolled_newspaper:","category":7,"emoji_order":3119},{"name":"bookmark tabs","shortname":":bookmark_tabs:","category":7,"emoji_order":3120},{"name":"bookmark","shortname":":bookmark:","category":7,"emoji_order":3121},{"name":"label","shortname":":label:","category":7,"emoji_order":3123},{"name":"money bag","shortname":":moneybag:","category":7,"emoji_order":3124},{"name":"yen banknote","shortname":":yen:","category":7,"emoji_order":3125},{"name":"dollar banknote","shortname":":dollar:","category":7,"emoji_order":3126},{"name":"euro banknote","shortname":":euro:","category":7,"emoji_order":3127},{"name":"pound banknote","shortname":":pound:","category":7,"emoji_order":3128},{"name":"money with wings","shortname":":money_wings:","category":7,"emoji_order":3129},{"name":"credit card","shortname":":credit_card:","category":7,"emoji_order":3130},{"name":"receipt","shortname":":receipt:","category":7,"emoji_order":3131},{"name":"chart increasing with yen","shortname":":ja_chart:","category":7,"emoji_order":3132},{"name":"currency exchange","shortname":":currency_exchange:","category":7,"emoji_order":3133},{"name":"heavy dollar sign","shortname":":dollar_sign:","category":7,"emoji_order":3134},{"name":"envelope","shortname":":envelope:","category":7,"emoji_order":3136},{"name":"e-mail","shortname":":email:","category":7,"emoji_order":3137},{"name":"incoming envelope","shortname":":incoming_envelope:","category":7,"emoji_order":3138},{"name":"envelope with arrow","shortname":":envelope_arrow:","category":7,"emoji_order":3139},{"name":"outbox tray","shortname":":outbox_tray:","category":7,"emoji_order":3140},{"name":"inbox tray","shortname":":inbox_tray:","category":7,"emoji_order":3141},{"name":"package","shortname":":package:","category":7,"emoji_order":3142},{"name":"closed mailbox with raised flag","shortname":":mailbox:","category":7,"emoji_order":3143},{"name":"closed mailbox with lowered flag","shortname":":mailbox_closed:","category":7,"emoji_order":3144},{"name":"open mailbox with raised flag","shortname":":mailbox_mail:","category":7,"emoji_order":3145},{"name":"open mailbox with lowered flag","shortname":":mailbox_no_mail:","category":7,"emoji_order":3146},{"name":"postbox","shortname":":postbox:","category":7,"emoji_order":3147},{"name":"ballot box with ballot","shortname":":ballot_box:","category":7,"emoji_order":3149},{"name":"pencil","shortname":":pencil:","category":7,"emoji_order":3151},{"name":"black nib","shortname":":black_nib:","category":7,"emoji_order":3153},{"name":"fountain pen","shortname":":fountain_pen:","category":7,"emoji_order":3155},{"name":"pen","shortname":":pen:","category":7,"emoji_order":3157},{"name":"paintbrush","shortname":":paintbrush:","category":7,"emoji_order":3159},{"name":"crayon","shortname":":crayon:","category":7,"emoji_order":3161},{"name":"memo","shortname":":memo:","category":7,"emoji_order":3162},{"name":"briefcase","shortname":":briefcase:","category":7,"emoji_order":3163},{"name":"file folder","shortname":":file_folder:","category":7,"emoji_order":3164},{"name":"open file folder","shortname":":open_file_folder:","category":7,"emoji_order":3165},{"name":"card index dividers","shortname":":dividers:","category":7,"emoji_order":3167},{"name":"calendar","shortname":":date:","category":7,"emoji_order":3168,"aliases":[":calendar:"]},{"name":"tear-off calendar","shortname":":torn_calendar:","category":7,"emoji_order":3169},{"name":"spiral notepad","shortname":":notepad_spiral:","category":7,"emoji_order":3171},{"name":"spiral calendar","shortname":":calendar_spiral:","category":7,"emoji_order":3173},{"name":"card index","shortname":":card_index:","category":7,"emoji_order":3174},{"name":"chart increasing","shortname":":chart_up:","category":7,"emoji_order":3175},{"name":"chart decreasing","shortname":":chart_down:","category":7,"emoji_order":3176},{"name":"bar chart","shortname":":bar_chart:","category":7,"emoji_order":3177},{"name":"clipboard","shortname":":clipboard:","category":7,"emoji_order":3178},{"name":"pushpin","shortname":":pushpin:","category":7,"emoji_order":3179},{"name":"round pushpin","shortname":":round_pushpin:","category":7,"emoji_order":3180},{"name":"paperclip","shortname":":paperclip:","category":7,"emoji_order":3181},{"name":"linked paperclips","shortname":":paperclips:","category":7,"emoji_order":3183},{"name":"straight ruler","shortname":":straight_ruler:","category":7,"emoji_order":3184},{"name":"triangular ruler","shortname":":triangular_ruler:","category":7,"emoji_order":3185},{"name":"scissors","shortname":":scissors:","category":7,"emoji_order":3187},{"name":"card file box","shortname":":card_box:","category":7,"emoji_order":3189},{"name":"file cabinet","shortname":":file_cabinet:","category":7,"emoji_order":3191},{"name":"wastebasket","shortname":":trashcan:","category":7,"emoji_order":3193,"aliases":[":wastebasket:"]},{"name":"locked","shortname":":lock:","category":7,"emoji_order":3194},{"name":"unlocked","shortname":":unlock:","category":7,"emoji_order":3195},{"name":"locked with pen","shortname":":locked_pen:","category":7,"emoji_order":3196},{"name":"locked with key","shortname":":locked_key:","category":7,"emoji_order":3197},{"name":"key","shortname":":key:","category":7,"emoji_order":3198},{"name":"old key","shortname":":old_key:","category":7,"emoji_order":3200},{"name":"hammer","shortname":":hammer:","category":7,"emoji_order":3201},{"name":"axe","shortname":":axe:","category":7,"emoji_order":3202},{"name":"pick","shortname":":pick:","category":7,"emoji_order":3204},{"name":"hammer and pick","shortname":":hammer_pick:","category":7,"emoji_order":3206},{"name":"hammer and wrench","shortname":":tools:","category":7,"emoji_order":3208,"aliases":[":hammer_wrench:"]},{"name":"dagger","shortname":":dagger:","category":7,"emoji_order":3210},{"name":"crossed swords","shortname":":crossed_swords:","category":7,"emoji_order":3212},{"name":"pistol","shortname":":gun:","category":7,"emoji_order":3213,"aliases":[":pistol:"]},{"name":"bow and arrow","shortname":":bow:","category":7,"emoji_order":3214},{"name":"shield","shortname":":shield:","category":7,"emoji_order":3216},{"name":"wrench","shortname":":wrench:","category":7,"emoji_order":3217},{"name":"nut and bolt","shortname":":nut_and_bolt:","category":7,"emoji_order":3218},{"name":"gear","shortname":":gear:","category":7,"emoji_order":3220},{"name":"clamp","shortname":":clamp:","category":7,"emoji_order":3222,"aliases":[":compression:"]},{"name":"balance scale","shortname":":scales:","category":7,"emoji_order":3224},{"name":"probing cane","shortname":":probing_cane:","category":7,"emoji_order":3225},{"name":"link","shortname":":link:","category":7,"emoji_order":3226},{"name":"chains","shortname":":chains:","category":7,"emoji_order":3228},{"name":"toolbox","shortname":":toolbox:","category":7,"emoji_order":3229},{"name":"magnet","shortname":":magnet:","category":7,"emoji_order":3230},{"name":"alembic","shortname":":alembic:","category":7,"emoji_order":3232},{"name":"test tube","shortname":":test_tube:","category":7,"emoji_order":3233},{"name":"petri dish","shortname":":petri_dish:","category":7,"emoji_order":3234},{"name":"dna","shortname":":dna:","category":7,"emoji_order":3235,"aliases":[":double_helix:"]},{"name":"microscope","shortname":":microscope:","category":7,"emoji_order":3236},{"name":"telescope","shortname":":telescope:","category":7,"emoji_order":3237},{"name":"satellite antenna","shortname":":satellite_antenna:","category":7,"emoji_order":3238},{"name":"syringe","shortname":":syringe:","category":7,"emoji_order":3239},{"name":"drop of blood","shortname":":blood_drop:","category":7,"emoji_order":3240},{"name":"pill","shortname":":pill:","category":7,"emoji_order":3241},{"name":"adhesive bandage","shortname":":bandaid:","category":7,"emoji_order":3242,"aliases":[":adhesive_bandage:"]},{"name":"stethoscope","shortname":":stethoscope:","category":7,"emoji_order":3243},{"name":"door","shortname":":door:","category":7,"emoji_order":3244},{"name":"bed","shortname":":bed:","category":7,"emoji_order":3246},{"name":"couch and lamp","shortname":":couch:","category":7,"emoji_order":3248},{"name":"chair","shortname":":chair:","category":7,"emoji_order":3249},{"name":"toilet","shortname":":toilet:","category":7,"emoji_order":3250},{"name":"shower","shortname":":shower:","category":7,"emoji_order":3251},{"name":"bathtub","shortname":":bathtub:","category":7,"emoji_order":3252},{"name":"razor","shortname":":razor:","category":7,"emoji_order":3253},{"name":"lotion bottle","shortname":":lotion:","category":7,"emoji_order":3254},{"name":"safety pin","shortname":":safety_pin:","category":7,"emoji_order":3255},{"name":"broom","shortname":":broom:","category":7,"emoji_order":3256},{"name":"basket","shortname":":basket:","category":7,"emoji_order":3257},{"name":"roll of paper","shortname":":toilet_paper:","category":7,"emoji_order":3258},{"name":"soap","shortname":":soap:","category":7,"emoji_order":3259},{"name":"sponge","shortname":":sponge:","category":7,"emoji_order":3260},{"name":"fire extinguisher","shortname":":fire_extinguisher:","category":7,"emoji_order":3261},{"name":"shopping cart","shortname":":shopping_cart:","category":7,"emoji_order":3262},{"name":"cigarette","shortname":":cigarette:","category":7,"emoji_order":3263,"aliases":[":smoking:"]},{"name":"coffin","shortname":":coffin:","category":7,"emoji_order":3265},{"name":"funeral urn","shortname":":urn:","category":7,"emoji_order":3267},{"name":"moai","shortname":":moai:","category":7,"emoji_order":3268},{"name":"ATM sign","shortname":":atm:","category":8,"emoji_order":3269},{"name":"litter in bin sign","shortname":":litter_bin:","category":8,"emoji_order":3270},{"name":"potable water","shortname":":potable_water:","category":8,"emoji_order":3271},{"name":"wheelchair symbol","shortname":":handicapped:","category":8,"emoji_order":3272},{"name":"men’s room","shortname":":mens:","category":8,"emoji_order":3273},{"name":"women’s room","shortname":":womens:","category":8,"emoji_order":3274},{"name":"restroom","shortname":":restroom:","category":8,"emoji_order":3275,"aliases":[":bathroom:"]},{"name":"baby symbol","shortname":":baby_symbol:","category":8,"emoji_order":3276},{"name":"water closet","shortname":":wc:","category":8,"emoji_order":3277},{"name":"passport control","shortname":":passport_control:","category":8,"emoji_order":3278},{"name":"customs","shortname":":customs:","category":8,"emoji_order":3279},{"name":"baggage claim","shortname":":baggage_claim:","category":8,"emoji_order":3280},{"name":"left luggage","shortname":":left_luggage:","category":8,"emoji_order":3281},{"name":"warning","shortname":":warning:","category":8,"emoji_order":3283},{"name":"children crossing","shortname":":children_crossing:","category":8,"emoji_order":3284},{"name":"no entry","shortname":":no_entry:","category":8,"emoji_order":3285},{"name":"prohibited","shortname":":no_entry_sign:","category":8,"emoji_order":3286},{"name":"no bicycles","shortname":":no_bicycles:","category":8,"emoji_order":3287},{"name":"no smoking","shortname":":no_smoking:","category":8,"emoji_order":3288},{"name":"no littering","shortname":":do_not_litter:","category":8,"emoji_order":3289},{"name":"non-potable water","shortname":":non_potable_water:","category":8,"emoji_order":3290},{"name":"no pedestrians","shortname":":no_pedestrians:","category":8,"emoji_order":3291},{"name":"no mobile phones","shortname":":no_mobile_phones:","category":8,"emoji_order":3292},{"name":"no one under eighteen","shortname":":underage:","category":8,"emoji_order":3293},{"name":"radioactive","shortname":":radioactive:","category":8,"emoji_order":3295},{"name":"biohazard","shortname":":biohazard:","category":8,"emoji_order":3297},{"name":"up arrow","shortname":":arrow_up:","category":8,"emoji_order":3299},{"name":"up-right arrow","shortname":":arrow_upper_right:","category":8,"emoji_order":3301},{"name":"right arrow","shortname":":arrow_right:","category":8,"emoji_order":3303},{"name":"down-right arrow","shortname":":arrow_lower_right:","category":8,"emoji_order":3305},{"name":"down arrow","shortname":":arrow_down:","category":8,"emoji_order":3307},{"name":"down-left arrow","shortname":":arrow_lower_left:","category":8,"emoji_order":3309},{"name":"left arrow","shortname":":arrow_left:","category":8,"emoji_order":3311},{"name":"up-left arrow","shortname":":arrow_upper_left:","category":8,"emoji_order":3313},{"name":"up-down arrow","shortname":":arrow_up_down:","category":8,"emoji_order":3315},{"name":"left-right arrow","shortname":":arrow_left_right:","category":8,"emoji_order":3317},{"name":"right arrow curving left","shortname":":arrow_left_hook:","category":8,"emoji_order":3319},{"name":"left arrow curving right","shortname":":arrow_right_hook:","category":8,"emoji_order":3321},{"name":"right arrow curving up","shortname":":arrow_heading_up:","category":8,"emoji_order":3323},{"name":"right arrow curving down","shortname":":arrow_heading_down:","category":8,"emoji_order":3325},{"name":"clockwise vertical arrows","shortname":":clockwise:","category":8,"emoji_order":3326},{"name":"counterclockwise arrows button","shortname":":counter_clockwise:","category":8,"emoji_order":3327},{"name":"BACK arrow","shortname":":back:","category":8,"emoji_order":3328},{"name":"END arrow","shortname":":end:","category":8,"emoji_order":3329},{"name":"ON! arrow","shortname":":on:","category":8,"emoji_order":3330},{"name":"SOON arrow","shortname":":soon:","category":8,"emoji_order":3331},{"name":"TOP arrow","shortname":":top:","category":8,"emoji_order":3332},{"name":"place of worship","shortname":":place_of_worship:","category":8,"emoji_order":3333},{"name":"atom symbol","shortname":":atom:","category":8,"emoji_order":3335},{"name":"om","shortname":":om_symbol:","category":8,"emoji_order":3337},{"name":"star of David","shortname":":star_of_david:","category":8,"emoji_order":3339},{"name":"wheel of dharma","shortname":":wheel_of_dharma:","category":8,"emoji_order":3341},{"name":"yin yang","shortname":":yin_yang:","category":8,"emoji_order":3343},{"name":"latin cross","shortname":":cross:","category":8,"emoji_order":3345},{"name":"orthodox cross","shortname":":orthodox_cross:","category":8,"emoji_order":3347},{"name":"star and crescent","shortname":":star_and_crescent:","category":8,"emoji_order":3349},{"name":"peace symbol","shortname":":peace:","category":8,"emoji_order":3351},{"name":"menorah","shortname":":menorah:","category":8,"emoji_order":3352},{"name":"dotted six-pointed star","shortname":":six_pointed_star:","category":8,"emoji_order":3353},{"name":"Aries","shortname":":aries:","category":8,"emoji_order":3354},{"name":"Taurus","shortname":":taurus:","category":8,"emoji_order":3355},{"name":"Gemini","shortname":":gemini:","category":8,"emoji_order":3356},{"name":"Cancer","shortname":":cancer:","category":8,"emoji_order":3357},{"name":"Leo","shortname":":leo:","category":8,"emoji_order":3358},{"name":"Virgo","shortname":":virgo:","category":8,"emoji_order":3359},{"name":"Libra","shortname":":libra:","category":8,"emoji_order":3360},{"name":"Scorpio","shortname":":scorpius:","category":8,"emoji_order":3361},{"name":"Sagittarius","shortname":":sagittarius:","category":8,"emoji_order":3362},{"name":"Capricorn","shortname":":capricorn:","category":8,"emoji_order":3363},{"name":"Aquarius","shortname":":aquarius:","category":8,"emoji_order":3364},{"name":"Pisces","shortname":":pisces:","category":8,"emoji_order":3365},{"name":"Ophiuchus","shortname":":ophiuchus:","category":8,"emoji_order":3366},{"name":"shuffle tracks button","shortname":":shuffle:","category":8,"emoji_order":3367},{"name":"repeat button","shortname":":repeat:","category":8,"emoji_order":3368},{"name":"repeat single button","shortname":":repeat_single:","category":8,"emoji_order":3369},{"name":"play button","shortname":":play:","category":8,"emoji_order":3371},{"name":"fast-forward button","shortname":":fast_forward:","category":8,"emoji_order":3372},{"name":"next track button","shortname":":next_track:","category":8,"emoji_order":3374},{"name":"play or pause button","shortname":":play_pause:","category":8,"emoji_order":3376},{"name":"reverse button","shortname":":reverse:","category":8,"emoji_order":3378},{"name":"fast reverse button","shortname":":rewind:","category":8,"emoji_order":3379},{"name":"last track button","shortname":":previous_track:","category":8,"emoji_order":3381},{"name":"upwards button","shortname":":up_button:","category":8,"emoji_order":3382},{"name":"fast up button","shortname":":fast_up_button:","category":8,"emoji_order":3383},{"name":"downwards button","shortname":":down_button:","category":8,"emoji_order":3384},{"name":"fast down button","shortname":":fast_down_button:","category":8,"emoji_order":3385},{"name":"pause button","shortname":":pause:","category":8,"emoji_order":3387},{"name":"stop button","shortname":":stop:","category":8,"emoji_order":3389},{"name":"record button","shortname":":record:","category":8,"emoji_order":3391},{"name":"eject button","shortname":":eject:","category":8,"emoji_order":3393},{"name":"cinema","shortname":":cinema:","category":8,"emoji_order":3394},{"name":"dim button","shortname":":dim:","category":8,"emoji_order":3395,"aliases":[":low_brightness:"]},{"name":"bright button","shortname":":bright:","category":8,"emoji_order":3396,"aliases":[":high_brightness:"]},{"name":"antenna bars","shortname":":signal_strength:","category":8,"emoji_order":3397,"aliases":[":antenna_bars:"]},{"name":"vibration mode","shortname":":vibration_mode:","category":8,"emoji_order":3398},{"name":"mobile phone off","shortname":":mobile_phone_off:","category":8,"emoji_order":3399},{"name":"female sign","shortname":":female:","category":8,"emoji_order":3401,"aliases":[":female_sign:"]},{"name":"male sign","shortname":":male:","category":8,"emoji_order":3403,"aliases":[":male_sign:"]},{"name":"medical symbol","shortname":":medical:","category":8,"emoji_order":3405},{"name":"infinity","shortname":":infinity:","category":8,"emoji_order":3407},{"name":"recycling symbol","shortname":":recycle:","category":8,"emoji_order":3409},{"name":"fleur-de-lis","shortname":":fleur-de-lis:","category":8,"emoji_order":3411},{"name":"trident emblem","shortname":":trident:","category":8,"emoji_order":3412},{"name":"name badge","shortname":":name_badge:","category":8,"emoji_order":3413},{"name":"Japanese symbol for beginner","shortname":":ja_beginner:","category":8,"emoji_order":3414},{"name":"hollow red circle","shortname":":o:","category":8,"emoji_order":3415},{"name":"check mark button","shortname":":white_check_mark:","category":8,"emoji_order":3416},{"name":"check box with check","shortname":":checked_ballot:","category":8,"emoji_order":3418},{"name":"check mark","shortname":":check_mark:","category":8,"emoji_order":3420},{"name":"multiplication sign","shortname":":multiplication:","category":8,"emoji_order":3422},{"name":"cross mark","shortname":":x:","category":8,"emoji_order":3423,"aliases":[":cross_mark:"]},{"name":"cross mark button","shortname":":cross_mark_button:","category":8,"emoji_order":3424},{"name":"plus sign","shortname":":plus:","category":8,"emoji_order":3425},{"name":"minus sign","shortname":":minus:","category":8,"emoji_order":3426},{"name":"division sign","shortname":":division:","category":8,"emoji_order":3427},{"name":"curly loop","shortname":":curly_loop:","category":8,"emoji_order":3428},{"name":"double curly loop","shortname":":double_curly_loop:","category":8,"emoji_order":3429},{"name":"part alternation mark","shortname":":part_alternation_mark:","category":8,"emoji_order":3431},{"name":"eight-spoked asterisk","shortname":":eight_spoked_asterisk:","category":8,"emoji_order":3433},{"name":"eight-pointed star","shortname":":eight_pointed_star:","category":8,"emoji_order":3435},{"name":"sparkle","shortname":":sparkle:","category":8,"emoji_order":3437},{"name":"double exclamation mark","shortname":":bangbang:","category":8,"emoji_order":3439,"aliases":[":double_exclamation:"]},{"name":"exclamation question mark","shortname":":interrobang:","category":8,"emoji_order":3441,"aliases":[":exclamation_question:"]},{"name":"question mark","shortname":":question:","category":8,"emoji_order":3442},{"name":"white question mark","shortname":":white_question:","category":8,"emoji_order":3443},{"name":"white exclamation mark","shortname":":white_exclamation:","category":8,"emoji_order":3444},{"name":"exclamation mark","shortname":":exclamation:","category":8,"emoji_order":3445},{"name":"wavy dash","shortname":":wavy_dash:","category":8,"emoji_order":3447},{"name":"copyright","shortname":":copyright:","category":8,"emoji_order":3449},{"name":"registered","shortname":":registered:","category":8,"emoji_order":3451},{"name":"trade mark","shortname":":tm:","category":8,"emoji_order":3453},{"name":"keycap: #","shortname":":hash:","category":8,"emoji_order":3454},{"name":"keycap: *","shortname":":asterisk:","category":8,"emoji_order":3456},{"name":"keycap: 0","shortname":":zero:","category":8,"emoji_order":3458},{"name":"keycap: 1","shortname":":one:","category":8,"emoji_order":3460},{"name":"keycap: 2","shortname":":two:","category":8,"emoji_order":3462},{"name":"keycap: 3","shortname":":three:","category":8,"emoji_order":3464},{"name":"keycap: 4","shortname":":four:","category":8,"emoji_order":3466},{"name":"keycap: 5","shortname":":five:","category":8,"emoji_order":3468},{"name":"keycap: 6","shortname":":six:","category":8,"emoji_order":3470},{"name":"keycap: 7","shortname":":seven:","category":8,"emoji_order":3472},{"name":"keycap: 8","shortname":":eight:","category":8,"emoji_order":3474},{"name":"keycap: 9","shortname":":nine:","category":8,"emoji_order":3476},{"name":"keycap: 10","shortname":":ten:","category":8,"emoji_order":3478},{"name":"input latin uppercase","shortname":":upper_abcd:","category":8,"emoji_order":3479},{"name":"input latin lowercase","shortname":":abcd:","category":8,"emoji_order":3480},{"name":"input numbers","shortname":":1234:","category":8,"emoji_order":3481},{"name":"input symbols","shortname":":symbols:","category":8,"emoji_order":3482},{"name":"input latin letters","shortname":":abc:","category":8,"emoji_order":3483},{"name":"A button (blood type)","shortname":":a_blood:","category":8,"emoji_order":3485},{"name":"AB button (blood type)","shortname":":ab_blood:","category":8,"emoji_order":3486},{"name":"B button (blood type)","shortname":":b_blood:","category":8,"emoji_order":3488},{"name":"CL button","shortname":":cl:","category":8,"emoji_order":3489},{"name":"COOL button","shortname":":cool:","category":8,"emoji_order":3490},{"name":"FREE button","shortname":":free:","category":8,"emoji_order":3491},{"name":"information","shortname":":info:","category":8,"emoji_order":3493},{"name":"ID button","shortname":":id:","category":8,"emoji_order":3494},{"name":"circled M","shortname":":m:","category":8,"emoji_order":3496},{"name":"NEW button","shortname":":new:","category":8,"emoji_order":3497},{"name":"NG button","shortname":":ng:","category":8,"emoji_order":3498},{"name":"O button (blood type)","shortname":":o_blood:","category":8,"emoji_order":3500},{"name":"OK button","shortname":":ok:","category":8,"emoji_order":3501},{"name":"P button","shortname":":p:","category":8,"emoji_order":3503},{"name":"SOS button","shortname":":sos:","category":8,"emoji_order":3504},{"name":"UP! button","shortname":":up:","category":8,"emoji_order":3505},{"name":"VS button","shortname":":vs:","category":8,"emoji_order":3506},{"name":"Japanese “here” button","shortname":":ja_here:","category":8,"emoji_order":3507,"aliases":[":koko:"]},{"name":"Japanese “service charge” button","shortname":":ja_service_charge:","category":8,"emoji_order":3509},{"name":"Japanese “monthly amount” button","shortname":":ja_monthly_amount:","category":8,"emoji_order":3511},{"name":"Japanese “not free of charge” button","shortname":":ja_not_free_of_carge:","category":8,"emoji_order":3512},{"name":"Japanese “reserved” button","shortname":":ja_reserved:","category":8,"emoji_order":3513},{"name":"Japanese “bargain” button","shortname":":ja_bargain:","category":8,"emoji_order":3514},{"name":"Japanese “discount” button","shortname":":ja_discount:","category":8,"emoji_order":3515},{"name":"Japanese “free of charge” button","shortname":":ja_free_of_charge:","category":8,"emoji_order":3516},{"name":"Japanese “prohibited” button","shortname":":ja_prohibited:","category":8,"emoji_order":3517},{"name":"Japanese “acceptable” button","shortname":":ja_acceptable:","category":8,"emoji_order":3518},{"name":"Japanese “application” button","shortname":":ja_application:","category":8,"emoji_order":3519},{"name":"Japanese “passing grade” button","shortname":":ja_passing_grade:","category":8,"emoji_order":3520},{"name":"Japanese “vacancy” button","shortname":":ja_vacancy:","category":8,"emoji_order":3521},{"name":"Japanese “congratulations” button","shortname":":ja_congratulations:","category":8,"emoji_order":3523},{"name":"Japanese “secret” button","shortname":":ja_secret:","category":8,"emoji_order":3525},{"name":"Japanese “open for business” button","shortname":":ja_open_for_business:","category":8,"emoji_order":3526},{"name":"Japanese “no vacancy” button","shortname":":ja_no_vacancy:","category":8,"emoji_order":3527},{"name":"red circle","shortname":":red_circle:","category":8,"emoji_order":3528},{"name":"orange circle","shortname":":orange_circle:","category":8,"emoji_order":3529},{"name":"yellow circle","shortname":":yellow_circle:","category":8,"emoji_order":3530},{"name":"green circle","shortname":":green_circle:","category":8,"emoji_order":3531},{"name":"blue circle","shortname":":blue_circle:","category":8,"emoji_order":3532},{"name":"purple circle","shortname":":purple_circle:","category":8,"emoji_order":3533},{"name":"brown circle","shortname":":brown_circle:","category":8,"emoji_order":3534},{"name":"black circle","shortname":":black_circle:","category":8,"emoji_order":3535},{"name":"white circle","shortname":":white_circle:","category":8,"emoji_order":3536},{"name":"red square","shortname":":red_square:","category":8,"emoji_order":3537},{"name":"orange square","shortname":":orange_square:","category":8,"emoji_order":3538},{"name":"yellow square","shortname":":yellow_square:","category":8,"emoji_order":3539},{"name":"green square","shortname":":green_square:","category":8,"emoji_order":3540},{"name":"blue square","shortname":":blue_square:","category":8,"emoji_order":3541},{"name":"purple square","shortname":":purple_square:","category":8,"emoji_order":3542},{"name":"brown square","shortname":":brown_square:","category":8,"emoji_order":3543},{"name":"black large square","shortname":":large_black_square:","category":8,"emoji_order":3544},{"name":"white large square","shortname":":large_white_square:","category":8,"emoji_order":3545},{"name":"black medium square","shortname":":medium_black_square:","category":8,"emoji_order":3547},{"name":"white medium square","shortname":":medium_white_square:","category":8,"emoji_order":3549},{"name":"black medium-small square","shortname":":medium_small_black_square:","category":8,"emoji_order":3550},{"name":"white medium-small square","shortname":":medium_small_white_square:","category":8,"emoji_order":3551},{"name":"black small square","shortname":":small_black_square:","category":8,"emoji_order":3553},{"name":"white small square","shortname":":small_white_square:","category":8,"emoji_order":3555},{"name":"large orange diamond","shortname":":large_orange_diamond:","category":8,"emoji_order":3556},{"name":"large blue diamond","shortname":":large_blue_diamond:","category":8,"emoji_order":3557},{"name":"small orange diamond","shortname":":small_orange_diamond:","category":8,"emoji_order":3558},{"name":"small blue diamond","shortname":":small_blue_diamond:","category":8,"emoji_order":3559},{"name":"red triangle pointed up","shortname":":up_red_triangle:","category":8,"emoji_order":3560},{"name":"red triangle pointed down","shortname":":down_red_triangle:","category":8,"emoji_order":3561},{"name":"diamond with a dot","shortname":":diamond_dot:","category":8,"emoji_order":3562},{"name":"radio button","shortname":":radio_button:","category":8,"emoji_order":3563},{"name":"white square button","shortname":":white_square_button:","category":8,"emoji_order":3564},{"name":"black square button","shortname":":black_square_button:","category":8,"emoji_order":3565},{"name":"chequered flag","shortname":":checkered_flag:","category":9,"emoji_order":3566},{"name":"triangular flag","shortname":":triangle_flag:","category":9,"emoji_order":3567},{"name":"crossed flags","shortname":":crossed_flags:","category":9,"emoji_order":3568},{"name":"black flag","shortname":":black_flag:","category":9,"emoji_order":3569},{"name":"white flag","shortname":":white_flag:","category":9,"emoji_order":3571},{"name":"rainbow flag","shortname":":rainbow_flag:","category":9,"emoji_order":3572},{"name":"pirate flag","shortname":":pirate_flag:","category":9,"emoji_order":3574,"aliases":[":jolly_roger:"]},{"name":"flag: Ascension Island","shortname":":flag_ac:","category":9,"emoji_order":3576},{"name":"flag: Andorra","shortname":":flag_ad:","category":9,"emoji_order":3577},{"name":"flag: United Arab Emirates","shortname":":flag_ae:","category":9,"emoji_order":3578},{"name":"flag: Afghanistan","shortname":":flag_af:","category":9,"emoji_order":3579},{"name":"flag: Antigua & Barbuda","shortname":":flag_ag:","category":9,"emoji_order":3580},{"name":"flag: Anguilla","shortname":":flag_ai:","category":9,"emoji_order":3581},{"name":"flag: Albania","shortname":":flag_al:","category":9,"emoji_order":3582},{"name":"flag: Armenia","shortname":":flag_am:","category":9,"emoji_order":3583},{"name":"flag: Angola","shortname":":flag_ao:","category":9,"emoji_order":3584},{"name":"flag: Antarctica","shortname":":flag_aq:","category":9,"emoji_order":3585},{"name":"flag: Argentina","shortname":":flag_ar:","category":9,"emoji_order":3586},{"name":"flag: American Samoa","shortname":":flag_as:","category":9,"emoji_order":3587},{"name":"flag: Austria","shortname":":flag_at:","category":9,"emoji_order":3588},{"name":"flag: Australia","shortname":":flag_au:","category":9,"emoji_order":3589},{"name":"flag: Aruba","shortname":":flag_aw:","category":9,"emoji_order":3590},{"name":"flag: Åland Islands","shortname":":flag_ax:","category":9,"emoji_order":3591},{"name":"flag: Azerbaijan","shortname":":flag_az:","category":9,"emoji_order":3592},{"name":"flag: Bosnia & Herzegovina","shortname":":flag_ba:","category":9,"emoji_order":3593},{"name":"flag: Barbados","shortname":":flag_bb:","category":9,"emoji_order":3594},{"name":"flag: Bangladesh","shortname":":flag_bd:","category":9,"emoji_order":3595},{"name":"flag: Belgium","shortname":":flag_be:","category":9,"emoji_order":3596},{"name":"flag: Burkina Faso","shortname":":flag_bf:","category":9,"emoji_order":3597},{"name":"flag: Bulgaria","shortname":":flag_bg:","category":9,"emoji_order":3598},{"name":"flag: Bahrain","shortname":":flag_bh:","category":9,"emoji_order":3599},{"name":"flag: Burundi","shortname":":flag_bi:","category":9,"emoji_order":3600},{"name":"flag: Benin","shortname":":flag_bj:","category":9,"emoji_order":3601},{"name":"flag: St. Barthélemy","shortname":":flag_bl:","category":9,"emoji_order":3602},{"name":"flag: Bermuda","shortname":":flag_bm:","category":9,"emoji_order":3603},{"name":"flag: Brunei","shortname":":flag_bn:","category":9,"emoji_order":3604},{"name":"flag: Bolivia","shortname":":flag_bo:","category":9,"emoji_order":3605},{"name":"flag: Caribbean Netherlands","shortname":":flag_bq:","category":9,"emoji_order":3606},{"name":"flag: Brazil","shortname":":flag_br:","category":9,"emoji_order":3607},{"name":"flag: Bahamas","shortname":":flag_bs:","category":9,"emoji_order":3608},{"name":"flag: Bhutan","shortname":":flag_bt:","category":9,"emoji_order":3609},{"name":"flag: Bouvet Island","shortname":":flag_bv:","category":9,"emoji_order":3610},{"name":"flag: Botswana","shortname":":flag_bw:","category":9,"emoji_order":3611},{"name":"flag: Belarus","shortname":":flag_by:","category":9,"emoji_order":3612},{"name":"flag: Belize","shortname":":flag_bz:","category":9,"emoji_order":3613},{"name":"flag: Canada","shortname":":flag_ca:","category":9,"emoji_order":3614},{"name":"flag: Cocos (Keeling) Islands","shortname":":flag_cc:","category":9,"emoji_order":3615},{"name":"flag: Congo - Kinshasa","shortname":":flag_cd:","category":9,"emoji_order":3616},{"name":"flag: Central African Republic","shortname":":flag_cf:","category":9,"emoji_order":3617},{"name":"flag: Congo - Brazzaville","shortname":":flag_cg:","category":9,"emoji_order":3618},{"name":"flag: Switzerland","shortname":":flag_ch:","category":9,"emoji_order":3619},{"name":"flag: Côte d’Ivoire","shortname":":flag_ci:","category":9,"emoji_order":3620},{"name":"flag: Cook Islands","shortname":":flag_ck:","category":9,"emoji_order":3621},{"name":"flag: Chile","shortname":":flag_cl:","category":9,"emoji_order":3622},{"name":"flag: Cameroon","shortname":":flag_cm:","category":9,"emoji_order":3623},{"name":"flag: China","shortname":":flag_cn:","category":9,"emoji_order":3624},{"name":"flag: Colombia","shortname":":flag_co:","category":9,"emoji_order":3625},{"name":"flag: Clipperton Island","shortname":":flag_cp:","category":9,"emoji_order":3626},{"name":"flag: Costa Rica","shortname":":flag_cr:","category":9,"emoji_order":3627},{"name":"flag: Cuba","shortname":":flag_cu:","category":9,"emoji_order":3628},{"name":"flag: Cape Verde","shortname":":flag_cv:","category":9,"emoji_order":3629},{"name":"flag: Curaçao","shortname":":flag_cw:","category":9,"emoji_order":3630},{"name":"flag: Christmas Island","shortname":":flag_cx:","category":9,"emoji_order":3631},{"name":"flag: Cyprus","shortname":":flag_cy:","category":9,"emoji_order":3632},{"name":"flag: Czechia","shortname":":flag_cz:","category":9,"emoji_order":3633},{"name":"flag: Germany","shortname":":flag_de:","category":9,"emoji_order":3634},{"name":"flag: Diego Garcia","shortname":":flag_dg:","category":9,"emoji_order":3635},{"name":"flag: Djibouti","shortname":":flag_dj:","category":9,"emoji_order":3636},{"name":"flag: Denmark","shortname":":flag_dk:","category":9,"emoji_order":3637},{"name":"flag: Dominica","shortname":":flag_dm:","category":9,"emoji_order":3638},{"name":"flag: Dominican Republic","shortname":":flag_do:","category":9,"emoji_order":3639},{"name":"flag: Algeria","shortname":":flag_dz:","category":9,"emoji_order":3640},{"name":"flag: Ceuta & Melilla","shortname":":flag_ea:","category":9,"emoji_order":3641},{"name":"flag: Ecuador","shortname":":flag_ec:","category":9,"emoji_order":3642},{"name":"flag: Estonia","shortname":":flag_ee:","category":9,"emoji_order":3643},{"name":"flag: Egypt","shortname":":flag_eg:","category":9,"emoji_order":3644},{"name":"flag: Western Sahara","shortname":":flag_eh:","category":9,"emoji_order":3645},{"name":"flag: Eritrea","shortname":":flag_er:","category":9,"emoji_order":3646},{"name":"flag: Spain","shortname":":flag_es:","category":9,"emoji_order":3647},{"name":"flag: Ethiopia","shortname":":flag_et:","category":9,"emoji_order":3648},{"name":"flag: European Union","shortname":":flag_eu:","category":9,"emoji_order":3649},{"name":"flag: Finland","shortname":":flag_fi:","category":9,"emoji_order":3650},{"name":"flag: Fiji","shortname":":flag_fj:","category":9,"emoji_order":3651},{"name":"flag: Falkland Islands","shortname":":flag_fk:","category":9,"emoji_order":3652},{"name":"flag: Micronesia","shortname":":flag_fm:","category":9,"emoji_order":3653},{"name":"flag: Faroe Islands","shortname":":flag_fo:","category":9,"emoji_order":3654},{"name":"flag: France","shortname":":flag_fr:","category":9,"emoji_order":3655},{"name":"flag: Gabon","shortname":":flag_ga:","category":9,"emoji_order":3656},{"name":"flag: United Kingdom","shortname":":flag_gb:","category":9,"emoji_order":3657},{"name":"flag: Grenada","shortname":":flag_gd:","category":9,"emoji_order":3658},{"name":"flag: Georgia","shortname":":flag_ge:","category":9,"emoji_order":3659},{"name":"flag: French Guiana","shortname":":flag_gf:","category":9,"emoji_order":3660},{"name":"flag: Guernsey","shortname":":flag_gg:","category":9,"emoji_order":3661},{"name":"flag: Ghana","shortname":":flag_gh:","category":9,"emoji_order":3662},{"name":"flag: Gibraltar","shortname":":flag_gi:","category":9,"emoji_order":3663},{"name":"flag: Greenland","shortname":":flag_gl:","category":9,"emoji_order":3664},{"name":"flag: Gambia","shortname":":flag_gm:","category":9,"emoji_order":3665},{"name":"flag: Guinea","shortname":":flag_gn:","category":9,"emoji_order":3666},{"name":"flag: Guadeloupe","shortname":":flag_gp:","category":9,"emoji_order":3667},{"name":"flag: Equatorial Guinea","shortname":":flag_gq:","category":9,"emoji_order":3668},{"name":"flag: Greece","shortname":":flag_gr:","category":9,"emoji_order":3669},{"name":"flag: South Georgia & South Sandwich Islands","shortname":":flag_gs:","category":9,"emoji_order":3670},{"name":"flag: Guatemala","shortname":":flag_gt:","category":9,"emoji_order":3671},{"name":"flag: Guam","shortname":":flag_gu:","category":9,"emoji_order":3672},{"name":"flag: Guinea-Bissau","shortname":":flag_gw:","category":9,"emoji_order":3673},{"name":"flag: Guyana","shortname":":flag_gy:","category":9,"emoji_order":3674},{"name":"flag: Hong Kong SAR China","shortname":":flag_hk:","category":9,"emoji_order":3675},{"name":"flag: Heard & McDonald Islands","shortname":":flag_hm:","category":9,"emoji_order":3676},{"name":"flag: Honduras","shortname":":flag_hn:","category":9,"emoji_order":3677},{"name":"flag: Croatia","shortname":":flag_hr:","category":9,"emoji_order":3678},{"name":"flag: Haiti","shortname":":flag_ht:","category":9,"emoji_order":3679},{"name":"flag: Hungary","shortname":":flag_hu:","category":9,"emoji_order":3680},{"name":"flag: Canary Islands","shortname":":flag_ic:","category":9,"emoji_order":3681},{"name":"flag: Indonesia","shortname":":flag_id:","category":9,"emoji_order":3682},{"name":"flag: Ireland","shortname":":flag_ie:","category":9,"emoji_order":3683},{"name":"flag: Israel","shortname":":flag_il:","category":9,"emoji_order":3684},{"name":"flag: Isle of Man","shortname":":flag_im:","category":9,"emoji_order":3685},{"name":"flag: India","shortname":":flag_in:","category":9,"emoji_order":3686},{"name":"flag: British Indian Ocean Territory","shortname":":flag_io:","category":9,"emoji_order":3687},{"name":"flag: Iraq","shortname":":flag_iq:","category":9,"emoji_order":3688},{"name":"flag: Iran","shortname":":flag_ir:","category":9,"emoji_order":3689},{"name":"flag: Iceland","shortname":":flag_is:","category":9,"emoji_order":3690},{"name":"flag: Italy","shortname":":flag_it:","category":9,"emoji_order":3691},{"name":"flag: Jersey","shortname":":flag_je:","category":9,"emoji_order":3692},{"name":"flag: Jamaica","shortname":":flag_jm:","category":9,"emoji_order":3693},{"name":"flag: Jordan","shortname":":flag_jo:","category":9,"emoji_order":3694},{"name":"flag: Japan","shortname":":flag_jp:","category":9,"emoji_order":3695},{"name":"flag: Kenya","shortname":":flag_ke:","category":9,"emoji_order":3696},{"name":"flag: Kyrgyzstan","shortname":":flag_kg:","category":9,"emoji_order":3697},{"name":"flag: Cambodia","shortname":":flag_kh:","category":9,"emoji_order":3698},{"name":"flag: Kiribati","shortname":":flag_ki:","category":9,"emoji_order":3699},{"name":"flag: Comoros","shortname":":flag_km:","category":9,"emoji_order":3700},{"name":"flag: St. Kitts & Nevis","shortname":":flag_kn:","category":9,"emoji_order":3701},{"name":"flag: North Korea","shortname":":flag_kp:","category":9,"emoji_order":3702},{"name":"flag: South Korea","shortname":":flag_kr:","category":9,"emoji_order":3703},{"name":"flag: Kuwait","shortname":":flag_kw:","category":9,"emoji_order":3704},{"name":"flag: Cayman Islands","shortname":":flag_ky:","category":9,"emoji_order":3705},{"name":"flag: Kazakhstan","shortname":":flag_kz:","category":9,"emoji_order":3706},{"name":"flag: Laos","shortname":":flag_la:","category":9,"emoji_order":3707},{"name":"flag: Lebanon","shortname":":flag_lb:","category":9,"emoji_order":3708},{"name":"flag: St. Lucia","shortname":":flag_lc:","category":9,"emoji_order":3709},{"name":"flag: Liechtenstein","shortname":":flag_li:","category":9,"emoji_order":3710},{"name":"flag: Sri Lanka","shortname":":flag_lk:","category":9,"emoji_order":3711},{"name":"flag: Liberia","shortname":":flag_lr:","category":9,"emoji_order":3712},{"name":"flag: Lesotho","shortname":":flag_ls:","category":9,"emoji_order":3713},{"name":"flag: Lithuania","shortname":":flag_lt:","category":9,"emoji_order":3714},{"name":"flag: Luxembourg","shortname":":flag_lu:","category":9,"emoji_order":3715},{"name":"flag: Latvia","shortname":":flag_lv:","category":9,"emoji_order":3716},{"name":"flag: Libya","shortname":":flag_ly:","category":9,"emoji_order":3717},{"name":"flag: Morocco","shortname":":flag_ma:","category":9,"emoji_order":3718},{"name":"flag: Monaco","shortname":":flag_mc:","category":9,"emoji_order":3719},{"name":"flag: Moldova","shortname":":flag_md:","category":9,"emoji_order":3720},{"name":"flag: Montenegro","shortname":":flag_me:","category":9,"emoji_order":3721},{"name":"flag: St. Martin","shortname":":flag_mf:","category":9,"emoji_order":3722},{"name":"flag: Madagascar","shortname":":flag_mg:","category":9,"emoji_order":3723},{"name":"flag: Marshall Islands","shortname":":flag_mh:","category":9,"emoji_order":3724},{"name":"flag: North Macedonia","shortname":":flag_mk:","category":9,"emoji_order":3725},{"name":"flag: Mali","shortname":":flag_ml:","category":9,"emoji_order":3726},{"name":"flag: Myanmar (Burma)","shortname":":flag_mm:","category":9,"emoji_order":3727},{"name":"flag: Mongolia","shortname":":flag_mn:","category":9,"emoji_order":3728},{"name":"flag: Macao SAR China","shortname":":flag_mo:","category":9,"emoji_order":3729},{"name":"flag: Northern Mariana Islands","shortname":":flag_mp:","category":9,"emoji_order":3730},{"name":"flag: Martinique","shortname":":flag_mq:","category":9,"emoji_order":3731},{"name":"flag: Mauritania","shortname":":flag_mr:","category":9,"emoji_order":3732},{"name":"flag: Montserrat","shortname":":flag_ms:","category":9,"emoji_order":3733},{"name":"flag: Malta","shortname":":flag_mt:","category":9,"emoji_order":3734},{"name":"flag: Mauritius","shortname":":flag_mu:","category":9,"emoji_order":3735},{"name":"flag: Maldives","shortname":":flag_mv:","category":9,"emoji_order":3736},{"name":"flag: Malawi","shortname":":flag_mw:","category":9,"emoji_order":3737},{"name":"flag: Mexico","shortname":":flag_mx:","category":9,"emoji_order":3738},{"name":"flag: Malaysia","shortname":":flag_my:","category":9,"emoji_order":3739},{"name":"flag: Mozambique","shortname":":flag_mz:","category":9,"emoji_order":3740},{"name":"flag: Namibia","shortname":":flag_na:","category":9,"emoji_order":3741},{"name":"flag: New Caledonia","shortname":":flag_nc:","category":9,"emoji_order":3742},{"name":"flag: Niger","shortname":":flag_ne:","category":9,"emoji_order":3743},{"name":"flag: Norfolk Island","shortname":":flag_nf:","category":9,"emoji_order":3744},{"name":"flag: Nigeria","shortname":":flag_ng:","category":9,"emoji_order":3745},{"name":"flag: Nicaragua","shortname":":flag_ni:","category":9,"emoji_order":3746},{"name":"flag: Netherlands","shortname":":flag_nl:","category":9,"emoji_order":3747},{"name":"flag: Norway","shortname":":flag_no:","category":9,"emoji_order":3748},{"name":"flag: Nepal","shortname":":flag_np:","category":9,"emoji_order":3749},{"name":"flag: Nauru","shortname":":flag_nr:","category":9,"emoji_order":3750},{"name":"flag: Niue","shortname":":flag_nu:","category":9,"emoji_order":3751},{"name":"flag: New Zealand","shortname":":flag_nz:","category":9,"emoji_order":3752},{"name":"flag: Oman","shortname":":flag_om:","category":9,"emoji_order":3753},{"name":"flag: Panama","shortname":":flag_pa:","category":9,"emoji_order":3754},{"name":"flag: Peru","shortname":":flag_pe:","category":9,"emoji_order":3755},{"name":"flag: French Polynesia","shortname":":flag_pf:","category":9,"emoji_order":3756},{"name":"flag: Papua New Guinea","shortname":":flag_pg:","category":9,"emoji_order":3757},{"name":"flag: Philippines","shortname":":flag_ph:","category":9,"emoji_order":3758},{"name":"flag: Pakistan","shortname":":flag_pk:","category":9,"emoji_order":3759},{"name":"flag: Poland","shortname":":flag_pl:","category":9,"emoji_order":3760},{"name":"flag: St. Pierre & Miquelon","shortname":":flag_pm:","category":9,"emoji_order":3761},{"name":"flag: Pitcairn Islands","shortname":":flag_pn:","category":9,"emoji_order":3762},{"name":"flag: Puerto Rico","shortname":":flag_pr:","category":9,"emoji_order":3763},{"name":"flag: Palestinian Territories","shortname":":flag_ps:","category":9,"emoji_order":3764},{"name":"flag: Portugal","shortname":":flag_pt:","category":9,"emoji_order":3765},{"name":"flag: Palau","shortname":":flag_pw:","category":9,"emoji_order":3766},{"name":"flag: Paraguay","shortname":":flag_py:","category":9,"emoji_order":3767},{"name":"flag: Qatar","shortname":":flag_qa:","category":9,"emoji_order":3768},{"name":"flag: Réunion","shortname":":flag_re:","category":9,"emoji_order":3769},{"name":"flag: Romania","shortname":":flag_ro:","category":9,"emoji_order":3770},{"name":"flag: Serbia","shortname":":flag_rs:","category":9,"emoji_order":3771},{"name":"flag: Russia","shortname":":flag_ru:","category":9,"emoji_order":3772},{"name":"flag: Rwanda","shortname":":flag_rw:","category":9,"emoji_order":3773},{"name":"flag: Saudi Arabia","shortname":":flag_sa:","category":9,"emoji_order":3774},{"name":"flag: Solomon Islands","shortname":":flag_sb:","category":9,"emoji_order":3775},{"name":"flag: Seychelles","shortname":":flag_sc:","category":9,"emoji_order":3776},{"name":"flag: Sudan","shortname":":flag_sd:","category":9,"emoji_order":3777},{"name":"flag: Sweden","shortname":":flag_se:","category":9,"emoji_order":3778},{"name":"flag: Singapore","shortname":":flag_sg:","category":9,"emoji_order":3779},{"name":"flag: St. Helena","shortname":":flag_sh:","category":9,"emoji_order":3780},{"name":"flag: Slovenia","shortname":":flag_si:","category":9,"emoji_order":3781},{"name":"flag: Svalbard & Jan Mayen","shortname":":flag_sj:","category":9,"emoji_order":3782},{"name":"flag: Slovakia","shortname":":flag_sk:","category":9,"emoji_order":3783},{"name":"flag: Sierra Leone","shortname":":flag_sl:","category":9,"emoji_order":3784},{"name":"flag: San Marino","shortname":":flag_sm:","category":9,"emoji_order":3785},{"name":"flag: Senegal","shortname":":flag_sn:","category":9,"emoji_order":3786},{"name":"flag: Somalia","shortname":":flag_so:","category":9,"emoji_order":3787},{"name":"flag: Suriname","shortname":":flag_sr:","category":9,"emoji_order":3788},{"name":"flag: South Sudan","shortname":":flag_ss:","category":9,"emoji_order":3789},{"name":"flag: São Tomé & Príncipe","shortname":":flag_st:","category":9,"emoji_order":3790},{"name":"flag: El Salvador","shortname":":flag_sv:","category":9,"emoji_order":3791},{"name":"flag: Sint Maarten","shortname":":flag_sx:","category":9,"emoji_order":3792},{"name":"flag: Syria","shortname":":flag_sy:","category":9,"emoji_order":3793},{"name":"flag: Eswatini","shortname":":flag_sz:","category":9,"emoji_order":3794},{"name":"flag: Tristan da Cunha","shortname":":flag_ta:","category":9,"emoji_order":3795},{"name":"flag: Turks & Caicos Islands","shortname":":flag_tc:","category":9,"emoji_order":3796},{"name":"flag: Chad","shortname":":flag_td:","category":9,"emoji_order":3797},{"name":"flag: French Southern Territories","shortname":":flag_tf:","category":9,"emoji_order":3798},{"name":"flag: Togo","shortname":":flag_tg:","category":9,"emoji_order":3799},{"name":"flag: Thailand","shortname":":flag_th:","category":9,"emoji_order":3800},{"name":"flag: Tajikistan","shortname":":flag_tj:","category":9,"emoji_order":3801},{"name":"flag: Tokelau","shortname":":flag_tk:","category":9,"emoji_order":3802},{"name":"flag: Timor-Leste","shortname":":flag_tl:","category":9,"emoji_order":3803},{"name":"flag: Turkmenistan","shortname":":flag_tm:","category":9,"emoji_order":3804},{"name":"flag: Tunisia","shortname":":flag_tn:","category":9,"emoji_order":3805},{"name":"flag: Tonga","shortname":":flag_to:","category":9,"emoji_order":3806},{"name":"flag: Turkey","shortname":":flag_tr:","category":9,"emoji_order":3807},{"name":"flag: Trinidad & Tobago","shortname":":flag_tt:","category":9,"emoji_order":3808},{"name":"flag: Tuvalu","shortname":":flag_tv:","category":9,"emoji_order":3809},{"name":"flag: Taiwan","shortname":":flag_tw:","category":9,"emoji_order":3810},{"name":"flag: Tanzania","shortname":":flag_tz:","category":9,"emoji_order":3811},{"name":"flag: Ukraine","shortname":":flag_ua:","category":9,"emoji_order":3812},{"name":"flag: Uganda","shortname":":flag_ug:","category":9,"emoji_order":3813},{"name":"flag: U.S. Outlying Islands","shortname":":flag_um:","category":9,"emoji_order":3814},{"name":"flag: United Nations","shortname":":flag_un:","category":9,"emoji_order":3815},{"name":"flag: United States","shortname":":flag_us:","category":9,"emoji_order":3816,"aliases":[":usa:"]},{"name":"flag: Uruguay","shortname":":flag_uy:","category":9,"emoji_order":3817},{"name":"flag: Uzbekistan","shortname":":flag_uz:","category":9,"emoji_order":3818},{"name":"flag: Vatican City","shortname":":flag_va:","category":9,"emoji_order":3819},{"name":"flag: St. Vincent & Grenadines","shortname":":flag_vc:","category":9,"emoji_order":3820},{"name":"flag: Venezuela","shortname":":flag_ve:","category":9,"emoji_order":3821},{"name":"flag: British Virgin Islands","shortname":":flag_vg:","category":9,"emoji_order":3822},{"name":"flag: U.S. Virgin Islands","shortname":":flag_vi:","category":9,"emoji_order":3823},{"name":"flag: Vietnam","shortname":":flag_vn:","category":9,"emoji_order":3824},{"name":"flag: Vanuatu","shortname":":flag_vu:","category":9,"emoji_order":3825},{"name":"flag: Wallis & Futuna","shortname":":flag_wf:","category":9,"emoji_order":3826},{"name":"flag: Samoa","shortname":":flag_ws:","category":9,"emoji_order":3827},{"name":"flag: Kosovo","shortname":":flag_xk:","category":9,"emoji_order":3828},{"name":"flag: Yemen","shortname":":flag_ye:","category":9,"emoji_order":3829},{"name":"flag: Mayotte","shortname":":flag_yt:","category":9,"emoji_order":3830},{"name":"flag: South Africa","shortname":":flag_za:","category":9,"emoji_order":3831},{"name":"flag: Zambia","shortname":":flag_zm:","category":9,"emoji_order":3832},{"name":"flag: Zimbabwe","shortname":":flag_zw:","category":9,"emoji_order":3833},{"name":"flag: England","shortname":":flag_gbeng:","category":9,"emoji_order":3834,"aliases":[":england:"]},{"name":"flag: Scotland","shortname":":flag_gbsct:","category":9,"emoji_order":3835,"aliases":[":scotland:"]},{"name":"flag: Wales","shortname":":flag_gbwls:","category":9,"emoji_order":3836,"aliases":[":wales:"]}]
\ No newline at end of file

From a5d5569af4e06d57c0d89abaf75fb2966ca6cceb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 17 Dec 2019 21:40:17 +0000
Subject: [PATCH 0048/3235] Translated using Weblate (Japanese)

Currently translated at 59.3% (1184 of 1998 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 14a1b6d429..cce9a81188 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -446,7 +446,7 @@
     "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>します。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "他の端末から<requestLink>暗号化キーを再リクエスト</requestLink>します。",
     "Undecryptable": "解読不能",
     "Encrypted by an unverified device": "未検証の端末によって暗号化されました",
     "Unencrypted message": "暗号化されていないメッセージ",

From a1df87a37579ff948302a1387e2ec160409c9dea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 07:23:05 +0000
Subject: [PATCH 0049/3235] Make EmojiPicker an unmanaged Context Menu as it is
 too complex to be managed

---
 src/components/structures/ContextMenu.js      | 20 +++++++++++--------
 .../views/messages/MessageActionBar.js        |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js
index e861e3d45f..662972ee37 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.js
@@ -71,12 +71,12 @@ export class ContextMenu extends React.Component {
         // on resize callback
         windowResize: PropTypes.func,
 
-        catchTab: PropTypes.bool, // whether to close the ContextMenu on TAB (default=true)
+        managed: PropTypes.bool, // whether this context menu should be focus managed. If false it must handle itself
     };
 
     static defaultProps = {
         hasBackground: true,
-        catchTab: true,
+        managed: true,
     };
 
     constructor() {
@@ -186,15 +186,19 @@ export class ContextMenu extends React.Component {
     };
 
     _onKeyDown = (ev) => {
+        if (!this.props.managed) {
+            if (ev.key === Key.ESCAPE) {
+                this.props.onFinished();
+                ev.stopPropagation();
+                ev.preventDefault();
+            }
+            return;
+        }
+
         let handled = true;
 
         switch (ev.key) {
             case Key.TAB:
-                if (!this.props.catchTab) {
-                    handled = false;
-                    break;
-                }
-                // fallthrough
             case Key.ESCAPE:
                 this.props.onFinished();
                 break;
@@ -321,7 +325,7 @@ export class ContextMenu extends React.Component {
 
         return (
             <div className="mx_ContextualMenu_wrapper" style={{...position, ...wrapperStyle}} onKeyDown={this._onKeyDown}>
-                <div className={menuClasses} style={menuStyle} ref={this.collectContextMenuRect} role="menu">
+                <div className={menuClasses} style={menuStyle} ref={this.collectContextMenuRect} role={this.props.managed ? "menu" : undefined}>
                     { chevron }
                     { props.children }
                 </div>
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 81e806cf62..52d7a74632 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -88,7 +88,7 @@ const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
     if (menuDisplayed) {
         const buttonRect = button.current.getBoundingClientRect();
         const ReactionPicker = sdk.getComponent('emojipicker.ReactionPicker');
-        contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} catchTab={false}>
+        contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} managed={false}>
             <ReactionPicker mxEvent={mxEvent} reactions={reactions} onFinished={closeMenu} />
         </ContextMenu>;
     }

From 3196655524ed7860c7e26a1fdc5bdff9e4b21be3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 09:06:52 +0000
Subject: [PATCH 0050/3235] Replace UserInfo avatar with <MemberAvatar/> for
 fallback logic

---
 res/css/views/right_panel/_UserInfo.scss     | 18 +++++----
 src/components/views/right_panel/UserInfo.js | 40 +++++++++-----------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index df7d0a5f87..a5428393ee 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -63,7 +63,6 @@ limitations under the License.
 
     .mx_UserInfo_avatar {
         margin: 24px 32px 0 32px;
-        cursor: pointer;
     }
 
     .mx_UserInfo_avatar > div {
@@ -71,18 +70,23 @@ limitations under the License.
         margin: 0 auto;
     }
 
-    .mx_UserInfo_avatar > div > div {
+    .mx_UserInfo_avatar > div * {
         /* use padding-top instead of height to make this element square,
         as the % in padding is a % of the width (including margin,
         that's why we had to put the margin to center on a parent div),
         and not a % of the parent height. */
-        padding-top: 100%;
-        height: 0;
+        width: 30vh;
+        height: 30vh;
+        object-fit: cover;
         border-radius: 100%;
         box-sizing: content-box;
-        background-repeat: no-repeat;
-        background-size: cover;
-        background-position: center;
+    }
+
+    // override the calculated sizes so that the letter isn't HUGE
+    .mx_UserInfo_avatar > div .mx_BaseAvatar_initial {
+        font-size: 26px !important;
+        width: 30vh !important;
+        line-height: 30vh !important;
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index d1d7aa0371..0116fafb9e 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1051,16 +1051,9 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
         }
     }, [cli, user.userId]);
 
-
-    const onMemberAvatarKey = e => {
-        if (e.key === "Enter") {
-            onMemberAvatarClick();
-        }
-    };
-
     const onMemberAvatarClick = useCallback(() => {
         const member = user;
-        const avatarUrl = member.getMxcAvatarUrl();
+        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
         if (!avatarUrl) return;
 
         const httpUrl = cli.mxcUrlToHttp(avatarUrl);
@@ -1158,21 +1151,22 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
         statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
     }
 
-    const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl;
-    let avatarElement;
-    if (avatarUrl) {
-        const httpUrl = cli.mxcUrlToHttp(avatarUrl, 800, 800);
-        avatarElement = <div
-            className="mx_UserInfo_avatar"
-            onClick={onMemberAvatarClick}
-            onKeyDown={onMemberAvatarKey}
-            tabIndex="0"
-            role="img"
-            aria-label={_t("Profile picture")}
-        >
-            <div><div style={{backgroundImage: `url(${httpUrl})`}} /></div>
-        </div>;
-    }
+    // const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl;
+    const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+    const avatarElement = (
+        <div className="mx_UserInfo_avatar">
+            <div>
+                <MemberAvatar
+                    member={user}
+                    width={0.3 * window.outerHeight} // ~30vh
+                    height={0.3 * window.outerHeight} // ~30vh
+                    resizeMethod="scale"
+                    fallbackUserId={user.userId}
+                    onClick={onMemberAvatarClick}
+                    urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
+            </div>
+        </div>
+    );
 
     let closeButton;
     if (onClose) {

From 4fe0150944f747e8ab2982dffa02bcbb1eb1368c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 10:51:55 +0000
Subject: [PATCH 0051/3235] Regen yarn.lock

---
 yarn.lock | 2328 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 1250 insertions(+), 1078 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b8b877ab62..9cd4cad706 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
   integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
@@ -132,42 +132,6 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
-  dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
-
-"@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
-
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
-  dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -181,41 +145,32 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.6.0.tgz#ec7670432ae9c8eb710400d112c201a362d83393"
-  integrity sha512-w4/WHG7C4WWFyE5geCieFJF6MZkbW4VAriol5KlmQXpAQdxvV0p26sqNZOW6Qyw6Y0l9K4g+cHvvczR2sEEpqg==
+"@peculiar/asn1-schema@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.3.tgz#e55ff9e98a1cf31832629aabacf85be3edf13a48"
+  integrity sha512-Tfgj9eNJ6cTKEtEuidKenLHMx/Q5M8KEE9hnohHqvdpqHJXWYr5RlT3GjAHPjGXy5+mr7sSfuXfzE6aAkEGN7A==
   dependencies:
-    type-detect "4.0.8"
+    asn1js "^2.0.22"
+    tslib "^1.9.3"
 
-"@sinonjs/formatio@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
-  integrity sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==
+"@peculiar/json-schema@^1.1.6":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.9.tgz#b746e046b787607a1b2804f64437fda2527b3e62"
+  integrity sha512-F2ST2y/IQPgY+1QMw1Q33sqJbGDCeO3lGqI69SL3Hgo0++7iHqprUB1QyxB/A7bN3tuM65MBxoM2JLbwh42lsQ==
   dependencies:
-    samsam "1.3.0"
+    tslib "^1.10.0"
 
-"@sinonjs/formatio@^3.2.1":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c"
-  integrity sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==
+"@peculiar/webcrypto@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.22.tgz#9dae652fce6bacd9df15bc91965797cee33adf67"
+  integrity sha512-NP6H6ZGXUvJnQJCWzUgnRcQv+9nMCNwLUDhTwOxRUwPFvtHauMOl0oPTKUjbhInCMaE55gJqB4yc0YKbde6Exw==
   dependencies:
-    "@sinonjs/commons" "^1"
-    "@sinonjs/samsam" "^3.1.0"
-
-"@sinonjs/samsam@^3.1.0":
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz#46682efd9967b259b81136b9f120fd54585feb4a"
-  integrity sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==
-  dependencies:
-    "@sinonjs/commons" "^1.3.0"
-    array-from "^2.1.1"
-    lodash "^4.17.15"
-
-"@sinonjs/text-encoding@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
-  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+    "@peculiar/asn1-schema" "^1.0.3"
+    "@peculiar/json-schema" "^1.1.6"
+    asn1js "^2.0.26"
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
+    webcrypto-core "^1.0.17"
 
 "@types/events@*":
   version "3.0.0"
@@ -231,26 +186,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-
-"@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
 "@types/json-schema@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -266,11 +201,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
   integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
@@ -292,18 +222,6 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
-"@types/yargs-parser@*":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
-  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
-
-"@types/yargs@^13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380"
-  integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@typescript-eslint/experimental-utils@^2.5.0":
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
@@ -482,34 +400,44 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+abab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+acorn-globals@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
 
 acorn-jsx@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn@^6.0.7, acorn@^6.2.1:
+acorn-walk@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+
+acorn@^5.5.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
   integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -556,12 +484,7 @@ another-json@^0.2.0:
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw=
 
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
-ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -576,7 +499,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
@@ -609,13 +532,12 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
   dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
+    default-require-extensions "^1.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
@@ -659,16 +581,16 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-from@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
-  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-
 array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
@@ -699,11 +621,6 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -730,6 +647,13 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+asn1js@^2.0.22, asn1js@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251"
+  integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ==
+  dependencies:
+    pvutils latest
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -763,7 +687,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.5.0, async@^2.6.2:
+async@^2.1.4, async@^2.5.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -834,7 +758,7 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.26.0, babel-core@^6.26.3:
+babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
@@ -871,7 +795,7 @@ babel-eslint@^10.0.1:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-generator@^6.26.0:
+babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
@@ -1007,6 +931,14 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-jest@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
+  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
+  dependencies:
+    babel-plugin-istanbul "^4.1.6"
+    babel-preset-jest "^23.2.0"
+
 babel-loader@^7.1.5:
   version "7.1.5"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68"
@@ -1035,6 +967,21 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-istanbul@^4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
+
+babel-plugin-jest-hoist@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
+
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -1065,7 +1012,7 @@ babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
   integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
 
-babel-plugin-syntax-object-rest-spread@^6.8.0:
+babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
@@ -1432,6 +1379,14 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
+babel-preset-jest@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
+  dependencies:
+    babel-plugin-jest-hoist "^23.2.0"
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+
 babel-preset-react@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
@@ -1465,7 +1420,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
@@ -1476,7 +1431,7 @@ babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
@@ -1491,7 +1446,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
@@ -1506,11 +1461,6 @@ babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 bail@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
@@ -1528,21 +1478,11 @@ base-x@^3.0.2:
   dependencies:
     safe-buffer "^5.0.1"
 
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1563,13 +1503,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1580,17 +1513,19 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+bluebird@^2.9.27:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
 
-bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -1605,22 +1540,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@^1.16.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1654,13 +1573,6 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1671,15 +1583,22 @@ browser-encrypt-attachment@^0.3.0:
   resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
   integrity sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw=
 
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+
 browser-request@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
@@ -1756,23 +1675,12 @@ bs58@^4.0.1:
   dependencies:
     base-x "^3.0.2"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+    node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -1798,11 +1706,6 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
 cacache@^12.0.0, cacache@^12.0.2:
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
@@ -1858,11 +1761,6 @@ caller-path@^2.0.0:
   dependencies:
     caller-callsite "^2.0.0"
 
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -1897,6 +1795,13 @@ caniuse-lite@^1.0.30001012:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
   integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
 
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+  dependencies:
+    rsvp "^3.3.3"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1912,7 +1817,7 @@ chain-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
   integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
 
-chalk@2.4.2, "chalk@^1.1.3 || 2.x", chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1992,21 +1897,6 @@ chokidar@^2.0.2, chokidar@^2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
-  optionalDependencies:
-    fsevents "~2.1.1"
-
 chownr@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
@@ -2019,6 +1909,11 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2072,15 +1967,6 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 clone-regexp@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f"
@@ -2089,6 +1975,11 @@ clone-regexp@^1.0.0:
     is-regexp "^1.0.0"
     is-supported-regexp-flag "^1.0.0"
 
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -2119,11 +2010,6 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-colors@^1.1.0, colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2131,12 +2017,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.11.0, commander@^2.20.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2156,26 +2037,11 @@ commonmark@^0.28.1:
     minimist "~ 1.2.0"
     string.prototype.repeat "^0.2.0"
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2206,16 +2072,6 @@ concurrently@^4.0.1:
     tree-kill "^1.2.1"
     yargs "^12.0.5"
 
-connect@^3.6.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -2231,23 +2087,18 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-type@^1.0.2, content-type@~1.0.4:
+content-type@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2379,6 +2230,18 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+  dependencies:
+    cssom "0.3.x"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2386,11 +2249,6 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
-
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -2403,36 +2261,40 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 date-fns@^1.30.1:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-format@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
 date-names@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.1.0, debug@~3.1.0:
+debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
+debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2454,7 +2316,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2474,6 +2336,13 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
+  dependencies:
+    strip-bom "^2.0.0"
+
 define-properties@^1.1.2, define-properties@^1.1.3, define-properties@~1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2513,11 +2382,6 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2543,16 +2407,16 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
-
 diff-dom@^4.1.3:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-4.1.6.tgz#ecd20f4b34703d777b7956790fc7e28e5ff3fece"
@@ -2566,12 +2430,7 @@ diff-match-patch@^1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-
-diff@3.5.0, diff@^3.5.0:
+diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -2618,16 +2477,6 @@ dom-helpers@^3.2.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-dom-serialize@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -2651,6 +2500,13 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -2683,6 +2539,13 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+ecc-jsbn@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.0.1.tgz#970577ba31b4976fb1889a298cb7451d896c466d"
+  integrity sha1-lwV3ujG0l2+xiJopjLdFHYlsRm0=
+  dependencies:
+    jsbn "git+https://github.com/rynomad/jsbn.git"
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2691,10 +2554,11 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+"ecc-qj@git+https://github.com/rynomad/ecc.git":
+  version "0.0.1"
+  resolved "git+https://github.com/rynomad/ecc.git#a8c599363dab87a5c95274338d863233f00f7c4a"
+  dependencies:
+    nan "^1.6.2"
 
 electron-to-chromium@^1.3.317:
   version "1.3.322"
@@ -2739,11 +2603,6 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -2758,46 +2617,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
-  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
-engine.io@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
-  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
-
 enhanced-resolve@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
@@ -2816,11 +2635,6 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
-
 entities@^1.1.1, "entities@~ 1.1.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -2843,7 +2657,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -2866,6 +2680,23 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7.
     string.prototype.trimleft "^2.1.0"
     string.prototype.trimright "^2.1.0"
 
+es-abstract@^1.17.0-next.1:
+  version "1.17.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
+  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
+
 es-get-iterator@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
@@ -2900,16 +2731,28 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@^1.9.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-google@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
@@ -3046,6 +2889,11 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -3070,7 +2918,7 @@ esrever@^0.2.0:
   resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8"
   integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g=
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3090,11 +2938,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
-  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
-
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@@ -3115,6 +2958,13 @@ except@^0.1.3:
   dependencies:
     indexof "0.0.1"
 
+exec-sh@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -3135,6 +2985,11 @@ execall@^1.0.0:
   dependencies:
     clone-regexp "^1.0.0"
 
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -3182,17 +3037,17 @@ expect@^1.20.2:
     object-keys "^1.0.9"
     tmatch "^2.0.1"
 
-expect@^24.1.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
-  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
+expect@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
+  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
   dependencies:
-    "@jest/types" "^24.9.0"
     ansi-styles "^3.2.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.9.0"
+    jest-diff "^23.6.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3281,6 +3136,13 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
 fbemitter@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
@@ -3349,11 +3211,24 @@ file-saver@^1.3.3:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
   integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
 filesize@3.5.6:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
@@ -3380,26 +3255,6 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -3426,6 +3281,14 @@ find-up@4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -3496,13 +3359,6 @@ focus-visible@^5.0.2:
   resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.0.2.tgz#4fae9cf40458b73c10701c9774c462e3ccd53caf"
   integrity sha512-zT2fj/bmOgEBjqGbURGlowTmCwsIs3bRDMr/sFZz8Ly7VkEiwuCn9swNTL3pPuf8Oua2de7CLuKdnuNajWdDsQ==
 
-follow-redirects@^1.0.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f"
-  integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==
-  dependencies:
-    debug "^3.0.0"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3549,22 +3405,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-access@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
-  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
-  dependencies:
-    null-check "^1.0.0"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -3600,10 +3440,13 @@ fsevents@^1.0.0, fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+fsevents@^1.2.3:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
+  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -3717,13 +3560,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -3734,18 +3570,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^5.0.14:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -3757,7 +3581,7 @@ glob@^5.0.14:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3841,15 +3665,26 @@ gonzales-pe@^4.2.3:
   dependencies:
     minimist "1.1.x"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+
+handlebars@^4.0.3:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
 
 har-schema@^2.0.0:
   version "2.0.0"
@@ -3871,17 +3706,10 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^2.0.0:
   version "2.0.0"
@@ -3957,11 +3785,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
 highlight.js@^9.15.8:
   version "9.16.2"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
@@ -4010,6 +3833,13 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
@@ -4032,17 +3862,6 @@ http-cache-semantics@^3.8.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
@@ -4051,15 +3870,6 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy@^1.13.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
-  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4157,6 +3967,14 @@ import-local@2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4317,13 +4135,6 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
@@ -4344,6 +4155,13 @@ is-callable@^1.0.4, is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-ci@^1.0.10:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+  dependencies:
+    ci-info "^1.5.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4473,6 +4291,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
+
 is-generator-function@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
@@ -4492,7 +4315,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -4550,11 +4373,6 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -4631,6 +4449,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
 is-weakmap@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.0.tgz#88bd0b8ec3a5724477637d58ed96cb00552593fd"
@@ -4666,33 +4489,16 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -4728,43 +4534,249 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+istanbul-api@^1.3.1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
+  dependencies:
+    async "^2.1.4"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.1"
+    istanbul-lib-hook "^1.2.2"
+    istanbul-lib-instrument "^1.10.2"
+    istanbul-lib-report "^1.1.5"
+    istanbul-lib-source-maps "^1.2.6"
+    istanbul-reports "^1.5.1"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
+
+istanbul-lib-hook@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.1"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
+  dependencies:
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.1"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
+  dependencies:
+    throat "^4.0.0"
+
+jest-cli@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
+  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    import-local "^1.0.0"
+    is-ci "^1.0.10"
+    istanbul-api "^1.3.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
+    jest-changed-files "^23.4.2"
+    jest-config "^23.6.0"
+    jest-environment-jsdom "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve-dependencies "^23.6.0"
+    jest-runner "^23.6.0"
+    jest-runtime "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    jest-watcher "^23.4.0"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    node-notifier "^5.2.1"
+    prompts "^0.1.9"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
+    slash "^1.0.0"
+    string-length "^2.0.0"
+    strip-ansi "^4.0.0"
+    which "^1.2.12"
+    yargs "^11.0.0"
+
+jest-config@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
+  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^23.6.0"
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^23.4.0"
+    jest-environment-node "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^23.6.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.6.0"
+
+jest-diff@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
+  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
   dependencies:
     chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
+    diff "^3.2.0"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
 
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
+jest-docblock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
+  dependencies:
+    detect-newline "^2.1.0"
 
-jest-matcher-utils@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
+jest-each@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
+  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
+    pretty-format "^23.6.0"
 
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+jest-environment-jsdom@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/stack-utils" "^1.0.1"
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+    jsdom "^11.5.1"
+
+jest-environment-node@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
+  dependencies:
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+
+jest-get-type@^22.1.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
+
+jest-haste-map@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
+  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    invariant "^2.2.4"
+    jest-docblock "^23.2.0"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.2.0"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
+
+jest-jasmine2@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
+  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
+  dependencies:
+    babel-traverse "^6.0.0"
     chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
+    co "^4.6.0"
+    expect "^23.6.0"
+    is-generator-fn "^1.0.0"
+    jest-diff "^23.6.0"
+    jest-each "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    pretty-format "^23.6.0"
+
+jest-leak-detector@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
+  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
+  dependencies:
+    pretty-format "^23.6.0"
+
+jest-matcher-utils@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
+  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
+jest-message-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
+  dependencies:
+    "@babel/code-frame" "^7.0.0-beta.35"
+    chalk "^2.0.1"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
     stack-utils "^1.0.1"
 
 jest-mock@^23.2.0:
@@ -4772,10 +4784,134 @@ jest-mock@^23.2.0:
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
   integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
-jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
+jest-regex-util@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
+
+jest-resolve-dependencies@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
+  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
+  dependencies:
+    jest-regex-util "^23.3.0"
+    jest-snapshot "^23.6.0"
+
+jest-resolve@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
+  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
+  dependencies:
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    realpath-native "^1.0.0"
+
+jest-runner@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
+  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
+  dependencies:
+    exit "^0.1.2"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-docblock "^23.2.0"
+    jest-haste-map "^23.6.0"
+    jest-jasmine2 "^23.6.0"
+    jest-leak-detector "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-runtime "^23.6.0"
+    jest-util "^23.4.0"
+    jest-worker "^23.2.0"
+    source-map-support "^0.5.6"
+    throat "^4.0.0"
+
+jest-runtime@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
+  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^4.1.6"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    realpath-native "^1.0.0"
+    slash "^1.0.0"
+    strip-bom "3.0.0"
+    write-file-atomic "^2.1.0"
+    yargs "^11.0.0"
+
+jest-serializer@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
+
+jest-snapshot@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
+  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
+  dependencies:
+    babel-types "^6.0.0"
+    chalk "^2.0.1"
+    jest-diff "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-resolve "^23.6.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^23.6.0"
+    semver "^5.5.0"
+
+jest-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
+  dependencies:
+    callsites "^2.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    jest-message-util "^23.4.0"
+    mkdirp "^0.5.1"
+    slash "^1.0.0"
+    source-map "^0.6.0"
+
+jest-validate@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
+  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    leven "^2.1.0"
+    pretty-format "^23.6.0"
+
+jest-watcher@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
+
+jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
+  dependencies:
+    merge-stream "^1.0.1"
 
 jest-worker@^24.6.0:
   version "24.9.0"
@@ -4785,6 +4921,14 @@ jest-worker@^24.6.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
+jest@^23.2.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
+  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
+  dependencies:
+    import-local "^1.0.0"
+    jest-cli "^23.6.0"
+
 jquery@^3.3.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -4800,7 +4944,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4808,11 +4952,47 @@ js-yaml@^3.13.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+"jsbn@git+https://github.com/rynomad/jsbn.git":
+  version "0.0.0"
+  resolved "git+https://github.com/rynomad/jsbn.git#bb522b0124f75424f89d49446c40a87111942c7b"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsdom@^11.5.1:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^5.5.3"
+    acorn-globals "^4.1.0"
+    array-equal "^1.0.0"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle "^1.0.0"
+    data-urls "^1.0.0"
+    domexception "^1.0.1"
+    escodegen "^1.9.1"
+    html-encoding-sniffer "^1.0.2"
+    left-pad "^1.3.0"
+    nwsapi "^2.0.7"
+    parse5 "4.0.0"
+    pn "^1.1.0"
+    request "^2.87.0"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.3.4"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^5.2.0"
+    xml-name-validator "^3.0.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -4872,13 +5052,6 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4897,103 +5070,6 @@ jsx-ast-utils@^2.2.3:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
-just-extend@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
-  integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
-
-karma-chrome-launcher@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
-  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
-  dependencies:
-    fs-access "^1.0.0"
-    which "^1.2.1"
-
-karma-cli@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-1.0.1.tgz#ae6c3c58a313a1d00b45164c455b9b86ce17f960"
-  integrity sha1-rmw8WKMTodALRRZMRVubhs4X+WA=
-  dependencies:
-    resolve "^1.1.6"
-
-karma-logcapture-reporter@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz#bf1b0b1c915e0de295a15fe2f0179d4281bacddc"
-  integrity sha1-vxsLHJFeDeKVoV/i8BedQoG6zdw=
-
-karma-mocha@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-1.3.0.tgz#eeaac7ffc0e201eb63c467440d2b69c7cf3778bf"
-  integrity sha1-7qrH/8DiAetjxGdEDStpx883eL8=
-  dependencies:
-    minimist "1.2.0"
-
-karma-sourcemap-loader@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
-  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
-  dependencies:
-    graceful-fs "^4.1.2"
-
-karma-spec-reporter@^0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz#4830dc7148a155c7d7a186e632339a0d80fadec3"
-  integrity sha1-SDDccUihVcfXoYbmMjOaDYD63sM=
-  dependencies:
-    colors "^1.1.2"
-
-karma-summary-reporter@^1.5.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma-summary-reporter/-/karma-summary-reporter-1.7.1.tgz#ff751e6e3950a3b3f2ae96a39b10fdc87938c4db"
-  integrity sha512-1I1njfSKFwogQrfDDyjyXKUeysYdD7SXoXBz2o7oK7RpiGsteyBoV3+6J5qFLcT0D8VGxLzYCsU0BbyeeHIl0g==
-  dependencies:
-    chalk "^1.1.3 || 2.x"
-
-karma-webpack@^4.0.0-beta.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.2.tgz#23219bd95bdda853e3073d3874d34447c77bced0"
-  integrity sha512-970/okAsdUOmiMOCY8sb17A2I8neS25Ad9uhyK3GHgmRSIFJbDcNEFE8dqqUhNe9OHiCC9k3DMrSmtd/0ymP1A==
-  dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.1.0"
-    neo-async "^2.6.1"
-    schema-utils "^1.0.0"
-    source-map "^0.7.3"
-    webpack-dev-middleware "^3.7.0"
-
-karma@^4.0.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.4.1.tgz#6d9aaab037a31136dc074002620ee11e8c2e32ab"
-  integrity sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^3.0.2"
-    chokidar "^3.0.0"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.14"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5018,6 +5094,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+kleur@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
+  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
+
 known-css-properties@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
@@ -5030,6 +5111,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -5052,6 +5138,17 @@ linkifyjs@^2.1.6:
     react "^16.4.2"
     react-dom "^16.4.2"
 
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5114,11 +5211,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -5144,6 +5236,11 @@ lodash.mergewith@^4.6.1:
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -5161,32 +5258,16 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log4js@^4.0.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
-  dependencies:
-    date-format "^2.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.0"
-    rfdc "^1.1.4"
-    streamroller "^1.0.6"
-
 loglevel@^1.6.4:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
   integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
-lolex@4.2, lolex@^4.1.0:
+lolex@4.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
   integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==
 
-lolex@^2.4.2:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
-  integrity sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==
-
 longest-streak@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
@@ -5207,14 +5288,6 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lru-cache@4.1.x:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5254,6 +5327,13 @@ make-fetch-happen@5.0.0:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -5355,11 +5435,6 @@ mdast-util-compact@^1.0.0:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -5410,6 +5485,13 @@ meow@^5.0.0:
     trim-newlines "^2.0.0"
     yargs-parser "^10.0.0"
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5420,7 +5502,12 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-micromatch@^2.1.5:
+merge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
@@ -5471,18 +5558,13 @@ mime-db@1.42.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
   integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
-mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.25"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
   integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
   dependencies:
     mime-db "1.42.0"
 
-mime@^2.3.1, mime@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
-
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -5503,7 +5585,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -5528,7 +5610,7 @@ minimist@1.1.x:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
   integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
 
-minimist@1.2.0, minimist@^1.2.0, "minimist@~ 1.2.0":
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -5577,30 +5659,13 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
-mocha@^5.0.5:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -5628,6 +5693,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+nan@^1.6.2:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515"
+  integrity sha1-GpzSdVYJdm9cKR5BlPzjn94oZRU=
+
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -5664,12 +5734,7 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-neo-async@^2.5.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -5679,17 +5744,6 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^1.3.3:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.2.tgz#b6d29af10e48b321b307e10e065199338eeb2652"
-  integrity sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==
-  dependencies:
-    "@sinonjs/formatio" "^3.2.1"
-    "@sinonjs/text-encoding" "^0.7.1"
-    just-extend "^4.0.2"
-    lolex "^4.1.0"
-    path-to-regexp "^1.7.0"
-
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -5707,6 +5761,16 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-forge@^0.6.20:
+  version "0.6.49"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.49.tgz#f1ee95d5d74623938fe19d698aa5a26d54d2f60f"
+  integrity sha1-8e6V1ddGI5OP4Z1piqWibVTS9g8=
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
 node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -5736,6 +5800,33 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
+node-notifier@^5.2.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -5784,7 +5875,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
+normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -5829,11 +5920,6 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-null-check@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
-
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -5844,6 +5930,11 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
+nwsapi@^2.0.7:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -5854,11 +5945,6 @@ object-assign@^4.1.0, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -5915,6 +6001,14 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5940,13 +6034,6 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -5969,7 +6056,7 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.2:
+optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -6137,6 +6224,13 @@ parse-glob@^3.0.4:
     is-extglob "^1.0.0"
     is-glob "^2.0.0"
 
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6150,24 +6244,10 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -6184,6 +6264,13 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6209,17 +6296,19 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.6:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
-    isarray "0.0.1"
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
@@ -6249,10 +6338,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
-  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
@@ -6264,6 +6353,18 @@ pify@^4.0.0, pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -6283,6 +6384,11 @@ pluralizers@^0.1.7:
   resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
   integrity sha512-mw6AejUiCaMQ6uPN9ObjJDTnR5AnBSmnHHy3uVTbxrSFSxO5scfwpTs8Dxyb6T2v7GSulhvOq+pm9y+hXUvtOA==
 
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
 png-chunks-extract@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d"
@@ -6290,6 +6396,13 @@ png-chunks-extract@^1.0.0:
   dependencies:
     crc-32 "^0.3.0"
 
+polyfill-promise@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/polyfill-promise/-/polyfill-promise-4.0.1.tgz#f8448dc27c3b967d5f67fc060f56ed64e2286b49"
+  integrity sha1-+ESNwnw7ln1fZ/wGD1btZOIoa0k=
+  dependencies:
+    bluebird "^2.9.27"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6418,15 +6531,13 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
+pretty-format@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
+    ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
-    react-is "^16.8.4"
 
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
@@ -6468,6 +6579,14 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prompts@^0.1.9:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
+  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
+  dependencies:
+    kleur "^2.0.1"
+    sisteransi "^0.1.1"
+
 prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -6482,16 +6601,16 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
 psl@^1.1.24:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.5.0.tgz#47fd1292def7fdb1e138cd78afa8814cebcf7b13"
   integrity sha512-4vqUjKi2huMu1OJiLhi3jN6jeeKvMZdI1tYgi/njW5zV52jNLgSAZSdN16m9bJFe61/cT8ulmw4qFitV9QRsEA==
 
+psl@^1.1.28:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110"
+  integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -6539,15 +6658,22 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qjobs@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
+pvtsutils@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.9.tgz#0eb6106f27878ccaa55e7dfbf6bd2c75af461dee"
+  integrity sha512-/kDsuCKPqJuIzn37w6+iN+TiSrN+zrwPEd7FjT61oNbRvceGdsS94fMEWZ4/h6QZU5EZhBMiV+79IYedroP/Yw==
+  dependencies:
+    tslib "^1.10.0"
+
+pvutils@latest:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
+  integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
 
 qr.js@0.0.0:
   version "0.0.0"
@@ -6561,11 +6687,6 @@ qrcode-react@^0.1.16:
   dependencies:
     qr.js "0.0.0"
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
 qs@^6.5.2, qs@^6.6.0:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
@@ -6627,21 +6748,6 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.0, range-parser@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -6715,7 +6821,7 @@ react-immutable-proptypes@^2.1.0:
   resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
   integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
 
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -6777,6 +6883,14 @@ react@^16.4.2, react@^16.9.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -6785,6 +6899,15 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -6834,12 +6957,12 @@ readdirp@^2.0.0, readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+realpath-native@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
   dependencies:
-    picomatch "^2.0.4"
+    util.promisify "^1.0.0"
 
 redent@^2.0.0:
   version "2.0.0"
@@ -7019,7 +7142,23 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request@^2.88.0:
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+  dependencies:
+    lodash "^4.17.15"
+
+request-promise-native@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  dependencies:
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -7065,11 +7204,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
 reselect@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
@@ -7110,7 +7244,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -7135,11 +7274,6 @@ retry@^0.10.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rfdc@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
-  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
-
 rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -7147,7 +7281,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7180,6 +7314,11 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -7223,10 +7362,21 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-samsam@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
-  integrity sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==
+sane@^2.0.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+  dependencies:
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.18.0"
+  optionalDependencies:
+    fsevents "^1.2.3"
 
 sanitize-html@^1.18.4:
   version "1.20.1"
@@ -7306,11 +7456,6 @@ setimmediate@^1.0.4, setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -7319,13 +7464,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7338,23 +7476,25 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-sinon@^5.0.7:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-5.1.1.tgz#19c59810ffb733ea6e76a28b94a71fc4c2f523b8"
-  integrity sha512-h/3uHscbt5pQNxkf7Y/Lb9/OM44YNCicHakcq73ncbrIS8lXg+ZGOZbtuU+/km4YnyiCYfQQEwANaReJz7KDfw==
-  dependencies:
-    "@sinonjs/formatio" "^2.0.0"
-    diff "^3.5.0"
-    lodash.get "^4.4.2"
-    lolex "^2.4.2"
-    nise "^1.3.3"
-    supports-color "^5.4.0"
-    type-detect "^4.0.8"
+sisteransi@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
+
+sjcl@^1.0.3:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a"
+  integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==
 
 slash@^1.0.0:
   version "1.0.0"
@@ -7497,52 +7637,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    engine.io-client "~3.2.0"
-    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
-  dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
-
 socks-proxy-agent@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
@@ -7590,7 +7684,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.12:
+source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -7603,7 +7697,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -7613,11 +7707,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 spawn-command@^0.0.2-1:
   version "0.0.2-1"
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
@@ -7719,10 +7808,10 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
   version "2.0.2"
@@ -7756,16 +7845,13 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
+string-length@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
+    astral-regex "^1.0.0"
+    strip-ansi "^4.0.0"
 
 string-width@4.1.0:
   version "4.1.0"
@@ -7868,11 +7954,18 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-bom@^3.0.0:
+strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -7971,6 +8064,18 @@ stylelint@^9.10.1:
     svg-tags "^1.0.0"
     table "^5.0.0"
 
+subtle@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/subtle/-/subtle-0.1.8.tgz#0c12599b9cf13127eda11626510cd8f24f878916"
+  integrity sha1-DBJZm5zxMSftoRYmUQzY8k+HiRY=
+  dependencies:
+    ecc-jsbn "0.0.1"
+    node-forge "^0.6.20"
+    polyfill-promise "^4.0.1"
+    sjcl "^1.0.3"
+  optionalDependencies:
+    ecc-qj "git+https://github.com/rynomad/ecc.git"
+
 sugarss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
@@ -7978,13 +8083,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@6.1.0, supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
@@ -7997,6 +8095,13 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
+supports-color@^3.1.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
+  dependencies:
+    has-flag "^1.0.0"
+
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -8004,7 +8109,7 @@ supports-color@^4.5.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -8021,6 +8126,11 @@ symbol-observable@^1.0.3:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
 table@^5.0.0, table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -8036,7 +8146,7 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4:
+tar@^4, tar@^4.4.2:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -8073,6 +8183,17 @@ terser@^4.1.0, terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+test-exclude@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
 text-encoding-utf-8@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
@@ -8083,6 +8204,11 @@ text-table@0.2.0, text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+throat@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -8108,17 +8234,17 @@ tmatch@^2.0.1:
   resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
   integrity sha1-DFYkbzPzDaG409colauvFmYPOM8=
 
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
@@ -8150,13 +8276,6 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -8167,10 +8286,13 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+tough-cookie@^2.3.3, tough-cookie@^2.3.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
@@ -8180,6 +8302,13 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
 tree-kill@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
@@ -8210,7 +8339,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
@@ -8246,19 +8375,6 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8, type-detect@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-is@~1.6.17:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
 type-of@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972"
@@ -8274,10 +8390,13 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
   integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+uglify-js@^3.1.4:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
+  integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==
+  dependencies:
+    commander "~2.20.3"
+    source-map "~0.6.1"
 
 unherit@^1.0.4:
   version "1.1.2"
@@ -8380,16 +8499,6 @@ unist-util-visit@^1.1.0:
   dependencies:
     unist-util-visit-parents "^2.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -8462,19 +8571,19 @@ user-home@^1.1.1:
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
   integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
 
-useragent@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util.promisify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
+
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -8489,11 +8598,6 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
 uuid@^3.3.2:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
@@ -8568,10 +8672,12 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
 
 walk@^2.3.9:
   version "2.3.14"
@@ -8580,6 +8686,13 @@ walk@^2.3.9:
   dependencies:
     foreachasync "^3.0.0"
 
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -8587,6 +8700,14 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
 watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -8596,6 +8717,19 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+webcrypto-core@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.17.tgz#a9354bc0b1ba6735e882f4137ede2c4366e6ad9b"
+  integrity sha512-7jxTLgtM+TahBPErx/Dd2XvxFDfWJrHxjVeTSvIa4LSgiYrmCPlC2INiAMAfb8MbtHiwJKKqF5sPS0AWNjBbXw==
+  dependencies:
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
 webpack-cli@^3.1.1:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
@@ -8613,25 +8747,6 @@ webpack-cli@^3.1.1:
     v8-compile-cache "2.0.3"
     yargs "13.2.4"
 
-webpack-dev-middleware@^3.7.0:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
 webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
@@ -8674,6 +8789,13 @@ what-input@^5.2.6:
   resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.6.tgz#ac6f003bf8d3592a0031dea7a03565469b00020b"
   integrity sha512-a0BcI5YR7xp87vSzGcbN0IszJKpUQuTmrZaTSQBl7TLDIdKj6rDhluQ7b/7lYGG81gWDvkySsEvwv4BW5an9kg==
 
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
 whatwg-fetch@>=0.10.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
@@ -8689,6 +8811,29 @@ whatwg-fetch@^1.1.1:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
   integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk=
 
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 which-boxed-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
@@ -8715,7 +8860,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -8768,6 +8913,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@^2.1.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -8775,40 +8929,38 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+ws@^5.2.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
 
 x-is-string@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
   integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -8837,6 +8989,13 @@ yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@13.2.4:
   version "13.2.4"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
@@ -8854,6 +9013,24 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+yargs@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -8872,11 +9049,6 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"

From 6851ad04b6864ceb721b8185f9db083e0503b33b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 11:26:20 +0000
Subject: [PATCH 0052/3235] Migrate key backups to SSSS

If there's a key backup set up when we bootstrap SSSS, use its key
for SSSS and add the key backup key as a passthrough secret.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128
Fixes https://github.com/vector-im/riot-web/issues/11210
---
 .../CreateSecretStorageDialog.js              | 64 ++++++++++++++++---
 src/i18n/strings/en_EN.json                   |  2 +
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 78ff2a1698..f47baa9f4e 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -23,13 +23,15 @@ import FileSaver from 'file-saver';
 import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 
-const PHASE_PASSPHRASE = 0;
-const PHASE_PASSPHRASE_CONFIRM = 1;
-const PHASE_SHOWKEY = 2;
-const PHASE_KEEPITSAFE = 3;
-const PHASE_STORING = 4;
-const PHASE_DONE = 5;
-const PHASE_OPTOUT_CONFIRM = 6;
+const PHASE_LOADING = 0;
+const PHASE_MIGRATE = 1;
+const PHASE_PASSPHRASE = 2;
+const PHASE_PASSPHRASE_CONFIRM = 3;
+const PHASE_SHOWKEY = 4;
+const PHASE_KEEPITSAFE = 5;
+const PHASE_STORING = 6;
+const PHASE_DONE = 7;
+const PHASE_OPTOUT_CONFIRM = 8;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -58,7 +60,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._setZxcvbnResultTimeout = null;
 
         this.state = {
-            phase: PHASE_PASSPHRASE,
+            phase: PHASE_LOADING,
             passPhrase: '',
             passPhraseConfirm: '',
             copied: false,
@@ -66,6 +68,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             zxcvbnResult: null,
             setPassPhrase: false,
         };
+
+        this._fetchBackupInfo();
     }
 
     componentWillUnmount() {
@@ -74,10 +78,23 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     }
 
+    async _fetchBackupInfo() {
+        const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+
+        this.setState({
+            phase: backupInfo ? PHASE_MIGRATE: PHASE_PASSPHRASE,
+            backupInfo,
+        });
+    }
+
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
 
+    _onMigrateNextClick = () => {
+        this._bootstrapSecretStorage();
+    }
+
     _onCopyClick = () => {
         selectText(this._recoveryKeyNode);
         const successful = document.execCommand('copy');
@@ -105,6 +122,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.setState({
             phase: PHASE_STORING,
             error: null,
+            keyBackupInfo: this.state.backupInfo,
         });
         const cli = MatrixClientPeg.get();
         try {
@@ -250,6 +268,26 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
     }
 
+    _renderPhaseMigrate() {
+        // This is a temporary screen so people who have the labs flag turned on and
+        // click the button are aware they're making a change to their account.
+        // Once we're confident enough in this (and it's supported enough) we can do
+        // it automatically.
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>{_t(
+                "Secret Storage will be set up using your existing key backup details." +
+                "Your secret storage passphrase and recovery key will be the same as " +
+                " they were for your key backup",
+            )}</p>
+            <DialogButtons primaryButton={_t('Next')}
+                onPrimaryButtonClick={this._onMigrateNextClick}
+                hasCancel={true}
+                onCancel={this._onCancel}
+            />
+        </div>;
+    }
+
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
@@ -449,7 +487,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         </div>;
     }
 
-    _renderBusyPhase(text) {
+    _renderBusyPhase() {
         const Spinner = sdk.getComponent('views.elements.Spinner');
         return <div>
             <Spinner />
@@ -488,6 +526,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _titleForPhase(phase) {
         switch (phase) {
+            case PHASE_MIGRATE:
+                return _t('Migrate from Key Backup');
             case PHASE_PASSPHRASE:
                 return _t('Secure your encrypted messages with a passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
@@ -525,6 +565,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         } else {
             switch (this.state.phase) {
+                case PHASE_LOADING:
+                    content = this._renderBusyPhase();
+                    break;
+                case PHASE_MIGRATE:
+                    content = this._renderPhaseMigrate();
+                    break;
                 case PHASE_PASSPHRASE:
                     content = this._renderPhasePassPhrase();
                     break;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9bccca14f4..14cfbac987 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1935,6 +1935,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
     "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
@@ -1961,6 +1962,7 @@
     "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
+    "Migrate from Key Backup": "Migrate from Key Backup",
     "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
     "Confirm your passphrase": "Confirm your passphrase",
     "Recovery key": "Recovery key",

From 66783dff9e4ebfd4ddae8ad5be3927a7439f83ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 12:27:25 +0000
Subject: [PATCH 0053/3235] Fix scaling of the avatar in UserInfo

---
 res/css/views/avatars/_BaseAvatar.scss       |  1 +
 res/css/views/right_panel/_UserInfo.scss     | 30 +++++++++++++-------
 src/components/views/right_panel/UserInfo.js | 18 ++++++------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/res/css/views/avatars/_BaseAvatar.scss b/res/css/views/avatars/_BaseAvatar.scss
index a085034758..e59598278f 100644
--- a/res/css/views/avatars/_BaseAvatar.scss
+++ b/res/css/views/avatars/_BaseAvatar.scss
@@ -40,6 +40,7 @@ limitations under the License.
 }
 
 .mx_BaseAvatar_image {
+    object-fit: cover;
     border-radius: 40px;
     vertical-align: top;
     background-color: $avatar-bg-color;
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index a5428393ee..e87fe06a94 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -70,23 +70,33 @@ limitations under the License.
         margin: 0 auto;
     }
 
-    .mx_UserInfo_avatar > div * {
+    .mx_UserInfo_avatar > div > div {
         /* use padding-top instead of height to make this element square,
         as the % in padding is a % of the width (including margin,
         that's why we had to put the margin to center on a parent div),
         and not a % of the parent height. */
-        width: 30vh;
-        height: 30vh;
-        object-fit: cover;
-        border-radius: 100%;
-        box-sizing: content-box;
+        padding-top: 100%;
+        position: relative;
     }
 
-    // override the calculated sizes so that the letter isn't HUGE
-    .mx_UserInfo_avatar > div .mx_BaseAvatar_initial {
+    .mx_UserInfo_avatar > div > div * {
+        border-radius: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+    }
+
+    .mx_UserInfo_avatar .mx_BaseAvatar_initial {
+        z-index: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        // override the calculated sizes so that the letter isn't HUGE
         font-size: 26px !important;
-        width: 30vh !important;
-        line-height: 30vh !important;
+        width: 100% !important;
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 0116fafb9e..65fc0bf66b 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1156,14 +1156,16 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
     const avatarElement = (
         <div className="mx_UserInfo_avatar">
             <div>
-                <MemberAvatar
-                    member={user}
-                    width={0.3 * window.outerHeight} // ~30vh
-                    height={0.3 * window.outerHeight} // ~30vh
-                    resizeMethod="scale"
-                    fallbackUserId={user.userId}
-                    onClick={onMemberAvatarClick}
-                    urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
+                <div>
+                    <MemberAvatar
+                        member={user}
+                        width={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        height={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        resizeMethod="scale"
+                        fallbackUserId={user.userId}
+                        onClick={onMemberAvatarClick}
+                        urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
+                </div>
             </div>
         </div>
     );

From 3678e64f5d10aff9eaad2da93b735411a93ea3a0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 13:25:43 +0000
Subject: [PATCH 0054/3235] Internationalise M_TOO_LARGE error from Synapse

---
 src/components/structures/RoomStatusBar.js | 4 ++--
 src/i18n/strings/en_EN.json                | 1 +
 src/utils/ErrorUtils.js                    | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index b0aa4cb59b..574d3b7d1e 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -25,7 +25,7 @@ import MatrixClientPeg from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
 import dis from '../../dispatcher';
-import { messageForResourceLimitError } from '../../utils/ErrorUtils';
+import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -272,7 +272,7 @@ module.exports = createReactClass({
                 unsentMessages[0].error.data &&
                 unsentMessages[0].error.data.error
             ) {
-                title = unsentMessages[0].error.data.error;
+                title = messageForSendError(unsentMessages[0].error.data) || unsentMessages[0].error.data.error;
             } else {
                 title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length });
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9bccca14f4..1dbd94f64f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -301,6 +301,7 @@
     "No homeserver URL provided": "No homeserver URL provided",
     "Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration",
     "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
+    "The message you are trying to send is too large.": "The message you are trying to send is too large.",
     "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.",
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
index 4a56d64ef1..51b130bdb6 100644
--- a/src/utils/ErrorUtils.js
+++ b/src/utils/ErrorUtils.js
@@ -49,6 +49,12 @@ export function messageForResourceLimitError(limitType, adminContact, strings, e
     }
 }
 
+export function messageForSendError(errorData) {
+    if (errorData.errcode === "M_TOO_LARGE") {
+        return _t("The message you are trying to send is too large.");
+    }
+}
+
 export function messageForSyncError(err) {
     if (err.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
         const limitError = messageForResourceLimitError(

From 6c1944359ece104736f64f1051d525ba9f45ea28 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 14:29:46 +0000
Subject: [PATCH 0055/3235] Add RoomTile online indicator to DMs

---
 res/css/views/rooms/_RoomTile.scss            |  9 ++++
 src/components/views/rooms/RoomTile.js        | 17 ++++---
 .../views/rooms/RoomTileOnlineDot.js          | 48 +++++++++++++++++++
 3 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 src/components/views/rooms/RoomTileOnlineDot.js

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 1814919b61..2b181f366e 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -61,6 +62,14 @@ limitations under the License.
     min-width: 0;
 }
 
+.mx_RoomTile_online_dot {
+    border-radius: 50%;
+    background-color: $accent-color;
+    height: 5px;
+    width: 5px;
+    display: inline-block;
+}
+
 .mx_RoomTile_subtext {
     display: inline-block;
     font-size: 11px;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 817ada9706..797aa7b87a 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,6 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
+import RoomTileOnlineDot from "./RoomTileOnlineDot";
 
 module.exports = createReactClass({
     displayName: 'RoomTile',
@@ -68,11 +69,6 @@ module.exports = createReactClass({
         });
     },
 
-    _isDirectMessageRoom: function(roomId) {
-        const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId);
-        return Boolean(dmRooms);
-    },
-
     _shouldShowStatusMessage() {
         if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
             return false;
@@ -371,8 +367,11 @@ module.exports = createReactClass({
 
         let ariaLabel = name;
 
+        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+
         let dmIndicator;
-        if (this._isDirectMessageRoom(this.props.room.roomId)) {
+        let dmOnline;
+        if (dmUserId) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"
@@ -380,6 +379,11 @@ module.exports = createReactClass({
                 height="13"
                 alt="dm"
             />;
+
+            if (this.props.room.getMember(dmUserId).membership === "join") {
+                const RoomTileOnlineDot = sdk.getComponent('rooms.RoomTileOnlineDot');
+                dmOnline = <RoomTileOnlineDot userId={dmUserId} />;
+            }
         }
 
         // The following labels are written in such a fashion to increase screen reader efficiency (speed).
@@ -428,6 +432,7 @@ module.exports = createReactClass({
                         { label }
                         { subtextLabel }
                     </div>
+                    { dmOnline }
                     { contextMenuButton }
                     { badge }
                 </div>
diff --git a/src/components/views/rooms/RoomTileOnlineDot.js b/src/components/views/rooms/RoomTileOnlineDot.js
new file mode 100644
index 0000000000..a882aec613
--- /dev/null
+++ b/src/components/views/rooms/RoomTileOnlineDot.js
@@ -0,0 +1,48 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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, {useContext, useEffect, useMemo, useState, useCallback} from "react";
+import PropTypes from "prop-types";
+
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+const RoomTileOnlineDot = ({userId}) => {
+    const cli = useContext(MatrixClientContext);
+    const user = useMemo(() => cli.getUser(userId), [cli, userId]);
+
+    const [isOnline, setIsOnline] = useState(false);
+
+    // Recheck if the user or client changes
+    useEffect(() => {
+        setIsOnline(user && (user.currentlyActive || user.presence === "online"));
+    }, [cli, user]);
+    // Recheck also if we receive a User.currentlyActive event
+    const currentlyActiveHandler = useCallback((ev) => {
+        const content = ev.getContent();
+        setIsOnline(content.currently_active || content.presence === "online");
+    }, []);
+    useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler);
+    useEventEmitter(user, "User.presence", currentlyActiveHandler);
+
+    return isOnline ? <span className="mx_RoomTile_online_dot" /> : null;
+};
+
+RoomTileOnlineDot.propTypes = {
+    userId: PropTypes.string.isRequired,
+};
+
+export default RoomTileOnlineDot;

From db069b960207f3c8af5b6320a0bc5709b06354cb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 14:33:46 +0000
Subject: [PATCH 0056/3235] delint

---
 src/components/views/rooms/RoomTile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 797aa7b87a..cd5af61862 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,7 +32,6 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
-import RoomTileOnlineDot from "./RoomTileOnlineDot";
 
 module.exports = createReactClass({
     displayName: 'RoomTile',

From 3f7ea3bc66ba47d171ff406ab79a8e5d126ef116 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Thu, 19 Dec 2019 07:39:57 +0000
Subject: [PATCH 0057/3235] Translated using Weblate (Finnish)

Currently translated at 95.5% (1909 of 1998 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 6f941b5d4a..381eff2e8e 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1078,7 +1078,7 @@
     "This room is a continuation of another conversation.": "Tämä huone on jatkumo toisesta keskustelusta.",
     "Don't ask me again": "Älä kysy uudelleen",
     "Not now": "Ei nyt",
-    "The conversation continues here.": "Keskustelu jatkuu tässä.",
+    "The conversation continues here.": "Keskustelu jatkuu täällä.",
     "Share Link to User": "Jaa linkki käyttäjälle",
     "Muted Users": "Mykistetyt käyttäjät",
     "Timeline": "Aikajana",

From 1010c0a27b22466e25aae9bb1cb34fbb3d097f01 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 19 Dec 2019 08:58:42 +0000
Subject: [PATCH 0058/3235] Translated using Weblate (Italian)

Currently translated at 99.9% (1997 of 1998 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 08be6d4c06..b18b6c9272 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2006,5 +2006,12 @@
     "Secure your encrypted messages with a passphrase": "Proteggi i tuoi messaggi cifrati con una password",
     "Storing secrets...": "Memorizzo i segreti...",
     "Unable to set up secret storage": "Impossibile impostare un archivio segreto",
-    "Close preview": "Chiudi anteprima"
+    "Close preview": "Chiudi anteprima",
+    "This user has not verified all of their devices.": "Questo utente non ha verificato tutti i suoi dispositivi.",
+    "You have not verified this user. This user has verified all of their devices.": "Non hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.",
+    "You have verified this user. This user has verified all of their devices.": "Hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Non hai verificato alcuni utenti in questa stanza criptata o essi non hanno verificato i loro dispositivi.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Hai verificato tutti gli utenti in questa stanza criptata ed essi hanno verificato i loro dispositivi.",
+    "Language Dropdown": "Lingua a tendina",
+    "Country Dropdown": "Nazione a tendina"
 }

From 00b66b487799b4095f213ebf81e0835baf1f4c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 19 Dec 2019 10:03:51 +0000
Subject: [PATCH 0059/3235] Translated using Weblate (Slovak)

Currently translated at 75.0% (1498 of 1998 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 1782059252..21830a92e0 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1187,70 +1187,70 @@
     "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
     "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.",
     "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Pre zachovanie maximálnej bezpečnosti odporúčame, aby ste toto vykonali osobne, alebo použili iný dôverihodný komunikačný kanál.",
-    "Dog": "Pes",
-    "Cat": "Mačka",
-    "Lion": "Lev",
+    "Dog": "Hlava psa",
+    "Cat": "Hlava mačky",
+    "Lion": "Hlava leva",
     "Horse": "Kôň",
-    "Unicorn": "Jednorožec",
-    "Pig": "Prasa",
+    "Unicorn": "Hlava jednorožca",
+    "Pig": "Hlava Prasaťa",
     "Elephant": "Slon",
-    "Rabbit": "Zajac",
-    "Panda": "Panda",
+    "Rabbit": "Hlava Zajaca",
+    "Panda": "Hlava Pandy",
     "Rooster": "Kohút",
     "Penguin": "Tučniak",
     "Turtle": "Korytnačka",
     "Fish": "Ryba",
     "Octopus": "Chobotnica",
     "Butterfly": "Motýľ",
-    "Flower": "Kvetina",
-    "Tree": "Strom",
+    "Flower": "Tulipán",
+    "Tree": "Listnatý strom",
     "Cactus": "Kaktus",
-    "Mushroom": "Hríb",
+    "Mushroom": "Huba",
     "Globe": "Zemeguľa",
-    "Moon": "Mesiac",
+    "Moon": "Polmesiac",
     "Cloud": "Oblak",
     "Fire": "Oheň",
     "Banana": "Banán",
-    "Apple": "Jablko",
+    "Apple": "Červené jablko",
     "Strawberry": "Jahoda",
-    "Corn": "Kukurica",
+    "Corn": "Kukuričný klas",
     "Pizza": "Pizza",
-    "Cake": "Koláč",
-    "Heart": "Srdce",
-    "Smiley": "Úsmev",
+    "Cake": "Narodeninová torta",
+    "Heart": "Červené srdce",
+    "Smiley": "Škeriaca sa tvár",
     "Robot": "Robot",
-    "Hat": "Klobúk",
+    "Hat": "Cylinder",
     "Glasses": "Okuliare",
-    "Spanner": "Skrutkovač",
-    "Santa": "Mikuláš",
+    "Spanner": "Francúzsky kľúč",
+    "Santa": "Santa Claus",
     "Thumbs up": "palec nahor",
     "Umbrella": "Dáždnik",
     "Hourglass": "Presýpacie hodiny",
-    "Clock": "Hodiny",
-    "Gift": "Darček",
+    "Clock": "Budík",
+    "Gift": "Zabalený darček",
     "Light bulb": "Žiarovka",
-    "Book": "Kniha",
+    "Book": "Zatvorená kniha",
     "Pencil": "Ceruzka",
-    "Paperclip": "Kancelárska sponka",
+    "Paperclip": "Sponka na papier",
     "Scissors": "Nožnice",
-    "Padlock": "Visiaci zámok",
+    "Padlock": "Zatvorená zámka",
     "Key": "Kľúč",
     "Hammer": "Kladivo",
     "Telephone": "Telefón",
-    "Flag": "Vlajka",
-    "Train": "Vlak",
+    "Flag": "Kockovaná zástava",
+    "Train": "Rušeň",
     "Bicycle": "Bicykel",
     "Aeroplane": "Lietadlo",
     "Rocket": "Raketa",
     "Trophy": "Trofej",
-    "Ball": "Lopta",
+    "Ball": "Futbal",
     "Guitar": "Gitara",
     "Trumpet": "Trúbka",
-    "Bell": "Zvonček",
+    "Bell": "Zvon",
     "Anchor": "Kotva",
     "Headphones": "Slúchadlá",
-    "Folder": "Priečinok",
-    "Pin": "Pin",
+    "Folder": "Fascikel",
+    "Pin": "Špendlík",
     "Your homeserver does not support device management.": "Váš domovský server nepodporuje správu zariadení.",
     "Yes": "Áno",
     "No": "Nie",
@@ -1461,7 +1461,7 @@
     "The server does not support the room version specified.": "Server nepodporuje zadanú verziu miestnosti.",
     "Name or Matrix ID": "Meno alebo Matrix ID",
     "Email, name or Matrix ID": "Email, meno alebo Matrix ID",
-    "Failed to start chat": "Nepodarilo sa spustiť konverzáciu",
+    "Failed to start chat": "Nepodarilo sa začať konverzáciu",
     "Messages": "Správy",
     "Actions": "Akcie",
     "Room upgrade confirmation": "Potvrdenie aktualizácii miestnosti",
@@ -1514,5 +1514,52 @@
     "Terms of service not accepted or the identity server is invalid.": "Neprijali ste Podmienky poskytovania služby alebo to nie je správny server.",
     "Identity server has no terms of service": "Server totožností nemá žiadne podmienky poskytovania služieb",
     "The identity server you have chosen does not have any terms of service.": "Zadaný server totožností nezverejňuje žiadne podmienky poskytovania služieb.",
-    "Only continue if you trust the owner of the server.": "Pokračujte len v prípade, že dôverujete prevádzkovateľovi servera."
+    "Only continue if you trust the owner of the server.": "Pokračujte len v prípade, že dôverujete prevádzkovateľovi servera.",
+    "Add Email Address": "Pridať emailovú adresu",
+    "Add Phone Number": "Pridať telefónne číslo",
+    "Send cross-signing keys to homeserver": "Poslať kľúče pre podpisovanie naprieč zariadeniami na domovský server",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Táto akcia si vyžaduje mať overenú emailovú adresu alebo telefónne číslo cez predvolený server totožností <server />, ale server nezverejnil podmienky používania.",
+    "Trust": "Dôverovať",
+    "Custom (%(level)s)": "Vlastná (%(level)s)",
+    "Sends a message as plain text, without interpreting it as markdown": "Odošle správu vo formáte obyčajný text, bez prekladu markdown",
+    "You do not have the required permissions to use this command.": "Na použitie tohoto príkazu nemáte dostatočné povolenia.",
+    "Error upgrading room": "Chyba pri aktualizácii miestnosti",
+    "Double check that your server supports the room version chosen and try again.": "Uistite sa, že domovský server podporuje zvolenú verziu miestnosti a skúste znovu.",
+    "Changes the avatar of the current room": "Zmení obrázok miestnosti",
+    "Use an identity server": "Použiť server totožností",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Aby ste mohli používateľov pozývať zadaním emailovej adresy, je potrebné nastaviť adresu servera totožností. Klepnutím na tlačidlo pokračovať  použijete predvolený server (%(defaultIdentityServerName)s) a zmeniť to môžete v nastaveniach.",
+    "Use an identity server to invite by email. Manage in Settings.": "Server totožností sa použije na pozývanie používateľov zadaním emailovej adresy. Spravujte v nastaveniach.",
+    "%(senderName)s placed a voice call.": "%(senderName)s uskutočnil telefonát.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s uskutočnil telefonát. (Nepodporované týmto prehliadačom)",
+    "%(senderName)s placed a video call.": "%(senderName)s uskutočnil video hovor.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s uskutočnil video hovor. (Nepodporované týmto prehliadačom)",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s odstránil pravidlo zákazu vstúpiť používateľom zhodujúcich sa s %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s odstránil pravidlo zákaz vstúpiť do miestností zhodujúcich sa s %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s odstránil pravidlo zakázať vstúpiť z domovského servera zhodnými s %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s odstránil pravidlo zákazu vstupu zhodné s %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualizoval neplatné pravidlo zákazu vstúpiť",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zákazu vstúpiť používateľom zhodujúcim sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť do miestností shodujúcich sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť z domovských serverov zhodujúcich sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť zhodujúce sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť používateľom zhodujúcim sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť do miestností zhodujúcich sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť z domovských serverov zhodujúcich sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s vytvoril pravidlo zakázať vstúpiť zhodujúce sa s %(glob)s, dôvod: %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť používateľom pôvodne zhodujúcich sa s %(oldGlob)s na používateľov zhodujúcich sa s %(newGlob)s, dôvod: %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť do miestností pôvodne zhodujúcich sa s %(oldGlob)s na miestnosti zhodujúce sa s %(newGlob)s, dôvod: %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť z domovských serverov pôvodne sa zhodujúcich s %(oldGlob)s na servery zhodujúce sa s %(newGlob)s, dôvod: %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť pôvodne sa zhodujúce s %(oldGlob)s na %(newGlob)s, dôvod: %(reason)s",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Multiple integration managers": "Viacej integračných serverov",
+    "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)",
+    "Send verification requests in direct message, including a new verification UX in the member panel.": "Požiadavky na overenie používateľov posielať v priamych konverzáciách, zahŕňa tiež nové rozhranie overenia v zozname používateľov.",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Povoliť podpisovanie naprieč zariadeniami, umožňuje overovanie používateľov namiesto ich zariadení (vo vývoji)",
+    "Enable local event indexing and E2EE search (requires restart)": "Povoliť lokálne indexovanie udalostí a vyhľadávanie v šifrovaných miestnostiach",
+    "Use the new, faster, composer for writing messages": "Používať nový, rýchly, editor pri písaní správ",
+    "Match system theme": "Prispôsobiť sa vzhľadu systému",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)",
+    "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov",
+    "My Ban List": "Môj zoznam zakázať vstúpiť",
+    "Decline (%(counter)s)": "Zamietnuť (%(counter)s)"
 }

From 709b2eed7c802789334769d176790bfe5c6d9705 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 15:10:54 +0000
Subject: [PATCH 0060/3235] Add bunch of null-guards and similar to fix React
 Errors/complaints

---
 src/components/views/elements/LazyRenderList.js     | 10 ++++++++--
 src/components/views/elements/Pill.js               |  2 +-
 src/components/views/elements/SettingsFlag.js       |  5 +++--
 src/components/views/elements/TagTile.js            |  2 ++
 src/components/views/groups/GroupPublicityToggle.js |  4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/LazyRenderList.js b/src/components/views/elements/LazyRenderList.js
index 0fc0ef6733..7572dced0b 100644
--- a/src/components/views/elements/LazyRenderList.js
+++ b/src/components/views/elements/LazyRenderList.js
@@ -56,14 +56,20 @@ class ItemRange {
 }
 
 export default class LazyRenderList extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {};
+    }
+
     static getDerivedStateFromProps(props, state) {
         const range = LazyRenderList.getVisibleRangeFromProps(props);
         const intersectRange = range.expand(props.overflowMargin);
         const renderRange = range.expand(props.overflowItems);
-        const listHasChangedSize = !!state && renderRange.totalSize() !== state.renderRange.totalSize();
+        const listHasChangedSize = !!state.renderRange && renderRange.totalSize() !== state.renderRange.totalSize();
         // only update render Range if the list has shrunk/grown and we need to adjust padding OR
         // if the new range + overflowMargin isn't contained by the old anymore
-        if (listHasChangedSize || !state || !state.renderRange.contains(intersectRange)) {
+        if (listHasChangedSize || !state.renderRange || !state.renderRange.contains(intersectRange)) {
             return {renderRange};
         }
         return null;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 12830488b1..b821276e92 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -127,7 +127,7 @@ const Pill = createReactClass({
             }
                 break;
             case Pill.TYPE_USER_MENTION: {
-                const localMember = nextProps.room.getMember(resourceId);
+                const localMember = nextProps.room ? nextProps.room.getMember(resourceId) : null;
                 member = localMember;
                 if (!localMember) {
                     member = new RoomMember(null, resourceId);
diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index a3a6d18d33..d62f3182fc 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -34,12 +34,13 @@ module.exports = createReactClass({
 
     getInitialState: function() {
         return {
-            value: SettingsStore.getValueAt(
+            // convert to Boolean to protect against null-capable "tri-state" Settings e.g fallbackICEServerAllowed
+            value: Boolean(SettingsStore.getValueAt(
                 this.props.level,
                 this.props.name,
                 this.props.roomId,
                 this.props.isExplicit,
-            ),
+            )),
         };
     },
 
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 767980f0a0..e31c1c524e 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -56,6 +56,8 @@ export default createReactClass({
             hover: false,
             // The profile data of the group if this.props.tag is a group ID
             profile: null,
+            // Whether or not the context menu is open
+            menuDisplayed: false,
         };
     },
 
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index bacf54382a..176bd9f988 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -32,7 +32,7 @@ export default createReactClass({
         return {
             busy: false,
             ready: false,
-            isGroupPublicised: null,
+            isGroupPublicised: false, // assume false as <ToggleSwitch /> expects a boolean
         };
     },
 
@@ -43,7 +43,7 @@ export default createReactClass({
     _initGroupStore: function(groupId) {
         this._groupStoreToken = GroupStore.registerListener(groupId, () => {
             this.setState({
-                isGroupPublicised: GroupStore.getGroupPublicity(groupId),
+                isGroupPublicised: Boolean(GroupStore.getGroupPublicity(groupId)),
                 ready: GroupStore.isStateReady(groupId, GroupStore.STATE_KEY.Summary),
             });
         });

From 3d8422c88afe85a59eb9759a8bfb25bafb5ffd22 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 15:23:32 +0000
Subject: [PATCH 0061/3235] Combine cross signing and verification over DM
 feature flags

This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
---
 src/components/structures/MatrixChat.js            | 2 +-
 src/components/structures/RightPanel.js            | 4 ++--
 src/components/views/dialogs/DeviceVerifyDialog.js | 2 +-
 src/settings/Settings.js                           | 7 -------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 82a682f9ab..8cee3e9def 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1466,7 +1466,7 @@ export default createReactClass({
             }
         });
 
-        if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             cli.on("crypto.verification.request", request => {
                 let requestObserver;
                 if (request.event.getRoomId()) {
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 1745c9d7dc..2f91c5419d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -190,7 +190,7 @@ export default class RightPanel extends React.Component {
         } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) {
             panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
-            if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
+            if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
                 const onClose = () => {
                     dis.dispatch({
                         action: "view_user",
@@ -209,7 +209,7 @@ export default class RightPanel extends React.Component {
         } else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) {
             panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
-            if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
+            if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
                 const onClose = () => {
                     dis.dispatch({
                         action: "view_user",
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 0e191cc192..6408245452 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -97,7 +97,7 @@ export default class DeviceVerifyDialog extends React.Component {
         const client = MatrixClientPeg.get();
         const verifyingOwnDevice = this.props.userId === client.getUserId();
         try {
-            if (!verifyingOwnDevice && SettingsStore.getValue("feature_dm_verification")) {
+            if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
                 const roomId = await ensureDMExistsAndOpen(this.props.userId);
                 // throws upon cancellation before having started
                 this._verifier = await client.requestVerificationDM(
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 82dd639819..f1299a9045 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -136,13 +136,6 @@ export const SETTINGS = {
         supportedLevels: ['account'],
         default: null,
     },
-    "feature_dm_verification": {
-        isFeature: true,
-        displayName: _td("Send verification requests in direct message," +
-            " including a new verification UX in the member panel."),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_cross_signing": {
         isFeature: true,
         displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),

From 26980e2ad542bcf290640bee3af50d89b585b303 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 15:26:04 +0000
Subject: [PATCH 0062/3235] apply unhomoglyph when filtering room list to
 fuzzify it

---
 src/components/views/rooms/RoomList.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 80a03e7a73..fb1643b8dd 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -22,6 +22,7 @@ import React from "react";
 import ReactDOM from "react-dom";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
+import utils from "matrix-js-sdk/lib/utils";
 import { _t } from '../../../languageHandler';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const CallHandler = require('../../../CallHandler');
@@ -588,11 +589,17 @@ module.exports = createReactClass({
 
     _applySearchFilter: function(list, filter) {
         if (filter === "") return list;
+        const fuzzyFilter = utils.removeHiddenChars(filter).toLowerCase();
         const lcFilter = filter.toLowerCase();
         // case insensitive if room name includes filter,
         // or if starts with `#` and one of room's aliases starts with filter
-        return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) ||
-            (filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
+        return list.filter((room) => {
+            if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
+                return true;
+            }
+            const lcRoomName = room.name ? utils.removeHiddenChars(room.name).toLowerCase() : "";
+            return lcRoomName.includes(fuzzyFilter);
+        });
     },
 
     _handleCollapsedState: function(key, collapsed) {

From c5e7594fe9869ab89bf3a9d3444d7418798dbe02 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 15:27:29 +0000
Subject: [PATCH 0063/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9bccca14f4..c959be6263 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -357,7 +357,6 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Send verification requests in direct message, including a new verification UX in the member panel.",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",

From e54429680be928e27815bf11761ea68950147b0b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 15:28:11 +0000
Subject: [PATCH 0064/3235] tidy up

---
 src/components/views/rooms/RoomList.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index fb1643b8dd..152ce5105e 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -597,8 +597,7 @@ module.exports = createReactClass({
             if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
                 return true;
             }
-            const lcRoomName = room.name ? utils.removeHiddenChars(room.name).toLowerCase() : "";
-            return lcRoomName.includes(fuzzyFilter);
+            return room.name ? utils.removeHiddenChars(room.name).toLowerCase().includes(fuzzyFilter) : false;
         });
     },
 

From 1c31fd34130e4aa8e0a224f36863efe3ae744e74 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 16:54:30 +0000
Subject: [PATCH 0065/3235] Apply new design to highlighted tags and add toggle
 mechanic

---
 res/css/structures/_TagPanel.scss | 24 +++++++++---------------
 src/stores/TagOrderStore.js       |  9 +++++++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index b03d36a592..8efd0796f5 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -68,7 +68,7 @@ limitations under the License.
 }
 .mx_TagPanel .mx_TagPanel_tagTileContainer > div {
     height: 40px;
-    padding: 5px 0 4px 0;
+    padding: 10px 0 9px 0;
 }
 
 .mx_TagPanel .mx_TagTile {
@@ -82,21 +82,15 @@ limitations under the License.
     // opacity: 1;
 }
 
-.mx_TagPanel .mx_TagTile.mx_TagTile_selected .mx_TagTile_avatar .mx_BaseAvatar {
+.mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
+    content: '';
+    height: 56px;
     background-color: $accent-color;
-    border-radius: 40px;
-
-    /* In case this is a "initial" avatar */
-    display: block;
-    height: 40px;
-    width: 40px;
-}
-
-.mx_TagPanel .mx_TagTile_selected .mx_BaseAvatar_image {
-    border: 3px solid $accent-color;
-    height: 40px;
-    width: 40px;
-    box-sizing: border-box;
+    width: 5px;
+    position: absolute;
+    left: -15px;
+    border-radius: 0 2px 2px 0;
+    top: -8px; // (56 - 40)/2
 }
 
 .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 48a8817270..973d27f4e7 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -141,8 +141,13 @@ class TagOrderStore extends Store {
                             newTags = [...this._state.selectedTags, payload.tag];
                         }
                     } else {
-                        // Select individual tag
-                        newTags = [payload.tag];
+                        if (this._state.selectedTags.length === 1 && this._state.selectedTags.includes(payload.tag)) {
+                            // Existing (only) selected tag is being normally clicked again, clear tags
+                            newTags = [];
+                        } else {
+                            // Select individual tag
+                            newTags = [payload.tag];
+                        }
                     }
                     // Only set the anchor tag if the tag was previously unselected, otherwise
                     // the next range starts with an unselected tag.

From a25bc9434390de9ac8a076179fc518ab8e8a4f01 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 17:22:02 +0000
Subject: [PATCH 0066/3235] remove unused, commented line of code

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

diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 7e30c8ca6a..9373ed662e 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -68,7 +68,6 @@ export default class EmojiProvider extends AutocompleteProvider {
         this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
             keys: ['emoji.emoticon', 'shortname'],
             funcs: [
-            //     (o) => `:${o.emoji.shortcodes[0]}:`, // shortname
                 (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases
             ],
             // For matching against ascii equivalents

From 48b166f4511e8e99475295485b091fa65e23f829 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 17:28:32 +0000
Subject: [PATCH 0067/3235] Pass the key backup into the right thing

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

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index f47baa9f4e..f8f782057b 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -122,7 +122,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.setState({
             phase: PHASE_STORING,
             error: null,
-            keyBackupInfo: this.state.backupInfo,
         });
         const cli = MatrixClientPeg.get();
         try {
@@ -143,6 +142,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     }
                 },
                 createSecretStorageKey: async () => this._keyInfo,
+                keyBackupInfo: this.state.backupInfo,
             });
             this.setState({
                 phase: PHASE_DONE,

From 372512b0c4b8fb5ffb6ee676ba3e6d117cfa1234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 19 Dec 2019 17:54:46 +0000
Subject: [PATCH 0068/3235] Translated using Weblate (French)

Currently translated at 100.0% (1998 of 1998 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 96f2337229..f486048d66 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2015,5 +2015,6 @@
     "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Certains utilisateurs dans ce salon chiffré n’ont pas été vérifiés par vous ou n’ont pas vérifié leurs propres appareils.",
     "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.",
     "Language Dropdown": "Sélection de la langue",
-    "Country Dropdown": "Sélection du pays"
+    "Country Dropdown": "Sélection du pays",
+    "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros."
 }

From 822762f01434cfb5dabf92d36e6eef575dd954f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 19:49:36 +0000
Subject: [PATCH 0069/3235] add todo

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

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index f8f782057b..289cb3265b 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -269,7 +269,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _renderPhaseMigrate() {
-        // This is a temporary screen so people who have the labs flag turned on and
+        // TODO: This is a temporary screen so people who have the labs flag turned on and
         // click the button are aware they're making a change to their account.
         // Once we're confident enough in this (and it's supported enough) we can do
         // it automatically.

From b98058fc3c4b30db3795dc555f55a50ff55512bd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Dec 2019 19:54:44 +0000
Subject: [PATCH 0070/3235] Add bug for removing temporary srceen

---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 289cb3265b..25bc8cdfda 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -273,6 +273,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         // click the button are aware they're making a change to their account.
         // Once we're confident enough in this (and it's supported enough) we can do
         // it automatically.
+        // https://github.com/vector-im/riot-web/issues/11696
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(

From b2249d056117cb0c3f1891f476c0547ee5fcbfc3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 20:09:05 +0000
Subject: [PATCH 0071/3235] Initial rejig

---
 res/css/_components.scss                      |  1 -
 res/css/structures/_TagPanel.scss             | 27 ++++++++-
 res/css/structures/_TagPanelButtons.scss      | 56 ------------------
 res/css/views/context_menus/_TopLeftMenu.scss |  4 ++
 res/img/feather-customised/plus.svg           |  4 ++
 src/components/structures/LeftPanel.js        |  1 -
 src/components/structures/TagPanel.js         |  2 +
 src/components/structures/TagPanelButtons.js  | 59 -------------------
 .../views/context_menus/TopLeftMenu.js        | 13 ++++
 .../views/elements/AccessibleTooltipButton.js |  3 +-
 src/components/views/elements/GroupsButton.js | 37 ------------
 src/components/views/elements/TagTile.js      | 18 +-----
 src/i18n/strings/en_EN.json                   |  3 +-
 13 files changed, 56 insertions(+), 172 deletions(-)
 delete mode 100644 res/css/structures/_TagPanelButtons.scss
 create mode 100644 res/img/feather-customised/plus.svg
 delete mode 100644 src/components/structures/TagPanelButtons.js
 delete mode 100644 src/components/views/elements/GroupsButton.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 233c781d7f..20395550ab 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -24,7 +24,6 @@
 @import "./structures/_SearchBox.scss";
 @import "./structures/_TabbedView.scss";
 @import "./structures/_TagPanel.scss";
-@import "./structures/_TagPanelButtons.scss";
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 8efd0796f5..307925335f 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -82,6 +82,31 @@ limitations under the License.
     // opacity: 1;
 }
 
+.mx_TagPanel .mx_TagTile_plus {
+    margin-bottom: 12px;
+    height: 40px;
+    width: 40px;
+    border-radius: 20px;
+    background-color: $button-primary-fg-color;
+    opacity: 0.11;
+    position: relative;
+    /* overwrite mx_RoleButton inline-block */
+    display: block !important;
+
+    &::before {
+        mask-image: url('$(res)/img/feather-customised/plus.svg');
+        mask-position: center;
+        background-color: $tagpanel-bg-color;
+        mask-repeat: no-repeat;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+}
+
 .mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
     content: '';
     height: 56px;
@@ -89,7 +114,7 @@ limitations under the License.
     width: 5px;
     position: absolute;
     left: -15px;
-    border-radius: 0 2px 2px 0;
+    border-radius: 0 3px 3px 0;
     top: -8px; // (56 - 40)/2
 }
 
diff --git a/res/css/structures/_TagPanelButtons.scss b/res/css/structures/_TagPanelButtons.scss
deleted file mode 100644
index 70fea92959..0000000000
--- a/res/css/structures/_TagPanelButtons.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2019 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_TagPanelButtons {
-    background-color: $tagpanel-bg-color;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: space-between;
-    padding: 17px 0 3px 0;
-}
-
-.mx_TagPanelButtons > .mx_GroupsButton::before {
-    mask: url('$(res)/img/feather-customised/users.svg');
-    mask-position: center 11px;
-}
-
-.mx_TagPanelButtons > .mx_TagPanelButtons_report::before {
-    mask: url('$(res)/img/feather-customised/life-buoy.svg');
-    mask-position: center 9px;
-}
-
-.mx_TagPanelButtons > .mx_AccessibleButton {
-    margin-bottom: 12px;
-    height: 40px;
-    width: 40px;
-    border-radius: 20px;
-    background-color: $tagpanel-button-color;
-    position: relative;
-    /* overwrite mx_RoleButton inline-block */
-    display: block !important;
-
-    &::before {
-        background-color: $tagpanel-bg-color;
-        mask-repeat: no-repeat;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss
index d17d683e7e..ed0d0106bc 100644
--- a/res/css/views/context_menus/_TopLeftMenu.scss
+++ b/res/css/views/context_menus/_TopLeftMenu.scss
@@ -53,6 +53,10 @@ limitations under the License.
             mask-image: url('$(res)/img/feather-customised/home.svg');
         }
 
+        .mx_TopLeftMenu_icon_help::after {
+            mask-image: url('$(res)/img/feather-customised/life-buoy.svg');
+        }
+
         .mx_TopLeftMenu_icon_settings::after {
             mask-image: url('$(res)/img/feather-customised/settings.svg');
         }
diff --git a/res/img/feather-customised/plus.svg b/res/img/feather-customised/plus.svg
new file mode 100644
index 0000000000..c747253139
--- /dev/null
+++ b/res/img/feather-customised/plus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 5V19" stroke="#2E2F32" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 12H19" stroke="#2E2F32" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a0ad2b5c81..f733888db9 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -243,7 +243,6 @@ const LeftPanel = createReactClass({
             tagPanelContainer = (<div className="mx_LeftPanel_tagPanelContainer">
                 <TagPanel />
                 { isCustomTagsEnabled ? <CustomRoomTagPanel /> : undefined }
-                <TagPanelButtons />
             </div>);
         }
 
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index a758092dc8..6410af174e 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -104,6 +104,7 @@ const TagPanel = createReactClass({
     render() {
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton');
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
@@ -154,6 +155,7 @@ const TagPanel = createReactClass({
                                 ref={provided.innerRef}
                             >
                                 { tags }
+                                <div><AccessibleTooltipButton title={_t("Communities")} className="mx_TagTile mx_TagTile_plus" /></div>
                                 { provided.placeholder }
                             </div>
                     ) }
diff --git a/src/components/structures/TagPanelButtons.js b/src/components/structures/TagPanelButtons.js
deleted file mode 100644
index 7255e12307..0000000000
--- a/src/components/structures/TagPanelButtons.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2019 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 createReactClass from 'create-react-class';
-import sdk from '../../index';
-import dis from '../../dispatcher';
-import Modal from '../../Modal';
-import { _t } from '../../languageHandler';
-
-const TagPanelButtons = createReactClass({
-    displayName: 'TagPanelButtons',
-
-
-    componentDidMount: function() {
-        this._dispatcherRef = dis.register(this._onAction);
-    },
-
-    componentWillUnmount() {
-        if (this._dispatcherRef) {
-            dis.unregister(this._dispatcherRef);
-            this._dispatcherRef = null;
-        }
-    },
-
-    _onAction(payload) {
-        if (payload.action === "show_redesign_feedback_dialog") {
-            const RedesignFeedbackDialog =
-                sdk.getComponent("views.dialogs.RedesignFeedbackDialog");
-            Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
-        }
-    },
-
-    render() {
-        const GroupsButton = sdk.getComponent('elements.GroupsButton');
-        const ActionButton = sdk.getComponent("elements.ActionButton");
-
-        return (<div className="mx_TagPanelButtons">
-            <GroupsButton />
-            <ActionButton
-                className="mx_TagPanelButtons_report" action="show_redesign_feedback_dialog"
-                label={_t("Report bugs & give feedback")} tooltip={true} />
-        </div>);
-    },
-});
-export default TagPanelButtons;
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index b9aabdc608..db388a657d 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -25,6 +25,7 @@ import SdkConfig from '../../../SdkConfig';
 import { getHostingLink } from '../../../utils/HostingLink';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
+import sdk from "../../../index";
 
 export class TopLeftMenu extends React.Component {
     static propTypes = {
@@ -100,6 +101,12 @@ export class TopLeftMenu extends React.Component {
             );
         }
 
+        const helpItem = (
+            <MenuItem className="mx_TopLeftMenu_icon_help" onClick={this.openHelp}>
+                {_t("Help")}
+            </MenuItem>
+        );
+
         const settingsItem = (
             <MenuItem className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>
                 {_t("Settings")}
@@ -115,11 +122,17 @@ export class TopLeftMenu extends React.Component {
             <ul className="mx_TopLeftMenu_section_withIcon" role="none">
                 {homePageItem}
                 {settingsItem}
+                {helpItem}
                 {signInOutItem}
             </ul>
         </div>;
     }
 
+    openHelp() {
+        const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog");
+        Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
+    }
+
     viewHomePage() {
         dis.dispatch({action: 'view_home_page'});
         this.closeMenu();
diff --git a/src/components/views/elements/AccessibleTooltipButton.js b/src/components/views/elements/AccessibleTooltipButton.js
index c824ea4025..4f2b1f1a96 100644
--- a/src/components/views/elements/AccessibleTooltipButton.js
+++ b/src/components/views/elements/AccessibleTooltipButton.js
@@ -48,7 +48,7 @@ export default class AccessibleTooltipButton extends React.PureComponent {
         const Tooltip = sdk.getComponent("elements.Tooltip");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
-        const {title, ...props} = this.props;
+        const {title, children, ...props} = this.props;
 
         const tip = this.state.hover ? <Tooltip
             className="mx_AccessibleTooltipButton_container"
@@ -57,6 +57,7 @@ export default class AccessibleTooltipButton extends React.PureComponent {
         /> : <div />;
         return (
             <AccessibleButton {...props} onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} aria-label={title}>
+                { children }
                 { tip }
             </AccessibleButton>
         );
diff --git a/src/components/views/elements/GroupsButton.js b/src/components/views/elements/GroupsButton.js
deleted file mode 100644
index 7b15e96424..0000000000
--- a/src/components/views/elements/GroupsButton.js
+++ /dev/null
@@ -1,37 +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.
-*/
-
-import React from 'react';
-import sdk from '../../../index';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-
-const GroupsButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton className="mx_GroupsButton" action="toggle_my_groups"
-            label={_t("Communities")}
-            size={props.size}
-            tooltip={true}
-        />
-    );
-};
-
-GroupsButton.propTypes = {
-    size: PropTypes.string,
-};
-
-export default GroupsButton;
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 767980f0a0..f3dbc5dd21 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -112,12 +112,10 @@ export default createReactClass({
     },
 
     onMouseOver: function() {
-        console.log("DEBUG onMouseOver");
         this.setState({hover: true});
     },
 
     onMouseOut: function() {
-        console.log("DEBUG onMouseOut");
         this.setState({hover: false});
     },
 
@@ -140,7 +138,6 @@ export default createReactClass({
 
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const Tooltip = sdk.getComponent('elements.Tooltip');
         const profile = this.state.profile || {};
         const name = profile.name || this.props.tag;
         const avatarHeight = 40;
@@ -164,9 +161,6 @@ export default createReactClass({
             badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badge.count)}</div>);
         }
 
-        const tip = this.state.hover ?
-            <Tooltip className="mx_TagTile_tooltip" label={name} /> :
-            <div />;
         // FIXME: this ought to use AccessibleButton for a11y but that causes onMouseOut/onMouseOver to fire too much
         const contextButton = this.state.hover || this.state.menuDisplayed ?
             <div className="mx_TagTile_context_button" onClick={this.openMenu} ref={this._contextMenuButton}>
@@ -184,14 +178,9 @@ export default createReactClass({
             );
         }
 
+        const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
         return <React.Fragment>
-            <ContextMenuButton
-                className={className}
-                onClick={this.onClick}
-                onContextMenu={this.openMenu}
-                label={_t("Options")}
-                isExpanded={this.state.menuDisplayed}
-            >
+            <AccessibleTooltipButton className={className} onClick={this.onClick} onContextMenu={this.openMenu} title={name}>
                 <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
                     <BaseAvatar
                         name={name}
@@ -200,11 +189,10 @@ export default createReactClass({
                         width={avatarHeight}
                         height={avatarHeight}
                     />
-                    { tip }
                     { contextButton }
                     { badgeElement }
                 </div>
-            </ContextMenuButton>
+            </AccessibleTooltipButton>
 
             { contextMenu }
         </React.Fragment>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1dbd94f64f..57479bc70e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1259,7 +1259,6 @@
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
     "collapse": "collapse",
     "expand": "expand",
-    "Communities": "Communities",
     "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Rotate Left": "Rotate Left",
@@ -1625,6 +1624,7 @@
     "Hide": "Hide",
     "Home": "Home",
     "Sign in": "Sign in",
+    "Help": "Help",
     "Reload": "Reload",
     "Take picture": "Take picture",
     "Remove for everyone": "Remove for everyone",
@@ -1768,6 +1768,7 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
     "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.": "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": "Error whilst fetching joined communities",
+    "Communities": "Communities",
     "Create a new community": "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.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
     "You have no visible notifications": "You have no visible notifications",

From d9ea9b4ad3c1b59e1872e8123974b839ce6a04fd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 20:53:34 +0000
Subject: [PATCH 0072/3235] Iterate to match design on Zeplin

---
 res/css/structures/_CustomRoomTagPanel.scss   | 16 +++++++--
 res/css/structures/_TagPanel.scss             |  4 +--
 .../structures/CustomRoomTagPanel.js          | 33 ++++---------------
 src/components/structures/TagPanel.js         | 10 ++++--
 .../views/context_menus/TopLeftMenu.js        |  1 +
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
index 45961d7be1..278c7c3d0c 100644
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ b/res/css/structures/_CustomRoomTagPanel.scss
@@ -26,11 +26,15 @@ limitations under the License.
 
 .mx_CustomRoomTagPanel_scroller {
     max-height: inherit;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
 
 .mx_CustomRoomTagPanel .mx_AccessibleButton {
     margin: 9px auto;
     width: 40px;
+    position: relative;
 }
 
 .mx_CustomRoomTagPanel .mx_BaseAvatar_image {
@@ -39,7 +43,13 @@ limitations under the License.
     height: 40px;
 }
 
-.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected .mx_BaseAvatar_image {
-    border: 3px solid $warning-color;
-    border-radius: 40px;
+.mx_CustomRoomTagPanel .mx_AccessibleButton.CustomRoomTagPanel_tileSelected::before {
+    content: '';
+    height: 56px;
+    background-color: $accent-color-alt;
+    width: 5px;
+    position: absolute;
+    left: -15px;
+    border-radius: 0 3px 3px 0;
+    top: -8px; // (56 - 40)/2
 }
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 307925335f..e2eda433ba 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -87,7 +87,7 @@ limitations under the License.
     height: 40px;
     width: 40px;
     border-radius: 20px;
-    background-color: $button-primary-fg-color;
+    background-color: $tagpanel-button-color;
     opacity: 0.11;
     position: relative;
     /* overwrite mx_RoleButton inline-block */
@@ -96,7 +96,7 @@ limitations under the License.
     &::before {
         mask-image: url('$(res)/img/feather-customised/plus.svg');
         mask-position: center;
-        background-color: $tagpanel-bg-color;
+        background-color: $button-primary-fg-color;
         mask-repeat: no-repeat;
         content: '';
         position: absolute;
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index ee69d800ed..f1b548d72f 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -61,30 +61,13 @@ class CustomRoomTagPanel extends React.Component {
 }
 
 class CustomRoomTagTile extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {hover: false};
-        this.onClick = this.onClick.bind(this);
-        this.onMouseOut = this.onMouseOut.bind(this);
-        this.onMouseOver = this.onMouseOver.bind(this);
-    }
-
-    onMouseOver() {
-        this.setState({hover: true});
-    }
-
-    onMouseOut() {
-        this.setState({hover: false});
-    }
-
-    onClick() {
+    onClick = () => {
         dis.dispatch({action: 'select_custom_room_tag', tag: this.props.tag.name});
-    }
+    };
 
     render() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const Tooltip = sdk.getComponent('elements.Tooltip');
+        const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton');
 
         const tag = this.props.tag;
         const avatarHeight = 40;
@@ -102,12 +85,9 @@ class CustomRoomTagTile extends React.Component {
             badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badge.count)}</div>);
         }
 
-        const tip = (this.state.hover ?
-            <Tooltip className="mx_TagTile_tooltip" label={name} /> :
-            <div />);
         return (
-            <AccessibleButton className={className} onClick={this.onClick}>
-                <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
+            <AccessibleTooltipButton className={className} onClick={this.onClick} title={name}>
+                <div className="mx_TagTile_avatar">
                     <BaseAvatar
                         name={tag.avatarLetter}
                         idName={name}
@@ -115,9 +95,8 @@ class CustomRoomTagTile extends React.Component {
                         height={avatarHeight}
                     />
                     { badgeElement }
-                    { tip }
                 </div>
-            </AccessibleButton>
+            </AccessibleTooltipButton>
         );
     }
 }
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6410af174e..0e05dbd785 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -104,7 +104,7 @@ const TagPanel = createReactClass({
     render() {
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton');
+        const ActionButton = sdk.getComponent('elements.ActionButton');
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
@@ -155,7 +155,13 @@ const TagPanel = createReactClass({
                                 ref={provided.innerRef}
                             >
                                 { tags }
-                                <div><AccessibleTooltipButton title={_t("Communities")} className="mx_TagTile mx_TagTile_plus" /></div>
+                                <div>
+                                    <ActionButton
+                                        tooltip
+                                        label={_t("Communities")}
+                                        action="toggle_my_groups"
+                                        className="mx_TagTile mx_TagTile_plus" />
+                                </div>
                                 { provided.placeholder }
                             </div>
                     ) }
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index db388a657d..7a7b124919 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -129,6 +129,7 @@ export class TopLeftMenu extends React.Component {
     }
 
     openHelp() {
+        this.closeMenu();
         const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog");
         Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
     }

From 3a36d61fab829640cb1aed82230d1565cab29c10 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Dec 2019 21:10:22 +0000
Subject: [PATCH 0073/3235] delint

---
 src/components/structures/LeftPanel.js   | 1 -
 src/components/views/elements/TagTile.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index f733888db9..57ba58d6fe 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -24,7 +24,6 @@ import { Key } from '../../Keyboard';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 import VectorConferenceHandler from '../../VectorConferenceHandler';
-import TagPanelButtons from './TagPanelButtons';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index f3dbc5dd21..5464d69609 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -23,14 +23,13 @@ import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import {_t} from '../../../languageHandler';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 
 import FlairStore from '../../../stores/FlairStore';
 import GroupStore from '../../../stores/GroupStore';
 import TagOrderStore from '../../../stores/TagOrderStore';
-import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
+import {ContextMenu, toRightOf} from "../../structures/ContextMenu";
 
 // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents
 // a thing to click on for the user to filter the visible rooms in the RoomList to:

From b998e6ffe88df4936d8c172fdf70d50b8315cff3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Dec 2019 11:31:11 +0000
Subject: [PATCH 0074/3235] Switch to using checkDeviceTrust

In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!

Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
---
 src/components/views/right_panel/UserInfo.js | 32 +++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index da82fb2bdf..0ad2cc4dfb 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -129,17 +129,20 @@ function verifyDevice(userId, device) {
 }
 
 function DeviceItem({userId, device}) {
+    const cli = useContext(MatrixClientContext);
+    const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
+
     const classes = classNames("mx_UserInfo_device", {
-        mx_UserInfo_device_verified: device.isVerified(),
-        mx_UserInfo_device_unverified: !device.isVerified(),
+        mx_UserInfo_device_verified: deviceTrust.isVerified(),
+        mx_UserInfo_device_unverified: !deviceTrust.isVerified(),
     });
     const iconClasses = classNames("mx_E2EIcon", {
-        mx_E2EIcon_verified: device.isVerified(),
-        mx_E2EIcon_warning: !device.isVerified(),
+        mx_E2EIcon_verified: deviceTrust.isVerified(),
+        mx_E2EIcon_warning: !deviceTrust.isVerified(),
     });
 
     const onDeviceClick = () => {
-        if (!device.isVerified()) {
+        if (!deviceTrust.isVerified()) {
             verifyDevice(userId, device);
         }
     };
@@ -147,7 +150,7 @@ function DeviceItem({userId, device}) {
     const deviceName = device.ambiguous ?
             (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" :
             device.getDisplayName();
-    const trustedLabel = device.isVerified() ? _t("Trusted") : _t("Not trusted");
+    const trustedLabel = deviceTrust.isVerified() ? _t("Trusted") : _t("Not trusted");
     return (<AccessibleButton className={classes} onClick={onDeviceClick}>
         <div className={iconClasses} />
         <div className="mx_UserInfo_device_name">{deviceName}</div>
@@ -157,6 +160,7 @@ function DeviceItem({userId, device}) {
 
 function DevicesSection({devices, userId, loading}) {
     const Spinner = sdk.getComponent("elements.Spinner");
+    const cli = useContext(MatrixClientContext);
 
     const [isExpanded, setExpanded] = useState(false);
 
@@ -167,9 +171,21 @@ function DevicesSection({devices, userId, loading}) {
     if (devices === null) {
         return _t("Unable to load device list");
     }
+    const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
 
-    const unverifiedDevices = devices.filter(d => !d.isVerified());
-    const verifiedDevices = devices.filter(d => d.isVerified());
+    const unverifiedDevices = [];
+    const verifiedDevices = [];
+
+    for (let i = 0; i < devices.length; ++i) {
+        const device = devices[i];
+        const deviceTrust = deviceTrusts[i];
+
+        if (deviceTrust.isVerified()) {
+            verifiedDevices.push(device);
+        } else {
+            unverifiedDevices.push(device);
+        }
+    }
 
     let expandButton;
     if (verifiedDevices.length) {

From a928b33f274adf93cfb8b97a826776f4f0b5934e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Dec 2019 16:51:50 +0000
Subject: [PATCH 0075/3235] Don't show the 'verify' button if the user is
 verified

Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
---
 src/components/views/right_panel/UserInfo.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 0ad2cc4dfb..4dd71700ad 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1286,11 +1286,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     const devicesSection = isRoomEncrypted ?
         (<DevicesSection loading={devices === undefined} devices={devices} userId={user.userId} />) : null;
+
+    const userVerified = cli.checkUserTrust(user.userId).isVerified();
+    let verifyButton;
+    if (!userVerified) {
+        verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyDevice(user.userId, null)}>
+            {_t("Verify")}
+        </AccessibleButton>;
+    }
+
     const securitySection = (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>
             <p>{ text }</p>
-            <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyDevice(user.userId, null)}>{_t("Verify")}</AccessibleButton>
+            {verifyButton}
             { devicesSection }
         </div>
     );

From 376bf7e2138c2eb62199211ea37a4915a6505d5c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Dec 2019 16:56:38 +0000
Subject: [PATCH 0076/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 313bc93edd..ec1797cafd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1124,8 +1124,8 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
-    "Security": "Security",
     "Verify": "Verify",
+    "Security": "Security",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From e936f7eb095fc03d53b512d081db8aa37b2a87ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 21 Dec 2019 11:13:37 +0000
Subject: [PATCH 0077/3235] Fix room list filtering weird case sensitivity

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 152ce5105e..2fd4fef5b0 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -589,15 +589,17 @@ module.exports = createReactClass({
 
     _applySearchFilter: function(list, filter) {
         if (filter === "") return list;
-        const fuzzyFilter = utils.removeHiddenChars(filter).toLowerCase();
         const lcFilter = filter.toLowerCase();
+        // apply toLowerCase before and after removeHiddenChars because different rules get applied
+        // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppsercase, e.g 𝚮 -> H
+        const fuzzyFilter = utils.removeHiddenChars(lcFilter).toLowerCase();
         // case insensitive if room name includes filter,
         // or if starts with `#` and one of room's aliases starts with filter
         return list.filter((room) => {
             if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
                 return true;
             }
-            return room.name ? utils.removeHiddenChars(room.name).toLowerCase().includes(fuzzyFilter) : false;
+            return room.name && utils.removeHiddenChars(room.name.toLowerCase()).toLowerCase().includes(fuzzyFilter);
         });
     },
 

From 21dcf65858940dbf6b076b8303442bba1d0b4fee Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 20 Dec 2019 04:49:56 +0000
Subject: [PATCH 0078/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2000 of 2000 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 cea6d8d70d..73af96e7fc 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2015,5 +2015,8 @@
     "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "在此已加密的聊天室中的某些使用者尚未被您驗證，或是他們尚未驗證他們的裝置。",
     "All users in this encrypted room are verified by you and they have verified their own devices.": "在此已加密的聊天室中的所有使用者已被您驗證，他們也已驗證所有裝置。",
     "Language Dropdown": "語言下拉式選單",
-    "Country Dropdown": "國家下拉式選單"
+    "Country Dropdown": "國家下拉式選單",
+    "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同",
+    "Migrate from Key Backup": "從金鑰備份導入"
 }

From 0e7949d73eda08c9ac49ed727c855eb24a165e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 19 Dec 2019 23:06:27 +0000
Subject: [PATCH 0079/3235] Translated using Weblate (French)

Currently translated at 100.0% (2000 of 2000 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 f486048d66..fb233b40d9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2016,5 +2016,7 @@
     "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.",
     "Language Dropdown": "Sélection de la langue",
     "Country Dropdown": "Sélection du pays",
-    "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros."
+    "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés",
+    "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés"
 }

From fef19c510c36ae1346a772c025e175bf97928c7f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 20 Dec 2019 12:54:30 +0000
Subject: [PATCH 0080/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2000 of 2000 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 0faf20937b..fd88250707 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2016,5 +2016,8 @@
     "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Néhány felhasználót még nem ellenőriztél ebben a titkosított szobában vagy még ők nem ellenőrizték az összes eszközüket.",
     "All users in this encrypted room are verified by you and they have verified their own devices.": "Minden felhasználót ellenőriztél ebben a titkosított szobában és ők ellenőrizték az összes eszközüket.",
     "Language Dropdown": "Nyelvválasztó lenyíló menü",
-    "Country Dropdown": "Ország lenyíló menü"
+    "Country Dropdown": "Ország lenyíló menü",
+    "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal",
+    "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből"
 }

From 9a51b418463423a5a23282f9e1f024bf8b981cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 20 Dec 2019 10:05:17 +0000
Subject: [PATCH 0081/3235] Translated using Weblate (Slovak)

Currently translated at 77.8% (1556 of 2000 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 21830a92e0..8befc3c18c 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1561,5 +1561,68 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)",
     "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov",
     "My Ban List": "Môj zoznam zakázať vstúpiť",
-    "Decline (%(counter)s)": "Zamietnuť (%(counter)s)"
+    "Decline (%(counter)s)": "Zamietnuť (%(counter)s)",
+    "The message you are trying to send is too large.": "Správa, ktorú sa usilujete odoslať, je príliš veľká.",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!",
+    "Upload": "Nahrať",
+    "Cross-signing and secret storage are enabled.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko sú aktívne.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Na bezpečnom úložisku vo vašom účte máte uloženú totožnosť podpisovania naprieč zariadeniami, ale v tomto zariadení zatiaľ tejto totožnosti nedôverujete.",
+    "Cross-signing and secret storage are not yet set up.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko zatiaľ nie sú nastavené.",
+    "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko",
+    "Cross-signing public keys:": "Verejné kľúče podpisovania naprieč zariadeniami:",
+    "on device": "na zariadení",
+    "not found": "nenájdené",
+    "Cross-signing private keys:": "Súkromné kľúče podpisovania naprieč zariadeniami:",
+    "in secret storage": "na bezpečnom úložisku",
+    "Secret storage public key:": "Verejný kľúč bezpečného úložiska:",
+    "in account data": "v údajoch účtu",
+    "Connecting to integration manager...": "Pripájanie k integračnému serveru…",
+    "Cannot connect to integration manager": "Nie je možné sa pripojiť k integračnému serveru",
+    "The integration manager is offline or it cannot reach your homeserver.": "Integračný server je offline, alebo nemôže pristupovať k domovskému serveru.",
+    "not stored": "neuložené",
+    "Backup has a <validity>valid</validity> signature from this user": "Záloha je podpísaná <validity>platným</validity> kľúčom od tohoto používateľa",
+    "Backup has a <validity>invalid</validity> signature from this user": "Záloha je podpísaná <validity>neplatným</validity> kľúčom od tohoto používateľa",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Podpis zálohy pochádza od <verify>neznámeho</verify> používateľa ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Podpis zálohy pochádza z <verify>neznámeho</verify> zariadenia ID %(deviceId)s",
+    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Záloha kľúčov je uložená na bezpečnom úložisku, ale funkcia podpisovanie naprieč zariadeniami nie je na tomto zariadení aktívna. Ak chcete zmeniť stav zálohy kľúčov, zapnite podpisovanie naprieč zariadeniami v časti experimenty.",
+    "Backup key stored: ": "Záloha kľúčov uložená: ",
+    "Start using Key Backup with Secure Secret Storage": "Začnite používať zálohu kľúčov na bezpečnom úložisku",
+    "Clear notifications": "Vymazať oznámenia",
+    "Change identity server": "Zmeniť server totožností",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Naozaj si želáte odpojiť od servera totožností <current /> a pripojiť sa namiesto toho k serveru <new />?",
+    "Disconnect identity server": "Odpojiť server totožností",
+    "Disconnect from the identity server <idserver />?": "Naozaj sa chcete odpojiť od servera totožností <idserver />?",
+    "Disconnect": "Odpojiť",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Pred odpojením zo servera totožností <idserver /> by ste mali z neho <b>odstrániť vaše osobné údaje</b>. Žiaľ, server <idserver /> momentálne nie je dostupný a nie je možné sa k nemu pripojiť.",
+    "You should:": "Mali by ste:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Skontrolovať rozšírenia inštalované vo webovom prehliadači, ktoré by mohli blokovať prístup k serveru totožností (napr. rozšírenie Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "Kontaktovať správcu servera totožností <idserver />",
+    "wait and try again later": "Počkať a skúsiť znovu neskôr",
+    "Disconnect anyway": "Napriek tomu sa odpojiť",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "na servery <idserver /> <b>máte stále uložené vaše osobné údaje</b>.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Odporúčame, aby ste ešte pred odpojením sa zo servera totožností odstránili vašu emailovú adresu a telefónne číslo.",
+    "Identity Server (%(server)s)": "Server totožností (%(server)s)",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ak nechcete na vyhľadávanie kontaktov a možnosť byť nájdení používať <server />, zadajte adresu servera totožností nižšie.",
+    "Identity Server": "Server totožností",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Momentálne nepoužívate žiaden server totožností. Ak chcete vyhľadávať kontakty a zároveň umožniť ostatným vašim kontaktom, aby mohli nájsť vás, nastavte si server totožností nižšie.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ak sa odpojíte od servera totožností, vaše kontakty vás nebudú môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy a telefónneho čísla.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Používanie servera totožností je voliteľné. Ak sa rozhodnete, že nebudete používať server totožností, nebudú vás vaši známi môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy alebo telefónneho čísla.",
+    "Do not use an identity server": "Nepoužívať server totožností",
+    "Enter a new identity server": "Zadať nový server totožností",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použiť integračný server <b>(%(serverName)s)</b> na správu botov, widgetov a balíčkov s nálepkami.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.",
+    "Manage integrations": "Spravovať integrácie",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlas s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
+    "Discovery": "Objaviť",
+    "Deactivate account": "Deaktivovať účet",
+    "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Prispôsobte si zážitok s používania  aktivovaním experimentálnych vlastností. <a>Zistiť viac</a>.",
+    "Ignored/Blocked": "Ignorovaní / Blokovaní",
+    "Error adding ignored user/server": "Chyba pri pridávaní ignorovaného používateľa / servera",
+    "Something went wrong. Please try again or view your console for hints.": "Niečo sa nepodarilo. Prosím, skúste znovu neskôr alebo si prečítajte ďalšie usmernenia zobrazením konzoly.",
+    "Error subscribing to list": "Chyba pri prihlasovaní sa do zoznamu",
+    "Please verify the room ID or alias and try again.": "Prosím, overte platnosť ID miestnosti alebo alias a skúste znovu.\nPlease verify the room ID or alias and try again.",
+    "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera"
 }

From 3dcef53b930833b1e945df7e50054479becafeb9 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 20 Dec 2019 21:13:53 +0000
Subject: [PATCH 0082/3235] Translated using Weblate (Turkish)

Currently translated at 33.8% (677 of 2000 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 2462b5789f..da177ae68c 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -589,5 +589,95 @@
     "The platform you're on": "Bulunduğun platform",
     "The version of Riot.im": "Riot.im'in sürümü",
     "Your language of choice": "Seçtiginiz diliniz",
-    "Which officially provided instance you are using, if any": ""
+    "Which officially provided instance you are using, if any": "",
+    "Add Email Address": "E-posta Adresi Ekle",
+    "Add Phone Number": "Telefon Numarası Ekle",
+    "Your identity server's URL": "Kimlik sunucunuzun linki",
+    "e.g. %(exampleValue)s": "örn.%(exampleValue)s",
+    "Every page you use in the app": "uygulamadaki kullandığınız tüm sayfalar",
+    "e.g. <CurrentPageURL>": "örn. <CurrentPageURL>",
+    "Your User Agent": "Kullanıcı Ajanınız",
+    "Your device resolution": "Cihazınızın çözünürlüğü",
+    "Call Failed": "Arama Başarısız",
+    "Review Devices": "Cihazları Gözden Geçir",
+    "Call Anyway": "Yinede Ara",
+    "Answer Anyway": "Yinede Cevapla",
+    "Call": "Ara",
+    "Answer": "Cevap",
+    "Call failed due to misconfigured server": "Hatalı yapılandırılmış sunucu nedeniyle arama başarısız",
+    "Call in Progress": "Arama Yapılıyor",
+    "A call is already in progress!": "Zaten bir arama devam etmekte!",
+    "Permission Required": "İzin Gerekli",
+    "Replying With Files": "Dosyalarla Cevaplanıyor",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s%(monthName)s%(day)s%(fullYear)s",
+    "Invite new community members": "Yeni topluluk üyelerini davet et",
+    "Name or Matrix ID": "İsim yada Matrix ID",
+    "Invite to Community": "Topluluğa Davet",
+    "Add rooms to the community": "Topluluğa odalar ekle",
+    "Add to community": "Topluluğa ekle",
+    "Failed to invite the following users to %(groupId)s:": "%(groupId)s grubuna belirtilen kullanıcıların davet işlemi başarısız oldu:",
+    "Failed to invite users to community": "Kullanıcıların topluluğa daveti başarısız",
+    "Identity server has no terms of service": "Kimlik sunucusu hizmet kurallarına sahip değil",
+    "Only continue if you trust the owner of the server.": "Sadece sunucunun sahibine güveniyorsanız devam edin.",
+    "Trust": "Güven",
+    "Unable to load! Check your network connectivity and try again.": "Yüklenemiyor! Ağ bağlantınızı kontrol edin ve yeniden deneyin.",
+    "Registration Required": "Kayıt Zorunlu",
+    "You need to register to do this. Would you like to register now?": "Bunu yapabilmek için kayıt olmalısınız. Şimdi kayıt olmak ister misiniz?",
+    "Restricted": "Sınırlı",
+    "Email, name or Matrix ID": "E-posta, isim yada Matrix ID",
+    "Failed to start chat": "Sohbet başlatma başarısız",
+    "Failed to invite users to the room:": "Kullanıcıların odaya daveti başarısız oldu:",
+    "Missing roomId.": "roomId eksik.",
+    "You are not in this room.": "Bu odada değilsin.",
+    "You do not have permission to do that in this room.": "Bu odada bunu yapma yetkiniz yok.",
+    "Messages": "Mesajlar",
+    "Actions": "Eylemler",
+    "Other": "Diğer",
+    "Upgrades a room to a new version": "Odayı yeni bir sürüme yükseltir",
+    "You do not have the required permissions to use this command.": "Bu komutu kullanmak için gerekli izinlere sahip değilsin.",
+    "Error upgrading room": "Oda güncellenirken hata",
+    "Changes your avatar in all rooms": "Tüm odalardaki avatarlarını değiştirir",
+    "This room has no topic.": "Bu odanın başlığı yok.",
+    "Sets the room name": "Oda adını düzenler",
+    "Use an identity server": "Bir kimlik sunucusu kullan",
+    "Define the power level of a user": "Bir kullanıcının güç düzeyini tanımla",
+    "Opens the Developer Tools dialog": "Geliştirici Araçları kutucuğunu açar",
+    "%(senderDisplayName)s upgraded this room.": "Odayı güncelleyen %(senderDisplayName)s.",
+    "%(senderDisplayName)s made the room invite only.": "Odayı sadece davetle yapan %(senderDisplayName)s.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "Odaya misafirlerin girişini engelleyen %(senderDisplayName)s.",
+    "%(senderName)s removed the main address for this room.": "Bu oda için ana adresi silen %(senderName)s.",
+    "Light theme": "Açık tema",
+    "Dark theme": "Koyu tema",
+    "%(displayName)s is typing …": "%(displayName)s yazıyor…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…",
+    "Cannot reach homeserver": "Ana sunucuya erişilemiyor",
+    "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış",
+    "Cannot reach identity server": "Kimlik sunucu erişilemiyor",
+    "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş",
+    "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata",
+    "Unexpected error resolving identity server configuration": "Kimlik sunucu yapılandırması çözümlenirken beklenmeyen hata",
+    "The message you are trying to send is too large.": "Göndermeye çalıştığın mesaj çok büyük.",
+    "This homeserver has hit its Monthly Active User limit.": "Bu ana sunucu Aylık Aktif Kullanıcı limitine ulaştı.",
+    "Riot URL": "Riot Linki",
+    "Room ID": "Oda ID",
+    "More options": "Daha fazla seçenek",
+    "Join": "Katıl",
+    "Yes": "Evet",
+    "No": "Hayır",
+    "expand": "genişlet",
+    "Communities": "Topluluklar",
+    "Rotate Left": "Sola Döndür",
+    "Rotate Right": "Sağa Döndür",
+    "Rotate clockwise": "Saat yönünde döndür",
+    "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s kez katıldı",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s katıldı",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s kez katıldı",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s katıldı",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s kullanıcı ayrıldı",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ayrıldı",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s katıldı ve ayrıldı",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s katıldı ve ayrıldı",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı"
 }

From 24a1017d6d246e388d23910630edb89f1164248f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 21 Dec 2019 20:26:32 +0000
Subject: [PATCH 0083/3235] Fix typo in comment

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 2fd4fef5b0..cb88861509 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -591,7 +591,7 @@ module.exports = createReactClass({
         if (filter === "") return list;
         const lcFilter = filter.toLowerCase();
         // apply toLowerCase before and after removeHiddenChars because different rules get applied
-        // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppsercase, e.g 𝚮 -> H
+        // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppercase, e.g 𝚮 -> H
         const fuzzyFilter = utils.removeHiddenChars(lcFilter).toLowerCase();
         // case insensitive if room name includes filter,
         // or if starts with `#` and one of room's aliases starts with filter

From e7928e8def9d80b9df06aec87433cb77acd15e68 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 22 Dec 2019 20:56:19 -0700
Subject: [PATCH 0084/3235] Use `flex-start` instead of `start` for postcss

This is just something the loaders complain about - apparently `start` is old and we should feel bad.
---
 res/css/views/context_menus/_StatusMessageContextMenu.scss      | 2 +-
 res/css/views/dialogs/_CreateRoomDialog.scss                    | 2 +-
 res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss     | 2 +-
 .../views/dialogs/secretstorage/_CreateSecretStorageDialog.scss | 2 +-
 res/css/views/rooms/_MemberDeviceInfo.scss                      | 2 +-
 res/css/views/rooms/_MessageComposer.scss                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index 972f608caf..2c8d608950 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -61,5 +61,5 @@ input.mx_StatusMessageContextMenu_message {
 }
 
 .mx_StatusMessageContextMenu_actionContainer .mx_Spinner {
-    justify-content: start;
+    justify-content: flex-start;
 }
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index d3a8f6ff42..7416ec2ef4 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -30,7 +30,7 @@ limitations under the License.
 
     > div {
         display: flex;
-        align-items: start;
+        align-items: flex-start;
         margin: 5px 0;
 
         input[type=checkbox] {
diff --git a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
index 7ba5f01a76..04ee575867 100644
--- a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
@@ -32,7 +32,7 @@ limitations under the License.
 
 .mx_CreateKeyBackupDialog_passPhraseContainer {
     display: flex;
-    align-items: start;
+    align-items: flex-start;
 }
 
 .mx_CreateKeyBackupDialog_passPhraseHelp {
diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index 757d8028f0..5899abdf73 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -33,7 +33,7 @@ limitations under the License.
 
 .mx_CreateSecretStorageDialog_passPhraseContainer {
     display: flex;
-    align-items: start;
+    align-items: flex-start;
 }
 
 .mx_CreateSecretStorageDialog_passPhraseHelp {
diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss
index e73e6c58f1..15b4832dc5 100644
--- a/res/css/views/rooms/_MemberDeviceInfo.scss
+++ b/res/css/views/rooms/_MemberDeviceInfo.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_MemberDeviceInfo {
     display: flex;
     padding-bottom: 10px;
-    align-items: start;
+    align-items: flex-start;
 }
 
 .mx_MemberDeviceInfo_icon {
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 12e45a07c9..5efca51844 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -101,7 +101,7 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     min-height: 60px;
-    justify-content: start;
+    justify-content: flex-start;
     align-items: flex-start;
     font-size: 14px;
     margin-right: 6px;

From 0b0fe92b1767771b1666c0c4e6fdd5a58b534be0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 17 Dec 2019 12:51:09 -0700
Subject: [PATCH 0085/3235] Convert resizer to ES6

---
 src/resizer/index.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/resizer/index.js b/src/resizer/index.js
index bc4c8f388c..7c4b2bd493 100644
--- a/src/resizer/index.js
+++ b/src/resizer/index.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,14 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import FixedDistributor from "./distributors/fixed";
-import CollapseDistributor from "./distributors/collapse";
-import RoomSubListDistributor from "./distributors/roomsublist";
-import Resizer from "./resizer";
-
-module.exports = {
-    Resizer,
-    FixedDistributor,
-    CollapseDistributor,
-    RoomSubListDistributor,
-};
+export FixedDistributor from "./distributors/fixed";
+export CollapseDistributor from "./distributors/collapse";
+export RoomSubListDistributor from "./distributors/roomsublist";
+export Resizer from "./resizer";

From 344dac4fb984f42e9881f5d6267e1448fe3e319e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 17:45:24 -0700
Subject: [PATCH 0086/3235] Convert CommonJS exports to ES6-compatible exports

We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
---
 src/Analytics.js                              |   2 +-
 src/Avatar.js                                 | 204 +++++++++---------
 src/CallHandler.js                            |   2 +-
 src/Entities.js                               |  59 +++--
 src/ImageUtils.js                             |  71 +++---
 src/Notifier.js                               |   2 +-
 src/PasswordReset.js                          |   3 +-
 src/PlatformPeg.js                            |   2 +-
 src/Presence.js                               |   3 +-
 src/RoomListSorter.js                         |   6 +-
 src/ScalarMessaging.js                        |  49 +++--
 src/Skinner.js                                |   2 +-
 src/TextForEvent.js                           |  12 +-
 src/Unread.js                                 | 140 ++++++------
 src/WhoIsTyping.js                            | 108 +++++-----
 .../views/dialogs/EncryptedEventDialog.js     |   2 +-
 .../structures/CompatibilityPage.js           |   3 +-
 src/components/structures/FilePanel.js        |   3 +-
 src/components/structures/LeftPanel.js        |   2 +-
 .../structures/NotificationPanel.js           |   3 +-
 src/components/structures/RoomDirectory.js    |   2 +-
 src/components/structures/RoomStatusBar.js    |   3 +-
 src/components/structures/RoomView.js         |   2 +-
 src/components/structures/ScrollPanel.js      |   2 +-
 src/components/structures/SearchBox.js        |   2 +-
 src/components/structures/TimelinePanel.js    |   2 +-
 src/components/structures/UploadBar.js        |   3 +-
 src/components/structures/ViewSource.js       |   3 +-
 .../structures/auth/ForgotPassword.js         |   2 +-
 src/components/structures/auth/Login.js       |   2 +-
 .../structures/auth/PostRegistration.js       |   2 +-
 .../structures/auth/Registration.js           |   2 +-
 src/components/views/auth/AuthFooter.js       |   3 +-
 src/components/views/auth/AuthHeader.js       |   2 +-
 src/components/views/auth/CaptchaForm.js      |   2 +-
 .../views/auth/CustomServerDialog.js          |   2 +-
 src/components/views/auth/RegistrationForm.js |   2 +-
 src/components/views/avatars/BaseAvatar.js    |   3 +-
 src/components/views/avatars/MemberAvatar.js  |   3 +-
 src/components/views/avatars/RoomAvatar.js    |   2 +-
 .../views/context_menus/MessageContextMenu.js |   2 +-
 .../context_menus/RoomTileContextMenu.js      |   2 +-
 .../views/create_room/CreateRoomButton.js     |   3 +-
 src/components/views/create_room/Presets.js   |   3 +-
 src/components/views/create_room/RoomAlias.js |   3 +-
 .../views/dialogs/AddressPickerDialog.js      |   2 +-
 .../views/elements/DialogButtons.js           |   3 +-
 src/components/views/elements/EditableText.js |   2 +-
 .../views/elements/InlineSpinner.js           |   2 +-
 .../views/elements/MemberEventListSummary.js  |   2 +-
 .../views/elements/MessageSpinner.js          |   2 +-
 .../views/elements/PersistentApp.js           |   3 +-
 .../views/elements/PowerSelector.js           |   2 +-
 src/components/views/elements/ProgressBar.js  |   3 +-
 src/components/views/elements/SettingsFlag.js |   3 +-
 src/components/views/elements/Spinner.js      |   3 +-
 src/components/views/elements/TintableSvg.js  |   3 +-
 src/components/views/elements/Tooltip.js      |   3 +-
 .../views/elements/TooltipButton.js           |   2 +-
 .../views/elements/TruncatedList.js           |   2 +-
 src/components/views/elements/UserSelector.js |   3 +-
 src/components/views/globals/MatrixToolbar.js |   2 +-
 .../views/groups/GroupMemberInfo.js           |   3 +-
 src/components/views/groups/GroupRoomInfo.js  |   3 +-
 src/components/views/messages/MFileBody.js    |   2 +-
 src/components/views/messages/MVideoBody.js   |   3 +-
 src/components/views/messages/MessageEvent.js |   2 +-
 .../views/messages/RoomAvatarEvent.js         |   3 +-
 src/components/views/messages/RoomCreate.js   |   3 +-
 src/components/views/messages/TextualBody.js  |   2 +-
 src/components/views/messages/TextualEvent.js |   3 +-
 src/components/views/messages/UnknownBody.js  |   2 +-
 .../views/room_settings/ColorSettings.js      |   2 +-
 .../views/room_settings/UrlPreviewSettings.js |   5 +-
 src/components/views/rooms/AppsDrawer.js      |   2 +-
 src/components/views/rooms/AuxPanel.js        |   2 +-
 src/components/views/rooms/EventTile.js       |   2 +-
 src/components/views/rooms/ForwardMessage.js  |   2 +-
 .../views/rooms/LinkPreviewWidget.js          |   3 +-
 src/components/views/rooms/MemberInfo.js      |   2 +-
 src/components/views/rooms/MemberList.js      |   2 +-
 src/components/views/rooms/MemberTile.js      |   3 +-
 src/components/views/rooms/PinnedEventTile.js |   2 +-
 .../views/rooms/PinnedEventsPanel.js          |   3 +-
 src/components/views/rooms/PresenceLabel.js   |   2 +-
 .../views/rooms/ReadReceiptMarker.js          |   3 +-
 src/components/views/rooms/RoomDropTarget.js  |   3 +-
 src/components/views/rooms/RoomHeader.js      |   3 +-
 src/components/views/rooms/RoomList.js        |   2 +-
 src/components/views/rooms/RoomNameEditor.js  |   2 +-
 src/components/views/rooms/RoomPreviewBar.js  |   2 +-
 src/components/views/rooms/RoomTile.js        |   2 +-
 src/components/views/rooms/RoomTopicEditor.js |   2 +-
 .../views/rooms/RoomUpgradeWarningBar.js      |   2 +-
 src/components/views/rooms/SearchBar.js       |   2 +-
 .../views/rooms/SearchResultTile.js           |   3 +-
 .../views/rooms/SearchableEntityList.js       |   3 +-
 .../views/rooms/TopUnreadMessagesBar.js       |   2 +-
 src/components/views/rooms/UserTile.js        |   3 +-
 src/components/views/rooms/WhoIsTypingTile.js |   2 +-
 src/components/views/settings/ChangeAvatar.js |   2 +-
 .../views/settings/ChangeDisplayName.js       |   3 +-
 .../views/settings/ChangePassword.js          |   2 +-
 .../settings/EnableNotificationsButton.js     |   2 +-
 .../views/settings/Notifications.js           |   2 +-
 src/components/views/voip/CallPreview.js      |   3 +-
 src/components/views/voip/CallView.js         |   3 +-
 src/components/views/voip/IncomingCallBox.js  |   3 +-
 src/components/views/voip/VideoFeed.js        |   3 +-
 src/components/views/voip/VideoView.js        |   3 +-
 src/createRoom.js                             |   4 +-
 src/dispatcher.js                             |   2 +-
 src/email.js                                  |   8 +-
 src/extend.js                                 |   4 +-
 src/indexing/EventIndexPeg.js                 |   2 +-
 src/notifications/ContentRules.js             |  15 +-
 src/notifications/NotificationUtils.js        |  13 +-
 src/notifications/PushRuleVectorState.js      |  55 +++--
 src/notifications/StandardActions.js          |  21 +-
 .../VectorPushRulesDefinitions.js             |  14 +-
 src/notifications/index.js                    |  11 +-
 src/rageshake/rageshake.js                    | 136 ++++++------
 src/rageshake/submit-rageshake.js             |   2 +-
 src/stores/GroupStore.js                      |   2 +-
 src/stores/LifecycleStore.js                  |   3 +-
 src/stores/MessageComposerStore.js            |   3 +-
 src/stores/RoomViewStore.js                   |   3 +-
 src/stores/SessionStore.js                    |   3 +-
 src/stores/WidgetEchoStore.js                 |   3 +-
 test/components/stub-component.js             |   2 +-
 test/end-to-end-tests/src/logbuffer.js        |   3 +-
 test/end-to-end-tests/src/logger.js           |   3 +-
 test/end-to-end-tests/src/rest/creator.js     |   3 +-
 test/end-to-end-tests/src/rest/multi.js       |   3 +-
 test/end-to-end-tests/src/rest/room.js        |   3 +-
 test/end-to-end-tests/src/rest/session.js     |   2 +-
 .../src/scenarios/directory.js                |   3 +-
 .../src/scenarios/e2e-encryption.js           |   3 +-
 .../src/scenarios/lazy-loading.js             |   3 +-
 test/end-to-end-tests/src/session.js          |   3 +-
 .../src/usecases/accept-invite.js             |   3 +-
 .../src/usecases/create-room.js               |   7 +-
 test/end-to-end-tests/src/usecases/dialog.js  |  13 +-
 test/end-to-end-tests/src/usecases/invite.js  |   3 +-
 test/end-to-end-tests/src/usecases/join.js    |   3 +-
 .../src/usecases/room-settings.js             |   3 +-
 test/end-to-end-tests/src/usecases/signup.js  |   3 +-
 147 files changed, 649 insertions(+), 620 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 3e208ad6bd..3d28a236b0 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -306,4 +306,4 @@ class Analytics {
 if (!global.mxAnalytics) {
     global.mxAnalytics = new Analytics();
 }
-module.exports = global.mxAnalytics;
+export default global.mxAnalytics;
diff --git a/src/Avatar.js b/src/Avatar.js
index 17860698cb..3377849eca 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -19,116 +19,114 @@ import {ContentRepo} from 'matrix-js-sdk';
 import MatrixClientPeg from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
 
-module.exports = {
-    avatarUrlForMember: function(member, width, height, resizeMethod) {
-        let url = member.getAvatarUrl(
-            MatrixClientPeg.get().getHomeserverUrl(),
-            Math.floor(width * window.devicePixelRatio),
-            Math.floor(height * window.devicePixelRatio),
-            resizeMethod,
-            false,
-            false,
-        );
-        if (!url) {
-            // member can be null here currently since on invites, the JS SDK
-            // does not have enough info to build a RoomMember object for
-            // the inviter.
-            url = this.defaultAvatarUrlForString(member ? member.userId : '');
+export function avatarUrlForMember(member, width, height, resizeMethod) {
+    let url = member.getAvatarUrl(
+        MatrixClientPeg.get().getHomeserverUrl(),
+        Math.floor(width * window.devicePixelRatio),
+        Math.floor(height * window.devicePixelRatio),
+        resizeMethod,
+        false,
+        false,
+    );
+    if (!url) {
+        // member can be null here currently since on invites, the JS SDK
+        // does not have enough info to build a RoomMember object for
+        // the inviter.
+        url = this.defaultAvatarUrlForString(member ? member.userId : '');
+    }
+    return url;
+}
+
+export function avatarUrlForUser(user, width, height, resizeMethod) {
+    const url = ContentRepo.getHttpUriForMxc(
+        MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
+        Math.floor(width * window.devicePixelRatio),
+        Math.floor(height * window.devicePixelRatio),
+        resizeMethod,
+    );
+    if (!url || url.length === 0) {
+        return null;
+    }
+    return url;
+}
+
+export function defaultAvatarUrlForString(s) {
+    const images = ['03b381', '368bd6', 'ac3ba8'];
+    let total = 0;
+    for (let i = 0; i < s.length; ++i) {
+        total += s.charCodeAt(i);
+    }
+    return require('../res/img/' + images[total % images.length] + '.png');
+}
+
+/**
+ * returns the first (non-sigil) character of 'name',
+ * converted to uppercase
+ * @param {string} name
+ * @return {string} the first letter
+ */
+export function getInitialLetter(name) {
+    if (!name) {
+        // XXX: We should find out what causes the name to sometimes be falsy.
+        console.trace("`name` argument to `getInitialLetter` not supplied");
+        return undefined;
+    }
+    if (name.length < 1) {
+        return undefined;
+    }
+
+    let idx = 0;
+    const initial = name[0];
+    if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
+        idx++;
+    }
+
+    // string.codePointAt(0) would do this, but that isn't supported by
+    // some browsers (notably PhantomJS).
+    let chars = 1;
+    const first = name.charCodeAt(idx);
+
+    // check if it’s the start of a surrogate pair
+    if (first >= 0xD800 && first <= 0xDBFF && name[idx+1]) {
+        const second = name.charCodeAt(idx+1);
+        if (second >= 0xDC00 && second <= 0xDFFF) {
+            chars++;
         }
-        return url;
-    },
+    }
 
-    avatarUrlForUser: function(user, width, height, resizeMethod) {
-        const url = ContentRepo.getHttpUriForMxc(
-            MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
-            Math.floor(width * window.devicePixelRatio),
-            Math.floor(height * window.devicePixelRatio),
-            resizeMethod,
-        );
-        if (!url || url.length === 0) {
-            return null;
-        }
-        return url;
-    },
+    const firstChar = name.substring(idx, idx+chars);
+    return firstChar.toUpperCase();
+}
 
-    defaultAvatarUrlForString: function(s) {
-        const images = ['03b381', '368bd6', 'ac3ba8'];
-        let total = 0;
-        for (let i = 0; i < s.length; ++i) {
-            total += s.charCodeAt(i);
-        }
-        return require('../res/img/' + images[total % images.length] + '.png');
-    },
+export function avatarUrlForRoom(room, width, height, resizeMethod) {
+    const explicitRoomAvatar = room.getAvatarUrl(
+        MatrixClientPeg.get().getHomeserverUrl(),
+        width,
+        height,
+        resizeMethod,
+        false,
+    );
+    if (explicitRoomAvatar) {
+        return explicitRoomAvatar;
+    }
 
-    /**
-     * returns the first (non-sigil) character of 'name',
-     * converted to uppercase
-     * @param {string} name
-     * @return {string} the first letter
-     */
-    getInitialLetter(name) {
-        if (!name) {
-            // XXX: We should find out what causes the name to sometimes be falsy.
-            console.trace("`name` argument to `getInitialLetter` not supplied");
-            return undefined;
-        }
-        if (name.length < 1) {
-            return undefined;
-        }
-
-        let idx = 0;
-        const initial = name[0];
-        if ((initial === '@' || initial === '#' || initial === '+') && name[1]) {
-            idx++;
-        }
-
-        // string.codePointAt(0) would do this, but that isn't supported by
-        // some browsers (notably PhantomJS).
-        let chars = 1;
-        const first = name.charCodeAt(idx);
-
-        // check if it’s the start of a surrogate pair
-        if (first >= 0xD800 && first <= 0xDBFF && name[idx+1]) {
-            const second = name.charCodeAt(idx+1);
-            if (second >= 0xDC00 && second <= 0xDFFF) {
-                chars++;
-            }
-        }
-
-        const firstChar = name.substring(idx, idx+chars);
-        return firstChar.toUpperCase();
-    },
-
-    avatarUrlForRoom(room, width, height, resizeMethod) {
-        const explicitRoomAvatar = room.getAvatarUrl(
+    let otherMember = null;
+    const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+    if (otherUserId) {
+        otherMember = room.getMember(otherUserId);
+    } else {
+        // if the room is not marked as a 1:1, but only has max 2 members
+        // then still try to show any avatar (pref. other member)
+        otherMember = room.getAvatarFallbackMember();
+    }
+    if (otherMember) {
+        return otherMember.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
             width,
             height,
             resizeMethod,
             false,
         );
-        if (explicitRoomAvatar) {
-            return explicitRoomAvatar;
-        }
-
-        let otherMember = null;
-        const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
-        if (otherUserId) {
-            otherMember = room.getMember(otherUserId);
-        } else {
-            // if the room is not marked as a 1:1, but only has max 2 members
-            // then still try to show any avatar (pref. other member)
-            otherMember = room.getAvatarFallbackMember();
-        }
-        if (otherMember) {
-            return otherMember.getAvatarUrl(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                width,
-                height,
-                resizeMethod,
-                false,
-            );
-        }
-        return null;
-    },
-};
+    }
+    return null;
+}
diff --git a/src/CallHandler.js b/src/CallHandler.js
index ecbf6c2c12..eb5a5c1c8e 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -583,4 +583,4 @@ if (global.mxCallHandler === undefined) {
     global.mxCallHandler = callHandler;
 }
 
-module.exports = global.mxCallHandler;
+export default global.mxCallHandler;
diff --git a/src/Entities.js b/src/Entities.js
index 8be1da0db8..0906bef5de 100644
--- a/src/Entities.js
+++ b/src/Entities.js
@@ -105,36 +105,33 @@ class UserEntity extends Entity {
     }
 }
 
+export function newEntity(jsx, matchFn) {
+    const entity = new Entity();
+    entity.getJsx = function() {
+        return jsx;
+    };
+    entity.matches = matchFn;
+    return entity;
+}
 
-module.exports = {
-    newEntity: function(jsx, matchFn) {
-        const entity = new Entity();
-        entity.getJsx = function() {
-            return jsx;
-        };
-        entity.matches = matchFn;
-        return entity;
-    },
+/**
+ * @param {RoomMember[]} members
+ * @return {Entity[]}
+ */
+export function fromRoomMembers(members) {
+    return members.map(function(m) {
+        return new MemberEntity(m);
+    });
+}
 
-    /**
-     * @param {RoomMember[]} members
-     * @return {Entity[]}
-     */
-    fromRoomMembers: function(members) {
-        return members.map(function(m) {
-            return new MemberEntity(m);
-        });
-    },
-
-    /**
-     * @param {User[]} users
-     * @param {boolean} showInviteButton
-     * @param {Function} inviteFn Called with the user ID.
-     * @return {Entity[]}
-     */
-    fromUsers: function(users, showInviteButton, inviteFn) {
-        return users.map(function(u) {
-            return new UserEntity(u, showInviteButton, inviteFn);
-        });
-    },
-};
+/**
+ * @param {User[]} users
+ * @param {boolean} showInviteButton
+ * @param {Function} inviteFn Called with the user ID.
+ * @return {Entity[]}
+ */
+export function fromUsers(users, showInviteButton, inviteFn) {
+    return users.map(function(u) {
+        return new UserEntity(u, showInviteButton, inviteFn);
+    });
+}
diff --git a/src/ImageUtils.js b/src/ImageUtils.js
index a83d94a633..c0f7b94b81 100644
--- a/src/ImageUtils.js
+++ b/src/ImageUtils.js
@@ -16,41 +16,38 @@ limitations under the License.
 
 'use strict';
 
-module.exports = {
-
-    /**
-     * Returns the actual height that an image of dimensions (fullWidth, fullHeight)
-     * will occupy if resized to fit inside a thumbnail bounding box of size
-     * (thumbWidth, thumbHeight).
-     *
-     * If the aspect ratio of the source image is taller than the aspect ratio of
-     * the thumbnail bounding box, then we return the thumbHeight parameter unchanged.
-     * Otherwise we return the thumbHeight parameter scaled down appropriately to
-     * reflect the actual height the scaled thumbnail occupies.
-     *
-     * This is very useful for calculating how much height a thumbnail will actually
-     * consume in the timeline, when performing scroll offset calcuations
-     * (e.g. scroll locking)
-     */
-    thumbHeight: function(fullWidth, fullHeight, thumbWidth, thumbHeight) {
-        if (!fullWidth || !fullHeight) {
-            // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
-            // log this because it's spammy
-            return undefined;
-        }
-        if (fullWidth < thumbWidth && fullHeight < thumbHeight) {
-            // no scaling needs to be applied
-            return fullHeight;
-        }
-        const widthMulti = thumbWidth / fullWidth;
-        const heightMulti = thumbHeight / fullHeight;
-        if (widthMulti < heightMulti) {
-            // width is the dominant dimension so scaling will be fixed on that
-            return Math.floor(widthMulti * fullHeight);
-        } else {
-            // height is the dominant dimension so scaling will be fixed on that
-            return Math.floor(heightMulti * fullHeight);
-        }
-    },
-};
+/**
+ * Returns the actual height that an image of dimensions (fullWidth, fullHeight)
+ * will occupy if resized to fit inside a thumbnail bounding box of size
+ * (thumbWidth, thumbHeight).
+ *
+ * If the aspect ratio of the source image is taller than the aspect ratio of
+ * the thumbnail bounding box, then we return the thumbHeight parameter unchanged.
+ * Otherwise we return the thumbHeight parameter scaled down appropriately to
+ * reflect the actual height the scaled thumbnail occupies.
+ *
+ * This is very useful for calculating how much height a thumbnail will actually
+ * consume in the timeline, when performing scroll offset calcuations
+ * (e.g. scroll locking)
+ */
+export function thumbHeight(fullWidth, fullHeight, thumbWidth, thumbHeight) {
+    if (!fullWidth || !fullHeight) {
+        // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
+        // log this because it's spammy
+        return undefined;
+    }
+    if (fullWidth < thumbWidth && fullHeight < thumbHeight) {
+        // no scaling needs to be applied
+        return fullHeight;
+    }
+    const widthMulti = thumbWidth / fullWidth;
+    const heightMulti = thumbHeight / fullHeight;
+    if (widthMulti < heightMulti) {
+        // width is the dominant dimension so scaling will be fixed on that
+        return Math.floor(widthMulti * fullHeight);
+    } else {
+        // height is the dominant dimension so scaling will be fixed on that
+        return Math.floor(heightMulti * fullHeight);
+    }
+}
 
diff --git a/src/Notifier.js b/src/Notifier.js
index dd691d8ca7..10d2048f45 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -364,4 +364,4 @@ if (!global.mxNotifier) {
     global.mxNotifier = Notifier;
 }
 
-module.exports = global.mxNotifier;
+export default global.mxNotifier;
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 31339eb4e5..320599f6d9 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -25,7 +25,7 @@ import { _t } from './languageHandler';
  * the client owns the given email address, which is then passed to the password
  * API on the homeserver in question with the new password.
  */
-class PasswordReset {
+export default class PasswordReset {
     /**
      * Configure the endpoints for password resetting.
      * @param {string} homeserverUrl The URL to the HS which has the account to reset.
@@ -101,4 +101,3 @@ class PasswordReset {
     }
 }
 
-module.exports = PasswordReset;
diff --git a/src/PlatformPeg.js b/src/PlatformPeg.js
index 5c1112e23b..34131fde7d 100644
--- a/src/PlatformPeg.js
+++ b/src/PlatformPeg.js
@@ -47,4 +47,4 @@ class PlatformPeg {
 if (!global.mxPlatformPeg) {
     global.mxPlatformPeg = new PlatformPeg();
 }
-module.exports = global.mxPlatformPeg;
+export default global.mxPlatformPeg;
diff --git a/src/Presence.js b/src/Presence.js
index 8ef988f171..4776157514 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -104,4 +105,4 @@ class Presence {
     }
 }
 
-module.exports = new Presence();
+export default new Presence();
diff --git a/src/RoomListSorter.js b/src/RoomListSorter.js
index c06cc60c97..0ff37a6af2 100644
--- a/src/RoomListSorter.js
+++ b/src/RoomListSorter.js
@@ -24,12 +24,8 @@ function tsOfNewestEvent(room) {
     }
 }
 
-function mostRecentActivityFirst(roomList) {
+export function mostRecentActivityFirst(roomList) {
     return roomList.sort(function(a, b) {
         return tsOfNewestEvent(b) - tsOfNewestEvent(a);
     });
 }
-
-module.exports = {
-    mostRecentActivityFirst,
-};
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index c0ffc3022d..a449c2c2b9 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -658,30 +658,29 @@ const onMessage = function(event) {
 
 let listenerCount = 0;
 let openManagerUrl = null;
-module.exports = {
-    startListening: function() {
-        if (listenerCount === 0) {
-            window.addEventListener("message", onMessage, false);
-        }
-        listenerCount += 1;
-    },
 
-    stopListening: function() {
-        listenerCount -= 1;
-        if (listenerCount === 0) {
-            window.removeEventListener("message", onMessage);
-        }
-        if (listenerCount < 0) {
-            // Make an error so we get a stack trace
-            const e = new Error(
-                "ScalarMessaging: mismatched startListening / stopListening detected." +
-                " Negative count",
-            );
-            console.error(e);
-        }
-    },
+export function startListening() {
+    if (listenerCount === 0) {
+        window.addEventListener("message", onMessage, false);
+    }
+    listenerCount += 1;
+}
 
-    setOpenManagerUrl: function(url) {
-        openManagerUrl = url;
-    },
-};
+export function stopListening() {
+    listenerCount -= 1;
+    if (listenerCount === 0) {
+        window.removeEventListener("message", onMessage);
+    }
+    if (listenerCount < 0) {
+        // Make an error so we get a stack trace
+        const e = new Error(
+            "ScalarMessaging: mismatched startListening / stopListening detected." +
+            " Negative count",
+        );
+        console.error(e);
+    }
+}
+
+export function setOpenManagerUrl(url) {
+    openManagerUrl = url;
+}
diff --git a/src/Skinner.js b/src/Skinner.js
index 7235d55937..fee234d77e 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -106,5 +106,5 @@ class Skinner {
 if (global.mxSkinner === undefined) {
     global.mxSkinner = new Skinner();
 }
-module.exports = global.mxSkinner;
+export default global.mxSkinner;
 
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index c3c8396e26..fe936d7d21 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -620,10 +620,8 @@ for (const evType of ALL_RULE_TYPES) {
     stateHandlers[evType] = textForMjolnirEvent;
 }
 
-module.exports = {
-    textForEvent: function(ev) {
-        const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
-        if (handler) return handler(ev);
-        return '';
-    },
-};
+export function textForEvent(ev) {
+    const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
+    if (handler) return handler(ev);
+    return '';
+}
diff --git a/src/Unread.js b/src/Unread.js
index d5c5993974..c2eaa468f5 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -18,76 +18,74 @@ const MatrixClientPeg = require('./MatrixClientPeg');
 import shouldHideEvent from './shouldHideEvent';
 const sdk = require('./index');
 
-module.exports = {
-    /**
-     * Returns true iff this event arriving in a room should affect the room's
-     * count of unread messages
-     */
-    eventTriggersUnreadCount: function(ev) {
-        if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
-            return false;
-        } else if (ev.getType() == 'm.room.member') {
-            return false;
-        } else if (ev.getType() == 'm.room.third_party_invite') {
-            return false;
-        } else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
-            return false;
-        } else if (ev.getType() == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
-            return false;
-        } else if (ev.getType() == 'm.room.aliases' || ev.getType() == 'm.room.canonical_alias') {
-            return false;
-        } else if (ev.getType() == 'm.room.server_acl') {
+/**
+ * Returns true iff this event arriving in a room should affect the room's
+ * count of unread messages
+ */
+export function eventTriggersUnreadCount(ev) {
+    if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
+        return false;
+    } else if (ev.getType() == 'm.room.member') {
+        return false;
+    } else if (ev.getType() == 'm.room.third_party_invite') {
+        return false;
+    } else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
+        return false;
+    } else if (ev.getType() == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
+        return false;
+    } else if (ev.getType() == 'm.room.aliases' || ev.getType() == 'm.room.canonical_alias') {
+        return false;
+    } else if (ev.getType() == 'm.room.server_acl') {
+        return false;
+    }
+    const EventTile = sdk.getComponent('rooms.EventTile');
+    return EventTile.haveTileForEvent(ev);
+}
+
+export function doesRoomHaveUnreadMessages(room) {
+    const myUserId = MatrixClientPeg.get().credentials.userId;
+
+    // get the most recent read receipt sent by our account.
+    // N.B. this is NOT a read marker (RM, aka "read up to marker"),
+    // despite the name of the method :((
+    const readUpToId = room.getEventReadUpTo(myUserId);
+
+    // as we don't send RRs for our own messages, make sure we special case that
+    // if *we* sent the last message into the room, we consider it not unread!
+    // Should fix: https://github.com/vector-im/riot-web/issues/3263
+    //             https://github.com/vector-im/riot-web/issues/2427
+    // ...and possibly some of the others at
+    //             https://github.com/vector-im/riot-web/issues/3363
+    if (room.timeline.length &&
+        room.timeline[room.timeline.length - 1].sender &&
+        room.timeline[room.timeline.length - 1].sender.userId === myUserId) {
+        return false;
+    }
+
+    // this just looks at whatever history we have, which if we've only just started
+    // up probably won't be very much, so if the last couple of events are ones that
+    // don't count, we don't know if there are any events that do count between where
+    // we have and the read receipt. We could fetch more history to try & find out,
+    // but currently we just guess.
+
+    // Loop through messages, starting with the most recent...
+    for (let i = room.timeline.length - 1; i >= 0; --i) {
+        const ev = room.timeline[i];
+
+        if (ev.getId() == readUpToId) {
+            // If we've read up to this event, there's nothing more recent
+            // that counts and we can stop looking because the user's read
+            // this and everything before.
             return false;
+        } else if (!shouldHideEvent(ev) && this.eventTriggersUnreadCount(ev)) {
+            // We've found a message that counts before we hit
+            // the user's read receipt, so this room is definitely unread.
+            return true;
         }
-        const EventTile = sdk.getComponent('rooms.EventTile');
-        return EventTile.haveTileForEvent(ev);
-    },
-
-    doesRoomHaveUnreadMessages: function(room) {
-        const myUserId = MatrixClientPeg.get().credentials.userId;
-
-        // get the most recent read receipt sent by our account.
-        // N.B. this is NOT a read marker (RM, aka "read up to marker"),
-        // despite the name of the method :((
-        const readUpToId = room.getEventReadUpTo(myUserId);
-
-        // as we don't send RRs for our own messages, make sure we special case that
-        // if *we* sent the last message into the room, we consider it not unread!
-        // Should fix: https://github.com/vector-im/riot-web/issues/3263
-        //             https://github.com/vector-im/riot-web/issues/2427
-        // ...and possibly some of the others at
-        //             https://github.com/vector-im/riot-web/issues/3363
-        if (room.timeline.length &&
-            room.timeline[room.timeline.length - 1].sender &&
-            room.timeline[room.timeline.length - 1].sender.userId === myUserId) {
-            return false;
-        }
-
-        // this just looks at whatever history we have, which if we've only just started
-        // up probably won't be very much, so if the last couple of events are ones that
-        // don't count, we don't know if there are any events that do count between where
-        // we have and the read receipt. We could fetch more history to try & find out,
-        // but currently we just guess.
-
-        // Loop through messages, starting with the most recent...
-        for (let i = room.timeline.length - 1; i >= 0; --i) {
-            const ev = room.timeline[i];
-
-            if (ev.getId() == readUpToId) {
-                // If we've read up to this event, there's nothing more recent
-                // that counts and we can stop looking because the user's read
-                // this and everything before.
-                return false;
-            } else if (!shouldHideEvent(ev) && this.eventTriggersUnreadCount(ev)) {
-                // We've found a message that counts before we hit
-                // the user's read receipt, so this room is definitely unread.
-                return true;
-            }
-        }
-        // If we got here, we didn't find a message that counted but didn't find
-        // the user's read receipt either, so we guess and say that the room is
-        // unread on the theory that false positives are better than false
-        // negatives here.
-        return true;
-    },
-};
+    }
+    // If we got here, we didn't find a message that counted but didn't find
+    // the user's read receipt either, so we guess and say that the room is
+    // unread on the theory that false positives are better than false
+    // negatives here.
+    return true;
+}
diff --git a/src/WhoIsTyping.js b/src/WhoIsTyping.js
index eb09685cbe..d690466127 100644
--- a/src/WhoIsTyping.js
+++ b/src/WhoIsTyping.js
@@ -17,68 +17,66 @@ limitations under the License.
 import MatrixClientPeg from "./MatrixClientPeg";
 import { _t } from './languageHandler';
 
-module.exports = {
-    usersTypingApartFromMeAndIgnored: function(room) {
-        return this.usersTyping(
-            room, [MatrixClientPeg.get().credentials.userId].concat(MatrixClientPeg.get().getIgnoredUsers()),
-        );
-    },
+export function usersTypingApartFromMeAndIgnored(room) {
+    return usersTyping(
+        room, [MatrixClientPeg.get().credentials.userId].concat(MatrixClientPeg.get().getIgnoredUsers()),
+    );
+}
 
-    usersTypingApartFromMe: function(room) {
-        return this.usersTyping(
-            room, [MatrixClientPeg.get().credentials.userId],
-        );
-    },
+export function usersTypingApartFromMe(room) {
+    return usersTyping(
+        room, [MatrixClientPeg.get().credentials.userId],
+    );
+}
 
-    /**
-     * Given a Room object and, optionally, a list of userID strings
-     * to exclude, return a list of user objects who are typing.
-     * @param {Room} room: room object to get users from.
-     * @param {string[]} exclude: list of user mxids to exclude.
-     * @returns {string[]} list of user objects who are typing.
-     */
-    usersTyping: function(room, exclude) {
-        const whoIsTyping = [];
+/**
+ * Given a Room object and, optionally, a list of userID strings
+ * to exclude, return a list of user objects who are typing.
+ * @param {Room} room: room object to get users from.
+ * @param {string[]} exclude: list of user mxids to exclude.
+ * @returns {string[]} list of user objects who are typing.
+ */
+export function usersTyping(room, exclude) {
+    const whoIsTyping = [];
 
-        if (exclude === undefined) {
-            exclude = [];
-        }
+    if (exclude === undefined) {
+        exclude = [];
+    }
 
-        const memberKeys = Object.keys(room.currentState.members);
-        for (let i = 0; i < memberKeys.length; ++i) {
-            const userId = memberKeys[i];
+    const memberKeys = Object.keys(room.currentState.members);
+    for (let i = 0; i < memberKeys.length; ++i) {
+        const userId = memberKeys[i];
 
-            if (room.currentState.members[userId].typing) {
-                if (exclude.indexOf(userId) === -1) {
-                    whoIsTyping.push(room.currentState.members[userId]);
-                }
+        if (room.currentState.members[userId].typing) {
+            if (exclude.indexOf(userId) === -1) {
+                whoIsTyping.push(room.currentState.members[userId]);
             }
         }
+    }
 
-        return whoIsTyping;
-    },
+    return whoIsTyping;
+}
 
-    whoIsTypingString: function(whoIsTyping, limit) {
-        let othersCount = 0;
-        if (whoIsTyping.length > limit) {
-            othersCount = whoIsTyping.length - limit + 1;
-        }
-        if (whoIsTyping.length === 0) {
-            return '';
-        } else if (whoIsTyping.length === 1) {
-            return _t('%(displayName)s is typing …', {displayName: whoIsTyping[0].name});
-        }
-        const names = whoIsTyping.map(function(m) {
-            return m.name;
+export function whoIsTypingString(whoIsTyping, limit) {
+    let othersCount = 0;
+    if (whoIsTyping.length > limit) {
+        othersCount = whoIsTyping.length - limit + 1;
+    }
+    if (whoIsTyping.length === 0) {
+        return '';
+    } else if (whoIsTyping.length === 1) {
+        return _t('%(displayName)s is typing …', {displayName: whoIsTyping[0].name});
+    }
+    const names = whoIsTyping.map(function(m) {
+        return m.name;
+    });
+    if (othersCount>=1) {
+        return _t('%(names)s and %(count)s others are typing …', {
+            names: names.slice(0, limit - 1).join(', '),
+            count: othersCount,
         });
-        if (othersCount>=1) {
-            return _t('%(names)s and %(count)s others are typing …', {
-                names: names.slice(0, limit - 1).join(', '),
-                count: othersCount,
-            });
-        } else {
-            const lastPerson = names.pop();
-            return _t('%(names)s and %(lastPerson)s are typing …', {names: names.join(', '), lastPerson: lastPerson});
-        }
-    },
-};
+    } else {
+        const lastPerson = names.pop();
+        return _t('%(names)s and %(lastPerson)s are typing …', {names: names.join(', '), lastPerson: lastPerson});
+    }
+}
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 145203136a..b6383c9dab 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -21,7 +21,7 @@ import { _t } from '../../../languageHandler';
 const sdk = require('../../../index');
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'EncryptedEventDialog',
 
     propTypes: {
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index 28c86f8dd8..9a3fdb5f39 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CompatibilityPage',
     propTypes: {
         onAccept: PropTypes.func,
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f5a5912dd5..b6fbf6d45d 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -126,4 +127,4 @@ const FilePanel = createReactClass({
     },
 });
 
-module.exports = FilePanel;
+export default FilePanel;
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a0ad2b5c81..57cbd6ec59 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -308,4 +308,4 @@ const LeftPanel = createReactClass({
     },
 });
 
-module.exports = LeftPanel;
+export default LeftPanel;
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 470c7c8728..b65365b7e4 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -60,4 +61,4 @@ const NotificationPanel = createReactClass({
     },
 });
 
-module.exports = NotificationPanel;
+export default NotificationPanel;
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 4823b0976c..16333d51c0 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -38,7 +38,7 @@ function track(action) {
     Analytics.trackEvent('RoomDirectory', action);
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomDirectory',
 
     propTypes: {
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index b0aa4cb59b..e7a0771962 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -38,7 +39,7 @@ function getUnsentMessages(room) {
     });
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomStatusBar',
 
     propTypes: {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 2f8d274866..3f9d680503 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -72,7 +72,7 @@ const RoomContext = PropTypes.shape({
     room: PropTypes.instanceOf(Room),
 });
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomView',
     propTypes: {
         ConferenceHandler: PropTypes.any,
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 17583a22ed..c5725e1343 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -84,7 +84,7 @@ if (DEBUG_SCROLL) {
  * offset as normal.
  */
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ScrollPanel',
 
     propTypes: {
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 0aa2e15f4c..faa20a68ba 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -24,7 +24,7 @@ import { throttle } from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import classNames from 'classnames';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'SearchBox',
 
     propTypes: {
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 41283b5308..d0f99aec91 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1347,4 +1347,4 @@ const TimelinePanel = createReactClass({
     },
 });
 
-module.exports = TimelinePanel;
+export default TimelinePanel;
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index da0ca7fe99..ce5441089c 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ const dis = require('../../dispatcher');
 const filesize = require('filesize');
 import { _t } from '../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'UploadBar',
     propTypes: {
         room: PropTypes.object,
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index ef4ede517a..e946b5afbf 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ import {_t} from "../../languageHandler";
 import sdk from "../../index";
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ViewSource',
 
     propTypes: {
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index ada7d4449b..6a84913f36 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -40,7 +40,7 @@ const PHASE_EMAIL_SENT = 3;
 // User has clicked the link in email and completed reset
 const PHASE_DONE = 4;
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ForgotPassword',
 
     propTypes: {
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index ade417d156..dc2755be8e 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -54,7 +54,7 @@ _td("General failure");
 /**
  * A wire component which glues together login UI components and Login logic
  */
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'Login',
 
     propTypes: {
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index a77b4d0d56..128c061cc4 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -22,7 +22,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import AuthPage from "../../views/auth/AuthPage";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PostRegistration',
 
     propTypes: {
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 69f34f764a..fce77631f8 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -41,7 +41,7 @@ const PHASE_REGISTRATION = 1;
 // Enable phases for registration
 const PHASES_ENABLED = true;
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'Registration',
 
     propTypes: {
diff --git a/src/components/views/auth/AuthFooter.js b/src/components/views/auth/AuthFooter.js
index 39d636f9cc..4076141606 100644
--- a/src/components/views/auth/AuthFooter.js
+++ b/src/components/views/auth/AuthFooter.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ import { _t } from '../../../languageHandler';
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'AuthFooter',
 
     render: function() {
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
index 193f347857..7048472681 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import sdk from '../../../index';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'AuthHeader',
 
     render: function() {
diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index f907a58026..2da837f029 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -24,7 +24,7 @@ const DIV_ID = 'mx_recaptcha';
 /**
  * A pure UI component which displays a captcha form.
  */
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CaptchaForm',
 
     propTypes: {
diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
index a9a3a53f02..024951e6c0 100644
--- a/src/components/views/auth/CustomServerDialog.js
+++ b/src/components/views/auth/CustomServerDialog.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CustomServerDialog',
 
     render: function() {
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 03fb74462c..28efe60d0e 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -41,7 +41,7 @@ const PASSWORD_MIN_SCORE = 3; // safely unguessable: moderate protection from of
 /**
  * A pure UI component which displays a registration form.
  */
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RegistrationForm',
 
     propTypes: {
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 82db78615e..ae9eaba488 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@ import AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'BaseAvatar',
 
     propTypes: {
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 383bab5e79..4f84191ccd 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ const Avatar = require('../../../Avatar');
 const sdk = require("../../../index");
 const dispatcher = require("../../../dispatcher");
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MemberAvatar',
 
     propTypes: {
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 6f8f236afc..3e02e439ff 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -22,7 +22,7 @@ import Modal from '../../../Modal';
 import sdk from "../../../index";
 import Avatar from '../../../Avatar';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomAvatar',
 
     // Room may be left unset here, but if it is,
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index efbfc4322f..1011b6ce46 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -37,7 +37,7 @@ function canCancel(eventStatus) {
     return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MessageContextMenu',
 
     propTypes: {
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index f5e68bd20b..902506b015 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -63,7 +63,7 @@ const NotifOption = ({active, onClick, src, label}) => {
     );
 };
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomTileContextMenu',
 
     propTypes: {
diff --git a/src/components/views/create_room/CreateRoomButton.js b/src/components/views/create_room/CreateRoomButton.js
index 1c44aed78c..adf3972eff 100644
--- a/src/components/views/create_room/CreateRoomButton.js
+++ b/src/components/views/create_room/CreateRoomButton.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CreateRoomButton',
     propTypes: {
         onCreateRoom: PropTypes.func,
diff --git a/src/components/views/create_room/Presets.js b/src/components/views/create_room/Presets.js
index f512c3e2fd..0f18d11511 100644
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@ const Presets = {
     Custom: "custom",
 };
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CreateRoomPresets',
     propTypes: {
         onChange: PropTypes.func,
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index fd3e3365f7..bc5dec1468 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomAlias',
     propTypes: {
         // Specifying a homeserver will make magical things happen when you,
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 2be505a798..b7d8f3f55f 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -43,7 +43,7 @@ const addressTypeName = {
 };
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: "AddressPickerDialog",
 
     propTypes: {
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index e7b3a9c7eb..4e47e73052 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Aidan Gauland
 Copyright 2018 New Vector Ltd.
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ import { _t } from '../../../languageHandler';
 /**
  * Basic container for buttons in modal dialogs.
  */
-module.exports = createReactClass({
+export default createReactClass({
     displayName: "DialogButtons",
 
     propTypes: {
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index 5913682255..fbac63cbba 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {Key} from "../../../Keyboard";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'EditableText',
 
     propTypes: {
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index 18711f90d3..ad70471d89 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'InlineSpinner',
 
     render: function() {
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index ef80efaa68..4db0ad1c68 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -24,7 +24,7 @@ import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import sdk from "../../../index";
 import {MatrixEvent} from "matrix-js-sdk";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MemberEventListSummary',
 
     propTypes: {
diff --git a/src/components/views/elements/MessageSpinner.js b/src/components/views/elements/MessageSpinner.js
index f00fdcf576..1775fdd4d7 100644
--- a/src/components/views/elements/MessageSpinner.js
+++ b/src/components/views/elements/MessageSpinner.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MessageSpinner',
 
     render: function() {
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index 19e4be6083..996dbf2283 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ import WidgetUtils from '../../../utils/WidgetUtils';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PersistentApp',
 
     getInitialState: function() {
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index e6babded32..2f4c08922a 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -22,7 +22,7 @@ import { _t } from '../../../languageHandler';
 import Field from "./Field";
 import {Key} from "../../../Keyboard";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PowerSelector',
 
     propTypes: {
diff --git a/src/components/views/elements/ProgressBar.js b/src/components/views/elements/ProgressBar.js
index 3561763e51..045731ba38 100644
--- a/src/components/views/elements/ProgressBar.js
+++ b/src/components/views/elements/ProgressBar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@ import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ProgressBar',
     propTypes: {
         value: PropTypes.number,
diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index a3a6d18d33..15f17805a8 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'SettingsFlag',
     propTypes: {
         name: PropTypes.string.isRequired,
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index 5d43e836cc..b1fe97d5d2 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'Spinner',
 
     render: function() {
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
index 73ba375d59..3e0e41f411 100644
--- a/src/components/views/elements/TintableSvg.js
+++ b/src/components/views/elements/TintableSvg.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -83,4 +84,4 @@ Tinter.registerTintable(function() {
     }
 });
 
-module.exports = TintableSvg;
+export default TintableSvg;
diff --git a/src/components/views/elements/Tooltip.js b/src/components/views/elements/Tooltip.js
index 8ff3ce9bdb..fd845d9db3 100644
--- a/src/components/views/elements/Tooltip.js
+++ b/src/components/views/elements/Tooltip.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@ import classNames from 'classnames';
 
 const MIN_TOOLTIP_HEIGHT = 25;
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'Tooltip',
 
     propTypes: {
diff --git a/src/components/views/elements/TooltipButton.js b/src/components/views/elements/TooltipButton.js
index 0cabf776a4..29a18d4b34 100644
--- a/src/components/views/elements/TooltipButton.js
+++ b/src/components/views/elements/TooltipButton.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import sdk from '../../../index';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'TooltipButton',
 
     getInitialState: function() {
diff --git a/src/components/views/elements/TruncatedList.js b/src/components/views/elements/TruncatedList.js
index e6a5e2ae32..9ce2395638 100644
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'TruncatedList',
 
     propTypes: {
diff --git a/src/components/views/elements/UserSelector.js b/src/components/views/elements/UserSelector.js
index 1010d4144c..706c6ed2e5 100644
--- a/src/components/views/elements/UserSelector.js
+++ b/src/components/views/elements/UserSelector.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'UserSelector',
 
     propTypes: {
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index aabf0810f8..ac449c39d7 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -20,7 +20,7 @@ import { _t } from '../../../languageHandler';
 import Notifier from '../../../Notifier';
 import AccessibleButton from '../../../components/views/elements/AccessibleButton';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MatrixToolbar',
 
     hideToolbar: function() {
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 3dac90fc35..e028f5a000 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2017 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ import { GroupMemberType } from '../../../groups';
 import GroupStore from '../../../stores/GroupStore';
 import AccessibleButton from '../elements/AccessibleButton';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'GroupMemberInfo',
 
     contextTypes: {
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index f9f7324e23..1460c7bf0b 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@ import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import GroupStore from '../../../stores/GroupStore';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'GroupRoomInfo',
 
     contextTypes: {
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 552b1108d2..37f1401a58 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -194,7 +194,7 @@ function computedStyle(element) {
     return cssText;
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MFileBody',
 
     getInitialState: function() {
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 8366d0dd01..7d0c782bdc 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MVideoBody',
 
     propTypes: {
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index ba271f95b5..61170111c7 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -21,7 +21,7 @@ import sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MessageEvent',
 
     propTypes: {
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index 513e104d12..faae53776d 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@ import sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomAvatarEvent',
 
     propTypes: {
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index 9bb6fcc0d8..8689a636d8 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomCreate',
 
     propTypes: {
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 6bf45d9193..48144fbb2d 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -35,7 +35,7 @@ import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
 import {toRightOf} from "../../structures/ContextMenu";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'TextualBody',
 
     propTypes: {
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index be9adeed77..83b3c84f1e 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ import createReactClass from 'create-react-class';
 
 const TextForEvent = require('../../../TextForEvent');
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'TextualEvent',
 
     propTypes: {
diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.js
index ed2306de4f..2a19f324e8 100644
--- a/src/components/views/messages/UnknownBody.js
+++ b/src/components/views/messages/UnknownBody.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'UnknownBody',
 
     render: function() {
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index 952c49828b..1e06da0cd8 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -40,7 +40,7 @@ const ROOM_COLORS = [
 // has a high possibility of being used in the nearish future.
 // Ref: https://github.com/vector-im/riot-web/issues/8421
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ColorSettings',
 
     propTypes: {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 7a8332cc9f..30420b193f 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -1,7 +1,8 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Travis Ralston
-Copyright 2018-2019 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@ import dis from "../../../dispatcher";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'UrlPreviewSettings',
 
     propTypes: {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index e53570dc5b..5cf7923df3 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -34,7 +34,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 // The maximum number of widgets that can be added in a room
 const MAX_WIDGETS = 2;
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'AppsDrawer',
 
     propTypes: {
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index a83160ddbf..498a7131a2 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -29,7 +29,7 @@ import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'AuxPanel',
 
     propTypes: {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 988482df7f..8f645522a3 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -118,7 +118,7 @@ const MAX_READ_AVATARS = 5;
 // |    '--------------------------------------'              |
 // '----------------------------------------------------------'
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'EventTile',
 
     propTypes: {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 4a6c560d2c..7e48071fe5 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -23,7 +23,7 @@ import dis from '../../../dispatcher';
 import { KeyCode } from '../../../Keyboard';
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ForwardMessage',
 
     propTypes: {
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 2e3a3915d0..985ddc43bd 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@ const MatrixClientPeg = require('../../../MatrixClientPeg');
 const ImageUtils = require('../../../ImageUtils');
 const Modal = require('../../../Modal');
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'LinkPreviewWidget',
 
     propTypes: {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 1a2c8e2212..d6e23bd87c 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -50,7 +50,7 @@ import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import {EventTimeline} from "matrix-js-sdk";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MemberInfo',
 
     propTypes: {
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 05464b43c9..a74d34c02c 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -32,7 +32,7 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
 const SHOW_MORE_INCREMENT = 100;
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MemberList',
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index c002849450..eacb35c69d 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@ const sdk = require('../../../index');
 const dis = require('../../../dispatcher');
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'MemberTile',
 
     propTypes: {
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 1279c01049..ca03fd787c 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -25,7 +25,7 @@ import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from '../../../languageHandler';
 import {formatFullDate} from '../../../DateUtils';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PinnedEventTile',
     propTypes: {
         mxRoom: PropTypes.object.isRequired,
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index dd2febdf39..3f07e25588 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ import PinnedEventTile from "./PinnedEventTile";
 import { _t } from '../../../languageHandler';
 import PinningUtils from "../../../utils/PinningUtils";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PinnedEventsPanel',
     propTypes: {
         // The Room from the js-sdk we're going to show pinned events for
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index 5cb34b473f..f9dcd7e89d 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'PresenceLabel',
 
     propTypes: {
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 27c5e8c20e..7dda4651b5 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,7 +36,7 @@ try {
 } catch (e) {
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ReadReceiptMarker',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomDropTarget.js b/src/components/views/rooms/RoomDropTarget.js
index 1012b23105..61b7ca6d59 100644
--- a/src/components/views/rooms/RoomDropTarget.js
+++ b/src/components/views/rooms/RoomDropTarget.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomDropTarget',
 
     render: function() {
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index eaf2e733ca..8567c32563 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,7 +33,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
 import E2EIcon from './E2EIcon';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomHeader',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 210c9394dc..496f942245 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -49,7 +49,7 @@ function labelForTagName(tagName) {
     return tagName;
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomList',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 375a4b42b1..d227574ed1 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -21,7 +21,7 @@ const sdk = require('../../../index');
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomNameEditor',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index a43a4df158..e460c2583f 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -43,7 +43,7 @@ const MessageCase = Object.freeze({
     OtherError: "OtherError",
 });
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomPreviewBar',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 817ada9706..1ae0af29c2 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -33,7 +33,7 @@ import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomTile',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index a7d11313ff..2a58dcef39 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import sdk from '../../../index';
 import { _t } from "../../../languageHandler";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomTopicEditor',
 
     propTypes: {
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index 58d959ddcc..f1117ff8c6 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -23,7 +23,7 @@ import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'RoomUpgradeWarningBar',
 
     propTypes: {
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index 492c29a621..4edcab3d16 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -20,7 +20,7 @@ const classNames = require('classnames');
 const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'SearchBar',
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 19ed490683..f5e77879b2 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import sdk from '../../../index';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'SearchResult',
 
     propTypes: {
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 024816c6fc..bbc98cedef 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -182,4 +183,4 @@ const SearchableEntityList = createReactClass({
     },
 });
 
- module.exports = SearchableEntityList;
+export default SearchableEntityList;
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index c7a1a22580..04805c799f 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -22,7 +22,7 @@ import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'TopUnreadMessagesBar',
 
     propTypes: {
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 76afda6dd7..0234d1ed85 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ import createReactClass from 'create-react-class';
 const Avatar = require("../../../Avatar");
 const sdk = require('../../../index');
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'UserTile',
 
     propTypes: {
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index 0e23286eb6..567d821a5e 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -23,7 +23,7 @@ import Timer from '../../../utils/Timer';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'WhoIsTypingTile',
 
     propTypes: {
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 904b17b15f..3718e8d2db 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -21,7 +21,7 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ChangeAvatar',
     propTypes: {
         initialAvatarUrl: PropTypes.string,
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 90c761ba3d..65aa8a9af6 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ChangeDisplayName',
 
     _getDisplayName: async function() {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index a317c46cec..db38fa065a 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -30,7 +30,7 @@ import { _t } from '../../../languageHandler';
 
 import sessionStore from '../../../stores/SessionStore';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'ChangePassword',
 
     propTypes: {
diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
index 1f65c39e6e..9ca591f30e 100644
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@@ -20,7 +20,7 @@ import Notifier from "../../../Notifier";
 import dis from "../../../dispatcher";
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'EnableNotificationsButton',
 
     componentDidMount: function() {
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 7345980bff..cc0841011f 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -63,7 +63,7 @@ function portLegacyActions(actions) {
     }
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'Notifications',
 
     phases: {
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 15c30dcb5b..d049e23dcf 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ import CallHandler from '../../../CallHandler';
 import dis from '../../../dispatcher';
 import sdk from '../../../index';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CallPreview',
 
     propTypes: {
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 3a62ffbac2..79c1c13c30 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'CallView',
 
     propTypes: {
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 2a2839d103..7317e0a63f 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'IncomingCallBox',
 
     propTypes: {
diff --git a/src/components/views/voip/VideoFeed.js b/src/components/views/voip/VideoFeed.js
index 0faa227088..4210c60177 100644
--- a/src/components/views/voip/VideoFeed.js
+++ b/src/components/views/voip/VideoFeed.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'VideoFeed',
 
     propTypes: {
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 83584bcc68..4409e1aad5 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +35,7 @@ function getFullScreenElement() {
     );
 }
 
-module.exports = createReactClass({
+export default createReactClass({
     displayName: 'VideoView',
 
     propTypes: {
diff --git a/src/createRoom.js b/src/createRoom.js
index 0ee90beba8..d47343abf6 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -35,7 +35,7 @@ import {getAddressType} from "./UserAddress";
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
  */
-function createRoom(opts) {
+export default function createRoom(opts) {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
 
@@ -139,5 +139,3 @@ function createRoom(opts) {
         return null;
     });
 }
-
-module.exports = createRoom;
diff --git a/src/dispatcher.js b/src/dispatcher.js
index 48c8dc86e9..f6bbea97d8 100644
--- a/src/dispatcher.js
+++ b/src/dispatcher.js
@@ -55,4 +55,4 @@ class MatrixDispatcher extends flux.Dispatcher {
 if (global.mxDispatcher === undefined) {
     global.mxDispatcher = new MatrixDispatcher();
 }
-module.exports = global.mxDispatcher;
+export default global.mxDispatcher;
diff --git a/src/email.js b/src/email.js
index 3fd535c849..6e2ed69bb7 100644
--- a/src/email.js
+++ b/src/email.js
@@ -16,8 +16,6 @@ limitations under the License.
 
 const EMAIL_ADDRESS_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 
-module.exports = {
-    looksValid: function(email) {
-        return EMAIL_ADDRESS_REGEX.test(email);
-    },
-};
+export function looksValid(email) {
+    return EMAIL_ADDRESS_REGEX.test(email);
+}
diff --git a/src/extend.js b/src/extend.js
index 4b3f028a94..263d802ab6 100644
--- a/src/extend.js
+++ b/src/extend.js
@@ -16,11 +16,11 @@ limitations under the License.
 
 'use strict';
 
-module.exports = function(dest, src) {
+export default function(dest, src) {
     for (const i in src) {
         if (src.hasOwnProperty(i)) {
             dest[i] = src[i];
         }
     }
     return dest;
-};
+}
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 75f0fa66ba..3746591b1f 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -110,4 +110,4 @@ class EventIndexPeg {
 if (!global.mxEventIndexPeg) {
     global.mxEventIndexPeg = new EventIndexPeg();
 }
-module.exports = global.mxEventIndexPeg;
+export default global.mxEventIndexPeg;
diff --git a/src/notifications/ContentRules.js b/src/notifications/ContentRules.js
index f7e722dbfe..8c285220c7 100644
--- a/src/notifications/ContentRules.js
+++ b/src/notifications/ContentRules.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,9 +17,9 @@ limitations under the License.
 
 'use strict';
 
-const PushRuleVectorState = require('./PushRuleVectorState');
+import {PushRuleVectorState} from "./PushRuleVectorState";
 
-module.exports = {
+export class ContentRules {
     /**
      * Extract the keyword rules from a list of rules, and parse them
      * into a form which is useful for Vector's UI.
@@ -30,7 +31,7 @@ module.exports = {
      *   externalRules: a list of other keyword rules, with states other than
      *      vectorState
      */
-    parseContentRules: function(rulesets) {
+    static parseContentRules(rulesets) {
         // first categorise the keyword rules in terms of their actions
         const contentRules = this._categoriseContentRules(rulesets);
 
@@ -79,9 +80,9 @@ module.exports = {
                 externalRules: contentRules.other,
             };
         }
-    },
+    }
 
-    _categoriseContentRules: function(rulesets) {
+    static _categoriseContentRules(rulesets) {
         const contentRules = {on: [], on_but_disabled: [], loud: [], loud_but_disabled: [], other: []};
         for (const kind in rulesets.global) {
             for (let i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
@@ -116,5 +117,5 @@ module.exports = {
             }
         }
         return contentRules;
-    },
-};
+    }
+}
diff --git a/src/notifications/NotificationUtils.js b/src/notifications/NotificationUtils.js
index 79c1b38f6d..bf393da060 100644
--- a/src/notifications/NotificationUtils.js
+++ b/src/notifications/NotificationUtils.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@ limitations under the License.
 
 'use strict';
 
-module.exports = {
+export class NotificationUtils {
     // Encodes a dictionary of {
     //   "notify": true/false,
     //   "sound": string or undefined,
     //   "highlight: true/false,
     // }
     // to a list of push actions.
-    encodeActions: function(action) {
+    static encodeActions(action) {
         const notify = action.notify;
         const sound = action.sound;
         const highlight = action.highlight;
@@ -41,7 +42,7 @@ module.exports = {
         } else {
             return ["dont_notify"];
         }
-    },
+    }
 
     // Decode a list of actions to a dictionary of {
     //   "notify": true/false,
@@ -49,7 +50,7 @@ module.exports = {
     //   "highlight: true/false,
     // }
     // If the actions couldn't be decoded then returns null.
-    decodeActions: function(actions) {
+    static decodeActions(actions) {
         let notify = false;
         let sound = null;
         let highlight = false;
@@ -85,5 +86,5 @@ module.exports = {
             result.sound = sound;
         }
         return result;
-    },
-};
+    }
+}
diff --git a/src/notifications/PushRuleVectorState.js b/src/notifications/PushRuleVectorState.js
index f4ba365b6d..263226ce1c 100644
--- a/src/notifications/PushRuleVectorState.js
+++ b/src/notifications/PushRuleVectorState.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,42 +17,44 @@ limitations under the License.
 
 'use strict';
 
-const StandardActions = require('./StandardActions');
-const NotificationUtils = require('./NotificationUtils');
+import {StandardActions} from "./StandardActions";
+import {NotificationUtils} from "./NotificationUtils";
 
-const states = {
-    /** The push rule is disabled */
-    OFF: "off",
+export class PushRuleVectorState {
+    // Backwards compatibility (things should probably be using .states instead)
+    static OFF = "off";
+    static ON = "on";
+    static LOUD = "loud";
 
-    /** The user will receive push notification for this rule */
-    ON: "on",
-
-    /** The user will receive push notification for this rule with sound and
-        highlight if this is legitimate */
-    LOUD: "loud",
-};
-
-
-module.exports = {
     /**
      * Enum for state of a push rule as defined by the Vector UI.
      * @readonly
      * @enum {string}
      */
-    states: states,
+    static states = {
+        /** The push rule is disabled */
+        OFF: PushRuleVectorState.OFF,
+
+        /** The user will receive push notification for this rule */
+        ON: PushRuleVectorState.ON,
+
+        /** The user will receive push notification for this rule with sound and
+         highlight if this is legitimate */
+        LOUD: PushRuleVectorState.LOUD,
+    };
 
     /**
      * Convert a PushRuleVectorState to a list of actions
      *
      * @return [object] list of push-rule actions
      */
-    actionsFor: function(pushRuleVectorState) {
-        if (pushRuleVectorState === this.ON) {
+    static actionsFor(pushRuleVectorState) {
+        if (pushRuleVectorState === PushRuleVectorState.ON) {
             return StandardActions.ACTION_NOTIFY;
-        } else if (pushRuleVectorState === this.LOUD) {
+        } else if (pushRuleVectorState === PushRuleVectorState.LOUD) {
             return StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND;
         }
-    },
+    }
 
     /**
      * Convert a pushrule's actions to a PushRuleVectorState.
@@ -60,7 +63,7 @@ module.exports = {
      * category or in PushRuleVectorState.LOUD, regardless of its enabled
      * state. Returns null if it does not match these categories.
      */
-    contentRuleVectorStateKind: function(rule) {
+    static contentRuleVectorStateKind(rule) {
         const decoded = NotificationUtils.decodeActions(rule.actions);
 
         if (!decoded) {
@@ -78,16 +81,12 @@ module.exports = {
         let stateKind = null;
         switch (tweaks) {
             case 0:
-                stateKind = this.ON;
+                stateKind = PushRuleVectorState.ON;
                 break;
             case 2:
-                stateKind = this.LOUD;
+                stateKind = PushRuleVectorState.LOUD;
                 break;
         }
         return stateKind;
-    },
-};
-
-for (const k in states) {
-    module.exports[k] = states[k];
+    }
 }
diff --git a/src/notifications/StandardActions.js b/src/notifications/StandardActions.js
index 15f645d5f7..b54cea332a 100644
--- a/src/notifications/StandardActions.js
+++ b/src/notifications/StandardActions.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,16 +17,16 @@ limitations under the License.
 
 'use strict';
 
-const NotificationUtils = require('./NotificationUtils');
+import {NotificationUtils} from "./NotificationUtils";
 
 const encodeActions = NotificationUtils.encodeActions;
 
-module.exports = {
-    ACTION_NOTIFY: encodeActions({notify: true}),
-    ACTION_NOTIFY_DEFAULT_SOUND: encodeActions({notify: true, sound: "default"}),
-    ACTION_NOTIFY_RING_SOUND: encodeActions({notify: true, sound: "ring"}),
-    ACTION_HIGHLIGHT: encodeActions({notify: true, highlight: true}),
-    ACTION_HIGHLIGHT_DEFAULT_SOUND: encodeActions({notify: true, sound: "default", highlight: true}),
-    ACTION_DONT_NOTIFY: encodeActions({notify: false}),
-    ACTION_DISABLED: null,
-};
+export class StandardActions {
+    static ACTION_NOTIFY = encodeActions({notify: true});
+    static ACTION_NOTIFY_DEFAULT_SOUND = encodeActions({notify: true, sound: "default"});
+    static ACTION_NOTIFY_RING_SOUND = encodeActions({notify: true, sound: "ring"});
+    static ACTION_HIGHLIGHT = encodeActions({notify: true, highlight: true});
+    static ACTION_HIGHLIGHT_DEFAULT_SOUND = encodeActions({notify: true, sound: "default", highlight: true});
+    static ACTION_DONT_NOTIFY = encodeActions({notify: false});
+    static ACTION_DISABLED = null;
+}
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js
index b15fb4ccd7..98d197a004 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,10 +18,9 @@ limitations under the License.
 'use strict';
 
 import { _td } from '../languageHandler';
-
-const StandardActions = require('./StandardActions');
-const PushRuleVectorState = require('./PushRuleVectorState');
-const { decodeActions } = require('./NotificationUtils');
+import {StandardActions} from "./StandardActions";
+import {PushRuleVectorState} from "./PushRuleVectorState";
+import {NotificationUtils} from "./NotificationUtils";
 
 class VectorPushRuleDefinition {
     constructor(opts) {
@@ -51,8 +51,8 @@ class VectorPushRuleDefinition {
                 // value: true vs. unspecified for highlight (which defaults to
                 // true, making them equivalent).
                 if (enabled &&
-                        JSON.stringify(decodeActions(rule.actions)) ===
-                        JSON.stringify(decodeActions(vectorStateToActions))) {
+                        JSON.stringify(NotificationUtils.decodeActions(rule.actions)) ===
+                        JSON.stringify(NotificationUtils.decodeActions(vectorStateToActions))) {
                     return state;
                 }
             }
@@ -68,7 +68,7 @@ class VectorPushRuleDefinition {
 /**
  * The descriptions of rules managed by the Vector UI.
  */
-module.exports = {
+export const VectorPushRulesDefinitions = {
     // Messages containing user's display name
     ".m.rule.contains_display_name": new VectorPushRuleDefinition({
         kind: "override",
diff --git a/src/notifications/index.js b/src/notifications/index.js
index 8ed77e9d41..7c400ad8b3 100644
--- a/src/notifications/index.js
+++ b/src/notifications/index.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,9 +17,7 @@ limitations under the License.
 
 'use strict';
 
-module.exports = {
-    NotificationUtils: require('./NotificationUtils'),
-    PushRuleVectorState: require('./PushRuleVectorState'),
-    VectorPushRulesDefinitions: require('./VectorPushRulesDefinitions'),
-    ContentRules: require('./ContentRules'),
-};
+export * from "./NotificationUtils";
+export * from "./PushRuleVectorState";
+export * from "./VectorPushRulesDefinitions";
+export * from "./ContentRules";
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index 47bab38079..a9d17e77c9 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -432,77 +432,73 @@ function selectQuery(store, keyRange, resultMapper) {
     });
 }
 
-
-module.exports = {
-
-    /**
-     * Configure rage shaking support for sending bug reports.
-     * Modifies globals.
-     * @return {Promise} Resolves when set up.
-     */
-    init: function() {
-        if (global.mx_rage_initPromise) {
-            return global.mx_rage_initPromise;
-        }
-        global.mx_rage_logger = new ConsoleLogger();
-        global.mx_rage_logger.monkeyPatch(window.console);
-
-        // just *accessing* indexedDB throws an exception in firefox with
-        // indexeddb disabled.
-        let indexedDB;
-        try {
-            indexedDB = window.indexedDB;
-        } catch (e) {}
-
-        if (indexedDB) {
-            global.mx_rage_store = new IndexedDBLogStore(indexedDB, global.mx_rage_logger);
-            global.mx_rage_initPromise = global.mx_rage_store.connect();
-            return global.mx_rage_initPromise;
-        }
-        global.mx_rage_initPromise = Promise.resolve();
+/**
+ * Configure rage shaking support for sending bug reports.
+ * Modifies globals.
+ * @return {Promise} Resolves when set up.
+ */
+export function init() {
+    if (global.mx_rage_initPromise) {
         return global.mx_rage_initPromise;
-    },
+    }
+    global.mx_rage_logger = new ConsoleLogger();
+    global.mx_rage_logger.monkeyPatch(window.console);
 
-    flush: function() {
-        if (!global.mx_rage_store) {
-            return;
-        }
-        global.mx_rage_store.flush();
-    },
+    // just *accessing* indexedDB throws an exception in firefox with
+    // indexeddb disabled.
+    let indexedDB;
+    try {
+        indexedDB = window.indexedDB;
+    } catch (e) {}
 
-    /**
-     * Clean up old logs.
-     * @return Promise Resolves if cleaned logs.
-     */
-    cleanup: async function() {
-        if (!global.mx_rage_store) {
-            return;
-        }
-        await global.mx_rage_store.consume();
-    },
+    if (indexedDB) {
+        global.mx_rage_store = new IndexedDBLogStore(indexedDB, global.mx_rage_logger);
+        global.mx_rage_initPromise = global.mx_rage_store.connect();
+        return global.mx_rage_initPromise;
+    }
+    global.mx_rage_initPromise = Promise.resolve();
+    return global.mx_rage_initPromise;
+}
 
-    /**
-     * Get a recent snapshot of the logs, ready for attaching to a bug report
-     *
-     * @return {Array<{lines: string, id, string}>}  list of log data
-     */
-    getLogsForReport: async function() {
-        if (!global.mx_rage_logger) {
-            throw new Error(
-                "No console logger, did you forget to call init()?",
-            );
-        }
-        // If in incognito mode, store is null, but we still want bug report
-        // sending to work going off the in-memory console logs.
-        if (global.mx_rage_store) {
-            // flush most recent logs
-            await global.mx_rage_store.flush();
-            return await global.mx_rage_store.consume();
-        } else {
-            return [{
-                lines: global.mx_rage_logger.flush(true),
-                id: "-",
-            }];
-        }
-    },
-};
+export function flush() {
+    if (!global.mx_rage_store) {
+        return;
+    }
+    global.mx_rage_store.flush();
+}
+
+/**
+ * Clean up old logs.
+ * @return Promise Resolves if cleaned logs.
+ */
+export async function cleanup() {
+    if (!global.mx_rage_store) {
+        return;
+    }
+    await global.mx_rage_store.consume();
+}
+
+/**
+ * Get a recent snapshot of the logs, ready for attaching to a bug report
+ *
+ * @return {Array<{lines: string, id, string}>}  list of log data
+ */
+export async function getLogsForReport() {
+    if (!global.mx_rage_logger) {
+        throw new Error(
+            "No console logger, did you forget to call init()?",
+        );
+    }
+    // If in incognito mode, store is null, but we still want bug report
+    // sending to work going off the in-memory console logs.
+    if (global.mx_rage_store) {
+        // flush most recent logs
+        await global.mx_rage_store.flush();
+        return await global.mx_rage_store.consume();
+    } else {
+        return [{
+            lines: global.mx_rage_logger.flush(true),
+            id: "-",
+        }];
+    }
+}
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 457958eb82..0e5db7c54c 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -22,7 +22,7 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import PlatformPeg from '../PlatformPeg';
 import { _t } from '../languageHandler';
 
-import rageshake from './rageshake';
+import * as rageshake from './rageshake';
 
 
 // polyfill textencoder if necessary
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 637e87b728..3ba0e04631 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -340,4 +340,4 @@ let singletonGroupStore = null;
 if (!singletonGroupStore) {
     singletonGroupStore = new GroupStore();
 }
-module.exports = singletonGroupStore;
+export default singletonGroupStore;
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 91dcf0aebb..904f29f7b3 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -79,4 +80,4 @@ let singletonLifecycleStore = null;
 if (!singletonLifecycleStore) {
     singletonLifecycleStore = new LifecycleStore();
 }
-module.exports = singletonLifecycleStore;
+export default singletonLifecycleStore;
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
index ab2dbfedec..3c7440e10b 100644
--- a/src/stores/MessageComposerStore.js
+++ b/src/stores/MessageComposerStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017, 2018 Vector Creations Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -63,4 +64,4 @@ let singletonMessageComposerStore = null;
 if (!singletonMessageComposerStore) {
     singletonMessageComposerStore = new MessageComposerStore();
 }
-module.exports = singletonMessageComposerStore;
+export default singletonMessageComposerStore;
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index a3caf876ef..eb2d539bb1 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -357,4 +358,4 @@ let singletonRoomViewStore = null;
 if (!singletonRoomViewStore) {
     singletonRoomViewStore = new RoomViewStore();
 }
-module.exports = singletonRoomViewStore;
+export default singletonRoomViewStore;
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index ad58f1e93d..f38bc046d0 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -86,4 +87,4 @@ let singletonSessionStore = null;
 if (!singletonSessionStore) {
     singletonSessionStore = new SessionStore();
 }
-module.exports = singletonSessionStore;
+export default singletonSessionStore;
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 0d14ed1d60..33fa45c635 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -105,4 +106,4 @@ let singletonWidgetEchoStore = null;
 if (!singletonWidgetEchoStore) {
     singletonWidgetEchoStore = new WidgetEchoStore();
 }
-module.exports = singletonWidgetEchoStore;
+export default singletonWidgetEchoStore;
diff --git a/test/components/stub-component.js b/test/components/stub-component.js
index 9264792ffb..5638ada09d 100644
--- a/test/components/stub-component.js
+++ b/test/components/stub-component.js
@@ -4,7 +4,7 @@
 import React from 'react';
 import createReactClass from 'create-react-class';
 
-module.exports = function(opts) {
+export default function(opts) {
     opts = opts || {};
     if (!opts.displayName) {
         opts.displayName = 'StubComponent';
diff --git a/test/end-to-end-tests/src/logbuffer.js b/test/end-to-end-tests/src/logbuffer.js
index d586dc8b84..db4be33e8d 100644
--- a/test/end-to-end-tests/src/logbuffer.js
+++ b/test/end-to-end-tests/src/logbuffer.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-module.exports = class LogBuffer {
+export default class LogBuffer {
     constructor(page, eventName, eventMapper, reduceAsync=false, initialValue = "") {
         this.buffer = initialValue;
         page.on(eventName, (arg) => {
diff --git a/test/end-to-end-tests/src/logger.js b/test/end-to-end-tests/src/logger.js
index 283d07f163..42a9544e4d 100644
--- a/test/end-to-end-tests/src/logger.js
+++ b/test/end-to-end-tests/src/logger.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-module.exports = class Logger {
+export default class Logger {
     constructor(username) {
         this.indent = 0;
         this.username = username;
diff --git a/test/end-to-end-tests/src/rest/creator.js b/test/end-to-end-tests/src/rest/creator.js
index fde54014b2..c4ddee0581 100644
--- a/test/end-to-end-tests/src/rest/creator.js
+++ b/test/end-to-end-tests/src/rest/creator.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +32,7 @@ function execAsync(command, options) {
     });
 }
 
-module.exports = class RestSessionCreator {
+export default class RestSessionCreator {
     constructor(synapseSubdir, hsUrl, cwd) {
         this.synapseSubdir = synapseSubdir;
         this.hsUrl = hsUrl;
diff --git a/test/end-to-end-tests/src/rest/multi.js b/test/end-to-end-tests/src/rest/multi.js
index e58b9f3f57..d4cd5c765c 100644
--- a/test/end-to-end-tests/src/rest/multi.js
+++ b/test/end-to-end-tests/src/rest/multi.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 const Logger = require('../logger');
 
-module.exports = class RestMultiSession {
+export default class RestMultiSession {
     constructor(sessions, groupName) {
         this.log = new Logger(groupName);
         this.sessions = sessions;
diff --git a/test/end-to-end-tests/src/rest/room.js b/test/end-to-end-tests/src/rest/room.js
index 429a29c31a..b3ba725336 100644
--- a/test/end-to-end-tests/src/rest/room.js
+++ b/test/end-to-end-tests/src/rest/room.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@ limitations under the License.
 const uuidv4 = require('uuid/v4');
 
 /* no pun intented */
-module.exports = class RestRoom {
+export default class RestRoom {
     constructor(session, roomId, log) {
         this.session = session;
         this._roomId = roomId;
diff --git a/test/end-to-end-tests/src/rest/session.js b/test/end-to-end-tests/src/rest/session.js
index 5b97824f5c..344493968c 100644
--- a/test/end-to-end-tests/src/rest/session.js
+++ b/test/end-to-end-tests/src/rest/session.js
@@ -19,7 +19,7 @@ const Logger = require('../logger');
 const RestRoom = require('./room');
 const {approveConsent} = require('./consent');
 
-module.exports = class RestSession {
+export default class RestSession {
     constructor(credentials) {
         this.log = new Logger(credentials.userId);
         this._credentials = credentials;
diff --git a/test/end-to-end-tests/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
index 3ae728a5b7..cf995ae1a8 100644
--- a/test/end-to-end-tests/src/scenarios/directory.js
+++ b/test/end-to-end-tests/src/scenarios/directory.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ const {receiveMessage} = require('../usecases/timeline');
 const {createRoom} = require('../usecases/create-room');
 const changeRoomSettings = require('../usecases/room-settings');
 
-module.exports = async function roomDirectoryScenarios(alice, bob) {
+export default async function roomDirectoryScenarios(alice, bob) {
     console.log(" creating a public room and join through directory:");
     const room = 'test';
     await createRoom(alice, room);
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 8df374bacb..2a002da66b 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@ const changeRoomSettings = require('../usecases/room-settings');
 const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
 const assert = require('assert');
 
-module.exports = async function e2eEncryptionScenarios(alice, bob) {
+export default async function e2eEncryptionScenarios(alice, bob) {
     console.log(" creating an e2e encrypted room and join through invite:");
     const room = "secrets";
     await createRoom(bob, room);
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index be5a91bb71..651397e426 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ const {getMembersInMemberlist} = require('../usecases/memberlist');
 const changeRoomSettings = require('../usecases/room-settings');
 const assert = require('assert');
 
-module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
+export default async function lazyLoadingScenarios(alice, bob, charlies) {
     console.log(" creating a room for lazy loading member scenarios:");
     const charly1to5 = charlies.slice("charly-1..5", 0, 5);
     const charly6to10 = charlies.slice("charly-6..10", 5);
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 65cec6fef0..b17e55efa4 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@ const {delay} = require('./util');
 
 const DEFAULT_TIMEOUT = 20000;
 
-module.exports = class RiotSession {
+export default class RiotSession {
     constructor(browser, page, username, riotserver, hsUrl) {
         this.browser = browser;
         this.page = page;
diff --git a/test/end-to-end-tests/src/usecases/accept-invite.js b/test/end-to-end-tests/src/usecases/accept-invite.js
index 085c60aa6a..d17f583a77 100644
--- a/test/end-to-end-tests/src/usecases/accept-invite.js
+++ b/test/end-to-end-tests/src/usecases/accept-invite.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-module.exports = async function acceptInvite(session, name) {
+export default async function acceptInvite(session, name) {
     session.log.step(`accepts "${name}" invite`);
     //TODO: brittle selector
     const invitesHandles = await session.queryAll('.mx_RoomTile_name.mx_RoomTile_invite');
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index 75abdc78f4..7ca3826c71 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-async function openRoomDirectory(session) {
+export async function openRoomDirectory(session) {
     const roomDirectoryButton = await session.query('.mx_LeftPanel_explore .mx_AccessibleButton');
     await roomDirectoryButton.click();
 }
 
-async function createRoom(session, roomName) {
+export async function createRoom(session, roomName) {
     session.log.step(`creates room "${roomName}"`);
 
     const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
@@ -42,5 +43,3 @@ async function createRoom(session, roomName) {
     await session.query('.mx_MessageComposer');
     session.log.done();
 }
-
-module.exports = {openRoomDirectory, createRoom};
diff --git a/test/end-to-end-tests/src/usecases/dialog.js b/test/end-to-end-tests/src/usecases/dialog.js
index 7b5d4d09fa..72d024fc79 100644
--- a/test/end-to-end-tests/src/usecases/dialog.js
+++ b/test/end-to-end-tests/src/usecases/dialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,20 +17,20 @@ limitations under the License.
 
 const assert = require('assert');
 
-async function assertDialog(session, expectedTitle) {
+export async function assertDialog(session, expectedTitle) {
     const titleElement = await session.query(".mx_Dialog .mx_Dialog_title");
     const dialogHeader = await session.innerText(titleElement);
     assert(dialogHeader, expectedTitle);
 }
 
-async function acceptDialog(session, expectedTitle) {
+export async function acceptDialog(session, expectedTitle) {
     const foundDialog = await acceptDialogMaybe(session, expectedTitle);
     if (!foundDialog) {
         throw new Error("could not find a dialog");
     }
 }
 
-async function acceptDialogMaybe(session, expectedTitle) {
+export async function acceptDialogMaybe(session, expectedTitle) {
     let primaryButton = null;
     try {
         primaryButton = await session.query(".mx_Dialog .mx_Dialog_primary");
@@ -42,9 +43,3 @@ async function acceptDialogMaybe(session, expectedTitle) {
     await primaryButton.click();
     return true;
 }
-
-module.exports = {
-    assertDialog,
-    acceptDialog,
-    acceptDialogMaybe,
-};
diff --git a/test/end-to-end-tests/src/usecases/invite.js b/test/end-to-end-tests/src/usecases/invite.js
index 814ecd30a6..fc91e4ce16 100644
--- a/test/end-to-end-tests/src/usecases/invite.js
+++ b/test/end-to-end-tests/src/usecases/invite.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-module.exports = async function invite(session, userId) {
+export default async function invite(session, userId) {
     session.log.step(`invites "${userId}" to room`);
     await session.delay(1000);
     const memberPanelButton = await session.query(".mx_RightPanel_membersButton");
diff --git a/test/end-to-end-tests/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
index bc292a0768..4fbc134598 100644
--- a/test/end-to-end-tests/src/usecases/join.js
+++ b/test/end-to-end-tests/src/usecases/join.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 const {openRoomDirectory} = require('./create-room');
 
-module.exports = async function join(session, roomName) {
+export default async function join(session, roomName) {
     session.log.step(`joins room "${roomName}"`);
     await openRoomDirectory(session);
     const roomInput = await session.query('.mx_DirectorySearchBox input');
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index 7655d2d066..d853cf92e4 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,7 +30,7 @@ async function setSettingsToggle(session, toggle, enabled) {
     }
 }
 
-module.exports = async function changeRoomSettings(session, settings) {
+export default async function changeRoomSettings(session, settings) {
     session.log.startGroup(`changes the room settings`);
     /// XXX delay is needed here, possibly because the header is being rerendered
     /// click doesn't do anything otherwise
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index fd2b948572..381b87ec9e 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-module.exports = async function signup(session, username, password, homeserver) {
+export default async function signup(session, username, password, homeserver) {
     session.log.step("signs up");
     await session.goto(session.url('/#/register'));
     // change the homeserver by clicking the advanced section

From 4aec432b30209bfe633221c5a93c13140e69e213 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 17:57:50 -0700
Subject: [PATCH 0087/3235] Convert the more complicated CommonJS exports to
 ES6-style

---
 src/CallHandler.js                            |  6 +--
 src/ObjectUtils.js                            |  9 ++--
 src/Resend.js                                 | 42 ++++++++++---------
 src/VectorConferenceHandler.js                | 28 ++++++-------
 src/components/structures/RoomView.js         |  4 +-
 src/components/views/rooms/EventTile.js       |  8 ++--
 src/index.js                                  | 13 +++---
 test/end-to-end-tests/src/rest/consent.js     |  5 ++-
 .../src/usecases/memberlist.js                | 13 +++---
 .../end-to-end-tests/src/usecases/settings.js |  9 ++--
 .../end-to-end-tests/src/usecases/timeline.js | 13 +++---
 test/end-to-end-tests/src/usecases/verify.js  |  9 ++--
 test/end-to-end-tests/src/util.js             |  9 ++--
 test/mock-clock.js                            |  9 ++--
 14 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index eb5a5c1c8e..7dabaa3fc1 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -302,7 +302,7 @@ function _onAction(payload) {
     switch (payload.action) {
         case 'place_call':
             {
-                if (module.exports.getAnyActiveCall()) {
+                if (callHandler.getAnyActiveCall()) {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
                         title: _t('Existing Call'),
@@ -355,7 +355,7 @@ function _onAction(payload) {
             break;
         case 'incoming_call':
             {
-                if (module.exports.getAnyActiveCall()) {
+                if (callHandler.getAnyActiveCall()) {
                     // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
                     // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
                     // in future we could signal a "local busy" as a warning to the caller.
@@ -523,7 +523,7 @@ if (!global.mxCallHandler) {
 
 const callHandler = {
     getCallForRoom: function(roomId) {
-        let call = module.exports.getCall(roomId);
+        let call = callHandler.getCall(roomId);
         if (call) return call;
 
         if (ConferenceHandler) {
diff --git a/src/ObjectUtils.js b/src/ObjectUtils.js
index 07d8b465af..24dfe61d68 100644
--- a/src/ObjectUtils.js
+++ b/src/ObjectUtils.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ limitations under the License.
  * @return {Object[]} An array of objects with the form:
  * { key: $KEY, val: $VALUE, place: "add|del" }
  */
-module.exports.getKeyValueArrayDiffs = function(before, after) {
+export function getKeyValueArrayDiffs(before, after) {
     const results = [];
     const delta = {};
     Object.keys(before).forEach(function(beforeKey) {
@@ -76,7 +77,7 @@ module.exports.getKeyValueArrayDiffs = function(before, after) {
     });
 
     return results;
-};
+}
 
 /**
  * Shallow-compare two objects for equality: each key and value must be identical
@@ -84,7 +85,7 @@ module.exports.getKeyValueArrayDiffs = function(before, after) {
  * @param {Object} objB Second object to compare against the first
  * @return {boolean} whether the two objects have same key=values
  */
-module.exports.shallowEqual = function(objA, objB) {
+export function shallowEqual(objA, objB) {
     if (objA === objB) {
         return true;
     }
@@ -109,4 +110,4 @@ module.exports.shallowEqual = function(objA, objB) {
     }
 
     return true;
-};
+}
diff --git a/src/Resend.js b/src/Resend.js
index 51ec804c01..563171d73e 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,40 +19,43 @@ import MatrixClientPeg from './MatrixClientPeg';
 import dis from './dispatcher';
 import { EventStatus } from 'matrix-js-sdk';
 
-module.exports = {
-    resendUnsentEvents: function(room) {
-        room.getPendingEvents().filter(function(ev) {
+export default class Resend {
+    static resendUnsentEvents(room) {
+        room.getPendingEvents().filter(function (ev) {
             return ev.status === EventStatus.NOT_SENT;
-        }).forEach(function(event) {
-            module.exports.resend(event);
+        }).forEach(function (event) {
+            Resend.resend(event);
         });
-    },
-    cancelUnsentEvents: function(room) {
-        room.getPendingEvents().filter(function(ev) {
+    }
+
+    static cancelUnsentEvents(room) {
+        room.getPendingEvents().filter(function (ev) {
             return ev.status === EventStatus.NOT_SENT;
-        }).forEach(function(event) {
-            module.exports.removeFromQueue(event);
+        }).forEach(function (event) {
+            Resend.removeFromQueue(event);
         });
-    },
-    resend: function(event) {
+    }
+
+    static resend(event) {
         const room = MatrixClientPeg.get().getRoom(event.getRoomId());
-        MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
+        MatrixClientPeg.get().resendEvent(event, room).then(function (res) {
             dis.dispatch({
                 action: 'message_sent',
                 event: event,
             });
-        }, function(err) {
+        }, function (err) {
             // XXX: temporary logging to try to diagnose
             // https://github.com/vector-im/riot-web/issues/3148
-            console.log('Resend got send failure: ' + err.name + '('+err+')');
+            console.log('Resend got send failure: ' + err.name + '(' + err + ')');
 
             dis.dispatch({
                 action: 'message_send_failed',
                 event: event,
             });
         });
-    },
-    removeFromQueue: function(event) {
+    }
+
+    static removeFromQueue(event) {
         MatrixClientPeg.get().cancelPendingEvent(event);
-    },
-};
+    }
+}
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index e0e333a371..debb5f94b2 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@ import MatrixClientPeg from "./MatrixClientPeg";
 const USER_PREFIX = "fs_";
 const DOMAIN = "matrix.org";
 
-function ConferenceCall(matrixClient, groupChatRoomId) {
+export function ConferenceCall(matrixClient, groupChatRoomId) {
     this.client = matrixClient;
     this.groupRoomId = groupChatRoomId;
-    this.confUserId = module.exports.getConferenceUserIdForRoom(this.groupRoomId);
+    this.confUserId = getConferenceUserIdForRoom(this.groupRoomId);
 }
 
 ConferenceCall.prototype.setup = function() {
@@ -90,7 +91,7 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
  * @param {string} userId The user ID to check.
  * @return {boolean} True if it is a conference bot.
  */
-module.exports.isConferenceUser = function(userId) {
+export function isConferenceUser(userId) {
     if (userId.indexOf("@" + USER_PREFIX) !== 0) {
         return false;
     }
@@ -101,26 +102,26 @@ module.exports.isConferenceUser = function(userId) {
         return /^!.+:.+/.test(decoded);
     }
     return false;
-};
+}
 
-module.exports.getConferenceUserIdForRoom = function(roomId) {
+export function getConferenceUserIdForRoom(roomId) {
     // abuse browserify's core node Buffer support (strip padding ='s)
     const base64RoomId = new Buffer(roomId).toString("base64").replace(/=/g, "");
     return "@" + USER_PREFIX + base64RoomId + ":" + DOMAIN;
-};
+}
 
-module.exports.createNewMatrixCall = function(client, roomId) {
+export function createNewMatrixCall(client, roomId) {
     const confCall = new ConferenceCall(
         client, roomId,
     );
     return confCall.setup();
-};
+}
 
-module.exports.getConferenceCallForRoom = function(roomId) {
+export function getConferenceCallForRoom(roomId) {
     // search for a conference 1:1 call for this group chat room ID
     const activeCall = CallHandler.getAnyActiveCall();
     if (activeCall && activeCall.confUserId) {
-        const thisRoomConfUserId = module.exports.getConferenceUserIdForRoom(
+        const thisRoomConfUserId = getConferenceUserIdForRoom(
             roomId,
         );
         if (thisRoomConfUserId === activeCall.confUserId) {
@@ -128,8 +129,7 @@ module.exports.getConferenceCallForRoom = function(roomId) {
         }
     }
     return null;
-};
+}
 
-module.exports.ConferenceCall = ConferenceCall;
-
-module.exports.slot = 'conference';
+// TODO: Document this.
+export const slot = 'conference';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3f9d680503..c2311586b3 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -66,7 +66,7 @@ if (DEBUG) {
     debuglog = console.log.bind(console);
 }
 
-const RoomContext = PropTypes.shape({
+export const RoomContext = PropTypes.shape({
     canReact: PropTypes.bool.isRequired,
     canReply: PropTypes.bool.isRequired,
     room: PropTypes.instanceOf(Room),
@@ -2002,5 +2002,3 @@ export default createReactClass({
         );
     },
 });
-
-module.exports.RoomContext = RoomContext;
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 8f645522a3..8b8c60e402 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -75,7 +75,7 @@ for (const evType of ALL_RULE_TYPES) {
     stateEventTileTypes[evType] = 'messages.TextualEvent';
 }
 
-function getHandlerTile(ev) {
+export function getHandlerTile(ev) {
     const type = ev.getType();
 
     // don't show verification requests we're not involved in,
@@ -879,7 +879,7 @@ function isMessageEvent(ev) {
     return (messageTypes.includes(ev.getType()));
 }
 
-module.exports.haveTileForEvent = function(e) {
+export function haveTileForEvent(e) {
     // Only messages have a tile (black-rectangle) if redacted
     if (e.isRedacted() && !isMessageEvent(e)) return false;
 
@@ -895,7 +895,7 @@ module.exports.haveTileForEvent = function(e) {
     } else {
         return true;
     }
-};
+}
 
 function E2ePadlockUndecryptable(props) {
     return (
@@ -964,5 +964,3 @@ class E2ePadlock extends React.Component {
         );
     }
 }
-
-module.exports.getHandlerTile = getHandlerTile;
diff --git a/src/index.js b/src/index.js
index 7d0547d9c9..008e15ad90 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@ limitations under the License.
 
 import Skinner from './Skinner';
 
-module.exports.loadSkin = function(skinObject) {
+export function loadSkin(skinObject) {
     Skinner.load(skinObject);
-};
+}
 
-module.exports.resetSkin = function() {
+export function resetSkin() {
     Skinner.reset();
-};
+}
 
-module.exports.getComponent = function(componentName) {
+export function getComponent(componentName) {
     return Skinner.getComponent(componentName);
-};
+}
diff --git a/test/end-to-end-tests/src/rest/consent.js b/test/end-to-end-tests/src/rest/consent.js
index 1e36f541a3..5c424cd6e8 100644
--- a/test/end-to-end-tests/src/rest/consent.js
+++ b/test/end-to-end-tests/src/rest/consent.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@ const request = require('request-promise-native');
 const cheerio = require('cheerio');
 const url = require("url");
 
-module.exports.approveConsent = async function(consentUrl) {
+export async function approveConsent(consentUrl) {
     const body = await request.get(consentUrl);
     const doc = cheerio.load(body);
     const v = doc("input[name=v]").val();
@@ -27,4 +28,4 @@ module.exports.approveConsent = async function(consentUrl) {
     const formAction = doc("form").attr("action");
     const absAction = url.resolve(consentUrl, formAction);
     await request.post(absAction).form({v, u, h});
-};
+}
diff --git a/test/end-to-end-tests/src/usecases/memberlist.js b/test/end-to-end-tests/src/usecases/memberlist.js
index 42601b6610..8d2aacf35c 100644
--- a/test/end-to-end-tests/src/usecases/memberlist.js
+++ b/test/end-to-end-tests/src/usecases/memberlist.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-async function openMemberInfo(session, name) {
+export async function openMemberInfo(session, name) {
     const membersAndNames = await getMembersInMemberlist(session);
     const matchingLabel = membersAndNames.filter((m) => {
         return m.displayName === name;
@@ -24,9 +25,7 @@ async function openMemberInfo(session, name) {
     await matchingLabel.click();
 }
 
-module.exports.openMemberInfo = openMemberInfo;
-
-module.exports.verifyDeviceForUser = async function(session, name, expectedDevice) {
+export async function verifyDeviceForUser(session, name, expectedDevice) {
     session.log.step(`verifies e2e device for ${name}`);
     const membersAndNames = await getMembersInMemberlist(session);
     const matchingLabel = membersAndNames.filter((m) => {
@@ -59,9 +58,9 @@ module.exports.verifyDeviceForUser = async function(session, name, expectedDevic
     const closeMemberInfo = await session.query(".mx_MemberInfo_cancel");
     await closeMemberInfo.click();
     session.log.done();
-};
+}
 
-async function getMembersInMemberlist(session) {
+export async function getMembersInMemberlist(session) {
     const memberPanelButton = await session.query(".mx_RightPanel_membersButton");
     try {
         await session.query(".mx_RightPanel_headerButton_highlight", 500);
@@ -78,5 +77,3 @@ async function getMembersInMemberlist(session) {
         return {label: el, displayName: await session.innerText(el)};
     }));
 }
-
-module.exports.getMembersInMemberlist = getMembersInMemberlist;
diff --git a/test/end-to-end-tests/src/usecases/settings.js b/test/end-to-end-tests/src/usecases/settings.js
index ec675157f2..411ec3b497 100644
--- a/test/end-to-end-tests/src/usecases/settings.js
+++ b/test/end-to-end-tests/src/usecases/settings.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ async function openSettings(session, section) {
     }
 }
 
-module.exports.enableLazyLoading = async function(session) {
+export async function enableLazyLoading(session) {
     session.log.step(`enables lazy loading of members in the lab settings`);
     const settingsButton = await session.query('.mx_BottomLeftMenu_settings');
     await settingsButton.click();
@@ -38,9 +39,9 @@ module.exports.enableLazyLoading = async function(session) {
     const closeButton = await session.query(".mx_RoomHeader_cancelButton");
     await closeButton.click();
     session.log.done();
-};
+}
 
-module.exports.getE2EDeviceFromSettings = async function(session) {
+export async function getE2EDeviceFromSettings(session) {
     session.log.step(`gets e2e device/key from settings`);
     await openSettings(session, "security");
     const deviceAndKey = await session.queryAll(".mx_SettingsTab_section .mx_SecurityUserSettingsTab_deviceInfo code");
@@ -51,4 +52,4 @@ module.exports.getE2EDeviceFromSettings = async function(session) {
     await closeButton.click();
     session.log.done();
     return {id, key};
-};
+}
diff --git a/test/end-to-end-tests/src/usecases/timeline.js b/test/end-to-end-tests/src/usecases/timeline.js
index 3ff9e0f5b4..8a18e2653f 100644
--- a/test/end-to-end-tests/src/usecases/timeline.js
+++ b/test/end-to-end-tests/src/usecases/timeline.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-module.exports.scrollToTimelineTop = async function(session) {
+export async function scrollToTimelineTop(session) {
     session.log.step(`scrolls to the top of the timeline`);
     await session.page.evaluate(() => {
         return Promise.resolve().then(async () => {
@@ -40,9 +41,9 @@ module.exports.scrollToTimelineTop = async function(session) {
         });
     });
     session.log.done();
-};
+}
 
-module.exports.receiveMessage = async function(session, expectedMessage) {
+export async function receiveMessage(session, expectedMessage) {
     session.log.step(`receives message "${expectedMessage.body}" from ${expectedMessage.sender}`);
     // wait for a response to come in that contains the message
     // crude, but effective
@@ -66,10 +67,10 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
     });
     assertMessage(lastMessage, expectedMessage);
     session.log.done();
-};
+}
 
 
-module.exports.checkTimelineContains = async function(session, expectedMessages, sendersDescription) {
+export async function checkTimelineContains(session, expectedMessages, sendersDescription) {
     session.log.step(`checks timeline contains ${expectedMessages.length} ` +
         `given messages${sendersDescription ? ` from ${sendersDescription}`:""}`);
     const eventTiles = await getAllEventTiles(session);
@@ -101,7 +102,7 @@ module.exports.checkTimelineContains = async function(session, expectedMessages,
     });
 
     session.log.done();
-};
+}
 
 function assertMessage(foundMessage, expectedMessage) {
     assert(foundMessage, `message ${JSON.stringify(expectedMessage)} not found in timeline`);
diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index 11ff98d097..a8b71cfe5c 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -37,7 +38,7 @@ async function getSasCodes(session) {
     return sasLabels;
 }
 
-module.exports.startSasVerifcation = async function(session, name) {
+export async function startSasVerifcation(session, name) {
     await startVerification(session, name);
     // expect "Verify device" dialog and click "Begin Verification"
     await assertDialog(session, "Verify device");
@@ -50,9 +51,9 @@ module.exports.startSasVerifcation = async function(session, name) {
     // click "Got it" when verification is done
     await acceptDialog(session);
     return sasCodes;
-};
+}
 
-module.exports.acceptSasVerification = async function(session, name) {
+export async function acceptSasVerification(session, name) {
     await assertDialog(session, "Incoming Verification Request");
     const opponentLabelElement = await session.query(".mx_IncomingSasDialog_opponentProfile h2");
     const opponentLabel = await session.innerText(opponentLabelElement);
@@ -66,4 +67,4 @@ module.exports.acceptSasVerification = async function(session, name) {
     // click "Got it" when verification is done
     await acceptDialog(session);
     return sasCodes;
-};
+}
diff --git a/test/end-to-end-tests/src/util.js b/test/end-to-end-tests/src/util.js
index 699b11b5ce..cafe929eca 100644
--- a/test/end-to-end-tests/src/util.js
+++ b/test/end-to-end-tests/src/util.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-module.exports.range = function(start, amount, step = 1) {
+export function range(start, amount, step = 1) {
     const r = [];
     for (let i = 0; i < amount; ++i) {
         r.push(start + (i * step));
     }
     return r;
-};
+}
 
-module.exports.delay = function(ms) {
+export function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
-};
+}
diff --git a/test/mock-clock.js b/test/mock-clock.js
index 103e186c1f..7cad0e9483 100644
--- a/test/mock-clock.js
+++ b/test/mock-clock.js
@@ -1,5 +1,6 @@
 /*
 Copyright (c) 2008-2015 Pivotal Labs
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -411,10 +412,10 @@ j$.MockDate = function() {
   return MockDate;
 }();
 
-const clock = new j$.Clock(global, function() { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
+const _clock = new j$.Clock(global, function() { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
 
-module.exports.clock = function() {
-    return clock;
-};
+export function clock() {
+    return _clock;
+}
 
 

From d56f0f2a25985f31df177c70ca87983bd921c0d6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:19:56 -0700
Subject: [PATCH 0088/3235] Convert many imports to handle ES6 exports

Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
---
 src/AddThreepid.js                                          | 2 +-
 src/Analytics.js                                            | 2 +-
 src/CallHandler.js                                          | 2 +-
 src/ContentMessages.js                                      | 2 +-
 src/CrossSigningManager.js                                  | 2 +-
 src/Entities.js                                             | 2 +-
 src/GroupAddressPicker.js                                   | 2 +-
 src/IdentityAuthClient.js                                   | 2 +-
 src/KeyRequestHandler.js                                    | 2 +-
 src/Lifecycle.js                                            | 2 +-
 src/MatrixClientPeg.js                                      | 2 +-
 src/Modal.js                                                | 2 +-
 src/Notifier.js                                             | 6 +++---
 src/Registration.js                                         | 2 +-
 src/RoomInvite.js                                           | 2 +-
 src/SlashCommands.js                                        | 2 +-
 src/Terms.js                                                | 2 +-
 src/actions/RoomListActions.js                              | 2 +-
 src/async-components/views/dialogs/ExportE2eKeysDialog.js   | 2 +-
 src/async-components/views/dialogs/ImportE2eKeysDialog.js   | 2 +-
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js        | 2 +-
 .../views/dialogs/keybackup/IgnoreRecoveryReminderDialog.js | 2 +-
 .../views/dialogs/keybackup/NewRecoveryMethodDialog.js      | 2 +-
 .../views/dialogs/keybackup/RecoveryMethodRemovedDialog.js  | 2 +-
 .../dialogs/secretstorage/CreateSecretStorageDialog.js      | 2 +-
 src/autocomplete/CommunityProvider.js                       | 2 +-
 src/autocomplete/NotifProvider.js                           | 2 +-
 src/autocomplete/RoomProvider.js                            | 2 +-
 src/autocomplete/UserProvider.js                            | 2 +-
 src/components/structures/ContextMenu.js                    | 2 +-
 src/components/structures/CustomRoomTagPanel.js             | 2 +-
 src/components/structures/EmbeddedPage.js                   | 2 +-
 src/components/structures/FilePanel.js                      | 2 +-
 src/components/structures/GroupView.js                      | 2 +-
 src/components/structures/InteractiveAuth.js                | 2 +-
 src/components/structures/LeftPanel.js                      | 4 ++--
 src/components/structures/LoggedInView.js                   | 2 +-
 src/components/structures/MatrixChat.js                     | 2 +-
 src/components/structures/MessagePanel.js                   | 2 +-
 src/components/structures/MyGroups.js                       | 2 +-
 src/components/structures/RightPanel.js                     | 2 +-
 src/components/structures/RoomStatusBar.js                  | 2 +-
 src/components/structures/RoomSubList.js                    | 4 ++--
 src/components/structures/RoomView.js                       | 4 ++--
 src/components/structures/TabbedView.js                     | 2 +-
 src/components/structures/TagPanel.js                       | 2 +-
 src/components/structures/TagPanelButtons.js                | 2 +-
 src/components/structures/TimelinePanel.js                  | 2 +-
 src/components/structures/TopLeftMenuButton.js              | 2 +-
 src/components/structures/UserView.js                       | 2 +-
 src/components/structures/ViewSource.js                     | 2 +-
 src/components/structures/auth/ForgotPassword.js            | 2 +-
 src/components/structures/auth/Login.js                     | 2 +-
 src/components/structures/auth/PostRegistration.js          | 2 +-
 src/components/structures/auth/Registration.js              | 2 +-
 src/components/structures/auth/SoftLogout.js                | 2 +-
 src/components/views/auth/AuthHeader.js                     | 2 +-
 src/components/views/auth/AuthPage.js                       | 2 +-
 src/components/views/auth/CountryDropdown.js                | 2 +-
 src/components/views/auth/InteractiveAuthEntryComponents.js | 2 +-
 src/components/views/auth/LanguageSelector.js               | 2 +-
 src/components/views/auth/ModularServerConfig.js            | 2 +-
 src/components/views/auth/PasswordLogin.js                  | 2 +-
 src/components/views/auth/RegistrationForm.js               | 4 ++--
 src/components/views/auth/ServerConfig.js                   | 2 +-
 src/components/views/auth/ServerTypeSelector.js             | 2 +-
 src/components/views/auth/SignInToText.js                   | 2 +-
 src/components/views/auth/Welcome.js                        | 2 +-
 src/components/views/avatars/BaseAvatar.js                  | 2 +-
 src/components/views/avatars/GroupAvatar.js                 | 2 +-
 src/components/views/avatars/MemberAvatar.js                | 2 +-
 src/components/views/avatars/RoomAvatar.js                  | 4 ++--
 .../views/context_menus/GroupInviteTileContextMenu.js       | 2 +-
 src/components/views/context_menus/MessageContextMenu.js    | 2 +-
 src/components/views/context_menus/RoomTileContextMenu.js   | 2 +-
 .../views/context_menus/StatusMessageContextMenu.js         | 2 +-
 src/components/views/context_menus/TagTileContextMenu.js    | 2 +-
 src/components/views/dialogs/AddressPickerDialog.js         | 2 +-
 src/components/views/dialogs/AskInviteAnywayDialog.js       | 2 +-
 src/components/views/dialogs/BugReportDialog.js             | 2 +-
 src/components/views/dialogs/ChangelogDialog.js             | 2 +-
 src/components/views/dialogs/ConfirmAndWaitRedactDialog.js  | 2 +-
 src/components/views/dialogs/ConfirmRedactDialog.js         | 2 +-
 src/components/views/dialogs/ConfirmUserActionDialog.js     | 2 +-
 src/components/views/dialogs/ConfirmWipeDeviceDialog.js     | 2 +-
 src/components/views/dialogs/CreateGroupDialog.js           | 2 +-
 src/components/views/dialogs/CreateRoomDialog.js            | 2 +-
 src/components/views/dialogs/CryptoStoreTooNewDialog.js     | 2 +-
 src/components/views/dialogs/DeactivateAccountDialog.js     | 2 +-
 src/components/views/dialogs/DeviceVerifyDialog.js          | 2 +-
 src/components/views/dialogs/DevtoolsDialog.js              | 2 +-
 src/components/views/dialogs/ErrorDialog.js                 | 2 +-
 src/components/views/dialogs/IncomingSasDialog.js           | 2 +-
 src/components/views/dialogs/InfoDialog.js                  | 2 +-
 src/components/views/dialogs/IntegrationsDisabledDialog.js  | 2 +-
 .../views/dialogs/IntegrationsImpossibleDialog.js           | 2 +-
 src/components/views/dialogs/InteractiveAuthDialog.js       | 2 +-
 src/components/views/dialogs/KeyShareDialog.js              | 2 +-
 src/components/views/dialogs/LogoutDialog.js                | 2 +-
 src/components/views/dialogs/MessageEditHistoryDialog.js    | 2 +-
 src/components/views/dialogs/QuestionDialog.js              | 2 +-
 src/components/views/dialogs/ReportEventDialog.js           | 2 +-
 src/components/views/dialogs/RoomSettingsDialog.js          | 2 +-
 src/components/views/dialogs/RoomUpgradeDialog.js           | 2 +-
 src/components/views/dialogs/RoomUpgradeWarningDialog.js    | 2 +-
 src/components/views/dialogs/SessionRestoreErrorDialog.js   | 2 +-
 src/components/views/dialogs/SetEmailDialog.js              | 4 ++--
 src/components/views/dialogs/SetMxIdDialog.js               | 2 +-
 src/components/views/dialogs/SetPasswordDialog.js           | 2 +-
 src/components/views/dialogs/ShareDialog.js                 | 2 +-
 src/components/views/dialogs/SlashCommandHelpDialog.js      | 2 +-
 src/components/views/dialogs/StorageEvictedDialog.js        | 2 +-
 .../views/dialogs/TabbedIntegrationManagerDialog.js         | 4 ++--
 src/components/views/dialogs/TermsDialog.js                 | 2 +-
 src/components/views/dialogs/TextInputDialog.js             | 2 +-
 src/components/views/dialogs/UnknownDeviceDialog.js         | 2 +-
 src/components/views/dialogs/UploadConfirmDialog.js         | 2 +-
 src/components/views/dialogs/UploadFailureDialog.js         | 2 +-
 src/components/views/dialogs/UserSettingsDialog.js          | 2 +-
 .../views/dialogs/WidgetOpenIDPermissionsDialog.js          | 2 +-
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js       | 2 +-
 .../dialogs/secretstorage/AccessSecretStorageDialog.js      | 2 +-
 src/components/views/elements/AccessibleTooltipButton.js    | 2 +-
 src/components/views/elements/ActionButton.js               | 2 +-
 src/components/views/elements/AddressSelector.js            | 2 +-
 src/components/views/elements/AddressTile.js                | 2 +-
 src/components/views/elements/AppPermission.js              | 2 +-
 src/components/views/elements/AppTile.js                    | 2 +-
 src/components/views/elements/CreateRoomButton.js           | 2 +-
 src/components/views/elements/DeviceVerifyButtons.js        | 2 +-
 src/components/views/elements/DirectorySearchBox.js         | 2 +-
 src/components/views/elements/EditableTextContainer.js      | 2 +-
 src/components/views/elements/ErrorBoundary.js              | 2 +-
 src/components/views/elements/Field.js                      | 2 +-
 src/components/views/elements/GroupsButton.js               | 2 +-
 src/components/views/elements/LanguageDropdown.js           | 2 +-
 src/components/views/elements/ManageIntegsButton.js         | 2 +-
 src/components/views/elements/MemberEventListSummary.js     | 2 +-
 src/components/views/elements/PersistentApp.js              | 2 +-
 src/components/views/elements/Pill.js                       | 2 +-
 src/components/views/elements/ReplyThread.js                | 2 +-
 src/components/views/elements/RoomAliasField.js             | 2 +-
 src/components/views/elements/RoomDirectoryButton.js        | 2 +-
 src/components/views/elements/StartChatButton.js            | 2 +-
 src/components/views/elements/TagTile.js                    | 2 +-
 src/components/views/elements/TextWithTooltip.js            | 2 +-
 src/components/views/elements/TooltipButton.js              | 2 +-
 src/components/views/emojipicker/Category.js                | 2 +-
 src/components/views/emojipicker/EmojiPicker.js             | 2 +-
 src/components/views/emojipicker/QuickReactions.js          | 2 +-
 src/components/views/globals/CookieBar.js                   | 2 +-
 src/components/views/globals/NewVersionBar.js               | 2 +-
 src/components/views/globals/PasswordNagBar.js              | 2 +-
 src/components/views/groups/GroupInviteTile.js              | 2 +-
 src/components/views/groups/GroupMemberInfo.js              | 2 +-
 src/components/views/groups/GroupMemberList.js              | 2 +-
 src/components/views/groups/GroupMemberTile.js              | 2 +-
 src/components/views/groups/GroupPublicityToggle.js         | 2 +-
 src/components/views/groups/GroupRoomInfo.js                | 2 +-
 src/components/views/groups/GroupRoomList.js                | 2 +-
 src/components/views/groups/GroupRoomTile.js                | 2 +-
 src/components/views/groups/GroupTile.js                    | 2 +-
 src/components/views/groups/GroupUserSettings.js            | 2 +-
 src/components/views/messages/EditHistoryMessage.js         | 2 +-
 src/components/views/messages/MFileBody.js                  | 2 +-
 src/components/views/messages/MImageBody.js                 | 2 +-
 src/components/views/messages/MKeyVerificationRequest.js    | 2 +-
 src/components/views/messages/MStickerBody.js               | 2 +-
 src/components/views/messages/MessageActionBar.js           | 2 +-
 src/components/views/messages/MessageEvent.js               | 2 +-
 src/components/views/messages/ReactionsRow.js               | 2 +-
 src/components/views/messages/ReactionsRowButton.js         | 2 +-
 src/components/views/messages/ReactionsRowButtonTooltip.js  | 2 +-
 src/components/views/messages/RoomAvatarEvent.js            | 2 +-
 src/components/views/messages/TextualBody.js                | 2 +-
 src/components/views/messages/TextualEvent.js               | 3 +--
 src/components/views/right_panel/UserInfo.js                | 4 ++--
 src/components/views/room_settings/RelatedGroupSettings.js  | 2 +-
 src/components/views/room_settings/UrlPreviewSettings.js    | 2 +-
 src/components/views/rooms/AppsDrawer.js                    | 4 ++--
 src/components/views/rooms/AuxPanel.js                      | 4 ++--
 src/components/views/rooms/BasicMessageComposer.js          | 2 +-
 src/components/views/rooms/EditMessageComposer.js           | 2 +-
 src/components/views/rooms/EntityTile.js                    | 2 +-
 src/components/views/rooms/EventTile.js                     | 5 ++---
 src/components/views/rooms/MemberDeviceInfo.js              | 2 +-
 src/components/views/rooms/MemberInfo.js                    | 4 ++--
 src/components/views/rooms/MessageComposer.js               | 2 +-
 src/components/views/rooms/MessageComposerFormatBar.js      | 2 +-
 src/components/views/rooms/MessageComposerInput.js          | 2 +-
 src/components/views/rooms/ReplyPreview.js                  | 2 +-
 src/components/views/rooms/RoomBreadcrumbs.js               | 2 +-
 src/components/views/rooms/RoomDetailList.js                | 2 +-
 src/components/views/rooms/RoomDetailRow.js                 | 2 +-
 src/components/views/rooms/RoomHeader.js                    | 2 +-
 src/components/views/rooms/RoomPreviewBar.js                | 2 +-
 src/components/views/rooms/RoomRecoveryReminder.js          | 2 +-
 src/components/views/rooms/RoomTile.js                      | 2 +-
 src/components/views/rooms/RoomTopicEditor.js               | 2 +-
 src/components/views/rooms/RoomUpgradeWarningBar.js         | 2 +-
 src/components/views/rooms/SearchResultTile.js              | 2 +-
 src/components/views/rooms/SearchableEntityList.js          | 2 +-
 src/components/views/rooms/SendMessageComposer.js           | 2 +-
 src/components/views/rooms/SimpleRoomHeader.js              | 2 +-
 src/components/views/rooms/SlateMessageComposer.js          | 2 +-
 src/components/views/rooms/Stickerpicker.js                 | 2 +-
 src/components/views/rooms/ThirdPartyMemberInfo.js          | 2 +-
 src/components/views/rooms/UserTile.js                      | 2 +-
 src/components/views/rooms/WhoIsTypingTile.js               | 2 +-
 src/components/views/settings/ChangeAvatar.js               | 2 +-
 src/components/views/settings/ChangeDisplayName.js          | 2 +-
 src/components/views/settings/CrossSigningPanel.js          | 2 +-
 src/components/views/settings/DevicesPanel.js               | 2 +-
 src/components/views/settings/DevicesPanelEntry.js          | 2 +-
 src/components/views/settings/IntegrationManager.js         | 2 +-
 src/components/views/settings/KeyBackupPanel.js             | 2 +-
 src/components/views/settings/Notifications.js              | 2 +-
 src/components/views/settings/SetIdServer.js                | 2 +-
 src/components/views/settings/SetIntegrationManager.js      | 2 +-
 src/components/views/settings/account/EmailAddresses.js     | 2 +-
 src/components/views/settings/account/PhoneNumbers.js       | 2 +-
 src/components/views/settings/discovery/EmailAddresses.js   | 2 +-
 src/components/views/settings/discovery/PhoneNumbers.js     | 2 +-
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js     | 2 +-
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js      | 2 +-
 .../views/settings/tabs/room/RolesRoomSettingsTab.js        | 2 +-
 .../views/settings/tabs/room/SecurityRoomSettingsTab.js     | 2 +-
 .../views/settings/tabs/user/GeneralUserSettingsTab.js      | 2 +-
 .../views/settings/tabs/user/PreferencesUserSettingsTab.js  | 2 +-
 .../views/settings/tabs/user/SecurityUserSettingsTab.js     | 2 +-
 src/components/views/terms/InlineTermsAgreement.js          | 2 +-
 src/components/views/toasts/VerificationRequestToast.js     | 2 +-
 src/components/views/verification/VerificationCancelled.js  | 2 +-
 src/components/views/verification/VerificationComplete.js   | 2 +-
 src/components/views/verification/VerificationShowSas.js    | 2 +-
 src/components/views/voip/CallPreview.js                    | 2 +-
 src/components/views/voip/CallView.js                       | 2 +-
 src/components/views/voip/IncomingCallBox.js                | 2 +-
 src/components/views/voip/VideoView.js                      | 2 +-
 src/createRoom.js                                           | 2 +-
 src/cryptodevices.js                                        | 2 +-
 src/editor/parts.js                                         | 2 +-
 src/integrations/IntegrationManagerInstance.js              | 2 +-
 src/integrations/IntegrationManagers.js                     | 2 +-
 src/stores/RoomListStore.js                                 | 2 +-
 src/stores/RoomViewStore.js                                 | 2 +-
 src/utils/MultiInviter.js                                   | 2 +-
 src/utils/pillify.js                                        | 2 +-
 src/utils/replaceableComponent.ts                           | 2 +-
 249 files changed, 263 insertions(+), 265 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 694c2e124c..4d027e4cfb 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import sdk from './index';
+import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 import IdentityAuthClient from './IdentityAuthClient';
diff --git a/src/Analytics.js b/src/Analytics.js
index 3e208ad6bd..75b547d3d7 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -18,7 +18,7 @@ import { getCurrentLanguage, _t, _td } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
 import SdkConfig from './SdkConfig';
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 
 const hashRegex = /#\/(groups?|room|user|settings|register|login|forgot_password|home|directory)/;
 const hashVarRegex = /#\/(group|room|user)\/.*$/;
diff --git a/src/CallHandler.js b/src/CallHandler.js
index ecbf6c2c12..a5e6c34ab3 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -56,7 +56,7 @@ limitations under the License.
 import MatrixClientPeg from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 6908a6a18e..4b8b911cfa 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -20,7 +20,7 @@ limitations under the License.
 import extend from './extend';
 import dis from './dispatcher';
 import MatrixClientPeg from './MatrixClientPeg';
-import sdk from './index';
+import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
 import RoomViewStore from './stores/RoomViewStore';
diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index ab0a22e4d5..9f7b9e97ce 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 import MatrixClientPeg from './MatrixClientPeg';
 import { deriveKey } from 'matrix-js-sdk/lib/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/lib/crypto/recoverykey';
diff --git a/src/Entities.js b/src/Entities.js
index 8be1da0db8..3135953744 100644
--- a/src/Entities.js
+++ b/src/Entities.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import sdk from './index';
+import * as sdk from './index';
 
 function isMatch(query, name, uid) {
     query = query.toLowerCase();
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 793f5c9227..2d34af01eb 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import Modal from './Modal';
-import sdk from './';
+import * as sdk from './';
 import MultiInviter from './utils/MultiInviter';
 import { _t } from './languageHandler';
 import MatrixClientPeg from './MatrixClientPeg';
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index c82c93e7a6..a501426865 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -18,7 +18,7 @@ import { createClient, SERVICE_TYPES } from 'matrix-js-sdk';
 
 import MatrixClientPeg from './MatrixClientPeg';
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 import { _t } from './languageHandler';
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 import {
diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index c3de7988b2..8101d24e6e 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import sdk from './index';
+import * as sdk from './index';
 import Modal from './Modal';
 
 export default class KeyRequestHandler {
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index b81b563129..9847c972f4 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -28,7 +28,7 @@ import Presence from './Presence';
 import dis from './dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
 import PlatformPeg from "./PlatformPeg";
 import { sendLoginRequest } from "./Login";
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 46debab731..974c5b6f51 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -22,7 +22,7 @@ import {MatrixClient, MemoryStore} 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 * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
diff --git a/src/Modal.js b/src/Modal.js
index 4fc9fdcb02..29d3af2e74 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -20,7 +20,7 @@ import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import Analytics from './Analytics';
-import sdk from './index';
+import * as sdk from './index';
 import dis from './dispatcher';
 import { _t } from './languageHandler';
 import {defer} from "./utils/promise";
diff --git a/src/Notifier.js b/src/Notifier.js
index dd691d8ca7..73b1eae33c 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -18,11 +18,11 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
-import TextForEvent from './TextForEvent';
+import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
-import Avatar from './Avatar';
+import * as Avatar from './Avatar';
 import dis from './dispatcher';
-import sdk from './index';
+import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
diff --git a/src/Registration.js b/src/Registration.js
index 42e172ca0b..e76e7bc5bf 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -21,7 +21,7 @@ limitations under the License.
  */
 
 import dis from './dispatcher';
-import sdk from './index';
+import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 // import MatrixClientPeg from './MatrixClientPeg';
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 48baad5d9f..80979da372 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -21,7 +21,7 @@ import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
 import { getAddressType } from './UserAddress';
 import createRoom from './createRoom';
-import sdk from './';
+import * as sdk from './';
 import dis from './dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import { _t } from './languageHandler';
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index a9c015fdaf..b9b7866643 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -20,7 +20,7 @@ limitations under the License.
 import React from 'react';
 import MatrixClientPeg from './MatrixClientPeg';
 import dis from './dispatcher';
-import sdk from './index';
+import * as sdk from './index';
 import {_t, _td} from './languageHandler';
 import Modal from './Modal';
 import MultiInviter from './utils/MultiInviter';
diff --git a/src/Terms.js b/src/Terms.js
index 14a7ccb65e..f6a4850446 100644
--- a/src/Terms.js
+++ b/src/Terms.js
@@ -17,7 +17,7 @@ limitations under the License.
 import classNames from 'classnames';
 
 import MatrixClientPeg from './MatrixClientPeg';
-import sdk from './';
+import * as sdk from './';
 import Modal from './Modal';
 
 export class TermsNotSignedError extends Error {}
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index e5911c4e32..854fa1b367 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -20,7 +20,7 @@ import RoomListStore from '../stores/RoomListStore';
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
-import sdk from '../index';
+import * as sdk from '../index';
 
 const RoomListActions = {};
 
diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index ba2e985889..481075d0fa 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -22,7 +22,7 @@ import { _t } from '../../../languageHandler';
 
 import { MatrixClient } from 'matrix-js-sdk';
 import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 const PHASE_EDIT = 1;
 const PHASE_EXPORTING = 2;
diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index de9e819f5a..591c84f5d3 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 
 import { MatrixClient } from 'matrix-js-sdk';
 import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 function readFileAsArrayBuffer(file) {
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3fac00c1b3..3b34c2f7a0 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import FileSaver from 'file-saver';
 
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
diff --git a/src/async-components/views/dialogs/keybackup/IgnoreRecoveryReminderDialog.js b/src/async-components/views/dialogs/keybackup/IgnoreRecoveryReminderDialog.js
index a9df3cca6e..b79911c66e 100644
--- a/src/async-components/views/dialogs/keybackup/IgnoreRecoveryReminderDialog.js
+++ b/src/async-components/views/dialogs/keybackup/IgnoreRecoveryReminderDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from "prop-types";
-import sdk from "../../../../index";
+import * as sdk from "../../../../index";
 import { _t } from "../../../../languageHandler";
 
 export default class IgnoreRecoveryReminderDialog extends React.PureComponent {
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 28281af771..5382aba23b 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from "prop-types";
-import sdk from "../../../../index";
+import * as sdk from "../../../../index";
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import dis from "../../../../dispatcher";
 import { _t } from "../../../../languageHandler";
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 1975fbe6d6..2ca595fdc9 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from "prop-types";
-import sdk from "../../../../index";
+import * as sdk from "../../../../index";
 import dis from "../../../../dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 78ff2a1698..beb7a22157 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import FileSaver from 'file-saver';
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index 0acfd426fb..dce1d279ff 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -21,7 +21,7 @@ import AutocompleteProvider from './AutocompleteProvider';
 import MatrixClientPeg from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
-import sdk from '../index';
+import * as sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeGroupPermalink} from "../utils/permalinks/Permalinks";
 import type {Completion, SelectionRange} from "./Autocompleter";
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index 95cfb34616..1fb9da95c9 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -19,7 +19,7 @@ import AutocompleteProvider from './AutocompleteProvider';
 import { _t } from '../languageHandler';
 import MatrixClientPeg from '../MatrixClientPeg';
 import {PillCompletion} from './Components';
-import sdk from '../index';
+import * as sdk from '../index';
 import type {Completion, SelectionRange} from "./Autocompleter";
 
 const AT_ROOM_REGEX = /@\S*/g;
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index b67abc388e..91b4543432 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -24,7 +24,7 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
 import {getDisplayAliasForRoom} from '../Rooms';
-import sdk from '../index';
+import * as sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../utils/permalinks/Permalinks";
 import type {Completion, SelectionRange} from "./Autocompleter";
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index ac159c8213..3385e13b72 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -22,7 +22,7 @@ import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {PillCompletion} from './Components';
-import sdk from '../index';
+import * as sdk from '../index';
 import QueryMatcher from './QueryMatcher';
 import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js
index e861e3d45f..bc6fd68686 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.js
@@ -21,7 +21,7 @@ import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Key} from "../../Keyboard";
-import sdk from "../../index";
+import * as sdk from "../../index";
 import AccessibleButton from "../views/elements/AccessibleButton";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index ee69d800ed..f378e0f25e 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import CustomRoomTagStore from '../../stores/CustomRoomTagStore';
 import AutoHideScrollbar from './AutoHideScrollbar';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import classNames from 'classnames';
 import * as FormattingUtils from '../../utils/FormattingUtils';
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index ecc01a443d..8cc8a9424e 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';
 import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f5a5912dd5..ef60f71ec9 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -19,7 +19,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 
 import Matrix from 'matrix-js-sdk';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..07a9fbc521 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../MatrixClientPeg';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import { getHostingLink } from '../../utils/HostingLink';
 import { sanitizedHtmlNode } from '../../HtmlUtils';
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 1981310a2f..e7194e9fa4 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -24,7 +24,7 @@ import PropTypes from 'prop-types';
 
 import {getEntryComponentForLoginType} from '../views/auth/InteractiveAuthEntryComponents';
 
-import sdk from '../../index';
+import * as sdk from '../../index';
 
 export default createReactClass({
     displayName: 'InteractiveAuth',
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a0ad2b5c81..080344abc6 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -21,9 +21,9 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
 import { Key } from '../../Keyboard';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
-import VectorConferenceHandler from '../../VectorConferenceHandler';
+import * as VectorConferenceHandler from '../../VectorConferenceHandler';
 import TagPanelButtons from './TagPanelButtons';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index df2eebd7c9..85b794f67f 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -26,7 +26,7 @@ import { Key, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
 import MatrixClientPeg from '../../MatrixClientPeg';
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8105805ab0..1469324aaf 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -38,7 +38,7 @@ import Notifier from '../../Notifier';
 
 import Modal from "../../Modal";
 import Tinter from "../../Tinter";
-import sdk from '../../index';
+import * as sdk from '../../index';
 import { showStartChatInviteDialog, showRoomInviteDialog } from '../../RoomInvite';
 import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index f7d22bc17a..01644d8aff 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
 import {wantsDateSeparator} from '../../DateUtils';
-import sdk from '../../index';
+import * as sdk from '../../index';
 
 import MatrixClientPeg from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 63ae14ba09..3c01c3d6a3 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 1745c9d7dc..bb62699ecf 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -21,7 +21,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import { MatrixClient } from 'matrix-js-sdk';
 import RateLimitedFunc from '../../ratelimitedfunc';
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index b0aa4cb59b..a10faa199a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import { _t, _td } from '../../languageHandler';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2fbd19c428..e16fee64a5 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -19,9 +19,9 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import classNames from 'classnames';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
-import Unread from '../../Unread';
+import * as Unread from '../../Unread';
 import * as RoomNotifs from '../../RoomNotifs';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 import IndicatorScrollbar from './IndicatorScrollbar';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 2f8d274866..fbbc8b56ba 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -35,12 +35,12 @@ import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import CallHandler from '../../CallHandler';
 import dis from '../../dispatcher';
 import Tinter from '../../Tinter';
 import rate_limited_func from '../../ratelimitedfunc';
-import ObjectUtils from '../../ObjectUtils';
+import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
 import eventSearch from '../../Searching';
 
diff --git a/src/components/structures/TabbedView.js b/src/components/structures/TabbedView.js
index 01c68fad62..ae5f9e3ee1 100644
--- a/src/components/structures/TabbedView.js
+++ b/src/components/structures/TabbedView.js
@@ -19,7 +19,7 @@ limitations under the License.
 import * as React from "react";
 import {_t} from '../../languageHandler';
 import PropTypes from "prop-types";
-import sdk from "../../index";
+import * as sdk from "../../index";
 
 /**
  * Represents a tab for the TabbedView.
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index a758092dc8..0724027e37 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -22,7 +22,7 @@ import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
 
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/TagPanelButtons.js b/src/components/structures/TagPanelButtons.js
index 7255e12307..93a596baa3 100644
--- a/src/components/structures/TagPanelButtons.js
+++ b/src/components/structures/TagPanelButtons.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../index';
+import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 41283b5308..d8c2b96424 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -31,7 +31,7 @@ const sdk = require('../../index');
 import { _t } from '../../languageHandler';
 const MatrixClientPeg = require("../../MatrixClientPeg");
 const dis = require("../../dispatcher");
-const ObjectUtils = require('../../ObjectUtils');
+import * as ObjectUtils from "../../ObjectUtils";
 const Modal = require("../../Modal");
 const UserActivity = require("../../UserActivity");
 import { KeyCode } from '../../Keyboard';
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index e7928ab4d7..0d7af81a07 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import {TopLeftMenu} from '../views/context_menus/TopLeftMenu';
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import MatrixClientPeg from '../../MatrixClientPeg';
-import Avatar from '../../Avatar';
+import * as Avatar from '../../Avatar';
 import { _t } from '../../languageHandler';
 import dis from "../../dispatcher";
 import {ContextMenu, ContextMenuButton} from "./ContextMenu";
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index 26d0ff5044..57235093f7 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -19,7 +19,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import Matrix from "matrix-js-sdk";
 import MatrixClientPeg from "../../MatrixClientPeg";
-import sdk from "../../index";
+import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index ef4ede517a..391cbf6eef 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import SyntaxHighlight from '../views/elements/SyntaxHighlight';
 import {_t} from "../../languageHandler";
-import sdk from "../../index";
+import * as sdk from "../../index";
 
 
 module.exports = createReactClass({
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index ada7d4449b..01453f1322 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
 import PasswordReset from "../../../PasswordReset";
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index ade417d156..bdc95d4b94 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import {_t, _td} from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index a77b4d0d56..0395cb8d35 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import AuthPage from "../../views/auth/AuthPage";
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 69f34f764a..20769be4cd 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -21,7 +21,7 @@ import Matrix from 'matrix-js-sdk';
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index da19a852f6..bdc34117d0 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import * as Lifecycle from '../../../Lifecycle';
 import Modal from '../../../Modal';
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
index 193f347857..abf9e8895e 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 module.exports = createReactClass({
     displayName: 'AuthHeader',
diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.js
index bfac6514e2..82f7270121 100644
--- a/src/components/views/auth/AuthPage.js
+++ b/src/components/views/auth/AuthPage.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.auth.AuthPage")
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index d8aa88c798..c55d2419ff 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 import { COUNTRIES } from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index dd661291f3..869e81c1f7 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import url from 'url';
 import classnames from 'classnames';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
diff --git a/src/components/views/auth/LanguageSelector.js b/src/components/views/auth/LanguageSelector.js
index 32862478f4..99578d4504 100644
--- a/src/components/views/auth/LanguageSelector.js
+++ b/src/components/views/auth/LanguageSelector.js
@@ -18,7 +18,7 @@ import SdkConfig from "../../../SdkConfig";
 import {getCurrentLanguage} from "../../../languageHandler";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import PlatformPeg from "../../../PlatformPeg";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import React from 'react';
 
 function onChange(newLang) {
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index 684e8d5912..32418d3462 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import SdkConfig from "../../../SdkConfig";
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 63e77a938d..c836b96a89 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 03fb74462c..d85ad6b3b2 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -20,8 +20,8 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
-import Email from '../../../email';
+import * as sdk from '../../../index';
+import * as Email from '../../../email';
 import { looksValid as phoneNumberLooksValid } from '../../../phonenumber';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index e5523b1e36..a86e27b6c2 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
index ebc2ea6d37..341f81c546 100644
--- a/src/components/views/auth/ServerTypeSelector.js
+++ b/src/components/views/auth/ServerTypeSelector.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import classnames from 'classnames';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import {makeType} from "../../../utils/TypeUtils";
diff --git a/src/components/views/auth/SignInToText.js b/src/components/views/auth/SignInToText.js
index a7acdc6705..7564096b7d 100644
--- a/src/components/views/auth/SignInToText.js
+++ b/src/components/views/auth/SignInToText.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import PropTypes from "prop-types";
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index a110631033..58f117ea36 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
 
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 82db78615e..8218ffdfc6 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { MatrixClient } from 'matrix-js-sdk';
-import AvatarLogic from '../../../Avatar';
+import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 
diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.js
index e8ef2a5279..27122052dd 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
 export default createReactClass({
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 383bab5e79..cb9ef70168 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-const Avatar = require('../../../Avatar');
+import * as Avatar from '../../../Avatar';
 const sdk = require("../../../index");
 const dispatcher = require("../../../dispatcher");
 
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 6f8f236afc..d1e2ed25bb 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -19,8 +19,8 @@ import createReactClass from 'create-react-class';
 import {ContentRepo} from "matrix-js-sdk";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
-import sdk from "../../../index";
-import Avatar from '../../../Avatar';
+import * as sdk from "../../../index";
+import * as Avatar from '../../../Avatar';
 
 module.exports = createReactClass({
     displayName: 'RoomAvatar',
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 3feffbc0d9..6d0f921ed0 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import {Group} from 'matrix-js-sdk';
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index efbfc4322f..876e3b10ac 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -24,7 +24,7 @@ import {EventStatus} from 'matrix-js-sdk';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import Resend from '../../../Resend';
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index f5e68bd20b..d9497d729e 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -21,7 +21,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index 441220c95e..e9dd42f123 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
 
 export default class StatusMessageContextMenu extends React.Component {
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 1af0c9ae66..2be0487ced 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -21,7 +21,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {MenuItem} from "../../structures/ContextMenu";
 
 export default class TagTileContextMenu extends React.Component {
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 2be505a798..a1cdb5d5bb 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
 import { _t, _td } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
index 3d10752ff8..7fa6069478 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.js
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {SettingLevel} from "../../../settings/SettingsStore";
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index a3c4ad96ee..9289947e61 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -19,7 +19,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index 91f1af64e3..e58f56a639 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -17,7 +17,7 @@ Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import request from 'browser-request';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
index db00f445a8..0622dd7dfb 100644
--- a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 /*
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
index c606706ed2..71139155ec 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmRedactDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 /*
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 4d33b2b500..14910fbf6d 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 
diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
index b7ad5c2557..49b558976a 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export default class ConfirmWipeDeviceDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 3430a12e71..b88639ba5a 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 6a73d22708..cdc63b7f88 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import withValidation from '../elements/Validation';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
index 0146420f46..11e202b0cc 100644
--- a/src/components/views/dialogs/CryptoStoreTooNewDialog.js
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 703ecaf092..bbf5dbe943 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import * as Lifecycle from '../../../Lifecycle';
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 0e191cc192..708dfb1dd6 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -20,7 +20,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
 import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 9327e1e54e..dfb15f0e0c 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index f6db0a14a5..15c87990d0 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -28,7 +28,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default createReactClass({
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 0720fedddc..d0a184f543 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 const PHASE_START = 0;
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index c54da480e6..8a8f51c25a 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import classNames from "classnames";
 
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
index 3ab1123f8b..1ca638f0ab 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import dis from '../../../dispatcher';
 
 export default class IntegrationsDisabledDialog extends React.Component {
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.js b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
index 9927f627f1..f12e4232be 100644
--- a/src/components/views/dialogs/IntegrationsImpossibleDialog.js
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export default class IntegrationsImpossibleDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 0b658bad81..ff9f55cb74 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 import AccessibleButton from '../elements/AccessibleButton';
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index 01e3479bb1..f9407213da 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -18,7 +18,7 @@ import Modal from '../../../Modal';
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 import { _t, _td } from '../../../languageHandler';
 
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 47d4153494..67d6574084 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.js b/src/components/views/dialogs/MessageEditHistoryDialog.js
index b5e4daa1c1..24c5d3b682 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import {wantsDateSeparator} from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
 
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 4d2a699898..b165bf79e2 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default createReactClass({
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 394e5ad47d..dd5afeb477 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, {PureComponent} from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import PropTypes from "prop-types";
 import {MatrixEvent} from "matrix-js-sdk";
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 740dc4d2c2..06a3f1301b 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -24,7 +24,7 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
 
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.js
index 6900ac6fe8..d81958c5f0 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index 4c5a1abf7a..1ee1bec987 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index b9f6e77222..935faf0cad 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index b527abffc9..2e38d6a7c4 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -18,8 +18,8 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
-import Email from '../../../email';
+import * as sdk from '../../../index';
+import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 0294c1c700..dffb98443d 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import classnames from 'classnames';
 import { KeyCode } from '../../../Keyboard';
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 0fe65aaca3..c8752afa6c 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index f9e77101fc..842c7fc109 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import QRCode from 'qrcode-react';
 import {RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
diff --git a/src/components/views/dialogs/SlashCommandHelpDialog.js b/src/components/views/dialogs/SlashCommandHelpDialog.js
index fc8cb46342..9e48a92ed1 100644
--- a/src/components/views/dialogs/SlashCommandHelpDialog.js
+++ b/src/components/views/dialogs/SlashCommandHelpDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../languageHandler";
 import {CommandCategories, CommandMap} from "../../../SlashCommands";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export default ({onFinished}) => {
     const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
diff --git a/src/components/views/dialogs/StorageEvictedDialog.js b/src/components/views/dialogs/StorageEvictedDialog.js
index 22fa3ae3ab..a22f302807 100644
--- a/src/components/views/dialogs/StorageEvictedDialog.js
+++ b/src/components/views/dialogs/StorageEvictedDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
index e86a46fb36..9f5c9f6a11 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
@@ -18,10 +18,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import {Room} from "matrix-js-sdk";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {dialogTermsInteractionCallback, TermsNotSignedError} from "../../../Terms";
 import classNames from 'classnames';
-import ScalarMessaging from "../../../ScalarMessaging";
+import * as ScalarMessaging from "../../../ScalarMessaging";
 
 export default class TabbedIntegrationManagerDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index ea090ef080..2d1e62e01a 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import url from 'url';
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t, pickBestLanguage } from '../../../languageHandler';
 
 import Matrix from 'matrix-js-sdk';
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index a5421acaf5..0ffc072cc0 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 export default createReactClass({
     displayName: 'TextInputDialog',
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index e7522e971d..23e84bbe78 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/dialogs/UploadConfirmDialog.js b/src/components/views/dialogs/UploadConfirmDialog.js
index 98c031e89b..28f2183eb0 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.js
+++ b/src/components/views/dialogs/UploadConfirmDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import filesize from "filesize";
 
diff --git a/src/components/views/dialogs/UploadFailureDialog.js b/src/components/views/dialogs/UploadFailureDialog.js
index e264f1a3fb..4be1656f66 100644
--- a/src/components/views/dialogs/UploadFailureDialog.js
+++ b/src/components/views/dialogs/UploadFailureDialog.js
@@ -18,7 +18,7 @@ import filesize from 'filesize';
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
 
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index d3ab2b8722..a3f586cdea 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -28,7 +28,7 @@ import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSet
 import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab";
 import HelpUserSettingsTab from "../settings/tabs/user/HelpUserSettingsTab";
 import FlairUserSettingsTab from "../settings/tabs/user/FlairUserSettingsTab";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
index 62bd1d2521..162cb4736a 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import WidgetUtils from "../../../utils/WidgetUtils";
 
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 45168c381e..99dd118438 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import Modal from '../../../../Modal';
 
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index d116ce505f..64bf54ce8a 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from "prop-types";
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
diff --git a/src/components/views/elements/AccessibleTooltipButton.js b/src/components/views/elements/AccessibleTooltipButton.js
index c824ea4025..401683160a 100644
--- a/src/components/views/elements/AccessibleTooltipButton.js
+++ b/src/components/views/elements/AccessibleTooltipButton.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import AccessibleButton from "./AccessibleButton";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export default class AccessibleTooltipButton extends React.PureComponent {
     static propTypes = {
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index ea9a9bd876..d2277bd69a 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import AccessibleButton from './AccessibleButton';
 import dis from '../../../dispatcher';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
 
 export default createReactClass({
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index fad57890c4..febe0ff480 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import classNames from 'classnames';
 import { UserAddressType } from '../../../UserAddress';
 
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 6d6ac20a5d..5ea6ca110c 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { UserAddressType } from '../../../UserAddress.js';
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index 8dc58643bd..e08e008259 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import url from 'url';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from "../../../utils/WidgetUtils";
 import MatrixClientPeg from "../../../MatrixClientPeg";
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 9f75e5433b..05491cf4d8 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -25,7 +25,7 @@ import WidgetMessaging from '../../../WidgetMessaging';
 import AccessibleButton from './AccessibleButton';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
index da937be3e1..1410bdabdb 100644
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index 15678b7d7a..6867406a03 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index 78a7cb7eba..5fe2f6dbc8 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default class DirectorySearchBox extends React.Component {
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 5cba98470c..53b3a454d2 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 /**
  * A component which wraps an EditableText, with a spinner while updates take
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index e36464c4ef..12708863e5 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 0a737d963a..86f73b68e4 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { debounce } from 'lodash';
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
diff --git a/src/components/views/elements/GroupsButton.js b/src/components/views/elements/GroupsButton.js
index 7b15e96424..dd1118aba0 100644
--- a/src/components/views/elements/GroupsButton.js
+++ b/src/components/views/elements/GroupsButton.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 451c97d958..3ebde884bb 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import * as languageHandler from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
diff --git a/src/components/views/elements/ManageIntegsButton.js b/src/components/views/elements/ManageIntegsButton.js
index 3503d1713b..b631ddee73 100644
--- a/src/components/views/elements/ManageIntegsButton.js
+++ b/src/components/views/elements/ManageIntegsButton.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index ef80efaa68..c47e095e01 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import {MatrixEvent} from "matrix-js-sdk";
 
 module.exports = createReactClass({
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index 19e4be6083..e0155d846b 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -19,7 +19,7 @@ import createReactClass from 'create-react-class';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
 module.exports = createReactClass({
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 12830488b1..b8c8f433f2 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import classNames from 'classnames';
 import { Room, RoomMember, MatrixClient } from 'matrix-js-sdk';
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 55fd028980..0b766807d5 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import dis from '../../../dispatcher';
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 03f4000e59..2f3ddcb929 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -16,7 +16,7 @@ limitations under the License.
 import { _t } from '../../../languageHandler';
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import withValidation from './Validation';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
index 1498157ee4..d0bff4beeb 100644
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
index 2132d63940..f828f8ae4d 100644
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 767980f0a0..28930bbabe 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.js
index f6cef47117..c46bc3bfbb 100644
--- a/src/components/views/elements/TextWithTooltip.js
+++ b/src/components/views/elements/TextWithTooltip.js
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 export default class TextWithTooltip extends React.Component {
     static propTypes = {
diff --git a/src/components/views/elements/TooltipButton.js b/src/components/views/elements/TooltipButton.js
index 0cabf776a4..7d50473469 100644
--- a/src/components/views/elements/TooltipButton.js
+++ b/src/components/views/elements/TooltipButton.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 module.exports = createReactClass({
     displayName: 'TooltipButton',
diff --git a/src/components/views/emojipicker/Category.js b/src/components/views/emojipicker/Category.js
index ba525b76e2..3c4352105e 100644
--- a/src/components/views/emojipicker/Category.js
+++ b/src/components/views/emojipicker/Category.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { CATEGORY_HEADER_HEIGHT, EMOJI_HEIGHT, EMOJIS_PER_ROW } from "./EmojiPicker";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 const OVERFLOW_ROWS = 3;
 
diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index 0ec11c2b38..060bcbae28 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 import * as recent from './recent';
diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js
index 8444fb2d9c..0ecdd127c2 100644
--- a/src/components/views/emojipicker/QuickReactions.js
+++ b/src/components/views/emojipicker/QuickReactions.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { findEmojiData } from '../../../HtmlUtils';
 
diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index 04226468d8..8774e4f1fa 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
 
 export default class CookieBar extends React.Component {
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index abb9334242..c1854ee9f5 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import PlatformPeg from '../../../PlatformPeg';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index 0a4996d0ce..74735ca5ea 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index a21b091145..68020c3228 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { MatrixClient } from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 3dac90fc35..2dd98f8160 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 import GroupStore from '../../../stores/GroupStore';
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 3228a862ce..05af70b266 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index c4b41d23ce..c395b00daa 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { MatrixClient } from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupMemberType } from '../../../groups';
 
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index bacf54382a..b885542300 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import GroupStore from '../../../stores/GroupStore';
 import ToggleSwitch from "../elements/ToggleSwitch";
 
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index f9f7324e23..42d8d89c69 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import GroupStore from '../../../stores/GroupStore';
 
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index d57d5e313f..5fd8c9f31d 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -16,7 +16,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
 import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index ae325d4796..fdf7c932d1 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClient} from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
 
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 3b64c10a1e..aacfab9516 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClient} from 'matrix-js-sdk';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 3cd5731b99..0f49043551 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index dfd4db49b3..d4fc926f03 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -22,7 +22,7 @@ import {formatTime} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
 import {pillifyLinks} from '../../../utils/pillify';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 552b1108d2..cc95bae64b 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import filesize from 'filesize';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 427056203d..74d103fb2b 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -22,7 +22,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 
 import MFileBody from './MFileBody';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index b2a1724fc6..6b71193b37 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from "../../../Modal";
 import { _t } from '../../../languageHandler';
 import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index ed82d49576..9839080661 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import MImageBody from './MImageBody';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 export default class MStickerBody extends MImageBody {
     // Mostly empty to prevent default behaviour of MImageBody
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 81e806cf62..36d764f52f 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -20,7 +20,7 @@ import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
 
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index ba271f95b5..eae6b6f3e3 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
 
diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js
index 3a8cd24518..e8c5563c6b 100644
--- a/src/components/views/messages/ReactionsRow.js
+++ b/src/components/views/messages/ReactionsRow.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { isContentActionable } from '../../../utils/EventUtils';
 import MatrixClientPeg from '../../../MatrixClientPeg';
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
index 89bd6e7938..22714e4fc7 100644
--- a/src/components/views/messages/ReactionsRowButton.js
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index d7e1ef3488..2061a9ffc2 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { unicodeToShortcode } from '../../../HtmlUtils';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index 513e104d12..c72190ad1c 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
 
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 6bf45d9193..a5697712ab 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 import highlight from 'highlight.js';
 import * as HtmlUtils from '../../../HtmlUtils';
 import {formatDate} from '../../../DateUtils';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index be9adeed77..ed63419029 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -17,8 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-
-const TextForEvent = require('../../../TextForEvent');
+import * as TextForEvent from "../../../TextForEvent";
 
 module.exports = createReactClass({
     displayName: 'TextualEvent',
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index af8b4616f8..8201cc6795 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -23,7 +23,7 @@ import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
@@ -32,7 +32,7 @@ import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventTimeline} from "matrix-js-sdk";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import * as RoomViewStore from "../../../stores/RoomViewStore";
+import RoomViewStore from "../../../stores/RoomViewStore";
 import MultiInviter from "../../../utils/MultiInviter";
 import GroupStore from "../../../stores/GroupStore";
 import MatrixClientPeg from "../../../MatrixClientPeg";
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index c30f446f41..f1ecc2ef70 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 7a8332cc9f..15a2d6ac63 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import dis from "../../../dispatcher";
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index e53570dc5b..907d5bca50 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -22,8 +22,8 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import AppTile from '../elements/AppTile';
 import Modal from '../../../Modal';
 import dis from '../../../dispatcher';
-import sdk from '../../../index';
-import ScalarMessaging from '../../../ScalarMessaging';
+import * as sdk from '../../../index';
+import * as ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import WidgetEchoStore from "../../../stores/WidgetEchoStore";
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index a83160ddbf..7add29af49 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -19,9 +19,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import MatrixClientPeg from "../../../MatrixClientPeg";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from "../../../dispatcher";
-import ObjectUtils from '../../../ObjectUtils';
+import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
 import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index c7659e89fb..9638fbe230 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -37,7 +37,7 @@ import TypingStore from "../../../stores/TypingStore";
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 import SettingsStore from "../../../settings/SettingsStore";
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {Key} from "../../../Keyboard";
 
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 34b2d92590..d2cd3cc4d3 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import dis from '../../../dispatcher';
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 0193275ca0..57db1ac240 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 import classNames from "classnames";
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 988482df7f..c3e6eb6ccb 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -24,10 +24,10 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 const classNames = require("classnames");
 import { _t, _td } from '../../../languageHandler';
+import * as TextForEvent from "../../../TextForEvent";
 const Modal = require('../../../Modal');
 
 const sdk = require('../../../index');
-const TextForEvent = require('../../../TextForEvent');
 
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
@@ -35,8 +35,7 @@ import {EventStatus, MatrixClient} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
-
-const ObjectUtils = require('../../../ObjectUtils');
+import * as ObjectUtils from "../../../ObjectUtils";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index ff88c6f6e6..4e2f6d4191 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 1a2c8e2212..f2656dddc5 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -34,11 +34,11 @@ import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
-import Unread from '../../../Unread';
+import * as Unread from '../../../Unread';
 import { findReadReceiptFromUserId } from '../../../utils/Receipt';
 import AccessibleButton from '../elements/AccessibleButton';
 import RoomViewStore from '../../../stores/RoomViewStore';
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 580e3b0d81..ae346cbc70 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import Stickerpicker from './Stickerpicker';
diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js
index 95c896c6fc..79ae9f34e8 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import classNames from 'classnames';
 
 export default class MessageComposerFormatBar extends React.PureComponent {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index cc92f7c750..2510adde9f 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -35,7 +35,7 @@ import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
 import {processCommandInput} from '../../../SlashCommands';
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 import Modal from '../../../Modal';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Analytics from '../../../Analytics';
 
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index caf8feeea2..a0d56b1116 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import dis from '../../../dispatcher';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 79e9f5c862..7611ff58ee 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -21,7 +21,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import RoomAvatar from '../avatars/RoomAvatar';
 import classNames from 'classnames';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import Analytics from "../../../Analytics";
 import * as RoomNotifs from '../../../RoomNotifs';
 import * as FormattingUtils from "../../../utils/FormattingUtils";
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index 19cd24b6e5..db7b86da4f 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 26a4697337..b3a8b68b0d 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import React, {createRef} from 'react';
 import { _t } from '../../../languageHandler';
 import { linkifyElement } from '../../../HtmlUtils';
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index eaf2e733ca..9b15cffcf5 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -18,7 +18,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from "../../../Modal";
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index a43a4df158..80b552ea24 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import classNames from 'classnames';
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 6b7366bc4f..b45dd3a32c 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from "prop-types";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
 import MatrixClientPeg from "../../../MatrixClientPeg";
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 817ada9706..0b8aae9d06 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -24,7 +24,7 @@ import classNames from 'classnames';
 import dis from '../../../dispatcher';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import {ContextMenu, ContextMenuButton, toRightOf} from '../../structures/ContextMenu';
 import * as RoomNotifs from '../../../RoomNotifs';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index a7d11313ff..ed55b66a9a 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from "../../../languageHandler";
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index 58d959ddcc..f7e167b253 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 19ed490683..084d4baffc 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 module.exports = createReactClass({
     displayName: 'SearchResult',
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 024816c6fc..0bd21635ba 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 
 // A list capable of displaying entities which conform to the SearchableEntity
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index af25155588..3b4f3122c0 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -35,7 +35,7 @@ import {parseEvent} from '../../../editor/deserialize';
 import {findEditableEvent} from '../../../utils/EventUtils';
 import SendHistoryManager from "../../../SendHistoryManager";
 import {processCommandInput} from '../../../SlashCommands';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index e1ade691d2..f22d9fc1d0 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import AccessibleButton from '../elements/AccessibleButton';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 // cancel button which is shared between room header and simple room header
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
index ebd9017d73..7714676565 100644
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ b/src/components/views/rooms/SlateMessageComposer.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import { _t, _td } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 24f256e706..f1f1113836 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -17,7 +17,7 @@ import React from 'react';
 import {_t, _td} from '../../../languageHandler';
 import AppTile from '../elements/AppTile';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import WidgetUtils from '../../../utils/WidgetUtils';
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index db6ab479a3..991b20f583 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -20,7 +20,7 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import {MatrixEvent} from "matrix-js-sdk";
 import {_t} from "../../../languageHandler";
 import dis from "../../../dispatcher";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
 
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 76afda6dd7..006bd81c98 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -17,8 +17,8 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
+import * as Avatar from '../../../Avatar';
 
-const Avatar = require("../../../Avatar");
 const sdk = require('../../../index');
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index 0e23286eb6..03cc899977 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import WhoIsTyping from '../../../WhoIsTyping';
+import * as WhoIsTyping from '../../../WhoIsTyping';
 import Timer from '../../../utils/Timer';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 904b17b15f..03147bc06c 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import MatrixClientPeg from "../../../MatrixClientPeg";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 90c761ba3d..946fe606e5 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index ccab886f17..5c7f7a21fe 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -18,7 +18,7 @@ import React from 'react';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { accessSecretStorage } from '../../../CrossSigningManager';
 
 export default class CrossSigningPanel extends React.PureComponent {
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index cb5db10be4..2da0a969af 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 98ba29471d..8702f1e553 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {formatDate} from '../../../DateUtils';
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index 1ab17ca8a0..7d2bed8de0 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher';
 
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 559b1e0ba1..13fc9850b7 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 7345980bff..15899c850c 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SettingsStore, {SettingLevel} from '../../../settings/SettingsStore';
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index a7a2e01c22..64a5ce751c 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -18,7 +18,7 @@ import url from 'url';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import dis from "../../../dispatcher";
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index e205f02e6c..da2953482f 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../languageHandler";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 
 export default class SetIntegrationManager extends React.Component {
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index 07f2a60c38..b41fe13805 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -23,7 +23,7 @@ import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import * as Email from "../../../../email";
 import AddThreepid from "../../../../AddThreepid";
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 
 /*
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index 55e95a9031..57aa5781b1 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -23,7 +23,7 @@ import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import AddThreepid from "../../../../AddThreepid";
 import CountryDropdown from "../../auth/CountryDropdown";
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 
 /*
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index cc3d2d0dad..567d2b4374 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
 import MatrixClientPeg from "../../../../MatrixClientPeg";
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
 
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 4188d1cdc7..84ad7d61e7 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
 import MatrixClientPeg from "../../../../MatrixClientPeg";
-import sdk from '../../../../index';
+import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
 
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 101cd036e5..4fa3fb8649 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher";
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 5d707fcf16..4423ef9ecb 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import {MatrixClient} from "matrix-js-sdk";
 import dis from "../../../../../dispatcher";
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index c826f89916..0c53a13e96 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t, _td} from "../../../../../languageHandler";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
 
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index b44d7b019d..6dea081d96 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
 import Modal from "../../../../../Modal";
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index cae4b19891..d4182a51d3 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -30,7 +30,7 @@ import PropTypes from "prop-types";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import PlatformPeg from "../../../../../PlatformPeg";
 import MatrixClientPeg from "../../../../../MatrixClientPeg";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher";
 import {Service, startTermsFlow} from "../../../../../Terms";
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 6fc854c155..f1d47b5756 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -21,7 +21,7 @@ import {SettingLevel} from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
 
 export default class PreferencesUserSettingsTab extends React.Component {
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 98ec18df5a..8d0ec5bd69 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -23,7 +23,7 @@ import * as FormattingUtils from "../../../../../utils/FormattingUtils";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
-import sdk from "../../../../..";
+import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
 
 export class IgnoredUser extends React.Component {
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.js
index 836b34c585..75e8eccea3 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {_t, pickBestLanguage} from "../../../languageHandler";
-import sdk from "../../..";
+import * as sdk from "../../..";
 
 export default class InlineTermsAgreement extends React.Component {
     static propTypes = {
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 89af91c41f..bf64de665a 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
 import MatrixClientPeg from '../../../MatrixClientPeg';
diff --git a/src/components/views/verification/VerificationCancelled.js b/src/components/views/verification/VerificationCancelled.js
index baace2ca1e..fc2a287359 100644
--- a/src/components/views/verification/VerificationCancelled.js
+++ b/src/components/views/verification/VerificationCancelled.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default class VerificationCancelled extends React.Component {
diff --git a/src/components/views/verification/VerificationComplete.js b/src/components/views/verification/VerificationComplete.js
index 59f7ff924a..2214711b1f 100644
--- a/src/components/views/verification/VerificationComplete.js
+++ b/src/components/views/verification/VerificationComplete.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default class VerificationComplete extends React.Component {
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index e7846a0199..1e7785222f 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 
 function capFirst(s) {
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 15c30dcb5b..24bc29515a 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import CallHandler from '../../../CallHandler';
 import dis from '../../../dispatcher';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 module.exports = createReactClass({
     displayName: 'CallPreview',
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 3a62ffbac2..e76fbf397f 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -18,7 +18,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import dis from '../../../dispatcher';
 import CallHandler from '../../../CallHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 2a2839d103..a7ad7bfdf6 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 
 module.exports = createReactClass({
     displayName: 'IncomingCallBox',
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 83584bcc68..fbb49ed367 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/createRoom.js b/src/createRoom.js
index 0ee90beba8..e0c4922f48 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import MatrixClientPeg from './MatrixClientPeg';
 import Modal from './Modal';
-import sdk from './index';
+import * as sdk from './index';
 import { _t } from './languageHandler';
 import dis from "./dispatcher";
 import * as Rooms from "./Rooms";
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index 161787fcbb..f56a80e1e4 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import Resend from './Resend';
-import sdk from './index';
+import * as sdk from './index';
 import dis from './dispatcher';
 import Modal from './Modal';
 import { _t } from './languageHandler';
diff --git a/src/editor/parts.js b/src/editor/parts.js
index f0b713beb6..137018d7e9 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import AutocompleteWrapperModel from "./autocomplete";
-import Avatar from "../Avatar";
+import * as Avatar from "../Avatar";
 
 class BasePart {
     constructor(text = "") {
diff --git a/src/integrations/IntegrationManagerInstance.js b/src/integrations/IntegrationManagerInstance.js
index 4958209351..3ffe1e5401 100644
--- a/src/integrations/IntegrationManagerInstance.js
+++ b/src/integrations/IntegrationManagerInstance.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import ScalarAuthClient from "../ScalarAuthClient";
-import sdk from "../index";
+import * as sdk from "../index";
 import {dialogTermsInteractionCallback, TermsNotSignedError} from "../Terms";
 import type {Room} from "matrix-js-sdk";
 import Modal from '../Modal';
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index 6c4d2ae4d4..8400b3dc94 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import SdkConfig from '../SdkConfig';
-import sdk from "../index";
+import * as sdk from "../index";
 import Modal from '../Modal';
 import {IntegrationManagerInstance, KIND_ACCOUNT, KIND_CONFIG, KIND_HOMESERVER} from "./IntegrationManagerInstance";
 import type {MatrixClient, MatrixEvent, Room} from "matrix-js-sdk";
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 134870398f..a0785cf10e 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -16,7 +16,7 @@ limitations under the License.
 import {Store} from 'flux/utils';
 import dis from '../dispatcher';
 import DMRoomMap from '../utils/DMRoomMap';
-import Unread from '../Unread';
+import * as Unread from '../Unread';
 import SettingsStore from "../settings/SettingsStore";
 
 /*
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index a3caf876ef..8b25eba356 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -17,7 +17,7 @@ limitations under the License.
 import dis from '../dispatcher';
 import {Store} from 'flux/utils';
 import MatrixClientPeg from '../MatrixClientPeg';
-import sdk from '../index';
+import * as sdk from '../index';
 import Modal from '../Modal';
 import { _t } from '../languageHandler';
 import { getCachedRoomIDForAlias, storeRoomAliasInCache } from '../RoomAliasCache';
diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 887d829d76..2ea1da5bcc 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -19,7 +19,7 @@ import MatrixClientPeg from '../MatrixClientPeg';
 import {getAddressType} from '../UserAddress';
 import GroupStore from '../stores/GroupStore';
 import {_t} from "../languageHandler";
-import sdk from "../index";
+import * as sdk from "../index";
 import Modal from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
 import {defer} from "./promise";
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index e943cfe657..524b0f75bb 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -18,7 +18,7 @@ import ReactDOM from 'react-dom';
 import MatrixClientPeg from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
-import sdk from '../index';
+import * as sdk from '../index';
 
 export function pillifyLinks(nodes, mxEvent) {
     const room = MatrixClientPeg.get().getRoom(mxEvent.getRoomId());
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 4777e2f395..9f617b27f3 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from '../index';
+import * as sdk from '../index';
 
 /**
  * Replaces a component with a skinned version if a skinned version exists.

From be4eeb5e07f79988ef540bc4373ec8ca2d692698 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:54:36 -0700
Subject: [PATCH 0089/3235] Fix js-sdk imports for new module

---
 src/MatrixClientPeg.js                              | 6 +++---
 src/RoomNotifs.js                                   | 2 +-
 src/settings/controllers/NotificationControllers.js | 2 +-
 src/utils/StorageManager.js                         | 2 +-
 src/utils/permalinks/Permalinks.js                  | 2 +-
 src/utils/pillify.js                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 974c5b6f51..f1713ca51f 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -19,9 +19,9 @@ limitations under the License.
 
 import {MatrixClient, MemoryStore} 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 * as 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 * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 5bef4afd25..9fe8bd75e4 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
 export const ALL_MESSAGES = 'all_messages';
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index e78b67e847..0e24b4baac 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -18,7 +18,7 @@ import SettingController from "./SettingController";
 import MatrixClientPeg from '../../MatrixClientPeg';
 
 // XXX: This feels wrong.
-import PushProcessor from "matrix-js-sdk/lib/pushprocessor";
+import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor";
 
 function isMasterRuleEnabled() {
     // Return the value of the master push rule as a default
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index 49a120a470..39466d66ce 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import Matrix from 'matrix-js-sdk';
-import LocalStorageCryptoStore from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
+import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
 import Analytics from '../Analytics';
 
 const localStorage = window.localStorage;
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index aec7243236..25845f93a0 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import MatrixClientPeg from "../../MatrixClientPeg";
 import isIp from "is-ip";
-import utils from 'matrix-js-sdk/lib/utils';
+import * as utils from 'matrix-js-sdk/lib/utils';
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index 524b0f75bb..d0675e4097 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -17,7 +17,7 @@ limitations under the License.
 import ReactDOM from 'react-dom';
 import MatrixClientPeg from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
-import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
 import * as sdk from '../index';
 
 export function pillifyLinks(nodes, mxEvent) {

From 806d728d597c2d68a4f3d3307bd00b05b570146a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 19:08:43 -0700
Subject: [PATCH 0090/3235] Import from the js-sdk's src/ directory

Because ES6 and such.
---
 src/CrossSigningManager.js                               | 4 ++--
 src/MatrixClientPeg.js                                   | 8 ++++----
 src/RoomNotifs.js                                        | 2 +-
 src/components/views/auth/ServerConfig.js                | 2 +-
 src/components/views/dialogs/DeviceVerifyDialog.js       | 2 +-
 src/components/views/messages/MKeyVerificationRequest.js | 2 +-
 src/components/views/rooms/MessageComposerInput.js       | 2 +-
 src/components/views/settings/KeyBackupPanel.js          | 2 +-
 src/components/views/toasts/VerificationRequestToast.js  | 2 +-
 src/settings/controllers/NotificationControllers.js      | 2 +-
 src/utils/StorageManager.js                              | 2 +-
 src/utils/permalinks/Permalinks.js                       | 2 +-
 src/utils/pillify.js                                     | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 9f7b9e97ce..a0919ddb28 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -17,8 +17,8 @@ limitations under the License.
 import Modal from './Modal';
 import * as sdk from './index';
 import MatrixClientPeg from './MatrixClientPeg';
-import { deriveKey } from 'matrix-js-sdk/lib/crypto/key_passphrase';
-import { decodeRecoveryKey } from 'matrix-js-sdk/lib/crypto/recoverykey';
+import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
+import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index f1713ca51f..44a05c2d6e 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -19,15 +19,15 @@ limitations under the License.
 
 import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
 
-import * as 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 * as utils from 'matrix-js-sdk/src/utils';
+import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
+import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set';
 import * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import Modal from './Modal';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler";
 import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 9fe8bd75e4..efc647436b 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
 export const ALL_MESSAGES = 'all_messages';
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index a86e27b6c2..5e17d50b55 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -24,7 +24,7 @@ import { _t } from '../../../languageHandler';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
 import SdkConfig from "../../../SdkConfig";
-import { createClient } from 'matrix-js-sdk/lib/matrix';
+import { createClient } from 'matrix-js-sdk/src/matrix';
 import classNames from 'classnames';
 
 /*
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 708dfb1dd6..8cf5a8536e 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -23,7 +23,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import createRoom from "../../../createRoom";
 import dis from "../../../dispatcher";
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 6b71193b37..ca5b858f2f 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import * as sdk from '../../../index';
 import Modal from "../../../Modal";
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 2510adde9f..c58fe677f5 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -31,7 +31,7 @@ import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerial
 import classNames from 'classnames';
 
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
+import type {MatrixClient} from 'matrix-js-sdk/src/matrix';
 import {processCommandInput} from '../../../SlashCommands';
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 import Modal from '../../../Modal';
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 13fc9850b7..3eb9d5ac72 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import SettingsStore from '../../../../lib/settings/SettingsStore';
+import SettingsStore from '../../../../src/settings/SettingsStore';
 import { accessSecretStorage } from '../../../CrossSigningManager';
 
 export default class KeyBackupPanel extends React.PureComponent {
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index bf64de665a..abc79c38d0 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -20,7 +20,7 @@ import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher";
 
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index 0e24b4baac..37d318eb1d 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -18,7 +18,7 @@ import SettingController from "./SettingController";
 import MatrixClientPeg from '../../MatrixClientPeg';
 
 // XXX: This feels wrong.
-import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor";
+import {PushProcessor} from "matrix-js-sdk/src/pushprocessor";
 
 function isMasterRuleEnabled() {
     // Return the value of the master push rule as a default
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index 39466d66ce..c5a9f7aeed 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import Matrix from 'matrix-js-sdk';
-import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
+import {LocalStorageCryptoStore} from 'matrix-js-sdk/src/crypto/store/localStorage-crypto-store';
 import Analytics from '../Analytics';
 
 const localStorage = window.localStorage;
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 25845f93a0..4b97d1664f 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import MatrixClientPeg from "../../MatrixClientPeg";
 import isIp from "is-ip";
-import * as utils from 'matrix-js-sdk/lib/utils';
+import * as utils from 'matrix-js-sdk/src/utils';
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index d0675e4097..044b04181e 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -17,7 +17,7 @@ limitations under the License.
 import ReactDOM from 'react-dom';
 import MatrixClientPeg from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
-import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 import * as sdk from '../index';
 
 export function pillifyLinks(nodes, mxEvent) {

From 042bd35d79bb640b6f454194a1924f0175a8e665 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 14:13:46 -0700
Subject: [PATCH 0091/3235] Fix MatrixClientPeg imports

---
 src/AddThreepid.js                                           | 2 +-
 src/Avatar.js                                                | 2 +-
 src/CallHandler.js                                           | 2 +-
 src/ContentMessages.js                                       | 2 +-
 src/CrossSigningManager.js                                   | 2 +-
 src/FromWidgetPostMessageApi.js                              | 2 +-
 src/GroupAddressPicker.js                                    | 2 +-
 src/HtmlUtils.js                                             | 2 +-
 src/IdentityAuthClient.js                                    | 2 +-
 src/Lifecycle.js                                             | 2 +-
 src/MatrixClientPeg.js                                       | 5 -----
 src/Notifier.js                                              | 2 +-
 src/Presence.js                                              | 2 +-
 src/Registration.js                                          | 2 +-
 src/Resend.js                                                | 2 +-
 src/RoomInvite.js                                            | 2 +-
 src/RoomNotifs.js                                            | 2 +-
 src/Rooms.js                                                 | 2 +-
 src/ScalarAuthClient.js                                      | 3 +--
 src/ScalarMessaging.js                                       | 2 +-
 src/Searching.js                                             | 2 +-
 src/SlashCommands.js                                         | 2 +-
 src/Terms.js                                                 | 2 +-
 src/TextForEvent.js                                          | 2 +-
 src/Unread.js                                                | 2 +-
 src/VectorConferenceHandler.js                               | 2 +-
 src/WhoIsTyping.js                                           | 2 +-
 src/WidgetMessaging.js                                       | 2 +-
 src/async-components/views/dialogs/EncryptedEventDialog.js   | 3 ++-
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js         | 2 +-
 .../views/dialogs/keybackup/NewRecoveryMethodDialog.js       | 2 +-
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js | 2 +-
 src/autocomplete/CommunityProvider.js                        | 2 +-
 src/autocomplete/NotifProvider.js                            | 2 +-
 src/autocomplete/RoomProvider.js                             | 2 +-
 src/autocomplete/UserProvider.js                             | 2 +-
 src/components/structures/EmbeddedPage.js                    | 2 +-
 src/components/structures/FilePanel.js                       | 2 +-
 src/components/structures/GroupView.js                       | 2 +-
 src/components/structures/LoggedInView.js                    | 2 +-
 src/components/structures/MatrixChat.js                      | 2 +-
 src/components/structures/MessagePanel.js                    | 2 +-
 src/components/structures/NotificationPanel.js               | 3 ++-
 src/components/structures/RoomDirectory.js                   | 4 ++--
 src/components/structures/RoomStatusBar.js                   | 2 +-
 src/components/structures/RoomView.js                        | 2 +-
 src/components/structures/TimelinePanel.js                   | 2 +-
 src/components/structures/TopLeftMenuButton.js               | 2 +-
 src/components/structures/UserView.js                        | 2 +-
 src/components/structures/auth/PostRegistration.js           | 2 +-
 src/components/structures/auth/Registration.js               | 2 +-
 src/components/structures/auth/SoftLogout.js                 | 2 +-
 src/components/views/avatars/GroupAvatar.js                  | 2 +-
 src/components/views/avatars/MemberStatusMessageAvatar.js    | 2 +-
 src/components/views/avatars/RoomAvatar.js                   | 2 +-
 src/components/views/context_menus/MessageContextMenu.js     | 2 +-
 src/components/views/context_menus/RoomTileContextMenu.js    | 2 +-
 .../views/context_menus/StatusMessageContextMenu.js          | 2 +-
 src/components/views/context_menus/TopLeftMenu.js            | 2 +-
 src/components/views/dialogs/AddressPickerDialog.js          | 2 +-
 src/components/views/dialogs/BaseDialog.js                   | 2 +-
 src/components/views/dialogs/CreateGroupDialog.js            | 2 +-
 src/components/views/dialogs/CreateRoomDialog.js             | 2 +-
 src/components/views/dialogs/DeactivateAccountDialog.js      | 2 +-
 src/components/views/dialogs/DeviceVerifyDialog.js           | 2 +-
 src/components/views/dialogs/DevtoolsDialog.js               | 2 +-
 src/components/views/dialogs/IncomingSasDialog.js            | 2 +-
 src/components/views/dialogs/LogoutDialog.js                 | 2 +-
 src/components/views/dialogs/MessageEditHistoryDialog.js     | 2 +-
 src/components/views/dialogs/ReportEventDialog.js            | 2 +-
 src/components/views/dialogs/RoomSettingsDialog.js           | 2 +-
 src/components/views/dialogs/RoomUpgradeDialog.js            | 2 +-
 src/components/views/dialogs/RoomUpgradeWarningDialog.js     | 2 +-
 src/components/views/dialogs/SetMxIdDialog.js                | 2 +-
 src/components/views/dialogs/UnknownDeviceDialog.js          | 2 +-
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js        | 2 +-
 .../views/dialogs/secretstorage/AccessSecretStorageDialog.js | 2 +-
 src/components/views/directory/NetworkDropdown.js            | 2 +-
 src/components/views/elements/AddressTile.js                 | 2 +-
 src/components/views/elements/AppPermission.js               | 2 +-
 src/components/views/elements/AppTile.js                     | 2 +-
 src/components/views/elements/DeviceVerifyButtons.js         | 2 +-
 src/components/views/elements/ErrorBoundary.js               | 2 +-
 src/components/views/elements/ImageView.js                   | 4 +---
 src/components/views/elements/PersistentApp.js               | 2 +-
 src/components/views/elements/Pill.js                        | 2 +-
 src/components/views/elements/RoomAliasField.js              | 2 +-
 src/components/views/emojipicker/ReactionPicker.js           | 2 +-
 src/components/views/groups/GroupInviteTile.js               | 2 +-
 src/components/views/messages/EditHistoryMessage.js          | 2 +-
 src/components/views/messages/MAudioBody.js                  | 2 +-
 src/components/views/messages/MFileBody.js                   | 2 +-
 src/components/views/messages/MKeyVerificationConclusion.js  | 2 +-
 src/components/views/messages/MKeyVerificationRequest.js     | 2 +-
 src/components/views/messages/MVideoBody.js                  | 2 +-
 src/components/views/messages/ReactionsRow.js                | 2 +-
 src/components/views/messages/ReactionsRowButton.js          | 2 +-
 src/components/views/messages/ReactionsRowButtonTooltip.js   | 2 +-
 src/components/views/messages/RoomAvatarEvent.js             | 2 +-
 src/components/views/messages/RoomCreate.js                  | 2 +-
 src/components/views/right_panel/UserInfo.js                 | 2 +-
 src/components/views/room_settings/AliasSettings.js          | 2 +-
 src/components/views/room_settings/RoomProfileSettings.js    | 2 +-
 src/components/views/room_settings/UrlPreviewSettings.js     | 2 +-
 src/components/views/rooms/AppsDrawer.js                     | 2 +-
 src/components/views/rooms/AuxPanel.js                       | 2 +-
 src/components/views/rooms/EventTile.js                      | 2 +-
 src/components/views/rooms/LinkPreviewWidget.js              | 2 +-
 src/components/views/rooms/MemberInfo.js                     | 2 +-
 src/components/views/rooms/MemberList.js                     | 2 +-
 src/components/views/rooms/MessageComposer.js                | 2 +-
 src/components/views/rooms/MessageComposerInput.js           | 2 +-
 src/components/views/rooms/PinnedEventTile.js                | 2 +-
 src/components/views/rooms/PinnedEventsPanel.js              | 2 +-
 src/components/views/rooms/RoomBreadcrumbs.js                | 2 +-
 src/components/views/rooms/RoomDetailRow.js                  | 2 +-
 src/components/views/rooms/RoomHeader.js                     | 2 +-
 src/components/views/rooms/RoomList.js                       | 2 +-
 src/components/views/rooms/RoomNameEditor.js                 | 2 +-
 src/components/views/rooms/RoomPreviewBar.js                 | 2 +-
 src/components/views/rooms/RoomRecoveryReminder.js           | 2 +-
 src/components/views/rooms/RoomTile.js                       | 2 +-
 src/components/views/rooms/RoomUpgradeWarningBar.js          | 2 +-
 src/components/views/rooms/SlateMessageComposer.js           | 2 +-
 src/components/views/rooms/Stickerpicker.js                  | 2 +-
 src/components/views/rooms/ThirdPartyMemberInfo.js           | 2 +-
 src/components/views/rooms/WhoIsTypingTile.js                | 2 +-
 src/components/views/settings/ChangeAvatar.js                | 2 +-
 src/components/views/settings/ChangeDisplayName.js           | 2 +-
 src/components/views/settings/ChangePassword.js              | 2 +-
 src/components/views/settings/CrossSigningPanel.js           | 2 +-
 src/components/views/settings/DevicesPanel.js                | 2 +-
 src/components/views/settings/DevicesPanelEntry.js           | 2 +-
 src/components/views/settings/KeyBackupPanel.js              | 2 +-
 src/components/views/settings/Notifications.js               | 2 +-
 src/components/views/settings/ProfileSettings.js             | 2 +-
 src/components/views/settings/SetIdServer.js                 | 2 +-
 src/components/views/settings/account/EmailAddresses.js      | 2 +-
 src/components/views/settings/account/PhoneNumbers.js        | 2 +-
 src/components/views/settings/discovery/EmailAddresses.js    | 2 +-
 src/components/views/settings/discovery/PhoneNumbers.js      | 2 +-
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js      | 2 +-
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js       | 2 +-
 .../views/settings/tabs/room/NotificationSettingsTab.js      | 2 +-
 .../views/settings/tabs/room/RolesRoomSettingsTab.js         | 2 +-
 .../views/settings/tabs/room/SecurityRoomSettingsTab.js      | 2 +-
 .../views/settings/tabs/user/FlairUserSettingsTab.js         | 2 +-
 .../views/settings/tabs/user/GeneralUserSettingsTab.js       | 2 +-
 .../views/settings/tabs/user/HelpUserSettingsTab.js          | 2 +-
 .../views/settings/tabs/user/MjolnirUserSettingsTab.js       | 2 +-
 .../views/settings/tabs/user/SecurityUserSettingsTab.js      | 2 +-
 .../views/settings/tabs/user/VoiceUserSettingsTab.js         | 2 +-
 src/components/views/toasts/VerificationRequestToast.js      | 2 +-
 src/components/views/voip/CallView.js                        | 2 +-
 src/components/views/voip/IncomingCallBox.js                 | 2 +-
 src/createRoom.js                                            | 2 +-
 src/indexing/EventIndex.js                                   | 2 +-
 src/integrations/IntegrationManagers.js                      | 2 +-
 src/mjolnir/BanList.js                                       | 2 +-
 src/mjolnir/Mjolnir.js                                       | 2 +-
 src/rageshake/submit-rageshake.js                            | 2 +-
 src/settings/controllers/NotificationControllers.js          | 2 +-
 src/settings/handlers/AccountSettingsHandler.js              | 2 +-
 src/settings/handlers/DeviceSettingsHandler.js               | 2 +-
 src/settings/handlers/RoomAccountSettingsHandler.js          | 2 +-
 src/settings/handlers/RoomSettingsHandler.js                 | 2 +-
 src/stores/ActiveWidgetStore.js                              | 2 +-
 src/stores/GroupStore.js                                     | 2 +-
 src/stores/RoomViewStore.js                                  | 2 +-
 src/stores/TagOrderStore.js                                  | 2 +-
 src/stores/TypingStore.js                                    | 2 +-
 src/utils/DMRoomMap.js                                       | 2 +-
 src/utils/DecryptFile.js                                     | 2 +-
 src/utils/EventUtils.js                                      | 2 +-
 src/utils/HostingLink.js                                     | 2 +-
 src/utils/IdentityServerUtils.js                             | 2 +-
 src/utils/KeyVerificationStateObserver.js                    | 2 +-
 src/utils/MultiInviter.js                                    | 2 +-
 src/utils/PasswordScorer.js                                  | 2 +-
 src/utils/WidgetUtils.js                                     | 2 +-
 src/utils/permalinks/Permalinks.js                           | 2 +-
 src/utils/pillify.js                                         | 2 +-
 test/ScalarAuthClient-test.js                                | 2 +-
 test/Terms-test.js                                           | 2 +-
 test/components/structures/GroupView-test.js                 | 2 +-
 test/components/structures/MessagePanel-test.js              | 2 +-
 test/components/views/dialogs/InteractiveAuthDialog-test.js  | 2 +-
 test/components/views/groups/GroupMemberList-test.js         | 2 +-
 test/components/views/rooms/MemberList-test.js               | 2 +-
 test/components/views/rooms/MessageComposerInput-test.js     | 2 +-
 test/components/views/rooms/RoomList-test.js                 | 2 +-
 test/components/views/rooms/RoomSettings-test.js             | 2 +-
 192 files changed, 194 insertions(+), 200 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 4d027e4cfb..7a3250d0ca 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
diff --git a/src/Avatar.js b/src/Avatar.js
index 17860698cb..c74f21bd37 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 'use strict';
 import {ContentRepo} from 'matrix-js-sdk';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
 
 module.exports = {
diff --git a/src/CallHandler.js b/src/CallHandler.js
index a5e6c34ab3..2c22b12a3d 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -53,7 +53,7 @@ limitations under the License.
  * }
  */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import Modal from './Modal';
 import * as sdk from './index';
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 4b8b911cfa..0752b0e59d 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -19,7 +19,7 @@ limitations under the License.
 
 import extend from './extend';
 import dis from './dispatcher';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index a0919ddb28..a242042bdb 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import Modal from './Modal';
 import * as sdk from './index';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 8915c1412f..64caba0fdf 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -20,7 +20,7 @@ import URL from 'url';
 import dis from './dispatcher';
 import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 import RoomViewStore from "./stores/RoomViewStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore from "./settings/SettingsStore";
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 2d34af01eb..9131a89e5d 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -19,7 +19,7 @@ import Modal from './Modal';
 import * as sdk from './';
 import MultiInviter from './utils/MultiInviter';
 import { _t } from './languageHandler';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import GroupStore from './stores/GroupStore';
 import {allSettled} from "./utils/promise";
 
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 2b7384a5aa..3402ee13e3 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -29,7 +29,7 @@ import linkifyMatrix from './linkify-matrix';
 import _linkifyElement from 'linkifyjs/element';
 import _linkifyString from 'linkifyjs/string';
 import classNames from 'classnames';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import url from 'url';
 
 import EMOJIBASE from 'emojibase-data/en/compact.json';
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index a501426865..72432b9a44 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { createClient, SERVICE_TYPES } from 'matrix-js-sdk';
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 9847c972f4..0796e326a0 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import Matrix from 'matrix-js-sdk';
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import EventIndexPeg from './indexing/EventIndexPeg';
 import createMatrixClient from './utils/createMatrixClient';
 import Analytics from './Analytics';
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 44a05c2d6e..9c939f2fd3 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -248,9 +248,4 @@ if (!global.mxMatrixClientPeg) {
     global.mxMatrixClientPeg = new _MatrixClientPeg();
 }
 
-// We export both because the syntax is slightly different with
-// our babel changes. We maintain both for backwards compatibility
-// and for babel to be happy.
-// TODO: Convert this to a single export
-export default global.mxMatrixClientPeg;
 export const MatrixClientPeg = global.mxMatrixClientPeg;
diff --git a/src/Notifier.js b/src/Notifier.js
index 73b1eae33c..0c335a8030 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
diff --git a/src/Presence.js b/src/Presence.js
index 8ef988f171..e3f5169c8f 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 import dis from "./dispatcher";
 import Timer from './utils/Timer';
 
diff --git a/src/Registration.js b/src/Registration.js
index e76e7bc5bf..ac8baa3cca 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -24,7 +24,7 @@ import dis from './dispatcher';
 import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
-// import MatrixClientPeg from './MatrixClientPeg';
+// import {MatrixClientPeg} from './MatrixClientPeg';
 
 // Regex for what a "safe" or "Matrix-looking" localpart would be.
 // TODO: Update as needed for https://github.com/matrix-org/matrix-doc/issues/1514
diff --git a/src/Resend.js b/src/Resend.js
index 51ec804c01..31d541630c 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher';
 import { EventStatus } from 'matrix-js-sdk';
 
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 80979da372..380bb4a7ac 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
 import { getAddressType } from './UserAddress';
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index efc647436b..c67acaf314 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
diff --git a/src/Rooms.js b/src/Rooms.js
index 239e348b58..f65e0ff218 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 
 /**
  * Given a room object, return the alias we should use for it,
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index c67f49ba26..99d6c533a9 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -18,10 +18,9 @@ limitations under the License.
 import url from 'url';
 import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
+import {MatrixClientPeg} from "./MatrixClientPeg";
 const request = require('browser-request');
 
-const MatrixClientPeg = require('./MatrixClientPeg');
-
 import * as Matrix from 'matrix-js-sdk';
 import SdkConfig from "./SdkConfig";
 
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index c0ffc3022d..daee7e3296 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -232,7 +232,7 @@ Example:
 }
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import dis from './dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
diff --git a/src/Searching.js b/src/Searching.js
index f8976c92e4..a5d945f64b 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import EventIndexPeg from "./indexing/EventIndexPeg";
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 
 function serverSideSearch(term, roomId = undefined) {
     let filter;
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index b9b7866643..c855b42c29 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 
 import React from 'react';
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher';
 import * as sdk from './index';
 import {_t, _td} from './languageHandler';
diff --git a/src/Terms.js b/src/Terms.js
index f6a4850446..6ae89f9a2c 100644
--- a/src/Terms.js
+++ b/src/Terms.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import classNames from 'classnames';
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import * as sdk from './';
 import Modal from './Modal';
 
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index c3c8396e26..8a5bddf617 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -13,7 +13,7 @@ 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 MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import CallHandler from './CallHandler';
 import { _t } from './languageHandler';
 import * as Roles from './Roles';
diff --git a/src/Unread.js b/src/Unread.js
index d5c5993974..8b859a07fe 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const MatrixClientPeg = require('./MatrixClientPeg');
+import {MatrixClientPeg} from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
 const sdk = require('./index');
 
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index e0e333a371..0ade4c9daf 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {createNewMatrixCall, Room} from "matrix-js-sdk";
 import CallHandler from './CallHandler';
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 
 // FIXME: this is Riot (Vector) specific code, but will be removed shortly when
 // we switch over to jitsi entirely for video conferencing.
diff --git a/src/WhoIsTyping.js b/src/WhoIsTyping.js
index eb09685cbe..8fce6d8311 100644
--- a/src/WhoIsTyping.js
+++ b/src/WhoIsTyping.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 import { _t } from './languageHandler';
 
 module.exports = {
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 1d8e1b9cd3..d40a8ab637 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -23,7 +23,7 @@ limitations under the License.
 import FromWidgetPostMessageApi from './FromWidgetPostMessageApi';
 import ToWidgetPostMessageApi from './ToWidgetPostMessageApi';
 import Modal from "./Modal";
-import MatrixClientPeg from "./MatrixClientPeg";
+import {MatrixClientPeg} from "./MatrixClientPeg";
 import SettingsStore from "./settings/SettingsStore";
 import WidgetOpenIDPermissionsDialog from "./components/views/dialogs/WidgetOpenIDPermissionsDialog";
 import WidgetUtils from "./utils/WidgetUtils";
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 145203136a..64c36962c4 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -18,8 +18,9 @@ const React = require("react");
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+
 const sdk = require('../../../index');
-const MatrixClientPeg = require("../../../MatrixClientPeg");
 
 module.exports = createReactClass({
     displayName: 'EncryptedEventDialog',
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3b34c2f7a0..56d3c80549 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -19,7 +19,7 @@ import React from 'react';
 import FileSaver from 'file-saver';
 
 import * as sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
 
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 5382aba23b..7a7d130dbe 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
-import MatrixClientPeg from '../../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import dis from "../../../../dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index beb7a22157..df51650719 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import FileSaver from 'file-saver';
 import { _t } from '../../../../languageHandler';
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index dce1d279ff..e67c53b3f4 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
 import * as sdk from '../index';
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index 1fb9da95c9..b433e91b05 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import AutocompleteProvider from './AutocompleteProvider';
 import { _t } from '../languageHandler';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import {PillCompletion} from './Components';
 import * as sdk from '../index';
 import type {Completion, SelectionRange} from "./Autocompleter";
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 91b4543432..bb7f8ae0c9 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -20,7 +20,7 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
 import {getDisplayAliasForRoom} from '../Rooms';
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 3385e13b72..59075b0752 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -25,7 +25,7 @@ import {PillCompletion} from './Components';
 import * as sdk from '../index';
 import QueryMatcher from './QueryMatcher';
 import _sortBy from 'lodash/sortBy';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
 import {makeUserPermalink} from "../utils/permalinks/Permalinks";
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index 8cc8a9424e..85ae414a0a 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -25,7 +25,7 @@ import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
 import classnames from 'classnames';
 
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index ef60f71ec9..03fd2e187a 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import Matrix from 'matrix-js-sdk';
 import * as sdk from '../../index';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import { _t } from '../../languageHandler';
 
 /*
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 07a9fbc521..f3e87befa3 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import { getHostingLink } from '../../utils/HostingLink';
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 85b794f67f..2cc30a5b39 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -29,7 +29,7 @@ import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "../../stores/RoomListStore";
 import { getHomePageUrl } from '../../utils/pages';
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1469324aaf..8dfb3dd74b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -29,7 +29,7 @@ import 'what-input';
 
 import Analytics from "../../Analytics";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
-import MatrixClientPeg from "../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
 import * as RoomListSorter from "../../RoomListSorter";
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 01644d8aff..54b910732a 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -24,7 +24,7 @@ import shouldHideEvent from '../../shouldHideEvent';
 import {wantsDateSeparator} from '../../DateUtils';
 import * as sdk from '../../index';
 
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 470c7c8728..eb46fbe1dc 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -18,8 +18,9 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../languageHandler';
+import {MatrixClientPeg} from "../../MatrixClientPeg";
+
 const sdk = require('../../index');
-const MatrixClientPeg = require("../../MatrixClientPeg");
 
 /*
  * Component which shows the global notification list using a TimelinePanel
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 4823b0976c..f88be944d7 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -18,9 +18,9 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
+import {ContentRepo} from "matrix-js-sdk";
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 
-const MatrixClientPeg = require('../../MatrixClientPeg');
-const ContentRepo = require("matrix-js-sdk").ContentRepo;
 const Modal = require('../../Modal');
 const sdk = require('../../index');
 const dis = require('../../dispatcher');
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index a10faa199a..487ccecd31 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import { _t, _td } from '../../languageHandler';
 import * as sdk from '../../index';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
 import dis from '../../dispatcher';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index fbbc8b56ba..198120428b 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -32,7 +32,7 @@ import {Room} from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
 import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks';
 
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
 import * as sdk from '../../index';
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index d8c2b96424..4763b4104b 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -29,7 +29,7 @@ const EventTimeline = Matrix.EventTimeline;
 
 const sdk = require('../../index');
 import { _t } from '../../languageHandler';
-const MatrixClientPeg = require("../../MatrixClientPeg");
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 const dis = require("../../dispatcher");
 import * as ObjectUtils from "../../ObjectUtils";
 const Modal = require("../../Modal");
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index 0d7af81a07..967805d099 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {TopLeftMenu} from '../views/context_menus/TopLeftMenu';
 import BaseAvatar from '../views/avatars/BaseAvatar';
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as Avatar from '../../Avatar';
 import { _t } from '../../languageHandler';
 import dis from "../../dispatcher";
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index 57235093f7..94159a1da4 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import Matrix from "matrix-js-sdk";
-import MatrixClientPeg from "../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index 0395cb8d35..706ab54de4 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import AuthPage from "../../views/auth/AuthPage";
 
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 20769be4cd..bcdb1953ba 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -29,7 +29,7 @@ import * as ServerType from '../../views/auth/ServerTypeSelector';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
 
 // Phases
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index bdc34117d0..63f590da2e 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import * as Lifecycle from '../../../Lifecycle';
 import Modal from '../../../Modal';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {sendLoginRequest} from "../../../Login";
 import url from 'url';
 import AuthPage from "../../views/auth/AuthPage";
diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.js
index 27122052dd..0da57bcb99 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 export default createReactClass({
     displayName: 'GroupAvatar',
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index ed73dd33b9..18af80991a 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {_t} from "../../../languageHandler";
 import MemberAvatar from '../avatars/MemberAvatar';
 import classNames from 'classnames';
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index d1e2ed25bb..55fe7e07b7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -17,7 +17,7 @@ import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {ContentRepo} from "matrix-js-sdk";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import * as sdk from "../../../index";
 import * as Avatar from '../../../Avatar';
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 876e3b10ac..3aec0e6752 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {EventStatus} from 'matrix-js-sdk';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index d9497d729e..fa4f4f54ba 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import * as Rooms from '../../../Rooms';
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index e9dd42f123..c7cf5607a1 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
 
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index b9aabdc608..b75ec7ce36 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -23,7 +23,7 @@ import LogoutDialog from "../dialogs/LogoutDialog";
 import Modal from "../../../Modal";
 import SdkConfig from '../../../SdkConfig';
 import { getHostingLink } from '../../../utils/HostingLink';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
 
 export class TopLeftMenu extends React.Component {
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index a1cdb5d5bb..d32833b144 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 
 import { _t, _td } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
 import GroupStore from '../../../stores/GroupStore';
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index d83ce46360..1a4523ad80 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -25,7 +25,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 
 import { KeyCode } from '../../../Keyboard';
 import AccessibleButton from '../elements/AccessibleButton';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 
 /**
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index b88639ba5a..d465ef26a2 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 export default createReactClass({
     displayName: 'CreateGroupDialog',
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index cdc63b7f88..41b43af287 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import withValidation from '../elements/Validation';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {Key} from "../../../Keyboard";
 
 export default createReactClass({
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index bbf5dbe943..cd284e3be4 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 8cf5a8536e..afb623c08b 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -19,7 +19,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index dfb15f0e0c..61002f27a2 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Field from "../elements/Field";
 
 class DevtoolsComponent extends React.Component {
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index d0a184f543..76323b55ad 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 67d6574084..64c0b77677 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -19,7 +19,7 @@ import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import SettingsStore from "../../../settings/SettingsStore";
 
 export default class LogoutDialog extends React.Component {
diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.js b/src/components/views/dialogs/MessageEditHistoryDialog.js
index 24c5d3b682..2bdf2be35c 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import * as sdk from "../../../index";
 import {wantsDateSeparator} from '../../../DateUtils';
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index dd5afeb477..3320477557 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -19,7 +19,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import PropTypes from "prop-types";
 import {MatrixEvent} from "matrix-js-sdk";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 /*
  * A dialog for reporting an event.
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 06a3f1301b..67b30e19c8 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -25,7 +25,7 @@ import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
 import * as sdk from "../../../index";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
 
 export default class RoomSettingsDialog extends React.Component {
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.js
index d81958c5f0..dc734718d5 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index 1ee1bec987..02534c5b35 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
 
 export default class RoomUpgradeWarningDialog extends React.Component {
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index dffb98443d..d24715cac0 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import classnames from 'classnames';
 import { KeyCode } from '../../../Keyboard';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 23e84bbe78..c70383061d 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { markAllDevicesKnown } from '../../../cryptodevices';
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 99dd118438..e8f98edc7c 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import Modal from '../../../../Modal';
 
 import { MatrixClient } from 'matrix-js-sdk';
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 64bf54ce8a..c976eb81d0 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from "prop-types";
 import * as sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
 import { Key } from "../../../../Keyboard";
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index bae1ecd5c9..cb6a015d86 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {instanceForInstanceId} from '../../../utils/DirectoryUtils';
 
 const DEFAULT_ICON_URL = require("../../../../res/img/network-matrix.svg");
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 5ea6ca110c..36af5059fc 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import * as sdk from "../../../index";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { UserAddressType } from '../../../UserAddress.js';
 
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index e08e008259..b96001b106 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -22,7 +22,7 @@ import url from 'url';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import WidgetUtils from "../../../utils/WidgetUtils";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 export default class AppPermission extends React.Component {
     static propTypes = {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 05491cf4d8..4b586b1553 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -20,7 +20,7 @@ import url from 'url';
 import qs from 'querystring';
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import WidgetMessaging from '../../../WidgetMessaging';
 import AccessibleButton from './AccessibleButton';
 import Modal from '../../../Modal';
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index 6867406a03..a9dd919a56 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index 12708863e5..a043b350ab 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
 
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index b2f6d0abbb..d92638e005 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -19,9 +19,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-
-const MatrixClientPeg = require('../../../MatrixClientPeg');
-
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {formatDate} from '../../../DateUtils';
 const filesize = require('filesize');
 const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index e0155d846b..df1a3196d6 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -20,7 +20,7 @@ import RoomViewStore from '../../../stores/RoomViewStore';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 module.exports = createReactClass({
     displayName: 'PersistentApp',
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index b8c8f433f2..d2d7434709 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -22,7 +22,7 @@ import dis from '../../../dispatcher';
 import classNames from 'classnames';
 import { Room, RoomMember, MatrixClient } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { getDisplayAliasForRoom } from '../../../Rooms';
 import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks";
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 2f3ddcb929..cacecb5005 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import withValidation from './Validation';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 export default class RoomAliasField extends React.PureComponent {
     static propTypes = {
diff --git a/src/components/views/emojipicker/ReactionPicker.js b/src/components/views/emojipicker/ReactionPicker.js
index c051ab40bb..96894e18d2 100644
--- a/src/components/views/emojipicker/ReactionPicker.js
+++ b/src/components/views/emojipicker/ReactionPicker.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from "prop-types";
 import EmojiPicker from "./EmojiPicker";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 class ReactionPicker extends React.Component {
     static propTypes = {
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 68020c3228..0c484435a4 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -24,7 +24,7 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 
 // XXX this class copies a lot from RoomTile.js
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index d4fc926f03..a28f8e27d8 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -23,7 +23,7 @@ import {MatrixEvent} from 'matrix-js-sdk';
 import {pillifyLinks} from '../../../utils/pillify';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
 
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index e10b175bd7..a642936fec 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -19,7 +19,7 @@
 import React from 'react';
 import MFileBody from './MFileBody';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index cc95bae64b..2177b110a5 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import filesize from 'filesize';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 0bd8e2d3d8..f37f270a77 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ca5b858f2f..5f0a02e6e8 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import * as sdk from '../../../index';
 import Modal from "../../../Modal";
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 8366d0dd01..dfbe632e1c 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import MFileBody from './MFileBody';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js
index e8c5563c6b..3451cdbb2d 100644
--- a/src/components/views/messages/ReactionsRow.js
+++ b/src/components/views/messages/ReactionsRow.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { isContentActionable } from '../../../utils/EventUtils';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 // The maximum number of reactions to initially show on a message.
 const MAX_ITEMS_WHEN_LIMITED = 8;
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
index 22714e4fc7..a7ff7dce96 100644
--- a/src/components/views/messages/ReactionsRowButton.js
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index 2061a9ffc2..59e9d2ad7f 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { unicodeToShortcode } from '../../../HtmlUtils';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index c72190ad1c..4ba7083bd2 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index 9bb6fcc0d8..65539da785 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import dis from '../../../dispatcher';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
 module.exports = createReactClass({
     displayName: 'RoomCreate',
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 8201cc6795..dc4accea09 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -35,7 +35,7 @@ import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import RoomViewStore from "../../../stores/RoomViewStore";
 import MultiInviter from "../../../utils/MultiInviter";
 import GroupStore from "../../../stores/GroupStore";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import E2EIcon from "../rooms/E2EIcon";
 import withLegacyMatrixClient from "../../../utils/withLegacyMatrixClient";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index daf5c6edc2..2c43546c60 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const React = require('react');
 import PropTypes from 'prop-types';
-const MatrixClientPeg = require('../../../MatrixClientPeg');
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 const sdk = require("../../../index");
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 76d2e5be84..56732d425d 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import AccessibleButton from "../elements/AccessibleButton";
 import classNames from 'classnames';
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 15a2d6ac63..7e94ccad09 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -23,7 +23,7 @@ import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import dis from "../../../dispatcher";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 907d5bca50..d73fb633a0 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import AppTile from '../elements/AppTile';
 import Modal from '../../../Modal';
 import dis from '../../../dispatcher';
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 7add29af49..297e64b152 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import dis from "../../../dispatcher";
 import * as ObjectUtils from '../../../ObjectUtils';
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index c3e6eb6ccb..b0a95e1188 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -33,7 +33,7 @@ import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus, MatrixClient} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 2e3a3915d0..1f1792f5d0 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -19,9 +19,9 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { linkifyElement } from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 const sdk = require('../../../index');
-const MatrixClientPeg = require('../../../MatrixClientPeg');
 const ImageUtils = require('../../../ImageUtils');
 const Modal = require('../../../Modal');
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index f2656dddc5..f2e85369c4 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -47,7 +47,7 @@ import MultiInviter from "../../../utils/MultiInviter";
 import SettingsStore from "../../../settings/SettingsStore";
 import E2EIcon from "./E2EIcon";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {EventTimeline} from "matrix-js-sdk";
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 05464b43c9..eecfd6cf96 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -24,7 +24,7 @@ import dis from '../../../dispatcher';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {isValid3pidInvite} from "../../../RoomInvite";
 import rate_limited_func from "../../../ratelimitedfunc";
-const MatrixClientPeg = require("../../../MatrixClientPeg");
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 const sdk = require('../../../index');
 const CallHandler = require("../../../CallHandler");
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index ae346cbc70..8a92175f77 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -18,7 +18,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c58fe677f5..5767309cc0 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -30,7 +30,7 @@ import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerial
 
 import classNames from 'classnames';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import type {MatrixClient} from 'matrix-js-sdk/src/matrix';
 import {processCommandInput} from '../../../SlashCommands';
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 1279c01049..d2715c3e63 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
 import AccessibleButton from "../elements/AccessibleButton";
 import MessageEvent from "../messages/MessageEvent";
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index dd2febdf39..e06e8f95a0 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AccessibleButton from "../elements/AccessibleButton";
 import PinnedEventTile from "./PinnedEventTile";
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 7611ff58ee..5a15a7518b 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, {createRef} from "react";
 import dis from "../../../dispatcher";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import RoomAvatar from '../avatars/RoomAvatar';
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index b3a8b68b0d..66ec733061 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import { _t } from '../../../languageHandler';
 import { linkifyElement } from '../../../HtmlUtils';
 import { ContentRepo } from 'matrix-js-sdk';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 9b15cffcf5..4c1452a29c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from "../../../Modal";
 import RateLimitedFunc from '../../../ratelimitedfunc';
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 210c9394dc..a9b3849e79 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -23,7 +23,7 @@ import ReactDOM from "react-dom";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-const MatrixClientPeg = require("../../../MatrixClientPeg");
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 const CallHandler = require('../../../CallHandler');
 const dis = require("../../../dispatcher");
 const sdk = require('../../../index');
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 375a4b42b1..94e7e3172b 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -17,8 +17,8 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 const sdk = require('../../../index');
-const MatrixClientPeg = require('../../../MatrixClientPeg');
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 80b552ea24..04139aa93d 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index b45dd3a32c..534d198611 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -19,7 +19,7 @@ import PropTypes from "prop-types";
 import * as sdk from "../../../index";
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 
 export default class RoomRecoveryReminder extends React.PureComponent {
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b8aae9d06..10ed397727 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import dis from '../../../dispatcher';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import * as sdk from '../../../index';
 import {ContextMenu, ContextMenuButton, toRightOf} from '../../structures/ContextMenu';
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index f7e167b253..dae5dbfa43 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 module.exports = createReactClass({
     displayName: 'RoomUpgradeWarningBar',
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
index 7714676565..b1f7adbe32 100644
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ b/src/components/views/rooms/SlateMessageComposer.js
@@ -18,7 +18,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import { _t, _td } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index f1f1113836..67ee0d183c 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -16,7 +16,7 @@ limitations under the License.
 import React from 'react';
 import {_t, _td} from '../../../languageHandler';
 import AppTile from '../elements/AppTile';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 991b20f583..f8d9069ca6 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {MatrixEvent} from "matrix-js-sdk";
 import {_t} from "../../../languageHandler";
 import dis from "../../../dispatcher";
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index 03cc899977..439ed67e40 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as WhoIsTyping from '../../../WhoIsTyping';
 import Timer from '../../../utils/Timer';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
 
 module.exports = createReactClass({
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 03147bc06c..7d088d9a40 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 946fe606e5..846fac6a6c 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index a317c46cec..37a8b1a1dc 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -20,7 +20,7 @@ import Field from "../elements/Field";
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-const MatrixClientPeg = require("../../../MatrixClientPeg");
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 const Modal = require("../../../Modal");
 const sdk = require("../../../index");
 
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 5c7f7a21fe..2b191454f6 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import { accessSecretStorage } from '../../../CrossSigningManager';
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 2da0a969af..8b76b26cb9 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 8702f1e553..9ebce281ef 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {formatDate} from '../../../DateUtils';
 
 export default class DevicesPanelEntry extends React.Component {
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 3eb9d5ac72..9e55ad3f06 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import SettingsStore from '../../../../src/settings/SettingsStore';
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 15899c850c..f3448f7bb5 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import SettingsStore, {SettingLevel} from '../../../settings/SettingsStore';
 import Modal from '../../../Modal';
 import {
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index a878a8cc3f..7f7d2c8e8c 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import {_t} from "../../../languageHandler";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import AccessibleButton from "../elements/AccessibleButton";
 import classNames from 'classnames';
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index 64a5ce751c..995959dc90 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from '../../../index';
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import dis from "../../../dispatcher";
 import { getThreepidsWithBindStatus } from '../../../boundThreepids';
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index b41fe13805..5c7f9b24d3 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../languageHandler";
-import MatrixClientPeg from "../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import * as Email from "../../../../email";
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index 57aa5781b1..a59fd60eca 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../languageHandler";
-import MatrixClientPeg from "../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 import AddThreepid from "../../../../AddThreepid";
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index 567d2b4374..afc538bd33 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
-import MatrixClientPeg from "../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 84ad7d61e7..17fc99458f 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { _t } from "../../../../languageHandler";
-import MatrixClientPeg from "../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 4fa3fb8649..6be868dc40 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 4423ef9ecb..f0ebd2d7fd 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import {MatrixClient} from "matrix-js-sdk";
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 448963dacf..9db27651c0 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index 0c53a13e96..42947d1fb2 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t, _td} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 6dea081d96..0c66503c43 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
index 0063a9a981..b5f3849729 100644
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import PropTypes from "prop-types";
 import {MatrixClient} from "matrix-js-sdk";
 
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index d4182a51d3..908968b051 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -29,7 +29,7 @@ import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import PlatformPeg from "../../../../../PlatformPeg";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher";
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 875f0bfc10..0cf67a4db7 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t, getCurrentLanguage} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import SdkConfig from "../../../../../SdkConfig";
 import createRoom from "../../../../../createRoom";
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index 608be0b129..575221c780 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -20,7 +20,7 @@ import {Mjolnir} from "../../../../../mjolnir/Mjolnir";
 import {ListRule} from "../../../../../mjolnir/ListRule";
 import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 
 const sdk = require("../../../../..");
 
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 8d0ec5bd69..e816a03e90 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as FormattingUtils from "../../../../../utils/FormattingUtils";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Analytics from "../../../../../Analytics";
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index 18ea5a82be..d0119ecbbf 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -20,9 +20,9 @@ import CallMediaHandler from "../../../../../CallMediaHandler";
 import Field from "../../../elements/Field";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 const Modal = require("../../../../../Modal");
 const sdk = require("../../../../..");
-const MatrixClientPeg = require("../../../../../MatrixClientPeg");
 
 export default class VoiceUserSettingsTab extends React.Component {
     constructor() {
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index abc79c38d0..f6923025d7 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher";
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index e76fbf397f..5b3b198472 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -19,7 +19,7 @@ import createReactClass from 'create-react-class';
 import dis from '../../../dispatcher';
 import CallHandler from '../../../CallHandler';
 import * as sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index a7ad7bfdf6..4304cac912 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
diff --git a/src/createRoom.js b/src/createRoom.js
index e0c4922f48..ac943663ff 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index cf7e2d8da2..c912e31fa5 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import PlatformPeg from "../PlatformPeg";
-import MatrixClientPeg from "../MatrixClientPeg";
+import {MatrixClientPeg} from "../MatrixClientPeg";
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index 8400b3dc94..b482ec73ce 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -20,7 +20,7 @@ import Modal from '../Modal';
 import {IntegrationManagerInstance, KIND_ACCOUNT, KIND_CONFIG, KIND_HOMESERVER} from "./IntegrationManagerInstance";
 import type {MatrixClient, MatrixEvent, Room} from "matrix-js-sdk";
 import WidgetUtils from "../utils/WidgetUtils";
-import MatrixClientPeg from "../MatrixClientPeg";
+import {MatrixClientPeg} from "../MatrixClientPeg";
 import {AutoDiscovery} from "matrix-js-sdk";
 import SettingsStore from "../settings/SettingsStore";
 
diff --git a/src/mjolnir/BanList.js b/src/mjolnir/BanList.js
index 60a924a52b..21cd5d4cf7 100644
--- a/src/mjolnir/BanList.js
+++ b/src/mjolnir/BanList.js
@@ -17,7 +17,7 @@ limitations under the License.
 // Inspiration largely taken from Mjolnir itself
 
 import {ListRule, RECOMMENDATION_BAN, recommendationToStable} from "./ListRule";
-import MatrixClientPeg from "../MatrixClientPeg";
+import {MatrixClientPeg} from "../MatrixClientPeg";
 
 export const RULE_USER = "m.room.rule.user";
 export const RULE_ROOM = "m.room.rule.room";
diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 7539dfafb0..4970d8e8af 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "../MatrixClientPeg";
+import {MatrixClientPeg} from "../MatrixClientPeg";
 import {ALL_RULE_TYPES, BanList} from "./BanList";
 import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
 import {_t} from "../languageHandler";
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 457958eb82..019da10d52 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import pako from 'pako';
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import PlatformPeg from '../PlatformPeg';
 import { _t } from '../languageHandler';
 
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index 37d318eb1d..ada4155206 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 
 // XXX: This feels wrong.
 import {PushProcessor} from "matrix-js-sdk/src/pushprocessor";
diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index 7b05ad0c1b..fea2e92c62 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import {SettingLevel} from "../SettingsStore";
 
diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index ed61e9f3be..44f89b9086 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import SettingsHandler from "./SettingsHandler";
-import MatrixClientPeg from "../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import {SettingLevel} from "../SettingsStore";
 
 /**
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 0206711db2..1e9d3f7bed 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import {SettingLevel} from "../SettingsStore";
 
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index 79626e2186..6407818450 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../../MatrixClientPeg';
+import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import {SettingLevel} from "../SettingsStore";
 
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index 82a7f7932c..60ea3f9106 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import EventEmitter from 'events';
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 /**
  * Stores information about the widgets active in the app right now:
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 637e87b728..f691a33e6f 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -17,7 +17,7 @@ limitations under the License.
 import EventEmitter from 'events';
 import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 function parseMembersResponse(response) {
     return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 8b25eba356..a96174234a 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 import dis from '../dispatcher';
 import {Store} from 'flux/utils';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import * as sdk from '../index';
 import Modal from '../Modal';
 import { _t } from '../languageHandler';
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 48a8817270..3ca9e39560 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -18,7 +18,7 @@ import dis from '../dispatcher';
 import GroupStore from './GroupStore';
 import Analytics from '../Analytics';
 import * as RoomNotifs from "../RoomNotifs";
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 const INITIAL_STATE = {
     orderedTags: null,
diff --git a/src/stores/TypingStore.js b/src/stores/TypingStore.js
index 71ae4f55a3..e86d698eac 100644
--- a/src/stores/TypingStore.js
+++ b/src/stores/TypingStore.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "../MatrixClientPeg";
+import {MatrixClientPeg} from "../MatrixClientPeg";
 import SettingsStore from "../settings/SettingsStore";
 import Timer from "../utils/Timer";
 
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index af65b6f001..de6d42e4a2 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import _uniq from 'lodash/uniq';
 
 /**
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index f193bd7709..b87b723ed7 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -20,7 +20,7 @@ import encrypt from 'browser-encrypt-attachment';
 // Pull in a fetch polyfill so we can download encrypted attachments.
 import 'isomorphic-fetch';
 // Grab the client so that we can turn mxc:// URLs into https:// URLS.
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 // WARNING: We have to be very careful about what mime-types we allow into blobs,
 // as for performance reasons these are now rendered via URL.createObjectURL()
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 29af5ca9b5..8acf5ae396 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { EventStatus } from 'matrix-js-sdk';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import shouldHideEvent from "../shouldHideEvent";
 /**
  * Returns whether an event should allow actions like reply, reactions, edit, etc.
diff --git a/src/utils/HostingLink.js b/src/utils/HostingLink.js
index ff1ac3d063..580ed00de5 100644
--- a/src/utils/HostingLink.js
+++ b/src/utils/HostingLink.js
@@ -18,7 +18,7 @@ import url from 'url';
 import qs from 'qs';
 
 import SdkConfig from '../SdkConfig';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 export function getHostingLink(campaign) {
     const hostingLink = SdkConfig.get().hosting_signup_link;
diff --git a/src/utils/IdentityServerUtils.js b/src/utils/IdentityServerUtils.js
index cf180e3026..093d4eeabf 100644
--- a/src/utils/IdentityServerUtils.js
+++ b/src/utils/IdentityServerUtils.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { SERVICE_TYPES } from 'matrix-js-sdk';
 import SdkConfig from '../SdkConfig';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 
 export function getDefaultIdentityServerUrl() {
     return SdkConfig.get()['validated_server_config']['isUrl'];
diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 2f7c0367ad..d84a5f584e 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import { _t } from '../languageHandler';
 
 const SUB_EVENT_TYPES_OF_INTEREST = ["start", "cancel", "done"];
diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 2ea1da5bcc..7d1c900360 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import {getAddressType} from '../UserAddress';
 import GroupStore from '../stores/GroupStore';
 import {_t} from "../languageHandler";
diff --git a/src/utils/PasswordScorer.js b/src/utils/PasswordScorer.js
index 3c366a73f8..9d89942bf5 100644
--- a/src/utils/PasswordScorer.js
+++ b/src/utils/PasswordScorer.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import zxcvbn from 'zxcvbn';
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import { _t, _td } from '../languageHandler';
 
 const ZXCVBN_USER_INPUTS = [
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 9bab78dee4..c09cd8a858 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher';
 import * as url from "url";
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 4b97d1664f..591cdbb576 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import MatrixClientPeg from "../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import isIp from "is-ip";
 import * as utils from 'matrix-js-sdk/src/utils';
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index 044b04181e..8c2eda5f71 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import ReactDOM from 'react-dom';
-import MatrixClientPeg from '../MatrixClientPeg';
+import {MatrixClientPeg} from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
 import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 import * as sdk from '../index';
diff --git a/test/ScalarAuthClient-test.js b/test/ScalarAuthClient-test.js
index 7e944189a6..a3a95c7053 100644
--- a/test/ScalarAuthClient-test.js
+++ b/test/ScalarAuthClient-test.js
@@ -19,7 +19,7 @@ import expect from 'expect';
 import sinon from 'sinon';
 
 import ScalarAuthClient from '../src/ScalarAuthClient';
-import MatrixClientPeg from '../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../src/MatrixClientPeg';
 import { stubClient } from './test-utils';
 
 describe('ScalarAuthClient', function() {
diff --git a/test/Terms-test.js b/test/Terms-test.js
index 3fc7b56e42..6b102a5eda 100644
--- a/test/Terms-test.js
+++ b/test/Terms-test.js
@@ -22,7 +22,7 @@ import * as Matrix from 'matrix-js-sdk';
 
 import { startTermsFlow, Service } from '../src/Terms';
 import { stubClient } from './test-utils';
-import MatrixClientPeg from '../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../src/MatrixClientPeg';
 
 const POLICY_ONE = {
     version: "six",
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index b0768d3911..45b524c4ed 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -20,7 +20,7 @@ import ReactTestUtils from 'react-dom/test-utils';
 import expect from 'expect';
 
 import MockHttpBackend from 'matrix-mock-request';
-import MatrixClientPeg from '../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../src/MatrixClientPeg';
 import sdk from 'matrix-react-sdk';
 import Matrix from 'matrix-js-sdk';
 
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 7c52512bc2..60a392047b 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -29,7 +29,7 @@ import { EventEmitter } from "events";
 const sdk = require('matrix-react-sdk');
 
 const MessagePanel = sdk.getComponent('structures.MessagePanel');
-import MatrixClientPeg from '../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../src/MatrixClientPeg';
 import Matrix from 'matrix-js-sdk';
 
 const test_utils = require('test-utils');
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index 5f90e0f21c..850e4e94d5 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -22,7 +22,7 @@ import sinon from 'sinon';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
 
 import sdk from 'matrix-react-sdk';
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 
 import * as test_utils from '../../../test-utils';
 import {sleep} from "../../../../src/utils/promise";
diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 3922610644..32bf25f570 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -20,7 +20,7 @@ import ReactTestUtils from "react-dom/test-utils";
 import expect from "expect";
 
 import MockHttpBackend from "matrix-mock-request";
-import MatrixClientPeg from "../../../../src/MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../src/MatrixClientPeg";
 import sdk from "matrix-react-sdk";
 import Matrix from "matrix-js-sdk";
 
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index 9a1439c2f7..635d0753fd 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -7,7 +7,7 @@ import lolex from 'lolex';
 import * as TestUtils from 'test-utils';
 
 import sdk from '../../../../src/index';
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 
 import {Room, RoomMember, User} from 'matrix-js-sdk';
 
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 60380eecd2..6adae13181 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -6,7 +6,7 @@ import sinon from 'sinon';
 import * as testUtils from '../../../test-utils';
 import sdk from 'matrix-react-sdk';
 const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 import {sleep} from "../../../../src/utils/promise";
 
 function addTextToDraft(text) {
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 68168fcf29..0df968824d 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -7,7 +7,7 @@ import lolex from 'lolex';
 import * as TestUtils from 'test-utils';
 
 import sdk from '../../../../src/index';
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 import { DragDropContext } from 'react-beautiful-dnd';
 
 import dis from '../../../../src/dispatcher';
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 1c0bfd95dc..b0ed832c6d 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -6,7 +6,7 @@
 // import * as testUtils from '../../../test-utils';
 // import sdk from 'matrix-react-sdk';
 // const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
-// import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+// import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 // import SettingsStore from '../../../../src/settings/SettingsStore';
 //
 //

From f1ac3d2f646007946d5a8ce440ec630833c6a5f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 14:41:07 -0700
Subject: [PATCH 0092/3235] Convert imports to ES6 from CommonJS

This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
---
 src/ScalarAuthClient.js                           |  2 +-
 src/Unread.js                                     |  2 +-
 src/Velociraptor.js                               |  6 +++---
 src/VelocityBounce.js                             |  2 +-
 src/actions/RoomListActions.js                    |  1 -
 .../views/dialogs/EncryptedEventDialog.js         |  2 +-
 .../dialogs/keybackup/CreateKeyBackupDialog.js    |  1 -
 src/autocomplete/CommunityProvider.js             |  2 +-
 src/autocomplete/DuckDuckGoProvider.js            |  2 +-
 src/autocomplete/NotifProvider.js                 |  2 +-
 src/autocomplete/RoomProvider.js                  |  2 +-
 src/autocomplete/UserProvider.js                  |  2 +-
 src/components/structures/InteractiveAuth.js      |  4 +---
 src/components/structures/MatrixChat.js           |  2 +-
 src/components/structures/NotificationPanel.js    |  3 +--
 src/components/structures/RoomDirectory.js        |  8 +++-----
 src/components/structures/TimelinePanel.js        | 15 ++++++---------
 src/components/structures/UploadBar.js            |  4 ++--
 src/components/views/avatars/MemberAvatar.js      |  4 ++--
 src/components/views/elements/ImageView.js        |  8 ++++----
 .../views/room_settings/AliasSettings.js          |  6 +++---
 src/components/views/rooms/EventTile.js           |  9 +++------
 src/components/views/rooms/LinkPreviewWidget.js   |  7 +++----
 src/components/views/rooms/MemberList.js          |  4 ++--
 src/components/views/rooms/MemberTile.js          |  6 ++----
 src/components/views/rooms/ReadReceiptMarker.js   |  9 +++------
 src/components/views/rooms/RoomList.js            | 11 +++++------
 src/components/views/rooms/RoomNameEditor.js      |  2 +-
 src/components/views/rooms/SearchBar.js           |  4 ++--
 src/components/views/rooms/UserTile.js            |  3 +--
 src/components/views/settings/ChangePassword.js   |  6 ++----
 .../settings/tabs/user/LabsUserSettingsTab.js     |  2 +-
 .../settings/tabs/user/MjolnirUserSettingsTab.js  |  3 +--
 .../tabs/user/NotificationUserSettingsTab.js      |  2 +-
 .../settings/tabs/user/VoiceUserSettingsTab.js    |  4 ++--
 src/dispatcher.js                                 |  2 +-
 src/utils/createMatrixClient.js                   |  2 +-
 src/utils/permalinks/Permalinks.js                |  3 +--
 38 files changed, 67 insertions(+), 92 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 99d6c533a9..819fe3c998 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -19,7 +19,7 @@ import url from 'url';
 import SettingsStore from "./settings/SettingsStore";
 import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 import {MatrixClientPeg} from "./MatrixClientPeg";
-const request = require('browser-request');
+import request from "browser-request";
 
 import * as Matrix from 'matrix-js-sdk';
 import SdkConfig from "./SdkConfig";
diff --git a/src/Unread.js b/src/Unread.js
index 8b859a07fe..6aaa733f20 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {MatrixClientPeg} from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
-const sdk = require('./index');
+import * as sdk from "./index";
 
 module.exports = {
     /**
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index 245ca6648b..ce52f60dbd 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -1,7 +1,7 @@
-const React = require('react');
-const ReactDom = require('react-dom');
+import React from "react";
+import ReactDom from "react-dom";
+import Velocity from "velocity-animate";
 import PropTypes from 'prop-types';
-const Velocity = require('velocity-animate');
 
 /**
  * The Velociraptor contains components and animates transitions with velocity.
diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
index db216f81fb..ffbf7de829 100644
--- a/src/VelocityBounce.js
+++ b/src/VelocityBounce.js
@@ -1,4 +1,4 @@
-const Velocity = require('velocity-animate');
+import Velocity from "velocity-animate";
 
 // courtesy of https://github.com/julianshapiro/velocity/issues/283
 // We only use easeOutBounce (easeInBounce is just sort of nonsensical)
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index 854fa1b367..d534fe5d1d 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import { asyncAction } from './actionCreators';
 import RoomListStore from '../stores/RoomListStore';
-
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 64c36962c4..45cc154906 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const React = require("react");
+import React from "react";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 56d3c80549..aec9162c97 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React from 'react';
 import FileSaver from 'file-saver';
-
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.js
index e67c53b3f4..b863603aae 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.js
@@ -46,7 +46,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
         const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
 
         // Disable autocompletions when composing commands because of various issues
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index 49ef7dfb43..ca1b1478cc 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -37,7 +37,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
          + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false) {
+    async getCompletions(query: string, selection: SelectionRange, force: boolean = false) {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!query || !command) {
             return [];
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.js
index b433e91b05..e7c8f6f70d 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.js
@@ -30,7 +30,7 @@ export default class NotifProvider extends AutocompleteProvider {
         this.room = room;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?:boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: SelectionRange, force:boolean = false): Array<Completion> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index bb7f8ae0c9..b28c79ac54 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -48,7 +48,7 @@ export default class RoomProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 59075b0752..7fd600b136 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -91,7 +91,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // lazy-load user list into matcher
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index e7194e9fa4..53bb990e26 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -15,9 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Matrix from 'matrix-js-sdk';
-const InteractiveAuth = Matrix.InteractiveAuth;
-
+import {InteractiveAuth} from "matrix-js-sdk";
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8dfb3dd74b..0713290a26 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -20,7 +20,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import Matrix from "matrix-js-sdk";
+import * as Matrix from "matrix-js-sdk";
 
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index eb46fbe1dc..70ea24ad17 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -19,8 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../languageHandler';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-
-const sdk = require('../../index');
+import * as sdk from "../../index";
 
 /*
  * Component which shows the global notification list using a TimelinePanel
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index f88be944d7..94a6d04b55 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -20,11 +20,9 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import {ContentRepo} from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-
-const Modal = require('../../Modal');
-const sdk = require('../../index');
-const dis = require('../../dispatcher');
-
+import * as sdk from "../../index";
+import dis from "../../dispatcher";
+import Modal from "../../Modal";
 import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 4763b4104b..3996b74922 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -18,22 +18,19 @@ limitations under the License.
 */
 
 import SettingsStore from "../../settings/SettingsStore";
-
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
-
-const Matrix = require("matrix-js-sdk");
-const EventTimeline = Matrix.EventTimeline;
-
-const sdk = require('../../index');
+import {EventTimeline} from "matrix-js-sdk";
+import * as Matrix from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-const dis = require("../../dispatcher");
 import * as ObjectUtils from "../../ObjectUtils";
-const Modal = require("../../Modal");
-const UserActivity = require("../../UserActivity");
+import UserActivity from "../../UserActivity";
+import Modal from "../../Modal";
+import dis from "../../dispatcher";
+import * as sdk from "../../index";
 import { KeyCode } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index da0ca7fe99..adaf8824fc 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -18,8 +18,8 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import ContentMessages from '../../ContentMessages';
-const dis = require('../../dispatcher');
-const filesize = require('filesize');
+import dis from "../../dispatcher";
+import filesize from "filesize";
 import { _t } from '../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index cb9ef70168..6961a00d6d 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -18,8 +18,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as Avatar from '../../../Avatar';
-const sdk = require("../../../index");
-const dispatcher = require("../../../dispatcher");
+import * as sdk from "../../../index";
+import dis from "../../../dispatcher";
 
 module.exports = createReactClass({
     displayName: 'MemberAvatar',
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index d92638e005..e12a15766e 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -21,11 +21,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {formatDate} from '../../../DateUtils';
-const filesize = require('filesize');
-const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
-const Modal = require('../../../Modal');
-const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
+import filesize from "filesize";
+import AccessibleButton from "./AccessibleButton";
+import Modal from "../../../Modal";
+import * as sdk from "../../../index";
 
 export default class ImageView extends React.Component {
     static propTypes = {
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 2c43546c60..b0d291ac10 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -15,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const React = require('react');
+import React from "react";
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-const sdk = require("../../../index");
+import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
-const Modal = require("../../../Modal");
+import Modal from "../../../Modal";
 
 export default class AliasSettings extends React.Component {
     static propTypes = {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index b0a95e1188..de3af77946 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,17 +18,14 @@ limitations under the License.
 */
 
 import ReplyThread from "../elements/ReplyThread";
-
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-const classNames = require("classnames");
+import classNames from "classnames";
 import { _t, _td } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
-const Modal = require('../../../Modal');
-
-const sdk = require('../../../index');
-
+import Modal from "../../../Modal";
+import * as sdk from "../../../index";
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus, MatrixClient} from 'matrix-js-sdk';
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 1f1792f5d0..f0b51ff299 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -20,10 +20,9 @@ import createReactClass from 'create-react-class';
 import { linkifyElement } from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-
-const sdk = require('../../../index');
-const ImageUtils = require('../../../ImageUtils');
-const Modal = require('../../../Modal');
+import * as sdk from "../../../index";
+import Modal from "../../../Modal";
+import * as ImageUtils from "../../../ImageUtils";
 
 module.exports = createReactClass({
     displayName: 'LinkPreviewWidget',
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index eecfd6cf96..7d47bdb4b8 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -25,8 +25,8 @@ import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {isValid3pidInvite} from "../../../RoomInvite";
 import rate_limited_func from "../../../ratelimitedfunc";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-const sdk = require('../../../index');
-const CallHandler = require("../../../CallHandler");
+import * as sdk from "../../../index";
+import CallHandler from "../../../CallHandler";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index c002849450..c992b9d4f3 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -15,13 +15,11 @@ limitations under the License.
 */
 
 import SettingsStore from "../../../settings/SettingsStore";
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-
-const sdk = require('../../../index');
-const dis = require('../../../dispatcher');
+import * as sdk from "../../../index";
+import dis from "../../../dispatcher";
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 27c5e8c20e..d8ce58342a 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -18,14 +18,11 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-
-const sdk = require('../../../index');
-
-const Velociraptor = require('../../../Velociraptor');
-require('../../../VelocityBounce');
+import('../../../VelocityBounce');
 import { _t } from '../../../languageHandler';
-
 import {formatDate} from '../../../DateUtils';
+import Velociraptor from "../../../Velociraptor";
+import * as sdk from "../../../index";
 
 let bounce = false;
 try {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index a9b3849e79..ab15ab5a83 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -17,29 +17,28 @@ limitations under the License.
 
 import SettingsStore from "../../../settings/SettingsStore";
 import Timer from "../../../utils/Timer";
-
 import React from "react";
 import ReactDOM from "react-dom";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-const CallHandler = require('../../../CallHandler');
-const dis = require("../../../dispatcher");
-const sdk = require('../../../index');
 import rate_limited_func from "../../../ratelimitedfunc";
 import * as Rooms from '../../../Rooms';
 import DMRoomMap from '../../../utils/DMRoomMap';
-const Receipt = require('../../../utils/Receipt');
 import TagOrderStore from '../../../stores/TagOrderStore';
 import RoomListStore from '../../../stores/RoomListStore';
 import CustomRoomTagStore from '../../../stores/CustomRoomTagStore';
 import GroupStore from '../../../stores/GroupStore';
 import RoomSubList from '../../structures/RoomSubList';
 import ResizeHandle from '../elements/ResizeHandle';
-
+import CallHandler from "../../../CallHandler";
+import dis from "../../../dispatcher";
+import * as sdk from "../../../index";
+import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
+
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
 const HOVER_MOVE_TIMEOUT = 1000;
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 94e7e3172b..0789da2724 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-const sdk = require('../../../index');
+import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index 492c29a621..c9a9308544 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -16,8 +16,8 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
-const classNames = require('classnames');
-const AccessibleButton = require('../../../components/views/elements/AccessibleButton');
+import AccessibleButton from "../elements/AccessibleButton";
+import classNames from "classnames";
 import { _t } from '../../../languageHandler';
 
 module.exports = createReactClass({
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 006bd81c98..9fea1a3ad2 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -18,8 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as Avatar from '../../../Avatar';
-
-const sdk = require('../../../index');
+import * as sdk from "../../../index";
 
 module.exports = createReactClass({
     displayName: 'UserTile',
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 37a8b1a1dc..dc41e5e2c8 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -16,17 +16,15 @@ limitations under the License.
 */
 
 import Field from "../elements/Field";
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-const Modal = require("../../../Modal");
-const sdk = require("../../../index");
-
 import dis from "../../../dispatcher";
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
+import * as sdk from "../../../index";
+import Modal from "../../../Modal";
 
 import sessionStore from '../../../stores/SessionStore';
 
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 5f7d75c5c3..ec5f984d46 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -19,7 +19,7 @@ import {_t} from "../../../../../languageHandler";
 import PropTypes from "prop-types";
 import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
-const sdk = require("../../../../..");
+import * as sdk from "../../../../../index";
 
 export class LabsSettingToggle extends React.Component {
     static propTypes = {
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index 575221c780..7f3a2c401d 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -21,8 +21,7 @@ import {ListRule} from "../../../../../mjolnir/ListRule";
 import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-
-const sdk = require("../../../../..");
+import * as sdk from "../../../../../index";
 
 export default class MjolnirUserSettingsTab extends React.Component {
     constructor() {
diff --git a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
index 970659af6e..2e649cb7f8 100644
--- a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
-const sdk = require("../../../../..");
+import * as sdk from "../../../../../index";
 
 export default class NotificationUserSettingsTab extends React.Component {
     constructor() {
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index d0119ecbbf..f4fbcada3a 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -21,8 +21,8 @@ import Field from "../../../elements/Field";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-const Modal = require("../../../../../Modal");
-const sdk = require("../../../../..");
+import * as sdk from "../../../../../index";
+import Modal from "../../../../../Modal";
 
 export default class VoiceUserSettingsTab extends React.Component {
     constructor() {
diff --git a/src/dispatcher.js b/src/dispatcher.js
index 48c8dc86e9..5abdb29604 100644
--- a/src/dispatcher.js
+++ b/src/dispatcher.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 'use strict';
 
-const flux = require("flux");
+import flux from "flux";
 
 class MatrixDispatcher extends flux.Dispatcher {
     /**
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index dee9324460..c8ff35a584 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Matrix from 'matrix-js-sdk';
+import * as Matrix from 'matrix-js-sdk';
 
 const localStorage = window.localStorage;
 
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 591cdbb576..1174e59da6 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -21,8 +21,7 @@ import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermal
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
 import matrixLinkify from "../../linkify-matrix";
-
-const SdkConfig = require("../../SdkConfig");
+import SdkConfig from "../../SdkConfig";
 
 // The maximum number of servers to pick when working out which servers
 // to add to permalinks. The servers are appended as ?via=example.org

From 0d2cb6e73150b1a9255cff1d7ddda34fb900320e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 14:43:06 -0700
Subject: [PATCH 0093/3235] Import haveTileForEvent() from the right place

---
 src/Unread.js                                  | 4 ++--
 src/components/structures/MessagePanel.js      | 4 ++--
 src/components/structures/RoomView.js          | 3 ++-
 src/components/structures/TimelinePanel.js     | 3 ++-
 src/components/views/rooms/SearchResultTile.js | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Unread.js b/src/Unread.js
index d199991dc5..f82c0899b5 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -17,6 +17,7 @@ limitations under the License.
 import {MatrixClientPeg} from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
 import * as sdk from "./index";
+import {haveTileForEvent} from "./components/views/rooms/EventTile";
 
 /**
  * Returns true iff this event arriving in a room should affect the room's
@@ -38,8 +39,7 @@ export function eventTriggersUnreadCount(ev) {
     } else if (ev.getType() == 'm.room.server_acl') {
         return false;
     }
-    const EventTile = sdk.getComponent('rooms.EventTile');
-    return EventTile.haveTileForEvent(ev);
+    return haveTileForEvent(ev);
 }
 
 export function doesRoomHaveUnreadMessages(room) {
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 54b910732a..4ad75eb700 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -27,6 +27,7 @@ import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
+import {haveTileForEvent} from "../views/rooms/EventTile";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -318,8 +319,7 @@ export default class MessagePanel extends React.Component {
             return true;
         }
 
-        const EventTile = sdk.getComponent('rooms.EventTile');
-        if (!EventTile.haveTileForEvent(mxEv)) {
+        if (!haveTileForEvent(mxEv)) {
             return false; // no tile = no show
         }
 
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1cb9e7db5e..d3309a1f43 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -55,6 +55,7 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import WidgetUtils from '../../utils/WidgetUtils';
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
+import {haveTileForEvent} from "../views/rooms/EventTile";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -1245,7 +1246,7 @@ export default createReactClass({
             const roomId = mxEv.getRoomId();
             const room = cli.getRoom(roomId);
 
-            if (!EventTile.haveTileForEvent(mxEv)) {
+            if (!haveTileForEvent(mxEv)) {
                 // XXX: can this ever happen? It will make the result count
                 // not match the displayed count.
                 continue;
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 54539b63fb..06be5af41c 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -35,6 +35,7 @@ import { KeyCode } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
 import EditorStateTransfer from '../../utils/EditorStateTransfer';
+import {haveTileForEvent} from "../views/rooms/EventTile";
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
@@ -1179,7 +1180,7 @@ const TimelinePanel = createReactClass({
 
             const shouldIgnore = !!ev.status || // local echo
                 (ignoreOwn && ev.sender && ev.sender.userId == myUserId);   // own message
-            const isWithoutTile = !EventTile.haveTileForEvent(ev) || shouldHideEvent(ev);
+            const isWithoutTile = !haveTileForEvent(ev) || shouldHideEvent(ev);
 
             if (isWithoutTile || !node) {
                 // don't start counting if the event should be ignored,
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index bf34a56de3..57856a3a5b 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -19,6 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
+import {haveTileForEvent} from "./EventTile";
 
 export default createReactClass({
     displayName: 'SearchResult',
@@ -54,7 +55,7 @@ export default createReactClass({
             if (!contextual) {
                 highlights = this.props.searchHighlights;
             }
-            if (EventTile.haveTileForEvent(ev)) {
+            if (haveTileForEvent(ev)) {
                 ret.push(<EventTile key={eventId+"+"+j} mxEvent={ev} contextual={contextual} highlights={highlights}
                           permalinkCreator={this.props.permalinkCreator}
                           highlightLink={this.props.resultLink}

From 615648af13e046ee50151a23fffeaf0bb65776d6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 22 Dec 2019 19:47:10 -0700
Subject: [PATCH 0094/3235] Fix tabbed view export for component index

---
 src/components/structures/TabbedView.js            | 2 +-
 src/components/views/dialogs/RoomSettingsDialog.js | 2 +-
 src/components/views/dialogs/UserSettingsDialog.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/TabbedView.js b/src/components/structures/TabbedView.js
index ae5f9e3ee1..20af183af8 100644
--- a/src/components/structures/TabbedView.js
+++ b/src/components/structures/TabbedView.js
@@ -38,7 +38,7 @@ export class Tab {
     }
 }
 
-export class TabbedView extends React.Component {
+export default class TabbedView extends React.Component {
     static propTypes = {
         // The tabs to show
         tabs: PropTypes.arrayOf(PropTypes.instanceOf(Tab)).isRequired,
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 67b30e19c8..2f01204c84 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Tab, TabbedView} from "../../structures/TabbedView";
+import TabbedView, {Tab} from "../../structures/TabbedView";
 import {_t, _td} from "../../../languageHandler";
 import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsTab";
 import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index a3f586cdea..b135d5f5f6 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Tab, TabbedView} from "../../structures/TabbedView";
+import TabbedView, {Tab} from "../../structures/TabbedView";
 import {_t, _td} from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
 import SettingsStore from "../../../settings/SettingsStore";

From 18ac2db2ea5c44de4153efbf133b8085ba613075 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 14:47:49 -0700
Subject: [PATCH 0095/3235] Fix Notifier imports in NotificationControllers

require() is a bit weird for riot-web's webpack, so we fork it out to its own function to reduce the weirdness.

The added weirdness is that require() is sync though exports a module instead. If we use import(), we get a promise which doesn't help us here. We therefore have to require() and pull out the default export, though this is only a problem for webpack - babel (our chosen compiler for exporting ES6) doesn't need this, hence the if statement.
---
 .../controllers/NotificationControllers.js    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index ada4155206..395da765a1 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -34,10 +34,15 @@ function isMasterRuleEnabled() {
     return !masterRule.enabled;
 }
 
+function getNotifier() {
+    let Notifier = require('../../Notifier'); // avoids cyclical references
+    if (Notifier.default) Notifier = Notifier.default; // correct for webpack require() weirdness
+    return Notifier;
+}
+
 export class NotificationsEnabledController extends SettingController {
     getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
-        const Notifier = require('../../Notifier'); // avoids cyclical references
-        if (!Notifier.isPossible()) return false;
+        if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null || calculatedAtLevel === "default") {
             return isMasterRuleEnabled();
@@ -47,18 +52,15 @@ export class NotificationsEnabledController extends SettingController {
     }
 
     onChange(level, roomId, newValue) {
-        const Notifier = require('../../Notifier'); // avoids cyclical references
-
-        if (Notifier.supportsDesktopNotifications()) {
-            Notifier.setEnabled(newValue);
+        if (getNotifier().supportsDesktopNotifications()) {
+            getNotifier().setEnabled(newValue);
         }
     }
 }
 
 export class NotificationBodyEnabledController extends SettingController {
     getValueOverride(level, roomId, calculatedValue) {
-        const Notifier = require('../../Notifier'); // avoids cyclical references
-        if (!Notifier.isPossible()) return false;
+        if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null) {
             return isMasterRuleEnabled();
@@ -70,8 +72,7 @@ export class NotificationBodyEnabledController extends SettingController {
 
 export class AudioNotificationsEnabledController extends SettingController {
     getValueOverride(level, roomId, calculatedValue) {
-        const Notifier = require('../../Notifier'); // avoids cyclical references
-        if (!Notifier.isPossible()) return false;
+        if (!getNotifier().isPossible()) return false;
 
         // Note: Audio notifications are *not* enabled by default.
         return calculatedValue;

From 539a33c722997b22e1dbfe95eb98eaae1b45a81d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:02:36 -0700
Subject: [PATCH 0096/3235] Fix naming conflict in VectorConferenceHandler

---
 src/VectorConferenceHandler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index d0120136e1..180dad876b 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {createNewMatrixCall, Room} from "matrix-js-sdk";
+import {createNewMatrixCall as jsCreateNewMatrixCall, Room} from "matrix-js-sdk";
 import CallHandler from './CallHandler';
 import {MatrixClientPeg} from "./MatrixClientPeg";
 
@@ -43,7 +43,7 @@ ConferenceCall.prototype.setup = function() {
         // return a call for *this* room to be placed. We also tack on
         // confUserId to speed up lookups (else we'd need to loop every room
         // looking for a 1:1 room with this conf user ID!)
-        const call = createNewMatrixCall(self.client, room.roomId);
+        const call = jsCreateNewMatrixCall(self.client, room.roomId);
         call.confUserId = self.confUserId;
         call.groupRoomId = self.groupRoomId;
         return call;

From d8da634c8b811a9cde47f44dc74fa0ffc2f0701e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:01:43 -0700
Subject: [PATCH 0097/3235] Cosmetic updates to package.json

---
 package.json | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 99e4983d60..2899d9fdb7 100644
--- a/package.json
+++ b/package.json
@@ -9,27 +9,25 @@
   },
   "license": "Apache-2.0",
   "files": [
+    "lib",
+    "res",
+    "src",
+    "scripts",
+    "git-revision.txt",
+    "header",
     "CHANGELOG.md",
     "CONTRIBUTING.rst",
     "LICENSE",
     "README.md",
-    "code_style.md",
-    "git-revision.txt",
-    "header",
-    "lib",
-    "package.json",
-    "scripts",
-    "docs",
-    "src",
-    "res"
+    "package.json"
   ],
   "bin": {
     "reskindex": "scripts/reskindex.js",
     "matrix-gen-i18n": "scripts/gen-i18n.js",
     "matrix-prune-i18n": "scripts/prune-i18n.js"
   },
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "main": "./lib/index.js",
+  "typings": "./lib/index.d.ts",
   "scripts": {
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
@@ -40,7 +38,7 @@
     "rethemendex": "res/css/rethemendex.sh",
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
-    "build:compile": "yarn reskindex && babel src -s -d lib --verbose --extensions \".ts,.js\"",
+    "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",
     "build:types": "tsc --emitDeclarationOnly",
     "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",

From 69424f4b4286fb2d6e6358d6aebe7c9e20639500 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 19:08:18 -0700
Subject: [PATCH 0098/3235] Add package.json fields for riot-web's webpack

See https://github.com/vector-im/riot-web/commit/a1c9551bc8a1a6d61afed7e87ff7cebb3042a5ac
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2899d9fdb7..3104ab1ac4 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
   },
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
+  "matrix_src_main": "./src/index.js",
   "scripts": {
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",

From 23e533393546d9f16b8ff6e1de65e1e0ae27f522 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:02:25 -0700
Subject: [PATCH 0099/3235] Introduce babel's export-default-from plugin to fix
 build errors

We do a lot of default exporting, so we kinda need this. It even asks for it to be installed when it is missing.
---
 .babelrc     |  1 +
 package.json |  1 +
 yarn.lock    | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/.babelrc b/.babelrc
index af736e9c19..f75a9f82ef 100644
--- a/.babelrc
+++ b/.babelrc
@@ -15,6 +15,7 @@
     ],
     "plugins": [
         ["@babel/plugin-proposal-decorators", { "legacy": true }],
+        "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
diff --git a/package.json b/package.json
index 99e4983d60..54f4534762 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,7 @@
     "@babel/core": "^7.7.5",
     "@babel/plugin-proposal-class-properties": "^7.7.4",
     "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-proposal-export-default-from": "^7.7.4",
     "@babel/plugin-proposal-numeric-separator": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
     "@babel/plugin-transform-flow-comments": "^7.7.4",
diff --git a/yarn.lock b/yarn.lock
index 4e1be061bc..3dba7da904 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -320,6 +320,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-dynamic-import" "^7.7.4"
 
+"@babel/plugin-proposal-export-default-from@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.7.4.tgz#890de3c0c475374638292df31f6582160b54d639"
+  integrity sha512-1t6dh7BHYUz4zD1m4pozYYEZy/3m8dgOr9owx3r0mPPI3iGKRUKUbIxfYmcJ4hwljs/dhd0qOTr1ZDUp43ix+w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-export-default-from" "^7.7.4"
+
 "@babel/plugin-proposal-json-strings@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
@@ -381,6 +389,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-export-default-from@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.7.4.tgz#897f05808298060b52873fa804ff853540790ea1"
+  integrity sha512-j888jpjATLEzOWhKawq46UrpXnCRDbdhBd5io4jgwjJ3+CHHGCRb6PNAVEgs+BXIb+dNRAmnkv36zfB992PRVw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-flow@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b"

From cfa21cbb8cb46fd959dc8bf54c1844da7c87b269 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Dec 2019 18:29:22 -0700
Subject: [PATCH 0100/3235] Define getLanguageFromBrowser() for
 LanguageDropdown

Without it we can't compile, so we should define it. It looks like it's never been defined, and LanguageDropdown seems to use it as a last resort - it should be safe to land.
---
 src/languageHandler.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index c56e5378df..c11f26ddf1 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -336,6 +336,10 @@ export function getLanguagesFromBrowser() {
     return [navigator.userLanguage || "en"];
 }
 
+export function getLanguageFromBrowser() {
+    return getLanguagesFromBrowser()[0];
+}
+
 /**
  * Turns a language string, normalises it,
  * (see normalizeLanguageKey) into an array of language strings

From 56adb8244b2c80703dad6341805e4f0e1e770b4b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 13:58:37 -0700
Subject: [PATCH 0101/3235] Add a bit of debugging to incorrect components in
 the Skinner

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

diff --git a/src/Skinner.js b/src/Skinner.js
index 7235d55937..06855691bd 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -58,7 +58,7 @@ class Skinner {
         // components have to be functions.
         const validType = typeof comp === 'function';
         if (!validType) {
-            throw new Error(`Not a valid component: ${name}.`);
+            throw new Error(`Not a valid component: ${name} (type = ${typeof(comp)}).`);
         }
         return comp;
     }

From 3eb3be45d18e6292c7bbddcae8cb1942d3a7b8a4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Dec 2019 13:58:46 -0700
Subject: [PATCH 0102/3235] Fix import of language index

This is a similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/3766/commits/18ac2db2ea5c44de4153efbf133b8085ba613075
---
 src/languageHandler.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index c56e5378df..4aa22f3e65 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -410,11 +410,12 @@ export function pickBestLanguage(langs) {
 }
 
 function getLangsJson() {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
         let url;
         try {
             // $webapp is a webpack resolve alias pointing to the output directory, see webpack config
-            url = require('$webapp/i18n/languages.json');
+            url = import('$webapp/i18n/languages.json');
+            if (url.then) url = (await url).default; // webpack resolves to a Module through a promise.
         } catch (e) {
             url = i18nFolder + 'languages.json';
         }

From afcbb218faf8a63fddce5ac19e8f90990e9fca2a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 11:31:30 +0000
Subject: [PATCH 0103/3235] match padding on CustomRoomTagPanel and fix colour
 of Communities btn

---
 res/css/structures/_CustomRoomTagPanel.scss | 3 ++-
 res/css/structures/_TagPanel.scss           | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
index 278c7c3d0c..32ad20132d 100644
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ b/res/css/structures/_CustomRoomTagPanel.scss
@@ -32,8 +32,9 @@ limitations under the License.
 }
 
 .mx_CustomRoomTagPanel .mx_AccessibleButton {
-    margin: 9px auto;
+    margin: 0 auto;
     width: 40px;
+    padding: 10px 0 9px 0;
     position: relative;
 }
 
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index e2eda433ba..dddd2e324c 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -87,16 +87,15 @@ limitations under the License.
     height: 40px;
     width: 40px;
     border-radius: 20px;
-    background-color: $tagpanel-button-color;
-    opacity: 0.11;
+    background-color: $roomheader-addroom-bg-color;
     position: relative;
     /* overwrite mx_RoleButton inline-block */
     display: block !important;
 
     &::before {
+        background-color: $roomheader-addroom-fg-color;
         mask-image: url('$(res)/img/feather-customised/plus.svg');
         mask-position: center;
-        background-color: $button-primary-fg-color;
         mask-repeat: no-repeat;
         content: '';
         position: absolute;

From 84eb72b0e065148395cad871745f138405931025 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 11:38:52 +0000
Subject: [PATCH 0104/3235] fix alignment

---
 res/css/structures/_CustomRoomTagPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
index 32ad20132d..1fb18ec41e 100644
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ b/res/css/structures/_CustomRoomTagPanel.scss
@@ -52,5 +52,5 @@ limitations under the License.
     position: absolute;
     left: -15px;
     border-radius: 0 3px 3px 0;
-    top: -8px; // (56 - 40)/2
+    top: 2px; // 10 [padding-top] - (56 - 40)/2
 }

From 17f58499857d71dd1ac854292643111013b02467 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 12:24:49 +0000
Subject: [PATCH 0105/3235] stop using ReactDOM.findDOMNode in
 componentWillUnmount, use refs

---
 src/components/structures/RoomView.js         |  5 ++---
 src/components/views/avatars/BaseAvatar.js    | 21 ++++++++++++++-----
 .../views/rooms/ReadReceiptMarker.js          | 12 +++++++----
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 739519a2b3..29ffc24009 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -25,7 +25,6 @@ import shouldHideEvent from '../../shouldHideEvent';
 
 import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
-import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Room} from "matrix-js-sdk";
@@ -461,7 +460,7 @@ module.exports = createReactClass({
 
     componentDidUpdate: function() {
         if (this._roomView.current) {
-            const roomView = ReactDOM.findDOMNode(this._roomView.current);
+            const roomView = this._roomView.current;
             if (!roomView.ondrop) {
                 roomView.addEventListener('drop', this.onDrop);
                 roomView.addEventListener('dragover', this.onDragOver);
@@ -505,7 +504,7 @@ module.exports = createReactClass({
             // is really just for hygiene - we're going to be
             // deleted anyway, so it doesn't matter if the event listeners
             // don't get cleaned up.
-            const roomView = ReactDOM.findDOMNode(this._roomView.current);
+            const roomView = this._roomView.current;
             roomView.removeEventListener('drop', this.onDrop);
             roomView.removeEventListener('dragover', this.onDragOver);
             roomView.removeEventListener('dragleave', this.onDragLeaveOrEnd);
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 82db78615e..d7e30bc6f1 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -38,6 +38,12 @@ module.exports = createReactClass({
         // XXX resizeMethod not actually used.
         resizeMethod: PropTypes.string,
         defaultToInitialLetter: PropTypes.bool, // true to add default url
+        inputRef: PropTypes.oneOfType([
+            // Either a function
+            PropTypes.func,
+            // Or the instance of a DOM native element
+            PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+        ]),
     },
 
     contextTypes: {
@@ -148,7 +154,7 @@ module.exports = createReactClass({
 
         const {
             name, idName, title, url, urls, width, height, resizeMethod,
-            defaultToInitialLetter, onClick,
+            defaultToInitialLetter, onClick, inputRef,
             ...otherProps
         } = this.props;
 
@@ -171,7 +177,7 @@ module.exports = createReactClass({
             if (onClick != null) {
                 return (
                     <AccessibleButton element='span' className="mx_BaseAvatar"
-                        onClick={onClick} {...otherProps}
+                        onClick={onClick} inputRef={inputRef} {...otherProps}
                     >
                         { textNode }
                         { imgNode }
@@ -179,7 +185,7 @@ module.exports = createReactClass({
                 );
             } else {
                 return (
-                    <span className="mx_BaseAvatar" {...otherProps}>
+                    <span className="mx_BaseAvatar" ref={inputRef} {...otherProps}>
                         { textNode }
                         { imgNode }
                     </span>
@@ -188,21 +194,26 @@ module.exports = createReactClass({
         }
         if (onClick != null) {
             return (
-                <AccessibleButton className="mx_BaseAvatar mx_BaseAvatar_image"
+                <AccessibleButton
+                    className="mx_BaseAvatar mx_BaseAvatar_image"
                     element='img'
                     src={imageUrl}
                     onClick={onClick}
                     onError={this.onError}
                     width={width} height={height}
                     title={title} alt=""
+                    inputRef={inputRef}
                     {...otherProps} />
             );
         } else {
             return (
-                <img className="mx_BaseAvatar mx_BaseAvatar_image" src={imageUrl}
+                <img
+                    className="mx_BaseAvatar mx_BaseAvatar_image"
+                    src={imageUrl}
                     onError={this.onError}
                     width={width} height={height}
                     title={title} alt=""
+                    ref={inputRef}
                     {...otherProps} />
             );
         }
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 27c5e8c20e..8f28d96f9d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import ReactDOM from 'react-dom';
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
@@ -90,6 +89,10 @@ module.exports = createReactClass({
         };
     },
 
+    UNSAFE_componentWillMount: function() {
+        this._avatar = createRef();
+    },
+
     componentWillUnmount: function() {
         // before we remove the rr, store its location in the map, so that if
         // it reappears, it can be animated from the right place.
@@ -105,7 +108,7 @@ module.exports = createReactClass({
             return;
         }
 
-        const avatarNode = ReactDOM.findDOMNode(this);
+        const avatarNode = this._avatar.current;
         rrInfo.top = avatarNode.offsetTop;
         rrInfo.left = avatarNode.offsetLeft;
         rrInfo.parent = avatarNode.offsetParent;
@@ -125,7 +128,7 @@ module.exports = createReactClass({
             oldTop = oldInfo.top + oldInfo.parent.getBoundingClientRect().top;
         }
 
-        const newElement = ReactDOM.findDOMNode(this);
+        const newElement = this._avatar.current;
         let startTopOffset;
         if (!newElement.offsetParent) {
             // this seems to happen sometimes for reasons I don't understand
@@ -215,6 +218,7 @@ module.exports = createReactClass({
                     style={style}
                     title={title}
                     onClick={this.props.onClick}
+                    inputRef={this._avatar}
                 />
             </Velociraptor>
         );

From 207045e979ed9916f68c0021b37a544aa93ffa1c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 12:54:31 +0000
Subject: [PATCH 0106/3235] fix ReadReceiptMarker ref

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

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 8f28d96f9d..35d745ae5a 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -178,7 +178,7 @@ module.exports = createReactClass({
     render: function() {
         const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         if (this.state.suppressDisplay) {
-            return <div />;
+            return <div ref={this._avatar} />;
         }
 
         const style = {

From 8018097e56be3c2d428a53eace899584c4a7e3a5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 14:13:56 +0000
Subject: [PATCH 0107/3235] Add alt="" to presentational images

---
 src/components/views/globals/MatrixToolbar.js | 2 +-
 src/components/views/globals/NewVersionBar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index aabf0810f8..1e496741ad 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -34,7 +34,7 @@ module.exports = createReactClass({
     render: function() {
         return (
             <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" />
+                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
                 <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>
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index abb9334242..f6bd029969 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -97,7 +97,7 @@ export default createReactClass({
         }
         return (
             <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" />
+                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
                 <div className="mx_MatrixToolbar_content">
                     {_t("A new version of Riot is available.")}
                 </div>

From e47ac5fbb530f87c39e3084e9f2fe3b030c04bee Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Sun, 22 Dec 2019 10:19:38 +0000
Subject: [PATCH 0108/3235] Translated using Weblate (Finnish)

Currently translated at 97.0% (1940 of 2000 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 381eff2e8e..bb63641848 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1926,5 +1926,37 @@
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Muokkaa kokemustasi kokeellisilla laboratio-ominaisuuksia. <a>Tutki vaihtoehtoja</a>.",
     "Error upgrading room": "Virhe päivitettäessä huonetta",
     "Double check that your server supports the room version chosen and try again.": "Tarkista, että palvelimesi tukee valittua huoneversiota ja yritä uudelleen.",
-    "Invite joined members to the new room automatically": "Kutsu huoneen jäsenet liittymään uuteen huoneeseen automaattisesti"
+    "Invite joined members to the new room automatically": "Kutsu huoneen jäsenet liittymään uuteen huoneeseen automaattisesti",
+    "Send cross-signing keys to homeserver": "Lähetä ristivarmennuksen tarvitsemat avaimet kotipalvelimelle",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s poisti porttikiellon käyttäjiltä, jotka täsmäsivät sääntöön %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s poisti huoneita estävän säännön %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s poisti palvelimia estävän säännön %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s poisti estosäännön %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s muokkasi epäkelpoa estosääntöä",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s muokkasi käyttäjiä estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s muokkasi huoneita estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s muokkasi palvelimia estävää sääntöä %(glob)s seuraavasta syystä: %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s muokkasi estosääntöä %(glob)s seuraavasta syystä: %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s loi porttikiellonsäännön %(glob)s, syy: %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s loi huoneita estävän säännön %(glob)s, syy: %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s loi palvelimia estävän säännön %(glob)s, syy: %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s loi estosäännön %(glob)s, syy: %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti käyttäjiä säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti huoneita säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti sääntöä, joka esti palvelimia säännöllä %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti estosääntöä muodosta %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
+    "The message you are trying to send is too large.": "Lähettämäsi viesti on liian suuri.",
+    "Cross-signing and secret storage are enabled.": "Ristivarmennus ja salavarasto on käytössä.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Tunnuksellasi on ristivarmennusidentiteetti salavarastossa, mutta tämä laite ei luota siihen.",
+    "Cross-signing and secret storage are not yet set up.": "Ristivarmennusta ja salavarastoa ei ole vielä otettu käyttöön.",
+    "Bootstrap cross-signing and secret storage": "Ota käyttöön ristivarmennus ja salavarasto",
+    "Cross-signing public keys:": "Ristivarmennuksen julkiset avaimet:",
+    "on device": "laitteella",
+    "not found": "ei löydetty",
+    "Cross-signing private keys:": "Ristivarmennuksen salaiset avaimet:",
+    "in secret storage": "salavarastossa",
+    "Secret storage public key:": "Salavaraston julkinen avain:",
+    "in account data": "tunnuksen tiedoissa",
+    "not stored": "ei tallennettu",
+    "Cross-signing": "Ristivarmennus"
 }

From 4d61e0bbe7d1f1abb441a3d871c3f78e2c3a357b Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 23 Dec 2019 09:45:06 +0000
Subject: [PATCH 0109/3235] Translated using Weblate (Italian)

Currently translated at 99.9% (1999 of 2000 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, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index b18b6c9272..5d0c769e6e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -271,9 +271,9 @@
     "Blacklisted": "In lista nera",
     "device id: ": "ID dispositivo: ",
     "Disinvite": "Revoca invito",
-    "Kick": "Caccia fuori",
+    "Kick": "Butta fuori",
     "Disinvite this user?": "Revocare l'invito a questo utente?",
-    "Kick this user?": "Cacciare questo utente?",
+    "Kick this user?": "Buttare fuori questo utente?",
     "Failed to kick": "Espulsione fallita",
     "Unban": "Togli ban",
     "Ban": "Bandisci",
@@ -2013,5 +2013,8 @@
     "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Non hai verificato alcuni utenti in questa stanza criptata o essi non hanno verificato i loro dispositivi.",
     "All users in this encrypted room are verified by you and they have verified their own devices.": "Hai verificato tutti gli utenti in questa stanza criptata ed essi hanno verificato i loro dispositivi.",
     "Language Dropdown": "Lingua a tendina",
-    "Country Dropdown": "Nazione a tendina"
+    "Country Dropdown": "Nazione a tendina",
+    "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi",
+    "Migrate from Key Backup": "Migra dal backup chiavi"
 }

From 131ecfe912736c82ae7ab52710aff1841faf8905 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 22 Dec 2019 08:25:01 +0000
Subject: [PATCH 0110/3235] Translated using Weblate (Turkish)

Currently translated at 36.8% (736 of 2000 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index da177ae68c..647ca2f6a5 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -679,5 +679,64 @@
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ayrıldı",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s katıldı ve ayrıldı",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s katıldı ve ayrıldı",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı"
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ayrıldı ve yeniden katıldı",
+    "were invited %(count)s times|other": "%(count)s kez davet edildi",
+    "were invited %(count)s times|one": "davet edildi",
+    "was invited %(count)s times|other": "%(count)s kez davet edildi",
+    "was invited %(count)s times|one": "davet edildi",
+    "were kicked %(count)s times|other": "%(count)s kez atıldı",
+    "were kicked %(count)s times|one": "atıldı",
+    "was kicked %(count)s times|other": "%(count)s kez atıldı",
+    "was kicked %(count)s times|one": "atıldı",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s isimlerini değiştrtiler",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ismini değiştirdi",
+    "Power level": "Güç düzeyi",
+    "e.g. my-room": "örn. odam",
+    "Some characters not allowed": "Bazı karakterlere izin verilmiyor",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix Oda ID",
+    "email address": "e-posta adresi",
+    "That doesn't look like a valid email address": "Geçerli bir e-posta adresi gibi gözükmüyor",
+    "You have entered an invalid address.": "Geçersiz bir adres girdiniz.",
+    "Invite anyway and never warn me again": "Yinede davet et ve asla beni uyarma",
+    "Invite anyway": "Yinede davet et",
+    "Close dialog": "Kutucuğu kapat",
+    "Preparing to send logs": "Loglar gönderilmek için hazırlanıyor",
+    "Logs sent": "Loglar gönderiliyor",
+    "Thank you!": "Teşekkürler!",
+    "Failed to send logs: ": "Loglarıb gönderilmesi başarısız: ",
+    "GitHub issue": "GitHub sorunu",
+    "Notes": "Notlar",
+    "Removing…": "Siliniyor…",
+    "Clear all data on this device?": "Bu cihazdaki bütün verileri sil?",
+    "Clear all data": "Bütün verileri sil",
+    "Community IDs cannot be empty.": "Topluluk ID leri boş bırakılamaz.",
+    "Something went wrong whilst creating your community": "Topluluğunuz oluşturulurken bir şeyler yanlış gitti",
+    "Create Community": "Topluluk Oluştur",
+    "Community Name": "Topluluk Adı",
+    "Example": "Örnek",
+    "Community ID": "Topluluk ID",
+    "example": "örnek",
+    "Create": "Oluştur",
+    "Please enter a name for the room": "Lütfen oda için bir ad girin",
+    "This room is private, and can only be joined by invitation.": "Bu oda özel, sadece davet ile katılınabilir.",
+    "Create a private room": "Özel bir oda oluştur",
+    "Hide advanced": "Gelişmiş gizle",
+    "Show advanced": "Gelişmiş göster",
+    "Incompatible Database": "Uyumsuz Veritabanı",
+    "To continue, please enter your password:": "Devam etmek için lütfen şifrenizi giriniz:",
+    "Begin Verifying": "Doğrulamaya Başla",
+    "Use two-way text verification": "İki yönlü metin doğrulama kullan",
+    "Back": "Geri",
+    "You must specify an event type!": "Bir olay tipi seçmek zorundasınız!",
+    "Event sent!": "Olay gönderildi!",
+    "Event Type": "Olay Tipi",
+    "State Key": "Durum Anahtarı",
+    "Event Content": "Olay İçeriği",
+    "Send Account Data": "Hesap Verisi Gönder",
+    "Filter results": "Sonuçları filtrele",
+    "View Servers in Room": "Odadaki Sunucuları Gör",
+    "Toolbox": "Araç Kutusu",
+    "Developer Tools": "Geliştirici Araçları",
+    "Integrations are disabled": "Bütünleştirmeler kapatılmış"
 }

From e55219570144af0b6244138d2ba6553b88fc2837 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 17:57:53 +0000
Subject: [PATCH 0111/3235] Fix duplicate Incoming Call prompt on Community
 Invite sublist

---
 src/components/views/rooms/RoomList.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index cb88861509..35a5ca9e66 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -636,7 +636,6 @@ module.exports = createReactClass({
         const defaultProps = {
             collapsed: this.props.collapsed,
             isFiltered: !!this.props.searchFilter,
-            incomingCall: this.state.incomingCall,
         };
 
         subListsProps.forEach((p) => {
@@ -649,7 +648,7 @@ module.exports = createReactClass({
         }));
 
         return subListsProps.reduce((components, props, i) => {
-            props = Object.assign({}, defaultProps, props);
+            props = {...defaultProps, ...props};
             const isLast = i === subListsProps.length - 1;
             const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0);
             const {key, label, onHeaderClick, ...otherProps} = props;
@@ -660,12 +659,12 @@ module.exports = createReactClass({
                     onHeaderClick(collapsed);
                 }
             };
-            let startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
+            const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
             this._layoutSections.push({
                 id: chosenKey,
                 count: len,
             });
-            let subList = (<RoomSubList
+            const subList = (<RoomSubList
                 ref={this._subListRef.bind(this, chosenKey)}
                 startAsHidden={startAsHidden}
                 forceExpand={!!this.props.searchFilter}

From 178dbdca5b361d1aecd445492ef3ce5307807ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Mon, 23 Dec 2019 17:42:06 +0000
Subject: [PATCH 0112/3235] Translated using Weblate (French)

Currently translated at 100.0% (2001 of 2001 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 fb233b40d9..727d171ca4 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2018,5 +2018,6 @@
     "Country Dropdown": "Sélection du pays",
     "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés",
-    "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés"
+    "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés",
+    "Help": "Aide"
 }

From 0497ef228d7348d8b82a72832e23fdbc1de5119f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 18:20:59 +0000
Subject: [PATCH 0113/3235] UserInfo hide kick/mute buttons if they make no
 sense

---
 src/components/views/right_panel/UserInfo.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 4dd71700ad..316c8d3d0e 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -425,6 +425,9 @@ const useRoomPowerLevels = (cli, room) => {
 const RoomKickButton = ({member, startUpdating, stopUpdating}) => {
     const cli = useContext(MatrixClientContext);
 
+    // check if user can be kicked/disinvited
+    if (member.membership !== "invite" && member.membership !== "join") return null;
+
     const onKick = async () => {
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         const {finished} = Modal.createTrackedDialog(
@@ -602,6 +605,9 @@ const BanToggleButton = ({member, startUpdating, stopUpdating}) => {
 const MuteToggleButton = ({member, room, powerLevels, startUpdating, stopUpdating}) => {
     const cli = useContext(MatrixClientContext);
 
+    // Don't show the mute/unmute option if the user is not in the room
+    if (member.membership !== "join") return null;
+
     const isMuted = _isMuted(member, powerLevels);
     const onMuteToggle = async () => {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");

From 25d864c39dddc78eed6b8aa09621965e28fa3b73 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Dec 2019 19:29:43 +0000
Subject: [PATCH 0114/3235] Fix wrong scope binding on openHelp for TopLeftMenu

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

diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 7a7b124919..08a65e2f21 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -128,11 +128,11 @@ export class TopLeftMenu extends React.Component {
         </div>;
     }
 
-    openHelp() {
+    openHelp = () => {
         this.closeMenu();
         const RedesignFeedbackDialog = sdk.getComponent("views.dialogs.RedesignFeedbackDialog");
         Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
-    }
+    };
 
     viewHomePage() {
         dis.dispatch({action: 'view_home_page'});

From 92ea1157bec969006882e87f38f8d9c35a7b5ce1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 23 Dec 2019 19:26:59 -0700
Subject: [PATCH 0115/3235] Reintroduce working resizer code for right panel

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

This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93

We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
---
 src/components/structures/MainSplit.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.js
index bd7bfd8780..772be358cf 100644
--- a/src/components/structures/MainSplit.js
+++ b/src/components/structures/MainSplit.js
@@ -74,6 +74,21 @@ export default class MainSplit extends React.Component {
         }
     }
 
+    componentDidUpdate(prevProps) {
+        const wasPanelSet = this.props.panel && !prevProps.panel;
+        const wasPanelCleared = !this.props.panel && prevProps.panel;
+
+        if (this.resizeContainer && wasPanelSet) {
+            // The resizer can only be created when **both** expanded and the panel is
+            // set. Once both are true, the container ref will mount, which is required
+            // for the resizer to work.
+            this._createResizer();
+        } else if (this.resizer && wasPanelCleared) {
+            this.resizer.detach();
+            this.resizer = null;
+        }
+    }
+
     render() {
         const bodyView = React.Children.only(this.props.children);
         const panelView = this.props.panel;

From abb5ea2df8565b8ef5bce1cf39a404d428fc32c4 Mon Sep 17 00:00:00 2001
From: "ferhad.necef" <ferhad.necef@gmail.com>
Date: Wed, 25 Dec 2019 15:54:20 +0000
Subject: [PATCH 0116/3235] Translated using Weblate (Azerbaijani)

Currently translated at 22.3% (447 of 2001 strings)

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

diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index c53258a28f..e4316496ec 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -70,7 +70,7 @@
     "%(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",
     "Unable to enable Notifications": "Xəbərdarlıqları daxil qoşmağı bacarmadı",
-    "Default": "Default",
+    "Default": "Varsayılan olaraq",
     "Moderator": "Moderator",
     "Admin": "Administrator",
     "Start a chat": "Danışığa başlamaq",
@@ -389,5 +389,63 @@
     "Verified key": "Təsdiqlənmiş açar",
     "Sends the given message coloured as a rainbow": "Verilən mesajı göy qurşağı kimi rəngli göndərir",
     "Sends the given emote coloured as a rainbow": "Göndərilmiş emote rəngini göy qurşağı kimi göndərir",
-    "Unrecognised command:": "Tanınmayan əmr:"
+    "Unrecognised command:": "Tanınmayan əmr:",
+    "Add Email Address": "Emal ünvan əlavə etmək",
+    "Add Phone Number": "Telefon nömrəsi əlavə etmək",
+    "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
+    "Call failed due to misconfigured server": "Düzgün qurulmamış server səbəbindən zəng alınmadı",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Xahiş edirik, baş serverin administratoruna müraciət edin (<code>%(homeserverDomain)s</code>) ki zənglərin etibarlı işləməsi üçün dönüş serverini konfiqurasiya etsin.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativ olaraq, ümumi serveri <code> turn.matrix.org </code> istifadə etməyə cəhd edə bilərsiniz, lakin bu qədər etibarlı olmayacaq və IP ünvanınızı bu serverlə bölüşəcəkdir. Bunu Ayarlarda da idarə edə bilərsiniz.",
+    "Try using turn.matrix.org": "Turn.matrix.org istifadə edin",
+    "The file '%(fileName)s' failed to upload.": "'%(fileName)s' faylı yüklənə bilmədi.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' faylı yükləmə üçün bu server ölçü həddini aşmışdır",
+    "Send cross-signing keys to homeserver": "Ev serveri üçün çarpaz imzalı açarları göndərin",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Add rooms to the community": "Icmaya otaqlar əlavə edin",
+    "Failed to invite the following users to %(groupId)s:": "Aşağıdakı istifadəçiləri %(groupId)s - ə dəvət etmək alınmadı:",
+    "Failed to invite users to %(groupId)s": "İstifadəçiləri %(groupId)s - a dəvət etmək alınmadı",
+    "Failed to add the following rooms to %(groupId)s:": "Aşağıdakı otaqları %(groupId)s - a əlavə etmək alınmadı:",
+    "Identity server has no terms of service": "Şəxsiyyət serverinin xidmət şərtləri yoxdur",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Bu hərəkət e-poçt ünvanı və ya telefon nömrəsini təsdiqləmək üçün standart şəxsiyyət serverinə <server /> girməyi tələb edir, lakin serverdə heç bir xidmət şəraiti yoxdur.",
+    "Only continue if you trust the owner of the server.": "Yalnız server sahibinə etibar etsəniz davam edin.",
+    "Trust": "Etibar",
+    "Custom (%(level)s)": "Xüsusi (%(level)s)",
+    "Failed to start chat": "Söhbətə başlamaq olmur",
+    "Failed to invite the following users to the %(roomName)s room:": "Aşağıdakı istifadəçiləri %(roomName)s otağına dəvət etmək alınmadı:",
+    "Room %(roomId)s not visible": "Otaq %(roomId)s görünmür",
+    "Messages": "Mesajlar",
+    "Actions": "Tədbirlər",
+    "Other": "Digər",
+    "Sends a message as plain text, without interpreting it as markdown": "Bir mesajı qeyd kimi şərh etmədən, düz mətn şəklində göndərir",
+    "You do not have the required permissions to use this command.": "Bu komandadan (əmrdən) istifadə etmək üçün tələb olunan icazəniz yoxdur.",
+    "Error upgrading room": "Otaq yeniləmə xətası",
+    "Double check that your server supports the room version chosen and try again.": "Serverinizin seçilmiş otaq versiyasını dəstəklədiyini  bir daha yoxlayın və yenidən cəhd edin.",
+    "Changes the avatar of the current room": "Cari otağın avatarını dəyişdirir",
+    "Use an identity server": "Şəxsiyyət serverindən istifadə edin",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Defolt şəxsiyyət serverini (%(defaultIdentityServerName)s) istifadə etməyə və ya Parametrlərdə idarə etməyə davam edin.",
+    "Use an identity server to invite by email. Manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Parametrlərdə idarə edin.",
+    "Please supply a https:// or http:// widget URL": "Zəhmət olmasa https:// və ya http:// widget URL təmin edin",
+    "Device already verified!": "Cihaz artıq təsdiqləndi!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "XƏBƏRDARLIQ: Cihaz artıq təsdiqləndi, lakin açarlar uyğun gəlmir!",
+    "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!": "XƏBƏRDARLIQ: ƏSAS VERIFİKASİYA VERİLİR! %(userId)s və cihaz %(deviceId)s üçün imza açarı \"%(fprint)s\" ilə təmin olunmayan \"%(fingerprint)s\". Bu, ünsiyyətlərinizin tutulduğunu ifadə edə bilər!",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Təqdim etdiyiniz imza açarı %(userId)s cihazının %(deviceId)s cihazından aldığınız imza açarına uyğundur. Cihaz təsdiqlənmiş kimi qeyd edildi.",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Şifrəli bir otaqda mövcud qrup sessiyasını ləğv etməyə məcbur edir",
+    "Displays list of commands with usages and descriptions": "İstifadə qaydaları və təsvirləri ilə komanda siyahısını göstərir",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konfrans istədi.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s göstərilən adlarını %(displayName)s olaraq dəyişdirdi.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s öz adlarını %(displayName)s olaraq təyin etdilər.",
+    "%(senderName)s set a profile picture.": "%(senderName)s profil şəkli təyin etdi.",
+    "%(senderName)s made no change.": "%(senderName)s dəyişiklik etməyib.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s otaq otağını sildi.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s bu otağı təkmilləşdirdi.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s linki olanlara otağı açıq etdi.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s otağı yalnız dəvətlə açıq etdi.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s qoşulma qaydasını %(rule)s olaraq dəyişdirdi",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s qonaq otağa qoşulmasına icazə verdi.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s qonaqların otağa daxil olmasının qarşısını aldı.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s %(rule)s-a qonaq girişi dəyişdirildi.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Bu otaqda %(qruplar)s üçün %(senderDisplayName)s aktiv oldu.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.",
+    "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir",
+    "Custom Server Options": "Xüsusi Server Seçimləri"
 }

From b4a569dfc7ea8653ab353a62092c2bff0ab65945 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 24 Dec 2019 06:39:24 +0000
Subject: [PATCH 0117/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2001 of 2001 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 73af96e7fc..e6ce4077e5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2018,5 +2018,6 @@
     "Country Dropdown": "國家下拉式選單",
     "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同",
-    "Migrate from Key Backup": "從金鑰備份導入"
+    "Migrate from Key Backup": "從金鑰備份導入",
+    "Help": "說明"
 }

From b8dbd32363b97f220f814195fda80cead34510bf Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Wed, 25 Dec 2019 08:11:50 +0000
Subject: [PATCH 0118/3235] Translated using Weblate (Finnish)

Currently translated at 100.0% (2001 of 2001 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index bb63641848..8881456d8c 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1343,7 +1343,7 @@
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s istunnon purkaminen epäonnistui!",
     "Restored %(sessionCount)s session keys": "%(sessionCount)s istunnon avainta palautettu",
     "Enter Recovery Passphrase": "Syötä palautuksen salalause",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulta tietokoneelta.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulla tietokoneella.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautuksen salalauseesi.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jos olet unohtanut palautuksen salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>ottaa käyttöön uuden palautustavan</button2>",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautusavaimesi.",
@@ -1958,5 +1958,66 @@
     "Secret storage public key:": "Salavaraston julkinen avain:",
     "in account data": "tunnuksen tiedoissa",
     "not stored": "ei tallennettu",
-    "Cross-signing": "Ristivarmennus"
+    "Cross-signing": "Ristivarmennus",
+    "Backup has a <validity>valid</validity> signature from this user": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus tältä käyttäjältä",
+    "Backup has a <validity>invalid</validity> signature from this user": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tältä käyttäjältä",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus käyttäjältä, jonka ID on %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus laitteelta, jonka ID on %(deviceId)s",
+    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Vara-avain on tallennettu salavarastoon, mutta salavarasto ei ole käytössä tällä laitteella. Ota käyttöön ristivarmennus Laboratoriosta, jotta voi muokata avainvarmuuskopion tilaa.",
+    "Backup key stored: ": "Vara-avain on tallennettu: ",
+    "Start using Key Backup with Secure Secret Storage": "Aloita avainten varmuuskopiointi turvalliseen salavarastoon",
+    "This user has not verified all of their devices.": "Tämä käyttäjä ei ole varmentanut kaikkia laitteitaan.",
+    "You have not verified this user. This user has verified all of their devices.": "Et ole varmentanut tätä käyttäjää. Tämä käyttäjä on varmentanut kaikki laitteensa.",
+    "You have verified this user. This user has verified all of their devices.": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki laitteensa.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Et ole varmentanut osaa tämän salausta käyttävän huoneen käyttäjistä tai he eivät ole varmentaneet omia laitteitaan.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Olet varmentanut kaikki käyttäjät tässä salausta käyttävässä huoneessa ja he ovat varmentaneet omat laitteensa.",
+    "This message cannot be decrypted": "Tätä viestiä ei voida avata luettavaksi",
+    "Unencrypted": "Suojaamaton",
+    "Close preview": "Sulje esikatselu",
+    "<userName/> wants to chat": "<userName/> haluaa keskustella",
+    "Start chatting": "Aloita keskustelu",
+    "Hide verified sessions": "Piilota varmennetut istunnot",
+    "%(count)s verified sessions|other": "%(count)s varmennettua istuntoa",
+    "%(count)s verified sessions|one": "1 varmennettu istunto",
+    "Reactions": "Reaktiot",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagoi: %(content)s</reactedWith>",
+    "Language Dropdown": "Kielipudotusvalikko",
+    "Automatically invite users": "Kutsu käyttäjät automaattisesti",
+    "Upgrade private room": "Päivitä yksityinen huone",
+    "Upgrade public room": "Päivitä julkinen huone",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Huoneen päivittäminen on monimutkainen toimenpide ja yleensä sitä suositellaan, kun huone on epävakaa bugien, puuttuvien ominaisuuksien tai tietoturvaongelmien takia.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Tämä yleensä vaikuttaa siihen, miten huonetta käsitellään palvelimella. Jos sinulla on ongelmia Riottisi kanssa, <a>ilmoita virheestä</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Olat päivittämässä tätä huonetta versiosta <oldVersion/> versioon <newVersion/>.",
+    "Upgrade": "Päivitä",
+    "Enter secret storage passphrase": "Syötä salavaraston salalause",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Salavavaraston avaaminen epäonnistui. Varmista, että syötit oikean salalauseen.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi käyttää salavarastoa vain luotetulta tietokoneelta.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä salalauseesi.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jos olet unohtanut salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>asettaa uusia palautusvaihtoehtoja</button2>.",
+    "Enter secret storage recovery key": "Syötä salavaraston palautusavain",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Salavaraston käyttö epäonnistui. Varmista, että syötit oikean palautusavaimen.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä palautusavaimesi.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainten varmuuskopiointi käyttöön vain luotetulla tietokoneella.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>",
+    "Notification settings": "Ilmoitusasetukset",
+    "Help": "Ohje",
+    "User Status": "Käyttäjän tila",
+    "Country Dropdown": "Maapudotusvalikko",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Salavarasto otetaan käyttöön nykyisen avainten varmuuskopiointimenetelmäsi tiedoilla. Salavaraston salalause ja palautusavain tulee olemaan samat kuin ne olivat avainten varmuuskopioinnissasi",
+    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa salavarasto käyttöön vain luotetulla tietokoneella.",
+    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Voimme vaihtoehtoisesti tallentaa salavarastoon salatun kopion ristivarmennuksen identiteetistäsi muiden laitteiden varmentamiseen ja lähettääksesi avaimia meidän palvelimelle. Suojaa pääsysi salattuihin viesteihisi pitämällä salalauseesi turvassa.",
+    "Set up with a recovery key": "Ota käyttöön palautusavaimella",
+    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihin, jos unohdat salalauseesi.",
+    "As a safety net, you can use it to restore your access to encrypted messages.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihisi.",
+    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Pidä palautusavaimesi jossain hyvin turvallisessa paikassa, kuten salasananhallintasovelluksessa (tai kassakaapissa).",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Palautusavaimesi on <b>kopioitu leikepöydällesi</b>. Liitä se:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Palautusavaimesi on <b>Lataukset</b>-kansiossasi.",
+    "Your access to encrypted messages is now protected.": "Pääsysi salattuihin viesteihisi on nyt turvattu.",
+    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Ottamatta käyttöön salavarastoa et voi palauttaa pääsyäsi salattuihin viesteihisi tai ristivarmennuksen identiteettiisi, jos kirjaudut ulos tai käytät toista laitetta.",
+    "Set up secret storage": "Ota salavarasto käyttöön",
+    "Migrate from Key Backup": "Siirrä tiedot vanhasta avainten varmuuskopiointijärjestelmästä",
+    "Secure your encrypted messages with a passphrase": "Turvaa salatut viestisi salalauseella",
+    "Storing secrets...": "Tallennetaan salaisuuksia...",
+    "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui"
 }

From 5e4f341cd870aa0b38098dba2fb29a0b69168567 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 25 Dec 2019 19:16:46 +0000
Subject: [PATCH 0119/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2001 of 2001 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 fd88250707..2f31f75407 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2019,5 +2019,6 @@
     "Country Dropdown": "Ország lenyíló menü",
     "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal",
-    "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből"
+    "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből",
+    "Help": "Segítség"
 }

From a0e816d134f4f80db26b131b02ce9c70b76a3372 Mon Sep 17 00:00:00 2001
From: "ferhad.necef" <ferhad.necef@gmail.com>
Date: Wed, 25 Dec 2019 16:02:48 +0000
Subject: [PATCH 0120/3235] Translated using Weblate (Russian)

Currently translated at 90.8% (1816 of 2001 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 c71e4236b9..fc8b37140e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1830,5 +1830,7 @@
     "My Ban List": "Мой список запрещенных",
     "Ignored/Blocked": "Игнорируемые/Заблокированные",
     "Error adding ignored user/server": "Ошибка добавления игнорируемого пользователя/сервера",
-    "Error subscribing to list": "Ошибка при подписке на список"
+    "Error subscribing to list": "Ошибка при подписке на список",
+    "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер",
+    "Error upgrading room": "Ошибка обновления комнаты"
 }

From 7043453d3ebcd97ccfec519f224f9175326baf5a Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 24 Dec 2019 15:28:22 +0000
Subject: [PATCH 0121/3235] Translated using Weblate (Turkish)

Currently translated at 44.7% (894 of 2001 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 647ca2f6a5..85715846ac 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -738,5 +738,166 @@
     "View Servers in Room": "Odadaki Sunucuları Gör",
     "Toolbox": "Araç Kutusu",
     "Developer Tools": "Geliştirici Araçları",
-    "Integrations are disabled": "Bütünleştirmeler kapatılmış"
+    "Integrations are disabled": "Bütünleştirmeler kapatılmış",
+    "Integrations not allowed": "Bütünleştirmelere izin verilmiyor",
+    "Loading device info...": "Cihaz bilgileri yükleniyor...",
+    "Incompatible local cache": "Yerel geçici bellek uyumsuz",
+    "Clear cache and resync": "Geçici belleği temizle ve yeniden eşle",
+    "Updating Riot": "Riot güncelleniyor",
+    "I don't want my encrypted messages": "Şifrelenmiş mesajlarımı istemiyorum",
+    "Manually export keys": "Elle dışa aktarılmış anahtarlar",
+    "You'll lose access to your encrypted messages": "Şifrelenmiş mesajlarınıza erişiminizi kaybedeceksiniz",
+    "Are you sure you want to sign out?": "Oturumdan çıkmak istediğinize emin misiniz?",
+    "Your homeserver doesn't seem to support this feature.": "Ana sunucunuz bu özelliği desteklemiyor gözüküyor.",
+    "Message edits": "Mesajları düzenle",
+    "Report bugs & give feedback": "Hataları raporla & geri bildirim yap",
+    "Please fill why you're reporting.": "Lütfen neden raporlama yaptığınızı belirtin.",
+    "Report Content to Your Homeserver Administrator": "Ana Sunucu Yöneticinize İçeriği Raporlayın",
+    "Send report": "Rapor gönder",
+    "Room Settings - %(roomName)s": "Oda Ayarları - %(roomName)s",
+    "Failed to upgrade room": "Oda güncelleme başarısız",
+    "The room upgrade could not be completed": "Oda güncelleme tamamlanamadı",
+    "Upgrade this room to version %(version)s": "Bu odayı %(version)s versiyonuna yükselt",
+    "Upgrade Room Version": "Oda Sürümünü Yükselt",
+    "Automatically invite users": "Otomatik olarak kullanıcıları davet et",
+    "Upgrade private room": "Özel oda güncelle",
+    "Upgrade": "Yükselt",
+    "Sign out and remove encryption keys?": "Oturumu kapat ve şifreleme anahtarlarını sil?",
+    "Clear Storage and Sign Out": "Depolamayı temizle ve Oturumu Kapat",
+    "Send Logs": "Logları Gönder",
+    "Refresh": "Yenile",
+    "Checking...": "Kontrol ediliyor...",
+    "To get started, please pick a username!": "Başlamak için lütfen bir kullanıcı adı seçin!",
+    "Share Room": "Oda Paylaş",
+    "Link to most recent message": "En son mesaja bağlantı",
+    "Share User": "Kullanıcı Paylaş",
+    "Share Community": "Topluluk Paylaş",
+    "Share Room Message": "Oda Mesajı Paylaş",
+    "Link to selected message": "Seçili mesaja bağlantı",
+    "COPY": "KOPYA",
+    "Command Help": "Komut Yardımı",
+    "Missing session data": "Kayıp oturum verisi",
+    "Integration Manager": "Bütünleştirme Yöneticisi",
+    "Find others by phone or email": "Kişileri telefon yada e-posta ile bul",
+    "Be found by phone or email": "Telefon veya e-posta ile bulunun",
+    "Terms of Service": "Hizmet Şartları",
+    "Service": "Hizmet",
+    "Summary": "Özet",
+    "Document": "Belge",
+    "Next": "İleri",
+    "Upload files": "Dosyaları yükle",
+    "Upload all": "Hepsini yükle",
+    "Cancel All": "Hepsi İptal",
+    "Upload Error": "Yükleme Hatası",
+    "Allow": "İzin ver",
+    "Enter secret storage recovery key": "Depolama kurtarma anahtarı için şifre gir",
+    "This looks like a valid recovery key!": "Bu geçerli bir kurtarma anahtarına benziyor!",
+    "Not a valid recovery key": "Geçersiz bir kurtarma anahtarı",
+    "Unable to load backup status": "Yedek durumu yüklenemiyor",
+    "Recovery Key Mismatch": "Kurtarma Anahtarı Kurtarma",
+    "Unable to restore backup": "Yedek geri dönüşü yapılamıyor",
+    "No backup found!": "Yedek bulunamadı!",
+    "Backup Restored": "Yedek Geri Dönüldü",
+    "Enter Recovery Key": "Kurtarma Anahtarını Gir",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Uyarı</b>: Yedek anahtarı kurulumunu sadece güvenli bir bilgisayardan yapmalısınız.",
+    "Unable to reject invite": "Davet reddedilemedi",
+    "Pin Message": "Pin Mesajı",
+    "Share Message": "Mesajı Paylaş",
+    "Report Content": "İçeriği Raporla",
+    "Notification settings": "Bildirim ayarları",
+    "Clear status": "Durumu temizle",
+    "Update status": "Durumu güncelle",
+    "Set status": "Durumu ayarla",
+    "Set a new status...": "Yeni bir durum ayarla...",
+    "View Community": "Topluluğu Gör",
+    "Hide": "Gizle",
+    "Reload": "Yeniden Yükle",
+    "Remove for everyone": "Herkes için sil",
+    "Remove for me": "Benim için sil",
+    "User Status": "Kullanıcı Durumu",
+    "This homeserver would like to make sure you are not a robot.": "Bu ana sunucu sizin bir robot olup olmadığınızdan emin olmak istiyor.",
+    "Country Dropdown": "Ülke Listesi",
+    "Code": "Kod",
+    "Unable to validate homeserver/identity server": "Ana/kimlik sunucu doğrulanamıyor",
+    "Your Modular server": "Sizin Modüler sunucunuz",
+    "Server Name": "Sunucu Adı",
+    "The email field must not be blank.": "E-posta alanı boş bırakılamaz.",
+    "The username field must not be blank.": "Kullanıcı adı alanı boş bırakılamaz.",
+    "The phone number field must not be blank.": "Telefon numarası alanı boş bırakılamaz.",
+    "The password field must not be blank.": "Şifre alanı boş bırakılamaz.",
+    "Username": "Kullanıcı Adı",
+    "Use an email address to recover your account": "Hesabınızı kurtarmak için bir e-posta adresi kullanın",
+    "Enter email address (required on this homeserver)": "E-posta adresi gir ( bu ana sunucuda gerekli)",
+    "Doesn't look like a valid email address": "Geçerli bir e-posta adresine benzemiyor",
+    "Enter password": "Şifre gir",
+    "Password is allowed, but unsafe": "Şifreye izin var, fakat kullanmak güvenli değil",
+    "Nice, strong password!": "Güzel, güçlü şifre!",
+    "Keep going...": "Devam et...",
+    "Passwords don't match": "Şifreler uyuşmuyor",
+    "Enter phone number (required on this homeserver)": "Telefon numarası gir ( bu ana sunucuda gerekli)",
+    "Doesn't look like a valid phone number": "Geçerli bir telefon numarasına benzemiyor",
+    "Enter username": "Kullanıcı adı gir",
+    "Email (optional)": "E-posta (opsiyonel)",
+    "Confirm": "Doğrula",
+    "Phone (optional)": "Telefon (opsiyonel)",
+    "Create your Matrix account on %(serverName)s": "%(serverName)s üzerinde Matrix hesabınızı oluşturun",
+    "Create your Matrix account on <underlinedServerName />": "<underlinedServerName /> üzerinde Matrix hesabınızı oluşturun",
+    "Homeserver URL": "Ana sunucu URL",
+    "Identity Server URL": "Kimlik Sunucu URL",
+    "Other servers": "Diğer sunucular",
+    "Couldn't load page": "Sayfa yüklenemiyor",
+    "Add a Room": "Bir Oda Ekle",
+    "Add a User": "Bir Kullanıcı Ekle",
+    "Failed to upload image": "Resim yükleme başarısız",
+    "Unable to accept invite": "Davet kabul edilemiyor",
+    "Unable to join community": "Topluluğa katılınamıyor",
+    "Leave Community": "Topluluktan Ayrıl",
+    "Leave %(groupName)s?": "%(groupName)s den ayrıl?",
+    "Unable to leave community": "Topluluktan ayrılınamıyor",
+    "Community Settings": "Topluluk Ayarları",
+    "Join this community": "Bu topluluğa katıl",
+    "Leave this community": "Bu topluluktan ayrıl",
+    "You are an administrator of this community": "Bu topluluğun yöneticisi sizsiniz",
+    "You are a member of this community": "Bu topluluğun bir üyesisiniz",
+    "Who can join this community?": "Bu topluluğa kimler katılabilir?",
+    "Everyone": "Herkes",
+    "Long Description (HTML)": "Uzun Tanım (HTML)",
+    "Description": "Tanım",
+    "Community %(groupId)s not found": "%(groupId)s topluluğu bulunamıyor",
+    "This homeserver does not support communities": "Bu ana sunucu toplulukları desteklemiyor",
+    "Failed to load %(groupId)s": "%(groupId)s yükleme başarısız",
+    "Filter": "Filtre",
+    "Filter rooms…": "Odaları filtrele…",
+    "Old cryptography data detected": "Eski kriptolama verisi tespit edildi",
+    "Verification Request": "Doğrulama Talebi",
+    "Your Communities": "Topluluklarınız",
+    "Error whilst fetching joined communities": "Katılım sağlanmış topluluklar getirilirken hata oluştu",
+    "Create a new community": "Yeni bir topluluk oluştur",
+    "The homeserver may be unavailable or overloaded.": "Ana sunucunu mevcut değil yada fazla yüklü.",
+    "Preview": "Önizleme",
+    "View": "Görüntüle",
+    "Find a room…": "Bir oda bul…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Bir oda bul... (örn. %(exampleRoom)s)",
+    "%(count)s of your messages have not been sent.|one": "Mesajınız gönderilmedi.",
+    "Jump to first unread room.": "Okunmamış ilk odaya zıpla.",
+    "Jump to first invite.": "İlk davete zıpla.",
+    "Add room": "Oda ekle",
+    "Clear filter": "Filtre temizle",
+    "Guest": "Misafir",
+    "Your profile": "Profiliniz",
+    "Could not load user profile": "Kullanıcı profili yüklenemedi",
+    "Your Matrix account on %(serverName)s": "%(serverName)s sunucusundaki Matrix hesabınız",
+    "Your password has been reset.": "Parolanız sıfırlandı.",
+    "Set a new password": "Yeni bir şifre belirle",
+    "General failure": "Genel başarısızlık",
+    "This homeserver does not support login using email address.": "Bu ana sunucu e-posta adresiyle oturum açmayı desteklemiyor.",
+    "This account has been deactivated.": "Bu hesap pasifleştirilmiş.",
+    "Create account": "Yeni hesap",
+    "Unable to query for supported registration methods.": "Desteklenen kayıt yöntemleri için sorgulama yapılamıyor.",
+    "Continue with previous account": "Önceki hesapla devam et",
+    "<a>Log in</a> to your new account.": "Yeni hesabınızla <a>Oturum aç</a>ın.",
+    "Registration Successful": "Kayıt Başarılı",
+    "Create your account": "Hesabınızı oluşturun",
+    "Forgotten your password?": "Parolanızı mı unuttunuz?",
+    "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın."
 }

From a9cae90a520be50608ef6aee60fce911c66cfbbe Mon Sep 17 00:00:00 2001
From: Pankaj Kumar Singh <34129569+ps0305@users.noreply.github.com>
Date: Thu, 26 Dec 2019 23:03:04 +0530
Subject: [PATCH 0122/3235] Signed-off-by Pankaj Singh <singh.pankaj@live.com

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1265c2bd77..c2e3737b81 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ matrix-react-sdk
 This is a react-based SDK for inserting a Matrix chat/voip client into a web page.
 
 This package provides the React components needed to build a Matrix web client
-using React.  It is not useable in isolation, and instead must must be used from
+using React.  It is not useable in isolation, and instead must be used from
 a 'skin'. A skin provides:
  * Customised implementations of presentation components.
  * Custom CSS
@@ -82,7 +82,7 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
     'Stealing' styling information from other components (including parents)
     is not cool, as it breaks the independence of the components.
 
-  * CSS classes are named with an app-specific namespacing prefix to try to avoid
+  * CSS classes are named with an app-specific name-spacing prefix to try to avoid
     CSS collisions.  The base skin shipped by Matrix.org with the matrix-react-sdk
     uses the naming prefix "mx_".  A company called Yoyodyne Inc might use a
     prefix like "yy_" for its app-specific classes.
@@ -107,7 +107,7 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
     .mx_RoomTile {} in RoomList.css - only RoomTile.css is allowed to define its
     own CSS.  Instead, say .mx_RoomList .mx_RoomTile {} to scope the override
     only to the context of RoomList views.  N.B. overrides should be relatively
-    rare as in general CSS inheritence should be enough.
+    rare as in general CSS inheritance should be enough.
 
   * Components should render only within the bounding box of their outermost DOM
     element. Page-absolute positioning and negative CSS margins and similar are

From 73800c9a9200648ac6259fa9d0c20e6d27bd333f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 18:04:58 +0000
Subject: [PATCH 0123/3235] Fix UserInfo promote user inverted buttons

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 316c8d3d0e..208c5e8906 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -984,7 +984,7 @@ const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => {
                 });
 
                 const [confirmed] = await finished;
-                if (confirmed) return;
+                if (!confirmed) return;
             }
             await _applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
         } finally {

From c1c0c36008fa21f0729feead80d9f0bc948ccd8a Mon Sep 17 00:00:00 2001
From: "ferhad.necef" <ferhad.necef@gmail.com>
Date: Wed, 25 Dec 2019 22:18:37 +0000
Subject: [PATCH 0124/3235] Translated using Weblate (Azerbaijani)

Currently translated at 22.4% (448 of 2001 strings)

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

diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index e4316496ec..538403f164 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -350,7 +350,7 @@
     "Failed to invite users to community": "İstifadəçiləri cəmiyyətə dəvət etmək alınmadı",
     "Unnamed Room": "Adı açıqlanmayan otaq",
     "Unable to load! Check your network connectivity and try again.": "Yükləmək olmur! Şəbəkə bağlantınızı yoxlayın və yenidən cəhd edin.",
-    "Dismiss": "Rədd et",
+    "Dismiss": "Nəzərə almayın",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot-un sizə bildiriş göndərmək icazəsi yoxdur - brauzerinizin parametrlərini yoxlayın",
     "Riot was not given permission to send notifications - please try again": "Riot bildiriş göndərmək üçün icazə verilmədi - lütfən yenidən cəhd edin",
     "This email address was not found": "Bu e-poçt ünvanı tapılmadı",
@@ -447,5 +447,6 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Bu otaqda %(qruplar)s üçün %(senderDisplayName)s aktiv oldu.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.",
     "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir",
-    "Custom Server Options": "Xüsusi Server Seçimləri"
+    "Custom Server Options": "Fərdi Server Seçimləri",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Bu otaqda %(newGroups)s üçün aktiv və %(oldGroups)s üçün %(senderDisplayName)s deaktiv oldu."
 }

From 22fe0add3c01215f2525e36f567196b6f3d0e8b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 18:10:52 +0000
Subject: [PATCH 0125/3235] Make UserOnlineDot more generic

---
 res/css/_components.scss                      |  1 +
 res/css/views/rooms/_RoomTile.scss            |  8 -------
 res/css/views/rooms/_UserOnlineDot.scss       | 23 +++++++++++++++++++
 src/components/views/rooms/RoomTile.js        |  4 ++--
 ...{RoomTileOnlineDot.js => UserOnlineDot.js} |  8 +++----
 5 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 res/css/views/rooms/_UserOnlineDot.scss
 rename src/components/views/rooms/{RoomTileOnlineDot.js => UserOnlineDot.js} (89%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 233c781d7f..03c2663af8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -174,6 +174,7 @@
 @import "./views/rooms/_SendMessageComposer.scss";
 @import "./views/rooms/_Stickers.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
+@import "./views/rooms/_UserOnlineDot.scss";
 @import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_AvatarSetting.scss";
 @import "./views/settings/_CrossSigningPanel.scss";
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 2b181f366e..e5c7948216 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -62,14 +62,6 @@ limitations under the License.
     min-width: 0;
 }
 
-.mx_RoomTile_online_dot {
-    border-radius: 50%;
-    background-color: $accent-color;
-    height: 5px;
-    width: 5px;
-    display: inline-block;
-}
-
 .mx_RoomTile_subtext {
     display: inline-block;
     font-size: 11px;
diff --git a/res/css/views/rooms/_UserOnlineDot.scss b/res/css/views/rooms/_UserOnlineDot.scss
new file mode 100644
index 0000000000..339e5cc48a
--- /dev/null
+++ b/res/css/views/rooms/_UserOnlineDot.scss
@@ -0,0 +1,23 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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_UserOnlineDot {
+    border-radius: 50%;
+    background-color: $accent-color;
+    height: 5px;
+    width: 5px;
+    display: inline-block;
+}
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index cd5af61862..3f45b5b342 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -380,8 +380,8 @@ module.exports = createReactClass({
             />;
 
             if (this.props.room.getMember(dmUserId).membership === "join") {
-                const RoomTileOnlineDot = sdk.getComponent('rooms.RoomTileOnlineDot');
-                dmOnline = <RoomTileOnlineDot userId={dmUserId} />;
+                const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
+                dmOnline = <UserOnlineDot userId={dmUserId} />;
             }
         }
 
diff --git a/src/components/views/rooms/RoomTileOnlineDot.js b/src/components/views/rooms/UserOnlineDot.js
similarity index 89%
rename from src/components/views/rooms/RoomTileOnlineDot.js
rename to src/components/views/rooms/UserOnlineDot.js
index a882aec613..426dd1bf64 100644
--- a/src/components/views/rooms/RoomTileOnlineDot.js
+++ b/src/components/views/rooms/UserOnlineDot.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
-const RoomTileOnlineDot = ({userId}) => {
+const UserOnlineDot = ({userId}) => {
     const cli = useContext(MatrixClientContext);
     const user = useMemo(() => cli.getUser(userId), [cli, userId]);
 
@@ -38,11 +38,11 @@ const RoomTileOnlineDot = ({userId}) => {
     useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler);
     useEventEmitter(user, "User.presence", currentlyActiveHandler);
 
-    return isOnline ? <span className="mx_RoomTile_online_dot" /> : null;
+    return isOnline ? <span className="mx_UserOnlineDot" /> : null;
 };
 
-RoomTileOnlineDot.propTypes = {
+UserOnlineDot.propTypes = {
     userId: PropTypes.string.isRequired,
 };
 
-export default RoomTileOnlineDot;
+export default UserOnlineDot;

From e95b67e101399c6d6b5b74e11f396e8489e6799a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 18:15:08 +0000
Subject: [PATCH 0126/3235] Only show it if exactly 2 members, until we get
 Canonical DMs

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

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 3f45b5b342..ecf2de394b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -379,7 +379,8 @@ module.exports = createReactClass({
                 alt="dm"
             />;
 
-            if (this.props.room.getMember(dmUserId).membership === "join") {
+            const { room } = this.props;
+            if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) {
                 const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
                 dmOnline = <UserOnlineDot userId={dmUserId} />;
             }

From ebf7eb698dd548766ec8dfb3f76438dbb13b1f64 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 18:52:57 +0000
Subject: [PATCH 0127/3235] Turn RoomAliasField into properly controlled and
 use in RoomSettings

---
 .../views/dialogs/CreateRoomDialog.js         |  2 +-
 .../views/elements/RoomAliasField.js          |  5 +++-
 .../views/room_settings/AliasSettings.js      | 28 +++++++++++++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 6a73d22708..5ddebb1119 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -173,7 +173,7 @@ export default createReactClass({
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
-                    <RoomAliasField id="alias" ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} />
+                    <RoomAliasField id="alias" ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} value={this.state.alias} />
                 </div>
             );
         } else {
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 03f4000e59..7054dfcce2 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -20,11 +20,13 @@ import sdk from '../../../index';
 import withValidation from './Validation';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
+// Controlled form component wrapping Field for inputting a room alias scoped to a given domain
 export default class RoomAliasField extends React.PureComponent {
     static propTypes = {
         id: PropTypes.string.isRequired,
         domain: PropTypes.string.isRequired,
         onChange: PropTypes.func,
+        value: PropTypes.string.isRequired,
     };
 
     constructor(props) {
@@ -53,6 +55,7 @@ export default class RoomAliasField extends React.PureComponent {
                     onValidate={this._onValidate}
                     placeholder={_t("e.g. my-room")}
                     onChange={this._onChange}
+                    value={this.props.value.substring(1, this.props.value.length - this.props.domain.length - 1)}
                     maxLength={maxlength} />
         );
     }
@@ -61,7 +64,7 @@ export default class RoomAliasField extends React.PureComponent {
         if (this.props.onChange) {
             this.props.onChange(this._asFullAlias(ev.target.value));
         }
-    }
+    };
 
     _onValidate = async (fieldState) => {
         const result = await this._validationRules(fieldState);
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index daf5c6edc2..946bf0d791 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EditableItemList from "../elements/EditableItemList";
+
 const React = require('react');
 import PropTypes from 'prop-types';
 const MatrixClientPeg = require('../../../MatrixClientPeg');
@@ -22,8 +24,29 @@ const sdk = require("../../../index");
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
+import AccessibleButton from "../elements/AccessibleButton";
 const Modal = require("../../../Modal");
 
+class EditableAliasesList extends EditableItemList {
+    _renderNewItemField() {
+        const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
+        const onChange = (alias) => this._onNewItemChanged({target: {value: alias}});
+        return (
+            <form onSubmit={this._onItemAdded} autoComplete="off"
+                  noValidate={true} className="mx_EditableItemList_newItem">
+                <RoomAliasField
+                    id={`mx_EditableItemList_new_${this.props.id}`}
+                    onChange={onChange}
+                    value={this.props.newItem || ""}
+                    domain={this.props.domain} />
+                <AccessibleButton onClick={this._onItemAdded} kind="primary">
+                    {_t("Add")}
+                </AccessibleButton>
+            </form>
+        );
+    }
+}
+
 export default class AliasSettings extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
@@ -47,7 +70,6 @@ export default class AliasSettings extends React.Component {
             remoteDomains: [], // [ domain.com, foobar.com ]
             canonicalAlias: null, // #canonical:domain.com
             updatingCanonicalAlias: false,
-            newItem: "",
         };
 
         const localDomain = MatrixClientPeg.get().getDomain();
@@ -181,7 +203,6 @@ export default class AliasSettings extends React.Component {
     };
 
     render() {
-        const EditableItemList = sdk.getComponent("elements.EditableItemList");
         const localDomain = MatrixClientPeg.get().getDomain();
 
         let found = false;
@@ -233,7 +254,7 @@ export default class AliasSettings extends React.Component {
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
-                <EditableItemList
+                <EditableAliasesList
                     id="roomAliases"
                     className={"mx_RoomSettings_localAliases"}
                     items={this.state.domainToAliases[localDomain] || []}
@@ -248,6 +269,7 @@ export default class AliasSettings extends React.Component {
                     placeholder={_t(
                         'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
                     )}
+                    domain={localDomain}
                 />
                 {remoteAliasesSection}
             </div>

From e320f64ba1ed9d6f99138885bcbd68fe2f402e85 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 19:27:04 +0000
Subject: [PATCH 0128/3235] fuzzy-sort MemberList

---
 src/components/views/rooms/MemberList.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 0805c0342c..b874c378d4 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -32,6 +32,9 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
 const SHOW_MORE_INCREMENT = 100;
 
+// Regex applied to member names before applying sort, to fuzzy it a little
+const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@]+/g;
+
 module.exports = createReactClass({
     displayName: 'MemberList',
 
@@ -336,10 +339,13 @@ module.exports = createReactClass({
         }
 
         // Fourth by name (alphabetical)
-        const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name;
-        const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name;
+        const nameA = (memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name).replace(SORT_REGEX, "");
+        const nameB = (memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name).replace(SORT_REGEX, "");
         // console.log(`Comparing userA_name=${nameA} against userB_name=${nameB} - returning`);
-        return nameA.localeCompare(nameB);
+        return nameA.localeCompare(nameB, {
+            ignorePunctuation: true,
+            sensitivity: "base",
+        });
     },
 
     onSearchQueryChanged: function(searchQuery) {

From ab122889795b5aa864dda67ac1a9b4d99e4555be Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 19:29:25 +0000
Subject: [PATCH 0129/3235] Add more punctuation to regex

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

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index b874c378d4..bbb1390611 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -33,7 +33,7 @@ const INITIAL_LOAD_NUM_INVITED = 5;
 const SHOW_MORE_INCREMENT = 100;
 
 // Regex applied to member names before applying sort, to fuzzy it a little
-const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@]+/g;
+const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@#\\/+_=]+/g;
 
 module.exports = createReactClass({
     displayName: 'MemberList',

From 06230e01e3805cdcb418d4cc452628f4f73a8317 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 19:36:16 +0000
Subject: [PATCH 0130/3235] Fix End-to-End tests for RoomSettings interactivity

---
 test/end-to-end-tests/src/usecases/room-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index 7655d2d066..5b425f14b7 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -52,7 +52,7 @@ module.exports = async function changeRoomSettings(session, settings) {
     if (settings.alias) {
         session.log.step(`sets alias to ${settings.alias}`);
         const aliasField = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings input[type=text]");
-        await session.replaceInputText(aliasField, settings.alias);
+        await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":")));
         const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings .mx_AccessibleButton");
         await addButton.click();
         session.log.done();

From ed24f19a3f24f6c23cb3dd04aae6c1c6a287a9d2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 20:12:50 +0000
Subject: [PATCH 0131/3235] Fix stick picker chevron offset calculation

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 24f256e706..4fabb75ed6 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -315,8 +315,8 @@ export default class Stickerpicker extends React.Component {
 
         // Offset the chevron location, which is relative to the left of the context menu
         //  (10 = offset when context menu would not be displayed off viewport)
-        //  (8 = value required in practice (possibly 10 - 2 where the 2 = context menu borders)
-        const stickerPickerChevronOffset = Math.max(10, 8 + window.pageXOffset + buttonRect.left - x);
+        //  (2 = context menu borders)
+        const stickerPickerChevronOffset = Math.max(10, 2 + window.pageXOffset + buttonRect.left - x);
 
         const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
 

From e9ebfa100fa639444c283222e658f8f64bb06c61 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 26 Dec 2019 20:32:25 +0000
Subject: [PATCH 0132/3235] Do not show Top Unread Messages Bar and Jump to
 bottom button if searching

---
 src/components/structures/RoomView.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 21d5a8f354..939f422a36 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1931,7 +1931,8 @@ module.exports = createReactClass({
             />);
 
         let topUnreadMessagesBar = null;
-        if (this.state.showTopUnreadMessagesBar) {
+        // Do not show TopUnreadMessagesBar if we have search results showing, it makes no sense
+        if (this.state.showTopUnreadMessagesBar && !this.state.searchResults) {
             const TopUnreadMessagesBar = sdk.getComponent('rooms.TopUnreadMessagesBar');
             topUnreadMessagesBar = (<TopUnreadMessagesBar
                                        onScrollUpClick={this.jumpToReadMarker}
@@ -1939,7 +1940,8 @@ module.exports = createReactClass({
                                     />);
         }
         let jumpToBottom;
-        if (!this.state.atEndOfLiveTimeline) {
+        // Do not show JumpToBottomButton if we have search results showing, it makes no sense
+        if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) {
             const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
             jumpToBottom = (<JumpToBottomButton
                 numUnreadMessages={this.state.numUnreadMessages}

From 9f948b5da3a40914288ccb4ccc1676a0e9a32849 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Dec 2019 13:59:57 +0000
Subject: [PATCH 0133/3235] Serialize file uploads into room to match
 confirmation dialog order

---
 src/ContentMessages.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 6908a6a18e..0ce349f348 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -422,6 +422,9 @@ export default class ContentMessages {
 
         const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
         let uploadAll = false;
+        // Promise to complete before sending next file into room, used for synchronisation of file-sending
+        // to match the order the files were specified in
+        let promBefore = Promise.resolve();
         for (let i = 0; i < okFiles.length; ++i) {
             const file = okFiles[i];
             if (!uploadAll) {
@@ -440,11 +443,11 @@ export default class ContentMessages {
                 });
                 if (!shouldContinue) break;
             }
-            this._sendContentToRoom(file, roomId, matrixClient);
+            promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore);
         }
     }
 
-    _sendContentToRoom(file, roomId, matrixClient) {
+    _sendContentToRoom(file, roomId, matrixClient, promBefore) {
         const content = {
             body: file.name || 'Attachment',
             info: {
@@ -517,7 +520,10 @@ export default class ContentMessages {
                 content.file = result.file;
                 content.url = result.url;
             });
-        }).then(function(url) {
+        }).then((url) => {
+            // Await previous message being sent into the room
+            return promBefore;
+        }).then(function() {
             return matrixClient.sendMessage(roomId, content);
         }, function(err) {
             error = err;

From 6f7ddc37139db7ebbd82823c9d1b771623981ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Fri, 27 Dec 2019 13:17:10 +0000
Subject: [PATCH 0134/3235] Translated using Weblate (Czech)

Currently translated at 98.8% (1976 of 2001 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 4b69e2da82..5aacb27c80 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1976,5 +1976,23 @@
     "Set up secret storage": "Nastavit bezpečné úložiště",
     "Secure your encrypted messages with a passphrase": "Zabezpečte vaše šifrované zprávy heslem",
     "Storing secrets...": "Ukládám tajná data...",
-    "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště"
+    "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště",
+    "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.",
+    "not found": "nenalezeno",
+    "Backup has a <validity>valid</validity> signature from this user": "Záloha má <validity>platný</validity> podpis od tohoto uživatele",
+    "Backup has a <validity>invalid</validity> signature from this user": "Záloha má <validity>neplatný</validity> podpis od tohoto uživatele",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Záloha je podepsaná <verify>neznámým</verify> uživatelem %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Záloha je podepsaná <verify>neznámým</verify> zařízením %(deviceId)s",
+    "This user has not verified all of their devices.": "Uživatel neověřil všechna svá zařízení.",
+    "You have not verified this user. This user has verified all of their devices.": "Tohoto uživatele jste neověřili. Uživatel má ověřená všechna svá zařízení.",
+    "You have verified this user. This user has verified all of their devices.": "Tohoto uživatele jste ověřili. Uživatel má ověřená všechna svá zařízení.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Někteřé uživatele v této šifrované místnosti jste neověřili nebo nemají ověřená některá svá zařízení.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Všichni uživatelé v této šifrované místnosti jsou ověření a mají ověřená všechna svá zařízení.",
+    "Close preview": "Zavřít náhled",
+    "Hide verified sessions": "Schovat ověřené relace",
+    "%(count)s verified sessions|other": "%(count)s ověřených relací",
+    "%(count)s verified sessions|one": "1 ověřená relace",
+    "Language Dropdown": "Menu jazyků",
+    "Help": "Pomoc",
+    "Country Dropdown": "Menu států"
 }

From 145741d16846b5ddca99a0800970209b04dc8139 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Fri, 27 Dec 2019 08:28:07 +0000
Subject: [PATCH 0135/3235] Translated using Weblate (Ukrainian)

Currently translated at 27.1% (542 of 2001 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index e2df3fc774..9a522e6ee2 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -405,7 +405,7 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив/ла %(widgetName)s",
     "Failure to create room": "Не вдалося створити кімнату",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сервер може бути недоступний, перевантажений, або ж ви натрапили на ваду.",
-    "Send anyway": "Все-таки надіслати",
+    "Send anyway": "Надіслати хоч би там що",
     "Unnamed Room": "Кімната без назви",
     "This homeserver has hit its Monthly Active User limit.": "Цей домашній сервер досягнув свого ліміту щомісячних активних користувачів.",
     "This homeserver has exceeded one of its resource limits.": "Цей домашній сервер досягнув одного зі своїх лімітів ресурсів.",

From f9e386adaa289e871a6da26ecaf12fc92fea0473 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Dec 2019 17:04:14 +0000
Subject: [PATCH 0136/3235] Improve SORT_REGEX

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

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index bbb1390611..de0a6fe478 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -32,8 +32,9 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
 const SHOW_MORE_INCREMENT = 100;
 
-// Regex applied to member names before applying sort, to fuzzy it a little
-const SORT_REGEX = /[.?!,;:\-()[\]{}'"&@#\\/+_=]+/g;
+// Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little
+// matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
+const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
 
 module.exports = createReactClass({
     displayName: 'MemberList',

From aa990462cec34b47349d3ef6ba542aed17470c33 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Dec 2019 17:05:51 +0000
Subject: [PATCH 0137/3235] delint

---
 src/components/views/room_settings/AliasSettings.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 946bf0d791..aa9d46c9d5 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -32,15 +32,19 @@ class EditableAliasesList extends EditableItemList {
         const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
         const onChange = (alias) => this._onNewItemChanged({target: {value: alias}});
         return (
-            <form onSubmit={this._onItemAdded} autoComplete="off"
-                  noValidate={true} className="mx_EditableItemList_newItem">
+            <form
+                onSubmit={this._onItemAdded}
+                autoComplete="off"
+                noValidate={true}
+                className="mx_EditableItemList_newItem"
+            >
                 <RoomAliasField
                     id={`mx_EditableItemList_new_${this.props.id}`}
                     onChange={onChange}
                     value={this.props.newItem || ""}
                     domain={this.props.domain} />
                 <AccessibleButton onClick={this._onItemAdded} kind="primary">
-                    {_t("Add")}
+                    { _t("Add") }
                 </AccessibleButton>
             </form>
         );

From 957b1efc00885b3f6fd55160e35de16a01b8cae0 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 27 Dec 2019 17:13:48 +0000
Subject: [PATCH 0138/3235] Translated using Weblate (Italian)

Currently translated at 99.9% (2000 of 2001 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 5d0c769e6e..390729950b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2016,5 +2016,6 @@
     "Country Dropdown": "Nazione a tendina",
     "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi",
-    "Migrate from Key Backup": "Migra dal backup chiavi"
+    "Migrate from Key Backup": "Migra dal backup chiavi",
+    "Help": "Aiuto"
 }

From 98571d706f16d36fd3402e765fd9c1b61c640824 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 27 Dec 2019 11:31:15 -0700
Subject: [PATCH 0139/3235] Fix NPE when searching for rooms

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
---
 src/components/views/rooms/RoomTile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ecf2de394b..241713c97d 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -380,7 +380,8 @@ module.exports = createReactClass({
             />;
 
             const { room } = this.props;
-            if (room.getMember(dmUserId).membership === "join" && room.getJoinedMemberCount() === 2) {
+            const member = room.getMember(dmUserId);
+            if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
                 const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
                 dmOnline = <UserOnlineDot userId={dmUserId} />;
             }

From a0cb6ce30287633192a7be5a13b02036a74395f6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 28 Dec 2019 17:51:38 +0000
Subject: [PATCH 0140/3235] User Info fetch latest RoomMember instead of
 showing historical data

---
 src/components/views/right_panel/UserInfo.js | 43 +++++++++++---------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 208c5e8906..69555bf79f 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1020,6 +1020,8 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     // Load room if we are given a room id and memoize it
     const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]);
+    // fetch latest room member if we have a room, so we don't show historical information
+    const member = useMemo(() => room ? room.getMember(user.userId) : user, [room, user]);
 
     // only display the devices list if our client supports E2E
     const _enableDevices = cli.isCryptoEnabled();
@@ -1051,7 +1053,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         setPendingUpdateCount(pendingUpdateCount - 1);
     }, [pendingUpdateCount]);
 
-    const roomPermissions = useRoomPermissions(cli, room, user);
+    const roomPermissions = useRoomPermissions(cli, room, member);
 
     const onSynapseDeactivate = useCallback(async () => {
         const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
@@ -1084,7 +1086,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
     }, [cli, user.userId]);
 
     const onMemberAvatarClick = useCallback(() => {
-        const member = user;
         const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
         if (!avatarUrl) return;
 
@@ -1096,7 +1097,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         };
 
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    }, [cli, user]);
+    }, [cli, member]);
 
     let synapseDeactivateButton;
     let spinner;
@@ -1113,11 +1114,11 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
     }
 
     let adminToolsContainer;
-    if (room && user.roomId) {
+    if (room && member.roomId) {
         adminToolsContainer = (
             <RoomAdminToolsContainer
                 powerLevels={powerLevels}
-                member={user}
+                member={member}
                 room={room}
                 startUpdating={startUpdating}
                 stopUpdating={stopUpdating}>
@@ -1147,20 +1148,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
     }
 
-    const displayName = user.name || user.displayname;
+    const displayName = member.name || member.displayname;
 
     let presenceState;
     let presenceLastActiveAgo;
     let presenceCurrentlyActive;
     let statusMessage;
 
-    if (user instanceof RoomMember && user.user) {
-        presenceState = user.user.presence;
-        presenceLastActiveAgo = user.user.lastActiveAgo;
-        presenceCurrentlyActive = user.user.currentlyActive;
+    if (member instanceof RoomMember && member.user) {
+        presenceState = member.user.presence;
+        presenceLastActiveAgo = member.user.lastActiveAgo;
+        presenceCurrentlyActive = member.user.currentlyActive;
 
         if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
-            statusMessage = user.user._unstable_statusMessage;
+            statusMessage = member.user._unstable_statusMessage;
         }
     }
 
@@ -1190,13 +1191,13 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
             <div>
                 <div>
                     <MemberAvatar
-                        member={user}
+                        member={member}
                         width={2 * 0.3 * window.innerHeight} // 2x@30vh
                         height={2 * 0.3 * window.innerHeight} // 2x@30vh
                         resizeMethod="scale"
-                        fallbackUserId={user.userId}
+                        fallbackUserId={member.userId}
                         onClick={onMemberAvatarClick}
-                        urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
+                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
                 </div>
             </div>
         </div>
@@ -1210,10 +1211,14 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
             title={_t('Close')} />;
     }
 
-    const memberDetails = <PowerLevelSection
-        powerLevels={powerLevels}
-        user={user} room={room} roomPermissions={roomPermissions}
-    />;
+    const memberDetails = (
+        <PowerLevelSection
+            powerLevels={powerLevels}
+            user={member}
+            room={room}
+            roomPermissions={roomPermissions}
+        />
+    );
 
     const isRoomEncrypted = useIsEncrypted(cli, room);
     // undefined means yet to be loaded, null means failed to load, otherwise list of devices
@@ -1349,7 +1354,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
                     devices={devices}
                     canInvite={roomPermissions.canInvite}
                     isIgnored={isIgnored}
-                    member={user} />
+                    member={member} />
 
                 { adminToolsContainer }
 

From 705bfcd20dca6f68ece3d12254818bbaec124871 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 28 Dec 2019 17:54:46 +0000
Subject: [PATCH 0141/3235] fix RoomViewStore import in UserInfo

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 69555bf79f..9fd7a1ddff 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -32,7 +32,7 @@ import SdkConfig from '../../../SdkConfig';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventTimeline} from "matrix-js-sdk";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import * as RoomViewStore from "../../../stores/RoomViewStore";
+import RoomViewStore from "../../../stores/RoomViewStore";
 import MultiInviter from "../../../utils/MultiInviter";
 import GroupStore from "../../../stores/GroupStore";
 import MatrixClientPeg from "../../../MatrixClientPeg";

From 4489b5a21aa7550d1bfeee1b4f3960ebc4698cb7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 28 Dec 2019 20:05:55 +0000
Subject: [PATCH 0142/3235] Escape HTML in og:description and render any html
 &-encoded entities

---
 src/components/views/rooms/LinkPreviewWidget.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index ee63cd1bb7..06c0201af8 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -128,15 +128,15 @@ module.exports = createReactClass({
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        // Escape </> to prevent any HTML injections, we can't replace & as the description may contain & encoded html entities
+        const safeDescription = (p["og:description"] || "").replace("<", "&lt;").replace(">", "&gt;");
         return (
             <div className="mx_LinkPreviewWidget" >
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
                     <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noopener">{ p["og:title"] }</a></div>
                     <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
-                    <div className="mx_LinkPreviewWidget_description" ref={this._description}>
-                        { p["og:description"] }
-                    </div>
+                    <div className="mx_LinkPreviewWidget_description" ref={this._description} dangerouslySetInnerHTML={{ __html: safeDescription }} />
                 </div>
                 <AccessibleButton className="mx_LinkPreviewWidget_cancel" onClick={this.props.onCancelClick} aria-label={_t("Close preview")}>
                     <img className="mx_filterFlipColor" alt="" role="presentation"

From d0b8565f544a6cb72af58054679f5471514ffe28 Mon Sep 17 00:00:00 2001
From: Justin Sleep <justin@midnightmechanism.com>
Date: Sat, 28 Dec 2019 23:52:57 -0600
Subject: [PATCH 0143/3235] Fix inverted diff line highlighting in dark theme

Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
---
 res/themes/dark/css/_dark.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index eadde4c672..d1d0e333a0 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -243,3 +243,12 @@ $breadcrumb-placeholder-bg-color: #272c35;
         }
     }
 }
+
+// Fixes diff color inversion by swapping add / del colors
+.hljs-addition {
+    background: #fdd;
+}
+
+.hljs-deletion {
+    background: #dfd;
+}

From 9eed423994b546dc01ecec75d4f8fae0df35d28b Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 24 Dec 2019 15:06:50 +0100
Subject: [PATCH 0144/3235] support channel names with slash in name/alias

Signed-off-by: Jan Gerber <j@mailb.org>
---
 src/components/structures/MatrixChat.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index fad57f5d52..af3f4d2598 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1569,9 +1569,17 @@ export default createReactClass({
                 action: 'start_post_registration',
             });
         } else if (screen.indexOf('room/') == 0) {
-            const segments = screen.substring(5).split('/');
-            const roomString = segments[0];
-            let eventId = segments.splice(1).join("/"); // empty string if no event id given
+            // Rooms can have the following formats:
+            // #room_alias:domain or !opaque_id:domain
+            const room = screen.substring(5);
+            const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a :
+            let eventOffset = room.length;
+            // room aliases can contain slashes only look for slash after domain
+            if (room.substring(domainOffset).indexOf('/') > -1) {
+                eventOffset = domainOffset + room.substring(domainOffset).indexOf('/');
+            }
+            const roomString = room.substring(0, eventOffset);
+            let eventId = room.substring(eventOffset + 1); // empty string if no event id given
 
             // Previously we pulled the eventID from the segments in such a way
             // where if there was no eventId then we'd get undefined. However, we

From b1c28870878ee0e5fb6f634bf8a4b5ef030b3c12 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Mon, 30 Dec 2019 16:08:24 +0000
Subject: [PATCH 0145/3235] line length

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

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 9ac2b17f23..e01319e3bd 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -55,7 +55,8 @@ export default class RoomSettingsDialog extends React.Component {
     _getTabs() {
         const tabs = [];
         const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state");
-        const shouldShowBridgeIcon = featureFlag && BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
+        const shouldShowBridgeIcon = featureFlag && 
+            BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
 
         tabs.push(new Tab(
             _td("General"),

From fb94be4abdb713bb23b8b22461500b90f682ec92 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Mon, 30 Dec 2019 16:11:59 +0000
Subject: [PATCH 0146/3235] No trailing space

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

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index e01319e3bd..c31fe1992d 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -55,7 +55,7 @@ export default class RoomSettingsDialog extends React.Component {
     _getTabs() {
         const tabs = [];
         const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state");
-        const shouldShowBridgeIcon = featureFlag && 
+        const shouldShowBridgeIcon = featureFlag &&
             BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
 
         tabs.push(new Tab(

From d7a680db71b94c46ebeeba9f93b9acae6c472379 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 29 Dec 2019 08:54:04 +0000
Subject: [PATCH 0147/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2001 of 2001 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b3e9a731ee..7214c231e0 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2007,5 +2007,16 @@
     "Set up secret storage": "Ezarri biltegi sekretua",
     "Secure your encrypted messages with a passphrase": "Babestu zure zifratutako mezuak pasa-esaldi batekin",
     "Storing secrets...": "Sekretuak gordetzen...",
-    "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri"
+    "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri",
+    "The message you are trying to send is too large.": "Bidali nahi duzun mezua handiegia da.",
+    "This user has not verified all of their devices.": "Erabiltzaileak ez ditu bere gailu guztiak egiaztatu.",
+    "You have not verified this user. This user has verified all of their devices.": "Ez duzu erabiltzaile hau egiaztatu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.",
+    "You have verified this user. This user has verified all of their devices.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Ez dituzu zifratutako gela honetako erabiltzaile batzuk egiaztatu, edo hauek ez dituzte bere gailu guztiak egiaztatu.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Zifratutako gela honetako erabiltzaile guztiak egiaztatu dituzu, eta hauek bere gailu guztiak egiaztatu dituzte.",
+    "Language Dropdown": "Hizkuntza menua",
+    "Help": "Laguntza",
+    "Country Dropdown": "Herrialde menua",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua zure oraingo gakoen babes-kopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berdinak izango dira",
+    "Migrate from Key Backup": "Migratu gakoen babes-kopiatik"
 }

From 44c181576e8aa7c0bc6a17d987ab4dd2dc09efd2 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 27 Dec 2019 19:29:34 +0000
Subject: [PATCH 0148/3235] Translated using Weblate (Turkish)

Currently translated at 47.9% (959 of 2001 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 85715846ac..85cfeedd06 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -589,7 +589,7 @@
     "The platform you're on": "Bulunduğun platform",
     "The version of Riot.im": "Riot.im'in sürümü",
     "Your language of choice": "Seçtiginiz diliniz",
-    "Which officially provided instance you are using, if any": "",
+    "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
     "Add Email Address": "E-posta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
     "Your identity server's URL": "Kimlik sunucunuzun linki",
@@ -899,5 +899,69 @@
     "Registration Successful": "Kayıt Başarılı",
     "Create your account": "Hesabınızı oluşturun",
     "Forgotten your password?": "Parolanızı mı unuttunuz?",
-    "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın."
+    "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın.",
+    "Whether or not you're logged in (we don't record your username)": "İster oturum açın yasa açmayın (biz kullanıcı adınızı kaydetmiyoruz)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zengin Metin Düzenleyicinin Zengin metin modunu kullanıyor ya da kullanmıyorsunuz",
+    "Your homeserver's URL": "Ana sunucunuzun URL’i",
+    "The information being sent to us to help make Riot.im better includes:": "Riot.im i daha iyi yapmamıza yardımcı olacak bize gönderdiğiniz bilgilerin içeriği:",
+    "Try using turn.matrix.org": "turn.matrix.org i kullanarak dene",
+    "You do not have permission to start a conference call in this room": "Bu odada bir konferans başlatmak için izniniz yok",
+    "The file '%(fileName)s' failed to upload.": "%(fileName)s dosyası için yükleme başarısız.",
+    "The server does not support the room version specified.": "Belirtilen oda sürümünü sunucu desteklemiyor.",
+    "Who would you like to add to this community?": "Bu topluluğa kimi eklemek isterdiniz?",
+    "Which rooms would you like to add to this community?": "Hangi odaları bu topluluğa eklemek isterdiniz?",
+    "Unable to create widget.": "Görsel bileşen oluşturulamıyor.",
+    "Changes your display nickname in the current room only": "sadece mevcut odada görüntülenen lakabınızı değiştirir",
+    "Changes the avatar of the current room": "Mevcut odadaki avatarınızı değiştirir",
+    "Use an identity server to invite by email. Manage in Settings.": "E-posta ile davet etmek için bir kimlik sunucusu kullan. Ayarlardan Yönet.",
+    "You cannot modify widgets in this room.": "Bu odadaki görsel bileşenleri değiştiremezsiniz.",
+    "Sends the given message coloured as a rainbow": "Verilen mesajı gökkuşağı renklerinde gönderir",
+    "Displays list of commands with usages and descriptions": "Komutların listesini kullanımı ve tanımlarıyla gösterir",
+    "%(senderName)s made no change.": "%(senderName)s değişiklik yapmadı.",
+    "%(senderName)s changed the pinned messages for the room.": "Oda için sabitlenmiş mesajları %(senderName)s değiştirdi.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından düzenlendi",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından eklendi",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s görsel bileşeni %(senderName)s tarafından silindi",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s ve diğer %(count)s kişi yazıyor…",
+    "This homeserver has exceeded one of its resource limits.": "Bu anasunucu kaynak limitlerinden birini aştı.",
+    "Unable to connect to Homeserver. Retrying...": "Anasunucuya bağlanılamıyor. Yeniden deneniyor...",
+    "%(items)s and %(count)s others|other": "%(items)s ve diğer %(count)s",
+    "%(items)s and %(count)s others|one": "%(items)s ve bir diğeri",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Unrecognised address": "Tanınmayan adres",
+    "You do not have permission to invite people to this room.": "Bu odaya kişi davet etme izniniz yok.",
+    "User %(userId)s is already in the room": "Kullanıcı %(userId)s zaten odada",
+    "User %(user_id)s does not exist": "Kullanıcı %(user_id)s mevcut değil",
+    "User %(user_id)s may or may not exist": "Kullanıcı %(user_id)s mevcut olup olmadığı belli değil",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Hesabınıza giriş yapamazsınız. Lütfen daha fazla bilgi için ana sunucu yöneticiniz ile bağlantıya geçiniz.",
+    "You're signed out": "Çıkış yaptınız",
+    "Clear personal data": "Kişisel veri temizle",
+    "Command Autocomplete": "Oto tamamlama komutu",
+    "Community Autocomplete": "Oto tamlama topluluğu",
+    "DuckDuckGo Results": "DuckDuckGo Sonuçları",
+    "Emoji Autocomplete": "Emoji Oto Tamamlama",
+    "Notify the whole room": "Tüm odayı bilgilendir",
+    "Room Notification": "Oda  Bildirimi",
+    "Set up with a recovery key": "Kurtarma anahtarı ile kur",
+    "That matches!": "Eşleşti!",
+    "That doesn't match.": "Eşleşmiyor.",
+    "Your Recovery Key": "Kurtarma Anahtarınız",
+    "Download": "İndir",
+    "<b>Print it</b> and store it somewhere safe": "<b>Yazdır</b> ve güvenli bir yerde sakla",
+    "<b>Save it</b> on a USB key or backup drive": "Bir USB anahtara <b>kaydet</b>  veya sürücüye yedekle",
+    "<b>Copy it</b> to your personal cloud storage": "Kişisel bulut depolamaya <b>kopyala</b>",
+    "Your access to encrypted messages is now protected.": "Şifrelenmiş mesajlara erişiminiz şimdi korunuyor.",
+    "Migrate from Key Backup": "Anahtar Yedeğinden Göç Et",
+    "Recovery key": "Kurtarma anahtarı",
+    "Success!": "Başarılı!",
+    "Retry": "Yeniden Dene",
+    "Set up with a Recovery Key": "Bir Kurtarma Anahtarı ile Kur",
+    "Set up Secure Message Recovery": "Güvenli Mesaj Kurtarma Kurulumu",
+    "Starting backup...": "Yedeklemeye başlanıyor...",
+    "Create Key Backup": "Anahtar Yedeği Oluştur",
+    "Unable to create key backup": "Anahtar yedeği oluşturulamıyor",
+    "Don't ask again": "Yeniden sorma",
+    "New Recovery Method": "Yeni Kurtarma Yöntemi",
+    "Go to Settings": "Ayarlara Git",
+    "Recovery Method Removed": "Kurtarma Yöntemi Silindi"
 }

From 827ddaf7df34a20a0ddf02bb584ae92889e3fb49 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Mon, 30 Dec 2019 08:15:28 +0000
Subject: [PATCH 0149/3235] Translated using Weblate (Ukrainian)

Currently translated at 28.6% (572 of 2001 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 | 42 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 9a522e6ee2..c6ae464a2b 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -438,8 +438,8 @@
     "Incorrect verification code": "Неправильний код перевірки",
     "Submit": "Надіслати",
     "Phone": "Телефон",
-    "Failed to upload profile picture!": "Не вдалося завантажити світлину профілю!",
-    "Upload new:": "Завантажити нову:",
+    "Failed to upload profile picture!": "Не вдалося відвантажити світлину профілю!",
+    "Upload new:": "Відвантажити нову:",
     "No display name": "Немає імені для показу",
     "New passwords don't match": "Нові паролі не збігаються",
     "Passwords can't be empty": "Пароль не може бути пустим",
@@ -460,7 +460,7 @@
     "Enable Notifications": "Увімкнути сповіщення",
     "The maximum permitted number of widgets have already been added to this room.": "Максимально дозволену кількість віджетів уже додано до цієї кімнати.",
     "Drop File Here": "Киньте файл сюди",
-    "Drop file here to upload": "Киньте файл сюди, щоб вивантажити",
+    "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.",
@@ -508,7 +508,7 @@
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Також ви можете спробувати використати публічний сервер <code>turn.matrix.org</code>, але це буде не настільки надійно, а також цей сервер матиме змогу бачити вашу IP-адресу. Ви можете керувати цим у налаштуваннях.",
     "Try using turn.matrix.org": "Спробуйте використати turn.matrix.org",
     "Replying With Files": "Відповісти файлами",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете завантажити цей файл без відповіді?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете відвантажити цей файл без відповіді?",
     "Name or Matrix ID": "Імʼя або Matrix ID",
     "Identity server has no terms of service": "Сервер ідентифікації не має умов надання послуг",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Щоб підтвердити адресу е-пошту або телефон ця дія потребує доступу до типового серверу ідентифікації <server />, але сервер не має жодних умов надання послуг.",
@@ -547,5 +547,37 @@
     "Forces the current outbound group session in an encrypted room to be discarded": "Примусово відкидає поточний вихідний груповий сеанс у шифрованій кімнаті",
     "Sends the given message coloured as a rainbow": "Надсилає вказане повідомлення розфарбоване веселкою",
     "Your Riot is misconfigured": "Ваш Riot налаштовано неправильно",
-    "Join the discussion": "Приєднатися до обговорення"
+    "Join the discussion": "Приєднатися до обговорення",
+    "Upload": "Відвантажити",
+    "Upload file": "Відвантажити файл",
+    "Send an encrypted message…": "Надіслати зашифроване повідомлення…",
+    "Send a message (unencrypted)…": "Надіслати повідомлення (незашифроване)…",
+    "The conversation continues here.": "Розмова триває тут.",
+    "This room has been replaced and is no longer active.": "Ця кімната була замінена і не є активною.",
+    "You do not have permission to post to this room": "У вас нема дозволу дописувати у цю кімнату",
+    "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": "Щоб уникнути втрати історії ваших листувань, ви маєте експортувати ключі кімнати перед виходом. Вам треба буде повернутися до новішої версії Riot аби зробити це",
+    "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. ": "Раніше ви використовували новішу версію Riot на %(host)s. Для повторного користування цією версією з наскрізним шифруванням вам треба буде вийти та зайти знову. ",
+    "Incompatible Database": "Несумісна база даних",
+    "Continue With Encryption Disabled": "Продовжити із вимкненим шифруванням",
+    "Unknown error": "Невідома помилка",
+    "Incorrect password": "Неправильний пароль",
+    "Are you sure you want to sign out?": "Ви впевнені, що хочете вийти?",
+    "Your homeserver doesn't seem to support this feature.": "Схоже, що ваш домашній сервер не підтримує цю властивість.",
+    "Sign out and remove encryption keys?": "Вийти та видалити ключі шифрування?",
+    "Clear Storage and Sign Out": "Очистити сховище та вийти",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очищення сховища вашого оглядача може усунути проблему, але воно виведе вас з системи і зробить непрочитною історію ваших зашифрованих листувань.",
+    "Verification Pending": "Очікується перевірка",
+    "Upload files (%(current)s of %(total)s)": "Відвантажити файли (%(current)s з %(total)s)",
+    "Upload files": "Відвантажити файли",
+    "Upload all": "Відвантажити всі",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Файл <b>є надто великим</b> для відвантаження. Допустимий розмір файлів — %(limit)s, але цей файл займає %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Ці файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Деякі файли є <b>надто великими</b> для відвантаження. Допустимий розмір файлів — %(limit)s.",
+    "Upload %(count)s other files|other": "Відвантажити %(count)s інших файли(ів)",
+    "Upload Error": "Помилка відвантаження",
+    "Failed to upload image": "Не вдалось відвантажити зображення",
+    "Upload avatar": "Відвантажити аватар",
+    "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.",
+    "Upload an avatar:": "Відвантажити аватар:"
 }

From 2bfe1e6be3f8db2caad9d26770de5168021d75c7 Mon Sep 17 00:00:00 2001
From: Volodymyr Kostyrko <arcade@b1t.name>
Date: Tue, 31 Dec 2019 11:19:17 +0000
Subject: [PATCH 0150/3235] Translated using Weblate (Ukrainian)

Currently translated at 28.9% (578 of 2001 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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index c6ae464a2b..7795060406 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -160,7 +160,7 @@
     "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
     "Room not found": "Кімнату не знайдено",
     "Reject": "Відмовитись",
-    "Failed to set Direct Message status of room": "Не вдалось встановити статус прямого спілкування в кімнаті",
+    "Failed to set Direct Message status of room": "Не вдалося встановити статус прямого спілкування в кімнаті",
     "Monday": "Понеділок",
     "Remove from Directory": "Прибрати з каталогу",
     "Enable them now": "Увімкнути їх зараз",
@@ -577,7 +577,11 @@
     "Upload %(count)s other files|other": "Відвантажити %(count)s інших файли(ів)",
     "Upload Error": "Помилка відвантаження",
     "Failed to upload image": "Не вдалось відвантажити зображення",
-    "Upload avatar": "Відвантажити аватар",
+    "Upload avatar": "Завантажити аватар",
     "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.",
-    "Upload an avatar:": "Відвантажити аватар:"
+    "Upload an avatar:": "Завантажити аватар:",
+    "Send cross-signing keys to homeserver": "Надсилання ключей підпису на домашній сервер",
+    "Custom (%(level)s)": "Власний (%(level)s)",
+    "Error upgrading room": "Помилка оновлення кімнати",
+    "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще."
 }

From fa9fd97a4e5b2a7e94d0185650402e214a649909 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 2 Jan 2020 09:41:50 +0000
Subject: [PATCH 0151/3235] missing }

---
 res/css/views/dialogs/_RoomSettingsDialog.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index b7641a4ad0..4b13684d9f 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -54,6 +54,7 @@ limitations under the License.
     mask-repeat: no-repeat;
     mask-size: 36px;
     mask-position: center;
+}
 
 .mx_RoomSettingsDialog_BridgeList {
     padding: 0;

From 31367bac57b3ef6e7f6983cce6386d691b2775b0 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 2 Jan 2020 08:49:30 +0000
Subject: [PATCH 0152/3235] Translated using Weblate (Bulgarian)

Currently translated at 93.5% (1870 of 2001 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 | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 3115ca140a..d1aa0dc9a8 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1851,5 +1851,38 @@
     "Connecting to integration manager...": "Свързане с мениджъра на интеграции...",
     "Cannot connect to integration manager": "Неуспешна връзка с мениджъра на интеграции",
     "The integration manager is offline or it cannot reach your homeserver.": "Мениджъра на интеграции е офлайн или не може да се свърже със сървъра ви.",
-    "Clear notifications": "Изчисти уведомленията"
+    "Clear notifications": "Изчисти уведомленията",
+    "Send cross-signing keys to homeserver": "Изпрати ключове за кръстосано-подписване към сървъра",
+    "Error upgrading room": "Грешка при обновяване на стаята",
+    "Double check that your server supports the room version chosen and try again.": "Проверете дали сървъра поддържа тази версия на стаята и опитайте пак.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s обнови невалидно правило за блокиране",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до неща отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа на потребители отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до стаи отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до сървъри отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до неща отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
+    "The message you are trying to send is too large.": "Съобщението, което се опитвате да изпратите е прекалено голямо.",
+    "Cross-signing and secret storage are enabled.": "Кръстосано-подписване и секретно складиране са включени.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "За вашия профил има самоличност за кръстосано-подписване в секретно складиране, но все още не е доверена от това устройство.",
+    "Cross-signing and secret storage are not yet set up.": "Кръстосаното-подписване и секретно складиране все още не са настроени.",
+    "Bootstrap cross-signing and secret storage": "Инициализирай кръстосано-подписване и секретно складиране",
+    "Cross-signing public keys:": "Публични ключове за кръстосано-подписване:",
+    "on device": "на устройството",
+    "not found": "не са намерени",
+    "Cross-signing private keys:": "Private ключове за кръстосано подписване:",
+    "in secret storage": "в секретно складиране",
+    "Secret storage public key:": "Публичен ключ за секретно складиране:",
+    "in account data": "в данни за акаунта",
+    "not stored": "не е складиран"
 }

From ffba19bd613796090bdc899f5cb4b40e96bbeb47 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Jan 2020 16:52:25 +0000
Subject: [PATCH 0153/3235] Remove E2eIcon onClick

It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
---
 res/css/views/rooms/_EventTile.scss     |  2 +-
 src/components/views/rooms/EventTile.js | 23 ++++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 5359992f84..fbac1e932a 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -353,7 +354,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     left: 46px;
     width: 15px;
     height: 15px;
-    cursor: pointer;
     display: block;
     bottom: 0;
     right: 0;
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 784c4071aa..e7696de841 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -443,15 +443,6 @@ module.exports = createReactClass({
         });
     },
 
-    onCryptoClick: function(e) {
-        const event = this.props.mxEvent;
-
-        Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
-            import('../../../async-components/views/dialogs/EncryptedEventDialog'),
-            {event},
-        );
-    },
-
     onRequestKeysClick: function() {
         this.setState({
             // Indicate in the UI that the keys have been requested (this is expected to
@@ -479,11 +470,10 @@ module.exports = createReactClass({
 
     _renderE2EPadlock: function() {
         const ev = this.props.mxEvent;
-        const props = {onClick: this.onCryptoClick};
 
         // event could not be decrypted
         if (ev.getContent().msgtype === 'm.bad.encrypted') {
-            return <E2ePadlockUndecryptable {...props} />;
+            return <E2ePadlockUndecryptable />;
         }
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
@@ -491,7 +481,7 @@ module.exports = createReactClass({
             if (this.state.verified) {
                 return; // no icon for verified
             } else {
-                return (<E2ePadlockUnverified {...props} />);
+                return (<E2ePadlockUnverified />);
             }
         }
 
@@ -508,7 +498,7 @@ module.exports = createReactClass({
                 return; // we expect this to be unencrypted
             }
             // if the event is not encrypted, but it's an e2e room, show the open padlock
-            return <E2ePadlockUnencrypted {...props} />;
+            return <E2ePadlockUnencrypted />;
         }
 
         // no padlock needed
@@ -920,7 +910,6 @@ class E2ePadlock extends React.Component {
     static propTypes = {
         icon: PropTypes.string.isRequired,
         title: PropTypes.string.isRequired,
-        onClick: PropTypes.func,
     };
 
     constructor() {
@@ -931,10 +920,6 @@ class E2ePadlock extends React.Component {
         };
     }
 
-    onClick = (e) => {
-        if (this.props.onClick) this.props.onClick(e);
-    };
-
     onHoverStart = () => {
         this.setState({hover: true});
     };

From 39777620a3d299943ed7d8f24fb34ff9263aa231 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Jan 2020 16:58:00 +0000
Subject: [PATCH 0154/3235] order copyright lines by date

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e7696de841..d8ca5ef7cd 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -1,8 +1,8 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 89ac476281763cea379fea4f23ed60a72ae4e031 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Jan 2020 16:59:46 +0000
Subject: [PATCH 0155/3235] Unused import

---
 src/components/views/rooms/EventTile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index d8ca5ef7cd..b71771a916 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -24,7 +24,6 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 const classNames = require("classnames");
 import { _t, _td } from '../../../languageHandler';
-const Modal = require('../../../Modal');
 
 const sdk = require('../../../index');
 const TextForEvent = require('../../../TextForEvent');

From 4de0f7257a1846ac75d56bd75bc9941927c55a2b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 2 Jan 2020 17:40:18 -0700
Subject: [PATCH 0156/3235] Initial implementation of FTUE user lists design

This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.

Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.

Closes https://github.com/vector-im/riot-web/issues/11197
---
 package.json                                  |   3 +-
 res/css/_components.scss                      |   1 +
 res/css/views/dialogs/_DMInviteDialog.scss    |  81 +++++++
 res/themes/dark/css/_dark.scss                |   3 +
 res/themes/light/css/_light.scss              |   3 +
 src/RoomInvite.js                             |  15 +-
 .../views/dialogs/DMInviteDialog.js           | 212 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |   6 +
 src/settings/Settings.js                      |   6 +
 src/utils/DMRoomMap.js                        |   9 +
 yarn.lock                                     |   5 +
 11 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 res/css/views/dialogs/_DMInviteDialog.scss
 create mode 100644 src/components/views/dialogs/DMInviteDialog.js

diff --git a/package.json b/package.json
index 7ef14e6635..a1ebc6602d 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,6 @@
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
     "flux": "2.1.1",
-    "react-focus-lock": "^2.2.1",
     "focus-visible": "^5.0.2",
     "fuse.js": "^2.2.0",
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
@@ -82,6 +81,7 @@
     "glob": "^5.0.14",
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
+    "humanize": "^0.0.9",
     "is-ip": "^2.0.0",
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
@@ -99,6 +99,7 @@
     "react-addons-css-transition-group": "15.6.2",
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
+    "react-focus-lock": "^2.2.1",
     "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 7b8ca77739..7a9ebfdf26 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -56,6 +56,7 @@
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./views/dialogs/_CreateGroupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
+@import "./views/dialogs/_DMInviteDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DeviceVerifyDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
new file mode 100644
index 0000000000..50e9b0a15f
--- /dev/null
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -0,0 +1,81 @@
+/*
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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_DMInviteDialog_addressBar {
+  display: flex;
+  flex-direction: row;
+
+  .mx_DMInviteDialog_editor {
+    flex: 1;
+    width: 100%; // Needed to make the Field inside grow
+  }
+
+  .mx_Field {
+    margin: 0;
+  }
+
+  .mx_DMInviteDialog_goButton {
+    width: 48px;
+    margin-left: 10px;
+  }
+}
+
+.mx_DMInviteDialog_section {
+  padding-bottom: 10px;
+
+  h3 {
+    font-size: 12px;
+    color: $muted-fg-color;
+    font-weight: bold;
+    text-transform: uppercase;
+  }
+}
+
+.mx_DMInviteDialog_roomTile {
+  cursor: pointer;
+  padding: 5px 10px;
+
+  &:hover {
+    background-color: $user-tile-hover-bg-color;
+    border-radius: 4px;
+  }
+
+  * {
+    vertical-align: middle;
+  }
+
+  .mx_DMInviteDialog_roomTile_name {
+    font-weight: 600;
+    font-size: 14px;
+    color: $primary-fg-color;
+    margin-left: 7px;
+  }
+
+  .mx_DMInviteDialog_roomTile_userId {
+    font-size: 12px;
+    color: $muted-fg-color;
+    margin-left: 7px;
+  }
+
+  .mx_DMInviteDialog_roomTile_time {
+    text-align: right;
+    font-size: 12px;
+    color: $muted-fg-color;
+    float: right;
+    line-height: 36px; // Height of the avatar to keep the time vertically aligned
+  }
+}
+
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index eadde4c672..d28efbb11f 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -16,6 +16,7 @@ $room-highlight-color: #343a46;
 // typical text (dark-on-white in light skin)
 $primary-fg-color: $text-primary-color;
 $primary-bg-color: $bg-color;
+$muted-fg-color: $header-panel-text-primary-color;
 
 // used for dialog box text
 $light-fg-color: $header-panel-text-secondary-color;
@@ -172,6 +173,8 @@ $interactive-tooltip-fg-color: #ffffff;
 
 $breadcrumb-placeholder-bg-color: #272c35;
 
+$user-tile-hover-bg-color: $header-panel-bg-color;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 0a3ef812b8..ac9cb261d3 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -21,6 +21,7 @@ $header-panel-bg-color: #f3f8fd;
 // typical text (dark-on-white in light skin)
 $primary-fg-color: #2e2f32;
 $primary-bg-color: #ffffff;
+$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
 
 // used for dialog box text
 $light-fg-color: #747474;
@@ -293,6 +294,8 @@ $interactive-tooltip-fg-color: #ffffff;
 
 $breadcrumb-placeholder-bg-color: #e8eef5;
 
+$user-tile-hover-bg-color: $header-panel-bg-color;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 48baad5d9f..ba9fe1f541 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -25,6 +25,7 @@ import sdk from './';
 import dis from './dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import { _t } from './languageHandler';
+import SettingsStore from "./settings/SettingsStore";
 
 /**
  * Invites multiple addresses to a room
@@ -41,6 +42,18 @@ function inviteMultipleToRoom(roomId, addrs) {
 }
 
 export function showStartChatInviteDialog() {
+    if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
+        const DMInviteDialog = sdk.getComponent("dialogs.DMInviteDialog");
+        Modal.createTrackedDialog('Start DM', '', DMInviteDialog, {
+            onFinished: (inviteIds) => {
+                // TODO: Replace _onStartDmFinished with less hacks
+                if (inviteIds.length > 0) _onStartDmFinished(true, inviteIds.map(i => ({address: i})));
+                // else ignore and just do nothing
+            },
+        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+        return;
+    }
+
     const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
 
     Modal.createTrackedDialog('Start a chat', '', AddressPickerDialog, {
@@ -99,7 +112,7 @@ export function isValid3pidInvite(event) {
     return true;
 }
 
-// TODO: Immutable DMs replaces this
+// TODO: Canonical DMs replaces this
 function _onStartDmFinished(shouldInvite, addrs) {
     if (!shouldInvite) return;
 
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
new file mode 100644
index 0000000000..5b67112c14
--- /dev/null
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -0,0 +1,212 @@
+/*
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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 {_t} from "../../../languageHandler";
+import sdk from "../../../index";
+import MatrixClientPeg from "../../../MatrixClientPeg";
+import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import {RoomMember} from "matrix-js-sdk/lib/matrix";
+import * as humanize from "humanize";
+
+// TODO: [TravisR] Make this generic for all kinds of invites
+
+const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
+const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
+
+class DMRoomTile extends React.Component {
+    static propTypes = {
+        member: PropTypes.object.isRequired,
+        lastActiveTs: PropTypes.number,
+        onToggle: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+    }
+
+    _onClick = (e) => {
+        // Stop the browser from highlighting text
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.props.onToggle(this.props.member.userId);
+    };
+
+    render() {
+        const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
+
+        let timestamp = null;
+        if (this.props.lastActiveTs) {
+            // TODO: [TravisR] Figure out how to i18n this
+            // `humanize` wants seconds for a timestamp, so divide by 1000
+            const humanTs = humanize.relativeTime(this.props.lastActiveTs / 1000);
+            timestamp = <span className='mx_DMInviteDialog_roomTile_time'>{humanTs}</span>;
+        }
+
+        return (
+            <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
+                <MemberAvatar member={this.props.member} width={36} height={36} />
+                <span className='mx_DMInviteDialog_roomTile_name'>{this.props.member.name}</span>
+                <span className='mx_DMInviteDialog_roomTile_userId'>{this.props.member.userId}</span>
+                {timestamp}
+            </div>
+        );
+    }
+}
+
+export default class DMInviteDialog extends React.Component {
+    static propTypes = {
+        // Takes an array of user IDs/emails to invite.
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+
+        this.state = {
+            targets: [], // string[] of mxids/email addresses
+            filterText: "",
+            recents: this._buildRecents(),
+            numRecentsShown: INITIAL_ROOMS_SHOWN,
+        };
+    }
+
+    _buildRecents(): {userId: string, user: RoomMember, lastActive: number} {
+        const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
+        const recents = [];
+        for (const userId in rooms) {
+            const room = rooms[userId];
+            const member = room.getMember(userId);
+            if (!member) continue; // just skip people who don't have memberships for some reason
+
+            const lastEventTs = room.timeline && room.timeline.length ? room.timeline[room.timeline.length - 1].getTs() : 0;
+            if (!lastEventTs) continue; // something weird is going on with this room
+
+            recents.push({userId, user: member, lastActive: lastEventTs});
+        }
+
+        // Sort the recents by last active to save us time later
+        recents.sort((a, b) => b.lastActive - a.lastActive);
+
+        return recents;
+    }
+
+    _startDm = () => {
+        this.props.onFinished(this.state.targets);
+    };
+
+    _cancel = () => {
+        this.props.onFinished([]);
+    };
+
+    _updateFilter = (e) => {
+        this.setState({filterText: e.target.value});
+    };
+
+    _showMoreRecents = () => {
+        this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN});
+    };
+
+    _toggleMember = (userId) => {
+        const targets = this.state.targets.map(t => t); // cheap clone for mutation
+        const idx = targets.indexOf(userId);
+        if (idx >= 0) targets.splice(idx, 1);
+        else targets.push(userId);
+        this.setState({targets});
+    };
+
+    _renderRecents() {
+        if (!this.state.recents || this.state.recents.length === 0) return null;
+
+        // .slice() will return an incomplete array but won't error on us if we go too far
+        const toRender = this.state.recents.slice(0, this.state.numRecentsShown);
+        const hasMore = toRender.length < this.state.recents.length;
+
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+        let showMore = null;
+        if (hasMore) {
+            showMore = (
+                <AccessibleButton onClick={this._showMoreRecents} kind="link">
+                    {_t("Show more")}
+                </AccessibleButton>
+            )
+        }
+
+        return (
+            <div className='mx_DMInviteDialog_section'>
+                <h3>{_t("Recent Conversations")}</h3>
+                {toRender.map(r => <DMRoomTile member={r.user} lastActiveTs={r.lastActive} key={r.userId} onToggle={this._toggleMember} />)}
+                {showMore}
+            </div>
+        )
+    }
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const Field = sdk.getComponent("elements.Field");
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        // Dev note: The use of Field is temporary/incomplete pending https://github.com/vector-im/riot-web/issues/11197
+        // For now, we just list who the targets are.
+        const editor = (
+            <div className='mx_DMInviteDialog_editor'>
+                <Field
+                    id="inviteTargets"
+                    value={this.state.filterText}
+                    onChange={this._updateFilter}
+                    placeholder="TODO: Implement filtering/searching (https://github.com/vector-im/riot-web/issues/11199)"
+                />
+            </div>
+        );
+        const targets = this.state.targets.map(t => <div key={t}>{t}</div>);
+
+        const userId = MatrixClientPeg.get().getUserId();
+        return (
+            <BaseDialog
+                className='mx_DMInviteDialog'
+                hasCancel={true}
+                onFinished={this._cancel}
+                title={_t("Direct Messages")}
+            >
+                <div className='mx_DMInviteDialog_content'>
+                    <p>
+                        {_t(
+                            "If you can't find someone, ask them for their username, or share your " +
+                            "username (%(userId)s) or <a>profile link</a>.",
+                            {userId},
+                            {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
+                        )}
+                    </p>
+                    {targets}
+                    <div className='mx_DMInviteDialog_addressBar'>
+                        {editor}
+                        <AccessibleButton
+                            kind="primary"
+                            onClick={this._startDm}
+                            className='mx_DMInviteDialog_goButton'
+                        >
+                            {_t("Go")}
+                        </AccessibleButton>
+                    </div>
+                    {this._renderRecents()}
+                </div>
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6979759cd2..18c3d76e12 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -358,6 +358,7 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
+    "New DM invite dialog (under development)": "New DM invite dialog (under development)",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
@@ -1431,6 +1432,11 @@
     "View Servers in Room": "View Servers in Room",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
+    "Show more": "Show more",
+    "Recent Conversations": "Recent Conversations",
+    "Direct Messages": "Direct Messages",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
+    "Go": "Go",
     "An error has occurred.": "An error has occurred.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
     "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index f1299a9045..d606528ca3 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -128,6 +128,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_ftue_dms": {
+        isFeature: true,
+        displayName: _td("New DM invite dialog (under development)"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index af65b6f001..498c073e0e 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +17,7 @@ limitations under the License.
 
 import MatrixClientPeg from '../MatrixClientPeg';
 import _uniq from 'lodash/uniq';
+import {Room} from "matrix-js-sdk/lib/matrix";
 
 /**
  * Class that takes a Matrix Client and flips the m.direct map
@@ -144,6 +146,13 @@ export default class DMRoomMap {
         return this.roomToUser[roomId];
     }
 
+    getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
+        return Object.keys(this.roomToUser)
+            .map(r => ({userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r)}))
+            .filter(r => r.userId && r.room && r.room.getInvitedAndJoinedMemberCount() === 2)
+            .reduce((obj, r) => (obj[r.userId] = r.room) && obj, {});
+    }
+
     _getUserToRooms() {
         if (!this.userToRooms) {
             const userToRooms = this.mDirectEvent;
diff --git a/yarn.lock b/yarn.lock
index b8b877ab62..fc2b9e04c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4089,6 +4089,11 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+humanize@^0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
+  integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"

From 3488eaba3cbed69f552d6a66d4e383b31768217a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 2 Jan 2020 17:44:19 -0700
Subject: [PATCH 0157/3235] Appease the linter

---
 src/components/views/dialogs/DMInviteDialog.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 5b67112c14..6456ef7083 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -95,7 +95,9 @@ export default class DMInviteDialog extends React.Component {
             const member = room.getMember(userId);
             if (!member) continue; // just skip people who don't have memberships for some reason
 
-            const lastEventTs = room.timeline && room.timeline.length ? room.timeline[room.timeline.length - 1].getTs() : 0;
+            const lastEventTs = room.timeline && room.timeline.length
+                ? room.timeline[room.timeline.length - 1].getTs()
+                : 0;
             if (!lastEventTs) continue; // something weird is going on with this room
 
             recents.push({userId, user: member, lastActive: lastEventTs});
@@ -145,16 +147,19 @@ export default class DMInviteDialog extends React.Component {
                 <AccessibleButton onClick={this._showMoreRecents} kind="link">
                     {_t("Show more")}
                 </AccessibleButton>
-            )
+            );
         }
 
+        const tiles = toRender.map(r => (
+            <DMRoomTile member={r.user} lastActiveTs={r.lastActive} key={r.userId} onToggle={this._toggleMember} />
+        ));
         return (
             <div className='mx_DMInviteDialog_section'>
                 <h3>{_t("Recent Conversations")}</h3>
-                {toRender.map(r => <DMRoomTile member={r.user} lastActiveTs={r.lastActive} key={r.userId} onToggle={this._toggleMember} />)}
+                {tiles}
                 {showMore}
             </div>
-        )
+        );
     }
 
     render() {
@@ -170,7 +175,7 @@ export default class DMInviteDialog extends React.Component {
                     id="inviteTargets"
                     value={this.state.filterText}
                     onChange={this._updateFilter}
-                    placeholder="TODO: Implement filtering/searching (https://github.com/vector-im/riot-web/issues/11199)"
+                    placeholder="TODO: Implement filtering/searching (vector-im/riot-web#11199)"
                 />
             </div>
         );

From 6f1525c1f341c1dd7fc64727f6a4f22971df4ebc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 2 Jan 2020 17:47:26 -0700
Subject: [PATCH 0158/3235] Appease the scss linter

---
 res/css/views/dialogs/_DMInviteDialog.scss | 94 +++++++++++-----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index 50e9b0a15f..1153ecb0d4 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -15,67 +15,67 @@ limitations under the License.
 */
 
 .mx_DMInviteDialog_addressBar {
-  display: flex;
-  flex-direction: row;
+    display: flex;
+    flex-direction: row;
 
-  .mx_DMInviteDialog_editor {
-    flex: 1;
-    width: 100%; // Needed to make the Field inside grow
-  }
+    .mx_DMInviteDialog_editor {
+        flex: 1;
+        width: 100%; // Needed to make the Field inside grow
+    }
 
-  .mx_Field {
-    margin: 0;
-  }
+    .mx_Field {
+        margin: 0;
+    }
 
-  .mx_DMInviteDialog_goButton {
-    width: 48px;
-    margin-left: 10px;
-  }
+    .mx_DMInviteDialog_goButton {
+        width: 48px;
+        margin-left: 10px;
+    }
 }
 
 .mx_DMInviteDialog_section {
-  padding-bottom: 10px;
+    padding-bottom: 10px;
 
-  h3 {
-    font-size: 12px;
-    color: $muted-fg-color;
-    font-weight: bold;
-    text-transform: uppercase;
-  }
+    h3 {
+        font-size: 12px;
+        color: $muted-fg-color;
+        font-weight: bold;
+        text-transform: uppercase;
+    }
 }
 
 .mx_DMInviteDialog_roomTile {
-  cursor: pointer;
-  padding: 5px 10px;
+    cursor: pointer;
+    padding: 5px 10px;
 
-  &:hover {
-    background-color: $user-tile-hover-bg-color;
-    border-radius: 4px;
-  }
+    &:hover {
+        background-color: $user-tile-hover-bg-color;
+        border-radius: 4px;
+    }
 
-  * {
-    vertical-align: middle;
-  }
+    * {
+        vertical-align: middle;
+    }
 
-  .mx_DMInviteDialog_roomTile_name {
-    font-weight: 600;
-    font-size: 14px;
-    color: $primary-fg-color;
-    margin-left: 7px;
-  }
+    .mx_DMInviteDialog_roomTile_name {
+        font-weight: 600;
+        font-size: 14px;
+        color: $primary-fg-color;
+        margin-left: 7px;
+    }
 
-  .mx_DMInviteDialog_roomTile_userId {
-    font-size: 12px;
-    color: $muted-fg-color;
-    margin-left: 7px;
-  }
+    .mx_DMInviteDialog_roomTile_userId {
+        font-size: 12px;
+        color: $muted-fg-color;
+        margin-left: 7px;
+    }
 
-  .mx_DMInviteDialog_roomTile_time {
-    text-align: right;
-    font-size: 12px;
-    color: $muted-fg-color;
-    float: right;
-    line-height: 36px; // Height of the avatar to keep the time vertically aligned
-  }
+    .mx_DMInviteDialog_roomTile_time {
+        text-align: right;
+        font-size: 12px;
+        color: $muted-fg-color;
+        float: right;
+        line-height: 36px; // Height of the avatar to keep the time vertically aligned
+    }
 }
 

From 557669b08e3734bf1e0e6fa871f17d76968af0fb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 11:12:55 +0000
Subject: [PATCH 0159/3235] Don't crash if a keyshare request is removed

...during the time the dialog is displayed.

Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)
---
 src/KeyRequestHandler.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index c3de7988b2..4ee258da53 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -111,6 +111,12 @@ export default class KeyRequestHandler {
             this._currentUser = null;
             this._currentDevice = null;
 
+            if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) {
+                // request was removed in the time the dialog was displayed
+                this._processNextRequest();
+                return;
+            }
+
             if (r) {
                 for (const req of this._pendingKeyRequests[userId][deviceId]) {
                     req.share();

From c2723176e403dcb16a11e57a40db5e800e0fc653 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 12:08:35 +0000
Subject: [PATCH 0160/3235] Convert /verify to checkDeviceTrust

Also de-promiseify the code a bit
---
 src/SlashCommands.js | 86 ++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index a9c015fdaf..21fa4a134e 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -780,54 +780,52 @@ export const CommandMap = {
                     const deviceId = matches[2];
                     const fingerprint = matches[3];
 
-                    return success(
-                        // Promise.resolve to handle transition from static result to promise; can be removed
-                        // in future
-                        Promise.resolve(cli.getStoredDevice(userId, deviceId)).then((device) => {
-                            if (!device) {
-                                throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
-                            }
+                    return success((async () => {
+                        const device = await cli.getStoredDevice(userId, deviceId);
+                        if (!device) {
+                            throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
+                        }
+                        const deviceTrust = await cli.checkDeviceTrust(userId, deviceId);
 
-                            if (device.isVerified()) {
-                                if (device.getFingerprint() === fingerprint) {
-                                    throw new Error(_t('Device already verified!'));
-                                } else {
-                                    throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
-                                }
+                        if (deviceTrust.isVerified()) {
+                            if (device.getFingerprint() === fingerprint) {
+                                throw new Error(_t('Device already verified!'));
+                            } else {
+                                throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
                             }
+                        }
 
-                            if (device.getFingerprint() !== fingerprint) {
-                                const fprint = device.getFingerprint();
-                                throw new Error(
-                                    _t('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!',
-                                        {
-                                            fprint,
-                                            userId,
-                                            deviceId,
-                                            fingerprint,
-                                        }));
-                            }
+                        if (device.getFingerprint() !== fingerprint) {
+                            const fprint = device.getFingerprint();
+                            throw new Error(
+                                _t('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!',
+                                    {
+                                        fprint,
+                                        userId,
+                                        deviceId,
+                                        fingerprint,
+                                    }));
+                        }
 
-                            return cli.setDeviceVerified(userId, deviceId, true);
-                        }).then(() => {
-                            // Tell the user we verified everything
-                            const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
-                            Modal.createTrackedDialog('Slash Commands', 'Verified key', InfoDialog, {
-                                title: _t('Verified key'),
-                                description: <div>
-                                    <p>
-                                        {
-                                            _t('The signing key you provided matches the signing key you received ' +
-                                                'from %(userId)s\'s device %(deviceId)s. Device marked as verified.',
-                                                {userId, deviceId})
-                                        }
-                                    </p>
-                                </div>,
-                            });
-                        }),
-                    );
+                        await cli.setDeviceVerified(userId, deviceId, true);
+
+                        // Tell the user we verified everything
+                        const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
+                        Modal.createTrackedDialog('Slash Commands', 'Verified key', InfoDialog, {
+                            title: _t('Verified key'),
+                            description: <div>
+                                <p>
+                                    {
+                                        _t('The signing key you provided matches the signing key you received ' +
+                                            'from %(userId)s\'s device %(deviceId)s. Device marked as verified.',
+                                            {userId, deviceId})
+                                    }
+                                </p>
+                            </div>,
+                        });
+                    })());
                 }
             }
             return reject(this.getUsage());

From d8a38e6b74b185724ecbc7a13c0cb24341a46dc9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Dec 2019 17:53:51 +0100
Subject: [PATCH 0161/3235] WIP

---
 src/components/structures/MatrixChat.js       | 12 +--
 src/components/structures/RightPanel.js       |  4 +
 src/components/structures/ToastContainer.js   |  1 +
 .../views/dialogs/DeviceVerifyDialog.js       |  8 +-
 .../views/messages/MKeyVerificationRequest.js | 98 +++++++++++--------
 .../views/right_panel/EncryptionPanel.js      | 33 +++++++
 .../views/right_panel/RoomHeaderButtons.js    |  1 +
 src/stores/RightPanelStore.js                 |  6 +-
 src/stores/RightPanelStorePhases.js           |  2 +-
 src/utils/KeyVerificationStateObserver.js     |  1 +
 10 files changed, 112 insertions(+), 54 deletions(-)
 create mode 100644 src/components/views/right_panel/EncryptionPanel.js

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index af3f4d2598..e093e9dff9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1458,20 +1458,16 @@ export default createReactClass({
 
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             cli.on("crypto.verification.request", request => {
-                let requestObserver;
-                if (request.event.getRoomId()) {
-                    requestObserver = new KeyVerificationStateObserver(
-                        request.event, MatrixClientPeg.get());
-                }
-
-                if (!requestObserver || requestObserver.pending) {
+                console.log(`MatrixChat got a .request ${request.channel.transactionId}`, request.event.getRoomId());
+                if (request.pending) {
+                    console.log(`emitting toast for verification request with txnid ${request.channel.transactionId}`, request.event && request.event.getId());
                     dis.dispatch({
                         action: "show_toast",
                         toast: {
                             key: request.event.getId(),
                             title: _t("Verification Request"),
                             icon: "verification",
-                            props: {request, requestObserver},
+                            props: {request},
                             component: sdk.getComponent("toasts.VerificationRequestToast"),
                         },
                     });
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index ff987a8f30..f5648a6d02 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -160,6 +160,7 @@ export default class RightPanel extends React.Component {
                 groupId: payload.groupId,
                 member: payload.member,
                 event: payload.event,
+                verificationRequest: payload.verificationRequest,
             });
         }
     }
@@ -168,6 +169,7 @@ export default class RightPanel extends React.Component {
         const MemberList = sdk.getComponent('rooms.MemberList');
         const MemberInfo = sdk.getComponent('rooms.MemberInfo');
         const UserInfo = sdk.getComponent('right_panel.UserInfo');
+        const EncryptionPanel = sdk.getComponent('right_panel.EncryptionPanel');
         const ThirdPartyMemberInfo = sdk.getComponent('rooms.ThirdPartyMemberInfo');
         const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
         const FilePanel = sdk.getComponent('structures.FilePanel');
@@ -235,6 +237,8 @@ export default class RightPanel extends React.Component {
             panel = <NotificationPanel />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.FilePanel) {
             panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
+        } else if (this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel) {
+            panel = <EncryptionPanel member={this.state.member} verificationRequest={this.state.verificationRequest} />;
         }
 
         const classes = classNames("mx_RightPanel", "mx_fadable", {
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index a8dca35747..a9c8267d0d 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -26,6 +26,7 @@ export default class ToastContainer extends React.Component {
     }
 
     componentDidMount() {
+        console.log("ToastContainer mounted");
         this._dispatcherRef = dis.register(this.onAction);
     }
 
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 6408245452..ca05d74964 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -100,9 +100,15 @@ export default class DeviceVerifyDialog extends React.Component {
             if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
                 const roomId = await ensureDMExistsAndOpen(this.props.userId);
                 // throws upon cancellation before having started
-                this._verifier = await client.requestVerificationDM(
+                const request = await client.requestVerificationDM(
                     this.props.userId, roomId, [verificationMethods.SAS],
                 );
+                await request.waitFor(r => r.ready || r.started);
+                if (request.ready) {
+                    this._verifier = request.beginKeyVerification(verificationMethods.SAS);
+                } else {
+                    this._verifier = request.verifier;
+                }
             } else {
                 this._verifier = client.beginKeyVerification(
                     verificationMethods.SAS, this.props.userId, this.props.device.deviceId,
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 4faa1b20aa..f31a823ac9 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -17,48 +17,62 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
 import sdk from '../../../index';
-import Modal from "../../../Modal";
 import { _t } from '../../../languageHandler';
-import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
+import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
+import dis from "../../../dispatcher";
+import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
         super(props);
-        this.keyVerificationState = new KeyVerificationStateObserver(this.props.mxEvent, MatrixClientPeg.get(), () => {
-            this.setState(this._copyState());
-        });
-        this.state = this._copyState();
-    }
-
-    _copyState() {
-        const {accepted, done, cancelled, cancelPartyUserId, otherPartyUserId} = this.keyVerificationState;
-        return {accepted, done, cancelled, cancelPartyUserId, otherPartyUserId};
     }
 
     componentDidMount() {
-        this.keyVerificationState.attach();
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            request.on("change", this._onRequestChanged);
+        }
     }
 
     componentWillUnmount() {
-        this.keyVerificationState.detach();
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            request.off("change", this._onRequestChanged);
+        }
     }
 
-    _onAcceptClicked = () => {
-        const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog');
-        // todo: validate event, for example if it has sas in the methods.
-        const verifier = MatrixClientPeg.get().acceptVerificationDM(this.props.mxEvent, verificationMethods.SAS);
-        Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-            verifier,
-        }, null, /* priority = */ false, /* static = */ true);
+    _onRequestChanged = () => {
+        this.forceUpdate();
     };
 
-    _onRejectClicked = () => {
-        // todo: validate event, for example if it has sas in the methods.
-        const verifier = MatrixClientPeg.get().acceptVerificationDM(this.props.mxEvent, verificationMethods.SAS);
-        verifier.cancel("User declined");
+    _onAcceptClicked = async () => {
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            try {
+                await request.accept();
+                dis.dispatch({action: "show_right_panel"});
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    verificationRequest: request,
+                });
+            } catch (err) {
+                console.error(err.message);
+            }
+        }
+    };
+
+    _onRejectClicked = async () => {
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            try {
+                await request.cancel();
+            } catch (err) {
+                console.error(err.message);
+            }
+        }
     };
 
     _acceptedLabel(userId) {
@@ -83,45 +97,43 @@ export default class MKeyVerificationRequest extends React.Component {
 
     render() {
         const {mxEvent} = this.props;
-        const fromUserId = mxEvent.getSender();
-        const content = mxEvent.getContent();
-        const toUserId = content.to;
-        const client = MatrixClientPeg.get();
-        const myUserId = client.getUserId();
-        const isOwn = fromUserId === myUserId;
+        const request = mxEvent.verificationRequest;
 
         let title;
         let subtitle;
         let stateNode;
 
-        if (this.state.accepted || this.state.cancelled) {
+        if (!request) {
+            return <p>This is an invalid request, ho ho ho!</p>;
+        }
+
+        if (request.ready || request.started || request.cancelled) {
             let stateLabel;
-            if (this.state.accepted) {
-                stateLabel = this._acceptedLabel(toUserId);
-            } else if (this.state.cancelled) {
-                stateLabel = this._cancelledLabel(this.state.cancelPartyUserId);
+            if (request.ready || request.started) {
+                stateLabel = this._acceptedLabel(request.receivingUserId);
+            } else if (request.cancelled) {
+                stateLabel = this._cancelledLabel(request.cancellingUserId);
             }
             stateNode = (<div className="mx_KeyVerification_state">{stateLabel}</div>);
         }
 
-        if (toUserId === myUserId) { // request sent to us
+        if (!request.initiatedByMe) {
             title = (<div className="mx_KeyVerification_title">{
-                _t("%(name)s wants to verify", {name: getNameForEventRoom(fromUserId, mxEvent)})}</div>);
+                _t("%(name)s wants to verify", {name: getNameForEventRoom(request.requestingUserId, mxEvent)})}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
-                userLabelForEventRoom(fromUserId, mxEvent)}</div>);
-            const isResolved = !(this.state.accepted || this.state.cancelled || this.state.done);
-            if (isResolved) {
+                userLabelForEventRoom(request.requestingUserId, mxEvent)}</div>);
+            if (request.requested) {
                 const FormButton = sdk.getComponent("elements.FormButton");
                 stateNode = (<div className="mx_KeyVerification_buttons">
                     <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
                     <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
                 </div>);
             }
-        } else if (isOwn) { // request sent by us
+        } else { // request sent by us
             title = (<div className="mx_KeyVerification_title">{
                 _t("You sent a verification request")}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
-                userLabelForEventRoom(this.state.otherPartyUserId, mxEvent)}</div>);
+                userLabelForEventRoom(request.receivingUserId, mxEvent)}</div>);
         }
 
         if (title) {
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
new file mode 100644
index 0000000000..2050ad8072
--- /dev/null
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -0,0 +1,33 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 Vector Creations Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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';
+
+export default class EncryptionPanel extends React.PureComponent {
+    render() {
+        const request = this.props.verificationRequest;
+        if (request) {
+            return <p>got a request, go straight to wizard</p>;
+        } else if (this.props.member) {
+            return <p>show encryption options for member {this.props.member.name}</p>;
+        } else {
+            return <p>nada</p>;
+        }
+    }
+}
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index f59159d1d9..2b5ea3aa27 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -27,6 +27,7 @@ import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 const MEMBER_PHASES = [
     RIGHT_PANEL_PHASES.RoomMemberList,
     RIGHT_PANEL_PHASES.RoomMemberInfo,
+    RIGHT_PANEL_PHASES.EncryptionPanel,
     RIGHT_PANEL_PHASES.Room3pidMemberInfo,
 ];
 
diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 02775b847b..1b3cb3d64b 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -123,7 +123,11 @@ export default class RightPanelStore extends Store {
 
         if (payload.action === 'view_room' || payload.action === 'view_group') {
             // Reset to the member list if we're viewing member info
-            const memberInfoPhases = [RIGHT_PANEL_PHASES.RoomMemberInfo, RIGHT_PANEL_PHASES.Room3pidMemberInfo];
+            const memberInfoPhases = [
+                RIGHT_PANEL_PHASES.RoomMemberInfo,
+                RIGHT_PANEL_PHASES.Room3pidMemberInfo,
+                RIGHT_PANEL_PHASES.EncryptionPanel,
+            ];
             if (memberInfoPhases.includes(this._state.lastRoomPhase)) {
                 this._setState({lastRoomPhase: RIGHT_PANEL_PHASES.RoomMemberList, lastRoomPhaseParams: {}});
             }
diff --git a/src/stores/RightPanelStorePhases.js b/src/stores/RightPanelStorePhases.js
index 96807ebf5b..7783f960d6 100644
--- a/src/stores/RightPanelStorePhases.js
+++ b/src/stores/RightPanelStorePhases.js
@@ -22,7 +22,7 @@ export const RIGHT_PANEL_PHASES = Object.freeze({
     NotificationPanel: 'NotificationPanel',
     RoomMemberInfo: 'RoomMemberInfo',
     Room3pidMemberInfo: 'Room3pidMemberInfo',
-
+    EncryptionPanel: 'EncryptionPanel',
     // Group stuff
     GroupMemberList: 'GroupMemberList',
     GroupRoomList: 'GroupRoomList',
diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 2f7c0367ad..7e33c29214 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -161,6 +161,7 @@ export default class KeyVerificationStateObserver {
         }
 
         this.otherPartyUserId = fromUserId === this._client.getUserId() ? toUserId : fromUserId;
+        console.log("KeyVerificationStateObserver update for txnId", this._requestEvent.getId(), {accepted: this.accepted, cancelled: this.cancelled, done: this.done});
     }
 }
 

From c02fc44d256a07c5c39802b05112194fc73ed9f0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Dec 2019 18:16:22 +0100
Subject: [PATCH 0162/3235] WIP sas in right panel

---
 .../views/right_panel/EncryptionInfo.js       | 30 +++++++
 .../views/right_panel/EncryptionPanel.js      | 26 ++++--
 .../views/right_panel/VerificationPanel.js    | 88 +++++++++++++++++++
 3 files changed, 135 insertions(+), 9 deletions(-)
 create mode 100644 src/components/views/right_panel/EncryptionInfo.js
 create mode 100644 src/components/views/right_panel/VerificationPanel.js

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
new file mode 100644
index 0000000000..88aa3f9a6c
--- /dev/null
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -0,0 +1,30 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 "../../..";
+
+export default class EncryptionInfo extends React.PureComponent {
+    render() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return (<div>
+            <p>End-to-end encryption is great!</p>
+            <div>
+                <AccessibleButton onClick={this.props.onStartVerification}>Start verification</AccessibleButton>
+            </div>
+        </div>);
+    }
+}
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2050ad8072..c37d4f2b61 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -1,7 +1,4 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +15,27 @@ limitations under the License.
 */
 
 import React from 'react';
+import EncryptionInfo from "./EncryptionInfo";
+import VerificationPanel from "./VerificationPanel";
+import MatrixClientPeg from "../../../MatrixClientPeg";
 
 export default class EncryptionPanel extends React.PureComponent {
     render() {
-        const request = this.props.verificationRequest;
+        const request = this.props.verificationRequest || this.state.verificationRequest;
+        const {member} = this.props;
         if (request) {
-            return <p>got a request, go straight to wizard</p>;
-        } else if (this.props.member) {
-            return <p>show encryption options for member {this.props.member.name}</p>;
-        } else {
-            return <p>nada</p>;
+            return <VerificationPanel request={request} />;
+        } else if (member) {
+            return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
         }
     }
+
+    _onStartVerification = async () => {
+        const client = MatrixClientPeg.get();
+        const {member} = this.props;
+        // TODO: get the room id of the DM here?
+        // will this panel be shown in non-DM rooms?
+        const verificationRequest = await client.requestVerificationDM(member.userId, member.roomId);
+        this.setState({verificationRequest});
+    };
 }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
new file mode 100644
index 0000000000..3546e81bf3
--- /dev/null
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -0,0 +1,88 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 "../../..";
+import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+
+export default class VerificationPanel extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        this.state = {};
+    }
+
+    render() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const Spinner = sdk.getComponent('elements.Spinner');
+        const {request} = this.props;
+
+        if (request.requested) {
+            return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
+        } else if (request.ready) {
+            return (<p>{request.otherUserId} is ready, start <AccessibleButton onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
+        } else if (request.started) {
+            if (this.state.sasEvent) {
+                const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
+                return (<div>
+                    <VerificationShowSas
+                        sas={this.state.sasEvent.sas}
+                        onCancel={this._onSasMismatchesClick}
+                        onDone={this._onSasMatchesClick}
+                    />
+                </div>);
+            } else {
+                return (<p>Setting up SAS verification...</p>);
+            }
+        } else if (request.done) {
+            return <p>verified {request.otherUserId}!!</p>;
+        }
+    }
+
+    _startSAS = async () => {
+        const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
+        verifier.on('show_sas', this._onVerifierShowSas);
+        try {
+            await this._verifier.verify();
+        } finally {
+            this.setState({sasEvent: null});
+            verifier.removeListener('show_sas', this._onVerifierShowSas);
+        }
+    };
+
+    _onSasMatchesClick = () => {
+        this.state.sasEvent.confirm();
+    };
+
+    _onSasMismatchesClick = () => {
+        this.state.sasEvent.cancel();
+    };
+
+    _onVerifierShowSas = (sasEvent) => {
+        this.setState({sasEvent});
+    };
+
+    _onRequestChange = () => {
+        this.forceUpdate();
+    };
+
+    componentDidMount() {
+        this.props.request.on("change", this._onRequestChange);
+    }
+
+    componentWillUnmount() {
+        this.props.request.off("change", this._onRequestChange);
+    }
+}

From 0f415038beccd1d730ca6ecceb1275df0809fa2c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 18 Dec 2019 17:26:54 +0000
Subject: [PATCH 0163/3235] actually start verify process in verification panel

temporary code, as ux is not complete
---
 .../views/right_panel/VerificationPanel.js      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 3546e81bf3..f73693a0ea 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -22,6 +22,7 @@ export default class VerificationPanel extends React.PureComponent {
     constructor(props) {
         super(props);
         this.state = {};
+        this._hasVerifier = !!props.request.verifier;
     }
 
     render() {
@@ -53,12 +54,10 @@ export default class VerificationPanel extends React.PureComponent {
 
     _startSAS = async () => {
         const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
-        verifier.on('show_sas', this._onVerifierShowSas);
         try {
-            await this._verifier.verify();
+            await verifier.verify();
         } finally {
             this.setState({sasEvent: null});
-            verifier.removeListener('show_sas', this._onVerifierShowSas);
         }
     };
 
@@ -75,6 +74,18 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onRequestChange = () => {
+        const {request} = this.props;
+        if (!this._hasVerifier && !!request.verifier) {
+            request.verifier.on('show_sas', this._onVerifierShowSas);
+            try {
+                request.verifier.verify();
+            } catch (err) {
+                console.error("error verify", err);
+            }
+        } else if (this._hasVerifier && !request.verifier) {
+            request.verifier.removeListener('show_sas', this._onVerifierShowSas);
+        }
+        this._hasVerifier = !!request.verifier;
         this.forceUpdate();
     };
 

From 9e4b65de6a9f4ed0595a67e5bfa6d8166678c8a9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:08:11 +0000
Subject: [PATCH 0164/3235] fixup after rebase

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

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index f31a823ac9..c851cd30b5 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -56,7 +56,7 @@ export default class MKeyVerificationRequest extends React.Component {
                 dis.dispatch({
                     action: "set_right_panel_phase",
                     phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    verificationRequest: request,
+                    refireParams: {verificationRequest: request},
                 });
             } catch (err) {
                 console.error(err.message);

From 2c28fa0568b196fd7e6147d12883a540761e3153 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:08:53 +0000
Subject: [PATCH 0165/3235] use verif in right panel from "verify" button

---
 .../views/right_panel/EncryptionInfo.js           |  4 ++--
 .../views/right_panel/EncryptionPanel.js          |  7 +++++++
 src/components/views/right_panel/UserInfo.js      | 15 ++++++++++++---
 .../views/right_panel/VerificationPanel.js        |  4 +++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 88aa3f9a6c..f10d0b3499 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -21,9 +21,9 @@ export default class EncryptionInfo extends React.PureComponent {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (<div>
-            <p>End-to-end encryption is great!</p>
+            <p>End-to-end encryption is great! You should try it.</p>
             <div>
-                <AccessibleButton onClick={this.props.onStartVerification}>Start verification</AccessibleButton>
+                <AccessibleButton kind="primary" onClick={this.props.onStartVerification}>Start verification</AccessibleButton>
             </div>
         </div>);
     }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index c37d4f2b61..9b32dba30e 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -20,6 +20,11 @@ import VerificationPanel from "./VerificationPanel";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 
 export default class EncryptionPanel extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        this.state = {};
+    }
+
     render() {
         const request = this.props.verificationRequest || this.state.verificationRequest;
         const {member} = this.props;
@@ -27,6 +32,8 @@ export default class EncryptionPanel extends React.PureComponent {
             return <VerificationPanel request={request} />;
         } else if (member) {
             return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
+        } else {
+            return <p>Not a member nor request, not sure what to render</p>;
         }
     }
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 208c5e8906..542e010edd 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -40,6 +40,7 @@ import E2EIcon from "../rooms/E2EIcon";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -128,6 +129,14 @@ function verifyDevice(userId, device) {
     }, null, /* priority = */ false, /* static = */ true);
 }
 
+function verifyUser(user) {
+    dis.dispatch({
+        action: "set_right_panel_phase",
+        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        refireParams: {member: user},
+    });
+}
+
 function DeviceItem({userId, device}) {
     const cli = useContext(MatrixClientContext);
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
@@ -1296,7 +1305,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
     const userVerified = cli.checkUserTrust(user.userId).isVerified();
     let verifyButton;
     if (!userVerified) {
-        verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyDevice(user.userId, null)}>
+        verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyUser(user)}>
             {_t("Verify")}
         </AccessibleButton>;
     }
@@ -1305,7 +1314,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>
             <p>{ text }</p>
-            {verifyButton}
+            { verifyButton }
             { devicesSection }
         </div>
     );
@@ -1323,7 +1332,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
             <div className="mx_UserInfo_container">
                 <div className="mx_UserInfo_profile">
-                    <div >
+                    <div>
                         <h2 aria-label={displayName}>
                             { e2eIcon }
                             { displayName }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index f73693a0ea..e1f36cbc0f 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -33,7 +33,7 @@ export default class VerificationPanel extends React.PureComponent {
         if (request.requested) {
             return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
         } else if (request.ready) {
-            return (<p>{request.otherUserId} is ready, start <AccessibleButton onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
+            return (<p>{request.otherUserId} is ready, start <AccessibleButton kind="primary" onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
         } else if (request.started) {
             if (this.state.sasEvent) {
                 const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
@@ -56,6 +56,8 @@ export default class VerificationPanel extends React.PureComponent {
         const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
         try {
             await verifier.verify();
+        } catch (err) {
+            console.error(err);
         } finally {
             this.setState({sasEvent: null});
         }

From 41cf18701fe45c502fcb1d30bcd98107db56f5bb Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:09:08 +0000
Subject: [PATCH 0166/3235] remove now-unused import

---
 src/components/structures/MatrixChat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e093e9dff9..88448311d2 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -62,7 +62,6 @@ import { countRoomsWithNotif } from '../../RoomNotifs';
 import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
-import KeyVerificationStateObserver from '../../utils/KeyVerificationStateObserver';
 
 /** constants for MatrixChat.state.view */
 const VIEWS = {

From b36df7330061d28c31c20ef4934e3d945a166af7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:09:19 +0000
Subject: [PATCH 0167/3235] fix for ref refactor pr

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

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 9d929d313b..53ae240653 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1136,7 +1136,7 @@ const TimelinePanel = createReactClass({
         const allowPartial = opts.allowPartial || false;
 
         const messagePanel = this._messagePanel.current;
-        if (messagePanel === undefined) return null;
+        if (!messagePanel) return null;
 
         const EventTile = sdk.getComponent('rooms.EventTile');
 

From db17321777ee7975cec10362cee11329482fd568 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:28:23 +0000
Subject: [PATCH 0168/3235] await verify so errors (like cancellation) are
 caught

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index e1f36cbc0f..2879916f37 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -75,12 +75,14 @@ export default class VerificationPanel extends React.PureComponent {
         this.setState({sasEvent});
     };
 
-    _onRequestChange = () => {
+    _onRequestChange = async () => {
         const {request} = this.props;
         if (!this._hasVerifier && !!request.verifier) {
             request.verifier.on('show_sas', this._onVerifierShowSas);
             try {
-                request.verifier.verify();
+                // on the requester side, this is also awaited in _startSAS,
+                // but that's ok as verify should return the same promise.
+                await request.verifier.verify();
             } catch (err) {
                 console.error("error verify", err);
             }

From b866c16071e81c5ed1c35e1cf5f10b80db4c2dc5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:28:44 +0000
Subject: [PATCH 0169/3235] show cancellation

---
 src/components/views/right_panel/VerificationPanel.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 2879916f37..c3fce4314b 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -49,6 +49,8 @@ export default class VerificationPanel extends React.PureComponent {
             }
         } else if (request.done) {
             return <p>verified {request.otherUserId}!!</p>;
+        } else if (request.cancelled) {
+            return <p>cancelled by {request.cancellingUserId}!</p>;
         }
     }
 

From b80bfd04b221a356232fd590619118db85ed1a1b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:43:10 +0000
Subject: [PATCH 0170/3235] make sure to have roomId of DM when starting verif.
 req.

---
 .../views/dialogs/DeviceVerifyDialog.js       | 21 ++--------------
 .../views/right_panel/EncryptionPanel.js      |  6 ++---
 src/createRoom.js                             | 25 ++++++++++++++++---
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index ca05d74964..fcb5089785 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -24,8 +24,7 @@ import sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
 import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import createRoom from "../../../createRoom";
+import {ensureDMExists} from "../../../createRoom";
 import dis from "../../../dispatcher";
 import SettingsStore from '../../../settings/SettingsStore';
 
@@ -322,23 +321,7 @@ export default class DeviceVerifyDialog extends React.Component {
 }
 
 async function ensureDMExistsAndOpen(userId) {
-    const client = MatrixClientPeg.get();
-    const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
-    const rooms = roomIds.map(id => client.getRoom(id));
-    const suitableDMRooms = rooms.filter(r => {
-        if (r && r.getMyMembership() === "join") {
-            const member = r.getMember(userId);
-            return member && (member.membership === "invite" || member.membership === "join");
-        }
-        return false;
-    });
-    let roomId;
-    if (suitableDMRooms.length) {
-        const room = suitableDMRooms[0];
-        roomId = room.roomId;
-    } else {
-        roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
-    }
+    const roomId = ensureDMExists(MatrixClientPeg.get(), userId);
     // don't use andView and spinner in createRoom, together, they cause this dialog to close and reopen,
     // we causes us to loose the verifier and restart, and we end up having two verification requests
     dis.dispatch({
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 9b32dba30e..7992933864 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -18,6 +18,7 @@ import React from 'react';
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
 import MatrixClientPeg from "../../../MatrixClientPeg";
+import {ensureDMExists} from "../../../createRoom";
 
 export default class EncryptionPanel extends React.PureComponent {
     constructor(props) {
@@ -40,9 +41,8 @@ export default class EncryptionPanel extends React.PureComponent {
     _onStartVerification = async () => {
         const client = MatrixClientPeg.get();
         const {member} = this.props;
-        // TODO: get the room id of the DM here?
-        // will this panel be shown in non-DM rooms?
-        const verificationRequest = await client.requestVerificationDM(member.userId, member.roomId);
+        const roomId = await ensureDMExists(client, member.userId);
+        const verificationRequest = await client.requestVerificationDM(member.userId, roomId);
         this.setState({verificationRequest});
     };
 }
diff --git a/src/createRoom.js b/src/createRoom.js
index 0ee90beba8..766c9b0c8f 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ import sdk from './index';
 import { _t } from './languageHandler';
 import dis from "./dispatcher";
 import * as Rooms from "./Rooms";
-
+import DMRoomMap from "./utils/DMRoomMap";
 import {getAddressType} from "./UserAddress";
 
 /**
@@ -35,7 +36,7 @@ import {getAddressType} from "./UserAddress";
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
  */
-function createRoom(opts) {
+export default function createRoom(opts) {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
 
@@ -140,4 +141,22 @@ function createRoom(opts) {
     });
 }
 
-module.exports = createRoom;
+export async function ensureDMExists(client, userId) {
+    const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
+    const rooms = roomIds.map(id => client.getRoom(id));
+    const suitableDMRooms = rooms.filter(r => {
+        if (r && r.getMyMembership() === "join") {
+            const member = r.getMember(userId);
+            return member && (member.membership === "invite" || member.membership === "join");
+        }
+        return false;
+    });
+    let roomId;
+    if (suitableDMRooms.length) {
+        const room = suitableDMRooms[0];
+        roomId = room.roomId;
+    } else {
+        roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
+    }
+    return roomId;
+}

From 8c5f3d6d9428e6d971604cc95782b4b75988535c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:43:55 +0000
Subject: [PATCH 0171/3235] show devices and unverify action also in
 unencrypted rooms

---
 src/components/views/right_panel/UserInfo.js | 24 ++++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 542e010edd..0f248d65d4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1249,15 +1249,13 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
                 setDevices(null);
             }
         }
-        if (isRoomEncrypted) {
-            _downloadDeviceList();
-        }
+        _downloadDeviceList();
 
         // Handle being unmounted
         return () => {
             cancelled = true;
         };
-    }, [cli, user.userId, isRoomEncrypted]);
+    }, [cli, user.userId]);
 
     // Listen to changes
     useEffect(() => {
@@ -1273,18 +1271,13 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
                 });
             }
         };
-
-        if (isRoomEncrypted) {
-            cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
-        }
+        cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
         // Handle being unmounted
         return () => {
             cancel = true;
-            if (isRoomEncrypted) {
-                cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
-            }
+            cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
         };
-    }, [cli, user.userId, isRoomEncrypted]);
+    }, [cli, user.userId]);
 
     let text;
     if (!isRoomEncrypted) {
@@ -1299,9 +1292,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
-    const devicesSection = isRoomEncrypted ?
-        (<DevicesSection loading={devices === undefined} devices={devices} userId={user.userId} />) : null;
-
     const userVerified = cli.checkUserTrust(user.userId).isVerified();
     let verifyButton;
     if (!userVerified) {
@@ -1310,6 +1300,10 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         </AccessibleButton>;
     }
 
+    const devicesSection = <DevicesSection
+        loading={devices === undefined}
+        devices={devices} userId={user.userId} />;
+
     const securitySection = (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>

From d57e76f3e271601a0b7c6367377c29eeaf121145 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Dec 2019 16:48:15 +0000
Subject: [PATCH 0172/3235] hide verify button for own member

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 0f248d65d4..a69390d932 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1293,8 +1293,9 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
     }
 
     const userVerified = cli.checkUserTrust(user.userId).isVerified();
+    const isMe = user.userId === cli.getUserId();
     let verifyButton;
-    if (!userVerified) {
+    if (!userVerified && !isMe) {
         verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyUser(user)}>
             {_t("Verify")}
         </AccessibleButton>;

From f4a276c052601abf3d5b3bb977894a9335e75ee8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 11:24:10 +0000
Subject: [PATCH 0173/3235] port MVerificationConclusion to use
 VerificationRequest

---
 .../messages/MKeyVerificationConclusion.js    | 90 +++++--------------
 1 file changed, 24 insertions(+), 66 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 0bd8e2d3d8..fb83eda803 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -19,102 +19,60 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
+import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
 
 export default class MKeyVerificationConclusion extends React.Component {
     constructor(props) {
         super(props);
-        this.keyVerificationState = null;
-        this.state = {
-            done: false,
-            cancelled: false,
-            otherPartyUserId: null,
-            cancelPartyUserId: null,
-        };
-        const rel = this.props.mxEvent.getRelation();
-        if (rel) {
-            const client = MatrixClientPeg.get();
-            const room = client.getRoom(this.props.mxEvent.getRoomId());
-            const requestEvent = room.findEventById(rel.event_id);
-            if (requestEvent) {
-                this._createStateObserver(requestEvent, client);
-                this.state = this._copyState();
-            } else {
-                const findEvent = event => {
-                    if (event.getId() === rel.event_id) {
-                        this._createStateObserver(event, client);
-                        this.setState(this._copyState());
-                        room.removeListener("Room.timeline", findEvent);
-                    }
-                };
-                room.on("Room.timeline", findEvent);
-            }
-        }
-    }
-
-    _createStateObserver(requestEvent, client) {
-        this.keyVerificationState = new KeyVerificationStateObserver(requestEvent, client, () => {
-            this.setState(this._copyState());
-        });
-    }
-
-    _copyState() {
-        const {done, cancelled, otherPartyUserId, cancelPartyUserId} = this.keyVerificationState;
-        return {done, cancelled, otherPartyUserId, cancelPartyUserId};
     }
 
     componentDidMount() {
-        if (this.keyVerificationState) {
-            this.keyVerificationState.attach();
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            request.on("change", this._onRequestChanged);
         }
     }
 
     componentWillUnmount() {
-        if (this.keyVerificationState) {
-            this.keyVerificationState.detach();
+        const request = this.props.mxEvent.verificationRequest;
+        if (request) {
+            request.off("change", this._onRequestChanged);
         }
     }
 
-    _getName(userId) {
-        const roomId = this.props.mxEvent.getRoomId();
-        const client = MatrixClientPeg.get();
-        const room = client.getRoom(roomId);
-        const member = room.getMember(userId);
-        return member ? member.name : userId;
-    }
-
-    _userLabel(userId) {
-        const name = this._getName(userId);
-        if (name !== userId) {
-            return _t("%(name)s (%(userId)s)", {name, userId});
-        } else {
-            return userId;
-        }
-    }
+    _onRequestChanged = () => {
+        this.forceUpdate();
+    };
 
     render() {
         const {mxEvent} = this.props;
+        const request = mxEvent.verificationRequest;
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
+
+        if (!request) {
+            return <p>This is a verification conclusion tile without a request.</p>;
+        }
+
         let title;
 
-        if (this.state.done) {
-            title = _t("You verified %(name)s", {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
-        } else if (this.state.cancelled) {
+        if (request.done) {
+            title = _t("You verified %(name)s", {name: getNameForEventRoom(request.otherUserId, mxEvent)});
+        } else if (request.cancelled) {
             if (mxEvent.getSender() === myUserId) {
                 title = _t("You cancelled verifying %(name)s",
-                    {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
-            } else if (mxEvent.getSender() === this.state.otherPartyUserId) {
+                    {name: getNameForEventRoom(request.otherUserId, mxEvent)});
+            } else if (mxEvent.getSender() === request.otherUserId) {
                 title = _t("%(name)s cancelled verifying",
-                    {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
+                    {name: getNameForEventRoom(request.otherUserId, mxEvent)});
             }
         }
 
         if (title) {
-            const subtitle = userLabelForEventRoom(this.state.otherPartyUserId, mxEvent);
+            const subtitle = userLabelForEventRoom(request.otherUserId, mxEvent);
             const classes = classNames("mx_EventTile_bubble", "mx_KeyVerification", "mx_KeyVerification_icon", {
-                mx_KeyVerification_icon_verified: this.state.done,
+                mx_KeyVerification_icon_verified: request.done,
             });
             return (<div className={classes}>
                 <div className="mx_KeyVerification_title">{title}</div>

From 1aebc9579330d6b5e1793d173f77abf3013a413a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 11:24:27 +0000
Subject: [PATCH 0174/3235] slightly better copy

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

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index c851cd30b5..0aa2188116 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -104,7 +104,7 @@ export default class MKeyVerificationRequest extends React.Component {
         let stateNode;
 
         if (!request) {
-            return <p>This is an invalid request, ho ho ho!</p>;
+            return <p>This is a verification request tile without a request.</p>;
         }
 
         if (request.ready || request.started || request.cancelled) {

From dd633bd8fe0284eb4ceb6cc1f4c190a75d4d3593 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 12:02:37 +0000
Subject: [PATCH 0175/3235] port toast to use VerificationRequest and open
 right panel, not dialog

---
 .../views/toasts/VerificationRequestToast.js  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 7e043f4d83..30478ce281 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -18,10 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import sdk from "../../../index";
 import { _t } from '../../../languageHandler';
-import Modal from "../../../Modal";
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
-import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
+import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher";
 
 export default class VerificationRequestToast extends React.PureComponent {
@@ -33,16 +32,9 @@ export default class VerificationRequestToast extends React.PureComponent {
         const remaining = Math.max(0, timeout - age);
         const counter = Math.ceil(remaining / 1000);
         this.state = {counter};
-        if (this.props.requestObserver) {
-            this.props.requestObserver.setCallback(this._checkRequestIsPending);
-        }
     }
 
     componentDidMount() {
-        if (this.props.requestObserver) {
-            this.props.requestObserver.attach();
-            this._checkRequestIsPending();
-        }
         this._intervalHandle = setInterval(() => {
             let {counter} = this.state;
             counter -= 1;
@@ -52,20 +44,22 @@ export default class VerificationRequestToast extends React.PureComponent {
                 this.setState({counter});
             }
         }, 1000);
+        const {request} = this.props;
+        request.on("change", this._checkRequestIsPending);
     }
 
     componentWillUnmount() {
         clearInterval(this._intervalHandle);
-        if (this.props.requestObserver) {
-            this.props.requestObserver.detach();
-        }
+        const {request} = this.props;
+        request.off("change", this._checkRequestIsPending);
     }
 
     _checkRequestIsPending = () => {
-        if (!this.props.requestObserver.pending) {
+        const {request} = this.props;
+        if (request.ready || request.started || request.done || request.cancelled) {
             this.props.dismiss();
         }
-    }
+    };
 
     cancel = () => {
         this.props.dismiss();
@@ -76,9 +70,10 @@ export default class VerificationRequestToast extends React.PureComponent {
         }
     }
 
-    accept = () => {
+    accept = async () => {
         this.props.dismiss();
-        const {event} = this.props.request;
+        const {request} = this.props;
+        const {event} = request;
         // no room id for to_device requests
         if (event.getRoomId()) {
             dis.dispatch({
@@ -87,18 +82,24 @@ export default class VerificationRequestToast extends React.PureComponent {
                 should_peek: false,
             });
         }
-
-        const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
-        const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog');
-        Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-            verifier,
-        }, null, /* priority = */ false, /* static = */ true);
+        try {
+            await request.accept();
+            dis.dispatch({action: "show_right_panel"});
+            dis.dispatch({
+                action: "set_right_panel_phase",
+                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                refireParams: {verificationRequest: request},
+            });
+        } catch (err) {
+            console.error(err.message);
+        }
     };
 
     render() {
         const FormButton = sdk.getComponent("elements.FormButton");
-        const {event} = this.props.request;
-        const userId = event.getSender();
+        const {request} = this.props;
+        const {event} = request;
+        const userId = request.otherUserId;
         let nameLabel = event.getRoomId() ? userLabelForEventRoom(userId, event) : userId;
         // for legacy to_device verification requests
         if (nameLabel === userId) {
@@ -121,5 +122,4 @@ export default class VerificationRequestToast extends React.PureComponent {
 VerificationRequestToast.propTypes = {
     dismiss: PropTypes.func.isRequired,
     request: PropTypes.object.isRequired,
-    requestObserver: PropTypes.instanceOf(KeyVerificationStateObserver),
 };

From 2dd1e93d84dbf5a0b20de70d09ecb8cb8fece4f2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:30:18 +0100
Subject: [PATCH 0176/3235] show message after clicking "they match"

---
 src/components/views/right_panel/VerificationPanel.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index c3fce4314b..ff7a356e70 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -35,7 +35,9 @@ export default class VerificationPanel extends React.PureComponent {
         } else if (request.ready) {
             return (<p>{request.otherUserId} is ready, start <AccessibleButton kind="primary" onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
         } else if (request.started) {
-            if (this.state.sasEvent) {
+            if (this.state.sasWaitingForOtherParty) {
+                return <p>Waiting for {request.otherUserId} to confirm ...</p>;
+            } else if (this.state.sasEvent) {
                 const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
                 return (<div>
                     <VerificationShowSas
@@ -66,6 +68,7 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onSasMatchesClick = () => {
+        this.setState({sasWaitingForOtherParty: true});
         this.state.sasEvent.confirm();
     };
 

From de1c3e2f83b7f387adbb3432684545eb4882868d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:30:47 +0100
Subject: [PATCH 0177/3235] use same style as UserInfo for sections and
 paragraphs

---
 src/components/views/right_panel/EncryptionInfo.js  | 13 +++++++------
 .../views/right_panel/VerificationPanel.js          |  8 ++++++++
 src/i18n/strings/en_EN.json                         |  4 ++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index f10d0b3499..49f4fc5da3 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -16,15 +16,16 @@ limitations under the License.
 
 import React from 'react';
 import sdk from "../../..";
+import {_t} from "../../../languageHandler";
 
 export default class EncryptionInfo extends React.PureComponent {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (<div>
-            <p>End-to-end encryption is great! You should try it.</p>
-            <div>
-                <AccessibleButton kind="primary" onClick={this.props.onStartVerification}>Start verification</AccessibleButton>
-            </div>
-        </div>);
+        return (<div class="mx_UserInfo"><div class="mx_UserInfo_container">
+            <h3>{_t("Verify User")}</h3>
+            <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
+            <p>{_t("For maximum security, do this in person.")}</p>
+            <AccessibleButton kind="primary" onClick={this.props.onStartVerification}>{_t("Start Verification")}</AccessibleButton>
+        </div></div>);
     }
 }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index ff7a356e70..9e5a448239 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -26,6 +26,14 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     render() {
+        return <div class="mx_UserInfo">
+            <div class="mx_UserInfo_container">
+                { this.renderStatus() }
+            </div>
+        </div>;
+    }
+
+    renderStatus() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const Spinner = sdk.getComponent('elements.Spinner');
         const {request} = this.props;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6979759cd2..59c1684076 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1106,6 +1106,10 @@
     "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.",
     "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.",
+    "Verify User": "Verify User",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
+    "For maximum security, do this in person.": "For maximum security, do this in person.",
+    "Start Verification": "Start Verification",
     "Members": "Members",
     "Files": "Files",
     "Trusted": "Trusted",

From 075e42c076d28ef6f252e183571ea066e3f06574 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:31:07 +0100
Subject: [PATCH 0178/3235] use transactionId as key for react

---
 src/components/structures/MatrixChat.js             | 2 +-
 src/components/views/right_panel/EncryptionPanel.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 88448311d2..0449c2b4fd 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1463,7 +1463,7 @@ export default createReactClass({
                     dis.dispatch({
                         action: "show_toast",
                         toast: {
-                            key: request.event.getId(),
+                            key: request.channel.transactionId,
                             title: _t("Verification Request"),
                             icon: "verification",
                             props: {request},
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 7992933864..e3f3b86940 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -30,7 +30,7 @@ export default class EncryptionPanel extends React.PureComponent {
         const request = this.props.verificationRequest || this.state.verificationRequest;
         const {member} = this.props;
         if (request) {
-            return <VerificationPanel request={request} />;
+            return <VerificationPanel request={request} key={request.channel.transactionId} />;
         } else if (member) {
             return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
         } else {

From b49c471f057dd51786ed2bbb297a1d37e42954ac Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:31:36 +0100
Subject: [PATCH 0179/3235] render empty tiles when no request

---
 .../views/messages/MKeyVerificationConclusion.js       | 10 +++++++---
 .../views/messages/MKeyVerificationRequest.js          |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index fb83eda803..6dce9dcd48 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -48,12 +48,14 @@ export default class MKeyVerificationConclusion extends React.Component {
     render() {
         const {mxEvent} = this.props;
         const request = mxEvent.verificationRequest;
+
+        if (!request) {
+            return null;
+        }
+
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
 
-        if (!request) {
-            return <p>This is a verification conclusion tile without a request.</p>;
-        }
 
         let title;
 
@@ -67,6 +69,8 @@ export default class MKeyVerificationConclusion extends React.Component {
                 title = _t("%(name)s cancelled verifying",
                     {name: getNameForEventRoom(request.otherUserId, mxEvent)});
             }
+        } else {
+            title = `request conclusion tile with phase ${request.phase}`;
         }
 
         if (title) {
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 0aa2188116..ea99435d85 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -99,13 +99,14 @@ export default class MKeyVerificationRequest extends React.Component {
         const {mxEvent} = this.props;
         const request = mxEvent.verificationRequest;
 
+        if (!request) {
+            return null;
+        }
+
         let title;
         let subtitle;
         let stateNode;
 
-        if (!request) {
-            return <p>This is a verification request tile without a request.</p>;
-        }
 
         if (request.ready || request.started || request.cancelled) {
             let stateLabel;

From 52c7c5b8379dbb70912a15353993e2703d774949 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:31:53 +0100
Subject: [PATCH 0180/3235] render done tile as accepted

---
 src/components/views/messages/MKeyVerificationRequest.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ea99435d85..ebdfa7c636 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -108,11 +108,12 @@ export default class MKeyVerificationRequest extends React.Component {
         let stateNode;
 
 
-        if (request.ready || request.started || request.cancelled) {
+        const accepted = request.ready || request.started || request.done;
+        if (accepted || request.cancelled) {
             let stateLabel;
-            if (request.ready || request.started) {
+            if (accepted) {
                 stateLabel = this._acceptedLabel(request.receivingUserId);
-            } else if (request.cancelled) {
+            } else {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
             }
             stateNode = (<div className="mx_KeyVerification_state">{stateLabel}</div>);

From 3b9c5c0a27aa7bdbc3fe8a2dbbe74ea4ef9ae9af Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Dec 2019 21:32:11 +0100
Subject: [PATCH 0181/3235] remove unused code

---
 src/utils/KeyVerificationStateObserver.js | 148 ----------------------
 1 file changed, 148 deletions(-)

diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 7e33c29214..ef69a6b2f0 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -17,154 +17,6 @@ limitations under the License.
 import MatrixClientPeg from '../MatrixClientPeg';
 import { _t } from '../languageHandler';
 
-const SUB_EVENT_TYPES_OF_INTEREST = ["start", "cancel", "done"];
-
-export default class KeyVerificationStateObserver {
-    constructor(requestEvent, client, updateCallback) {
-        this._requestEvent = requestEvent;
-        this._client = client;
-        this._updateCallback = updateCallback;
-        this.accepted = false;
-        this.done = false;
-        this.cancelled = false;
-        this._updateVerificationState();
-    }
-
-    get concluded() {
-        return this.accepted || this.done || this.cancelled;
-    }
-
-    get pending() {
-        return !this.concluded;
-    }
-
-    setCallback(callback) {
-        this._updateCallback = callback;
-    }
-
-    attach() {
-        this._requestEvent.on("Event.relationsCreated", this._onRelationsCreated);
-        for (const phaseName of SUB_EVENT_TYPES_OF_INTEREST) {
-            this._tryListenOnRelationsForType(`m.key.verification.${phaseName}`);
-        }
-    }
-
-    detach() {
-        const roomId = this._requestEvent.getRoomId();
-        const room = this._client.getRoom(roomId);
-
-        for (const phaseName of SUB_EVENT_TYPES_OF_INTEREST) {
-            const relations = room.getUnfilteredTimelineSet()
-                .getRelationsForEvent(this._requestEvent.getId(), "m.reference", `m.key.verification.${phaseName}`);
-            if (relations) {
-                relations.removeListener("Relations.add", this._onRelationsUpdated);
-                relations.removeListener("Relations.remove", this._onRelationsUpdated);
-                relations.removeListener("Relations.redaction", this._onRelationsUpdated);
-            }
-        }
-        this._requestEvent.removeListener("Event.relationsCreated", this._onRelationsCreated);
-    }
-
-    _onRelationsCreated = (relationType, eventType) => {
-        if (relationType !== "m.reference") {
-            return;
-        }
-        if (
-            eventType !== "m.key.verification.start" &&
-            eventType !== "m.key.verification.cancel" &&
-            eventType !== "m.key.verification.done"
-        ) {
-            return;
-        }
-        this._tryListenOnRelationsForType(eventType);
-        this._updateVerificationState();
-        this._updateCallback();
-    };
-
-    _tryListenOnRelationsForType(eventType) {
-        const roomId = this._requestEvent.getRoomId();
-        const room = this._client.getRoom(roomId);
-        const relations = room.getUnfilteredTimelineSet()
-            .getRelationsForEvent(this._requestEvent.getId(), "m.reference", eventType);
-        if (relations) {
-            relations.on("Relations.add", this._onRelationsUpdated);
-            relations.on("Relations.remove", this._onRelationsUpdated);
-            relations.on("Relations.redaction", this._onRelationsUpdated);
-        }
-    }
-
-    _onRelationsUpdated = (event) => {
-        this._updateVerificationState();
-        this._updateCallback && this._updateCallback();
-    };
-
-    _updateVerificationState() {
-        const roomId = this._requestEvent.getRoomId();
-        const room = this._client.getRoom(roomId);
-        const timelineSet = room.getUnfilteredTimelineSet();
-        const fromUserId = this._requestEvent.getSender();
-        const content = this._requestEvent.getContent();
-        const toUserId = content.to;
-
-        this.cancelled = false;
-        this.done = false;
-        this.accepted = false;
-        this.otherPartyUserId = null;
-        this.cancelPartyUserId = null;
-
-        const startRelations = timelineSet.getRelationsForEvent(
-            this._requestEvent.getId(), "m.reference", "m.key.verification.start");
-        if (startRelations) {
-            for (const startEvent of startRelations.getRelations()) {
-                if (startEvent.getSender() === toUserId) {
-                    this.accepted = true;
-                }
-            }
-        }
-
-        const doneRelations = timelineSet.getRelationsForEvent(
-            this._requestEvent.getId(), "m.reference", "m.key.verification.done");
-        if (doneRelations) {
-            let senderDone = false;
-            let receiverDone = false;
-            for (const doneEvent of doneRelations.getRelations()) {
-                if (doneEvent.getSender() === toUserId) {
-                    receiverDone = true;
-                } else if (doneEvent.getSender() === fromUserId) {
-                    senderDone = true;
-                }
-            }
-            if (senderDone && receiverDone) {
-                this.done = true;
-            }
-        }
-
-        if (!this.done) {
-            const cancelRelations = timelineSet.getRelationsForEvent(
-                this._requestEvent.getId(), "m.reference", "m.key.verification.cancel");
-
-            if (cancelRelations) {
-                let earliestCancelEvent;
-                for (const cancelEvent of cancelRelations.getRelations()) {
-                    // only accept cancellation from the users involved
-                    if (cancelEvent.getSender() === toUserId || cancelEvent.getSender() === fromUserId) {
-                        this.cancelled = true;
-                        if (!earliestCancelEvent || cancelEvent.getTs() < earliestCancelEvent.getTs()) {
-                            earliestCancelEvent = cancelEvent;
-                        }
-                    }
-                }
-                if (earliestCancelEvent) {
-                    this.cancelPartyUserId = earliestCancelEvent.getSender();
-                }
-            }
-        }
-
-        this.otherPartyUserId = fromUserId === this._client.getUserId() ? toUserId : fromUserId;
-        console.log("KeyVerificationStateObserver update for txnId", this._requestEvent.getId(), {accepted: this.accepted, cancelled: this.cancelled, done: this.done});
-    }
-}
-
 export function getNameForEventRoom(userId, mxEvent) {
     const roomId = mxEvent.getRoomId();
     const client = MatrixClientPeg.get();

From 7a88a94936bf3471bf82852a15775f2fca12f016 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Jan 2020 13:40:20 +0100
Subject: [PATCH 0182/3235] fixes!

---
 .../messages/MKeyVerificationConclusion.js    | 33 +++++++++++++++----
 .../views/messages/MKeyVerificationRequest.js | 30 ++++++++++-------
 .../views/right_panel/EncryptionInfo.js       |  2 +-
 .../views/right_panel/VerificationPanel.js    |  4 +--
 .../views/toasts/VerificationRequestToast.js  | 19 +++--------
 5 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 6dce9dcd48..90edb2f05d 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -45,32 +45,51 @@ export default class MKeyVerificationConclusion extends React.Component {
         this.forceUpdate();
     };
 
+    _shouldRender(mxEvent, request) {
+        // normally should not happen
+        if (!request) {
+            return false;
+        }
+        // .cancel event that was sent after the verification finished, ignore
+        if (mxEvent.getType() === "m.key.verification.cancel" && !request.cancelled) {
+            return false;
+        }
+        // .done event that was sent after the verification cancelled, ignore
+        if (mxEvent.getType() === "m.key.verification.done" && !request.done) {
+            return false;
+        }
+
+        // request hasn't concluded yet
+        if (request.pending) {
+            return false;
+        }
+        return true;
+    }
+
     render() {
         const {mxEvent} = this.props;
         const request = mxEvent.verificationRequest;
 
-        if (!request) {
+        if (!this._shouldRender(mxEvent, request)) {
             return null;
         }
 
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
 
-
         let title;
 
         if (request.done) {
             title = _t("You verified %(name)s", {name: getNameForEventRoom(request.otherUserId, mxEvent)});
         } else if (request.cancelled) {
-            if (mxEvent.getSender() === myUserId) {
+            const userId = request.cancellingUserId;
+            if (userId === myUserId) {
                 title = _t("You cancelled verifying %(name)s",
                     {name: getNameForEventRoom(request.otherUserId, mxEvent)});
-            } else if (mxEvent.getSender() === request.otherUserId) {
+            } else {
                 title = _t("%(name)s cancelled verifying",
-                    {name: getNameForEventRoom(request.otherUserId, mxEvent)});
+                    {name: getNameForEventRoom(userId, mxEvent)});
             }
-        } else {
-            title = `request conclusion tile with phase ${request.phase}`;
         }
 
         if (title) {
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ebdfa7c636..1bef3b4469 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -43,6 +43,16 @@ export default class MKeyVerificationRequest extends React.Component {
         }
     }
 
+    _openRequest = () => {
+        const {verificationRequest} = this.props.mxEvent;
+        dis.dispatch({action: "show_right_panel"});
+        dis.dispatch({
+            action: "set_right_panel_phase",
+            phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+            refireParams: {verificationRequest},
+        });
+    };
+
     _onRequestChanged = () => {
         this.forceUpdate();
     };
@@ -52,12 +62,7 @@ export default class MKeyVerificationRequest extends React.Component {
         if (request) {
             try {
                 await request.accept();
-                dis.dispatch({action: "show_right_panel"});
-                dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    refireParams: {verificationRequest: request},
-                });
+                this._openRequest();
             } catch (err) {
                 console.error(err.message);
             }
@@ -96,10 +101,13 @@ export default class MKeyVerificationRequest extends React.Component {
     }
 
     render() {
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+        const FormButton = sdk.getComponent("elements.FormButton");
+
         const {mxEvent} = this.props;
         const request = mxEvent.verificationRequest;
 
-        if (!request) {
+        if (!request || request.invalid) {
             return null;
         }
 
@@ -107,12 +115,13 @@ export default class MKeyVerificationRequest extends React.Component {
         let subtitle;
         let stateNode;
 
-
         const accepted = request.ready || request.started || request.done;
         if (accepted || request.cancelled) {
             let stateLabel;
             if (accepted) {
-                stateLabel = this._acceptedLabel(request.receivingUserId);
+                stateLabel = (<AccessibleButton onClick={this._openRequest}>
+                    {this._acceptedLabel(request.receivingUserId)}
+                </AccessibleButton>);
             } else {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
             }
@@ -124,8 +133,7 @@ export default class MKeyVerificationRequest extends React.Component {
                 _t("%(name)s wants to verify", {name: getNameForEventRoom(request.requestingUserId, mxEvent)})}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
                 userLabelForEventRoom(request.requestingUserId, mxEvent)}</div>);
-            if (request.requested) {
-                const FormButton = sdk.getComponent("elements.FormButton");
+            if (request.requested && !request.observeOnly) {
                 stateNode = (<div className="mx_KeyVerification_buttons">
                     <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
                     <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 49f4fc5da3..3d5de829b7 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -21,7 +21,7 @@ import {_t} from "../../../languageHandler";
 export default class EncryptionInfo extends React.PureComponent {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (<div class="mx_UserInfo"><div class="mx_UserInfo_container">
+        return (<div className="mx_UserInfo"><div className="mx_UserInfo_container">
             <h3>{_t("Verify User")}</h3>
             <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
             <p>{_t("For maximum security, do this in person.")}</p>
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 9e5a448239..e25aaabcfa 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -26,8 +26,8 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     render() {
-        return <div class="mx_UserInfo">
-            <div class="mx_UserInfo_container">
+        return <div className="mx_UserInfo">
+            <div className="mx_UserInfo_container">
                 { this.renderStatus() }
             </div>
         </div>;
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 30478ce281..f616575973 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -26,25 +26,16 @@ import dis from "../../../dispatcher";
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
         super(props);
-        const {event, timeout} = props.request;
-        // to_device requests don't have a timestamp, so consider them age=0
-        const age = event.getTs() ? event.getLocalAge() : 0;
-        const remaining = Math.max(0, timeout - age);
-        const counter = Math.ceil(remaining / 1000);
-        this.state = {counter};
+        this.state = {counter: Math.ceil(props.request.timeout / 1000)};
     }
 
     componentDidMount() {
+        const {request} = this.props;
         this._intervalHandle = setInterval(() => {
             let {counter} = this.state;
-            counter -= 1;
-            if (counter <= 0) {
-                this.cancel();
-            } else {
-                this.setState({counter});
-            }
+            counter = Math.max(0, counter - 1);
+            this.setState({counter});
         }, 1000);
-        const {request} = this.props;
         request.on("change", this._checkRequestIsPending);
     }
 
@@ -56,7 +47,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         const {request} = this.props;
-        if (request.ready || request.started || request.done || request.cancelled) {
+        if (request.ready || request.started || request.done || request.cancelled || request.observeOnly) {
             this.props.dismiss();
         }
     };

From b6572f7042c04c0e8afad885d22346fe408716fd Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 3 Jan 2020 08:50:36 +0000
Subject: [PATCH 0183/3235] Translated using Weblate (Bulgarian)

Currently translated at 97.4% (1948 of 2001 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 | 80 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d1aa0dc9a8..7911eb4607 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1884,5 +1884,83 @@
     "in secret storage": "в секретно складиране",
     "Secret storage public key:": "Публичен ключ за секретно складиране:",
     "in account data": "в данни за акаунта",
-    "not stored": "не е складиран"
+    "not stored": "не е складиран",
+    "Backup has a <validity>valid</validity> signature from this user": "Резервното копие има <validity>валиден</validity> подпис за този потребител",
+    "Backup has a <validity>invalid</validity> signature from this user": "Резервното копие има <validity>невалиден</validity> подпис за този потребител",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Резервното копие има подпис от <verify>непознат</verify> потребител с идентификатор %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Резервното копие има подпис от <verify>непознато</verify> устройство с идентификатор %(deviceId)s",
+    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Резервния ключ е съхранен в секретно складиране, но тази функция не е включена на това устройство. Включете кръстосано-подписване от Labs за да промените състоянието на резервното копие на ключа.",
+    "Backup key stored: ": "Резервният ключ е съхранен: ",
+    "Start using Key Backup with Secure Secret Storage": "Започни използване на резервно копие на ключ в защитено секретно складиране",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции <b>%(serverName)s</b> за управление на ботове, приспособления и стикери.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции за управление на ботове, приспособления и стикери.",
+    "Manage integrations": "Управление на интеграциите",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Мениджърът на интеграции получава конфигурационни данни, може да модифицира приспособления, да изпраща покани за стаи и да настройва нива на достъп от ваше име.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Настройте изживяването си с експериментални функции. <a>Научи повече</a>.",
+    "Ignored/Blocked": "Игнорирани/блокирани",
+    "Error adding ignored user/server": "Грешка при добавяне на игнориран потребител/сървър",
+    "Something went wrong. Please try again or view your console for hints.": "Нещо се обърка. Опитайте пак или вижте конзолата за информация какво не е наред.",
+    "Error subscribing to list": "Грешка при абониране за списък",
+    "Please verify the room ID or alias and try again.": "Потвърдете идентификатора или адреса на стаята и опитайте пак.",
+    "Error removing ignored user/server": "Грешка при премахване на игнориран потребител/сървър",
+    "Error unsubscribing from list": "Грешка при отписването от списък",
+    "Please try again or view your console for hints.": "Опитайте пак или вижте конзолата за информация какво не е наред.",
+    "None": "Няма нищо",
+    "Ban list rules - %(roomName)s": "Списък с правила за блокиране - %(roomName)s",
+    "Server rules": "Сървърни правила",
+    "User rules": "Потребителски правила",
+    "You have not ignored anyone.": "Не сте игнорирали никой.",
+    "You are currently ignoring:": "В момента игнорирате:",
+    "You are not subscribed to any lists": "Не сте абонирани към списъци",
+    "Unsubscribe": "Отпиши",
+    "View rules": "Виж правилата",
+    "You are currently subscribed to:": "В момента сте абонирани към:",
+    "⚠ These settings are meant for advanced users.": "⚠ Тези настройки са за напреднали потребители.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Добавете тук потребители или сървъри, които искате да игнорирате. Използвайте звездички за да кажете на Riot да търси съвпадения с всеки символ. Например: <code>@bot:*</code> ще игнорира всички потребители с име 'bot' на кой да е сървър.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Игнорирането на хора става чрез списъци за блокиране, които съдържат правила кой да бъде блокиран. Абонирането към списък за блокиране означава, че сървърите/потребителите блокирани от този списък ще бъдат скрити от вас.",
+    "Personal ban list": "Персонален списък за блокиране",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Персоналния ви списък за блокиране съдържа потребители/сървъри, от които не искате да виждате съобщения. След игнориране на първия потребител/сървър, ще се появи нова стая в списъка със стаи, наречена 'My Ban List' - останете в тази стая за да работи списъкът с блокиране.",
+    "Server or user ID to ignore": "Сървър или потребителски идентификатор за игнориране",
+    "eg: @bot:* or example.org": "напр.: @bot:* или example.org",
+    "Subscribed lists": "Абонирани списъци",
+    "Subscribing to a ban list will cause you to join it!": "Абонирането към списък ще направи така, че да се присъедините към него!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Ако това не е каквото искате, използвайте друг инструмент за игнориране на потребители.",
+    "Room ID or alias of ban list": "Идентификатор или име на стая списък за блокиране",
+    "Subscribe": "Абонирай ме",
+    "Cross-signing": "Кръстосано-подписване",
+    "This user has not verified all of their devices.": "Този потребител не е потвърдил всичките си устройства.",
+    "You have not verified this user. This user has verified all of their devices.": "Не сте потвърдили този потребител. Потребителят е потвърдил всичките си устройства.",
+    "You have verified this user. This user has verified all of their devices.": "Потвърдили сте този потребител. Потребителят е потвърдил всичките си устройства.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Някои потребители в тази стая не са потвърдени от вас или не са потвърдили собствените си устройства.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Всички потребители в тази стая са потвърдени от вас и са потвърдили всичките си устройства.",
+    "This message cannot be decrypted": "Съобщението не може да бъде дешифровано",
+    "Unencrypted": "Нешифровано",
+    "Close preview": "Затвори прегледа",
+    "<userName/> wants to chat": "<userName/> иска да чати",
+    "Start chatting": "Започни чат",
+    "Failed to connect to integration manager": "Неуспешна връзка с мениджъра на интеграции",
+    "Trusted": "Доверени",
+    "Not trusted": "Недоверени",
+    "Hide verified sessions": "Скрий потвърдените сесии",
+    "%(count)s verified sessions|other": "%(count)s потвърдени сесии",
+    "%(count)s verified sessions|one": "1 потвърдена сесия",
+    "Direct message": "Директно съобщение",
+    "Unverify user": "Отпотвърди потребители",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> в%(roomName)s",
+    "Messages in this room are end-to-end encrypted.": "Съобщенията в тази стая са шифровани от край-до-край.",
+    "Verify": "Потвърди",
+    "Security": "Сигурност",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Игнорирали сте този потребител, така че съобщението им е скрито. <a>Покажи така или иначе.</a>",
+    "Reactions": "Реакции",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> реагира с %(content)s</reactedWith>",
+    "Any of the following data may be shared:": "Следните данни може да бъдат споделени:",
+    "Your display name": "Вашето име",
+    "Your avatar URL": "Адреса на профилната ви снимка",
+    "Your user ID": "Потребителския ви идентификатор",
+    "Your theme": "Вашата тема",
+    "Riot URL": "Riot URL адрес",
+    "Room ID": "Идентификатор на стаята",
+    "Widget ID": "Идентификатор на приспособлението",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s и с мениджъра на интеграции.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s."
 }

From c8f9df691b6250d3480b0cacc0bf2736e37f122d Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Thu, 2 Jan 2020 18:15:14 +0000
Subject: [PATCH 0184/3235] Translated using Weblate (Turkish)

Currently translated at 50.8% (1017 of 2001 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 85cfeedd06..a3a178c358 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -963,5 +963,63 @@
     "Don't ask again": "Yeniden sorma",
     "New Recovery Method": "Yeni Kurtarma Yöntemi",
     "Go to Settings": "Ayarlara Git",
-    "Recovery Method Removed": "Kurtarma Yöntemi Silindi"
+    "Recovery Method Removed": "Kurtarma Yöntemi Silindi",
+    "Robot": "Robot",
+    "Hat": "Şapka",
+    "Glasses": "Gözlük",
+    "Umbrella": "Şemsiye",
+    "Hourglass": "Kum saati",
+    "Clock": "Saat",
+    "Gift": "Hediye",
+    "Light bulb": "Ampül",
+    "Book": "Kitap",
+    "Pencil": "Kalem",
+    "Paperclip": "Ataç",
+    "Scissors": "Makas",
+    "Key": "Anahtar",
+    "Hammer": "Çekiç",
+    "Telephone": "Telefon",
+    "Flag": "Bayrak",
+    "Train": "Tren",
+    "Bicycle": "Bisiklet",
+    "Aeroplane": "Uçak",
+    "Rocket": "Füze",
+    "Ball": "Top",
+    "Guitar": "Gitar",
+    "Trumpet": "Trampet",
+    "Bell": "Zil",
+    "Anchor": "Çıpa",
+    "Headphones": "Kulaklık",
+    "Folder": "Klasör",
+    "Accept <policyLink /> to continue:": "Devam etmek için <policyLink /> i kabul ediniz:",
+    "Upload": "Yükle",
+    "on device": "cihaz üstünde",
+    "not found": "bulunamadı",
+    "in account data": "hesap verisinde",
+    "Your homeserver does not support device management.": "Aan sunucunuz aygıt yönetimini desteklemiyor.",
+    "Delete %(count)s devices|other": "%(count)s cihazı silin",
+    "Delete %(count)s devices|one": "Cihaz sil",
+    "ID": "ID",
+    "Connecting to integration manager...": "Entegrasyon yöneticisine bağlanın...",
+    "Cannot connect to integration manager": "Entegrasyon yöneticisine bağlanılamadı",
+    "Delete Backup": "Yedek Sil",
+    "Unable to load key backup status": "Anahtar yedek durumu yüklenemiyor",
+    "Restore from Backup": "Yedekten Geri Dön",
+    "This device is backing up your keys. ": "Bu cihaz anahtarlarınızı yedekliyor. ",
+    "Connect this device to Key Backup": "Anahtar Yedeği için bu cihazı bağlayın",
+    "not stored": "depolanmadı",
+    "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s anahtar yedekleniyor...",
+    "All keys backed up": "Bütün yedekler yedeklendi",
+    "Backup is not signed by any of your devices": "Yedek hiç bir cihazınız tarafından imzalanmadı",
+    "Backup version: ": "Yedek sürümü: ",
+    "Algorithm: ": "Algoritma: ",
+    "Start using Key Backup": "Anahtar Yedekleme kullanmaya başla",
+    "Clear notifications": "Bildirimleri temizle",
+    "Enable desktop notifications for this device": "Bu cihaz için masaüstü bildirimlerini aç",
+    "Show message in desktop notification": "Masaüstü bildiriminde mesaj göster",
+    "Display Name": "Ekran Adı",
+    "Profile picture": "Profil resmi",
+    "Could not connect to Identity Server": "Kimlik Sunucusuna bağlanılamadı",
+    "Checking server": "Sunucu kontrol ediliyor",
+    "Change identity server": "Kimlik sunucu değiştir"
 }

From 99559c5121e5759b6a6801b66db5d13a6f558388 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 3 Jan 2020 13:33:32 +0000
Subject: [PATCH 0185/3235] Update backup restore paths for SSSS

This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
---
 .../keybackup/NewRecoveryMethodDialog.js      | 11 +++--
 src/components/views/dialogs/LogoutDialog.js  |  6 ++-
 .../keybackup/RestoreKeyBackupDialog.js       | 47 +++++++++++++++++--
 .../views/rooms/RoomRecoveryReminder.js       |  6 ++-
 .../views/settings/KeyBackupPanel.js          | 23 +++------
 5 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 28281af771..147f109113 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -1,5 +1,6 @@
 /*
-Copyright 2018-2019 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -40,9 +41,11 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
 
     onSetupClick = async () => {
         const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
-        Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
-            onFinished: this.props.onFinished,
-        });
+        Modal.createTrackedDialog(
+            'Restore Backup', '', RestoreKeyBackupDialog, {
+                onFinished: this.props.onFinished,
+            }, null, /* priority = */ false, /* static = */ true,
+        );
     }
 
     render() {
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 47d4153494..6e4f950830 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -94,7 +95,10 @@ export default class LogoutDialog extends React.Component {
             // verified, so restore the backup which will give us the keys from it and
             // allow us to trust it (ie. upload keys to it)
             const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
-            Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {});
+            Modal.createTrackedDialog(
+                'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+                /* priority = */ false, /* static = */ true,
+            );
         } else {
             Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
                 import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"),
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 45168c381e..2881cc920c 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,17 +16,18 @@ limitations under the License.
 */
 
 import React from 'react';
+import { MatrixClient } from 'matrix-js-sdk';
+
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import Modal from '../../../../Modal';
-
-import { MatrixClient } from 'matrix-js-sdk';
-
 import { _t } from '../../../../languageHandler';
 import {Key} from "../../../../Keyboard";
+import { accessSecretStorage } from '../../../../CrossSigningManager';
 
 const RESTORE_TYPE_PASSPHRASE = 0;
 const RESTORE_TYPE_RECOVERYKEY = 1;
+const RESTORE_TYPE_SECRET_STORAGE = 2;
 
 /*
  * Dialog for restoring e2e keys from a backup and the user's recovery key
@@ -35,6 +37,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         super(props);
         this.state = {
             backupInfo: null,
+            backupKeyStored: null,
             loading: false,
             loadError: null,
             restoreError: null,
@@ -148,6 +151,32 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         }
     }
 
+    async _restoreWithSecretStorage() {
+        this.setState({
+            loading: true,
+            restoreError: null,
+            restoreType: RESTORE_TYPE_SECRET_STORAGE,
+        });
+        try {
+            // `accessSecretStorage` may prompt for storage access as needed.
+            const recoverInfo = await accessSecretStorage(async () => {
+                return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
+                    this.state.backupInfo,
+                );
+            });
+            this.setState({
+                loading: false,
+                recoverInfo,
+            });
+        } catch (e) {
+            console.log("Error restoring backup", e);
+            this.setState({
+                restoreError: e,
+                loading: false,
+            });
+        }
+    }
+
     async _loadBackupStatus() {
         this.setState({
             loading: true,
@@ -155,10 +184,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         });
         try {
             const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored();
+            this.setState({
+                backupInfo,
+                backupKeyStored,
+            });
+
+            // If the backup key is stored, we can proceed directly to restore.
+            if (backupKeyStored) {
+                return this._restoreWithSecretStorage();
+            }
+
             this.setState({
                 loadError: null,
                 loading: false,
-                backupInfo,
             });
         } catch (e) {
             console.log("Error loading backup status", e);
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 6b7366bc4f..495364bf4c 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -70,7 +71,10 @@ export default class RoomRecoveryReminder extends React.PureComponent {
             // verified, so restore the backup which will give us the keys from it and
             // allow us to trust it (ie. upload keys to it)
             const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
-            Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {});
+            Modal.createTrackedDialog(
+                'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+                /* priority = */ false, /* static = */ true,
+            );
         } else {
             Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
                 import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"),
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 559b1e0ba1..55bfadba88 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -181,22 +181,11 @@ export default class KeyBackupPanel extends React.PureComponent {
     }
 
     _restoreBackup = async () => {
-        // Use legacy path if backup key not stored in secret storage
-        if (!this.state.backupKeyStored) {
-            const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
-            Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog);
-            return;
-        }
-
-        try {
-            await accessSecretStorage(async () => {
-                await MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
-                    this.state.backupInfo,
-                );
-            });
-        } catch (e) {
-            console.log("Error restoring backup", e);
-        }
+        const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
+        Modal.createTrackedDialog(
+            'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+            /* priority = */ false, /* static = */ true,
+        );
     }
 
     render() {

From 43e4f2dcc0f5d970bd4b4021a713b58358e213f0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 13:34:43 +0000
Subject: [PATCH 0186/3235] Use deviceTrust when displaying key backup trust
 status

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
---
 src/components/views/settings/KeyBackupPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 559b1e0ba1..9f20288fff 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -270,7 +270,7 @@ export default class KeyBackupPanel extends React.PureComponent {
                         {sub}
                     </span>;
                 const verify = sub =>
-                    <span className={sig.device && sig.device.isVerified() ? 'mx_KeyBackupPanel_deviceVerified' : 'mx_KeyBackupPanel_deviceNotVerified'}>
+                    <span className={sig.device && sig.deviceTrust.isVerified() ? 'mx_KeyBackupPanel_deviceVerified' : 'mx_KeyBackupPanel_deviceNotVerified'}>
                         {sub}
                     </span>;
                 const device = sub => <span className="mx_KeyBackupPanel_deviceName">{deviceName}</span>;

From d5a82a5fc2e9057ec94873e7c5f595ab4c79d569 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 3 Jan 2020 13:45:52 +0000
Subject: [PATCH 0187/3235] Finish sentence in accessSecretStorage docs

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

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index ab0a22e4d5..f3953b1897 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -97,7 +97,7 @@ export const crossSigningCallbacks = {
  *
  * Additionally, the secret storage keys are cached during the scope of this function
  * to ensure the user is prompted only once for their secret storage
- * passphrase. The cache is then
+ * passphrase. The cache is then cleared once the provided function completes.
  *
  * @param {Function} [func] An operation to perform once secret storage has been
  * bootstrapped. Optional.

From 4211ec5063d1e531ffe2938dc2ea0b6088253bf4 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 3 Jan 2020 13:51:42 +0000
Subject: [PATCH 0188/3235] Fix DOM structure in RoomRecoveryReminder

Buttons (which end up as <div>s) aren't allowed inside <p>s.
---
 res/css/views/rooms/_RoomRecoveryReminder.scss     | 1 +
 src/components/views/rooms/RoomRecoveryReminder.js | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_RoomRecoveryReminder.scss b/res/css/views/rooms/_RoomRecoveryReminder.scss
index 68e2bf861e..85d42ca4b4 100644
--- a/res/css/views/rooms/_RoomRecoveryReminder.scss
+++ b/res/css/views/rooms/_RoomRecoveryReminder.scss
@@ -40,4 +40,5 @@ limitations under the License.
 
 .mx_RoomRecoveryReminder_secondary {
     font-size: 90%;
+    margin-top: 1em;
 }
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 495364bf4c..8554c804c0 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -154,14 +154,14 @@ export default class RoomRecoveryReminder extends React.PureComponent {
                         onClick={this.onSetupClick}>
                         {setupCaption}
                     </AccessibleButton>
-                    <p><AccessibleButton className="mx_RoomRecoveryReminder_secondary mx_linkButton"
+                    <AccessibleButton className="mx_RoomRecoveryReminder_secondary mx_linkButton"
                         onClick={this.onOnNotNowClick}>
                         { _t("Not now") }
-                    </AccessibleButton></p>
-                    <p><AccessibleButton className="mx_RoomRecoveryReminder_secondary mx_linkButton"
+                    </AccessibleButton>
+                    <AccessibleButton className="mx_RoomRecoveryReminder_secondary mx_linkButton"
                         onClick={this.onDontAskAgainClick}>
                         { _t("Don't ask me again") }
-                    </AccessibleButton></p>
+                    </AccessibleButton>
                 </div>
             </div>
         );

From 668479d94a477976b4113906b21cce56f01458ac Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 3 Jan 2020 13:57:59 +0000
Subject: [PATCH 0189/3235] Tweak as per git review

---
 .../settings/tabs/room/BridgeSettingsTab.js   | 69 +++++++++----------
 src/i18n/strings/en_EN.json                   |  8 +--
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 82382e7828..9e6bdf8958 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,17 +33,6 @@ export default class BridgeSettingsTab extends React.Component {
         roomId: PropTypes.string.isRequired,
     };
 
-    constructor() {
-        super();
-
-        this.state = {
-        };
-    }
-
-    componentWillMount() {
-
-    }
-
     _renderBridgeCard(event, room) {
         const content = event.getContent();
         if (!content || !content.channel || !content.protocol) {
@@ -56,21 +45,18 @@ export default class BridgeSettingsTab extends React.Component {
 
         let creator = null;
         if (content.creator) {
-            const pill = <Pill
-                type={Pill.TYPE_USER_MENTION}
-                room={room}
-                url={makeUserPermalink(content.creator)}
-                shouldShowPillAvatar={true}
-            />;
-            creator = (<p>{
-                _t("This bridge was provisioned by %(pill)s", {
-                    pill,
-                })
-            } </p>);
+            creator = <p> { _t("This bridge was provisioned by <user />", {}, {
+                    user: <Pill
+                        type={Pill.TYPE_USER_MENTION}
+                        room={room}
+                        url={makeUserPermalink(content.creator)}
+                        shouldShowPillAvatar={true}
+                    />,
+                })}</p>;
         }
 
-        const bot = (<p> {_t("This bridge is managed by the %(pill)s bot user.", {
-            pill: <Pill
+        const bot = (<p> {_t("This bridge is managed by the <user /> bot user.", {}, {
+            user: <Pill
                 type={Pill.TYPE_USER_MENTION}
                 room={room}
                 url={makeUserPermalink(event.getSender())}
@@ -79,20 +65,20 @@ export default class BridgeSettingsTab extends React.Component {
         })} </p>);
         let channelLink = channelName;
         if (channel.external_url) {
-            channelLink = <a target="_blank" href={channel.external_url}>{channelName}</a>;
+            channelLink = <a target="_blank" href={channel.external_url} rel="noopener">{channelName}</a>;
         }
 
         let networkLink = networkName;
         if (network && network.external_url) {
-            networkLink = <a target="_blank" href={network.external_url}>{networkName}</a>;
+            networkLink = <a target="_blank" href={network.external_url} rel="noopener">{networkName}</a>;
         }
 
         const chanAndNetworkInfo = (
-            (_t("Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s", {
+            _t("Bridged into <channelLink /> <networkLink />, on <protocolName />", {}, {
                 channelLink,
                 networkLink,
                 protocolName,
-            }))
+            })
         );
 
         let networkIcon = null;
@@ -101,9 +87,13 @@ export default class BridgeSettingsTab extends React.Component {
                 MatrixClientPeg.get().getHomeserverUrl(),
                 network.avatar, 32, 32, "crop",
             );
-            networkIcon = <BaseAvatar width={32} height={32} resizeMethod='crop'
-                            name={ networkName } idName={ networkName }
-                            url={ avatarUrl } />;
+            networkIcon = <BaseAvatar
+                              width={32}
+                              height={32}
+                              resizeMethod='crop'
+                              name={ networkName }
+                              idName={ networkName }
+                              url={ avatarUrl } />;
         }
 
         let channelIcon = null;
@@ -112,13 +102,16 @@ export default class BridgeSettingsTab extends React.Component {
                 MatrixClientPeg.get().getHomeserverUrl(),
                 channel.avatar, 32, 32, "crop",
             );
-            console.log(channel.avatar);
-            channelIcon = <BaseAvatar width={32} height={32} resizeMethod='crop'
-                            name={ networkName } idName={ networkName }
-                            url={ avatarUrl } />;
+            channelIcon = <BaseAvatar
+                              width={32}
+                              height={32}
+                              resizeMethod='crop'
+                              name={ networkName }
+                              idName={ networkName }
+                              url={ avatarUrl } />;
         }
 
-        const heading = _t("Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s", {
+        const heading = _t("Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />", { }, {
             channelIcon,
             channelName,
             networkName,
@@ -127,7 +120,7 @@ export default class BridgeSettingsTab extends React.Component {
 
         return (<li key={event.stateKey}>
             <div>
-                <h3> {heading} </h3>
+                <h3>{heading}</h3>
                 <p>{_t("Connected via %(protocolName)s", { protocolName })}</p>
                 <details>
                     {creator}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6fcfd2eb95..1f66891857 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -763,10 +763,10 @@
     "Room version:": "Room version:",
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
-    "This bridge was provisioned by %(pill)s": "This bridge was provisioned by %(pill)s",
-    "This bridge is managed by the %(pill)s bot user.": "This bridge is managed by the %(pill)s bot user.",
-    "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s": "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s",
-    "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s": "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s",
+    "This bridge was provisioned by <user />": "This bridge was provisioned by <user />",
+    "This bridge is managed by the <user /> bot user.": "This bridge is managed by the <user /> bot user.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridged into <channelLink /> <networkLink />, on <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "Connected via %(protocolName)s",
     "Bridge Info": "Bridge Info",
     "Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",

From 831053de112921eaffafac5d94933e0e6dcc6a88 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 3 Jan 2020 13:58:07 +0000
Subject: [PATCH 0190/3235] Make bridge info cards more obvious

---
 res/css/views/dialogs/_RoomSettingsDialog.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 4b13684d9f..aa66e97f9e 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -62,8 +62,10 @@ limitations under the License.
 
 .mx_RoomSettingsDialog_BridgeList li {
     list-style-type: none;
-    padding: 0;
-    margin: 0;
-    border-bottom: 1px solid $panel-divider-color;
+    padding: 5px;
+    margin-bottom: 5px;
+    border-width: 1px 0px;
+    border-color: #dee1f3;
+    border-style: solid;
 }
 

From 50e19ba43d64e168e670e4657153f9359477bcb6 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 3 Jan 2020 14:04:59 +0000
Subject: [PATCH 0191/3235] User may not be a bot, therefore do not imply it.

---
 src/components/views/settings/tabs/room/BridgeSettingsTab.js | 2 +-
 src/i18n/strings/en_EN.json                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 9e6bdf8958..c3c85ec31c 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -55,7 +55,7 @@ export default class BridgeSettingsTab extends React.Component {
                 })}</p>;
         }
 
-        const bot = (<p> {_t("This bridge is managed by the <user /> bot user.", {}, {
+        const bot = (<p> {_t("This bridge is managed by <user />.", {}, {
             user: <Pill
                 type={Pill.TYPE_USER_MENTION}
                 room={room}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1f66891857..cb7c629aaa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -764,7 +764,7 @@
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
     "This bridge was provisioned by <user />": "This bridge was provisioned by <user />",
-    "This bridge is managed by the <user /> bot user.": "This bridge is managed by the <user /> bot user.",
+    "This bridge is managed by <user />.": "This bridge is managed by <user />.",
     "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridged into <channelLink /> <networkLink />, on <protocolName />",
     "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "Connected via %(protocolName)s",

From 0b16f862e97b79a72acf0f4c7ce19e6a9f55ef4a Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 3 Jan 2020 14:51:20 +0000
Subject: [PATCH 0192/3235] Translated using Weblate (Bulgarian)

Currently translated at 97.8% (1956 of 2001 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 7911eb4607..2c53a45fc2 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1962,5 +1962,13 @@
     "Room ID": "Идентификатор на стаята",
     "Widget ID": "Идентификатор на приспособлението",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s и с мениджъра на интеграции.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s."
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Приспособленията не използваш шифроване на съобщенията.",
+    "Widget added by": "Приспособлението е добавено от",
+    "This widget may use cookies.": "Това приспособление може да използва бисквитки.",
+    "More options": "Още опции",
+    "Language Dropdown": "Избор на език",
+    "Integrations are disabled": "Интеграциите са изключени",
+    "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.",
+    "Integrations not allowed": "Интеграциите не са разрешени"
 }

From 5897c8ca7ff5c20ef9f027097c6dae3735d52887 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 15:00:51 +0000
Subject: [PATCH 0193/3235] Remove 'unverify' from UserInfoPanel

It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
---
 src/components/views/right_panel/UserInfo.js | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 208c5e8906..809fdcb6d7 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -74,17 +74,6 @@ const _getE2EStatus = (cli, userId, devices) => {
     return "warning";
 };
 
-async function unverifyUser(matrixClient, userId) {
-    const devices = await matrixClient.getStoredDevicesForUser(userId);
-    for (const device of devices) {
-        if (device.isVerified()) {
-            matrixClient.setDeviceVerified(
-                userId, device.deviceId, false,
-            );
-        }
-    }
-}
-
 function openDMForUser(matrixClient, userId) {
     const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
     const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
@@ -331,14 +320,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
             </AccessibleButton>
         );
     }
-    let unverifyButton;
-    if (devices && devices.some(device => device.isVerified())) {
-        unverifyButton = (
-            <AccessibleButton onClick={() => unverifyUser(cli, member.userId)} className="mx_UserInfo_field mx_UserInfo_destructive">
-                { _t('Unverify user') }
-            </AccessibleButton>
-        );
-    }
 
     return (
         <div className="mx_UserInfo_container">
@@ -350,7 +331,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
                 { insertPillButton }
                 { inviteUserButton }
                 { ignoreButton }
-                { unverifyButton }
             </div>
         </div>
     );

From 5faae1d2f2a0425997c08d5f03b9be80eb136152 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 15:05:41 +0000
Subject: [PATCH 0194/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6979759cd2..2065454525 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1114,7 +1114,6 @@
     "%(count)s verified sessions|other": "%(count)s verified sessions",
     "%(count)s verified sessions|one": "1 verified session",
     "Direct message": "Direct message",
-    "Unverify user": "Unverify user",
     "Remove from community": "Remove from community",
     "Disinvite this user from community?": "Disinvite this user from community?",
     "Remove this user from community?": "Remove this user from community?",

From 2970a9faaffde5f4eb22b33d15d481c9e83501ec Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 15:16:02 +0000
Subject: [PATCH 0195/3235] Don't fail if logs exists and is an empty dir

---
 scripts/ci/end-to-end-tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index ae88ef70c7..a592888292 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -36,7 +36,8 @@ echo "--- Install synapse & other dependencies"
 ./install.sh
 # install static webserver to server symlinked local copy of riot
 ./riot/install-webserver.sh
-mkdir logs || rm -r logs/*
+rm -r logs || true
+mkdir logs
 echo "+++ Running end-to-end tests"
 TESTS_STARTED=1
 ./run.sh --no-sandbox --log-directory logs/

From 731279ab2d0de023743b16fdcefde385f722232d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 3 Jan 2020 14:53:05 +0000
Subject: [PATCH 0196/3235] Translated using Weblate (Bulgarian)

Currently translated at 99.2% (1985 of 2001 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 | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 2c53a45fc2..5744640ec8 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1967,8 +1967,37 @@
     "Widget added by": "Приспособлението е добавено от",
     "This widget may use cookies.": "Това приспособление може да използва бисквитки.",
     "More options": "Още опции",
-    "Language Dropdown": "Избор на език",
+    "Language Dropdown": "Падащо меню за избор на език",
     "Integrations are disabled": "Интеграциите са изключени",
     "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.",
-    "Integrations not allowed": "Интеграциите не са разрешени"
+    "Integrations not allowed": "Интеграциите не са разрешени",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Вашият Riot не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.",
+    "Automatically invite users": "Автоматично кани потребители",
+    "Upgrade private room": "Обнови лична стая",
+    "Upgrade public room": "Обнови публична стая",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Обновяването на стая е действие за напреднали и обикновено се препоръчва когато стаята е нестабилна поради бъгове, липсващи функции или проблеми със сигурността.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Това обикновено влия само на това как стаята се обработва на сървъра. Ако имате проблеми с Riot, <a>съобщете за проблем</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ще обновите стаята от <oldVersion /> до <newVersion />.",
+    "Upgrade": "Обнови",
+    "Enter secret storage passphrase": "Въведете парола за секретно складиране",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Неуспешен достъп до секретно складиране. Уверете се, че сте въвели правилната парола.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Внимание</b>: Трябва да достъпвате секретно складиране само от доверен компютър.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Въведете парола за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ако сте забравили паролата си, може да <button1>използвате ключ за възстановяване</button1> или да <button2>настройте опции за възстановяване</button2>.",
+    "Enter secret storage recovery key": "Въведете ключ за възстановяване на секретно складиране",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Неуспешен достъп до секретно складиране. Подсигурете се, че сте въвели правилния ключ за възстановяване.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Въведете ключа за възстановяване за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Ако сте забравили ключа си за възстановяване, може да <button>настройте нови опции за възстановяване</button>.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Внимание</b>: Трябва да настройвате резервно копие на ключове само от доверен компютър.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ако сте забравили ключа за възстановяване, може да <button>настройте нови опции за възстановяване</button>",
+    "Notification settings": "Настройки на уведомленията",
+    "Help": "Помощ",
+    "Reload": "Презареди",
+    "Take picture": "Направи снимка",
+    "Remove for everyone": "Премахни за всички",
+    "Remove for me": "Премахни за мен",
+    "User Status": "Потребителски статус",
+    "Country Dropdown": "Падащо меню за избор на държава",
+    "Verification Request": "Заявка за потвърждение",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
 }

From b8683462e8f0bee0654defe92883e36ef99cef44 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 3 Jan 2020 15:34:03 +0000
Subject: [PATCH 0197/3235] Update backup creation paths for SSSS

This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
---
 .../keybackup/CreateKeyBackupDialog.js        | 53 ++++++++++++++++---
 .../keybackup/RecoveryMethodRemovedDialog.js  |  2 +
 src/components/views/dialogs/LogoutDialog.js  |  1 +
 .../keybackup/RestoreKeyBackupDialog.js       |  2 +-
 .../views/rooms/RoomRecoveryReminder.js       |  1 +
 .../views/settings/KeyBackupPanel.js          | 34 ++++--------
 6 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3fac00c1b3..19720e077a 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,11 +17,14 @@ limitations under the License.
 
 import React from 'react';
 import FileSaver from 'file-saver';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../../index';
 import MatrixClientPeg from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
+import { accessSecretStorage } from '../../../../CrossSigningManager';
+import SettingsStore from '../../../../../lib/settings/SettingsStore';
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -49,10 +52,20 @@ function selectText(target) {
  * on the server.
  */
 export default class CreateKeyBackupDialog extends React.PureComponent {
+    static propTypes = {
+        secureSecretStorage: PropTypes.bool,
+        onFinished: PropTypes.func.isRequired,
+    }
+
     constructor(props) {
         super(props);
 
+        this._recoveryKeyNode = null;
+        this._keyBackupInfo = null;
+        this._setZxcvbnResultTimeout = null;
+
         this.state = {
+            secureSecretStorage: props.secureSecretStorage,
             phase: PHASE_PASSPHRASE,
             passPhrase: '',
             passPhraseConfirm: '',
@@ -61,12 +74,25 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             zxcvbnResult: null,
             setPassPhrase: false,
         };
+
+        if (this.state.secureSecretStorage === undefined) {
+            this.state.secureSecretStorage =
+                SettingsStore.isFeatureEnabled("feature_cross_signing");
+        }
+
+        // If we're using secret storage, skip ahead to the backing up step, as
+        // `accessSecretStorage` will handle passphrases as needed.
+        if (this.state.secureSecretStorage) {
+            this.state.phase = PHASE_BACKINGUP;
+        }
     }
 
-    componentWillMount() {
-        this._recoveryKeyNode = null;
-        this._keyBackupInfo = null;
-        this._setZxcvbnResultTimeout = null;
+    componentDidMount() {
+        // If we're using secret storage, skip ahead to the backing up step, as
+        // `accessSecretStorage` will handle passphrases as needed.
+        if (this.state.secureSecretStorage) {
+            this._createBackup();
+        }
     }
 
     componentWillUnmount() {
@@ -103,15 +129,26 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     }
 
     _createBackup = async () => {
+        const { secureSecretStorage } = this.state;
         this.setState({
             phase: PHASE_BACKINGUP,
             error: null,
         });
         let info;
         try {
-            info = await MatrixClientPeg.get().createKeyBackupVersion(
-                this._keyBackupInfo,
-            );
+            if (secureSecretStorage) {
+                await accessSecretStorage(async () => {
+                    info = await MatrixClientPeg.get().prepareKeyBackupVersion(
+                        null /* random key */,
+                        { secureSecretStorage: true },
+                    );
+                    info = await MatrixClientPeg.get().createKeyBackupVersion(info);
+                });
+            } else {
+                info = await MatrixClientPeg.get().createKeyBackupVersion(
+                    this._keyBackupInfo,
+                );
+            }
             await MatrixClientPeg.get().scheduleAllGroupSessionsForBackup();
             this.setState({
                 phase: PHASE_DONE,
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 1975fbe6d6..4383908e23 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,6 +36,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
         this.props.onFinished();
         Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
             import("./CreateKeyBackupDialog"),
+            null, null, /* priority = */ false, /* static = */ true,
         );
     }
 
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 6e4f950830..ede03f13cc 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -102,6 +102,7 @@ export default class LogoutDialog extends React.Component {
         } else {
             Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
                 import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"),
+                null, null, /* priority = */ false, /* static = */ true,
             );
         }
 
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 2881cc920c..106d8cd6f8 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -76,7 +76,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 onFinished: () => {
                     this._loadBackupStatus();
                 },
-            },
+            }, null, /* priority = */ false, /* static = */ true,
         );
     }
 
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 8554c804c0..aa8134d680 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -78,6 +78,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
         } else {
             Modal.createTrackedDialogAsync("Key Backup", "Key Backup",
                 import("../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog"),
+                null, null, /* priority = */ false, /* static = */ true,
             );
         }
     }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 55bfadba88..765dd16717 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -128,36 +128,24 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
+                secureSecretStorage: false,
                 onFinished: () => {
                     this._loadBackupStatus();
                 },
-            },
+            }, null, /* priority = */ false, /* static = */ true,
         );
     }
 
     _startNewBackupWithSecureSecretStorage = async () => {
-        const cli = MatrixClientPeg.get();
-        let info;
-        try {
-            await accessSecretStorage(async () => {
-                info = await cli.prepareKeyBackupVersion(
-                    null /* random key */,
-                    { secureSecretStorage: true },
-                );
-                info = await cli.createKeyBackupVersion(info);
-            });
-            await MatrixClientPeg.get().scheduleAllGroupSessionsForBackup();
-            this._loadBackupStatus();
-        } catch (e) {
-            console.error("Error creating key backup", e);
-            // TODO: If creating a version succeeds, but backup fails, should we
-            // delete the version, disable backup, or do nothing?  If we just
-            // disable without deleting, we'll enable on next app reload since
-            // it is trusted.
-            if (info && info.version) {
-                MatrixClientPeg.get().deleteKeyBackupVersion(info.version);
-            }
-        }
+        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+            import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+            {
+                secureSecretStorage: true,
+                onFinished: () => {
+                    this._loadBackupStatus();
+                },
+            }, null, /* priority = */ false, /* static = */ true,
+        );
     }
 
     _deleteBackup = () => {

From 2125bcf5a67d37142615b839d5c67cd0e77c082f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 3 Jan 2020 15:38:59 +0000
Subject: [PATCH 0198/3235] Comment remaining non-cross-signing-compliant
 components

Fixes https://github.com/vector-im/riot-web/issues/11748
---
 src/async-components/views/dialogs/EncryptedEventDialog.js | 3 +++
 src/components/views/elements/DeviceVerifyButtons.js       | 2 ++
 src/components/views/rooms/MemberDeviceInfo.js             | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 15bb1e046b..ea3c109e05 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -23,6 +23,9 @@ import { _t } from '../../../languageHandler';
 const sdk = require('../../../index');
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 
+// XXX: This component is not cross-signing aware.
+// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
+// component or taking it out to pasture.
 module.exports = createReactClass({
     displayName: 'EncryptedEventDialog',
 
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index bb08f8b234..14b4ad1760 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -22,6 +22,8 @@ import sdk from '../../../index';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 
+// XXX: This component is *not* cross-signing aware. Once everything is
+// cross-signing, this component should just go away.
 export default createReactClass({
     displayName: 'DeviceVerifyButtons',
 
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index ff88c6f6e6..ba90850b35 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -23,6 +23,8 @@ import classNames from 'classnames';
 export default class MemberDeviceInfo extends React.Component {
     render() {
         const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
+        // XXX: These checks are not cross-signing aware but this component is only used
+        // from the old, pre-cross-signing memberinfopanel
         const iconClasses = classNames({
             mx_MemberDeviceInfo_icon: true,
             mx_MemberDeviceInfo_icon_blacklisted: this.props.device.isBlocked(),

From e12ed04da8cf2914f002a599ec0d9e5ca079434d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 3 Jan 2020 15:59:14 +0000
Subject: [PATCH 0199/3235] Remove unused import

---
 src/components/views/settings/KeyBackupPanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 765dd16717..30d0416968 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -22,7 +22,6 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import SettingsStore from '../../../../lib/settings/SettingsStore';
-import { accessSecretStorage } from '../../../CrossSigningManager';
 
 export default class KeyBackupPanel extends React.PureComponent {
     constructor(props) {

From 33d35c83ba2cd472f0ade060a5162c1c6f2d6306 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 3 Jan 2020 15:42:11 +0000
Subject: [PATCH 0200/3235] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (2000 of 2000 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5744640ec8..e179c9d61b 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1999,5 +1999,21 @@
     "User Status": "Потребителски статус",
     "Country Dropdown": "Падащо меню за избор на държава",
     "Verification Request": "Заявка за потвърждение",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)"
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Секретно Складиране ще бъде настроено със съществуващия ви резервен ключ. Паролата и ключа за секретно складиране ще бъдат същите каквито са за резервно складиране",
+    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Внимание</b>: Желателно е да настройвате секретно складиране само от доверен компютър.",
+    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Ще използваме секретно складиране за да предоставим опцията да се съхрани шифровано копие на идентичността ви за кръстосано-подписване, за потвърждаване на други устройства и ключове. Защитете достъпа си до шифровани съобщения с парола за да е защитено.",
+    "Set up with a recovery key": "Настрой с ключ за възстановяване",
+    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Като предпазна мярка, ако забравите паролата, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
+    "As a safety net, you can use it to restore your access to encrypted messages.": "Като предпазна мярка, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
+    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Съхранявайте ключа за възстановяване на сигурно място, като в password manager (или сейф).",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ключа за възстановяване беше <b>копиран в клиборд</b>, поставете го в:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Ключа за възстановяване е във вашата папка <b>Изтегляния</b>.",
+    "Your access to encrypted messages is now protected.": "Достъпът ви до шифровани съобщения вече е защитен.",
+    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Без настройка на секретно складиране, ако излезе от профила или използвате друго устройство, няма да можете да възстановите достъпа до шифровани съобщения или идентичността за кръстосано-подписване за потвърждаване на други устройства.",
+    "Set up secret storage": "Настрой секретно складиране",
+    "Migrate from Key Backup": "Мигрирай от резервно копие на ключове",
+    "Secure your encrypted messages with a passphrase": "Защитете шифрованите съобщения с парола",
+    "Storing secrets...": "Складиране на тайни...",
+    "Unable to set up secret storage": "Неуспешна настройка на секретно складиране"
 }

From 752482964a4c5ce98825011c4797bf4c878b58d5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 10:24:07 -0700
Subject: [PATCH 0201/3235] Purify the components

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 6456ef7083..ff498e3e75 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -29,7 +29,7 @@ import * as humanize from "humanize";
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
 
-class DMRoomTile extends React.Component {
+class DMRoomTile extends React.PureComponent {
     static propTypes = {
         member: PropTypes.object.isRequired,
         lastActiveTs: PropTypes.number,
@@ -70,7 +70,7 @@ class DMRoomTile extends React.Component {
     }
 }
 
-export default class DMInviteDialog extends React.Component {
+export default class DMInviteDialog extends React.PureComponent {
     static propTypes = {
         // Takes an array of user IDs/emails to invite.
         onFinished: PropTypes.func.isRequired,

From 9edc361afc283961be02abc7b139a66e062d5ad5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 12:29:22 -0700
Subject: [PATCH 0202/3235] Use new imports for js-sdk's ContentRepo

Per https://github.com/matrix-org/matrix-js-sdk/pull/1134/commits/f4d1c5c006027962cd18dffb3f7c521d9e24e831
---
 src/Avatar.js                               | 4 ++--
 src/components/structures/RoomDirectory.js  | 4 ++--
 src/components/views/avatars/RoomAvatar.js  | 4 ++--
 src/components/views/rooms/RoomDetailRow.js | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 6d31959718..1039ab1bb1 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 'use strict';
-import {ContentRepo} from 'matrix-js-sdk';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 export function avatarUrlForMember(member, width, height, resizeMethod) {
     let url = member.getAvatarUrl(
@@ -38,7 +38,7 @@ export function avatarUrlForMember(member, width, height, resizeMethod) {
 }
 
 export function avatarUrlForUser(user, width, height, resizeMethod) {
-    const url = ContentRepo.getHttpUriForMxc(
+    const url = getHttpUriForMxc(
         MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
         Math.floor(width * window.devicePixelRatio),
         Math.floor(height * window.devicePixelRatio),
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index e06c00902b..d783c8cc3f 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-import {ContentRepo} from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import dis from "../../dispatcher";
@@ -28,6 +27,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 160;
@@ -463,7 +463,7 @@ export default createReactClass({
             topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
         }
         topic = linkifyAndSanitizeHtml(topic);
-        const avatarUrl = ContentRepo.getHttpUriForMxc(
+        const avatarUrl = getHttpUriForMxc(
                                 MatrixClientPeg.get().getHomeserverUrl(),
                                 room.avatar_url, 32, 32, "crop",
                             );
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 3b51fae4b3..c79e1827da 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -16,11 +16,11 @@ limitations under the License.
 import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import {ContentRepo} from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
 import * as sdk from "../../../index";
 import * as Avatar from '../../../Avatar';
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 export default createReactClass({
     displayName: 'RoomAvatar',
@@ -82,7 +82,7 @@ export default createReactClass({
 
     getImageUrls: function(props) {
         return [
-            ContentRepo.getHttpUriForMxc(
+            getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.oobData.avatarUrl,
                 Math.floor(props.width * window.devicePixelRatio),
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 66ec733061..2210406c18 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -18,10 +18,10 @@ import * as sdk from '../../../index';
 import React, {createRef} from 'react';
 import { _t } from '../../../languageHandler';
 import { linkifyElement } from '../../../HtmlUtils';
-import { ContentRepo } from 'matrix-js-sdk';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
@@ -101,7 +101,7 @@ export default createReactClass({
             <td className="mx_RoomDirectory_roomAvatar">
                 <BaseAvatar width={24} height={24} resizeMethod='crop'
                     name={name} idName={name}
-                    url={ContentRepo.getHttpUriForMxc(
+                    url={getHttpUriForMxc(
                             MatrixClientPeg.get().getHomeserverUrl(),
                             room.avatarUrl, 24, 24, "crop")} />
             </td>

From 206d4c78d2a3c943fd3d1ab6980061e4fb38a1ce Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 12:32:29 -0700
Subject: [PATCH 0203/3235] Fix references to 'this' in Avatar and Unread

---
 src/Avatar.js | 2 +-
 src/Unread.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 3377849eca..70be0a4684 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -32,7 +32,7 @@ export function avatarUrlForMember(member, width, height, resizeMethod) {
         // member can be null here currently since on invites, the JS SDK
         // does not have enough info to build a RoomMember object for
         // the inviter.
-        url = this.defaultAvatarUrlForString(member ? member.userId : '');
+        url = defaultAvatarUrlForString(member ? member.userId : '');
     }
     return url;
 }
diff --git a/src/Unread.js b/src/Unread.js
index c2eaa468f5..dba8be492d 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -77,7 +77,7 @@ export function doesRoomHaveUnreadMessages(room) {
             // that counts and we can stop looking because the user's read
             // this and everything before.
             return false;
-        } else if (!shouldHideEvent(ev) && this.eventTriggersUnreadCount(ev)) {
+        } else if (!shouldHideEvent(ev) && eventTriggersUnreadCount(ev)) {
             // We've found a message that counts before we hit
             // the user's read receipt, so this room is definitely unread.
             return true;

From 31d5617c97e34deda775a05c1e0337f2c7bd23d8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 19:41:06 -0700
Subject: [PATCH 0204/3235] Add suggestions for which users to invite to chat

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

Note this doesn't implement the entire algorithm in 11198 because it feels too complicated at this stage. Instead, the idea is to review the suggestions closer to when the whole dialog is complete and fix them then: https://github.com/vector-im/riot-web/issues/11769

Algorithm for picking members is largely based on https://github.com/matrix-org/matrix-react-sdk/commit/db5218e19a26b650d4af37de81f516c68ab7e9b8
---
 .../views/dialogs/DMInviteDialog.js           | 91 ++++++++++++++++---
 src/i18n/strings/en_EN.json                   |  3 +-
 2 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index ff498e3e75..bdeae6bc3e 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -23,6 +23,7 @@ import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/lib/matrix";
 import * as humanize from "humanize";
+import SdkConfig from "../../../SdkConfig";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -36,10 +37,6 @@ class DMRoomTile extends React.PureComponent {
         onToggle: PropTypes.func.isRequired,
     };
 
-    constructor() {
-        super();
-    }
-
     _onClick = (e) => {
         // Stop the browser from highlighting text
         e.preventDefault();
@@ -84,6 +81,8 @@ export default class DMInviteDialog extends React.PureComponent {
             filterText: "",
             recents: this._buildRecents(),
             numRecentsShown: INITIAL_ROOMS_SHOWN,
+            suggestions: this._buildSuggestions(),
+            numSuggestionsShown: INITIAL_ROOMS_SHOWN,
         };
     }
 
@@ -109,6 +108,59 @@ export default class DMInviteDialog extends React.PureComponent {
         return recents;
     }
 
+    _buildSuggestions(): {userId: string, user: RoomMember} {
+        const maxConsideredMembers = 200;
+        const client = MatrixClientPeg.get();
+        const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
+        const joinedRooms = client.getRooms()
+            .filter(r => r.getMyMembership() === 'join')
+            .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
+        const memberRooms = joinedRooms.reduce((members, room) => {
+            const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
+            for (const member of joinedMembers) {
+                if (!members[member.userId]) {
+                    members[member.userId] = {
+                        member: member,
+                        // Track the room size of the 'picked' member so we can use the profile of
+                        // the smallest room (likely a DM).
+                        pickedMemberRoomSize: room.getJoinedMemberCount(),
+                        rooms: [],
+                    };
+                }
+
+                members[member.userId].rooms.push(room);
+
+                if (room.getJoinedMemberCount() < members[member.userId].pickedMemberRoomSize) {
+                    members[member.userId].member = member;
+                    members[member.userId].pickedMemberRoomSize = room.getJoinedMemberCount();
+                }
+            }
+            return members;
+        }, {/* userId => {member, rooms[]} */});
+        const memberScores = Object.values(memberRooms).reduce((scores, entry) => {
+            const numMembersTotal = entry.rooms.reduce((c, r) => c + r.getJoinedMemberCount(), 0);
+            const maxRange = maxConsideredMembers * entry.rooms.length;
+            scores[entry.member.userId] = {
+                member: entry.member,
+                numRooms: entry.rooms.length,
+                score: Math.max(0, Math.pow(1 - (numMembersTotal / maxRange), 5)),
+            };
+            return scores;
+        }, {/* userId => {member, numRooms, score} */});
+        const members = Object.values(memberScores);
+        members.sort((a, b) => {
+            if (a.score === b.score) {
+                if (a.numRooms === b.numRooms) {
+                    return a.member.userId.localeCompare(b.member.userId);
+                }
+
+                return b.numRooms - a.numRooms;
+            }
+            return b.score - a.score;
+        });
+        return members.map(m => ({userId: m.userId, user: m.member}));
+    }
+
     _startDm = () => {
         this.props.onFinished(this.state.targets);
     };
@@ -125,6 +177,10 @@ export default class DMInviteDialog extends React.PureComponent {
         this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN});
     };
 
+    _showMoreSuggestions = () => {
+        this.setState({numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN});
+    };
+
     _toggleMember = (userId) => {
         const targets = this.state.targets.map(t => t); // cheap clone for mutation
         const idx = targets.indexOf(userId);
@@ -133,29 +189,39 @@ export default class DMInviteDialog extends React.PureComponent {
         this.setState({targets});
     };
 
-    _renderRecents() {
-        if (!this.state.recents || this.state.recents.length === 0) return null;
+    _renderSection(kind: "recents"|"suggestions") {
+        const sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
+        let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
+        const showMoreFn = kind === 'recents' ? this._showMoreRecents.bind(this) : this._showMoreSuggestions.bind(this);
+        const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
+        const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
+
+        if (!sourceMembers || sourceMembers.length === 0) return null;
+
+        // If we're going to hide one member behind 'show more', just use up the space of the button
+        // with the member's tile instead.
+        if (showNum === sourceMembers.length - 1) showNum++;
 
         // .slice() will return an incomplete array but won't error on us if we go too far
-        const toRender = this.state.recents.slice(0, this.state.numRecentsShown);
-        const hasMore = toRender.length < this.state.recents.length;
+        const toRender = sourceMembers.slice(0, showNum);
+        const hasMore = toRender.length < sourceMembers.length;
 
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         let showMore = null;
         if (hasMore) {
             showMore = (
-                <AccessibleButton onClick={this._showMoreRecents} kind="link">
+                <AccessibleButton onClick={showMoreFn} kind="link">
                     {_t("Show more")}
                 </AccessibleButton>
             );
         }
 
         const tiles = toRender.map(r => (
-            <DMRoomTile member={r.user} lastActiveTs={r.lastActive} key={r.userId} onToggle={this._toggleMember} />
+            <DMRoomTile member={r.user} lastActiveTs={lastActive(r)} key={r.userId} onToggle={this._toggleMember} />
         ));
         return (
             <div className='mx_DMInviteDialog_section'>
-                <h3>{_t("Recent Conversations")}</h3>
+                <h3>{sectionName}</h3>
                 {tiles}
                 {showMore}
             </div>
@@ -209,7 +275,8 @@ export default class DMInviteDialog extends React.PureComponent {
                             {_t("Go")}
                         </AccessibleButton>
                     </div>
-                    {this._renderRecents()}
+                    {this._renderSection('recents')}
+                    {this._renderSection('suggestions')}
                 </div>
             </BaseDialog>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cac3f2f619..4666a1fe9d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1431,8 +1431,9 @@
     "View Servers in Room": "View Servers in Room",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
-    "Show more": "Show more",
     "Recent Conversations": "Recent Conversations",
+    "Suggestions": "Suggestions",
+    "Show more": "Show more",
     "Direct Messages": "Direct Messages",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",

From df25a988104a978b23cc3aa45ae739c97cfe31ef Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 20:35:30 -0700
Subject: [PATCH 0205/3235] Implement basic filtering for invite targets

Part of https://github.com/vector-im/riot-web/issues/11200
---
 res/css/views/dialogs/_DMInviteDialog.scss    |  4 +
 src/HtmlUtils.js                              |  5 ++
 .../views/dialogs/DMInviteDialog.js           | 75 +++++++++++++++++--
 3 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index 1153ecb0d4..364c796f16 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -77,5 +77,9 @@ limitations under the License.
         float: right;
         line-height: 36px; // Height of the avatar to keep the time vertically aligned
     }
+
+    .mx_DMInviteDialog_roomTile_highlight {
+        font-weight: 900;
+    }
 }
 
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 7cdff26a21..ce677e6c68 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -528,3 +528,8 @@ export function checkBlockNode(node) {
             return false;
     }
 }
+
+export function htmlEntitiesEncode(str: string) {
+    // Source: https://stackoverflow.com/a/18750001/7037379
+    return str.replace(/[\u00A0-\u9999<>&]/gim, i => `&#${i.charCodeAt(0)};`);
+}
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index bdeae6bc3e..ba3221d632 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -24,6 +24,7 @@ import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/lib/matrix";
 import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
+import {htmlEntitiesEncode} from "../../../HtmlUtils";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -35,6 +36,7 @@ class DMRoomTile extends React.PureComponent {
         member: PropTypes.object.isRequired,
         lastActiveTs: PropTypes.number,
         onToggle: PropTypes.func.isRequired,
+        highlightWord: PropTypes.string,
     };
 
     _onClick = (e) => {
@@ -45,6 +47,44 @@ class DMRoomTile extends React.PureComponent {
         this.props.onToggle(this.props.member.userId);
     };
 
+    _highlightName(str: string) {
+        if (!this.props.highlightWord) return str;
+
+        // First encode the thing to avoid injection
+        str = htmlEntitiesEncode(str);
+
+        // We convert things to lowercase for index searching, but pull substrings from
+        // the submitted text to preserve case.
+        const lowerStr = str.toLowerCase();
+        const filterStr = this.props.highlightWord.toLowerCase();
+
+        const result = [];
+
+        let i = 0;
+        let ii;
+        while ((ii = lowerStr.indexOf(filterStr, i)) >= 0) {
+            // Push any text we missed (first bit/middle of text)
+            if (ii > i) {
+                // Push any text we aren't highlighting (middle of text match)
+                result.push(<span key={i + 'mid'}>{str.substring(i, ii)}</span>);
+            }
+
+            i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching)
+
+            // Highlight the word the user entered
+            const substr = str.substring(i, filterStr.length + i);
+            result.push(<span className='mx_DMInviteDialog_roomTile_highlight' key={i + 'bold'}>{substr}</span>);
+            i += substr.length;
+        }
+
+        // Push any text we missed (end of text)
+        if (i < (str.length - 1)) {
+            result.push(<span key={i + 'end'}>{str.substring(i)}</span>);
+        }
+
+        return result;
+    }
+
     render() {
         const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
 
@@ -59,8 +99,8 @@ class DMRoomTile extends React.PureComponent {
         return (
             <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
                 <MemberAvatar member={this.props.member} width={36} height={36} />
-                <span className='mx_DMInviteDialog_roomTile_name'>{this.props.member.name}</span>
-                <span className='mx_DMInviteDialog_roomTile_userId'>{this.props.member.userId}</span>
+                <span className='mx_DMInviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
+                <span className='mx_DMInviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
                 {timestamp}
             </div>
         );
@@ -158,7 +198,7 @@ export default class DMInviteDialog extends React.PureComponent {
             }
             return b.score - a.score;
         });
-        return members.map(m => ({userId: m.userId, user: m.member}));
+        return members.map(m => ({userId: m.member.userId, user: m.member}));
     }
 
     _startDm = () => {
@@ -190,14 +230,32 @@ export default class DMInviteDialog extends React.PureComponent {
     };
 
     _renderSection(kind: "recents"|"suggestions") {
-        const sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
+        let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
         let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
         const showMoreFn = kind === 'recents' ? this._showMoreRecents.bind(this) : this._showMoreSuggestions.bind(this);
         const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
         const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
 
+        // Hide the section if there's nothing to filter by
         if (!sourceMembers || sourceMembers.length === 0) return null;
 
+        // Do some simple filtering on the input before going much further. If we get no results, say so.
+        if (this.state.filterText) {
+            const filterBy = this.state.filterText.toLowerCase();
+            sourceMembers = sourceMembers
+                .filter(m => m.user.name.toLowerCase().includes(filterBy) || m.userId.toLowerCase().includes(filterBy));
+
+            if (sourceMembers.length === 0) {
+                return (
+                    <div className='mx_DMInviteDialog_section'>
+                        <h3>{sectionName}</h3>
+                        <p>{_t("No results")}</p>
+                    </div>
+                );
+            }
+        }
+
+
         // If we're going to hide one member behind 'show more', just use up the space of the button
         // with the member's tile instead.
         if (showNum === sourceMembers.length - 1) showNum++;
@@ -217,7 +275,13 @@ export default class DMInviteDialog extends React.PureComponent {
         }
 
         const tiles = toRender.map(r => (
-            <DMRoomTile member={r.user} lastActiveTs={lastActive(r)} key={r.userId} onToggle={this._toggleMember} />
+            <DMRoomTile
+                member={r.user}
+                lastActiveTs={lastActive(r)}
+                key={r.userId}
+                onToggle={this._toggleMember}
+                highlightWord={this.state.filterText}
+            />
         ));
         return (
             <div className='mx_DMInviteDialog_section'>
@@ -241,7 +305,6 @@ export default class DMInviteDialog extends React.PureComponent {
                     id="inviteTargets"
                     value={this.state.filterText}
                     onChange={this._updateFilter}
-                    placeholder="TODO: Implement filtering/searching (vector-im/riot-web#11199)"
                 />
             </div>
         );

From 8b4c1e3dec79f699951d87fb11eb29541637c943 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 Jan 2020 21:17:48 -0700
Subject: [PATCH 0206/3235] Support searching in the user directory for invite
 targets

Part of https://github.com/vector-im/riot-web/issues/11200
---
 .../views/dialogs/DMInviteDialog.js           | 84 ++++++++++++++++++-
 1 file changed, 81 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index ba3221d632..aec64919a0 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -25,14 +25,41 @@ import {RoomMember} from "matrix-js-sdk/lib/matrix";
 import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
 import {htmlEntitiesEncode} from "../../../HtmlUtils";
+import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
 
+class DirectoryMember {
+    _userId: string;
+    _displayName: string;
+    _avatarUrl: string;
+
+    constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) {
+        this._userId = userDirResult.user_id;
+        this._displayName = userDirResult.display_name;
+        this._avatarUrl = userDirResult.avatar_url;
+    }
+
+    // These next members are to implement the contract expected by DMRoomTile
+    get name(): string {
+        return this._displayName || this._userId;
+    }
+
+    get userId(): string {
+        return this._userId;
+    }
+
+    getMxcAvatarUrl(): string {
+        return this._avatarUrl;
+    }
+}
+
 class DMRoomTile extends React.PureComponent {
     static propTypes = {
+        // Has properties to match RoomMember: userId (str), name (str), getMxcAvatarUrl(): string
         member: PropTypes.object.isRequired,
         lastActiveTs: PropTypes.number,
         onToggle: PropTypes.func.isRequired,
@@ -86,7 +113,7 @@ class DMRoomTile extends React.PureComponent {
     }
 
     render() {
-        const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
+        const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
 
         let timestamp = null;
         if (this.props.lastActiveTs) {
@@ -96,9 +123,20 @@ class DMRoomTile extends React.PureComponent {
             timestamp = <span className='mx_DMInviteDialog_roomTile_time'>{humanTs}</span>;
         }
 
+        const avatarSize = 36;
+        const avatarUrl = getHttpUriForMxc(
+            MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
+            avatarSize, avatarSize, "crop");
+
         return (
             <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
-                <MemberAvatar member={this.props.member} width={36} height={36} />
+                <BaseAvatar
+                    url={avatarUrl}
+                    name={this.props.member.name}
+                    idName={this.props.member.userId}
+                    width={avatarSize}
+                    height={avatarSize}
+                />
                 <span className='mx_DMInviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
                 <span className='mx_DMInviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
                 {timestamp}
@@ -113,6 +151,8 @@ export default class DMInviteDialog extends React.PureComponent {
         onFinished: PropTypes.func.isRequired,
     };
 
+    _debounceTimer: number = null;
+
     constructor() {
         super();
 
@@ -123,6 +163,7 @@ export default class DMInviteDialog extends React.PureComponent {
             numRecentsShown: INITIAL_ROOMS_SHOWN,
             suggestions: this._buildSuggestions(),
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
+            serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
         };
     }
 
@@ -210,7 +251,35 @@ export default class DMInviteDialog extends React.PureComponent {
     };
 
     _updateFilter = (e) => {
-        this.setState({filterText: e.target.value});
+        const term = e.target.value;
+        this.setState({filterText: term});
+
+        // Debounce server lookups to reduce spam. We don't clear the existing server
+        // results because they might still be vaguely accurate, likewise for races which
+        // could happen here.
+        if (this._debounceTimer) {
+            clearTimeout(this._debounceTimer);
+        }
+        this._debounceTimer = setTimeout(() => {
+            MatrixClientPeg.get().searchUserDirectory({term}).then(r => {
+                if (term !== this.state.filterText) {
+                    // Discard the results - we were probably too slow on the server-side to make
+                    // these results useful. This is a race we want to avoid because we could overwrite
+                    // more accurate results.
+                    return;
+                }
+                this.setState({
+                    serverResultsMixin: r.results.map(u => ({
+                        userId: u.user_id,
+                        user: new DirectoryMember(u),
+                    })),
+                });
+            }).catch(e => {
+                console.error("Error searching user directory:");
+                console.error(e);
+                this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
+            });
+        }, 150); // 150ms debounce (human reaction time + some)
     };
 
     _showMoreRecents = () => {
@@ -236,6 +305,15 @@ export default class DMInviteDialog extends React.PureComponent {
         const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
         const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
 
+        // Mix in the server results if we have any, but only if we're searching
+        if (this.state.filterText && this.state.serverResultsMixin && kind === 'suggestions') {
+            // only pick out the server results that aren't already covered though
+            const uniqueServerResults = this.state.serverResultsMixin
+                .filter(u => !sourceMembers.some(m => m.userId === u.userId));
+
+            sourceMembers = sourceMembers.concat(uniqueServerResults);
+        }
+
         // Hide the section if there's nothing to filter by
         if (!sourceMembers || sourceMembers.length === 0) return null;
 

From 295dcbfe487ebb9bb4928d029a052f28cb6a079c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 4 Jan 2020 13:34:05 +0000
Subject: [PATCH 0207/3235] Fix ability to remove avatars

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/room_settings/RoomProfileSettings.js | 2 ++
 src/components/views/settings/ProfileSettings.js          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 2093a31a28..abcdce23f8 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -98,6 +98,8 @@ export default class RoomProfileSettings extends React.Component {
             newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
             newState.originalAvatarUrl = newState.avatarUrl;
             newState.avatarFile = null;
+        } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
+            await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {url: undefined}, '');
         }
 
         if (this.state.originalTopic !== this.state.topic) {
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 480b414911..72ff7e3d15 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -88,6 +88,8 @@ export default class ProfileSettings extends React.Component {
             newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
             newState.originalAvatarUrl = newState.avatarUrl;
             newState.avatarFile = null;
+        } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
+            await client.setAvatarUrl(""); // use empty string as Synapse 500's on undefined
         }
 
         this.setState(newState);

From 2ccc8caa6974ed3787436815aea95e5fc38a5205 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Sun, 5 Jan 2020 15:50:06 +0000
Subject: [PATCH 0208/3235] Fix indent

---
 .../settings/tabs/room/BridgeSettingsTab.js   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index c3c85ec31c..5536a2eb06 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -88,12 +88,12 @@ export default class BridgeSettingsTab extends React.Component {
                 network.avatar, 32, 32, "crop",
             );
             networkIcon = <BaseAvatar
-                              width={32}
-                              height={32}
-                              resizeMethod='crop'
-                              name={ networkName }
-                              idName={ networkName }
-                              url={ avatarUrl } />;
+    width={32}
+    height={32}
+    resizeMethod='crop'
+    name={ networkName }
+    idName={ networkName }
+    url={ avatarUrl } />;
         }
 
         let channelIcon = null;
@@ -103,12 +103,12 @@ export default class BridgeSettingsTab extends React.Component {
                 channel.avatar, 32, 32, "crop",
             );
             channelIcon = <BaseAvatar
-                              width={32}
-                              height={32}
-                              resizeMethod='crop'
-                              name={ networkName }
-                              idName={ networkName }
-                              url={ avatarUrl } />;
+    width={32}
+    height={32}
+    resizeMethod='crop'
+    name={ networkName }
+    idName={ networkName }
+    url={ avatarUrl } />;
         }
 
         const heading = _t("Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />", { }, {

From fb754b795cc37d2ac9077f6708dd0927319b0814 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:30:01 +0000
Subject: [PATCH 0209/3235] Fix right panel buttons highlighting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js            | 2 +-
 src/components/views/right_panel/HeaderButtons.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..50b63b94b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1299,7 +1299,7 @@ export default createReactClass({
                 );
             }
 
-            const rightPanel = !RightPanelStore.getSharedInstance().isOpenForGroup
+            const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
                 ? <RightPanel groupId={this.props.groupId} />
                 : undefined;
 
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index ebe1f5f915..dbcae4529a 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
         const rps = RightPanelStore.getSharedInstance();
         if (this.state.headerKind === HEADER_KIND_ROOM) {
             this.setState({phase: rps.visibleRoomPanelPhase});
-        } else if (this.state.head === HEADER_KIND_GROUP) {
+        } else if (this.state.headerKind === HEADER_KIND_GROUP) {
             this.setState({phase: rps.visibleGroupPanelPhase});
         }
     }

From 4118faa8340baf61610d78217ed80e715c83474d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:31:07 +0000
Subject: [PATCH 0210/3235] When looking at a MemberInfo, clicking on
 MemberList should close not switch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/GroupHeaderButtons.js | 9 +++++++--
 src/components/views/right_panel/RoomHeaderButtons.js  | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index c134a5d237..f164b6c578 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -66,8 +66,13 @@ export default class GroupHeaderButtons extends HeaderButtons {
     }
 
     _onMembersClicked() {
-        // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+        if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
+            // send the active phase to trigger a toggle
+            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
+        } else {
+            // This toggles for us, if needed
+            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+        }
     }
 
     _onRoomsClicked() {
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index f59159d1d9..3831a5953e 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -56,8 +56,13 @@ export default class RoomHeaderButtons extends HeaderButtons {
     }
 
     _onMembersClicked() {
-        // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+        if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+            // send the active phase to trigger a toggle
+            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
+        } else {
+            // This toggles for us, if needed
+            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+        }
     }
 
     _onFilesClicked() {

From 814c0aa4c2469fa71c2372609d85c4185a4320ca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:52:54 +0000
Subject: [PATCH 0211/3235] Send enabled_labs over rageshake as comma delimited
 list

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/rageshake/submit-rageshake.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 457958eb82..44f1039016 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -27,6 +27,7 @@ import rageshake from './rageshake';
 
 // polyfill textencoder if necessary
 import * as TextEncodingUtf8 from 'text-encoding-utf-8';
+import SettingsStore from "../settings/SettingsStore";
 let TextEncoder = window.TextEncoder;
 if (!TextEncoder) {
     TextEncoder = TextEncodingUtf8.TextEncoder;
@@ -85,6 +86,12 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         body.append('label', opts.label);
     }
 
+    // add labs options
+    const enabledLabs = SettingsStore.getLabsFeatures().filter(SettingsStore.isFeatureEnabled);
+    if (enabledLabs.length) {
+        body.append('enabled_labs', enabledLabs.join(', '));
+    }
+
     if (opts.sendLogs) {
         progressCallback(_t("Collecting logs"));
         const logs = await rageshake.getLogsForReport();

From cf071c5ac659898f19865411bfb3e9c874bc2da8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 21:23:34 +0000
Subject: [PATCH 0212/3235] Deduplicate recent emoji

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/emojipicker/EmojiPicker.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index 4d49b25100..0325dfd807 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -47,10 +47,10 @@ class EmojiPicker extends React.Component {
             viewportHeight: 280,
         };
 
-        // Convert recent emoji characters to emoji data, removing unknowns.
-        this.recentlyUsed = recent.get()
+        // Convert recent emoji characters to emoji data, removing unknowns and duplicates
+        this.recentlyUsed = Array.from(new Set(recent.get()
             .map(unicode => getEmojiFromUnicode(unicode))
-            .filter(data => !!data);
+            .filter(data => !!data)));
         this.memoizedDataByCategory = {
             recent: this.recentlyUsed,
             ...DATA_BY_CATEGORY,

From ba2f4aa973db060afd62807b837e9ee266b245ab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 21:26:32 +0000
Subject: [PATCH 0213/3235] tidy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/emojipicker/EmojiPicker.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index 0325dfd807..a9cf2a4732 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -48,9 +48,7 @@ class EmojiPicker extends React.Component {
         };
 
         // Convert recent emoji characters to emoji data, removing unknowns and duplicates
-        this.recentlyUsed = Array.from(new Set(recent.get()
-            .map(unicode => getEmojiFromUnicode(unicode))
-            .filter(data => !!data)));
+        this.recentlyUsed = Array.from(new Set(recent.get().map(getEmojiFromUnicode).filter(Boolean)));
         this.memoizedDataByCategory = {
             recent: this.recentlyUsed,
             ...DATA_BY_CATEGORY,

From c2c4426396312670617632a21f62eb8620c0ebd6 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 4 Jan 2020 10:32:00 +0000
Subject: [PATCH 0214/3235] Translated using Weblate (Albanian)

Currently translated at 99.1% (1988 of 2006 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 | 47 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 4d67df4fa4..15576d8d9a 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1964,5 +1964,50 @@
     "Set up secret storage": "Ujdisni depozitë të fshehtë",
     "Secure your encrypted messages with a passphrase": "Sigurojini mesazhet tuaj të fshehtëzuar me një frazëkalim",
     "Storing secrets...": "Po depozitohen të fshehta…",
-    "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë"
+    "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s hoqi rregullin për dëbim përdoruesish që kanë përputhje me %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon dhoma që kanë përputhje me %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon shërbyes që kanë përputhje me %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s hoqi një rregull dëbimi mbi përputhje me %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s përditësoi një rregull të pavlefshëm dëbimesh",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin mbi dëbim përdoruesish që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin për dëbim dhomash që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s përditësoi rregullin për dëbim shërbyesish që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimi rreth përputhjesh me %(glob)s për %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim përdoruesish që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim dhomash që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull mbi dëbim shërbyesish që kanë përputhje me %(glob)s për %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s krijoi një rregull dëbimi rreth përputhjesh me %(glob)s për %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte përdorues me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte dhoma me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte shërbyes me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimesh mbi përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
+    "The message you are trying to send is too large.": "Mesazhi që po rrekeni të dërgoni është shumë i madh.",
+    "New DM invite dialog (under development)": "Dialog ftese të re për MD (në zhvillim)",
+    "not stored": "e padepozituar",
+    "Backup has a <validity>valid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej këtij përdoruesi",
+    "Backup has a <validity>invalid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej këtij përdoruesi",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një përdorues i <verify>panjohur</verify> me ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një pajisje e <verify>panjohur</verify> me ID %(deviceId)s",
+    "Backup key stored: ": "Kyç kopjeruajtjeje i depozituar: ",
+    "Start using Key Backup with Secure Secret Storage": "Fillo të përdorësh Kopejruajtje Kyçesh me Depozitim Kyçi të Fshehtë",
+    "This user has not verified all of their devices.": "Ky përdorues s’ka verifikuar krejt pajisjet e tij.",
+    "You have not verified this user. This user has verified all of their devices.": "S’e keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.",
+    "You have verified this user. This user has verified all of their devices.": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Disa përdorues në këtë dhomë të fshehtëzuar nuk janë verifikuar nga ju ose nuk kanë verifikuar pajisjet e tyre.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "Krejt përdorues në këtë dhomë të fshehtëzuar janë verifikuar nga ju dhe kanë verifikuar pajisjet e tyre.",
+    "Close preview": "Mbylle paraparjen",
+    "Hide verified sessions": "Fshih sesione të verifikuar",
+    "%(count)s verified sessions|other": "%(count)s sesione të verifikuar",
+    "%(count)s verified sessions|one": "1 sesion i verifikuar",
+    "Language Dropdown": "Menu Hapmbyll Gjuhësh",
+    "Show more": "Shfaq më tepër",
+    "Recent Conversations": "Biseda Së Fundi",
+    "Direct Messages": "Mesazhe të Drejtpërdrejtë",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Nëse s’gjeni dot dikë, kërkojuni emrin e përdoruesit, ose jepuni emrin tuaj të përdoruesit (%(userId)s) ose <a>profile link</a>.",
+    "Go": "Shko",
+    "Help": "Ndihmë",
+    "Country Dropdown": "Menu Hapmbyll Vendesh",
+    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Depozita e Fshehtë do të ujdiset duke përdorur hollësitë tuaja ekzistuese për kopjeruajtje kyçesh.Frazëkalimi juaj për në depozitën e fshehtë dhe kyçi i rimarrjes do të jenë të njëjtë me ata për kopjeruajtjen tuaj të kyçeve",
+    "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh"
 }

From b8f1ca679b744d6be4373e0b02e04020d6697858 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 4 Jan 2020 13:20:53 +0000
Subject: [PATCH 0215/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2006 of 2006 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e6ce4077e5..b755e16735 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2019,5 +2019,11 @@
     "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同",
     "Migrate from Key Backup": "從金鑰備份導入",
-    "Help": "說明"
+    "Help": "說明",
+    "New DM invite dialog (under development)": "新的直接訊息邀請對話框（開發中）",
+    "Show more": "顯示更多",
+    "Recent Conversations": "最近的對話",
+    "Direct Messages": "直接訊息",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請向他們詢問他們的使用者名稱，或是分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
+    "Go": "到"
 }

From e6c80160861b9a33d0f217be048c37cb8e50be57 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Sat, 4 Jan 2020 16:49:31 +0000
Subject: [PATCH 0216/3235] Translated using Weblate (Finnish)

Currently translated at 100.0% (2006 of 2006 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 8881456d8c..e53afb2598 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2019,5 +2019,11 @@
     "Migrate from Key Backup": "Siirrä tiedot vanhasta avainten varmuuskopiointijärjestelmästä",
     "Secure your encrypted messages with a passphrase": "Turvaa salatut viestisi salalauseella",
     "Storing secrets...": "Tallennetaan salaisuuksia...",
-    "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui"
+    "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui",
+    "New DM invite dialog (under development)": "Uusi dialogi kutsuille yksityiskeskusteluun (kehitysversio)",
+    "Show more": "Näytä lisää",
+    "Recent Conversations": "Viimeaikaiset keskustelut",
+    "Direct Messages": "Yksityisviestit",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Jos et löydä jotakuta, kysy hänen käyttäjätunnusta, tai anna oma käyttäjätunnuksesi (%(userId)s) tai <a>linkin profiiliisi</a> hänelle.",
+    "Go": "Mene"
 }

From d1405233bd82a67beaae0f04a6c0669cce4fcbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 4 Jan 2020 08:16:36 +0000
Subject: [PATCH 0217/3235] Translated using Weblate (French)

Currently translated at 100.0% (2006 of 2006 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 727d171ca4..a44df701f9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2019,5 +2019,11 @@
     "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés",
     "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés",
-    "Help": "Aide"
+    "Help": "Aide",
+    "New DM invite dialog (under development)": "Nouveau dialogue d’invitation aux MD (en développement)",
+    "Show more": "En savoir plus",
+    "Recent Conversations": "Conversations récentes",
+    "Direct Messages": "Messages directs",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou <a>votre lien de profil</a>.",
+    "Go": "C’est parti"
 }

From 8128b97f3571ce2a19fca74e1293cbbf82956db4 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 5 Jan 2020 21:12:03 +0000
Subject: [PATCH 0218/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2006 of 2006 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2f31f75407..df482cd072 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2020,5 +2020,11 @@
     "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal",
     "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből",
-    "Help": "Segítség"
+    "Help": "Segítség",
+    "New DM invite dialog (under development)": "Új KB (DM) meghívó párbeszédablak (fejlesztés alatt)",
+    "Show more": "Mutass többet",
+    "Recent Conversations": "Legújabb Beszélgetések",
+    "Direct Messages": "Közvetlen Beszélgetések",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz meg valakit, kérdezd meg a felhasználói nevét vagy oszd meg a te felhasználói nevedet (%(userId)s) vagy a <a>profil hivatkozást</a>.",
+    "Go": "Menj"
 }

From a231419a775350df8628f4b1885e01b61417dfc2 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 4 Jan 2020 09:27:22 +0000
Subject: [PATCH 0219/3235] Translated using Weblate (Turkish)

Currently translated at 53.2% (1067 of 2006 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index a3a178c358..159cb61965 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1021,5 +1021,55 @@
     "Profile picture": "Profil resmi",
     "Could not connect to Identity Server": "Kimlik Sunucusuna bağlanılamadı",
     "Checking server": "Sunucu kontrol ediliyor",
-    "Change identity server": "Kimlik sunucu değiştir"
+    "Change identity server": "Kimlik sunucu değiştir",
+    "Sorry, your homeserver is too old to participate in this room.": "Üzgünüm, ana sunucunuz bu odaya katılabilmek için oldukça eski.",
+    "Please contact your homeserver administrator.": "Lütfen anasunucu yöneticiniz ile bağlantıya geçin.",
+    "Message Pinning": "Mesaj Sabitleme",
+    "Multiple integration managers": "Çoklu entegrasyon yöneticileri",
+    "New DM invite dialog (under development)": "Yeni DM davet diyalog kutusu (geliştirilmekte)",
+    "Enable Emoji suggestions while typing": "Yazarken Emoji önerilerini aç",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Katılma/ayrılma mesajları göster (davetler/atılmalar/yasaklamalar etkilenmeyecek)",
+    "Show avatar changes": "Avatar değişikliklerini göster",
+    "Always show encryption icons": "Şifreleme ikonlarını her zaman göster",
+    "Enable big emoji in chat": "Sohbette büyük emojileri aç",
+    "Send typing notifications": "Yazma bildirimlerini gönder",
+    "Send analytics data": "Analiz verilerini gönder",
+    "Show developer tools": "Geliştirici araçlarını göster",
+    "Low bandwidth mode": "Düşük bant genişliği modu",
+    "Messages containing my username": "Kullanıcı adımı içeren mesajlar",
+    "When rooms are upgraded": "Odaların güncellenme zamanları",
+    "My Ban List": "Yasaklı Listem",
+    "Verified!": "Doğrulandı!",
+    "You've successfully verified this user.": "Bu kullanıcıyı başarılı şekilde doğruladınız.",
+    "Unable to find a supported verification method.": "Desteklenen doğrulama yöntemi bulunamadı.",
+    "Dog": "Köpek",
+    "Cat": "Kedi",
+    "Lion": "Aslan",
+    "Horse": "At",
+    "Unicorn": "Tek boynuzlu at",
+    "Pig": "Domuz",
+    "Elephant": "Fil",
+    "Rabbit": "Tavşan",
+    "Panda": "Panda",
+    "Penguin": "Penguen",
+    "Turtle": "Kaplumbağa",
+    "Fish": "Balık",
+    "Octopus": "Ahtapot",
+    "Butterfly": "Kelebek",
+    "Flower": "Çiçek",
+    "Tree": "Ağaç",
+    "Cactus": "Kaktüs",
+    "Mushroom": "Mantar",
+    "Globe": "Dünya",
+    "Moon": "Ay",
+    "Cloud": "Bulut",
+    "Fire": "Ateş",
+    "Banana": "Muz",
+    "Apple": "Elma",
+    "Strawberry": "Çilek",
+    "Corn": "Mısır",
+    "Pizza": "Pizza",
+    "Cake": "Kek",
+    "Heart": "Kalp",
+    "Trophy": "Ödül"
 }

From b6098ddb47e138a3aca2a37d444788db08afa0dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 21:58:36 +0000
Subject: [PATCH 0220/3235] Delegate all room alias validation to the
 RoomAliasField validator

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/room_settings/AliasSettings.js      | 79 ++++++++++---------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index aa9d46c9d5..8e75680a89 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import EditableItemList from "../elements/EditableItemList";
 
-const React = require('react');
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 const sdk = require("../../../index");
@@ -28,22 +28,41 @@ import AccessibleButton from "../elements/AccessibleButton";
 const Modal = require("../../../Modal");
 
 class EditableAliasesList extends EditableItemList {
+    constructor(props) {
+        super(props);
+
+        this._aliasField = createRef();
+    }
+
+    _onAliasAdded = async () => {
+        await this._aliasField.current.validate({ allowEmpty: false });
+
+        if (this._aliasField.current.isValid) {
+            if (this.props.onItemAdded) this.props.onItemAdded(this.props.newItem);
+            return;
+        }
+
+        this._aliasField.current.focus();
+        this._aliasField.current.validate({ allowEmpty: false, focused: true });
+    };
+
     _renderNewItemField() {
         const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
         const onChange = (alias) => this._onNewItemChanged({target: {value: alias}});
         return (
             <form
-                onSubmit={this._onItemAdded}
+                onSubmit={this._onAliasAdded}
                 autoComplete="off"
                 noValidate={true}
                 className="mx_EditableItemList_newItem"
             >
                 <RoomAliasField
                     id={`mx_EditableItemList_new_${this.props.id}`}
+                    ref={this._aliasField}
                     onChange={onChange}
                     value={this.props.newItem || ""}
                     domain={this.props.domain} />
-                <AccessibleButton onClick={this._onItemAdded} kind="primary">
+                <AccessibleButton onClick={this._onAliasAdded} kind="primary">
                     { _t("Add") }
                 </AccessibleButton>
             </form>
@@ -99,11 +118,6 @@ export default class AliasSettings extends React.Component {
         return dict;
     }
 
-    isAliasValid(alias) {
-        // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
-        return (alias.match(/^#([^/:,]+?):(.+)$/) && encodeURI(alias) === alias);
-    }
-
     changeCanonicalAlias(alias) {
         if (!this.props.canSetCanonicalAlias) return;
 
@@ -139,38 +153,31 @@ export default class AliasSettings extends React.Component {
 
         const localDomain = MatrixClientPeg.get().getDomain();
         if (!alias.includes(':')) alias += ':' + localDomain;
-        if (this.isAliasValid(alias) && alias.endsWith(localDomain)) {
-            MatrixClientPeg.get().createAlias(alias, this.props.roomId).then(() => {
-                const localAliases = this.state.domainToAliases[localDomain] || [];
-                const domainAliases = Object.assign({}, this.state.domainToAliases);
-                domainAliases[localDomain] = [...localAliases, alias];
 
-                this.setState({
-                    domainToAliases: domainAliases,
-                    // Reset the add field
-                    newAlias: "",
-                });
+        MatrixClientPeg.get().createAlias(alias, this.props.roomId).then(() => {
+            const localAliases = this.state.domainToAliases[localDomain] || [];
+            const domainAliases = Object.assign({}, this.state.domainToAliases);
+            domainAliases[localDomain] = [...localAliases, alias];
 
-                if (!this.state.canonicalAlias) {
-                    this.changeCanonicalAlias(alias);
-                }
-            }).catch((err) => {
-                console.error(err);
-                Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, {
-                    title: _t("Error creating alias"),
-                    description: _t(
-                        "There was an error creating that alias. It may not be allowed by the server " +
-                        "or a temporary failure occurred.",
-                    ),
-                });
+            this.setState({
+                domainToAliases: domainAliases,
+                // Reset the add field
+                newAlias: "",
             });
-        } else {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Invalid alias format', '', ErrorDialog, {
-                title: _t('Invalid alias format'),
-                description: _t('\'%(alias)s\' is not a valid format for an alias', { alias: alias }),
+
+            if (!this.state.canonicalAlias) {
+                this.changeCanonicalAlias(alias);
+            }
+        }).catch((err) => {
+            console.error(err);
+            Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, {
+                title: _t("Error creating alias"),
+                description: _t(
+                    "There was an error creating that alias. It may not be allowed by the server " +
+                    "or a temporary failure occurred.",
+                ),
             });
-        }
+        });
     };
 
     onLocalAliasDeleted = (index) => {

From 4a836349ab5dbfc0c83f7e7983a64ced93604594 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 22:01:59 +0000
Subject: [PATCH 0221/3235] regenerate i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cac3f2f619..9cae17157a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1081,8 +1081,6 @@
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "Error creating alias": "Error creating alias",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "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",
     "Error removing alias": "Error removing alias",
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
     "Main address": "Main address",

From 378a82e6fb760657b5f77c1d13cad81c298af0da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 22:22:09 +0000
Subject: [PATCH 0222/3235] Use html-entities instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                    |  3 ++-
 src/components/views/rooms/LinkPreviewWidget.js | 10 ++++++----
 yarn.lock                                       |  5 +++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7ef14e6635..7e2c242b3a 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,6 @@
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
     "flux": "2.1.1",
-    "react-focus-lock": "^2.2.1",
     "focus-visible": "^5.0.2",
     "fuse.js": "^2.2.0",
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
@@ -82,6 +81,7 @@
     "glob": "^5.0.14",
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
+    "html-entities": "^1.2.1",
     "is-ip": "^2.0.0",
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
@@ -99,6 +99,7 @@
     "react-addons-css-transition-group": "15.6.2",
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
+    "react-focus-lock": "^2.2.1",
     "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 06c0201af8..4822848233 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import { linkifyElement } from '../../../HtmlUtils';
+import { AllHtmlEntities } from 'html-entities';
+
+import {linkifyElement} from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 
@@ -128,15 +130,15 @@ module.exports = createReactClass({
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        // Escape </> to prevent any HTML injections, we can't replace & as the description may contain & encoded html entities
-        const safeDescription = (p["og:description"] || "").replace("<", "&lt;").replace(">", "&gt;");
         return (
             <div className="mx_LinkPreviewWidget" >
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
                     <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noopener">{ p["og:title"] }</a></div>
                     <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
-                    <div className="mx_LinkPreviewWidget_description" ref={this._description} dangerouslySetInnerHTML={{ __html: safeDescription }} />
+                    <div className="mx_LinkPreviewWidget_description" ref={this._description}>
+                        { AllHtmlEntities.decode(p["og:description"] || "") }
+                    </div>
                 </div>
                 <AccessibleButton className="mx_LinkPreviewWidget_cancel" onClick={this.props.onCancelClick} aria-label={_t("Close preview")}>
                     <img className="mx_filterFlipColor" alt="" role="presentation"
diff --git a/yarn.lock b/yarn.lock
index b8b877ab62..a977b97259 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4010,6 +4010,11 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
+html-entities@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"

From 7f0ed05ee1dc5e03ff718986ba2040621bc41b71 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Sun, 5 Jan 2020 23:32:49 +0000
Subject: [PATCH 0223/3235] Update BridgeSettingsTab.js

---
 .../settings/tabs/room/BridgeSettingsTab.js   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 5536a2eb06..3022885701 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -88,12 +88,13 @@ export default class BridgeSettingsTab extends React.Component {
                 network.avatar, 32, 32, "crop",
             );
             networkIcon = <BaseAvatar
-    width={32}
-    height={32}
-    resizeMethod='crop'
-    name={ networkName }
-    idName={ networkName }
-    url={ avatarUrl } />;
+                width={32}
+                height={32}
+                resizeMethod='crop'
+                name={ networkName }
+                idName={ networkName }
+                url={ avatarUrl }
+            />;
         }
 
         let channelIcon = null;
@@ -103,12 +104,13 @@ export default class BridgeSettingsTab extends React.Component {
                 channel.avatar, 32, 32, "crop",
             );
             channelIcon = <BaseAvatar
-    width={32}
-    height={32}
-    resizeMethod='crop'
-    name={ networkName }
-    idName={ networkName }
-    url={ avatarUrl } />;
+                width={32}
+                height={32}
+                resizeMethod='crop'
+                name={ networkName }
+                idName={ networkName }
+                url={ avatarUrl }
+            />;
         }
 
         const heading = _t("Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />", { }, {

From dcdf68d7e1cb9f9eb4f18c627fe0029d7c57db67 Mon Sep 17 00:00:00 2001
From: Justin Sleep <justin@midnightmechanism.com>
Date: Sun, 5 Jan 2020 17:35:05 -0600
Subject: [PATCH 0224/3235] Explicitly define diff colors in light theme

Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
---
 res/themes/dark/css/_dark.scss   | 2 +-
 res/themes/light/css/_light.scss | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index d1d0e333a0..212513347d 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -244,7 +244,7 @@ $breadcrumb-placeholder-bg-color: #272c35;
     }
 }
 
-// Fixes diff color inversion by swapping add / del colors
+// diff highlight colors
 .hljs-addition {
     background: #fdd;
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 0a3ef812b8..f4fc459596 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -338,3 +338,12 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
     color: $accent-color;
     text-decoration: none;
 }
+
+// diff highlight colors
+.hljs-addition {
+    background: #dfd;
+}
+
+.hljs-deletion {
+    background: #fdd;
+}

From 8ec8a7c01534818178259b0708681e9b3f43b50a Mon Sep 17 00:00:00 2001
From: Justin Sleep <justin@midnightmechanism.com>
Date: Sun, 5 Jan 2020 17:58:07 -0600
Subject: [PATCH 0225/3235] Comment rationale for swapping dark theme colors

Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
---
 res/themes/dark/css/_dark.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 212513347d..0c47943301 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -245,6 +245,7 @@ $breadcrumb-placeholder-bg-color: #272c35;
 }
 
 // diff highlight colors
+// intentionally swapped to avoid inversion
 .hljs-addition {
     background: #fdd;
 }

From d31c863563e8d33e99a8890503968a308210f96f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 00:13:16 +0000
Subject: [PATCH 0226/3235] Remove all usages of slate in favour of CIDER

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles                      |    1 -
 package.json                                  |    4 -
 src/SlateComposerHistoryManager.js            |   86 -
 src/autocomplete/PlainWithPillsSerializer.js  |   92 -
 src/components/structures/LoggedInView.js     |    7 -
 src/components/structures/RoomView.js         |   43 +-
 .../views/rooms/MessageComposerInput.js       | 1516 -----------------
 .../views/rooms/SlateMessageComposer.js       |  485 ------
 .../tabs/user/PreferencesUserSettingsTab.js   |    1 -
 src/i18n/strings/en_EN.json                   |   21 +-
 src/settings/Settings.js                      |    5 -
 src/stores/MessageComposerStore.js            |   66 -
 .../views/rooms/MessageComposerInput-test.js  |    2 +-
 yarn.lock                                     |  151 +-
 14 files changed, 15 insertions(+), 2465 deletions(-)
 delete mode 100644 src/SlateComposerHistoryManager.js
 delete mode 100644 src/autocomplete/PlainWithPillsSerializer.js
 delete mode 100644 src/components/views/rooms/MessageComposerInput.js
 delete mode 100644 src/components/views/rooms/SlateMessageComposer.js
 delete mode 100644 src/stores/MessageComposerStore.js

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 7d998f8c4b..c3bb34ae26 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -33,7 +33,6 @@ src/components/views/rooms/RoomList.js
 src/components/views/rooms/RoomPreviewBar.js
 src/components/views/rooms/SearchBar.js
 src/components/views/rooms/SearchResultTile.js
-src/components/views/rooms/SlateMessageComposer.js
 src/components/views/settings/ChangeAvatar.js
 src/components/views/settings/ChangePassword.js
 src/components/views/settings/DevicesPanel.js
diff --git a/package.json b/package.json
index a1ebc6602d..ad446e26cc 100644
--- a/package.json
+++ b/package.json
@@ -103,10 +103,6 @@
     "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
-    "slate": "^0.41.2",
-    "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "github:matrix-org/slate-md-serializer#f7c4ad3",
-    "slate-react": "^0.18.10",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
     "velocity-animate": "^1.5.2",
diff --git a/src/SlateComposerHistoryManager.js b/src/SlateComposerHistoryManager.js
deleted file mode 100644
index 948dcf64ff..0000000000
--- a/src/SlateComposerHistoryManager.js
+++ /dev/null
@@ -1,86 +0,0 @@
-//@flow
-/*
-Copyright 2017 Aviral Dasgupta
-
-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 {Value} from 'slate';
-
-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;
-    format: MessageFormat = 'rich';
-
-    constructor(value: ?Value, format: ?MessageFormat) {
-        this.value = value;
-        this.format = format;
-    }
-
-    static fromJSON(obj: Object): HistoryItem {
-        return new HistoryItem(
-            Value.fromJSON(obj.value),
-            obj.format,
-        );
-    }
-
-    toJSON(): Object {
-        return {
-            value: this.value.toJSON(),
-            format: this.format,
-        };
-    }
-}
-
-export default class SlateComposerHistoryManager {
-    history: Array<HistoryItem> = [];
-    prefix: string;
-    lastIndex: number = 0; // used for indexing the storage
-    currentIndex: number = 0; // used for indexing the loaded validated history Array
-
-    constructor(roomId: string, prefix: string = 'mx_composer_history_') {
-        this.prefix = prefix + roomId;
-
-        // TODO: Performance issues?
-        let item;
-        for (; item = sessionStorage.getItem(`${this.prefix}[${this.currentIndex}]`); this.currentIndex++) {
-            try {
-                this.history.push(
-                    HistoryItem.fromJSON(JSON.parse(item)),
-                );
-            } catch (e) {
-                console.warn("Throwing away unserialisable history", e);
-            }
-        }
-        this.lastIndex = this.currentIndex;
-        // reset currentIndex to account for any unserialisable history
-        this.currentIndex = this.history.length;
-    }
-
-    save(value: Value, format: MessageFormat) {
-        const item = new HistoryItem(value, format);
-        this.history.push(item);
-        this.currentIndex = this.history.length;
-        sessionStorage.setItem(`${this.prefix}[${this.lastIndex++}]`, JSON.stringify(item.toJSON()));
-    }
-
-    getItem(offset: number): ?HistoryItem {
-        this.currentIndex = _clamp(this.currentIndex + offset, 0, this.history.length - 1);
-        return this.history[this.currentIndex];
-    }
-}
diff --git a/src/autocomplete/PlainWithPillsSerializer.js b/src/autocomplete/PlainWithPillsSerializer.js
deleted file mode 100644
index 09bb3772ac..0000000000
--- a/src/autocomplete/PlainWithPillsSerializer.js
+++ /dev/null
@@ -1,92 +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.
-*/
-
-// Based originally on slate-plain-serializer
-
-import { Block } from 'slate';
-
-/**
- * Plain text serializer, which converts a Slate `value` to a plain text string,
- * serializing pills into various different formats as required.
- *
- * @type {PlainWithPillsSerializer}
- */
-
-class PlainWithPillsSerializer {
-    /*
-     * @param {String} options.pillFormat - either 'md', 'plain', 'id'
-     */
-    constructor(options = {}) {
-        const {
-            pillFormat = 'plain',
-        } = options;
-        this.pillFormat = pillFormat;
-    }
-
-    /**
-     * Serialize a Slate `value` to a plain text string,
-     * serializing pills as either MD links, plain text representations or
-     * ID representations as required.
-     *
-     * @param {Value} value
-     * @return {String}
-     */
-    serialize = value => {
-        return this._serializeNode(value.document);
-    }
-
-    /**
-     * Serialize a `node` to plain text.
-     *
-     * @param {Node} node
-     * @return {String}
-     */
-    _serializeNode = node => {
-        if (
-            node.object == 'document' ||
-            (node.object == 'block' && Block.isBlockList(node.nodes))
-        ) {
-            return node.nodes.map(this._serializeNode).join('\n');
-        } else if (node.type == 'emoji') {
-            return node.data.get('emojiUnicode');
-        } else if (node.type == 'pill') {
-            const completion = node.data.get('completion');
-            // over the wire the @room pill is just plaintext
-            if (completion === '@room') return completion;
-
-            switch (this.pillFormat) {
-                case 'plain':
-                    return completion;
-                case 'md':
-                    return `[${ completion }](${ node.data.get('href') })`;
-                case 'id':
-                    return node.data.get('completionId') || completion;
-            }
-        } else if (node.nodes) {
-            return node.nodes.map(this._serializeNode).join('');
-        } else {
-            return node.text;
-        }
-    }
-}
-
-/**
- * Export.
- *
- * @type {PlainWithPillsSerializer}
- */
-
-export default PlainWithPillsSerializer;
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 7261af3bf0..3420e69ce6 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -393,13 +393,6 @@ const LoggedInView = createReactClass({
                 return;
             }
 
-            // XXX: Remove after CIDER replaces Slate completely: https://github.com/vector-im/riot-web/issues/11036
-            // If using Slate, consume the Backspace without first focusing as it causes an implosion
-            if (ev.key === Key.BACKSPACE && !SettingsStore.getValue("useCiderComposer")) {
-                ev.stopPropagation();
-                return;
-            }
-
             if (!isClickShortcut && ev.key !== Key.TAB && !canElementReceiveInput(ev.target)) {
                 // synchronous dispatch so we focus before key generates input
                 dis.dispatch({action: 'focus_composer'}, true);
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 939f422a36..c552e2f8f5 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -157,8 +157,6 @@ module.exports = createReactClass({
 
             canReact: false,
             canReply: false,
-
-            useCider: false,
         };
     },
 
@@ -180,18 +178,10 @@ module.exports = createReactClass({
 
         WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
 
-        this._onCiderUpdated();
-        this._ciderWatcherRef = SettingsStore.watchSetting(
-            "useCiderComposer", null, this._onCiderUpdated);
-
         this._roomView = createRef();
         this._searchResultsPanel = createRef();
     },
 
-    _onCiderUpdated: function() {
-        this.setState({useCider: SettingsStore.getValue("useCiderComposer")});
-    },
-
     _onRoomViewStoreUpdate: function(initial) {
         if (this.unmounted) {
             return;
@@ -1806,29 +1796,16 @@ module.exports = createReactClass({
             myMembership === 'join' && !this.state.searchResults
         );
         if (canSpeak) {
-            if (this.state.useCider) {
-                const MessageComposer = sdk.getComponent('rooms.MessageComposer');
-                messageComposer =
-                    <MessageComposer
-                        room={this.state.room}
-                        callState={this.state.callState}
-                        disabled={this.props.disabled}
-                        showApps={this.state.showApps}
-                        e2eStatus={this.state.e2eStatus}
-                        permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
-                    />;
-            } else {
-                const SlateMessageComposer = sdk.getComponent('rooms.SlateMessageComposer');
-                messageComposer =
-                    <SlateMessageComposer
-                        room={this.state.room}
-                        callState={this.state.callState}
-                        disabled={this.props.disabled}
-                        showApps={this.state.showApps}
-                        e2eStatus={this.state.e2eStatus}
-                        permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
-                    />;
-            }
+            const MessageComposer = sdk.getComponent('rooms.MessageComposer');
+            messageComposer =
+                <MessageComposer
+                    room={this.state.room}
+                    callState={this.state.callState}
+                    disabled={this.props.disabled}
+                    showApps={this.state.showApps}
+                    e2eStatus={this.state.e2eStatus}
+                    permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
+                />;
         }
 
         // TODO: Why aren't we storing the term/scope/count in this format
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
deleted file mode 100644
index 595ec0681f..0000000000
--- a/src/components/views/rooms/MessageComposerInput.js
+++ /dev/null
@@ -1,1516 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 { Editor } from 'slate-react';
-import { getEventTransfer } from 'slate-react';
-import { Value, Block, Inline, Range } from 'slate';
-import type { Change } from 'slate';
-
-import Html from 'slate-html-serializer';
-import Md from 'slate-md-serializer';
-import Plain from 'slate-plain-serializer';
-import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
-
-import classNames from 'classnames';
-
-import MatrixClientPeg from '../../../MatrixClientPeg';
-import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
-import {processCommandInput} from '../../../SlashCommands';
-import { isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard';
-import Modal from '../../../Modal';
-import sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import Analytics from '../../../Analytics';
-
-import dis from '../../../dispatcher';
-
-import * as HtmlUtils from '../../../HtmlUtils';
-import Autocomplete from './Autocomplete';
-import {Completion} from "../../../autocomplete/Autocompleter";
-import Markdown from '../../../Markdown';
-import MessageComposerStore from '../../../stores/MessageComposerStore';
-import ContentMessages from '../../../ContentMessages';
-
-import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import {getPrimaryPermalinkEntity, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
-import ReplyPreview from "./ReplyPreview";
-import RoomViewStore from '../../../stores/RoomViewStore';
-import ReplyThread from "../elements/ReplyThread";
-import {ContentHelpers} from 'matrix-js-sdk';
-import AccessibleButton from '../elements/AccessibleButton';
-import {findEditableEvent} from '../../../utils/EventUtils';
-import SlateComposerHistoryManager from "../../../SlateComposerHistoryManager";
-import TypingStore from "../../../stores/TypingStore";
-import {EMOTICON_TO_EMOJI} from "../../../emoji";
-
-const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
-
-// the Slate node type to default to for unstyled text
-const DEFAULT_NODE = 'paragraph';
-
-// map HTML elements through to our Slate schema node types
-// used for the HTML deserializer.
-// (The names here are chosen to match the MD serializer's schema for convenience)
-const BLOCK_TAGS = {
-    p: 'paragraph',
-    blockquote: 'block-quote',
-    ul: 'bulleted-list',
-    h1: 'heading1',
-    h2: 'heading2',
-    h3: 'heading3',
-    h4: 'heading4',
-    h5: 'heading5',
-    h6: 'heading6',
-    li: 'list-item',
-    ol: 'numbered-list',
-    pre: 'code',
-};
-
-const MARK_TAGS = {
-    strong: 'bold',
-    b: 'bold', // deprecated
-    em: 'italic',
-    i: 'italic', // deprecated
-    code: 'code',
-    u: 'underlined',
-    del: 'deleted',
-    strike: 'deleted', // deprecated
-    s: 'deleted', // deprecated
-};
-
-const SLATE_SCHEMA = {
-    inlines: {
-        pill: {
-            isVoid: true,
-        },
-        emoji: {
-            isVoid: true,
-        },
-    },
-};
-
-function onSendMessageFailed(err, room) {
-    // XXX: temporary logging to try to diagnose
-    // https://github.com/vector-im/riot-web/issues/3148
-    console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
-    dis.dispatch({
-        action: 'message_send_failed',
-    });
-}
-
-function rangeEquals(a: Range, b: Range): boolean {
-    return (a.anchor.key === b.anchor.key
-        && a.anchor.offset === b.anchorOffset
-        && a.focus.key === b.focusKey
-        && a.focus.offset === b.focusOffset
-        && a.isFocused === b.isFocused
-        && a.isBackward === b.isBackward);
-}
-
-/*
- * The textInput part of the MessageComposer
- */
-export default class MessageComposerInput extends React.Component {
-    static propTypes = {
-        // js-sdk Room object
-        room: PropTypes.object.isRequired,
-
-        onInputStateChanged: PropTypes.func,
-    };
-
-    client: MatrixClient;
-    autocomplete: Autocomplete;
-    historyManager: SlateComposerHistoryManager;
-
-    constructor(props) {
-        super(props);
-
-        const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
-
-        Analytics.setRichtextMode(isRichTextEnabled);
-
-        this.client = MatrixClientPeg.get();
-
-        // track whether we should be trying to show autocomplete suggestions on the current editor
-        // contents. currently it's only suppressed when navigating history to avoid ugly flashes
-        // of unexpected corrections as you navigate.
-        // XXX: should this be in state?
-        this.suppressAutoComplete = false;
-
-        // track whether we've just pressed an arrowkey left or right in order to skip void nodes.
-        // 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.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
-
-        this.md = new Md({
-            rules: [
-                {
-                    // if serialize returns undefined it falls through to the default hardcoded
-                    // serialization rules
-                    serialize: (obj, children) => {
-                        if (obj.object !== 'inline') return;
-                        switch (obj.type) {
-                            case 'pill':
-                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
-                            case 'emoji':
-                                return obj.data.get('emojiUnicode');
-                        }
-                    },
-                }, {
-                    serialize: (obj, children) => {
-                        if (obj.object !== 'mark') return;
-                        // XXX: slate-md-serializer consumes marks other than bold, italic, code, inserted, deleted
-                        switch (obj.type) {
-                            case 'underlined':
-                                return `<u>${ children }</u>`;
-                            case 'deleted':
-                                return `<del>${ children }</del>`;
-                            case 'code':
-                                // XXX: we only ever get given `code` regardless of whether it was inline or block
-                                // XXX: workaround for https://github.com/tommoor/slate-md-serializer/issues/14
-                                // strip single backslashes from children, as they would have been escaped here
-                                return `\`${ children.split('\\').map((v) => v ? v : '\\').join('') }\``;
-                        }
-                    },
-                },
-            ],
-        });
-
-        this.html = new Html({
-            rules: [
-                {
-                    deserialize: (el, next) => {
-                        const tag = el.tagName.toLowerCase();
-                        let type = BLOCK_TAGS[tag];
-                        if (type) {
-                            return {
-                                object: 'block',
-                                type: type,
-                                nodes: next(el.childNodes),
-                            };
-                        }
-                        type = MARK_TAGS[tag];
-                        if (type) {
-                            return {
-                                object: 'mark',
-                                type: type,
-                                nodes: next(el.childNodes),
-                            };
-                        }
-                        // special case links
-                        if (tag === 'a') {
-                            const href = el.getAttribute('href');
-                            const permalinkEntity = getPrimaryPermalinkEntity(href);
-                            if (permalinkEntity) {
-                                return {
-                                    object: 'inline',
-                                    type: 'pill',
-                                    data: {
-                                        href,
-                                        completion: el.innerText,
-                                        completionId: permalinkEntity,
-                                    },
-                                };
-                            } else {
-                                return {
-                                    object: 'inline',
-                                    type: 'link',
-                                    data: { href },
-                                    nodes: next(el.childNodes),
-                                };
-                            }
-                        }
-                    },
-                    serialize: (obj, children) => {
-                        if (obj.object === 'block') {
-                            return this.renderNode({
-                                node: obj,
-                                children: children,
-                            });
-                        } else if (obj.object === 'mark') {
-                            return this.renderMark({
-                                mark: obj,
-                                children: children,
-                            });
-                        } else if (obj.object === 'inline') {
-                            // special case links, pills and emoji otherwise we
-                            // end up with React components getting rendered out(!)
-                            switch (obj.type) {
-                                case 'pill':
-                                    return <a href={ obj.data.get('href') }>{ obj.data.get('completion') }</a>;
-                                case 'link':
-                                    return <a href={ obj.data.get('href') }>{ children }</a>;
-                                case 'emoji':
-                                    // XXX: apparently you can't return plain strings from serializer rules
-                                    // until https://github.com/ianstormtaylor/slate/pull/1854 is merged.
-                                    // So instead we temporarily wrap emoji from RTE in a span.
-                                    return <span>{ obj.data.get('emojiUnicode') }</span>;
-                            }
-                            return this.renderNode({
-                                node: obj,
-                                children: children,
-                            });
-                        }
-                    },
-                },
-            ],
-        });
-
-        const savedState = MessageComposerStore.getEditorState(this.props.room.roomId);
-        this.state = {
-            // whether we're in rich text or markdown mode
-            isRichTextEnabled,
-
-            // the currently displayed editor state (note: this is always what is modified on input)
-            editorState: this.createEditorState(
-                isRichTextEnabled,
-                savedState ? savedState.editor_state : undefined,
-                savedState ? savedState.rich_text : undefined,
-            ),
-
-            // the original editor state, before we started tabbing through completions
-            originalEditorState: null,
-
-            // the virtual state "above" the history stack, the message currently being composed that
-            // we want to persist whilst browsing history
-            currentlyComposedEditorState: null,
-
-            // whether there were any completions
-            someCompletions: null,
-        };
-    }
-
-    /*
-     * "Does the right thing" to create an Editor value, based on:
-     * - whether we've got rich text mode enabled
-     * - contentState was passed in
-     * - whether the contentState that was passed in was rich text
-     */
-    createEditorState(wantRichText: boolean, editorState: ?Value, wasRichText: ?boolean): Value {
-        if (editorState instanceof Value) {
-            if (wantRichText && !wasRichText) {
-                return this.mdToRichEditorState(editorState);
-            }
-            if (wasRichText && !wantRichText) {
-                return this.richToMdEditorState(editorState);
-            }
-            return editorState;
-        } else {
-            // ...or create a new one. and explicitly focus it otherwise tab in-out issues
-            const base = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-            return base.change().focus().value;
-        }
-    }
-
-    componentWillMount() {
-        this.dispatcherRef = dis.register(this.onAction);
-        this.historyManager = new SlateComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
-    }
-
-    _collectEditor = (e) => {
-        this._editor = e;
-    }
-
-    onAction = (payload) => {
-        const editorState = this.state.editorState;
-
-        switch (payload.action) {
-            case 'reply_to_event':
-            case 'focus_composer':
-                this.focusComposer();
-                break;
-            case 'insert_mention':
-                {
-                    // Pretend that we've autocompleted this user because keeping two code
-                    // paths for inserting a user pill is not fun
-                    const selection = this.getSelectionRange(this.state.editorState);
-                    const member = this.props.room.getMember(payload.user_id);
-                    const completion = member ?
-                        member.rawDisplayName : payload.user_id;
-                    this.setDisplayedCompletion({
-                        completion,
-                        completionId: payload.user_id,
-                        selection,
-                        href: makeUserPermalink(payload.user_id),
-                        suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
-                    });
-                }
-                break;
-            case 'quote': {
-                const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, {
-                    forComposerQuote: true,
-                    returnString: true,
-                });
-                const fragment = this.html.deserialize(html);
-                // FIXME: do we want to put in a permalink to the original quote here?
-                // If so, what should be the format, and how do we differentiate it from replies?
-
-                const quote = Block.create('block-quote');
-                if (this.state.isRichTextEnabled) {
-                    let change = editorState.change();
-                    const anchorText = editorState.anchorText;
-                    if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) {
-                        // replace the current block rather than split the block
-                        // XXX: this destroys our focus by deleting the thing we are anchored/focused on
-                        change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
-                    } else {
-                        // insert it into the middle of the block (splitting it)
-                        change = change.insertBlock(quote);
-                    }
-
-                    // XXX: heuristic to strip out wrapping <p> which breaks quoting in RT mode
-                    if (fragment.document.nodes.size && fragment.document.nodes.get(0).type === DEFAULT_NODE) {
-                        change = change.insertFragmentByKey(quote.key, 0, fragment.document.nodes.get(0));
-                    } else {
-                        change = change.insertFragmentByKey(quote.key, 0, fragment.document);
-                    }
-
-                    // XXX: this is to bring back the focus in a sane place and add a paragraph after it
-                    change = change.select(Range.create({
-                        anchor: {
-                            key: quote.key,
-                        },
-                        focus: {
-                            key: quote.key,
-                        },
-                    })).moveToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
-
-                    this.onChange(change);
-                } else {
-                    const fragmentChange = fragment.change();
-                    fragmentChange.moveToRangeOfNode(fragment.document)
-                                  .wrapBlock(quote);
-
-                    // FIXME: handle pills and use commonmark rather than md-serialize
-                    const md = this.md.serialize(fragmentChange.value);
-                    const change = editorState.change()
-                                            .insertText(md + '\n\n')
-                                            .focus();
-                    this.onChange(change);
-                }
-            }
-                break;
-        }
-    };
-
-    onChange = (change: Change, originalEditorState?: Value) => {
-        let editorState = change.value;
-
-        if (this.direction !== '') {
-            const focusedNode = editorState.focusInline || editorState.focusText;
-            if (editorState.schema.isVoid(focusedNode)) {
-                // XXX: does this work in RTL?
-                const edge = this.direction === 'Previous' ? 'End' : 'Start';
-                if (editorState.selection.isCollapsed) {
-                    change = change[`moveTo${ edge }Of${ this.direction }Text`]();
-                } else {
-                    const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText;
-                    if (block) {
-                        change = change[`moveFocusTo${ edge }OfNode`](block);
-                    }
-                }
-                editorState = change.value;
-            }
-        }
-
-        // when in autocomplete mode and selection changes hide the autocomplete.
-        // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
-        if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
-            !rangeEquals(this.state.editorState.selection, editorState.selection) &&
-            // XXX: the heuristic failed when inlines like pills weren't taken into account. This is inideal
-            this.state.editorState.document.toJSON() === editorState.document.toJSON()) {
-            this.autocomplete.hide();
-        }
-
-        if (Plain.serialize(editorState) !== '') {
-            TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, true);
-        } else {
-            TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, false);
-        }
-
-        if (editorState.startText !== null) {
-            const text = editorState.startText.text;
-            const currentStartOffset = editorState.selection.start.offset;
-
-            // Automatic replacement of plaintext emoji to Unicode emoji
-            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
-                // The first matched group includes just the matched plaintext emoji
-                const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset));
-                if (emoticonMatch) {
-                    const query = emoticonMatch[1].toLowerCase().replace("-", "");
-                    const data = EMOTICON_TO_EMOJI.get(query);
-
-                    // only perform replacement if we found a match, otherwise we would be not letting user type
-                    if (data) {
-                        const range = Range.create({
-                            anchor: {
-                                key: editorState.startText.key,
-                                offset: currentStartOffset - emoticonMatch[1].length - 1,
-                            },
-                            focus: {
-                                key: editorState.startText.key,
-                                offset: currentStartOffset - 1,
-                            },
-                        });
-                        change = change.insertTextAtRange(range, data.unicode);
-                        editorState = change.value;
-                    }
-                }
-            }
-        }
-
-        if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
-            let blockType = editorState.blocks.first().type;
-            // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
-
-            if (blockType === 'list-item') {
-                const parent = editorState.document.getParent(editorState.blocks.first().key);
-                if (parent.type === 'numbered-list') {
-                    blockType = 'numbered-list';
-                } else if (parent.type === 'bulleted-list') {
-                    blockType = 'bulleted-list';
-                }
-            }
-            const inputState = {
-                marks: editorState.activeMarks,
-                blockType,
-            };
-            this.props.onInputStateChanged(inputState);
-        }
-
-        // Record the editor state for this room so that it can be retrieved after switching to another room and back
-        MessageComposerStore.setEditorState(this.props.room.roomId, editorState, this.state.isRichTextEnabled);
-
-        this.setState({
-            editorState,
-            originalEditorState: originalEditorState || null,
-        });
-    };
-
-    mdToRichEditorState(editorState: Value): Value {
-        // for consistency when roundtripping, we could use slate-md-serializer rather than
-        // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
-        // them and doesn't have any extensibility hooks.
-        //
-        // The code looks like this:
-        //
-        // const markdown = this.plainWithMdPills.serialize(editorState);
-        //
-        // // weirdly, the Md serializer can't deserialize '' to a valid Value...
-        // if (markdown !== '') {
-        //     editorState = this.md.deserialize(markdown);
-        // }
-        // else {
-        //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-        // }
-
-        // so, instead, we use commonmark proper (which is arguably more logical to the user
-        // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
-        // but the HTML->MD conversion is anyone's guess).
-
-        const textWithMdPills = this.plainWithMdPills.serialize(editorState);
-        const markdown = new Markdown(textWithMdPills);
-        // HTML deserialize has custom rules to turn permalinks into pill objects.
-        return this.html.deserialize(markdown.toHTML());
-    }
-
-    richToMdEditorState(editorState: Value): Value {
-        // FIXME: this conversion loses pills (turning them into pure MD links).
-        // We need to add a pill-aware deserialize method
-        // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
-        return Plain.deserialize(
-            // FIXME: we compile the MD out of the RTE state using slate-md-serializer
-            // which doesn't roundtrip symmetrically with commonmark, which we use for
-            // compiling MD out of the MD editor state above.
-            this.md.serialize(editorState),
-            { defaultBlock: DEFAULT_NODE },
-        );
-    }
-
-    enableRichtext(enabled: boolean) {
-        if (enabled === this.state.isRichTextEnabled) return;
-
-        Analytics.setRichtextMode(enabled);
-
-        this.setState({
-            editorState: this.createEditorState(
-                enabled,
-                this.state.editorState,
-                this.state.isRichTextEnabled,
-            ),
-            isRichTextEnabled: enabled,
-        }, () => {
-            this._editor.focus();
-            if (this.props.onInputStateChanged) {
-                this.props.onInputStateChanged({
-                    isRichTextEnabled: enabled,
-                });
-            }
-        });
-
-        SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
-    }
-
-    /**
-    * Check if the current selection has a mark with `type` in it.
-    *
-    * @param {String} type
-    * @return {Boolean}
-    */
-
-    hasMark = type => {
-        const { editorState } = this.state;
-        return editorState.activeMarks.some(mark => mark.type === type);
-    };
-
-    /**
-    * Check if the any of the currently selected blocks are of `type`.
-    *
-    * @param {String} type
-    * @return {Boolean}
-    */
-
-    hasBlock = type => {
-        const { editorState } = this.state;
-        return editorState.blocks.some(node => node.type === type);
-    };
-
-    onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
-        this.suppressAutoComplete = false;
-        this.direction = '';
-
-        // Navigate autocomplete list with arrow keys
-        if (this.autocomplete.countCompletions() > 0) {
-            if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) {
-                switch (ev.key) {
-                    case Key.ARROW_UP:
-                        this.autocomplete.moveSelection(-1);
-                        ev.preventDefault();
-                        return true;
-                    case Key.ARROW_DOWN:
-                        this.autocomplete.moveSelection(+1);
-                        ev.preventDefault();
-                        return true;
-                }
-            }
-        }
-
-        // skip void nodes - see
-        // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
-        if (ev.key === Key.ARROW_LEFT) {
-            this.direction = 'Previous';
-        } else if (ev.key === Key.ARROW_RIGHT) {
-            this.direction = 'Next';
-        }
-
-        switch (ev.key) {
-            case Key.ENTER:
-                return this.handleReturn(ev, change);
-            case Key.BACKSPACE:
-                return this.onBackspace(ev, change);
-            case Key.ARROW_UP:
-                return this.onVerticalArrow(ev, true);
-            case Key.ARROW_DOWN:
-                return this.onVerticalArrow(ev, false);
-            case Key.TAB:
-                return this.onTab(ev);
-            case Key.ESCAPE:
-                return this.onEscape(ev);
-            case Key.SPACE:
-                return this.onSpace(ev, change);
-        }
-
-        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
-            const ctrlCmdCommand = {
-                // C-m => Toggles between rich text and markdown modes
-                [Key.M]: 'toggle-mode',
-                [Key.B]: 'bold',
-                [Key.I]: 'italic',
-                [Key.U]: 'underlined',
-                [Key.J]: 'inline-code',
-            }[ev.key];
-
-            if (ctrlCmdCommand) {
-                ev.preventDefault(); // to prevent clashing with Mac's minimize window
-                return this.handleKeyCommand(ctrlCmdCommand);
-            }
-        }
-    };
-
-    onSpace = (ev: KeyboardEvent, change: Change): Change => {
-        if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) {
-            return;
-        }
-
-        // drop a point in history so the user can undo a word
-        // XXX: this seems nasty but adding to history manually seems a no-go
-        ev.preventDefault();
-        return change.withoutMerging(() => {
-            change.insertText(ev.key);
-        });
-    };
-
-    onBackspace = (ev: KeyboardEvent, change: Change): Change => {
-        if (ev.metaKey || ev.altKey || ev.shiftKey) {
-            return;
-        }
-
-        const { editorState } = this.state;
-
-        // Allow Ctrl/Cmd-Backspace when focus starts at the start of the composer (e.g select-all)
-        // for some reason if slate sees you Ctrl-backspace and your anchor.offset=0 it just resets your focus
-        // XXX: Doing this now seems to put slate into a broken state, and it didn't appear to be doing
-        // what it claims to do on the old version of slate anyway...
-        /*if (!editorState.isCollapsed && editorState.selection.anchor.offset === 0) {
-            return change.delete();
-        }*/
-
-        if (this.state.isRichTextEnabled) {
-            // let backspace exit lists
-            const isList = this.hasBlock('list-item');
-
-            if (isList && editorState.selection.anchor.offset == 0) {
-                change
-                    .setBlocks(DEFAULT_NODE)
-                    .unwrapBlock('bulleted-list')
-                    .unwrapBlock('numbered-list');
-                return change;
-            } else if (editorState.selection.anchor.offset == 0 && editorState.isCollapsed) {
-                // turn blocks back into paragraphs
-                if ((this.hasBlock('block-quote') ||
-                     this.hasBlock('heading1') ||
-                     this.hasBlock('heading2') ||
-                     this.hasBlock('heading3') ||
-                     this.hasBlock('heading4') ||
-                     this.hasBlock('heading5') ||
-                     this.hasBlock('heading6') ||
-                     this.hasBlock('code'))) {
-                    return change.setBlocks(DEFAULT_NODE);
-                }
-
-                // remove paragraphs entirely if they're nested
-                const parent = editorState.document.getParent(editorState.anchorBlock.key);
-                if (editorState.selection.anchor.offset == 0 &&
-                    this.hasBlock('paragraph') &&
-                    parent.nodes.size == 1 &&
-                    parent.object !== 'document') {
-                    return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
-                                 .moveToEndOfNode(parent)
-                                 .focus();
-                }
-            }
-        }
-        return;
-    };
-
-    handleKeyCommand = (command: string): boolean => {
-        if (command === 'toggle-mode') {
-            this.enableRichtext(!this.state.isRichTextEnabled);
-            return true;
-        }
-
-        //const newState: ?Value = null;
-
-        // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
-        if (this.state.isRichTextEnabled) {
-            const type = command;
-            const { editorState } = this.state;
-            const change = editorState.change();
-            const { document } = editorState;
-            switch (type) {
-                // list-blocks:
-                case 'bulleted-list':
-                case 'numbered-list': {
-                    // Handle the extra wrapping required for list buttons.
-                    const isList = this.hasBlock('list-item');
-                    const isType = editorState.blocks.some(block => {
-                        return !!document.getClosest(block.key, parent => parent.type === type);
-                    });
-
-                    if (isList && isType) {
-                        change
-                            .setBlocks(DEFAULT_NODE)
-                            .unwrapBlock('bulleted-list')
-                            .unwrapBlock('numbered-list');
-                    } else if (isList) {
-                        change
-                            .unwrapBlock(
-                                type === 'bulleted-list' ? 'numbered-list' : 'bulleted-list',
-                            )
-                            .wrapBlock(type);
-                    } else {
-                        change.setBlocks('list-item').wrapBlock(type);
-                    }
-                }
-                break;
-
-                // simple blocks
-                case 'paragraph':
-                case 'block-quote':
-                case 'heading1':
-                case 'heading2':
-                case 'heading3':
-                case 'heading4':
-                case 'heading5':
-                case 'heading6':
-                case 'list-item':
-                case 'code': {
-                    const isActive = this.hasBlock(type);
-                    const isList = this.hasBlock('list-item');
-
-                    if (isList) {
-                        change
-                            .setBlocks(isActive ? DEFAULT_NODE : type)
-                            .unwrapBlock('bulleted-list')
-                            .unwrapBlock('numbered-list');
-                    } else {
-                        change.setBlocks(isActive ? DEFAULT_NODE : type);
-                    }
-                }
-                break;
-
-                // marks:
-                case 'bold':
-                case 'italic':
-                case 'inline-code':
-                case 'underlined':
-                case 'deleted': {
-                    change.toggleMark(type === 'inline-code' ? 'code' : type);
-                }
-                break;
-
-                default:
-                    console.warn(`ignoring unrecognised RTE command ${type}`);
-                    return false;
-            }
-
-            this.onChange(change);
-
-            return true;
-        } else {
-/*
-            const contentState = this.state.editorState.getCurrentContent();
-            const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState);
-
-            const selectionState = this.state.editorState.getSelection();
-            const start = selectionState.getStartOffset();
-            const end = selectionState.getEndOffset();
-
-            // If multiple lines are selected or nothing is selected, insert a code block
-            // instead of applying inline code formatting. This is an attempt to mimic what
-            // happens in non-MD mode.
-            const treatInlineCodeAsBlock = multipleLinesSelected || start === end;
-            const textMdCodeBlock = (text) => `\`\`\`\n${text}\n\`\`\`\n`;
-            const modifyFn = {
-                'bold': (text) => `**${text}**`,
-                'italic': (text) => `*${text}*`,
-                'underline': (text) => `<u>${text}</u>`,
-                'strike': (text) => `<del>${text}</del>`,
-                // ("code" is triggered by ctrl+j by draft-js by default)
-                'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
-                'code': textMdCodeBlock,
-                'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
-                'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
-                'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''),
-            }[command];
-
-            const selectionAfterOffset = {
-                'bold': -2,
-                'italic': -1,
-                'underline': -4,
-                'strike': -6,
-                'code': treatInlineCodeAsBlock ? -5 : -1,
-                'code': -5,
-                'blockquote': -2,
-            }[command];
-
-            // Returns a function that collapses a selection to its end and moves it by offset
-            const collapseAndOffsetSelection = (selection, offset) => {
-                const key = selection.endKey();
-                return new Range({
-                    anchorKey: key, anchor.offset: offset,
-                    focus.key: key, focus.offset: offset,
-                });
-            };
-
-            if (modifyFn) {
-
-                const previousSelection = this.state.editorState.getSelection();
-                const newContentState = RichText.modifyText(contentState, previousSelection, modifyFn);
-                newState = EditorState.push(
-                    this.state.editorState,
-                    newContentState,
-                    'insert-characters',
-                );
-
-                let newSelection = newContentState.getSelectionAfter();
-                // If the selection range is 0, move the cursor inside the formatted body
-                if (previousSelection.getStartOffset() === previousSelection.getEndOffset() &&
-                    previousSelection.getStartKey() === previousSelection.getEndKey() &&
-                    selectionAfterOffset !== undefined
-                ) {
-                    const selectedBlock = newContentState.getBlockForKey(previousSelection.getAnchorKey());
-                    const blockLength = selectedBlock.getText().length;
-                    const newOffset = blockLength + selectionAfterOffset;
-                    newSelection = collapseAndOffsetSelection(newSelection, newOffset);
-                }
-
-                newState = EditorState.forceSelection(newState, newSelection);
-            }
-        }
-
-        if (newState != null) {
-            this.setState({editorState: newState});
-            return true;
-        }
-*/
-        }
-        return false;
-    };
-
-    onPaste = (event: Event, change: Change, editor: Editor): Change => {
-        const transfer = getEventTransfer(event);
-
-        switch (transfer.type) {
-            case 'files':
-                // This actually not so much for 'files' as such (at time of writing
-                // neither chrome nor firefox let you paste a plain file copied
-                // from Finder) but more images copied from a different website
-                // / word processor etc.
-                return ContentMessages.sharedInstance().sendContentListToRoom(
-                    transfer.files, this.props.room.roomId, this.client,
-                );
-            case 'html': {
-                if (this.state.isRichTextEnabled) {
-                    // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
-                    // that we will silently discard nested blocks (e.g. nested lists) :(
-                    const fragment = this.html.deserialize(transfer.html);
-                    return change
-                    // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
-                    // .setOperationFlag("skip", false)
-                    // .setOperationFlag("merge", false)
-                        .insertFragment(fragment.document);
-                } else {
-                    // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain
-                    return change.withoutMerging(() => {
-                        change.insertText(transfer.text);
-                    });
-                }
-            }
-            case 'text':
-                // don't skip/merge so that multiple consecutive pastes can be undone individually
-                return change.withoutMerging(() => {
-                    change.insertText(transfer.text);
-                });
-        }
-    };
-
-    handleReturn = (ev, change) => {
-        const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-        if (ev.shiftKey || (isMac && ev.altKey)) {
-            return change.insertText('\n');
-        }
-
-        if (this.autocomplete.hasSelection()) {
-            this.autocomplete.hide();
-            ev.preventDefault();
-            return true;
-        }
-
-        const editorState = this.state.editorState;
-
-        const lastBlock = editorState.blocks.last();
-        if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) {
-            const text = lastBlock.text;
-            if (text === '') {
-                // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
-                return change
-                    .setBlocks(DEFAULT_NODE)
-                    .unwrapBlock('bulleted-list')
-                    .unwrapBlock('numbered-list');
-            }
-
-            // TODO strip trailing lines from blockquotes/list entries
-            // the below code seemingly works but doesn't account for edge cases like return with caret not at end
-            /* const trailingNewlines = text.match(/\n*$/);
-            if (trailingNewlines && trailingNewlines[0]) {
-                remove trailing newlines at the end of this block before making a new one
-                return change.deleteBackward(trailingNewlines[0].length);
-            }*/
-
-            return;
-        }
-
-        let contentText;
-        let contentHTML;
-
-        // 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; let commandText;
-        const firstChild = editorState.document.nodes.get(0);
-        const firstGrandChild = firstChild && firstChild.nodes.get(0);
-        if (firstChild && firstGrandChild &&
-            firstChild.object === 'block' && firstGrandChild.object === 'text' &&
-            firstGrandChild.text[0] === '/') {
-            commandText = this.plainWithIdPills.serialize(editorState);
-            cmd = processCommandInput(this.props.room.roomId, commandText);
-        }
-
-        if (cmd) {
-            if (!cmd.error) {
-                this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
-                this.setState({
-                    editorState: this.createEditorState(),
-                }, ()=>{
-                    this._editor.focus();
-                });
-            }
-            if (cmd.promise) {
-                cmd.promise.then(()=>{
-                    console.log("Command success.");
-                }, (err)=>{
-                    console.error("Command failure: %s", err);
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Server error', '', ErrorDialog, {
-                        title: _t("Server error"),
-                        description: ((err && err.message) ? err.message : _t(
-                            "Server unavailable, overloaded, or something else went wrong.",
-                        )),
-                    });
-                });
-            } else if (cmd.error) {
-                console.error(cmd.error);
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                // TODO possibly track which command they ran (not its Arguments) here
-                Modal.createTrackedDialog('Command error', '', ErrorDialog, {
-                    title: _t("Command error"),
-                    description: cmd.error,
-                });
-            }
-            return true;
-        }
-
-        const replyingToEv = RoomViewStore.getQuotingEvent();
-        const mustSendHTML = Boolean(replyingToEv);
-
-        if (this.state.isRichTextEnabled) {
-            // We should only send HTML if any block is styled or contains inline style
-            let shouldSendHTML = false;
-
-            if (mustSendHTML) shouldSendHTML = true;
-
-            if (!shouldSendHTML) {
-                shouldSendHTML = !!editorState.document.findDescendant(node => {
-                    // N.B. node.getMarks() might be private?
-                    return ((node.object === 'block' && node.type !== 'paragraph') ||
-                            (node.object === 'inline') ||
-                            (node.object === 'text' && node.getMarks().size > 0));
-                });
-            }
-
-            contentText = this.plainWithPlainPills.serialize(editorState);
-            if (contentText === '') return true;
-
-            if (shouldSendHTML) {
-                contentHTML = HtmlUtils.processHtmlForSending(this.html.serialize(editorState));
-            }
-        } else {
-            const sourceWithPills = this.plainWithMdPills.serialize(editorState);
-            if (sourceWithPills === '') return true;
-
-            const mdWithPills = new Markdown(sourceWithPills);
-
-            // if contains no HTML and we're not quoting (needing HTML)
-            if (mdWithPills.isPlainText() && !mustSendHTML) {
-                // N.B. toPlainText is only usable here because we know that the MD
-                // didn't contain any formatting in the first place...
-                contentText = mdWithPills.toPlaintext();
-            } else {
-                // to avoid ugliness on clients which ignore the HTML body we don't
-                // send pills in the plaintext body.
-                contentText = this.plainWithPlainPills.serialize(editorState);
-                contentHTML = mdWithPills.toHTML();
-            }
-        }
-
-        let sendHtmlFn = ContentHelpers.makeHtmlMessage;
-        let sendTextFn = ContentHelpers.makeTextMessage;
-
-        this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
-
-        if (commandText && commandText.startsWith('/me')) {
-            if (replyingToEv) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, {
-                    title: _t("Unable to reply"),
-                    description: _t("At this time it is not possible to reply with an emote."),
-                });
-                return false;
-            }
-
-            contentText = contentText.substring(4);
-            // bit of a hack, but the alternative would be quite complicated
-            if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, '');
-            sendHtmlFn = ContentHelpers.makeHtmlEmote;
-            sendTextFn = ContentHelpers.makeEmoteMessage;
-        }
-
-        let content = contentHTML ?
-                      sendHtmlFn(contentText, contentHTML) :
-                      sendTextFn(contentText);
-
-        if (replyingToEv) {
-            const replyContent = ReplyThread.makeReplyMixIn(replyingToEv);
-            content = Object.assign(replyContent, content);
-
-            // Part of Replies fallback support - prepend the text we're sending
-            // with the text we're replying to
-            const nestedReply = ReplyThread.getNestedReplyText(replyingToEv, this.props.permalinkCreator);
-            if (nestedReply) {
-                if (content.formatted_body) {
-                    content.formatted_body = nestedReply.html + content.formatted_body;
-                }
-                content.body = nestedReply.body + content.body;
-            }
-
-            // Clear reply_to_event as we put the message into the queue
-            // if the send fails, retry will handle resending.
-            dis.dispatch({
-                action: 'reply_to_event',
-                event: null,
-            });
-        }
-
-        this.client.sendMessage(this.props.room.roomId, content).then((res) => {
-            dis.dispatch({
-                action: 'message_sent',
-            });
-        }).catch((e) => {
-            onSendMessageFailed(e, this.props.room);
-        });
-
-        this.setState({
-            editorState: this.createEditorState(),
-        }, ()=>{ this._editor.focus(); });
-
-        return true;
-    };
-
-    onVerticalArrow = (e, up) => {
-        if (e.ctrlKey || e.shiftKey || e.metaKey) return;
-
-        const shouldSelectHistory = e.altKey;
-        const shouldEditLastMessage = !e.altKey && up && !RoomViewStore.getQuotingEvent();
-
-        if (shouldSelectHistory) {
-            // Try select composer history
-            const selected = this.selectHistory(up);
-            if (selected) {
-                // We're selecting history, so prevent the key event from doing anything else
-                e.preventDefault();
-            }
-        } else if (shouldEditLastMessage) {
-            // selection must be collapsed
-            const selection = this.state.editorState.selection;
-            if (!selection.isCollapsed) return;
-            // and we must be at the edge of the document (up=start, down=end)
-            const document = this.state.editorState.document;
-            if (up) {
-                if (!selection.anchor.isAtStartOfNode(document)) return;
-            } else {
-                if (!selection.anchor.isAtEndOfNode(document)) return;
-            }
-
-            const editEvent = findEditableEvent(this.props.room, false);
-            if (editEvent) {
-                // We're selecting history, so prevent the key event from doing anything else
-                e.preventDefault();
-                dis.dispatch({
-                    action: 'edit_event',
-                    event: editEvent,
-                });
-            }
-        }
-    };
-
-    selectHistory = (up) => {
-        const delta = up ? -1 : 1;
-
-        // True if we are not currently selecting history, but composing a message
-        if (this.historyManager.currentIndex === this.historyManager.history.length) {
-            // We can't go any further - there isn't any more history, so nop.
-            if (!up) {
-                return;
-            }
-            this.setState({
-                currentlyComposedEditorState: this.state.editorState,
-            });
-        } else if (this.historyManager.currentIndex + delta === this.historyManager.history.length) {
-            // True when we return to the message being composed currently
-            this.setState({
-                editorState: this.state.currentlyComposedEditorState,
-            });
-            this.historyManager.currentIndex = this.historyManager.history.length;
-            return;
-        }
-
-        let editorState;
-        const historyItem = this.historyManager.getItem(delta);
-        if (!historyItem) return;
-
-        if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
-            editorState = this.richToMdEditorState(historyItem.value);
-        } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
-            editorState = this.mdToRichEditorState(historyItem.value);
-        } else {
-            editorState = historyItem.value;
-        }
-
-        // Move selection to the end of the selected history
-        const change = editorState.change().moveToEndOfNode(editorState.document);
-
-        // We don't call this.onChange(change) now, as fixups on stuff like pills
-        // should already have been done and persisted in the history.
-        editorState = change.value;
-
-        this.suppressAutoComplete = true;
-
-        this.setState({ editorState }, ()=>{
-            this._editor.focus();
-        });
-        return true;
-    };
-
-    onTab = async (e) => {
-        this.setState({
-            someCompletions: null,
-        });
-        e.preventDefault();
-        if (this.autocomplete.countCompletions() === 0) {
-            // Force completions to show for the text currently entered
-            const completionCount = await this.autocomplete.forceComplete();
-            this.setState({
-                someCompletions: completionCount > 0,
-            });
-            // Select the first item by moving "down"
-            await this.autocomplete.moveSelection(+1);
-        } else {
-            await this.autocomplete.moveSelection(e.shiftKey ? -1 : +1);
-        }
-    };
-
-    onEscape = async (e) => {
-        e.preventDefault();
-        if (this.autocomplete) {
-            this.autocomplete.onEscape(e);
-        }
-        await this.setDisplayedCompletion(null); // restore originalEditorState
-    };
-
-    onAutocompleteConfirm = (displayedCompletion: ?Completion) => {
-        this.focusComposer();
-        // XXX: this fails if the composer isn't focused so focus it and delay the completion until next tick
-        setImmediate(() => {
-            this.setDisplayedCompletion(displayedCompletion);
-        });
-    };
-
-    /* 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 => {
-        const activeEditorState = this.state.originalEditorState || this.state.editorState;
-
-        if (displayedCompletion == null) {
-            if (this.state.originalEditorState) {
-                const editorState = this.state.originalEditorState;
-                this.setState({editorState});
-            }
-            return false;
-        }
-
-        const {
-            range = null,
-            completion = '',
-            completionId = '',
-            href = null,
-            suffix = '',
-        } = displayedCompletion;
-
-        let inline;
-        if (href) {
-            inline = Inline.create({
-                type: 'pill',
-                data: { completion, completionId, href },
-            });
-        } else if (completion === '@room') {
-            inline = Inline.create({
-                type: 'pill',
-                data: { completion, completionId },
-            });
-        }
-
-        let editorState = activeEditorState;
-
-        if (range) {
-            const change = editorState.change()
-                                      .moveToAnchor()
-                                      .moveAnchorTo(range.start)
-                                      .moveFocusTo(range.end)
-                                      .focus();
-            editorState = change.value;
-        }
-
-        let change;
-        if (inline) {
-            change = editorState.change()
-                                .insertInlineAtRange(editorState.selection, inline)
-                                .insertText(suffix)
-                                .focus();
-        } else {
-            change = editorState.change()
-                                .insertTextAtRange(editorState.selection, completion)
-                                .insertText(suffix)
-                                .focus();
-        }
-        // for good hygiene, keep editorState updated to track the result of the change
-        // even though we don't do anything subsequently with it
-        editorState = change.value;
-
-        this.onChange(change, activeEditorState);
-
-        return true;
-    };
-
-    renderNode = props => {
-        const { attributes, children, node, isSelected } = props;
-
-        switch (node.type) {
-            case 'paragraph':
-                return <p {...attributes}>{children}</p>;
-            case 'block-quote':
-                return <blockquote {...attributes}>{children}</blockquote>;
-            case 'bulleted-list':
-                return <ul {...attributes}>{children}</ul>;
-            case 'heading1':
-                return <h1 {...attributes}>{children}</h1>;
-            case 'heading2':
-                return <h2 {...attributes}>{children}</h2>;
-            case 'heading3':
-                return <h3 {...attributes}>{children}</h3>;
-            case 'heading4':
-                return <h4 {...attributes}>{children}</h4>;
-            case 'heading5':
-                return <h5 {...attributes}>{children}</h5>;
-            case 'heading6':
-                return <h6 {...attributes}>{children}</h6>;
-            case 'list-item':
-                return <li {...attributes}>{children}</li>;
-            case 'numbered-list':
-                return <ol {...attributes}>{children}</ol>;
-            case 'code':
-                return <pre {...attributes}>{children}</pre>;
-            case 'link':
-                return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
-            case 'pill': {
-                const { data } = node;
-                const url = data.get('href');
-                const completion = data.get('completion');
-
-                const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
-                const Pill = sdk.getComponent('elements.Pill');
-
-                if (completion === '@room') {
-                    return <Pill
-                            type={Pill.TYPE_AT_ROOM_MENTION}
-                            room={this.props.room}
-                            shouldShowPillAvatar={shouldShowPillAvatar}
-                            isSelected={isSelected}
-                            {...attributes}
-                            />;
-                } else if (Pill.isPillUrl(url)) {
-                    return <Pill
-                            url={url}
-                            room={this.props.room}
-                            shouldShowPillAvatar={shouldShowPillAvatar}
-                            isSelected={isSelected}
-                            {...attributes}
-                            />;
-                } else {
-                    const { text } = node;
-                    return <a href={url} {...props.attributes}>
-                                { text }
-                           </a>;
-                }
-            }
-            case 'emoji': {
-                const { data } = node;
-                return data.get('emojiUnicode');
-            }
-        }
-    };
-
-    renderMark = props => {
-        const { children, mark, attributes } = props;
-        switch (mark.type) {
-            case 'bold':
-                return <strong {...attributes}>{children}</strong>;
-            case 'italic':
-                return <em {...attributes}>{children}</em>;
-            case 'code':
-                return <code {...attributes}>{children}</code>;
-            case 'underlined':
-                return <u {...attributes}>{children}</u>;
-            case 'deleted':
-                return <del {...attributes}>{children}</del>;
-        }
-    };
-
-    onFormatButtonClicked = (name, e) => {
-        e.preventDefault();
-
-        // XXX: horrible evil hack to ensure the editor is focused so the act
-        // of focusing it doesn't then cancel the format button being pressed
-        // FIXME: can we just tell handleKeyCommand's change to invoke .focus()?
-        if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
-            this._editor.focus();
-            setTimeout(()=>{
-                this.handleKeyCommand(name);
-            }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early.
-            return;
-        }
-
-        this.handleKeyCommand(name);
-    };
-
-    getAutocompleteQuery(editorState: Value) {
-        // We can just return the current block where the selection begins, which
-        // should be enough to capture any autocompletion input, given autocompletion
-        // providers only search for the first match which intersects with the current selection.
-        // This avoids us having to serialize the whole thing to plaintext and convert
-        // selection offsets in & out of the plaintext domain.
-
-        if (editorState.selection.anchor.key) {
-            return editorState.document.getDescendant(editorState.selection.anchor.key).text;
-        } else {
-            return '';
-        }
-    }
-
-    getSelectionRange(editorState: Value) {
-        let beginning = false;
-        const firstChild = editorState.document.nodes.get(0);
-        const firstGrandChild = firstChild && firstChild.nodes.get(0);
-        beginning = (firstChild && firstGrandChild &&
-                     firstChild.object === 'block' && firstGrandChild.object === 'text' &&
-                     editorState.selection.anchor.key === firstGrandChild.key);
-
-        // return a character range suitable for handing to an autocomplete provider.
-        // the range is relative to the anchor of the current editor selection.
-        // if the selection spans multiple blocks, then we collapse it for the calculation.
-        const range = {
-            beginning, // whether the selection is in the first block of the editor or not
-            start: editorState.selection.anchor.offset,
-            end: (editorState.selection.anchor.key == editorState.selection.focus.key) ?
-                 editorState.selection.focus.offset : editorState.selection.anchor.offset,
-        };
-        if (range.start > range.end) {
-            const tmp = range.start;
-            range.start = range.end;
-            range.end = tmp;
-        }
-        return range;
-    }
-
-    onMarkdownToggleClicked = (e) => {
-        e.preventDefault(); // don't steal focus from the editor!
-        this.handleKeyCommand('toggle-mode');
-    };
-
-    focusComposer = () => {
-        this._editor.focus();
-    };
-
-    render() {
-        const activeEditorState = this.state.originalEditorState || this.state.editorState;
-
-        const className = classNames('mx_MessageComposer_input', {
-            mx_MessageComposer_input_error: this.state.someCompletions === false,
-        });
-
-        const isEmpty = Plain.serialize(this.state.editorState) === '';
-
-        let {placeholder} = this.props;
-        // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text
-        if (isEmpty && this.state.editorState.startBlock && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
-            placeholder = undefined;
-        }
-
-        const markdownClasses = classNames({
-            mx_MessageComposer_input_markdownIndicator: true,
-            mx_MessageComposer_markdownDisabled: this.state.isRichTextEnabled,
-        });
-
-        return (
-            <div className="mx_MessageComposer_input_wrapper" onClick={this.focusComposer}>
-                <div className="mx_MessageComposer_autocomplete_wrapper">
-                    <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
-                    <Autocomplete
-                        ref={(e) => this.autocomplete = e}
-                        room={this.props.room}
-                        onConfirm={this.onAutocompleteConfirm}
-                        onSelectionChange={this.setDisplayedCompletion}
-                        query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) }
-                        selection={this.getSelectionRange(activeEditorState)}
-                    />
-                </div>
-                <div className={className}>
-                    <AccessibleButton className={markdownClasses}
-                        onClick={this.onMarkdownToggleClicked}
-                        title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
-                    />
-                    <Editor ref={this._collectEditor}
-                            dir="auto"
-                            className="mx_MessageComposer_editor"
-                            placeholder={placeholder}
-                            value={this.state.editorState}
-                            onChange={this.onChange}
-                            onKeyDown={this.onKeyDown}
-                            onPaste={this.onPaste}
-                            renderNode={this.renderNode}
-                            renderMark={this.renderMark}
-                            // disable spell check for the placeholder because browsers don't like "unencrypted"
-                            spellCheck={!isEmpty}
-                            schema={SLATE_SCHEMA}
-                            />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
deleted file mode 100644
index 2b68e0d338..0000000000
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 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, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import { _t, _td } from '../../../languageHandler';
-import CallHandler from '../../../CallHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
-import sdk from '../../../index';
-import dis from '../../../dispatcher';
-import RoomViewStore from '../../../stores/RoomViewStore';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import Stickerpicker from './Stickerpicker';
-import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
-import ContentMessages from '../../../ContentMessages';
-
-import E2EIcon from './E2EIcon';
-
-const formatButtonList = [
-    _td("bold"),
-    _td("italic"),
-    _td("deleted"),
-    _td("underlined"),
-    _td("inline-code"),
-    _td("block-quote"),
-    _td("bulleted-list"),
-    _td("numbered-list"),
-];
-
-function ComposerAvatar(props) {
-    const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
-    return <div className="mx_MessageComposer_avatar">
-        <MemberStatusMessageAvatar member={props.me} width={24} height={24} />
-    </div>;
-}
-
-ComposerAvatar.propTypes = {
-    me: PropTypes.object.isRequired,
-}
-
-function CallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onVoiceCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: "voice",
-            room_id: props.roomId,
-        });
-    };
-
-    return <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_voicecall"
-        onClick={onVoiceCallClick}
-        title={_t('Voice call')}
-    />
-}
-
-CallButton.propTypes = {
-    roomId: PropTypes.string.isRequired
-}
-
-function VideoCallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: ev.shiftKey ? "screensharing" : "video",
-            room_id: props.roomId,
-        });
-    };
-
-    return <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_videocall"
-        onClick={onCallClick}
-        title={_t('Video call')}
-    />;
-}
-
-VideoCallButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-};
-
-function HangupButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onHangupClick = () => {
-        const call = CallHandler.getCallForRoom(props.roomId);
-        if (!call) {
-            return;
-        }
-        dis.dispatch({
-            action: 'hangup',
-            // hangup the call for this room, which may not be the room in props
-            // (e.g. conferences which will hangup the 1:1 room instead)
-            room_id: call.roomId,
-        });
-    };
-    return  <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_hangup"
-        onClick={onHangupClick}
-        title={_t('Hangup')}
-    />;
-}
-
-HangupButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-}
-
-function FormattingButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return <AccessibleButton
-        element="img"
-        className="mx_MessageComposer_formatting"
-        alt={_t("Show Text Formatting Toolbar")}
-        title={_t("Show Text Formatting Toolbar")}
-        src={require("../../../../res/img/button-text-formatting.svg")}
-        style={{visibility: props.showFormatting ? 'hidden' : 'visible'}}
-        onClick={props.onClickHandler}
-    />;
-}
-
-FormattingButton.propTypes = {
-    showFormatting: PropTypes.bool.isRequired,
-    onClickHandler: PropTypes.func.isRequired,
-}
-
-class UploadButton extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    }
-    constructor(props) {
-        super(props);
-        this.onUploadClick = this.onUploadClick.bind(this);
-        this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
-
-        this._uploadInput = createRef();
-    }
-
-    onUploadClick(ev) {
-        if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'require_registration'});
-            return;
-        }
-        this._uploadInput.current.click();
-    }
-
-    onUploadFileInputChange(ev) {
-        if (ev.target.files.length === 0) return;
-
-        // take a copy so we can safely reset the value of the form control
-        // (Note it is a FileList: we can't use slice or sesnible iteration).
-        const tfiles = [];
-        for (let i = 0; i < ev.target.files.length; ++i) {
-            tfiles.push(ev.target.files[i]);
-        }
-
-        ContentMessages.sharedInstance().sendContentListToRoom(
-            tfiles, this.props.roomId, MatrixClientPeg.get(),
-        );
-
-        // This is the onChange handler for a file form control, but we're
-        // not keeping any state, so reset the value of the form control
-        // to empty.
-        // NB. we need to set 'value': the 'files' property is immutable.
-        ev.target.value = '';
-    }
-
-    render() {
-        const uploadInputStyle = {display: 'none'};
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (
-            <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_upload"
-                onClick={this.onUploadClick}
-                title={_t('Upload file')}
-            >
-                <input ref={this._uploadInput} type="file"
-                    style={uploadInputStyle}
-                    multiple
-                    onChange={this.onUploadFileInputChange}
-                />
-            </AccessibleButton>
-        );
-    }
-}
-
-export default class SlateMessageComposer extends React.Component {
-    constructor(props) {
-        super(props);
-        this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
-        this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this);
-        this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
-        this.onInputStateChanged = this.onInputStateChanged.bind(this);
-        this.onEvent = this.onEvent.bind(this);
-        this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
-        this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
-        this._onTombstoneClick = this._onTombstoneClick.bind(this);
-        this.renderPlaceholderText = this.renderPlaceholderText.bind(this);
-        this.renderFormatBar = this.renderFormatBar.bind(this);
-
-        this.state = {
-            inputState: {
-                marks: [],
-                blockType: null,
-                isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
-            },
-            showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
-            isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
-            tombstone: this._getRoomTombstone(),
-            canSendMessages: this.props.room.maySendMessage(),
-        };
-    }
-
-    componentDidMount() {
-        // N.B. using 'event' rather than 'RoomEvents' otherwise the crypto handler
-        // for 'event' fires *after* 'RoomEvent', and our room won't have yet been
-        // marked as encrypted.
-        // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
-        MatrixClientPeg.get().on("event", this.onEvent);
-        MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
-        this._waitForOwnMember();
-    }
-
-    _waitForOwnMember() {
-        // if we have the member already, do that
-        const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
-        if (me) {
-            this.setState({me});
-            return;
-        }
-        // Otherwise, wait for member loading to finish and then update the member for the avatar.
-        // The members should already be loading, and loadMembersIfNeeded
-        // will return the promise for the existing operation
-        this.props.room.loadMembersIfNeeded().then(() => {
-            const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
-            this.setState({me});
-        });
-    }
-
-    componentWillUnmount() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("event", this.onEvent);
-            MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
-        }
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
-        }
-    }
-
-    onEvent(event) {
-        if (event.getType() !== 'm.room.encryption') return;
-        if (event.getRoomId() !== this.props.room.roomId) return;
-        this.forceUpdate();
-    }
-
-    _onRoomStateEvents(ev, state) {
-        if (ev.getRoomId() !== this.props.room.roomId) return;
-
-        if (ev.getType() === 'm.room.tombstone') {
-            this.setState({tombstone: this._getRoomTombstone()});
-        }
-        if (ev.getType() === 'm.room.power_levels') {
-            this.setState({canSendMessages: this.props.room.maySendMessage()});
-        }
-    }
-
-    _getRoomTombstone() {
-        return this.props.room.currentState.getStateEvents('m.room.tombstone', '');
-    }
-
-    _onRoomViewStoreUpdate() {
-        const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
-        if (this.state.isQuoting === isQuoting) return;
-        this.setState({ isQuoting });
-    }
-
-
-    onInputStateChanged(inputState) {
-        // Merge the new input state with old to support partial updates
-        inputState = Object.assign({}, this.state.inputState, inputState);
-        this.setState({inputState});
-    }
-
-    _onAutocompleteConfirm(range, completion) {
-        if (this.messageComposerInput) {
-            this.messageComposerInput.setDisplayedCompletion(range, completion);
-        }
-    }
-
-    onFormatButtonClicked(name, event) {
-        event.preventDefault();
-        this.messageComposerInput.onFormatButtonClicked(name, event);
-    }
-
-    onToggleFormattingClicked() {
-        SettingsStore.setValue("MessageComposer.showFormatting", null, SettingLevel.DEVICE, !this.state.showFormatting);
-        this.setState({showFormatting: !this.state.showFormatting});
-    }
-
-    onToggleMarkdownClicked(e) {
-        e.preventDefault(); // don't steal focus from the editor!
-        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichTextEnabled);
-    }
-
-    _onTombstoneClick(ev) {
-        ev.preventDefault();
-
-        const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
-        const replacementRoom = MatrixClientPeg.get().getRoom(replacementRoomId);
-        let createEventId = null;
-        if (replacementRoom) {
-            const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', '');
-            if (createEvent && createEvent.getId()) createEventId = createEvent.getId();
-        }
-
-        const viaServers = [this.state.tombstone.getSender().split(':').splice(1).join(':')];
-        dis.dispatch({
-            action: 'view_room',
-            highlighted: true,
-            event_id: createEventId,
-            room_id: replacementRoomId,
-            auto_join: true,
-
-            // Try to join via the server that sent the event. This converts @something:example.org
-            // into a server domain by splitting on colons and ignoring the first entry ("@something").
-            via_servers: viaServers,
-            opts: {
-                // These are passed down to the js-sdk's /join call
-                viaServers: viaServers,
-            },
-        });
-    }
-
-    renderPlaceholderText() {
-        const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
-        if (this.state.isQuoting) {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted reply…');
-            } else {
-                return _t('Send a reply (unencrypted)…');
-            }
-        } else {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted message…');
-            } else {
-                return _t('Send a message (unencrypted)…');
-            }
-        }
-    }
-
-    renderFormatBar() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const {marks, blockType} = this.state.inputState;
-        const formatButtons = formatButtonList.map((name) => {
-            // special-case to match the md serializer and the special-case in MessageComposerInput.js
-            const markName = name === 'inline-code' ? 'code' : name;
-            const active = marks.some(mark => mark.type === markName) || blockType === name;
-            const suffix = active ? '-on' : '';
-            const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
-            const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
-            return (
-                <img className={className}
-                    title={_t(name)}
-                    onMouseDown={onFormatButtonClicked}
-                    key={name}
-                    src={require(`../../../../res/img/button-text-${name}${suffix}.svg`)}
-                    height="17"
-                />
-            );
-        })
-
-        return (
-            <div className="mx_MessageComposer_formatbar_wrapper">
-                <div className="mx_MessageComposer_formatbar">
-                { formatButtons }
-                <div style={{ flex: 1 }}></div>
-                <AccessibleButton
-                    className="mx_MessageComposer_formatbar_markdown mx_MessageComposer_markdownDisabled"
-                    onClick={this.onToggleMarkdownClicked}
-                    title={_t("Markdown is disabled")}
-                />
-                <AccessibleButton element="img" title={_t("Hide Text Formatting Toolbar")}
-                    onClick={this.onToggleFormattingClicked}
-                    className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
-                    src={require("../../../../res/img/icon-text-cancel.svg")}
-                />
-                </div>
-            </div>
-        );
-    }
-
-    render() {
-        const controls = [
-            this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
-            this.props.e2eStatus ? <E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> : null,
-        ];
-
-        if (!this.state.tombstone && this.state.canSendMessages) {
-            // This also currently includes the call buttons. Really we should
-            // check separately for whether we can call, but this is slightly
-            // complex because of conference calls.
-
-            const MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput");
-            const showFormattingButton = this.state.inputState.isRichTextEnabled;
-            const callInProgress = this.props.callState && this.props.callState !== 'ended';
-
-            controls.push(
-                <MessageComposerInput
-                    ref={(c) => this.messageComposerInput = c}
-                    key="controls_input"
-                    room={this.props.room}
-                    placeholder={this.renderPlaceholderText()}
-                    onInputStateChanged={this.onInputStateChanged}
-                    permalinkCreator={this.props.permalinkCreator} />,
-                showFormattingButton ? <FormattingButton key="controls_formatting"
-                    showFormatting={this.state.showFormatting} onClickHandler={this.onToggleFormattingClicked} /> : null,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
-                <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
-                callInProgress ? <HangupButton key="controls_hangup" roomId={this.props.room.roomId} /> : null,
-                callInProgress ? null : <CallButton key="controls_call" roomId={this.props.room.roomId} />,
-                callInProgress ? null : <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
-            );
-        } else if (this.state.tombstone) {
-            const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
-
-            const continuesLink = replacementRoomId ? (
-                <a href={makeRoomPermalink(replacementRoomId)}
-                    className="mx_MessageComposer_roomReplaced_link"
-                    onClick={this._onTombstoneClick}
-                >
-                    {_t("The conversation continues here.")}
-                </a>
-            ) : '';
-
-            controls.push(<div className="mx_MessageComposer_replaced_wrapper">
-                <div className="mx_MessageComposer_replaced_valign">
-                    <img className="mx_MessageComposer_roomReplaced_icon" src={require("../../../../res/img/room_replaced.svg")} />
-                    <span className="mx_MessageComposer_roomReplaced_header">
-                        {_t("This room has been replaced and is no longer active.")}
-                    </span><br />
-                    { continuesLink }
-                </div>
-            </div>);
-        } else {
-            controls.push(
-                <div key="controls_error" className="mx_MessageComposer_noperm_error">
-                    { _t('You do not have permission to post to this room') }
-                </div>,
-            );
-        }
-
-        const showFormatBar = this.state.showFormatting && this.state.inputState.isRichTextEnabled;
-
-        return (
-            <div className="mx_MessageComposer">
-                <div className="mx_MessageComposer_wrapper">
-                    <div className="mx_MessageComposer_row">
-                        { controls }
-                    </div>
-                </div>
-                { showFormatBar ? this.renderFormatBar() : null }
-            </div>
-        );
-    }
-}
-
-SlateMessageComposer.propTypes = {
-    // js-sdk Room object
-    room: PropTypes.object.isRequired,
-
-    // string representing the current voip call state
-    callState: PropTypes.string,
-
-    // string representing the current room app drawer state
-    showApps: PropTypes.bool
-};
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 6fc854c155..a8a393887b 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -26,7 +26,6 @@ import PlatformPeg from "../../../../../PlatformPeg";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static COMPOSER_SETTINGS = [
-        'useCiderComposer',
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5d32066fd8..9c2105afab 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -362,7 +362,6 @@
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
@@ -956,13 +955,6 @@
     "Strikethrough": "Strikethrough",
     "Code block": "Code block",
     "Quote": "Quote",
-    "Server error": "Server error",
-    "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
-    "Command error": "Command error",
-    "Unable to reply": "Unable to reply",
-    "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",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
@@ -1064,16 +1056,9 @@
     "This Room": "This Room",
     "All Rooms": "All Rooms",
     "Search…": "Search…",
-    "bold": "bold",
-    "italic": "italic",
-    "deleted": "deleted",
-    "underlined": "underlined",
-    "inline-code": "inline-code",
-    "block-quote": "block-quote",
-    "bulleted-list": "bulleted-list",
-    "numbered-list": "numbered-list",
-    "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
-    "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
+    "Server error": "Server error",
+    "Command error": "Command error",
+    "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Failed to connect to integration manager": "Failed to connect to integration manager",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Add some now": "Add some now",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 1d24e81469..14208e1f03 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -161,11 +161,6 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "useCiderComposer": {
-        displayName: _td("Use the new, faster, composer for writing messages"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: true,
-    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
deleted file mode 100644
index ab2dbfedec..0000000000
--- a/src/stores/MessageComposerStore.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2017, 2018 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.
-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 { Value } from 'slate';
-
-const localStoragePrefix = 'editor_state_';
-
-/**
- * A class for storing application state to do with the message composer (specifically in-progress message drafts).
- * It does not worry about cleaning up on log out as this is handled in Lifecycle.js by localStorage.clear()
- */
-class MessageComposerStore {
-    constructor() {
-        this.prefix = localStoragePrefix;
-    }
-
-    _getKey(roomId: string): string {
-        return this.prefix + roomId;
-    }
-
-    setEditorState(roomId: string, editorState: Value, richText: boolean) {
-        localStorage.setItem(this._getKey(roomId), JSON.stringify({
-            editor_state: editorState.toJSON({
-                preserveSelection: true,
-                // XXX: re-hydrating history is not currently supported by fromJSON
-                // preserveHistory: true,
-                // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
-                preserveKeys: true,
-            }),
-            rich_text: richText,
-        }));
-    }
-
-    getEditorState(roomId): {editor_state: Value, rich_text: boolean} {
-        const stateStr = localStorage.getItem(this._getKey(roomId));
-
-        let state;
-        if (stateStr) {
-            state = JSON.parse(stateStr);
-
-            // if it does not have the fields we expect then bail
-            if (!state || state.rich_text === undefined || state.editor_state === undefined) return;
-            state.editor_state = Value.fromJSON(state.editor_state);
-        }
-
-        return state;
-    }
-}
-
-let singletonMessageComposerStore = null;
-if (!singletonMessageComposerStore) {
-    singletonMessageComposerStore = new MessageComposerStore();
-}
-module.exports = singletonMessageComposerStore;
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index 60380eecd2..518e7e06ac 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -19,7 +19,7 @@ function addTextToDraft(text) {
     }
 }
 
-// FIXME: These tests need to be updated from Draft to Slate.
+// FIXME: These tests need to be updated from Draft to CIDER.
 
 xdescribe('MessageComposerInput', () => {
     let parentDiv = null,
diff --git a/yarn.lock b/yarn.lock
index fc2b9e04c4..a491ba3941 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2592,11 +2592,6 @@ dir-glob@^2.2.2:
   dependencies:
     path-type "^3.0.0"
 
-direction@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/direction/-/direction-0.1.5.tgz#ce5d797f97e26f8be7beff53f7dc40e1c1a9ec4c"
-  integrity sha1-zl15f5fib4vnvv9T99xA4cGp7Ew=
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -3065,11 +3060,6 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-esrever@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8"
-  integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g=
-
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
@@ -3653,11 +3643,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-document@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-document/-/get-document-1.0.0.tgz#4821bce66f1c24cb0331602be6cb6b12c4f01c4b"
-  integrity sha1-SCG85m8cJMsDMWAr5strEsTwHEs=
-
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
@@ -3675,13 +3660,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-get-window@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/get-window/-/get-window-1.1.2.tgz#65fbaa999fb87f86ea5d30770f4097707044f47f"
-  integrity sha512-yjWpFcy9fjhLQHW1dPtg9ga4pmizLY8y4ZSHdGrAQ1NU277MRhnGnnLPxe19X8W5lWVsCZz++5xEuNozWMVmTw==
-  dependencies:
-    get-document "1"
-
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -4509,16 +4487,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
   integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
 
-is-hotkey@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-hotkey/-/is-hotkey-0.1.4.tgz#c34d2c85d6ec8d09a871dcf71931c8067a824c7d"
-  integrity sha512-Py+aW4r5mBBY18TGzGz286/gKS+fCQ0Hee3qkaiSmEPiD0PqFpe0wuA3l7rTOUKyeXl8Mxf3XzJxIoTlSv+kxA==
-
-is-in-browser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
-
 is-ip@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-2.0.0.tgz#68eea07e8a0a0a94c2d080dd674c731ab2a461ab"
@@ -4651,11 +4619,6 @@ is-whitespace-character@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
   integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==
 
-is-window@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d"
-  integrity sha1-LIlspT25feRdPDMTOmXYyfVjSA0=
-
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4715,11 +4678,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-base64@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/isomorphic-base64/-/isomorphic-base64-1.0.2.tgz#f426aae82569ba8a4ec5ca73ad21a44ab1ee7803"
-  integrity sha1-9Caq6CVpuopOxcpzrSGkSrHueAM=
-
 isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -5154,7 +5112,7 @@ lodash.unescape@4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@^4.1.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -5379,11 +5337,6 @@ memoize-one@^3.0.1:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17"
   integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA==
 
-memoize-one@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.1.0.tgz#a2387c58c03fff27ca390c31b764a79addf3f906"
-  integrity sha512-2GApq0yI/b22J2j9rhbrAlsHb0Qcz+7yWxeLG8h+95sl1XPUgeLimQSOdur4Vw7cUhrBHwaUZxWFZueojqNRzA==
-
 memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -6715,11 +6668,6 @@ react-focus-lock@^2.2.1:
   dependencies:
     gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
-react-immutable-proptypes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
-  integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
-
 react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
@@ -7271,11 +7219,6 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-selection-is-backward@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/selection-is-backward/-/selection-is-backward-1.0.0.tgz#97a54633188a511aba6419fc5c1fa91b467e6be1"
-  integrity sha1-l6VGMxiKURq6ZBn8XB+pG0Z+a+E=
-
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -7371,93 +7314,6 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slate-base64-serializer@^0.2.69:
-  version "0.2.112"
-  resolved "https://registry.yarnpkg.com/slate-base64-serializer/-/slate-base64-serializer-0.2.112.tgz#791d04a0ae7b9796844f068a904e185f2afc91f9"
-  integrity sha512-Vo94bkCq8cbFj7Lutdh2RaM9S4WlLxnnMqZPKGUyefklUN4q2EzM/WUH7s9CIlLUH1qRfC/b0V25VJZr5XXTzA==
-  dependencies:
-    isomorphic-base64 "^1.0.2"
-
-slate-dev-environment@^0.2.0, slate-dev-environment@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/slate-dev-environment/-/slate-dev-environment-0.2.2.tgz#bd8946e1fe4cf5447060c84a362a1d026ed8b77f"
-  integrity sha512-JZ09llrRQu6JUsLJCUlGC0lB1r1qIAabAkSd454iyYBq6lDuY//Bypi3Jo8yzIfzZ4+mRLdQvl9e8MbeM9l48Q==
-  dependencies:
-    is-in-browser "^1.1.3"
-
-slate-dev-logger@^0.1.43:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/slate-dev-logger/-/slate-dev-logger-0.1.43.tgz#77f6ca7207fcbf453a5516f3aa8b19794d1d26dc"
-  integrity sha512-GkcPMGzmPVm85AL+jaKnzhIA0UH9ktQDEIDM+FuQtz+TAPcpPCQiRAaZ6I2p2uD0Hq9bImhKSCtHIa0qRxiVGw==
-
-slate-dev-warning@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/slate-dev-warning/-/slate-dev-warning-0.0.1.tgz#f6c36731babea5e301b5bd504fe64911dd24200a"
-  integrity sha512-QdXa+qmOG46VrTfnzn2gUVzs1WiO3Q+zCv3XomzMNGdgAJjCgHBs3jaeQD845h15loS3OJ181gCNAkB3dby6Hw==
-
-slate-hotkeys@^0.2.5:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/slate-hotkeys/-/slate-hotkeys-0.2.9.tgz#0cc9eb750a49ab9ef11601305b7c82b5402348e3"
-  integrity sha512-y+C/s5vJEmBxo8fIqHmUcdViGwALL/A6Qow3sNG1OHYD5SI11tC2gfYtGbPh+2q0H7O4lufffCmFsP5bMaDHqA==
-  dependencies:
-    is-hotkey "0.1.4"
-    slate-dev-environment "^0.2.2"
-
-slate-html-serializer@^0.6.1:
-  version "0.6.32"
-  resolved "https://registry.yarnpkg.com/slate-html-serializer/-/slate-html-serializer-0.6.32.tgz#69b0fcdb89a0bdcea28b60b6a90b944651ad3277"
-  integrity sha512-x1RP1R2HMaVFflk9UXiuepcbN4wMoJRv0VWtxFw8efGNFmJfNBWME4iXAy6GNFRV0rRPlG3xCuQv2wHZ/+JMYw==
-  dependencies:
-    slate-dev-logger "^0.1.43"
-    type-of "^2.0.1"
-
-"slate-md-serializer@github:matrix-org/slate-md-serializer#f7c4ad3":
-  version "3.1.0"
-  resolved "https://codeload.github.com/matrix-org/slate-md-serializer/tar.gz/f7c4ad394f5af34d4c623de7909ce95ab78072d3"
-
-slate-plain-serializer@^0.6.8:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.6.39.tgz#5fb8d4dc530a2e7e0689548d48964ce242c4516a"
-  integrity sha512-EGl+Y+9Fw9IULtPg8sttydaeiAoaibJolMXNfqI79+5GWTQwJFIbg24keKvsTw+3f2RieaPu8fcrKyujKtZ7ZQ==
-
-slate-prop-types@^0.4.67:
-  version "0.4.67"
-  resolved "https://registry.yarnpkg.com/slate-prop-types/-/slate-prop-types-0.4.67.tgz#c6aa74195466546a44fcb85d1c7b15fefe36ce6b"
-  integrity sha512-FmdwitAw1Y69JHm326dfwP6Zd6R99jz1Im8jvKcnG2hytk72I1vIv6ct2CkNGwc3sg90+OIO/Rf18frYxxoTzw==
-
-slate-react@^0.18.10:
-  version "0.18.11"
-  resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.18.11.tgz#f452e7eb73f0271422d2a17e8090dcd8d889aef6"
-  integrity sha512-7u0+LLabGaxjWYb0oTqUDcs3iCvJdaZwcGW6hLc1hFv06KkwaIxAqYpP8dUBRVlQd+0/X0TdyagCmf0IjFSPhg==
-  dependencies:
-    debug "^3.1.0"
-    get-window "^1.1.1"
-    is-window "^1.0.2"
-    lodash "^4.1.1"
-    memoize-one "^4.0.0"
-    prop-types "^15.5.8"
-    react-immutable-proptypes "^2.1.0"
-    selection-is-backward "^1.0.0"
-    slate-base64-serializer "^0.2.69"
-    slate-dev-environment "^0.2.0"
-    slate-dev-warning "^0.0.1"
-    slate-hotkeys "^0.2.5"
-    slate-plain-serializer "^0.6.8"
-    slate-prop-types "^0.4.67"
-
-slate@^0.41.2:
-  version "0.41.3"
-  resolved "https://registry.yarnpkg.com/slate/-/slate-0.41.3.tgz#fa468de5db53afc453a0a7d7875b4de05737a900"
-  integrity sha512-I/ymHWRxtoSOWYKh/SFgW3Vkkojt5ywWf7Wh4oBvaKic/3mAsM1wymyZmhnvSKK59IeE0JJzD4uyyQaM1KEFHA==
-  dependencies:
-    debug "^3.1.0"
-    direction "^0.1.5"
-    esrever "^0.2.0"
-    is-plain-object "^2.0.4"
-    lodash "^4.17.4"
-    slate-dev-warning "^0.0.1"
-    type-of "^2.0.1"
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -8264,11 +8120,6 @@ type-is@~1.6.17:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-type-of@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/type-of/-/type-of-2.0.1.tgz#e72a1741896568e9f628378d816d6912f7f23972"
-  integrity sha1-5yoXQYllaOn2KDeNgW1pEvfyOXI=
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

From 64754a3f88c8f531100b46359da7bce45267f2c6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 00:18:24 +0000
Subject: [PATCH 0227/3235] Add comment and delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/LinkPreviewWidget.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 4822848233..3b5545e0e0 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -19,7 +19,6 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { AllHtmlEntities } from 'html-entities';
-
 import {linkifyElement} from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
@@ -129,6 +128,10 @@ module.exports = createReactClass({
                   </div>;
         }
 
+        // The description includes &-encoded HTML entities, we decode those as React treats the thing as an
+        // opaque string. This does not allow any HTML to be injected into the DOM.
+        const description = AllHtmlEntities.decode(p["og:description"] || "");
+
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_LinkPreviewWidget" >
@@ -137,7 +140,7 @@ module.exports = createReactClass({
                     <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noopener">{ p["og:title"] }</a></div>
                     <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
                     <div className="mx_LinkPreviewWidget_description" ref={this._description}>
-                        { AllHtmlEntities.decode(p["og:description"] || "") }
+                        { description }
                     </div>
                 </div>
                 <AccessibleButton className="mx_LinkPreviewWidget_cancel" onClick={this.props.onCancelClick} aria-label={_t("Close preview")}>

From c802f9a302f0463d9029802df93a6d613baa658c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 00:23:19 +0000
Subject: [PATCH 0228/3235] remove unused stale Test Suite

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles                      |   1 -
 .../views/rooms/MessageComposerInput-test.js  | 303 ------------------
 2 files changed, 304 deletions(-)
 delete mode 100644 test/components/views/rooms/MessageComposerInput-test.js

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index c3bb34ae26..36b03b121c 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -57,7 +57,6 @@ src/utils/Receipt.js
 src/Velociraptor.js
 test/components/structures/MessagePanel-test.js
 test/components/views/dialogs/InteractiveAuthDialog-test.js
-test/components/views/rooms/MessageComposerInput-test.js
 test/mock-clock.js
 test/notifications/ContentRules-test.js
 test/notifications/PushRuleVectorState-test.js
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
deleted file mode 100644
index 518e7e06ac..0000000000
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import React from 'react';
-import ReactTestUtils from 'react-dom/test-utils';
-import ReactDOM from 'react-dom';
-import expect from 'expect';
-import sinon from 'sinon';
-import * as testUtils from '../../../test-utils';
-import sdk from 'matrix-react-sdk';
-const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
-import {sleep} from "../../../../src/utils/promise";
-
-function addTextToDraft(text) {
-    const components = document.getElementsByClassName('public-DraftEditor-content');
-    if (components && components.length) {
-        const textarea = components[0];
-        const textEvent = document.createEvent('TextEvent');
-        textEvent.initTextEvent('textInput', true, true, null, text);
-        textarea.dispatchEvent(textEvent);
-    }
-}
-
-// FIXME: These tests need to be updated from Draft to CIDER.
-
-xdescribe('MessageComposerInput', () => {
-    let parentDiv = null,
-        sandbox = null,
-        client = null,
-        mci = null,
-        room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
-
-    beforeEach(function() {
-        testUtils.beforeEach(this);
-        sandbox = testUtils.stubClient(sandbox);
-        client = MatrixClientPeg.get();
-        client.credentials = {userId: '@me:domain.com'};
-
-        parentDiv = document.createElement('div');
-        document.body.appendChild(parentDiv);
-        mci = ReactDOM.render(
-            <MessageComposerInput
-                room={room}
-                client={client}
-            />,
-            parentDiv);
-    });
-
-    afterEach((done) => {
-        // hack: let the component finish mounting before unmounting, to avoid
-        // warnings
-        // (please can we make the components not setState() after
-        // they are unmounted?)
-        sleep(10).done(() => {
-            if (parentDiv) {
-                ReactDOM.unmountComponentAtNode(parentDiv);
-                parentDiv.remove();
-                parentDiv = null;
-            }
-            sandbox.restore();
-            done();
-        });
-    });
-
-    // XXX this fails
-    xit('should change mode if indicator is clicked', (done) => {
-        mci.enableRichtext(true);
-
-        setTimeout(() => {
-            const indicator = ReactTestUtils.findRenderedDOMComponentWithClass(
-                mci,
-                'mx_MessageComposer_input_markdownIndicator');
-            ReactTestUtils.Simulate.click(indicator);
-
-            expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode');
-            done();
-        });
-    });
-
-    it('should not send messages when composer is empty', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(false, 'should not send message');
-    });
-
-    it('should not change content unnecessarily on RTE -> Markdown conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        addTextToDraft('a');
-        mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('a');
-    });
-
-    it('should not change content unnecessarily on Markdown -> RTE conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('a');
-        mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('a');
-    });
-
-    it('should send emoji messages when rich text is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true, 'should send message');
-    });
-
-    it('should send emoji messages when Markdown is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true, 'should send message');
-    });
-
-    // FIXME
-    // it('should convert basic Markdown to rich text correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
-    //     mci.enableRichtext(false);
-    //     addTextToDraft('*abc*');
-    //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
-    //     console.error(spy.args[0][2]);
-    //     expect(spy.args[0][2]).toContain('<em>abc');
-    // });
-    //
-    // it('should convert basic rich text to Markdown correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
-    //     mci.enableRichtext(true);
-    //     process.nextTick(() => {
-    //
-    //     });
-    //     mci.handleKeyCommand('italic');
-    //     addTextToDraft('abc');
-    //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
-    //     expect(['_abc_', '*abc*']).toContain(spy.args[0][1]);
-    // });
-
-    it('should insert formatting characters in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        mci.handleKeyCommand('italic');
-        mci.handleReturn(sinon.stub());
-        expect(['__', '**']).toContain(spy.args[0][1].body);
-    });
-
-    it('should not entity-encode " in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('"');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('"');
-    });
-
-    it('should escape characters without other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('\\*escaped\\*');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('*escaped*');
-    });
-
-    it('should escape characters with other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('\\*escaped\\* *italic*');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('\\*escaped\\* *italic*');
-        expect(spy.args[0][1].formatted_body).toEqual('*escaped* <em>italic</em>');
-    });
-
-    it('should not convert -_- into a horizontal rule in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('-_-');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('-_-');
-    });
-
-    it('should not strip <del> tags in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('<del>striked-out</del>');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('<del>striked-out</del>');
-        expect(spy.args[0][1].formatted_body).toEqual('<del>striked-out</del>');
-    });
-
-    it('should not strike-through ~~~ in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('~~~striked-out~~~');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('~~~striked-out~~~');
-    });
-
-    it('should not mark single unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
-    });
-
-    it('should not mark two unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
-    });
-
-    it('should strip tab-completed mentions so that only the display name is sent in the plain body in Markdown mode', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        mci.setDisplayedCompletion({
-            completion: 'Some Member',
-            selection: mci.state.editorState.getSelection(),
-            href: `https://matrix.to/#/@some_member:domain.bla`,
-        });
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual(
-            'Some Member',
-            'the plaintext body should only include the display name',
-        );
-        expect(spy.args[0][1].formatted_body).toEqual(
-            '<a href="https://matrix.to/#/@some_member:domain.bla">Some Member</a>',
-            'the html body should contain an anchor tag with a matrix.to href and display name text',
-        );
-    });
-
-    it('should strip tab-completed mentions so that only the display name is sent in the plain body in RTE mode', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        mci.setDisplayedCompletion({
-            completion: 'Some Member',
-            selection: mci.state.editorState.getSelection(),
-            href: `https://matrix.to/#/@some_member:domain.bla`,
-        });
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('Some Member');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">Some Member</a>');
-    });
-
-    it('should not strip non-tab-completed mentions when manually typing MD', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        // Markdown mode enabled
-        mci.enableRichtext(false);
-        addTextToDraft('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">My Not-Tab-Completed Mention</a>');
-    });
-
-    it('should not strip arbitrary typed (i.e. not tab-completed) MD links', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        // Markdown mode enabled
-        mci.enableRichtext(false);
-        addTextToDraft('[Click here](https://some.lovely.url)');
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
-    });
-});

From 98ede6437e8d0132bec7ebe61a0dd3cc375c2729 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sun, 5 Jan 2020 23:04:42 -0600
Subject: [PATCH 0229/3235] Use display name when pinned messages are changed

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

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index c3c8396e26..2e79ff2044 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -473,7 +473,7 @@ function textForPowerEvent(event) {
 }
 
 function textForPinnedEvent(event) {
-    const senderName = event.getSender();
+    const senderName = event.sender ? event.sender.name : event.getSender();
     return _t("%(senderName)s changed the pinned messages for the room.", {senderName});
 }
 

From ac1d9b03bfbf1358ec3e092dc5a35c2e9c4598ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 09:35:14 +0000
Subject: [PATCH 0230/3235] undo one of the "fixes"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/SettingsFlag.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index d62f3182fc..a3a6d18d33 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -34,13 +34,12 @@ module.exports = createReactClass({
 
     getInitialState: function() {
         return {
-            // convert to Boolean to protect against null-capable "tri-state" Settings e.g fallbackICEServerAllowed
-            value: Boolean(SettingsStore.getValueAt(
+            value: SettingsStore.getValueAt(
                 this.props.level,
                 this.props.name,
                 this.props.roomId,
                 this.props.isExplicit,
-            )),
+            ),
         };
     },
 

From 2af4cdf532f7e82388840f4afb13e352cdc97090 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 6 Jan 2020 10:05:50 +0000
Subject: [PATCH 0231/3235] Translated using Weblate (Albanian)

Currently translated at 99.1% (1995 of 2014 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 15576d8d9a..e833009d59 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2009,5 +2009,12 @@
     "Help": "Ndihmë",
     "Country Dropdown": "Menu Hapmbyll Vendesh",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Depozita e Fshehtë do të ujdiset duke përdorur hollësitë tuaja ekzistuese për kopjeruajtje kyçesh.Frazëkalimi juaj për në depozitën e fshehtë dhe kyçi i rimarrjes do të jenë të njëjtë me ata për kopjeruajtjen tuaj të kyçeve",
-    "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh"
+    "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh",
+    "Show info about bridges in room settings": "Shfaq te rregullime dhome të dhëna rreth urash",
+    "This bridge was provisioned by <user />": "Kjo urë është dhënë nga <user />",
+    "This bridge is managed by <user />.": "Kjo urë administrohet nga <user />.",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Lidhur me <channelIcon /> <channelName /> në <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "Lidhur përmes %(protocolName)s",
+    "Bridge Info": "Të dhëna Ure",
+    "Below is a list of bridges connected to this room.": "Më poshtë keni një listë urash të lidhura në këtë dhomë."
 }

From 3b91b31534e7261d04fad63ad97791572eb2d2ef Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 6 Jan 2020 05:49:40 +0000
Subject: [PATCH 0232/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2014 of 2014 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 7214c231e0..e0e667ecce 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2018,5 +2018,19 @@
     "Help": "Laguntza",
     "Country Dropdown": "Herrialde menua",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua zure oraingo gakoen babes-kopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berdinak izango dira",
-    "Migrate from Key Backup": "Migratu gakoen babes-kopiatik"
+    "Migrate from Key Backup": "Migratu gakoen babes-kopiatik",
+    "New DM invite dialog (under development)": "Mezu zuzen bidezko gonbidapen elkarrizketa-koadro berria (garapenean)",
+    "Show info about bridges in room settings": "Erakutsi zubiei buruzko informazioa gelaren ezarpenetan",
+    "This bridge was provisioned by <user />": "Zubi hau <user /> erabiltzaileak hornitu du",
+    "This bridge is managed by <user />.": "Zubi hau <user /> erabiltzaileak kudeatzen du.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "<channelLink /><networkLink /> kanalera zubia, <protocolName /> protokoloan",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "<channelIcon /><channelName /> kanalera konektatuta, <networkIcon /><networkName /> sarean",
+    "Connected via %(protocolName)s": "%(protocolName)s bidez konektatuta",
+    "Bridge Info": "Zubiaren informazioa",
+    "Below is a list of bridges connected to this room.": "Behean gela honetara konektatutako zubien informazioa dago.",
+    "Show more": "Erakutsi gehiago",
+    "Recent Conversations": "Azken elkarrizketak",
+    "Direct Messages": "Mezu zuzenak",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eska egiezu bere erabiltzaile-izena, edo eman egiezu zurea (%(userId)s) edo <a>profilera esteka</a>.",
+    "Go": "Joan"
 }

From 51a1507f47d06993574760ae190e7575096c2645 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 6 Jan 2020 07:27:45 +0000
Subject: [PATCH 0233/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2014 of 2014 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index b755e16735..db75121f07 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2025,5 +2025,13 @@
     "Recent Conversations": "最近的對話",
     "Direct Messages": "直接訊息",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請向他們詢問他們的使用者名稱，或是分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
-    "Go": "到"
+    "Go": "到",
+    "Show info about bridges in room settings": "顯示關於聊天室設定中橋接相關的資訊",
+    "This bridge was provisioned by <user />": "此橋接由 <user /> 配置",
+    "This bridge is managed by <user />.": "此橋接由 <user /> 管理。",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "橋接於 <channelLink /> <networkLink />，在 <protocolName /> 上",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "連線到 <channelIcon /> <channelName /> 於 <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "透過 %(protocolName)s 連線",
+    "Bridge Info": "橋接資訊",
+    "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。"
 }

From d8a88387f349e2c995fbefa8d19e976f925559d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Mon, 6 Jan 2020 07:24:10 +0000
Subject: [PATCH 0234/3235] Translated using Weblate (French)

Currently translated at 100.0% (2014 of 2014 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a44df701f9..c2ee7c575b 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2025,5 +2025,13 @@
     "Recent Conversations": "Conversations récentes",
     "Direct Messages": "Messages directs",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou <a>votre lien de profil</a>.",
-    "Go": "C’est parti"
+    "Go": "C’est parti",
+    "Show info about bridges in room settings": "Afficher des informations à propos des passerelles dans les paramètres du salon",
+    "This bridge was provisioned by <user />": "Cette passerelle est fournie par <user />",
+    "This bridge is managed by <user />.": "Cette passerelle est gérée par <user />.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Relié à <channelLink /> <networkLink />, sur <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connecté à <channelIcon /> <channelName /> sur <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "Connecté via %(protocolName)s",
+    "Bridge Info": "Informations de la passerelle",
+    "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon."
 }

From 393c610b5a6faea93014b1a68ffd05f03805f45b Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 6 Jan 2020 07:06:31 +0000
Subject: [PATCH 0235/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2014 of 2014 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index df482cd072..92113c3238 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2026,5 +2026,13 @@
     "Recent Conversations": "Legújabb Beszélgetések",
     "Direct Messages": "Közvetlen Beszélgetések",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz meg valakit, kérdezd meg a felhasználói nevét vagy oszd meg a te felhasználói nevedet (%(userId)s) vagy a <a>profil hivatkozást</a>.",
-    "Go": "Menj"
+    "Go": "Menj",
+    "Show info about bridges in room settings": "Híd információk megmutatása a szoba beállításoknál",
+    "This bridge was provisioned by <user />": "Ezt a hidat ez a felhasználó hozta létre: <user />",
+    "This bridge is managed by <user />.": "Ezt a hidat ez a felhasználó kezeli: <user />.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Híd ide: <channelLink /> <networkLink />, ezzel a protokollal: <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Ide csatlakozva: <channelIcon /> <channelName /> itt: <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "Ezzel a protokollal csatlakozva: %(protocolName)s",
+    "Bridge Info": "Híd információ",
+    "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról."
 }

From d5eb4ff310d2cd328f8795bd6eea37b90a4db86a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 13:02:32 +0000
Subject: [PATCH 0236/3235] Update
 src/components/views/settings/ProfileSettings.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/settings/ProfileSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 72ff7e3d15..b56321c1c9 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -89,7 +89,7 @@ export default class ProfileSettings extends React.Component {
             newState.originalAvatarUrl = newState.avatarUrl;
             newState.avatarFile = null;
         } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
-            await client.setAvatarUrl(""); // use empty string as Synapse 500's on undefined
+            await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined
         }
 
         this.setState(newState);

From c551f2983a2495805f9158e1d335e4ae195ad018 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 13:28:29 +0000
Subject: [PATCH 0237/3235] Add TextualBody-test.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |   2 +
 src/components/views/elements/Pill.js         |   2 +-
 src/utils/pillify.js                          |   1 +
 .../views/messages/TextualBody-test.js        | 195 +++++++++
 test/test-utils.js                            |   1 +
 yarn.lock                                     | 376 +++++++++++++++++-
 6 files changed, 567 insertions(+), 10 deletions(-)
 create mode 100644 test/components/views/messages/TextualBody-test.js

diff --git a/package.json b/package.json
index ad446e26cc..2f8d5f9f7a 100644
--- a/package.json
+++ b/package.json
@@ -127,6 +127,8 @@
     "babel-preset-react": "^6.24.1",
     "chokidar": "^2.1.2",
     "concurrently": "^4.0.1",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^5.12.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^5.2.1",
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 99005de03b..da40c53700 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -261,7 +261,7 @@ const Pill = createReactClass({
         }
 
         const classes = classNames("mx_Pill", pillClass, {
-            "mx_UserPill_me": userId === MatrixClientPeg.get().credentials.userId,
+            "mx_UserPill_me": userId === MatrixClientPeg.get().getUserId(),
             "mx_UserPill_selected": this.props.isSelected,
         });
 
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index e943cfe657..ed8a7e18cd 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
 import ReactDOM from 'react-dom';
 import MatrixClientPeg from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
new file mode 100644
index 0000000000..d93bfd307b
--- /dev/null
+++ b/test/components/views/messages/TextualBody-test.js
@@ -0,0 +1,195 @@
+import React from "react";
+import expect from 'expect';
+import Adapter from "enzyme-adapter-react-16";
+import { configure, mount } from "enzyme";
+
+import sdk from "../../../skinned-sdk";
+import {mkEvent, mkStubRoom} from "../../../test-utils";
+import MatrixClientPeg from "../../../../src/MatrixClientPeg";
+
+const TextualBody = sdk.getComponent("views.messages.TextualBody");
+
+configure({ adapter: new Adapter() });
+
+describe("<TextualBody />", () => {
+    afterEach(() => {
+        MatrixClientPeg.matrixClient = null;
+    });
+
+    describe("renders m.emote correctly", () => {
+        MatrixClientPeg.matrixClient = {
+            getRoom: () => mkStubRoom("room_id"),
+            getAccountData: () => undefined,
+        };
+
+        const ev = mkEvent({
+            type: "m.room.message",
+            room: "room_id",
+            user: "sender",
+            content: {
+                body: "winks",
+                msgtype: "m.emote",
+            },
+            event: true,
+        });
+
+        const wrapper = mount(<TextualBody mxEvent={ev} />);
+        expect(wrapper.text()).toBe("* sender winks");
+        const content = wrapper.find(".mx_EventTile_body");
+        expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">winks</span>');
+    });
+
+    describe("renders m.notice correctly", () => {
+        MatrixClientPeg.matrixClient = {
+            getRoom: () => mkStubRoom("room_id"),
+            getAccountData: () => undefined,
+        };
+
+        const ev = mkEvent({
+            type: "m.room.message",
+            room: "room_id",
+            user: "bot_sender",
+            content: {
+                body: "this is a notice, probably from a bot",
+                msgtype: "m.notice",
+            },
+            event: true,
+        });
+
+        const wrapper = mount(<TextualBody mxEvent={ev} />);
+        expect(wrapper.text()).toBe(ev.getContent().body);
+        const content = wrapper.find(".mx_EventTile_body");
+        expect(content.html()).toBe(`<span class="mx_EventTile_body" dir="auto">${ ev.getContent().body }</span>`);
+    });
+
+    describe("renders plain-text m.text correctly", () => {
+        MatrixClientPeg.matrixClient = {
+            getRoom: () => mkStubRoom("room_id"),
+            getAccountData: () => undefined,
+        };
+
+        describe("simple message renders as expected", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body: "this is a plaintext message",
+                    msgtype: "m.text",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe(ev.getContent().body);
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe(`<span class="mx_EventTile_body" dir="auto">${ ev.getContent().body }</span>`);
+        });
+
+        // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test
+        describe("linkification get applied correctly into the DOM", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body: "Visit https://matrix.org/",
+                    msgtype: "m.text",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe(ev.getContent().body);
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">' +
+                'Visit <a href="https://matrix.org/" class="linkified" target="_blank" rel="noopener">' +
+                'https://matrix.org/</a></span>');
+        });
+    });
+
+    describe("renders formatted m.text correctly", () => {
+        MatrixClientPeg.matrixClient = {
+            getRoom: () => mkStubRoom("room_id"),
+            getAccountData: () => undefined,
+            getUserId: () => "@me:my_server",
+            getHomeserverUrl: () => "https://my_server/",
+            on: () => undefined,
+            removeListener: () => undefined,
+        };
+
+        describe("italics, bold, underline and strikethrough render as expected", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body: "foo *baz* __bar__ <del>del</del> <u>u</u>",
+                    msgtype: "m.text",
+                    format: "org.matrix.custom.html",
+                    formatted_body: "foo <em>baz</em> <strong>bar</strong> <del>del</del> <u>u</u>",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe("foo baz bar del u");
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
+                ev.getContent().formatted_body + '</span>');
+        });
+
+        describe("spoilers get injected properly into the DOM", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body: "Hey [Spoiler for movie](mxc://someserver/somefile)",
+                    msgtype: "m.text",
+                    format: "org.matrix.custom.html",
+                    formatted_body: "Hey <span data-mx-spoiler=\"movie\">the movie was awesome</span>",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe("Hey (movie) the movie was awesome");
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
+                'Hey <span>' +
+                '<span class="mx_EventTile_spoiler">' +
+                '<span class="mx_EventTile_spoiler_reason">(movie)</span>&nbsp;' +
+                '<span class="mx_EventTile_spoiler_content"><span>the movie was awesome</span></span>' +
+                '</span></span></span>');
+        });
+
+        // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test
+        describe("pills get injected correctly into the DOM", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body: "Hey User",
+                    msgtype: "m.text",
+                    format: "org.matrix.custom.html",
+                    formatted_body: "Hey <a href=\"https://matrix.to/#/@user:server\">Member</a>",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe("Hey Member");
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
+                'Hey <span>' +
+                '<a class="mx_Pill mx_UserPill" title="@user:server">' +
+                '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
+                'width="16" height="16" title="@member:domain.bla" alt="">Member</a>' +
+                '</span></span>');
+        });
+    });
+});
+
+
diff --git a/test/test-utils.js b/test/test-utils.js
index 5c8c7f8a10..e27fff3388 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -238,6 +238,7 @@ export function mkStubRoom(roomId = null) {
         getMember: sinon.stub().returns({
             userId: '@member:domain.bla',
             name: 'Member',
+            rawDisplayName: 'Member',
             roomId: roomId,
             getAvatarUrl: () => 'mxc://avatar.url/image.png',
         }),
diff --git a/yarn.lock b/yarn.lock
index a491ba3941..c32a108934 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -531,6 +531,22 @@ agentkeepalive@^3.4.1:
   dependencies:
     humanize-ms "^1.2.1"
 
+airbnb-prop-types@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef"
+  integrity sha512-jUh2/hfKsRjNFC4XONQrxo/n/3GG4Tn6Hl0WlFQN5PY9OMC9loSCoAYKnZsWaP8wEfd5xcrPloK0Zg6iS1xwVA==
+  dependencies:
+    array.prototype.find "^2.1.0"
+    function.prototype.name "^1.1.1"
+    has "^1.0.3"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object.assign "^4.1.0"
+    object.entries "^1.1.0"
+    prop-types "^15.7.2"
+    prop-types-exact "^1.2.0"
+    react-is "^16.9.0"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -659,6 +675,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -699,6 +720,22 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.prototype.find@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz#630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"
+  integrity sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.13.0"
+
+array.prototype.flat@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
@@ -1621,6 +1658,11 @@ body-parser@^1.16.1:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1957,6 +1999,18 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+cheerio@^1.0.0-rc.3:
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.1"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash "^4.15.0"
+    parse5 "^3.0.1"
+
 chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -2136,7 +2190,7 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2374,6 +2428,21 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -2592,6 +2661,11 @@ dir-glob@^2.2.2:
   dependencies:
     path-type "^3.0.0"
 
+discontinuous-range@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -2631,12 +2705,20 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
+dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.1:
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
@@ -2653,6 +2735,14 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
@@ -2816,7 +2906,7 @@ ent@~2.2.0:
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
-entities@^1.1.1, "entities@~ 1.1.1":
+entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
@@ -2826,6 +2916,69 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
+enzyme-adapter-react-16@^1.15.1:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
+  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
+  dependencies:
+    enzyme-adapter-utils "^1.13.0"
+    enzyme-shallow-equal "^1.0.1"
+    has "^1.0.3"
+    object.assign "^4.1.0"
+    object.values "^1.1.1"
+    prop-types "^15.7.2"
+    react-is "^16.12.0"
+    react-test-renderer "^16.0.0-0"
+    semver "^5.7.0"
+
+enzyme-adapter-utils@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78"
+  integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ==
+  dependencies:
+    airbnb-prop-types "^2.15.0"
+    function.prototype.name "^1.1.2"
+    object.assign "^4.1.0"
+    object.fromentries "^2.0.2"
+    prop-types "^15.7.2"
+    semver "^5.7.1"
+
+enzyme-shallow-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e"
+  integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ==
+  dependencies:
+    has "^1.0.3"
+    object-is "^1.0.2"
+
+enzyme@^3.10.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
+  integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
+  dependencies:
+    array.prototype.flat "^1.2.3"
+    cheerio "^1.0.0-rc.3"
+    enzyme-shallow-equal "^1.0.1"
+    function.prototype.name "^1.1.2"
+    has "^1.0.3"
+    html-element-map "^1.2.0"
+    is-boolean-object "^1.0.1"
+    is-callable "^1.1.5"
+    is-number-object "^1.0.4"
+    is-regex "^1.0.5"
+    is-string "^1.0.5"
+    is-subset "^0.1.1"
+    lodash.escape "^4.0.1"
+    lodash.isequal "^4.5.0"
+    object-inspect "^1.7.0"
+    object-is "^1.0.2"
+    object.assign "^4.1.0"
+    object.entries "^1.1.1"
+    object.values "^1.1.1"
+    raf "^3.4.1"
+    rst-selector-parser "^2.2.3"
+    string.prototype.trim "^1.2.1"
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
@@ -2861,6 +3014,23 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7.
     string.prototype.trimleft "^2.1.0"
     string.prototype.trimright "^2.1.0"
 
+es-abstract@^1.13.0, es-abstract@^1.17.0-next.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
+  integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
 es-get-iterator@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
@@ -3600,6 +3770,15 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.1, function.prototype.name@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
+  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    functions-have-names "^1.2.0"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -3988,12 +4167,19 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
+html-element-map@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22"
+  integrity sha512-0uXq8HsuG1v2TmQ8QkIhzbrqeskE4kn52Q18QJ9iAA/SnHoEKXWiUxHQtclRsCFWEUD2So34X+0+pZZu862nnw==
+  dependencies:
+    array-filter "^1.0.0"
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
   integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
 
-htmlparser2@^3.10.0:
+htmlparser2@^3.10.0, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -4312,6 +4498,11 @@ is-boolean-object@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
   integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
 
+is-boolean-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
+  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -4327,6 +4518,11 @@ is-callable@^1.0.4, is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4504,6 +4700,11 @@ is-number-object@^1.0.3:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
   integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4567,6 +4768,13 @@ is-regex@^1.0.3, is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -4587,6 +4795,16 @@ is-string@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
   integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
 
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
+
 is-supported-regexp-flag@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
@@ -5072,11 +5290,21 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.escape@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
+lodash.flattendeep@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5087,6 +5315,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -5112,7 +5345,7 @@ lodash.unescape@4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
+lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -5559,6 +5792,11 @@ mocha@^5.0.5:
     mkdirp "0.5.1"
     supports-color "5.4.0"
 
+moo@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
+  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -5613,6 +5851,17 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+nearley@^2.7.10:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz#37717781d0fd0f2bfc95e233ebd75678ca4bda46"
+  integrity sha512-2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA==
+  dependencies:
+    commander "^2.19.0"
+    moo "^0.4.3"
+    railroad-diagrams "^1.0.0"
+    randexp "0.4.6"
+    semver "^5.4.1"
+
 needle@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
@@ -5787,6 +6036,13 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
@@ -5831,6 +6087,11 @@ object-inspect@^1.1.0, object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
+object-is@^1.0.1, object-is@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
+  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -5863,6 +6124,16 @@ object.entries@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.entries@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
+  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 object.fromentries@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
@@ -5873,6 +6144,16 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.fromentries@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
+  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5898,6 +6179,16 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.values@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -6108,6 +6399,13 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse5@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
+  dependencies:
+    "@types/node" "*"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -6426,6 +6724,15 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types-exact@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
+  integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==
+  dependencies:
+    has "^1.0.3"
+    object.assign "^4.1.0"
+    reflect.ownkeys "^0.2.0"
+
 prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -6554,13 +6861,26 @@ raf-schd@^2.1.0:
   resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.2.tgz#ec622b5167f2912089f054dc03ebd5bcf33c8f62"
   integrity sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g==
 
-raf@^3.1.0:
+raf@^3.1.0, raf@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
   integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
   dependencies:
     performance-now "^2.1.0"
 
+railroad-diagrams@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
+
+randexp@0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
+  dependencies:
+    discontinuous-range "1.0.0"
+    ret "~0.1.10"
+
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -6668,7 +6988,7 @@ react-focus-lock@^2.2.1:
   dependencies:
     gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -6700,7 +7020,7 @@ react-redux@^5.0.6:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
-react-test-renderer@^16.9.0:
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f"
   integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w==
@@ -6817,6 +7137,11 @@ redux@^3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
+reflect.ownkeys@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
+  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
+
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -7133,6 +7458,14 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
+rst-selector-parser@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
+  dependencies:
+    lodash.flattendeep "^4.4.0"
+    nearley "^2.7.10"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -7219,7 +7552,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7668,6 +8001,15 @@ string.prototype.repeat@^0.2.0:
   resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
   integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=
 
+string.prototype.trim@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
+  integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+
 string.prototype.trimleft@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
@@ -7676,6 +8018,14 @@ string.prototype.trimleft@^2.1.0:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
+string.prototype.trimleft@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
+  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string.prototype.trimright@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
@@ -7684,6 +8034,14 @@ string.prototype.trimright@^2.1.0:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
+string.prototype.trimright@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
+  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"

From 93c44390458f00bcdff090df2c1d4950870cd705 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 6 Jan 2020 13:30:56 +0000
Subject: [PATCH 0238/3235] js-sdk rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ad446e26cc..61e12eceda 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "2.4.7",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index a491ba3941..1646ac5a59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5271,9 +5271,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "2.4.6"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/01f0dd4498fb689cb66091aff7aa0ae49f9b8ebf"
+matrix-js-sdk@2.4.7:
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.7.tgz#998949120cb6cfb6362af6ff7b6bce326f7dca6f"
+  integrity sha512-3BVlZrHJYt7j5N83BLEeqroe4Gi2J/ycZKvKIe6s6SEygP8TpUP+trVSd+bSLm7c2JpPpMCoEsJ22aaPcbWVDQ==
   dependencies:
     another-json "^0.2.0"
     browser-request "^0.3.3"

From 6b8f6239c5f29ef3d969c8f7700f097d35ff139b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 6 Jan 2020 13:58:43 +0000
Subject: [PATCH 0239/3235] js-sdk 3.0.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 61e12eceda..1b97d84abb 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "2.4.7",
+    "matrix-js-sdk": "3.0.0-rc.1",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 1646ac5a59..982760c49a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5271,10 +5271,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@2.4.7:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.7.tgz#998949120cb6cfb6362af6ff7b6bce326f7dca6f"
-  integrity sha512-3BVlZrHJYt7j5N83BLEeqroe4Gi2J/ycZKvKIe6s6SEygP8TpUP+trVSd+bSLm7c2JpPpMCoEsJ22aaPcbWVDQ==
+matrix-js-sdk@3.0.0-rc.1:
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0-rc.1.tgz#6ecdedab752933f6a0ccf6aa7d2786bd32f6d7f7"
+  integrity sha512-1eaECVqG64tj1pE0UBFTIGc1whryXLNaRpkrXrZ5+ZMDtuK2ZDlTOLYoK3t4z/hjn+4C6a294ytoEVe0UnIA8w==
   dependencies:
     another-json "^0.2.0"
     browser-request "^0.3.3"

From 623799ebdcededefc5c34c3dd5a93fc08fc79f1e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 6 Jan 2020 14:01:54 +0000
Subject: [PATCH 0240/3235] Prepare changelog for v1.7.6-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5390cad319..3ad057dc7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,177 @@
+Changes in [1.7.6-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6-rc.1) (2020-01-06)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.5...v1.7.6-rc.1)
+
+ * Deduplicate recent emoji
+   [\#3806](https://github.com/matrix-org/matrix-react-sdk/pull/3806)
+ * Fix ability to remove avatars
+   [\#3803](https://github.com/matrix-org/matrix-react-sdk/pull/3803)
+ * Update from Weblate
+   [\#3810](https://github.com/matrix-org/matrix-react-sdk/pull/3810)
+ * User Info fetch latest RoomMember instead of showing historical data
+   [\#3788](https://github.com/matrix-org/matrix-react-sdk/pull/3788)
+ * Remove all usages of slate in favour of CIDER
+   [\#3808](https://github.com/matrix-org/matrix-react-sdk/pull/3808)
+ * Use display name when pinned messages are changed
+   [\#3809](https://github.com/matrix-org/matrix-react-sdk/pull/3809)
+ * Fix inverted diff line highlighting in dark theme
+   [\#3790](https://github.com/matrix-org/matrix-react-sdk/pull/3790)
+ * Bridge info settings tab
+   [\#3693](https://github.com/matrix-org/matrix-react-sdk/pull/3693)
+ * Send the labs flags the client is running with in rageshake
+   [\#3805](https://github.com/matrix-org/matrix-react-sdk/pull/3805)
+ * Initial implementation of FTUE user lists design
+   [\#3792](https://github.com/matrix-org/matrix-react-sdk/pull/3792)
+ * Update key backup creation and recovery paths for SSSS
+   [\#3800](https://github.com/matrix-org/matrix-react-sdk/pull/3800)
+ * Don't fail if logs exists and is an empty dir
+   [\#3798](https://github.com/matrix-org/matrix-react-sdk/pull/3798)
+ * Comment remaining non-cross-signing-compliant components
+   [\#3799](https://github.com/matrix-org/matrix-react-sdk/pull/3799)
+ * Remove 'unverify' from UserInfoPanel
+   [\#3797](https://github.com/matrix-org/matrix-react-sdk/pull/3797)
+ * Use deviceTrust when displaying key backup trust status
+   [\#3795](https://github.com/matrix-org/matrix-react-sdk/pull/3795)
+ * Don't crash if a keyshare request is removed
+   [\#3793](https://github.com/matrix-org/matrix-react-sdk/pull/3793)
+ * Convert /verify to checkDeviceTrust
+   [\#3794](https://github.com/matrix-org/matrix-react-sdk/pull/3794)
+ * Remove E2eIcon onClick
+   [\#3791](https://github.com/matrix-org/matrix-react-sdk/pull/3791)
+ * support channel names with slash in name/alias
+   [\#3778](https://github.com/matrix-org/matrix-react-sdk/pull/3778)
+ * Fix NPE when filtering the room list
+   [\#3787](https://github.com/matrix-org/matrix-react-sdk/pull/3787)
+ * Turn RoomAliasField into properly controlled and use in RoomSettings
+   [\#3782](https://github.com/matrix-org/matrix-react-sdk/pull/3782)
+ * fuzzy-sort MemberList
+   [\#3783](https://github.com/matrix-org/matrix-react-sdk/pull/3783)
+ * Serialize file uploads into room to match confirmation dialog order
+   [\#3786](https://github.com/matrix-org/matrix-react-sdk/pull/3786)
+ * Do not show Top Unread Messages Bar and Jump to bottom button if searching
+   [\#3785](https://github.com/matrix-org/matrix-react-sdk/pull/3785)
+ * Fix sticker picker chevron offset calculation
+   [\#3784](https://github.com/matrix-org/matrix-react-sdk/pull/3784)
+ * Fix not being able to promote others to the same power level as your own
+   [\#3781](https://github.com/matrix-org/matrix-react-sdk/pull/3781)
+ * Room Tile DMs online/active green dot
+   [\#3751](https://github.com/matrix-org/matrix-react-sdk/pull/3751)
+ * Fix spelling and grammar in README
+   [\#3780](https://github.com/matrix-org/matrix-react-sdk/pull/3780)
+ * Reintroduce working resizer code for right panel
+   [\#3776](https://github.com/matrix-org/matrix-react-sdk/pull/3776)
+ * Fix wrong scope binding on openHelp for TopLeftMenu
+   [\#3775](https://github.com/matrix-org/matrix-react-sdk/pull/3775)
+ * UserInfo hide kick/mute buttons if they make no sense
+   [\#3774](https://github.com/matrix-org/matrix-react-sdk/pull/3774)
+ * Fix duplicate Incoming Call prompt on Community Invite sublist
+   [\#3773](https://github.com/matrix-org/matrix-react-sdk/pull/3773)
+ * Apply new design to highlighted tags and add toggle mechanic
+   [\#3755](https://github.com/matrix-org/matrix-react-sdk/pull/3755)
+ * stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
+   [\#3771](https://github.com/matrix-org/matrix-react-sdk/pull/3771)
+ * Add alt="" to presentational images
+   [\#3772](https://github.com/matrix-org/matrix-react-sdk/pull/3772)
+ * Fix room list filtering weird case sensitivity
+   [\#3759](https://github.com/matrix-org/matrix-react-sdk/pull/3759)
+ * Don't show the 'verify' button if the user is verified
+   [\#3758](https://github.com/matrix-org/matrix-react-sdk/pull/3758)
+ * Switch to using checkDeviceTrust
+   [\#3757](https://github.com/matrix-org/matrix-react-sdk/pull/3757)
+ * Migrate away from React Legacy contexts API
+   [\#3743](https://github.com/matrix-org/matrix-react-sdk/pull/3743)
+ * Migrate key backups to SSSS
+   [\#3749](https://github.com/matrix-org/matrix-react-sdk/pull/3749)
+ * Get rid of stripped-emoji.json in favour of an in-memory single source of
+   truth
+   [\#3745](https://github.com/matrix-org/matrix-react-sdk/pull/3745)
+ * Combine cross signing and verification over DM feature flags
+   [\#3753](https://github.com/matrix-org/matrix-react-sdk/pull/3753)
+ * apply unhomoglyph when filtering room list to fuzzify it
+   [\#3754](https://github.com/matrix-org/matrix-react-sdk/pull/3754)
+ * Make EmojiPicker an unmanaged Context Menu as it is too complex to be
+   managed
+   [\#3746](https://github.com/matrix-org/matrix-react-sdk/pull/3746)
+ * Internationalise M_TOO_LARGE error from Synapse
+   [\#3750](https://github.com/matrix-org/matrix-react-sdk/pull/3750)
+ * Replace UserInfo avatar with <MemberAvatar/> for fallback logic
+   [\#3748](https://github.com/matrix-org/matrix-react-sdk/pull/3748)
+ * Dropdown stop keyboard propagation if key handled
+   [\#3741](https://github.com/matrix-org/matrix-react-sdk/pull/3741)
+ * Fix right panel for multiple member info viewings
+   [\#3742](https://github.com/matrix-org/matrix-react-sdk/pull/3742)
+ * Fix Field validation tooltip sticking if blurred before async validation
+   resolved
+   [\#3740](https://github.com/matrix-org/matrix-react-sdk/pull/3740)
+ * Fix UserInfo exploding without a room being passed to it
+   [\#3738](https://github.com/matrix-org/matrix-react-sdk/pull/3738)
+ * Fix room directory maintaining and error state
+   [\#3737](https://github.com/matrix-org/matrix-react-sdk/pull/3737)
+ * Stop trapping tab in AddressPickerDialog
+   [\#3735](https://github.com/matrix-org/matrix-react-sdk/pull/3735)
+ * Stop using KeyboardEvent.keyCode as it is deprecated
+   [\#3736](https://github.com/matrix-org/matrix-react-sdk/pull/3736)
+ * Implement new design for uploading/removing avatars
+   [\#3733](https://github.com/matrix-org/matrix-react-sdk/pull/3733)
+ * Fix aspect ratio on room/profile avatar preview
+   [\#3731](https://github.com/matrix-org/matrix-react-sdk/pull/3731)
+ * Switch to react-focus-lock for it to comprehend Portals
+   [\#3732](https://github.com/matrix-org/matrix-react-sdk/pull/3732)
+ * Make combobox dropdown keyboard and screen reader accessible
+   [\#3729](https://github.com/matrix-org/matrix-react-sdk/pull/3729)
+ * Verify users when cross-signing enabled
+   [\#3728](https://github.com/matrix-org/matrix-react-sdk/pull/3728)
+ * Update from Weblate
+   [\#3730](https://github.com/matrix-org/matrix-react-sdk/pull/3730)
+ * Improve a11y of the unignore button in Settings
+   [\#3727](https://github.com/matrix-org/matrix-react-sdk/pull/3727)
+ * Fix ToggleSwitch A11Y (trapping tab and switch v. checkbox)
+   [\#3726](https://github.com/matrix-org/matrix-react-sdk/pull/3726)
+ * Make URL previews dismissable via keyboard and accessible to screen readers
+   [\#3725](https://github.com/matrix-org/matrix-react-sdk/pull/3725)
+ * Create new key backups using secret storage
+   [\#3720](https://github.com/matrix-org/matrix-react-sdk/pull/3720)
+ * Replace sign-ins with sessions
+   [\#3721](https://github.com/matrix-org/matrix-react-sdk/pull/3721)
+ * Refactor RightPanel to match expected behaviour
+   [\#3703](https://github.com/matrix-org/matrix-react-sdk/pull/3703)
+ * Render policy room event updates in the timeline
+   [\#3716](https://github.com/matrix-org/matrix-react-sdk/pull/3716)
+ * Wrap the await call for unknown device lookups
+   [\#3718](https://github.com/matrix-org/matrix-react-sdk/pull/3718)
+ * Add testing flow to bootstrap secret storage
+   [\#3640](https://github.com/matrix-org/matrix-react-sdk/pull/3640)
+ * Fix remaining context menu regressions
+   [\#3715](https://github.com/matrix-org/matrix-react-sdk/pull/3715)
+ * Migrate away from React Legacy string refs
+   [\#3712](https://github.com/matrix-org/matrix-react-sdk/pull/3712)
+ * Update copy for DM invites
+   [\#3706](https://github.com/matrix-org/matrix-react-sdk/pull/3706)
+ * Fix message action bar reaction picker regression
+   [\#3714](https://github.com/matrix-org/matrix-react-sdk/pull/3714)
+ * Add what-input to allow different scoping to focus-visible for MAB a11y
+   [\#3709](https://github.com/matrix-org/matrix-react-sdk/pull/3709)
+ * Mark the This/All Rooms scope buttons as radios for a11y
+   [\#3708](https://github.com/matrix-org/matrix-react-sdk/pull/3708)
+ * Switch ReactionsRowButton to an AccessibleButton for space/enter handling
+   [\#3707](https://github.com/matrix-org/matrix-react-sdk/pull/3707)
+ * Change the (edited) link to an AccessibleButton for a11y
+   [\#3710](https://github.com/matrix-org/matrix-react-sdk/pull/3710)
+ * Update from Weblate
+   [\#3713](https://github.com/matrix-org/matrix-react-sdk/pull/3713)
+ * Fix ?via= args in SpecPermalinkConstructor.js
+   [\#3694](https://github.com/matrix-org/matrix-react-sdk/pull/3694)
+ * Don't mark a room as unread when server ACLs are set
+   [\#3705](https://github.com/matrix-org/matrix-react-sdk/pull/3705)
+ * Make reaction buttons more accessible
+   [\#3704](https://github.com/matrix-org/matrix-react-sdk/pull/3704)
+ * yarn upgrade
+   [\#3701](https://github.com/matrix-org/matrix-react-sdk/pull/3701)
+ * Make CI scripts executable
+   [\#3698](https://github.com/matrix-org/matrix-react-sdk/pull/3698)
+ * ARIA compliant context menus
+   [\#3611](https://github.com/matrix-org/matrix-react-sdk/pull/3611)
+
 Changes in [1.7.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.5) (2019-12-09)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.5-rc.1...v1.7.5)

From 0df16631c24824c4cca5902a83e8c574d12fed9f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 6 Jan 2020 14:01:54 +0000
Subject: [PATCH 0241/3235] v1.7.6-rc.1

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

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

From f1de6d060acd66b5ba69f7f494fd176d161b40f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 14:38:21 +0000
Subject: [PATCH 0242/3235] Add a regression test for editing events and url
 previews

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../keybackup/CreateKeyBackupDialog.js        |  2 +-
 .../views/settings/KeyBackupPanel.js          |  2 +-
 .../views/messages/TextualBody-test.js        | 62 +++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 19720e077a..1095fb4aee 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -24,7 +24,7 @@ import MatrixClientPeg from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
-import SettingsStore from '../../../../../lib/settings/SettingsStore';
+import SettingsStore from '../../../../settings/SettingsStore';
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index bfa96f277f..3781f97dbe 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,7 +21,7 @@ import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import SettingsStore from '../../../../lib/settings/SettingsStore';
+import SettingsStore from '../../../settings/SettingsStore';
 
 export default class KeyBackupPanel extends React.PureComponent {
     constructor(props) {
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index d93bfd307b..9e721d1d09 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -6,6 +6,8 @@ import { configure, mount } from "enzyme";
 import sdk from "../../../skinned-sdk";
 import {mkEvent, mkStubRoom} from "../../../test-utils";
 import MatrixClientPeg from "../../../../src/MatrixClientPeg";
+import * as languageHandler from "../../../../src/languageHandler";
+import {sleep} from "../../../../src/utils/promise";
 
 const TextualBody = sdk.getComponent("views.messages.TextualBody");
 
@@ -190,6 +192,66 @@ describe("<TextualBody />", () => {
                 '</span></span>');
         });
     });
+
+    describe("renders url previews correctly", () => {
+        languageHandler.setMissingEntryGenerator(key => key.split('|', 2)[1]);
+
+        MatrixClientPeg.matrixClient = {
+            getRoom: () => mkStubRoom("room_id"),
+            getAccountData: () => undefined,
+            getUrlPreview: (url) => new Promise(() => {}),
+        };
+
+        const ev = mkEvent({
+            type: "m.room.message",
+            room: "room_id",
+            user: "sender",
+            content: {
+                body: "Visit https://matrix.org/",
+                msgtype: "m.text",
+            },
+            event: true,
+        });
+
+        const wrapper = mount(<TextualBody mxEvent={ev} showUrlPreview={true} />);
+        expect(wrapper.text()).toBe(ev.getContent().body);
+
+        let widgets = wrapper.find("LinkPreviewWidget");
+        // at this point we should have exactly one widget
+        expect(widgets.length).toBe(1);
+        expect(widgets.at(0).prop("link")).toBe("https://matrix.org/");
+
+        // simulate an event edit and check the transition from the old URL preview to the new one
+        const ev2 = mkEvent({
+            type: "m.room.message",
+            room: "room_id",
+            user: "sender",
+            content: {
+                "m.new_content": {
+                    body: "Visit https://vector.im/ and https://riot.im/",
+                    msgtype: "m.text",
+                },
+            },
+            event: true,
+        });
+        ev.makeReplaced(ev2);
+
+        wrapper.setProps({
+            mxEvent: ev,
+            replacingEventId: ev.getId(),
+        }, () => {
+            expect(wrapper.text()).toBe(ev2.getContent()["m.new_content"].body + "(edited)");
+
+            // XXX: this is to give TextualBody enough time for state to settle
+            wrapper.setState({}, () => {
+                widgets = wrapper.find("LinkPreviewWidget");
+                // at this point we should have exactly two widgets (not the matrix.org one anymore)
+                expect(widgets.length).toBe(2);
+                expect(widgets.at(0).prop("link")).toBe("https://vector.im/");
+                expect(widgets.at(1).prop("link")).toBe("https://riot.im/");
+            });
+        });
+    });
 });
 
 

From bdef54622b81c2855d0605f2944b88bb1519e337 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 14:52:08 +0000
Subject: [PATCH 0243/3235] delint and add copyright

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/messages/TextualBody-test.js          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 9e721d1d09..7aeff94404 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -1,3 +1,19 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 expect from 'expect';
 import Adapter from "enzyme-adapter-react-16";
@@ -7,7 +23,6 @@ import sdk from "../../../skinned-sdk";
 import {mkEvent, mkStubRoom} from "../../../test-utils";
 import MatrixClientPeg from "../../../../src/MatrixClientPeg";
 import * as languageHandler from "../../../../src/languageHandler";
-import {sleep} from "../../../../src/utils/promise";
 
 const TextualBody = sdk.getComponent("views.messages.TextualBody");
 

From bef824e84ee36769712fc3c48171032056875df0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Jan 2020 12:21:59 -0700
Subject: [PATCH 0244/3235] Remove harmful html entities encoding and other
 style nits

React will take care of this for us. It's harmful because simple characters get converted to something illegible.
---
 src/HtmlUtils.js                               |  5 -----
 src/components/views/dialogs/DMInviteDialog.js | 12 ++++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index ce677e6c68..7cdff26a21 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -528,8 +528,3 @@ export function checkBlockNode(node) {
             return false;
     }
 }
-
-export function htmlEntitiesEncode(str: string) {
-    // Source: https://stackoverflow.com/a/18750001/7037379
-    return str.replace(/[\u00A0-\u9999<>&]/gim, i => `&#${i.charCodeAt(0)};`);
-}
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index aec64919a0..bb3e38a304 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -24,7 +24,6 @@ import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/lib/matrix";
 import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
-import {htmlEntitiesEncode} from "../../../HtmlUtils";
 import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
@@ -77,11 +76,9 @@ class DMRoomTile extends React.PureComponent {
     _highlightName(str: string) {
         if (!this.props.highlightWord) return str;
 
-        // First encode the thing to avoid injection
-        str = htmlEntitiesEncode(str);
-
         // We convert things to lowercase for index searching, but pull substrings from
-        // the submitted text to preserve case.
+        // the submitted text to preserve case. Note: we don't need to htmlEntities the
+        // string because React will safely encode the text for us.
         const lowerStr = str.toLowerCase();
         const filterStr = this.props.highlightWord.toLowerCase();
 
@@ -92,8 +89,8 @@ class DMRoomTile extends React.PureComponent {
         while ((ii = lowerStr.indexOf(filterStr, i)) >= 0) {
             // Push any text we missed (first bit/middle of text)
             if (ii > i) {
-                // Push any text we aren't highlighting (middle of text match)
-                result.push(<span key={i + 'mid'}>{str.substring(i, ii)}</span>);
+                // Push any text we aren't highlighting (middle of text match, or beginning of text)
+                result.push(<span key={i + 'begin'}>{str.substring(i, ii)}</span>);
             }
 
             i = ii; // copy over ii only if we have a match (to preserve i for end-of-text matching)
@@ -333,7 +330,6 @@ export default class DMInviteDialog extends React.PureComponent {
             }
         }
 
-
         // If we're going to hide one member behind 'show more', just use up the space of the button
         // with the member's tile instead.
         if (showNum === sourceMembers.length - 1) showNum++;

From 6c410e602787ef041f85fb6aa62ca6ae5bae3b4f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Jan 2020 12:23:35 -0700
Subject: [PATCH 0245/3235] Fix comment style

---
 src/components/views/dialogs/DMInviteDialog.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index bdeae6bc3e..2854c914f8 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -115,6 +115,8 @@ export default class DMInviteDialog extends React.PureComponent {
         const joinedRooms = client.getRooms()
             .filter(r => r.getMyMembership() === 'join')
             .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
+
+        // Generates { userId: {member, rooms[]} }
         const memberRooms = joinedRooms.reduce((members, room) => {
             const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
             for (const member of joinedMembers) {
@@ -136,7 +138,9 @@ export default class DMInviteDialog extends React.PureComponent {
                 }
             }
             return members;
-        }, {/* userId => {member, rooms[]} */});
+        }, {});
+
+        // Generates { userId: {member, numRooms, score} }
         const memberScores = Object.values(memberRooms).reduce((scores, entry) => {
             const numMembersTotal = entry.rooms.reduce((c, r) => c + r.getJoinedMemberCount(), 0);
             const maxRange = maxConsideredMembers * entry.rooms.length;
@@ -146,7 +150,8 @@ export default class DMInviteDialog extends React.PureComponent {
                 score: Math.max(0, Math.pow(1 - (numMembersTotal / maxRange), 5)),
             };
             return scores;
-        }, {/* userId => {member, numRooms, score} */});
+        }, {});
+
         const members = Object.values(memberScores);
         members.sort((a, b) => {
             if (a.score === b.score) {

From dac31dbe00176d28ec93c0ef579e05f00e808cc1 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 6 Jan 2020 21:08:18 +0000
Subject: [PATCH 0246/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2000 of 2000 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 92113c3238..10da7537a9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2034,5 +2034,6 @@
     "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Ide csatlakozva: <channelIcon /> <channelName /> itt: <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "Ezzel a protokollal csatlakozva: %(protocolName)s",
     "Bridge Info": "Híd információ",
-    "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról."
+    "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról.",
+    "Suggestions": "Javaslatok"
 }

From 7b91d2056b2098e7a12e574a8495503d23570c15 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Jan 2020 23:50:42 +0000
Subject: [PATCH 0247/3235] Attempt to fix e2e tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/usecases/room-settings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index 5b425f14b7..8e9e267d45 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -55,6 +55,7 @@ module.exports = async function changeRoomSettings(session, settings) {
         await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":")));
         const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings .mx_AccessibleButton");
         await addButton.click();
+        await session.delay(10); // delay to give time for the validator to run and check the alias
         session.log.done();
     }
 

From 7367c73a37a795f1baf3e8be0f33da51ca97dbd7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Jan 2020 10:50:02 +0000
Subject: [PATCH 0248/3235] Searchbox Enter is to clear, tabbing to clear
 button doesn't work, remove it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/SearchBox.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 9090152de8..6bf7c754f0 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -133,9 +133,11 @@ module.exports = createReactClass({
             return null;
         }
         const clearButton = (!this.state.blurred || this.state.searchTerm) ?
-            (<AccessibleButton key="button"
-                    className="mx_SearchBox_closeButton"
-                    onClick={ () => {this._clearSearch("button"); } }>
+            (<AccessibleButton
+                key="button"
+                tabIndex={-1}
+                className="mx_SearchBox_closeButton"
+                onClick={ () => {this._clearSearch("button"); } }>
             </AccessibleButton>) : undefined;
 
         // show a shorter placeholder when blurred, if requested

From a62c260f794f2f89815045458b05a656bc5962dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Jan 2020 12:58:24 +0000
Subject: [PATCH 0249/3235] Fix userinfo for users not in the room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b55991eda8..9c90953114 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1000,8 +1000,8 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     // Load room if we are given a room id and memoize it
     const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]);
-    // fetch latest room member if we have a room, so we don't show historical information
-    const member = useMemo(() => room ? room.getMember(user.userId) : user, [room, user]);
+    // fetch latest room member if we have a room, so we don't show historical information, falling back to user
+    const member = useMemo(() => room ? (room.getMember(user.userId) || user) : user, [room, user]);
 
     // only display the devices list if our client supports E2E
     const _enableDevices = cli.isCryptoEnabled();

From 69dde64a7a6670f9954bfd94d3b64c3afa4af99f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 7 Jan 2020 02:52:43 +0000
Subject: [PATCH 0250/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1998 of 1998 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 db75121f07..d58f37b37a 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2033,5 +2033,6 @@
     "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "連線到 <channelIcon /> <channelName /> 於 <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "透過 %(protocolName)s 連線",
     "Bridge Info": "橋接資訊",
-    "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。"
+    "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。",
+    "Suggestions": "建議"
 }

From 0381334f45de10054797c170fd89ef221a4db55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 7 Jan 2020 11:02:59 +0000
Subject: [PATCH 0251/3235] Translated using Weblate (French)

Currently translated at 100.0% (1998 of 1998 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 c2ee7c575b..7261f62f3a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2033,5 +2033,6 @@
     "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connecté à <channelIcon /> <channelName /> sur <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "Connecté via %(protocolName)s",
     "Bridge Info": "Informations de la passerelle",
-    "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon."
+    "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon.",
+    "Suggestions": "Suggestions"
 }

From 8606bb9fba98a39444158e3408d121197465c9ba Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 7 Jan 2020 13:50:05 +0000
Subject: [PATCH 0252/3235] Translated using Weblate (Italian)

Currently translated at 99.9% (1997 of 1998 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 390729950b..22fc083d08 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2017,5 +2017,20 @@
     "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.",
     "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi",
     "Migrate from Key Backup": "Migra dal backup chiavi",
-    "Help": "Aiuto"
+    "Help": "Aiuto",
+    "New DM invite dialog (under development)": "Nuovo invito via messaggio diretto (in sviluppo)",
+    "Show info about bridges in room settings": "Mostra info sui bridge nelle impostazioni stanza",
+    "This bridge was provisioned by <user />": "Questo bridge è stato fornito da <user />",
+    "This bridge is managed by <user />.": "Questo bridge è gestito da <user />.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridge in <channelLink /> <networkLink />, su <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connesso a <channelIcon /> <channelName /> su <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "Connesso via %(protocolName)s",
+    "Bridge Info": "Info bridge",
+    "Below is a list of bridges connected to this room.": "Sotto vedi una lista di brdige connessi a questa stanza.",
+    "Recent Conversations": "Conversazioni recenti",
+    "Suggestions": "Suggerimenti",
+    "Show more": "Mostra altro",
+    "Direct Messages": "Messaggi diretti",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Se non riesci a trovare qualcuno, chiedigli il nome utente o condividi il tuo (%(userId)s) o il <a>link al profilo</a>.",
+    "Go": "Vai"
 }

From 40b23d6aa4cb6ad465c4ec1c9c2b55bd2ebe3cc9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 18:48:55 +0000
Subject: [PATCH 0253/3235] Strip all variation selectors on emoji

...when inserting into or looking up in the unicode to emoji map.

This broke with emojibase 4.2.0 which changed the type of a whole
load of emojis to 'text' when previously they were 'emoji'. This
caused them to get the 'text' variant of the unicode string which
has the text variation selector (15) appended instead of the emoji
variation selector (16). We were only stripping the emoji selector,
so upgrading to 4.2.0 caused riot to fail to find the heart in the
unicode map, which therefore prevented the app from starting.
---
 src/emoji.js | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/emoji.js b/src/emoji.js
index 7b7a9c1bfe..8b3c4c9fe4 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -16,14 +16,12 @@ limitations under the License.
 
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
-export const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
-
 // The unicode is stored without the variant selector
 const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode
 export const EMOTICON_TO_EMOJI = new Map();
 export const SHORTCODE_TO_EMOJI = new Map();
 
-export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(unicode.replace(VARIATION_SELECTOR, ""));
+export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
     "people", // smileys
@@ -51,13 +49,6 @@ export const DATA_BY_CATEGORY = {
 
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
 EMOJIBASE.forEach(emoji => {
-    if (emoji.unicode.includes(VARIATION_SELECTOR)) {
-        // Clone data into variation-less version
-        emoji = Object.assign({}, emoji, {
-            unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""),
-        });
-    }
-
     const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
     if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
         DATA_BY_CATEGORY[categoryId].push(emoji);
@@ -66,7 +57,13 @@ EMOJIBASE.forEach(emoji => {
     emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
 
     // Add mapping from unicode to Emoji object
-    UNICODE_TO_EMOJI.set(emoji.unicode, emoji);
+    // The 'unicode' field that we use in emojibase has either
+    // VS15 or VS16 appended to any characters that can take
+    // variation selectors. Which one it appends depends
+    // on whether emojibase considers their type to be 'text' or
+    // 'emoji'. We therefore strip any variation chars from strings
+    // both when building the map and when looking up.
+    UNICODE_TO_EMOJI.set(stripVariation(emoji.unicode), emoji);
 
     if (emoji.emoticon) {
         // Add mapping from emoticon to Emoji object
@@ -80,3 +77,23 @@ EMOJIBASE.forEach(emoji => {
         });
     }
 });
+
+/**
+ * Strips variation selectors from a string
+ * NB. Skin tone modifers are not variation selectors:
+ * this function does not touch them. (Should it?)
+ *
+ * @param {string} str string to strip
+ * @returns {string} stripped string
+ */
+function stripVariation(str) {
+    let ret = '';
+    for (let i = 0; i < str.length; ++i) {
+        const charCode = str.charCodeAt(i);
+        // append to output only if it's outside the variation selector range
+        if (charCode < 0xFE00 && charCode > 0xFE0F) {
+            ret += str.charAt(i);
+        }
+    }
+    return ret;
+}

From ffd40c2c4081ce7bd2a6fb09a39e230f6d07b991 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Jan 2020 20:51:23 -0700
Subject: [PATCH 0254/3235] Initial editor for user list selection

For https://github.com/vector-im/riot-web/issues/11199
---
 res/css/views/dialogs/_DMInviteDialog.scss    |  77 ++++++-
 res/img/icon-email-pill-avatar.svg            |  37 +++
 res/img/icon-pill-remove.svg                  |  36 +++
 .../views/dialogs/DMInviteDialog.js           | 214 ++++++++++++++----
 4 files changed, 323 insertions(+), 41 deletions(-)
 create mode 100644 res/img/icon-email-pill-avatar.svg
 create mode 100644 res/img/icon-pill-remove.svg

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index 364c796f16..e581f9dc7a 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -21,15 +21,51 @@ limitations under the License.
     .mx_DMInviteDialog_editor {
         flex: 1;
         width: 100%; // Needed to make the Field inside grow
-    }
+        background-color: $user-tile-hover-bg-color;
+        border-radius: 4px;
+        min-height: 25px;
+        padding-left: 8px;
+        overflow-x: hidden;
+        overflow-y: auto;
 
-    .mx_Field {
-        margin: 0;
+        .mx_DMInviteDialog_userTile {
+            display: inline-block;
+            float: left;
+            position: relative;
+            top: 7px;
+        }
+
+        // Using a textarea for this element, to circumvent autofill
+        // Mostly copied from AddressPickerDialog
+        textarea,
+        textarea:focus {
+            height: 34px;
+            line-height: 34px;
+            font-size: 14px;
+            padding-left: 12px;
+            margin: 0 !important;
+            border: 0 !important;
+            outline: 0 !important;
+            resize: none;
+            overflow: hidden;
+            box-sizing: border-box;
+            word-wrap: nowrap;
+
+            // Roughly fill about 2/5ths of the available space. This is to try and 'fill' the
+            // remaining space after a bunch of pills, but is a bit hacky. Ideally we'd have
+            // support for "fill remaining width", but traditional tricks don't work with what
+            // we're pushing into this "field". Flexbox just makes things worse. The theory is
+            // that users won't need more than about 2/5ths of the input to find the person
+            // they're looking for.
+            width: 40%;
+        }
     }
 
     .mx_DMInviteDialog_goButton {
         width: 48px;
         margin-left: 10px;
+        height: 25px;
+        line-height: 25px;
     }
 }
 
@@ -83,3 +119,38 @@ limitations under the License.
     }
 }
 
+// Many of these styles are stolen from mx_UserPill, but adjusted for the invite dialog.
+.mx_DMInviteDialog_userTile {
+    margin-right: 8px;
+
+    .mx_DMInviteDialog_userTile_pill {
+        background-color: $username-variant1-color;
+        border-radius: 12px;
+        display: inline-block;
+        height: 24px;
+        line-height: 24px;
+        padding-left: 8px;
+        padding-right: 8px;
+        color: #ffffff; // this is fine without a var because it's for both themes
+
+        .mx_DMInviteDialog_userTile_avatar {
+            border-radius: 20px;
+            position: relative;
+            left: -5px;
+            top: 2px;
+        }
+
+        img.mx_DMInviteDialog_userTile_avatar {
+           vertical-align: top;
+        }
+
+        .mx_DMInviteDialog_userTile_name {
+            vertical-align: top;
+        }
+    }
+
+    .mx_DMInviteDialog_userTile_remove {
+        display: inline-block;
+        margin-left: 4px;
+    }
+}
diff --git a/res/img/icon-email-pill-avatar.svg b/res/img/icon-email-pill-avatar.svg
new file mode 100644
index 0000000000..c107ccc480
--- /dev/null
+++ b/res/img/icon-email-pill-avatar.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="69px" height="68px" viewBox="0 0 69 68" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>at-sign</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <filter x="-5.9%" y="-7.9%" width="111.8%" height="115.8%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="FTUE" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="FTUE---User-list-suggestions" transform="translate(-5161.000000, -1379.000000)" stroke="#368BD6">
+            <g id="Group-14-Copy-10" transform="translate(4748.000000, 1168.000000)">
+                <g id="Web-Copy-6" filter="url(#filter-1)">
+                    <g id="modal-copy" transform="translate(253.000000, 118.000000)">
+                        <g id="content" transform="translate(40.000000, 107.000000)">
+                            <g id="Group-43">
+                                <g id="Group-15-Copy-6" transform="translate(143.000000, 6.000000)">
+                                    <g id="at-sign" transform="translate(5.500000, 6.500000)">
+                                        <circle id="Oval" cx="6.28571429" cy="5.71428571" r="2.28571429"></circle>
+                                        <path d="M8.57142857,3.42857143 L8.57142857,6.28571429 C8.57142857,7.23248814 9.33894043,8 10.2857143,8 C11.2324881,8 12,7.23248814 12,6.28571429 L12,5.71428571 C11.9998328,3.05880261 10.1703625,0.75337961 7.58436487,0.149884297 C4.9983672,-0.453611015 2.33741804,0.803881013 1.16186053,3.18498476 C-0.0136969889,5.5660885 0.605971794,8.4432307 2.65750183,10.1292957 C4.70903186,11.8153606 7.65171364,11.8659623 9.76,10.2514286" id="Path"></path>
+                                    </g>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/res/img/icon-pill-remove.svg b/res/img/icon-pill-remove.svg
new file mode 100644
index 0000000000..5b31cca42f
--- /dev/null
+++ b/res/img/icon-pill-remove.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="58px" height="60px" viewBox="26 25 6 6" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
+    <title>x</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <filter x="-5.9%" y="-7.9%" width="111.8%" height="115.8%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0" type="matrix"
+                           in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="F..." transform="translate(-2802.000000, -392.000000)" stroke="#61708B">
+        <g id="Group-14-Copy-8" transform="translate(2396.000000, 177.000000)">
+            <g id="Web-Copy-6" filter="url(#filter-1)">
+                <g id="modal-copy" transform="translate(253.000000, 118.000000)">
+                    <g id="content" transform="translate(40.000000, 107.000000)">
+                        <g id="Group-43">
+                            <g id="Group-15" transform="translate(7.000000, 6.000000)">
+                                <g id="x" transform="translate(132.000000, 9.000000)">
+                                    <path d="M6,0 L0,6" id="Path"></path>
+                                    <path d="M0,0 L6,6" id="Path"></path>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index c5e9c92131..6eb6d0c78b 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import sdk from "../../../index";
@@ -31,18 +31,46 @@ import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
 
-class DirectoryMember {
+// This is the interface that is expected by various components in this file. It is a bit
+// awkward because it also matches the RoomMember class from the js-sdk with some extra support
+// for 3PIDs/email addresses.
+//
+// Dev note: In order to allow us to compile the app correctly, this needs to be a class
+// even though FlowJS supports interfaces. It just means that we "extend" rather than "implement"
+// in the classes, at least until TypeScript saves us.
+class Member {
+    /**
+     * The display name of this Member. For users this should be their profile's display
+     * name or user ID if none set. For 3PIDs this should be the 3PID address (email).
+     */
+    get name(): string { throw new Error("Member class not implemented"); }
+
+    /**
+     * The ID of this Member. For users this should be their user ID. For 3PIDs this should
+     * be the 3PID address (email).
+     */
+    get userId(): string { throw new Error("Member class not implemented"); }
+
+    /**
+     * Gets the MXC URL of this Member's avatar. For users this should be their profile's
+     * avatar MXC URL or null if none set. For 3PIDs this should always be null.
+     */
+    getMxcAvatarUrl(): string { throw new Error("Member class not implemented"); }
+}
+
+class DirectoryMember extends Member {
     _userId: string;
     _displayName: string;
     _avatarUrl: string;
 
     constructor(userDirResult: {user_id: string, display_name: string, avatar_url: string}) {
+        super();
         this._userId = userDirResult.user_id;
         this._displayName = userDirResult.display_name;
         this._avatarUrl = userDirResult.avatar_url;
     }
 
-    // These next members are to implement the contract expected by DMRoomTile
+    // These next class members are for the Member interface
     get name(): string {
         return this._displayName || this._userId;
     }
@@ -56,12 +84,91 @@ class DirectoryMember {
     }
 }
 
+class ThreepidMember extends Member {
+    _id: string;
+
+    constructor(id: string) {
+        super();
+        this._id = id;
+    }
+
+    // This is a getter that would be falsey on all other implementations. Until we have
+    // better type support in the react-sdk we can use this trick to determine the kind
+    // of 3PID we're dealing with, if any.
+    get isEmail(): boolean {
+        return this._id.includes('@');
+    }
+
+    // These next class members are for the Member interface
+    get name(): string {
+        return this._id;
+    }
+
+    get userId(): string {
+        return this._id;
+    }
+
+    getMxcAvatarUrl(): string {
+        return null;
+    }
+}
+
+class DMUserTile extends React.PureComponent {
+    static propTypes = {
+        member: PropTypes.object.isRequired, // Should be a Member (see interface above)
+        onRemove: PropTypes.func.isRequired, // takes 1 argument, the member being removed
+    };
+
+    _onRemove = (e) => {
+        // Stop the browser from highlighting text
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.props.onRemove(this.props.member);
+    };
+
+    render() {
+        const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        const avatarSize = 20;
+        const avatar = this.props.member.isEmail
+            ? <img
+                className='mx_DMInviteDialog_userTile_avatar'
+                src={require("../../../../res/img/icon-email-pill-avatar.svg")}
+                width={avatarSize} height={avatarSize} />
+            : <BaseAvatar
+                className='mx_DMInviteDialog_userTile_avatar'
+                url={getHttpUriForMxc(
+                    MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
+                    avatarSize, avatarSize, "crop")}
+                name={this.props.member.name}
+                idName={this.props.member.userId}
+                width={avatarSize}
+                height={avatarSize} />;
+
+        return (
+            <span className='mx_DMInviteDialog_userTile'>
+                <span className='mx_DMInviteDialog_userTile_pill'>
+                    {avatar}
+                    <span className='mx_DMInviteDialog_userTile_name'>{this.props.member.name}</span>
+                </span>
+                <AccessibleButton
+                    className='mx_DMInviteDialog_userTile_remove'
+                    onClick={this._onRemove}
+                >
+                    <img src={require("../../../../res/img/icon-pill-remove.svg")} alt={_t('Remove')} width={8} height={8} />
+                </AccessibleButton>
+            </span>
+        );
+    }
+}
+
 class DMRoomTile extends React.PureComponent {
     static propTypes = {
-        // Has properties to match RoomMember: userId (str), name (str), getMxcAvatarUrl(): string
-        member: PropTypes.object.isRequired,
+        member: PropTypes.object.isRequired, // Should be a Member (see interface above)
         lastActiveTs: PropTypes.number,
-        onToggle: PropTypes.func.isRequired,
+        onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled
         highlightWord: PropTypes.string,
     };
 
@@ -70,7 +177,7 @@ class DMRoomTile extends React.PureComponent {
         e.preventDefault();
         e.stopPropagation();
 
-        this.props.onToggle(this.props.member.userId);
+        this.props.onToggle(this.props.member);
     };
 
     _highlightName(str: string) {
@@ -121,19 +228,22 @@ class DMRoomTile extends React.PureComponent {
         }
 
         const avatarSize = 36;
-        const avatarUrl = getHttpUriForMxc(
-            MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
-            avatarSize, avatarSize, "crop");
+        const avatar = this.props.member.isEmail
+            ? <img
+                src={require("../../../../res/img/icon-email-pill-avatar.svg")}
+                width={avatarSize} height={avatarSize} />
+            : <BaseAvatar
+                url={getHttpUriForMxc(
+                    MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
+                    avatarSize, avatarSize, "crop")}
+                name={this.props.member.name}
+                idName={this.props.member.userId}
+                width={avatarSize}
+                height={avatarSize} />;
 
         return (
             <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
-                <BaseAvatar
-                    url={avatarUrl}
-                    name={this.props.member.name}
-                    idName={this.props.member.userId}
-                    width={avatarSize}
-                    height={avatarSize}
-                />
+                {avatar}
                 <span className='mx_DMInviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
                 <span className='mx_DMInviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
                 {timestamp}
@@ -149,12 +259,13 @@ export default class DMInviteDialog extends React.PureComponent {
     };
 
     _debounceTimer: number = null;
+    _editorRef: any = null;
 
     constructor() {
         super();
 
         this.state = {
-            targets: [], // string[] of mxids/email addresses
+            targets: [], // array of Member objects (see interface above)
             filterText: "",
             recents: this._buildRecents(),
             numRecentsShown: INITIAL_ROOMS_SHOWN,
@@ -162,6 +273,8 @@ export default class DMInviteDialog extends React.PureComponent {
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
             serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
         };
+
+        this._editorRef = createRef();
     }
 
     _buildRecents(): {userId: string, user: RoomMember, lastActive: number} {
@@ -245,7 +358,7 @@ export default class DMInviteDialog extends React.PureComponent {
     }
 
     _startDm = () => {
-        this.props.onFinished(this.state.targets);
+        this.props.onFinished(this.state.targets.map(t => t.userId));
     };
 
     _cancel = () => {
@@ -292,14 +405,33 @@ export default class DMInviteDialog extends React.PureComponent {
         this.setState({numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN});
     };
 
-    _toggleMember = (userId) => {
+    _toggleMember = (member: Member) => {
         const targets = this.state.targets.map(t => t); // cheap clone for mutation
-        const idx = targets.indexOf(userId);
+        const idx = targets.indexOf(member);
         if (idx >= 0) targets.splice(idx, 1);
-        else targets.push(userId);
+        else targets.push(member);
         this.setState({targets});
     };
 
+    _removeMember = (member: Member) => {
+        const targets = this.state.targets.map(t => t); // cheap clone for mutation
+        const idx = targets.indexOf(member);
+        if (idx >= 0) {
+            targets.splice(idx, 1);
+            this.setState({targets});
+        }
+    };
+
+    _onClickInputArea = (e) => {
+        // Stop the browser from highlighting text
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (this._editorRef && this._editorRef.current) {
+            this._editorRef.current.focus();
+        }
+    };
+
     _renderSection(kind: "recents"|"suggestions") {
         let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
         let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
@@ -371,24 +503,31 @@ export default class DMInviteDialog extends React.PureComponent {
         );
     }
 
+    _renderEditor() {
+        const targets = this.state.targets.map(t => (
+            <DMUserTile member={t} onRemove={this._removeMember} key={t.userId} />
+        ));
+        const input = (
+            <textarea
+                key={"input"}
+                rows={1}
+                onChange={this._updateFilter}
+                defaultValue={this.state.filterText}
+                ref={this._editorRef}
+            />
+        );
+        return (
+            <div className='mx_DMInviteDialog_editor' onClick={this._onClickInputArea}>
+                {targets}
+                {input}
+            </div>
+        )
+    }
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Field = sdk.getComponent("elements.Field");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
-        // Dev note: The use of Field is temporary/incomplete pending https://github.com/vector-im/riot-web/issues/11197
-        // For now, we just list who the targets are.
-        const editor = (
-            <div className='mx_DMInviteDialog_editor'>
-                <Field
-                    id="inviteTargets"
-                    value={this.state.filterText}
-                    onChange={this._updateFilter}
-                />
-            </div>
-        );
-        const targets = this.state.targets.map(t => <div key={t}>{t}</div>);
-
         const userId = MatrixClientPeg.get().getUserId();
         return (
             <BaseDialog
@@ -406,9 +545,8 @@ export default class DMInviteDialog extends React.PureComponent {
                             {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
                         )}
                     </p>
-                    {targets}
                     <div className='mx_DMInviteDialog_addressBar'>
-                        {editor}
+                        {this._renderEditor()}
                         <AccessibleButton
                             kind="primary"
                             onClick={this._startDm}

From 091bfdeaa01cadf7143e7df88a5ca2d50011c68c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 12:12:31 -0700
Subject: [PATCH 0255/3235] Add checkmarks to selected individuals

---
 res/css/views/dialogs/_DMInviteDialog.scss    | 37 +++++++++++++++++++
 .../views/dialogs/DMInviteDialog.js           | 21 ++++++++++-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index e581f9dc7a..e4ca0b5953 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -93,6 +93,43 @@ limitations under the License.
         vertical-align: middle;
     }
 
+    .mx_DMInviteDialog_roomTile_avatarStack {
+        display: inline-block;
+        position: relative;
+        width: 36px;
+        height: 36px;
+
+        &>* {
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
+    }
+
+    .mx_DMInviteDialog_roomTile_selected {
+        width: 36px;
+        height: 36px;
+        border-radius: 36px;
+        background-color: $username-variant1-color;
+        display: inline-block;
+        position: relative;
+
+        &::before {
+            content: "";
+            width: 24px;
+            height: 24px;
+            grid-column: 1;
+            grid-row: 1;
+            mask-image: url('$(res)/img/feather-customised/check.svg');
+            mask-size: 100%;
+            mask-repeat: no-repeat;
+            position: absolute;
+            top: 6px; // 50%
+            left: 6px; // 50%
+            background-color: #ffffff; // this is fine without a var because it's for both themes
+        }
+    }
+
     .mx_DMInviteDialog_roomTile_name {
         font-weight: 600;
         font-size: 14px;
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 6eb6d0c78b..3703082504 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -170,6 +170,7 @@ class DMRoomTile extends React.PureComponent {
         lastActiveTs: PropTypes.number,
         onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled
         highlightWord: PropTypes.string,
+        isSelected: PropTypes.bool,
     };
 
     _onClick = (e) => {
@@ -228,7 +229,7 @@ class DMRoomTile extends React.PureComponent {
         }
 
         const avatarSize = 36;
-        const avatar = this.props.member.isEmail
+        let avatar = this.props.member.isEmail
             ? <img
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
                 width={avatarSize} height={avatarSize} />
@@ -241,9 +242,24 @@ class DMRoomTile extends React.PureComponent {
                 width={avatarSize}
                 height={avatarSize} />;
 
+        let checkmark = null;
+        if (this.props.isSelected) {
+            // To reduce flickering we put the 'selected' room tile above the real avatar
+            checkmark = <div className='mx_DMInviteDialog_roomTile_selected' />;
+        }
+
+        // To reduce flickering we put the checkmark on top of the actual avatar (prevents
+        // the browser from reloading the image source when the avatar remounts).
+        let stackedAvatar = (
+            <span className='mx_DMInviteDialog_roomTile_avatarStack'>
+                {avatar}
+                {checkmark}
+            </span>
+        );
+
         return (
             <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
-                {avatar}
+                {stackedAvatar}
                 <span className='mx_DMInviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
                 <span className='mx_DMInviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
                 {timestamp}
@@ -492,6 +508,7 @@ export default class DMInviteDialog extends React.PureComponent {
                 key={r.userId}
                 onToggle={this._toggleMember}
                 highlightWord={this.state.filterText}
+                isSelected={this.state.targets.some(t => t.userId === r.userId)}
             />
         ));
         return (

From 45a44b910233a513d9dc7ca905d7cea1674b2e0f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 12:20:02 -0700
Subject: [PATCH 0256/3235] Appease the linter

---
 src/components/views/dialogs/DMInviteDialog.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 3703082504..597dd4e01e 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -229,7 +229,7 @@ class DMRoomTile extends React.PureComponent {
         }
 
         const avatarSize = 36;
-        let avatar = this.props.member.isEmail
+        const avatar = this.props.member.isEmail
             ? <img
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
                 width={avatarSize} height={avatarSize} />
@@ -250,7 +250,7 @@ class DMRoomTile extends React.PureComponent {
 
         // To reduce flickering we put the checkmark on top of the actual avatar (prevents
         // the browser from reloading the image source when the avatar remounts).
-        let stackedAvatar = (
+        const stackedAvatar = (
             <span className='mx_DMInviteDialog_roomTile_avatarStack'>
                 {avatar}
                 {checkmark}
@@ -538,7 +538,7 @@ export default class DMInviteDialog extends React.PureComponent {
                 {targets}
                 {input}
             </div>
-        )
+        );
     }
 
     render() {

From 4936e16a156870580f9f90fa1e42bf93859d6fcf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 12:21:14 -0700
Subject: [PATCH 0257/3235] Remove unused ThreepidMember class for now

It's going to be used for future work in this area, but for this particular PR it isn't needed.
---
 .../views/dialogs/DMInviteDialog.js           | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 597dd4e01e..5934dfdc25 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -84,35 +84,6 @@ class DirectoryMember extends Member {
     }
 }
 
-class ThreepidMember extends Member {
-    _id: string;
-
-    constructor(id: string) {
-        super();
-        this._id = id;
-    }
-
-    // This is a getter that would be falsey on all other implementations. Until we have
-    // better type support in the react-sdk we can use this trick to determine the kind
-    // of 3PID we're dealing with, if any.
-    get isEmail(): boolean {
-        return this._id.includes('@');
-    }
-
-    // These next class members are for the Member interface
-    get name(): string {
-        return this._id;
-    }
-
-    get userId(): string {
-        return this._id;
-    }
-
-    getMxcAvatarUrl(): string {
-        return null;
-    }
-}
-
 class DMUserTile extends React.PureComponent {
     static propTypes = {
         member: PropTypes.object.isRequired, // Should be a Member (see interface above)

From e7d48e00d28bd59633566ee247b0fea994389fee Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 12:25:22 -0700
Subject: [PATCH 0258/3235] Appease the scss linter too

---
 res/css/views/dialogs/_DMInviteDialog.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index e4ca0b5953..eaad74d581 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -99,7 +99,7 @@ limitations under the License.
         width: 36px;
         height: 36px;
 
-        &>* {
+        & > * {
             position: absolute;
             top: 0;
             left: 0;
@@ -178,7 +178,7 @@ limitations under the License.
         }
 
         img.mx_DMInviteDialog_userTile_avatar {
-           vertical-align: top;
+            vertical-align: top;
         }
 
         .mx_DMInviteDialog_userTile_name {

From 2d410c91acdc41fa7bcd985787429e40f8188055 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 19:57:17 +0000
Subject: [PATCH 0259/3235] Use a regex because it's simpler and works

and my loop did not because I meant 'or', not 'and'
---
 src/emoji.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/emoji.js b/src/emoji.js
index 8b3c4c9fe4..d62630ae08 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -87,13 +87,5 @@ EMOJIBASE.forEach(emoji => {
  * @returns {string} stripped string
  */
 function stripVariation(str) {
-    let ret = '';
-    for (let i = 0; i < str.length; ++i) {
-        const charCode = str.charCodeAt(i);
-        // append to output only if it's outside the variation selector range
-        if (charCode < 0xFE00 && charCode > 0xFE0F) {
-            ret += str.charAt(i);
-        }
-    }
-    return ret;
+    return str.replace("\uFE00-\uFE0F", "");
 }

From 45ef57d86f9d2a5523468c2a8c7ee87fd158bcaa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 20:41:19 +0000
Subject: [PATCH 0260/3235] Use a regex that actually works

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

diff --git a/src/emoji.js b/src/emoji.js
index d62630ae08..125864e381 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -87,5 +87,5 @@ EMOJIBASE.forEach(emoji => {
  * @returns {string} stripped string
  */
 function stripVariation(str) {
-    return str.replace("\uFE00-\uFE0F", "");
+    return str.replace(/[\uFE00-\uFE0F]/, "");
 }

From 9213f88180ebb7109fe416efca485242c7c7fb89 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:13:42 -0700
Subject: [PATCH 0261/3235] Re-add docs

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

diff --git a/package.json b/package.json
index 3104ab1ac4..221155f70f 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "src",
     "scripts",
     "git-revision.txt",
+    "docs",
     "header",
     "CHANGELOG.md",
     "CONTRIBUTING.rst",

From 56152e4c60ba22964b139a9c9b76f51aa22d2da2 Mon Sep 17 00:00:00 2001
From: Hucki <satanklaus@gmail.com>
Date: Tue, 7 Jan 2020 21:38:22 +0000
Subject: [PATCH 0262/3235] Translated using Weblate (German)

Currently translated at 76.1% (1521 of 1998 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4eb038ec33..1e75c59a21 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1238,7 +1238,7 @@
     "Banana": "Banane",
     "Apple": "Apfel",
     "Strawberry": "Erdbeere",
-    "Corn": "Weizen",
+    "Corn": "Mais",
     "Pizza": "Pizza",
     "Cake": "Kuchen",
     "Heart": "Herz",

From 36e11c7581325f8ffc179e4678e3528f453c6707 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 7 Jan 2020 17:30:43 +0000
Subject: [PATCH 0263/3235] Translated using Weblate (Turkish)

Currently translated at 55.7% (1113 of 1998 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 159cb61965..495b882104 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1071,5 +1071,59 @@
     "Pizza": "Pizza",
     "Cake": "Kek",
     "Heart": "Kalp",
-    "Trophy": "Ödül"
+    "Trophy": "Ödül",
+    "wait and try again later": "bekle ve tekrar dene",
+    "Disconnect anyway": "Yinede bağlantıyı kes",
+    "Go back": "Geri dön",
+    "Identity Server (%(server)s)": "(%(server)s) Kimlik Sunucusu",
+    "Identity Server": "Kimlik Sunucusu",
+    "Do not use an identity server": "Bir kimlik sunucu kullanma",
+    "Enter a new identity server": "Yeni bir kimlik sunucu gir",
+    "Change": "Değiştir",
+    "Manage integrations": "Entegrasyonları yönet",
+    "Email addresses": "E-posta adresleri",
+    "Phone numbers": "Telefon numaraları",
+    "Language and region": "Dil ve bölge",
+    "Theme": "Tema",
+    "Account management": "Hesap yönetimi",
+    "Warning": "Uyarı",
+    "General": "Genel",
+    "Discovery": "Keşfet",
+    "Legal": "Yasal",
+    "Check for update": "Güncelleme kontrolü",
+    "Help & About": "Yardım & Hakkında",
+    "Bug reporting": "Hata raporlama",
+    "FAQ": "FAQ",
+    "Versions": "Sürümler",
+    "Server rules": "Sunucu kuralları",
+    "User rules": "Kullanıcı kuralları",
+    "View rules": "Kuralları görüntüle",
+    "Room list": "Oda listesi",
+    "Autocomplete delay (ms)": "Oto tamamlama gecikmesi (ms)",
+    "Key backup": "Anahtar yedek",
+    "Cross-signing": "Çapraz-imzalama",
+    "Security & Privacy": "Güvenlik & Gizlilik",
+    "Learn more about how we use analytics.": "Analizleri nasıl kullandığımız hakkında daha fazla öğrenin.",
+    "No Audio Outputs detected": "Ses çıkışları tespit edilemedi",
+    "Audio Output": "Ses Çıkışı",
+    "Voice & Video": "Ses & Video",
+    "this room": "bu oda",
+    "Room information": "Oda bilgisi",
+    "Room version": "Oda sürümü",
+    "Room version:": "Oda versiyonu:",
+    "Developer options": "Geliştirici ayarları",
+    "Open Devtools": "Geliştirici araçlarını aç",
+    "Room Addresses": "Oda Adresleri",
+    "Uploaded sound": "Yüklenen ses",
+    "Sounds": "Sesler",
+    "Notification sound": "Bildirim sesi",
+    "Reset": "Sıfırla",
+    "Browse": "Gözat",
+    "Change room name": "Oda adını değiştir",
+    "Change history visibility": "Geçmiş görünürlüğünü değiştir",
+    "Change permissions": "İzinleri değiştir",
+    "Upgrade the room": "Odayı güncelle",
+    "Enable room encryption": "Oda şifrelemeyi aç",
+    "Modify widgets": "Görsel bileşenleri düzenle",
+    "Banned by %(displayName)s": "%(displayName)s tarafından yasaklandı"
 }

From f31cc7dfeee4fb5423c62359e8d87e023520d25c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 18:48:55 +0000
Subject: [PATCH 0264/3235] Strip all variation selectors on emoji

...when inserting into or looking up in the unicode to emoji map.

This broke with emojibase 4.2.0 which changed the type of a whole
load of emojis to 'text' when previously they were 'emoji'. This
caused them to get the 'text' variant of the unicode string which
has the text variation selector (15) appended instead of the emoji
variation selector (16). We were only stripping the emoji selector,
so upgrading to 4.2.0 caused riot to fail to find the heart in the
unicode map, which therefore prevented the app from starting.
---
 src/emoji.js | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/emoji.js b/src/emoji.js
index 7b7a9c1bfe..8b3c4c9fe4 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -16,14 +16,12 @@ limitations under the License.
 
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
-export const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
-
 // The unicode is stored without the variant selector
 const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode
 export const EMOTICON_TO_EMOJI = new Map();
 export const SHORTCODE_TO_EMOJI = new Map();
 
-export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(unicode.replace(VARIATION_SELECTOR, ""));
+export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
 const EMOJIBASE_GROUP_ID_TO_CATEGORY = [
     "people", // smileys
@@ -51,13 +49,6 @@ export const DATA_BY_CATEGORY = {
 
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
 EMOJIBASE.forEach(emoji => {
-    if (emoji.unicode.includes(VARIATION_SELECTOR)) {
-        // Clone data into variation-less version
-        emoji = Object.assign({}, emoji, {
-            unicode: emoji.unicode.replace(VARIATION_SELECTOR, ""),
-        });
-    }
-
     const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
     if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
         DATA_BY_CATEGORY[categoryId].push(emoji);
@@ -66,7 +57,13 @@ EMOJIBASE.forEach(emoji => {
     emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
 
     // Add mapping from unicode to Emoji object
-    UNICODE_TO_EMOJI.set(emoji.unicode, emoji);
+    // The 'unicode' field that we use in emojibase has either
+    // VS15 or VS16 appended to any characters that can take
+    // variation selectors. Which one it appends depends
+    // on whether emojibase considers their type to be 'text' or
+    // 'emoji'. We therefore strip any variation chars from strings
+    // both when building the map and when looking up.
+    UNICODE_TO_EMOJI.set(stripVariation(emoji.unicode), emoji);
 
     if (emoji.emoticon) {
         // Add mapping from emoticon to Emoji object
@@ -80,3 +77,23 @@ EMOJIBASE.forEach(emoji => {
         });
     }
 });
+
+/**
+ * Strips variation selectors from a string
+ * NB. Skin tone modifers are not variation selectors:
+ * this function does not touch them. (Should it?)
+ *
+ * @param {string} str string to strip
+ * @returns {string} stripped string
+ */
+function stripVariation(str) {
+    let ret = '';
+    for (let i = 0; i < str.length; ++i) {
+        const charCode = str.charCodeAt(i);
+        // append to output only if it's outside the variation selector range
+        if (charCode < 0xFE00 && charCode > 0xFE0F) {
+            ret += str.charAt(i);
+        }
+    }
+    return ret;
+}

From bd336b0710cc95a9cdf497c270607de70d33fd1c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 19:57:17 +0000
Subject: [PATCH 0265/3235] Use a regex because it's simpler and works

and my loop did not because I meant 'or', not 'and'
---
 src/emoji.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/emoji.js b/src/emoji.js
index 8b3c4c9fe4..d62630ae08 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -87,13 +87,5 @@ EMOJIBASE.forEach(emoji => {
  * @returns {string} stripped string
  */
 function stripVariation(str) {
-    let ret = '';
-    for (let i = 0; i < str.length; ++i) {
-        const charCode = str.charCodeAt(i);
-        // append to output only if it's outside the variation selector range
-        if (charCode < 0xFE00 && charCode > 0xFE0F) {
-            ret += str.charAt(i);
-        }
-    }
-    return ret;
+    return str.replace("\uFE00-\uFE0F", "");
 }

From 96cb1ddff5c718a7575a3af1cb5fdcb03ef9c967 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Jan 2020 20:41:19 +0000
Subject: [PATCH 0266/3235] Use a regex that actually works

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

diff --git a/src/emoji.js b/src/emoji.js
index d62630ae08..125864e381 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -87,5 +87,5 @@ EMOJIBASE.forEach(emoji => {
  * @returns {string} stripped string
  */
 function stripVariation(str) {
-    return str.replace("\uFE00-\uFE0F", "");
+    return str.replace(/[\uFE00-\uFE0F]/, "");
 }

From f03d55cfe18550efaa4e56388219cf396b4a0b36 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Jan 2020 11:20:29 +0000
Subject: [PATCH 0267/3235] Prepare changelog for v1.7.6-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad057dc7c..a416920529 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [1.7.6-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6-rc.2) (2020-01-08)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6-rc.1...v1.7.6-rc.2)
+
+ * Strip all variation selectors on emoji
+   [\#3818](https://github.com/matrix-org/matrix-react-sdk/pull/3818)
+
 Changes in [1.7.6-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6-rc.1) (2020-01-06)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.5...v1.7.6-rc.1)

From a3fe5bbd8c865f227b62370d0722d7f3bc077478 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Jan 2020 11:20:29 +0000
Subject: [PATCH 0268/3235] v1.7.6-rc.2

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

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

From 79ab69353c838fe013afa60501d6e23587b1d00c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 8 Jan 2020 20:49:29 -0700
Subject: [PATCH 0269/3235] Support searching for 3PIDs from the invite dialog

Part of https://github.com/vector-im/riot-web/issues/11199
---
 res/css/views/dialogs/_DMInviteDialog.scss    |   4 +
 res/img/icon-email-pill-avatar.svg            | 150 ++++++++++++---
 .../views/dialogs/DMInviteDialog.js           | 177 +++++++++++++++++-
 3 files changed, 296 insertions(+), 35 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index eaad74d581..f806e85120 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -184,6 +184,10 @@ limitations under the License.
         .mx_DMInviteDialog_userTile_name {
             vertical-align: top;
         }
+
+        .mx_DMInviteDialog_userTile_threepidAvatar {
+            background-color: #ffffff; // this is fine without a var because it's for both themes
+        }
     }
 
     .mx_DMInviteDialog_userTile_remove {
diff --git a/res/img/icon-email-pill-avatar.svg b/res/img/icon-email-pill-avatar.svg
index c107ccc480..ddc5f5e317 100644
--- a/res/img/icon-email-pill-avatar.svg
+++ b/res/img/icon-email-pill-avatar.svg
@@ -1,31 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="69px" height="68px" viewBox="0 0 69 68" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="65.631203"
+        height="67.980705"
+        viewBox="0 0 65.631202 67.980705"
+        version="1.1"
+        id="svg32"
+        sodipodi:docname="icon-email-pill-avatar.svg"
+        inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+    <metadata
+            id="metadata36">
+        <rdf:RDF>
+            <cc:Work
+                    rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type
+                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+                <dc:title>at-sign</dc:title>
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <sodipodi:namedview
+            pagecolor="#ffffff"
+            bordercolor="#666666"
+            borderopacity="1"
+            objecttolerance="10"
+            gridtolerance="10"
+            guidetolerance="10"
+            inkscape:pageopacity="0"
+            inkscape:pageshadow="2"
+            inkscape:window-width="2560"
+            inkscape:window-height="1377"
+            id="namedview34"
+            showgrid="false"
+            fit-margin-top="0"
+            fit-margin-left="0"
+            fit-margin-right="0"
+            fit-margin-bottom="0"
+            inkscape:zoom="13.882353"
+            inkscape:cx="52.627789"
+            inkscape:cy="30.525891"
+            inkscape:window-x="1912"
+            inkscape:window-y="-8"
+            inkscape:window-maximized="1"
+            inkscape:current-layer="svg32"/>
     <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
-    <title>at-sign</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <filter x="-5.9%" y="-7.9%" width="111.8%" height="115.8%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
+    <title
+            id="title2">at-sign
+    </title>
+    <desc
+            id="desc4">Created with Sketch.
+    </desc>
+    <defs
+            id="defs19">
+        <filter
+                x="-0.059"
+                y="-0.079000004"
+                width="1.118"
+                height="1.158"
+                filterUnits="objectBoundingBox"
+                id="filter-1">
+            <feOffset
+                    dx="0"
+                    dy="2"
+                    in="SourceAlpha"
+                    result="shadowOffsetOuter1"
+                    id="feOffset6"/>
+            <feGaussianBlur
+                    stdDeviation="16"
+                    in="shadowOffsetOuter1"
+                    result="shadowBlurOuter1"
+                    id="feGaussianBlur8"/>
+            <feColorMatrix
+                    values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0"
+                    type="matrix"
+                    in="shadowBlurOuter1"
+                    result="shadowMatrixOuter1"
+                    id="feColorMatrix10"/>
+            <feMerge
+                    id="feMerge16">
+                <feMergeNode
+                        in="shadowMatrixOuter1"
+                        id="feMergeNode12"/>
+                <feMergeNode
+                        in="SourceGraphic"
+                        id="feMergeNode14"/>
             </feMerge>
         </filter>
     </defs>
-    <g id="FTUE" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="FTUE---User-list-suggestions" transform="translate(-5161.000000, -1379.000000)" stroke="#368BD6">
-            <g id="Group-14-Copy-10" transform="translate(4748.000000, 1168.000000)">
-                <g id="Web-Copy-6" filter="url(#filter-1)">
-                    <g id="modal-copy" transform="translate(253.000000, 118.000000)">
-                        <g id="content" transform="translate(40.000000, 107.000000)">
-                            <g id="Group-43">
-                                <g id="Group-15-Copy-6" transform="translate(143.000000, 6.000000)">
-                                    <g id="at-sign" transform="translate(5.500000, 6.500000)">
-                                        <circle id="Oval" cx="6.28571429" cy="5.71428571" r="2.28571429"></circle>
-                                        <path d="M8.57142857,3.42857143 L8.57142857,6.28571429 C8.57142857,7.23248814 9.33894043,8 10.2857143,8 C11.2324881,8 12,7.23248814 12,6.28571429 L12,5.71428571 C11.9998328,3.05880261 10.1703625,0.75337961 7.58436487,0.149884297 C4.9983672,-0.453611015 2.33741804,0.803881013 1.16186053,3.18498476 C-0.0136969889,5.5660885 0.605971794,8.4432307 2.65750183,10.1292957 C4.70903186,11.8153606 7.65171364,11.8659623 9.76,10.2514286" id="Path"></path>
-                                    </g>
+    <g
+            style="fill:none;fill-rule:evenodd;stroke:#368bd6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round"
+            transform="matrix(3.4090685,0,0,3.4090685,-17679.973,-4776.9361)"
+            id="FTUE---User-list-suggestions">
+        <g
+                transform="translate(4748,1168)"
+                id="Group-14-Copy-10">
+            <g
+                    style="filter:url(#filter-1)"
+                    id="Web-Copy-6">
+                <g
+                        transform="translate(253,118)"
+                        id="modal-copy">
+                    <g
+                            transform="translate(40,107)"
+                            id="content">
+                        <g
+                                id="Group-43">
+                            <g
+                                    transform="translate(143,6)"
+                                    id="Group-15-Copy-6">
+                                <g
+                                        transform="translate(5.5,6.5)"
+                                        id="at-sign">
+                                    <circle
+                                            r="2.2857144"
+                                            cy="5.7142859"
+                                            cx="6.2857141"
+                                            id="Oval"/>
+                                    <path
+                                            inkscape:connector-curvature="0"
+                                            id="Path"
+                                            d="M 8.5714286,3.4285714 V 6.2857143 C 8.5714286,7.2324881 9.3389404,8 10.285714,8 11.232488,8 12,7.2324881 12,6.2857143 V 5.7142857 C 11.999833,3.0588026 10.170363,0.75337961 7.5843649,0.1498843 4.9983672,-0.45361102 2.337418,0.80388101 1.1618605,3.1849848 -0.01369699,5.5660885 0.60597179,8.4432307 2.6575018,10.129296 4.7090319,11.815361 7.6517136,11.865962 9.76,10.251429"/>
                                 </g>
                             </g>
                         </g>
@@ -34,4 +134,4 @@
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 5934dfdc25..aadb07edea 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -25,6 +25,11 @@ import {RoomMember} from "matrix-js-sdk/lib/matrix";
 import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
 import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
+import * as Email from "../../../email";
+import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
+import {abbreviateUrl} from "../../../utils/UrlUtils";
+import dis from "../../../dispatcher";
+import IdentityAuthClient from "../../../IdentityAuthClient";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -84,6 +89,35 @@ class DirectoryMember extends Member {
     }
 }
 
+class ThreepidMember extends Member {
+    _id: string;
+
+    constructor(id: string) {
+        super();
+        this._id = id;
+    }
+
+    // This is a getter that would be falsey on all other implementations. Until we have
+    // better type support in the react-sdk we can use this trick to determine the kind
+    // of 3PID we're dealing with, if any.
+    get isEmail(): boolean {
+        return this._id.includes('@');
+    }
+
+    // These next class members are for the Member interface
+    get name(): string {
+        return this._id;
+    }
+
+    get userId(): string {
+        return this._id;
+    }
+
+    getMxcAvatarUrl(): string {
+        return null;
+    }
+}
+
 class DMUserTile extends React.PureComponent {
     static propTypes = {
         member: PropTypes.object.isRequired, // Should be a Member (see interface above)
@@ -105,7 +139,7 @@ class DMUserTile extends React.PureComponent {
         const avatarSize = 20;
         const avatar = this.props.member.isEmail
             ? <img
-                className='mx_DMInviteDialog_userTile_avatar'
+                className='mx_DMInviteDialog_userTile_avatar mx_DMInviteDialog_userTile_threepidAvatar'
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
                 width={avatarSize} height={avatarSize} />
             : <BaseAvatar
@@ -259,6 +293,9 @@ export default class DMInviteDialog extends React.PureComponent {
             suggestions: this._buildSuggestions(),
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
             serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
+            threepidResultsMixin: [], // { user: ThreepidMember, userId: string}[], like recents and suggestions
+            canUseIdentityServer: !!MatrixClientPeg.get().getIdentityServerUrl(),
+            tryingIdentityServer: false,
         };
 
         this._editorRef = createRef();
@@ -362,7 +399,7 @@ export default class DMInviteDialog extends React.PureComponent {
         if (this._debounceTimer) {
             clearTimeout(this._debounceTimer);
         }
-        this._debounceTimer = setTimeout(() => {
+        this._debounceTimer = setTimeout(async () => {
             MatrixClientPeg.get().searchUserDirectory({term}).then(r => {
                 if (term !== this.state.filterText) {
                     // Discard the results - we were probably too slow on the server-side to make
@@ -381,6 +418,62 @@ export default class DMInviteDialog extends React.PureComponent {
                 console.error(e);
                 this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
             });
+
+            // Whenever we search the directory, also try to search the identity server. It's
+            // all debounced the same anyways.
+            if (!this.state.canUseIdentityServer) {
+                // The user doesn't have an identity server set - warn them of that.
+                this.setState({tryingIdentityServer: true});
+                return;
+            }
+            if (term.indexOf('@') > 0 && Email.looksValid(term)) {
+                // Start off by suggesting the plain email while we try and resolve it
+                // to a real account.
+                this.setState({
+                    // per above: the userId is a lie here - it's just a regular identifier
+                    threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
+                });
+                try {
+                    const authClient = new IdentityAuthClient();
+                    const token = await authClient.getAccessToken();
+                    if (term !== this.state.filterText) return; // abandon hope
+
+                    const lookup = await MatrixClientPeg.get().lookupThreePid(
+                        'email',
+                        term,
+                        undefined, // callback
+                        token,
+                    );
+                    if (term !== this.state.filterText) return; // abandon hope
+
+                    if (!lookup || !lookup.mxid) {
+                        // We weren't able to find anyone - we're already suggesting the plain email
+                        // as an alternative, so do nothing.
+                        return;
+                    }
+
+                    // We append the user suggestion to give the user an option to click
+                    // the email anyways, and so we don't cause things to jump around. In
+                    // theory, the user would see the user pop up and think "ah yes, that
+                    // person!"
+                    const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
+                    if (term !== this.state.filterText || !profile) return; // abandon hope
+                    this.setState({
+                        threepidResultsMixin: [...this.state.threepidResultsMixin, {
+                            user: new DirectoryMember({
+                                user_id: lookup.mxid,
+                                display_name: profile.displayname,
+                                avatar_url: profile.avatar_url,
+                            }),
+                            userId: lookup.mxid,
+                        }],
+                    });
+                } catch (e) {
+                    console.error("Error searching identity server:");
+                    console.error(e);
+                    this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
+                }
+            }
         }, 150); // 150ms debounce (human reaction time + some)
     };
 
@@ -419,6 +512,21 @@ export default class DMInviteDialog extends React.PureComponent {
         }
     };
 
+    _onUseDefaultIdentityServerClick(e) {
+        e.preventDefault();
+
+        // Update the IS in account data. Actually using it may trigger terms.
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        useDefaultIdentityServer();
+        this.setState({canUseIdentityServer: true, tryingIdentityServer: false});
+    }
+
+    _onManageSettingsClick(e) {
+        e.preventDefault();
+        dis.dispatch({ action: 'view_user_settings' });
+        this._cancel();
+    }
+
     _renderSection(kind: "recents"|"suggestions") {
         let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
         let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
@@ -426,17 +534,27 @@ export default class DMInviteDialog extends React.PureComponent {
         const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
         const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
 
-        // Mix in the server results if we have any, but only if we're searching
-        if (this.state.filterText && this.state.serverResultsMixin && kind === 'suggestions') {
-            // only pick out the server results that aren't already covered though
-            const uniqueServerResults = this.state.serverResultsMixin
-                .filter(u => !sourceMembers.some(m => m.userId === u.userId));
+        // Mix in the server results if we have any, but only if we're searching. We track the additional
+        // members separately because we want to filter sourceMembers but trust the mixin arrays to have
+        // the right members in them.
+        let additionalMembers = [];
+        const hasMixins = this.state.serverResultsMixin || this.state.threepidResultsMixin;
+        if (this.state.filterText && hasMixins && kind === 'suggestions') {
+            // We don't want to duplicate members though, so just exclude anyone we've already seen.
+            function notAlreadyExists(u: Member): boolean {
+                return !sourceMembers.some(m => m.userId === u.userId)
+                    && !additionalMembers.some(m => m.userId === u.userId);
+            }
 
-            sourceMembers = sourceMembers.concat(uniqueServerResults);
+            const uniqueServerResults = this.state.serverResultsMixin.filter(notAlreadyExists);
+            additionalMembers = additionalMembers.concat(...uniqueServerResults);
+
+            const uniqueThreepidResults = this.state.threepidResultsMixin.filter(notAlreadyExists);
+            additionalMembers = additionalMembers.concat(...uniqueThreepidResults);
         }
 
         // Hide the section if there's nothing to filter by
-        if (!sourceMembers || sourceMembers.length === 0) return null;
+        if (sourceMembers.length === 0 && additionalMembers.length === 0) return null;
 
         // Do some simple filtering on the input before going much further. If we get no results, say so.
         if (this.state.filterText) {
@@ -444,7 +562,7 @@ export default class DMInviteDialog extends React.PureComponent {
             sourceMembers = sourceMembers
                 .filter(m => m.user.name.toLowerCase().includes(filterBy) || m.userId.toLowerCase().includes(filterBy));
 
-            if (sourceMembers.length === 0) {
+            if (sourceMembers.length === 0 && additionalMembers.length === 0) {
                 return (
                     <div className='mx_DMInviteDialog_section'>
                         <h3>{sectionName}</h3>
@@ -454,6 +572,10 @@ export default class DMInviteDialog extends React.PureComponent {
             }
         }
 
+        // Now we mix in the additional members. Again, we presume these have already been filtered. We
+        // also assume they are more relevant than our suggestions and prepend them to the list.
+        sourceMembers = [...additionalMembers, ...sourceMembers];
+
         // If we're going to hide one member behind 'show more', just use up the space of the button
         // with the member's tile instead.
         if (showNum === sourceMembers.length - 1) showNum++;
@@ -512,6 +634,40 @@ export default class DMInviteDialog extends React.PureComponent {
         );
     }
 
+    _renderIdentityServerWarning() {
+        if (!this.state.tryingIdentityServer || this.state.canUseIdentityServer) {
+            return null;
+        }
+
+        const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
+        if (defaultIdentityServerUrl) {
+            return (
+                <div className="mx_AddressPickerDialog_identityServer">{_t(
+                    "Use an identity server to invite by email. " +
+                    "<default>Use the default (%(defaultIdentityServerName)s)</default> " +
+                    "or manage in <settings>Settings</settings>.",
+                    {
+                        defaultIdentityServerName: abbreviateUrl(defaultIdentityServerUrl),
+                    },
+                    {
+                        default: sub => <a href="#" onClick={this._onUseDefaultIdentityServerClick}>{sub}</a>,
+                        settings: sub => <a href="#" onClick={this._onManageSettingsClick}>{sub}</a>,
+                    },
+                )}</div>
+            );
+        } else {
+            return (
+                <div className="mx_AddressPickerDialog_identityServer">{_t(
+                    "Use an identity server to invite by email. " +
+                    "Manage in <settings>Settings</settings>.",
+                    {}, {
+                        settings: sub => <a href="#" onClick={this._onManageSettingsClick}>{sub}</a>,
+                    },
+                )}</div>
+            );
+        }
+    }
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@@ -535,6 +691,7 @@ export default class DMInviteDialog extends React.PureComponent {
                     </p>
                     <div className='mx_DMInviteDialog_addressBar'>
                         {this._renderEditor()}
+                        {this._renderIdentityServerWarning()}
                         <AccessibleButton
                             kind="primary"
                             onClick={this._startDm}

From ab5d82b5acfa4e3c488cb3aee411846e03e06c2b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 8 Jan 2020 20:53:20 -0700
Subject: [PATCH 0270/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index aadb07edea..2a4640205d 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -541,10 +541,10 @@ export default class DMInviteDialog extends React.PureComponent {
         const hasMixins = this.state.serverResultsMixin || this.state.threepidResultsMixin;
         if (this.state.filterText && hasMixins && kind === 'suggestions') {
             // We don't want to duplicate members though, so just exclude anyone we've already seen.
-            function notAlreadyExists(u: Member): boolean {
+            const notAlreadyExists = (u: Member): boolean => {
                 return !sourceMembers.some(m => m.userId === u.userId)
                     && !additionalMembers.some(m => m.userId === u.userId);
-            }
+            };
 
             const uniqueServerResults = this.state.serverResultsMixin.filter(notAlreadyExists);
             additionalMembers = additionalMembers.concat(...uniqueServerResults);

From 6e5de1893b30fcd06e4322e8cf18f63d42ecf56a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 8 Jan 2020 21:01:53 -0700
Subject: [PATCH 0271/3235] Bind handlers to this

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 2a4640205d..aa54376a0a 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -512,20 +512,20 @@ export default class DMInviteDialog extends React.PureComponent {
         }
     };
 
-    _onUseDefaultIdentityServerClick(e) {
+    _onUseDefaultIdentityServerClick = (e) => {
         e.preventDefault();
 
         // Update the IS in account data. Actually using it may trigger terms.
         // eslint-disable-next-line react-hooks/rules-of-hooks
         useDefaultIdentityServer();
         this.setState({canUseIdentityServer: true, tryingIdentityServer: false});
-    }
+    };
 
-    _onManageSettingsClick(e) {
+    _onManageSettingsClick = (e) => {
         e.preventDefault();
         dis.dispatch({ action: 'view_user_settings' });
         this._cancel();
-    }
+    };
 
     _renderSection(kind: "recents"|"suggestions") {
         let sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;

From 4ad4437f3382f369829d844fbab71db376575bf5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 8 Jan 2020 21:19:00 -0700
Subject: [PATCH 0272/3235] Support pasting a bunch of identifiers into the
 invite dialog

Part of https://github.com/vector-im/riot-web/issues/11199
---
 .../views/dialogs/DMInviteDialog.js           | 66 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  2 +
 2 files changed, 68 insertions(+)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index aa54376a0a..f6cc5f0466 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -30,6 +30,7 @@ import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../ut
 import {abbreviateUrl} from "../../../utils/UrlUtils";
 import dis from "../../../dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
+import Modal from "../../../Modal";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -502,6 +503,70 @@ export default class DMInviteDialog extends React.PureComponent {
         }
     };
 
+    _onPaste = async (e) => {
+        // Prevent the text being pasted into the textarea
+        e.preventDefault();
+
+        // Process it as a list of addresses to add instead
+        const text = e.clipboardData.getData("text");
+        const possibleMembers = [
+            // If we can avoid hitting the profile endpoint, we should.
+            ...this.state.recents,
+            ...this.state.suggestions,
+            ...this.state.serverResultsMixin,
+            ...this.state.threepidResultsMixin,
+        ];
+        const toAdd = [];
+        const failed = [];
+        const potentialAddresses = text.split(/[\s,]+/);
+        for (const address of potentialAddresses) {
+            const member = possibleMembers.find(m => m.userId === address);
+            if (member) {
+                toAdd.push(member.user);
+                continue;
+            }
+
+            if (address.indexOf('@') > 0 && Email.looksValid(address)) {
+                toAdd.push(new ThreepidMember(address));
+                continue;
+            }
+
+            if (address[0] !== '@') {
+                failed.push(address); // not a user ID
+                continue;
+            }
+
+            try {
+                const profile = await MatrixClientPeg.get().getProfileInfo(address);
+                const displayName = profile ? profile.displayname : null;
+                const avatarUrl = profile ? profile.avatar_url : null;
+                toAdd.push(new DirectoryMember({
+                    user_id: address,
+                    display_name: displayName,
+                    avatar_url: avatarUrl,
+                }));
+            } catch (e) {
+                console.error("Error looking up profile for " + address);
+                console.error(e);
+                failed.push(address);
+            }
+        }
+
+        if (failed.length > 0) {
+            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+            Modal.createTrackedDialog('Invite Paste Fail', '', QuestionDialog, {
+                title: _t('Failed to find the following users'),
+                description: _t(
+                    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
+                    {csvNames: failed.join(", ")},
+                ),
+                button: _t('OK'),
+            });
+        }
+
+        this.setState({targets: [...this.state.targets, ...toAdd]});
+    };
+
     _onClickInputArea = (e) => {
         // Stop the browser from highlighting text
         e.preventDefault();
@@ -624,6 +689,7 @@ export default class DMInviteDialog extends React.PureComponent {
                 onChange={this._updateFilter}
                 defaultValue={this.state.filterText}
                 ref={this._editorRef}
+                onPaste={this._onPaste}
             />
         );
         return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b34b737891..4311733b51 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1422,6 +1422,8 @@
     "View Servers in Room": "View Servers in Room",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
+    "Failed to find the following users": "Failed to find the following users",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
     "Recent Conversations": "Recent Conversations",
     "Suggestions": "Suggestions",
     "Show more": "Show more",

From 27468a4abc4b7e436222c1ab181878a44d39a1cf Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 8 Jan 2020 11:38:40 +0000
Subject: [PATCH 0273/3235] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1998 of 1998 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index e179c9d61b..8f08328be6 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2015,5 +2015,20 @@
     "Migrate from Key Backup": "Мигрирай от резервно копие на ключове",
     "Secure your encrypted messages with a passphrase": "Защитете шифрованите съобщения с парола",
     "Storing secrets...": "Складиране на тайни...",
-    "Unable to set up secret storage": "Неуспешна настройка на секретно складиране"
+    "Unable to set up secret storage": "Неуспешна настройка на секретно складиране",
+    "New DM invite dialog (under development)": "Нов процес за канене чрез директни съобщения (все още се разработва)",
+    "Show info about bridges in room settings": "Показвай информация за връзки с други мрежи в настройките на стаята",
+    "This bridge was provisioned by <user />": "Тази връзка с друга мрежа е била настроена от <user />",
+    "This bridge is managed by <user />.": "Тази връзка с друга мрежа се управлява от <user />.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Свързано с <channelLink /><networkLink />, посредством <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Свързано с <channelIcon /><channelName /> посредством <networkIcon /><networkName />",
+    "Connected via %(protocolName)s": "Свързано посредством %(protocolName)s",
+    "Bridge Info": "Информация за връзката с друга мрежа",
+    "Below is a list of bridges connected to this room.": "По-долу е списък на връзки с други мрежи свързани с тази стая.",
+    "Recent Conversations": "Скорошни разговори",
+    "Suggestions": "Предложения",
+    "Show more": "Покажи повече",
+    "Direct Messages": "Директни съобщения",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ако не можете да намерите някой, питайте за потребителското им име, или споделете своето (%(userId)s) или <a>връзка към профила</a>.",
+    "Go": "Давай"
 }

From 9cd364b0e244fbaedabc19b0d5ec91c0aa77f54d Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Wed, 8 Jan 2020 15:32:25 +0000
Subject: [PATCH 0274/3235] Translated using Weblate (Swedish)

Currently translated at 76.3% (1525 of 1998 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 | 119 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 1cd7b42a42..4910cd60f4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -149,7 +149,7 @@
     "Incorrect verification code": "Fel verifieringskod",
     "Invalid alias format": "Fel alias-format",
     "Invalid Email Address": "Ogiltig epostadress",
-    "Invalid file%(extra)s": "Fel fil%(extra)s",
+    "Invalid file%(extra)s": "Felaktig fil%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
     "Invite new room members": "Bjud in nya rumsmedlemmar",
     "Invited": "Inbjuden",
@@ -1519,5 +1519,120 @@
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Testa nya sätt att ignorera personer (experimentalt)",
     "Use the new, faster, composer for writing messages": "Använd den nya, snabbare kompositören för att skriva meddelanden",
-    "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder"
+    "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder",
+    "Send cross-signing keys to homeserver": "Skicka korssigneringsnycklar till hemserver",
+    "Custom (%(level)s)": "Anpassad (%(level)s)",
+    "Error upgrading room": "Fel vid uppgradering av rum",
+    "Double check that your server supports the room version chosen and try again.": "Dubbelkolla att din server stöder den valda rumsversionen och försök igen.",
+    "%(senderName)s placed a voice call.": "%(senderName)s ringde ett röstsamtal.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ringde ett röstsamtal. (stöds inte av denna webbläsare)",
+    "%(senderName)s placed a video call.": "%(senderName)s ringde ett videosamtal.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ringde ett videosamtal. (stöds inte av denna webbläsare)",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s tog bort regeln som bannar användare som matchar %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s tog bort regeln som bannar rum som matchar %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s tog bort regeln som bannar servrar som matchar %(glob)s",
+    "Match system theme": "Matcha systemtema",
+    "Decline (%(counter)s)": "Avvisa (%(counter)s)",
+    "on device": "på enhet",
+    "not found": "hittades inte",
+    "Connecting to integration manager...": "Ansluter till integrationshanterare...",
+    "Cannot connect to integration manager": "Det går inte att ansluta till integrationshanterare",
+    "The integration manager is offline or it cannot reach your homeserver.": "Integrationshanteraren är offline eller kan inte nå din hemserver.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Använd en Integrationshanterare <b>(%(serverName)s)</b> för att hantera bots, widgets och klistermärkespaket.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Använd en Integrationshanterare för att hantera bots, widgets och klistermärkespaket.",
+    "Manage integrations": "Hantera integrationer",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationshanterare får konfigurationsdata och kan ändra widgetar, skicka ruminbjudningar och ställa in behörighetsnivåer via ditt konto.",
+    "Close preview": "Stäng förhandsvisning",
+    "Room %(name)s": "Rum %(name)s",
+    "Recent rooms": "Senaste rummen",
+    "Loading room preview": "Laddar förhandsvisning av rummet",
+    "Re-join": "Gå med igen",
+    "Try to join anyway": "Försök att gå med ändå",
+    "Join the discussion": "Gå med i diskussionen",
+    "Do you want to chat with %(user)s?": "Vill du chatta med %(user)s?",
+    "<userName/> wants to chat": "<userName/> vill chatta",
+    "Start chatting": "Börja chatta",
+    "Do you want to join %(roomName)s?": "Vill du gå med i %(roomName)s?",
+    "<userName/> invited you": "<userName/> bjöd in dig",
+    "You're previewing %(roomName)s. Want to join it?": "Du förhandsgranskar %(roomName)s. Vill du gå med i det?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan inte förhandsvisas. Vill du gå med i det?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Detta rum finns inte. Är du säker på att du är på rätt plats?",
+    "Try again later, or ask a room admin to check if you have access.": "Försök igen senare, eller be en rumsadministratör om att kontrollera om du har åtkomst.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s returnerades när du försökte komma åt rummet. Om du tror att du ser det här meddelandet felaktigt, vänligen <issueLink>skicka in en felrapport</issueLink>.",
+    "Failed to connect to integration manager": "Det gick inte att ansluta till integrationshanterare",
+    "React": "Reagera",
+    "Message Actions": "Meddelandeåtgärder",
+    "Show image": "Visa bild",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Du har ignorerat denna användare, så deras meddelande är dolt. <a>Visa ändå.</a>",
+    "You verified %(name)s": "Du verifierade %(name)s",
+    "You cancelled verifying %(name)s": "Du avbröt verifiering av %(name)s",
+    "%(name)s cancelled verifying": "%(name)s avbröt verifiering",
+    "You accepted": "Du accepterade",
+    "%(name)s accepted": "%(name)s accepterade",
+    "You cancelled": "Du avbröt",
+    "%(name)s cancelled": "%(name)s avbröt",
+    "%(name)s wants to verify": "%(name)s vill verifiera",
+    "You sent a verification request": "Du skickade en verifieringsbegäran",
+    "Reactions": "Reaktioner",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagerade med %(content)s</reactedWith>",
+    "Frequently Used": "Ofta använd",
+    "Smileys & People": "Smileys & Människor",
+    "Animals & Nature": "Djur & Natur",
+    "Food & Drink": "Mat & Dryck",
+    "Activities": "Aktiviteter",
+    "Travel & Places": "Resor & Platser",
+    "Objects": "Objekt",
+    "Symbols": "Symboler",
+    "Flags": "Flaggor",
+    "Quick Reactions": "Snabbreaktioner",
+    "Cancel search": "Avbryt sökningen",
+    "Any of the following data may be shared:": "Någon av följande data kan delas:",
+    "Your display name": "Ditt visningsnamn",
+    "Your avatar URL": "Din avatar-URL",
+    "Your user ID": "Ditt användar-ID",
+    "Your theme": "Ditt tema",
+    "Riot URL": "Riot-URL",
+    "Room ID": "Rums-ID",
+    "Widget ID": "Widget-ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s och din Integrationshanterare.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Widgets använder inte meddelandekryptering.",
+    "Widget added by": "Widget tillagd av",
+    "This widget may use cookies.": "Denna widget kan använda cookies.",
+    "More options": "Fler alternativ",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vänligen <newIssueLink>skapa ett nytt ärende</newIssueLink> på GitHub så att vi kan undersöka detta fel.",
+    "Rotate Left": "Rotera vänster",
+    "Rotate Right": "Rotera höger",
+    "Language Dropdown": "Språkmeny",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sgjorde inga ändringar %(count)s gånger",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sgjorde inga ändringar",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgjorde inga ändringar %(count)s gånger",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgjorde inga ändringar",
+    "Room alias": "Rumsalias",
+    "e.g. my-room": "t.ex. mitt rum",
+    "Some characters not allowed": "Vissa tecken är inte tillåtna",
+    "Please provide a room alias": "Vänligen ange ett rumsalias",
+    "This alias is available to use": "Detta alias är tillgängligt att använda",
+    "This alias is already in use": "Detta alias används redan",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Använd en identitetsserver för att bjuda in via epost. <default>Använd standard (%(defaultIdentityServerName)s)</default> eller hantera i <settings>Inställningar</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Använd en identitetsserver för att bjuda in via epost. Hantera i <settings>Inställningar</settings>.",
+    "Close dialog": "Stäng dialogrutan",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Berätta vad som gick fel eller, bättre, skapa ett GitHub-ärende som beskriver problemet.",
+    "View Servers in Room": "Visa servrar i rum",
+    "Recent Conversations": "Senaste konversationerna",
+    "Suggestions": "Förslag",
+    "Show more": "Visa mer",
+    "Direct Messages": "Direktmeddelanden",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Om det är någon du inte kan hitta, be dem om sitt användarnamn eller dela ditt användarnamn (%(userId)s) eller <a>profillänk</a>.",
+    "Go": "Gå",
+    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifiering av den här användaren kommer att markera deras enhet som betrodd, men även markera din enhet som den är betrodd för dem.",
+    "Waiting for partner to confirm...": "Väntar på att kompanjon ska bekräfta...",
+    "Incoming Verification Request": "Inkommande verifieringsbegäran",
+    "Integrations are disabled": "Integrationer är inaktiverade",
+    "Enable 'Manage Integrations' in Settings to do this.": "Aktivera \"Hantera integrationer\" i Inställningar för att göra detta.",
+    "Integrations not allowed": "Integrationer inte tillåtna",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ditt Riot tillåter dig inte att använda en Integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
+    "Your homeserver doesn't seem to support this feature.": "Din hemserver verkar inte stödja den här funktionen.",
+    "Message edits": "Meddelandedigeringar",
+    "Preview": "Förhandsvisa"
 }

From 8116ac74cef1235ef8efd34b137955433a14c35c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Jan 2020 12:10:44 +0000
Subject: [PATCH 0275/3235] Update
 src/components/views/context_menus/MessageContextMenu.js

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/components/views/context_menus/MessageContextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 2084a67cdc..ef1822b555 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -422,7 +422,7 @@ module.exports = createReactClass({
             </MenuItem>
         );
 
-        if (this.props.eventTileOps) { // this event is rendered using TextuaLBody
+        if (this.props.eventTileOps) { // this event is rendered using TextualBody
             quoteButton = (
                 <MenuItem className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
                     { _t('Quote') }

From f3f929207c6c9774e8bb159d876b4de2acae4967 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Jan 2020 12:18:14 +0000
Subject: [PATCH 0276/3235] Update yarn.lock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 yarn.lock | 376 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 367 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 36b6acee26..34c089dc97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -531,6 +531,22 @@ agentkeepalive@^3.4.1:
   dependencies:
     humanize-ms "^1.2.1"
 
+airbnb-prop-types@^2.15.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef"
+  integrity sha512-jUh2/hfKsRjNFC4XONQrxo/n/3GG4Tn6Hl0WlFQN5PY9OMC9loSCoAYKnZsWaP8wEfd5xcrPloK0Zg6iS1xwVA==
+  dependencies:
+    array.prototype.find "^2.1.0"
+    function.prototype.name "^1.1.1"
+    has "^1.0.3"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object.assign "^4.1.0"
+    object.entries "^1.1.0"
+    prop-types "^15.7.2"
+    prop-types-exact "^1.2.0"
+    react-is "^16.9.0"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -659,6 +675,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -699,6 +720,22 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.prototype.find@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz#630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"
+  integrity sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.13.0"
+
+array.prototype.flat@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
@@ -1621,6 +1658,11 @@ body-parser@^1.16.1:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1957,6 +1999,18 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+cheerio@^1.0.0-rc.3:
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.1"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash "^4.15.0"
+    parse5 "^3.0.1"
+
 chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -2136,7 +2190,7 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2374,6 +2428,21 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -2592,6 +2661,11 @@ dir-glob@^2.2.2:
   dependencies:
     path-type "^3.0.0"
 
+discontinuous-range@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -2631,12 +2705,20 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
+dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.1:
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
@@ -2653,6 +2735,14 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
@@ -2816,7 +2906,7 @@ ent@~2.2.0:
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
-entities@^1.1.1, "entities@~ 1.1.1":
+entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
@@ -2826,6 +2916,69 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
+enzyme-adapter-react-16@^1.15.1:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
+  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
+  dependencies:
+    enzyme-adapter-utils "^1.13.0"
+    enzyme-shallow-equal "^1.0.1"
+    has "^1.0.3"
+    object.assign "^4.1.0"
+    object.values "^1.1.1"
+    prop-types "^15.7.2"
+    react-is "^16.12.0"
+    react-test-renderer "^16.0.0-0"
+    semver "^5.7.0"
+
+enzyme-adapter-utils@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78"
+  integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ==
+  dependencies:
+    airbnb-prop-types "^2.15.0"
+    function.prototype.name "^1.1.2"
+    object.assign "^4.1.0"
+    object.fromentries "^2.0.2"
+    prop-types "^15.7.2"
+    semver "^5.7.1"
+
+enzyme-shallow-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e"
+  integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ==
+  dependencies:
+    has "^1.0.3"
+    object-is "^1.0.2"
+
+enzyme@^3.10.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
+  integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
+  dependencies:
+    array.prototype.flat "^1.2.3"
+    cheerio "^1.0.0-rc.3"
+    enzyme-shallow-equal "^1.0.1"
+    function.prototype.name "^1.1.2"
+    has "^1.0.3"
+    html-element-map "^1.2.0"
+    is-boolean-object "^1.0.1"
+    is-callable "^1.1.5"
+    is-number-object "^1.0.4"
+    is-regex "^1.0.5"
+    is-string "^1.0.5"
+    is-subset "^0.1.1"
+    lodash.escape "^4.0.1"
+    lodash.isequal "^4.5.0"
+    object-inspect "^1.7.0"
+    object-is "^1.0.2"
+    object.assign "^4.1.0"
+    object.entries "^1.1.1"
+    object.values "^1.1.1"
+    raf "^3.4.1"
+    rst-selector-parser "^2.2.3"
+    string.prototype.trim "^1.2.1"
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
@@ -2861,6 +3014,23 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7.
     string.prototype.trimleft "^2.1.0"
     string.prototype.trimright "^2.1.0"
 
+es-abstract@^1.13.0, es-abstract@^1.17.0-next.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
+  integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
 es-get-iterator@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
@@ -3600,6 +3770,15 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.1, function.prototype.name@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
+  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    functions-have-names "^1.2.0"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -3988,6 +4167,13 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
   integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
+html-element-map@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22"
+  integrity sha512-0uXq8HsuG1v2TmQ8QkIhzbrqeskE4kn52Q18QJ9iAA/SnHoEKXWiUxHQtclRsCFWEUD2So34X+0+pZZu862nnw==
+  dependencies:
+    array-filter "^1.0.0"
+
 html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
@@ -3998,7 +4184,7 @@ html-tags@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
   integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
 
-htmlparser2@^3.10.0:
+htmlparser2@^3.10.0, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -4317,6 +4503,11 @@ is-boolean-object@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
   integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
 
+is-boolean-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
+  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -4332,6 +4523,11 @@ is-callable@^1.0.4, is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4509,6 +4705,11 @@ is-number-object@^1.0.3:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
   integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4572,6 +4773,13 @@ is-regex@^1.0.3, is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -4592,6 +4800,16 @@ is-string@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
   integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
 
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
+
 is-supported-regexp-flag@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
@@ -5077,11 +5295,21 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.escape@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
+lodash.flattendeep@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5092,6 +5320,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -5117,7 +5350,7 @@ lodash.unescape@4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
+lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -5564,6 +5797,11 @@ mocha@^5.0.5:
     mkdirp "0.5.1"
     supports-color "5.4.0"
 
+moo@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
+  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -5618,6 +5856,17 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+nearley@^2.7.10:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz#37717781d0fd0f2bfc95e233ebd75678ca4bda46"
+  integrity sha512-2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA==
+  dependencies:
+    commander "^2.19.0"
+    moo "^0.4.3"
+    railroad-diagrams "^1.0.0"
+    randexp "0.4.6"
+    semver "^5.4.1"
+
 needle@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
@@ -5792,6 +6041,13 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
@@ -5836,6 +6092,11 @@ object-inspect@^1.1.0, object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
+object-is@^1.0.1, object-is@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
+  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -5868,6 +6129,16 @@ object.entries@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.entries@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
+  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 object.fromentries@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
@@ -5878,6 +6149,16 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.fromentries@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
+  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5903,6 +6184,16 @@ object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+object.values@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -6113,6 +6404,13 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse5@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
+  dependencies:
+    "@types/node" "*"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -6431,6 +6729,15 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types-exact@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
+  integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==
+  dependencies:
+    has "^1.0.3"
+    object.assign "^4.1.0"
+    reflect.ownkeys "^0.2.0"
+
 prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -6559,13 +6866,26 @@ raf-schd@^2.1.0:
   resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.2.tgz#ec622b5167f2912089f054dc03ebd5bcf33c8f62"
   integrity sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g==
 
-raf@^3.1.0:
+raf@^3.1.0, raf@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
   integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
   dependencies:
     performance-now "^2.1.0"
 
+railroad-diagrams@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
+
+randexp@0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
+  dependencies:
+    discontinuous-range "1.0.0"
+    ret "~0.1.10"
+
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -6673,7 +6993,7 @@ react-focus-lock@^2.2.1:
   dependencies:
     gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -6705,7 +7025,7 @@ react-redux@^5.0.6:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
-react-test-renderer@^16.9.0:
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f"
   integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w==
@@ -6822,6 +7142,11 @@ redux@^3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
+reflect.ownkeys@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
+  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
+
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -7138,6 +7463,14 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
+rst-selector-parser@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
+  dependencies:
+    lodash.flattendeep "^4.4.0"
+    nearley "^2.7.10"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -7224,7 +7557,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7673,6 +8006,15 @@ string.prototype.repeat@^0.2.0:
   resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
   integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=
 
+string.prototype.trim@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
+  integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+
 string.prototype.trimleft@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
@@ -7681,6 +8023,14 @@ string.prototype.trimleft@^2.1.0:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
+string.prototype.trimleft@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
+  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string.prototype.trimright@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
@@ -7689,6 +8039,14 @@ string.prototype.trimright@^2.1.0:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
+string.prototype.trimright@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
+  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"

From e0d80fb8b24d472869031592088b167e917a1c43 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Thu, 9 Jan 2020 08:39:17 +0000
Subject: [PATCH 0277/3235] Translated using Weblate (Swedish)

Currently translated at 76.8% (1535 of 1998 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 4910cd60f4..90c03b84f3 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -1634,5 +1634,15 @@
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ditt Riot tillåter dig inte att använda en Integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
     "Your homeserver doesn't seem to support this feature.": "Din hemserver verkar inte stödja den här funktionen.",
     "Message edits": "Meddelandedigeringar",
-    "Preview": "Förhandsvisa"
+    "Preview": "Förhandsvisa",
+    "The message you are trying to send is too large.": "Meddelandet du försöker skicka är för stort.",
+    "New DM invite dialog (under development)": "Ny inbjudningsdialog för direktmeddelanden (under utveckling)",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Aktivera korssignering för att verifiera per användare istället för per enhet (under utveckling)",
+    "Find others by phone or email": "Hitta andra via telefon eller epost",
+    "Be found by phone or email": "Bli hittad via telefon eller e-post",
+    "Terms of Service": "Användarvillkor",
+    "To continue you need to accept the terms of this service.": "För att fortsätta måste du acceptera villkoren för denna tjänst.",
+    "Service": "Tjänst",
+    "Summary": "Sammanfattning",
+    "Document": "Dokument"
 }

From 5d22561815a512e2c989208266dddc7b504b4e2f Mon Sep 17 00:00:00 2001
From: Zoe <zoel@matrix.org>
Date: Thu, 9 Jan 2020 15:17:33 +0000
Subject: [PATCH 0278/3235] Display a padlock icon beside encrypted rooms in
 the room list

https://github.com/vector-im/riot-web/issues/11226
---
 res/css/views/rooms/_RoomTile.scss     | 28 ++++++++++++++++++++++++++
 res/img/lock.svg                       |  4 ++++
 src/components/views/rooms/RoomTile.js |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 res/img/lock.svg

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index e5c7948216..ae38045712 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -200,3 +200,31 @@ limitations under the License.
 .mx_GroupInviteTile .mx_RoomTile_name {
     flex: 1;
 }
+
+.mx_RoomTile.mx_RoomTile.mx_RoomTile_isEncrypted .mx_RoomTile_name {
+    // Scoot the padding in a bit from 6px to make it look better
+    padding-left: 3px;
+}
+
+.mx_RoomTile.mx_RoomTile_isEncrypted .mx_RoomTile_E2EIcon {
+    width: 12px;
+    height: 12px;
+    position: relative;
+    display: block !important;
+    // Align the padlock with unencrypted room names
+    margin-left: 6px;
+
+    &::before {
+        background-color: $roomtile-name-color;
+        mask-image: url('$(res)/img/lock.svg');
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+}
diff --git a/res/img/lock.svg b/res/img/lock.svg
new file mode 100644
index 0000000000..9eb8b6a4c5
--- /dev/null
+++ b/res/img/lock.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 13C3 11.8954 3.89543 11 5 11H19C20.1046 11 21 11.8954 21 13V20C21 21.1046 20.1046 22 19 22H5C3.89543 22 3 21.1046 3 20V13Z" fill="#2E2F32" stroke="#2E2F32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 11V7C7 4.23858 9.23858 2 12 2C14.7614 2 17 4.23858 17 7V11" stroke="#2E2F32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 241713c97d..b9e1abd23d 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -303,6 +303,7 @@ module.exports = createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
+            'mx_RoomTile_isEncrypted': MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId),
         });
 
         const avatarClasses = classNames({
@@ -428,6 +429,7 @@ module.exports = createReactClass({
                         { dmIndicator }
                     </div>
                 </div>
+                <div className="mx_RoomTile_E2EIcon" />
                 <div className="mx_RoomTile_nameContainer">
                     <div className="mx_RoomTile_labelContainer">
                         { label }

From 0a9d7f43c64da95e74046b589286f92648fbf746 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Jan 2020 15:51:19 +0000
Subject: [PATCH 0279/3235] pass the correct phase params for consistency

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/GroupHeaderButtons.js | 3 ++-
 src/components/views/right_panel/RoomHeaderButtons.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index f164b6c578..1602f47347 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import RightPanelStore from "../../../stores/RightPanelStore";
 
 const GROUP_PHASES = [
     RIGHT_PANEL_PHASES.GroupMemberInfo,
@@ -68,7 +69,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
     _onMembersClicked() {
         if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
+            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
         } else {
             // This toggles for us, if needed
             this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index 3831a5953e..449ab3d686 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import RightPanelStore from "../../../stores/RightPanelStore";
 
 const MEMBER_PHASES = [
     RIGHT_PANEL_PHASES.RoomMemberList,
@@ -58,7 +59,7 @@ export default class RoomHeaderButtons extends HeaderButtons {
     _onMembersClicked() {
         if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
+            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
         } else {
             // This toggles for us, if needed
             this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);

From e9032a9f61d4b161117c98b1c5995cee3b338072 Mon Sep 17 00:00:00 2001
From: Zoe <zoel@matrix.org>
Date: Thu, 9 Jan 2020 15:59:27 +0000
Subject: [PATCH 0280/3235] Move the lock icon within the feather-customised
 directory

---
 res/css/views/rooms/_RoomTile.scss                      | 2 +-
 res/img/{lock.svg => feather-customised/lock-solid.svg} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename res/img/{lock.svg => feather-customised/lock-solid.svg} (100%)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index ae38045712..5c37492383 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -216,7 +216,7 @@ limitations under the License.
 
     &::before {
         background-color: $roomtile-name-color;
-        mask-image: url('$(res)/img/lock.svg');
+        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
         mask-position: center;
         mask-repeat: no-repeat;
         mask-size: contain;
diff --git a/res/img/lock.svg b/res/img/feather-customised/lock-solid.svg
similarity index 100%
rename from res/img/lock.svg
rename to res/img/feather-customised/lock-solid.svg

From f452ea225abfc731aaeed1380a7bb36c55702011 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 12:31:16 -0700
Subject: [PATCH 0281/3235] FlowJS is not Flow

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 5934dfdc25..5d5997e52c 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -36,7 +36,7 @@ const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is c
 // for 3PIDs/email addresses.
 //
 // Dev note: In order to allow us to compile the app correctly, this needs to be a class
-// even though FlowJS supports interfaces. It just means that we "extend" rather than "implement"
+// even though Flow supports interfaces. It just means that we "extend" rather than "implement"
 // in the classes, at least until TypeScript saves us.
 class Member {
     /**

From 94e9c6ac9fb82e06c54ffa9982eab493cb5bc6e2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 13:38:47 -0700
Subject: [PATCH 0282/3235] Make the SVG smaller

---
 res/img/icon-pill-remove.svg | 37 +-----------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/res/img/icon-pill-remove.svg b/res/img/icon-pill-remove.svg
index 5b31cca42f..adf6fd4771 100644
--- a/res/img/icon-pill-remove.svg
+++ b/res/img/icon-pill-remove.svg
@@ -1,36 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="58px" height="60px" viewBox="26 25 6 6" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
-    <title>x</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <filter x="-5.9%" y="-7.9%" width="111.8%" height="115.8%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0" type="matrix"
-                           in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="F..." transform="translate(-2802.000000, -392.000000)" stroke="#61708B">
-        <g id="Group-14-Copy-8" transform="translate(2396.000000, 177.000000)">
-            <g id="Web-Copy-6" filter="url(#filter-1)">
-                <g id="modal-copy" transform="translate(253.000000, 118.000000)">
-                    <g id="content" transform="translate(40.000000, 107.000000)">
-                        <g id="Group-43">
-                            <g id="Group-15" transform="translate(7.000000, 6.000000)">
-                                <g id="x" transform="translate(132.000000, 9.000000)">
-                                    <path d="M6,0 L0,6" id="Path"></path>
-                                    <path d="M0,0 L6,6" id="Path"></path>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg width="58" height="60" viewBox="26 25 6 6" xmlns="http://www.w3.org/2000/svg"><defs><filter x="-5.9%" y="-7.9%" width="111.8%" height="115.8%" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0.473684211 0 0 0 0 1 0 0 0 0.241258741 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><g filter="url(#a)" transform="translate(-406 -215)" stroke="#61708B"><path d="M438 240l-6 6M432 240l6 6"/></g></svg>
\ No newline at end of file

From cb9e4376b83c81be072f6eded15ad2bed37e1526 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 13:39:50 -0700
Subject: [PATCH 0283/3235] Fix flow comment

---
 src/components/views/dialogs/DMInviteDialog.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 5d5997e52c..b40865d075 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -35,9 +35,7 @@ const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is c
 // awkward because it also matches the RoomMember class from the js-sdk with some extra support
 // for 3PIDs/email addresses.
 //
-// Dev note: In order to allow us to compile the app correctly, this needs to be a class
-// even though Flow supports interfaces. It just means that we "extend" rather than "implement"
-// in the classes, at least until TypeScript saves us.
+// XXX: We should use TypeScript interfaces instead of this weird "abstract" class.
 class Member {
     /**
      * The display name of this Member. For users this should be their profile's display

From 2caebef7a1d288c930a7b76a241916e731210657 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 13:40:35 -0700
Subject: [PATCH 0284/3235] Make the SVG smaller

---
 res/img/icon-email-pill-avatar.svg | 138 +----------------------------
 1 file changed, 1 insertion(+), 137 deletions(-)

diff --git a/res/img/icon-email-pill-avatar.svg b/res/img/icon-email-pill-avatar.svg
index ddc5f5e317..6b0ac200a5 100644
--- a/res/img/icon-email-pill-avatar.svg
+++ b/res/img/icon-email-pill-avatar.svg
@@ -1,137 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        xmlns:dc="http://purl.org/dc/elements/1.1/"
-        xmlns:cc="http://creativecommons.org/ns#"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-        width="65.631203"
-        height="67.980705"
-        viewBox="0 0 65.631202 67.980705"
-        version="1.1"
-        id="svg32"
-        sodipodi:docname="icon-email-pill-avatar.svg"
-        inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-    <metadata
-            id="metadata36">
-        <rdf:RDF>
-            <cc:Work
-                    rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-                <dc:title>at-sign</dc:title>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <sodipodi:namedview
-            pagecolor="#ffffff"
-            bordercolor="#666666"
-            borderopacity="1"
-            objecttolerance="10"
-            gridtolerance="10"
-            guidetolerance="10"
-            inkscape:pageopacity="0"
-            inkscape:pageshadow="2"
-            inkscape:window-width="2560"
-            inkscape:window-height="1377"
-            id="namedview34"
-            showgrid="false"
-            fit-margin-top="0"
-            fit-margin-left="0"
-            fit-margin-right="0"
-            fit-margin-bottom="0"
-            inkscape:zoom="13.882353"
-            inkscape:cx="52.627789"
-            inkscape:cy="30.525891"
-            inkscape:window-x="1912"
-            inkscape:window-y="-8"
-            inkscape:window-maximized="1"
-            inkscape:current-layer="svg32"/>
-    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
-    <title
-            id="title2">at-sign
-    </title>
-    <desc
-            id="desc4">Created with Sketch.
-    </desc>
-    <defs
-            id="defs19">
-        <filter
-                x="-0.059"
-                y="-0.079000004"
-                width="1.118"
-                height="1.158"
-                filterUnits="objectBoundingBox"
-                id="filter-1">
-            <feOffset
-                    dx="0"
-                    dy="2"
-                    in="SourceAlpha"
-                    result="shadowOffsetOuter1"
-                    id="feOffset6"/>
-            <feGaussianBlur
-                    stdDeviation="16"
-                    in="shadowOffsetOuter1"
-                    result="shadowBlurOuter1"
-                    id="feGaussianBlur8"/>
-            <feColorMatrix
-                    values="0 0 0 0 0   0 0 0 0 0.473684211   0 0 0 0 1  0 0 0 0.241258741 0"
-                    type="matrix"
-                    in="shadowBlurOuter1"
-                    result="shadowMatrixOuter1"
-                    id="feColorMatrix10"/>
-            <feMerge
-                    id="feMerge16">
-                <feMergeNode
-                        in="shadowMatrixOuter1"
-                        id="feMergeNode12"/>
-                <feMergeNode
-                        in="SourceGraphic"
-                        id="feMergeNode14"/>
-            </feMerge>
-        </filter>
-    </defs>
-    <g
-            style="fill:none;fill-rule:evenodd;stroke:#368bd6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round"
-            transform="matrix(3.4090685,0,0,3.4090685,-17679.973,-4776.9361)"
-            id="FTUE---User-list-suggestions">
-        <g
-                transform="translate(4748,1168)"
-                id="Group-14-Copy-10">
-            <g
-                    style="filter:url(#filter-1)"
-                    id="Web-Copy-6">
-                <g
-                        transform="translate(253,118)"
-                        id="modal-copy">
-                    <g
-                            transform="translate(40,107)"
-                            id="content">
-                        <g
-                                id="Group-43">
-                            <g
-                                    transform="translate(143,6)"
-                                    id="Group-15-Copy-6">
-                                <g
-                                        transform="translate(5.5,6.5)"
-                                        id="at-sign">
-                                    <circle
-                                            r="2.2857144"
-                                            cy="5.7142859"
-                                            cx="6.2857141"
-                                            id="Oval"/>
-                                    <path
-                                            inkscape:connector-curvature="0"
-                                            id="Path"
-                                            d="M 8.5714286,3.4285714 V 6.2857143 C 8.5714286,7.2324881 9.3389404,8 10.285714,8 11.232488,8 12,7.2324881 12,6.2857143 V 5.7142857 C 11.999833,3.0588026 10.170363,0.75337961 7.5843649,0.1498843 4.9983672,-0.45361102 2.337418,0.80388101 1.1618605,3.1849848 -0.01369699,5.5660885 0.60597179,8.4432307 2.6575018,10.129296 4.7090319,11.815361 7.6517136,11.865962 9.76,10.251429"/>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="65.631" height="67.981"><defs><filter x="-.059" y="-.079" width="1.118" height="1.158" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="16" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0.473684211 0 0 0 0 1 0 0 0 0.241258741 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><g filter="url(#a)" transform="matrix(3.40907 0 0 3.40907 -1493.716 -795.144)" fill="none" fill-rule="evenodd" stroke="#368bd6" stroke-linecap="round" stroke-linejoin="round"><g transform="translate(441.5 237.5)"><circle r="2.286" cy="5.714" cx="6.286"/><path d="M8.571 3.429v2.857a1.714 1.714 0 103.429 0v-.572a5.714 5.714 0 10-2.24 4.537"/></g></g></svg>
\ No newline at end of file

From 5019eff1e361148a50106e2dd9afd7179f5c0718 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 9 Jan 2020 20:49:37 +0000
Subject: [PATCH 0285/3235] Don't allow upgrade from untrusted key backup.

If we trust the key backup at upgrade time then we can sign it so
key backup will work automatically when cross-signing is trusted.
If we don't sign it at this point we'll end up with cross-signing
and key backup set up but key backup untrusted by the cross-signing
key which is a bit of a broken situation.

With https://github.com/matrix-org/matrix-js-sdk/pull/1144 fixes
https://github.com/vector-im/riot-web/issues/11747
---
 .../CreateSecretStorageDialog.js              | 50 +++++++++++++++----
 src/i18n/strings/en_EN.json                   |  4 +-
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 25bc8cdfda..60d1f4c1a0 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -24,14 +24,15 @@ import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 
 const PHASE_LOADING = 0;
-const PHASE_MIGRATE = 1;
-const PHASE_PASSPHRASE = 2;
-const PHASE_PASSPHRASE_CONFIRM = 3;
-const PHASE_SHOWKEY = 4;
-const PHASE_KEEPITSAFE = 5;
-const PHASE_STORING = 6;
-const PHASE_DONE = 7;
-const PHASE_OPTOUT_CONFIRM = 8;
+const PHASE_RESTORE_KEY_BACKUP = 1;
+const PHASE_MIGRATE = 2;
+const PHASE_PASSPHRASE = 3;
+const PHASE_PASSPHRASE_CONFIRM = 4;
+const PHASE_SHOWKEY = 5;
+const PHASE_KEEPITSAFE = 6;
+const PHASE_STORING = 7;
+const PHASE_DONE = 8;
+const PHASE_OPTOUT_CONFIRM = 9;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -67,6 +68,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             downloaded: false,
             zxcvbnResult: null,
             setPassPhrase: false,
+            backupInfo: null,
+            backupSigStatus: null,
         };
 
         this._fetchBackupInfo();
@@ -80,10 +83,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     async _fetchBackupInfo() {
         const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+        const backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo);
+
+        const phase = backupInfo ?
+            (backupSigStatus.usable ? PHASE_MIGRATE : PHASE_RESTORE_KEY_BACKUP) :
+            PHASE_PASSPHRASE;
 
         this.setState({
-            phase: backupInfo ? PHASE_MIGRATE: PHASE_PASSPHRASE,
+            phase,
             backupInfo,
+            backupSigStatus,
         });
     }
 
@@ -268,6 +277,22 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
     }
 
+    _renderPhaseRestoreKeyBackup() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>{_t(
+                "Key Backup is enabled on your account but has not been set " +
+                "up from this sign-in. To set up secret storage, " +
+                "restore your key backup.",
+            )}</p>
+            <DialogButtons primaryButton={_t('Cancel')}
+                onPrimaryButtonClick={this._onCancel}
+                hasCancel={false}
+            >
+            </DialogButtons>
+        </div>;
+    }
+
     _renderPhaseMigrate() {
         // TODO: This is a temporary screen so people who have the labs flag turned on and
         // click the button are aware they're making a change to their account.
@@ -277,7 +302,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(
-                "Secret Storage will be set up using your existing key backup details." +
+                "Secret Storage will be set up using your existing key backup details. " +
                 "Your secret storage passphrase and recovery key will be the same as " +
                 " they were for your key backup",
             )}</p>
@@ -527,6 +552,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _titleForPhase(phase) {
         switch (phase) {
+            case PHASE_RESTORE_KEY_BACKUP:
+                return _t('Restore Your Key Backup');
             case PHASE_MIGRATE:
                 return _t('Migrate from Key Backup');
             case PHASE_PASSPHRASE:
@@ -569,6 +596,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_LOADING:
                     content = this._renderBusyPhase();
                     break;
+                case PHASE_RESTORE_KEY_BACKUP:
+                    content = this._renderPhaseRestoreKeyBackup();
+                    break;
                 case PHASE_MIGRATE:
                     content = this._renderPhaseMigrate();
                     break;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b34b737891..3624a7c743 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1933,7 +1933,8 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
+    "Key Backup is enabled on your account but has not been set up from this sign-in. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this sign-in. To set up secret storage, restore your key backup.",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
     "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
@@ -1960,6 +1961,7 @@
     "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
+    "Restore Your Key Backup": "Restore Your Key Backup",
     "Migrate from Key Backup": "Migrate from Key Backup",
     "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
     "Confirm your passphrase": "Confirm your passphrase",

From 4e4871c281655dff5cecf75c8d085e3cd487d2f9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 13:56:14 -0700
Subject: [PATCH 0286/3235] Move lang import to the top of the file

---
 src/languageHandler.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index c31db5eb5b..3a061df915 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -22,6 +22,9 @@ import counterpart from 'counterpart';
 import React from 'react';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 
+// $webapp is a webpack resolve alias pointing to the output directory, see webpack config
+import webpackLangJsonUrl from "$webapp/i18n/languages.json";
+
 const i18nFolder = 'i18n/';
 
 // Control whether to also return original, untranslated strings
@@ -417,9 +420,7 @@ function getLangsJson() {
     return new Promise(async (resolve, reject) => {
         let url;
         try {
-            // $webapp is a webpack resolve alias pointing to the output directory, see webpack config
-            url = import('$webapp/i18n/languages.json');
-            if (url.then) url = (await url).default; // webpack resolves to a Module through a promise.
+            url = webpackLangJsonUrl;
         } catch (e) {
             url = i18nFolder + 'languages.json';
         }

From 8a2efd77ed925d10846d86922854624915b8414c Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 9 Jan 2020 20:18:03 +0000
Subject: [PATCH 0287/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (1998 of 1998 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index e0e667ecce..ac30ab6534 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2032,5 +2032,6 @@
     "Recent Conversations": "Azken elkarrizketak",
     "Direct Messages": "Mezu zuzenak",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eska egiezu bere erabiltzaile-izena, edo eman egiezu zurea (%(userId)s) edo <a>profilera esteka</a>.",
-    "Go": "Joan"
+    "Go": "Joan",
+    "Suggestions": "Proposamenak"
 }

From 5b1246324efb25a22f23f094b6d149b13a31b842 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Thu, 9 Jan 2020 19:58:09 +0000
Subject: [PATCH 0288/3235] Translated using Weblate (Turkish)

Currently translated at 58.2% (1162 of 1998 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 495b882104..8e9c2c35bf 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1125,5 +1125,54 @@
     "Upgrade the room": "Odayı güncelle",
     "Enable room encryption": "Oda şifrelemeyi aç",
     "Modify widgets": "Görsel bileşenleri düzenle",
-    "Banned by %(displayName)s": "%(displayName)s tarafından yasaklandı"
+    "Banned by %(displayName)s": "%(displayName)s tarafından yasaklandı",
+    "Default role": "Varsayılan rol",
+    "Send messages": "Mesajları gönder",
+    "Invite users": "Kullanıcıları davet et",
+    "Change settings": "Ayarları değiştir",
+    "Kick users": "Kullanıcıları at",
+    "Ban users": "Kullanıcıları yasakla",
+    "Remove messages": "Mesajları sil",
+    "Notify everyone": "Herkesi bilgilendir",
+    "Muted Users": "Sessizdeki Kullanıcılar",
+    "Roles & Permissions": "Roller & İzinler",
+    "Enable encryption?": "Şifrelemeyi aç?",
+    "Members only (since they were invited)": "Sadece üyeler (davet edildiklerinden beri)",
+    "Members only (since they joined)": "Sadece üyeler (katıldıklarından beri)",
+    "Encryption": "Şifreleme",
+    "Once enabled, encryption cannot be disabled.": "Açıldıktan donra şifreleme kapatılamaz.",
+    "Encrypted": "Şifrelenmiş",
+    "Unable to share email address": "E-posta adresi paylaşılamıyor",
+    "Your email address hasn't been verified yet": "E-posta adresiniz henüz doğrulanmadı",
+    "Verify the link in your inbox": "Gelen kutunuzdaki linki doğrulayın",
+    "Share": "Paylaş",
+    "Unable to share phone number": "Telefon numarası paylaşılamıyor",
+    "Unable to verify phone number.": "Telefon numarası doğrulanamıyor.",
+    "Please enter verification code sent via text.": "Lütfen mesajla gönderilen doğrulama kodunu girin.",
+    "Verification code": "Doğrulama kodu",
+    "Remove %(email)s?": "%(email)s sil?",
+    "Email Address": "E-posta Adresi",
+    "Remove %(phone)s?": "%(phone)s sil?",
+    "Phone Number": "Telefon Numarası",
+    "Cannot add any more widgets": "Daha fazla görsel bileşen eklenemiyor",
+    "The maximum permitted number of widgets have already been added to this room.": "İzin verilen maksimum sayıda görsel bileşen bu odaya zaten eklenmiş.",
+    "Add a widget": "Bir görsel bileşen ekle",
+    "Some devices for this user are not trusted": "Bu kullanıcının bazı cihazları güvenilir değil",
+    "All devices for this user are trusted": "Bu kullanıcının tüm cihazları güvenilir",
+    "Some devices in this encrypted room are not trusted": "Bu şifrelenmiş odada bazı cihazlar şifrelenmemiş",
+    "All devices in this encrypted room are trusted": "Bu şifrelenmiş odadaki tüm cihazlar güvenilir",
+    "Edit message": "Mesajı düzenle",
+    "%(senderName)s sent an image": "%(senderName)s bir resim gönderdi",
+    "%(senderName)s sent a video": "%(senderName)s bir video gönderdi",
+    "%(senderName)s uploaded a file": "%(senderName)s bir dosya yükledi",
+    "Key request sent.": "Anahtar isteği gönderildi.",
+    "This message cannot be decrypted": "Bu mesajın şifresi çözülemedi",
+    "Unencrypted": "Şifrelenmemiş",
+    "Close preview": "Önizlemeyi kapat",
+    "Disinvite this user?": "Bu kullanıcı davetini geri çek?",
+    "Kick this user?": "Bu kullanıcıyı kov?",
+    "Unban this user?": "Bu kullanıcının yasağını kaldır?",
+    "Ban this user?": "Bu kullanıcıyı yasakla?",
+    "Remove %(count)s messages|other": "%(count)s mesajı sil",
+    "Remove %(count)s messages|one": "1 mesajı sil"
 }

From a0da13200f4931b0620fcd9c6dc826dcab8787cd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:52:46 -0700
Subject: [PATCH 0289/3235] Fix conflicts in package.json

We removed the emojistrip script
---
 package.json | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/package.json b/package.json
index 7c5fbe656f..b876106891 100644
--- a/package.json
+++ b/package.json
@@ -34,22 +34,9 @@
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-<<<<<<< HEAD
-    "emoji-data-strip": "node scripts/emoji-data-strip.js",
     "reskindex": "node scripts/reskindex.js -h header",
     "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "rethemendex": "res/css/rethemendex.sh",
-=======
-    "build": "yarn reskindex && yarn start:init",
-    "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
-    "start": "yarn start:init && yarn start:all",
-    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn build:watch\" \"yarn reskindex:watch\"",
-    "start:init": "babel src -d lib --source-maps --copy-files",
-    "lint": "eslint src/",
-    "lintall": "eslint src/ test/",
-    "lintwithexclusions": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
-    "stylelint": "stylelint 'res/css/**/*.scss'",
->>>>>>> develop
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
     "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",

From 3e5cc9550b4e4dcd052a189d33835c548535c1e6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 14:15:38 -0700
Subject: [PATCH 0290/3235] Fix import merge conflicts, removing any that
 aren't needed anymore

Many imports were removed as part of refactoring work, so here we are.
---
 .../views/dialogs/EncryptedEventDialog.js        | 16 +++-------------
 .../dialogs/keybackup/CreateKeyBackupDialog.js   |  6 ------
 src/components/structures/EmbeddedPage.js        |  5 -----
 src/components/structures/LeftPanel.js           |  5 -----
 src/components/structures/MyGroups.js            |  6 ------
 src/components/structures/RoomDirectory.js       |  4 ----
 src/components/structures/RoomView.js            |  3 ---
 src/components/structures/TimelinePanel.js       | 11 +----------
 src/components/views/avatars/BaseAvatar.js       |  5 -----
 src/components/views/dialogs/DevtoolsDialog.js   |  8 --------
 .../views/dialogs/RoomSettingsDialog.js          |  7 +------
 .../dialogs/keybackup/RestoreKeyBackupDialog.js  |  6 ------
 src/components/views/elements/ImageView.js       |  3 ---
 src/components/views/elements/TagTile.js         |  5 -----
 src/components/views/groups/GroupInviteTile.js   |  5 -----
 src/components/views/groups/GroupMemberTile.js   |  5 -----
 src/components/views/groups/GroupRoomTile.js     |  5 -----
 src/components/views/groups/GroupUserSettings.js |  5 -----
 .../views/room_settings/AliasSettings.js         | 10 ----------
 .../views/room_settings/RelatedGroupSettings.js  |  7 +------
 src/components/views/rooms/EventTile.js          | 13 -------------
 src/components/views/rooms/LinkPreviewWidget.js  |  3 ---
 src/components/views/rooms/MemberInfo.js         |  5 -----
 src/components/views/settings/KeyBackupPanel.js  |  5 -----
 .../settings/tabs/room/GeneralRoomSettingsTab.js |  5 -----
 .../settings/tabs/user/FlairUserSettingsTab.js   |  6 ------
 26 files changed, 6 insertions(+), 158 deletions(-)

diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 28dd802082..f6e17b1c84 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -14,28 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-<<<<<<< HEAD
 import React from "react";
-=======
-import {Key} from "../../../Keyboard";
-
-const React = require("react");
->>>>>>> develop
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {Key} from "../../../Keyboard";
+import * as sdk from "../../../index";
 
-const sdk = require('../../../index');
-
-<<<<<<< HEAD
-export default createReactClass({
-=======
 // XXX: This component is not cross-signing aware.
 // https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
 // component or taking it out to pasture.
-module.exports = createReactClass({
->>>>>>> develop
+export default createReactClass({
     displayName: 'EncryptedEventDialog',
 
     propTypes: {
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index af07ce3fb7..8940239cfd 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -17,15 +17,9 @@ limitations under the License.
 
 import React from 'react';
 import FileSaver from 'file-saver';
-<<<<<<< HEAD
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-=======
 import PropTypes from 'prop-types';
-
-import sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
->>>>>>> develop
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index 276baccef1..6d734c3838 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -25,12 +25,7 @@ import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
-<<<<<<< HEAD
 import {MatrixClientPeg} from '../../MatrixClientPeg';
-import { MatrixClient } from 'matrix-js-sdk';
-=======
-import MatrixClientPeg from '../../MatrixClientPeg';
->>>>>>> develop
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index ec52afba19..8a7d10e5b5 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -22,12 +22,7 @@ import classNames from 'classnames';
 import { Key } from '../../Keyboard';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
-<<<<<<< HEAD
 import * as VectorConferenceHandler from '../../VectorConferenceHandler';
-import TagPanelButtons from './TagPanelButtons';
-=======
-import VectorConferenceHandler from '../../VectorConferenceHandler';
->>>>>>> develop
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 7d7b19d979..b26ab5ff70 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -17,13 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../index';
-=======
-import sdk from '../../index';
->>>>>>> develop
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 87b9d076e2..42dbc1b4e4 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -27,11 +27,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
-<<<<<<< HEAD
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
-=======
-import MatrixClientContext from "../../contexts/MatrixClientContext";
->>>>>>> develop
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 160;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 83ef6441f6..3c311d2b83 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -53,11 +53,8 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import WidgetUtils from '../../utils/WidgetUtils';
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
-<<<<<<< HEAD
 import {haveTileForEvent} from "../views/rooms/EventTile";
-=======
 import RoomContext from "../../contexts/RoomContext";
->>>>>>> develop
 
 const DEBUG = false;
 let debuglog = function() {};
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index ceb4113d86..1d50a51579 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -25,22 +25,13 @@ import PropTypes from 'prop-types';
 import {EventTimeline} from "matrix-js-sdk";
 import * as Matrix from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as ObjectUtils from "../../ObjectUtils";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
 import dis from "../../dispatcher";
 import * as sdk from "../../index";
-import { KeyCode } from '../../Keyboard';
-=======
-const MatrixClientPeg = require("../../MatrixClientPeg");
-const dis = require("../../dispatcher");
-const ObjectUtils = require('../../ObjectUtils');
-const Modal = require("../../Modal");
-const UserActivity = require("../../UserActivity");
-import {Key} from '../../Keyboard';
->>>>>>> develop
+import { Key } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
 import EditorStateTransfer from '../../utils/EditorStateTransfer';
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 2b49916bbe..4c34cee853 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -20,12 +20,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as AvatarLogic from '../../../Avatar';
-=======
-import AvatarLogic from '../../../Avatar';
->>>>>>> develop
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 1db6e9b284..34b2f5a52b 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -16,18 +16,10 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-<<<<<<< HEAD
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-=======
 import { Room } from "matrix-js-sdk";
-
-import sdk from '../../../index';
-import SyntaxHighlight from '../elements/SyntaxHighlight';
-import { _t } from '../../../languageHandler';
->>>>>>> develop
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 0adcfb441f..a99141870b 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -24,14 +24,9 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
-<<<<<<< HEAD
+import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-=======
-import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
-import sdk from "../../../index";
-import MatrixClientPeg from "../../../MatrixClientPeg";
->>>>>>> develop
 import dis from "../../../dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 7a0e48263e..77fdee5e8a 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -16,15 +16,9 @@ limitations under the License.
 */
 
 import React from 'react';
-<<<<<<< HEAD
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-=======
 import { MatrixClient } from 'matrix-js-sdk';
-
-import sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
->>>>>>> develop
 import Modal from '../../../../Modal';
 import { _t } from '../../../../languageHandler';
 import {Key} from "../../../../Keyboard";
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index 449eaad7a7..7cc2741df7 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -22,14 +22,11 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {formatDate} from '../../../DateUtils';
 import { _t } from '../../../languageHandler';
-<<<<<<< HEAD
 import filesize from "filesize";
 import AccessibleButton from "./AccessibleButton";
 import Modal from "../../../Modal";
 import * as sdk from "../../../index";
-=======
 import {Key} from "../../../Keyboard";
->>>>>>> develop
 
 export default class ImageView extends React.Component {
     static propTypes = {
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index d4a9d836aa..2f182c261e 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -20,12 +20,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 64aadf406d..808cf17d55 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -19,12 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 2049e7d6bf..68513cf0db 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -19,12 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 6a9c189e09..94d143b263 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -17,12 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import {MatrixClient} from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 3fa05cad0a..a65d23bed7 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -16,12 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
 import * as sdk from '../../../index';
-import { MatrixClient } from 'matrix-js-sdk';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import { _t } from '../../../languageHandler';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 07ee91580e..b5febb689e 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -15,25 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-<<<<<<< HEAD
-import React from "react";
-=======
 import EditableItemList from "../elements/EditableItemList";
-
 import React, {createRef} from 'react';
->>>>>>> develop
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
-<<<<<<< HEAD
-import Modal from "../../../Modal";
-=======
 import AccessibleButton from "../elements/AccessibleButton";
-const Modal = require("../../../Modal");
->>>>>>> develop
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index a11821d99c..af3f58f9db 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -16,13 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-<<<<<<< HEAD
-import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
-import * as sdk from '../../../index';
-=======
 import {MatrixEvent} from 'matrix-js-sdk';
-import sdk from '../../../index';
->>>>>>> develop
+import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index cc00810188..dce4dc8a93 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -23,30 +23,17 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from "classnames";
 import { _t, _td } from '../../../languageHandler';
-<<<<<<< HEAD
 import * as TextForEvent from "../../../TextForEvent";
-import Modal from "../../../Modal";
 import * as sdk from "../../../index";
-=======
-
-const sdk = require('../../../index');
-const TextForEvent = require('../../../TextForEvent');
-
->>>>>>> develop
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
-<<<<<<< HEAD
 import * as ObjectUtils from "../../../ObjectUtils";
-=======
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
-const ObjectUtils = require('../../../ObjectUtils');
->>>>>>> develop
-
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
     'm.sticker': 'messages.MessageEvent',
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 3c9118aacb..c6374db464 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -21,14 +21,11 @@ import createReactClass from 'create-react-class';
 import { AllHtmlEntities } from 'html-entities';
 import {linkifyElement} from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
-=======
 import { _t } from "../../../languageHandler";
->>>>>>> develop
 
 export default createReactClass({
     displayName: 'LinkPreviewWidget',
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index e179790d39..55855bbc9a 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -46,13 +46,8 @@ import MultiInviter from "../../../utils/MultiInviter";
 import SettingsStore from "../../../settings/SettingsStore";
 import E2EIcon from "./E2EIcon";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {EventTimeline} from "matrix-js-sdk";
-=======
-import MatrixClientPeg from "../../../MatrixClientPeg";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
->>>>>>> develop
 
 export default createReactClass({
     displayName: 'MemberInfo',
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 54fc679b3b..07cb02bd8e 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,12 +21,7 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-<<<<<<< HEAD
-import SettingsStore from '../../../../src/settings/SettingsStore';
-import { accessSecretStorage } from '../../../CrossSigningManager';
-=======
 import SettingsStore from '../../../settings/SettingsStore';
->>>>>>> develop
 
 export default class KeyBackupPanel extends React.PureComponent {
     constructor(props) {
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index f56e81f015..b65f8d49a4 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -18,12 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
-=======
-import sdk from "../../../../..";
->>>>>>> develop
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
index fbcecd1313..26e0033233 100644
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
@@ -17,12 +17,6 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
-=======
->>>>>>> develop
 
 export default class FlairUserSettingsTab extends React.Component {
     render() {

From 727ce892de8c23e1dd0ad8239b9bd72291069787 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:54:51 -0700
Subject: [PATCH 0291/3235] Fix remaining RoomView conflict

RoomContext was pulled out to its own file.
---
 src/components/structures/RoomView.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3c311d2b83..a24df775e2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -66,17 +66,7 @@ if (DEBUG) {
     debuglog = console.log.bind(console);
 }
 
-<<<<<<< HEAD
-export const RoomContext = PropTypes.shape({
-    canReact: PropTypes.bool.isRequired,
-    canReply: PropTypes.bool.isRequired,
-    room: PropTypes.instanceOf(Room),
-});
-
 export default createReactClass({
-=======
-module.exports = createReactClass({
->>>>>>> develop
     displayName: 'RoomView',
     propTypes: {
         ConferenceHandler: PropTypes.any,

From 19f78d4d972979268208b43d06cfaa27bae81cb8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:55:02 -0700
Subject: [PATCH 0292/3235] Fix class construction in MemberList

---
 src/components/views/rooms/MemberList.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 86199d7535..edd2f52496 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -32,15 +32,11 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
 const SHOW_MORE_INCREMENT = 100;
 
-<<<<<<< HEAD
-export default createReactClass({
-=======
 // Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little
 // matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
 const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
 
-module.exports = createReactClass({
->>>>>>> develop
+export default createReactClass({
     displayName: 'MemberList',
 
     getInitialState: function() {

From a6376461d03c77aa08bf4203d72e0f8e9fd90ec4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:55:29 -0700
Subject: [PATCH 0293/3235] Use yarn's updated lockfile

Didn't manually handle this conflict, just let yarn do its thing.
---
 yarn.lock | 94 ++++++-------------------------------------------------
 1 file changed, 10 insertions(+), 84 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4942802b37..0602190974 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -281,7 +281,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
   integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
 
-<<<<<<< HEAD
 "@babel/parser@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
@@ -859,14 +858,13 @@
     make-dir "^2.1.0"
     pirates "^4.0.0"
     source-map-support "^0.5.16"
-=======
-"@babel/runtime@^7.0.0":
+
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.7.6":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
   integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
   dependencies:
     regenerator-runtime "^0.13.2"
->>>>>>> develop
 
 "@babel/runtime@^7.1.2":
   version "7.7.4"
@@ -875,13 +873,6 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
-  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -2075,9 +2066,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-<<<<<<< HEAD
-chokidar@^2.0.2, chokidar@^2.1.2, chokidar@^2.1.8:
-=======
 cheerio@^1.0.0-rc.3:
   version "1.0.0-rc.3"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
@@ -2090,24 +2078,7 @@ cheerio@^1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chokidar@^2.0.2, chokidar@^2.1.2:
->>>>>>> develop
+chokidar@^2.0.2, chokidar@^2.1.2, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2270,11 +2241,7 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-<<<<<<< HEAD
-commander@^2.12.1, commander@^2.20.0:
-=======
-commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
->>>>>>> develop
+commander@^2.12.1, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4681,21 +4648,11 @@ is-number-object@^1.0.3:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
   integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
 
-<<<<<<< HEAD
-=======
 is-number-object@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
   integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
->>>>>>> develop
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6077,8 +6034,6 @@ object.fromentries@^2.0.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-<<<<<<< HEAD
-=======
 object.fromentries@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
@@ -6089,15 +6044,6 @@ object.fromentries@^2.0.2:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
->>>>>>> develop
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -6780,8 +6726,6 @@ raf@^3.1.0, raf@^3.4.1:
   dependencies:
     performance-now "^2.1.0"
 
-<<<<<<< HEAD
-=======
 railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
@@ -6795,16 +6739,6 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
->>>>>>> develop
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -7052,7 +6986,11 @@ redux@^3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
-<<<<<<< HEAD
+reflect.ownkeys@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
+  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
+
 regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
@@ -7061,14 +6999,6 @@ regenerate-unicode-properties@^8.1.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-=======
-reflect.ownkeys@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
-  integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
-
-regenerate@^1.2.1:
->>>>>>> develop
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
@@ -8310,11 +8240,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-<<<<<<< HEAD
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
-=======
-tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
->>>>>>> develop
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

From dc914774fb743f1093368211e18280b246757e00 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 16:11:00 -0700
Subject: [PATCH 0294/3235] Delete files that were conflicting in the merge and
 deleted on develop

---
 .../views/rooms/MessageComposerInput.js       | 1516 -----------------
 .../views/rooms/SlateMessageComposer.js       |  485 ------
 src/stores/MessageComposerStore.js            |   67 -
 .../views/rooms/MessageComposerInput-test.js  |  303 ----
 4 files changed, 2371 deletions(-)
 delete mode 100644 src/components/views/rooms/MessageComposerInput.js
 delete mode 100644 src/components/views/rooms/SlateMessageComposer.js
 delete mode 100644 src/stores/MessageComposerStore.js
 delete mode 100644 test/components/views/rooms/MessageComposerInput-test.js

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
deleted file mode 100644
index 5767309cc0..0000000000
--- a/src/components/views/rooms/MessageComposerInput.js
+++ /dev/null
@@ -1,1516 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 { Editor } from 'slate-react';
-import { getEventTransfer } from 'slate-react';
-import { Value, Block, Inline, Range } from 'slate';
-import type { Change } from 'slate';
-
-import Html from 'slate-html-serializer';
-import Md from 'slate-md-serializer';
-import Plain from 'slate-plain-serializer';
-import PlainWithPillsSerializer from "../../../autocomplete/PlainWithPillsSerializer";
-
-import classNames from 'classnames';
-
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import type {MatrixClient} from 'matrix-js-sdk/src/matrix';
-import {processCommandInput} from '../../../SlashCommands';
-import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import Analytics from '../../../Analytics';
-
-import dis from '../../../dispatcher';
-
-import * as HtmlUtils from '../../../HtmlUtils';
-import Autocomplete from './Autocomplete';
-import {Completion} from "../../../autocomplete/Autocompleter";
-import Markdown from '../../../Markdown';
-import MessageComposerStore from '../../../stores/MessageComposerStore';
-import ContentMessages from '../../../ContentMessages';
-
-import EMOJIBASE from 'emojibase-data/en/compact.json';
-import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import {getPrimaryPermalinkEntity, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
-import ReplyPreview from "./ReplyPreview";
-import RoomViewStore from '../../../stores/RoomViewStore';
-import ReplyThread from "../elements/ReplyThread";
-import {ContentHelpers} from 'matrix-js-sdk';
-import AccessibleButton from '../elements/AccessibleButton';
-import {findEditableEvent} from '../../../utils/EventUtils';
-import SlateComposerHistoryManager from "../../../SlateComposerHistoryManager";
-import TypingStore from "../../../stores/TypingStore";
-
-const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
-
-// the Slate node type to default to for unstyled text
-const DEFAULT_NODE = 'paragraph';
-
-// map HTML elements through to our Slate schema node types
-// used for the HTML deserializer.
-// (The names here are chosen to match the MD serializer's schema for convenience)
-const BLOCK_TAGS = {
-    p: 'paragraph',
-    blockquote: 'block-quote',
-    ul: 'bulleted-list',
-    h1: 'heading1',
-    h2: 'heading2',
-    h3: 'heading3',
-    h4: 'heading4',
-    h5: 'heading5',
-    h6: 'heading6',
-    li: 'list-item',
-    ol: 'numbered-list',
-    pre: 'code',
-};
-
-const MARK_TAGS = {
-    strong: 'bold',
-    b: 'bold', // deprecated
-    em: 'italic',
-    i: 'italic', // deprecated
-    code: 'code',
-    u: 'underlined',
-    del: 'deleted',
-    strike: 'deleted', // deprecated
-    s: 'deleted', // deprecated
-};
-
-const SLATE_SCHEMA = {
-    inlines: {
-        pill: {
-            isVoid: true,
-        },
-        emoji: {
-            isVoid: true,
-        },
-    },
-};
-
-function onSendMessageFailed(err, room) {
-    // XXX: temporary logging to try to diagnose
-    // https://github.com/vector-im/riot-web/issues/3148
-    console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
-    dis.dispatch({
-        action: 'message_send_failed',
-    });
-}
-
-function rangeEquals(a: Range, b: Range): boolean {
-    return (a.anchor.key === b.anchor.key
-        && a.anchor.offset === b.anchorOffset
-        && a.focus.key === b.focusKey
-        && a.focus.offset === b.focusOffset
-        && a.isFocused === b.isFocused
-        && a.isBackward === b.isBackward);
-}
-
-/*
- * The textInput part of the MessageComposer
- */
-export default class MessageComposerInput extends React.Component {
-    static propTypes = {
-        // js-sdk Room object
-        room: PropTypes.object.isRequired,
-
-        onInputStateChanged: PropTypes.func,
-    };
-
-    client: MatrixClient;
-    autocomplete: Autocomplete;
-    historyManager: SlateComposerHistoryManager;
-
-    constructor(props, context) {
-        super(props, context);
-
-        const isRichTextEnabled = SettingsStore.getValue('MessageComposerInput.isRichTextEnabled');
-
-        Analytics.setRichtextMode(isRichTextEnabled);
-
-        this.client = MatrixClientPeg.get();
-
-        // track whether we should be trying to show autocomplete suggestions on the current editor
-        // contents. currently it's only suppressed when navigating history to avoid ugly flashes
-        // of unexpected corrections as you navigate.
-        // XXX: should this be in state?
-        this.suppressAutoComplete = false;
-
-        // track whether we've just pressed an arrowkey left or right in order to skip void nodes.
-        // 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.plainWithPlainPills = new PlainWithPillsSerializer({ pillFormat: 'plain' });
-
-        this.md = new Md({
-            rules: [
-                {
-                    // if serialize returns undefined it falls through to the default hardcoded
-                    // serialization rules
-                    serialize: (obj, children) => {
-                        if (obj.object !== 'inline') return;
-                        switch (obj.type) {
-                            case 'pill':
-                                return `[${ obj.data.get('completion') }](${ obj.data.get('href') })`;
-                            case 'emoji':
-                                return obj.data.get('emojiUnicode');
-                        }
-                    },
-                }, {
-                    serialize: (obj, children) => {
-                        if (obj.object !== 'mark') return;
-                        // XXX: slate-md-serializer consumes marks other than bold, italic, code, inserted, deleted
-                        switch (obj.type) {
-                            case 'underlined':
-                                return `<u>${ children }</u>`;
-                            case 'deleted':
-                                return `<del>${ children }</del>`;
-                            case 'code':
-                                // XXX: we only ever get given `code` regardless of whether it was inline or block
-                                // XXX: workaround for https://github.com/tommoor/slate-md-serializer/issues/14
-                                // strip single backslashes from children, as they would have been escaped here
-                                return `\`${ children.split('\\').map((v) => v ? v : '\\').join('') }\``;
-                        }
-                    },
-                },
-            ],
-        });
-
-        this.html = new Html({
-            rules: [
-                {
-                    deserialize: (el, next) => {
-                        const tag = el.tagName.toLowerCase();
-                        let type = BLOCK_TAGS[tag];
-                        if (type) {
-                            return {
-                                object: 'block',
-                                type: type,
-                                nodes: next(el.childNodes),
-                            };
-                        }
-                        type = MARK_TAGS[tag];
-                        if (type) {
-                            return {
-                                object: 'mark',
-                                type: type,
-                                nodes: next(el.childNodes),
-                            };
-                        }
-                        // special case links
-                        if (tag === 'a') {
-                            const href = el.getAttribute('href');
-                            const permalinkEntity = getPrimaryPermalinkEntity(href);
-                            if (permalinkEntity) {
-                                return {
-                                    object: 'inline',
-                                    type: 'pill',
-                                    data: {
-                                        href,
-                                        completion: el.innerText,
-                                        completionId: permalinkEntity,
-                                    },
-                                };
-                            } else {
-                                return {
-                                    object: 'inline',
-                                    type: 'link',
-                                    data: { href },
-                                    nodes: next(el.childNodes),
-                                };
-                            }
-                        }
-                    },
-                    serialize: (obj, children) => {
-                        if (obj.object === 'block') {
-                            return this.renderNode({
-                                node: obj,
-                                children: children,
-                            });
-                        } else if (obj.object === 'mark') {
-                            return this.renderMark({
-                                mark: obj,
-                                children: children,
-                            });
-                        } else if (obj.object === 'inline') {
-                            // special case links, pills and emoji otherwise we
-                            // end up with React components getting rendered out(!)
-                            switch (obj.type) {
-                                case 'pill':
-                                    return <a href={ obj.data.get('href') }>{ obj.data.get('completion') }</a>;
-                                case 'link':
-                                    return <a href={ obj.data.get('href') }>{ children }</a>;
-                                case 'emoji':
-                                    // XXX: apparently you can't return plain strings from serializer rules
-                                    // until https://github.com/ianstormtaylor/slate/pull/1854 is merged.
-                                    // So instead we temporarily wrap emoji from RTE in a span.
-                                    return <span>{ obj.data.get('emojiUnicode') }</span>;
-                            }
-                            return this.renderNode({
-                                node: obj,
-                                children: children,
-                            });
-                        }
-                    },
-                },
-            ],
-        });
-
-        const savedState = MessageComposerStore.getEditorState(this.props.room.roomId);
-        this.state = {
-            // whether we're in rich text or markdown mode
-            isRichTextEnabled,
-
-            // the currently displayed editor state (note: this is always what is modified on input)
-            editorState: this.createEditorState(
-                isRichTextEnabled,
-                savedState ? savedState.editor_state : undefined,
-                savedState ? savedState.rich_text : undefined,
-            ),
-
-            // the original editor state, before we started tabbing through completions
-            originalEditorState: null,
-
-            // the virtual state "above" the history stack, the message currently being composed that
-            // we want to persist whilst browsing history
-            currentlyComposedEditorState: null,
-
-            // whether there were any completions
-            someCompletions: null,
-        };
-    }
-
-    /*
-     * "Does the right thing" to create an Editor value, based on:
-     * - whether we've got rich text mode enabled
-     * - contentState was passed in
-     * - whether the contentState that was passed in was rich text
-     */
-    createEditorState(wantRichText: boolean, editorState: ?Value, wasRichText: ?boolean): Value {
-        if (editorState instanceof Value) {
-            if (wantRichText && !wasRichText) {
-                return this.mdToRichEditorState(editorState);
-            }
-            if (wasRichText && !wantRichText) {
-                return this.richToMdEditorState(editorState);
-            }
-            return editorState;
-        } else {
-            // ...or create a new one. and explicitly focus it otherwise tab in-out issues
-            const base = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-            return base.change().focus().value;
-        }
-    }
-
-    componentWillMount() {
-        this.dispatcherRef = dis.register(this.onAction);
-        this.historyManager = new SlateComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
-    }
-
-    _collectEditor = (e) => {
-        this._editor = e;
-    }
-
-    onAction = (payload) => {
-        const editorState = this.state.editorState;
-
-        switch (payload.action) {
-            case 'reply_to_event':
-            case 'focus_composer':
-                this.focusComposer();
-                break;
-            case 'insert_mention':
-                {
-                    // Pretend that we've autocompleted this user because keeping two code
-                    // paths for inserting a user pill is not fun
-                    const selection = this.getSelectionRange(this.state.editorState);
-                    const member = this.props.room.getMember(payload.user_id);
-                    const completion = member ?
-                        member.rawDisplayName : payload.user_id;
-                    this.setDisplayedCompletion({
-                        completion,
-                        completionId: payload.user_id,
-                        selection,
-                        href: makeUserPermalink(payload.user_id),
-                        suffix: (selection.beginning && selection.start === 0) ? ': ' : ' ',
-                    });
-                }
-                break;
-            case 'quote': {
-                const html = HtmlUtils.bodyToHtml(payload.event.getContent(), null, {
-                    forComposerQuote: true,
-                    returnString: true,
-                });
-                const fragment = this.html.deserialize(html);
-                // FIXME: do we want to put in a permalink to the original quote here?
-                // If so, what should be the format, and how do we differentiate it from replies?
-
-                const quote = Block.create('block-quote');
-                if (this.state.isRichTextEnabled) {
-                    let change = editorState.change();
-                    const anchorText = editorState.anchorText;
-                    if ((!anchorText || anchorText.text === '') && editorState.anchorBlock.nodes.size === 1) {
-                        // replace the current block rather than split the block
-                        // XXX: this destroys our focus by deleting the thing we are anchored/focused on
-                        change = change.replaceNodeByKey(editorState.anchorBlock.key, quote);
-                    } else {
-                        // insert it into the middle of the block (splitting it)
-                        change = change.insertBlock(quote);
-                    }
-
-                    // XXX: heuristic to strip out wrapping <p> which breaks quoting in RT mode
-                    if (fragment.document.nodes.size && fragment.document.nodes.get(0).type === DEFAULT_NODE) {
-                        change = change.insertFragmentByKey(quote.key, 0, fragment.document.nodes.get(0));
-                    } else {
-                        change = change.insertFragmentByKey(quote.key, 0, fragment.document);
-                    }
-
-                    // XXX: this is to bring back the focus in a sane place and add a paragraph after it
-                    change = change.select(Range.create({
-                        anchor: {
-                            key: quote.key,
-                        },
-                        focus: {
-                            key: quote.key,
-                        },
-                    })).moveToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
-
-                    this.onChange(change);
-                } else {
-                    const fragmentChange = fragment.change();
-                    fragmentChange.moveToRangeOfNode(fragment.document)
-                                  .wrapBlock(quote);
-
-                    // FIXME: handle pills and use commonmark rather than md-serialize
-                    const md = this.md.serialize(fragmentChange.value);
-                    const change = editorState.change()
-                                            .insertText(md + '\n\n')
-                                            .focus();
-                    this.onChange(change);
-                }
-            }
-                break;
-        }
-    };
-
-    onChange = (change: Change, originalEditorState?: Value) => {
-        let editorState = change.value;
-
-        if (this.direction !== '') {
-            const focusedNode = editorState.focusInline || editorState.focusText;
-            if (editorState.schema.isVoid(focusedNode)) {
-                // XXX: does this work in RTL?
-                const edge = this.direction === 'Previous' ? 'End' : 'Start';
-                if (editorState.selection.isCollapsed) {
-                    change = change[`moveTo${ edge }Of${ this.direction }Text`]();
-                } else {
-                    const block = this.direction === 'Previous' ? editorState.previousText : editorState.nextText;
-                    if (block) {
-                        change = change[`moveFocusTo${ edge }OfNode`](block);
-                    }
-                }
-                editorState = change.value;
-            }
-        }
-
-        // when in autocomplete mode and selection changes hide the autocomplete.
-        // Selection changes when we enter text so use a heuristic to compare documents without doing it recursively
-        if (this.autocomplete.state.completionList.length > 0 && !this.autocomplete.state.hide &&
-            !rangeEquals(this.state.editorState.selection, editorState.selection) &&
-            // XXX: the heuristic failed when inlines like pills weren't taken into account. This is inideal
-            this.state.editorState.document.toJSON() === editorState.document.toJSON()) {
-            this.autocomplete.hide();
-        }
-
-        if (Plain.serialize(editorState) !== '') {
-            TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, true);
-        } else {
-            TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, false);
-        }
-
-        if (editorState.startText !== null) {
-            const text = editorState.startText.text;
-            const currentStartOffset = editorState.selection.start.offset;
-
-            // Automatic replacement of plaintext emoji to Unicode emoji
-            if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) {
-                // The first matched group includes just the matched plaintext emoji
-                const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(text.slice(0, currentStartOffset));
-                if (emoticonMatch) {
-                    const query = emoticonMatch[1].toLowerCase().replace("-", "");
-                    const data = EMOJIBASE.find(e => e.emoticon ? e.emoticon.toLowerCase() === query : false);
-
-                    // only perform replacement if we found a match, otherwise we would be not letting user type
-                    if (data) {
-                        const range = Range.create({
-                            anchor: {
-                                key: editorState.startText.key,
-                                offset: currentStartOffset - emoticonMatch[1].length - 1,
-                            },
-                            focus: {
-                                key: editorState.startText.key,
-                                offset: currentStartOffset - 1,
-                            },
-                        });
-                        change = change.insertTextAtRange(range, data.unicode);
-                        editorState = change.value;
-                    }
-                }
-            }
-        }
-
-        if (this.props.onInputStateChanged && editorState.blocks.size > 0) {
-            let blockType = editorState.blocks.first().type;
-            // console.log("onInputStateChanged; current block type is " + blockType + " and marks are " + editorState.activeMarks);
-
-            if (blockType === 'list-item') {
-                const parent = editorState.document.getParent(editorState.blocks.first().key);
-                if (parent.type === 'numbered-list') {
-                    blockType = 'numbered-list';
-                } else if (parent.type === 'bulleted-list') {
-                    blockType = 'bulleted-list';
-                }
-            }
-            const inputState = {
-                marks: editorState.activeMarks,
-                blockType,
-            };
-            this.props.onInputStateChanged(inputState);
-        }
-
-        // Record the editor state for this room so that it can be retrieved after switching to another room and back
-        MessageComposerStore.setEditorState(this.props.room.roomId, editorState, this.state.isRichTextEnabled);
-
-        this.setState({
-            editorState,
-            originalEditorState: originalEditorState || null,
-        });
-    };
-
-    mdToRichEditorState(editorState: Value): Value {
-        // for consistency when roundtripping, we could use slate-md-serializer rather than
-        // commonmark, but then we would lose pills as the MD deserialiser doesn't know about
-        // them and doesn't have any extensibility hooks.
-        //
-        // The code looks like this:
-        //
-        // const markdown = this.plainWithMdPills.serialize(editorState);
-        //
-        // // weirdly, the Md serializer can't deserialize '' to a valid Value...
-        // if (markdown !== '') {
-        //     editorState = this.md.deserialize(markdown);
-        // }
-        // else {
-        //     editorState = Plain.deserialize('', { defaultBlock: DEFAULT_NODE });
-        // }
-
-        // so, instead, we use commonmark proper (which is arguably more logical to the user
-        // anyway, as they'll expect the RTE view to match what they'll see in the timeline,
-        // but the HTML->MD conversion is anyone's guess).
-
-        const textWithMdPills = this.plainWithMdPills.serialize(editorState);
-        const markdown = new Markdown(textWithMdPills);
-        // HTML deserialize has custom rules to turn permalinks into pill objects.
-        return this.html.deserialize(markdown.toHTML());
-    }
-
-    richToMdEditorState(editorState: Value): Value {
-        // FIXME: this conversion loses pills (turning them into pure MD links).
-        // We need to add a pill-aware deserialize method
-        // to PlainWithPillsSerializer which recognises pills in raw MD and turns them into pills.
-        return Plain.deserialize(
-            // FIXME: we compile the MD out of the RTE state using slate-md-serializer
-            // which doesn't roundtrip symmetrically with commonmark, which we use for
-            // compiling MD out of the MD editor state above.
-            this.md.serialize(editorState),
-            { defaultBlock: DEFAULT_NODE },
-        );
-    }
-
-    enableRichtext(enabled: boolean) {
-        if (enabled === this.state.isRichTextEnabled) return;
-
-        Analytics.setRichtextMode(enabled);
-
-        this.setState({
-            editorState: this.createEditorState(
-                enabled,
-                this.state.editorState,
-                this.state.isRichTextEnabled,
-            ),
-            isRichTextEnabled: enabled,
-        }, () => {
-            this._editor.focus();
-            if (this.props.onInputStateChanged) {
-                this.props.onInputStateChanged({
-                    isRichTextEnabled: enabled,
-                });
-            }
-        });
-
-        SettingsStore.setValue("MessageComposerInput.isRichTextEnabled", null, SettingLevel.ACCOUNT, enabled);
-    }
-
-    /**
-    * Check if the current selection has a mark with `type` in it.
-    *
-    * @param {String} type
-    * @return {Boolean}
-    */
-
-    hasMark = type => {
-        const { editorState } = this.state;
-        return editorState.activeMarks.some(mark => mark.type === type);
-    };
-
-    /**
-    * Check if the any of the currently selected blocks are of `type`.
-    *
-    * @param {String} type
-    * @return {Boolean}
-    */
-
-    hasBlock = type => {
-        const { editorState } = this.state;
-        return editorState.blocks.some(node => node.type === type);
-    };
-
-    onKeyDown = (ev: KeyboardEvent, change: Change, editor: Editor) => {
-        this.suppressAutoComplete = false;
-        this.direction = '';
-
-        // Navigate autocomplete list with arrow keys
-        if (this.autocomplete.countCompletions() > 0) {
-            if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) {
-                switch (ev.keyCode) {
-                    case KeyCode.UP:
-                        this.autocomplete.moveSelection(-1);
-                        ev.preventDefault();
-                        return true;
-                    case KeyCode.DOWN:
-                        this.autocomplete.moveSelection(+1);
-                        ev.preventDefault();
-                        return true;
-                }
-            }
-        }
-
-        // skip void nodes - see
-        // https://github.com/ianstormtaylor/slate/issues/762#issuecomment-304855095
-        if (ev.keyCode === KeyCode.LEFT) {
-            this.direction = 'Previous';
-        } else if (ev.keyCode === KeyCode.RIGHT) {
-            this.direction = 'Next';
-        }
-
-        switch (ev.keyCode) {
-            case KeyCode.ENTER:
-                return this.handleReturn(ev, change);
-            case KeyCode.BACKSPACE:
-                return this.onBackspace(ev, change);
-            case KeyCode.UP:
-                return this.onVerticalArrow(ev, true);
-            case KeyCode.DOWN:
-                return this.onVerticalArrow(ev, false);
-            case KeyCode.TAB:
-                return this.onTab(ev);
-            case KeyCode.ESCAPE:
-                return this.onEscape(ev);
-            case KeyCode.SPACE:
-                return this.onSpace(ev, change);
-        }
-
-        if (isOnlyCtrlOrCmdKeyEvent(ev)) {
-            const ctrlCmdCommand = {
-                // C-m => Toggles between rich text and markdown modes
-                [KeyCode.KEY_M]: 'toggle-mode',
-                [KeyCode.KEY_B]: 'bold',
-                [KeyCode.KEY_I]: 'italic',
-                [KeyCode.KEY_U]: 'underlined',
-                [KeyCode.KEY_J]: 'inline-code',
-            }[ev.keyCode];
-
-            if (ctrlCmdCommand) {
-                ev.preventDefault(); // to prevent clashing with Mac's minimize window
-                return this.handleKeyCommand(ctrlCmdCommand);
-            }
-        }
-    };
-
-    onSpace = (ev: KeyboardEvent, change: Change): Change => {
-        if (ev.metaKey || ev.altKey || ev.shiftKey || ev.ctrlKey) {
-            return;
-        }
-
-        // drop a point in history so the user can undo a word
-        // XXX: this seems nasty but adding to history manually seems a no-go
-        ev.preventDefault();
-        return change.withoutMerging(() => {
-            change.insertText(ev.key);
-        });
-    };
-
-    onBackspace = (ev: KeyboardEvent, change: Change): Change => {
-        if (ev.metaKey || ev.altKey || ev.shiftKey) {
-            return;
-        }
-
-        const { editorState } = this.state;
-
-        // Allow Ctrl/Cmd-Backspace when focus starts at the start of the composer (e.g select-all)
-        // for some reason if slate sees you Ctrl-backspace and your anchor.offset=0 it just resets your focus
-        // XXX: Doing this now seems to put slate into a broken state, and it didn't appear to be doing
-        // what it claims to do on the old version of slate anyway...
-        /*if (!editorState.isCollapsed && editorState.selection.anchor.offset === 0) {
-            return change.delete();
-        }*/
-
-        if (this.state.isRichTextEnabled) {
-            // let backspace exit lists
-            const isList = this.hasBlock('list-item');
-
-            if (isList && editorState.selection.anchor.offset == 0) {
-                change
-                    .setBlocks(DEFAULT_NODE)
-                    .unwrapBlock('bulleted-list')
-                    .unwrapBlock('numbered-list');
-                return change;
-            } else if (editorState.selection.anchor.offset == 0 && editorState.isCollapsed) {
-                // turn blocks back into paragraphs
-                if ((this.hasBlock('block-quote') ||
-                     this.hasBlock('heading1') ||
-                     this.hasBlock('heading2') ||
-                     this.hasBlock('heading3') ||
-                     this.hasBlock('heading4') ||
-                     this.hasBlock('heading5') ||
-                     this.hasBlock('heading6') ||
-                     this.hasBlock('code'))) {
-                    return change.setBlocks(DEFAULT_NODE);
-                }
-
-                // remove paragraphs entirely if they're nested
-                const parent = editorState.document.getParent(editorState.anchorBlock.key);
-                if (editorState.selection.anchor.offset == 0 &&
-                    this.hasBlock('paragraph') &&
-                    parent.nodes.size == 1 &&
-                    parent.object !== 'document') {
-                    return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
-                                 .moveToEndOfNode(parent)
-                                 .focus();
-                }
-            }
-        }
-        return;
-    };
-
-    handleKeyCommand = (command: string): boolean => {
-        if (command === 'toggle-mode') {
-            this.enableRichtext(!this.state.isRichTextEnabled);
-            return true;
-        }
-
-        //const newState: ?Value = null;
-
-        // Draft handles rich text mode commands by default but we need to do it ourselves for Markdown.
-        if (this.state.isRichTextEnabled) {
-            const type = command;
-            const { editorState } = this.state;
-            const change = editorState.change();
-            const { document } = editorState;
-            switch (type) {
-                // list-blocks:
-                case 'bulleted-list':
-                case 'numbered-list': {
-                    // Handle the extra wrapping required for list buttons.
-                    const isList = this.hasBlock('list-item');
-                    const isType = editorState.blocks.some(block => {
-                        return !!document.getClosest(block.key, parent => parent.type === type);
-                    });
-
-                    if (isList && isType) {
-                        change
-                            .setBlocks(DEFAULT_NODE)
-                            .unwrapBlock('bulleted-list')
-                            .unwrapBlock('numbered-list');
-                    } else if (isList) {
-                        change
-                            .unwrapBlock(
-                                type === 'bulleted-list' ? 'numbered-list' : 'bulleted-list',
-                            )
-                            .wrapBlock(type);
-                    } else {
-                        change.setBlocks('list-item').wrapBlock(type);
-                    }
-                }
-                break;
-
-                // simple blocks
-                case 'paragraph':
-                case 'block-quote':
-                case 'heading1':
-                case 'heading2':
-                case 'heading3':
-                case 'heading4':
-                case 'heading5':
-                case 'heading6':
-                case 'list-item':
-                case 'code': {
-                    const isActive = this.hasBlock(type);
-                    const isList = this.hasBlock('list-item');
-
-                    if (isList) {
-                        change
-                            .setBlocks(isActive ? DEFAULT_NODE : type)
-                            .unwrapBlock('bulleted-list')
-                            .unwrapBlock('numbered-list');
-                    } else {
-                        change.setBlocks(isActive ? DEFAULT_NODE : type);
-                    }
-                }
-                break;
-
-                // marks:
-                case 'bold':
-                case 'italic':
-                case 'inline-code':
-                case 'underlined':
-                case 'deleted': {
-                    change.toggleMark(type === 'inline-code' ? 'code' : type);
-                }
-                break;
-
-                default:
-                    console.warn(`ignoring unrecognised RTE command ${type}`);
-                    return false;
-            }
-
-            this.onChange(change);
-
-            return true;
-        } else {
-/*
-            const contentState = this.state.editorState.getCurrentContent();
-            const multipleLinesSelected = RichText.hasMultiLineSelection(this.state.editorState);
-
-            const selectionState = this.state.editorState.getSelection();
-            const start = selectionState.getStartOffset();
-            const end = selectionState.getEndOffset();
-
-            // If multiple lines are selected or nothing is selected, insert a code block
-            // instead of applying inline code formatting. This is an attempt to mimic what
-            // happens in non-MD mode.
-            const treatInlineCodeAsBlock = multipleLinesSelected || start === end;
-            const textMdCodeBlock = (text) => `\`\`\`\n${text}\n\`\`\`\n`;
-            const modifyFn = {
-                'bold': (text) => `**${text}**`,
-                'italic': (text) => `*${text}*`,
-                'underline': (text) => `<u>${text}</u>`,
-                'strike': (text) => `<del>${text}</del>`,
-                // ("code" is triggered by ctrl+j by draft-js by default)
-                'code': (text) => treatInlineCodeAsBlock ? textMdCodeBlock(text) : `\`${text}\``,
-                'code': textMdCodeBlock,
-                'blockquote': (text) => text.split('\n').map((line) => `> ${line}\n`).join('') + '\n',
-                'unordered-list-item': (text) => text.split('\n').map((line) => `\n- ${line}`).join(''),
-                'ordered-list-item': (text) => text.split('\n').map((line, i) => `\n${i + 1}. ${line}`).join(''),
-            }[command];
-
-            const selectionAfterOffset = {
-                'bold': -2,
-                'italic': -1,
-                'underline': -4,
-                'strike': -6,
-                'code': treatInlineCodeAsBlock ? -5 : -1,
-                'code': -5,
-                'blockquote': -2,
-            }[command];
-
-            // Returns a function that collapses a selection to its end and moves it by offset
-            const collapseAndOffsetSelection = (selection, offset) => {
-                const key = selection.endKey();
-                return new Range({
-                    anchorKey: key, anchor.offset: offset,
-                    focus.key: key, focus.offset: offset,
-                });
-            };
-
-            if (modifyFn) {
-
-                const previousSelection = this.state.editorState.getSelection();
-                const newContentState = RichText.modifyText(contentState, previousSelection, modifyFn);
-                newState = EditorState.push(
-                    this.state.editorState,
-                    newContentState,
-                    'insert-characters',
-                );
-
-                let newSelection = newContentState.getSelectionAfter();
-                // If the selection range is 0, move the cursor inside the formatted body
-                if (previousSelection.getStartOffset() === previousSelection.getEndOffset() &&
-                    previousSelection.getStartKey() === previousSelection.getEndKey() &&
-                    selectionAfterOffset !== undefined
-                ) {
-                    const selectedBlock = newContentState.getBlockForKey(previousSelection.getAnchorKey());
-                    const blockLength = selectedBlock.getText().length;
-                    const newOffset = blockLength + selectionAfterOffset;
-                    newSelection = collapseAndOffsetSelection(newSelection, newOffset);
-                }
-
-                newState = EditorState.forceSelection(newState, newSelection);
-            }
-        }
-
-        if (newState != null) {
-            this.setState({editorState: newState});
-            return true;
-        }
-*/
-        }
-        return false;
-    };
-
-    onPaste = (event: Event, change: Change, editor: Editor): Change => {
-        const transfer = getEventTransfer(event);
-
-        switch (transfer.type) {
-            case 'files':
-                // This actually not so much for 'files' as such (at time of writing
-                // neither chrome nor firefox let you paste a plain file copied
-                // from Finder) but more images copied from a different website
-                // / word processor etc.
-                return ContentMessages.sharedInstance().sendContentListToRoom(
-                    transfer.files, this.props.room.roomId, this.client,
-                );
-            case 'html': {
-                if (this.state.isRichTextEnabled) {
-                    // FIXME: https://github.com/ianstormtaylor/slate/issues/1497 means
-                    // that we will silently discard nested blocks (e.g. nested lists) :(
-                    const fragment = this.html.deserialize(transfer.html);
-                    return change
-                    // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
-                    // .setOperationFlag("skip", false)
-                    // .setOperationFlag("merge", false)
-                        .insertFragment(fragment.document);
-                } else {
-                    // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain
-                    return change.withoutMerging(() => {
-                        change.insertText(transfer.text);
-                    });
-                }
-            }
-            case 'text':
-                // don't skip/merge so that multiple consecutive pastes can be undone individually
-                return change.withoutMerging(() => {
-                    change.insertText(transfer.text);
-                });
-        }
-    };
-
-    handleReturn = (ev, change) => {
-        const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-        if (ev.shiftKey || (isMac && ev.altKey)) {
-            return change.insertText('\n');
-        }
-
-        if (this.autocomplete.hasSelection()) {
-            this.autocomplete.hide();
-            ev.preventDefault();
-            return true;
-        }
-
-        const editorState = this.state.editorState;
-
-        const lastBlock = editorState.blocks.last();
-        if (['code', 'block-quote', 'list-item'].includes(lastBlock.type)) {
-            const text = lastBlock.text;
-            if (text === '') {
-                // allow the user to cancel empty block by hitting return, useful in conjunction with below `inBlock`
-                return change
-                    .setBlocks(DEFAULT_NODE)
-                    .unwrapBlock('bulleted-list')
-                    .unwrapBlock('numbered-list');
-            }
-
-            // TODO strip trailing lines from blockquotes/list entries
-            // the below code seemingly works but doesn't account for edge cases like return with caret not at end
-            /* const trailingNewlines = text.match(/\n*$/);
-            if (trailingNewlines && trailingNewlines[0]) {
-                remove trailing newlines at the end of this block before making a new one
-                return change.deleteBackward(trailingNewlines[0].length);
-            }*/
-
-            return;
-        }
-
-        let contentText;
-        let contentHTML;
-
-        // 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; let commandText;
-        const firstChild = editorState.document.nodes.get(0);
-        const firstGrandChild = firstChild && firstChild.nodes.get(0);
-        if (firstChild && firstGrandChild &&
-            firstChild.object === 'block' && firstGrandChild.object === 'text' &&
-            firstGrandChild.text[0] === '/') {
-            commandText = this.plainWithIdPills.serialize(editorState);
-            cmd = processCommandInput(this.props.room.roomId, commandText);
-        }
-
-        if (cmd) {
-            if (!cmd.error) {
-                this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
-                this.setState({
-                    editorState: this.createEditorState(),
-                }, ()=>{
-                    this._editor.focus();
-                });
-            }
-            if (cmd.promise) {
-                cmd.promise.then(()=>{
-                    console.log("Command success.");
-                }, (err)=>{
-                    console.error("Command failure: %s", err);
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Server error', '', ErrorDialog, {
-                        title: _t("Server error"),
-                        description: ((err && err.message) ? err.message : _t(
-                            "Server unavailable, overloaded, or something else went wrong.",
-                        )),
-                    });
-                });
-            } else if (cmd.error) {
-                console.error(cmd.error);
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                // TODO possibly track which command they ran (not its Arguments) here
-                Modal.createTrackedDialog('Command error', '', ErrorDialog, {
-                    title: _t("Command error"),
-                    description: cmd.error,
-                });
-            }
-            return true;
-        }
-
-        const replyingToEv = RoomViewStore.getQuotingEvent();
-        const mustSendHTML = Boolean(replyingToEv);
-
-        if (this.state.isRichTextEnabled) {
-            // We should only send HTML if any block is styled or contains inline style
-            let shouldSendHTML = false;
-
-            if (mustSendHTML) shouldSendHTML = true;
-
-            if (!shouldSendHTML) {
-                shouldSendHTML = !!editorState.document.findDescendant(node => {
-                    // N.B. node.getMarks() might be private?
-                    return ((node.object === 'block' && node.type !== 'paragraph') ||
-                            (node.object === 'inline') ||
-                            (node.object === 'text' && node.getMarks().size > 0));
-                });
-            }
-
-            contentText = this.plainWithPlainPills.serialize(editorState);
-            if (contentText === '') return true;
-
-            if (shouldSendHTML) {
-                contentHTML = HtmlUtils.processHtmlForSending(this.html.serialize(editorState));
-            }
-        } else {
-            const sourceWithPills = this.plainWithMdPills.serialize(editorState);
-            if (sourceWithPills === '') return true;
-
-            const mdWithPills = new Markdown(sourceWithPills);
-
-            // if contains no HTML and we're not quoting (needing HTML)
-            if (mdWithPills.isPlainText() && !mustSendHTML) {
-                // N.B. toPlainText is only usable here because we know that the MD
-                // didn't contain any formatting in the first place...
-                contentText = mdWithPills.toPlaintext();
-            } else {
-                // to avoid ugliness on clients which ignore the HTML body we don't
-                // send pills in the plaintext body.
-                contentText = this.plainWithPlainPills.serialize(editorState);
-                contentHTML = mdWithPills.toHTML();
-            }
-        }
-
-        let sendHtmlFn = ContentHelpers.makeHtmlMessage;
-        let sendTextFn = ContentHelpers.makeTextMessage;
-
-        this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
-
-        if (commandText && commandText.startsWith('/me')) {
-            if (replyingToEv) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Emote Reply Fail', '', ErrorDialog, {
-                    title: _t("Unable to reply"),
-                    description: _t("At this time it is not possible to reply with an emote."),
-                });
-                return false;
-            }
-
-            contentText = contentText.substring(4);
-            // bit of a hack, but the alternative would be quite complicated
-            if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, '');
-            sendHtmlFn = ContentHelpers.makeHtmlEmote;
-            sendTextFn = ContentHelpers.makeEmoteMessage;
-        }
-
-        let content = contentHTML ?
-                      sendHtmlFn(contentText, contentHTML) :
-                      sendTextFn(contentText);
-
-        if (replyingToEv) {
-            const replyContent = ReplyThread.makeReplyMixIn(replyingToEv);
-            content = Object.assign(replyContent, content);
-
-            // Part of Replies fallback support - prepend the text we're sending
-            // with the text we're replying to
-            const nestedReply = ReplyThread.getNestedReplyText(replyingToEv, this.props.permalinkCreator);
-            if (nestedReply) {
-                if (content.formatted_body) {
-                    content.formatted_body = nestedReply.html + content.formatted_body;
-                }
-                content.body = nestedReply.body + content.body;
-            }
-
-            // Clear reply_to_event as we put the message into the queue
-            // if the send fails, retry will handle resending.
-            dis.dispatch({
-                action: 'reply_to_event',
-                event: null,
-            });
-        }
-
-        this.client.sendMessage(this.props.room.roomId, content).then((res) => {
-            dis.dispatch({
-                action: 'message_sent',
-            });
-        }).catch((e) => {
-            onSendMessageFailed(e, this.props.room);
-        });
-
-        this.setState({
-            editorState: this.createEditorState(),
-        }, ()=>{ this._editor.focus(); });
-
-        return true;
-    };
-
-    onVerticalArrow = (e, up) => {
-        if (e.ctrlKey || e.shiftKey || e.metaKey) return;
-
-        const shouldSelectHistory = e.altKey;
-        const shouldEditLastMessage = !e.altKey && up && !RoomViewStore.getQuotingEvent();
-
-        if (shouldSelectHistory) {
-            // Try select composer history
-            const selected = this.selectHistory(up);
-            if (selected) {
-                // We're selecting history, so prevent the key event from doing anything else
-                e.preventDefault();
-            }
-        } else if (shouldEditLastMessage) {
-            // selection must be collapsed
-            const selection = this.state.editorState.selection;
-            if (!selection.isCollapsed) return;
-            // and we must be at the edge of the document (up=start, down=end)
-            const document = this.state.editorState.document;
-            if (up) {
-                if (!selection.anchor.isAtStartOfNode(document)) return;
-            } else {
-                if (!selection.anchor.isAtEndOfNode(document)) return;
-            }
-
-            const editEvent = findEditableEvent(this.props.room, false);
-            if (editEvent) {
-                // We're selecting history, so prevent the key event from doing anything else
-                e.preventDefault();
-                dis.dispatch({
-                    action: 'edit_event',
-                    event: editEvent,
-                });
-            }
-        }
-    };
-
-    selectHistory = (up) => {
-        const delta = up ? -1 : 1;
-
-        // True if we are not currently selecting history, but composing a message
-        if (this.historyManager.currentIndex === this.historyManager.history.length) {
-            // We can't go any further - there isn't any more history, so nop.
-            if (!up) {
-                return;
-            }
-            this.setState({
-                currentlyComposedEditorState: this.state.editorState,
-            });
-        } else if (this.historyManager.currentIndex + delta === this.historyManager.history.length) {
-            // True when we return to the message being composed currently
-            this.setState({
-                editorState: this.state.currentlyComposedEditorState,
-            });
-            this.historyManager.currentIndex = this.historyManager.history.length;
-            return;
-        }
-
-        let editorState;
-        const historyItem = this.historyManager.getItem(delta);
-        if (!historyItem) return;
-
-        if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
-            editorState = this.richToMdEditorState(historyItem.value);
-        } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
-            editorState = this.mdToRichEditorState(historyItem.value);
-        } else {
-            editorState = historyItem.value;
-        }
-
-        // Move selection to the end of the selected history
-        const change = editorState.change().moveToEndOfNode(editorState.document);
-
-        // We don't call this.onChange(change) now, as fixups on stuff like pills
-        // should already have been done and persisted in the history.
-        editorState = change.value;
-
-        this.suppressAutoComplete = true;
-
-        this.setState({ editorState }, ()=>{
-            this._editor.focus();
-        });
-        return true;
-    };
-
-    onTab = async (e) => {
-        this.setState({
-            someCompletions: null,
-        });
-        e.preventDefault();
-        if (this.autocomplete.countCompletions() === 0) {
-            // Force completions to show for the text currently entered
-            const completionCount = await this.autocomplete.forceComplete();
-            this.setState({
-                someCompletions: completionCount > 0,
-            });
-            // Select the first item by moving "down"
-            await this.autocomplete.moveSelection(+1);
-        } else {
-            await this.autocomplete.moveSelection(e.shiftKey ? -1 : +1);
-        }
-    };
-
-    onEscape = async (e) => {
-        e.preventDefault();
-        if (this.autocomplete) {
-            this.autocomplete.onEscape(e);
-        }
-        await this.setDisplayedCompletion(null); // restore originalEditorState
-    };
-
-    onAutocompleteConfirm = (displayedCompletion: ?Completion) => {
-        this.focusComposer();
-        // XXX: this fails if the composer isn't focused so focus it and delay the completion until next tick
-        setImmediate(() => {
-            this.setDisplayedCompletion(displayedCompletion);
-        });
-    };
-
-    /* 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 => {
-        const activeEditorState = this.state.originalEditorState || this.state.editorState;
-
-        if (displayedCompletion == null) {
-            if (this.state.originalEditorState) {
-                const editorState = this.state.originalEditorState;
-                this.setState({editorState});
-            }
-            return false;
-        }
-
-        const {
-            range = null,
-            completion = '',
-            completionId = '',
-            href = null,
-            suffix = '',
-        } = displayedCompletion;
-
-        let inline;
-        if (href) {
-            inline = Inline.create({
-                type: 'pill',
-                data: { completion, completionId, href },
-            });
-        } else if (completion === '@room') {
-            inline = Inline.create({
-                type: 'pill',
-                data: { completion, completionId },
-            });
-        }
-
-        let editorState = activeEditorState;
-
-        if (range) {
-            const change = editorState.change()
-                                      .moveToAnchor()
-                                      .moveAnchorTo(range.start)
-                                      .moveFocusTo(range.end)
-                                      .focus();
-            editorState = change.value;
-        }
-
-        let change;
-        if (inline) {
-            change = editorState.change()
-                                .insertInlineAtRange(editorState.selection, inline)
-                                .insertText(suffix)
-                                .focus();
-        } else {
-            change = editorState.change()
-                                .insertTextAtRange(editorState.selection, completion)
-                                .insertText(suffix)
-                                .focus();
-        }
-        // for good hygiene, keep editorState updated to track the result of the change
-        // even though we don't do anything subsequently with it
-        editorState = change.value;
-
-        this.onChange(change, activeEditorState);
-
-        return true;
-    };
-
-    renderNode = props => {
-        const { attributes, children, node, isSelected } = props;
-
-        switch (node.type) {
-            case 'paragraph':
-                return <p {...attributes}>{children}</p>;
-            case 'block-quote':
-                return <blockquote {...attributes}>{children}</blockquote>;
-            case 'bulleted-list':
-                return <ul {...attributes}>{children}</ul>;
-            case 'heading1':
-                return <h1 {...attributes}>{children}</h1>;
-            case 'heading2':
-                return <h2 {...attributes}>{children}</h2>;
-            case 'heading3':
-                return <h3 {...attributes}>{children}</h3>;
-            case 'heading4':
-                return <h4 {...attributes}>{children}</h4>;
-            case 'heading5':
-                return <h5 {...attributes}>{children}</h5>;
-            case 'heading6':
-                return <h6 {...attributes}>{children}</h6>;
-            case 'list-item':
-                return <li {...attributes}>{children}</li>;
-            case 'numbered-list':
-                return <ol {...attributes}>{children}</ol>;
-            case 'code':
-                return <pre {...attributes}>{children}</pre>;
-            case 'link':
-                return <a {...attributes} href={ node.data.get('href') }>{children}</a>;
-            case 'pill': {
-                const { data } = node;
-                const url = data.get('href');
-                const completion = data.get('completion');
-
-                const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
-                const Pill = sdk.getComponent('elements.Pill');
-
-                if (completion === '@room') {
-                    return <Pill
-                            type={Pill.TYPE_AT_ROOM_MENTION}
-                            room={this.props.room}
-                            shouldShowPillAvatar={shouldShowPillAvatar}
-                            isSelected={isSelected}
-                            {...attributes}
-                            />;
-                } else if (Pill.isPillUrl(url)) {
-                    return <Pill
-                            url={url}
-                            room={this.props.room}
-                            shouldShowPillAvatar={shouldShowPillAvatar}
-                            isSelected={isSelected}
-                            {...attributes}
-                            />;
-                } else {
-                    const { text } = node;
-                    return <a href={url} {...props.attributes}>
-                                { text }
-                           </a>;
-                }
-            }
-            case 'emoji': {
-                const { data } = node;
-                return data.get('emojiUnicode');
-            }
-        }
-    };
-
-    renderMark = props => {
-        const { children, mark, attributes } = props;
-        switch (mark.type) {
-            case 'bold':
-                return <strong {...attributes}>{children}</strong>;
-            case 'italic':
-                return <em {...attributes}>{children}</em>;
-            case 'code':
-                return <code {...attributes}>{children}</code>;
-            case 'underlined':
-                return <u {...attributes}>{children}</u>;
-            case 'deleted':
-                return <del {...attributes}>{children}</del>;
-        }
-    };
-
-    onFormatButtonClicked = (name, e) => {
-        e.preventDefault();
-
-        // XXX: horrible evil hack to ensure the editor is focused so the act
-        // of focusing it doesn't then cancel the format button being pressed
-        // FIXME: can we just tell handleKeyCommand's change to invoke .focus()?
-        if (document.activeElement && document.activeElement.className !== 'mx_MessageComposer_editor') {
-            this._editor.focus();
-            setTimeout(()=>{
-                this.handleKeyCommand(name);
-            }, 500); // can't find any callback to hook this to. onFocus and onChange and willComponentUpdate fire too early.
-            return;
-        }
-
-        this.handleKeyCommand(name);
-    };
-
-    getAutocompleteQuery(editorState: Value) {
-        // We can just return the current block where the selection begins, which
-        // should be enough to capture any autocompletion input, given autocompletion
-        // providers only search for the first match which intersects with the current selection.
-        // This avoids us having to serialize the whole thing to plaintext and convert
-        // selection offsets in & out of the plaintext domain.
-
-        if (editorState.selection.anchor.key) {
-            return editorState.document.getDescendant(editorState.selection.anchor.key).text;
-        } else {
-            return '';
-        }
-    }
-
-    getSelectionRange(editorState: Value) {
-        let beginning = false;
-        const firstChild = editorState.document.nodes.get(0);
-        const firstGrandChild = firstChild && firstChild.nodes.get(0);
-        beginning = (firstChild && firstGrandChild &&
-                     firstChild.object === 'block' && firstGrandChild.object === 'text' &&
-                     editorState.selection.anchor.key === firstGrandChild.key);
-
-        // return a character range suitable for handing to an autocomplete provider.
-        // the range is relative to the anchor of the current editor selection.
-        // if the selection spans multiple blocks, then we collapse it for the calculation.
-        const range = {
-            beginning, // whether the selection is in the first block of the editor or not
-            start: editorState.selection.anchor.offset,
-            end: (editorState.selection.anchor.key == editorState.selection.focus.key) ?
-                 editorState.selection.focus.offset : editorState.selection.anchor.offset,
-        };
-        if (range.start > range.end) {
-            const tmp = range.start;
-            range.start = range.end;
-            range.end = tmp;
-        }
-        return range;
-    }
-
-    onMarkdownToggleClicked = (e) => {
-        e.preventDefault(); // don't steal focus from the editor!
-        this.handleKeyCommand('toggle-mode');
-    };
-
-    focusComposer = () => {
-        this._editor.focus();
-    };
-
-    render() {
-        const activeEditorState = this.state.originalEditorState || this.state.editorState;
-
-        const className = classNames('mx_MessageComposer_input', {
-            mx_MessageComposer_input_error: this.state.someCompletions === false,
-        });
-
-        const isEmpty = Plain.serialize(this.state.editorState) === '';
-
-        let {placeholder} = this.props;
-        // XXX: workaround for placeholder being shown when there is a formatting block e.g blockquote but no text
-        if (isEmpty && this.state.editorState.startBlock && this.state.editorState.startBlock.type !== DEFAULT_NODE) {
-            placeholder = undefined;
-        }
-
-        const markdownClasses = classNames({
-            mx_MessageComposer_input_markdownIndicator: true,
-            mx_MessageComposer_markdownDisabled: this.state.isRichTextEnabled,
-        });
-
-        return (
-            <div className="mx_MessageComposer_input_wrapper" onClick={this.focusComposer}>
-                <div className="mx_MessageComposer_autocomplete_wrapper">
-                    <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
-                    <Autocomplete
-                        ref={(e) => this.autocomplete = e}
-                        room={this.props.room}
-                        onConfirm={this.onAutocompleteConfirm}
-                        onSelectionChange={this.setDisplayedCompletion}
-                        query={ this.suppressAutoComplete ? '' : this.getAutocompleteQuery(activeEditorState) }
-                        selection={this.getSelectionRange(activeEditorState)}
-                    />
-                </div>
-                <div className={className}>
-                    <AccessibleButton className={markdownClasses}
-                        onClick={this.onMarkdownToggleClicked}
-                        title={this.state.isRichTextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
-                    />
-                    <Editor ref={this._collectEditor}
-                            dir="auto"
-                            className="mx_MessageComposer_editor"
-                            placeholder={placeholder}
-                            value={this.state.editorState}
-                            onChange={this.onChange}
-                            onKeyDown={this.onKeyDown}
-                            onPaste={this.onPaste}
-                            renderNode={this.renderNode}
-                            renderMark={this.renderMark}
-                            // disable spell check for the placeholder because browsers don't like "unencrypted"
-                            spellCheck={!isEmpty}
-                            schema={SLATE_SCHEMA}
-                            />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/SlateMessageComposer.js b/src/components/views/rooms/SlateMessageComposer.js
deleted file mode 100644
index b1f7adbe32..0000000000
--- a/src/components/views/rooms/SlateMessageComposer.js
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 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, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import { _t, _td } from '../../../languageHandler';
-import CallHandler from '../../../CallHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
-import RoomViewStore from '../../../stores/RoomViewStore';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import Stickerpicker from './Stickerpicker';
-import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
-import ContentMessages from '../../../ContentMessages';
-
-import E2EIcon from './E2EIcon';
-
-const formatButtonList = [
-    _td("bold"),
-    _td("italic"),
-    _td("deleted"),
-    _td("underlined"),
-    _td("inline-code"),
-    _td("block-quote"),
-    _td("bulleted-list"),
-    _td("numbered-list"),
-];
-
-function ComposerAvatar(props) {
-    const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
-    return <div className="mx_MessageComposer_avatar">
-        <MemberStatusMessageAvatar member={props.me} width={24} height={24} />
-    </div>;
-}
-
-ComposerAvatar.propTypes = {
-    me: PropTypes.object.isRequired,
-}
-
-function CallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onVoiceCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: "voice",
-            room_id: props.roomId,
-        });
-    };
-
-    return <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_voicecall"
-        onClick={onVoiceCallClick}
-        title={_t('Voice call')}
-    />
-}
-
-CallButton.propTypes = {
-    roomId: PropTypes.string.isRequired
-}
-
-function VideoCallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: ev.shiftKey ? "screensharing" : "video",
-            room_id: props.roomId,
-        });
-    };
-
-    return <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_videocall"
-        onClick={onCallClick}
-        title={_t('Video call')}
-    />;
-}
-
-VideoCallButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-};
-
-function HangupButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    const onHangupClick = () => {
-        const call = CallHandler.getCallForRoom(props.roomId);
-        if (!call) {
-            return;
-        }
-        dis.dispatch({
-            action: 'hangup',
-            // hangup the call for this room, which may not be the room in props
-            // (e.g. conferences which will hangup the 1:1 room instead)
-            room_id: call.roomId,
-        });
-    };
-    return  <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_hangup"
-        onClick={onHangupClick}
-        title={_t('Hangup')}
-    />;
-}
-
-HangupButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-}
-
-function FormattingButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return <AccessibleButton
-        element="img"
-        className="mx_MessageComposer_formatting"
-        alt={_t("Show Text Formatting Toolbar")}
-        title={_t("Show Text Formatting Toolbar")}
-        src={require("../../../../res/img/button-text-formatting.svg")}
-        style={{visibility: props.showFormatting ? 'hidden' : 'visible'}}
-        onClick={props.onClickHandler}
-    />;
-}
-
-FormattingButton.propTypes = {
-    showFormatting: PropTypes.bool.isRequired,
-    onClickHandler: PropTypes.func.isRequired,
-}
-
-class UploadButton extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    }
-    constructor(props, context) {
-        super(props, context);
-        this.onUploadClick = this.onUploadClick.bind(this);
-        this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
-
-        this._uploadInput = createRef();
-    }
-
-    onUploadClick(ev) {
-        if (MatrixClientPeg.get().isGuest()) {
-            dis.dispatch({action: 'require_registration'});
-            return;
-        }
-        this._uploadInput.current.click();
-    }
-
-    onUploadFileInputChange(ev) {
-        if (ev.target.files.length === 0) return;
-
-        // take a copy so we can safely reset the value of the form control
-        // (Note it is a FileList: we can't use slice or sesnible iteration).
-        const tfiles = [];
-        for (let i = 0; i < ev.target.files.length; ++i) {
-            tfiles.push(ev.target.files[i]);
-        }
-
-        ContentMessages.sharedInstance().sendContentListToRoom(
-            tfiles, this.props.roomId, MatrixClientPeg.get(),
-        );
-
-        // This is the onChange handler for a file form control, but we're
-        // not keeping any state, so reset the value of the form control
-        // to empty.
-        // NB. we need to set 'value': the 'files' property is immutable.
-        ev.target.value = '';
-    }
-
-    render() {
-        const uploadInputStyle = {display: 'none'};
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (
-            <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_upload"
-                onClick={this.onUploadClick}
-                title={_t('Upload file')}
-            >
-                <input ref={this._uploadInput} type="file"
-                    style={uploadInputStyle}
-                    multiple
-                    onChange={this.onUploadFileInputChange}
-                />
-            </AccessibleButton>
-        );
-    }
-}
-
-export default class SlateMessageComposer extends React.Component {
-    constructor(props, context) {
-        super(props, context);
-        this._onAutocompleteConfirm = this._onAutocompleteConfirm.bind(this);
-        this.onToggleFormattingClicked = this.onToggleFormattingClicked.bind(this);
-        this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
-        this.onInputStateChanged = this.onInputStateChanged.bind(this);
-        this.onEvent = this.onEvent.bind(this);
-        this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
-        this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
-        this._onTombstoneClick = this._onTombstoneClick.bind(this);
-        this.renderPlaceholderText = this.renderPlaceholderText.bind(this);
-        this.renderFormatBar = this.renderFormatBar.bind(this);
-
-        this.state = {
-            inputState: {
-                marks: [],
-                blockType: null,
-                isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
-            },
-            showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
-            isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
-            tombstone: this._getRoomTombstone(),
-            canSendMessages: this.props.room.maySendMessage(),
-        };
-    }
-
-    componentDidMount() {
-        // N.B. using 'event' rather than 'RoomEvents' otherwise the crypto handler
-        // for 'event' fires *after* 'RoomEvent', and our room won't have yet been
-        // marked as encrypted.
-        // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
-        MatrixClientPeg.get().on("event", this.onEvent);
-        MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
-        this._waitForOwnMember();
-    }
-
-    _waitForOwnMember() {
-        // if we have the member already, do that
-        const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
-        if (me) {
-            this.setState({me});
-            return;
-        }
-        // Otherwise, wait for member loading to finish and then update the member for the avatar.
-        // The members should already be loading, and loadMembersIfNeeded
-        // will return the promise for the existing operation
-        this.props.room.loadMembersIfNeeded().then(() => {
-            const me = this.props.room.getMember(MatrixClientPeg.get().getUserId());
-            this.setState({me});
-        });
-    }
-
-    componentWillUnmount() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("event", this.onEvent);
-            MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
-        }
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
-        }
-    }
-
-    onEvent(event) {
-        if (event.getType() !== 'm.room.encryption') return;
-        if (event.getRoomId() !== this.props.room.roomId) return;
-        this.forceUpdate();
-    }
-
-    _onRoomStateEvents(ev, state) {
-        if (ev.getRoomId() !== this.props.room.roomId) return;
-
-        if (ev.getType() === 'm.room.tombstone') {
-            this.setState({tombstone: this._getRoomTombstone()});
-        }
-        if (ev.getType() === 'm.room.power_levels') {
-            this.setState({canSendMessages: this.props.room.maySendMessage()});
-        }
-    }
-
-    _getRoomTombstone() {
-        return this.props.room.currentState.getStateEvents('m.room.tombstone', '');
-    }
-
-    _onRoomViewStoreUpdate() {
-        const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
-        if (this.state.isQuoting === isQuoting) return;
-        this.setState({ isQuoting });
-    }
-
-
-    onInputStateChanged(inputState) {
-        // Merge the new input state with old to support partial updates
-        inputState = Object.assign({}, this.state.inputState, inputState);
-        this.setState({inputState});
-    }
-
-    _onAutocompleteConfirm(range, completion) {
-        if (this.messageComposerInput) {
-            this.messageComposerInput.setDisplayedCompletion(range, completion);
-        }
-    }
-
-    onFormatButtonClicked(name, event) {
-        event.preventDefault();
-        this.messageComposerInput.onFormatButtonClicked(name, event);
-    }
-
-    onToggleFormattingClicked() {
-        SettingsStore.setValue("MessageComposer.showFormatting", null, SettingLevel.DEVICE, !this.state.showFormatting);
-        this.setState({showFormatting: !this.state.showFormatting});
-    }
-
-    onToggleMarkdownClicked(e) {
-        e.preventDefault(); // don't steal focus from the editor!
-        this.messageComposerInput.enableRichtext(!this.state.inputState.isRichTextEnabled);
-    }
-
-    _onTombstoneClick(ev) {
-        ev.preventDefault();
-
-        const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
-        const replacementRoom = MatrixClientPeg.get().getRoom(replacementRoomId);
-        let createEventId = null;
-        if (replacementRoom) {
-            const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', '');
-            if (createEvent && createEvent.getId()) createEventId = createEvent.getId();
-        }
-
-        const viaServers = [this.state.tombstone.getSender().split(':').splice(1).join(':')];
-        dis.dispatch({
-            action: 'view_room',
-            highlighted: true,
-            event_id: createEventId,
-            room_id: replacementRoomId,
-            auto_join: true,
-
-            // Try to join via the server that sent the event. This converts @something:example.org
-            // into a server domain by splitting on colons and ignoring the first entry ("@something").
-            via_servers: viaServers,
-            opts: {
-                // These are passed down to the js-sdk's /join call
-                viaServers: viaServers,
-            },
-        });
-    }
-
-    renderPlaceholderText() {
-        const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
-        if (this.state.isQuoting) {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted reply…');
-            } else {
-                return _t('Send a reply (unencrypted)…');
-            }
-        } else {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted message…');
-            } else {
-                return _t('Send a message (unencrypted)…');
-            }
-        }
-    }
-
-    renderFormatBar() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const {marks, blockType} = this.state.inputState;
-        const formatButtons = formatButtonList.map((name) => {
-            // special-case to match the md serializer and the special-case in MessageComposerInput.js
-            const markName = name === 'inline-code' ? 'code' : name;
-            const active = marks.some(mark => mark.type === markName) || blockType === name;
-            const suffix = active ? '-on' : '';
-            const onFormatButtonClicked = this.onFormatButtonClicked.bind(this, name);
-            const className = 'mx_MessageComposer_format_button mx_filterFlipColor';
-            return (
-                <img className={className}
-                    title={_t(name)}
-                    onMouseDown={onFormatButtonClicked}
-                    key={name}
-                    src={require(`../../../../res/img/button-text-${name}${suffix}.svg`)}
-                    height="17"
-                />
-            );
-        })
-
-        return (
-            <div className="mx_MessageComposer_formatbar_wrapper">
-                <div className="mx_MessageComposer_formatbar">
-                { formatButtons }
-                <div style={{ flex: 1 }}></div>
-                <AccessibleButton
-                    className="mx_MessageComposer_formatbar_markdown mx_MessageComposer_markdownDisabled"
-                    onClick={this.onToggleMarkdownClicked}
-                    title={_t("Markdown is disabled")}
-                />
-                <AccessibleButton element="img" title={_t("Hide Text Formatting Toolbar")}
-                    onClick={this.onToggleFormattingClicked}
-                    className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
-                    src={require("../../../../res/img/icon-text-cancel.svg")}
-                />
-                </div>
-            </div>
-        );
-    }
-
-    render() {
-        const controls = [
-            this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
-            this.props.e2eStatus ? <E2EIcon key="e2eIcon" status={this.props.e2eStatus} className="mx_MessageComposer_e2eIcon" /> : null,
-        ];
-
-        if (!this.state.tombstone && this.state.canSendMessages) {
-            // This also currently includes the call buttons. Really we should
-            // check separately for whether we can call, but this is slightly
-            // complex because of conference calls.
-
-            const MessageComposerInput = sdk.getComponent("rooms.MessageComposerInput");
-            const showFormattingButton = this.state.inputState.isRichTextEnabled;
-            const callInProgress = this.props.callState && this.props.callState !== 'ended';
-
-            controls.push(
-                <MessageComposerInput
-                    ref={(c) => this.messageComposerInput = c}
-                    key="controls_input"
-                    room={this.props.room}
-                    placeholder={this.renderPlaceholderText()}
-                    onInputStateChanged={this.onInputStateChanged}
-                    permalinkCreator={this.props.permalinkCreator} />,
-                showFormattingButton ? <FormattingButton key="controls_formatting"
-                    showFormatting={this.state.showFormatting} onClickHandler={this.onToggleFormattingClicked} /> : null,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
-                <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
-                callInProgress ? <HangupButton key="controls_hangup" roomId={this.props.room.roomId} /> : null,
-                callInProgress ? null : <CallButton key="controls_call" roomId={this.props.room.roomId} />,
-                callInProgress ? null : <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
-            );
-        } else if (this.state.tombstone) {
-            const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
-
-            const continuesLink = replacementRoomId ? (
-                <a href={makeRoomPermalink(replacementRoomId)}
-                    className="mx_MessageComposer_roomReplaced_link"
-                    onClick={this._onTombstoneClick}
-                >
-                    {_t("The conversation continues here.")}
-                </a>
-            ) : '';
-
-            controls.push(<div className="mx_MessageComposer_replaced_wrapper">
-                <div className="mx_MessageComposer_replaced_valign">
-                    <img className="mx_MessageComposer_roomReplaced_icon" src={require("../../../../res/img/room_replaced.svg")} />
-                    <span className="mx_MessageComposer_roomReplaced_header">
-                        {_t("This room has been replaced and is no longer active.")}
-                    </span><br />
-                    { continuesLink }
-                </div>
-            </div>);
-        } else {
-            controls.push(
-                <div key="controls_error" className="mx_MessageComposer_noperm_error">
-                    { _t('You do not have permission to post to this room') }
-                </div>,
-            );
-        }
-
-        const showFormatBar = this.state.showFormatting && this.state.inputState.isRichTextEnabled;
-
-        return (
-            <div className="mx_MessageComposer">
-                <div className="mx_MessageComposer_wrapper">
-                    <div className="mx_MessageComposer_row">
-                        { controls }
-                    </div>
-                </div>
-                { showFormatBar ? this.renderFormatBar() : null }
-            </div>
-        );
-    }
-}
-
-SlateMessageComposer.propTypes = {
-    // js-sdk Room object
-    room: PropTypes.object.isRequired,
-
-    // string representing the current voip call state
-    callState: PropTypes.string,
-
-    // string representing the current room app drawer state
-    showApps: PropTypes.bool
-};
diff --git a/src/stores/MessageComposerStore.js b/src/stores/MessageComposerStore.js
deleted file mode 100644
index 3c7440e10b..0000000000
--- a/src/stores/MessageComposerStore.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 { Value } from 'slate';
-
-const localStoragePrefix = 'editor_state_';
-
-/**
- * A class for storing application state to do with the message composer (specifically in-progress message drafts).
- * It does not worry about cleaning up on log out as this is handled in Lifecycle.js by localStorage.clear()
- */
-class MessageComposerStore {
-    constructor() {
-        this.prefix = localStoragePrefix;
-    }
-
-    _getKey(roomId: string): string {
-        return this.prefix + roomId;
-    }
-
-    setEditorState(roomId: string, editorState: Value, richText: boolean) {
-        localStorage.setItem(this._getKey(roomId), JSON.stringify({
-            editor_state: editorState.toJSON({
-                preserveSelection: true,
-                // XXX: re-hydrating history is not currently supported by fromJSON
-                // preserveHistory: true,
-                // XXX: this seems like a workaround for selection.isSet being based on anchorKey instead of anchorPath
-                preserveKeys: true,
-            }),
-            rich_text: richText,
-        }));
-    }
-
-    getEditorState(roomId): {editor_state: Value, rich_text: boolean} {
-        const stateStr = localStorage.getItem(this._getKey(roomId));
-
-        let state;
-        if (stateStr) {
-            state = JSON.parse(stateStr);
-
-            // if it does not have the fields we expect then bail
-            if (!state || state.rich_text === undefined || state.editor_state === undefined) return;
-            state.editor_state = Value.fromJSON(state.editor_state);
-        }
-
-        return state;
-    }
-}
-
-let singletonMessageComposerStore = null;
-if (!singletonMessageComposerStore) {
-    singletonMessageComposerStore = new MessageComposerStore();
-}
-export default singletonMessageComposerStore;
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
deleted file mode 100644
index 6adae13181..0000000000
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import React from 'react';
-import ReactTestUtils from 'react-dom/test-utils';
-import ReactDOM from 'react-dom';
-import expect from 'expect';
-import sinon from 'sinon';
-import * as testUtils from '../../../test-utils';
-import sdk from 'matrix-react-sdk';
-const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
-import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
-import {sleep} from "../../../../src/utils/promise";
-
-function addTextToDraft(text) {
-    const components = document.getElementsByClassName('public-DraftEditor-content');
-    if (components && components.length) {
-        const textarea = components[0];
-        const textEvent = document.createEvent('TextEvent');
-        textEvent.initTextEvent('textInput', true, true, null, text);
-        textarea.dispatchEvent(textEvent);
-    }
-}
-
-// FIXME: These tests need to be updated from Draft to Slate.
-
-xdescribe('MessageComposerInput', () => {
-    let parentDiv = null,
-        sandbox = null,
-        client = null,
-        mci = null,
-        room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
-
-    beforeEach(function() {
-        testUtils.beforeEach(this);
-        sandbox = testUtils.stubClient(sandbox);
-        client = MatrixClientPeg.get();
-        client.credentials = {userId: '@me:domain.com'};
-
-        parentDiv = document.createElement('div');
-        document.body.appendChild(parentDiv);
-        mci = ReactDOM.render(
-            <MessageComposerInput
-                room={room}
-                client={client}
-            />,
-            parentDiv);
-    });
-
-    afterEach((done) => {
-        // hack: let the component finish mounting before unmounting, to avoid
-        // warnings
-        // (please can we make the components not setState() after
-        // they are unmounted?)
-        sleep(10).done(() => {
-            if (parentDiv) {
-                ReactDOM.unmountComponentAtNode(parentDiv);
-                parentDiv.remove();
-                parentDiv = null;
-            }
-            sandbox.restore();
-            done();
-        });
-    });
-
-    // XXX this fails
-    xit('should change mode if indicator is clicked', (done) => {
-        mci.enableRichtext(true);
-
-        setTimeout(() => {
-            const indicator = ReactTestUtils.findRenderedDOMComponentWithClass(
-                mci,
-                'mx_MessageComposer_input_markdownIndicator');
-            ReactTestUtils.Simulate.click(indicator);
-
-            expect(mci.state.isRichTextEnabled).toEqual(false, 'should have changed mode');
-            done();
-        });
-    });
-
-    it('should not send messages when composer is empty', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(false, 'should not send message');
-    });
-
-    it('should not change content unnecessarily on RTE -> Markdown conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        addTextToDraft('a');
-        mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('a');
-    });
-
-    it('should not change content unnecessarily on Markdown -> RTE conversion', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('a');
-        mci.handleKeyCommand('toggle-mode');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('a');
-    });
-
-    it('should send emoji messages when rich text is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true, 'should send message');
-    });
-
-    it('should send emoji messages when Markdown is enabled', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('☹');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true, 'should send message');
-    });
-
-    // FIXME
-    // it('should convert basic Markdown to rich text correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
-    //     mci.enableRichtext(false);
-    //     addTextToDraft('*abc*');
-    //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
-    //     console.error(spy.args[0][2]);
-    //     expect(spy.args[0][2]).toContain('<em>abc');
-    // });
-    //
-    // it('should convert basic rich text to Markdown correctly', () => {
-    //     const spy = sinon.spy(client, 'sendHtmlMessage');
-    //     mci.enableRichtext(true);
-    //     process.nextTick(() => {
-    //
-    //     });
-    //     mci.handleKeyCommand('italic');
-    //     addTextToDraft('abc');
-    //     mci.handleKeyCommand('toggle-mode');
-    //     mci.handleReturn(sinon.stub());
-    //     expect(['_abc_', '*abc*']).toContain(spy.args[0][1]);
-    // });
-
-    it('should insert formatting characters in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        mci.handleKeyCommand('italic');
-        mci.handleReturn(sinon.stub());
-        expect(['__', '**']).toContain(spy.args[0][1].body);
-    });
-
-    it('should not entity-encode " in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('"');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('"');
-    });
-
-    it('should escape characters without other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('\\*escaped\\*');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('*escaped*');
-    });
-
-    it('should escape characters with other markup in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('\\*escaped\\* *italic*');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('\\*escaped\\* *italic*');
-        expect(spy.args[0][1].formatted_body).toEqual('*escaped* <em>italic</em>');
-    });
-
-    it('should not convert -_- into a horizontal rule in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('-_-');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('-_-');
-    });
-
-    it('should not strip <del> tags in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('<del>striked-out</del>');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('<del>striked-out</del>');
-        expect(spy.args[0][1].formatted_body).toEqual('<del>striked-out</del>');
-    });
-
-    it('should not strike-through ~~~ in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('~~~striked-out~~~');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('~~~striked-out~~~');
-    });
-
-    it('should not mark single unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.');
-    });
-
-    it('should not mark two unmarkedup paragraphs as HTML in Markdown mode', () => {
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        addTextToDraft('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.calledOnce).toEqual(true);
-        expect(spy.args[0][1].body).toEqual('Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nFusce congue sapien sed neque molestie volutpat.');
-    });
-
-    it('should strip tab-completed mentions so that only the display name is sent in the plain body in Markdown mode', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(false);
-        mci.setDisplayedCompletion({
-            completion: 'Some Member',
-            selection: mci.state.editorState.getSelection(),
-            href: `https://matrix.to/#/@some_member:domain.bla`,
-        });
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual(
-            'Some Member',
-            'the plaintext body should only include the display name',
-        );
-        expect(spy.args[0][1].formatted_body).toEqual(
-            '<a href="https://matrix.to/#/@some_member:domain.bla">Some Member</a>',
-            'the html body should contain an anchor tag with a matrix.to href and display name text',
-        );
-    });
-
-    it('should strip tab-completed mentions so that only the display name is sent in the plain body in RTE mode', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        mci.enableRichtext(true);
-        mci.setDisplayedCompletion({
-            completion: 'Some Member',
-            selection: mci.state.editorState.getSelection(),
-            href: `https://matrix.to/#/@some_member:domain.bla`,
-        });
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('Some Member');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">Some Member</a>');
-    });
-
-    it('should not strip non-tab-completed mentions when manually typing MD', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        // Markdown mode enabled
-        mci.enableRichtext(false);
-        addTextToDraft('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('[My Not-Tab-Completed Mention](https://matrix.to/#/@some_member:domain.bla)');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://matrix.to/#/@some_member:domain.bla">My Not-Tab-Completed Mention</a>');
-    });
-
-    it('should not strip arbitrary typed (i.e. not tab-completed) MD links', () => {
-        // Sending a HTML message because we have entities in the composer (because of completions)
-        const spy = sinon.spy(client, 'sendMessage');
-        // Markdown mode enabled
-        mci.enableRichtext(false);
-        addTextToDraft('[Click here](https://some.lovely.url)');
-
-        mci.handleReturn(sinon.stub());
-
-        expect(spy.args[0][1].body).toEqual('[Click here](https://some.lovely.url)');
-        expect(spy.args[0][1].formatted_body).toEqual('<a href="https://some.lovely.url">Click here</a>');
-    });
-});

From 135c84251c8b7b5c7f02dd81d6b914e99ec1b247 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 14:16:32 -0700
Subject: [PATCH 0295/3235] Fix more imports post-merge

---
 src/components/views/context_menus/TopLeftMenu.js         | 2 +-
 src/components/views/dialogs/DMInviteDialog.js            | 8 ++++----
 src/components/views/elements/ToggleSwitch.js             | 3 +--
 src/components/views/room_settings/RoomProfileSettings.js | 2 +-
 src/components/views/rooms/RoomList.js                    | 2 +-
 src/components/views/settings/AvatarSetting.js            | 2 +-
 src/components/views/settings/ProfileSettings.js          | 2 +-
 .../views/settings/tabs/room/BridgeSettingsTab.js         | 8 ++++----
 src/utils/DMRoomMap.js                                    | 2 +-
 9 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 4f6da336f7..528e4790c2 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -25,7 +25,7 @@ import SdkConfig from '../../../SdkConfig';
 import { getHostingLink } from '../../../utils/HostingLink';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export class TopLeftMenu extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 371768eb4e..a0d95772f9 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -17,14 +17,14 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import sdk from "../../../index";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import * as sdk from "../../../index";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {RoomMember} from "matrix-js-sdk/lib/matrix";
+import {RoomMember} from "matrix-js-sdk/src/matrix";
 import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
-import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import * as Email from "../../../email";
 import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
 import {abbreviateUrl} from "../../../utils/UrlUtils";
diff --git a/src/components/views/elements/ToggleSwitch.js b/src/components/views/elements/ToggleSwitch.js
index b067840792..bea1a85555 100644
--- a/src/components/views/elements/ToggleSwitch.js
+++ b/src/components/views/elements/ToggleSwitch.js
@@ -18,8 +18,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import classNames from "classnames";
-
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 // Controlled Toggle Switch element, written with Accessibility in mind
 const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 2b0123192c..a1816df71a 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 // TODO: Merge with ProfileSettings?
 export default class RoomProfileSettings extends React.Component {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b33e3daf77..5c12b027a4 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -21,7 +21,7 @@ import React from "react";
 import ReactDOM from "react-dom";
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
-import utils from "matrix-js-sdk/lib/utils";
+import * as utils from "matrix-js-sdk/src/utils";
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import rate_limited_func from "../../../ratelimitedfunc";
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js
index 51ef3a4302..261a832158 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {useCallback} from "react";
 import PropTypes from "prop-types";
 
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 import {_t} from "../../../languageHandler";
 import Modal from "../../../Modal";
 
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index e386b0fe0f..8d2c289b15 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -20,7 +20,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import {User} from "matrix-js-sdk";
 import { getHostingLink } from '../../../utils/HostingLink';
-import sdk from "../../../index";
+import * as sdk from "../../../index";
 
 export default class ProfileSettings extends React.Component {
     constructor() {
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 3022885701..71b0169788 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -17,11 +17,11 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
-import MatrixClientPeg from "../../../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import Pill from "../../../elements/Pill";
 import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../../../avatars/BaseAvatar";
-import { ContentRepo } from "matrix-js-sdk";
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -83,7 +83,7 @@ export default class BridgeSettingsTab extends React.Component {
 
         let networkIcon = null;
         if (networkName && network.avatar) {
-            const avatarUrl = ContentRepo.getHttpUriForMxc(
+            const avatarUrl = getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 network.avatar, 32, 32, "crop",
             );
@@ -99,7 +99,7 @@ export default class BridgeSettingsTab extends React.Component {
 
         let channelIcon = null;
         if (channel.avatar) {
-            const avatarUrl = ContentRepo.getHttpUriForMxc(
+            const avatarUrl = getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 channel.avatar, 32, 32, "crop",
             );
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index fb66b0a55f..547da0863b 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import _uniq from 'lodash/uniq';
-import {Room} from "matrix-js-sdk/lib/matrix";
+import {Room} from "matrix-js-sdk/src/matrix";
 
 /**
  * Class that takes a Matrix Client and flips the m.direct map

From 23eb6cbeb3a91c2d6dbbba1d3686faa26349b229 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 16:17:27 -0700
Subject: [PATCH 0296/3235] Upgrade Jest and babel-jest to match js-sdk

This also magically gets rid of a ton of errors
---
 package.json |    8 +-
 yarn.lock    | 1781 +++++++++++++++++++++-----------------------------
 2 files changed, 759 insertions(+), 1030 deletions(-)

diff --git a/package.json b/package.json
index d1603104b7..29567928f5 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "@babel/register": "^7.7.4",
     "@babel/runtime": "^7.7.6",
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.9.0",
     "chokidar": "^2.1.2",
     "concurrently": "^4.0.1",
     "enzyme": "^3.10.0",
@@ -137,7 +137,7 @@
     "estree-walker": "^0.5.0",
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
-    "jest": "^23.2.0",
+    "jest": "^24.9.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "react-test-renderer": "^16.9.0",
@@ -155,7 +155,9 @@
     "webpack-cli": "^3.1.1"
   },
   "jest": {
-    "testMatch": ["<rootDir>/test/**/*-test.js"],
+    "testMatch": [
+      "<rootDir>/test/**/*-test.js"
+    ],
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"
diff --git a/yarn.lock b/yarn.lock
index bb185e316f..49c559a612 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,7 +18,7 @@
   optionalDependencies:
     chokidar "^2.1.8"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
   integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
@@ -45,6 +45,26 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.1.0":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
+  integrity sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.7"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.7"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/core@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
@@ -65,6 +85,16 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.4.0", "@babel/generator@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
+  integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
+  dependencies:
+    "@babel/types" "^7.7.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
@@ -281,6 +311,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
   integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
 
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
+  integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==
+
 "@babel/parser@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
@@ -424,7 +459,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.7.4":
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
   integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
@@ -873,7 +908,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.7.4":
+"@babel/template@^7.4.0", "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
   integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
@@ -882,7 +917,7 @@
     "@babel/parser" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.7.4":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
   integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
@@ -897,7 +932,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.7.4":
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
   integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
@@ -906,6 +941,162 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
+"@jest/console@^24.7.1", "@jest/console@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
+  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+  dependencies:
+    "@jest/source-map" "^24.9.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/core@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4"
+  integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.9.0"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-resolve-dependencies "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    jest-watcher "^24.9.0"
+    micromatch "^3.1.10"
+    p-each-series "^1.0.0"
+    realpath-native "^1.1.0"
+    rimraf "^2.5.4"
+    slash "^2.0.0"
+    strip-ansi "^5.0.0"
+
+"@jest/environment@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
+  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
+  dependencies:
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+
+"@jest/fake-timers@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
+  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+
+"@jest/reporters@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43"
+  integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==
+  dependencies:
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.1"
+    istanbul-reports "^2.2.6"
+    jest-haste-map "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
+    node-notifier "^5.4.2"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+    string-length "^2.0.0"
+
+"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
+  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
+  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/test-sequencer@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"
+  integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==
+  dependencies:
+    "@jest/test-result" "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+
+"@jest/transform@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
+  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.9.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.15"
+    jest-haste-map "^24.9.0"
+    jest-regex-util "^24.9.0"
+    jest-util "^24.9.0"
+    micromatch "^3.1.10"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
+"@jest/types@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^13.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -919,6 +1110,39 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@types/babel__core@^7.1.0":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
+  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
+  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012"
+  integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -933,6 +1157,26 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+
+"@types/istanbul-lib-report@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
 "@types/json-schema@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -948,6 +1192,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
   integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
 
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
@@ -969,6 +1218,18 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
+"@types/yargs-parser@*":
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
+  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
+
+"@types/yargs@^13.0.0":
+  version "13.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.5.tgz#18121bfd39dc12f280cee58f92c5b21d32041908"
+  integrity sha512-CF/+sxTO7FOwbIRL4wMv0ZYLCRfMid2HQpzDRyViH7kSpfoAFiMdGqKIxb1PxWfjtQXQhnQuD33lvRHNwr809Q==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@typescript-eslint/experimental-utils@^2.5.0":
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
@@ -1262,16 +1523,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.1.0:
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1287,13 +1543,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
-  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
-  dependencies:
-    default-require-extensions "^1.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1314,19 +1563,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -1371,11 +1613,6 @@ array-uniq@^1.0.1, array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1456,7 +1693,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.1.4, async@^2.5.0:
+async@^2.5.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -1496,40 +1733,6 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
   integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
 
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.0.0, babel-core@^6.26.0:
-  version "6.26.3"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.1"
-    debug "^2.6.9"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.8"
-    slash "^1.0.0"
-    source-map "^0.5.7"
-
 babel-eslint@^10.0.3:
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
@@ -1542,42 +1745,18 @@ babel-eslint@^10.0.3:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+babel-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
+  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
   dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-jest@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
-  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
-  dependencies:
-    babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.2.0"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
-  dependencies:
-    babel-runtime "^6.22.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^5.1.0"
+    babel-preset-jest "^24.9.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
 
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
@@ -1586,48 +1765,32 @@ babel-plugin-dynamic-import-node@^2.3.0:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
-  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
+babel-plugin-istanbul@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
+  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
   dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.10.1"
-    test-exclude "^4.2.1"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    find-up "^3.0.0"
+    istanbul-lib-instrument "^3.3.0"
+    test-exclude "^5.2.3"
 
-babel-plugin-jest-hoist@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
-  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
-
-babel-plugin-syntax-object-rest-spread@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
-
-babel-preset-jest@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
-  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
+babel-plugin-jest-hoist@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
+  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
   dependencies:
-    babel-plugin-jest-hoist "^23.2.0"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    "@types/babel__traverse" "^7.0.6"
 
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+babel-preset-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
+  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
   dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^24.9.0"
 
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -1635,47 +1798,6 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 bail@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
@@ -1728,13 +1850,6 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
 bluebird@^2.9.27:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
@@ -1768,15 +1883,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2019,7 +2125,7 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -2029,12 +2135,12 @@ caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
   integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2060,17 +2166,6 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 character-entities-html4@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
@@ -2139,10 +2234,10 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -2327,7 +2422,7 @@ content-type@^1.0.2:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2369,11 +2464,6 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
   integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
 
-core-js@^2.5.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -2550,7 +2640,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2579,7 +2669,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2599,13 +2689,6 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-require-extensions@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
-  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
-  dependencies:
-    strip-bom "^2.0.0"
-
 define-properties@^1.1.2, define-properties@^1.1.3, define-properties@~1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2686,10 +2769,10 @@ diff-match-patch@^1.0.4:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
 diff@^4.0.1:
   version "4.0.1"
@@ -2997,7 +3080,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -3093,7 +3176,7 @@ escape-html@^1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3310,12 +3393,10 @@ except@^0.1.3:
   dependencies:
     indexof "0.0.1"
 
-exec-sh@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
-  dependencies:
-    merge "^1.2.0"
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -3342,13 +3423,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -3362,13 +3436,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
@@ -3389,17 +3456,17 @@ expect@^1.20.2:
     object-keys "^1.0.9"
     tmatch "^2.0.1"
 
-expect@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
-  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
+expect@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
+  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
   dependencies:
+    "@jest/types" "^24.9.0"
     ansi-styles "^3.2.0"
-    jest-diff "^23.6.0"
-    jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.9.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3430,13 +3497,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3563,40 +3623,11 @@ file-saver@^1.3.3:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fileset@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
 filesize@3.5.6:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
   integrity sha1-X9mPPqyU7JUW747VeC+thKAaCho=
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -3624,15 +3655,7 @@ find-up@4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -3768,14 +3791,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.3:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
-  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
 fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
@@ -3870,21 +3885,6 @@ gfm.css@^1.1.1:
   resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
   integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3914,7 +3914,7 @@ glob@^5.0.14:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3967,11 +3967,6 @@ globals@^11.1.0, globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-
 globby@^9.0.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -4008,10 +4003,10 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.0.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+handlebars@^4.1.2:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.6.0.tgz#33af6c3eda930d7a924f5d8f1c6d8edc3180512e"
+  integrity sha512-i1ZUP7Qp2JdkMaFon2a+b0m5geE8Z4ZTLaGkgrObkEd+OkUKyRbRWw4KxuFCoHfdETSY1yf9/574eVoNSiK7pw==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -4032,18 +4027,6 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -4139,14 +4122,6 @@ hoist-non-react-statics@^3.3.0:
   dependencies:
     react-is "^16.7.0"
 
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -4309,7 +4284,7 @@ import-lazy@^3.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc"
   integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==
 
-import-local@2.0.0:
+import-local@2.0.0, import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -4317,14 +4292,6 @@ import-local@2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
-import-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
-  dependencies:
-    pkg-dir "^2.0.0"
-    resolve-cwd "^2.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4515,12 +4482,12 @@ is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
-is-ci@^1.0.10:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
-    ci-info "^1.5.0"
+    ci-info "^2.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -4569,18 +4536,6 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-equal@^1.5.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.6.1.tgz#74fafde5060fcaf187041c05f11f0b9f020bb9b3"
@@ -4617,11 +4572,6 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -4644,23 +4594,16 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-fn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
-  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
   integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -4702,13 +4645,6 @@ is-number-object@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
   integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -4716,11 +4652,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -4738,16 +4669,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -4814,11 +4735,6 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-weakmap@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.0.tgz#88bd0b8ec3a5724477637d58ed96cb00552593fd"
@@ -4889,386 +4805,390 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^1.3.1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
-  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
-  dependencies:
-    async "^2.1.4"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.1"
-    istanbul-lib-hook "^1.2.2"
-    istanbul-lib-instrument "^1.10.2"
-    istanbul-lib-report "^1.1.5"
-    istanbul-lib-source-maps "^1.2.6"
-    istanbul-reports "^1.5.1"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
-    once "^1.4.0"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
-  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
-
-istanbul-lib-hook@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
-  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
+istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
   dependencies:
-    append-transform "^0.4.0"
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
 
-istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
-  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
+istanbul-lib-report@^2.0.4:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
   dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.1"
-    semver "^5.3.0"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
 
-istanbul-lib-report@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
-  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
+istanbul-lib-source-maps@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
-    istanbul-lib-coverage "^1.2.1"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
+    source-map "^0.6.1"
 
-istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
-  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
+istanbul-reports@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.1"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
+    handlebars "^4.1.2"
 
-istanbul-reports@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
-  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
-  dependencies:
-    handlebars "^4.0.3"
-
-jest-changed-files@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
-  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
+jest-changed-files@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
+  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
   dependencies:
+    "@jest/types" "^24.9.0"
+    execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
-  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
+jest-cli@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af"
+  integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==
   dependencies:
-    ansi-escapes "^3.0.0"
+    "@jest/core" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    import-local "^1.0.0"
-    is-ci "^1.0.10"
-    istanbul-api "^1.3.1"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.4.2"
-    jest-config "^23.6.0"
-    jest-environment-jsdom "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-haste-map "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.6.0"
-    jest-runner "^23.6.0"
-    jest-runtime "^23.6.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    jest-watcher "^23.4.0"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    node-notifier "^5.2.1"
-    prompts "^0.1.9"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^1.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^4.0.0"
-    which "^1.2.12"
-    yargs "^11.0.0"
+    import-local "^2.0.0"
+    is-ci "^2.0.0"
+    jest-config "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    prompts "^2.0.1"
+    realpath-native "^1.1.0"
+    yargs "^13.3.0"
 
-jest-config@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
-  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
+jest-config@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5"
+  integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==
   dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^23.6.0"
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    babel-jest "^24.9.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.4.0"
-    jest-environment-node "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.6.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    micromatch "^2.3.11"
-    pretty-format "^23.6.0"
+    jest-environment-jsdom "^24.9.0"
+    jest-environment-node "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    micromatch "^3.1.10"
+    pretty-format "^24.9.0"
+    realpath-native "^1.1.0"
 
-jest-diff@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
-  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
+jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
   dependencies:
     chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.6.0"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-docblock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
-  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
+jest-docblock@^24.3.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
+  integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
-  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
+jest-each@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"
+  integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==
   dependencies:
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
-    pretty-format "^23.6.0"
+    jest-get-type "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-environment-jsdom@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
-  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
+jest-environment-jsdom@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
+  integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==
   dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
-  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
+jest-environment-node@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3"
+  integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==
   dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
 
-jest-get-type@^22.1.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
-  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
+jest-get-type@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
+  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
 
-jest-haste-map@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
-  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
+jest-haste-map@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
+  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
   dependencies:
+    "@jest/types" "^24.9.0"
+    anymatch "^2.0.0"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.1.11"
+    graceful-fs "^4.1.15"
     invariant "^2.2.4"
-    jest-docblock "^23.2.0"
-    jest-serializer "^23.0.1"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    sane "^2.0.0"
+    jest-serializer "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.9.0"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
 
-jest-jasmine2@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
-  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
+jest-jasmine2@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
+  integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==
   dependencies:
-    babel-traverse "^6.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.6.0"
-    is-generator-fn "^1.0.0"
-    jest-diff "^23.6.0"
-    jest-each "^23.6.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    pretty-format "^23.6.0"
+    expect "^24.9.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
+    throat "^4.0.0"
 
-jest-leak-detector@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
-  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
+jest-leak-detector@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"
+  integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==
   dependencies:
-    pretty-format "^23.6.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-matcher-utils@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
-  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
+jest-matcher-utils@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.6.0"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-message-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
-  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
+jest-message-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
+  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
   dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/stack-utils" "^1.0.1"
     chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
-  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
-
-jest-regex-util@^23.3.0:
-  version "23.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
-  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
-
-jest-resolve-dependencies@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
-  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
+jest-mock@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
+  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
   dependencies:
-    jest-regex-util "^23.3.0"
-    jest-snapshot "^23.6.0"
+    "@jest/types" "^24.9.0"
 
-jest-resolve@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
-  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
+jest-pnp-resolver@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
+
+jest-regex-util@^24.3.0, jest-regex-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
+  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
+
+jest-resolve-dependencies@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
+  integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==
   dependencies:
+    "@jest/types" "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.9.0"
+
+jest-resolve@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321"
+  integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
+  dependencies:
+    "@jest/types" "^24.9.0"
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
-    realpath-native "^1.0.0"
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
 
-jest-runner@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
-  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
+jest-runner@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42"
+  integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==
   dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.4.2"
     exit "^0.1.2"
-    graceful-fs "^4.1.11"
-    jest-config "^23.6.0"
-    jest-docblock "^23.2.0"
-    jest-haste-map "^23.6.0"
-    jest-jasmine2 "^23.6.0"
-    jest-leak-detector "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-runtime "^23.6.0"
-    jest-util "^23.4.0"
-    jest-worker "^23.2.0"
+    graceful-fs "^4.1.15"
+    jest-config "^24.9.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-leak-detector "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
-  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
+jest-runtime@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"
+  integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==
   dependencies:
-    babel-core "^6.0.0"
-    babel-plugin-istanbul "^4.1.6"
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/yargs" "^13.0.0"
     chalk "^2.0.1"
-    convert-source-map "^1.4.0"
     exit "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-config "^23.6.0"
-    jest-haste-map "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.6.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    micromatch "^2.3.11"
-    realpath-native "^1.0.0"
-    slash "^1.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.1.0"
-    yargs "^11.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    strip-bom "^3.0.0"
+    yargs "^13.3.0"
 
-jest-serializer@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
-  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
+jest-serializer@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
+  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
 
-jest-snapshot@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
-  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
+jest-snapshot@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
+  integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
   dependencies:
-    babel-types "^6.0.0"
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
-    jest-diff "^23.6.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-resolve "^23.6.0"
+    expect "^24.9.0"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.6.0"
-    semver "^5.5.0"
+    pretty-format "^24.9.0"
+    semver "^6.2.0"
 
-jest-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
-  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
+jest-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
+  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
   dependencies:
-    callsites "^2.0.0"
+    "@jest/console" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/source-map" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    callsites "^3.0.0"
     chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^23.4.0"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
     mkdirp "^0.5.1"
-    slash "^1.0.0"
+    slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
-  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
+jest-validate@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
+  integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
   dependencies:
+    "@jest/types" "^24.9.0"
+    camelcase "^5.3.1"
     chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^23.6.0"
+    jest-get-type "^24.9.0"
+    leven "^3.1.0"
+    pretty-format "^24.9.0"
 
-jest-watcher@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
-  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+jest-watcher@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"
+  integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==
   dependencies:
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/yargs" "^13.0.0"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
+    jest-util "^24.9.0"
     string-length "^2.0.0"
 
-jest-worker@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
-  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
-  dependencies:
-    merge-stream "^1.0.1"
-
-jest-worker@^24.6.0:
+jest-worker@^24.6.0, jest-worker@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
   integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
@@ -5276,13 +5196,13 @@ jest-worker@^24.6.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest@^23.2.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
-  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
+jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
+  integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==
   dependencies:
-    import-local "^1.0.0"
-    jest-cli "^23.6.0"
+    import-local "^2.0.0"
+    jest-cli "^24.9.0"
 
 jquery@^3.3.1:
   version "3.4.1"
@@ -5299,12 +5219,7 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
+js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -5388,11 +5303,6 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -5449,10 +5359,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
-kleur@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
-  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 known-css-properties@^0.11.0:
   version "0.11.0"
@@ -5476,6 +5386,11 @@ leven@^2.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
   integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -5493,17 +5408,6 @@ linkifyjs@^2.1.6:
     react "^16.4.2"
     react-dom "^16.4.2"
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5741,11 +5645,6 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
   integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
 
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
 mathml-tag-names@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
@@ -5843,13 +5742,6 @@ meow@^5.0.0:
     trim-newlines "^2.0.0"
     yargs-parser "^10.0.0"
 
-merge-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5860,30 +5752,6 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -5943,7 +5811,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6179,7 +6047,7 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^5.2.1:
+node-notifier@^5.4.2:
   version "5.4.3"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
   integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
@@ -6231,7 +6099,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -6404,14 +6272,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -6492,7 +6352,7 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -6510,6 +6370,13 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -6555,6 +6422,11 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -6610,23 +6482,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6667,13 +6522,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6684,7 +6532,7 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
@@ -6699,20 +6547,11 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6741,11 +6580,6 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -6756,32 +6590,13 @@ pify@^4.0.0, pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pirates@^4.0.0:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -6936,20 +6751,17 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-pretty-format@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
-  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
+pretty-format@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
+  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
   dependencies:
-    ansi-regex "^3.0.0"
+    "@jest/types" "^24.9.0"
+    ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
+    react-is "^16.8.4"
 
-private@^0.1.6, private@^0.1.8:
+private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -6989,13 +6801,13 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prompts@^0.1.9:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
-  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
+prompts@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
+  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
   dependencies:
-    kleur "^2.0.1"
-    sisteransi "^0.1.1"
+    kleur "^3.0.3"
+    sisteransi "^1.0.3"
 
 prop-types-exact@^1.2.0:
   version "1.2.0"
@@ -7144,15 +6956,6 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -7236,7 +7039,7 @@ react-focus-lock@^2.2.1:
   dependencies:
     gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
-react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -7298,14 +7101,6 @@ react@^16.4.2, react@^16.9.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -7314,14 +7109,13 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
   dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
 
 read-pkg@^3.0.0:
   version "3.0.0"
@@ -7372,7 +7166,7 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realpath-native@^1.0.0:
+realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
   integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
@@ -7436,13 +7230,6 @@ regenerator-transform@^0.14.0:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -7548,7 +7335,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -7745,10 +7532,10 @@ rst-selector-parser@^2.2.3:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -7793,21 +7580,20 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^2.0.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
-  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
-    exec-sh "^0.2.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.2.3"
 
 sanitize-html@^1.18.4:
   version "1.20.1"
@@ -7852,7 +7638,7 @@ schema-utils@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.3.0:
+semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -7912,21 +7698,16 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-sisteransi@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
-  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
+sisteransi@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
+  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
 sjcl@^1.0.3:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a"
   integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -8016,13 +7797,6 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
@@ -8036,7 +7810,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -8318,18 +8092,11 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-bom@3.0.0, strip-bom@^3.0.0:
+strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -8454,18 +8221,6 @@ supports-color@6.1.0, supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -8547,16 +8302,15 @@ terser@^4.1.0, terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-test-exclude@^4.2.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
-  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
+test-exclude@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
   dependencies:
-    arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
+    require-main-filename "^2.0.0"
 
 text-encoding-utf-8@^1.0.1:
   version "1.0.2"
@@ -8615,11 +8369,6 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -9082,7 +8831,7 @@ walk@^2.3.9:
   dependencies:
     foreachasync "^3.0.0"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
@@ -9096,14 +8845,6 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
 watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -9248,7 +8989,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -9301,10 +9042,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.1.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+write-file-atomic@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9339,11 +9080,6 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
-
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -9369,7 +9105,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.1.0, yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
   integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -9377,13 +9113,6 @@ yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs@13.2.4:
   version "13.2.4"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
@@ -9401,24 +9130,6 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-yargs@^11.0.0:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
-  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^9.0.2"
-
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -9437,6 +9148,22 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
+yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"
+
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"

From 5f514329872cabd3d00cfca7640acca227c3f962 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:14:50 -0700
Subject: [PATCH 0297/3235] Convert babel config to a different babel config

This is needed because of https://github.com/facebook/jest/issues/6229
---
 .babelrc => babel.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename .babelrc => babel.config.js (97%)

diff --git a/.babelrc b/babel.config.js
similarity index 97%
rename from .babelrc
rename to babel.config.js
index f75a9f82ef..c83be72518 100644
--- a/.babelrc
+++ b/babel.config.js
@@ -1,4 +1,4 @@
-{
+module.exports = {
     "sourceMaps": "inline",
     "presets": [
         ["@babel/preset-env", {
@@ -23,4 +23,4 @@
         "@babel/plugin-syntax-dynamic-import",
         "@babel/plugin-transform-runtime"
     ]
-}
+};

From 0e8af15b9c944a6ea83c4c887055ec6ae36edfe2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:15:13 -0700
Subject: [PATCH 0298/3235] Add webcrypto dep back

Probably accidentally merge-conflicted out
---
 package.json |  1 +
 yarn.lock    | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 29567928f5..d6cb56b136 100644
--- a/package.json
+++ b/package.json
@@ -121,6 +121,7 @@
     "@babel/preset-typescript": "^7.7.4",
     "@babel/register": "^7.7.4",
     "@babel/runtime": "^7.7.6",
+    "@peculiar/webcrypto": "^1.0.22",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "chokidar": "^2.1.2",
diff --git a/yarn.lock b/yarn.lock
index 49c559a612..e7998243eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1110,6 +1110,33 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@peculiar/asn1-schema@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.3.tgz#e55ff9e98a1cf31832629aabacf85be3edf13a48"
+  integrity sha512-Tfgj9eNJ6cTKEtEuidKenLHMx/Q5M8KEE9hnohHqvdpqHJXWYr5RlT3GjAHPjGXy5+mr7sSfuXfzE6aAkEGN7A==
+  dependencies:
+    asn1js "^2.0.22"
+    tslib "^1.9.3"
+
+"@peculiar/json-schema@^1.1.6":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.9.tgz#b746e046b787607a1b2804f64437fda2527b3e62"
+  integrity sha512-F2ST2y/IQPgY+1QMw1Q33sqJbGDCeO3lGqI69SL3Hgo0++7iHqprUB1QyxB/A7bN3tuM65MBxoM2JLbwh42lsQ==
+  dependencies:
+    tslib "^1.10.0"
+
+"@peculiar/webcrypto@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.22.tgz#9dae652fce6bacd9df15bc91965797cee33adf67"
+  integrity sha512-NP6H6ZGXUvJnQJCWzUgnRcQv+9nMCNwLUDhTwOxRUwPFvtHauMOl0oPTKUjbhInCMaE55gJqB4yc0YKbde6Exw==
+  dependencies:
+    "@peculiar/asn1-schema" "^1.0.3"
+    "@peculiar/json-schema" "^1.1.6"
+    asn1js "^2.0.26"
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
+    webcrypto-core "^1.0.17"
+
 "@types/babel__core@^7.1.0":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
@@ -1660,6 +1687,13 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+asn1js@^2.0.22, asn1js@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251"
+  integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ==
+  dependencies:
+    pvutils latest
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -6894,6 +6928,18 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pvtsutils@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.9.tgz#0eb6106f27878ccaa55e7dfbf6bd2c75af461dee"
+  integrity sha512-/kDsuCKPqJuIzn37w6+iN+TiSrN+zrwPEd7FjT61oNbRvceGdsS94fMEWZ4/h6QZU5EZhBMiV+79IYedroP/Yw==
+  dependencies:
+    tslib "^1.10.0"
+
+pvutils@latest:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
+  integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
+
 qr.js@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
@@ -8447,7 +8493,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
   integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
@@ -8854,6 +8900,14 @@ watchpack@^1.6.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+webcrypto-core@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.17.tgz#a9354bc0b1ba6735e882f4137ede2c4366e6ad9b"
+  integrity sha512-7jxTLgtM+TahBPErx/Dd2XvxFDfWJrHxjVeTSvIa4LSgiYrmCPlC2INiAMAfb8MbtHiwJKKqF5sPS0AWNjBbXw==
+  dependencies:
+    pvtsutils "^1.0.9"
+    tslib "^1.10.0"
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"

From ffd037dfa8e390a1a18e47aebcab4b1e17f1da19 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:22:21 -0700
Subject: [PATCH 0299/3235] Fix resolution of files for Jest

---
 __mocks__/languages.json | 10 ++++++++++
 package.json             |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 __mocks__/languages.json

diff --git a/__mocks__/languages.json b/__mocks__/languages.json
new file mode 100644
index 0000000000..f62fe9b9b4
--- /dev/null
+++ b/__mocks__/languages.json
@@ -0,0 +1,10 @@
+{
+  "en": {
+    "fileName": "en_EN.json",
+    "label": "English"
+  },
+  "en-us": {
+    "fileName": "en_US.json",
+    "label": "English (US)"
+  }
+}
diff --git a/package.json b/package.json
index d6cb56b136..a2d042a6b8 100644
--- a/package.json
+++ b/package.json
@@ -161,7 +161,11 @@
     ],
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
     "moduleNameMapper": {
-      "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js"
-    }
+      "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
+      "\\$webapp/i18n/languages.json": "<rootDir>/__mocks__/languages.json"
+    },
+    "transformIgnorePatterns": [
+      "/node_modules/(?!matrix-js-sdk).+$"
+    ]
   }
 }

From 4dfbce31085adccd48079c766b6323d67494eb33 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:22:50 -0700
Subject: [PATCH 0300/3235] Fix languageHandler's use of $webapp languages.json
 for Jest

---
 src/languageHandler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 3a061df915..ddb7e2718c 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -419,9 +419,9 @@ export function pickBestLanguage(langs) {
 function getLangsJson() {
     return new Promise(async (resolve, reject) => {
         let url;
-        try {
+        if (typeof(webpackLangJsonUrl) === 'string') { // in Jest this 'url' isn't a URL, so just fall through
             url = webpackLangJsonUrl;
-        } catch (e) {
+        } else {
             url = i18nFolder + 'languages.json';
         }
         request(

From 54f3288dea791fb272cb7f18bba6c8d1bf7323e0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:23:27 -0700
Subject: [PATCH 0301/3235] Fix imports for tests

This doesn't fix the fact that someone called it "peg".
---
 test/components/views/messages/TextualBody-test.js | 2 +-
 test/components/views/rooms/RoomSettings-test.js   | 2 +-
 test/stores/RoomViewStore-test.js                  | 2 +-
 test/test-utils.js                                 | 5 ++---
 test/utils/permalinks/Permalinks-test.js           | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 7aeff94404..443aa7e121 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -21,7 +21,7 @@ import { configure, mount } from "enzyme";
 
 import sdk from "../../../skinned-sdk";
 import {mkEvent, mkStubRoom} from "../../../test-utils";
-import MatrixClientPeg from "../../../../src/MatrixClientPeg";
+import {MatrixClientPeg} from "../../../../src/MatrixClientPeg";
 import * as languageHandler from "../../../../src/languageHandler";
 
 const TextualBody = sdk.getComponent("views.messages.TextualBody");
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index a89508fe98..21d22a964c 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 import jest from 'jest-mock';
 import * as testUtils from '../../../test-utils';
 import sdk from '../../../skinned-sdk';
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 import SettingsStore from '../../../../src/settings/SettingsStore';
 
 
diff --git a/test/stores/RoomViewStore-test.js b/test/stores/RoomViewStore-test.js
index f227ae69ab..41252103e7 100644
--- a/test/stores/RoomViewStore-test.js
+++ b/test/stores/RoomViewStore-test.js
@@ -1,6 +1,6 @@
 import RoomViewStore from '../../src/stores/RoomViewStore';
 
-import peg from '../../src/MatrixClientPeg';
+import {MatrixClientPeg as peg} from '../../src/MatrixClientPeg';
 
 import * as testUtils from '../test-utils';
 
diff --git a/test/test-utils.js b/test/test-utils.js
index eadda2fa7e..fdd50a8792 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,14 +1,13 @@
 "use strict";
 
 import React from 'react';
-import peg from '../src/MatrixClientPeg';
+import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher';
-import jssdk from 'matrix-js-sdk';
 import {makeType} from "../src/utils/TypeUtils";
 import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';
 import MatrixClientContext from "../src/contexts/MatrixClientContext";
-const MatrixEvent = jssdk.MatrixEvent;
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 
 export function getRenderer() {
     // Old: ReactTestUtils.createRenderer();
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 05be3a6e5b..72cd66cb69 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import peg from '../../../src/MatrixClientPeg';
+import {MatrixClientPeg as peg} from '../../../src/MatrixClientPeg';
 import {
     makeGroupPermalink,
     makeRoomPermalink,

From 4bc5ada50e96d6d307dc70f29156962ef740af9b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:23:46 -0700
Subject: [PATCH 0302/3235] Fix test bootstrap for new skinning approach

---
 test/skinned-sdk.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
index 1ad361d59d..bc13d78815 100644
--- a/test/skinned-sdk.js
+++ b/test/skinned-sdk.js
@@ -9,16 +9,10 @@
  * app to provide
  */
 
-// for ES6 stuff like startsWith() and Object.values() that babel doesn't do by
-// default
-require('babel-polyfill');
+import * as sdk from "../src/index";
+import stubComponent from "./components/stub-component";
 
-const sdk = require("../src/index");
-
-const skin = require('../src/component-index.js');
-const stubComponent = require('./components/stub-component.js');
-
-const components = skin.components;
+const components = {};
 components['structures.LeftPanel'] = stubComponent();
 components['structures.RightPanel'] = stubComponent();
 components['structures.RoomDirectory'] = stubComponent();
@@ -31,6 +25,6 @@ components['views.messages.MessageTimestamp'] = stubComponent({displayName: 'Mes
 components['views.messages.SenderProfile'] = stubComponent({displayName: 'SenderProfile'});
 components['views.rooms.SearchBar'] = stubComponent();
 
-sdk.loadSkin(skin);
+sdk.loadSkin({components});
 
-module.exports = sdk;
+export default sdk;

From aa389461667396224701f17c0884ca0cd628287a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:24:13 -0700
Subject: [PATCH 0303/3235] Actually define some tests in TextualBody's test

Jest really wants you to do things the right way.
---
 .../views/messages/TextualBody-test.js        | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 443aa7e121..755751ffb7 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -33,7 +33,7 @@ describe("<TextualBody />", () => {
         MatrixClientPeg.matrixClient = null;
     });
 
-    describe("renders m.emote correctly", () => {
+    it("renders m.emote correctly", () => {
         MatrixClientPeg.matrixClient = {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
@@ -56,7 +56,7 @@ describe("<TextualBody />", () => {
         expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">winks</span>');
     });
 
-    describe("renders m.notice correctly", () => {
+    it("renders m.notice correctly", () => {
         MatrixClientPeg.matrixClient = {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
@@ -80,12 +80,14 @@ describe("<TextualBody />", () => {
     });
 
     describe("renders plain-text m.text correctly", () => {
-        MatrixClientPeg.matrixClient = {
-            getRoom: () => mkStubRoom("room_id"),
-            getAccountData: () => undefined,
-        };
+        beforeEach(() => {
+            MatrixClientPeg.matrixClient = {
+                getRoom: () => mkStubRoom("room_id"),
+                getAccountData: () => undefined,
+            };
+        });
 
-        describe("simple message renders as expected", () => {
+        it("simple message renders as expected", () => {
             const ev = mkEvent({
                 type: "m.room.message",
                 room: "room_id",
@@ -104,7 +106,7 @@ describe("<TextualBody />", () => {
         });
 
         // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test
-        describe("linkification get applied correctly into the DOM", () => {
+        it("linkification get applied correctly into the DOM", () => {
             const ev = mkEvent({
                 type: "m.room.message",
                 room: "room_id",
@@ -126,16 +128,18 @@ describe("<TextualBody />", () => {
     });
 
     describe("renders formatted m.text correctly", () => {
-        MatrixClientPeg.matrixClient = {
-            getRoom: () => mkStubRoom("room_id"),
-            getAccountData: () => undefined,
-            getUserId: () => "@me:my_server",
-            getHomeserverUrl: () => "https://my_server/",
-            on: () => undefined,
-            removeListener: () => undefined,
-        };
+        beforeEach(() => {
+            MatrixClientPeg.matrixClient = {
+                getRoom: () => mkStubRoom("room_id"),
+                getAccountData: () => undefined,
+                getUserId: () => "@me:my_server",
+                getHomeserverUrl: () => "https://my_server/",
+                on: () => undefined,
+                removeListener: () => undefined,
+            };
+        });
 
-        describe("italics, bold, underline and strikethrough render as expected", () => {
+        it("italics, bold, underline and strikethrough render as expected", () => {
             const ev = mkEvent({
                 type: "m.room.message",
                 room: "room_id",
@@ -156,7 +160,7 @@ describe("<TextualBody />", () => {
                 ev.getContent().formatted_body + '</span>');
         });
 
-        describe("spoilers get injected properly into the DOM", () => {
+        it("spoilers get injected properly into the DOM", () => {
             const ev = mkEvent({
                 type: "m.room.message",
                 room: "room_id",
@@ -182,7 +186,7 @@ describe("<TextualBody />", () => {
         });
 
         // If pills were rendered within a Portal/same shadow DOM then it'd be easier to test
-        describe("pills get injected correctly into the DOM", () => {
+        it("pills get injected correctly into the DOM", () => {
             const ev = mkEvent({
                 type: "m.room.message",
                 room: "room_id",
@@ -208,7 +212,7 @@ describe("<TextualBody />", () => {
         });
     });
 
-    describe("renders url previews correctly", () => {
+    it("renders url previews correctly", () => {
         languageHandler.setMissingEntryGenerator(key => key.split('|', 2)[1]);
 
         MatrixClientPeg.matrixClient = {

From d7dd67f69e7644130b28e914fd26f0f0359c7981 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:28:32 -0700
Subject: [PATCH 0304/3235] Remove subtly irrelevant package

---
 package.json |  1 -
 yarn.lock    | 56 ----------------------------------------------------
 2 files changed, 57 deletions(-)

diff --git a/package.json b/package.json
index a2d042a6b8..7abb9bcaaa 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,6 @@
     "stylelint": "^9.10.1",
     "stylelint-config-standard": "^18.2.0",
     "stylelint-scss": "^3.9.0",
-    "subtle": "^0.1.8",
     "tslint": "^5.20.1",
     "typescript": "^3.7.3",
     "walk": "^2.3.9",
diff --git a/yarn.lock b/yarn.lock
index e7998243eb..6655f9663e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1884,11 +1884,6 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-bluebird@^2.9.27:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
-
 bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2933,13 +2928,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-ecc-jsbn@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.0.1.tgz#970577ba31b4976fb1889a298cb7451d896c466d"
-  integrity sha1-lwV3ujG0l2+xiJopjLdFHYlsRm0=
-  dependencies:
-    jsbn "git+https://github.com/rynomad/jsbn.git"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2948,12 +2936,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-"ecc-qj@git+https://github.com/rynomad/ecc.git":
-  version "0.0.1"
-  resolved "git+https://github.com/rynomad/ecc.git#a8c599363dab87a5c95274338d863233f00f7c4a"
-  dependencies:
-    nan "^1.6.2"
-
 electron-to-chromium@^1.3.317, electron-to-chromium@^1.3.322:
   version "1.3.322"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
@@ -5261,10 +5243,6 @@ js-yaml@^3.13.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-"jsbn@git+https://github.com/rynomad/jsbn.git":
-  version "0.0.0"
-  resolved "git+https://github.com/rynomad/jsbn.git#bb522b0124f75424f89d49446c40a87111942c7b"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5958,11 +5936,6 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^1.6.2:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-1.9.0.tgz#1a9cd2755609766f5c291e4194fce39fde286515"
-  integrity sha1-GpzSdVYJdm9cKR5BlPzjn94oZRU=
-
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -6037,11 +6010,6 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-forge@^0.6.20:
-  version "0.6.49"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.49.tgz#f1ee95d5d74623938fe19d698aa5a26d54d2f60f"
-  integrity sha1-8e6V1ddGI5OP4Z1piqWibVTS9g8=
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -6655,13 +6623,6 @@ png-chunks-extract@^1.0.0:
   dependencies:
     crc-32 "^0.3.0"
 
-polyfill-promise@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/polyfill-promise/-/polyfill-promise-4.0.1.tgz#f8448dc27c3b967d5f67fc060f56ed64e2286b49"
-  integrity sha1-+ESNwnw7ln1fZ/wGD1btZOIoa0k=
-  dependencies:
-    bluebird "^2.9.27"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -7749,11 +7710,6 @@ sisteransi@^1.0.3:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
   integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
-sjcl@^1.0.3:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a"
-  integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -8241,18 +8197,6 @@ stylelint@^9.10.1:
     svg-tags "^1.0.0"
     table "^5.0.0"
 
-subtle@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/subtle/-/subtle-0.1.8.tgz#0c12599b9cf13127eda11626510cd8f24f878916"
-  integrity sha1-DBJZm5zxMSftoRYmUQzY8k+HiRY=
-  dependencies:
-    ecc-jsbn "0.0.1"
-    node-forge "^0.6.20"
-    polyfill-promise "^4.0.1"
-    sjcl "^1.0.3"
-  optionalDependencies:
-    ecc-qj "git+https://github.com/rynomad/ecc.git"
-
 sugarss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"

From 4b65cdf3f2c2ea42179ce4d38b70a44b218b3fd9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:40:57 -0700
Subject: [PATCH 0305/3235] Regenerate i18n

Apparently we need to do this.
---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4311733b51..b2d4c61579 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1249,6 +1249,7 @@
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
     "collapse": "collapse",
     "expand": "expand",
+    "Communities": "Communities",
     "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Rotate Left": "Rotate Left",
@@ -1766,7 +1767,6 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
     "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.": "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": "Error whilst fetching joined communities",
-    "Communities": "Communities",
     "Create a new community": "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.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
     "You have no visible notifications": "You have no visible notifications",

From 9f04f94c65843f66eb6187442c39a2d5eaeab01e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Jan 2020 17:55:57 -0700
Subject: [PATCH 0306/3235] Enable e2e and Riot tests, removing Karma

---
 .buildkite/pipeline.yaml | 115 +++++++++++++++------------------------
 1 file changed, 44 insertions(+), 71 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index f1b436338a..e5ee817934 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -54,77 +54,50 @@ steps:
       - docker#v3.0.1:
           image: "node:12"
 
-#  - label: ":chains: End-to-End Tests"
-#    agents:
-#      # We use a xlarge sized instance instead of the normal small ones because
-#      # e2e tests otherwise take +-8min
-#      queue: "xlarge"
-#    command:
-#      # TODO: Remove hacky chmod for BuildKite
-#      - "echo '--- Setup'"
-#      - "chmod +x ./scripts/ci/*.sh"
-#      - "chmod +x ./scripts/*"
-#      - "echo '--- Install js-sdk'"
-#      - "./scripts/ci/install-deps.sh"
-#      - "./scripts/ci/end-to-end-tests.sh"
-#    plugins:
-#      - docker#v3.0.1:
-#          image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
-#          propagate-environment: true
-#
-#  - label: ":karma: Tests"
-#    agents:
-#      # We use a medium sized instance instead of the normal small ones because
-#      # webpack loves to gorge itself on resources.
-#      queue: "medium"
-#    command:
-#      # Install chrome
-#      - "echo '--- Installing Chrome'"
-#      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-#      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-#      - "apt-get update"
-#      - "apt-get install -y google-chrome-stable"
-#      # Run tests
-#      # TODO: Remove hacky chmod for BuildKite
-#      - "chmod +x ./scripts/ci/*.sh"
-#      - "chmod +x ./scripts/*"
-#      - "echo '--- Installing Dependencies'"
-#      - "./scripts/ci/install-deps.sh"
-#      - "echo '+++ Running Tests'"
-#      - "./scripts/ci/unit-tests.sh"
-#    env:
-#      CHROME_BIN: "/usr/bin/google-chrome-stable"
-#    plugins:
-#      - docker#v3.0.1:
-#          image: "node:10"
-#          propagate-environment: true
-#
-#  - label: "🔧 Riot Tests"
-#    agents:
-#      # We use a medium sized instance instead of the normal small ones because
-#      # webpack loves to gorge itself on resources.
-#      queue: "medium"
-#    command:
-#      # Install chrome
-#      - "echo '--- Installing Chrome'"
-#      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-#      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-#      - "apt-get update"
-#      - "apt-get install -y google-chrome-stable"
-#      # Run tests
-#      # TODO: Remove hacky chmod for BuildKite
-#      - "chmod +x ./scripts/ci/*.sh"
-#      - "chmod +x ./scripts/*"
-#      - "echo '--- Installing Dependencies'"
-#      - "./scripts/ci/install-deps.sh"
-#      - "echo '+++ Running Tests'"
-#      - "./scripts/ci/riot-unit-tests.sh"
-#    env:
-#      CHROME_BIN: "/usr/bin/google-chrome-stable"
-#    plugins:
-#      - docker#v3.0.1:
-#          image: "node:10"
-#          propagate-environment: true
+  - label: ":chains: End-to-End Tests"
+    agents:
+      # We use a xlarge sized instance instead of the normal small ones because
+      # e2e tests otherwise take +-8min
+      queue: "xlarge"
+    command:
+      # TODO: Remove hacky chmod for BuildKite
+      - "echo '--- Setup'"
+      - "chmod +x ./scripts/ci/*.sh"
+      - "chmod +x ./scripts/*"
+      - "echo '--- Install js-sdk'"
+      - "./scripts/ci/install-deps.sh"
+      - "./scripts/ci/end-to-end-tests.sh"
+    plugins:
+      - docker#v3.0.1:
+          image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
+          propagate-environment: true
+
+  - label: "🔧 Riot Tests"
+    agents:
+      # We use a medium sized instance instead of the normal small ones because
+      # webpack loves to gorge itself on resources.
+      queue: "medium"
+    command:
+      # Install chrome
+      - "echo '--- Installing Chrome'"
+      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
+      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
+      - "apt-get update"
+      - "apt-get install -y google-chrome-stable"
+      # Run tests
+      # TODO: Remove hacky chmod for BuildKite
+      - "chmod +x ./scripts/ci/*.sh"
+      - "chmod +x ./scripts/*"
+      - "echo '--- Installing Dependencies'"
+      - "./scripts/ci/install-deps.sh"
+      - "echo '+++ Running Tests'"
+      - "./scripts/ci/riot-unit-tests.sh"
+    env:
+      CHROME_BIN: "/usr/bin/google-chrome-stable"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:10"
+          propagate-environment: true
 
   - label: "🌐 i18n"
     command:

From 6cf5b3f1a23774e4946875efeb8d7e62265e7cfb Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Thu, 9 Jan 2020 21:56:17 -0600
Subject: [PATCH 0307/3235] =?UTF-8?q?Emoji=20verification:=20Change=20name?=
 =?UTF-8?q?=20of=20=F0=9F=94=92=20to=20lock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index e7846a0199..ca2eab3e17 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -140,7 +140,7 @@ _td("Book");
 _td("Pencil");
 _td("Paperclip");
 _td("Scissors");
-_td("Padlock");
+_td("Lock");
 _td("Key");
 _td("Hammer");
 _td("Telephone");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4311733b51..cce86878c2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -480,7 +480,7 @@
     "Pencil": "Pencil",
     "Paperclip": "Paperclip",
     "Scissors": "Scissors",
-    "Padlock": "Padlock",
+    "Lock": "Lock",
     "Key": "Key",
     "Hammer": "Hammer",
     "Telephone": "Telephone",

From 63942d5200d5cf2103a9ae3114d581bfd607dc47 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 10 Jan 2020 11:12:52 +0000
Subject: [PATCH 0308/3235] Fix listener leak on RoomView

It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
---
 src/components/structures/RoomView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c552e2f8f5..a717f485f0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -485,6 +485,7 @@ module.exports = createReactClass({
             MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             MatrixClientPeg.get().removeListener("Room.accountData", this.onRoomAccountData);
+            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
             MatrixClientPeg.get().removeListener("Room.myMembership", this.onMyMembership);
             MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);

From 8f292eb6a45b12019f253cf8f2c0e57dce33c1ea Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 10 Jan 2020 03:05:44 +0000
Subject: [PATCH 0309/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2000 of 2000 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d58f37b37a..9401bb4a65 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2034,5 +2034,7 @@
     "Connected via %(protocolName)s": "透過 %(protocolName)s 連線",
     "Bridge Info": "橋接資訊",
     "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。",
-    "Suggestions": "建議"
+    "Suggestions": "建議",
+    "Failed to find the following users": "找不到以下使用者",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s"
 }

From a02ecca775201995b7ee90a4f2e76a0a6fe38725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 10 Jan 2020 06:44:11 +0000
Subject: [PATCH 0310/3235] Translated using Weblate (French)

Currently translated at 100.0% (2000 of 2000 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 7261f62f3a..d526c53430 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2034,5 +2034,7 @@
     "Connected via %(protocolName)s": "Connecté via %(protocolName)s",
     "Bridge Info": "Informations de la passerelle",
     "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon.",
-    "Suggestions": "Suggestions"
+    "Suggestions": "Suggestions",
+    "Failed to find the following users": "Impossible de trouver les utilisateurs suivants",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s"
 }

From abf4a88c662f73dab291f2d3db5294b93ebd4e2d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 10 Jan 2020 08:43:51 +0000
Subject: [PATCH 0311/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2000 of 2000 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 10da7537a9..68af34ae2d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2035,5 +2035,7 @@
     "Connected via %(protocolName)s": "Ezzel a protokollal csatlakozva: %(protocolName)s",
     "Bridge Info": "Híd információ",
     "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról.",
-    "Suggestions": "Javaslatok"
+    "Suggestions": "Javaslatok",
+    "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s"
 }

From 7f116c1bede5d943adebb13b000f001cacd26ab7 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 9 Jan 2020 22:03:28 +0000
Subject: [PATCH 0312/3235] Translated using Weblate (Lithuanian)

Currently translated at 47.2% (944 of 2000 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 | 50 ++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index e8e62922af..71b46d67f3 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -59,7 +59,7 @@
     "You have successfully set a password!": "Jūs sėkmingai įrašėte slaptažodį!",
     "Favourite": "Svarbūs",
     "All Rooms": "Visi pokalbių kambariai",
-    "Explore Room State": "Peržiūrėti pokalbių kambario būseną",
+    "Explore Room State": "Peržiūrėti kambario būseną",
     "Source URL": "Šaltinio URL adresas",
     "Messages sent by bot": "Roboto siunčiamos žinutės",
     "Cancel": "Atšaukti",
@@ -303,7 +303,7 @@
     "Failed to mute user": "Nepavyko nutildyti naudotoją",
     "Are you sure?": "Ar tikrai?",
     "Devices": "Įrenginiai",
-    "Ignore": "Nepaisyti",
+    "Ignore": "Ignoruoti",
     "Invite": "Pakviesti",
     "User Options": "Naudotojo parametrai",
     "Admin Tools": "Administratoriaus įrankiai",
@@ -332,7 +332,7 @@
     "Settings": "Nustatymai",
     "Community Invites": "Bendruomenės pakvietimai",
     "People": "Žmonės",
-    "%(roomName)s does not exist.": "%(roomName)s nėra.",
+    "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s šiuo metu nėra pasiekiamas.",
     "Muted Users": "Nutildyti naudotojai",
     "Click here to fix": "Spustelėkite čia, norėdami pataisyti",
@@ -568,7 +568,7 @@
     "Confirm password": "Pakartokite slaptažodį",
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
-    "Share Link to User": "Bendrinti nuorodą su naudotoju",
+    "Share Link to User": "Dalintis nuoroda į naudotoją",
     "Direct chats": "Tiesioginiai pokalbiai",
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
     "Jump to message": "Pereiti prie žinutės",
@@ -644,7 +644,7 @@
     "Enable widget screenshots on supported widgets": "Palaikomuose valdikliuose įjungti valdiklių ekrano kopijas",
     "Export E2E room keys": "Eksportuoti E2E kambario raktus",
     "Last seen": "Paskutinį kartą matytas",
-    "Unignore": "Nustoti nepaisyti",
+    "Unignore": "Nebeignoruoti",
     "and %(count)s others...|other": "ir %(count)s kitų...",
     "and %(count)s others...|one": "ir dar vienas...",
     "Mention": "Paminėti",
@@ -807,7 +807,7 @@
     "Whether or not you're logged in (we don't record your username)": "Nepriklausomai nuo to ar jūs prisijungę (mes neįrašome jūsų vartotojo vardo)",
     "Chat with Riot Bot": "Kalbėtis su Riot botu",
     "Sign In": "Prisijungti",
-    "Explore rooms": "Peržiūrėti kambarius",
+    "Explore rooms": "Žvalgyti kambarius",
     "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
     "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo paskyros %(serverName)s serveryje",
     "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
@@ -926,5 +926,41 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupuoti ir filtruoti kambarius pagal pasirinktines žymas (atnaujinkite, kad pritaikytumėte pakeitimus)",
     "Render simple counters in room header": "Užkrauti paprastus skaitiklius kambario antraštėje",
     "Multiple integration managers": "Daugialypiai integracijų valdikliai",
-    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)"
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Show info about bridges in room settings": "Rodyti informaciją apie tiltus kambario nustatymuose",
+    "General": "Bendrieji",
+    "Remove recent messages by %(user)s": "Pašalinti paskutines %(user)s žinutes",
+    "Jump to read receipt": "Nušokti iki perskaitytų žinučių",
+    "Remove recent messages": "Pašalinti paskutines žinutes",
+    "You can still join it because this is a public room.": "Jūs vis tiek galite prie jo prisijungti, nes tai yra viešas kambarys.",
+    "Do you want to chat with %(user)s?": "Ar jūs norite kalbėtis su %(user)s?",
+    "<userName/> wants to chat": "<userName/> nori kalbėtis",
+    "Start chatting": "Pradėti kalbėtis",
+    "Do you want to join %(roomName)s?": "Ar jūs norite prisijungti prie %(roomName)s?",
+    "<userName/> invited you": "<userName/> jus pakvietė",
+    "You're previewing %(roomName)s. Want to join it?": "Jūs peržiūrite %(roomName)s. Norite prie jo prisijungti?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s negali būti peržiūrėtas. Ar jūs norite prie jo prisijungti?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Šis kambarys neegzistuoja. Ar jūs tikras, kad esate tinkamoje vietoje?",
+    "Create a public room": "Sukurti viešą kambarį",
+    "Make this room public": "Padaryti šį kambarį viešu",
+    "Room Settings - %(roomName)s": "Kambario nustatymai - %(roomName)s",
+    "Upgrade public room": "Atnaujinti viešą kambarį",
+    "Upload files (%(current)s of %(total)s)": "Įkelti failus (%(current)s iš %(total)s)",
+    "Upload files": "Įkelti failus",
+    "Upload all": "Įkelti visus",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Šis failas yra <b>per didelis</b> įkėlimui. Failų dydžio limitas yra %(limit)s, bet šis failas užima %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Šie failai yra <b>per dideli</b> įkėlimui. Failų dydžio limitas yra %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Kai kurie failai yra <b>per dideli</b> įkėlimui. Failų dydžio limitas yra %(limit)s.",
+    "Upload %(count)s other files|other": "Įkelti %(count)s kitus failus",
+    "Upload %(count)s other files|one": "Įkelti %(count)s kitą failą",
+    "Cancel All": "Atšaukti visus",
+    "Upload Error": "Įkėlimo klaida",
+    "Explore": "Žvalgyti",
+    "Filter": "Filtruoti",
+    "Filter rooms…": "Filtruoti kambarius…",
+    "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prie jo vėl prisijungti be pakvietimo.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite palikti kambarį %(roomName)s?",
+    "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
+    "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
+    "General failure": "Bendras triktis"
 }

From cb250c9b1024f12e260b1156f2e14efa584b5efc Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 13:09:16 +0000
Subject: [PATCH 0313/3235] Use existing available props data to determine
 whether a room is encrypted, thereby allowing a state update to properly
 rerender the tile

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

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index b9e1abd23d..ce0375e088 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -303,7 +303,7 @@ module.exports = createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-            'mx_RoomTile_isEncrypted': MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId),
+            'mx_RoomTile_isEncrypted': Boolean(this.props.room.currentState.getStateEvents("m.room.encryption", "")),
         });
 
         const avatarClasses = classNames({

From 5551b207c1b50abb52a31692d726c456a429a9e3 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 16:33:08 +0000
Subject: [PATCH 0314/3235] Actually, this task was about join rules, not
 encryption ones. Oops.

---
 res/css/views/rooms/_RoomTile.scss     |  4 ++--
 src/components/views/rooms/RoomTile.js | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 5c37492383..cb1137bb2f 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -201,12 +201,12 @@ limitations under the License.
     flex: 1;
 }
 
-.mx_RoomTile.mx_RoomTile.mx_RoomTile_isEncrypted .mx_RoomTile_name {
+.mx_RoomTile.mx_RoomTile.mx_RoomTile_isPrivate .mx_RoomTile_name {
     // Scoot the padding in a bit from 6px to make it look better
     padding-left: 3px;
 }
 
-.mx_RoomTile.mx_RoomTile_isEncrypted .mx_RoomTile_E2EIcon {
+.mx_RoomTile.mx_RoomTile_isPrivate .mx_RoomTile_PrivateIcon {
     width: 12px;
     height: 12px;
     position: relative;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ce0375e088..35b5d2fea5 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -56,7 +56,10 @@ module.exports = createReactClass({
     },
 
     getInitialState: function() {
+        const { event: { content: { join_rule } } } = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+
         return ({
+            join_rule,
             hover: false,
             badgeHover: false,
             contextMenuPosition: null, // DOM bounding box, null if non-shown
@@ -104,6 +107,14 @@ module.exports = createReactClass({
         });
     },
 
+    onJoinRule: function(ev) {
+        const { event: { type, room_id } } = ev;
+        if (type !== "m.room.join_rules") return;
+        if (room_id !== this.props.room.roomId) return;
+        const { event: { content: { join_rule } } } = ev;
+        this.setState({ join_rule });
+    },
+
     onAccountData: function(accountDataEvent) {
         if (accountDataEvent.getType() === 'm.push_rules') {
             this.setState({
@@ -143,6 +154,7 @@ module.exports = createReactClass({
         const cli = MatrixClientPeg.get();
         cli.on("accountData", this.onAccountData);
         cli.on("Room.name", this.onRoomName);
+        cli.on("RoomState.events", this.onJoinRule);
         ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
         this.dispatcherRef = dis.register(this.onAction);
 
@@ -159,6 +171,7 @@ module.exports = createReactClass({
         if (cli) {
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
+            cli.removeListener("RoomState.events", this.onJoinRule);
         }
         ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
         dis.unregister(this.dispatcherRef);
@@ -303,7 +316,7 @@ module.exports = createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-            'mx_RoomTile_isEncrypted': Boolean(this.props.room.currentState.getStateEvents("m.room.encryption", "")),
+            'mx_RoomTile_isPrivate': this.state.join_rule == "invite",
         });
 
         const avatarClasses = classNames({
@@ -429,7 +442,7 @@ module.exports = createReactClass({
                         { dmIndicator }
                     </div>
                 </div>
-                <div className="mx_RoomTile_E2EIcon" />
+                <div className="mx_RoomTile_PrivateIcon" />
                 <div className="mx_RoomTile_nameContainer">
                     <div className="mx_RoomTile_labelContainer">
                         { label }

From 808785c2f89dec842e727601ebc5dd5624eb21c1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 16:43:36 +0000
Subject: [PATCH 0315/3235] lint

---
 src/components/views/rooms/RoomTile.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 35b5d2fea5..09918ace3d 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -56,7 +56,9 @@ module.exports = createReactClass({
     },
 
     getInitialState: function() {
-        const { event: { content: { join_rule } } } = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+         // eslint-disable-next-line camelcase
+        const { event: { content: { join_rule } } } =
+          this.props.room.currentState.getStateEvents("m.room.join_rules", "");
 
         return ({
             join_rule,
@@ -108,11 +110,13 @@ module.exports = createReactClass({
     },
 
     onJoinRule: function(ev) {
+        /* eslint-disable camelcase */
         const { event: { type, room_id } } = ev;
         if (type !== "m.room.join_rules") return;
         if (room_id !== this.props.room.roomId) return;
         const { event: { content: { join_rule } } } = ev;
         this.setState({ join_rule });
+        /* eslint-enable camelcase */
     },
 
     onAccountData: function(accountDataEvent) {

From df1fd4db72583c891a6850e1c19a0c87119d8ad2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 16:49:07 +0000
Subject: [PATCH 0316/3235] suppress private icon if the room is a DM

---
 src/components/views/rooms/RoomTile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 09918ace3d..16fff4fc97 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -309,6 +309,8 @@ module.exports = createReactClass({
 
         const isMenuDisplayed = Boolean(this.state.contextMenuPosition);
 
+        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+
         const classes = classNames({
             'mx_RoomTile': true,
             'mx_RoomTile_selected': this.state.selected,
@@ -320,7 +322,7 @@ module.exports = createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-            'mx_RoomTile_isPrivate': this.state.join_rule == "invite",
+            'mx_RoomTile_isPrivate': this.state.join_rule == "invite" && !dmUserId,
         });
 
         const avatarClasses = classNames({
@@ -384,8 +386,6 @@ module.exports = createReactClass({
 
         let ariaLabel = name;
 
-        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-
         let dmIndicator;
         let dmOnline;
         if (dmUserId) {

From e66f2a6c3ff76c434c5e9490a2f8aec4271cff47 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 10 Jan 2020 10:13:41 -0700
Subject: [PATCH 0317/3235] Revert ES6ification of end-to-end tests and add
 instructions for Windows

Because the tests are run directly by node, we have to use the CommonJS module syntax. We could run the thing through babel, but then we just have another babel.

Windows instructions are from experience and may not be optimized.
---
 test/end-to-end-tests/Windows.md              | 39 +++++++++++++++++++
 test/end-to-end-tests/src/logbuffer.js        |  2 +-
 test/end-to-end-tests/src/logger.js           |  2 +-
 test/end-to-end-tests/src/rest/consent.js     |  4 +-
 test/end-to-end-tests/src/rest/creator.js     | 14 +++----
 test/end-to-end-tests/src/rest/multi.js       |  2 +-
 test/end-to-end-tests/src/rest/room.js        |  2 +-
 test/end-to-end-tests/src/rest/session.js     |  2 +-
 .../src/scenarios/directory.js                |  2 +-
 .../src/scenarios/e2e-encryption.js           |  2 +-
 .../src/scenarios/lazy-loading.js             |  2 +-
 test/end-to-end-tests/src/session.js          |  2 +-
 .../src/usecases/accept-invite.js             |  4 +-
 .../src/usecases/create-room.js               |  6 ++-
 test/end-to-end-tests/src/usecases/dialog.js  | 12 ++++--
 test/end-to-end-tests/src/usecases/invite.js  |  2 +-
 test/end-to-end-tests/src/usecases/join.js    |  2 +-
 .../src/usecases/memberlist.js                | 12 ++++--
 .../src/usecases/room-settings.js             |  2 +-
 .../end-to-end-tests/src/usecases/settings.js |  8 ++--
 test/end-to-end-tests/src/usecases/signup.js  |  2 +-
 .../end-to-end-tests/src/usecases/timeline.js | 14 +++----
 test/end-to-end-tests/src/usecases/verify.js  |  8 ++--
 test/end-to-end-tests/src/util.js             |  8 ++--
 24 files changed, 103 insertions(+), 52 deletions(-)
 create mode 100644 test/end-to-end-tests/Windows.md

diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
new file mode 100644
index 0000000000..dee4fabb3f
--- /dev/null
+++ b/test/end-to-end-tests/Windows.md
@@ -0,0 +1,39 @@
+# Running the end-to-end tests on Windows
+
+Windows is not the best platform to run the tests on, but if you have to, enable Windows Subsystem for Linux (WSL)
+and start following these steps to get going:
+
+1. Navigate to your working directory (`cd /mnt/c/users/travisr/whatever/matrix-react-sdk` for example).
+2. Run `sudo apt-get install unzip python3 virtualenv dos2unix`
+3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/riot/*.sh`
+4. Install NodeJS for ubuntu: 
+   ```bash
+   curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+   sudo apt-get update
+   sudo apt-get install nodejs
+   ```
+5. Start Riot on Windows through `yarn start`
+6. While that builds... Run:
+   ```bash
+   sudo apt-get install x11-apps
+   wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+   sudo dpkg -i google-chrome-stable_current_amd64.deb
+   sudo apt -f install
+   ```
+7. Run: 
+   ```bash
+   cd ./test/end-to-end-tests
+   ./synapse/install.sh
+   ./run.sh --riot-url http://localhost:8080 --no-sandbox
+   ```
+
+Note that using `yarn test:e2e` probably won't work for you. You might also have to use the config.json from the
+`riot/config-template` directory in order to actually succeed at the tests.
+
+Also note that you'll have to use `--no-sandbox` otherwise Chrome will complain that there's no sandbox available. You
+could probably fix this with enough effort, or you could run a headless Chrome in the WSL container without a sandbox.
+
+
+Reference material that isn't fully represented in the steps above (but snippets have been borrowed):
+* https://virtualizationreview.com/articles/2017/02/08/graphical-programs-on-windows-subsystem-on-linux.aspx
+* https://gist.github.com/drexler/d70ab957f964dbef1153d46bd853c775
diff --git a/test/end-to-end-tests/src/logbuffer.js b/test/end-to-end-tests/src/logbuffer.js
index db4be33e8d..873363c2ec 100644
--- a/test/end-to-end-tests/src/logbuffer.js
+++ b/test/end-to-end-tests/src/logbuffer.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export default class LogBuffer {
+module.exports = class LogBuffer {
     constructor(page, eventName, eventMapper, reduceAsync=false, initialValue = "") {
         this.buffer = initialValue;
         page.on(eventName, (arg) => {
diff --git a/test/end-to-end-tests/src/logger.js b/test/end-to-end-tests/src/logger.js
index 42a9544e4d..f5a338e2c7 100644
--- a/test/end-to-end-tests/src/logger.js
+++ b/test/end-to-end-tests/src/logger.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export default class Logger {
+module.exports = class Logger {
     constructor(username) {
         this.indent = 0;
         this.username = username;
diff --git a/test/end-to-end-tests/src/rest/consent.js b/test/end-to-end-tests/src/rest/consent.js
index 5c424cd6e8..956441571b 100644
--- a/test/end-to-end-tests/src/rest/consent.js
+++ b/test/end-to-end-tests/src/rest/consent.js
@@ -19,7 +19,7 @@ const request = require('request-promise-native');
 const cheerio = require('cheerio');
 const url = require("url");
 
-export async function approveConsent(consentUrl) {
+module.exports.approveConsent = async function(consentUrl) {
     const body = await request.get(consentUrl);
     const doc = cheerio.load(body);
     const v = doc("input[name=v]").val();
@@ -28,4 +28,4 @@ export async function approveConsent(consentUrl) {
     const formAction = doc("form").attr("action");
     const absAction = url.resolve(consentUrl, formAction);
     await request.post(absAction).form({v, u, h});
-}
+};
diff --git a/test/end-to-end-tests/src/rest/creator.js b/test/end-to-end-tests/src/rest/creator.js
index c4ddee0581..03b2e099bc 100644
--- a/test/end-to-end-tests/src/rest/creator.js
+++ b/test/end-to-end-tests/src/rest/creator.js
@@ -32,7 +32,7 @@ function execAsync(command, options) {
     });
 }
 
-export default class RestSessionCreator {
+module.exports = class RestSessionCreator {
     constructor(synapseSubdir, hsUrl, cwd) {
         this.synapseSubdir = synapseSubdir;
         this.hsUrl = hsUrl;
@@ -72,12 +72,12 @@ export default class RestSessionCreator {
 
     async _authenticate(username, password) {
         const requestBody = {
-          "type": "m.login.password",
-          "identifier": {
-            "type": "m.id.user",
-            "user": username,
-          },
-          "password": password,
+            "type": "m.login.password",
+            "identifier": {
+                "type": "m.id.user",
+                "user": username,
+            },
+            "password": password,
         };
         const url = `${this.hsUrl}/_matrix/client/r0/login`;
         const responseBody = await request.post({url, json: true, body: requestBody});
diff --git a/test/end-to-end-tests/src/rest/multi.js b/test/end-to-end-tests/src/rest/multi.js
index d4cd5c765c..570879bff7 100644
--- a/test/end-to-end-tests/src/rest/multi.js
+++ b/test/end-to-end-tests/src/rest/multi.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const Logger = require('../logger');
 
-export default class RestMultiSession {
+module.exports = class RestMultiSession {
     constructor(sessions, groupName) {
         this.log = new Logger(groupName);
         this.sessions = sessions;
diff --git a/test/end-to-end-tests/src/rest/room.js b/test/end-to-end-tests/src/rest/room.js
index b3ba725336..94afce1dac 100644
--- a/test/end-to-end-tests/src/rest/room.js
+++ b/test/end-to-end-tests/src/rest/room.js
@@ -18,7 +18,7 @@ limitations under the License.
 const uuidv4 = require('uuid/v4');
 
 /* no pun intented */
-export default class RestRoom {
+module.exports = class RestRoom {
     constructor(session, roomId, log) {
         this.session = session;
         this._roomId = roomId;
diff --git a/test/end-to-end-tests/src/rest/session.js b/test/end-to-end-tests/src/rest/session.js
index 344493968c..5b97824f5c 100644
--- a/test/end-to-end-tests/src/rest/session.js
+++ b/test/end-to-end-tests/src/rest/session.js
@@ -19,7 +19,7 @@ const Logger = require('../logger');
 const RestRoom = require('./room');
 const {approveConsent} = require('./consent');
 
-export default class RestSession {
+module.exports = class RestSession {
     constructor(credentials) {
         this.log = new Logger(credentials.userId);
         this._credentials = credentials;
diff --git a/test/end-to-end-tests/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
index cf995ae1a8..ca2f99f192 100644
--- a/test/end-to-end-tests/src/scenarios/directory.js
+++ b/test/end-to-end-tests/src/scenarios/directory.js
@@ -22,7 +22,7 @@ const {receiveMessage} = require('../usecases/timeline');
 const {createRoom} = require('../usecases/create-room');
 const changeRoomSettings = require('../usecases/room-settings');
 
-export default async function roomDirectoryScenarios(alice, bob) {
+module.exports = async function roomDirectoryScenarios(alice, bob) {
     console.log(" creating a public room and join through directory:");
     const room = 'test';
     await createRoom(alice, room);
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 2a002da66b..2f08acf417 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -24,7 +24,7 @@ const changeRoomSettings = require('../usecases/room-settings');
 const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
 const assert = require('assert');
 
-export default async function e2eEncryptionScenarios(alice, bob) {
+module.exports = async function e2eEncryptionScenarios(alice, bob) {
     console.log(" creating an e2e encrypted room and join through invite:");
     const room = "secrets";
     await createRoom(bob, room);
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index 651397e426..0c45b0d083 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -28,7 +28,7 @@ const {getMembersInMemberlist} = require('../usecases/memberlist');
 const changeRoomSettings = require('../usecases/room-settings');
 const assert = require('assert');
 
-export default async function lazyLoadingScenarios(alice, bob, charlies) {
+module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
     console.log(" creating a room for lazy loading member scenarios:");
     const charly1to5 = charlies.slice("charly-1..5", 0, 5);
     const charly6to10 = charlies.slice("charly-6..10", 5);
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index b17e55efa4..f25c5056ad 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -22,7 +22,7 @@ const {delay} = require('./util');
 
 const DEFAULT_TIMEOUT = 20000;
 
-export default class RiotSession {
+module.exports = class RiotSession {
     constructor(browser, page, username, riotserver, hsUrl) {
         this.browser = browser;
         this.page = page;
diff --git a/test/end-to-end-tests/src/usecases/accept-invite.js b/test/end-to-end-tests/src/usecases/accept-invite.js
index d17f583a77..3f208cc1fc 100644
--- a/test/end-to-end-tests/src/usecases/accept-invite.js
+++ b/test/end-to-end-tests/src/usecases/accept-invite.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export default async function acceptInvite(session, name) {
+module.exports = async function acceptInvite(session, name) {
     session.log.step(`accepts "${name}" invite`);
     //TODO: brittle selector
     const invitesHandles = await session.queryAll('.mx_RoomTile_name.mx_RoomTile_invite');
@@ -24,7 +24,7 @@ export default async function acceptInvite(session, name) {
         return {inviteHandle, text};
     }));
     const inviteHandle = invitesWithText.find(({inviteHandle, text}) => {
-    return text.trim() === name;
+        return text.trim() === name;
     }).inviteHandle;
 
     await inviteHandle.click();
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index 7ca3826c71..140748bca7 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export async function openRoomDirectory(session) {
+async function openRoomDirectory(session) {
     const roomDirectoryButton = await session.query('.mx_LeftPanel_explore .mx_AccessibleButton');
     await roomDirectoryButton.click();
 }
 
-export async function createRoom(session, roomName) {
+async function createRoom(session, roomName) {
     session.log.step(`creates room "${roomName}"`);
 
     const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
@@ -43,3 +43,5 @@ export async function createRoom(session, roomName) {
     await session.query('.mx_MessageComposer');
     session.log.done();
 }
+
+module.exports = {openRoomDirectory, createRoom};
diff --git a/test/end-to-end-tests/src/usecases/dialog.js b/test/end-to-end-tests/src/usecases/dialog.js
index 72d024fc79..d4ae97dff9 100644
--- a/test/end-to-end-tests/src/usecases/dialog.js
+++ b/test/end-to-end-tests/src/usecases/dialog.js
@@ -17,20 +17,20 @@ limitations under the License.
 
 const assert = require('assert');
 
-export async function assertDialog(session, expectedTitle) {
+async function assertDialog(session, expectedTitle) {
     const titleElement = await session.query(".mx_Dialog .mx_Dialog_title");
     const dialogHeader = await session.innerText(titleElement);
     assert(dialogHeader, expectedTitle);
 }
 
-export async function acceptDialog(session, expectedTitle) {
+async function acceptDialog(session, expectedTitle) {
     const foundDialog = await acceptDialogMaybe(session, expectedTitle);
     if (!foundDialog) {
         throw new Error("could not find a dialog");
     }
 }
 
-export async function acceptDialogMaybe(session, expectedTitle) {
+async function acceptDialogMaybe(session, expectedTitle) {
     let primaryButton = null;
     try {
         primaryButton = await session.query(".mx_Dialog .mx_Dialog_primary");
@@ -43,3 +43,9 @@ export async function acceptDialogMaybe(session, expectedTitle) {
     await primaryButton.click();
     return true;
 }
+
+module.exports = {
+    assertDialog,
+    acceptDialog,
+    acceptDialogMaybe,
+};
diff --git a/test/end-to-end-tests/src/usecases/invite.js b/test/end-to-end-tests/src/usecases/invite.js
index fc91e4ce16..6bee5dfd6f 100644
--- a/test/end-to-end-tests/src/usecases/invite.js
+++ b/test/end-to-end-tests/src/usecases/invite.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export default async function invite(session, userId) {
+module.exports = async function invite(session, userId) {
     session.log.step(`invites "${userId}" to room`);
     await session.delay(1000);
     const memberPanelButton = await session.query(".mx_RightPanel_membersButton");
diff --git a/test/end-to-end-tests/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
index 4fbc134598..655c0be686 100644
--- a/test/end-to-end-tests/src/usecases/join.js
+++ b/test/end-to-end-tests/src/usecases/join.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const {openRoomDirectory} = require('./create-room');
 
-export default async function join(session, roomName) {
+module.exports = async function join(session, roomName) {
     session.log.step(`joins room "${roomName}"`);
     await openRoomDirectory(session);
     const roomInput = await session.query('.mx_DirectorySearchBox input');
diff --git a/test/end-to-end-tests/src/usecases/memberlist.js b/test/end-to-end-tests/src/usecases/memberlist.js
index 8d2aacf35c..e974eea95b 100644
--- a/test/end-to-end-tests/src/usecases/memberlist.js
+++ b/test/end-to-end-tests/src/usecases/memberlist.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-export async function openMemberInfo(session, name) {
+async function openMemberInfo(session, name) {
     const membersAndNames = await getMembersInMemberlist(session);
     const matchingLabel = membersAndNames.filter((m) => {
         return m.displayName === name;
@@ -25,7 +25,9 @@ export async function openMemberInfo(session, name) {
     await matchingLabel.click();
 }
 
-export async function verifyDeviceForUser(session, name, expectedDevice) {
+module.exports.openMemberInfo = openMemberInfo;
+
+module.exports.verifyDeviceForUser = async function(session, name, expectedDevice) {
     session.log.step(`verifies e2e device for ${name}`);
     const membersAndNames = await getMembersInMemberlist(session);
     const matchingLabel = membersAndNames.filter((m) => {
@@ -58,9 +60,9 @@ export async function verifyDeviceForUser(session, name, expectedDevice) {
     const closeMemberInfo = await session.query(".mx_MemberInfo_cancel");
     await closeMemberInfo.click();
     session.log.done();
-}
+};
 
-export async function getMembersInMemberlist(session) {
+async function getMembersInMemberlist(session) {
     const memberPanelButton = await session.query(".mx_RightPanel_membersButton");
     try {
         await session.query(".mx_RightPanel_headerButton_highlight", 500);
@@ -77,3 +79,5 @@ export async function getMembersInMemberlist(session) {
         return {label: el, displayName: await session.innerText(el)};
     }));
 }
+
+module.exports.getMembersInMemberlist = getMembersInMemberlist;
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index c6a84706cf..f526312f8a 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -30,7 +30,7 @@ async function setSettingsToggle(session, toggle, enabled) {
     }
 }
 
-export default async function changeRoomSettings(session, settings) {
+module.exports = async function changeRoomSettings(session, settings) {
     session.log.startGroup(`changes the room settings`);
     /// XXX delay is needed here, possibly because the header is being rerendered
     /// click doesn't do anything otherwise
diff --git a/test/end-to-end-tests/src/usecases/settings.js b/test/end-to-end-tests/src/usecases/settings.js
index 411ec3b497..a405fde9fb 100644
--- a/test/end-to-end-tests/src/usecases/settings.js
+++ b/test/end-to-end-tests/src/usecases/settings.js
@@ -29,7 +29,7 @@ async function openSettings(session, section) {
     }
 }
 
-export async function enableLazyLoading(session) {
+module.exports.enableLazyLoading = async function(session) {
     session.log.step(`enables lazy loading of members in the lab settings`);
     const settingsButton = await session.query('.mx_BottomLeftMenu_settings');
     await settingsButton.click();
@@ -39,9 +39,9 @@ export async function enableLazyLoading(session) {
     const closeButton = await session.query(".mx_RoomHeader_cancelButton");
     await closeButton.click();
     session.log.done();
-}
+};
 
-export async function getE2EDeviceFromSettings(session) {
+module.exports.getE2EDeviceFromSettings = async function(session) {
     session.log.step(`gets e2e device/key from settings`);
     await openSettings(session, "security");
     const deviceAndKey = await session.queryAll(".mx_SettingsTab_section .mx_SecurityUserSettingsTab_deviceInfo code");
@@ -52,4 +52,4 @@ export async function getE2EDeviceFromSettings(session) {
     await closeButton.click();
     session.log.done();
     return {id, key};
-}
+};
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index 381b87ec9e..ef8a259091 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-export default async function signup(session, username, password, homeserver) {
+module.exports = async function signup(session, username, password, homeserver) {
     session.log.step("signs up");
     await session.goto(session.url('/#/register'));
     // change the homeserver by clicking the advanced section
diff --git a/test/end-to-end-tests/src/usecases/timeline.js b/test/end-to-end-tests/src/usecases/timeline.js
index 8a18e2653f..3889dce108 100644
--- a/test/end-to-end-tests/src/usecases/timeline.js
+++ b/test/end-to-end-tests/src/usecases/timeline.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 const assert = require('assert');
 
-export async function scrollToTimelineTop(session) {
+module.exports.scrollToTimelineTop = async function(session) {
     session.log.step(`scrolls to the top of the timeline`);
     await session.page.evaluate(() => {
         return Promise.resolve().then(async () => {
@@ -41,9 +41,9 @@ export async function scrollToTimelineTop(session) {
         });
     });
     session.log.done();
-}
+};
 
-export async function receiveMessage(session, expectedMessage) {
+module.exports.receiveMessage = async function(session, expectedMessage) {
     session.log.step(`receives message "${expectedMessage.body}" from ${expectedMessage.sender}`);
     // wait for a response to come in that contains the message
     // crude, but effective
@@ -67,10 +67,10 @@ export async function receiveMessage(session, expectedMessage) {
     });
     assertMessage(lastMessage, expectedMessage);
     session.log.done();
-}
+};
 
 
-export async function checkTimelineContains(session, expectedMessages, sendersDescription) {
+module.exports.checkTimelineContains = async function(session, expectedMessages, sendersDescription) {
     session.log.step(`checks timeline contains ${expectedMessages.length} ` +
         `given messages${sendersDescription ? ` from ${sendersDescription}`:""}`);
     const eventTiles = await getAllEventTiles(session);
@@ -91,7 +91,7 @@ export async function checkTimelineContains(session, expectedMessages, sendersDe
     expectedMessages.forEach((expectedMessage) => {
         const foundMessage = timelineMessages.find((message) => {
             return message.sender === expectedMessage.sender &&
-                   message.body === expectedMessage.body;
+                message.body === expectedMessage.body;
         });
         try {
             assertMessage(foundMessage, expectedMessage);
@@ -102,7 +102,7 @@ export async function checkTimelineContains(session, expectedMessages, sendersDe
     });
 
     session.log.done();
-}
+};
 
 function assertMessage(foundMessage, expectedMessage) {
     assert(foundMessage, `message ${JSON.stringify(expectedMessage)} not found in timeline`);
diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index a8b71cfe5c..5f507f96e6 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -38,7 +38,7 @@ async function getSasCodes(session) {
     return sasLabels;
 }
 
-export async function startSasVerifcation(session, name) {
+module.exports.startSasVerifcation = async function(session, name) {
     await startVerification(session, name);
     // expect "Verify device" dialog and click "Begin Verification"
     await assertDialog(session, "Verify device");
@@ -51,9 +51,9 @@ export async function startSasVerifcation(session, name) {
     // click "Got it" when verification is done
     await acceptDialog(session);
     return sasCodes;
-}
+};
 
-export async function acceptSasVerification(session, name) {
+module.exports.acceptSasVerification = async function(session, name) {
     await assertDialog(session, "Incoming Verification Request");
     const opponentLabelElement = await session.query(".mx_IncomingSasDialog_opponentProfile h2");
     const opponentLabel = await session.innerText(opponentLabelElement);
@@ -67,4 +67,4 @@ export async function acceptSasVerification(session, name) {
     // click "Got it" when verification is done
     await acceptDialog(session);
     return sasCodes;
-}
+};
diff --git a/test/end-to-end-tests/src/util.js b/test/end-to-end-tests/src/util.js
index cafe929eca..cc7391fa9f 100644
--- a/test/end-to-end-tests/src/util.js
+++ b/test/end-to-end-tests/src/util.js
@@ -15,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function range(start, amount, step = 1) {
+module.exports.range = function(start, amount, step = 1) {
     const r = [];
     for (let i = 0; i < amount; ++i) {
         r.push(start + (i * step));
     }
     return r;
-}
+};
 
-export function delay(ms) {
+module.exports.delay = function(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
-}
+};

From bebfd60daf14e84350e60f2a41dbd4bd99a06fc1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:22:09 +0000
Subject: [PATCH 0318/3235] Very fastidiously check for null/undefined

---
 src/components/views/rooms/RoomTile.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 16fff4fc97..b904f9d437 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -57,11 +57,11 @@ module.exports = createReactClass({
 
     getInitialState: function() {
          // eslint-disable-next-line camelcase
-        const { event: { content: { join_rule } } } =
-          this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+        const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+        const joinRule = joinRules && joinRules.event && joinRules.event.content && joinRules.event.content.join_rule;
 
         return ({
-            join_rule,
+            joinRule,
             hover: false,
             badgeHover: false,
             contextMenuPosition: null, // DOM bounding box, null if non-shown
@@ -110,12 +110,14 @@ module.exports = createReactClass({
     },
 
     onJoinRule: function(ev) {
+        if (!ev || !ev.event ) return;
         /* eslint-disable camelcase */
         const { event: { type, room_id } } = ev;
         if (type !== "m.room.join_rules") return;
         if (room_id !== this.props.room.roomId) return;
+        if ( !event.content ) return;
         const { event: { content: { join_rule } } } = ev;
-        this.setState({ join_rule });
+        this.setState({ joinRule: join_rule });
         /* eslint-enable camelcase */
     },
 
@@ -322,7 +324,7 @@ module.exports = createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-            'mx_RoomTile_isPrivate': this.state.join_rule == "invite" && !dmUserId,
+            'mx_RoomTile_isPrivate': this.state.joinRule == "invite" && !dmUserId,
         });
 
         const avatarClasses = classNames({

From fb587cc62c60851597723db440abe1af78ab091f Mon Sep 17 00:00:00 2001
From: "Z. E. Cat" <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:33:37 +0000
Subject: [PATCH 0319/3235] Update src/components/views/rooms/RoomTile.js

Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index b904f9d437..f7c58f5c5a 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -58,7 +58,7 @@ module.exports = createReactClass({
     getInitialState: function() {
          // eslint-disable-next-line camelcase
         const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
-        const joinRule = joinRules && joinRules.event && joinRules.event.content && joinRules.event.content.join_rule;
+        const joinRule = joinRules && joinRules.getContent() && joinRules.getContent().join_rule;
 
         return ({
             joinRule,

From fbabe79647c8d8e54922155ce976936987ad6616 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:35:57 +0000
Subject: [PATCH 0320/3235] use getContent() instead

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

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index f7c58f5c5a..f17ec98d9a 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -115,10 +115,9 @@ module.exports = createReactClass({
         const { event: { type, room_id } } = ev;
         if (type !== "m.room.join_rules") return;
         if (room_id !== this.props.room.roomId) return;
-        if ( !event.content ) return;
-        const { event: { content: { join_rule } } } = ev;
-        this.setState({ joinRule: join_rule });
         /* eslint-enable camelcase */
+        const joinRule = event.getContent().join_rule;
+        this.setState({ joinRule });
     },
 
     onAccountData: function(accountDataEvent) {

From 1b75909cadc9f4af3ab7da30bc546e25c5b64614 Mon Sep 17 00:00:00 2001
From: "Z. E. Cat" <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:36:33 +0000
Subject: [PATCH 0321/3235] Update src/components/views/rooms/RoomTile.js

Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index f17ec98d9a..cc77bf5b3d 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -58,7 +58,7 @@ module.exports = createReactClass({
     getInitialState: function() {
          // eslint-disable-next-line camelcase
         const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
-        const joinRule = joinRules && joinRules.getContent() && joinRules.getContent().join_rule;
+        const joinRule = joinRules && joinRules.getContent().join_rule;
 
         return ({
             joinRule,

From 54c69b4630afd0d1819fbcd6e617c2e08b901832 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:46:14 +0000
Subject: [PATCH 0322/3235] this is what we call fast iteration

---
 src/components/views/rooms/RoomTile.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index cc77bf5b3d..232e11cfd8 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -110,13 +110,9 @@ module.exports = createReactClass({
     },
 
     onJoinRule: function(ev) {
-        if (!ev || !ev.event ) return;
-        /* eslint-disable camelcase */
-        const { event: { type, room_id } } = ev;
-        if (type !== "m.room.join_rules") return;
-        if (room_id !== this.props.room.roomId) return;
-        /* eslint-enable camelcase */
-        const joinRule = event.getContent().join_rule;
+        if (ev.getType() !== "m.room.join_rules") return;
+        if (ev.getRoomId() !== this.props.room.roomId) return;
+        const joinRule = (ev.getContent() || {}).join_rule;
         this.setState({ joinRule });
     },
 

From c370b28694d7e397078b0a9a2806662bb4eb0baa Mon Sep 17 00:00:00 2001
From: Christopher <kurekc@hotmail.com>
Date: Sun, 12 Jan 2020 16:19:24 +0000
Subject: [PATCH 0323/3235] #11378. Added cut/copy and pasting user pills from
 editor.

---
 .../views/rooms/BasicMessageComposer.js       | 46 ++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 15585ffea0..94159ec8c3 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -200,17 +200,47 @@ export default class BasicMessageEditor extends React.Component {
         return !!(this._isIMEComposing || (event.nativeEvent && event.nativeEvent.isComposing));
     }
 
+    _onCutCopy = (event, type) => {
+        const selection = document.getSelection();
+        const text = selection.toString();
+        if (text) {
+            const {model} = this.props;
+            const range = getRangeForSelection(this._editorRef, model, selection);
+            const selectedParts = range.parts.map(p => p.serialize());
+            event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
+            if (type === "cut") {
+                selection.deleteFromDocument();
+                range.replace([]);
+            }
+            event.preventDefault();
+        }
+    }
+
+    _onCopy = (event) => {
+        this._onCutCopy(event, "copy");
+    }
+
+    _onCut = (event) => {
+        this._onCutCopy(event, "cut");
+    }
+
     _onPaste = (event) => {
         const {model} = this.props;
         const {partCreator} = model;
-        const text = event.clipboardData.getData("text/plain");
-        if (text) {
-            this._modifiedFlag = true;
-            const range = getRangeForSelection(this._editorRef, model, document.getSelection());
-            const parts = parsePlainTextMessage(text, partCreator);
-            replaceRangeAndMoveCaret(range, parts);
-            event.preventDefault();
+        const partsText = event.clipboardData.getData("application/x-riot-composer");
+        let parts;
+        if (partsText) {
+            const serializedTextParts = JSON.parse(partsText);
+            const deserializedParts = serializedTextParts.map(p => partCreator.deserializePart(p))
+            parts = deserializedParts;
+        } else {
+            const text = event.clipboardData.getData("text/plain");
+            parts = parsePlainTextMessage(text, partCreator);
         }
+        this._modifiedFlag = true;
+        const range = getRangeForSelection(this._editorRef, model, document.getSelection());
+        replaceRangeAndMoveCaret(range, parts);
+        event.preventDefault();
     }
 
     _onInput = (event) => {
@@ -557,6 +587,8 @@ export default class BasicMessageEditor extends React.Component {
                 tabIndex="0"
                 onBlur={this._onBlur}
                 onFocus={this._onFocus}
+                onCopy={this._onCopy}
+                onCut={this._onCut}
                 onPaste={this._onPaste}
                 onKeyDown={this._onKeyDown}
                 ref={ref => this._editorRef = ref}

From 6266f21a08322b4f6e2c4286fb626ba3ac5ec4d1 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 12 Jan 2020 09:05:58 +0000
Subject: [PATCH 0324/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2000 of 2000 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 ac30ab6534..11904a95f0 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2033,5 +2033,7 @@
     "Direct Messages": "Mezu zuzenak",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eska egiezu bere erabiltzaile-izena, edo eman egiezu zurea (%(userId)s) edo <a>profilera esteka</a>.",
     "Go": "Joan",
-    "Suggestions": "Proposamenak"
+    "Suggestions": "Proposamenak",
+    "Failed to find the following users": "Ezin izan dira honako erabiltzaile hauek aurkitu",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Honako erabiltzaile hauek agian ez dira existitzen edo baliogabeak dira, eta ezin dira gonbidatu: %(csvNames)s"
 }

From e1cb7b4f0871f25b82ee95281b1e293c2ad4463e Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 10 Jan 2020 12:15:00 +0000
Subject: [PATCH 0325/3235] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (2000 of 2000 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 8f08328be6..108eb8ffb7 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2030,5 +2030,7 @@
     "Show more": "Покажи повече",
     "Direct Messages": "Директни съобщения",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ако не можете да намерите някой, питайте за потребителското им име, или споделете своето (%(userId)s) или <a>връзка към профила</a>.",
-    "Go": "Давай"
+    "Go": "Давай",
+    "Failed to find the following users": "Неуспешно откриване на следните потребители",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следните потребители не съществуват или са невалидни и не могат да бъдат поканени: %(csvNames)s"
 }

From 0065895b9c51d20bf0fc1c11a8393a792ed8674e Mon Sep 17 00:00:00 2001
From: Alexey Murz Korepov <murznn@gmail.com>
Date: Sun, 12 Jan 2020 04:50:36 +0000
Subject: [PATCH 0326/3235] Translated using Weblate (Russian)

Currently translated at 90.0% (1799 of 2000 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index fc8b37140e..aeab97caf3 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1267,7 +1267,7 @@
     "Unable to load key backup status": "Не удалось получить статус резервного копирования для ключей шифрования",
     "Restore from Backup": "Восстановить из резервной копии",
     "This device is backing up your keys. ": "Это устройство хранит резервную копию ключей шифрования. ",
-    "Back up your keys before signing out to avoid losing them.": "Перед выходом сохраните резервную копию ключей шифрования чтобы не потерять их.",
+    "Back up your keys before signing out to avoid losing them.": "Перед выходом сохраните резервную копию ключей шифрования, чтобы не потерять их.",
     "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Резервная копия подписана <verify>неизвестным</verify> устройством с ID %(deviceId)s.",
     "Backup has a <validity>valid</validity> signature from this device": "Резервная копия заверена <validity>действительной</validity> подписью от этого устройства",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Резервная копия заверена <validity>действительной</validity> подписью от <verify>подтверждённого</verify> устройства <device></device>",
@@ -1389,7 +1389,7 @@
     "Do you want to join %(roomName)s?": "Хотите присоединиться к %(roomName)s?",
     "<userName/> invited you": "<userName/> пригласил тебя",
     "You're previewing %(roomName)s. Want to join it?": "Вы просматриваете %(roomName)s. Хотите присоединиться?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не могут быть предварительно просмотрены. Вы хотите присоединиться к ней?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не может быть предварительно просмотрена. Вы хотите присоединиться к ней?",
     "This room doesn't exist. Are you sure you're at the right place?": "Эта комната не существует. Вы уверены, что находитесь в правильном месте?",
     "Try again later, or ask a room admin to check if you have access.": "Повторите попытку позже или попросите администратора комнаты проверить, есть ли у вас доступ.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s был возвращен при попытке доступа в комнату. Если вы считаете, что видите это сообщение по ошибке, пожалуйста, <issueLink> отправьте отчет об ошибке </issueLink>.",
@@ -1440,7 +1440,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.": "Ранее вы использовали 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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
     "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 раз меньше памяти, загружая информацию только о других пользователях, когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
-    "I don't want my encrypted messages": "Я не хочу, мои зашифрованные сообщения",
+    "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
     "Manually export keys": "Ручной экспорт ключей",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы столкнулись с какими-либо ошибками или хотите оставить отзыв, которым хотите поделиться, сообщите нам об этом на GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала <existingIssuesLink> просмотрите существующие проблемы </existingIssuesLink> (и добавьте +1), либо <newIssueLink> создайте новую проблему </newIssueLink>, если вы не можете ее найти.",
@@ -1550,7 +1550,7 @@
     "Unable to query for supported registration methods.": "Невозможно запросить поддерживаемые методы регистрации.",
     "Great! This passphrase looks strong enough.": "Отлично! Этот пароль выглядит достаточно сильной.",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию паролем, чтобы сохранить ее в безопасности.",
-    "For maximum security, this should be different from your account password.": "Для максимальной безопасности это должно отличаться от пароля вашей учётной записи.",
+    "For maximum security, this should be different from your account password.": "Для максимальной безопасности он должен отличаться от пароля вашей учётной записи.",
     "Enter a passphrase...": "Введите пароль....",
     "Set up with a Recovery Key": "Настройка с ключом восстановления",
     "That matches!": "Это совпадает!",

From b3d3f3b09f2b579c22abc4062c4f6182eff1f558 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 10 Jan 2020 16:56:10 +0000
Subject: [PATCH 0327/3235] Translated using Weblate (Turkish)

Currently translated at 64.2% (1285 of 2000 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 8e9c2c35bf..659c973d35 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1174,5 +1174,128 @@
     "Unban this user?": "Bu kullanıcının yasağını kaldır?",
     "Ban this user?": "Bu kullanıcıyı yasakla?",
     "Remove %(count)s messages|other": "%(count)s mesajı sil",
-    "Remove %(count)s messages|one": "1 mesajı sil"
+    "Remove %(count)s messages|one": "1 mesajı sil",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu odada bilinmeyen cihazlar var: bunları doğrulamadan devam ederseniz birilerinin çağrılarınıza göz atma ihtimali var.",
+    "A conference call could not be started because the integrations server is not available": "Entegrasyon sunucusu mevcut olmadığından konferans çağrısı başlatılamadı",
+    "Send cross-signing keys to homeserver": "Çapraz-imzalama anahtarlarını anasunucuya gönder",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uyarı: Topluluğa eklediğiniz her bir kişi topluluk IDsini bilen herhangi biri tarafından açıkça görünür olacaktır",
+    "Room name or alias": "Oda adı ve lakabı",
+    "Failed to invite users to %(groupId)s": "%(groupId)s grubuna kullanıcı daveti başarısız",
+    "Failed to add the following rooms to %(groupId)s:": "%(groupId)s odalarına ekleme başarısız:",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Düz-metin mesajına ¯\\_(ツ)_/¯ ifadesi ekler",
+    "Rooster": "Horoz",
+    "Cross-signing public keys:": "Çarpraz-imzalama açık anahtarları:",
+    "Cross-signing private keys:": "Çarpraz-imzalama gizli anahtarları:",
+    "Backup has a <validity>valid</validity> signature from this user": "Yedek bu kullanıcıdan <validity>geçerli</validity> anahtara sahip",
+    "Backup has a <validity>invalid</validity> signature from this user": "Yedek bu kullanıcıdan <validity>geçersiz</validity> bir anahtara sahip",
+    "Add an email address to configure email notifications": "E-posta bildirimlerini yapılandırmak için bir e-posta adresi ekleyin",
+    "Identity Server URL must be HTTPS": "Kimlik Sunucu URL adresi HTTPS olmak zorunda",
+    "Not a valid Identity Server (status code %(code)s)": "Geçerli bir Kimlik Sunucu değil ( durum kodu %(code)s )",
+    "Terms of service not accepted or the identity server is invalid.": "Hizmet şartları kabuk edilmedi yada kimlik sunucu geçersiz.",
+    "The identity server you have chosen does not have any terms of service.": "Seçtiğiniz kimlik sunucu herhangi bir hizmet şartları sözleşmesine sahip değil.",
+    "Disconnect identity server": "Kimlik sunucu bağlantısını kes",
+    "Disconnect from the identity server <idserver />?": "<idserver /> kimlik sunucusundan bağlantıyı kes?",
+    "Disconnect": "Bağlantıyı kes",
+    "contact the administrators of identity server <idserver />": "<idserver /> kimlik sunucusu yöneticisiyle bağlantıya geç",
+    "Deactivate user?": "Kullanıcıyı pasifleştir?",
+    "Deactivate user": "Kullanıcıyı pasifleştir",
+    "Failed to deactivate user": "Kullanıcı pasifleştirme başarısız",
+    "Invite": "Davet",
+    "Share Link to User": "Kullanıcıya Link Paylaş",
+    "User Options": "Kullanıcı Ayarları",
+    "Send an encrypted reply…": "Şifrelenmiş bir cevap gönder…",
+    "Send a reply (unencrypted)…": "Bir cevap gönder (şifresiz)…",
+    "Send an encrypted message…": "Şifreli bir mesaj gönder…",
+    "Send a message (unencrypted)…": "Bir mesaj gönder (şifresiz)…",
+    "Bold": "Kalın",
+    "Italics": "Eğik",
+    "Code block": "Kod bloku",
+    "No pinned messages.": "Sabitlenmiş mesaj yok.",
+    "Loading...": "Yükleniyor...",
+    "Pinned Messages": "Sabitlenmiş Mesajlar",
+    "Jump to message": "Mesaja git",
+    "%(duration)ss": "%(duration)ssn",
+    "%(duration)sm": "%(duration)sdk",
+    "%(duration)sh": "%(duration)ssa",
+    "%(duration)sd": "%(duration)sgün",
+    "Online for %(duration)s": "%(duration)s süresince çevrimiçi",
+    "Offline for %(duration)s": "%(duration)s süresince çevrimdışı",
+    "Unknown for %(duration)s": "%(duration)s süresince bilinmiyor",
+    "Unknown": "Bilinmeyen",
+    "Replying": "Cevap yazıyor",
+    "Room %(name)s": "Oda %(name)s",
+    "Share room": "Oda paylaş",
+    "Community Invites": "Topluluk Davetleri",
+    "System Alerts": "Sistem Uyarıları",
+    "Joining room …": "Odaya giriliyor …",
+    "Loading …": "Yükleniyor …",
+    "Rejecting invite …": "Davet reddediliyor …",
+    "Join the conversation with an account": "Konuşmaya bir hesapla katıl",
+    "Sign Up": "Kayıt Ol",
+    "Sign In": "Giriş Yap",
+    "Loading room preview": "Oda önizlemesi yükleniyor",
+    "Reason: %(reason)s": "Sebep: %(reason)s",
+    "Forget this room": "Bu odayı unut",
+    "Re-join": "Yeniden katıl",
+    "Join the discussion": "Tartışmaya katıl",
+    "Do you want to chat with %(user)s?": "%(user)s ile sohbet etmek ister misin?",
+    "<userName/> wants to chat": "<userName/> sohbet etmek istiyor",
+    "Start chatting": "Sohbet başlat",
+    "Do you want to join %(roomName)s?": "%(roomName)s odasına katılmak ister misin?",
+    "<userName/> invited you": "<userName/> davet etti",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s odasında önizleme yapılamaz. Katılmak ister misin?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Bu oda mevcut değil. Doğru yerde olduğunuza emin misiniz?",
+    "Try again later, or ask a room admin to check if you have access.": "Daha sonra deneyin, yada bir oda adminine erişiminiz olup olmadığını sorun.",
+    "Never lose encrypted messages": "Şifrelenmiş mesajları asla kaybetmeyin",
+    "Not now": "Şimdi değil",
+    "Don't ask me again": "Yeniden sorma",
+    "%(count)s unread messages.|other": "%(count)s okunmamış mesaj.",
+    "%(count)s unread messages.|one": "1 okunmamış mesaj.",
+    "Unread messages.": "Okunmamış mesajlar.",
+    "This room has already been upgraded.": "Bu ıda zaten güncellenmiş.",
+    "Only room administrators will see this warning": "Bu uyarıyı sadece oda yöneticileri görür",
+    "Failed to connect to integration manager": "Entegrasyon yöneticisine bağlanma başarısız",
+    "Add some now": "Şimdi biraz ekle",
+    "Stickerpack": "Çıkartma paketi",
+    "Hide Stickers": "Çıkartmaları Gizle",
+    "Show Stickers": "Çıkartmaları Göster",
+    "Failed to revoke invite": "Davetin geri çekilmesi başarısız",
+    "Revoke invite": "Davet geri çekildi",
+    "Invited by %(sender)s": "%(sender)s tarafından davet",
+    "Error updating main address": "Ana adres güncellemede hata",
+    "Error removing alias": "Lakap silmede hata",
+    "Main address": "Ana adres",
+    "Invalid community ID": "Geçersiz topluluk ID si",
+    "'%(groupId)s' is not a valid community ID": "%(groupId)s geçerli olmayan bir topluluk ID si",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Yeni topluluk ID si ( örn. +foo:%(localDomain)s)",
+    "Room Name": "Oda Adı",
+    "Hide verified sessions": "Onaylı oturumları gizle",
+    "%(count)s verified sessions|other": "%(count)s doğrulanmış oturum",
+    "%(count)s verified sessions|one": "1 doğrulanmış oturum",
+    "Direct message": "Doğrudan mesaj",
+    "Remove from community": "Topluluktan sil",
+    "Remove this user from community?": "Bu kullanıcıyı topluluktan sil?",
+    "Failed to withdraw invitation": "Davetin geri çekilmesi başarısız",
+    "Failed to remove user from community": "Kullanıcıyı bu topluluktan silme başarısız",
+    "Verify": "Doğrula",
+    "Security": "Güvenlik",
+    "Reply": "Cevapla",
+    "Edit": "Düzenle",
+    "Message Actions": "Mesaj Eylemleri",
+    "Show image": "Resim göster",
+    "You verified %(name)s": "%(name)s yı doğruladınız",
+    "You cancelled verifying %(name)s": "%(name)s doğrulaması iptal edildi",
+    "You accepted": "Kabul ettiniz",
+    "%(name)s accepted": "%(name)s kabul etti",
+    "You cancelled": "İptal ettiniz",
+    "%(name)s cancelled": "%(name)s iptal etti",
+    "%(name)s wants to verify": "%(name)s doğrulamak istiyor",
+    "You sent a verification request": "Doğrulama isteği gönderdiniz",
+    "Show all": "Hepsini göster",
+    "Reactions": "Tepkiler",
+    "Click here to see older messages.": "Daha eski mesajları görmek için buraya tıklayın.",
+    "Copied!": "Kopyalandı!",
+    "Failed to copy": "Kopyalama başarısız",
+    "edited": "düzenlendi",
+    "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi"
 }

From 422d4cd73a7c5223ba5f886314f06be2ad5c1ae1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:18:24 +0000
Subject: [PATCH 0328/3235] small simplification in code as `.getContent()`
 will always return an object

---
 src/components/views/rooms/RoomTile.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 232e11cfd8..fd06962a99 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -112,8 +112,7 @@ module.exports = createReactClass({
     onJoinRule: function(ev) {
         if (ev.getType() !== "m.room.join_rules") return;
         if (ev.getRoomId() !== this.props.room.roomId) return;
-        const joinRule = (ev.getContent() || {}).join_rule;
-        this.setState({ joinRule });
+        this.setState({ joinRule: ev.getContent().join_rule });
     },
 
     onAccountData: function(accountDataEvent) {

From 2168e7ec0cb11f0a35a615c9ed2a82da23697ca7 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 13 Jan 2020 11:48:51 +0000
Subject: [PATCH 0329/3235] Add feature flag around the presence indicator in
 room list

This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
---
 src/components/views/rooms/RoomTile.js | 5 ++++-
 src/i18n/strings/en_EN.json            | 1 +
 src/settings/Settings.js               | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 241713c97d..f0c1a23c9c 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -381,7 +381,10 @@ module.exports = createReactClass({
 
             const { room } = this.props;
             const member = room.getMember(dmUserId);
-            if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
+            if (
+                member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
+                SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
+            ) {
                 const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
                 dmOnline = <UserOnlineDot userId={dmUserId} />;
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4311733b51..e4ef1adb13 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -359,6 +359,7 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "New DM invite dialog (under development)": "New DM invite dialog (under development)",
+    "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 14208e1f03..8ee8d89890 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -134,6 +134,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_presence_in_room_list": {
+        isFeature: true,
+        displayName: _td("Show a presence dot next to DMs in the room list"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],

From 878c5b5b521e78793cf310597a6c1dbd7b2426ed Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 12:11:19 +0000
Subject: [PATCH 0330/3235] removed unnecessary lint rule

---
 src/components/views/rooms/RoomTile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index fd06962a99..6c14a1cb43 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -56,7 +56,6 @@ module.exports = createReactClass({
     },
 
     getInitialState: function() {
-         // eslint-disable-next-line camelcase
         const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
         const joinRule = joinRules && joinRules.getContent().join_rule;
 

From 9c686bf5019177c709dcbf5143d7d9e868bc6e9e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:30:01 +0000
Subject: [PATCH 0331/3235] Fix right panel buttons highlighting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js            | 2 +-
 src/components/views/right_panel/HeaderButtons.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..50b63b94b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1299,7 +1299,7 @@ export default createReactClass({
                 );
             }
 
-            const rightPanel = !RightPanelStore.getSharedInstance().isOpenForGroup
+            const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
                 ? <RightPanel groupId={this.props.groupId} />
                 : undefined;
 
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index ebe1f5f915..dbcae4529a 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
         const rps = RightPanelStore.getSharedInstance();
         if (this.state.headerKind === HEADER_KIND_ROOM) {
             this.setState({phase: rps.visibleRoomPanelPhase});
-        } else if (this.state.head === HEADER_KIND_GROUP) {
+        } else if (this.state.headerKind === HEADER_KIND_GROUP) {
             this.setState({phase: rps.visibleGroupPanelPhase});
         }
     }

From 77b479d50c11d948cf767545541c38b475f14dbc Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 13 Jan 2020 12:29:03 +0000
Subject: [PATCH 0332/3235] Guard against missing members in avatars

Part of https://github.com/vector-im/riot-web/issues/11744
---
 src/Avatar.js                                | 19 +++++++++++--------
 src/components/views/avatars/MemberAvatar.js |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 17860698cb..a529ca5588 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -21,14 +21,17 @@ import DMRoomMap from './utils/DMRoomMap';
 
 module.exports = {
     avatarUrlForMember: function(member, width, height, resizeMethod) {
-        let url = member.getAvatarUrl(
-            MatrixClientPeg.get().getHomeserverUrl(),
-            Math.floor(width * window.devicePixelRatio),
-            Math.floor(height * window.devicePixelRatio),
-            resizeMethod,
-            false,
-            false,
-        );
+        let url;
+        if (member && member.getAvatarUrl) {
+            url = member.getAvatarUrl(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                Math.floor(width * window.devicePixelRatio),
+                Math.floor(height * window.devicePixelRatio),
+                resizeMethod,
+                false,
+                false,
+            );
+        }
         if (!url) {
             // member can be null here currently since on invites, the JS SDK
             // does not have enough info to build a RoomMember object for
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 383bab5e79..8b6d41eb9f 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -55,7 +55,7 @@ module.exports = createReactClass({
     },
 
     _getState: function(props) {
-        if (props.member) {
+        if (props.member && props.member.name) {
             return {
                 name: props.member.name,
                 title: props.title || props.member.userId,

From 63e5c44c63f70137ef36ec11fa3bcedf34f0737a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 13 Jan 2020 11:48:51 +0000
Subject: [PATCH 0333/3235] Add feature flag around the presence indicator in
 room list

This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
---
 src/components/views/rooms/RoomTile.js | 5 ++++-
 src/i18n/strings/en_EN.json            | 1 +
 src/settings/Settings.js               | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 241713c97d..f0c1a23c9c 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -381,7 +381,10 @@ module.exports = createReactClass({
 
             const { room } = this.props;
             const member = room.getMember(dmUserId);
-            if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
+            if (
+                member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
+                SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
+            ) {
                 const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
                 dmOnline = <UserOnlineDot userId={dmUserId} />;
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9c2105afab..fe64a7df12 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -359,6 +359,7 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "New DM invite dialog (under development)": "New DM invite dialog (under development)",
+    "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 14208e1f03..8ee8d89890 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -134,6 +134,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_presence_in_room_list": {
+        isFeature: true,
+        displayName: _td("Show a presence dot next to DMs in the room list"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],

From 8fc85797a7715bce0319298e6f8d08619f75cd4f Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 13 Jan 2020 12:29:03 +0000
Subject: [PATCH 0334/3235] Guard against missing members in avatars

Part of https://github.com/vector-im/riot-web/issues/11744
---
 src/Avatar.js                                | 19 +++++++++++--------
 src/components/views/avatars/MemberAvatar.js |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 17860698cb..a529ca5588 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -21,14 +21,17 @@ import DMRoomMap from './utils/DMRoomMap';
 
 module.exports = {
     avatarUrlForMember: function(member, width, height, resizeMethod) {
-        let url = member.getAvatarUrl(
-            MatrixClientPeg.get().getHomeserverUrl(),
-            Math.floor(width * window.devicePixelRatio),
-            Math.floor(height * window.devicePixelRatio),
-            resizeMethod,
-            false,
-            false,
-        );
+        let url;
+        if (member && member.getAvatarUrl) {
+            url = member.getAvatarUrl(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                Math.floor(width * window.devicePixelRatio),
+                Math.floor(height * window.devicePixelRatio),
+                resizeMethod,
+                false,
+                false,
+            );
+        }
         if (!url) {
             // member can be null here currently since on invites, the JS SDK
             // does not have enough info to build a RoomMember object for
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 383bab5e79..8b6d41eb9f 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -55,7 +55,7 @@ module.exports = createReactClass({
     },
 
     _getState: function(props) {
-        if (props.member) {
+        if (props.member && props.member.name) {
             return {
                 name: props.member.name,
                 title: props.title || props.member.userId,

From 66b55495bb02433b00b3faf60dcfaadb28a41577 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 5 Jan 2020 20:30:01 +0000
Subject: [PATCH 0335/3235] Fix right panel buttons highlighting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js            | 2 +-
 src/components/views/right_panel/HeaderButtons.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..50b63b94b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1299,7 +1299,7 @@ export default createReactClass({
                 );
             }
 
-            const rightPanel = !RightPanelStore.getSharedInstance().isOpenForGroup
+            const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
                 ? <RightPanel groupId={this.props.groupId} />
                 : undefined;
 
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index ebe1f5f915..dbcae4529a 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
         const rps = RightPanelStore.getSharedInstance();
         if (this.state.headerKind === HEADER_KIND_ROOM) {
             this.setState({phase: rps.visibleRoomPanelPhase});
-        } else if (this.state.head === HEADER_KIND_GROUP) {
+        } else if (this.state.headerKind === HEADER_KIND_GROUP) {
             this.setState({phase: rps.visibleGroupPanelPhase});
         }
     }

From 9a3ca289781fd3a59dac47a378ef8565029cc4c6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 13 Jan 2020 13:01:36 +0000
Subject: [PATCH 0336/3235] js-sdk 3.0.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2237ae2d53..253f230f14 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
-    "matrix-js-sdk": "3.0.0-rc.1",
+    "matrix-js-sdk": "3.0.0",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 982760c49a..ff86a10a11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5271,10 +5271,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@3.0.0-rc.1:
-  version "3.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0-rc.1.tgz#6ecdedab752933f6a0ccf6aa7d2786bd32f6d7f7"
-  integrity sha512-1eaECVqG64tj1pE0UBFTIGc1whryXLNaRpkrXrZ5+ZMDtuK2ZDlTOLYoK3t4z/hjn+4C6a294ytoEVe0UnIA8w==
+matrix-js-sdk@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0.tgz#97908f9eda9eeb3ba0333b7e474c45f2b258e50c"
+  integrity sha512-lzUMwJAZHw7Dk0K+rubqe6kEpy4+pJ+qCp8n6lisfdKfMDJXdNCkjiiXRnakM1ZD4PFYK8ju89+NfxlyhAAd4A==
   dependencies:
     another-json "^0.2.0"
     browser-request "^0.3.3"

From d38c3582353182debb2f4e6085e0a966a7c9df74 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 13 Jan 2020 13:06:30 +0000
Subject: [PATCH 0337/3235] Prepare changelog for v1.7.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a416920529..3ae2711e25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [1.7.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6) (2020-01-13)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6-rc.2...v1.7.6)
+
+ * Repair community member info panel
+   [\#3834](https://github.com/matrix-org/matrix-react-sdk/pull/3834)
+ * Add feature flag around the presence indicator in room list
+   [\#3833](https://github.com/matrix-org/matrix-react-sdk/pull/3833)
+
 Changes in [1.7.6-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6-rc.2) (2020-01-08)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6-rc.1...v1.7.6-rc.2)

From 8091cadc46d0b92e7b0c024becb0fc802f95cad4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 13 Jan 2020 13:06:31 +0000
Subject: [PATCH 0338/3235] v1.7.6

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

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

From 59ea865e8e5e3f8ff9c2f7990f7213e82a708a20 Mon Sep 17 00:00:00 2001
From: Christopher <kurekc@hotmail.com>
Date: Mon, 13 Jan 2020 14:29:42 +0000
Subject: [PATCH 0339/3235] Added missing semicolon.

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 94159ec8c3..4c3b5d5c2c 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -231,7 +231,7 @@ export default class BasicMessageEditor extends React.Component {
         let parts;
         if (partsText) {
             const serializedTextParts = JSON.parse(partsText);
-            const deserializedParts = serializedTextParts.map(p => partCreator.deserializePart(p))
+            const deserializedParts = serializedTextParts.map(p => partCreator.deserializePart(p));
             parts = deserializedParts;
         } else {
             const text = event.clipboardData.getData("text/plain");

From e43174c636281206a906067b86a31ab734bf7bec Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 14:49:23 +0000
Subject: [PATCH 0340/3235] Show padlock in room headers for invite-only rooms

Fixes #11832
---
 res/css/views/rooms/_RoomHeader.scss     | 21 +++++++++++++++++++++
 src/components/views/rooms/RoomHeader.js |  5 +++++
 2 files changed, 26 insertions(+)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index f1e4456cc1..5915fb9408 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -263,3 +263,24 @@ limitations under the License.
 .mx_RoomHeader_pinsIndicatorUnread {
     background-color: $pinned-unread-color;
 }
+
+.mx_RoomHeader_PrivateIcon.mx_RoomHeader_isPrivate {
+    width: 12px;
+    height: 12px;
+    position: relative;
+    display: block !important;
+
+    &::before {
+        background-color: $roomtile-name-color;
+        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+}
\ No newline at end of file
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index eaf2e733ca..dda3be5a0c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -159,6 +159,10 @@ module.exports = createReactClass({
             <E2EIcon status={this.props.e2eStatus} /> :
             undefined;
 
+        const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+        const joinRule = joinRules && joinRules.getContent().join_rule;
+        const joinRuleClass = "mx_RoomHeader_PrivateIcon" + (joinRule === "invite" ? " mx_RoomHeader_isPrivate" : "");
+
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
         }
@@ -303,6 +307,7 @@ module.exports = createReactClass({
                 <div className="mx_RoomHeader_wrapper">
                     <div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
                     { e2eIcon }
+                    <div className={joinRuleClass}/>
                     { name }
                     { topicElement }
                     { cancelButton }

From 0bd2ecd79847091007f88f129122ac753bec5687 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 14:51:10 +0000
Subject: [PATCH 0341/3235] lint

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

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index dda3be5a0c..c55ab48159 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -307,7 +307,7 @@ module.exports = createReactClass({
                 <div className="mx_RoomHeader_wrapper">
                     <div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
                     { e2eIcon }
-                    <div className={joinRuleClass}/>
+                    <div className={joinRuleClass} />
                     { name }
                     { topicElement }
                     { cancelButton }

From a56bf5398dfdecd58739397bf60fc85e655ac2fd Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 14:54:39 +0000
Subject: [PATCH 0342/3235] lint

---
 res/css/views/rooms/_RoomHeader.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 5915fb9408..45b9733faa 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -283,4 +283,4 @@ limitations under the License.
         left: 0;
         right: 0;
     }
-}
\ No newline at end of file
+}

From 397637d59dd26ab810201b69cc0b267f63f7d3c1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 13 Jan 2020 15:07:34 +0000
Subject: [PATCH 0343/3235] used classnames module

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

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index c55ab48159..76c85ea54b 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -161,7 +161,8 @@ module.exports = createReactClass({
 
         const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
         const joinRule = joinRules && joinRules.getContent().join_rule;
-        const joinRuleClass = "mx_RoomHeader_PrivateIcon" + (joinRule === "invite" ? " mx_RoomHeader_isPrivate" : "");
+        const joinRuleClass = classNames("mx_RoomHeader_PrivateIcon",
+                                         {"mx_RoomHeader_isPrivate": joinRule === "invite"});
 
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;

From 76fe87c941fd20185932907ffc598b54ae559b48 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 17:41:58 +0000
Subject: [PATCH 0344/3235] Don't error on unverifie/unknownd devices.

When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
---
 src/components/structures/MatrixChat.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index af3f4d2598..ce6f7d936f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1506,6 +1506,15 @@ export default createReactClass({
             );
             cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
         }
+
+        // With cross-signing enabled, we send to unknown devices
+        // without prompting. Any bad-device status the user should
+        // be aware of will be signalled through the room shield
+        // changing colour. More advanced behaviour will come once
+        // we implement more settings.
+        cli.setGlobalErrorOnUnknownDevices(
+            !SettingsStore.isFeatureEnabled("feature_cross_signing")
+        );
     },
 
     showScreen: function(screen, params) {

From d53016e8fc7695b4e86887c1c0790598eea498a6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 17:53:49 +0000
Subject: [PATCH 0345/3235] Room padlock decorations only if cross-signing is
 enabled

Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
---
 src/components/views/rooms/RoomTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ae8cfae67a..4dbcc7ca03 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -426,6 +426,11 @@ module.exports = createReactClass({
             );
         }
 
+        let privateIcon = null;
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            privateIcon = <div className="mx_RoomTile_PrivateIcon" />;
+        }
+
         return <React.Fragment>
             <AccessibleButton
                 tabIndex="0"
@@ -444,7 +449,7 @@ module.exports = createReactClass({
                         { dmIndicator }
                     </div>
                 </div>
-                <div className="mx_RoomTile_PrivateIcon" />
+                { privateIcon }
                 <div className="mx_RoomTile_nameContainer">
                     <div className="mx_RoomTile_labelContainer">
                         { label }

From e47240d838b94b14230e8dc98f8ade7cf0b41e6b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 17:56:40 +0000
Subject: [PATCH 0346/3235] Lint Eastwood

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index ce6f7d936f..a07446d971 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1513,7 +1513,7 @@ export default createReactClass({
         // changing colour. More advanced behaviour will come once
         // we implement more settings.
         cli.setGlobalErrorOnUnknownDevices(
-            !SettingsStore.isFeatureEnabled("feature_cross_signing")
+            !SettingsStore.isFeatureEnabled("feature_cross_signing"),
         );
     },
 

From bf6798e1096ad0145f2e833239e5135e4309dec9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 13:28:33 -0700
Subject: [PATCH 0347/3235] Appease the linter

---
 src/Avatar.js                                       |  3 ++-
 src/Resend.js                                       | 12 ++++++------
 src/components/structures/TimelinePanel.js          |  2 --
 src/components/views/room_settings/AliasSettings.js |  1 +
 test/components/stub-component.js                   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 47d08aac21..5a330c31e9 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -20,6 +20,7 @@ import DMRoomMap from './utils/DMRoomMap';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 export function avatarUrlForMember(member, width, height, resizeMethod) {
+    let url;
     if (member && member.getAvatarUrl) {
         url = member.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
@@ -34,7 +35,7 @@ export function avatarUrlForMember(member, width, height, resizeMethod) {
         // member can be null here currently since on invites, the JS SDK
         // does not have enough info to build a RoomMember object for
         // the inviter.
-        url = this.defaultAvatarUrlForString(member ? member.userId : '');
+        url = defaultAvatarUrlForString(member ? member.userId : '');
     }
     return url;
 }
diff --git a/src/Resend.js b/src/Resend.js
index 1d73212340..6d6c18cf27 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -21,29 +21,29 @@ import { EventStatus } from 'matrix-js-sdk';
 
 export default class Resend {
     static resendUnsentEvents(room) {
-        room.getPendingEvents().filter(function (ev) {
+        room.getPendingEvents().filter(function(ev) {
             return ev.status === EventStatus.NOT_SENT;
-        }).forEach(function (event) {
+        }).forEach(function(event) {
             Resend.resend(event);
         });
     }
 
     static cancelUnsentEvents(room) {
-        room.getPendingEvents().filter(function (ev) {
+        room.getPendingEvents().filter(function(ev) {
             return ev.status === EventStatus.NOT_SENT;
-        }).forEach(function (event) {
+        }).forEach(function(event) {
             Resend.removeFromQueue(event);
         });
     }
 
     static resend(event) {
         const room = MatrixClientPeg.get().getRoom(event.getRoomId());
-        MatrixClientPeg.get().resendEvent(event, room).then(function (res) {
+        MatrixClientPeg.get().resendEvent(event, room).then(function(res) {
             dis.dispatch({
                 action: 'message_sent',
                 event: event,
             });
-        }, function (err) {
+        }, function(err) {
             // XXX: temporary logging to try to diagnose
             // https://github.com/vector-im/riot-web/issues/3148
             console.log('Resend got send failure: ' + err.name + '(' + err + ')');
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1d50a51579..30b02bfcca 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1136,8 +1136,6 @@ const TimelinePanel = createReactClass({
         const messagePanel = this._messagePanel.current;
         if (messagePanel === undefined) return null;
 
-        const EventTile = sdk.getComponent('rooms.EventTile');
-
         const wrapperRect = ReactDOM.findDOMNode(messagePanel).getBoundingClientRect();
         const myUserId = MatrixClientPeg.get().credentials.userId;
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index b5febb689e..ee5a505b32 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -24,6 +24,7 @@ import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
+import Modal from "../../../Modal";
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {
diff --git a/test/components/stub-component.js b/test/components/stub-component.js
index 5638ada09d..a5c3b44409 100644
--- a/test/components/stub-component.js
+++ b/test/components/stub-component.js
@@ -17,4 +17,4 @@ export default function(opts) {
     }
 
     return createReactClass(opts);
-};
+}

From eeee736e9fd87e86b2bfad59bffb43f3406bc119 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 13 Jan 2020 13:22:03 +0000
Subject: [PATCH 0348/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2001 of 2001 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 68af34ae2d..900694e2ab 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2037,5 +2037,6 @@
     "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról.",
     "Suggestions": "Javaslatok",
     "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s"
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s",
+    "Show a presence dot next to DMs in the room list": "Jelenlét pötty mutatása a Közvetlen beszélgetések mellett a szobák listájában"
 }

From ce8520493728ab883f540eaa722683581a6fcd40 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Mon, 13 Jan 2020 12:50:52 +0000
Subject: [PATCH 0349/3235] Translated using Weblate (Japanese)

Currently translated at 59.5% (1190 of 2001 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 | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index cce9a81188..c4c231249f 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -357,7 +357,7 @@
     "(could not connect media)": "(メディアを接続できませんでした)",
     "(no answer)": "(応答なし)",
     "(unknown failure: %(reason)s)": "(不明なエラー: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s は通話を終了しました。",
+    "%(senderName)s ended the call.": "%(senderName)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 は、部屋のメンバー全員に参加した時点からの部屋履歴を参照できるようにしました。",
@@ -658,7 +658,7 @@
     "Popout widget": "ウィジェットをポップアウト",
     "Unblacklist": "ブラックリスト解除",
     "Blacklist": "ブラックリスト",
-    "Verify...": "検証中...",
+    "Verify...": "検証する...",
     "No results": "結果がありません",
     "Communities": "コミュニティ",
     "Home": "ホーム",
@@ -947,9 +947,9 @@
     "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:",
+    "matrix-react-sdk version:": "matrix-react-sdk のバージョン:",
+    "riot-web version:": "riot-web のバージョン:",
+    "olm version:": "olm のバージョン:",
     "Failed to send email": "メールを送信できませんでした",
     "The email address linked to your account must be entered.": "あなたのアカウントにリンクされているメールアドレスを入力する必要があります。",
     "A new password must be entered.": "新しいパスワードを入力する必要があります。",
@@ -1124,7 +1124,7 @@
     "Enable Community Filter Panel": "コミュニティーフィルターパネルを有効にする",
     "Show recently visited rooms above the room list": "最近訪問した部屋をリストの上位に表示する",
     "Low bandwidth mode": "低帯域通信モード",
-    "Public Name": "パブリック名",
+    "Public Name": "公開名",
     "Upload profile picture": "プロフィール画像をアップロード",
     "<a>Upgrade</a> to your own domain": "あなた自身のドメインに<a>アップグレード</a>",
     "Phone numbers": "電話番号",
@@ -1134,7 +1134,7 @@
     "General": "一般",
     "Preferences": "環境設定",
     "Security & Privacy": "セキュリティとプライバシー",
-    "A device's public name is visible to people you communicate with": "デバイスのパブリック名はあなたと会話するすべての人が閲覧できます",
+    "A device's public name is visible to people you communicate with": "デバイスの公開名はあなたと会話するすべての人が閲覧できます",
     "Room information": "部屋の情報",
     "Internal room ID:": "内部 部屋ID:",
     "Room version": "部屋のバージョン",
@@ -1195,5 +1195,28 @@
     "Other servers": "他のサーバー",
     "Sign in to your Matrix account on %(serverName)s": "%(serverName)s上のMatrixアカウントにサインインします",
     "Sign in to your Matrix account on <underlinedServerName />": "<underlinedServerName />上のMatrixアカウントにサインインします",
-    "Create account": "アカウントを作成"
+    "Create account": "アカウントを作成",
+    "Error upgrading room": "部屋のアップグレード中にエラーが発生しました",
+    "%(senderName)s placed a voice call.": "%(senderName)s が音声通話を行いました。",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s が音声通話を行いました。 (このブラウザではサポートされていません)",
+    "%(senderName)s placed a video call.": "%(senderName)s がビデオ通話を行いました。",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s がビデオ通話を行いました。 (このブラウザではサポートされていません)",
+    "Match system theme": "システムテーマに合わせる",
+    "Allow Peer-to-Peer for 1:1 calls": "1対1通話でP2P(ピアツーピア)を許可する",
+    "Delete Backup": "バックアップを削除",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと参加者だけです。",
+    "Restore from Backup": "バックアップから復元",
+    "This device is backing up your keys. ": "このデバイスは鍵をバックアップしています。 ",
+    "Enable desktop notifications for this device": "このデバイスでデスクトップ通知を有効にする",
+    "Credits": "クレジット",
+    "For help with using Riot, click <a>here</a>.": "Riotの使用方法に関するヘルプは<a>こちら</a>をご覧ください。",
+    "Help & About": "ヘルプと概要",
+    "Bug reporting": "バグの報告",
+    "FAQ": "よくある質問",
+    "Versions": "バージョン",
+    "Key backup": "鍵のバックアップ",
+    "Voice & Video": "音声とビデオ",
+    "Remove recent messages": "最近のメッセージを削除する",
+    "%(creator)s created and configured the room.": "%(creator)s が部屋を作成して構成しました。",
+    "Add room": "部屋を追加"
 }

From 9a1be1a24d53bac3ea0771f8550ec0b337004f42 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 21:54:14 +0000
Subject: [PATCH 0350/3235] Don't try to set crypto options without crypto
 enabled

---
 src/components/structures/MatrixChat.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a07446d971..323bec4441 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1505,16 +1505,17 @@ export default createReactClass({
                 "blacklistUnverifiedDevices",
             );
             cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
+
+            // With cross-signing enabled, we send to unknown devices
+            // without prompting. Any bad-device status the user should
+            // be aware of will be signalled through the room shield
+            // changing colour. More advanced behaviour will come once
+            // we implement more settings.
+            cli.setGlobalErrorOnUnknownDevices(
+                !SettingsStore.isFeatureEnabled("feature_cross_signing"),
+            );
         }
 
-        // With cross-signing enabled, we send to unknown devices
-        // without prompting. Any bad-device status the user should
-        // be aware of will be signalled through the room shield
-        // changing colour. More advanced behaviour will come once
-        // we implement more settings.
-        cli.setGlobalErrorOnUnknownDevices(
-            !SettingsStore.isFeatureEnabled("feature_cross_signing"),
-        );
     },
 
     showScreen: function(screen, params) {

From 14501b748b9633e7a3990d846c25ff53c6f38e12 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 21:58:26 +0000
Subject: [PATCH 0351/3235] lint again

---
 src/components/structures/MatrixChat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 323bec4441..2515035996 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1515,7 +1515,6 @@ export default createReactClass({
                 !SettingsStore.isFeatureEnabled("feature_cross_signing"),
             );
         }
-
     },
 
     showScreen: function(screen, params) {

From 813b14018ed23db5def3a486262ee66a8723be37 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 13:36:35 -0700
Subject: [PATCH 0352/3235] Fix CI build steps for new environment.

Some of the CI stuff requires the autogenerated files to be present. Easiest way to get them all is to build the thing. Previously this was done in an install stage, but we don't do that anymore.
---
 .buildkite/pipeline.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index e5ee817934..a8ce1273fb 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -33,12 +33,13 @@ steps:
       queue: "medium"
     command:
       - "echo '--- Install js-sdk'"
-      # Run tests
       # TODO: Remove hacky chmod for BuildKite
       - "chmod +x ./scripts/ci/*.sh"
       - "chmod +x ./scripts/*"
       - "echo '--- Installing Dependencies'"
       - "./scripts/ci/install-deps.sh"
+      - "echo '--- Running initial build steps'"
+      - "yarn build"
       - "echo '+++ Running Tests'"
       - "yarn test"
     plugins:
@@ -49,6 +50,7 @@ steps:
     command:
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh"
+      - "echo '+++ Building Project'"
       - "yarn build"
     plugins:
       - docker#v3.0.1:
@@ -66,6 +68,9 @@ steps:
       - "chmod +x ./scripts/*"
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh"
+      - "echo '--- Running initial build steps'"
+      - "yarn build"
+      - "echo '+++ Running Tests'"
       - "./scripts/ci/end-to-end-tests.sh"
     plugins:
       - docker#v3.0.1:
@@ -84,12 +89,13 @@ steps:
       - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
       - "apt-get update"
       - "apt-get install -y google-chrome-stable"
-      # Run tests
       # TODO: Remove hacky chmod for BuildKite
       - "chmod +x ./scripts/ci/*.sh"
       - "chmod +x ./scripts/*"
       - "echo '--- Installing Dependencies'"
       - "./scripts/ci/install-deps.sh"
+      - "echo '--- Running initial build steps'"
+      - "yarn build"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/riot-unit-tests.sh"
     env:

From 1e70af00a3b2368660f69d42b7b1760674d0e241 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 17:28:24 -0700
Subject: [PATCH 0353/3235] Fix GroupView test

It was counting the wrong number of updates for reasons I don't understand.
---
 test/components/structures/GroupView-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index eac471190c..fb942d2f7c 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -302,7 +302,7 @@ describe('GroupView', function() {
 
     it('should show a RoomDetailList after a successful /summary & /rooms (no rooms returned)', function() {
         const groupView = ReactTestUtils.findRenderedComponentWithType(root, GroupView);
-        const prom = waitForUpdate(groupView, 5).then(() => {
+        const prom = waitForUpdate(groupView, 4).then(() => {
             const roomDetailList = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_RoomDetailList');
             const roomDetailListElement = ReactDOM.findDOMNode(roomDetailList);
             expect(roomDetailListElement).toBeTruthy();

From 90c7535a695cb6111a308683a9189bd3c78646ff Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 17:51:17 -0700
Subject: [PATCH 0354/3235] Export VIEWS from MatrixChat for riot-web tests

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e88c1bfa16..cca86ff764 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -65,7 +65,7 @@ import { defer } from "../../utils/promise";
 import KeyVerificationStateObserver from '../../utils/KeyVerificationStateObserver';
 
 /** constants for MatrixChat.state.view */
-const VIEWS = {
+export const VIEWS = {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
     LOADING: 0,

From 9188183c9bc5e00d8bdfaa21415b34151fb82859 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 21:04:13 -0700
Subject: [PATCH 0355/3235] Improve the quality of invite suggestions by
 filtering out DMs

This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
---
 src/components/views/dialogs/DMInviteDialog.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 371768eb4e..1a6e387f46 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -332,6 +332,11 @@ export default class DMInviteDialog extends React.PureComponent {
 
         // Generates { userId: {member, rooms[]} }
         const memberRooms = joinedRooms.reduce((members, room) => {
+            // Filter out DMs (we'll handle these in the recents section)
+            if (!!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                return members; // Do nothing
+            }
+
             const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
             for (const member of joinedMembers) {
                 if (!members[member.userId]) {
@@ -377,6 +382,7 @@ export default class DMInviteDialog extends React.PureComponent {
             }
             return b.score - a.score;
         });
+
         return members.map(m => ({userId: m.member.userId, user: m.member}));
     }
 

From b69b284efa25640c69c7e5a33382bc458021f81e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 21:20:01 -0700
Subject: [PATCH 0356/3235] Humanize the recent DM rooms ourselves for
 translations

---
 package.json                                  |  1 -
 .../views/dialogs/DMInviteDialog.js           |  6 +-
 src/i18n/strings/en_EN.json                   | 14 +++++
 src/utils/humanize.js                         | 57 +++++++++++++++++++
 yarn.lock                                     |  5 --
 5 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 src/utils/humanize.js

diff --git a/package.json b/package.json
index 4cbfd84882..df354d3ff6 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
     "html-entities": "^1.2.1",
-    "humanize": "^0.0.9",
     "is-ip": "^2.0.0",
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 371768eb4e..54d3ab8337 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -22,7 +22,6 @@ import MatrixClientPeg from "../../../MatrixClientPeg";
 import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/lib/matrix";
-import * as humanize from "humanize";
 import SdkConfig from "../../../SdkConfig";
 import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo";
 import * as Email from "../../../email";
@@ -31,6 +30,7 @@ import {abbreviateUrl} from "../../../utils/UrlUtils";
 import dis from "../../../dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
+import {humanizeTime} from "../../../utils/humanize";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -226,9 +226,7 @@ class DMRoomTile extends React.PureComponent {
 
         let timestamp = null;
         if (this.props.lastActiveTs) {
-            // TODO: [TravisR] Figure out how to i18n this
-            // `humanize` wants seconds for a timestamp, so divide by 1000
-            const humanTs = humanize.relativeTime(this.props.lastActiveTs / 1000);
+            const humanTs = humanizeTime(this.props.lastActiveTs);
             timestamp = <span className='mx_DMInviteDialog_roomTile_time'>{humanTs}</span>;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e3aaf044c3..b1c8b12d86 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -309,6 +309,20 @@
     "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
     "%(items)s and %(count)s others|one": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
+    "a few seconds ago": "a few seconds ago",
+    "about a minute ago": "about a minute ago",
+    "%(num)s minutes ago": "%(num)s minutes ago",
+    "about an hour ago": "about an hour ago",
+    "%(num)s hours ago": "%(num)s hours ago",
+    "about a day ago": "about a day ago",
+    "%(num)s days ago": "%(num)s days ago",
+    "a few seconds from now": "a few seconds from now",
+    "about a minute from now": "about a minute from now",
+    "%(num)s minutes from now": "%(num)s minutes from now",
+    "about an hour from now": "about an hour from now",
+    "%(num)s hours from now": "%(num)s hours from now",
+    "about a day from now": "about a day from now",
+    "%(num)s days from now": "%(num)s days from now",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "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",
diff --git a/src/utils/humanize.js b/src/utils/humanize.js
new file mode 100644
index 0000000000..6e6f17f8f4
--- /dev/null
+++ b/src/utils/humanize.js
@@ -0,0 +1,57 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {_t} from "../languageHandler";
+
+/**
+ * Converts a timestamp into human-readable, translated, text.
+ * @param {number} timeMillis The time in millis to compare against.
+ * @returns {string} The humanized time.
+ */
+export function humanizeTime(timeMillis) {
+    // These are the constants we use for when to break the text
+    const MILLISECONDS_RECENT = 15000;
+    const MILLISECONDS_1_MIN = 75000;
+    const MINUTES_UNDER_1_HOUR = 45;
+    const MINUTES_1_HOUR = 75;
+    const HOURS_UNDER_1_DAY = 23;
+    const HOURS_1_DAY = 26;
+
+    const now = (new Date()).getTime();
+    let msAgo = now - timeMillis;
+    const minutes = Math.abs(Math.ceil(msAgo / 60000));
+    const hours = Math.ceil(minutes / 60);
+    const days = Math.ceil(hours / 24);
+
+    if (msAgo >= 0) { // Past
+        if (msAgo <= MILLISECONDS_RECENT) return _t("a few seconds ago");
+        if (msAgo <= MILLISECONDS_1_MIN) return _t("about a minute ago");
+        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes ago", {num: minutes});
+        if (minutes <= MINUTES_1_HOUR) return _t("about an hour ago");
+        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours ago", {num: hours});
+        if (hours <= HOURS_1_DAY) return _t("about a day ago");
+        return _t("%(num)s days ago", {num: days});
+    } else { // Future
+        msAgo = Math.abs(msAgo);
+        if (msAgo <= MILLISECONDS_RECENT) return _t("a few seconds from now");
+        if (msAgo <= MILLISECONDS_1_MIN) return _t("about a minute from now");
+        if (minutes <= MINUTES_UNDER_1_HOUR) return _t("%(num)s minutes from now", {num: minutes});
+        if (minutes <= MINUTES_1_HOUR) return _t("about an hour from now");
+        if (hours <= HOURS_UNDER_1_DAY) return _t("%(num)s hours from now", {num: hours});
+        if (hours <= HOURS_1_DAY) return _t("about a day from now");
+        return _t("%(num)s days from now", {num: days});
+    }
+}
diff --git a/yarn.lock b/yarn.lock
index 0ea3190258..b31cd3ab4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4258,11 +4258,6 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-humanize@^0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
-  integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"

From 76183fc8fd1a184dd54667efc9dbaab1877fb3e2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 13 Jan 2020 21:21:18 -0700
Subject: [PATCH 0357/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 1a6e387f46..ceab2fea02 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -333,7 +333,7 @@ export default class DMInviteDialog extends React.PureComponent {
         // Generates { userId: {member, rooms[]} }
         const memberRooms = joinedRooms.reduce((members, room) => {
             // Filter out DMs (we'll handle these in the recents section)
-            if (!!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+            if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
                 return members; // Do nothing
             }
 

From f617fb7bbec66ec2d474f1d4c7e8ba7efa3f8440 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 14 Jan 2020 10:31:01 +0000
Subject: [PATCH 0358/3235] Place RoomHeader privacy padlocks behind the
 crosssigning feature flag

---
 src/components/views/rooms/RoomHeader.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 76c85ea54b..6807cc98a8 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -163,6 +163,9 @@ module.exports = createReactClass({
         const joinRule = joinRules && joinRules.getContent().join_rule;
         const joinRuleClass = classNames("mx_RoomHeader_PrivateIcon",
                                          {"mx_RoomHeader_isPrivate": joinRule === "invite"});
+        const privateIcon = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+            <div className={joinRuleClass} /> :
+            undefined;
 
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
@@ -308,7 +311,7 @@ module.exports = createReactClass({
                 <div className="mx_RoomHeader_wrapper">
                     <div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
                     { e2eIcon }
-                    <div className={joinRuleClass} />
+                    { privateIcon }
                     { name }
                     { topicElement }
                     { cancelButton }

From 44ca35296a8d62860f11b94c4f1bf550822c7d41 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Tue, 14 Jan 2020 11:31:00 +0000
Subject: [PATCH 0359/3235] Consistent capitalisation

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 60d1f4c1a0..414a51bb31 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -553,7 +553,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _titleForPhase(phase) {
         switch (phase) {
             case PHASE_RESTORE_KEY_BACKUP:
-                return _t('Restore Your Key Backup');
+                return _t('Restore your Key Backup');
             case PHASE_MIGRATE:
                 return _t('Migrate from Key Backup');
             case PHASE_PASSPHRASE:

From 94e4d5bf1f212b8334543e8bb0e3cec2822f79de Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Jan 2020 11:32:30 +0000
Subject: [PATCH 0360/3235] s/sign-in/session/

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

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 414a51bb31..608fc964ab 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -282,7 +282,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return <div>
             <p>{_t(
                 "Key Backup is enabled on your account but has not been set " +
-                "up from this sign-in. To set up secret storage, " +
+                "up from this session. To set up secret storage, " +
                 "restore your key backup.",
             )}</p>
             <DialogButtons primaryButton={_t('Cancel')}

From c91af5ae498d9562cca7d91dd3afde58f7a868ad Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Jan 2020 11:33:16 +0000
Subject: [PATCH 0361/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3624a7c743..b71f22f136 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1933,7 +1933,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Key Backup is enabled on your account but has not been set up from this sign-in. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this sign-in. To set up secret storage, restore your key backup.",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
@@ -1961,7 +1961,7 @@
     "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
-    "Restore Your Key Backup": "Restore Your Key Backup",
+    "Restore your Key Backup": "Restore your Key Backup",
     "Migrate from Key Backup": "Migrate from Key Backup",
     "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
     "Confirm your passphrase": "Confirm your passphrase",

From 24552f567ece2a9bc1873e8cf913c5acbeb23735 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Jan 2020 11:52:00 +0000
Subject: [PATCH 0362/3235] Add primary button to trigger restore flow

---
 .../secretstorage/CreateSecretStorageDialog.js    | 15 ++++++++++++---
 src/i18n/strings/en_EN.json                       |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 608fc964ab..b6d314aab1 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -170,6 +170,14 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.props.onFinished(true);
     }
 
+    _onRestoreKeyBackupClick = () => {
+        const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
+        Modal.createTrackedDialog(
+            'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+            /* priority = */ false, /* static = */ true,
+        );
+    }
+
     _onOptOutClick = () => {
         this.setState({phase: PHASE_OPTOUT_CONFIRM});
     }
@@ -285,9 +293,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "up from this session. To set up secret storage, " +
                 "restore your key backup.",
             )}</p>
-            <DialogButtons primaryButton={_t('Cancel')}
-                onPrimaryButtonClick={this._onCancel}
-                hasCancel={false}
+            <DialogButtons primaryButton={_t('Restore')}
+                onPrimaryButtonClick={this._onRestoreKeyBackupClick}
+                onCancel={this._onCancel}
+                hasCancel={true}
             >
             </DialogButtons>
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b71f22f136..19c31d540a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1934,6 +1934,7 @@
     "File to import": "File to import",
     "Import": "Import",
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
+    "Restore": "Restore",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",

From 1aec21562467dca4d25ecbdc06fde06efce138b6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 14 Jan 2020 03:18:51 +0000
Subject: [PATCH 0363/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2001 of 2001 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9401bb4a65..1216ad79a9 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2036,5 +2036,7 @@
     "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。",
     "Suggestions": "建議",
     "Failed to find the following users": "找不到以下使用者",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s"
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s",
+    "Show a presence dot next to DMs in the room list": "在聊天室清單中的直接訊息旁顯示上線狀態點",
+    "Lock": "鎖定"
 }

From 1542ea75c9702d30faa0d99380a85dd2a188a956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 14 Jan 2020 08:15:09 +0000
Subject: [PATCH 0364/3235] Translated using Weblate (French)

Currently translated at 100.0% (2001 of 2001 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 d526c53430..84cdf623ee 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2036,5 +2036,7 @@
     "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon.",
     "Suggestions": "Suggestions",
     "Failed to find the following users": "Impossible de trouver les utilisateurs suivants",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s"
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s",
+    "Show a presence dot next to DMs in the room list": "Afficher une pastille de présence à côté des messages directs dans la liste des salons",
+    "Lock": "Cadenas"
 }

From b556208014620de8de1d72b688c64bf7c2a1e1af Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 13 Jan 2020 21:43:10 +0000
Subject: [PATCH 0365/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2001 of 2001 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 900694e2ab..0dcea60fda 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2038,5 +2038,6 @@
     "Suggestions": "Javaslatok",
     "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s",
-    "Show a presence dot next to DMs in the room list": "Jelenlét pötty mutatása a Közvetlen beszélgetések mellett a szobák listájában"
+    "Show a presence dot next to DMs in the room list": "Jelenlét pötty mutatása a Közvetlen beszélgetések mellett a szobák listájában",
+    "Lock": "Zár"
 }

From d37c19d785f06e2ba0a42712f29036f9cc8f9142 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Jan 2020 00:27:54 +0000
Subject: [PATCH 0366/3235] Fix timing of when Composer considers itself to be
 modified

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 15585ffea0..080d248a29 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -126,6 +126,7 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     _updateEditorState = (selection, inputType, diff) => {
+        this._modifiedFlag = true;
         renderModel(this._editorRef, this.props.model);
         if (selection) { // set the caret/selection
             try {
@@ -205,7 +206,6 @@ export default class BasicMessageEditor extends React.Component {
         const {partCreator} = model;
         const text = event.clipboardData.getData("text/plain");
         if (text) {
-            this._modifiedFlag = true;
             const range = getRangeForSelection(this._editorRef, model, document.getSelection());
             const parts = parsePlainTextMessage(text, partCreator);
             replaceRangeAndMoveCaret(range, parts);
@@ -218,7 +218,6 @@ export default class BasicMessageEditor extends React.Component {
         if (this._isIMEComposing) {
             return;
         }
-        this._modifiedFlag = true;
         const sel = document.getSelection();
         const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
         this.props.model.update(text, event.inputType, caret);
@@ -230,7 +229,6 @@ export default class BasicMessageEditor extends React.Component {
         const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
         caret.offset += textToInsert.length;
         this.props.model.update(newText, inputType, caret);
-        this._modifiedFlag = true;
     }
 
     // this is used later to see if we need to recalculate the caret

From 5252cf4c454c8790ea7f5d12eb7e8ac426aa57a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Jan 2020 02:44:22 +0000
Subject: [PATCH 0367/3235] Implement roving tab index context based magic
 thing and demo on LeftPanel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_RoomTile.scss            |   5 +-
 src/components/structures/LeftPanel.js        |   3 -
 src/components/structures/RoomSubList.js      |  36 +++-
 .../views/groups/GroupInviteTile.js           |  17 +-
 src/components/views/rooms/RoomList.js        |   5 +-
 src/components/views/rooms/RoomTile.js        |   8 +-
 src/contexts/RovingTabIndexContext.js         | 193 ++++++++++++++++++
 7 files changed, 242 insertions(+), 25 deletions(-)
 create mode 100644 src/contexts/RovingTabIndexContext.js

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index cb1137bb2f..db2c09f6f1 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -142,10 +142,11 @@ limitations under the License.
     }
 }
 
-// toggle menuButton and badge on hover/menu displayed
+// toggle menuButton and badge on menu displayed
 .mx_RoomTile_menuDisplayed,
 // or on keyboard focus of room tile
-.mx_RoomTile.focus-visible:focus-within,
+.mx_LeftPanel_container:not(.collapsed) .mx_RoomTile:focus-within,
+// or on pointer hover
 .mx_LeftPanel_container:not(.collapsed) .mx_RoomTile:hover {
     .mx_RoomTile_menuButton {
         display: block;
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 796840a625..3444225d06 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -129,9 +129,6 @@ const LeftPanel = createReactClass({
         if (!this.focusedElement) return;
 
         switch (ev.key) {
-            case Key.TAB:
-                this._onMoveFocus(ev, ev.shiftKey);
-                break;
             case Key.ARROW_UP:
                 this._onMoveFocus(ev, true, true);
                 break;
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 123ed7c4e1..915a952e79 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -31,6 +31,7 @@ import PropTypes from 'prop-types';
 import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
+import {RovingTabIndex, RovingTabIndexGroup} from "../../contexts/RovingTabIndexContext";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
@@ -272,20 +273,32 @@ export default class RoomSubList extends React.PureComponent {
             // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
             if (subListNotifCount > 0) {
                 badge = (
-                    <AccessibleButton className={badgeClasses} onClick={this._onNotifBadgeClick} aria-label={_t("Jump to first unread room.")}>
+                    <RovingTabIndex
+                        component={AccessibleButton}
+                        useInputRef
+                        className={badgeClasses}
+                        onClick={this._onNotifBadgeClick}
+                        aria-label={_t("Jump to first unread room.")}
+                    >
                         <div>
                             { FormattingUtils.formatCount(subListNotifCount) }
                         </div>
-                    </AccessibleButton>
+                    </RovingTabIndex>
                 );
             } else if (this.props.isInvite && this.props.list.length) {
                 // no notifications but highlight anyway because this is an invite badge
                 badge = (
-                    <AccessibleButton className={badgeClasses} onClick={this._onInviteBadgeClick} aria-label={_t("Jump to first invite.")}>
+                    <RovingTabIndex
+                        component={AccessibleButton}
+                        useInputRef
+                        className={badgeClasses}
+                        onClick={this._onInviteBadgeClick}
+                        aria-label={_t("Jump to first invite.")}
+                    >
                         <div>
                             { this.props.list.length }
                         </div>
-                    </AccessibleButton>
+                    </RovingTabIndex>
                 );
             }
         }
@@ -308,7 +321,9 @@ export default class RoomSubList extends React.PureComponent {
         let addRoomButton;
         if (this.props.onAddRoom) {
             addRoomButton = (
-                <AccessibleTooltipButton
+                <RovingTabIndex
+                    component={AccessibleTooltipButton}
+                    useInputRef
                     onClick={this.onAddRoom}
                     className="mx_RoomSubList_addRoom"
                     title={this.props.addRoomLabel || _t("Add room")}
@@ -327,12 +342,13 @@ export default class RoomSubList extends React.PureComponent {
             chevron = (<div className={chevronClasses} />);
         }
 
-        return (
+        return <RovingTabIndexGroup>
             <div className="mx_RoomSubList_labelContainer" title={title} ref={this._header} onKeyDown={this.onHeaderKeyDown}>
-                <AccessibleButton
+                <RovingTabIndex
+                    component={AccessibleButton}
+                    useInputRef
                     onClick={this.onClick}
                     className="mx_RoomSubList_label"
-                    tabIndex={0}
                     aria-expanded={!isCollapsed}
                     inputRef={this._headerButton}
                     role="treeitem"
@@ -341,11 +357,11 @@ export default class RoomSubList extends React.PureComponent {
                     { chevron }
                     <span>{this.props.label}</span>
                     { incomingCall }
-                </AccessibleButton>
+                </RovingTabIndex>
                 { badge }
                 { addRoomButton }
             </div>
-        );
+        </RovingTabIndexGroup>;
     }
 
     checkOverflow = () => {
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index c0d0d9eafe..e7ccbdf40b 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -26,6 +26,7 @@ import classNames from 'classnames';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {RovingTabIndex, RovingTabIndexGroup} from "../../../contexts/RovingTabIndexContext";
 
 // XXX this class copies a lot from RoomTile.js
 export default createReactClass({
@@ -138,14 +139,16 @@ export default createReactClass({
 
         const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
         const badge = (
-            <ContextMenuButton
+            <RovingTabIndex
+                component={ContextMenuButton}
+                useInputRef
                 className={badgeClasses}
                 onClick={this.onContextMenuButtonClick}
                 label={_t("Options")}
                 isExpanded={isMenuDisplayed}
             >
                 { badgeContent }
-            </ContextMenuButton>
+            </RovingTabIndex>
         );
 
         let tooltip;
@@ -170,8 +173,10 @@ export default createReactClass({
             );
         }
 
-        return <React.Fragment>
-            <AccessibleButton
+        return <RovingTabIndexGroup>
+            <RovingTabIndex
+                component={AccessibleButton}
+                useInputRef
                 className={classes}
                 onClick={this.onClick}
                 onMouseEnter={this.onMouseEnter}
@@ -186,9 +191,9 @@ export default createReactClass({
                     { badge }
                 </div>
                 { tooltip }
-            </AccessibleButton>
+            </RovingTabIndex>
 
             { contextMenu }
-        </React.Fragment>;
+        </RovingTabIndexGroup>;
     },
 });
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 35a5ca9e66..277aedb65e 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -41,6 +41,7 @@ import ResizeHandle from '../elements/ResizeHandle';
 
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
+import {RovingTabIndexContextWrapper} from "../../../contexts/RovingTabIndexContext";
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
 const HOVER_MOVE_TIMEOUT = 1000;
@@ -788,7 +789,9 @@ module.exports = createReactClass({
                 onMouseMove={this.onMouseMove}
                 onMouseLeave={this.onMouseLeave}
             >
-                { subListComponents }
+                <RovingTabIndexContextWrapper>
+                    { subListComponents }
+                </RovingTabIndexContextWrapper>
             </div>
         );
     },
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 4dbcc7ca03..6358564042 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,6 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
+import {RovingTabIndex} from "../../../contexts/RovingTabIndexContext";
 
 module.exports = createReactClass({
     displayName: 'RoomTile',
@@ -432,8 +433,9 @@ module.exports = createReactClass({
         }
 
         return <React.Fragment>
-            <AccessibleButton
-                tabIndex="0"
+            <RovingTabIndex
+                component={AccessibleButton}
+                useInputRef
                 className={classes}
                 onClick={this.onClick}
                 onMouseEnter={this.onMouseEnter}
@@ -461,7 +463,7 @@ module.exports = createReactClass({
                 </div>
                 { /* { incomingCallBox } */ }
                 { tooltip }
-            </AccessibleButton>
+            </RovingTabIndex>
 
             { contextMenu }
         </React.Fragment>;
diff --git a/src/contexts/RovingTabIndexContext.js b/src/contexts/RovingTabIndexContext.js
new file mode 100644
index 0000000000..a571bd2eae
--- /dev/null
+++ b/src/contexts/RovingTabIndexContext.js
@@ -0,0 +1,193 @@
+/*
+ *
+ * Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+ *
+ * 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, {
+    createContext,
+    useCallback,
+    useContext,
+    useLayoutEffect,
+    useMemo,
+    useRef,
+    useReducer,
+} from "react";
+import PropTypes from "prop-types";
+import {Key} from "../Keyboard";
+
+const DOCUMENT_POSITION_PRECEDING = 2;
+const ANY = Symbol();
+
+const RovingTabIndexContext = createContext({
+    state: {
+        activeRef: null,
+        refs: [],
+    },
+    dispatch: () => {},
+});
+RovingTabIndexContext.displayName = "RovingTabIndexContext";
+
+// TODO use a TypeScript type here
+const types = {
+    REGISTER: "REGISTER",
+    UNREGISTER: "UNREGISTER",
+    SET_FOCUS: "SET_FOCUS",
+};
+
+const reducer = (state, action) => {
+    switch (action.type) {
+        case types.REGISTER: {
+            if (state.refs.length === 0) {
+                return {
+                    ...state,
+                    activeRef: action.payload.ref,
+                    refs: [action.payload.ref],
+                };
+            }
+
+            if (state.refs.includes(action.payload.ref)) {
+                return state; // already in refs, this should not happen
+            }
+
+            let newIndex = state.refs.findIndex(ref => {
+                return ref.current.compareDocumentPosition(action.payload.ref.current) & DOCUMENT_POSITION_PRECEDING;
+            });
+
+            if (newIndex < 0) {
+                newIndex = state.refs.length; // append to the end
+            }
+
+            return {
+                ...state,
+                refs: [
+                    ...state.refs.slice(0, newIndex),
+                    action.payload.ref,
+                    ...state.refs.slice(newIndex),
+                ],
+            };
+        }
+        case types.UNREGISTER: {
+            const refs = state.refs.filter(r => r !== action.payload.ref); // keep all other refs
+
+            if (refs.length === state.refs.length) {
+                return state; // already removed, this should not happen
+            }
+
+            if (state.activeRef === action.payload.ref) { // we just removed the active ref, need to replace it
+                const oldIndex = state.refs.findIndex(r => r === action.payload.ref);
+                return {
+                    ...state,
+                    activeRef: oldIndex >= refs.length ? refs[refs.length - 1] : refs[oldIndex],
+                    refs,
+                };
+            }
+
+            return {
+                ...state,
+                refs,
+            };
+        }
+        case types.SET_FOCUS: {
+            return {
+                ...state,
+                activeRef: action.payload.ref,
+            };
+        }
+        default:
+            return state;
+    }
+};
+
+export const RovingTabIndexContextWrapper = ({children}) => {
+    const [state, dispatch] = useReducer(reducer, {
+        activeRef: null,
+        refs: [],
+    });
+
+    const context = useMemo(() => ({state, dispatch}), [state]);
+
+    return <RovingTabIndexContext.Provider value={context}>
+        {children}
+    </RovingTabIndexContext.Provider>;
+};
+
+export const useRovingTabIndex = () => {
+    const ref = useRef(null);
+    const context = useContext(RovingTabIndexContext);
+
+    // setup/teardown
+    // add ref to the context
+    useLayoutEffect(() => {
+        context.dispatch({
+            type: types.REGISTER,
+            payload: {ref},
+        });
+        return () => {
+            context.dispatch({
+                type: types.UNREGISTER,
+                payload: {ref},
+            });
+        };
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+    const onFocus = useCallback(() => {
+        context.dispatch({
+            type: types.SET_FOCUS,
+            payload: {ref},
+        });
+    }, [ref, context]);
+    const isActive = context.state.activeRef === ref || context.state.activeRef === ANY;
+    return [onFocus, isActive, ref];
+};
+
+export const RovingTabIndexGroup = ({children}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex();
+
+    // fake reducer dispatch to catch SET_FOCUS calls and pass them to parent as a focus of the group
+    const dispatch = useCallback(({type}) => {
+        if (type === types.SET_FOCUS) {
+            onFocus();
+        }
+    }, [onFocus]);
+
+    const context = useMemo(() => ({
+        state: {activeRef: isActive ? ANY : undefined},
+        dispatch,
+    }), [isActive, dispatch]);
+
+    return <div ref={ref}>
+        <RovingTabIndexContext.Provider value={context}>
+            {children}
+        </RovingTabIndexContext.Provider>
+    </div>;
+};
+
+// Wraps a given element to attach it to the roving context, props onFocus and tabIndex overridden
+export const RovingTabIndex = ({component: E, useInputRef, ...props}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex();
+    const refProps = {};
+    if (useInputRef) {
+        refProps.inputRef = ref;
+    } else {
+        refProps.ref = ref;
+    }
+    return <E {...props} {...refProps} onFocus={onFocus} tabIndex={isActive ? 0 : -1} />;
+};
+RovingTabIndex.propTypes = {
+    component: PropTypes.elementType.isRequired,
+    useInputRef: PropTypes.bool, // whether to pass inputRef instead of ref like for AccessibleButton
+};
+

From 443744733dc8fbea8c3bb805c29b1dbcb80a2a98 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 14 Jan 2020 23:32:00 -0700
Subject: [PATCH 0368/3235] Move DM creation logic into DMInviteDialog

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

The copy hasn't been reviewed by anyone and could probably use some work.
---
 res/css/views/dialogs/_DMInviteDialog.scss    | 11 +++
 src/RoomInvite.js                             | 14 ++-
 .../views/dialogs/DMInviteDialog.js           | 92 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  2 +
 src/utils/DMRoomMap.js                        | 21 +++++
 5 files changed, 122 insertions(+), 18 deletions(-)

diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_DMInviteDialog.scss
index f806e85120..5d58f3ae8b 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_DMInviteDialog.scss
@@ -67,6 +67,17 @@ limitations under the License.
         height: 25px;
         line-height: 25px;
     }
+
+    .mx_DMInviteDialog_buttonAndSpinner {
+        .mx_Spinner {
+            // Width and height are required to trick the layout engine.
+            width: 20px;
+            height: 20px;
+            margin-left: 5px;
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
 }
 
 .mx_DMInviteDialog_section {
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index ba9fe1f541..675efe53c8 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -36,21 +36,19 @@ import SettingsStore from "./settings/SettingsStore";
  * @param {string[]} addrs Array of strings of addresses to invite. May be matrix IDs or 3pids.
  * @returns {Promise} Promise
  */
-function inviteMultipleToRoom(roomId, addrs) {
+export function inviteMultipleToRoom(roomId, addrs) {
     const inviter = new MultiInviter(roomId);
     return inviter.invite(addrs).then(states => Promise.resolve({states, inviter}));
 }
 
 export function showStartChatInviteDialog() {
     if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
+        // This new dialog handles the room creation internally - we don't need to worry about it.
         const DMInviteDialog = sdk.getComponent("dialogs.DMInviteDialog");
-        Modal.createTrackedDialog('Start DM', '', DMInviteDialog, {
-            onFinished: (inviteIds) => {
-                // TODO: Replace _onStartDmFinished with less hacks
-                if (inviteIds.length > 0) _onStartDmFinished(true, inviteIds.map(i => ({address: i})));
-                // else ignore and just do nothing
-            },
-        }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+        Modal.createTrackedDialog(
+            'Start DM', '', DMInviteDialog, {},
+            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+        );
         return;
     }
 
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 371768eb4e..e82d63acad 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -31,6 +31,8 @@ import {abbreviateUrl} from "../../../utils/UrlUtils";
 import dis from "../../../dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
+import createRoom from "../../../createRoom";
+import {inviteMultipleToRoom} from "../../../RoomInvite";
 
 // TODO: [TravisR] Make this generic for all kinds of invites
 
@@ -295,6 +297,10 @@ export default class DMInviteDialog extends React.PureComponent {
             threepidResultsMixin: [], // { user: ThreepidMember, userId: string}[], like recents and suggestions
             canUseIdentityServer: !!MatrixClientPeg.get().getIdentityServerUrl(),
             tryingIdentityServer: false,
+
+            // These two flags are used for the 'Go' button to communicate what is going on.
+            busy: true,
+            errorText: _t("We couldn't create your DM. Please check the users you want to invite and try again."),
         };
 
         this._editorRef = createRef();
@@ -381,11 +387,66 @@ export default class DMInviteDialog extends React.PureComponent {
     }
 
     _startDm = () => {
-        this.props.onFinished(this.state.targets.map(t => t.userId));
+        this.setState({busy: true});
+        const targetIds = this.state.targets.map(t => t.userId);
+
+        // Check if there is already a DM with these people and reuse it if possible.
+        const existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+        if (existingRoom) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: existingRoom.roomId,
+                should_peek: false,
+                joining: false,
+            });
+            this.props.onFinished();
+            return;
+        }
+
+        // Check if it's a traditional DM and create the room if required.
+        // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
+        let createRoomPromise = Promise.resolve();
+        if (targetIds.length === 1) {
+            createRoomPromise = createRoom({dmUserId: targetIds[0]})
+        } else {
+            // Create a boring room and try to invite the targets manually.
+            let room;
+            createRoomPromise = createRoom().then(roomId => {
+                room = MatrixClientPeg.get().getRoom(roomId);
+                return inviteMultipleToRoom(roomId, targetIds);
+            }).then(result => {
+                const failedUsers = Object.keys(result.states).filter(a => result.states[a] === 'error');
+                if (failedUsers.length > 0) {
+                    console.log("Failed to invite users: ", result);
+                    this.setState({
+                        busy: false,
+                        errorText: _t("Failed to invite the following users to chat: %(csvUsers)s", {
+                            csvUsers: failedUsers.join(", "),
+                        }),
+                    });
+                    return true; // abort
+                }
+            });
+        }
+
+        // the createRoom call will show the room for us, so we don't need to worry about that.
+        createRoomPromise.then(abort => {
+            if (abort === true) return; // only abort on true booleans, not roomIds or something
+            this.props.onFinished();
+        }).catch(err => {
+            console.error(err);
+            this.setState({
+                busy: false,
+                errorText: _t("We couldn't create your DM. Please check the users you want to invite and try again."),
+            });
+        });
     };
 
     _cancel = () => {
-        this.props.onFinished([]);
+        // We do not want the user to close the dialog while an action is in progress
+        if (this.state.busy) return;
+
+        this.props.onFinished();
     };
 
     _updateFilter = (e) => {
@@ -735,6 +796,12 @@ export default class DMInviteDialog extends React.PureComponent {
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+        const Spinner = sdk.getComponent("elements.Spinner");
+
+        let spinner = null;
+        if (this.state.busy) {
+            spinner = <Spinner w={20} h={20} />;
+        }
 
         const userId = MatrixClientPeg.get().getUserId();
         return (
@@ -755,15 +822,20 @@ export default class DMInviteDialog extends React.PureComponent {
                     </p>
                     <div className='mx_DMInviteDialog_addressBar'>
                         {this._renderEditor()}
-                        {this._renderIdentityServerWarning()}
-                        <AccessibleButton
-                            kind="primary"
-                            onClick={this._startDm}
-                            className='mx_DMInviteDialog_goButton'
-                        >
-                            {_t("Go")}
-                        </AccessibleButton>
+                        <div className='mx_DMInviteDialog_buttonAndSpinner'>
+                            <AccessibleButton
+                                kind="primary"
+                                onClick={this._startDm}
+                                className='mx_DMInviteDialog_goButton'
+                                disabled={this.state.busy}
+                            >
+                                {_t("Go")}
+                            </AccessibleButton>
+                            {spinner}
+                        </div>
                     </div>
+                    {this._renderIdentityServerWarning()}
+                    <div className='error'>{this.state.errorText}</div>
                     {this._renderSection('recents')}
                     {this._renderSection('suggestions')}
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9627ac0e14..82f0cf8521 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1423,6 +1423,8 @@
     "View Servers in Room": "View Servers in Room",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
     "Failed to find the following users": "Failed to find the following users",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
     "Recent Conversations": "Recent Conversations",
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index 498c073e0e..e42d724748 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -124,6 +124,27 @@ export default class DMRoomMap {
         return this._getUserToRooms()[userId] || [];
     }
 
+    /**
+     * Gets the DM room which the given IDs share, if any.
+     * @param {string[]} ids The identifiers (user IDs and email addresses) to look for.
+     * @returns {Room} The DM room which all IDs given share, or falsey if no common room.
+     */
+    getDMRoomForIdentifiers(ids) {
+        // TODO: [Canonical DMs] Handle lookups for email addresses.
+        // For now we'll pretend we only get user IDs and end up returning nothing for email addresses
+
+        let commonRooms = this.getDMRoomsForUserId(ids[0]);
+        for (let i = 1; i < ids.length; i++) {
+            const userRooms = this.getDMRoomsForUserId(ids[i]);
+            commonRooms = commonRooms.filter(r => userRooms.includes(r));
+        }
+
+        const joinedRooms = commonRooms.map(r => MatrixClientPeg.get().getRoom(r))
+            .filter(r => r && r.getMyMembership() === 'join');
+
+        return joinedRooms[0];
+    }
+
     getUserIdForRoomId(roomId) {
         if (this.roomToUser == null) {
             // we lazily populate roomToUser so you can use

From b9852c7264cff54246bfb3bbd9f42b5dd8cf047d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 14 Jan 2020 23:35:07 -0700
Subject: [PATCH 0369/3235] Appease the linter

---
 src/components/views/dialogs/DMInviteDialog.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index e82d63acad..904d531c60 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -407,12 +407,10 @@ export default class DMInviteDialog extends React.PureComponent {
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
         let createRoomPromise = Promise.resolve();
         if (targetIds.length === 1) {
-            createRoomPromise = createRoom({dmUserId: targetIds[0]})
+            createRoomPromise = createRoom({dmUserId: targetIds[0]});
         } else {
             // Create a boring room and try to invite the targets manually.
-            let room;
             createRoomPromise = createRoom().then(roomId => {
-                room = MatrixClientPeg.get().getRoom(roomId);
                 return inviteMultipleToRoom(roomId, targetIds);
             }).then(result => {
                 const failedUsers = Object.keys(result.states).filter(a => result.states[a] === 'error');

From 8b6a5d37aa10d4155a833c0b91ddd8de5ed903c4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 14 Jan 2020 23:35:45 -0700
Subject: [PATCH 0370/3235] Remove simulated error state used for screenshot

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

diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index 904d531c60..6422749d60 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -299,8 +299,8 @@ export default class DMInviteDialog extends React.PureComponent {
             tryingIdentityServer: false,
 
             // These two flags are used for the 'Go' button to communicate what is going on.
-            busy: true,
-            errorText: _t("We couldn't create your DM. Please check the users you want to invite and try again."),
+            busy: false,
+            errorText: null,
         };
 
         this._editorRef = createRef();

From dedf1eab315347cd85ea45ed3d6a85d60f542104 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Jan 2020 11:37:14 +0000
Subject: [PATCH 0371/3235] Iterate to get rid of the magic group and just
 provide a generic functional render wrapper

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js      | 149 +++++++++---------
 .../views/groups/GroupInviteTile.js           |  67 ++++----
 src/components/views/rooms/RoomTile.js        |  69 ++++----
 src/contexts/RovingTabIndexContext.js         |  81 +++++-----
 4 files changed, 184 insertions(+), 182 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 915a952e79..98e69f6edb 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -31,7 +31,7 @@ import PropTypes from 'prop-types';
 import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
-import {RovingTabIndex, RovingTabIndexGroup} from "../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../contexts/RovingTabIndexContext";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
@@ -264,45 +264,6 @@ export default class RoomSubList extends React.PureComponent {
         const subListNotifCount = subListNotifications.count;
         const subListNotifHighlight = subListNotifications.highlight;
 
-        let badge;
-        if (!this.props.collapsed) {
-            const badgeClasses = classNames({
-                'mx_RoomSubList_badge': true,
-                'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
-            });
-            // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
-            if (subListNotifCount > 0) {
-                badge = (
-                    <RovingTabIndex
-                        component={AccessibleButton}
-                        useInputRef
-                        className={badgeClasses}
-                        onClick={this._onNotifBadgeClick}
-                        aria-label={_t("Jump to first unread room.")}
-                    >
-                        <div>
-                            { FormattingUtils.formatCount(subListNotifCount) }
-                        </div>
-                    </RovingTabIndex>
-                );
-            } else if (this.props.isInvite && this.props.list.length) {
-                // no notifications but highlight anyway because this is an invite badge
-                badge = (
-                    <RovingTabIndex
-                        component={AccessibleButton}
-                        useInputRef
-                        className={badgeClasses}
-                        onClick={this._onInviteBadgeClick}
-                        aria-label={_t("Jump to first invite.")}
-                    >
-                        <div>
-                            { this.props.list.length }
-                        </div>
-                    </RovingTabIndex>
-                );
-            }
-        }
-
         // When collapsed, allow a long hover on the header to show user
         // the full tag name and room count
         let title;
@@ -318,19 +279,6 @@ export default class RoomSubList extends React.PureComponent {
                 <IncomingCallBox className="mx_RoomSubList_incomingCall" incomingCall={this.props.incomingCall} />;
         }
 
-        let addRoomButton;
-        if (this.props.onAddRoom) {
-            addRoomButton = (
-                <RovingTabIndex
-                    component={AccessibleTooltipButton}
-                    useInputRef
-                    onClick={this.onAddRoom}
-                    className="mx_RoomSubList_addRoom"
-                    title={this.props.addRoomLabel || _t("Add room")}
-                />
-            );
-        }
-
         const len = this.props.list.length + this.props.extraTiles.length;
         let chevron;
         if (len) {
@@ -342,26 +290,81 @@ export default class RoomSubList extends React.PureComponent {
             chevron = (<div className={chevronClasses} />);
         }
 
-        return <RovingTabIndexGroup>
-            <div className="mx_RoomSubList_labelContainer" title={title} ref={this._header} onKeyDown={this.onHeaderKeyDown}>
-                <RovingTabIndex
-                    component={AccessibleButton}
-                    useInputRef
-                    onClick={this.onClick}
-                    className="mx_RoomSubList_label"
-                    aria-expanded={!isCollapsed}
-                    inputRef={this._headerButton}
-                    role="treeitem"
-                    aria-level="1"
-                >
-                    { chevron }
-                    <span>{this.props.label}</span>
-                    { incomingCall }
-                </RovingTabIndex>
-                { badge }
-                { addRoomButton }
-            </div>
-        </RovingTabIndexGroup>;
+        return <RovingTabIndexWrapper inputRef={this._headerButton}>
+            {({onFocus, isActive, ref}) => {
+                const tabIndex = isActive ? 0 : -1;
+
+                let badge;
+                if (!this.props.collapsed) {
+                    const badgeClasses = classNames({
+                        'mx_RoomSubList_badge': true,
+                        'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
+                    });
+                    // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
+                    if (subListNotifCount > 0) {
+                        badge = (
+                            <AccessibleButton
+                                tabIndex={tabIndex}
+                                className={badgeClasses}
+                                onClick={this._onNotifBadgeClick}
+                                aria-label={_t("Jump to first unread room.")}
+                            >
+                                <div>
+                                    { FormattingUtils.formatCount(subListNotifCount) }
+                                </div>
+                            </AccessibleButton>
+                        );
+                    } else if (this.props.isInvite && this.props.list.length) {
+                        // no notifications but highlight anyway because this is an invite badge
+                        badge = (
+                            <AccessibleButton
+                                tabIndex={tabIndex}
+                                className={badgeClasses}
+                                onClick={this._onInviteBadgeClick}
+                                aria-label={_t("Jump to first invite.")}
+                            >
+                                <div>
+                                    { this.props.list.length }
+                                </div>
+                            </AccessibleButton>
+                        );
+                    }
+                }
+
+                let addRoomButton;
+                if (this.props.onAddRoom) {
+                    addRoomButton = (
+                        <AccessibleTooltipButton
+                            tabIndex={tabIndex}
+                            onClick={this.onAddRoom}
+                            className="mx_RoomSubList_addRoom"
+                            title={this.props.addRoomLabel || _t("Add room")}
+                        />
+                    );
+                }
+
+                return (
+                    <div className="mx_RoomSubList_labelContainer" title={title} ref={this._header} onKeyDown={this.onHeaderKeyDown}>
+                        <AccessibleButton
+                            onFocus={onFocus}
+                            tabIndex={tabIndex}
+                            inputRef={ref}
+                            onClick={this.onClick}
+                            className="mx_RoomSubList_label"
+                            aria-expanded={!isCollapsed}
+                            role="treeitem"
+                            aria-level="1"
+                        >
+                            { chevron }
+                            <span>{this.props.label}</span>
+                            { incomingCall }
+                        </AccessibleButton>
+                        { badge }
+                        { addRoomButton }
+                    </div>
+                );
+            } }
+        </RovingTabIndexWrapper>;
     }
 
     checkOverflow = () => {
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index e7ccbdf40b..70baeb1e78 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -26,7 +26,7 @@ import classNames from 'classnames';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {RovingTabIndex, RovingTabIndexGroup} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
 
 // XXX this class copies a lot from RoomTile.js
 export default createReactClass({
@@ -138,18 +138,6 @@ export default createReactClass({
         });
 
         const badgeContent = badgeEllipsis ? '\u00B7\u00B7\u00B7' : '!';
-        const badge = (
-            <RovingTabIndex
-                component={ContextMenuButton}
-                useInputRef
-                className={badgeClasses}
-                onClick={this.onContextMenuButtonClick}
-                label={_t("Options")}
-                isExpanded={isMenuDisplayed}
-            >
-                { badgeContent }
-            </RovingTabIndex>
-        );
 
         let tooltip;
         if (this.props.collapsed && this.state.hover) {
@@ -173,27 +161,40 @@ export default createReactClass({
             );
         }
 
-        return <RovingTabIndexGroup>
-            <RovingTabIndex
-                component={AccessibleButton}
-                useInputRef
-                className={classes}
-                onClick={this.onClick}
-                onMouseEnter={this.onMouseEnter}
-                onMouseLeave={this.onMouseLeave}
-                onContextMenu={this.onContextMenu}
-            >
-                <div className="mx_RoomTile_avatar">
-                    { av }
-                </div>
-                <div className="mx_RoomTile_nameContainer">
-                    { label }
-                    { badge }
-                </div>
-                { tooltip }
-            </RovingTabIndex>
+        return <React.Fragment>
+            <RovingTabIndexWrapper>
+                {({onFocus, isActive, ref}) =>
+                    <AccessibleButton
+                        onFocus={onFocus}
+                        tabIndex={isActive ? 0 : -1}
+                        inputRef={ref}
+                        className={classes}
+                        onClick={this.onClick}
+                        onMouseEnter={this.onMouseEnter}
+                        onMouseLeave={this.onMouseLeave}
+                        onContextMenu={this.onContextMenu}
+                    >
+                        <div className="mx_RoomTile_avatar">
+                            { av }
+                        </div>
+                        <div className="mx_RoomTile_nameContainer">
+                            { label }
+                            <ContextMenuButton
+                                className={badgeClasses}
+                                onClick={this.onContextMenuButtonClick}
+                                label={_t("Options")}
+                                isExpanded={isMenuDisplayed}
+                                tabIndex={isActive ? 0 : -1}
+                            >
+                                { badgeContent }
+                            </ContextMenuButton>
+                        </div>
+                        { tooltip }
+                    </AccessibleButton>
+                }
+            </RovingTabIndexWrapper>
 
             { contextMenu }
-        </RovingTabIndexGroup>;
+        </React.Fragment>;
     },
 });
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 6358564042..001baf0b96 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,7 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
-import {RovingTabIndex} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
 
 module.exports = createReactClass({
     displayName: 'RoomTile',
@@ -433,37 +433,42 @@ module.exports = createReactClass({
         }
 
         return <React.Fragment>
-            <RovingTabIndex
-                component={AccessibleButton}
-                useInputRef
-                className={classes}
-                onClick={this.onClick}
-                onMouseEnter={this.onMouseEnter}
-                onMouseLeave={this.onMouseLeave}
-                onContextMenu={this.onContextMenu}
-                aria-label={ariaLabel}
-                aria-selected={this.state.selected}
-                role="treeitem"
-            >
-                <div className={avatarClasses}>
-                    <div className="mx_RoomTile_avatar_container">
-                        <RoomAvatar room={this.props.room} width={24} height={24} />
-                        { dmIndicator }
-                    </div>
-                </div>
-                { privateIcon }
-                <div className="mx_RoomTile_nameContainer">
-                    <div className="mx_RoomTile_labelContainer">
-                        { label }
-                        { subtextLabel }
-                    </div>
-                    { dmOnline }
-                    { contextMenuButton }
-                    { badge }
-                </div>
-                { /* { incomingCallBox } */ }
-                { tooltip }
-            </RovingTabIndex>
+            <RovingTabIndexWrapper>
+                {({onFocus, isActive, ref}) =>
+                    <AccessibleButton
+                        onFocus={onFocus}
+                        tabIndex={isActive ? 0 : -1}
+                        inputRef={ref}
+                        className={classes}
+                        onClick={this.onClick}
+                        onMouseEnter={this.onMouseEnter}
+                        onMouseLeave={this.onMouseLeave}
+                        onContextMenu={this.onContextMenu}
+                        aria-label={ariaLabel}
+                        aria-selected={this.state.selected}
+                        role="treeitem"
+                    >
+                        <div className={avatarClasses}>
+                            <div className="mx_RoomTile_avatar_container">
+                                <RoomAvatar room={this.props.room} width={24} height={24} />
+                                { dmIndicator }
+                            </div>
+                        </div>
+                        { privateIcon }
+                        <div className="mx_RoomTile_nameContainer">
+                            <div className="mx_RoomTile_labelContainer">
+                                { label }
+                                { subtextLabel }
+                            </div>
+                            { dmOnline }
+                            { contextMenuButton }
+                            { badge }
+                        </div>
+                        { /* { incomingCallBox } */ }
+                        { tooltip }
+                    </AccessibleButton>
+                }
+            </RovingTabIndexWrapper>
 
             { contextMenu }
         </React.Fragment>;
diff --git a/src/contexts/RovingTabIndexContext.js b/src/contexts/RovingTabIndexContext.js
index a571bd2eae..f5001d28cc 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/contexts/RovingTabIndexContext.js
@@ -25,11 +25,9 @@ import React, {
     useRef,
     useReducer,
 } from "react";
-import PropTypes from "prop-types";
 import {Key} from "../Keyboard";
 
 const DOCUMENT_POSITION_PRECEDING = 2;
-const ANY = Symbol();
 
 const RovingTabIndexContext = createContext({
     state: {
@@ -119,15 +117,42 @@ export const RovingTabIndexContextWrapper = ({children}) => {
 
     const context = useMemo(() => ({state, dispatch}), [state]);
 
-    return <RovingTabIndexContext.Provider value={context}>
-        {children}
-    </RovingTabIndexContext.Provider>;
+    const onKeyDown = useCallback((ev) => {
+        if (state.refs.length <= 0) return;
+
+        let handled = true;
+        switch (ev.key) {
+            case Key.HOME:
+                setImmediate(() => state.refs[0].current.focus());
+                break;
+            case Key.END:
+                state.refs[state.refs.length - 1].current.focus();
+                break;
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            ev.preventDefault();
+            ev.stopPropagation();
+        }
+    }, [state]);
+
+    return <div onKeyDown={onKeyDown}>
+        <RovingTabIndexContext.Provider value={context}>
+            {children}
+        </RovingTabIndexContext.Provider>
+    </div>;
 };
 
-export const useRovingTabIndex = () => {
-    const ref = useRef(null);
+export const useRovingTabIndex = (inputRef) => {
+    let ref = useRef(null);
     const context = useContext(RovingTabIndexContext);
 
+    if (inputRef) {
+        ref = inputRef;
+    }
+
     // setup/teardown
     // add ref to the context
     useLayoutEffect(() => {
@@ -149,45 +174,13 @@ export const useRovingTabIndex = () => {
             payload: {ref},
         });
     }, [ref, context]);
-    const isActive = context.state.activeRef === ref || context.state.activeRef === ANY;
+
+    const isActive = context.state.activeRef === ref;
     return [onFocus, isActive, ref];
 };
 
-export const RovingTabIndexGroup = ({children}) => {
-    const [onFocus, isActive, ref] = useRovingTabIndex();
-
-    // fake reducer dispatch to catch SET_FOCUS calls and pass them to parent as a focus of the group
-    const dispatch = useCallback(({type}) => {
-        if (type === types.SET_FOCUS) {
-            onFocus();
-        }
-    }, [onFocus]);
-
-    const context = useMemo(() => ({
-        state: {activeRef: isActive ? ANY : undefined},
-        dispatch,
-    }), [isActive, dispatch]);
-
-    return <div ref={ref}>
-        <RovingTabIndexContext.Provider value={context}>
-            {children}
-        </RovingTabIndexContext.Provider>
-    </div>;
-};
-
-// Wraps a given element to attach it to the roving context, props onFocus and tabIndex overridden
-export const RovingTabIndex = ({component: E, useInputRef, ...props}) => {
-    const [onFocus, isActive, ref] = useRovingTabIndex();
-    const refProps = {};
-    if (useInputRef) {
-        refProps.inputRef = ref;
-    } else {
-        refProps.ref = ref;
-    }
-    return <E {...props} {...refProps} onFocus={onFocus} tabIndex={isActive ? 0 : -1} />;
-};
-RovingTabIndex.propTypes = {
-    component: PropTypes.elementType.isRequired,
-    useInputRef: PropTypes.bool, // whether to pass inputRef instead of ref like for AccessibleButton
+export const RovingTabIndexWrapper = ({children, inputRef}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
+    return children({onFocus, isActive, ref});
 };
 

From 93b9bf1647600192e619390360cd67423daa5f6e Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 15 Jan 2020 06:06:42 +0000
Subject: [PATCH 0372/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2004 of 2004 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 11904a95f0..036f70d9cb 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2035,5 +2035,11 @@
     "Go": "Joan",
     "Suggestions": "Proposamenak",
     "Failed to find the following users": "Ezin izan dira honako erabiltzaile hauek aurkitu",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Honako erabiltzaile hauek agian ez dira existitzen edo baliogabeak dira, eta ezin dira gonbidatu: %(csvNames)s"
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Honako erabiltzaile hauek agian ez dira existitzen edo baliogabeak dira, eta ezin dira gonbidatu: %(csvNames)s",
+    "Show a presence dot next to DMs in the room list": "Erakutsi presentzia puntua mezu zuzenen ondoan gelen zerrendan",
+    "Lock": "Blokeatu",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Gakoen babes-kopia gaituta dago zure kontuan baina ez da saio honetarako ezarri. Biltegi sekretua ezartzeko, berrezarri zure gakoen babes-kopia.",
+    "Restore": "Berrezarri",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua ezarriko da zure oraingo gakoen babes-kopiaren xehetasunak erabiliz. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berberak izango dira",
+    "Restore your Key Backup": "Berrezarri zure gakoen babes-kopia"
 }

From c74dc2c87026ed600f77c6abf8ebd86740ad71b3 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 15 Jan 2020 03:45:57 +0000
Subject: [PATCH 0373/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2004 of 2004 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 1216ad79a9..2d17d643ce 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2038,5 +2038,9 @@
     "Failed to find the following users": "找不到以下使用者",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s",
     "Show a presence dot next to DMs in the room list": "在聊天室清單中的直接訊息旁顯示上線狀態點",
-    "Lock": "鎖定"
+    "Lock": "鎖定",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "您的帳號已啟用金鑰備份，但並在此工作階段中設定。要設定秘密儲存空間，請還原金鑰備份。",
+    "Restore": "還原",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰會與您的金鑰備份相同",
+    "Restore your Key Backup": "復原您的金鑰備份"
 }

From a9d5c7e7205d8ef5a8cb169a47c8844ad6132311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 15 Jan 2020 08:00:57 +0000
Subject: [PATCH 0374/3235] Translated using Weblate (French)

Currently translated at 100.0% (2004 of 2004 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 84cdf623ee..c2863d713f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2038,5 +2038,9 @@
     "Failed to find the following users": "Impossible de trouver les utilisateurs suivants",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s",
     "Show a presence dot next to DMs in the room list": "Afficher une pastille de présence à côté des messages directs dans la liste des salons",
-    "Lock": "Cadenas"
+    "Lock": "Cadenas",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "La sauvegarde de clés est activée pour votre compte mais n’a pas été configurée pour cette session. Pour configurer le coffre secret, restaurez votre sauvegarde de clés.",
+    "Restore": "Restaurer",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant les paramètres existants de la sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés",
+    "Restore your Key Backup": "Restaurer votre sauvegarde de clés"
 }

From 457e63f24ee79f064679ccc5d7ab48e21e9a357f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 10:25:36 -0700
Subject: [PATCH 0375/3235] Fix reference to js-sdk lint config

---
 .eslintrc.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0721c1c8d2..6a0576c58a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,7 +5,10 @@ const path = require('path');
 // but only if they come from a module that starts with eslint-config-
 // So we load the filename directly (and it could be in node_modules/
 // or or ../node_modules/ etc)
-const matrixJsSdkPath = path.dirname(require.resolve('matrix-js-sdk'));
+//
+// We add a `..` to the end because the js-sdk lives out of lib/, but the eslint
+// config is at the project root.
+const matrixJsSdkPath = path.join(path.dirname(require.resolve('matrix-js-sdk')), '..');
 
 module.exports = {
     parser: "babel-eslint",

From 8f37f8638d9009d7bf65e3cbad864133e8d916b3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 10:28:27 -0700
Subject: [PATCH 0376/3235] Build the js-sdk for Jest tests

This is theoretically a fix for the tests failing post-sourcemaps.
---
 scripts/ci/install-deps.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
index 6484ebab29..a2e2e59a45 100755
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -7,6 +7,7 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk
 pushd matrix-js-sdk
 yarn link
 yarn install
+yarn build
 popd
 
 yarn link matrix-js-sdk

From dd88809622fe350169040efd01af2fa31a8076e1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 12:02:23 -0700
Subject: [PATCH 0377/3235] Fix imports for help & support tab

This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
---
 .../views/settings/tabs/user/HelpUserSettingsTab.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 0cf67a4db7..ab71de86b9 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -21,10 +21,10 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import SdkConfig from "../../../../../SdkConfig";
 import createRoom from "../../../../../createRoom";
-const packageJson = require('../../../../../../package.json');
-const Modal = require("../../../../../Modal");
-const sdk = require("../../../../..");
-const PlatformPeg = require("../../../../../PlatformPeg");
+import packageJson from "../../../../../../package.json";
+import Modal from "../../../../../Modal";
+import * as sdk from "../../../../../";
+import PlatformPeg from "../../../../../PlatformPeg";
 
 // if this looks like a release, use the 'version' from package.json; else use
 // the git sha. Prepend version with v, to look like riot-web version

From 6f351ed2257c4876b4fb6a668be5696bbd9888c5 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 15 Jan 2020 18:38:26 +0000
Subject: [PATCH 0378/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2018 of 2018 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 036f70d9cb..31dc6497ef 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2041,5 +2041,19 @@
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Gakoen babes-kopia gaituta dago zure kontuan baina ez da saio honetarako ezarri. Biltegi sekretua ezartzeko, berrezarri zure gakoen babes-kopia.",
     "Restore": "Berrezarri",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua ezarriko da zure oraingo gakoen babes-kopiaren xehetasunak erabiliz. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berberak izango dira",
-    "Restore your Key Backup": "Berrezarri zure gakoen babes-kopia"
+    "Restore your Key Backup": "Berrezarri zure gakoen babes-kopia",
+    "a few seconds ago": "duela segundo batzuk",
+    "about a minute ago": "duela minutu bat inguru",
+    "%(num)s minutes ago": "duela %(num)s minutu",
+    "about an hour ago": "duela ordubete inguru",
+    "%(num)s hours ago": "duela %(num)s ordu",
+    "about a day ago": "duela egun bat inguru",
+    "%(num)s days ago": "duela %(num)s egun",
+    "a few seconds from now": "hemendik segundo batzuetara",
+    "about a minute from now": "hemendik minutu batera",
+    "%(num)s minutes from now": "hemendik %(num)s minututara",
+    "about an hour from now": "hemendik ordubetera",
+    "%(num)s hours from now": "hemendik %(num)s ordutara",
+    "about a day from now": "hemendik egun batera",
+    "%(num)s days from now": "hemendik %(num)s egunetara"
 }

From 27ee90cad58666a97e3a61993f3a7c2575753aa2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 15 Jan 2020 21:13:56 +0000
Subject: [PATCH 0379/3235] Add post-login complete security flow

This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.

This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.

Fixes https://github.com/vector-im/riot-web/issues/11214
---
 res/css/_components.scss                      |   1 +
 .../structures/auth/_CompleteSecurity.scss    |  51 ++++++
 src/MatrixClientPeg.js                        |   9 +-
 .../CreateSecretStorageDialog.js              |   2 +-
 src/components/structures/MatrixChat.js       |  90 ++++++---
 .../structures/auth/CompleteSecurity.js       | 173 ++++++++++++++++++
 src/components/structures/auth/SoftLogout.js  |   2 +-
 src/i18n/strings/en_EN.json                   |  10 +-
 src/settings/Settings.js                      |   3 +-
 9 files changed, 309 insertions(+), 32 deletions(-)
 create mode 100644 res/css/structures/auth/_CompleteSecurity.scss
 create mode 100644 src/components/structures/auth/CompleteSecurity.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 7a9ebfdf26..a9a114a4cf 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -28,6 +28,7 @@
 @import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_ViewSource.scss";
+@import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
 @import "./views/auth/_AuthBody.scss";
 @import "./views/auth/_AuthButtons.scss";
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
new file mode 100644
index 0000000000..c258ce4ec7
--- /dev/null
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_CompleteSecurity_header {
+    display: flex;
+    align-items: center;
+}
+
+.mx_CompleteSecurity_headerIcon {
+    width: 24px;
+    height: 24px;
+    margin: 0 4px;
+    position: relative;
+}
+
+.mx_CompleteSecurity_heroIcon {
+    width: 128px;
+    height: 128px;
+    position: relative;
+    margin: 0 auto;
+}
+
+.mx_CompleteSecurity_body {
+    font-size: 15px;
+}
+
+.mx_CompleteSecurity_actionRow {
+    display: flex;
+    justify-content: flex-end;
+
+    .mx_AccessibleButton {
+        margin-inline-start: 18px;
+
+        &.warning {
+            color: $warning-color;
+        }
+    }
+}
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 9c939f2fd3..dbc570c872 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd.
 Copyright 2017, 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -223,9 +223,10 @@ class _MatrixClientPeg {
         };
 
         opts.cryptoCallbacks = {};
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            Object.assign(opts.cryptoCallbacks, crossSigningCallbacks);
-        }
+        // These are always installed regardless of the labs flag so that
+        // cross-signing features can toggle on without reloading and also be
+        // accessed immediately after login.
+        Object.assign(opts.cryptoCallbacks, crossSigningCallbacks);
 
         this.matrixClient = createMatrixClient(opts);
 
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 628214a2bb..01b9c9c7c8 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -313,7 +313,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             <p>{_t(
                 "Secret Storage will be set up using your existing key backup details. " +
                 "Your secret storage passphrase and recovery key will be the same as " +
-                " they were for your key backup",
+                "they were for your key backup.",
             )}</p>
             <DialogButtons primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onMigrateNextClick}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index ed6b7746bc..d9aa5e902d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2017-2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as Matrix from "matrix-js-sdk";
+import { isCryptoAvailable } from 'matrix-js-sdk/src/crypto';
 
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
@@ -79,18 +80,14 @@ export const VIEWS = {
     // we are showing the registration view
     REGISTER: 3,
 
-    // completeing the registration flow
+    // completing the registration flow
     POST_REGISTRATION: 4,
 
     // showing the 'forgot password' view
     FORGOT_PASSWORD: 5,
 
-    // we have valid matrix credentials (either via an explicit login, via the
-    // initial re-animation/guest registration, or via a registration), and are
-    // now setting up a matrixclient to talk to it. This isn't an instant
-    // process because we need to clear out indexeddb. While it is going on we
-    // show a big spinner.
-    LOGGING_IN: 6,
+    // showing flow to trust this new device with cross-signing
+    COMPLETE_SECURITY: 6,
 
     // we are logged in with an active matrix client.
     LOGGED_IN: 7,
@@ -656,16 +653,12 @@ export default createReactClass({
                 });
                 break;
             }
-            case 'on_logging_in':
-                // We are now logging in, so set the state to reflect that
-                // NB. This does not touch 'ready' since if our dispatches
-                // are delayed, the sync could already have completed
-                this.setStateForNewView({
-                    view: VIEWS.LOGGING_IN,
-                });
-                break;
             case 'on_logged_in':
-                if (!Lifecycle.isSoftLogout()) {
+                if (
+                    !Lifecycle.isSoftLogout() &&
+                    this.state.view !== VIEWS.LOGIN &&
+                    this.state.view !== VIEWS.COMPLETE_SECURITY
+                ) {
                     this._onLoggedIn();
                 }
                 break;
@@ -1169,7 +1162,7 @@ export default createReactClass({
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
                 const welcomeUserRoom = await this._startWelcomeUserChat();
                 if (welcomeUserRoom === null) {
-                    // We didn't rediret to the welcome user room, so show
+                    // We didn't redirect to the welcome user room, so show
                     // the homepage.
                     dis.dispatch({action: 'view_home_page'});
                 }
@@ -1573,6 +1566,10 @@ export default createReactClass({
             dis.dispatch({
                 action: 'view_my_groups',
             });
+        } else if (screen == 'complete_security') {
+            dis.dispatch({
+                action: 'start_complete_security',
+            });
         } else if (screen == 'post_registration') {
             dis.dispatch({
                 action: 'start_post_registration',
@@ -1822,21 +1819,68 @@ export default createReactClass({
         this._loggedInView = ref;
     },
 
+    async onUserCompletedLoginFlow(credentials) {
+        // Create and start the client in the background
+        Lifecycle.setLoggedIn(credentials);
+
+        // Wait for the client to be logged in (but not started)
+        // which is enough to ask the server about account data.
+        await new Promise(resolve => {
+            const actionHandlerRef = dis.register(payload => {
+                if (payload.action !== "on_logged_in") {
+                    return;
+                }
+                dis.unregister(actionHandlerRef);
+                resolve();
+            });
+        });
+
+        const cli = MatrixClientPeg.get();
+        // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
+        // because the client hasn't been started yet.
+        if (!isCryptoAvailable()) {
+            this._onLoggedIn();
+        }
+
+        // Test for the master cross-signing key in SSSS as a quick proxy for
+        // whether cross-signing has been set up on the account.
+        let masterKeyInStorage = false;
+        try {
+            masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
+        } catch (e) {
+            if (e.errcode !== "M_NOT_FOUND") throw e;
+        }
+
+        if (masterKeyInStorage) {
+            this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
+        } else {
+            this._onLoggedIn();
+        }
+    },
+
+    onCompleteSecurityFinished() {
+        this._onLoggedIn();
+    },
+
     render: function() {
         // console.log(`Rendering MatrixChat with view ${this.state.view}`);
 
         let view;
 
-        if (
-            this.state.view === VIEWS.LOADING ||
-            this.state.view === VIEWS.LOGGING_IN
-        ) {
+        if (this.state.view === VIEWS.LOADING) {
             const Spinner = sdk.getComponent('elements.Spinner');
             view = (
                 <div className="mx_MatrixChat_splash">
                     <Spinner />
                 </div>
             );
+        } else if (this.state.view === VIEWS.COMPLETE_SECURITY) {
+            const CompleteSecurity = sdk.getComponent('structures.auth.CompleteSecurity');
+            view = (
+                <CompleteSecurity
+                    onFinished={this.onCompleteSecurityFinished}
+                />
+            );
         } else if (this.state.view === VIEWS.POST_REGISTRATION) {
             // needs to be before normal PageTypes as you are logged in technically
             const PostRegistration = sdk.getComponent('structures.auth.PostRegistration');
@@ -1921,7 +1965,7 @@ export default createReactClass({
             const Login = sdk.getComponent('structures.auth.Login');
             view = (
                 <Login
-                    onLoggedIn={Lifecycle.setLoggedIn}
+                    onLoggedIn={this.onUserCompletedLoginFlow}
                     onRegisterClick={this.onRegisterClick}
                     fallbackHsUrl={this.getFallbackHsUrl()}
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
new file mode 100644
index 0000000000..0bc41a8fbb
--- /dev/null
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -0,0 +1,173 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../../../languageHandler';
+import sdk from '../../../index';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import { accessSecretStorage } from '../../../CrossSigningManager';
+
+const PHASE_INTRO = 0;
+const PHASE_DONE = 1;
+const PHASE_CONFIRM_SKIP = 2;
+
+export default class CompleteSecurity extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+
+        this.state = {
+            phase: PHASE_INTRO,
+        };
+    }
+
+    onStartClick = async () => {
+        const cli = MatrixClientPeg.get();
+        await accessSecretStorage(async () => {
+            await cli.checkOwnCrossSigningTrust();
+        });
+        this.setState({
+            phase: PHASE_DONE,
+        });
+    }
+
+    onSkipClick = () => {
+        this.setState({
+            phase: PHASE_CONFIRM_SKIP,
+        });
+    }
+
+    onSkipConfirmClick = () => {
+        this.props.onFinished();
+    }
+
+    onSkipBackClick = () => {
+        this.setState({
+            phase: PHASE_INTRO,
+        });
+    }
+
+    onDoneClick = () => {
+        this.props.onFinished();
+    }
+
+    render() {
+        const AuthPage = sdk.getComponent("auth.AuthPage");
+        const AuthHeader = sdk.getComponent("auth.AuthHeader");
+        const AuthBody = sdk.getComponent("auth.AuthBody");
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        const {
+            phase,
+        } = this.state;
+
+        let icon;
+        let title;
+        let body;
+        if (phase === PHASE_INTRO) {
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
+            title = _t("Complete security");
+            body = (
+                <div>
+                    <p>{_t(
+                        "Verify this session to grant it access to encrypted messages.",
+                    )}</p>
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            kind="danger"
+                            onClick={this.onSkipClick}
+                        >
+                            {_t("Skip")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            kind="primary"
+                            onClick={this.onStartClick}
+                        >
+                            {_t("Start")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else if (phase === PHASE_DONE) {
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified"></span>;
+            title = _t("Session verified");
+            body = (
+                <div>
+                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
+                    <p>{_t(
+                        "Your new session is now verified. It has access to your " +
+                        "encrypted messages, and other users will see it as trusted.",
+                    )}</p>
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            kind="primary"
+                            onClick={this.onDoneClick}
+                        >
+                            {_t("Done")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else if (phase === PHASE_CONFIRM_SKIP) {
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
+            title = _t("Are you sure?");
+            body = (
+                <div>
+                    <p>{_t(
+                        "Without completing security on this device, it won’t have " +
+                        "access to encrypted messages.",
+                    )}</p>
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            className="warning"
+                            kind="secondary"
+                            onClick={this.onSkipConfirmClick}
+                        >
+                            {_t("Skip")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            kind="danger"
+                            onClick={this.onSkipBackClick}
+                        >
+                            {_t("Go Back")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else {
+            throw new Error(`Unknown phase ${phase}`);
+        }
+
+        return (
+            <AuthPage>
+                <AuthHeader />
+                <AuthBody>
+                    <h2 className="mx_CompleteSecurity_header">
+                        {icon}
+                        {title}
+                    </h2>
+                    <div className="mx_CompleteSecurity_body">
+                        {body}
+                    </div>
+                </AuthBody>
+            </AuthPage>
+        );
+    }
+}
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 63f590da2e..40800ad907 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -66,7 +66,7 @@ export default class SoftLogout extends React.Component {
     componentDidMount(): void {
         // We've ended up here when we don't need to - navigate to login
         if (!Lifecycle.isSoftLogout()) {
-            dis.dispatch({action: "on_logged_in"});
+            dis.dispatch({action: "start_login"});
             return;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 42c87172b8..3756b4c60b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1848,6 +1848,14 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
+    "Complete security": "Complete security",
+    "Verify this session to grant it access to encrypted messages.": "Verify this session to grant it access to encrypted messages.",
+    "Start": "Start",
+    "Session verified": "Session verified",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
+    "Done": "Done",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
+    "Go Back": "Go Back",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",
@@ -1952,7 +1960,7 @@
     "Import": "Import",
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
     "Restore": "Restore",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
     "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 8ee8d89890..2b8c0aef89 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Travis Ralston
 Copyright 2018, 2019 New Vector Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -153,7 +153,6 @@ export const SETTINGS = {
         displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new ReloadOnChangeController(),
     },
     "feature_event_indexing": {
         isFeature: true,

From 6e027badc0b0f5e7a32ec340b0aa33033d658896 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 15 Jan 2020 22:10:59 +0000
Subject: [PATCH 0380/3235] Tweak comparison

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d9aa5e902d..edc0501086 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1566,7 +1566,7 @@ export default createReactClass({
             dis.dispatch({
                 action: 'view_my_groups',
             });
-        } else if (screen == 'complete_security') {
+        } else if (screen === 'complete_security') {
             dis.dispatch({
                 action: 'start_complete_security',
             });

From 71fa3222fef38715584c877c7e499e2f98941ded Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 15 Jan 2020 22:11:22 +0000
Subject: [PATCH 0381/3235] Fix component index import

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/auth/CompleteSecurity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 0bc41a8fbb..77f7fe26e4 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { accessSecretStorage } from '../../../CrossSigningManager';
 

From 3afa2b1d5b491d09df3755ad0cf003c8d1a5ebf3 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 15 Jan 2020 21:19:52 +0000
Subject: [PATCH 0382/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2018 of 2018 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 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0dcea60fda..a59b4fd658 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2039,5 +2039,23 @@
     "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s",
     "Show a presence dot next to DMs in the room list": "Jelenlét pötty mutatása a Közvetlen beszélgetések mellett a szobák listájában",
-    "Lock": "Zár"
+    "Lock": "Zár",
+    "a few seconds ago": "néhány másodperce",
+    "about a minute ago": "percekkel ezelőtt",
+    "%(num)s minutes ago": "%(num)s perccel ezelőtt",
+    "about an hour ago": "egy órája",
+    "%(num)s hours ago": "%(num)s órával ezelőtt",
+    "about a day ago": "egy napja",
+    "%(num)s days ago": "%(num)s nappal ezelőtt",
+    "a few seconds from now": "másodpercek múlva",
+    "about a minute from now": "percek múlva",
+    "%(num)s minutes from now": "%(num)s perc múlva",
+    "about an hour from now": "egy óra múlva",
+    "%(num)s hours from now": "%(num)s óra múlva",
+    "about a day from now": "egy nap múlva",
+    "%(num)s days from now": "%(num)s nap múlva",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "A Kulcs Mentés a fiókhoz igen de ehhez a munkamenethez nincs beállítva. A Biztonsági tároló beállításához állítsd vissza a kulcs mentést.",
+    "Restore": "Visszaállít",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a meglévő kulcs mentés adatai alapján lesz beállítva. A biztonsági tárolóhoz tartozó jelmondat és a visszaállítási kulcs azonos lesz  ahogy azok a kulcs mentéshez voltak",
+    "Restore your Key Backup": "Kulcs Mentés visszaállítása"
 }

From ed9bce21f5ec22f70ce2509eb49aeeb240475eb6 Mon Sep 17 00:00:00 2001
From: Alexey Murz Korepov <murznn@gmail.com>
Date: Wed, 15 Jan 2020 20:21:16 +0000
Subject: [PATCH 0383/3235] Translated using Weblate (Russian)

Currently translated at 89.1% (1798 of 2018 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index aeab97caf3..608c7a3328 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1440,7 +1440,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.": "Ранее вы использовали 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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
     "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 раз меньше памяти, загружая информацию только о других пользователях, когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
-    "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
+    "I don't want my encrypted messages": "Продолжить выход, мне не нужны мои зашифрованные сообщения",
     "Manually export keys": "Ручной экспорт ключей",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы столкнулись с какими-либо ошибками или хотите оставить отзыв, которым хотите поделиться, сообщите нам об этом на GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала <existingIssuesLink> просмотрите существующие проблемы </existingIssuesLink> (и добавьте +1), либо <newIssueLink> создайте новую проблему </newIssueLink>, если вы не можете ее найти.",

From 2b37fe76242fe1ae328d435abb8d82ca454ec13d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 00:40:08 +0000
Subject: [PATCH 0384/3235] do some renaming

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 6 +++---
 src/contexts/RovingTabIndexContext.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 45ff940c22..4441b4d539 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -39,7 +39,7 @@ import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexContextWrapper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexContextProvider} from "../../../contexts/RovingTabIndexContext";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -788,9 +788,9 @@ export default createReactClass({
                 onMouseMove={this.onMouseMove}
                 onMouseLeave={this.onMouseLeave}
             >
-                <RovingTabIndexContextWrapper>
+                <RovingTabIndexContextProvider>
                     { subListComponents }
-                </RovingTabIndexContextWrapper>
+                </RovingTabIndexContextProvider>
             </div>
         );
     },
diff --git a/src/contexts/RovingTabIndexContext.js b/src/contexts/RovingTabIndexContext.js
index f5001d28cc..182a7f5504 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/contexts/RovingTabIndexContext.js
@@ -109,7 +109,7 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexContextWrapper = ({children}) => {
+export const RovingTabIndexContextProvider = ({children}) => {
     const [state, dispatch] = useReducer(reducer, {
         activeRef: null,
         refs: [],

From 8c1fdf4cabfb0984f5d34d4656bc3e48d345d7d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 01:25:44 +0000
Subject: [PATCH 0385/3235] tidy up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/contexts/RovingTabIndexContext.js | 78 ++++++++++++++++++---------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/contexts/RovingTabIndexContext.js b/src/contexts/RovingTabIndexContext.js
index 182a7f5504..2e8439d2a4 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/contexts/RovingTabIndexContext.js
@@ -1,20 +1,18 @@
 /*
- *
- * Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
- *
- * 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.
- * /
- */
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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, {
     createContext,
@@ -27,12 +25,25 @@ import React, {
 } from "react";
 import {Key} from "../Keyboard";
 
+/**
+ * Module to simplify implementing the Roving TabIndex accessibility technique
+ *
+ * Wrap the Widget in an RovingTabIndexContextProvider
+ * and then for all buttons make use of useRovingTabIndex or RovingTabIndexWrapper.
+ * The code will keep track of which tabIndex was most recently focused and expose that information as `isActive` which
+ * can then be used to only set the tabIndex to 0 as expected by the roving tabindex technique.
+ * When the active button gets unmounted the closest button will be chosen as expected.
+ * Initially the first button to mount will be given active state.
+ *
+ * https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets#Technique_1_Roving_tabindex
+ */
+
 const DOCUMENT_POSITION_PRECEDING = 2;
 
 const RovingTabIndexContext = createContext({
     state: {
         activeRef: null,
-        refs: [],
+        refs: [], // list of refs in DOM order
     },
     dispatch: () => {},
 });
@@ -49,6 +60,7 @@ const reducer = (state, action) => {
     switch (action.type) {
         case types.REGISTER: {
             if (state.refs.length === 0) {
+                // Our list of refs was empty, set activeRef to this first item
                 return {
                     ...state,
                     activeRef: action.payload.ref,
@@ -60,6 +72,7 @@ const reducer = (state, action) => {
                 return state; // already in refs, this should not happen
             }
 
+            // find the index of the first ref which is not preceding this one in DOM order
             let newIndex = state.refs.findIndex(ref => {
                 return ref.current.compareDocumentPosition(action.payload.ref.current) & DOCUMENT_POSITION_PRECEDING;
             });
@@ -68,6 +81,7 @@ const reducer = (state, action) => {
                 newIndex = state.refs.length; // append to the end
             }
 
+            // update the refs list
             return {
                 ...state,
                 refs: [
@@ -78,13 +92,16 @@ const reducer = (state, action) => {
             };
         }
         case types.UNREGISTER: {
-            const refs = state.refs.filter(r => r !== action.payload.ref); // keep all other refs
+            // filter out the ref which we are removing
+            const refs = state.refs.filter(r => r !== action.payload.ref);
 
             if (refs.length === state.refs.length) {
                 return state; // already removed, this should not happen
             }
 
-            if (state.activeRef === action.payload.ref) { // we just removed the active ref, need to replace it
+            if (state.activeRef === action.payload.ref) {
+                // we just removed the active ref, need to replace it
+                // pick the ref which is now in the index the old ref was in
                 const oldIndex = state.refs.findIndex(r => r === action.payload.ref);
                 return {
                     ...state,
@@ -93,12 +110,14 @@ const reducer = (state, action) => {
                 };
             }
 
+            // update the refs list
             return {
                 ...state,
                 refs,
             };
         }
         case types.SET_FOCUS: {
+            // update active ref
             return {
                 ...state,
                 activeRef: action.payload.ref,
@@ -115,17 +134,18 @@ export const RovingTabIndexContextProvider = ({children}) => {
         refs: [],
     });
 
-    const context = useMemo(() => ({state, dispatch}), [state]);
-
     const onKeyDown = useCallback((ev) => {
+        // check if we actually have any items
         if (state.refs.length <= 0) return;
 
         let handled = true;
         switch (ev.key) {
             case Key.HOME:
+                // move focus to first item
                 setImmediate(() => state.refs[0].current.focus());
                 break;
             case Key.END:
+                // move focus to last item
                 state.refs[state.refs.length - 1].current.focus();
                 break;
             default:
@@ -138,6 +158,9 @@ export const RovingTabIndexContextProvider = ({children}) => {
         }
     }, [state]);
 
+    const context = useMemo(() => ({state, dispatch}), [state]);
+
+    // wrap in a div with key-down handling for HOME/END keys
     return <div onKeyDown={onKeyDown}>
         <RovingTabIndexContext.Provider value={context}>
             {children}
@@ -145,21 +168,27 @@ export const RovingTabIndexContextProvider = ({children}) => {
     </div>;
 };
 
+// Hook to register a roving tab index
+// inputRef parameter specifies the ref to use
+// onFocus should be called when the index gained focus in any manner
+// isActive should be used to set tabIndex in a manner such as `tabIndex={isActive ? 0 : -1}`
+// ref should be passed to a DOM node which will be used for DOM compareDocumentPosition
 export const useRovingTabIndex = (inputRef) => {
-    let ref = useRef(null);
     const context = useContext(RovingTabIndexContext);
+    let ref = useRef(null);
 
     if (inputRef) {
+        // if we are given a ref, use it instead of ours
         ref = inputRef;
     }
 
-    // setup/teardown
-    // add ref to the context
+    // setup (after refs)
     useLayoutEffect(() => {
         context.dispatch({
             type: types.REGISTER,
             payload: {ref},
         });
+        // teardown
         return () => {
             context.dispatch({
                 type: types.UNREGISTER,
@@ -179,6 +208,7 @@ export const useRovingTabIndex = (inputRef) => {
     return [onFocus, isActive, ref];
 };
 
+// Wrapper to allow use of useRovingTabIndex outside of React Functional Components.
 export const RovingTabIndexWrapper = ({children, inputRef}) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
     return children({onFocus, isActive, ref});

From 781db63fa639e286622542bc7cba4e29c3c17e5f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 01:35:42 +0000
Subject: [PATCH 0386/3235] split out home/end handling into a helper as not
 all roving-tab-index widgets want it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js |  6 ++++--
 src/contexts/RovingTabIndexContext.js  | 26 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 4441b4d539..21cd1ed719 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -39,7 +39,7 @@ import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexContextProvider} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexContextProvider, RovingTabIndexHomeEndHelper} from "../../../contexts/RovingTabIndexContext";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -789,7 +789,9 @@ export default createReactClass({
                 onMouseLeave={this.onMouseLeave}
             >
                 <RovingTabIndexContextProvider>
-                    { subListComponents }
+                    <RovingTabIndexHomeEndHelper>
+                        { subListComponents }
+                    </RovingTabIndexHomeEndHelper>
                 </RovingTabIndexContextProvider>
             </div>
         );
diff --git a/src/contexts/RovingTabIndexContext.js b/src/contexts/RovingTabIndexContext.js
index 2e8439d2a4..55ac19e40f 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/contexts/RovingTabIndexContext.js
@@ -134,19 +134,30 @@ export const RovingTabIndexContextProvider = ({children}) => {
         refs: [],
     });
 
+    const context = useMemo(() => ({state, dispatch}), [state]);
+
+    return <RovingTabIndexContext.Provider value={context}>
+        {children}
+    </RovingTabIndexContext.Provider>;
+};
+
+// Helper to handle Home/End to jump to first/last roving-tab-index for widgets such as treeview
+export const RovingTabIndexHomeEndHelper = ({children}) => {
+    const context = useContext(RovingTabIndexContext);
+
     const onKeyDown = useCallback((ev) => {
         // check if we actually have any items
-        if (state.refs.length <= 0) return;
+        if (context.state.refs.length <= 0) return;
 
         let handled = true;
         switch (ev.key) {
             case Key.HOME:
                 // move focus to first item
-                setImmediate(() => state.refs[0].current.focus());
+                setImmediate(() => context.state.refs[0].current.focus());
                 break;
             case Key.END:
                 // move focus to last item
-                state.refs[state.refs.length - 1].current.focus();
+                context.state.refs[context.state.refs.length - 1].current.focus();
                 break;
             default:
                 handled = false;
@@ -156,15 +167,10 @@ export const RovingTabIndexContextProvider = ({children}) => {
             ev.preventDefault();
             ev.stopPropagation();
         }
-    }, [state]);
+    }, [context.state]);
 
-    const context = useMemo(() => ({state, dispatch}), [state]);
-
-    // wrap in a div with key-down handling for HOME/END keys
     return <div onKeyDown={onKeyDown}>
-        <RovingTabIndexContext.Provider value={context}>
-            {children}
-        </RovingTabIndexContext.Provider>
+        { children }
     </div>;
 };
 

From 2230b7732a703215c49a356697a7acd9cd969383 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 01:45:16 +0000
Subject: [PATCH 0387/3235] rearrange

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../RovingTabIndex.js}                                      | 2 +-
 src/components/structures/RoomSubList.js                    | 2 +-
 src/components/views/groups/GroupInviteTile.js              | 2 +-
 src/components/views/rooms/RoomList.js                      | 6 +++---
 src/components/views/rooms/RoomTile.js                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{contexts/RovingTabIndexContext.js => accessibility/RovingTabIndex.js} (99%)

diff --git a/src/contexts/RovingTabIndexContext.js b/src/accessibility/RovingTabIndex.js
similarity index 99%
rename from src/contexts/RovingTabIndexContext.js
rename to src/accessibility/RovingTabIndex.js
index 55ac19e40f..ad2051f1f1 100644
--- a/src/contexts/RovingTabIndexContext.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -128,7 +128,7 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexContextProvider = ({children}) => {
+export const RovingTabIndexProvider = ({children}) => {
     const [state, dispatch] = useReducer(reducer, {
         activeRef: null,
         refs: [],
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 775b6b69ce..2d41abf902 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -31,7 +31,7 @@ import PropTypes from 'prop-types';
 import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
-import {RovingTabIndexWrapper} from "../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 488c1e20cf..3b15c6ff41 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -26,7 +26,7 @@ import classNames from 'classnames';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 
 // XXX this class copies a lot from RoomTile.js
 export default createReactClass({
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 21cd1ed719..a137a36c60 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -39,7 +39,7 @@ import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexContextProvider, RovingTabIndexHomeEndHelper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexProvider, RovingTabIndexHomeEndHelper} from "../../../accessibility/RovingTabIndex";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -788,11 +788,11 @@ export default createReactClass({
                 onMouseMove={this.onMouseMove}
                 onMouseLeave={this.onMouseLeave}
             >
-                <RovingTabIndexContextProvider>
+                <RovingTabIndexProvider>
                     <RovingTabIndexHomeEndHelper>
                         { subListComponents }
                     </RovingTabIndexHomeEndHelper>
-                </RovingTabIndexContextProvider>
+                </RovingTabIndexProvider>
             </div>
         );
     },
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 8701c3d287..3b13001225 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -32,7 +32,7 @@ import ActiveRoomObserver from '../../../ActiveRoomObserver';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
-import {RovingTabIndexWrapper} from "../../../contexts/RovingTabIndexContext";
+import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 
 export default createReactClass({
     displayName: 'RoomTile',

From be3ef2b50e2f0b754f7effd67acd2ebc89baf55f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 19:08:14 -0700
Subject: [PATCH 0388/3235] Remove all text when cutting in the composer

The previous function did in fact remove the elements, but left the model thinking there was a zero-length string. This approach deletes the text from the model and the DOM, resulting in the placeholder being shown when cutting all the text.

Part of https://github.com/vector-im/riot-web/issues/11378
---
 src/components/views/rooms/BasicMessageComposer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index d9604cf030..c605953473 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -209,8 +209,9 @@ export default class BasicMessageEditor extends React.Component {
             const selectedParts = range.parts.map(p => p.serialize());
             event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
             if (type === "cut") {
-                selection.deleteFromDocument();
-                range.replace([]);
+                // Remove the text from the composer
+                const {caret} = getCaretOffsetAndText(this._editorRef, selection);
+                this.props.model.update("", event.inputType, caret);
             }
             event.preventDefault();
         }

From 4504d9b790c1fdbaa2ab2545cf9c7de2a601f6c8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 03:15:52 +0000
Subject: [PATCH 0389/3235] add tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/RovingTabIndex.js       |   2 +-
 test/accessibility/RovingTabIndex-test.js | 117 ++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 test/accessibility/RovingTabIndex-test.js

diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.js
index ad2051f1f1..85aa133aa4 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -153,7 +153,7 @@ export const RovingTabIndexHomeEndHelper = ({children}) => {
         switch (ev.key) {
             case Key.HOME:
                 // move focus to first item
-                setImmediate(() => context.state.refs[0].current.focus());
+                context.state.refs[0].current.focus();
                 break;
             case Key.END:
                 // move focus to last item
diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
new file mode 100644
index 0000000000..2b55d1420c
--- /dev/null
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -0,0 +1,117 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 Adapter from "enzyme-adapter-react-16";
+import { configure, mount } from "enzyme";
+
+import {
+    RovingTabIndexProvider,
+    RovingTabIndexWrapper,
+    useRovingTabIndex,
+} from "../../src/accessibility/RovingTabIndex";
+
+configure({ adapter: new Adapter() });
+
+const Button = (props) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex();
+    return <button {...props} onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref} />;
+};
+
+const checkTabIndexes = (buttons, expectations) => {
+    expect(buttons.length).toBe(expectations.length);
+    for (let i = 0; i < buttons.length; i++) {
+        expect(buttons.at(i).prop("tabIndex")).toBe(expectations[i]);
+    }
+};
+
+// give the buttons keys for the fibre reconciler to not treat them all as the same
+const button1 = <Button key={1}>a</Button>;
+const button2 = <Button key={2}>b</Button>;
+const button3 = <Button key={3}>c</Button>;
+const button4 = <Button key={4}>d</Button>;
+
+describe("RovingTabIndex", () => {
+    it("RovingTabIndexProvider renders children as expected", () => {
+        const wrapper = mount(<RovingTabIndexProvider>
+            <div><span>Test</span></div>
+        </RovingTabIndexProvider>);
+        expect(wrapper.text()).toBe("Test");
+        expect(wrapper.html()).toBe('<div><span>Test</span></div>');
+    });
+
+    it("RovingTabIndexProvider works as expected with useRovingTabIndex", () => {
+        const wrapper = mount(<RovingTabIndexProvider>
+            { button1 }
+            { button2 }
+            { button3 }
+        </RovingTabIndexProvider>);
+
+        // should begin with 0th being active
+        checkTabIndexes(wrapper.find("button"), [0, -1, -1]);
+
+        // focus on 2nd button and test it is the only active one
+        wrapper.find("button").at(2).simulate("focus");
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, -1, 0]);
+
+        // focus on 1st button and test it is the only active one
+        wrapper.find("button").at(1).simulate("focus");
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, 0, -1]);
+
+        // check that the active button does not change even on an explicit blur event
+        wrapper.find("button").at(1).simulate("blur");
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, 0, -1]);
+
+        // update the children, it should remain on the same button
+        wrapper.setProps({
+            children: [button1, button4, button2, button3],
+        });
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, -1, 0, -1]);
+
+        // update the children, remove the active button, it should move to the next one
+        wrapper.setProps({
+            children: [button1, button4, button3],
+        });
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, -1, 0]);
+    });
+
+    it("RovingTabIndexProvider works as expected with RovingTabIndexWrapper", () => {
+        const wrapper = mount(<RovingTabIndexProvider>
+            { button1 }
+            { button2 }
+            <RovingTabIndexWrapper>
+                {({onFocus, isActive, ref}) =>
+                    <button onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref}>.</button>
+                }
+            </RovingTabIndexWrapper>
+        </RovingTabIndexProvider>);
+
+        // should begin with 0th being active
+        checkTabIndexes(wrapper.find("button"), [0, -1, -1]);
+
+        // focus on 2nd button and test it is the only active one
+        wrapper.find("button").at(2).simulate("focus");
+        wrapper.update();
+        checkTabIndexes(wrapper.find("button"), [-1, -1, 0]);
+    });
+});
+
+

From b137cd21d3832213ba55ad0c8d74c466f67e96b3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 21:04:18 -0700
Subject: [PATCH 0390/3235] Replace the selected range instead of force-setting
 it

This gives people the option of cutting parts or all of their message.
---
 src/components/views/rooms/BasicMessageComposer.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index c605953473..0dd9d16e51 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -209,9 +209,8 @@ export default class BasicMessageEditor extends React.Component {
             const selectedParts = range.parts.map(p => p.serialize());
             event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
             if (type === "cut") {
-                // Remove the text from the composer
-                const {caret} = getCaretOffsetAndText(this._editorRef, selection);
-                this.props.model.update("", event.inputType, caret);
+                // Remove the text, updating the model as appropriate
+                replaceRangeAndMoveCaret(range, []);
             }
             event.preventDefault();
         }

From 1b4ab856c9b9fdfe79a2e97685fe6816db68bf9a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Jan 2020 21:05:00 -0700
Subject: [PATCH 0391/3235] Assume the position is at the end when the offset
 has no last part

We get an NPE when the user cuts their entire message, and this fixes it.
---
 src/editor/position.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor/position.js b/src/editor/position.js
index 4693f62999..726377ef48 100644
--- a/src/editor/position.js
+++ b/src/editor/position.js
@@ -117,7 +117,7 @@ export default class DocumentPosition {
         }
         offset += this.offset;
         const lastPart = model.parts[this.index];
-        const atEnd = offset >= lastPart.text.length;
+        const atEnd = !lastPart || offset >= lastPart.text.length; // if no last part, we're at the end
         return new DocumentOffset(offset, atEnd);
     }
 

From ff05041a5a240410460ce3176fd07351679dccb6 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 15 Jan 2020 13:57:29 +0000
Subject: [PATCH 0392/3235] Update room shield icons to represent encrypted but
 unverified chats in less alarmed tones

---
 src/components/structures/RoomView.js | 58 ++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a717f485f0..3adcd22d87 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -172,6 +172,7 @@ module.exports = createReactClass({
         MatrixClientPeg.get().on("accountData", this.onAccountData);
         MatrixClientPeg.get().on("crypto.keyBackupStatus", this.onKeyBackupStatus);
         MatrixClientPeg.get().on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        MatrixClientPeg.get().on("userTrustStatusChanged", this.onUserVerificationChanged);
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._onRoomViewStoreUpdate(true);
@@ -491,6 +492,7 @@ module.exports = createReactClass({
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
             MatrixClientPeg.get().removeListener("crypto.keyBackupStatus", this.onKeyBackupStatus);
             MatrixClientPeg.get().removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
+            MatrixClientPeg.get().removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -761,6 +763,14 @@ module.exports = createReactClass({
         this._updateE2EStatus(room);
     },
 
+    onUserVerificationChanged: function(userId, _trustStatus) {
+        const room = this.state.room;
+        if (!room.currentState.getMember(userId)) {
+            return;
+        }
+        this._updateE2EStatus(room);
+    },
+
     _updateE2EStatus: async function(room) {
         const cli = MatrixClientPeg.get();
         if (!cli.isRoomEncrypted(room.roomId)) {
@@ -784,29 +794,57 @@ module.exports = createReactClass({
             return;
         }
         const e2eMembers = await room.getEncryptionTargetMembers();
+
+        /*
+        Ensure we trust our own signing key, ie, nobody's used our credentials to
+        replace it and sign all our devices
+        */
+        if (!cli.checkUserTrust(cli.getUserId())) {
+            this.setState({
+                e2eStatus: "warning",
+            });
+            debuglog("e2e status set to warning due to not trusting our own signing key");
+            return;
+        }
+
+        /*
+        Gather verification state of every user in the room.
+        If _any_ user is verified then _every_ user must be verified, or we'll bail.
+        Note we don't count our own user so that the all/any check behaves properly.
+        */
+        const verificationState = e2eMembers.map(({userId}) => userId)
+            .filter((userId) => userId !== cli.getUserId())
+            .map((userId) => cli.checkUserTrust(userId).isCrossSigningVerified());
+        if (verificationState.includes(true) && verificationState.includes(false)) {
+            this.setState({
+                e2eStatus: "warning",
+            });
+            debuglog("e2e status set to warning as some, but not all, users are verified");
+            return;
+        }
+
+        /*
+        Whether we verify or not, a user having an untrusted device requires warnings.
+        Check every user's devices, including ourselves.
+        */
         for (const member of e2eMembers) {
             const { userId } = member;
-            const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
-            if (!userVerified) {
-                this.setState({
-                    e2eStatus: "warning",
-                });
-                return;
-            }
             const devices = await cli.getStoredDevicesForUser(userId);
-            const allDevicesVerified = devices.every(device => {
-                const { deviceId } = device;
+            const allDevicesVerified = devices.every(({deviceId}) => {
                 return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified();
             });
             if (!allDevicesVerified) {
                 this.setState({
                     e2eStatus: "warning",
                 });
+                debuglog("e2e status set to warning as not all users trust all of their devices." +
+                         " Aborted on user", userId);
                 return;
             }
         }
+
         this.setState({
-            e2eStatus: "verified",
+            e2eStatus: verificationState.includes(true) ? "verified" : "normal",
         });
     },
 

From 5926e277c485d7833c6b75b52ccdbfc33db6034e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 16 Jan 2020 11:52:02 +0000
Subject: [PATCH 0393/3235] Avoid logged in event race

---
 src/components/structures/MatrixChat.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index edc0501086..c59c44ebd8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1820,12 +1820,9 @@ export default createReactClass({
     },
 
     async onUserCompletedLoginFlow(credentials) {
-        // Create and start the client in the background
-        Lifecycle.setLoggedIn(credentials);
-
         // Wait for the client to be logged in (but not started)
         // which is enough to ask the server about account data.
-        await new Promise(resolve => {
+        const loggedIn = new Promise(resolve => {
             const actionHandlerRef = dis.register(payload => {
                 if (payload.action !== "on_logged_in") {
                     return;
@@ -1835,6 +1832,10 @@ export default createReactClass({
             });
         });
 
+        // Create and start the client in the background
+        Lifecycle.setLoggedIn(credentials);
+        await loggedIn;
+
         const cli = MatrixClientPeg.get();
         // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
         // because the client hasn't been started yet.

From 0dfd58c7844eb13a599fd9a4f1a43fa0d153ed6e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 16 Jan 2020 11:54:36 +0000
Subject: [PATCH 0394/3235] Compute download file icon immediately

Build process changes may have changed the load order, so this tintable is now
registered too late (after the theme is set).

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

diff --git a/src/Tinter.js b/src/Tinter.js
index de9ae94097..24a4d25a00 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -143,10 +143,14 @@ class Tinter {
      * over time then the best bet is to register a single callback for the
      * entire set.
      *
+     * To ensure the tintable work happens at least once, it is also called as
+     * part of registration.
+     *
      * @param {Function} tintable Function to call when the tint changes.
      */
     registerTintable(tintable) {
         this.tintables.push(tintable);
+        tintable();
     }
 
     getKeyRgb() {

From dab31d724dcc45cb3dfed87d8eed442e6526b147 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 16 Jan 2020 14:01:15 +0000
Subject: [PATCH 0395/3235] Support uri option in request mock

---
 __mocks__/browser-request.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/__mocks__/browser-request.js b/__mocks__/browser-request.js
index 45f83a1763..8038262091 100644
--- a/__mocks__/browser-request.js
+++ b/__mocks__/browser-request.js
@@ -1,14 +1,15 @@
 const en = require("../src/i18n/strings/en_EN");
 
 module.exports = jest.fn((opts, cb) => {
-    if (opts.url.endsWith("languages.json")) {
+    const url = opts.url || opts.uri;
+    if (url && url.endsWith("languages.json")) {
         cb(undefined, {status: 200}, JSON.stringify({
             "en": {
                 "fileName": "en_EN.json",
                 "label": "English",
             },
         }));
-    } else if (opts.url.endsWith("en_EN.json")) {
+    } else if (url && url.endsWith("en_EN.json")) {
         cb(undefined, {status: 200}, JSON.stringify(en));
     } else {
         cb(undefined, {status: 404}, "");

From 0ef362a79317c2a1dc77f987816b6fddef32e4c7 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 16 Jan 2020 14:06:54 +0000
Subject: [PATCH 0396/3235] Request mock should send truthy for errors

---
 __mocks__/browser-request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__mocks__/browser-request.js b/__mocks__/browser-request.js
index 8038262091..7d231fb9db 100644
--- a/__mocks__/browser-request.js
+++ b/__mocks__/browser-request.js
@@ -12,6 +12,6 @@ module.exports = jest.fn((opts, cb) => {
     } else if (url && url.endsWith("en_EN.json")) {
         cb(undefined, {status: 200}, JSON.stringify(en));
     } else {
-        cb(undefined, {status: 404}, "");
+        cb(true, {status: 404}, "");
     }
 });

From 82c5349c4ed1cf516985f5d5de693d9caf4a7fa6 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 16 Jan 2020 16:31:50 +0000
Subject: [PATCH 0397/3235] Updated to properly handle logic

---
 src/components/structures/RoomView.js | 47 +++++++++++----------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1843a7b64a..3cdc308758 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -792,31 +792,25 @@ export default createReactClass({
                     e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
                 });
             });
+            debuglog("e2e check is warning/verified only as cross-signing is off");
             return;
         }
+
+        /* At this point, the user has encryption on and cross-signing on */
         const e2eMembers = await room.getEncryptionTargetMembers();
-
-        /*
-        Ensure we trust our own signing key, ie, nobody's used our credentials to
-        replace it and sign all our devices
-        */
-        if (!cli.checkUserTrust(cli.getUserId())) {
-            this.setState({
-                e2eStatus: "warning",
-            });
-            debuglog("e2e status set to warning due to not trusting our own signing key");
-            return;
-        }
-
-        /*
-        Gather verification state of every user in the room.
-        If _any_ user is verified then _every_ user must be verified, or we'll bail.
-        Note we don't count our own user so that the all/any check behaves properly.
-        */
-        const verificationState = e2eMembers.map(({userId}) => userId)
+        const verified = [];
+        const unverified = [];
+        e2eMembers.map(({userId}) => userId)
             .filter((userId) => userId !== cli.getUserId())
-            .map((userId) => cli.checkUserTrust(userId).isCrossSigningVerified());
-        if (verificationState.includes(true) && verificationState.includes(false)) {
+            .forEach((userId) => {
+                (cli.checkUserTrust(userId).isCrossSigningVerified() ?
+                verified : unverified).push(userId)
+            });
+
+        debuglog("e2e verified", verified, "unverified", unverified);
+
+        /* If we verify any users in this room, expect to verify every user in the room */
+        if (verified.length > 0 && unverified.length > 0) {
             this.setState({
                 e2eStatus: "warning",
             });
@@ -824,12 +818,9 @@ export default createReactClass({
             return;
         }
 
-        /*
-        Whether we verify or not, a user having an untrusted device requires warnings.
-        Check every user's devices, including ourselves.
-        */
-        for (const member of e2eMembers) {
-            const { userId } = member;
+        /* At this point, either `verified` or `unverified` is empty, or both */
+        /* Check all verified user devices. We don't care if everyone's unverified anyway. */
+        for (const userId of [...verified, cli.getUserId()]) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
                 return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified();
@@ -845,7 +836,7 @@ export default createReactClass({
         }
 
         this.setState({
-            e2eStatus: verificationState.includes(true) ? "verified" : "normal",
+            e2eStatus: unverified.length === 0 ? "verified" : "normal",
         });
     },
 

From 869fd0b2c91a0a225a2b1dda5559f2d288c14216 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 09:40:11 -0700
Subject: [PATCH 0398/3235] Fix not being able to open profiles from the
 timeline

MemberAvatar was referencing the wrong dispatcher (it was imported as `dis`, like everywhere else, not `dispatcher`).

Fixes https://github.com/vector-im/riot-web/issues/11887
---
 src/components/views/avatars/MemberAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 7cd14f67d4..a07a184aa1 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -83,7 +83,7 @@ export default createReactClass({
 
         if (viewUserOnClick) {
             onClick = () => {
-                dispatcher.dispatch({
+                dis.dispatch({
                     action: 'view_user',
                     member: this.props.member,
                 });

From eb6c7ec275e4503771aae6c84af6b579cbd7921c Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Thu, 16 Jan 2020 13:13:25 +0000
Subject: [PATCH 0399/3235] Translated using Weblate (Finnish)

Currently translated at 98.5% (1988 of 2018 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e53afb2598..38d7556f52 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2025,5 +2025,6 @@
     "Recent Conversations": "Viimeaikaiset keskustelut",
     "Direct Messages": "Yksityisviestit",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Jos et löydä jotakuta, kysy hänen käyttäjätunnusta, tai anna oma käyttäjätunnuksesi (%(userId)s) tai <a>linkin profiiliisi</a> hänelle.",
-    "Go": "Mene"
+    "Go": "Mene",
+    "Lock": "Lukko"
 }

From 086b3f811e9491ebd604cfc33d0f703ee9ce7680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 16 Jan 2020 08:12:23 +0000
Subject: [PATCH 0400/3235] Translated using Weblate (French)

Currently translated at 100.0% (2018 of 2018 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c2863d713f..b18bf44d73 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2042,5 +2042,19 @@
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "La sauvegarde de clés est activée pour votre compte mais n’a pas été configurée pour cette session. Pour configurer le coffre secret, restaurez votre sauvegarde de clés.",
     "Restore": "Restaurer",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant les paramètres existants de la sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés",
-    "Restore your Key Backup": "Restaurer votre sauvegarde de clés"
+    "Restore your Key Backup": "Restaurer votre sauvegarde de clés",
+    "a few seconds ago": "il y a quelques secondes",
+    "about a minute ago": "il y a environ une minute",
+    "%(num)s minutes ago": "il y a %(num)s minutes",
+    "about an hour ago": "il y a environ une heure",
+    "%(num)s hours ago": "il y a %(num)s heures",
+    "about a day ago": "il y a environ un jour",
+    "%(num)s days ago": "il y a %(num)s jours",
+    "a few seconds from now": "dans quelques secondes",
+    "about a minute from now": "dans une minute environ",
+    "%(num)s minutes from now": "dans %(num)s minutes",
+    "about an hour from now": "dans une heure environ",
+    "%(num)s hours from now": "dans %(num)s heures",
+    "about a day from now": "dans un jour environ",
+    "%(num)s days from now": "dans %(num)s jours"
 }

From f8d12b11f5f17781cc468311cd417a9c2dd4c474 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 16 Jan 2020 11:57:17 +0000
Subject: [PATCH 0401/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2018 of 2018 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 | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 22fc083d08..bb35bd6d69 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2032,5 +2032,28 @@
     "Show more": "Mostra altro",
     "Direct Messages": "Messaggi diretti",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Se non riesci a trovare qualcuno, chiedigli il nome utente o condividi il tuo (%(userId)s) o il <a>link al profilo</a>.",
-    "Go": "Vai"
+    "Go": "Vai",
+    "a few seconds ago": "pochi secondi fa",
+    "about a minute ago": "circa un minuto fa",
+    "%(num)s minutes ago": "%(num)s minuti fa",
+    "about an hour ago": "circa un'ora fa",
+    "%(num)s hours ago": "%(num)s ore fa",
+    "about a day ago": "circa un giorno fa",
+    "%(num)s days ago": "%(num)s giorni fa",
+    "a few seconds from now": "pochi secondi da adesso",
+    "about a minute from now": "circa un minuto da adesso",
+    "%(num)s minutes from now": "%(num)s minuti da adesso",
+    "about an hour from now": "circa un'ora da adesso",
+    "%(num)s hours from now": "%(num)s ore da adesso",
+    "about a day from now": "circa un giorno da adesso",
+    "%(num)s days from now": "%(num)s giorni da adesso",
+    "Show a presence dot next to DMs in the room list": "Mostra un punto di presenza accanto ai mess. diretti nell'elenco stanza",
+    "Lock": "Lucchetto",
+    "Bootstrap cross-signing and secret storage": "Inizializza firma incrociata e archivio segreto",
+    "Failed to find the following users": "Impossibile trovare i seguenti utenti",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "I seguenti utenti potrebbero non esistere o non sono validi, perciò non possono essere invitati: %(csvNames)s",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Il Backup Chiavi è attivo sul tuo account ma non è stato impostato da questa sessione. Per impostare un archivio segreto, ripristina il tuo backup chiavi.",
+    "Restore": "Ripristina",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli esistenti del backup chiavi. La password dell'archivio segreto e la chiave di recupero saranno le stesse del backup chiavi",
+    "Restore your Key Backup": "Ripristina il tuo Backup Chiavi"
 }

From 0f61aa57ffae4c3e813390b43aaa93d639b8cc6f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jan 2020 17:00:04 +0000
Subject: [PATCH 0402/3235] Apply suggestions from code review

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/components/views/right_panel/GroupHeaderButtons.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index 1602f47347..f164b6c578 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -23,7 +23,6 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
-import RightPanelStore from "../../../stores/RightPanelStore";
 
 const GROUP_PHASES = [
     RIGHT_PANEL_PHASES.GroupMemberInfo,
@@ -69,7 +68,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
     _onMembersClicked() {
         if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
+            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
         } else {
             // This toggles for us, if needed
             this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);

From 83b15054015c06b7201b11c22fda4592c34b24e9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Jan 2020 20:23:47 +0000
Subject: [PATCH 0403/3235] Add a ToastStore

To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
---
 src/components/structures/MatrixChat.js       | 16 +++---
 src/components/structures/ToastContainer.js   | 25 +++------
 .../views/toasts/VerificationRequestToast.js  |  9 ++--
 src/stores/ToastStore.js                      | 52 +++++++++++++++++++
 4 files changed, 71 insertions(+), 31 deletions(-)
 create mode 100644 src/stores/ToastStore.js

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c59c44ebd8..978743ca87 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -64,6 +64,7 @@ import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import KeyVerificationStateObserver from '../../utils/KeyVerificationStateObserver';
+import ToastStore from "../../stores/ToastStore";
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {
@@ -1458,15 +1459,12 @@ export default createReactClass({
                 }
 
                 if (!requestObserver || requestObserver.pending) {
-                    dis.dispatch({
-                        action: "show_toast",
-                        toast: {
-                            key: request.event.getId(),
-                            title: _t("Verification Request"),
-                            icon: "verification",
-                            props: {request, requestObserver},
-                            component: sdk.getComponent("toasts.VerificationRequestToast"),
-                        },
+                    ToastStore.sharedInstance().addOrReplaceToast({
+                        key: 'verifreq_' + request.event.getId(),
+                        title: _t("Verification Request"),
+                        icon: "verification",
+                        props: {request, requestObserver},
+                        component: sdk.getComponent("toasts.VerificationRequestToast"),
                     });
                 }
             });
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index a8dca35747..bc74133433 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import * as React from "react";
-import dis from "../../dispatcher";
 import { _t } from '../../languageHandler';
+import ToastStore from "../../stores/ToastStore";
 import classNames from "classnames";
 
 export default class ToastContainer extends React.Component {
@@ -26,26 +26,15 @@ export default class ToastContainer extends React.Component {
     }
 
     componentDidMount() {
-        this._dispatcherRef = dis.register(this.onAction);
+        ToastStore.sharedInstance().on('update', this._onToastStoreUpdate);
     }
 
     componentWillUnmount() {
-        dis.unregister(this._dispatcherRef);
+        ToastStore.sharedInstance().removeListener('update', this._onToastStoreUpdate);
     }
 
-    onAction = (payload) => {
-        if (payload.action === "show_toast") {
-            this._addToast(payload.toast);
-        }
-    };
-
-    _addToast(toast) {
-        this.setState({toasts: this.state.toasts.concat(toast)});
-    }
-
-    dismissTopToast = () => {
-        const [, ...remaining] = this.state.toasts;
-        this.setState({toasts: remaining});
+    _onToastStoreUpdate = () => {
+        this.setState({toasts: ToastStore.sharedInstance().getToasts()});
     };
 
     render() {
@@ -62,8 +51,8 @@ export default class ToastContainer extends React.Component {
             const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
 
             const toastProps = Object.assign({}, props, {
-                dismiss: this.dismissTopToast,
                 key,
+                toastKey: key,
             });
             toast = (<div className={toastClasses}>
                 <h2>{title}{countIndicator}</h2>
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 6d53c23743..18db5eae66 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import KeyVerificationStateObserver, {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher";
+import ToastStore from "../../../stores/ToastStore";
 
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
@@ -63,12 +64,12 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         if (!this.props.requestObserver.pending) {
-            this.props.dismiss();
+            ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
     }
 
     cancel = () => {
-        this.props.dismiss();
+        ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         try {
             this.props.request.cancel();
         } catch (err) {
@@ -77,7 +78,7 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     accept = () => {
-        this.props.dismiss();
+        ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {event} = this.props.request;
         // no room id for to_device requests
         if (event.getRoomId()) {
@@ -119,7 +120,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 }
 
 VerificationRequestToast.propTypes = {
-    dismiss: PropTypes.func.isRequired,
     request: PropTypes.object.isRequired,
     requestObserver: PropTypes.instanceOf(KeyVerificationStateObserver),
+    toastKey: PropTypes.string.isRequired,
 };
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
new file mode 100644
index 0000000000..f6cc30db67
--- /dev/null
+++ b/src/stores/ToastStore.js
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 EventEmitter from 'events';
+
+/**
+ * Holds the active toasts
+ */
+export default class ToastStore extends EventEmitter {
+    static sharedInstance() {
+        if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
+        return global.mx_ToastStore;
+    }
+
+    constructor() {
+        super();
+        this._dispatcherRef = null;
+        this._toasts = [];
+    }
+
+    addOrReplaceToast(newToast) {
+        const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
+        if (oldIndex === -1) {
+            this._toasts.push(newToast);
+        } else {
+            this._toasts[oldIndex] = newToast;
+        }
+        this.emit('update');
+    }
+
+    dismissToast(key) {
+        this._toasts = this._toasts.filter(t => t.key !== key);
+        this.emit('update');
+    }
+
+    getToasts() {
+        return this._toasts;
+    }
+}

From 45dea0152fa9bd1fdb4fe6b48f2a53b524488ee2 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 16 Jan 2020 20:29:23 +0000
Subject: [PATCH 0404/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2026 of 2026 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index a59b4fd658..1803ac7601 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2057,5 +2057,14 @@
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "A Kulcs Mentés a fiókhoz igen de ehhez a munkamenethez nincs beállítva. A Biztonsági tároló beállításához állítsd vissza a kulcs mentést.",
     "Restore": "Visszaállít",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a meglévő kulcs mentés adatai alapján lesz beállítva. A biztonsági tárolóhoz tartozó jelmondat és a visszaállítási kulcs azonos lesz  ahogy azok a kulcs mentéshez voltak",
-    "Restore your Key Backup": "Kulcs Mentés visszaállítása"
+    "Restore your Key Backup": "Kulcs Mentés visszaállítása",
+    "Complete security": "Biztonság beállítása",
+    "Verify this session to grant it access to encrypted messages.": "A titkosított üzenetekhez való hozzáféréshez hitelesítsd ezt a munkamenetet.",
+    "Start": "Indít",
+    "Session verified": "Munkamenet hitelesítve",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ez a munkameneted hitelesítve van. A titkosított üzenetekhez hozzáférése van és más felhasználók megbízhatónak látják.",
+    "Done": "Kész",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Az eszköz biztonságának beállítása nélkül nem férhet hozzá a titkosított üzenetekhez.",
+    "Go Back": "Vissza",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "A Biztonsági Tároló a kulcs mentés adatainak felhasználásával lesz beállítva. A biztonsági tároló jelmondata és a visszaállítási kulcs ugyanaz lesz mint a kulcs mentéshez használt."
 }

From fa0d7127735e5883440ac317b1886c289a95dfb6 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Thu, 16 Jan 2020 19:42:11 +0000
Subject: [PATCH 0405/3235] Translated using Weblate (Turkish)

Currently translated at 65.9% (1336 of 2026 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 659c973d35..af4bab9689 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1297,5 +1297,56 @@
     "Copied!": "Kopyalandı!",
     "Failed to copy": "Kopyalama başarısız",
     "edited": "düzenlendi",
-    "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi"
+    "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu <idserver /> üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Kimlik sunucusundan bağlantıyı kesmeden önce telefon numaranızı ve e-posta adreslerinizi silmenizi tavsiye ederiz.",
+    "Set a new account password...": "Yeni bir hesap şifresi belirle...",
+    "Deactivating your account is a permanent action - be careful!": "Hesabınızı pasifleştirmek bir kalıcı eylemdir - dikkat edin!",
+    "Deactivate account": "Hesabı pasifleştir",
+    "For help with using Riot, click <a>here</a>.": "Riot kullanarak yardım etmek için, <a>buraya</a> tıklayın.",
+    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
+    "Submit debug logs": "Hata ayıklama kayıtlarını gönder",
+    "Something went wrong. Please try again or view your console for hints.": "Bir şeyler hatalı gitti. Lütfen yeniden deneyin veya ipuçları için konsolunuza bakın.",
+    "Please verify the room ID or alias and try again.": "Lütfen odanın ID si veya lakabı doğrulayın ve yeniden deneyin.",
+    "Please try again or view your console for hints.": "Lütfen yeniden deneyin veya ipuçları için konsolunuza bakın.",
+    "None": "Yok",
+    "Ban list rules - %(roomName)s": "Yasak Liste Kuralları - %(roomName)s",
+    "You have not ignored anyone.": "Kimseyi yok saymamışsınız.",
+    "You are currently ignoring:": "Halihazırda yoksaydıklarınız:",
+    "Unsubscribe": "Abonelikten Çık",
+    "You are currently subscribed to:": "Halizhazırdaki abonelikleriniz:",
+    "Ignored users": "Yoksayılan kullanıcılar",
+    "Personal ban list": "Kişisel yasak listesi",
+    "Server or user ID to ignore": "Yoksaymak için sunucu veya kullanıcı ID",
+    "eg: @bot:* or example.org": "örn: @bot:* veya example.org",
+    "Ignore": "Yoksay",
+    "Subscribed lists": "Abone olunmuş listeler",
+    "If this isn't what you want, please use a different tool to ignore users.": "Eğer istediğiniz bu değilse, kullanıcıları yoksaymak için lütfen farklı bir araç kullanın.",
+    "Room ID or alias of ban list": "Yasak listesinin Oda ID veya lakabı",
+    "Subscribe": "Abone ol",
+    "Always show the window menu bar": "Pencerenin menü çubuğunu her zaman göster",
+    "Bulk options": "Toplu işlem seçenekleri",
+    "Accept all %(invitedRooms)s invites": "Bütün %(invitedRooms)s davetlerini kabul et",
+    "Request media permissions": "Medya izinleri talebi",
+    "Upgrade this room to the recommended room version": "Bu odayı önerilen oda sürümüne yükselt",
+    "View older messages in %(roomName)s.": "%(roomName)s odasında daha eski mesajları göster.",
+    "This bridge is managed by <user />.": "Bu köprü <user /> tarafından yönetiliyor.",
+    "Connected via %(protocolName)s": "%(protocolName)s yoluyla bağlandı",
+    "Bridge Info": "Köprü Bilgisi",
+    "Set a new custom sound": "Özel bir ses ayarla",
+    "Change main address for the room": "Oda için ana adresi değiştir",
+    "Error changing power level requirement": "Güç düzey gereksinimi değiştirmede hata",
+    "Error changing power level": "Güç düzeyi değiştirme hatası",
+    "Send %(eventType)s events": "%(eventType)s olaylarını gönder",
+    "To link to this room, please add an alias.": "Bu odaya bağlanmak için, lütfen bir lakap ekle.",
+    "This user has not verified all of their devices.": "Bu kullanıcı tüm cihazlarda doğrulanmadı.",
+    "You have verified this user. This user has verified all of their devices.": "Bu kullanıcıyı doğruladınız. Bu kullanıcı tüm cihazlarında doğrulandı.",
+    "This event could not be displayed": "Bu olay görüntülenemedi",
+    "Demote yourself?": "Kendinin rütbeni düşür?",
+    "Demote": "Rütbe Düşür",
+    "Mention": "Bahsetme",
+    "Remove recent messages": "Son mesajları sil",
+    "The conversation continues here.": "Sohbet buradan devam ediyor.",
+    "You can only join it with a working invite.": "Sadece çalışan bir davet ile katılınabilir.",
+    "Try to join anyway": "Katılmak için yinede deneyin"
 }

From 7da9e0582f3887f3dab030d5279c200ce97f1ce8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 13:42:34 -0700
Subject: [PATCH 0406/3235] Rename DMInviteDialog to be a generic Invite Dialog

---
 res/css/_components.scss                      |  2 +-
 ...DMInviteDialog.scss => _InviteDialog.scss} | 40 ++++++++---------
 src/RoomInvite.js                             |  4 +-
 .../{DMInviteDialog.js => InviteDialog.js}    | 44 +++++++++----------
 4 files changed, 45 insertions(+), 45 deletions(-)
 rename res/css/views/dialogs/{_DMInviteDialog.scss => _InviteDialog.scss} (86%)
 rename src/components/views/dialogs/{DMInviteDialog.js => InviteDialog.js} (94%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index a9a114a4cf..60f749de9c 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -57,13 +57,13 @@
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./views/dialogs/_CreateGroupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
-@import "./views/dialogs/_DMInviteDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DeviceVerifyDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
+@import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
diff --git a/res/css/views/dialogs/_DMInviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
similarity index 86%
rename from res/css/views/dialogs/_DMInviteDialog.scss
rename to res/css/views/dialogs/_InviteDialog.scss
index 5d58f3ae8b..d0b53b7766 100644
--- a/res/css/views/dialogs/_DMInviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DMInviteDialog_addressBar {
+.mx_InviteDialog_addressBar {
     display: flex;
     flex-direction: row;
 
-    .mx_DMInviteDialog_editor {
+    .mx_InviteDialog_editor {
         flex: 1;
         width: 100%; // Needed to make the Field inside grow
         background-color: $user-tile-hover-bg-color;
@@ -28,7 +28,7 @@ limitations under the License.
         overflow-x: hidden;
         overflow-y: auto;
 
-        .mx_DMInviteDialog_userTile {
+        .mx_InviteDialog_userTile {
             display: inline-block;
             float: left;
             position: relative;
@@ -61,14 +61,14 @@ limitations under the License.
         }
     }
 
-    .mx_DMInviteDialog_goButton {
+    .mx_InviteDialog_goButton {
         width: 48px;
         margin-left: 10px;
         height: 25px;
         line-height: 25px;
     }
 
-    .mx_DMInviteDialog_buttonAndSpinner {
+    .mx_InviteDialog_buttonAndSpinner {
         .mx_Spinner {
             // Width and height are required to trick the layout engine.
             width: 20px;
@@ -80,7 +80,7 @@ limitations under the License.
     }
 }
 
-.mx_DMInviteDialog_section {
+.mx_InviteDialog_section {
     padding-bottom: 10px;
 
     h3 {
@@ -91,7 +91,7 @@ limitations under the License.
     }
 }
 
-.mx_DMInviteDialog_roomTile {
+.mx_InviteDialog_roomTile {
     cursor: pointer;
     padding: 5px 10px;
 
@@ -104,7 +104,7 @@ limitations under the License.
         vertical-align: middle;
     }
 
-    .mx_DMInviteDialog_roomTile_avatarStack {
+    .mx_InviteDialog_roomTile_avatarStack {
         display: inline-block;
         position: relative;
         width: 36px;
@@ -117,7 +117,7 @@ limitations under the License.
         }
     }
 
-    .mx_DMInviteDialog_roomTile_selected {
+    .mx_InviteDialog_roomTile_selected {
         width: 36px;
         height: 36px;
         border-radius: 36px;
@@ -141,20 +141,20 @@ limitations under the License.
         }
     }
 
-    .mx_DMInviteDialog_roomTile_name {
+    .mx_InviteDialog_roomTile_name {
         font-weight: 600;
         font-size: 14px;
         color: $primary-fg-color;
         margin-left: 7px;
     }
 
-    .mx_DMInviteDialog_roomTile_userId {
+    .mx_InviteDialog_roomTile_userId {
         font-size: 12px;
         color: $muted-fg-color;
         margin-left: 7px;
     }
 
-    .mx_DMInviteDialog_roomTile_time {
+    .mx_InviteDialog_roomTile_time {
         text-align: right;
         font-size: 12px;
         color: $muted-fg-color;
@@ -162,16 +162,16 @@ limitations under the License.
         line-height: 36px; // Height of the avatar to keep the time vertically aligned
     }
 
-    .mx_DMInviteDialog_roomTile_highlight {
+    .mx_InviteDialog_roomTile_highlight {
         font-weight: 900;
     }
 }
 
 // Many of these styles are stolen from mx_UserPill, but adjusted for the invite dialog.
-.mx_DMInviteDialog_userTile {
+.mx_InviteDialog_userTile {
     margin-right: 8px;
 
-    .mx_DMInviteDialog_userTile_pill {
+    .mx_InviteDialog_userTile_pill {
         background-color: $username-variant1-color;
         border-radius: 12px;
         display: inline-block;
@@ -181,27 +181,27 @@ limitations under the License.
         padding-right: 8px;
         color: #ffffff; // this is fine without a var because it's for both themes
 
-        .mx_DMInviteDialog_userTile_avatar {
+        .mx_InviteDialog_userTile_avatar {
             border-radius: 20px;
             position: relative;
             left: -5px;
             top: 2px;
         }
 
-        img.mx_DMInviteDialog_userTile_avatar {
+        img.mx_InviteDialog_userTile_avatar {
             vertical-align: top;
         }
 
-        .mx_DMInviteDialog_userTile_name {
+        .mx_InviteDialog_userTile_name {
             vertical-align: top;
         }
 
-        .mx_DMInviteDialog_userTile_threepidAvatar {
+        .mx_InviteDialog_userTile_threepidAvatar {
             background-color: #ffffff; // this is fine without a var because it's for both themes
         }
     }
 
-    .mx_DMInviteDialog_userTile_remove {
+    .mx_InviteDialog_userTile_remove {
         display: inline-block;
         margin-left: 4px;
     }
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 8b7324d4f5..aaddd58d0b 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -44,9 +44,9 @@ export function inviteMultipleToRoom(roomId, addrs) {
 export function showStartChatInviteDialog() {
     if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
         // This new dialog handles the room creation internally - we don't need to worry about it.
-        const DMInviteDialog = sdk.getComponent("dialogs.DMInviteDialog");
+        const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
         Modal.createTrackedDialog(
-            'Start DM', '', DMInviteDialog, {},
+            'Start DM', '', InviteDialog, {},
             /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
         );
         return;
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/InviteDialog.js
similarity index 94%
rename from src/components/views/dialogs/DMInviteDialog.js
rename to src/components/views/dialogs/InviteDialog.js
index 2a5c896a75..6b8e532854 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -140,11 +140,11 @@ class DMUserTile extends React.PureComponent {
         const avatarSize = 20;
         const avatar = this.props.member.isEmail
             ? <img
-                className='mx_DMInviteDialog_userTile_avatar mx_DMInviteDialog_userTile_threepidAvatar'
+                className='mx_InviteDialog_userTile_avatar mx_InviteDialog_userTile_threepidAvatar'
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
                 width={avatarSize} height={avatarSize} />
             : <BaseAvatar
-                className='mx_DMInviteDialog_userTile_avatar'
+                className='mx_InviteDialog_userTile_avatar'
                 url={getHttpUriForMxc(
                     MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
                     avatarSize, avatarSize, "crop")}
@@ -154,13 +154,13 @@ class DMUserTile extends React.PureComponent {
                 height={avatarSize} />;
 
         return (
-            <span className='mx_DMInviteDialog_userTile'>
-                <span className='mx_DMInviteDialog_userTile_pill'>
+            <span className='mx_InviteDialog_userTile'>
+                <span className='mx_InviteDialog_userTile_pill'>
                     {avatar}
-                    <span className='mx_DMInviteDialog_userTile_name'>{this.props.member.name}</span>
+                    <span className='mx_InviteDialog_userTile_name'>{this.props.member.name}</span>
                 </span>
                 <AccessibleButton
-                    className='mx_DMInviteDialog_userTile_remove'
+                    className='mx_InviteDialog_userTile_remove'
                     onClick={this._onRemove}
                 >
                     <img src={require("../../../../res/img/icon-pill-remove.svg")} alt={_t('Remove')} width={8} height={8} />
@@ -211,7 +211,7 @@ class DMRoomTile extends React.PureComponent {
 
             // Highlight the word the user entered
             const substr = str.substring(i, filterStr.length + i);
-            result.push(<span className='mx_DMInviteDialog_roomTile_highlight' key={i + 'bold'}>{substr}</span>);
+            result.push(<span className='mx_InviteDialog_roomTile_highlight' key={i + 'bold'}>{substr}</span>);
             i += substr.length;
         }
 
@@ -229,7 +229,7 @@ class DMRoomTile extends React.PureComponent {
         let timestamp = null;
         if (this.props.lastActiveTs) {
             const humanTs = humanizeTime(this.props.lastActiveTs);
-            timestamp = <span className='mx_DMInviteDialog_roomTile_time'>{humanTs}</span>;
+            timestamp = <span className='mx_InviteDialog_roomTile_time'>{humanTs}</span>;
         }
 
         const avatarSize = 36;
@@ -249,30 +249,30 @@ class DMRoomTile extends React.PureComponent {
         let checkmark = null;
         if (this.props.isSelected) {
             // To reduce flickering we put the 'selected' room tile above the real avatar
-            checkmark = <div className='mx_DMInviteDialog_roomTile_selected' />;
+            checkmark = <div className='mx_InviteDialog_roomTile_selected' />;
         }
 
         // To reduce flickering we put the checkmark on top of the actual avatar (prevents
         // the browser from reloading the image source when the avatar remounts).
         const stackedAvatar = (
-            <span className='mx_DMInviteDialog_roomTile_avatarStack'>
+            <span className='mx_InviteDialog_roomTile_avatarStack'>
                 {avatar}
                 {checkmark}
             </span>
         );
 
         return (
-            <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}>
+            <div className='mx_InviteDialog_roomTile' onClick={this._onClick}>
                 {stackedAvatar}
-                <span className='mx_DMInviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
-                <span className='mx_DMInviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
+                <span className='mx_InviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
+                <span className='mx_InviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
                 {timestamp}
             </div>
         );
     }
 }
 
-export default class DMInviteDialog extends React.PureComponent {
+export default class InviteDialog extends React.PureComponent {
     static propTypes = {
         // Takes an array of user IDs/emails to invite.
         onFinished: PropTypes.func.isRequired,
@@ -690,7 +690,7 @@ export default class DMInviteDialog extends React.PureComponent {
 
             if (sourceMembers.length === 0 && additionalMembers.length === 0) {
                 return (
-                    <div className='mx_DMInviteDialog_section'>
+                    <div className='mx_InviteDialog_section'>
                         <h3>{sectionName}</h3>
                         <p>{_t("No results")}</p>
                     </div>
@@ -731,7 +731,7 @@ export default class DMInviteDialog extends React.PureComponent {
             />
         ));
         return (
-            <div className='mx_DMInviteDialog_section'>
+            <div className='mx_InviteDialog_section'>
                 <h3>{sectionName}</h3>
                 {tiles}
                 {showMore}
@@ -754,7 +754,7 @@ export default class DMInviteDialog extends React.PureComponent {
             />
         );
         return (
-            <div className='mx_DMInviteDialog_editor' onClick={this._onClickInputArea}>
+            <div className='mx_InviteDialog_editor' onClick={this._onClickInputArea}>
                 {targets}
                 {input}
             </div>
@@ -808,12 +808,12 @@ export default class DMInviteDialog extends React.PureComponent {
         const userId = MatrixClientPeg.get().getUserId();
         return (
             <BaseDialog
-                className='mx_DMInviteDialog'
+                className='mx_InviteDialog'
                 hasCancel={true}
                 onFinished={this._cancel}
                 title={_t("Direct Messages")}
             >
-                <div className='mx_DMInviteDialog_content'>
+                <div className='mx_InviteDialog_content'>
                     <p>
                         {_t(
                             "If you can't find someone, ask them for their username, or share your " +
@@ -822,13 +822,13 @@ export default class DMInviteDialog extends React.PureComponent {
                             {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
                         )}
                     </p>
-                    <div className='mx_DMInviteDialog_addressBar'>
+                    <div className='mx_InviteDialog_addressBar'>
                         {this._renderEditor()}
-                        <div className='mx_DMInviteDialog_buttonAndSpinner'>
+                        <div className='mx_InviteDialog_buttonAndSpinner'>
                             <AccessibleButton
                                 kind="primary"
                                 onClick={this._startDm}
-                                className='mx_DMInviteDialog_goButton'
+                                className='mx_InviteDialog_goButton'
                                 disabled={this.state.busy}
                             >
                                 {_t("Go")}

From 73fc91aa20a76f8b3a8d2b4a13d3407e4084151f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 13:44:59 -0700
Subject: [PATCH 0407/3235] Rename feature flag for use in both code paths

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 2b8c0aef89..eacf63e55d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -130,7 +130,7 @@ export const SETTINGS = {
     },
     "feature_ftue_dms": {
         isFeature: true,
-        displayName: _td("New DM invite dialog (under development)"),
+        displayName: _td("New invite dialog"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },

From f350167408b916db2fd3fefea84e500f7016f993 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 14:40:12 -0700
Subject: [PATCH 0408/3235] Support using the InviteDialog for both DMs and
 invites

For https://github.com/vector-im/riot-web/issues/11201
---
 src/RoomInvite.js                            |  14 +-
 src/components/views/dialogs/InviteDialog.js | 127 +++++++++++++++----
 src/i18n/strings/en_EN.json                  |  26 ++--
 3 files changed, 129 insertions(+), 38 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index aaddd58d0b..2eccf69b0f 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017, 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +27,7 @@ import dis from './dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import { _t } from './languageHandler';
 import SettingsStore from "./settings/SettingsStore";
+import {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
 
 /**
  * Invites multiple addresses to a room
@@ -46,7 +48,7 @@ export function showStartChatInviteDialog() {
         // This new dialog handles the room creation internally - we don't need to worry about it.
         const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
         Modal.createTrackedDialog(
-            'Start DM', '', InviteDialog, {},
+            'Start DM', '', InviteDialog, {kind: KIND_DM},
             /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
         );
         return;
@@ -72,6 +74,16 @@ export function showStartChatInviteDialog() {
 }
 
 export function showRoomInviteDialog(roomId) {
+    if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
+        // This new dialog handles the room creation internally - we don't need to worry about it.
+        const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
+        Modal.createTrackedDialog(
+            'Invite Users', '', InviteDialog, {kind: KIND_INVITE, roomId},
+            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+        );
+        return;
+    }
+
     const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
 
     Modal.createTrackedDialog('Chat Invite', '', AddressPickerDialog, {
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 6b8e532854..7448b1a5a3 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/src/matrix";
 import SdkConfig from "../../../SdkConfig";
@@ -34,7 +34,8 @@ import {humanizeTime} from "../../../utils/humanize";
 import createRoom from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
 
-// TODO: [TravisR] Make this generic for all kinds of invites
+export const KIND_DM = "dm";
+export const KIND_INVITE = "invite";
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
@@ -276,13 +277,28 @@ export default class InviteDialog extends React.PureComponent {
     static propTypes = {
         // Takes an array of user IDs/emails to invite.
         onFinished: PropTypes.func.isRequired,
+
+        // The kind of invite being performed. Assumed to be KIND_DM if
+        // not provided.
+        kind: PropTypes.string,
+
+        // The room ID this dialog is for. Only required for KIND_INVITE.
+        roomId: PropTypes.string,
+    };
+
+    static defaultProps = {
+        kind: KIND_DM,
     };
 
     _debounceTimer: number = null;
     _editorRef: any = null;
 
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
+
+        if (props.kind === KIND_INVITE && !props.roomId) {
+            throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
+        }
 
         this.state = {
             targets: [], // array of Member objects (see interface above)
@@ -390,6 +406,21 @@ export default class InviteDialog extends React.PureComponent {
         return members.map(m => ({userId: m.member.userId, user: m.member}));
     }
 
+    _shouldAbortAfterInviteError(result): boolean {
+        const failedUsers = Object.keys(result.states).filter(a => result.states[a] === 'error');
+        if (failedUsers.length > 0) {
+            console.log("Failed to invite users: ", result);
+            this.setState({
+                busy: false,
+                errorText: _t("Failed to invite the following users to chat: %(csvUsers)s", {
+                    csvUsers: failedUsers.join(", "),
+                }),
+            });
+            return true; // abort
+        }
+        return false;
+    }
+
     _startDm = () => {
         this.setState({busy: true});
         const targetIds = this.state.targets.map(t => t.userId);
@@ -417,15 +448,7 @@ export default class InviteDialog extends React.PureComponent {
             createRoomPromise = createRoom().then(roomId => {
                 return inviteMultipleToRoom(roomId, targetIds);
             }).then(result => {
-                const failedUsers = Object.keys(result.states).filter(a => result.states[a] === 'error');
-                if (failedUsers.length > 0) {
-                    console.log("Failed to invite users: ", result);
-                    this.setState({
-                        busy: false,
-                        errorText: _t("Failed to invite the following users to chat: %(csvUsers)s", {
-                            csvUsers: failedUsers.join(", "),
-                        }),
-                    });
+                if (this._shouldAbortAfterInviteError(result)) {
                     return true; // abort
                 }
             });
@@ -444,6 +467,33 @@ export default class InviteDialog extends React.PureComponent {
         });
     };
 
+    _inviteUsers = () => {
+        this.setState({busy: true});
+        const targetIds = this.state.targets.map(t => t.userId);
+
+        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+        if (!room) {
+            console.error("Failed to find the room to invite users to");
+            this.setState({
+                busy: false,
+                errorText: _t("Something went wrong trying to invite the users."),
+            });
+            return;
+        }
+
+        inviteMultipleToRoom(this.props.roomId, targetIds).then(result => {
+            if (!this._shouldAbortAfterInviteError(result)) { // handles setting error message too
+                this.props.onFinished();
+            }
+        }).catch(err => {
+            console.error(err);
+            this.setState({
+                busy: false,
+                errorText: _t("We couldn't invite those users. Please check the users you want to invite and try again."),
+            });
+        });
+    };
+
     _cancel = () => {
         // We do not want the user to close the dialog while an action is in progress
         if (this.state.busy) return;
@@ -658,7 +708,11 @@ export default class InviteDialog extends React.PureComponent {
         let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
         const showMoreFn = kind === 'recents' ? this._showMoreRecents.bind(this) : this._showMoreSuggestions.bind(this);
         const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
-        const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
+        let sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
+
+        if (this.props.kind === KIND_INVITE) {
+            sectionName = kind === 'recents' ? _t("Recently Direct Messaged") : _t("Suggestions");
+        }
 
         // Mix in the server results if we have any, but only if we're searching. We track the additional
         // members separately because we want to filter sourceMembers but trust the mixin arrays to have
@@ -805,33 +859,54 @@ export default class InviteDialog extends React.PureComponent {
             spinner = <Spinner w={20} h={20} />;
         }
 
-        const userId = MatrixClientPeg.get().getUserId();
+
+        let title;
+        let helpText;
+        let buttonText;
+        let goButtonFn;
+
+        if (this.props.kind === KIND_DM) {
+            const userId = MatrixClientPeg.get().getUserId();
+
+            title = _t("Direct Messages");
+            helpText = _t(
+                "If you can't find someone, ask them for their username, or share your " +
+                "username (%(userId)s) or <a>profile link</a>.",
+                {userId},
+                {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
+            );
+            buttonText = _t("Go");
+            goButtonFn = this._startDm;
+        } else { // KIND_INVITE
+            title = _t("Invite to this room");
+            helpText = _t(
+                "If you can't find someone, ask them for their username (e.g. @user:server.com) or " +
+                "<a>share this room</a>.", {},
+                {a: (sub) => <a href={makeRoomPermalink(this.props.roomId)} rel="noopener" target="_blank">{sub}</a>},
+            );
+            buttonText = _t("Invite");
+            goButtonFn = this._inviteUsers;
+        }
+
         return (
             <BaseDialog
                 className='mx_InviteDialog'
                 hasCancel={true}
                 onFinished={this._cancel}
-                title={_t("Direct Messages")}
+                title={title}
             >
                 <div className='mx_InviteDialog_content'>
-                    <p>
-                        {_t(
-                            "If you can't find someone, ask them for their username, or share your " +
-                            "username (%(userId)s) or <a>profile link</a>.",
-                            {userId},
-                            {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
-                        )}
-                    </p>
+                    <p>{helpText}</p>
                     <div className='mx_InviteDialog_addressBar'>
                         {this._renderEditor()}
                         <div className='mx_InviteDialog_buttonAndSpinner'>
                             <AccessibleButton
                                 kind="primary"
-                                onClick={this._startDm}
+                                onClick={goButtonFn}
                                 className='mx_InviteDialog_goButton'
                                 disabled={this.state.busy}
                             >
-                                {_t("Go")}
+                                {buttonText}
                             </AccessibleButton>
                             {spinner}
                         </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b6f61570cd..f8b17db7c5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -372,7 +372,7 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "New DM invite dialog (under development)": "New DM invite dialog (under development)",
+    "New invite dialog": "New invite dialog",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
@@ -1438,16 +1438,6 @@
     "View Servers in Room": "View Servers in Room",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
-    "Failed to find the following users": "Failed to find the following users",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
-    "Recent Conversations": "Recent Conversations",
-    "Suggestions": "Suggestions",
-    "Show more": "Show more",
-    "Direct Messages": "Direct Messages",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
-    "Go": "Go",
     "An error has occurred.": "An error has occurred.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
     "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
@@ -1457,6 +1447,20 @@
     "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
     "Integrations not allowed": "Integrations not allowed",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
+    "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
+    "Failed to find the following users": "Failed to find the following users",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
+    "Recent Conversations": "Recent Conversations",
+    "Suggestions": "Suggestions",
+    "Recently Direct Messaged": "Recently Direct Messaged",
+    "Show more": "Show more",
+    "Direct Messages": "Direct Messages",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
+    "Go": "Go",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
     "Start verification": "Start verification",

From 1a961358f0fe7956cefc246281960c9761f500ae Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 14:40:25 -0700
Subject: [PATCH 0409/3235] Don't show recents and suggestions for users
 already in the room

---
 src/components/views/dialogs/InviteDialog.js | 28 +++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 7448b1a5a3..e176d3b105 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -300,12 +300,24 @@ export default class InviteDialog extends React.PureComponent {
             throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
         }
 
+        let alreadyInvited = [];
+        if (props.roomId) {
+            const room = MatrixClientPeg.get().getRoom(props.roomId);
+            if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
+            alreadyInvited = [
+                ...room.getMembersWithMembership('invite'),
+                ...room.getMembersWithMembership('join'),
+                ...room.getMembersWithMembership('ban'), // so we don't try to invite them
+            ].map(m => m.userId);
+        }
+
+
         this.state = {
             targets: [], // array of Member objects (see interface above)
             filterText: "",
-            recents: this._buildRecents(),
+            recents: this._buildRecents(alreadyInvited),
             numRecentsShown: INITIAL_ROOMS_SHOWN,
-            suggestions: this._buildSuggestions(),
+            suggestions: this._buildSuggestions(alreadyInvited),
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
             serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
             threepidResultsMixin: [], // { user: ThreepidMember, userId: string}[], like recents and suggestions
@@ -320,10 +332,13 @@ export default class InviteDialog extends React.PureComponent {
         this._editorRef = createRef();
     }
 
-    _buildRecents(): {userId: string, user: RoomMember, lastActive: number} {
+    _buildRecents(excludedTargetIds: string[]): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
         const recents = [];
         for (const userId in rooms) {
+            // Filter out user IDs that are already in the room / should be excluded
+            if (excludedTargetIds.includes(userId)) continue;
+
             const room = rooms[userId];
             const member = room.getMember(userId);
             if (!member) continue; // just skip people who don't have memberships for some reason
@@ -342,7 +357,7 @@ export default class InviteDialog extends React.PureComponent {
         return recents;
     }
 
-    _buildSuggestions(): {userId: string, user: RoomMember} {
+    _buildSuggestions(excludedTargetIds: string[]): {userId: string, user: RoomMember} {
         const maxConsideredMembers = 200;
         const client = MatrixClientPeg.get();
         const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
@@ -359,6 +374,11 @@ export default class InviteDialog extends React.PureComponent {
 
             const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
             for (const member of joinedMembers) {
+                // Filter out user IDs that are already in the room / should be excluded
+                if (excludedTargetIds.includes(member.userId)) {
+                    continue;
+                }
+
                 if (!members[member.userId]) {
                     members[member.userId] = {
                         member: member,

From e42663fc627187cee9a59e65cd8ff1abccb95bf3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 14:45:17 -0700
Subject: [PATCH 0410/3235] Appease the linter

---
 src/components/views/dialogs/InviteDialog.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e176d3b105..1b7a50c084 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -509,7 +509,9 @@ export default class InviteDialog extends React.PureComponent {
             console.error(err);
             this.setState({
                 busy: false,
-                errorText: _t("We couldn't invite those users. Please check the users you want to invite and try again."),
+                errorText: _t(
+                    "We couldn't invite those users. Please check the users you want to invite and try again.",
+                ),
             });
         });
     };

From 03448313e6b4f0ad41b329d08d95f1d8188bb84c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 16 Jan 2020 21:52:33 +0000
Subject: [PATCH 0411/3235] Fix event handler leak in MemberStatusMessageAvatar

A typo led to an event handler leak with the custom status labs feature. A new
handler would leak each time you change rooms, which can add up over the course
of a long-lived session.
---
 src/components/views/avatars/MemberStatusMessageAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index aaac61ce7d..54f11e8e91 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -63,7 +63,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
         user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
     }
 
-    componentWillUmount() {
+    componentWillUnmount() {
         const { user } = this.props.member;
         if (!user) {
             return;

From f535fdbcaa5f6f43f1b10ee61feaa8071953ff32 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Jan 2020 15:39:07 -0700
Subject: [PATCH 0412/3235] Update chokidar to fix reskindex not working

The major version bump doesn't appear to affect us. It wasn't working before on Windows, but now it is.
---
 package.json |  2 +-
 yarn.lock    | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 16e7f943f1..3686966870 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "@peculiar/webcrypto": "^1.0.22",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
-    "chokidar": "^2.1.2",
+    "chokidar": "^3.3.1",
     "concurrently": "^4.0.1",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.15.1",
diff --git a/yarn.lock b/yarn.lock
index d2135f7aa6..81602b4e3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1570,6 +1570,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1884,6 +1892,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+
 bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -1928,6 +1941,13 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -2232,7 +2252,7 @@ cheerio@^1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^2.0.2, chokidar@^2.1.2, chokidar@^2.1.8:
+chokidar@^2.0.2, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2251,6 +2271,21 @@ chokidar@^2.0.2, chokidar@^2.1.2, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
+  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.3.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chownr@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
@@ -3654,6 +3689,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -3815,6 +3857,11 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
+fsevents@~2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3909,6 +3956,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -4463,6 +4517,13 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
@@ -4622,7 +4683,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -4663,6 +4724,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -6104,7 +6170,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -6578,6 +6644,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.4, picomatch@^2.0.7:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
+  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -7169,6 +7240,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
+  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
+  dependencies:
+    picomatch "^2.0.7"
+
 realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
@@ -8375,6 +8453,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"

From d30c46a641a061c6f54694ef642d469dcf175f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 14 Jan 2020 11:20:56 +0100
Subject: [PATCH 0413/3235] FilePanel: Refactor out the file panel and convert
 the methods to async ones.

---
 src/components/structures/FilePanel.js | 62 +++++++++++++++-----------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 61b3d2d4b9..6728472a6c 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -40,42 +40,50 @@ const FilePanel = createReactClass({
         };
     },
 
-    componentDidMount: function() {
-        this.updateTimelineSet(this.props.roomId);
+    async componentDidMount() {
+        await this.updateTimelineSet(this.props.roomId);
     },
 
-    updateTimelineSet: function(roomId) {
+    async fetchFileEventsServer(room) {
+        const client = MatrixClientPeg.get();
+
+        const filter = new Matrix.Filter(client.credentials.userId);
+        filter.setDefinition(
+            {
+                "room": {
+                    "timeline": {
+                        "contains_url": true,
+                        "types": [
+                            "m.room.message",
+                        ],
+                    },
+                },
+            },
+        );
+
+        // FIXME: we shouldn't be doing this every time we change room - see comment above.
+        // TODO: Remove this stale comment? Which comment above?
+        const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter)
+        filter.filterId = filterId;
+        const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
+
+        return timelineSet;
+    },
+
+    async updateTimelineSet(roomId: string) {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
 
         this.noRoom = !room;
 
         if (room) {
-            const filter = new Matrix.Filter(client.credentials.userId);
-            filter.setDefinition(
-                {
-                    "room": {
-                        "timeline": {
-                            "contains_url": true,
-                            "types": [
-                                "m.room.message",
-                            ],
-                        },
-                    },
-                },
-            );
+            try {
+                let timelineSet = await this.fetchFileEventsServer(room)
+                this.setState({ timelineSet: timelineSet });
 
-            // FIXME: we shouldn't be doing this every time we change room - see comment above.
-            client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter).then(
-                (filterId)=>{
-                    filter.filterId = filterId;
-                    const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
-                    this.setState({ timelineSet: timelineSet });
-                },
-                (error)=>{
-                    console.error("Failed to get or create file panel filter", error);
-                },
-            );
+            } catch (error) {
+                console.error("Failed to get or create file panel filter", error);
+            }
         } else {
             console.error("Failed to add filtered timelineSet for FilePanel as no room!");
         }

From 4f63b10465c28db5f9abb6e5d04fd241b03e74f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 15 Jan 2020 10:41:33 +0100
Subject: [PATCH 0414/3235] EventIndex: Live events can be unencrypted as well.

---
 src/indexing/EventIndex.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c912e31fa5..0980413eb5 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -170,7 +170,12 @@ export default class EventIndex {
             return;
         }
 
-        const e = ev.toJSON().decrypted;
+        const jsonEvent = ev.toJSON();
+
+        let e;
+        if (ev.isEncrypted()) e = jsonEvent.decrypted;
+        else e = jsonEvent;
+
         const profile = {
             displayname: ev.sender.rawDisplayName,
             avatar_url: ev.sender.getMxcAvatarUrl(),

From 263370c9ae6d13038157417e71220a9c5e5cfd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 15 Jan 2020 12:04:27 +0100
Subject: [PATCH 0415/3235] BaseEventIndexManager: Add a method to load file
 events of a room.

---
 src/indexing/BaseEventIndexManager.js | 30 ++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 5e8ca668ad..d7b322bb1a 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -62,11 +62,18 @@ export interface SearchArgs {
     room_id: ?string;
 }
 
-export interface HistoricEvent {
+export interface EventAndProfile {
     event: MatrixEvent;
     profile: MatrixProfile;
 }
 
+export interface LoadArgs {
+    roomId: string;
+    limit: number;
+    fromEvent: string;
+    direction: string;
+}
+
 /**
  * Base class for classes that provide platform-specific event indexing.
  *
@@ -145,7 +152,7 @@ export default class BaseEventIndexManager {
      *
      * This is used to add a batch of events to the index.
      *
-     * @param {[HistoricEvent]} events The list of events and profiles that
+     * @param {[EventAndProfile]} events The list of events and profiles that
      * should be added to the event index.
      * @param {[CrawlerCheckpoint]} checkpoint A new crawler checkpoint that
      * should be stored in the index which should be used to continue crawling
@@ -158,7 +165,7 @@ export default class BaseEventIndexManager {
      * were already added to the index, false otherwise.
      */
     async addHistoricEvents(
-        events: [HistoricEvent],
+        events: [EventAndProfile],
         checkpoint: CrawlerCheckpoint | null,
         oldCheckpoint: CrawlerCheckpoint | null,
     ): Promise<bool> {
@@ -201,6 +208,23 @@ export default class BaseEventIndexManager {
         throw new Error("Unimplemented");
     }
 
+    /** Load events that contain an mxc URL to a file from the index.
+     *
+     * @param  {object} args Arguments object for the method.
+     * @param  {string} args.roomId The ID of the room for which the events
+     * should be loaded.
+     * @param  {number} args.limit The maximum number of events to return.
+     * @param  {string} args.fromEvent An event id of a previous event returned
+     * by this method. If set events that are older than the event with the
+     * given event ID will be returned.
+     *
+     * @return {Promise<[EventAndProfile]>} A promise that will resolve to an array
+     * of Matrix events that contain mxc URLs.
+     */
+    async loadFileEvents(args: LoadArgs): Promise<[EventAndProfile]> {
+        throw new Error("Unimplemented");
+    }
+
     /**
      * close our event index.
      *

From 8a17c73b79d13eddd31418de59716870a5b2cfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 15 Jan 2020 12:05:02 +0100
Subject: [PATCH 0416/3235] EventIndex: Add a method to populate an event
 timeline with file events.

---
 src/indexing/EventIndex.js | 68 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 0980413eb5..501e21b29d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -17,6 +17,12 @@ limitations under the License.
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 
+import Matrix from 'matrix-js-sdk';
+import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
+import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
+import MatrixEvent from 'matrix-js-sdk/lib/models/event';
+import RoomMember from 'matrix-js-sdk/lib/models/room-member';
+
 /*
  * Event indexing class that wraps the platform specific event indexing.
  */
@@ -411,4 +417,66 @@ export default class EventIndex {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.searchEventIndex(searchArgs);
     }
+
+    async populateFileTimeline(room, timelineSet) {
+        const client = MatrixClientPeg.get();
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+
+        // Get our events from the event index.
+        const events = await indexManager.loadFileEvents(
+            {
+                roomId: room.roomId,
+                limit: 10
+            }
+        );
+
+        let eventMapper = client.getEventMapper();
+
+        // Turn the events into MatrixEvent objects.
+        const matrixEvents = events.map(e => {
+            const matrixEvent = eventMapper(e.event);
+
+            const member = new RoomMember(room.roomId, matrixEvent.getSender());
+
+            // We can't really reconstruct the whole room state from our
+            // EventIndex to calculate the correct display name. Use the
+            // disambiguated form always instead.
+            member.name = e.profile.displayname + " (" + matrixEvent.getSender() + ")";
+
+            // This is sets the avatar URL.
+            const memberEvent = eventMapper(
+                {
+                    content: {
+                        membership: "join",
+                        avatar_url: e.profile.avatar_url,
+                        displayname: e.profile.displayname,
+                    },
+                    type: "m.room.member",
+                    event_id: matrixEvent.getId() + ":eventIndex",
+                    room_id: matrixEvent.getRoomId(),
+                    sender: matrixEvent.getSender(),
+                    origin_server_ts: matrixEvent.getTs(),
+                    state_key: matrixEvent.getSender()
+                }
+            );
+
+            // We set this manually to avoid emitting RoomMember.membership and
+            // RoomMember.name events.
+            member.events.member = memberEvent;
+            matrixEvent.sender = member;
+
+            return matrixEvent;
+        });
+
+        // Add the events to the live timeline of the file panel.
+        matrixEvents.forEach(e => {
+            if (!timelineSet.eventIdToTimeline(e.getId())) {
+                const liveTimeline = timelineSet.getLiveTimeline();
+                timelineSet.addEventToTimeline(e, liveTimeline, true)
+            }
+        });
+
+        // Set the pagination token to the oldest event that we retrieved.
+        timelineSet.getLiveTimeline().setPaginationToken("", EventTimeline.BACKWARDS);
+    }
 }

From a1cbff3c8cefa3945c5ebedc85e31dd305d2b9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 15 Jan 2020 12:05:43 +0100
Subject: [PATCH 0417/3235] FilePanel: Use the event index in encrypted rooms
 to populate the panel.

---
 src/components/structures/FilePanel.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 6728472a6c..56bc9dee64 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -22,6 +22,7 @@ import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
+import {EventIndexPeg} from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
 /*
@@ -73,12 +74,20 @@ const FilePanel = createReactClass({
     async updateTimelineSet(roomId: string) {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
+        const eventIndex = EventIndexPeg.get();
 
         this.noRoom = !room;
 
         if (room) {
+            let timelineSet;
+
             try {
-                let timelineSet = await this.fetchFileEventsServer(room)
+                timelineSet = await this.fetchFileEventsServer(room)
+
+                if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
+                    await eventIndex.populateFileTimeline(room, timelineSet);
+                }
+
                 this.setState({ timelineSet: timelineSet });
 
             } catch (error) {

From 7fb3645e940073a7c7db4e022e1655ca7facde7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 15 Jan 2020 12:06:29 +0100
Subject: [PATCH 0418/3235] LifeCycle: Start the event index before the client.

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

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 0796e326a0..aab7884b2e 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -588,8 +588,8 @@ async function startMatrixClient(startSyncing=true) {
     Mjolnir.sharedInstance().start();
 
     if (startSyncing) {
-        await MatrixClientPeg.start();
         await EventIndexPeg.init();
+        await MatrixClientPeg.start();
     } else {
         console.warn("Caller requested only auxiliary services be started");
         await MatrixClientPeg.assign();

From 49c1dbe42133dd8103e1d0d8036d5bcc29c32c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 10:04:53 +0100
Subject: [PATCH 0419/3235] FilePanel: Implement pagination requesting using
 the EventIndex.

---
 src/components/structures/FilePanel.js     | 18 +++-
 src/components/structures/TimelinePanel.js | 14 ++-
 src/indexing/EventIndex.js                 | 99 +++++++++++++++++++---
 3 files changed, 119 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 56bc9dee64..74b434cdbf 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -71,6 +71,20 @@ const FilePanel = createReactClass({
         return timelineSet;
     },
 
+    onPaginationRequest(timelineWindow, direction, limit) {
+        const client = MatrixClientPeg.get();
+        const eventIndex = EventIndexPeg.get();
+        const roomId = this.props.roomId;
+
+        const room = client.getRoom(roomId);
+
+        if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
+            return eventIndex.paginateTimelineWindow(room, timelineWindow, direction, limit);
+        } else {
+            return timelineWindow.paginate(direction, limit);
+        }
+    },
+
     async updateTimelineSet(roomId: string) {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(roomId);
@@ -85,7 +99,8 @@ const FilePanel = createReactClass({
                 timelineSet = await this.fetchFileEventsServer(room)
 
                 if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
-                    await eventIndex.populateFileTimeline(room, timelineSet);
+                    const timeline = timelineSet.getLiveTimeline();
+                    await eventIndex.populateFileTimeline(timelineSet, timeline, room, 1);
                 }
 
                 this.setState({ timelineSet: timelineSet });
@@ -128,6 +143,7 @@ const FilePanel = createReactClass({
                         manageReadMarkers={false}
                         timelineSet={this.state.timelineSet}
                         showUrlPreview = {false}
+                        onPaginationRequest={this.onPaginationRequest}
                         tileShape="file_grid"
                         resizeNotifier={this.props.resizeNotifier}
                         empty={_t('There are no visible files in this room')}
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 30b02bfcca..41b1b6f675 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -94,6 +94,10 @@ const TimelinePanel = createReactClass({
         // callback which is called when the read-up-to mark is updated.
         onReadMarkerUpdated: PropTypes.func,
 
+        // callback which is called when we wish to paginate the timeline
+        // window.
+        onPaginationRequest: PropTypes.func,
+
         // maximum number of events to show in a timeline
         timelineCap: PropTypes.number,
 
@@ -338,6 +342,14 @@ const TimelinePanel = createReactClass({
         }
     },
 
+    onPaginationRequest(timelineWindow, direction, size) {
+        if (this.props.onPaginationRequest) {
+            return this.props.onPaginationRequest(timelineWindow, direction, size);
+        } else {
+            return timelineWindow.paginate(direction, size);
+        }
+    },
+
     // set off a pagination request.
     onMessageListFillRequest: function(backwards) {
         if (!this._shouldPaginate()) return Promise.resolve(false);
@@ -360,7 +372,7 @@ const TimelinePanel = createReactClass({
         debuglog("TimelinePanel: Initiating paginate; backwards:"+backwards);
         this.setState({[paginatingKey]: true});
 
-        return this._timelineWindow.paginate(dir, PAGINATE_SIZE).then((r) => {
+        return this.onPaginationRequest(this._timelineWindow, dir, PAGINATE_SIZE).then((r) => {
             if (this.unmounted) { return; }
 
             debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 501e21b29d..7263d8b2c4 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -418,17 +418,29 @@ export default class EventIndex {
         return indexManager.searchEventIndex(searchArgs);
     }
 
-    async populateFileTimeline(room, timelineSet) {
+    async loadFileEvents(room, limit = 10, fromEvent = null, direction = EventTimeline.BACKWARDS) {
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
+        let loadArgs = {
+            roomId: room.roomId,
+            limit: limit
+        }
+
+        if (fromEvent) {
+            loadArgs.fromEvent = fromEvent;
+            loadArgs.direction = direction;
+        }
+
+        let events
+
         // Get our events from the event index.
-        const events = await indexManager.loadFileEvents(
-            {
-                roomId: room.roomId,
-                limit: 10
-            }
-        );
+        try {
+            events = await indexManager.loadFileEvents(loadArgs);
+        } catch (e) {
+            console.log("EventIndex: Error getting file events", e);
+            return []
+        }
 
         let eventMapper = client.getEventMapper();
 
@@ -468,15 +480,82 @@ export default class EventIndex {
             return matrixEvent;
         });
 
+        return matrixEvents;
+    }
+
+    async populateFileTimeline(timelineSet, timeline, room, limit = 10,
+                               fromEvent = null, direction = EventTimeline.BACKWARDS) {
+        let matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
+
         // Add the events to the live timeline of the file panel.
         matrixEvents.forEach(e => {
             if (!timelineSet.eventIdToTimeline(e.getId())) {
-                const liveTimeline = timelineSet.getLiveTimeline();
-                timelineSet.addEventToTimeline(e, liveTimeline, true)
+                timelineSet.addEventToTimeline(e, timeline,
+                                               direction == EventTimeline.BACKWARDS)
             }
         });
 
         // Set the pagination token to the oldest event that we retrieved.
-        timelineSet.getLiveTimeline().setPaginationToken("", EventTimeline.BACKWARDS);
+        if (matrixEvents.length > 0) {
+            timeline.setPaginationToken(matrixEvents[matrixEvents.length - 1].getId(),
+                                        EventTimeline.BACKWARDS);
+            return true;
+        } else {
+            timeline.setPaginationToken("", EventTimeline.BACKWARDS);
+            return false;
+        }
+    }
+
+    paginateTimelineWindow(room, timelineWindow, direction, limit) {
+        let tl;
+
+        // TODO this is from the js-sdk, this should probably be exposed to
+        // us through the js-sdk.
+        const moveWindowCap = (titmelineWindow, timeline, direction, limit) => {
+            var count = (direction == EventTimeline.BACKWARDS) ?
+            timeline.retreat(limit) : timeline.advance(limit);
+
+            if (count) {
+                timelineWindow._eventCount += count;
+                var excess = timelineWindow._eventCount - timelineWindow._windowLimit;
+
+                if (excess > 0) {
+                    timelineWindow.unpaginate(3, direction != EventTimeline.BACKWARDS);
+                }
+                return true;
+            }
+
+            return false;
+        };
+
+        // TODO these private fields should be somehow exposed in the js-sdk.
+        if (direction == EventTimeline.BACKWARDS) tl = timelineWindow._start;
+        else if (direction == EventTimeline.FORWARDS) tl = timelineWindow._end;
+
+        if (!tl) return Promise.resolve(false);
+        if (tl.pendingPaginate) return tl.pendingPaginate;
+
+        if (moveWindowCap(timelineWindow, tl, direction, limit)) {
+            return Promise.resolve(true);
+        }
+
+        const paginationMethod = async (timelineWindow, timeline, room, direction, limit) => {
+            const timelineSet = timelineWindow._timelineSet;
+            const token = timeline.timeline.getPaginationToken(direction);
+
+            const ret = await this.populateFileTimeline(timelineSet, timeline.timeline,
+                                                        room, limit, token, direction);
+
+            moveWindowCap(timelineWindow, timeline, direction, limit)
+            timeline.pendingPaginate = null;
+
+            return ret;
+        };
+
+        const paginationPromise = paginationMethod(timelineWindow, tl, room,
+                                                   direction, limit);
+        tl.pendingPaginate = paginationPromise;
+
+        return paginationPromise;
     }
 }

From 70d394e668615d431a0c9f9ed4f2c16cad1c2a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 10:35:33 +0100
Subject: [PATCH 0420/3235] EventIndex: Update the imports for the new build
 system.

---
 src/components/structures/FilePanel.js |  2 +-
 src/indexing/EventIndex.js             | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 74b434cdbf..0ef9331338 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
-import {EventIndexPeg} from "../../indexing/EventIndexPeg";
+import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
 /*
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 7263d8b2c4..cb2f646d07 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -17,11 +17,9 @@ limitations under the License.
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 
-import Matrix from 'matrix-js-sdk';
-import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
-import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
-import MatrixEvent from 'matrix-js-sdk/lib/models/event';
-import RoomMember from 'matrix-js-sdk/lib/models/room-member';
+import * as Matrix from 'matrix-js-sdk';
+import {EventTimelineSet} from 'matrix-js-sdk';
+import {EventTimeline} from 'matrix-js-sdk';
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -448,7 +446,7 @@ export default class EventIndex {
         const matrixEvents = events.map(e => {
             const matrixEvent = eventMapper(e.event);
 
-            const member = new RoomMember(room.roomId, matrixEvent.getSender());
+            const member = new Matrix.RoomMember(room.roomId, matrixEvent.getSender());
 
             // We can't really reconstruct the whole room state from our
             // EventIndex to calculate the correct display name. Use the

From 8efc45b31a504cfe65593077a9c6e8fc01f3c857 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:04:34 +0000
Subject: [PATCH 0421/3235] no need to verify our own devices for every room

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3cdc308758..e0997f87da 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -820,7 +820,7 @@ export default createReactClass({
 
         /* At this point, either `verified` or `unverified` is empty, or both */
         /* Check all verified user devices. We don't care if everyone's unverified anyway. */
-        for (const userId of [...verified, cli.getUserId()]) {
+        for (const userId of verified) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
                 return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified();

From 9877fd9e85c04fe03d9dfa0ae8cfd08ab3694392 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Jan 2020 10:04:38 +0000
Subject: [PATCH 0422/3235] Fix Array.concat undefined

---
 src/components/views/settings/tabs/room/BridgeSettingsTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 71b0169788..19c19d3bc6 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -137,7 +137,7 @@ export default class BridgeSettingsTab extends React.Component {
         const client = MatrixClientPeg.get();
         const roomState = (client.getRoom(roomId)).currentState;
 
-        const bridgeEvents = Array.concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
+        const bridgeEvents = [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
             Object.values(roomState.events[typeName] || {}),
         ));
 

From 95b86b42d00b1b23cfaed2f1aa474b962d55fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 11:06:05 +0100
Subject: [PATCH 0423/3235] BaseEventIndexManager: Update the docs for the
 loadFileEvents method.

---
 src/indexing/BaseEventIndexManager.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index d7b322bb1a..c4758bcaa3 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -215,11 +215,14 @@ export default class BaseEventIndexManager {
      * should be loaded.
      * @param  {number} args.limit The maximum number of events to return.
      * @param  {string} args.fromEvent An event id of a previous event returned
-     * by this method. If set events that are older than the event with the
-     * given event ID will be returned.
+     * by this method. Passing this means that we are going to continue loading
+     * events from this point in the history.
+     * @param  {string} args.direction The direction to which we should continue
+     * loading events from. This is used only if fromEvent is used as well.
      *
-     * @return {Promise<[EventAndProfile]>} A promise that will resolve to an array
-     * of Matrix events that contain mxc URLs.
+     * @return {Promise<[EventAndProfile]>} A promise that will resolve to an
+     * array of Matrix events that contain mxc URLs accompanied with the
+     * historic profile of the sender.
      */
     async loadFileEvents(args: LoadArgs): Promise<[EventAndProfile]> {
         throw new Error("Unimplemented");

From 15e5552507c5584f0b160bc85326269df57500d3 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 17 Jan 2020 03:54:38 +0000
Subject: [PATCH 0424/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2028 of 2028 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 | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2d17d643ce..04a4792a77 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2042,5 +2042,30 @@
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "您的帳號已啟用金鑰備份，但並在此工作階段中設定。要設定秘密儲存空間，請還原金鑰備份。",
     "Restore": "還原",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰會與您的金鑰備份相同",
-    "Restore your Key Backup": "復原您的金鑰備份"
+    "Restore your Key Backup": "復原您的金鑰備份",
+    "a few seconds ago": "數秒前",
+    "about a minute ago": "大約一分鐘前",
+    "%(num)s minutes ago": "%(num)s 分鐘前",
+    "about an hour ago": "大約一小時前",
+    "%(num)s hours ago": "%(num)s 小時前",
+    "about a day ago": "大約一天前",
+    "%(num)s days ago": "%(num)s 天前",
+    "a few seconds from now": "從現在開始數秒鐘",
+    "about a minute from now": "從現在開始大約一分鐘",
+    "%(num)s minutes from now": "從現在開始 %(num)s 分鐘",
+    "about an hour from now": "從現在開始大約一小時",
+    "%(num)s hours from now": "從現在開始 %(num)s 小時",
+    "about a day from now": "從現在開始大約一天",
+    "%(num)s days from now": "從現在開始 %(num)s 天",
+    "Failed to invite the following users to chat: %(csvUsers)s": "邀請使用者加入聊天失敗：%(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "我們無法建立您的直接對話。請檢查您想要邀請的使用者並再試一次。",
+    "Complete security": "完全安全",
+    "Verify this session to grant it access to encrypted messages.": "驗證此工作階段以取得對已加密訊息的存取權限。",
+    "Start": "開始",
+    "Session verified": "工作階段已驗證",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "您的新工作階段已驗證。其對您的已加密訊息有存取權，其他使用者也將會看到其受信任。",
+    "Done": "完成",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "此裝置上沒有完全安全性，其對已加密訊息沒有存取權。",
+    "Go Back": "返回",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰將會與您的金鑰備份相同。"
 }

From 8e11389820023231bc8ca347aadf443fb9e4ecf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 17 Jan 2020 07:37:12 +0000
Subject: [PATCH 0425/3235] Translated using Weblate (French)

Currently translated at 100.0% (2032 of 2032 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b18bf44d73..3c70407ace 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2056,5 +2056,21 @@
     "about an hour from now": "dans une heure environ",
     "%(num)s hours from now": "dans %(num)s heures",
     "about a day from now": "dans un jour environ",
-    "%(num)s days from now": "dans %(num)s jours"
+    "%(num)s days from now": "dans %(num)s jours",
+    "New invite dialog": "Nouvelle boîte de dialogue d’invitation",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à discuter : %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre Message direct. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
+    "Something went wrong trying to invite the users.": "Une erreur est survenue en essayant d’inviter les utilisateurs.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossible d’inviter ces utilisateurs. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
+    "Recently Direct Messaged": "Messages directs récents",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "S’il y a quelqu’un que vous n’arrivez pas à trouver, demandez-lui son nom d’utilisateur (par ex. @utilisateur:serveur.com) ou <a>partagez ce salon</a>.",
+    "Complete security": "Compléter la sécurité",
+    "Verify this session to grant it access to encrypted messages.": "Vérifiez cette session pour l’autoriser à accéder à vos messages chiffrés.",
+    "Start": "Commencer",
+    "Session verified": "Session vérifiée",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Elle a accès à vos messages chiffrés et les autres utilisateurs la verront comme fiable.",
+    "Done": "Terminé",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Si vous ne complétez pas la sécurité sur cet appareil, vous n’aurez pas accès aux messages chiffrés.",
+    "Go Back": "Retourner en arrière",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Le coffre secret sera configuré en utilisant les détails existants de votre sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés."
 }

From 510b08c88bd6f0dfeac1f56c39a12855f67990c1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:18:50 +0000
Subject: [PATCH 0426/3235] changed logic to reflect the task

---
 src/components/structures/RoomView.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e0997f87da..aa3e86fa60 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -809,17 +809,16 @@ export default createReactClass({
 
         debuglog("e2e verified", verified, "unverified", unverified);
 
-        /* If we verify any users in this room, expect to verify every user in the room */
-        if (verified.length > 0 && unverified.length > 0) {
+        /* If we've not verified anyone, set state to "normal" */
+        if (verified.length == 0) {
             this.setState({
-                e2eStatus: "warning",
+                e2eStatus: "normal",
             });
-            debuglog("e2e status set to warning as some, but not all, users are verified");
+            debuglog("e2e state set to normal as we have no verified users to worry about");
             return;
         }
 
-        /* At this point, either `verified` or `unverified` is empty, or both */
-        /* Check all verified user devices. We don't care if everyone's unverified anyway. */
+        /* Check all verified user devices. */
         for (const userId of verified) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
@@ -836,7 +835,7 @@ export default createReactClass({
         }
 
         this.setState({
-            e2eStatus: unverified.length === 0 ? "verified" : "normal",
+            e2eStatus: "verified",
         });
     },
 

From d02185e4af661542e39a568d43aa58f19670ec0c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:22:53 +0000
Subject: [PATCH 0427/3235] whoops, the number of unverified users matters to
 the logic

---
 src/components/structures/RoomView.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index aa3e86fa60..8ecb6a6a02 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -809,15 +809,6 @@ export default createReactClass({
 
         debuglog("e2e verified", verified, "unverified", unverified);
 
-        /* If we've not verified anyone, set state to "normal" */
-        if (verified.length == 0) {
-            this.setState({
-                e2eStatus: "normal",
-            });
-            debuglog("e2e state set to normal as we have no verified users to worry about");
-            return;
-        }
-
         /* Check all verified user devices. */
         for (const userId of verified) {
             const devices = await cli.getStoredDevicesForUser(userId);
@@ -835,7 +826,7 @@ export default createReactClass({
         }
 
         this.setState({
-            e2eStatus: "verified",
+            e2eStatus: unverified.length === 0 ? "verified" : "normal",
         });
     },
 

From ccfe3c7e70e9b9d5e8beddf7e8dc4c3e111bab56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 11:52:20 +0100
Subject: [PATCH 0428/3235] FilePanel/EventIndex: Fix lint errors.

---
 src/components/structures/FilePanel.js |  6 +++---
 src/indexing/EventIndex.js             | 27 +++++++++++++-------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 0ef9331338..6faec27284 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -64,7 +64,8 @@ const FilePanel = createReactClass({
 
         // FIXME: we shouldn't be doing this every time we change room - see comment above.
         // TODO: Remove this stale comment? Which comment above?
-        const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter)
+        const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId,
+                                                        filter);
         filter.filterId = filterId;
         const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
 
@@ -96,7 +97,7 @@ const FilePanel = createReactClass({
             let timelineSet;
 
             try {
-                timelineSet = await this.fetchFileEventsServer(room)
+                timelineSet = await this.fetchFileEventsServer(room);
 
                 if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
                     const timeline = timelineSet.getLiveTimeline();
@@ -104,7 +105,6 @@ const FilePanel = createReactClass({
                 }
 
                 this.setState({ timelineSet: timelineSet });
-
             } catch (error) {
                 console.error("Failed to get or create file panel filter", error);
             }
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index cb2f646d07..0e48af749c 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -18,7 +18,6 @@ import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 
 import * as Matrix from 'matrix-js-sdk';
-import {EventTimelineSet} from 'matrix-js-sdk';
 import {EventTimeline} from 'matrix-js-sdk';
 
 /*
@@ -420,27 +419,27 @@ export default class EventIndex {
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        let loadArgs = {
+        const loadArgs = {
             roomId: room.roomId,
-            limit: limit
-        }
+            limit: limit,
+        };
 
         if (fromEvent) {
             loadArgs.fromEvent = fromEvent;
             loadArgs.direction = direction;
         }
 
-        let events
+        let events;
 
         // Get our events from the event index.
         try {
             events = await indexManager.loadFileEvents(loadArgs);
         } catch (e) {
             console.log("EventIndex: Error getting file events", e);
-            return []
+            return [];
         }
 
-        let eventMapper = client.getEventMapper();
+        const eventMapper = client.getEventMapper();
 
         // Turn the events into MatrixEvent objects.
         const matrixEvents = events.map(e => {
@@ -466,8 +465,8 @@ export default class EventIndex {
                     room_id: matrixEvent.getRoomId(),
                     sender: matrixEvent.getSender(),
                     origin_server_ts: matrixEvent.getTs(),
-                    state_key: matrixEvent.getSender()
-                }
+                    state_key: matrixEvent.getSender(),
+                },
             );
 
             // We set this manually to avoid emitting RoomMember.membership and
@@ -483,13 +482,13 @@ export default class EventIndex {
 
     async populateFileTimeline(timelineSet, timeline, room, limit = 10,
                                fromEvent = null, direction = EventTimeline.BACKWARDS) {
-        let matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
+        const matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
 
         // Add the events to the live timeline of the file panel.
         matrixEvents.forEach(e => {
             if (!timelineSet.eventIdToTimeline(e.getId())) {
                 timelineSet.addEventToTimeline(e, timeline,
-                                               direction == EventTimeline.BACKWARDS)
+                                               direction == EventTimeline.BACKWARDS);
             }
         });
 
@@ -510,12 +509,12 @@ export default class EventIndex {
         // TODO this is from the js-sdk, this should probably be exposed to
         // us through the js-sdk.
         const moveWindowCap = (titmelineWindow, timeline, direction, limit) => {
-            var count = (direction == EventTimeline.BACKWARDS) ?
+            const count = (direction == EventTimeline.BACKWARDS) ?
             timeline.retreat(limit) : timeline.advance(limit);
 
             if (count) {
                 timelineWindow._eventCount += count;
-                var excess = timelineWindow._eventCount - timelineWindow._windowLimit;
+                const excess = timelineWindow._eventCount - timelineWindow._windowLimit;
 
                 if (excess > 0) {
                     timelineWindow.unpaginate(3, direction != EventTimeline.BACKWARDS);
@@ -544,7 +543,7 @@ export default class EventIndex {
             const ret = await this.populateFileTimeline(timelineSet, timeline.timeline,
                                                         room, limit, token, direction);
 
-            moveWindowCap(timelineWindow, timeline, direction, limit)
+            moveWindowCap(timelineWindow, timeline, direction, limit);
             timeline.pendingPaginate = null;
 
             return ret;

From 908630c0d942de6ec9115c7b197b0d2b47f87488 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 17 Jan 2020 11:30:45 +0000
Subject: [PATCH 0429/3235] *rude grumbling noises about @dbkr*

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8ecb6a6a02..9b02f6d503 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -813,7 +813,7 @@ export default createReactClass({
         for (const userId of verified) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
-                return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified();
+                return cli.checkDeviceTrust(userId, deviceId).isVerified();
             });
             if (!allDevicesVerified) {
                 this.setState({

From 9e43abaf3aa5eb4e76492c34209a46f8e8796c7c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 11:43:35 +0000
Subject: [PATCH 0430/3235] Toasts for new, unverified sessions

Fixes https://github.com/vector-im/riot-web/issues/11218
---
 res/css/structures/_ToastContainer.scss       |  6 +-
 src/DeviceListener.js                         | 90 +++++++++++++++++++
 src/Lifecycle.js                              |  8 ++
 src/components/structures/ToastContainer.js   |  2 +-
 .../views/toasts/NewSessionToast.js           | 57 ++++++++++++
 src/i18n/strings/en_EN.json                   |  5 +-
 src/stores/ToastStore.js                      |  4 +
 7 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 src/DeviceListener.js
 create mode 100644 src/components/views/toasts/NewSessionToast.js

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 4c5e746e66..5634a97c53 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -51,7 +51,7 @@ limitations under the License.
         &.mx_Toast_hasIcon {
             &::after {
                 content: "";
-                width: 20px;
+                width: 21px;
                 height: 20px;
                 grid-column: 1;
                 grid-row: 1;
@@ -64,6 +64,10 @@ limitations under the License.
                 background-color: $primary-fg-color;
             }
 
+            &.mx_Toast_icon_verification_warning::after {
+                background-image: url("$(res)/img/e2e/warning.svg");
+            }
+
             h2, .mx_Toast_body {
                 grid-column: 2;
             }
diff --git a/src/DeviceListener.js b/src/DeviceListener.js
new file mode 100644
index 0000000000..4b779377e8
--- /dev/null
+++ b/src/DeviceListener.js
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { MatrixClientPeg } from './MatrixClientPeg';
+import SettingsStore from './settings/SettingsStore';
+import * as sdk from './index';
+import { _t } from './languageHandler';
+import ToastStore from './stores/ToastStore';
+
+function toastKey(device) {
+    return 'newsession_' + device.deviceId;
+}
+
+export default class DeviceListener {
+    static sharedInstance() {
+        if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
+        return global.mx_DeviceListener;
+    }
+
+    constructor() {
+        // device IDs for which the user has dismissed the verify toast ('Later')
+        this._dismissed = new Set();
+    }
+
+    start() {
+        MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
+        MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
+        this.recheck();
+    }
+
+    stop() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
+            MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
+        }
+        this._dismissed.clear();
+    }
+
+    dismissVerification(deviceId) {
+        this._dismissed.add(deviceId);
+        this.recheck();
+    }
+
+    _onDevicesUpdated = (users) => {
+        if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
+        this.recheck();
+    }
+
+    _onDeviceVerificationChanged = (users) => {
+        if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
+        this.recheck();
+    }
+
+    async recheck() {
+        const cli = MatrixClientPeg.get();
+
+        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+        for (const device of devices) {
+            if (device.deviceId == cli.deviceId) continue;
+
+            const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
+            if (deviceTrust.isVerified() || this._dismissed.has(device.deviceId)) {
+                ToastStore.sharedInstance().dismissToast(toastKey(device));
+            } else {
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: toastKey(device),
+                    title: _t("New Session"),
+                    icon: "verification_warning",
+                    props: {deviceId: device.deviceId},
+                    component: sdk.getComponent("toasts.NewSessionToast"),
+                });
+            }
+        }
+    }
+}
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 0796e326a0..1603c73d25 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,8 +36,10 @@ import { sendLoginRequest } from "./Login";
 import * as StorageManager from './utils/StorageManager';
 import SettingsStore from "./settings/SettingsStore";
 import TypingStore from "./stores/TypingStore";
+import ToastStore from "./stores/ToastStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import {Mjolnir} from "./mjolnir/Mjolnir";
+import DeviceListener from "./DeviceListener";
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -575,6 +578,7 @@ async function startMatrixClient(startSyncing=true) {
     Notifier.start();
     UserActivity.sharedInstance().start();
     TypingStore.sharedInstance().reset(); // just in case
+    ToastStore.sharedInstance().reset();
     if (!SettingsStore.getValue("lowBandwidth")) {
         Presence.start();
     }
@@ -595,6 +599,9 @@ async function startMatrixClient(startSyncing=true) {
         await MatrixClientPeg.assign();
     }
 
+    // This needs to be started after crypto is set up
+    DeviceListener.sharedInstance().start();
+
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.
     dis.dispatch({action: 'client_started'});
@@ -651,6 +658,7 @@ export function stopMatrixClient(unsetClient=true) {
     ActiveWidgetStore.stop();
     IntegrationManagers.sharedInstance().stopWatching();
     Mjolnir.sharedInstance().stop();
+    DeviceListener.sharedInstance().stop();
     if (DMRoomMap.shared()) DMRoomMap.shared().stop();
     EventIndexPeg.stop();
     const cli = MatrixClientPeg.get();
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index bc74133433..8a05f62e61 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -22,7 +22,7 @@ import classNames from "classnames";
 export default class ToastContainer extends React.Component {
     constructor() {
         super();
-        this.state = {toasts: []};
+        this.state = {toasts: ToastStore.sharedInstance().getToasts()};
     }
 
     componentDidMount() {
diff --git a/src/components/views/toasts/NewSessionToast.js b/src/components/views/toasts/NewSessionToast.js
new file mode 100644
index 0000000000..f83326121b
--- /dev/null
+++ b/src/components/views/toasts/NewSessionToast.js
@@ -0,0 +1,57 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from "../../../index";
+import { _t } from '../../../languageHandler';
+import Modal from "../../../Modal";
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import DeviceListener from '../../../DeviceListener';
+
+export default class VerifySessionToast extends React.PureComponent {
+    static propTypes = {
+        toastKey: PropTypes.string.isRequired,
+        deviceId: PropTypes.string,
+    };
+
+    _onLaterClick = () => {
+        DeviceListener.sharedInstance().dismissVerification(this.props.deviceId);
+    };
+
+    _onVerifyClick = async () => {
+        const cli = MatrixClientPeg.get();
+        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+
+        const device = await cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+
+        Modal.createTrackedDialog('New Session Verify', 'Starting dialog', DeviceVerifyDialog, {
+            userId: MatrixClientPeg.get().getUserId(),
+            device,
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    render() {
+        const FormButton = sdk.getComponent("elements.FormButton");
+        return (<div>
+            <div className="mx_Toast_description">{_t("Other users may not trust it")}</div>
+            <div className="mx_Toast_buttons" aria-live="off">
+                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
+                <FormButton label={_t("Verify")} onClick={this._onVerifyClick} />
+            </div>
+        </div>);
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f8b17db7c5..4af203177c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -85,6 +85,7 @@
     "%(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",
+    "New Session": "New Session",
     "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",
@@ -513,6 +514,9 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
+    "Other users may not trust it": "Other users may not trust it",
+    "Later": "Later",
+    "Verify": "Verify",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Upload": "Upload",
@@ -1130,7 +1134,6 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
-    "Verify": "Verify",
     "Security": "Security",
     "Sunday": "Sunday",
     "Monday": "Monday",
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index f6cc30db67..2c4464813b 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -31,6 +31,10 @@ export default class ToastStore extends EventEmitter {
         this._toasts = [];
     }
 
+    reset() {
+        this._toasts = [];
+    }
+
     addOrReplaceToast(newToast) {
         const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {

From fb9962b08e702081572fbf7c1263496f747fd3fc Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 17 Jan 2020 13:09:08 +0000
Subject: [PATCH 0431/3235] Disable key request dialogs with cross-signing

Cross-signing verification is meant to replace the old key share between devices
flow. This disables it when the cross-signing lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11904
---
 src/KeyRequestHandler.js                       | 13 +++++++++++++
 src/components/structures/MatrixChat.js        |  2 ++
 src/components/views/dialogs/KeyShareDialog.js |  3 +++
 3 files changed, 18 insertions(+)

diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index 65dc7fdb0f..0aca6529e4 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,6 +18,8 @@ limitations under the License.
 import * as sdk from './index';
 import Modal from './Modal';
 
+// TODO: We can remove this once cross-signing is the only way.
+// https://github.com/vector-im/riot-web/issues/11908
 export default class KeyRequestHandler {
     constructor(matrixClient) {
         this._matrixClient = matrixClient;
@@ -30,6 +33,11 @@ export default class KeyRequestHandler {
     }
 
     handleKeyRequest(keyRequest) {
+        // Ignore own device key requests if cross-signing lab enabled
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            return;
+        }
+
         const userId = keyRequest.userId;
         const deviceId = keyRequest.deviceId;
         const requestId = keyRequest.requestId;
@@ -60,6 +68,11 @@ export default class KeyRequestHandler {
     }
 
     handleKeyRequestCancellation(cancellation) {
+        // Ignore own device key requests if cross-signing lab enabled
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            return;
+        }
+
         // see if we can find the request in the queue
         const userId = cancellation.userId;
         const deviceId = cancellation.deviceId;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 978743ca87..2797887f29 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1383,6 +1383,8 @@ export default createReactClass({
         cli.on("Session.logged_out", () => dft.stop());
         cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
 
+        // TODO: We can remove this once cross-signing is the only way.
+        // https://github.com/vector-im/riot-web/issues/11908
         const krh = new KeyRequestHandler(cli);
         cli.on("crypto.roomKeyRequest", (req) => {
             krh.handleKeyRequest(req);
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index 3afb5546cf..507f8b4678 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -22,6 +22,9 @@ import * as sdk from '../../../index';
 
 import { _t, _td } from '../../../languageHandler';
 
+// TODO: We can remove this once cross-signing is the only way.
+// https://github.com/vector-im/riot-web/issues/11908
+
 /**
  * Dialog which asks the user whether they want to share their keys with
  * an unverified device.

From f324f676d37ae5d330beedc77268bbb954fe2cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:14:53 +0100
Subject: [PATCH 0432/3235] EventIndex: Add a method to get the current disk
 usage of the index.

---
 src/indexing/BaseEventIndexManager.js | 7 +++++++
 src/indexing/EventIndex.js            | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 5e8ca668ad..733dc05dd6 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -117,6 +117,13 @@ export default class BaseEventIndexManager {
         throw new Error("Unimplemented");
     }
 
+    /**
+     * Get the disk usage of the index
+     */
+    async indexSize(): Promise<number> {
+        throw new Error("Unimplemented");
+    }
+
     /**
      * Commit the previously queued up events to the index.
      *
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c912e31fa5..ae738e5d4d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -406,4 +406,9 @@ export default class EventIndex {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.searchEventIndex(searchArgs);
     }
+
+    async indexSize() {
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+        return indexManager.indexSize();
+    }
 }

From b7b66cfd9aad22f3a00e3b3126a708d1d81e0447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:15:55 +0100
Subject: [PATCH 0433/3235] EventIndex: Use the sleep method from our utils.

---
 src/indexing/EventIndex.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index ae738e5d4d..f034df888c 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
+import {sleep} from "../utils/promise";
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -180,12 +181,6 @@ export default class EventIndex {
     }
 
     async crawlerFunc() {
-        // TODO either put this in a better place or find a library provided
-        // method that does this.
-        const sleep = async (ms) => {
-            return new Promise(resolve => setTimeout(resolve, ms));
-        };
-
         let cancelled = false;
 
         console.log("EventIndex: Started crawler function");

From 47156351a6d9ffe9ee2110c63c8667fc043c8936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:25:34 +0100
Subject: [PATCH 0434/3235] EventIndex: Use a setting for the crawler sleep
 time.

---
 src/indexing/EventIndex.js | 24 ++++++++++++++++++++----
 src/settings/Settings.js   |  5 +++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index f034df888c..1e15fcaa5a 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
+import SettingsStore from '../settings/SettingsStore';
+import {SettingLevel} from "../settings/SettingsStore";
 import {sleep} from "../utils/promise";
 
 /*
@@ -24,9 +26,9 @@ import {sleep} from "../utils/promise";
 export default class EventIndex {
     constructor() {
         this.crawlerCheckpoints = [];
-        // The time that the crawler will wait between /rooms/{room_id}/messages
-        // requests
-        this._crawlerTimeout = 3000;
+        // The time in ms that the crawler will wait loop iterations if there
+        // have not been any checkpoints to consume in the last iteration.
+        this._crawlerIdleTime = 5000;
         // The maximum number of events our crawler should fetch in a single
         // crawl.
         this._eventsPerCrawl = 100;
@@ -194,11 +196,22 @@ export default class EventIndex {
             cancelled = true;
         };
 
+        let idle = false;
+
         while (!cancelled) {
             // This is a low priority task and we don't want to spam our
             // homeserver with /messages requests so we set a hefty timeout
             // here.
-            await sleep(this._crawlerTimeout);
+            let sleepTime = SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime');
+
+            // Don't let the user configure a lower sleep time than 100 ms.
+            sleepTime = Math.max(sleepTime, 100);
+
+            if (idle) {
+                sleepTime = this._crawlerIdleTime;
+            }
+
+            await sleep(sleepTime);
 
             console.log("EventIndex: Running the crawler loop.");
 
@@ -211,9 +224,12 @@ export default class EventIndex {
             /// There is no checkpoint available currently, one may appear if
             // a sync with limited room timelines happens, so go back to sleep.
             if (checkpoint === undefined) {
+                idle = true;
                 continue;
             }
 
+            idle = false;
+
             console.log("EventIndex: crawling using checkpoint", checkpoint);
 
             // We have a checkpoint, let us fetch some messages, again, very
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index eacf63e55d..e967becf98 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -486,4 +486,9 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: RIGHT_PANEL_PHASES.GroupMemberList,
     },
+    "crawlerSleepTime": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        displayName: _td("How long should the crawler wait between requests"),
+        default: 3000,
+    }
 };

From 0132c3bbe3521ecd2af39bfd526ea41048791619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:31:16 +0100
Subject: [PATCH 0435/3235] EventIndex: Start the crawler only if it's
 configured to start.

---
 src/indexing/EventIndex.js | 4 +++-
 src/settings/Settings.js   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 1e15fcaa5a..c907e769b5 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -120,7 +120,9 @@ export default class EventIndex {
             if (eventIndexWasEmpty) await addInitialCheckpoints();
 
             // Start our crawler.
-            this.startCrawler();
+            if (SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling')) {
+                this.startCrawler();
+            }
             return;
         }
 
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index e967becf98..1c65c38167 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -490,5 +490,10 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("How long should the crawler wait between requests"),
         default: 3000,
+    },
+    "enableCrawling" : {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        displayName: _td("How long should the crawler wait between requests"),
+        default: true,
     }
 };

From 4fe7752f3cd9d52b97d212afc49fc46c60d318d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:37:07 +0100
Subject: [PATCH 0436/3235] EventIndex: Add a method to gather the currently
 crawled rooms.

---
 src/indexing/EventIndex.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c907e769b5..1b17cc6d87 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -33,6 +33,7 @@ export default class EventIndex {
         // crawl.
         this._eventsPerCrawl = 100;
         this._crawler = null;
+        this._currentCheckpoint = null;
         this.liveEventsForIndex = new Set();
     }
 
@@ -213,6 +214,8 @@ export default class EventIndex {
                 sleepTime = this._crawlerIdleTime;
             }
 
+            this._currentCheckpoint = null;
+
             await sleep(sleepTime);
 
             console.log("EventIndex: Running the crawler loop.");
@@ -230,6 +233,8 @@ export default class EventIndex {
                 continue;
             }
 
+            this._currentCheckpoint = checkpoint;
+
             idle = false;
 
             console.log("EventIndex: crawling using checkpoint", checkpoint);
@@ -424,4 +429,31 @@ export default class EventIndex {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.indexSize();
     }
+
+    currentlyCrawledRooms() {
+        let crawlingRooms = new Set();
+        let totalRooms = new Set();
+
+        this.crawlerCheckpoints.forEach((checkpoint, index) => {
+            crawlingRooms.add(checkpoint.roomId);
+        });
+
+        if (this._currentCheckpoint !== null) {
+            crawlingRooms.add(this._currentCheckpoint.roomId);
+        }
+
+        const client = MatrixClientPeg.get();
+        const rooms = client.getRooms();
+
+        const isRoomEncrypted = (room) => {
+            return client.isRoomEncrypted(room.roomId);
+        };
+
+        const encryptedRooms = rooms.filter(isRoomEncrypted);
+        encryptedRooms.forEach((room, index) => {
+            totalRooms.add(room.roomId);
+        });
+
+        return {crawlingRooms, totalRooms}
+    }
 }

From 928bb69b116fbfb3041d6b2538080b37f503e7e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:37:53 +0100
Subject: [PATCH 0437/3235] EventIndexPeg: Add a helper method to easily start
 the crawler.

---
 src/indexing/EventIndexPeg.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 3746591b1f..a63756ab4e 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -69,6 +69,11 @@ class EventIndexPeg {
         return this.index;
     }
 
+    start() {
+        if (this.index === null) return;
+        this.index.startCrawler();
+    }
+
     stop() {
         if (this.index === null) return;
         this.index.stopCrawler();

From 2fe36037371fc723d4d7219e884b8fb77298a8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:39:45 +0100
Subject: [PATCH 0438/3235] utils: Add an utility function to format bytes.

---
 src/utils/FormattingUtils.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.js
index 1fd7d00feb..9016d62cfb 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.js
@@ -30,6 +30,22 @@ export function formatCount(count) {
    return (count / 1000000000).toFixed(1) + "B"; // 10B is enough for anyone, right? :S
 }
 
+/**
+ * format a size in bytes into a human readable form
+ * e.g: 1024 -> 1.00 KB
+ */
+export function formatBytes(bytes, decimals = 2) {
+    if (bytes === 0) return '0 Bytes';
+
+    const k = 1024;
+    const dm = decimals < 0 ? 0 : decimals;
+    const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+}
+
 /**
  * format a key into groups of 4 characters, for easier visual inspection
  *

From c397de18bdea962ca8dca8f2f1a98c26aa29941d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 13:43:47 +0100
Subject: [PATCH 0439/3235] PreferencesUserSettingsTab: Add initial event
 indexing preferences.

---
 .../tabs/user/PreferencesUserSettingsTab.js   | 91 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  9 ++
 2 files changed, 100 insertions(+)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index db5b95cb4c..d1fed21a1f 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,6 +23,8 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
+import EventIndexPeg from "../../../../../indexing/EventIndexPeg";
+import {formatBytes} from "../../../../../utils/FormattingUtils";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static COMPOSER_SETTINGS = [
@@ -70,6 +72,13 @@ export default class PreferencesUserSettingsTab extends React.Component {
             alwaysShowMenuBarSupported: false,
             minimizeToTray: true,
             minimizeToTraySupported: false,
+            eventIndexSize: 0,
+            crawlingRooms: 0,
+            totalCrawlingRooms: 0,
+            eventIndexingEnabled:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
+            crawlerSleepTime:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
             autocompleteDelay:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay').toString(10),
             readMarkerInViewThresholdMs:
@@ -100,6 +109,19 @@ export default class PreferencesUserSettingsTab extends React.Component {
             minimizeToTray = await platform.getMinimizeToTrayEnabled();
         }
 
+        let eventIndexSize = 0;
+        let crawlingRooms = 0;
+        let totalCrawlingRooms = 0;
+
+        let eventIndex = EventIndexPeg.get();
+
+        if (eventIndex !== null) {
+            eventIndexSize = await eventIndex.indexSize();
+            let crawledRooms = eventIndex.currentlyCrawledRooms();
+            crawlingRooms = crawledRooms.crawlingRooms.size;
+            totalCrawlingRooms = crawledRooms.totalRooms.size;
+        }
+
         this.setState({
             autoLaunch,
             autoLaunchSupported,
@@ -107,6 +129,9 @@ export default class PreferencesUserSettingsTab extends React.Component {
             alwaysShowMenuBar,
             minimizeToTraySupported,
             minimizeToTray,
+            eventIndexSize,
+            crawlingRooms,
+            totalCrawlingRooms,
         });
     }
 
@@ -137,6 +162,20 @@ export default class PreferencesUserSettingsTab extends React.Component {
         SettingsStore.setValue("readMarkerOutOfViewThresholdMs", null, SettingLevel.DEVICE, e.target.value);
     };
 
+    _onEventIndexingEnabledChange = (checked) => {
+        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
+
+        if (checked) EventIndexPeg.start();
+        else EventIndexPeg.stop();
+
+        this.setState({eventIndexingEnabled: checked});
+    }
+
+    _onCrawlerSleepTimeChange = (e) => {
+        this.setState({crawlerSleepTime: e.target.value});
+        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
+    }
+
     _renderGroup(settingIds) {
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return settingIds.map(i => <SettingsFlag key={i} name={i} level={SettingLevel.ACCOUNT} />);
@@ -167,9 +206,61 @@ export default class PreferencesUserSettingsTab extends React.Component {
                 label={_t('Show tray icon and minimize window to it on close')} />;
         }
 
+        let eventIndexingSettings = null;
+        let crawlerState;
+
+        if (!this.state.eventIndexingEnabled) {
+            crawlerState = <div>{_t("Message downloader is stopped.")}</div>;
+        }
+        else if (this.state.crawlingRooms === 0) {
+            crawlerState = <div>{_t("Message downloader is currently idle.")}</div>;
+        } else {
+            crawlerState = (
+                <div>{_t(
+                    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
+                    { crawlingRooms: this.state.crawlingRooms,
+                      totalRooms: this.state.totalCrawlingRooms,
+                    })}
+                </div>
+            );
+        }
+
+        if (EventIndexPeg.get() !== null) {
+            eventIndexingSettings = (
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
+                    {
+                        _t( "To enable search in encrypted rooms, Riot needs to run " +
+                            "a background process to download historical messages "   +
+                            "from those rooms to your computer."
+                        )
+                    }
+                    <div className='mx_SettingsTab_subsectionText'>
+                        {_t("Message disk usage:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                        {crawlerState}<br />
+                    </div>
+
+                    <LabelledToggleSwitch
+                        value={this.state.eventIndexingEnabled}
+                        onChange={this._onEventIndexingEnabledChange}
+                        label={_t('Enable message downloading')} />
+
+                    <Field
+                        id={"crawlerSleepTimeMs"}
+                        label={_t('Message downloading sleep time(ms)')}
+                        type='number'
+                        value={this.state.crawlerSleepTime}
+                        onChange={this._onCrawlerSleepTimeChange} />
+                </div>
+            );
+        }
+
         return (
             <div className="mx_SettingsTab mx_PreferencesUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Preferences")}</div>
+
+                {eventIndexingSettings}
+
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f8b17db7c5..aa8583cf8d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -415,6 +415,7 @@
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
+    "How long should the crawler wait between requests": "How long should the crawler wait between requests",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -731,6 +732,14 @@
     "Start automatically after system login": "Start automatically after system login",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
+    "Message downloader is stopped.": "Message downloader is stopped.",
+    "Message downloader is currently idle.": "Message downloader is currently idle.",
+    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.": "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
+    "Encrypted search": "Encrypted search",
+    "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.": "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.",
+    "Message disk usage:": "Message disk usage:",
+    "Enable message downloading": "Enable message downloading",
+    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "Preferences": "Preferences",
     "Composer": "Composer",
     "Timeline": "Timeline",

From 3c46a563914f0347ebdfed3f80161ea86b4e841b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 Nov 2019 15:06:04 +0100
Subject: [PATCH 0440/3235] EventIndex: Fix some lint errors.

---
 .../settings/tabs/user/PreferencesUserSettingsTab.js  | 11 +++++------
 src/indexing/EventIndex.js                            |  6 +++---
 src/settings/Settings.js                              |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index d1fed21a1f..e47f591dcb 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -113,11 +113,11 @@ export default class PreferencesUserSettingsTab extends React.Component {
         let crawlingRooms = 0;
         let totalCrawlingRooms = 0;
 
-        let eventIndex = EventIndexPeg.get();
+        const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
             eventIndexSize = await eventIndex.indexSize();
-            let crawledRooms = eventIndex.currentlyCrawledRooms();
+            const crawledRooms = eventIndex.currentlyCrawledRooms();
             crawlingRooms = crawledRooms.crawlingRooms.size;
             totalCrawlingRooms = crawledRooms.totalRooms.size;
         }
@@ -211,8 +211,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
 
         if (!this.state.eventIndexingEnabled) {
             crawlerState = <div>{_t("Message downloader is stopped.")}</div>;
-        }
-        else if (this.state.crawlingRooms === 0) {
+        } else if (this.state.crawlingRooms === 0) {
             crawlerState = <div>{_t("Message downloader is currently idle.")}</div>;
         } else {
             crawlerState = (
@@ -231,8 +230,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
                     <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
                     {
                         _t( "To enable search in encrypted rooms, Riot needs to run " +
-                            "a background process to download historical messages "   +
-                            "from those rooms to your computer."
+                            "a background process to download historical messages " +
+                            "from those rooms to your computer.",
                         )
                     }
                     <div className='mx_SettingsTab_subsectionText'>
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 1b17cc6d87..0d7f43b839 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -431,8 +431,8 @@ export default class EventIndex {
     }
 
     currentlyCrawledRooms() {
-        let crawlingRooms = new Set();
-        let totalRooms = new Set();
+        const crawlingRooms = new Set();
+        const totalRooms = new Set();
 
         this.crawlerCheckpoints.forEach((checkpoint, index) => {
             crawlingRooms.add(checkpoint.roomId);
@@ -454,6 +454,6 @@ export default class EventIndex {
             totalRooms.add(room.roomId);
         });
 
-        return {crawlingRooms, totalRooms}
+        return {crawlingRooms, totalRooms};
     }
 }
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 1c65c38167..817adcfc4d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -491,9 +491,9 @@ export const SETTINGS = {
         displayName: _td("How long should the crawler wait between requests"),
         default: 3000,
     },
-    "enableCrawling" : {
+    "enableCrawling": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("How long should the crawler wait between requests"),
         default: true,
-    }
+    },
 };

From 066a01ae94444f7c13f5709bcd74dbd445bd0e2c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 13:35:51 +0000
Subject: [PATCH 0441/3235] Check for a matrixclient before trying to use it

Was being caught by the try block but still logging an error to the
console unnecessarily: we should not expect there to necessarily
be a matrix client since we run this from the constructor and
there's a shared instance which could be constructed at any point.
---
 src/integrations/IntegrationManagers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index b482ec73ce..c933e5c433 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -83,6 +83,7 @@ export class IntegrationManagers {
     }
 
     async _setupHomeserverManagers() {
+        if (!MatrixClientPeg.get()) return;
         try {
             console.log("Updating homeserver-configured integration managers...");
             const homeserverDomain = MatrixClientPeg.getHomeserverName();

From 5e4dab1f151422fa7220c766bfb13752ba06a1dc Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 17 Jan 2020 11:05:36 +0000
Subject: [PATCH 0442/3235] Translated using Weblate (Hungarian)

Currently translated at 99.7% (2026 of 2032 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 1803ac7601..77952b994c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2066,5 +2066,6 @@
     "Done": "Kész",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Az eszköz biztonságának beállítása nélkül nem férhet hozzá a titkosított üzenetekhez.",
     "Go Back": "Vissza",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "A Biztonsági Tároló a kulcs mentés adatainak felhasználásával lesz beállítva. A biztonsági tároló jelmondata és a visszaállítási kulcs ugyanaz lesz mint a kulcs mentéshez használt."
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "A Biztonsági Tároló a kulcs mentés adatainak felhasználásával lesz beállítva. A biztonsági tároló jelmondata és a visszaállítási kulcs ugyanaz lesz mint a kulcs mentéshez használt.",
+    "New invite dialog": "Új meghívó párbeszédablak"
 }

From 9b64686041b9ef4c28fc76bbf3ab54cc795ce5f1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 17 Jan 2020 13:50:24 +0000
Subject: [PATCH 0443/3235] Add missing import

---
 src/KeyRequestHandler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index 0aca6529e4..30f3b7d50e 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import * as sdk from './index';
 import Modal from './Modal';
+import SettingsStore from './settings/SettingsStore';
 
 // TODO: We can remove this once cross-signing is the only way.
 // https://github.com/vector-im/riot-web/issues/11908

From 42fe69aec9777d868da6504f3981e6023959c550 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 14:08:37 +0000
Subject: [PATCH 0444/3235] Don't check devices if crypto is disabled

---
 src/DeviceListener.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4b779377e8..15ca931fc8 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -69,6 +69,8 @@ export default class DeviceListener {
     async recheck() {
         const cli = MatrixClientPeg.get();
 
+        if (!cli.isCryptoEnabled()) return false;
+
         const devices = await cli.getStoredDevicesForUser(cli.getUserId());
         for (const device of devices) {
             if (device.deviceId == cli.deviceId) continue;

From d69c5f6a1b2be338560217a21ef1f79c2c6f803f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 14:46:20 +0000
Subject: [PATCH 0445/3235] Catch exception if passphrase dialog cancelled

As hopefully explained by comment
---
 .../structures/auth/CompleteSecurity.js          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 77f7fe26e4..b64f368908 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -40,12 +40,16 @@ export default class CompleteSecurity extends React.Component {
 
     onStartClick = async () => {
         const cli = MatrixClientPeg.get();
-        await accessSecretStorage(async () => {
-            await cli.checkOwnCrossSigningTrust();
-        });
-        this.setState({
-            phase: PHASE_DONE,
-        });
+        try {
+            await accessSecretStorage(async () => {
+                await cli.checkOwnCrossSigningTrust();
+            });
+            this.setState({
+                phase: PHASE_DONE,
+            });
+        } catch (e) {
+            // this will throw if the user hits cancel, so ignore
+        }
     }
 
     onSkipClick = () => {

From d20db3560a20c2a7075cfb77ef1e3e35fceed897 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 17 Jan 2020 15:50:27 +0100
Subject: [PATCH 0446/3235] fix import paths after build system refactor

---
 src/components/views/right_panel/EncryptionInfo.js    | 2 +-
 src/components/views/right_panel/EncryptionPanel.js   | 2 +-
 src/components/views/right_panel/VerificationPanel.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 3d5de829b7..5770e9b086 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from "../../..";
+import * as sdk from '../../../index';
 import {_t} from "../../../languageHandler";
 
 export default class EncryptionInfo extends React.PureComponent {
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index e3f3b86940..4b3473935a 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
-import MatrixClientPeg from "../../../MatrixClientPeg";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 
 export default class EncryptionPanel extends React.PureComponent {
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index fff9c37358..4dee3e6ae8 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import sdk from "../../..";
+import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 export default class VerificationPanel extends React.PureComponent {

From a73b7229a7ec50a65f3b147ce7f760691e03a254 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 17 Jan 2020 16:31:38 +0100
Subject: [PATCH 0447/3235] fix lint

---
 src/components/structures/MatrixChat.js               | 1 -
 src/components/views/right_panel/VerificationPanel.js | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7cbec11e08..3ac8a93e3d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1455,7 +1455,6 @@ export default createReactClass({
             cli.on("crypto.verification.request", request => {
                 console.log(`MatrixChat got a .request ${request.channel.transactionId}`, request.event.getRoomId());
                 if (request.pending) {
-                    console.log(`emitting toast for verification request with txnid ${request.channel.transactionId}`, request.event && request.event.getId());
                     ToastStore.sharedInstance().addOrReplaceToast({
                         key: 'verifreq_' + request.channel.transactionId,
                         title: _t("Verification Request"),
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 4dee3e6ae8..0d28e1568f 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -41,7 +41,10 @@ export default class VerificationPanel extends React.PureComponent {
         if (request.requested) {
             return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
         } else if (request.ready) {
-            return (<p>{request.otherUserId} is ready, start <AccessibleButton kind="primary" onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>);
+            const verifyButton = <AccessibleButton kind="primary" onClick={this._startSAS}>
+                Verify by emoji
+            </AccessibleButton>;
+            return (<p>{request.otherUserId} is ready, start {verifyButton}</p>);
         } else if (request.started) {
             if (this.state.sasWaitingForOtherParty) {
                 return <p>Waiting for {request.otherUserId} to confirm ...</p>;

From 942b391d8e251c8d5eaa96293594dffaf17f7368 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 17 Jan 2020 15:29:08 +0000
Subject: [PATCH 0448/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2035 of 2035 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 77952b994c..c131e77302 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2067,5 +2067,14 @@
     "Without completing security on this device, it won’t have access to encrypted messages.": "Az eszköz biztonságának beállítása nélkül nem férhet hozzá a titkosított üzenetekhez.",
     "Go Back": "Vissza",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "A Biztonsági Tároló a kulcs mentés adatainak felhasználásával lesz beállítva. A biztonsági tároló jelmondata és a visszaállítási kulcs ugyanaz lesz mint a kulcs mentéshez használt.",
-    "New invite dialog": "Új meghívó párbeszédablak"
+    "New invite dialog": "Új meghívó párbeszédablak",
+    "New Session": "Új Munkamenet",
+    "Other users may not trust it": "Más felhasználók lehet, hogy nem bíznak benne",
+    "Later": "Később",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Az alábbi felhasználókat nem sikerült meghívni a beszélgetésbe: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "A közvetlen üzenetedet nem sikerült elkészíteni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
+    "Something went wrong trying to invite the users.": "Valami nem sikerült a felhasználók meghívásával.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezeket a felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
+    "Recently Direct Messaged": "Nemrég küldött Közvetlen Üzenetek",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>."
 }

From 716c8ba68f392d3d1f727918475381aae26f24c4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 17 Jan 2020 17:02:31 +0100
Subject: [PATCH 0449/3235] pr feedback

---
 src/components/views/messages/MKeyVerificationRequest.js | 1 -
 src/components/views/toasts/VerificationRequestToast.js  | 1 -
 src/stores/RightPanelStorePhases.js                      | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 32f75d9895..ae793556d8 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -45,7 +45,6 @@ export default class MKeyVerificationRequest extends React.Component {
 
     _openRequest = () => {
         const {verificationRequest} = this.props.mxEvent;
-        dis.dispatch({action: "show_right_panel"});
         dis.dispatch({
             action: "set_right_panel_phase",
             phase: RIGHT_PANEL_PHASES.EncryptionPanel,
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index c681ca0951..479a3e3f93 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -76,7 +76,6 @@ export default class VerificationRequestToast extends React.PureComponent {
         }
         try {
             await request.accept();
-            dis.dispatch({action: "show_right_panel"});
             dis.dispatch({
                 action: "set_right_panel_phase",
                 phase: RIGHT_PANEL_PHASES.EncryptionPanel,
diff --git a/src/stores/RightPanelStorePhases.js b/src/stores/RightPanelStorePhases.js
index 7783f960d6..d9af320233 100644
--- a/src/stores/RightPanelStorePhases.js
+++ b/src/stores/RightPanelStorePhases.js
@@ -21,8 +21,9 @@ export const RIGHT_PANEL_PHASES = Object.freeze({
     FilePanel: 'FilePanel',
     NotificationPanel: 'NotificationPanel',
     RoomMemberInfo: 'RoomMemberInfo',
-    Room3pidMemberInfo: 'Room3pidMemberInfo',
     EncryptionPanel: 'EncryptionPanel',
+
+    Room3pidMemberInfo: 'Room3pidMemberInfo',
     // Group stuff
     GroupMemberList: 'GroupMemberList',
     GroupRoomList: 'GroupRoomList',

From 3b99f7565dbbf453eb615f9034db2dfd574c9128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 17:10:59 +0100
Subject: [PATCH 0450/3235] PreferencesUserSettingsTab: Move the event index UI
 into a separate component.

---
 .../views/settings/EventIndexPanel.js         | 131 ++++++++++++++++++
 .../tabs/user/PreferencesUserSettingsTab.js   |  90 +-----------
 2 files changed, 134 insertions(+), 87 deletions(-)
 create mode 100644 src/components/views/settings/EventIndexPanel.js

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
new file mode 100644
index 0000000000..98ba83f62b
--- /dev/null
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -0,0 +1,131 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 classNames from 'classnames';
+
+import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import Field from "../elements/Field";
+import {formatBytes} from "../../../utils/FormattingUtils";
+import EventIndexPeg from "../../../indexing/EventIndexPeg";
+
+export default class EventIndexPanel extends React.Component {
+    constructor() {
+        super();
+
+        this.state = {
+            eventIndexSize: 0,
+            crawlingRooms: 0,
+            totalCrawlingRooms: 0,
+            eventIndexingEnabled:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
+            crawlerSleepTime:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
+        };
+    }
+
+    async componentWillMount(): void {
+        let eventIndexSize = 0;
+        let crawlingRooms = 0;
+        let totalCrawlingRooms = 0;
+
+        const eventIndex = EventIndexPeg.get();
+
+        if (eventIndex !== null) {
+            eventIndexSize = await eventIndex.indexSize();
+            const crawledRooms = eventIndex.currentlyCrawledRooms();
+            crawlingRooms = crawledRooms.crawlingRooms.size;
+            totalCrawlingRooms = crawledRooms.totalRooms.size;
+        }
+
+        this.setState({
+            eventIndexSize,
+            crawlingRooms,
+            totalCrawlingRooms,
+        });
+    }
+
+    _onEventIndexingEnabledChange = (checked) => {
+        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
+
+        if (checked) EventIndexPeg.start();
+        else EventIndexPeg.stop();
+
+        this.setState({eventIndexingEnabled: checked});
+    }
+
+    _onCrawlerSleepTimeChange = (e) => {
+        this.setState({crawlerSleepTime: e.target.value});
+        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
+    }
+
+    render() {
+        let eventIndexingSettings = null;
+        let crawlerState;
+
+        if (!this.state.eventIndexingEnabled) {
+            crawlerState = <div>{_t("Message downloader is stopped.")}</div>;
+        } else if (this.state.crawlingRooms === 0) {
+            crawlerState = <div>{_t("Message downloader is currently idle.")}</div>;
+        } else {
+            crawlerState = (
+                <div>{_t(
+                    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
+                    { crawlingRooms: this.state.crawlingRooms,
+                      totalRooms: this.state.totalCrawlingRooms,
+                    })}
+                </div>
+            );
+        }
+
+        if (EventIndexPeg.get() !== null) {
+            eventIndexingSettings = (
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
+                    {
+                        _t( "To enable search in encrypted rooms, Riot needs to run " +
+                            "a background process to download historical messages " +
+                            "from those rooms to your computer.",
+                        )
+                    }
+                    <div className='mx_SettingsTab_subsectionText'>
+                        {_t("Message disk usage:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                        {crawlerState}<br />
+                    </div>
+
+                    <LabelledToggleSwitch
+                        value={this.state.eventIndexingEnabled}
+                        onChange={this._onEventIndexingEnabledChange}
+                        label={_t('Enable message downloading')} />
+
+                    <Field
+                        id={"crawlerSleepTimeMs"}
+                        label={_t('Message downloading sleep time(ms)')}
+                        type='number'
+                        value={this.state.crawlerSleepTime}
+                        onChange={this._onCrawlerSleepTimeChange} />
+                </div>
+            );
+        }
+
+        return eventIndexingSettings;
+    }
+}
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index e47f591dcb..5ecafcc5ae 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,7 +23,6 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
-import EventIndexPeg from "../../../../../indexing/EventIndexPeg";
 import {formatBytes} from "../../../../../utils/FormattingUtils";
 
 export default class PreferencesUserSettingsTab extends React.Component {
@@ -72,13 +71,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
             alwaysShowMenuBarSupported: false,
             minimizeToTray: true,
             minimizeToTraySupported: false,
-            eventIndexSize: 0,
-            crawlingRooms: 0,
-            totalCrawlingRooms: 0,
-            eventIndexingEnabled:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
-            crawlerSleepTime:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
             autocompleteDelay:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay').toString(10),
             readMarkerInViewThresholdMs:
@@ -109,19 +101,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
             minimizeToTray = await platform.getMinimizeToTrayEnabled();
         }
 
-        let eventIndexSize = 0;
-        let crawlingRooms = 0;
-        let totalCrawlingRooms = 0;
-
-        const eventIndex = EventIndexPeg.get();
-
-        if (eventIndex !== null) {
-            eventIndexSize = await eventIndex.indexSize();
-            const crawledRooms = eventIndex.currentlyCrawledRooms();
-            crawlingRooms = crawledRooms.crawlingRooms.size;
-            totalCrawlingRooms = crawledRooms.totalRooms.size;
-        }
-
         this.setState({
             autoLaunch,
             autoLaunchSupported,
@@ -129,9 +108,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
             alwaysShowMenuBar,
             minimizeToTraySupported,
             minimizeToTray,
-            eventIndexSize,
-            crawlingRooms,
-            totalCrawlingRooms,
         });
     }
 
@@ -162,26 +138,14 @@ export default class PreferencesUserSettingsTab extends React.Component {
         SettingsStore.setValue("readMarkerOutOfViewThresholdMs", null, SettingLevel.DEVICE, e.target.value);
     };
 
-    _onEventIndexingEnabledChange = (checked) => {
-        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
-
-        if (checked) EventIndexPeg.start();
-        else EventIndexPeg.stop();
-
-        this.setState({eventIndexingEnabled: checked});
-    }
-
-    _onCrawlerSleepTimeChange = (e) => {
-        this.setState({crawlerSleepTime: e.target.value});
-        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
-    }
-
     _renderGroup(settingIds) {
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return settingIds.map(i => <SettingsFlag key={i} name={i} level={SettingLevel.ACCOUNT} />);
     }
 
     render() {
+        const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
+
         let autoLaunchOption = null;
         if (this.state.autoLaunchSupported) {
             autoLaunchOption = <LabelledToggleSwitch
@@ -206,59 +170,11 @@ export default class PreferencesUserSettingsTab extends React.Component {
                 label={_t('Show tray icon and minimize window to it on close')} />;
         }
 
-        let eventIndexingSettings = null;
-        let crawlerState;
-
-        if (!this.state.eventIndexingEnabled) {
-            crawlerState = <div>{_t("Message downloader is stopped.")}</div>;
-        } else if (this.state.crawlingRooms === 0) {
-            crawlerState = <div>{_t("Message downloader is currently idle.")}</div>;
-        } else {
-            crawlerState = (
-                <div>{_t(
-                    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
-                    { crawlingRooms: this.state.crawlingRooms,
-                      totalRooms: this.state.totalCrawlingRooms,
-                    })}
-                </div>
-            );
-        }
-
-        if (EventIndexPeg.get() !== null) {
-            eventIndexingSettings = (
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
-                    {
-                        _t( "To enable search in encrypted rooms, Riot needs to run " +
-                            "a background process to download historical messages " +
-                            "from those rooms to your computer.",
-                        )
-                    }
-                    <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Message disk usage:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                        {crawlerState}<br />
-                    </div>
-
-                    <LabelledToggleSwitch
-                        value={this.state.eventIndexingEnabled}
-                        onChange={this._onEventIndexingEnabledChange}
-                        label={_t('Enable message downloading')} />
-
-                    <Field
-                        id={"crawlerSleepTimeMs"}
-                        label={_t('Message downloading sleep time(ms)')}
-                        type='number'
-                        value={this.state.crawlerSleepTime}
-                        onChange={this._onCrawlerSleepTimeChange} />
-                </div>
-            );
-        }
-
         return (
             <div className="mx_SettingsTab mx_PreferencesUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Preferences")}</div>
 
-                {eventIndexingSettings}
+                <EventIndexPanel />
 
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>

From 695b8aff5b4672d3af70db317c023f84c9968aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 17 Jan 2020 17:14:55 +0100
Subject: [PATCH 0451/3235] EventIndexPanel: Reword the enable/disable setting.

---
 src/components/views/settings/EventIndexPanel.js | 2 +-
 src/i18n/strings/en_EN.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 98ba83f62b..bade2d8735 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -114,7 +114,7 @@ export default class EventIndexPanel extends React.Component {
                     <LabelledToggleSwitch
                         value={this.state.eventIndexingEnabled}
                         onChange={this._onEventIndexingEnabledChange}
-                        label={_t('Enable message downloading')} />
+                        label={_t('Download and index encrypted messages')} />
 
                     <Field
                         id={"crawlerSleepTimeMs"}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index aa8583cf8d..1d1636bfb2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -738,7 +738,7 @@
     "Encrypted search": "Encrypted search",
     "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.": "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.",
     "Message disk usage:": "Message disk usage:",
-    "Enable message downloading": "Enable message downloading",
+    "Download and index encrypted messages": "Download and index encrypted messages",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "Preferences": "Preferences",
     "Composer": "Composer",

From 03cb76861f42d0b8e06555c0cb80df515032d74d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 16:26:47 +0000
Subject: [PATCH 0452/3235] Catch exception in checkTerms if no ID server

This line will throw if it can't get to the ID server, so move it
inside the catch block too.
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 908968b051..b9eaa3efa3 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -160,8 +160,8 @@ export default class GeneralUserSettingsTab extends React.Component {
         // for free. So we might as well use that for our own purposes.
         const idServerUrl = MatrixClientPeg.get().getIdentityServerUrl();
         const authClient = new IdentityAuthClient();
-        const idAccessToken = await authClient.getAccessToken({ check: false });
         try {
+            const idAccessToken = await authClient.getAccessToken({ check: false });
             await startTermsFlow([new Service(
                 SERVICE_TYPES.IS,
                 idServerUrl,

From 4a82e868595160a0494dbb1efd0a09b1f4c2817f Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 17 Jan 2020 17:59:08 +0000
Subject: [PATCH 0453/3235] Adjust secret storage to work before sync

This adjusts to changed JS SDK APIs that allow secret storage to optionally ask
the server for any account data needed at login.

Fixes https://github.com/vector-im/riot-web/issues/11901
---
 src/CrossSigningManager.js                         | 2 +-
 src/components/views/settings/CrossSigningPanel.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 0773a8d32d..085764214f 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -107,7 +107,7 @@ export async function accessSecretStorage(func = async () => { }) {
     cachingAllowed = true;
 
     try {
-        if (!cli.hasSecretStorageKey()) {
+        if (!await cli.hasSecretStorageKey()) {
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 2b191454f6..49046cd051 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -60,14 +60,14 @@ export default class CrossSigningPanel extends React.PureComponent {
         this.setState(this._getUpdatedStatus());
     };
 
-    _getUpdatedStatus() {
+    async _getUpdatedStatus() {
         // XXX: Add public accessors if we keep this around in production
         const cli = MatrixClientPeg.get();
         const crossSigning = cli._crypto._crossSigningInfo;
         const secretStorage = cli._crypto._secretStorage;
         const crossSigningPublicKeysOnDevice = crossSigning.getId();
-        const crossSigningPrivateKeysInStorage = crossSigning.isStoredInSecretStorage(secretStorage);
-        const secretStorageKeyInAccount = secretStorage.hasKey();
+        const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
+        const secretStorageKeyInAccount = await secretStorage.hasKey();
 
         return {
             crossSigningPublicKeysOnDevice,

From c7ddba786bdabaf61f473b5162c8fe7f945920f4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Jan 2020 20:06:44 +0000
Subject: [PATCH 0454/3235] Move feature flag check for new session toast

Forgot the path where it checks on startup. Just put it in recheck which covers everything.

Fixes https://github.com/vector-im/riot-web/issues/11921
---
 src/DeviceListener.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 15ca931fc8..9ae6a62ab1 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -56,17 +56,16 @@ export default class DeviceListener {
 
     _onDevicesUpdated = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         this.recheck();
     }
 
     _onDeviceVerificationChanged = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         this.recheck();
     }
 
     async recheck() {
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         const cli = MatrixClientPeg.get();
 
         if (!cli.isCryptoEnabled()) return false;

From 2faa4254baa06e0f4f0ed53d8289cd47fb65eea6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jan 2020 14:36:23 -0700
Subject: [PATCH 0455/3235] Score users who have recently spoken higher in
 invite suggestions

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

The algorithm should be documented in the diff as comments.
---
 src/components/views/dialogs/InviteDialog.js | 51 ++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 1b7a50c084..0c2a6785e8 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -411,6 +411,57 @@ export default class InviteDialog extends React.PureComponent {
             return scores;
         }, {});
 
+        // Now that we have scores for being in rooms, boost those people who have sent messages
+        // recently, as a way to improve the quality of suggestions. We do this by checking every
+        // room to see who has sent a message in the last few hours, and giving them a score
+        // which correlates to the freshness of their message. In theory, this results in suggestions
+        // which are closer to "continue this conversation" rather than "this person exists".
+        const trueJoinedRooms = client.getRooms().filter(r => r.getMyMembership() === 'join');
+        const now = (new Date()).getTime();
+        const maxAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago
+        const maxMessagesConsidered = 50; // so we don't iterate over a huge amount of traffic
+        const lastSpoke = {}; // userId: timestamp
+        const lastSpokeMembers = {}; // userId: room member
+        for (const room of trueJoinedRooms) {
+            // Skip low priority rooms and DMs
+            if (Object.keys(room.tags).includes("m.lowpriority") || DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                continue;
+            }
+
+            const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
+            for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) {
+                const ev = events[i];
+                if (ev.getSender() === MatrixClientPeg.get().getUserId() || excludedUserIds.includes(ev.getSender())) {
+                    continue;
+                }
+                if (ev.getTs() <= maxAgeConsidered) {
+                    break; // give up: all events from here on out are too old
+                }
+
+                if (!lastSpoke[ev.getSender()] || lastSpoke[ev.getSender()] < ev.getTs()) {
+                    lastSpoke[ev.getSender()] = ev.getTs();
+                    lastSpokeMembers[ev.getSender()] = room.getMember(ev.getSender());
+                }
+            }
+        }
+        for (const userId in lastSpoke) {
+            const ts = lastSpoke[userId];
+            const member = lastSpokeMembers[userId];
+            if (!member) continue; // skip people we somehow don't have profiles for
+
+            // Scores from being in a room give a 'good' score of about 1.0-1.5, so for our
+            // boost we'll try and award at least +1.0 for making the list, with +4.0 being
+            // an approximate maximum for being selected.
+            const distanceFromNow = Math.abs(now - ts); // abs to account for slight future messages
+            const inverseTime = (now - maxAgeConsidered) - distanceFromNow;
+            const scoreBoost = Math.max(1, inverseTime / (15 * 60 * 1000)); // 15min segments to keep scores sane
+
+            let record = memberScores[userId];
+            if (!record) record = memberScores[userId] = {score: 0};
+            record.member = member;
+            record.score += scoreBoost;
+        }
+
         const members = Object.values(memberScores);
         members.sort((a, b) => {
             if (a.score === b.score) {

From 3850377e275d6ccc27cbe38a07586c266010e264 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jan 2020 14:40:33 -0700
Subject: [PATCH 0456/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 0c2a6785e8..02a96f7f37 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -424,7 +424,8 @@ export default class InviteDialog extends React.PureComponent {
         const lastSpokeMembers = {}; // userId: room member
         for (const room of trueJoinedRooms) {
             // Skip low priority rooms and DMs
-            if (Object.keys(room.tags).includes("m.lowpriority") || DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+            const isDm = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+            if (Object.keys(room.tags).includes("m.lowpriority") || isDm) {
                 continue;
             }
 

From df3fe5139d70bd8a4ffe1fb0f91b0d17147798f4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jan 2020 17:07:37 -0700
Subject: [PATCH 0457/3235] Fix error about MessagePanel not being available
 for read markers

Stacktrace:
```
TimelinePanel.js?b9ae:1139 Uncaught (in promise) TypeError: Cannot read property 'getBoundingClientRect' of null
    at Object._getLastDisplayedEventIndex (TimelinePanel.js?b9ae:1139)
    at Object.updateReadMarker (TimelinePanel.js?b9ae:751)
    at Object._callee$ (TimelinePanel.js?b9ae:613)
    at tryCatch (runtime.js?4422:45)
    at Generator.invoke [as _invoke] (runtime.js?4422:271)
    at Generator.prototype.<computed> [as next] (runtime.js?4422:97)
    at asyncGeneratorStep (asyncToGenerator.js?56ef:3)
    at _next (asyncToGenerator.js?56ef:25)
```
---
 src/components/structures/TimelinePanel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 30b02bfcca..68e3e3b3ab 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1136,7 +1136,9 @@ const TimelinePanel = createReactClass({
         const messagePanel = this._messagePanel.current;
         if (messagePanel === undefined) return null;
 
-        const wrapperRect = ReactDOM.findDOMNode(messagePanel).getBoundingClientRect();
+        const messagePanelNode = ReactDOM.findDOMNode(messagePanel);
+        if (!messagePanelNode) return null; // sometimes this happens for fresh rooms/post-sync
+        const wrapperRect = messagePanelNode.getBoundingClientRect();
         const myUserId = MatrixClientPeg.get().credentials.userId;
 
         const isNodeInView = (node) => {

From 21f8130ebe601cc257e0ec0ec7ed581b3b8e2fc6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jan 2020 17:12:35 -0700
Subject: [PATCH 0458/3235] Prevent the invite dialog from jumping around when
 elements change

Part of https://github.com/vector-im/riot-web/issues/11201
---
 res/css/views/dialogs/_InviteDialog.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index d0b53b7766..221ad7d48c 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -206,3 +206,8 @@ limitations under the License.
         margin-left: 4px;
     }
 }
+
+.mx_InviteDialog {
+    // Prevent the dialog from jumping around randomly when elements change.
+    height: 590px;
+}

From 8ba54f5f7d7227b8de0a2809bab7a0f4dc4ae231 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Jan 2020 01:38:22 +0000
Subject: [PATCH 0459/3235] Don't use expect and jest-mock anymore as they're
 implicit from jest

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/components/views/messages/TextualBody-test.js | 1 -
 test/components/views/rooms/RoomSettings-test.js   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 755751ffb7..180a2f7e54 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from "react";
-import expect from 'expect';
 import Adapter from "enzyme-adapter-react-16";
 import { configure, mount } from "enzyme";
 
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 21d22a964c..870d7f0aab 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -1,7 +1,6 @@
 // TODO: Rewrite room settings tests for dialog support
 import React from 'react';
 import ReactDOM from 'react-dom';
-import jest from 'jest-mock';
 import * as testUtils from '../../../test-utils';
 import sdk from '../../../skinned-sdk';
 import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';

From 9365a9cb3040e8d7d0d7652175ec52ac8dce1d2e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Jan 2020 01:39:14 +0000
Subject: [PATCH 0460/3235] Remove lolex where its not needed and move to
 dev-deps. Remove unused optimist

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |  7 +++---
 test/UserActivity-test.js                     |  5 ++---
 .../components/views/rooms/MemberList-test.js |  6 -----
 yarn.lock                                     | 22 +++++++++++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 3686966870..d5f56aded0 100644
--- a/package.json
+++ b/package.json
@@ -80,9 +80,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "lolex": "4.2",
     "matrix-js-sdk": "3.0.0",
-    "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",
@@ -138,6 +136,7 @@
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
     "jest": "^24.9.0",
+    "lolex": "^5.1.2",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "react-test-renderer": "^16.9.0",
@@ -157,7 +156,9 @@
     "testMatch": [
       "<rootDir>/test/**/*-test.js"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/test/setupTests.js",
+    "setupFilesAfterEnv": [
+      "<rootDir>/test/setupTests.js"
+    ],
     "moduleNameMapper": {
       "\\.(gif|png|svg|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
       "\\$webapp/i18n/languages.json": "<rootDir>/__mocks__/languages.json"
diff --git a/test/UserActivity-test.js b/test/UserActivity-test.js
index a30df527ae..1b0fbafb48 100644
--- a/test/UserActivity-test.js
+++ b/test/UserActivity-test.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import lolex from 'lolex';
-import jest from 'jest-mock';
 import EventEmitter from 'events';
 import UserActivity from '../src/UserActivity';
 
@@ -36,8 +35,8 @@ describe('UserActivity', function() {
     let clock;
 
     beforeEach(function() {
-        fakeWindow = new FakeDomEventEmitter(),
-        fakeDocument = new FakeDomEventEmitter(),
+        fakeWindow = new FakeDomEventEmitter();
+        fakeDocument = new FakeDomEventEmitter();
         userActivity = new UserActivity(fakeWindow, fakeDocument);
         userActivity.start();
         clock = lolex.install();
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index cac2c5287c..24b6391c93 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import lolex from 'lolex';
 
 import * as TestUtils from '../../../test-utils';
 
@@ -27,7 +26,6 @@ describe('MemberList', () => {
     let parentDiv = null;
     let client = null;
     let root = null;
-    let clock = null;
     let memberListRoom;
     let memberList = null;
 
@@ -40,8 +38,6 @@ describe('MemberList', () => {
         client = MatrixClientPeg.get();
         client.hasLazyLoadMembersEnabled = () => false;
 
-        clock = lolex.install();
-
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
 
@@ -114,8 +110,6 @@ describe('MemberList', () => {
             parentDiv = null;
         }
 
-        clock.uninstall();
-
         done();
     });
 
diff --git a/yarn.lock b/yarn.lock
index 81602b4e3d..ce718c0900 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1137,6 +1137,13 @@
     tslib "^1.10.0"
     webcrypto-core "^1.0.17"
 
+"@sinonjs/commons@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6"
+  integrity sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==
+  dependencies:
+    type-detect "4.0.8"
+
 "@types/babel__core@^7.1.0":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
@@ -5610,10 +5617,12 @@ loglevel@^1.6.4:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
   integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
-lolex@4.2:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
-  integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==
+lolex@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
+  integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
 
 longest-streak@^2.0.1:
   version "2.0.3"
@@ -8580,6 +8589,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

From 2eaafa71a22276190ac176b673c9a63e73d00da2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 18 Jan 2020 01:46:39 +0000
Subject: [PATCH 0461/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2035 of 2035 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 04a4792a77..dbd8319b8a 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2067,5 +2067,13 @@
     "Done": "完成",
     "Without completing security on this device, it won’t have access to encrypted messages.": "此裝置上沒有完全安全性，其對已加密訊息沒有存取權。",
     "Go Back": "返回",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰將會與您的金鑰備份相同。"
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰將會與您的金鑰備份相同。",
+    "New Session": "新工作階段",
+    "New invite dialog": "新邀請對話框",
+    "Other users may not trust it": "其他使用者可能不會信任它",
+    "Later": "稍後",
+    "Something went wrong trying to invite the users.": "在嘗試邀請使用者時發生錯誤。",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "我們無法邀請那些使用者。請檢查您想要邀請的使用者並再試一次。",
+    "Recently Direct Messaged": "最近傳送過直接訊息",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "如果您找不到某人，請詢問他們的使用者名稱（範例：@user:server.com）或<a>分享此聊天室</a>。"
 }

From c97de43f69095b64d0db325959c43dae8ccbda77 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Jan 2020 02:01:45 +0000
Subject: [PATCH 0462/3235] Remove unused fetch polyfills, querystring,
 require-json. Move glob to dev-dep

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                             |  6 +-----
 src/autocomplete/DuckDuckGoProvider.js   |  1 -
 src/components/views/elements/AppTile.js |  2 +-
 src/utils/DecryptFile.js                 |  2 --
 yarn.lock                                | 14 ++------------
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 3686966870..a18186ef6e 100644
--- a/package.json
+++ b/package.json
@@ -72,12 +72,10 @@
     "fuse.js": "^2.2.0",
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.1",
-    "glob": "^5.0.14",
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
     "html-entities": "^1.2.1",
     "is-ip": "^2.0.0",
-    "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "lolex": "4.2",
@@ -88,7 +86,6 @@
     "prop-types": "^15.5.8",
     "qrcode-react": "^0.1.16",
     "qs": "^6.6.0",
-    "querystring": "^0.2.0",
     "react": "^16.9.0",
     "react-addons-css-transition-group": "15.6.2",
     "react-beautiful-dnd": "^4.0.1",
@@ -101,7 +98,6 @@
     "url": "^0.11.0",
     "velocity-animate": "^1.5.2",
     "what-input": "^5.2.6",
-    "whatwg-fetch": "^1.1.1",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
@@ -137,11 +133,11 @@
     "estree-walker": "^0.5.0",
     "file-loader": "^3.0.1",
     "flow-parser": "^0.57.3",
+    "glob": "^5.0.14",
     "jest": "^24.9.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "react-test-renderer": "^16.9.0",
-    "require-json": "0.0.1",
     "rimraf": "^2.4.3",
     "source-map-loader": "^0.2.3",
     "stylelint": "^9.10.1",
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.js
index ca1b1478cc..8cff83554a 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.js
@@ -19,7 +19,6 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import 'whatwg-fetch';
 
 import {TextualCompletion} from './Components';
 import type {SelectionRange} from "./Autocompleter";
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 4b586b1553..b12ace708d 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import url from 'url';
-import qs from 'querystring';
+import qs from 'qs';
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index b87b723ed7..f5a1b0aa62 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -17,8 +17,6 @@ limitations under the License.
 
 // Pull in the encryption lib so that we can decrypt attachments.
 import encrypt from 'browser-encrypt-attachment';
-// Pull in a fetch polyfill so we can download encrypted attachments.
-import 'isomorphic-fetch';
 // Grab the client so that we can turn mxc:// URLs into https:// URLS.
 import {MatrixClientPeg} from '../MatrixClientPeg';
 
diff --git a/yarn.lock b/yarn.lock
index 81602b4e3d..db405d2480 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4869,7 +4869,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
@@ -6995,7 +6995,7 @@ querystring-es3@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
   integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
@@ -7473,11 +7473,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-json@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/require-json/-/require-json-0.0.1.tgz#3c8914f93d7442de8cbf4e681ac62a72aa3367fe"
-  integrity sha1-PIkU+T10Qt6Mv05oGsYqcqozZ/4=
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -9014,11 +9009,6 @@ whatwg-fetch@^0.9.0:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
   integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=
 
-whatwg-fetch@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
-  integrity sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk=
-
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"

From ef7aeda4d6a6b68711aba33205844a68389d050a Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 18 Jan 2020 11:42:52 +0000
Subject: [PATCH 0463/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2035 of 2035 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 | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 31dc6497ef..97cef0c70d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2055,5 +2055,24 @@
     "about an hour from now": "hemendik ordubetera",
     "%(num)s hours from now": "hemendik %(num)s ordutara",
     "about a day from now": "hemendik egun batera",
-    "%(num)s days from now": "hemendik %(num)s egunetara"
+    "%(num)s days from now": "hemendik %(num)s egunetara",
+    "New Session": "Saio berria",
+    "New invite dialog": "Gonbidapen elkarrizketa-koadro berria",
+    "Other users may not trust it": "Beste erabiltzaile batzuk ez fidagarritzat jo lezakete",
+    "Later": "Geroago",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Ezin izan dira honako erabiltzaile hauek gonbidatu txatera: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Ezin izan dugu zure mezu zuena sortu. Egiaztatu gonbidatu nahi dituzun erabiltzaileak eta saiatu berriro.",
+    "Something went wrong trying to invite the users.": "Okerren bat egon da erabiltzaileak gonbidatzen saiatzean.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezin izan ditugu erabiltzaile horiek gonbidatu. Egiaztatu gonbidatu nahi dituzun erabiltzaileak eta saiatu berriro.",
+    "Recently Direct Messaged": "Berriki mezu zuzena bidalita",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ez baduzu baten bat aurkitzen, eskatu bere erabiltzaile-izena (adib. @erabiltzailea:zerbitzaria.eus) edo <a>partekatu gela hau</a>.",
+    "Complete security": "Segurtasun osoa",
+    "Verify this session to grant it access to encrypted messages.": "Egiaztatu saio hau zifratutako mezuetara sarbidea emateko.",
+    "Start": "Hasi",
+    "Session verified": "Saioa egiaztatuta",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Zure saio berria orain egiaztatuta dago. Zure zifratutako mezuetara sarbidea du, eta beste erabiltzaileek fidagarri gisa ikusiko zaituzte.",
+    "Done": "Egina",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Gailu honetan segurtasuna osatu ezean, ez du zifratutako mezuetara sarbiderik izango.",
+    "Go Back": "Joan atzera",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Biltegi sekretua oraingo gakoen babeskopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa zure gakoen babes-kopiarako zenerabiltzanak izango dira."
 }

From 4d08cbecf79a1fbe9766a36d317cb2559bda2d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 18 Jan 2020 07:39:49 +0000
Subject: [PATCH 0464/3235] Translated using Weblate (French)

Currently translated at 100.0% (2035 of 2035 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 3c70407ace..d1c4f7379c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2072,5 +2072,8 @@
     "Done": "Terminé",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Si vous ne complétez pas la sécurité sur cet appareil, vous n’aurez pas accès aux messages chiffrés.",
     "Go Back": "Retourner en arrière",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Le coffre secret sera configuré en utilisant les détails existants de votre sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés."
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Le coffre secret sera configuré en utilisant les détails existants de votre sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés.",
+    "New Session": "Nouvelle session",
+    "Other users may not trust it": "D’autres utilisateurs pourraient ne pas lui faire confiance",
+    "Later": "Plus tard"
 }

From 1ec55b611f3f218997c1f3d6bc76a1ebcfd5d084 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 18 Jan 2020 08:27:11 +0000
Subject: [PATCH 0465/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2035 of 2035 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 c131e77302..e5b9f637f1 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -269,7 +269,7 @@
     "Show Text Formatting Toolbar": "Szöveg formázási eszköztár megjelenítése",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
     "Signed Out": "Kijelentkezett",
-    "Sign in": "Bejelentkezett",
+    "Sign in": "Bejelentkezés",
     "Sign out": "Kijelentkezés",
     "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.",
     "Someone": "Valaki",

From 0e2f90a31ef4ce460827c107d39a81fd2f9cf092 Mon Sep 17 00:00:00 2001
From: take100yen <take100yen@gmail.com>
Date: Sat, 18 Jan 2020 14:37:38 +0000
Subject: [PATCH 0466/3235] Translated using Weblate (Japanese)

Currently translated at 60.2% (1226 of 2035 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 | 54 +++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index c4c231249f..55cc8782ef 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -575,8 +575,8 @@
     "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": "この部屋はどんなコミュニティに対しても特色を表示していません",
+    "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>です。",
@@ -638,7 +638,7 @@
     "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.": "それを表示するように構成された部屋にコミュニティの特色を表示します。",
+    "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>をご覧ください)>。",
@@ -713,8 +713,8 @@
     "%(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": "拡大する",
+    "collapse": "折りたたむ",
+    "expand": "展開",
     "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>",
@@ -744,7 +744,7 @@
     "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>これにより、今後のユーザーは会話履歴の全文を見ることができなくなります)",
+    "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:": "続行するには、パスワードを入力してください:",
     "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": "端末名",
@@ -1017,7 +1017,7 @@
     "bulleted-list": "bulleted-list",
     "numbered-list": "numbered-list",
     "People": "人々",
-    "Flair": "特色",
+    "Flair": "バッジ",
     "Fill screen": "フィルスクリーン",
     "Light theme": "明るいテーマ",
     "Dark theme": "暗いテーマ",
@@ -1214,9 +1214,45 @@
     "Bug reporting": "バグの報告",
     "FAQ": "よくある質問",
     "Versions": "バージョン",
-    "Key backup": "鍵のバックアップ",
+    "Key backup": "キーのバックアップ",
     "Voice & Video": "音声とビデオ",
     "Remove recent messages": "最近のメッセージを削除する",
     "%(creator)s created and configured the room.": "%(creator)s が部屋を作成して構成しました。",
-    "Add room": "部屋を追加"
+    "Add room": "部屋を追加",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)sがこの部屋に%(groups)sのバッジを追加しました。",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)sがこの部屋から%(groups)sのバッジを削除しました。",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)sが%(newGroups)sのバッジを追加し、%(oldGroups)sのバッジを削除しました。",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "キーが正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。本当によろしいですか？",
+    "not stored": "保存されていません",
+    "All keys backed up": "すべてのキーがバックアップされました",
+    "Backup version: ": "バックアップのバージョン: ",
+    "Algorithm: ": "アルゴリズム: ",
+    "Backup key stored: ": "バックアップキーの保存: ",
+    "Back up your keys before signing out to avoid losing them.": "暗号化キーを失くさないために、サインアウトする前にキーをバックアップしてください。",
+    "Start using Key Backup": "キーのバックアップをはじめる",
+    "Error updating flair": "バッジの更新でエラーが発生しました。",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "この部屋のバッジの更新でエラーが発生しました。サーバーが許可していないか、一時的なエラーが発生しました。",
+    "Edited at %(date)s. Click to view edits.": "%(date)sに編集。クリックして編集を表示。",
+    "edited": "編集済",
+    "I don't want my encrypted messages": "暗号化されたメッセージは必要ありません",
+    "Manually export keys": "手動でキーをエクスポート",
+    "You'll lose access to your encrypted messages": "暗号化されたメッセージにアクセスできなくなります",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "このルームを<oldVersion />から<newVersion />にアップグレードします。",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>: 信頼できるコンピュータからのみキーのバックアップをセットアップしてください。",
+    "For maximum security, this should be different from your account password.": "セキュリティの効果を高めるために、アカウントのパスワードと別のものを設定するべきです。",
+    "Enter a passphrase...": "パスワードを入力...",
+    "That matches!": "同じです!",
+    "Please enter your passphrase a second time to confirm.": "確認のために、パスワードをもう一度入力してください。",
+    "Repeat your passphrase...": "パスワードを再度入力...",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "リカバリキーは安全網です - パスワードを忘れた際は、リカバリキーを使って復元できます。",
+    "Copy to clipboard": "クリップボードにコピー",
+    "Download": "ダウンロード",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "リカバリキーが<b>クリップボードにコピーされました</b>。ペーストして:",
+    "<b>Print it</b> and store it somewhere safe": "<b>印刷して</b>安全な場所に保管しましょう",
+    "<b>Save it</b> on a USB key or backup drive": "USB メモリーやバックアップ用のドライブに<b>保存</b>しましょう",
+    "<b>Copy it</b> to your personal cloud storage": "個人のクラウドストレージに<b>コピー</b>しましょう",
+    "Confirm your passphrase": "パスワードを確認",
+    "Recovery key": "リカバリキー",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "キーの暗号化されたコピーがサーバーに保存されます。バックアップを保護するために、パスワードを設定してください。",
+    "Secure your backup with a passphrase": "バックアップをパスワードで保護"
 }

From 931cace323f6abfe4429b2dc5e5fce87b362b648 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 18 Jan 2020 09:17:19 +0000
Subject: [PATCH 0467/3235] Translated using Weblate (Turkish)

Currently translated at 66.5% (1354 of 2035 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index af4bab9689..52e837637b 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -8,7 +8,7 @@
     "Add": "Ekle",
     "Add a topic": "Bir konu(topic) ekle",
     "Admin": "Admin",
-    "Admin Tools": "Admin araçları",
+    "Admin Tools": "Admin Araçları",
     "No Microphones detected": "Hiçbir Mikrofon bulunamadı",
     "No Webcams detected": "Hiçbir Web kamerası bulunamadı",
     "No media permissions": "Medya izinleri yok",
@@ -344,7 +344,7 @@
     "You cannot place VoIP calls in this browser.": "Bu tarayıcıda VoIP çağrısı yapamazsınız.",
     "You do not have permission to post to this room": "Bu odaya göndermeye izniniz yok",
     "You have <a>disabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a> devre dışı </a> bıraktınız.",
-    "You have <a>enabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a> etkinleştirdiniz </a> .",
+    "You have <a>enabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a>etkinleştirdiniz</a>.",
     "You have no visible notifications": "Hiçbir görünür bildiriminiz yok",
     "You must <a>register</a> to use this functionality": "Bu işlevi kullanmak için <a> Kayıt Olun </a>",
     "You need to be able to invite users to do that.": "Bunu yapmak için kullanıcıları davet etmeye ihtiyacınız var.",
@@ -1348,5 +1348,23 @@
     "Remove recent messages": "Son mesajları sil",
     "The conversation continues here.": "Sohbet buradan devam ediyor.",
     "You can only join it with a working invite.": "Sadece çalışan bir davet ile katılınabilir.",
-    "Try to join anyway": "Katılmak için yinede deneyin"
+    "Try to join anyway": "Katılmak için yinede deneyin",
+    "Preferences": "Tercihler",
+    "Timeline": "Zaman Çizelgesi",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "%(user)s tarafından gönderilen 1 mesajı silmek üzeresiniz. Bu işlem geri alınamaz. Devam etmek istediğinize emin misiniz?",
+    "This room has been replaced and is no longer active.": "Bu oda değiştirildi ve artık aktif değil.",
+    "Idle for %(duration)s": "%(duration)s süresince boşta",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s tarafından %(roomName)s dan kovuldunuz",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s tarafından %(roomName)s odası size yasaklandı",
+    "Something went wrong with your invite to %(roomName)s": "%(roomName)s odasına davet işleminizde birşeyler yanlış gitti",
+    "This invite to %(roomName)s was sent to %(email)s": "%(roomName)s odası daveti %(email)s adresine gönderildi",
+    "You're previewing %(roomName)s. Want to join it?": "%(roomName)s odasını inceliyorsunuz. Katılmak ister misiniz?",
+    "You don't currently have any stickerpacks enabled": "Açılmış herhangi bir çıkartma paketine sahip değilsiniz",
+    "Error creating alias": "Lakap oluştururken hata",
+    "Room Topic": "Oda Başlığı",
+    "Verify this session to grant it access to encrypted messages.": "Şifrelenmiş mesajlara erişmek için bu oturumu doğrula.",
+    "Start": "Başlat",
+    "Session verified": "Oturum doğrulandı",
+    "Done": "Bitti",
+    "Go Back": "Geri dön"
 }

From 9978fee51208b2c6031f611fdbc25f8752d8d7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 10:06:20 +0100
Subject: [PATCH 0468/3235] Lifecycle: Comment why we need to initialize the
 index before the client.

---
 src/Lifecycle.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index aab7884b2e..b52e5e9da5 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -588,6 +588,9 @@ async function startMatrixClient(startSyncing=true) {
     Mjolnir.sharedInstance().start();
 
     if (startSyncing) {
+        // The client might want to populate some views with events from the
+        // index (e.g. the FilePanel), therefore initialize the event index
+        // before the client.
         await EventIndexPeg.init();
         await MatrixClientPeg.start();
     } else {

From 0c854fce9b19543a57e2494b24b494faefcca35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 10:09:58 +0100
Subject: [PATCH 0469/3235] FilePanel: Remove a stale comment.

---
 src/components/structures/FilePanel.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 6faec27284..cb788cd6d2 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -62,8 +62,6 @@ const FilePanel = createReactClass({
             },
         );
 
-        // FIXME: we shouldn't be doing this every time we change room - see comment above.
-        // TODO: Remove this stale comment? Which comment above?
         const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId,
                                                         filter);
         filter.filterId = filterId;

From 93b6040291556a0cac2d5804008330001d9d1996 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 19 Jan 2020 17:14:38 +0000
Subject: [PATCH 0470/3235] Translated using Weblate (Turkish)

Currently translated at 69.3% (1410 of 2035 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 52e837637b..81f0522922 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1366,5 +1366,61 @@
     "Start": "Başlat",
     "Session verified": "Oturum doğrulandı",
     "Done": "Bitti",
-    "Go Back": "Geri dön"
+    "Go Back": "Geri dön",
+    "New Session": "Yeni Oturum",
+    "Gets or sets the room topic": "Oda başlığını getirir yada ayarlar",
+    "Unbans user with given ID": "Verilen ID ile kullanıcı yasağını kaldırır",
+    "Ignores a user, hiding their messages from you": "Mesajlarını senden gizleyerek, bir kullanıcıyı yok sayar",
+    "Ignored user": "Yoksayılan kullanıcı",
+    "You are now ignoring %(userId)s": "Şimdi %(userId)s yı yoksayıyorsunuz",
+    "Stops ignoring a user, showing their messages going forward": "Sonraki mesajlarını göstererek, bir kullanıcıyı yoksaymaktan vazgeç",
+    "Adds a custom widget by URL to the room": "URL ile odaya özel bir görsel bileşen ekle",
+    "Verifies a user, device, and pubkey tuple": "Bir kullanıcıyı, cihazı ve açık anahtar ikilisini doğrular",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s misafirlerin odaya katılmasına izin verdi.",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s bir geçersiz yasaklama kuralını güncelledi",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen yasaklama kuralını güncelledi",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen kullanıcıları yasaklama kuralı oluşturdu",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen bir oda yasaklama kuralı oluşturdu",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen bir sunucular yasaklama kuralı oluşturdu",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen bir yasak kuralı oluşturdu",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Kararlı bir internet bağlantısına sahip olduğunuzdan emin olun yada sunucu yöneticisi ile iletişime geçin",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Hizmeti kullanmaya devam etmek için, lütfen <a>hizmet yöneticiniz ile bağlantıya geçin</a>.",
+    "a few seconds ago": "bir kaç saniye önce",
+    "about a minute ago": "yaklaşık bir dakika önce",
+    "%(num)s minutes ago": "%(num)s dakika önce",
+    "about an hour ago": "yaklaşık bir saat önce",
+    "%(num)s hours ago": "%(num)s saat önce",
+    "about a day ago": "yaklaşık bir gün önce",
+    "%(num)s days ago": "%(num)s gün önce",
+    "The user's homeserver does not support the version of the room.": "Kullanıcının ana sunucusu odanın sürümünü desteklemiyor.",
+    "Unknown server error": "Bilinmeyen sunucu hatası",
+    "Use a few words, avoid common phrases": "Bir kaç kelime kullanın ve genel ifadelerden kaçının",
+    "No need for symbols, digits, or uppercase letters": "Semboller, sayılar yada büyük harflere gerek yok",
+    "Avoid repeated words and characters": "Tekrarlanan kelimeler ve karakterlerden kaçının",
+    "Avoid sequences": "Sekanslardan kaçının",
+    "Avoid recent years": "Son yıllardan kaçının",
+    "Avoid years that are associated with you": "Sizle ilişkili yıllardan kaçının",
+    "Avoid dates and years that are associated with you": "Sizle ilişkili tarihler ve yıllardan kaçının",
+    "Capitalization doesn't help very much": "Baş harfi büyük yapmak size pek yardımcı olmaz",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Bütün harflerin büyük olmasıyla tümünün küçük olması tahmin için hemen hemen aynı kolaylıktadır",
+    "Reversed words aren't much harder to guess": "Ters kelimeler tahmin için çok zor değil",
+    "Repeats like \"aaa\" are easy to guess": "“aaa” gibi tekrarlar tahmin için oldukça kolay",
+    "Dates are often easy to guess": "Tarihler sıklıkla tahmin için daha kolaydır",
+    "This is a top-10 common password": "Bu bir top-10 yaygın parola",
+    "This is a top-100 common password": "Bu bir top-100 yaygın parola",
+    "This is a very common password": "Bu oldukça yaygın parola",
+    "This is similar to a commonly used password": "Bu yaygınca kullanılan bir parolaya benziyor",
+    "Names and surnames by themselves are easy to guess": "Adlar ve soyadlar kendi kendilerine tahmin için kolaydır",
+    "There was an error joining the room": "Odaya katılırken bir hata oluştu",
+    "Custom user status messages": "Özel kullanıcı durum mesajları",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Özel etiketler ile odaları grupla & filtrele ( değişiklikleri uygulamak için yenile)",
+    "Render simple counters in room header": "Oda başlığında basit sayaçları görüntüle",
+    "Try out new ways to ignore people (experimental)": "Kişileri yoksaymak için yeni yöntemleri dene (deneysel)",
+    "New invite dialog": "Yeni davet diyalogu",
+    "Enable local event indexing and E2EE search (requires restart)": "E2EE arama ve yerel olay indeksini aç (yeniden başlatma gerekli)",
+    "Mirror local video feed": "Yerel video beslemesi yansısı",
+    "Enable Community Filter Panel": "Toluluk Filtre Panelini Aç",
+    "Match system theme": "Sistem temasıyla eşle",
+    "Allow Peer-to-Peer for 1:1 calls": "1:1 çağrılar için eşten-eşe izin ver",
+    "Missing media permissions, click the button below to request.": "Medya izinleri eksik, alttaki butona tıkayarak talep edin."
 }

From b4c8a686cec16290f56603d3fe925ddc1d975830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 12:41:55 +0100
Subject: [PATCH 0471/3235] EventIndex: Don't import the whole js-sdk.

---
 src/indexing/EventIndex.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 0e48af749c..67a3d4cace 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,9 +16,7 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-
-import * as Matrix from 'matrix-js-sdk';
-import {EventTimeline} from 'matrix-js-sdk';
+import {EventTimeline, RoomMember} from 'matrix-js-sdk';
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -445,7 +443,7 @@ export default class EventIndex {
         const matrixEvents = events.map(e => {
             const matrixEvent = eventMapper(e.event);
 
-            const member = new Matrix.RoomMember(room.roomId, matrixEvent.getSender());
+            const member = new RoomMember(room.roomId, matrixEvent.getSender());
 
             // We can't really reconstruct the whole room state from our
             // EventIndex to calculate the correct display name. Use the

From 0b4b9d8d5d166ed7454b7d729fc5a08478ac6fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 12:42:46 +0100
Subject: [PATCH 0472/3235] EventIndex: Simplify the json event getting logic.

---
 src/indexing/EventIndex.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 67a3d4cace..e361f66edc 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -172,10 +172,7 @@ export default class EventIndex {
         }
 
         const jsonEvent = ev.toJSON();
-
-        let e;
-        if (ev.isEncrypted()) e = jsonEvent.decrypted;
-        else e = jsonEvent;
+        const e = ev.isEncrypted() ? jsonEvent.decrypted: jsonEvent;
 
         const profile = {
             displayname: ev.sender.rawDisplayName,
@@ -311,10 +308,7 @@ export default class EventIndex {
             // consume.
             const events = filteredEvents.map((ev) => {
                 const jsonEvent = ev.toJSON();
-
-                let e;
-                if (ev.isEncrypted()) e = jsonEvent.decrypted;
-                else e = jsonEvent;
+                const e = ev.isEncrypted() ? jsonEvent.decrypted: jsonEvent;
 
                 let profile = {};
                 if (e.sender in profiles) profile = profiles[e.sender];

From 4cf44cf5a561f801c107b121f109e18236db0e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 12:43:20 +0100
Subject: [PATCH 0473/3235] EventIndex/FilePanel: Allow longer lines.

---
 src/components/structures/FilePanel.js |  3 +--
 src/indexing/EventIndex.js             | 16 ++++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index cb788cd6d2..71e8143f0a 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -62,8 +62,7 @@ const FilePanel = createReactClass({
             },
         );
 
-        const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId,
-                                                        filter);
+        const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter);
         filter.filterId = filterId;
         const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
 
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index e361f66edc..cb77d92c27 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -479,15 +479,13 @@ export default class EventIndex {
         // Add the events to the live timeline of the file panel.
         matrixEvents.forEach(e => {
             if (!timelineSet.eventIdToTimeline(e.getId())) {
-                timelineSet.addEventToTimeline(e, timeline,
-                                               direction == EventTimeline.BACKWARDS);
+                timelineSet.addEventToTimeline(e, timeline, direction == EventTimeline.BACKWARDS);
             }
         });
 
         // Set the pagination token to the oldest event that we retrieved.
         if (matrixEvents.length > 0) {
-            timeline.setPaginationToken(matrixEvents[matrixEvents.length - 1].getId(),
-                                        EventTimeline.BACKWARDS);
+            timeline.setPaginationToken(matrixEvents[matrixEvents.length - 1].getId(), EventTimeline.BACKWARDS);
             return true;
         } else {
             timeline.setPaginationToken("", EventTimeline.BACKWARDS);
@@ -501,7 +499,7 @@ export default class EventIndex {
         // TODO this is from the js-sdk, this should probably be exposed to
         // us through the js-sdk.
         const moveWindowCap = (titmelineWindow, timeline, direction, limit) => {
-            const count = (direction == EventTimeline.BACKWARDS) ?
+            const count = (direction === EventTimeline.BACKWARDS) ?
             timeline.retreat(limit) : timeline.advance(limit);
 
             if (count) {
@@ -509,7 +507,7 @@ export default class EventIndex {
                 const excess = timelineWindow._eventCount - timelineWindow._windowLimit;
 
                 if (excess > 0) {
-                    timelineWindow.unpaginate(3, direction != EventTimeline.BACKWARDS);
+                    timelineWindow.unpaginate(3, direction !== EventTimeline.BACKWARDS);
                 }
                 return true;
             }
@@ -532,8 +530,7 @@ export default class EventIndex {
             const timelineSet = timelineWindow._timelineSet;
             const token = timeline.timeline.getPaginationToken(direction);
 
-            const ret = await this.populateFileTimeline(timelineSet, timeline.timeline,
-                                                        room, limit, token, direction);
+            const ret = await this.populateFileTimeline(timelineSet, timeline.timeline, room, limit, token, direction);
 
             moveWindowCap(timelineWindow, timeline, direction, limit);
             timeline.pendingPaginate = null;
@@ -541,8 +538,7 @@ export default class EventIndex {
             return ret;
         };
 
-        const paginationPromise = paginationMethod(timelineWindow, tl, room,
-                                                   direction, limit);
+        const paginationPromise = paginationMethod(timelineWindow, tl, room, direction, limit);
         tl.pendingPaginate = paginationPromise;
 
         return paginationPromise;

From 15749621a51d797d61960bb83d70f64c1f3c43a8 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 20 Jan 2020 12:06:43 +0000
Subject: [PATCH 0474/3235] Fix rageshake submission after build changes

We aren't able to depend on `require` in this context anymore.

Fixes https://github.com/vector-im/riot-web/issues/11938
---
 .../views/dialogs/BugReportDialog.js          | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index ccb332fa60..fe95041373 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -23,6 +23,7 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
+import sendBugReport from '../../../rageshake/submit-rageshake';
 
 export default class BugReportDialog extends React.Component {
     constructor(props) {
@@ -67,32 +68,30 @@ export default class BugReportDialog extends React.Component {
         this.setState({ busy: true, progress: null, err: null });
         this._sendProgressCallback(_t("Preparing to send logs"));
 
-        require(['../../../rageshake/submit-rageshake'], (s) => {
-            s(SdkConfig.get().bug_report_endpoint_url, {
-                userText,
-                sendLogs: true,
-                progressCallback: this._sendProgressCallback,
-                label: this.props.label,
-            }).then(() => {
-                if (!this._unmounted) {
-                    this.props.onFinished(false);
-                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                    // N.B. first param is passed to piwik and so doesn't want i18n
-                    Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, {
-                        title: _t('Logs sent'),
-                        description: _t('Thank you!'),
-                        hasCancelButton: false,
-                    });
-                }
-            }, (err) => {
-                if (!this._unmounted) {
-                    this.setState({
-                        busy: false,
-                        progress: null,
-                        err: _t("Failed to send logs: ") + `${err.message}`,
-                    });
-                }
-            });
+        sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
+            userText,
+            sendLogs: true,
+            progressCallback: this._sendProgressCallback,
+            label: this.props.label,
+        }).then(() => {
+            if (!this._unmounted) {
+                this.props.onFinished(false);
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                // N.B. first param is passed to piwik and so doesn't want i18n
+                Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, {
+                    title: _t('Logs sent'),
+                    description: _t('Thank you!'),
+                    hasCancelButton: false,
+                });
+            }
+        }, (err) => {
+            if (!this._unmounted) {
+                this.setState({
+                    busy: false,
+                    progress: null,
+                    err: _t("Failed to send logs: ") + `${err.message}`,
+                });
+            }
         });
     }
 

From 2ed5d89c9fca8f4449b1cc32f8aa72dcfe39cb5a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Jan 2020 12:20:21 +0000
Subject: [PATCH 0475/3235] Fix arrows keys moving through edit history

Different fix that fixes https://github.com/vector-im/riot-web/issues/11817
by setting the flag before the callback rather than having the update
method set the flag.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842
Fixes https://github.com/vector-im/riot-web/issues/11917
---
 src/components/views/rooms/BasicMessageComposer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 15a7c29e3a..e54396a9ed 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -126,7 +126,6 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     _updateEditorState = (selection, inputType, diff) => {
-        this._modifiedFlag = true;
         renderModel(this._editorRef, this.props.model);
         if (selection) { // set the caret/selection
             try {
@@ -212,6 +211,7 @@ export default class BasicMessageEditor extends React.Component {
             if (type === "cut") {
                 // Remove the text, updating the model as appropriate
                 replaceRangeAndMoveCaret(range, []);
+                this._modifiedFlag = true;
             }
             event.preventDefault();
         }
@@ -238,6 +238,7 @@ export default class BasicMessageEditor extends React.Component {
             const text = event.clipboardData.getData("text/plain");
             parts = parsePlainTextMessage(text, partCreator);
         }
+        this._modifiedFlag = true;
         const range = getRangeForSelection(this._editorRef, model, document.getSelection());
         replaceRangeAndMoveCaret(range, parts);
         event.preventDefault();
@@ -248,6 +249,7 @@ export default class BasicMessageEditor extends React.Component {
         if (this._isIMEComposing) {
             return;
         }
+        this._modifiedFlag = true;
         const sel = document.getSelection();
         const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
         this.props.model.update(text, event.inputType, caret);
@@ -258,6 +260,7 @@ export default class BasicMessageEditor extends React.Component {
         const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
         const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
         caret.offset += textToInsert.length;
+        this._modifiedFlag = true;
         this.props.model.update(newText, inputType, caret);
     }
 

From 277f10792481d78881695df9af30f8a9e3ddb265 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Jan 2020 13:03:09 +0000
Subject: [PATCH 0476/3235] Set flag before mutating on cut too

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e54396a9ed..94904242c3 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -210,8 +210,8 @@ export default class BasicMessageEditor extends React.Component {
             event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
             if (type === "cut") {
                 // Remove the text, updating the model as appropriate
-                replaceRangeAndMoveCaret(range, []);
                 this._modifiedFlag = true;
+                replaceRangeAndMoveCaret(range, []);
             }
             event.preventDefault();
         }

From d2ef6ba3f52395b93f38833b87b2d50d1962c89f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Jan 2020 14:27:19 +0000
Subject: [PATCH 0477/3235] js-sdk 4.0.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d4e58c80e4..d24fcd1777 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "3.0.0",
+    "matrix-js-sdk": "4.0.0-rc.1",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",
diff --git a/yarn.lock b/yarn.lock
index 0177629cd8..808721a188 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5732,10 +5732,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-3.0.0.tgz#97908f9eda9eeb3ba0333b7e474c45f2b258e50c"
-  integrity sha512-lzUMwJAZHw7Dk0K+rubqe6kEpy4+pJ+qCp8n6lisfdKfMDJXdNCkjiiXRnakM1ZD4PFYK8ju89+NfxlyhAAd4A==
+matrix-js-sdk@4.0.0-rc.1:
+  version "4.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e"
+  integrity sha512-1tP9fUCU5I4bXQQHuVlKHbpySh71aM6sugVC6L8ikG1ebZuKkAc2tXf1tiHizp3hZadHoTZ1PGH19ZFlKDZ8Qw==
   dependencies:
     another-json "^0.2.0"
     browser-request "^0.3.3"

From 6c8f20df60f2cb1b9dfbe2de434d1c63f89ee9be Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 20 Jan 2020 14:34:07 +0000
Subject: [PATCH 0478/3235] Prepare changelog for v2.0.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ae2711e25..eda0e0e911 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,159 @@
+Changes in [2.0.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0-rc.1) (2020-01-20)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6...v2.0.0-rc.1)
+
+BREAKING CHANGES
+================
+ * The react-sdk node module now exports ES6 rather than ES5. If you
+   wish to supports target that aren't compatible with ES6, you
+   will need to transpile the react-sdk to a suitable dialect.
+
+All Changes
+===========
+ * Fix arrows keys moving through edit history
+   [\#3874](https://github.com/matrix-org/matrix-react-sdk/pull/3874)
+ * Fix error about MessagePanel not being available for read markers
+   [\#3867](https://github.com/matrix-org/matrix-react-sdk/pull/3867)
+ * Adjust secret storage to work before sync
+   [\#3864](https://github.com/matrix-org/matrix-react-sdk/pull/3864)
+ * Update from Weblate
+   [\#3872](https://github.com/matrix-org/matrix-react-sdk/pull/3872)
+ * Remove unused deps and dev-deps
+   [\#3870](https://github.com/matrix-org/matrix-react-sdk/pull/3870)
+ * Tidy Jest test stuff and dependencies
+   [\#3869](https://github.com/matrix-org/matrix-react-sdk/pull/3869)
+ * Move feature flag check for new session toast
+   [\#3865](https://github.com/matrix-org/matrix-react-sdk/pull/3865)
+ * Catch exception in checkTerms if no ID server
+   [\#3863](https://github.com/matrix-org/matrix-react-sdk/pull/3863)
+ * Catch exception if passphrase dialog cancelled
+   [\#3862](https://github.com/matrix-org/matrix-react-sdk/pull/3862)
+ * Disable key request dialogs with cross-signing
+   [\#3860](https://github.com/matrix-org/matrix-react-sdk/pull/3860)
+ * Toasts for new, unverified sessions
+   [\#3859](https://github.com/matrix-org/matrix-react-sdk/pull/3859)
+ * Check for a matrixclient before trying to use it
+   [\#3861](https://github.com/matrix-org/matrix-react-sdk/pull/3861)
+ * Room header & message box shields now reflect cross-signing state
+   [\#3850](https://github.com/matrix-org/matrix-react-sdk/pull/3850)
+ * Fix Array.concat undefined
+   [\#3857](https://github.com/matrix-org/matrix-react-sdk/pull/3857)
+ * Update chokidar to fix reskindex not working
+   [\#3856](https://github.com/matrix-org/matrix-react-sdk/pull/3856)
+ * Make the new DM invite dialog work for regular invites too
+   [\#3854](https://github.com/matrix-org/matrix-react-sdk/pull/3854)
+ * Fix event handler leak in MemberStatusMessageAvatar
+   [\#3855](https://github.com/matrix-org/matrix-react-sdk/pull/3855)
+ * Move DM creation logic into DMInviteDialog
+   [\#3843](https://github.com/matrix-org/matrix-react-sdk/pull/3843)
+ * Remove all text when cutting in the composer
+   [\#3848](https://github.com/matrix-org/matrix-react-sdk/pull/3848)
+ * Add a ToastStore
+   [\#3853](https://github.com/matrix-org/matrix-react-sdk/pull/3853)
+ * 'Members' button always toggle the right panel
+   [\#3804](https://github.com/matrix-org/matrix-react-sdk/pull/3804)
+ * Fix timing of when Composer considers itself to be modified
+   [\#3842](https://github.com/matrix-org/matrix-react-sdk/pull/3842)
+ * Compute download file icon immediately
+   [\#3851](https://github.com/matrix-org/matrix-react-sdk/pull/3851)
+ * Fix not being able to open profiles from the timeline
+   [\#3852](https://github.com/matrix-org/matrix-react-sdk/pull/3852)
+ * Add post-login complete security flow
+   [\#3847](https://github.com/matrix-org/matrix-react-sdk/pull/3847)
+ * Added cut/copy and pasting user pills from editor.
+   [\#3828](https://github.com/matrix-org/matrix-react-sdk/pull/3828)
+ * Fix imports for help & support tab
+   [\#3846](https://github.com/matrix-org/matrix-react-sdk/pull/3846)
+ * Humanize the recent DM rooms ourselves for translations
+   [\#3841](https://github.com/matrix-org/matrix-react-sdk/pull/3841)
+ * Improve the quality of invite suggestions by filtering out DMs
+   [\#3840](https://github.com/matrix-org/matrix-react-sdk/pull/3840)
+ * Fix linter and tests on develop
+   [\#3845](https://github.com/matrix-org/matrix-react-sdk/pull/3845)
+ * Fix sourcemaps by refactoring the build system
+   [\#3839](https://github.com/matrix-org/matrix-react-sdk/pull/3839)
+ * Don't error on unverified/unknown devices.
+   [\#3837](https://github.com/matrix-org/matrix-react-sdk/pull/3837)
+ * Padlock icons in room header
+   [\#3835](https://github.com/matrix-org/matrix-react-sdk/pull/3835)
+ * Don't allow upgrade from untrusted key backup.
+   [\#3822](https://github.com/matrix-org/matrix-react-sdk/pull/3822)
+ * Emoji verification: Change name of 🔒 to lock
+   [\#3825](https://github.com/matrix-org/matrix-react-sdk/pull/3825)
+ * Room padlock decorations only if cross-signing is enabled
+   [\#3838](https://github.com/matrix-org/matrix-react-sdk/pull/3838)
+ * Enable end-to-end tests for sourcemaps (+Windows instructions)
+   [\#3827](https://github.com/matrix-org/matrix-react-sdk/pull/3827)
+ * Repair community member info panel
+   [\#3832](https://github.com/matrix-org/matrix-react-sdk/pull/3832)
+ * Add feature flag around the presence indicator in room list
+   [\#3831](https://github.com/matrix-org/matrix-react-sdk/pull/3831)
+ * Display a padlock icon beside invite-only rooms in the room list
+   [\#3821](https://github.com/matrix-org/matrix-react-sdk/pull/3821)
+ * Update from Weblate
+   [\#3830](https://github.com/matrix-org/matrix-react-sdk/pull/3830)
+ * Fix listener leak on RoomView
+   [\#3826](https://github.com/matrix-org/matrix-react-sdk/pull/3826)
+ * Regenerate i18n for sourcemaps branch
+   [\#3824](https://github.com/matrix-org/matrix-react-sdk/pull/3824)
+ * Fix tests for sourcemaps branch
+   [\#3823](https://github.com/matrix-org/matrix-react-sdk/pull/3823)
+ * Jest
+   [\#3724](https://github.com/matrix-org/matrix-react-sdk/pull/3724)
+ * Sourcemaps: develop -> feature branch
+   [\#3817](https://github.com/matrix-org/matrix-react-sdk/pull/3817)
+ * Support pasting a bunch of identifiers into the invite dialog
+   [\#3820](https://github.com/matrix-org/matrix-react-sdk/pull/3820)
+ * Support 3PIDs (email addresses) in the invite dialog
+   [\#3819](https://github.com/matrix-org/matrix-react-sdk/pull/3819)
+ * Placeholder PR for cleaner diffs: ES6
+   [\#3765](https://github.com/matrix-org/matrix-react-sdk/pull/3765)
+ * Misc fixes for ES6 imports/exports
+   [\#3766](https://github.com/matrix-org/matrix-react-sdk/pull/3766)
+ * Wire up the invite targets dialog to a real composer and show selections
+   [\#3815](https://github.com/matrix-org/matrix-react-sdk/pull/3815)
+ * Change ref handling in TextualBody to prevent it parsing generated nodes
+   [\#3711](https://github.com/matrix-org/matrix-react-sdk/pull/3711)
+ * Render encoded html entities in og:description
+   [\#3789](https://github.com/matrix-org/matrix-react-sdk/pull/3789)
+ * Update package.json for new build process + cosmetics
+   [\#3767](https://github.com/matrix-org/matrix-react-sdk/pull/3767)
+ * Convert CommonJS exports to ES6 exports
+   [\#3761](https://github.com/matrix-org/matrix-react-sdk/pull/3761)
+ * Round 2 of CommonJS to ES6 imports
+   [\#3764](https://github.com/matrix-org/matrix-react-sdk/pull/3764)
+ * Strip all variation selectors on emoji
+   [\#3814](https://github.com/matrix-org/matrix-react-sdk/pull/3814)
+ * Use the new js-sdk imports and import from src
+   [\#3763](https://github.com/matrix-org/matrix-react-sdk/pull/3763)
+ * Convert many imports to handle ES6 exports
+   [\#3762](https://github.com/matrix-org/matrix-react-sdk/pull/3762)
+ * Fix userinfo for users not in the room
+   [\#3812](https://github.com/matrix-org/matrix-react-sdk/pull/3812)
+ * Attempt to fix e2e tests
+   [\#3811](https://github.com/matrix-org/matrix-react-sdk/pull/3811)
+ * Add bunch of null-guards and similar to fix React Errors/complaints
+   [\#3752](https://github.com/matrix-org/matrix-react-sdk/pull/3752)
+ * Delegate all room alias validation to the RoomAliasField validator
+   [\#3807](https://github.com/matrix-org/matrix-react-sdk/pull/3807)
+ * Support filtering and searching for users to invite in DMs
+   [\#3802](https://github.com/matrix-org/matrix-react-sdk/pull/3802)
+ * Add suggestions for which users to invite to chat
+   [\#3801](https://github.com/matrix-org/matrix-react-sdk/pull/3801)
+ * Use `flex-start` instead of `start` for postcss
+   [\#3760](https://github.com/matrix-org/matrix-react-sdk/pull/3760)
+ * Define getLanguageFromBrowser() for LanguageDropdown
+   [\#3769](https://github.com/matrix-org/matrix-react-sdk/pull/3769)
+ * Introduce babel's export-default-from plugin to fix build errors
+   [\#3768](https://github.com/matrix-org/matrix-react-sdk/pull/3768)
+ * Add a bit of debugging to incorrect components in the Skinner
+   [\#3770](https://github.com/matrix-org/matrix-react-sdk/pull/3770)
+ * [BREAKING] Refactor the entire build process for babel@7 and TypeScript
+   (chunk 1 of many)
+   [\#3722](https://github.com/matrix-org/matrix-react-sdk/pull/3722)
+ * Implementation of new potential skinning mechanism
+   [\#3723](https://github.com/matrix-org/matrix-react-sdk/pull/3723)
+
 Changes in [1.7.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.7.6) (2020-01-13)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6-rc.2...v1.7.6)

From 4ee2fce1f11946fa48f84eb300bdfa1b195d0009 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 20 Jan 2020 14:34:07 +0000
Subject: [PATCH 0479/3235] v2.0.0-rc.1

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

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

From f77eb078498e1bdd761e176519fb5a5dc884529c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 20 Jan 2020 15:16:41 +0000
Subject: [PATCH 0480/3235] Verify individual messages via cross-signing

Fixes #11880
---
 res/css/views/rooms/_EventTile.scss     | 21 ++++++++--
 res/themes/light/css/_light.scss        |  1 +
 src/components/views/rooms/EventTile.js | 51 +++++++++++++++++++++----
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index fbac1e932a..81ba547ff0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -367,6 +367,11 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     opacity: 1;
 }
 
+.mx_EventTile_e2eIcon_userVerified {
+    background-image: url('$(res)/img/e2e/normal.svg');
+    opacity: 0.5;
+}
+
 .mx_EventTile_e2eIcon_unencrypted {
     background-image: url('$(res)/img/e2e/warning.svg');
     opacity: 1;
@@ -415,7 +420,8 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 }
 
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
+.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
+.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line {
     padding-left: 60px;
 }
 
@@ -427,8 +433,13 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     border-left: $e2e-unverified-color 5px solid;
 }
 
+.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line {
+    border-left: $e2e-userVerified-color 5px solid;
+}
+
 .mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line {
+.mx_EventTile:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
+.mx_EventTile:hover.mx_EventTile_userVerified.mx_EventTile_info .mx_EventTile_line {
     padding-left: 78px;
 }
 
@@ -439,14 +450,16 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp {
+.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
+.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line > a > .mx_MessageTimestamp {
     left: 3px;
     width: auto;
 }
 
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > .mx_EventTile_e2eIcon,
-.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > .mx_EventTile_e2eIcon {
+.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > .mx_EventTile_e2eIcon,
+.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line > .mx_EventTile_e2eIcon {
     display: block;
     left: 41px;
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 288fb3cadc..17b9a344ef 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -224,6 +224,7 @@ $copy-button-url: "$(res)/img/icon_copy_message.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
+$e2e-userVerified-color: #e8bf37;
 $e2e-unverified-color: #e8bf37;
 $e2e-warning-color: #ba6363;
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index dce4dc8a93..4aefe6929b 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -235,6 +235,7 @@ export default createReactClass({
         this._suppressReadReceiptAnimation = false;
         const client = this.context;
         client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        client.on("userTrustStatusChanged", this.onUserVerificationChanged);
         this.props.mxEvent.on("Event.decrypted", this._onDecrypted);
         if (this.props.showReactions) {
             this.props.mxEvent.on("Event.relationsCreated", this._onReactionsCreated);
@@ -260,6 +261,7 @@ export default createReactClass({
     componentWillUnmount: function() {
         const client = this.context;
         client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        client.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
         this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
         if (this.props.showReactions) {
             this.props.mxEvent.removeListener("Event.relationsCreated", this._onReactionsCreated);
@@ -282,18 +284,42 @@ export default createReactClass({
         }
     },
 
+    onUserVerificationChanged: function(userId, _trustStatus) {
+        if (userId === this.props.mxEvent.getSender()) {
+            this._verifyEvent(this.props.mxEvent);
+        }
+    },
+
     _verifyEvent: async function(mxEvent) {
         if (!mxEvent.isEncrypted()) {
             return;
         }
 
+        // If we directly trust the device, short-circuit here
         const verified = await this.context.isEventSenderVerified(mxEvent);
+        if (verified) {
+            this.setState({
+                verified: "verified"
+            }, () => {
+                // Decryption may have caused a change in size
+                this.props.onHeightChanged();
+            });
+            return;
+        }
+
+        const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
+        if (!eventSenderTrust) {
+            // We cannot find the device.  Instead, we have to verify the user.
+            const userTrust = await this.context.checkUserTrust(mxEvent.getSender());
+            this.setState({
+                verified: userTrust.isVerified() ? "user-verified": "warning",
+            }, this.props.onHeightChanged); // Decryption may have cause a change in size
+            return;
+        }
+
         this.setState({
-            verified: verified,
-        }, () => {
-            // Decryption may have caused a change in size
-            this.props.onHeightChanged();
-        });
+            verified: eventSenderTrust.isVerified() ? "verified" : "warning",
+        }, this.props.onHeightChanged); // Decryption may have caused a change in size
     },
 
     _propsEqual: function(objA, objB) {
@@ -473,8 +499,10 @@ export default createReactClass({
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
         if (ev.isEncrypted()) {
-            if (this.state.verified) {
+            if (this.state.verified === "verified") {
                 return; // no icon for verified
+            } else if (this.state.verified === "user-verified") {
+                return (<E2ePadlockUserVerified />);
             } else {
                 return (<E2ePadlockUnverified />);
             }
@@ -604,8 +632,9 @@ export default createReactClass({
             mx_EventTile_last: this.props.last,
             mx_EventTile_contextual: this.props.contextual,
             mx_EventTile_actionBarFocused: this.state.actionBarFocused,
-            mx_EventTile_verified: !isBubbleMessage && this.state.verified === true,
-            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === false,
+            mx_EventTile_verified: !isBubbleMessage && this.state.verified === "verified",
+            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === "warning",
+            mx_EventTile_userVerified: !isBubbleMessage && this.state.verified === "user-verified",
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,
@@ -901,6 +930,12 @@ function E2ePadlockUnencrypted(props) {
     );
 }
 
+function E2ePadlockUserVerified(props) {
+    return (
+        <E2ePadlock title={_t("Encrypted by a deleted device")} icon="userVerified" {...props} />
+    );
+}
+
 class E2ePadlock extends React.Component {
     static propTypes = {
         icon: PropTypes.string.isRequired,

From 51fb3b494f8a87f28e2b20f9eafe0e96275de924 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 20 Jan 2020 15:25:01 +0000
Subject: [PATCH 0481/3235] lint and i18n

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 4aefe6929b..f2a77935bc 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -299,7 +299,7 @@ export default createReactClass({
         const verified = await this.context.isEventSenderVerified(mxEvent);
         if (verified) {
             this.setState({
-                verified: "verified"
+                verified: "verified",
             }, () => {
                 // Decryption may have caused a change in size
                 this.props.onHeightChanged();
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4af203177c..510c1be0c7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -906,6 +906,7 @@
     "This message cannot be decrypted": "This message cannot be decrypted",
     "Encrypted by an unverified device": "Encrypted by an unverified device",
     "Unencrypted": "Unencrypted",
+    "Encrypted by a deleted device": "Encrypted by a deleted device",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Close preview": "Close preview",

From 34c69a59b2437e99f3997a20cf2a07f393bfd675 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Jan 2020 15:26:34 +0000
Subject: [PATCH 0482/3235] Add prepublish script

https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index d4e58c80e4..aa2cf8bf8b 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   "typings": "./lib/index.d.ts",
   "matrix_src_main": "./src/index.js",
   "scripts": {
+    "prepublish": "yarn build",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",

From 551b2907d841e4f0fcb9c58377e950330f00862f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 09:29:33 -0700
Subject: [PATCH 0483/3235] Fix variable usage and naming

---
 src/components/views/dialogs/InviteDialog.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 02a96f7f37..251fb62d2c 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -359,8 +359,8 @@ export default class InviteDialog extends React.PureComponent {
 
     _buildSuggestions(excludedTargetIds: string[]): {userId: string, user: RoomMember} {
         const maxConsideredMembers = 200;
-        const client = MatrixClientPeg.get();
-        const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
+        const myUserId = MatrixClientPeg.get().getUserId();
+        const excludedUserIds = [myUserId, SdkConfig.get()['welcomeUserId']];
         const joinedRooms = client.getRooms()
             .filter(r => r.getMyMembership() === 'join')
             .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
@@ -418,7 +418,7 @@ export default class InviteDialog extends React.PureComponent {
         // which are closer to "continue this conversation" rather than "this person exists".
         const trueJoinedRooms = client.getRooms().filter(r => r.getMyMembership() === 'join');
         const now = (new Date()).getTime();
-        const maxAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago
+        const earliestAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago
         const maxMessagesConsidered = 50; // so we don't iterate over a huge amount of traffic
         const lastSpoke = {}; // userId: timestamp
         const lastSpokeMembers = {}; // userId: room member
@@ -432,10 +432,10 @@ export default class InviteDialog extends React.PureComponent {
             const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
             for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) {
                 const ev = events[i];
-                if (ev.getSender() === MatrixClientPeg.get().getUserId() || excludedUserIds.includes(ev.getSender())) {
+                if (ev.getSender() === myUserId || excludedUserIds.includes(ev.getSender())) {
                     continue;
                 }
-                if (ev.getTs() <= maxAgeConsidered) {
+                if (ev.getTs() <= earliestAgeConsidered) {
                     break; // give up: all events from here on out are too old
                 }
 
@@ -454,7 +454,7 @@ export default class InviteDialog extends React.PureComponent {
             // boost we'll try and award at least +1.0 for making the list, with +4.0 being
             // an approximate maximum for being selected.
             const distanceFromNow = Math.abs(now - ts); // abs to account for slight future messages
-            const inverseTime = (now - maxAgeConsidered) - distanceFromNow;
+            const inverseTime = (now - earliestAgeConsidered) - distanceFromNow;
             const scoreBoost = Math.max(1, inverseTime / (15 * 60 * 1000)); // 15min segments to keep scores sane
 
             let record = memberScores[userId];

From 1b9b30d4ea735798f344d4fbc36655d4f1ff6950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 17:42:24 +0100
Subject: [PATCH 0484/3235] EventIndexPanel: Get more stats for our indexer,
 not just the size.

---
 .../views/settings/EventIndexPanel.js         | 40 +++++++++++++------
 src/i18n/strings/en_EN.json                   | 18 +++++----
 src/indexing/BaseEventIndexManager.js         | 13 +++++-
 src/indexing/EventIndex.js                    | 27 ++++++++++++-
 4 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index bade2d8735..f8c61e092d 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -35,6 +35,9 @@ export default class EventIndexPanel extends React.Component {
             eventIndexSize: 0,
             crawlingRooms: 0,
             totalCrawlingRooms: 0,
+            eventCount: 0,
+            roomCount: 0,
+            currentRoom: null,
             eventIndexingEnabled:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
             crawlerSleepTime:
@@ -44,22 +47,35 @@ export default class EventIndexPanel extends React.Component {
 
     async componentWillMount(): void {
         let eventIndexSize = 0;
+        let roomCount = 0;
+        let eventCount = 0;
         let crawlingRooms = 0;
         let totalCrawlingRooms = 0;
+        let currentRoom = null;
 
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
-            eventIndexSize = await eventIndex.indexSize();
+            const stats = await eventIndex.getStats();
+            eventIndexSize = stats.size;
+            roomCount = stats.roomCount;
+            eventCount = stats.eventCount;
+
             const crawledRooms = eventIndex.currentlyCrawledRooms();
             crawlingRooms = crawledRooms.crawlingRooms.size;
             totalCrawlingRooms = crawledRooms.totalRooms.size;
+
+            const room = eventIndex.currentRoom();
+            if (room) currentRoom = room.name;
         }
 
         this.setState({
             eventIndexSize,
             crawlingRooms,
             totalCrawlingRooms,
+            eventCount,
+            roomCount,
+            currentRoom,
         });
     }
 
@@ -82,16 +98,15 @@ export default class EventIndexPanel extends React.Component {
         let crawlerState;
 
         if (!this.state.eventIndexingEnabled) {
-            crawlerState = <div>{_t("Message downloader is stopped.")}</div>;
-        } else if (this.state.crawlingRooms === 0) {
-            crawlerState = <div>{_t("Message downloader is currently idle.")}</div>;
+            crawlerState = <div>{_t("Message search for encrypted rooms is disabled.")}</div>;
+        } else if (this.state.currentRoom === null) {
+            crawlerState = <div>{_t("Not currently downloading messages for any room.")}</div>;
         } else {
             crawlerState = (
                 <div>{_t(
-                    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
-                    { crawlingRooms: this.state.crawlingRooms,
-                      totalRooms: this.state.totalCrawlingRooms,
-                    })}
+                    "Downloading mesages for %(currentRoom)s.",
+                    { currentRoom: this.state.currentRoom }
+                )}
                 </div>
             );
         }
@@ -101,13 +116,14 @@ export default class EventIndexPanel extends React.Component {
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
                     {
-                        _t( "To enable search in encrypted rooms, Riot needs to run " +
-                            "a background process to download historical messages " +
-                            "from those rooms to your computer.",
+                        _t( "Riot is securely caching encrypted messages locally for them" +
+                            "to appear in search results:"
                         )
                     }
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Message disk usage:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                        {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                        {_t("Indexed messages:")} {this.state.eventCount}<br />
+                        {_t("Number of rooms:")} {this.state.roomCount}<br />
                         {crawlerState}<br />
                     </div>
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d1636bfb2..a968c145d9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -554,6 +554,16 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
+    "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
+    "Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
+    "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
+    "Encrypted search": "Encrypted search",
+    "Riot is securely caching encrypted messages locally for themto appear in search results:": "Riot is securely caching encrypted messages locally for themto appear in search results:",
+    "Space used:": "Space used:",
+    "Indexed messages:": "Indexed messages:",
+    "Number of rooms:": "Number of rooms:",
+    "Download and index encrypted messages": "Download and index encrypted messages",
+    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -732,14 +742,6 @@
     "Start automatically after system login": "Start automatically after system login",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
-    "Message downloader is stopped.": "Message downloader is stopped.",
-    "Message downloader is currently idle.": "Message downloader is currently idle.",
-    "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.": "Currently downloading mesages in %(crawlingRooms)s of %(totalRooms)s rooms.",
-    "Encrypted search": "Encrypted search",
-    "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.": "To enable search in encrypted rooms, Riot needs to run a background process to download historical messages from those rooms to your computer.",
-    "Message disk usage:": "Message disk usage:",
-    "Download and index encrypted messages": "Download and index encrypted messages",
-    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "Preferences": "Preferences",
     "Composer": "Composer",
     "Timeline": "Timeline",
diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 733dc05dd6..819b3e65a7 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -67,6 +67,12 @@ export interface HistoricEvent {
     profile: MatrixProfile;
 }
 
+export interface IndexStats {
+    size: number;
+    event_count: number;
+    room_count: number;
+}
+
 /**
  * Base class for classes that provide platform-specific event indexing.
  *
@@ -118,9 +124,12 @@ export default class BaseEventIndexManager {
     }
 
     /**
-     * Get the disk usage of the index
+     * Get statistical information of the index.
+     *
+     * @return {Promise<IndexStats>} A promise that will resolve to the index
+     * statistics.
      */
-    async indexSize(): Promise<number> {
+    async getStats(): Promise<IndexStats> {
         throw new Error("Unimplemented");
     }
 
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 0d7f43b839..d00a0530ba 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -425,9 +425,9 @@ export default class EventIndex {
         return indexManager.searchEventIndex(searchArgs);
     }
 
-    async indexSize() {
+    async getStats() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
-        return indexManager.indexSize();
+        return indexManager.getStats();
     }
 
     currentlyCrawledRooms() {
@@ -456,4 +456,27 @@ export default class EventIndex {
 
         return {crawlingRooms, totalRooms};
     }
+
+    /**
+     * Get the room that we are currently crawling.
+     *
+     * @returns A MatrixRoom that is being currently crawled, null if no room is
+     * currently being crawled.
+     */
+    currentRoom() {
+        if (this._currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {
+            console.log("EventIndex: No current nor any checkpoint");
+            return null;
+        }
+
+        const client = MatrixClientPeg.get();
+
+        if (this._currentCheckpoint !== null) {
+            console.log("EventIndex: Current checkpoint available");
+            return client.getRoom(this._currentCheckpoint.roomId);
+        } else {
+            console.log("EventIndex: No current but have checkpoint available");
+            return client.getRoom(this.crawlerCheckpoints[0].roomId);
+        }
+    }
 }

From 8de149704e52c4b1872b32efb899bdd5fd0b6707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Jan 2020 17:43:55 +0100
Subject: [PATCH 0485/3235] EventIndexPanel: Dynamically update the indexer
 stats.

---
 .../views/settings/EventIndexPanel.js         | 25 +++++++++++++++++++
 src/indexing/EventIndex.js                    | 23 ++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index f8c61e092d..b777957a3a 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -45,6 +45,29 @@ export default class EventIndexPanel extends React.Component {
         };
     }
 
+    async updateCurrentRoom(room) {
+        const eventIndex = EventIndexPeg.get();
+        const stats = await eventIndex.getStats();
+        let currentRoom = null;
+
+        if (room) currentRoom = room.name;
+
+        this.setState({
+            eventIndexSize: stats.size,
+            roomCount: stats.roomCount,
+            eventCount: stats.eventCount,
+            currentRoom: currentRoom,
+        });
+    }
+
+    componentWillUnmount(): void {
+        const eventIndex = EventIndexPeg.get();
+
+        if (eventIndex !== null) {
+            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom.bind(this));
+        }
+    }
+
     async componentWillMount(): void {
         let eventIndexSize = 0;
         let roomCount = 0;
@@ -56,6 +79,8 @@ export default class EventIndexPanel extends React.Component {
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
+            eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
+
             const stats = await eventIndex.getStats();
             eventIndexSize = stats.size;
             roomCount = stats.roomCount;
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index d00a0530ba..5676636eed 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -19,6 +19,7 @@ import {MatrixClientPeg} from "../MatrixClientPeg";
 import SettingsStore from '../settings/SettingsStore';
 import {SettingLevel} from "../settings/SettingsStore";
 import {sleep} from "../utils/promise";
+import {EventEmitter} from "events";
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -35,6 +36,7 @@ export default class EventIndex {
         this._crawler = null;
         this._currentCheckpoint = null;
         this.liveEventsForIndex = new Set();
+        this._eventEmitter = new EventEmitter();
     }
 
     async init() {
@@ -185,6 +187,10 @@ export default class EventIndex {
         indexManager.addEventToIndex(e, profile);
     }
 
+    emitNewCheckpoint() {
+        this._eventEmitter.emit("changedCheckpoint", this.currentRoom());
+    }
+
     async crawlerFunc() {
         let cancelled = false;
 
@@ -214,7 +220,10 @@ export default class EventIndex {
                 sleepTime = this._crawlerIdleTime;
             }
 
-            this._currentCheckpoint = null;
+            if (this._currentCheckpoint !== null) {
+                this._currentCheckpoint = null;
+                this.emitNewCheckpoint();
+            }
 
             await sleep(sleepTime);
 
@@ -234,6 +243,7 @@ export default class EventIndex {
             }
 
             this._currentCheckpoint = checkpoint;
+            this.emitNewCheckpoint();
 
             idle = false;
 
@@ -465,18 +475,23 @@ export default class EventIndex {
      */
     currentRoom() {
         if (this._currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {
-            console.log("EventIndex: No current nor any checkpoint");
             return null;
         }
 
         const client = MatrixClientPeg.get();
 
         if (this._currentCheckpoint !== null) {
-            console.log("EventIndex: Current checkpoint available");
             return client.getRoom(this._currentCheckpoint.roomId);
         } else {
-            console.log("EventIndex: No current but have checkpoint available");
             return client.getRoom(this.crawlerCheckpoints[0].roomId);
         }
     }
+
+    on(eventName, callback) {
+        this._eventEmitter.on(eventName, callback);
+    }
+
+    removeListener(eventName, callback) {
+        this._eventEmitter.removeListener(eventName, callback);
+    }
 }

From 727ca8ba7792b11c337e0460a05530fd41aef69f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 10:04:14 -0700
Subject: [PATCH 0486/3235] Don't double check ourselves

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 251fb62d2c..94d4214fd4 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -432,7 +432,7 @@ export default class InviteDialog extends React.PureComponent {
             const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
             for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) {
                 const ev = events[i];
-                if (ev.getSender() === myUserId || excludedUserIds.includes(ev.getSender())) {
+                if (excludedUserIds.includes(ev.getSender())) {
                     continue;
                 }
                 if (ev.getTs() <= earliestAgeConsidered) {

From 7c877fb9c4b50935bb3dd8849c8861ec688d02da Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 10:08:35 -0700
Subject: [PATCH 0487/3235] Reinstate client variable that is actually used

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 94d4214fd4..703b0b5121 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -359,8 +359,8 @@ export default class InviteDialog extends React.PureComponent {
 
     _buildSuggestions(excludedTargetIds: string[]): {userId: string, user: RoomMember} {
         const maxConsideredMembers = 200;
-        const myUserId = MatrixClientPeg.get().getUserId();
-        const excludedUserIds = [myUserId, SdkConfig.get()['welcomeUserId']];
+        const client = MatrixClientPeg.get();
+        const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
         const joinedRooms = client.getRooms()
             .filter(r => r.getMyMembership() === 'join')
             .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);

From 12c4e453870f4570aa2cb85631be8efdfc423e97 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:14:31 +0000
Subject: [PATCH 0488/3235] User verified but device deleted isn't a useful
 state

---
 res/css/views/rooms/_EventTile.scss     | 14 +++++++-------
 res/themes/light/css/_light.scss        |  2 +-
 src/components/views/rooms/EventTile.js | 14 ++++++--------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 81ba547ff0..e54255c4c4 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -367,7 +367,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     opacity: 1;
 }
 
-.mx_EventTile_e2eIcon_userVerified {
+.mx_EventTile_e2eIcon_unknown {
     background-image: url('$(res)/img/e2e/normal.svg');
     opacity: 0.5;
 }
@@ -421,7 +421,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line {
+.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
     padding-left: 60px;
 }
 
@@ -433,13 +433,13 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     border-left: $e2e-unverified-color 5px solid;
 }
 
-.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line {
-    border-left: $e2e-userVerified-color 5px solid;
+.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
+    border-left: $e2e-unknown-color 5px solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
 .mx_EventTile:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_userVerified.mx_EventTile_info .mx_EventTile_line {
+.mx_EventTile:hover.mx_EventTile_unknown.mx_EventTile_info .mx_EventTile_line {
     padding-left: 78px;
 }
 
@@ -451,7 +451,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
-.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line > a > .mx_MessageTimestamp {
+.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line > a > .mx_MessageTimestamp {
     left: 3px;
     width: auto;
 }
@@ -459,7 +459,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > .mx_EventTile_e2eIcon,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > .mx_EventTile_e2eIcon,
-.mx_EventTile:hover.mx_EventTile_userVerified .mx_EventTile_line > .mx_EventTile_e2eIcon {
+.mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line > .mx_EventTile_e2eIcon {
     display: block;
     left: 41px;
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 17b9a344ef..c868c81549 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -224,7 +224,7 @@ $copy-button-url: "$(res)/img/icon_copy_message.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
-$e2e-userVerified-color: #e8bf37;
+$e2e-unknown-color: #e8bf37;
 $e2e-unverified-color: #e8bf37;
 $e2e-warning-color: #ba6363;
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f2a77935bc..037b080aa3 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -309,10 +309,8 @@ export default createReactClass({
 
         const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
         if (!eventSenderTrust) {
-            // We cannot find the device.  Instead, we have to verify the user.
-            const userTrust = await this.context.checkUserTrust(mxEvent.getSender());
             this.setState({
-                verified: userTrust.isVerified() ? "user-verified": "warning",
+                verified: "unknown",
             }, this.props.onHeightChanged); // Decryption may have cause a change in size
             return;
         }
@@ -501,8 +499,8 @@ export default createReactClass({
         if (ev.isEncrypted()) {
             if (this.state.verified === "verified") {
                 return; // no icon for verified
-            } else if (this.state.verified === "user-verified") {
-                return (<E2ePadlockUserVerified />);
+            } else if (this.state.verified === "unknown") {
+                return (<E2ePadlockUnknown />);
             } else {
                 return (<E2ePadlockUnverified />);
             }
@@ -634,7 +632,7 @@ export default createReactClass({
             mx_EventTile_actionBarFocused: this.state.actionBarFocused,
             mx_EventTile_verified: !isBubbleMessage && this.state.verified === "verified",
             mx_EventTile_unverified: !isBubbleMessage && this.state.verified === "warning",
-            mx_EventTile_userVerified: !isBubbleMessage && this.state.verified === "user-verified",
+            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === "unknown",
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,
@@ -930,9 +928,9 @@ function E2ePadlockUnencrypted(props) {
     );
 }
 
-function E2ePadlockUserVerified(props) {
+function E2ePadlockUnknown(props) {
     return (
-        <E2ePadlock title={_t("Encrypted by a deleted device")} icon="userVerified" {...props} />
+        <E2ePadlock title={_t("Encrypted by a deleted device")} icon="unknown" {...props} />
     );
 }
 

From 8df07334c34ca39898bddf02deb9af96ac0859b1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 20 Jan 2020 11:00:28 +0000
Subject: [PATCH 0489/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2035 of 2035 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 | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index bb35bd6d69..a519c138b1 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2055,5 +2055,24 @@
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Il Backup Chiavi è attivo sul tuo account ma non è stato impostato da questa sessione. Per impostare un archivio segreto, ripristina il tuo backup chiavi.",
     "Restore": "Ripristina",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli esistenti del backup chiavi. La password dell'archivio segreto e la chiave di recupero saranno le stesse del backup chiavi",
-    "Restore your Key Backup": "Ripristina il tuo Backup Chiavi"
+    "Restore your Key Backup": "Ripristina il tuo Backup Chiavi",
+    "New Session": "Nuova sessione",
+    "New invite dialog": "Nuova finestra di invito",
+    "Other users may not trust it": "Altri utenti potrebbero non fidarsi",
+    "Later": "Più tardi",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Impossibile invitare i seguenti utenti alla chat: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossibile creare il messaggio diretto. Ricontrolla gli utenti che vuoi invitare e riprova.",
+    "Something went wrong trying to invite the users.": "Qualcosa è andato storto provando ad invitare gli utenti.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossibile invitare quegli utenti. Ricontrolla gli utenti che vuoi invitare e riprova.",
+    "Recently Direct Messaged": "Contattati direttamente di recente",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Se non riesci a trovare qualcuno, chiedi il nome utente (es. @utente:server.it) o <a>condividi questa stanza</a>.",
+    "Complete security": "Sicurezza completa",
+    "Verify this session to grant it access to encrypted messages.": "Verifica questa sessione per concederle accesso ai messaggi cifrati.",
+    "Start": "Inizia",
+    "Session verified": "Sessione verificata",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "La tua sessione ora è verificata. Ha accesso ai tuoi messaggi cifrati e gli altri utenti la vedranno come fidata.",
+    "Done": "Fatto",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Se non completi la sicurezza su questo dispositivo, esso non avrà accesso ai messaggi cifrati.",
+    "Go Back": "Torna",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "L'archivio segreto verrà impostato usando i dettagli del backup chiavi esistente. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del backup chiavi."
 }

From d3ae65698f21950f9c4208441d2f3eff963bae8e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Jan 2020 15:26:34 +0000
Subject: [PATCH 0490/3235] Add prepublish script

https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index b607ed04ca..bc99e0eeda 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   "typings": "./lib/index.d.ts",
   "matrix_src_main": "./src/index.js",
   "scripts": {
+    "prepublish": "yarn build",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",

From befd4e1f5a0f893722858b70280d278c5aa05b6d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:25:08 +0000
Subject: [PATCH 0491/3235] shout more for unknown devices, but keep the
 tooltip

---
 res/css/views/rooms/_EventTile.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index e54255c4c4..d292c729dd 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -368,8 +368,8 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 }
 
 .mx_EventTile_e2eIcon_unknown {
-    background-image: url('$(res)/img/e2e/normal.svg');
-    opacity: 0.5;
+    background-image: url('$(res)/img/e2e/warning.svg');
+    opacity: 1;
 }
 
 .mx_EventTile_e2eIcon_unencrypted {

From 71f96770c6d494b8fd8a08ab304d25dc17d7185c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 20 Jan 2020 17:27:00 +0000
Subject: [PATCH 0492/3235] Prepare changelog for v2.0.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eda0e0e911..7630231615 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [2.0.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0-rc.2) (2020-01-20)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0-rc.1...v2.0.0-rc.2)
+
+ * Add prepublish script
+   [\#3877](https://github.com/matrix-org/matrix-react-sdk/pull/3877)
+
 Changes in [2.0.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0-rc.1) (2020-01-20)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.7.6...v2.0.0-rc.1)

From 4521ef1a7bed272288bf2e63fe673eeedeb0ea40 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 20 Jan 2020 17:27:00 +0000
Subject: [PATCH 0493/3235] v2.0.0-rc.2

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

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

From e947a68e13c37c5a1014023fd58b761a80527052 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 20 Jan 2020 20:19:38 +0000
Subject: [PATCH 0494/3235] Remove temporary key backup button

This removes the temporary extra key backup setup button in Settings used for
testing with and without cross-signing. With this change, there's only one
button and the path you take is determined by the labs flag.

Fixes https://github.com/vector-im/riot-web/issues/11890
---
 .../views/settings/KeyBackupPanel.js          | 31 +------------------
 src/i18n/strings/en_EN.json                   |  1 -
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 07cb02bd8e..fd166782d8 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,19 +127,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: false,
-                onFinished: () => {
-                    this._loadBackupStatus();
-                },
-            }, null, /* priority = */ false, /* static = */ true,
-        );
-    }
-
-    _startNewBackupWithSecureSecretStorage = async () => {
-        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
-            import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
-            {
-                secureSecretStorage: true,
+                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
                 onFinished: () => {
                     this._loadBackupStatus();
                 },
@@ -361,22 +349,6 @@ export default class KeyBackupPanel extends React.PureComponent {
                 {buttonRow}
             </div>;
         } else {
-            // This is a temporary button for testing the new path which stores
-            // the key backup key in SSSS. Initialising SSSS depends on
-            // cross-signing and is part of the same project, so we only show
-            // this mode when the cross-signing feature is enabled.
-            // TODO: Clean this up when removing the feature flag.
-            let secureSecretStorageKeyBackup;
-            if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-                secureSecretStorageKeyBackup = (
-                    <div className="mx_KeyBackupPanel_buttonRow">
-                        <AccessibleButton kind="primary" onClick={this._startNewBackupWithSecureSecretStorage}>
-                            {_t("Start using Key Backup with Secure Secret Storage")}
-                        </AccessibleButton>
-                    </div>
-                );
-            }
-
             return <div>
                 <div>
                     <p>{_t(
@@ -391,7 +363,6 @@ export default class KeyBackupPanel extends React.PureComponent {
                         {_t("Start using Key Backup")}
                     </AccessibleButton>
                 </div>
-                {secureSecretStorageKeyBackup}
             </div>;
         }
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f1886cd56..f0eab6b12d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -588,7 +588,6 @@
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
     "Backup key stored: ": "Backup key stored: ",
-    "Start using Key Backup with Secure Secret Storage": "Start using Key Backup with Secure Secret Storage",
     "Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
     "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
     "Start using Key Backup": "Start using Key Backup",

From 0bcfe5819fd033040429aba0941d450b5477e0ee Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Jan 2020 20:31:36 +0000
Subject: [PATCH 0495/3235] Integrate handleHomeEnd

---
 src/accessibility/RovingTabIndex.js    | 18 +++++++++++++++---
 src/components/views/rooms/RoomList.js |  8 +++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.js
index 85aa133aa4..2445a47e35 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -23,6 +23,7 @@ import React, {
     useRef,
     useReducer,
 } from "react";
+import PropTypes from "prop-types";
 import {Key} from "../Keyboard";
 
 /**
@@ -128,7 +129,7 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexProvider = ({children}) => {
+export const RovingTabIndexProvider = ({children, handleHomeEnd}) => {
     const [state, dispatch] = useReducer(reducer, {
         activeRef: null,
         refs: [],
@@ -136,13 +137,24 @@ export const RovingTabIndexProvider = ({children}) => {
 
     const context = useMemo(() => ({state, dispatch}), [state]);
 
+    if (handleHomeEnd) {
+        return <RovingTabIndexContext.Provider value={context}>
+            <HomeEndHelper>
+                { children }
+            </HomeEndHelper>
+        </RovingTabIndexContext.Provider>
+    }
+
     return <RovingTabIndexContext.Provider value={context}>
-        {children}
+        { children }
     </RovingTabIndexContext.Provider>;
 };
+RovingTabIndexProvider.propTypes = {
+    handleHomeEnd: PropTypes.bool,
+};
 
 // Helper to handle Home/End to jump to first/last roving-tab-index for widgets such as treeview
-export const RovingTabIndexHomeEndHelper = ({children}) => {
+export const HomeEndHelper = ({children}) => {
     const context = useContext(RovingTabIndexContext);
 
     const onKeyDown = useCallback((ev) => {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index a137a36c60..bd563b2f28 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -39,7 +39,7 @@ import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexProvider, RovingTabIndexHomeEndHelper} from "../../../accessibility/RovingTabIndex";
+import {RovingTabIndexProvider} from "../../../accessibility/RovingTabIndex";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -788,10 +788,8 @@ export default createReactClass({
                 onMouseMove={this.onMouseMove}
                 onMouseLeave={this.onMouseLeave}
             >
-                <RovingTabIndexProvider>
-                    <RovingTabIndexHomeEndHelper>
-                        { subListComponents }
-                    </RovingTabIndexHomeEndHelper>
+                <RovingTabIndexProvider handleHomeEnd={true}>
+                    { subListComponents }
                 </RovingTabIndexProvider>
             </div>
         );

From 5a67bd4b463b160821bd430bee63f9635446451d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 20 Jan 2020 20:35:21 +0000
Subject: [PATCH 0496/3235] Repair cross-signing panel with async status

This repairs the cross-signing panel after recent changes that made the panel's
status an async function.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3864
Fixes https://github.com/vector-im/riot-web/issues/11952
---
 .../views/settings/CrossSigningPanel.js         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 49046cd051..f7d3d62b4f 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,7 +29,9 @@ export default class CrossSigningPanel extends React.PureComponent {
 
         this.state = {
             error: null,
-            ...this._getUpdatedStatus(),
+            crossSigningPublicKeysOnDevice: false,
+            crossSigningPrivateKeysInStorage: false,
+            secretStorageKeyInAccount: false,
         };
     }
 
@@ -38,6 +40,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         cli.on("accountData", this.onAccountData);
         cli.on("userTrustStatusChanged", this.onStatusChanged);
         cli.on("crossSigning.keysChanged", this.onStatusChanged);
+        this._getUpdatedStatus();
     }
 
     componentWillUnmount() {
@@ -52,12 +55,12 @@ export default class CrossSigningPanel extends React.PureComponent {
     onAccountData = (event) => {
         const type = event.getType();
         if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) {
-            this.setState(this._getUpdatedStatus());
+            this._getUpdatedStatus();
         }
     };
 
     onStatusChanged = () => {
-        this.setState(this._getUpdatedStatus());
+        this._getUpdatedStatus();
     };
 
     async _getUpdatedStatus() {
@@ -69,11 +72,11 @@ export default class CrossSigningPanel extends React.PureComponent {
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
         const secretStorageKeyInAccount = await secretStorage.hasKey();
 
-        return {
+        this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
-        };
+        });
     }
 
     /**
@@ -93,7 +96,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             console.error("Error bootstrapping secret storage", e);
         }
         if (this._unmounted) return;
-        this.setState(this._getUpdatedStatus());
+        this._getUpdatedStatus();
     }
 
     render() {

From be6a3821215b699d683cd7a628e583bdaa68d792 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Jan 2020 20:46:12 +0000
Subject: [PATCH 0497/3235] delint

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

diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.js
index 2445a47e35..8924815f23 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -142,7 +142,7 @@ export const RovingTabIndexProvider = ({children, handleHomeEnd}) => {
             <HomeEndHelper>
                 { children }
             </HomeEndHelper>
-        </RovingTabIndexContext.Provider>
+        </RovingTabIndexContext.Provider>;
     }
 
     return <RovingTabIndexContext.Provider value={context}>

From 4e018905fc6ad87e6f75f4fd31fe30a8e96d1699 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 15:17:47 -0700
Subject: [PATCH 0498/3235] Remove Chrome stuff (not needed for riot-web tests
 anymore)

---
 .buildkite/pipeline.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index a8ce1273fb..85aff94069 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -83,12 +83,6 @@ steps:
       # webpack loves to gorge itself on resources.
       queue: "medium"
     command:
-      # Install chrome
-      - "echo '--- Installing Chrome'"
-      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
-      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
-      - "apt-get update"
-      - "apt-get install -y google-chrome-stable"
       # TODO: Remove hacky chmod for BuildKite
       - "chmod +x ./scripts/ci/*.sh"
       - "chmod +x ./scripts/*"
@@ -98,8 +92,6 @@ steps:
       - "yarn build"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/riot-unit-tests.sh"
-    env:
-      CHROME_BIN: "/usr/bin/google-chrome-stable"
     plugins:
       - docker#v3.0.1:
           image: "node:10"

From 62b1dd77a68fdf5cee58fd0f9041a05e9155d0d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 16:12:59 -0700
Subject: [PATCH 0499/3235] Fix layering of the riot-web tests pipeline

---
 .buildkite/pipeline.yaml       |  5 +----
 scripts/ci/layered-riot-web.sh | 33 +++++++++++++++++++++++++++++++++
 scripts/ci/riot-unit-tests.sh  |  7 ++-----
 scripts/fetchdep.sh            |  2 +-
 4 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 scripts/ci/layered-riot-web.sh

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 85aff94069..100d14e967 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -86,16 +86,13 @@ steps:
       # TODO: Remove hacky chmod for BuildKite
       - "chmod +x ./scripts/ci/*.sh"
       - "chmod +x ./scripts/*"
-      - "echo '--- Installing Dependencies'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '--- Running initial build steps'"
-      - "yarn build"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/riot-unit-tests.sh"
     plugins:
       - docker#v3.0.1:
           image: "node:10"
           propagate-environment: true
+          workdir: "/workdir/matrix-react-sdk"
 
   - label: "🌐 i18n"
     command:
diff --git a/scripts/ci/layered-riot-web.sh b/scripts/ci/layered-riot-web.sh
new file mode 100644
index 0000000000..2b908be68f
--- /dev/null
+++ b/scripts/ci/layered-riot-web.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Creates an environment similar to one that riot-web would expect for
+# development. This means going one directory up (and assuming we're in
+# a directory like /workdir/matrix-react-sdk) and putting riot-web and
+# the js-sdk there.
+
+cd ../  # Assume we're at something like /workdir/matrix-react-sdk
+
+# Set up the js-sdk first
+matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk
+pushd matrix-js-sdk
+yarn link
+yarn install
+#yarn build
+popd
+
+# Now set up the react-sdk
+pushd matrix-react-sdk
+yarn link matrix-js-sdk
+yarn link
+yarn install
+#yarn build
+popd
+
+# Finally, set up riot-web
+matrix-react-sdk/scripts/fetchdep.sh vector-im riot-web
+pushd riot-web
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
+yarn install
+yarn build:res
+popd
diff --git a/scripts/ci/riot-unit-tests.sh b/scripts/ci/riot-unit-tests.sh
index 215af13030..7a9ed77793 100755
--- a/scripts/ci/riot-unit-tests.sh
+++ b/scripts/ci/riot-unit-tests.sh
@@ -6,9 +6,6 @@
 
 set -ev
 
-RIOT_WEB_DIR=riot-web
-
-scripts/ci/build.sh
-pushd "$RIOT_WEB_DIR"
+scripts/ci/layered-riot-web.sh
+cd ../riot-web
 yarn test
-popd
diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index f82752bfc5..f477fd08b8 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -17,7 +17,7 @@ clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone git://github.com/$org/$repo.git $repo --branch "$branch" && exit 0
+        git clone git://github.com/$org/$repo.git $repo --branch "$branch" --depth=1 && exit 0
     fi
 }
 

From 3eeeb9c6afbacf46da266675ff17772747a3a47f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 16:20:02 -0700
Subject: [PATCH 0500/3235] Remove irrelevant build steps

---
 scripts/ci/layered-riot-web.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/ci/layered-riot-web.sh b/scripts/ci/layered-riot-web.sh
index 2b908be68f..f58794b451 100644
--- a/scripts/ci/layered-riot-web.sh
+++ b/scripts/ci/layered-riot-web.sh
@@ -12,7 +12,6 @@ matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk
 pushd matrix-js-sdk
 yarn link
 yarn install
-#yarn build
 popd
 
 # Now set up the react-sdk
@@ -20,7 +19,6 @@ pushd matrix-react-sdk
 yarn link matrix-js-sdk
 yarn link
 yarn install
-#yarn build
 popd
 
 # Finally, set up riot-web

From 27412ba0b2f342a42652ae6da69d41cfc2a17b03 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 16:23:33 -0700
Subject: [PATCH 0501/3235] Fix end-to-end test layering too

---
 .buildkite/pipeline.yaml       |  1 +
 scripts/ci/build.sh            | 25 -------------------------
 scripts/ci/end-to-end-tests.sh | 10 +++++-----
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100755 scripts/ci/build.sh

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 100d14e967..de61d4e5b9 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -76,6 +76,7 @@ steps:
       - docker#v3.0.1:
           image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
           propagate-environment: true
+          workdir: "/workdir/matrix-react-sdk"
 
   - label: "🔧 Riot Tests"
     agents:
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
deleted file mode 100755
index 0b1fa23093..0000000000
--- a/scripts/ci/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# script which is run by the CI build (after `yarn test`).
-#
-# clones riot-web develop and runs the tests against our version of react-sdk.
-
-set -ev
-
-RIOT_WEB_DIR=riot-web
-REACT_SDK_DIR=`pwd`
-
-yarn link
-
-scripts/fetchdep.sh vector-im riot-web
-
-pushd "$RIOT_WEB_DIR"
-
-yarn link matrix-js-sdk
-yarn link matrix-react-sdk
-
-yarn install
-
-yarn build
-
-popd
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index a592888292..9eb3c2bd87 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -21,15 +21,15 @@ handle_error() {
 
 trap 'handle_error' ERR
 
-RIOT_WEB_DIR=riot-web
-REACT_SDK_DIR=`pwd`
-
 
 echo "--- Building Riot"
-scripts/ci/build.sh
+scripts/ci/layered-riot-web.sh
+cd ../riot-web
+yarn build
+cd ../matrix-react-sdk
 # run end to end tests
 pushd test/end-to-end-tests
-ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
+ln -s ../riot-web riot/riot-web
 # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 # CHROME_PATH=$(which google-chrome-stable) ./run.sh
 echo "--- Install synapse & other dependencies"

From 19615d372175e6f7e8f7756e33f236ac41cb626e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 16:33:13 -0700
Subject: [PATCH 0502/3235] Disable minification of Riot in end-to-end tests

---
 scripts/ci/end-to-end-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 9eb3c2bd87..cc1e548af9 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -25,7 +25,7 @@ trap 'handle_error' ERR
 echo "--- Building Riot"
 scripts/ci/layered-riot-web.sh
 cd ../riot-web
-yarn build
+CI_PACKAGE=true yarn build
 cd ../matrix-react-sdk
 # run end to end tests
 pushd test/end-to-end-tests

From 776b3af6bb46c7a55a121abfffe32dc26efcf772 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 16:33:22 -0700
Subject: [PATCH 0503/3235] Fix relative pathing on riot-web link

---
 scripts/ci/end-to-end-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index cc1e548af9..bae268bbe3 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -29,7 +29,7 @@ CI_PACKAGE=true yarn build
 cd ../matrix-react-sdk
 # run end to end tests
 pushd test/end-to-end-tests
-ln -s ../riot-web riot/riot-web
+ln -s ../../../riot-web riot/riot-web
 # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 # CHROME_PATH=$(which google-chrome-stable) ./run.sh
 echo "--- Install synapse & other dependencies"

From 3b2f96bc047bbe221efe216ced07dc927d016d09 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 18:02:54 -0700
Subject: [PATCH 0504/3235] Try explicitly mapping the directory

---
 scripts/ci/end-to-end-tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index bae268bbe3..9bdb512940 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -25,11 +25,12 @@ trap 'handle_error' ERR
 echo "--- Building Riot"
 scripts/ci/layered-riot-web.sh
 cd ../riot-web
+riot_web_dir=`pwd`
 CI_PACKAGE=true yarn build
 cd ../matrix-react-sdk
 # run end to end tests
 pushd test/end-to-end-tests
-ln -s ../../../riot-web riot/riot-web
+ln -s $riot_web_dir riot/riot-web
 # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 # CHROME_PATH=$(which google-chrome-stable) ./run.sh
 echo "--- Install synapse & other dependencies"

From 4913d579e37c5bcb0c39d6291fb1e43110c4ffc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 09:24:20 +0100
Subject: [PATCH 0505/3235] EventIndexPanel: Reword the crawler state if no
 room is being crawled.

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index b777957a3a..b3c75cd336 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -125,7 +125,7 @@ export default class EventIndexPanel extends React.Component {
         if (!this.state.eventIndexingEnabled) {
             crawlerState = <div>{_t("Message search for encrypted rooms is disabled.")}</div>;
         } else if (this.state.currentRoom === null) {
-            crawlerState = <div>{_t("Not currently downloading messages for any room.")}</div>;
+            crawlerState = <div>{_t("Not downloading messages for any room.")}</div>;
         } else {
             crawlerState = (
                 <div>{_t(

From 908a00a13dc936d9bab61c165d9fe941999f8924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 10:06:04 +0100
Subject: [PATCH 0506/3235] EventIndexPanel: Move the panel from the
 preferences to the security tab.

---
 src/components/views/settings/EventIndexPanel.js   | 14 ++++++++++++--
 .../tabs/user/PreferencesUserSettingsTab.js        |  4 ----
 .../settings/tabs/user/SecurityUserSettingsTab.js  |  9 +++++++++
 src/i18n/strings/en_EN.json                        |  5 +++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index b3c75cd336..5b8029a09a 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -138,8 +138,7 @@ export default class EventIndexPanel extends React.Component {
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
+                <div>
                     {
                         _t( "Riot is securely caching encrypted messages locally for them" +
                             "to appear in search results:"
@@ -165,6 +164,17 @@ export default class EventIndexPanel extends React.Component {
                         onChange={this._onCrawlerSleepTimeChange} />
                 </div>
             );
+        } else {
+            eventIndexingSettings = (
+                <div>
+                    {
+                        _t( "Riot can't securely cache encrypted messages locally" +
+                            "while running in a web browser. Use Riot Desktop for" +
+                            "encrypted messages to appear in search results."
+                        )
+                    }
+                </div>
+            );
         }
 
         return eventIndexingSettings;
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 5ecafcc5ae..8cbaba037d 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -144,8 +144,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
     }
 
     render() {
-        const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
-
         let autoLaunchOption = null;
         if (this.state.autoLaunchSupported) {
             autoLaunchOption = <LabelledToggleSwitch
@@ -174,8 +172,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab mx_PreferencesUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Preferences")}</div>
 
-                <EventIndexPanel />
-
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 5eadfc234a..8ef9983efd 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -242,6 +242,7 @@ export default class SecurityUserSettingsTab extends React.Component {
     render() {
         const DevicesPanel = sdk.getComponent('views.settings.DevicesPanel');
         const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
+        const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
 
         const KeyBackupPanel = sdk.getComponent('views.settings.KeyBackupPanel');
         const keyBackup = (
@@ -253,6 +254,13 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
+        const eventIndex = (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
+                <EventIndexPanel />
+            </div>
+        );
+
         // XXX: There's no such panel in the current cross-signing designs, but
         // it's useful to have for testing the feature. If there's no interest
         // in having advanced details here once all flows are implemented, we
@@ -281,6 +289,7 @@ export default class SecurityUserSettingsTab extends React.Component {
                     </div>
                 </div>
                 {keyBackup}
+                {eventIndex}
                 {crossSigning}
                 {this._renderCurrentDeviceInfo()}
                 <div className='mx_SettingsTab_section'>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a968c145d9..f78e3594ee 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -555,15 +555,15 @@
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
     "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
-    "Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
+    "Not downloading messages for any room.": "Not downloading messages for any room.",
     "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
-    "Encrypted search": "Encrypted search",
     "Riot is securely caching encrypted messages locally for themto appear in search results:": "Riot is securely caching encrypted messages locally for themto appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
     "Download and index encrypted messages": "Download and index encrypted messages",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
+    "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -759,6 +759,7 @@
     "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
     "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
     "Key backup": "Key backup",
+    "Encrypted search": "Encrypted search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
     "Devices": "Devices",

From d34f1e52ad1e7d499018f96f6942501c7598b005 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 21 Jan 2020 10:08:53 +0000
Subject: [PATCH 0507/3235] constants for e2estates

---
 src/components/views/rooms/EventTile.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 037b080aa3..9c73daaa50 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -66,6 +66,12 @@ const stateEventTileTypes = {
     'm.room.related_groups': 'messages.TextualEvent',
 };
 
+const E2ESTATE = {
+    VERIFIED: "verified",
+    WARNING: "warning",
+    UNKNOWN: "unknown",
+};
+
 // Add all the Mjolnir stuff to the renderer
 for (const evType of ALL_RULE_TYPES) {
     stateEventTileTypes[evType] = 'messages.TextualEvent';
@@ -299,7 +305,7 @@ export default createReactClass({
         const verified = await this.context.isEventSenderVerified(mxEvent);
         if (verified) {
             this.setState({
-                verified: "verified",
+                verified: E2ESTATE.VERIFIED,
             }, () => {
                 // Decryption may have caused a change in size
                 this.props.onHeightChanged();
@@ -310,13 +316,13 @@ export default createReactClass({
         const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
         if (!eventSenderTrust) {
             this.setState({
-                verified: "unknown",
+                verified: E2ESTATE.UNKNOWN,
             }, this.props.onHeightChanged); // Decryption may have cause a change in size
             return;
         }
 
         this.setState({
-            verified: eventSenderTrust.isVerified() ? "verified" : "warning",
+            verified: eventSenderTrust.isVerified() ? E2ESTATE.VERIFIED : E2ESTATE.WARNING,
         }, this.props.onHeightChanged); // Decryption may have caused a change in size
     },
 
@@ -497,9 +503,9 @@ export default createReactClass({
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
         if (ev.isEncrypted()) {
-            if (this.state.verified === "verified") {
+            if (this.state.verified === E2ESTATE.VERIFIED) {
                 return; // no icon for verified
-            } else if (this.state.verified === "unknown") {
+            } else if (this.state.verified === E2ESTATE.UNKNOWN) {
                 return (<E2ePadlockUnknown />);
             } else {
                 return (<E2ePadlockUnverified />);
@@ -630,9 +636,9 @@ export default createReactClass({
             mx_EventTile_last: this.props.last,
             mx_EventTile_contextual: this.props.contextual,
             mx_EventTile_actionBarFocused: this.state.actionBarFocused,
-            mx_EventTile_verified: !isBubbleMessage && this.state.verified === "verified",
-            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === "warning",
-            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === "unknown",
+            mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2ESTATE.VERIFIED,
+            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2ESTATE.WARNING,
+            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2ESTATE.UNKNOWN,
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,

From 26bba4416b35d7219ce34fcffaf03cc3b28e0385 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 10:12:23 +0000
Subject: [PATCH 0508/3235] Fix emoticon space completion for upper case
 emoticons like :D xD

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 94904242c3..73c3d961ee 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -107,8 +107,9 @@ export default class BasicMessageEditor extends React.Component {
         });
         const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text);
         if (emoticonMatch) {
-            const query = emoticonMatch[1].toLowerCase().replace("-", "");
-            const data = EMOTICON_TO_EMOJI.get(query);
+            const query = emoticonMatch[1].replace("-", "");
+            // try both exact match and lower-case, this means that xd won't match xD but :P will match :p
+            const data = EMOTICON_TO_EMOJI.get(query) || EMOTICON_TO_EMOJI.get(query.toLowerCase());
 
             if (data) {
                 const {partCreator} = model;

From 996d0f1d2074ef76e5c2d111569dd888cb01ab00 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 21 Jan 2020 08:05:43 +0000
Subject: [PATCH 0509/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2039 of 2039 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index dbd8319b8a..b459fb9306 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2075,5 +2075,9 @@
     "Something went wrong trying to invite the users.": "在嘗試邀請使用者時發生錯誤。",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "我們無法邀請那些使用者。請檢查您想要邀請的使用者並再試一次。",
     "Recently Direct Messaged": "最近傳送過直接訊息",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "如果您找不到某人，請詢問他們的使用者名稱（範例：@user:server.com）或<a>分享此聊天室</a>。"
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "如果您找不到某人，請詢問他們的使用者名稱（範例：@user:server.com）或<a>分享此聊天室</a>。",
+    "Verify User": "驗證使用者",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "為了提高安全性，請透過檢查您兩個裝置上的一次性代碼來驗證此使用者。",
+    "For maximum security, do this in person.": "為了取得最強的安全性，請親自進行。",
+    "Start Verification": "開始驗證"
 }

From 961f52924e0c84020b55a3ca45e065541933ec0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 21 Jan 2020 10:26:12 +0000
Subject: [PATCH 0510/3235] Translated using Weblate (French)

Currently translated at 100.0% (2039 of 2039 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 d1c4f7379c..abe05e9812 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2075,5 +2075,9 @@
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Le coffre secret sera configuré en utilisant les détails existants de votre sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés.",
     "New Session": "Nouvelle session",
     "Other users may not trust it": "D’autres utilisateurs pourraient ne pas lui faire confiance",
-    "Later": "Plus tard"
+    "Later": "Plus tard",
+    "Verify User": "Vérifier l’utilisateur",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une meilleure sécurité, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
+    "For maximum security, do this in person.": "Pour une sécurité maximale, faites-le en personne.",
+    "Start Verification": "Commencer la vérification"
 }

From 21dea189855ec027cd4bf8a3f1768aca62f83c52 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 20 Jan 2020 20:29:42 +0000
Subject: [PATCH 0511/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2039 of 2039 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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e5b9f637f1..c5334c1592 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1156,7 +1156,7 @@
     "Show avatars in user and room mentions": "Profilkép mutatása a felhasználó és szoba említéseknél",
     "Enable big emoji in chat": "Nagy Emojik engedélyezése a csevegésekben",
     "Send typing notifications": "Gépelés visszajelzés küldése",
-    "Enable Community Filter Panel": "Közösségi szűrő panel engedélyezése",
+    "Enable Community Filter Panel": "Közösségi szűrő panel bekapcsolása",
     "Messages containing my username": "Üzenetek amik a nevemet tartalmazzák",
     "The other party cancelled the verification.": "A másik fél törölte az ellenőrzést.",
     "Verified!": "Ellenőrizve!",
@@ -2076,5 +2076,9 @@
     "Something went wrong trying to invite the users.": "Valami nem sikerült a felhasználók meghívásával.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezeket a felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
     "Recently Direct Messaged": "Nemrég küldött Közvetlen Üzenetek",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>."
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>.",
+    "Verify User": "Felhasználó ellenőrzése",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
+    "For maximum security, do this in person.": "A legnagyobb biztonság érdekében ezt személyesen tedd meg.",
+    "Start Verification": "Ellenőrzés elindítása"
 }

From 46f2c1f29b3a5ec9551b302a29e9aff317f120a5 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Tue, 21 Jan 2020 06:51:42 +0000
Subject: [PATCH 0512/3235] Translated using Weblate (Japanese)

Currently translated at 60.1% (1226 of 2039 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 55cc8782ef..787dcbc4ca 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -601,7 +601,7 @@
     "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 で使用するためにアカウントを認証できるようになります。続行しますか？",
+    "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?": "サードパーティのサイトに移動して、%(integrationsUrl)s で使用するためにアカウントを認証できるようになります。続行しますか？",
     "Removed or unknown message type": "削除されたまたは未知のメッセージタイプ",
     "Message removed by %(userId)s": "%(userId)s によってメッセージが削除されました",
     "Message removed": "メッセージが削除された",
@@ -630,7 +630,7 @@
     "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' を削除できませんでした",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "%(groupId)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": "ルームリストの可視性",
@@ -668,7 +668,7 @@
     "%(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|other": "%(severalUsers)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 は退出しました",

From b5d5f4e13a8291d27479eb01d39e12ab2948ab6f Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Mon, 20 Jan 2020 18:09:12 +0000
Subject: [PATCH 0513/3235] Translated using Weblate (Turkish)

Currently translated at 70.0% (1428 of 2039 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 81f0522922..1e92d28586 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1422,5 +1422,23 @@
     "Enable Community Filter Panel": "Toluluk Filtre Panelini Aç",
     "Match system theme": "Sistem temasıyla eşle",
     "Allow Peer-to-Peer for 1:1 calls": "1:1 çağrılar için eşten-eşe izin ver",
-    "Missing media permissions, click the button below to request.": "Medya izinleri eksik, alttaki butona tıkayarak talep edin."
+    "Missing media permissions, click the button below to request.": "Medya izinleri eksik, alttaki butona tıkayarak talep edin.",
+    "Credits": "Katkıda Bulunanlar",
+    "Clear cache and reload": "Belleği temizle ve yeniden yükle",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Deneysel laboratuar özellikler ile deneyiminizi özelleştirebilirsiniz. <a>Daha fazla</a>.",
+    "Ignored/Blocked": "Yoksayılan/Bloklanan",
+    "Error adding ignored user/server": "Yoksayılan kullanıcı/sunucu eklenirken hata",
+    "Error subscribing to list": "Listeye abone olunurken hata",
+    "Error removing ignored user/server": "Yoksayılan kullanıcı/sunucu silinirken hata",
+    "Error unsubscribing from list": "Listeden abonelikten çıkılırken hata",
+    "You are not subscribed to any lists": "Herhangi bir listeye aboneliğiniz bulunmuyor",
+    "⚠ These settings are meant for advanced users.": "⚠ Bu ayarlar ileri düzey kullanıcılar içindir.",
+    "Unignore": "Yoksayma",
+    "This bridge was provisioned by <user />": "Bu körpü <user /> tarafından provize edildi",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "<networkIcon /> <networkName /> ağındaki <channelIcon /> <channelName /> kanala bağlandı",
+    "Below is a list of bridges connected to this room.": "Bu odaya bağlanmış köprülerin bir listesi alttadır.",
+    "Change room avatar": "Oda resmini değiştir",
+    "Members only (since the point in time of selecting this option)": "Sadece üyeler ( bu seçeneği seçtiğinizden itibaren)",
+    "Unable to revoke sharing for email address": "E-posta adresi paylaşımı kaldırılamadı",
+    "Unable to revoke sharing for phone number": "Telefon numarası paylaşımı kaldırılamıyor"
 }

From 8a00ff7f1f931939746bc150435951fcb6350003 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 21 Jan 2020 11:00:38 +0000
Subject: [PATCH 0514/3235] Change all user info verification checks to
 cross-signing

This fixes some user vs. device verification confusion in user info by changing
all the verification tests to the cross-signing variant when the lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11886
---
 src/components/views/right_panel/UserInfo.js | 25 +++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 5f7de42368..15387af8d5 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -129,18 +129,21 @@ function verifyUser(user) {
 function DeviceItem({userId, device}) {
     const cli = useContext(MatrixClientContext);
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
+    const isVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+        deviceTrust.isCrossSigningVerified() :
+        deviceTrust.isVerified();
 
     const classes = classNames("mx_UserInfo_device", {
-        mx_UserInfo_device_verified: deviceTrust.isVerified(),
-        mx_UserInfo_device_unverified: !deviceTrust.isVerified(),
+        mx_UserInfo_device_verified: isVerified,
+        mx_UserInfo_device_unverified: !isVerified,
     });
     const iconClasses = classNames("mx_E2EIcon", {
-        mx_E2EIcon_verified: deviceTrust.isVerified(),
-        mx_E2EIcon_warning: !deviceTrust.isVerified(),
+        mx_E2EIcon_verified: isVerified,
+        mx_E2EIcon_warning: !isVerified,
     });
 
     const onDeviceClick = () => {
-        if (!deviceTrust.isVerified()) {
+        if (!isVerified) {
             verifyDevice(userId, device);
         }
     };
@@ -148,7 +151,7 @@ function DeviceItem({userId, device}) {
     const deviceName = device.ambiguous ?
             (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" :
             device.getDisplayName();
-    const trustedLabel = deviceTrust.isVerified() ? _t("Trusted") : _t("Not trusted");
+    const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
     return (<AccessibleButton className={classes} onClick={onDeviceClick}>
         <div className={iconClasses} />
         <div className="mx_UserInfo_device_name">{deviceName}</div>
@@ -177,8 +180,11 @@ function DevicesSection({devices, userId, loading}) {
     for (let i = 0; i < devices.length; ++i) {
         const device = devices[i];
         const deviceTrust = deviceTrusts[i];
+        const isVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+            deviceTrust.isCrossSigningVerified() :
+            deviceTrust.isVerified();
 
-        if (deviceTrust.isVerified()) {
+        if (isVerified) {
             verifiedDevices.push(device);
         } else {
             unverifiedDevices.push(device);
@@ -1277,7 +1283,10 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
-    const userVerified = cli.checkUserTrust(user.userId).isVerified();
+    const userTrust = cli.checkUserTrust(user.userId);
+    const userVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+        userTrust.isCrossSigningVerified() :
+        userTrust.isVerified();
     const isMe = user.userId === cli.getUserId();
     let verifyButton;
     if (!userVerified && !isMe) {

From f56a9d246fa91df5b06e781221028243ebeee5d1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 11:13:08 +0000
Subject: [PATCH 0515/3235] Fix index for _insertMention

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

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index c11d940331..e3b794b1d0 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -326,7 +326,8 @@ export default class SendMessageComposer extends React.Component {
             member.rawDisplayName : userId;
         const caret = this._editorRef.getCaret();
         const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
-        const insertIndex = position.index + 1;
+        // index is -1 if there are no parts but we only care for if this would be the part in position 0
+        const insertIndex = position.index > 0 ? position.index : 0;
         const parts = partCreator.createMentionParts(insertIndex, displayName, userId);
         model.transform(() => {
             const addedLen = model.insert(parts, position);

From a7231d73367828e70a2005080ae44c317a579cb0 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 21 Jan 2020 11:33:09 +0000
Subject: [PATCH 0516/3235] New session toast should check cross-signing
 verification

To ensure all your sessions are cross-signing verified, we use the more specific
test for only that kind of verification in the new session toast.
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 9ae6a62ab1..a4c5785db4 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -75,7 +75,7 @@ export default class DeviceListener {
             if (device.deviceId == cli.deviceId) continue;
 
             const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-            if (deviceTrust.isVerified() || this._dismissed.has(device.deviceId)) {
+            if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
                 ToastStore.sharedInstance().dismissToast(toastKey(device));
             } else {
                 ToastStore.sharedInstance().addOrReplaceToast({

From b3d56b378e3e5e959204fc0c1a880fb89b3203b7 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 21 Jan 2020 12:03:46 +0000
Subject: [PATCH 0517/3235] Use cross-signing verification only for own devices

The device verification checks are slightly more nuanced: we want to use
stricter cross-signing checks for your own devices to encourage everyone to
trust their devices via cross-signing so that other users can in turn trust
them.

However, for other users, it's okay to use the looser verification check that
also includes locally verified devices.
---
 src/components/views/right_panel/UserInfo.js | 25 +++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 15387af8d5..a0819be472 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -64,10 +64,17 @@ const _getE2EStatus = (cli, userId, devices) => {
         const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
         return hasUnverifiedDevice ? "warning" : "verified";
     }
+    const isMe = userId === cli.getUserId();
     const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
     const allDevicesVerified = devices.every(device => {
         const { deviceId } = device;
-        return cli.checkDeviceTrust(userId, deviceId).isCrossSigningVerified();
+        // For your own devices, we use the stricter check of cross-signing
+        // verification to encourage everyone to trust their own devices via
+        // cross-signing so that other users can then safely trust you.
+        // For other people's devices, the more general verified check that
+        // includes locally verified devices can be used.
+        const deviceTrust = cli.checkDeviceTrust(userId, deviceId);
+        return isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
     });
     if (allDevicesVerified) {
         return userVerified ? "verified" : "normal";
@@ -128,8 +135,14 @@ function verifyUser(user) {
 
 function DeviceItem({userId, device}) {
     const cli = useContext(MatrixClientContext);
+    const isMe = userId === cli.getUserId();
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
-    const isVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+    // For your own devices, we use the stricter check of cross-signing
+    // verification to encourage everyone to trust their own devices via
+    // cross-signing so that other users can then safely trust you.
+    // For other people's devices, the more general verified check that
+    // includes locally verified devices can be used.
+    const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
         deviceTrust.isCrossSigningVerified() :
         deviceTrust.isVerified();
 
@@ -172,6 +185,7 @@ function DevicesSection({devices, userId, loading}) {
     if (devices === null) {
         return _t("Unable to load device list");
     }
+    const isMe = userId === cli.getUserId();
     const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
 
     const unverifiedDevices = [];
@@ -180,7 +194,12 @@ function DevicesSection({devices, userId, loading}) {
     for (let i = 0; i < devices.length; ++i) {
         const device = devices[i];
         const deviceTrust = deviceTrusts[i];
-        const isVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+        // For your own devices, we use the stricter check of cross-signing
+        // verification to encourage everyone to trust their own devices via
+        // cross-signing so that other users can then safely trust you.
+        // For other people's devices, the more general verified check that
+        // includes locally verified devices can be used.
+        const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
             deviceTrust.isCrossSigningVerified() :
             deviceTrust.isVerified();
 

From 6b85284632fad2d83f38d9f71959e8afcac1a76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 13:20:30 +0100
Subject: [PATCH 0518/3235] EventIndexPanel: Move the bulk of the event index
 info into a modal.

---
 .../dialogs/eventindex/ManageEventIndex.js    | 226 ++++++++++++++++++
 .../views/settings/EventIndexPanel.js         |  93 ++-----
 src/i18n/strings/en_EN.json                   |  25 +-
 3 files changed, 259 insertions(+), 85 deletions(-)
 create mode 100644 src/async-components/views/dialogs/eventindex/ManageEventIndex.js

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
new file mode 100644
index 0000000000..23aa61c33a
--- /dev/null
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -0,0 +1,226 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from '../../../../index';
+import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import PropTypes from 'prop-types';
+import { _t } from '../../../../languageHandler';
+
+import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
+import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
+import Field from "../../../../components/views/elements/Field";
+import {formatBytes} from "../../../../utils/FormattingUtils";
+import EventIndexPeg from "../../../../indexing/EventIndexPeg";
+import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
+
+
+/*
+ * Walks the user through the process of creating an e2e key backup
+ * on the server.
+ */
+export default class ManageEventIndex extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    }
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            eventIndexSize: 0,
+            crawlingRooms: 0,
+            totalCrawlingRooms: 0,
+            eventCount: 0,
+            roomCount: 0,
+            currentRoom: null,
+            eventIndexingEnabled:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
+            crawlerSleepTime:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
+        };
+
+    }
+
+    async updateCurrentRoom(room) {
+        const eventIndex = EventIndexPeg.get();
+        const stats = await eventIndex.getStats();
+        let currentRoom = null;
+
+        if (room) currentRoom = room.name;
+
+        this.setState({
+            eventIndexSize: stats.size,
+            roomCount: stats.roomCount,
+            eventCount: stats.eventCount,
+            currentRoom: currentRoom,
+        });
+    }
+
+    componentWillUnmount(): void {
+        const eventIndex = EventIndexPeg.get();
+
+        if (eventIndex !== null) {
+            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom.bind(this));
+        }
+    }
+
+    async componentWillMount(): void {
+        let eventIndexSize = 0;
+        let roomCount = 0;
+        let eventCount = 0;
+        let crawlingRooms = 0;
+        let totalCrawlingRooms = 0;
+        let currentRoom = null;
+
+        const eventIndex = EventIndexPeg.get();
+
+        if (eventIndex !== null) {
+            eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
+
+            const stats = await eventIndex.getStats();
+            eventIndexSize = stats.size;
+            roomCount = stats.roomCount;
+            eventCount = stats.eventCount;
+
+            const crawledRooms = eventIndex.currentlyCrawledRooms();
+            crawlingRooms = crawledRooms.crawlingRooms.size;
+            totalCrawlingRooms = crawledRooms.totalRooms.size;
+
+            const room = eventIndex.currentRoom();
+            if (room) currentRoom = room.name;
+        }
+
+        this.setState({
+            eventIndexSize,
+            crawlingRooms,
+            totalCrawlingRooms,
+            eventCount,
+            roomCount,
+            currentRoom,
+        });
+    }
+
+    _onEventIndexingEnabledChange = (checked) => {
+        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
+
+        if (checked) EventIndexPeg.start();
+        else EventIndexPeg.stop();
+
+        this.setState({eventIndexingEnabled: checked});
+    }
+
+    _onCrawlerSleepTimeChange = (e) => {
+        this.setState({crawlerSleepTime: e.target.value});
+        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
+    }
+
+    _onDisable = () => {
+        this.props.onFinished(false);
+    }
+
+    _onDone = () => {
+        this.props.onFinished(true);
+    }
+
+    render() {
+        let eventIndexingSettings = null;
+        let crawlerState;
+
+        if (!this.state.eventIndexingEnabled) {
+            crawlerState = <div>{_t("Message search for encrypted rooms is disabled.")}</div>;
+        } else if (this.state.currentRoom === null) {
+            crawlerState = <div>{_t("Not downloading messages for any room.")}</div>;
+        } else {
+            crawlerState = (
+                <div>{_t(
+                    "Downloading mesages for %(currentRoom)s.",
+                    { currentRoom: this.state.currentRoom }
+                )}
+                </div>
+            );
+        }
+
+        if (EventIndexPeg.get() !== null) {
+            eventIndexingSettings = (
+                <div>
+                    {
+                        _t( "Riot is securely caching encrypted messages locally for them " +
+                            "to appear in search results:"
+                        )
+                    }
+                    <div className='mx_SettingsTab_subsectionText'>
+                        {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                        {_t("Indexed messages:")} {this.state.eventCount}<br />
+                        {_t("Number of rooms:")} {this.state.roomCount}<br />
+                        {crawlerState}<br />
+                    </div>
+
+                    <LabelledToggleSwitch
+                        value={this.state.eventIndexingEnabled}
+                        onChange={this._onEventIndexingEnabledChange}
+                        label={_t('Download and index encrypted messages')} />
+
+                    <Field
+                        id={"crawlerSleepTimeMs"}
+                        label={_t('Message downloading sleep time(ms)')}
+                        type='number'
+                        value={this.state.crawlerSleepTime}
+                        onChange={this._onCrawlerSleepTimeChange} />
+                </div>
+            );
+        } else {
+            eventIndexingSettings = (
+                <div>
+                    {
+                        _t( "Riot can't securely cache encrypted messages locally" +
+                            "while running in a web browser. Use Riot Desktop for" +
+                            "encrypted messages to appear in search results."
+                        )
+                    }
+                </div>
+            );
+        }
+
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        let buttons;
+
+        buttons = <div>
+            <div className="mx_Dialog_buttons">
+                <AccessibleButton kind="secondary" onClick={this._onDisable}>
+                    {_t("Disable")}
+                </AccessibleButton>
+                <AccessibleButton kind="primary" onClick={this._onDone}>
+                    {_t("Done")}
+                </AccessibleButton>
+            </div>
+        </div>;
+
+        return (
+            <BaseDialog className='mx_ManageEventIndexDialog'
+                onFinished={() => {}}
+                title={_t("Message search")}
+            >
+            <div>
+                {eventIndexingSettings}
+            </div>
+            <div>
+                {buttons}
+            </div>
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 5b8029a09a..fd3facbc6b 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -21,6 +21,7 @@ import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
+import AccessibleButton from "../elements/AccessibleButton";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import Field from "../elements/Field";
@@ -33,30 +34,17 @@ export default class EventIndexPanel extends React.Component {
 
         this.state = {
             eventIndexSize: 0,
-            crawlingRooms: 0,
-            totalCrawlingRooms: 0,
-            eventCount: 0,
             roomCount: 0,
-            currentRoom: null,
-            eventIndexingEnabled:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
-            crawlerSleepTime:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
     }
 
     async updateCurrentRoom(room) {
         const eventIndex = EventIndexPeg.get();
         const stats = await eventIndex.getStats();
-        let currentRoom = null;
-
-        if (room) currentRoom = room.name;
 
         this.setState({
             eventIndexSize: stats.size,
             roomCount: stats.roomCount,
-            eventCount: stats.eventCount,
-            currentRoom: currentRoom,
         });
     }
 
@@ -71,10 +59,6 @@ export default class EventIndexPanel extends React.Component {
     async componentWillMount(): void {
         let eventIndexSize = 0;
         let roomCount = 0;
-        let eventCount = 0;
-        let crawlingRooms = 0;
-        let totalCrawlingRooms = 0;
-        let currentRoom = null;
 
         const eventIndex = EventIndexPeg.get();
 
@@ -84,84 +68,41 @@ export default class EventIndexPanel extends React.Component {
             const stats = await eventIndex.getStats();
             eventIndexSize = stats.size;
             roomCount = stats.roomCount;
-            eventCount = stats.eventCount;
-
-            const crawledRooms = eventIndex.currentlyCrawledRooms();
-            crawlingRooms = crawledRooms.crawlingRooms.size;
-            totalCrawlingRooms = crawledRooms.totalRooms.size;
-
-            const room = eventIndex.currentRoom();
-            if (room) currentRoom = room.name;
         }
 
         this.setState({
             eventIndexSize,
-            crawlingRooms,
-            totalCrawlingRooms,
-            eventCount,
             roomCount,
-            currentRoom,
         });
     }
 
-    _onEventIndexingEnabledChange = (checked) => {
-        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
+    _onManage = async () => {
+        Modal.createTrackedDialogAsync('Message search', 'Message search',
+            import('../../../async-components/views/dialogs/eventindex/ManageEventIndex'),
+            {
+                onFinished: () => {},
+            }, null, /* priority = */ false, /* static = */ true,
+        );
 
-        if (checked) EventIndexPeg.start();
-        else EventIndexPeg.stop();
-
-        this.setState({eventIndexingEnabled: checked});
-    }
-
-    _onCrawlerSleepTimeChange = (e) => {
-        this.setState({crawlerSleepTime: e.target.value});
-        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
     }
 
     render() {
         let eventIndexingSettings = null;
-        let crawlerState;
-
-        if (!this.state.eventIndexingEnabled) {
-            crawlerState = <div>{_t("Message search for encrypted rooms is disabled.")}</div>;
-        } else if (this.state.currentRoom === null) {
-            crawlerState = <div>{_t("Not downloading messages for any room.")}</div>;
-        } else {
-            crawlerState = (
-                <div>{_t(
-                    "Downloading mesages for %(currentRoom)s.",
-                    { currentRoom: this.state.currentRoom }
-                )}
-                </div>
-            );
-        }
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
                 <div>
-                    {
-                        _t( "Riot is securely caching encrypted messages locally for them" +
-                            "to appear in search results:"
-                        )
-                    }
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                        {_t("Indexed messages:")} {this.state.eventCount}<br />
-                        {_t("Number of rooms:")} {this.state.roomCount}<br />
-                        {crawlerState}<br />
+                        {_t( "Securely cache encrypted messages locally for them " +
+                             "to appear in search results, using ")
+                        } {formatBytes(this.state.eventIndexSize, 0)}
+                        {_t( " to store messages from ")} {this.state.roomCount} {_t("rooms.")}
+                    </div>
+                    <div>
+                        <AccessibleButton kind="primary" onClick={this._onManage}>
+                            {_t("Manage")}
+                        </AccessibleButton>
                     </div>
-
-                    <LabelledToggleSwitch
-                        value={this.state.eventIndexingEnabled}
-                        onChange={this._onEventIndexingEnabledChange}
-                        label={_t('Download and index encrypted messages')} />
-
-                    <Field
-                        id={"crawlerSleepTimeMs"}
-                        label={_t('Message downloading sleep time(ms)')}
-                        type='number'
-                        value={this.state.crawlerSleepTime}
-                        onChange={this._onCrawlerSleepTimeChange} />
                 </div>
             );
         } else {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f78e3594ee..6b1eda0b0c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -554,15 +554,10 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
-    "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
-    "Not downloading messages for any room.": "Not downloading messages for any room.",
-    "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for themto appear in search results:": "Riot is securely caching encrypted messages locally for themto appear in search results:",
-    "Space used:": "Space used:",
-    "Indexed messages:": "Indexed messages:",
-    "Number of rooms:": "Number of rooms:",
-    "Download and index encrypted messages": "Download and index encrypted messages",
-    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Securely cache encrypted messages locally for them to appear in search results, using ",
+    " to store messages from ": " to store messages from ",
+    "rooms.": "rooms.",
+    "Manage": "Manage",
     "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
@@ -2040,6 +2035,18 @@
     "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
+    "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
+    "Not downloading messages for any room.": "Not downloading messages for any room.",
+    "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
+    "Space used:": "Space used:",
+    "Indexed messages:": "Indexed messages:",
+    "Number of rooms:": "Number of rooms:",
+    "Download and index encrypted messages": "Download and index encrypted messages",
+    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
+    "Disable or enable": "Disable or enable",
+    "Disable": "Disable",
+    "Message search": "Message search",
     "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"

From 8e26268079ca83954a78336859b679bb0937b533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 13:38:20 +0100
Subject: [PATCH 0519/3235] SecurityUserSettingsTab: Rename encrypted search
 section.

---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js       | 2 +-
 src/i18n/strings/en_EN.json                                   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 8ef9983efd..7b22dd15e2 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -256,7 +256,7 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         const eventIndex = (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Encrypted search")}</span>
+                <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
                 <EventIndexPanel />
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6b1eda0b0c..b2ac55ba04 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -754,7 +754,7 @@
     "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
     "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
     "Key backup": "Key backup",
-    "Encrypted search": "Encrypted search",
+    "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
     "Devices": "Devices",
@@ -2044,9 +2044,7 @@
     "Number of rooms:": "Number of rooms:",
     "Download and index encrypted messages": "Download and index encrypted messages",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
-    "Disable or enable": "Disable or enable",
     "Disable": "Disable",
-    "Message search": "Message search",
     "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"

From c8a2f6a5a0133a55f324adfcb11fc25af53e6cab Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:33:16 +0000
Subject: [PATCH 0520/3235] Move room header shields over the avatar for the
 room

Currently this is calibrated like the lil' DM icon is
---
 res/css/views/rooms/_RoomHeader.scss     | 6 +++++-
 src/components/views/rooms/RoomHeader.js | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 45b9733faa..0d92247735 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -19,7 +19,10 @@ limitations under the License.
     border-bottom: 1px solid $primary-hairline-color;
 
     .mx_E2EIcon {
-        margin: 0 5px;
+        margin: 0;
+        position: absolute;
+        bottom: 0;
+        right: -5px;
     }
 }
 
@@ -171,6 +174,7 @@ limitations under the License.
     width: 28px;
     height: 28px;
     margin: 0 7px;
+    position: relative;
 }
 
 .mx_RoomHeader_avatar .mx_BaseAvatar_image {
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 09f3fd489f..15f0daa200 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -310,8 +310,7 @@ export default createReactClass({
         return (
             <div className="mx_RoomHeader light-panel">
                 <div className="mx_RoomHeader_wrapper">
-                    <div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
-                    { e2eIcon }
+                    <div className="mx_RoomHeader_avatar">{ roomAvatar }{ e2eIcon }</div>
                     { privateIcon }
                     { name }
                     { topicElement }

From a0599dedf0b39e66c3ee49f4e772e3380667cd10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 15:45:29 +0100
Subject: [PATCH 0521/3235] EventIndex: Use the newly exposed TimelineWindow
 methods.

---
 src/indexing/EventIndex.js | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index cb77d92c27..c081440233 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -494,35 +494,12 @@ export default class EventIndex {
     }
 
     paginateTimelineWindow(room, timelineWindow, direction, limit) {
-        let tl;
-
-        // TODO this is from the js-sdk, this should probably be exposed to
-        // us through the js-sdk.
-        const moveWindowCap = (titmelineWindow, timeline, direction, limit) => {
-            const count = (direction === EventTimeline.BACKWARDS) ?
-            timeline.retreat(limit) : timeline.advance(limit);
-
-            if (count) {
-                timelineWindow._eventCount += count;
-                const excess = timelineWindow._eventCount - timelineWindow._windowLimit;
-
-                if (excess > 0) {
-                    timelineWindow.unpaginate(3, direction !== EventTimeline.BACKWARDS);
-                }
-                return true;
-            }
-
-            return false;
-        };
-
-        // TODO these private fields should be somehow exposed in the js-sdk.
-        if (direction == EventTimeline.BACKWARDS) tl = timelineWindow._start;
-        else if (direction == EventTimeline.FORWARDS) tl = timelineWindow._end;
+        const tl = timelineWindow.getTimelineIndex(direction);
 
         if (!tl) return Promise.resolve(false);
         if (tl.pendingPaginate) return tl.pendingPaginate;
 
-        if (moveWindowCap(timelineWindow, tl, direction, limit)) {
+        if (timelineWindow.extend(direction, limit)) {
             return Promise.resolve(true);
         }
 
@@ -532,8 +509,8 @@ export default class EventIndex {
 
             const ret = await this.populateFileTimeline(timelineSet, timeline.timeline, room, limit, token, direction);
 
-            moveWindowCap(timelineWindow, timeline, direction, limit);
             timeline.pendingPaginate = null;
+            timelineWindow.extend(direction, limit);
 
             return ret;
         };

From 9c0cf326c1992d4d641c46509cd4534504e656d3 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 21 Jan 2020 15:12:59 +0000
Subject: [PATCH 0522/3235] Only show devices and verify actions in E2EE rooms

This changes logic to only show the devices list and verify button in E2EE
rooms, matching the design.

Fixes https://github.com/vector-im/riot-web/issues/11839
---
 src/components/views/right_panel/UserInfo.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index a0819be472..b08f07ace4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1308,15 +1308,18 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         userTrust.isVerified();
     const isMe = user.userId === cli.getUserId();
     let verifyButton;
-    if (!userVerified && !isMe) {
+    if (isRoomEncrypted && !userVerified && !isMe) {
         verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyUser(user)}>
             {_t("Verify")}
         </AccessibleButton>;
     }
 
-    const devicesSection = <DevicesSection
-        loading={devices === undefined}
-        devices={devices} userId={user.userId} />;
+    let devicesSection;
+    if (isRoomEncrypted) {
+        devicesSection = <DevicesSection
+            loading={devices === undefined}
+            devices={devices} userId={user.userId} />;
+    }
 
     const securitySection = (
         <div className="mx_UserInfo_container">

From 790d2c147203ca390804dbfa8ed14120416ab969 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 21 Jan 2020 15:30:01 +0000
Subject: [PATCH 0523/3235] Fix toast icon to prevent clipping

This fixes the bottom and right edges of the toast icon, which were getting
clipped away.

Fixes https://github.com/vector-im/riot-web/issues/11915
---
 res/css/structures/_ToastContainer.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 5634a97c53..5b5c49f357 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -51,8 +51,8 @@ limitations under the License.
         &.mx_Toast_hasIcon {
             &::after {
                 content: "";
-                width: 21px;
-                height: 20px;
+                width: 22px;
+                height: 22px;
                 grid-column: 1;
                 grid-row: 1;
                 mask-size: 100%;

From b2aba6db352027c6f7d5db0256e3483eb5a6aded Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 15:32:32 +0000
Subject: [PATCH 0524/3235] Initial attempt to make toggleInlineFormat
 paragraph-aware

---
 src/editor/deserialize.js      |   2 +-
 src/editor/operations.js       |  70 +++++++++++----
 test/editor/mock.js            |  10 +++
 test/editor/operations-test.js | 154 +++++++++++++++++++++++++++++++++
 test/editor/range-test.js      |  12 +--
 5 files changed, 221 insertions(+), 27 deletions(-)
 create mode 100644 test/editor/operations-test.js

diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js
index 1fdbf9490c..7ba4c3eda3 100644
--- a/src/editor/deserialize.js
+++ b/src/editor/deserialize.js
@@ -250,7 +250,7 @@ function parseHtmlMessage(html, partCreator, isQuotedMessage) {
 }
 
 export function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
-    const lines = body.split("\n");
+    const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n
     const parts = lines.reduce((parts, line, i) => {
         if (isQuotedMessage) {
             parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
diff --git a/src/editor/operations.js b/src/editor/operations.js
index e2661faf59..6bae60e6b8 100644
--- a/src/editor/operations.js
+++ b/src/editor/operations.js
@@ -104,23 +104,63 @@ export function toggleInlineFormat(range, prefix, suffix = prefix) {
     const {model, parts} = range;
     const {partCreator} = model;
 
-    const isFormatted = parts.length &&
-        parts[0].text.startsWith(prefix) &&
-        parts[parts.length - 1].text.endsWith(suffix);
+    // compute paragraph [start, end] indexes
+    const paragraphIndexes = [];
+    let startIndex = 0;
+    // let seenNewlines = 0;
+    for (let i = 2; i < parts.length; i++) {
+        // paragraph breaks can be denoted in a multitude of ways,
+        // - 2 newline parts in sequence
+        // - newline part, plain(<empty or just spaces>), newline part
 
-    if (isFormatted) {
-        // remove prefix and suffix
-        const partWithoutPrefix = parts[0].serialize();
-        partWithoutPrefix.text = partWithoutPrefix.text.substr(prefix.length);
-        parts[0] = partCreator.deserializePart(partWithoutPrefix);
+        const isBlank = part => !part.text || !/\S/.test(part.text);
+        const isNL = part => part.type === "newline";
 
-        const partWithoutSuffix = parts[parts.length - 1].serialize();
-        const suffixPartText = partWithoutSuffix.text;
-        partWithoutSuffix.text = suffixPartText.substring(0, suffixPartText.length - suffix.length);
-        parts[parts.length - 1] = partCreator.deserializePart(partWithoutSuffix);
-    } else {
-        parts.unshift(partCreator.plain(prefix));
-        parts.push(partCreator.plain(suffix));
+        // bump startIndex onto the first non-blank after the paragraph ending
+        if (isBlank(parts[i - 2]) && isNL(parts[i - 1]) && !isNL(parts[i]) && !isBlank(parts[i])) {
+            startIndex = i;
+        }
+
+        if (isNL(parts[i - 1]) && isNL(parts[i])) {
+            paragraphIndexes.push([startIndex, i - 1]);
+            startIndex = i + 1;
+        } else if (isNL(parts[i - 2]) && isBlank(parts[i - 1]) && isNL(parts[i])) {
+            paragraphIndexes.push([startIndex, i - 2]);
+            startIndex = i + 1;
+        }
     }
+    if (startIndex < parts.length) {
+        // TODO don't use parts.length here to clean up any trailing cruft
+        paragraphIndexes.push([startIndex, parts.length]);
+    }
+
+    // keep track of how many things we have inserted as an offset:=0
+    let offset = 0;
+    paragraphIndexes.forEach(([startIndex, endIndex]) => {
+        // for each paragraph apply the same rule
+        const base = startIndex + offset;
+        const index = endIndex + offset;
+
+        const isFormatted = (index - base > 0) &&
+            parts[base].text.startsWith(prefix) &&
+            parts[index - 1].text.endsWith(suffix);
+
+        if (isFormatted) {
+            // remove prefix and suffix
+            const partWithoutPrefix = parts[base].serialize();
+            partWithoutPrefix.text = partWithoutPrefix.text.substr(prefix.length);
+            parts[base] = partCreator.deserializePart(partWithoutPrefix);
+
+            const partWithoutSuffix = parts[index - 1].serialize();
+            const suffixPartText = partWithoutSuffix.text;
+            partWithoutSuffix.text = suffixPartText.substring(0, suffixPartText.length - suffix.length);
+            parts[index - 1] = partCreator.deserializePart(partWithoutSuffix);
+        } else {
+            parts.splice(index, 0, partCreator.plain(suffix)); // splice in the later one first to not change offset
+            parts.splice(base, 0, partCreator.plain(prefix));
+            offset += 2; // offset index to account for the two items we just spliced in
+        }
+    });
+
     replaceRangeAndExpandSelection(range, parts);
 }
diff --git a/test/editor/mock.js b/test/editor/mock.js
index bb1a51d14b..6de65cf23d 100644
--- a/test/editor/mock.js
+++ b/test/editor/mock.js
@@ -67,3 +67,13 @@ export function createPartCreator(completions = []) {
     };
     return new PartCreator(new MockRoom(), new MockClient(), autoCompleteCreator);
 }
+
+export function createRenderer() {
+    const render = (c) => {
+        render.caret = c;
+        render.count += 1;
+    };
+    render.count = 0;
+    render.caret = null;
+    return render;
+}
diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
new file mode 100644
index 0000000000..591166759c
--- /dev/null
+++ b/test/editor/operations-test.js
@@ -0,0 +1,154 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {getLineAndNodePosition} from "../../src/editor/caret";
+import EditorModel from "../../src/editor/model";
+import {createPartCreator, createRenderer} from "./mock";
+import {toggleInlineFormat} from "../../src/editor/operations";
+
+describe('editor/operations: formatting operations', () => {
+    describe('toggleInlineFormat', () => {
+        it('works for words', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world!"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(11, false));  // around "world"
+
+            expect(range.parts[0].text).toBe("world");
+            expect(model.serializeParts()).toEqual([{"text": "hello world!", "type": "plain"}]);
+            toggleInlineFormat(range, "_");
+            expect(model.serializeParts()).toEqual([{"text": "hello _world_!", "type": "plain"}]);
+        });
+
+        it('works for parts of words', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world!"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(7, false),
+                model.positionForOffset(10, false));  // around "orl"
+
+            expect(range.parts[0].text).toBe("orl");
+            expect(model.serializeParts()).toEqual([{"text": "hello world!", "type": "plain"}]);
+            toggleInlineFormat(range, "*");
+            expect(model.serializeParts()).toEqual([{"text": "hello w*orl*d!", "type": "plain"}]);
+        });
+
+        it('works for around pills', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello there "),
+                pc.atRoomPill("@room"),
+                pc.plain(", how are you doing?"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(30, false));  // around "there @room, how are you"
+
+            expect(range.parts.map(p => p.text).join("")).toBe("there @room, how are you");
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello there ", "type": "plain"},
+                {"text": "@room", "type": "at-room-pill"},
+                {"text": ", how are you doing?", "type": "plain"},
+            ]);
+            toggleInlineFormat(range, "_");
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello _there ", "type": "plain"},
+                {"text": "@room", "type": "at-room-pill"},
+                {"text": ", how are you_ doing?", "type": "plain"},
+            ]);
+        });
+
+        it('works for a paragraph', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(6, false),
+                model.positionForOffset(16, false));  // around "world,\nhow"
+
+            expect(range.parts.map(p => p.text).join("")).toBe("world,\nhow");
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello world,", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "how are you doing?", "type": "plain"},
+            ]);
+            toggleInlineFormat(range, "**");
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello **world,", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "how** are you doing?", "type": "plain"},
+            ]);
+        });
+
+        it('works for multiple paragraph', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+                pc.newline(),
+                pc.newline(),
+                pc.plain("new paragraph"),
+            ], pc, renderer);
+
+            let range = model.startRange(model.positionForOffset(0, true),
+                model.getPositionAtEnd()); // select-all
+
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello world,", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "how are you doing?", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "\n", "type": "newline"},
+                {"text": "new paragraph", "type": "plain"},
+            ]);
+            toggleInlineFormat(range, "__");
+            expect(model.serializeParts()).toEqual([
+                {"text": "__hello world,", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "how are you doing?__", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "\n", "type": "newline"},
+                {"text": "__new paragraph__", "type": "plain"},
+            ]);
+            range = model.startRange(model.positionForOffset(0, true),
+                model.getPositionAtEnd()); // select-all
+            console.log("RANGE", range.parts);
+            toggleInlineFormat(range, "__");
+            expect(model.serializeParts()).toEqual([
+                {"text": "hello world,", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "how are you doing?", "type": "plain"},
+                {"text": "\n", "type": "newline"},
+                {"text": "\n", "type": "newline"},
+                {"text": "new paragraph", "type": "plain"},
+            ]);
+        });
+    });
+});
diff --git a/test/editor/range-test.js b/test/editor/range-test.js
index 53fb6cb765..b69ed9eb53 100644
--- a/test/editor/range-test.js
+++ b/test/editor/range-test.js
@@ -15,17 +15,7 @@ limitations under the License.
 */
 
 import EditorModel from "../../src/editor/model";
-import {createPartCreator} from "./mock";
-
-function createRenderer() {
-    const render = (c) => {
-        render.caret = c;
-        render.count += 1;
-    };
-    render.count = 0;
-    render.caret = null;
-    return render;
-}
+import {createPartCreator, createRenderer} from "./mock";
 
 const pillChannel = "#riot-dev:matrix.org";
 

From 9a530a72f6d27dd67d338533fe3823c880d7ff77 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 15:36:25 +0000
Subject: [PATCH 0525/3235] delint

---
 test/editor/operations-test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
index 591166759c..872cc78bdb 100644
--- a/test/editor/operations-test.js
+++ b/test/editor/operations-test.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {getLineAndNodePosition} from "../../src/editor/caret";
 import EditorModel from "../../src/editor/model";
 import {createPartCreator, createRenderer} from "./mock";
 import {toggleInlineFormat} from "../../src/editor/operations";

From a2892f5b02a8998a7d19985b59f65d246d99c99f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 16:40:32 +0100
Subject: [PATCH 0526/3235] EventIndex: Fix some lint issues.

---
 src/components/views/settings/EventIndexPanel.js         | 9 +--------
 .../settings/tabs/user/PreferencesUserSettingsTab.js     | 1 -
 src/indexing/EventIndex.js                               | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index fd3facbc6b..8ed4b114e7 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -15,16 +15,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
 
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import Field from "../elements/Field";
 import {formatBytes} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 
@@ -83,7 +77,6 @@ export default class EventIndexPanel extends React.Component {
                 onFinished: () => {},
             }, null, /* priority = */ false, /* static = */ true,
         );
-
     }
 
     render() {
@@ -111,7 +104,7 @@ export default class EventIndexPanel extends React.Component {
                     {
                         _t( "Riot can't securely cache encrypted messages locally" +
                             "while running in a web browser. Use Riot Desktop for" +
-                            "encrypted messages to appear in search results."
+                            "encrypted messages to appear in search results.",
                         )
                     }
                 </div>
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 8cbaba037d..bd1b7c2ca4 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,7 +23,6 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
-import {formatBytes} from "../../../../../utils/FormattingUtils";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static COMPOSER_SETTINGS = [
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 5676636eed..435f67447d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -470,8 +470,8 @@ export default class EventIndex {
     /**
      * Get the room that we are currently crawling.
      *
-     * @returns A MatrixRoom that is being currently crawled, null if no room is
-     * currently being crawled.
+     * @returns {Room} A MatrixRoom that is being currently crawled, null
+     * if no room is currently being crawled.
      */
     currentRoom() {
         if (this._currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {

From b5e902e1f2f8f3a00fea93adeb7985db3ba13b23 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 15:55:21 +0000
Subject: [PATCH 0527/3235] Fix escaping commands using double-slash //, e.g
 //plain sends `/plain`

---
 src/components/views/rooms/SendMessageComposer.js |  9 +++++++--
 src/editor/serialize.js                           | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index c11d940331..c4ae2929af 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -24,6 +24,8 @@ import {
     containsEmote,
     stripEmoteCommand,
     unescapeMessage,
+    startsWith,
+    stripPrefix,
 } from '../../../editor/serialize';
 import {CommandPartCreator} from '../../../editor/parts';
 import BasicMessageComposer from "./BasicMessageComposer";
@@ -61,6 +63,9 @@ function createMessageContent(model, permalinkCreator) {
     if (isEmote) {
         model = stripEmoteCommand(model);
     }
+    if (startsWith(model, "//")) {
+        model = stripPrefix(model, "/");
+    }
     model = unescapeMessage(model);
     const repliedToEvent = RoomViewStore.getQuotingEvent();
 
@@ -175,13 +180,13 @@ export default class SendMessageComposer extends React.Component {
         const parts = this.model.parts;
         const firstPart = parts[0];
         if (firstPart) {
-            if (firstPart.type === "command") {
+            if (firstPart.type === "command" && !firstPart.text.startsWith("//")) {
                 return true;
             }
             // be extra resilient when somehow the AutocompleteWrapperModel or
             // CommandPartCreator fails to insert a command part, so we don't send
             // a command as a message
-            if (firstPart.text.startsWith("/") && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
+            if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//") && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
                 return true;
             }
         }
diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index a55eed97da..ba380f2809 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -61,18 +61,26 @@ export function textSerialize(model) {
 }
 
 export function containsEmote(model) {
+    return startsWith(model, "/me ");
+}
+
+export function startsWith(model, prefix) {
     const firstPart = model.parts[0];
     // part type will be "plain" while editing,
     // and "command" while composing a message.
     return firstPart &&
         (firstPart.type === "plain" || firstPart.type === "command") &&
-        firstPart.text.startsWith("/me ");
+        firstPart.text.startsWith(prefix);
 }
 
 export function stripEmoteCommand(model) {
     // trim "/me "
+    return stripPrefix(model, "/me ");
+}
+
+export function stripPrefix(model, prefix) {
     model = model.clone();
-    model.removeText({index: 0, offset: 0}, 4);
+    model.removeText({index: 0, offset: 0}, prefix.length);
     return model;
 }
 

From 47ea453abfbd6ac5ce7f4e474d84eb7c8a3d4083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 21 Jan 2020 16:58:41 +0100
Subject: [PATCH 0528/3235] ManageEventIndex: Fix a couple of lint issues.

---
 .../views/dialogs/eventindex/ManageEventIndex.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 23aa61c33a..8623856b2e 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../../index';
-import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
@@ -52,7 +51,6 @@ export default class ManageEventIndex extends React.Component {
             crawlerSleepTime:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
-
     }
 
     async updateCurrentRoom(room) {
@@ -146,10 +144,8 @@ export default class ManageEventIndex extends React.Component {
             crawlerState = <div>{_t("Not downloading messages for any room.")}</div>;
         } else {
             crawlerState = (
-                <div>{_t(
-                    "Downloading mesages for %(currentRoom)s.",
-                    { currentRoom: this.state.currentRoom }
-                )}
+                <div>
+                    {_t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })}
                 </div>
             );
         }
@@ -159,7 +155,7 @@ export default class ManageEventIndex extends React.Component {
                 <div>
                     {
                         _t( "Riot is securely caching encrypted messages locally for them " +
-                            "to appear in search results:"
+                            "to appear in search results:",
                         )
                     }
                     <div className='mx_SettingsTab_subsectionText'>
@@ -188,7 +184,7 @@ export default class ManageEventIndex extends React.Component {
                     {
                         _t( "Riot can't securely cache encrypted messages locally" +
                             "while running in a web browser. Use Riot Desktop for" +
-                            "encrypted messages to appear in search results."
+                            "encrypted messages to appear in search results.",
                         )
                     }
                 </div>
@@ -196,9 +192,7 @@ export default class ManageEventIndex extends React.Component {
         }
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        let buttons;
-
-        buttons = <div>
+        const buttons = <div>
             <div className="mx_Dialog_buttons">
                 <AccessibleButton kind="secondary" onClick={this._onDisable}>
                     {_t("Disable")}

From 060938379a7183f7959aa4af436eef775ce6c9d3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 15:58:51 +0000
Subject: [PATCH 0529/3235] Fix changes after typing / at pos=0 allowing to
 cancel command

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

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index c4ae2929af..8de105d84d 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -180,13 +180,14 @@ export default class SendMessageComposer extends React.Component {
         const parts = this.model.parts;
         const firstPart = parts[0];
         if (firstPart) {
-            if (firstPart.type === "command" && !firstPart.text.startsWith("//")) {
+            if (firstPart.type === "command" && firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")) {
                 return true;
             }
             // be extra resilient when somehow the AutocompleteWrapperModel or
             // CommandPartCreator fails to insert a command part, so we don't send
             // a command as a message
-            if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//") && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
+            if (firstPart.text.startsWith("/") && firstPart.text.startsWith("//") && !firstPart.text.startsWith("//")
+                && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
                 return true;
             }
         }

From ccd3234873184393ac5afe4abbe3494461f87ac6 Mon Sep 17 00:00:00 2001
From: Christopher <kurekc@hotmail.com>
Date: Tue, 21 Jan 2020 16:13:14 +0000
Subject: [PATCH 0530/3235] Moved read receipts to the bottom of the EventTile.

---
 res/css/views/rooms/_EventTile.scss     | 17 +----------------
 src/components/views/rooms/EventTile.js |  6 +++---
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index fbac1e932a..0b5c4a48a6 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -289,17 +289,11 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     display: inline-block;
     width: 14px;
     height: 14px;
-    top: 29px;
+    top: -19px;
     user-select: none;
     z-index: 1;
 }
 
-.mx_EventTile_continuation .mx_EventTile_readAvatars,
-.mx_EventTile_info .mx_EventTile_readAvatars,
-.mx_EventTile_emote .mx_EventTile_readAvatars {
-    top: 7px;
-}
-
 .mx_EventTile_readAvatars .mx_BaseAvatar {
     position: absolute;
     display: inline-block;
@@ -621,15 +615,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
         top: 27px;
     }
 
-    .mx_EventTile_continuation .mx_EventTile_readAvatars,
-    .mx_EventTile_emote .mx_EventTile_readAvatars {
-        top: 5px;
-    }
-
-    .mx_EventTile_info .mx_EventTile_readAvatars {
-        top: 4px;
-    }
-
     .mx_RoomView_MessageList h2 {
         margin-top: 6px;
     }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index dce4dc8a93..8ee51a9377 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -820,9 +820,6 @@ export default createReactClass({
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
                     <div className={classes} tabIndex={-1}>
-                        <div className="mx_EventTile_msgOption">
-                            { readAvatars }
-                        </div>
                         { sender }
                         <div className="mx_EventTile_line">
                             <a
@@ -846,6 +843,9 @@ export default createReactClass({
                             { reactionsRow }
                             { actionBar }
                         </div>
+                        <div className="mx_EventTile_msgOption">
+                            { readAvatars }
+                        </div>
                         {
                             // The avatar goes after the event tile as it's absolutely positioned to be over the
                             // event tile line, so needs to be later in the DOM so it appears on top (this avoids

From b34fe45518fbfff23f92a860a7af653fc383180b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 16:50:04 +0000
Subject: [PATCH 0531/3235] First attempt. Has a lag issue due to the
 async-clear :(

---
 src/SlashCommands.js                          | 13 +++----
 .../views/rooms/SendMessageComposer.js        | 39 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  4 +-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 20b8ba76da..414dd60121 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -81,6 +81,8 @@ class Command {
     }
 
     run(roomId, args) {
+        // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
+        if (!this.runFn) return;
         return this.runFn.bind(this)(roomId, args);
     }
 
@@ -918,12 +920,12 @@ export function processCommandInput(roomId, input) {
     input = input.replace(/\s+$/, '');
     if (input[0] !== '/') return null; // not a command
 
-    const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
+    const bits = input.match(/^(\S+?)(?: +((.|\n)*))?$/);
     let cmd;
     let args;
     if (bits) {
         cmd = bits[1].substring(1).toLowerCase();
-        args = bits[3];
+        args = bits[2];
     } else {
         cmd = input;
     }
@@ -932,11 +934,8 @@ export function processCommandInput(roomId, input) {
         cmd = aliases[cmd];
     }
     if (CommandMap[cmd]) {
-        // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
-        if (!CommandMap[cmd].runFn) return null;
-
         return CommandMap[cmd].run(roomId, args);
-    } else {
-        return reject(_t('Unrecognised command:') + ' ' + input);
     }
+    return null;
+    // return reject(_t('Unrecognised command:') + ' ' + input);
 }
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 8de105d84d..9f3a407402 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -43,6 +43,9 @@ import ContentMessages from '../../../ContentMessages';
 import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
+const SEND_ANYWAY = Symbol("send-anyway");
+const UNKNOWN_CMD = Symbol("unknown-cmd");
+
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
     Object.assign(content, replyContent);
@@ -194,7 +197,12 @@ export default class SendMessageComposer extends React.Component {
         return false;
     }
 
-    async _runSlashCommand() {
+    /**
+     * Parses and executes current input as a Slash Command
+     * @returns {Promise<Symbol|void>} UNKNOWN_CMD if the command is not known,
+     *  SEND_ANYWAY if the input should be sent as message instead
+     */
+    async _tryRunSlashCommand() {
         const commandText = this.model.parts.reduce((text, part) => {
             // use mxid to textify user pills in a command
             if (part.type === "user-pill") {
@@ -236,16 +244,38 @@ export default class SendMessageComposer extends React.Component {
             } else {
                 console.log("Command success.");
             }
+        } else {
+            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+            // unknown command, ask the user if they meant to send it as a message
+            const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
+                title: _t("Unknown Command"),
+                description: _t("Unrecognised command: ") + commandText,
+                button: _t('Send as message'),
+                danger: true,
+            });
+            const [sendAnyway] = await finished;
+            return sendAnyway ? SEND_ANYWAY : UNKNOWN_CMD;
         }
     }
 
-    _sendMessage() {
+    async _sendMessage() {
         if (this.model.isEmpty) {
             return;
         }
+
+        let shouldSend = true;
+
         if (!containsEmote(this.model) && this._isSlashCommand()) {
-            this._runSlashCommand();
-        } else {
+            const resp = await this._tryRunSlashCommand();
+            if (resp === UNKNOWN_CMD) {
+                // unknown command, bail to let the user modify it
+                return;
+            }
+
+            shouldSend = resp === SEND_ANYWAY;
+        }
+
+        if (shouldSend) {
             const isReply = !!RoomViewStore.getQuotingEvent();
             const {roomId} = this.props.room;
             const content = createMessageContent(this.model, this.props.permalinkCreator);
@@ -259,6 +289,7 @@ export default class SendMessageComposer extends React.Component {
                 });
             }
         }
+
         this.sendHistoryManager.save(this.model);
         // clear composer
         this.model.reset([]);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f0eab6b12d..314731a910 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -200,7 +200,6 @@
     "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
     "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
     "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
-    "Unrecognised command:": "Unrecognised command:",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
@@ -1077,6 +1076,9 @@
     "Server error": "Server error",
     "Command error": "Command error",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
+    "Unknown Command": "Unknown Command",
+    "Unrecognised command: ": "Unrecognised command: ",
+    "Send as message": "Send as message",
     "Failed to connect to integration manager": "Failed to connect to integration manager",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Add some now": "Add some now",

From 9f7df33bc30acaceaa7d1f9d100fbf2de153d8d3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 16:57:07 +0000
Subject: [PATCH 0532/3235] re-arrange to split the async task into two and
 only wait on the user-blocking one

---
 src/SlashCommands.js                          |  10 +-
 .../views/rooms/SendMessageComposer.js        | 100 +++++++++---------
 2 files changed, 52 insertions(+), 58 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 414dd60121..2eb34576ac 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -907,14 +907,14 @@ const aliases = {
 
 
 /**
- * Process the given text for /commands and perform them.
+ * Process the given text for /commands and return a bound method to perform them.
  * @param {string} roomId The room in which the command was performed.
  * @param {string} input The raw text input by the user.
- * @return {Object|null} An object with the property 'error' if there was an error
+ * @return {null|function(): Object} Function returning an object with the property 'error' if there was an error
  * processing the command, or 'promise' if a request was sent out.
  * Returns null if the input didn't match a command.
  */
-export function processCommandInput(roomId, input) {
+export function getCommand(roomId, input) {
     // trim any trailing whitespace, as it can confuse the parser for
     // IRC-style commands
     input = input.replace(/\s+$/, '');
@@ -934,8 +934,6 @@ export function processCommandInput(roomId, input) {
         cmd = aliases[cmd];
     }
     if (CommandMap[cmd]) {
-        return CommandMap[cmd].run(roomId, args);
+        return () => CommandMap[cmd].run(roomId, args);
     }
-    return null;
-    // return reject(_t('Unrecognised command:') + ' ' + input);
 }
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 9f3a407402..994c28f531 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -35,7 +35,7 @@ import ReplyThread from "../elements/ReplyThread";
 import {parseEvent} from '../../../editor/deserialize';
 import {findEditableEvent} from '../../../utils/EventUtils';
 import SendHistoryManager from "../../../SendHistoryManager";
-import {processCommandInput} from '../../../SlashCommands';
+import {getCommand} from '../../../SlashCommands';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
@@ -197,12 +197,7 @@ export default class SendMessageComposer extends React.Component {
         return false;
     }
 
-    /**
-     * Parses and executes current input as a Slash Command
-     * @returns {Promise<Symbol|void>} UNKNOWN_CMD if the command is not known,
-     *  SEND_ANYWAY if the input should be sent as message instead
-     */
-    async _tryRunSlashCommand() {
+    _getSlashCommand() {
         const commandText = this.model.parts.reduce((text, part) => {
             // use mxid to textify user pills in a command
             if (part.type === "user-pill") {
@@ -210,51 +205,41 @@ export default class SendMessageComposer extends React.Component {
             }
             return text + part.text;
         }, "");
-        const cmd = processCommandInput(this.props.room.roomId, commandText);
+        return [getCommand(this.props.room.roomId, commandText), commandText];
+    }
 
-        if (cmd) {
-            let error = cmd.error;
-            if (cmd.promise) {
-                try {
-                    await cmd.promise;
-                } catch (err) {
-                    error = err;
-                }
+    async _runSlashCommand(fn) {
+        const cmd = fn();
+        let error = cmd.error;
+        if (cmd.promise) {
+            try {
+                await cmd.promise;
+            } catch (err) {
+                error = err;
             }
-            if (error) {
-                console.error("Command failure: %s", error);
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                // assume the error is a server error when the command is async
-                const isServerError = !!cmd.promise;
-                const title = isServerError ? _td("Server error") : _td("Command error");
+        }
+        if (error) {
+            console.error("Command failure: %s", error);
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            // assume the error is a server error when the command is async
+            const isServerError = !!cmd.promise;
+            const title = isServerError ? _td("Server error") : _td("Command error");
 
-                let errText;
-                if (typeof error === 'string') {
-                    errText = error;
-                } else if (error.message) {
-                    errText = error.message;
-                } else {
-                    errText = _t("Server unavailable, overloaded, or something else went wrong.");
-                }
-
-                Modal.createTrackedDialog(title, '', ErrorDialog, {
-                    title: _t(title),
-                    description: errText,
-                });
+            let errText;
+            if (typeof error === 'string') {
+                errText = error;
+            } else if (error.message) {
+                errText = error.message;
             } else {
-                console.log("Command success.");
+                errText = _t("Server unavailable, overloaded, or something else went wrong.");
             }
-        } else {
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            // unknown command, ask the user if they meant to send it as a message
-            const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
-                title: _t("Unknown Command"),
-                description: _t("Unrecognised command: ") + commandText,
-                button: _t('Send as message'),
-                danger: true,
+
+            Modal.createTrackedDialog(title, '', ErrorDialog, {
+                title: _t(title),
+                description: errText,
             });
-            const [sendAnyway] = await finished;
-            return sendAnyway ? SEND_ANYWAY : UNKNOWN_CMD;
+        } else {
+            console.log("Command success.");
         }
     }
 
@@ -266,13 +251,24 @@ export default class SendMessageComposer extends React.Component {
         let shouldSend = true;
 
         if (!containsEmote(this.model) && this._isSlashCommand()) {
-            const resp = await this._tryRunSlashCommand();
-            if (resp === UNKNOWN_CMD) {
-                // unknown command, bail to let the user modify it
-                return;
+            const [cmd, commandText] = this._getSlashCommand();
+            if (cmd) {
+                shouldSend = false;
+                this._runSlashCommand(cmd);
+            } else {
+                // ask the user if their unknown command should be sent as a message instead
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                // unknown command, ask the user if they meant to send it as a message
+                const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
+                    title: _t("Unknown Command"),
+                    description: _t("Unrecognised command: ") + commandText,
+                    button: _t('Send as message'),
+                    danger: true,
+                });
+                const [sendAnyway] = await finished;
+                // if !sendAnyway bail to let the user edit the composer and try again
+                if (!sendAnyway) return;
             }
-
-            shouldSend = resp === SEND_ANYWAY;
         }
 
         if (shouldSend) {

From 2480f709b31f9f05270430bf73235c904f029b2c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 21 Jan 2020 17:19:10 +0000
Subject: [PATCH 0533/3235] E2ESTATE -> E2E_STATE

---
 src/components/views/rooms/EventTile.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9c73daaa50..bcd32d2c9c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -66,7 +66,7 @@ const stateEventTileTypes = {
     'm.room.related_groups': 'messages.TextualEvent',
 };
 
-const E2ESTATE = {
+const E2E_STATE = {
     VERIFIED: "verified",
     WARNING: "warning",
     UNKNOWN: "unknown",
@@ -305,7 +305,7 @@ export default createReactClass({
         const verified = await this.context.isEventSenderVerified(mxEvent);
         if (verified) {
             this.setState({
-                verified: E2ESTATE.VERIFIED,
+                verified: E2E_STATE.VERIFIED,
             }, () => {
                 // Decryption may have caused a change in size
                 this.props.onHeightChanged();
@@ -316,13 +316,13 @@ export default createReactClass({
         const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
         if (!eventSenderTrust) {
             this.setState({
-                verified: E2ESTATE.UNKNOWN,
+                verified: E2E_STATE.UNKNOWN,
             }, this.props.onHeightChanged); // Decryption may have cause a change in size
             return;
         }
 
         this.setState({
-            verified: eventSenderTrust.isVerified() ? E2ESTATE.VERIFIED : E2ESTATE.WARNING,
+            verified: eventSenderTrust.isVerified() ? E2E_STATE.VERIFIED : E2E_STATE.WARNING,
         }, this.props.onHeightChanged); // Decryption may have caused a change in size
     },
 
@@ -503,9 +503,9 @@ export default createReactClass({
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
         if (ev.isEncrypted()) {
-            if (this.state.verified === E2ESTATE.VERIFIED) {
+            if (this.state.verified === E2E_STATE.VERIFIED) {
                 return; // no icon for verified
-            } else if (this.state.verified === E2ESTATE.UNKNOWN) {
+            } else if (this.state.verified === E2E_STATE.UNKNOWN) {
                 return (<E2ePadlockUnknown />);
             } else {
                 return (<E2ePadlockUnverified />);
@@ -636,9 +636,9 @@ export default createReactClass({
             mx_EventTile_last: this.props.last,
             mx_EventTile_contextual: this.props.contextual,
             mx_EventTile_actionBarFocused: this.state.actionBarFocused,
-            mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2ESTATE.VERIFIED,
-            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2ESTATE.WARNING,
-            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2ESTATE.UNKNOWN,
+            mx_EventTile_verified: !isBubbleMessage && this.state.verified === E2E_STATE.VERIFIED,
+            mx_EventTile_unverified: !isBubbleMessage && this.state.verified === E2E_STATE.WARNING,
+            mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2E_STATE.UNKNOWN,
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,

From 931c0885de5db562d24a5c3fc451a4296fbaf69f Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 21 Jan 2020 17:06:26 +0000
Subject: [PATCH 0534/3235] Translated using Weblate (Turkish)

Currently translated at 70.7% (1440 of 2038 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 1e92d28586..5d83ff5b06 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1440,5 +1440,17 @@
     "Change room avatar": "Oda resmini değiştir",
     "Members only (since the point in time of selecting this option)": "Sadece üyeler ( bu seçeneği seçtiğinizden itibaren)",
     "Unable to revoke sharing for email address": "E-posta adresi paylaşımı kaldırılamadı",
-    "Unable to revoke sharing for phone number": "Telefon numarası paylaşımı kaldırılamıyor"
+    "Unable to revoke sharing for phone number": "Telefon numarası paylaşımı kaldırılamıyor",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Bu sayfadaki oda, kullanıcı veya grup ID si gibi betimleyici bilgiler sunucuya gönderilmeden önce silindi.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Çağrıların sağlıklı bir şekide yapılabilmesi için lütfen anasunucunuzun (<code>%(homeserverDomain)s</code>) yöneticisinden bir TURN sunucusu yapılandırmasını isteyin.",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s kullanıcıları isimlerini %(count)s kez değiştirdiler",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s ismini %(count)s kez değiştirdi",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s değişiklik yapmadı",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s kez değişiklik yapmadı",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s değişiklik yapmadı",
+    "Room alias": "Oda lakabı",
+    "Please provide a room alias": "Lütfen bir oda lakabı belirtin",
+    "This alias is available to use": "Bu lakap kullanmaya uygun",
+    "This alias is already in use": "Bu lakap zaten kullanımda",
+    "And %(count)s more...|other": "ve %(count)s kez daha..."
 }

From 33220c2d7230c999b0f65158a66affdd87e756a1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 21 Jan 2020 10:53:17 -0700
Subject: [PATCH 0535/3235] Ensure generated files are present for riot-web
 tests

---
 scripts/ci/riot-unit-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/riot-unit-tests.sh b/scripts/ci/riot-unit-tests.sh
index 7a9ed77793..337c0fe6c3 100755
--- a/scripts/ci/riot-unit-tests.sh
+++ b/scripts/ci/riot-unit-tests.sh
@@ -8,4 +8,5 @@ set -ev
 
 scripts/ci/layered-riot-web.sh
 cd ../riot-web
+yarn build:genfiles # so the tests can run. Faster version of `build`
 yarn test

From a8df058ea6f7e55e2b8f1bbddc171a46777febe8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 17:54:27 +0000
Subject: [PATCH 0536/3235] tidy up, improve wording on modal

---
 .../views/rooms/SendMessageComposer.js        | 23 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  4 +++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 994c28f531..7870699fec 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -43,9 +43,6 @@ import ContentMessages from '../../../ContentMessages';
 import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
-const SEND_ANYWAY = Symbol("send-anyway");
-const UNKNOWN_CMD = Symbol("unknown-cmd");
-
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
     Object.assign(content, replyContent);
@@ -256,14 +253,26 @@ export default class SendMessageComposer extends React.Component {
                 shouldSend = false;
                 this._runSlashCommand(cmd);
             } else {
-                // ask the user if their unknown command should be sent as a message instead
+                // ask the user if their unknown command should be sent as a message
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                // unknown command, ask the user if they meant to send it as a message
                 const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
                     title: _t("Unknown Command"),
-                    description: _t("Unrecognised command: ") + commandText,
+                    description: <div>
+                        <p>
+                            { _t("Unrecognised command: %(commandText)s", {commandText}) }
+                        </p>
+                        <p>
+                            { _t("You can use <code>/help</code> to list available commands. Did you mean to send this as a message?", {}, {
+                                code: t => <code>{ t }</code>,
+                            }) }
+                        </p>
+                        <p>
+                            { _t("Protip: Begin your message with <code>//</code> to start it with a slash.", {}, {
+                                code: t => <code>{ t }</code>,
+                            }) }
+                        </p>
+                    </div>,
                     button: _t('Send as message'),
-                    danger: true,
                 });
                 const [sendAnyway] = await finished;
                 // if !sendAnyway bail to let the user edit the composer and try again
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 314731a910..da4111aec8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1077,7 +1077,9 @@
     "Command error": "Command error",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Unknown Command": "Unknown Command",
-    "Unrecognised command: ": "Unrecognised command: ",
+    "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?",
+    "Protip: Begin your message with <code>//</code> to start it with a slash.": "Protip: Begin your message with <code>//</code> to start it with a slash.",
     "Send as message": "Send as message",
     "Failed to connect to integration manager": "Failed to connect to integration manager",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",

From e455aa474d652c1f66228ea4e2e2f8b69f2a796b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 17:58:53 +0000
Subject: [PATCH 0537/3235] improve copy further

---
 src/components/views/rooms/SendMessageComposer.js | 2 +-
 src/i18n/strings/en_EN.json                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 7870699fec..4402a034f6 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -267,7 +267,7 @@ export default class SendMessageComposer extends React.Component {
                             }) }
                         </p>
                         <p>
-                            { _t("Protip: Begin your message with <code>//</code> to start it with a slash.", {}, {
+                            { _t("Hint: Begin your message with <code>//</code> to start it with a slash.", {}, {
                                 code: t => <code>{ t }</code>,
                             }) }
                         </p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index da4111aec8..a3c56e5973 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1079,7 +1079,7 @@
     "Unknown Command": "Unknown Command",
     "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?",
-    "Protip: Begin your message with <code>//</code> to start it with a slash.": "Protip: Begin your message with <code>//</code> to start it with a slash.",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hint: Begin your message with <code>//</code> to start it with a slash.",
     "Send as message": "Send as message",
     "Failed to connect to integration manager": "Failed to connect to integration manager",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",

From 708f62784fbf7c46e2105e255faa28f6d1fd5879 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 21 Jan 2020 10:59:33 -0700
Subject: [PATCH 0538/3235] Consistency

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 scripts/fetchdep.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index f477fd08b8..0142305797 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -17,7 +17,7 @@ clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone git://github.com/$org/$repo.git $repo --branch "$branch" --depth=1 && exit 0
+        git clone git://github.com/$org/$repo.git $repo --branch "$branch" --depth 1 && exit 0
     fi
 }
 

From 7b26067397e5bc1870c725968778bde83c6b0b34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Jan 2020 18:03:01 +0000
Subject: [PATCH 0539/3235] delint

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

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 4402a034f6..c4970c4570 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -262,7 +262,8 @@ export default class SendMessageComposer extends React.Component {
                             { _t("Unrecognised command: %(commandText)s", {commandText}) }
                         </p>
                         <p>
-                            { _t("You can use <code>/help</code> to list available commands. Did you mean to send this as a message?", {}, {
+                            { _t("You can use <code>/help</code> to list available commands. " +
+                                "Did you mean to send this as a message?", {}, {
                                 code: t => <code>{ t }</code>,
                             }) }
                         </p>

From b2fc4a1c4de9251284c392c3d1efe3ae06fd222c Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 21 Jan 2020 18:41:43 +0000
Subject: [PATCH 0540/3235] Style bridge settings tab according to design

Signed-off-by: Half-Shot <will@half-shot.uk>
---
 .../views/dialogs/_RoomSettingsDialog.scss    |  58 ++++++-
 .../views/dialogs/RoomSettingsDialog.js       |   7 +-
 .../settings/tabs/room/BridgeSettingsTab.js   | 156 ++++++++++--------
 src/i18n/strings/en_EN.json                   |  11 +-
 4 files changed, 144 insertions(+), 88 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index aa66e97f9e..0e8deb018e 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -63,9 +63,59 @@ limitations under the License.
 .mx_RoomSettingsDialog_BridgeList li {
     list-style-type: none;
     padding: 5px;
-    margin-bottom: 5px;
-    border-width: 1px 0px;
-    border-color: #dee1f3;
-    border-style: solid;
+    margin-bottom: 8px;
+    border-width: 1px 1px;
+    border-color: $primary-hairline-color;
+    border-radius: 5px;
+
+    .protocol-icon {
+        float: left;
+        margin-right: 30px;
+        img {
+            border-radius: 5px;
+            border-width: 1px 1px;
+            border-color: $primary-hairline-color;
+            border-style: solid;
+        }
+        span {
+            /* Correct letter placement */
+            left: auto;
+        }
+    }
+
+    h3 {
+        margin-top: 0;
+        margin-bottom: 4px;
+        font-size: 16pt;
+    }
+
+    .column-icon {
+        float: left;
+    }
+
+    .column-data {
+        display: inline-block;
+        width: 85%;
+    }
+
+    .workspace-channel-details {
+        margin-top: 0;
+        color: $primary-fg-color;
+    }
+
+    .metadata {
+        color: $muted-fg-color;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin-bottom: 0;
+    }
+
+    .metadata.visible {
+        overflow-y: visible;
+        text-overflow: ellipsis;
+        white-space: normal;
+    }
+    
 }
 
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index a99141870b..76faf60eef 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -54,9 +54,6 @@ export default class RoomSettingsDialog extends React.Component {
 
     _getTabs() {
         const tabs = [];
-        const featureFlag = SettingsStore.isFeatureEnabled("feature_bridge_state");
-        const shouldShowBridgeIcon = featureFlag &&
-            BridgeSettingsTab.getBridgeStateEvents(this.props.roomId).length > 0;
 
         tabs.push(new Tab(
             _td("General"),
@@ -79,9 +76,9 @@ export default class RoomSettingsDialog extends React.Component {
             <NotificationSettingsTab roomId={this.props.roomId} />,
         ));
 
-        if (shouldShowBridgeIcon) {
+        if (SettingsStore.isFeatureEnabled("feature_bridge_state")) {
             tabs.push(new Tab(
-                _td("Bridge Info"),
+                _td("Bridges"),
                 "mx_RoomSettingsDialog_bridgesIcon",
                 <BridgeSettingsTab roomId={this.props.roomId} />,
             ));
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 19c19d3bc6..8090cf7d4d 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -33,6 +33,21 @@ export default class BridgeSettingsTab extends React.Component {
         roomId: PropTypes.string.isRequired,
     };
 
+    constructor() {
+        super();
+
+        this.state = {
+            showMoreCard: null,
+        };
+    }
+
+
+    _showMoreDetails(eventId) {
+        this.setState({
+            showMoreCard: eventId,
+        });
+    }
+
     _renderBridgeCard(event, room) {
         const content = event.getContent();
         if (!content || !content.channel || !content.protocol) {
@@ -45,90 +60,59 @@ export default class BridgeSettingsTab extends React.Component {
 
         let creator = null;
         if (content.creator) {
-            creator = <p> { _t("This bridge was provisioned by <user />", {}, {
+            creator = _t("This bridge was provisioned by <user />.", {}, {
                     user: <Pill
                         type={Pill.TYPE_USER_MENTION}
                         room={room}
                         url={makeUserPermalink(content.creator)}
                         shouldShowPillAvatar={true}
                     />,
-                })}</p>;
+            });
         }
 
-        const bot = (<p> {_t("This bridge is managed by <user />.", {}, {
+        const bot = _t("This bridge is managed by <user />.", {}, {
             user: <Pill
                 type={Pill.TYPE_USER_MENTION}
                 room={room}
                 url={makeUserPermalink(event.getSender())}
                 shouldShowPillAvatar={true}
                 />,
-        })} </p>);
-        let channelLink = channelName;
-        if (channel.external_url) {
-            channelLink = <a target="_blank" href={channel.external_url} rel="noopener">{channelName}</a>;
-        }
-
-        let networkLink = networkName;
-        if (network && network.external_url) {
-            networkLink = <a target="_blank" href={network.external_url} rel="noopener">{networkName}</a>;
-        }
-
-        const chanAndNetworkInfo = (
-            _t("Bridged into <channelLink /> <networkLink />, on <protocolName />", {}, {
-                channelLink,
-                networkLink,
-                protocolName,
-            })
-        );
-
-        let networkIcon = null;
-        if (networkName && network.avatar) {
-            const avatarUrl = getHttpUriForMxc(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                network.avatar, 32, 32, "crop",
-            );
-            networkIcon = <BaseAvatar
-                width={32}
-                height={32}
-                resizeMethod='crop'
-                name={ networkName }
-                idName={ networkName }
-                url={ avatarUrl }
-            />;
-        }
-
-        let channelIcon = null;
-        if (channel.avatar) {
-            const avatarUrl = getHttpUriForMxc(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                channel.avatar, 32, 32, "crop",
-            );
-            channelIcon = <BaseAvatar
-                width={32}
-                height={32}
-                resizeMethod='crop'
-                name={ networkName }
-                idName={ networkName }
-                url={ avatarUrl }
-            />;
-        }
-
-        const heading = _t("Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />", { }, {
-            channelIcon,
-            channelName,
-            networkName,
-            networkIcon,
         });
 
-        return (<li key={event.stateKey}>
-            <div>
-                <h3>{heading}</h3>
-                <p>{_t("Connected via %(protocolName)s", { protocolName })}</p>
-                <details>
-                    {creator}
-                    {bot}
-                    <p>{chanAndNetworkInfo}</p>
-                </details>
+        const avatarUrl = network.avatar ? getHttpUriForMxc(
+            MatrixClientPeg.get().getHomeserverUrl(),
+            network.avatar, 32, 32, "crop",
+        ) : null;
+
+        const networkIcon = <BaseAvatar className="protocol-icon"
+            width={48}
+            height={48}
+            resizeMethod='crop'
+            name={ protocolName }
+            idName={ protocolName }
+            url={ avatarUrl }
+        />;
+
+        const workspaceChannelDetails = _t("Workspace: %(networkName)s      Channel: %(channelName)s", {
+            networkName,
+            channelName,
+        });
+        const id = event.getId();
+        const isVisible = this.state.showMoreCard === id;
+        const metadataClassname = "metadata " + (isVisible ? "visible" : "");
+        return (<li key={id}>
+            <div className="column-icon">
+                {networkIcon}
+            </div>
+            <div className="column-data">
+                <h3>{protocolName}</h3>
+                <p className="workspace-channel-details">
+                    {workspaceChannelDetails}
+                </p>
+                <p className={metadataClassname}>
+                    {creator} {bot}
+                </p>
+                <a href="#" onClick={() => this._showMoreDetails(isVisible ? null : id)}>Show { isVisible ? "less" : "more" } </a>
             </div>
         </li>);
     }
@@ -151,14 +135,40 @@ export default class BridgeSettingsTab extends React.Component {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
 
+        let content = null;
+
+        if (bridgeEvents.length > 0) {
+            content = <div>
+                <p>{_t(
+                    "This room is bridging messages to the following platforms. " +
+                    "<a>Learn more.</a>", {},
+                    {
+                        // TODO: We don't have this link yet: this will prevent the translators
+                        // having to re-translate the string when we do.
+                        a: sub => '',
+                    },
+                )}</p>
+                <ul className="mx_RoomSettingsDialog_BridgeList">
+                    { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
+                </ul>
+            </div>
+        } else  {
+            content = <p>{_t(
+                "This room isn’t bridging messages to any platforms. " +
+                "<a>Learn more.</a>", {},
+                {
+                    // TODO: We don't have this link yet: this will prevent the translators
+                    // having to re-translate the string when we do.
+                    a: sub => '',
+                },
+            )}</p>
+        }
+
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Bridge Info")}</div>
+                <div className="mx_SettingsTab_heading">{_t("Bridges")}</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    <p>{ _t("Below is a list of bridges connected to this room.") }</p>
-                    <ul className="mx_RoomSettingsDialog_BridgeList">
-                        { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
-                    </ul>
+                    {content}
                 </div>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f0eab6b12d..e4ab764989 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -781,13 +781,12 @@
     "Room version:": "Room version:",
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
-    "This bridge was provisioned by <user />": "This bridge was provisioned by <user />",
+    "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridged into <channelLink /> <networkLink />, on <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Connected via %(protocolName)s",
-    "Bridge Info": "Bridge Info",
-    "Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",
+    "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "This room is bridging messages to the following platforms. <a>Learn more.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
+    "Bridges": "Bridges",
     "Room Addresses": "Room Addresses",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "URL Previews": "URL Previews",

From 2c6fe780123e2cdffdb65961f282c7afb8e06156 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 10:36:20 +0000
Subject: [PATCH 0541/3235] Fix roving room list for resizer and ff tabstop
 a11y

---
 src/accessibility/RovingTabIndex.js           | 70 ++++++++-----------
 src/components/structures/RoomSubList.js      |  4 --
 .../views/groups/GroupInviteTile.js           |  3 +-
 src/components/views/rooms/RoomList.js        | 27 +++----
 src/components/views/rooms/RoomTile.js        |  3 +-
 5 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.js
index 8924815f23..38f2594baf 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -129,7 +129,7 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexProvider = ({children, handleHomeEnd}) => {
+export const RovingTabIndexProvider = ({children, handleHomeEnd, onKeyDown}) => {
     const [state, dispatch] = useReducer(reducer, {
         activeRef: null,
         refs: [],
@@ -137,53 +137,43 @@ export const RovingTabIndexProvider = ({children, handleHomeEnd}) => {
 
     const context = useMemo(() => ({state, dispatch}), [state]);
 
-    if (handleHomeEnd) {
-        return <RovingTabIndexContext.Provider value={context}>
-            <HomeEndHelper>
-                { children }
-            </HomeEndHelper>
-        </RovingTabIndexContext.Provider>;
-    }
-
-    return <RovingTabIndexContext.Provider value={context}>
-        { children }
-    </RovingTabIndexContext.Provider>;
-};
-RovingTabIndexProvider.propTypes = {
-    handleHomeEnd: PropTypes.bool,
-};
-
-// Helper to handle Home/End to jump to first/last roving-tab-index for widgets such as treeview
-export const HomeEndHelper = ({children}) => {
-    const context = useContext(RovingTabIndexContext);
-
-    const onKeyDown = useCallback((ev) => {
-        // check if we actually have any items
-        if (context.state.refs.length <= 0) return;
-
-        let handled = true;
-        switch (ev.key) {
-            case Key.HOME:
-                // move focus to first item
-                context.state.refs[0].current.focus();
-                break;
-            case Key.END:
-                // move focus to last item
-                context.state.refs[context.state.refs.length - 1].current.focus();
-                break;
-            default:
-                handled = false;
+    const onKeyDownHandler = useCallback((ev) => {
+        let handled = false;
+        if (handleHomeEnd) {
+            // check if we actually have any items
+            switch (ev.key) {
+                case Key.HOME:
+                    handled = true;
+                    // move focus to first item
+                    if (context.state.refs.length > 0) {
+                        context.state.refs[0].current.focus();
+                    }
+                    break;
+                case Key.END:
+                    handled = true;
+                    // move focus to last item
+                    if (context.state.refs.length > 0) {
+                        context.state.refs[context.state.refs.length - 1].current.focus();
+                    }
+                    break;
+            }
         }
 
         if (handled) {
             ev.preventDefault();
             ev.stopPropagation();
+        } else if (onKeyDown) {
+            return onKeyDown(ev);
         }
     }, [context.state]);
 
-    return <div onKeyDown={onKeyDown}>
-        { children }
-    </div>;
+    return <RovingTabIndexContext.Provider value={context}>
+        { children({onKeyDownHandler}) }
+    </RovingTabIndexContext.Provider>;
+};
+RovingTabIndexProvider.propTypes = {
+    handleHomeEnd: PropTypes.bool,
+    onKeyDown: PropTypes.func,
 };
 
 // Hook to register a roving tab index
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2d41abf902..600b418fe0 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -142,10 +142,6 @@ export default class RoomSubList extends React.PureComponent {
 
     onHeaderKeyDown = (ev) => {
         switch (ev.key) {
-            case Key.TAB:
-                // Prevent LeftPanel handling Tab if focus is on the sublist header itself
-                ev.stopPropagation();
-                break;
             case Key.ARROW_LEFT:
                 // On ARROW_LEFT collapse the room sublist
                 if (!this.state.hidden && !this.props.forceExpand) {
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 3b15c6ff41..91c930525d 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -128,7 +128,8 @@ export default createReactClass({
             'mx_RoomTile_badgeShown': this.state.badgeHover || isMenuDisplayed,
         });
 
-        const label = <div title={this.props.group.groupId} className={nameClasses} dir="auto">
+        // XXX: this is a workaround for Firefox giving this div a tabstop :( [tabIndex]
+        const label = <div title={this.props.group.groupId} className={nameClasses} tabIndex={-1} dir="auto">
             { groupName }
         </div>;
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index bd563b2f28..ee3100b535 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -777,21 +777,22 @@ export default createReactClass({
 
         const subListComponents = this._mapSubListProps(subLists);
 
-        const {resizeNotifier, collapsed, searchFilter, ConferenceHandler, ...props} = this.props; // eslint-disable-line
+        const {resizeNotifier, collapsed, searchFilter, ConferenceHandler, onKeyDown, ...props} = this.props; // eslint-disable-line
         return (
-            <div
-                {...props}
-                ref={this._collectResizeContainer}
-                className="mx_RoomList"
-                role="tree"
-                aria-label={_t("Rooms")}
-                onMouseMove={this.onMouseMove}
-                onMouseLeave={this.onMouseLeave}
-            >
-                <RovingTabIndexProvider handleHomeEnd={true}>
+            <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
+                {({onKeyDownHandler}) => <div
+                    {...props}
+                    onKeyDown={onKeyDownHandler}
+                    ref={this._collectResizeContainer}
+                    className="mx_RoomList"
+                    role="tree"
+                    aria-label={_t("Rooms")}
+                    onMouseMove={this.onMouseMove}
+                    onMouseLeave={this.onMouseLeave}
+                >
                     { subListComponents }
-                </RovingTabIndexProvider>
-            </div>
+                </div> }
+            </RovingTabIndexProvider>
         );
     },
 });
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 3b13001225..f4f5fa10fc 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -353,7 +353,8 @@ export default createReactClass({
             });
 
             subtextLabel = subtext ? <span className="mx_RoomTile_subtext">{ subtext }</span> : null;
-            label = <div title={name} className={nameClasses} dir="auto">{ name }</div>;
+            // XXX: this is a workaround for Firefox giving this div a tabstop :( [tabIndex]
+            label = <div title={name} className={nameClasses} tabIndex={-1} dir="auto">{ name }</div>;
         } else if (this.state.hover) {
             const Tooltip = sdk.getComponent("elements.Tooltip");
             tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto" />;

From 37fb500e22aeb4762cef90ca8ca4f28eead57fa6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 10:41:10 +0000
Subject: [PATCH 0542/3235] fix useCallback dependencies, delint

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

diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.js
index 38f2594baf..b481f08fe2 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.js
@@ -165,7 +165,7 @@ export const RovingTabIndexProvider = ({children, handleHomeEnd, onKeyDown}) =>
         } else if (onKeyDown) {
             return onKeyDown(ev);
         }
-    }, [context.state]);
+    }, [context.state, onKeyDown, handleHomeEnd]);
 
     return <RovingTabIndexContext.Provider value={context}>
         { children({onKeyDownHandler}) }

From d211372740588bdac1ad740111d28183180d5e8b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 10:44:02 +0000
Subject: [PATCH 0543/3235] UI to bootsrap SSSS from key backup

---
 .../CreateSecretStorageDialog.js              | 130 ++++++++++++++----
 .../views/elements/DialogButtons.js           |  17 ++-
 src/i18n/strings/en_EN.json                   |   6 +-
 3 files changed, 123 insertions(+), 30 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 01b9c9c7c8..7d1b82681b 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -70,9 +70,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             setPassPhrase: false,
             backupInfo: null,
             backupSigStatus: null,
+            // does the server offer a UI auth flow with just m.login.password
+            // for /keys/device_signing/upload?
+            canUploadKeysWithPasswordOnly: null,
+            accountPassword: '',
+            accountPasswordCorrect: null,
         };
 
         this._fetchBackupInfo();
+        this._queryKeyUploadAuth();
     }
 
     componentWillUnmount() {
@@ -96,11 +102,32 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
+    async _queryKeyUploadAuth() {
+        try {
+            await MatrixClientPeg.get().uploadDeviceSigningKeys(null, {});
+            // We should never get here: the server should always require
+            // UI auth to upload device signing keys. If we do, we upload
+            // no keys which would be a no-op.
+            console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
+        } catch (error) {
+            if (!error.data.flows) {
+                console.log("uploadDeviceSigningKeys advertised no flows!");
+            }
+            const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
+                return f.stages.length === 1 && f.stages[0] === 'm.login.password';
+            });
+            this.setState({
+                canUploadKeysWithPasswordOnly,
+            });
+        }
+    }
+
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
 
-    _onMigrateNextClick = () => {
+    _onMigrateFormSubmit = (e) => {
+        e.preventDefault();
         this._bootstrapSecretStorage();
     }
 
@@ -127,29 +154,46 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
+    _doBootstrapUIAuth = async (makeRequest) => {
+        if (this.state.canUploadKeysWithPasswordOnly) {
+            await makeRequest({
+                type: 'm.login.password',
+                identifier: {
+                    type: 'm.id.user',
+                    user: MatrixClientPeg.get().getUserId(),
+                },
+                // https://github.com/matrix-org/synapse/issues/5665
+                user: MatrixClientPeg.get().getUserId(),
+                password: this.state.accountPassword,
+            });
+        } else {
+            const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
+            const { finished } = Modal.createTrackedDialog(
+                'Cross-signing keys dialog', '', InteractiveAuthDialog,
+                {
+                    title: _t("Send cross-signing keys to homeserver"),
+                    matrixClient: MatrixClientPeg.get(),
+                    makeRequest,
+                },
+            );
+            const [confirmed] = await finished;
+            if (!confirmed) {
+                throw new Error("Cross-signing key upload auth canceled");
+            }
+        }
+    }
+
     _bootstrapSecretStorage = async () => {
         this.setState({
             phase: PHASE_STORING,
             error: null,
         });
+
         const cli = MatrixClientPeg.get();
+
         try {
-            const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
             await cli.bootstrapSecretStorage({
-                authUploadDeviceSigningKeys: async (makeRequest) => {
-                    const { finished } = Modal.createTrackedDialog(
-                        'Cross-signing keys dialog', '', InteractiveAuthDialog,
-                        {
-                            title: _t("Send cross-signing keys to homeserver"),
-                            matrixClient: MatrixClientPeg.get(),
-                            makeRequest,
-                        },
-                    );
-                    const [confirmed] = await finished;
-                    if (!confirmed) {
-                        throw new Error("Cross-signing key upload auth canceled");
-                    }
-                },
+                authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                 createSecretStorageKey: async () => this._keyInfo,
                 keyBackupInfo: this.state.backupInfo,
             });
@@ -157,7 +201,14 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 phase: PHASE_DONE,
             });
         } catch (e) {
-            this.setState({ error: e });
+            if (this.state.canUploadKeysWithPasswordOnly && e.httpStatus === 401 && e.data.flows) {
+                this.setState({
+                    accountPasswordCorrect: false,
+                    phase: PHASE_MIGRATE,
+                });
+            } else {
+                this.setState({ error: e });
+            }
             console.error("Error bootstrapping secret storage", e);
         }
     }
@@ -285,6 +336,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
     }
 
+    _onAccountPasswordChange = (e) => {
+        this.setState({
+            accountPassword: e.target.value,
+        });
+    }
+
     _renderPhaseRestoreKeyBackup() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
@@ -309,18 +366,41 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         // it automatically.
         // https://github.com/vector-im/riot-web/issues/11696
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
+        const Field = sdk.getComponent('views.elements.Field');
+
+        let authPrompt;
+        if (this.state.canUploadKeysWithPasswordOnly) {
+            authPrompt = <div>
+                <div>{_t("Enter your account password to confirm the upgrade:")}</div>
+                <div><Field type="password"
+                    id="mx_CreateSecretStorage_accountPassword"
+                    label={_t("Password")}
+                    value={this.state.accountPassword}
+                    onChange={this._onAccountPasswordChange}
+                    flagInvalid={this.state.accountPasswordCorrect === false}
+                    autoFocus={true}
+                /></div>
+            </div>;
+        } else {
+            authPrompt = <p>
+                {_t("You'll need to authenticate with the server to confirm the upgrade.")}
+            </p>;
+        }
+
+        return <form onSubmit={this._onMigrateFormSubmit}>
             <p>{_t(
-                "Secret Storage will be set up using your existing key backup details. " +
-                "Your secret storage passphrase and recovery key will be the same as " +
-                "they were for your key backup.",
+                "Upgrade this device to allow it to verify other devices, " +
+                "granting them access to encrypted messages and marking them " +
+                "as trusted for other users.",
             )}</p>
+            <div>{authPrompt}</div>
             <DialogButtons primaryButton={_t('Next')}
-                onPrimaryButtonClick={this._onMigrateNextClick}
+                primaryIsSubmit={true}
                 hasCancel={true}
                 onCancel={this._onCancel}
+                primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             />
-        </div>;
+        </form>;
     }
 
     _renderPhasePassPhrase() {
@@ -564,7 +644,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_RESTORE_KEY_BACKUP:
                 return _t('Restore your Key Backup');
             case PHASE_MIGRATE:
-                return _t('Migrate from Key Backup');
+                return _t('Upgrade your encryption');
             case PHASE_PASSPHRASE:
                 return _t('Secure your encrypted messages with a passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index 4e47e73052..7b37fdb4eb 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -34,8 +34,11 @@ export default createReactClass({
         // A node to insert into the cancel button instead of default "Cancel"
         cancelButton: PropTypes.node,
 
+        // If true, make the primary button a form submit button (input type="submit")
+        primaryIsSubmit: PropTypes.bool,
+
         // onClick handler for the primary button.
-        onPrimaryButtonClick: PropTypes.func.isRequired,
+        onPrimaryButtonClick: PropTypes.func,
 
         // should there be a cancel button? default: true
         hasCancel: PropTypes.bool,
@@ -70,15 +73,23 @@ export default createReactClass({
         }
         let cancelButton;
         if (this.props.cancelButton || this.props.hasCancel) {
-            cancelButton = <button onClick={this._onCancelClick} disabled={this.props.disabled}>
+            cancelButton = <button
+                // important: the default type is 'submit' and this button comes before the
+                // primary in the DOM so will get form submissions unless we make it not a submit.
+                type="button"
+                onClick={this._onCancelClick}
+                disabled={this.props.disabled}
+            >
                 { this.props.cancelButton || _t("Cancel") }
             </button>;
         }
+
         return (
             <div className="mx_Dialog_buttons">
                 { cancelButton }
                 { this.props.children }
-                <button className={primaryButtonClassName}
+                <button type={this.props.primaryIsSubmit ? 'submit' : 'button'}
+                    className={primaryButtonClassName}
                     onClick={this.props.onPrimaryButtonClick}
                     autoFocus={this.props.focus}
                     disabled={this.props.disabled || this.props.primaryDisabled}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f0eab6b12d..3aad50f45e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1972,7 +1972,9 @@
     "Import": "Import",
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
     "Restore": "Restore",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.",
+    "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
     "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
@@ -2000,7 +2002,7 @@
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
     "Restore your Key Backup": "Restore your Key Backup",
-    "Migrate from Key Backup": "Migrate from Key Backup",
+    "Upgrade your encryption": "Upgrade your encryption",
     "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
     "Confirm your passphrase": "Confirm your passphrase",
     "Recovery key": "Recovery key",

From 176605c302698d7146380624bd82696ababde64f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 10:49:58 +0000
Subject: [PATCH 0544/3235] update tests to match new rendering method

---
 test/accessibility/RovingTabIndex-test.js | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
index 2b55d1420c..e7d7a0977d 100644
--- a/test/accessibility/RovingTabIndex-test.js
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -47,7 +47,7 @@ const button4 = <Button key={4}>d</Button>;
 describe("RovingTabIndex", () => {
     it("RovingTabIndexProvider renders children as expected", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            <div><span>Test</span></div>
+            {() => <div><span>Test</span></div> }
         </RovingTabIndexProvider>);
         expect(wrapper.text()).toBe("Test");
         expect(wrapper.html()).toBe('<div><span>Test</span></div>');
@@ -55,9 +55,11 @@ describe("RovingTabIndex", () => {
 
     it("RovingTabIndexProvider works as expected with useRovingTabIndex", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            { button1 }
-            { button2 }
-            { button3 }
+            {() => <React.Fragment>
+                { button1 }
+                { button2 }
+                { button3 }
+            </React.Fragment>}
         </RovingTabIndexProvider>);
 
         // should begin with 0th being active
@@ -95,13 +97,15 @@ describe("RovingTabIndex", () => {
 
     it("RovingTabIndexProvider works as expected with RovingTabIndexWrapper", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            { button1 }
-            { button2 }
-            <RovingTabIndexWrapper>
-                {({onFocus, isActive, ref}) =>
-                    <button onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref}>.</button>
-                }
-            </RovingTabIndexWrapper>
+            {() => <React.Fragment>
+                { button1 }
+                { button2 }
+                <RovingTabIndexWrapper>
+                    {({onFocus, isActive, ref}) =>
+                        <button onFocus={onFocus} tabIndex={isActive ? 0 : -1} ref={ref}>.</button>
+                    }
+                </RovingTabIndexWrapper>
+            </React.Fragment>}
         </RovingTabIndexProvider>);
 
         // should begin with 0th being active

From 644d68d836b085cccac8d06cea1ee416894970cc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 10:59:50 +0000
Subject: [PATCH 0545/3235] Update copy in bootstrap success dialog phase

---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++++++---
 src/i18n/strings/en_EN.json                            |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 7d1b82681b..d75126687c 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -613,7 +613,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(
-                "Your access to encrypted messages is now protected.",
+                "This device can now verify other devices, granting them access " +
+                "to encrypted messages and marking them as trusted for other users.",
+            )}</p>
+            <p>{_t(
+                "Verify other users in their profile.",
             )}</p>
             <DialogButtons primaryButton={_t('OK')}
                 onPrimaryButtonClick={this._onDone}
@@ -658,7 +662,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_STORING:
                 return _t('Storing secrets...');
             case PHASE_DONE:
-                return _t('Success!');
+                return _t('Encryption upgraded');
             default:
                 return null;
         }
@@ -719,7 +723,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             <BaseDialog className='mx_CreateSecretStorageDialog'
                 onFinished={this.props.onFinished}
                 title={this._titleForPhase(this.state.phase)}
-                hasCancel={[PHASE_PASSPHRASE, PHASE_DONE].includes(this.state.phase)}
+                hasCancel={[PHASE_PASSPHRASE].includes(this.state.phase)}
             >
             <div>
                 {content}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3aad50f45e..29ce36a814 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1998,7 +1998,8 @@
     "<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",
-    "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
+    "Verify other users in their profile.": "Verify other users in their profile.",
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
     "Restore your Key Backup": "Restore your Key Backup",
@@ -2008,7 +2009,7 @@
     "Recovery key": "Recovery key",
     "Keep it safe": "Keep it safe",
     "Storing secrets...": "Storing secrets...",
-    "Success!": "Success!",
+    "Encryption upgraded": "Encryption upgraded",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
@@ -2020,6 +2021,7 @@
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
     "Secure your backup with a passphrase": "Secure your backup with a passphrase",
     "Starting backup...": "Starting backup...",
+    "Success!": "Success!",
     "Create Key Backup": "Create Key Backup",
     "Unable to create key backup": "Unable to create key backup",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",

From fc724cfe709ec046db13283e2fd8bf91646bb017 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 11:05:25 +0000
Subject: [PATCH 0546/3235] fix tests some moar

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

diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
index e7d7a0977d..8be4a2976c 100644
--- a/test/accessibility/RovingTabIndex-test.js
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -47,7 +47,7 @@ const button4 = <Button key={4}>d</Button>;
 describe("RovingTabIndex", () => {
     it("RovingTabIndexProvider renders children as expected", () => {
         const wrapper = mount(<RovingTabIndexProvider>
-            {() => <div><span>Test</span></div> }
+            {() => <div><span>Test</span></div>}
         </RovingTabIndexProvider>);
         expect(wrapper.text()).toBe("Test");
         expect(wrapper.html()).toBe('<div><span>Test</span></div>');
@@ -82,14 +82,14 @@ describe("RovingTabIndex", () => {
 
         // update the children, it should remain on the same button
         wrapper.setProps({
-            children: [button1, button4, button2, button3],
+            children: () => [button1, button4, button2, button3],
         });
         wrapper.update();
         checkTabIndexes(wrapper.find("button"), [-1, -1, 0, -1]);
 
         // update the children, remove the active button, it should move to the next one
         wrapper.setProps({
-            children: [button1, button4, button3],
+            children: () => [button1, button4, button3],
         });
         wrapper.update();
         checkTabIndexes(wrapper.find("button"), [-1, -1, 0]);

From 85ee6bd51f06be795c1e596f353de422a9f21083 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 22 Jan 2020 11:17:54 +0000
Subject: [PATCH 0547/3235] Don't warn on unverified users; ensured behavior
 stays the same with flags off

---
 src/components/views/rooms/EventTile.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index bcd32d2c9c..634b77c9e1 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -70,6 +70,7 @@ const E2E_STATE = {
     VERIFIED: "verified",
     WARNING: "warning",
     UNKNOWN: "unknown",
+    NORMAL: "normal",
 };
 
 // Add all the Mjolnir stuff to the renderer
@@ -313,6 +314,22 @@ export default createReactClass({
             return;
         }
 
+        // If cross-signing is off, the old behaviour is to scream at the user
+        // as if they've done something wrong, which they haven't
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            this.setState({
+                verified: E2E_STATE.WARNING,
+            }, this.props.onHeightChanged);
+            return;
+        }
+
+        if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
+            this.setState({
+                verified: E2E_STATE.NORMAL,
+            }, this.props.onHeightChanged);
+            return;
+        }
+
         const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
         if (!eventSenderTrust) {
             this.setState({
@@ -503,7 +520,9 @@ export default createReactClass({
 
         // event is encrypted, display padlock corresponding to whether or not it is verified
         if (ev.isEncrypted()) {
-            if (this.state.verified === E2E_STATE.VERIFIED) {
+            if (this.state.verified === E2E_STATE.NORMAL) {
+                return; // no icon if we've not even cross-signed the user
+            } else if (this.state.verified === E2E_STATE.VERIFIED) {
                 return; // no icon for verified
             } else if (this.state.verified === E2E_STATE.UNKNOWN) {
                 return (<E2ePadlockUnknown />);

From 78f7622fc59e3a393f9485e82fd5c8da179065db Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 22 Jan 2020 01:55:12 +0000
Subject: [PATCH 0548/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2039 of 2039 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 b459fb9306..694d5e3d84 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2079,5 +2079,6 @@
     "Verify User": "驗證使用者",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "為了提高安全性，請透過檢查您兩個裝置上的一次性代碼來驗證此使用者。",
     "For maximum security, do this in person.": "為了取得最強的安全性，請親自進行。",
-    "Start Verification": "開始驗證"
+    "Start Verification": "開始驗證",
+    "Encrypted by a deleted device": "被已刪除的裝置加密"
 }

From d92ddebe5a1a8f5b24c40800e1fdaae5fbec7910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 22 Jan 2020 07:34:43 +0000
Subject: [PATCH 0549/3235] Translated using Weblate (French)

Currently translated at 100.0% (2039 of 2039 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 abe05e9812..8fda9e458e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2079,5 +2079,6 @@
     "Verify User": "Vérifier l’utilisateur",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une meilleure sécurité, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
     "For maximum security, do this in person.": "Pour une sécurité maximale, faites-le en personne.",
-    "Start Verification": "Commencer la vérification"
+    "Start Verification": "Commencer la vérification",
+    "Encrypted by a deleted device": "Chiffré par un appareil supprimé"
 }

From e923fdb1498e5cf3effcdbf2da3101510042dde1 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 21 Jan 2020 20:54:31 +0000
Subject: [PATCH 0550/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2039 of 2039 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 c5334c1592..f6c85e1674 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2080,5 +2080,6 @@
     "Verify User": "Felhasználó ellenőrzése",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
     "For maximum security, do this in person.": "A legnagyobb biztonság érdekében ezt személyesen tedd meg.",
-    "Start Verification": "Ellenőrzés elindítása"
+    "Start Verification": "Ellenőrzés elindítása",
+    "Encrypted by a deleted device": "Egy már törölt eszköz titkosította"
 }

From 5571164fe0c842fce6b0701b8f54622a0e09e52e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 22 Jan 2020 11:29:25 +0000
Subject: [PATCH 0551/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2039 of 2039 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a519c138b1..d6ebc985fb 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2074,5 +2074,10 @@
     "Done": "Fatto",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Se non completi la sicurezza su questo dispositivo, esso non avrà accesso ai messaggi cifrati.",
     "Go Back": "Torna",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "L'archivio segreto verrà impostato usando i dettagli del backup chiavi esistente. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del backup chiavi."
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "L'archivio segreto verrà impostato usando i dettagli del backup chiavi esistente. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del backup chiavi.",
+    "Encrypted by a deleted device": "Cifrato da un dispositivo eliminato",
+    "Verify User": "Verifica utente",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Per maggiore sicurezza, verifica questo utente controllando un codice univoco sui vostri dispositivi.",
+    "For maximum security, do this in person.": "Per massima sicurezza, fatelo di persona.",
+    "Start Verification": "Inizia la verifica"
 }

From e98269822cb5c48bfc692e1845734a340f5094db Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 11:44:47 +0000
Subject: [PATCH 0552/3235] Add icon to bootstrap dialogs

---
 res/css/_common.scss                                  |  8 ++++++++
 .../secretstorage/CreateSecretStorageDialog.js        | 10 ++++++++--
 src/components/views/dialogs/BaseDialog.js            | 11 +++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 51d985efb7..abc57a95ed 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -338,6 +338,14 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     margin-bottom: 10px;
 }
 
+.mx_Dialog_titleImage {
+    vertical-align: middle;
+    width: 25px;
+    height: 25px;
+    margin-left: -2px;
+    margin-right: 4px;
+}
+
 .mx_Dialog_title {
     font-size: 22px;
     line-height: 36px;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index d75126687c..a56a1ee905 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -155,7 +155,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _doBootstrapUIAuth = async (makeRequest) => {
-        if (this.state.canUploadKeysWithPasswordOnly) {
+        if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
             await makeRequest({
                 type: 'm.login.password',
                 identifier: {
@@ -664,7 +664,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_DONE:
                 return _t('Encryption upgraded');
             default:
-                return null;
+                return '';
         }
     }
 
@@ -719,10 +719,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             }
         }
 
+        let headerImage;
+        if (this._titleForPhase(this.state.phase)) {
+            headerImage = require("../../../../../res/img/e2e/normal.svg");
+        }
+
         return (
             <BaseDialog className='mx_CreateSecretStorageDialog'
                 onFinished={this.props.onFinished}
                 title={this._titleForPhase(this.state.phase)}
+                headerImage={headerImage}
                 hasCancel={[PHASE_PASSPHRASE].includes(this.state.phase)}
             >
             <div>
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 19f22a15ad..9238024b60 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -65,6 +65,9 @@ export default createReactClass({
         // Title for the dialog.
         title: PropTypes.node.isRequired,
 
+        // Path to an icon to put in the header
+        headerImage: PropTypes.string,
+
         // children should be the content of the dialog
         children: PropTypes.node,
 
@@ -110,6 +113,13 @@ export default createReactClass({
             );
         }
 
+        let headerImage;
+        if (this.props.headerImage) {
+            headerImage = <img className="mx_Dialog_titleImage" src={this.props.headerImage}
+                alt=""
+            />;
+        }
+
         return (
             <MatrixClientContext.Provider value={this._matrixClient}>
                 <FocusLock
@@ -135,6 +145,7 @@ export default createReactClass({
                         'mx_Dialog_headerWithButton': !!this.props.headerButton,
                     })}>
                         <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
+                            {headerImage}
                             { this.props.title }
                         </div>
                         { this.props.headerButton }

From e1e53f567f93ab044f24bc195d40fa4046acd2fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 11:56:27 +0000
Subject: [PATCH 0553/3235] add more tests

---
 .../views/rooms/SendMessageComposer.js        |  3 +-
 .../views/rooms/SendMessageComposer-test.js   | 83 +++++++++++++++++++
 test/editor/mock.js                           | 10 +++
 test/editor/model-test.js                     | 12 +--
 4 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 test/components/views/rooms/SendMessageComposer-test.js

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index c4970c4570..a857e40f55 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -58,7 +58,8 @@ function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     }
 }
 
-function createMessageContent(model, permalinkCreator) {
+// exported for tests
+export function createMessageContent(model, permalinkCreator) {
     const isEmote = containsEmote(model);
     if (isEmote) {
         model = stripEmoteCommand(model);
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
new file mode 100644
index 0000000000..d5a143a1fb
--- /dev/null
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -0,0 +1,83 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 RoomViewStore from "../../../../src/stores/RoomViewStore";
+import {createMessageContent} from "../../../../src/components/views/rooms/SendMessageComposer";
+import EditorModel from "../../../../src/editor/model";
+import {createPartCreator, createRenderer} from "../../../editor/mock";
+
+jest.mock("../../../../src/stores/RoomViewStore");
+
+describe('<SendMessageComposer/>', () => {
+    describe("createMessageContent", () => {
+        RoomViewStore.getQuotingEvent.mockReturnValue(false);
+        const permalinkCreator = jest.fn();
+
+        it("sends plaintext messages correctly", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("hello world", "insertText", {offset: 11, atNodeEnd: true});
+
+            const content = createMessageContent(model, permalinkCreator);
+
+            expect(content).toEqual({
+                body: "hello world",
+                msgtype: "m.text",
+            });
+        });
+
+        it("sends markdown messages correctly", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("hello *world*", "insertText", {offset: 13, atNodeEnd: true});
+
+            const content = createMessageContent(model, permalinkCreator);
+
+            expect(content).toEqual({
+                body: "hello *world*",
+                msgtype: "m.text",
+                format: "org.matrix.custom.html",
+                formatted_body: "hello <em>world</em>",
+            });
+        });
+
+        it("strips /me from messages and marks them as m.emote accordingly", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("/me blinks __quickly__", "insertText", {offset: 22, atNodeEnd: true});
+
+            const content = createMessageContent(model, permalinkCreator);
+
+            expect(content).toEqual({
+                body: "blinks __quickly__",
+                msgtype: "m.emote",
+                format: "org.matrix.custom.html",
+                formatted_body: "blinks <strong>quickly</strong>",
+            });
+        });
+
+        it("allows sending double-slash escaped slash commands correctly", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("//dev/null is my favourite place", "insertText", {offset: 32, atNodeEnd: true});
+
+            const content = createMessageContent(model, permalinkCreator);
+
+            expect(content).toEqual({
+                body: "/dev/null is my favourite place",
+                msgtype: "m.text",
+            });
+        });
+    });
+});
+
+
diff --git a/test/editor/mock.js b/test/editor/mock.js
index bb1a51d14b..6de65cf23d 100644
--- a/test/editor/mock.js
+++ b/test/editor/mock.js
@@ -67,3 +67,13 @@ export function createPartCreator(completions = []) {
     };
     return new PartCreator(new MockRoom(), new MockClient(), autoCompleteCreator);
 }
+
+export function createRenderer() {
+    const render = (c) => {
+        render.caret = c;
+        render.count += 1;
+    };
+    render.count = 0;
+    render.caret = null;
+    return render;
+}
diff --git a/test/editor/model-test.js b/test/editor/model-test.js
index 826dde3d68..2a3584d508 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.js
@@ -15,17 +15,7 @@ limitations under the License.
 */
 
 import EditorModel from "../../src/editor/model";
-import {createPartCreator} from "./mock";
-
-function createRenderer() {
-    const render = (c) => {
-        render.caret = c;
-        render.count += 1;
-    };
-    render.count = 0;
-    render.caret = null;
-    return render;
-}
+import {createPartCreator, createRenderer} from "./mock";
 
 describe('editor/model', function() {
     describe('plain text manipulation', function() {

From 832da062cccc814fe5748e60a9c71f03290a6eff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 13:37:27 +0000
Subject: [PATCH 0554/3235] Improve trailing spurious breaks + tests

---
 src/editor/deserialize.js      |  2 +-
 src/editor/operations.js       | 16 +++++---
 test/editor/operations-test.js | 67 ++++++++++++++++++++++++++--------
 3 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js
index 7ba4c3eda3..190963f357 100644
--- a/src/editor/deserialize.js
+++ b/src/editor/deserialize.js
@@ -250,7 +250,7 @@ function parseHtmlMessage(html, partCreator, isQuotedMessage) {
 }
 
 export function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
-    const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n
+    const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
     const parts = lines.reduce((parts, line, i) => {
         if (isQuotedMessage) {
             parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
diff --git a/src/editor/operations.js b/src/editor/operations.js
index 6bae60e6b8..d0115d9ca7 100644
--- a/src/editor/operations.js
+++ b/src/editor/operations.js
@@ -100,6 +100,10 @@ export function formatRangeAsCode(range) {
     replaceRangeAndExpandSelection(range, parts);
 }
 
+// parts helper methods
+const isBlank = part => !part.text || !/\S/.test(part.text);
+const isNL = part => part.type === "newline";
+
 export function toggleInlineFormat(range, prefix, suffix = prefix) {
     const {model, parts} = range;
     const {partCreator} = model;
@@ -113,14 +117,12 @@ export function toggleInlineFormat(range, prefix, suffix = prefix) {
         // - 2 newline parts in sequence
         // - newline part, plain(<empty or just spaces>), newline part
 
-        const isBlank = part => !part.text || !/\S/.test(part.text);
-        const isNL = part => part.type === "newline";
-
         // bump startIndex onto the first non-blank after the paragraph ending
         if (isBlank(parts[i - 2]) && isNL(parts[i - 1]) && !isNL(parts[i]) && !isBlank(parts[i])) {
             startIndex = i;
         }
 
+        // if at a paragraph break, store the indexes of the paragraph
         if (isNL(parts[i - 1]) && isNL(parts[i])) {
             paragraphIndexes.push([startIndex, i - 1]);
             startIndex = i + 1;
@@ -129,9 +131,11 @@ export function toggleInlineFormat(range, prefix, suffix = prefix) {
             startIndex = i + 1;
         }
     }
-    if (startIndex < parts.length) {
-        // TODO don't use parts.length here to clean up any trailing cruft
-        paragraphIndexes.push([startIndex, parts.length]);
+
+    const lastNonEmptyPart = parts.map(isBlank).lastIndexOf(false);
+    // If we have not yet included the final paragraph then add it now
+    if (startIndex <= lastNonEmptyPart) {
+        paragraphIndexes.push([startIndex, lastNonEmptyPart + 1]);
     }
 
     // keep track of how many things we have inserted as an offset:=0
diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
index 872cc78bdb..90a9812306 100644
--- a/test/editor/operations-test.js
+++ b/test/editor/operations-test.js
@@ -18,6 +18,8 @@ import EditorModel from "../../src/editor/model";
 import {createPartCreator, createRenderer} from "./mock";
 import {toggleInlineFormat} from "../../src/editor/operations";
 
+const SERIALIZED_NEWLINE = {"text": "\n", "type": "newline"};
+
 describe('editor/operations: formatting operations', () => {
     describe('toggleInlineFormat', () => {
         it('works for words', () => {
@@ -93,17 +95,54 @@ describe('editor/operations: formatting operations', () => {
             expect(range.parts.map(p => p.text).join("")).toBe("world,\nhow");
             expect(model.serializeParts()).toEqual([
                 {"text": "hello world,", "type": "plain"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
                 {"text": "how are you doing?", "type": "plain"},
             ]);
             toggleInlineFormat(range, "**");
             expect(model.serializeParts()).toEqual([
                 {"text": "hello **world,", "type": "plain"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
                 {"text": "how** are you doing?", "type": "plain"},
             ]);
         });
 
+        it('works for a paragraph with spurious breaks around it in selected range', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator();
+            const model = new EditorModel([
+                pc.newline(),
+                pc.newline(),
+                pc.plain("hello world,"),
+                pc.newline(),
+                pc.plain("how are you doing?"),
+                pc.newline(),
+                pc.newline(),
+            ], pc, renderer);
+
+            const range = model.startRange(model.positionForOffset(0, false), model.getPositionAtEnd());  // select-all
+
+            expect(range.parts.map(p => p.text).join("")).toBe("\n\nhello world,\nhow are you doing?\n\n");
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                {"text": "hello world,", "type": "plain"},
+                SERIALIZED_NEWLINE,
+                {"text": "how are you doing?", "type": "plain"},
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+            ]);
+            toggleInlineFormat(range, "**");
+            expect(model.serializeParts()).toEqual([
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+                {"text": "**hello world,", "type": "plain"},
+                SERIALIZED_NEWLINE,
+                {"text": "how are you doing?**", "type": "plain"},
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
+            ]);
+        });
+
         it('works for multiple paragraph', () => {
             const renderer = createRenderer();
             const pc = createPartCreator();
@@ -116,36 +155,34 @@ describe('editor/operations: formatting operations', () => {
                 pc.plain("new paragraph"),
             ], pc, renderer);
 
-            let range = model.startRange(model.positionForOffset(0, true),
-                model.getPositionAtEnd()); // select-all
+            let range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
 
             expect(model.serializeParts()).toEqual([
                 {"text": "hello world,", "type": "plain"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
                 {"text": "how are you doing?", "type": "plain"},
-                {"text": "\n", "type": "newline"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
                 {"text": "new paragraph", "type": "plain"},
             ]);
             toggleInlineFormat(range, "__");
             expect(model.serializeParts()).toEqual([
                 {"text": "__hello world,", "type": "plain"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
                 {"text": "how are you doing?__", "type": "plain"},
-                {"text": "\n", "type": "newline"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
                 {"text": "__new paragraph__", "type": "plain"},
             ]);
-            range = model.startRange(model.positionForOffset(0, true),
-                model.getPositionAtEnd()); // select-all
+            range = model.startRange(model.positionForOffset(0, true), model.getPositionAtEnd()); // select-all
             console.log("RANGE", range.parts);
             toggleInlineFormat(range, "__");
             expect(model.serializeParts()).toEqual([
                 {"text": "hello world,", "type": "plain"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
                 {"text": "how are you doing?", "type": "plain"},
-                {"text": "\n", "type": "newline"},
-                {"text": "\n", "type": "newline"},
+                SERIALIZED_NEWLINE,
+                SERIALIZED_NEWLINE,
                 {"text": "new paragraph", "type": "plain"},
             ]);
         });

From fbb65f068a6bb8d153ef65310ec52b886cfdc5ee Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 22 Jan 2020 14:07:16 +0000
Subject: [PATCH 0555/3235] Support admin configurable message when reporting
 content

This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.

Fixes https://github.com/vector-im/riot-web/issues/11992
---
 src/components/views/dialogs/ReportEventDialog.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index e77bb0693b..2442bc2f95 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -20,6 +20,8 @@ import { _t } from '../../../languageHandler';
 import PropTypes from "prop-types";
 import {MatrixEvent} from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import SdkConfig from '../../../SdkConfig';
+import Markdown from '../../../Markdown';
 
 /*
  * A dialog for reporting an event.
@@ -95,6 +97,15 @@ export default class ReportEventDialog extends PureComponent {
             );
         }
 
+        const adminMessageMD =
+            SdkConfig.get().reportEvent &&
+            SdkConfig.get().reportEvent.adminMessageMD;
+        let adminMessage;
+        if (adminMessageMD) {
+            const html = new Markdown(adminMessageMD).toHTML();
+            adminMessage = <p dangerouslySetInnerHTML={{ __html: html }} />;
+        }
+
         return (
             <BaseDialog
                 className="mx_BugReportDialog"
@@ -110,7 +121,7 @@ export default class ReportEventDialog extends PureComponent {
                                 "administrator will not be able to read the message text or view any files or images.")
                         }
                     </p>
-
+                    {adminMessage}
                     <Field
                         id="mx_ReportEventDialog_reason"
                         className="mx_ReportEventDialog_reason"

From 2842e8dee8970c9f6ee870a03270f6201dc22105 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 14:15:17 +0000
Subject: [PATCH 0556/3235] Change prepublish script to prepare

prepublish is deprecated (prepare also runs for git checkouts, and
lib will need to be built in this case).
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa2cf8bf8b..8f49eed4b5 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   "typings": "./lib/index.d.ts",
   "matrix_src_main": "./src/index.js",
   "scripts": {
-    "prepublish": "yarn build",
+    "prepare": "yarn build",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",

From 516dd25797f4ad5c8fb53a6471ef65cf212879a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 14:24:10 +0000
Subject: [PATCH 0557/3235] fix typo in fallback codepath

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

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index a857e40f55..6a60037036 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -187,7 +187,7 @@ export default class SendMessageComposer extends React.Component {
             // be extra resilient when somehow the AutocompleteWrapperModel or
             // CommandPartCreator fails to insert a command part, so we don't send
             // a command as a message
-            if (firstPart.text.startsWith("/") && firstPart.text.startsWith("//") && !firstPart.text.startsWith("//")
+            if (firstPart.text.startsWith("/") && !firstPart.text.startsWith("//")
                 && (firstPart.type === "plain" || firstPart.type === "pill-candidate")) {
                 return true;
             }

From 088b1ea6285b544108cb4e122aced3449ab14082 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 15:03:48 +0000
Subject: [PATCH 0558/3235] Retry end-to-end tests automatically once if they
 fail, flakey flake

---
 .buildkite/pipeline.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index de61d4e5b9..747625ae6e 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -77,6 +77,10 @@ steps:
           image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
           propagate-environment: true
           workdir: "/workdir/matrix-react-sdk"
+    retry:
+      automatic:
+        - exit_status: 1 # retry end-to-end tests once as Puppeteer sometimes fails
+        - limit: 1
 
   - label: "🔧 Riot Tests"
     agents:

From e3a28e3e449a451a85710de272d32d26b47fab56 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 15:05:25 +0000
Subject: [PATCH 0559/3235] Remove the react-sdk version

I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
---
 .../views/settings/tabs/user/HelpUserSettingsTab.js       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index ab71de86b9..99b94d47f2 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -26,10 +26,6 @@ import Modal from "../../../../../Modal";
 import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";
 
-// if this looks like a release, use the 'version' from package.json; else use
-// the git sha. Prepend version with v, to look like riot-web version
-const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '<local>';
-
 // Simple method to help prettify GH Release Tags and Commit Hashes.
 const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
 const ghVersionLabel = function(repo, token='') {
@@ -188,9 +184,6 @@ export default class HelpUserSettingsTab extends React.Component {
             );
         }
 
-        const reactSdkVersion = REACT_SDK_VERSION !== '<local>'
-            ? ghVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION)
-            : REACT_SDK_VERSION;
         const vectorVersion = this.state.vectorVersion
             ? ghVersionLabel('vector-im/riot-web', this.state.vectorVersion)
             : 'unknown';
@@ -243,7 +236,6 @@ export default class HelpUserSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
                     <span className='mx_SettingsTab_subheading'>{_t("Versions")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("matrix-react-sdk version:")} {reactSdkVersion}<br />
                         {_t("riot-web version:")} {vectorVersion}<br />
                         {_t("olm version:")} {olmVersion}<br />
                         {updateButton}

From d04ba40efe49ef31f757e823a99f44fc9650e9ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 15:05:40 +0000
Subject: [PATCH 0560/3235] fix syntax

---
 .buildkite/pipeline.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 747625ae6e..f5f63b647a 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -80,7 +80,7 @@ steps:
     retry:
       automatic:
         - exit_status: 1 # retry end-to-end tests once as Puppeteer sometimes fails
-        - limit: 1
+          limit: 1
 
   - label: "🔧 Riot Tests"
     agents:

From 735ba4fd33d7fcdfb5e6e36141176f20f99395dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 22 Jan 2020 16:11:54 +0100
Subject: [PATCH 0561/3235] EventIndex: Correctly populate events on initial
 fill requests.

---
 src/components/structures/FilePanel.js |  2 +-
 src/indexing/EventIndex.js             | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 71e8143f0a..c96f8770ad 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -98,7 +98,7 @@ const FilePanel = createReactClass({
 
                 if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
                     const timeline = timelineSet.getLiveTimeline();
-                    await eventIndex.populateFileTimeline(timelineSet, timeline, room, 1);
+                    await eventIndex.populateFileTimeline(timelineSet, timeline, room, 10);
                 }
 
                 this.setState({ timelineSet: timelineSet });
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c081440233..93c640cf8e 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -476,6 +476,16 @@ export default class EventIndex {
                                fromEvent = null, direction = EventTimeline.BACKWARDS) {
         const matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
 
+        // If this is a normal fill request, not a pagination request, we need
+        // to get our events in the BACKWARDS direction but populate them in the
+        // forwards direction.
+        // This needs to happen because a fill request might come with an
+        // exisitng timeline e.g. if you close and re-open the FilePanel.
+        if (fromEvent === null) {
+            matrixEvents.reverse();
+            direction = direction == EventTimeline.BACKWARDS ? EventTimeline.FORWARDS: EventTimeline.BACKWARDS;
+        }
+
         // Add the events to the live timeline of the file panel.
         matrixEvents.forEach(e => {
             if (!timelineSet.eventIdToTimeline(e.getId())) {

From c04872dd9b6974e334dca1286a69c422bc8ccaf9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 15:12:38 +0000
Subject: [PATCH 0562/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4daf7cd29e..d19cbb9bfd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -687,7 +687,6 @@
     "Clear cache and reload": "Clear cache and reload",
     "FAQ": "FAQ",
     "Versions": "Versions",
-    "matrix-react-sdk version:": "matrix-react-sdk version:",
     "riot-web version:": "riot-web version:",
     "olm version:": "olm version:",
     "Homeserver is": "Homeserver is",

From 7e52eb9f65374ffcb0bc9cba99ea8c3d16ecd51b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 15:16:41 +0000
Subject: [PATCH 0563/3235] Unused import

---
 src/components/views/settings/tabs/user/HelpUserSettingsTab.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 99b94d47f2..a245c7c7b9 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -21,7 +21,6 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import SdkConfig from "../../../../../SdkConfig";
 import createRoom from "../../../../../createRoom";
-import packageJson from "../../../../../../package.json";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";

From f917c2faea6fabd118bbf08251b9e341c793c740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 22 Jan 2020 16:21:11 +0100
Subject: [PATCH 0564/3235] FilePanel: Listen for live events and add them to
 an open FilePanel.

---
 src/components/structures/FilePanel.js | 57 ++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index c96f8770ad..a25f8babd1 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -30,6 +30,7 @@ import { _t } from '../../languageHandler';
  */
 const FilePanel = createReactClass({
     displayName: 'FilePanel',
+    decryptingEvents: new Set(),
 
     propTypes: {
         roomId: PropTypes.string.isRequired,
@@ -41,8 +42,64 @@ const FilePanel = createReactClass({
         };
     },
 
+    onRoomTimeline (ev, room, toStartOfTimeline, removed, data) {
+        if (room.roomId !== this.props.roomId) return;
+        if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
+
+        if (ev.isBeingDecrypted()) {
+            this.decryptingEvents.add(ev.getId());
+        } else {
+            this.addEncryptedLiveEvent(ev);
+        }
+    },
+
+    onEventDecrypted (ev, err) {
+        if (ev.getRoomId() !== this.props.roomId) return;
+        const eventId = ev.getId();
+
+        if (!this.decryptingEvents.delete(eventId)) return;
+        if (err) return;
+
+        this.addEncryptedLiveEvent(ev);
+    },
+
+    addEncryptedLiveEvent(ev, toStartOfTimeline) {
+        if (!this.state.timelineSet) return;
+
+        const timeline = this.state.timelineSet.getLiveTimeline();
+        if (ev.getType() !== "m.room.message") return;
+        if (["m.file", "m.image", "m.video", "m.audio"].indexOf(ev.getContent().msgtype) == -1) {
+            return;
+        }
+
+        if (!this.state.timelineSet.eventIdToTimeline(ev.getId())) {
+            this.state.timelineSet.addEventToTimeline(ev, timeline, false);
+        }
+    },
+
     async componentDidMount() {
+        const client = MatrixClientPeg.get();
+
         await this.updateTimelineSet(this.props.roomId);
+
+        if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
+
+        if (EventIndexPeg.get() !== null) {
+            client.on('Room.timeline', this.onRoomTimeline.bind(this));
+            client.on('Event.decrypted', this.onEventDecrypted.bind(this));
+        }
+    },
+
+    componentWillUnmount() {
+        const client = MatrixClientPeg.get();
+        if (client === null) return;
+
+        if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
+
+        if (EventIndexPeg.get() !== null) {
+            client.removeListener('Room.timeline', this.onRoomTimeline.bind(this));
+            client.removeListener('Event.decrypted', this.onEventDecrypted.bind(this));
+        }
     },
 
     async fetchFileEventsServer(room) {

From c5e8753b0535d898961e4e8a0d3d469a86d39fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 22 Jan 2020 16:26:40 +0100
Subject: [PATCH 0565/3235] FilePanel: Don't import the whole of the js-sdk.

---
 src/components/structures/FilePanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index a25f8babd1..7ee86436a5 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 
-import Matrix from 'matrix-js-sdk';
+import {Filter} from 'matrix-js-sdk';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
@@ -105,7 +105,7 @@ const FilePanel = createReactClass({
     async fetchFileEventsServer(room) {
         const client = MatrixClientPeg.get();
 
-        const filter = new Matrix.Filter(client.credentials.userId);
+        const filter = new Filter(client.credentials.userId);
         filter.setDefinition(
             {
                 "room": {

From c3418df9197ba46b9275f22e600997ae089f26f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 22 Jan 2020 16:31:49 +0100
Subject: [PATCH 0566/3235] FilePanel: Remove whitespace before two function
 definitions.

---
 src/components/structures/FilePanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 7ee86436a5..e03c587e61 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -42,7 +42,7 @@ const FilePanel = createReactClass({
         };
     },
 
-    onRoomTimeline (ev, room, toStartOfTimeline, removed, data) {
+    onRoomTimeline(ev, room, toStartOfTimeline, removed, data) {
         if (room.roomId !== this.props.roomId) return;
         if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
 
@@ -53,7 +53,7 @@ const FilePanel = createReactClass({
         }
     },
 
-    onEventDecrypted (ev, err) {
+    onEventDecrypted(ev, err) {
         if (ev.getRoomId() !== this.props.roomId) return;
         const eventId = ev.getId();
 

From 33b5d42c0687185ca02c1661e22e4d49dfcdb867 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 15:34:17 +0000
Subject: [PATCH 0567/3235] Be consistent about our settings svg, free the
 other one

---
 res/css/structures/_GroupView.scss                        | 2 +-
 res/img/icons-settings-room.svg                           | 6 ------
 src/components/views/context_menus/RoomTileContextMenu.js | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 res/img/icons-settings-room.svg

diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 4ec53a3c9a..517b8b1922 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -63,7 +63,7 @@ limitations under the License.
 }
 
 .mx_GroupHeader_editButton::before {
-    mask-image: url('$(res)/img/icons-settings-room.svg');
+    mask-image: url('$(res)/img/feather-customised/settings.svg');
 }
 
 .mx_GroupHeader_shareButton::before {
diff --git a/res/img/icons-settings-room.svg b/res/img/icons-settings-room.svg
deleted file mode 100644
index 421eefdefa..0000000000
--- a/res/img/icons-settings-room.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00545 1.06618C7.82268 1.06619 7.66831 1.20186 7.64482 1.38311L7.4704 2.72959C6.80076 2.8906 6.17084 3.15423 5.59936 3.50402L4.52364 2.67618C4.37886 2.56476 4.1739 2.57804 4.04471 2.7072L3.34289 3.40902L2.63925 4.11266C2.51008 4.24184 2.49678 4.44679 2.60818 4.59158L3.43624 5.66766C3.08773 6.23834 2.82293 6.86706 2.66158 7.53692L1.31647 7.71288C1.13542 7.73658 1.00002 7.89085 1 8.07345V9.06618V10.0607C1.00002 10.2435 1.13564 10.3978 1.31687 10.4214L2.66158 10.5957C2.8226 11.2654 3.08622 11.8954 3.43602 12.4669L2.60818 13.5426C2.49671 13.6875 2.51016 13.8927 2.6396 14.0218L3.34255 14.723H3.34324L4.04436 15.4259C4.17359 15.5555 4.37893 15.5688 4.52385 15.4571L5.59949 14.6278C6.17069 14.9777 6.80053 15.2425 7.47045 15.4039L7.64489 16.7486C7.6684 16.9298 7.82272 17.0655 8.00545 17.0655H9H9.99273C10.1755 17.0655 10.3298 16.9299 10.3533 16.7487L10.5278 15.4039C11.1977 15.2425 11.8275 14.9777 12.3987 14.6278L13.4744 15.4571C13.6193 15.5688 13.8246 15.5555 13.9539 15.4259L14.655 14.723H14.6553H14.6557L15.3586 14.0218C15.4881 13.8927 15.5015 13.6875 15.39 13.5426L14.5622 12.4669C14.912 11.8954 15.1756 11.2655 15.3366 10.5958L16.6831 10.4214C16.8644 10.3979 17 10.2435 17 10.0607V9.06618V8.07345C17 7.89085 16.8646 7.73657 16.6835 7.71288L15.3366 7.53686C15.1756 6.86843 14.9119 6.23874 14.5622 5.66732L15.39 4.59158C15.5014 4.4468 15.4881 4.24185 15.359 4.11266L14.6553 3.40902L13.9535 2.7072C13.8243 2.57805 13.6194 2.56478 13.4746 2.67618L12.3989 3.50402C11.8274 3.15422 11.1974 2.89054 10.5278 2.72953L10.3533 1.38311C10.3299 1.20186 10.1755 1.0662 9.99273 1.06618H9H8.00545V1.06618ZM8.325 1.79345H9H9.67318L9.83936 3.07652C9.85943 3.23139 9.97613 3.35616 10.1293 3.38652C10.8891 3.53711 11.5952 3.83463 12.2159 4.25016C12.3456 4.337 12.5163 4.33137 12.64 4.23618L13.6651 3.44731L14.1411 3.92328L14.6189 4.40112L13.83 5.42623C13.7348 5.54994 13.7292 5.72057 13.816 5.85027C14.2315 6.471 14.5291 7.17724 14.6797 7.93521C14.7101 8.08816 14.8346 8.2047 14.9893 8.22492L16.2727 8.39265V9.06618V9.74118L14.9897 9.90736C14.8348 9.92745 14.7101 10.0441 14.6797 10.1973C14.5291 10.9571 14.2315 11.6632 13.816 12.2839C13.7292 12.4136 13.7348 12.5842 13.83 12.7079L14.6186 13.7327L14.1414 14.2087C14.1412 14.2087 14.141 14.2087 14.1407 14.2087L13.6649 14.6857L12.6402 13.8957C12.5165 13.8003 12.3457 13.7946 12.2159 13.8815C11.5948 14.2973 10.8886 14.5965 10.1293 14.747C9.97618 14.7774 9.85952 14.9021 9.83944 15.0569L9.67324 16.3383H9H8.325L8.1588 15.057C8.13872 14.9021 8.02205 14.7774 7.86891 14.747C7.10964 14.5965 6.40344 14.2973 5.78233 13.8815C5.65252 13.7946 5.48172 13.8003 5.358 13.8957L4.33329 14.6857L3.85749 14.2087C3.85727 14.2087 3.85704 14.2087 3.85682 14.2087L3.3796 13.7327L4.16818 12.708C4.26337 12.5843 4.26901 12.4136 4.18222 12.2839C3.76667 11.6632 3.46911 10.9571 3.31853 10.1973C3.28818 10.0442 3.16346 9.92749 3.00864 9.90738L1.72727 9.7412V9.06618V8.39259L3.00904 8.22494C3.16369 8.20468 3.2882 8.08805 3.31853 7.93505C3.46898 7.17588 3.76816 6.47136 4.1826 5.8497C4.26901 5.72004 4.26321 5.54973 4.16818 5.42624L3.37931 4.40112L3.85715 3.92328L4.33313 3.44732L5.35824 4.23618C5.48195 4.33137 5.65261 4.337 5.78233 4.25016C6.40305 3.83463 7.10913 3.53712 7.86891 3.38653C8.02207 3.35614 8.13874 3.23138 8.1588 3.07653L8.325 1.79346V1.79345Z" fill="#9FA9BA"/>
-<path d="M8.00545 1.06618L8.00546 1.16618L8.10545 1.16618V1.06618H8.00545ZM7.64482 1.38311L7.54565 1.37026L7.54565 1.37027L7.64482 1.38311ZM7.4704 2.72959L7.49378 2.82682L7.56073 2.81072L7.56957 2.74244L7.4704 2.72959ZM5.59936 3.50402L5.53838 3.58327L5.59289 3.62523L5.65157 3.58931L5.59936 3.50402ZM4.52364 2.67618L4.46265 2.75543L4.46265 2.75543L4.52364 2.67618ZM4.04471 2.7072L3.97401 2.63649L3.974 2.63649L4.04471 2.7072ZM2.63925 4.11266L2.56854 4.04195L2.56854 4.04195L2.63925 4.11266ZM2.60818 4.59158L2.52893 4.65256L2.52893 4.65256L2.60818 4.59158ZM3.43624 5.66766L3.52158 5.71978L3.55739 5.66113L3.51549 5.60667L3.43624 5.66766ZM2.66158 7.53692L2.67455 7.63607L2.74271 7.62716L2.7588 7.56034L2.66158 7.53692ZM1.31647 7.71288L1.3035 7.61373L1.30349 7.61373L1.31647 7.71288ZM1 8.07345L0.9 8.07344V8.07345H1ZM1 10.0607H0.9V10.0608L1 10.0607ZM1.31687 10.4214L1.304 10.5205L1.30401 10.5205L1.31687 10.4214ZM2.66158 10.5957L2.75881 10.5724L2.74272 10.5054L2.67444 10.4966L2.66158 10.5957ZM3.43602 12.4669L3.51527 12.5279L3.55722 12.4733L3.52131 12.4147L3.43602 12.4669ZM2.60818 13.5426L2.52893 13.4816L2.52892 13.4816L2.60818 13.5426ZM2.6396 14.0218L2.56898 14.0926L2.56898 14.0926L2.6396 14.0218ZM3.34255 14.723L3.27193 14.7938L3.3012 14.823H3.34255V14.723ZM3.34324 14.723L3.41404 14.6523L3.38473 14.623H3.34324V14.723ZM4.04436 15.4259L3.97356 15.4965L3.97357 15.4965L4.04436 15.4259ZM4.52385 15.4571L4.5849 15.5363L4.58491 15.5363L4.52385 15.4571ZM5.59949 14.6278L5.65173 14.5425L5.59298 14.5065L5.53843 14.5486L5.59949 14.6278ZM7.47045 15.4039L7.56962 15.391L7.56077 15.3228L7.49387 15.3067L7.47045 15.4039ZM7.64489 16.7486L7.74406 16.7358L7.64489 16.7486ZM8.00545 17.0655L8.00543 17.1655H8.00545V17.0655ZM9.99273 17.0655V17.1655H9.99274L9.99273 17.0655ZM10.3533 16.7487L10.4525 16.7615V16.7615L10.3533 16.7487ZM10.5278 15.4039L10.5044 15.3067L10.4375 15.3228L10.4286 15.391L10.5278 15.4039ZM12.3987 14.6278L12.4598 14.5486L12.4053 14.5065L12.3465 14.5425L12.3987 14.6278ZM13.4744 15.4571L13.4133 15.5363L13.4133 15.5363L13.4744 15.4571ZM13.9539 15.4259L14.0246 15.4966L14.0247 15.4965L13.9539 15.4259ZM14.655 14.723V14.623H14.6135L14.5842 14.6523L14.655 14.723ZM14.6557 14.723V14.823H14.697L14.7263 14.7938L14.6557 14.723ZM15.3586 14.0218L15.4293 14.0926L15.4293 14.0926L15.3586 14.0218ZM15.39 13.5426L15.4693 13.4817L15.4693 13.4816L15.39 13.5426ZM14.5622 12.4669L14.4769 12.4147L14.441 12.4734L14.4829 12.5279L14.5622 12.4669ZM15.3366 10.5958L15.3238 10.4966L15.2555 10.5055L15.2394 10.5724L15.3366 10.5958ZM16.6831 10.4214L16.696 10.5206L16.696 10.5205L16.6831 10.4214ZM17 10.0607L17.1 10.0607V10.0607H17ZM17 8.07345H17.1V8.07344L17 8.07345ZM16.6835 7.71288L16.6965 7.61373L16.6965 7.61373L16.6835 7.71288ZM15.3366 7.53686L15.2394 7.56028L15.2555 7.62711L15.3236 7.63602L15.3366 7.53686ZM14.5622 5.66732L14.4829 5.60633L14.441 5.66085L14.4769 5.71952L14.5622 5.66732ZM15.39 4.59158L15.4693 4.65257L15.4693 4.65257L15.39 4.59158ZM15.359 4.11266L15.4297 4.04196L15.4297 4.04195L15.359 4.11266ZM14.6553 3.40902L14.5846 3.47973H14.5846L14.6553 3.40902ZM13.9535 2.7072L14.0242 2.63649L14.0242 2.63648L13.9535 2.7072ZM13.4746 2.67618L13.4136 2.59693L13.4136 2.59693L13.4746 2.67618ZM12.3989 3.50402L12.3466 3.58931L12.4053 3.62523L12.4598 3.58327L12.3989 3.50402ZM10.5278 2.72953L10.4286 2.74238L10.4375 2.81067L10.5044 2.82676L10.5278 2.72953ZM10.3533 1.38311L10.4525 1.37027L10.4525 1.37026L10.3533 1.38311ZM9.99273 1.06618L9.99274 0.966181H9.99273V1.06618ZM8.00545 1.06618V0.966181H7.90545V1.06618H8.00545ZM8.325 1.79345V1.69345H8.225V1.79345H8.325ZM9.67318 1.79345L9.77235 1.78061L9.76107 1.69345H9.67318V1.79345ZM9.83936 3.07652L9.74019 3.08937V3.08937L9.83936 3.07652ZM10.1293 3.38652L10.1099 3.48461L10.1099 3.48462L10.1293 3.38652ZM12.2159 4.25016L12.2715 4.16706L12.2715 4.16706L12.2159 4.25016ZM12.64 4.23618L12.701 4.31543L12.701 4.31543L12.64 4.23618ZM13.6651 3.44731L13.7358 3.3766L13.6737 3.3145L13.6041 3.36806L13.6651 3.44731ZM14.1411 3.92328L14.2118 3.85257L14.2118 3.85257L14.1411 3.92328ZM14.6189 4.40112L14.6982 4.46211L14.7517 4.39251L14.6896 4.33041L14.6189 4.40112ZM13.83 5.42623L13.7508 5.36525L13.7507 5.36526L13.83 5.42623ZM13.816 5.85027L13.7329 5.90589L13.7329 5.9059L13.816 5.85027ZM14.6797 7.93521L14.5816 7.95469L14.5816 7.9547L14.6797 7.93521ZM14.9893 8.22492L14.9763 8.32408L14.9763 8.32408L14.9893 8.22492ZM16.2727 8.39265H16.3727V8.30486L16.2857 8.29349L16.2727 8.39265ZM16.2727 9.74118L16.2856 9.84035L16.3727 9.82906V9.74118H16.2727ZM14.9897 9.90736L14.9768 9.80819L14.9768 9.80819L14.9897 9.90736ZM14.6797 10.1973L14.5816 10.1779V10.1779L14.6797 10.1973ZM13.816 12.2839L13.7329 12.2283L13.7329 12.2283L13.816 12.2839ZM13.83 12.7079L13.7507 12.7689L13.7508 12.7689L13.83 12.7079ZM14.6186 13.7327L14.6893 13.8035L14.7515 13.7414L14.6979 13.6717L14.6186 13.7327ZM14.1414 14.2087L14.1413 14.3087L14.1827 14.3087L14.212 14.2795L14.1414 14.2087ZM14.1407 14.2087L14.1406 14.1087L14.0992 14.1087L14.0699 14.1381L14.1407 14.2087ZM13.6649 14.6857L13.6039 14.7649L13.6736 14.8187L13.7358 14.7563L13.6649 14.6857ZM12.6402 13.8957L12.7013 13.8165L12.7013 13.8165L12.6402 13.8957ZM12.2159 13.8815L12.1603 13.7984L12.1603 13.7984L12.2159 13.8815ZM10.1293 14.747L10.1099 14.6489L10.1098 14.6489L10.1293 14.747ZM9.83944 15.0569L9.74027 15.0441L9.74027 15.0441L9.83944 15.0569ZM9.67324 16.3383V16.4383H9.7611L9.77241 16.3511L9.67324 16.3383ZM8.325 16.3383L8.22583 16.3511L8.23713 16.4383H8.325V16.3383ZM8.1588 15.057L8.05963 15.0698L8.05963 15.0698L8.1588 15.057ZM7.86891 14.747L7.88837 14.6489L7.88835 14.6489L7.86891 14.747ZM5.78233 13.8815L5.83796 13.7984L5.83795 13.7984L5.78233 13.8815ZM5.358 13.8957L5.29695 13.8165L5.29694 13.8165L5.358 13.8957ZM4.33329 14.6857L4.26249 14.7564L4.32465 14.8187L4.39435 14.7649L4.33329 14.6857ZM3.85749 14.2087L3.92829 14.1381L3.89903 14.1087L3.85758 14.1087L3.85749 14.2087ZM3.85682 14.2087L3.7862 14.2795L3.81551 14.3087L3.85691 14.3087L3.85682 14.2087ZM3.3796 13.7327L3.30035 13.6717L3.24672 13.7414L3.30898 13.8035L3.3796 13.7327ZM4.16818 12.708L4.24743 12.769L4.24743 12.7689L4.16818 12.708ZM4.18222 12.2839L4.26533 12.2283L4.26532 12.2283L4.18222 12.2839ZM3.31853 10.1973L3.22044 10.2168V10.2168L3.31853 10.1973ZM3.00864 9.90738L3.02152 9.80821L3.0215 9.80821L3.00864 9.90738ZM1.72727 9.7412H1.62727V9.82907L1.71441 9.84037L1.72727 9.7412ZM1.72727 8.39259L1.7143 8.29344L1.62727 8.30482V8.39259H1.72727ZM3.00904 8.22494L3.02201 8.32409L3.02203 8.32409L3.00904 8.22494ZM3.31853 7.93505L3.41662 7.95449L3.31853 7.93505ZM4.1826 5.8497L4.26581 5.90517L4.26582 5.90516L4.1826 5.8497ZM4.16818 5.42624L4.24743 5.36525V5.36525L4.16818 5.42624ZM3.37931 4.40112L3.3086 4.33041L3.2465 4.39251L3.30006 4.46211L3.37931 4.40112ZM3.85715 3.92328L3.78644 3.85257L3.78643 3.85257L3.85715 3.92328ZM4.33313 3.44732L4.39411 3.36807L4.32452 3.31451L4.26242 3.37661L4.33313 3.44732ZM5.35824 4.23618L5.29725 4.31543L5.29725 4.31543L5.35824 4.23618ZM5.78233 4.25016L5.7267 4.16706L5.7267 4.16707L5.78233 4.25016ZM7.86891 3.38653L7.88835 3.48462L7.88837 3.48462L7.86891 3.38653ZM8.1588 3.07653L8.25797 3.08937V3.08937L8.1588 3.07653ZM8.325 1.79346L8.425 1.80641V1.79346H8.325ZM8.00545 0.966181C7.77242 0.966194 7.5756 1.13916 7.54565 1.37026L7.74399 1.39597C7.76102 1.26455 7.87294 1.16619 8.00546 1.16618L8.00545 0.966181ZM7.54565 1.37027L7.37123 2.71674L7.56957 2.74244L7.74399 1.39596L7.54565 1.37027ZM7.44702 2.63236C6.7671 2.79584 6.12746 3.06353 5.54716 3.41873L5.65157 3.58931C6.21421 3.24493 6.83442 2.98536 7.49378 2.82682L7.44702 2.63236ZM5.66035 3.42477L4.58462 2.59693L4.46265 2.75543L5.53838 3.58327L5.66035 3.42477ZM4.58463 2.59693C4.40004 2.45488 4.13872 2.47181 3.97401 2.63649L4.11541 2.77792C4.20908 2.68428 4.35768 2.67465 4.46265 2.75543L4.58463 2.59693ZM3.974 2.63649L3.27218 3.33831L3.4136 3.47973L4.11542 2.77792L3.974 2.63649ZM3.27218 3.33831L2.56854 4.04195L2.70997 4.18337L3.4136 3.47973L3.27218 3.33831ZM2.56854 4.04195C2.40385 4.20665 2.3869 4.46796 2.52893 4.65256L2.68744 4.5306C2.60667 4.42563 2.61631 4.27703 2.70997 4.18337L2.56854 4.04195ZM2.52893 4.65256L3.35698 5.72864L3.51549 5.60667L2.68743 4.53059L2.52893 4.65256ZM3.35089 5.61554C2.9971 6.19487 2.72821 6.83326 2.56436 7.5135L2.7588 7.56034C2.91764 6.90087 3.17836 6.2818 3.52158 5.71978L3.35089 5.61554ZM2.64861 7.43776L1.3035 7.61373L1.32944 7.81204L2.67455 7.63607L2.64861 7.43776ZM1.30349 7.61373C1.07266 7.64394 0.900021 7.84064 0.9 8.07344L1.1 8.07346C1.10001 7.94107 1.19819 7.82922 1.32945 7.81204L1.30349 7.61373ZM0.9 8.07345V9.06618H1.1V8.07345H0.9ZM0.9 9.06618V10.0607H1.1V9.06618H0.9ZM0.9 10.0608C0.90002 10.2938 1.07294 10.4905 1.304 10.5205L1.32974 10.3222C1.19835 10.3051 1.10001 10.1932 1.1 10.0607L0.9 10.0608ZM1.30401 10.5205L2.64872 10.6949L2.67444 10.4966L1.32973 10.3222L1.30401 10.5205ZM2.56435 10.6191C2.72784 11.2991 2.99552 11.9388 3.35073 12.5191L3.52131 12.4147C3.17692 11.852 2.91736 11.2318 2.75881 10.5724L2.56435 10.6191ZM3.35677 12.4059L2.52893 13.4816L2.68743 13.6036L3.51527 12.5279L3.35677 12.4059ZM2.52892 13.4816C2.38679 13.6664 2.40394 13.928 2.56898 14.0926L2.71022 13.951C2.61638 13.8574 2.60662 13.7087 2.68745 13.6036L2.52892 13.4816ZM2.56898 14.0926L3.27193 14.7938L3.41317 14.6522L2.71022 13.951L2.56898 14.0926ZM3.34255 14.823H3.34324V14.623H3.34255V14.823ZM3.27243 14.7936L3.97356 15.4965L4.11517 15.3553L3.41404 14.6523L3.27243 14.7936ZM3.97357 15.4965C4.13832 15.6617 4.40013 15.6787 4.5849 15.5363L4.46281 15.3779C4.35773 15.4589 4.20885 15.4492 4.11516 15.3553L3.97357 15.4965ZM4.58491 15.5363L5.66055 14.707L5.53843 14.5486L4.46279 15.3779L4.58491 15.5363ZM5.54726 14.7131C6.12721 15.0683 6.76675 15.3373 7.44704 15.5011L7.49387 15.3067C6.83431 15.1478 6.21417 14.887 5.65173 14.5425L5.54726 14.7131ZM7.37129 15.4167L7.54572 16.7615L7.74406 16.7358L7.56962 15.391L7.37129 15.4167ZM7.54572 16.7615C7.57569 16.9925 7.77245 17.1655 8.00543 17.1655L8.00548 16.9655C7.87299 16.9655 7.7611 16.8672 7.74406 16.7358L7.54572 16.7615ZM8.00545 17.1655H9V16.9655H8.00545V17.1655ZM9 17.1655H9.99273V16.9655H9V17.1655ZM9.99274 17.1655C10.2257 17.1655 10.4225 16.9926 10.4525 16.7615L10.2542 16.7358C10.2371 16.8672 10.1252 16.9655 9.99272 16.9655L9.99274 17.1655ZM10.4525 16.7615L10.627 15.4167L10.4286 15.391L10.2542 16.7358L10.4525 16.7615ZM10.5512 15.5011C11.2315 15.3373 11.871 15.0683 12.451 14.7131L12.3465 14.5425C11.7841 14.887 11.1639 15.1478 10.5044 15.3067L10.5512 15.5011ZM12.3377 14.707L13.4133 15.5363L13.5354 15.3779L12.4598 14.5486L12.3377 14.707ZM13.4133 15.5363C13.5981 15.6787 13.8599 15.6617 14.0246 15.4966L13.8831 15.3553C13.7894 15.4492 13.6405 15.4589 13.5354 15.3779L13.4133 15.5363ZM14.0247 15.4965L14.7258 14.7936L14.5842 14.6523L13.8831 15.3553L14.0247 15.4965ZM14.655 14.823H14.6553V14.623H14.655V14.823ZM14.6553 14.823H14.6557V14.623H14.6553V14.823ZM14.7263 14.7938L15.4293 14.0926L15.288 13.951L14.5851 14.6522L14.7263 14.7938ZM15.4293 14.0926C15.5943 13.928 15.6114 13.6664 15.4693 13.4817L15.3107 13.6036C15.3916 13.7087 15.3818 13.8574 15.288 13.951L15.4293 14.0926ZM15.4693 13.4816L14.6414 12.4059L14.4829 12.5279L15.3108 13.6036L15.4693 13.4816ZM14.6475 12.5191C15.0027 11.9388 15.2704 11.2991 15.4339 10.6192L15.2394 10.5724C15.0809 11.2318 14.8213 11.852 14.4769 12.4147L14.6475 12.5191ZM15.3495 10.695L16.696 10.5206L16.6703 10.3222L15.3238 10.4966L15.3495 10.695ZM16.696 10.5205C16.9271 10.4906 17.1 10.2938 17.1 10.0607L16.9 10.0607C16.9 10.1932 16.8017 10.3052 16.6703 10.3222L16.696 10.5205ZM17.1 10.0607V9.06618H16.9V10.0607H17.1ZM17.1 9.06618V8.07345H16.9V9.06618H17.1ZM17.1 8.07344C17.1 7.84063 16.9273 7.64393 16.6965 7.61373L16.6705 7.81204C16.8018 7.82921 16.9 7.94107 16.9 8.07346L17.1 8.07344ZM16.6965 7.61373L15.3495 7.43771L15.3236 7.63602L16.6706 7.81204L16.6965 7.61373ZM15.4338 7.51345C15.2703 6.83474 15.0026 6.19535 14.6475 5.61511L14.4769 5.71952C14.8212 6.28213 15.0808 6.90212 15.2394 7.56028L15.4338 7.51345ZM14.6414 5.7283L15.4693 4.65257L15.3108 4.53059L14.4829 5.60633L14.6414 5.7283ZM15.4693 4.65257C15.6113 4.46798 15.5944 4.20666 15.4297 4.04196L15.2882 4.18336C15.3819 4.27703 15.3915 4.42563 15.3107 4.53059L15.4693 4.65257ZM15.4297 4.04195L14.726 3.33831L14.5846 3.47973L15.2883 4.18337L15.4297 4.04195ZM14.726 3.33831L14.0242 2.63649L13.8828 2.77792L14.5846 3.47973L14.726 3.33831ZM14.0242 2.63648C13.8595 2.47182 13.5982 2.45489 13.4136 2.59693L13.5356 2.75543C13.6405 2.67466 13.7891 2.68429 13.8828 2.77793L14.0242 2.63648ZM13.4136 2.59693L12.3379 3.42477L12.4598 3.58327L13.5356 2.75543L13.4136 2.59693ZM12.4511 3.41873C11.8707 3.06353 11.2311 2.79579 10.5512 2.6323L10.5044 2.82676C11.1638 2.9853 11.784 3.24491 12.3466 3.58931L12.4511 3.41873ZM10.627 2.71669L10.4525 1.37027L10.2542 1.39596L10.4286 2.74238L10.627 2.71669ZM10.4525 1.37026C10.4226 1.13917 10.2258 0.966206 9.99274 0.966181L9.99272 1.16618C10.1252 1.1662 10.2371 1.26455 10.2542 1.39597L10.4525 1.37026ZM9.99273 0.966181H9V1.16618H9.99273V0.966181ZM9 0.966181H8.00545V1.16618H9V0.966181ZM7.90545 1.06618V1.06618H8.10545V1.06618H7.90545ZM8.325 1.89345H9V1.69345H8.325V1.89345ZM9 1.89345H9.67318V1.69345H9V1.89345ZM9.57401 1.8063L9.74019 3.08937L9.93854 3.06368L9.77235 1.78061L9.57401 1.8063ZM9.74019 3.08937C9.76578 3.28682 9.91456 3.4459 10.1099 3.48461L10.1488 3.28843C10.0377 3.26642 9.95308 3.17596 9.93853 3.06367L9.74019 3.08937ZM10.1099 3.48462C10.8566 3.63261 11.5504 3.92497 12.1603 4.33326L12.2715 4.16706C11.64 3.74429 10.9217 3.44161 10.1488 3.28843L10.1099 3.48462ZM12.1603 4.33326C12.3257 4.44397 12.5433 4.4368 12.701 4.31543L12.579 4.15692C12.4893 4.22594 12.3656 4.23002 12.2715 4.16706L12.1603 4.33326ZM12.701 4.31543L13.7261 3.52656L13.6041 3.36806L12.579 4.15693L12.701 4.31543ZM13.5944 3.51802L14.0704 3.99399L14.2118 3.85257L13.7358 3.3766L13.5944 3.51802ZM14.0704 3.99399L14.5482 4.47183L14.6896 4.33041L14.2118 3.85257L14.0704 3.99399ZM14.5397 4.34013L13.7508 5.36525L13.9092 5.48722L14.6982 4.46211L14.5397 4.34013ZM13.7507 5.36526C13.6294 5.52297 13.6222 5.74052 13.7329 5.90589L13.8991 5.79465C13.8362 5.70061 13.8403 5.5769 13.9093 5.48721L13.7507 5.36526ZM13.7329 5.9059C14.1412 6.51583 14.4337 7.20981 14.5816 7.95469L14.7778 7.91573C14.6246 7.14467 14.3219 6.42617 13.8991 5.79464L13.7329 5.9059ZM14.5816 7.9547C14.6204 8.14971 14.7792 8.2983 14.9763 8.32408L15.0022 8.12576C14.8901 8.11111 14.7998 8.02661 14.7778 7.91572L14.5816 7.9547ZM14.9763 8.32408L16.2598 8.4918L16.2857 8.29349L15.0022 8.12576L14.9763 8.32408ZM16.1727 8.39265V9.06618H16.3727V8.39265H16.1727ZM16.1727 9.06618V9.74118H16.3727V9.06618H16.1727ZM16.2599 9.64201L14.9768 9.80819L15.0025 10.0065L16.2856 9.84035L16.2599 9.64201ZM14.9768 9.80819C14.7794 9.83381 14.6203 9.98259 14.5816 10.1779L14.7778 10.2168C14.7998 10.1057 14.8903 10.0211 15.0025 10.0065L14.9768 9.80819ZM14.5816 10.1779C14.4336 10.9246 14.1412 11.6184 13.7329 12.2283L13.8991 12.3395C14.3219 11.708 14.6246 10.9897 14.7778 10.2167L14.5816 10.1779ZM13.7329 12.2283C13.6222 12.3937 13.6294 12.6112 13.7507 12.7689L13.9093 12.647C13.8403 12.5573 13.8362 12.4336 13.8991 12.3395L13.7329 12.2283ZM13.7508 12.7689L14.5394 13.7937L14.6979 13.6717L13.9092 12.647L13.7508 12.7689ZM14.548 13.6619L14.0708 14.1379L14.212 14.2795L14.6893 13.8035L14.548 13.6619ZM14.1415 14.1087C14.1412 14.1087 14.1409 14.1087 14.1406 14.1087L14.1408 14.3087C14.141 14.3087 14.1412 14.3087 14.1413 14.3087L14.1415 14.1087ZM14.0699 14.1381L13.5941 14.6151L13.7358 14.7563L14.2115 14.2793L14.0699 14.1381ZM13.726 14.6065L12.7013 13.8165L12.5792 13.9749L13.6039 14.7649L13.726 14.6065ZM12.7013 13.8165C12.5435 13.6949 12.3258 13.6876 12.1603 13.7984L12.2715 13.9646C12.3656 13.9016 12.4895 13.9057 12.5792 13.9749L12.7013 13.8165ZM12.1603 13.7984C11.5499 14.207 10.8559 14.5011 10.1099 14.6489L10.1488 14.8451C10.9213 14.692 11.6397 14.3875 12.2715 13.9646L12.1603 13.7984ZM10.1098 14.6489C9.91461 14.6877 9.76588 14.8467 9.74027 15.0441L9.93861 15.0698C9.95317 14.9576 10.0377 14.8671 10.1488 14.8451L10.1098 14.6489ZM9.74027 15.0441L9.57407 16.3254L9.77241 16.3511L9.93861 15.0698L9.74027 15.0441ZM9.67324 16.2383H9V16.4383H9.67324V16.2383ZM9 16.2383H8.325V16.4383H9V16.2383ZM8.42417 16.3254L8.25797 15.0441L8.05963 15.0698L8.22583 16.3511L8.42417 16.3254ZM8.25797 15.0441C8.23237 14.8467 8.08362 14.6877 7.88837 14.6489L7.84945 14.8451C7.96048 14.8671 8.04507 14.9576 8.05963 15.0698L8.25797 15.0441ZM7.88835 14.6489C7.14232 14.5011 6.44837 14.207 5.83796 13.7984L5.7267 13.9646C6.3585 14.3875 7.07695 14.692 7.84947 14.8451L7.88835 14.6489ZM5.83795 13.7984C5.67245 13.6876 5.45469 13.6949 5.29695 13.8165L5.41905 13.9749C5.50875 13.9057 5.63259 13.9016 5.7267 13.9646L5.83795 13.7984ZM5.29694 13.8165L4.27223 14.6066L4.39435 14.7649L5.41906 13.9749L5.29694 13.8165ZM4.40409 14.6151L3.92829 14.1381L3.78669 14.2793L4.26249 14.7564L4.40409 14.6151ZM3.85758 14.1087C3.8573 14.1087 3.85701 14.1087 3.85673 14.1087L3.85691 14.3087C3.85707 14.3087 3.85724 14.3087 3.8574 14.3087L3.85758 14.1087ZM3.92744 14.1379L3.45022 13.6619L3.30898 13.8035L3.7862 14.2795L3.92744 14.1379ZM3.45885 13.7937L4.24743 12.769L4.08893 12.647L3.30035 13.6717L3.45885 13.7937ZM4.24743 12.7689C4.36879 12.6112 4.37599 12.3937 4.26533 12.2283L4.09911 12.3395C4.16204 12.4336 4.15794 12.5573 4.08893 12.647L4.24743 12.7689ZM4.26532 12.2283C3.85701 11.6184 3.5646 10.9246 3.41662 10.1779L3.22044 10.2168C3.37361 10.9897 3.67634 11.708 4.09912 12.3396L4.26532 12.2283ZM3.41662 10.1779C3.37792 9.98263 3.21892 9.83385 3.02152 9.80821L2.99576 10.0065C3.10801 10.0211 3.19843 10.1057 3.22044 10.2168L3.41662 10.1779ZM3.0215 9.80821L1.74013 9.64203L1.71441 9.84037L2.99577 10.0065L3.0215 9.80821ZM1.82727 9.7412V9.06618H1.62727V9.7412H1.82727ZM1.82727 9.06618V8.39259H1.62727V9.06618H1.82727ZM1.74024 8.49175L3.02201 8.32409L2.99607 8.12578L1.7143 8.29344L1.74024 8.49175ZM3.02203 8.32409C3.21921 8.29826 3.37796 8.14956 3.41662 7.95449L3.22044 7.91561C3.19845 8.02654 3.10818 8.11109 2.99605 8.12578L3.02203 8.32409ZM3.41662 7.95449C3.56444 7.20861 3.8584 6.51628 4.26581 5.90517L4.09939 5.79424C3.67793 6.42644 3.37352 7.14314 3.22044 7.91561L3.41662 7.95449ZM4.26582 5.90516C4.37599 5.73984 4.36859 5.5227 4.24743 5.36525L4.08893 5.48722C4.15783 5.57676 4.16204 5.70024 4.09939 5.79425L4.26582 5.90516ZM4.24743 5.36525L3.45856 4.34014L3.30006 4.46211L4.08893 5.48722L4.24743 5.36525ZM3.45002 4.47184L3.92786 3.99399L3.78643 3.85257L3.3086 4.33041L3.45002 4.47184ZM3.92786 3.99399L4.40384 3.51803L4.26242 3.37661L3.78644 3.85257L3.92786 3.99399ZM4.27214 3.52657L5.29725 4.31543L5.41922 4.15693L4.39411 3.36807L4.27214 3.52657ZM5.29725 4.31543C5.45498 4.4368 5.67258 4.44398 5.83796 4.33326L5.7267 4.16707C5.63265 4.23003 5.50891 4.22595 5.41922 4.15693L5.29725 4.31543ZM5.83796 4.33326C6.44787 3.92497 7.14167 3.63261 7.88835 3.48462L7.84947 3.28843C7.07659 3.44162 6.35824 3.7443 5.7267 4.16706L5.83796 4.33326ZM7.88837 3.48462C8.08364 3.44588 8.2324 3.2868 8.25797 3.08937L8.05963 3.06368C8.04508 3.17595 7.9605 3.26641 7.84945 3.28844L7.88837 3.48462ZM8.25797 3.08937L8.42417 1.8063L8.22583 1.78061L8.05963 3.06368L8.25797 3.08937ZM8.425 1.79346V1.79345H8.225V1.79346H8.425Z" fill="#9FA9BA"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.99964 5.42982C6.99417 5.42982 5.36328 7.06258 5.36328 9.06618C5.36328 11.0698 6.99417 12.7026 8.99964 12.7026C11.0035 12.7026 12.636 11.07 12.636 9.06618C12.636 7.06234 11.0035 5.42982 8.99964 5.42982ZM8.99964 6.15709C10.6103 6.15709 11.9087 7.45548 11.9087 9.06618C11.9087 10.6769 10.6103 11.9753 8.99964 11.9753C7.38692 11.9753 6.09055 10.6771 6.09055 9.06618C6.09055 7.45523 7.38692 6.15709 8.99964 6.15709Z" fill="#9FA9BA"/>
-<path d="M8.99964 5.32982C6.93891 5.32982 5.26328 7.00738 5.26328 9.06618H5.46328C5.46328 7.11777 7.04943 5.52982 8.99964 5.52982V5.32982ZM5.26328 9.06618C5.26328 11.125 6.93891 12.8026 8.99964 12.8026V12.6026C7.04943 12.6026 5.46328 11.0146 5.46328 9.06618H5.26328ZM8.99964 12.8026C11.0587 12.8026 12.736 11.1253 12.736 9.06618H12.536C12.536 11.0148 10.9483 12.6026 8.99964 12.6026V12.8026ZM12.736 9.06618C12.736 7.00711 11.0587 5.32982 8.99964 5.32982V5.52982C10.9483 5.52982 12.536 7.11756 12.536 9.06618H12.736ZM8.99964 6.25709C10.5551 6.25709 11.8087 7.51071 11.8087 9.06618H12.0087C12.0087 7.40025 10.6656 6.05709 8.99964 6.05709V6.25709ZM11.8087 9.06618C11.8087 10.6217 10.5551 11.8753 8.99964 11.8753V12.0753C10.6656 12.0753 12.0087 10.7321 12.0087 9.06618H11.8087ZM8.99964 11.8753C7.44219 11.8753 6.19055 10.622 6.19055 9.06618H5.99055C5.99055 10.7323 7.33165 12.0753 8.99964 12.0753V11.8753ZM6.19055 9.06618C6.19055 7.51042 7.44219 6.25709 8.99964 6.25709V6.05709C7.33165 6.05709 5.99055 7.40004 5.99055 9.06618H6.19055Z" fill="#9FA9BA"/>
-</svg>
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index 6e2bd8ebf5..2d8dec29c7 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -306,7 +306,7 @@ export default createReactClass({
         return (
             <div>
                 <MenuItem className="mx_RoomTileContextMenu_tag_field" onClick={this._onClickSettings}>
-                    <img className="mx_RoomTileContextMenu_tag_icon" src={require("../../../../res/img/icons-settings-room.svg")} width="15" height="15" alt="" />
+                    <img className="mx_RoomTileContextMenu_tag_icon" src={require("../../../../res/img/feather-customised/settings.svg")} width="15" height="15" alt="" />
                     { _t('Settings') }
                 </MenuItem>
             </div>

From 9706114bb571a903fd607838229717fe767fe465 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 16:54:31 +0000
Subject: [PATCH 0568/3235] move E2E_STATE to E2EIcon to simplify imports

---
 src/components/views/rooms/E2EIcon.js   | 18 +++++++++++++-----
 src/components/views/rooms/EventTile.js |  8 +-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 545d1fd7ed..6ee20023ff 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -14,22 +14,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import SettingsStore from '../../../settings/SettingsStore';
 
+export const E2E_STATE = {
+    VERIFIED: "verified",
+    WARNING: "warning",
+    UNKNOWN: "unknown",
+    NORMAL: "normal",
+};
+
 export default function(props) {
-    const { isUser } = props;
-    const isNormal = props.status === "normal";
-    const isWarning = props.status === "warning";
-    const isVerified = props.status === "verified";
+    const { isUser, status, className } = props;
+    const isNormal = status === E2E_STATE.NORMAL;
+    const isWarning = status === E2E_STATE.WARNING;
+    const isVerified = status === E2E_STATE.VERIFIED;
     const e2eIconClasses = classNames({
         mx_E2EIcon: true,
         mx_E2EIcon_warning: isWarning,
         mx_E2EIcon_normal: isNormal,
         mx_E2EIcon_verified: isVerified,
-    }, props.className);
+    }, className);
     let e2eTitle;
 
     const crossSigning = SettingsStore.isFeatureEnabled("feature_cross_signing");
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 634b77c9e1..940515f02e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -33,6 +33,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {E2E_STATE} from "./E2EIcon";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -66,13 +67,6 @@ const stateEventTileTypes = {
     'm.room.related_groups': 'messages.TextualEvent',
 };
 
-const E2E_STATE = {
-    VERIFIED: "verified",
-    WARNING: "warning",
-    UNKNOWN: "unknown",
-    NORMAL: "normal",
-};
-
 // Add all the Mjolnir stuff to the renderer
 for (const evType of ALL_RULE_TYPES) {
     stateEventTileTypes[evType] = 'messages.TextualEvent';

From b7d1c17ad1453c237e99e3bd87d1fdb722bb01d7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Jan 2020 16:56:27 +0000
Subject: [PATCH 0569/3235] simple optimization to bail out of check on first
 failure

---
 src/components/structures/RoomView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9b02f6d503..23d3002faa 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -812,10 +812,10 @@ export default createReactClass({
         /* Check all verified user devices. */
         for (const userId of verified) {
             const devices = await cli.getStoredDevicesForUser(userId);
-            const allDevicesVerified = devices.every(({deviceId}) => {
-                return cli.checkDeviceTrust(userId, deviceId).isVerified();
+            const anyDeviceNotVerified = devices.some(({deviceId}) => {
+                return !cli.checkDeviceTrust(userId, deviceId).isVerified();
             });
-            if (!allDevicesVerified) {
+            if (anyDeviceNotVerified) {
                 this.setState({
                     e2eStatus: "warning",
                 });

From 78654cc69308641142b355ad601a7fd071ed8b8f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 18:08:39 +0000
Subject: [PATCH 0570/3235] Updated visuals for cross-signing bootstrap

 * Use Fields rather than plain inputs
 * Update padding & alignment to match designs
 * Add Skip buttons
 * Update copy as per designs

Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
---
 .../_CreateSecretStorageDialog.scss           | 20 ++---
 .../CreateSecretStorageDialog.js              | 88 ++++++++++---------
 src/i18n/strings/en_EN.json                   | 18 ++--
 3 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index 5899abdf73..ed5aaa05a3 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -1,6 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ limitations under the License.
 
 .mx_CreateSecretStorageDialog_primaryContainer {
     /* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
-    padding: 20px;
+    padding-top: 20px;
 }
 
 .mx_CreateSecretStorageDialog_primaryContainer::after {
@@ -36,9 +36,13 @@ limitations under the License.
     align-items: flex-start;
 }
 
+.mx_Field.mx_CreateSecretStorageDialog_passPhraseField {
+    margin-top: 0px;
+}
+
 .mx_CreateSecretStorageDialog_passPhraseHelp {
     flex: 1;
-    height: 85px;
+    height: 64px;
     margin-left: 20px;
     font-size: 80%;
 }
@@ -47,16 +51,8 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_CreateSecretStorageDialog_passPhraseInput {
-    flex: none;
-    width: 250px;
-    border: 1px solid $accent-color;
-    border-radius: 5px;
-    padding: 10px;
-    margin-bottom: 1em;
-}
-
 .mx_CreateSecretStorageDialog_passPhraseMatch {
+    width: 200px;
     margin-left: 20px;
 }
 
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index a56a1ee905..e3516d1245 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -405,6 +405,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        const Field = sdk.getComponent('views.elements.Field');
 
         let strengthMeter;
         let helpText;
@@ -430,39 +431,39 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <div>
             <p>{_t(
-                "<b>Warning</b>: You should only set up secret storage from a trusted computer.", {},
-                { b: sub => <b>{sub}</b> },
+                "Set up encryption on this device to allow it to verify other devices, " +
+                "granting them access to encrypted messages and marking them as trusted for other users.",
             )}</p>
             <p>{_t(
-                "We'll use secret storage to optionally store an encrypted copy of " +
-                "your cross-signing identity for verifying other devices and message " +
-                "keys on our server. Protect your access to encrypted messages with a " +
-                "passphrase to keep it secure.",
+                "Secure your encryption keys with a passphrase. For maximum security " +
+                "this should be different to your account password:"
             )}</p>
-            <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
-            <div className="mx_CreateSecretStorageDialog_primaryContainer">
-                <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                    <input type="password"
-                        onChange={this._onPassPhraseChange}
-                        onKeyPress={this._onPassPhraseKeyPress}
-                        value={this.state.passPhrase}
-                        className="mx_CreateSecretStorageDialog_passPhraseInput"
-                        placeholder={_t("Enter a passphrase...")}
-                        autoFocus={true}
-                    />
-                    <div className="mx_CreateSecretStorageDialog_passPhraseHelp">
-                        {strengthMeter}
-                        {helpText}
-                    </div>
+            <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
+                <Field type="password"
+                    className="mx_CreateSecretStorageDialog_passPhraseField"
+                    onChange={this._onPassPhraseChange}
+                    onKeyPress={this._onPassPhraseKeyPress}
+                    value={this.state.passPhrase}
+                    label={_t("Enter a passphrase")}
+                    autoFocus={true}
+                />
+                <div className="mx_CreateSecretStorageDialog_passPhraseHelp">
+                    {strengthMeter}
+                    {helpText}
                 </div>
             </div>
 
-            <DialogButtons primaryButton={_t('Next')}
+            <DialogButtons primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
                 disabled={!this._passPhraseIsValid()}
-            />
+            >
+                <button type="button"
+                    onClick={this._onCancel}
+                    className="danger"
+                >{_t("Skip")}</button>
+            </DialogButtons>
 
             <details>
                 <summary>{_t("Advanced")}</summary>
@@ -475,6 +476,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhasePassPhraseConfirm() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const Field = sdk.getComponent('views.elements.Field');
 
         let matchText;
         if (this.state.passPhraseConfirm === this.state.passPhrase) {
@@ -492,7 +494,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         let passPhraseMatch = null;
         if (matchText) {
-            passPhraseMatch = <div className="mx_CreateSecretStorageDialog_passPhraseMatch">
+            passPhraseMatch = <div>
                 <div>{matchText}</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
@@ -504,28 +506,32 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(
-                "Please enter your passphrase a second time to confirm.",
+                "Enter your passphrase a second time to confirm it.",
             )}</p>
-            <div className="mx_CreateSecretStorageDialog_primaryContainer">
-                <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                    <div>
-                        <input type="password"
-                            onChange={this._onPassPhraseConfirmChange}
-                            onKeyPress={this._onPassPhraseConfirmKeyPress}
-                            value={this.state.passPhraseConfirm}
-                            className="mx_CreateSecretStorageDialog_passPhraseInput"
-                            placeholder={_t("Repeat your passphrase...")}
-                            autoFocus={true}
-                        />
-                    </div>
+            <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
+                <Field type="password"
+                    id="mx_CreateSecretStorageDialog_passPhraseField"
+                    onChange={this._onPassPhraseConfirmChange}
+                    onKeyPress={this._onPassPhraseConfirmKeyPress}
+                    value={this.state.passPhraseConfirm}
+                    className="mx_CreateSecretStorageDialog_passPhraseField"
+                    label={_t("Confirm your passphrase")}
+                    autoFocus={true}
+                />
+                <div className="mx_CreateSecretStorageDialog_passPhraseMatch">
                     {passPhraseMatch}
                 </div>
             </div>
-            <DialogButtons primaryButton={_t('Next')}
+            <DialogButtons primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
                 hasCancel={false}
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
-            />
+            >
+                <button type="button"
+                    onClick={this._onCancel}
+                    className="danger"
+                >{_t("Skip")}</button>
+            </DialogButtons>
         </div>;
     }
 
@@ -650,9 +656,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_MIGRATE:
                 return _t('Upgrade your encryption');
             case PHASE_PASSPHRASE:
-                return _t('Secure your encrypted messages with a passphrase');
+                return _t('Set up encryption');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm your passphrase');
+                return _t('Confirm passphrase');
             case PHASE_OPTOUT_CONFIRM:
                 return _t('Warning!');
             case PHASE_SHOWKEY:
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 29ce36a814..a49a8269df 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1976,16 +1976,15 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
-    "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a passphrase...": "Enter a passphrase...",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:",
+    "Enter a passphrase": "Enter a passphrase",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
-    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
-    "Repeat your passphrase...": "Repeat your passphrase...",
+    "Enter your passphrase a second time to confirm it.": "Enter your passphrase a second time to confirm it.",
+    "Confirm your passphrase": "Confirm your passphrase",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "As a safety net, you can use it to restore your access to encrypted messages.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
@@ -2004,8 +2003,7 @@
     "Set up secret storage": "Set up secret storage",
     "Restore your Key Backup": "Restore your Key Backup",
     "Upgrade your encryption": "Upgrade your encryption",
-    "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
-    "Confirm your passphrase": "Confirm your passphrase",
+    "Set up encryption": "Set up encryption",
     "Recovery key": "Recovery key",
     "Keep it safe": "Keep it safe",
     "Storing secrets...": "Storing secrets...",
@@ -2013,7 +2011,11 @@
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
+    "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
+    "Enter a passphrase...": "Enter a passphrase...",
     "Set up with a Recovery Key": "Set up with a Recovery Key",
+    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
+    "Repeat your passphrase...": "Repeat your passphrase...",
     "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.",
     "As a safety net, you can use it to restore your encrypted message history.": "As a safety net, you can use it to restore your encrypted message history.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",

From 30b0663eb0aa96974e84c89365e4dd8340d66e28 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 22 Jan 2020 18:15:35 +0000
Subject: [PATCH 0571/3235] lint

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

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index e3516d1245..932f6e30e4 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -436,7 +436,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "Secure your encryption keys with a passphrase. For maximum security " +
-                "this should be different to your account password:"
+                "this should be different to your account password:",
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">

From cf5673be17de09afecc33450fb5b769ed967ab0d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 22 Jan 2020 16:04:17 +0000
Subject: [PATCH 0572/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2042 of 2042 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f6c85e1674..fa7528a397 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2081,5 +2081,10 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
     "For maximum security, do this in person.": "A legnagyobb biztonság érdekében ezt személyesen tedd meg.",
     "Start Verification": "Ellenőrzés elindítása",
-    "Encrypted by a deleted device": "Egy már törölt eszköz titkosította"
+    "Encrypted by a deleted device": "Egy már törölt eszköz titkosította",
+    "Unknown Command": "Ismeretlen Parancs",
+    "Unrecognised command: %(commandText)s": "Ismeretlen parancs: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Használhatod a <code>/help</code>-et az elérhető parancsok kilistázásához. Ezt üzenetként akartad küldeni?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tipp: Ez üzenetedet kezd ezzel: <code>//</code>, ha perjellel szeretnéd kezdeni.",
+    "Send as message": "Üzenet küldése"
 }

From 78ed8019d49426ee0c80406cc281f256a7b93cf1 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 22 Jan 2020 18:29:10 +0000
Subject: [PATCH 0573/3235] Translated using Weblate (Turkish)

Currently translated at 72.6% (1482 of 2042 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 5d83ff5b06..21ccf03a46 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1452,5 +1452,49 @@
     "Please provide a room alias": "Lütfen bir oda lakabı belirtin",
     "This alias is available to use": "Bu lakap kullanmaya uygun",
     "This alias is already in use": "Bu lakap zaten kullanımda",
-    "And %(count)s more...|other": "ve %(count)s kez daha..."
+    "And %(count)s more...|other": "ve %(count)s kez daha...",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatif olarak,<code>turn.matrix.org</code> adresindeki herkese açık sunucuyu kullanmayı deneyebilirsiniz. Fakat bu güvenilir olmayabilir. IP adresiniz bu sunucu ile paylaşılacaktır. Ayarlardan yönetebilirsiniz.",
+    "An error ocurred whilst trying to remove the widget from the room": "Görsel bileşen odadan silinmeye çalışılırken bir hata oluştu",
+    "Minimize apps": "Uygulamaları küçült",
+    "Maximize apps": "Uygulamaları büyült",
+    "Popout widget": "Görsel bileşeni göster",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Lütfen GitHub’da <newIssueLink>Yeni bir talep</newIssueLink> oluşturun ki bu hatayı inceleyebilelim.",
+    "Rotate counter-clockwise": "Saat yönünün tersine döndür",
+    "Language Dropdown": "Dil Listesi",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s, %(count)s kez ayrıldı",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s kez ayrıldı",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s kez katılıp ve ayrıldı",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s kez katıldı ve ayrıldı",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s ayrıldı ve yeniden katıldı",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s kez davetlerini reddetti",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s davetlerini reddetti",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s davetlerini reddetti",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s davetlerini geri çekti",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s davetini %(count)s kez geri çekti",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s davetini geri çekti",
+    "were banned %(count)s times|other": "%(count)s kez yasaklandı",
+    "were banned %(count)s times|one": "yasaklandı",
+    "was banned %(count)s times|other": "%(count)s kez yasaklandı",
+    "was banned %(count)s times|one": "yasaklandı",
+    "were unbanned %(count)s times|other": "%(count)s kez yasak kaldırıldı",
+    "were unbanned %(count)s times|one": "yasak kaldırıldı",
+    "was unbanned %(count)s times|other": "%(count)s kez yasak kaldırıldı",
+    "was unbanned %(count)s times|one": "yasak kaldırıldı",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s resimlerini değiştirdiler",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s %(count)s kez resmini değiştirdi",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s resmini değiştirdi",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s kez hiç bir değişiklik yapmadı",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Takip eden geçerli adres tiplerinden birini kullanmayı deneyin: %(validTypesList)s.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "E-posta ile davet etmek için bir kimlik sunucusu kullan. <default> Varsayılanı kullan (%(defaultIdentityServerName)s</default> ya da <settings>Ayarlar</settings> kullanarak yönetin.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "E-posta ile davet için bir kimlik sunucu kullan. <settings>Ayarlar</settings> dan yönet.",
+    "The following users may not exist": "Belirtilen kullanıcılar mevcut olmayabilir",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Altta belirtilen Matrix ID li profiller bulunamıyor - Onları yinede davet etmek ister misiniz?",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Lütfen neyin yanlış gittiğini bize bildirin ya da en güzeli problemi tanımlayan bir GitHub talebi oluşturun.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Logları göndermeden önce, probleminizi betimleyen <a>bir GitHub talebi oluşturun</a>.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Topluluk ID leri sadece a-z, 0-9 ya da '=_-./' karakterlerini içerebilir",
+    "Set a room alias to easily share your room with other people.": "Odanızı diğer kişilerle kolayca paylaşabilmek için bir oda lakabı ayarların.",
+    "Create a public room": "Halka açık bir oda oluşturun",
+    "Make this room public": "Bu odayı halka açık yap",
+    "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": "Sohbet tarihçesini kaybetmemek için, çıkmadan önce odanızın anahtarlarını dışarıya aktarın. Bunu yapabilmek için Riotun daha yeni sürümü gerekli.  Ulaşmak için geri gitmeye ihtiyacınız var",
+    "Continue With Encryption Disabled": "Şifreleme Kapalı Şekilde Devam Et"
 }

From a504faa2f6f80fa879d46e10009c45e4474aa257 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 22 Jan 2020 22:08:34 +0000
Subject: [PATCH 0574/3235] Treat links as external in report content admin
 message

This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
---
 src/Markdown.js                               | 20 ++++++++++++++++++-
 .../views/dialogs/ReportEventDialog.js        |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Markdown.js b/src/Markdown.js
index acfea52100..437ceec88b 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -91,7 +91,7 @@ export default class Markdown {
         return true;
     }
 
-    toHTML() {
+    toHTML({ externalLinks = false } = {}) {
         const renderer = new commonmark.HtmlRenderer({
             safe: false,
 
@@ -125,6 +125,24 @@ export default class Markdown {
             }
         };
 
+        renderer.link = function(node, entering) {
+            const attrs = this.attrs(node);
+            if (entering) {
+                attrs.push(['href', this.esc(node.destination)]);
+                if (node.title) {
+                    attrs.push(['title', this.esc(node.title)]);
+                }
+                // Modified link behaviour to treat them all as external and
+                // thus opening in a new tab.
+                if (externalLinks) {
+                    attrs.push(['target', '_blank']);
+                    attrs.push(['rel', 'noopener']);
+                }
+                this.tag('a', attrs);
+            } else {
+                this.tag('/a');
+            }
+        };
 
         renderer.html_inline = html_if_tag_allowed;
 
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 2442bc2f95..99853582dd 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -102,7 +102,7 @@ export default class ReportEventDialog extends PureComponent {
             SdkConfig.get().reportEvent.adminMessageMD;
         let adminMessage;
         if (adminMessageMD) {
-            const html = new Markdown(adminMessageMD).toHTML();
+            const html = new Markdown(adminMessageMD).toHTML({ externalLinks: true });
             adminMessage = <p dangerouslySetInnerHTML={{ __html: html }} />;
         }
 

From 054ebb9458ec5fe79d0ec958d8daef2ac919c26d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Jan 2020 21:07:29 -0700
Subject: [PATCH 0575/3235] Fix scrollable area and padding in user lists
 dialog

---
 res/css/views/dialogs/_InviteDialog.scss     | 15 +++++++++++++++
 src/components/views/dialogs/InviteDialog.js |  8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 221ad7d48c..71fab50339 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -210,4 +210,19 @@ limitations under the License.
 .mx_InviteDialog {
     // Prevent the dialog from jumping around randomly when elements change.
     height: 590px;
+    padding-left: 20px; // the design wants some padding on the left
+}
+
+.mx_InviteDialog_userSections {
+    margin-top: 10px;
+    overflow-y: auto;
+    padding-right: 45px;
+    height: 455px; // mx_InviteDialog's height minus some for the upper elements
+}
+
+// Right margin for the design. We could apply this to the whole dialog, but then the scrollbar
+// for the user section gets weird.
+.mx_InviteDialog_helpText,
+.mx_InviteDialog_addressBar {
+    margin-right: 45px;
 }
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 703b0b5121..cb4f123cea 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -970,7 +970,7 @@ export default class InviteDialog extends React.PureComponent {
                 title={title}
             >
                 <div className='mx_InviteDialog_content'>
-                    <p>{helpText}</p>
+                    <p className='mx_InviteDialog_helpText'>{helpText}</p>
                     <div className='mx_InviteDialog_addressBar'>
                         {this._renderEditor()}
                         <div className='mx_InviteDialog_buttonAndSpinner'>
@@ -987,8 +987,10 @@ export default class InviteDialog extends React.PureComponent {
                     </div>
                     {this._renderIdentityServerWarning()}
                     <div className='error'>{this.state.errorText}</div>
-                    {this._renderSection('recents')}
-                    {this._renderSection('suggestions')}
+                    <div className='mx_InviteDialog_userSections'>
+                        {this._renderSection('recents')}
+                        {this._renderSection('suggestions')}
+                    </div>
                 </div>
             </BaseDialog>
         );

From 139b5663fe4015934d3833bdfe0cdf9b4e756ada Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Jan 2020 21:14:53 -0700
Subject: [PATCH 0576/3235] Remove user lists feature flag, making it the
 default

Fixes https://github.com/vector-im/riot-web/issues/11201
---
 src/RoomInvite.js        | 156 +++------------------------------------
 src/settings/Settings.js |   6 --
 2 files changed, 12 insertions(+), 150 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 2eccf69b0f..839d677069 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -20,13 +20,8 @@ import React from 'react';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
-import { getAddressType } from './UserAddress';
-import createRoom from './createRoom';
 import * as sdk from './';
-import dis from './dispatcher';
-import DMRoomMap from './utils/DMRoomMap';
 import { _t } from './languageHandler';
-import SettingsStore from "./settings/SettingsStore";
 import {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
 
 /**
@@ -44,64 +39,21 @@ export function inviteMultipleToRoom(roomId, addrs) {
 }
 
 export function showStartChatInviteDialog() {
-    if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
-        // This new dialog handles the room creation internally - we don't need to worry about it.
-        const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
-        Modal.createTrackedDialog(
-            'Start DM', '', InviteDialog, {kind: KIND_DM},
-            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
-        );
-        return;
-    }
-
-    const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-
-    Modal.createTrackedDialog('Start a chat', '', AddressPickerDialog, {
-        title: _t('Start a chat'),
-        description: _t("Who would you like to communicate with?"),
-        placeholder: (validAddressTypes) => {
-            // The set of valid address type can be mutated inside the dialog
-            // when you first have no IS but agree to use one in the dialog.
-            if (validAddressTypes.includes('email')) {
-                return _t("Email, name or Matrix ID");
-            }
-            return _t("Name or Matrix ID");
-        },
-        validAddressTypes: ['mx-user-id', 'email'],
-        button: _t("Start Chat"),
-        onFinished: _onStartDmFinished,
-    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+    // This dialog handles the room creation internally - we don't need to worry about it.
+    const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
+    Modal.createTrackedDialog(
+        'Start DM', '', InviteDialog, {kind: KIND_DM},
+        /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+    );
 }
 
 export function showRoomInviteDialog(roomId) {
-    if (SettingsStore.isFeatureEnabled("feature_ftue_dms")) {
-        // This new dialog handles the room creation internally - we don't need to worry about it.
-        const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
-        Modal.createTrackedDialog(
-            'Invite Users', '', InviteDialog, {kind: KIND_INVITE, roomId},
-            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
-        );
-        return;
-    }
-
-    const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-
-    Modal.createTrackedDialog('Chat Invite', '', AddressPickerDialog, {
-        title: _t('Invite new room members'),
-        button: _t('Send Invites'),
-        placeholder: (validAddressTypes) => {
-            // The set of valid address type can be mutated inside the dialog
-            // when you first have no IS but agree to use one in the dialog.
-            if (validAddressTypes.includes('email')) {
-                return _t("Email, name or Matrix ID");
-            }
-            return _t("Name or Matrix ID");
-        },
-        validAddressTypes: ['mx-user-id', 'email'],
-        onFinished: (shouldInvite, addrs) => {
-            _onRoomInviteFinished(roomId, shouldInvite, addrs);
-        },
-    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+    // This dialog handles the room creation internally - we don't need to worry about it.
+    const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
+    Modal.createTrackedDialog(
+        'Invite Users', '', InviteDialog, {kind: KIND_INVITE, roomId},
+        /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+    );
 }
 
 /**
@@ -122,60 +74,6 @@ export function isValid3pidInvite(event) {
     return true;
 }
 
-// TODO: Canonical DMs replaces this
-function _onStartDmFinished(shouldInvite, addrs) {
-    if (!shouldInvite) return;
-
-    const addrTexts = addrs.map((addr) => addr.address);
-
-    if (_isDmChat(addrTexts)) {
-        const rooms = _getDirectMessageRooms(addrTexts[0]);
-        if (rooms.length > 0) {
-            // A Direct Message room already exists for this user, so reuse it
-            dis.dispatch({
-                action: 'view_room',
-                room_id: rooms[0],
-                should_peek: false,
-                joining: false,
-            });
-        } else {
-            // Start a new DM chat
-            createRoom({dmUserId: addrTexts[0]}).catch((err) => {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createTrackedDialog('Failed to start chat', '', ErrorDialog, {
-                    title: _t("Failed to start chat"),
-                    description: ((err && err.message) ? err.message : _t("Operation failed")),
-                });
-            });
-        }
-    } else if (addrTexts.length === 1) {
-        // Start a new DM chat
-        createRoom({dmUserId: addrTexts[0]}).catch((err) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to start chat', '', ErrorDialog, {
-                title: _t("Failed to start chat"),
-                description: ((err && err.message) ? err.message : _t("Operation failed")),
-            });
-        });
-    } else {
-        // Start multi user chat
-        let room;
-        createRoom().then((roomId) => {
-            room = MatrixClientPeg.get().getRoom(roomId);
-            return inviteMultipleToRoom(roomId, addrTexts);
-        }).then((result) => {
-            return _showAnyInviteErrors(result.states, room, result.inviter);
-        }).catch((err) => {
-            console.error(err.stack);
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
-                title: _t("Failed to invite"),
-                description: ((err && err.message) ? err.message : _t("Operation failed")),
-            });
-        });
-    }
-}
-
 export function inviteUsersToRoom(roomId, userIds) {
     return inviteMultipleToRoom(roomId, userIds).then((result) => {
         const room = MatrixClientPeg.get().getRoom(roomId);
@@ -190,24 +88,6 @@ export function inviteUsersToRoom(roomId, userIds) {
     });
 }
 
-function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
-    if (!shouldInvite) return;
-
-    const addrTexts = addrs.map((addr) => addr.address);
-
-    // Invite new users to a room
-    inviteUsersToRoom(roomId, addrTexts);
-}
-
-// TODO: Immutable DMs replaces this
-function _isDmChat(addrTexts) {
-    if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx-user-id') {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 function _showAnyInviteErrors(addrs, room, inviter) {
     // Show user any errors
     const failedUsers = Object.keys(addrs).filter(a => addrs[a] === 'error');
@@ -243,15 +123,3 @@ function _showAnyInviteErrors(addrs, room, inviter) {
 
     return addrs;
 }
-
-function _getDirectMessageRooms(addr) {
-    const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
-    const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
-    const rooms = dmRooms.filter((dmRoom) => {
-        const room = MatrixClientPeg.get().getRoom(dmRoom);
-        if (room) {
-            return room.getMyMembership() === 'join';
-        }
-    });
-    return rooms;
-}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index eacf63e55d..e908861821 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -128,12 +128,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_ftue_dms": {
-        isFeature: true,
-        displayName: _td("New invite dialog"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_presence_in_room_list": {
         isFeature: true,
         displayName: _td("Show a presence dot next to DMs in the room list"),

From a196ecc8911fc951ac18ab6ed28c2a7426f7bc99 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Jan 2020 21:17:40 -0700
Subject: [PATCH 0577/3235] Fix i18n

---
 src/i18n/strings/en_EN.json | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d19cbb9bfd..6a68c70d56 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -121,15 +121,8 @@
     "Moderator": "Moderator",
     "Admin": "Admin",
     "Custom (%(level)s)": "Custom (%(level)s)",
-    "Start a chat": "Start a chat",
-    "Who would you like to communicate with?": "Who would you like to communicate with?",
-    "Email, name or Matrix ID": "Email, name or Matrix ID",
-    "Start Chat": "Start Chat",
-    "Invite new room members": "Invite new room members",
-    "Send Invites": "Send Invites",
-    "Failed to start chat": "Failed to start chat",
-    "Operation failed": "Operation failed",
     "Failed to invite": "Failed to invite",
+    "Operation failed": "Operation failed",
     "Failed to invite users to the room:": "Failed to invite users to the room:",
     "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
     "You need to be logged in.": "You need to be logged in.",
@@ -372,7 +365,6 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "New invite dialog": "New invite dialog",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
@@ -943,6 +935,7 @@
     "Invite": "Invite",
     "Share Link to User": "Share Link to User",
     "User Options": "User Options",
+    "Start a chat": "Start a chat",
     "Direct chats": "Direct chats",
     "Remove recent messages": "Remove recent messages",
     "Unmute": "Unmute",

From e41f94bdb79273fda94fafe8fdd7c6556e488707 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Jan 2020 22:33:50 -0700
Subject: [PATCH 0578/3235] Try to populate user IDs even when the server's
 directory fails us

Fixes https://github.com/vector-im/riot-web/issues/11943
---
 src/components/views/dialogs/InviteDialog.js | 25 +++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 703b0b5121..effb887fc9 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -586,13 +586,36 @@ export default class InviteDialog extends React.PureComponent {
             clearTimeout(this._debounceTimer);
         }
         this._debounceTimer = setTimeout(async () => {
-            MatrixClientPeg.get().searchUserDirectory({term}).then(r => {
+            MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
                 if (term !== this.state.filterText) {
                     // Discard the results - we were probably too slow on the server-side to make
                     // these results useful. This is a race we want to avoid because we could overwrite
                     // more accurate results.
                     return;
                 }
+
+                if (!r.results) r.results = [];
+
+                // While we're here, try and autocomplete a search result for the mxid itself
+                // if there's no matches (and the input looks like a mxid).
+                if (term[0] === '@' && term.indexOf(':') > 1 && r.results.length === 0) {
+                    try {
+                        const profile = await MatrixClientPeg.get().getProfileInfo(term);
+                        if (profile) {
+                            // If we have a profile, we have enough information to assume that
+                            // the mxid can be invited - add it to the list
+                            r.results.push({
+                                user_id: term,
+                                display_name: profile['displayname'],
+                                avatar_url: profile['avatar_url'],
+                            });
+                        }
+                    } catch (e) {
+                        console.warn("Non-fatal error trying to make an invite for a user ID");
+                        console.warn(e);
+                    }
+                }
+
                 this.setState({
                     serverResultsMixin: r.results.map(u => ({
                         userId: u.user_id,

From 65450e893c9862ef2ef7cdaeb22267bd19f3d731 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Jan 2020 22:40:02 -0700
Subject: [PATCH 0579/3235] Try and fix e2e tests for new invite dialog

---
 test/end-to-end-tests/src/usecases/invite.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/invite.js b/test/end-to-end-tests/src/usecases/invite.js
index 6bee5dfd6f..75ebc61a88 100644
--- a/test/end-to-end-tests/src/usecases/invite.js
+++ b/test/end-to-end-tests/src/usecases/invite.js
@@ -31,10 +31,11 @@ module.exports = async function invite(session, userId) {
     }
     const inviteButton = await session.query(".mx_MemberList_invite");
     await inviteButton.click();
-    const inviteTextArea = await session.query(".mx_AddressPickerDialog textarea");
+    const inviteTextArea = await session.query(".mx_InviteDialog_editor textarea");
     await inviteTextArea.type(userId);
-    await inviteTextArea.press("Enter");
-    const confirmButton = await session.query(".mx_Dialog_primary");
+    const selectUserItem = await session.query(".mx_InviteDialog_roomTile");
+    await selectUserItem.click();
+    const confirmButton = await session.query(".mx_InviteDialog_goButton");
     await confirmButton.click();
     session.log.done();
 };

From 4627e3b2825c5b547d1ccfe249ac74b75d5497d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 11:02:44 +0100
Subject: [PATCH 0580/3235] EventIndex: Refactor out the addInitialCheckpoints
 method.

---
 src/indexing/EventIndex.js | 94 +++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 435f67447d..09abb5d209 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -70,62 +70,62 @@ export default class EventIndex {
         client.removeListener('Room.timelineReset', this.onTimelineReset);
     }
 
+    /** Get crawler checkpoints for the encrypted rooms and store them in the index.
+     */
+    async addInitialCheckpoints() {
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+        const client = MatrixClientPeg.get();
+        const rooms = client.getRooms();
+
+        const isRoomEncrypted = (room) => {
+            return client.isRoomEncrypted(room.roomId);
+        };
+
+        // We only care to crawl the encrypted rooms, non-encrypted.
+        // rooms can use the search provided by the homeserver.
+        const encryptedRooms = rooms.filter(isRoomEncrypted);
+
+        console.log("EventIndex: Adding initial crawler checkpoints");
+
+        // Gather the prev_batch tokens and create checkpoints for
+        // our message crawler.
+        await Promise.all(encryptedRooms.map(async (room) => {
+            const timeline = room.getLiveTimeline();
+            const token = timeline.getPaginationToken("b");
+
+            console.log("EventIndex: Got token for indexer",
+                        room.roomId, token);
+
+            const backCheckpoint = {
+                roomId: room.roomId,
+                token: token,
+                direction: "b",
+            };
+
+            const forwardCheckpoint = {
+                roomId: room.roomId,
+                token: token,
+                direction: "f",
+            };
+
+            await indexManager.addCrawlerCheckpoint(backCheckpoint);
+            await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
+            this.crawlerCheckpoints.push(backCheckpoint);
+            this.crawlerCheckpoints.push(forwardCheckpoint);
+        }));
+    }
+
     onSync = async (state, prevState, data) => {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         if (prevState === "PREPARED" && state === "SYNCING") {
-            const addInitialCheckpoints = async () => {
-                const client = MatrixClientPeg.get();
-                const rooms = client.getRooms();
-
-                const isRoomEncrypted = (room) => {
-                    return client.isRoomEncrypted(room.roomId);
-                };
-
-                // We only care to crawl the encrypted rooms, non-encrypted.
-                // rooms can use the search provided by the homeserver.
-                const encryptedRooms = rooms.filter(isRoomEncrypted);
-
-                console.log("EventIndex: Adding initial crawler checkpoints");
-
-                // Gather the prev_batch tokens and create checkpoints for
-                // our message crawler.
-                await Promise.all(encryptedRooms.map(async (room) => {
-                    const timeline = room.getLiveTimeline();
-                    const token = timeline.getPaginationToken("b");
-
-                    console.log("EventIndex: Got token for indexer",
-                                room.roomId, token);
-
-                    const backCheckpoint = {
-                        roomId: room.roomId,
-                        token: token,
-                        direction: "b",
-                    };
-
-                    const forwardCheckpoint = {
-                        roomId: room.roomId,
-                        token: token,
-                        direction: "f",
-                    };
-
-                    await indexManager.addCrawlerCheckpoint(backCheckpoint);
-                    await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
-                    this.crawlerCheckpoints.push(backCheckpoint);
-                    this.crawlerCheckpoints.push(forwardCheckpoint);
-                }));
-            };
-
             // If our indexer is empty we're most likely running Riot the
             // first time with indexing support or running it with an
             // initial sync. Add checkpoints to crawl our encrypted rooms.
             const eventIndexWasEmpty = await indexManager.isEventIndexEmpty();
-            if (eventIndexWasEmpty) await addInitialCheckpoints();
+            if (eventIndexWasEmpty) await this.addInitialCheckpoints();
 
-            // Start our crawler.
-            if (SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling')) {
-                this.startCrawler();
-            }
+            this.startCrawler();
             return;
         }
 

From c0b713240427315475c000bc8c769f608d252043 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 10:18:08 +0000
Subject: [PATCH 0581/3235] Different copy on done screen if we setup from
 scratch

---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js     | 7 ++++++-
 src/i18n/strings/en_EN.json                                | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 932f6e30e4..8fd881fc32 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -75,6 +75,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             canUploadKeysWithPasswordOnly: null,
             accountPassword: '',
             accountPasswordCorrect: null,
+            // set if we are 'upgrading' encryption (making an SSSS store from
+            // an existing key backup secret).
+            doingUpgrade: null,
         };
 
         this._fetchBackupInfo();
@@ -99,6 +102,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             phase,
             backupInfo,
             backupSigStatus,
+            // remember this after this phase so we can use appropriate copy
+            doingUpgrade: phase === PHASE_MIGRATE,
         });
     }
 
@@ -668,7 +673,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_STORING:
                 return _t('Storing secrets...');
             case PHASE_DONE:
-                return _t('Encryption upgraded');
+                return this.state.doingUpgrade ? _t('Encryption upgraded') : _t('Encryption setup complete');
             default:
                 return '';
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a49a8269df..22c09b5ae6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2008,6 +2008,7 @@
     "Keep it safe": "Keep it safe",
     "Storing secrets...": "Storing secrets...",
     "Encryption upgraded": "Encryption upgraded",
+    "Encryption setup complete": "Encryption setup complete",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",

From 5fd121d2afdf7b18ebff311b2221539a492fd20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 11:44:56 +0100
Subject: [PATCH 0582/3235] ManageEventIndex: Remove the unused stats.

---
 .../dialogs/eventindex/ManageEventIndex.js    | 10 -------
 src/indexing/EventIndex.js                    | 27 -------------------
 2 files changed, 37 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 8623856b2e..d9a0cdcb5d 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -41,8 +41,6 @@ export default class ManageEventIndex extends React.Component {
 
         this.state = {
             eventIndexSize: 0,
-            crawlingRooms: 0,
-            totalCrawlingRooms: 0,
             eventCount: 0,
             roomCount: 0,
             currentRoom: null,
@@ -80,8 +78,6 @@ export default class ManageEventIndex extends React.Component {
         let eventIndexSize = 0;
         let roomCount = 0;
         let eventCount = 0;
-        let crawlingRooms = 0;
-        let totalCrawlingRooms = 0;
         let currentRoom = null;
 
         const eventIndex = EventIndexPeg.get();
@@ -94,18 +90,12 @@ export default class ManageEventIndex extends React.Component {
             roomCount = stats.roomCount;
             eventCount = stats.eventCount;
 
-            const crawledRooms = eventIndex.currentlyCrawledRooms();
-            crawlingRooms = crawledRooms.crawlingRooms.size;
-            totalCrawlingRooms = crawledRooms.totalRooms.size;
-
             const room = eventIndex.currentRoom();
             if (room) currentRoom = room.name;
         }
 
         this.setState({
             eventIndexSize,
-            crawlingRooms,
-            totalCrawlingRooms,
             eventCount,
             roomCount,
             currentRoom,
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 09abb5d209..a10f4aff71 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -440,33 +440,6 @@ export default class EventIndex {
         return indexManager.getStats();
     }
 
-    currentlyCrawledRooms() {
-        const crawlingRooms = new Set();
-        const totalRooms = new Set();
-
-        this.crawlerCheckpoints.forEach((checkpoint, index) => {
-            crawlingRooms.add(checkpoint.roomId);
-        });
-
-        if (this._currentCheckpoint !== null) {
-            crawlingRooms.add(this._currentCheckpoint.roomId);
-        }
-
-        const client = MatrixClientPeg.get();
-        const rooms = client.getRooms();
-
-        const isRoomEncrypted = (room) => {
-            return client.isRoomEncrypted(room.roomId);
-        };
-
-        const encryptedRooms = rooms.filter(isRoomEncrypted);
-        encryptedRooms.forEach((room, index) => {
-            totalRooms.add(room.roomId);
-        });
-
-        return {crawlingRooms, totalRooms};
-    }
-
     /**
      * Get the room that we are currently crawling.
      *

From d68db74efe9bfb6952fe268ed53f97d9f305293c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 21 Jan 2020 17:17:40 +0000
Subject: [PATCH 0583/3235] Room list reflects encryption state

---
 res/css/views/rooms/_RoomHeader.scss   |   4 +-
 res/css/views/rooms/_RoomTile.scss     |  13 ++++
 src/components/structures/RoomView.js  |   1 +
 src/components/views/rooms/RoomTile.js | 101 +++++++++++++++++++++++++
 4 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 0d92247735..a235a47fdd 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -22,7 +22,9 @@ limitations under the License.
         margin: 0;
         position: absolute;
         bottom: 0;
-        right: -5px;
+        right: -1px;
+        height: 10px;
+        width: 10px
     }
 }
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index db2c09f6f1..a36d781669 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -98,6 +98,19 @@ limitations under the License.
     z-index: 2;
 }
 
+// Note we match .mx_E2EIcon to make sure this matches more tightly than just
+// .mx_E2EIcon on its own
+.mx_RoomTile_e2eIcon.mx_E2EIcon {
+    height: 10px;
+    width: 10px;
+    display: block;
+    position: absolute;
+    bottom: -0px;
+    right: -1px;
+    z-index: 1;
+    margin: 0;
+}
+
 .mx_RoomTile_name {
     font-size: 14px;
     padding: 0 6px;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9b02f6d503..f10c98dd98 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -796,6 +796,7 @@ export default createReactClass({
             return;
         }
 
+        // Duplication betwen here and _updateE2eStatus in RoomTile
         /* At this point, the user has encryption on and cross-signing on */
         const e2eMembers = await room.getEncryptionTargetMembers();
         const verified = [];
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index f4f5fa10fc..c277433a5c 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -33,6 +33,8 @@ import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
 import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
+import E2EIcon from './E2EIcon';
+import rate_limited_func from '../../../ratelimitedfunc';
 
 export default createReactClass({
     displayName: 'RoomTile',
@@ -70,6 +72,7 @@ export default createReactClass({
             notificationCount: this.props.room.getUnreadNotificationCount(),
             selected: this.props.room.roomId === RoomViewStore.getRoomId(),
             statusMessage: this._getStatusMessage(),
+            e2eStatus: null,
         });
     },
 
@@ -102,6 +105,85 @@ export default createReactClass({
         return statusUser._unstable_statusMessage;
     },
 
+    onRoomStateMember: function(ev, state, member) {
+        // we only care about leaving users
+        // because trust state will change if someone joins a megolm session anyway
+        if (member.membership !== "leave") {
+            return;
+        }
+        // ignore members in other rooms
+        if (member.roomId !== this.props.room.roomId) {
+            return;
+        }
+
+        this._updateE2eStatus();
+    },
+
+    onUserVerificationChanged: function(userId, _trustStatus) {
+        if (!this.props.room.getMember(userId)) {
+            // Not in this room
+            return;
+        }
+        this._updateE2eStatus();
+    },
+
+    onRoomTimeline: function(ev, room) {
+        if (!room) return;
+        if (room.roomId != this.props.room.roomId) return;
+        console.warn("e2e onRoomTimeline");
+        if (ev.getType() !== "m.room.encryption") return;
+        console.warn("e2e onRoomTimeline ENCRYPTION");
+        MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
+        this.onFindingRoomToBeEncrypted();
+    },
+
+    onFindingRoomToBeEncrypted: function () {
+        const cli = MatrixClientPeg.get();
+        cli.on("RoomState.members", this.onRoomStateMember);
+        cli.on("userTrustStatusChanged", this.onUserVerificationChanged);
+
+        this._updateE2eStatus();
+    },
+
+    _updateE2eStatus: async function() {
+        const cli = MatrixClientPeg.get();
+        if (!cli.isRoomEncrypted(this.props.room.roomId)) {
+            return;
+        }
+        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            return;
+        }
+
+        // Duplication between here and _updateE2eStatus in RoomView
+        const e2eMembers = await this.props.room.getEncryptionTargetMembers();
+        const verified = [];
+        const unverified = [];
+        e2eMembers.map(({userId}) => userId)
+            .filter((userId) => userId !== cli.getUserId())
+            .forEach((userId) => {
+                (cli.checkUserTrust(userId).isCrossSigningVerified() ?
+                verified : unverified).push(userId)
+            });
+
+        /* Check all verified user devices. */
+        for (const userId of verified) {
+            const devices = await cli.getStoredDevicesForUser(userId);
+            const allDevicesVerified = devices.every(({deviceId}) => {
+                return cli.checkDeviceTrust(userId, deviceId).isVerified();
+            });
+            if (!allDevicesVerified) {
+                this.setState({
+                    e2eStatus: "warning",
+                });
+                return;
+            }
+        }
+
+        this.setState({
+            e2eStatus: unverified.length === 0 ? "verified" : "normal",
+        });
+    },
+
     onRoomName: function(room) {
         if (room !== this.props.room) return;
         this.setState({
@@ -151,10 +233,19 @@ export default createReactClass({
     },
 
     componentDidMount: function() {
+        /* We bind here rather than in the definition because otherwise we wind up with the
+           method only being callable once every 500ms across all instances, which would be wrong */
+        this._updateE2eStatus = rate_limited_func(this._updateE2eStatus, 500);
+
         const cli = MatrixClientPeg.get();
         cli.on("accountData", this.onAccountData);
         cli.on("Room.name", this.onRoomName);
         cli.on("RoomState.events", this.onJoinRule);
+        if (cli.isRoomEncrypted(this.props.room.roomId)) {
+            this.onFindingRoomToBeEncrypted();
+        } else {
+            cli.on("Room.timeline", this.onRoomTimeline);
+        }
         ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
         this.dispatcherRef = dis.register(this.onAction);
 
@@ -172,6 +263,9 @@ export default createReactClass({
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             cli.removeListener("RoomState.events", this.onJoinRule);
+            cli.removeListener("RoomState.members", this.onRoomStateMember);
+            cli.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
+            cli.removeListener("Room.timeline", this.onRoomTimeline);
         }
         ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
         dis.unregister(this.dispatcherRef);
@@ -433,6 +527,12 @@ export default createReactClass({
             privateIcon = <div className="mx_RoomTile_PrivateIcon" />;
         }
 
+        let e2eIcon = null;
+        // For now, skip the icon for DMs.  Possibly we want to move the DM icon elsewhere?
+        if (!dmUserId && this.state.e2eStatus) {
+            e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon"/>
+        }
+
         return <React.Fragment>
             <RovingTabIndexWrapper>
                 {({onFocus, isActive, ref}) =>
@@ -453,6 +553,7 @@ export default createReactClass({
                             <div className="mx_RoomTile_avatar_container">
                                 <RoomAvatar room={this.props.room} width={24} height={24} />
                                 { dmIndicator }
+                                { e2eIcon }
                             </div>
                         </div>
                         { privateIcon }

From 8218962c37308c472989372e5343fb1f63e113f2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 23 Jan 2020 03:45:50 +0000
Subject: [PATCH 0584/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2042 of 2042 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 694d5e3d84..03fbe6f61b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2080,5 +2080,10 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "為了提高安全性，請透過檢查您兩個裝置上的一次性代碼來驗證此使用者。",
     "For maximum security, do this in person.": "為了取得最強的安全性，請親自進行。",
     "Start Verification": "開始驗證",
-    "Encrypted by a deleted device": "被已刪除的裝置加密"
+    "Encrypted by a deleted device": "被已刪除的裝置加密",
+    "Unknown Command": "未知的指令",
+    "Unrecognised command: %(commandText)s": "無法識別的指令：%(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "您可以使用 <code>/help</code> 來列出可用的指令。您是要傳送此訊息嗎？",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "提示：以 <code>//</code> 開頭讓您的訊息傳送時可以用斜線開頭。",
+    "Send as message": "以訊息傳送"
 }

From f7ca8a1b845a1ea133a5b715b598f8c3c8323fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 23 Jan 2020 08:11:37 +0000
Subject: [PATCH 0585/3235] Translated using Weblate (French)

Currently translated at 100.0% (2042 of 2042 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8fda9e458e..472cd02e6f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2080,5 +2080,10 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une meilleure sécurité, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
     "For maximum security, do this in person.": "Pour une sécurité maximale, faites-le en personne.",
     "Start Verification": "Commencer la vérification",
-    "Encrypted by a deleted device": "Chiffré par un appareil supprimé"
+    "Encrypted by a deleted device": "Chiffré par un appareil supprimé",
+    "Unknown Command": "Commande inconnue",
+    "Unrecognised command: %(commandText)s": "Commande non reconnue : %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vous pouvez utiliser <code>/help</code> pour obtenir la liste des commandes disponibles. Vouliez-vous envoyer un message ?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Astuce : Votre message doit démarrer par <code>//</code> pour commencer par une barre oblique.",
+    "Send as message": "Envoyer comme message"
 }

From 5d8249507cd685402ce2612d5b94565548022dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Thu, 23 Jan 2020 10:11:27 +0000
Subject: [PATCH 0586/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2042 of 2042 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index fa7528a397..da2c015335 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -138,7 +138,7 @@
     "Failed to toggle moderator status": "Moderátor státuszt nem sikerült átállítani",
     "Failed to unban": "Kizárás visszavonása sikertelen",
     "Failed to upload profile picture!": "Profil kép feltöltése sikertelen!",
-    "Failed to verify email address: make sure you clicked the link in the email": "E-mail cím ellenőrzése sikertelen: ellenőrizd, hogy az e-mailnél lévő linkre rákattintottál",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-mail cím ellenőrzése sikertelen: ellenőrizd, hogy az e-mailben lévő hivatkozásra kattintottál",
     "Failure to create room": "Szoba létrehozása sikertelen",
     "Favourites": "Kedvencek",
     "Fill screen": "Képernyő kitöltése",
@@ -355,7 +355,7 @@
     "You need to be able to invite users to do that.": "Hogy ezt csinálhasd meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix szerveren.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "A jelszavadat sikeresen megváltoztattuk. Nem kapsz \"push\" értesítéseket amíg a többi eszközön vissza nem jelentkezel",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "A jelszavadat sikeresen megváltoztattuk. Addig nem fogsz leküldéses értesítéseket kapni, amíg a többi eszközön vissza nem jelentkezel",
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
@@ -451,7 +451,7 @@
     "Username available": "Szabad felhasználói név",
     "Username not available": "A felhasználói név foglalt",
     "Something went wrong!": "Valami tönkrement!",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Ha már van Matrix fiókod akkor <a>beléphetsz</a> helyette.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Ha már van Matrix fiókod, akkor <a>beléphetsz</a> helyette.",
     "Your browser does not support the required cryptography extensions": "A böngésződ nem támogatja a szükséges titkosítási kiterjesztést",
     "Not a valid Riot keyfile": "Nem érvényes Riot kulcsfájl",
     "Authentication check failed: incorrect password?": "Azonosítás sikertelen: hibás jelszó?",
@@ -929,7 +929,7 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
     "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
-    "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>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
+    "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>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az személyazonosságod biztosító szerverről. <b>Ez a művelet visszafordíthatatlan.</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.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "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.": "Az üzenetek láthatósága a Matrix-ban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "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)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
@@ -1053,7 +1053,7 @@
     "<b>Print it</b> and store it somewhere safe": "<b>Nyomtad ki</b> és tárold biztonságos helyen",
     "<b>Save it</b> on a USB key or backup drive": "<b>Mentsd el</b> egy Pendrive-ra vagy a biztonsági mentésekhez",
     "<b>Copy it</b> to your personal cloud storage": "<b>Másold fel</b> a személyes felhődbe",
-    "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.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül ha kijelentkezel vagy másik eszközt használsz, akkor nem tudod visszaállítani a régi titkosított üzeneteidet.",
+    "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.": "A Biztonságos üzenet-visszaállítás beállítása nélkül ha kijelentkezel vagy másik eszközt használsz, akkor nem tudod visszaállítani a régi titkosított üzeneteidet.",
     "Set up Secure Message Recovery": "Biztonságos Üzenet Visszaállítás beállítása",
     "Keep it safe": "Tartsd biztonságban",
     "Create Key Backup": "Kulcs mentés készítése",

From ee33c7cd627bdc378d1760f288d0b027f94bf6f1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 23 Jan 2020 11:09:52 +0000
Subject: [PATCH 0587/3235] lint

---
 src/components/views/rooms/RoomTile.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index c277433a5c..6ad7bc3f2d 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -34,6 +34,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
 import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 import E2EIcon from './E2EIcon';
+// eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
 
 export default createReactClass({
@@ -137,7 +138,7 @@ export default createReactClass({
         this.onFindingRoomToBeEncrypted();
     },
 
-    onFindingRoomToBeEncrypted: function () {
+    onFindingRoomToBeEncrypted: function() {
         const cli = MatrixClientPeg.get();
         cli.on("RoomState.members", this.onRoomStateMember);
         cli.on("userTrustStatusChanged", this.onUserVerificationChanged);
@@ -162,7 +163,7 @@ export default createReactClass({
             .filter((userId) => userId !== cli.getUserId())
             .forEach((userId) => {
                 (cli.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId)
+                verified : unverified).push(userId);
             });
 
         /* Check all verified user devices. */
@@ -530,7 +531,7 @@ export default createReactClass({
         let e2eIcon = null;
         // For now, skip the icon for DMs.  Possibly we want to move the DM icon elsewhere?
         if (!dmUserId && this.state.e2eStatus) {
-            e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon"/>
+            e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
         }
 
         return <React.Fragment>

From a409b9b96fe706e02d88c8956886be0d103da794 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 23 Jan 2020 11:14:01 +0000
Subject: [PATCH 0588/3235] whoops, left some printfs

---
 src/components/views/rooms/RoomTile.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 6ad7bc3f2d..0b50d85ff6 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -131,9 +131,7 @@ export default createReactClass({
     onRoomTimeline: function(ev, room) {
         if (!room) return;
         if (room.roomId != this.props.room.roomId) return;
-        console.warn("e2e onRoomTimeline");
         if (ev.getType() !== "m.room.encryption") return;
-        console.warn("e2e onRoomTimeline ENCRYPTION");
         MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
         this.onFindingRoomToBeEncrypted();
     },

From 13bb719a890818e15ea14959fb5fdcab55cf54bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 11:22:22 +0000
Subject: [PATCH 0589/3235] Add comment for operations loop

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

diff --git a/src/editor/operations.js b/src/editor/operations.js
index d0115d9ca7..d677d7016c 100644
--- a/src/editor/operations.js
+++ b/src/editor/operations.js
@@ -111,7 +111,7 @@ export function toggleInlineFormat(range, prefix, suffix = prefix) {
     // compute paragraph [start, end] indexes
     const paragraphIndexes = [];
     let startIndex = 0;
-    // let seenNewlines = 0;
+    // start at i=2 because we look at i and up to two parts behind to detect paragraph breaks at their end
     for (let i = 2; i < parts.length; i++) {
         // paragraph breaks can be denoted in a multitude of ways,
         // - 2 newline parts in sequence

From 0d545ed3359a665860354e750c114bffbf36b425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 11:47:49 +0100
Subject: [PATCH 0590/3235] EventIndexPeg: Small refactor and change the init
 logic.

This changes the way the event index is initialized, if it's disabled in
the settings it will not be initialized at all, before only the crawler
loop was not being started.
---
 src/indexing/EventIndexPeg.js | 57 +++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index a63756ab4e..c8c8cbefe9 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -21,17 +21,19 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import EventIndex from "../indexing/EventIndex";
-import SettingsStore from '../settings/SettingsStore';
+import SettingsStore, {SettingLevel} from '../settings/SettingsStore';
 
 class EventIndexPeg {
     constructor() {
         this.index = null;
+        this._supportIsInstalled = false;
     }
 
     /**
-     * Create a new EventIndex and initialize it if the platform supports it.
+     * Initialize the EventIndexPeg and if event indexing is enabled initialize
+     * the event index.
      *
-     * @return {Promise<bool>} A promise that will resolve to true if an
+     * @return {Promise<boolean>} A promise that will resolve to true if an
      * EventIndex was successfully initialized, false otherwise.
      */
     async init() {
@@ -40,12 +42,32 @@ class EventIndexPeg {
         }
 
         const indexManager = PlatformPeg.get().getEventIndexingManager();
-        if (!indexManager || await indexManager.supportsEventIndexing() !== true) {
-            console.log("EventIndex: Platform doesn't support event indexing,",
-                        "not initializing.");
+        if (!indexManager) {
+            console.log("EventIndex: Platform doesn't support event indexing, not initializing.");
             return false;
         }
 
+        this._supportIsInstalled = await indexManager.supportsEventIndexing();
+
+        if (!this.supportIsInstalled()) {
+            console.log("EventIndex: Event indexing isn't installed for the platform, not initializing.");
+            return false;
+        }
+
+        if (!SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing')) {
+            console.log("EventIndex: Event indexing is disabled, not initializing");
+            return false;
+        }
+
+        return this.initEventIndex();
+    }
+
+    /* Initialize the event index.
+     *
+     * @returns {boolean} True if the event index was succesfully initialized,
+     * false otherwise.
+     */
+    async initEventIndex() {
         const index = new EventIndex();
 
         try {
@@ -60,6 +82,29 @@ class EventIndexPeg {
         return true;
     }
 
+    /**
+     * Check if the current platform has support for event indexing.
+     *
+     * @return {boolean} True if it has support, false otherwise. Note that this
+     * does not mean that support is installed.
+     */
+    platformHasSupport(): boolean {
+        return PlatformPeg.get().getEventIndexingManager() !== null;
+    }
+
+    /**
+     * Check if event indexing support is installed for the platfrom.
+     *
+     * Event indexing might require additional optional modules to be installed,
+     * this tells us if those are installed. Note that this should only be
+     * called after the init() method was called.
+     *
+     * @return {boolean} True if support is installed, false otherwise.
+     */
+    supportIsInstalled(): boolean {
+        return this._supportIsInstalled;
+    }
+
     /**
      * Get the current event index.
      *

From 9bee024da71b7faa06b3c1cec379b0c692d9b895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 12:24:06 +0100
Subject: [PATCH 0591/3235] ManageEventIndex: Remove some useless divs and add
 the enable case.

---
 .../dialogs/eventindex/ManageEventIndex.js    | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index d9a0cdcb5d..754d1b8516 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -116,7 +116,11 @@ export default class ManageEventIndex extends React.Component {
         SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
     }
 
-    _onDisable = () => {
+    _onDisable = async () => {
+        this.props.onFinished(false);
+    }
+
+    _onEnable = async () => {
         this.props.onFinished(false);
     }
 
@@ -126,17 +130,16 @@ export default class ManageEventIndex extends React.Component {
 
     render() {
         let eventIndexingSettings = null;
+        let buttons;
         let crawlerState;
 
         if (!this.state.eventIndexingEnabled) {
-            crawlerState = <div>{_t("Message search for encrypted rooms is disabled.")}</div>;
+            crawlerState = _t("Message search for encrypted rooms is disabled.");
         } else if (this.state.currentRoom === null) {
-            crawlerState = <div>{_t("Not downloading messages for any room.")}</div>;
+            crawlerState = _t("Not downloading messages for any room.");
         } else {
             crawlerState = (
-                <div>
-                    {_t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })}
-                </div>
+                    _t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })
             );
         }
 
@@ -154,18 +157,30 @@ export default class ManageEventIndex extends React.Component {
                         {_t("Number of rooms:")} {this.state.roomCount}<br />
                         {crawlerState}<br />
                     </div>
+                </div>
+            );
 
-                    <LabelledToggleSwitch
-                        value={this.state.eventIndexingEnabled}
-                        onChange={this._onEventIndexingEnabledChange}
-                        label={_t('Download and index encrypted messages')} />
-
-                    <Field
-                        id={"crawlerSleepTimeMs"}
-                        label={_t('Message downloading sleep time(ms)')}
-                        type='number'
-                        value={this.state.crawlerSleepTime}
-                        onChange={this._onCrawlerSleepTimeChange} />
+            buttons = (
+                <div className="mx_Dialog_buttons">
+                    <AccessibleButton kind="secondary" onClick={this._onDisable}>
+                        {_t("Disable")}
+                    </AccessibleButton>
+                    <AccessibleButton kind="primary" onClick={this._onDone}>
+                        {_t("Done")}
+                    </AccessibleButton>
+                </div>
+            );
+        } else if (!this.state.eventIndexingEnabled && this.state.eventIndexingInstalled) {
+            eventIndexingSettings = (
+                <div>
+                    {_t( "Securely cache encrypted messages locally for them to appear in search results.")}
+                </div>
+            );
+            buttons = (
+                <div className="mx_Dialog_buttons">
+                    <AccessibleButton kind="primary" onClick={this._onEnable}>
+                        {_t("Enable")}
+                    </AccessibleButton>
                 </div>
             );
         } else {
@@ -182,28 +197,14 @@ export default class ManageEventIndex extends React.Component {
         }
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const buttons = <div>
-            <div className="mx_Dialog_buttons">
-                <AccessibleButton kind="secondary" onClick={this._onDisable}>
-                    {_t("Disable")}
-                </AccessibleButton>
-                <AccessibleButton kind="primary" onClick={this._onDone}>
-                    {_t("Done")}
-                </AccessibleButton>
-            </div>
-        </div>;
 
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
-                onFinished={() => {}}
+                onFinished={this.props.onFinished}
                 title={_t("Message search")}
             >
-            <div>
-                {eventIndexingSettings}
-            </div>
-            <div>
-                {buttons}
-            </div>
+            {eventIndexingSettings}
+            {buttons}
             </BaseDialog>
         );
     }

From 4953f32cbae89967bfbea894a8d25740a3b7124a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 12:24:54 +0100
Subject: [PATCH 0592/3235] ManageEventIndex: Rename the enable crawler
 setting.

---
 .../views/dialogs/eventindex/ManageEventIndex.js              | 2 +-
 src/settings/Settings.js                                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 754d1b8516..76e41fe4b8 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -45,7 +45,7 @@ export default class ManageEventIndex extends React.Component {
             roomCount: 0,
             currentRoom: null,
             eventIndexingEnabled:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableCrawling'),
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
             crawlerSleepTime:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 817adcfc4d..68b26dbae1 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -491,9 +491,9 @@ export const SETTINGS = {
         displayName: _td("How long should the crawler wait between requests"),
         default: 3000,
     },
-    "enableCrawling": {
+    "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        displayName: _td("How long should the crawler wait between requests"),
+        displayName: _td("Enable message search in encrypted rooms"),
         default: true,
     },
 };

From 6c3ac2d0c4585798ba82b913b6ac42b87129c42c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 11:50:59 +0000
Subject: [PATCH 0593/3235] Add Reject & Ignore user button to invites view

---
 src/components/structures/RoomView.js        | 39 +++++++++++++++++++-
 src/components/views/rooms/RoomPreviewBar.js | 14 ++++++-
 src/i18n/strings/en_EN.json                  |  1 +
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9b02f6d503..b3dafc4acd 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1367,6 +1367,41 @@ export default createReactClass({
         });
     },
 
+    onRejectAndIgnoreClick: async function() {
+        this.setState({
+            rejecting: true,
+        });
+
+        const cli = MatrixClientPeg.get();
+        try {
+            const myMember = this.state.room.getMember(cli.getUserId());
+            const inviteEvent = myMember.events.member;
+            const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
+            ignoredUsers.push(inviteEvent.getSender()); // de-duped internally in the js-sdk
+            cli.setIgnoredUsers(ignoredUsers);
+
+            cli.leave(this.state.roomId);
+            dis.dispatch({ action: 'view_next_room' });
+            this.setState({
+                rejecting: false,
+            });
+        } catch (error) {
+            console.error("Failed to reject invite: %s", error);
+
+            const msg = error.message ? error.message : JSON.stringify(error);
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {
+                title: _t("Failed to reject invite"),
+                description: msg,
+            });
+
+            self.setState({
+                rejecting: false,
+                rejectError: error,
+            });
+        }
+    },
+
     onRejectThreepidInviteButtonClicked: function(ev) {
         // We can reject 3pid invites in the same way that we accept them,
         // using /leave rather than /join. In the short term though, we
@@ -1671,9 +1706,11 @@ export default createReactClass({
                 return (
                     <div className="mx_RoomView">
                         <ErrorBoundary>
-                            <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
+                            <RoomPreviewBar
+                                onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectButtonClicked}
+                                onRejectAndIgnoreClick={this.onRejectAndIgnoreClick}
                                 inviterName={inviterName}
                                 canPreview={false}
                                 joining={this.state.joining}
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index cbc992d67f..e9d752a80f 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -49,6 +49,7 @@ export default createReactClass({
     propTypes: {
         onJoinClick: PropTypes.func,
         onRejectClick: PropTypes.func,
+        onRejectAndIgnoreClick: PropTypes.func,
         onForgetClick: PropTypes.func,
         // if inviterName is specified, the preview bar will shown an invite to the room.
         // You should also specify onRejectClick if specifiying inviterName
@@ -282,6 +283,7 @@ export default createReactClass({
 
     render: function() {
         const Spinner = sdk.getComponent('elements.Spinner');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let showSpinner = false;
         let darkStyle = false;
@@ -292,6 +294,7 @@ export default createReactClass({
         let secondaryActionHandler;
         let secondaryActionLabel;
         let footer;
+        const extraComponents = [];
 
         const messageCase = this._getMessageCase();
         switch (messageCase) {
@@ -469,6 +472,14 @@ export default createReactClass({
                 primaryActionHandler = this.props.onJoinClick;
                 secondaryActionLabel = _t("Reject");
                 secondaryActionHandler = this.props.onRejectClick;
+
+                if (this.props.onRejectAndIgnoreClick) {
+                    extraComponents.push(
+                        <AccessibleButton kind="secondary" onClick={this.props.onRejectAndIgnoreClick} key="ignore">
+                            { _t("Reject & Ignore user") }
+                        </AccessibleButton>
+                    );
+                }
                 break;
             }
             case MessageCase.ViewingRoom: {
@@ -505,8 +516,6 @@ export default createReactClass({
             }
         }
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         let subTitleElements;
         if (subTitle) {
             if (!Array.isArray(subTitle)) {
@@ -554,6 +563,7 @@ export default createReactClass({
                 </div>
                 <div className="mx_RoomPreviewBar_actions">
                     { secondaryButton }
+                    { extraComponents }
                     { primaryButton }
                 </div>
                 <div className="mx_RoomPreviewBar_footer">
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2e92cbd282..9acbfbd1f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1046,6 +1046,7 @@
     "Do you want to join %(roomName)s?": "Do you want to join %(roomName)s?",
     "<userName/> invited you": "<userName/> invited you",
     "Reject": "Reject",
+    "Reject & Ignore user": "Reject & Ignore user",
     "You're previewing %(roomName)s. Want to join it?": "You're previewing %(roomName)s. Want to join it?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",
     "%(roomName)s does not exist.": "%(roomName)s does not exist.",

From 873952a83e9ac886606a733415c30f1f1d8c9cdd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 11:51:31 +0000
Subject: [PATCH 0594/3235] delint

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

diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index e9d752a80f..9af06190f7 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -477,7 +477,7 @@ export default createReactClass({
                     extraComponents.push(
                         <AccessibleButton kind="secondary" onClick={this.props.onRejectAndIgnoreClick} key="ignore">
                             { _t("Reject & Ignore user") }
-                        </AccessibleButton>
+                        </AccessibleButton>,
                     );
                 }
                 break;

From 1747a621189d909c643247206d88399f76f0fa1b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 11:55:08 +0000
Subject: [PATCH 0595/3235] add missing awaits

---
 src/components/structures/RoomView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index b3dafc4acd..3f438ea909 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1378,9 +1378,9 @@ export default createReactClass({
             const inviteEvent = myMember.events.member;
             const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
             ignoredUsers.push(inviteEvent.getSender()); // de-duped internally in the js-sdk
-            cli.setIgnoredUsers(ignoredUsers);
+            await cli.setIgnoredUsers(ignoredUsers);
 
-            cli.leave(this.state.roomId);
+            await cli.leave(this.state.roomId);
             dis.dispatch({ action: 'view_next_room' });
             this.setState({
                 rejecting: false,

From 30bfd4046d9eb135217688ddab9a8db962b6d55e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 12:27:25 +0000
Subject: [PATCH 0596/3235] improve spacing of buttons on RoomPreviewBar

---
 res/css/views/rooms/_RoomPreviewBar.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index c7d03e3523..85b6916226 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -117,12 +117,17 @@ limitations under the License.
     .mx_RoomPreviewBar_actions {
         flex-direction: column-reverse;
         .mx_AccessibleButton {
-            padding: 7px 50px;//extra wide
+            padding: 7px 50px; //extra wide
         }
 
         & > * {
             margin-top: 12px;
         }
+        .mx_AccessibleButton.mx_AccessibleButton_kind_primary {
+            // to account for the padding of the primary button which causes inconsistent look between
+            // subsequent secondary (text) buttons
+            margin-bottom: 7px;
+        }
     }
 }
 

From 947ea9823d6bb22ea57ed854e4e5ace81673bb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 13:32:27 +0100
Subject: [PATCH 0597/3235] Settings: Remove the crawler sleep time setting.

---
 .../views/dialogs/eventindex/ManageEventIndex.js | 16 ----------------
 src/indexing/EventIndex.js                       |  3 ++-
 src/settings/Settings.js                         |  5 -----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 76e41fe4b8..be7df25381 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -46,8 +46,6 @@ export default class ManageEventIndex extends React.Component {
             currentRoom: null,
             eventIndexingEnabled:
                 SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
-            crawlerSleepTime:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
     }
 
@@ -102,20 +100,6 @@ export default class ManageEventIndex extends React.Component {
         });
     }
 
-    _onEventIndexingEnabledChange = (checked) => {
-        SettingsStore.setValue("enableCrawling", null, SettingLevel.DEVICE, checked);
-
-        if (checked) EventIndexPeg.start();
-        else EventIndexPeg.stop();
-
-        this.setState({eventIndexingEnabled: checked});
-    }
-
-    _onCrawlerSleepTimeChange = (e) => {
-        this.setState({crawlerSleepTime: e.target.value});
-        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
-    }
-
     _onDisable = async () => {
         this.props.onFinished(false);
     }
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a10f4aff71..6d38f1683f 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -30,6 +30,7 @@ export default class EventIndex {
         // The time in ms that the crawler will wait loop iterations if there
         // have not been any checkpoints to consume in the last iteration.
         this._crawlerIdleTime = 5000;
+        this._crawlerSleepTime = 3000;
         // The maximum number of events our crawler should fetch in a single
         // crawl.
         this._eventsPerCrawl = 100;
@@ -211,7 +212,7 @@ export default class EventIndex {
             // This is a low priority task and we don't want to spam our
             // homeserver with /messages requests so we set a hefty timeout
             // here.
-            let sleepTime = SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime');
+            let sleepTime = this._crawlerSleepTime;
 
             // Don't let the user configure a lower sleep time than 100 ms.
             sleepTime = Math.max(sleepTime, 100);
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 68b26dbae1..44f38f232f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -486,11 +486,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: RIGHT_PANEL_PHASES.GroupMemberList,
     },
-    "crawlerSleepTime": {
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        displayName: _td("How long should the crawler wait between requests"),
-        default: 3000,
-    },
     "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("Enable message search in encrypted rooms"),

From 4aa0658ac8e36f671fc6d715091cfc392e311ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 13:33:09 +0100
Subject: [PATCH 0598/3235] SecurityUserSettingsTab: Put the event index
 settings behind the feature flag.

---
 .../settings/tabs/user/SecurityUserSettingsTab.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 7b22dd15e2..eb5f346714 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -254,12 +254,15 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
-        const eventIndex = (
-            <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
-                <EventIndexPanel />
-            </div>
-        );
+        let eventIndex;
+        if (SettingsStore.isFeatureEnabled("feature_event_indexing")) {
+            eventIndex = (
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
+                    <EventIndexPanel />
+                </div>
+            );
+        }
 
         // XXX: There's no such panel in the current cross-signing designs, but
         // it's useful to have for testing the feature. If there's no interest

From 64c4ad2eb9474dbacd681954682f677fb97d71cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 13:33:55 +0100
Subject: [PATCH 0599/3235] ManageEventIndex: Hook up the disable event index
 button.

---
 .../dialogs/eventindex/DisableEventIndex.js   | 74 +++++++++++++++++++
 .../dialogs/eventindex/ManageEventIndex.js    |  6 +-
 src/i18n/strings/en_EN.json                   |  8 +-
 3 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 src/async-components/views/dialogs/eventindex/DisableEventIndex.js

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
new file mode 100644
index 0000000000..159f8b3d95
--- /dev/null
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -0,0 +1,74 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from '../../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../../languageHandler';
+
+import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
+import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
+import Field from "../../../../components/views/elements/Field";
+import {formatBytes} from "../../../../utils/FormattingUtils";
+import EventIndexPeg from "../../../../indexing/EventIndexPeg";
+import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
+
+
+/*
+ * Walks the user through the process of creating an e2e key backup
+ * on the server.
+ */
+export default class ManageEventIndex extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    }
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            eventIndexingEnabled:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
+        };
+    }
+
+    _onDisable = async () => {
+        const eventIndex = EventIndexPeg.get();
+        await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
+        await EventIndexPeg.deleteEventIndex();
+        this.props.onFinished(true);
+    }
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+
+        return (
+            <BaseDialog className='mx_ManageEventIndexDialog'
+                onFinished={this.props.onFinished}
+                title={_t("Are you sure?")}
+            >
+            {_t("If disabled, messages form encrypted rooms won't appear in search results")}
+            <DialogButtons
+                primaryButton={_t("Disable")}
+                onPrimaryButtonClick={this._onDisable}
+                cancelButton={_t("Cancel")}
+                onCancel={this.props.onFinished}
+            />
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index be7df25381..cf0e2bccc6 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -19,6 +19,7 @@ import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
+import Modal from '../../../../Modal';
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
 import Field from "../../../../components/views/elements/Field";
@@ -101,7 +102,10 @@ export default class ManageEventIndex extends React.Component {
     }
 
     _onDisable = async () => {
-        this.props.onFinished(false);
+        Modal.createTrackedDialogAsync("Disable message search", "Disable message search",
+            import("./DisableEventIndex"),
+            null, null, /* priority = */ false, /* static = */ true,
+        );
     }
 
     _onEnable = async () => {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b2ac55ba04..31ba5581f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -416,6 +416,7 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "How long should the crawler wait between requests": "How long should the crawler wait between requests",
+    "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -2035,6 +2036,8 @@
     "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
+    "If disabled, messages form encrypted rooms won't appear in search results": "If disabled, messages form encrypted rooms won't appear in search results",
+    "Disable": "Disable",
     "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
     "Not downloading messages for any room.": "Not downloading messages for any room.",
     "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
@@ -2042,9 +2045,8 @@
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
-    "Download and index encrypted messages": "Download and index encrypted messages",
-    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
-    "Disable": "Disable",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
+    "Enable": "Enable",
     "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"

From 78e1d1674f15d99a182158fcb73974284512e8c3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 13:00:17 +0000
Subject: [PATCH 0600/3235] reactor E2EIcon for reusability

---
 src/components/views/rooms/E2EIcon.js | 100 +++++++++++++-------------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 6ee20023ff..36f230f472 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -15,8 +15,10 @@ limitations under the License.
 */
 
 import React from "react";
+import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { _t } from '../../../languageHandler';
+
+import {_t, _td} from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import SettingsStore from '../../../settings/SettingsStore';
 
@@ -27,71 +29,65 @@ export const E2E_STATE = {
     NORMAL: "normal",
 };
 
-export default function(props) {
-    const { isUser, status, className } = props;
-    const isNormal = status === E2E_STATE.NORMAL;
-    const isWarning = status === E2E_STATE.WARNING;
-    const isVerified = status === E2E_STATE.VERIFIED;
+const crossSigningUserTitles = {
+    [E2E_STATE.WARNING]: _td("This user has not verified all of their devices."),
+    [E2E_STATE.NORMAL]: _td("You have not verified this user. This user has verified all of their devices."),
+    [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their devices."),
+};
+const crossSigningRoomTitles = {
+    [E2E_STATE.WARNING]: _td("Some users in this encrypted room are not verified by you or they have not verified " +
+        "their own devices."),
+    [E2E_STATE.VERIFIED]: _td("All users in this encrypted room are verified by you and they have verified their " +
+        "own devices."),
+};
+const legacyUserTitles = {
+    [E2E_STATE.WARNING]: _td("Some devices for this user are not trusted"),
+    [E2E_STATE.VERIFIED]: _td("All devices for this user are trusted"),
+};
+const legacyRoomTitles = {
+    [E2E_STATE.WARNING]: _td("Some devices in this encrypted room are not trusted"),
+    [E2E_STATE.VERIFIED]: _td("All devices in this encrypted room are trusted"),
+};
+
+const E2EIcon = ({isUser, status, className, size, onClick}) => {
     const e2eIconClasses = classNames({
         mx_E2EIcon: true,
-        mx_E2EIcon_warning: isWarning,
-        mx_E2EIcon_normal: isNormal,
-        mx_E2EIcon_verified: isVerified,
+        mx_E2EIcon_warning: status === E2E_STATE.WARNING,
+        mx_E2EIcon_normal: status === E2E_STATE.NORMAL,
+        mx_E2EIcon_verified: status === E2E_STATE.VERIFIED,
     }, className);
-    let e2eTitle;
 
+    let e2eTitle;
     const crossSigning = SettingsStore.isFeatureEnabled("feature_cross_signing");
     if (crossSigning && isUser) {
-        if (isWarning) {
-            e2eTitle = _t(
-                "This user has not verified all of their devices.",
-            );
-        } else if (isNormal) {
-            e2eTitle = _t(
-                "You have not verified this user. " +
-                "This user has verified all of their devices.",
-            );
-        } else if (isVerified) {
-            e2eTitle = _t(
-                "You have verified this user. " +
-                "This user has verified all of their devices.",
-            );
-        }
+        e2eTitle = crossSigningUserTitles[status];
     } else if (crossSigning && !isUser) {
-        if (isWarning) {
-            e2eTitle = _t(
-                "Some users in this encrypted room are not verified by you or " +
-                "they have not verified their own devices.",
-            );
-        } else if (isVerified) {
-            e2eTitle = _t(
-                "All users in this encrypted room are verified by you and " +
-                "they have verified their own devices.",
-            );
-        }
+        e2eTitle = crossSigningRoomTitles[status];
     } else if (!crossSigning && isUser) {
-        if (isWarning) {
-            e2eTitle = _t("Some devices for this user are not trusted");
-        } else if (isVerified) {
-            e2eTitle = _t("All devices for this user are trusted");
-        }
+        e2eTitle = legacyUserTitles[status];
     } else if (!crossSigning && !isUser) {
-        if (isWarning) {
-            e2eTitle = _t("Some devices in this encrypted room are not trusted");
-        } else if (isVerified) {
-            e2eTitle = _t("All devices in this encrypted room are trusted");
-        }
+        e2eTitle = legacyRoomTitles[status];
     }
 
     let style = null;
-    if (props.size) {
-        style = {width: `${props.size}px`, height: `${props.size}px`};
+    if (size) {
+        style = {width: `${size}px`, height: `${size}px`};
     }
 
-    const icon = (<div className={e2eIconClasses} style={style} title={e2eTitle} />);
-    if (props.onClick) {
-        return (<AccessibleButton onClick={props.onClick}>{ icon }</AccessibleButton>);
+    const icon = (<div className={e2eIconClasses} style={style} title={e2eTitle ? _t(e2eTitle) : undefined} />);
+    if (onClick) {
+        return (<AccessibleButton onClick={onClick}>{ icon }</AccessibleButton>);
     } else {
         return icon;
     }
-}
+};
+
+E2EIcon.propTypes = {
+    isUser: PropTypes.bool,
+    status: PropTypes.oneOf(Object.values(E2E_STATE)),
+    className: PropTypes.string,
+    size: PropTypes.number,
+    onClick: PropTypes.func,
+};
+
+export default E2EIcon;

From c251031dfbf2d432e6818f4c70c0f228f9a15eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 14:25:47 +0100
Subject: [PATCH 0601/3235] DisableEventIndex: Return back to the user settings
 after disabling.

---
 .../views/dialogs/eventindex/DisableEventIndex.js             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 159f8b3d95..3dcbeab454 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
+import dis from "../../../../dispatcher";
 import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
@@ -49,7 +50,8 @@ export default class ManageEventIndex extends React.Component {
         const eventIndex = EventIndexPeg.get();
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
-        this.props.onFinished(true);
+        this.props.onFinished();
+        dis.dispatch({ action: 'view_user_settings' });
     }
 
     render() {

From 5ac37c8694f8f42c6cadef7225195b35eaea5cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 14:26:35 +0100
Subject: [PATCH 0602/3235] ManageEventIndex: Remove the enable button, that
 one goes somewhere else.

---
 .../dialogs/eventindex/ManageEventIndex.js    | 86 ++++++-------------
 1 file changed, 25 insertions(+), 61 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index cf0e2bccc6..76fee228bf 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -45,8 +45,6 @@ export default class ManageEventIndex extends React.Component {
             eventCount: 0,
             roomCount: 0,
             currentRoom: null,
-            eventIndexingEnabled:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
         };
     }
 
@@ -108,22 +106,14 @@ export default class ManageEventIndex extends React.Component {
         );
     }
 
-    _onEnable = async () => {
-        this.props.onFinished(false);
-    }
-
     _onDone = () => {
         this.props.onFinished(true);
     }
 
     render() {
-        let eventIndexingSettings = null;
-        let buttons;
         let crawlerState;
 
-        if (!this.state.eventIndexingEnabled) {
-            crawlerState = _t("Message search for encrypted rooms is disabled.");
-        } else if (this.state.currentRoom === null) {
+        if (this.state.currentRoom === null) {
             crawlerState = _t("Not downloading messages for any room.");
         } else {
             crawlerState = (
@@ -131,58 +121,32 @@ export default class ManageEventIndex extends React.Component {
             );
         }
 
-        if (EventIndexPeg.get() !== null) {
-            eventIndexingSettings = (
-                <div>
-                    {
-                        _t( "Riot is securely caching encrypted messages locally for them " +
-                            "to appear in search results:",
-                        )
-                    }
-                    <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                        {_t("Indexed messages:")} {this.state.eventCount}<br />
-                        {_t("Number of rooms:")} {this.state.roomCount}<br />
-                        {crawlerState}<br />
-                    </div>
+        const eventIndexingSettings = (
+            <div>
+                {
+                    _t( "Riot is securely caching encrypted messages locally for them " +
+                        "to appear in search results:",
+                    )
+                }
+                <div className='mx_SettingsTab_subsectionText'>
+                    {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
+                    {_t("Indexed messages:")} {this.state.eventCount}<br />
+                    {_t("Number of rooms:")} {this.state.roomCount}<br />
+                    {crawlerState}<br />
                 </div>
-            );
+            </div>
+        );
 
-            buttons = (
-                <div className="mx_Dialog_buttons">
-                    <AccessibleButton kind="secondary" onClick={this._onDisable}>
-                        {_t("Disable")}
-                    </AccessibleButton>
-                    <AccessibleButton kind="primary" onClick={this._onDone}>
-                        {_t("Done")}
-                    </AccessibleButton>
-                </div>
-            );
-        } else if (!this.state.eventIndexingEnabled && this.state.eventIndexingInstalled) {
-            eventIndexingSettings = (
-                <div>
-                    {_t( "Securely cache encrypted messages locally for them to appear in search results.")}
-                </div>
-            );
-            buttons = (
-                <div className="mx_Dialog_buttons">
-                    <AccessibleButton kind="primary" onClick={this._onEnable}>
-                        {_t("Enable")}
-                    </AccessibleButton>
-                </div>
-            );
-        } else {
-            eventIndexingSettings = (
-                <div>
-                    {
-                        _t( "Riot can't securely cache encrypted messages locally" +
-                            "while running in a web browser. Use Riot Desktop for" +
-                            "encrypted messages to appear in search results.",
-                        )
-                    }
-                </div>
-            );
-        }
+        const buttons = (
+            <div className="mx_Dialog_buttons">
+                <AccessibleButton kind="secondary" onClick={this._onDisable}>
+                    {_t("Disable")}
+                </AccessibleButton>
+                <AccessibleButton kind="primary" onClick={this._onDone}>
+                    {_t("Done")}
+                </AccessibleButton>
+            </div>
+        );
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 

From 981acec0d2030efabec4cf4959aab352f0637c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 14:27:46 +0100
Subject: [PATCH 0603/3235] EventIndexPanel: Show the enable button if event
 indexing is disabled.

---
 .../views/settings/EventIndexPanel.js         | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 8ed4b114e7..7cd0dbe753 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -18,6 +18,7 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import {formatBytes} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
@@ -29,6 +30,8 @@ export default class EventIndexPanel extends React.Component {
         this.state = {
             eventIndexSize: 0,
             roomCount: 0,
+            eventIndexingEnabled:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
         };
     }
 
@@ -51,10 +54,15 @@ export default class EventIndexPanel extends React.Component {
     }
 
     async componentWillMount(): void {
+        this.updateState();
+    }
+
+    async updateState() {
         let eventIndexSize = 0;
         let roomCount = 0;
 
         const eventIndex = EventIndexPeg.get();
+        const eventIndexingEnabled = SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing');
 
         if (eventIndex !== null) {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
@@ -67,6 +75,7 @@ export default class EventIndexPanel extends React.Component {
         this.setState({
             eventIndexSize,
             roomCount,
+            eventIndexingEnabled,
         });
     }
 
@@ -79,6 +88,14 @@ export default class EventIndexPanel extends React.Component {
         );
     }
 
+    _onEnable = async () => {
+        await EventIndexPeg.initEventIndex();
+        await EventIndexPeg.get().addInitialCheckpoints();
+        await EventIndexPeg.get().startCrawler();
+        await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, true);
+        await this.updateState();
+    }
+
     render() {
         let eventIndexingSettings = null;
 
@@ -98,12 +115,25 @@ export default class EventIndexPanel extends React.Component {
                     </div>
                 </div>
             );
+        } else if (!this.state.eventIndexingEnabled && EventIndexPeg.supportIsInstalled()) {
+            eventIndexingSettings = (
+                <div>
+                    <div className='mx_SettingsTab_subsectionText'>
+                        {_t( "Securely cache encrypted messages locally for them to appear in search results.")}
+                    </div>
+                    <div>
+                        <AccessibleButton kind="primary" onClick={this._onEnable}>
+                            {_t("Enable")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
         } else {
             eventIndexingSettings = (
                 <div>
                     {
-                        _t( "Riot can't securely cache encrypted messages locally" +
-                            "while running in a web browser. Use Riot Desktop for" +
+                        _t( "Riot can't securely cache encrypted messages locally " +
+                            "while running in a web browser. Use Riot Desktop for " +
                             "encrypted messages to appear in search results.",
                         )
                     }

From c25c1878b884d04e832c047c90d24acc3212a26a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 23 Jan 2020 13:54:28 +0000
Subject: [PATCH 0604/3235] Move control of room initial state into createRoom

This changes `createRoom` so it has more control of the room's initial state,
and appends state for different features, rather resetting the entire state
array. This makes room for also controlling encryption state in the next change.
---
 src/components/structures/MatrixChat.js          |  4 ++--
 src/components/views/dialogs/CreateRoomDialog.js |  9 +++++----
 src/createRoom.js                                | 14 +++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3ac8a93e3d..9afc79811d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -961,9 +961,9 @@ export default createReactClass({
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
 
-        const [shouldCreate, createOpts] = await modal.finished;
+        const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
-            createRoom({createOpts});
+            createRoom(opts);
         }
     },
 
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 288074a891..9380226381 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -44,13 +45,13 @@ export default createReactClass({
     },
 
     _roomCreateOptions() {
-        const createOpts = {};
+        const opts = {};
+        const createOpts = opts.createOpts = {};
         createOpts.name = this.state.name;
         if (this.state.isPublic) {
             createOpts.visibility = "public";
             createOpts.preset = "public_chat";
-            // to prevent createRoom from enabling guest access
-            createOpts['initial_state'] = [];
+            opts.guestAccess = false;
             const {alias} = this.state;
             const localPart = alias.substr(1, alias.indexOf(":") - 1);
             createOpts['room_alias_name'] = localPart;
@@ -61,7 +62,7 @@ export default createReactClass({
         if (this.state.noFederate) {
             createOpts.creation_content = {'m.federate': false};
         }
-        return createOpts;
+        return opts;
     },
 
     componentDidMount() {
diff --git a/src/createRoom.js b/src/createRoom.js
index cde9e8b03e..0fa8b1b241 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,6 +32,8 @@ import {getAddressType} from "./UserAddress";
  * @param {object=} opts.createOpts set of options to pass to createRoom call.
  * @param {bool=} opts.spinner True to show a modal spinner while the room is created.
  *     Default: True
+ * @param {bool=} opts.guestAccess Whether to enable guest access.
+ *     Default: True
  *
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
@@ -39,6 +41,7 @@ import {getAddressType} from "./UserAddress";
 export default function createRoom(opts) {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
+    if (opts.guestAccess === undefined) opts.guestAccess = true;
 
     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
     const Loader = sdk.getComponent("elements.Spinner");
@@ -80,15 +83,16 @@ export default function createRoom(opts) {
     // Allow guests by default since the room is private and they'd
     // need an invite. This means clicking on a 3pid invite email can
     // actually drop you right in to a chat.
-    createOpts.initial_state = createOpts.initial_state || [
-        {
+    createOpts.initial_state = createOpts.initial_state || [];
+    if (opts.guestAccess) {
+        createOpts.initial_state.push({
             content: {
                 guest_access: 'can_join',
             },
             type: 'm.room.guest_access',
             state_key: '',
-        },
-    ];
+        });
+    }
 
     let modal;
     if (opts.spinner) modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');

From 2b16b650fed350ccfca1730a4407d7100d88e408 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 23 Jan 2020 14:05:38 +0000
Subject: [PATCH 0605/3235] Add encryption option to createRoom

---
 src/createRoom.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index 0fa8b1b241..c25b618dc6 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -34,6 +34,8 @@ import {getAddressType} from "./UserAddress";
  *     Default: True
  * @param {bool=} opts.guestAccess Whether to enable guest access.
  *     Default: True
+ * @param {bool=} opts.encryption Whether to enable encryption.
+ *     Default: False
  *
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
@@ -42,6 +44,7 @@ export default function createRoom(opts) {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
     if (opts.guestAccess === undefined) opts.guestAccess = true;
+    if (opts.encryption === undefined) opts.encryption = false;
 
     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
     const Loader = sdk.getComponent("elements.Spinner");
@@ -80,17 +83,28 @@ export default function createRoom(opts) {
         opts.andView = true;
     }
 
+    createOpts.initial_state = createOpts.initial_state || [];
+
     // Allow guests by default since the room is private and they'd
     // need an invite. This means clicking on a 3pid invite email can
     // actually drop you right in to a chat.
-    createOpts.initial_state = createOpts.initial_state || [];
     if (opts.guestAccess) {
         createOpts.initial_state.push({
+            type: 'm.room.guest_access',
+            state_key: '',
             content: {
                 guest_access: 'can_join',
             },
-            type: 'm.room.guest_access',
+        });
+    }
+
+    if (opts.encryption) {
+        createOpts.initial_state.push({
+            type: 'm.room.encryption',
             state_key: '',
+            content: {
+                algorithm: 'm.megolm.v1.aes-sha2',
+            },
         });
     }
 

From 3073ce55883dc96b2ed88ad1e586920a4fd2f4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 15:05:40 +0100
Subject: [PATCH 0606/3235] DisableEventIndex: Set the correct button kind and
 add a spinner.

---
 .../dialogs/eventindex/DisableEventIndex.js   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 3dcbeab454..6d0f9a43e8 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -41,12 +41,15 @@ export default class ManageEventIndex extends React.Component {
         super(props);
 
         this.state = {
-            eventIndexingEnabled:
-                SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
+            disabling: false,
         };
     }
 
     _onDisable = async () => {
+        this.setState({
+            disabling: true,
+        });
+
         const eventIndex = EventIndexPeg.get();
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
@@ -64,12 +67,15 @@ export default class ManageEventIndex extends React.Component {
                 title={_t("Are you sure?")}
             >
             {_t("If disabled, messages form encrypted rooms won't appear in search results")}
-            <DialogButtons
-                primaryButton={_t("Disable")}
-                onPrimaryButtonClick={this._onDisable}
-                cancelButton={_t("Cancel")}
-                onCancel={this.props.onFinished}
-            />
+            <div className="mx_Dialog_buttons">
+                <AccessibleButton kind="secondary" onClick={this.props.onFinished}>
+                    {_t("Cancel")}
+                </AccessibleButton>
+                <AccessibleButton kind="danger" disabled={this.state.disabling} onClick={this._onDisable}>
+                    {_t("Disable")}
+                </AccessibleButton>
+                {this.state.enabling ? <InlineSpinner /> : <div />}
+            </div>
             </BaseDialog>
         );
     }

From 251661388a9dee3d3f9ce394820ebb3fbd607513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 15:06:10 +0100
Subject: [PATCH 0607/3235] ManageEventIndex: Set the button kind to danger.

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

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 76fee228bf..b53b4810aa 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -139,7 +139,7 @@ export default class ManageEventIndex extends React.Component {
 
         const buttons = (
             <div className="mx_Dialog_buttons">
-                <AccessibleButton kind="secondary" onClick={this._onDisable}>
+                <AccessibleButton kind="danger" onClick={this._onDisable}>
                     {_t("Disable")}
                 </AccessibleButton>
                 <AccessibleButton kind="primary" onClick={this._onDone}>

From a5a149933a0dd98e7ca86d08a382a9ff6b0cc48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 15:06:38 +0100
Subject: [PATCH 0608/3235] EventIndexPanel: Add a spinner when the index is
 being enabled.

---
 .../views/settings/EventIndexPanel.js         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 7cd0dbe753..f93ab489c7 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
+import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -28,6 +29,7 @@ export default class EventIndexPanel extends React.Component {
         super();
 
         this.state = {
+            enabling: false,
             eventIndexSize: 0,
             roomCount: 0,
             eventIndexingEnabled:
@@ -58,11 +60,12 @@ export default class EventIndexPanel extends React.Component {
     }
 
     async updateState() {
-        let eventIndexSize = 0;
-        let roomCount = 0;
-
         const eventIndex = EventIndexPeg.get();
         const eventIndexingEnabled = SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing');
+        const enabling = false;
+
+        let eventIndexSize = 0;
+        let roomCount = 0;
 
         if (eventIndex !== null) {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
@@ -73,6 +76,7 @@ export default class EventIndexPanel extends React.Component {
         }
 
         this.setState({
+            enabling,
             eventIndexSize,
             roomCount,
             eventIndexingEnabled,
@@ -89,6 +93,10 @@ export default class EventIndexPanel extends React.Component {
     }
 
     _onEnable = async () => {
+        this.setState({
+            enabling: true,
+        });
+
         await EventIndexPeg.initEventIndex();
         await EventIndexPeg.get().addInitialCheckpoints();
         await EventIndexPeg.get().startCrawler();
@@ -98,6 +106,7 @@ export default class EventIndexPanel extends React.Component {
 
     render() {
         let eventIndexingSettings = null;
+        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
@@ -119,12 +128,15 @@ export default class EventIndexPanel extends React.Component {
             eventIndexingSettings = (
                 <div>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t( "Securely cache encrypted messages locally for them to appear in search results.")}
+                        {_t( "Securely cache encrypted messages locally for them to " +
+                             "appear in search results.")}
                     </div>
                     <div>
-                        <AccessibleButton kind="primary" onClick={this._onEnable}>
+                        <AccessibleButton kind="primary" disabled={this.state.enabling}
+                            onClick={this._onEnable}>
                             {_t("Enable")}
                         </AccessibleButton>
+                        {this.state.enabling ? <InlineSpinner /> : <div />}
                     </div>
                 </div>
             );

From 381fe95f67919457cd1cdfa75ba7dd895dd69b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 15:22:26 +0100
Subject: [PATCH 0609/3235] EventIndex: Fix some lint errors.

---
 .../views/dialogs/eventindex/DisableEventIndex.js           | 6 +-----
 .../views/dialogs/eventindex/ManageEventIndex.js            | 3 ---
 src/indexing/EventIndex.js                                  | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 6d0f9a43e8..064f55edc0 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -21,9 +21,6 @@ import dis from "../../../../dispatcher";
 import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
-import Field from "../../../../components/views/elements/Field";
-import {formatBytes} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
@@ -50,7 +47,6 @@ export default class ManageEventIndex extends React.Component {
             disabling: true,
         });
 
-        const eventIndex = EventIndexPeg.get();
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
         this.props.onFinished();
@@ -59,7 +55,7 @@ export default class ManageEventIndex extends React.Component {
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
 
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index b53b4810aa..d0f3c2cf50 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -20,9 +20,6 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
 import Modal from '../../../../Modal';
-import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
-import Field from "../../../../components/views/elements/Field";
 import {formatBytes} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 6d38f1683f..d466c6acba 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,8 +16,6 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-import SettingsStore from '../settings/SettingsStore';
-import {SettingLevel} from "../settings/SettingsStore";
 import {sleep} from "../utils/promise";
 import {EventEmitter} from "events";
 

From e2a4a08b2552279c2cb9acce3f5f3706a0d40901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jan 2020 15:32:43 +0100
Subject: [PATCH 0610/3235] Update the translation file.

---
 src/i18n/strings/en_EN.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 31ba5581f3..3973ae442e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -415,7 +415,6 @@
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
-    "How long should the crawler wait between requests": "How long should the crawler wait between requests",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
@@ -559,7 +558,9 @@
     " to store messages from ": " to store messages from ",
     "rooms.": "rooms.",
     "Manage": "Manage",
-    "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locallywhile running in a web browser. Use Riot Desktop forencrypted messages to appear in search results.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
+    "Enable": "Enable",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use Riot Desktop for encrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locally while running in a web browser. Use Riot Desktop for encrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -2038,15 +2039,12 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages form encrypted rooms won't appear in search results": "If disabled, messages form encrypted rooms won't appear in search results",
     "Disable": "Disable",
-    "Message search for encrypted rooms is disabled.": "Message search for encrypted rooms is disabled.",
     "Not downloading messages for any room.": "Not downloading messages for any room.",
     "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
-    "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
-    "Enable": "Enable",
     "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"

From 74b08ea4895a581ebb16a83a470e170213f7b24f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 14:38:17 +0000
Subject: [PATCH 0611/3235] Clean up E2EIcon for better maintainability

---
 src/components/views/rooms/E2EIcon.js | 13 +++----
 src/hooks/useSettings.js              | 52 +++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json           |  5 +--
 3 files changed, 62 insertions(+), 8 deletions(-)
 create mode 100644 src/hooks/useSettings.js

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 36f230f472..7ac3b5af2d 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@ import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
-import SettingsStore from '../../../settings/SettingsStore';
+import {useFeatureEnabled} from "../../../hooks/useSettings";
 
 export const E2E_STATE = {
     VERIFIED: "verified",
@@ -35,11 +36,11 @@ const crossSigningUserTitles = {
     [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their devices."),
 };
 const crossSigningRoomTitles = {
-    [E2E_STATE.WARNING]: _td("Some users in this encrypted room are not verified by you or they have not verified " +
-        "their own devices."),
-    [E2E_STATE.VERIFIED]: _td("All users in this encrypted room are verified by you and they have verified their " +
-        "own devices."),
+    [E2E_STATE.WARNING]: _td("Someone is using an unknown device"),
+    [E2E_STATE.NORMAL]: _td("This room is end-to-end encrypted"),
+    [E2E_STATE.VERIFIED]: _td("Everyone in this room is verified"),
 };
+
 const legacyUserTitles = {
     [E2E_STATE.WARNING]: _td("Some devices for this user are not trusted"),
     [E2E_STATE.VERIFIED]: _td("All devices for this user are trusted"),
@@ -58,7 +59,7 @@ const E2EIcon = ({isUser, status, className, size, onClick}) => {
     }, className);
 
     let e2eTitle;
-    const crossSigning = SettingsStore.isFeatureEnabled("feature_cross_signing");
+    const crossSigning = useFeatureEnabled("feature_cross_signing");
     if (crossSigning && isUser) {
         e2eTitle = crossSigningUserTitles[status];
     } else if (crossSigning && !isUser) {
diff --git a/src/hooks/useSettings.js b/src/hooks/useSettings.js
new file mode 100644
index 0000000000..151a6369de
--- /dev/null
+++ b/src/hooks/useSettings.js
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {useEffect, useState} from "react";
+import SettingsStore from '../settings/SettingsStore';
+
+// Hook to fetch the value of a setting and dynamically update when it changes
+export const useSettingValue = (settingName, roomId = null, excludeDefault = false) => {
+    const [value, setValue] = useState(SettingsStore.getValue(settingName, roomId, excludeDefault));
+
+    useEffect(() => {
+        const ref = SettingsStore.watchSetting(settingName, roomId, () => {
+            setValue(SettingsStore.getValue(settingName, roomId, excludeDefault));
+        });
+        // clean-up
+        return () => {
+            SettingsStore.unwatchSetting(ref);
+        };
+    }, [settingName, roomId, excludeDefault]);
+
+    return value;
+};
+
+// Hook to fetch whether a feature is enabled and dynamically update when that changes
+export const useFeatureEnabled = (featureName, roomId = null) => {
+    const [enabled, setEnabled] = useState(SettingsStore.isFeatureEnabled(featureName, roomId));
+
+    useEffect(() => {
+        const ref = SettingsStore.watchSetting(featureName, roomId, () => {
+            setEnabled(SettingsStore.isFeatureEnabled(featureName, roomId));
+        });
+        // clean-up
+        return () => {
+            SettingsStore.unwatchSetting(ref);
+        };
+    }, [featureName, roomId]);
+
+    return enabled;
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d19cbb9bfd..fb2898ae3d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -884,8 +884,9 @@
     "This user has not verified all of their devices.": "This user has not verified all of their devices.",
     "You have not verified this user. This user has verified all of their devices.": "You have not verified this user. This user has verified all of their devices.",
     "You have verified this user. This user has verified all of their devices.": "You have verified this user. This user has verified all of their devices.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Some users in this encrypted room are not verified by you or they have not verified their own devices.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "All users in this encrypted room are verified by you and they have verified their own devices.",
+    "Someone is using an unknown device": "Someone is using an unknown device",
+    "This room is end-to-end encrypted": "This room is end-to-end encrypted",
+    "Everyone in this room is verified": "Everyone in this room is verified",
     "Some devices for this user are not trusted": "Some devices for this user are not trusted",
     "All devices for this user are trusted": "All devices for this user are trusted",
     "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",

From 662b34c8dbc2196b4061f08c8555c2a1e02cf5a2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 14:38:39 +0000
Subject: [PATCH 0612/3235] Update MessageComposer placeholder and e2e icon
 size

---
 res/css/views/rooms/_MessageComposer.scss     |  2 +
 src/components/views/rooms/MessageComposer.js | 46 ++++++++++---------
 src/i18n/strings/en_EN.json                   |  4 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 5efca51844..fae9d0dfe3 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -76,6 +76,8 @@ limitations under the License.
     left: 60px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
+    width: 12px;
+    height: 12px;
 }
 
 .mx_MessageComposer_noperm_error {
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 8d36f02d02..53e10fa750 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -26,6 +26,7 @@ import Stickerpicker from './Stickerpicker';
 import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
 import ContentMessages from '../../../ContentMessages';
 import E2EIcon from './E2EIcon';
+import SettingsStore from "../../../settings/SettingsStore";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -168,7 +169,6 @@ export default class MessageComposer extends React.Component {
     constructor(props) {
         super(props);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
-        this.onEvent = this.onEvent.bind(this);
         this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
         this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
         this._onTombstoneClick = this._onTombstoneClick.bind(this);
@@ -182,11 +182,6 @@ export default class MessageComposer extends React.Component {
     }
 
     componentDidMount() {
-        // N.B. using 'event' rather than 'RoomEvents' otherwise the crypto handler
-        // for 'event' fires *after* 'RoomEvent', and our room won't have yet been
-        // marked as encrypted.
-        // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
-        MatrixClientPeg.get().on("event", this.onEvent);
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._waitForOwnMember();
@@ -210,7 +205,6 @@ export default class MessageComposer extends React.Component {
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("event", this.onEvent);
             MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
         }
         if (this._roomStoreToken) {
@@ -218,13 +212,6 @@ export default class MessageComposer extends React.Component {
         }
     }
 
-    onEvent(event) {
-        if (event.getType() !== 'm.room.encryption') return;
-        if (event.getRoomId() !== this.props.room.roomId) return;
-        // TODO: put (encryption state??) in state
-        this.forceUpdate();
-    }
-
     _onRoomStateEvents(ev, state) {
         if (ev.getRoomId() !== this.props.room.roomId) return;
 
@@ -282,18 +269,33 @@ export default class MessageComposer extends React.Component {
     }
 
     renderPlaceholderText() {
-        const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
-        if (this.state.isQuoting) {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted reply…');
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (this.state.isQuoting) {
+                if (this.props.e2eStatus) {
+                    return _t('Send an encrypted reply…');
+                } else {
+                    return _t('Send a reply…');
+                }
             } else {
-                return _t('Send a reply (unencrypted)…');
+                if (this.props.e2eStatus) {
+                    return _t('Send an encrypted message…');
+                } else {
+                    return _t('Send a message…');
+                }
             }
         } else {
-            if (roomIsEncrypted) {
-                return _t('Send an encrypted message…');
+            if (this.state.isQuoting) {
+                if (this.props.e2eStatus) {
+                    return _t('Send an encrypted reply…');
+                } else {
+                    return _t('Send a reply (unencrypted)…');
+                }
             } else {
-                return _t('Send a message (unencrypted)…');
+                if (this.props.e2eStatus) {
+                    return _t('Send an encrypted message…');
+                } else {
+                    return _t('Send a message (unencrypted)…');
+                }
             }
         }
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fb2898ae3d..20707a4f29 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -962,8 +962,10 @@
     "Hangup": "Hangup",
     "Upload file": "Upload file",
     "Send an encrypted reply…": "Send an encrypted reply…",
-    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
+    "Send a reply…": "Send a reply…",
     "Send an encrypted message…": "Send an encrypted message…",
+    "Send a message…": "Send a message…",
+    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
     "Send a message (unencrypted)…": "Send a message (unencrypted)…",
     "The conversation continues here.": "The conversation continues here.",
     "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",

From e9dccd1460935cd8e68fe8f9595223cc7ebac4ba Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 23 Jan 2020 14:44:57 +0000
Subject: [PATCH 0613/3235] moving icons exactly one pixel to the right and one
 pixel down

---
 res/css/views/rooms/_RoomHeader.scss | 4 ++--
 res/css/views/rooms/_RoomTile.scss   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index a235a47fdd..6bfcd437c1 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -21,8 +21,8 @@ limitations under the License.
     .mx_E2EIcon {
         margin: 0;
         position: absolute;
-        bottom: 0;
-        right: -1px;
+        bottom: -1px;
+        right: -2px;
         height: 10px;
         width: 10px
     }
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index a36d781669..376f4370e3 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -105,8 +105,8 @@ limitations under the License.
     width: 10px;
     display: block;
     position: absolute;
-    bottom: -0px;
-    right: -1px;
+    bottom: -1px;
+    right: -2px;
     z-index: 1;
     margin: 0;
 }

From 604e244265df6a4637cdb772ea779dd066f3d137 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 14:53:41 +0000
Subject: [PATCH 0614/3235] Attempt to fix Safari + VoiceOver misunderstanding
 the timeline list

---
 src/components/structures/ScrollPanel.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index bc7c400949..5121dd3f9d 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -877,11 +877,14 @@ export default createReactClass({
         // TODO: the classnames on the div and ol could do with being updated to
         // reflect the fact that we don't necessarily contain a list of messages.
         // it's not obvious why we have a separate div and ol anyway.
+
+        // give the <ol> an explicit role=list because Safari+VoiceOver seems to think an ordered-list with
+        // list-style-type: none; is no longer a list
         return (<AutoHideScrollbar wrappedRef={this._collectScroll}
                 onScroll={this.onScroll}
                 className={`mx_ScrollPanel ${this.props.className}`} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
-                        <ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite">
+                        <ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
                             { this.props.children }
                         </ol>
                     </div>

From 8a523fbb594174f54608691cf3c172e6b2ba8364 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 23 Jan 2020 15:53:54 +0100
Subject: [PATCH 0615/3235] remove this log line, so we can remove the .event
 property

this is likely the error Dave hit last week, because there was
no .request event set yet for some other reasons that have
been fixed already (the event being put in the wrong map, theirs
instead of us) in the VerificationRequest object.
---
 src/components/structures/MatrixChat.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3ac8a93e3d..cc5695cf31 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1453,7 +1453,6 @@ export default createReactClass({
 
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             cli.on("crypto.verification.request", request => {
-                console.log(`MatrixChat got a .request ${request.channel.transactionId}`, request.event.getRoomId());
                 if (request.pending) {
                     ToastStore.sharedInstance().addOrReplaceToast({
                         key: 'verifreq_' + request.channel.transactionId,

From 1e25b32ba395f3bf714241f6f5eab202a2a49c31 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 23 Jan 2020 16:00:55 +0000
Subject: [PATCH 0616/3235] Enable encryption in DMs with device keys

When the cross-signing lab is enabled, this changes DMs to use encryption as
long as all invited users have uploaded device keys (which we're using as a
proxy for "has some client that understands E2E").

Fixes https://github.com/vector-im/riot-web/issues/12005
---
 src/components/views/dialogs/InviteDialog.js | 24 +++++++++++++++++---
 src/components/views/right_panel/UserInfo.js | 24 +++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 703b0b5121..fde21791e7 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -33,6 +33,7 @@ import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
 import createRoom from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
+import SettingsStore from '../../../settings/SettingsStore';
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
@@ -493,7 +494,7 @@ export default class InviteDialog extends React.PureComponent {
         return false;
     }
 
-    _startDm = () => {
+    _startDm = async () => {
         this.setState({busy: true});
         const targetIds = this.state.targets.map(t => t.userId);
 
@@ -510,14 +511,31 @@ export default class InviteDialog extends React.PureComponent {
             return;
         }
 
+        const createRoomOptions = {};
+
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            // Check whether all users have uploaded device keys before.
+            // If so, enable encryption in the new room.
+            const client = MatrixClientPeg.get();
+            const usersToDevicesMap = await client.downloadKeys(targetIds);
+            const allHaveDeviceKeys = Object.values(usersToDevicesMap).every(devices => {
+                // `devices` is an object of the form { deviceId: deviceInfo, ... }.
+                return Object.keys(devices).length > 0;
+            });
+            if (allHaveDeviceKeys) {
+                createRoomOptions.encryption = true;
+            }
+        }
+
         // Check if it's a traditional DM and create the room if required.
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
         let createRoomPromise = Promise.resolve();
         if (targetIds.length === 1) {
-            createRoomPromise = createRoom({dmUserId: targetIds[0]});
+            createRoomOptions.dmUserId = targetIds[0];
+            createRoomPromise = createRoom(createRoomOptions);
         } else {
             // Create a boring room and try to invite the targets manually.
-            createRoomPromise = createRoom().then(roomId => {
+            createRoomPromise = createRoom(createRoomOptions).then(roomId => {
                 return inviteMultipleToRoom(roomId, targetIds);
             }).then(result => {
                 if (this._shouldAbortAfterInviteError(result)) {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b08f07ace4..01d0002801 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -82,7 +82,7 @@ const _getE2EStatus = (cli, userId, devices) => {
     return "warning";
 };
 
-function openDMForUser(matrixClient, userId) {
+async function openDMForUser(matrixClient, userId) {
     const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
     const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
         const room = matrixClient.getRoom(roomId);
@@ -100,9 +100,27 @@ function openDMForUser(matrixClient, userId) {
             action: 'view_room',
             room_id: lastActiveRoom.roomId,
         });
-    } else {
-        createRoom({dmUserId: userId});
+        return;
     }
+
+    const createRoomOptions = {
+        dmUserId: userId,
+    };
+
+    if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        // Check whether all users have uploaded device keys before.
+        // If so, enable encryption in the new room.
+        const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
+        const allHaveDeviceKeys = Object.values(usersToDevicesMap).every(devices => {
+            // `devices` is an object of the form { deviceId: deviceInfo, ... }.
+            return Object.keys(devices).length > 0;
+        });
+        if (allHaveDeviceKeys) {
+            createRoomOptions.encryption = true;
+        }
+    }
+
+    createRoom(createRoomOptions);
 }
 
 function useIsEncrypted(cli, room) {

From 237a0ed07121992faecff207d783c0c63634b260 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Jan 2020 16:09:32 +0000
Subject: [PATCH 0617/3235] Make the entire User Info scrollable, sticky close
 button

---
 res/css/views/right_panel/_UserInfo.scss     | 22 +++++---
 src/components/views/right_panel/UserInfo.js | 57 ++++++++++----------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index e87fe06a94..d2d9d12c6d 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -23,15 +23,23 @@ limitations under the License.
     font-size: 12px;
 
     .mx_UserInfo_cancel {
-        height: 16px;
-        width: 16px;
-        padding: 10px 0 10px 10px;
         cursor: pointer;
-        mask-image: url('$(res)/img/minimise.svg');
-        mask-repeat: no-repeat;
-        mask-position: 16px center;
-        background-color: $rightpanel-button-color;
         position: absolute;
+        top: 0;
+        border-radius: 4px;
+        background-color: $dark-panel-bg-color;
+        margin: 9px;
+        z-index: 1; // render on top of the right panel
+
+        div {
+            height: 16px;
+            width: 16px;
+            padding: 4px;
+            mask-image: url('$(res)/img/minimise.svg');
+            mask-repeat: no-repeat;
+            mask-position: 7px center;
+            background-color: $rightpanel-button-color;
+        }
     }
 
     h2 {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b08f07ace4..31431d56a4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1219,10 +1219,9 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     let closeButton;
     if (onClose) {
-        closeButton = <AccessibleButton
-            className="mx_UserInfo_cancel"
-            onClick={onClose}
-            title={_t('Close')} />;
+        closeButton = <AccessibleButton className="mx_UserInfo_cancel" onClick={onClose} title={_t('Close')}>
+            <div />
+        </AccessibleButton>;
     }
 
     const memberDetails = (
@@ -1338,32 +1337,32 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     return (
         <div className="mx_UserInfo" role="tabpanel">
-            { closeButton }
-            { avatarElement }
-
-            <div className="mx_UserInfo_container">
-                <div className="mx_UserInfo_profile">
-                    <div>
-                        <h2 aria-label={displayName}>
-                            { e2eIcon }
-                            { displayName }
-                        </h2>
-                    </div>
-                    <div>{ user.userId }</div>
-                    <div className="mx_UserInfo_profileStatus">
-                        {presenceLabel}
-                        {statusLabel}
-                    </div>
-                </div>
-            </div>
-
-            { memberDetails && <div className="mx_UserInfo_container mx_UserInfo_memberDetailsContainer">
-                <div className="mx_UserInfo_memberDetails">
-                    { memberDetails }
-                </div>
-            </div> }
-
             <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
+                { closeButton }
+                { avatarElement }
+
+                <div className="mx_UserInfo_container">
+                    <div className="mx_UserInfo_profile">
+                        <div>
+                            <h2 aria-label={displayName}>
+                                { e2eIcon }
+                                { displayName }
+                            </h2>
+                        </div>
+                        <div>{ user.userId }</div>
+                        <div className="mx_UserInfo_profileStatus">
+                            {presenceLabel}
+                            {statusLabel}
+                        </div>
+                    </div>
+                </div>
+
+                { memberDetails && <div className="mx_UserInfo_container mx_UserInfo_memberDetailsContainer">
+                    <div className="mx_UserInfo_memberDetails">
+                        { memberDetails }
+                    </div>
+                </div> }
+
                 { securitySection }
                 <UserOptionsSection
                     devices={devices}

From 5319ee4572aec3d26d0fc4b2d50c1073fa065b15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 18:14:08 +0000
Subject: [PATCH 0618/3235] Remove riot logo from the security setup screens

With a little faff to make the rounded borders consistent again
---
 res/css/views/auth/_AuthBody.scss              |  4 ++++
 .../structures/auth/CompleteSecurity.js        |  3 +--
 src/components/views/auth/AuthBody.js          | 18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index b05629003e..d342de6d75 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -95,6 +95,10 @@ limitations under the License.
     }
 }
 
+.mx_AuthBody_noHeader {
+    border-radius: 4px;
+}
+
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index b64f368908..982360e8c1 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -161,8 +161,7 @@ export default class CompleteSecurity extends React.Component {
 
         return (
             <AuthPage>
-                <AuthHeader />
-                <AuthBody>
+                <AuthBody header={false}>
                     <h2 className="mx_CompleteSecurity_header">
                         {icon}
                         {title}
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index 9a078efb52..db5c941b20 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -17,10 +17,26 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
+
+import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {
+    static PropTypes = {
+        header: PropTypes.bool,
+    };
+
+    static defaultProps = {
+        header: true,
+    };
+
     render() {
-        return <div className="mx_AuthBody">
+        const classes = {
+            'mx_AuthBody': true,
+            'mx_AuthBody_noHeader': !this.props.header,
+        };
+
+        return <div className={classnames(classes)}>
             { this.props.children }
         </div>;
     }

From a3026277c1c03a929f95308bcfd97b26cca83067 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 18:24:03 +0000
Subject: [PATCH 0619/3235] Unused variable

---
 src/components/structures/auth/CompleteSecurity.js | 1 -
 src/components/views/settings/KeyBackupPanel.js    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 982360e8c1..d2cea9b00a 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -74,7 +74,6 @@ export default class CompleteSecurity extends React.Component {
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
-        const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index fd166782d8..cd8cdfa5d9 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,7 +127,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
+                secureSecretStorage: false,
                 onFinished: () => {
                     this._loadBackupStatus();
                 },

From 74b678d0ff4444f1522c68b5e68628659628f9b5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 19:19:12 +0000
Subject: [PATCH 0620/3235] Only say the session is verified if it is now
 verified

---
 src/components/structures/auth/CompleteSecurity.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index b64f368908..741306a68b 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -44,9 +44,12 @@ export default class CompleteSecurity extends React.Component {
             await accessSecretStorage(async () => {
                 await cli.checkOwnCrossSigningTrust();
             });
-            this.setState({
-                phase: PHASE_DONE,
-            });
+
+            if (cli.getCrossSigningId()) {
+                this.setState({
+                    phase: PHASE_DONE,
+                });
+            }
         } catch (e) {
             // this will throw if the user hits cancel, so ignore
         }

From 4cff50a11e0e4d4a7c008ac38835010e63aacff4 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Thu, 23 Jan 2020 18:29:15 +0000
Subject: [PATCH 0621/3235] Translated using Weblate (Turkish)

Currently translated at 72.9% (1494 of 2050 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 21ccf03a46..2656b00593 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1496,5 +1496,19 @@
     "Create a public room": "Halka açık bir oda oluşturun",
     "Make this room public": "Bu odayı halka açık yap",
     "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": "Sohbet tarihçesini kaybetmemek için, çıkmadan önce odanızın anahtarlarını dışarıya aktarın. Bunu yapabilmek için Riotun daha yeni sürümü gerekli.  Ulaşmak için geri gitmeye ihtiyacınız var",
-    "Continue With Encryption Disabled": "Şifreleme Kapalı Şekilde Devam Et"
+    "Continue With Encryption Disabled": "Şifreleme Kapalı Şekilde Devam Et",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "%(fileName)s dosyası anasunucunun yükleme boyutu limitini aşıyor",
+    "Double check that your server supports the room version chosen and try again.": "Seçtiğiniz oda sürümünün sunucunuz tarafından desteklenip desteklenmediğini iki kez kontrol edin ve yeniden deneyin.",
+    "Changes your avatar in this current room only": "Sadece bu odadaki resminizi değiştirin",
+    "Please supply a https:// or http:// widget URL": "Lütfen bir https:// ya da http:// olarak bir görsel bileşen URL i belirtin",
+    "Sends the given emote coloured as a rainbow": "Verilen ifadeyi bir gökkuşağı gibi renklendirilmiş olarak gönderin",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ekran adını %(displayName)s olarak değiştirdi.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s odayı adresi bilen herkesin girebileceği şekilde halka açık hale getirdi.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s katılma kuralını %(rule)s şeklinde değiştirdi",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s misafir erişim kuralını %(rule)s şeklinde değiştirdi",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s bu odanın ana adresini %(address)s olarak ayarladı.",
+    "%(senderName)s placed a voice call.": "%(senderName)s bir çağrı yaptı.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bir çağrı başlattı. (Bu tarayıcı tarafından desteklenmiyor)",
+    "%(senderName)s placed a video call.": "%(senderName)s bir görüntülü çağrı yaptı.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bir görüntülü çağrı yaptı. (bu tarayıcı tarafından desteklenmiyor)"
 }

From 6fc647c3d969aff9bba47e209e2b48bbebfc91a6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 14:59:52 -0700
Subject: [PATCH 0622/3235] Don't list every single alias when there's many

---
 src/TextForEvent.js         | 24 ++++++++++++++++++++++++
 src/i18n/strings/en_EN.json |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index a0d088affb..6a2744109b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -275,6 +275,8 @@ function textForRoomAliasesEvent(ev) {
     // This feels a bit overkill though, and it's not clear the i18n really needs it
     // so instead it's landing as a simple textual event.
 
+    const maxShown = 3;
+
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAliases = ev.getPrevContent().aliases || [];
     const newAliases = ev.getContent().aliases || [];
@@ -287,18 +289,40 @@ function textForRoomAliasesEvent(ev) {
     }
 
     if (addedAliases.length && !removedAliases.length) {
+        if (addedAliases.length > maxShown) {
+            return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
+                senderName: senderName,
+                count: addedAliases.length - maxShown,
+                addedAddresses: addedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: addedAliases.length,
             addedAddresses: addedAliases.join(', '),
         });
     } else if (!addedAliases.length && removedAliases.length) {
+        if (removedAliases.length > maxShown) {
+            return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
+                senderName: senderName,
+                count: removedAliases.length - maxShown,
+                removedAddresses: removedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: removedAliases.length,
             removedAddresses: removedAliases.join(', '),
         });
     } else {
+        const combined = addedAliases.length + removedAliases.length;
+        if (combined > maxShown) {
+            return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
+                senderName: senderName,
+                countAdded: addedAliases.length,
+                countRemoved: removedAliases.length,
+            });
+        }
         return _t(
             '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
                 senderName: senderName,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9060279e54..c86640132a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -235,10 +235,13 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",

From 1ac82a9f165c145c12ea796eb29968a97e37a510 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 14:59:52 -0700
Subject: [PATCH 0623/3235] Revert "Don't list every single alias when there's
 many"

This reverts commit 6fc647c3d969aff9bba47e209e2b48bbebfc91a6.
---
 src/TextForEvent.js         | 24 ------------------------
 src/i18n/strings/en_EN.json |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 6a2744109b..a0d088affb 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -275,8 +275,6 @@ function textForRoomAliasesEvent(ev) {
     // This feels a bit overkill though, and it's not clear the i18n really needs it
     // so instead it's landing as a simple textual event.
 
-    const maxShown = 3;
-
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAliases = ev.getPrevContent().aliases || [];
     const newAliases = ev.getContent().aliases || [];
@@ -289,40 +287,18 @@ function textForRoomAliasesEvent(ev) {
     }
 
     if (addedAliases.length && !removedAliases.length) {
-        if (addedAliases.length > maxShown) {
-            return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
-                senderName: senderName,
-                count: addedAliases.length - maxShown,
-                addedAddresses: addedAliases.slice(0, maxShown).join(', '),
-            });
-        }
         return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: addedAliases.length,
             addedAddresses: addedAliases.join(', '),
         });
     } else if (!addedAliases.length && removedAliases.length) {
-        if (removedAliases.length > maxShown) {
-            return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
-                senderName: senderName,
-                count: removedAliases.length - maxShown,
-                removedAddresses: removedAliases.slice(0, maxShown).join(', '),
-            });
-        }
         return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: removedAliases.length,
             removedAddresses: removedAliases.join(', '),
         });
     } else {
-        const combined = addedAliases.length + removedAliases.length;
-        if (combined > maxShown) {
-            return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
-                senderName: senderName,
-                countAdded: addedAliases.length,
-                countRemoved: removedAliases.length,
-            });
-        }
         return _t(
             '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
                 senderName: senderName,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c86640132a..9060279e54 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -235,13 +235,10 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",

From 18f8f8858c92d11806bf08d5c1125f562f7871b2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 14:59:52 -0700
Subject: [PATCH 0624/3235] Don't list every single alias when there's many

---
 src/TextForEvent.js         | 24 ++++++++++++++++++++++++
 src/i18n/strings/en_EN.json |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index a0d088affb..6a2744109b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -275,6 +275,8 @@ function textForRoomAliasesEvent(ev) {
     // This feels a bit overkill though, and it's not clear the i18n really needs it
     // so instead it's landing as a simple textual event.
 
+    const maxShown = 3;
+
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAliases = ev.getPrevContent().aliases || [];
     const newAliases = ev.getContent().aliases || [];
@@ -287,18 +289,40 @@ function textForRoomAliasesEvent(ev) {
     }
 
     if (addedAliases.length && !removedAliases.length) {
+        if (addedAliases.length > maxShown) {
+            return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
+                senderName: senderName,
+                count: addedAliases.length - maxShown,
+                addedAddresses: addedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: addedAliases.length,
             addedAddresses: addedAliases.join(', '),
         });
     } else if (!addedAliases.length && removedAliases.length) {
+        if (removedAliases.length > maxShown) {
+            return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
+                senderName: senderName,
+                count: removedAliases.length - maxShown,
+                removedAddresses: removedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: removedAliases.length,
             removedAddresses: removedAliases.join(', '),
         });
     } else {
+        const combined = addedAliases.length + removedAliases.length;
+        if (combined > maxShown) {
+            return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
+                senderName: senderName,
+                countAdded: addedAliases.length,
+                countRemoved: removedAliases.length,
+            });
+        }
         return _t(
             '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
                 senderName: senderName,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9060279e54..c86640132a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -235,10 +235,13 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",

From 6f6d149a7077064cfa953b33e9ec02891f55dd13 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 14:59:52 -0700
Subject: [PATCH 0625/3235] Don't list every single alias when there's many

---
 src/TextForEvent.js         | 24 ++++++++++++++++++++++++
 src/i18n/strings/en_EN.json |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index a0d088affb..6a2744109b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -275,6 +275,8 @@ function textForRoomAliasesEvent(ev) {
     // This feels a bit overkill though, and it's not clear the i18n really needs it
     // so instead it's landing as a simple textual event.
 
+    const maxShown = 3;
+
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAliases = ev.getPrevContent().aliases || [];
     const newAliases = ev.getContent().aliases || [];
@@ -287,18 +289,40 @@ function textForRoomAliasesEvent(ev) {
     }
 
     if (addedAliases.length && !removedAliases.length) {
+        if (addedAliases.length > maxShown) {
+            return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
+                senderName: senderName,
+                count: addedAliases.length - maxShown,
+                addedAddresses: addedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: addedAliases.length,
             addedAddresses: addedAliases.join(', '),
         });
     } else if (!addedAliases.length && removedAliases.length) {
+        if (removedAliases.length > maxShown) {
+            return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
+                senderName: senderName,
+                count: removedAliases.length - maxShown,
+                removedAddresses: removedAliases.slice(0, maxShown).join(', '),
+            });
+        }
         return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
             senderName: senderName,
             count: removedAliases.length,
             removedAddresses: removedAliases.join(', '),
         });
     } else {
+        const combined = addedAliases.length + removedAliases.length;
+        if (combined > maxShown) {
+            return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
+                senderName: senderName,
+                countAdded: addedAliases.length,
+                countRemoved: removedAliases.length,
+            });
+        }
         return _t(
             '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
                 senderName: senderName,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4af203177c..853cd1f744 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -236,10 +236,13 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",

From 4aa3be9b42698e5b963c02494379ac60b9d67e8b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 15:38:06 -0700
Subject: [PATCH 0626/3235] Move & upgrade babel runtime into dependencies
 (like it wants)

https://babeljs.io/docs/en/babel-runtime
---
 package.json |  4 ++--
 yarn.lock    | 42 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 8f49eed4b5..0c1d66058a 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
+    "@babel/runtime": "^7.8.3",
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
@@ -108,13 +109,12 @@
     "@babel/plugin-proposal-numeric-separator": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
     "@babel/plugin-transform-flow-comments": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/plugin-transform-runtime": "^7.8.3",
     "@babel/preset-env": "^7.7.6",
     "@babel/preset-flow": "^7.7.4",
     "@babel/preset-react": "^7.7.4",
     "@babel/preset-typescript": "^7.7.4",
     "@babel/register": "^7.7.4",
-    "@babel/runtime": "^7.7.6",
     "@peculiar/webcrypto": "^1.0.22",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/yarn.lock b/yarn.lock
index 0177629cd8..576cd019ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -211,6 +211,13 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
 "@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
@@ -235,6 +242,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
+"@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
 "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
@@ -735,13 +747,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-runtime@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61"
-  integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==
+"@babel/plugin-transform-runtime@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
+  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
     resolve "^1.8.1"
     semver "^5.5.1"
 
@@ -894,7 +906,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.7.6":
+"@babel/runtime@^7.0.0":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
   integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
@@ -908,6 +920,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
+  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.4.0", "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -941,6 +960,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
+  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"

From a330ee186aafd758cc4f6ed274b92f7afe764c65 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 15:38:06 -0700
Subject: [PATCH 0627/3235] Move & upgrade babel runtime into dependencies
 (like it wants)

https://babeljs.io/docs/en/babel-runtime
---
 package.json |  4 ++--
 yarn.lock    | 42 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 9203b20bfa..dc619e50ef 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
+    "@babel/runtime": "^7.8.3",
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
@@ -108,13 +109,12 @@
     "@babel/plugin-proposal-numeric-separator": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
     "@babel/plugin-transform-flow-comments": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/plugin-transform-runtime": "^7.8.3",
     "@babel/preset-env": "^7.7.6",
     "@babel/preset-flow": "^7.7.4",
     "@babel/preset-react": "^7.7.4",
     "@babel/preset-typescript": "^7.7.4",
     "@babel/register": "^7.7.4",
-    "@babel/runtime": "^7.7.6",
     "@peculiar/webcrypto": "^1.0.22",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/yarn.lock b/yarn.lock
index 808721a188..75c5af6a1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -211,6 +211,13 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
 "@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
@@ -235,6 +242,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
+"@babel/helper-plugin-utils@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
 "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
@@ -735,13 +747,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-runtime@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61"
-  integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==
+"@babel/plugin-transform-runtime@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
+  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
     resolve "^1.8.1"
     semver "^5.5.1"
 
@@ -894,7 +906,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.7.6":
+"@babel/runtime@^7.0.0":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
   integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
@@ -908,6 +920,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
+  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.4.0", "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -941,6 +960,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
+  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"

From 915c4efeacbfa03dd6e20d66512d71bcf0e14db1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 15:53:32 -0700
Subject: [PATCH 0628/3235] Ensure a plaintext version of the composer ends up
 on the clipboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/vector-im/riot-web/issues/12018
---
 src/components/views/rooms/BasicMessageComposer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 73c3d961ee..d2b6f8cbc8 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -209,6 +209,7 @@ export default class BasicMessageEditor extends React.Component {
             const range = getRangeForSelection(this._editorRef, model, selection);
             const selectedParts = range.parts.map(p => p.serialize());
             event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
+            event.clipboardData.setData("text/plain", text); // so plain copy/paste works
             if (type === "cut") {
                 // Remove the text, updating the model as appropriate
                 this._modifiedFlag = true;

From 6adfa35445e3514c1f2323674949bce242b50da4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 15:53:32 -0700
Subject: [PATCH 0629/3235] Ensure a plaintext version of the composer ends up
 on the clipboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/vector-im/riot-web/issues/12018
---
 src/components/views/rooms/BasicMessageComposer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 94904242c3..3c67b4ed60 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -208,6 +208,7 @@ export default class BasicMessageEditor extends React.Component {
             const range = getRangeForSelection(this._editorRef, model, selection);
             const selectedParts = range.parts.map(p => p.serialize());
             event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
+            event.clipboardData.setData("text/plain", text); // so plain copy/paste works
             if (type === "cut") {
                 // Remove the text, updating the model as appropriate
                 this._modifiedFlag = true;

From c22bfa84b7498635916ad4afc8ce2f16f530bef3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 16:29:55 -0700
Subject: [PATCH 0630/3235] Hide password section if you can't change your
 password

Fixes https://github.com/vector-im/riot-web/issues/11950
---
 .../tabs/user/GeneralUserSettingsTab.js        | 18 +++++++++++++++---
 src/i18n/strings/en_EN.json                    |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index b9eaa3efa3..1325a1c583 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -70,7 +70,12 @@ export default class GeneralUserSettingsTab extends React.Component {
         const cli = MatrixClientPeg.get();
 
         const serverSupportsSeparateAddAndBind = await cli.doesServerSupportSeparateAddAndBind();
-        this.setState({serverSupportsSeparateAddAndBind});
+
+        const capabilities = await cli.getCapabilities(); // this is cached
+        const changePasswordCap = capabilities['m.change_password'];
+        const canChangePassword = changePasswordCap && changePasswordCap['enabled'] === false;
+
+        this.setState({serverSupportsSeparateAddAndBind, canChangePassword});
 
         this._getThreepidState();
     }
@@ -280,7 +285,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         const PhoneNumbers = sdk.getComponent("views.settings.account.PhoneNumbers");
         const Spinner = sdk.getComponent("views.elements.Spinner");
 
-        const passwordChangeForm = (
+        let passwordChangeForm = (
             <ChangePassword
                 className="mx_GeneralUserSettingsTab_changePassword"
                 rowClassName=""
@@ -314,11 +319,18 @@ export default class GeneralUserSettingsTab extends React.Component {
             threepidSection = <Spinner />;
         }
 
+        let passwordChangeText = _t("Set a new account password...");
+        if (!this.state.canChangePassword) {
+            // Just don't show anything if you can't do anything.
+            passwordChangeText = null;
+            passwordChangeForm = null;
+        }
+
         return (
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_accountSection">
                 <span className="mx_SettingsTab_subheading">{_t("Account")}</span>
                 <p className="mx_SettingsTab_subsectionText">
-                    {_t("Set a new account password...")}
+                    {passwordChangeText}
                 </p>
                 {passwordChangeForm}
                 {threepidSection}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c86640132a..099b64dd49 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -665,8 +665,8 @@
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
-    "Account": "Account",
     "Set a new account password...": "Set a new account password...",
+    "Account": "Account",
     "Language and region": "Language and region",
     "Theme": "Theme",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",

From 1394331133c7aedcd8de471422fdcd35b855b922 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 16:33:33 -0700
Subject: [PATCH 0631/3235] Fix booleans

---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 1325a1c583..2d56df6be4 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -73,7 +73,11 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         const capabilities = await cli.getCapabilities(); // this is cached
         const changePasswordCap = capabilities['m.change_password'];
-        const canChangePassword = changePasswordCap && changePasswordCap['enabled'] === false;
+
+        // You can change your password so long as the capability isn't explicitly disabled. The implicit
+        // behaviour is you can change your password when the capability is missing or has not-false as
+        // the enabled flag value.
+        const canChangePassword = !changePasswordCap || changePasswordCap['enabled'] !== false;
 
         this.setState({serverSupportsSeparateAddAndBind, canChangePassword});
 

From b5f22001b13292768ede9a20a275892e904f1433 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 17:22:39 -0700
Subject: [PATCH 0632/3235] Fix copy

---
 src/components/views/dialogs/InviteDialog.js | 2 +-
 src/i18n/strings/en_EN.json                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a96028e71b..54a067d716 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -985,7 +985,7 @@ export default class InviteDialog extends React.PureComponent {
 
             title = _t("Direct Messages");
             helpText = _t(
-                "If you can't find someone, ask them for their username, or share your " +
+                "If you can't find someone, ask them for their username, share your " +
                 "username (%(userId)s) or <a>profile link</a>.",
                 {userId},
                 {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..e59805ccd7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1472,7 +1472,7 @@
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Show more": "Show more",
     "Direct Messages": "Direct Messages",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",

From 442ab9f30170743c26523ca867ac9d2821a979e4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 17:27:37 -0700
Subject: [PATCH 0633/3235] Clear the filter when a suggestion is
 accepted/added

---
 src/components/views/dialogs/InviteDialog.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 54a067d716..42319b1842 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -713,11 +713,16 @@ export default class InviteDialog extends React.PureComponent {
     };
 
     _toggleMember = (member: Member) => {
+        let filterText = this.state.filterText;
         const targets = this.state.targets.map(t => t); // cheap clone for mutation
         const idx = targets.indexOf(member);
-        if (idx >= 0) targets.splice(idx, 1);
-        else targets.push(member);
-        this.setState({targets});
+        if (idx >= 0) {
+            targets.splice(idx, 1);
+        } else {
+            targets.push(member);
+            filterText = ""; // clear the filter when the user accepts a suggestion
+        }
+        this.setState({targets, filterText});
     };
 
     _removeMember = (member: Member) => {
@@ -917,7 +922,7 @@ export default class InviteDialog extends React.PureComponent {
                 key={"input"}
                 rows={1}
                 onChange={this._updateFilter}
-                defaultValue={this.state.filterText}
+                value={this.state.filterText}
                 ref={this._editorRef}
                 onPaste={this._onPaste}
             />

From 32f9a4e6231cefbdb9790afcfcd10d2ab5f56ea9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 17:35:36 -0700
Subject: [PATCH 0634/3235] Add some debugging around the recently DM'd users

The suggestions are relatively stable, but the recents have some issues. Adding logging to the suggestions would also destroy the console log with thousands of messages whereas recents aren't too bad.
---
 src/components/views/dialogs/InviteDialog.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 42319b1842..de11dbf9fa 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -338,19 +338,31 @@ export default class InviteDialog extends React.PureComponent {
         const recents = [];
         for (const userId in rooms) {
             // Filter out user IDs that are already in the room / should be excluded
-            if (excludedTargetIds.includes(userId)) continue;
+            if (excludedTargetIds.includes(userId)) {
+                console.warn(`[Invite:Recents] Excluding ${userId} from recents`);
+                continue;
+            }
 
             const room = rooms[userId];
             const member = room.getMember(userId);
-            if (!member) continue; // just skip people who don't have memberships for some reason
+            if (!member) {
+                // just skip people who don't have memberships for some reason
+                console.warn(`[Invite:Recents] ${userId} is missing a member object in their own DM (${room.roomId})`);
+                continue;
+            }
 
             const lastEventTs = room.timeline && room.timeline.length
                 ? room.timeline[room.timeline.length - 1].getTs()
                 : 0;
-            if (!lastEventTs) continue; // something weird is going on with this room
+            if (!lastEventTs) {
+                // something weird is going on with this room
+                console.warn(`[Invite:Recents] ${userId} (${room.roomId}) has a weird last timestamp: ${lastEventTs}`);
+                continue;
+            }
 
             recents.push({userId, user: member, lastActive: lastEventTs});
         }
+        if (!recents) console.warn("[Invite:Recents] No recents to suggest!");
 
         // Sort the recents by last active to save us time later
         recents.sort((a, b) => b.lastActive - a.lastActive);

From 1ec746c01411dafa8b2554d8463e2ec5bcd204eb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jan 2020 19:53:33 -0700
Subject: [PATCH 0635/3235] Add verification with QR codes

---
 src/MatrixClientPeg.js                        |  2 +-
 .../elements/crypto/VerificationQRCode.js     | 59 +++++++++++++++++++
 .../views/right_panel/VerificationPanel.js    | 22 ++++++-
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/components/views/elements/crypto/VerificationQRCode.js

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index dbc570c872..450bec8e77 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -217,7 +217,7 @@ class _MatrixClientPeg {
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
-            verificationMethods: [verificationMethods.SAS],
+            verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
         };
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
new file mode 100644
index 0000000000..c49dd3faf5
--- /dev/null
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -0,0 +1,59 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {replaceableComponent} from "../../../../utils/replaceableComponent";
+import * as qs from "qs";
+import QRCode from "qrcode-react";
+
+@replaceableComponent("views.elements.crypto.VerificationQRCode")
+export default class VerificationQRCode extends React.PureComponent {
+    static propTypes = {
+        // Common for all kinds of QR codes
+        keys: PropTypes.array.isRequired, // array of [Key ID, Key] pairs
+        action: PropTypes.string.isRequired,
+        keyholderUserId: PropTypes.string.isRequired,
+
+        // User verification use case only
+        secret: PropTypes.string,
+        otherUserKey: PropTypes.string,
+        verificationKey: PropTypes.string,
+        verificationAlgorithms: PropTypes.array,
+        requestEventId: PropTypes.string,
+    };
+
+    static defaultProps = {
+        action: "verify",
+    };
+
+    render() {
+        const query = {
+            request: this.props.requestEventId,
+            action: this.props.action,
+            verification_algorithms: this.props.verificationAlgorithms,
+            verification_key: this.props.verificationKey,
+            other_user_key: this.props.otherUserKey,
+        };
+        for (const key of this.props.keys) {
+            query[`key_${key[0]}`] = key[1];
+        }
+
+        const uri = `https://matrix.to/#/${this.props.keyholderUserId}?${qs.stringify(query)}`;
+
+        return <QRCode value={uri} size={256} logoWidth={48} logo={require("../../../../../res/img/matrix-m.svg")} />
+    }
+}
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 0d28e1568f..a2038087fc 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -17,6 +17,9 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import VerificationQRCode from "../elements/crypto/VerificationQRCode";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 export default class VerificationPanel extends React.PureComponent {
     constructor(props) {
@@ -36,15 +39,30 @@ export default class VerificationPanel extends React.PureComponent {
     renderStatus() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const Spinner = sdk.getComponent('elements.Spinner');
-        const {request} = this.props;
+        const {request: req} = this.props;
+        const request: VerificationRequest = req;
 
         if (request.requested) {
             return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
         } else if (request.ready) {
+            const qrCodeKeys = [
+                [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
+                [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningKey("master")],
+            ];
+            // TODO: Await a bunch of this
+            const otherCrossSigning = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+            const otherUserKey = otherCrossSigning ? otherCrossSigning.getCrossSigningKey("master") : null;
+            const qrCode = <VerificationQRCode
+                keyholderUserId={MatrixClientPeg.get().getUserId()}
+                requestEventId={request.event.eventId}
+                otherUserKey={otherUserKey}
+                secret={request.encodedSharedSecret}
+                keys={qrCodeKeys}
+            />;
             const verifyButton = <AccessibleButton kind="primary" onClick={this._startSAS}>
                 Verify by emoji
             </AccessibleButton>;
-            return (<p>{request.otherUserId} is ready, start {verifyButton}</p>);
+            return (<p>{request.otherUserId} is ready, start {verifyButton} or have them scan: {qrCode}</p>);
         } else if (request.started) {
             if (this.state.sasWaitingForOtherParty) {
                 return <p>Waiting for {request.otherUserId} to confirm ...</p>;

From 586a240e41721651ae661abb216de865504672bd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Jan 2020 23:10:35 -0700
Subject: [PATCH 0636/3235] Don't use private keys for QR code

---
 src/components/views/right_panel/VerificationPanel.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a2038087fc..34f7538b1c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -45,17 +45,15 @@ export default class VerificationPanel extends React.PureComponent {
         if (request.requested) {
             return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
         } else if (request.ready) {
+            const keyId = `ed25519:${MatrixClientPeg.get().getCrossSigningId()}`;
             const qrCodeKeys = [
                 [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-                [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningKey("master")],
+                [keyId, MatrixClientPeg.get().getCrossSigningId()],
             ];
-            // TODO: Await a bunch of this
-            const otherCrossSigning = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
-            const otherUserKey = otherCrossSigning ? otherCrossSigning.getCrossSigningKey("master") : null;
             const qrCode = <VerificationQRCode
                 keyholderUserId={MatrixClientPeg.get().getUserId()}
                 requestEventId={request.event.eventId}
-                otherUserKey={otherUserKey}
+                otherUserKey={"todo"}
                 secret={request.encodedSharedSecret}
                 keys={qrCodeKeys}
             />;

From b682e7d908a8e6b3c84a0e77977604bd85709bf6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 20:05:32 -0700
Subject: [PATCH 0637/3235] Generate a QR code for apps to scan

---
 .../elements/crypto/VerificationQRCode.js     |  8 ++---
 .../views/right_panel/VerificationPanel.js    | 32 +++++++++++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index c49dd3faf5..fa4031da9f 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -24,15 +24,13 @@ import QRCode from "qrcode-react";
 export default class VerificationQRCode extends React.PureComponent {
     static propTypes = {
         // Common for all kinds of QR codes
-        keys: PropTypes.array.isRequired, // array of [Key ID, Key] pairs
+        keys: PropTypes.array.isRequired, // array of [Key ID, Base64 Key] pairs
         action: PropTypes.string.isRequired,
         keyholderUserId: PropTypes.string.isRequired,
 
         // User verification use case only
         secret: PropTypes.string,
-        otherUserKey: PropTypes.string,
-        verificationKey: PropTypes.string,
-        verificationAlgorithms: PropTypes.array,
+        otherUserKey: PropTypes.string, // Base64 key being verified
         requestEventId: PropTypes.string,
     };
 
@@ -44,8 +42,6 @@ export default class VerificationQRCode extends React.PureComponent {
         const query = {
             request: this.props.requestEventId,
             action: this.props.action,
-            verification_algorithms: this.props.verificationAlgorithms,
-            verification_key: this.props.verificationKey,
             other_user_key: this.props.otherUserKey,
         };
         for (const key of this.props.keys) {
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 34f7538b1c..d0c3d2df10 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -45,22 +45,28 @@ export default class VerificationPanel extends React.PureComponent {
         if (request.requested) {
             return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
         } else if (request.ready) {
-            const keyId = `ed25519:${MatrixClientPeg.get().getCrossSigningId()}`;
-            const qrCodeKeys = [
-                [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-                [keyId, MatrixClientPeg.get().getCrossSigningId()],
-            ];
-            const qrCode = <VerificationQRCode
-                keyholderUserId={MatrixClientPeg.get().getUserId()}
-                requestEventId={request.event.eventId}
-                otherUserKey={"todo"}
-                secret={request.encodedSharedSecret}
-                keys={qrCodeKeys}
-            />;
             const verifyButton = <AccessibleButton kind="primary" onClick={this._startSAS}>
                 Verify by emoji
             </AccessibleButton>;
-            return (<p>{request.otherUserId} is ready, start {verifyButton} or have them scan: {qrCode}</p>);
+
+            if (request.requestEvent && request.requestEvent.getId()) {
+                const keyId = `ed25519:${MatrixClientPeg.get().getCrossSigningId()}`;
+                const qrCodeKeys = [
+                    [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
+                    [keyId, MatrixClientPeg.get().getCrossSigningId()],
+                ];
+                const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+                const qrCode = <VerificationQRCode
+                    keyholderUserId={MatrixClientPeg.get().getUserId()}
+                    requestEventId={request.requestEvent.getId()}
+                    otherUserKey={crossSigningInfo.getId("master")}
+                    secret={request.encodedSharedSecret}
+                    keys={qrCodeKeys}
+                />;
+                return (<p>{request.otherUserId} is ready, start {verifyButton} or have them scan: {qrCode}</p>);
+            }
+
+            return (<p>{request.otherUserId} is ready, start {verifyButton}</p>);
         } else if (request.started) {
             if (this.state.sasWaitingForOtherParty) {
                 return <p>Waiting for {request.otherUserId} to confirm ...</p>;

From ebcc4d573bacac10c991db7df788cc28b1b73a8a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 20:10:31 -0700
Subject: [PATCH 0638/3235] Add trace logging to figure out which component is
 causing weird events

For https://github.com/vector-im/riot-web/issues/11120
---
 src/components/views/rooms/EventTile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 634b77c9e1..155ed19821 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -578,6 +578,7 @@ export default createReactClass({
             console.error("EventTile attempted to get relations for an event without an ID");
             // Use event's special `toJSON` method to log key data.
             console.log(JSON.stringify(this.props.mxEvent, null, 4));
+            console.trace("Stacktrace for https://github.com/vector-im/riot-web/issues/11120");
         }
         return this.props.getRelationsForEvent(eventId, "m.annotation", "m.reaction");
     },

From 0ce9da5d365d4b2e1490206233c8ecfa6dc01eed Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 20:12:24 -0700
Subject: [PATCH 0639/3235] Appease the linter

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

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index fa4031da9f..9026e51096 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -50,6 +50,6 @@ export default class VerificationQRCode extends React.PureComponent {
 
         const uri = `https://matrix.to/#/${this.props.keyholderUserId}?${qs.stringify(query)}`;
 
-        return <QRCode value={uri} size={256} logoWidth={48} logo={require("../../../../../res/img/matrix-m.svg")} />
+        return <QRCode value={uri} size={256} logoWidth={48} logo={require("../../../../../res/img/matrix-m.svg")} />;
     }
 }

From b7e680ba5154935f3f8a394ceaeeb0bda307c29b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 20:14:27 -0700
Subject: [PATCH 0640/3235] Fix key ID

---
 src/components/views/right_panel/VerificationPanel.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index d0c3d2df10..a29546c8f7 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -50,10 +50,9 @@ export default class VerificationPanel extends React.PureComponent {
             </AccessibleButton>;
 
             if (request.requestEvent && request.requestEvent.getId()) {
-                const keyId = `ed25519:${MatrixClientPeg.get().getCrossSigningId()}`;
                 const qrCodeKeys = [
                     [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-                    [keyId, MatrixClientPeg.get().getCrossSigningId()],
+                    [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
                 ];
                 const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
                 const qrCode = <VerificationQRCode

From 12fa94106eb5602cc05be6717099ac138ce70027 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Jan 2020 20:19:17 -0700
Subject: [PATCH 0641/3235] Actually add the secret to the QR code url

---
 src/components/views/elements/crypto/VerificationQRCode.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 9026e51096..1cb5647317 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -43,6 +43,7 @@ export default class VerificationQRCode extends React.PureComponent {
             request: this.props.requestEventId,
             action: this.props.action,
             other_user_key: this.props.otherUserKey,
+            secret: this.props.secret,
         };
         for (const key of this.props.keys) {
             query[`key_${key[0]}`] = key[1];

From 86a098fcd983d546b18f1a1eba9e2d1e1f1e6f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:35:31 +0100
Subject: [PATCH 0642/3235] DisableEventIndex: Remove a blank line and rewrite
 a doc comment.

---
 .../views/dialogs/eventindex/DisableEventIndex.js             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 064f55edc0..5720c26e40 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -24,10 +24,8 @@ import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
-
 /*
- * Walks the user through the process of creating an e2e key backup
- * on the server.
+ * Allows the user to disable the Event Index.
  */
 export default class ManageEventIndex extends React.Component {
     static propTypes = {

From d30fd3eac04ecedd1bbd8dda8b0a38b49f77444d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:39:56 +0100
Subject: [PATCH 0643/3235] DisableEventIndex: Rename the class.

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

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 5720c26e40..820bcbe047 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -27,7 +27,7 @@ import AccessibleButton from "../../../../components/views/elements/AccessibleBu
 /*
  * Allows the user to disable the Event Index.
  */
-export default class ManageEventIndex extends React.Component {
+export default class DisableEventIndexDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
     }

From 4ea2d4f90eff09481a75366740274cecb5326b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:45:29 +0100
Subject: [PATCH 0644/3235] ManageEventIndex: Rewrite the docs and rename the
 dialog class.

---
 .../views/dialogs/eventindex/ManageEventIndex.js            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index d0f3c2cf50..5d75f9b168 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -24,12 +24,10 @@ import {formatBytes} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
-
 /*
- * Walks the user through the process of creating an e2e key backup
- * on the server.
+ * Allows the user to introspect the event index state and disable it.
  */
-export default class ManageEventIndex extends React.Component {
+export default class ManageEventIndexDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
     }

From f763ae3c7bec35d78097249e58859cb55bfaadda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:50:58 +0100
Subject: [PATCH 0645/3235] DisableEventIndex: Rename the file to contain the
 Dialog suffix.

---
 .../{DisableEventIndex.js => DisableEventIndexDialog.js}        | 0
 .../views/dialogs/eventindex/ManageEventIndex.js                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/async-components/views/dialogs/eventindex/{DisableEventIndex.js => DisableEventIndexDialog.js} (100%)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
similarity index 100%
rename from src/async-components/views/dialogs/eventindex/DisableEventIndex.js
rename to src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index 5d75f9b168..c9c4fc8ae6 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -96,7 +96,7 @@ export default class ManageEventIndexDialog extends React.Component {
 
     _onDisable = async () => {
         Modal.createTrackedDialogAsync("Disable message search", "Disable message search",
-            import("./DisableEventIndex"),
+            import("./DisableEventIndexDialog"),
             null, null, /* priority = */ false, /* static = */ true,
         );
     }

From 93facca47963ce17ae706f80150333a98ff4dfbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:54:46 +0100
Subject: [PATCH 0646/3235] ManageEventIndex: Rename the file to contain the
 Dialog suffix.

---
 .../{ManageEventIndex.js => ManageEventIndexDialog.js}          | 0
 src/components/views/settings/EventIndexPanel.js                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/async-components/views/dialogs/eventindex/{ManageEventIndex.js => ManageEventIndexDialog.js} (100%)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
similarity index 100%
rename from src/async-components/views/dialogs/eventindex/ManageEventIndex.js
rename to src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index f93ab489c7..785ce2a4ca 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -85,7 +85,7 @@ export default class EventIndexPanel extends React.Component {
 
     _onManage = async () => {
         Modal.createTrackedDialogAsync('Message search', 'Message search',
-            import('../../../async-components/views/dialogs/eventindex/ManageEventIndex'),
+            import('../../../async-components/views/dialogs/eventindex/ManageEventIndexDialog'),
             {
                 onFinished: () => {},
             }, null, /* priority = */ false, /* static = */ true,

From b59863781f703997058ab8bd4af9acab349d8e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:58:17 +0100
Subject: [PATCH 0647/3235] DisableEventIndexDialog: Fix a typo.

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

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 820bcbe047..7f46b54f65 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -60,7 +60,7 @@ export default class DisableEventIndexDialog extends React.Component {
                 onFinished={this.props.onFinished}
                 title={_t("Are you sure?")}
             >
-            {_t("If disabled, messages form encrypted rooms won't appear in search results")}
+            {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
             <div className="mx_Dialog_buttons">
                 <AccessibleButton kind="secondary" onClick={this.props.onFinished}>
                     {_t("Cancel")}

From 72a58d0c2c274ee6b7a874205e3a8ee13ade4f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 09:59:26 +0100
Subject: [PATCH 0648/3235] DisableEventIndexDialog: Properly indent the
 content of the BaseDialog.

---
 .../eventindex/DisableEventIndexDialog.js     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 7f46b54f65..7097ffb3bf 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -60,16 +60,16 @@ export default class DisableEventIndexDialog extends React.Component {
                 onFinished={this.props.onFinished}
                 title={_t("Are you sure?")}
             >
-            {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
-            <div className="mx_Dialog_buttons">
-                <AccessibleButton kind="secondary" onClick={this.props.onFinished}>
-                    {_t("Cancel")}
-                </AccessibleButton>
-                <AccessibleButton kind="danger" disabled={this.state.disabling} onClick={this._onDisable}>
-                    {_t("Disable")}
-                </AccessibleButton>
-                {this.state.enabling ? <InlineSpinner /> : <div />}
-            </div>
+                {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
+                <div className="mx_Dialog_buttons">
+                    <AccessibleButton kind="secondary" onClick={this.props.onFinished}>
+                        {_t("Cancel")}
+                    </AccessibleButton>
+                    <AccessibleButton kind="danger" disabled={this.state.disabling} onClick={this._onDisable}>
+                        {_t("Disable")}
+                    </AccessibleButton>
+                    {this.state.enabling ? <InlineSpinner /> : <div />}
+                </div>
             </BaseDialog>
         );
     }

From cd4e75c378d748d6cf42acf2fb0b43e6328b1ed1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 09:36:22 +0000
Subject: [PATCH 0649/3235] Unnecessary blank line

---
 src/components/views/auth/AuthBody.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index db5c941b20..fe20d76afb 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-
 import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {

From 99252e08b0eb3800b9aa79be9e000f803b04aeb0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 09:37:43 +0000
Subject: [PATCH 0650/3235] Unintentional commit

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

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index cd8cdfa5d9..fd166782d8 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,7 +127,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: false,
+                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
                 onFinished: () => {
                     this._loadBackupStatus();
                 },

From 169852adec208ce8451072ff9a08c5e9021920b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 24 Jan 2020 08:23:03 +0000
Subject: [PATCH 0651/3235] Translated using Weblate (French)

Currently translated at 100.0% (2053 of 2053 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 | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 472cd02e6f..5d02717b0c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2085,5 +2085,22 @@
     "Unrecognised command: %(commandText)s": "Commande non reconnue : %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vous pouvez utiliser <code>/help</code> pour obtenir la liste des commandes disponibles. Vouliez-vous envoyer un message ?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Astuce : Votre message doit démarrer par <code>//</code> pour commencer par une barre oblique.",
-    "Send as message": "Envoyer comme message"
+    "Send as message": "Envoyer comme message",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s a ajouté %(addedAddresses)s et %(count)s autres adresses à ce salon",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s a supprimé %(removedAddresses)s et %(count)s autres adresses de ce salon",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s a supprimé %(countRemoved)s et ajouté %(countAdded)s adresses à ce salon",
+    "Reject & Ignore user": "Rejeter et ignorer l’utilisateur",
+    "Enter your account password to confirm the upgrade:": "Saisissez le mot de passe de votre compte pour confirmer la mise à niveau :",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Vous devrez vous identifier avec le serveur pour confirmer la mise à niveau.",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cet appareil pour lui permettre de vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Configurez le chiffrement sur cet appareil pour lui permettre de vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sécurisez vos clés de chiffrement avec une phrase de passe. Pour une sécurité maximale, elle devrait être différente du mot de passe de votre compte :",
+    "Enter a passphrase": "Saisissez une phrase de passe",
+    "Enter your passphrase a second time to confirm it.": "Saisissez votre phrase de passe une seconde fois pour la confirmer.",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Cet appareil peut à présent vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
+    "Verify other users in their profile.": "Vérifiez d’autres utilisateurs dans leur profil.",
+    "Upgrade your encryption": "Mettre à niveau votre chiffrement",
+    "Set up encryption": "Configurer le chiffrement",
+    "Encryption upgraded": "Chiffrement mis à niveau",
+    "Encryption setup complete": "Configuration du chiffrement terminé"
 }

From cba7764784e1b60365cfcac0ea8f5ea3310dcaa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:00:28 +0100
Subject: [PATCH 0652/3235] DisableEventIndexDialog: Use the DialogButtons
 element for the buttons.

---
 .../eventindex/DisableEventIndexDialog.js     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 7097ffb3bf..2e0f97c705 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -53,7 +53,8 @@ export default class DisableEventIndexDialog extends React.Component {
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+        const Spinner = sdk.getComponent('elements.Spinner');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
@@ -61,15 +62,15 @@ export default class DisableEventIndexDialog extends React.Component {
                 title={_t("Are you sure?")}
             >
                 {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
-                <div className="mx_Dialog_buttons">
-                    <AccessibleButton kind="secondary" onClick={this.props.onFinished}>
-                        {_t("Cancel")}
-                    </AccessibleButton>
-                    <AccessibleButton kind="danger" disabled={this.state.disabling} onClick={this._onDisable}>
-                        {_t("Disable")}
-                    </AccessibleButton>
-                    {this.state.enabling ? <InlineSpinner /> : <div />}
-                </div>
+                {this.state.disabling ? <InlineSpinner /> : <div />}
+                <DialogButtons
+                    primaryButton={_t('Disable')}
+                    onPrimaryButtonClick={this._onDisable}
+                    primaryButtonClass="danger"
+                    onCancel={this.props.onFinished}
+                    disabled={this.state.disabling}
+                >
+                </DialogButtons>
             </BaseDialog>
         );
     }

From 71024d14188cb70965eb69b64c7f8fcf384a39eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:03:40 +0100
Subject: [PATCH 0653/3235] ManageEventIndexDialog: Properly indent the content
 of the BaseDialog.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index c9c4fc8ae6..f435cf050f 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -150,8 +150,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 onFinished={this.props.onFinished}
                 title={_t("Message search")}
             >
-            {eventIndexingSettings}
-            {buttons}
+                {eventIndexingSettings}
+                {buttons}
             </BaseDialog>
         );
     }

From 128c0b73004e27cb6d5ff16da01f48a99785d72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:11:53 +0100
Subject: [PATCH 0654/3235] ManageEventIndexDialog: Use formatCount to format
 the message and room count.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index f435cf050f..a8fc7dce3a 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
 import Modal from '../../../../Modal';
-import {formatBytes} from "../../../../utils/FormattingUtils";
+import {formatBytes, formatCount} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
@@ -125,8 +125,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 }
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                    {_t("Indexed messages:")} {this.state.eventCount}<br />
-                    {_t("Number of rooms:")} {this.state.roomCount}<br />
+                    {_t("Indexed messages:")} {formatCount(this.state.eventCount)}<br />
+                    {_t("Number of rooms:")} {formatCount(this.state.roomCount)}<br />
                     {crawlerState}<br />
                 </div>
             </div>

From b72ab57e1b33d443b40a56e73645044233a736f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Jan 2020 10:13:03 +0000
Subject: [PATCH 0655/3235] add <Tooltip/> to <E2EIcon/>

---
 src/components/views/rooms/E2EIcon.js | 40 +++++++++++++++++++++------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 7ac3b5af2d..df5fe204d4 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -15,13 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
+import React, {useState} from "react";
 import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import AccessibleButton from '../elements/AccessibleButton';
 import {useFeatureEnabled} from "../../../hooks/useSettings";
+import AccessibleButton from "../elements/AccessibleButton";
+import Tooltip from "../elements/Tooltip";
 
 export const E2E_STATE = {
     VERIFIED: "verified",
@@ -51,7 +52,9 @@ const legacyRoomTitles = {
 };
 
 const E2EIcon = ({isUser, status, className, size, onClick}) => {
-    const e2eIconClasses = classNames({
+    const [hover, setHover] = useState(false);
+
+    const classes = classNames({
         mx_E2EIcon: true,
         mx_E2EIcon_warning: status === E2E_STATE.WARNING,
         mx_E2EIcon_normal: status === E2E_STATE.NORMAL,
@@ -70,17 +73,36 @@ const E2EIcon = ({isUser, status, className, size, onClick}) => {
         e2eTitle = legacyRoomTitles[status];
     }
 
-    let style = null;
+    let style;
     if (size) {
         style = {width: `${size}px`, height: `${size}px`};
     }
 
-    const icon = (<div className={e2eIconClasses} style={style} title={e2eTitle ? _t(e2eTitle) : undefined} />);
-    if (onClick) {
-        return (<AccessibleButton onClick={onClick}>{ icon }</AccessibleButton>);
-    } else {
-        return icon;
+    const onMouseOver = () => setHover(true);
+    const onMouseOut = () => setHover(false);
+
+    let tip;
+    if (hover) {
+        tip = <Tooltip label={e2eTitle ? _t(e2eTitle) : ""} />;
     }
+
+    if (onClick) {
+        return (
+            <AccessibleButton
+                onClick={onClick}
+                onMouseOver={onMouseOver}
+                onMouseOut={onMouseOut}
+                className={classes}
+                style={style}
+            >
+                { tip }
+            </AccessibleButton>
+        );
+    }
+
+    return <div onMouseOver={onMouseOver} onMouseOut={onMouseOut} className={classes} style={style}>
+        { tip }
+    </div>;
 };
 
 E2EIcon.propTypes = {

From 660240e2c047a964f2556cd2d63145f15ddc963e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:13:09 +0100
Subject: [PATCH 0656/3235] EventIndexPanel: Use formatCount to format the room
 count.

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 785ce2a4ca..13063d9305 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
-import {formatBytes} from "../../../utils/FormattingUtils";
+import {formatBytes, formatCount} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 
 export default class EventIndexPanel extends React.Component {
@@ -115,7 +115,7 @@ export default class EventIndexPanel extends React.Component {
                         {_t( "Securely cache encrypted messages locally for them " +
                              "to appear in search results, using ")
                         } {formatBytes(this.state.eventIndexSize, 0)}
-                        {_t( " to store messages from ")} {this.state.roomCount} {_t("rooms.")}
+                        {_t( " to store messages from ")} {formatCount(this.state.roomCount)} {_t("rooms.")}
                     </div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this._onManage}>

From d9e933c915534456fead4641841e5b5ff9632a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:15:57 +0100
Subject: [PATCH 0657/3235] EventIndex: Style fixes for the docstrings.

---
 src/indexing/EventIndex.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index d466c6acba..53f47148b9 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -69,7 +69,8 @@ export default class EventIndex {
         client.removeListener('Room.timelineReset', this.onTimelineReset);
     }
 
-    /** Get crawler checkpoints for the encrypted rooms and store them in the index.
+    /**
+     * Get crawler checkpoints for the encrypted rooms and store them in the index.
      */
     async addInitialCheckpoints() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
@@ -80,7 +81,7 @@ export default class EventIndex {
             return client.isRoomEncrypted(room.roomId);
         };
 
-        // We only care to crawl the encrypted rooms, non-encrypted.
+        // We only care to crawl the encrypted rooms, non-encrypted
         // rooms can use the search provided by the homeserver.
         const encryptedRooms = rooms.filter(isRoomEncrypted);
 

From 825b6f7b7d6848b4963dcbfc335c829779dfd40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:16:49 +0100
Subject: [PATCH 0658/3235] EventIndexPeg: Style fix for a docstring.

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

diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index c8c8cbefe9..067aea3a7f 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -62,7 +62,8 @@ class EventIndexPeg {
         return this.initEventIndex();
     }
 
-    /* Initialize the event index.
+    /**
+     * Initialize the event index.
      *
      * @returns {boolean} True if the event index was succesfully initialized,
      * false otherwise.

From 6f919eaeec0aaf96bd5cea50e9a714f3b2c023d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:27:56 +0100
Subject: [PATCH 0659/3235] DisableEventIndexDialog: Use the correct spinner.

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

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 2e0f97c705..f031c5a11f 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -62,7 +62,7 @@ export default class DisableEventIndexDialog extends React.Component {
                 title={_t("Are you sure?")}
             >
                 {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
-                {this.state.disabling ? <InlineSpinner /> : <div />}
+                {this.state.disabling ? <Spinner /> : <div />}
                 <DialogButtons
                     primaryButton={_t('Disable')}
                     onPrimaryButtonClick={this._onDisable}

From 38b1663755e45d497f418e9e13ad9d7b4b66752e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:28:33 +0100
Subject: [PATCH 0660/3235] EventIndex: Subclass the event emitter instead of
 putting one in a property.

---
 src/indexing/EventIndex.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 53f47148b9..85e75cfc82 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -22,8 +22,9 @@ import {EventEmitter} from "events";
 /*
  * Event indexing class that wraps the platform specific event indexing.
  */
-export default class EventIndex {
+export default class EventIndex extends EventEmitter {
     constructor() {
+        super();
         this.crawlerCheckpoints = [];
         // The time in ms that the crawler will wait loop iterations if there
         // have not been any checkpoints to consume in the last iteration.
@@ -35,7 +36,6 @@ export default class EventIndex {
         this._crawler = null;
         this._currentCheckpoint = null;
         this.liveEventsForIndex = new Set();
-        this._eventEmitter = new EventEmitter();
     }
 
     async init() {
@@ -188,7 +188,7 @@ export default class EventIndex {
     }
 
     emitNewCheckpoint() {
-        this._eventEmitter.emit("changedCheckpoint", this.currentRoom());
+        this.emit("changedCheckpoint", this.currentRoom());
     }
 
     async crawlerFunc() {
@@ -459,12 +459,4 @@ export default class EventIndex {
             return client.getRoom(this.crawlerCheckpoints[0].roomId);
         }
     }
-
-    on(eventName, callback) {
-        this._eventEmitter.on(eventName, callback);
-    }
-
-    removeListener(eventName, callback) {
-        this._eventEmitter.removeListener(eventName, callback);
-    }
 }

From ffe5d411db9a7ae02ead2f5e78a8741be08ec5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:44:56 +0100
Subject: [PATCH 0661/3235] EventIndexPanel: Add a link to the download page of
 Riot Desktop.

---
 src/components/views/settings/EventIndexPanel.js | 8 ++++++--
 src/i18n/strings/en_EN.json                      | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 13063d9305..a6f21fa114 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -145,8 +145,12 @@ export default class EventIndexPanel extends React.Component {
                 <div>
                     {
                         _t( "Riot can't securely cache encrypted messages locally " +
-                            "while running in a web browser. Use Riot Desktop for " +
-                            "encrypted messages to appear in search results.",
+                            "while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +
+                            "for encrypted messages to appear in search results.",
+                            {},
+                            {
+                                'riotLink': (sub) => <a href="https://riot.im/download/desktop">{sub}</a>,
+                            }
                         )
                     }
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3973ae442e..fceb299131 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -560,7 +560,7 @@
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "Enable": "Enable",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use Riot Desktop for encrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locally while running in a web browser. Use Riot Desktop for encrypted messages to appear in search results.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -2037,7 +2037,7 @@
     "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
-    "If disabled, messages form encrypted rooms won't appear in search results": "If disabled, messages form encrypted rooms won't appear in search results",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
     "Disable": "Disable",
     "Not downloading messages for any room.": "Not downloading messages for any room.",
     "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",

From 0c3d507455bbf77d956e2f6c303e08ef6d9d8c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:46:46 +0100
Subject: [PATCH 0662/3235] EventIndex: Cancel the crawler early after a
 message request.

If we're cancelling the crawler nowadays this means that we're likely
deleting the index. Processing these messages is wasted effort in that
case so break early.
---
 src/indexing/EventIndex.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 85e75cfc82..723d516a29 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -266,6 +266,11 @@ export default class EventIndex extends EventEmitter {
                 continue;
             }
 
+            if (cancelled) {
+                this.crawlerCheckpoints.push(checkpoint);
+                break;
+            }
+
             if (res.chunk.length === 0) {
                 console.log("EventIndex: Done with the checkpoint", checkpoint);
                 // We got to the start/end of our timeline, lets just

From ee133a9c715559e33c058c58ce8776574816fafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:56:19 +0100
Subject: [PATCH 0663/3235] DisableEventIndexDialog: Remove an unused import.

---
 .../views/dialogs/eventindex/DisableEventIndexDialog.js          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index f031c5a11f..c2b7e2933e 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -22,7 +22,6 @@ import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
-import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
 /*
  * Allows the user to disable the Event Index.

From 029369a04bd08f2fdb8944ff72be50e79050784a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 11:56:43 +0100
Subject: [PATCH 0664/3235] EventIndexPanel: Small style fix.

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index a6f21fa114..5edc25bbab 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -150,7 +150,7 @@ export default class EventIndexPanel extends React.Component {
                             {},
                             {
                                 'riotLink': (sub) => <a href="https://riot.im/download/desktop">{sub}</a>,
-                            }
+                            },
                         )
                     }
                 </div>

From 2483337e8993463f87be946b078ffa08a6f514ca Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 Jan 2020 11:57:57 +0100
Subject: [PATCH 0665/3235] don't use removed .event property anymore on
 verification request

---
 .../messages/MKeyVerificationConclusion.js    |  2 +-
 .../views/messages/MKeyVerificationRequest.js | 10 +++---
 .../views/toasts/VerificationRequestToast.js  | 33 +++++++++----------
 src/utils/KeyVerificationStateObserver.js     |  7 ++--
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index f51b97786b..a17dcd8ab0 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -93,7 +93,7 @@ export default class MKeyVerificationConclusion extends React.Component {
         }
 
         if (title) {
-            const subtitle = userLabelForEventRoom(request.otherUserId, mxEvent);
+            const subtitle = userLabelForEventRoom(request.otherUserId, mxEvent.getRoomId());
             const classes = classNames("mx_EventTile_bubble", "mx_KeyVerification", "mx_KeyVerification_icon", {
                 mx_KeyVerification_icon_verified: request.done,
             });
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ae793556d8..8caff322aa 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -85,7 +85,7 @@ export default class MKeyVerificationRequest extends React.Component {
         if (userId === myUserId) {
             return _t("You accepted");
         } else {
-            return _t("%(name)s accepted", {name: getNameForEventRoom(userId, this.props.mxEvent)});
+            return _t("%(name)s accepted", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
         }
     }
 
@@ -95,7 +95,7 @@ export default class MKeyVerificationRequest extends React.Component {
         if (userId === myUserId) {
             return _t("You cancelled");
         } else {
-            return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent)});
+            return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
         }
     }
 
@@ -129,9 +129,9 @@ export default class MKeyVerificationRequest extends React.Component {
 
         if (!request.initiatedByMe) {
             title = (<div className="mx_KeyVerification_title">{
-                _t("%(name)s wants to verify", {name: getNameForEventRoom(request.requestingUserId, mxEvent)})}</div>);
+                _t("%(name)s wants to verify", {name: getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId())})}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
-                userLabelForEventRoom(request.requestingUserId, mxEvent)}</div>);
+                userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
             if (request.requested && !request.observeOnly) {
                 stateNode = (<div className="mx_KeyVerification_buttons">
                     <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
@@ -142,7 +142,7 @@ export default class MKeyVerificationRequest extends React.Component {
             title = (<div className="mx_KeyVerification_title">{
                 _t("You sent a verification request")}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
-                userLabelForEventRoom(request.receivingUserId, mxEvent)}</div>);
+                userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId())}</div>);
         }
 
         if (title) {
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 479a3e3f93..274085c0fd 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -65,22 +65,21 @@ export default class VerificationRequestToast extends React.PureComponent {
     accept = async () => {
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {request} = this.props;
-        const {event} = request;
         // no room id for to_device requests
-        if (event.getRoomId()) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: event.getRoomId(),
-                should_peek: false,
-            });
-        }
         try {
-            await request.accept();
-            dis.dispatch({
-                action: "set_right_panel_phase",
-                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {verificationRequest: request},
-            });
+            if (request.channel.roomId) {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: request.channel.roomId,
+                    should_peek: false,
+                });
+                await request.accept();
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {verificationRequest: request},
+                });
+            }
         } catch (err) {
             console.error(err.message);
         }
@@ -89,13 +88,13 @@ export default class VerificationRequestToast extends React.PureComponent {
     render() {
         const FormButton = sdk.getComponent("elements.FormButton");
         const {request} = this.props;
-        const {event} = request;
         const userId = request.otherUserId;
-        let nameLabel = event.getRoomId() ? userLabelForEventRoom(userId, event) : userId;
+        const roomId = request.channel.roomId;
+        let nameLabel = roomId ? userLabelForEventRoom(userId, roomId) : userId;
         // for legacy to_device verification requests
         if (nameLabel === userId) {
             const client = MatrixClientPeg.get();
-            const user = client.getUser(event.getSender());
+            const user = client.getUser(userId);
             if (user && user.displayName) {
                 nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
             }
diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 1a35319186..7da532109c 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -17,16 +17,15 @@ limitations under the License.
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import { _t } from '../languageHandler';
 
-export function getNameForEventRoom(userId, mxEvent) {
-    const roomId = mxEvent.getRoomId();
+export function getNameForEventRoom(userId, roomId) {
     const client = MatrixClientPeg.get();
     const room = client.getRoom(roomId);
     const member = room.getMember(userId);
     return member ? member.name : userId;
 }
 
-export function userLabelForEventRoom(userId, mxEvent) {
-    const name = getNameForEventRoom(userId, mxEvent);
+export function userLabelForEventRoom(userId, roomId) {
+    const name = getNameForEventRoom(userId, roomId);
     if (name !== userId) {
         return _t("%(name)s (%(userId)s)", {name, userId});
     } else {

From 512bd4b0b2afb62d50cf6bb179b6bc8b619887c2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 Jan 2020 11:59:17 +0100
Subject: [PATCH 0666/3235] show to_device verification in dialog, not right
 panel

this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
---
 src/components/views/toasts/VerificationRequestToast.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 274085c0fd..f912984486 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -23,6 +23,7 @@ import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher";
 import ToastStore from "../../../stores/ToastStore";
+import Modal from "../../../Modal";
 
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
@@ -79,6 +80,12 @@ export default class VerificationRequestToast extends React.PureComponent {
                     phase: RIGHT_PANEL_PHASES.EncryptionPanel,
                     refireParams: {verificationRequest: request},
                 });
+            } else if (request.channel.deviceId && request.verifier) {
+                // show to_device verifications in dialog still
+                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
+                    verifier: request.verifier,
+                }, null, /* priority = */ false, /* static = */ true);
             }
         } catch (err) {
             console.error(err.message);

From 395c82b1e5042e915cf3d1184ace4d23ea2ad240 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 24 Jan 2020 11:04:40 +0000
Subject: [PATCH 0667/3235] Update src/components/structures/RoomView.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/structures/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f10c98dd98..4c88f533f0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -796,7 +796,7 @@ export default createReactClass({
             return;
         }
 
-        // Duplication betwen here and _updateE2eStatus in RoomTile
+        // Duplication between here and _updateE2eStatus in RoomTile
         /* At this point, the user has encryption on and cross-signing on */
         const e2eMembers = await room.getEncryptionTargetMembers();
         const verified = [];

From ecfecfe559e2eda9c8cc326913a5103d19fb9ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 12:07:03 +0100
Subject: [PATCH 0668/3235] EventIndex: Fix a small style issue.

---
 src/indexing/EventIndex.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 93c640cf8e..2b432ab1a1 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -172,7 +172,7 @@ export default class EventIndex {
         }
 
         const jsonEvent = ev.toJSON();
-        const e = ev.isEncrypted() ? jsonEvent.decrypted: jsonEvent;
+        const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
 
         const profile = {
             displayname: ev.sender.rawDisplayName,
@@ -308,7 +308,7 @@ export default class EventIndex {
             // consume.
             const events = filteredEvents.map((ev) => {
                 const jsonEvent = ev.toJSON();
-                const e = ev.isEncrypted() ? jsonEvent.decrypted: jsonEvent;
+                const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
 
                 let profile = {};
                 if (e.sender in profiles) profile = profiles[e.sender];

From 6cce65a2a59544ef21b77744856ad2875abfb1ad Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 Jan 2020 12:08:47 +0100
Subject: [PATCH 0669/3235] fix lint

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

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 8caff322aa..49f871d16e 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -128,8 +128,9 @@ export default class MKeyVerificationRequest extends React.Component {
         }
 
         if (!request.initiatedByMe) {
+            const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId());
             title = (<div className="mx_KeyVerification_title">{
-                _t("%(name)s wants to verify", {name: getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId())})}</div>);
+                _t("%(name)s wants to verify", {name})}</div>);
             subtitle = (<div className="mx_KeyVerification_subtitle">{
                 userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
             if (request.requested && !request.observeOnly) {

From 210616c737bdc93fd421c75ec8e554779f4af7fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Jan 2020 11:45:39 +0000
Subject: [PATCH 0670/3235] Phase 1, split out UserInfo into a generic Pane,
 use for EncInfo

---
 res/css/views/right_panel/_UserInfo.scss      |  17 +-
 src/components/structures/RightPanel.js       |  13 +-
 .../views/right_panel/EncryptionInfo.js       |  18 +-
 .../views/right_panel/EncryptionPanel.js      |  25 +-
 src/components/views/right_panel/UserInfo.js  | 248 +++++++++---------
 src/i18n/strings/en_EN.json                   |   3 +-
 6 files changed, 191 insertions(+), 133 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index d2d9d12c6d..57ffd4982e 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -49,12 +49,17 @@ limitations under the License.
     }
 
     .mx_UserInfo_container {
-        padding: 0 16px 16px 16px;
+        padding: 8px 16px;
+    }
+
+    .mx_UserInfo_separator {
         border-bottom: 1px solid lightgray;
     }
 
     .mx_UserInfo_memberDetailsContainer {
+        padding-top: 0;
         padding-bottom: 0;
+        margin-bottom: 8px;
     }
 
     .mx_RoomTile_nameContainer {
@@ -204,10 +209,9 @@ limitations under the License.
         padding-bottom: 16px;
     }
 
-    .mx_UserInfo_scrollContainer .mx_UserInfo_container {
+    .mx_UserInfo_scrollContainer:not(.mx_UserInfo_separator) {
         padding-top: 16px;
         padding-bottom: 0;
-        border-bottom: none;
 
         > :not(h3) {
             margin-left: 8px;
@@ -264,3 +268,10 @@ limitations under the License.
         margin: 16px 0;
     }
 }
+
+.mx_UserInfo.mx_UserInfo_smallAvatar {
+    .mx_UserInfo_avatar > div {
+        max-width: 72px;
+        margin: 0 auto;
+    }
+}
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index dca89d0c35..c01a3709e7 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -238,7 +238,18 @@ export default class RightPanel extends React.Component {
         } else if (this.state.phase === RIGHT_PANEL_PHASES.FilePanel) {
             panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel) {
-            panel = <EncryptionPanel member={this.state.member} verificationRequest={this.state.verificationRequest} />;
+            const onClose = () => {
+                dis.dispatch({
+                    action: "view_user",
+                    member: this.state.member,
+                });
+            };
+            panel = (
+                <EncryptionPanel
+                    member={this.state.member}
+                    verificationRequest={this.state.verificationRequest}
+                    onClose={onClose} />
+            );
         }
 
         const classes = classNames("mx_RightPanel", "mx_fadable", {
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 5770e9b086..2d265967ae 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -21,11 +21,17 @@ import {_t} from "../../../languageHandler";
 export default class EncryptionInfo extends React.PureComponent {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (<div className="mx_UserInfo"><div className="mx_UserInfo_container">
-            <h3>{_t("Verify User")}</h3>
-            <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
-            <p>{_t("For maximum security, do this in person.")}</p>
-            <AccessibleButton kind="primary" onClick={this.props.onStartVerification}>{_t("Start Verification")}</AccessibleButton>
-        </div></div>);
+        return (
+            <div className="mx_UserInfo_container">
+                <h3>{_t("Verify User")}</h3>
+                <div>
+                    <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
+                    <p>{_t("For maximum security, do this in person.")}</p>
+                    <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onStartVerification}>
+                        {_t("Start Verification")}
+                    </AccessibleButton>
+                </div>
+            </div>
+        );
     }
 }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 4b3473935a..a1008543e4 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
+import {UserInfoPane} from "./UserInfo";
+import {_t} from "../../../languageHandler";
 
 export default class EncryptionPanel extends React.PureComponent {
     constructor(props) {
@@ -27,15 +29,30 @@ export default class EncryptionPanel extends React.PureComponent {
     }
 
     render() {
+        let content;
         const request = this.props.verificationRequest || this.state.verificationRequest;
         const {member} = this.props;
         if (request) {
-            return <VerificationPanel request={request} key={request.channel.transactionId} />;
+            content = <VerificationPanel request={request} key={request.channel.transactionId} />;
         } else if (member) {
-            return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
+            content = <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
         } else {
-            return <p>Not a member nor request, not sure what to render</p>;
+            content = <p>Not a member nor request, not sure what to render</p>;
         }
+
+        return (
+            <UserInfoPane className="mx_UserInfo_smallAvatar" member={member} onClose={this.props.onClose} e2eStatus="">
+                <div className="mx_UserInfo_container">
+                    <h3>{_t("Encryption")}</h3>
+                    <div>
+                        <p>{_t("Messages in this room are end-to-end encrypted.")}</p>
+                        <p>{_t("Your messages are secured and only you and the recipient have the unique keys to unlock them.")}</p>
+                    </div>
+                </div>
+
+                { content }
+            </UserInfoPane>
+        );
     }
 
     _onStartVerification = async () => {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 051f92cc9c..a31e9a6ce0 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -59,7 +59,7 @@ const _disambiguateDevices = (devices) => {
     }
 };
 
-const _getE2EStatus = (cli, userId, devices) => {
+export const getE2EStatus = (cli, userId, devices) => {
     if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
         const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
         return hasUnverifiedDevice ? "warning" : "verified";
@@ -1047,6 +1047,117 @@ const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => {
     );
 };
 
+export const UserInfoPane = ({children, className, onClose, e2eStatus, member}) => {
+    const cli = useContext(MatrixClientContext);
+
+    let closeButton;
+    if (onClose) {
+        closeButton = <AccessibleButton className="mx_UserInfo_cancel" onClick={onClose} title={_t('Close')}>
+            <div />
+        </AccessibleButton>;
+    }
+
+    let presenceState;
+    let presenceLastActiveAgo;
+    let presenceCurrentlyActive;
+    let statusMessage;
+
+    if (member instanceof RoomMember && member.user) {
+        presenceState = member.user.presence;
+        presenceLastActiveAgo = member.user.lastActiveAgo;
+        presenceCurrentlyActive = member.user.currentlyActive;
+
+        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+            statusMessage = member.user._unstable_statusMessage;
+        }
+    }
+
+    const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+    let showPresence = true;
+    if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
+        showPresence = enablePresenceByHsUrl[cli.baseUrl];
+    }
+
+    let presenceLabel = null;
+    if (showPresence) {
+        const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
+        presenceLabel = <PresenceLabel activeAgo={presenceLastActiveAgo}
+                                       currentlyActive={presenceCurrentlyActive}
+                                       presenceState={presenceState} />;
+    }
+
+    let statusLabel = null;
+    if (statusMessage) {
+        statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
+    }
+
+    const onMemberAvatarClick = useCallback(() => {
+        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
+        if (!avatarUrl) return;
+
+        const httpUrl = cli.mxcUrlToHttp(avatarUrl);
+        const ImageView = sdk.getComponent("elements.ImageView");
+        const params = {
+            src: httpUrl,
+            name: member.name,
+        };
+
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+    }, [cli, member]);
+
+    const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+    const avatarElement = (
+        <div className="mx_UserInfo_avatar">
+            <div>
+                <div>
+                    <MemberAvatar
+                        member={member}
+                        width={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        height={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        resizeMethod="scale"
+                        fallbackUserId={member.userId}
+                        onClick={onMemberAvatarClick}
+                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
+                </div>
+            </div>
+        </div>
+    );
+
+    let e2eIcon;
+    if (e2eStatus) {
+        e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
+    }
+
+    const displayName = member.name || member.displayname;
+
+    return (
+        <div className={classNames("mx_UserInfo", className)} role="tabpanel">
+            <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
+                { closeButton }
+                { avatarElement }
+
+                <div className="mx_UserInfo_container mx_UserInfo_separator">
+                    <div className="mx_UserInfo_profile">
+                        <div>
+                            <h2 aria-label={displayName}>
+                                { e2eIcon }
+                                { displayName }
+                            </h2>
+                        </div>
+                        <div>{ member.userId }</div>
+                        <div className="mx_UserInfo_profileStatus">
+                            {presenceLabel}
+                            {statusLabel}
+                        </div>
+                    </div>
+                </div>
+
+                { children }
+            </AutoHideScrollbar>
+        </div>
+    );
+};
+
 const UserInfo = ({user, groupId, roomId, onClose}) => {
     const cli = useContext(MatrixClientContext);
 
@@ -1117,20 +1228,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         }
     }, [cli, user.userId]);
 
-    const onMemberAvatarClick = useCallback(() => {
-        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
-        if (!avatarUrl) return;
-
-        const httpUrl = cli.mxcUrlToHttp(avatarUrl);
-        const ImageView = sdk.getComponent("elements.ImageView");
-        const params = {
-            src: httpUrl,
-            name: member.name,
-        };
-
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    }, [cli, member]);
-
     let synapseDeactivateButton;
     let spinner;
 
@@ -1180,68 +1277,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
     }
 
-    const displayName = member.name || member.displayname;
-
-    let presenceState;
-    let presenceLastActiveAgo;
-    let presenceCurrentlyActive;
-    let statusMessage;
-
-    if (member instanceof RoomMember && member.user) {
-        presenceState = member.user.presence;
-        presenceLastActiveAgo = member.user.lastActiveAgo;
-        presenceCurrentlyActive = member.user.currentlyActive;
-
-        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
-            statusMessage = member.user._unstable_statusMessage;
-        }
-    }
-
-    const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
-    let showPresence = true;
-    if (enablePresenceByHsUrl && enablePresenceByHsUrl[cli.baseUrl] !== undefined) {
-        showPresence = enablePresenceByHsUrl[cli.baseUrl];
-    }
-
-    let presenceLabel = null;
-    if (showPresence) {
-        const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
-        presenceLabel = <PresenceLabel activeAgo={presenceLastActiveAgo}
-                                       currentlyActive={presenceCurrentlyActive}
-                                       presenceState={presenceState} />;
-    }
-
-    let statusLabel = null;
-    if (statusMessage) {
-        statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
-    }
-
-    // const avatarUrl = user.getMxcAvatarUrl ? user.getMxcAvatarUrl() : user.avatarUrl;
-    const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-    const avatarElement = (
-        <div className="mx_UserInfo_avatar">
-            <div>
-                <div>
-                    <MemberAvatar
-                        member={member}
-                        width={2 * 0.3 * window.innerHeight} // 2x@30vh
-                        height={2 * 0.3 * window.innerHeight} // 2x@30vh
-                        resizeMethod="scale"
-                        fallbackUserId={member.userId}
-                        onClick={onMemberAvatarClick}
-                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
-                </div>
-            </div>
-        </div>
-    );
-
-    let closeButton;
-    if (onClose) {
-        closeButton = <AccessibleButton className="mx_UserInfo_cancel" onClick={onClose} title={_t('Close')}>
-            <div />
-        </AccessibleButton>;
-    }
-
     const memberDetails = (
         <PowerLevelSection
             powerLevels={powerLevels}
@@ -1347,53 +1382,30 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
         </div>
     );
 
-    let e2eIcon;
+    let e2eStatus;
     if (isRoomEncrypted && devices) {
-        const e2eStatus = _getE2EStatus(cli, user.userId, devices);
-        e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
+        e2eStatus = getE2EStatus(cli, user.userId, devices);
     }
 
-    return (
-        <div className="mx_UserInfo" role="tabpanel">
-            <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
-                { closeButton }
-                { avatarElement }
+    return <UserInfoPane onClose={onClose} e2eStatus={e2eStatus} member={member}>
+        { memberDetails &&
+        <div className="mx_UserInfo_container mx_UserInfo_separator mx_UserInfo_memberDetailsContainer">
+            <div className="mx_UserInfo_memberDetails">
+                { memberDetails }
+            </div>
+        </div> }
 
-                <div className="mx_UserInfo_container">
-                    <div className="mx_UserInfo_profile">
-                        <div>
-                            <h2 aria-label={displayName}>
-                                { e2eIcon }
-                                { displayName }
-                            </h2>
-                        </div>
-                        <div>{ user.userId }</div>
-                        <div className="mx_UserInfo_profileStatus">
-                            {presenceLabel}
-                            {statusLabel}
-                        </div>
-                    </div>
-                </div>
+        { securitySection }
+        <UserOptionsSection
+            devices={devices}
+            canInvite={roomPermissions.canInvite}
+            isIgnored={isIgnored}
+            member={member} />
 
-                { memberDetails && <div className="mx_UserInfo_container mx_UserInfo_memberDetailsContainer">
-                    <div className="mx_UserInfo_memberDetails">
-                        { memberDetails }
-                    </div>
-                </div> }
+        { adminToolsContainer }
 
-                { securitySection }
-                <UserOptionsSection
-                    devices={devices}
-                    canInvite={roomPermissions.canInvite}
-                    isIgnored={isIgnored}
-                    member={member} />
-
-                { adminToolsContainer }
-
-                { spinner }
-            </AutoHideScrollbar>
-        </div>
-    );
+        { spinner }
+    </UserInfoPane>;
 };
 
 UserInfo.propTypes = {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..c99b22f421 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1128,6 +1128,8 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
     "For maximum security, do this in person.": "For maximum security, do this in person.",
     "Start Verification": "Start Verification",
+    "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Members": "Members",
     "Files": "Files",
     "Trusted": "Trusted",
@@ -1144,7 +1146,6 @@
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
-    "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Security": "Security",
     "Sunday": "Sunday",
     "Monday": "Monday",

From a6fcbcacf68d0d01ead7edaad9ad33dbbd1dfbcb Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 24 Jan 2020 12:04:08 +0000
Subject: [PATCH 0671/3235] Seperates out the padlock icon, and adds a tooltip

Fixes https://github.com/vector-im/riot-web/issues/11840
---
 res/css/_components.scss                     |  1 +
 res/css/views/rooms/_InviteOnlyIcon.scss     | 38 +++++++++++++++
 res/css/views/rooms/_RoomHeader.scss         | 21 --------
 res/css/views/rooms/_RoomTile.scss           | 25 +---------
 src/components/views/rooms/InviteOnlyIcon.js | 51 ++++++++++++++++++++
 src/components/views/rooms/RoomHeader.js     | 12 +++--
 src/components/views/rooms/RoomTile.js       |  6 ++-
 src/i18n/strings/en_EN.json                  |  1 +
 8 files changed, 103 insertions(+), 52 deletions(-)
 create mode 100644 res/css/views/rooms/_InviteOnlyIcon.scss
 create mode 100644 src/components/views/rooms/InviteOnlyIcon.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 60f749de9c..07e92bdc7b 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -148,6 +148,7 @@
 @import "./views/rooms/_AuxPanel.scss";
 @import "./views/rooms/_BasicMessageComposer.scss";
 @import "./views/rooms/_E2EIcon.scss";
+@import "./views/rooms/_InviteOnlyIcon.scss";
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
 @import "./views/rooms/_EventTile.scss";
diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
new file mode 100644
index 0000000000..e70586bb73
--- /dev/null
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -0,0 +1,38 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_InviteOnlyIcon {
+    width: 12px;
+    height: 12px;
+    position: relative;
+    display: block !important;
+    // Align the padlock with unencrypted room names
+    margin-left: 6px;
+
+    &::before {
+        background-color: $roomtile-name-color;
+        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+}
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 6bfcd437c1..0ac2e99b97 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -269,24 +269,3 @@ limitations under the License.
 .mx_RoomHeader_pinsIndicatorUnread {
     background-color: $pinned-unread-color;
 }
-
-.mx_RoomHeader_PrivateIcon.mx_RoomHeader_isPrivate {
-    width: 12px;
-    height: 12px;
-    position: relative;
-    display: block !important;
-
-    &::before {
-        background-color: $roomtile-name-color;
-        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
-        mask-position: center;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 376f4370e3..a24fdf2629 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -215,30 +215,7 @@ limitations under the License.
     flex: 1;
 }
 
-.mx_RoomTile.mx_RoomTile.mx_RoomTile_isPrivate .mx_RoomTile_name {
+.mx_InviteOnlyIcon + .mx_RoomTile_nameContainer .mx_RoomTile_name {
     // Scoot the padding in a bit from 6px to make it look better
     padding-left: 3px;
 }
-
-.mx_RoomTile.mx_RoomTile_isPrivate .mx_RoomTile_PrivateIcon {
-    width: 12px;
-    height: 12px;
-    position: relative;
-    display: block !important;
-    // Align the padlock with unencrypted room names
-    margin-left: 6px;
-
-    &::before {
-        background-color: $roomtile-name-color;
-        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
-        mask-position: center;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
new file mode 100644
index 0000000000..5afaa7f0f2
--- /dev/null
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../../../languageHandler';
+import * as sdk from '../../../index';
+
+export default class InviteOnlyIcon extends React.Component {
+    constructor() {
+        super();
+
+        this.state = {
+            hover: false,
+        };
+    }
+
+    onHoverStart = () => {
+        this.setState({hover: true});
+    };
+
+    onHoverEnd = () => {
+        this.setState({hover: false});
+    };
+
+    render() {
+        const Tooltip = sdk.getComponent("elements.Tooltip");
+        let tooltip;
+        if (this.state.hover) {
+            tooltip = <Tooltip className="mx_InviteOnlyIcon_tooltip" label={_t("Invite only")} dir="auto" />;
+        }
+        return (<div className="mx_InviteOnlyIcon"
+          onMouseEnter={this.onHoverStart}
+          onMouseLeave={this.onHoverEnd}
+        >
+          { tooltip }
+        </div>);
+    }
+}
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 15f0daa200..8a427e1c06 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -32,6 +32,7 @@ import {CancelButton} from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
 import E2EIcon from './E2EIcon';
+import InviteOnlyIcon from './InviteOnlyIcon';
 
 export default createReactClass({
     displayName: 'RoomHeader',
@@ -162,11 +163,12 @@ export default createReactClass({
 
         const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
         const joinRule = joinRules && joinRules.getContent().join_rule;
-        const joinRuleClass = classNames("mx_RoomHeader_PrivateIcon",
-                                         {"mx_RoomHeader_isPrivate": joinRule === "invite"});
-        const privateIcon = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
-            <div className={joinRuleClass} /> :
-            undefined;
+        let privateIcon;
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (joinRule == "invite") {
+                privateIcon = <InviteOnlyIcon />;
+            }
+        }
 
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b50d85ff6..4e1a4c7b23 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -34,6 +34,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import {_t} from "../../../languageHandler";
 import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 import E2EIcon from './E2EIcon';
+import InviteOnlyIcon from './InviteOnlyIcon';
 // eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
 
@@ -411,7 +412,6 @@ export default createReactClass({
             'mx_RoomTile_noBadges': !badges,
             'mx_RoomTile_transparent': this.props.transparent,
             'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-            'mx_RoomTile_isPrivate': this.state.joinRule == "invite" && !dmUserId,
         });
 
         const avatarClasses = classNames({
@@ -523,7 +523,9 @@ export default createReactClass({
 
         let privateIcon = null;
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            privateIcon = <div className="mx_RoomTile_PrivateIcon" />;
+            if (this.state.joinRule == "invite" && !dmUserId) {
+                privateIcon = <InviteOnlyIcon />;
+            }
         }
 
         let e2eIcon = null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..456d48a94c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -908,6 +908,7 @@
     "Unencrypted": "Unencrypted",
     "Encrypted by a deleted device": "Encrypted by a deleted device",
     "Please select the destination room for this message": "Please select the destination room for this message",
+    "Invite only": "Invite only",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Close preview": "Close preview",
     "device id: ": "device id: ",

From 688f7029d292dcbcaace4eefeec28837e2978041 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 12:28:03 +0000
Subject: [PATCH 0672/3235] Split AsyncWrapper out from Modal

So we can use it outside of modals & dialogs
---
 src/AsyncWrapper.js | 93 +++++++++++++++++++++++++++++++++++++++++++++
 src/Modal.js        | 77 +------------------------------------
 2 files changed, 95 insertions(+), 75 deletions(-)
 create mode 100644 src/AsyncWrapper.js

diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.js
new file mode 100644
index 0000000000..63b856a882
--- /dev/null
+++ b/src/AsyncWrapper.js
@@ -0,0 +1,93 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 createReactClass from 'create-react-class';
+import Analytics from './Analytics';
+import * as sdk from './index';
+import PropTypes from 'prop-types';
+import { _t } from './languageHandler';
+
+/**
+ * Wrap an asynchronous loader function with a react component which shows a
+ * spinner until the real component loads.
+ */
+export default createReactClass({
+    propTypes: {
+        /** A promise which resolves with the real component
+         */
+        prom: PropTypes.object.isRequired,
+    },
+
+    getInitialState: function() {
+        return {
+            component: null,
+            error: null,
+        };
+    },
+
+    componentWillMount: function() {
+        this._unmounted = false;
+        // 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.prom.then((result) => {
+            if (this._unmounted) {
+                return;
+            }
+            // 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) => {
+            console.warn('AsyncWrapper promise failed', e);
+            this.setState({error: e});
+        });
+    },
+
+    componentWillUnmount: function() {
+        this._unmounted = true;
+    },
+
+    _onWrapperCancelClick: function() {
+        this.props.onFinished(false);
+    },
+
+    render: function() {
+        if (this.state.component) {
+            const Component = this.state.component;
+            return <Component {...this.props} />;
+        } 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");
+            return <Spinner />;
+        }
+    },
+});
+
diff --git a/src/Modal.js b/src/Modal.js
index 29d3af2e74..b6215b2b5a 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -17,87 +17,14 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
 import Analytics from './Analytics';
-import * as sdk from './index';
 import dis from './dispatcher';
-import { _t } from './languageHandler';
-import {defer} from "./utils/promise";
+import {defer} from './utils/promise';
+import AsyncWrapper from './AsyncWrapper';
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
 const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
 
-/**
- * Wrap an asynchronous loader function with a react component which shows a
- * spinner until the real component loads.
- */
-const AsyncWrapper = createReactClass({
-    propTypes: {
-        /** A promise which resolves with the real component
-         */
-        prom: PropTypes.object.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            component: null,
-            error: null,
-        };
-    },
-
-    componentWillMount: function() {
-        this._unmounted = false;
-        // 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.prom.then((result) => {
-            if (this._unmounted) {
-                return;
-            }
-            // 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) => {
-            console.warn('AsyncWrapper promise failed', e);
-            this.setState({error: e});
-        });
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-    },
-
-    _onWrapperCancelClick: function() {
-        this.props.onFinished(false);
-    },
-
-    render: function() {
-        if (this.state.component) {
-            const Component = this.state.component;
-            return <Component {...this.props} />;
-        } 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");
-            return <Spinner />;
-        }
-    },
-});
-
 class ModalManager {
     constructor() {
         this._counter = 0;

From dbf1c9a02a4550fba98930f51d6058e4566ada47 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 12:34:03 +0000
Subject: [PATCH 0673/3235] Apparently i18n...

---
 src/i18n/strings/en_EN.json      |    6 +-
 src/i18n/strings/en_EN.json.orig | 2040 ++++++++++++++++++++++++++++++
 2 files changed, 2043 insertions(+), 3 deletions(-)
 create mode 100644 src/i18n/strings/en_EN.json.orig

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..610f1546e7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -21,6 +21,9 @@
     "Analytics": "Analytics",
     "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.",
+    "Error": "Error",
+    "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
+    "Dismiss": "Dismiss",
     "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",
@@ -105,9 +108,6 @@
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.",
     "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
     "Trust": "Trust",
-    "Error": "Error",
-    "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",
diff --git a/src/i18n/strings/en_EN.json.orig b/src/i18n/strings/en_EN.json.orig
new file mode 100644
index 0000000000..f0eab6b12d
--- /dev/null
+++ b/src/i18n/strings/en_EN.json.orig
@@ -0,0 +1,2040 @@
+{
+    "This email address is already in use": "This email address is already in use",
+    "This phone number is already in use": "This phone number is already in use",
+    "Add Email Address": "Add Email Address",
+    "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
+    "Add Phone Number": "Add Phone Number",
+    "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 username)": "Whether or not you're logged in (we don't record your username)",
+    "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",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
+    "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",
+    "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
+    "Your User Agent": "Your User Agent",
+    "Your device resolution": "Your device resolution",
+    "Analytics": "Analytics",
+    "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",
+    "Call Timeout": "Call Timeout",
+    "The remote side failed to pick up": "The remote side failed to pick up",
+    "Call failed due to misconfigured server": "Call failed due to misconfigured server",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.",
+    "Try using turn.matrix.org": "Try using turn.matrix.org",
+    "OK": "OK",
+    "Unable to capture screen": "Unable to capture screen",
+    "Existing Call": "Existing Call",
+    "You are already in a call.": "You are already in a call.",
+    "VoIP is unsupported": "VoIP is unsupported",
+    "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
+    "You cannot place a call with yourself.": "You cannot place a call with yourself.",
+    "Could not connect to the integration server": "Could not connect to the integration server",
+    "A conference call could not be started because the integrations 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",
+    "Replying With Files": "Replying With Files",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
+    "Continue": "Continue",
+    "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
+    "Upload Failed": "Upload Failed",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "The server does not support the room version specified.": "The server does not support the room version specified.",
+    "Failure to create room": "Failure to create room",
+    "Send cross-signing keys to homeserver": "Send cross-signing keys to homeserver",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Sun": "Sun",
+    "Mon": "Mon",
+    "Tue": "Tue",
+    "Wed": "Wed",
+    "Thu": "Thu",
+    "Fri": "Fri",
+    "Sat": "Sat",
+    "Jan": "Jan",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "May",
+    "Jun": "Jun",
+    "Jul": "Jul",
+    "Aug": "Aug",
+    "Sep": "Sep",
+    "Oct": "Oct",
+    "Nov": "Nov",
+    "Dec": "Dec",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(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",
+    "New Session": "New Session",
+    "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",
+    "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
+    "Identity server has no terms of service": "Identity server has no terms of service",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.",
+    "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
+    "Trust": "Trust",
+    "Error": "Error",
+    "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",
+    "This email address was not found": "This email address was not found",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
+    "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?",
+    "Register": "Register",
+    "Default": "Default",
+    "Restricted": "Restricted",
+    "Moderator": "Moderator",
+    "Admin": "Admin",
+    "Custom (%(level)s)": "Custom (%(level)s)",
+    "Start a chat": "Start a chat",
+    "Who would you like to communicate with?": "Who would you like to communicate with?",
+    "Email, name or Matrix ID": "Email, name or Matrix ID",
+    "Start Chat": "Start Chat",
+    "Invite new room members": "Invite new room members",
+    "Send Invites": "Send Invites",
+    "Failed to start chat": "Failed to start chat",
+    "Operation failed": "Operation failed",
+    "Failed to invite": "Failed to invite",
+    "Failed to invite users to the room:": "Failed to invite users to the room:",
+    "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
+    "You need to be logged in.": "You need to be logged in.",
+    "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
+    "Unable to create widget.": "Unable to create widget.",
+    "Missing roomId.": "Missing roomId.",
+    "Failed to send request.": "Failed to send request.",
+    "This room is not recognised.": "This room is not recognised.",
+    "Power level must be positive integer.": "Power level must be positive integer.",
+    "You are not in this room.": "You are not in this room.",
+    "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
+    "Missing room_id in request": "Missing room_id in request",
+    "Room %(roomId)s not visible": "Room %(roomId)s not visible",
+    "Missing user_id in request": "Missing user_id in request",
+    "Messages": "Messages",
+    "Actions": "Actions",
+    "Advanced": "Advanced",
+    "Other": "Other",
+    "Usage": "Usage",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
+    "Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
+    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
+    "/ddg is not a command": "/ddg is not a command",
+    "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
+    "Upgrades a room to a new version": "Upgrades a room to a new version",
+    "You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
+    "Error upgrading room": "Error upgrading room",
+    "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
+    "Changes your display nickname": "Changes your display nickname",
+    "Changes your display nickname in the current room only": "Changes your display nickname in the current room only",
+    "Changes the avatar of the current room": "Changes the avatar of the current room",
+    "Changes your avatar in this current room only": "Changes your avatar in this current room only",
+    "Changes your avatar in all rooms": "Changes your avatar in all rooms",
+    "Gets or sets the room topic": "Gets or sets the room topic",
+    "This room has no topic.": "This room has no topic.",
+    "Sets the room name": "Sets the room name",
+    "Invites user with given id to current room": "Invites user with given id to current room",
+    "Use an identity server": "Use an identity server",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.",
+    "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
+    "Joins room with given alias": "Joins room with given alias",
+    "Leave room": "Leave room",
+    "Unrecognised room alias:": "Unrecognised room alias:",
+    "Kicks user with given id": "Kicks user with given id",
+    "Bans user with given id": "Bans user with given id",
+    "Unbans user with given ID": "Unbans user with given ID",
+    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
+    "Ignored user": "Ignored user",
+    "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
+    "Unignored user": "Unignored user",
+    "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
+    "Define the power level of a user": "Define the power level of a user",
+    "Deops user with given id": "Deops user with given id",
+    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
+    "Adds a custom widget by URL to the room": "Adds a custom widget by URL to the room",
+    "Please supply a https:// or http:// widget URL": "Please supply a https:// or http:// widget URL",
+    "You cannot modify widgets in this room.": "You cannot modify widgets in this room.",
+    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
+    "Unknown (user, device) pair:": "Unknown (user, device) pair:",
+    "Device already verified!": "Device already verified!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "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!": "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!",
+    "Verified key": "Verified key",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
+    "Displays action": "Displays action",
+    "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",
+    "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
+    "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
+    "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
+    "Unrecognised command:": "Unrecognised command:",
+    "Reason": "Reason",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
+    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
+    "%(senderName)s made no change.": "%(senderName)s made no change.",
+    "VoIP conference started.": "VoIP conference started.",
+    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
+    "VoIP conference finished.": "VoIP conference finished.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
+    "%(targetName)s left the room.": "%(targetName)s left the room.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s changed the join rule to %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s has allowed guests to join the room.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s has prevented guests from joining the room.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s changed guest access to %(rule)s",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
+    "Someone": "Someone",
+    "(not supported by this browser)": "(not supported by this browser)",
+    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
+    "(could not connect media)": "(could not connect media)",
+    "(no answer)": "(no answer)",
+    "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+    "%(senderName)s placed a voice call.": "%(senderName)s placed a voice call.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s placed a voice call. (not supported by this browser)",
+    "%(senderName)s placed a video call.": "%(senderName)s placed a video call.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s placed a video call. (not supported by this browser)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s removed the rule banning users matching %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removed the rule banning rooms matching %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s removed the rule banning servers matching %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s removed a ban rule matching %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s updated an invalid ban rule",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s created a ban rule matching %(glob)s for %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
+    "Light theme": "Light theme",
+    "Dark theme": "Dark theme",
+    "%(displayName)s is typing …": "%(displayName)s is typing …",
+    "%(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 …",
+    "Cannot reach homeserver": "Cannot reach homeserver",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ensure you have a stable internet connection, or get in touch with the server admin",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
+    "Cannot reach identity server": "Cannot reach identity server",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "No homeserver URL provided": "No homeserver URL provided",
+    "Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration",
+    "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
+    "The message you are trying to send is too large.": "The message you are trying to send is too large.",
+    "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.",
+    "Unable to connect to Homeserver. Retrying...": "Unable to connect to Homeserver. Retrying...",
+    "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
+    "%(items)s and %(count)s others|one": "%(items)s and one other",
+    "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
+    "a few seconds ago": "a few seconds ago",
+    "about a minute ago": "about a minute ago",
+    "%(num)s minutes ago": "%(num)s minutes ago",
+    "about an hour ago": "about an hour ago",
+    "%(num)s hours ago": "%(num)s hours ago",
+    "about a day ago": "about a day ago",
+    "%(num)s days ago": "%(num)s days ago",
+    "a few seconds from now": "a few seconds from now",
+    "about a minute from now": "about a minute from now",
+    "%(num)s minutes from now": "%(num)s minutes from now",
+    "about an hour from now": "about an hour from now",
+    "%(num)s hours from now": "%(num)s hours from now",
+    "about a day from now": "about a day from now",
+    "%(num)s days from now": "%(num)s days from now",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "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?",
+    "Unrecognised address": "Unrecognised address",
+    "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
+    "User %(userId)s is already in the room": "User %(userId)s is already in the room",
+    "User %(user_id)s does not exist": "User %(user_id)s does not exist",
+    "User %(user_id)s may or may not exist": "User %(user_id)s may or may not exist",
+    "The user must be unbanned before they can be invited.": "The user must be unbanned before they can be invited.",
+    "The user's homeserver does not support the version of the room.": "The user's homeserver does not support the version of the room.",
+    "Unknown server error": "Unknown server error",
+    "Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
+    "No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters",
+    "Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",
+    "Avoid repeated words and characters": "Avoid repeated words and characters",
+    "Avoid sequences": "Avoid sequences",
+    "Avoid recent years": "Avoid recent years",
+    "Avoid years that are associated with you": "Avoid years that are associated with you",
+    "Avoid dates and years that are associated with you": "Avoid dates and years that are associated with you",
+    "Capitalization doesn't help very much": "Capitalization doesn't help very much",
+    "All-uppercase is almost as easy to guess as all-lowercase": "All-uppercase is almost as easy to guess as all-lowercase",
+    "Reversed words aren't much harder to guess": "Reversed words aren't much harder to guess",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Predictable substitutions like '@' instead of 'a' don't help very much",
+    "Add another word or two. Uncommon words are better.": "Add another word or two. Uncommon words are better.",
+    "Repeats like \"aaa\" are easy to guess": "Repeats like \"aaa\" are easy to guess",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"",
+    "Sequences like abc or 6543 are easy to guess": "Sequences like abc or 6543 are easy to guess",
+    "Recent years are easy to guess": "Recent years are easy to guess",
+    "Dates are often easy to guess": "Dates are often easy to guess",
+    "This is a top-10 common password": "This is a top-10 common password",
+    "This is a top-100 common password": "This is a top-100 common password",
+    "This is a very common password": "This is a very common password",
+    "This is similar to a commonly used password": "This is similar to a commonly used password",
+    "A word by itself is easy to guess": "A word by itself is easy to guess",
+    "Names and surnames by themselves are easy to guess": "Names and surnames by themselves are easy to guess",
+    "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
+    "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
+    "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "There was an error joining the room": "There was an error joining the room",
+    "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
+    "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
+    "Failed to join room": "Failed to join room",
+    "Message Pinning": "Message Pinning",
+    "Custom user status messages": "Custom user status messages",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
+    "Render simple counters in room header": "Render simple counters in room header",
+    "Multiple integration managers": "Multiple integration managers",
+    "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
+    "New invite dialog": "New invite dialog",
+    "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
+    "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
+    "Show info about bridges in room settings": "Show info about bridges in room settings",
+    "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
+    "Use compact timeline layout": "Use compact timeline layout",
+    "Show a placeholder for removed messages": "Show a placeholder for removed messages",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
+    "Show avatar changes": "Show avatar changes",
+    "Show display name changes": "Show display name changes",
+    "Show read receipts sent by other users": "Show read receipts sent by other users",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
+    "Always show message timestamps": "Always show message timestamps",
+    "Autoplay GIFs and videos": "Autoplay GIFs and videos",
+    "Always show encryption icons": "Always show encryption icons",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Show a reminder to enable Secure Message Recovery in encrypted rooms",
+    "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
+    "Show avatars in user and room mentions": "Show avatars in user and room mentions",
+    "Enable big emoji in chat": "Enable big emoji in chat",
+    "Send typing notifications": "Send typing notifications",
+    "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
+    "Mirror local video feed": "Mirror local video feed",
+    "Enable Community Filter Panel": "Enable Community Filter Panel",
+    "Match system theme": "Match system theme",
+    "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
+    "Send analytics data": "Send analytics data",
+    "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
+    "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
+    "Enable inline URL previews by default": "Enable inline URL previews by default",
+    "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",
+    "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
+    "Show developer tools": "Show developer tools",
+    "Order rooms in the room list by most important first instead of most recent": "Order rooms in the room list by most important first instead of most recent",
+    "Show recently visited rooms above the room list": "Show recently visited rooms above the room list",
+    "Show hidden events in timeline": "Show hidden events in timeline",
+    "Low bandwidth mode": "Low bandwidth mode",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
+    "Show previews/thumbnails for images": "Show previews/thumbnails for images",
+    "Collecting app version information": "Collecting app version information",
+    "Collecting logs": "Collecting logs",
+    "Uploading report": "Uploading report",
+    "Waiting for response from server": "Waiting for response from server",
+    "Messages containing my display name": "Messages containing my display name",
+    "Messages containing my username": "Messages containing my username",
+    "Messages containing @room": "Messages containing @room",
+    "Messages in one-to-one chats": "Messages in one-to-one chats",
+    "Encrypted messages in one-to-one chats": "Encrypted messages in one-to-one chats",
+    "Messages in group chats": "Messages in group chats",
+    "Encrypted messages in group chats": "Encrypted messages in group chats",
+    "When I'm invited to a room": "When I'm invited to a room",
+    "Call invitation": "Call invitation",
+    "Messages sent by bot": "Messages sent by bot",
+    "When rooms are upgraded": "When rooms are upgraded",
+    "My Ban List": "My Ban List",
+    "This is your list of users/servers you have blocked - don't leave the room!": "This is your list of users/servers you have blocked - don't leave the room!",
+    "Active call (%(roomName)s)": "Active call (%(roomName)s)",
+    "unknown caller": "unknown caller",
+    "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
+    "Incoming video call from %(name)s": "Incoming video call from %(name)s",
+    "Incoming call from %(name)s": "Incoming call from %(name)s",
+    "Decline": "Decline",
+    "Accept": "Accept",
+    "The other party cancelled the verification.": "The other party cancelled the verification.",
+    "Verified!": "Verified!",
+    "You've successfully verified this user.": "You've successfully verified this user.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
+    "Got It": "Got It",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
+    "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
+    "Unable to find a supported verification method.": "Unable to find a supported verification method.",
+    "Cancel": "Cancel",
+    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
+    "Dog": "Dog",
+    "Cat": "Cat",
+    "Lion": "Lion",
+    "Horse": "Horse",
+    "Unicorn": "Unicorn",
+    "Pig": "Pig",
+    "Elephant": "Elephant",
+    "Rabbit": "Rabbit",
+    "Panda": "Panda",
+    "Rooster": "Rooster",
+    "Penguin": "Penguin",
+    "Turtle": "Turtle",
+    "Fish": "Fish",
+    "Octopus": "Octopus",
+    "Butterfly": "Butterfly",
+    "Flower": "Flower",
+    "Tree": "Tree",
+    "Cactus": "Cactus",
+    "Mushroom": "Mushroom",
+    "Globe": "Globe",
+    "Moon": "Moon",
+    "Cloud": "Cloud",
+    "Fire": "Fire",
+    "Banana": "Banana",
+    "Apple": "Apple",
+    "Strawberry": "Strawberry",
+    "Corn": "Corn",
+    "Pizza": "Pizza",
+    "Cake": "Cake",
+    "Heart": "Heart",
+    "Smiley": "Smiley",
+    "Robot": "Robot",
+    "Hat": "Hat",
+    "Glasses": "Glasses",
+    "Spanner": "Spanner",
+    "Santa": "Santa",
+    "Thumbs up": "Thumbs up",
+    "Umbrella": "Umbrella",
+    "Hourglass": "Hourglass",
+    "Clock": "Clock",
+    "Gift": "Gift",
+    "Light bulb": "Light bulb",
+    "Book": "Book",
+    "Pencil": "Pencil",
+    "Paperclip": "Paperclip",
+    "Scissors": "Scissors",
+    "Lock": "Lock",
+    "Key": "Key",
+    "Hammer": "Hammer",
+    "Telephone": "Telephone",
+    "Flag": "Flag",
+    "Train": "Train",
+    "Bicycle": "Bicycle",
+    "Aeroplane": "Aeroplane",
+    "Rocket": "Rocket",
+    "Trophy": "Trophy",
+    "Ball": "Ball",
+    "Guitar": "Guitar",
+    "Trumpet": "Trumpet",
+    "Bell": "Bell",
+    "Anchor": "Anchor",
+    "Headphones": "Headphones",
+    "Folder": "Folder",
+    "Pin": "Pin",
+    "Other users may not trust it": "Other users may not trust it",
+    "Later": "Later",
+    "Verify": "Verify",
+    "Decline (%(counter)s)": "Decline (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
+    "Upload": "Upload",
+    "Remove": "Remove",
+    "Failed to upload profile picture!": "Failed to upload profile picture!",
+    "Upload new:": "Upload new:",
+    "No display name": "No display name",
+    "New passwords don't match": "New passwords don't match",
+    "Passwords can't be empty": "Passwords can't be empty",
+    "Warning!": "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.": "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": "Export E2E room keys",
+    "Do you want to set an email address?": "Do you want to set an email address?",
+    "Current password": "Current password",
+    "Password": "Password",
+    "New Password": "New Password",
+    "Confirm password": "Confirm password",
+    "Change Password": "Change Password",
+    "Cross-signing and secret storage are enabled.": "Cross-signing and secret storage are enabled.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.",
+    "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
+    "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
+    "Cross-signing public keys:": "Cross-signing public keys:",
+    "on device": "on device",
+    "not found": "not found",
+    "Cross-signing private keys:": "Cross-signing private keys:",
+    "in secret storage": "in secret storage",
+    "Secret storage public key:": "Secret storage public key:",
+    "in account data": "in account data",
+    "Your homeserver does not support device management.": "Your homeserver does not support device management.",
+    "Unable to load device list": "Unable to load device list",
+    "Authentication": "Authentication",
+    "Delete %(count)s devices|other": "Delete %(count)s devices",
+    "Delete %(count)s devices|one": "Delete device",
+    "ID": "ID",
+    "Public Name": "Public Name",
+    "Last seen": "Last seen",
+    "Failed to set display name": "Failed to set display name",
+    "Disable Notifications": "Disable Notifications",
+    "Enable Notifications": "Enable Notifications",
+    "Connecting to integration manager...": "Connecting to integration manager...",
+    "Cannot connect to integration manager": "Cannot connect to integration manager",
+    "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
+    "Delete Backup": "Delete Backup",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
+    "Unable to load key backup status": "Unable to load key backup status",
+    "Restore from Backup": "Restore from Backup",
+    "This device is backing up your keys. ": "This device is backing up your keys. ",
+    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
+    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.",
+    "Connect this device to Key Backup": "Connect this device to Key Backup",
+    "not stored": "not stored",
+    "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
+    "All keys backed up": "All keys backed up",
+    "Backup has a <validity>valid</validity> signature from this user": "Backup has a <validity>valid</validity> signature from this user",
+    "Backup has a <validity>invalid</validity> signature from this user": "Backup has a <validity>invalid</validity> signature from this user",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this device": "Backup has a <validity>valid</validity> signature from this device",
+    "Backup has an <validity>invalid</validity> signature from this device": "Backup has an <validity>invalid</validity> signature from this device",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></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",
+    "This backup is trusted because it has been restored on this device": "This backup is trusted because it has been restored on this device",
+    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.",
+    "Backup version: ": "Backup version: ",
+    "Algorithm: ": "Algorithm: ",
+    "Backup key stored: ": "Backup key stored: ",
+    "Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
+    "Start using Key Backup": "Start using Key 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",
+    "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
+    "Failed to change settings": "Failed to change settings",
+    "Can't update user notification settings": "Can't update user notification settings",
+    "Failed to update keywords": "Failed to update keywords",
+    "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
+    "Notify for all other messages/rooms": "Notify for all other messages/rooms",
+    "Notify me for anything else": "Notify me for anything else",
+    "Enable notifications for this account": "Enable notifications for this account",
+    "Clear notifications": "Clear notifications",
+    "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
+    "Add an email address to configure email notifications": "Add an email address to configure email notifications",
+    "Enable email notifications": "Enable email notifications",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
+    "Unable to fetch notification target list": "Unable to fetch notification target list",
+    "Notification targets": "Notification targets",
+    "Advanced notification settings": "Advanced notification settings",
+    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+    "Enable desktop notifications for this device": "Enable desktop notifications for this device",
+    "Show message in desktop notification": "Show message in desktop notification",
+    "Enable audible notifications for this device": "Enable audible notifications for this device",
+    "Off": "Off",
+    "On": "On",
+    "Noisy": "Noisy",
+    "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> to your own domain",
+    "Display Name": "Display Name",
+    "Profile picture": "Profile picture",
+    "Save": "Save",
+    "Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)",
+    "Could not connect to Identity Server": "Could not connect to Identity Server",
+    "Checking server": "Checking server",
+    "Change identity server": "Change identity server",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Disconnect from the identity server <current /> and connect to <new /> instead?",
+    "Terms of service not accepted or the identity server is invalid.": "Terms of service not accepted or the identity server is invalid.",
+    "The identity server you have chosen does not have any terms of service.": "The identity server you have chosen does not have any terms of service.",
+    "Disconnect identity server": "Disconnect identity server",
+    "Disconnect from the identity server <idserver />?": "Disconnect from the identity server <idserver />?",
+    "Disconnect": "Disconnect",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.",
+    "You should:": "You should:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "check your browser plugins for anything that might block the identity server (such as Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "contact the administrators of identity server <idserver />",
+    "wait and try again later": "wait and try again later",
+    "Disconnect anyway": "Disconnect anyway",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "You are still <b>sharing your personal data</b> on the identity server <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
+    "Go back": "Go back",
+    "Identity Server (%(server)s)": "Identity Server (%(server)s)",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
+    "Identity Server": "Identity Server",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.",
+    "Do not use an identity server": "Do not use an identity server",
+    "Enter a new identity server": "Enter a new identity server",
+    "Change": "Change",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
+    "Manage integrations": "Manage integrations",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+    "Flair": "Flair",
+    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    "Success": "Success",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
+    "Profile": "Profile",
+    "Email addresses": "Email addresses",
+    "Phone numbers": "Phone numbers",
+    "Account": "Account",
+    "Set a new account password...": "Set a new account password...",
+    "Language and region": "Language and region",
+    "Theme": "Theme",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",
+    "Account management": "Account management",
+    "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
+    "Deactivate Account": "Deactivate Account",
+    "Warning": "Warning",
+    "General": "General",
+    "Discovery": "Discovery",
+    "Deactivate account": "Deactivate account",
+    "Legal": "Legal",
+    "Credits": "Credits",
+    "For help with using Riot, click <a>here</a>.": "For help with using Riot, click <a>here</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.",
+    "Chat with Riot Bot": "Chat with Riot Bot",
+    "Check for update": "Check for update",
+    "Help & About": "Help & About",
+    "Bug reporting": "Bug reporting",
+    "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.": "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.",
+    "Submit debug logs": "Submit debug logs",
+    "Clear cache and reload": "Clear cache and reload",
+    "FAQ": "FAQ",
+    "Versions": "Versions",
+    "matrix-react-sdk version:": "matrix-react-sdk version:",
+    "riot-web version:": "riot-web version:",
+    "olm version:": "olm version:",
+    "Homeserver is": "Homeserver is",
+    "Identity Server is": "Identity Server is",
+    "Access Token:": "Access Token:",
+    "click to reveal": "click to reveal",
+    "Labs": "Labs",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Customise your experience with experimental labs features. <a>Learn more</a>.",
+    "Ignored/Blocked": "Ignored/Blocked",
+    "Error adding ignored user/server": "Error adding ignored user/server",
+    "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",
+    "Error subscribing to list": "Error subscribing to list",
+    "Please verify the room ID or alias and try again.": "Please verify the room ID or alias and try again.",
+    "Error removing ignored user/server": "Error removing ignored user/server",
+    "Error unsubscribing from list": "Error unsubscribing from list",
+    "Please try again or view your console for hints.": "Please try again or view your console for hints.",
+    "None": "None",
+    "Ban list rules - %(roomName)s": "Ban list rules - %(roomName)s",
+    "Server rules": "Server rules",
+    "User rules": "User rules",
+    "Close": "Close",
+    "You have not ignored anyone.": "You have not ignored anyone.",
+    "You are currently ignoring:": "You are currently ignoring:",
+    "You are not subscribed to any lists": "You are not subscribed to any lists",
+    "Unsubscribe": "Unsubscribe",
+    "View rules": "View rules",
+    "You are currently subscribed to:": "You are currently subscribed to:",
+    "Ignored users": "Ignored users",
+    "⚠ These settings are meant for advanced users.": "⚠ These settings are meant for advanced users.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.",
+    "Personal ban list": "Personal ban list",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.",
+    "Server or user ID to ignore": "Server or user ID to ignore",
+    "eg: @bot:* or example.org": "eg: @bot:* or example.org",
+    "Ignore": "Ignore",
+    "Subscribed lists": "Subscribed lists",
+    "Subscribing to a ban list will cause you to join it!": "Subscribing to a ban list will cause you to join it!",
+    "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
+    "Room ID or alias of ban list": "Room ID or alias of ban list",
+    "Subscribe": "Subscribe",
+    "Notifications": "Notifications",
+    "Start automatically after system login": "Start automatically after system login",
+    "Always show the window menu bar": "Always show the window menu bar",
+    "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
+    "Preferences": "Preferences",
+    "Composer": "Composer",
+    "Timeline": "Timeline",
+    "Room list": "Room list",
+    "Autocomplete delay (ms)": "Autocomplete delay (ms)",
+    "Read Marker lifetime (ms)": "Read Marker lifetime (ms)",
+    "Read Marker off-screen lifetime (ms)": "Read Marker off-screen lifetime (ms)",
+    "Unignore": "Unignore",
+    "<not supported>": "<not supported>",
+    "Import E2E room keys": "Import E2E room keys",
+    "Cryptography": "Cryptography",
+    "Device ID:": "Device ID:",
+    "Device key:": "Device key:",
+    "Bulk options": "Bulk options",
+    "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
+    "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
+    "Key backup": "Key backup",
+    "Cross-signing": "Cross-signing",
+    "Security & Privacy": "Security & Privacy",
+    "Devices": "Devices",
+    "A device's public name is visible to people you communicate with": "A device's public name is visible to people you communicate with",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "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.": "Learn more about how we use analytics.",
+    "No media permissions": "No media permissions",
+    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
+    "Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
+    "Request media permissions": "Request media permissions",
+    "No Audio Outputs detected": "No Audio Outputs detected",
+    "No Microphones detected": "No Microphones detected",
+    "No Webcams detected": "No Webcams detected",
+    "Default Device": "Default Device",
+    "Audio Output": "Audio Output",
+    "Microphone": "Microphone",
+    "Camera": "Camera",
+    "Voice & Video": "Voice & Video",
+    "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
+    "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
+    "this room": "this room",
+    "View older messages in %(roomName)s.": "View older messages in %(roomName)s.",
+    "Room information": "Room information",
+    "Internal room ID:": "Internal room ID:",
+    "Room version": "Room version",
+    "Room version:": "Room version:",
+    "Developer options": "Developer options",
+    "Open Devtools": "Open Devtools",
+    "This bridge was provisioned by <user />": "This bridge was provisioned by <user />",
+    "This bridge is managed by <user />.": "This bridge is managed by <user />.",
+    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridged into <channelLink /> <networkLink />, on <protocolName />",
+    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />",
+    "Connected via %(protocolName)s": "Connected via %(protocolName)s",
+    "Bridge Info": "Bridge Info",
+    "Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",
+    "Room Addresses": "Room Addresses",
+    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
+    "URL Previews": "URL Previews",
+    "Uploaded sound": "Uploaded sound",
+    "Sounds": "Sounds",
+    "Notification sound": "Notification sound",
+    "Reset": "Reset",
+    "Set a new custom sound": "Set a new custom sound",
+    "Browse": "Browse",
+    "Change room avatar": "Change room avatar",
+    "Change room name": "Change room name",
+    "Change main address for the room": "Change main address for the room",
+    "Change history visibility": "Change history visibility",
+    "Change permissions": "Change permissions",
+    "Change topic": "Change topic",
+    "Upgrade the room": "Upgrade the room",
+    "Enable room encryption": "Enable room encryption",
+    "Modify widgets": "Modify widgets",
+    "Failed to unban": "Failed to unban",
+    "Unban": "Unban",
+    "Banned by %(displayName)s": "Banned by %(displayName)s",
+    "Error changing power level requirement": "Error changing power level requirement",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.",
+    "Error changing power level": "Error changing power level",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.",
+    "Default role": "Default role",
+    "Send messages": "Send messages",
+    "Invite users": "Invite users",
+    "Change settings": "Change settings",
+    "Kick users": "Kick users",
+    "Ban users": "Ban users",
+    "Remove messages": "Remove messages",
+    "Notify everyone": "Notify everyone",
+    "No users have specific privileges in this room": "No users have specific privileges in this room",
+    "Privileged Users": "Privileged Users",
+    "Muted Users": "Muted Users",
+    "Banned users": "Banned users",
+    "Send %(eventType)s events": "Send %(eventType)s events",
+    "Roles & Permissions": "Roles & Permissions",
+    "Permissions": "Permissions",
+    "Select the roles required to change various parts of the room": "Select the roles required to change various parts of the room",
+    "Enable encryption?": "Enable encryption?",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
+    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
+    "Click here to fix": "Click here to fix",
+    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
+    "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",
+    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
+    "Anyone": "Anyone",
+    "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
+    "Members only (since they were invited)": "Members only (since they were invited)",
+    "Members only (since they joined)": "Members only (since they joined)",
+    "Encryption": "Encryption",
+    "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
+    "Encrypted": "Encrypted",
+    "Who can access this room?": "Who can access this room?",
+    "Who can read history?": "Who can read history?",
+    "Unable to revoke sharing for email address": "Unable to revoke sharing for email address",
+    "Unable to share email address": "Unable to share email address",
+    "Your email address hasn't been verified yet": "Your email address hasn't been verified yet",
+    "Click the link in the email you received to verify and then click continue again.": "Click the link in the email you received to verify and then click continue again.",
+    "Unable to verify email address.": "Unable to verify email address.",
+    "Verify the link in your inbox": "Verify the link in your inbox",
+    "Complete": "Complete",
+    "Revoke": "Revoke",
+    "Share": "Share",
+    "Discovery options will appear once you have added an email above.": "Discovery options will appear once you have added an email above.",
+    "Unable to revoke sharing for phone number": "Unable to revoke sharing for phone number",
+    "Unable to share phone number": "Unable to share phone number",
+    "Unable to verify phone number.": "Unable to verify phone number.",
+    "Incorrect verification code": "Incorrect verification code",
+    "Please enter verification code sent via text.": "Please enter verification code sent via text.",
+    "Verification code": "Verification code",
+    "Discovery options will appear once you have added a phone number above.": "Discovery options will appear once you have added a phone number above.",
+    "Unable to remove contact information": "Unable to remove contact information",
+    "Remove %(email)s?": "Remove %(email)s?",
+    "Invalid Email Address": "Invalid Email Address",
+    "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
+    "Unable to add email address": "Unable to add email address",
+    "Add": "Add",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.",
+    "Email Address": "Email Address",
+    "Remove %(phone)s?": "Remove %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.",
+    "Phone Number": "Phone Number",
+    "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",
+    "Drop File Here": "Drop File Here",
+    "Drop file here to upload": "Drop file here to upload",
+    " (unsupported)": " (unsupported)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
+    "This user has not verified all of their devices.": "This user has not verified all of their devices.",
+    "You have not verified this user. This user has verified all of their devices.": "You have not verified this user. This user has verified all of their devices.",
+    "You have verified this user. This user has verified all of their devices.": "You have verified this user. This user has verified all of their devices.",
+    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Some users in this encrypted room are not verified by you or they have not verified their own devices.",
+    "All users in this encrypted room are verified by you and they have verified their own devices.": "All users in this encrypted room are verified by you and they have verified their own devices.",
+    "Some devices for this user are not trusted": "Some devices for this user are not trusted",
+    "All devices for this user are trusted": "All devices for this user are trusted",
+    "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",
+    "All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted",
+    "Edit message": "Edit message",
+    "This event could not be displayed": "This event could not be displayed",
+    "%(senderName)s sent an image": "%(senderName)s sent an image",
+    "%(senderName)s sent a video": "%(senderName)s sent a video",
+    "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
+    "Your key share request has been sent - please check your other devices for key share requests.": "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.": "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.": "If your other devices do not have the key for this message you will not be able to decrypt them.",
+    "Key request sent.": "Key request sent.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
+    "This message cannot be decrypted": "This message cannot be decrypted",
+    "Encrypted by an unverified device": "Encrypted by an unverified device",
+    "Unencrypted": "Unencrypted",
+    "Please select the destination room for this message": "Please select the destination room for this message",
+    "Scroll to bottom of page": "Scroll to bottom of page",
+    "Close preview": "Close preview",
+    "device id: ": "device id: ",
+    "Disinvite": "Disinvite",
+    "Kick": "Kick",
+    "Disinvite this user?": "Disinvite this user?",
+    "Kick this user?": "Kick this user?",
+    "Failed to kick": "Failed to kick",
+    "Ban": "Ban",
+    "Unban this user?": "Unban this user?",
+    "Ban this user?": "Ban this user?",
+    "Failed to ban user": "Failed to ban user",
+    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
+    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "You are about to remove 1 message by %(user)s. This cannot be undone. Do you wish to continue?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
+    "Remove %(count)s messages|other": "Remove %(count)s messages",
+    "Remove %(count)s messages|one": "Remove 1 message",
+    "Demote yourself?": "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.": "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": "Demote",
+    "Failed to mute user": "Failed to mute user",
+    "Failed to toggle moderator status": "Failed to toggle moderator status",
+    "Deactivate user?": "Deactivate user?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
+    "Deactivate user": "Deactivate user",
+    "Failed to deactivate user": "Failed to deactivate user",
+    "Failed to change power level": "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.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
+    "Are you sure?": "Are you sure?",
+    "No devices with registered encryption keys": "No devices with registered encryption keys",
+    "Jump to read receipt": "Jump to read receipt",
+    "Mention": "Mention",
+    "Invite": "Invite",
+    "Share Link to User": "Share Link to User",
+    "User Options": "User Options",
+    "Direct chats": "Direct chats",
+    "Remove recent messages": "Remove recent messages",
+    "Unmute": "Unmute",
+    "Mute": "Mute",
+    "Revoke Moderator": "Revoke Moderator",
+    "Make Moderator": "Make Moderator",
+    "Admin Tools": "Admin Tools",
+    "and %(count)s others...|other": "and %(count)s others...",
+    "and %(count)s others...|one": "and one other...",
+    "Invite to this room": "Invite to this room",
+    "Invited": "Invited",
+    "Filter room members": "Filter room members",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
+    "Voice call": "Voice call",
+    "Video call": "Video call",
+    "Hangup": "Hangup",
+    "Upload file": "Upload file",
+    "Send an encrypted reply…": "Send an encrypted reply…",
+    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
+    "Send an encrypted message…": "Send an encrypted message…",
+    "Send a message (unencrypted)…": "Send a message (unencrypted)…",
+    "The conversation continues here.": "The conversation continues here.",
+    "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
+    "You do not have permission to post to this room": "You do not have permission to post to this room",
+    "Bold": "Bold",
+    "Italics": "Italics",
+    "Strikethrough": "Strikethrough",
+    "Code block": "Code block",
+    "Quote": "Quote",
+    "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",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Online for %(duration)s",
+    "Idle for %(duration)s": "Idle for %(duration)s",
+    "Offline for %(duration)s": "Offline for %(duration)s",
+    "Unknown for %(duration)s": "Unknown for %(duration)s",
+    "Online": "Online",
+    "Idle": "Idle",
+    "Offline": "Offline",
+    "Unknown": "Unknown",
+    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+    "Replying": "Replying",
+    "Direct Chat": "Direct Chat",
+    "Room %(name)s": "Room %(name)s",
+    "Recent rooms": "Recent rooms",
+    "No rooms to show": "No rooms to show",
+    "Unnamed room": "Unnamed room",
+    "World readable": "World readable",
+    "Guests can join": "Guests can join",
+    "(~%(count)s results)|other": "(~%(count)s results)",
+    "(~%(count)s results)|one": "(~%(count)s result)",
+    "Join Room": "Join Room",
+    "Settings": "Settings",
+    "Forget room": "Forget room",
+    "Search": "Search",
+    "Share room": "Share room",
+    "Community Invites": "Community Invites",
+    "Invites": "Invites",
+    "Favourites": "Favourites",
+    "People": "People",
+    "Start chat": "Start chat",
+    "Rooms": "Rooms",
+    "Low priority": "Low priority",
+    "Historical": "Historical",
+    "System Alerts": "System Alerts",
+    "This room": "This room",
+    "Joining room …": "Joining room …",
+    "Loading …": "Loading …",
+    "Rejecting invite …": "Rejecting invite …",
+    "Join the conversation with an account": "Join the conversation with an account",
+    "Sign Up": "Sign Up",
+    "Sign In": "Sign In",
+    "Loading room preview": "Loading room preview",
+    "You were kicked from %(roomName)s by %(memberName)s": "You were kicked from %(roomName)s by %(memberName)s",
+    "Reason: %(reason)s": "Reason: %(reason)s",
+    "Forget this room": "Forget this room",
+    "Re-join": "Re-join",
+    "You were banned from %(roomName)s by %(memberName)s": "You were banned from %(roomName)s by %(memberName)s",
+    "Something went wrong with your invite to %(roomName)s": "Something went wrong with your invite to %(roomName)s",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.",
+    "unknown error code": "unknown error code",
+    "You can only join it with a working invite.": "You can only join it with a working invite.",
+    "Try to join anyway": "Try to join anyway",
+    "You can still join it because this is a public room.": "You can still join it because this is a public room.",
+    "Join the discussion": "Join the discussion",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "This invite to %(roomName)s was sent to %(email)s which is not associated with your account",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Link this email with your account in Settings to receive invites directly in Riot.",
+    "This invite to %(roomName)s was sent to %(email)s": "This invite to %(roomName)s was sent to %(email)s",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Use an identity server in Settings to receive invites directly in Riot.",
+    "Share this email in Settings to receive invites directly in Riot.": "Share this email in Settings to receive invites directly in Riot.",
+    "Do you want to chat with %(user)s?": "Do you want to chat with %(user)s?",
+    "<userName/> wants to chat": "<userName/> wants to chat",
+    "Start chatting": "Start chatting",
+    "Do you want to join %(roomName)s?": "Do you want to join %(roomName)s?",
+    "<userName/> invited you": "<userName/> invited you",
+    "Reject": "Reject",
+    "You're previewing %(roomName)s. Want to join it?": "You're previewing %(roomName)s. Want to join it?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",
+    "%(roomName)s does not exist.": "%(roomName)s does not exist.",
+    "This room doesn't exist. Are you sure you're at the right place?": "This room doesn't exist. Are you sure you're at the right place?",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
+    "Try again later, or ask a room admin to check if you have access.": "Try again later, or ask a room admin to check if you have access.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.",
+    "Never lose encrypted messages": "Never lose encrypted messages",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
+    "Not now": "Not now",
+    "Don't ask me again": "Don't ask me again",
+    "Options": "Options",
+    "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
+    "%(count)s unread messages including mentions.|one": "1 unread mention.",
+    "%(count)s unread messages.|other": "%(count)s unread messages.",
+    "%(count)s unread messages.|one": "1 unread message.",
+    "Unread mentions.": "Unread mentions.",
+    "Unread messages.": "Unread messages.",
+    "Add a topic": "Add a topic",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
+    "This room has already been upgraded.": "This room has already been upgraded.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.",
+    "Only room administrators will see this warning": "Only room administrators will see this warning",
+    "This Room": "This Room",
+    "All Rooms": "All Rooms",
+    "Search…": "Search…",
+    "Server error": "Server error",
+    "Command error": "Command error",
+    "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
+    "Failed to connect to integration manager": "Failed to connect to integration manager",
+    "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
+    "Add some now": "Add some now",
+    "Stickerpack": "Stickerpack",
+    "Hide Stickers": "Hide Stickers",
+    "Show Stickers": "Show Stickers",
+    "Failed to revoke invite": "Failed to revoke invite",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.",
+    "Revoke invite": "Revoke invite",
+    "Invited by %(sender)s": "Invited by %(sender)s",
+    "Jump to first unread message.": "Jump to first unread message.",
+    "Error updating main address": "Error updating main address",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
+    "Error creating alias": "Error creating alias",
+    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
+    "Error removing alias": "Error removing alias",
+    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
+    "Main address": "Main address",
+    "not specified": "not specified",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "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)",
+    "Error updating flair": "Error updating flair",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "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)",
+    "Room Name": "Room Name",
+    "Room Topic": "Room Topic",
+    "Room avatar": "Room avatar",
+    "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.",
+    "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.",
+    "Verify User": "Verify User",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
+    "For maximum security, do this in person.": "For maximum security, do this in person.",
+    "Start Verification": "Start Verification",
+    "Members": "Members",
+    "Files": "Files",
+    "Trusted": "Trusted",
+    "Not trusted": "Not trusted",
+    "Hide verified sessions": "Hide verified sessions",
+    "%(count)s verified sessions|other": "%(count)s verified sessions",
+    "%(count)s verified sessions|one": "1 verified session",
+    "Direct message": "Direct message",
+    "Remove from community": "Remove from community",
+    "Disinvite this user from community?": "Disinvite this user from community?",
+    "Remove this user from community?": "Remove this user from community?",
+    "Failed to withdraw invitation": "Failed to withdraw invitation",
+    "Failed to remove user from community": "Failed to remove user from community",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
+    "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
+    "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
+    "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
+    "Security": "Security",
+    "Sunday": "Sunday",
+    "Monday": "Monday",
+    "Tuesday": "Tuesday",
+    "Wednesday": "Wednesday",
+    "Thursday": "Thursday",
+    "Friday": "Friday",
+    "Saturday": "Saturday",
+    "Today": "Today",
+    "Yesterday": "Yesterday",
+    "View Source": "View Source",
+    "Error decrypting audio": "Error decrypting audio",
+    "React": "React",
+    "Reply": "Reply",
+    "Edit": "Edit",
+    "Message Actions": "Message Actions",
+    "Attachment": "Attachment",
+    "Error decrypting attachment": "Error decrypting attachment",
+    "Decrypt %(text)s": "Decrypt %(text)s",
+    "Download %(text)s": "Download %(text)s",
+    "Invalid file%(extra)s": "Invalid file%(extra)s",
+    "Error decrypting image": "Error decrypting image",
+    "Show image": "Show image",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "You have ignored this user, so their message is hidden. <a>Show anyways.</a>",
+    "You verified %(name)s": "You verified %(name)s",
+    "You cancelled verifying %(name)s": "You cancelled verifying %(name)s",
+    "%(name)s cancelled verifying": "%(name)s cancelled verifying",
+    "You accepted": "You accepted",
+    "%(name)s accepted": "%(name)s accepted",
+    "You cancelled": "You cancelled",
+    "%(name)s cancelled": "%(name)s cancelled",
+    "%(name)s wants to verify": "%(name)s wants to verify",
+    "You sent a verification request": "You sent a verification request",
+    "Error decrypting video": "Error decrypting video",
+    "Show all": "Show all",
+    "Reactions": "Reactions",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
+    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
+    "Click here to see older messages.": "Click here to see older messages.",
+    "Copied!": "Copied!",
+    "Failed to copy": "Failed to copy",
+    "Add an Integration": "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?": "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?",
+    "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
+    "edited": "edited",
+    "Removed or unknown message type": "Removed or unknown message type",
+    "Message removed by %(userId)s": "Message removed by %(userId)s",
+    "Message removed": "Message removed",
+    "Failed to load group members": "Failed to load group members",
+    "Filter community members": "Filter community members",
+    "Invite to this community": "Invite to this community",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Removing a room from the community will also remove it from the community page.",
+    "Failed to remove room from community": "Failed to remove room from community",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
+    "Something went wrong!": "Something went wrong!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "The visibility of '%(roomName)s' in %(groupId)s could not be updated.",
+    "Visibility in Room List": "Visibility in Room List",
+    "Visible to everyone": "Visible to everyone",
+    "Only visible to community members": "Only visible to community members",
+    "Add rooms to this community": "Add rooms to this community",
+    "Filter community rooms": "Filter community rooms",
+    "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
+    "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
+    "You're not currently a member of any communities.": "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>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
+    "Yes, I want to help!": "Yes, I want to help!",
+    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+    "Enable them now": "Enable them now",
+    "What's New": "What's New",
+    "Update": "Update",
+    "What's new?": "What's new?",
+    "A new version of Riot is available.": "A new version of Riot is available.",
+    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
+    "Set Password": "Set Password",
+    "Please <a>contact your service administrator</a> to get this limit increased.": "Please <a>contact your service administrator</a> to get this limit increased.",
+    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.",
+    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.",
+    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+    "Checking for an update...": "Checking for an update...",
+    "No update available.": "No update available.",
+    "Downloading update...": "Downloading update...",
+    "Frequently Used": "Frequently Used",
+    "Smileys & People": "Smileys & People",
+    "Animals & Nature": "Animals & Nature",
+    "Food & Drink": "Food & Drink",
+    "Activities": "Activities",
+    "Travel & Places": "Travel & Places",
+    "Objects": "Objects",
+    "Symbols": "Symbols",
+    "Flags": "Flags",
+    "Quick Reactions": "Quick Reactions",
+    "Cancel search": "Cancel search",
+    "Unknown Address": "Unknown Address",
+    "Any of the following data may be shared:": "Any of the following data may be shared:",
+    "Your display name": "Your display name",
+    "Your avatar URL": "Your avatar URL",
+    "Your user ID": "Your user ID",
+    "Your theme": "Your theme",
+    "Riot URL": "Riot URL",
+    "Room ID": "Room ID",
+    "Widget ID": "Widget ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Widgets do not use message encryption.",
+    "Widget added by": "Widget added by",
+    "This widget may use cookies.": "This widget may use cookies.",
+    "Delete Widget": "Delete Widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
+    "Delete widget": "Delete widget",
+    "Failed to remove widget": "Failed to remove widget",
+    "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
+    "Minimize apps": "Minimize apps",
+    "Maximize apps": "Maximize apps",
+    "Popout widget": "Popout widget",
+    "More options": "More options",
+    "Create new room": "Create new room",
+    "Unblacklist": "Unblacklist",
+    "Blacklist": "Blacklist",
+    "Unverify": "Unverify",
+    "Verify...": "Verify...",
+    "Join": "Join",
+    "No results": "No results",
+    "Yes": "Yes",
+    "No": "No",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
+    "collapse": "collapse",
+    "expand": "expand",
+    "Communities": "Communities",
+    "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
+    "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
+    "Rotate Left": "Rotate Left",
+    "Rotate counter-clockwise": "Rotate counter-clockwise",
+    "Rotate Right": "Rotate Right",
+    "Rotate clockwise": "Rotate clockwise",
+    "Download this file": "Download this file",
+    "Language Dropdown": "Language Dropdown",
+    "Manage Integrations": "Manage Integrations",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sjoined",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sjoined %(count)s times",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sjoined",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sleft %(count)s times",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sleft",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sleft %(count)s times",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sleft",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sjoined and left %(count)s times",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sjoined and left",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sjoined and left %(count)s times",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sjoined and left",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sleft and rejoined %(count)s times",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sleft and rejoined",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sleft and rejoined %(count)s times",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sleft and rejoined",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)srejected their invitations %(count)s times",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srejected their invitations",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)srejected their invitation %(count)s times",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)srejected their invitation",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)shad their invitations withdrawn %(count)s times",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)shad their invitations withdrawn",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)shad their invitation withdrawn %(count)s times",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)shad their invitation withdrawn",
+    "were invited %(count)s times|other": "were invited %(count)s times",
+    "were invited %(count)s times|one": "were invited",
+    "was invited %(count)s times|other": "was invited %(count)s times",
+    "was invited %(count)s times|one": "was invited",
+    "were banned %(count)s times|other": "were banned %(count)s times",
+    "were banned %(count)s times|one": "were banned",
+    "was banned %(count)s times|other": "was banned %(count)s times",
+    "was banned %(count)s times|one": "was banned",
+    "were unbanned %(count)s times|other": "were unbanned %(count)s times",
+    "were unbanned %(count)s times|one": "were unbanned",
+    "was unbanned %(count)s times|other": "was unbanned %(count)s times",
+    "was unbanned %(count)s times|one": "was unbanned",
+    "were kicked %(count)s times|other": "were kicked %(count)s times",
+    "were kicked %(count)s times|one": "were kicked",
+    "was kicked %(count)s times|other": "was kicked %(count)s times",
+    "was kicked %(count)s times|one": "was kicked",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)schanged their name %(count)s times",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)schanged their name",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)schanged their name %(count)s times",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)schanged their name",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)schanged their avatar %(count)s times",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)schanged their avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)schanged their avatar %(count)s times",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)schanged their avatar",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)smade no changes %(count)s times",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)smade no changes",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)smade no changes %(count)s times",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
+    "Power level": "Power level",
+    "Custom level": "Custom level",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
+    "Room alias": "Room alias",
+    "e.g. my-room": "e.g. my-room",
+    "Some characters not allowed": "Some characters not allowed",
+    "Please provide a room alias": "Please provide a room alias",
+    "This alias is available to use": "This alias is available to use",
+    "This alias is already in use": "This alias is already in use",
+    "Room directory": "Room directory",
+    "And %(count)s more...|other": "And %(count)s more...",
+    "ex. @bob:example.com": "ex. @bob:example.com",
+    "Add User": "Add User",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix Room ID",
+    "email address": "email address",
+    "That doesn't look like a valid email address": "That doesn't look like a valid email address",
+    "You have entered an invalid address.": "You have entered an invalid address.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use an identity server to invite by email. Manage in <settings>Settings</settings>.",
+    "The following users may not exist": "The following users may not exist",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
+    "Invite anyway and never warn me again": "Invite anyway and never warn me again",
+    "Invite anyway": "Invite anyway",
+    "Close dialog": "Close dialog",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
+    "Preparing to send logs": "Preparing to send logs",
+    "Logs sent": "Logs sent",
+    "Thank you!": "Thank you!",
+    "Failed to send logs: ": "Failed to send logs: ",
+    "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.": "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.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
+    "GitHub issue": "GitHub issue",
+    "Notes": "Notes",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.",
+    "Send logs": "Send logs",
+    "Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
+    "Unavailable": "Unavailable",
+    "Changelog": "Changelog",
+    "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
+    "Removing…": "Removing…",
+    "Confirm Removal": "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.": "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.",
+    "Clear all data on this device?": "Clear all data on this device?",
+    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.",
+    "Clear all data": "Clear all data",
+    "Community IDs cannot be empty.": "Community IDs cannot be empty.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
+    "Create Community": "Create Community",
+    "Community Name": "Community Name",
+    "Example": "Example",
+    "Community ID": "Community ID",
+    "example": "example",
+    "Create": "Create",
+    "Please enter a name for the room": "Please enter a name for the room",
+    "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
+    "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
+    "Create a public room": "Create a public room",
+    "Create a private room": "Create a private room",
+    "Name": "Name",
+    "Topic (optional)": "Topic (optional)",
+    "Make this room public": "Make this room public",
+    "Hide advanced": "Hide advanced",
+    "Show advanced": "Show advanced",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)",
+    "Create Room": "Create Room",
+    "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",
+    "Unknown error": "Unknown error",
+    "Incorrect password": "Incorrect password",
+    "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>": "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>",
+    "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.": "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.",
+    "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.": "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.",
+    "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)": "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)",
+    "To continue, please enter your password:": "To continue, please enter your password:",
+    "Verify device": "Verify device",
+    "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
+    "Verify by comparing a short text string.": "Verify by comparing a short text string.",
+    "Begin Verifying": "Begin Verifying",
+    "Waiting for partner to accept...": "Waiting for partner to accept...",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",
+    "Waiting for %(userId)s to confirm...": "Waiting for %(userId)s to confirm...",
+    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:",
+    "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:": "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:",
+    "Use two-way text verification": "Use two-way text verification",
+    "Device name": "Device name",
+    "Device ID": "Device ID",
+    "Device key": "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.": "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.",
+    "I verify that the keys match": "I verify that the keys match",
+    "Back": "Back",
+    "Send Custom Event": "Send Custom Event",
+    "You must specify an event type!": "You must specify an event type!",
+    "Event sent!": "Event sent!",
+    "Failed to send custom event.": "Failed to send custom event.",
+    "Event Type": "Event Type",
+    "State Key": "State Key",
+    "Event Content": "Event Content",
+    "Send Account Data": "Send Account Data",
+    "Filter results": "Filter results",
+    "Explore Room State": "Explore Room State",
+    "Explore Account Data": "Explore Account Data",
+    "View Servers in Room": "View Servers in Room",
+    "Toolbox": "Toolbox",
+    "Developer Tools": "Developer Tools",
+    "An error has occurred.": "An error has occurred.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
+    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
+    "Waiting for partner to confirm...": "Waiting for partner to confirm...",
+    "Incoming Verification Request": "Incoming Verification Request",
+    "Integrations are disabled": "Integrations are disabled",
+    "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
+    "Integrations not allowed": "Integrations not allowed",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
+    "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
+    "Failed to find the following users": "Failed to find the following users",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
+    "Recent Conversations": "Recent Conversations",
+    "Suggestions": "Suggestions",
+    "Recently Direct Messaged": "Recently Direct Messaged",
+    "Show more": "Show more",
+    "Direct Messages": "Direct Messages",
+    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
+    "Go": "Go",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
+    "Start verification": "Start verification",
+    "Share without verifying": "Share without verifying",
+    "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",
+    "I don't want my encrypted messages": "I don't want my encrypted messages",
+    "Manually export keys": "Manually export keys",
+    "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
+    "Are you sure you want to sign out?": "Are you sure you want to sign out?",
+    "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
+    "Message edits": "Message edits",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
+    "Report bugs & give feedback": "Report bugs & give feedback",
+    "Please fill why you're reporting.": "Please fill why you're reporting.",
+    "Report Content to Your Homeserver Administrator": "Report Content to Your Homeserver Administrator",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
+    "Send report": "Send report",
+    "Room Settings - %(roomName)s": "Room Settings - %(roomName)s",
+    "Failed to upgrade room": "Failed to upgrade room",
+    "The room upgrade could not be completed": "The room upgrade could not be completed",
+    "Upgrade this room to version %(version)s": "Upgrade this room to version %(version)s",
+    "Upgrade Room Version": "Upgrade Room Version",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:",
+    "Create a new room with the same name, description and avatar": "Create a new room with the same name, description and avatar",
+    "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",
+    "Automatically invite users": "Automatically invite users",
+    "Upgrade private room": "Upgrade private room",
+    "Upgrade public room": "Upgrade public room",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "You'll upgrade this room from <oldVersion /> to <newVersion />.",
+    "Upgrade": "Upgrade",
+    "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
+    "Clear Storage and Sign Out": "Clear Storage and Sign Out",
+    "Send Logs": "Send Logs",
+    "Refresh": "Refresh",
+    "Unable to restore session": "Unable to restore session",
+    "We encountered an error trying to restore your previous 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.": "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.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.",
+    "Verification Pending": "Verification Pending",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
+    "Email address": "Email address",
+    "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
+    "Skip": "Skip",
+    "A username can only contain lower case letters, numbers and '=_-./'": "A username can only contain lower case letters, numbers and '=_-./'",
+    "Username not available": "Username not available",
+    "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
+    "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
+    "Checking...": "Checking...",
+    "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 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 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.",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
+    "Please set a password!": "Please set a password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "Share Room": "Share Room",
+    "Link to most recent message": "Link to most recent message",
+    "Share User": "Share User",
+    "Share Community": "Share Community",
+    "Share Room Message": "Share Room Message",
+    "Link to selected message": "Link to selected message",
+    "COPY": "COPY",
+    "Command Help": "Command Help",
+    "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
+    "Missing session data": "Missing session data",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
+    "Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.",
+    "Integration Manager": "Integration Manager",
+    "Find others by phone or email": "Find others by phone or email",
+    "Be found by phone or email": "Be found by phone or email",
+    "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
+    "Terms of Service": "Terms of Service",
+    "To continue you need to accept the terms of this service.": "To continue you need to accept the terms of this service.",
+    "Service": "Service",
+    "Summary": "Summary",
+    "Document": "Document",
+    "Next": "Next",
+    "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",
+    "Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)",
+    "Upload files": "Upload files",
+    "Upload all": "Upload all",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "These files are <b>too large</b> to upload. The file size limit is %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.",
+    "Upload %(count)s other files|other": "Upload %(count)s other files",
+    "Upload %(count)s other files|one": "Upload %(count)s other file",
+    "Cancel All": "Cancel All",
+    "Upload Error": "Upload Error",
+    "A widget would like to verify your identity": "A widget would like to verify your identity",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
+    "Remember my selection for this widget": "Remember my selection for this widget",
+    "Allow": "Allow",
+    "Deny": "Deny",
+    "Enter secret storage passphrase": "Enter secret storage passphrase",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Unable to access secret storage. Please verify that you entered the correct passphrase.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
+    "Enter secret storage recovery key": "Enter secret storage recovery key",
+    "This looks like a valid recovery key!": "This looks like a valid recovery key!",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct recovery key.",
+    "Not a valid recovery key": "Not a valid recovery key",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
+    "Unable to load backup status": "Unable to load backup status",
+    "Recovery Key Mismatch": "Recovery Key Mismatch",
+    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
+    "Incorrect Recovery Passphrase": "Incorrect Recovery Passphrase",
+    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
+    "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",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
+    "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",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
+    "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 key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
+    "Private Chat": "Private Chat",
+    "Public Chat": "Public Chat",
+    "Custom": "Custom",
+    "Alias (optional)": "Alias (optional)",
+    "Reject invitation": "Reject invitation",
+    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
+    "Unable to reject invite": "Unable to reject invite",
+    "Resend": "Resend",
+    "Resend edit": "Resend edit",
+    "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
+    "Resend removal": "Resend removal",
+    "Cancel Sending": "Cancel Sending",
+    "Forward Message": "Forward Message",
+    "Pin Message": "Pin Message",
+    "View Decrypted Source": "View Decrypted Source",
+    "Unhide Preview": "Unhide Preview",
+    "Share Permalink": "Share Permalink",
+    "Share Message": "Share Message",
+    "Source URL": "Source URL",
+    "Collapse Reply Thread": "Collapse Reply Thread",
+    "End-to-end encryption information": "End-to-end encryption information",
+    "Report Content": "Report Content",
+    "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
+    "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
+    "Notification settings": "Notification settings",
+    "All messages (noisy)": "All messages (noisy)",
+    "All messages": "All messages",
+    "Mentions only": "Mentions only",
+    "Leave": "Leave",
+    "Forget": "Forget",
+    "Favourite": "Favourite",
+    "Low Priority": "Low Priority",
+    "Clear status": "Clear status",
+    "Update status": "Update status",
+    "Set status": "Set status",
+    "Set a new status...": "Set a new status...",
+    "View Community": "View Community",
+    "Hide": "Hide",
+    "Home": "Home",
+    "Sign in": "Sign in",
+    "Help": "Help",
+    "Reload": "Reload",
+    "Take picture": "Take picture",
+    "Remove for everyone": "Remove for everyone",
+    "Remove for me": "Remove for me",
+    "User Status": "User Status",
+    "powered by Matrix": "powered by Matrix",
+    "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
+    "Country Dropdown": "Country Dropdown",
+    "Custom Server Options": "Custom Server Options",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
+    "To continue, please enter your password.": "To continue, please enter your password.",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
+    "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.",
+    "Token incorrect": "Token incorrect",
+    "A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
+    "Please enter the code it contains:": "Please enter the code it contains:",
+    "Code": "Code",
+    "Submit": "Submit",
+    "Start authentication": "Start authentication",
+    "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
+    "Your Modular server": "Your Modular server",
+    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.",
+    "Server Name": "Server Name",
+    "The email field must not be blank.": "The email field must not be blank.",
+    "The username field must not be blank.": "The username field must not be blank.",
+    "The phone number field must not be blank.": "The phone number field must not be blank.",
+    "The password field must not be blank.": "The password field must not be blank.",
+    "Email": "Email",
+    "Username": "Username",
+    "Phone": "Phone",
+    "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
+    "Sign in with": "Sign in with",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
+    "Use an email address to recover your account": "Use an email address to recover your account",
+    "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
+    "Doesn't look like a valid email address": "Doesn't look like a valid email address",
+    "Enter password": "Enter password",
+    "Password is allowed, but unsafe": "Password is allowed, but unsafe",
+    "Nice, strong password!": "Nice, strong password!",
+    "Keep going...": "Keep going...",
+    "Passwords don't match": "Passwords don't match",
+    "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
+    "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
+    "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
+    "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
+    "Enter username": "Enter username",
+    "Email (optional)": "Email (optional)",
+    "Confirm": "Confirm",
+    "Phone (optional)": "Phone (optional)",
+    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
+    "Homeserver URL": "Homeserver URL",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",
+    "Identity Server URL": "Identity Server URL",
+    "Other servers": "Other servers",
+    "Free": "Free",
+    "Join millions for free on the largest public server": "Join millions for free on the largest public server",
+    "Premium": "Premium",
+    "Premium hosting for organisations <a>Learn more</a>": "Premium hosting for organisations <a>Learn more</a>",
+    "Find other public servers or use a custom server": "Find other public servers or use a custom server",
+    "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Sign in to your Matrix account on <underlinedServerName />",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
+    "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!",
+    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
+    "Couldn't load page": "Couldn't load page",
+    "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>\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",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Failed to add the following rooms to the summary of %(groupId)s:",
+    "Add a Room": "Add a Room",
+    "Failed to remove the room from the summary of %(groupId)s": "Failed to remove the room from the summary of %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "The room '%(roomName)s' could not be removed from the summary.",
+    "Add users to the community summary": "Add users to the community summary",
+    "Who would you like to add to this summary?": "Who would you like to add to this summary?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Failed to add the following users to the summary of %(groupId)s:",
+    "Add a User": "Add a User",
+    "Failed to remove a user from the summary of %(groupId)s": "Failed to remove a user from the summary of %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary.",
+    "Failed to upload image": "Failed to upload image",
+    "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 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",
+    "Community Settings": "Community Settings",
+    "Want more than a community? <a>Get your own server</a>": "Want more than a community? <a>Get your own server</a>",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
+    "Featured Rooms:": "Featured Rooms:",
+    "Featured Users:": "Featured Users:",
+    "%(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",
+    "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!": "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!",
+    "Long Description (HTML)": "Long Description (HTML)",
+    "Upload avatar": "Upload avatar",
+    "Description": "Description",
+    "Community %(groupId)s not found": "Community %(groupId)s not found",
+    "This homeserver does not support communities": "This homeserver does not support communities",
+    "Failed to load %(groupId)s": "Failed to load %(groupId)s",
+    "Explore": "Explore",
+    "Filter": "Filter",
+    "Filter rooms…": "Filter rooms…",
+    "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.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
+    "Failed to leave room": "Failed to leave room",
+    "Can't leave Server Notices room": "Can't leave Server Notices room",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.",
+    "Signed Out": "Signed Out",
+    "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
+    "Terms and Conditions": "Terms and Conditions",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.",
+    "Review terms and conditions": "Review terms and conditions",
+    "Old cryptography data detected": "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.": "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.",
+    "Verification Request": "Verification Request",
+    "Logout": "Logout",
+    "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
+    "Your Communities": "Your Communities",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
+    "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.": "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": "Error whilst fetching joined communities",
+    "Create a new community": "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.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
+    "You have no visible notifications": "You have no visible notifications",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
+    "Riot failed to get the public room list.": "Riot failed to get the public room list.",
+    "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+    "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
+    "Remove from Directory": "Remove from Directory",
+    "remove %(name)s from the directory.": "remove %(name)s from the directory.",
+    "delete the alias.": "delete the alias.",
+    "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
+    "Unable to join network": "Unable to join network",
+    "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+    "Room not found": "Room not found",
+    "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
+    "Fetching third party location failed": "Fetching third party location failed",
+    "Unable to look up room ID from server": "Unable to look up room ID from server",
+    "Preview": "Preview",
+    "View": "View",
+    "Find a room…": "Find a room…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
+    "Explore rooms": "Explore rooms",
+    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</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.": "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.",
+    "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.": "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.",
+    "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
+    "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Resend message</resendText> or <cancelText>cancel message</cancelText> now.",
+    "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
+    "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
+    "Active call": "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>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
+    "Jump to first unread room.": "Jump to first unread room.",
+    "Jump to first invite.": "Jump to first invite.",
+    "Add room": "Add room",
+    "You seem to be uploading files, are you sure you want to quit?": "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?": "You seem to be in a call, are you sure you want to quit?",
+    "Search failed": "Search failed",
+    "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
+    "No more results": "No more results",
+    "Unknown room %(roomId)s": "Unknown room %(roomId)s",
+    "Room": "Room",
+    "Failed to reject invite": "Failed to reject invite",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
+    "Fill screen": "Fill screen",
+    "Click to unmute video": "Click to unmute video",
+    "Click to mute video": "Click to mute video",
+    "Click to unmute audio": "Click to unmute audio",
+    "Click to mute audio": "Click to mute audio",
+    "Clear filter": "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 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.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
+    "Failed to load timeline position": "Failed to load timeline position",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Guest": "Guest",
+    "Your profile": "Your profile",
+    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
+    "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+    "Could not load user profile": "Could not load user profile",
+    "Complete security": "Complete security",
+    "Verify this session to grant it access to encrypted messages.": "Verify this session to grant it access to encrypted messages.",
+    "Start": "Start",
+    "Session verified": "Session verified",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
+    "Done": "Done",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
+    "Go Back": "Go Back",
+    "Failed to send email": "Failed to send email",
+    "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
+    "A new password must be entered.": "A new password must be entered.",
+    "New passwords must match each other.": "New passwords must match each other.",
+    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.",
+    "Your Matrix account on %(serverName)s": "Your Matrix account on %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Your Matrix account on <underlinedServerName />",
+    "No identity server is configured: add one in server settings to reset your password.": "No identity server is configured: add one in server settings to reset your password.",
+    "Sign in instead": "Sign in instead",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",
+    "Send Reset Email": "Send Reset Email",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
+    "I have verified my email address": "I have verified my email address",
+    "Your password has been reset.": "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.": "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": "Return to login screen",
+    "Set a new password": "Set a new password",
+    "Invalid homeserver discovery response": "Invalid homeserver discovery response",
+    "Failed to get autodiscovery configuration from server": "Failed to get autodiscovery configuration from server",
+    "Invalid base_url for m.homeserver": "Invalid base_url for m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver URL does not appear to be a valid Matrix homeserver",
+    "Invalid identity server discovery response": "Invalid identity server discovery response",
+    "Invalid base_url for m.identity_server": "Invalid base_url for m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "Identity server URL does not appear to be a valid identity server",
+    "General failure": "General failure",
+    "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
+    "This account has been deactivated.": "This account has been deactivated.",
+    "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.",
+    "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
+    "The phone number entered looks invalid": "The phone number entered looks invalid",
+    "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>.",
+    "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",
+    "Create account": "Create account",
+    "Failed to fetch avatar URL": "Failed to fetch avatar URL",
+    "Set a display name:": "Set a display name:",
+    "Upload an avatar:": "Upload an avatar:",
+    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
+    "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
+    "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
+    "Continue with previous account": "Continue with previous account",
+    "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
+    "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
+    "Registration Successful": "Registration Successful",
+    "Create your account": "Create your account",
+    "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
+    "Failed to re-authenticate": "Failed to re-authenticate",
+    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.",
+    "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
+    "Forgotten your password?": "Forgotten your password?",
+    "Sign in and regain access to your account.": "Sign in and regain access to your account.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
+    "You're signed out": "You're signed out",
+    "Clear personal data": "Clear personal data",
+    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.",
+    "Commands": "Commands",
+    "Command Autocomplete": "Command Autocomplete",
+    "Community Autocomplete": "Community Autocomplete",
+    "Results from DuckDuckGo": "Results from DuckDuckGo",
+    "DuckDuckGo Results": "DuckDuckGo Results",
+    "Emoji": "Emoji",
+    "Emoji Autocomplete": "Emoji Autocomplete",
+    "Notify the whole room": "Notify the whole room",
+    "Room Notification": "Room Notification",
+    "Notification Autocomplete": "Notification Autocomplete",
+    "Room Autocomplete": "Room Autocomplete",
+    "Users": "Users",
+    "User Autocomplete": "User Autocomplete",
+    "unknown device": "unknown device",
+    "NOT verified": "NOT verified",
+    "Blacklisted": "Blacklisted",
+    "verified": "verified",
+    "Verification": "Verification",
+    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "User ID": "User ID",
+    "Curve25519 identity key": "Curve25519 identity key",
+    "none": "none",
+    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
+    "Algorithm": "Algorithm",
+    "unencrypted": "unencrypted",
+    "Decryption error": "Decryption error",
+    "Session ID": "Session ID",
+    "Event information": "Event information",
+    "Sender device information": "Sender device information",
+    "Passphrases must match": "Passphrases must match",
+    "Passphrase must not be empty": "Passphrase must not be empty",
+    "Export room keys": "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.": "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.",
+    "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.": "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": "Enter passphrase",
+    "Confirm passphrase": "Confirm passphrase",
+    "Export": "Export",
+    "Import room keys": "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.": "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.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
+    "File to import": "File to import",
+    "Import": "Import",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
+    "Restore": "Restore",
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.",
+    "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
+    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
+    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
+    "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
+    "Enter a passphrase...": "Enter a passphrase...",
+    "Set up with a recovery key": "Set up with a recovery key",
+    "That matches!": "That matches!",
+    "That doesn't match.": "That doesn't match.",
+    "Go back to set it again.": "Go back to set it again.",
+    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
+    "Repeat your passphrase...": "Repeat your passphrase...",
+    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.",
+    "As a safety net, you can use it to restore your access to encrypted messages.": "As a safety net, you can use it to restore your access to encrypted messages.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
+    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Keep your recovery key somewhere very secure, like a password manager (or a safe).",
+    "Your Recovery Key": "Your Recovery Key",
+    "Copy to clipboard": "Copy to clipboard",
+    "Download": "Download",
+    "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",
+    "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
+    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
+    "Set up secret storage": "Set up secret storage",
+    "Restore your Key Backup": "Restore your Key Backup",
+    "Migrate from Key Backup": "Migrate from Key Backup",
+    "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
+    "Confirm your passphrase": "Confirm your passphrase",
+    "Recovery key": "Recovery key",
+    "Keep it safe": "Keep it safe",
+    "Storing secrets...": "Storing secrets...",
+    "Success!": "Success!",
+    "Unable to set up secret storage": "Unable to set up secret storage",
+    "Retry": "Retry",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
+    "Set up with a Recovery Key": "Set up with a Recovery Key",
+    "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.",
+    "As a safety net, you can use it to restore your encrypted message history.": "As a safety net, you can use it to restore your encrypted message history.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
+    "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",
+    "Secure your backup with a passphrase": "Secure your backup with a passphrase",
+    "Starting backup...": "Starting backup...",
+    "Create Key Backup": "Create Key Backup",
+    "Unable to create key backup": "Unable to create key backup",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
+    "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
+    "Set up": "Set up",
+    "Don't ask again": "Don't ask again",
+    "New Recovery Method": "New Recovery Method",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
+    "This device is encrypting history using the new recovery method.": "This device is encrypting history using the new recovery method.",
+    "Go to Settings": "Go to Settings",
+    "Set up Secure Messages": "Set up Secure Messages",
+    "Recovery Method Removed": "Recovery Method Removed",
+    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
+    "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"
+}

From c5ecd83bc18bc59382be69cff459dfc81347c1e3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 12:34:50 +0000
Subject: [PATCH 0674/3235] remove .orig file

---
 src/i18n/strings/en_EN.json.orig | 2040 ------------------------------
 1 file changed, 2040 deletions(-)
 delete mode 100644 src/i18n/strings/en_EN.json.orig

diff --git a/src/i18n/strings/en_EN.json.orig b/src/i18n/strings/en_EN.json.orig
deleted file mode 100644
index f0eab6b12d..0000000000
--- a/src/i18n/strings/en_EN.json.orig
+++ /dev/null
@@ -1,2040 +0,0 @@
-{
-    "This email address is already in use": "This email address is already in use",
-    "This phone number is already in use": "This phone number is already in use",
-    "Add Email Address": "Add Email Address",
-    "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
-    "Add Phone Number": "Add Phone Number",
-    "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 username)": "Whether or not you're logged in (we don't record your username)",
-    "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",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
-    "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",
-    "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
-    "Your User Agent": "Your User Agent",
-    "Your device resolution": "Your device resolution",
-    "Analytics": "Analytics",
-    "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",
-    "Call Timeout": "Call Timeout",
-    "The remote side failed to pick up": "The remote side failed to pick up",
-    "Call failed due to misconfigured server": "Call failed due to misconfigured server",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
-    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.",
-    "Try using turn.matrix.org": "Try using turn.matrix.org",
-    "OK": "OK",
-    "Unable to capture screen": "Unable to capture screen",
-    "Existing Call": "Existing Call",
-    "You are already in a call.": "You are already in a call.",
-    "VoIP is unsupported": "VoIP is unsupported",
-    "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
-    "You cannot place a call with yourself.": "You cannot place a call with yourself.",
-    "Could not connect to the integration server": "Could not connect to the integration server",
-    "A conference call could not be started because the integrations 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",
-    "Replying With Files": "Replying With Files",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
-    "Continue": "Continue",
-    "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
-    "Upload Failed": "Upload Failed",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "The server does not support the room version specified.": "The server does not support the room version specified.",
-    "Failure to create room": "Failure to create room",
-    "Send cross-signing keys to homeserver": "Send cross-signing keys to homeserver",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Sun": "Sun",
-    "Mon": "Mon",
-    "Tue": "Tue",
-    "Wed": "Wed",
-    "Thu": "Thu",
-    "Fri": "Fri",
-    "Sat": "Sat",
-    "Jan": "Jan",
-    "Feb": "Feb",
-    "Mar": "Mar",
-    "Apr": "Apr",
-    "May": "May",
-    "Jun": "Jun",
-    "Jul": "Jul",
-    "Aug": "Aug",
-    "Sep": "Sep",
-    "Oct": "Oct",
-    "Nov": "Nov",
-    "Dec": "Dec",
-    "PM": "PM",
-    "AM": "AM",
-    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "%(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",
-    "New Session": "New Session",
-    "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",
-    "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
-    "Identity server has no terms of service": "Identity server has no terms of service",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.",
-    "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
-    "Trust": "Trust",
-    "Error": "Error",
-    "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",
-    "This email address was not found": "This email address was not found",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
-    "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?",
-    "Register": "Register",
-    "Default": "Default",
-    "Restricted": "Restricted",
-    "Moderator": "Moderator",
-    "Admin": "Admin",
-    "Custom (%(level)s)": "Custom (%(level)s)",
-    "Start a chat": "Start a chat",
-    "Who would you like to communicate with?": "Who would you like to communicate with?",
-    "Email, name or Matrix ID": "Email, name or Matrix ID",
-    "Start Chat": "Start Chat",
-    "Invite new room members": "Invite new room members",
-    "Send Invites": "Send Invites",
-    "Failed to start chat": "Failed to start chat",
-    "Operation failed": "Operation failed",
-    "Failed to invite": "Failed to invite",
-    "Failed to invite users to the room:": "Failed to invite users to the room:",
-    "Failed to invite the following users to the %(roomName)s room:": "Failed to invite the following users to the %(roomName)s room:",
-    "You need to be logged in.": "You need to be logged in.",
-    "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
-    "Unable to create widget.": "Unable to create widget.",
-    "Missing roomId.": "Missing roomId.",
-    "Failed to send request.": "Failed to send request.",
-    "This room is not recognised.": "This room is not recognised.",
-    "Power level must be positive integer.": "Power level must be positive integer.",
-    "You are not in this room.": "You are not in this room.",
-    "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
-    "Missing room_id in request": "Missing room_id in request",
-    "Room %(roomId)s not visible": "Room %(roomId)s not visible",
-    "Missing user_id in request": "Missing user_id in request",
-    "Messages": "Messages",
-    "Actions": "Actions",
-    "Advanced": "Advanced",
-    "Other": "Other",
-    "Usage": "Usage",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
-    "Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
-    "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
-    "/ddg is not a command": "/ddg is not a command",
-    "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
-    "Upgrades a room to a new version": "Upgrades a room to a new version",
-    "You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
-    "Error upgrading room": "Error upgrading room",
-    "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
-    "Changes your display nickname": "Changes your display nickname",
-    "Changes your display nickname in the current room only": "Changes your display nickname in the current room only",
-    "Changes the avatar of the current room": "Changes the avatar of the current room",
-    "Changes your avatar in this current room only": "Changes your avatar in this current room only",
-    "Changes your avatar in all rooms": "Changes your avatar in all rooms",
-    "Gets or sets the room topic": "Gets or sets the room topic",
-    "This room has no topic.": "This room has no topic.",
-    "Sets the room name": "Sets the room name",
-    "Invites user with given id to current room": "Invites user with given id to current room",
-    "Use an identity server": "Use an identity server",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.",
-    "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
-    "Joins room with given alias": "Joins room with given alias",
-    "Leave room": "Leave room",
-    "Unrecognised room alias:": "Unrecognised room alias:",
-    "Kicks user with given id": "Kicks user with given id",
-    "Bans user with given id": "Bans user with given id",
-    "Unbans user with given ID": "Unbans user with given ID",
-    "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
-    "Ignored user": "Ignored user",
-    "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
-    "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
-    "Unignored user": "Unignored user",
-    "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
-    "Define the power level of a user": "Define the power level of a user",
-    "Deops user with given id": "Deops user with given id",
-    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
-    "Adds a custom widget by URL to the room": "Adds a custom widget by URL to the room",
-    "Please supply a https:// or http:// widget URL": "Please supply a https:// or http:// widget URL",
-    "You cannot modify widgets in this room.": "You cannot modify widgets in this room.",
-    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
-    "Unknown (user, device) pair:": "Unknown (user, device) pair:",
-    "Device already verified!": "Device already verified!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "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!": "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!",
-    "Verified key": "Verified key",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
-    "Displays action": "Displays action",
-    "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",
-    "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
-    "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
-    "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
-    "Unrecognised command:": "Unrecognised command:",
-    "Reason": "Reason",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
-    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
-    "%(senderName)s made no change.": "%(senderName)s made no change.",
-    "VoIP conference started.": "VoIP conference started.",
-    "%(targetName)s joined the room.": "%(targetName)s joined the room.",
-    "VoIP conference finished.": "VoIP conference finished.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
-    "%(targetName)s left the room.": "%(targetName)s left the room.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
-    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s changed the join rule to %(rule)s",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s has allowed guests to join the room.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s has prevented guests from joining the room.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s changed guest access to %(rule)s",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
-    "Someone": "Someone",
-    "(not supported by this browser)": "(not supported by this browser)",
-    "%(senderName)s answered the call.": "%(senderName)s answered the call.",
-    "(could not connect media)": "(could not connect media)",
-    "(no answer)": "(no answer)",
-    "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
-    "%(senderName)s placed a voice call.": "%(senderName)s placed a voice call.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s placed a voice call. (not supported by this browser)",
-    "%(senderName)s placed a video call.": "%(senderName)s placed a video call.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s placed a video call. (not supported by this browser)",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s made future room history visible to all room members, from the point they joined.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s removed the rule banning users matching %(glob)s",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removed the rule banning rooms matching %(glob)s",
-    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s removed the rule banning servers matching %(glob)s",
-    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s removed a ban rule matching %(glob)s",
-    "%(senderName)s updated an invalid ban rule": "%(senderName)s updated an invalid ban rule",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s",
-    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s",
-    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s",
-    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s",
-    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s",
-    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s",
-    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s created a ban rule matching %(glob)s for %(reason)s",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
-    "Light theme": "Light theme",
-    "Dark theme": "Dark theme",
-    "%(displayName)s is typing …": "%(displayName)s is typing …",
-    "%(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 …",
-    "Cannot reach homeserver": "Cannot reach homeserver",
-    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ensure you have a stable internet connection, or get in touch with the server admin",
-    "Your Riot is misconfigured": "Your Riot is misconfigured",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
-    "Cannot reach identity server": "Cannot reach identity server",
-    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
-    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
-    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
-    "No homeserver URL provided": "No homeserver URL provided",
-    "Unexpected error resolving homeserver configuration": "Unexpected error resolving homeserver configuration",
-    "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
-    "The message you are trying to send is too large.": "The message you are trying to send is too large.",
-    "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.",
-    "Unable to connect to Homeserver. Retrying...": "Unable to connect to Homeserver. Retrying...",
-    "%(items)s and %(count)s others|other": "%(items)s and %(count)s others",
-    "%(items)s and %(count)s others|one": "%(items)s and one other",
-    "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "a few seconds ago": "a few seconds ago",
-    "about a minute ago": "about a minute ago",
-    "%(num)s minutes ago": "%(num)s minutes ago",
-    "about an hour ago": "about an hour ago",
-    "%(num)s hours ago": "%(num)s hours ago",
-    "about a day ago": "about a day ago",
-    "%(num)s days ago": "%(num)s days ago",
-    "a few seconds from now": "a few seconds from now",
-    "about a minute from now": "about a minute from now",
-    "%(num)s minutes from now": "%(num)s minutes from now",
-    "about an hour from now": "about an hour from now",
-    "%(num)s hours from now": "%(num)s hours from now",
-    "about a day from now": "about a day from now",
-    "%(num)s days from now": "%(num)s days from now",
-    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "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?",
-    "Unrecognised address": "Unrecognised address",
-    "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
-    "User %(userId)s is already in the room": "User %(userId)s is already in the room",
-    "User %(user_id)s does not exist": "User %(user_id)s does not exist",
-    "User %(user_id)s may or may not exist": "User %(user_id)s may or may not exist",
-    "The user must be unbanned before they can be invited.": "The user must be unbanned before they can be invited.",
-    "The user's homeserver does not support the version of the room.": "The user's homeserver does not support the version of the room.",
-    "Unknown server error": "Unknown server error",
-    "Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
-    "No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters",
-    "Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",
-    "Avoid repeated words and characters": "Avoid repeated words and characters",
-    "Avoid sequences": "Avoid sequences",
-    "Avoid recent years": "Avoid recent years",
-    "Avoid years that are associated with you": "Avoid years that are associated with you",
-    "Avoid dates and years that are associated with you": "Avoid dates and years that are associated with you",
-    "Capitalization doesn't help very much": "Capitalization doesn't help very much",
-    "All-uppercase is almost as easy to guess as all-lowercase": "All-uppercase is almost as easy to guess as all-lowercase",
-    "Reversed words aren't much harder to guess": "Reversed words aren't much harder to guess",
-    "Predictable substitutions like '@' instead of 'a' don't help very much": "Predictable substitutions like '@' instead of 'a' don't help very much",
-    "Add another word or two. Uncommon words are better.": "Add another word or two. Uncommon words are better.",
-    "Repeats like \"aaa\" are easy to guess": "Repeats like \"aaa\" are easy to guess",
-    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"",
-    "Sequences like abc or 6543 are easy to guess": "Sequences like abc or 6543 are easy to guess",
-    "Recent years are easy to guess": "Recent years are easy to guess",
-    "Dates are often easy to guess": "Dates are often easy to guess",
-    "This is a top-10 common password": "This is a top-10 common password",
-    "This is a top-100 common password": "This is a top-100 common password",
-    "This is a very common password": "This is a very common password",
-    "This is similar to a commonly used password": "This is similar to a commonly used password",
-    "A word by itself is easy to guess": "A word by itself is easy to guess",
-    "Names and surnames by themselves are easy to guess": "Names and surnames by themselves are easy to guess",
-    "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
-    "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
-    "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
-    "There was an error joining the room": "There was an error joining the room",
-    "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
-    "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
-    "Failed to join room": "Failed to join room",
-    "Message Pinning": "Message Pinning",
-    "Custom user status messages": "Custom user status messages",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
-    "Render simple counters in room header": "Render simple counters in room header",
-    "Multiple integration managers": "Multiple integration managers",
-    "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "New invite dialog": "New invite dialog",
-    "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
-    "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
-    "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
-    "Use compact timeline layout": "Use compact timeline layout",
-    "Show a placeholder for removed messages": "Show a placeholder for removed messages",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
-    "Show avatar changes": "Show avatar changes",
-    "Show display name changes": "Show display name changes",
-    "Show read receipts sent by other users": "Show read receipts sent by other users",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
-    "Always show message timestamps": "Always show message timestamps",
-    "Autoplay GIFs and videos": "Autoplay GIFs and videos",
-    "Always show encryption icons": "Always show encryption icons",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Show a reminder to enable Secure Message Recovery in encrypted rooms",
-    "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
-    "Show avatars in user and room mentions": "Show avatars in user and room mentions",
-    "Enable big emoji in chat": "Enable big emoji in chat",
-    "Send typing notifications": "Send typing notifications",
-    "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
-    "Mirror local video feed": "Mirror local video feed",
-    "Enable Community Filter Panel": "Enable Community Filter Panel",
-    "Match system theme": "Match system theme",
-    "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
-    "Send analytics data": "Send analytics data",
-    "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
-    "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
-    "Enable inline URL previews by default": "Enable inline URL previews by default",
-    "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",
-    "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
-    "Show developer tools": "Show developer tools",
-    "Order rooms in the room list by most important first instead of most recent": "Order rooms in the room list by most important first instead of most recent",
-    "Show recently visited rooms above the room list": "Show recently visited rooms above the room list",
-    "Show hidden events in timeline": "Show hidden events in timeline",
-    "Low bandwidth mode": "Low bandwidth mode",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
-    "Show previews/thumbnails for images": "Show previews/thumbnails for images",
-    "Collecting app version information": "Collecting app version information",
-    "Collecting logs": "Collecting logs",
-    "Uploading report": "Uploading report",
-    "Waiting for response from server": "Waiting for response from server",
-    "Messages containing my display name": "Messages containing my display name",
-    "Messages containing my username": "Messages containing my username",
-    "Messages containing @room": "Messages containing @room",
-    "Messages in one-to-one chats": "Messages in one-to-one chats",
-    "Encrypted messages in one-to-one chats": "Encrypted messages in one-to-one chats",
-    "Messages in group chats": "Messages in group chats",
-    "Encrypted messages in group chats": "Encrypted messages in group chats",
-    "When I'm invited to a room": "When I'm invited to a room",
-    "Call invitation": "Call invitation",
-    "Messages sent by bot": "Messages sent by bot",
-    "When rooms are upgraded": "When rooms are upgraded",
-    "My Ban List": "My Ban List",
-    "This is your list of users/servers you have blocked - don't leave the room!": "This is your list of users/servers you have blocked - don't leave the room!",
-    "Active call (%(roomName)s)": "Active call (%(roomName)s)",
-    "unknown caller": "unknown caller",
-    "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
-    "Incoming video call from %(name)s": "Incoming video call from %(name)s",
-    "Incoming call from %(name)s": "Incoming call from %(name)s",
-    "Decline": "Decline",
-    "Accept": "Accept",
-    "The other party cancelled the verification.": "The other party cancelled the verification.",
-    "Verified!": "Verified!",
-    "You've successfully verified this user.": "You've successfully verified this user.",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
-    "Got It": "Got It",
-    "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
-    "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
-    "Unable to find a supported verification method.": "Unable to find a supported verification method.",
-    "Cancel": "Cancel",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
-    "Dog": "Dog",
-    "Cat": "Cat",
-    "Lion": "Lion",
-    "Horse": "Horse",
-    "Unicorn": "Unicorn",
-    "Pig": "Pig",
-    "Elephant": "Elephant",
-    "Rabbit": "Rabbit",
-    "Panda": "Panda",
-    "Rooster": "Rooster",
-    "Penguin": "Penguin",
-    "Turtle": "Turtle",
-    "Fish": "Fish",
-    "Octopus": "Octopus",
-    "Butterfly": "Butterfly",
-    "Flower": "Flower",
-    "Tree": "Tree",
-    "Cactus": "Cactus",
-    "Mushroom": "Mushroom",
-    "Globe": "Globe",
-    "Moon": "Moon",
-    "Cloud": "Cloud",
-    "Fire": "Fire",
-    "Banana": "Banana",
-    "Apple": "Apple",
-    "Strawberry": "Strawberry",
-    "Corn": "Corn",
-    "Pizza": "Pizza",
-    "Cake": "Cake",
-    "Heart": "Heart",
-    "Smiley": "Smiley",
-    "Robot": "Robot",
-    "Hat": "Hat",
-    "Glasses": "Glasses",
-    "Spanner": "Spanner",
-    "Santa": "Santa",
-    "Thumbs up": "Thumbs up",
-    "Umbrella": "Umbrella",
-    "Hourglass": "Hourglass",
-    "Clock": "Clock",
-    "Gift": "Gift",
-    "Light bulb": "Light bulb",
-    "Book": "Book",
-    "Pencil": "Pencil",
-    "Paperclip": "Paperclip",
-    "Scissors": "Scissors",
-    "Lock": "Lock",
-    "Key": "Key",
-    "Hammer": "Hammer",
-    "Telephone": "Telephone",
-    "Flag": "Flag",
-    "Train": "Train",
-    "Bicycle": "Bicycle",
-    "Aeroplane": "Aeroplane",
-    "Rocket": "Rocket",
-    "Trophy": "Trophy",
-    "Ball": "Ball",
-    "Guitar": "Guitar",
-    "Trumpet": "Trumpet",
-    "Bell": "Bell",
-    "Anchor": "Anchor",
-    "Headphones": "Headphones",
-    "Folder": "Folder",
-    "Pin": "Pin",
-    "Other users may not trust it": "Other users may not trust it",
-    "Later": "Later",
-    "Verify": "Verify",
-    "Decline (%(counter)s)": "Decline (%(counter)s)",
-    "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
-    "Upload": "Upload",
-    "Remove": "Remove",
-    "Failed to upload profile picture!": "Failed to upload profile picture!",
-    "Upload new:": "Upload new:",
-    "No display name": "No display name",
-    "New passwords don't match": "New passwords don't match",
-    "Passwords can't be empty": "Passwords can't be empty",
-    "Warning!": "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.": "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": "Export E2E room keys",
-    "Do you want to set an email address?": "Do you want to set an email address?",
-    "Current password": "Current password",
-    "Password": "Password",
-    "New Password": "New Password",
-    "Confirm password": "Confirm password",
-    "Change Password": "Change Password",
-    "Cross-signing and secret storage are enabled.": "Cross-signing and secret storage are enabled.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.",
-    "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
-    "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
-    "Cross-signing public keys:": "Cross-signing public keys:",
-    "on device": "on device",
-    "not found": "not found",
-    "Cross-signing private keys:": "Cross-signing private keys:",
-    "in secret storage": "in secret storage",
-    "Secret storage public key:": "Secret storage public key:",
-    "in account data": "in account data",
-    "Your homeserver does not support device management.": "Your homeserver does not support device management.",
-    "Unable to load device list": "Unable to load device list",
-    "Authentication": "Authentication",
-    "Delete %(count)s devices|other": "Delete %(count)s devices",
-    "Delete %(count)s devices|one": "Delete device",
-    "ID": "ID",
-    "Public Name": "Public Name",
-    "Last seen": "Last seen",
-    "Failed to set display name": "Failed to set display name",
-    "Disable Notifications": "Disable Notifications",
-    "Enable Notifications": "Enable Notifications",
-    "Connecting to integration manager...": "Connecting to integration manager...",
-    "Cannot connect to integration manager": "Cannot connect to integration manager",
-    "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
-    "Delete Backup": "Delete Backup",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
-    "Unable to load key backup status": "Unable to load key backup status",
-    "Restore from Backup": "Restore from Backup",
-    "This device is backing up your keys. ": "This device is backing up your keys. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.",
-    "Connect this device to Key Backup": "Connect this device to Key Backup",
-    "not stored": "not stored",
-    "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
-    "All keys backed up": "All keys backed up",
-    "Backup has a <validity>valid</validity> signature from this user": "Backup has a <validity>valid</validity> signature from this user",
-    "Backup has a <validity>invalid</validity> signature from this user": "Backup has a <validity>invalid</validity> signature from this user",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s",
-    "Backup has a <validity>valid</validity> signature from this device": "Backup has a <validity>valid</validity> signature from this device",
-    "Backup has an <validity>invalid</validity> signature from this device": "Backup has an <validity>invalid</validity> signature from this device",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></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",
-    "This backup is trusted because it has been restored on this device": "This backup is trusted because it has been restored on this device",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.",
-    "Backup version: ": "Backup version: ",
-    "Algorithm: ": "Algorithm: ",
-    "Backup key stored: ": "Backup key stored: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
-    "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
-    "Start using Key Backup": "Start using Key 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",
-    "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
-    "Failed to change settings": "Failed to change settings",
-    "Can't update user notification settings": "Can't update user notification settings",
-    "Failed to update keywords": "Failed to update keywords",
-    "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
-    "Notify for all other messages/rooms": "Notify for all other messages/rooms",
-    "Notify me for anything else": "Notify me for anything else",
-    "Enable notifications for this account": "Enable notifications for this account",
-    "Clear notifications": "Clear notifications",
-    "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
-    "Add an email address to configure email notifications": "Add an email address to configure email notifications",
-    "Enable email notifications": "Enable email notifications",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
-    "Unable to fetch notification target list": "Unable to fetch notification target list",
-    "Notification targets": "Notification targets",
-    "Advanced notification settings": "Advanced notification settings",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
-    "Enable desktop notifications for this device": "Enable desktop notifications for this device",
-    "Show message in desktop notification": "Show message in desktop notification",
-    "Enable audible notifications for this device": "Enable audible notifications for this device",
-    "Off": "Off",
-    "On": "On",
-    "Noisy": "Noisy",
-    "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> to your own domain",
-    "Display Name": "Display Name",
-    "Profile picture": "Profile picture",
-    "Save": "Save",
-    "Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)",
-    "Could not connect to Identity Server": "Could not connect to Identity Server",
-    "Checking server": "Checking server",
-    "Change identity server": "Change identity server",
-    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Disconnect from the identity server <current /> and connect to <new /> instead?",
-    "Terms of service not accepted or the identity server is invalid.": "Terms of service not accepted or the identity server is invalid.",
-    "The identity server you have chosen does not have any terms of service.": "The identity server you have chosen does not have any terms of service.",
-    "Disconnect identity server": "Disconnect identity server",
-    "Disconnect from the identity server <idserver />?": "Disconnect from the identity server <idserver />?",
-    "Disconnect": "Disconnect",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.",
-    "You should:": "You should:",
-    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "check your browser plugins for anything that might block the identity server (such as Privacy Badger)",
-    "contact the administrators of identity server <idserver />": "contact the administrators of identity server <idserver />",
-    "wait and try again later": "wait and try again later",
-    "Disconnect anyway": "Disconnect anyway",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "You are still <b>sharing your personal data</b> on the identity server <idserver />.",
-    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
-    "Go back": "Go back",
-    "Identity Server (%(server)s)": "Identity Server (%(server)s)",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
-    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
-    "Identity Server": "Identity Server",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.",
-    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.",
-    "Do not use an identity server": "Do not use an identity server",
-    "Enter a new identity server": "Enter a new identity server",
-    "Change": "Change",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
-    "Manage integrations": "Manage integrations",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
-    "Flair": "Flair",
-    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
-    "Success": "Success",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
-    "Profile": "Profile",
-    "Email addresses": "Email addresses",
-    "Phone numbers": "Phone numbers",
-    "Account": "Account",
-    "Set a new account password...": "Set a new account password...",
-    "Language and region": "Language and region",
-    "Theme": "Theme",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",
-    "Account management": "Account management",
-    "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
-    "Deactivate Account": "Deactivate Account",
-    "Warning": "Warning",
-    "General": "General",
-    "Discovery": "Discovery",
-    "Deactivate account": "Deactivate account",
-    "Legal": "Legal",
-    "Credits": "Credits",
-    "For help with using Riot, click <a>here</a>.": "For help with using Riot, click <a>here</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.",
-    "Chat with Riot Bot": "Chat with Riot Bot",
-    "Check for update": "Check for update",
-    "Help & About": "Help & About",
-    "Bug reporting": "Bug reporting",
-    "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.": "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.",
-    "Submit debug logs": "Submit debug logs",
-    "Clear cache and reload": "Clear cache and reload",
-    "FAQ": "FAQ",
-    "Versions": "Versions",
-    "matrix-react-sdk version:": "matrix-react-sdk version:",
-    "riot-web version:": "riot-web version:",
-    "olm version:": "olm version:",
-    "Homeserver is": "Homeserver is",
-    "Identity Server is": "Identity Server is",
-    "Access Token:": "Access Token:",
-    "click to reveal": "click to reveal",
-    "Labs": "Labs",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Customise your experience with experimental labs features. <a>Learn more</a>.",
-    "Ignored/Blocked": "Ignored/Blocked",
-    "Error adding ignored user/server": "Error adding ignored user/server",
-    "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",
-    "Error subscribing to list": "Error subscribing to list",
-    "Please verify the room ID or alias and try again.": "Please verify the room ID or alias and try again.",
-    "Error removing ignored user/server": "Error removing ignored user/server",
-    "Error unsubscribing from list": "Error unsubscribing from list",
-    "Please try again or view your console for hints.": "Please try again or view your console for hints.",
-    "None": "None",
-    "Ban list rules - %(roomName)s": "Ban list rules - %(roomName)s",
-    "Server rules": "Server rules",
-    "User rules": "User rules",
-    "Close": "Close",
-    "You have not ignored anyone.": "You have not ignored anyone.",
-    "You are currently ignoring:": "You are currently ignoring:",
-    "You are not subscribed to any lists": "You are not subscribed to any lists",
-    "Unsubscribe": "Unsubscribe",
-    "View rules": "View rules",
-    "You are currently subscribed to:": "You are currently subscribed to:",
-    "Ignored users": "Ignored users",
-    "⚠ These settings are meant for advanced users.": "⚠ These settings are meant for advanced users.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.",
-    "Personal ban list": "Personal ban list",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.",
-    "Server or user ID to ignore": "Server or user ID to ignore",
-    "eg: @bot:* or example.org": "eg: @bot:* or example.org",
-    "Ignore": "Ignore",
-    "Subscribed lists": "Subscribed lists",
-    "Subscribing to a ban list will cause you to join it!": "Subscribing to a ban list will cause you to join it!",
-    "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
-    "Room ID or alias of ban list": "Room ID or alias of ban list",
-    "Subscribe": "Subscribe",
-    "Notifications": "Notifications",
-    "Start automatically after system login": "Start automatically after system login",
-    "Always show the window menu bar": "Always show the window menu bar",
-    "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
-    "Preferences": "Preferences",
-    "Composer": "Composer",
-    "Timeline": "Timeline",
-    "Room list": "Room list",
-    "Autocomplete delay (ms)": "Autocomplete delay (ms)",
-    "Read Marker lifetime (ms)": "Read Marker lifetime (ms)",
-    "Read Marker off-screen lifetime (ms)": "Read Marker off-screen lifetime (ms)",
-    "Unignore": "Unignore",
-    "<not supported>": "<not supported>",
-    "Import E2E room keys": "Import E2E room keys",
-    "Cryptography": "Cryptography",
-    "Device ID:": "Device ID:",
-    "Device key:": "Device key:",
-    "Bulk options": "Bulk options",
-    "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
-    "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
-    "Key backup": "Key backup",
-    "Cross-signing": "Cross-signing",
-    "Security & Privacy": "Security & Privacy",
-    "Devices": "Devices",
-    "A device's public name is visible to people you communicate with": "A device's public name is visible to people you communicate with",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "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.": "Learn more about how we use analytics.",
-    "No media permissions": "No media permissions",
-    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
-    "Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
-    "Request media permissions": "Request media permissions",
-    "No Audio Outputs detected": "No Audio Outputs detected",
-    "No Microphones detected": "No Microphones detected",
-    "No Webcams detected": "No Webcams detected",
-    "Default Device": "Default Device",
-    "Audio Output": "Audio Output",
-    "Microphone": "Microphone",
-    "Camera": "Camera",
-    "Voice & Video": "Voice & Video",
-    "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
-    "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
-    "this room": "this room",
-    "View older messages in %(roomName)s.": "View older messages in %(roomName)s.",
-    "Room information": "Room information",
-    "Internal room ID:": "Internal room ID:",
-    "Room version": "Room version",
-    "Room version:": "Room version:",
-    "Developer options": "Developer options",
-    "Open Devtools": "Open Devtools",
-    "This bridge was provisioned by <user />": "This bridge was provisioned by <user />",
-    "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridged into <channelLink /> <networkLink />, on <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Connected via %(protocolName)s",
-    "Bridge Info": "Bridge Info",
-    "Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",
-    "Room Addresses": "Room Addresses",
-    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
-    "URL Previews": "URL Previews",
-    "Uploaded sound": "Uploaded sound",
-    "Sounds": "Sounds",
-    "Notification sound": "Notification sound",
-    "Reset": "Reset",
-    "Set a new custom sound": "Set a new custom sound",
-    "Browse": "Browse",
-    "Change room avatar": "Change room avatar",
-    "Change room name": "Change room name",
-    "Change main address for the room": "Change main address for the room",
-    "Change history visibility": "Change history visibility",
-    "Change permissions": "Change permissions",
-    "Change topic": "Change topic",
-    "Upgrade the room": "Upgrade the room",
-    "Enable room encryption": "Enable room encryption",
-    "Modify widgets": "Modify widgets",
-    "Failed to unban": "Failed to unban",
-    "Unban": "Unban",
-    "Banned by %(displayName)s": "Banned by %(displayName)s",
-    "Error changing power level requirement": "Error changing power level requirement",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.",
-    "Error changing power level": "Error changing power level",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.",
-    "Default role": "Default role",
-    "Send messages": "Send messages",
-    "Invite users": "Invite users",
-    "Change settings": "Change settings",
-    "Kick users": "Kick users",
-    "Ban users": "Ban users",
-    "Remove messages": "Remove messages",
-    "Notify everyone": "Notify everyone",
-    "No users have specific privileges in this room": "No users have specific privileges in this room",
-    "Privileged Users": "Privileged Users",
-    "Muted Users": "Muted Users",
-    "Banned users": "Banned users",
-    "Send %(eventType)s events": "Send %(eventType)s events",
-    "Roles & Permissions": "Roles & Permissions",
-    "Permissions": "Permissions",
-    "Select the roles required to change various parts of the room": "Select the roles required to change various parts of the room",
-    "Enable encryption?": "Enable encryption?",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
-    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
-    "Click here to fix": "Click here to fix",
-    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
-    "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",
-    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
-    "Anyone": "Anyone",
-    "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
-    "Members only (since they were invited)": "Members only (since they were invited)",
-    "Members only (since they joined)": "Members only (since they joined)",
-    "Encryption": "Encryption",
-    "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
-    "Encrypted": "Encrypted",
-    "Who can access this room?": "Who can access this room?",
-    "Who can read history?": "Who can read history?",
-    "Unable to revoke sharing for email address": "Unable to revoke sharing for email address",
-    "Unable to share email address": "Unable to share email address",
-    "Your email address hasn't been verified yet": "Your email address hasn't been verified yet",
-    "Click the link in the email you received to verify and then click continue again.": "Click the link in the email you received to verify and then click continue again.",
-    "Unable to verify email address.": "Unable to verify email address.",
-    "Verify the link in your inbox": "Verify the link in your inbox",
-    "Complete": "Complete",
-    "Revoke": "Revoke",
-    "Share": "Share",
-    "Discovery options will appear once you have added an email above.": "Discovery options will appear once you have added an email above.",
-    "Unable to revoke sharing for phone number": "Unable to revoke sharing for phone number",
-    "Unable to share phone number": "Unable to share phone number",
-    "Unable to verify phone number.": "Unable to verify phone number.",
-    "Incorrect verification code": "Incorrect verification code",
-    "Please enter verification code sent via text.": "Please enter verification code sent via text.",
-    "Verification code": "Verification code",
-    "Discovery options will appear once you have added a phone number above.": "Discovery options will appear once you have added a phone number above.",
-    "Unable to remove contact information": "Unable to remove contact information",
-    "Remove %(email)s?": "Remove %(email)s?",
-    "Invalid Email Address": "Invalid Email Address",
-    "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
-    "Unable to add email address": "Unable to add email address",
-    "Add": "Add",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.",
-    "Email Address": "Email Address",
-    "Remove %(phone)s?": "Remove %(phone)s?",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.",
-    "Phone Number": "Phone Number",
-    "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",
-    "Drop File Here": "Drop File Here",
-    "Drop file here to upload": "Drop file here to upload",
-    " (unsupported)": " (unsupported)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
-    "This user has not verified all of their devices.": "This user has not verified all of their devices.",
-    "You have not verified this user. This user has verified all of their devices.": "You have not verified this user. This user has verified all of their devices.",
-    "You have verified this user. This user has verified all of their devices.": "You have verified this user. This user has verified all of their devices.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Some users in this encrypted room are not verified by you or they have not verified their own devices.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "All users in this encrypted room are verified by you and they have verified their own devices.",
-    "Some devices for this user are not trusted": "Some devices for this user are not trusted",
-    "All devices for this user are trusted": "All devices for this user are trusted",
-    "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",
-    "All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted",
-    "Edit message": "Edit message",
-    "This event could not be displayed": "This event could not be displayed",
-    "%(senderName)s sent an image": "%(senderName)s sent an image",
-    "%(senderName)s sent a video": "%(senderName)s sent a video",
-    "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
-    "Your key share request has been sent - please check your other devices for key share requests.": "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.": "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.": "If your other devices do not have the key for this message you will not be able to decrypt them.",
-    "Key request sent.": "Key request sent.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
-    "This message cannot be decrypted": "This message cannot be decrypted",
-    "Encrypted by an unverified device": "Encrypted by an unverified device",
-    "Unencrypted": "Unencrypted",
-    "Please select the destination room for this message": "Please select the destination room for this message",
-    "Scroll to bottom of page": "Scroll to bottom of page",
-    "Close preview": "Close preview",
-    "device id: ": "device id: ",
-    "Disinvite": "Disinvite",
-    "Kick": "Kick",
-    "Disinvite this user?": "Disinvite this user?",
-    "Kick this user?": "Kick this user?",
-    "Failed to kick": "Failed to kick",
-    "Ban": "Ban",
-    "Unban this user?": "Unban this user?",
-    "Ban this user?": "Ban this user?",
-    "Failed to ban user": "Failed to ban user",
-    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
-    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "You are about to remove 1 message by %(user)s. This cannot be undone. Do you wish to continue?",
-    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
-    "Remove %(count)s messages|other": "Remove %(count)s messages",
-    "Remove %(count)s messages|one": "Remove 1 message",
-    "Demote yourself?": "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.": "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": "Demote",
-    "Failed to mute user": "Failed to mute user",
-    "Failed to toggle moderator status": "Failed to toggle moderator status",
-    "Deactivate user?": "Deactivate user?",
-    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
-    "Deactivate user": "Deactivate user",
-    "Failed to deactivate user": "Failed to deactivate user",
-    "Failed to change power level": "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.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
-    "Are you sure?": "Are you sure?",
-    "No devices with registered encryption keys": "No devices with registered encryption keys",
-    "Jump to read receipt": "Jump to read receipt",
-    "Mention": "Mention",
-    "Invite": "Invite",
-    "Share Link to User": "Share Link to User",
-    "User Options": "User Options",
-    "Direct chats": "Direct chats",
-    "Remove recent messages": "Remove recent messages",
-    "Unmute": "Unmute",
-    "Mute": "Mute",
-    "Revoke Moderator": "Revoke Moderator",
-    "Make Moderator": "Make Moderator",
-    "Admin Tools": "Admin Tools",
-    "and %(count)s others...|other": "and %(count)s others...",
-    "and %(count)s others...|one": "and one other...",
-    "Invite to this room": "Invite to this room",
-    "Invited": "Invited",
-    "Filter room members": "Filter room members",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
-    "Voice call": "Voice call",
-    "Video call": "Video call",
-    "Hangup": "Hangup",
-    "Upload file": "Upload file",
-    "Send an encrypted reply…": "Send an encrypted reply…",
-    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
-    "Send an encrypted message…": "Send an encrypted message…",
-    "Send a message (unencrypted)…": "Send a message (unencrypted)…",
-    "The conversation continues here.": "The conversation continues here.",
-    "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
-    "You do not have permission to post to this room": "You do not have permission to post to this room",
-    "Bold": "Bold",
-    "Italics": "Italics",
-    "Strikethrough": "Strikethrough",
-    "Code block": "Code block",
-    "Quote": "Quote",
-    "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",
-    "%(duration)sd": "%(duration)sd",
-    "Online for %(duration)s": "Online for %(duration)s",
-    "Idle for %(duration)s": "Idle for %(duration)s",
-    "Offline for %(duration)s": "Offline for %(duration)s",
-    "Unknown for %(duration)s": "Unknown for %(duration)s",
-    "Online": "Online",
-    "Idle": "Idle",
-    "Offline": "Offline",
-    "Unknown": "Unknown",
-    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-    "Replying": "Replying",
-    "Direct Chat": "Direct Chat",
-    "Room %(name)s": "Room %(name)s",
-    "Recent rooms": "Recent rooms",
-    "No rooms to show": "No rooms to show",
-    "Unnamed room": "Unnamed room",
-    "World readable": "World readable",
-    "Guests can join": "Guests can join",
-    "(~%(count)s results)|other": "(~%(count)s results)",
-    "(~%(count)s results)|one": "(~%(count)s result)",
-    "Join Room": "Join Room",
-    "Settings": "Settings",
-    "Forget room": "Forget room",
-    "Search": "Search",
-    "Share room": "Share room",
-    "Community Invites": "Community Invites",
-    "Invites": "Invites",
-    "Favourites": "Favourites",
-    "People": "People",
-    "Start chat": "Start chat",
-    "Rooms": "Rooms",
-    "Low priority": "Low priority",
-    "Historical": "Historical",
-    "System Alerts": "System Alerts",
-    "This room": "This room",
-    "Joining room …": "Joining room …",
-    "Loading …": "Loading …",
-    "Rejecting invite …": "Rejecting invite …",
-    "Join the conversation with an account": "Join the conversation with an account",
-    "Sign Up": "Sign Up",
-    "Sign In": "Sign In",
-    "Loading room preview": "Loading room preview",
-    "You were kicked from %(roomName)s by %(memberName)s": "You were kicked from %(roomName)s by %(memberName)s",
-    "Reason: %(reason)s": "Reason: %(reason)s",
-    "Forget this room": "Forget this room",
-    "Re-join": "Re-join",
-    "You were banned from %(roomName)s by %(memberName)s": "You were banned from %(roomName)s by %(memberName)s",
-    "Something went wrong with your invite to %(roomName)s": "Something went wrong with your invite to %(roomName)s",
-    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.",
-    "unknown error code": "unknown error code",
-    "You can only join it with a working invite.": "You can only join it with a working invite.",
-    "Try to join anyway": "Try to join anyway",
-    "You can still join it because this is a public room.": "You can still join it because this is a public room.",
-    "Join the discussion": "Join the discussion",
-    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "This invite to %(roomName)s was sent to %(email)s which is not associated with your account",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Link this email with your account in Settings to receive invites directly in Riot.",
-    "This invite to %(roomName)s was sent to %(email)s": "This invite to %(roomName)s was sent to %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Use an identity server in Settings to receive invites directly in Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Share this email in Settings to receive invites directly in Riot.",
-    "Do you want to chat with %(user)s?": "Do you want to chat with %(user)s?",
-    "<userName/> wants to chat": "<userName/> wants to chat",
-    "Start chatting": "Start chatting",
-    "Do you want to join %(roomName)s?": "Do you want to join %(roomName)s?",
-    "<userName/> invited you": "<userName/> invited you",
-    "Reject": "Reject",
-    "You're previewing %(roomName)s. Want to join it?": "You're previewing %(roomName)s. Want to join it?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",
-    "%(roomName)s does not exist.": "%(roomName)s does not exist.",
-    "This room doesn't exist. Are you sure you're at the right place?": "This room doesn't exist. Are you sure you're at the right place?",
-    "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
-    "Try again later, or ask a room admin to check if you have access.": "Try again later, or ask a room admin to check if you have access.",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.",
-    "Never lose encrypted messages": "Never lose encrypted messages",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
-    "Not now": "Not now",
-    "Don't ask me again": "Don't ask me again",
-    "Options": "Options",
-    "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
-    "%(count)s unread messages including mentions.|one": "1 unread mention.",
-    "%(count)s unread messages.|other": "%(count)s unread messages.",
-    "%(count)s unread messages.|one": "1 unread message.",
-    "Unread mentions.": "Unread mentions.",
-    "Unread messages.": "Unread messages.",
-    "Add a topic": "Add a topic",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
-    "This room has already been upgraded.": "This room has already been upgraded.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.",
-    "Only room administrators will see this warning": "Only room administrators will see this warning",
-    "This Room": "This Room",
-    "All Rooms": "All Rooms",
-    "Search…": "Search…",
-    "Server error": "Server error",
-    "Command error": "Command error",
-    "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
-    "Failed to connect to integration manager": "Failed to connect to integration manager",
-    "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
-    "Add some now": "Add some now",
-    "Stickerpack": "Stickerpack",
-    "Hide Stickers": "Hide Stickers",
-    "Show Stickers": "Show Stickers",
-    "Failed to revoke invite": "Failed to revoke invite",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.",
-    "Revoke invite": "Revoke invite",
-    "Invited by %(sender)s": "Invited by %(sender)s",
-    "Jump to first unread message.": "Jump to first unread message.",
-    "Error updating main address": "Error updating main address",
-    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
-    "Error creating alias": "Error creating alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "Error removing alias": "Error removing alias",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
-    "Main address": "Main address",
-    "not specified": "not specified",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "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)",
-    "Error updating flair": "Error updating flair",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "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)",
-    "Room Name": "Room Name",
-    "Room Topic": "Room Topic",
-    "Room avatar": "Room avatar",
-    "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.",
-    "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.",
-    "Verify User": "Verify User",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
-    "For maximum security, do this in person.": "For maximum security, do this in person.",
-    "Start Verification": "Start Verification",
-    "Members": "Members",
-    "Files": "Files",
-    "Trusted": "Trusted",
-    "Not trusted": "Not trusted",
-    "Hide verified sessions": "Hide verified sessions",
-    "%(count)s verified sessions|other": "%(count)s verified sessions",
-    "%(count)s verified sessions|one": "1 verified session",
-    "Direct message": "Direct message",
-    "Remove from community": "Remove from community",
-    "Disinvite this user from community?": "Disinvite this user from community?",
-    "Remove this user from community?": "Remove this user from community?",
-    "Failed to withdraw invitation": "Failed to withdraw invitation",
-    "Failed to remove user from community": "Failed to remove user from community",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
-    "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
-    "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
-    "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
-    "Security": "Security",
-    "Sunday": "Sunday",
-    "Monday": "Monday",
-    "Tuesday": "Tuesday",
-    "Wednesday": "Wednesday",
-    "Thursday": "Thursday",
-    "Friday": "Friday",
-    "Saturday": "Saturday",
-    "Today": "Today",
-    "Yesterday": "Yesterday",
-    "View Source": "View Source",
-    "Error decrypting audio": "Error decrypting audio",
-    "React": "React",
-    "Reply": "Reply",
-    "Edit": "Edit",
-    "Message Actions": "Message Actions",
-    "Attachment": "Attachment",
-    "Error decrypting attachment": "Error decrypting attachment",
-    "Decrypt %(text)s": "Decrypt %(text)s",
-    "Download %(text)s": "Download %(text)s",
-    "Invalid file%(extra)s": "Invalid file%(extra)s",
-    "Error decrypting image": "Error decrypting image",
-    "Show image": "Show image",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "You have ignored this user, so their message is hidden. <a>Show anyways.</a>",
-    "You verified %(name)s": "You verified %(name)s",
-    "You cancelled verifying %(name)s": "You cancelled verifying %(name)s",
-    "%(name)s cancelled verifying": "%(name)s cancelled verifying",
-    "You accepted": "You accepted",
-    "%(name)s accepted": "%(name)s accepted",
-    "You cancelled": "You cancelled",
-    "%(name)s cancelled": "%(name)s cancelled",
-    "%(name)s wants to verify": "%(name)s wants to verify",
-    "You sent a verification request": "You sent a verification request",
-    "Error decrypting video": "Error decrypting video",
-    "Show all": "Show all",
-    "Reactions": "Reactions",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
-    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
-    "Click here to see older messages.": "Click here to see older messages.",
-    "Copied!": "Copied!",
-    "Failed to copy": "Failed to copy",
-    "Add an Integration": "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?": "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?",
-    "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
-    "edited": "edited",
-    "Removed or unknown message type": "Removed or unknown message type",
-    "Message removed by %(userId)s": "Message removed by %(userId)s",
-    "Message removed": "Message removed",
-    "Failed to load group members": "Failed to load group members",
-    "Filter community members": "Filter community members",
-    "Invite to this community": "Invite to this community",
-    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Are you sure you want to remove '%(roomName)s' from %(groupId)s?",
-    "Removing a room from the community will also remove it from the community page.": "Removing a room from the community will also remove it from the community page.",
-    "Failed to remove room from community": "Failed to remove room from community",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Failed to remove '%(roomName)s' from %(groupId)s",
-    "Something went wrong!": "Something went wrong!",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "The visibility of '%(roomName)s' in %(groupId)s could not be updated.",
-    "Visibility in Room List": "Visibility in Room List",
-    "Visible to everyone": "Visible to everyone",
-    "Only visible to community members": "Only visible to community members",
-    "Add rooms to this community": "Add rooms to this community",
-    "Filter community rooms": "Filter community rooms",
-    "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
-    "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
-    "You're not currently a member of any communities.": "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>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
-    "Yes, I want to help!": "Yes, I want to help!",
-    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-    "Enable them now": "Enable them now",
-    "What's New": "What's New",
-    "Update": "Update",
-    "What's new?": "What's new?",
-    "A new version of Riot is available.": "A new version of Riot is available.",
-    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
-    "Set Password": "Set Password",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Please <a>contact your service administrator</a> to get this limit increased.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.",
-    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
-    "Checking for an update...": "Checking for an update...",
-    "No update available.": "No update available.",
-    "Downloading update...": "Downloading update...",
-    "Frequently Used": "Frequently Used",
-    "Smileys & People": "Smileys & People",
-    "Animals & Nature": "Animals & Nature",
-    "Food & Drink": "Food & Drink",
-    "Activities": "Activities",
-    "Travel & Places": "Travel & Places",
-    "Objects": "Objects",
-    "Symbols": "Symbols",
-    "Flags": "Flags",
-    "Quick Reactions": "Quick Reactions",
-    "Cancel search": "Cancel search",
-    "Unknown Address": "Unknown Address",
-    "Any of the following data may be shared:": "Any of the following data may be shared:",
-    "Your display name": "Your display name",
-    "Your avatar URL": "Your avatar URL",
-    "Your user ID": "Your user ID",
-    "Your theme": "Your theme",
-    "Riot URL": "Riot URL",
-    "Room ID": "Room ID",
-    "Widget ID": "Widget ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s.",
-    "Widgets do not use message encryption.": "Widgets do not use message encryption.",
-    "Widget added by": "Widget added by",
-    "This widget may use cookies.": "This widget may use cookies.",
-    "Delete Widget": "Delete Widget",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
-    "Delete widget": "Delete widget",
-    "Failed to remove widget": "Failed to remove widget",
-    "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
-    "Minimize apps": "Minimize apps",
-    "Maximize apps": "Maximize apps",
-    "Popout widget": "Popout widget",
-    "More options": "More options",
-    "Create new room": "Create new room",
-    "Unblacklist": "Unblacklist",
-    "Blacklist": "Blacklist",
-    "Unverify": "Unverify",
-    "Verify...": "Verify...",
-    "Join": "Join",
-    "No results": "No results",
-    "Yes": "Yes",
-    "No": "No",
-    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
-    "collapse": "collapse",
-    "expand": "expand",
-    "Communities": "Communities",
-    "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
-    "Rotate Left": "Rotate Left",
-    "Rotate counter-clockwise": "Rotate counter-clockwise",
-    "Rotate Right": "Rotate Right",
-    "Rotate clockwise": "Rotate clockwise",
-    "Download this file": "Download this file",
-    "Language Dropdown": "Language Dropdown",
-    "Manage Integrations": "Manage Integrations",
-    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sjoined",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sjoined %(count)s times",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sjoined",
-    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sleft %(count)s times",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sleft",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sleft %(count)s times",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sleft",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sjoined and left %(count)s times",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sjoined and left",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sjoined and left %(count)s times",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sjoined and left",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sleft and rejoined %(count)s times",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sleft and rejoined",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sleft and rejoined %(count)s times",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sleft and rejoined",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)srejected their invitations %(count)s times",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srejected their invitations",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)srejected their invitation %(count)s times",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)srejected their invitation",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)shad their invitations withdrawn %(count)s times",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)shad their invitations withdrawn",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)shad their invitation withdrawn %(count)s times",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)shad their invitation withdrawn",
-    "were invited %(count)s times|other": "were invited %(count)s times",
-    "were invited %(count)s times|one": "were invited",
-    "was invited %(count)s times|other": "was invited %(count)s times",
-    "was invited %(count)s times|one": "was invited",
-    "were banned %(count)s times|other": "were banned %(count)s times",
-    "were banned %(count)s times|one": "were banned",
-    "was banned %(count)s times|other": "was banned %(count)s times",
-    "was banned %(count)s times|one": "was banned",
-    "were unbanned %(count)s times|other": "were unbanned %(count)s times",
-    "were unbanned %(count)s times|one": "were unbanned",
-    "was unbanned %(count)s times|other": "was unbanned %(count)s times",
-    "was unbanned %(count)s times|one": "was unbanned",
-    "were kicked %(count)s times|other": "were kicked %(count)s times",
-    "were kicked %(count)s times|one": "were kicked",
-    "was kicked %(count)s times|other": "was kicked %(count)s times",
-    "was kicked %(count)s times|one": "was kicked",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)schanged their name %(count)s times",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)schanged their name",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)schanged their name %(count)s times",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)schanged their name",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)schanged their avatar %(count)s times",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)schanged their avatar",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)schanged their avatar %(count)s times",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)schanged their avatar",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)smade no changes %(count)s times",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)smade no changes",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)smade no changes %(count)s times",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
-    "Power level": "Power level",
-    "Custom level": "Custom level",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
-    "Room alias": "Room alias",
-    "e.g. my-room": "e.g. my-room",
-    "Some characters not allowed": "Some characters not allowed",
-    "Please provide a room alias": "Please provide a room alias",
-    "This alias is available to use": "This alias is available to use",
-    "This alias is already in use": "This alias is already in use",
-    "Room directory": "Room directory",
-    "And %(count)s more...|other": "And %(count)s more...",
-    "ex. @bob:example.com": "ex. @bob:example.com",
-    "Add User": "Add User",
-    "Matrix ID": "Matrix ID",
-    "Matrix Room ID": "Matrix Room ID",
-    "email address": "email address",
-    "That doesn't look like a valid email address": "That doesn't look like a valid email address",
-    "You have entered an invalid address.": "You have entered an invalid address.",
-    "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use an identity server to invite by email. Manage in <settings>Settings</settings>.",
-    "The following users may not exist": "The following users may not exist",
-    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
-    "Invite anyway and never warn me again": "Invite anyway and never warn me again",
-    "Invite anyway": "Invite anyway",
-    "Close dialog": "Close dialog",
-    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
-    "Preparing to send logs": "Preparing to send logs",
-    "Logs sent": "Logs sent",
-    "Thank you!": "Thank you!",
-    "Failed to send logs: ": "Failed to send logs: ",
-    "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.": "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.",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
-    "GitHub issue": "GitHub issue",
-    "Notes": "Notes",
-    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.",
-    "Send logs": "Send logs",
-    "Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
-    "Unavailable": "Unavailable",
-    "Changelog": "Changelog",
-    "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
-    "Removing…": "Removing…",
-    "Confirm Removal": "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.": "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.",
-    "Clear all data on this device?": "Clear all data on this device?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.",
-    "Clear all data": "Clear all data",
-    "Community IDs cannot be empty.": "Community IDs cannot be empty.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
-    "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
-    "Create Community": "Create Community",
-    "Community Name": "Community Name",
-    "Example": "Example",
-    "Community ID": "Community ID",
-    "example": "example",
-    "Create": "Create",
-    "Please enter a name for the room": "Please enter a name for the room",
-    "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
-    "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
-    "Create a public room": "Create a public room",
-    "Create a private room": "Create a private room",
-    "Name": "Name",
-    "Topic (optional)": "Topic (optional)",
-    "Make this room public": "Make this room public",
-    "Hide advanced": "Hide advanced",
-    "Show advanced": "Show advanced",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)",
-    "Create Room": "Create Room",
-    "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",
-    "Unknown error": "Unknown error",
-    "Incorrect password": "Incorrect password",
-    "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>": "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>",
-    "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.": "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.",
-    "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.": "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.",
-    "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)": "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)",
-    "To continue, please enter your password:": "To continue, please enter your password:",
-    "Verify device": "Verify device",
-    "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
-    "Verify by comparing a short text string.": "Verify by comparing a short text string.",
-    "Begin Verifying": "Begin Verifying",
-    "Waiting for partner to accept...": "Waiting for partner to accept...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",
-    "Waiting for %(userId)s to confirm...": "Waiting for %(userId)s to confirm...",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:",
-    "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:": "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:",
-    "Use two-way text verification": "Use two-way text verification",
-    "Device name": "Device name",
-    "Device ID": "Device ID",
-    "Device key": "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.": "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.",
-    "I verify that the keys match": "I verify that the keys match",
-    "Back": "Back",
-    "Send Custom Event": "Send Custom Event",
-    "You must specify an event type!": "You must specify an event type!",
-    "Event sent!": "Event sent!",
-    "Failed to send custom event.": "Failed to send custom event.",
-    "Event Type": "Event Type",
-    "State Key": "State Key",
-    "Event Content": "Event Content",
-    "Send Account Data": "Send Account Data",
-    "Filter results": "Filter results",
-    "Explore Room State": "Explore Room State",
-    "Explore Account Data": "Explore Account Data",
-    "View Servers in Room": "View Servers in Room",
-    "Toolbox": "Toolbox",
-    "Developer Tools": "Developer Tools",
-    "An error has occurred.": "An error has occurred.",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
-    "Waiting for partner to confirm...": "Waiting for partner to confirm...",
-    "Incoming Verification Request": "Incoming Verification Request",
-    "Integrations are disabled": "Integrations are disabled",
-    "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
-    "Integrations not allowed": "Integrations not allowed",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
-    "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
-    "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
-    "Failed to find the following users": "Failed to find the following users",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
-    "Recent Conversations": "Recent Conversations",
-    "Suggestions": "Suggestions",
-    "Recently Direct Messaged": "Recently Direct Messaged",
-    "Show more": "Show more",
-    "Direct Messages": "Direct Messages",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
-    "Go": "Go",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
-    "Start verification": "Start verification",
-    "Share without verifying": "Share without verifying",
-    "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",
-    "I don't want my encrypted messages": "I don't want my encrypted messages",
-    "Manually export keys": "Manually export keys",
-    "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
-    "Are you sure you want to sign out?": "Are you sure you want to sign out?",
-    "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
-    "Message edits": "Message edits",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
-    "Report bugs & give feedback": "Report bugs & give feedback",
-    "Please fill why you're reporting.": "Please fill why you're reporting.",
-    "Report Content to Your Homeserver Administrator": "Report Content to Your Homeserver Administrator",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
-    "Send report": "Send report",
-    "Room Settings - %(roomName)s": "Room Settings - %(roomName)s",
-    "Failed to upgrade room": "Failed to upgrade room",
-    "The room upgrade could not be completed": "The room upgrade could not be completed",
-    "Upgrade this room to version %(version)s": "Upgrade this room to version %(version)s",
-    "Upgrade Room Version": "Upgrade Room Version",
-    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:",
-    "Create a new room with the same name, description and avatar": "Create a new room with the same name, description and avatar",
-    "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",
-    "Automatically invite users": "Automatically invite users",
-    "Upgrade private room": "Upgrade private room",
-    "Upgrade public room": "Upgrade public room",
-    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.",
-    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "You'll upgrade this room from <oldVersion /> to <newVersion />.",
-    "Upgrade": "Upgrade",
-    "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
-    "Clear Storage and Sign Out": "Clear Storage and Sign Out",
-    "Send Logs": "Send Logs",
-    "Refresh": "Refresh",
-    "Unable to restore session": "Unable to restore session",
-    "We encountered an error trying to restore your previous 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.": "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.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.",
-    "Verification Pending": "Verification Pending",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
-    "Email address": "Email address",
-    "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
-    "Skip": "Skip",
-    "A username can only contain lower case letters, numbers and '=_-./'": "A username can only contain lower case letters, numbers and '=_-./'",
-    "Username not available": "Username not available",
-    "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
-    "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
-    "Checking...": "Checking...",
-    "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 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 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.",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
-    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
-    "Please set a password!": "Please set a password!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
-    "Share Room": "Share Room",
-    "Link to most recent message": "Link to most recent message",
-    "Share User": "Share User",
-    "Share Community": "Share Community",
-    "Share Room Message": "Share Room Message",
-    "Link to selected message": "Link to selected message",
-    "COPY": "COPY",
-    "Command Help": "Command Help",
-    "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
-    "Missing session data": "Missing session data",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
-    "Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.",
-    "Integration Manager": "Integration Manager",
-    "Find others by phone or email": "Find others by phone or email",
-    "Be found by phone or email": "Be found by phone or email",
-    "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
-    "Terms of Service": "Terms of Service",
-    "To continue you need to accept the terms of this service.": "To continue you need to accept the terms of this service.",
-    "Service": "Service",
-    "Summary": "Summary",
-    "Document": "Document",
-    "Next": "Next",
-    "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",
-    "Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)",
-    "Upload files": "Upload files",
-    "Upload all": "Upload all",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.",
-    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "These files are <b>too large</b> to upload. The file size limit is %(limit)s.",
-    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.",
-    "Upload %(count)s other files|other": "Upload %(count)s other files",
-    "Upload %(count)s other files|one": "Upload %(count)s other file",
-    "Cancel All": "Cancel All",
-    "Upload Error": "Upload Error",
-    "A widget would like to verify your identity": "A widget would like to verify your identity",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
-    "Remember my selection for this widget": "Remember my selection for this widget",
-    "Allow": "Allow",
-    "Deny": "Deny",
-    "Enter secret storage passphrase": "Enter secret storage passphrase",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Unable to access secret storage. Please verify that you entered the correct passphrase.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
-    "Enter secret storage recovery key": "Enter secret storage recovery key",
-    "This looks like a valid recovery key!": "This looks like a valid recovery key!",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct recovery key.",
-    "Not a valid recovery key": "Not a valid recovery key",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Unable to load backup status": "Unable to load backup status",
-    "Recovery Key Mismatch": "Recovery Key Mismatch",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
-    "Incorrect Recovery Passphrase": "Incorrect Recovery Passphrase",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
-    "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",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
-    "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",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
-    "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 key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
-    "Private Chat": "Private Chat",
-    "Public Chat": "Public Chat",
-    "Custom": "Custom",
-    "Alias (optional)": "Alias (optional)",
-    "Reject invitation": "Reject invitation",
-    "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
-    "Unable to reject invite": "Unable to reject invite",
-    "Resend": "Resend",
-    "Resend edit": "Resend edit",
-    "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
-    "Resend removal": "Resend removal",
-    "Cancel Sending": "Cancel Sending",
-    "Forward Message": "Forward Message",
-    "Pin Message": "Pin Message",
-    "View Decrypted Source": "View Decrypted Source",
-    "Unhide Preview": "Unhide Preview",
-    "Share Permalink": "Share Permalink",
-    "Share Message": "Share Message",
-    "Source URL": "Source URL",
-    "Collapse Reply Thread": "Collapse Reply Thread",
-    "End-to-end encryption information": "End-to-end encryption information",
-    "Report Content": "Report Content",
-    "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
-    "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
-    "Notification settings": "Notification settings",
-    "All messages (noisy)": "All messages (noisy)",
-    "All messages": "All messages",
-    "Mentions only": "Mentions only",
-    "Leave": "Leave",
-    "Forget": "Forget",
-    "Favourite": "Favourite",
-    "Low Priority": "Low Priority",
-    "Clear status": "Clear status",
-    "Update status": "Update status",
-    "Set status": "Set status",
-    "Set a new status...": "Set a new status...",
-    "View Community": "View Community",
-    "Hide": "Hide",
-    "Home": "Home",
-    "Sign in": "Sign in",
-    "Help": "Help",
-    "Reload": "Reload",
-    "Take picture": "Take picture",
-    "Remove for everyone": "Remove for everyone",
-    "Remove for me": "Remove for me",
-    "User Status": "User Status",
-    "powered by Matrix": "powered by Matrix",
-    "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
-    "Country Dropdown": "Country Dropdown",
-    "Custom Server Options": "Custom Server Options",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
-    "To continue, please enter your password.": "To continue, please enter your password.",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
-    "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.",
-    "Token incorrect": "Token incorrect",
-    "A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
-    "Please enter the code it contains:": "Please enter the code it contains:",
-    "Code": "Code",
-    "Submit": "Submit",
-    "Start authentication": "Start authentication",
-    "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
-    "Your Modular server": "Your Modular server",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.",
-    "Server Name": "Server Name",
-    "The email field must not be blank.": "The email field must not be blank.",
-    "The username field must not be blank.": "The username field must not be blank.",
-    "The phone number field must not be blank.": "The phone number field must not be blank.",
-    "The password field must not be blank.": "The password field must not be blank.",
-    "Email": "Email",
-    "Username": "Username",
-    "Phone": "Phone",
-    "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
-    "Sign in with": "Sign in with",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
-    "Use an email address to recover your account": "Use an email address to recover your account",
-    "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
-    "Doesn't look like a valid email address": "Doesn't look like a valid email address",
-    "Enter password": "Enter password",
-    "Password is allowed, but unsafe": "Password is allowed, but unsafe",
-    "Nice, strong password!": "Nice, strong password!",
-    "Keep going...": "Keep going...",
-    "Passwords don't match": "Passwords don't match",
-    "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
-    "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
-    "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
-    "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
-    "Enter username": "Enter username",
-    "Email (optional)": "Email (optional)",
-    "Confirm": "Confirm",
-    "Phone (optional)": "Phone (optional)",
-    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
-    "Homeserver URL": "Homeserver URL",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",
-    "Identity Server URL": "Identity Server URL",
-    "Other servers": "Other servers",
-    "Free": "Free",
-    "Join millions for free on the largest public server": "Join millions for free on the largest public server",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium hosting for organisations <a>Learn more</a>",
-    "Find other public servers or use a custom server": "Find other public servers or use a custom server",
-    "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Sign in to your Matrix account on <underlinedServerName />",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
-    "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!",
-    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
-    "Couldn't load page": "Couldn't load page",
-    "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>\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",
-    "Failed to add the following rooms to the summary of %(groupId)s:": "Failed to add the following rooms to the summary of %(groupId)s:",
-    "Add a Room": "Add a Room",
-    "Failed to remove the room from the summary of %(groupId)s": "Failed to remove the room from the summary of %(groupId)s",
-    "The room '%(roomName)s' could not be removed from the summary.": "The room '%(roomName)s' could not be removed from the summary.",
-    "Add users to the community summary": "Add users to the community summary",
-    "Who would you like to add to this summary?": "Who would you like to add to this summary?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Failed to add the following users to the summary of %(groupId)s:",
-    "Add a User": "Add a User",
-    "Failed to remove a user from the summary of %(groupId)s": "Failed to remove a user from the summary of %(groupId)s",
-    "The user '%(displayName)s' could not be removed from the summary.": "The user '%(displayName)s' could not be removed from the summary.",
-    "Failed to upload image": "Failed to upload image",
-    "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 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",
-    "Community Settings": "Community Settings",
-    "Want more than a community? <a>Get your own server</a>": "Want more than a community? <a>Get your own server</a>",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
-    "Featured Rooms:": "Featured Rooms:",
-    "Featured Users:": "Featured Users:",
-    "%(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",
-    "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!": "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!",
-    "Long Description (HTML)": "Long Description (HTML)",
-    "Upload avatar": "Upload avatar",
-    "Description": "Description",
-    "Community %(groupId)s not found": "Community %(groupId)s not found",
-    "This homeserver does not support communities": "This homeserver does not support communities",
-    "Failed to load %(groupId)s": "Failed to load %(groupId)s",
-    "Explore": "Explore",
-    "Filter": "Filter",
-    "Filter rooms…": "Filter rooms…",
-    "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.",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
-    "Failed to leave room": "Failed to leave room",
-    "Can't leave Server Notices room": "Can't leave Server Notices room",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.",
-    "Signed Out": "Signed Out",
-    "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
-    "Terms and Conditions": "Terms and Conditions",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.",
-    "Review terms and conditions": "Review terms and conditions",
-    "Old cryptography data detected": "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.": "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.",
-    "Verification Request": "Verification Request",
-    "Logout": "Logout",
-    "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
-    "Your Communities": "Your Communities",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
-    "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.": "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": "Error whilst fetching joined communities",
-    "Create a new community": "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.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
-    "You have no visible notifications": "You have no visible notifications",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
-    "Riot failed to get the public room list.": "Riot failed to get the public room list.",
-    "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
-    "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
-    "Remove from Directory": "Remove from Directory",
-    "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-    "delete the alias.": "delete the alias.",
-    "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
-    "Unable to join network": "Unable to join network",
-    "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
-    "Room not found": "Room not found",
-    "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
-    "Fetching third party location failed": "Fetching third party location failed",
-    "Unable to look up room ID from server": "Unable to look up room ID from server",
-    "Preview": "Preview",
-    "View": "View",
-    "Find a room…": "Find a room…",
-    "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
-    "Explore rooms": "Explore rooms",
-    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</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.": "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.",
-    "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.": "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.",
-    "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
-    "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Resend message</resendText> or <cancelText>cancel message</cancelText> now.",
-    "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
-    "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
-    "Active call": "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>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
-    "You seem to be uploading files, are you sure you want to quit?": "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?": "You seem to be in a call, are you sure you want to quit?",
-    "Search failed": "Search failed",
-    "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
-    "No more results": "No more results",
-    "Unknown room %(roomId)s": "Unknown room %(roomId)s",
-    "Room": "Room",
-    "Failed to reject invite": "Failed to reject invite",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
-    "Fill screen": "Fill screen",
-    "Click to unmute video": "Click to unmute video",
-    "Click to mute video": "Click to mute video",
-    "Click to unmute audio": "Click to unmute audio",
-    "Click to mute audio": "Click to mute audio",
-    "Clear filter": "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 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.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
-    "Failed to load timeline position": "Failed to load timeline position",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Guest": "Guest",
-    "Your profile": "Your profile",
-    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
-    "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
-    "Could not load user profile": "Could not load user profile",
-    "Complete security": "Complete security",
-    "Verify this session to grant it access to encrypted messages.": "Verify this session to grant it access to encrypted messages.",
-    "Start": "Start",
-    "Session verified": "Session verified",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
-    "Done": "Done",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
-    "Go Back": "Go Back",
-    "Failed to send email": "Failed to send email",
-    "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
-    "A new password must be entered.": "A new password must be entered.",
-    "New passwords must match each other.": "New passwords must match each other.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.",
-    "Your Matrix account on %(serverName)s": "Your Matrix account on %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Your Matrix account on <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "No identity server is configured: add one in server settings to reset your password.",
-    "Sign in instead": "Sign in instead",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",
-    "Send Reset Email": "Send Reset Email",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
-    "I have verified my email address": "I have verified my email address",
-    "Your password has been reset.": "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.": "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": "Return to login screen",
-    "Set a new password": "Set a new password",
-    "Invalid homeserver discovery response": "Invalid homeserver discovery response",
-    "Failed to get autodiscovery configuration from server": "Failed to get autodiscovery configuration from server",
-    "Invalid base_url for m.homeserver": "Invalid base_url for m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver URL does not appear to be a valid Matrix homeserver",
-    "Invalid identity server discovery response": "Invalid identity server discovery response",
-    "Invalid base_url for m.identity_server": "Invalid base_url for m.identity_server",
-    "Identity server URL does not appear to be a valid identity server": "Identity server URL does not appear to be a valid identity server",
-    "General failure": "General failure",
-    "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
-    "This account has been deactivated.": "This account has been deactivated.",
-    "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.",
-    "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
-    "The phone number entered looks invalid": "The phone number entered looks invalid",
-    "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>.",
-    "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",
-    "Create account": "Create account",
-    "Failed to fetch avatar URL": "Failed to fetch avatar URL",
-    "Set a display name:": "Set a display name:",
-    "Upload an avatar:": "Upload an avatar:",
-    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
-    "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
-    "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
-    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
-    "Continue with previous account": "Continue with previous account",
-    "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
-    "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
-    "Registration Successful": "Registration Successful",
-    "Create your account": "Create your account",
-    "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
-    "Failed to re-authenticate": "Failed to re-authenticate",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.",
-    "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
-    "Forgotten your password?": "Forgotten your password?",
-    "Sign in and regain access to your account.": "Sign in and regain access to your account.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
-    "You're signed out": "You're signed out",
-    "Clear personal data": "Clear personal data",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.",
-    "Commands": "Commands",
-    "Command Autocomplete": "Command Autocomplete",
-    "Community Autocomplete": "Community Autocomplete",
-    "Results from DuckDuckGo": "Results from DuckDuckGo",
-    "DuckDuckGo Results": "DuckDuckGo Results",
-    "Emoji": "Emoji",
-    "Emoji Autocomplete": "Emoji Autocomplete",
-    "Notify the whole room": "Notify the whole room",
-    "Room Notification": "Room Notification",
-    "Notification Autocomplete": "Notification Autocomplete",
-    "Room Autocomplete": "Room Autocomplete",
-    "Users": "Users",
-    "User Autocomplete": "User Autocomplete",
-    "unknown device": "unknown device",
-    "NOT verified": "NOT verified",
-    "Blacklisted": "Blacklisted",
-    "verified": "verified",
-    "Verification": "Verification",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
-    "User ID": "User ID",
-    "Curve25519 identity key": "Curve25519 identity key",
-    "none": "none",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
-    "Algorithm": "Algorithm",
-    "unencrypted": "unencrypted",
-    "Decryption error": "Decryption error",
-    "Session ID": "Session ID",
-    "Event information": "Event information",
-    "Sender device information": "Sender device information",
-    "Passphrases must match": "Passphrases must match",
-    "Passphrase must not be empty": "Passphrase must not be empty",
-    "Export room keys": "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.": "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.",
-    "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.": "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": "Enter passphrase",
-    "Confirm passphrase": "Confirm passphrase",
-    "Export": "Export",
-    "Import room keys": "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.": "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.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
-    "File to import": "File to import",
-    "Import": "Import",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
-    "Restore": "Restore",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.",
-    "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.",
-    "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a passphrase...": "Enter a passphrase...",
-    "Set up with a recovery key": "Set up with a recovery key",
-    "That matches!": "That matches!",
-    "That doesn't match.": "That doesn't match.",
-    "Go back to set it again.": "Go back to set it again.",
-    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
-    "Repeat your passphrase...": "Repeat your passphrase...",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "As a safety net, you can use it to restore your access to encrypted messages.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Keep your recovery key somewhere very secure, like a password manager (or a safe).",
-    "Your Recovery Key": "Your Recovery Key",
-    "Copy to clipboard": "Copy to clipboard",
-    "Download": "Download",
-    "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",
-    "Your access to encrypted messages is now protected.": "Your access to encrypted messages is now protected.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
-    "Set up secret storage": "Set up secret storage",
-    "Restore your Key Backup": "Restore your Key Backup",
-    "Migrate from Key Backup": "Migrate from Key Backup",
-    "Secure your encrypted messages with a passphrase": "Secure your encrypted messages with a passphrase",
-    "Confirm your passphrase": "Confirm your passphrase",
-    "Recovery key": "Recovery key",
-    "Keep it safe": "Keep it safe",
-    "Storing secrets...": "Storing secrets...",
-    "Success!": "Success!",
-    "Unable to set up secret storage": "Unable to set up secret storage",
-    "Retry": "Retry",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
-    "Set up with a Recovery Key": "Set up with a Recovery Key",
-    "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.",
-    "As a safety net, you can use it to restore your encrypted message history.": "As a safety net, you can use it to restore your encrypted message history.",
-    "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
-    "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",
-    "Secure your backup with a passphrase": "Secure your backup with a passphrase",
-    "Starting backup...": "Starting backup...",
-    "Create Key Backup": "Create Key Backup",
-    "Unable to create key backup": "Unable to create key backup",
-    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
-    "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
-    "Set up": "Set up",
-    "Don't ask again": "Don't ask again",
-    "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
-    "This device is encrypting history using the new recovery method.": "This device is encrypting history using the new recovery method.",
-    "Go to Settings": "Go to Settings",
-    "Set up Secure Messages": "Set up Secure Messages",
-    "Recovery Method Removed": "Recovery Method Removed",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
-    "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"
-}

From 590ff29e60bac1283c15c512a7afc5089e60de94 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 13:15:57 +0000
Subject: [PATCH 0675/3235] Unused import

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

diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.js
index 63b856a882..b7b81688e1 100644
--- a/src/AsyncWrapper.js
+++ b/src/AsyncWrapper.js
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import createReactClass from 'create-react-class';
-import Analytics from './Analytics';
 import * as sdk from './index';
 import PropTypes from 'prop-types';
 import { _t } from './languageHandler';

From 66768416a628c10c0c80ecc7e0099c36e9b8a89b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 Jan 2020 14:20:48 +0100
Subject: [PATCH 0676/3235] dont assume the room exist ... not sure why though

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

diff --git a/src/utils/KeyVerificationStateObserver.js b/src/utils/KeyVerificationStateObserver.js
index 7da532109c..a29d2ea1aa 100644
--- a/src/utils/KeyVerificationStateObserver.js
+++ b/src/utils/KeyVerificationStateObserver.js
@@ -20,7 +20,7 @@ import { _t } from '../languageHandler';
 export function getNameForEventRoom(userId, roomId) {
     const client = MatrixClientPeg.get();
     const room = client.getRoom(roomId);
-    const member = room.getMember(userId);
+    const member = room && room.getMember(userId);
     return member ? member.name : userId;
 }
 

From 3534cd42023882785cc83c6222a1e478302f8131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 14:23:43 +0100
Subject: [PATCH 0677/3235] FilePanel: Add comments to explain what's going on
 with the event index.

---
 src/components/structures/FilePanel.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index e03c587e61..4c02f925fc 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -30,6 +30,8 @@ import { _t } from '../../languageHandler';
  */
 const FilePanel = createReactClass({
     displayName: 'FilePanel',
+    // This is used to track if a decrypted event was a live event and should be
+    // added to the timeline.
     decryptingEvents: new Set(),
 
     propTypes: {
@@ -84,6 +86,14 @@ const FilePanel = createReactClass({
 
         if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
 
+        // The timelineSets filter makes sure that encrypted events that contain
+        // URLs never get added to the timeline, even if they are live events.
+        // These methods are here to manually listen for such events and add
+        // them despite the filter's best efforts.
+        //
+        // We do this only for encrypted rooms and if an event index exists,
+        // this could be made more general in the future or the filter logic
+        // could be fixed.
         if (EventIndexPeg.get() !== null) {
             client.on('Room.timeline', this.onRoomTimeline.bind(this));
             client.on('Event.decrypted', this.onEventDecrypted.bind(this));
@@ -133,6 +143,10 @@ const FilePanel = createReactClass({
 
         const room = client.getRoom(roomId);
 
+        // We override the pagination request for encrypted rooms so that we ask
+        // the event index to fulfill the pagination request. Asking the server
+        // to paginate won't ever work since the server can't correctly filter
+        // out events containing URLs
         if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
             return eventIndex.paginateTimelineWindow(room, timelineWindow, direction, limit);
         } else {
@@ -153,6 +167,15 @@ const FilePanel = createReactClass({
             try {
                 timelineSet = await this.fetchFileEventsServer(room);
 
+                // If this room is encrypted the file panel won't be populated
+                // correctly since the defined filter doesn't support encrypted
+                // events and the server can't check if encrypted events contain
+                // URLs.
+                //
+                // This is where our event index comes into place, we ask the
+                // event index to populate the timelineSet for us. This call
+                // will add 10 events to the live timeline of the set. More can
+                // be requested using pagination.
                 if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
                     const timeline = timelineSet.getLiveTimeline();
                     await eventIndex.populateFileTimeline(timelineSet, timeline, room, 10);

From 37f289b120ff23752204fd6a98b47b79b648df67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 14:24:25 +0100
Subject: [PATCH 0678/3235] EventIndex: Add docstrings for the FilePanel
 methods.

---
 src/indexing/EventIndex.js | 72 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 2b432ab1a1..b6e29c455d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -407,6 +407,27 @@ export default class EventIndex {
         return indexManager.searchEventIndex(searchArgs);
     }
 
+    /**
+     * Load events that contain URLs from the event index.
+     *
+     * @param {Room} room The room for which we should fetch events containing
+     * URLs
+     *
+     * @param {number} limit The maximum number of events to fetch.
+     *
+     * @param {string} fromEvent From which event should we continue fetching
+     * events from the index. This is only needed if we're continuing to fill
+     * the timeline, e.g. if we're paginating. This needs to be set to a event
+     * id of an event that was previously fetched with this function.
+     *
+     * @param {string} direction The direction in which we will continue
+     * fetching events. EventTimeline.BACKWARDS to continue fetching events that
+     * are older than the event given in fromEvent, EventTimeline.FORWARDS to
+     * fetch newer events.
+     *
+     * @returns {Promise<MatrixEvent[]>} Resolves to an array of events that
+     * contain URLs.
+     */
     async loadFileEvents(room, limit = 10, fromEvent = null, direction = EventTimeline.BACKWARDS) {
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
@@ -472,6 +493,33 @@ export default class EventIndex {
         return matrixEvents;
     }
 
+    /**
+     * Fill a timeline with events that contain URLs.
+     *
+     * @param {TimelineSet} timelineSet The TimelineSet the Timeline belongs to,
+     * used to check if we're adding duplicate events.
+     *
+     * @param {Timeline} timeline The Timeline which should be filed with
+     * events.
+     *
+     * @param {Room} room The room for which we should fetch events containing
+     * URLs
+     *
+     * @param {number} limit The maximum number of events to fetch.
+     *
+     * @param {string} fromEvent From which event should we continue fetching
+     * events from the index. This is only needed if we're continuing to fill
+     * the timeline, e.g. if we're paginating. This needs to be set to a event
+     * id of an event that was previously fetched with this function.
+     *
+     * @param {string} direction The direction in which we will continue
+     * fetching events. EventTimeline.BACKWARDS to continue fetching events that
+     * are older than the event given in fromEvent, EventTimeline.FORWARDS to
+     * fetch newer events.
+     *
+     * @returns {Promise<boolean>} Resolves to true if events were added to the
+     * timeline, false otherwise.
+     */
     async populateFileTimeline(timelineSet, timeline, room, limit = 10,
                                fromEvent = null, direction = EventTimeline.BACKWARDS) {
         const matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
@@ -486,7 +534,7 @@ export default class EventIndex {
             direction = direction == EventTimeline.BACKWARDS ? EventTimeline.FORWARDS: EventTimeline.BACKWARDS;
         }
 
-        // Add the events to the live timeline of the file panel.
+        // Add the events to the timeline of the file panel.
         matrixEvents.forEach(e => {
             if (!timelineSet.eventIdToTimeline(e.getId())) {
                 timelineSet.addEventToTimeline(e, timeline, direction == EventTimeline.BACKWARDS);
@@ -503,6 +551,28 @@ export default class EventIndex {
         }
     }
 
+    /**
+     * Emulate a TimelineWindow pagination() request with the event index as the event source
+     *
+     * Might not fetch events from the index if the timeline already contains
+     * events that the window isn't showing.
+     *
+     * @param {Room} room The room for which we should fetch events containing
+     * URLs
+     *
+     * @param {TimelineWindow} timelineWindow The timeline window that should be
+     * populated with new events.
+     *
+     * @param {string} direction The direction in which we should paginate.
+     * EventTimeline.BACKWARDS to paginate back, EventTimeline.FORWARDS to
+     * paginate forwards.
+     *
+     * @param {number} limit The maximum number of events to fetch while
+     * paginating.
+     *
+     * @returns {Promise<boolean>} Resolves to a boolean which is true if more
+     * events were successfully retrieved.
+     */
     paginateTimelineWindow(room, timelineWindow, direction, limit) {
         const tl = timelineWindow.getTimelineIndex(direction);
 

From 6ebeb0a376f9fab634f48c731b82740e5921af11 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 24 Jan 2020 13:30:03 +0000
Subject: [PATCH 0679/3235] Translated using Weblate (Italian)

Currently translated at 98.7% (2031 of 2057 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 d6ebc985fb..6a021e8ab7 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2079,5 +2079,7 @@
     "Verify User": "Verifica utente",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Per maggiore sicurezza, verifica questo utente controllando un codice univoco sui vostri dispositivi.",
     "For maximum security, do this in person.": "Per massima sicurezza, fatelo di persona.",
-    "Start Verification": "Inizia la verifica"
+    "Start Verification": "Inizia la verifica",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s ha aggiunto %(addedAddresses)s e %(count)s altri indirizzi a questa stanza",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza"
 }

From be98f24051f212f5b9d7cda96aba00f697b019ff Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 24 Jan 2020 13:31:06 +0000
Subject: [PATCH 0680/3235] Translated using Weblate (Italian)

Currently translated at 98.8% (2032 of 2057 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 6a021e8ab7..c9a6c27221 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2081,5 +2081,6 @@
     "For maximum security, do this in person.": "Per massima sicurezza, fatelo di persona.",
     "Start Verification": "Inizia la verifica",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s ha aggiunto %(addedAddresses)s e %(count)s altri indirizzi a questa stanza",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza"
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s ha rimosso %(countRemoved)s e aggiunto %(countAdded)s indirizzi a questa stanza"
 }

From 75da5b7944ded503a50b099a2a467abec3c40858 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 24 Jan 2020 12:59:46 +0000
Subject: [PATCH 0681/3235] Design pass for room icons

---
 src/components/views/rooms/RoomList.js | 2 +-
 src/components/views/rooms/RoomTile.js | 6 +++---
 src/i18n/strings/en_EN.json            | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ee3100b535..f41400ecfc 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -719,7 +719,7 @@ export default createReactClass({
             },
             {
                 list: this.state.lists['im.vector.fake.direct'],
-                label: _t('People'),
+                label: _t('Direct Messages'),
                 tagName: "im.vector.fake.direct",
                 order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b50d85ff6..c546b7503e 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -478,7 +478,8 @@ export default createReactClass({
 
         let dmIndicator;
         let dmOnline;
-        if (dmUserId) {
+        // If we can place a shield, do that instead
+        if (dmUserId && !this.state.e2eStatus) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"
@@ -527,8 +528,7 @@ export default createReactClass({
         }
 
         let e2eIcon = null;
-        // For now, skip the icon for DMs.  Possibly we want to move the DM icon elsewhere?
-        if (!dmUserId && this.state.e2eStatus) {
+        if (this.state.e2eStatus) {
             e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..1d5f534a36 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1012,7 +1012,7 @@
     "Community Invites": "Community Invites",
     "Invites": "Invites",
     "Favourites": "Favourites",
-    "People": "People",
+    "Direct Messages": "Direct Messages",
     "Start chat": "Start chat",
     "Rooms": "Rooms",
     "Low priority": "Low priority",
@@ -1471,7 +1471,6 @@
     "Suggestions": "Suggestions",
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Show more": "Show more",
-    "Direct Messages": "Direct Messages",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",

From a46646105f29cb68714e0c0794136b452b37833d Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 24 Jan 2020 13:31:48 +0000
Subject: [PATCH 0682/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2057 of 2057 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 | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c9a6c27221..c8844fb2bb 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2082,5 +2082,30 @@
     "Start Verification": "Inizia la verifica",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s ha aggiunto %(addedAddresses)s e %(count)s altri indirizzi a questa stanza",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s ha rimosso %(countRemoved)s e aggiunto %(countAdded)s indirizzi a questa stanza"
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s ha rimosso %(countRemoved)s e aggiunto %(countAdded)s indirizzi a questa stanza",
+    "Someone is using an unknown device": "Qualcuno sta usando un dispositivo sconosciuto",
+    "This room is end-to-end encrypted": "Questa stanza è cifrata end-to-end",
+    "Everyone in this room is verified": "Tutti in questa stanza sono verificati",
+    "Invite only": "Solo a invito",
+    "Send a reply…": "Invia risposta…",
+    "Send a message…": "Invia un messaggio…",
+    "Reject & Ignore user": "Rifiuta e ignora l'utente",
+    "Unknown Command": "Comando sconosciuto",
+    "Unrecognised command: %(commandText)s": "Comando non riconosciuto: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Puoi usare <code>/help</code> per elencare i comandi disponibili. Volevo forse inviarlo come messaggio?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Suggerimento: anteponi al tuo messaggio <code>//</code> per farlo iniziare con uno slash.",
+    "Send as message": "Invia come messaggio",
+    "Enter your account password to confirm the upgrade:": "Inserisci la password del tuo account per confermare l'aggiornamento:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Dovrai autenticarti con il server per confermare l'aggiornamento.",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Aggiorna il dispositivo per consentirgli di verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Imposta la cifratura sul dispositivo per consentirgli di verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Proteggi le chiavi di cifratura con una password. Per massima sicurezza questa dovrebbe essere diversa da quella del tuo account:",
+    "Enter a passphrase": "Inserisci una password",
+    "Enter your passphrase a second time to confirm it.": "Inserisci di nuovo la tua password per confermarla.",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Questo dispositivo ora può verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
+    "Verify other users in their profile.": "Verifica gli altri utenti nel loro profilo.",
+    "Upgrade your encryption": "Aggiorna la tua cifratura",
+    "Set up encryption": "Imposta la cifratura",
+    "Encryption upgraded": "Cifratura aggiornata",
+    "Encryption setup complete": "Impostazione cifratura completata"
 }

From 098d09792215d4a1922a906e05e0ca23dc26d685 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:03:31 +0000
Subject: [PATCH 0683/3235] Re-enable stylelint on CI

---
 .buildkite/pipeline.yaml             | 8 ++++++++
 res/css/views/rooms/_RoomHeader.scss | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index f5f63b647a..1e08d2cd3b 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -25,6 +25,14 @@ steps:
     plugins:
       - docker#v3.0.1:
           image: "node:12"
+  - label: ":stylelint: Style Lint"
+    command:
+      - "echo '--- Install'"
+      - "yarn install --ignore-scripts"
+      - "yarn lint:style"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:12"
 
   - label: ":jest: Tests"
     agents:
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 0ac2e99b97..6f0377b29c 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -24,7 +24,7 @@ limitations under the License.
         bottom: -1px;
         right: -2px;
         height: 10px;
-        width: 10px
+        width: 10px;
     }
 }
 

From 5536384866eb72aa61500fcbd844b61c0b7a00d3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:21:28 +0000
Subject: [PATCH 0684/3235] Do less unnecessary work on CI

We were checking out & installing the develop js-sdk explicitly
in cases where we didn't need it at all. We were babeling the src
folder many, many times over (in some cases twice in the same job)
and never using the output at all.
---
 .buildkite/pipeline.yaml   | 43 ++++++++++++++------------------------
 scripts/ci/install-deps.sh |  4 ++--
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 1e08d2cd3b..39bba6637a 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -2,7 +2,8 @@ steps:
   - label: ":eslint: JS Lint"
     command:
       - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
+      - "./scripts/ci/install-deps.sh --ignore-scripts"
+      - "echo '+++ Lint"
       - "yarn lint:js"
     plugins:
       - docker#v3.0.1:
@@ -10,8 +11,9 @@ steps:
 
   - label: ":eslint: TS Lint"
     command:
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
+      - "echo '--- Install"
+      - "yarn install --ignore-scripts"
+      - "echo '+++ Lint"
       - "yarn lint:ts"
     plugins:
       - docker#v3.0.1:
@@ -19,8 +21,9 @@ steps:
 
   - label: ":eslint: Types Lint"
     command:
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
+      - "echo '--- Install"
+      - "yarn install --ignore-scripts"
+      - "echo '+++ Lint"
       - "yarn lint:types"
     plugins:
       - docker#v3.0.1:
@@ -41,13 +44,10 @@ steps:
       queue: "medium"
     command:
       - "echo '--- Install js-sdk'"
-      # TODO: Remove hacky chmod for BuildKite
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
-      - "echo '--- Installing Dependencies'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '--- Running initial build steps'"
-      - "yarn build"
+      # We don't use the babel-ed output for anything so we can --ignore-scripts
+      # to save transpiling the files. We run the transpile step explicitly in
+      # the 'build' job.
+      - "./scripts/ci/install-deps.sh --ignore-scripts"
       - "echo '+++ Running Tests'"
       - "yarn test"
     plugins:
@@ -56,10 +56,8 @@ steps:
 
   - label: "🛠 Build"
     command:
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '+++ Building Project'"
-      - "yarn build"
+      - "echo '+++ Install & Build'"
+      - "yarn install"
     plugins:
       - docker#v3.0.1:
           image: "node:12"
@@ -70,14 +68,8 @@ steps:
       # e2e tests otherwise take +-8min
       queue: "xlarge"
     command:
-      # TODO: Remove hacky chmod for BuildKite
-      - "echo '--- Setup'"
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
       - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh"
-      - "echo '--- Running initial build steps'"
-      - "yarn build"
+      - "./scripts/ci/install-deps.sh --ignore-scripts"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/end-to-end-tests.sh"
     plugins:
@@ -96,9 +88,6 @@ steps:
       # webpack loves to gorge itself on resources.
       queue: "medium"
     command:
-      # TODO: Remove hacky chmod for BuildKite
-      - "chmod +x ./scripts/ci/*.sh"
-      - "chmod +x ./scripts/*"
       - "echo '+++ Running Tests'"
       - "./scripts/ci/riot-unit-tests.sh"
     plugins:
@@ -110,7 +99,7 @@ steps:
   - label: "🌐 i18n"
     command:
       - "echo '--- Fetching Dependencies'"
-      - "yarn install"
+      - "yarn install --ignore-scripts"
       - "echo '+++ Testing i18n output'"
       - "yarn diff-i18n"
     plugins:
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
index a2e2e59a45..14b5fc5393 100755
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -6,9 +6,9 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk
 
 pushd matrix-js-sdk
 yarn link
-yarn install
+yarn install $@
 yarn build
 popd
 
 yarn link matrix-js-sdk
-yarn install
+yarn install $@

From 97d55f63a362194ce5d9cc6d9bb92f78e1c63157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 15:25:27 +0100
Subject: [PATCH 0685/3235] DisableEventIndexDialog: Remove the incorrect class
 on the dialog.

---
 .../views/dialogs/eventindex/DisableEventIndexDialog.js      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index c2b7e2933e..81920eab7a 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -56,10 +56,7 @@ export default class DisableEventIndexDialog extends React.Component {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         return (
-            <BaseDialog className='mx_ManageEventIndexDialog'
-                onFinished={this.props.onFinished}
-                title={_t("Are you sure?")}
-            >
+            <BaseDialog onFinished={this.props.onFinished} title={_t("Are you sure?")}>
                 {_t("If disabled, messages from encrypted rooms won't appear in search results.")}
                 {this.state.disabling ? <Spinner /> : <div />}
                 <DialogButtons

From 2252f48e042dd3e90aa12fadc9a0e90a1b6add61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 15:26:24 +0100
Subject: [PATCH 0686/3235] DisableEventIndexDialog: Use a self-closing tag for
 the buttons.

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

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 81920eab7a..13278217de 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -65,8 +65,7 @@ export default class DisableEventIndexDialog extends React.Component {
                     primaryButtonClass="danger"
                     onCancel={this.props.onFinished}
                     disabled={this.state.disabling}
-                >
-                </DialogButtons>
+                />
             </BaseDialog>
         );
     }

From 47999c2e468ea98ec5ea99c527b48b7ac54c3fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 15:26:54 +0100
Subject: [PATCH 0687/3235] EventIndexPanel: Add a separate message for the
 case where Seshat is missing.

---
 src/components/views/settings/EventIndexPanel.js | 16 ++++++++++++++++
 src/i18n/strings/en_EN.json                      |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 5edc25bbab..321f45699b 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -140,6 +140,22 @@ export default class EventIndexPanel extends React.Component {
                     </div>
                 </div>
             );
+        } else if (EventIndexPeg.platformHasSupport() && !EventIndexPeg.supportIsInstalled()) {
+            eventIndexingSettings = (
+                <div>
+                    {
+                        _t( "Riot is missing some components required for securely " +
+                            "caching encrypted messages locally. If you'd like to " +
+                            "experiment with this feature, build a custom Riot Desktop " +
+                            "with <nativeLink>search components added</nativeLink>.",
+                            {},
+                            {
+                                'nativeLink': (sub) => <a href="https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms">{sub}</a>,
+                            },
+                        )
+                    }
+                </div>
+            );
         } else {
             eventIndexingSettings = (
                 <div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fceb299131..419aecd528 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -560,6 +560,7 @@
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "Enable": "Enable",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.",
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",

From 57ee99d6f797115d051914d8513b262ca50441e2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:30:41 +0000
Subject: [PATCH 0688/3235] chmod

---
 scripts/ci/layered-riot-web.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/ci/layered-riot-web.sh

diff --git a/scripts/ci/layered-riot-web.sh b/scripts/ci/layered-riot-web.sh
old mode 100644
new mode 100755

From 19c49eedec75ce21e7ecc982ec209b6b4203b2bc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:36:12 +0000
Subject: [PATCH 0689/3235] reskindex for tests

---
 .buildkite/pipeline.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 39bba6637a..7dbb959dea 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -48,6 +48,7 @@ steps:
       # to save transpiling the files. We run the transpile step explicitly in
       # the 'build' job.
       - "./scripts/ci/install-deps.sh --ignore-scripts"
+      - "yarn run reskindex"
       - "echo '+++ Running Tests'"
       - "yarn test"
     plugins:

From de5c47960c8a34f7412dcf0c836349348378e65a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:51:11 +0000
Subject: [PATCH 0690/3235] quotes

---
 .buildkite/pipeline.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 7dbb959dea..698ce43c93 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -3,7 +3,7 @@ steps:
     command:
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh --ignore-scripts"
-      - "echo '+++ Lint"
+      - "echo '+++ Lint'"
       - "yarn lint:js"
     plugins:
       - docker#v3.0.1:
@@ -13,7 +13,7 @@ steps:
     command:
       - "echo '--- Install"
       - "yarn install --ignore-scripts"
-      - "echo '+++ Lint"
+      - "echo '+++ Lint'"
       - "yarn lint:ts"
     plugins:
       - docker#v3.0.1:
@@ -21,9 +21,9 @@ steps:
 
   - label: ":eslint: Types Lint"
     command:
-      - "echo '--- Install"
+      - "echo '--- Install'"
       - "yarn install --ignore-scripts"
-      - "echo '+++ Lint"
+      - "echo '+++ Lint'"
       - "yarn lint:types"
     plugins:
       - docker#v3.0.1:

From b17f38856ca5f49efe593aa92755583cdc5058c9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:56:00 +0000
Subject: [PATCH 0691/3235] More quote failing

---
 .buildkite/pipeline.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 698ce43c93..842ea091fb 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -11,7 +11,7 @@ steps:
 
   - label: ":eslint: TS Lint"
     command:
-      - "echo '--- Install"
+      - "echo '--- Install'"
       - "yarn install --ignore-scripts"
       - "echo '+++ Lint'"
       - "yarn lint:ts"

From 26aaa58e3cc2c05ceeb239a753747cde6f720d34 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 14:58:46 +0000
Subject: [PATCH 0692/3235] Comments are great

---
 .buildkite/pipeline.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 842ea091fb..4bc69a76bd 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,6 +1,7 @@
 steps:
   - label: ":eslint: JS Lint"
     command:
+      # We fetch the develop js-sdk to get our latest eslint rules
       - "echo '--- Install js-sdk'"
       - "./scripts/ci/install-deps.sh --ignore-scripts"
       - "echo '+++ Lint'"

From 2d8477aaa69ac35c451c8a47691a0372cb635175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:13:55 +0100
Subject: [PATCH 0693/3235] FormattingUtils: Add a formatCountLong method.

---
 src/utils/FormattingUtils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.js
index 9016d62cfb..b932214530 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.js
@@ -30,6 +30,15 @@ export function formatCount(count) {
    return (count / 1000000000).toFixed(1) + "B"; // 10B is enough for anyone, right? :S
 }
 
+/**
+ * Format a count showing the whole number but making it a bit more readable.
+ * e.g: 1000 => 1,000
+ */
+export function formatCountLong(count) {
+    const formatter = new Intl.NumberFormat();
+    return formatter.format(count)
+}
+
 /**
  * format a size in bytes into a human readable form
  * e.g: 1024 -> 1.00 KB

From ddea7415c7bd954343efc98322a00326b5c1d2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:15:06 +0100
Subject: [PATCH 0694/3235] EventIndexPanel: Use formatCountLong to format the
 event and room counts.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 +++---
 src/components/views/settings/EventIndexPanel.js            | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index a8fc7dce3a..66cd89f4ab 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
 import Modal from '../../../../Modal';
-import {formatBytes, formatCount} from "../../../../utils/FormattingUtils";
+import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
@@ -125,8 +125,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 }
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
-                    {_t("Indexed messages:")} {formatCount(this.state.eventCount)}<br />
-                    {_t("Number of rooms:")} {formatCount(this.state.roomCount)}<br />
+                    {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
+                    {_t("Number of rooms:")} {formatCountLong(this.state.roomCount)}<br />
                     {crawlerState}<br />
                 </div>
             </div>
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 321f45699b..851f86f3d4 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
-import {formatBytes, formatCount} from "../../../utils/FormattingUtils";
+import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 
 export default class EventIndexPanel extends React.Component {
@@ -115,7 +115,8 @@ export default class EventIndexPanel extends React.Component {
                         {_t( "Securely cache encrypted messages locally for them " +
                              "to appear in search results, using ")
                         } {formatBytes(this.state.eventIndexSize, 0)}
-                        {_t( " to store messages from ")} {formatCount(this.state.roomCount)} {_t("rooms.")}
+                        {_t( " to store messages from ")}
+                        {formatCountLong(this.state.roomCount)} {_t("rooms.")}
                     </div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this._onManage}>

From cd225943ea7a504d8e9ff09eefa6aa098514ee2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:22:09 +0100
Subject: [PATCH 0695/3235] EventIndexPanel: Shorten a overly long line.

---
 src/components/views/settings/EventIndexPanel.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 851f86f3d4..479a995bc8 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -142,6 +142,12 @@ export default class EventIndexPanel extends React.Component {
                 </div>
             );
         } else if (EventIndexPeg.platformHasSupport() && !EventIndexPeg.supportIsInstalled()) {
+            const nativeLink = (
+                "https://github.com/vector-im/riot-web/blob/develop/" +
+                "docs/native-node-modules.md#" +
+                "adding-seshat-for-search-in-e2e-encrypted-rooms"
+            );
+
             eventIndexingSettings = (
                 <div>
                     {
@@ -151,7 +157,7 @@ export default class EventIndexPanel extends React.Component {
                             "with <nativeLink>search components added</nativeLink>.",
                             {},
                             {
-                                'nativeLink': (sub) => <a href="https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms">{sub}</a>,
+                                'nativeLink': (sub) => <a href={nativeLink}>{sub}</a>,
                             },
                         )
                     }

From 5d3b916a89bb0c04b38fa24a5e360c93ff178d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:46:46 +0100
Subject: [PATCH 0696/3235] DialogButtons: Allow setting the cancel button
 class with a prop.

---
 src/components/views/elements/DialogButtons.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index 4e47e73052..2cb25d9c9c 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -40,6 +40,10 @@ export default createReactClass({
         // should there be a cancel button? default: true
         hasCancel: PropTypes.bool,
 
+        // The class of the cancel button, only used if a cancel button is
+        // enabled
+        cancelButtonClass: PropTypes.node,
+
         // onClick handler for the cancel button.
         onCancel: PropTypes.func,
 
@@ -69,8 +73,10 @@ export default createReactClass({
             primaryButtonClassName += " " + this.props.primaryButtonClass;
         }
         let cancelButton;
+
         if (this.props.cancelButton || this.props.hasCancel) {
-            cancelButton = <button onClick={this._onCancelClick} disabled={this.props.disabled}>
+            cancelButton = <button className={this.props.cancelButtonClass}
+                            onClick={this._onCancelClick} disabled={this.props.disabled}>
                 { this.props.cancelButton || _t("Cancel") }
             </button>;
         }

From 3208ac60c7b6ea453448ada43e08441a371d6758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:47:29 +0100
Subject: [PATCH 0697/3235] ManageEventIndexDialog: Override the Disable button
 class to be danger.

---
 .../eventindex/ManageEventIndexDialog.js      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 66cd89f4ab..5f6f4985da 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -132,18 +132,8 @@ export default class ManageEventIndexDialog extends React.Component {
             </div>
         );
 
-        const buttons = (
-            <div className="mx_Dialog_buttons">
-                <AccessibleButton kind="danger" onClick={this._onDisable}>
-                    {_t("Disable")}
-                </AccessibleButton>
-                <AccessibleButton kind="primary" onClick={this._onDone}>
-                    {_t("Done")}
-                </AccessibleButton>
-            </div>
-        );
-
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
@@ -151,7 +141,14 @@ export default class ManageEventIndexDialog extends React.Component {
                 title={_t("Message search")}
             >
                 {eventIndexingSettings}
-                {buttons}
+                <DialogButtons
+                    primaryButton={_t("Done")}
+                    onPrimaryButtonClick={this.props.onFinished}
+                    primaryButtonClass="primary"
+                    cancelButton={_t("Disable")}
+                    onCancel={this._onDisable}
+                    cancelButtonClass="danger"
+                />
             </BaseDialog>
         );
     }

From 9f3e5ab1db15b0aa4cf6d45528e9a0f2323f85a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 24 Jan 2020 16:52:26 +0100
Subject: [PATCH 0698/3235] ManageEventIndexDialog: Remove an unused import.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 5f6f4985da..5c82cc0391 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -22,7 +22,6 @@ import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
-import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
 /*
  * Allows the user to introspect the event index state and disable it.

From abc2808b62d1cacb94d7a4e2403c5ee5f74faab8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jan 2020 08:57:03 -0700
Subject: [PATCH 0699/3235] Fix i18n post-merge

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3c758ecbfb..eb06518c7a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1475,7 +1475,6 @@
     "Suggestions": "Suggestions",
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Show more": "Show more",
-    "Direct Messages": "Direct Messages",
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",

From 7a5e172b88c959f94051db1f6d7424cf0ef8108f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Jan 2020 16:16:46 +0000
Subject: [PATCH 0700/3235] Apply a huge part of the decorations and copy

---
 res/css/_components.scss                      |   2 +
 .../views/right_panel/_EncryptionInfo.scss    |  24 +
 res/css/views/right_panel/_UserInfo.scss      |   6 +-
 .../views/right_panel/_VerificationPanel.scss |  21 +
 src/components/structures/RightPanel.js       |  25 +-
 .../views/messages/MKeyVerificationRequest.js |   3 +-
 .../views/right_panel/EncryptionInfo.js       |  68 +-
 .../views/right_panel/EncryptionPanel.js      |  72 +-
 src/components/views/right_panel/UserInfo.js  | 619 ++++++++++--------
 .../views/right_panel/VerificationPanel.js    |  85 ++-
 .../views/toasts/VerificationRequestToast.js  |   6 +-
 .../views/verification/VerificationShowSas.js |  55 +-
 src/i18n/strings/en_EN.json                   |  18 +-
 13 files changed, 586 insertions(+), 418 deletions(-)
 create mode 100644 res/css/views/right_panel/_EncryptionInfo.scss
 create mode 100644 res/css/views/right_panel/_VerificationPanel.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 60f749de9c..e19050dc7e 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -140,7 +140,9 @@
 @import "./views/messages/_TextualEvent.scss";
 @import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";
+@import "./views/right_panel/_EncryptionInfo.scss";
 @import "./views/right_panel/_UserInfo.scss";
+@import "./views/right_panel/_VerificationPanel.scss";
 @import "./views/room_settings/_AliasSettings.scss";
 @import "./views/room_settings/_ColorSettings.scss";
 @import "./views/rooms/_AppsDrawer.scss";
diff --git a/res/css/views/right_panel/_EncryptionInfo.scss b/res/css/views/right_panel/_EncryptionInfo.scss
new file mode 100644
index 0000000000..386eef8e7f
--- /dev/null
+++ b/res/css/views/right_panel/_EncryptionInfo.scss
@@ -0,0 +1,24 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_UserInfo {
+    .mx_EncryptionInfo_spinner {
+        .mx_Spinner {
+            margin-top: 25px;
+            margin-bottom: 15px;
+        }
+    }
+}
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 57ffd4982e..8aad5240aa 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -81,6 +81,7 @@ limitations under the License.
     .mx_UserInfo_avatar > div {
         max-width: 30vh;
         margin: 0 auto;
+        transition: 1s;
     }
 
     .mx_UserInfo_avatar > div > div {
@@ -260,11 +261,6 @@ limitations under the License.
 
     .mx_UserInfo_verify {
         display: block;
-        background-color: $accent-color;
-        color: $accent-fg-color;
-        border-radius: 4px;
-        padding: 7px 1.5em;
-        text-align: center;
         margin: 16px 0;
     }
 }
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
new file mode 100644
index 0000000000..84a82c9a5c
--- /dev/null
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_UserInfo {
+    .mx_VerificationPanel_verified_section .mx_E2EIcon {
+        margin: 0 auto;
+    }
+}
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index c01a3709e7..2188bda4f2 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -169,7 +169,6 @@ export default class RightPanel extends React.Component {
         const MemberList = sdk.getComponent('rooms.MemberList');
         const MemberInfo = sdk.getComponent('rooms.MemberInfo');
         const UserInfo = sdk.getComponent('right_panel.UserInfo');
-        const EncryptionPanel = sdk.getComponent('right_panel.EncryptionPanel');
         const ThirdPartyMemberInfo = sdk.getComponent('rooms.ThirdPartyMemberInfo');
         const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
         const FilePanel = sdk.getComponent('structures.FilePanel');
@@ -187,19 +186,22 @@ export default class RightPanel extends React.Component {
             panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) {
             panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+        } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo ||
+            this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel) {
             if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
                 const onClose = () => {
                     dis.dispatch({
                         action: "view_user",
-                        member: null,
+                        member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
                     });
                 };
                 panel = <UserInfo
-                    user={this.state.member}
+                    userId={this.state.member}
                     roomId={this.props.roomId}
                     key={this.props.roomId || this.state.member.userId}
                     onClose={onClose}
+                    phase={this.state.phase}
+                    verificationRequest={this.state.verificationRequest}
                 />;
             } else {
                 panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />;
@@ -215,7 +217,7 @@ export default class RightPanel extends React.Component {
                     });
                 };
                 panel = <UserInfo
-                    user={this.state.member}
+                    userId={this.state.member}
                     groupId={this.props.groupId}
                     key={this.state.member.userId}
                     onClose={onClose} />;
@@ -237,19 +239,6 @@ export default class RightPanel extends React.Component {
             panel = <NotificationPanel />;
         } else if (this.state.phase === RIGHT_PANEL_PHASES.FilePanel) {
             panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel) {
-            const onClose = () => {
-                dis.dispatch({
-                    action: "view_user",
-                    member: this.state.member,
-                });
-            };
-            panel = (
-                <EncryptionPanel
-                    member={this.state.member}
-                    verificationRequest={this.state.verificationRequest}
-                    onClose={onClose} />
-            );
         }
 
         const classes = classNames("mx_RightPanel", "mx_fadable", {
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ae793556d8..474ff7becb 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -45,10 +45,11 @@ export default class MKeyVerificationRequest extends React.Component {
 
     _openRequest = () => {
         const {verificationRequest} = this.props.mxEvent;
+        const member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId);
         dis.dispatch({
             action: "set_right_panel_phase",
             phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-            refireParams: {verificationRequest},
+            refireParams: {verificationRequest, member},
         });
     };
 
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 2d265967ae..8868c30053 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,24 +14,58 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import * as sdk from '../../../index';
+import React from "react";
+import PropTypes from "prop-types";
+
+import * as sdk from "../../../index";
 import {_t} from "../../../languageHandler";
 
-export default class EncryptionInfo extends React.PureComponent {
-    render() {
+export const PendingActionSpinner = ({text}) => {
+    const Spinner = sdk.getComponent('elements.Spinner');
+    return <div className="mx_EncryptionInfo_spinner">
+        <Spinner />
+        { text }
+    </div>;
+};
+
+const EncryptionInfo = ({pending, member, onStartVerification}) => {
+    let content;
+    if (pending) {
+        const text = _t("Waiting for %(displayName)s to accept…", {
+            displayName: member.displayName || member.name || member.userId,
+        });
+        content = <PendingActionSpinner text={text} />;
+    } else {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (
-            <div className="mx_UserInfo_container">
-                <h3>{_t("Verify User")}</h3>
-                <div>
-                    <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
-                    <p>{_t("For maximum security, do this in person.")}</p>
-                    <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onStartVerification}>
-                        {_t("Start Verification")}
-                    </AccessibleButton>
-                </div>
-            </div>
+        content = (
+            <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={onStartVerification}>
+                {_t("Start Verification")}
+            </AccessibleButton>
         );
     }
-}
+
+    return <React.Fragment>
+        <div className="mx_UserInfo_container">
+            <h3>{_t("Encryption")}</h3>
+            <div>
+                <p>{_t("Messages in this room are end-to-end encrypted.")}</p>
+                <p>{_t("Your messages are secured and only you and the recipient have the unique keys to unlock them.")}</p>
+            </div>
+        </div>
+        <div className="mx_UserInfo_container">
+            <h3>{_t("Verify User")}</h3>
+            <div>
+                <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
+                <p>{_t("For maximum security, do this in person.")}</p>
+                { content }
+            </div>
+        </div>
+    </React.Fragment>;
+};
+EncryptionInfo.propTypes = {
+    member: PropTypes.object.isRequired,
+    onStartVerification: PropTypes.func.isRequired,
+    request: PropTypes.object,
+};
+
+export default EncryptionInfo;
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index a1008543e4..dfb145f61d 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -14,52 +14,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
+
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
-import {UserInfoPane} from "./UserInfo";
-import {_t} from "../../../languageHandler";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
 
-export default class EncryptionPanel extends React.PureComponent {
-    constructor(props) {
-        super(props);
-        this.state = {};
+const EncryptionPanel = ({verificationRequest, member}) => {
+    const [request, setRequest] = useState(verificationRequest);
+    useEffect(() => {
+        setRequest(verificationRequest);
+    }, [verificationRequest]);
+
+    const [pending, setPending] = useState(false);
+    const changeHandler = useCallback(() => {
+        setPending(request && request.requested);
+    }, [request]);
+    useEventEmitter(request, "change", changeHandler);
+    useEffect(changeHandler, [changeHandler]);
+
+    const onStartVerification = useCallback(async () => {
+        const cli = MatrixClientPeg.get();
+        const roomId = await ensureDMExists(cli, member.userId);
+        const verificationRequest = await cli.requestVerificationDM(member.userId, roomId);
+        setRequest(verificationRequest);
+    }, [member.userId]);
+
+    if (!request || pending) {
+        return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={pending} />;
+    } else {
+        return <VerificationPanel member={member} request={request} key={request.channel.transactionId} />;
     }
+};
+EncryptionPanel.propTypes = {
 
-    render() {
-        let content;
-        const request = this.props.verificationRequest || this.state.verificationRequest;
-        const {member} = this.props;
-        if (request) {
-            content = <VerificationPanel request={request} key={request.channel.transactionId} />;
-        } else if (member) {
-            content = <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
-        } else {
-            content = <p>Not a member nor request, not sure what to render</p>;
-        }
+};
 
-        return (
-            <UserInfoPane className="mx_UserInfo_smallAvatar" member={member} onClose={this.props.onClose} e2eStatus="">
-                <div className="mx_UserInfo_container">
-                    <h3>{_t("Encryption")}</h3>
-                    <div>
-                        <p>{_t("Messages in this room are end-to-end encrypted.")}</p>
-                        <p>{_t("Your messages are secured and only you and the recipient have the unique keys to unlock them.")}</p>
-                    </div>
-                </div>
-
-                { content }
-            </UserInfoPane>
-        );
-    }
-
-    _onStartVerification = async () => {
-        const client = MatrixClientPeg.get();
-        const {member} = this.props;
-        const roomId = await ensureDMExists(client, member.userId);
-        const verificationRequest = await client.requestVerificationDM(member.userId, roomId);
-        this.setState({verificationRequest});
-    };
-}
+export default EncryptionPanel;
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index a31e9a6ce0..41dbe49cc8 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -41,6 +41,7 @@ import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import EncryptionPanel from "./EncryptionPanel";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -1047,7 +1048,256 @@ const PowerLevelEditor = ({user, room, roomPermissions, onFinished}) => {
     );
 };
 
-export const UserInfoPane = ({children, className, onClose, e2eStatus, member}) => {
+export const useDevices = (userId) => {
+    const cli = useContext(MatrixClientContext);
+
+    // undefined means yet to be loaded, null means failed to load, otherwise list of devices
+    const [devices, setDevices] = useState(undefined);
+    // Download device lists
+    useEffect(() => {
+        setDevices(undefined);
+
+        let cancelled = false;
+
+        async function _downloadDeviceList() {
+            try {
+                await cli.downloadKeys([userId], true);
+                const devices = await cli.getStoredDevicesForUser(userId);
+
+                if (cancelled) {
+                    // we got cancelled - presumably a different user now
+                    return;
+                }
+
+                _disambiguateDevices(devices);
+                setDevices(devices);
+            } catch (err) {
+                setDevices(null);
+            }
+        }
+        _downloadDeviceList();
+
+        // Handle being unmounted
+        return () => {
+            cancelled = true;
+        };
+    }, [cli, userId]);
+
+    // Listen to changes
+    useEffect(() => {
+        let cancel = false;
+        const onDeviceVerificationChanged = (_userId, device) => {
+            if (_userId === userId) {
+                // no need to re-download the whole thing; just update our copy of the list.
+
+                // Promise.resolve to handle transition from static result to promise; can be removed in future
+                Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
+                    if (cancel) return;
+                    console.log("setDevices 2", devices);
+                    setDevices(devices);
+                });
+            }
+        };
+        cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
+        // Handle being unmounted
+        return () => {
+            cancel = true;
+            cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
+        };
+    }, [cli, userId]);
+
+    return devices;
+};
+
+const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
+    const cli = useContext(MatrixClientContext);
+
+    const powerLevels = useRoomPowerLevels(cli, room);
+    // Load whether or not we are a Synapse Admin
+    const isSynapseAdmin = useIsSynapseAdmin(cli);
+
+    // Check whether the user is ignored
+    const [isIgnored, setIsIgnored] = useState(cli.isUserIgnored(member.userId));
+    // Recheck if the user or client changes
+    useEffect(() => {
+        setIsIgnored(cli.isUserIgnored(member.userId));
+    }, [cli, member.userId]);
+    // Recheck also if we receive new accountData m.ignored_user_list
+    const accountDataHandler = useCallback((ev) => {
+        if (ev.getType() === "m.ignored_user_list") {
+            setIsIgnored(cli.isUserIgnored(member.userId));
+        }
+    }, [cli, member.userId]);
+    useEventEmitter(cli, "accountData", accountDataHandler);
+
+    // Count of how many operations are currently in progress, if > 0 then show a Spinner
+    const [pendingUpdateCount, setPendingUpdateCount] = useState(0);
+    const startUpdating = useCallback(() => {
+        setPendingUpdateCount(pendingUpdateCount + 1);
+    }, [pendingUpdateCount]);
+    const stopUpdating = useCallback(() => {
+        setPendingUpdateCount(pendingUpdateCount - 1);
+    }, [pendingUpdateCount]);
+
+    const roomPermissions = useRoomPermissions(cli, room, member);
+
+    const onSynapseDeactivate = useCallback(async () => {
+        const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
+        const {finished} = Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
+            title: _t("Deactivate user?"),
+            description:
+                <div>{ _t(
+                    "Deactivating this user will log them out and prevent them from logging back in. Additionally, " +
+                    "they will leave all the rooms they are in. This action cannot be reversed. Are you sure you " +
+                    "want to deactivate this user?",
+                ) }</div>,
+            button: _t("Deactivate user"),
+            danger: true,
+        });
+
+        const [accepted] = await finished;
+        if (!accepted) return;
+        try {
+            await cli.deactivateSynapseUser(member.userId);
+        } catch (err) {
+            console.error("Failed to deactivate user");
+            console.error(err);
+
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+            Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
+                title: _t('Failed to deactivate user'),
+                description: ((err && err.message) ? err.message : _t("Operation failed")),
+            });
+        }
+    }, [cli, member.userId]);
+
+    let synapseDeactivateButton;
+    let spinner;
+
+    // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
+    // someone does figure out how to bypass this check the worst that happens is an error.
+    // FIXME this should be using cli instead of MatrixClientPeg.matrixClient
+    if (isSynapseAdmin && member.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`)) {
+        synapseDeactivateButton = (
+            <AccessibleButton onClick={onSynapseDeactivate} className="mx_UserInfo_field mx_UserInfo_destructive">
+                {_t("Deactivate user")}
+            </AccessibleButton>
+        );
+    }
+
+    let adminToolsContainer;
+    if (room && member.roomId) {
+        adminToolsContainer = (
+            <RoomAdminToolsContainer
+                powerLevels={powerLevels}
+                member={member}
+                room={room}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}>
+                { synapseDeactivateButton }
+            </RoomAdminToolsContainer>
+        );
+    } else if (groupId) {
+        adminToolsContainer = (
+            <GroupAdminToolsSection
+                groupId={groupId}
+                groupMember={member}
+                startUpdating={startUpdating}
+                stopUpdating={stopUpdating}>
+                { synapseDeactivateButton }
+            </GroupAdminToolsSection>
+        );
+    } else if (synapseDeactivateButton) {
+        adminToolsContainer = (
+            <GenericAdminToolsContainer>
+                { synapseDeactivateButton }
+            </GenericAdminToolsContainer>
+        );
+    }
+
+    if (pendingUpdateCount > 0) {
+        const Loader = sdk.getComponent("elements.Spinner");
+        spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
+    }
+
+    const memberDetails = (
+        <PowerLevelSection
+            powerLevels={powerLevels}
+            user={member}
+            room={room}
+            roomPermissions={roomPermissions}
+        />
+    );
+
+    // only display the devices list if our client supports E2E
+    const _enableDevices = cli.isCryptoEnabled();
+
+    let text;
+    if (!isRoomEncrypted) {
+        if (!_enableDevices) {
+            text = _t("This client does not support end-to-end encryption.");
+        } else if (room) {
+            text = _t("Messages in this room are not end-to-end encrypted.");
+        } else {
+            // TODO what to render for GroupMember
+        }
+    } else {
+        text = _t("Messages in this room are end-to-end encrypted.");
+    }
+
+    const userTrust = cli.checkUserTrust(member.userId);
+    const userVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
+        userTrust.isCrossSigningVerified() :
+        userTrust.isVerified();
+    const isMe = member.userId === cli.getUserId();
+    let verifyButton;
+    if (isRoomEncrypted && !userVerified && !isMe) {
+        verifyButton = (
+            <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={() => verifyUser(member)}>
+                {_t("Verify")}
+            </AccessibleButton>
+        );
+    }
+
+    let devicesSection;
+    if (isRoomEncrypted) {
+        devicesSection = <DevicesSection
+            loading={devices === undefined}
+            devices={devices}
+            userId={member.userId} />;
+    }
+
+    const securitySection = (
+        <div className="mx_UserInfo_container">
+            <h3>{ _t("Security") }</h3>
+            <p>{ text }</p>
+            { verifyButton }
+            { devicesSection }
+        </div>
+    );
+
+    return <React.Fragment>
+        { memberDetails &&
+        <div className="mx_UserInfo_container mx_UserInfo_separator mx_UserInfo_memberDetailsContainer">
+            <div className="mx_UserInfo_memberDetails">
+                { memberDetails }
+            </div>
+        </div> }
+
+        { securitySection }
+        <UserOptionsSection
+            devices={devices}
+            canInvite={roomPermissions.canInvite}
+            isIgnored={isIgnored}
+            member={member} />
+
+        { adminToolsContainer }
+
+        { spinner }
+    </React.Fragment>;
+};
+
+const UserInfoHeader = ({onClose, member, e2eStatus}) => {
     const cli = useContext(MatrixClientContext);
 
     let closeButton;
@@ -1057,6 +1307,38 @@ export const UserInfoPane = ({children, className, onClose, e2eStatus, member})
         </AccessibleButton>;
     }
 
+    const onMemberAvatarClick = useCallback(() => {
+        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
+        if (!avatarUrl) return;
+
+        const httpUrl = cli.mxcUrlToHttp(avatarUrl);
+        const ImageView = sdk.getComponent("elements.ImageView");
+        const params = {
+            src: httpUrl,
+            name: member.name,
+        };
+
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+    }, [cli, member]);
+
+    const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
+    const avatarElement = (
+        <div className="mx_UserInfo_avatar">
+            <div>
+                <div>
+                    <MemberAvatar
+                        member={member}
+                        width={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        height={2 * 0.3 * window.innerHeight} // 2x@30vh
+                        resizeMethod="scale"
+                        fallbackUserId={member.userId}
+                        onClick={onMemberAvatarClick}
+                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
+                </div>
+            </div>
+        </div>
+    );
+
     let presenceState;
     let presenceLastActiveAgo;
     let presenceCurrentlyActive;
@@ -1091,74 +1373,35 @@ export const UserInfoPane = ({children, className, onClose, e2eStatus, member})
         statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
     }
 
-    const onMemberAvatarClick = useCallback(() => {
-        const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
-        if (!avatarUrl) return;
-
-        const httpUrl = cli.mxcUrlToHttp(avatarUrl);
-        const ImageView = sdk.getComponent("elements.ImageView");
-        const params = {
-            src: httpUrl,
-            name: member.name,
-        };
-
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    }, [cli, member]);
-
-    const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
-    const avatarElement = (
-        <div className="mx_UserInfo_avatar">
-            <div>
-                <div>
-                    <MemberAvatar
-                        member={member}
-                        width={2 * 0.3 * window.innerHeight} // 2x@30vh
-                        height={2 * 0.3 * window.innerHeight} // 2x@30vh
-                        resizeMethod="scale"
-                        fallbackUserId={member.userId}
-                        onClick={onMemberAvatarClick}
-                        urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
-                </div>
-            </div>
-        </div>
-    );
-
     let e2eIcon;
     if (e2eStatus) {
         e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
     }
 
     const displayName = member.name || member.displayname;
+    return <React.Fragment>
+        { closeButton }
+        { avatarElement }
 
-    return (
-        <div className={classNames("mx_UserInfo", className)} role="tabpanel">
-            <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
-                { closeButton }
-                { avatarElement }
-
-                <div className="mx_UserInfo_container mx_UserInfo_separator">
-                    <div className="mx_UserInfo_profile">
-                        <div>
-                            <h2 aria-label={displayName}>
-                                { e2eIcon }
-                                { displayName }
-                            </h2>
-                        </div>
-                        <div>{ member.userId }</div>
-                        <div className="mx_UserInfo_profileStatus">
-                            {presenceLabel}
-                            {statusLabel}
-                        </div>
-                    </div>
+        <div className="mx_UserInfo_container mx_UserInfo_separator">
+            <div className="mx_UserInfo_profile">
+                <div>
+                    <h2 aria-label={displayName}>
+                        { e2eIcon }
+                        { displayName }
+                    </h2>
                 </div>
-
-                { children }
-            </AutoHideScrollbar>
+                <div>{ member.userId }</div>
+                <div className="mx_UserInfo_profileStatus">
+                    {presenceLabel}
+                    {statusLabel}
+                </div>
+            </div>
         </div>
-    );
+    </React.Fragment>;
 };
 
-const UserInfo = ({user, groupId, roomId, onClose}) => {
+const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.RoomMemberInfo, ...props}) => {
     const cli = useContext(MatrixClientContext);
 
     // Load room if we are given a room id and memoize it
@@ -1166,246 +1409,46 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
     // fetch latest room member if we have a room, so we don't show historical information, falling back to user
     const member = useMemo(() => room ? (room.getMember(user.userId) || user) : user, [room, user]);
 
-    // only display the devices list if our client supports E2E
-    const _enableDevices = cli.isCryptoEnabled();
-
-    const powerLevels = useRoomPowerLevels(cli, room);
-    // Load whether or not we are a Synapse Admin
-    const isSynapseAdmin = useIsSynapseAdmin(cli);
-
-    // Check whether the user is ignored
-    const [isIgnored, setIsIgnored] = useState(cli.isUserIgnored(user.userId));
-    // Recheck if the user or client changes
-    useEffect(() => {
-        setIsIgnored(cli.isUserIgnored(user.userId));
-    }, [cli, user.userId]);
-    // Recheck also if we receive new accountData m.ignored_user_list
-    const accountDataHandler = useCallback((ev) => {
-        if (ev.getType() === "m.ignored_user_list") {
-            setIsIgnored(cli.isUserIgnored(user.userId));
-        }
-    }, [cli, user.userId]);
-    useEventEmitter(cli, "accountData", accountDataHandler);
-
-    // Count of how many operations are currently in progress, if > 0 then show a Spinner
-    const [pendingUpdateCount, setPendingUpdateCount] = useState(0);
-    const startUpdating = useCallback(() => {
-        setPendingUpdateCount(pendingUpdateCount + 1);
-    }, [pendingUpdateCount]);
-    const stopUpdating = useCallback(() => {
-        setPendingUpdateCount(pendingUpdateCount - 1);
-    }, [pendingUpdateCount]);
-
-    const roomPermissions = useRoomPermissions(cli, room, member);
-
-    const onSynapseDeactivate = useCallback(async () => {
-        const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
-        const {finished} = Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
-            title: _t("Deactivate user?"),
-            description:
-                <div>{ _t(
-                    "Deactivating this user will log them out and prevent them from logging back in. Additionally, " +
-                    "they will leave all the rooms they are in. This action cannot be reversed. Are you sure you " +
-                    "want to deactivate this user?",
-                ) }</div>,
-            button: _t("Deactivate user"),
-            danger: true,
-        });
-
-        const [accepted] = await finished;
-        if (!accepted) return;
-        try {
-            await cli.deactivateSynapseUser(user.userId);
-        } catch (err) {
-            console.error("Failed to deactivate user");
-            console.error(err);
-
-            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-            Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
-                title: _t('Failed to deactivate user'),
-                description: ((err && err.message) ? err.message : _t("Operation failed")),
-            });
-        }
-    }, [cli, user.userId]);
-
-    let synapseDeactivateButton;
-    let spinner;
-
-    // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
-    // someone does figure out how to bypass this check the worst that happens is an error.
-    // FIXME this should be using cli instead of MatrixClientPeg.matrixClient
-    if (isSynapseAdmin && user.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`)) {
-        synapseDeactivateButton = (
-            <AccessibleButton onClick={onSynapseDeactivate} className="mx_UserInfo_field mx_UserInfo_destructive">
-                {_t("Deactivate user")}
-            </AccessibleButton>
-        );
-    }
-
-    let adminToolsContainer;
-    if (room && member.roomId) {
-        adminToolsContainer = (
-            <RoomAdminToolsContainer
-                powerLevels={powerLevels}
-                member={member}
-                room={room}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}>
-                { synapseDeactivateButton }
-            </RoomAdminToolsContainer>
-        );
-    } else if (groupId) {
-        adminToolsContainer = (
-            <GroupAdminToolsSection
-                groupId={groupId}
-                groupMember={user}
-                startUpdating={startUpdating}
-                stopUpdating={stopUpdating}>
-                { synapseDeactivateButton }
-            </GroupAdminToolsSection>
-        );
-    } else if (synapseDeactivateButton) {
-        adminToolsContainer = (
-            <GenericAdminToolsContainer>
-                { synapseDeactivateButton }
-            </GenericAdminToolsContainer>
-        );
-    }
-
-    if (pendingUpdateCount > 0) {
-        const Loader = sdk.getComponent("elements.Spinner");
-        spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
-    }
-
-    const memberDetails = (
-        <PowerLevelSection
-            powerLevels={powerLevels}
-            user={member}
-            room={room}
-            roomPermissions={roomPermissions}
-        />
-    );
-
     const isRoomEncrypted = useIsEncrypted(cli, room);
-    // undefined means yet to be loaded, null means failed to load, otherwise list of devices
-    const [devices, setDevices] = useState(undefined);
-    // Download device lists
-    useEffect(() => {
-        setDevices(undefined);
-
-        let cancelled = false;
-
-        async function _downloadDeviceList() {
-            try {
-                await cli.downloadKeys([user.userId], true);
-                const devices = await cli.getStoredDevicesForUser(user.userId);
-
-                if (cancelled) {
-                    // we got cancelled - presumably a different user now
-                    return;
-                }
-
-                _disambiguateDevices(devices);
-                setDevices(devices);
-            } catch (err) {
-                setDevices(null);
-            }
-        }
-        _downloadDeviceList();
-
-        // Handle being unmounted
-        return () => {
-            cancelled = true;
-        };
-    }, [cli, user.userId]);
-
-    // Listen to changes
-    useEffect(() => {
-        let cancel = false;
-        const onDeviceVerificationChanged = (_userId, device) => {
-            if (_userId === user.userId) {
-                // no need to re-download the whole thing; just update our copy of the list.
-
-                // Promise.resolve to handle transition from static result to promise; can be removed in future
-                Promise.resolve(cli.getStoredDevicesForUser(user.userId)).then((devices) => {
-                    if (cancel) return;
-                    setDevices(devices);
-                });
-            }
-        };
-        cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
-        // Handle being unmounted
-        return () => {
-            cancel = true;
-            cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
-        };
-    }, [cli, user.userId]);
-
-    let text;
-    if (!isRoomEncrypted) {
-        if (!_enableDevices) {
-            text = _t("This client does not support end-to-end encryption.");
-        } else if (room) {
-            text = _t("Messages in this room are not end-to-end encrypted.");
-        } else {
-            // TODO what to render for GroupMember
-        }
-    } else {
-        text = _t("Messages in this room are end-to-end encrypted.");
-    }
-
-    const userTrust = cli.checkUserTrust(user.userId);
-    const userVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
-        userTrust.isCrossSigningVerified() :
-        userTrust.isVerified();
-    const isMe = user.userId === cli.getUserId();
-    let verifyButton;
-    if (isRoomEncrypted && !userVerified && !isMe) {
-        verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyUser(user)}>
-            {_t("Verify")}
-        </AccessibleButton>;
-    }
-
-    let devicesSection;
-    if (isRoomEncrypted) {
-        devicesSection = <DevicesSection
-            loading={devices === undefined}
-            devices={devices} userId={user.userId} />;
-    }
-
-    const securitySection = (
-        <div className="mx_UserInfo_container">
-            <h3>{ _t("Security") }</h3>
-            <p>{ text }</p>
-            { verifyButton }
-            { devicesSection }
-        </div>
-    );
+    const devices = useDevices(user.userId);
 
     let e2eStatus;
     if (isRoomEncrypted && devices) {
         e2eStatus = getE2EStatus(cli, user.userId, devices);
     }
 
-    return <UserInfoPane onClose={onClose} e2eStatus={e2eStatus} member={member}>
-        { memberDetails &&
-        <div className="mx_UserInfo_container mx_UserInfo_separator mx_UserInfo_memberDetailsContainer">
-            <div className="mx_UserInfo_memberDetails">
-                { memberDetails }
-            </div>
-        </div> }
+    const classes = ["mx_UserInfo"];
 
-        { securitySection }
-        <UserOptionsSection
-            devices={devices}
-            canInvite={roomPermissions.canInvite}
-            isIgnored={isIgnored}
-            member={member} />
+    let content;
+    switch (phase) {
+        case RIGHT_PANEL_PHASES.RoomMemberInfo:
+        case RIGHT_PANEL_PHASES.GroupMemberInfo:
+            content = (
+                <BasicUserInfo
+                    room={room}
+                    member={member}
+                    groupId={groupId}
+                    devices={devices}
+                    isRoomEncrypted={isRoomEncrypted} />
+            );
+            break;
+        case RIGHT_PANEL_PHASES.EncryptionPanel:
+            classes.push("mx_UserInfo_smallAvatar");
+            content = (
+                <EncryptionPanel {...props} member={member} onClose={onClose} />
+            );
+            break;
+    }
 
-        { adminToolsContainer }
+    return (
+        <div className={classes.join(" ")} role="tabpanel">
+            <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
+                <UserInfoHeader member={member} e2eStatus={e2eStatus} onClose={onClose} />
 
-        { spinner }
-    </UserInfoPane>;
+                { content }
+            </AutoHideScrollbar>
+        </div>
+    );
 };
 
 UserInfo.propTypes = {
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 0d28e1568f..a66ecd34fb 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,8 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {_t} from "../../../languageHandler";
+import E2EIcon from "../rooms/E2EIcon";
 
 export default class VerificationPanel extends React.PureComponent {
     constructor(props) {
@@ -25,46 +28,81 @@ export default class VerificationPanel extends React.PureComponent {
         this._hasVerifier = !!props.request.verifier;
     }
 
-    render() {
-        return <div className="mx_UserInfo">
+    renderQRPhase() {
+        const {member} = this.props;
+        // TODO change the button into a spinner when on click
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return <React.Fragment>
             <div className="mx_UserInfo_container">
-                { this.renderStatus() }
+                <h3>Verify by scanning</h3>
+                <p>{_t("Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:", {
+                    displayName: member.displayName || member.name || member.userId,
+                }, {
+                    a: t => <a>{ t }</a>,
+                })}</p>
+                <div>QR Code</div>
             </div>
-        </div>;
+
+            <div className="mx_UserInfo_container">
+                <h3>Verify by emoji</h3>
+                <p>{_t("If you can't scan the code above, verify by comparing unique emoji.")}</p>
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+                    {_t("Verify by emoji")}
+                </AccessibleButton>
+            </div>
+        </React.Fragment>;
     }
 
-    renderStatus() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const Spinner = sdk.getComponent('elements.Spinner');
-        const {request} = this.props;
+    renderVerifiedPhase() {
+        const {member} = this.props;
 
-        if (request.requested) {
-            return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
-        } else if (request.ready) {
-            const verifyButton = <AccessibleButton kind="primary" onClick={this._startSAS}>
-                Verify by emoji
-            </AccessibleButton>;
-            return (<p>{request.otherUserId} is ready, start {verifyButton}</p>);
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        return (
+            <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
+                <h3>Verified</h3>
+                <p>{_t("You've successfully verified %(displayName)s!", {
+                    displayName: member.displayName || member.name || member.userId,
+                })}</p>
+                <E2EIcon isUser={true} status="verified" size={128} />
+                <p>Verify all users in a room to ensure it's secure.</p>
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+                    {_t("Got it")}
+                </AccessibleButton>
+            </div>
+        );
+    }
+
+    render() {
+        const {member, request} = this.props;
+
+        const displayName = member.displayName || member.name || member.userId;
+
+        if (request.ready) {
+            return this.renderQRPhase();
         } else if (request.started) {
-            if (this.state.sasWaitingForOtherParty) {
-                return <p>Waiting for {request.otherUserId} to confirm ...</p>;
-            } else if (this.state.sasEvent) {
+            if (this.state.sasEvent) {
                 const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
-                return (<div>
+                // TODO implement "mismatch" vs "cancelled"
+                return <div className="mx_UserInfo_container">
+                    <h3>Compare emoji</h3>
                     <VerificationShowSas
+                        displayName={displayName}
                         sas={this.state.sasEvent.sas}
                         onCancel={this._onSasMismatchesClick}
                         onDone={this._onSasMatchesClick}
                     />
-                </div>);
+                </div>;
             } else {
                 return (<p>Setting up SAS verification...</p>);
             }
         } else if (request.done) {
-            return <p>verified {request.otherUserId}!!</p>;
+            return this.renderVerifiedPhase();
         } else if (request.cancelled) {
+            // TODO check if this matches target
+            // TODO should this be a MODAL?
             return <p>cancelled by {request.cancellingUserId}!</p>;
         }
+        return null;
     }
 
     _startSAS = async () => {
@@ -79,7 +117,6 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onSasMatchesClick = () => {
-        this.setState({sasWaitingForOtherParty: true});
         this.state.sasEvent.confirm();
     };
 
@@ -106,7 +143,7 @@ export default class VerificationPanel extends React.PureComponent {
             request.verifier.removeListener('show_sas', this._onVerifierShowSas);
         }
         this._hasVerifier = !!request.verifier;
-        this.forceUpdate();
+        this.forceUpdate(); // TODO fix this
     };
 
     componentDidMount() {
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 479a3e3f93..769e0d36d0 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -76,10 +76,14 @@ export default class VerificationRequestToast extends React.PureComponent {
         }
         try {
             await request.accept();
+            const cli = MatrixClientPeg.get();
             dis.dispatch({
                 action: "set_right_panel_phase",
                 phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {verificationRequest: request},
+                refireParams: {
+                    verificationRequest: request,
+                    member: cli.getUser(request.otherUserId),
+                },
             });
         } catch (err) {
             console.error(err.message);
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 8f39457689..693a3769a0 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -18,6 +18,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
+import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
+import AccessibleButton from "../elements/AccessibleButton";
 
 function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
@@ -25,18 +27,26 @@ function capFirst(s) {
 
 export default class VerificationShowSas extends React.Component {
     static propTypes = {
+        displayName: PropTypes.string.isRequired,
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
+    };
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            pending: false,
+        };
     }
 
-    constructor() {
-        super();
-    }
+    onMatchClick = () => {
+        this.setState({ pending: true });
+        this.props.onDone();
+    };
 
     render() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-
         let sasDisplay;
         let sasCaption;
         if (this.props.sas.emoji) {
@@ -69,26 +79,33 @@ export default class VerificationShowSas extends React.Component {
         } else {
             return <div>
                 {_t("Unable to find a supported verification method.")}
-                <DialogButtons
-                    primaryButton={_t('Cancel')}
-                    hasCancel={false}
-                    onPrimaryButtonClick={this.props.onCancel}
-                />
+                <AccessibleButton kind="primary" onClick={this.props.onCancel} className="mx_UserInfo_verify">
+                    {_t('Cancel')}
+                </AccessibleButton>
             </div>;
         }
 
+        let confirm;
+        if (this.state.pending) {
+            const {displayName} = this.props;
+            const text = _t("Waiting for %(displayName)s to verify…", {displayName});
+            confirm = <PendingActionSpinner text={text} />;
+        } else {
+            confirm = <React.Fragment>
+                <AccessibleButton kind="primary" onClick={this.onMatchClick} className="mx_UserInfo_verify">
+                    {_t("They match")}
+                </AccessibleButton>
+                <AccessibleButton kind="danger" onClick={this.props.onCancel} className="mx_UserInfo_verify">
+                    {_t("They don't match")}
+                </AccessibleButton>
+            </React.Fragment>;
+        }
+
         return <div className="mx_VerificationShowSas">
             <p>{sasCaption}</p>
-            <p>{_t(
-                "For maximum security, we recommend you do this in person or use another " +
-                "trusted means of communication.",
-            )}</p>
+            <p>{_t("For ultimate security, do this in person or use another way to communicate.")}</p>
             {sasDisplay}
-            <DialogButtons onPrimaryButtonClick={this.props.onDone}
-                primaryButton={_t("Continue")}
-                hasCancel={true}
-                onCancel={this.props.onCancel}
-            />
+            {confirm}
         </div>;
     }
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c99b22f421..5b131b8750 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -451,7 +451,10 @@
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Cancel": "Cancel",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
+    "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
+    "They match": "They match",
+    "They don't match": "They don't match",
+    "For ultimate security, do this in person or use another way to communicate.": "For ultimate security, do this in person or use another way to communicate.",
     "Dog": "Dog",
     "Cat": "Cat",
     "Lion": "Lion",
@@ -1124,12 +1127,13 @@
     "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.",
     "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.",
-    "Verify User": "Verify User",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
-    "For maximum security, do this in person.": "For maximum security, do this in person.",
+    "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
     "Start Verification": "Start Verification",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
+    "Verify User": "Verify User",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
+    "For maximum security, do this in person.": "For maximum security, do this in person.",
     "Members": "Members",
     "Files": "Files",
     "Trusted": "Trusted",
@@ -1147,6 +1151,11 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Security": "Security",
+    "Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:": "Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
+    "Verify by emoji": "Verify by emoji",
+    "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
+    "Got it": "Got it",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -1426,6 +1435,7 @@
     "Verify device": "Verify device",
     "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
     "Verify by comparing a short text string.": "Verify by comparing a short text string.",
+    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
     "Begin Verifying": "Begin Verifying",
     "Waiting for partner to accept...": "Waiting for partner to accept...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",

From f8e0dcf26437c03c384ace261b53f06cb5a2293d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jan 2020 09:33:55 -0700
Subject: [PATCH 0701/3235] Add null check for cross-signing info in
 verification panel

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a29546c8f7..70ef8486bd 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -49,12 +49,12 @@ export default class VerificationPanel extends React.PureComponent {
                 Verify by emoji
             </AccessibleButton>;
 
-            if (request.requestEvent && request.requestEvent.getId()) {
+            const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+            if (request.requestEvent && request.requestEvent.getId() && crossSigningInfo) {
                 const qrCodeKeys = [
                     [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
                     [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
                 ];
-                const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
                 const qrCode = <VerificationQRCode
                     keyholderUserId={MatrixClientPeg.get().getUserId()}
                     requestEventId={request.requestEvent.getId()}

From 91d59556db80dbabfea8a66a47963cdcaafcc158 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jan 2020 09:37:12 -0700
Subject: [PATCH 0702/3235] Also check for our own key ID

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 70ef8486bd..403cff818c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -50,10 +50,11 @@ export default class VerificationPanel extends React.PureComponent {
             </AccessibleButton>;
 
             const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+            const myKeyId = MatrixClientPeg.get().getCrossSigningId();
             if (request.requestEvent && request.requestEvent.getId() && crossSigningInfo) {
                 const qrCodeKeys = [
                     [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-                    [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
+                    [myKeyId, MatrixClientPeg.get().getCrossSigningId()],
                 ];
                 const qrCode = <VerificationQRCode
                     keyholderUserId={MatrixClientPeg.get().getUserId()}

From b67256c7c2b0b68b4b54274fcbf70b2336a32134 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Jan 2020 16:41:43 +0000
Subject: [PATCH 0703/3235] post-merge fix

---
 src/components/structures/RightPanel.js       |  4 +--
 .../views/right_panel/VerificationPanel.js    | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 2188bda4f2..79955c8448 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -196,7 +196,7 @@ export default class RightPanel extends React.Component {
                     });
                 };
                 panel = <UserInfo
-                    userId={this.state.member}
+                    user={this.state.member}
                     roomId={this.props.roomId}
                     key={this.props.roomId || this.state.member.userId}
                     onClose={onClose}
@@ -217,7 +217,7 @@ export default class RightPanel extends React.Component {
                     });
                 };
                 panel = <UserInfo
-                    userId={this.state.member}
+                    user={this.state.member}
                     groupId={this.props.groupId}
                     key={this.state.member.userId}
                     onClose={onClose} />;
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index cbabb1188a..0fdf16de65 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -19,7 +19,6 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {_t} from "../../../languageHandler";
 import E2EIcon from "../rooms/E2EIcon";
@@ -32,9 +31,26 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     renderQRPhase() {
-        const {member} = this.props;
+        const {member, request} = this.props; // type req: VerificationRequest
         // TODO change the button into a spinner when on click
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+
+        if (!request.requestEvent || !request.requestEvent.getId()) {
+            // TODO handle this error case
+            return <p>request.requestEvent.getId()</p>;
+        }
+
+        const qrCodeKeys = [
+            [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
+            [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
+        ];
+        const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+
+        if (!crossSigningInfo) {
+            // TODO handle this error case
+            return <p>crossSigningInfo</p>;
+        }
+
         return <React.Fragment>
             <div className="mx_UserInfo_container">
                 <h3>Verify by scanning</h3>
@@ -43,12 +59,20 @@ export default class VerificationPanel extends React.PureComponent {
                 }, {
                     a: t => <a>{ t }</a>,
                 })}</p>
-                <div>QR Code</div>
+
+                <VerificationQRCode
+                    keyholderUserId={MatrixClientPeg.get().getUserId()}
+                    requestEventId={request.requestEvent.getId()}
+                    otherUserKey={crossSigningInfo.getId("master")}
+                    secret={request.encodedSharedSecret}
+                    keys={qrCodeKeys}
+                />
             </div>
 
             <div className="mx_UserInfo_container">
                 <h3>Verify by emoji</h3>
                 <p>{_t("If you can't scan the code above, verify by comparing unique emoji.")}</p>
+
                 <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
                     {_t("Verify by emoji")}
                 </AccessibleButton>

From 540a7f5c02f7b5151c38edcb4cd715e62294704c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jan 2020 09:41:47 -0700
Subject: [PATCH 0704/3235] less duplication

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 403cff818c..a75afd154a 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -54,7 +54,7 @@ export default class VerificationPanel extends React.PureComponent {
             if (request.requestEvent && request.requestEvent.getId() && crossSigningInfo) {
                 const qrCodeKeys = [
                     [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-                    [myKeyId, MatrixClientPeg.get().getCrossSigningId()],
+                    [myKeyId, myKeyId],
                 ];
                 const qrCode = <VerificationQRCode
                     keyholderUserId={MatrixClientPeg.get().getUserId()}

From 202149875525752e261bd25689fa753eb8a1574f Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 24 Jan 2020 17:31:00 +0000
Subject: [PATCH 0705/3235] Update profile avatar letter size

Fixes https://github.com/vector-im/riot-web/issues/12042
---
 res/css/views/right_panel/_UserInfo.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index d2d9d12c6d..ad6254f57c 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -103,7 +103,7 @@ limitations under the License.
         justify-content: center;
 
         // override the calculated sizes so that the letter isn't HUGE
-        font-size: 26px !important;
+        font-size: 56px !important;
         width: 100% !important;
     }
 

From bf0e1efce8441d8b8bd06243255617da76a11ffc Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 24 Jan 2020 17:53:30 +0000
Subject: [PATCH 0706/3235] Hide default encryption algorithm

When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".

Fixes https://github.com/vector-im/riot-web/issues/8829
---
 src/TextForEvent.js         | 17 +++++++++++++----
 src/i18n/strings/en_EN.json |  3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 6a2744109b..cdfea45ad7 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -444,10 +444,19 @@ function textForHistoryVisibilityEvent(event) {
 
 function textForEncryptionEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).', {
-        senderName,
-        algorithm: event.getContent().algorithm,
-    });
+    if (event.getContent().algorithm === "m.megolm.v1.aes-sha2") {
+        return _t('%(senderName)s turned on end-to-end encryption.', {
+            senderName,
+        });
+    }
+    return _t(
+        '%(senderName)s turned on end-to-end encryption ' +
+        '(unrecognised algorithm %(algorithm)s).',
+        {
+            senderName,
+            algorithm: event.getContent().algorithm,
+        },
+    );
 }
 
 // Currently will only display a change if a user's power level is changed
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c3ad3d1901..79f5731aed 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -256,7 +256,8 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s turned on end-to-end encryption.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",

From 3d7137d4adeb4fa69742605e1828c53dabb5a2e2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 19:11:57 +0000
Subject: [PATCH 0707/3235] Setup flow for cross-signing on login /
 registration

Still outstanding:
 * Keep password from login / registration
 * Confirmation on skip button

Fixes https://github.com/vector-im/riot-web/issues/11902
---
 res/css/_common.scss                          | 18 ++++---
 res/css/views/auth/_AuthBody.scss             |  9 ++--
 .../_CreateSecretStorageDialog.scss           |  4 ++
 .../CreateSecretStorageDialog.js              | 39 +++++++++++----
 src/components/structures/MatrixChat.js       | 35 +++++++++++---
 src/components/structures/RoomView.js         |  2 +-
 src/components/structures/auth/E2eSetup.js    | 48 +++++++++++++++++++
 src/components/views/auth/AuthBody.js         |  4 ++
 .../keybackup/RestoreKeyBackupDialog.js       | 25 ++++++++++
 9 files changed, 159 insertions(+), 25 deletions(-)
 create mode 100644 src/components/structures/auth/E2eSetup.js

diff --git a/res/css/_common.scss b/res/css/_common.scss
index abc57a95ed..b92a618504 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -386,7 +386,13 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     text-align: right;
 }
 
-.mx_Dialog button, .mx_Dialog input[type="submit"] {
+/* XXX: Our button style are a mess: buttons that happen to appear in dialogs get special styles applied
+ * to them that no button anywhere else in the app gets by default. In practice, buttons in other places
+ * in the app look the same by being AccessibleButtons, or possibly by having explict button classes.
+ * We should go through and have one consistent set of styles for buttons throughout the app.
+ * For now, I am duplicating the selectors here for mx_Dialog and mx_DialogButtons.
+ */
+.mx_Dialog button, .mx_Dialog input[type="submit"], .mx_Dialog_buttons button, .mx_Dialog_buttons input[type="submit"] {
     @mixin mx_DialogButton;
     margin-left: 0px;
     margin-right: 8px;
@@ -402,27 +408,27 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     margin-right: 0px;
 }
 
-.mx_Dialog button:hover, .mx_Dialog input[type="submit"]:hover {
+.mx_Dialog button:hover, .mx_Dialog input[type="submit"]:hover, .mx_Dialog_buttons button:hover, .mx_Dialog_buttons input[type="submit"]:hover {
     @mixin mx_DialogButton_hover;
 }
 
-.mx_Dialog button:focus, .mx_Dialog input[type="submit"]:focus {
+.mx_Dialog button:focus, .mx_Dialog input[type="submit"]:focus, .mx_Dialog_buttons button:focus, .mx_Dialog_buttons input[type="submit"]:focus {
     filter: brightness($focus-brightness);
 }
 
-.mx_Dialog button.mx_Dialog_primary, .mx_Dialog input[type="submit"].mx_Dialog_primary {
+.mx_Dialog button.mx_Dialog_primary, .mx_Dialog input[type="submit"].mx_Dialog_primary, .mx_Dialog_buttons button.mx_Dialog_primary, .mx_Dialog_buttons input[type="submit"].mx_Dialog_primary {
     color: $accent-fg-color;
     background-color: $accent-color;
     min-width: 156px;
 }
 
-.mx_Dialog button.danger, .mx_Dialog input[type="submit"].danger {
+.mx_Dialog button.danger, .mx_Dialog input[type="submit"].danger, .mx_Dialog_buttons button.danger, .mx_Dialog_buttons input[type="submit"].danger {
     background-color: $warning-color;
     border: solid 1px $warning-color;
     color: $accent-fg-color;
 }
 
-.mx_Dialog button:disabled, .mx_Dialog input[type="submit"]:disabled {
+.mx_Dialog button:disabled, .mx_Dialog input[type="submit"]:disabled, .mx_Dialog_buttons button:disabled, .mx_Dialog_buttons input[type="submit"]:disabled {
     background-color: $light-fg-color;
     border: solid 1px $light-fg-color;
     opacity: 0.7;
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index d342de6d75..51b9775811 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -15,13 +15,10 @@ limitations under the License.
 */
 
 .mx_AuthBody {
-    width: 500px;
     background-color: $authpage-body-bg-color;
     border-radius: 0 4px 4px 0;
     padding: 25px 60px;
     box-sizing: border-box;
-    font-size: 12px;
-    color: $authpage-secondary-color;
 
     h2 {
         font-size: 24px;
@@ -99,6 +96,12 @@ limitations under the License.
     border-radius: 4px;
 }
 
+.mx_AuthBody_loginRegister {
+    width: 500px;
+    font-size: 12px;
+    color: $authpage-secondary-color;
+}
+
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index ed5aaa05a3..53e82670e1 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -78,6 +78,10 @@ limitations under the License.
     align-items: center;
 }
 
+.mx_CreateSecretStorageDialog_recoveryKeyButtons .mx_AccessibleButton {
+    margin-right: 10px;
+}
+
 .mx_CreateSecretStorageDialog_recoveryKeyButtons button {
     flex: 1;
     white-space: nowrap;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 8fd881fc32..92ede334d0 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { scorePassword } from '../../../../utils/PasswordScorer';
@@ -52,6 +53,14 @@ function selectText(target) {
  * Secret Storage in account data.
  */
 export default class CreateSecretStorageDialog extends React.PureComponent {
+    static propTypes = {
+        hasCancel: PropTypes.bool,
+    };
+
+    defaultProps = {
+        hasCancel: true,
+    };
+
     constructor(props) {
         super(props);
 
@@ -82,9 +91,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         this._fetchBackupInfo();
         this._queryKeyUploadAuth();
+
+        MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
     }
 
     componentWillUnmount() {
+        MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
         if (this._setZxcvbnResultTimeout !== null) {
             clearTimeout(this._setZxcvbnResultTimeout);
         }
@@ -92,7 +104,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     async _fetchBackupInfo() {
         const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-        const backupSigStatus = await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo);
+        const backupSigStatus = (
+            // we may not have started crypto yet, in which case we definitely don't trust the backup
+            MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
+        );
 
         const phase = backupInfo ?
             (backupSigStatus.usable ? PHASE_MIGRATE : PHASE_RESTORE_KEY_BACKUP) :
@@ -127,6 +142,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     }
 
+    _onKeyBackupStatusChange = () => {
+        this._fetchBackupInfo();
+    }
+
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
@@ -229,7 +248,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _onRestoreKeyBackupClick = () => {
         const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
         Modal.createTrackedDialog(
-            'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+            'Restore Backup', '', RestoreKeyBackupDialog, {showSummary: false}, null,
             /* priority = */ false, /* static = */ true,
         );
     }
@@ -411,6 +430,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const Field = sdk.getComponent('views.elements.Field');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let strengthMeter;
         let helpText;
@@ -472,9 +492,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
             <details>
                 <summary>{_t("Advanced")}</summary>
-                <p><button onClick={this._onSkipPassPhraseClick} >
+                <p><AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
                     {_t("Set up with a recovery key")}
-                </button></p>
+                </AccessibleButton></p>
             </details>
         </div>;
     }
@@ -554,6 +574,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             );
         }
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
@@ -572,12 +593,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                         <code ref={this._collectRecoveryKeyNode}>{this._encodedRecoveryKey}</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
-                        <button className="mx_Dialog_primary" onClick={this._onCopyClick}>
+                        <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onCopyClick}>
                             {_t("Copy to clipboard")}
-                        </button>
-                        <button className="mx_Dialog_primary" onClick={this._onDownloadClick}>
+                        </AccessibleButton>
+                        <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
                             {_t("Download")}
-                        </button>
+                        </AccessibleButton>
                     </div>
                 </div>
             </div>
@@ -740,7 +761,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 onFinished={this.props.onFinished}
                 title={this._titleForPhase(this.state.phase)}
                 headerImage={headerImage}
-                hasCancel={[PHASE_PASSPHRASE].includes(this.state.phase)}
+                hasCancel={this.props.hasCancel && [PHASE_PASSPHRASE].includes(this.state.phase)}
             >
             <div>
                 {content}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 0486ce764c..b4b38d7617 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -89,12 +89,15 @@ export const VIEWS = {
     // showing flow to trust this new device with cross-signing
     COMPLETE_SECURITY: 6,
 
+    // flow to setup SSSS / cross-signing on this account
+    E2E_SETUP: 7,
+
     // we are logged in with an active matrix client.
-    LOGGED_IN: 7,
+    LOGGED_IN: 8,
 
     // We are logged out (invalid token) but have our local state again. The user
     // should log back in to rehydrate the client.
-    SOFT_LOGOUT: 8,
+    SOFT_LOGOUT: 9,
 };
 
 // Actions that are redirected through the onboarding process prior to being
@@ -657,7 +660,9 @@ export default createReactClass({
                 if (
                     !Lifecycle.isSoftLogout() &&
                     this.state.view !== VIEWS.LOGIN &&
-                    this.state.view !== VIEWS.COMPLETE_SECURITY
+                    this.state.view !== VIEWS.REGISTER &&
+                    this.state.view !== VIEWS.COMPLETE_SECURITY &&
+                    this.state.view !== VIEWS.E2E_SETUP
                 ) {
                     this._onLoggedIn();
                 }
@@ -1724,6 +1729,11 @@ export default createReactClass({
         this.showScreen("forgot_password");
     },
 
+    onRegisterFlowComplete: function(credentials) {
+        this.onUserCompletedLoginFlow();
+        return this.onRegistered(credentials);
+    },
+
     // returns a promise which resolves to the new MatrixClient
     onRegistered: function(credentials) {
         return Lifecycle.setLoggedIn(credentials);
@@ -1847,12 +1857,18 @@ export default createReactClass({
 
         if (masterKeyInStorage) {
             this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
+        } else if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            // This will only work if the feature is set to 'enable' in the config,
+            // since it's too early in the lifecycle for users to have turned the
+            // labs flag on.
+            this.setStateForNewView({ view: VIEWS.E2E_SETUP });
         } else {
             this._onLoggedIn();
         }
     },
 
-    onCompleteSecurityFinished() {
+    // complete security / e2e setup has finished
+    onCompleteSecurityE2eSetupFinished() {
         this._onLoggedIn();
     },
 
@@ -1872,7 +1888,14 @@ export default createReactClass({
             const CompleteSecurity = sdk.getComponent('structures.auth.CompleteSecurity');
             view = (
                 <CompleteSecurity
-                    onFinished={this.onCompleteSecurityFinished}
+                    onFinished={this.onCompleteSecurityE2eSetupFinished}
+                />
+            );
+        } else if (this.state.view === VIEWS.E2E_SETUP) {
+            const E2eSetup = sdk.getComponent('structures.auth.E2eSetup');
+            view = (
+                <E2eSetup
+                    onFinished={this.onCompleteSecurityE2eSetupFinished}
                 />
             );
         } else if (this.state.view === VIEWS.POST_REGISTRATION) {
@@ -1939,7 +1962,7 @@ export default createReactClass({
                     email={this.props.startingFragmentQueryParams.email}
                     brand={this.props.config.brand}
                     makeRegistrationUrl={this._makeRegistrationUrl}
-                    onLoggedIn={this.onRegistered}
+                    onLoggedIn={this.onRegisterFlowComplete}
                     onLoginClick={this.onLoginClick}
                     onServerConfigChange={this.onServerConfigChange}
                     {...this.getServerProperties()}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5c243f04bc..60fff5f1e3 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -766,7 +766,7 @@ export default createReactClass({
 
     onUserVerificationChanged: function(userId, _trustStatus) {
         const room = this.state.room;
-        if (!room.currentState.getMember(userId)) {
+        if (!room || !room.currentState.getMember(userId)) {
             return;
         }
         this._updateE2EStatus(room);
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.js
new file mode 100644
index 0000000000..a5f4ff933b
--- /dev/null
+++ b/src/components/structures/auth/E2eSetup.js
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 AsyncWrapper from '../../../AsyncWrapper';
+import * as sdk from '../../../index';
+
+export default class E2eSetup extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+        // awkwardly indented because https://github.com/eslint/eslint/issues/11310
+        this._createStorageDialogPromise =
+            import("../../../async-components/views/dialogs/secretstorage/CreateSecretStorageDialog");
+    }
+
+    render() {
+        const AuthPage = sdk.getComponent("auth.AuthPage");
+        const AuthBody = sdk.getComponent("auth.AuthBody");
+        return (
+            <AuthPage>
+                <AuthBody header={false}>
+                    <AsyncWrapper prom={this._createStorageDialogPromise}
+                        hasCancel={false}
+                        onFinished={this.props.onFinished}
+                    />
+                </AuthBody>
+            </AuthPage>
+        );
+    }
+}
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index fe20d76afb..b74b7d866a 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -33,6 +33,10 @@ export default class AuthBody extends React.PureComponent {
         const classes = {
             'mx_AuthBody': true,
             'mx_AuthBody_noHeader': !this.props.header,
+            // XXX The login pages all use a smaller fonts size but we don't want this
+            // for subsequent auth screens like the e2e setup. Doing this a terrible way
+            // for now.
+            'mx_AuthBody_loginRegister': this.props.header,
         };
 
         return <div className={classnames(classes)}>
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 77fdee5e8a..0c432ba542 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
@@ -32,6 +33,16 @@ const RESTORE_TYPE_SECRET_STORAGE = 2;
  * Dialog for restoring e2e keys from a backup and the user's recovery key
  */
 export default class RestoreKeyBackupDialog extends React.PureComponent {
+    static propTypes = {
+        // if false, will close the dialog as soon as the restore completes succesfully
+        // default: true
+        showSummary: PropTypes.bool,
+    };
+
+    defaultProps = {
+        showSummary: true,
+    };
+
     constructor(props) {
         super(props);
         this.state = {
@@ -96,6 +107,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
                 this.state.passPhrase, undefined, undefined, this.state.backupInfo,
             );
+            if (!this.props.showSummary) {
+                this.props.onFinished(true);
+                return;
+            }
             this.setState({
                 loading: false,
                 recoverInfo,
@@ -119,6 +134,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo,
             );
+            if (!this.props.showSummary) {
+                this.props.onFinished(true);
+                return;
+            }
             this.setState({
                 loading: false,
                 recoverInfo,
@@ -253,6 +272,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             title = _t("Error");
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             title = _t("Backup Restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
@@ -264,6 +284,11 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = <div>
                 <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
+                <DialogButtons primaryButton={_t('OK')}
+                    onPrimaryButtonClick={this._onDone}
+                    hasCancel={false}
+                    focus={true}
+                />
             </div>;
         } else if (backupHasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');

From 9991a544aa2b413d00640bb6cb9262d831c80358 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 24 Jan 2020 22:26:28 +0000
Subject: [PATCH 0708/3235] Resolve default export warnings from Webpack

Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.

As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import.
---
 src/components/structures/InteractiveAuth.js                | 2 +-
 src/components/structures/TopLeftMenuButton.js              | 2 +-
 src/components/views/auth/InteractiveAuthEntryComponents.js | 2 +-
 src/components/views/context_menus/TopLeftMenu.js           | 2 +-
 src/components/views/emojipicker/EmojiPicker.js             | 2 +-
 src/{components/views => }/emojipicker/recent.js            | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{components/views => }/emojipicker/recent.js (100%)

diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 53bb990e26..3d63029b06 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -20,7 +20,7 @@ import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 
-import {getEntryComponentForLoginType} from '../views/auth/InteractiveAuthEntryComponents';
+import getEntryComponentForLoginType from '../views/auth/InteractiveAuthEntryComponents';
 
 import * as sdk from '../../index';
 
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index 967805d099..ebd7aaae89 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {TopLeftMenu} from '../views/context_menus/TopLeftMenu';
+import TopLeftMenu from '../views/context_menus/TopLeftMenu';
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as Avatar from '../../Avatar';
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 869e81c1f7..801420da95 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -641,7 +641,7 @@ const AuthEntryComponents = [
     TermsAuthEntry,
 ];
 
-export function getEntryComponentForLoginType(loginType) {
+export default function getEntryComponentForLoginType(loginType) {
     for (const c of AuthEntryComponents) {
         if (c.LOGIN_TYPE == loginType) {
             return c;
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 528e4790c2..51ec202b90 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -27,7 +27,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
 import * as sdk from "../../../index";
 
-export class TopLeftMenu extends React.Component {
+export default class TopLeftMenu extends React.Component {
     static propTypes = {
         displayName: PropTypes.string.isRequired,
         userId: PropTypes.string.isRequired,
diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index 1f508ceedc..ca8f0c0565 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
-import * as recent from './recent';
+import * as recent from '../../../emojipicker/recent';
 import {DATA_BY_CATEGORY, getEmojiFromUnicode} from "../../../emoji";
 
 export const CATEGORY_HEADER_HEIGHT = 22;
diff --git a/src/components/views/emojipicker/recent.js b/src/emojipicker/recent.js
similarity index 100%
rename from src/components/views/emojipicker/recent.js
rename to src/emojipicker/recent.js

From 95df8b9bb7d4a2b40e65d079fb31bfca6767c57c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 24 Jan 2020 18:34:27 +0000
Subject: [PATCH 0709/3235] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2052 of 2056 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 | 52 +++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index da2c015335..d2b877a8de 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -981,7 +981,7 @@
     "Please <a>contact your service administrator</a> to get this limit increased.": "A korlát emelése érdekében kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátját <b>néhány felhasználó nem fog tudni bejelentkezni</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ez a Matrix szerver túllépte valamelyik erőforrás korlátját így <b>néhány felhasználó nem tud majd bejelentkezni</b>.",
-    "Upgrade Room Version": "Szoba verziójának frissítése",
+    "Upgrade Room Version": "Szoba verziójának fejlesztése",
     "Create a new room with the same name, description and avatar": "Készíts egy új szobát ugyanazzal a névvel, leírással és profilképpel",
     "Update any local room aliases to point to the new room": "Állíts át minden helyi alternatív nevet erre a szobára",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "A felhasználóknak tiltsd meg, hogy a régi szobában beszélgessenek. Küldj egy üzenetet amiben megkéred a felhasználókat, hogy menjenek át az új szobába",
@@ -996,9 +996,9 @@
     "The conversation continues here.": "A beszélgetés itt folytatódik.",
     "This room is a continuation of another conversation.": "Ebben a szobában folytatódik egy másik beszélgetés.",
     "Click here to see older messages.": "Ide kattintva megnézheted a régi üzeneteket.",
-    "Failed to upgrade room": "A szoba frissítése sikertelen",
-    "The room upgrade could not be completed": "A szoba frissítését nem sikerült befejezni",
-    "Upgrade this room to version %(version)s": "A szoba frissítése %(version)s verzióra",
+    "Failed to upgrade room": "A szoba fejlesztése sikertelen",
+    "The room upgrade could not be completed": "A szoba fejlesztését nem sikerült befejezni",
+    "Upgrade this room to version %(version)s": "A szoba fejlesztése %(version)s verzióra",
     "Forces the current outbound group session in an encrypted room to be discarded": "A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában",
     "Registration Required": "Regisztrációt igényel",
     "You need to register to do this. Would you like to register now?": "Hogy ezt megtedd regisztrálnod kell. Szeretnél regisztrálni?",
@@ -1140,9 +1140,9 @@
     "Invite anyway and never warn me again": "Mindenképpen meghív és ne figyelmeztess többet",
     "Invite anyway": "Mindenképpen meghív",
     "Whether or not you're logged in (we don't record your username)": "Se akkor ha bejelentkezel se akkor ha nem; mi nem tároljuk a felhasználói nevedet",
-    "Upgrades a room to a new version": "Szoba frissítése új verzióra",
+    "Upgrades a room to a new version": "Szoba fejlesztése új verzióra",
     "Sets the room name": "Szobanév beállítása",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s frissítette a szobát.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s fejlesztette a szobát.",
     "%(displayName)s is typing …": "%(displayName)s gépel …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s és %(count)s másik gépelnek …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s és még valaki gépelnek …",
@@ -1460,9 +1460,9 @@
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s visszavonta %(targetDisplayName)s a szobába való belépéséhez szükséges meghívóját.",
     "Enable desktop notifications for this device": "Asztali értesítések engedélyezése ehhez az eszközhöz",
     "Enable audible notifications for this device": "Hallható értesítések engedélyezése ehhez az eszközhöz",
-    "Upgrade this room to the recommended room version": "A szoba frissítése a javasolt verzióra",
+    "Upgrade this room to the recommended room version": "A szoba fejlesztése a javasolt verzióra",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A szoba verziója:  <roomVersion />, amit a Matrix szerver <i>instabilnak</i> tekint.",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "A szoba frissítése bezárja ezt a szobát és új, frissített verzióval ugyanezen a néven létrehoz egy újat.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "A szoba fejlesztése bezárja ezt a szobát és új, frissített verzióval ugyanezen a néven létrehoz egy újat.",
     "Failed to revoke invite": "A meghívó visszavonása sikertelen",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "A meghívót nem lehet visszavonni. Vagy a szervernek átmenetileg problémái vannak vagy nincs megfelelő jogosultságod a meghívó visszavonásához.",
     "Revoke invite": "Meghívó visszavonása",
@@ -1507,7 +1507,7 @@
     "Sends the given message coloured as a rainbow": "A megadott üzenetet szivárvány színben küldi el",
     "Sends the given emote coloured as a rainbow": "A megadott hangulatjelet szivárvány színben küldi el",
     "The user's homeserver does not support the version of the room.": "A felhasználó matrix szervere nem támogatja a megadott szoba verziót.",
-    "When rooms are upgraded": "Ha a szobák frissültek",
+    "When rooms are upgraded": "Ha a szobák fejlesztésre kerülnek",
     "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ez az eszköz <b>nem menti el a kulcsaidat</b>, de létezik mentés amit visszaállíthatsz és folytathatod.",
     "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Csatlakozz ezzel az eszközzel a kulcs mentéshez kilépés előtt, hogy ne veszíts el kulcsot ami esetleg csak ezen az eszközön van meg.",
     "Connect this device to Key Backup": "Csatlakozz ezzel az eszközzel a Kulcs Mentéshez",
@@ -1538,7 +1538,7 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Ez a szoba nem létezik. Biztos, hogy jó helyen vagy?",
     "Try again later, or ask a room admin to check if you have access.": "Próbálkozz később vagy kérd meg a szoba adminisztrátorát, hogy nézze meg van-e hozzáférésed.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Amikor a szobát próbáltuk elérni ezt a hibaüzenetet kaptuk: %(errcode)s. Ha úgy gondolod, hogy ez egy hiba légy szíves<issueLink>nyiss egy hibajegyet</issueLink>.",
-    "This room has already been upgraded.": "Ez a szoba már frissült.",
+    "This room has already been upgraded.": "Ez a szoba már fejlesztve van.",
     "Rotate Left": "Balra forgat",
     "Rotate Right": "Jobbra forgat",
     "View Servers in Room": "Szerverek megjelenítése a szobában",
@@ -1690,7 +1690,7 @@
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ha felkutatásra és, hogy más ismerősök megtalálhassanak, nem akarod használni ezt a szervert: <server />, akkor adjál meg másik azonosítási szervert alább.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Azonosítási szerver használata nem kötelező. Ha úgy döntesz, hogy az azonosítási szervert nem használod más felhasználók nem találnak rád és másokat sem tudsz e-mail cím vagy telefonszám alapján meghívni.",
     "Do not use an identity server": "Az azonosítási szerver mellőzése",
-    "Upgrade the room": "Szoba frissítése",
+    "Upgrade the room": "Szoba fejlesztése",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "E-mail cím beállítása a fiók visszaállításához. E-mail cím vagy telefonszám, hogy ismerősök megtalálhassanak.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "E-mail cím beállítása a fiók visszaállításához. E-mail cím, hogy ismerősök megtalálhassanak.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Add meg a matrix szervered URL-jét <a>Mit jelent ez?</a>",
@@ -1930,12 +1930,12 @@
     "This message cannot be decrypted": "Ezt az üzenetet nem lehet visszafejteni",
     "Unencrypted": "Titkosítatlan",
     "Automatically invite users": "Felhasználók automatikus meghívása",
-    "Upgrade private room": "Privát szoba frissítése",
-    "Upgrade public room": "Nyilvános szoba frissítése",
+    "Upgrade private room": "Privát szoba fejlesztése",
+    "Upgrade public room": "Nyilvános szoba fejlesztése",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "A szoba frissítése nem egyszerű művelet, általában a szoba hibás működése, hiányzó funkció vagy biztonsági sérülékenység esetén javasolt.",
     "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Ez általában a szoba szerver oldali kezelésében jelent változást. Ha a Riotban van problémád, kérlek <a>küldj egy hibajelentést</a>.",
-    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "<oldVersion /> verzióról <newVersion /> verzióra frissíted a szobát.",
-    "Upgrade": "Frissítés",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "<oldVersion /> verzióról <newVersion /> verzióra fejleszted a szobát.",
+    "Upgrade": "Fejlesztés",
     "Notification settings": "Értesítések beállítása",
     "User Status": "Felhasználó állapota",
     "Reactions": "Reakciók",
@@ -2086,5 +2086,25 @@
     "Unrecognised command: %(commandText)s": "Ismeretlen parancs: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Használhatod a <code>/help</code>-et az elérhető parancsok kilistázásához. Ezt üzenetként akartad küldeni?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tipp: Ez üzenetedet kezd ezzel: <code>//</code>, ha perjellel szeretnéd kezdeni.",
-    "Send as message": "Üzenet küldése"
+    "Send as message": "Üzenet küldése",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s szoba címnek, %(count)s másikkal együtt, hozzáadta: %(addedAddresses)s",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s %(count)s másikkal együtt törölte a szoba címek közül: %(removedAddresses)s",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s %(countRemoved)s darabot törölt és %(countAdded)s darabot hozzáadott a szoba címekhez",
+    "Someone is using an unknown device": "Valaki ismeretlen eszközt használ",
+    "This room is end-to-end encrypted": "Ez a szoba végpontok közötti titkosítást használ",
+    "Everyone in this room is verified": "A szobába mindenki ellenőrizve van",
+    "Invite only": "Csak meghívóval",
+    "Send a reply…": "Válasz küldése…",
+    "Send a message…": "Üzenet küldése…",
+    "Reject & Ignore user": "Felhasználó elutasítása és figyelmen kívül hagyása",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét, áruld el neki a felhasználói nevedet (%(userId)s) vagy a <a>profil hivatkozásodat</a>.",
+    "Enter your account password to confirm the upgrade:": "A fejlesztés megerősítéséhez add meg a fiók jelszavadat:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Azonosítanod kell magad a szerveren a fejlesztés megerősítéséhez.",
+    "Enter a passphrase": "Jelmondat bevitele",
+    "Enter your passphrase a second time to confirm it.": "Add meg a jelmondatot másodszor is a biztonság kedvéért.",
+    "Verify other users in their profile.": "Más felhasználók ellenőrzése a profiljukban.",
+    "Upgrade your encryption": "Titkosításod fejlesztése",
+    "Set up encryption": "Titkosítás beállítása",
+    "Encryption upgraded": "Titkosítás fejlesztve",
+    "Encryption setup complete": "Titkosítás beállítása kész"
 }

From 662c723bf3401157e59601188d53ff008ae4d230 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 24 Jan 2020 18:48:00 +0000
Subject: [PATCH 0710/3235] Translated using Weblate (Turkish)

Currently translated at 73.7% (1515 of 2056 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 2656b00593..db43e96cea 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1510,5 +1510,27 @@
     "%(senderName)s placed a voice call.": "%(senderName)s bir çağrı yaptı.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bir çağrı başlattı. (Bu tarayıcı tarafından desteklenmiyor)",
     "%(senderName)s placed a video call.": "%(senderName)s bir görüntülü çağrı yaptı.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bir görüntülü çağrı yaptı. (bu tarayıcı tarafından desteklenmiyor)"
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bir görüntülü çağrı yaptı. (bu tarayıcı tarafından desteklenmiyor)",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Riot yöneticinize <a>yapılandırmanızın</a> hatalı ve mükerrer girdilerini kontrol etmesi için talepte bulunun.",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Kayıt olabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Parolanızı sıfırlayabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Oturum açabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
+    "a few seconds from now": "şu andan itibaren bir kaç saniye",
+    "about a minute from now": "şu andan itibaren yaklaşık bir dakika",
+    "%(num)s minutes from now": "şu andan itibaren %(num)s dakika",
+    "about an hour from now": "şu andan itibaren yaklaşık bir saat",
+    "%(num)s hours from now": "şu andan itibaren %(num)s saat",
+    "about a day from now": "şu andan itibaren yaklaşık bir gün",
+    "%(num)s days from now": "şu andan itibaren %(num)s gün",
+    "The user must be unbanned before they can be invited.": "Kullanıcının davet edilebilmesi için öncesinde yasağının kaldırılması gereklidir.",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "“abcabcabc” gibi tekrarlar “abc” yi tahmin etmekten çok az daha zor olur",
+    "Sequences like abc or 6543 are easy to guess": "abc veya 6543 gibi diziler tahmin için oldukça kolaydır",
+    "Common names and surnames are easy to guess": "Yaygın isimleri ve soyisimleri tahmin etmek oldukça kolay",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Her cihaz yerine her kullanıcıyı doğrulamak için çarpraz-imzalamayı aç (geliştiriliyor)",
+    "Show info about bridges in room settings": "Oda ayarlarındaki köprülerin bilgilerini göster",
+    "Show a placeholder for removed messages": "Silinen mesajlar için bir yer tutucu göster",
+    "Show display name changes": "Ekran isim değişikliklerini göster",
+    "Enable URL previews for this room (only affects you)": "Bu oda için URL önizlemeyi aç (sadece sizi etkiler)",
+    "Enable URL previews by default for participants in this room": "Bu odadaki katılımcılar için URL önizlemeyi varsayılan olarak açık hale getir",
+    "Enable widget screenshots on supported widgets": "Desteklenen görsel bileşenlerde anlık görüntüleri aç"
 }

From 440b3fd1fdefe69993ff1b73d1a7b0c6de7ff317 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 25 Jan 2020 11:39:29 +0000
Subject: [PATCH 0711/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2050 of 2050 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 | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 97cef0c70d..1ab4bd15b1 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1617,7 +1617,7 @@
     "Resend edit": "Birbidali edizioa",
     "Resend %(unsentCount)s reaction(s)": "Birbidali %(unsentCount)s erreakzio",
     "Resend removal": "Birbidali kentzeko agindua",
-    "Forgotten your password?": "Pasahitza ahaztu duzu?",
+    "Forgotten your password?": "Pasahitza ahaztuta?",
     "Sign in and regain access to your account.": "Hasi saioa eta berreskuratu zure kontua.",
     "You're signed out": "Saioa amaitu duzu",
     "Clear personal data": "Garbitu datu pertsonalak",
@@ -2074,5 +2074,41 @@
     "Done": "Egina",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Gailu honetan segurtasuna osatu ezean, ez du zifratutako mezuetara sarbiderik izango.",
     "Go Back": "Joan atzera",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Biltegi sekretua oraingo gakoen babeskopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa zure gakoen babes-kopiarako zenerabiltzanak izango dira."
+    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Biltegi sekretua oraingo gakoen babeskopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa zure gakoen babes-kopiarako zenerabiltzanak izango dira.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak eta beste %(count)s gehitu dizkio gela honi",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s erabiltzaileak %(removedAddresses)s helbideak eta beste %(count)s kendu dizkio gela honi",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s erabiltzaileak %(countRemoved)s helbide kendu eta %(countAdded)s gehitu dizkio gela honi",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea aktibatu du.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea gaitu du (%(algorithm)s algoritmo ezezaguna).",
+    "Someone is using an unknown device": "Baten bat gailu ezezagun bat erabiltzen ari da",
+    "This room is end-to-end encrypted": "Gela hau muturretik muturrera zifratuta dago",
+    "Everyone in this room is verified": "Gelako guztiak egiaztatuta daude",
+    "Encrypted by a deleted device": "Ezabatutako gailu batek zifratua",
+    "Invite only": "Gonbidapenez besterik ez",
+    "Send a reply…": "Bidali erantzuna…",
+    "Send a message…": "Bidali mezua…",
+    "Reject & Ignore user": "Ukatu eta ezikusi erabiltzailea",
+    "Unknown Command": "Agindu ezezaguna",
+    "Unrecognised command: %(commandText)s": "Agindu ezezaguna: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code> erabili dezakezu agindu erabilgarrien zerrenda ikusteko. Ala mezu gisa bidali nahi zenuen hau?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Aholkua: Hasi zure mezua <code>//</code> idatziz barra batekin hasi nahi baduzu.",
+    "Send as message": "Bidali mezu gisa",
+    "Verify User": "Egiaztatu erabiltzailea",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Segurtasun gehiagorako, egiaztatu erabiltzaile hau aldi-bakarrerako kode bat bi gailuetan egiaztatuz.",
+    "For maximum security, do this in person.": "Segurtasun gorenerako, egin hau aurrez aurre.",
+    "Start Verification": "Hasi egiaztaketa",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eskatu bere erabiltzaile-izena, partekatu zurea (%(userId)s) edo partekatu <a>profilaren esteka</a>.",
+    "Enter your account password to confirm the upgrade:": "Sartu zure kontuaren pasa-hitza eguneraketa baieztatzeko:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Zerbitzariarekin autentifikatu beharko duzu eguneraketa baieztatzeko.",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Eguneratu gailu hau honek beste gailuak egiaztatu ahal izateko, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatzeko.",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ezarri zifratzea gailu honetan honek beste gailuak egiaztatu ahal izateko, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatzeko.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Babestu zure zifratze gakoak pasa-esaldi batekin. Segurtasun gorenerako hau eta zure kontuaren pasahitza desberdinak izan beharko lukete:",
+    "Enter a passphrase": "Sartu pasa-esaldia",
+    "Enter your passphrase a second time to confirm it.": "Sartu zure pasa-esaldia berriro hau baieztatzeko.",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Gailu honek beste gailuak egiaztatu ditzake, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatuz.",
+    "Verify other users in their profile.": "Egiaztatu beste erabiltzaileak bere profiletan.",
+    "Upgrade your encryption": "Eguneratu zure zifratzea",
+    "Set up encryption": "Ezarri zifratzea",
+    "Encryption upgraded": "Zifratzea eguneratuta",
+    "Encryption setup complete": "Zifratzearen ezarpena egina"
 }

From e710607a7244452aeb66f2c3204ccea62351bcd8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 25 Jan 2020 08:22:40 +0000
Subject: [PATCH 0712/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2050 of 2050 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 | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 03fbe6f61b..4a70441317 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2085,5 +2085,31 @@
     "Unrecognised command: %(commandText)s": "無法識別的指令：%(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "您可以使用 <code>/help</code> 來列出可用的指令。您是要傳送此訊息嗎？",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "提示：以 <code>//</code> 開頭讓您的訊息傳送時可以用斜線開頭。",
-    "Send as message": "以訊息傳送"
+    "Send as message": "以訊息傳送",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s 向此聊天室新增了 %(addedAddresses)s 與其他 %(count)s 個地址",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s 從此聊天室移除了 %(removedAddresses)s 與其他 %(count)s 個地址",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s 對此聊天室移除了 %(countRemoved)s 個並新增了 %(countAdded)s 地址到此聊天室",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s 開啟了端到端加密。",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s 開啟了端到端加密（無法識別的演算法 %(algorithm)s）。",
+    "Someone is using an unknown device": "某人正在使用未知的裝置",
+    "This room is end-to-end encrypted": "此聊天室已端到端加密",
+    "Everyone in this room is verified": "此聊天室中每個人都已驗證",
+    "Invite only": "僅邀請",
+    "Send a reply…": "傳送回覆……",
+    "Send a message…": "傳送訊息……",
+    "Reject & Ignore user": "回絕並忽略使用者",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請詢問他們以取得他們的使用者名稱，分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
+    "Enter your account password to confirm the upgrade:": "輸入您的帳號密碼以確認升級：",
+    "You'll need to authenticate with the server to confirm the upgrade.": "您必須透過伺服器驗證以確認升級。",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "升級此裝置以允許其驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "在此裝置上設定加密以允許其驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "使用通關密語保護您的加密金鑰。為了取得最強的安全性，此通關密語應與您的帳號密碼不同：",
+    "Enter a passphrase": "輸入通關密語",
+    "Enter your passphrase a second time to confirm it.": "輸入您的通關密語兩次以確認。",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "此裝置現在可以驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
+    "Verify other users in their profile.": "透過他們的簡介驗證其他使用者。",
+    "Upgrade your encryption": "升級您的加密",
+    "Set up encryption": "設定加密",
+    "Encryption upgraded": "加密已升級",
+    "Encryption setup complete": "加密設定完成"
 }

From c96f82cd8b742b9f863099a2d7a6c2de7275768e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 25 Jan 2020 08:09:22 +0000
Subject: [PATCH 0713/3235] Translated using Weblate (French)

Currently translated at 100.0% (2050 of 2050 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5d02717b0c..1ddcc55544 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2102,5 +2102,14 @@
     "Upgrade your encryption": "Mettre à niveau votre chiffrement",
     "Set up encryption": "Configurer le chiffrement",
     "Encryption upgraded": "Chiffrement mis à niveau",
-    "Encryption setup complete": "Configuration du chiffrement terminé"
+    "Encryption setup complete": "Configuration du chiffrement terminé",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s a activé le chiffrement de bout en bout.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s non reconnu).",
+    "Someone is using an unknown device": "Quelqu'un utilise un appareil inconnu",
+    "This room is end-to-end encrypted": "Ce salon est chiffré de bout en bout",
+    "Everyone in this room is verified": "Tout le monde dans ce salon est vérifié",
+    "Invite only": "Uniquement sur invitation",
+    "Send a reply…": "Envoyer une réponse…",
+    "Send a message…": "Envoyer un message…",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur, partagez votre nom d’utilisateur (%(userId)s) ou votre <a>lien de profil</a>."
 }

From 437b45f8a65decdf6d83f5e61e484f345505f314 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 15:28:06 +0000
Subject: [PATCH 0714/3235] Remember password for e2e bootstrapping

Fixes https://github.com/vector-im/riot-web/issues/12046
---
 .../CreateSecretStorageDialog.js              |  3 ++-
 src/components/structures/MatrixChat.js       | 24 +++++++++++++++----
 src/components/structures/auth/E2eSetup.js    |  2 ++
 src/components/structures/auth/Login.js       |  7 +++++-
 .../structures/auth/Registration.js           |  8 ++++++-
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 92ede334d0..0867cae6f4 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -55,6 +55,7 @@ function selectText(target) {
 export default class CreateSecretStorageDialog extends React.PureComponent {
     static propTypes = {
         hasCancel: PropTypes.bool,
+        accountPassword: PropTypes.string,
     };
 
     defaultProps = {
@@ -82,7 +83,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // does the server offer a UI auth flow with just m.login.password
             // for /keys/device_signing/upload?
             canUploadKeysWithPasswordOnly: null,
-            accountPassword: '',
+            accountPassword: props.accountPassword,
             accountPasswordCorrect: null,
             // set if we are 'upgrading' encryption (making an SSSS store from
             // an existing key backup secret).
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b4b38d7617..133d74db45 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -256,6 +256,9 @@ export default createReactClass({
             // logout page.
             Lifecycle.loadSession({});
         }
+
+        this._accountPassword = null;
+        this._accountPasswordTimer = null;
     },
 
     componentDidMount: function() {
@@ -352,6 +355,8 @@ export default createReactClass({
         window.removeEventListener("focus", this.onFocus);
         window.removeEventListener('resize', this.handleResize);
         this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
+
+        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
     },
 
     componentWillUpdate: function(props, state) {
@@ -1729,9 +1734,8 @@ export default createReactClass({
         this.showScreen("forgot_password");
     },
 
-    onRegisterFlowComplete: function(credentials) {
-        this.onUserCompletedLoginFlow();
-        return this.onRegistered(credentials);
+    onRegisterFlowComplete: function(credentials, password) {
+        return this.onUserCompletedLoginFlow(credentials, password);
     },
 
     // returns a promise which resolves to the new MatrixClient
@@ -1822,7 +1826,14 @@ export default createReactClass({
         this._loggedInView = ref;
     },
 
-    async onUserCompletedLoginFlow(credentials) {
+    async onUserCompletedLoginFlow(credentials, password) {
+        this._accountPassword = password;
+        // self-destruct the password after 5mins
+        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
+        this._accountPasswordTimer = setTimeout(() => {
+            this._accountPassword = null;
+            this._accountPasswordTimer = null;
+        }, 60 * 5 * 1000);
         // Wait for the client to be logged in (but not started)
         // which is enough to ask the server about account data.
         const loggedIn = new Promise(resolve => {
@@ -1836,7 +1847,7 @@ export default createReactClass({
         });
 
         // Create and start the client in the background
-        Lifecycle.setLoggedIn(credentials);
+        const setLoggedInPromise = Lifecycle.setLoggedIn(credentials);
         await loggedIn;
 
         const cli = MatrixClientPeg.get();
@@ -1865,6 +1876,8 @@ export default createReactClass({
         } else {
             this._onLoggedIn();
         }
+
+        return setLoggedInPromise;
     },
 
     // complete security / e2e setup has finished
@@ -1896,6 +1909,7 @@ export default createReactClass({
             view = (
                 <E2eSetup
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
+                    accountPassword={this._accountPassword}
                 />
             );
         } else if (this.state.view === VIEWS.POST_REGISTRATION) {
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.js
index a5f4ff933b..29b4345761 100644
--- a/src/components/structures/auth/E2eSetup.js
+++ b/src/components/structures/auth/E2eSetup.js
@@ -22,6 +22,7 @@ import * as sdk from '../../../index';
 export default class E2eSetup extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
+        accountPassword: PropTypes.string,
     };
 
     constructor() {
@@ -40,6 +41,7 @@ export default class E2eSetup extends React.Component {
                     <AsyncWrapper prom={this._createStorageDialogPromise}
                         hasCancel={false}
                         onFinished={this.props.onFinished}
+                        accountPassword={this.props.accountPassword}
                     />
                 </AuthBody>
             </AuthPage>
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 7bc2dbcbae..c8b2a1ea9c 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -58,6 +58,11 @@ export default createReactClass({
     displayName: 'Login',
 
     propTypes: {
+        // Called when the user has logged in. Params:
+        // - The object returned by the login API
+        // - The user's password, if applicable, (may be cached in memory for a
+        //   short time so the user is not required to re-enter their password
+        //   for operations like uploading cross-signing keys).
         onLoggedIn: PropTypes.func.isRequired,
 
         // If true, the component will consider itself busy.
@@ -181,7 +186,7 @@ export default createReactClass({
             username, phoneCountry, phoneNumber, password,
         ).then((data) => {
             this.setState({serverIsAlive: true}); // it must be, we logged in.
-            this.props.onLoggedIn(data);
+            this.props.onLoggedIn(data, password);
         }, (error) => {
             if (this._unmounted) {
                 return;
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index fdf2f51e00..171d3ada26 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -45,7 +45,13 @@ export default createReactClass({
     displayName: 'Registration',
 
     propTypes: {
+        // Called when the user has logged in. Params:
+        // - object with userId, deviceId, homeserverUrl, identityServerUrl, accessToken
+        // - The user's password, if available and applicable (may be cached in memory
+        //   for a short time so the user is not required to re-enter their password
+        //   for operations like uploading cross-signing keys).
         onLoggedIn: PropTypes.func.isRequired,
+
         clientSecret: PropTypes.string,
         sessionId: PropTypes.string,
         makeRegistrationUrl: PropTypes.func.isRequired,
@@ -348,7 +354,7 @@ export default createReactClass({
                 homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
                 identityServerUrl: this.state.matrixClient.getIdentityServerUrl(),
                 accessToken: response.access_token,
-            });
+            }, this.state.formVals.password);
 
             this._setupPushers(cli);
             // we're still busy until we get unmounted: don't show the registration form again

From 8c5fd5c77e7110abba89412d41004149b6633918 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 16:52:12 +0000
Subject: [PATCH 0715/3235] Verification nag toasts

Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.

Fixes https://github.com/vector-im/riot-web/issues/11220
---
 src/DeviceListener.js                         | 87 +++++++++++++++++--
 .../views/toasts/NewSessionToast.js           |  6 +-
 .../views/toasts/SetupEncryptionToast.js      | 68 +++++++++++++++
 src/i18n/strings/en_EN.json                   | 11 ++-
 4 files changed, 160 insertions(+), 12 deletions(-)
 create mode 100644 src/components/views/toasts/SetupEncryptionToast.js

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index a4c5785db4..dc066eb7cb 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -24,6 +24,9 @@ function toastKey(device) {
     return 'newsession_' + device.deviceId;
 }
 
+const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
+const THIS_DEVICE_TOAST_KEY = 'setupencryption';
+
 export default class DeviceListener {
     static sharedInstance() {
         if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
@@ -33,42 +36,114 @@ export default class DeviceListener {
     constructor() {
         // device IDs for which the user has dismissed the verify toast ('Later')
         this._dismissed = new Set();
+        // has the user dismissed any of the various nag toasts to setup encryption on this device?
+        this._dismissedThisDeviceToast = false;
+
+        // cache of the key backup info
+        this._keyBackupInfo = null;
+        this._keyBackupFetchedAt = null;
     }
 
     start() {
         MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
         MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
-        this.recheck();
+        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+        this._recheck();
     }
 
     stop() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
             MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
         }
         this._dismissed.clear();
     }
 
     dismissVerification(deviceId) {
         this._dismissed.add(deviceId);
-        this.recheck();
+        this._recheck();
+    }
+
+    dismissEncryptionSetup() {
+        this._dismissedThisDeviceToast = true;
+        this._recheck();
     }
 
     _onDevicesUpdated = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        this.recheck();
+        this._recheck();
     }
 
     _onDeviceVerificationChanged = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        this.recheck();
+        this._recheck();
     }
 
-    async recheck() {
+    _onUserTrustStatusChanged = (userId, trustLevel) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        this._recheck();
+    }
+
+    // The server doesn't tell us when key backup is set up, so we poll
+    // & cache the result
+    async _getKeyBackupInfo() {
+        const now = (new Date()).getTime();
+        if (!this._keyBackupInfo || this._keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
+            this._keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            this._keyBackupFetchedAt = now;
+        }
+        return this._keyBackupInfo;
+    }
+
+    async _recheck() {
         if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         const cli = MatrixClientPeg.get();
 
-        if (!cli.isCryptoEnabled()) return false;
+        if (!cli.isCryptoEnabled()) return;
+        if (!cli.getCrossSigningId()) {
+            if (this._dismissedThisDeviceToast) {
+                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+                return;
+            }
+
+            // cross signing isn't enabled - nag to enable it
+            // There 3 different toasts for:
+            if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
+                // Cross-signing on account but this device doesn't trust the master key (verify this session)
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: THIS_DEVICE_TOAST_KEY,
+                    title: _t("Verify this Session"),
+                    icon: "verification_warning",
+                    props: {kind: 'verify_this_session'},
+                    component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                });
+            } else {
+                const backupInfo = await this._getKeyBackupInfo();
+                if (backupInfo) {
+                    // No cross-signing on account but key backup available (upgrade encryption)
+                    ToastStore.sharedInstance().addOrReplaceToast({
+                        key: THIS_DEVICE_TOAST_KEY,
+                        title: _t("Encryption upgrade available"),
+                        icon: "verification_warning",
+                        props: {kind: 'upgrade_encryption'},
+                        component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                    });
+                } else {
+                    // No cross-signing or key backup on account (set up encryption)
+                    ToastStore.sharedInstance().addOrReplaceToast({
+                        key: THIS_DEVICE_TOAST_KEY,
+                        title: _t("Set up encryption"),
+                        icon: "verification_warning",
+                        props: {kind: 'set_up_encryption'},
+                        component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                    });
+                }
+            }
+            return;
+        } else {
+            ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+        }
 
         const devices = await cli.getStoredDevicesForUser(cli.getUserId());
         for (const device of devices) {
diff --git a/src/components/views/toasts/NewSessionToast.js b/src/components/views/toasts/NewSessionToast.js
index f83326121b..3b60f59131 100644
--- a/src/components/views/toasts/NewSessionToast.js
+++ b/src/components/views/toasts/NewSessionToast.js
@@ -32,7 +32,7 @@ export default class VerifySessionToast extends React.PureComponent {
         DeviceListener.sharedInstance().dismissVerification(this.props.deviceId);
     };
 
-    _onVerifyClick = async () => {
+    _onReviewClick = async () => {
         const cli = MatrixClientPeg.get();
         const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
 
@@ -47,10 +47,10 @@ export default class VerifySessionToast extends React.PureComponent {
     render() {
         const FormButton = sdk.getComponent("elements.FormButton");
         return (<div>
-            <div className="mx_Toast_description">{_t("Other users may not trust it")}</div>
+            <div className="mx_Toast_description">{_t("Review & verify your new session")}</div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Verify")} onClick={this._onVerifyClick} />
+                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
             </div>
         </div>);
     }
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
new file mode 100644
index 0000000000..841ee66ac7
--- /dev/null
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -0,0 +1,68 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from "../../../index";
+import { _t } from '../../../languageHandler';
+import DeviceListener from '../../../DeviceListener';
+import { accessSecretStorage } from '../../../CrossSigningManager';
+
+export default class SetupEncryptionToast extends React.PureComponent {
+    static propTypes = {
+        toastKey: PropTypes.string.isRequired,
+        kind: PropTypes.oneOf(['set_up_encryption', 'verify_this_session', 'upgrade_encryption']).isRequired,
+    };
+
+    _onLaterClick = () => {
+        DeviceListener.sharedInstance().dismissEncryptionSetup();
+    };
+
+    _onSetupClick = async () => {
+        accessSecretStorage();
+    };
+
+    getDescription() {
+        switch (this.props.kind) {
+            case 'set_up_encryption':
+            case 'upgrade_encryption':
+                return _t('Verify your other devices easier');
+            case 'verify_this_session':
+                return _t('Other users may not trust it');
+        }
+    }
+
+    getSetupCaption() {
+        switch (this.props.kind) {
+            case 'set_up_encryption':
+            case 'upgrade_encryption':
+                return _t('Upgrade');
+            case 'verify_this_session':
+                return _t('Verify');
+        }
+    }
+
+    render() {
+        const FormButton = sdk.getComponent("elements.FormButton");
+        return (<div>
+            <div className="mx_Toast_description">{this.getDescription()}</div>
+            <div className="mx_Toast_buttons" aria-live="off">
+                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
+                <FormButton label={this.getSetupCaption()} onClick={this._onSetupClick} />
+            </div>
+        </div>);
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 79f5731aed..0d033dff4d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -88,6 +88,9 @@
     "%(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",
+    "Verify this Session": "Verify this Session",
+    "Encryption upgrade available": "Encryption upgrade available",
+    "Set up encryption": "Set up encryption",
     "New Session": "New Session",
     "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",
@@ -509,8 +512,12 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Other users may not trust it": "Other users may not trust it",
+    "Review & verify your new session": "Review & verify your new session",
     "Later": "Later",
+    "Review": "Review",
+    "Verify your other devices easier": "Verify your other devices easier",
+    "Other users may not trust it": "Other users may not trust it",
+    "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
@@ -1514,7 +1521,6 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
     "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "You'll upgrade this room from <oldVersion /> to <newVersion />.",
-    "Upgrade": "Upgrade",
     "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
     "Send Logs": "Send Logs",
@@ -2008,7 +2014,6 @@
     "Set up secret storage": "Set up secret storage",
     "Restore your Key Backup": "Restore your Key Backup",
     "Upgrade your encryption": "Upgrade your encryption",
-    "Set up encryption": "Set up encryption",
     "Recovery key": "Recovery key",
     "Keep it safe": "Keep it safe",
     "Storing secrets...": "Storing secrets...",

From 7169a8444959fe384504e99c5a0736408e9120ef Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 17:08:31 +0000
Subject: [PATCH 0716/3235] Dismiss toasts for logged out devices

---
 src/DeviceListener.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index dc066eb7cb..3135e3d9a5 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -20,8 +20,8 @@ import * as sdk from './index';
 import { _t } from './languageHandler';
 import ToastStore from './stores/ToastStore';
 
-function toastKey(device) {
-    return 'newsession_' + device.deviceId;
+function toastKey(deviceId) {
+    return 'newsession_' + deviceId;
 }
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
@@ -34,6 +34,8 @@ export default class DeviceListener {
     }
 
     constructor() {
+        // set of device ID's we're currently showing toasts for
+        this._activeNagToasts = new Set();
         // device IDs for which the user has dismissed the verify toast ('Later')
         this._dismissed = new Set();
         // has the user dismissed any of the various nag toasts to setup encryption on this device?
@@ -145,22 +147,32 @@ export default class DeviceListener {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         }
 
+        const newActiveToasts = new Set();
+
         const devices = await cli.getStoredDevicesForUser(cli.getUserId());
         for (const device of devices) {
             if (device.deviceId == cli.deviceId) continue;
 
             const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
             if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
-                ToastStore.sharedInstance().dismissToast(toastKey(device));
+                ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
             } else {
+                this._activeNagToasts.add(device.deviceId);
                 ToastStore.sharedInstance().addOrReplaceToast({
-                    key: toastKey(device),
+                    key: toastKey(device.deviceId),
                     title: _t("New Session"),
                     icon: "verification_warning",
                     props: {deviceId: device.deviceId},
                     component: sdk.getComponent("toasts.NewSessionToast"),
                 });
+                newActiveToasts.add(device.deviceId);
             }
         }
+
+        // clear any other outstanding toasts (eg. logged out devices)
+        for (const deviceId of this._activeNagToasts) {
+            if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
+        }
+        this._activeNagToasts = newActiveToasts;
     }
 }

From 9e38c627913444f358939533c43fce2dc7754ebf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 20:42:45 +0000
Subject: [PATCH 0717/3235] Show incoming verification requests in the
 'complete security' phase

If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
---
 .../structures/auth/CompleteSecurity.js       | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 89711fcb1d..ce938bd2f8 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -35,7 +35,18 @@ export default class CompleteSecurity extends React.Component {
 
         this.state = {
             phase: PHASE_INTRO,
+            verificationRequest: null,
         };
+        MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+    }
+
+    componentWillUnmount() {
+        if (this.state.verificationRequest) {
+            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
+        }
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
+        }
     }
 
     onStartClick = async () => {
@@ -55,6 +66,27 @@ export default class CompleteSecurity extends React.Component {
         }
     }
 
+    onVerificationRequest = (request) => {
+        if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
+
+        if (this.state.verificationRequest) {
+            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
+        }
+        request.on("change", this.onVerificationRequestChange);
+        this.setState({
+            verificationRequest: request,
+        });
+    }
+
+    onVerificationRequestChange = () => {
+        if (this.state.verificationRequest.cancelled) {
+            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
+            this.setState({
+                verificationRequest: null,
+            });
+        }
+    }
+
     onSkipClick = () => {
         this.setState({
             phase: PHASE_CONFIRM_SKIP,
@@ -87,7 +119,13 @@ export default class CompleteSecurity extends React.Component {
         let icon;
         let title;
         let body;
-        if (phase === PHASE_INTRO) {
+
+        if (this.state.verificationRequest) {
+            const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
+            body = <IncomingSasDialog verifier={this.state.verificationRequest.verifier}
+                onFinished={this.props.onFinished}
+            />;
+        } else if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
             title = _t("Complete security");
             body = (

From f851f976e7e82017cc02955c3adf758664d85ccc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 21:26:43 +0000
Subject: [PATCH 0718/3235] Stop rogue verification toast if you verify during
 login

Fixes https://github.com/vector-im/riot-web/issues/12057
---
 src/components/structures/ToastContainer.js             | 2 --
 src/components/views/toasts/VerificationRequestToast.js | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 8a05f62e61..298c40e825 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -23,9 +23,7 @@ export default class ToastContainer extends React.Component {
     constructor() {
         super();
         this.state = {toasts: ToastStore.sharedInstance().getToasts()};
-    }
 
-    componentDidMount() {
         ToastStore.sharedInstance().on('update', this._onToastStoreUpdate);
     }
 
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index f912984486..b2d1aaf59d 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -39,6 +39,13 @@ export default class VerificationRequestToast extends React.PureComponent {
             this.setState({counter});
         }, 1000);
         request.on("change", this._checkRequestIsPending);
+        // We should probably have a separate class managing the active verification toasts,
+        // rather than monitoring this in the toast component itself, since we'll get problems
+        // like the toasdt not going away when the verification is cancelled unless it's the
+        // one on the top (ie. the one that's mounted).
+        // As a quick & dirty fix, check the toast is still relevant when it mounts (this prevents
+        // a toast hanging around after logging in if you did a verification as part of login).
+        this._checkRequestIsPending();
     }
 
     componentWillUnmount() {

From 086e43e58469e7dba0fb2443b241ca1f68f2fe17 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 25 Jan 2020 21:30:42 +0000
Subject: [PATCH 0719/3235] comments ftw

---
 src/components/structures/ToastContainer.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 298c40e825..283fbdd96a 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -24,6 +24,10 @@ export default class ToastContainer extends React.Component {
         super();
         this.state = {toasts: ToastStore.sharedInstance().getToasts()};
 
+        // Start listening here rather than in componentDidMount because
+        // toasts may dismiss themselves in their didMount if they find
+        // they're already irrelevant by the time they're mounted, and
+        // our own componentDidMount is too late.
         ToastStore.sharedInstance().on('update', this._onToastStoreUpdate);
     }
 

From 49cdbc9ebe68da74e0099c4e598d851800ba7852 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 25 Jan 2020 16:25:51 +0000
Subject: [PATCH 0720/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2043 of 2050 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 | 91 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index e833009d59..3c04ff85c0 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1917,11 +1917,11 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bëri një thirrje zanore. (e pambuluar nga ky shfletues)",
     "%(senderName)s placed a video call.": "%(senderName)s bëri një thirrje video.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bëri një thirrje video. (e pambuluar nga ky shfletues)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "",
+    "Enable cross-signing to verify per-user instead of per-device (in development)": "Aktivizoni <em>cross-signing</em> për të verifikuar me bazë përdorues në vend se me bazë pajisje (në zhvillim)",
     "Enable local event indexing and E2EE search (requires restart)": "Aktivizoni indeksim aktesh vendore dhe kërkim E2EE (lyp rinisje)",
     "Match system theme": "Përputhe me temën e sistemit",
-    "Send cross-signing keys to homeserver": "",
-    "Cross-signing public keys:": "",
+    "Send cross-signing keys to homeserver": "Dërgo te shërbyesi Home kyçe <em>cross-signing</em>",
+    "Cross-signing public keys:": "Kyçe publikë për <em>cross-signing</em>:",
     "on device": "në pajisje",
     "not found": "s’u gjet",
     "in secret storage": "në depozitë të fshehtë",
@@ -2016,5 +2016,88 @@
     "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Lidhur me <channelIcon /> <channelName /> në <networkIcon /> <networkName />",
     "Connected via %(protocolName)s": "Lidhur përmes %(protocolName)s",
     "Bridge Info": "Të dhëna Ure",
-    "Below is a list of bridges connected to this room.": "Më poshtë keni një listë urash të lidhura në këtë dhomë."
+    "Below is a list of bridges connected to this room.": "Më poshtë keni një listë urash të lidhura në këtë dhomë.",
+    "New Session": "Sesion i Ri",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s shtoi %(addedAddresses)s dhe dhe %(count)s adresa të tjera te kjo dhomë",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hoqi %(removedAddresses)s dhe %(count)s adresa të tjera nga kjo dhomë",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hoqi %(countRemoved)s dhe shtoi %(countAdded)s adresa te kjo dhomë",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s aktivizoi fshehtëzimin skaj-më-skaj.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s aktivizoi fshehtëzimin skaj-më-skaj (algoritëm jo i pranuar %(algorithm)s).",
+    "a few seconds ago": "pak sekonda më parë",
+    "about a minute ago": "rreth një minutë më parë",
+    "%(num)s minutes ago": "%(num)s minuta më parë",
+    "about an hour ago": "rreth një orë më parë",
+    "%(num)s hours ago": "%(num)s orë më parë",
+    "about a day ago": "rreth një ditë më parë",
+    "%(num)s days ago": "%(num)s ditë më parë",
+    "a few seconds from now": "pak sekonda nga tani",
+    "about a minute from now": "rreth një minutë nga tani",
+    "%(num)s minutes from now": "%(num)s minuta nga tani",
+    "about an hour from now": "rreth një orë nga tani",
+    "%(num)s hours from now": "%(num)s orë nga tani",
+    "about a day from now": "rreth një ditë nga tani",
+    "%(num)s days from now": "%(num)s ditë nga tani",
+    "Show a presence dot next to DMs in the room list": "Shfaqni një pikë pranie në krah DM-sh te lista e dhomave",
+    "Other users may not trust it": "Përdorues të tjerë mund të mos e besojnë",
+    "Later": "Më vonë",
+    "Cross-signing and secret storage are enabled.": "<em>Cross-signing</em> dhe depozitimi i fshehtë janë aktivizuar.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Llogaria juaj ka një identitet <em>cross-signing</em> në depozitë të fshehtë, por s’është ende i besuar në këtë pajisje.",
+    "Cross-signing and secret storage are not yet set up.": "<em>Cross-signing</em> dhe depozitimi i fshehtë s’janë ujdisur ende.",
+    "Cross-signing private keys:": "Kyçe privatë për <em>cross-signing</em>:",
+    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Kyçi i kopjeruajtjeve u depozitua në depozitë të fshehtë, po kjo veçori s’është e aktivizuar në këtë pajisje. Ju lutemi, aktivizoni në Labs <em>cross-signing</em> që të modifikoni gjendje kopjeruatjeje kyçesh.",
+    "Labs": "Labs",
+    "Complete": "E plotë",
+    "Someone is using an unknown device": "Dikush po përdor një pajisje të panjohur",
+    "This room is end-to-end encrypted": "Kjo dhomë është e fshehtëzuar skaj-më-skaj",
+    "Everyone in this room is verified": "Gjithkush në këtë dhomë është verifikuar",
+    "Encrypted by a deleted device": "Fshehtëzuar nga një pajisje e fshirë",
+    "Invite only": "Vetëm me ftesa",
+    "Send a reply…": "Dërgoni një përgjigje…",
+    "Send a message…": "Dërgoni një mesazh…",
+    "Reject & Ignore user": "Hidhe poshtë & Shpërfille përdoruesin",
+    "Unknown Command": "Urdhër i Panjohur",
+    "Unrecognised command: %(commandText)s": "Urdhër Jo i Pranuar: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Mund të përdorni <code>/help</code> që të shfaqen urdhrat e gatshëm. Donit vërtet ta dërgoni këtë si një mesazh?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Ndihmëz: Fillojeni mesazhin tuaj me <code>//</code> që të nisë me një pjerrake.",
+    "Send as message": "Dërgoni një mesazh",
+    "Verify User": "Verifikoni Përdoruesin",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Për siguri ekstra, verifikojeni këtë përdorues duke kontrolluar në të dyja pajisjet tuaja një kod njëpërdorimsh.",
+    "For maximum security, do this in person.": "Për siguri maksimum, bëjeni këtë ju vetë.",
+    "Start Verification": "Fillo Verifikimin",
+    "Failed to invite the following users to chat: %(csvUsers)s": "S’u arrit të ftoheshin për bisedë përdoruesit vijues: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "S’e krijuam dot DM-në tuaj. Ju lutemi, kontrolloni përdoruesit që doni të ftoni dhe riprovoni.",
+    "Something went wrong trying to invite the users.": "Diç shkoi ters teksa provohej të ftoheshin përdoruesit.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "S’i ftuam dot këta përdorues. Ju lutemi, kontrolloni përdoruesit që doni të ftoni dhe riprovoni.",
+    "Failed to find the following users": "S’u arrit të gjendeshin përdoruesit vijues",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Përdoruesit vijues mund të mos ekzistojnë ose janë të pavlefshëm, dhe s’mund të ftohen: %(csvNames)s",
+    "Suggestions": "Sugjerime",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit, tregojuni emrin tuaj të përdoruesit (%(userId)s) ose <a>lidhjen e profilit</a>.",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit (p.sh., @përdorues:shërbyes.com) ose <a>tregojuni këtë dhomë</a>.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Për verifikim pajisjesh të tjera përmes dhënies së frazëkalimit tuaj, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
+    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Për verifikim pajisjesh të tjera përmes dhënies së kyçit tuaj të rimarrjes, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
+    "Complete security": "Siguri të plotë",
+    "Verify this session to grant it access to encrypted messages.": "Verifikojeni këtë sesion që t’i akordohet hyrje te mesazhe të fshehtëzuar.",
+    "Start": "Nise",
+    "Session verified": "Sesion i verifikuar",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Ka hyrje te mesazhet tuaj të fshehtëzuar dhe përdoruesit e tjerë do ta shohin si të besuar.",
+    "Done": "U bë",
+    "Without completing security on this device, it won’t have access to encrypted messages.": "Pa plotësuar sigurinë në këtë pajisje, s’do të ketë hyrje te mesazhe të fshehtëzuar.",
+    "Go Back": "Shko Mbrapsht",
+    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Kopjeruajtja e Kyçeve është e aktivizuar në llogarinë tuaj, por nuk është ujdisur që nga ky sesion. Që të ujdisni depozitim të fshehtë, riktheni kopjeruajtjen tuaj të kyçeve.",
+    "Restore": "Riktheje",
+    "Enter your account password to confirm the upgrade:": "Që të ripohohet përmirësimi, jepni fjalëkalimin e llogarisë tuaj:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Do t’ju duhet të bëni mirëfilltësimin me shërbyesin që të ripohohet përmirësimi.",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Përmirësojeni këtë pajisje për ta lejuar të verifikojë pajisje të tjera, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuara për përdorues të tjerë.",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ujdisni fshehtëzim në këtë pajisje që ta lejoni të verifikojë pajisje të tjera, duke u akorduar atyre hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë atyre si të besuara për përdorues të tjerë.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sigurojini kyçet tuaj të fshehtëzimit me një frazëkalim. Për siguri maksimale, ky do të duhej të ishte i ndryshëm nga fjalëkalimi për llogarinë tuaj:",
+    "Enter a passphrase": "Jepni një frazëkalim",
+    "Enter your passphrase a second time to confirm it.": "Që të ripohohet, jepeni edhe një herë frazëkalimin tuaj.",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Kjo pajisje mund të verifikojë pajisje të tjera, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuara për përdorues të tjerë.",
+    "Verify other users in their profile.": "Verifikoni përdorues të tjerë në profilin e tyre.",
+    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Pa ujdisur depozitim të fshehtë, s’do të jeni në gjendje të rimerrni hyrje te mesazhe të fshehtëzuar apo te identiteti juaj <em>cross-signing</em> për verifikim pajisjesh të tjera, nëse dilni nga llogaria juaj ose përdorni një pajisje tjetër.",
+    "Restore your Key Backup": "Riktheni Kopjeruajtjen tuaj të Kyçeve",
+    "Upgrade your encryption": "Përmirësoni fshehtëzimin tuaj",
+    "Set up encryption": "Ujdisni fshehtëzim",
+    "Encryption upgraded": "U përmirësua fshehtëzimi",
+    "Encryption setup complete": "Ujdisje fshehtëzimit e plotësuar"
 }

From a4bbe2ba645d6f411313b4b87b38a6783feec4c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 26 Jan 2020 22:15:44 +0000
Subject: [PATCH 0721/3235] fix compound emoji

---
 src/emoji.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/emoji.js b/src/emoji.js
index 125864e381..20b05531ca 100644
--- a/src/emoji.js
+++ b/src/emoji.js
@@ -79,13 +79,13 @@ EMOJIBASE.forEach(emoji => {
 });
 
 /**
- * Strips variation selectors from a string
- * NB. Skin tone modifers are not variation selectors:
+ * Strips variation selectors from the end of given string
+ * NB. Skin tone modifiers are not variation selectors:
  * this function does not touch them. (Should it?)
  *
  * @param {string} str string to strip
  * @returns {string} stripped string
  */
 function stripVariation(str) {
-    return str.replace(/[\uFE00-\uFE0F]/, "");
+    return str.replace(/[\uFE00-\uFE0F]$/, "");
 }

From 13ba90a05469b3b6f35133d90c2233b50d63c57b Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 27 Jan 2020 09:33:34 +0000
Subject: [PATCH 0722/3235] Translated using Weblate (Esperanto)

Currently translated at 90.1% (1848 of 2050 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 | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4ac519d16a..243aebb52d 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1851,7 +1851,7 @@
     "Error unsubscribing from list": "Eraris malabono de la listo",
     "Please try again or view your console for hints.": "Bonvolu reprovi aŭ serĉi helpilojn en via konzolo.",
     "You have not ignored anyone.": "Vi neniun malatentis.",
-    "You are not subscribed to any lists": "Vi neniun liston abonis.",
+    "You are not subscribed to any lists": "Vi neniun liston abonis",
     "Unsubscribe": "Malaboni",
     "View rules": "Montri regulojn",
     "You are currently subscribed to:": "Vi nun abonas:",
@@ -1867,5 +1867,28 @@
     "Widget ID": "Identigilo de fenestraĵo",
     "Widgets do not use message encryption.": "Fenestraĵoj ne uzas ĉifradon de mesaĝoj.",
     "Widget added by": "Fenestraĵon aldonis",
-    "This widget may use cookies.": "Ĉi tiu fenestraĵo povas uzi kuketojn."
+    "This widget may use cookies.": "Ĉi tiu fenestraĵo povas uzi kuketojn.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s aldonis %(addedAddresses)s kaj %(count)s aliajn adresojn al ĉi tiu ĉambro",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s forigis %(removedAddresses)s kaj %(count)s aliajn adresojn el ĉi tiu ĉambro",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s forigis %(countRemoved)s kaj aldonis %(countAdded)s adresojn al ĉi tiu ĉambro",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s ŝaltis tutvojan ĉifradon.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s ŝaltis tutvojan ĉifradon (nerekonita algoritmo %(algorithm)s).",
+    "a few seconds ago": "antaŭ kelkaj sekundoj",
+    "about a minute ago": "antaŭ ĉirkaŭ minuto",
+    "%(num)s minutes ago": "antaŭ %(num)s minutoj",
+    "about an hour ago": "antaŭ ĉirkaŭ horo",
+    "%(num)s hours ago": "antaŭ %(num)s horoj",
+    "about a day ago": "antaŭ ĉirkaŭ tago",
+    "%(num)s days ago": "antaŭ %(num)s tagoj",
+    "a few seconds from now": "kelkajn sekundojn de nun",
+    "about a minute from now": "ĉirkaŭ minuton de nun",
+    "%(num)s minutes from now": "%(num)s minutojn de nun",
+    "about an hour from now": "ĉirkaŭ horon de nun",
+    "%(num)s hours from now": "%(num)s horojn de nun",
+    "about a day from now": "ĉirkaŭ tagon de nun",
+    "%(num)s days from now": "%(num)s tagojn de nun",
+    "Lock": "Seruro",
+    "Other users may not trust it": "Aliaj uzantoj eble ne kredas ĝin",
+    "Later": "Pli poste",
+    "Verify": "Kontroli"
 }

From ca774f45fea0685b002f8bde37cae95cb7a51ece Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 26 Jan 2020 19:49:59 +0000
Subject: [PATCH 0723/3235] Translated using Weblate (Turkish)

Currently translated at 73.8% (1513 of 2050 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index db43e96cea..257cb27b42 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1532,5 +1532,11 @@
     "Show display name changes": "Ekran isim değişikliklerini göster",
     "Enable URL previews for this room (only affects you)": "Bu oda için URL önizlemeyi aç (sadece sizi etkiler)",
     "Enable URL previews by default for participants in this room": "Bu odadaki katılımcılar için URL önizlemeyi varsayılan olarak açık hale getir",
-    "Enable widget screenshots on supported widgets": "Desteklenen görsel bileşenlerde anlık görüntüleri aç"
+    "Enable widget screenshots on supported widgets": "Desteklenen görsel bileşenlerde anlık görüntüleri aç",
+    "Show recently visited rooms above the room list": "En son ziyaret edilen odaları oda listesinin en üstünde göster",
+    "Show hidden events in timeline": "Zaman çizelgesinde gizli olayları göster",
+    "Encrypted messages in one-to-one chats": "Birebir sohbetlerdeki şifrelenmiş mesajlar",
+    "Encrypted messages in group chats": "Grup sohbetlerdeki şifrelenmiş mesajlar",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Bu sizin engellediğiniz kullanıcılar/sunucular listeniz - odadan ayrılmayın!",
+    "Got It": "Anlaşıldı"
 }

From ebb70ca9fb943317bb2bcb8e214de04797a8ea51 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 27 Jan 2020 09:44:12 +0000
Subject: [PATCH 0724/3235] English

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index dc066eb7cb..f503353145 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -108,7 +108,7 @@ export default class DeviceListener {
             }
 
             // cross signing isn't enabled - nag to enable it
-            // There 3 different toasts for:
+            // There are 3 different toasts for:
             if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
                 // Cross-signing on account but this device doesn't trust the master key (verify this session)
                 ToastStore.sharedInstance().addOrReplaceToast({

From 43173824d3bbecda233d896f43b44d4a53828862 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 27 Jan 2020 09:44:39 +0000
Subject: [PATCH 0725/3235] Capitalisation

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index f503353145..32024d1d87 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -113,7 +113,7 @@ export default class DeviceListener {
                 // Cross-signing on account but this device doesn't trust the master key (verify this session)
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: THIS_DEVICE_TOAST_KEY,
-                    title: _t("Verify this Session"),
+                    title: _t("Verify this session"),
                     icon: "verification_warning",
                     props: {kind: 'verify_this_session'},
                     component: sdk.getComponent("toasts.SetupEncryptionToast"),

From 8c4c79adde070766a14ad49d6b736104ca9a9ea4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Jan 2020 10:05:42 +0000
Subject: [PATCH 0726/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0d033dff4d..5c2f427c6a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -88,7 +88,7 @@
     "%(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",
-    "Verify this Session": "Verify this Session",
+    "Verify this session": "Verify this session",
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
     "New Session": "New Session",

From e50ed95edff8e2d5b8bfebd1ec605b6dd196e23b Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 27 Jan 2020 10:17:16 +0000
Subject: [PATCH 0727/3235] English

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 3135e3d9a5..331b68398b 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -34,7 +34,7 @@ export default class DeviceListener {
     }
 
     constructor() {
-        // set of device ID's we're currently showing toasts for
+        // set of device IDs we're currently showing toasts for
         this._activeNagToasts = new Set();
         // device IDs for which the user has dismissed the verify toast ('Later')
         this._dismissed = new Set();

From 11de92b9a90c6d847f6687d6c9808a24ca189fdd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Jan 2020 11:07:55 +0000
Subject: [PATCH 0728/3235] hopefully informative comment

---
 src/components/structures/auth/CompleteSecurity.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index ce938bd2f8..206cdb743e 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -35,6 +35,9 @@ export default class CompleteSecurity extends React.Component {
 
         this.state = {
             phase: PHASE_INTRO,
+            // this serves dual purpose as the object for the request logic and
+            // the presence of it insidicating that we're in 'verify mode'.
+            // Because of the latter, it lives in the state.
             verificationRequest: null,
         };
         MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);

From c9a0e93a74f437978eef3266f8b2b279558e9857 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 27 Jan 2020 11:14:32 +0000
Subject: [PATCH 0729/3235] tidy up borders

---
 res/css/views/dialogs/_RoomSettingsDialog.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 0e8deb018e..66c34fd73d 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -66,16 +66,16 @@ limitations under the License.
     margin-bottom: 8px;
     border-width: 1px 1px;
     border-color: $primary-hairline-color;
+    border-style: solid;
     border-radius: 5px;
 
     .protocol-icon {
         float: left;
-        margin-right: 30px;
+        margin-right: 5px;
         img {
             border-radius: 5px;
             border-width: 1px 1px;
             border-color: $primary-hairline-color;
-            border-style: solid;
         }
         span {
             /* Correct letter placement */

From 692c993a34a5a4947b6ea25142e8533d11852c07 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 27 Jan 2020 11:40:05 +0000
Subject: [PATCH 0730/3235] js-sdk v4.0.0

---
 package.json | 2 +-
 yarn.lock    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dc619e50ef..901c0cec15 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "4.0.0-rc.1",
+    "matrix-js-sdk": "4.0.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",
diff --git a/yarn.lock b/yarn.lock
index 75c5af6a1d..232067a99f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,11 +5760,12 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@4.0.0-rc.1:
-  version "4.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0-rc.1.tgz#160d445364aa8ff36ae4fffb0ebc944f680afa4e"
-  integrity sha512-1tP9fUCU5I4bXQQHuVlKHbpySh71aM6sugVC6L8ikG1ebZuKkAc2tXf1tiHizp3hZadHoTZ1PGH19ZFlKDZ8Qw==
+matrix-js-sdk@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0.tgz#c81bdc905af2ab1634527e5f542f2f15977d31cf"
+  integrity sha512-Xbe36xL443qtEBH4xk0k39JabolqZfloK7fwYGMb/PgWO26VOzvw94XWahnIr5w83oxBAF9nFmP+7EnPG6IHnA==
   dependencies:
+    "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
     browser-request "^0.3.3"
     bs58 "^4.0.1"

From 976ac328e12414e4b9af631a7c6ce18770defda4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 27 Jan 2020 11:44:10 +0000
Subject: [PATCH 0731/3235] Prepare changelog for v2.0.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7630231615..881669a1a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Changes in [2.0.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0) (2020-01-27)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0-rc.2...v2.0.0)
+
+ * Ensure a plaintext version of the composer ends up on the clipboard
+   [\#3923](https://github.com/matrix-org/matrix-react-sdk/pull/3923)
+ * Move & upgrade babel runtime into dependencies (like it wants)
+   [\#3921](https://github.com/matrix-org/matrix-react-sdk/pull/3921)
+ * Don't list every single alias when there's many
+   [\#3919](https://github.com/matrix-org/matrix-react-sdk/pull/3919)
+
 Changes in [2.0.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0-rc.2) (2020-01-20)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0-rc.1...v2.0.0-rc.2)

From 8c56c59922b2c0df387bd8fafb51272cb447392a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 27 Jan 2020 11:44:10 +0000
Subject: [PATCH 0732/3235] v2.0.0

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

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

From e224150190f2d2869951a03eebc76c2ebcc93b18 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:17:12 +0000
Subject: [PATCH 0733/3235] detail pass on DMs

---
 src/components/views/rooms/RoomBreadcrumbs.js | 2 +-
 src/components/views/rooms/RoomHeader.js      | 5 ++++-
 src/components/views/rooms/RoomTile.js        | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 5a15a7518b..f9408d3259 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -363,7 +363,7 @@ export default class RoomBreadcrumbs extends React.Component {
             }
 
             let dmIndicator;
-            if (this._isDmRoom(r.room)) {
+            if (this._isDmRoom(r.room) && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
                 dmIndicator = <img
                     src={require("../../../../res/img/icon_person.svg")}
                     className="mx_RoomBreadcrumbs_dmIndicator"
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 8a427e1c06..3c0f2e3d41 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -31,6 +31,7 @@ import ManageIntegsButton from '../elements/ManageIntegsButton';
 import {CancelButton} from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
+import DMRoomMap from '../../../utils/DMRoomMap';
 import E2EIcon from './E2EIcon';
 import InviteOnlyIcon from './InviteOnlyIcon';
 
@@ -161,10 +162,12 @@ export default createReactClass({
             <E2EIcon status={this.props.e2eStatus} /> :
             undefined;
 
+        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
         const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
         const joinRule = joinRules && joinRules.getContent().join_rule;
         let privateIcon;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        // Don't show an invite-only icon for DMs. Users know they're invite-only.
+        if (!dmUserId && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             if (joinRule == "invite") {
                 privateIcon = <InviteOnlyIcon />;
             }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 9d2334de82..41975fe7b8 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -478,8 +478,9 @@ export default createReactClass({
 
         let dmIndicator;
         let dmOnline;
-        // If we can place a shield, do that instead
-        if (dmUserId && !this.state.e2eStatus) {
+        /* Post-cross-signing we don't show DM indicators at all, instead relying on user
+           context to let them know when that is. */
+        if (dmUserId && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"

From c0d1298c4f7296fc066b5721fa4f01695acdc95a Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 27 Jan 2020 14:05:22 +0000
Subject: [PATCH 0734/3235] Factor out into BridgeTile

---
 res/css/_components.scss                      |   1 +
 .../dialogs/_RoomSettingsDialogBridges.scss   |  93 ++++++++++++++
 src/components/views/settings/BridgeTile.js   | 116 ++++++++++++++++++
 .../settings/tabs/room/BridgeSettingsTab.js   |  79 +-----------
 4 files changed, 212 insertions(+), 77 deletions(-)
 create mode 100644 res/css/views/dialogs/_RoomSettingsDialogBridges.scss
 create mode 100644 src/components/views/settings/BridgeTile.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 60f749de9c..f6a680c438 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -66,6 +66,7 @@
 @import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
+@import "./views/dialogs/_RoomSettingsDialogBridges.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
new file mode 100644
index 0000000000..85d5c76ffc
--- /dev/null
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -0,0 +1,93 @@
+/*
+Copyright 2020 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_RoomSettingsDialog_BridgeList {
+    padding: 0;
+
+    .mx_AccessibleButton {
+        display: inline;
+        margin: 0;
+        padding: 0;
+        float: left;
+    }
+}
+
+.mx_RoomSettingsDialog_BridgeList li {
+    list-style-type: none;
+    padding: 5px;
+    margin-bottom: 8px;
+    border-width: 1px 1px;
+    border-color: $primary-hairline-color;
+    border-style: solid;
+    border-radius: 5px;
+
+    .protocol-icon {
+        float: left;
+        margin-right: 5px;
+        img {
+            border-radius: 5px;
+            border-width: 1px 1px;
+            border-color: $primary-hairline-color;
+        }
+        span {
+            /* Correct letter placement */
+            left: auto;
+        }
+    }
+
+    h3 {
+        margin-top: 0;
+        margin-bottom: 4px;
+        font-size: 16pt;
+        color: $primary-fg-color;
+    }
+
+    .column-icon {
+        float: left;
+        padding-right: 10px;
+
+        .noProtocolIcon {
+            width: 48px;
+            height: 48px;
+            background: $settings-profile-placeholder-bg-color;
+            border-radius: 5px;
+        }
+    }
+
+    .column-data {
+        display: inline-block;
+        width: 85%;
+    }
+
+    .workspace-channel-details {
+        margin-top: 0;
+        color: $primary-fg-color;
+    }
+
+    .metadata {
+        color: $muted-fg-color;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin-bottom: 0;
+    }
+
+    .metadata.visible {
+        overflow-y: visible;
+        text-overflow: ellipsis;
+        white-space: normal;
+    }
+}
diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
new file mode 100644
index 0000000000..330af4a18a
--- /dev/null
+++ b/src/components/views/settings/BridgeTile.js
@@ -0,0 +1,116 @@
+/*
+Copyright 2020 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 {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import {_t} from "../../../languageHandler";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import Pill from "../elements/Pill";
+import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import BaseAvatar from "../avatars/BaseAvatar";
+import AccessibleButton from "../elements/AccessibleButton";
+
+export default class BridgeTile extends React.PureComponent {
+    static propTypes = {
+        ev: PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
+    }
+    
+    state = {
+        visible: false
+    }
+
+    _toggleVisible() {
+        this.setState({
+            visible: !this.state.visible,
+        });
+    }
+
+    render() {
+        const content = this.props.ev.getContent();
+        const { channel, network, protocol } = content;
+        const protocolName = protocol.displayname || protocol.id;
+        const channelName = channel.displayname || channel.id;
+        const networkName = network ? network.displayname || network.id : protocolName;
+
+        let creator = null;
+        if (content.creator) {
+            creator = _t("This bridge was provisioned by <user />.", {}, {
+                    user: <Pill
+                        type={Pill.TYPE_USER_MENTION}
+                        room={this.props.room}
+                        url={makeUserPermalink(content.creator)}
+                        shouldShowPillAvatar={true}
+                    />,
+            });
+        }
+
+        const bot = _t("This bridge is managed by <user />.", {}, {
+            user: <Pill
+                type={Pill.TYPE_USER_MENTION}
+                room={this.props.room}
+                url={makeUserPermalink(this.props.ev.getSender())}
+                shouldShowPillAvatar={true}
+                />,
+        });
+
+        let networkIcon;
+
+        if (protocol.avatar) {
+            const avatarUrl = getHttpUriForMxc(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                protocol.avatar, 64, 64, "crop",
+            );
+
+            networkIcon = <BaseAvatar className="protocol-icon"
+                width={48}
+                height={48}
+                resizeMethod='crop'
+                name={ protocolName }
+                idName={ protocolName }
+                url={ avatarUrl }
+            />;
+        } else {
+            networkIcon = <div class="noProtocolIcon"></div>;
+        }
+
+
+        const workspaceChannelDetails = _t("Workspace: %(networkName)s      Channel: %(channelName)s", {
+            networkName,
+            channelName,
+        });
+        const id = this.props.ev.getId();
+        const metadataClassname = "metadata" + (this.state.visible ? " visible" : "");
+        return (<li key={id}>
+            <div className="column-icon">
+                {networkIcon}
+            </div>
+            <div className="column-data">
+                <h3>{protocolName}</h3>
+                <p className="workspace-channel-details">
+                    {workspaceChannelDetails}
+                </p>
+                <p className={metadataClassname}>
+                    {creator} {bot}
+                </p>
+                <AccessibleButton kind="secondary" onClick={this._toggleVisible.bind(this)}>
+                    Show { this.state.visible ? "less" : "more" }
+                </AccessibleButton>
+            </div>
+        </li>);
+    }
+}
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 8090cf7d4d..7a859b0594 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -18,10 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import Pill from "../../../elements/Pill";
-import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
-import BaseAvatar from "../../../avatars/BaseAvatar";
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import BridgeTile from "../../BridgeTile";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -35,17 +32,6 @@ export default class BridgeSettingsTab extends React.Component {
 
     constructor() {
         super();
-
-        this.state = {
-            showMoreCard: null,
-        };
-    }
-
-
-    _showMoreDetails(eventId) {
-        this.setState({
-            showMoreCard: eventId,
-        });
     }
 
     _renderBridgeCard(event, room) {
@@ -53,68 +39,7 @@ export default class BridgeSettingsTab extends React.Component {
         if (!content || !content.channel || !content.protocol) {
             return null;
         }
-        const { channel, network } = content;
-        const protocolName = content.protocol.displayname || content.protocol.id;
-        const channelName = channel.displayname || channel.id;
-        const networkName = network ? network.displayname || network.id : protocolName;
-
-        let creator = null;
-        if (content.creator) {
-            creator = _t("This bridge was provisioned by <user />.", {}, {
-                    user: <Pill
-                        type={Pill.TYPE_USER_MENTION}
-                        room={room}
-                        url={makeUserPermalink(content.creator)}
-                        shouldShowPillAvatar={true}
-                    />,
-            });
-        }
-
-        const bot = _t("This bridge is managed by <user />.", {}, {
-            user: <Pill
-                type={Pill.TYPE_USER_MENTION}
-                room={room}
-                url={makeUserPermalink(event.getSender())}
-                shouldShowPillAvatar={true}
-                />,
-        });
-
-        const avatarUrl = network.avatar ? getHttpUriForMxc(
-            MatrixClientPeg.get().getHomeserverUrl(),
-            network.avatar, 32, 32, "crop",
-        ) : null;
-
-        const networkIcon = <BaseAvatar className="protocol-icon"
-            width={48}
-            height={48}
-            resizeMethod='crop'
-            name={ protocolName }
-            idName={ protocolName }
-            url={ avatarUrl }
-        />;
-
-        const workspaceChannelDetails = _t("Workspace: %(networkName)s      Channel: %(channelName)s", {
-            networkName,
-            channelName,
-        });
-        const id = event.getId();
-        const isVisible = this.state.showMoreCard === id;
-        const metadataClassname = "metadata " + (isVisible ? "visible" : "");
-        return (<li key={id}>
-            <div className="column-icon">
-                {networkIcon}
-            </div>
-            <div className="column-data">
-                <h3>{protocolName}</h3>
-                <p className="workspace-channel-details">
-                    {workspaceChannelDetails}
-                </p>
-                <p className={metadataClassname}>
-                    {creator} {bot}
-                </p>
-                <a href="#" onClick={() => this._showMoreDetails(isVisible ? null : id)}>Show { isVisible ? "less" : "more" } </a>
-            </div>
-        </li>);
+        return <BridgeTile room={room} ev={event}></BridgeTile>
     }
 
     static getBridgeStateEvents(roomId) {

From 7e0ab2f0a309157af8c953c88ef183b610e4fce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 27 Jan 2020 15:28:43 +0100
Subject: [PATCH 0735/3235] DisableEventIndexDialog: Turn the cancel button
 red.

---
 res/css/_common.scss                                         | 5 +++++
 .../views/dialogs/eventindex/DisableEventIndexDialog.js      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 51d985efb7..77284d0a14 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -414,6 +414,11 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     color: $accent-fg-color;
 }
 
+.mx_Dialog button.warning, .mx_Dialog input[type="submit"].warning {
+    border: solid 1px $warning-color;
+    color: $warning-color;
+}
+
 .mx_Dialog button:disabled, .mx_Dialog input[type="submit"]:disabled {
     background-color: $light-fg-color;
     border: solid 1px $light-fg-color;
diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 13278217de..120b086ef6 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -63,6 +63,7 @@ export default class DisableEventIndexDialog extends React.Component {
                     primaryButton={_t('Disable')}
                     onPrimaryButtonClick={this._onDisable}
                     primaryButtonClass="danger"
+                    cancelButtonClass="warning"
                     onCancel={this.props.onFinished}
                     disabled={this.state.disabling}
                 />

From 4d83288f4ea6ebfe61f6f7f0ef4784a9e175ad86 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 27 Jan 2020 14:42:46 +0000
Subject: [PATCH 0736/3235] linting

---
 src/components/views/settings/BridgeTile.js               | 4 ++--
 .../views/settings/tabs/room/BridgeSettingsTab.js         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index 330af4a18a..ee9343ec39 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -29,9 +29,9 @@ export default class BridgeTile extends React.PureComponent {
         ev: PropTypes.object.isRequired,
         room: PropTypes.object.isRequired,
     }
-    
+
     state = {
-        visible: false
+        visible: false,
     }
 
     _toggleVisible() {
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 7a859b0594..65c59ff977 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -39,7 +39,7 @@ export default class BridgeSettingsTab extends React.Component {
         if (!content || !content.channel || !content.protocol) {
             return null;
         }
-        return <BridgeTile room={room} ev={event}></BridgeTile>
+        return <BridgeTile room={room} ev={event}></BridgeTile>;
     }
 
     static getBridgeStateEvents(roomId) {
@@ -76,8 +76,8 @@ export default class BridgeSettingsTab extends React.Component {
                 <ul className="mx_RoomSettingsDialog_BridgeList">
                     { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
                 </ul>
-            </div>
-        } else  {
+            </div>;
+        } else {
             content = <p>{_t(
                 "This room isn’t bridging messages to any platforms. " +
                 "<a>Learn more.</a>", {},
@@ -86,7 +86,7 @@ export default class BridgeSettingsTab extends React.Component {
                     // having to re-translate the string when we do.
                     a: sub => '',
                 },
-            )}</p>
+            )}</p>;
         }
 
         return (

From 5851b10f72af580b2be3357799075ea0fcd1dd82 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 27 Jan 2020 14:44:11 +0000
Subject: [PATCH 0737/3235] strings

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e4ab764989..1afa3a33c9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -521,6 +521,9 @@
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Upload": "Upload",
     "Remove": "Remove",
+    "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
+    "This bridge is managed by <user />.": "This bridge is managed by <user />.",
+    "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Upload new:": "Upload new:",
     "No display name": "No display name",
@@ -781,9 +784,6 @@
     "Room version:": "Room version:",
     "Developer options": "Developer options",
     "Open Devtools": "Open Devtools",
-    "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
-    "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "This room is bridging messages to the following platforms. <a>Learn more.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
     "Bridges": "Bridges",

From e38f1191a52880ee5b80ee3c68feb02831a8bdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 27 Jan 2020 15:50:14 +0100
Subject: [PATCH 0738/3235] ManageEventIndex: Clarify that we're currently not
 downloading any messages.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js          | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 5c82cc0391..b7ea87b1b2 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -108,7 +108,7 @@ export default class ManageEventIndexDialog extends React.Component {
         let crawlerState;
 
         if (this.state.currentRoom === null) {
-            crawlerState = _t("Not downloading messages for any room.");
+            crawlerState = _t("Not currently downloading messages for any room.");
         } else {
             crawlerState = (
                     _t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 419aecd528..e6e4ad3ed3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2040,7 +2040,7 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
     "Disable": "Disable",
-    "Not downloading messages for any room.": "Not downloading messages for any room.",
+    "Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
     "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",

From 50b491d7e5ede07a2d23e91e0a8cb3ec0c3c7251 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Jan 2020 15:48:19 +0000
Subject: [PATCH 0739/3235] post merge fix

---
 .../views/right_panel/VerificationPanel.js        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 0fdf16de65..b911824b4e 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -35,21 +35,18 @@ export default class VerificationPanel extends React.PureComponent {
         // TODO change the button into a spinner when on click
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
-        if (!request.requestEvent || !request.requestEvent.getId()) {
+        const cli = MatrixClientPeg.get();
+        const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
+        if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
             // TODO handle this error case
             return <p>request.requestEvent.getId()</p>;
         }
 
+        const myKeyId = cli.getCrossSigningId();
         const qrCodeKeys = [
-            [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-            [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
+            [cli.getDeviceId(), cli.getDeviceEd25519Key()],
+            [myKeyId, myKeyId],
         ];
-        const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
-
-        if (!crossSigningInfo) {
-            // TODO handle this error case
-            return <p>crossSigningInfo</p>;
-        }
 
         return <React.Fragment>
             <div className="mx_UserInfo_container">

From ab8ea5226647fcfdcaa7a352f3c711d2d5c536ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 27 Jan 2020 16:50:33 +0100
Subject: [PATCH 0740/3235] EventIndexPanel: Make sure links get opened in a
 new tab.

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 479a995bc8..68faa53e53 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -157,7 +157,8 @@ export default class EventIndexPanel extends React.Component {
                             "with <nativeLink>search components added</nativeLink>.",
                             {},
                             {
-                                'nativeLink': (sub) => <a href={nativeLink}>{sub}</a>,
+                                'nativeLink': (sub) => <a href={nativeLink} target="_blank"
+                                    rel="noopener">{sub}</a>,
                             },
                         )
                     }
@@ -172,7 +173,8 @@ export default class EventIndexPanel extends React.Component {
                             "for encrypted messages to appear in search results.",
                             {},
                             {
-                                'riotLink': (sub) => <a href="https://riot.im/download/desktop">{sub}</a>,
+                                'riotLink': (sub) => <a href="https://riot.im/download/desktop"
+                                    target="_blank" rel="noopener">{sub}</a>,
                             },
                         )
                     }

From 805e9abb3981584cd941e59c5c10edc3595c38b9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 27 Jan 2020 16:00:25 +0000
Subject: [PATCH 0741/3235] Flip back to develop

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index f0b7e04c73..78bbb5b4c6 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "4.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",
diff --git a/yarn.lock b/yarn.lock
index 232067a99f..b892ac44f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,10 +5760,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@4.0.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0.tgz#c81bdc905af2ab1634527e5f542f2f15977d31cf"
-  integrity sha512-Xbe36xL443qtEBH4xk0k39JabolqZfloK7fwYGMb/PgWO26VOzvw94XWahnIr5w83oxBAF9nFmP+7EnPG6IHnA==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/21e4c597d9633aef606871cf9ffffaf039142be3"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 40ec6d47a6693d99505f66742ca09c7951406553 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 27 Jan 2020 10:26:19 +0000
Subject: [PATCH 0742/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2048 of 2055 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 3c04ff85c0..e23bd07015 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2099,5 +2099,10 @@
     "Upgrade your encryption": "Përmirësoni fshehtëzimin tuaj",
     "Set up encryption": "Ujdisni fshehtëzim",
     "Encryption upgraded": "U përmirësua fshehtëzimi",
-    "Encryption setup complete": "Ujdisje fshehtëzimit e plotësuar"
+    "Encryption setup complete": "Ujdisje fshehtëzimit e plotësuar",
+    "Verify this session": "Verifikoni këtë sesion",
+    "Encryption upgrade available": "Ka të gatshëm përmirësim fshehtëzimi",
+    "Review & verify your new session": "Shqyrtoni & verifikoni sesionin tuaj të ri",
+    "Review": "Shqyrtojeni",
+    "Verify your other devices easier": "Verifikoni më lehtë pajisjet tuaja të tjera"
 }

From 1d90600ee1876e22108a80df3b2d74946589a031 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 27 Jan 2020 10:25:39 +0000
Subject: [PATCH 0743/3235] Translated using Weblate (Esperanto)

Currently translated at 92.3% (1897 of 2055 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 | 51 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 243aebb52d..2953a81ce3 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1890,5 +1890,54 @@
     "Lock": "Seruro",
     "Other users may not trust it": "Aliaj uzantoj eble ne kredas ĝin",
     "Later": "Pli poste",
-    "Verify": "Kontroli"
+    "Verify": "Kontroli",
+    "Set up encryption": "Agordi ĉifradon",
+    "Upgrade": "Gradaltigi",
+    "Cannot connect to integration manager": "Ne povas konektiĝi al kunigilo",
+    "The integration manager is offline or it cannot reach your homeserver.": "La kunigilo estas eksterreta aŭ ne povas atingi vian hejmservilon",
+    "Backup has a <validity>valid</validity> signature from this user": "Savkopio havas <validity>validan</validity> subskribon de ĉi tiu uzanto",
+    "Backup has a <validity>invalid</validity> signature from this user": "Savkopio havas <validity>nevalidan</validity> subskribon de ĉi tiu uzanto",
+    "This user has not verified all of their devices.": "Ĉi tiu uzanto ne kontrolis ĉiujn siajn aparatojn.",
+    "You have not verified this user. This user has verified all of their devices.": "Vi ne kontrolis ĉi tiun uzanton. Ĉi tiu uzanto kontrolis ĉiujn siajn aparatojn.",
+    "You have verified this user. This user has verified all of their devices.": "Vi kontrolis ĉi tiun uzanton. Ĉi tiu uzanto kontrolis ĉiujn siajn aparatojn.",
+    "Someone is using an unknown device": "Iu uzas nekonatan aparaton",
+    "This room is end-to-end encrypted": "Ĉi tiu ĉambro uzas tutvojan ĉifradon",
+    "Everyone in this room is verified": "Ĉiu en la ĉambro estas kontrolita",
+    "This message cannot be decrypted": "Ĉi tiun mesaĝon ne eblas malĉifri",
+    "Unencrypted": "Neĉifrita",
+    "Encrypted by a deleted device": "Ĉifrita de forigita aparato",
+    "Send a reply…": "Sendi respondon…",
+    "Send a message…": "Sendi mesaĝon…",
+    "Direct Messages": "Rektaj mesaĝoj",
+    "<userName/> wants to chat": "<userName/> volas babili",
+    "Start chatting": "Ekbabili",
+    "Reject & Ignore user": "Rifuzi kaj malatenti uzanton",
+    "Unknown Command": "Nekonata komando",
+    "Send as message": "Sendi mesaĝon",
+    "Failed to connect to integration manager": "Malsukcesis konekton al kunigilo",
+    "Verify User": "Kontroli uzanton",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Por plia sekureco, kontrolu ĉi tiun uzanton per unufoja kodo aperonta sur ambaŭ el viaj aparatoj.",
+    "For maximum security, do this in person.": "Por plejgranda sekureco, faru tion persone.",
+    "Start Verification": "Komenci kontrolon",
+    "Trusted": "Fidata",
+    "Not trusted": "Nefidata",
+    "Direct message": "Rekta mesaĝo",
+    "Security": "Sekureco",
+    "Reactions": "Reagoj",
+    "More options": "Pliaj elektebloj",
+    "Integrations are disabled": "Kunigoj estas malŝaltitaj",
+    "Integrations not allowed": "Kunigoj ne estas permesitaj",
+    "Suggestions": "Proponoj",
+    "Automatically invite users": "Memage inviti uzantojn",
+    "Upgrade private room": "Gradaltigi privatan ĉambron",
+    "Upgrade public room": "Gradaltigi publikan ĉambron",
+    "Notification settings": "Sciigaj agordoj",
+    "Take picture": "Foti",
+    "Start": "Komenci",
+    "Done": "Fini",
+    "Go Back": "Reiri",
+    "Verify other users in their profile.": "Kontrolu aliajn uzantojn en iliaj profiloj.",
+    "Upgrade your encryption": "Gradaltigi vian ĉifradon",
+    "Encryption upgraded": "Ĉifrado gradaltigita",
+    "Encryption setup complete": "Agordo de ĉifrado finita"
 }

From 1964e18315657f800257e66756f6f6e5505ba20b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 27 Jan 2020 16:40:56 +0000
Subject: [PATCH 0744/3235] Fix issue where we don't notice if our own devices
 shouldn't be trusted

---
 src/components/structures/RoomView.js  | 2 +-
 src/components/views/rooms/RoomTile.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 60fff5f1e3..2d669f9243 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -811,7 +811,7 @@ export default createReactClass({
         debuglog("e2e verified", verified, "unverified", unverified);
 
         /* Check all verified user devices. */
-        for (const userId of verified) {
+        for (const userId of [...verified, cli.getUserId()]) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const anyDeviceNotVerified = devices.some(({deviceId}) => {
                 return !cli.checkDeviceTrust(userId, deviceId).isVerified();
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 41975fe7b8..41d43476ea 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -166,7 +166,7 @@ export default createReactClass({
             });
 
         /* Check all verified user devices. */
-        for (const userId of verified) {
+        for (const userId of [...verified, cli.getUserId()]) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
                 return cli.checkDeviceTrust(userId, deviceId).isVerified();

From ca5d4d88a275c93aff94158ae8b6836acd1f08e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Jan 2020 17:17:05 +0000
Subject: [PATCH 0745/3235] Style the QR code

---
 res/css/views/right_panel/_UserInfo.scss      |  5 +++++
 .../views/right_panel/_VerificationPanel.scss | 16 ++++++++++++++
 .../elements/crypto/VerificationQRCode.js     |  2 +-
 .../views/right_panel/VerificationPanel.js    | 21 ++++++++++---------
 src/i18n/strings/en_EN.json                   |  2 +-
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 9db636ae6b..30c71146bf 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -111,6 +111,7 @@ limitations under the License.
         // override the calculated sizes so that the letter isn't HUGE
         font-size: 56px !important;
         width: 100% !important;
+        transition: font-size 1s;
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
@@ -270,4 +271,8 @@ limitations under the License.
         max-width: 72px;
         margin: 0 auto;
     }
+
+    .mx_UserInfo_avatar .mx_BaseAvatar_initial {
+        font-size: 40px !important; // override the other override because here the avatar is smaller
+    }
 }
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 84a82c9a5c..75b469cef9 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -18,4 +18,20 @@ limitations under the License.
     .mx_VerificationPanel_verified_section .mx_E2EIcon {
         margin: 0 auto;
     }
+
+    .mx_VerificationPanel_qrCode {
+        padding: 4px 4px 0 4px;
+        background: white;
+        border-radius: 4px;
+        width: max-content;
+        max-width: 100%;
+        margin: 0 auto;
+
+        canvas {
+            // override height and width which are set on the element directly
+            height: auto !important;
+            width: 100% !important;
+            max-width: 240px;
+        }
+    }
 }
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 1cb5647317..630a06a07c 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -51,6 +51,6 @@ export default class VerificationQRCode extends React.PureComponent {
 
         const uri = `https://matrix.to/#/${this.props.keyholderUserId}?${qs.stringify(query)}`;
 
-        return <QRCode value={uri} size={256} logoWidth={48} logo={require("../../../../../res/img/matrix-m.svg")} />;
+        return <QRCode value={uri} size={512} logoWidth={64} logo={require("../../../../../res/img/matrix-m.svg")} />;
     }
 }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index b911824b4e..c1e84afc22 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -48,22 +48,23 @@ export default class VerificationPanel extends React.PureComponent {
             [myKeyId, myKeyId],
         ];
 
+        // TODO: add way to open camera to scan a QR code
         return <React.Fragment>
             <div className="mx_UserInfo_container">
                 <h3>Verify by scanning</h3>
-                <p>{_t("Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:", {
+                <p>{_t("Ask %(displayName)s to scan your code:", {
                     displayName: member.displayName || member.name || member.userId,
-                }, {
-                    a: t => <a>{ t }</a>,
                 })}</p>
 
-                <VerificationQRCode
-                    keyholderUserId={MatrixClientPeg.get().getUserId()}
-                    requestEventId={request.requestEvent.getId()}
-                    otherUserKey={crossSigningInfo.getId("master")}
-                    secret={request.encodedSharedSecret}
-                    keys={qrCodeKeys}
-                />
+                <div className="mx_VerificationPanel_qrCode">
+                    <VerificationQRCode
+                        keyholderUserId={MatrixClientPeg.get().getUserId()}
+                        requestEventId={request.requestEvent.getId()}
+                        otherUserKey={crossSigningInfo.getId("master")}
+                        secret={request.encodedSharedSecret}
+                        keys={qrCodeKeys}
+                    />
+                </div>
             </div>
 
             <div className="mx_UserInfo_container">
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6297270540..d4512d785d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1156,7 +1156,7 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Security": "Security",
-    "Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:": "Ask %(displayName)s to scan your code, or <a>open your camera</a> to scan theirs:",
+    "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by emoji": "Verify by emoji",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",

From db1d3c091e041b607507fdf145cb41c6a92c46f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Jan 2020 17:21:31 +0000
Subject: [PATCH 0746/3235] Error handle the no QR verif case better

---
 .../views/right_panel/VerificationPanel.js          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index c1e84afc22..f6a26665d8 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -31,15 +31,22 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     renderQRPhase() {
-        const {member, request} = this.props; // type req: VerificationRequest
+        const {member, request} = this.props;
         // TODO change the button into a spinner when on click
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         const cli = MatrixClientPeg.get();
         const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
         if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
-            // TODO handle this error case
-            return <p>request.requestEvent.getId()</p>;
+            // for whatever reason we can't generate a QR code, offer only SAS Verification
+            return <div className="mx_UserInfo_container">
+                <h3>Verify by emoji</h3>
+                <p>{_t("Verify by comparing unique emoji.")}</p>
+
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+                    {_t("Verify by emoji")}
+                </AccessibleButton>
+            </div>;
         }
 
         const myKeyId = cli.getCrossSigningId();

From ff195381e9f17439fba3c7a2ff79e8587d41eaa6 Mon Sep 17 00:00:00 2001
From: stoically <stoically@protonmail.com>
Date: Wed, 22 Jan 2020 16:44:47 +0100
Subject: [PATCH 0747/3235] Use https for recaptcha for all non-http protocols

Signed-off-by: stoically <stoically@protonmail.com>
---
 src/components/views/auth/CaptchaForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index 2da837f029..efcc450067 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -62,7 +62,7 @@ export default createReactClass({
             console.log("Loading recaptcha script...");
             window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
             let protocol = global.location.protocol;
-            if (protocol === "vector:") {
+            if (protocol !== "http:") {
                 protocol = "https:";
             }
             const scriptTag = document.createElement('script');

From dbf0c5b4c37f57d1b15597102690ef492f015756 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 27 Jan 2020 17:14:46 +0000
Subject: [PATCH 0748/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2066 of 2073 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 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index e23bd07015..db687780f4 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2104,5 +2104,23 @@
     "Encryption upgrade available": "Ka të gatshëm përmirësim fshehtëzimi",
     "Review & verify your new session": "Shqyrtoni & verifikoni sesionin tuaj të ri",
     "Review": "Shqyrtojeni",
-    "Verify your other devices easier": "Verifikoni më lehtë pajisjet tuaja të tjera"
+    "Verify your other devices easier": "Verifikoni më lehtë pajisjet tuaja të tjera",
+    "Enable message search in encrypted rooms": "Aktivizo kërkim mesazhesh në dhoma të fshehtëzuara",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi, duke përdorur ",
+    " to store messages from ": " për të depozituar mesazhe nga ",
+    "rooms.": "dhoma.",
+    "Manage": "Administroni",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi.",
+    "Enable": "Aktivizoje",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot-it i mungojnë disa përbërës të domosdoshëm për ruajtje lokalisht në mënyrë të sigurt në fshehtinë mesazhe. Nëse do të donit të eksperimentonit me këtë veçori, montoni një Desktop vetjak Riot Desktop me <nativeLink>shtim përbërësish kërkimi</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot-i s’mund të ruajë lokalisht në mënyrë të sigurt mesazhe në fshehtinë teksa xhirohet nën shfletues. Që mesazhet e fshehtëzuar të shihen në përfundime kërkimi, përdorni <riotLink>Riot Desktop</riotLink>.",
+    "Message search": "Kërkim mesazhesh",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Në u çaktivizoftë, mesazhet prej dhomash të fshehtëzuara s’do të duken në përfundime kërkimi.",
+    "Disable": "Çaktivizoje",
+    "Not currently downloading messages for any room.": "Aktualisht s’po shkarkohen mesazhe për ndonjë dhomë.",
+    "Downloading mesages for %(currentRoom)s.": "Po shkarkohen mesazhe për %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot-i po ruan lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi:",
+    "Space used:": "Hapësirë e përdorur:",
+    "Indexed messages:": "Mesazhe të indeksuar:",
+    "Number of rooms:": "Numër dhomash:"
 }

From 68bf646d032b60f13cdf9157b3b7d2f05d7bb8b7 Mon Sep 17 00:00:00 2001
From: Joshua Dietz <jospam@dietz-ulm.de>
Date: Mon, 27 Jan 2020 17:45:39 +0000
Subject: [PATCH 0749/3235] Translated using Weblate (German)

Currently translated at 76.5% (1586 of 2073 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 | 78 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1e75c59a21..6963fdfa6c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1585,5 +1585,81 @@
     "%(senderName)s placed a voice call.": "%(senderName)s tätigte einen Sprachanruf.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s tätigte einen Sprachanruf (Nicht von diesem Browser unterstützt)",
     "%(senderName)s placed a video call.": "%(senderName)s tätigte einen Videoanruf.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s tätigte einen Videoanruf (Nicht von diesem Browser unterstützt)"
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s tätigte einen Videoanruf (Nicht von diesem Browser unterstützt)",
+    "Verify this session": "Sitzung verifizieren",
+    "Set up encryption": "Verschlüsselung einrichten",
+    "New Session": "Neue Sitzung",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s hat %(addedAddresses)s und %(count)s Adressen zu diesem Raum hinzugefügt",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hat %(removedAddresses)s und %(count)s andere Adressen aus diesem Raum entfernt",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hat %(countRemoved)s entfernt und %(countAdded)s Adressen zu diesem Raum hinzugefügt",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s hat die Ende-zu-Ende Verschlüsselung aktiviert.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s hat die Ende-zu-Ende Verschlüsselung aktiviert (unbekannter Algorithmus %(algorithm)s).",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s hat eine ungültige Bannregel aktualisiert",
+    "The message you are trying to send is too large.": "Die Nachricht, die du versuchst zu senden, ist zu lang.",
+    "a few seconds ago": "vor ein paar Sekunden",
+    "about a minute ago": "vor etwa einer Minute",
+    "%(num)s minutes ago": "vor %(num)s Minuten",
+    "about an hour ago": "vor etwa einer Stunde",
+    "%(num)s hours ago": "vor %(num)s Stunden",
+    "about a day ago": "vor etwa einem Tag",
+    "%(num)s days ago": "vor %(num)s Tagen",
+    "about a minute from now": "in etwa einer Minute",
+    "%(num)s minutes from now": "In etwa %(num)s Minuten",
+    "about an hour from now": "in etwa einer Stunde",
+    "%(num)s hours from now": "in %(num)s Stunden",
+    "about a day from now": "in etwa einem Tag",
+    "%(num)s days from now": "in %(num)s Tagen",
+    "Show info about bridges in room settings": "Information über Bridges in den Raumeinstellungen anzeigen",
+    "Enable message search in encrypted rooms": "Nachrichtensuche in verschlüsselten Räumen aktivieren",
+    "Lock": "Sperren",
+    "Review & verify your new session": "Überprüfe & verifiziere deine neue Sitzung",
+    "Later": "Später",
+    "Review": "Überprüfen",
+    "Verify your other devices easier": "Verifiziere deine weiteren Geräte einfacher",
+    "Verify": "Verifizieren",
+    "Decline (%(counter)s)": "Zurückweisen (%(counter)s)",
+    "on device": "auf dem Gerät",
+    "not found": "nicht gefunden",
+    "rooms.": "Räume.",
+    "Manage": "Verwalten",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Speichere verschlüsselte Nachrichten sicher lokal zwischen, sodass sie in Suchergebnissen erscheinen können.",
+    "Enable": "Aktivieren",
+    "Connecting to integration manager...": "Verbinden zum Integrationsmanager...",
+    "Cannot connect to integration manager": "Verbindung zum Integrationsmanager fehlgeschlagen",
+    "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsmanager ist offline oder er kann den Heimserver nicht erreichen.",
+    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbinde dieses Gerät zum Schlüssel Backup, bevor du dich ausloggst, um zu verhindern, dass Verschlüsselungsschlüssel, die sich nur auf dem Gerät befinden, verloren gehen.",
+    "not stored": "nicht gespeichert",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup hat eine Signatur von <verify>Unbekanntem</verify> Nutzer mit ID %(deviceId)s",
+    "Backup key stored: ": "Backup Schlüssel gespeichert: ",
+    "Clear notifications": "Benachrichtigungen löschen",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Verbindung vom Identitätsserver <current /> trennen und stattdessen zu <new /> verbinden?",
+    "The identity server you have chosen does not have any terms of service.": "Der Identitätsserver, den du gewählt hast, hat keine Nutzungsbedingungen.",
+    "Disconnect identity server": "Verbindung zum Identitätsserver trennen",
+    "contact the administrators of identity server <idserver />": "Administrator des Identitätsservers <idserver /> kontaktieren",
+    "wait and try again later": "warte und versuche es später erneut",
+    "Disconnect anyway": "Verbindung trotzdem trennen",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Du <b>teilst deine persönlichen Daten</b> immer noch auf dem Identitätsserver <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Wir empfehlen, dass du deine Email Adressen und Telefonnummern vom Identitätsserver löschst, bevor du die Verbindung trennst.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Du nutzt momentan keinen Identitätsserver. Um von bestehenden Kontakten die du kennst gefunden zu werden und diese zu finden, füge unten einen hinzu.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Nutze einen Integrationsmanager <b>(%(serverName)s)</b> um Bots, Widgets und Sticker Packs zu verwalten.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsmanager um Bots, Widgets und Sticker Packs zu verwalten.",
+    "Manage integrations": "Integrationen verwalten",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Stimme den Nutzungsbedingungen des Identitätsservers %(serverName)s zu, um dich per Email Adresse und Telefonnummer auffindbar zu machen.",
+    "Clear cache and reload": "Cache löschen und neu laden",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Passe deine Erfahrung mit experimentellen Lab Funktionen an. <a>Mehr erfahren</a>.",
+    "Ignored/Blocked": "Ignoriert/Blockiert",
+    "Something went wrong. Please try again or view your console for hints.": "Etwas ist schief gelaufen. Bitte versuche es erneut oder sieh für weitere Hinweise in deiner Konsole nach.",
+    "Error subscribing to list": "Fehler beim Abonnieren der Liste",
+    "Please verify the room ID or alias and try again.": "Bitte überprüfe die Raum ID oder den Alias und versuche es erneut.",
+    "Error removing ignored user/server": "Fehler beim Entfernen eines ignorierten Benutzers/Servers",
+    "Error unsubscribing from list": "Fehler beim Deabonnieren der Liste",
+    "Please try again or view your console for hints.": "Bitte versuche es erneut oder sieh für weitere Hinweise in deine Konsole.",
+    "Server rules": "Serverregeln",
+    "User rules": "Nutzerregeln",
+    "You have not ignored anyone.": "Du hast niemanden ignoriert.",
+    "You are currently ignoring:": "Du ignorierst momentan:",
+    "Unsubscribe": "Deabonnieren",
+    "View rules": "Regeln betrachten",
+    "You are currently subscribed to:": "Du abonnierst momentan:",
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht."
 }

From 89f110f60a7756f0c27f4e248fc27011b55cd28e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 27 Jan 2020 22:27:11 +0000
Subject: [PATCH 0750/3235] Add separate component for post-auth security flows

Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
---
 res/css/_components.scss                      |  3 +-
 .../structures/auth/_CompleteSecurity.scss    |  2 +-
 res/css/views/auth/_AuthBody.scss             | 14 ++-----
 res/css/views/auth/_CompleteSecurityBody.scss | 42 +++++++++++++++++++
 .../structures/auth/CompleteSecurity.js       |  6 +--
 src/components/structures/auth/E2eSetup.js    |  6 +--
 src/components/views/auth/AuthBody.js         | 21 +---------
 .../views/auth/CompleteSecurityBody.js        | 27 ++++++++++++
 8 files changed, 83 insertions(+), 38 deletions(-)
 create mode 100644 res/css/views/auth/_CompleteSecurityBody.scss
 create mode 100644 src/components/views/auth/CompleteSecurityBody.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 07e92bdc7b..a2cfc94c79 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -36,6 +36,7 @@
 @import "./views/auth/_AuthHeader.scss";
 @import "./views/auth/_AuthHeaderLogo.scss";
 @import "./views/auth/_AuthPage.scss";
+@import "./views/auth/_CompleteSecurityBody.scss";
 @import "./views/auth/_CountryDropdown.scss";
 @import "./views/auth/_InteractiveAuthEntryComponents.scss";
 @import "./views/auth/_LanguageSelector.scss";
@@ -148,10 +149,10 @@
 @import "./views/rooms/_AuxPanel.scss";
 @import "./views/rooms/_BasicMessageComposer.scss";
 @import "./views/rooms/_E2EIcon.scss";
-@import "./views/rooms/_InviteOnlyIcon.scss";
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
 @import "./views/rooms/_EventTile.scss";
+@import "./views/rooms/_InviteOnlyIcon.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
 @import "./views/rooms/_LinkPreviewWidget.scss";
 @import "./views/rooms/_MemberDeviceInfo.scss";
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index c258ce4ec7..2bf51d9574 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -22,7 +22,7 @@ limitations under the License.
 .mx_CompleteSecurity_headerIcon {
     width: 24px;
     height: 24px;
-    margin: 0 4px;
+    margin-right: 4px;
     position: relative;
 }
 
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 51b9775811..7c5b008535 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +16,9 @@ limitations under the License.
 */
 
 .mx_AuthBody {
+    width: 500px;
+    font-size: 12px;
+    color: $authpage-secondary-color;
     background-color: $authpage-body-bg-color;
     border-radius: 0 4px 4px 0;
     padding: 25px 60px;
@@ -92,16 +96,6 @@ limitations under the License.
     }
 }
 
-.mx_AuthBody_noHeader {
-    border-radius: 4px;
-}
-
-.mx_AuthBody_loginRegister {
-    width: 500px;
-    font-size: 12px;
-    color: $authpage-secondary-color;
-}
-
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
diff --git a/res/css/views/auth/_CompleteSecurityBody.scss b/res/css/views/auth/_CompleteSecurityBody.scss
new file mode 100644
index 0000000000..c7860fbe74
--- /dev/null
+++ b/res/css/views/auth/_CompleteSecurityBody.scss
@@ -0,0 +1,42 @@
+/*
+Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_CompleteSecurityBody {
+    width: 600px;
+    color: $authpage-primary-color;
+    background-color: $authpage-body-bg-color;
+    border-radius: 4px;
+    padding: 20px;
+    box-sizing: border-box;
+
+    h2 {
+        font-size: 24px;
+        font-weight: 600;
+        margin-top: 0;
+    }
+
+    h3 {
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+    a:link,
+    a:hover,
+    a:visited {
+        @mixin mx_Dialog_link;
+    }
+}
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 206cdb743e..29d8207d0a 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -112,7 +112,7 @@ export default class CompleteSecurity extends React.Component {
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
-        const AuthBody = sdk.getComponent("auth.AuthBody");
+        const CompleteSecurityBody = sdk.getComponent("auth.CompleteSecurityBody");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
         const {
@@ -204,7 +204,7 @@ export default class CompleteSecurity extends React.Component {
 
         return (
             <AuthPage>
-                <AuthBody header={false}>
+                <CompleteSecurityBody>
                     <h2 className="mx_CompleteSecurity_header">
                         {icon}
                         {title}
@@ -212,7 +212,7 @@ export default class CompleteSecurity extends React.Component {
                     <div className="mx_CompleteSecurity_body">
                         {body}
                     </div>
-                </AuthBody>
+                </CompleteSecurityBody>
             </AuthPage>
         );
     }
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.js
index 29b4345761..9b390d24cc 100644
--- a/src/components/structures/auth/E2eSetup.js
+++ b/src/components/structures/auth/E2eSetup.js
@@ -34,16 +34,16 @@ export default class E2eSetup extends React.Component {
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
-        const AuthBody = sdk.getComponent("auth.AuthBody");
+        const CompleteSecurityBody = sdk.getComponent("auth.CompleteSecurityBody");
         return (
             <AuthPage>
-                <AuthBody header={false}>
+                <CompleteSecurityBody>
                     <AsyncWrapper prom={this._createStorageDialogPromise}
                         hasCancel={false}
                         onFinished={this.props.onFinished}
                         accountPassword={this.props.accountPassword}
                     />
-                </AuthBody>
+                </CompleteSecurityBody>
             </AuthPage>
         );
     }
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index b74b7d866a..9a078efb52 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -17,29 +17,10 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {
-    static PropTypes = {
-        header: PropTypes.bool,
-    };
-
-    static defaultProps = {
-        header: true,
-    };
-
     render() {
-        const classes = {
-            'mx_AuthBody': true,
-            'mx_AuthBody_noHeader': !this.props.header,
-            // XXX The login pages all use a smaller fonts size but we don't want this
-            // for subsequent auth screens like the e2e setup. Doing this a terrible way
-            // for now.
-            'mx_AuthBody_loginRegister': this.props.header,
-        };
-
-        return <div className={classnames(classes)}>
+        return <div className="mx_AuthBody">
             { this.props.children }
         </div>;
     }
diff --git a/src/components/views/auth/CompleteSecurityBody.js b/src/components/views/auth/CompleteSecurityBody.js
new file mode 100644
index 0000000000..d757de9fe0
--- /dev/null
+++ b/src/components/views/auth/CompleteSecurityBody.js
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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';
+
+export default class CompleteSecurityBody extends React.PureComponent {
+    render() {
+        return <div className="mx_CompleteSecurityBody">
+            { this.props.children }
+        </div>;
+    }
+}

From 2a1407a531e74eaea8a729cbd66d8f33d9d5f661 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 27 Jan 2020 15:36:12 -0700
Subject: [PATCH 0751/3235] Add more logging to settings watchers

To try and track leaks versus spam.

Fixes https://github.com/vector-im/riot-web/issues/12094 (it's not leaking, probably)
---
 src/settings/SettingsStore.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 9501bac205..b1d61197a0 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -145,7 +145,7 @@ export default class SettingsStore {
             callbackFn(originalSettingName, changedInRoomId, atLevel, newValAtLevel, newValue);
         };
 
-        console.log(`Starting watcher for ${settingName}@${roomId || '<null room>'}`);
+        console.log(`Starting watcher for ${settingName}@${roomId || '<null room>'} as ID ${watcherId}`);
         SettingsStore._watchers[watcherId] = localizedCallback;
         defaultWatchManager.watchSetting(settingName, roomId, localizedCallback);
 
@@ -159,8 +159,12 @@ export default class SettingsStore {
      * to cancel.
      */
     static unwatchSetting(watcherReference) {
-        if (!SettingsStore._watchers[watcherReference]) return;
+        if (!SettingsStore._watchers[watcherReference]) {
+            console.warn(`Ending non-existent watcher ID ${watcherReference}`);
+            return;
+        }
 
+        console.log(`Ending watcher ID ${watcherReference}`);
         defaultWatchManager.unwatchSetting(SettingsStore._watchers[watcherReference]);
         delete SettingsStore._watchers[watcherReference];
     }

From 7effd22f6b9511ce7242065ddd3485f94078de3f Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Mon, 27 Jan 2020 20:05:38 +0000
Subject: [PATCH 0752/3235] Translated using Weblate (Turkish)

Currently translated at 73.4% (1521 of 2073 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 257cb27b42..222d2802da 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -106,7 +106,7 @@
     "Export": "Dışa Aktar",
     "Export E2E room keys": "Uçtan uca Oda anahtarlarını Dışa Aktar",
     "Failed to ban user": "Kullanıcı yasaklama(Ban) başarısız",
-    "Failed to change password. Is your password correct?": "Şifreniz değiştirilemedi . Şifreniz doğru mu ?",
+    "Failed to change password. Is your password correct?": "Parola değiştirilemedi . Şifreniz doğru mu ?",
     "Failed to change power level": "Güç seviyesini değiştirme başarısız oldu",
     "Failed to fetch avatar URL": "Avatar URL'i alınamadı",
     "Failed to forget room %(errCode)s": "Oda unutulması başarısız oldu %(errCode)s",
@@ -270,7 +270,7 @@
     "Start authentication": "Kimlik Doğrulamayı başlatın",
     "Start Chat": "Sohbet Başlat",
     "Submit": "Gönder",
-    "Success": "Başarı",
+    "Success": "Başarılı",
     "The phone number entered looks invalid": "Girilen telefon numarası geçersiz görünüyor",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Sağladığınız imza anahtarı %(userId)s aygıtından %(deviceId)s ile eşleşiyor . Aygıt doğrulanmış olarak işaretlendi.",
     "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
@@ -350,7 +350,7 @@
     "You need to be able to invite users to do that.": "Bunu yapmak için kullanıcıları davet etmeye ihtiyacınız var.",
     "You need to be logged in.": "Oturum açmanız gerekiyor.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "E-posta adresiniz bu Ana Sunucu'da ki Matrix ID'si ile ilişkili gözükmüyor.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Şifreniz başarıyla değiştirildi . Diğer cihazlara girene kadar onlara bildirim almayacaksınız",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Parolanız başarıyla değiştirildi . Diğer cihazlara girene kadar onlara bildirim almayacaksınız",
     "You seem to be in a call, are you sure you want to quit?": "Bir çağrıda gözüküyorsunuz , çıkmak istediğinizden emin misiniz ?",
     "You seem to be uploading files, are you sure you want to quit?": "Dosya yüklüyorsunuz gibi görünüyor , çıkmak istediğinizden emin misiniz ?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Kullanıcıyı sizinle aynı güç seviyesine yükseltirken , bu değişikliği geri alamazsınız.",
@@ -588,7 +588,7 @@
     "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
     "The platform you're on": "Bulunduğun platform",
     "The version of Riot.im": "Riot.im'in sürümü",
-    "Your language of choice": "Seçtiginiz diliniz",
+    "Your language of choice": "",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
     "Add Email Address": "E-posta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
@@ -1300,7 +1300,7 @@
     "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu <idserver /> üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Kimlik sunucusundan bağlantıyı kesmeden önce telefon numaranızı ve e-posta adreslerinizi silmenizi tavsiye ederiz.",
-    "Set a new account password...": "Yeni bir hesap şifresi belirle...",
+    "Set a new account password...": "Yeni bir hesap parolası belirle...",
     "Deactivating your account is a permanent action - be careful!": "Hesabınızı pasifleştirmek bir kalıcı eylemdir - dikkat edin!",
     "Deactivate account": "Hesabı pasifleştir",
     "For help with using Riot, click <a>here</a>.": "Riot kullanarak yardım etmek için, <a>buraya</a> tıklayın.",
@@ -1538,5 +1538,14 @@
     "Encrypted messages in one-to-one chats": "Birebir sohbetlerdeki şifrelenmiş mesajlar",
     "Encrypted messages in group chats": "Grup sohbetlerdeki şifrelenmiş mesajlar",
     "This is your list of users/servers you have blocked - don't leave the room!": "Bu sizin engellediğiniz kullanıcılar/sunucular listeniz - odadan ayrılmayın!",
-    "Got It": "Anlaşıldı"
+    "Got It": "Anlaşıldı",
+    "Subscribing to a ban list will cause you to join it!": "Bir yasak listesine abonelik ona katılmanıza yol açar!",
+    "Message search": "Mesaj arama",
+    "A device's public name is visible to people you communicate with": "Bir cihazın halka açık ismi iletişimde olduğunuz kişilere görünür",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Mahremiyet bizim için önemli, bu yüzden hiç bir kişisel ve betimleyici veriyi analizlerimiz için toplamayız.",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Uyarı</b>: Bir oda yükseltimi <i> o oda üyelerinin otomatik olarak yeni sürüm odaya göç ettirilmesini sağlamaz.</i> Odanın eski sürümünde yeni sürüm odaya gitmek için bir linki gönderilecektir - yeni odaya katılmak için oda üyeleri bu linke tıklamak zorunda olacaktır.",
+    "Internal room ID:": "Dahili oda ID:",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Kullanıcının güç düzeyini değiştirirken bir hata oluştu. Yeterli izinlere sahip olduğunuza emin olun ve yeniden deneyin.",
+    "Select the roles required to change various parts of the room": "Odanın çeşitli bölümlerini değişmek için gerekli rolleri seçiniz",
+    "Click the link in the email you received to verify and then click continue again.": "Aldığınız e-postaki bağlantıyı tıklayarak doğrulayın ve sonra tekrar tıklayarak devam edin."
 }

From d014c5239be443911d3a3ad0b4650756c9e04a1a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 27 Jan 2020 23:14:02 +0000
Subject: [PATCH 0753/3235] Add new session verification details dialog

This gives more info on the session you're about to verify, including device
name and ID.

Fixes https://github.com/vector-im/riot-web/issues/11977
---
 res/css/_components.scss                      |  1 +
 .../dialogs/_NewSessionReviewDialog.scss      | 37 ++++++++
 .../views/dialogs/NewSessionReviewDialog.js   | 92 +++++++++++++++++++
 .../views/elements/DialogButtons.js           |  2 +-
 .../views/toasts/NewSessionToast.js           |  5 +-
 src/i18n/strings/en_EN.json                   |  4 +
 6 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 res/css/views/dialogs/_NewSessionReviewDialog.scss
 create mode 100644 src/components/views/dialogs/NewSessionReviewDialog.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 07e92bdc7b..de56ad77bb 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -65,6 +65,7 @@
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
+@import "./views/dialogs/_NewSessionReviewDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
diff --git a/res/css/views/dialogs/_NewSessionReviewDialog.scss b/res/css/views/dialogs/_NewSessionReviewDialog.scss
new file mode 100644
index 0000000000..7e35fe941e
--- /dev/null
+++ b/res/css/views/dialogs/_NewSessionReviewDialog.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_NewSessionReviewDialog_header {
+    display: flex;
+    align-items: center;
+    margin-top: 0;
+}
+
+.mx_NewSessionReviewDialog_headerIcon {
+    width: 24px;
+    height: 24px;
+    margin-right: 4px;
+    position: relative;
+}
+
+.mx_NewSessionReviewDialog_deviceName {
+    font-weight: 600;
+}
+
+.mx_NewSessionReviewDialog_deviceID {
+    font-size: 12px;
+    color: $notice-secondary-color;
+}
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
new file mode 100644
index 0000000000..c14f0f5614
--- /dev/null
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -0,0 +1,92 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from "../../../index";
+import { _t } from '../../../languageHandler';
+import Modal from "../../../Modal";
+
+export default class NewSessionReviewDialog extends React.PureComponent {
+    static propTypes = {
+        userId: PropTypes.string.isRequired,
+        device: PropTypes.object.isRequired,
+        onFinished: PropTypes.func.isRequired,
+    }
+
+    onCancelClick = () => {
+        this.props.onFinished(false);
+    }
+
+    onContinueClick = () => {
+        const DeviceVerifyDialog =
+            sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+        const { userId, device } = this.props;
+        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
+            userId,
+            device,
+        }, null, /* priority = */ false, /* static = */ true);
+    }
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+
+        const { device } = this.props;
+
+        const icon = <span className="mx_NewSessionReviewDialog_headerIcon mx_E2EIcon_warning"></span>;
+        const titleText = _t("New session");
+
+        const title = <h2 className="mx_NewSessionReviewDialog_header">
+            {icon}
+            {titleText}
+        </h2>;
+
+        return (
+            <BaseDialog
+                title={title}
+                onFinished={this.props.onFinished}
+            >
+                <div className="mx_NewSessionReviewDialog_body">
+                    <p>{_t(
+                        "Use this session to verify your new one, " +
+                        "granting it access to encrypted messages:",
+                    )}</p>
+                    <div className="mx_NewSessionReviewDialog_deviceInfo">
+                        <div>
+                            <span className="mx_NewSessionReviewDialog_deviceName">
+                                {device.getDisplayName()}
+                            </span> <span className="mx_NewSessionReviewDialog_deviceID">
+                                ({device.deviceId})
+                            </span>
+                        </div>
+                    </div>
+                    <p>{_t(
+                        "If you didn’t sign in to this session, " +
+                        "your account may be compromised.",
+                    )}</p>
+                    <DialogButtons
+                        cancelButton={_t("This wasn't me")}
+                        cancelButtonClass="danger"
+                        primaryButton={_t("Continue")}
+                        onCancel={this.onCancelClick}
+                        onPrimaryButtonClick={this.onContinueClick}
+                    />
+                </div>
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index ee15bfc3f2..9223b5ade8 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -83,7 +83,7 @@ export default createReactClass({
                 // primary in the DOM so will get form submissions unless we make it not a submit.
                 type="button"
                 onClick={this._onCancelClick}
-		className={this.props.cancelButtonClass}
+                className={this.props.cancelButtonClass}
                 disabled={this.props.disabled}
             >
                 { this.props.cancelButton || _t("Cancel") }
diff --git a/src/components/views/toasts/NewSessionToast.js b/src/components/views/toasts/NewSessionToast.js
index 3b60f59131..ed8b15e25f 100644
--- a/src/components/views/toasts/NewSessionToast.js
+++ b/src/components/views/toasts/NewSessionToast.js
@@ -34,11 +34,12 @@ export default class VerifySessionToast extends React.PureComponent {
 
     _onReviewClick = async () => {
         const cli = MatrixClientPeg.get();
-        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+        const NewSessionReviewDialog =
+            sdk.getComponent('views.dialogs.NewSessionReviewDialog');
 
         const device = await cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
 
-        Modal.createTrackedDialog('New Session Verify', 'Starting dialog', DeviceVerifyDialog, {
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
             userId: MatrixClientPeg.get().getUserId(),
             device,
         }, null, /* priority = */ false, /* static = */ true);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 23ca730d97..7ccce9e7f6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1508,6 +1508,10 @@
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
     "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
     "Message edits": "Message edits",
+    "New session": "New session",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
+    "If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",
+    "This wasn't me": "This wasn't me",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
     "Report bugs & give feedback": "Report bugs & give feedback",

From 23a6b44fe7b615a50b42f234a8ee9e051984778d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 28 Jan 2020 07:43:25 +0000
Subject: [PATCH 0754/3235] Translated using Weblate (French)

Currently translated at 100.0% (2073 of 2073 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 | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 1ddcc55544..beaf2f9281 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2111,5 +2111,28 @@
     "Invite only": "Uniquement sur invitation",
     "Send a reply…": "Envoyer une réponse…",
     "Send a message…": "Envoyer un message…",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur, partagez votre nom d’utilisateur (%(userId)s) ou votre <a>lien de profil</a>."
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur, partagez votre nom d’utilisateur (%(userId)s) ou votre <a>lien de profil</a>.",
+    "Verify this session": "Vérifier cette session",
+    "Encryption upgrade available": "Mise à niveau du chiffrement disponible",
+    "Enable message search in encrypted rooms": "Activer la recherche de messages dans les salons chiffrés",
+    "Review & verify your new session": "Examiner et vérifier votre nouvelle session",
+    "Review": "Examiner",
+    "Verify your other devices easier": "Vérifiez vos autres appareils facilement",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche, en utilisant ",
+    " to store messages from ": " pour stocker des messages de ",
+    "rooms.": "salons.",
+    "Manage": "Gérer",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche.",
+    "Enable": "Activer",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Il manque quelques composants à Riot pour mettre en cache les messages chiffrés localement de manière sécurisée. Si vous voulez essayer cette fonctionnalité, construisez Riot Desktop vous-même en <nativeLink>ajoutant les composants de recherche</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ne peut pas mettre en cache les messages chiffrés localement de manière sécurisée dans un navigateur web. Utilisez <riotLink>Riot Desktop</riotLink> pour que les messages chiffrés apparaissent dans les résultats de recherche.",
+    "Message search": "Recherche de message",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Si l’option est désactivée, les messages des salons chiffrés n’apparaîtront pas dans les résultats de recherche.",
+    "Disable": "Désactiver",
+    "Not currently downloading messages for any room.": "Aucun téléchargement de message en cours pour les salons.",
+    "Downloading mesages for %(currentRoom)s.": "Téléchargement des messages pour %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
+    "Space used:": "Espace utilisé :",
+    "Indexed messages:": "Messages indexés :",
+    "Number of rooms:": "Nombre de salons :"
 }

From bdaf9fd06d2ec85985753eda2d076c7f195dd367 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 28 Jan 2020 10:05:42 +0000
Subject: [PATCH 0755/3235] i18n

---
 src/components/views/settings/BridgeTile.js | 2 +-
 src/i18n/strings/en_EN.json                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index ee9343ec39..a5672c271c 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -108,7 +108,7 @@ export default class BridgeTile extends React.PureComponent {
                     {creator} {bot}
                 </p>
                 <AccessibleButton kind="secondary" onClick={this._toggleVisible.bind(this)}>
-                    Show { this.state.visible ? "less" : "more" }
+                    { this.state.visible ? _t("Show less") : _t("Show more") }
                 </AccessibleButton>
             </div>
         </li>);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1afa3a33c9..270d964e56 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -524,6 +524,8 @@
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
     "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
+    "Show less": "Show less",
+    "Show more": "Show more",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Upload new:": "Upload new:",
     "No display name": "No display name",
@@ -1461,7 +1463,6 @@
     "Recent Conversations": "Recent Conversations",
     "Suggestions": "Suggestions",
     "Recently Direct Messaged": "Recently Direct Messaged",
-    "Show more": "Show more",
     "Direct Messages": "Direct Messages",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",

From 67358e06bf5da0d40f58d00c75b589e70624bc79 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 28 Jan 2020 10:10:37 +0000
Subject: [PATCH 0756/3235] Use annotations and imports

---
 .../views/dialogs/NewSessionReviewDialog.js         | 13 ++++++-------
 src/components/views/toasts/NewSessionToast.js      |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index c14f0f5614..2d2bcc8f35 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -16,10 +16,14 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
-import Modal from "../../../Modal";
+import Modal from '../../../Modal';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
+import DeviceVerifyDialog from './DeviceVerifyDialog';
+import BaseDialog from './BaseDialog';
+import DialogButtons from '../elements/DialogButtons';
 
+@replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
     static propTypes = {
         userId: PropTypes.string.isRequired,
@@ -32,8 +36,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
     }
 
     onContinueClick = () => {
-        const DeviceVerifyDialog =
-            sdk.getComponent('views.dialogs.DeviceVerifyDialog');
         const { userId, device } = this.props;
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
             userId,
@@ -42,9 +44,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
     }
 
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
-
         const { device } = this.props;
 
         const icon = <span className="mx_NewSessionReviewDialog_headerIcon mx_E2EIcon_warning"></span>;
diff --git a/src/components/views/toasts/NewSessionToast.js b/src/components/views/toasts/NewSessionToast.js
index ed8b15e25f..80564f3494 100644
--- a/src/components/views/toasts/NewSessionToast.js
+++ b/src/components/views/toasts/NewSessionToast.js
@@ -16,12 +16,15 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
+import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
+import FormButton from '../elements/FormButton';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
 
+@replaceableComponent("views.toasts.VerifySessionToast")
 export default class VerifySessionToast extends React.PureComponent {
     static propTypes = {
         toastKey: PropTypes.string.isRequired,
@@ -34,8 +37,6 @@ export default class VerifySessionToast extends React.PureComponent {
 
     _onReviewClick = async () => {
         const cli = MatrixClientPeg.get();
-        const NewSessionReviewDialog =
-            sdk.getComponent('views.dialogs.NewSessionReviewDialog');
 
         const device = await cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
 
@@ -46,7 +47,6 @@ export default class VerifySessionToast extends React.PureComponent {
     };
 
     render() {
-        const FormButton = sdk.getComponent("elements.FormButton");
         return (<div>
             <div className="mx_Toast_description">{_t("Review & verify your new session")}</div>
             <div className="mx_Toast_buttons" aria-live="off">

From f4842688f880c324acdd1819d2fea05f15415b4b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 11:10:15 +0000
Subject: [PATCH 0757/3235] Add reciprocate to verification methods

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

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 450bec8e77..53dd63d805 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -217,7 +217,7 @@ class _MatrixClientPeg {
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
-            verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW],
+            verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW, verificationMethods.RECIPROCATE_QR_CODE],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
         };

From 657457c14bc1f49da33ddae8a51f9a7d5ac91cba Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 11:13:09 +0000
Subject: [PATCH 0758/3235] Apply remainder of ux

---
 .../views/right_panel/_EncryptionInfo.scss    |   2 +
 src/components/views/dialogs/ErrorDialog.js   |  10 +-
 .../views/right_panel/EncryptionPanel.js      |  52 ++++++--
 .../views/right_panel/VerificationPanel.js    | 112 ++++++++++++------
 .../views/verification/VerificationShowSas.js |   1 -
 src/i18n/strings/en_EN.json                   |  12 +-
 6 files changed, 139 insertions(+), 50 deletions(-)

diff --git a/res/css/views/right_panel/_EncryptionInfo.scss b/res/css/views/right_panel/_EncryptionInfo.scss
index 386eef8e7f..e13b1b6802 100644
--- a/res/css/views/right_panel/_EncryptionInfo.scss
+++ b/res/css/views/right_panel/_EncryptionInfo.scss
@@ -20,5 +20,7 @@ limitations under the License.
             margin-top: 25px;
             margin-bottom: 15px;
         }
+
+        text-align: center;
     }
 }
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index 15c87990d0..fbc5509457 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -42,6 +42,7 @@ export default createReactClass({
         button: PropTypes.string,
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
+        headerImage: PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -56,9 +57,12 @@ export default createReactClass({
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
-            <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
-                    title={this.props.title || _t('Error')}
-                    contentId='mx_Dialog_content'
+            <BaseDialog
+                className="mx_ErrorDialog"
+                onFinished={this.props.onFinished}
+                title={this.props.title || _t('Error')}
+                headerImage={this.props.headerImage}
+                contentId='mx_Dialog_content'
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     { this.props.description || _t('An error has occurred.') }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index dfb145f61d..2c4a896624 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -21,19 +21,47 @@ import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import Modal from "../../../Modal";
+import {PHASE_REQUESTED} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import * as sdk from "../../../index";
+import {_t} from "../../../languageHandler";
 
-const EncryptionPanel = ({verificationRequest, member}) => {
+// cancellation codes which constitute a key mismatch
+const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
+
+const EncryptionPanel = ({verificationRequest, member, onClose}) => {
     const [request, setRequest] = useState(verificationRequest);
     useEffect(() => {
         setRequest(verificationRequest);
     }, [verificationRequest]);
 
-    const [pending, setPending] = useState(false);
+    const [phase, setPhase] = useState(false);
     const changeHandler = useCallback(() => {
-        setPending(request && request.requested);
-    }, [request]);
+        // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
+        if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog("Verification failed", "insecure", ErrorDialog, {
+                headerImage: require("../../../../res/img/e2e/warning.svg"),
+                title: _t("Your messages are not secure"),
+                description: <div>
+                    {_t("One of the following may be compromised:")}
+                    <ul>
+                        <li>{_t("Your homeserver")}</li>
+                        <li>{_t("The homeserver the user you’re verifying is connected to")}</li>
+                        <li>{_t("Yours, or the other users’ internet connection")}</li>
+                        <li>{_t("Yours, or the other users’ device")}</li>
+                    </ul>
+                </div>,
+                onFinished: onClose,
+            });
+            return; // don't update phase here as we will be transitioning away from this view shortly
+        }
+
+        if (request) {
+            setPhase(request.phase);
+        }
+    }, [onClose, request]);
     useEventEmitter(request, "change", changeHandler);
-    useEffect(changeHandler, [changeHandler]);
 
     const onStartVerification = useCallback(async () => {
         const cli = MatrixClientPeg.get();
@@ -42,10 +70,18 @@ const EncryptionPanel = ({verificationRequest, member}) => {
         setRequest(verificationRequest);
     }, [member.userId]);
 
-    if (!request || pending) {
-        return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={pending} />;
+    const requested = request && phase === PHASE_REQUESTED;
+    if (!request || requested) {
+        return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={requested} />;
     } else {
-        return <VerificationPanel member={member} request={request} key={request.channel.transactionId} />;
+        return (
+            <VerificationPanel
+                onClose={onClose}
+                member={member}
+                request={request}
+                key={request.channel.transactionId}
+                phase={phase} />
+        );
     }
 };
 EncryptionPanel.propTypes = {
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index f6a26665d8..6a5516927a 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -22,6 +22,13 @@ import VerificationQRCode from "../elements/crypto/VerificationQRCode";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {_t} from "../../../languageHandler";
 import E2EIcon from "../rooms/E2EIcon";
+import {
+    PHASE_READY,
+    PHASE_DONE,
+    PHASE_STARTED,
+    PHASE_CANCELLED,
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import Spinner from "../elements/Spinner";
 
 export default class VerificationPanel extends React.PureComponent {
     constructor(props) {
@@ -30,11 +37,22 @@ export default class VerificationPanel extends React.PureComponent {
         this._hasVerifier = !!props.request.verifier;
     }
 
-    renderQRPhase() {
+    renderQRPhase(pending) {
         const {member, request} = this.props;
         // TODO change the button into a spinner when on click
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
+        let button;
+        if (pending) {
+            button = <Spinner />;
+        } else {
+            button = (
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+                    {_t("Verify by emoji")}
+                </AccessibleButton>
+            );
+        }
+
         const cli = MatrixClientPeg.get();
         const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
         if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
@@ -43,9 +61,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <h3>Verify by emoji</h3>
                 <p>{_t("Verify by comparing unique emoji.")}</p>
 
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
-                    {_t("Verify by emoji")}
-                </AccessibleButton>
+                { button }
             </div>;
         }
 
@@ -78,9 +94,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <h3>Verify by emoji</h3>
                 <p>{_t("If you can't scan the code above, verify by comparing unique emoji.")}</p>
 
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
-                    {_t("Verify by emoji")}
-                </AccessibleButton>
+                { button }
             </div>
         </React.Fragment>;
     }
@@ -97,7 +111,36 @@ export default class VerificationPanel extends React.PureComponent {
                 })}</p>
                 <E2EIcon isUser={true} status="verified" size={128} />
                 <p>Verify all users in a room to ensure it's secure.</p>
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onClose}>
+                    {_t("Got it")}
+                </AccessibleButton>
+            </div>
+        );
+    }
+
+    renderCancelledPhase() {
+        const {member, request} = this.props;
+
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+
+        let text;
+        if (request.cancellationCode === "m.timeout") {
+            text = _t("Verification timed out. Start verification again from their profile.");
+        } else if (request.cancellingUserId === request.otherUserId) {
+            text = _t("%(displayName)s cancelled verification. Start verification again from their profile.", {
+                displayName: member.displayName || member.name || member.userId,
+            });
+        } else {
+            text = _t("You cancelled verification. Start verification again from their profile.");
+        }
+
+        return (
+            <div className="mx_UserInfo_container">
+                <h3>Verification cancelled</h3>
+                <p>{ text }</p>
+
+                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onClose}>
                     {_t("Got it")}
                 </AccessibleButton>
             </div>
@@ -105,34 +148,32 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     render() {
-        const {member, request} = this.props;
+        const {member} = this.props;
 
         const displayName = member.displayName || member.name || member.userId;
 
-        if (request.ready) {
-            return this.renderQRPhase();
-        } else if (request.started) {
-            if (this.state.sasEvent) {
-                const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
-                // TODO implement "mismatch" vs "cancelled"
-                return <div className="mx_UserInfo_container">
-                    <h3>Compare emoji</h3>
-                    <VerificationShowSas
-                        displayName={displayName}
-                        sas={this.state.sasEvent.sas}
-                        onCancel={this._onSasMismatchesClick}
-                        onDone={this._onSasMatchesClick}
-                    />
-                </div>;
-            } else {
-                return (<p>Setting up SAS verification...</p>);
-            }
-        } else if (request.done) {
-            return this.renderVerifiedPhase();
-        } else if (request.cancelled) {
-            // TODO check if this matches target
-            // TODO should this be a MODAL?
-            return <p>cancelled by {request.cancellingUserId}!</p>;
+        switch (this.props.phase) {
+            case PHASE_READY:
+                return this.renderQRPhase();
+            case PHASE_STARTED:
+                if (this.state.sasEvent) {
+                    const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
+                    return <div className="mx_UserInfo_container">
+                        <h3>Compare emoji</h3>
+                        <VerificationShowSas
+                            displayName={displayName}
+                            sas={this.state.sasEvent.sas}
+                            onCancel={this._onSasMismatchesClick}
+                            onDone={this._onSasMatchesClick}
+                        />
+                    </div>;
+                } else {
+                    return this.renderQRPhase(true); // keep showing same phase but with a spinner
+                }
+            case PHASE_DONE:
+                return this.renderVerifiedPhase();
+            case PHASE_CANCELLED:
+                return this.renderCancelledPhase();
         }
         return null;
     }
@@ -143,8 +184,6 @@ export default class VerificationPanel extends React.PureComponent {
             await verifier.verify();
         } catch (err) {
             console.error(err);
-        } finally {
-            this.setState({sasEvent: null});
         }
     };
 
@@ -153,7 +192,7 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onSasMismatchesClick = () => {
-        this.state.sasEvent.cancel();
+        this.state.sasEvent.mismatch();
     };
 
     _onVerifierShowSas = (sasEvent) => {
@@ -175,7 +214,6 @@ export default class VerificationPanel extends React.PureComponent {
             request.verifier.removeListener('show_sas', this._onVerifierShowSas);
         }
         this._hasVerifier = !!request.verifier;
-        this.forceUpdate(); // TODO fix this
     };
 
     componentDidMount() {
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 693a3769a0..08d0dd422d 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d4512d785d..e926d4ff91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1139,6 +1139,12 @@
     "Verify User": "Verify User",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
     "For maximum security, do this in person.": "For maximum security, do this in person.",
+    "Your messages are not secure": "Your messages are not secure",
+    "One of the following may be compromised:": "One of the following may be compromised:",
+    "Your homeserver": "Your homeserver",
+    "The homeserver the user you’re verifying is connected to": "The homeserver the user you’re verifying is connected to",
+    "Yours, or the other users’ internet connection": "Yours, or the other users’ internet connection",
+    "Yours, or the other users’ device": "Yours, or the other users’ device",
     "Members": "Members",
     "Files": "Files",
     "Trusted": "Trusted",
@@ -1156,11 +1162,15 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Security": "Security",
+    "Verify by emoji": "Verify by emoji",
+    "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
-    "Verify by emoji": "Verify by emoji",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Got it": "Got it",
+    "Verification timed out. Start verification again from their profile.": "Verification timed out. Start verification again from their profile.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s cancelled verification. Start verification again from their profile.",
+    "You cancelled verification. Start verification again from their profile.": "You cancelled verification. Start verification again from their profile.",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From 785277d4b8d44ad011bb79cf0db2369584ee0730 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 28 Jan 2020 11:17:51 +0000
Subject: [PATCH 0759/3235] Review bits for travis

---
 .../views/dialogs/_RoomSettingsDialog.scss    | 63 -------------------
 .../dialogs/_RoomSettingsDialogBridges.scss   |  7 ++-
 src/components/views/settings/BridgeTile.js   | 13 ++--
 .../settings/tabs/room/BridgeSettingsTab.js   |  8 +--
 src/i18n/strings/en_EN.json                   |  3 +-
 5 files changed, 14 insertions(+), 80 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 66c34fd73d..2a4e62f9aa 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -56,66 +56,3 @@ limitations under the License.
     mask-position: center;
 }
 
-.mx_RoomSettingsDialog_BridgeList {
-    padding: 0;
-}
-
-.mx_RoomSettingsDialog_BridgeList li {
-    list-style-type: none;
-    padding: 5px;
-    margin-bottom: 8px;
-    border-width: 1px 1px;
-    border-color: $primary-hairline-color;
-    border-style: solid;
-    border-radius: 5px;
-
-    .protocol-icon {
-        float: left;
-        margin-right: 5px;
-        img {
-            border-radius: 5px;
-            border-width: 1px 1px;
-            border-color: $primary-hairline-color;
-        }
-        span {
-            /* Correct letter placement */
-            left: auto;
-        }
-    }
-
-    h3 {
-        margin-top: 0;
-        margin-bottom: 4px;
-        font-size: 16pt;
-    }
-
-    .column-icon {
-        float: left;
-    }
-
-    .column-data {
-        display: inline-block;
-        width: 85%;
-    }
-
-    .workspace-channel-details {
-        margin-top: 0;
-        color: $primary-fg-color;
-    }
-
-    .metadata {
-        color: $muted-fg-color;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        margin-bottom: 0;
-    }
-
-    .metadata.visible {
-        overflow-y: visible;
-        text-overflow: ellipsis;
-        white-space: normal;
-    }
-    
-}
-
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index 85d5c76ffc..ab54fb777b 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ limitations under the License.
         display: inline;
         margin: 0;
         padding: 0;
-        float: left;
     }
 }
 
@@ -75,6 +74,10 @@ limitations under the License.
     .workspace-channel-details {
         margin-top: 0;
         color: $primary-fg-color;
+
+        .channel {
+            margin-left: 15px;
+        }
     }
 
     .metadata {
diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index a5672c271c..dca23723aa 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@ import Pill from "../elements/Pill";
 import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import AccessibleButton from "../elements/AccessibleButton";
-
+import {replaceableComponent} from "../../../utils/replaceableComponent";
+@replaceableComponent("views.settings.BridgeTile")
 export default class BridgeTile extends React.PureComponent {
     static propTypes = {
         ev: PropTypes.object.isRequired,
@@ -88,11 +89,6 @@ export default class BridgeTile extends React.PureComponent {
             networkIcon = <div class="noProtocolIcon"></div>;
         }
 
-
-        const workspaceChannelDetails = _t("Workspace: %(networkName)s      Channel: %(channelName)s", {
-            networkName,
-            channelName,
-        });
         const id = this.props.ev.getId();
         const metadataClassname = "metadata" + (this.state.visible ? " visible" : "");
         return (<li key={id}>
@@ -102,7 +98,8 @@ export default class BridgeTile extends React.PureComponent {
             <div className="column-data">
                 <h3>{protocolName}</h3>
                 <p className="workspace-channel-details">
-                    {workspaceChannelDetails}
+                    <span>{_t("Workspace: %(networkName)s", {networkName})}</span>
+                    <span className="channel">{_t("Channel: %(channelName)s", {channelName})}</span>
                 </p>
                 <p className={metadataClassname}>
                     {creator} {bot}
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 65c59ff977..12a72ab8f9 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -30,10 +30,6 @@ export default class BridgeSettingsTab extends React.Component {
         roomId: PropTypes.string.isRequired,
     };
 
-    constructor() {
-        super();
-    }
-
     _renderBridgeCard(event, room) {
         const content = event.getContent();
         if (!content || !content.channel || !content.protocol) {
@@ -70,7 +66,7 @@ export default class BridgeSettingsTab extends React.Component {
                     {
                         // TODO: We don't have this link yet: this will prevent the translators
                         // having to re-translate the string when we do.
-                        a: sub => '',
+                        a: sub => sub,
                     },
                 )}</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
@@ -84,7 +80,7 @@ export default class BridgeSettingsTab extends React.Component {
                 {
                     // TODO: We don't have this link yet: this will prevent the translators
                     // having to re-translate the string when we do.
-                    a: sub => '',
+                    a: sub => sub,
                 },
             )}</p>;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 270d964e56..61dcd90638 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -523,7 +523,8 @@
     "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
+    "Workspace: %(networkName)s": "Workspace: %(networkName)s",
+    "Channel: %(channelName)s": "Channel: %(channelName)s",
     "Show less": "Show less",
     "Show more": "Show more",
     "Failed to upload profile picture!": "Failed to upload profile picture!",

From c93b080434670d83511acf01940779d2bbfc5d39 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 11:17:53 +0000
Subject: [PATCH 0760/3235] delint

---
 .../views/toasts/VerificationRequestToast.js    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 1015ed0313..342b7d840c 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -83,14 +83,15 @@ export default class VerificationRequestToast extends React.PureComponent {
                 });
                 await request.accept();
                 const cli = MatrixClientPeg.get();
-            dis.dispatch({
-                action: "set_right_panel_phase",
-                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {
-                    verificationRequest: request,
-                    member: cli.getUser(request.otherUserId),
-                },
-            });} else if (request.channel.deviceId && request.verifier) {
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {
+                        verificationRequest: request,
+                        member: cli.getUser(request.otherUserId),
+                    },
+                });
+            } else if (request.channel.deviceId && request.verifier) {
                 // show to_device verifications in dialog still
                 const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
                 Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {

From 71233a5affbfc8a793cd74e5ae9d6c3fd99dea63 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 28 Jan 2020 11:33:51 +0000
Subject: [PATCH 0761/3235] liney liney come back we need you

---
 src/components/views/settings/BridgeTile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index dca23723aa..6902639879 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -24,6 +24,7 @@ import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import AccessibleButton from "../elements/AccessibleButton";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+
 @replaceableComponent("views.settings.BridgeTile")
 export default class BridgeTile extends React.PureComponent {
     static propTypes = {

From 9cf59ab16d6b08b0ae40a76e300e0b5d0e4612f7 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 28 Jan 2020 12:30:39 +0000
Subject: [PATCH 0762/3235] Enable cross-signing lab when key in storage

When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 133d74db45..1b4d0e9609 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1834,6 +1834,7 @@ export default createReactClass({
             this._accountPassword = null;
             this._accountPasswordTimer = null;
         }, 60 * 5 * 1000);
+
         // Wait for the client to be logged in (but not started)
         // which is enough to ask the server about account data.
         const loggedIn = new Promise(resolve => {
@@ -1867,6 +1868,9 @@ export default createReactClass({
         }
 
         if (masterKeyInStorage) {
+            // Auto-enable cross-signing for the new session when key found in
+            // secret storage.
+            SettingsStore.setFeatureEnabled("feature_cross_signing", true);
             this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
         } else if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             // This will only work if the feature is set to 'enable' in the config,

From 21405b8f25ab36dc1967b53bdd349e872165dd18 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 12:44:14 +0000
Subject: [PATCH 0763/3235] Fix skinning and babel tagets

---
 babel.config.js                   |  4 ++--
 src/Skinner.js                    | 14 ++++++++------
 src/utils/replaceableComponent.ts |  8 ++++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index c83be72518..944d9051bb 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -4,7 +4,7 @@ module.exports = {
         ["@babel/preset-env", {
             "targets": {
                 "browsers": [
-                    "last 2 versions"
+                    "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
                 ]
             },
             "modules": "commonjs"
@@ -14,7 +14,7 @@ module.exports = {
         "@babel/preset-react"
     ],
     "plugins": [
-        ["@babel/plugin-proposal-decorators", { "legacy": true }],
+        ["@babel/plugin-proposal-decorators", {"legacy": false, decoratorsBeforeExport: true}],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
diff --git a/src/Skinner.js b/src/Skinner.js
index 3baecc9fb3..1e121b8808 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -20,6 +20,7 @@ class Skinner {
     }
 
     getComponent(name) {
+        if (!name) throw new Error(`Invalid component name: ${name}`);
         if (this.components === null) {
             throw new Error(
                 "Attempted to get a component before a skin has been loaded."+
@@ -43,12 +44,6 @@ class Skinner {
         // Check the skin first
         let comp = doLookup(this.components);
 
-        // If that failed, check against our own components
-        if (!comp) {
-            // Lazily load our own components because they might end up calling .getComponent()
-            comp = doLookup(require("./component-index").components);
-        }
-
         // Just return nothing instead of erroring - the consumer should be smart enough to
         // handle this at this point.
         if (!comp) {
@@ -75,6 +70,13 @@ class Skinner {
             const comp = skinObject.components[compKeys[i]];
             this.addComponent(compKeys[i], comp);
         }
+
+        // Now that we have a skin, load our components too
+        const idx = require("./component-index");
+        if (!idx || !idx.components) throw new Error("Invalid react-sdk component index");
+        for (const c in idx.components) {
+            if (!this.components[c]) this.components[c] = idx.components[c];
+        }
     }
 
     addComponent(name, comp) {
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 9f617b27f3..92272e533c 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -32,9 +32,13 @@ import * as sdk from '../index';
  * with a skinned version. If no skinned version is available, this component
  * will be used.
  */
-export function replaceableComponent(name: string, origComponent: React.Component) {
+export function replaceableComponent<T extends{new(...args:any[])}>(name: string) {
     // Decorators return a function to override the class (origComponent). This
     // ultimately assumes that `getComponent()` won't throw an error and instead
     // return a falsey value like `null` when the skin doesn't have a component.
-    return () => sdk.getComponent(name) || origComponent;
+    return (origComponent) => {
+        const c = sdk.getComponent(name) || origComponent;
+        c.kind = "class"; // appeases babel
+        return c;
+    };
 }

From d0c28adfb1a13a54e78a7b9c825f824a784db28c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 12:53:37 +0000
Subject: [PATCH 0764/3235] Appease the linter

---
 src/Skinner.js                    | 2 +-
 src/utils/replaceableComponent.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Skinner.js b/src/Skinner.js
index 1e121b8808..87c5a7be7f 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -42,7 +42,7 @@ class Skinner {
         };
 
         // Check the skin first
-        let comp = doLookup(this.components);
+        const comp = doLookup(this.components);
 
         // Just return nothing instead of erroring - the consumer should be smart enough to
         // handle this at this point.
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 92272e533c..281ff4c1ac 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -32,7 +32,7 @@ import * as sdk from '../index';
  * with a skinned version. If no skinned version is available, this component
  * will be used.
  */
-export function replaceableComponent<T extends{new(...args:any[])}>(name: string) {
+export function replaceableComponent<T extends{new(...args: any[])}>(name: string) {
     // Decorators return a function to override the class (origComponent). This
     // ultimately assumes that `getComponent()` won't throw an error and instead
     // return a falsey value like `null` when the skin doesn't have a component.

From 0b7f23fa5491a97b598c4d94881108893520b030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 28 Jan 2020 15:06:43 +0100
Subject: [PATCH 0765/3235] EventIndex: Improve the documentation a bit.

---
 src/indexing/BaseEventIndexManager.js |   4 +-
 src/indexing/EventIndex.js            | 131 +++++++++++++++++++++-----
 2 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 8ebaddc3ab..7a3b583088 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -153,8 +153,8 @@ export default class BaseEventIndexManager {
     /**
      * Search the event index using the given term for matching events.
      *
-     * @param {SearchArgs} searchArgs The search configuration sets what should
-     * be searched for and what should be contained in the search result.
+     * @param {SearchArgs} searchArgs The search configuration for the search,
+     * sets the search term and determines the search result contents.
      *
      * @return {Promise<[SearchResult]>} A promise that will resolve to an array
      * of search results once the search is done.
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 9628920cd7..5d40267fcd 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -51,6 +51,9 @@ export default class EventIndex extends EventEmitter {
         this.registerListeners();
     }
 
+    /**
+     * Register event listeners that are necessary for the event index to work.
+     */
     registerListeners() {
         const client = MatrixClientPeg.get();
 
@@ -60,6 +63,9 @@ export default class EventIndex extends EventEmitter {
         client.on('Room.timelineReset', this.onTimelineReset);
     }
 
+    /**
+     * Remove the event index specific event listeners.
+     */
     removeListeners() {
         const client = MatrixClientPeg.get();
         if (client === null) return;
@@ -116,6 +122,15 @@ export default class EventIndex extends EventEmitter {
         }));
     }
 
+    /**
+     * The sync event listener.
+     *
+     * The listener has two cases:
+     *     - First sync after start up, check if the index is empty, add
+     *         initial checkpoints, if so. Start the crawler background task.
+     *     - Every other sync, tell the event index to commit all the queued up
+     *         live events
+     */
     onSync = async (state, prevState, data) => {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
@@ -139,6 +154,14 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
+    /**
+     * The Room.timeline listener.
+     *
+     * This listener waits for live events in encrypted rooms, if they are
+     * decrypted or unencrypted we queue them to be added to the index,
+     * otherwise we save their event id and wait for them in the Event.decrypted
+     * listener.
+     */
     onRoomTimeline = async (ev, room, toStartOfTimeline, removed, data) => {
         // We only index encrypted rooms locally.
         if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
@@ -162,6 +185,12 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
+    /**
+     * The Event.decrypted listener.
+     *
+     * Checks if the event was marked for addition in the Room.timeline
+     * listener, if so queues it up to be added to the index.
+     */
     onEventDecrypted = async (ev, err) => {
         const eventId = ev.getId();
 
@@ -171,6 +200,41 @@ export default class EventIndex extends EventEmitter {
         await this.addLiveEventToIndex(ev);
     }
 
+    /**
+     * The Room.timelineReset listener.
+     *
+     * Listens for timeline resets that are caused by a limited timeline to
+     * re-add checkpoints for rooms that need to be crawled again.
+     */
+    onTimelineReset = async (room, timelineSet, resetAllTimelines) => {
+        if (room === null) return;
+
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
+
+        const timeline = room.getLiveTimeline();
+        const token = timeline.getPaginationToken("b");
+
+        const backwardsCheckpoint = {
+            roomId: room.roomId,
+            token: token,
+            fullCrawl: false,
+            direction: "b",
+        };
+
+        console.log("EventIndex: Added checkpoint because of a limited timeline",
+            backwardsCheckpoint);
+
+        await indexManager.addCrawlerCheckpoint(backwardsCheckpoint);
+
+        this.crawlerCheckpoints.push(backwardsCheckpoint);
+    }
+
+    /**
+     * Queue up live events to be added to the event index.
+     *
+     * @param {MatrixEvent} ev The event that should be added to the index.
+     */
     async addLiveEventToIndex(ev) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
@@ -190,10 +254,24 @@ export default class EventIndex extends EventEmitter {
         indexManager.addEventToIndex(e, profile);
     }
 
+    /**
+     * Emmit that the crawler has changed the checkpoint that it's currently
+     * handling.
+     */
     emitNewCheckpoint() {
         this.emit("changedCheckpoint", this.currentRoom());
     }
 
+    /**
+     * The main crawler loop.
+     *
+     * Goes through crawlerCheckpoints and fetches events from the server to be
+     * added to the EventIndex.
+     *
+     * If a /room/{roomId}/messages request doesn't contain any events, stop the
+     * crawl, otherwise create a new checkpoint and push it to the
+     * crawlerCheckpoints queue so we go through them in a round-robin way.
+     */
     async crawlerFunc() {
         let cancelled = false;
 
@@ -328,8 +406,6 @@ export default class EventIndex extends EventEmitter {
                     ].indexOf(value.getType()) >= 0
                         && !value.isRedacted() && !value.isDecryptionFailure()
                 );
-                // TODO do we need to check if the event has all the valid
-                // attributes?
             };
 
             // TODO if there are no events at this point we're missing a lot
@@ -394,40 +470,28 @@ export default class EventIndex extends EventEmitter {
         console.log("EventIndex: Stopping crawler function");
     }
 
-    onTimelineReset = async (room, timelineSet, resetAllTimelines) => {
-        if (room === null) return;
-
-        const indexManager = PlatformPeg.get().getEventIndexingManager();
-        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
-
-        const timeline = room.getLiveTimeline();
-        const token = timeline.getPaginationToken("b");
-
-        const backwardsCheckpoint = {
-            roomId: room.roomId,
-            token: token,
-            fullCrawl: false,
-            direction: "b",
-        };
-
-        console.log("EventIndex: Added checkpoint because of a limited timeline",
-            backwardsCheckpoint);
-
-        await indexManager.addCrawlerCheckpoint(backwardsCheckpoint);
-
-        this.crawlerCheckpoints.push(backwardsCheckpoint);
-    }
-
+    /**
+     * Start the crawler background task.
+     */
     startCrawler() {
         if (this._crawler !== null) return;
         this.crawlerFunc();
     }
 
+    /**
+     * Stop the crawler background task.
+     */
     stopCrawler() {
         if (this._crawler === null) return;
         this._crawler.cancel();
     }
 
+    /**
+     * Close the event index.
+     *
+     * This removes all the MatrixClient event listeners, stops the crawler
+     * task, and closes the index.
+     */
     async close() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         this.removeListeners();
@@ -435,6 +499,15 @@ export default class EventIndex extends EventEmitter {
         return indexManager.closeEventIndex();
     }
 
+    /**
+     * Search the event index using the given term for matching events.
+     *
+     * @param {SearchArgs} searchArgs The search configuration for the search,
+     * sets the search term and determines the search result contents.
+     *
+     * @return {Promise<[SearchResult]>} A promise that will resolve to an array
+     * of search results once the search is done.
+     */
     async search(searchArgs) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.searchEventIndex(searchArgs);
@@ -634,6 +707,12 @@ export default class EventIndex extends EventEmitter {
         return paginationPromise;
     }
 
+    /**
+     * Get statistical information of the index.
+     *
+     * @return {Promise<IndexStats>} A promise that will resolve to the index
+     * statistics.
+     */
     async getStats() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         return indexManager.getStats();

From 948ec203c63856863661256f0ea9bfa60455c4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 28 Jan 2020 15:07:29 +0100
Subject: [PATCH 0766/3235] BaseEventIndexManager: Fix the type hints for the
 empty promises.

---
 src/indexing/BaseEventIndexManager.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 7a3b583088..66904f9264 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -105,7 +105,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve when the event index is
      * initialized.
      */
-    async initEventIndex(): Promise<> {
+    async initEventIndex(): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -146,7 +146,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve once the queued up events
      * were added to the index.
      */
-    async commitLiveEvents(): Promise<> {
+    async commitLiveEvents(): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -197,7 +197,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve once the checkpoint has
      * been stored.
      */
-    async addCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<> {
+    async addCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -210,7 +210,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve once the checkpoint has
      * been removed.
      */
-    async removeCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<> {
+    async removeCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -250,7 +250,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve once the event index has
      * been closed.
      */
-    async closeEventIndex(): Promise<> {
+    async closeEventIndex(): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -260,7 +260,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve once the event index has
      * been deleted.
      */
-    async deleteEventIndex(): Promise<> {
+    async deleteEventIndex(): Promise<void> {
         throw new Error("Unimplemented");
     }
 }

From a4778cc7e3371f12c32ec991a684c681911e0d1e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 14:18:12 +0000
Subject: [PATCH 0767/3235] Remove legacy

---
 babel.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel.config.js b/babel.config.js
index 944d9051bb..333e5301af 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -14,7 +14,7 @@ module.exports = {
         "@babel/preset-react"
     ],
     "plugins": [
-        ["@babel/plugin-proposal-decorators", {"legacy": false, decoratorsBeforeExport: true}],
+        ["@babel/plugin-proposal-decorators", {decoratorsBeforeExport: true}],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",

From 894568bf7aff3578970e6d577d28a14c19d2bce2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 14:19:06 +0000
Subject: [PATCH 0768/3235] Stop using deprecated stuff

---
 babel.config.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 333e5301af..3c0c3fcb85 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,12 +2,9 @@ module.exports = {
     "sourceMaps": "inline",
     "presets": [
         ["@babel/preset-env", {
-            "targets": {
-                "browsers": [
-                    "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
-                ]
-            },
-            "modules": "commonjs"
+            "targets": [
+                "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
+            ],
         }],
         "@babel/preset-typescript",
         "@babel/preset-flow",

From 9821e25e0b8aa5b4845897221af99261c1bf0418 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Tue, 28 Jan 2020 15:12:07 +0100
Subject: [PATCH 0769/3235] Tweak styling of unread indicator circle.

This makes the element symmetric and reduces the size of the hit target.
With the previous styling, the mid-circle glyph was sometimes offset from the center.
Furthermore, the large font size increased the hit box of the ::after element, eating into the scroll up arrow button's hit target.
It might be a good idea to give the ::after element pointer-events:none so that the scroll up button is clickable in its entirety.

Signed-off-by: Markus Stange <mstange@themasta.com>
---
 res/css/views/rooms/_TopUnreadMessagesBar.scss | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 77f19dac1c..505af9691d 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -25,19 +25,16 @@ limitations under the License.
 }
 
 .mx_TopUnreadMessagesBar::after {
-    content: "·";
+    content: "";
     position: absolute;
     top: -8px;
     left: 11px;
-    width: 16px;
-    height: 16px;
+    width: 4px;
+    height: 4px;
     border-radius: 16px;
-    font-weight: 600;
-    font-size: 30px;
-    line-height: 14px;
-    text-align: center;
-    color: $secondary-accent-color;
-    background-color: $accent-color;
+    overflow: hidden;
+    background-color: $secondary-accent-color;
+    border: 6px solid $accent-color;
 }
 
 .mx_TopUnreadMessagesBar_scrollUp {

From 85bcad0ea0e0a667de343efa81dac64e63c2cf85 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 28 Jan 2020 14:42:58 +0000
Subject: [PATCH 0770/3235] Styling for Nad

---
 .../dialogs/_RoomSettingsDialogBridges.scss   | 100 ++++++++++--------
 src/components/views/settings/BridgeTile.js   |   2 +-
 .../settings/tabs/room/BridgeSettingsTab.js   |   6 +-
 3 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index ab54fb777b..d77e019cbf 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -33,64 +33,80 @@ limitations under the License.
     border-style: solid;
     border-radius: 5px;
 
-    .protocol-icon {
-        float: left;
-        margin-right: 5px;
-        img {
-            border-radius: 5px;
-            border-width: 1px 1px;
-            border-color: $primary-hairline-color;
-        }
-        span {
-            /* Correct letter placement */
-            left: auto;
-        }
-    }
-
-    h3 {
-        margin-top: 0;
-        margin-bottom: 4px;
-        font-size: 16pt;
-        color: $primary-fg-color;
-    }
-
     .column-icon {
         float: left;
         padding-right: 10px;
 
+        * {
+            border-radius: 5px;
+            border: 1px solid $input-darker-bg-color;
+        }
+
         .noProtocolIcon {
             width: 48px;
             height: 48px;
-            background: $settings-profile-placeholder-bg-color;
+            background: $input-darker-bg-color;
             border-radius: 5px;
         }
+
+        .protocol-icon {
+            float: left;
+            margin-right: 5px;
+            img {
+                border-radius: 5px;
+                border-width: 1px 1px;
+                border-color: $primary-hairline-color;
+            }
+            span {
+                /* Correct letter placement */
+                left: auto;
+            }
+        }
     }
 
     .column-data {
         display: inline-block;
         width: 85%;
-    }
 
-    .workspace-channel-details {
-        margin-top: 0;
-        color: $primary-fg-color;
+        > h3 {
+            margin-top: 0px;
+            margin-bottom: 0px;
+            font-size: 16pt;
+            color: $primary-fg-color;
+        }
 
-        .channel {
-            margin-left: 15px;
+        > * {
+            margin-top: 4px;
+            margin-bottom: 0;
+        }
+
+        .workspace-channel-details {
+            color: $primary-fg-color;
+            font-weight: 600;
+
+            .channel {
+                margin-left: 5px;
+            }
+        }
+
+        .showMore {
+            display: block;
+            text-align: left;
+            margin-top: 10px;
+        }
+
+        .metadata {
+            color: $muted-fg-color;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            margin-bottom: 0;
+        }
+
+        .metadata.visible {
+            overflow-y: visible;
+            text-overflow: ellipsis;
+            white-space: normal;
         }
     }
-
-    .metadata {
-        color: $muted-fg-color;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        margin-bottom: 0;
-    }
-
-    .metadata.visible {
-        overflow-y: visible;
-        text-overflow: ellipsis;
-        white-space: normal;
-    }
 }
diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index 6902639879..1759c0f58d 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -105,7 +105,7 @@ export default class BridgeTile extends React.PureComponent {
                 <p className={metadataClassname}>
                     {creator} {bot}
                 </p>
-                <AccessibleButton kind="secondary" onClick={this._toggleVisible.bind(this)}>
+                <AccessibleButton className="showMore" kind="secondary" onClick={this._toggleVisible.bind(this)}>
                     { this.state.visible ? _t("Show less") : _t("Show more") }
                 </AccessibleButton>
             </div>
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 12a72ab8f9..d66732de55 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -25,6 +25,8 @@ const BRIDGE_EVENT_TYPES = [
     // m.bridge
 ];
 
+const BRIDGES_LINK = "https://matrix.org/bridges/";
+
 export default class BridgeSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
@@ -66,7 +68,7 @@ export default class BridgeSettingsTab extends React.Component {
                     {
                         // TODO: We don't have this link yet: this will prevent the translators
                         // having to re-translate the string when we do.
-                        a: sub => sub,
+                        a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noopener">{sub}</a>,
                     },
                 )}</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
@@ -80,7 +82,7 @@ export default class BridgeSettingsTab extends React.Component {
                 {
                     // TODO: We don't have this link yet: this will prevent the translators
                     // having to re-translate the string when we do.
-                    a: sub => sub,
+                    a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noopener">{sub}</a>,
                 },
             )}</p>;
         }

From 5cabfb63a43a62e3a28c61f926bba32c312a8be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 28 Jan 2020 16:13:56 +0100
Subject: [PATCH 0771/3235] EventIndex: Don't mark the event listener method
 docs as jsdoc comments.

---
 src/indexing/EventIndex.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 5d40267fcd..e1ec0d1d1c 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -122,7 +122,7 @@ export default class EventIndex extends EventEmitter {
         }));
     }
 
-    /**
+    /*
      * The sync event listener.
      *
      * The listener has two cases:
@@ -154,7 +154,7 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
-    /**
+    /*
      * The Room.timeline listener.
      *
      * This listener waits for live events in encrypted rooms, if they are
@@ -185,7 +185,7 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
-    /**
+    /*
      * The Event.decrypted listener.
      *
      * Checks if the event was marked for addition in the Room.timeline
@@ -200,7 +200,7 @@ export default class EventIndex extends EventEmitter {
         await this.addLiveEventToIndex(ev);
     }
 
-    /**
+    /*
      * The Room.timelineReset listener.
      *
      * Listens for timeline resets that are caused by a limited timeline to

From bfaa9d56fbf368eb3ffb4c985794633fd8014833 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Tue, 28 Jan 2020 16:05:27 +0000
Subject: [PATCH 0772/3235] prefixes

---
 res/css/views/dialogs/_RoomSettingsDialogBridges.scss | 2 +-
 src/components/views/settings/BridgeTile.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index d77e019cbf..a1793cc75e 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -89,7 +89,7 @@ limitations under the License.
             }
         }
 
-        .showMore {
+        .mx_showMore {
             display: block;
             text-align: left;
             margin-top: 10px;
diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
index 1759c0f58d..5b74e44c9e 100644
--- a/src/components/views/settings/BridgeTile.js
+++ b/src/components/views/settings/BridgeTile.js
@@ -105,7 +105,7 @@ export default class BridgeTile extends React.PureComponent {
                 <p className={metadataClassname}>
                     {creator} {bot}
                 </p>
-                <AccessibleButton className="showMore" kind="secondary" onClick={this._toggleVisible.bind(this)}>
+                <AccessibleButton className="mx_showMore" kind="secondary" onClick={this._toggleVisible.bind(this)}>
                     { this.state.visible ? _t("Show less") : _t("Show more") }
                 </AccessibleButton>
             </div>

From ab8fe80d6b6aa6f09093f2bdf83a975cdfc26d00 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 28 Jan 2020 16:11:15 +0000
Subject: [PATCH 0773/3235] Translated using Weblate (Hungarian)

Currently translated at 98.6% (2048 of 2077 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d2b877a8de..fe6f1d504e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2106,5 +2106,9 @@
     "Upgrade your encryption": "Titkosításod fejlesztése",
     "Set up encryption": "Titkosítás beállítása",
     "Encryption upgraded": "Titkosítás fejlesztve",
-    "Encryption setup complete": "Titkosítás beállítása kész"
+    "Encryption setup complete": "Titkosítás beállítása kész",
+    "Verify this session": "Munkamenet ellenőrzése",
+    "Encryption upgrade available": "A titkosítás fejlesztése elérhető",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s bekapcsolta a végpontok közötti titkosítást.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s)."
 }

From abfa593791975e48440f32cdb1bbff6f0491dd88 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 16:36:07 +0000
Subject: [PATCH 0774/3235] Make the 'encryption upgrade' flow better

Fixes https://github.com/vector-im/riot-web/issues/12086
---
 .../CreateSecretStorageDialog.js              | 92 ++++++++++---------
 .../keybackup/RestoreKeyBackupDialog.js       |  2 +-
 src/i18n/strings/en_EN.json                   |  3 +-
 3 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 0867cae6f4..69dd13f46e 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -25,15 +25,14 @@ import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 
 const PHASE_LOADING = 0;
-const PHASE_RESTORE_KEY_BACKUP = 1;
-const PHASE_MIGRATE = 2;
-const PHASE_PASSPHRASE = 3;
-const PHASE_PASSPHRASE_CONFIRM = 4;
-const PHASE_SHOWKEY = 5;
-const PHASE_KEEPITSAFE = 6;
-const PHASE_STORING = 7;
-const PHASE_DONE = 8;
-const PHASE_OPTOUT_CONFIRM = 9;
+const PHASE_MIGRATE = 1;
+const PHASE_PASSPHRASE = 2;
+const PHASE_PASSPHRASE_CONFIRM = 3;
+const PHASE_SHOWKEY = 4;
+const PHASE_KEEPITSAFE = 5;
+const PHASE_STORING = 6;
+const PHASE_DONE = 7;
+const PHASE_OPTOUT_CONFIRM = 8;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -58,7 +57,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         accountPassword: PropTypes.string,
     };
 
-    defaultProps = {
+    static defaultProps = {
         hasCancel: true,
     };
 
@@ -110,9 +109,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
         );
 
-        const phase = backupInfo ?
-            (backupSigStatus.usable ? PHASE_MIGRATE : PHASE_RESTORE_KEY_BACKUP) :
-            PHASE_PASSPHRASE;
+        const phase = backupInfo ? PHASE_MIGRATE : PHASE_PASSPHRASE;
 
         this.setState({
             phase,
@@ -151,9 +148,18 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._recoveryKeyNode = n;
     }
 
+    _onSkipClick = () => {
+        // TODO: add confirmation
+        this.props.onFinished(false);
+    }
+
     _onMigrateFormSubmit = (e) => {
         e.preventDefault();
-        this._bootstrapSecretStorage();
+        if (this.state.backupSigStatus.usable) {
+            this._bootstrapSecretStorage();
+        } else {
+            this._restoreBackup();
+        }
     }
 
     _onCopyClick = () => {
@@ -228,6 +234,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         } catch (e) {
             if (this.state.canUploadKeysWithPasswordOnly && e.httpStatus === 401 && e.data.flows) {
                 this.setState({
+                    accountPassword: '',
                     accountPasswordCorrect: false,
                     phase: PHASE_MIGRATE,
                 });
@@ -246,12 +253,22 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.props.onFinished(true);
     }
 
-    _onRestoreKeyBackupClick = () => {
+    _restoreBackup = async () => {
         const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
-        Modal.createTrackedDialog(
+        const { finished } = Modal.createTrackedDialog(
             'Restore Backup', '', RestoreKeyBackupDialog, {showSummary: false}, null,
             /* priority = */ false, /* static = */ true,
         );
+
+        await finished;
+        await this._fetchBackupInfo();
+        if (
+            this.state.backupSigStatus.usable &&
+            this.state.canUploadKeysWithPasswordOnly &&
+            this.state.accountPassword
+        ) {
+            this._bootstrapSecretStorage();
+        }
     }
 
     _onOptOutClick = () => {
@@ -367,23 +384,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _renderPhaseRestoreKeyBackup() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
-            <p>{_t(
-                "Key Backup is enabled on your account but has not been set " +
-                "up from this session. To set up secret storage, " +
-                "restore your key backup.",
-            )}</p>
-            <DialogButtons primaryButton={_t('Restore')}
-                onPrimaryButtonClick={this._onRestoreKeyBackupClick}
-                onCancel={this._onCancel}
-                hasCancel={true}
-            >
-            </DialogButtons>
-        </div>;
-    }
-
     _renderPhaseMigrate() {
         // TODO: This is a temporary screen so people who have the labs flag turned on and
         // click the button are aware they're making a change to their account.
@@ -392,9 +392,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         // https://github.com/vector-im/riot-web/issues/11696
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const Field = sdk.getComponent('views.elements.Field');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let authPrompt;
-        if (this.state.canUploadKeysWithPasswordOnly) {
+        let nextCaption = _t("Next");
+        if (!this.state.backupSigStatus.usable) {
+            authPrompt = <div>
+                <div>{_t("Restore your key backup to upgrade your encryption")}</div>
+            </div>;
+            nextCaption = _t("Restore");
+        } else if (this.state.canUploadKeysWithPasswordOnly) {
             authPrompt = <div>
                 <div>{_t("Enter your account password to confirm the upgrade:")}</div>
                 <div><Field type="password"
@@ -419,12 +426,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "as trusted for other users.",
             )}</p>
             <div>{authPrompt}</div>
-            <DialogButtons primaryButton={_t('Next')}
+            <DialogButtons primaryButton={nextCaption}
                 primaryIsSubmit={true}
-                hasCancel={true}
-                onCancel={this._onCancel}
+                hasCancel={false}
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
-            />
+            >
+                <button type="button" className="danger" onClick={this._onSkipClick}>
+                    {_t('Skip')}
+                </button>
+            </DialogButtons>
         </form>;
     }
 
@@ -678,8 +688,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _titleForPhase(phase) {
         switch (phase) {
-            case PHASE_RESTORE_KEY_BACKUP:
-                return _t('Restore your Key Backup');
             case PHASE_MIGRATE:
                 return _t('Upgrade your encryption');
             case PHASE_PASSPHRASE:
@@ -722,9 +730,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_LOADING:
                     content = this._renderBusyPhase();
                     break;
-                case PHASE_RESTORE_KEY_BACKUP:
-                    content = this._renderPhaseRestoreKeyBackup();
-                    break;
                 case PHASE_MIGRATE:
                     content = this._renderPhaseMigrate();
                     break;
@@ -763,6 +768,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 title={this._titleForPhase(this.state.phase)}
                 headerImage={headerImage}
                 hasCancel={this.props.hasCancel && [PHASE_PASSPHRASE].includes(this.state.phase)}
+                fixedWidth={false}
             >
             <div>
                 {content}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 0c432ba542..4466775d3a 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -39,7 +39,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         showSummary: PropTypes.bool,
     };
 
-    defaultProps = {
+    static defaultProps = {
         showSummary: true,
     };
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 23ca730d97..75aadc02bd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1991,7 +1991,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
+    "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
     "Restore": "Restore",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
@@ -2022,7 +2022,6 @@
     "Verify other users in their profile.": "Verify other users in their profile.",
     "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
     "Set up secret storage": "Set up secret storage",
-    "Restore your Key Backup": "Restore your Key Backup",
     "Upgrade your encryption": "Upgrade your encryption",
     "Recovery key": "Recovery key",
     "Keep it safe": "Keep it safe",

From 330b489fd528b1f80bdbdd1ba1de091fec573cf7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 16:44:30 +0000
Subject: [PATCH 0775/3235] Switch back to legacy decorators

Empirically the build is fine with these, but it is unfortunate that we have to reply on deprecated semantics. TypeScript should help fix this.
---
 babel.config.js                   | 2 +-
 src/utils/replaceableComponent.ts | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 3c0c3fcb85..d5a97d56ce 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -11,7 +11,7 @@ module.exports = {
         "@babel/preset-react"
     ],
     "plugins": [
-        ["@babel/plugin-proposal-decorators", {decoratorsBeforeExport: true}],
+        ["@babel/plugin-proposal-decorators", {legacy: true}],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 281ff4c1ac..9f617b27f3 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -32,13 +32,9 @@ import * as sdk from '../index';
  * with a skinned version. If no skinned version is available, this component
  * will be used.
  */
-export function replaceableComponent<T extends{new(...args: any[])}>(name: string) {
+export function replaceableComponent(name: string, origComponent: React.Component) {
     // Decorators return a function to override the class (origComponent). This
     // ultimately assumes that `getComponent()` won't throw an error and instead
     // return a falsey value like `null` when the skin doesn't have a component.
-    return (origComponent) => {
-        const c = sdk.getComponent(name) || origComponent;
-        c.kind = "class"; // appeases babel
-        return c;
-    };
+    return () => sdk.getComponent(name) || origComponent;
 }

From 6c10c1b76d3ca69e5f5356b998ab44b5f2a02415 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 28 Jan 2020 16:16:03 +0000
Subject: [PATCH 0776/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2078 of 2078 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 | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index fe6f1d504e..856e3f535d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2110,5 +2110,41 @@
     "Verify this session": "Munkamenet ellenőrzése",
     "Encryption upgrade available": "A titkosítás fejlesztése elérhető",
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s bekapcsolta a végpontok közötti titkosítást.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s)."
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s).",
+    "Enable message search in encrypted rooms": "Üzenetek keresésének engedélyezése titkosított szobákban",
+    "Review & verify your new session": "Az új munkameneted átnézése és ellenőrzése",
+    "Review": "Átnéz",
+    "Verify your other devices easier": "Ellenőrizd egyszerűbben a többi eszközöd",
+    "This bridge was provisioned by <user />.": "Ezt a hidat az alábbi felhasználó készítette: <user />.",
+    "Workspace: %(networkName)s": "Munkahely: %(networkName)s",
+    "Channel: %(channelName)s": "Csatorna: %(channelName)s",
+    "Show less": "Kevesebbet mutat",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod, felhasználva: ",
+    " to store messages from ": " üzenetek eltárolásához innen ",
+    "rooms.": "szobák.",
+    "Manage": "Kezel",
+    "Securely cache encrypted messages locally for them to appear in search results.": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod.",
+    "Enable": "Engedélyez",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A  Riotból a titkosított üzenetek biztonságos helyi tárolásához hiányzik néhány dolog. Ha kísérletezni szeretnél ezzel a lehetőséggel fordíts le egy saját Riotot a <nativeLink>kereső komponens hozzáadásával</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "A Riot a web böngészőben nem tud biztonságosan titkosított üzenetet helyben elmenteni. Hogy a titkosított üzenetekre tudjál keresni használj <riotLink>Asztali Riot klienst</riotLink>.",
+    "Message search": "Üzenet keresése",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ez a szoba összeköti az üzeneteket a következő platformokkal, <a>tudj meg többet.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ez a szoba egy platformmal sem köt össze üzeneteket. <a>Tudj meg többet.</a>",
+    "Bridges": "Hidak",
+    "New session": "Új munkamenet",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Az új munkamenet ellenőrzéséhez használd ezt, amivel hozzáférést adsz a titkosított üzenetekhez:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Ha nem te jelentkeztél be ebbe a munkamenetbe akkor a fiókodat feltörték.",
+    "This wasn't me": "Nem én voltam",
+    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt az eszközt, hogy ellenőrizhesd a többi eszközödet vele amivel hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
+    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Állítsd be a titkosítást ezen az eszközön, hogy ellenőrizhesd a többi eszközödet vele, amivel hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Helyezd biztonságba a titkosítási kulcsaidat egy jelmondattal. A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól:",
+    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ezzel az eszközzel most már ellenőrizheted a többi eszközödet, hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Ha nincs engedélyezve akkor a titkosított szobák üzenetei nem jelennek meg a keresések között.",
+    "Disable": "Tiltás",
+    "Not currently downloading messages for any room.": "Jelenleg egy szobából sem folyik üzenet letöltés.",
+    "Downloading mesages for %(currentRoom)s.": "Üzenetek letöltése innen: %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot a kereshetőség érdekében a titkosított üzeneteket biztonságos módon helyileg tárolja:",
+    "Space used:": "Hely felhasználva:",
+    "Indexed messages:": "Indexált üzenetek:",
+    "Number of rooms:": "Szobák száma:"
 }

From 58df4127d3b0c3b08c776c15ae84ccb215d68247 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 17:14:48 +0000
Subject: [PATCH 0777/3235] Update propTypes and remove todo

---
 src/components/views/right_panel/EncryptionPanel.js   | 7 +++++--
 src/components/views/right_panel/VerificationPanel.js | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2c4a896624..d45280e29c 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useState} from "react";
+import PropTypes from "prop-types";
 
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
@@ -85,7 +86,9 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
     }
 };
 EncryptionPanel.propTypes = {
-
+    member: PropTypes.object.isRequired,
+    onClose: PropTypes.func.isRequired,
+    verificationRequest: PropTypes.object,
 };
 
 export default EncryptionPanel;
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 6a5516927a..3740c6e49d 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -39,7 +39,6 @@ export default class VerificationPanel extends React.PureComponent {
 
     renderQRPhase(pending) {
         const {member, request} = this.props;
-        // TODO change the button into a spinner when on click
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let button;

From 546acb696dd7c2313ebab2cc6f4a29122c6c4b1f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 17:15:50 +0000
Subject: [PATCH 0778/3235] Add confirmation to skip button

Re-using the opt out phase which was unused
---
 .../CreateSecretStorageDialog.js              | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 69dd13f46e..b08b6c5624 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -32,7 +32,7 @@ const PHASE_SHOWKEY = 4;
 const PHASE_KEEPITSAFE = 5;
 const PHASE_STORING = 6;
 const PHASE_DONE = 7;
-const PHASE_OPTOUT_CONFIRM = 8;
+const PHASE_CONFIRM_SKIP = 8;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -148,11 +148,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._recoveryKeyNode = n;
     }
 
-    _onSkipClick = () => {
-        // TODO: add confirmation
-        this.props.onFinished(false);
-    }
-
     _onMigrateFormSubmit = (e) => {
         e.preventDefault();
         if (this.state.backupSigStatus.usable) {
@@ -271,8 +266,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     }
 
-    _onOptOutClick = () => {
-        this.setState({phase: PHASE_OPTOUT_CONFIRM});
+    _onSkipSetupClick = () => {
+        this.setState({phase: PHASE_CONFIRM_SKIP});
     }
 
     _onSetUpClick = () => {
@@ -496,7 +491,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 disabled={!this._passPhraseIsValid()}
             >
                 <button type="button"
-                    onClick={this._onCancel}
+                    onClick={this._onSkipSetupClick}
                     className="danger"
                 >{_t("Skip")}</button>
             </DialogButtons>
@@ -564,7 +559,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             >
                 <button type="button"
-                    onClick={this._onCancel}
+                    onClick={this._onSkipSetupClick}
                     className="danger"
                 >{_t("Skip")}</button>
             </DialogButtons>
@@ -669,19 +664,18 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         </div>;
     }
 
-    _renderPhaseOptOutConfirm() {
+    _renderPhaseSkipConfirm() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             {_t(
-                "Without setting up secret storage, you won't be able to restore your " +
-                "access to encrypted messages or your cross-signing identity for " +
-                "verifying other devices if you log out or use another device.",
+                "Without completing security on this device, it won’t have " +
+                "access to encrypted messages.",
         )}
-            <DialogButtons primaryButton={_t('Set up secret storage')}
+            <DialogButtons primaryButton={_t('Go back')}
                 onPrimaryButtonClick={this._onSetUpClick}
                 hasCancel={false}
             >
-                <button onClick={this._onCancel}>I understand, continue without</button>
+                <button type="button" className="danger" onClick={this._onCancel}>{_t('Skip')}</button>
             </DialogButtons>
         </div>;
     }
@@ -694,8 +688,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 return _t('Set up encryption');
             case PHASE_PASSPHRASE_CONFIRM:
                 return _t('Confirm passphrase');
-            case PHASE_OPTOUT_CONFIRM:
-                return _t('Warning!');
+            case PHASE_CONFIRM_SKIP:
+                return _t('Are you sure?');
             case PHASE_SHOWKEY:
                 return _t('Recovery key');
             case PHASE_KEEPITSAFE:
@@ -751,8 +745,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_DONE:
                     content = this._renderPhaseDone();
                     break;
-                case PHASE_OPTOUT_CONFIRM:
-                    content = this._renderPhaseOptOutConfirm();
+                case PHASE_CONFIRM_SKIP:
+                    content = this._renderPhaseSkipConfirm();
                     break;
             }
         }

From e1e35a53e43f9e8567da0e671d91cab1e640a555 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 17:18:09 +0000
Subject: [PATCH 0779/3235] i18n

---
 src/i18n/strings/en_EN.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 75aadc02bd..6a884d6f25 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2020,8 +2020,6 @@
     "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
     "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
     "Verify other users in their profile.": "Verify other users in their profile.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.",
-    "Set up secret storage": "Set up secret storage",
     "Upgrade your encryption": "Upgrade your encryption",
     "Recovery key": "Recovery key",
     "Keep it safe": "Keep it safe",

From 5e1b42b3505adb53652a9efb60bd7eda8df15a52 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 17:21:42 +0000
Subject: [PATCH 0780/3235] unused component

---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index b08b6c5624..62a80d0cdc 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -387,7 +387,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         // https://github.com/vector-im/riot-web/issues/11696
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const Field = sdk.getComponent('views.elements.Field');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let authPrompt;
         let nextCaption = _t("Next");

From b0028066395547f9912c7438bbf2e3e70a59f2e2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 17:42:39 +0000
Subject: [PATCH 0781/3235] Use DialogButtons because reusability :((

---
 .../views/verification/VerificationShowSas.js  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 08d0dd422d..4a1628e9e6 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import { _t, _td } from '../../../languageHandler';
 import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
+import DialogButtons from "../elements/DialogButtons";
 
 function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
@@ -90,14 +91,15 @@ export default class VerificationShowSas extends React.Component {
             const text = _t("Waiting for %(displayName)s to verify…", {displayName});
             confirm = <PendingActionSpinner text={text} />;
         } else {
-            confirm = <React.Fragment>
-                <AccessibleButton kind="primary" onClick={this.onMatchClick} className="mx_UserInfo_verify">
-                    {_t("They match")}
-                </AccessibleButton>
-                <AccessibleButton kind="danger" onClick={this.props.onCancel} className="mx_UserInfo_verify">
-                    {_t("They don't match")}
-                </AccessibleButton>
-            </React.Fragment>;
+            // FIXME: stop using DialogButtons here once it this component is only used in the right panel verification
+            confirm = <DialogButtons
+                primaryButton={_t("They match")}
+                onPrimaryButtonClick={this.onMatchClick}
+                primaryButtonClassName="mx_UserInfo_verify"
+                cancelButton={_t("They don't match")}
+                onCancel={this.props.onCancel}
+                cancelButtonClass="mx_UserInfo_verify"
+            />;
         }
 
         return <div className="mx_VerificationShowSas">

From 6fb8f6eef16ef7fc2f18871d8eceaaf083bdefab Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 28 Jan 2020 18:03:47 +0000
Subject: [PATCH 0782/3235] Add device IDs in user info tooltips

For easier device identification, add the device ID in an HTML tooltip for now.

Fixes https://github.com/vector-im/riot-web/issues/12103
---
 src/components/views/right_panel/UserInfo.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 051f92cc9c..394f6b5c98 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -183,11 +183,16 @@ function DeviceItem({userId, device}) {
             (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" :
             device.getDisplayName();
     const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
-    return (<AccessibleButton className={classes} onClick={onDeviceClick}>
-        <div className={iconClasses} />
-        <div className="mx_UserInfo_device_name">{deviceName}</div>
-        <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
-    </AccessibleButton>);
+    return (
+        <AccessibleButton
+            className={classes} onClick={onDeviceClick}
+            title={device.deviceId}
+        >
+            <div className={iconClasses} />
+            <div className="mx_UserInfo_device_name">{deviceName}</div>
+            <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+        </AccessibleButton>
+    );
 }
 
 function DevicesSection({devices, userId, loading}) {

From 39c8a9d204016ae1bc0209c2658f3a3ef7ec3835 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 19:42:09 +0000
Subject: [PATCH 0783/3235] Start new key backup in security setup flow

Part of https://github.com/vector-im/riot-web/issues/11889
---
 .../_CreateSecretStorageDialog.scss           | 24 +++++++++++++++++++
 .../CreateSecretStorageDialog.js              | 19 +++++++++++++--
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index 53e82670e1..bbbf3fc1d3 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -15,6 +15,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_CreateSecretStorageDialog {
+    // Why you ask? Because CompleteSecurityBody is 600px so this is the width
+    // we end up when in there, but when in our own dialog we set our own width
+    // so need to fix it to something sensible as otherwise we'd end up either
+    // really wide or really narrow depending on the phase. I bet you wish you
+    // never asked.
+    width: 560px;
+
+    .mx_SettingsFlag {
+        display: flex;
+    }
+
+    .mx_SettingsFlag_label {
+        flex: 1 1 0;
+        min-width: 0;
+        font-weight: 600;
+    }
+
+    .mx_ToggleSwitch {
+        flex: 0 0 auto;
+        margin-left: 30px;
+    }
+}
+
 .mx_CreateSecretStorageDialog .mx_Dialog_title {
     /* TODO: Consider setting this for all dialog titles. */
     margin-bottom: 1em;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 62a80d0cdc..4068f72217 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -87,6 +87,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // set if we are 'upgrading' encryption (making an SSSS store from
             // an existing key backup secret).
             doingUpgrade: null,
+            // status of the key backup toggle switch
+            useKeyBackup: true,
         };
 
         this._fetchBackupInfo();
@@ -141,13 +143,19 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onKeyBackupStatusChange = () => {
-        this._fetchBackupInfo();
+        if (this.state.phase === PHASE_MIGRATE) this._fetchBackupInfo();
     }
 
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
 
+    _onUseKeyBackupChange = (enabled) => {
+        this.setState({
+            useKeyBackup: enabled,
+        });
+    }
+
     _onMigrateFormSubmit = (e) => {
         e.preventDefault();
         if (this.state.backupSigStatus.usable) {
@@ -222,6 +230,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                 createSecretStorageKey: async () => this._keyInfo,
                 keyBackupInfo: this.state.backupInfo,
+                setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
             });
             this.setState({
                 phase: PHASE_DONE,
@@ -425,7 +434,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 hasCancel={false}
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             >
-                <button type="button" className="danger" onClick={this._onSkipClick}>
+                <button type="button" className="danger" onClick={this._onSkipSetupClick}>
                     {_t('Skip')}
                 </button>
             </DialogButtons>
@@ -436,6 +445,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const Field = sdk.getComponent('views.elements.Field');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const LabelledToggleSwitch = sdk.getComponent('views.elements.LabelledToggleSwitch');
 
         let strengthMeter;
         let helpText;
@@ -484,6 +494,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 </div>
             </div>
 
+            <LabelledToggleSwitch
+                label={ _t("Back up my encryption keys, securing them with the same passphrase")}
+                onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
+            />
+
             <DialogButtons primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf7e3568bd..b5a412e117 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2005,6 +2005,7 @@
     "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:",
     "Enter a passphrase": "Enter a passphrase",
+    "Back up my encryption keys, securing them with the same passphrase": "Back up my encryption keys, securing them with the same passphrase",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",

From 32cb3b8ccbe7ccf5467533c61f2d302a36db3ff5 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 28 Jan 2020 19:55:53 +0000
Subject: [PATCH 0784/3235] onClick to separate line

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 394f6b5c98..e20ab07cae 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -185,8 +185,9 @@ function DeviceItem({userId, device}) {
     const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
     return (
         <AccessibleButton
-            className={classes} onClick={onDeviceClick}
+            className={classes}
             title={device.deviceId}
+            onClick={onDeviceClick}
         >
             <div className={iconClasses} />
             <div className="mx_UserInfo_device_name">{deviceName}</div>

From 793ff2cccc3b2359bf384df6e4dc938a4e735765 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Tue, 28 Jan 2020 15:36:24 -0500
Subject: [PATCH 0785/3235] Hide pre-join UTDs (#3881)

---
 src/components/structures/TimelinePanel.js | 94 ++++++++++++++++++++--
 1 file changed, 88 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 65fb00c305..e708fad6a4 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -2,7 +2,7 @@
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019-2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -146,6 +146,9 @@ const TimelinePanel = createReactClass({
             liveEvents: [],
             timelineLoading: true, // track whether our room timeline is loading
 
+            // the index of the first event that is to be shown
+            firstVisibleEventIndex: 0,
+
             // canBackPaginate == false may mean:
             //
             // * we haven't (successfully) loaded the timeline yet, or:
@@ -333,11 +336,12 @@ const TimelinePanel = createReactClass({
 
             // We can now paginate in the unpaginated direction
             const canPaginateKey = (backwards) ? 'canBackPaginate' : 'canForwardPaginate';
-            const { events, liveEvents } = this._getEvents();
+            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
             this.setState({
                 [canPaginateKey]: true,
                 events,
                 liveEvents,
+                firstVisibleEventIndex,
             });
         }
     },
@@ -369,6 +373,11 @@ const TimelinePanel = createReactClass({
             return Promise.resolve(false);
         }
 
+        if (backwards && this.state.firstVisibleEventIndex !== 0) {
+            debuglog("TimelinePanel: won't", dir, "paginate past first visible event");
+            return Promise.resolve(false);
+        }
+
         debuglog("TimelinePanel: Initiating paginate; backwards:"+backwards);
         this.setState({[paginatingKey]: true});
 
@@ -377,12 +386,13 @@ const TimelinePanel = createReactClass({
 
             debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
 
-            const { events, liveEvents } = this._getEvents();
+            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
             const newState = {
                 [paginatingKey]: false,
                 [canPaginateKey]: r,
                 events,
                 liveEvents,
+                firstVisibleEventIndex,
             };
 
             // moving the window in this direction may mean that we can now
@@ -402,7 +412,11 @@ const TimelinePanel = createReactClass({
             // itself into the right place
             return new Promise((resolve) => {
                 this.setState(newState, () => {
-                    resolve(r);
+                    // we can continue paginating in the given direction if:
+                    // - _timelineWindow.paginate says we can
+                    // - we're paginating forwards, or we won't be trying to
+                    //   paginate backwards past the first visible event
+                    resolve(r && (!backwards || firstVisibleEventIndex === 0));
                 });
             });
         });
@@ -476,12 +490,13 @@ const TimelinePanel = createReactClass({
         this._timelineWindow.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
             if (this.unmounted) { return; }
 
-            const { events, liveEvents } = this._getEvents();
+            const { events, liveEvents, firstVisibleEventIndex } = this._getEvents();
             const lastLiveEvent = liveEvents[liveEvents.length - 1];
 
             const updatedState = {
                 events,
                 liveEvents,
+                firstVisibleEventIndex,
             };
 
             let callRMUpdated;
@@ -1115,6 +1130,7 @@ const TimelinePanel = createReactClass({
     // get the list of events from the timeline window and the pending event list
     _getEvents: function() {
         const events = this._timelineWindow.getEvents();
+        const firstVisibleEventIndex = this._checkForPreJoinUISI(events);
 
         // Hold onto the live events separately. The read receipt and read marker
         // should use this list, so that they don't advance into pending events.
@@ -1128,9 +1144,72 @@ const TimelinePanel = createReactClass({
         return {
             events,
             liveEvents,
+            firstVisibleEventIndex,
         };
     },
 
+    /**
+     * Check for undecryptable messages that were sent while the user was not in
+     * the room.
+     *
+     * @param {Array<MatrixEvent>} events The timeline events to check
+     *
+     * @return {Number} The index within `events` of the event after the most recent
+     * undecryptable event that was sent while the user was not in the room.  If no
+     * such events were found, then it returns 0.
+     */
+    _checkForPreJoinUISI: function(events) {
+        const room = this.props.timelineSet.room;
+
+        if (events.length === 0 || !room ||
+            !MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
+            return 0;
+        }
+
+        const userId = MatrixClientPeg.get().credentials.userId;
+
+        // get the user's membership at the last event by getting the timeline
+        // that the event belongs to, and traversing the timeline looking for
+        // that event, while keeping track of the user's membership
+        const lastEvent = events[events.length - 1];
+        const timeline = room.getTimelineForEvent(lastEvent.getId());
+        const userMembershipEvent =
+              timeline.getState(EventTimeline.FORWARDS).getMember(userId);
+        let userMembership = userMembershipEvent
+            ? userMembershipEvent.membership : "leave";
+        const timelineEvents = timeline.getEvents();
+        for (let i = timelineEvents.length - 1; i >= 0; i--) {
+            const event = timelineEvents[i];
+            if (event.getId() === lastEvent.getId()) {
+                // found the last event, so we can stop looking through the timeline
+                break;
+            } else if (event.getStateKey() === userId
+                       && event.getType() === "m.room.member") {
+                const prevContent = event.getPrevContent();
+                userMembership = prevContent.membership || "leave";
+            }
+        }
+
+        // now go through the events that we have and find the first undecryptable
+        // one that was sent when the user wasn't in the room
+        for (let i = events.length - 1; i >= 0; i--) {
+            const event = events[i];
+            if (event.getStateKey() === userId
+                && event.getType() === "m.room.member") {
+                const prevContent = event.getPrevContent();
+                userMembership = prevContent.membership || "leave";
+            } else if (userMembership === "leave" &&
+                       (event.isDecryptionFailure() || event.isBeingDecrypted())) {
+                // reached an undecryptable message when the user wasn't in
+                // the room -- don't try to load any more
+                // Note: for now, we assume that events that are being decrypted are
+                // not decryptable
+                return i + 1;
+            }
+        }
+        return 0;
+    },
+
     _indexForEventId: function(evId) {
         for (let i = 0; i < this.state.events.length; ++i) {
             if (evId == this.state.events[i].getId()) {
@@ -1323,6 +1402,9 @@ const TimelinePanel = createReactClass({
             this.state.forwardPaginating ||
             ['PREPARED', 'CATCHUP'].includes(this.state.clientSyncState)
         );
+        const events = this.state.firstVisibleEventIndex
+              ? this.state.events.slice(this.state.firstVisibleEventIndex)
+              : this.state.events;
         return (
             <MessagePanel
                 ref={this._messagePanel}
@@ -1331,7 +1413,7 @@ const TimelinePanel = createReactClass({
                 hidden={this.props.hidden}
                 backPaginating={this.state.backPaginating}
                 forwardPaginating={forwardPaginating}
-                events={this.state.events}
+                events={events}
                 highlightedEventId={this.props.highlightedEventId}
                 readMarkerEventId={this.state.readMarkerEventId}
                 readMarkerVisible={this.state.readMarkerVisible}

From 68a22a4d645e69dce756394ec3a1d598fafac2a1 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 28 Jan 2020 20:06:25 +0000
Subject: [PATCH 0786/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2075 of 2075 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 856e3f535d..0ef0a7eeec 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2146,5 +2146,6 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot a kereshetőség érdekében a titkosított üzeneteket biztonságos módon helyileg tárolja:",
     "Space used:": "Hely felhasználva:",
     "Indexed messages:": "Indexált üzenetek:",
-    "Number of rooms:": "Szobák száma:"
+    "Number of rooms:": "Szobák száma:",
+    "Restore your key backup to upgrade your encryption": "A titkosítás fejlesztéséhez allítsd vissza a kulcs mentést"
 }

From 7b5a8856a4c03fd902077f1a1d0d4f073c17ba22 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 22:06:04 +0000
Subject: [PATCH 0787/3235] Passing refireParams actually prevented this from
 working

---
 src/components/views/right_panel/RoomHeaderButtons.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index a7accc23d8..bad89e2dbe 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -3,7 +3,7 @@ Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2017 New Vector Ltd
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
-import RightPanelStore from "../../../stores/RightPanelStore";
 
 const MEMBER_PHASES = [
     RIGHT_PANEL_PHASES.RoomMemberList,
@@ -60,7 +59,8 @@ export default class RoomHeaderButtons extends HeaderButtons {
     _onMembersClicked() {
         if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
+            // XXX: we should pass refireParams here but then it won't collapse as we desire it to
+            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
         } else {
             // This toggles for us, if needed
             this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);

From 4a26a72684e47aa921a3e38965beeebd6c759d3f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jan 2020 22:46:21 +0000
Subject: [PATCH 0788/3235] Restore key backup in Complete Security dialog

Fixes https://github.com/vector-im/riot-web/issues/11889
---
 .../structures/auth/CompleteSecurity.js       | 36 +++++++++++++++----
 src/i18n/strings/en_EN.json                   |  1 +
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 29d8207d0a..0f30d9cf61 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -22,8 +22,9 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { accessSecretStorage } from '../../../CrossSigningManager';
 
 const PHASE_INTRO = 0;
-const PHASE_DONE = 1;
-const PHASE_CONFIRM_SKIP = 2;
+const PHASE_BUSY = 1;
+const PHASE_DONE = 2;
+const PHASE_CONFIRM_SKIP = 3;
 
 export default class CompleteSecurity extends React.Component {
     static propTypes = {
@@ -39,6 +40,7 @@ export default class CompleteSecurity extends React.Component {
             // the presence of it insidicating that we're in 'verify mode'.
             // Because of the latter, it lives in the state.
             verificationRequest: null,
+            backupInfo: null,
         };
         MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
     }
@@ -53,10 +55,16 @@ export default class CompleteSecurity extends React.Component {
     }
 
     onStartClick = async () => {
+        this.setState({
+            phase: PHASE_BUSY,
+        });
         const cli = MatrixClientPeg.get();
+        const backupInfo = await cli.getKeyBackupVersion();
+        this.setState({backupInfo});
         try {
             await accessSecretStorage(async () => {
                 await cli.checkOwnCrossSigningTrust();
+                if (backupInfo) await cli.restoreKeyBackupWithSecretStorage(backupInfo);
             });
 
             if (cli.getCrossSigningId()) {
@@ -66,6 +74,9 @@ export default class CompleteSecurity extends React.Component {
             }
         } catch (e) {
             // this will throw if the user hits cancel, so ignore
+            this.setState({
+                phase: PHASE_INTRO,
+            });
         }
     }
 
@@ -155,13 +166,21 @@ export default class CompleteSecurity extends React.Component {
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified"></span>;
             title = _t("Session verified");
+            let message;
+            if (this.state.backupInfo) {
+                message = <p>{_t(
+                    "Your new session is now verified. It has access to your " +
+                    "encrypted messages, and other users will see it as trusted.",
+                )}</p>;
+            } else {
+                message = <p>{_t(
+                    "Your new session is now verified. Other users will see it as trusted.",
+                )}</p>;
+            }
             body = (
                 <div>
                     <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
-                    <p>{_t(
-                        "Your new session is now verified. It has access to your " +
-                        "encrypted messages, and other users will see it as trusted.",
-                    )}</p>
+                    {message}
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
                             kind="primary"
@@ -198,6 +217,11 @@ export default class CompleteSecurity extends React.Component {
                     </div>
                 </div>
             );
+        } else if (phase === PHASE_BUSY) {
+            const Spinner = sdk.getComponent('views.elements.Spinner');
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
+            title = '';
+            body = <Spinner />;
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b5a412e117..3ce31f69aa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1894,6 +1894,7 @@
     "Done": "Done",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
     "Go Back": "Go Back",
+    "Restoring": "Restoring",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",

From c632c72f25433a91cec974117fff05424ec774a7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 23:43:09 +0000
Subject: [PATCH 0789/3235] tidy up right-panel if-else-if statement

---
 src/components/structures/RightPanel.js | 133 +++++++++++++-----------
 1 file changed, 75 insertions(+), 58 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 79955c8448..be10ead7ca 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -180,65 +180,82 @@ export default class RightPanel extends React.Component {
 
         let panel = <div />;
 
-        if (this.props.roomId && this.state.phase === RIGHT_PANEL_PHASES.RoomMemberList) {
-            panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
-        } else if (this.props.groupId && this.state.phase === RIGHT_PANEL_PHASES.GroupMemberList) {
-            panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) {
-            panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo ||
-            this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel) {
-            if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-                const onClose = () => {
-                    dis.dispatch({
-                        action: "view_user",
-                        member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
-                    });
-                };
-                panel = <UserInfo
-                    user={this.state.member}
-                    roomId={this.props.roomId}
-                    key={this.props.roomId || this.state.member.userId}
-                    onClose={onClose}
-                    phase={this.state.phase}
-                    verificationRequest={this.state.verificationRequest}
-                />;
-            } else {
-                panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />;
-            }
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) {
-            panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
-            if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-                const onClose = () => {
-                    dis.dispatch({
-                        action: "view_user",
-                        member: null,
-                    });
-                };
-                panel = <UserInfo
-                    user={this.state.member}
-                    groupId={this.props.groupId}
-                    key={this.state.member.userId}
-                    onClose={onClose} />;
-            } else {
-                panel = (
-                    <GroupMemberInfo
-                        groupMember={this.state.member}
+        switch (this.state.phase) {
+            case RIGHT_PANEL_PHASES.RoomMemberList:
+                if (this.props.roomId) {
+                    panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
+                }
+                break;
+            case RIGHT_PANEL_PHASES.GroupMemberList:
+                if (this.props.groupId) {
+                    panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
+                }
+                break;
+            case RIGHT_PANEL_PHASES.GroupRoomList:
+                panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
+                break;
+            case RIGHT_PANEL_PHASES.RoomMemberInfo:
+            case RIGHT_PANEL_PHASES.EncryptionPanel:
+                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                    const onClose = () => {
+                        dis.dispatch({
+                            action: "view_user",
+                            member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                        });
+                    };
+                    panel = <UserInfo
+                        user={this.state.member}
+                        roomId={this.props.roomId}
+                        key={this.props.roomId || this.state.member.userId}
+                        onClose={onClose}
+                        phase={this.state.phase}
+                        verificationRequest={this.state.verificationRequest}
+                    />;
+                } else {
+                    panel = <MemberInfo
+                        member={this.state.member}
+                        key={this.props.roomId || this.state.member.userId}
+                    />;
+                }
+                break;
+            case RIGHT_PANEL_PHASES.Room3pidMemberInfo:
+                panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
+                break;
+            case RIGHT_PANEL_PHASES.GroupMemberInfo:
+                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                    const onClose = () => {
+                        dis.dispatch({
+                            action: "view_user",
+                            member: null,
+                        });
+                    };
+                    panel = <UserInfo
+                        user={this.state.member}
                         groupId={this.props.groupId}
-                        key={this.state.member.user_id}
-                    />
-                );
-            }
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomInfo) {
-            panel = <GroupRoomInfo
-                groupRoomId={this.state.groupRoomId}
-                groupId={this.props.groupId}
-                key={this.state.groupRoomId} />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.NotificationPanel) {
-            panel = <NotificationPanel />;
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.FilePanel) {
-            panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
+                        key={this.state.member.userId}
+                        onClose={onClose} />;
+                } else {
+                    panel = (
+                        <GroupMemberInfo
+                            groupMember={this.state.member}
+                            groupId={this.props.groupId}
+                            key={this.state.member.user_id}
+                        />
+                    );
+                }
+                break;
+            case RIGHT_PANEL_PHASES.GroupRoomInfo:
+                panel = <GroupRoomInfo
+                    groupRoomId={this.state.groupRoomId}
+                    groupId={this.props.groupId}
+                    key={this.state.groupRoomId} />;
+                break;
+            case RIGHT_PANEL_PHASES.NotificationPanel:
+                panel = <NotificationPanel />;
+                break;
+            case RIGHT_PANEL_PHASES.FilePanel:
+                panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
+                break;
         }
 
         const classes = classNames("mx_RightPanel", "mx_fadable", {

From 2fb6e737947140d23250101f315f282b5f4b541f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 23:43:27 +0000
Subject: [PATCH 0790/3235] speed up user info verification css transitions by
 2x

---
 res/css/views/right_panel/_UserInfo.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 30c71146bf..9ce524c5ac 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -81,7 +81,7 @@ limitations under the License.
     .mx_UserInfo_avatar > div {
         max-width: 30vh;
         margin: 0 auto;
-        transition: 1s;
+        transition: 0.5s;
     }
 
     .mx_UserInfo_avatar > div > div {
@@ -111,7 +111,7 @@ limitations under the License.
         // override the calculated sizes so that the letter isn't HUGE
         font-size: 56px !important;
         width: 100% !important;
-        transition: font-size 1s;
+        transition: font-size 0.5s;
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {

From 5c44ff8f8a04599f795c45310e523502f902ddd7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Jan 2020 23:48:00 +0000
Subject: [PATCH 0791/3235] other PR iteration based on feedback

---
 src/components/views/right_panel/UserInfo.js             | 1 -
 src/components/views/verification/VerificationShowSas.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 41dbe49cc8..0c71642acc 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1093,7 +1093,6 @@ export const useDevices = (userId) => {
                 // Promise.resolve to handle transition from static result to promise; can be removed in future
                 Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
                     if (cancel) return;
-                    console.log("setDevices 2", devices);
                     setDevices(devices);
                 });
             }
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 4a1628e9e6..7b93f42983 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -91,7 +91,7 @@ export default class VerificationShowSas extends React.Component {
             const text = _t("Waiting for %(displayName)s to verify…", {displayName});
             confirm = <PendingActionSpinner text={text} />;
         } else {
-            // FIXME: stop using DialogButtons here once it this component is only used in the right panel verification
+            // FIXME: stop using DialogButtons here once this component is only used in the right panel verification
             confirm = <DialogButtons
                 primaryButton={_t("They match")}
                 onPrimaryButtonClick={this.onMatchClick}

From 2fbda42374d8f044cf6116364122bd94f45645ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:53:06 +0000
Subject: [PATCH 0792/3235] Fix buttons in right panel verif

---
 res/css/views/right_panel/_UserInfo.scss                 | 1 +
 src/components/views/verification/VerificationShowSas.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 9ce524c5ac..c275f42222 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -263,6 +263,7 @@ limitations under the License.
     .mx_UserInfo_verify {
         display: block;
         margin: 16px 0;
+        width: 100%;
     }
 }
 
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 7b93f42983..ec222159ab 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -95,7 +95,7 @@ export default class VerificationShowSas extends React.Component {
             confirm = <DialogButtons
                 primaryButton={_t("They match")}
                 onPrimaryButtonClick={this.onMatchClick}
-                primaryButtonClassName="mx_UserInfo_verify"
+                primaryButtonClass="mx_UserInfo_verify"
                 cancelButton={_t("They don't match")}
                 onCancel={this.props.onCancel}
                 cancelButtonClass="mx_UserInfo_verify"

From 83fdeeb1809df9db99686db159bc66ad894abcfd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:53:23 +0000
Subject: [PATCH 0793/3235] Fix MemberInfo handling User objects without
 crashing

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 55855bbc9a..7c77c546b6 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -1113,7 +1113,8 @@ export default createReactClass({
             }
         }
 
-        const avatarUrl = this.props.member.getMxcAvatarUrl();
+        const {member} = this.props;
+        const avatarUrl = member.avatarUrl || (member.getMxcAvatarUrl && member.getMxcAvatarUrl());
         let avatarElement;
         if (avatarUrl) {
             const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);

From 3d47e259553d15c6e6d1b08b10a2070c42f7c4a6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:53:45 +0000
Subject: [PATCH 0794/3235] improve PropTypes for better rageshakes

---
 .../views/right_panel/VerificationPanel.js    | 19 ++++++++++++++++++-
 .../views/verification/VerificationShowSas.js |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 3740c6e49d..46179183e1 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React from "react";
+import PropTypes from "prop-types";
 
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
@@ -23,6 +24,8 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {_t} from "../../../languageHandler";
 import E2EIcon from "../rooms/E2EIcon";
 import {
+    PHASE_UNSENT,
+    PHASE_REQUESTED,
     PHASE_READY,
     PHASE_DONE,
     PHASE_STARTED,
@@ -31,6 +34,20 @@ import {
 import Spinner from "../elements/Spinner";
 
 export default class VerificationPanel extends React.PureComponent {
+    static propTypes = {
+        request: PropTypes.object.isRequired,
+        member: PropTypes.object.isRequired,
+        phase: PropTypes.oneOf([
+            PHASE_UNSENT,
+            PHASE_REQUESTED,
+            PHASE_READY,
+            PHASE_STARTED,
+            PHASE_CANCELLED,
+            PHASE_DONE,
+        ]).isRequired,
+        onClose: PropTypes.func.isRequired,
+    };
+
     constructor(props) {
         super(props);
         this.state = {};
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index ec222159ab..aee0f57cf8 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -27,7 +27,8 @@ function capFirst(s) {
 
 export default class VerificationShowSas extends React.Component {
     static propTypes = {
-        displayName: PropTypes.string.isRequired,
+        pending: PropTypes.bool,
+        displayName: PropTypes.string, // required if pending is true
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,

From d824145638adba42a753bb1518b4335c0758b487 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:54:10 +0000
Subject: [PATCH 0795/3235] show as pending whilst in an empty state until told
 better to prevent a flash

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

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index d45280e29c..4e147bd7a5 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -36,7 +36,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
         setRequest(verificationRequest);
     }, [verificationRequest]);
 
-    const [phase, setPhase] = useState(false);
+    const [phase, setPhase] = useState(undefined);
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {
@@ -71,7 +71,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
         setRequest(verificationRequest);
     }, [member.userId]);
 
-    const requested = request && phase === PHASE_REQUESTED;
+    const requested = request && (phase === PHASE_REQUESTED || phase === undefined);
     if (!request || requested) {
         return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={requested} />;
     } else {

From 2aa21d9199396dca19f4b9e0867be298e48b9d35 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:54:28 +0000
Subject: [PATCH 0796/3235] reload on enabling cross-signing just to make
 things generally happier

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 37a211e905..6011f0499a 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -147,6 +147,7 @@ export const SETTINGS = {
         displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        controller: new ReloadOnChangeController(),
     },
     "feature_event_indexing": {
         isFeature: true,

From 61d0021c8eef4f7d558a596800e7d210510c7cea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 07:58:43 +0000
Subject: [PATCH 0797/3235] Fix styling special case for DialogButtons

---
 res/css/views/right_panel/_UserInfo.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index c275f42222..dc22de4713 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -263,7 +263,9 @@ limitations under the License.
     .mx_UserInfo_verify {
         display: block;
         margin: 16px 0;
-        width: 100%;
+    }
+    button.mx_UserInfo_verify {
+        width: 100%; // FIXME get rid of this once we get rid of DialogButtons here
     }
 }
 

From 0bb423fd5ad9aecf3b6d408471fefb2699d008b3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 08:00:32 +0000
Subject: [PATCH 0798/3235] Add console log on unhandled error to track down
 rageshake

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 46179183e1..2d3fdd3f40 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -164,11 +164,11 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     render() {
-        const {member} = this.props;
+        const {member, phase} = this.props;
 
         const displayName = member.displayName || member.name || member.userId;
 
-        switch (this.props.phase) {
+        switch (phase) {
             case PHASE_READY:
                 return this.renderQRPhase();
             case PHASE_STARTED:
@@ -191,6 +191,7 @@ export default class VerificationPanel extends React.PureComponent {
             case PHASE_CANCELLED:
                 return this.renderCancelledPhase();
         }
+        console.error("VerificationPanel unhandled phase:", phase)
         return null;
     }
 

From 37e568448d8a09dae730d1334c04794cca089899 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 08:08:52 +0000
Subject: [PATCH 0799/3235] delint

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 2d3fdd3f40..18a9024310 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -191,7 +191,7 @@ export default class VerificationPanel extends React.PureComponent {
             case PHASE_CANCELLED:
                 return this.renderCancelledPhase();
         }
-        console.error("VerificationPanel unhandled phase:", phase)
+        console.error("VerificationPanel unhandled phase:", phase);
         return null;
     }
 

From 7d1c61fa550c1fda3a601a678ca44742e6786d06 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 09:29:45 +0000
Subject: [PATCH 0800/3235] Use new constant for QR code verification

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

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 53dd63d805..db99f38738 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -32,6 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB
 import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
+import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -217,7 +218,7 @@ class _MatrixClientPeg {
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
-            verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW, verificationMethods.RECIPROCATE_QR_CODE],
+            verificationMethods: [verificationMethods.SAS, SHOW_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
         };

From e9854f5e44c3f9fce735acfde0da551173493f76 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Jan 2020 09:32:09 +0000
Subject: [PATCH 0801/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3ce31f69aa..df163bbd56 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1891,10 +1891,10 @@
     "Start": "Start",
     "Session verified": "Session verified",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
+    "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Done": "Done",
     "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
     "Go Back": "Go Back",
-    "Restoring": "Restoring",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",

From 610354220e074a457f0875bca83c23a781c6f0e7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 11:01:00 +0000
Subject: [PATCH 0802/3235] Automatically focus on the invite dialog input

Fixes https://github.com/vector-im/riot-web/issues/12070
---
 src/components/views/dialogs/InviteDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index de11dbf9fa..afa204af04 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -937,6 +937,7 @@ export default class InviteDialog extends React.PureComponent {
                 value={this.state.filterText}
                 ref={this._editorRef}
                 onPaste={this._onPaste}
+                autoFocus={true}
             />
         );
         return (

From 8d1265748348d90d673ecd4c4f5cf6cfc3b07d63 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 11:14:33 +0000
Subject: [PATCH 0803/3235] Filter event types when deciding on activity
 metrics for DM suggestions

Fixes https://github.com/vector-im/riot-web/issues/12083
---
 src/components/views/dialogs/InviteDialog.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index de11dbf9fa..a911abbf76 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -351,9 +351,19 @@ export default class InviteDialog extends React.PureComponent {
                 continue;
             }
 
-            const lastEventTs = room.timeline && room.timeline.length
-                ? room.timeline[room.timeline.length - 1].getTs()
-                : 0;
+            // Find the last timestamp for a message event
+            const searchTypes = ["m.room.message", "m.room.encrypted", "m.sticker"];
+            const maxSearchEvents = 20; // to prevent traversing history
+            let lastEventTs = 0;
+            if (room.timeline && room.timeline.length) {
+                for (let i = room.timeline.length - 1; i >= 0; i--) {
+                    const ev = room.timeline[i];
+                    if (searchTypes.includes(ev.getType())) {
+                        lastEventTs = ev.getTs();
+                    }
+                    if (room.timeline.length - i > maxSearchEvents) break;
+                }
+            }
             if (!lastEventTs) {
                 // something weird is going on with this room
                 console.warn(`[Invite:Recents] ${userId} (${room.roomId}) has a weird last timestamp: ${lastEventTs}`);

From a138a66e77528bcbd6fcd44c7e63d73d3abded3e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 11:22:03 +0000
Subject: [PATCH 0804/3235] Let users paste text if they've already started
 filtering invite targets

Fixes https://github.com/vector-im/riot-web/issues/11814
---
 src/components/views/dialogs/InviteDialog.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index afa204af04..ee0d26c48d 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -747,6 +747,12 @@ export default class InviteDialog extends React.PureComponent {
     };
 
     _onPaste = async (e) => {
+        if (this.state.filterText) {
+            // if the user has already typed something, just let them
+            // paste normally.
+            return;
+        }
+
         // Prevent the text being pasted into the textarea
         e.preventDefault();
 

From 95a78538e0b7cbf3b7ca91f567d491571c7ab1f0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 11:23:48 +0000
Subject: [PATCH 0805/3235] Break after getting timestamp

---
 src/components/views/dialogs/InviteDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a911abbf76..9d60610784 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -360,6 +360,7 @@ export default class InviteDialog extends React.PureComponent {
                     const ev = room.timeline[i];
                     if (searchTypes.includes(ev.getType())) {
                         lastEventTs = ev.getTs();
+                        break;
                     }
                     if (room.timeline.length - i > maxSearchEvents) break;
                 }

From 7d6981ba1adc4a4e023eef4a02a3d9b66f9bea2e Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Jan 2020 11:29:56 +0000
Subject: [PATCH 0806/3235] Revert "reload on enabling cross-signing just to
 make things generally happier"

This reverts commit 2aa21d9199396dca19f4b9e0867be298e48b9d35.

It was causing a login loop
---
 src/settings/Settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 6011f0499a..37a211e905 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -147,7 +147,6 @@ export const SETTINGS = {
         displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
-        controller: new ReloadOnChangeController(),
     },
     "feature_event_indexing": {
         isFeature: true,

From 336f623aa905b2feb7879e7b67f8c6eb4db8f821 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 12:00:02 +0000
Subject: [PATCH 0807/3235] Check for timeline in pre-join UISI path

Somehow, live events can be missing a timeline, even though that should not
happen... This restores @uhoreg's previous version where we test for this case.

Fixes https://github.com/vector-im/riot-web/issues/12120
---
 src/components/structures/TimelinePanel.js | 48 ++++++++++++++--------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index e708fad6a4..25526c3139 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1171,28 +1171,40 @@ const TimelinePanel = createReactClass({
         // get the user's membership at the last event by getting the timeline
         // that the event belongs to, and traversing the timeline looking for
         // that event, while keeping track of the user's membership
-        const lastEvent = events[events.length - 1];
-        const timeline = room.getTimelineForEvent(lastEvent.getId());
-        const userMembershipEvent =
-              timeline.getState(EventTimeline.FORWARDS).getMember(userId);
-        let userMembership = userMembershipEvent
-            ? userMembershipEvent.membership : "leave";
-        const timelineEvents = timeline.getEvents();
-        for (let i = timelineEvents.length - 1; i >= 0; i--) {
-            const event = timelineEvents[i];
-            if (event.getId() === lastEvent.getId()) {
-                // found the last event, so we can stop looking through the timeline
-                break;
-            } else if (event.getStateKey() === userId
-                       && event.getType() === "m.room.member") {
-                const prevContent = event.getPrevContent();
-                userMembership = prevContent.membership || "leave";
+        let i;
+        let userMembership = "leave";
+        for (i = events.length - 1; i >= 0; i--) {
+            const timeline = room.getTimelineForEvent(events[i].getId());
+            if (!timeline) {
+                // Somehow, it seems to be possible for live events to not have
+                // a timeline, even though that should not happen. :(
+                // https://github.com/vector-im/riot-web/issues/12120
+                console.warn(
+                    `Event ${events[i].getId()} in room ${room.roomId} is live, ` +
+                    `but it does not have a timeline`,
+                );
+                continue;
             }
+            const userMembershipEvent =
+                    timeline.getState(EventTimeline.FORWARDS).getMember(userId);
+            userMembership = userMembershipEvent ? userMembershipEvent.membership : "leave";
+            const timelineEvents = timeline.getEvents();
+            for (let j = timelineEvents.length - 1; j >= 0; j--) {
+                const event = timelineEvents[j];
+                if (event.getId() === events[i].getId()) {
+                    break;
+                } else if (event.getStateKey() === userId
+                    && event.getType() === "m.room.member") {
+                    const prevContent = event.getPrevContent();
+                    userMembership = prevContent.membership || "leave";
+                }
+            }
+            break;
         }
 
-        // now go through the events that we have and find the first undecryptable
+        // now go through the rest of the events and find the first undecryptable
         // one that was sent when the user wasn't in the room
-        for (let i = events.length - 1; i >= 0; i--) {
+        for (; i >= 0; i--) {
             const event = events[i];
             if (event.getStateKey() === userId
                 && event.getType() === "m.room.member") {

From a549c42022eb8cf4acb1f3ba129ab2755b046304 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 12:10:50 +0000
Subject: [PATCH 0808/3235] Update copy for right panel verification

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DeviceVerifyDialog.js       | 5 +----
 src/components/views/right_panel/EncryptionInfo.js       | 2 +-
 src/components/views/verification/VerificationShowSas.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 67e1649bb9..4340082c3a 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -194,10 +194,7 @@ export default class DeviceVerifyDialog extends React.Component {
                     { _t("Verify by comparing a short text string.") }
                 </p>
                 <p>
-                    {_t(
-                        "For maximum security, we recommend you do this in person or " +
-                        "use another trusted means of communication.",
-                    )}
+                    {_t("To be secure, do this in person or use another way to communicate.")}
                 </p>
                 <DialogButtons
                     primaryButton={_t('Begin Verifying')}
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 8868c30053..2635a15f76 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -56,7 +56,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
             <h3>{_t("Verify User")}</h3>
             <div>
                 <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
-                <p>{_t("For maximum security, do this in person.")}</p>
+                <p>{_t("To be secure, do this in person or use another way to communicate.")}</p>
                 { content }
             </div>
         </div>
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index aee0f57cf8..04f7d86ae5 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -105,7 +105,7 @@ export default class VerificationShowSas extends React.Component {
 
         return <div className="mx_VerificationShowSas">
             <p>{sasCaption}</p>
-            <p>{_t("For ultimate security, do this in person or use another way to communicate.")}</p>
+            <p>{_t("To be secure, do this in person or use another way to communicate.")}</p>
             {sasDisplay}
             {confirm}
         </div>;

From 227e6f63762e3268c7d4e4aa09ffc26e119e8f6e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 12:16:42 +0000
Subject: [PATCH 0809/3235] regen i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3ae0991f16..b00fcf3c11 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -451,7 +451,7 @@
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "They match": "They match",
     "They don't match": "They don't match",
-    "For ultimate security, do this in person or use another way to communicate.": "For ultimate security, do this in person or use another way to communicate.",
+    "To be secure, do this in person or use another way to communicate.": "To be secure, do this in person or use another way to communicate.",
     "Dog": "Dog",
     "Cat": "Cat",
     "Lion": "Lion",
@@ -1150,7 +1150,6 @@
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Verify User": "Verify User",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
-    "For maximum security, do this in person.": "For maximum security, do this in person.",
     "Your messages are not secure": "Your messages are not secure",
     "One of the following may be compromised:": "One of the following may be compromised:",
     "Your homeserver": "Your homeserver",
@@ -1462,7 +1461,6 @@
     "Verify device": "Verify device",
     "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
     "Verify by comparing a short text string.": "Verify by comparing a short text string.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
     "Begin Verifying": "Begin Verifying",
     "Waiting for partner to accept...": "Waiting for partner to accept...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",

From cb0392b78d8e84cf9bfeb39b444936adb692deb6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 13:24:45 +0000
Subject: [PATCH 0810/3235] use forms to wrap password fields so Chrome doesn't
 go wild and prefill all the things

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../CreateSecretStorageDialog.js              | 75 +++++++++----------
 src/components/structures/SearchBox.js        |  1 +
 .../AccessSecretStorageDialog.js              | 45 +++++------
 3 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 4068f72217..35cd5aa819 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -295,31 +295,27 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseNextClick = () => {
-        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
-    }
-
-    _onPassPhraseKeyPress = async (e) => {
-        if (e.key === 'Enter') {
-            // If we're waiting for the timeout before updating the result at this point,
-            // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-            // even if the user entered a valid passphrase
-            if (this._setZxcvbnResultTimeout !== null) {
-                clearTimeout(this._setZxcvbnResultTimeout);
-                this._setZxcvbnResultTimeout = null;
-                await new Promise((resolve) => {
-                    this.setState({
-                        zxcvbnResult: scorePassword(this.state.passPhrase),
-                    }, resolve);
-                });
-            }
-            if (this._passPhraseIsValid()) {
-                this._onPassPhraseNextClick();
-            }
+    _onPassPhraseNextClick = async () => {
+        // If we're waiting for the timeout before updating the result at this point,
+        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
+        // even if the user entered a valid passphrase
+        if (this._setZxcvbnResultTimeout !== null) {
+            clearTimeout(this._setZxcvbnResultTimeout);
+            this._setZxcvbnResultTimeout = null;
+            await new Promise((resolve) => {
+                this.setState({
+                    zxcvbnResult: scorePassword(this.state.passPhrase),
+                }, resolve);
+            });
         }
-    }
+        if (this._passPhraseIsValid()) {
+            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        }
+    };
 
     _onPassPhraseConfirmNextClick = async () => {
+        if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
+
         const [keyInfo, encodedRecoveryKey] =
             await MatrixClientPeg.get().createRecoveryKeyFromPassphrase(this.state.passPhrase);
         this._keyInfo = keyInfo;
@@ -332,12 +328,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseConfirmKeyPress = (e) => {
-        if (e.key === 'Enter' && this.state.passPhrase === this.state.passPhraseConfirm) {
-            this._onPassPhraseConfirmNextClick();
-        }
-    }
-
     _onSetAgainClick = () => {
         this.setState({
             passPhrase: '',
@@ -407,7 +397,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         } else if (this.state.canUploadKeysWithPasswordOnly) {
             authPrompt = <div>
                 <div>{_t("Enter your account password to confirm the upgrade:")}</div>
-                <div><Field type="password"
+                <div><Field
+                    type="password"
                     id="mx_CreateSecretStorage_accountPassword"
                     label={_t("Password")}
                     value={this.state.accountPassword}
@@ -469,7 +460,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         }
 
-        return <div>
+        return <form>
             <p>{_t(
                 "Set up encryption on this device to allow it to verify other devices, " +
                 "granting them access to encrypted messages and marking them as trusted for other users.",
@@ -480,13 +471,14 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                <Field type="password"
+                <Field
+                    type="password"
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
-                    onKeyPress={this._onPassPhraseKeyPress}
                     value={this.state.passPhrase}
                     label={_t("Enter a passphrase")}
                     autoFocus={true}
+                    autoComplete="new-password"
                 />
                 <div className="mx_CreateSecretStorageDialog_passPhraseHelp">
                     {strengthMeter}
@@ -499,10 +491,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 
-            <DialogButtons primaryButton={_t('Continue')}
+            <DialogButtons
+                primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
                 disabled={!this._passPhraseIsValid()}
+                primaryIsSubmit={true}
             >
                 <button type="button"
                     onClick={this._onSkipSetupClick}
@@ -516,7 +510,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     {_t("Set up with a recovery key")}
                 </AccessibleButton></p>
             </details>
-        </div>;
+        </form>;
     }
 
     _renderPhasePassPhraseConfirm() {
@@ -549,27 +543,30 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
+        return <form>
             <p>{_t(
                 "Enter your passphrase a second time to confirm it.",
             )}</p>
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                <Field type="password"
+                <Field
+                    type="password"
                     id="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseConfirmChange}
-                    onKeyPress={this._onPassPhraseConfirmKeyPress}
                     value={this.state.passPhraseConfirm}
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     label={_t("Confirm your passphrase")}
                     autoFocus={true}
+                    autoComplete="new-password"
                 />
                 <div className="mx_CreateSecretStorageDialog_passPhraseMatch">
                     {passPhraseMatch}
                 </div>
             </div>
-            <DialogButtons primaryButton={_t('Continue')}
+            <DialogButtons
+                primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
                 hasCancel={false}
+                primaryIsSubmit={true}
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             >
                 <button type="button"
@@ -577,7 +574,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     className="danger"
                 >{_t("Skip")}</button>
             </DialogButtons>
-        </div>;
+        </form>;
     }
 
     _renderPhaseShowKey() {
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 873efb64c2..e169e09752 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -160,6 +160,7 @@ export default createReactClass({
                     onKeyDown={ this._onKeyDown }
                     onBlur={this._onBlur}
                     placeholder={ placeholder }
+                    autoComplete="off"
                 />
                 { clearButton }
             </div>
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index c976eb81d0..ed65c9d2a6 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
-import { Key } from "../../../../Keyboard";
 
 /*
  * Access Secure Secret Storage by requesting the user's passphrase.
@@ -69,6 +68,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
     }
 
     _onPassPhraseNext = async () => {
+        if (this.state.passPhrase.length <= 0) return;
+
         this.setState({ keyMatches: null });
         const input = { passphrase: this.state.passPhrase };
         const keyMatches = await this.props.checkPrivateKey(input);
@@ -80,6 +81,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
     }
 
     _onRecoveryKeyNext = async () => {
+        if (!this.state.recoveryKeyValid) return;
+
         this.setState({ keyMatches: null });
         const input = { recoveryKey: this.state.recoveryKey };
         const keyMatches = await this.props.checkPrivateKey(input);
@@ -97,18 +100,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseKeyPress = (e) => {
-        if (e.key === Key.ENTER && this.state.passPhrase.length > 0) {
-            this._onPassPhraseNext();
-        }
-    }
-
-    _onRecoveryKeyKeyPress = (e) => {
-        if (e.key === Key.ENTER && this.state.recoveryKeyValid) {
-            this._onRecoveryKeyNext();
-        }
-    }
-
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
@@ -135,7 +126,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     )}
                 </div>;
             } else {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus"></div>;
+                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
             }
 
             content = <div>
@@ -149,23 +140,26 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     "identity for verifying other devices by entering your passphrase.",
                 )}</p>
 
-                <div className="mx_AccessSecretStorageDialog_primaryContainer">
-                    <input type="password"
+                <form className="mx_AccessSecretStorageDialog_primaryContainer">
+                    <input
+                        type="password"
                         className="mx_AccessSecretStorageDialog_passPhraseInput"
                         onChange={this._onPassPhraseChange}
-                        onKeyPress={this._onPassPhraseKeyPress}
                         value={this.state.passPhrase}
                         autoFocus={true}
+                        autoComplete="new-password"
                     />
                     {keyStatus}
-                    <DialogButtons primaryButton={_t('Next')}
+                    <DialogButtons
+                        primaryButton={_t('Next')}
                         onPrimaryButtonClick={this._onPassPhraseNext}
                         hasCancel={true}
                         onCancel={this._onCancel}
                         focus={false}
+                        primaryIsSubmit={true}
                         primaryDisabled={this.state.passPhrase.length === 0}
                     />
-                </div>
+                </form>
                 {_t(
                     "If you've forgotten your passphrase you can "+
                     "<button1>use your recovery key</button1> or " +
@@ -192,7 +186,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             let keyStatus;
             if (this.state.recoveryKey.length === 0) {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus"></div>;
+                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
             } else if (this.state.recoveryKeyValid) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
@@ -221,22 +215,23 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     "identity for verifying other devices by entering your recovery key.",
                 )}</p>
 
-                <div className="mx_AccessSecretStorageDialog_primaryContainer">
+                <form className="mx_AccessSecretStorageDialog_primaryContainer">
                     <input className="mx_AccessSecretStorageDialog_recoveryKeyInput"
                         onChange={this._onRecoveryKeyChange}
-                        onKeyPress={this._onRecoveryKeyKeyPress}
                         value={this.state.recoveryKey}
                         autoFocus={true}
                     />
                     {keyStatus}
-                    <DialogButtons primaryButton={_t('Next')}
+                    <DialogButtons
+                        primaryButton={_t('Next')}
                         onPrimaryButtonClick={this._onRecoveryKeyNext}
                         hasCancel={true}
                         onCancel={this._onCancel}
                         focus={false}
+                        primaryIsSubmit={true}
                         primaryDisabled={!this.state.recoveryKeyValid}
                     />
-                </div>
+                </form>
                 {_t(
                     "If you've forgotten your recovery key you can "+
                     "<button>set up new recovery options</button>."

From fe71fe6033a59e0dcc20c62527ad5b7ec7f71895 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 13:38:50 +0000
Subject: [PATCH 0811/3235] Sprinkle forms and new-password designators to make
 autofill and password completion less wild

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../keybackup/CreateKeyBackupDialog.js        | 66 ++++++++-----------
 src/components/views/auth/RegistrationForm.js |  2 +
 .../views/dialogs/DeactivateAccountDialog.js  |  1 +
 .../keybackup/RestoreKeyBackupDialog.js       | 15 ++---
 .../views/settings/ChangePassword.js          |  8 ++-
 5 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 8940239cfd..1557159e5c 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -192,31 +192,27 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseNextClick = () => {
-        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
-    }
-
-    _onPassPhraseKeyPress = async (e) => {
-        if (e.key === 'Enter') {
-            // If we're waiting for the timeout before updating the result at this point,
-            // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-            // even if the user entered a valid passphrase
-            if (this._setZxcvbnResultTimeout !== null) {
-                clearTimeout(this._setZxcvbnResultTimeout);
-                this._setZxcvbnResultTimeout = null;
-                await new Promise((resolve) => {
-                    this.setState({
-                        zxcvbnResult: scorePassword(this.state.passPhrase),
-                    }, resolve);
-                });
-            }
-            if (this._passPhraseIsValid()) {
-                this._onPassPhraseNextClick();
-            }
+    _onPassPhraseNextClick = async () => {
+        // If we're waiting for the timeout before updating the result at this point,
+        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
+        // even if the user entered a valid passphrase
+        if (this._setZxcvbnResultTimeout !== null) {
+            clearTimeout(this._setZxcvbnResultTimeout);
+            this._setZxcvbnResultTimeout = null;
+            await new Promise((resolve) => {
+                this.setState({
+                    zxcvbnResult: scorePassword(this.state.passPhrase),
+                }, resolve);
+            });
         }
-    }
+        if (this._passPhraseIsValid()) {
+            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        }
+    };
 
     _onPassPhraseConfirmNextClick = async () => {
+        if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
+
         this._keyBackupInfo = await MatrixClientPeg.get().prepareKeyBackupVersion(this.state.passPhrase);
         this.setState({
             setPassPhrase: true,
@@ -224,13 +220,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             downloaded: false,
             phase: PHASE_SHOWKEY,
         });
-    }
-
-    _onPassPhraseConfirmKeyPress = (e) => {
-        if (e.key === 'Enter' && this.state.passPhrase === this.state.passPhraseConfirm) {
-            this._onPassPhraseConfirmNextClick();
-        }
-    }
+    };
 
     _onSetAgainClick = () => {
         this.setState({
@@ -301,7 +291,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             </div>;
         }
 
-        return <div>
+        return <form>
             <p>{_t(
                 "<b>Warning</b>: You should only set up key backup from a trusted computer.", {},
                 { b: sub => <b>{sub}</b> },
@@ -316,7 +306,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
                     <input type="password"
                         onChange={this._onPassPhraseChange}
-                        onKeyPress={this._onPassPhraseKeyPress}
                         value={this.state.passPhrase}
                         className="mx_CreateKeyBackupDialog_passPhraseInput"
                         placeholder={_t("Enter a passphrase...")}
@@ -329,9 +318,11 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 </div>
             </div>
 
-            <DialogButtons primaryButton={_t('Next')}
+            <DialogButtons
+                primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
+                primaryIsSubmit={true}
                 disabled={!this._passPhraseIsValid()}
             />
 
@@ -341,7 +332,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                     {_t("Set up with a Recovery Key")}
                 </button></p>
             </details>
-        </div>;
+        </form>;
     }
 
     _renderPhasePassPhraseConfirm() {
@@ -373,7 +364,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             </div>;
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
+        return <form>
             <p>{_t(
                 "Please enter your passphrase a second time to confirm.",
             )}</p>
@@ -382,7 +373,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                     <div>
                         <input type="password"
                             onChange={this._onPassPhraseConfirmChange}
-                            onKeyPress={this._onPassPhraseConfirmKeyPress}
                             value={this.state.passPhraseConfirm}
                             className="mx_CreateKeyBackupDialog_passPhraseInput"
                             placeholder={_t("Repeat your passphrase...")}
@@ -392,12 +382,14 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                     {passPhraseMatch}
                 </div>
             </div>
-            <DialogButtons primaryButton={_t('Next')}
+            <DialogButtons
+                primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
                 hasCancel={false}
+                primaryIsSubmit={true}
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             />
-        </div>;
+        </form>;
     }
 
     _renderPhaseShowKey() {
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 91f8e1b226..8ca454dabd 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -486,6 +486,7 @@ export default createReactClass({
             id="mx_RegistrationForm_password"
             ref={field => this[FIELD_PASSWORD] = field}
             type="password"
+            autoComplete="new-password"
             label={_t("Password")}
             value={this.state.password}
             onChange={this.onPasswordChange}
@@ -499,6 +500,7 @@ export default createReactClass({
             id="mx_RegistrationForm_passwordConfirm"
             ref={field => this[FIELD_PASSWORD_CONFIRM] = field}
             type="password"
+            autoComplete="new-password"
             label={_t("Confirm")}
             value={this.state.passwordConfirm}
             onChange={this.onPasswordConfirmChange}
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 7e36232eb0..d7468933df 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -118,6 +118,7 @@ export default class DeactivateAccountDialog extends React.Component {
 
         const Field = sdk.getComponent('elements.Field');
 
+        // this is on purpose not a <form /> to prevent Enter triggering submission, to further prevent accidents
         return (
             <BaseDialog className="mx_DeactivateAccountDialog"
                 onFinished={this.props.onFinished}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 4466775d3a..814f5a4980 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -157,12 +157,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseKeyPress = (e) => {
-        if (e.key === Key.ENTER) {
-            this._onPassPhraseNext();
-        }
-    }
-
     _onRecoveryKeyKeyPress = (e) => {
         if (e.key === Key.ENTER && this.state.recoveryKeyValid) {
             this._onRecoveryKeyNext();
@@ -305,21 +299,22 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     "messaging by entering your recovery passphrase.",
                 )}</p>
 
-                <div className="mx_RestoreKeyBackupDialog_primaryContainer">
+                <form 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')}
+                    <DialogButtons
+                        primaryButton={_t('Next')}
                         onPrimaryButtonClick={this._onPassPhraseNext}
+                        primaryIsSubmit={true}
                         hasCancel={true}
                         onCancel={this._onCancel}
                         focus={false}
                     />
-                </div>
+                </form>
                 {_t(
                     "If you've forgotten your recovery passphrase you can "+
                     "<button1>use your recovery key</button1> or " +
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 2d8c4c4178..8cbe455af3 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -253,20 +253,24 @@ export default createReactClass({
                     <form className={this.props.className} onSubmit={this.onClickChange}>
                         { currentPassword }
                         <div className={rowClassName}>
-                            <Field id="mx_ChangePassword_newPassword"
+                            <Field
+                                id="mx_ChangePassword_newPassword"
                                 type="password"
                                 label={passwordLabel}
                                 value={this.state.newPassword}
                                 autoFocus={this.props.autoFocusNewPasswordInput}
                                 onChange={this.onChangeNewPassword}
+                                autoComplete="new-password"
                             />
                         </div>
                         <div className={rowClassName}>
-                            <Field id="mx_ChangePassword_newPasswordConfirm"
+                            <Field
+                                id="mx_ChangePassword_newPasswordConfirm"
                                 type="password"
                                 label={_t("Confirm password")}
                                 value={this.state.newPasswordConfirm}
                                 onChange={this.onChangeNewPasswordConfirm}
+                                autoComplete="new-password"
                             />
                         </div>
                         <AccessibleButton className={buttonClassName} kind={this.props.buttonKind} onClick={this.onClickChange}>

From 920daa3125c229697a25daa65788d909839c71e1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 13:43:08 +0000
Subject: [PATCH 0812/3235] Get rid of custom enter handling and protect
 handlers, disabling button isn't foolproof

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 814f5a4980..fc9a21c51b 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -22,7 +22,6 @@ import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
 import Modal from '../../../../Modal';
 import { _t } from '../../../../languageHandler';
-import {Key} from "../../../../Keyboard";
 import { accessSecretStorage } from '../../../../CrossSigningManager';
 
 const RESTORE_TYPE_PASSPHRASE = 0;
@@ -125,6 +124,8 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
     }
 
     _onRecoveryKeyNext = async () => {
+        if (!this.state.recoveryKeyValid) return;
+
         this.setState({
             loading: true,
             restoreError: null,
@@ -157,12 +158,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _onRecoveryKeyKeyPress = (e) => {
-        if (e.key === Key.ENTER && this.state.recoveryKeyValid) {
-            this._onRecoveryKeyNext();
-        }
-    }
-
     async _restoreWithSecretStorage() {
         this.setState({
             loading: true,
@@ -366,7 +361,6 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 <div className="mx_RestoreKeyBackupDialog_primaryContainer">
                     <input className="mx_RestoreKeyBackupDialog_recoveryKeyInput"
                         onChange={this._onRecoveryKeyChange}
-                        onKeyPress={this._onRecoveryKeyKeyPress}
                         value={this.state.recoveryKey}
                         autoFocus={true}
                     />

From 957e8629397cc620a1790e7154dba4d866b1b5a0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 13:58:02 +0000
Subject: [PATCH 0813/3235] Update copy some more

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DeviceVerifyDialog.js       | 2 +-
 src/components/views/right_panel/EncryptionInfo.js       | 2 +-
 src/components/views/verification/VerificationShowSas.js | 2 +-
 src/i18n/strings/en_EN.json                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 4340082c3a..f2368ad795 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -194,7 +194,7 @@ export default class DeviceVerifyDialog extends React.Component {
                     { _t("Verify by comparing a short text string.") }
                 </p>
                 <p>
-                    {_t("To be secure, do this in person or use another way to communicate.")}
+                    {_t("To be secure, do this in person or use a trusted way to communicate.")}
                 </p>
                 <DialogButtons
                     primaryButton={_t('Begin Verifying')}
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 2635a15f76..f8ac797b63 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -56,7 +56,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
             <h3>{_t("Verify User")}</h3>
             <div>
                 <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
-                <p>{_t("To be secure, do this in person or use another way to communicate.")}</p>
+                <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
                 { content }
             </div>
         </div>
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 04f7d86ae5..2a4888ffab 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -105,7 +105,7 @@ export default class VerificationShowSas extends React.Component {
 
         return <div className="mx_VerificationShowSas">
             <p>{sasCaption}</p>
-            <p>{_t("To be secure, do this in person or use another way to communicate.")}</p>
+            <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
             {sasDisplay}
             {confirm}
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b00fcf3c11..20c1234190 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -451,7 +451,7 @@
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "They match": "They match",
     "They don't match": "They don't match",
-    "To be secure, do this in person or use another way to communicate.": "To be secure, do this in person or use another way to communicate.",
+    "To be secure, do this in person or use a trusted way to communicate.": "To be secure, do this in person or use a trusted way to communicate.",
     "Dog": "Dog",
     "Cat": "Cat",
     "Lion": "Lion",

From 042bffc5e2ff84a5a7485a1024e39de6debccc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 29 Jan 2020 12:17:18 +0000
Subject: [PATCH 0814/3235] Translated using Weblate (French)

Currently translated at 100.0% (2098 of 2098 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 | 41 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index beaf2f9281..bf5eef02e1 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1138,7 +1138,7 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Impossible de trouver les profils pour les identifiants Matrix listés ci-dessous. Voulez-vous quand même les inviter ?",
     "Invite anyway and never warn me again": "Inviter quand même et ne plus me prévenir",
     "Invite anyway": "Inviter quand même",
-    "Waiting for %(userId)s to confirm...": "Attente de la confirmation de %(userId)s…",
+    "Waiting for %(userId)s to confirm...": "Nous attendons que %(userId)s confirme…",
     "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d'utilisateur n'est pas enregistré)",
     "Upgrades a room to a new version": "Met à niveau un salon vers une nouvelle version",
     "Sets the room name": "Défini le nom du salon",
@@ -2021,7 +2021,7 @@
     "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés",
     "Help": "Aide",
     "New DM invite dialog (under development)": "Nouveau dialogue d’invitation aux MD (en développement)",
-    "Show more": "En savoir plus",
+    "Show more": "En voir plus",
     "Recent Conversations": "Conversations récentes",
     "Direct Messages": "Messages directs",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou <a>votre lien de profil</a>.",
@@ -2134,5 +2134,40 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
     "Space used:": "Espace utilisé :",
     "Indexed messages:": "Messages indexés :",
-    "Number of rooms:": "Nombre de salons :"
+    "Number of rooms:": "Nombre de salons :",
+    "Waiting for %(displayName)s to verify…": "Nous attendons que %(displayName)s vérifie…",
+    "They match": "Ils correspondent",
+    "They don't match": "Ils ne correspondent pas",
+    "For ultimate security, do this in person or use another way to communicate.": "Pour une sécurité maximale, faites cela en personne ou utilisez un autre moyen de communication.",
+    "This bridge was provisioned by <user />.": "Cette passerelle a été fournie par <user />.",
+    "Workspace: %(networkName)s": "Espace de travail : %(networkName)s",
+    "Channel: %(channelName)s": "Canal : %(channelName)s",
+    "Show less": "En voir moins",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ce salon transmet les messages vers les plateformes suivantes. <a>En savoir plus.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ce salon ne transmet les messages à aucune plateforme. <a>En savoir plus.</a>",
+    "Bridges": "Passerelles",
+    "Waiting for %(displayName)s to accept…": "Nous attendons que %(displayName)s accepte…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vos messages sont sécurisés et seuls vous et le destinataire avez les clés uniques pour les déchiffrer.",
+    "Your messages are not secure": "Vos messages ne sont pas sécurisés",
+    "One of the following may be compromised:": "Un des éléments suivants est peut-être compromis :",
+    "Your homeserver": "Votre serveur d’accueil",
+    "The homeserver the user you’re verifying is connected to": "Le serveur d’accueil auquel l’utilisateur que vous vérifiez est connecté",
+    "Yours, or the other users’ internet connection": "Votre connexion internet ou celle de l’autre utilisateur",
+    "Yours, or the other users’ device": "Votre appareil ou celui de l’autre ordinateur",
+    "Verify by emoji": "Vérifier avec des émojis",
+    "Verify by comparing unique emoji.": "Vérifier en comparant des émojis uniques.",
+    "Ask %(displayName)s to scan your code:": "Demandez à %(displayName)s de scanner votre code :",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Si vous ne pouvez pas scanner le code ci-dessus, vérifiez en comparant des émojis uniques.",
+    "You've successfully verified %(displayName)s!": "Vous avez vérifié %(displayName)s !",
+    "Got it": "Compris",
+    "Verification timed out. Start verification again from their profile.": "La vérification a expiré. Recommencez la vérification depuis son profil.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s a annulé la vérification. Recommencez la vérification depuis son profil.",
+    "You cancelled verification. Start verification again from their profile.": "Vous avez annulé la vérification. Recommencez la vérification depuis son profil.",
+    "New session": "Nouvelle session",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Utilisez cette session pour vérifier la nouvelle, ce qui lui permettra d’accéder aux messages chiffrés :",
+    "If you didn’t sign in to this session, your account may be compromised.": "Si vous ne vous êtes pas connecté à cette session, votre compte est peut-être compromis.",
+    "This wasn't me": "Ce n’était pas moi",
+    "Your new session is now verified. Other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Les autres utilisateurs la verront comme fiable.",
+    "Restore your key backup to upgrade your encryption": "Restaurez votre sauvegarde de clés pour mettre à niveau votre chiffrement",
+    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec la même phrase de passe"
 }

From 8418625026c08cdd7fac050d17905c0afccfb7cb Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 29 Jan 2020 11:51:21 +0000
Subject: [PATCH 0815/3235] Translated using Weblate (Italian)

Currently translated at 98.2% (2060 of 2098 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 | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c8844fb2bb..d60190ec66 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2107,5 +2107,28 @@
     "Upgrade your encryption": "Aggiorna la tua cifratura",
     "Set up encryption": "Imposta la cifratura",
     "Encryption upgraded": "Cifratura aggiornata",
-    "Encryption setup complete": "Impostazione cifratura completata"
+    "Encryption setup complete": "Impostazione cifratura completata",
+    "Verify this session": "Verifica questa sessione",
+    "Encryption upgrade available": "Aggiornamento cifratura disponibile",
+    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s ha attivato la cifratura end-to-end.",
+    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s ha attivato la cifratura end-to-end (algoritmo %(algorithm)s sconosciuto).",
+    "Enable message search in encrypted rooms": "Attiva la ricerca messaggi nelle stanze cifrate",
+    "Waiting for %(displayName)s to verify…": "In attesa della verifica da %(displayName)s …",
+    "They match": "Corrispondono",
+    "They don't match": "Non corrispondono",
+    "For ultimate security, do this in person or use another way to communicate.": "Per la massima sicurezza, fatelo di persona o usate un'altra via di comunicazione.",
+    "Review & verify your new session": "Controlla e verifica la tua nuova sessione",
+    "Review": "Controlla",
+    "Verify your other devices easier": "Verifica più facilmente gli altri tuoi dispositivi",
+    "This bridge was provisioned by <user />.": "Questo bridge è stato fornito da <user />.",
+    "Workspace: %(networkName)s": "Spazio di lavoro: %(networkName)s",
+    "Channel: %(channelName)s": "Canale: %(channelName)s",
+    "Show less": "Mostra meno",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca, usando ",
+    " to store messages from ": " per conservare i messaggi da ",
+    "rooms.": "stanze.",
+    "Manage": "Gestisci",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca.",
+    "Enable": "Attiva",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un Riot Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>."
 }

From 19e7c768b6847b19c0e1f865749dd5077f1b45c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 14:11:50 +0000
Subject: [PATCH 0816/3235] Replace Verify button in UserInfo verification with
 "Learn more"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss                 | 8 +++++++-
 src/components/views/right_panel/EncryptionInfo.js       | 2 +-
 src/components/views/right_panel/UserInfo.js             | 5 +++--
 src/components/views/right_panel/VerificationPanel.js    | 6 +++---
 src/components/views/verification/VerificationShowSas.js | 6 +++---
 src/i18n/strings/en_EN.json                              | 1 +
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index dc22de4713..27014d175a 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -261,10 +261,16 @@ limitations under the License.
     }
 
     .mx_UserInfo_verify {
+        padding-top: 0;
+        padding-left: 0;
+        font-weight: normal;
+    }
+
+    .mx_UserInfo_wideButton {
         display: block;
         margin: 16px 0;
     }
-    button.mx_UserInfo_verify {
+    button.mx_UserInfo_wideButton {
         width: 100%; // FIXME get rid of this once we get rid of DialogButtons here
     }
 }
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 8868c30053..c3f6770d18 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -38,7 +38,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
     } else {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         content = (
-            <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={onStartVerification}>
+            <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={onStartVerification}>
                 {_t("Start Verification")}
             </AccessibleButton>
         );
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index ee9884efe8..c48d9c9c37 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1255,11 +1255,12 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
         userTrust.isCrossSigningVerified() :
         userTrust.isVerified();
     const isMe = member.userId === cli.getUserId();
+
     let verifyButton;
     if (isRoomEncrypted && !userVerified && !isMe) {
         verifyButton = (
-            <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={() => verifyUser(member)}>
-                {_t("Verify")}
+            <AccessibleButton kind="secondary" className="mx_UserInfo_verify" onClick={() => verifyUser(member)}>
+                {_t("Learn more")}
             </AccessibleButton>
         );
     }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 18a9024310..48f4320bee 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -63,7 +63,7 @@ export default class VerificationPanel extends React.PureComponent {
             button = <Spinner />;
         } else {
             button = (
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
+                <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
                     {_t("Verify by emoji")}
                 </AccessibleButton>
             );
@@ -128,7 +128,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <E2EIcon isUser={true} status="verified" size={128} />
                 <p>Verify all users in a room to ensure it's secure.</p>
 
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onClose}>
+                <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
                     {_t("Got it")}
                 </AccessibleButton>
             </div>
@@ -156,7 +156,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <h3>Verification cancelled</h3>
                 <p>{ text }</p>
 
-                <AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this.props.onClose}>
+                <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
                     {_t("Got it")}
                 </AccessibleButton>
             </div>
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index aee0f57cf8..26badb9826 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -80,7 +80,7 @@ export default class VerificationShowSas extends React.Component {
         } else {
             return <div>
                 {_t("Unable to find a supported verification method.")}
-                <AccessibleButton kind="primary" onClick={this.props.onCancel} className="mx_UserInfo_verify">
+                <AccessibleButton kind="primary" onClick={this.props.onCancel} className="mx_UserInfo_wideButton">
                     {_t('Cancel')}
                 </AccessibleButton>
             </div>;
@@ -96,10 +96,10 @@ export default class VerificationShowSas extends React.Component {
             confirm = <DialogButtons
                 primaryButton={_t("They match")}
                 onPrimaryButtonClick={this.onMatchClick}
-                primaryButtonClass="mx_UserInfo_verify"
+                primaryButtonClass="mx_UserInfo_wideButton"
                 cancelButton={_t("They don't match")}
                 onCancel={this.props.onCancel}
-                cancelButtonClass="mx_UserInfo_verify"
+                cancelButtonClass="mx_UserInfo_wideButton"
             />;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3ae0991f16..c529e8bf56 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1173,6 +1173,7 @@
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
+    "Learn more": "Learn more",
     "Security": "Security",
     "Verify by emoji": "Verify by emoji",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",

From 00dd1a4a8f673abb281c8fa1a404a194a22b3c86 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 14:22:20 +0000
Subject: [PATCH 0817/3235] Re-use existing classes to fix font-size matching

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss     | 6 ------
 src/components/views/right_panel/UserInfo.js | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 27014d175a..5e5b66f58a 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -260,12 +260,6 @@ limitations under the License.
         }
     }
 
-    .mx_UserInfo_verify {
-        padding-top: 0;
-        padding-left: 0;
-        font-weight: normal;
-    }
-
     .mx_UserInfo_wideButton {
         display: block;
         margin: 16px 0;
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index c48d9c9c37..f189380eac 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1259,7 +1259,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     let verifyButton;
     if (isRoomEncrypted && !userVerified && !isMe) {
         verifyButton = (
-            <AccessibleButton kind="secondary" className="mx_UserInfo_verify" onClick={() => verifyUser(member)}>
+            <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
                 {_t("Learn more")}
             </AccessibleButton>
         );

From c4f16591161bfc261a9c7fd34b0525962481bb75 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Jan 2020 15:22:05 +0100
Subject: [PATCH 0818/3235] don't dismiss toasts for device verification

as they are immediately started
---
 src/components/views/toasts/VerificationRequestToast.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 342b7d840c..d7b2880b92 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -56,7 +56,10 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         const {request} = this.props;
-        if (request.ready || request.started || request.done || request.cancelled || request.observeOnly) {
+        const isPendingInRoomRequest = request.channel.roomId &&
+            !(request.ready || request.started || request.done || request.cancelled || request.observeOnly);
+        const isPendingDeviceRequest = request.channel.deviceId && request.started;
+        if (!isPendingInRoomRequest && !isPendingDeviceRequest) {
             ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
     };

From 59dc3cfb97c21833a99a0ede22dcc312a1d3911d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Jan 2020 15:23:13 +0100
Subject: [PATCH 0819/3235] update immediately, don't wait until verification
 is done

this can deadlock, as you can't finish the verification without the UI
---
 src/components/views/right_panel/VerificationPanel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 18a9024310..a34dfbfdd0 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -217,9 +217,12 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onRequestChange = async () => {
+        this.forceUpdate();
         const {request} = this.props;
-        if (!this._hasVerifier && !!request.verifier) {
-            request.verifier.on('show_sas', this._onVerifierShowSas);
+        const hadVerifier = this._hasVerifier;
+        this._hasVerifier = !!request.verifier;
+        if (!hadVerifier && this._hasVerifier) {
+            request.verifier.once('show_sas', this._onVerifierShowSas);
             try {
                 // on the requester side, this is also awaited in _startSAS,
                 // but that's ok as verify should return the same promise.
@@ -227,10 +230,7 @@ export default class VerificationPanel extends React.PureComponent {
             } catch (err) {
                 console.error("error verify", err);
             }
-        } else if (this._hasVerifier && !request.verifier) {
-            request.verifier.removeListener('show_sas', this._onVerifierShowSas);
         }
-        this._hasVerifier = !!request.verifier;
     };
 
     componentDidMount() {

From 3590c97d96d0b9a739d266067d15999924b9178c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Jan 2020 15:24:06 +0100
Subject: [PATCH 0820/3235] unrelated fix: rerender hidden event tile when
 decrypted

to get accurate type
---
 src/components/views/messages/ViewSourceEvent.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/views/messages/ViewSourceEvent.js b/src/components/views/messages/ViewSourceEvent.js
index 62cf45fb6e..9064fc3b68 100644
--- a/src/components/views/messages/ViewSourceEvent.js
+++ b/src/components/views/messages/ViewSourceEvent.js
@@ -32,6 +32,13 @@ export default class ViewSourceEvent extends React.PureComponent {
         };
     }
 
+    componentDidMount() {
+        const {mxEvent} = this.props;
+        if (mxEvent.isBeingDecrypted()) {
+            mxEvent.once("Event.decrypted", () => this.forceUpdate());
+        }
+    }
+
     onToggle = (ev) => {
         ev.preventDefault();
         const { expanded } = this.state;

From 6d47f9620f12fe50efc4220a5ed7b71a40fd5358 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 14:28:19 +0000
Subject: [PATCH 0821/3235] Adjust icons with in person with design

---
 res/css/views/rooms/_InviteOnlyIcon.scss  |  2 +-
 res/css/views/rooms/_MessageComposer.scss |  4 ++--
 res/css/views/rooms/_RoomHeader.scss      |  8 ++++----
 res/css/views/rooms/_RoomTile.scss        | 15 +++++----------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index e70586bb73..f4d9e4869f 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -20,7 +20,7 @@ limitations under the License.
     position: relative;
     display: block !important;
     // Align the padlock with unencrypted room names
-    margin-left: 6px;
+    margin: 0 4px;
 
     &::before {
         background-color: $roomtile-name-color;
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index fae9d0dfe3..a05b4c0c0e 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -76,8 +76,8 @@ limitations under the License.
     left: 60px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
-    width: 12px;
-    height: 12px;
+    width: 15px;
+    height: 15px;
 }
 
 .mx_MessageComposer_noperm_error {
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 6f0377b29c..47b8131ef0 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -21,10 +21,10 @@ limitations under the License.
     .mx_E2EIcon {
         margin: 0;
         position: absolute;
-        bottom: -1px;
-        right: -2px;
-        height: 10px;
-        width: 10px;
+        bottom: -2px;
+        right: -6px;
+        height: 15px;
+        width: 15px;
     }
 }
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index a24fdf2629..31d887cbbb 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -101,19 +101,19 @@ limitations under the License.
 // Note we match .mx_E2EIcon to make sure this matches more tightly than just
 // .mx_E2EIcon on its own
 .mx_RoomTile_e2eIcon.mx_E2EIcon {
-    height: 10px;
-    width: 10px;
+    height: 14px;
+    width: 14px;
     display: block;
     position: absolute;
-    bottom: -1px;
-    right: -2px;
+    bottom: -2px;
+    right: -5px;
     z-index: 1;
     margin: 0;
 }
 
 .mx_RoomTile_name {
     font-size: 14px;
-    padding: 0 6px;
+    padding: 0 4px;
     color: $roomtile-name-color;
     white-space: nowrap;
     overflow-x: hidden;
@@ -214,8 +214,3 @@ limitations under the License.
 .mx_GroupInviteTile .mx_RoomTile_name {
     flex: 1;
 }
-
-.mx_InviteOnlyIcon + .mx_RoomTile_nameContainer .mx_RoomTile_name {
-    // Scoot the padding in a bit from 6px to make it look better
-    padding-left: 3px;
-}

From 44bc0d9fb19bddf39d44ec1192fe1c324dee87e2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Jan 2020 15:45:36 +0100
Subject: [PATCH 0822/3235] phase is a prop now

---
 src/components/views/right_panel/VerificationPanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a34dfbfdd0..e78f20c743 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -217,7 +217,6 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onRequestChange = async () => {
-        this.forceUpdate();
         const {request} = this.props;
         const hadVerifier = this._hasVerifier;
         this._hasVerifier = !!request.verifier;

From f12fe984e5275df6df6fd42d56526f5860658ff0 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 15:00:01 +0000
Subject: [PATCH 0823/3235] Change new session toast to unverified

This also changes text to show the device ID and name in the toast.

Fixes https://github.com/vector-im/riot-web/issues/11916
---
 res/css/structures/_ToastContainer.scss       |  4 ++++
 src/DeviceListener.js                         |  8 ++++----
 ...sionToast.js => UnverifiedSessionToast.js} | 20 ++++++++++++-------
 src/i18n/strings/en_EN.json                   |  7 +++----
 4 files changed, 24 insertions(+), 15 deletions(-)
 rename src/components/views/toasts/{NewSessionToast.js => UnverifiedSessionToast.js} (76%)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 5b5c49f357..d1687743d6 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -98,5 +98,9 @@ limitations under the License.
             margin: 4px 0 11px 0;
             font-size: 12px;
         }
+
+        .mx_Toast_deviceID {
+            font-size: 10px;
+        }
     }
 }
diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 630d1a61c0..4bc6ce2097 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -21,7 +21,7 @@ import { _t } from './languageHandler';
 import ToastStore from './stores/ToastStore';
 
 function toastKey(deviceId) {
-    return 'newsession_' + deviceId;
+    return 'unverified_session_' + deviceId;
 }
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
@@ -160,10 +160,10 @@ export default class DeviceListener {
                 this._activeNagToasts.add(device.deviceId);
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: toastKey(device.deviceId),
-                    title: _t("New Session"),
+                    title: _t("Unverified session"),
                     icon: "verification_warning",
-                    props: {deviceId: device.deviceId},
-                    component: sdk.getComponent("toasts.NewSessionToast"),
+                    props: { device },
+                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
                 });
                 newActiveToasts.add(device.deviceId);
             }
diff --git a/src/components/views/toasts/NewSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
similarity index 76%
rename from src/components/views/toasts/NewSessionToast.js
rename to src/components/views/toasts/UnverifiedSessionToast.js
index 80564f3494..cf982741a1 100644
--- a/src/components/views/toasts/NewSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -24,11 +24,11 @@ import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
 import FormButton from '../elements/FormButton';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
 
-@replaceableComponent("views.toasts.VerifySessionToast")
-export default class VerifySessionToast extends React.PureComponent {
+@replaceableComponent("views.toasts.UnverifiedSessionToast")
+export default class UnverifiedSessionToast extends React.PureComponent {
     static propTypes = {
         toastKey: PropTypes.string.isRequired,
-        deviceId: PropTypes.string,
+        device: PropTypes.object.isRequired,
     };
 
     _onLaterClick = () => {
@@ -36,9 +36,7 @@ export default class VerifySessionToast extends React.PureComponent {
     };
 
     _onReviewClick = async () => {
-        const cli = MatrixClientPeg.get();
-
-        const device = await cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+        const { device } = this.props;
 
         Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
             userId: MatrixClientPeg.get().getUserId(),
@@ -47,8 +45,16 @@ export default class VerifySessionToast extends React.PureComponent {
     };
 
     render() {
+        const { device } = this.props;
+
         return (<div>
-            <div className="mx_Toast_description">{_t("Review & verify your new session")}</div>
+            <div className="mx_Toast_description">
+                <span className="mx_Toast_deviceName">
+                    {device.getDisplayName()}
+                </span> <span className="mx_Toast_deviceID">
+                    ({device.deviceId})
+                </span>
+            </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
                 <FormButton label={_t("Review")} onClick={this._onReviewClick} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3ae0991f16..c064c7c8fd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -91,7 +91,7 @@
     "Verify this session": "Verify this session",
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
-    "New Session": "New Session",
+    "Unverified session": "Unverified session",
     "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",
@@ -516,13 +516,12 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Review & verify your new session": "Review & verify your new session",
-    "Later": "Later",
-    "Review": "Review",
     "Verify your other devices easier": "Verify your other devices easier",
     "Other users may not trust it": "Other users may not trust it",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
+    "Later": "Later",
+    "Review": "Review",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Upload": "Upload",

From 00fa7cce57498d0c2ab1963f75029baa4ff5956e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Jan 2020 15:02:52 +0000
Subject: [PATCH 0824/3235] Appease the linter

---
 src/MatrixClientPeg.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index db99f38738..98fcc85d60 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -218,7 +218,11 @@ class _MatrixClientPeg {
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
-            verificationMethods: [verificationMethods.SAS, SHOW_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE],
+            verificationMethods: [
+                verificationMethods.SAS,
+                SHOW_QR_CODE_METHOD,
+                verificationMethods.RECIPROCATE_QR_CODE,
+            ],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
         };

From b96ad4a4f09b6edfebf279a6d4ebda65dd04ebdd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Jan 2020 15:07:43 +0000
Subject: [PATCH 0825/3235] Don't peek until the matrix client is ready

When the client loaded, we'd load the room view which would try to
get a room object from the client, fail because the client wasn't
ready, think it's because the user wasn't joined to the room and
start peeking instead.

Coupled with the bug fixed by https://github.com/matrix-org/matrix-js-sdk/pull/1188
this would have caused https://github.com/vector-im/riot-web/issues/11120
---
 src/stores/RoomViewStore.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index d9204193e4..9bcc2815e6 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -46,6 +46,7 @@ const INITIAL_STATE = {
     forwardingEvent: null,
 
     quotingEvent: null,
+    matrixClientIsReady: false,
 };
 
 /**
@@ -59,6 +60,9 @@ class RoomViewStore extends Store {
 
         // Initialise state
         this._state = INITIAL_STATE;
+        if (MatrixClientPeg.get()) {
+            this._state.matrixClientIsReady = MatrixClientPeg.get().isInitialSyncComplete();
+        }
     }
 
     _setState(newState) {
@@ -136,6 +140,11 @@ class RoomViewStore extends Store {
                 }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
                 break;
             }
+            case 'sync_state':
+                this._setState({
+                    matrixClientIsReady: MatrixClientPeg.get().isInitialSyncComplete(),
+                });
+                break;
         }
     }
 
@@ -350,7 +359,7 @@ class RoomViewStore extends Store {
     }
 
     shouldPeek() {
-        return this._state.shouldPeek;
+        return this._state.shouldPeek && this._state.matrixClientIsReady;
     }
 }
 

From b5914f5c2bb7ee2f44440d78e16d8607ea75d1e9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 15:14:56 +0000
Subject: [PATCH 0826/3235] Fix later button

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

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index cf982741a1..15cf18f47d 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -32,7 +32,8 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissVerification(this.props.deviceId);
+        const { device } = this.props;
+        DeviceListener.sharedInstance().dismissVerification(device.deviceId);
     };
 
     _onReviewClick = async () => {

From 81ee27f41e07234c3b84a7e801861e7d18ee22c9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 15:48:25 +0000
Subject: [PATCH 0827/3235] Replace device with session in UI text

This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
---
 src/Analytics.js                              |   2 +-
 src/CallHandler.js                            |   2 +-
 src/Lifecycle.js                              |   2 +-
 src/SlashCommands.js                          |  12 +-
 .../views/dialogs/EncryptedEventDialog.js     |   2 +-
 .../keybackup/CreateKeyBackupDialog.js        |   2 +-
 .../keybackup/NewRecoveryMethodDialog.js      |   2 +-
 .../keybackup/RecoveryMethodRemovedDialog.js  |   4 +-
 .../CreateSecretStorageDialog.js              |   8 +-
 src/components/structures/RoomStatusBar.js    |   6 +-
 src/components/structures/RoomView.js         |   2 +-
 .../structures/auth/CompleteSecurity.js       |   2 +-
 .../structures/auth/ForgotPassword.js         |   8 +-
 src/components/structures/auth/SoftLogout.js  |   8 +-
 .../views/dialogs/ConfirmWipeDeviceDialog.js  |   4 +-
 .../views/dialogs/DeviceVerifyDialog.js       |  18 +-
 .../views/dialogs/IncomingSasDialog.js        |   6 +-
 .../views/dialogs/KeyShareDialog.js           |   8 +-
 src/components/views/dialogs/LogoutDialog.js  |   2 +-
 .../views/dialogs/SetPasswordDialog.js        |   4 +-
 .../views/dialogs/UnknownDeviceDialog.js      |  12 +-
 .../AccessSecretStorageDialog.js              |   4 +-
 .../views/right_panel/EncryptionInfo.js       |   2 +-
 .../views/right_panel/EncryptionPanel.js      |   2 +-
 src/components/views/right_panel/UserInfo.js  |   2 +-
 src/components/views/rooms/E2EIcon.js         |  16 +-
 src/components/views/rooms/EventTile.js       |  14 +-
 src/components/views/rooms/MemberInfo.js      |   8 +-
 .../views/rooms/RoomRecoveryReminder.js       |   2 +-
 .../views/settings/ChangePassword.js          |   2 +-
 .../views/settings/CrossSigningPanel.js       |   4 +-
 src/components/views/settings/DevicesPanel.js |  10 +-
 .../views/settings/DevicesPanelEntry.js       |   2 +-
 .../views/settings/KeyBackupPanel.js          |  32 +--
 .../views/settings/Notifications.js           |   4 +-
 .../tabs/user/GeneralUserSettingsTab.js       |   2 +-
 .../tabs/user/SecurityUserSettingsTab.js      |   8 +-
 .../views/toasts/SetupEncryptionToast.js      |   2 +-
 src/i18n/strings/en_EN.json                   | 191 +++++++++---------
 src/settings/Settings.js                      |   6 +-
 40 files changed, 214 insertions(+), 215 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index d0c7a52814..6ec50cc25f 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -272,7 +272,7 @@ class Analytics {
                 ),
             },
             { expl: _td('Your User Agent'), value: navigator.userAgent },
-            { expl: _td('Your device resolution'), value: resolution },
+            { expl: _td('Your session resolution'), value: resolution },
         ];
 
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 33e15d3cc9..1551b57313 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -139,7 +139,7 @@ function _setCallListeners(call) {
             Modal.createTrackedDialog('Call Failed', '', QuestionDialog, {
                 title: _t('Call Failed'),
                 description: _t(
-                    "There are unknown devices in this room: "+
+                    "There are unknown sessions in this room: "+
                     "if you proceed without verifying them, it will be "+
                     "possible for someone to eavesdrop on your call.",
                 ),
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 7488488dd8..303bae42b1 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -378,7 +378,7 @@ export function hydrateSession(credentials) {
 
     const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
     if (overwrite) {
-        console.warn("Clearing all data: Old session belongs to a different user/device");
+        console.warn("Clearing all data: Old session belongs to a different user/session");
     }
 
     return _doSetLoggedIn(credentials, overwrite);
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 2eb34576ac..b39b8fb9ac 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -771,7 +771,7 @@ export const CommandMap = {
     verify: new Command({
         name: 'verify',
         args: '<user-id> <device-id> <device-signing-key>',
-        description: _td('Verifies a user, device, and pubkey tuple'),
+        description: _td('Verifies a user, session, and pubkey tuple'),
         runFn: function(roomId, args) {
             if (args) {
                 const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
@@ -785,22 +785,22 @@ export const CommandMap = {
                     return success((async () => {
                         const device = await cli.getStoredDevice(userId, deviceId);
                         if (!device) {
-                            throw new Error(_t('Unknown (user, device) pair:') + ` (${userId}, ${deviceId})`);
+                            throw new Error(_t('Unknown (user, session) pair:') + ` (${userId}, ${deviceId})`);
                         }
                         const deviceTrust = await cli.checkDeviceTrust(userId, deviceId);
 
                         if (deviceTrust.isVerified()) {
                             if (device.getFingerprint() === fingerprint) {
-                                throw new Error(_t('Device already verified!'));
+                                throw new Error(_t('Session already verified!'));
                             } else {
-                                throw new Error(_t('WARNING: Device already verified, but keys do NOT MATCH!'));
+                                throw new Error(_t('WARNING: Session already verified, but keys do NOT MATCH!'));
                             }
                         }
 
                         if (device.getFingerprint() !== fingerprint) {
                             const fprint = device.getFingerprint();
                             throw new Error(
-                                _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' +
+                                _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session' +
                                     ' %(deviceId)s is "%(fprint)s" which does not match the provided key ' +
                                     '"%(fingerprint)s". This could mean your communications are being intercepted!',
                                     {
@@ -821,7 +821,7 @@ export const CommandMap = {
                                 <p>
                                     {
                                         _t('The signing key you provided matches the signing key you received ' +
-                                            'from %(userId)s\'s device %(deviceId)s. Device marked as verified.',
+                                            'from %(userId)s\'s session %(deviceId)s. Session marked as verified.',
                                             {userId, deviceId})
                                     }
                                 </p>
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index f6e17b1c84..b602cf60fe 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -191,7 +191,7 @@ export default createReactClass({
                     <h4>{ _t('Event information') }</h4>
                     { this._renderEventInfo() }
 
-                    <h4>{ _t('Sender device information') }</h4>
+                    <h4>{ _t('Sender session information') }</h4>
                     { this._renderDeviceInfo() }
                 </div>
                 <div className="mx_Dialog_buttons">
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 8940239cfd..09abb2677d 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -495,7 +495,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         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 session.",
             )}
             <DialogButtons primaryButton={_t('Set up Secure Message Recovery')}
                 onPrimaryButtonClick={this._onSetUpClick}
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 559d972f24..6588ff5191 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -73,7 +73,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
             content = <div>
                 {newMethodDetected}
                 <p>{_t(
-                    "This device is encrypting history using the new recovery method.",
+                    "This session is encrypting history using the new recovery method.",
                 )}</p>
                 {hackWarning}
                 <DialogButtons
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 9dfc3e73ed..c5222dafd5 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -55,12 +55,12 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This device has detected that your recovery passphrase and key " +
+                        "This session has detected that your recovery passphrase and key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
                         "If you did this accidentally, you can setup Secure Messages on " +
-                        "this device which will re-encrypt this device's message " +
+                        "this session which will re-encrypt this session's message " +
                         "history with a new recovery method.",
                     )}</p>
                     <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 4068f72217..c3b74381ff 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -424,7 +424,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <form onSubmit={this._onMigrateFormSubmit}>
             <p>{_t(
-                "Upgrade this device to allow it to verify other devices, " +
+                "Upgrade this session to allow it to verify other sessions, " +
                 "granting them access to encrypted messages and marking them " +
                 "as trusted for other users.",
             )}</p>
@@ -471,7 +471,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <div>
             <p>{_t(
-                "Set up encryption on this device to allow it to verify other devices, " +
+                "Set up encryption on this session to allow it to verify other sessions, " +
                 "granting them access to encrypted messages and marking them as trusted for other users.",
             )}</p>
             <p>{_t(
@@ -665,7 +665,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(
-                "This device can now verify other devices, granting them access " +
+                "This session can now verify other sessions, granting them access " +
                 "to encrypted messages and marking them as trusted for other users.",
             )}</p>
             <p>{_t(
@@ -682,7 +682,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             {_t(
-                "Without completing security on this device, it won’t have " +
+                "Without completing security on this session, it won’t have " +
                 "access to encrypted messages.",
         )}
             <DialogButtons primaryButton={_t('Go back')}
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index d9ce032ba8..13b73ec02b 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -220,12 +220,12 @@ export default createReactClass({
         });
 
         if (hasUDE) {
-            title = _t("Message not sent due to unknown devices being present");
+            title = _t("Message not sent due to unknown sessions being present");
             content = _t(
-                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+                "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
                 {},
                 {
-                    'showDevicesText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,
+                    'showSessionsText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,
                     'sendAnywayText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="sendAnyway" onClick={this._onSendWithoutVerifyingClick}>{ sub }</a>,
                     'cancelText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this._onCancelAllClick}>{ sub }</a>,
                 },
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 2d669f9243..24eaa7a410 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -820,7 +820,7 @@ export default createReactClass({
                 this.setState({
                     e2eStatus: "warning",
                 });
-                debuglog("e2e status set to warning as not all users trust all of their devices." +
+                debuglog("e2e status set to warning as not all users trust all of their sessions." +
                          " Aborted on user", userId);
                 return;
             }
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 0f30d9cf61..66834deb2c 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -197,7 +197,7 @@ export default class CompleteSecurity extends React.Component {
             body = (
                 <div>
                     <p>{_t(
-                        "Without completing security on this device, it won’t have " +
+                        "Without completing security on this session, it won’t have " +
                         "access to encrypted messages.",
                     )}</p>
                     <div className="mx_CompleteSecurity_actionRow">
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 4576067caa..0fc4a9af1e 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -152,8 +152,8 @@ export default createReactClass({
                     <div>
                         { _t(
                             "Changing your password will reset any end-to-end encryption keys " +
-                            "on all of your devices, making encrypted chat history unreadable. Set up " +
-                            "Key Backup or export your room keys from another device before resetting your " +
+                            "on all of your sessions, making encrypted chat history unreadable. Set up " +
+                            "Key Backup or export your room keys from another session before resetting your " +
                             "password.",
                         ) }
                     </div>,
@@ -358,9 +358,9 @@ export default createReactClass({
         return <div>
             <p>{_t("Your password has been reset.")}</p>
             <p>{_t(
-                "You have been logged out of all devices and will no longer receive " +
+                "You have been logged out of all sessions and will no longer receive " +
                 "push notifications. To re-enable notifications, sign in again on each " +
-                "device.",
+                "session.",
             )}</p>
             <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
                 value={_t('Return to login screen')} />
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 40800ad907..06838798c7 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -83,7 +83,7 @@ export default class SoftLogout extends React.Component {
             onFinished: (wipeData) => {
                 if (!wipeData) return;
 
-                console.log("Clearing data from soft-logged-out device");
+                console.log("Clearing data from soft-logged-out session");
                 Lifecycle.logout();
             },
         });
@@ -212,8 +212,8 @@ export default class SoftLogout extends React.Component {
         let introText = null; // null is translated to something area specific in this function
         if (this.state.keyBackupNeeded) {
             introText = _t(
-                "Regain access to your account and recover encryption keys stored on this device. " +
-                "Without them, you won’t be able to read all of your secure messages on any device.");
+                "Regain access to your account and recover encryption keys stored on this session. " +
+                "Without them, you won’t be able to read all of your secure messages on any session.");
         }
 
         if (this.state.loginView === LOGIN_VIEW.PASSWORD) {
@@ -306,7 +306,7 @@ export default class SoftLogout extends React.Component {
                     <p>
                         {_t(
                             "Warning: Your personal data (including encryption keys) is still stored " +
-                            "on this device. Clear it if you're finished using this device, or want to sign " +
+                            "on this session. Clear it if you're finished using this session, or want to sign " +
                             "in to another account.",
                         )}
                     </p>
diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
index 49b558976a..2672d3e0f2 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
@@ -39,11 +39,11 @@ export default class ConfirmWipeDeviceDialog extends React.Component {
         return (
             <BaseDialog className='mx_ConfirmWipeDeviceDialog' hasCancel={true}
                         onFinished={this.props.onFinished}
-                        title={_t("Clear all data on this device?")}>
+                        title={_t("Clear all data on this session?")}>
                 <div className='mx_ConfirmWipeDeviceDialog_content'>
                     <p>
                         {_t(
-                            "Clearing all data from this device is permanent. Encrypted messages will be lost " +
+                            "Clearing all data from this session is permanent. Encrypted messages will be lost " +
                             "unless their keys have been backed up.",
                         )}
                     </p>
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index f2368ad795..89cf449eba 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -172,7 +172,7 @@ export default class DeviceVerifyDialog extends React.Component {
         const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
         return (
             <BaseDialog
-                title={_t("Verify device")}
+                title={_t("Verify session")}
                 onFinished={this._onCancelClick}
             >
                 {body}
@@ -262,12 +262,12 @@ export default class DeviceVerifyDialog extends React.Component {
 
         let text;
         if (MatrixClientPeg.get().getUserId() === this.props.userId) {
-            text = _t("To verify that this device can be trusted, please check that the key you see " +
+            text = _t("To verify that this session can be trusted, please check that the key you see " +
                 "in User Settings on that device matches the key below:");
         } else {
-            text = _t("To verify that this device can be trusted, please contact its owner using some other " +
+            text = _t("To verify that this session 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:");
+                "for this session matches the key below:");
         }
 
         const key = FormattingUtils.formatCryptoKey(this.props.device.getFingerprint());
@@ -283,14 +283,14 @@ export default class DeviceVerifyDialog extends React.Component {
                 </p>
                 <div className="mx_DeviceVerifyDialog_cryptoSection">
                     <ul>
-                        <li><label>{ _t("Device name") }:</label> <span>{ this.props.device.getDisplayName() }</span></li>
-                        <li><label>{ _t("Device ID") }:</label> <span><code>{ this.props.device.deviceId }</code></span></li>
-                        <li><label>{ _t("Device key") }:</label> <span><code><b>{ key }</b></code></span></li>
+                        <li><label>{ _t("Session name") }:</label> <span>{ this.props.device.getDisplayName() }</span></li>
+                        <li><label>{ _t("Session ID") }:</label> <span><code>{ this.props.device.deviceId }</code></span></li>
+                        <li><label>{ _t("Session key") }:</label> <span><code><b>{ key }</b></code></span></li>
                     </ul>
                 </div>
                 <p>
                     { _t("If it matches, press the verify button below. " +
-                        "If it doesn't, then someone else is intercepting this device " +
+                        "If it doesn't, then someone else is intercepting this session " +
                         "and you probably want to press the blacklist button instead.") }
                 </p>
             </div>
@@ -298,7 +298,7 @@ export default class DeviceVerifyDialog extends React.Component {
 
         return (
             <QuestionDialog
-                title={_t("Verify device")}
+                title={_t("Verify session")}
                 description={body}
                 button={_t("I verify that the keys match")}
                 onFinished={this._onLegacyFinished}
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 76323b55ad..daaa1aff55 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -157,10 +157,10 @@ export default class IncomingSasDialog extends React.Component {
                     "end-to-end encrypted messages.",
                 )}</p>
                 <p>{_t(
-                    // NB. Below wording adjusted to singular 'device' until we have
+                    // NB. Below wording adjusted to singular 'session' until we have
                     // cross-signing
-                    "Verifying this user will mark their device as trusted, and " +
-                    "also mark your device as trusted to them.",
+                    "Verifying this user will mark their session as trusted, and " +
+                    "also mark your session as trusted to them.",
                 )}</p>
                 <DialogButtons
                     primaryButton={_t('Continue')}
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index 507f8b4678..8ef36bb59f 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -60,7 +60,7 @@ export default createReactClass({
             const deviceInfo = r[userId][deviceId];
 
             if (!deviceInfo) {
-                console.warn(`No details found for device ${userId}:${deviceId}`);
+                console.warn(`No details found for session ${userId}:${deviceId}`);
 
                 this.props.onFinished(false);
                 return;
@@ -121,10 +121,10 @@ export default createReactClass({
 
         let text;
         if (this.state.wasNewDevice) {
-            text = _td("You added a new device '%(displayName)s', which is"
+            text = _td("You added a new session '%(displayName)s', which is"
                 + " requesting encryption keys.");
         } else {
-            text = _td("Your unverified device '%(displayName)s' is requesting"
+            text = _td("Your unverified session '%(displayName)s' is requesting"
                 + " encryption keys.");
         }
         text = _t(text, {displayName: displayName});
@@ -159,7 +159,7 @@ export default createReactClass({
         } else {
             content = (
                 <div id='mx_Dialog_content'>
-                    <p>{ _t('Loading device info...') }</p>
+                    <p>{ _t('Loading session info...') }</p>
                     <Spinner />
                 </div>
             );
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index a27ab6079b..fed1310469 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -138,7 +138,7 @@ export default class LogoutDialog extends React.Component {
                 const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
                 let setupButtonCaption;
                 if (this.state.backupInfo) {
-                    setupButtonCaption = _t("Connect this device to Key Backup");
+                    setupButtonCaption = _t("Connect this session to Key Backup");
                 } else {
                     // if there's an error fetching the backup info, we'll just assume there's
                     // no backup for the purpose of the button caption
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index c8752afa6c..3797957568 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -29,7 +29,7 @@ const WarmFuzzy = function(props) {
     if (props.didSetEmail) {
         title = _t('You have successfully set a password and an email address!');
     }
-    const advice = _t('You can now return to your account after signing out, and sign in on other devices.');
+    const advice = _t('You can now return to your account after signing out, and sign in on other sessions.');
     let extraAdvice = null;
     if (!props.didSetEmail) {
         extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.');
@@ -114,7 +114,7 @@ export default createReactClass({
             >
                 <div className="mx_Dialog_content">
                     <p>
-                        { _t('This will allow you to return to your account after signing out, and sign in on other devices.') }
+                        { _t('This will allow you to return to your account after signing out, and sign in on other sessions.') }
                     </p>
                     <ChangePassword
                         className="mx_SetPasswordDialog_change_password"
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index c70383061d..d58961f964 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -132,8 +132,8 @@ export default createReactClass({
         if (SettingsStore.getValue("blacklistUnverifiedDevices", this.props.room.roomId)) {
             warning = (
                 <h4>
-                    { _t("You are currently blacklisting unverified devices; to send " +
-                    "messages to these devices you must verify them.") }
+                    { _t("You are currently blacklisting unverified sessions; to send " +
+                    "messages to these sessions you must verify them.") }
                 </h4>
             );
         } else {
@@ -141,7 +141,7 @@ export default createReactClass({
                 <div>
                     <p>
                         { _t("We recommend you go through the verification process " +
-                            "for each device to confirm they belong to their legitimate owner, " +
+                            "for each session to confirm they belong to their legitimate owner, " +
                             "but you can resend the message without verifying if you prefer.") }
                     </p>
                 </div>
@@ -165,15 +165,15 @@ export default createReactClass({
         return (
             <BaseDialog className='mx_UnknownDeviceDialog'
                 onFinished={this.props.onFinished}
-                title={_t('Room contains unknown devices')}
+                title={_t('Room contains unknown sessions')}
                 contentId='mx_Dialog_content'
             >
                 <GeminiScrollbarWrapper autoshow={false} className="mx_Dialog_content" id='mx_Dialog_content'>
                     <h4>
-                        { _t('"%(RoomName)s" contains devices that you haven\'t seen before.', {RoomName: this.props.room.name}) }
+                        { _t('"%(RoomName)s" contains sessions that you haven\'t seen before.', {RoomName: this.props.room.name}) }
                     </h4>
                     { warning }
-                    { _t("Unknown devices") }:
+                    { _t("Unknown sessions") }:
 
                     <UnknownDeviceList devices={this.props.devices} />
                 </GeminiScrollbarWrapper>
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index c976eb81d0..08d9f8dd5e 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -146,7 +146,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and your cross-signing " +
-                    "identity for verifying other devices by entering your passphrase.",
+                    "identity for verifying other sessions by entering your passphrase.",
                 )}</p>
 
                 <div className="mx_AccessSecretStorageDialog_primaryContainer">
@@ -218,7 +218,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and your cross-signing " +
-                    "identity for verifying other devices by entering your recovery key.",
+                    "identity for verifying other sessions by entering your recovery key.",
                 )}</p>
 
                 <div className="mx_AccessSecretStorageDialog_primaryContainer">
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 299e553769..040b0a7929 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -55,7 +55,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
         <div className="mx_UserInfo_container">
             <h3>{_t("Verify User")}</h3>
             <div>
-                <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
+                <p>{_t("For extra security, verify this user by checking a one-time code on both of your sessions.")}</p>
                 <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
                 { content }
             </div>
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 4e147bd7a5..6819db8e55 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -50,7 +50,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
                         <li>{_t("Your homeserver")}</li>
                         <li>{_t("The homeserver the user you’re verifying is connected to")}</li>
                         <li>{_t("Yours, or the other users’ internet connection")}</li>
-                        <li>{_t("Yours, or the other users’ device")}</li>
+                        <li>{_t("Yours, or the other users’ session")}</li>
                     </ul>
                 </div>,
                 onFinished: onClose,
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index f189380eac..5a5d9a577c 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -208,7 +208,7 @@ function DevicesSection({devices, userId, loading}) {
         return <Spinner />;
     }
     if (devices === null) {
-        return _t("Unable to load device list");
+        return _t("Unable to load session list");
     }
     const isMe = userId === cli.getUserId();
     const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index df5fe204d4..ade44aa7c8 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -32,23 +32,23 @@ export const E2E_STATE = {
 };
 
 const crossSigningUserTitles = {
-    [E2E_STATE.WARNING]: _td("This user has not verified all of their devices."),
-    [E2E_STATE.NORMAL]: _td("You have not verified this user. This user has verified all of their devices."),
-    [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their devices."),
+    [E2E_STATE.WARNING]: _td("This user has not verified all of their sessions."),
+    [E2E_STATE.NORMAL]: _td("You have not verified this user. This user has verified all of their sessions."),
+    [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their sessions."),
 };
 const crossSigningRoomTitles = {
-    [E2E_STATE.WARNING]: _td("Someone is using an unknown device"),
+    [E2E_STATE.WARNING]: _td("Someone is using an unknown session"),
     [E2E_STATE.NORMAL]: _td("This room is end-to-end encrypted"),
     [E2E_STATE.VERIFIED]: _td("Everyone in this room is verified"),
 };
 
 const legacyUserTitles = {
-    [E2E_STATE.WARNING]: _td("Some devices for this user are not trusted"),
-    [E2E_STATE.VERIFIED]: _td("All devices for this user are trusted"),
+    [E2E_STATE.WARNING]: _td("Some sessions for this user are not trusted"),
+    [E2E_STATE.VERIFIED]: _td("All sessions for this user are trusted"),
 };
 const legacyRoomTitles = {
-    [E2E_STATE.WARNING]: _td("Some devices in this encrypted room are not trusted"),
-    [E2E_STATE.VERIFIED]: _td("All devices in this encrypted room are trusted"),
+    [E2E_STATE.WARNING]: _td("Some sessions in this encrypted room are not trusted"),
+    [E2E_STATE.VERIFIED]: _td("All sessions in this encrypted room are trusted"),
 };
 
 const E2EIcon = ({isUser, status, className, size, onClick}) => {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 7d07e03b58..a8e9c7bf81 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -733,15 +733,15 @@ export default createReactClass({
             <div className="mx_EventTile_keyRequestInfo_tooltip_contents">
                 <p>
                     { this.state.previouslyRequestedKeys ?
-                        _t( 'Your key share request has been sent - please check your other devices ' +
+                        _t( 'Your key share request has been sent - please check your other sessions ' +
                             'for key share requests.') :
-                        _t( 'Key share requests are sent to your other devices automatically. If you ' +
-                            'rejected or dismissed the key share request on your other devices, click ' +
+                        _t( 'Key share requests are sent to your other sessions automatically. If you ' +
+                            'rejected or dismissed the key share request on your other sessions, click ' +
                             'here to request the keys for this session again.')
                     }
                 </p>
                 <p>
-                    { _t( 'If your other devices do not have the key for this message you will not ' +
+                    { _t( 'If your other sessions do not have the key for this message you will not ' +
                             'be able to decrypt them.')
                     }
                 </p>
@@ -749,7 +749,7 @@ export default createReactClass({
         const keyRequestInfoContent = this.state.previouslyRequestedKeys ?
             _t('Key request sent.') :
             _t(
-                '<requestLink>Re-request encryption keys</requestLink> from your other devices.',
+                '<requestLink>Re-request encryption keys</requestLink> from your other sessions.',
                 {},
                 {'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a>},
             );
@@ -938,7 +938,7 @@ function E2ePadlockUndecryptable(props) {
 
 function E2ePadlockUnverified(props) {
     return (
-        <E2ePadlock title={_t("Encrypted by an unverified device")} icon="unverified" {...props} />
+        <E2ePadlock title={_t("Encrypted by an unverified session")} icon="unverified" {...props} />
     );
 }
 
@@ -950,7 +950,7 @@ function E2ePadlockUnencrypted(props) {
 
 function E2ePadlockUnknown(props) {
     return (
-        <E2ePadlock title={_t("Encrypted by a deleted device")} icon="unknown" {...props} />
+        <E2ePadlock title={_t("Encrypted by a deleted session")} icon="unknown" {...props} />
     );
 }
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 7c77c546b6..7c187bd17a 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -260,7 +260,7 @@ export default createReactClass({
                 e2eStatus: self._getE2EStatus(devices),
             });
         }, function(err) {
-            console.log("Error downloading devices", err);
+            console.log("Error downloading sessions", err);
             self.setState({devicesLoading: false});
         });
     },
@@ -766,9 +766,9 @@ export default createReactClass({
             // still loading
             devComponents = <Spinner />;
         } else if (devices === null) {
-            devComponents = _t("Unable to load device list");
+            devComponents = _t("Unable to load session list");
         } else if (devices.length === 0) {
-            devComponents = _t("No devices with registered encryption keys");
+            devComponents = _t("No sessions with registered encryption keys");
         } else {
             devComponents = [];
             for (let i = 0; i < devices.length; i++) {
@@ -780,7 +780,7 @@ export default createReactClass({
 
         return (
             <div>
-                <h3>{ _t("Devices") }</h3>
+                <h3>{ _t("Sessions") }</h3>
                 <div className="mx_MemberInfo_devices">
                     { devComponents }
                 </div>
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 6ce5e8153a..50521cdd37 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -124,7 +124,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
 
         let setupCaption;
         if (this.state.backupInfo) {
-            setupCaption = _t("Connect this device to Key Backup");
+            setupCaption = _t("Connect this session to Key Backup");
         } else {
             setupCaption = _t("Start using Key Backup");
         }
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 2d8c4c4178..291313a463 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -113,7 +113,7 @@ export default createReactClass({
             description:
                 <div>
                     { _t(
-                        'Changing password will currently reset any end-to-end encryption keys on all devices, ' +
+                        'Changing password will currently reset any end-to-end encryption keys on all sessions, ' +
                         'making encrypted chat history unreadable, unless you first export your room keys ' +
                         'and re-import them afterwards. ' +
                         'In future this will be improved.',
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index f7d3d62b4f..f99968c44f 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -127,7 +127,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         } else if (crossSigningPrivateKeysInStorage) {
             summarisedStatus = <p>{_t(
                 "Your account has a cross-signing identity in secret storage, but it " +
-                "is not yet trusted by this device.",
+                "is not yet trusted by this session.",
             )}</p>;
         } else {
             summarisedStatus = <p>{_t(
@@ -152,7 +152,7 @@ export default class CrossSigningPanel extends React.PureComponent {
                     <table className="mx_CrossSigningPanel_statusList"><tbody>
                         <tr>
                             <td>{_t("Cross-signing public keys:")}</td>
-                            <td>{crossSigningPublicKeysOnDevice ? _t("on device") : _t("not found")}</td>
+                            <td>{crossSigningPublicKeysOnDevice ? _t("in memory") : _t("not found")}</td>
                         </tr>
                         <tr>
                             <td>{_t("Cross-signing private keys:")}</td>
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 2f5262c75a..2120801a81 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -62,10 +62,10 @@ export default class DevicesPanel extends React.Component {
                 let errtxt;
                 if (error.httpStatus == 404) {
                     // 404 probably means the HS doesn't yet support the API.
-                    errtxt = _t("Your homeserver does not support device management.");
+                    errtxt = _t("Your homeserver does not support session management.");
                 } else {
-                    console.error("Error loading devices:", error);
-                    errtxt = _t("Unable to load device list");
+                    console.error("Error loading sessions:", error);
+                    errtxt = _t("Unable to load session list");
                 }
                 this.setState({deviceLoadError: errtxt});
             },
@@ -130,7 +130,7 @@ export default class DevicesPanel extends React.Component {
                 makeRequest: this._makeDeleteRequest.bind(this),
             });
         }).catch((e) => {
-            console.error("Error deleting devices", e);
+            console.error("Error deleting sessions", e);
             if (this._unmounted) { return; }
         }).finally(() => {
             this.setState({
@@ -188,7 +188,7 @@ export default class DevicesPanel extends React.Component {
         const deleteButton = this.state.deleting ?
             <Spinner w={22} h={22} /> :
             <AccessibleButton onClick={this._onDeleteClick} kind="danger_sm">
-               { _t("Delete %(count)s devices", {count: this.state.selectedDevices.length}) }
+               { _t("Delete %(count)s sessions", {count: this.state.selectedDevices.length}) }
             </AccessibleButton>;
 
         const classes = classNames(this.props.className, "mx_DevicesPanel");
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index d9da697e78..ff3c318a92 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -40,7 +40,7 @@ export default class DevicesPanelEntry extends React.Component {
         return MatrixClientPeg.get().setDeviceDetails(device.device_id, {
             display_name: value,
         }).catch((e) => {
-            console.error("Error setting device display name", e);
+            console.error("Error setting session display name", e);
             throw new Error(_t("Failed to set display name"));
         });
     }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index fd166782d8..f3fe171e63 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -186,23 +186,23 @@ export default class KeyBackupPanel extends React.PureComponent {
             if (MatrixClientPeg.get().getKeyBackupEnabled()) {
                 clientBackupStatus = <div>
                     <p>{encryptedMessageAreEncrypted}</p>
-                    <p>✅ {_t("This device is backing up your keys. ")}</p>
+                    <p>✅ {_t("This session is backing up your keys. ")}</p>
                 </div>;
             } else {
                 clientBackupStatus = <div>
                     <p>{encryptedMessageAreEncrypted}</p>
                     <p>{_t(
-                        "This device is <b>not backing up your keys</b>, " +
+                        "This session is <b>not backing up your keys</b>, " +
                         "but you do have an existing backup you can restore from " +
                         "and add to going forward.", {},
                         {b: sub => <b>{sub}</b>},
                     )}</p>
                     <p>{_t(
-                        "Connect this device to key backup before signing out to avoid " +
-                        "losing any keys that may only be on this device.",
+                        "Connect this session to key backup before signing out to avoid " +
+                        "losing any keys that may only be on this session.",
                     )}</p>
                 </div>;
-                restoreButtonCaption = _t("Connect this device to Key Backup");
+                restoreButtonCaption = _t("Connect this session to Key Backup");
             }
 
             let keyStatus;
@@ -264,42 +264,42 @@ export default class KeyBackupPanel extends React.PureComponent {
                     );
                 } else if (!sig.device) {
                     sigStatus = _t(
-                        "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s",
+                        "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s",
                         { deviceId: sig.deviceId }, { verify },
                     );
                 } else if (sig.valid && fromThisDevice) {
                     sigStatus = _t(
-                        "Backup has a <validity>valid</validity> signature from this device",
+                        "Backup has a <validity>valid</validity> signature from this session",
                         {}, { validity },
                     );
                 } else if (!sig.valid && fromThisDevice) {
                     // it can happen...
                     sigStatus = _t(
-                        "Backup has an <validity>invalid</validity> signature from this device",
+                        "Backup has an <validity>invalid</validity> signature from this session",
                         {}, { validity },
                     );
                 } else if (sig.valid && sig.device.isVerified()) {
                     sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
-                        "<verify>verified</verify> device <device></device>",
+                        "<verify>verified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
                 } else if (sig.valid && !sig.device.isVerified()) {
                     sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
-                        "<verify>unverified</verify> device <device></device>",
+                        "<verify>unverified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
                 } else if (!sig.valid && sig.device.isVerified()) {
                     sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
-                        "<verify>verified</verify> device <device></device>",
+                        "<verify>verified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
                 } else if (!sig.valid && !sig.device.isVerified()) {
                     sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
-                        "<verify>unverified</verify> device <device></device>",
+                        "<verify>unverified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
                 }
@@ -309,12 +309,12 @@ export default class KeyBackupPanel extends React.PureComponent {
                 </div>;
             });
             if (this.state.backupSigStatus.sigs.length === 0) {
-                backupSigStatuses = _t("Backup is not signed by any of your devices");
+                backupSigStatuses = _t("Backup is not signed by any of your sessions");
             }
 
             let trustedLocally;
             if (this.state.backupSigStatus.trusted_locally) {
-                trustedLocally = _t("This backup is trusted because it has been restored on this device");
+                trustedLocally = _t("This backup is trusted because it has been restored on this session");
             }
 
             let buttonRow = (
@@ -330,7 +330,7 @@ export default class KeyBackupPanel extends React.PureComponent {
             if (this.state.backupKeyStored && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
                 buttonRow = <p>⚠️ {_t(
                     "Backup key stored in secret storage, but this feature is not " +
-                    "enabled on this device. Please enable cross-signing in Labs to " +
+                    "enabled on this session. Please enable cross-signing in Labs to " +
                     "modify key backup state.",
                 )}</p>;
             }
@@ -352,7 +352,7 @@ export default class KeyBackupPanel extends React.PureComponent {
             return <div>
                 <div>
                     <p>{_t(
-                        "Your keys are <b>not being backed up from this device</b>.", {},
+                        "Your keys are <b>not being backed up from this session</b>.", {},
                         {b: sub => <b>{sub}</b>},
                     )}</p>
                     <p>{encryptedMessageAreEncrypted}</p>
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 3bad8ba2bd..1f4bde6eab 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -864,7 +864,7 @@ export default createReactClass({
 
                     <LabelledToggleSwitch value={SettingsStore.getValue("notificationsEnabled")}
                                           onChange={this.onEnableDesktopNotificationsChange}
-                                          label={_t('Enable desktop notifications for this device')} />
+                                          label={_t('Enable desktop notifications for this session')} />
 
                     <LabelledToggleSwitch value={SettingsStore.getValue("notificationBodyEnabled")}
                                           onChange={this.onEnableDesktopNotificationBodyChange}
@@ -872,7 +872,7 @@ export default createReactClass({
 
                     <LabelledToggleSwitch value={SettingsStore.getValue("audioNotificationsEnabled")}
                                           onChange={this.onEnableAudioNotificationsChange}
-                                          label={_t('Enable audible notifications for this device')} />
+                                          label={_t('Enable audible notifications for this session')} />
 
                     { emailNotificationsRows }
 
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 2d56df6be4..304bb6449f 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -261,7 +261,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             title: _t("Success"),
             description: _t(
                 "Your password was successfully changed. You will not receive " +
-                "push notifications on other devices until you log back in to them",
+                "push notifications on other sessions until you log back in to them",
             ) + ".",
         });
     };
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index eb5f346714..2e35a6bf6f 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -185,11 +185,11 @@ export default class SecurityUserSettingsTab extends React.Component {
                 <span className='mx_SettingsTab_subheading'>{_t("Cryptography")}</span>
                 <ul className='mx_SettingsTab_subsectionText mx_SecurityUserSettingsTab_deviceInfo'>
                     <li>
-                        <label>{_t("Device ID:")}</label>
+                        <label>{_t("Session ID:")}</label>
                         <span><code>{deviceId}</code></span>
                     </li>
                     <li>
-                        <label>{_t("Device key:")}</label>
+                        <label>{_t("Session key:")}</label>
                         <span><code><b>{identityKey}</b></code></span>
                     </li>
                 </ul>
@@ -285,9 +285,9 @@ export default class SecurityUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Devices")}</span>
+                    <span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("A device's public name is visible to people you communicate with")}
+                        {_t("A session's public name is visible to people you communicate with")}
                         <DevicesPanel />
                     </div>
                 </div>
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 841ee66ac7..31406a6ff3 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -39,7 +39,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
         switch (this.props.kind) {
             case 'set_up_encryption':
             case 'upgrade_encryption':
-                return _t('Verify your other devices easier');
+                return _t('Verify your other sessions easier');
             case 'verify_this_session':
                 return _t('Other users may not trust it');
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c45ccace7e..b745feda17 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -17,7 +17,7 @@
     "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",
+    "Your session resolution": "Your session resolution",
     "Analytics": "Analytics",
     "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.",
@@ -25,7 +25,7 @@
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
     "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.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions 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",
@@ -184,13 +184,13 @@
     "Adds a custom widget by URL to the room": "Adds a custom widget by URL to the room",
     "Please supply a https:// or http:// widget URL": "Please supply a https:// or http:// widget URL",
     "You cannot modify widgets in this room.": "You cannot modify widgets in this room.",
-    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
-    "Unknown (user, device) pair:": "Unknown (user, device) pair:",
-    "Device already verified!": "Device already verified!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "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!": "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!",
+    "Verifies a user, session, and pubkey tuple": "Verifies a user, session, and pubkey tuple",
+    "Unknown (user, session) pair:": "Unknown (user, session) pair:",
+    "Session already verified!": "Session already verified!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "WARNING: Session already verified, but keys do NOT MATCH!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
     "Verified key": "Verified key",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.",
     "Displays action": "Displays action",
     "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",
     "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
@@ -373,7 +373,7 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
@@ -398,8 +398,8 @@
     "Match system theme": "Match system theme",
     "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
     "Send analytics data": "Send analytics data",
-    "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
-    "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
+    "Never send encrypted messages to unverified sessions from this session": "Never send encrypted messages to unverified sessions from this session",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Never send encrypted messages to unverified sessions in this room from this session",
     "Enable inline URL previews by default": "Enable inline URL previews by default",
     "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",
@@ -516,7 +516,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify your other devices easier": "Verify your other devices easier",
+    "Verify your other sessions easier": "Verify your other sessions easier",
     "Other users may not trust it": "Other users may not trust it",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
@@ -538,7 +538,7 @@
     "New passwords don't match": "New passwords don't match",
     "Passwords can't be empty": "Passwords can't be empty",
     "Warning!": "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.": "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.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, 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": "Export E2E room keys",
     "Do you want to set an email address?": "Do you want to set an email address?",
     "Current password": "Current password",
@@ -547,21 +547,20 @@
     "Confirm password": "Confirm password",
     "Change Password": "Change Password",
     "Cross-signing and secret storage are enabled.": "Cross-signing and secret storage are enabled.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
     "Cross-signing public keys:": "Cross-signing public keys:",
-    "on device": "on device",
+    "in memory": "in memory",
     "not found": "not found",
     "Cross-signing private keys:": "Cross-signing private keys:",
     "in secret storage": "in secret storage",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
-    "Your homeserver does not support device management.": "Your homeserver does not support device management.",
-    "Unable to load device list": "Unable to load device list",
+    "Your homeserver does not support session management.": "Your homeserver does not support session management.",
+    "Unable to load session list": "Unable to load session list",
     "Authentication": "Authentication",
-    "Delete %(count)s devices|other": "Delete %(count)s devices",
-    "Delete %(count)s devices|one": "Delete device",
+    "Delete %(count)s sessions|other": "Delete %(count)s sessions",
     "ID": "ID",
     "Public Name": "Public Name",
     "Last seen": "Last seen",
@@ -584,30 +583,30 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
     "Unable to load key backup status": "Unable to load key backup status",
     "Restore from Backup": "Restore from Backup",
-    "This device is backing up your keys. ": "This device is backing up your keys. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.",
-    "Connect this device to Key Backup": "Connect this device to Key Backup",
+    "This session is backing up your keys. ": "This session is backing up your keys. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.",
+    "Connect this session to Key Backup": "Connect this session to Key Backup",
     "not stored": "not stored",
     "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
     "All keys backed up": "All keys backed up",
     "Backup has a <validity>valid</validity> signature from this user": "Backup has a <validity>valid</validity> signature from this user",
     "Backup has a <validity>invalid</validity> signature from this user": "Backup has a <validity>invalid</validity> signature from this user",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s",
-    "Backup has a <validity>valid</validity> signature from this device": "Backup has a <validity>valid</validity> signature from this device",
-    "Backup has an <validity>invalid</validity> signature from this device": "Backup has an <validity>invalid</validity> signature from this device",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></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",
-    "This backup is trusted because it has been restored on this device": "This backup is trusted because it has been restored on this device",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Backup has a <validity>valid</validity> signature from this session",
+    "Backup has an <validity>invalid</validity> signature from this session": "Backup has an <validity>invalid</validity> signature from this session",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>",
+    "Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
+    "This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.",
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
     "Backup key stored: ": "Backup key stored: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Your keys are <b>not being backed up from this device</b>.",
+    "Your keys are <b>not being backed up from this session</b>.": "Your keys are <b>not being backed up from this session</b>.",
     "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
     "Start using Key Backup": "Start using Key Backup",
     "Error saving email notification preferences": "Error saving email notification preferences",
@@ -631,9 +630,9 @@
     "Advanced notification settings": "Advanced notification settings",
     "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
-    "Enable desktop notifications for this device": "Enable desktop notifications for this device",
+    "Enable desktop notifications for this session": "Enable desktop notifications for this session",
     "Show message in desktop notification": "Show message in desktop notification",
-    "Enable audible notifications for this device": "Enable audible notifications for this device",
+    "Enable audible notifications for this session": "Enable audible notifications for this session",
     "Off": "Off",
     "On": "On",
     "Noisy": "Noisy",
@@ -678,7 +677,7 @@
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
@@ -763,8 +762,8 @@
     "<not supported>": "<not supported>",
     "Import E2E room keys": "Import E2E room keys",
     "Cryptography": "Cryptography",
-    "Device ID:": "Device ID:",
-    "Device key:": "Device key:",
+    "Session ID:": "Session ID:",
+    "Session key:": "Session key:",
     "Bulk options": "Bulk options",
     "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
     "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
@@ -772,8 +771,8 @@
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
-    "Devices": "Devices",
-    "A device's public name is visible to people you communicate with": "A device's public name is visible to people you communicate with",
+    "Sessions": "Sessions",
+    "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "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.": "Learn more about how we use analytics.",
@@ -898,30 +897,30 @@
     " (unsupported)": " (unsupported)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
-    "This user has not verified all of their devices.": "This user has not verified all of their devices.",
-    "You have not verified this user. This user has verified all of their devices.": "You have not verified this user. This user has verified all of their devices.",
-    "You have verified this user. This user has verified all of their devices.": "You have verified this user. This user has verified all of their devices.",
-    "Someone is using an unknown device": "Someone is using an unknown device",
+    "This user has not verified all of their sessions.": "This user has not verified all of their sessions.",
+    "You have not verified this user. This user has verified all of their sessions.": "You have not verified this user. This user has verified all of their sessions.",
+    "You have verified this user. This user has verified all of their sessions.": "You have verified this user. This user has verified all of their sessions.",
+    "Someone is using an unknown session": "Someone is using an unknown session",
     "This room is end-to-end encrypted": "This room is end-to-end encrypted",
     "Everyone in this room is verified": "Everyone in this room is verified",
-    "Some devices for this user are not trusted": "Some devices for this user are not trusted",
-    "All devices for this user are trusted": "All devices for this user are trusted",
-    "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",
-    "All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted",
+    "Some sessions for this user are not trusted": "Some sessions for this user are not trusted",
+    "All sessions for this user are trusted": "All sessions for this user are trusted",
+    "Some sessions in this encrypted room are not trusted": "Some sessions in this encrypted room are not trusted",
+    "All sessions in this encrypted room are trusted": "All sessions in this encrypted room are trusted",
     "Edit message": "Edit message",
     "This event could not be displayed": "This event could not be displayed",
     "%(senderName)s sent an image": "%(senderName)s sent an image",
     "%(senderName)s sent a video": "%(senderName)s sent a video",
     "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
-    "Your key share request has been sent - please check your other devices for key share requests.": "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.": "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.": "If your other devices do not have the key for this message you will not be able to decrypt them.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Your key share request has been sent - please check your other sessions for key share requests.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "If your other sessions do not have the key for this message you will not be able to decrypt them.",
     "Key request sent.": "Key request sent.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Re-request encryption keys</requestLink> from your other sessions.",
     "This message cannot be decrypted": "This message cannot be decrypted",
-    "Encrypted by an unverified device": "Encrypted by an unverified device",
+    "Encrypted by an unverified session": "Encrypted by an unverified session",
     "Unencrypted": "Unencrypted",
-    "Encrypted by a deleted device": "Encrypted by a deleted device",
+    "Encrypted by a deleted session": "Encrypted by a deleted session",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Invite only": "Invite only",
     "Scroll to bottom of page": "Scroll to bottom of page",
@@ -956,7 +955,7 @@
     "Failed to change power level": "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.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
     "Are you sure?": "Are you sure?",
-    "No devices with registered encryption keys": "No devices with registered encryption keys",
+    "No sessions with registered encryption keys": "No sessions with registered encryption keys",
     "Jump to read receipt": "Jump to read receipt",
     "Mention": "Mention",
     "Invite": "Invite",
@@ -1148,13 +1147,13 @@
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Verify User": "Verify User",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
+    "For extra security, verify this user by checking a one-time code on both of your sessions.": "For extra security, verify this user by checking a one-time code on both of your sessions.",
     "Your messages are not secure": "Your messages are not secure",
     "One of the following may be compromised:": "One of the following may be compromised:",
     "Your homeserver": "Your homeserver",
     "The homeserver the user you’re verifying is connected to": "The homeserver the user you’re verifying is connected to",
     "Yours, or the other users’ internet connection": "Yours, or the other users’ internet connection",
-    "Yours, or the other users’ device": "Yours, or the other users’ device",
+    "Yours, or the other users’ session": "Yours, or the other users’ session",
     "Members": "Members",
     "Files": "Files",
     "Trusted": "Trusted",
@@ -1422,8 +1421,8 @@
     "Removing…": "Removing…",
     "Confirm Removal": "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.": "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.",
-    "Clear all data on this device?": "Clear all data on this device?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.",
+    "Clear all data on this session?": "Clear all data on this session?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
     "Clear all data": "Clear all data",
     "Community IDs cannot be empty.": "Community IDs cannot be empty.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
@@ -1458,20 +1457,20 @@
     "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.": "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.",
     "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)": "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)",
     "To continue, please enter your password:": "To continue, please enter your password:",
-    "Verify device": "Verify device",
+    "Verify session": "Verify session",
     "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
     "Verify by comparing a short text string.": "Verify by comparing a short text string.",
     "Begin Verifying": "Begin Verifying",
     "Waiting for partner to accept...": "Waiting for partner to accept...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",
     "Waiting for %(userId)s to confirm...": "Waiting for %(userId)s to confirm...",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:",
-    "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:": "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:",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:",
+    "To verify that this session 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 session matches the key below:": "To verify that this session 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 session matches the key below:",
     "Use two-way text verification": "Use two-way text verification",
-    "Device name": "Device name",
-    "Device ID": "Device ID",
-    "Device key": "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.": "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.",
+    "Session name": "Session name",
+    "Session ID": "Session ID",
+    "Session key": "Session key",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.",
     "I verify that the keys match": "I verify that the keys match",
     "Back": "Back",
     "Send Custom Event": "Send Custom Event",
@@ -1490,7 +1489,7 @@
     "Developer Tools": "Developer Tools",
     "An error has occurred.": "An error has occurred.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.",
     "Waiting for partner to confirm...": "Waiting for partner to confirm...",
     "Incoming Verification Request": "Incoming Verification Request",
     "Integrations are disabled": "Integrations are disabled",
@@ -1509,12 +1508,12 @@
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
     "Start verification": "Start verification",
     "Share without verifying": "Share without verifying",
     "Ignore request": "Ignore request",
-    "Loading device info...": "Loading device info...",
+    "Loading session info...": "Loading session 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.",
@@ -1579,11 +1578,11 @@
     "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 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.",
+    "You can now return to your account after signing out, and sign in on other sessions.": "You can now return to your account after signing out, and sign in on other sessions.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Please set a password!": "Please set a password!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "This will allow you to return to your account after signing out, and sign in on other sessions.",
     "Share Room": "Share Room",
     "Link to most recent message": "Link to most recent message",
     "Share User": "Share User",
@@ -1606,11 +1605,11 @@
     "Summary": "Summary",
     "Document": "Document",
     "Next": "Next",
-    "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",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.",
+    "We recommend you go through the verification process for each session 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 session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
+    "Room contains unknown sessions": "Room contains unknown sessions",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contains sessions that you haven't seen before.",
+    "Unknown sessions": "Unknown sessions",
     "Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)",
     "Upload files": "Upload files",
     "Upload all": "Upload all",
@@ -1629,13 +1628,13 @@
     "Enter secret storage passphrase": "Enter secret storage passphrase",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Unable to access secret storage. Please verify that you entered the correct passphrase.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
     "Enter secret storage recovery key": "Enter secret storage recovery key",
     "This looks like a valid recovery key!": "This looks like a valid recovery key!",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct recovery key.",
     "Not a valid recovery key": "Not a valid recovery key",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery Key Mismatch": "Recovery Key Mismatch",
@@ -1863,8 +1862,8 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
     "Explore rooms": "Explore rooms",
-    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+    "Message not sent due to unknown sessions being present": "Message not sent due to unknown sessions being present",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</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.": "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.",
     "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.": "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.",
@@ -1912,13 +1911,13 @@
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Done": "Done",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Without completing security on this device, it won’t have access to encrypted messages.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
     "Go Back": "Go Back",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",
     "New passwords must match each other.": "New passwords must match each other.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.",
     "Your Matrix account on %(serverName)s": "Your Matrix account on %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Your Matrix account on <underlinedServerName />",
     "No identity server is configured: add one in server settings to reset your password.": "No identity server is configured: add one in server settings to reset your password.",
@@ -1928,7 +1927,7 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
     "I have verified my email address": "I have verified my email address",
     "Your password has been reset.": "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.": "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.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.",
     "Return to login screen": "Return to login screen",
     "Set a new password": "Set a new password",
     "Invalid homeserver discovery response": "Invalid homeserver discovery response",
@@ -1966,14 +1965,14 @@
     "Create your account": "Create your account",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Failed to re-authenticate": "Failed to re-authenticate",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.",
+    "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.": "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.",
     "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
     "Forgotten your password?": "Forgotten your password?",
     "Sign in and regain access to your account.": "Sign in and regain access to your account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
     "You're signed out": "You're signed out",
     "Clear personal data": "Clear personal data",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.",
+    "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.",
     "Commands": "Commands",
     "Command Autocomplete": "Command Autocomplete",
     "Community Autocomplete": "Community Autocomplete",
@@ -1991,6 +1990,7 @@
     "NOT verified": "NOT verified",
     "Blacklisted": "Blacklisted",
     "verified": "verified",
+    "Device ID": "Device ID",
     "Verification": "Verification",
     "Ed25519 fingerprint": "Ed25519 fingerprint",
     "User ID": "User ID",
@@ -2000,9 +2000,8 @@
     "Algorithm": "Algorithm",
     "unencrypted": "unencrypted",
     "Decryption error": "Decryption error",
-    "Session ID": "Session ID",
     "Event information": "Event information",
-    "Sender device information": "Sender device information",
+    "Sender session information": "Sender session information",
     "Passphrases must match": "Passphrases must match",
     "Passphrase must not be empty": "Passphrase must not be empty",
     "Export room keys": "Export room keys",
@@ -2020,9 +2019,9 @@
     "Restore": "Restore",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:",
     "Enter a passphrase": "Enter a passphrase",
     "Back up my encryption keys, securing them with the same passphrase": "Back up my encryption keys, securing them with the same passphrase",
@@ -2044,7 +2043,7 @@
     "<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",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.",
+    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Verify other users in their profile.": "Verify other users in their profile.",
     "Upgrade your encryption": "Upgrade your encryption",
     "Recovery key": "Recovery key",
@@ -2063,7 +2062,7 @@
     "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.",
     "As a safety net, you can use it to restore your encrypted message history.": "As a safety net, you can use it to restore your encrypted message history.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
-    "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.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
     "Secure your backup with a passphrase": "Secure your backup with a passphrase",
     "Starting backup...": "Starting backup...",
@@ -2077,12 +2076,12 @@
     "New Recovery Method": "New Recovery Method",
     "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
-    "This device is encrypting history using the new recovery method.": "This device is encrypting history using the new recovery method.",
+    "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "This device has detected that your recovery passphrase and key for Secure Messages have been removed.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
     "Disable": "Disable",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 37a211e905..83975dd8e9 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -144,7 +144,7 @@ export const SETTINGS = {
     },
     "feature_cross_signing": {
         isFeature: true,
-        displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
+        displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
@@ -348,8 +348,8 @@ export const SETTINGS = {
         supportedLevels: ['room-device', 'device'],
         supportedLevelsAreOrdered: true,
         displayName: {
-            "default": _td('Never send encrypted messages to unverified devices from this device'),
-            "room-device": _td('Never send encrypted messages to unverified devices in this room from this device'),
+            "default": _td('Never send encrypted messages to unverified sessions from this session'),
+            "room-session": _td('Never send encrypted messages to unverified sessions in this room from this session'),
         },
         default: false,
     },

From a2734e6955a06535ab1eb84cddc7d57c763cfbbf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 15:56:26 +0000
Subject: [PATCH 0828/3235] Add missing await causing promises to be leaked as
 room IDs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/DeviceVerifyDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index f2368ad795..7fa83da58d 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -318,7 +318,7 @@ export default class DeviceVerifyDialog extends React.Component {
 }
 
 async function ensureDMExistsAndOpen(userId) {
-    const roomId = ensureDMExists(MatrixClientPeg.get(), userId);
+    const roomId = await ensureDMExists(MatrixClientPeg.get(), userId);
     // don't use andView and spinner in createRoom, together, they cause this dialog to close and reopen,
     // we causes us to loose the verifier and restart, and we end up having two verification requests
     dis.dispatch({

From 067bfe2ee3ce0129ba4f09e86d6b28977c68ed97 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 16:10:46 +0000
Subject: [PATCH 0829/3235] Tweaks from PR

---
 src/Analytics.js                                   |  2 +-
 src/components/structures/auth/ForgotPassword.js   |  2 +-
 src/components/structures/auth/SoftLogout.js       |  6 +++---
 .../views/dialogs/ConfirmWipeDeviceDialog.js       |  2 +-
 src/components/views/dialogs/SetPasswordDialog.js  |  2 +-
 src/components/views/right_panel/EncryptionInfo.js |  2 +-
 src/i18n/strings/en_EN.json                        | 14 +++++++-------
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 6ec50cc25f..d0c7a52814 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -272,7 +272,7 @@ class Analytics {
                 ),
             },
             { expl: _td('Your User Agent'), value: navigator.userAgent },
-            { expl: _td('Your session resolution'), value: resolution },
+            { expl: _td('Your device resolution'), value: resolution },
         ];
 
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 0fc4a9af1e..e921951512 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -360,7 +360,7 @@ export default createReactClass({
             <p>{_t(
                 "You have been logged out of all sessions and will no longer receive " +
                 "push notifications. To re-enable notifications, sign in again on each " +
-                "session.",
+                "device.",
             )}</p>
             <input className="mx_Login_submit" type="button" onClick={this.props.onComplete}
                 value={_t('Return to login screen')} />
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 06838798c7..8481b3fc43 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -212,8 +212,8 @@ export default class SoftLogout extends React.Component {
         let introText = null; // null is translated to something area specific in this function
         if (this.state.keyBackupNeeded) {
             introText = _t(
-                "Regain access to your account and recover encryption keys stored on this session. " +
-                "Without them, you won’t be able to read all of your secure messages on any session.");
+                "Regain access to your account and recover encryption keys stored in this session. " +
+                "Without them, you won’t be able to read all of your secure messages in any session.");
         }
 
         if (this.state.loginView === LOGIN_VIEW.PASSWORD) {
@@ -306,7 +306,7 @@ export default class SoftLogout extends React.Component {
                     <p>
                         {_t(
                             "Warning: Your personal data (including encryption keys) is still stored " +
-                            "on this session. Clear it if you're finished using this session, or want to sign " +
+                            "in this session. Clear it if you're finished using this session, or want to sign " +
                             "in to another account.",
                         )}
                     </p>
diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
index 2672d3e0f2..41ef9131fa 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
@@ -39,7 +39,7 @@ export default class ConfirmWipeDeviceDialog extends React.Component {
         return (
             <BaseDialog className='mx_ConfirmWipeDeviceDialog' hasCancel={true}
                         onFinished={this.props.onFinished}
-                        title={_t("Clear all data on this session?")}>
+                        title={_t("Clear all data in this session?")}>
                 <div className='mx_ConfirmWipeDeviceDialog_content'>
                     <p>
                         {_t(
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 3797957568..c48690bb48 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -29,7 +29,7 @@ const WarmFuzzy = function(props) {
     if (props.didSetEmail) {
         title = _t('You have successfully set a password and an email address!');
     }
-    const advice = _t('You can now return to your account after signing out, and sign in on other sessions.');
+    const advice = _t('You can now return to your account after signing out, and sign in on other devices.');
     let extraAdvice = null;
     if (!props.didSetEmail) {
         extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.');
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 040b0a7929..299e553769 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -55,7 +55,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => {
         <div className="mx_UserInfo_container">
             <h3>{_t("Verify User")}</h3>
             <div>
-                <p>{_t("For extra security, verify this user by checking a one-time code on both of your sessions.")}</p>
+                <p>{_t("For extra security, verify this user by checking a one-time code on both of your devices.")}</p>
                 <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
                 { content }
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b745feda17..e3738b1175 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -17,7 +17,7 @@
     "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 session resolution": "Your session resolution",
+    "Your device resolution": "Your device resolution",
     "Analytics": "Analytics",
     "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.",
@@ -1147,7 +1147,7 @@
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Verify User": "Verify User",
-    "For extra security, verify this user by checking a one-time code on both of your sessions.": "For extra security, verify this user by checking a one-time code on both of your sessions.",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
     "Your messages are not secure": "Your messages are not secure",
     "One of the following may be compromised:": "One of the following may be compromised:",
     "Your homeserver": "Your homeserver",
@@ -1421,7 +1421,7 @@
     "Removing…": "Removing…",
     "Confirm Removal": "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.": "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.",
-    "Clear all data on this session?": "Clear all data on this session?",
+    "Clear all data in this session?": "Clear all data in this session?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
     "Clear all data": "Clear all data",
     "Community IDs cannot be empty.": "Community IDs cannot be empty.",
@@ -1578,7 +1578,7 @@
     "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 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 sessions.": "You can now return to your account after signing out, and sign in on other sessions.",
+    "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.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Please set a password!": "Please set a password!",
@@ -1927,7 +1927,7 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
     "I have verified my email address": "I have verified my email address",
     "Your password has been reset.": "Your password has been reset.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each session.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
     "Return to login screen": "Return to login screen",
     "Set a new password": "Set a new password",
     "Invalid homeserver discovery response": "Invalid homeserver discovery response",
@@ -1965,14 +1965,14 @@
     "Create your account": "Create your account",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Failed to re-authenticate": "Failed to re-authenticate",
-    "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.": "Regain access to your account and recover encryption keys stored on this session. Without them, you won’t be able to read all of your secure messages on any session.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.",
     "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",
     "Forgotten your password?": "Forgotten your password?",
     "Sign in and regain access to your account.": "Sign in and regain access to your account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.",
     "You're signed out": "You're signed out",
     "Clear personal data": "Clear personal data",
-    "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this session. Clear it if you're finished using this session, or want to sign in to another account.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.",
     "Commands": "Commands",
     "Command Autocomplete": "Command Autocomplete",
     "Community Autocomplete": "Community Autocomplete",

From d8ca9d0f13e48fb470f11d43d41c8c4f247cf294 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 16:35:38 +0000
Subject: [PATCH 0830/3235] Prune unused translations

---
 src/i18n/strings/ar.json      |   1 -
 src/i18n/strings/az.json      |  29 ------
 src/i18n/strings/bg.json      | 148 -----------------------------
 src/i18n/strings/ca.json      |  53 -----------
 src/i18n/strings/cs.json      | 133 --------------------------
 src/i18n/strings/da.json      |  24 -----
 src/i18n/strings/de_DE.json   | 119 ------------------------
 src/i18n/strings/el.json      |  60 ------------
 src/i18n/strings/en_US.json   |  58 ------------
 src/i18n/strings/eo.json      | 124 -------------------------
 src/i18n/strings/es.json      |  95 -------------------
 src/i18n/strings/eu.json      | 164 ---------------------------------
 src/i18n/strings/fa.json      |   1 -
 src/i18n/strings/fi.json      | 146 -----------------------------
 src/i18n/strings/fr.json      | 169 ----------------------------------
 src/i18n/strings/gl.json      |  66 -------------
 src/i18n/strings/he.json      |   2 -
 src/i18n/strings/hi.json      |  68 +-------------
 src/i18n/strings/hu.json      | 168 ---------------------------------
 src/i18n/strings/id.json      |  12 ---
 src/i18n/strings/is.json      |  28 ------
 src/i18n/strings/it.json      | 167 ---------------------------------
 src/i18n/strings/ja.json      |  75 ---------------
 src/i18n/strings/jbo.json     |  19 ----
 src/i18n/strings/ko.json      | 123 -------------------------
 src/i18n/strings/lt.json      |  62 -------------
 src/i18n/strings/lv.json      |  58 ------------
 src/i18n/strings/ml.json      |   1 -
 src/i18n/strings/nb_NO.json   |  18 ----
 src/i18n/strings/nl.json      | 117 -----------------------
 src/i18n/strings/nn.json      |  84 -----------------
 src/i18n/strings/pl.json      |  97 -------------------
 src/i18n/strings/pt.json      |  51 ----------
 src/i18n/strings/pt_BR.json   |  84 -----------------
 src/i18n/strings/ro.json      |   1 -
 src/i18n/strings/ru.json      | 117 -----------------------
 src/i18n/strings/sk.json      | 118 ------------------------
 src/i18n/strings/sq.json      | 161 --------------------------------
 src/i18n/strings/sr.json      |  62 -------------
 src/i18n/strings/sr_Latn.json |   6 --
 src/i18n/strings/sv.json      |  98 --------------------
 src/i18n/strings/ta.json      |   1 -
 src/i18n/strings/te.json      |   7 --
 src/i18n/strings/th.json      |  27 ------
 src/i18n/strings/tr.json      |  80 ----------------
 src/i18n/strings/uk.json      |  34 -------
 src/i18n/strings/vi.json      |  21 -----
 src/i18n/strings/vls.json     | 115 -----------------------
 src/i18n/strings/zh_Hans.json | 103 ---------------------
 src/i18n/strings/zh_Hant.json | 165 ---------------------------------
 50 files changed, 1 insertion(+), 3739 deletions(-)

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 436c518ba0..708778d15d 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -46,7 +46,6 @@
     "Changelog": "سِجل التغييرات",
     "Send Account Data": "إرسال بيانات الحساب",
     "Waiting for response from server": "في انتظار الرد مِن الخادوم",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "سيسمح لك هذا بالعودة إلى حسابك بعد الخروج، وتسجيل الدخول على الأجهزة الأخرى.",
     "Send logs": "إرسال السِجلات",
     "Download this file": "تنزيل هذا الملف",
     "Thank you!": "شكرًا !",
diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 538403f164..6cddb58ad1 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -74,9 +74,6 @@
     "Moderator": "Moderator",
     "Admin": "Administrator",
     "Start a chat": "Danışığa başlamaq",
-    "Who would you like to communicate with?": "Kimlə siz əlaqə saxlamaq istəyirdiniz?",
-    "Start Chat": "Danışığa başlamaq",
-    "Invite new room members": "Yeni iştirakçıların otağına dəvət etmək",
     "You need to be logged in.": "Siz sistemə girməlisiniz.",
     "You need to be able to invite users to do that.": "Bunun üçün siz istifadəçiləri dəvət etmək imkanına malik olmalısınız.",
     "Failed to send request.": "Sorğunu göndərməyi bacarmadı.",
@@ -126,14 +123,11 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s iştirakçılar üçün danışıqların tarixini açdı.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s hamı üçün danışıqların tarixini açdı.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s naməlum rejimdə otağın tarixini açdı (%(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 üçün  %(fromPowerLevel)s-dan %(toPowerLevel)s-lə",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hüquqların səviyyələrini dəyişdirdi %(powerLevelDiffText)s.",
     "Failed to join room": "Otağa girməyi bacarmadı",
     "Always show message timestamps": "Həmişə mesajların göndərilməsi vaxtını göstərmək",
     "Autoplay GIFs and videos": "GIF animasiyalarını və videolarını avtomatik olaraq oynayır",
-    "Never send encrypted messages to unverified devices from this device": "Heç vaxt (bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
-    "Never send encrypted messages to unverified devices in this room from this device": "Heç vaxt (bu otaqda, bu qurğudan) yoxlanılmamış qurğulara şifrlənmiş mesajları göndərməmək",
     "Accept": "Qəbul etmək",
     "Error": "Səhv",
     "Incorrect verification code": "Təsdiq etmənin səhv kodu",
@@ -152,8 +146,6 @@
     "Failed to set display name": "Görünüş adını təyin etmək bacarmadı",
     "Notification targets": "Xəbərdarlıqlar üçün qurğular",
     "On": "Qoşmaq",
-    "Invalid alias format": "Adının yolverilməz formatı",
-    "'%(alias)s' is not a valid format for an alias": "Ad '%(alias)s' yolverilməz formata malikdir",
     "not specified": "qeyd edilmədi",
     "Local addresses for this room:": "Sizin serverinizdə bu otağın ünvanları:",
     "New address (e.g. #foo:%(localDomain)s)": "Yeni ünvan (məsələn, #nəsə:%(localDomain)s)",
@@ -168,8 +160,6 @@
     "Failed to toggle moderator status": "Moderatorun statusunu dəyişdirməyi bacarmadı",
     "Failed to change power level": "Hüquqların səviyyəsini dəyişdirməyi bacarmadı",
     "Are you sure?": "Siz əminsiniz?",
-    "No devices with registered encryption keys": "Şifrləmənin qeyd edilmiş açarlarıyla qurğu yoxdur",
-    "Devices": "Qurğular",
     "Unignore": "Blokdan çıxarmaq",
     "Ignore": "Bloklamaq",
     "User Options": "Hərəkətlər",
@@ -182,17 +172,13 @@
     "Video call": "Video çağırış",
     "Upload file": "Faylı göndərmək",
     "You do not have permission to post to this room": "Siz bu otağa yaza bilmirsiniz",
-    "Hide Text Formatting Toolbar": "Mətnin formatlaşdırılmasının alətlərini gizlətmək",
     "Command error": "Komandanın səhvi",
-    "Markdown is disabled": "Markdown kəsilmişdir",
-    "Markdown is enabled": "Markdown qoşulmuşdur",
     "Join Room": "Otağa girmək",
     "Upload avatar": "Avatar-ı yükləmək",
     "Settings": "Qurmalar",
     "Forget room": "Otağı unutmaq",
     "Invites": "Dəvətlər",
     "Favourites": "Seçilmişlər",
-    "People": "İnsanlar",
     "Low priority": "Əhəmiyyətsizlər",
     "Historical": "Arxiv",
     "Failed to unban": "Blokdan çıxarmağı bacarmadı",
@@ -267,7 +253,6 @@
     "Click to unmute audio": "Klikləyin, səsi qoşmaq üçün",
     "Click to mute audio": "Klikləyin, səsi söndürmək üçün",
     "Failed to load timeline position": "Xronologiyadan nişanı yükləməyi bacarmadı",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Şifrə uğurla dəyişdirildi. Təkrar avtorizasiyaya qədər siz başqa cihazlarda push-xəbərdarlıqları almayacaqsınız",
     "Unable to remove contact information": "Əlaqə məlumatlarının silməyi bacarmadı",
     "<not supported>": "<dəstəklənmir>",
     "Import E2E room keys": "Şifrləmənin açarlarının idxalı",
@@ -282,7 +267,6 @@
     "click to reveal": "açılış üçün basın",
     "Homeserver is": "Ev serveri bu",
     "Identity Server is": "Eyniləşdirmənin serveri bu",
-    "matrix-react-sdk version:": "matrix-react-sdk versiyası:",
     "olm version:": "Olm versiyası:",
     "Failed to send email": "Email göndərilməsinin səhvi",
     "A new password must be entered.": "Yeni parolu daxil edin.",
@@ -317,7 +301,6 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Çörək parçaları' funksiyadan istifadə edmiirsiniz (otaqlar siyahısından yuxarıdakı avatarlar)",
     "Analytics": "Analitik",
     "Call Failed": "Uğursuz zəng",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu otaqda məlum olmayan cihazlar var: onları təsdiq etmədən davam etsəniz, kimsə zənginizə qulaq asmaq mümkün olacaq.",
     "Review Devices": "Cihazları nəzərdən keçirin",
     "Call Anyway": "Hər halda zəng edin",
     "Answer Anyway": "Hər halda cavab verin",
@@ -358,8 +341,6 @@
     "Registration Required": "Qeydiyyat tələb olunur",
     "You need to register to do this. Would you like to register now?": "Bunu etmək üçün qeydiyyatdan keçməlisiniz. İndi qeydiyyatdan keçmək istərdiniz?",
     "Restricted": "Məhduddur",
-    "Email, name or Matrix ID": "E-poçt, ad və ya Matrix ID",
-    "Send Invites": "Dəvət göndərin",
     "Failed to invite": "Dəvət alınmadı",
     "Failed to invite users to the room:": "İstifadəçiləri otağa dəvət etmək alınmadı:",
     "Unable to create widget.": "Widjet yaratmaq olmur.",
@@ -370,8 +351,6 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯ \\ _ (ツ) _ / ¯ işarəsini mesaja elavə edir.",
     "Searches DuckDuckGo for results": "Nəticələr üçün DuckDuckGo-da axtarır",
     "Upgrades a room to a new version": "Bir otağı yeni bir versiyaya yüksəldir",
-    "Room upgrade confirmation": "Otaq yenilənməsi quraşdırılması",
-    "Upgrading a room can be destructive and isn't always necessary.": "Bir otağı təkmilləşdirməsi dağıdıcı ola bilər və həmişə lazım deyil.",
     "Changes your display nickname in the current room only": "Yalnız cari otaqda ekran ləqəbinizi dəyişdirir",
     "Changes your avatar in this current room only": "Avatarınızı yalnız bu cari otaqda dəyişir",
     "Changes your avatar in all rooms": "Bütün otaqlarda avatarınızı dəyişdirir",
@@ -384,12 +363,9 @@
     "Opens the Developer Tools dialog": "Geliştirici Alətlər dialoqunu açır",
     "Adds a custom widget by URL to the room": "Otağa URL tərəfindən xüsusi bir widjet əlavə edir",
     "You cannot modify widgets in this room.": "Bu otaqda vidjetləri dəyişdirə bilməzsiniz.",
-    "Verifies a user, device, and pubkey tuple": "Bir istifadəçini, cihazı və publik açarı yoxlayır",
-    "Unknown (user, device) pair:": "Naməlum (istifadəçi, cihaz) qoşulma:",
     "Verified key": "Təsdiqlənmiş açar",
     "Sends the given message coloured as a rainbow": "Verilən mesajı göy qurşağı kimi rəngli göndərir",
     "Sends the given emote coloured as a rainbow": "Göndərilmiş emote rəngini göy qurşağı kimi göndərir",
-    "Unrecognised command:": "Tanınmayan əmr:",
     "Add Email Address": "Emal ünvan əlavə etmək",
     "Add Phone Number": "Telefon nömrəsi əlavə etmək",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
@@ -410,7 +386,6 @@
     "Only continue if you trust the owner of the server.": "Yalnız server sahibinə etibar etsəniz davam edin.",
     "Trust": "Etibar",
     "Custom (%(level)s)": "Xüsusi (%(level)s)",
-    "Failed to start chat": "Söhbətə başlamaq olmur",
     "Failed to invite the following users to the %(roomName)s room:": "Aşağıdakı istifadəçiləri %(roomName)s otağına dəvət etmək alınmadı:",
     "Room %(roomId)s not visible": "Otaq %(roomId)s görünmür",
     "Messages": "Mesajlar",
@@ -425,10 +400,6 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Defolt şəxsiyyət serverini (%(defaultIdentityServerName)s) istifadə etməyə və ya Parametrlərdə idarə etməyə davam edin.",
     "Use an identity server to invite by email. Manage in Settings.": "E-poçtla dəvət etmək üçün şəxsiyyət serverindən istifadə edin. Parametrlərdə idarə edin.",
     "Please supply a https:// or http:// widget URL": "Zəhmət olmasa https:// və ya http:// widget URL təmin edin",
-    "Device already verified!": "Cihaz artıq təsdiqləndi!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "XƏBƏRDARLIQ: Cihaz artıq təsdiqləndi, lakin açarlar uyğun gəlmir!",
-    "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!": "XƏBƏRDARLIQ: ƏSAS VERIFİKASİYA VERİLİR! %(userId)s və cihaz %(deviceId)s üçün imza açarı \"%(fprint)s\" ilə təmin olunmayan \"%(fingerprint)s\". Bu, ünsiyyətlərinizin tutulduğunu ifadə edə bilər!",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Təqdim etdiyiniz imza açarı %(userId)s cihazının %(deviceId)s cihazından aldığınız imza açarına uyğundur. Cihaz təsdiqlənmiş kimi qeyd edildi.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Şifrəli bir otaqda mövcud qrup sessiyasını ləğv etməyə məcbur edir",
     "Displays list of commands with usages and descriptions": "İstifadə qaydaları və təsvirləri ilə komanda siyahısını göstərir",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konfrans istədi.",
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 108eb8ffb7..a62f66edfb 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -102,10 +102,6 @@
     "Moderator": "Модератор",
     "Admin": "Администратор",
     "Start a chat": "Започване на чат",
-    "Who would you like to communicate with?": "С кой бихте желали да си комуникирате?",
-    "Start Chat": "Започни чат",
-    "Invite new room members": "Покана на нови членове в стаята",
-    "Send Invites": "Изпрати покани",
     "Failed to invite": "Неуспешна покана",
     "Failed to invite the following users to the %(roomName)s room:": "Следните потребителите не успяха да бъдат добавени в %(roomName)s:",
     "You need to be logged in.": "Трябва да влезете в профила си.",
@@ -131,10 +127,7 @@
     "You are now ignoring %(userId)s": "Вече игнорирате %(userId)s",
     "Unignored user": "Неигнориран потребител",
     "You are no longer ignoring %(userId)s": "Вече не игнорирате %(userId)s",
-    "Device already verified!": "Устройството е вече потвърдено!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Устройстовото е потвърдено, но ключовете не съвпадат!",
     "Verified key": "Потвърден ключ",
-    "Unrecognised command:": "Неразпозната команда:",
     "Reason": "Причина",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
@@ -171,7 +164,6 @@
     "%(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 смени закачените съобщения за стаята.",
@@ -194,8 +186,6 @@
     "Enable automatic language detection for syntax highlighting": "Включване на автоматично разпознаване на език за подчертаване на синтаксиса",
     "Automatically replace plain text Emoji": "Автоматично откриване и заместване на емотикони в текста",
     "Mirror local video feed": "Показвай ми огледално моя видео образ",
-    "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 прегледи за участници в тази стая",
@@ -223,10 +213,7 @@
     "New Password": "Нова парола",
     "Confirm password": "Потвърждаване на парола",
     "Change Password": "Смяна на парола",
-    "Unable to load device list": "Неуспешно зареждане на списък с устройства",
     "Authentication": "Автентикация",
-    "Delete %(count)s devices|other": "Изтрий %(count)s устройства",
-    "Delete %(count)s devices|one": "Изтрий устройство",
     "Device ID": "Идентификатор на устройство",
     "Last seen": "Последно видян",
     "Failed to set display name": "Неуспешно задаване на име",
@@ -244,9 +231,6 @@
     "%(senderName)s sent a video": "%(senderName)s изпрати видео",
     "%(senderName)s uploaded a file": "%(senderName)s качи файл",
     "Options": "Настройки",
-    "Undecryptable": "Невъзможно разшифроване",
-    "Encrypted by an unverified device": "Шифровано от непотвърдено устройство",
-    "Unencrypted message": "Нешифровано съобщение",
     "Please select the destination room for this message": "Моля, изберете стаята, в която искате да изпратите това съобщение",
     "Blacklisted": "В черния списък",
     "device id: ": "идентификатор на устройството: ",
@@ -266,8 +250,6 @@
     "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.": "След като си намалите нивото на достъп, няма да можете да възвърнете тази промяна. Ако сте последния потребител с привилегии в тази стая, ще бъде невъзможно да възвърнете привилегии си.",
     "Are you sure?": "Сигурни ли сте?",
     "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": "Устройства",
     "Unignore": "Премахни игнорирането",
     "Ignore": "Игнорирай",
     "Mention": "Спомени",
@@ -287,20 +269,14 @@
     "Voice call": "Гласово повикване",
     "Video call": "Видео повикване",
     "Upload file": "Качи файл",
-    "Show Text Formatting Toolbar": "Показване на лентата с инструменти за форматиране на текст",
     "Send an encrypted reply…": "Изпрати шифрован отговор…",
     "Send a reply (unencrypted)…": "Отговори (нешифрованo)…",
     "Send an encrypted message…": "Изпрати шифровано съобщение…",
     "Send a message (unencrypted)…": "Изпрати съобщение (нешифровано)…",
     "You do not have permission to post to this room": "Нямате разрешение да публикувате в тази стая",
-    "Hide Text Formatting Toolbar": "Скриване на лентата с инструменти за форматиране на текст",
     "Server error": "Сървърна грешка",
     "Server unavailable, overloaded, or something else went wrong.": "Сървърът е недостъпен, претоварен или нещо друго се обърка.",
     "Command error": "Грешка в командата",
-    "bold": "удебелен",
-    "italic": "курсивен",
-    "Markdown is disabled": "Markdown е изключен",
-    "Markdown is enabled": "Markdown е включен",
     "No pinned messages.": "Няма закачени съобщения.",
     "Loading...": "Зареждане...",
     "Pinned Messages": "Закачени съобщения",
@@ -328,7 +304,6 @@
     "Community Invites": "Покани за общност",
     "Invites": "Покани",
     "Favourites": "Любими",
-    "People": "Хора",
     "Low priority": "Нисък приоритет",
     "Historical": "Архив",
     "This room": "В тази стая",
@@ -357,8 +332,6 @@
     "Advanced": "Разширени",
     "Add a topic": "Добавете тема",
     "Jump to first unread message.": "Отиди до първото непрочетено съобщение.",
-    "Invalid alias format": "Невалиден формат на псевдонима",
-    "'%(alias)s' is not a valid format for an alias": "%(alias)s не е валиден формат на псевдоним",
     "not specified": "неопределен",
     "Remote addresses for this room:": "Отдалечени адреси на тази стая:",
     "Local addresses for this room:": "Локалните адреси на тази стая са:",
@@ -408,8 +381,6 @@
     "Community %(groupId)s not found": "Общност %(groupId)s не е намерена",
     "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 Вселената.",
-    "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):",
-    "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. Устройството е маркирано като потвърдено.",
     "Jump to message": "Отиди до съобщението",
     "Jump to read receipt": "Отиди до потвърждението за прочитане",
     "Revoke Moderator": "Премахване на правата на модератора",
@@ -457,7 +428,6 @@
     "Blacklist": "Добави в черен списък",
     "Unverify": "Махни потвърждението",
     "Verify...": "Потвърди...",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Вашето непотвърдено устройство '%(displayName)s' изисква ключове за шифроване.",
     "I have verified my email address": "Потвърдих имейл адреса си",
     "NOT verified": "НЕ е потвърдено",
     "verified": "потвърдено",
@@ -543,18 +513,13 @@
     "Unknown error": "Неизвестна грешка",
     "Incorrect password": "Неправилна парола",
     "Deactivate Account": "Затвори акаунта",
-    "Device name": "Име на устройство",
-    "Device key": "Ключ на устройство",
-    "Verify device": "Потвърждение на устройство",
     "Start verification": "Започни потвърждението",
     "Verification Pending": "Очакване на потвърждение",
     "Verification": "Потвърждение",
     "I verify that the keys match": "Потвърждавам, че ключовете съвпадат",
     "An error has occurred.": "Възникна грешка.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Добавихте ново устройство '%(displayName)s', което изисква ключове за шифроване.",
     "Share without verifying": "Сподели без потвърждение",
     "Ignore request": "Игнорирай поканата",
-    "Loading device info...": "Зареждане на информация за устройството...",
     "Encryption key request": "Заявка за ключ за шифроване",
     "Unable to restore session": "Неуспешно възстановяване на сесията",
     "Invalid Email Address": "Невалиден имейл адрес",
@@ -574,10 +539,6 @@
     "Username available": "Потребителското име не е заето",
     "To get started, please pick a username!": "За да започнете, моля изберете потребителско име!",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ако вече имате Matrix профил, можете да <a>влезете</a> с него.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "В момента Вие блокирате непотвърдени устройства; за да изпращате съобщения до тези устройства, трябва да ги потвърдите.",
-    "Room contains unknown devices": "Стаята съдържа непознати устройства",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" съдържа устройства, който не сте виждали до сега.",
-    "Unknown devices": "Непознати устройства",
     "Private Chat": "Личен чат",
     "Public Chat": "Публичен чат",
     "Alias (optional)": "Псевдоним (по избор)",
@@ -619,8 +580,6 @@
     "Error whilst fetching joined communities": "Грешка при извличането на общности, към които сте присъединени",
     "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>.",
     "%(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> сега. Също така може да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
@@ -652,12 +611,9 @@
     "Light theme": "Светла тема",
     "Dark theme": "Тъмна тема",
     "Success": "Успешно",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Вашата парола беше успешно сменена. Няма да получавате известия на други устройства, докато не влезете отново в профила си от тях",
     "<not supported>": "<не се поддържа>",
     "Import E2E room keys": "Импортирай E2E ключове",
     "Cryptography": "Криптография",
-    "Device ID:": "Идентификатор на устройството:",
-    "Device key:": "Ключ на устройството:",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot събира анонимни статистики, за да ни позволи да подобрим приложението.",
     "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.": "Научете повече за това как използваме статистическите данни.",
@@ -678,7 +634,6 @@
     "click to reveal": "натиснете за показване",
     "Homeserver is": "Home сървър:",
     "Identity Server is": "Сървър за самоличност:",
-    "matrix-react-sdk version:": "Версия на matrix-react-sdk:",
     "riot-web version:": "Версия на riot-web:",
     "olm version:": "Версия на olm:",
     "Failed to send email": "Неуспешно изпращане на имейл",
@@ -706,7 +661,6 @@
     "Kicks user with given id": "Изгонва потребителя с даден идентификатор",
     "Changes your display nickname": "Сменя Вашия псевдоним",
     "Searches DuckDuckGo for results": "Търси в DuckDuckGo за резултати",
-    "Verifies a user, device, and pubkey tuple": "Потвърждава потребител, устройство или ключова двойка",
     "Ignores a user, hiding their messages from you": "Игнорира потребител, скривайки съобщенията му от Вас",
     "Stops ignoring a user, showing their messages going forward": "Спира игнорирането на потребител, показвайки съобщенията му занапред",
     "Commands": "Команди",
@@ -726,7 +680,6 @@
     "Claimed Ed25519 fingerprint key": "Заявен ключов отпечатък Ed25519",
     "End-to-end encryption information": "Информация за шифроването от край до край",
     "Event information": "Информация за събитието",
-    "Sender device information": "Информация за устройството на подателя",
     "Passphrases must match": "Паролите трябва да съвпадат",
     "Passphrase must not be empty": "Паролата не трябва да е празна",
     "Export room keys": "Експортиране на ключове за стаята",
@@ -737,16 +690,10 @@
     "File to import": "Файл за импортиране",
     "Import": "Импортирай",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Когато тази страница съдържа информация идентифицираща Вас (като например стая, потребител или идентификатор на група), тези данни биват премахнати преди да бъдат изпратени до сървъра.",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Има непознати устройства в тази стая. Ако продължите без да ги потвърдите, ще бъде възможно за някого да подслушва Вашия разговор.",
-    "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\". Това може да означава, че Вашата комуникация е прихваната!",
-    "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.": "Смяната на парола ще нулира всички ключове за шифроване от край до край на всички устройства, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате ключовете за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
     "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?": "На път сте да бъдете отведени до друг сайт, където можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
     "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.": "Сигурни ли сте, че искате да премахнете (изтриете) това събитие? Забележете, че ако изтриете събитие за промяна на името на стая или тема, това може да обърне промяната.",
-    "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:": "За да потвърдите, че на това устройство може да се вярва, моля свържете се със собственика му по друг начин (напр. на живо или чрез телефонен разговор) и го попитайте дали ключът, който той вижда в неговите настройки на потребителя за това устройство, съвпада с ключа по-долу:",
-    "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.": "Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не, то тогава някой друг имитира това устройство и вероятно искате вместо това да натиснете бутона за черен списък.",
     "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, Вашата сесия може да не бъде съвместима с текущата версия. Затворете този прозорец и се върнете в по-новата версия.",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървъра, или можете да изберете <a>друг сървър</a>.",
-    "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.": "Препоръчваме Ви да минете през процеса за потвърждение за всяко устройство, за да потвърдите, че принадлежат на легитимен собственик. Ако предпочитате, можете да изпратите съобщение без потвърждение.",
     "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. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите от край до край съобщения, които са били обменени наскоро (при използването на по-стара версия), може да не успеят да бъдат разшифровани в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
     "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.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка. Уверете се, че <a>SSL сертификатът на Home сървъра</a> е надежден и че някое разширение на браузъра не блокира заявките.",
     "none": "няма",
@@ -756,11 +703,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
     "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.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
-    "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> от другите Ви устройства.",
     "Code": "Код",
     "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, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
     "Submit debug logs": "Изпрати логове за дебъгване",
@@ -823,7 +766,6 @@
     "Noisy": "Шумно",
     "Collecting app version information": "Събиране на информация за версията на приложението",
     "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.": "Това ще Ви позволи да се върнете в профила си след излизане от него, и да влезете от други устройства.",
     "Enable notifications for this account": "Включване на известия за този профил",
     "Invite to this community": "Покани в тази общност",
     "Search…": "Търсене…",
@@ -912,8 +854,6 @@
     "Your User Agent": "Вашият браузър",
     "Your device resolution": "Разделителната способност на устройството Ви",
     "Always show encryption icons": "Винаги показвай икони за шифроване",
-    "Unable to reply": "Не може да се отговори",
-    "At this time it is not possible to reply with an emote.": "В момента не може да се отговори с емотикона.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не може да се зареди събитието, на което е отговорено. Или не съществува или нямате достъп да го видите.",
     "Popout widget": "Изкарай в нов прозорец",
     "Clear Storage and Sign Out": "Изчисти запазените данни и излез",
@@ -965,12 +905,6 @@
     "Permission Required": "Необходимо е разрешение",
     "A call is currently being placed!": "В момента се осъществява разговор!",
     "You do not have permission to start a conference call in this room": "Нямате достъп да започнете конферентен разговор в тази стая",
-    "deleted": "изтрито",
-    "underlined": "подчертано",
-    "inline-code": "код",
-    "block-quote": "цитат",
-    "bulleted-list": "списък (с тирета)",
-    "numbered-list": "номериран списък",
     "Failed to remove widget": "Неуспешно премахване на приспособление",
     "An error ocurred whilst trying to remove the widget from the room": "Възникна грешка при премахването на приспособлението от стаята",
     "System Alerts": "Системни уведомления",
@@ -1059,11 +993,6 @@
     "Encrypted messages in group chats": "Шифровани съобщения в групови чатове",
     "Delete Backup": "Изтрий резервното копие",
     "Unable to load key backup status": "Неуспешно зареждане на състоянието на резервното копие на ключа",
-    "Backup has a <validity>valid</validity> signature from this device": "Резервното копие има <validity>валиден</validity> подпис за това устройство",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>непотвърдено</verify> устройство <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>потвърдено</verify> устройство <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>непотвърдено</verify> устройство <device></device>",
-    "Backup is not signed by any of your devices": "Резервното копие не е подписано от нито едно Ваше устройство",
     "Backup version: ": "Версия на резервното копие: ",
     "Algorithm: ": "Алгоритъм: ",
     "Don't ask again": "Не питай пак",
@@ -1090,7 +1019,6 @@
     "This looks like a valid recovery key!": "Това изглежда като валиден ключ за възстановяване!",
     "Not a valid 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>": "Ако сте забравили паролата за възстановяване, може да <button>настройте нов вариант за възстановяване</button>",
     "Invalid homeserver discovery response": "Невалиден отговор по време на откриването на конфигурацията за сървъра",
     "Invalid identity server discovery response": "Невалиден отговор по време на откриването на конфигурацията за сървъра за самоличност",
     "General failure": "Обща грешка",
@@ -1107,12 +1035,9 @@
     "Your Recovery Key": "Вашия ключ за възстановяване",
     "Copy to clipboard": "Копирай в клипборд",
     "Download": "Свали",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Ключа Ви за възстановяване <b>беше копиран в клипборда</b>, поставете го в:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Ключът Ви за възстановяване е в папка <b>Изтеглени</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Принтирайте го</b> и го съхранявайте на безопасно място",
     "<b>Save it</b> on a USB key or backup drive": "<b>Запазете го</b> на USB или резервен диск",
     "<b>Copy it</b> to your personal cloud storage": "<b>Копирайте го</b> в персонално облачно пространство",
-    "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": "Настрой Възстановяване на Защитени Съобщения",
     "Keep it safe": "Пазете го в безопасност",
     "Create Key Backup": "Създай резервно копие на ключа",
@@ -1123,7 +1048,6 @@
     "Straight rows of keys are easy to guess": "Клавиши от прави редици са лесни за отгатване",
     "Short keyboard patterns are easy to guess": "Къси клавиатурни последователности са лесни за отгатване",
     "Custom user status messages": "Собствено статус съобщение",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>потвърдено</verify> устройство <device></device>",
     "Unable to load commit detail: %(msg)s": "Неуспешно зареждане на информация за commit: %(msg)s",
     "Set a new status...": "Задаване на нов статус...",
     "Clear status": "Изчисти статуса",
@@ -1164,20 +1088,17 @@
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Защитените съобщения с този потребител са шифровани от край-до-край и не могат да бъдат прочетени от други.",
     "Got It": "Разбрах",
     "Verify this user by confirming the following number appears on their screen.": "Потвърдете този потребител като се уверите, че следното число се вижда на екрана му.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "За максимална сигурност, препоръчваме да го направите на живо или да използвате друг надежден начин за комуникация.",
     "Yes": "Да",
     "No": "Не",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Изпратихме Ви имейл за да потвърдим адреса Ви. Последвайте инструкциите в имейла и след това кликнете на бутона по-долу.",
     "Email Address": "Имейл адрес",
     "Backing up %(sessionsRemaining)s keys...": "Правене на резервно копие на %(sessionsRemaining)s ключа...",
     "All keys backed up": "Всички ключове са в резервното копие",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Резервното копие съдържа подпис от <verify>непознато</verify> устройство с идентификатор %(deviceId)s.",
     "Add an email address to configure email notifications": "Добавете имейл адрес за да конфигурирате уведомления по имейл",
     "Unable to verify phone number.": "Неуспешно потвърждение на телефонния номер.",
     "Verification code": "Код за потвърждение",
     "Phone Number": "Телефонен номер",
     "Profile picture": "Профилна снимка",
-    "Upload profile picture": "Качи профилна снимка",
     "Display Name": "Име",
     "Room information": "Информация за стаята",
     "Internal room ID:": "Идентификатор на стаята:",
@@ -1220,8 +1141,6 @@
     "Voice & Video": "Глас и видео",
     "Main address": "Основен адрес",
     "Room avatar": "Снимка на стаята",
-    "Upload room avatar": "Качи снимка на стаята",
-    "No room avatar": "Няма снимка на стаята",
     "Room Name": "Име на стаята",
     "Room Topic": "Тема на стаята",
     "Join": "Присъедини се",
@@ -1231,7 +1150,6 @@
     "Waiting for partner to accept...": "Изчакване партньора да приеме...",
     "Use two-way text verification": "Използвай двустранно текстово потвърждение",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Потвърди потребителя и го маркирай като доверен. Доверяването на потребители Ви дава допълнително спокойствие при използване на съобщения шифровани от край-до-край.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Потвърждението на този потребител ще маркира устройството му като доверено, а Вашето ще бъде маркирано като доверено при него.",
     "Waiting for partner to confirm...": "Изчакване партньора да потвърди...",
     "Incoming Verification Request": "Входяща заявка за потвърждение",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "За да се избегнат дублиращи се проблеми, моля първо <existingIssuesLink>прегледайте съществуващите проблеми</existingIssuesLink> (и гласувайте с +1) или <newIssueLink>създайте нов проблем</newIssueLink>, ако не сте намерили съществуващ.",
@@ -1267,10 +1185,7 @@
     "Keep going...": "Продължавайте...",
     "Starting backup...": "Започване на резервното копие...",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Беше открита нова парола и ключ за Защитени Съобщения.",
-    "This device is encrypting history using the new recovery method.": "Устройството шифрова историята използвайки новия метод за възстановяване.",
     "Recovery Method Removed": "Методът за възстановяване беше премахнат",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Устройството откри, че паролата за възстановяване и ключът за Защитени Съобщения са били премахнати.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Ако сте извършили това по погрешка, може да настройте Защитени Съобщения за това устройство, което ще зашифрова наново историята на съобщенията за това устройство, използвайки новия метод за възстановяване.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ако не сте премахнали метода за възстановяване, е възможно нападател да се опитва да получи достъп до акаунта Ви. Променете паролата на акаунта и настройте нов метод за възстановяване веднага от Настройки.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението за размер на файлове за този сървър",
     "Gets or sets the room topic": "Взима или настройва темата на стаята",
@@ -1329,7 +1244,6 @@
     "Book": "Книга",
     "Pencil": "Молив",
     "Paperclip": "Кламер",
-    "Padlock": "Катинар",
     "Key": "Ключ",
     "Hammer": "Чук",
     "Telephone": "Телефон",
@@ -1347,12 +1261,6 @@
     "Headphones": "Слушалки",
     "Folder": "Папка",
     "Pin": "Кабърче",
-    "Your homeserver does not support device management.": "Вашият сървър не поддържа управление на устройствата.",
-    "This backup is trusted because it has been restored on this device": "Това резервно копие е доверено, понеже е било възстановено на това устройство",
-    "Some devices for this user are not trusted": "Някои устройства на този потребител не са доверени",
-    "Some devices in this encrypted room are not trusted": "Някои устройства в тази шифрована стая не са доверени",
-    "All devices for this user are trusted": "Всички устройства на този потребител са доверени",
-    "All devices in this encrypted room are trusted": "Всички устройства в тази шифрована стая са доверени",
     "Recovery Key Mismatch": "Ключа за възстановяване не съвпада",
     "Incorrect Recovery Passphrase": "Неправилна парола за възстановяване",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Резервното копие не можа да бъде разшифровано с тази парола: потвърдете, че сте въвели правилната парола.",
@@ -1362,16 +1270,13 @@
     "This homeserver does not support communities": "Този сървър не поддържа общности",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ще Ви бъде изпратен имейл за потвърждение на новата парола.",
     "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.": "Бяхте изхвърлени от профила на всички ваши устройства и вече няма да получавате известия на тях. За да включите известията отново, влезте пак от всяко едно устройство.",
     "This homeserver does not support login using email address.": "Този сървър не поддържа влизане в профил посредством имейл адрес.",
     "Registration has been disabled on this homeserver.": "Регистрацията е изключена на този сървър.",
     "Unable to query for supported registration methods.": "Неуспешно взимане на поддържаните методи за регистрация.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Сигурни ли сте? Ако нямате работещо резервно копие на ключовете, ще загубите достъп до шифрованите съобщения.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Шифрованите съобщения са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за четенето им.",
     "Restore from Backup": "Възстанови от резервно копие",
-    "This device is backing up your keys. ": "Това устройство прави резервни копия на ключовете. ",
     "Back up your keys before signing out to avoid losing them.": "Направете резервно копие на ключовете преди изход от профила, за да не ги загубите.",
-    "Your keys are <b>not being backed up from this device</b>.": "<b>Това устройство не прави резервно копие</b> на ключовете Ви.",
     "Start using Key Backup": "Включи резервни копия за ключовете",
     "Never lose encrypted messages": "Никога не губете шифровани съобщения",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Съобщенията в тази стая са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за разчитането им.",
@@ -1390,7 +1295,6 @@
     "Set up with a Recovery Key": "Настрой с ключ за възстановяване",
     "Please enter your passphrase a second time to confirm.": "Въведете паролата отново за потвърждение.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключът за възстановяване дава допълнителна сигурност - може да го използвате за да възстановите достъпа до шифрованите съобщения, в случай че забравите паролата.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Пазете ключът за възстановяване на много сигурно място, например в password manager програма или сейф",
     "Your keys are being backed up (the first backup could take a few minutes).": "Прави се резервно копие на ключовете Ви (първото копие може да отнеме няколко минути).",
     "Secure your backup with a passphrase": "Защитете резервното копие с парола",
     "Confirm your passphrase": "Потвърдете паролата",
@@ -1448,22 +1352,15 @@
     "Power level": "Ниво на достъп",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирайте <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> за най-добра работа.",
     "Want more than a community? <a>Get your own server</a>": "Искате повече от общност? <a>Сдобийте се със собствен сървър</a>",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Промяната на паролата Ви, ще анулира всички ключове за шифроване от-край-до-край по всички Ваши устройства, правейки историята на чата нечетима. Настройте резервно копие на ключовете или експортирайте ключовете от друго устройство преди да промените паролата си.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Дали използвате 'breadcrumbs' функцията (аватари над списъка със стаи)",
     "Replying With Files": "Отговаряне с файлове",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Все още не е възможно да отговорите с файл. Искате ли да качите файла без той да бъде отговор?",
     "The file '%(fileName)s' failed to upload.": "Файлът '%(fileName)s' не можа да бъде качен.",
-    "Room upgrade confirmation": "Потвърждение на обновяването на стаята",
-    "Upgrading a room can be destructive and isn't always necessary.": "Обновяването на стаята може да бъде деструктивно и не винаги е задължително.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Обновяването на стаи обикновено се препоръчва за стаи с версии считащи се за <i>нестабилни</i>. Нестабилните версии може да имат бъгове, липсващи функции или проблеми със сигурността.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Обновяванията на стаи обикновено повлияват само <i>сървърната</i> обработка. Ако имате проблем с Riot, моля съобщете за него със <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Внимание</b>: Обновяването на стаята <i>няма автоматично да прехвърли членовете в новата версия на стаята.</i> Ще изпратим съобщение в старата стая с връзка към новата - членовете на стаята ще трябва да кликнат на връзката за да влязат в новата стая.",
     "Adds a custom widget by URL to the room": "Добавя собствено приспособление от URL в стаята",
     "Please supply a https:// or http:// widget URL": "Моля, укажете https:// или http:// адрес на приспособление",
     "You cannot modify widgets in this room.": "Не можете да модифицирате приспособления в тази стая.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s премахна покана към %(targetDisplayName)s за присъединяване в стаята.",
-    "Enable desktop notifications for this device": "Включи известия на работния плот за това устройство",
-    "Enable audible notifications for this device": "Включи звукови уведомления за това устройство",
     "Upgrade this room to the recommended room version": "Обнови тази стая до препоръчаната версия на стаята",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Тази стая използва версия на стая <roomVersion />, която сървърът счита за <i>нестабилна</i>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновяването на тази стая ще изключи текущата стая и ще създаде обновена стая със същото име.",
@@ -1504,8 +1401,6 @@
     "A conference call could not be started because the integrations server is not available": "Не може да бъде започнат конферентен разговор, защото сървърът за интеграции не е достъпен",
     "The server does not support the room version specified.": "Сървърът не поддържа указаната версия на стая.",
     "Name or Matrix ID": "Име или Matrix идентификатор",
-    "Email, name or Matrix ID": "Имейл, име или Matrix идентификатор",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Потвърдете, че искате да обновите стаята от <oldVersion /> до <newVersion />.",
     "Changes your avatar in this current room only": "Променя снимката Ви само в тази стая",
     "Unbans user with given ID": "Премахва блокирането на потребител с даден идентификатор",
     "Sends the given message coloured as a rainbow": "Изпраща текущото съобщение оцветено като дъга",
@@ -1515,10 +1410,6 @@
     "Sends the given emote coloured as a rainbow": "Изпраща дадената емоция, оцветена като дъга",
     "Show hidden events in timeline": "Покажи скрити събития по времевата линия",
     "When rooms are upgraded": "Когато стаите се актуализират",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Това устройстовото <b>не архивира ключовете ви</b>, вие обаче имате съществуващ архив, от който можете да ги възстановите и към който да ги добавяте в бъдеще.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Преди да се отпишете, свържете устройство си към архивирането, за да предотвратите загуба на ключове, който може да се намират само на него.",
-    "Connect this device to Key Backup": "Свържете това устройство към Архивиране на ключове",
-    "Backup has an <validity>invalid</validity> signature from this device": "Архивирането получи <validity>невалиден</validity> подпис от това устройство",
     "this room": "тази стая",
     "View older messages in %(roomName)s.": "Виж по-стари съобщения в %(roomName)s.",
     "Joining room …": "Влизане в стая …",
@@ -1612,8 +1503,6 @@
     "Changes your avatar in all rooms": "Променя снимката ви във всички стаи",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Моля, кажете ни какво се обърка, или още по-добре - създайте проблем в GitHub обясняващ ситуацията.",
     "Removing…": "Премахване…",
-    "Clear all data on this device?": "Изчистване на всички данни от това устройство?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Изчистването на всички данни от устройството е необратимо. Шифрованите съобщения ще бъдат загубени, освен ако не е било направено резервно копие на ключовете.",
     "Clear all data": "Изчисти всички данни",
     "Your homeserver doesn't seem to support this feature.": "Не изглежда сървърът ви да поддържа тази функция.",
     "Resend edit": "Изпрати наново корекцията",
@@ -1621,14 +1510,12 @@
     "Resend removal": "Изпрати наново премахването",
     "Failed to re-authenticate due to a homeserver problem": "Неуспешна повторна автентикация поради проблем със сървъра",
     "Failed to re-authenticate": "Неуспешна повторна автентикация",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Възвърнете си достъпа до профила и възстановете ключовете за шифроване съхранени на това устройство. Без тях няма да можете да четете защитени съобщения на кое да е устройство.",
     "Enter your password to sign in and regain access to your account.": "Въведете паролата си за да влезете и да възстановите достъп до профила.",
     "Forgotten your password?": "Забравили сте си паролата?",
     "Sign in and regain access to your account.": "Влез и възвърни достъп до профила.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Не можете да влезете в профила си. Свържете се с администратора на сървъра за повече информация.",
     "You're signed out": "Излязохте от профила",
     "Clear personal data": "Изчисти личните данни",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Внимание: личните ви данни (включително ключове за шифроване) все още се съхраняват на това устройство.  Изчистете, ако сте приключили с използването на това устройство или искате да влезете в друг профил.",
     "Identity Server": "Сървър за самоличност",
     "Find others by phone or email": "Открийте други по телефон или имейл",
     "Be found by phone or email": "Бъдете открит по телефон или имейл",
@@ -1641,7 +1528,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Попитайте администратора на сървъра ви (<code>%(homeserverDomain)s</code>) да конфигурира TURN сървър, за да може разговорите да работят надеждно.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Като алтернатива, може да използвате публичния сървър <code>turn.matrix.org</code>, но той не е толкова надежден, а и IP адресът ви ще бъде споделен с него. Може да управлявате това в Настройки.",
     "Try using turn.matrix.org": "Опитай turn.matrix.org",
-    "Failed to start chat": "Неуспешно започване на чат",
     "Messages": "Съобщения",
     "Actions": "Действия",
     "Displays list of commands with usages and descriptions": "Показва списък с команди, начин на използване и описания",
@@ -1667,7 +1553,6 @@
     "Discovery": "Откриване",
     "Deactivate account": "Деактивиране на акаунт",
     "Always show the window menu bar": "Винаги показвай менютата на прозореца",
-    "A device's public name is visible to people you communicate with": "Публичното име на устройството е видимо от всички, с които комуникирате",
     "Unable to revoke sharing for email address": "Неуспешно оттегляне на споделянето на имейл адреса",
     "Unable to share email address": "Неуспешно споделяне на имейл адрес",
     "Revoke": "Оттегли",
@@ -1680,7 +1565,6 @@
     "Remove %(email)s?": "Премахни %(email)s?",
     "Remove %(phone)s?": "Премахни %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Беше изпратено SMS съобщение към +%(msisdn)s. Въведете съдържащият се код за потвърждение.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "За да потвърдите, че устройството е доверено, проверете дали ключът в Потребителски Настройки на устройството съвпада с ключа по-долу:",
     "Command Help": "Помощ за команди",
     "No identity server is configured: add one in server settings to reset your password.": "Не е конфигуриран сървър за самоличност: добавете такъв в настройки за сървъри за да може да възстановите паролата си.",
     "You do not have the required permissions to use this command.": "Нямате необходимите привилегии за да използвате тази команда.",
@@ -1772,7 +1656,6 @@
     "Add Phone Number": "Добави телефонен номер",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Това действие изисква връзка със сървъра за самоличност <server /> за валидиране на имейл адреса или телефонния номер, но сървърът не предоставя условия за ползване.",
     "Trust": "Довери се",
-    "Use the new, faster, composer for writing messages": "Използвай новия, по-бърз редактор за писане на съобщения",
     "Show previews/thumbnails for images": "Показвай преглед (умален размер) на снимки",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Би било добре да <b>премахнете личните си данни</b> от сървъра за самоличност <idserver /> преди прекъсване на връзката. За съжаление, сървърът за самоличност <idserver /> в момента не е достъпен.",
     "You should:": "Ще е добре да:",
@@ -1841,8 +1724,6 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s започна гласово обаждане. (не се поддържа от този браузър)",
     "%(senderName)s placed a video call.": "%(senderName)s започна видео обаждане.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s започна видео обаждане. (не се поддържа от този браузър)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Изпращай заявки за потвърждение в директни съобщения, както и нов панел за верификация на членове.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Включи кръстосано-подписване, за да се верифицира на ниво потребител, а не устройство (в процес на разработка)",
     "Enable local event indexing and E2EE search (requires restart)": "Включи локални индексиране на събития и E2EE търсене (изисква рестартиране)",
     "Match system theme": "Напасване със системната тема",
     "My Ban List": "Моя списък с блокирания",
@@ -1874,11 +1755,9 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа до неща отговарящи на %(oldGlob)s към отговарящи на %(newGlob)s поради %(reason)s",
     "The message you are trying to send is too large.": "Съобщението, което се опитвате да изпратите е прекалено голямо.",
     "Cross-signing and secret storage are enabled.": "Кръстосано-подписване и секретно складиране са включени.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "За вашия профил има самоличност за кръстосано-подписване в секретно складиране, но все още не е доверена от това устройство.",
     "Cross-signing and secret storage are not yet set up.": "Кръстосаното-подписване и секретно складиране все още не са настроени.",
     "Bootstrap cross-signing and secret storage": "Инициализирай кръстосано-подписване и секретно складиране",
     "Cross-signing public keys:": "Публични ключове за кръстосано-подписване:",
-    "on device": "на устройството",
     "not found": "не са намерени",
     "Cross-signing private keys:": "Private ключове за кръстосано подписване:",
     "in secret storage": "в секретно складиране",
@@ -1888,10 +1767,7 @@
     "Backup has a <validity>valid</validity> signature from this user": "Резервното копие има <validity>валиден</validity> подпис за този потребител",
     "Backup has a <validity>invalid</validity> signature from this user": "Резервното копие има <validity>невалиден</validity> подпис за този потребител",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Резервното копие има подпис от <verify>непознат</verify> потребител с идентификатор %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Резервното копие има подпис от <verify>непознато</verify> устройство с идентификатор %(deviceId)s",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Резервния ключ е съхранен в секретно складиране, но тази функция не е включена на това устройство. Включете кръстосано-подписване от Labs за да промените състоянието на резервното копие на ключа.",
     "Backup key stored: ": "Резервният ключ е съхранен: ",
-    "Start using Key Backup with Secure Secret Storage": "Започни използване на резервно копие на ключ в защитено секретно складиране",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции <b>%(serverName)s</b> за управление на ботове, приспособления и стикери.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Използвай мениджър на интеграции за управление на ботове, приспособления и стикери.",
     "Manage integrations": "Управление на интеграциите",
@@ -1928,11 +1804,6 @@
     "Room ID or alias of ban list": "Идентификатор или име на стая списък за блокиране",
     "Subscribe": "Абонирай ме",
     "Cross-signing": "Кръстосано-подписване",
-    "This user has not verified all of their devices.": "Този потребител не е потвърдил всичките си устройства.",
-    "You have not verified this user. This user has verified all of their devices.": "Не сте потвърдили този потребител. Потребителят е потвърдил всичките си устройства.",
-    "You have verified this user. This user has verified all of their devices.": "Потвърдили сте този потребител. Потребителят е потвърдил всичките си устройства.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Някои потребители в тази стая не са потвърдени от вас или не са потвърдили собствените си устройства.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Всички потребители в тази стая са потвърдени от вас и са потвърдили всичките си устройства.",
     "This message cannot be decrypted": "Съобщението не може да бъде дешифровано",
     "Unencrypted": "Нешифровано",
     "Close preview": "Затвори прегледа",
@@ -1945,7 +1816,6 @@
     "%(count)s verified sessions|other": "%(count)s потвърдени сесии",
     "%(count)s verified sessions|one": "1 потвърдена сесия",
     "Direct message": "Директно съобщение",
-    "Unverify user": "Отпотвърди потребители",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> в%(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Съобщенията в тази стая са шифровани от край-до-край.",
     "Verify": "Потвърди",
@@ -1982,11 +1852,9 @@
     "Enter secret storage passphrase": "Въведете парола за секретно складиране",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Неуспешен достъп до секретно складиране. Уверете се, че сте въвели правилната парола.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Внимание</b>: Трябва да достъпвате секретно складиране само от доверен компютър.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Въведете парола за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ако сте забравили паролата си, може да <button1>използвате ключ за възстановяване</button1> или да <button2>настройте опции за възстановяване</button2>.",
     "Enter secret storage recovery key": "Въведете ключ за възстановяване на секретно складиране",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Неуспешен достъп до секретно складиране. Подсигурете се, че сте въвели правилния ключ за възстановяване.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Въведете ключа за възстановяване за да достъпите защитената история на съобщенията и самоличността за кръстосано-подписване и потвърждение на други устройства.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Ако сте забравили ключа си за възстановяване, може да <button>настройте нови опции за възстановяване</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Внимание</b>: Трябва да настройвате резервно копие на ключове само от доверен компютър.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ако сте забравили ключа за възстановяване, може да <button>настройте нови опции за възстановяване</button>",
@@ -2000,36 +1868,20 @@
     "Country Dropdown": "Падащо меню за избор на държава",
     "Verification Request": "Заявка за потвърждение",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Секретно Складиране ще бъде настроено със съществуващия ви резервен ключ. Паролата и ключа за секретно складиране ще бъдат същите каквито са за резервно складиране",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Внимание</b>: Желателно е да настройвате секретно складиране само от доверен компютър.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Ще използваме секретно складиране за да предоставим опцията да се съхрани шифровано копие на идентичността ви за кръстосано-подписване, за потвърждаване на други устройства и ключове. Защитете достъпа си до шифровани съобщения с парола за да е защитено.",
     "Set up with a recovery key": "Настрой с ключ за възстановяване",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Като предпазна мярка, ако забравите паролата, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Като предпазна мярка, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Съхранявайте ключа за възстановяване на сигурно място, като в password manager (или сейф).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ключа за възстановяване беше <b>копиран в клиборд</b>, поставете го в:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Ключа за възстановяване е във вашата папка <b>Изтегляния</b>.",
-    "Your access to encrypted messages is now protected.": "Достъпът ви до шифровани съобщения вече е защитен.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Без настройка на секретно складиране, ако излезе от профила или използвате друго устройство, няма да можете да възстановите достъпа до шифровани съобщения или идентичността за кръстосано-подписване за потвърждаване на други устройства.",
-    "Set up secret storage": "Настрой секретно складиране",
-    "Migrate from Key Backup": "Мигрирай от резервно копие на ключове",
-    "Secure your encrypted messages with a passphrase": "Защитете шифрованите съобщения с парола",
     "Storing secrets...": "Складиране на тайни...",
     "Unable to set up secret storage": "Неуспешна настройка на секретно складиране",
-    "New DM invite dialog (under development)": "Нов процес за канене чрез директни съобщения (все още се разработва)",
     "Show info about bridges in room settings": "Показвай информация за връзки с други мрежи в настройките на стаята",
-    "This bridge was provisioned by <user />": "Тази връзка с друга мрежа е била настроена от <user />",
     "This bridge is managed by <user />.": "Тази връзка с друга мрежа се управлява от <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Свързано с <channelLink /><networkLink />, посредством <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Свързано с <channelIcon /><channelName /> посредством <networkIcon /><networkName />",
-    "Connected via %(protocolName)s": "Свързано посредством %(protocolName)s",
-    "Bridge Info": "Информация за връзката с друга мрежа",
-    "Below is a list of bridges connected to this room.": "По-долу е списък на връзки с други мрежи свързани с тази стая.",
     "Recent Conversations": "Скорошни разговори",
     "Suggestions": "Предложения",
     "Show more": "Покажи повече",
     "Direct Messages": "Директни съобщения",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ако не можете да намерите някой, питайте за потребителското им име, или споделете своето (%(userId)s) или <a>връзка към профила</a>.",
     "Go": "Давай",
     "Failed to find the following users": "Неуспешно откриване на следните потребители",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следните потребители не съществуват или са невалидни и не могат да бъдат поканени: %(csvNames)s"
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 77c8a9e635..87e90fec9d 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1,5 +1,4 @@
 {
-    "People": "Gent",
     "Add a widget": "Afegeix un giny",
     "Account": "Compte",
     "No Microphones detected": "No s'ha detectat cap micròfon",
@@ -42,7 +41,6 @@
     "This phone number is already in use": "Aquest número de telèfon ja està en ús",
     "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic. Assegureu-vos de fer clic a l'enllaç del correu electrònic de verificació",
     "Call Failed": "No s'ha pogut realitzar la trucada",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hi ha dispositius desconeguts a aquesta sala: si continueu sense verificar-los, és possible que algú escolti la vostra trucada.",
     "Review Devices": "Revisió de dispositius",
     "Call Anyway": "Truca de totes maneres",
     "Answer Anyway": "Contesta de totes maneres",
@@ -105,10 +103,6 @@
     "Moderator": "Moderador",
     "Admin": "Administrador",
     "Start a chat": "Comença un xat",
-    "Who would you like to communicate with?": "Amb qui us voleu comunicar?",
-    "Start Chat": "Comença un xat",
-    "Invite new room members": "Convida a nous membres a la sala",
-    "Send Invites": "Envia invitacions",
     "Failed to invite": "No s'ha pogut tramitar la invitació",
     "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
     "You need to be logged in.": "És necessari estar autenticat.",
@@ -130,14 +124,8 @@
     "You are now ignoring %(userId)s": "Esteu ignorant l'usuari %(userId)s",
     "Unignored user": "Usuari no ignorat",
     "You are no longer ignoring %(userId)s": "Ja no esteu ignorant l'usuari %(userId)s",
-    "Device already verified!": "El dispositiu ja estava verificat!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "AVÍS: El dispositiu ja estava verificat, però les claus NO COINCIDEIXEN!",
-    "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!": "AVÍS: NO S'HA POGUT VERIFICAR! La clau de signatura de l'usuari %(userId)s i el dispositiu %(deviceId)s és \"%(fprint)s\", però no coincideix amb la clau \"%(fingerprint)s\". Això pot voler dir que les vostres comunicacions estan sent interceptades!",
     "Verified key": "Claus verificades",
     "Call Timeout": "Temps d'espera de les trucades",
-    "Unknown (user, device) pair:": "Parell desconegut (usuari, dispositiu):",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clau de signatura que heu proporcionat coincideix amb la clau de signatura que heu rebut del dispositiu %(deviceId)s de l'usuari %(userId)s. S'ha marcat el dispositiu com a dispositiu verificat.",
-    "Unrecognised command:": "Ordre no reconegut:",
     "Reason": "Raó",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha acceptat la invitació de %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s ha acceptat una invitació.",
@@ -174,7 +162,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible el futur historial de la sala per a tothom.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible el futur historial de la sala per a desconeguts (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat el xifratge d'extrem a extrem (algoritme %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de poders de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
@@ -196,7 +183,6 @@
     "Autoplay GIFs and videos": "Reprodueix de forma automàtica els GIF i vídeos",
     "Enable automatic language detection for syntax highlighting": "Activa la detecció automàtica d'idiomes per al ressaltat de sintaxi",
     "Automatically replace plain text Emoji": "Substitueix automàticament Emoji de text pla",
-    "Never send encrypted messages to unverified devices in this room from this device": "No enviïs mai missatges xifrats a dispositius no verificats en aquesta sala des d'aquest dispositiu",
     "Enable inline URL previews by default": "Activa per defecte la vista prèvia d'URL en línia",
     "Enable URL previews for this room (only affects you)": "Activa la vista prèvia d'URL d'aquesta sala (no afecta altres usuaris)",
     "Enable URL previews by default for participants in this room": "Activa per defecte la vista prèvia d'URL per als participants d'aquesta sala",
@@ -204,7 +190,6 @@
     "Active call (%(roomName)s)": "Trucada activa (%(roomName)s)",
     "unknown caller": "trucada d'un desconegut",
     "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s",
-    "Never send encrypted messages to unverified devices from this device": "No enviïs mai missatges xifrats a dispositius no verificats des d'aquest dispositiu",
     "Incoming video call from %(name)s": "Trucada de vídeo entrant de %(name)s",
     "Incoming call from %(name)s": "Trucada entrant de %(name)s",
     "Decline": "Declina",
@@ -218,7 +203,6 @@
     "No display name": "Sense nom visible",
     "New passwords don't match": "Les noves contrasenyes no coincideixen",
     "Passwords can't be empty": "Les contrasenyes no poden estar buides",
-    "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.": "Si canvieu la contrasenya, es reiniciaran totes les actuals claus de xifratge d'extrem per a tots els dispositius, fent que l'historial xifrat no sigui llegible, tret que primer exporteu les claus de la vostra sala i les torneu a importar després. En un futur això serà millorat.",
     "Export E2E room keys": "Exporta les claus E2E de la sala",
     "Do you want to set an email address?": "Voleu establir una adreça de correu electrònic?",
     "Current password": "Contrasenya actual",
@@ -226,10 +210,7 @@
     "New Password": "Nova contrasenya",
     "Confirm password": "Confirma la contrasenya",
     "Change Password": "Canvia la contrasenya",
-    "Unable to load device list": "No s'ha pogut carregar la llista de dispositius",
     "Authentication": "Autenticació",
-    "Delete %(count)s devices|other": "Suprimeix %(count)s dispositius",
-    "Delete %(count)s devices|one": "Suprimeix el dispositiu",
     "Device ID": "ID del dispositiu",
     "Last seen": "Vist per última vegada",
     "Failed to set display name": "No s'ha pogut establir el nom visible",
@@ -246,9 +227,6 @@
     "%(senderName)s sent a video": "%(senderName)s ha enviat un vídeo",
     "%(senderName)s uploaded a file": "%(senderName)s ha pujat un fitxer",
     "Options": "Opcions",
-    "Undecryptable": "Indesxifrable",
-    "Encrypted by an unverified device": "Xifrat per un dispositiu no verificat",
-    "Unencrypted message": "Missatge no xifrat",
     "Please select the destination room for this message": "Si us plau, seleccioneu la sala destinatària per a aquest missatge",
     "Blacklisted": "Llista negre",
     "device id: ": "ID del dispositiu: ",
@@ -269,8 +247,6 @@
     "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.": "No podreu desfer aquest canvi ja que estareu baixant de grau de privilegis. Només un altre usuari amb més privilegis podrà fer que els recupereu.",
     "Are you sure?": "Esteu segur?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podreu desfer aquesta acció ja que esteu donant al usuari el mateix nivell de privilegi que el vostre.",
-    "No devices with registered encryption keys": "No hi ha cap dispositiu amb les claus de xifratge registrades",
-    "Devices": "Dispositius",
     "Unignore": "Deixa de ignorar",
     "Ignore": "Ignora",
     "Jump to read receipt": "Vés a l'últim missatge llegit",
@@ -292,21 +268,15 @@
     "Voice call": "Trucada de veu",
     "Video call": "Trucada de vídeo",
     "Upload file": "Puja un fitxer",
-    "Show Text Formatting Toolbar": "Mostra la barra d'eines de format de text",
     "Send an encrypted reply…": "Envia una resposta xifrada…",
     "Send a reply (unencrypted)…": "Envia una resposta (sense xifrar)…",
     "Send an encrypted message…": "Envia un missatge xifrat…",
     "Send a message (unencrypted)…": "Envia un missatge (sense xifrar)…",
     "You do not have permission to post to this room": "No teniu el permís per escriure en aquesta sala",
-    "Hide Text Formatting Toolbar": "Amaga la barra d'eines de format de text",
     "Server error": "S'ha produït un error al servidor",
     "Mirror local video feed": "Mostra el vídeo local com un mirall",
     "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
     "Command error": "S'ha produït un error en l'ordre",
-    "bold": "negreta",
-    "italic": "cursiva",
-    "Markdown is disabled": "El Markdown està desactivat",
-    "Markdown is enabled": "El Markdown està activat",
     "Jump to message": "Salta al missatge",
     "No pinned messages.": "No hi ha cap missatge fixat.",
     "Loading...": "S'està carregant...",
@@ -362,8 +332,6 @@
     "Permissions": "Permisos",
     "Add a topic": "Afegeix un tema",
     "Jump to first unread message.": "Salta al primer missatge no llegit.",
-    "Invalid alias format": "El format de l'àlies no és vàlid",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no és un format d'àlies vàlid",
     "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç de la sala, inclosos els usuaris d'altres xarxes",
     "not specified": "sense especificar",
     "Remote addresses for this room:": "Adreces remotes per a aquesta sala:",
@@ -521,19 +489,11 @@
     "Unknown error": "S'ha produït un error desconegut",
     "Incorrect password": "Contrasenya incorrecta",
     "Deactivate Account": "Desactivar el compte",
-    "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:": "Per verificar que es pot confiar en aquest dispositiu, poseu-vos en contacte amb el propietari mitjançant altres mitjans (per exemple, en persona o amb una trucada telefònica) i pregunteu-li si la clau que veuen a la configuració del seu usuari, aquest dispositiu coincideix amb la següent clau:",
-    "Device name": "Nom del dispositiu",
-    "Device key": "Clau del dispositiu",
-    "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.": "Si coincideix, premeu el botó de verificació de sota. Si no coincideix, algú més està interceptant aquest dispositiu i probablement voleu prémer el botó de llista negra.",
-    "Verify device": "Verifica el dispositiu",
     "I verify that the keys match": "Verifico que les claus coincideixen",
     "An error has occurred.": "S'ha produït un error.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Heu afegit el nou dispositiu «%(displayName)s», que està demanant les claus de xifratge.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "El dispositiu no verificat «%(displayName)s» està demanant les claus de xifratge.",
     "Start verification": "Inicia la verificació",
     "Share without verifying": "Comparteix sense verificar",
     "Ignore request": "Ignora la sol·licitud",
-    "Loading device info...": "S'està carregant la informació del dispositiu...",
     "Encryption key request": "Sol·licitud de claus",
     "Unable to restore session": "No s'ha pogut restaurar la sessió",
     "Invalid Email Address": "El correu electrònic no és vàlid",
@@ -552,11 +512,6 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Aquest serà el nom del seu compte al <span></span> servidor amfitrió, o bé trieu-ne un altre <a>different server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Si ja teniu un compte a Matrix, podeu <a>log in</a>.",
     "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.": "Si anteriorment heu utilitzat un versió de Riot més recent, la vostra sessió podría ser incompatible amb aquesta versió. Tanqueu aquesta finestra i torneu a la versió més recent.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Actualment teniu a la llista negre els dispositius no verificats; per enviar missatges a aquests dispositius, els heu de verificar abans.",
-    "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.": "Recomanem que dugueu a terme el procès de verificació per a cada dispositiu per tal de confirmar que són del legítim propietari, però podeu enviar el missatge sense verificar-ho si ho preferiu.",
-    "Room contains unknown devices": "Hi ha dispositius desconeguts a la sala",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "A la sala «%(RoomName)s» hi ha dispositius que no havíeu vist abans.",
-    "Unknown devices": "Dispositius desconeguts",
     "Private Chat": "Xat privat",
     "Public Chat": "Xat públic",
     "Custom": "Personalitzat",
@@ -613,7 +568,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.",
     "You have no visible notifications": "No teniu cap notificació visible",
     "Scroll to bottom of page": "Desplaça't fins a la part inferior de la pàgina",
-    "Message not sent due to unknown devices being present": "El missatge no s'ha enviat perquè hi ha dispositius desconeguts presents",
     "%(count)s of your messages have not been sent.|other": "Alguns dels vostres missatges no s'han enviat.",
     "%(count)s of your messages have not been sent.|one": "El vostre missatge no s'ha enviat.",
     "Warning": "Avís",
@@ -636,7 +590,6 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "S'ha intentat carregar un punt específic dins la línia de temps d'aquesta sala, però no teniu permís per veure el missatge en qüestió.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "S'ha intentat carregar un punt específic de la línia de temps d'aquesta sala, però no s'ha pogut trobar.",
     "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra els dispositius</showDevicesText>, <sendAnywayText>envia de totes maneres</sendAnywayText> o <cancelText>cancel·la</cancelText>.",
     "Signed Out": "Sessió tancada",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar tot</resendText> o <cancelText>cancel·lar tot</cancelText> ara. També pots seleccionar missatges individualment per reenviar o cancel·lar.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar missarge</resendText> o <cancelText>cancel·lar missatge</cancelText> ara.",
@@ -648,10 +601,7 @@
     "Sign out": "Tancar sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
     "Cryptography": "Criptografia",
-    "Device ID:": "ID del dispositiu:",
-    "Device key:": "Clau del dispositiu:",
     "Labs": "Laboraroris",
-    "matrix-react-sdk version:": "Versió de matrix-react-sdk:",
     "riot-web version:": "Versió de riot-web:",
     "olm version:": "Versió d'olm:",
     "Incorrect username and/or password.": "Usuari i/o contrasenya incorrectes.",
@@ -664,7 +614,6 @@
     "Event information": "Informació d'esdeveniment",
     "User ID": "ID de l'usuari",
     "Decryption error": "Error de desxifratge",
-    "Sender device information": "Informació del dispositiu remitent",
     "Export room keys": "Exporta les claus de la sala",
     "Upload an avatar:": "Pujar un avatar:",
     "Confirm passphrase": "Introduïu una contrasenya",
@@ -736,7 +685,6 @@
     "Noisy": "Sorollós",
     "Collecting app version information": "S'està recollint la informació de la versió de l'aplicació",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Voleu esborrar de la sala l'alies %(alias)s i retirar %(name)s del directori?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Això farà possible que pugueu tronar al vostre compte des de qualsevol dispositiu.",
     "Enable notifications for this account": "Habilita les notificacions per aquest compte",
     "Invite to this community": "Convida a aquesta comunitat",
     "Search…": "Cerca…",
@@ -847,7 +795,6 @@
     "Define the power level of a user": "Defineix el nivell d'autoritat d'un usuari",
     "Deops user with given id": "Degrada l'usuari amb l'id donat",
     "Opens the Developer Tools dialog": "Obre el diàleg d'Eines del desenvolupador",
-    "Verifies a user, device, and pubkey tuple": "Verifica un usuari, dispositiu i tupla de clau pública",
     "Displays action": "Mostra l'acció",
     "Whether or not you're logged in (we don't record your username)": "Si heu iniciat sessió o no (no desem el vostre usuari)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fitxer %(fileName)s supera el límit de pujades del servidor",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 5aacb27c80..53126e8ff6 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -8,11 +8,9 @@
     "Logout": "Odhlásit se",
     "Low priority": "Nízká priorita",
     "Notifications": "Upozornění",
-    "People": "Lidé",
     "Rooms": "Místnosti",
     "Search": "Hledání",
     "Settings": "Nastavení",
-    "Start Chat": "Začít chat",
     "This room": "Tato místnost",
     "Video call": "Videohovor",
     "Voice call": "Telefonát",
@@ -94,7 +92,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil/a název místnosti.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na „%(topic)s“.",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
-    "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.": "V současnosti změna hesla resetuje všechny šifrovací klíče na všech zařízeních, což vám znepřístupní historii zašifrovaných chatů, pokud si nejprve nevyexportujete klíče svých místností a pak je do nich znova nevložíte. Toto bude v budoucnu lépe ošetřeno.",
     "Command error": "Chyba příkazu",
     "Commands": "Příkazy",
     "Confirm password": "Potvrďte heslo",
@@ -111,12 +108,8 @@
     "Decryption error": "Chyba dešifrování",
     "Delete widget": "Vymazat widget",
     "Default": "Výchozí",
-    "Device already verified!": "Zařízení již bylo ověřeno!",
     "Device ID": "ID zařízení",
-    "Device ID:": "ID zařízení:",
     "device id: ": "id zařízení: ",
-    "Device key:": "Klíč zařízení:",
-    "Devices": "Zařízení",
     "Direct chats": "Přímé chaty",
     "Disable Notifications": "Vypnout upozornění",
     "Disinvite": "Odvolat pozvání",
@@ -128,7 +121,6 @@
     "Emoji": "Emodži",
     "Enable automatic language detection for syntax highlighting": "Zapnout kvůli zvýrazňování syntaxe automatické rozpoznávání jazyka",
     "Enable Notifications": "Zapnout upozornění",
-    "Encrypted by an unverified device": "Zašifrováno neověřeným zařízením",
     "%(senderName)s ended the call.": "%(senderName)s ukončil/a hovor.",
     "End-to-end encryption information": "Informace o end-to-end šifrování",
     "Enter passphrase": "Zadejte heslo",
@@ -174,13 +166,10 @@
     "Incoming voice call from %(name)s": "Příchozí hlasový hovor od %(name)s",
     "Incorrect username and/or password.": "Nesprávné uživatelské jméno nebo heslo.",
     "Incorrect verification code": "Nesprávný ověřovací kód",
-    "Invalid alias format": "Neplaný formát aliasu",
     "Invalid Email Address": "Neplatná e-mailová adresa",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval/a %(targetName)s.",
-    "Invite new room members": "Pozvat do místnosti nové členy",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' není platný formát aliasu",
     "Join Room": "Vstoupit do místnosti",
     "%(targetName)s joined the room.": "%(targetName)s vstoupil/a do místnosti.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopnul/a %(targetName)s.",
@@ -189,7 +178,6 @@
     "Last seen": "Naposledy viděn/a",
     "Leave room": "Odejít z místnosti",
     "Local addresses for this room:": "Místní adresy této místnosti:",
-    "matrix-react-sdk version:": "Verze matrix-react-sdk:",
     "Moderator": "Moderátor",
     "Name": "Jméno",
     "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (např. #neco:%(localDomain)s)",
@@ -224,13 +212,11 @@
     "riot-web version:": "verze riot-web:",
     "Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
     "Room Colour": "Barva místnosti",
-    "Room contains unknown devices": "V místnosti jsou neznámá zařízení",
     "%(roomName)s does not exist.": "%(roomName)s neexistuje.",
     "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
     "Save": "Uložit",
     "Scroll to bottom of page": "Přejít na konec stránky",
     "Send anyway": "Přesto poslat",
-    "Sender device information": "Informace o zařízení odesílatele",
     "Send Reset Email": "Poslat resetovací e-mail",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
@@ -251,7 +237,6 @@
     "Submit": "Odeslat",
     "Success": "Úspěch",
     "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Zadaný podepisovaný klíč se shoduje s klíčem obdrženým od uživatele %(userId)s ze zařízení %(deviceId)s. Zařízení je označeno jako ověřené.",
     "This email address is already in use": "Tato e-mailová adresa je již používaná",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
     "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
@@ -260,7 +245,6 @@
     "Warning!": "Varování!",
     "Who can access this room?": "Kdo má přístup k této místnosti?",
     "Who can read history?": "Kdo může číst historii?",
-    "Who would you like to communicate with?": "S kým byste chtěli komunikovat?",
     "You are not in this room.": "Nejste v této místnosti.",
     "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
     "You cannot place a call with yourself.": "Nemůžete volat sami sobě.",
@@ -288,7 +272,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Použijte tak, že vyčkáte na načtení našeptávaných výsledků a ty pak projdete tabulátorem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nemáte práva k zobrazení zprávy v daném časovém úseku.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úseku nenalezena.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s zapnul/a end-to-end šifrování (algoritmus %(algorithm)s).",
     "Unable to add email address": "Nepodařilo se přidat e-mailovou adresu",
     "Unable to create widget.": "Nepodařilo se vytvořit widget.",
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
@@ -297,17 +280,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal/a zpět %(targetName)s.",
     "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
     "Unable to enable Notifications": "Nepodařilo se povolit upozornění",
-    "Unable to load device list": "Nepodařilo se načíst seznam zařízení",
-    "Undecryptable": "Nerozšifrovatelné",
     "unencrypted": "nešifrované",
-    "Unencrypted message": "Nešifrovaná zpráva",
     "unknown caller": "neznámý volající",
     "unknown device": "neznámé zařízení",
     "Unknown room %(roomId)s": "Neznámá místnost %(roomId)s",
-    "Unknown (user, device) pair:": "Neznámý pár (uživatel, zařízení):",
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
-    "Unrecognised command:": "Nerozpoznaný příkaz:",
     "Unrecognised room alias:": "Nerozpoznaný alias místnosti:",
     "Uploading %(filename)s and %(count)s others|zero": "Nahrávám %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Nahrávám %(filename)s a %(count)s další",
@@ -326,7 +304,6 @@
     "Verified key": "Ověřený klíč",
     "(no answer)": "(žádná odpověď)",
     "(unknown failure: %(reason)s)": "(neznámá chyba: %(reason)s)",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Zařízení byl již ověřeno, ale klíče se NESHODUJÍ!",
     "The remote side failed to pick up": "Vzdálené straně se nepodařilo hovor přijmout",
     "Who would you like to add to this community?": "Koho chcete přidat do této skupiny?",
     "Invite new community members": "Pozvěte nové členy skupiny",
@@ -344,7 +321,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Failed to add the following rooms to %(groupId)s:": "Nepodařilo se přidat následující místnosti do %(groupId)s:",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Vaše e-mailová adresa zřejmě nepatří k žádnému Matrix ID na tomto domovském serveru.",
-    "Send Invites": "Odeslat pozvánky",
     "Failed to invite": "Pozvání se nezdařilo",
     "Failed to invite the following users to the %(roomName)s room:": "Do místnosti %(roomName)s se nepodařilo pozvat následující uživatele:",
     "You need to be logged in.": "Musíte být přihlášen/a.",
@@ -354,7 +330,6 @@
     "Unpin Message": "Odepnout zprávu",
     "Ignored user": "Ignorovaný uživatel",
     "Unignored user": "Odignorovaný uživatel",
-    "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!": "VAROVÁNÍ: OVĚŘENÍ KLÍČE SELHALO! Podepisovací klíč uživatele %(userId)s a zařízení %(deviceId)s je „%(fprint)s“, což nesouhlasí s dodaným klíčem „%(fingerprint)s“. Toto může znamenat, že vaše komunikace je odposlouchávána!",
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
@@ -371,8 +346,6 @@
     "Unignore": "Odignorovat",
     "Ignore": "Ignorovat",
     "Admin Tools": "Nástroje pro správce",
-    "bold": "tučně",
-    "italic": "kurzíva",
     "No pinned messages.": "Žádné připíchnuté zprávy.",
     "Pinned Messages": "Připíchnuté zprávy",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil/a svoje zobrazované jméno (%(oldDisplayName)s).",
@@ -404,18 +377,14 @@
     "Create": "Vytvořit",
     "User Options": "Volby uživatele",
     "Please select the destination room for this message": "Vyberte prosím pro tuto zprávu cílovou místnost",
-    "No devices with registered encryption keys": "Žádná zařízení se zaregistrovanými šifrovacími klíči",
     "Jump to read receipt": "Skočit na poslední potvrzení o přečtení",
     "Invite": "Pozvat",
     "Revoke Moderator": "Odebrat moderátorství",
     "Make Moderator": "Udělit moderátorství",
     "and %(count)s others...|one": "a někdo další...",
     "Hangup": "Zavěsit",
-    "Show Text Formatting Toolbar": "Zobrazit nástroje formátování textu",
-    "Hide Text Formatting Toolbar": "Skrýt nástroje formátování textu",
     "Jump to message": "Přeskočit na zprávu",
     "Loading...": "Načítání...",
-    "Loading device info...": "Načítá se info o zařízení...",
     "You seem to be uploading files, are you sure you want to quit?": "Zřejmě právě nahráváte soubory. Chcete přesto odejít?",
     "You seem to be in a call, are you sure you want to quit?": "Zřejmě máte probíhající hovor. Chcete přesto odejít?",
     "Idle": "Nečinný/á",
@@ -431,8 +400,6 @@
     "Mention": "Zmínit",
     "Blacklisted": "Na černé listině",
     "Invited": "Pozvaní",
-    "Markdown is disabled": "Markdown je vypnutý",
-    "Markdown is enabled": "Markdown je zapnutý",
     "Joins room with given alias": "Vstoupí do místnosti s daným aliasem",
     "Leave Community": "Odejít ze skupiny",
     "Leave %(groupName)s?": "Odejít z %(groupName)s?",
@@ -446,7 +413,6 @@
     "Failed to fetch avatar URL": "Nepodařilo se získat adresu avataru",
     "Error decrypting audio": "Chyba při dešifrování zvuku",
     "Banned by %(displayName)s": "Vykázán/a uživatelem %(displayName)s",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nikdy z tohoto zařízení neposílat šifrované zprávy neověřeným zařízením v této místnosti",
     "Privileged Users": "Privilegovaní uživatelé",
     "No users have specific privileges in this room": "Žádní uživatelé v této místnosti nemají zvláštní privilegia",
     "Publish this room to the public in %(domain)s's room directory?": "Zapsat tuto místnost do veřejného adresáře místností na %(domain)s?",
@@ -490,12 +456,9 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
     "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
     "Mirror local video feed": "Zrcadlit lokání video",
-    "Never send encrypted messages to unverified devices from this device": "Z tohoto zařízení nikdy neodesílat šifrované zprávy na neověřená zařízení",
     "Enable inline URL previews by default": "Nastavit povolení náhledů URL adres jako výchozí",
     "Enable URL previews for this room (only affects you)": "Povolit náhledy URL adres pro tuto místnost (ovlivňuje pouze vás)",
     "Enable URL previews by default for participants in this room": "Povolit náhledy URL adres pro členy této místnosti jako výchozí",
-    "Delete %(count)s devices|one": "Smazat zařízení",
-    "Delete %(count)s devices|other": "Smazat %(count)s zařízení",
     " (unsupported)": " (nepodporované)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Připojte se prostřednictvím <voiceText>audio</voiceText> nebo <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Probíhající konferenční hovor%(supportedText)s.",
@@ -608,14 +571,7 @@
     "Something went wrong whilst creating your community": "Něco se pokazilo během vytváření vaší skupiny",
     "Unknown error": "Neznámá chyba",
     "Incorrect password": "Nesprávné heslo",
-    "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:": "Pokud si chcete ověřit, zda je zařízení skutečně důvěryhodné, kontaktujte vlastníka jiným způsobem (např. osobně anebo telefonicky) a zeptejte se ho na klíč, který má pro toto zařízení zobrazený v nastavení a zda se shoduje s klíčem zobrazeným níže:",
-    "Device name": "Název zařízení",
-    "Device key": "Klíč zařízení",
-    "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.": "Pokud se klíče shodují, stlačte ověřovací tlačítko uvedené níže. Pokud se neshodují, někdo další odposlouchává toto zařízení a v takovém případě by jste měli místo toho vybrat tlačítko černé listiny.",
-    "Verify device": "Ověřit zařízení",
     "I verify that the keys match": "Ověřil jsem, klíče se shodují",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Přidali jste nové zařízení s názvem  '%(displayName)s', vyžadující šifrovací klíč.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Vaše neověřené zařízení s názvem '%(displayName)s' vyžaduje šifrovací klíč.",
     "Start verification": "Zahájit ověřování",
     "Share without verifying": "Sdílet bez ověření",
     "Ignore request": "Ignorovat žádost",
@@ -632,10 +588,6 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domácím serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud již účet Matrix máte, můžete se ihned <a>Přihlásit</a>.",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neověřená zařízení jsou v této chvíli na černé listině; pokud chcete zasílat zprávy na tato zařízení, musíte je nejdříve ověřit.",
-    "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.": "Doporučujeme vám projít procesem ověřování pro všechna zařízení, abyste si potvrdili, že patří jejich pravým vlastníkům, ale pokud si to přejete, můžete zprávu znovu odeslat bez ověřování.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "V místnosti „%(RoomName)s“ jsou zařízení s kterými jste dosud nikdy nekomunikovali.",
-    "Unknown devices": "Neznámá zařízení",
     "Private Chat": "Soukromý chat",
     "Public Chat": "Veřejný chat",
     "You must <a>register</a> to use this functionality": "Musíte být <a>zaregistrovaný</a> pokud chcete využívat této funkce",
@@ -678,12 +630,10 @@
     "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
     "Active call": "Aktivní hovor",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
-    "Message not sent due to unknown devices being present": "Zpráva nebyla odeslána vzhledem k nalezeným neznámým zařízením",
     "Room": "Místnost",
     "Failed to load timeline position": "Nepodařilo se načíst pozici na časové ose",
     "Light theme": "Světlý motiv",
     "Dark theme": "Tmavý motiv",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Vaše heslo bylo úspěšně změněno. Na ostatních zařízeních se vám již nebudou zobrazovat okamžitá oznámení do té chvíle než se na nich znovu přihlásíte",
     "Analytics": "Analytické údaje",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot sbírá anonymní analytické údaje, které nám umožňují aplikaci dále zlepšovat.",
     "Labs": "Experimentální funkce",
@@ -701,7 +651,6 @@
     "This server does not support authentication with a phone number.": "Tento server nepodporuje ověření telefonním číslem.",
     "Deops user with given id": "Zruší stav moderátor uživateli se zadaným ID",
     "Searches DuckDuckGo for results": "Vyhledá výsledky na DuckDuckGo",
-    "Verifies a user, device, and pubkey tuple": "Ověří zadané údaje uživatele, zařízení a veřejný klíč",
     "Ignores a user, hiding their messages from you": "Ignoruje uživatele a skryje všechny jeho zprávy",
     "Stops ignoring a user, showing their messages going forward": "Přestane ignorovat uživatele a začne zobrazovat jeho zprávy",
     "Notify the whole room": "Oznámení pro celou místnost",
@@ -711,7 +660,6 @@
     "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.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.",
     "Call Failed": "Hovor selhal",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V této místnosti jsou neznámá zařízení: Pokud budete pokračovat bez jejich ověření, někdo může Váš hovor odposlouchávat.",
     "Review Devices": "Ověřit zařízení",
     "Call Anyway": "Přesto zavolat",
     "Answer Anyway": "Přesto přijmout",
@@ -771,7 +719,6 @@
     "Resend": "Poslat znovu",
     "Collecting app version information": "Sbírání informací o verzi aplikace",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Smazat alias místnosti %(alias)s a odstranit %(name)s z adresáře?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Toto vám umožní vrátit se po odhlášení ke svému účtu a používat jej na ostatních zařízeních.",
     "Keywords": "Klíčová slova",
     "Enable notifications for this account": "Zapnout upozornění na tomto účtu",
     "Invite to this community": "Pozvat do této komunity",
@@ -878,27 +825,15 @@
     "Send analytics data": "Odesílat analytická data",
     "Enable widget screenshots on supported widgets": "Povolit screenshot widgetu pro podporované widgety",
     "This event could not be displayed": "Tato událost nemohla být zobrazena",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Žádost o sdílení klíče byla odeslána - prosím zkontrolujte si Vaše ostatí zařízení.",
-    "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.": "Žádost o sdílení klíčů je automaticky odesílaná na Vaše ostatní zařízení. Jestli jste žádost odmítly nebo zrušili dialogové okno se žádostí na ostatních zařízeních, kliknutím sem ji můžete opakovaně pro tuto relaci vyžádat.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Pokud Vaše ostatní zařízení nemají klíč pro tyto zprávy, nebudete je moci dešifrovat.",
     "Key request sent.": "Žádost o klíč poslána.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Znovu vyžádat šifrovací klíče</requestLink> z vašich ostatních zařízení.",
     "Demote yourself?": "Snížit Vaši vlastní hodnost?",
     "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.": "Tuto změnu nebudete moci vzít zpět, protože snižujete svoji vlastní hodnost, jste-li poslední privilegovaný uživatel v místnosti, bude nemožné vaši současnou hodnost získat zpět.",
     "Demote": "Degradovat",
     "Share Link to User": "Sdílet odkaz na uživatele",
-    "deleted": "smazáno",
-    "underlined": "podtrženo",
-    "inline-code": "vnořený kód",
-    "block-quote": "citace",
-    "bulleted-list": "odrážkový seznam",
-    "numbered-list": "číselný seznam",
     "Send an encrypted reply…": "Odeslat šifrovanou odpověď …",
     "Send a reply (unencrypted)…": "Odeslat odpověď (nešifrovaně) …",
     "Send an encrypted message…": "Odeslat šifrovanou zprávu …",
     "Send a message (unencrypted)…": "Odeslat zprávu (nešifrovaně) …",
-    "Unable to reply": "Není možné odpovědět",
-    "At this time it is not possible to reply with an emote.": "V odpovědi zatím nejde vyjádřit pocit.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) viděl %(dateTime)s",
     "Replying": "Odpovídá",
     "Share room": "Sdílet místnost",
@@ -975,7 +910,6 @@
     "Review terms and conditions": "Přečíst smluvní podmínky",
     "Did you know: you can use communities to filter your Riot.im experience!": "Věděli jste, že: práci s Riot.im si můžete zpříjemnit s použitím komunit!",
     "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.": "Pro nastavení filtru přetáhněte avatar komunity na panel filtrování na levé straně obrazovky. Potom můžete kdykoliv kliknout na avatar komunity na tomto panelu a Riot Vám bude zobrazovat jen místnosti a lidi z dané komunity.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobrazit zařízení</showDevicesText>, <sendAnywayText>i tak odeslat</sendAnywayText> a nebo  <cancelText>zrušit</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Dokud si nepřečtete a neodsouhlasíte <consentLink>naše smluvní podmínky</consentLink>, nebudete moci posílat žádné zprávy.",
     "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.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl svého měsíčního limitu pro aktivní uživatele. Prosím <a>kontaktujte Vašeho administratora</a> pro další využívání služby.",
     "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.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl limitu. Prosím <a>kontaktujte Vašeho administratora</a> pro další využívání služby.",
@@ -1017,9 +951,7 @@
     "Set a new password": "Nastavit nové heslo",
     "Room Name": "Jméno místnosti",
     "Room Topic": "Téma místnosti",
-    "No room avatar": "Žádný avatar místnosti",
     "Room avatar": "Avatar místnosti",
-    "Upload room avatar": "Nahrát avatar místnosti",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Změny toho kdo smí číst historické zprávy se aplikují jenom na další zprávy v této místosti. Viditelnost už poslaných zpráv zůstane jaká byla.",
     "To link to this room, please add an alias.": "K vytvoření odkazu je potřeba vyrobit místnosti alias.",
     "Roles & Permissions": "Funkce & Práva",
@@ -1065,7 +997,6 @@
     "Unable to verify phone number.": "Nepovedlo se ověřit telefonní číslo.",
     "Verification code": "Ověřovací kód",
     "Profile picture": "Profilový obrázek",
-    "Upload profile picture": "Nahrát profilový obrázek",
     "Display Name": "Zobrazované jméno",
     "Room Addresses": "Adresy místnosti",
     "For help with using Riot, click <a>here</a>.": "Pro pomoc s používáním Riotu, klikněte <a>sem</a>.",
@@ -1074,10 +1005,6 @@
     "Ignored users": "Ignorovaní uživatelé",
     "Bulk options": "Hromadná možnost",
     "Key backup": "Záloha klíčů",
-    "Some devices for this user are not trusted": "Některá zařízení nejsou důvěryhodné",
-    "Some devices in this encrypted room are not trusted": "Některá zařízení v této šifrované místnosti nejsou důvěryhodné",
-    "All devices for this user are trusted": "Všechna zařízení tohoto uživatele jsou důvěryhodná",
-    "All devices in this encrypted room are trusted": "Všechna zařízení v této šifrované místnosti jsou důveryhodná",
     "This room has been replaced and is no longer active.": "Tato místnost byla nahrazena a už není používaná.",
     "The conversation continues here.": "Konverzace pokračuje zde.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali jsme Vám ověřovací email. Následujte prosím instrukce a pak klikněte na následující tlačítko.",
@@ -1087,21 +1014,11 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené end-to-end šifrováním. Jenom Vy a příjemci mají dešifrovací klíče.",
     "Unable to load key backup status": "Nepovedlo se načíst stav zálohy",
     "Restore from Backup": "Obnovit ze zálohy",
-    "This device is backing up your keys. ": "Toto zařízení má zálohované klíče. ",
     "Back up your keys before signing out to avoid losing them.": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli.",
     "Backing up %(sessionsRemaining)s keys...": "Zálohování %(sessionsRemaining)s klíčů...",
     "All keys backed up": "Všechny klíče jsou zazálohované",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Záloha je podepsaná <verify>neznámým</verify> zařízením s ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "Záloha má <validity>platný</validity> podpis tohoto zařízení",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Záloha má <validity>platný</validity> podpis <verify>ověřeného</verify> zařízení <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Záloha má <validity>platný</validity> podpis <verify>neověřeného</verify> zařízení <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Záloha má <validity>neplatný</validity> podpis <verify>ověřeného</verify> zařízení <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Záloha má <validity>neplatný</validity> podpis <verify>neověřeného</verify> zařízení <device></device>",
-    "Backup is not signed by any of your devices": "Záloha není podepsaná žádným Vaším zařízením",
-    "This backup is trusted because it has been restored on this device": "Tato záloha je důvěryhodná, protože už z ní byly obnovené klíče",
     "Backup version: ": "Verze zálohy: ",
     "Algorithm: ": "Algoritmus: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Vaše klíče se z tohoto zařízení <b>nezálohují</b>.",
     "Start using Key Backup": "Začít používat zálohu klíčů",
     "Add an email address to configure email notifications": "Pro nastavení emailových upozornění je třeba přidat emailovou adresu",
     "Whether or not you're logged in (we don't record your username)": "Jestli jste přihlášený/á (nezaznamenáváme ale Vaše jméno)",
@@ -1175,7 +1092,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné obrázky.",
     "Verify this user by confirming the following number appears on their screen.": "Ověřte uživatele zkontrolováním, že se na obrazovce objevila stejná čísla.",
     "Unable to find a supported verification method.": "Nepovedlo se nám najít podporovanou metodu ověření.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Pro co nejlepší bezpečnost doporučujeme ověření dělat osobně nebo přes nějaký jiný důvěryhodný kanál.",
     "Dog": "Pes",
     "Cat": "Kočka",
     "Lion": "Lev",
@@ -1221,7 +1137,6 @@
     "Book": "Kniha",
     "Pencil": "Tužka",
     "Paperclip": "Sponka",
-    "Padlock": "Zámek",
     "Key": "Klíč",
     "Hammer": "Kladivo",
     "Telephone": "Telefon",
@@ -1262,7 +1177,6 @@
     "Incompatible Database": "Nekompatibilní databáze",
     "Continue With Encryption Disabled": "Pokračovat bez šifrování",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů Vám dává jistotu, že je komunikace důvěrná.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Ověření uživatele označí jeho zařízení za důvěryhodná a Vaše zařízení budou důvěryhodná pro něj.",
     "Waiting for partner to confirm...": "Čekám až to partner potvrdí...",
     "Incoming Verification Request": "Přišla Vám žádost o ověření",
     "Incompatible local cache": "Nekompatibilní lokální vyrovnávací paměť",
@@ -1288,9 +1202,7 @@
     "This looks like a valid recovery key!": "To vypadá jako správný klíč!",
     "Not a valid recovery key": "To není správný klíč",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Zadejte obnovovací klíč pro přístupu k historii zpráv a zabezpečené komunikaci.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Pokud si nepamatujete heslo k obnovení, můžete si <button>nastavit další možnosti obnovení klíčů</button>",
     "Recovery Method Removed": "Záloha klíčů byla odstraněna",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Na tomto zařízení došlo k odstranění hesla k zálohám a klíče k zabezpečné konverzaci.",
     "Go to Settings": "Přejít do nastavení",
     "Enter a passphrase...": "Zadejte silné heslo...",
     "For maximum security, this should be different from your account password.": "Z bezpečnostních důvodů by toto heslo mělo být jiné než přihlašovací heslo.",
@@ -1306,12 +1218,9 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie pokud byste zapomněl/a heslo k záloze.",
     "As a safety net, you can use it to restore your encrypted message history.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Obnovovací klíč je záchraná síť - lze použít k obnově zašifrovaných zpráv když zapomenete heslo.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Uchovejte tento klíč na velmi bezpečném místě, například ve správci hesel (password manageru) nebo v trezoru",
     "Your Recovery Key": "Váš klíč pro obnovu zálohy",
     "Copy to clipboard": "Zkopírovat do schránky",
     "Download": "Stáhnout",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Klíč byl <b>uložen do schránky</b>, vložte ho:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Klíč byl uložen do <b>složky se staženými soubory</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Vytiskněte</b> si ho a bezpečně ho uložte",
     "<b>Save it</b> on a USB key or backup drive": "<b>Uložte ho</b> na bezpečnou USB flash disk nebo zálohovací disk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Zkopírujte si ho</b> na osobní cloudové úložiště",
@@ -1326,7 +1235,6 @@
     "Unable to create key backup": "Nepovedlo se vyrobit zálohů klíčů",
     "Retry": "Zkusit znovu",
     "Set up Secure Messages": "Nastavit bezpečné obnovení zpráv",
-    "This device is encrypting history using the new recovery method.": "Toto zařízení šifruje historii pomocí nového způsobu zálohy a obnovy.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste způsob obnovy neodstranili Vy, útočníci se můžou pokoušet dostat k vašemu účtu. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
     "Set up": "Nastavit",
     "Don't ask again": "Už se neptat",
@@ -1334,9 +1242,7 @@
     "If you don't want to set this up now, you can later in Settings.": "Pokud nechcete nastavení dokončit teď, můžete se k tomu vrátit později v nastavení.",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Detekovali jsme nové heslo a klíč pro bezpečné obnovení.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste nenastavili nový způsob obnovy Vy, útočníci se můžou pokoušet dostat k vašemu účtu. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Pokud jste to udělali omylem, můžete si na tomto zařízení nastavit bezpečné obnovení zpráv, což znovu zašifruje kompletní historii s novým způsobem obnovení.",
     "Set up Secure Message Recovery": "Nastavit bezpečné obnovení zpráv",
-    "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.": "Když si nenastavíte bezpečné obnovení zpráv, nebudete mít možnost po odhlášení nebo přihlášení se na jiném zařízení číst historii šifrovaných konverzací.",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Bez nastavení bezpečného obnovení zpráv přijdete po odhlášení o historii šifrované komunikace.",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "V šifrovaných konverzacích zobrazovat upozornění na možnost aktivovat bezpečné obnovení zpráv",
     "Gets or sets the room topic": "Nastaví nebo zjistí téma místnosti",
@@ -1347,7 +1253,6 @@
     "Enable Community Filter Panel": "Povolit panel Filtr komunity",
     "Show developer tools": "Zobrazit nástoje pro vývojáře",
     "Encrypted messages in group chats": "Šifrované zprávy ve skupinových konverzacích",
-    "Your homeserver does not support device management.": "Váš domovský server nepodporuje správu zařízení.",
     "Open Devtools": "Otevřít nástroje pro vývojáře",
     "Credits": "Poděkování",
     "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. ": "Už jste na adrese %(host)s použili novější verzi Riotu. Jestli chcete znovu používat tuto verzi i s E2E šifrováním, je potřeba se odhlásit a znovu přihlásit. ",
@@ -1394,7 +1299,6 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "Nastavení nového hesla je potřeba potvrdit. Bude Vám odeslán ověřovací email.",
     "Sign in instead": "Přihlásit se",
     "Your password has been reset.": "Heslo bylo resetováno.",
-    "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.": "Na všech zařízení jsme Vás odhlásili, takže nedostáváte žádné upozornění. Můžete je znovu povolit tím, že se na každém zařízení přihlásíte.",
     "Sign in with single sign-on": "Přihlásit se přes jednotné přihlašování",
     "Create account": "Vytvořit účet",
     "Unable to query for supported registration methods.": "Nepovedlo se načíst podporované způsoby přihlášení.",
@@ -1444,13 +1348,7 @@
     "The file '%(fileName)s' failed to upload.": "Soubor '%(fileName)s' se nepodařilo nahrát.",
     "The server does not support the room version specified.": "Server nepodporuje určenou verzi místnosti.",
     "Name or Matrix ID": "Jméno nebo Matrix ID",
-    "Email, name or Matrix ID": "Email, jméno nebo Matrix ID",
-    "Room upgrade confirmation": "Potvrzení: Upgrade místnosti",
-    "Upgrading a room can be destructive and isn't always necessary.": "Upgrade místnosti může mít destruktivní následky a možná není potřeba.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Upgrade místnosti se většinou doporučuje pokud je původní verze <i>nestabilní</i>. V nestabilních verzích můžou být chyby, chybějící funkce nebo můžou mít bezpečnostní problémy.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Upgrade místnosti se většinou týká zpracování <i>serverovem</i>. Pokud máte problém s klientem Riot, nahlašte nám prosím chybu na GitHub: <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varování</b>: Upgrade místnosti <i>automaticky převede všechny členy na novou verzi místnosti.</i> Do staré místnosti pošleme odkaz na novou místnost - všichni členové na něj budou muset kliknout, aby se přidali do nové místnosti.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Potvrďte prosím, že chcete pokračovat a opravdu provést upgrade z verze <oldVersion /> na verzi <newVersion />.",
     "Changes your avatar in this current room only": "Změní váš avatar jen v této místnosti",
     "Unbans user with given ID": "Přijmout zpět uživatele s daným identifikátorem",
     "Adds a custom widget by URL to the room": "Přidá do místnosti vlastní widget podle adresy URL",
@@ -1467,12 +1365,6 @@
     "The user's homeserver does not support the version of the room.": "Uživatelův domovský server nepodporuje verzi této místnosti.",
     "Show hidden events in timeline": "Zobrazovat skryté události",
     "When rooms are upgraded": "Když je proveden upgrade místnosti",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Toto zařízení <b>nezálohuje vaše klíče</b>, ale máte existující zálohu kterou lze obnovit.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Před odhlášením připojte toto zařízení k záloze klíčů, ať o ně nepřijdete.",
-    "Connect this device to Key Backup": "Připojit zařízení k zálohování klíčů",
-    "Backup has an <validity>invalid</validity> signature from this device": "Záloha má <validity>neplatný</validity> podpis z tohoto zařízení",
-    "Enable desktop notifications for this device": "Povolit na tomto zařízení notifikace",
-    "Enable audible notifications for this device": "Povolit na tomto zařízení zvukové notifikace",
     "<a>Upgrade</a> to your own domain": "<a>Přejít</a> na vlastní doménu",
     "Upgrade this room to the recommended room version": "Provést upgrade místnosti na doporučenou verzi",
     "this room": "tato místnost",
@@ -1568,7 +1460,6 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených notifikací v předchozí verzi této místnosti.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtenou notifikaci v předchozí verzi této místnosti.",
     "Your profile": "Váš profil",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Změna hesla resetuje šifrovací klíče na všech vašich zařízeních a přijdete tak o přístup k historickým zprávám. Před změnou hesla si nastavte zálohu klíčů nebo si klíče pro místnosti exportujte.",
     "Your Matrix account on <underlinedServerName />": "Váš Matrix účet na serveru <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Nepovedlo se automaticky načíst konfiguraci ze serveru",
     "Invalid base_url for m.homeserver": "Neplatná base_url pro m.homeserver",
@@ -1597,7 +1488,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Zeptejte se administrátora (<code>%(homeserverDomain)s</code>) jestli by nemohl nakonfigurovat server TURN, aby začalo fungoval volání.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Případně můžete zkusit použít veřejný server <code>turn.matrix.org</code>, což nemusí fungovat tak spolehlivě a řekne to tomu cizímu serveru vaší IP adresu. Můžete to udělat v Nastavení.",
     "Try using turn.matrix.org": "Zkuste použít turn.matrix.org",
-    "Failed to start chat": "Nepovedlo se začít chat",
     "Messages": "Zprávy",
     "Actions": "Akce",
     "Sends a message as plain text, without interpreting it as markdown": "Pošle zprávu jako prostý text, neinterpretuje jí jako Markdown",
@@ -1648,8 +1538,6 @@
     "Close dialog": "Zavřít dialog",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Napište nám prosím co se pokazilo a nebo nám napište issue na GitHub, kde popíšete problém.",
     "Removing…": "Odstaňování…",
-    "Clear all data on this device?": "Smazat všechna data na tomto zařízení?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Smazání všech dat na tomto zařízení je nevratné. Zašifrované zprávy nepůjde obnovit, pokud nejsou klíče zazálohované.",
     "Clear all data": "Smazat všechna data",
     "Please enter a name for the room": "Zadejte prosím jméno místnosti",
     "Set a room alias to easily share your room with other people.": "Nastavte alias místnosti, abyste mohli místnost snadno sdílet s ostatními.",
@@ -1661,7 +1549,6 @@
     "Hide advanced": "Skrýt pokročilé",
     "Show advanced": "Zobrazit pokročilé",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby se připojili do místnosti (Toto nelze později změnit!)",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Abyste ověřili, že je toto zařízení důvěryhodné, zkontrolujte, že klíč v Nastavení na tom zařízení se shoduje s tímto klíčem:",
     "Your homeserver doesn't seem to support this feature.": "Váš domovský server asi tuto funkci nepodporuje.",
     "Message edits": "Editování zpráv",
     "Please fill why you're reporting.": "Vyplňte prosím co chcete nahlásit.",
@@ -1678,7 +1565,6 @@
     "Trust": "Důvěra",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Multiple integration managers": "Více správců integrací",
-    "Use the new, faster, composer for writing messages": "Použít nový, rychlejší editor zpráv",
     "Show previews/thumbnails for images": "Zobrazovat náhledy obrázků",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Před odpojením byste měli <b>smazat osobní údaje</b> ze serveru identit <idserver />. Bohužel, server je offline nebo neodpovídá.",
     "You should:": "Měli byste:",
@@ -1690,7 +1576,6 @@
     "Show tray icon and minimize window to it on close": "Zobrazovat systémovou ikonu a minimalizovat při zavření",
     "Read Marker lifetime (ms)": "životnost značky přečteno (ms)",
     "Read Marker off-screen lifetime (ms)": "životnost značky přečteno mimo obrazovku (ms)",
-    "A device's public name is visible to people you communicate with": "Veřejné jméno zařízení je viditelné pro lidi se kterými komunikujete",
     "Upgrade the room": "Upgradovat místnost",
     "Enable room encryption": "Povolit v místnosti šifrování",
     "Error changing power level requirement": "Chyba změny požadavku na úroveň oprávnění",
@@ -1820,14 +1705,12 @@
     "Registration Successful": "Úspěšná registrace",
     "Failed to re-authenticate due to a homeserver problem": "Kvůli problémům s domovským server se nepovedlo autentifikovat znovu",
     "Failed to re-authenticate": "Nepovedlo se autentifikovat",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené na tomto zařízení. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
     "Enter your password to sign in and regain access to your account.": "Zadejte heslo pro přihlášení a obnovte si přístup k účtu.",
     "Forgotten your password?": "Zapomněli jste heslo?",
     "Sign in and regain access to your account.": "Přihlaste se a získejte přístup ke svému účtu.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Nemůžete se přihlásit do svého účtu. Kontaktujte administrátora domovského serveru pro více informací.",
     "You're signed out": "Jste odhlášeni",
     "Clear personal data": "Smazat osobní data",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou pořád uložena na tomto zařízení. Smažte je, pokud už toto zařízení nehodláte používat nebo se přihlašte pod jiný účet.",
     "Command Autocomplete": "Automatické doplňování příkazů",
     "Community Autocomplete": "Automatické doplňování komunit",
     "DuckDuckGo Results": "Výsledky hledání DuckDuckGo",
@@ -1860,13 +1743,11 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s",
     "Try out new ways to ignore people (experimental)": "Vyzkošejte nové metody ignorování lidí (experimentální)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Poslat požadavek na ověření v přímé zprávě včetně nového verifikačního rozhraní v panelu.",
     "Enable local event indexing and E2EE search (requires restart)": "Povolit lokální indexování a vyhledávání v E2E šifrovaných zprávách (vyžaduje restart)",
     "Match system theme": "Přizpůsobit se systémovému vzhledu",
     "My Ban List": "Můj seznam zablokovaných",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je váš seznam blokovaných uživatelů/serverů - neopouštějte tuto místnost!",
     "Decline (%(counter)s)": "Odmítnout (%(counter)s)",
-    "on device": "na zařízení",
     "Connecting to integration manager...": "Připojuji se ke správci integrací...",
     "Cannot connect to integration manager": "Nepovedlo se připojení ke správci integrací",
     "The integration manager is offline or it cannot reach your homeserver.": "Správce integrací neběží nebo se nemůže připojit k vašemu domovskému serveru.",
@@ -1911,11 +1792,7 @@
     "Failed to connect to integration manager": "Nepovedlo se připojit ke správci integrací",
     "Trusted": "Důvěryhodné",
     "Not trusted": "Nedůvěryhodné",
-    "Hide verified Sign-In's": "Skrýt důvěryhodná přihlášení",
-    "%(count)s verified Sign-In's|other": "%(count)s důvěryhodných přihlášení",
-    "%(count)s verified Sign-In's|one": "1 důvěryhodné přihlášení",
     "Direct message": "Přímá zpráva",
-    "Unverify user": "Nedůvěřovat uživateli",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> v %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "V této místosti jsou zprávy E2E šifrované.",
     "Security": "Bezpečnost",
@@ -1965,16 +1842,12 @@
     "User Status": "Stav uživatele",
     "Verification Request": "Požadavek na ověření",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Varování</b>: Nastavujte bezpečné úložiště pouze z důvěryhodného počítače.",
     "Set up with a recovery key": "Nastavit obnovovací klíč",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv když zapomenete heslo.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Uschovejte svůj klíč na velmi bezpečném místě, například ve správci hesel (nebo v trezoru).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Váš obnovovací klíč byl <b>zkopírován do schránky</b>, vložte jej:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Váš obnovací klíč je ve složce <b>Stažené</b>.",
-    "Your access to encrypted messages is now protected.": "Přístup k šifrovaným zprávám je teď chráněn.",
-    "Set up secret storage": "Nastavit bezpečné úložiště",
-    "Secure your encrypted messages with a passphrase": "Zabezpečte vaše šifrované zprávy heslem",
     "Storing secrets...": "Ukládám tajná data...",
     "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště",
     "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.",
@@ -1982,12 +1855,6 @@
     "Backup has a <validity>valid</validity> signature from this user": "Záloha má <validity>platný</validity> podpis od tohoto uživatele",
     "Backup has a <validity>invalid</validity> signature from this user": "Záloha má <validity>neplatný</validity> podpis od tohoto uživatele",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Záloha je podepsaná <verify>neznámým</verify> uživatelem %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Záloha je podepsaná <verify>neznámým</verify> zařízením %(deviceId)s",
-    "This user has not verified all of their devices.": "Uživatel neověřil všechna svá zařízení.",
-    "You have not verified this user. This user has verified all of their devices.": "Tohoto uživatele jste neověřili. Uživatel má ověřená všechna svá zařízení.",
-    "You have verified this user. This user has verified all of their devices.": "Tohoto uživatele jste ověřili. Uživatel má ověřená všechna svá zařízení.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Někteřé uživatele v této šifrované místnosti jste neověřili nebo nemají ověřená některá svá zařízení.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Všichni uživatelé v této šifrované místnosti jsou ověření a mají ověřená všechna svá zařízení.",
     "Close preview": "Zavřít náhled",
     "Hide verified sessions": "Schovat ověřené relace",
     "%(count)s verified sessions|other": "%(count)s ověřených relací",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 14063d0dd1..e84be8e3c7 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -3,7 +3,6 @@
     "You have no visible notifications": "Du har ingen synlige meddelelser",
     "Invites": "Invitationer",
     "Favourites": "Favoritter",
-    "People": "Personilg chat",
     "Rooms": "Rum",
     "Low priority": "Lav prioritet",
     "Historical": "Historisk",
@@ -28,7 +27,6 @@
     "Session ID": "Sessions ID",
     "End-to-end encryption information": "End-to-end krypterings oplysninger",
     "Event information": "Hændelses information",
-    "Sender device information": "Afsende enheds-oplysning",
     "Displays action": "Viser handling",
     "Bans user with given id": "Forbyder bruger med givet id",
     "Deops user with given id": "Fjerner OP af bruger med givet id",
@@ -146,10 +144,6 @@
     "Restricted": "Begrænset",
     "Moderator": "Moderator",
     "Start a chat": "Start en chat",
-    "Who would you like to communicate with?": "Hvem vil du kommunikere med?",
-    "Start Chat": "Start Chat",
-    "Invite new room members": "Inviter nye rummedlemmer",
-    "Send Invites": "Send invitationer",
     "Operation failed": "Operation mislykkedes",
     "Failed to invite": "Kunne ikke invitere",
     "Failed to invite the following users to the %(roomName)s room:": "Kunne ikke invitere de følgende brugere til %(roomName)s rummet:",
@@ -172,13 +166,7 @@
     "You are now ignoring %(userId)s": "Du ignorere nu %(userId)s",
     "Unignored user": "Holdt op med at ignorere bruger",
     "You are no longer ignoring %(userId)s": "Du ignorer ikke længere %(userId)s",
-    "Unknown (user, device) pair:": "Ukendt (bruger, enhed) par:",
-    "Device already verified!": "Enhed allerede verificeret!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ADVARSEL: Enhed allerede verificeret, men nøgler PASSER IKKE!",
-    "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!": "ADVARSEL: NØGLE VERIFICERING FEJLEDE! Signaturnøglen for %(userId)s and enhed %(deviceId)s er \"%(fprint)s\" hvilket ikke passer med den oplyste nøgle \"%(fingerprint)s\". Dette kan betyde jeres kommunikation bliver opsnappet!",
     "Verified key": "Verificeret nøgle",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signaturnøglen du oplste passer med nøglen fra %(userId)ss enhed %(deviceId)s. Enheden er markeret som verificeret.",
-    "Unrecognised command:": "Ukendt kommando:",
     "Reason": "Årsag",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
@@ -259,7 +247,6 @@
     "Noisy": "Støjende",
     "Collecting app version information": "Indsamler app versionsoplysninger",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slet rumaliaset %(alias)s og fjern %(name)s fra kataloget?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Dette vil tillade dig at vende tilbage til din konto efter at have logget ud og at logge ind på andre enheder.",
     "Keywords": "Søgeord",
     "Enable notifications for this account": "Aktivér underretninger for dette brugernavn",
     "Invite to this community": "Inviter til dette fællesskab",
@@ -361,7 +348,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Information som sendes til os for at kunne forbedre Riot.im inkluderer:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Hvis denne side indeholder identificerbar information, så som rum, bruger eller gruppe ID, bliver disse fjernet før dataene sendes til serveren.",
     "Call Failed": "Opkald mislykkedes",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Der er ukendte enheder i dette rum: hvis du fortsætter uden at bekræfte dem, kan det være muligt at nogen aflytter dit opkald.",
     "Review Devices": "Gennemse enheder",
     "Call Anyway": "Ring op alligevel",
     "Answer Anyway": "Tag imod alligevel",
@@ -391,8 +377,6 @@
     "Unable to load! Check your network connectivity and try again.": "Kunne ikke hente! Tjek din netværksforbindelse og prøv igen.",
     "Registration Required": "Registrering påkrævet",
     "You need to register to do this. Would you like to register now?": "Du behøver registrere dig for at gøre dette. Vil du registrere nu?",
-    "Email, name or Matrix ID": "E-mail, navn eller Matrix-ID",
-    "Failed to start chat": "Kunne ikke starte chatten",
     "Failed to invite users to the room:": "Kunne ikke invitere brugere til rummet:",
     "Missing roomId.": "roomId mangler.",
     "Messages": "Beskeder",
@@ -402,12 +386,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Sender en besked som ren tekst, uden at fortolke den som Markdown",
     "Upgrades a room to a new version": "Opgraderer et rum til en ny version",
     "You do not have the required permissions to use this command.": "Du har ikke de nødvendige rettigheder for at udføre denne kommando.",
-    "Room upgrade confirmation": "Rum opgraderings information",
-    "Upgrading a room can be destructive and isn't always necessary.": "At opgradere et rum kan være skadelig og er ikke altid nødvendigt.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Rumopgraderinger anbefales typisk når en rumversion betragtes som <i>ustabil</i>. Ustabile rumversioner kan have fejl, manglende funktioner eller sikkerhedsbrister.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Rumopgraderinger påvirker normalt kun <i>servernes</i> behandling af rum. Hvis du har problemer med din Riot-klient bedes du oprette en sag på <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Advarsel:</b> Opgradering af et rum <i>flytter ikke automatisk rummets medlemmer til den nye version af rummet.</i> Vi sender et link til den nye version i den gamle version af rummet - rummets medlemmer må klikke på dette link for at tilgå det nye rum.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bekræft venligst at du vil fortsætte med at opgradere rummet fra <oldVersion /> til <newVersion />.",
     "Changes your display nickname in the current room only": "Ændrer dit viste navn kun for det nuværende rum",
     "Changes the avatar of the current room": "Ændrer avataren af det nuværende rum",
     "Changes your avatar in this current room only": "Ændrer din avatar kun for det nuværende rum",
@@ -427,7 +406,6 @@
     "Adds a custom widget by URL to the room": "Tilføjer en widget til rummet vha. URL",
     "Please supply a https:// or http:// widget URL": "Oplys en https:// eller http:// widget URL",
     "You cannot modify widgets in this room.": "Du kan ikke ændre widgets i dette rum.",
-    "Verifies a user, device, and pubkey tuple": "Bekræfter en tupel (kombination) af bruger, enhed og offentlig nøgle",
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvinger den nuværende udgående gruppe-session i et krypteret rum til at blive kasseret",
     "Sends the given message coloured as a rainbow": "Sender beskeden med regnbuefarver",
     "Sends the given emote coloured as a rainbow": "Sender emoji'en med regnbuefarver",
@@ -457,7 +435,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde fremtidig rumhistorik synligt for alle rummedlemmer.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde fremtidig rumhistorik synligt for alle.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde fremtidig rumhistorik synligt for ukendt (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverede end-to-end kryptering (algoritme %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s fra %(fromPowerLevel)s til %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ændrede rettighedsniveau af %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ændrede de fastgjorte beskeder for rummet.",
@@ -537,7 +514,6 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gruppér og filtrér rum efter egne tags (opdater for at anvende ændringerne)",
     "Render simple counters in room header": "Vis simple tællere i rumhovedet",
     "Multiple integration managers": "Flere integrationsmanagere",
-    "Use the new, faster, composer for writing messages": "Brug den nye, hurtigere editor for at forfatte beskeder",
     "Enable Emoji suggestions while typing": "Aktiver emoji forslag under indtastning",
     "Use compact timeline layout": "Brug kompakt tidslinje",
     "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder"
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6963fdfa6c..2dcdb43aec 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3,7 +3,6 @@
     "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen",
     "Invites": "Einladungen",
     "Favourites": "Favoriten",
-    "People": "Personen",
     "Rooms": "Räume",
     "Low priority": "Niedrige Priorität",
     "Historical": "Archiv",
@@ -28,7 +27,6 @@
     "Session ID": "Sitzungs-ID",
     "End-to-end encryption information": "Informationen zur Ende-zu-Ende-Verschlüsselung",
     "Event information": "Ereignis-Information",
-    "Sender device information": "Geräte-Informationen des Absenders",
     "Displays action": "Zeigt Aktionen an",
     "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID",
     "Deops user with given id": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück",
@@ -54,7 +52,6 @@
     "Deactivate Account": "Benutzerkonto schließen",
     "Failed to send email": "Fehler beim Senden der E-Mail",
     "Account": "Benutzerkonto",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du wirst erst Benachrichtigungen auf anderen Geräten empfangen können, wenn du dich dort erneut anmeldest",
     "Click here to fix": "Zum reparieren hier klicken",
     "Default": "Standard",
     "Export E2E room keys": "E2E-Raum-Schlüssel exportieren",
@@ -72,14 +69,11 @@
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raum-Schlüssel importieren",
     "Invalid Email Address": "Ungültige E-Mail-Adresse",
-    "Invite new room members": "Neue Raum-Mitglieder einladen",
     "Sign in with": "Anmelden mit",
     "Leave room": "Raum verlassen",
     "Logout": "Abmelden",
     "Manage Integrations": "Integrationen verwalten",
     "Moderator": "Moderator",
-    "Never send encrypted messages to unverified devices from this device": "Niemals verschlüsselte Nachrichten an unverifizierte Geräte von diesem Gerät aus versenden",
-    "Never send encrypted messages to unverified devices in this room from this device": "Niemals verschlüsselte Nachrichten an unverifizierte Geräte in diesem Raum von diesem Gerät aus senden",
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
     "No users have specific privileges in this room": "Kein Benutzer hat in diesem Raum besondere Berechtigungen",
@@ -94,14 +88,12 @@
     "Remove": "Entfernen",
     "Return to login screen": "Zur Anmeldemaske zurückkehren",
     "Room Colour": "Raumfarbe",
-    "Send Invites": "Einladungen senden",
     "Send Reset Email": "E-Mail zum Zurücksetzen senden",
     "Settings": "Einstellungen",
     "Signed Out": "Abgemeldet",
     "Sign out": "Abmelden",
     "Someone": "Jemand",
     "Start a chat": "Chat starten",
-    "Start Chat": "Chat beginnen",
     "Success": "Erfolg",
     "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
     "This room is not accessible by remote Matrix servers": "Remote-Matrix-Server können auf diesen Raum nicht zugreifen",
@@ -124,7 +116,6 @@
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
     "Who can access this room?": "Wer hat Zugang zu diesem Raum?",
     "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?",
-    "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
     "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden",
     "Call Timeout": "Anruf-Timeout",
     "Existing Call": "Bereits bestehender Anruf",
@@ -206,7 +197,6 @@
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Autovervollständigungsergebnisse und benutze dann die TAB-Taste zum durchblättern.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s hat die Ende-zu-Ende-Verschlüsselung aktiviert (Algorithmus: %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
@@ -228,7 +218,6 @@
     "Click to mute video": "Klicken, um das Video stummzuschalten",
     "Command error": "Befehlsfehler",
     "Decrypt %(text)s": "%(text)s entschlüsseln",
-    "Devices": "Geräte",
     "Direct chats": "Direkt-Chats",
     "Disinvite": "Einladung zurückziehen",
     "Download %(text)s": "%(text)s herunterladen",
@@ -240,19 +229,12 @@
     "Failed to reject invite": "Ablehnen der Einladung ist fehlgeschlagen",
     "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
     "Fill screen": "Fülle Bildschirm",
-    "Hide Text Formatting Toolbar": "Text-Formatierungs-Werkzeugleiste verbergen",
     "Incorrect verification code": "Falscher Verifizierungscode",
-    "Invalid alias format": "Ungültiges Alias-Format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ist kein gültiges Alias-Format",
     "Join Room": "Dem Raum beitreten",
     "Kick": "Kicken",
     "Local addresses for this room:": "Lokale Adressen dieses Raumes:",
-    "Markdown is disabled": "Markdown ist deaktiviert",
-    "Markdown is enabled": "Markdown ist aktiviert",
-    "Message not sent due to unknown devices being present": "Nachrichten wurden nicht gesendet, da unbekannte Geräte anwesend sind",
     "New address (e.g. #foo:%(localDomain)s)": "Neue Adresse (z. B. #foo:%(localDomain)s)",
     "not specified": "nicht spezifiziert",
-    "No devices with registered encryption keys": "Keine Geräte mit registrierten Verschlüsselungs-Schlüsseln",
     "No more results": "Keine weiteren Ergebnisse",
     "No results": "Keine Ergebnisse",
     "OK": "OK",
@@ -267,7 +249,6 @@
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden. Dir fehlt jedoch die Berechtigung, die betreffende Nachricht zu sehen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
-    "Unable to load device list": "Geräteliste konnte nicht geladen werden",
     "Unknown room %(roomId)s": "Unbekannter Raum %(roomId)s",
     "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?",
     "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
@@ -275,8 +256,6 @@
     "Make Moderator": "Zum Moderator ernennen",
     "Room": "Raum",
     "Cancel": "Abbrechen",
-    "bold": "Fett",
-    "italic": "Kursiv",
     "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
     "Click to unmute audio": "Klicken, um den Ton wieder einzuschalten",
     "Failed to load timeline position": "Laden der Chat-Position fehlgeschlagen",
@@ -291,7 +270,6 @@
     "Confirm password": "Passwort bestätigen",
     "Current password": "Aktuelles Passwort",
     "Email": "E-Mail",
-    "matrix-react-sdk version:": "Version von matrix-react-sdk:",
     "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
     "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
@@ -302,7 +280,6 @@
     "Error decrypting attachment": "Fehler beim Entschlüsseln des Anhangs",
     "Mute": "Stummschalten",
     "Operation failed": "Aktion fehlgeschlagen",
-    "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.": "Eine Änderung des Passworts setzt derzeit alle Schlüssel für die E2E-Verschlüsselung auf allen verwendeten Geräten zurück. Bereits verschlüsselte Chat-Inhalte sind somit nur noch lesbar, wenn du zunächst alle Schlüssel exportierst und später wieder importierst. Wir arbeiten an einer Verbesserung dieser momentan noch notwendigen Vorgehensweise.",
     "Unmute": "Stummschalten aufheben",
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
     "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
@@ -320,14 +297,8 @@
     "Unknown error": "Unbekannter Fehler",
     "Incorrect password": "Ungültiges Passwort",
     "To continue, please enter your password.": "Zum fortfahren bitte Passwort eingeben.",
-    "Device name": "Geräte-Name",
-    "Device key": "Geräte-Schlüssel",
-    "Verify device": "Gerät verifizieren",
     "I verify that the keys match": "Ich bestätige, dass die Schlüssel identisch sind",
     "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Nicht verifizierte Geräte werden aktuell blockiert und auf die Sperrliste gesetzt. Um Nachrichten an diese Geräte senden zu können,  müssen diese zunächst verifiziert werden.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" enthält Geräte, die du bislang noch nicht gesehen hast.",
-    "Unknown devices": "Unbekannte Geräte",
     "Unknown Address": "Unbekannte Adresse",
     "Verify...": "Verifizieren...",
     "ex. @bob:example.com": "z. B. @bob:example.com",
@@ -357,15 +328,12 @@
     "Online": "Online",
     " (unsupported)": " (nicht unterstützt)",
     "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.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.",
-    "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:": "Um sicherzustellen, dass diesem Gerät vertraut werden kann, kontaktiere bitte den Eigentümer des Geräts über ein anderes Kommunikationsmittel (z.B. im persönlichen Gespräch oder durch einen Telefonanruf) und vergewissere dich, dass der Schlüssel, den der Eigentümer in den Benutzer-Einstellungen für dieses Gerät sieht, mit dem folgenden Schlüssel identisch ist:",
-    "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.": "Wenn er identisch ist, bitte den Bestätigen-Button unten verwenden. Falls er nicht identisch sein sollte, hat eine Fremdperson Kontrolle über dieses Gerät und es sollte gesperrt werden.",
     "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.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
     "Blacklist": "Blockieren",
     "Unblacklist": "Entblockieren",
     "Unverify": "Verifizierung widerrufen",
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
     "Idle": "Untätig",
-    "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.": "Wir empfehlen dir, für jedes Gerät den Verifizierungsprozess durchzuführen, um sicherzustellen, dass sie tatsächlich ihrem rechtmäßigem Eigentümer gehören. Alternativ kannst du die Nachrichten auch ohne Verifizierung erneut senden.",
     "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
     "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?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
     "Start automatically after system login": "Nach System-Login automatisch starten",
@@ -380,30 +348,22 @@
     "Default Device": "Standard-Gerät",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Device already verified!": "Gerät bereits verifiziert!",
     "Export": "Export",
     "Import": "Importieren",
     "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.",
     "Results from DuckDuckGo": "Ergebnisse von DuckDuckGo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Den Signaturschlüssel den du bereitstellst stimmt mit dem Schlüssel den du von %(userId)s's Gerät %(deviceId)s empfangen hast überein. Gerät als verifiziert markiert.",
     "Add a topic": "Thema hinzufügen",
     "Anyone": "Jeder",
     "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen möchtest?",
     "Custom level": "Benutzerdefiniertes Berechtigungslevel",
-    "Device ID:": "Geräte-Kennung:",
     "device id: ": "Geräte-ID: ",
-    "Device key:": "Geräte-Schlüssel:",
     "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raum-Verzeichnis von %(domain)s veröffentlichen?",
     "Register": "Registrieren",
     "Save": "Speichern",
-    "Unknown (user, device) pair:": "Unbekanntes (Benutzer-/Gerät-)Paar:",
     "Remote addresses for this room:": "Remote-Adressen für diesen Raum:",
-    "Unrecognised command:": "Unbekannter Befehl:",
     "Unrecognised room alias:": "Unbekannter Raum-Alias:",
     "Use compact timeline layout": "Kompaktes Chatverlauf-Layout verwenden",
     "Verified key": "Verifizierter Schlüssel",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "WARNUNG: Gerät bereits verifiziert, aber Schlüssel sind NICHT GLEICH!",
-    "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!": "WARNUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signatur-Schlüssel für %(userId)s und das Gerät %(deviceId)s ist \"%(fprint)s\", welcher nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Dies kann bedeuten, dass deine Kommunikation abgehört wird!",
     "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
     "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raum-Bild geändert zu <img/>",
@@ -438,7 +398,6 @@
     "Disable Notifications": "Benachrichtigungen deaktivieren",
     "Drop File Here": "Lasse Datei hier los",
     "Enable Notifications": "Benachrichtigungen aktivieren",
-    "Encrypted by an unverified device": "Von einem nicht verifizierten Gerät verschlüsselt",
     "Failed to upload profile picture!": "Hochladen des Profilbild's fehlgeschlagen!",
     "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
     "Incoming video call from %(name)s": "Eingehender Video-Anruf von %(name)s",
@@ -448,16 +407,12 @@
     "No display name": "Kein Anzeigename",
     "Private Chat": "Privater Chat",
     "Public Chat": "Öffentlicher Chat",
-    "Room contains unknown devices": "Raum enthält unbekannte Geräte",
     "%(roomName)s does not exist.": "%(roomName)s existert nicht.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ist aktuell nicht zugreifbar.",
     "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s",
     "Send anyway": "Trotzdem senden",
     "Start authentication": "Authentifizierung beginnen",
-    "Show Text Formatting Toolbar": "Text-Formatierungs-Werkzeugleiste anzeigen",
     "This room": "In diesem Raum",
-    "Undecryptable": "Nicht entschlüsselbar",
-    "Unencrypted message": "Nicht verschlüsselbare Nachricht",
     "unknown caller": "Unbekannter Anrufer",
     "Unnamed Room": "Unbenannter Raum",
     "Upload new:": "Neue(s) hochladen:",
@@ -476,9 +431,7 @@
     "Start verification": "Verifizierung starten",
     "Share without verifying": "Ohne Verifizierung verwenden",
     "Ignore request": "Anforderung ignorieren",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Du hast das neue Gerät '%(displayName)s' hinzugefügt, welches nun Verschlüsselungs-Schlüssel anfordert.",
     "Encryption key request": "Anforderung von Verschlüsselungs-Schlüsseln",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Dein nicht verifiziertes Gerät '%(displayName)s' fordert Verschlüsselungs-Schlüssel an.",
     "Check for update": "Suche nach Updates",
     "Add a widget": "Widget hinzufügen",
     "Allow": "Erlauben",
@@ -490,8 +443,6 @@
     "Unable to create widget.": "Widget kann nicht erstellt werden.",
     "You are not in this room.": "Du bist nicht in diesem Raum.",
     "You do not have permission to do that in this room.": "Du hast dafür keine Berechtigung in diesem Raum.",
-    "Verifies a user, device, and pubkey tuple": "Verifiziert ein Tupel aus Benutzer, Gerät und öffentlichem Schlüssel",
-    "Loading device info...": "Lädt Geräte-Info...",
     "Example": "Beispiel",
     "Create": "Erstellen",
     "Featured Rooms:": "Hervorgehobene Räume:",
@@ -705,13 +656,10 @@
     "Flair": "Abzeichen",
     "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
     "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an",
-    "Delete %(count)s devices|other": "Lösche %(count)s Geräte",
-    "Delete %(count)s devices|one": "Lösche Gerät",
     "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen.",
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren.",
     "Call Failed": "Anruf fehlgeschlagen",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht-verifizierte Geräte. Wenn du fortfährst ohne sie zu verifizieren, könnten Angreifer den Anruf mithören.",
     "Review Devices": "Geräte ansehen",
     "Call Anyway": "Trotzdem anrufen",
     "Answer Anyway": "Trotzdem annehmen",
@@ -743,7 +691,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "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.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
@@ -756,11 +703,7 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
     "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.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Die Anfrage den Schlüssel zu teilen wurden gesendet. Bitte sieh auf deinen anderen Geräte nach der Anfrage.",
-    "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.": "Schlüssel-Anfragen wurden automatisch zu den anderen Geräten gesendet. Wenn du diese Anfragen auf deinen anderen Geräten abgelehnt oder verpasst hast, klicke hier um die Schlüssel für diese Sitzung erneut anzufragen.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Geräte keine Schlüssel für diese Nachricht haben, wirst du diese nicht entschlüsseln können.",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "Verschlüsselungs-Schlüssel von deinen anderen Geräten <requestLink>erneut anfragen</requestLink>.",
     "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.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
     "Code": "Code",
@@ -823,7 +766,6 @@
     "Noisy": "Laut",
     "Collecting app version information": "App-Versionsinformationen werden abgerufen",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Keywords": "Schlüsselwörter",
     "Enable notifications for this account": "Benachrichtigungen für dieses Benutzerkonto aktivieren",
     "Invite to this community": "In diese Community einladen",
@@ -913,7 +855,6 @@
     "Your device resolution": "Deine Bildschirmauflösung",
     "Popout widget": "Widget ausklinken",
     "Always show encryption icons": "Immer Verschlüsselungssymbole zeigen",
-    "Unable to reply": "Antworten nicht möglich",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Das Ereignis, auf das geantwortet wurde, konnte nicht geladen werden. Entweder es existiert nicht oder du hast keine Berechtigung, dieses anzusehen.",
     "Send Logs": "Sende Protokoll",
     "Clear Storage and Sign Out": "Speicher leeren und abmelden",
@@ -921,7 +862,6 @@
     "We encountered an error trying to restore your previous session.": "Wir haben ein Problem beim Wiederherstellen deiner vorherigen Sitzung festgestellt.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Den Browser-Speicher zu löschen kann das Problem lösen, wird dich aber abmelden und verschlüsselte Chats unlesbar machen.",
     "Collapse Reply Thread": "Antwort-Thread zusammenklappen",
-    "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.",
     "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren",
     "Send analytics data": "Analysedaten senden",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
@@ -965,14 +905,8 @@
     "A call is currently being placed!": "Ein Anruf wurde schon gestartet!",
     "Permission Required": "Berechtigung benötigt",
     "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung um ein Konferenzgespräch in diesem Raum zu starten",
-    "deleted": "gelöscht",
-    "underlined": "unterstrichen",
-    "bulleted-list": "Liste mit Punkten",
-    "numbered-list": "Liste mit Nummern",
     "Failed to remove widget": "Widget konnte nicht entfernt werden",
     "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf, während versucht wurde das Widget aus diesem Raum zu entfernen",
-    "inline-code": "Quellcode",
-    "block-quote": "Zitat",
     "System Alerts": "System-Benachrichtigung",
     "Only room administrators will see this warning": "Nur Raum-Administratoren werden diese Nachricht sehen",
     "Please <a>contact your service administrator</a> to continue using the service.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
@@ -1024,11 +958,6 @@
     "Show developer tools": "Zeige Entwickler-Werkzeuge",
     "Unable to load! Check your network connectivity and try again.": "Konnte nicht geladen werden! Überprüfe die Netzwerkverbindung und versuche es erneut.",
     "Delete Backup": "Sicherung löschen",
-    "Backup has a <validity>valid</validity> signature from this device": "Sicherung hat eine <validity>valide</validity> Signatur von diesem Gerät",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Sicherung hat eine <validity>invalide</validity> Signatur vom <verify>verifiziertem</verify> Gerät <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Sicherung hat eine <validity>invalide</validity> Signatur vom <verify>unverifiziertem</verify> Gerät <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Sicherung hat eine <validity>valide</validity> Signatur vom <verify>unverifiziertem</verify> Gerät <device></device>",
-    "Backup is not signed by any of your devices": "Sicherung wurde von keinem deiner Geräte signiert",
     "Backup version: ": "Sicherungsversion: ",
     "Algorithm: ": "Algorithmus: ",
     "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": "Um deinen Chatverlauf nicht zu verlieren, musst du deine Raum-Schlüssel exportieren, bevor du dich abmeldest. Du musst zurück zu einer neueren Riot-Version gehen, um dies zu tun",
@@ -1095,7 +1024,6 @@
     "Straight rows of keys are easy to guess": "Gerade Reihen von Tasten sind einfach zu erraten",
     "Custom user status messages": "Angepasste Nutzerstatus-Nachrichten",
     "Unable to load key backup status": "Konnte Status des Schlüsselbackups nicht laden",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Sicherung hat eine <validity>valide</validity> Signatur von einem <verify>verifiziertem</verify> Gerät <device></device>",
     "Don't ask again": "Nicht erneut fragen",
     "Set up": "Einrichten",
     "Please review and accept all of the homeserver's policies": "Bitte sieh dir die Heimserver-Regularien an und akzeptiere sie",
@@ -1110,7 +1038,6 @@
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Wenn du deinen Wiederherstellungspassphrase vergessen hast, kannst du <button1>deinen Wiederherstellungsschlüssel benutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
     "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. ": "Du hast kürzlich eine neuere Version von Riot auf %(host)s verwendet. Um diese Version erneut mit Ende-zu-Ende-Verschlüsselung zu nutzen, musst du dich ab- und wieder anmelden. ",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Auf sichere Nachrichtenhistorie zugreifen und sicheren Nachrichtenversand einrichten indem du deinen Wiederherstellungsschlüssel eingibst.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Wenn du deine Wiederherstellungspassphrase vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>",
     "Set a new status...": "Setze einen neuen Status...",
     "Clear status": "Status löschen",
     "Invalid homeserver discovery response": "Ungültige Antwort beim Aufspüren des Heimservers",
@@ -1120,8 +1047,6 @@
     "Great! This passphrase looks strong enough.": "Gut! Diese Passphrase sieht stark genug aus.",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als Sicherheitsnetz kannst du ihn benutzen um deine verschlüsselte Nachrichtenhistorie wiederherzustellen, falls du deine Wiederherstellungspassphrase vergessen hast.",
     "As a safety net, you can use it to restore your encrypted message history.": "Als Sicherheitsnetz kannst du ihn benutzen um deine verschlüsselte Nachrichtenhistorie wiederherzustellen.",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in deine Zwischenablage kopiert</b>. Füge ihn hier ein:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Downloads</b>-Ordner.",
     "Set up Secure Message Recovery": "Richte Sichere Nachrichten-Wiederherstellung ein",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.",
     "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.",
@@ -1130,7 +1055,6 @@
     "Set up Secure Messages": "Richte sichere Nachrichten ein",
     "Go to Settings": "Gehe zu Einstellungen",
     "Sign in with single sign-on": "Mit Single Sign-On anmelden",
-    "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.": "Wenn du die Sichere Nachrichten-Wiederherstellung nicht einrichtest, wirst du nicht in der Lage sein deine verschlüsselte Nachrichtenhistorie wiederherzustellen, wenn du dich abmeldest oder ein weiteres Gerät benutzt.",
     "Waiting for %(userId)s to confirm...": "Warte auf Bestätigung für  %(userId)s ...",
     "Unrecognised address": "Nicht erkannte Adresse",
     "User %(user_id)s may or may not exist": "Existenz der Benutzer %(user_id)s unsicher",
@@ -1164,20 +1088,17 @@
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
     "Got It": "Verstanden",
     "Verify this user by confirming the following number appears on their screen.": "Verifizieren Sie diesen Benutzer, indem Sie bestätigen, dass die folgende Nummer auf dessen Bildschirm erscheint.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Für maximale Sicherheit empfehlen wir, dies persönlich zu tun oder ein anderes vertrauenswürdiges Kommunikationsmittel zu verwenden.",
     "Yes": "Ja",
     "No": "Nein",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Wir haben dir eine E-Mail geschickt, um deine Adresse zu überprüfen. Bitte folge den Anweisungen dort und klicke dann auf die Schaltfläche unten.",
     "Email Address": "E-Mail-Adresse",
     "Backing up %(sessionsRemaining)s keys...": "Sichere %(sessionsRemaining)s Schlüssel...",
     "All keys backed up": "Alle Schlüssel gesichert",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Sicherung hat eine Signatur von einem <verify>unbekannten</verify> Gerät mit der ID %(deviceId)s.",
     "Add an email address to configure email notifications": "Füge eine E-Mail-Adresse hinzu, um E-Mail-Benachrichtigungen zu konfigurieren",
     "Unable to verify phone number.": "Die Telefonnummer kann nicht überprüft werden.",
     "Verification code": "Bestätigungscode",
     "Phone Number": "Telefonnummer",
     "Profile picture": "Profilbild",
-    "Upload profile picture": "Profilbild hochladen",
     "Display Name": "Anzeigename",
     "Room information": "Rauminformationen",
     "Internal room ID:": "Interne Raum ID:",
@@ -1257,7 +1178,6 @@
     "Book": "Buch",
     "Pencil": "Stift",
     "Paperclip": "Büroklammer",
-    "Padlock": "Vorhängeschloss",
     "Key": "Schlüssel",
     "Hammer": "Hammer",
     "Telephone": "Telefon",
@@ -1275,8 +1195,6 @@
     "Headphones": "Kopfhörer",
     "Folder": "Ordner",
     "Pin": "Stecknadel",
-    "Your homeserver does not support device management.": "Dein Heimserver unterstützt Geräte-Management nicht.",
-    "This backup is trusted because it has been restored on this device": "Dieser Sicherung wird vertraut, weil es auf diesem Gerät wiederhergestellt wurde",
     "Timeline": "Chatverlauf",
     "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
     "Roles & Permissions": "Rollen & Berechtigungen",
@@ -1292,14 +1210,8 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifizieren Sie diesen Benutzer, indem Sie bestätigen, dass folgendes Emoji auf dessen Bildschirm erscheint.",
     "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.",
     "Request media permissions": "Medienberechtigungen anfordern",
-    "Some devices for this user are not trusted": "Nicht allen Geräte dieses Benutzers wird vertraut",
-    "Some devices in this encrypted room are not trusted": "Nicht allen Geräten in diesem Verschlüsselten Raum wird vertraut",
-    "All devices for this user are trusted": "Allen Geräten dieses Benutzers wird vertraut",
-    "All devices in this encrypted room are trusted": "Allen Geräten in diesem Raum wird vertraut",
     "Main address": "Primäre Adresse",
     "Room avatar": "Raum-Bild",
-    "Upload room avatar": "Raum-Bild hochladen",
-    "No room avatar": "Kein Raum-Bild",
     "Room Name": "Raum-Name",
     "Room Topic": "Raum-Thema",
     "Join": "Beitreten",
@@ -1314,9 +1226,7 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Bist du sicher? Du wirst deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gesichert sind.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Verschlüsselte Nachrichten sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger haben die Schlüssel um diese Nachrichten zu lesen.",
     "Restore from Backup": "Von Sicherung wiederherstellen",
-    "This device is backing up your keys. ": "Dieses Gerät sichert deine Schlüssel. ",
     "Back up your keys before signing out to avoid losing them.": "Sichere deine Schlüssel bevor du dich abmeldest, damit du sie nicht verlierst.",
-    "Your keys are <b>not being backed up from this device</b>.": "Deine Schlüssel werden <b>nicht von diesem Gerät gesichert</b>.",
     "Start using Key Backup": "Beginne Schlüsselsicherung zu nutzen",
     "Credits": "Danksagungen",
     "Starting backup...": "Starte Backup...",
@@ -1337,7 +1247,6 @@
     "Composer": "Nachrichteneingabefeld",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Es ist nichts aufgetaucht? Noch nicht alle Clients unterstützen die interaktive Verifikation. <button>Nutze alte Verifikation</button>.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifiziere diesen Benutzer und markiere ihn als \"vertraut\". Dies gibt dir bei Ende-zu-Ende-verschlüsselten Nachrichten extra Seelenfrieden.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Das Verifizieren dieses Benutzers wird seine Geräte als \"vertraut\" markieren und dein Gerät bei ihnen als \"vertraut\" markieren.",
     "I don't want my encrypted messages": "Ich möchte meine verschlüsselten Nachrichten nicht",
     "You'll lose access to your encrypted messages": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Wenn du Fehler bemerkst oder eine Rückmeldung geben möchtest, teile dies uns auf GitHub mit.",
@@ -1372,7 +1281,6 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "Eine Verifizierungs-E-Mail wird an dich gesendet um dein neues Passwort zu bestätigen.",
     "Sign in instead": "Stattdessen anmelden",
     "Your password has been reset.": "Dein Passwort wurde zurückgesetzt.",
-    "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.": "Du wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen bekommen. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.",
     "Set a new password": "Setze ein neues Passwort",
     "This homeserver does not support login using email address.": "Dieser Heimserver unterstützt eine Anmeldung über E-Mail-Adresse nicht.",
     "Create account": "Konto anlegen",
@@ -1383,12 +1291,8 @@
     "Set up with a Recovery Key": "Wiederherstellungsschlüssel einrichten",
     "Please enter your passphrase a second time to confirm.": "Bitte gebe deine Passphrase ein weiteres mal zur Bestätigung ein.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - Du kannst ihn benutzen um Zugang zu deinen verschlüsselten Nachrichten zu bekommen, wenn du deine Passphrase vergisst.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Speichere deinen Wiederherstellungsschlüssel irgendwo, wo er sicher ist. Das kann ein Passwort-Manager oder Safe sein",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Eine neue Wiederherstellungspassphrase und -Schlüssel für sichere Nachrichten wurde festgestellt.",
-    "This device is encrypting history using the new recovery method.": "Dieses Gerät verschlüsselt die Historie mit einer neuen Wiederherstellungsmethode.",
     "Recovery Method Removed": "Wiederherstellungsmethode gelöscht",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Dieses Gerät hat bemerkt, dass deine Wiederherstellungspassphrase und -Schlüssel für Sichere Nachrichten gelöscht wurde.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Wenn du dies aus Versehen getan hast, kannst du Sichere Nachrichten auf diesem Gerät einrichten, wodurch die Nachrichtenhistorie von diesem Gerät mit einer neuen Wiederherstellungsmethode erneut verschlüsselt wird.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die Wiederherstellungsmethode nicht gelöscht hast, kann ein Angreifer versuchen Zugang zu deinem Konto zu bekommen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein.",
     "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Sicherung konnte mit diesem Schlüssel nicht entschlüsselt werden: Bitte stelle sicher, dass du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Incorrect Recovery Passphrase": "Falsche Wiederherstellungspassphrase",
@@ -1448,22 +1352,16 @@
     "Want more than a community? <a>Get your own server</a>": "Du möchtest mehr als eine Community? <a>Hol dir deinen eigenen Server</a>",
     "Could not load user profile": "Konnte Nutzerprofil nicht laden",
     "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
-    "Email, name or Matrix ID": "E-Mail, Name oder Matrix-ID",
     "Name or Matrix ID": "Name oder Matrix ID",
     "Your Riot is misconfigured": "Dein Riot ist falsch konfiguriert",
     "You cannot modify widgets in this room.": "Du kannst in diesem Raum keine Widgets verändern.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ob du die \"Breadcrumbs\"-Funktion nutzt oder nicht (Avatare oberhalb der Raumliste)",
     "A conference call could not be started because the integrations server is not available": "Ein Konferenzanruf konnte nicht gestartet werden, da der Integrationsserver nicht verfügbar ist",
     "The server does not support the room version specified.": "Der Server unterstützt die angegebene Raumversion nicht.",
-    "Room upgrade confirmation": "Raum-Upgradebestätigung",
-    "Upgrading a room can be destructive and isn't always necessary.": "Ein Raum-Upgrade kann destruktiv sein und ist nicht immer notwendig.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Raum-Upgrades werden üblicherweise empfohlen, wenn eine Raum-Version <i>instabil</i> ist. Instabile Raum-Versionen können Bugs, fehlende Features oder Sicherheitslücken enthalten.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Raum-Upgrades betreffen überlicherweise nur <i>serverseitige</i> Datenverarbeitung des Raumes. Wenn du ein Problem mit deinem Riot-Client hast, dann erstelle bitte ein Issue mit <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Achtung</b>: Ein Raum-Upgrade wird <i>die Mitglieder des Raumes nicht automatisch auf die neue Version migrieren.</i> Wir werden in der alten Raumversion einen Link zum neuen Raum posten - Raum-Mitglieder müssen dann auf diesen Link klicken um dem neuen Raum beizutreten.",
     "Replying With Files": "Mit Dateien antworten",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momentan ist es nicht möglich mit einer Datei zu antworten. Möchtest Du die Datei hochladen ohne zu antworten?",
     "The file '%(fileName)s' failed to upload.": "Die Datei \"%(fileName)s\" konnte nicht hochgeladen werden.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bitte bestätige, dass du mit dem Raum-Upgrade von <oldVersion /> auf <newVersion /> fortfahren möchtest.",
     "Changes your avatar in this current room only": "Ändert deinen Avatar für diesen Raum",
     "Unbans user with given ID": "Entbannt den Benutzer mit der angegebenen ID",
     "Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben",
@@ -1486,7 +1384,6 @@
     "Show recently visited rooms above the room list": "Zeige kürzlich besuchte Räume oberhalb der Raumliste",
     "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik",
     "Low bandwidth mode": "Modus für niedrige Bandbreite",
-    "Enable desktop notifications for this device": "Desktop-Benachrichtigungen für dieses Gerät aktivieren",
     "Reset": "Zurücksetzen",
     "Joining room …": "Raum beitreten…",
     "Rejecting invite …": "Einladung ablehnen…",
@@ -1516,19 +1413,14 @@
     "Revoke invite": "Einladung zurückziehen",
     "Invited by %(sender)s": "Eingeladen von %(sender)s",
     "Changes your avatar in all rooms": "Verändert dein Profilbild in allen Räumen",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dieses Gerät <b>speichert deine Schlüssel nicht</b>, aber du hast ein bestehendes Backup, welches du wiederherstellen kannst um fortzufahren.",
-    "Backup has an <validity>invalid</validity> signature from this device": "Das Backup besitzt eine <validity>ungültige</validity> Signatur von diesem Gerät",
-    "Failed to start chat": "Chat konnte nicht gestartet werden",
     "Messages": "Nachrichten",
     "Actions": "Aktionen",
     "Displays list of commands with usages and descriptions": "Zeigt eine Liste von Befehlen mit Verwendungen und Beschreibungen an",
-    "Connect this device to Key Backup": "Schließen Sie dieses Gerät an Key Backup an",
     "Call failed due to misconfigured server": "Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen",
     "Try using turn.matrix.org": "Versuchen Sie es mit turn.matrix.org",
     "You do not have the required permissions to use this command.": "Sie haben nicht die erforderlichen Berechtigungen, um diesen Befehl zu verwenden.",
     "Multiple integration managers": "Mehrere Integrationsmanager",
     "Public Name": "Öffentlicher Name",
-    "Enable audible notifications for this device": "Aktivieren Sie die akustischen Benachrichtigungen für dieses Gerät",
     "Identity Server URL must be HTTPS": "Die Identity Server-URL muss HTTPS sein",
     "Could not connect to Identity Server": "Verbindung zum Identity Server konnte nicht hergestellt werden",
     "Checking server": "Server wird überprüft",
@@ -1545,7 +1437,6 @@
     "Do not use an identity server": "Keinen Identitätsserver verwenden",
     "Enter a new identity server": "Gib einen neuen Identitätsserver ein",
     "Clear personal data": "Persönliche Daten löschen",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Warnung: Deine persönlichen Daten (inkl. Verschlüsselungsschlüssel) sind noch auf diesem Gerät gespeichert. Lösche diese Daten, wenn du mit der Nutzung auf diesem Gerät fertig bist oder dich in einen anderen Account einloggen möchtest.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
     "Disconnect from the identity server <idserver />?": "Verbindung zum Identitätsserver <idserver /> trennen?",
@@ -1554,8 +1445,6 @@
     "Changes the avatar of the current room": "Ändert den Avatar für diesen Raum",
     "Deactivate account": "Benutzerkonto schließen",
     "Show previews/thumbnails for images": "Zeige eine Vorschau für Bilder",
-    "A device's public name is visible to people you communicate with": "Der Gerätename ist sichtbar für die Personen mit denen du kommunizierst",
-    "Clear all data on this device?": "Alle Daten auf diesem Gerät löschen?",
     "View": "Vorschau",
     "Find a room…": "Suche einen Raum…",
     "Find a room… (e.g. %(exampleRoom)s)": "Suche einen Raum… (z.B. %(exampleRoom)s)",
@@ -1569,9 +1458,6 @@
     "Use an identity server to invite by email. Manage in Settings.": "Nutze einen Identitätsserver, um über E-Mail Einladungen zu verschicken. Verwalte es in den Einstellungen.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Versuche neue Möglichkeiten, um Menschen zu ignorieren (experimentell)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Verschicke Bestätigungsanfragen via Direktnachricht, inklusive einer neuen Verifikationsnutzer*innenoberfläche im Mitglieds-Panel",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Schalte cross-signing ein, um Verifizierung per Benutzer*in statt per Gerät zu ermöglichen (in Entwicklung)",
-    "Use the new, faster, composer for writing messages": "Nutze die neue, schnellere Schreiboberfläche um Nachrichten zu verfassen.",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Schicke Lesebestätigungen für Nachrichten (erfordert einen kompatiblen Heimserver zum Deaktivieren)",
     "My Ban List": "Meine Bannliste",
     "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer*innen/Servern, die du blockiert hast - verlasse den Raum nicht!",
@@ -1588,7 +1474,6 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s tätigte einen Videoanruf (Nicht von diesem Browser unterstützt)",
     "Verify this session": "Sitzung verifizieren",
     "Set up encryption": "Verschlüsselung einrichten",
-    "New Session": "Neue Sitzung",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s hat %(addedAddresses)s und %(count)s Adressen zu diesem Raum hinzugefügt",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hat %(removedAddresses)s und %(count)s andere Adressen aus diesem Raum entfernt",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hat %(countRemoved)s entfernt und %(countAdded)s Adressen zu diesem Raum hinzugefügt",
@@ -1612,13 +1497,10 @@
     "Show info about bridges in room settings": "Information über Bridges in den Raumeinstellungen anzeigen",
     "Enable message search in encrypted rooms": "Nachrichtensuche in verschlüsselten Räumen aktivieren",
     "Lock": "Sperren",
-    "Review & verify your new session": "Überprüfe & verifiziere deine neue Sitzung",
     "Later": "Später",
     "Review": "Überprüfen",
-    "Verify your other devices easier": "Verifiziere deine weiteren Geräte einfacher",
     "Verify": "Verifizieren",
     "Decline (%(counter)s)": "Zurückweisen (%(counter)s)",
-    "on device": "auf dem Gerät",
     "not found": "nicht gefunden",
     "rooms.": "Räume.",
     "Manage": "Verwalten",
@@ -1627,7 +1509,6 @@
     "Connecting to integration manager...": "Verbinden zum Integrationsmanager...",
     "Cannot connect to integration manager": "Verbindung zum Integrationsmanager fehlgeschlagen",
     "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsmanager ist offline oder er kann den Heimserver nicht erreichen.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbinde dieses Gerät zum Schlüssel Backup, bevor du dich ausloggst, um zu verhindern, dass Verschlüsselungsschlüssel, die sich nur auf dem Gerät befinden, verloren gehen.",
     "not stored": "nicht gespeichert",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Backup hat eine Signatur von <verify>Unbekanntem</verify> Nutzer mit ID %(deviceId)s",
     "Backup key stored: ": "Backup Schlüssel gespeichert: ",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index b4de278ef0..8bbcf47cbe 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -59,12 +59,8 @@
     "Decrypt %(text)s": "Αποκρυπτογράφηση %(text)s",
     "Decryption error": "Σφάλμα αποκρυπτογράφησης",
     "Default": "Προεπιλογή",
-    "Device already verified!": "Η συσκευή έχει ήδη επαληθευτεί!",
     "Device ID": "Αναγνωριστικό συσκευής",
-    "Device ID:": "Αναγνωριστικό συσκευής:",
     "device id: ": "αναγνωριστικό συσκευής: ",
-    "Device key:": "Κλειδί συσκευής:",
-    "Devices": "Συσκευές",
     "Direct chats": "Απευθείας συνομιλίες",
     "Disinvite": "Ανάκληση πρόσκλησης",
     "Download %(text)s": "Λήψη %(text)s",
@@ -103,7 +99,6 @@
     "Incorrect username and/or password.": "Λανθασμένο όνομα χρήστη και/ή κωδικός.",
     "Incorrect verification code": "Λανθασμένος κωδικός επαλήθευσης",
     "Invalid Email Address": "Μη έγκυρη διεύθυνση ηλεκτρονικής αλληλογραφίας",
-    "Invite new room members": "Προσκαλέστε νέα μέλη",
     "Invited": "Προσκλήθηκε",
     "Invites": "Προσκλήσεις",
     "Sign in with": "Συνδεθείτε με",
@@ -118,8 +113,6 @@
     "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logout": "Αποσύνδεση",
     "Low priority": "Χαμηλής προτεραιότητας",
-    "matrix-react-sdk version:": "Έκδοση matrix-react-sdk:",
-    "Message not sent due to unknown devices being present": "Το μήνυμα δεν στάλθηκε γιατί υπάρχουν άγνωστες συσκευές",
     "Click here to fix": "Κάνε κλικ εδώ για διόρθωση",
     "Command error": "Σφάλμα εντολής",
     "Commands": "Εντολές",
@@ -140,7 +133,6 @@
     "olm version:": "Έκδοση olm:",
     "Password": "Κωδικός πρόσβασης",
     "Passwords can't be empty": "Οι κωδικοί πρόσβασης δεν γίνετε να είναι κενοί",
-    "People": "Άτομα",
     "Phone": "Τηλέφωνο",
     "Register": "Εγγραφή",
     "riot-web version:": "Έκδοση riot-web:",
@@ -157,12 +149,9 @@
     "This email address is already in use": "Η διεύθυνση ηλ. αλληλογραφίας χρησιμοποιείται ήδη",
     "This email address was not found": "Δεν βρέθηκε η διεύθυνση ηλ. αλληλογραφίας",
     "Success": "Επιτυχία",
-    "Start Chat": "Συνομιλία",
     "Cancel": "Ακύρωση",
     "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
     "Dismiss": "Απόρριψη",
-    "bold": "έντονα",
-    "italic": "πλάγια",
     "Close": "Κλείσιμο",
     "Create new room": "Δημιουργία νέου δωματίου",
     "Room directory": "Ευρετήριο",
@@ -193,8 +182,6 @@
     "Home": "Αρχική",
     "Last seen": "Τελευταία εμφάνιση",
     "Manage Integrations": "Διαχείριση ενσωματώσεων",
-    "Markdown is disabled": "Το Markdown είναι απενεργοποιημένο",
-    "Markdown is enabled": "Το Markdown είναι ενεργοποιημένο",
     "Missing room_id in request": "Λείπει το room_id στο αίτημα",
     "Permissions": "Δικαιώματα",
     "Power level must be positive integer.": "Το επίπεδο δύναμης πρέπει να είναι ένας θετικός ακέραιος.",
@@ -214,7 +201,6 @@
     "Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα",
     "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s",
     "Send anyway": "Αποστολή ούτως ή άλλως",
-    "Send Invites": "Αποστολή προσκλήσεων",
     "Send Reset Email": "Αποστολή μηνύματος επαναφοράς",
     "%(senderDisplayName)s sent an image.": "Ο %(senderDisplayName)s έστειλε μια φωτογραφία.",
     "Session ID": "Αναγνωριστικό συνεδρίας",
@@ -231,15 +217,12 @@
     "Unban": "Άρση αποκλεισμού",
     "%(senderName)s unbanned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Unable to enable Notifications": "Αδυναμία ενεργοποίησης των ειδοποιήσεων",
-    "Unable to load device list": "Αδυναμία φόρτωσης της λίστας συσκευών",
     "unencrypted": "μη κρυπτογραφημένο",
-    "Unencrypted message": "Μη κρυπτογραφημένο μήνυμα",
     "unknown caller": "άγνωστος καλών",
     "unknown device": "άγνωστη συσκευή",
     "Unknown room %(roomId)s": "Άγνωστο δωμάτιο %(roomId)s",
     "Unmute": "Άρση σίγασης",
     "Unnamed Room": "Ανώνυμο δωμάτιο",
-    "Unrecognised command:": "Μη αναγνωρίσιμη εντολή:",
     "Unrecognised room alias:": "Μη αναγνωρίσιμο ψευδώνυμο:",
     "Upload avatar": "Αποστολή προσωπικής εικόνας",
     "Upload Failed": "Απέτυχε η αποστολή",
@@ -252,7 +235,6 @@
     "Video call": "Βιντεοκλήση",
     "Voice call": "Φωνητική κλήση",
     "Warning!": "Προειδοποίηση!",
-    "Who would you like to communicate with?": "Με ποιον θα θέλατε να επικοινωνήσετε;",
     "You are already in a call.": "Είστε ήδη σε μια κλήση.",
     "You have no visible notifications": "Δεν έχετε ορατές ειδοποιήσεις",
     "You must <a>register</a> to use this functionality": "Πρέπει να <a>εγγραφείτε</a> για να χρησιμοποιήσετε αυτή την λειτουργία",
@@ -300,11 +282,7 @@
     "Unknown error": "Άγνωστο σφάλμα",
     "Incorrect password": "Λανθασμένος κωδικός πρόσβασης",
     "To continue, please enter your password.": "Για να συνεχίσετε, παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασής σας.",
-    "Device name": "Όνομα συσκευής",
-    "Device key": "Κλειδί συσκευής",
-    "Verify device": "Επιβεβαίωση συσκευής",
     "Unable to restore session": "Αδυναμία επαναφοράς συνεδρίας",
-    "Unknown devices": "Άγνωστες συσκευές",
     "Unknown Address": "Άγνωστη διεύθυνση",
     "Blacklist": "Μαύρη λίστα",
     "Verify...": "Επιβεβαίωση...",
@@ -327,7 +305,6 @@
     "Username not available": "Μη διαθέσιμο όνομα χρήστη",
     "Something went wrong!": "Κάτι πήγε στραβά!",
     "Could not connect to the integration server": "Αδυναμία σύνδεσης στον διακομιστή ενσωμάτωσης",
-    "Encrypted by an unverified device": "Κρυπτογραφημένο από μια ανεπιβεβαίωτη συσκευή",
     "Error: Problem communicating with the given homeserver.": "Σφάλμα: πρόβλημα κατά την επικοινωνία με τον ορισμένο διακομιστή.",
     "Failed to ban user": "Δεν ήταν δυνατό ο αποκλεισμός του χρήστη",
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
@@ -335,26 +312,20 @@
     "Failed to unban": "Δεν ήταν δυνατή η άρση του αποκλεισμού",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Οι επισκέπτες δεν μπορούν να συνδεθούν στο δωμάτιο ακόμη και αν έχουν καλεστεί.",
-    "Hide Text Formatting Toolbar": "Απόκρυψη εργαλειοθήκης μορφοποίησης κειμένου",
     "Incoming call from %(name)s": "Εισερχόμενη κλήση από %(name)s",
     "Incoming video call from %(name)s": "Εισερχόμενη βιντεοκλήση από %(name)s",
     "Incoming voice call from %(name)s": "Εισερχόμενη φωνητική κλήση από %(name)s",
-    "Invalid alias format": "Μη έγκυρη μορφή ψευδώνυμου",
     "Invalid file%(extra)s": "Μη έγκυρο αρχείο %(extra)s",
     "%(senderName)s invited %(targetName)s.": "Ο %(senderName)s προσκάλεσε τον %(targetName)s.",
     "Invites user with given id to current room": "Προσκαλεί τον χρήστη με το δοσμένο αναγνωριστικό στο τρέχον δωμάτιο",
-    "'%(alias)s' is not a valid format for an alias": "Το '%(alias)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).",
     "Missing user_id in request": "Λείπει το user_id στο αίτημα",
-    "Never send encrypted messages to unverified devices from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές από αυτή τη συσκευή",
-    "Never send encrypted messages to unverified devices in this room from this device": "Να μη γίνει ποτέ αποστολή κρυπτογραφημένων μηνυμάτων σε ανεπιβεβαίωτες συσκευές, σε αυτό το δωμάτιο, από αυτή τη συσκευή",
     "not specified": "μη καθορισμένο",
     "NOT verified": "ΧΩΡΙΣ επαλήθευση",
-    "No devices with registered encryption keys": "Καθόλου συσκευές με εγγεγραμένα κλειδιά κρυπτογράφησης",
     "No display name": "Χωρίς όνομα",
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
@@ -363,18 +334,14 @@
     "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
     "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 - παρακαλούμε προσπαθήστε ξανά",
-    "Room contains unknown devices": "Το δωμάτιο περιέχει άγνωστες συσκευές",
     "%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
     "Scroll to bottom of page": "Μετάβαση στο τέλος της σελίδας",
-    "Sender device information": "Πληροφορίες συσκευής αποστολέα",
     "Server may be unavailable, overloaded, or search timed out :(": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να έχει λήξει η αναζήτηση :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να πέσατε σε ένα σφάλμα.",
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
-    "Show Text Formatting Toolbar": "Εμφάνιση της εργαλειοθήκης μορφοποίησης κειμένου",
     "%(count)s of your messages have not been sent.|other": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
     "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
-    "Unknown (user, device) pair:": "Άγνωστο ζεύγος (χρήστη, συσκευής):",
     "Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
@@ -385,7 +352,6 @@
     "VoIP conference finished.": "Ολοκληρώθηκε η συνδιάσκεψη VoIP.",
     "VoIP conference started.": "Ξεκίνησησε η συνδιάσκεψη VoIP.",
     "VoIP is unsupported": "Δεν υποστηρίζεται το VoIP",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η συσκευή έχει επαληθευτεί, αλλά τα κλειδιά ΔΕΝ ΤΑΙΡΙΑΖΟΥΝ!",
     "Who can access this room?": "Ποιος μπορεί να προσπελάσει αυτό το δωμάτιο;",
     "Who can read history?": "Ποιος μπορεί να διαβάσει το ιστορικό;",
     "%(senderName)s withdrew %(targetName)s's invitation.": "Ο %(senderName)s ανακάλεσε την πρόσκληση του %(targetName)s.",
@@ -401,7 +367,6 @@
     "Riot collects anonymous analytics to allow us to improve the application.": "Το Riot συλλέγει ανώνυμα δεδομένα επιτρέποντας μας να βελτιώσουμε την εφαρμογή.",
     "Failed to invite": "Δεν ήταν δυνατή η πρόσκληση",
     "I verify that the keys match": "Επιβεβαιώνω πως ταιριάζουν τα κλειδιά",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "Το \"%(RoomName)s\"  περιέχει συσκευές που δεν έχετε ξαναδεί.",
     "Please check your email to continue registration.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία για να συνεχίσετε με την εγγραφή.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Αν δεν ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας, δεν θα θα μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σας. Είστε σίγουροι;",
     "Removed or unknown message type": "Αφαιρέθηκε ή άγνωστος τύπος μηνύματος",
@@ -418,8 +383,6 @@
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
     "The remote side failed to pick up": "Η απομακρυσμένη πλευρά απέτυχε να συλλέξει",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
-    "Undecryptable": "Μη αποκρυπτογραφημένο",
     "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "You have <a>disabled</a> URL previews by default.": "Έχετε <a>απενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
     "You have <a>enabled</a> URL previews by default.": "Έχετε <a>ενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
@@ -432,9 +395,7 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Συμμετάσχετε με <voiceText>φωνή</voiceText> ή <videoText>βίντεο</videoText>.",
     "Joins room with given alias": "Συνδέεστε στο δωμάτιο με δοσμένο ψευδώνυμο",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
-    "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. Η συσκευή έχει επισημανθεί ως επιβεβαιωμένη.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Η διεύθυνση της ηλ. αλληλογραφίας σας δεν φαίνεται να συσχετίζεται με μια ταυτότητα Matrix σε αυτόν τον Διακομιστή Φιλοξενίας.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς. Δεν θα λάβετε ειδοποιήσεις push σε άλλες συσκευές μέχρι να συνδεθείτε ξανά σε αυτές",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.",
     "Sent messages will be stored until your connection has returned.": "Τα απεσταλμένα μηνύματα θα αποθηκευτούν μέχρι να αακτηθεί η σύνδεσή σας.",
     "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.": "Είστε βέβαιοι ότι θέλετε να καταργήσετε (διαγράψετε) αυτό το συμβάν; Σημειώστε ότι αν διαγράψετε το όνομα δωματίου ή αλλάξετε το θέμα, θα μπορούσε να αναιρέσει την αλλαγή.",
@@ -452,22 +413,16 @@
     "Your browser does not support the required cryptography extensions": "Ο περιηγητής σας δεν υποστηρίζει τα απαιτούμενα πρόσθετα κρυπτογράφησης",
     "Not a valid Riot keyfile": "Μη έγκυρο αρχείο κλειδιού Riot",
     "Authentication check failed: incorrect password?": "Αποτυχία ελέγχου πιστοποίησης: λανθασμένος κωδικός πρόσβασης;",
-    "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.": "Η αλλαγή του κωδικού πρόσβασης θα επαναφέρει τα κλειδιά κρυπτογράφησης από άκρο σε άκρο σε όλες τις συσκευές, καθιστώντας το κρυπτογραφημένο ιστορικό συζητήσεων μη αναγνώσιμο, εκτός και αν εξάγετε πρώτα τα κλειδιά και τα εισαγάγετε ξανά στο δωμάτιο. Στο μέλλον αυτή η διαδικασία θα βελτιωθεί.",
     "Claimed Ed25519 fingerprint key": "Απαιτήθηκε κλειδί αποτυπώματος Ed25519",
     "Displays action": "Εμφανίζει την ενέργεια",
     "To use it, just wait for autocomplete results to load and tab through them.": "Για να το χρησιμοποιήσετε, απλά περιμένετε μέχρι να φορτωθούν τα αποτέλεσμα αυτόματης συμπλήρωσης. Έπειτα επιλέξτε ένα από αυτά χρησιμοποιώντας τον στηλοθέτη.",
     "Use compact timeline layout": "Χρήση συμπαγούς διάταξης χρονολογίου",
     "(could not connect media)": "(αδυναμία σύνδεσης με το πολυμέσο)",
-    "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\". Αυτό σημαίνει ότι η επικοινωνία σας μπορεί να έχει υποκλαπεί!",
     "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.": "Το αρχείο εξαγωγής θα επιτρέψει σε οποιονδήποτε που μπορεί να το διαβάσει να αποκρυπτογραφήσει κρυπτογραφημένα μηνύματα που εσείς μπορείτε να δείτε, οπότε θα πρέπει να είστε προσεκτικοί για να το κρατήσετε ασφαλές. Για να βοηθήσετε με αυτό, θα πρέπει να εισαγάγετε ένα συνθηματικό, το οποία θα χρησιμοποιηθεί για την κρυπτογράφηση των εξαγόμενων δεδομένων. Η εισαγωγή δεδομένων θα είναι δυνατή χρησιμοποιώντας μόνο το ίδιο συνθηματικό.",
     "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.": "Το αρχείο εξαγωγής θα είναι προστατευμένο με συνθηματικό. Θα χρειαστεί να πληκτρολογήσετε το συνθηματικό εδώ για να αποκρυπτογραφήσετε το αρχείο.",
-    "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:": "Για να βεβαιωθείτε ότι είναι αξιόπιστη αυτή η συσκευή, επικοινωνήστε με τον κάτοχο της χρησιμοποιώντας άλλα μέσα (π.χ. προσωπικά ή μέσω τηλεφώνου) και ρωτήστε εάν το κλειδί που βλέπετε στις ρυθμίσεις χρήστη για αυτήν τη συσκευή ταιριάζει με το παρακάτω κλειδί:",
-    "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.": "Εάν ταιριάζει, πατήστε το κουμπί επιβεβαίωσης παρακάτω. Εάν όχι, τότε κάποιος άλλος παρακολουθεί αυτή τη συσκευή και ίσως θέλετε να πατήσετε το κουμπί της μαύρης λίστας.",
     "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, η συνεδρία σας ίσως είναι μη συμβατή με αυτήν την έκδοση. Κλείστε αυτό το παράθυρο και επιστρέψτε στην πιο πρόσφατη έκδοση.",
-    "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.": "Σας συνιστούμε να ολοκληρώσετε τη διαδικασία επαλήθευσης για κάθε συσκευή και να επιβεβαιώσετε ότι ανήκουν στον νόμιμο κάτοχό της, αλλά εάν προτιμάτε μπορείτε να στείλετε ξανά το μήνυμα χωρίς επαλήθευση.",
     "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?": "Θα μεταφερθείτε σε έναν ιστότοπου τρίτου για να πραγματοποιηθεί η πιστοποίηση του λογαριασμού σας με το %(integrationsUrl)s. Θα θέλατε να συνεχίσετε;",
     "Do you want to set an email address?": "Θέλετε να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας;",
     "This will allow you to reset your password and receive notifications.": "Αυτό θα σας επιτρέψει να επαναφέρετε τον κωδικό πρόσβαση σας και θα μπορείτε να λαμβάνετε ειδοποιήσεις.",
@@ -475,8 +430,6 @@
     "Start verification": "Έναρξη επιβεβαίωσης",
     "Share without verifying": "Κοινή χρήση χωρίς επιβεβαίωση",
     "Ignore request": "Παράβλεψη αιτήματος",
-    "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' ζητά κλειδιά κρυπτογράφησης.",
     "Encryption key request": "Αίτημα κλειδιού κρυπτογράφησης",
     "Check for update": "Έλεγχος για ενημέρωση",
     "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
@@ -527,7 +480,6 @@
     "Noisy": "Δυνατά",
     "Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
     "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.": "Αυτό θα σας επιτρέψει να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
     "Keywords": "Λέξεις κλειδιά",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
     "Messages containing <span>keywords</span>": "Μηνύματα που περιέχουν <span>λέξεις κλειδιά</span>",
@@ -624,7 +576,6 @@
     "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 των δωματίων:",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Υπάρχουν άγνωστες συσκευές στο δωμάτιο: εάν συνεχίσετε χωρίς να τις επιβεβαιώσετε, θα μπορούσε κάποιος να κρυφακούει την κλήση σας.",
     "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;",
     "Room name or alias": "Όνομα η ψευδώνυμο δωματίου",
     "Restricted": "Περιορισμένο/η",
@@ -640,15 +591,12 @@
     "%(widgetName)s widget removed by %(senderName)s": "Το widget %(widgetName)s αφαιρέθηκε από τον/την %(senderName)s",
     "Message Pinning": "Καρφίτσωμα Μηνυμάτων",
     "Enable URL previews for this room (only affects you)": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
-    "Delete %(count)s devices|other": "Διαγραφή %(count)s συσκευών",
-    "Delete %(count)s devices|one": "Διαγραφή συσκευής",
     "Cannot add any more widgets": "Δεν είναι δυνατή η προσθήκη άλλων γραφικών στοιχείων",
     "The maximum permitted number of widgets have already been added to this room.": "Ο μέγιστος επιτρεπτός αριθμός γραφικών στοιχείων έχει ήδη προστεθεί σε αυτό το δωμάτιο.",
     "Add a widget": "Προσθέστε ένα γραφικό στοιχείο",
     "%(senderName)s sent an image": "Ο/Η %(senderName)s έστειλε μία εικόνα",
     "%(senderName)s sent a video": "Ο/Η %(senderName)s έστειλε ένα βίντεο",
     "%(senderName)s uploaded a file": "Ο/Η %(senderName)s αναφόρτωσε ένα αρχείο",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Εάν οι άλλες συσκευές σας δεν έχουν το κλειδί για αυτό το μήνυμα, τότε δεν θα μπορείτε να το αποκρυπτογραφήσετε.",
     "Disinvite this user?": "Απόσυρση της πρόσκλησης αυτού του χρήστη;",
     "Mention": "Αναφορά",
     "Invite": "Πρόσκληση",
@@ -657,7 +605,6 @@
     "Send a reply (unencrypted)…": "Αποστολή απάντησης (μη κρυπτογραφημένης)…",
     "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…",
     "Send a message (unencrypted)…": "Αποστολή μηνύματος (μη κρυπτογραφημένου)…",
-    "Unable to reply": "Αδυναμία απάντησης",
     "Unpin Message": "Ξεκαρφίτσωμα μηνύματος",
     "Jump to message": "Πηγαίντε στο μήνυμα",
     "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.",
@@ -704,8 +651,6 @@
     "Unable to load! Check your network connectivity and try again.": "Αδυναμία φόρτωσης! Ελέγξτε την σύνδεση του δικτύου και προσπαθήστε ξανά.",
     "Registration Required": "Απαιτείτε Εγγραφή",
     "You need to register to do this. Would you like to register now?": "Χρειάζεται να γίνει εγγραφή για αυτό. Θα θέλατε να κάνετε εγγραφή τώρα;",
-    "Email, name or Matrix ID": "Ηλ. ταχυδρομείο, όνομα ή ταυτότητα Matrix",
-    "Failed to start chat": "Αποτυχία αρχικοποίησης συνομιλίας",
     "Failed to invite users to the room:": "Αποτυχία πρόσκλησης χρηστών στο δωμάτιο:",
     "Missing roomId.": "Λείπει η ταυτότητα δωματίου.",
     "Messages": "Μηνύματα",
@@ -715,12 +660,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Αποστέλλει ένα μήνυμα ως απλό κείμενο, χωρίς να το ερμηνεύει ως \"markdown\"",
     "Upgrades a room to a new version": "Αναβαθμίζει το δωμάτιο σε μια καινούργια έκδοση",
     "You do not have the required permissions to use this command.": "Δεν διαθέτετε τις απαιτούμενες άδειες για να χρησιμοποιήσετε αυτήν την εντολή.",
-    "Room upgrade confirmation": "Επιβεβαίωση αναβάθμισης δωματίου",
-    "Upgrading a room can be destructive and isn't always necessary.": "Η αναβάθμιση ενός δωματίου μπορεί να είναι καταστροφική και δεν είναι πάντα απαραίτητη.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Οι αναβαθμίσεις δωματίου είναι συνήθως προτεινόμενες όταν μια έκδοση δωματίου θεωρείτε <i>ασταθής</i>. Ασταθείς εκδόσεις δωματίων μπορεί να έχουν σφάλματα, ελλειπή χαρακτηριστικά, ή αδυναμίες ασφαλείας.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Οι αναβαθμίσεις δωματίων συνήθως επηρεάζουν μόνο την επεξεργασία του δωματίου <i>από την πλευρά του διακομιστή</i>. Εάν έχετε προβλήματα με το πρόγραμμα-πελάτη Riot, παρακαλώ αρχειοθετήστε ένα πρόβλημα μέσω <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Προσοχή</b>: Αναβαθμίζοντας ένα δωμάτιο <i>δεν θα μεταφέρει αυτόματα τα μέλη του δωματίου στη νέα έκδοση του δωματίου.</i> Θα αναρτήσουμε ένα σύνδεσμο προς το νέο δωμάτιο στη παλιά έκδοση του δωματίου - τα μέλη του δωματίου θα πρέπει να πατήσουν στον σύνδεσμο για να μπουν στο νέο δωμάτιο.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Παρακαλώ επιβεβαιώστε ότι θα θέλατε να προχωρήσετε με την αναβάθμιση του δωματίου από <oldVersion /> σε <newVersion />.",
     "Changes your display nickname in the current room only": "Αλλάζει το εμφανιζόμενο ψευδώνυμο μόνο στο παρόν δωμάτιο",
     "Changes the avatar of the current room": "Αλλάζει το άβαταρ αυτού του δωματίου",
     "Changes your avatar in this current room only": "Αλλάζει το άβαταρ σας μόνο στο παρόν δωμάτιο",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 70e4bf5092..05f29c3887 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -47,7 +47,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "Changes your display nickname": "Changes your display nickname",
-    "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.": "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.",
     "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
     "Click here to fix": "Click here to fix",
     "Click to mute audio": "Click to mute audio",
@@ -72,12 +71,8 @@
     "Deops user with given id": "Deops user with given id",
     "Default": "Default",
     "Delete widget": "Delete widget",
-    "Device already verified!": "Device already verified!",
     "Device ID": "Device ID",
-    "Device ID:": "Device ID:",
     "device id: ": "device id: ",
-    "Device key:": "Device key:",
-    "Devices": "Devices",
     "Direct chats": "Direct chats",
     "Disinvite": "Disinvite",
     "Displays action": "Displays action",
@@ -124,7 +119,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Hangup": "Hangup",
-    "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
     "Historical": "Historical",
     "Homeserver is": "Homeserver is",
     "Identity Server is": "Identity Server is",
@@ -133,15 +127,12 @@
     "Import E2E room keys": "Import E2E room keys",
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Incorrect verification code": "Incorrect verification code",
-    "Invalid alias format": "Invalid alias format",
     "Invalid Email Address": "Invalid Email Address",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
-    "Invite new room members": "Invite new room members",
     "Invited": "Invited",
     "Invites": "Invites",
     "Invites user with given id to current room": "Invites user with given id to current room",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
     "Sign in with": "Sign in with",
     "Join Room": "Join Room",
     "%(targetName)s joined the room.": "%(targetName)s joined the room.",
@@ -172,17 +163,11 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
     "Manage Integrations": "Manage Integrations",
-    "Markdown is disabled": "Markdown is disabled",
-    "Markdown is enabled": "Markdown is enabled",
-    "matrix-react-sdk version:": "matrix-react-sdk version:",
-    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "Missing room_id in request": "Missing room_id in request",
     "Missing user_id in request": "Missing user_id in request",
     "Moderator": "Moderator",
     "Mute": "Mute",
     "Name": "Name",
-    "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
-    "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
     "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "New passwords don't match",
     "New passwords must match each other.": "New passwords must match each other.",
@@ -192,7 +177,6 @@
     "(not supported by this browser)": "(not supported by this browser)",
     "<not supported>": "<not supported>",
     "NOT verified": "NOT verified",
-    "No devices with registered encryption keys": "No devices with registered encryption keys",
     "No more results": "No more results",
     "No results": "No results",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -202,7 +186,6 @@
     "Operation failed": "Operation failed",
     "Password": "Password",
     "Passwords can't be empty": "Passwords can't be empty",
-    "People": "People",
     "Permissions": "Permissions",
     "Phone": "Phone",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
@@ -233,8 +216,6 @@
     "Search": "Search",
     "Search failed": "Search failed",
     "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
-    "Sender device information": "Sender device information",
-    "Send Invites": "Send Invites",
     "Send Reset Email": "Send Reset Email",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
@@ -253,10 +234,8 @@
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "Someone": "Someone",
     "Start a chat": "Start a chat",
-    "Start Chat": "Start Chat",
     "Submit": "Submit",
     "Success": "Success",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
     "This email address is already in use": "This email address is already in use",
     "This email address was not found": "This email address was not found",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -269,7 +248,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
     "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 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.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
     "Unable to add email address": "Unable to add email address",
     "Unable to remove contact information": "Unable to remove contact information",
     "Unable to verify email address.": "Unable to verify email address.",
@@ -277,14 +255,11 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
     "Unable to capture screen": "Unable to capture screen",
     "Unable to enable Notifications": "Unable to enable Notifications",
-    "Unable to load device list": "Unable to load device list",
     "unencrypted": "unencrypted",
     "unknown device": "unknown device",
     "unknown error code": "unknown error code",
     "Unknown room %(roomId)s": "Unknown room %(roomId)s",
-    "Unknown (user, device) pair:": "Unknown (user, device) pair:",
     "Unmute": "Unmute",
-    "Unrecognised command:": "Unrecognized command:",
     "Unrecognised room alias:": "Unrecognized room alias:",
     "Upload avatar": "Upload avatar",
     "Upload Failed": "Upload Failed",
@@ -306,11 +281,8 @@
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
     "Warning!": "Warning!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "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!": "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!",
     "Who can access this room?": "Who can access this room?",
     "Who can read history?": "Who can read history?",
-    "Who would you like to communicate with?": "Who would you like to communicate with?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
     "You are already in a call.": "You are already in a call.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
@@ -322,7 +294,6 @@
     "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
     "You need to be logged in.": "You need to be logged in.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
@@ -359,8 +330,6 @@
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "Cancel": "Cancel",
     "Active call": "Active call",
-    "bold": "bold",
-    "italic": "italic",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Start automatically after system login": "Start automatically after system login",
     "Analytics": "Analytics",
@@ -387,18 +356,9 @@
     "Unknown error": "Unknown error",
     "Incorrect password": "Incorrect password",
     "To continue, please enter your password.": "To continue, please enter your 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:": "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 name",
-    "Device key": "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.": "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.",
-    "Verify device": "Verify device",
     "I verify that the keys match": "I verify that the keys match",
     "Unable to restore session": "Unable to restore 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.": "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.",
-    "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.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
-    "Unknown devices": "Unknown devices",
     "Unknown Address": "Unknown Address",
     "Unblacklist": "Unblacklist",
     "Blacklist": "Blacklist",
@@ -444,7 +404,6 @@
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "Drop File Here": "Drop File Here",
-    "Encrypted by an unverified device": "Encrypted by an unverified device",
     "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
@@ -457,17 +416,13 @@
     "No display name": "No display name",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
-    "Room contains unknown devices": "Room contains unknown devices",
     "%(roomName)s does not exist.": "%(roomName)s does not exist.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
     "Send anyway": "Send anyway",
-    "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Start authentication": "Start authentication",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
     "This room": "This room",
-    "Undecryptable": "Undecryptable",
-    "Unencrypted message": "Unencrypted message",
     "unknown caller": "unknown caller",
     "Unnamed Room": "Unnamed Room",
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
@@ -494,8 +449,6 @@
     "Start verification": "Start verification",
     "Share without verifying": "Share without verifying",
     "Ignore request": "Ignore request",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "You added a new device '%(displayName)s', which is requesting encryption keys.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Your unverified device '%(displayName)s' is requesting encryption keys.",
     "Encryption key request": "Encryption key request",
     "Check for update": "Check for update",
     "Allow": "Allow",
@@ -508,7 +461,6 @@
     "Unable to create widget.": "Unable to create widget.",
     "You are not in this room.": "You are not in this room.",
     "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
-    "Loading device info...": "Loading device info...",
     "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Example": "Example",
     "Create": "Create",
@@ -519,7 +471,6 @@
     "Failed to upload image": "Failed to upload image",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
-    "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "Fetching third party location failed": "Fetching third party location failed",
     "A new version of Riot is available.": "A new version of Riot is available.",
@@ -568,7 +519,6 @@
     "Files": "Files",
     "Collecting app version information": "Collecting app version information",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
     "Keywords": "Keywords",
     "Unpin Message": "Unpin Message",
     "Enable notifications for this account": "Enable notifications for this account",
@@ -653,7 +603,6 @@
     "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",
@@ -701,15 +650,9 @@
     "The server does not support the room version specified.": "The server does not support the room version specified.",
     "Name or Matrix ID": "Name or Matrix ID",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
-    "Email, name or Matrix ID": "Email, name or Matrix ID",
     "Failed to invite users to the room:": "Failed to invite users to the room:",
     "Upgrades a room to a new version": "Upgrades a room to a new version",
-    "Room upgrade confirmation": "Room upgrade confirmation",
-    "Upgrading a room can be destructive and isn't always necessary.": "Upgrading a room can be destructive and isn't always necessary.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.",
     "Changes your display nickname in the current room only": "Changes your display nickname in the current room only",
     "Changes your avatar in this current room only": "Changes your avatar in this current room only",
     "Gets or sets the room topic": "Gets or sets the room topic",
@@ -743,7 +686,6 @@
     "Call failed due to misconfigured server": "Call failed due to misconfigured server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
     "Try using turn.matrix.org": "Try using turn.matrix.org",
-    "Failed to start chat": "Failed to start chat",
     "Messages": "Messages",
     "Actions": "Actions",
     "Other": "Other"
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 2953a81ce3..1513e2dcd8 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -62,10 +62,6 @@
     "Moderator": "Ĉambrestro",
     "Admin": "Administranto",
     "Start a chat": "Komenci babilon",
-    "Who would you like to communicate with?": "Kun kiu vi volas komuniki?",
-    "Start Chat": "Komenci babilon",
-    "Invite new room members": "Inviti novajn ĉambranojn",
-    "Send Invites": "Sendi invitojn",
     "Operation failed": "Ago malsukcesis",
     "Failed to invite": "Invito malsukcesis",
     "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
@@ -88,13 +84,7 @@
     "You are now ignoring %(userId)s": "Vi nun malatentas uzanton %(userId)s",
     "Unignored user": "Reatentata uzanto",
     "You are no longer ignoring %(userId)s": "Vi nun reatentas uzanton %(userId)s",
-    "Unknown (user, device) pair:": "Nekonata duopo (uzanto, aparato):",
-    "Device already verified!": "Aparato jam kontroliĝis!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "AVERTO: Aparato jam kontroliĝis, sed la ŝlosiloj NE KONGRUAS!",
-    "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!": "AVERTO: KONTROLO DE ŜLOSILO MALSUKCESIS! Subskriba ŝlosilo por %(userId)s kaj aparato%(deviceId)s estas « %(fprint)s », kiu ne kongruas kun la donita ŝlosilo « %(fingerprint)s ». Eble do via komuniko estas subaŭskultata!",
     "Verified key": "Kontrolita ŝlosilo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La donita subskriba ŝlosilo kongruas kun la ŝlosilo ricevita de %(userId)s por ĝia aparato %(deviceId)s. Aparato markita kiel kontrolita.",
-    "Unrecognised command:": "Nerekonita komando:",
     "Reason": "Kialo",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akceptis la inviton por %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s akceptis inviton.",
@@ -131,7 +121,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonata (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
@@ -151,7 +140,6 @@
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
     "Autoplay GIFs and videos": "Memfare ludi GIF-bildojn kaj filmojn",
     "Call Failed": "Voko malsukcesis",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la ĉambro estas nekonataj aparatoj: se vi daŭrigos ne kontrolante ilin, iu povos subaŭskulti vian vokon.",
     "Review Devices": "Kontroli aparatojn",
     "Call Anyway": "Tamen voki",
     "Answer Anyway": "Tamen respondi",
@@ -162,8 +150,6 @@
     "Enable automatic language detection for syntax highlighting": "Ŝalti memagan rekonon de lingvo por sintaksa markado",
     "Automatically replace plain text Emoji": "Memfare anstataŭigi tekstajn mienetojn",
     "Mirror local video feed": "Speguli lokan filmon",
-    "Never send encrypted messages to unverified devices from this device": "Neniam sendi neĉifritajn mesaĝojn al nekontrolitaj aparatoj de tiu ĉi aparato",
-    "Never send encrypted messages to unverified devices in this room from this device": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj aparatoj en tiu ĉi ĉambro el tiu ĉi aparato",
     "Enable inline URL previews by default": "Ŝalti entekstan antaŭrigardon al retadresoj",
     "Enable URL previews for this room (only affects you)": "Ŝalti URL-antaŭrigardon en ĉi tiu ĉambro (nur por vi)",
     "Enable URL previews by default for participants in this room": "Ŝalti URL-antaŭrigardon por anoj de ĉi tiu ĉambro",
@@ -193,10 +179,7 @@
     "New Password": "Nova pasvorto",
     "Confirm password": "Konfirmi pasvorton",
     "Change Password": "Ŝanĝi pasvorton",
-    "Unable to load device list": "Listo de aparatoj ne legeblas",
     "Authentication": "Aŭtentigo",
-    "Delete %(count)s devices|other": "Forigi %(count)s aparatojn",
-    "Delete %(count)s devices|one": "Forigi aparaton",
     "Device ID": "Aparata identigilo",
     "Last seen": "Laste vidita",
     "Failed to set display name": "Malsukcesis agordi vidigan nomon",
@@ -214,9 +197,6 @@
     "%(senderName)s sent a video": "%(senderName)s sendis filmon",
     "%(senderName)s uploaded a file": "%(senderName)s alŝutis dosieron",
     "Options": "Agordoj",
-    "Undecryptable": "Nemalĉifrebla",
-    "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 tiu mesaĝo",
     "Blacklisted": "Senpova legi ĉifritajn mesaĝojn",
     "device id: ": "aparata identigilo: ",
@@ -235,11 +215,8 @@
     "Failed to change power level": "Malsukcesis ŝanĝi nivelon de potenco",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos fareblos, ĉar vi donas al la uzanto la saman nivelon de potenco, kiun havas vi mem.",
     "Are you sure?": "Ĉu vi certas?",
-    "No devices with registered encryption keys": "Neniuj aparatoj kun registritaj ĉifraj ŝlosiloj",
-    "Devices": "Aparatoj",
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
-    "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.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio igos ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estonte tio pliboniĝos.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
     "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?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
     "Jump to read receipt": "Salti al legokonfirmo",
@@ -262,16 +239,10 @@
     "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 tiu ĉambro",
-    "Hide Text Formatting Toolbar": "Kaŝi tekstaranĝan breton",
     "Server error": "Servila eraro",
     "Server unavailable, overloaded, or something else went wrong.": "Servilo estas neatingebla, troŝarĝita, aŭ io alia misokazis.",
     "Command error": "Komanda eraro",
-    "bold": "grasa",
-    "italic": "kursiva",
-    "Markdown is disabled": "Marksubo estas malŝaltita",
-    "Markdown is enabled": "Marksubo estas ŝaltita",
     "Unpin Message": "Malfiksi mesaĝon",
     "Jump to message": "Salti al mesaĝo",
     "No pinned messages.": "Neniuj fiksitaj mesaĝoj.",
@@ -305,7 +276,6 @@
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
     "Favourites": "Ŝatataj",
-    "People": "Homoj",
     "Rooms": "Ĉambroj",
     "Low priority": "Malpli gravaj",
     "Historical": "Estintaj",
@@ -340,8 +310,6 @@
     "Cancel": "Nuligi",
     "Jump to first unread message.": "Salti al unua nelegita mesaĝo.",
     "Close": "Fermi",
-    "Invalid alias format": "Malvalida formo de kromnomo",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ne estas valida formo de kromnomo",
     "not specified": "nespecifita",
     "Remote addresses for this room:": "Foraj adresoj de ĉi tiu ĉambro:",
     "Local addresses for this room:": "Lokaj adresoj por ĉi tiu ĉambro:",
@@ -502,20 +470,12 @@
     "Unknown error": "Nekonata eraro",
     "Incorrect password": "Malĝusta pasvorto",
     "Deactivate Account": "Malaktivigi konton",
-    "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:": "Por kontroli ke tiu ĉi aparato estas fidinda, bonvolu kontakti ties posedanton per alia maniero (ekz-e persone aŭ telefone) kaj demandi ĝin ĉu la ŝlosilo, kiun ĝi vidas en agordoj de uzanto ĉe si, kongruas kun la ĉi-suba ŝlosilo:",
-    "Device name": "Aparata nomo",
-    "Device key": "Aparata ŝlosilo",
-    "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.": "Se ĝi kongruas, premu la kontrolan butonon sube. Se ne, tiuokaze iu alia interkaptas ĉi tiun aparaton, kaj eble vi premu la malpermesan butonon anstataŭe.",
-    "Verify device": "Kontroli aparaton",
     "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj kongruas",
     "An error has occurred.": "Okazis eraro.",
     "OK": "Bone",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton “%(displayName)s”, kiu petas ĉifrajn ŝlosilojn.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Via nekontrolita aparato '%(displayName)s' petas ĉifrajn ŝlosilojn.",
     "Start verification": "Komenci kontrolon",
     "Share without verifying": "Kunhavigi sen kontrolo",
     "Ignore request": "Malatenti peton",
-    "Loading device info...": "Enleganta informojn pri aparato…",
     "Encryption key request": "Peto por ĉifra ŝlosilo",
     "Unable to restore session": "Seanco ne restaŭreblas",
     "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.": "Se vi antaŭe uzis pli novan version de Riot, via seanco eble ne kongruos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
@@ -532,11 +492,6 @@
     "Blacklist": "Malpermesi legadon de ĉifritaj mesaĝoj",
     "Unverify": "Malkontroli",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se vi jam havas Matrix-konton, vi povas <a>saluti</a> anstataŭe.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vi nun malpermesas legadon de ĉifritaj mesaĝoj al nekontrolitaj aparatoj; por sendi mesaĝojn al tiuj, vi devas ilin kontroli.",
-    "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.": "Ni rekomendas al vi bone kontroli ĉiun aparaton por certigi, ke ĝi apartenas al la verŝajna posedanto, sed vi povas resendi la mesaĝon sen kontrolo, laŭprefere.",
-    "Room contains unknown devices": "Ĉambro enhavas nekonatajn aparatojn",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "« %(RoomName)s » enhavas aparatojn, kiujn vi neniam vidis antaŭe.",
-    "Unknown devices": "Nekonataj aparatoj",
     "Private Chat": "Privata babilo",
     "Public Chat": "Publika babilo",
     "Custom": "Propra",
@@ -592,7 +547,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.",
     "You have no visible notifications": "Neniuj videblaj sciigoj",
     "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
-    "Message not sent due to unknown devices being present": "Mesaĝo ne sendita pro ĉeesto de nekonataj aparatoj",
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
     "Active call": "Aktiva voko",
@@ -620,13 +574,10 @@
     "Dark theme": "Malhela haŭto",
     "Sign out": "Adiaŭi",
     "Success": "Sukceso",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevos puŝatentigojn je aliaj aparatoj ĝis tiam, kiam vi resalutos per ili",
     "Unable to remove contact information": "Kontaktaj informoj ne forigeblas",
     "<not supported>": "<nesubtenata>",
     "Import E2E room keys": "Enporti ĝiscele ĉifrajn ĉambrajn ŝlosilojn",
     "Cryptography": "Kriptografio",
-    "Device ID:": "Aparata identigilo:",
-    "Device key:": "Aparata ŝlosilo:",
     "Analytics": "Analizo",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot kolektas sennomaj analizajn datumojn por helpi plibonigadon de la programo.",
     "Labs": "Eksperimentaj funkcioj",
@@ -648,7 +599,6 @@
     "click to reveal": "klaku por malkovri",
     "Homeserver is": "Hejmservilo estas",
     "Identity Server is": "Identiga servilo estas",
-    "matrix-react-sdk version:": "versio de matrix-react-sdk:",
     "riot-web version:": "versio de riot-web:",
     "olm version:": "versio de olm:",
     "Failed to send email": "Malsukcesis sendi retleteron",
@@ -678,7 +628,6 @@
     "Kicks user with given id": "Forpelas uzanton kun la donita identigilo",
     "Changes your display nickname": "Ŝanĝas vian vidigan nomon",
     "Searches DuckDuckGo for results": "Serĉas rezultojn per DuckDuckGo",
-    "Verifies a user, device, and pubkey tuple": "Kontrolas opon de uzanto, aparato, kaj publika ŝlosilo",
     "Ignores a user, hiding their messages from you": "Malatentas uzanton, kaŝante ĝiajn mesaĝojn de vi",
     "Stops ignoring a user, showing their messages going forward": "Ĉesas malatenti uzanton, montronte ĝiajn pluajn mesaĝojn",
     "Commands": "Komandoj",
@@ -701,7 +650,6 @@
     "Session ID": "Seanca identigilo",
     "End-to-end encryption information": "Informoj pri tutvoja ĉifrado",
     "Event information": "Informoj pri okazaĵo",
-    "Sender device information": "Informoj pri aparato de sendinto",
     "Passphrases must match": "Pasfrazoj devas kongrui",
     "Passphrase must not be empty": "Pasfrazoj maldevas esti malplenaj",
     "Export room keys": "Elporti ĉambrajn ŝlosilojn",
@@ -785,7 +733,6 @@
     "Resend": "Resendi",
     "Collecting app version information": "Kolektanta informon pri versio de la aplikaĵo",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la ĉambran kromnomon %(alias)s kaj forigi %(name)s de la ujo?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Ĉi tio permesos al vi reveni al via konto post adiaŭo, kaj saluti kun aliaj aparatoj.",
     "Enable notifications for this account": "Ŝalti sciigojn por tiu ĉi konto",
     "Invite to this community": "Inviti al tiu ĉi komunumo",
     "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortojn</span>",
@@ -879,8 +826,6 @@
     "Always show encryption icons": "Ĉiam montri bildetojn de ĉifrado",
     "Send analytics data": "Sendi statistikajn datumojn",
     "Key request sent.": "Demando de ŝlosilo sendita.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Redemandi ĉifroŝlosilojn</requestLink> el viaj aliaj aparatoj.",
-    "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?",
@@ -938,10 +883,8 @@
     "Language and region": "Lingvo kaj regiono",
     "Theme": "Haŭto",
     "General": "Ĝenerala",
-    "Unable to reply": "Ne eblas respondi",
     "<a>In reply to</a> <pill>": "<a>Respondanta al</a> <pill>",
     "Share Message": "Diskonigi",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Montri aparatojn</showDevicesText>, <sendAnywayText>tamen sendi</sendAnywayText> aŭ <cancelText>nuligi</cancelText>.",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
     "You do not have permission to start a conference call in this room": "Vi ne havas permeson komenci grupvokon en ĉi tiu ĉambro",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "La dosiero '%(fileName)s' superas la grandecan limon de ĉi tiu hejmservilo",
@@ -991,7 +934,6 @@
     "Book": "Libro",
     "Pencil": "Grifelo",
     "Scissors": "Tondilo",
-    "Padlock": "Penda seruro",
     "Key": "Ŝlosilo",
     "Hammer": "Martelo",
     "Telephone": "Telefono",
@@ -1013,7 +955,6 @@
     "Email Address": "Retpoŝtadreso",
     "Phone Number": "Telefonnumero",
     "Profile picture": "Profilbildo",
-    "Upload profile picture": "Alŝuti profilbildon",
     "<a>Upgrade</a> to your own domain": "<a>Ĝisdatigi</a> al via propra domajno",
     "Display Name": "Vidiga nomo",
     "Set a new account password...": "Agordi novan kontan pasvorton...",
@@ -1060,12 +1001,6 @@
     "Roles & Permissions": "Roloj & Permesoj",
     "Enable encryption?": "Ĉu ŝalti ĉifradon?",
     "Share Link to User": "Kunhavigi ligilon al uzanto",
-    "deleted": "forigita",
-    "underlined": "substrekita",
-    "inline-code": "enteksta-kodo",
-    "block-quote": "blokcito",
-    "bulleted-list": "bula-listo",
-    "numbered-list": "numerita-listo",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vidita de %(displayName)s (%(userName)s) je %(dateTime)s",
     "Share room": "Kunhavigi ĉambron",
     "System Alerts": "Sistemaj avertoj",
@@ -1073,8 +1008,6 @@
     "Don't ask me again": "Ne demandu min denove",
     "Main address": "Ĉefa adreso",
     "Room avatar": "Profilbildo de ĉambro",
-    "Upload room avatar": "Alŝuti profilbildon de ĉambro",
-    "No room avatar": "Neniu profilbildo de ĉambro",
     "Room Name": "Nomo de ĉambro",
     "Room Topic": "Temo de ĉambro",
     "Yes, I want to help!": "Jes. Mi volas helpi!",
@@ -1150,14 +1083,8 @@
     "The file '%(fileName)s' failed to upload.": "Malsukcesis alŝuti dosieron « %(fileName)s ».",
     "The server does not support the room version specified.": "La servilo ne subtenas la donitan ĉambran version.",
     "Name or Matrix ID": "Nomo aŭ Matrix-identigilo",
-    "Email, name or Matrix ID": "Retpoŝtadreso, nomo, aŭ Matrix-identigilo",
     "Upgrades a room to a new version": "Gradaltigas ĉambron al nova versio",
-    "Room upgrade confirmation": "Konfirmo de ĉambra gradaltigo",
-    "Upgrading a room can be destructive and isn't always necessary.": "Gradaltigo de ĉambro povas esti detrua kaj ne estas ĉiam necesa.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gradaltigoj de ĉambroj estas kutime rekomendataj kiam ĉambra versio estas opiniata <i>malstabila</i>. Malstabilaj ĉambraj versioj povas kunhavi erarojn, mankojn de funkcioj, aŭ malsekuraĵojn.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Ĉambraj gradaltigoj efikas nur sur <i>servil-flanka</i> funkciado de la ĉambro. Se vi havas problemon kun via kliento (Riot), bonvolu raparti problemon per <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Averto</b>: Gradaltigo de ĉambro <i>ne transmetos ĉiujn ĉambranojn al la nova versio de la ĉambro.</i> Ni afiŝos ligilon al la nova ĉambro en la malnova versio de la ĉambro – ĉambranoj devos tien klaki por aliĝi al la nova ĉambro.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bonvolu konfirmi, ke vi certe volas gradaltigi ĉi tiun ĉambron de <oldVersion /> al <newVersion />.",
     "Changes your display nickname in the current room only": "Ŝanĝas vian vidigan nomon nur en la nuna ĉambro",
     "Changes your avatar in this current room only": "Ŝanĝas vian profilbildon nur en la nuna ĉambro",
     "Gets or sets the room topic": "Ekhavas aŭ agordas la temon de la ĉambro",
@@ -1205,38 +1132,22 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Kontrolu ĉi tiun uzanton per konfirmo, ke la jenaj bildsignoj aperis sur ĝia ekrano.",
     "Verify this user by confirming the following number appears on their screen.": "Kontrolu ĉu tiun uzanton per konfirmo, ke la jena numero aperis sur ĝia ekrano.",
     "Unable to find a supported verification method.": "Ne povas trovi subtenatan metodon de kontrolo.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Por la plej bona sekureco, ni rekomendas fari ĉi tion persone, aŭ per alia, fidata komunikilo.",
     "Santa": "Kristnaska viro",
     "Thumbs up": "Dikfingro supren",
     "Paperclip": "Paperkuntenilo",
     "Pin": "Pinglo",
-    "Your homeserver does not support device management.": "Via hejmservilo ne subtenas administradon de aparatoj.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Ni sendis al vi retleteron por konfirmi vian adreson. Bonvolu sekvi la tieajn intrukciojn kaj poste klaki al la butono sube.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ĉu vi certas? Vi perdos ĉiujn viajn ĉifritajn mesaĝojn, se viaj ŝlosiloj ne estas savkopiitaj.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Ĉifritaj mesaĝoj estas sekurigitaj per tutvoja ĉifrado. Nur vi kaj la ricevonto(j) havas la ŝlosilojn necesajn por legado.",
-    "This device is backing up your keys. ": "Ĉi tiu aparato savkopias viajn ŝlosilojn. ",
     "Custom user status messages": "Propraj uzantoaj statmesaĝoj",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupigi kaj filtri ĉambrojn per propraj etikedoj (aktualigu por ŝanĝojn apliki)",
     "Restore from Backup": "Rehavi el savkopio",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Tiu ĉi aparato ne <b>ne savkopias viajn ŝlosilojn</b>, sed vi jam havas savkopion, kiun vi povas restarigi, kaj aldonadi al ĝi de nun.",
     "Backing up %(sessionsRemaining)s keys...": "Savkopianta %(sessionsRemaining)s ŝlosilojn…",
     "All keys backed up": "Ĉiuj ŝlosiloj estas savkopiitaj",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Savkopio havas subskribon de <verify>nekonata</verify> aparato kun la identigilo %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "Savkopio havas <validity>validan</validity> subskribon de ĉi tiu aparato",
-    "Backup has an <validity>invalid</validity> signature from this device": "Savkopio havas <validity>nevalidan</validity> subskribon de tiu ĉi aparato",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Savkopio havas <validity>validan</validity> subskribon de <verify>kontrolita</verify> aparato <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Savkopio havas <validity>validan</validity> subskribon de <verify>nekontrolita</verify> aparato <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>kontrolita</verify> aparato <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>nekontrolita</verify> aparato <device></device>",
-    "Backup is not signed by any of your devices": "Savkopio estas subskribita de neniu el viaj aparatoj",
-    "This backup is trusted because it has been restored on this device": "Ĉi tiu savkopio estas fidata ĉar ĝi estis restarigita por ĉi tiu aparato",
     "Backup version: ": "Versio de savkopio: ",
     "Algorithm: ": "Algoritmo: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Viaj ŝlosiloj <b>ne estas savkopiataj de ĉi tiu aparato</b>.",
     "Back up your keys before signing out to avoid losing them.": "Savkopiu viajn ŝlosilojn antaŭ adiaŭo, por ilin ne perdi.",
     "Add an email address to configure email notifications": "Aldonu retpoŝtadreson por agordi retpoŝtajn sciigojn",
-    "Enable desktop notifications for this device": "Ŝalti labortablajn sciigojn por ĉi tiu aparato",
-    "Enable audible notifications for this device": "Ŝalti sonajn sciigojn por ĉi tiu aparato",
     "Unable to verify phone number.": "Ne povas kontroli telefonnumeron.",
     "Verification code": "Kontrola kodo",
     "Deactivating your account is a permanent action - be careful!": "Malaktivigo de via konto estas nemalfarebla – atentu!",
@@ -1287,10 +1198,6 @@
     "This room has already been upgraded.": "Ĉi tiu ĉambro jam gradaltiĝis.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>.",
     "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
-    "All devices for this user are trusted": "Ĉiuj aparatoj de tiu ĉi uzanto estas fidataj",
-    "All devices in this encrypted room are trusted": "Ĉiuj aparatoj en ĉi tiu ĉifrita ĉambro estas fidataj",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Via peto por havigo de ŝlosilo sendiĝis – bonvolu kontroli viajn aliajn aparatojn pro petoj.",
-    "At this time it is not possible to reply with an emote.": "Ankoraŭ ne eblas respondi per mieno.",
     "Joining room …": "Aliĝanta al ĉambro …",
     "Loading …": "Enleganta …",
     "Rejecting invite …": "Rifuzanta inviton …",
@@ -1338,7 +1245,6 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ĉu neniu aperas? Ankoraŭ ne ĉiuj klientoj subtenas interagan kontrolon. <button>Uzi malnovecan kontrolon</button>.",
     "Waiting for %(userId)s to confirm...": "Atendanta konfirmon de %(userId)s…",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Kontrolu ĉi tiun uzanton por marki ĝin fidata. Fidado devas vin trankviligi dum uzado de tutvoja ĉifrado.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Kontrolo de ĉi tiu uzanto markos ĝian aparaton fidata, kaj ankaŭ la vian por ĝi.",
     "Waiting for partner to confirm...": "Atendas konfirmon de kunulo…",
     "Incoming Verification Request": "Venas kontrolpeto",
     "Manually export keys": "Mane elporti ŝlosilojn",
@@ -1398,7 +1304,6 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Vi havas %(count)s nelegitajn sciigojn en antaŭa versio de ĉi tiu ĉambro.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Vi havas %(count)s nelegitan sciigon en antaŭa versio de ĉi tiu ĉambro.",
     "Your profile": "Via profilo",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Ŝanĝo de pasvorto renovigos tutvoje ĉifrajn ŝlosilojn de ĉiuj viaj aparatoj, igante la historion de ĉifrita babilo nelegebla. Agordu savkopiadon de ŝlosiloj, aŭ elportu ŝlosilojn de viaj ĉambroj el alia aparato, antaŭ ol vi ŝanĝos la pasvorton.",
     "Your Matrix account on <underlinedServerName />": "Via Matrix-konto sur <underlinedServerName />",
     "This homeserver does not support login using email address.": "Ĉi tiu hejmservilo ne subtenas saluton per retpoŝtadreso.",
     "Registration has been disabled on this homeserver.": "Registriĝoj malŝaltiĝis sur ĉi tiu hejmservilo.",
@@ -1440,7 +1345,6 @@
     "Show recently visited rooms above the room list": "Montri freŝe vizititajn ĉambrojn super la listo de ĉambroj",
     "Show hidden events in timeline": "Montri kaŝitajn okazojn en historio",
     "Low bandwidth mode": "Reĝimo de malmulta kapacito",
-    "Connect this device to Key Backup": "Konekti ĉi tiun aparaton al Savkopiado de ŝlosiloj",
     "Start using Key Backup": "Ekuzi Savkopiadon de ŝlosiloj",
     "Timeline": "Historio",
     "Autocomplete delay (ms)": "Prokrasto de memaga kompletigo",
@@ -1451,7 +1355,6 @@
     "Notification sound": "Sono de sciigo",
     "Set a new custom sound": "Agordi novan propran sonon",
     "Browse": "Foliumi",
-    "Some devices for this user are not trusted": "Iuj aparatoj de tiu ĉi uzanto ne estas fidataj",
     "Show all": "Montri ĉiujn",
     "Edited at %(date)s. Click to view edits.": "Redaktita je %(date)s. Klaku por vidi redaktojn.",
     "That doesn't look like a valid email address": "Tio ne ŝajnas esti valida retpoŝtadreso",
@@ -1480,8 +1383,6 @@
     "Encryption": "Ĉifrado",
     "Once enabled, encryption cannot be disabled.": "Post ŝalto, ne plu eblas malŝalti ĉifradon.",
     "Encrypted": "Ĉifrata",
-    "Some devices in this encrypted room are not trusted": "Iuj aparatoj en ĉi tiu ĉifrata ĉambro ne estas fidataj",
-    "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.": "Petoj pri kunhavigo de ŝlosiloj sendiĝas al viaj aliaj aparatoj memage. Se vi rifuzis aŭ forlasis la peton en viaj aliaj aparatoj, klaku ĉi tien por repeti la ŝlosilojn por tiu ĉi kunsido.",
     "The conversation continues here.": "La interparolo pluas ĉi tie.",
     "This room has been replaced and is no longer active.": "Ĉi tiu ĉambro estas anstataŭita, kaj ne plu aktivas.",
     "Loading room preview": "Preparas antaŭrigardon al la ĉambro",
@@ -1496,8 +1397,6 @@
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snenion ŝanĝis je %(count)s fojoj",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snenion ŝanĝis",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ne povas enlegi la responditan okazon; aŭ ĝi ne ekzistas, aŭ vi ne rajtas vidi ĝin.",
-    "Clear all data on this device?": "Ĉu vakigi ĉiujn datumojn en tiu ĉi aparato?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Vakigo de ĉiuj datumoj de tiu ĉi aparato estas porĉiama. Ĉifritaj mesaĝoj perdiĝos, malse vi savkopiis iliajn ŝlosilojn.",
     "Clear all data": "Vakigi ĉiujn datumojn",
     "Community IDs cannot be empty.": "Identigilo de komunumo ne estu malplena.",
     "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": "Por eviti perdon de via babila historio, vi devas elporti la ŝlosilojn de viaj ĉambroj antaŭ adiaŭo. Por tio vi bezonos reveni al la pli nova versio de Riot",
@@ -1537,7 +1436,6 @@
     "This looks like a valid recovery key!": "Ŝajnas esti valida rehava ŝlosilo!",
     "Not a valid recovery key": "Ne estas valida rehava ŝlosilo",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava ŝlosilo.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Se vi forgesis vian rehavan pasfrazon, vi povas <button>agordi novajn rehavajn elektojn</button>",
     "Resend %(unsentCount)s reaction(s)": "Resendi %(unsentCount)s reago(j)n",
     "Resend removal": "Resendi forigon",
     "Share Permalink": "Kunhavi daŭran ligilon",
@@ -1570,15 +1468,11 @@
     "New Recovery Method": "Nova rehava metodo",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Novaj rehava pasfrazo kaj ŝlosilo por sekuraj mesaĝoj troviĝis.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se vi ne agordis la novan rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
-    "This device is encrypting history using the new recovery method.": "Ĉi tiu aparato ĉifras historion kun la nova rehava metodo.",
     "Set up Secure Messages": "Agordi sekurajn mesaĝojn",
     "Recovery Method Removed": "Rehava metodo foriĝis",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ĉi tiu aparato trovis, ke viaj rehava pasfrazo kaj ŝlosilo por sekuraj mesaĝoj foriĝis.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Se vi faris tion akcidente, vi povas agordi sekurajn mesaĝojn per ĉi tiu aparato, reĉifrante la mesaĝan historion de la aparato kun nova rehava metodo.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se vi ne forigis la rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
     "Use a longer keyboard pattern with more turns": "Uzu pli longan tekston kun plia varieco",
     "Unable to load key backup status": "Ne povas enlegi staton de ŝlosila savkopio",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Konektu ĉi tiun aparaton al ŝlosila savkopiado antaŭ adiaŭo, por eviti perdon de ŝlosiloj de tiu ĉi aparato.",
     "Reset": "Reagordi",
     "Demote yourself?": "Ĉu malrangaltigi vin mem?",
     "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.": "Vi ne povos malfari tiun ŝanĝon, ĉar vi malrangaltigas vin mem; se vi estas la lasta povohava uzanto en la ĉambro, estos neeble vian povon rehavi.",
@@ -1586,7 +1480,6 @@
     "Power level": "Povonivelo",
     "Use two-way text verification": "Uzi duflankan tekstan kontrolon",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Gradaltigo de ĉi tiu ĉambro bezonas fermi ĝin, kaj krei novan por anstataŭi ĝin. Por plejbonigi sperton de la ĉambranoj, ni:",
-    "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.": "Vi adiaŭis ĉiujn aparatojn kaj ne plu ricevados sciigojn. Por reŝalti ilin, resalutu per ĉiu el la aparatoj.",
     "Invalid homeserver discovery response": "Nevalida eltrova respondo de hejmservilo",
     "Failed to get autodiscovery configuration from server": "Malsukcesis akiri agordojn de memaga eltrovado de la servilo",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "URL por hejmservilo ŝajne ne ligas al valida hejmservilo de Matrix",
@@ -1595,26 +1488,20 @@
     "Sign in with single sign-on": "Salutu per ununura saluto",
     "Failed to re-authenticate due to a homeserver problem": "Malsukcesis reaŭtentigi pro hejmservila problemo",
     "Failed to re-authenticate": "Malsukcesis reaŭtentigi",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Rehavu aliron al via konto kaj ĉifrajn ŝlosilojn memoratajn de tiu ĉi aparato. Sen ili, vi ne povos legi ĉiujn viajn sekurajn mesaĝojn per iu ajn aparato.",
     "Enter your password to sign in and regain access to your account.": "Enigu vian pasvorton por saluti kaj rehavi aliron al via konto.",
     "Sign in and regain access to your account.": "Saluti kaj rehavi aliron al via konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Vi ne povas saluti per via konto. Bonvolu kontakti administranton de via hejmservilo por akiri pliajn informojn.",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Averto: Tiu ĉi aparato ankoraŭ memoras viajn personajn datumojn (inkluzive ĉifrajn ŝlosilojn). Vakigu ilin, se vi ĉesas uzi ĉi tiun aparaton, aŭ volas saluti per alia konto.",
     "Set up with a Recovery Key": "Agordi per rehava ŝlosilo",
     "Go back to set it again.": "Reiru por reagordi ĝin.",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Asekure vi povas uzi ĝin por rehavi vian historion de ĉifritaj mesaĝoj se vi forgesos vian rehavan pasfrazon.",
     "As a safety net, you can use it to restore your encrypted message history.": "Asekure vi povas uzi ĝin por rehavi vian historion de ĉifritaj mesaĝoj.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Via rehava ŝlosilo estas asekuro – vi povos uzi ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj, se vi forgesos vian pasfrazon.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Konservu vian rehavan ŝlosilon en tre sekura loko, kiel en administrilo de pasvortoj (aŭ sekurŝranko)",
     "Your Recovery Key": "Via rehava ŝlosilo",
     "Copy to clipboard": "Kopii al tondujo",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Via rehava ŝlosilo <b>kopiiĝis al via tondujo</b>, algluu ĝin al:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Via rehava ŝlosilo estas en via <b>elŝuta</b> dosierujo.",
     "<b>Print it</b> and store it somewhere safe": "<b>Presu ĝin</b> kaj konservu ĝin en sekura loko",
     "<b>Save it</b> on a USB key or backup drive": "<b>Konservu ĝin</b> en poŝmemorilo aŭ savkopia disko",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiu ĝin</b> al via persona enreta konservejo",
     "Your keys are being backed up (the first backup could take a few minutes).": "Viaj ŝlosiloj estas savkopiataj (la unua savkopio povas daŭri kelkajn minutojn).",
-    "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.": "Sen agordo de sekura rehavo de mesaĝoj, vi ne povos rehavi vian historion de ĉifritaj mesaĝoj se vi adiaŭos aŭ uzos alian aparaton.",
     "Set up Secure Message Recovery": "Agordi sekuran rehavon de mesaĝoj",
     "Secure your backup with a passphrase": "Sekurigi vian savkopion per pasfrazo",
     "Confirm your passphrase": "Konfirmu vian pasfrazon",
@@ -1650,7 +1537,6 @@
     "Public Name": "Publika nomo",
     "Do not use an identity server": "Ne uzi identigan servilon",
     "Enter a new identity server": "Enigi novan identigan servilon",
-    "Failed to start chat": "Malsukcesis komenci babilon",
     "Messages": "Mesaĝoj",
     "Actions": "Agoj",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Uzu identigan servilon por inviti retpoŝte. Klaku al « daŭrigi » por uzi la norman identigan servilon (%(defaultIdentityServerName)s) aŭ administru tion en Agordoj.",
@@ -1683,7 +1569,6 @@
     "Discovery": "Trovado",
     "Deactivate account": "Malaktivigi konton",
     "Always show the window menu bar": "Ĉiam montri la fenestran menubreton",
-    "A device's public name is visible to people you communicate with": "Publika nomo de aparato estas videbla de homoj, kun kiuj vi komunikas",
     "Upgrade the room": "Gradaltigi la ĉambron",
     "Enable room encryption": "Ŝalti ĉifradon de la ĉambro",
     "Error changing power level requirement": "Eraris ŝanĝo de postulo de potenconivelo",
@@ -1721,7 +1606,6 @@
     "Trust": "Fido",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Multiple integration managers": "Pluraj kunigiloj",
-    "Use the new, faster, composer for writing messages": "Uzi la novan, pli rapidan verkilon de mesaĝoj",
     "Show previews/thumbnails for images": "Montri antaŭrigardojn/bildetojn je bildoj",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Vi <b>forigu viajn personajn datumojn</b> de identiga servilo <idserver /> antaŭ ol vi malkonektiĝos. Bedaŭrinde, identiga servilo <idserver /> estas nuntempe eksterreta kaj ne eblas ĝin atingi.",
     "You should:": "Vi:",
@@ -1809,7 +1693,6 @@
     "Hide advanced": "Kaŝi specialajn",
     "Show advanced": "Montri specialajn",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Bloki aliĝojn al ĉi tiu ĉambro de uzantoj el aliaj Matrix-serviloj (Ĉi tiun agordon ne eblas poste ŝanĝi!)",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Por kontroli ke tiu ĉi aparato estas fidinda, bonvolu kontroli, ke la ŝlosilo, kiun vi vidas en viaj Agordoj de uzanto je tiu aparato, akordas kun la ŝlosilo sube:",
     "Please fill why you're reporting.": "Bonvolu skribi, kial vi raportas.",
     "Report Content to Your Homeserver Administrator": "Raporti enhavon al la administrantode via hejmservilo",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Per raporto de ĝi tiu mesaĝo vi sendos ĝian unikan « eventan identigilon » al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
@@ -1839,7 +1722,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s metis vidvokon.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s metis vidvokon. (mankas subteno en ĉi tiu foliumilo)",
     "Try out new ways to ignore people (experimental)": "Elprovi novajn manierojn malatenti homojn (eksperimente)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Sendadi kontrolajn petojn per rektaj mesaĝoj, inkluzive novan kontrolan ilaron en la membra panelo.",
     "Match system theme": "Similiĝi la sisteman haŭton",
     "My Ban List": "Mia listo de forbaroj",
     "This is your list of users/servers you have blocked - don't leave the room!": "Ĉi tio estas la listo de uzantoj/serviloj, kiujn vi forbaris – ne eliru el la ĉambro!",
@@ -1897,15 +1779,10 @@
     "The integration manager is offline or it cannot reach your homeserver.": "La kunigilo estas eksterreta aŭ ne povas atingi vian hejmservilon",
     "Backup has a <validity>valid</validity> signature from this user": "Savkopio havas <validity>validan</validity> subskribon de ĉi tiu uzanto",
     "Backup has a <validity>invalid</validity> signature from this user": "Savkopio havas <validity>nevalidan</validity> subskribon de ĉi tiu uzanto",
-    "This user has not verified all of their devices.": "Ĉi tiu uzanto ne kontrolis ĉiujn siajn aparatojn.",
-    "You have not verified this user. This user has verified all of their devices.": "Vi ne kontrolis ĉi tiun uzanton. Ĉi tiu uzanto kontrolis ĉiujn siajn aparatojn.",
-    "You have verified this user. This user has verified all of their devices.": "Vi kontrolis ĉi tiun uzanton. Ĉi tiu uzanto kontrolis ĉiujn siajn aparatojn.",
-    "Someone is using an unknown device": "Iu uzas nekonatan aparaton",
     "This room is end-to-end encrypted": "Ĉi tiu ĉambro uzas tutvojan ĉifradon",
     "Everyone in this room is verified": "Ĉiu en la ĉambro estas kontrolita",
     "This message cannot be decrypted": "Ĉi tiun mesaĝon ne eblas malĉifri",
     "Unencrypted": "Neĉifrita",
-    "Encrypted by a deleted device": "Ĉifrita de forigita aparato",
     "Send a reply…": "Sendi respondon…",
     "Send a message…": "Sendi mesaĝon…",
     "Direct Messages": "Rektaj mesaĝoj",
@@ -1917,7 +1794,6 @@
     "Failed to connect to integration manager": "Malsukcesis konekton al kunigilo",
     "Verify User": "Kontroli uzanton",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Por plia sekureco, kontrolu ĉi tiun uzanton per unufoja kodo aperonta sur ambaŭ el viaj aparatoj.",
-    "For maximum security, do this in person.": "Por plejgranda sekureco, faru tion persone.",
     "Start Verification": "Komenci kontrolon",
     "Trusted": "Fidata",
     "Not trusted": "Nefidata",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 958203a020..85e24b7ba9 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -33,7 +33,6 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el tema a \"%(topic)s\".",
     "Changes your display nickname": "Cambia tu apodo público",
-    "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.": "El cambio de contraseña restablecerá actualmente todas las claves de cifrado de extremo a extremo de todos los dispositivos, haciendo que el historial de chat cifrado sea ilegible, a menos que primero exporte las claves de la habitación y vuelva a importarlas después. En el futuro esto será mejorado.",
     "Claimed Ed25519 fingerprint key": "Clave de huella digital Ed25519 reclamada",
     "Click here to fix": "Haz clic aquí para arreglar",
     "Click to mute audio": "Haz clic para silenciar el audio",
@@ -57,7 +56,6 @@
     "Deops user with given id": "Degrada al usuario con la ID dada",
     "Default": "Por Defecto",
     "Device ID": "ID de Dispositivo",
-    "Devices": "Dispositivos",
     "Direct chats": "Conversaciones directas",
     "Disinvite": "Deshacer invitación",
     "Displays action": "Muestra la acción",
@@ -100,21 +98,17 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
     "Hangup": "Colgar",
-    "Hide Text Formatting Toolbar": "Ocultar barra de herramientas de formato de texto",
     "Historical": "Histórico",
     "Homeserver is": "El Servidor Doméstico es",
     "Identity Server is": "El Servidor de Identidad es",
     "I have verified my email address": "He verificado mi dirección de correo electrónico",
     "Import E2E room keys": "Importar claves de salas con Cifrado de Extremo a Extremo",
     "Incorrect verification code": "Verificación de código incorrecta",
-    "Invalid alias format": "Formato de alias inválido",
     "Invalid Email Address": "Dirección de Correo Electrónico Inválida",
     "Invalid file%(extra)s": "Archivo inválido %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s invitó a %(targetName)s.",
-    "Invite new room members": "Invitar nuevos miembros a la sala",
     "Invites": "Invitaciones",
     "Invites user with given id to current room": "Invita al usuario con la ID dada a la sala actual",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no es un formato de alias válido",
     "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirse a la Sala",
     "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.",
@@ -142,12 +136,9 @@
     "Custom": "Personalizado",
     "Custom level": "Nivel personalizado",
     "Decline": "Rechazar",
-    "Device already verified!": "¡El dispositivo ya ha sido verificado!",
-    "Device ID:": "ID de Dispositivo:",
     "device id: ": "ID de dispositivo: ",
     "Disable Notifications": "Deshabilitar Notificaciones",
     "Enable Notifications": "Habilitar Notificaciones",
-    "Encrypted by an unverified device": "Cifrado por un dispositivo sin verificar",
     "Enter passphrase": "Ingresar frase de contraseña",
     "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor doméstico indicado.",
     "Export": "Exportar",
@@ -187,13 +178,9 @@
     "Unknown error": "Error desconocido",
     "Incorrect password": "Contraseña incorrecta",
     "To continue, please enter your password.": "Para continuar, ingresa tu contraseña por favor.",
-    "Device name": "Nombre de dispositivo",
-    "Device key": "Clave de dispositivo",
-    "Verify device": "Verificar dispositivo",
     "I verify that the keys match": "Verifico que las claves coinciden",
     "Unable to restore session": "No se puede recuperar la sesión",
     "Room Colour": "Color de la sala",
-    "Room contains unknown devices": "La sala contiene dispositivos desconocidos",
     "%(roomName)s does not exist.": "%(roomName)s no existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s no es accesible en este momento.",
     "Rooms": "Salas",
@@ -203,8 +190,6 @@
     "Search failed": "Falló la búsqueda",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s",
     "Send anyway": "Enviar de todos modos",
-    "Sender device information": "Información del dispositivo emisor",
-    "Send Invites": "Enviar Invitaciones",
     "Send Reset Email": "Enviar Correo Electrónico de Restauración",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
@@ -216,7 +201,6 @@
     "%(senderName)s set a profile picture.": "%(senderName)s estableció una imagen de perfil.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableció %(displayName)s como su nombre público.",
     "Settings": "Ajustes",
-    "Show Text Formatting Toolbar": "Mostrar la barra de formato de texto",
     "Signed Out": "Desconectado",
     "Sign in": "Conectar",
     "Sign out": "Cerrar sesión",
@@ -224,7 +208,6 @@
     "Someone": "Alguien",
     "Start a chat": "Iniciar una conversación",
     "Start authentication": "Iniciar autenticación",
-    "Start Chat": "Iniciar Conversación",
     "Submit": "Enviar",
     "Success": "Éxito",
     "The phone number entered looks invalid": "El número telefónico indicado parece erróneo",
@@ -235,21 +218,14 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "¿Está seguro de que desea abandonar la sala '%(roomName)s'?",
     "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.": "No se puede conectar al servidor doméstico - compruebe su conexión, asegúrese de que el <a>certificado SSL del servidor</a> es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminó el nombre de la sala.",
-    "Device key:": "Clave de dispositivo:",
     "Drop File Here": "Deje el fichero aquí",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Unirse con <voiceText>voz</voiceText> o <videoText>vídeo</videoText>.",
     "Manage Integrations": "Gestionar integraciones",
-    "Markdown is disabled": "Markdown está deshabilitado",
-    "Markdown is enabled": "Markdown está activado",
-    "matrix-react-sdk version:": "Versión de matrix-react-sdk:",
-    "Message not sent due to unknown devices being present": "Mensaje no enviado debido a la presencia de dispositivos desconocidos",
     "Missing room_id in request": "Falta el room_id en la solicitud",
     "Missing user_id in request": "Falta el user_id en la solicitud",
     "Moderator": "Moderador",
     "Mute": "Silenciar",
     "Name": "Nombre",
-    "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensajes cifrados a dispositivos sin verificar desde este dispositivo",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensajes cifrados a dispositivos sin verificar en esta sala desde este dispositivo",
     "New address (e.g. #foo:%(localDomain)s)": "Dirección nueva (ej. #foo:%(localDomain)s)",
     "New passwords don't match": "Las contraseñas nuevas no coinciden",
     "New passwords must match each other.": "Las contraseñas nuevas deben coincidir.",
@@ -259,7 +235,6 @@
     "(not supported by this browser)": "(no soportado por este navegador)",
     "<not supported>": "<no soportado>",
     "NOT verified": "SIN verificar",
-    "No devices with registered encryption keys": "No hay dispositivos con claves de cifrado registradas",
     "No display name": "Sin nombre público",
     "No more results": "No hay más resultados",
     "No results": "No hay resultados",
@@ -270,7 +245,6 @@
     "Operation failed": "Falló la operación",
     "Password": "Contraseña",
     "Passwords can't be empty": "Las contraseñas no pueden estar en blanco",
-    "People": "Personas",
     "Permissions": "Permisos",
     "Phone": "Teléfono",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, consulta tu correo electrónico y haz clic en el enlace que contiene. Una vez hecho esto, haz clic en continuar.",
@@ -297,7 +271,6 @@
     "Room %(roomId)s not visible": "La sala %(roomId)s no está visible",
     "Searches DuckDuckGo for results": "Busca resultados en DuckDuckGo",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clave de firma que usted ha proporcionado coincide con la recibida del dispositivo %(deviceId)s de %(userId)s. Dispositivo verificado.",
     "This email address is already in use": "Esta dirección de correo electrónico ya está en uso",
     "This email address was not found": "No se encontró esta dirección de correo electrónico",
     "The email address linked to your account must be entered.": "Debes ingresar la dirección de correo electrónico vinculada a tu cuenta.",
@@ -330,7 +303,6 @@
     "To get started, please pick a username!": "Para empezar, ¡por favor elija un nombre de usuario!",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no tiene permiso para ver el mensaje solicitado.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Se ha intentado cargar cierto punto en la cronología de esta sala, pero no se ha podido encontrarlo.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activó el cifrado de extremo a extremo (algoritmo %(algorithm)s).",
     "Unable to add email address": "No es posible añadir la dirección de correo electrónico",
     "Unable to create widget.": "No es posible crear el componente.",
     "Unable to remove contact information": "No se ha podido eliminar la información de contacto",
@@ -338,13 +310,9 @@
     "Unban": "Quitar Veto",
     "Unable to capture screen": "No es posible capturar la pantalla",
     "Unable to enable Notifications": "No es posible habilitar las Notificaciones",
-    "Unable to load device list": "No se ha podido cargar la lista de dispositivos",
-    "Undecryptable": "No se puede descifrar",
-    "Unencrypted message": "Mensaje sin cifrar",
     "unknown caller": "Persona que llama desconocida",
     "unknown device": "dispositivo desconocido",
     "Unknown room %(roomId)s": "Sala desconocida %(roomId)s",
-    "Unknown (user, device) pair:": "Pareja desconocida (usuario, dispositivo):",
     "Unnamed Room": "Sala sin nombre",
     "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
@@ -371,10 +339,8 @@
     "(no answer)": "(sin respuesta)",
     "(unknown failure: %(reason)s)": "(error desconocido: %(reason)s)",
     "Warning!": "¡Advertencia!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ADVERTENCIA: Dispositivo ya verificado, ¡pero las claves NO COINCIDEN!",
     "Who can access this room?": "¿Quién puede acceder a esta sala?",
     "Who can read history?": "¿Quién puede leer el historial?",
-    "Who would you like to communicate with?": "¿Con quién te gustaría comunicarte?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s retiró la invitación de %(targetName)s.",
     "You are already in a call.": "Ya estás participando en una llamada.",
     "You are not in this room.": "No estás en esta sala.",
@@ -389,10 +355,8 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s le quitó el veto a %(targetName)s.",
     "unencrypted": "sin cifrar",
     "Unmute": "Dejar de silenciar",
-    "Unrecognised command:": "Comando no identificado:",
     "Unrecognised room alias:": "Alias de sala no reconocido:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivel de permisos %(powerLevelNumber)s)",
-    "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!": "ADVERTENCIA: VERIFICACIÓN DE CLAVE FALLO\" La clave de firma para %(userId)s y el dispositivo %(deviceId)s es \"%(fprint)s\" la cual no concuerda con la clave provista por \"%(fingerprint)s\". Esto puede significar que sus comunicaciones están siendo interceptadas!",
     "You cannot place VoIP calls in this browser.": "No puedes realizar llamadas VoIP en este navegador.",
     "You do not have permission to post to this room": "No tienes permiso para publicar en esta sala",
     "You have <a>disabled</a> URL previews by default.": "Ha <a>deshabilitado</a> la vista previa de URL por defecto.",
@@ -402,7 +366,6 @@
     "You need to be able to invite users to do that.": "Debes ser capaz de invitar usuarios para realizar esa acción.",
     "You need to be logged in.": "Necesitas haber iniciado sesión.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tu dirección de correo electrónico no parece estar asociada a una ID de Matrix en este Servidor Doméstico.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Su contraseña a sido cambiada exitosamente. No recibirá notificaciones en otros dispositivos hasta que ingrese de nuevo en ellos",
     "You seem to be in a call, are you sure you want to quit?": "Parece estar en medio de una llamada, ¿esta seguro que desea salir?",
     "You seem to be uploading files, are you sure you want to quit?": "Pareces estar subiendo archivos, ¿seguro que quieres salir?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podrás deshacer este cambio porque estás promoviendo al usuario para tener el mismo nivel de autoridad que tú.",
@@ -501,7 +464,6 @@
     "Noisy": "Ruidoso",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar el alias de la sala %(alias)s y eliminar %(name)s del directorio?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto te permitirá regresar a tu cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos.",
     "Keywords": "Palabras clave",
     "Enable notifications for this account": "Habilitar notificaciones para esta cuenta",
     "Invite to this community": "Invitar a esta comunidad",
@@ -589,7 +551,6 @@
     "Every page you use in the app": "Cada página que utilizas en la aplicación",
     "Your User Agent": "Tu Agente de Usuario",
     "Your device resolution": "La resolución de tu dispositivo",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay dispositivos desconocidos en esta sala: si continúas sin verificarlos, será posible que alguien escuche tu llamada.",
     "Which officially provided instance you are using, if any": "Qué instancia proporcionada oficialmente estás utilizando, si estás utilizando alguna",
     "e.g. %(exampleValue)s": "ej. %(exampleValue)s",
     "e.g. <CurrentPageURL>": "ej. <CurrentPageURL>",
@@ -620,7 +581,6 @@
     "Unignored user": "Usuario no ignorado",
     "You are no longer ignoring %(userId)s": "Ya no está ignorando a %(userId)s",
     "Opens the Developer Tools dialog": "Abre el diálogo de Herramientas de Desarrollador",
-    "Verifies a user, device, and pubkey tuple": "Verifica a un usuario, dispositivo, y tupla de clave pública",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambió su nombre público a %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes con chincheta en la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "el widget %(widgetName)s fue modificado por %(senderName)s",
@@ -637,8 +597,6 @@
     "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (sólo le afecta a ud.)",
     "Enable URL previews by default for participants in this room": "Activar vista previa de URL por defecto para los participantes en esta sala",
     "Enable widget screenshots on supported widgets": "Activar capturas de pantalla de widget en los widgets soportados",
-    "Delete %(count)s devices|other": "Eliminar %(count)s dispositivos",
-    "Delete %(count)s devices|one": "Eliminar dispositivo",
     "Drop file here to upload": "Soltar aquí el fichero a subir",
     " (unsupported)": " (no soportado)",
     "Ongoing conference call%(supportedText)s.": "Llamada de conferencia en curso%(supportedText)s.",
@@ -646,11 +604,7 @@
     "%(senderName)s sent an image": "%(senderName)s envió una imagen",
     "%(senderName)s sent a video": "%(senderName)s envió un vídeo",
     "%(senderName)s uploaded a file": "%(senderName)s subió un fichero",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Se envió su solicitud para compartir la clave - por favor, compruebe sus otros dispositivos para solicitudes de compartir clave.",
-    "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.": "Las solicitudes para compartir la clave se envían a sus otros dispositivos automáticamente. Si rechazó o descartó la solicitud en sus otros dispositivos, pulse aquí para solicitar otra vez las claves durante esta sesión.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si sus otros dispositivos no tienen la clave para este mensaje no podrá descifrarlos.",
     "Key request sent.": "Solicitud de clave enviada.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Volver a solicitar las claves de cifrado</requestLink> de tus otros dispositivos.",
     "Disinvite this user?": "¿Dejar de invitar a este usuario?",
     "Kick this user?": "¿Echar a este usuario?",
     "Unban this user?": "¿Quitarle el veto a este usuario?",
@@ -666,20 +620,10 @@
     "Share Link to User": "Compartir Enlace al Usuario",
     "User Options": "Opciones de Usuario",
     "Make Moderator": "Convertir a Moderador",
-    "bold": "negrita",
-    "italic": "cursiva",
-    "deleted": "eliminado",
-    "underlined": "subrayado",
-    "inline-code": "código en línea",
-    "block-quote": "cita extensa",
-    "bulleted-list": "lista con viñetas",
-    "numbered-list": "lista numerada",
     "Send an encrypted reply…": "Enviar una respuesta cifrada…",
     "Send a reply (unencrypted)…": "Enviar una respuesta (sin cifrar)…",
     "Send an encrypted message…": "Enviar un mensaje cifrado…",
     "Send a message (unencrypted)…": "Enviar un mensaje (sin cifrar)…",
-    "Unable to reply": "No se pudo responder",
-    "At this time it is not possible to reply with an emote.": "En este momento no es posible responder con un emoticono.",
     "Jump to message": "Ir a mensaje",
     "No pinned messages.": "No hay mensajes con chincheta.",
     "Loading...": "Cargando...",
@@ -856,11 +800,6 @@
     "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.": "La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Que olvidemos tus mensajes implica que los mensajes que hayas enviado no se compartirán con ningún usuario nuevo o no registrado, pero aquellos usuarios registrados que ya tengan acceso a estos mensajes seguirán teniendo acceso a su copia.",
     "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)": "Por favor, olvida todos los mensajes enviados al desactivar mi cuenta. (<b>Advertencia:</b> esto provocará que los usuarios futuros vean conversaciones incompletas)",
     "To continue, please enter your password:": "Para continuar, ingresa tu contraseña por favor:",
-    "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:": "Para verificar que este dispositivo es confiable, por favor contacta a su dueño por algún otro medio (ej. cara a cara o por teléfono) y pregúntale si la clave que ve en sus Ajustes de Usuario para este dispositivo coincide con la clave a continuación:",
-    "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.": "Si coincide, oprime el botón de verificar a continuación. Si no coincide, entonces alguien más está interceptando este dispositivo y probablemente prefieras oprimir el botón de prohibir.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Añadiste un nuevo dispositivo '%(displayName)s', que está solicitando claves de cifrado.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tu dispositivo sin verificar '%(displayName)s' está solicitando claves de cifrado.",
-    "Loading device info...": "Cargando información del dispositivo...",
     "Encryption key request": "Solicitud de clave de cifrado",
     "Clear Storage and Sign Out": "Borrar Almacenamiento y Cerrar Sesión",
     "Send Logs": "Enviar Registros",
@@ -880,10 +819,6 @@
     "Share Room Message": "Compartir el mensaje de la sala",
     "Link to selected message": "Enlazar a mensaje seleccionado",
     "COPY": "COPIAR",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Está actualmente prohibiendo dispositivos sin verificar; para enviar mensajes a los mismos deber verificarlos.",
-    "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.": "Le recomendamos que efectúe el proceso de verificación con cada dispositivo para confirmar que pertenecen a su propietario legítimo, pero si lo prefiere puede reenviar el mensaje sin verificar.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contiene dispositivos que no ha visto antes.",
-    "Unknown devices": "Dispositivos desconocidos",
     "Unable to reject invite": "No se pudo rechazar la invitación",
     "Share Message": "Compartir mensaje",
     "Collapse Reply Thread": "Colapsar Hilo de Respuestas",
@@ -940,7 +875,6 @@
     "Error whilst fetching joined communities": "Error al recuperar las comunidades a las que estás unido",
     "Create a new community": "Crear una comunidad nueva",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear una comunidad para agrupar usuarios y salas. Construye una página de inicio personalizada para destacarla.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostrar dispositivos</showDevicesText>, <sendAnywayText>enviar de todos modos</sendAnywayText> o <cancelText>cancelar</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "No puede enviar ningún mensaje hasta que revise y esté de acuerdo con <consentLink>nuestros términos y condiciones</consentLink>.",
     "%(count)s of your messages have not been sent.|one": "No se envió su mensaje.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> o <cancelText>cancelar todo</cancelText> ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.",
@@ -1022,7 +956,6 @@
     "Gets or sets the room topic": "Obtiene o establece el tema de la sala",
     "This room has no topic.": "Esta sala no tiene tema.",
     "Sets the room name": "Establece el nombre de la sala",
-    "Upload profile picture": "Subir imagen de perfil",
     "Phone numbers": "Números de teléfono",
     "Email addresses": "Correos electrónicos",
     "Language and region": "Idioma y región",
@@ -1096,7 +1029,6 @@
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Los mensajes seguros con este usuario están cifrados punto a punto y no es posible que los lean otros.",
     "Verify this user by confirming the following number appears on their screen.": "Verifica a este usuario confirmando que este número aparece en su pantalla.",
     "Unable to find a supported verification method.": "No es posible encontrar un método de verificación soportado.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Para mayor seguridad, recomendamos que hagas esto en persona o uses otro medio de comunicación fiables.",
     "Dog": "Perro",
     "Cat": "Gato",
     "Lion": "León",
@@ -1142,7 +1074,6 @@
     "Book": "Libro",
     "Pencil": "Lápiz",
     "Paperclip": "Clip",
-    "Padlock": "Candado",
     "Key": "Llave",
     "Hammer": "Martillo",
     "Telephone": "Teléfono",
@@ -1160,7 +1091,6 @@
     "Headphones": "Auriculares",
     "Folder": "Carpeta",
     "Pin": "Pin",
-    "Your homeserver does not support device management.": "Tu servidor doméstico no soporta gestión de dispositivos.",
     "Yes": "Sí",
     "No": "No",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Te hemos enviado un mensaje para verificar tu dirección de correo. Por favor, sigue las instrucciones y después haz clic el botón de abajo.",
@@ -1170,18 +1100,11 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Los mensajes cifrados son seguros con el cifrado punto a punto. Solo tú y el/los destinatario/s tiene/n las claves para leer estos mensajes.",
     "Unable to load key backup status": "No se pudo cargar el estado de la copia de la clave",
     "Restore from Backup": "Restaurar desde copia",
-    "This device is backing up your keys. ": "Este dispositivo está haciendo copia de tus claves. ",
     "Back up your keys before signing out to avoid losing them.": "Haz copia de tus claves antes de salir para evitar perderlas.",
     "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves...",
     "All keys backed up": "Se han copiado todas las claves",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "La copia tiene una firma de un dispositivo <verify>desconocido</verify> con ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "La copia tiene una firma <validity>válida</validity> desde este dispositivo",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "La copia tiene una firma <validity>válida</validity> desde el <device>dispositivo</device> <verify>verificado</verify>",
-    "Backup is not signed by any of your devices": "La copia no está firmada por ninguno de tus dispositivos",
-    "This backup is trusted because it has been restored on this device": "Se confía en la copia porque se ha restaurado en este dispositivo",
     "Backup version: ": "Versión de la copia: ",
     "Algorithm: ": "Algoritmo: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Tus claves <b>no se está copiando desde este dispositivo</b>.",
     "Start using Key Backup": "Comenzar a usar la copia de claves",
     "Add an email address to configure email notifications": "Añade una dirección para configurar las notificaciones por correo",
     "Unable to verify phone number.": "No se pudo verificar el número de teléfono.",
@@ -1219,10 +1142,6 @@
     "Key backup": "Copia de clave",
     "Missing media permissions, click the button below to request.": "No hay permisos de medios, haz clic abajo para pedirlos.",
     "Request media permissions": "Pedir permisos de los medios",
-    "Some devices for this user are not trusted": "Algunos dispositivos de este usuario no son confiables",
-    "Some devices in this encrypted room are not trusted": "Algunos dispositivos de esta sala cifrada no son confiables",
-    "All devices for this user are trusted": "Todos los dispositivos de este usuario son confiables",
-    "All devices in this encrypted room are trusted": "Todos los dispositivos para esta sala cifrada con confiables",
     "Never lose encrypted messages": "Nunca perder mensajes cifrados",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Los mensajes en esta sala están cifrados de extremo a extremo. Solo tu y el/los destinatario/s tiene/n las claves para leer estos mensajes.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Haz copia de manera segura de tus claves para evitar perderlas. <a>Lee más.</a>",
@@ -1231,8 +1150,6 @@
     "Add some now": "Añadir algunos ahora",
     "Main address": "Dirección principal",
     "Room avatar": "Avatar de la sala",
-    "Upload room avatar": "Subir avatar de la sala",
-    "No room avatar": "Sin avatar de la sala",
     "Room Name": "Nombre de sala",
     "Failed to load group members": "No se pudieron cargar los miembros del grupo",
     "Join": "Unirse",
@@ -1255,7 +1172,6 @@
     "Waiting for %(userId)s to confirm...": "Esperando a que confirme %(userId)s...",
     "Use two-way text verification": "Usar verificación de texto en dos sentidos",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica ese usuario para marcar como confiable. Confiar en usuarios aporta mucha tranquilidad en los mensajes cifrados de extremo a extremo.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verificar a este usuario lo marcará como confiable, y también marca tu dispositivo como fiable para él.",
     "Waiting for partner to confirm...": "Esperando que confirme el compañero...",
     "Incoming Verification Request": "Petición de verificación entrante",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
@@ -1263,7 +1179,6 @@
     "Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo más largo y con más vueltas",
     "Enable Community Filter Panel": "Habilitar el Panel de Filtro de Comunidad",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "La copia tiene una firma <validity>válida</validity> de un <device>dispositivo</device> <verify>no verificado</verify>",
     "Your Riot is misconfigured": "Riot tiene un error de configuración",
     "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
@@ -1273,13 +1188,8 @@
     "The file '%(fileName)s' failed to upload.": "Falló en subir el archivo '%(fileName)s'.",
     "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.",
     "Name or Matrix ID": "Nombre o identificador (ID) Matrix ",
-    "Email, name or Matrix ID": "Correo, nombre o identificador (ID) Matrix.",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pone ¯\\_(ツ)_/¯ al principio de un mensaje de texto.",
-    "Upgrading a room can be destructive and isn't always necessary.": "Actualizar una sala podría dañarla y no siempre es necesario.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Se recomienda actualizar una sala cuando su versión es considerada <i>inestable</i>. Las versiones de sala inestables pueden tener bugs, menos funcionalidades o problemas de seguridad.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Las actualizaciones de sala normalmente sólo afectan a la sala en el lado del servidor. Si tienes problema con tu cliente, por favor comunica el problema en <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizar una sala <i>no migrará automáticamente a sus miembros a la nueva versión de la sala.</i> Incluiremos un enlace a la nueva sala en la versión antigüa de la misma - los miembros tendrán que seguir ese enlace para unirse a la nueva sala.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Por favor confirma que quieres continuar con la actualización de la sala de <oldVersion /> a <newVersion />.",
     "Changes your display nickname in the current room only": "Cambia tu apodo sólo en la sala actual",
     "Changes your avatar in this current room only": "Cambia tu avatar sólo en la sala actual",
     "Changes your avatar in all rooms": "Cambia tu avatar en todas las salas",
@@ -1315,7 +1225,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Por favor pídele al administrador de tu servidor doméstico (<code>%(homeserverDomain)s</code>) que configure un servidor TURN para que las llamadas funcionen correctamente.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativamente, puedes tratar de usar el servidor público en <code>turn.matrix.org</code>, pero éste no será igual de confiable, y compartirá tu dirección IP con ese servidor. También puedes administrar esto en Ajustes.",
     "Try using turn.matrix.org": "Trata de usar turn.matrix.org",
-    "Failed to start chat": "Error al iniciar el chat",
     "Messages": "Mensajes",
     "Actions": "Acciones",
     "Other": "Otros",
@@ -1330,7 +1239,6 @@
     "You cannot modify widgets in this room.": "No puedes modificar widgets en esta sala.",
     "Displays list of commands with usages and descriptions": "Muestra lista de comandos con usos y descripciones",
     "Multiple integration managers": "Administradores de integración múltiples",
-    "Room upgrade confirmation": "Confirmación de actualización de sala",
     "Add Email Address": "Añadir dirección de correo",
     "Add Phone Number": "Añadir número de teléfono",
     "Identity server has no terms of service": "El servidor de identidad no tiene términos de servicio",
@@ -1346,10 +1254,7 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hizo una llamada de vídeo (no soportada por este navegador)",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Pruebe nuevas formas de ignorar a usuarios (experimental)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Envíe solicitudes de verificación por mensaje directo, con una nueva interfaz de verificación en el panel de miembros.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Active la firma cruzada para verificar usuarios en vez de dispositivos (en desarrollo)",
     "Enable local event indexing and E2EE search (requires restart)": "Active el indexado de eventos locales y la búsqueda E2EE (necesita reiniciar)",
-    "Use the new, faster, composer for writing messages": "Escriba mensajes con el nuevo y mejorado compositor",
     "Match system theme": "Usar el tema del sistema",
     "Show previews/thumbnails for images": "Mostrar vistas previas para las imágenes",
     "When rooms are upgraded": "Cuando se mejoran las salas",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1ab4bd15b1..a7c1be2fdf 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -28,7 +28,6 @@
     "Sign out": "Amaitu saioa",
     "Home": "Hasiera",
     "Favourites": "Gogokoak",
-    "People": "Jendea",
     "Rooms": "Gelak",
     "Invites": "Gonbidapenak",
     "Low priority": "Lehentasun baxua",
@@ -61,7 +60,6 @@
     "Phone": "Telefonoa",
     "Advanced": "Aurreratua",
     "Cryptography": "Kriptografia",
-    "Devices": "Gailuak",
     "Always show message timestamps": "Erakutsi beti mezuen denbora-zigilua",
     "Name": "Izena",
     "Last seen": "Azkenekoz ikusia",
@@ -80,7 +78,6 @@
     "Banned users": "Debekatutako erabiltzaileak",
     "Labs": "Laborategia",
     "This room has no local addresses": "Gela honek ez du tokiko helbiderik",
-    "Invalid alias format": "Ezizenaren formatu baliogabea",
     "End-to-end encryption information": "Muturretik muturrerako zifratzearen informazioa",
     "Event information": "Gertaeraren informazioa",
     "Curve25519 identity key": "Curve25519 identitate gakoa",
@@ -88,10 +85,7 @@
     "Algorithm": "Algoritmoa",
     "Session ID": "Saioaren IDa",
     "Decryption error": "Deszifratze errorea",
-    "Sender device information": "Igorlearen gailuaren informazioa",
-    "Device name": "Gailuaren izena",
     "Device ID": "Gailuaren IDa",
-    "Device key": "Gailuaren gakoa",
     "Verification": "Egiaztaketa",
     "Ed25519 fingerprint": "Ed25519 hatz-marka",
     "Export E2E room keys": "Esportatu E2E geletako gakoak",
@@ -102,19 +96,15 @@
     "Import E2E room keys": "Inportatu E2E geletako gakoak",
     "Import room keys": "Inportatu gelako gakoak",
     "Import": "Inportatu",
-    "Never send encrypted messages to unverified devices from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gailu honetatik",
     "Blacklisted": "Blokeatuta",
     "unknown device": "gailu ezezaguna",
     "Unverify": "Kendu egiaztaketa",
     "Blacklist": "Blokeatu",
     "Unblacklist": "Desblokeatu",
-    "Verify device": "Egiaztatu gailua",
     "I verify that the keys match": "Gakoak bat datozela egiaztatu dut",
-    "Room contains unknown devices": "Gelan gailu ezezagunak daude",
     "Someone": "Norbait",
     "Start a chat": "Hasi txat bat",
     "Start authentication": "Hasi autentifikazioa",
-    "Start Chat": "Hasi txata",
     "Success": "Arrakasta",
     "For security, this session has been signed out. Please sign in again.": "Segurtasunagatik saio hau amaitu da. Hasi saioa berriro.",
     "Guests cannot join this room even if explicitly invited.": "Bisitariak ezin dira gela honetara elkartu ez bazaie zuzenean gonbidatu.",
@@ -167,10 +157,7 @@
     "Decline": "Ukatu",
     "Decrypt %(text)s": "Deszifratu %(text)s",
     "Default": "Lehenetsia",
-    "Device already verified!": "Gailua egiaztatuta dago!",
-    "Device ID:": "Gailuaren IDa:",
     "device id: ": "gailuaren id-a: ",
-    "Device key:": "Gailuaren gakoa:",
     "Direct chats": "Txat zuzenak",
     "Disable Notifications": "Desgaitu jakinarazpenak",
     "Displays action": "Ekintza bistaratzen du",
@@ -183,7 +170,6 @@
     "Download %(text)s": "Deskargatu %(text)s",
     "Emoji": "Emoji",
     "Enable Notifications": "Gaitu jakinarazpenak",
-    "Encrypted by an unverified device": "Egiaztatu gabeko gailu batek zifratuta",
     "%(senderName)s ended the call.": "%(senderName)s erabiltzaileak deia amaitu du.",
     "Error decrypting attachment": "Errorea eranskina deszifratzean",
     "Error: Problem communicating with the given homeserver.": "Errorea: Arazoa emandako hasiera zerbitzariarekin komunikatzeko.",
@@ -208,7 +194,6 @@
     "Fill screen": "Bete pantaila",
     "Forget room": "Ahaztu gela",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s mailatik %(toPowerLevel)s mailara",
-    "Hide Text Formatting Toolbar": "Ezkutatu testu-formatuaren tresna-barra",
     "Incoming call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incoming video call from %(name)s": "%(name)s erabiltzailearen bideo deia jasotzen",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
@@ -223,10 +208,8 @@
     "Invalid Email Address": "E-mail helbide baliogabea",
     "Invalid file%(extra)s": "Fitxategi %(extra)s baliogabea",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s gonbidatu du.",
-    "Invite new room members": "Gonbidatu kide berriak gelara",
     "Invited": "Gonbidatuta",
     "Invites user with given id to current room": "Emandako ID-a duen erabiltzailea gonbidatzen du gelara",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ez da baliozko formatua ezizen batentzat",
     "Sign in with": "Hasi saioa hau erabilita:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
     "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
@@ -242,13 +225,8 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
     "Manage Integrations": "Kudeatu integrazioak",
-    "Markdown is disabled": "Markdown desgaituta dago",
-    "Markdown is enabled": "Markdown gaituta dago",
-    "matrix-react-sdk version:": "matrix-react-sdk bertsioa:",
-    "Message not sent due to unknown devices being present": "Ez da mezua bidali gailu ezezagunak daudelako",
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
-    "Never send encrypted messages to unverified devices in this room from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan gailu honetatik",
     "New address (e.g. #foo:%(localDomain)s)": "Helbide berria (adib. #foo:%(localDomain)s)",
     "New passwords don't match": "Pasahitz berriak ez datoz bat",
     "New passwords must match each other.": "Pasahitz berriak berdinak izan behar dira.",
@@ -256,13 +234,11 @@
     "(not supported by this browser)": "(nabigatzaile honek ez du euskarririk)",
     "<not supported>": "<euskarririk gabe>",
     "NOT verified": "EZ egiaztatuta",
-    "No devices with registered encryption keys": "Erregistratutako zifratze gakoak dituen gailurik ez",
     "No display name": "Pantaila izenik ez",
     "No more results": "Emaitza gehiagorik ez",
     "No users have specific privileges in this room": "Ez dago gela honetan baimen zehatzik duen erabiltzailerik",
     "olm version:": "olm bertsioa:",
     "Server may be unavailable, overloaded, or you hit a bug.": "Agian zerbitzaria ez dago eskuragarri, edo gainezka dago, edo akats bat aurkitu duzu.",
-    "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.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",
     "Passwords can't be empty": "Pasahitzak ezin dira hutsik egon",
     "Permissions": "Baimenak",
     "Power level must be positive integer.": "Botere maila osoko zenbaki positibo bat izan behar da.",
@@ -279,7 +255,6 @@
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Une honetan egiaztatu gabeko gailuak blokeatzen ari zara, gailu hauetara mezuak bidali ahal izateko egiaztatu behar dituzu.",
     "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotek ez du zuri jakinarazpenak bidaltzeko baimenik,  egiaztatu nabigatzailearen ezarpenak",
     "Riot was not given permission to send notifications - please try again": "Ez zaio jakinarazpenak bidaltzeko baimena eman Rioti, saiatu berriro",
@@ -293,7 +268,6 @@
     "Searches DuckDuckGo for results": "DuckDuckGo-n bilatzen ditu emaitzak",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s erabiltzaileak ikusia %(dateTime)s(e)an",
     "Send anyway": "Bidali hala ere",
-    "Send Invites": "Bidali gonbidapenak",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
     "Server error": "Zerbitzari-errorea",
@@ -301,13 +275,11 @@
     "Server unavailable, overloaded, or something else went wrong.": "Zerbitzaria eskuraezin edo gainezka egon daiteke edo zerbaitek huts egin du.",
     "%(senderName)s set a profile picture.": "%(senderName)s erabiltzaileak profileko argazkia ezarri du.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erabiltzaileak %(displayName)s ezarri du pantaila izen gisa.",
-    "Show Text Formatting Toolbar": "Erakutsi testu-formatuaren tresna-barra",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Erakutsi denbora-zigiluak 12 ordutako formatuan (adib. 2:30pm)",
     "Signed Out": "Saioa amaituta",
     "Sign in": "Hasi saioa",
     "%(count)s of your messages have not been sent.|other": "Zure mezu batzuk ez dira bidali.",
     "The phone number entered looks invalid": "Sartutako telefono zenbakia ez dirudi baliozkoa",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Eman duzun sinadura-gakoa %(userId)s erabiltzailearen %(deviceId)s gailutik jasotako bera da. Gailua egiaztatuta gisa markatu da.",
     "This email address was not found": "Ez da e-mail helbide hau aurkitu",
     "The remote side failed to pick up": "Urruneko aldeak hartzean huts egin du",
     "This room is not recognised.": "Ez da gela hau ezagutzen.",
@@ -317,23 +289,17 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Erabiltzeko, itxaron osatze automatikoaren emaitzak kargatu arte eta gero tabuladorearekin hautatu.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu zara, baina ez duzu mezu zehatz hori ikusteko baimenik.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
     "Unable to add email address": "Ezin izan da e-mail helbidea gehitu",
     "Unable to remove contact information": "Ezin izan da kontaktuaren informazioa kendu",
     "Unable to verify email address.": "Ezin izan da e-mail helbidea egiaztatu.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s erabiltzaileak debekua kendu dio %(targetName)s erabiltzaileari.",
     "Unable to capture screen": "Ezin izan da pantaila-argazkia atera",
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
-    "Unable to load device list": "Ezin izan da gailuen zerrenda kargatu",
-    "Undecryptable": "Deszifraezina",
     "unencrypted": "zifratu gabe",
-    "Unencrypted message": "Zifratu gabeko mezua",
     "unknown caller": "deitzaile ezezaguna",
     "Unknown room %(roomId)s": "%(roomId)s gela ezezaguna da",
-    "Unknown (user, device) pair:": "Erabiltzaile eta gailu bikote ezezaguna:",
     "Unmute": "Audioa aktibatu",
     "Unnamed Room": "Izen gabeko gela",
-    "Unrecognised command:": "Agindu ezezaguna:",
     "Unrecognised room alias:": "Gelaren ezizen ezezaguna:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
@@ -358,9 +324,6 @@
     "(could not connect media)": "(ezin izan da media konektatu)",
     "(no answer)": "(erantzunik ez)",
     "(unknown failure: %(reason)s)": "(hutsegite ezezaguna: %(reason)s)",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ABISUA: Gailua egiaztatuta dago, baina gakoak EZ DATOZ BAT!",
-    "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!": "ABISUA: GAKOEN EGIAZTAKETAK HUTS EGIN DU! %(userId)s erabiltzailearen %(deviceId)s gailuaren sinadura-gakoa \"%(fprint)s\" da, eta ez dator bat emandako \"%(fingerprint)s\" gakoarekin. Honek inor komunikazioa antzematen ari dela esan nahi lezake!",
-    "Who would you like to communicate with?": "Norekin komunikatu nahi duzu?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s erabiltzaileak atzera bota du %(targetName)s erabiltzailearen gonbidapena.",
     "You are already in a call.": "Bazaude dei batean.",
     "You cannot place a call with yourself.": "Ezin diozu zure buruari deitu.",
@@ -372,7 +335,6 @@
     "You need to be able to invite users to do that.": "Erabiltzaileak gonbidatzeko baimena behar duzu hori egiteko.",
     "You need to be logged in.": "Saioa hasi duzu.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zure e-mail helbidea ez dago antza hasiera zerbitzari honetako Matrix ID batekin lotuta.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Zure pasahitza ongi aldatu da. Ez dituzu beste gailuetan jakinarazpenak jasoko hauetan saioa berriro hasi arte",
     "You seem to be in a call, are you sure you want to quit?": "Badirudi dei batean zaudela, ziur irten nahi duzula?",
     "You seem to be uploading files, are you sure you want to quit?": "Badirudi fitxategiak iotzen zaudela, ziur irten nahi duzula?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Ezin izango duzu hau atzera bota erabiltzailea zure botere maila berera igotzen ari zarelako.",
@@ -407,8 +369,6 @@
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
     "(~%(count)s results)|one": "(~%(count)s emaitza)",
     "(~%(count)s results)|other": "(~%(count)s emaitza)",
-    "bold": "lodia",
-    "italic": "etzana",
     "Please select the destination room for this message": "Hautatu mezu hau bidaltzeko gela",
     "New Password": "Pasahitz berria",
     "Start automatically after system login": "Hasi automatikoki sisteman saioa hasi eta gero",
@@ -430,13 +390,8 @@
     "Unknown error": "Errore ezezaguna",
     "Incorrect password": "Pasahitz okerra",
     "To continue, please enter your password.": "Jarraitzeko sartu zure pasahitza.",
-    "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:": "Gailu hau fidagarria dela egiaztatzeko, kontaktatu bere jabea beste medio bat erabiliz (adib. aurrez aurre edo telefonoz deituz) eta galdetu beraien erabiltzaile-ezarpenetan bere gailurako ikusten duen gakoa hemen beheko bera den:",
-    "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.": "Bat badator sakatu egiaztatu botoia. Bat ez badator, beste inor gailu hau atzematen dago eta blokeatu beharko zenuke.",
     "Unable to restore session": "Ezin izan da saioa berreskuratu",
     "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.": "Aurretik Riot bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
-    "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.": "Gailu bakoitzaren egiaztaketa prozesua jarraitzea aholkatzen dizugu, benetako jabeari dagozkiela baieztatzeko, baina mezua egiaztatu gabe birbidali dezakezu ere.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" gelan aurretik ikusi ez dituzun gailuak daude.",
-    "Unknown devices": "Gailu ezezagunak",
     "Unknown Address": "Helbide ezezaguna",
     "Verify...": "Egiaztatu...",
     "ex. @bob:example.com": "adib. @urko:adibidea.eus",
@@ -472,8 +427,6 @@
     "Start verification": "Hasi egiaztaketa",
     "Share without verifying": "Partekatu egiaztatu gabe",
     "Ignore request": "Ezikusi eskaera",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "'%(displayName)s' gailua gehitu duzu eta zifratze-gakoak eskatzen ari da.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Zure egiaztatu gabeko '%(displayName)s' gailua zifratze-gakoak eskatzen ari da.",
     "Encryption key request": "Zifratze-gakoa eskatuta",
     "Deops user with given id": "Emandako ID-a duen erabiltzailea mailaz jaisten du",
     "Add a widget": "Gehitu trepeta bat",
@@ -493,7 +446,6 @@
     "Unable to create widget.": "Ezin izan da trepeta sortu.",
     "You are not in this room.": "Ez zaude gela honetan.",
     "You do not have permission to do that in this room.": "Ez duzu gela honetan hori egiteko baimenik.",
-    "Loading device info...": "Gailuaren informazioa kargatzen...",
     "Example": "Adibidea",
     "Create": "Sortu",
     "Featured Rooms:": "Nabarmendutako gelak:",
@@ -502,7 +454,6 @@
     "Failed to upload image": "Irudia igotzeak huts egin du",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s trepeta gehitu du %(senderName)s erabiltzaileak",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s trepeta kendu du %(senderName)s erabiltzaileak",
-    "Verifies a user, device, and pubkey tuple": "Erabiltzaile, gailu eta gako publiko multzoa egiaztatzen du",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s trepeta aldatu du %(senderName)s erabiltzaileak",
     "Copied!": "Kopiatuta!",
     "Failed to copy": "Kopiak huts egin du",
@@ -521,7 +472,6 @@
     "Unpin Message": "Desfinkatu mezua",
     "Add rooms to this community": "Gehitu gelak komunitate honetara",
     "Call Failed": "Deiak huts egin du",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Gailu ezezagunak daude gela honetan: hauek egiaztatu gabe aurrera jarraituz gero, posiblea litzateke inork zure deia entzutea.",
     "Review Devices": "Berrikusi gailuak",
     "Call Anyway": "Deitu hala ere",
     "Answer Anyway": "Erantzun hala ere",
@@ -548,8 +498,6 @@
     "Enable inline URL previews by default": "Gailu URL-en aurrebista lehenetsita",
     "Enable URL previews for this room (only affects you)": "Gaitu URLen aurrebista gela honetan (zuretzat bakarrik aldatuko duzu)",
     "Enable URL previews by default for participants in this room": "Gaitu URLen aurrebista lehenetsita gela honetako partaideentzat",
-    "Delete %(count)s devices|other": "Ezabatu %(count)s gailu",
-    "Delete %(count)s devices|one": "Ezabatu gailua",
     "%(senderName)s sent an image": "%(senderName)s erabiltzaileak irudi bat bidali du",
     "%(senderName)s sent a video": "%(senderName)s erabiltzaileak bideo bat bidali du",
     "%(senderName)s uploaded a file": "%(senderName)s erabiltzaileak fitxategi bat bidali du",
@@ -747,7 +695,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
     "Community IDs cannot be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
@@ -756,11 +703,7 @@
     "Clear filter": "Garbitu iragazkia",
     "Did you know: you can use communities to filter your Riot.im experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure Riot.im esperientzia iragazteko!",
     "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.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Zure gakoa partekatzeko eskaria bidali da - egiaztatu zure beste gailuetan gakoa partekatzeko eskariak.",
-    "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.": "Gakoa partekatzeko eskariak automatikoki bidaltzen dira zure beste gailuetara. Zure beste gailuetan gakoa partekatzeko eskaria ukatu edo baztertu baduzu, egin klik hemen saio honetarako gakoak eskatzeko berriz ere.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Zure beste gailuek mezu honetarako gakoa ez badute ezin izango dute deszifratu.",
     "Key request sent.": "Gako eskaria bidalita.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Berriz eskatu zifratze-gakoak</requestLink> zure beste gailuetatik.",
     "Code": "Kodea",
     "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 bidez akats baten berri eman badiguzu, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioaren erabileraren datuak dauzkate, zure erabiltzaile izena barne, eta bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
     "Submit debug logs": "Bidali arazte-egunkariak",
@@ -823,7 +766,6 @@
     "Files": "Fitxategiak",
     "Collecting app version information": "Aplikazioaren bertsio-informazioa biltzen",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ezabatu gelaren %(alias)s  ezizena eta kendu %(name)s direktoriotik?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Honek zure kontura itzultzea ahalbidetuko dizu, beste gailuetan saioa amaitu eta berriro hasi eta gero.",
     "Keywords": "Hitz gakoak",
     "Enable notifications for this account": "Gaitu jakinarazpenak kontu honetarako",
     "Invite to this community": "Gonbidatu komunitate honetara",
@@ -918,8 +860,6 @@
     "Refresh": "Freskatu",
     "We encountered an error trying to restore your previous session.": "Errore bat aurkitu dugu zure aurreko saioa berrezartzen saiatzean.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Zure nabigatzailearen biltegiratzea garbitzeak arazoa konpon lezake, baina saioa amaituko da eta zifratutako txaten historiala ezin izango da berriro irakurri.",
-    "Unable to reply": "Ezin erantzun",
-    "At this time it is not possible to reply with an emote.": "Une honetan ezin da irriabartxo batekin erantzun.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ezin izan da erantzundako gertaera kargatu, edo ez dago edo ez duzu ikusteko baimenik.",
     "Collapse Reply Thread": "Tolestu erantzun-haria",
     "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak, onartzen duten trepetetan",
@@ -965,12 +905,6 @@
     "Permission Required": "Baimena beharrezkoa",
     "You do not have permission to start a conference call in this room": "Ez duzu baimenik konferentzia dei bat hasteko gela honetan",
     "This event could not be displayed": "Ezin izan da gertakari hau bistaratu",
-    "deleted": "ezabatuta",
-    "underlined": "azpimarratuta",
-    "inline-code": "lineako kodea",
-    "block-quote": "aipamen blokea",
-    "bulleted-list": "buletdun zerrenda",
-    "numbered-list": "zenbakidun zerrenda",
     "Failed to remove widget": "Huts egin du trepeta kentzean",
     "An error ocurred whilst trying to remove the widget from the room": "Trepeta gelatik kentzen saiatzean errore bat gertatu da",
     "System Alerts": "Sistemaren alertak",
@@ -1025,11 +959,6 @@
     "Unable to load! Check your network connectivity and try again.": "Ezin da kargatu! Egiaztatu sare konexioa eta saiatu berriro.",
     "Delete Backup": "Ezabatu babes-kopia",
     "Unable to load key backup status": "Ezin izan da gakoen babes-kopiaren egoera kargatu",
-    "Backup has a <validity>valid</validity> signature from this device": "Babes-kopiak gailu honen <validity>baliozko</validity> sinadura bat du",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Babes-kopiak <verify>egiaztatu gabeko</verify> <device>gailu baten</device> <validity>baliozko</validity> sinadura du",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Babes-kopiak <verify>egiaztatutako</verify> <device></device> gailuaren <validity>balio gabeko</validity> sinadura du",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Babes-kopiak <verify>egiaztatu gabeko</verify> <device></device> gailuaren <validity>baliogabeko</validity> sinadura du",
-    "Backup is not signed by any of your devices": "Babes-kopia ez dago zure gailu batek sinauta",
     "Backup version: ": "Babes-kopiaren bertsioa: ",
     "Algorithm: ": "Algoritmoa: ",
     "Please review and accept all of the homeserver's policies": "Berrikusi eta onartu hasiera-zerbitzariaren politika guztiak",
@@ -1047,12 +976,9 @@
     "Your Recovery Key": "Zure berreskuratze gakoa",
     "Copy to clipboard": "Kopiatu arbelera",
     "Download": "Deskargatu",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Zure berreskuratze gakoa <b>zure arbelera kopiatu da</b>, itsatsi hemen:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Zure berreskuratze gakoa zure <b>Deskargak</b> karpetan dago.",
     "<b>Print it</b> and store it somewhere safe": "<b>Inprimatu ezazu</b> eta gorde toki seguruan",
     "<b>Save it</b> on a USB key or backup drive": "<b>Gorde ezazu</b> USB giltza batean edo babes-kopien diskoan",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiatu ezazu</b> zure hodeiko biltegi pertsonalean",
-    "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.": "Mezu seguruen berreskuratzea ezartzen ez bada, ezin izango duzu zure zifratutako mezuen historiala berreskuratu saioa amaitzen baduzu edo beste gailu bat erabiltzen baduzu.",
     "Set up Secure Message Recovery": "Ezarri mezu seguruen berreskuratzea",
     "Keep it safe": "Gorde toki seguruan",
     "Create Key Backup": "Sortu gakoaren babes-kopia",
@@ -1071,7 +997,6 @@
     "This looks like a valid recovery key!": "Hau baliozko berreskuratze gako bat dirudi!",
     "Not a valid recovery key": "Ez da baliozko berreskuratze gako bat",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta ezarri mezularitza segurua zure berreskuratze gakoa sartuz.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Zure berreskuratze pasa-esaldia ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu",
     "Sign in with single sign-on": "Hai saioa urrats batean",
     "Failed to perform homeserver discovery": "Huts egin du hasiera-zerbitzarien bilaketak",
     "Invalid homeserver discovery response": "Baliogabeko hasiera-zerbitzarien bilaketaren erantzuna",
@@ -1127,7 +1052,6 @@
     "New Recovery Method": "Berreskuratze metodo berria",
     "Set up Secure Messages": "Ezarri mezu seguruak",
     "Go to Settings": "Joan ezarpenetara",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Babes-kopiak <verify>egiaztatutako</verify> <device>gailu</device> baten <validity>baliozko</validity> sinadura bat du",
     "Unable to load commit detail: %(msg)s": "Ezin izan dira xehetasunak kargatu: %(msg)s",
     "Invalid identity server discovery response": "Baliogabeko erantzuna identitate zerbitzariaren bilaketan",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ez baduzu berreskuratze sistema berria ezarri, erasotzaile bat zure kontua atzitzen saiatzen egon daiteke. Aldatu zure kontuaren pasahitza eta ezarri berreskuratze metodo berria berehala ezarpenetan.",
@@ -1214,8 +1138,6 @@
     "Hammer": "Mailua",
     "Telephone": "Telefonoa",
     "Room avatar": "Gelaren abatarra",
-    "Upload room avatar": "Igo gelaren abatarra",
-    "No room avatar": "Gelaren abatarrik ez",
     "Room Name": "Gelaren izena",
     "Room Topic": "Gelaren mintzagaia",
     "Verify by comparing a short text string.": "Egiaztatu testu-kate labur bat konparatuz.",
@@ -1290,10 +1212,8 @@
     "Missing media permissions, click the button below to request.": "Multimedia baimenak falda dira, sakatu beheko botoia baimenak eskatzeko.",
     "Request media permissions": "Eskatu multimedia baimenak",
     "Allow Peer-to-Peer for 1:1 calls": "Baimendu Peer-to-Peer biren arteko deietan",
-    "Your keys are <b>not being backed up from this device</b>.": "<b>Ez</b> da gakoen babes kopiarik sortzen gailu honetatik.",
     "Start using Key Backup": "Hasi gakoen babes-kopia egiten",
     "Restore from Backup": "Berrezarri babes-kopia",
-    "This device is backing up your keys. ": "Gailu honek zure gakoen babes-kopia egiten du. ",
     "Back up your keys before signing out to avoid losing them.": "Egin gakoen babes-kopia bat saioa amaitu aurretik, galdu nahi ez badituzu.",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s gakoen babes-kopia egiten...",
     "All keys backed up": "Gako guztien babes.kopia egin da",
@@ -1319,37 +1239,27 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Baieztatu erabiltzaile hau beheko emojiak bere pantailan agertzen direla egiaztatuz.",
     "Verify this user by confirming the following number appears on their screen.": "Baieztatu erabiltzaile hau honako zenbakia bere pantailan agertzen dela egiaztatuz.",
     "Unable to find a supported verification method.": "Ezin izan da onartutako egiaztaketa metodorik aurkitu.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Segurtasun hobe baterako, hau aurrez aurre egitea edo fidagarria den beste komunikazio modu baten bidez egitea aholkatzen dugu.",
     "Thumbs up": "Ederto",
     "Hourglass": "Harea-erlojua",
     "Paperclip": "Klipa",
-    "Padlock": "Giltzarrapoa",
     "Pin": "Txintxeta",
-    "Your homeserver does not support device management.": "Zure hasiera-zerbitzariak ez du gailuen kudeaketa onartzen.",
     "Yes": "Bai",
     "No": "Ez",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "E-mail bat bidali dizugu zure helbidea egiaztatzeko. Jarraitu hango argibideak eta gero sakatu beheko botoia.",
     "Email Address": "E-mail helbidea",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ziur al zaude? Zure zifratutako mezuak galduko dituzu zure gakoen babes-kopia egoki bat egiten ez bada.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zifratutako mezuak muturretik muturrerako zifratzearen bidez babestuak daude. Zuk eta hartzaileak edo hartzaileek irakurri ditzakezue mezu horiek, beste inork ez.",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Babes-kopiak   %(deviceId)s ID-a duen gailu <verify>ezezagun</verify> baten sinadura du.",
-    "This backup is trusted because it has been restored on this device": "Babes-kopia hau fidagarritzat jotzen da gailu honetan berrezarri delako",
     "Add an email address to configure email notifications": "Gehitu e-mail helbidea e-mail bidezko jakinarazpenak ezartzeko",
     "Unable to verify phone number.": "Ezin izan da telefono zenbakia egiaztatu.",
     "Verification code": "Egiaztaketa kodea",
     "Phone Number": "Telefono zenbakia",
     "Profile picture": "Profileko irudia",
-    "Upload profile picture": "Igo profileko irudia",
     "Display Name": "Pantaila-izena",
     "Room information": "Gelako informazioa",
     "Internal room ID:": "Gelaren barne ID-a:",
     "Room version": "Gela bertsioa",
     "Room version:": "Gela bertsioa:",
     "Developer options": "Garatzaileen aukerak",
-    "Some devices for this user are not trusted": "Erabiltzaile honen gailu batzuk ez dira fidagarritzat jotzen",
-    "Some devices in this encrypted room are not trusted": "Zifratutako gela honetako gailu batzuk ez dira fidagarritzat jotzen",
-    "All devices for this user are trusted": "Erabiltzaile honen gailu guztiak fidagarritzat jotzen dira",
-    "All devices in this encrypted room are trusted": "Zifratutako gela honetako gailu guztiak fidagarritzat jotzen dira",
     "Never lose encrypted messages": "Ez galdu inoiz zifratutako mezuak",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Gela honetako mezuak muturretik muturrerako zifratzeaz babestuak daude. Zuek eta hartzaileek besterik ez daukazue mezu horiek irakurtzeko giltza.",
     "Composer": "Idazlekua",
@@ -1366,7 +1276,6 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ez da ezer agertzen? Bezero guztiek ez dute egiaztaketa interaktiborako euskarria.  <button>Erabili egiaztaketa zaharra</button>.",
     "Use two-way text verification": "Erabili bi zentzutako testu egiaztaketa",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Egiaztatu erabiltzaile hau fidagarritzat markatzeko. Honek bakea ematen dizu muturretik muturrerako zifratutako mezuak erabiltzean.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Erabiltzaile hau egiaztatzean fidagarri gisa markatuko da, eta zure gailua berarentzat fidagarritzat markatuko da ere.",
     "Waiting for partner to confirm...": "Kideak baieztatzearen zain...",
     "Incoming Verification Request": "Jasotako egiaztaketa eskaria",
     "I don't want my encrypted messages": "Ez ditut nire zifratutako mezuak nahi",
@@ -1381,7 +1290,6 @@
     "Hide": "Ezkutatu",
     "This homeserver does not support communities": "Hasiera-zerbitzari honek ez du komunitateetarako euskarria",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Egiaztaketa e-mail bat bidaliko da zure sarrera-ontzira pasahitz berria ezarri nahi duzula berresteko.",
-    "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.": "Gailu guztietan saioa amaitu duzu eta ez duzu push jakinarazpenik jasoko. Jakinarazpenak berriro aktibatzeko, hasi saioa gailuetan.",
     "This homeserver does not support login using email address.": "Hasiera-zerbitzari honek ez du e-mail helbidea erabiliz saioa hastea onartzen.",
     "Registration has been disabled on this homeserver.": "Izen ematea desaktibatuta dago hasiera-zerbitzari honetan.",
     "Unable to query for supported registration methods.": "Ezin izan da onartutako izen emate metodoei buruz galdetu.",
@@ -1390,13 +1298,9 @@
     "Set up with a Recovery Key": "Ezarri berreskuratze gakoarekin",
     "Please enter your passphrase a second time to confirm.": "Sartu zure pasaesaldia berriro baieztatzeko.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Berreskuratze gakoa badaezpadako bat da, zure zifratutako mezuetara sarbidea berreskuratzeko erabili dezakezu pasaesaldia ahaztuz gero.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Gorde berreskuratze gakoa toki oso seguru batean, pasaesaldi kudeatzaile batean esaterako (edo gordailu kutxa batean)",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zure gakoen babes-kopia egiten ari da (lehen babes-kopiak minutu batzuk behar ditzake).",
     "Success!": "Ongi!",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Berreskuratze pasaesaldi eta mezu seguruen gako berriak antzeman dira.",
-    "This device is encrypting history using the new recovery method.": "Gailu honek historiala berreskuratze metodo berriarekin zifratzen du.",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Gailu honek zure berreskuratze pasaesaldia eta mezu seguruen gakoa kendu direla antzeman du.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Nahi gabe egin baduzu hau, Mezu seguruak ezarri ditzakezu gailu honetan eta gailu honetako mezuen historiala berreskuratze metodo berriarekin zifratuko da.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ez baduzu berreskuratze metodoa kendu, agian erasotzaile bat zure mezuen historialera sarbidea lortu nahi du. Aldatu kontuaren pasahitza eta ezarri berreskuratze metodo berri bat berehala ezarpenetan.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Zerbitzari pertsonalizatuaren aukera erabili dezakezu beste Matrix zerbitzarietan saioa hasteko beste hasiera-zerbitzari batek URLa adieraziz. Honek aplikazio hau beste Matrix zerbitzari batean duzun Matrix kontua erabiltzea baimentzen dizu.",
     "Changes your display nickname in the current room only": "Zure pantailako izena aldatzen du gela honetan bakarrik",
@@ -1448,14 +1352,8 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalatu <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, edo <safariLink>Safari</safariLink> esperientzia hobe baterako.",
     "Want more than a community? <a>Get your own server</a>": "Komunitate bat baino gehiago nahi duzu? <a>Eskuratu zure zerbitzari propioa</a>",
     "Could not load user profile": "Ezin izan da erabiltzaile-profila kargatu",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Zure pasahitza aldatzeak zure gailu guztietako muturretik-muturrerako zifratzerako gakoak berrezarriko ditu, eta aurretik zifratutako mezuen historiala ezin izango da irakurri. Ezarri gakoen babes-kopia edo esportatu zure geletako gakoak beste gailu batetik pasahitza aldatu aurretik.",
-    "Room upgrade confirmation": "Gela eguneratzeko berrespena",
-    "Upgrading a room can be destructive and isn't always necessary.": "Gela bertsio-berritzeak ondorio suntsitzaileak izan ditzake eta ez da beti beharrezkoa.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gela bertsio-berritzea aholkatzen da gelaren bertsioa <i>ezegonkortzat</i> jotzen denean. Gela bertsio ezegonkorrek akatsak izan ditzakete, falta diren ezaugarriak, edo segurtasun arazoak.",
     "You cannot modify widgets in this room.": "Ezin dituzu gela honetako trepetak aldatu.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak %(targetDisplayName)s geñara elkartzeko gonbidapena errefusatu du.",
-    "Enable desktop notifications for this device": "Gaitu mahaigaineko jakinarazpenak gailu honetan",
-    "Enable audible notifications for this device": "Gaitu jakinarazpen entzungarriak gailu honetan",
     "Upgrade this room to the recommended room version": "Bertsio-berritu gela hau aholkatutako bertsiora",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Gela hau bertsio-berritzeak gelaren oraingo instantzia itzaliko du eta izen bereko beste gela berri bat sortuko du.",
     "Failed to revoke invite": "Gonbidapena indargabetzeak huts egin du",
@@ -1475,10 +1373,7 @@
     "The file '%(fileName)s' failed to upload.": "Huts egin du '%(fileName)s' fitxategia igotzean.",
     "The server does not support the room version specified.": "Zerbitzariak ez du emandako gela-bertsioa onartzen.",
     "Name or Matrix ID": "Izena edo Matrix ID-a",
-    "Email, name or Matrix ID": "E-mail, izena edo Matrix ID-a",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gelak eguneratzeak <i>zerbitzariaren aldeko</i> gelaren prozesamenduan eragiten du besterik ez. Zure Riot bezeroarekin arazoak badituzu, eman arazoaren berri hemen <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Abisua:</b>: Gela eguneratzeak <i>ez ditu automatikoki migratuko kideak gelaren bertsio berrira</i>. Gela berrira daraman esteka bat argitaratuko da gelaren bertsio zaharrean, gelako kideek estekan sakatu beharko dute gela berrira elkartzeko.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Berretsi gela eguneratzearekin jarraitu nahi duzula, <oldVersion /> bertsiotik <newVersion /> bertsiora.",
     "Changes your avatar in this current room only": "Zure abatarra aldatzen du gela honetan bakarrik",
     "Unbans user with given ID": "ID zehatz bat duen erabiltzaileari debekua altxatzen dio",
     "Adds a custom widget by URL to the room": "URL bidez trepeta pertsonalizatu bat gehitzen du gelara",
@@ -1497,10 +1392,6 @@
     "Show hidden events in timeline": "Erakutsi gertaera ezkutuak denbora-lerroan",
     "Low bandwidth mode": "Banda-zabalera gutxiko modua",
     "When rooms are upgraded": "Gelak eguneratzean",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Gailu honek <b>ez du zure gakoen babes-kopia egiten</b>, baina badago babes-kopia bat eta berreskuratu dezakezu aurrera jarraitzeko.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Konektatu gailu hau gakoen babes-kopiara saioa amaitu aurretik, bakarrik gailu honetan egon daitezkeen gakoak galdu nahi ez badituzu.",
-    "Connect this device to Key Backup": "Konektatu gailu hau gakoen babes-kopiara",
-    "Backup has an <validity>invalid</validity> signature from this device": "Babes-kopiak gailu honen <validity>baliogabeko</validity> sinadura du",
     "this room": "gela hau",
     "View older messages in %(roomName)s.": "Ikusi %(roomName)s gelako mezu zaharragoak.",
     "Uploaded sound": "Igotako soinua",
@@ -1611,7 +1502,6 @@
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s erabiltzaileak ez du aldaketarik egin %(count)s aldiz",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s erabiltzaileak ez du aldaketarik egin",
     "Removing…": "Kentzen…",
-    "Clear all data on this device?": "Garbitu gailu honi buruzko datu guztiak?",
     "Clear all data": "Garbitu datu guztiak",
     "Your homeserver doesn't seem to support this feature.": "Antza zure hasiera-zerbitzariak ez du ezaugarri hau onartzen.",
     "Resend edit": "Birbidali edizioa",
@@ -1622,13 +1512,10 @@
     "You're signed out": "Saioa amaitu duzu",
     "Clear personal data": "Garbitu datu pertsonalak",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Esaguzu zer ez den behar bezala ibili edo, hobe oraindik, sortu GitHub txosten bat zure arazoa deskribatuz.",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Datu guztiak gailu honetatik ezabatzea behin betiko da. Zifratutako mezuak galdu egingo dira ez bada bere gakoen babes-kopia bat egin.",
     "Failed to re-authenticate due to a homeserver problem": "Berriro autentifikatzean huts egin du hasiera-zerbitzariaren arazo bat dela eta",
     "Failed to re-authenticate": "Berriro autentifikatzean huts egin du",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Berreskuratu zure kontura sarbidea eta gailu honetan gordetako zifratze gakoak. Hauek gabe, ezin izango dituzu zure mezu seguruak irakurri beste gailuetatik.",
     "Enter your password to sign in and regain access to your account.": "Sartu zure pasahitza saioa hasteko eta berreskuratu zure kontura sarbidea.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Ezin duzu zure kontuan saioa hasi. Jarri kontaktuan zure hasiera zerbitzariko administratzailearekin informazio gehiagorako.",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Abisua: Zure datu pertsonalak (zure zifratze gakoak barne) gailu honetan gordeko dira. Garbitu ezazu gailu hau erabiltzen bukatu duzunean edo beste kontu bat erabili nahi duzunean.",
     "Identity Server": "Identitate zerbitzaria",
     "Find others by phone or email": "Aurkitu besteak telefonoa edo e-maila erabiliz",
     "Be found by phone or email": "Izan telefonoa edo e-maila erabiliz aurkigarria",
@@ -1640,7 +1527,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Eskatu zure hasiera-zerbitzariaren administratzaileari (<code>%(homeserverDomain)s</code>) TURN zerbitzari bat konfiguratu dezala deiek ondo funtzionatzeko.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Bestela, <code>turn.matrix.org</code> zerbitzari publikoa erabili dezakezu, baina hau ez da hain fidagarria izango, eta zure IP-a partekatuko du zerbitzari horrekin. Hau ezarpenetan ere kudeatu dezakezu.",
     "Try using turn.matrix.org": "Saiatu turn.matrix.org erabiltzen",
-    "Failed to start chat": "Huts egin du txata hastean",
     "Messages": "Mezuak",
     "Actions": "Ekintzak",
     "Displays list of commands with usages and descriptions": "Aginduen zerrenda bistaratzen du, erabilera eta deskripzioekin",
@@ -1669,7 +1555,6 @@
     "Please enter verification code sent via text.": "Sartu SMS bidez bidalitako egiaztatze kodea.",
     "Discovery options will appear once you have added a phone number above.": "Aurkitze aukerak behin goian telefono zenbaki bat gehitu duzunean agertuko dira.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "SMS mezu bat bidali zaizu +%(msisdn)s zenbakira. Sartu hemen mezu horrek daukan egiaztatze-kodea.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Gailu hau fidagarria dela egiaztatzeko, egiaztatu gailu horretako Erabiltzaile ezarpenetan ikusi dezakezun gakoa beheko hau bera dela:",
     "Command Help": "Aginduen laguntza",
     "No identity server is configured: add one in server settings to reset your password.": "Eza da identitate-zerbitzaririk konfiguratu, gehitu bat zerbitzari-ezarpenetan zure pasahitza berrezartzeko.",
     "This account has been deactivated.": "Kontu hau desaktibatuta dago.",
@@ -1697,7 +1582,6 @@
     "Changes the avatar of the current room": "Uneko gelaren abatarra aldatzen du",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Sakatu jarraitu lehenetsitakoa erabiltzeko (%(defaultIdentityServerName)s) edo aldatu ezarpenetan.",
     "Use an identity server to invite by email. Manage in Settings.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Kudeatu ezarpenetan.",
-    "Use the new, faster, composer for writing messages": "Erabili mezuak idazteko tresna berri eta azkarragoa",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Bidali mezuentzako irakurragiriak (Hasiera-zerbitzari bateragarria behar da desgaitzeko)",
     "Show previews/thumbnails for images": "Erakutsi irudien aurrebista/iruditxoak",
     "Change identity server": "Aldatu identitate-zerbitzaria",
@@ -1714,7 +1598,6 @@
     "Clear cache and reload": "Garbitu cachea eta birkargatu",
     "Read Marker lifetime (ms)": "Orri-markagailuaren biziraupena (ms)",
     "Read Marker off-screen lifetime (ms)": "Orri-markagailuaren biziraupena pantailaz kanpo (ms)",
-    "A device's public name is visible to people you communicate with": "Gailuaren izen publikoa zurekin komunikatzen den jendeak ikusi dezake",
     "Error changing power level requirement": "Errorea botere-maila eskaria aldatzean",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Errore bat gertatu da gelaren botere-maila eskariak aldatzean. Baieztatu baimen bahikoa duzula eta saiatu berriro.",
     "Error changing power level": "Errorea botere-maila aldatzean",
@@ -1841,8 +1724,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du. (Nabigatzaile honek ez du onartzen)",
     "Try out new ways to ignore people (experimental)": "Probatu jendea ez entzuteko modu berriak (esperimentala)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Bidali egiaztatze eskariak mezu zuzenetan, kide paneleko egiaztatze interfaze berria barne.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Gaitu zeharkako sinadura erabiltzaileko eta ez gailuko egiaztatzeko (garapenean)",
     "Enable local event indexing and E2EE search (requires restart)": "Gaitu gertaera lokalen indexazioa eta E2EE bilaketa (berrabiarazi behar da)",
     "Match system theme": "Bat egin sistemako gaiarekin",
     "My Ban List": "Nire debeku-zerrenda",
@@ -1890,11 +1771,7 @@
     "Failed to connect to integration manager": "Huts egin du integrazio kudeatzailera konektatzean",
     "Trusted": "Konfiantzazkoa",
     "Not trusted": "Ez konfiantzazkoa",
-    "Hide verified Sign-In's": "Ezkutatu baieztatuko saio hasierak",
-    "%(count)s verified Sign-In's|other": "Baieztatutako %(count)s saio hasiera",
-    "%(count)s verified Sign-In's|one": "Baieztatutako saio hasiera 1",
     "Direct message": "Mezu zuzena",
-    "Unverify user": "Kendu baieztatzea erabiltzaileari",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> %(roomName)s gelan",
     "Messages in this room are end-to-end encrypted.": "Gela honetako mezuak ez daude muturretik muturrera zifratuta.",
     "Security": "Segurtasuna",
@@ -1945,11 +1822,9 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak zerbitzariak debekatzen dituen araua aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erabiltzaileak debeku arau bat aldatu du %(oldGlob)s adierazpenetik %(newGlob)s adierazpenera, arrazoia: %(reason)s",
     "Cross-signing and secret storage are enabled.": "Zeharkako sinadura eta biltegi sekretua gaituta daude.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Zure kontuak zeharkako sinaduraren identitatea biltegi sekretuan du, baina gailu honek oraindik ez du fidagarritzat.",
     "Cross-signing and secret storage are not yet set up.": "Zeharkako sinadura eta biltegi sekretua ez daude oraindik ezarrita.",
     "Bootstrap cross-signing and secret storage": "Abiatu zeharkako sinadura eta biltegi sekretua",
     "Cross-signing public keys:": "Zeharkako sinaduraren gako publikoak:",
-    "on device": "gailuan",
     "not found": "ez da aurkitu",
     "Cross-signing private keys:": "Zeharkako sinaduraren gako pribatuak:",
     "in secret storage": "biltegi sekretuan",
@@ -1959,10 +1834,7 @@
     "Backup has a <validity>valid</validity> signature from this user": "Babes-kopiak erabiltzaile honen <validity>baliozko</validity> sinadura bat du",
     "Backup has a <validity>invalid</validity> signature from this user": "Babes-kopiak erabiltzaile honen <validity>baliogabeko</validity> sinadura bat du",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile <verify>ezezagun</verify> baten sinadura du",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen gailu <verify>ezezagun</verify> baten sinadura du",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Babes-kopiaren gakoa biltegi sekretuan gorde da, gaina ezaugarri hau ez dago aktibatuta gailu honetan. Gaitu zeharkako sinadura laborategian babes-kopiaren egoera aldatzeko.",
     "Backup key stored: ": "Babes-kopiaren gakoa gordeta: ",
-    "Start using Key Backup with Secure Secret Storage": "Hasi gakoen babes-kopia erabiltzen biltegi sekretu seguruarekin",
     "Cross-signing": "Zeharkako sinadura",
     "This message cannot be decrypted": "Mezu hau ezin da deszifratu",
     "Unencrypted": "Zifratu gabe",
@@ -1984,64 +1856,38 @@
     "Enter secret storage passphrase": "Sartu biltegi sekretuko pasaesaldia",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu pasaesaldi zuzena idatzi duzula.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Abisua</b>: Biltegi sekretura ordenagailu fidagarri batetik konektatu beharko zinateke beti.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinaduraren identitatea beste gailuak egiaztatzeko zure pasa-esaldia sartuz.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Zure pasa-esaldia ahaztu baduzu <button1>berreskuratze gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu.",
     "Enter secret storage recovery key": "Sartu biltegi sekretuko berreskuratze-gakoa",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze-gako zuzena sartu duzula.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta zeharkako sinaduraren identitatea beste gailuak egiaztatzeko zure pasa-esaldia sartuz.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Zure berreskuratze-gakoa ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Abisua:</b>: Gakoen babes-kopia fidagarria den gailu batetik egin beharko zenuke beti.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Zure berreskuratze-gakoa ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu",
     "Notification settings": "Jakinarazpenen ezarpenak",
     "User Status": "Erabiltzaile-egoera",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Abisua</b>: Biltegi sekretura ordenagailu fidagarri batetik konektatu beharko zinateke beti.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biltegi sekretua erabiliko dugu, aukeran, beste gailuak egiaztatzeko zure zeharkako sinaduraren identitatearen  eta mezuen gakoen  kopia zifratu bat zure zerbitzarian gordetzeko. Babestu zure mezu zifratuetara sarbidea pasa.esaldi batekin seguru mantentzeko.",
     "Set up with a recovery key": "Ezarri berreskuratze gakoarekin",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Aukeran, berreskuratze pasa-esaldia ahazten baduzu, zure zifratutako mezuak berreskuratzeko erabili dezakezu.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Badaezpada, zure zifratutako mezuen historiala berreskuratzeko erabili dezakezu.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Gorde zure berreskuratze gakoa toki oso seguruan, esaterako pasahitz kudeatzaile batean (edo gordailu kutxan).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Zure berreskuratze gakoa <b>arbelera kopiatu da</b>, itsatsi hemen:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Zure berreskuratze gakoa zure <b>Deskargak</b> karpetan dago.",
-    "Your access to encrypted messages is now protected.": "Zure zifratutako mezuetara sarbidea babestuta dago.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Mezu seguruen berreskuratzea ezartzen ez bada, ezin izango duzu zure zifratutako mezuen historiala edo beste gailuak egiaztatzeko zeharkako sinadura berreskuratu saioa amaitzen baduzu edo beste gailu bat erabiltzen baduzu.",
-    "Set up secret storage": "Ezarri biltegi sekretua",
-    "Secure your encrypted messages with a passphrase": "Babestu zure zifratutako mezuak pasa-esaldi batekin",
     "Storing secrets...": "Sekretuak gordetzen...",
     "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri",
     "The message you are trying to send is too large.": "Bidali nahi duzun mezua handiegia da.",
-    "This user has not verified all of their devices.": "Erabiltzaileak ez ditu bere gailu guztiak egiaztatu.",
-    "You have not verified this user. This user has verified all of their devices.": "Ez duzu erabiltzaile hau egiaztatu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.",
-    "You have verified this user. This user has verified all of their devices.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere gailu guztiak egiaztatu ditu.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Ez dituzu zifratutako gela honetako erabiltzaile batzuk egiaztatu, edo hauek ez dituzte bere gailu guztiak egiaztatu.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Zifratutako gela honetako erabiltzaile guztiak egiaztatu dituzu, eta hauek bere gailu guztiak egiaztatu dituzte.",
     "Language Dropdown": "Hizkuntza menua",
     "Help": "Laguntza",
     "Country Dropdown": "Herrialde menua",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua zure oraingo gakoen babes-kopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berdinak izango dira",
-    "Migrate from Key Backup": "Migratu gakoen babes-kopiatik",
-    "New DM invite dialog (under development)": "Mezu zuzen bidezko gonbidapen elkarrizketa-koadro berria (garapenean)",
     "Show info about bridges in room settings": "Erakutsi zubiei buruzko informazioa gelaren ezarpenetan",
-    "This bridge was provisioned by <user />": "Zubi hau <user /> erabiltzaileak hornitu du",
     "This bridge is managed by <user />.": "Zubi hau <user /> erabiltzaileak kudeatzen du.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "<channelLink /><networkLink /> kanalera zubia, <protocolName /> protokoloan",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "<channelIcon /><channelName /> kanalera konektatuta, <networkIcon /><networkName /> sarean",
-    "Connected via %(protocolName)s": "%(protocolName)s bidez konektatuta",
-    "Bridge Info": "Zubiaren informazioa",
-    "Below is a list of bridges connected to this room.": "Behean gela honetara konektatutako zubien informazioa dago.",
     "Show more": "Erakutsi gehiago",
     "Recent Conversations": "Azken elkarrizketak",
     "Direct Messages": "Mezu zuzenak",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eska egiezu bere erabiltzaile-izena, edo eman egiezu zurea (%(userId)s) edo <a>profilera esteka</a>.",
     "Go": "Joan",
     "Suggestions": "Proposamenak",
     "Failed to find the following users": "Ezin izan dira honako erabiltzaile hauek aurkitu",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Honako erabiltzaile hauek agian ez dira existitzen edo baliogabeak dira, eta ezin dira gonbidatu: %(csvNames)s",
     "Show a presence dot next to DMs in the room list": "Erakutsi presentzia puntua mezu zuzenen ondoan gelen zerrendan",
     "Lock": "Blokeatu",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Gakoen babes-kopia gaituta dago zure kontuan baina ez da saio honetarako ezarri. Biltegi sekretua ezartzeko, berrezarri zure gakoen babes-kopia.",
     "Restore": "Berrezarri",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Biltegi sekretua ezarriko da zure oraingo gakoen babes-kopiaren xehetasunak erabiliz. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa lehen gakoen babes-kopiarako ziren berberak izango dira",
-    "Restore your Key Backup": "Berrezarri zure gakoen babes-kopia",
     "a few seconds ago": "duela segundo batzuk",
     "about a minute ago": "duela minutu bat inguru",
     "%(num)s minutes ago": "duela %(num)s minutu",
@@ -2056,8 +1902,6 @@
     "%(num)s hours from now": "hemendik %(num)s ordutara",
     "about a day from now": "hemendik egun batera",
     "%(num)s days from now": "hemendik %(num)s egunetara",
-    "New Session": "Saio berria",
-    "New invite dialog": "Gonbidapen elkarrizketa-koadro berria",
     "Other users may not trust it": "Beste erabiltzaile batzuk ez fidagarritzat jo lezakete",
     "Later": "Geroago",
     "Failed to invite the following users to chat: %(csvUsers)s": "Ezin izan dira honako erabiltzaile hauek gonbidatu txatera: %(csvUsers)s",
@@ -2072,18 +1916,14 @@
     "Session verified": "Saioa egiaztatuta",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Zure saio berria orain egiaztatuta dago. Zure zifratutako mezuetara sarbidea du, eta beste erabiltzaileek fidagarri gisa ikusiko zaituzte.",
     "Done": "Egina",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Gailu honetan segurtasuna osatu ezean, ez du zifratutako mezuetara sarbiderik izango.",
     "Go Back": "Joan atzera",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Biltegi sekretua oraingo gakoen babeskopiaren xehetasunak erabiliz ezarriko da. Zure biltegi sekretuaren pasa-esaldia eta berreskuratze gakoa zure gakoen babes-kopiarako zenerabiltzanak izango dira.",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak eta beste %(count)s gehitu dizkio gela honi",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s erabiltzaileak %(removedAddresses)s helbideak eta beste %(count)s kendu dizkio gela honi",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s erabiltzaileak %(countRemoved)s helbide kendu eta %(countAdded)s gehitu dizkio gela honi",
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea aktibatu du.",
     "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea gaitu du (%(algorithm)s algoritmo ezezaguna).",
-    "Someone is using an unknown device": "Baten bat gailu ezezagun bat erabiltzen ari da",
     "This room is end-to-end encrypted": "Gela hau muturretik muturrera zifratuta dago",
     "Everyone in this room is verified": "Gelako guztiak egiaztatuta daude",
-    "Encrypted by a deleted device": "Ezabatutako gailu batek zifratua",
     "Invite only": "Gonbidapenez besterik ez",
     "Send a reply…": "Bidali erantzuna…",
     "Send a message…": "Bidali mezua…",
@@ -2095,17 +1935,13 @@
     "Send as message": "Bidali mezu gisa",
     "Verify User": "Egiaztatu erabiltzailea",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Segurtasun gehiagorako, egiaztatu erabiltzaile hau aldi-bakarrerako kode bat bi gailuetan egiaztatuz.",
-    "For maximum security, do this in person.": "Segurtasun gorenerako, egin hau aurrez aurre.",
     "Start Verification": "Hasi egiaztaketa",
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eskatu bere erabiltzaile-izena, partekatu zurea (%(userId)s) edo partekatu <a>profilaren esteka</a>.",
     "Enter your account password to confirm the upgrade:": "Sartu zure kontuaren pasa-hitza eguneraketa baieztatzeko:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Zerbitzariarekin autentifikatu beharko duzu eguneraketa baieztatzeko.",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Eguneratu gailu hau honek beste gailuak egiaztatu ahal izateko, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatzeko.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ezarri zifratzea gailu honetan honek beste gailuak egiaztatu ahal izateko, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatzeko.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Babestu zure zifratze gakoak pasa-esaldi batekin. Segurtasun gorenerako hau eta zure kontuaren pasahitza desberdinak izan beharko lukete:",
     "Enter a passphrase": "Sartu pasa-esaldia",
     "Enter your passphrase a second time to confirm it.": "Sartu zure pasa-esaldia berriro hau baieztatzeko.",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Gailu honek beste gailuak egiaztatu ditzake, horrela zifratutako mezuetara sarbidea emanez eta beste erabiltzaileentzat fidagarri gisa markatuz.",
     "Verify other users in their profile.": "Egiaztatu beste erabiltzaileak bere profiletan.",
     "Upgrade your encryption": "Eguneratu zure zifratzea",
     "Set up encryption": "Ezarri zifratzea",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 056aa9400c..badb785132 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -52,7 +52,6 @@
     "Noisy": "پرسروصدا",
     "Collecting app version information": "درحال جمع‌آوری اطلاعات نسخه‌ی برنامه",
     "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.": "این به شما اجازه خواهد داد که پس از خروج به اکانت خود بازگردید و از سایر دستگاه‌ها وارد شوید.",
     "Cancel": "لغو",
     "Enable notifications for this account": "آگاه سازی با رایانامه را برای این اکانت فعال کن",
     "Messages containing <span>keywords</span>": "پیا‌م‌های دارای <span> این کلیدواژه‌ها </span>",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 38d7556f52..1d60b1af60 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -83,12 +83,8 @@
     "Decline": "Hylkää",
     "Decryption error": "Virhe salauksen purkamisessa",
     "Default": "Oletus",
-    "Device already verified!": "Laite on jo varmennettu!",
     "Device ID": "Laitetunniste",
-    "Device ID:": "Laitetunniste:",
     "device id: ": "laitetunniste: ",
-    "Device key:": "Laiteavain:",
-    "Devices": "Laitteet",
     "Direct chats": "Suorat keskustelut",
     "Disable Notifications": "Ota ilmoitukset pois käytöstä",
     "Disinvite": "Peru kutsu",
@@ -100,7 +96,6 @@
     "Email address": "Sähköpostiosoite",
     "Emoji": "Emoji",
     "Enable Notifications": "Ota ilmoitukset käyttöön",
-    "Encrypted by an unverified device": "Varmentamattoman laiteen salaama",
     "End-to-end encryption information": "Osapuolten välisen salauksen tiedot",
     "Enter passphrase": "Syötä salasana",
     "Error decrypting attachment": "Virhe purettaessa liitteen salausta",
@@ -129,7 +124,6 @@
     "Filter room members": "Suodata huoneen jäseniä",
     "Forget room": "Unohda huone",
     "For security, this session has been signed out. Please sign in again.": "Turvallisuussyistä tämä istunto on kirjattu ulos. Ole hyvä ja kirjaudu uudestaan.",
-    "Hide Text Formatting Toolbar": "Piilota tekstinmuotoilutyökalupalkki",
     "Homeserver is": "Kotipalvelin on",
     "Identity Server is": "Identiteettipalvelin on",
     "I have verified my email address": "Olen varmistanut sähköpostiosoitteeni",
@@ -140,9 +134,7 @@
     "Incoming voice call from %(name)s": "Saapuva äänipuhelu käyttäjältä %(name)s",
     "Incorrect username and/or password.": "Virheellinen käyttäjätunnus ja/tai salasana.",
     "Incorrect verification code": "Virheellinen varmennuskoodi",
-    "Invalid alias format": "Aliaksen muoto on virheellinen",
     "Invalid Email Address": "Virheellinen sähköpostiosoite",
-    "Invite new room members": "Kutsu lisää jäseniä huoneeseen",
     "Invited": "Kutsuttu",
     "Invites": "Kutsut",
     "Invites user with given id to current room": "Kutsuu tunnuksen mukaisen käyttäjän huoneeseen",
@@ -159,10 +151,6 @@
     "Logout": "Kirjaudu ulos",
     "Low priority": "Alhainen prioriteetti",
     "Manage Integrations": "Hallinnoi integraatioita",
-    "Markdown is disabled": "Markdown on pois päältä",
-    "Markdown is enabled": "Markdown on päällä",
-    "matrix-react-sdk version:": "Matrix-react-sdk:n versio:",
-    "Message not sent due to unknown devices being present": "Viestiä ei lähetetty koska paikalla on tuntemattomia laitteita",
     "Moderator": "Moderaattori",
     "Name": "Nimi",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
@@ -181,7 +169,6 @@
     "Only people who have been invited": "Vain kutsutut käyttäjät",
     "Password": "Salasana",
     "Passwords can't be empty": "Salasanat eivät voi olla tyhjiä",
-    "People": "Henkilöt",
     "Permissions": "Oikeudet",
     "Phone": "Puhelin",
     "Private Chat": "Yksityinen keskustelu",
@@ -194,15 +181,12 @@
     "Return to login screen": "Palaa kirjautumissivulle",
     "riot-web version:": "Riot-webin versio:",
     "Room Colour": "Huoneen väri",
-    "Room contains unknown devices": "Huone sisältää tuntemattomia laitteita",
     "Rooms": "Huoneet",
     "Save": "Tallenna",
     "Scroll to bottom of page": "Vieritä sivun loppuun",
     "Search failed": "Haku epäonnistui",
     "Searches DuckDuckGo for results": "Hakee DuckDuckGo:n avulla",
     "Send anyway": "Lähetä silti",
-    "Sender device information": "Lähettäjän laitteen tiedot",
-    "Send Invites": "Lähetä kutsut",
     "Server error": "Palvelinvirhe",
     "Session ID": "Istuntotunniste",
     "Sign in": "Kirjaudu sisään",
@@ -210,7 +194,6 @@
     "%(count)s of your messages have not been sent.|other": "Osaa viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
     "Start a chat": "Aloita keskustelu",
-    "Start Chat": "Aloita keskustelu",
     "Submit": "Lähetä",
     "This email address is already in use": "Tämä sähköpostiosoite on jo käytössä",
     "This email address was not found": "Sähköpostiosoitetta ei löytynyt",
@@ -219,16 +202,12 @@
     "This room": "Tämä huone",
     "This room is not accessible by remote Matrix servers": "Tähän huoneeseen ei pääse ulkopuolisilta Matrix-palvelimilta",
     "Unban": "Poista porttikielto",
-    "Undecryptable": "Salauksen purku ei ole mahdollista",
     "unencrypted": "salaamaton",
-    "Unencrypted message": "Salaamaton viesti",
     "unknown caller": "tuntematon soittaja",
     "unknown device": "tuntematon laite",
     "Unknown room %(roomId)s": "Tuntematon huone %(roomId)s",
-    "Unknown (user, device) pair:": "Tuntematon (käyttäjä, laite)-pari:",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
-    "Unrecognised command:": "Tuntematon komento:",
     "Unrecognised room alias:": "Tuntematon huonealias:",
     "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
@@ -243,14 +222,12 @@
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
     "none": "Ei mikään",
-    "No devices with registered encryption keys": "Ei laitteita, joilla on rekisteröityjä salausavaimia",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP-konferenssia.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
     "This room is not recognised.": "Huonetta ei tunnistettu.",
     "This doesn't appear to be a valid email address": "Tämä ei vaikuta olevan kelvollinen sähköpostiosoite",
     "This phone number is already in use": "Puhelinnumero on jo käytössä",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti osapuolten välisen salauksen käyttöön (algoritmi %(algorithm)s).",
     "Username invalid: %(errMessage)s": "Käyttäjätunnus ei kelpaa: %(errMessage)s",
     "Users": "Käyttäjät",
     "Verification": "Varmennus",
@@ -266,7 +243,6 @@
     "Warning!": "Varoitus!",
     "Who can access this room?": "Ketkä pääsevät tähän huoneeseen?",
     "Who can read history?": "Ketkä voivat lukea historiaa?",
-    "Who would you like to communicate with?": "Kenen kanssa haluaisit kommunikoida?",
     "You are already in a call.": "Sinulla on jo puhelu käynnissä.",
     "You are not in this room.": "Et ole tässä huoneessa.",
     "You do not have permission to do that in this room.": "Sinulla ei ole oikeutta tehdä tuota tässä huoneessa.",
@@ -299,8 +275,6 @@
     "(~%(count)s results)|one": "(~%(count)s tulos)",
     "(~%(count)s results)|other": "(~%(count)s tulosta)",
     "Active call": "Aktiivinen puhelu",
-    "bold": "lihavoitu",
-    "italic": "kursiivi",
     "Please select the destination room for this message": "Ole hyvä ja valitse vastaanottava huone tälle viestille",
     "New Password": "Uusi salasana",
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
@@ -320,9 +294,6 @@
     "Confirm Removal": "Varmista poistaminen",
     "Unknown error": "Tuntematon virhe",
     "Incorrect password": "Virheellinen salasana",
-    "Device name": "Laitenimi",
-    "Device key": "Laiteavain",
-    "Verify device": "Varmenna laite",
     "I verify that the keys match": "Varmistin, että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
@@ -338,8 +309,6 @@
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone verkkotunnuksen %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
-    "Never send encrypted messages to unverified devices from this device": "Älä koskaan lähetä salattuja viestejä varmentamattomiin laitteisiin tältä laitteelta",
-    "Never send encrypted messages to unverified devices in this room from this device": "Älä koskaan lähetä salattuja viestejä tässä huoneessa oleviin varmentamattomiin laitteisiin tältä laitteelta",
     "New address (e.g. #foo:%(localDomain)s)": "Uusi osoite (esim. #foo:%(localDomain)s)",
     "Revoke Moderator": "Poista moderaattorioikeudet",
     "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
@@ -354,20 +323,17 @@
     "Send Reset Email": "Lähetä salasanan palautusviesti",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s lähetti kuvan.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s kutsui käyttäjän %(targetDisplayName)s liittymään huoneeseen.",
-    "Show Text Formatting Toolbar": "Näytä tekstinmuotoilupalkki",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näytä aikaleimat 12 tunnin muodossa (esim. 2:30pm)",
     "Signed Out": "Uloskirjautunut",
     "Start authentication": "Aloita tunnistus",
     "Success": "Onnistui",
     "The phone number entered looks invalid": "Syötetty puhelinnumero näyttää virheelliseltä",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Syöttämäsi allekirjoitusavain vastaa käyttäjän %(userId)s laitteelta %(deviceId)s saamaasi allekirjoitusavainta. Laite on merkitty varmennetuksi.",
     "Unable to add email address": "Sähköpostiosoitteen lisääminen epäonnistui",
     "Unable to remove contact information": "Yhteystietojen poistaminen epäonnistui",
     "Unable to verify email address.": "Sähköpostin vahvistaminen epäonnistui.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
     "Unable to capture screen": "Ruudun kaappaus epäonnistui",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
-    "Unable to load device list": "Laitelistan lataaminen epäonnistui",
     "Uploading %(filename)s and %(count)s others|other": "Ladataan %(filename)s ja %(count)s muuta",
     "Upload Failed": "Lataus epäonnistui",
     "Upload file": "Lataa tiedosto",
@@ -376,10 +342,8 @@
     "Use compact timeline layout": "Käytä tiivistä aikajanaa",
     "User ID": "Käyttäjätunnus",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s vaihtoi aiheeksi \"%(topic)s\".",
-    "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.": "Salasanan muuttaminen nollaa myös osapuolten välisen salauksen avaimet kaikilla laitteilla. Tällöin vanhojen viestien lukeminen ei ole enää mahdollista, ellet ensin tallenna huoneavaimia ja tuo niitä takaisin jälkeenpäin. Tähän tulee tulevaisuudessa parannusta.",
     "Define the power level of a user": "Määritä käyttäjän oikeustaso",
     "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ei ole kelvollinen muoto aliakselle",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ole hyvä ja tarkista sähköpostisi ja seuraa sen sisältämää linkkiä. Kun olet valmis, paina jatka.",
     "Power level must be positive integer.": "Oikeustason pitää olla positiivinen kokonaisluku.",
     "Server may be unavailable, overloaded, or search timed out :(": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai haku kesti liian kauan :(",
@@ -393,10 +357,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oikeustaso %(powerLevelNumber)s)",
     "Verification Pending": "Varmennus odottaa",
     "(could not connect media)": "(mediaa ei voitu yhdistää)",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "VAROITUS: Laite on jo varmennettu mutta avaimet eivät vastaa toisiaan!",
-    "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!": "VAROITUS: AVAIMEN VARMENNUS EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s allekirjoitusavain on \"%(fprint)s\" joka ei vastaa annettua avainta \"%(fingerprint)s\". Tämä saattaa tarkoittaa että viestintäsi siepataan!",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Salasanan vaihtaminen onnistui. Et saa push-ilmoituksia muilla laitteilla ennen kuin kirjaudut niihin takaisin",
     "You seem to be in a call, are you sure you want to quit?": "Sinulla näyttää olevan puhelu kesken. Haluatko varmasti lopettaa?",
     "You seem to be uploading files, are you sure you want to quit?": "Näytät lataavan tiedostoja. Oletko varma että haluat lopettaa?",
     "Jan": "tammi",
@@ -412,9 +373,6 @@
     "Nov": "marras",
     "Dec": "joulu",
     "To continue, please enter your password.": "Ole hyvä ja syötä salasanasi jatkaaksesi.",
-    "Verifies a user, device, and pubkey tuple": "Varmentaa käyttäjän, laitteen ja julkisen avaimen kolmikon",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" sisältä laitteita joita et ole nähnyt aikaisemmin.",
-    "Unknown devices": "Tuntemattomia laitteita",
     "Unknown Address": "Tuntematon osoite",
     "Unverify": "Kumoa varmennus",
     "Verify...": "Varmenna...",
@@ -445,10 +403,7 @@
     "Start verification": "Aloita varmennus",
     "Share without verifying": "Jaa ilman varmennusta",
     "Ignore request": "Jätä pyyntö huomioimatta",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Lisäsit laitteen '%(displayName)s' joka pyytää salausavaimia.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Sinun varmentamaton laitteesi '%(displayName)s' pyytää salausavaimia.",
     "Encryption key request": "Salausavainpyyntö",
-    "Loading device info...": "Ladataan laitetiedot...",
     "Example": "Esimerkki",
     "Create": "Luo",
     "Failed to upload image": "Kuvan lataaminen epäonnistui",
@@ -611,7 +566,6 @@
     "Notify the whole room": "Ilmoita koko huoneelle",
     "Room Notification": "Huoneilmoitus",
     "Call Failed": "Puhelu epäonnistui",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Huoneessa on tuntemattomia laitteita: jos jatkat varmentamatta niitä, joku voi kuunnella puheluasi.",
     "Review Devices": "Näytä laitteet",
     "Call Anyway": "Soita silti",
     "Answer Anyway": "Vastaa silti",
@@ -629,8 +583,6 @@
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisäsi pienoisohjelman %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s poisti pienoisohjelman %(widgetName)s",
     "Send": "Lähetä",
-    "Delete %(count)s devices|other": "Poista %(count)s laitetta",
-    "Delete %(count)s devices|one": "Poista laite",
     "Ongoing conference call%(supportedText)s.": "Menossa oleva ryhmäpuhelu %(supportedText)s.",
     "%(duration)ss": "%(duration)s s",
     "%(duration)sm": "%(duration)s m",
@@ -707,8 +659,6 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s vaihtoi profiilikuvansa",
     "%(items)s and %(count)s others|other": "%(items)s ja %(count)s muuta",
     "%(items)s and %(count)s others|one": "%(items)s ja yksi muu",
-    "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:": "Varmistaaksesi, että tähän laitteeseen voidaan luottaa, ota yhteyttä laitteen haltijaan jollain muulla tavalla (esim. kasvotusten tai puhelimitse) ja pyydä häntä varmistamaan, että hänen laitteensa käyttäjäasetuksissa näkyy sama avain kuin alla:",
-    "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.": "Jos avain täsmää, valitse painike alla. Jos avain ei täsmää, niin joku muu salakuuntelee laitetta ja haluat todennäköisesti painaa estopainiketta.",
     "Old cryptography data detected": "Vanhaa salaustietoa havaittu",
     "Warning": "Varoitus",
     "Access Token:": "Pääsykoodi:",
@@ -758,7 +708,6 @@
     "Resend": "Lähetä uudelleen",
     "Collecting app version information": "Haetaan sovelluksen versiotietoja",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Poista huonealias  %(alias)s ja poista %(name)s luettelosta?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tämä antaa sinun palata tilillesi uloskirjautumisen jälkeen sekä kirjautua muilla laitteilla.",
     "Keywords": "Avainsanat",
     "Enable notifications for this account": "Ota käyttöön ilmoitukset tälle tilille",
     "Invite to this community": "Kutsu tähän yhteisöön",
@@ -935,7 +884,6 @@
     "Book": "Kirja",
     "Pencil": "Lyijykynä",
     "Paperclip": "Klemmari",
-    "Padlock": "Riippulukko",
     "Key": "Avain",
     "Hammer": "Vasara",
     "Telephone": "Puhelin",
@@ -971,8 +919,6 @@
     "Go back": "Takaisin",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Luo yhteisö tuodaksesi yhteen käyttäjät ja huoneet! Luo mukautettu kotisivu rajataksesi paikkasi Matrix-universumissa.",
     "Room avatar": "Huoneen kuva",
-    "Upload room avatar": "Lähetä huoneen kuva",
-    "No room avatar": "Huoneella ei ole kuvaa",
     "Main address": "Pääosoite",
     "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.": "Kun joku asettaa osoitteen linkiksi viestiinsä, URL-esikatselu voi näyttää tietoja linkistä kuten otsikon, kuvauksen ja kuvan verkkosivulta.",
     "Link to most recent message": "Linkitä viimeisimpään viestiin",
@@ -988,7 +934,6 @@
     "Hide Stickers": "Piilota tarrat",
     "Show Stickers": "Näytä tarrat",
     "Profile picture": "Profiilikuva",
-    "Upload profile picture": "Lataa profiilikuva palvelimelle",
     "Set a new account password...": "Aseta uusi salasana tilille...",
     "Set a new status...": "Aseta uusi tila...",
     "Not sure of your password? <a>Set a new one</a>": "Etkö ole varma salasanastasi? <a>Aseta uusi salasana</a>",
@@ -1090,10 +1035,8 @@
     "Email Address": "Sähköpostiosoite",
     "Yes": "Kyllä",
     "No": "Ei",
-    "Your homeserver does not support device management.": "Kotipalvelimesi ei tue laitehallintaa.",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Auta parantamaan Riot.im:ää lähettämällä <UsageDataLink>käyttötietoja anonyymisti</UsageDataLink>. Tämä vaatii toimiakseen evästeen (lue <PolicyLink>evästekäytäntö</PolicyLink>).",
     "Elephant": "Norsu",
-    "This device is backing up your keys. ": "Tämä laite on varmuuskopioimassa avaimiasi. ",
     "Add an email address to configure email notifications": "Lisää sähköpostiosoite määrittääksesi sähköposti-ilmoitukset",
     "Chat with Riot Bot": "Keskustele Riot-botin kanssa",
     "You'll lose access to your encrypted messages": "Menetät pääsyn salattuihin viesteihisi",
@@ -1173,17 +1116,8 @@
     "Back up your keys before signing out to avoid losing them.": "Varmuuskopioi avaimesi ennen kuin kirjaudut ulos välttääksesi avainten menetyksen.",
     "Backing up %(sessionsRemaining)s keys...": "Varmuuskopioidaan %(sessionsRemaining)s avainta…",
     "All keys backed up": "Kaikki avaimet on varmuuskopioitu",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Varmuuskopiossa on allekirjoitus <verify>tuntemattomasta</verify> laitteesta ID:llä %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "Varmuuskopiossa on <validity>pätevä</validity> allekirjoitus tästä laitteesta",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Varmuuskopiossa on <validity>pätevä</validity> allekirjoitus <verify>varmennetusta</verify> laitteesta <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Varmuuskopiossa on <validity>pätevä</validity> allekirjoitus <verify>varmentamattomasta</verify> laitteesta <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmennetusta</verify> laitteesta <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmentamattomasta</verify> laitteesta <device></device>",
-    "Backup is not signed by any of your devices": "Yksikään laitteistasi ei ole allekirjoittanut varmuuskopiota",
-    "This backup is trusted because it has been restored on this device": "Tämä varmuuskopio on luotettu, koska se on palautettu tähän laitteeseen",
     "Backup version: ": "Varmuuskopion versio: ",
     "Algorithm: ": "Algoritmi: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Avaimesi <b>eivät ole varmuuskopioituna tästä laitteesta</b>.",
     "Start using Key Backup": "Aloita avainvarmuuskopion käyttö",
     "Unable to verify phone number.": "Puhelinnumeron vahvistaminen epäonnistui.",
     "Verification code": "Varmennuskoodi",
@@ -1200,7 +1134,6 @@
     "Key backup": "Avainvarmuuskopio",
     "Missing media permissions, click the button below to request.": "Mediaoikeuksia puuttuu. Klikkaa painikkeesta pyytääksesi oikeuksia.",
     "Request media permissions": "Pyydä mediaoikeuksia",
-    "Some devices for this user are not trusted": "Jotkut tämän käyttäjän laitteista eivät ole luotettuja",
     "Manually export keys": "Vie avaimet käsin",
     "Share User": "Jaa käyttäjä",
     "Share Community": "Jaa yhteisö",
@@ -1216,7 +1149,6 @@
     "Show avatars in user and room mentions": "Näytä profiilikuvat käyttäjä- ja huonemaininnoissa",
     "Order rooms in the room list by most important first instead of most recent": "Järjestä huonelista tärkein ensin viimeisimmän sijasta",
     "Got It": "Ymmärretty",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Parhaan turvallisuuden takaamiseksi suosittelemme, että teet tämän kasvotusten tai muun luotetun viestintäkeinon avulla.",
     "Scissors": "Sakset",
     "Which officially provided instance you are using, if any": "Mitä virallisesti saatavilla olevaa instanssia käytät, jos mitään",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s. %(monthName)s %(fullYear)s",
@@ -1227,27 +1159,12 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s otti käyttöön tyylin ryhmälle %(newGroups)s ja poisti käytöstä tyylin ryhmältä %(oldGroups)s tässä huoneessa.",
     "Enable widget screenshots on supported widgets": "Ota sovelmien kuvankaappaukset käyttöön tuetuissa sovelmissa",
     "Legal": "Lakitekstit",
-    "Some devices in this encrypted room are not trusted": "Jotkut laitteet tässä salatussa huoneessa eivät ole luotettuja",
-    "All devices for this user are trusted": "Kaikki tämän käyttäjän laitteista ovat luotettuja",
-    "All devices in this encrypted room are trusted": "Kaikki laitteet tässä salatussa huoneessa ovat luotettuja",
     "This event could not be displayed": "Tätä tapahtumaa ei voitu näyttää",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Avaimen jakopyyntösi on lähetetty. Tarkista muut laitteesi avaimen jakopyyntöä varten.",
-    "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.": "Avaimen jakopyynnöt lähetetään automaattisesti muihin laitteisiin. Jos olet hylännyt tai jättänyt huomiotta avaimen jakopyynönn toisella laitteellasi, klikkaa tästä pyytääksesi avaimia tälle istunnolle uudestaan.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Jos muut laitteesi eivät sisällä avainta tälle viestille, et pysty purkamaan viestin salausta.",
     "Key request sent.": "Avainpyyntö lähetetty.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Pyydä uudelleen salausavaimia</requestLink> muilta laitteiltasi.",
     "Demote yourself?": "Alenna itsesi?",
     "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.": "Et voi perua tätä muutosta, koska olet alentamassa itseäsi. Jos olet viimeinen oikeutettu henkilö tässä huoneessa, oikeuksia ei voi enää saada takaisin.",
     "Demote": "Alenna",
-    "deleted": "poistettu",
-    "underlined": "alleviivattu",
-    "inline-code": "koodinpätkä",
-    "block-quote": "lainaus",
-    "bulleted-list": "lista",
-    "numbered-list": "numeroitu lista",
     "This room has been replaced and is no longer active.": "Tämä huone on korvattu, eikä se ole enää aktiivinen.",
-    "Unable to reply": "Vastaaminen on mahdotonta",
-    "At this time it is not possible to reply with an emote.": "Emojilla vastaaminen ei ole nyt mahdollista.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) näki %(dateTime)s",
     "Replying": "Vastataan",
     "System Alerts": "Järjestelmähälytykset",
@@ -1318,7 +1235,6 @@
     "Waiting for %(userId)s to confirm...": "Odotetaan, että %(userId)s hyväksyy...",
     "Use two-way text verification": "Käytä kahdensuuntaista tekstivarmennusta",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Varmenna tämä käyttäjä merkitäksesi hänet luotetuksi. Käyttäjiin luottaminen antaa sinulle ylimääräistä mielenrauhaa käyttäessäsi osapuolten välistä salausta.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Tämän käyttäjän varmentaminen merkitsee hänen laitteensa luotetuksi sekä merkitsee sinun laitteesi luotetuksi hänelle.",
     "Waiting for partner to confirm...": "Odotetaan, että toinen osapuoli varmistaa...",
     "Incoming Verification Request": "Saapuva varmennuspyyntö",
     "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.": "Olet aikaisemmin käytttänyt Riotia laitteella %(host)s, jossa oli jäsenten laiska lataus käytössä. Tässä versiossa laiska lataus on pois käytöstä. Koska paikallinen välimuisti ei ole yhteensopiva näiden kahden asetuksen välillä, Riotin täytyy synkronoida tilisi tiedot uudelleen.",
@@ -1333,8 +1249,6 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Selaimen varaston tyhjentäminen saattaa korjata ongelman, mutta kirjaa sinut samalla ulos ja estää sinua lukemasta salattuja keskusteluita.",
     "A username can only contain lower case letters, numbers and '=_-./'": "Käyttäjätunnus voi sisältää vain pieniä kirjaimia, numeroita ja merkkejä ”=_-./”",
     "COPY": "Kopioi",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Estät tällä hetkellä varmentamattomia laitteita; jotta voit lähettää viestejä näihin laitteisiin, sinun täytyy varmentaa ne.",
-    "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.": "Suosittelemme, että käyt varmennusprosessin läpi jokaisella laitteella varmistaaksesi, että ne kuuluvat oikeille omistajilleen, mutta voit lähettää viestin uudelleen varmentamatta, jos niin haluat.",
     "Unable to load backup status": "Varmuuskopioinnin tilan lataaminen epäonnistui",
     "Recovery Key Mismatch": "Palautusavaimet eivät täsmää",
     "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Varmuuskopiota ei voitu purkaa tällä avaimella. Tarkastathan, että syötit oikean palautusavaimen.",
@@ -1347,7 +1261,6 @@
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautuksen salalauseesi.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jos olet unohtanut palautuksen salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>ottaa käyttöön uuden palautustavan</button2>",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautusavaimesi.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Jos olet unohtanut palautuksen salalauseesi, voit <button>ottaa käyttöön uuden palautustavan</button>",
     "Share Permalink": "Jaa ikilinkki",
     "Collapse Reply Thread": "Supista vastaussäie",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi toiselle Matrix-palvelimelle. Tämä sallii tämän sovelluksen käytön toisella kotipalvelimella olevalla Matrix-tilillä.",
@@ -1383,7 +1296,6 @@
     "Review terms and conditions": "Lue käyttöehdot",
     "Did you know: you can use communities to filter your Riot.im experience!": "Tiesitkö: voit käyttää yhteisöjä suodattaaksesi Riot.im-kokemustasi!",
     "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.": "Asettaaksesi suodattimen, vedä yhteisön kuva vasemmalla olevan suodatinpaneelin päälle. Voit klikata suodatinpaneelissa olevaa yhteisön kuvaa, jotta näet vain huoneet ja henkilöt, jotka liittyvät kyseiseen yhteisöön.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Näytä laitteet</showDevicesText>, <sendAnywayText>lähetä silti</sendAnywayText> tai <cancelText>peruuta</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Et voi lähettää viestejä ennen kuin luet ja hyväksyt <consentLink>käyttöehtomme</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.": "Viestiäsi ei lähetetty, koska tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajan. <a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttämistä.",
     "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.": "Viestiäsi ei lähetetty, koska tämä kotipalvelin on ylittänyt resurssirajan. <a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttämistä.",
@@ -1391,7 +1303,6 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Lähetä viesti uudelleen</resendText> tai <cancelText>peruuta viesti</cancelText>.",
     "Could not load user profile": "Käyttäjäprofiilia ei voitu ladata",
     "Your Matrix account on %(serverName)s": "Matrix-tilisi palvelimella %(serverName)s",
-    "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.": "Olet kirjautunut ulos kaikista laitteista etkä enää saa push-ilmoituksia. Laittaaksesi ilmoitukset uudestaan päälle, kirjaudu uudelleen kullekin laitteelle.",
     "General failure": "Yleinen virhe",
     "This homeserver does not support login using email address.": "Tämä kotipalvelin ei tue sähköpostiosoitteella kirjautumista.",
     "Please <a>contact your service administrator</a> to continue using this service.": "<a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttöä.",
@@ -1413,17 +1324,11 @@
     "Your keys are being backed up (the first backup could take a few minutes).": "Avaimiasi varmuuskopioidaan (ensimmäinen varmuuskopio voi viedä muutaman minuutin).",
     "Unable to create key backup": "Avaimen varmuuskopiota ei voi luoda",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ottaaksesi käyttöön uuden salasanasi, seuraa ohjeita sinulle lähetettävässä vahvistussähköpostissa.",
-    "Room upgrade confirmation": "Huoneen päivitysvarmistus",
-    "Upgrading a room can be destructive and isn't always necessary.": "Huoneen päivittäminen saattaa tuhota jotain, eikä se aina ole tarpeellista.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Huonepäivityksiä suositellaan yleensä silloin, kun huoneen versio katsotaan <i>epävakaaksi</i>. Epävakaissa versioissa saattaa olla virheitä, puuttuvia ominaisuuksia tai tietoturvahaavoittuvuuksia.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Huonepäivitykset yleensä vaikuttavat vain huoneen <i>palvelinpuolen</i> käsittelyyn. Jos sinulla on ongelmia Riot-asiakasohjelmasi kanssa, tee virheilmoitus osoitteessa <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varoitus</b>: huoneen päivittäminen <i>ei automaattisesti siirrä huoneen jäseniä huoneen uuteen versioon.</i> Liitämme vanhaan huoneeseen linkin, joka osoittaa uuteen, päivitettyyn huoneeseen. Huoneen jäsenten täytyy klikata linkkiä liittyäkseen uuteen huoneeseen.",
     "Adds a custom widget by URL to the room": "Lisää huoneeseen määritetyssä osoitteessa olevan sovelman",
     "Please supply a https:// or http:// widget URL": "Lisää sovelman osoitteen alkuun https:// tai http://",
     "You cannot modify widgets in this room.": "Et voi muokata tämän huoneen sovelmia.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s kumosi henkilön %(targetDisplayName)s kutsun liittyä tähän huoneeseen.",
-    "Enable desktop notifications for this device": "Ota käyttöön työpöytäilmoitukset tälle laitteelle",
-    "Enable audible notifications for this device": "Ota käyttöön ääntä toistavat ilmoitukset tälle laitteelle",
     "Upgrade this room to the recommended room version": "Päivitä tämä huone suositeltuun huoneversioon",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Tämä huone pyörii versiolla <roomVersion />, jonka tämä kotipalvelin on merkannut <i>epävakaaksi</i>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Huoneen päivittäminen sulkee huoneen nykyisen instanssin ja luo päivitetyn huoneen samalla nimellä.",
@@ -1443,7 +1348,6 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Sinulla on %(count)s lukematonta ilmoitusta huoneen edellisessä versiossa.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sinulla on %(count)s lukematon ilmoitus huoneen edellisessä versiossa.",
     "Clear filter": "Tyhjennä suodatin",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Salasanan vaihtaminen nollaa osapuolten välisen salauksen avaimet kaikilla laitteillasi, estäen sinua lukemasta keskusteluhistoriaasi. Ota käyttöön avainvarmuuskopio tai ota talteen huoneavaimesi toiselta laitteelta ennen kuin palautat salasanasi.",
     "Sign in instead": "Kirjaudu sisään",
     "Your password has been reset.": "Salasanasi on nollattu.",
     "Invalid homeserver discovery response": "Epäkelpo kotipalvelimen etsinnän vastaus",
@@ -1456,11 +1360,7 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Voit käyttää sitä turvaverkkona palauttaaksesi salatun keskusteluhistoriasi, mikäli unohdat palautuksen salalauseesi.",
     "As a safety net, you can use it to restore your encrypted message history.": "Voit käyttää sitä turvaverkkona palauttaaksesi salatun keskusteluhistoriasi.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Palautusavaimesi on turvaverkko – voit käyttää sitä palauttaaksesi pääsyn salattuihin viesteihisi, mikäli unohdat salalauseesi.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Pidä palautusavaimesi jossain hyvin turvallisessa paikassa, kuten salasananhallintasovelluksessa (tai kassakaapissa)",
     "Your Recovery Key": "Palautusavaimesi",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Palautusavaimesi on <b>kopioitu leikepöydälle</b>, liitä se:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Palautusavaimesi on <b>Lataukset</b>-kansiossasi.",
-    "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.": "Mikäli et ota käyttöön salattujen viestien palautusta, et voi palauttaa salattua keskusteluhistoriaasi, jos kirjaudut ulos tai käytät toista laitetta.",
     "Set up Secure Message Recovery": "Ota käyttöön salattujen viestien palautus",
     "Secure your backup with a passphrase": "Turvaa varmuuskopiosi salalauseella",
     "Confirm your passphrase": "Varmista salalauseesi",
@@ -1471,24 +1371,18 @@
     "New Recovery Method": "Uusi palautustapa",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Uusi palautuksen salalause ja avain salatuille viesteille on löydetty.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jos et ottanut käyttöön uutta palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
-    "This device is encrypting history using the new recovery method.": "Tämä laite salaa historian käyttäen uutta palautustapaa.",
     "Set up Secure Messages": "Ota käyttöön salatut viestit",
     "Recovery Method Removed": "Palautustapa poistettu",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tämä laite on huomannut, että palautuksen salalauseesi ja avaimesi salatuille viesteille on poistettu.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Jos teit tämän vahingossa, voit ottaa käyttöön salatut viestit tälle laitteelle, mikä uudelleensalaa tämän laitteen keskusteluhistorian uudella palautustavalla.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jos et poistanut palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Käytätkö 'leivänmuruja' (kuvia huonelistan yläpuolella) vai et",
     "Replying With Files": "Tiedostoilla vastaaminen",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Tiedostolla vastaaminen ei onnistu tällä erää. Haluatko ladata tiedoston vastaamatta?",
     "The file '%(fileName)s' failed to upload.": "Tiedoston '%(fileName)s' lataaminen ei onnistunut.",
     "The server does not support the room version specified.": "Palvelin ei tue määritettyä huoneversiota.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Vahvista, että haluat päivittää huoneen versiosta <oldVersion /> versioon <newVersion />.",
     "Changes your avatar in this current room only": "Vaihtaa kuvasi vain nykyisessä huoneessa",
     "Sends the given message coloured as a rainbow": "Lähettää viestin sateenkaaren väreissä",
     "Sends the given emote coloured as a rainbow": "Lähettää emoten sateenkaaren väreissä",
     "The user's homeserver does not support the version of the room.": "Käyttäjän kotipalvelin ei tue huoneen versiota.",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Tämä laite <b>ei varmuuskopioi avaimiasi</b>, mutta sinulla on olemassa varmuuskopio palauttamista ja lisäämistä varten.",
-    "Backup has an <validity>invalid</validity> signature from this device": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tältä laitteelta",
     "this room": "tämä huone",
     "View older messages in %(roomName)s.": "Näytä vanhemmat viestit huoneessa %(roomName)s.",
     "Joining room …": "Liitytään huoneeseen …",
@@ -1545,13 +1439,11 @@
     "Identity server URL does not appear to be a valid identity server": "Identiteettipalvelimen osoite ei näytä olevan kelvollinen identiteettipalvelin",
     "A conference call could not be started because the integrations server is not available": "Konferenssipuhelua ei voitu aloittaa, koska integraatiopalvelin ei ole käytettävissä",
     "When rooms are upgraded": "Kun huoneet päivitetään",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Yhdistä tämä laite avainten varmuuskopiointiin ennen kuin kirjaudut ulos, jotta et menetä mahdollisia vain tällä laitteella olevia avaimia.",
     "Rejecting invite …": "Hylätään kutsua …",
     "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s poisti sinut huoneesta %(roomName)s",
     "edited": "muokattu",
     "To help us prevent this in future, please <a>send us logs</a>.": "Voit auttaa meitä estämään tämän toistumisen <a>lähettämällä meille lokeja</a>.",
     "Name or Matrix ID": "Nimi tai Matrix-tunnus",
-    "Email, name or Matrix ID": "Sähköposti, nimi tai Matrix-tunnus",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Tiedosto on <b>liian iso</b> ladattavaksi. Tiedostojen kokoraja on %(limit)s mutta tämä tiedosto on %(sizeOfThisFile)s.",
     "Unbans user with given ID": "Poistaa porttikiellon tunnuksen mukaiselta käyttäjältä",
     "No homeserver URL provided": "Kotipalvelimen osoite puuttuu",
@@ -1559,7 +1451,6 @@
     "Edit message": "Muokkaa viestiä",
     "Sign in to your Matrix account on <underlinedServerName />": "Kirjaudu Matrix-tilillesi palvelimella <underlinedServerName />",
     "Show hidden events in timeline": "Näytä piilotetut tapahtumat aikajanalla",
-    "Connect this device to Key Backup": "Yhdistä tämä laite avainten varmuuskopiointiin",
     "GitHub issue": "GitHub-issue",
     "Notes": "Huomautukset",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Sisällytä tähän lisätiedot, joista voi olla apua ongelman analysoinnissa, kuten mitä olit tekemässä, huoneen tunnukset, käyttäjätunnukset, jne.",
@@ -1606,7 +1497,6 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s eivät tehneet muutoksia",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s ei tehnyt muutoksia %(count)s kertaa",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s ei tehnyt muutoksia",
-    "Clear all data on this device?": "Poista kaikki tiedot tältä laitteelta?",
     "Your homeserver doesn't seem to support this feature.": "Kotipalvelimesi ei näytä tukevan tätä ominaisuutta.",
     "Resend edit": "Lähetä muokkaus uudelleen",
     "Resend %(unsentCount)s reaction(s)": "Lähetä %(unsentCount)s reaktio(ta) uudelleen",
@@ -1615,16 +1505,13 @@
     "Clear all data": "Poista kaikki tiedot",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Kerro mikä meni pieleen, tai, mikä parempaa, luo GitHub-issue joka kuvailee ongelman.",
     "Removing…": "Poistetaan…",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Kaikkien tietojen poistaminen tältä laitteelta on peruuttamatonta. Salatut viestit menetetään, ellei niiden avaimia ole varmuuskopioitu.",
     "Failed to re-authenticate due to a homeserver problem": "Uudelleenautentikointi epäonnistui kotipalvelinongelmasta johtuen",
     "Failed to re-authenticate": "Uudelleenautentikointi epäonnistui",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Pääse takaisin tilillesi ja palauta tälle laitteelle tallennetut salausavaimet. Ilman niitä et voi lukea kaikkia salattuja viestejäsi kaikilla laitteilla.",
     "Enter your password to sign in and regain access to your account.": "Syötä salasanasi kirjautuaksesi ja päästäksesi takaisin tilillesi.",
     "Forgotten your password?": "Unohditko salasanasi?",
     "Sign in and regain access to your account.": "Kirjaudu ja pääse takaisin tilillesi.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Et voi kirjautua tilillesi. Ota yhteyttä kotipalvelimesi ylläpitäjään saadaksesi lisätietoja.",
     "Clear personal data": "Poista henkilökohtaiset tiedot",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Varoitus: Henkilökohtaisia tietojasi (mukaan lukien salausavaimia) on edelleen tallennettuna tällä laitteella. Poista ne, jos et aio enää käyttää tätä laitetta, tai haluat kirjautua toiselle tilille.",
     "Identity Server": "Identiteettipalvelin",
     "Find others by phone or email": "Löydä muita käyttäjiä puhelimen tai sähköpostin perusteella",
     "Be found by phone or email": "Varmista, että sinut löydetään puhelimen tai sähköpostin perusteella",
@@ -1632,7 +1519,6 @@
     "Terms of Service": "Käyttöehdot (Terms of Service)",
     "Service": "Palvelu",
     "Summary": "Yhteenveto",
-    "Failed to start chat": "Keskustelun aloittaminen ei onnistunut",
     "Messages": "Viestit",
     "Actions": "Toiminnot",
     "Displays list of commands with usages and descriptions": "Näyttää luettelon komennoista käyttötavoin ja kuvauksin",
@@ -1667,7 +1553,6 @@
     "Enter a new identity server": "Syötä uusi identiteettipalvelin",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Hyväksy identiteettipalvelimen (%(serverName)s) käyttöehdot (Terms of Service), jotta sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.",
     "Deactivate account": "Deaktivoi tili",
-    "A device's public name is visible to people you communicate with": "Laitteen julkinen nimi näkyy käyttäjille, joiden kanssa olet yhteydessä",
     "Remove %(email)s?": "Poista %(email)s?",
     "Remove %(phone)s?": "Poista %(phone)s?",
     "Command Help": "Komento-ohje",
@@ -1834,10 +1719,7 @@
     "Use an identity server to invite by email. Manage in Settings.": "Voit käyttää identiteettipalvelinta sähköpostikutsujen lähettämiseen.",
     "Multiple integration managers": "Useita integraatiolähteitä",
     "Try out new ways to ignore people (experimental)": "Kokeile uusia tapoja käyttäjien huomiotta jättämiseen (kokeellinen)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Lähetä varmennuspyynnöt suoralla viestillä. Tämä sisältää uuden varmennuskäyttöliittymän jäsenpaneelissa.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Ota käyttöön ristivarmennus, jolla varmennat käyttäjän, jokaisen käyttäjän laitteen sijaan (kehitysversio)",
     "Enable local event indexing and E2EE search (requires restart)": "Ota käyttöön paikallinen tapahtumaindeksointi ja paikallinen haku salatuista viesteistä (vaatii uudelleenlatauksen)",
-    "Use the new, faster, composer for writing messages": "Käytä uutta, nopeampaa kirjoitinta viestien kirjoittamiseen",
     "Match system theme": "Käytä järjestelmän teemaa",
     "Decline (%(counter)s)": "Hylkää (%(counter)s)",
     "Connecting to integration manager...": "Yhdistetään integraatioiden lähteeseen...",
@@ -1881,10 +1763,6 @@
     "Failed to connect to integration manager": "Yhdistäminen integraatioiden lähteeseen epäonnistui",
     "Trusted": "Luotettu",
     "Not trusted": "Epäluotettu",
-    "Hide verified Sign-In's": "Piilota varmennetut tunnukset",
-    "%(count)s verified Sign-In's|other": "%(count)s varmennettua tunnusta",
-    "%(count)s verified Sign-In's|one": "1 varmennettu tunnus",
-    "Unverify user": "Poista käyttäjän varmennus",
     "This client does not support end-to-end encryption.": "Tämä asiakasohjelma ei tue osapuolten välistä salausta.",
     "Messages in this room are not end-to-end encrypted.": "Tämän huoneen viestit eivät ole salattuja.",
     "Messages in this room are end-to-end encrypted.": "Tämän huoneen viestit ovat salattuja.",
@@ -1904,7 +1782,6 @@
     "More options": "Lisää asetuksia",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Käytä identiteettipalvelinta kutsuaksesi henkilöitä sähköpostilla. <default>Käytä oletusta (%(defaultIdentityServerName)s)</default> tai aseta toinen palvelin <settings>asetuksissa</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Käytä identiteettipalvelinta kutsuaksesi käyttäjiä sähköpostilla. Voit vaihtaa identiteettipalvelimen <settings>asetuksissa</settings>.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Varmistaaksesi, että tähän laitteeseen voidaan luottaa, tarkista, että kyseisen laitteen asetuksissa näkyvä avain täsmää alapuolella olevaan avaimeen:",
     "Integrations are disabled": "Integraatiot ovat pois käytöstä",
     "Enable 'Manage Integrations' in Settings to do this.": "Ota integraatiot käyttöön asetuksista kohdasta ”Hallitse integraatioita”.",
     "Integrations not allowed": "Integraatioiden käyttö on kielletty",
@@ -1926,7 +1803,6 @@
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Muokkaa kokemustasi kokeellisilla laboratio-ominaisuuksia. <a>Tutki vaihtoehtoja</a>.",
     "Error upgrading room": "Virhe päivitettäessä huonetta",
     "Double check that your server supports the room version chosen and try again.": "Tarkista, että palvelimesi tukee valittua huoneversiota ja yritä uudelleen.",
-    "Invite joined members to the new room automatically": "Kutsu huoneen jäsenet liittymään uuteen huoneeseen automaattisesti",
     "Send cross-signing keys to homeserver": "Lähetä ristivarmennuksen tarvitsemat avaimet kotipalvelimelle",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s poisti porttikiellon käyttäjiltä, jotka täsmäsivät sääntöön %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s poisti huoneita estävän säännön %(glob)s",
@@ -1947,11 +1823,9 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutti estosääntöä muodosta %(oldGlob)s muotoon %(newGlob)s. Syy: %(reason)s",
     "The message you are trying to send is too large.": "Lähettämäsi viesti on liian suuri.",
     "Cross-signing and secret storage are enabled.": "Ristivarmennus ja salavarasto on käytössä.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Tunnuksellasi on ristivarmennusidentiteetti salavarastossa, mutta tämä laite ei luota siihen.",
     "Cross-signing and secret storage are not yet set up.": "Ristivarmennusta ja salavarastoa ei ole vielä otettu käyttöön.",
     "Bootstrap cross-signing and secret storage": "Ota käyttöön ristivarmennus ja salavarasto",
     "Cross-signing public keys:": "Ristivarmennuksen julkiset avaimet:",
-    "on device": "laitteella",
     "not found": "ei löydetty",
     "Cross-signing private keys:": "Ristivarmennuksen salaiset avaimet:",
     "in secret storage": "salavarastossa",
@@ -1962,15 +1836,7 @@
     "Backup has a <validity>valid</validity> signature from this user": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a <validity>invalid</validity> signature from this user": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus käyttäjältä, jonka ID on %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus laitteelta, jonka ID on %(deviceId)s",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Vara-avain on tallennettu salavarastoon, mutta salavarasto ei ole käytössä tällä laitteella. Ota käyttöön ristivarmennus Laboratoriosta, jotta voi muokata avainvarmuuskopion tilaa.",
     "Backup key stored: ": "Vara-avain on tallennettu: ",
-    "Start using Key Backup with Secure Secret Storage": "Aloita avainten varmuuskopiointi turvalliseen salavarastoon",
-    "This user has not verified all of their devices.": "Tämä käyttäjä ei ole varmentanut kaikkia laitteitaan.",
-    "You have not verified this user. This user has verified all of their devices.": "Et ole varmentanut tätä käyttäjää. Tämä käyttäjä on varmentanut kaikki laitteensa.",
-    "You have verified this user. This user has verified all of their devices.": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki laitteensa.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Et ole varmentanut osaa tämän salausta käyttävän huoneen käyttäjistä tai he eivät ole varmentaneet omia laitteitaan.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Olet varmentanut kaikki käyttäjät tässä salausta käyttävässä huoneessa ja he ovat varmentaneet omat laitteensa.",
     "This message cannot be decrypted": "Tätä viestiä ei voida avata luettavaksi",
     "Unencrypted": "Suojaamaton",
     "Close preview": "Sulje esikatselu",
@@ -1992,11 +1858,9 @@
     "Enter secret storage passphrase": "Syötä salavaraston salalause",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Salavavaraston avaaminen epäonnistui. Varmista, että syötit oikean salalauseen.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi käyttää salavarastoa vain luotetulta tietokoneelta.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä salalauseesi.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jos olet unohtanut salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>asettaa uusia palautusvaihtoehtoja</button2>.",
     "Enter secret storage recovery key": "Syötä salavaraston palautusavain",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Salavaraston käyttö epäonnistui. Varmista, että syötit oikean palautusavaimen.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Käytä turvattua viestihistoriaasi ja ristivarmennuksen identiteettiäsi muiden laitteiden varmentamiseen syöttämällä palautusavaimesi.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainten varmuuskopiointi käyttöön vain luotetulla tietokoneella.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>",
@@ -2004,27 +1868,17 @@
     "Help": "Ohje",
     "User Status": "Käyttäjän tila",
     "Country Dropdown": "Maapudotusvalikko",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Salavarasto otetaan käyttöön nykyisen avainten varmuuskopiointimenetelmäsi tiedoilla. Salavaraston salalause ja palautusavain tulee olemaan samat kuin ne olivat avainten varmuuskopioinnissasi",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa salavarasto käyttöön vain luotetulla tietokoneella.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Voimme vaihtoehtoisesti tallentaa salavarastoon salatun kopion ristivarmennuksen identiteetistäsi muiden laitteiden varmentamiseen ja lähettääksesi avaimia meidän palvelimelle. Suojaa pääsysi salattuihin viesteihisi pitämällä salalauseesi turvassa.",
     "Set up with a recovery key": "Ota käyttöön palautusavaimella",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihin, jos unohdat salalauseesi.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihisi.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Pidä palautusavaimesi jossain hyvin turvallisessa paikassa, kuten salasananhallintasovelluksessa (tai kassakaapissa).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Palautusavaimesi on <b>kopioitu leikepöydällesi</b>. Liitä se:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Palautusavaimesi on <b>Lataukset</b>-kansiossasi.",
-    "Your access to encrypted messages is now protected.": "Pääsysi salattuihin viesteihisi on nyt turvattu.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Ottamatta käyttöön salavarastoa et voi palauttaa pääsyäsi salattuihin viesteihisi tai ristivarmennuksen identiteettiisi, jos kirjaudut ulos tai käytät toista laitetta.",
-    "Set up secret storage": "Ota salavarasto käyttöön",
-    "Migrate from Key Backup": "Siirrä tiedot vanhasta avainten varmuuskopiointijärjestelmästä",
-    "Secure your encrypted messages with a passphrase": "Turvaa salatut viestisi salalauseella",
     "Storing secrets...": "Tallennetaan salaisuuksia...",
     "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui",
-    "New DM invite dialog (under development)": "Uusi dialogi kutsuille yksityiskeskusteluun (kehitysversio)",
     "Show more": "Näytä lisää",
     "Recent Conversations": "Viimeaikaiset keskustelut",
     "Direct Messages": "Yksityisviestit",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Jos et löydä jotakuta, kysy hänen käyttäjätunnusta, tai anna oma käyttäjätunnuksesi (%(userId)s) tai <a>linkin profiiliisi</a> hänelle.",
     "Go": "Mene",
     "Lock": "Lukko"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index bf5eef02e1..c371846eb3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -16,8 +16,6 @@
     "Failed to change power level": "Échec du changement de rang",
     "Failed to forget room %(errCode)s": "Échec de l'oubli du salon %(errCode)s",
     "Remove": "Supprimer",
-    "bold": "gras",
-    "italic": "italique",
     "Favourite": "Favoris",
     "Notifications": "Notifications",
     "Settings": "Paramètres",
@@ -71,7 +69,6 @@
     "Decryption error": "Erreur de déchiffrement",
     "Deops user with given id": "Retire le rang d’opérateur d’un utilisateur à partir de son identifiant",
     "Device ID": "Identifiant de l'appareil",
-    "Devices": "Appareils",
     "Failed to join room": "Échec de l’inscription au salon",
     "Failed to kick": "Échec de l'expulsion",
     "Failed to leave room": "Échec du départ du salon",
@@ -100,21 +97,17 @@
     "For security, this session has been signed out. Please sign in again.": "Par mesure de sécurité, la session a expiré. Merci de vous authentifier à nouveau.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
     "Hangup": "Raccrocher",
-    "Hide Text Formatting Toolbar": "Cacher la barre de formatage de texte",
     "Historical": "Historique",
     "Homeserver is": "Le serveur d'accueil est",
     "Identity Server is": "Le serveur d'identité est",
     "I have verified my email address": "J’ai vérifié mon adresse e-mail",
     "Import E2E room keys": "Importer les clés de chiffrement de bout en bout",
     "Incorrect verification code": "Code de vérification incorrect",
-    "Invalid alias format": "Format d'alias non valide",
     "Invalid Email Address": "Adresse e-mail non valide",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
-    "Invite new room members": "Inviter de nouveaux membres",
     "Invited": "Invités",
     "Invites": "Invitations",
     "Invites user with given id to current room": "Invite un utilisateur dans le salon actuel à partir de son identifiant",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' n'est pas un format valide pour un alias",
     "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
     "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
@@ -134,16 +127,10 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s a rendu l'historique visible à n'importe qui.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s a rendu l'historique visible à inconnu (%(visibility)s).",
     "Manage Integrations": "Gestion des intégrations",
-    "Markdown is disabled": "Le formatage Markdown est désactivé",
-    "Markdown is enabled": "Le formatage Markdown est activé",
-    "matrix-react-sdk version:": "Version de matrix-react-sdk :",
-    "Message not sent due to unknown devices being present": "Message non envoyé à cause de la présence d’appareils inconnus",
     "Missing room_id in request": "Absence du room_id dans la requête",
     "Missing user_id in request": "Absence du user_id dans la requête",
     "Moderator": "Modérateur",
     "Name": "Nom",
-    "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés depuis cet appareil",
-    "Never send encrypted messages to unverified devices in this room from this device": "Ne jamais envoyer de message chiffré aux appareils non vérifiés dans ce salon depuis cet appareil",
     "New address (e.g. #foo:%(localDomain)s)": "Nouvelle adresse (par ex. #foo:%(localDomain)s)",
     "New passwords don't match": "Les mots de passe ne correspondent pas",
     "New passwords must match each other.": "Les nouveaux mots de passe doivent être identiques.",
@@ -152,7 +139,6 @@
     "(not supported by this browser)": "(non supporté par ce navigateur)",
     "<not supported>": "<non supporté>",
     "NOT verified": "NON vérifié",
-    "No devices with registered encryption keys": "Pas d’appareil avec des clés de chiffrement enregistrées",
     "No more results": "Fin des résultats",
     "No results": "Pas de résultat",
     "unknown error code": "code d’erreur inconnu",
@@ -160,11 +146,9 @@
     "Only people who have been invited": "Seules les personnes ayant été invitées",
     "Password": "Mot de passe",
     "Passwords can't be empty": "Le mot de passe ne peut pas être vide",
-    "People": "Personnes",
     "Permissions": "Permissions",
     "Phone": "Numéro de téléphone",
     "Operation failed": "L'opération a échoué",
-    "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.": "Pour le moment, changer le mot de passe réinitialise les clés de chiffrement sur tous les appareils, rendant l’historique des discussions chiffrées illisible, à moins d’exporter d'abord les clés de salon puis de les ré-importer. Ceci sera amélioré prochainement.",
     "Default": "Par défaut",
     "Email address": "Adresse e-mail",
     "Error decrypting attachment": "Erreur lors du déchiffrement de la pièce jointe",
@@ -195,8 +179,6 @@
     "Search": "Rechercher",
     "Search failed": "Échec de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
-    "Sender device information": "Informations de l'appareil de l'expéditeur",
-    "Send Invites": "Envoyer des invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
@@ -214,7 +196,6 @@
     "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.",
     "Someone": "Quelqu'un",
     "Start a chat": "Commencer une discussion",
-    "Start Chat": "Commencer une discussion",
     "Submit": "Soumettre",
     "Success": "Succès",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
@@ -229,7 +210,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et défilez avec la touche Tab.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s).",
     "Unable to add email address": "Impossible d'ajouter l'adresse e-mail",
     "Unable to remove contact information": "Impossible de supprimer les informations du contact",
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
@@ -237,7 +217,6 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
     "Unable to capture screen": "Impossible de capturer l'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
-    "Unable to load device list": "Impossible de charger la liste des appareils",
     "unencrypted": "non chiffré",
     "unknown device": "appareil inconnu",
     "Unknown room %(roomId)s": "Salon inconnu %(roomId)s",
@@ -259,7 +238,6 @@
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
-    "Who would you like to communicate with?": "Avec qui voulez-vous communiquer ?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
@@ -269,7 +247,6 @@
     "You need to be able to invite users to do that.": "Vous devez être capable d’inviter des utilisateurs pour faire ça.",
     "You need to be logged in.": "Vous devez être identifié.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas être associée à un identifiant Matrix sur ce serveur d'accueil.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Votre mot de passe a été mis à jour avec succès. Vous ne recevrez plus de notification sur vos autres appareils jusqu’à ce que vous vous identifiez à nouveau",
     "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, voulez-vous vraiment partir ?",
     "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train d'envoyer des fichiers, voulez-vous vraiment partir ?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.",
@@ -330,18 +307,9 @@
     "Unknown error": "Erreur inconnue",
     "Incorrect password": "Mot de passe incorrect",
     "To continue, please enter your password.": "Pour continuer, veuillez saisir votre mot de passe.",
-    "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:": "Pour vérifier que vous pouvez faire confiance à cet appareil, merci de contacter son propriétaire par un autre moyen (par ex. en personne ou par téléphone) et demandez lui si la clé qu’il/elle voit dans ses Paramètres Utilisateur pour cet appareil correspond à la clé ci-dessous :",
-    "Device name": "Nom de l'appareil",
-    "Device key": "Clé de l'appareil",
-    "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.": "Si les clés correspondent, cliquer sur le bouton \"Vérifier\" ci-dessous. Sinon quelqu’un d’autre est en train d’intercepter cet appareil et vous devriez certainement cliquer sur le bouton \"Ajouter à la liste noire\" à la place.",
-    "Verify device": "Vérifier cet appareil",
     "I verify that the keys match": "J’ai vérifié que les clés correspondaient",
     "Unable to restore session": "Impossible de restaurer la 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.": "Si vous avez utilisé une version plus récente de Riot précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vous êtes en train d’ajouter à la liste noire des appareils non-vérifiés ; pour envoyer des messages à ces appareils vous devez les vérifier.",
-    "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.": "Nous vous recommandons d’effectuer le processus de vérification pour tous les appareils afin de confirmer qu’ils appartiennent à leurs propriétaires légitimes, mais vous pouvez renvoyer le(s) message(s) sans vérifier si vous préférez.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contient des appareils que vous n'avez encore jamais vus.",
-    "Unknown devices": "Appareils inconnus",
     "Unknown Address": "Adresse inconnue",
     "Unblacklist": "Supprimer de la liste noire",
     "Blacklist": "Ajouter à la liste noire",
@@ -375,19 +343,13 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
-    "Device already verified!": "Appareil déjà vérifié !",
     "Export": "Exporter",
     "Import": "Importer",
     "Incorrect username and/or password.": "Nom d’utilisateur et/ou mot de passe incorrect.",
     "Results from DuckDuckGo": "Résultats de DuckDuckGo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Les clés de signature que vous avez transmises correspondent aux clés que vous avez reçues de l’appareil %(deviceId)s de %(userId)s. L’appareil est vérifié.",
-    "Unknown (user, device) pair:": "Couple (utilisateur, appareil) inconnu :",
-    "Unrecognised command:": "Commande non reconnue :",
     "Unrecognised room alias:": "Alias de salon non reconnu :",
     "Use compact timeline layout": "Utiliser l'affichage compact de l'historique",
     "Verified key": "Clé vérifiée",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENTION : appareil déjà vérifié mais les clés NE CORRESPONDENT PAS !",
-    "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!": "ATTENTION : ERREUR DE VÉRIFICATION DES CLÉS ! La clé de signature pour %(userId)s et l'appareil %(deviceId)s est “%(fprint)s” et ne correspond pas à la clé “%(fingerprint)s” qui a été fournie. Cela peut signifier que vos communications sont interceptées !",
     "No Microphones detected": "Aucun micro détecté",
     "No Webcams detected": "Aucune webcam détectée",
     "No media permissions": "Pas de permission pour les médias",
@@ -399,9 +361,7 @@
     "Anyone": "N'importe qui",
     "Are you sure you want to leave the room '%(roomName)s'?": "Voulez-vous vraiment quitter le salon \"%(roomName)s\" ?",
     "Custom level": "Rang personnalisé",
-    "Device ID:": "Identifiant de l'appareil :",
     "device id: ": "identifiant de l'appareil : ",
-    "Device key:": "Clé de l’appareil :",
     "Register": "S'inscrire",
     "Remote addresses for this room:": "Adresses distantes pour ce salon :",
     "Save": "Enregistrer",
@@ -441,22 +401,17 @@
     "No display name": "Pas de nom affiché",
     "Private Chat": "Discussion privée",
     "Public Chat": "Discussion publique",
-    "Room contains unknown devices": "Le salon contient des appareils inconnus",
     "%(roomName)s does not exist.": "%(roomName)s n'existe pas.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s n'est pas accessible pour le moment.",
     "Seen by %(userName)s at %(dateTime)s": "Vu par %(userName)s à %(dateTime)s",
     "Send anyway": "Envoyer quand même",
-    "Show Text Formatting Toolbar": "Afficher la barre de formatage de texte",
     "Start authentication": "Commencer une authentification",
     "This room": "Ce salon",
-    "Undecryptable": "Indéchiffrable",
-    "Unencrypted message": "Message non chiffré",
     "unknown caller": "appelant inconnu",
     "Unnamed Room": "Salon anonyme",
     "Username invalid: %(errMessage)s": "Nom d'utilisateur non valide : %(errMessage)s",
     "(~%(count)s results)|one": "(~%(count)s résultat)",
     "(~%(count)s results)|other": "(~%(count)s résultats)",
-    "Encrypted by an unverified device": "Chiffré par un appareil non vérifié",
     "Home": "Accueil",
     "Upload new:": "Envoyer un nouveau :",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Rejoindre en <voiceText>audio</voiceText> ou en <videoText>vidéo</videoText>.",
@@ -474,8 +429,6 @@
     "Start verification": "Commencer la vérification",
     "Share without verifying": "Partager sans vérifier",
     "Ignore request": "Ignorer la requête",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vous avez ajouté un nouvel appareil, \"%(displayName)s\", qui demande des clés de chiffrement.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Votre appareil non vérifié \"%(displayName)s\" demande des clés de chiffrement.",
     "Encryption key request": "Requête de clé de chiffrement",
     "Check for update": "Rechercher une mise à jour",
     "Add a widget": "Ajouter un widget",
@@ -488,7 +441,6 @@
     "Unable to create widget.": "Impossible de créer le widget.",
     "You are not in this room.": "Vous n'êtes pas dans ce salon.",
     "You do not have permission to do that in this room.": "Vous n'avez pas la permission d'effectuer cette action dans ce salon.",
-    "Loading device info...": "Chargement des informations de l'appareil...",
     "Example": "Exemple",
     "Create": "Créer",
     "Featured Rooms:": "Salons mis en avant :",
@@ -504,7 +456,6 @@
     "PM": "PM",
     "Copied!": "Copié !",
     "Failed to copy": "Échec de la copie",
-    "Verifies a user, device, and pubkey tuple": "Vérifie un utilisateur, un appareil et une clé publique",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modifié par %(senderName)s",
     "Who would you like to add to this community?": "Qui souhaitez-vous ajouter à cette communauté ?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attention : toute personne ajoutée à une communauté sera visible par tous ceux connaissant l'identifiant de la communauté",
@@ -702,8 +653,6 @@
     "Idle for %(duration)s": "Inactif depuis %(duration)s",
     "Offline for %(duration)s": "Hors ligne depuis %(duration)s",
     "Unknown for %(duration)s": "Inconnu depuis %(duration)s",
-    "Delete %(count)s devices|one": "Supprimer l'appareil",
-    "Delete %(count)s devices|other": "Supprimer %(count)s appareils",
     "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucune méthode d'identification compatible avec ce client.",
     "Flair": "Badge",
@@ -713,7 +662,6 @@
     "expand": "développer",
     "collapse": "réduire",
     "Call Failed": "Échec de l'appel",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Il y a des appareils inconnus dans ce salon : si vous continuez sans les vérifier, quelqu'un pourrait épier votre appel.",
     "Review Devices": "Passer en revue les appareils",
     "Call Anyway": "Appeler quand même",
     "Answer Anyway": "Répondre quand même",
@@ -747,7 +695,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
@@ -756,11 +703,7 @@
     "Clear filter": "Supprimer les filtres",
     "Did you know: you can use communities to filter your Riot.im experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience 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.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Votre demande de partage de clé a été envoyée - veuillez vérifier les demandes de partage de clé sur vos autres appareils.",
-    "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.": "Les demandes de partage de clé sont envoyées à vos autres appareils automatiquement. Si vous rejetez ou supprimez la demande de partage de clé sur vos autres appareils, cliquez ici pour redemander les clés pour cette session.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si vos autres appareils n'ont pas la clé pour ce message, vous ne pourrez pas le déchiffrer.",
     "Key request sent.": "Demande de clé envoyée.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-demander les clés de chiffrement</requestLink> depuis vos autres appareils.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vu par %(displayName)s (%(userName)s) à %(dateTime)s",
     "Code": "Code",
     "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.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d'utilisation de l'application dont votre nom d'utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d'utilisateur des autres participants. Ils ne contiennent pas les messages.",
@@ -822,7 +765,6 @@
     "Resend": "Renvoyer",
     "Collecting app version information": "Récupération des informations de version de l’application",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Keywords": "Mots-clés",
     "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Invite to this community": "Inviter à cette communauté",
@@ -918,8 +860,6 @@
     "Refresh": "Rafraîchir",
     "We encountered an error trying to restore your previous session.": "Une erreur est survenue lors de la restauration de la dernière session.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Effacer le stockage de votre navigateur peut résoudre le problème, mais cela vous déconnectera et tous les historiques de conversation encryptés seront illisibles.",
-    "Unable to reply": "Impossible de répondre",
-    "At this time it is not possible to reply with an emote.": "Pour le moment il n'est pas possible de répondre avec une réaction.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossible de charger l'événement auquel il a été répondu, soit il n'existe pas, soit vous n'avez pas l'autorisation de le voir.",
     "Collapse Reply Thread": "Masquer le fil de réponse",
     "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
@@ -962,12 +902,6 @@
     "Demote yourself?": "Vous rétrograder ?",
     "Demote": "Rétrograder",
     "This event could not be displayed": "Cet événement n'a pas pu être affiché",
-    "deleted": "barré",
-    "underlined": "souligné",
-    "inline-code": "code",
-    "block-quote": "citation",
-    "bulleted-list": "liste à puces",
-    "numbered-list": "liste à numéros",
     "Permission Required": "Permission requise",
     "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon",
     "A call is currently being placed!": "Un appel est en cours !",
@@ -1031,11 +965,6 @@
     "Unable to load! Check your network connectivity and try again.": "Chargement impossible ! Vérifiez votre connexion au réseau et réessayez.",
     "Delete Backup": "Supprimer la sauvegarde",
     "Unable to load key backup status": "Impossible de charger l'état de sauvegarde des clés",
-    "Backup has a <validity>valid</validity> signature from this device": "La sauvegarde a une signature <validity>valide</validity> pour cet appareil",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "La sauvegarde a une signature <validity>valide</validity> de l'appareil <verify>non vérifié</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "La sauvegarde a une signature <validity>non valide</validity> de l'appareil <verify>vérifié</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "La sauvegarde a une signature <validity>non valide</validity> de l'appareil <verify>non vérifié</verify> <device></device>",
-    "Backup is not signed by any of your devices": "La sauvegarde n'est signée par aucun de vos appareils",
     "Backup version: ": "Version de la sauvegarde : ",
     "Algorithm: ": "Algorithme : ",
     "Enter a passphrase...": "Saisissez une phrase de passe…",
@@ -1048,12 +977,9 @@
     "Your Recovery Key": "Votre clé de récupération",
     "Copy to clipboard": "Copier dans le presse-papier",
     "Download": "Télécharger",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Votre clé de récupération a été <b>copiée dans votre presse-papier</b>, collez-la dans :",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Votre clé de récupération est dans votre dossier de <b>téléchargements</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Imprimez-la</b> et conservez-la dans un endroit sûr",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sauvegardez-la</b> sur une clé USB ou un disque de sauvegarde",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copiez-la</b> dans votre espace de stockage personnel en ligne",
-    "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.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez pas restaurer l'historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez un autre appareil.",
     "Set up Secure Message Recovery": "Configurer la récupération de messages sécurisée",
     "Keep it safe": "Conservez-la en lieu sûr",
     "Create Key Backup": "Créer la sauvegarde des clés",
@@ -1072,7 +998,6 @@
     "This looks like a valid recovery key!": "Cela ressemble à une clé de récupération valide !",
     "Not a valid recovery key": "Ce n'est pas une clé de récupération valide",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accédez à l'historique sécurisé de vos messages et configurez la messagerie sécurisée en renseignant votre clé de récupération.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de récupération vous pouvez <button>configurer de nouvelle options de récupération</button>",
     "Failed to perform homeserver discovery": "Échec lors de la découverte du serveur d'accueil",
     "Invalid homeserver discovery response": "Réponse de découverte du serveur d'accueil non valide",
     "Use a few words, avoid common phrases": "Utilisez quelques mots, évitez les phrases courantes",
@@ -1120,7 +1045,6 @@
     "Checking...": "Vérification…",
     "Invalid identity server discovery response": "Réponse non valide lors de la découverte du serveur d'identité",
     "General failure": "Erreur générale",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "La sauvegarde a une signature <validity>valide</validity> depuis un <device>appareil</device> <verify>vérifié</verify>",
     "New Recovery Method": "Nouvelle méthode de récupération",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas activé de nouvelle méthode de récupération, un attaquant essaye peut-être d'accéder à votre compte. Changez immédiatement le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les paramètres.",
     "Set up Secure Messages": "Configurer les messages sécurisés",
@@ -1170,13 +1094,11 @@
     "Email Address": "Adresse e-mail",
     "Backing up %(sessionsRemaining)s keys...": "Sauvegarde de %(sessionsRemaining)s clés...",
     "All keys backed up": "Toutes les clés ont été sauvegardées",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "La sauvegarde a une signature de l'appareil <verify>inconnu</verify> qui a pour identifiant %(deviceId)s.",
     "Add an email address to configure email notifications": "Ajouter une adresse e-mail pour configurer les notifications par e-mail",
     "Unable to verify phone number.": "Impossible de vérifier le numéro de téléphone.",
     "Verification code": "Code de vérification",
     "Phone Number": "Numéro de téléphone",
     "Profile picture": "Image de profil",
-    "Upload profile picture": "Transférer une image de profil",
     "Display Name": "Nom affiché",
     "Room information": "Information du salon",
     "Internal room ID:": "Identifiant interne du salon :",
@@ -1203,7 +1125,6 @@
     "Room list": "Liste de salons",
     "Timeline": "Historique",
     "Autocomplete delay (ms)": "Délai pour l'autocomplétion (ms)",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Pour une sécurité maximale, nous vous recommandons de faire cela en personne ou d'utiliser un autre moyen sûr de communication.",
     "Chat with Riot Bot": "Discuter avec le bot Riot",
     "Roles & Permissions": "Rôles & Permissions",
     "To link to this room, please add an alias.": "Pour partager ce salon, veuillez créer un alias.",
@@ -1220,8 +1141,6 @@
     "Voice & Video": "Voix & Vidéo",
     "Main address": "Adresse princpale",
     "Room avatar": "Avatar du salon",
-    "Upload room avatar": "Transférer un avatar pour le salon",
-    "No room avatar": "Aucun avatar de salon",
     "Room Name": "Nom du salon",
     "Room Topic": "Sujet du salon",
     "Join": "Rejoindre",
@@ -1231,7 +1150,6 @@
     "Waiting for partner to accept...": "Nous attendons que le partenaire accepte…",
     "Use two-way text verification": "Utiliser la vérification textuelle bidirectionnelle",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour que ce soit un utilisateur de confiance. Faire confiance aux utilisateurs vous apporte une tranquillité d’esprit quand vous utilisez des messages chiffrés de bout en bout.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "En vérifiant cet utilisateur, son appareil sera marqué comme appareil de confiance, et le vôtre sera aussi marqué comme appareil de confiance pour lui.",
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
@@ -1267,10 +1185,7 @@
     "Keep going...": "Continuer…",
     "Starting backup...": "Début de la sauvegarde…",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Une nouvelle phrase de passe et une nouvelle clé de récupération pour les messages sécurisés ont été détectées.",
-    "This device is encrypting history using the new recovery method.": "Cet appareil chiffre l'historique en utilisant la nouvelle méthode de récupération.",
     "Recovery Method Removed": "Méthode de récupération supprimée",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cet appareil a détecté que votre phrase de passe et votre clé de récupération ont été supprimées.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Si vus avez fait cela par accident, vous pouvez configurer les messages sécurisés sur cet appareil, ce qui re-chiffrera l'historique des messages de cet appareil avec une nouvelle méthode de récupération.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas supprimé la méthode de récupération, un attaquant peut être en train d'essayer d'accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier \"%(fileName)s\" dépasse la taille limite autorisée par ce serveur pour les téléchargements",
     "Gets or sets the room topic": "Récupère ou défini le sujet du salon",
@@ -1329,7 +1244,6 @@
     "Book": "Livre",
     "Pencil": "Crayon",
     "Paperclip": "Trombone",
-    "Padlock": "Cadenas",
     "Key": "Clé",
     "Hammer": "Marteau",
     "Telephone": "Téléphone",
@@ -1347,12 +1261,6 @@
     "Headphones": "Écouteurs",
     "Folder": "Dossier",
     "Pin": "Épingle",
-    "Your homeserver does not support device management.": "Votre serveur d'accueil ne prend pas en charge la gestion des appareils.",
-    "This backup is trusted because it has been restored on this device": "Cette sauvegarde est fiable car elle a été restaurée sur cet appareil",
-    "Some devices for this user are not trusted": "Certains appareil pour cet utilisateur ne sont pas fiables",
-    "Some devices in this encrypted room are not trusted": "Certains appareils dans ce salon chiffré ne sont pas fiables",
-    "All devices for this user are trusted": "Tous les appareils de cet utilisateur sont fiables",
-    "All devices in this encrypted room are trusted": "Tous les appareils de ce salon chiffré sont fiables",
     "Recovery Key Mismatch": "La clé de récupération ne correspond pas",
     "Incorrect Recovery Passphrase": "Phrase de passe de récupération incorrecte",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n'a pas pu être déchiffrée avec cette phrase de passe : vérifiez que vous avez saisi la bonne phrase de passe de récupération.",
@@ -1362,16 +1270,13 @@
     "This homeserver does not support communities": "Ce serveur d'accueil ne prend pas en charge les communautés",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Un e-mail de vérification sera envoyé à votre adresse pour confirmer la modification de votre mot de passe.",
     "Your password has been reset.": "Votre mot de passe a été réinitialisé.",
-    "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.": "Vous avez été déconnecté de tous les appareils et vous ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.",
     "This homeserver does not support login using email address.": "Ce serveur d'accueil ne prend pas en charge la connexion avec une adresse e-mail.",
     "Registration has been disabled on this homeserver.": "L'inscription a été désactivée sur ce serveur d'accueil.",
     "Unable to query for supported registration methods.": "Impossible de demander les méthodes d'inscription prises en charge.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "En êtes-vous sûr(e) ? Vous perdrez vos messages chiffrés si vos clés ne sont pas sauvegardées correctement.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) ont les clés pour lire ces messages.",
     "Restore from Backup": "Restaurer depuis la sauvegarde",
-    "This device is backing up your keys. ": "Cet appareil sauvegarde vos clés. ",
     "Back up your keys before signing out to avoid losing them.": "Sauvegardez vos clés avant de vous déconnecter pour éviter de les perdre.",
-    "Your keys are <b>not being backed up from this device</b>.": "Vos clés <b>ne sont pas sauvegardées depuis cet appareil</b>.",
     "Start using Key Backup": "Commencer à utiliser la sauvegarde de clés",
     "Never lose encrypted messages": "Ne perdez jamais vos messages chiffrés",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages de ce salon sont sécurisés avec le chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) avez les clés pour lire ces messages.",
@@ -1390,7 +1295,6 @@
     "Set up with a Recovery Key": "Configurer une clé de récupération",
     "Please enter your passphrase a second time to confirm.": "Veuillez saisir votre phrase de passe une seconde fois pour la confirmer.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Votre clé de récupération est une mesure de précaution. Vous pouvez l’utiliser pour restaurer l’accès à vos messages chiffrés si vous oubliez votre phrase de passe.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Conservez votre clé de récupération dans un endroit très sécurisé, comme un gestionnaire de mots de passe (ou un coffre-fort)",
     "Your keys are being backed up (the first backup could take a few minutes).": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
     "Secure your backup with a passphrase": "Protégez votre sauvegarde avec une phrase de passe",
     "Confirm your passphrase": "Confirmez votre phrase de passe",
@@ -1448,18 +1352,11 @@
     "Power level": "Rang",
     "Want more than a community? <a>Get your own server</a>": "Vous voulez plus qu’une communauté ? <a>Obtenez votre propre serveur</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Veuillez installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ou <safariLink>Safari</safariLink> pour une expérience optimale.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Le changement de votre mot de passe entraînera la réinitialisation de toutes les clés de chiffrement de bout en bout sur tous vos appareils. L’historique de vos conversations chiffrées sera alors illisible. Configurez la sauvegarde des clés ou exportez vos clés de chiffrement depuis un autre appareil avant de modifier votre mot de passe.",
-    "Room upgrade confirmation": "Confirmation de la mise à niveau du salon",
-    "Upgrading a room can be destructive and isn't always necessary.": "La mise à niveau d’un salon peut être destructive et n’est pas toujours nécessaire.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Les mises à niveau de salon sont généralement recommandées quand la version du salon est considérée comme <i>instable</i>. Les versions de salon instables peuvent produire des anomalies, avoir des fonctionnalités en moins ou contenir des failles de sécurité.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Les mises à niveau de salon n’affectent généralement que le traitement <i>par le serveur</i> du salon. Si vous avez un problème avec votre client Riot, créez un rapport avec <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Attention</b> : La mise à niveau du salon <i>ne migrera pas automatiquement les membres du salon vers la nouvelle version du salon.</i> Nous enverrons un lien vers le nouveau salon dans l’ancienne version du salon. Les participants au salon devront cliquer sur ce lien pour rejoindre le nouveau salon.",
     "Adds a custom widget by URL to the room": "Ajoute un widget personnalisé par URL au salon",
     "Please supply a https:// or http:// widget URL": "Veuillez fournir une URL du widget en https:// ou http://",
     "You cannot modify widgets in this room.": "Vous ne pouvez pas modifier les widgets de ce salon.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s a révoqué l’invitation de %(targetDisplayName)s à rejoindre le salon.",
-    "Enable desktop notifications for this device": "Activer les notifications de bureau pour cet appareil",
-    "Enable audible notifications for this device": "Activer les notifications sonores pour cet appareil",
     "Upgrade this room to the recommended room version": "Mettre à niveau ce salon vers la version recommandée",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ce salon utilise la version <roomVersion />, que ce serveur d’accueil a marqué comme <i>instable</i>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "La mise à niveau du salon désactivera cette instance du salon et créera un salon mis à niveau avec le même nom.",
@@ -1504,18 +1401,12 @@
     "A conference call could not be started because the integrations server is not available": "L’appel en téléconférence n’a pas pu être lancé car les intégrations du serveur ne sont pas disponibles",
     "The server does not support the room version specified.": "Le serveur ne prend pas en charge la version de salon spécifiée.",
     "Name or Matrix ID": "Nom ou identifiant Matrix",
-    "Email, name or Matrix ID": "E-mail, nom ou identifiant Matrix",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Veuillez confirmer la mise à niveau de ce salon de <oldVersion /> à <newVersion />.",
     "Changes your avatar in this current room only": "Change votre avatar seulement dans le salon actuel",
     "Unbans user with given ID": "Révoque le bannissement de l’utilisateur ayant l’identifiant fourni",
     "Sends the given message coloured as a rainbow": "Envoie le message coloré aux couleurs de l’arc-en-ciel",
     "Sends the given emote coloured as a rainbow": "Envoie la réaction colorée aux couleurs de l’arc-en-ciel",
     "The user's homeserver does not support the version of the room.": "Le serveur d’accueil de l’utilisateur ne prend pas en charge la version de ce salon.",
     "When rooms are upgraded": "Quand les salons sont mis à niveau",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Cet appareil <b>ne sauvegarde pas vos clés</b>, mais vous avez une sauvegarde existante que vous pouvez restaurer et joindre.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connecter cet appareil à la sauvegarde de clés avant de vous déconnecter pour éviter de perdre des clés qui pourraient n’être présentes que sur cet appareil.",
-    "Connect this device to Key Backup": "Connecter cet appareil à la sauvegarde de clés",
-    "Backup has an <validity>invalid</validity> signature from this device": "La sauvegarde a une signature <validity>invalide</validity> depuis cet appareil",
     "this room": "ce salon",
     "View older messages in %(roomName)s.": "Voir les messages plus anciens dans %(roomName)s.",
     "Joining room …": "Inscription au salon…",
@@ -1614,18 +1505,14 @@
     "Resend removal": "Renvoyer la suppression",
     "Your homeserver doesn't seem to support this feature.": "Il semble que votre serveur d’accueil ne prenne pas en charge cette fonctionnalité.",
     "Changes your avatar in all rooms": "Change votre avatar dans tous les salons",
-    "Clear all data on this device?": "Supprimer toutes les données sur cet appareil ?",
     "You're signed out": "Vous êtes déconnecté(e)",
     "Clear all data": "Supprimer toutes les données",
     "Removing…": "Suppression…",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La suppression de toutes les données sur cet appareil est permanente. Les messages chiffrés seront perdus à moins que leurs clés n’aient été sauvegardées.",
     "Failed to re-authenticate due to a homeserver problem": "Échec de la ré-authentification à cause d’un problème du serveur d’accueil",
     "Failed to re-authenticate": "Échec de la ré-authentification",
     "Enter your password to sign in and regain access to your account.": "Saisissez votre mot de passe pour vous connecter et ré-accéder à votre compte.",
     "Forgotten your password?": "Mot de passe oublié ?",
     "Clear personal data": "Supprimer les données personnelles",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Attention : Vos données personnelles (y compris vos clés de chiffrement) sont toujours stockées sur cet appareil. Supprimez-les si vous n’utilisez plus cet appareil ou si vous voulez vous connecter avec un autre compte.",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Ré-accédez à votre compte et récupérez les clés de chiffrement stockées sur cet appareil. Sans elles, vous ne pourrez pas lire tous les messages sécurisés sur tous les appareils.",
     "Sign in and regain access to your account.": "Connectez-vous et ré-accédez à votre compte.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Vous ne pouvez pas vous connecter à votre compte. Contactez l’administrateur de votre serveur d’accueil pour plus d’informations.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Dites-nous ce qui s’est mal passé ou, encore mieux, créez un rapport d’erreur sur GitHub qui décrit le problème.",
@@ -1637,7 +1524,6 @@
     "Service": "Service",
     "Summary": "Résumé",
     "This account has been deactivated.": "Ce compte a été désactivé.",
-    "Failed to start chat": "Échec du démarrage de la discussion",
     "Messages": "Messages",
     "Actions": "Actions",
     "Displays list of commands with usages and descriptions": "Affiche la liste des commandes avec leurs utilisations et descriptions",
@@ -1667,7 +1553,6 @@
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvert par les contacts existants que vous connaissez, ajoutez-en un ci-dessous.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "La déconnexion de votre serveur d’identité signifie que vous ne serez plus découvrable par d’autres utilisateurs et que vous ne pourrez plus faire d’invitation par e-mail ou téléphone.",
     "Integration Manager": "Gestionnaire d’intégration",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Pour savoir si vous pouvez faire confiance à cet appareil, vérifiez que la clé que vous voyez dans les paramètres de l’utilisateur sur cet appareil correspond à la clé ci-dessous :",
     "Call failed due to misconfigured server": "Échec de l’appel à cause d’un serveur mal configuré",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Demandez à l’administrateur de votre serveur d’accueil (<code>%(homeserverDomain)s</code>) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Sinon, vous pouvez essayer d’utiliser le serveur public à <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et ça partagera votre adresse IP avec ce serveur. Vous pouvez aussi gérer cela dans les paramètres.",
@@ -1682,7 +1567,6 @@
     "Remove %(phone)s?": "Supprimer %(phone)s ?",
     "ID": "Identifiant",
     "Public Name": "Nom public",
-    "A device's public name is visible to people you communicate with": "Le nom public d’un appareil est visible par les personnes avec qui vous communiquez",
     "Accept <policyLink /> to continue:": "Acceptez <policyLink /> pour continuer :",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acceptez les conditions de service du serveur d’identité (%(serverName)s) pour vous permettre d’être découvrable par votre adresse e-mail ou votre numéro de téléphone.",
     "Multiple integration managers": "Gestionnaires d’intégration multiples",
@@ -1782,7 +1666,6 @@
     "%(count)s unread messages.|other": "%(count)s messages non lus.",
     "Unread mentions.": "Mentions non lues.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Veuillez <newIssueLink>créer un nouveau rapport</newIssueLink> sur GitHub afin que l’on enquête sur cette erreur.",
-    "Use the new, faster, composer for writing messages": "Utilisez le nouveau compositeur plus rapide pour écrire des messages",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Clé public du captcha manquante dans la configuration du serveur d’accueil. Veuillez le signaler à l’administrateur de votre serveur d’accueil.",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vous êtes sur le point de supprimer 1 message de %(user)s. Ça ne peut pas être annulé. Voulez-vous continuer ?",
     "Remove %(count)s messages|one": "Supprimer 1 message",
@@ -1872,11 +1755,7 @@
     "Custom (%(level)s)": "Personnalisé (%(level)s)",
     "Trusted": "Fiable",
     "Not trusted": "Non vérifié",
-    "Hide verified Sign-In's": "Masquer les connexions vérifiées",
-    "%(count)s verified Sign-In's|other": "%(count)s connexions vérifiées",
-    "%(count)s verified Sign-In's|one": "1 connexion vérifiée",
     "Direct message": "Message direct",
-    "Unverify user": "Ne plus marquer l’utilisateur comme vérifié",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> dans %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Les messages dans ce salon sont chiffrés de bout en bout.",
     "Security": "Sécurité",
@@ -1893,7 +1772,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s.",
     "Widget added by": "Widget ajouté par",
     "This widget may use cookies.": "Ce widget pourrait utiliser des cookies.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Envoyer les demandes de vérification en message direct, en incluant une nouvelle expérience de vérification dans le tableau des membres.",
     "Enable local event indexing and E2EE search (requires restart)": "Activer l’indexation des événements locaux et la recherche des données chiffrées de bout en bout (nécessite un redémarrage)",
     "Connecting to integration manager...": "Connexion au gestionnaire d’intégrations…",
     "Cannot connect to integration manager": "Impossible de se connecter au gestionnaire d’intégrations",
@@ -1916,7 +1794,6 @@
     "Manage integrations": "Gérer les intégrations",
     "Verification Request": "Demande de vérification",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Activer la signature croisée pour vérifier par utilisateur plutôt que par appareil (en développement)",
     "Match system theme": "S’adapter au thème du système",
     "%(senderName)s placed a voice call.": "%(senderName)s a passé un appel vocal.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel vocal. (pas pris en charge par ce navigateur)",
@@ -1943,7 +1820,6 @@
     "Start chatting": "Commencer à discuter",
     "Send cross-signing keys to homeserver": "Envoyer les clés de signature croisée au serveur d’accueil",
     "Cross-signing public keys:": "Clés publiques de signature croisée :",
-    "on device": "sur l’appareil",
     "not found": "non trouvé",
     "Cross-signing private keys:": "Clés privées de signature croisée :",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s a supprimé la règle qui bannit les utilisateurs correspondant à %(glob)s",
@@ -1966,83 +1842,52 @@
     "in secret storage": "dans le coffre secret",
     "Secret storage public key:": "Clé publique du coffre secret :",
     "in account data": "dans les données du compte",
-    "Bootstrap Secure Secret Storage": "Créer le coffre secret sécurisé",
     "Cross-signing": "Signature croisée",
     "Enter secret storage passphrase": "Saisir la phrase de passe du coffre secret",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne phrase de passe.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement accéder au coffre secret depuis un ordinateur de confiance.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et votre identité de signature croisée pour vérifier d’autres appareils en saisissant votre phrase de passe.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre phrase de passe, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
     "Enter secret storage recovery key": "Saisir la clé de récupération du coffre secret",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne clé de récupération.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Accédez à l’historique de vos messages secrets et à votre identité de signature croisée pour vérifier d’autres appareils en saisissant votre clé de récupération.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Si vous avez oublié votre clé de récupération vous pouvez <button>définir de nouvelles options de récupération</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement configurer une sauvegarde de clés depuis un ordinateur de confiance.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de récupération, vous pouvez <button>définir de nouvelles options de récupération</button>",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement configurer le coffre secret depuis un ordinateur de confiance.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Nous utiliserons le coffre secret pour conserver optionnellement une copie chiffrée de votre identité de signature croisée pour vérifier d’autres appareils et des clés de messages sur notre serveur. Protégez votre accès aux messages chiffrés avec une phrase de passe pour la sécuriser.",
     "Set up with a recovery key": "Configurer avec une clé de récupération",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès aux messages chiffrés si vous oubliez votre phrase de passe.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Conservez votre clé de récupération dans un endroit très sécurisé, comme un gestionnaire de mots de passe (ou un coffre-fort).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Votre clé de récupération a été <b>copiée dans votre presse-papiers</b>, collez-la pour :",
     "Your recovery key is in your <b>Downloads</b> folder.": "Votre clé de récupération est dans votre dossier de <b>Téléchargements</b>.",
-    "Your access to encrypted messages is now protected.": "Votre accès aux messages chiffrés est maintenant protégé.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Si vous ne configurez pas le coffre secret, vous ne pourrez pas récupérer l’accès à vos messages chiffrés ou à votre identité de signature croisée pour vérifier d’autres appareils si vous vous déconnectez ou si vous utilisez un autre appareil.",
-    "Set up secret storage": "Configurer le coffre secret",
-    "Secure your encrypted messages with a passphrase": "Sécuriser vos messages chiffrés avec une phrase de passe",
     "Storing secrets...": "Sauvegarde des secrets…",
     "Unable to set up secret storage": "Impossible de configurer le coffre secret",
     "Cross-signing and secret storage are enabled.": "La signature croisée et le coffre secret sont activés.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Votre compte a une identité de signature croisée dans le coffre secret, mais cet appareil ne lui fait pas encore confiance.",
     "Cross-signing and secret storage are not yet set up.": "La signature croisée et le coffre secret ne sont pas encore configurés.",
     "Bootstrap cross-signing and secret storage": "Initialiser la signature croisée et le coffre secret",
     "not stored": "non sauvegardé",
     "Backup has a <validity>valid</validity> signature from this user": "La sauvegarde a une signature <validity>valide</validity> de cet utilisateur",
     "Backup has a <validity>invalid</validity> signature from this user": "La sauvegarde a une signature <validity>non valide</validity> de cet utilisateur",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "La sauvegarde a une signature de l’utilisateur <verify>inconnu</verify> ayant pour identifiant %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "La sauvegarde a une signature de l’appareil <verify>inconnu</verify> ayant pour identifiant %(deviceId)s",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "La clé de sauvegarde est stockée dans le coffre secret, mais cette fonctionnalité n’est pas activée sur cet appareil. Activez la signature croisée dans le Labo pour modifier l’état de la sauvegarde de clé.",
     "Backup key stored: ": "Clé de sauvegarde stockée : ",
-    "Start using Key Backup with Secure Secret Storage": "Commencer à utiliser la sauvegarde de clés avec le coffre secret sécurisé",
     "Hide verified sessions": "Masquer les sessions vérifiées",
     "%(count)s verified sessions|other": "%(count)s sessions vérifiées",
     "%(count)s verified sessions|one": "1 session vérifiée",
     "Close preview": "Fermer l’aperçu",
-    "This user has not verified all of their devices.": "Cet utilisateur n'a pas vérifié tous ses appareils.",
-    "You have not verified this user. This user has verified all of their devices.": "Vous n'avez pas vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.",
-    "You have verified this user. This user has verified all of their devices.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié tous ses appareils.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Certains utilisateurs dans ce salon chiffré n’ont pas été vérifiés par vous ou n’ont pas vérifié leurs propres appareils.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Tous les utilisateurs de ce salon chiffré ont été vérifiés par vous et ont vérifié leurs propres appareils.",
     "Language Dropdown": "Sélection de la langue",
     "Country Dropdown": "Sélection du pays",
     "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant vos informations de sauvegarde de clés existantes. Votre phrase de passe et votre clé de récupération seront les mêmes que pour la sauvegarde de clés",
-    "Migrate from Key Backup": "Migrer depuis la sauvegarde de clés",
     "Help": "Aide",
-    "New DM invite dialog (under development)": "Nouveau dialogue d’invitation aux MD (en développement)",
     "Show more": "En voir plus",
     "Recent Conversations": "Conversations récentes",
     "Direct Messages": "Messages directs",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur ou partagez votre nom d’utilisateur (%(userId)s) ou <a>votre lien de profil</a>.",
     "Go": "C’est parti",
     "Show info about bridges in room settings": "Afficher des informations à propos des passerelles dans les paramètres du salon",
-    "This bridge was provisioned by <user />": "Cette passerelle est fournie par <user />",
     "This bridge is managed by <user />.": "Cette passerelle est gérée par <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Relié à <channelLink /> <networkLink />, sur <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connecté à <channelIcon /> <channelName /> sur <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Connecté via %(protocolName)s",
-    "Bridge Info": "Informations de la passerelle",
-    "Below is a list of bridges connected to this room.": "Vous trouverez ci-dessous la liste des passerelles connectées à ce salon.",
     "Suggestions": "Suggestions",
     "Failed to find the following users": "Impossible de trouver les utilisateurs suivants",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s",
     "Show a presence dot next to DMs in the room list": "Afficher une pastille de présence à côté des messages directs dans la liste des salons",
     "Lock": "Cadenas",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "La sauvegarde de clés est activée pour votre compte mais n’a pas été configurée pour cette session. Pour configurer le coffre secret, restaurez votre sauvegarde de clés.",
     "Restore": "Restaurer",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Le coffre secret sera configuré en utilisant les paramètres existants de la sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés",
-    "Restore your Key Backup": "Restaurer votre sauvegarde de clés",
     "a few seconds ago": "il y a quelques secondes",
     "about a minute ago": "il y a environ une minute",
     "%(num)s minutes ago": "il y a %(num)s minutes",
@@ -2057,7 +1902,6 @@
     "%(num)s hours from now": "dans %(num)s heures",
     "about a day from now": "dans un jour environ",
     "%(num)s days from now": "dans %(num)s jours",
-    "New invite dialog": "Nouvelle boîte de dialogue d’invitation",
     "Failed to invite the following users to chat: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à discuter : %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre Message direct. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
     "Something went wrong trying to invite the users.": "Une erreur est survenue en essayant d’inviter les utilisateurs.",
@@ -2070,17 +1914,12 @@
     "Session verified": "Session vérifiée",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Elle a accès à vos messages chiffrés et les autres utilisateurs la verront comme fiable.",
     "Done": "Terminé",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Si vous ne complétez pas la sécurité sur cet appareil, vous n’aurez pas accès aux messages chiffrés.",
     "Go Back": "Retourner en arrière",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "Le coffre secret sera configuré en utilisant les détails existants de votre sauvegarde de clés. Votre phrase de passe et votre clé de récupération seront les mêmes que celles de votre sauvegarde de clés.",
-    "New Session": "Nouvelle session",
     "Other users may not trust it": "D’autres utilisateurs pourraient ne pas lui faire confiance",
     "Later": "Plus tard",
     "Verify User": "Vérifier l’utilisateur",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une meilleure sécurité, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
-    "For maximum security, do this in person.": "Pour une sécurité maximale, faites-le en personne.",
     "Start Verification": "Commencer la vérification",
-    "Encrypted by a deleted device": "Chiffré par un appareil supprimé",
     "Unknown Command": "Commande inconnue",
     "Unrecognised command: %(commandText)s": "Commande non reconnue : %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vous pouvez utiliser <code>/help</code> pour obtenir la liste des commandes disponibles. Vouliez-vous envoyer un message ?",
@@ -2092,12 +1931,9 @@
     "Reject & Ignore user": "Rejeter et ignorer l’utilisateur",
     "Enter your account password to confirm the upgrade:": "Saisissez le mot de passe de votre compte pour confirmer la mise à niveau :",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vous devrez vous identifier avec le serveur pour confirmer la mise à niveau.",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cet appareil pour lui permettre de vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Configurez le chiffrement sur cet appareil pour lui permettre de vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sécurisez vos clés de chiffrement avec une phrase de passe. Pour une sécurité maximale, elle devrait être différente du mot de passe de votre compte :",
     "Enter a passphrase": "Saisissez une phrase de passe",
     "Enter your passphrase a second time to confirm it.": "Saisissez votre phrase de passe une seconde fois pour la confirmer.",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Cet appareil peut à présent vérifier d’autres appareils, qui pourront alors accéder aux messages chiffrés et seront vus comme fiables par les autres utilisateurs.",
     "Verify other users in their profile.": "Vérifiez d’autres utilisateurs dans leur profil.",
     "Upgrade your encryption": "Mettre à niveau votre chiffrement",
     "Set up encryption": "Configurer le chiffrement",
@@ -2105,7 +1941,6 @@
     "Encryption setup complete": "Configuration du chiffrement terminé",
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s a activé le chiffrement de bout en bout.",
     "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s non reconnu).",
-    "Someone is using an unknown device": "Quelqu'un utilise un appareil inconnu",
     "This room is end-to-end encrypted": "Ce salon est chiffré de bout en bout",
     "Everyone in this room is verified": "Tout le monde dans ce salon est vérifié",
     "Invite only": "Uniquement sur invitation",
@@ -2115,9 +1950,7 @@
     "Verify this session": "Vérifier cette session",
     "Encryption upgrade available": "Mise à niveau du chiffrement disponible",
     "Enable message search in encrypted rooms": "Activer la recherche de messages dans les salons chiffrés",
-    "Review & verify your new session": "Examiner et vérifier votre nouvelle session",
     "Review": "Examiner",
-    "Verify your other devices easier": "Vérifiez vos autres appareils facilement",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche, en utilisant ",
     " to store messages from ": " pour stocker des messages de ",
     "rooms.": "salons.",
@@ -2138,7 +1971,6 @@
     "Waiting for %(displayName)s to verify…": "Nous attendons que %(displayName)s vérifie…",
     "They match": "Ils correspondent",
     "They don't match": "Ils ne correspondent pas",
-    "For ultimate security, do this in person or use another way to communicate.": "Pour une sécurité maximale, faites cela en personne ou utilisez un autre moyen de communication.",
     "This bridge was provisioned by <user />.": "Cette passerelle a été fournie par <user />.",
     "Workspace: %(networkName)s": "Espace de travail : %(networkName)s",
     "Channel: %(channelName)s": "Canal : %(channelName)s",
@@ -2153,7 +1985,6 @@
     "Your homeserver": "Votre serveur d’accueil",
     "The homeserver the user you’re verifying is connected to": "Le serveur d’accueil auquel l’utilisateur que vous vérifiez est connecté",
     "Yours, or the other users’ internet connection": "Votre connexion internet ou celle de l’autre utilisateur",
-    "Yours, or the other users’ device": "Votre appareil ou celui de l’autre ordinateur",
     "Verify by emoji": "Vérifier avec des émojis",
     "Verify by comparing unique emoji.": "Vérifier en comparant des émojis uniques.",
     "Ask %(displayName)s to scan your code:": "Demandez à %(displayName)s de scanner votre code :",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 0b80c41f65..346dda09f2 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -11,7 +11,6 @@
     "You cannot place a call with yourself.": "Non pode facer unha chamada a si mesmo.",
     "Warning!": "Aviso!",
     "Call Failed": "Fallou a chamada",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: se segue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
     "Review Devices": "Revisar dispositivos",
     "Call Anyway": "Chamar igualmente",
     "Answer Anyway": "Responder igualmente",
@@ -66,10 +65,6 @@
     "Moderator": "Moderador",
     "Admin": "Administrador",
     "Start a chat": "Iniciar unha conversa",
-    "Who would you like to communicate with?": "Con quen desexa comunicarse?",
-    "Start Chat": "Iniciar conversa",
-    "Invite new room members": "Convidar a novos participantes",
-    "Send Invites": "Enviar convites",
     "Operation failed": "Fallou a operación",
     "Failed to invite": "Fallou o convite",
     "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando os seguintes usuarios á sala %(roomName)s:",
@@ -92,13 +87,7 @@
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
     "Unignored user": "Usuarios non ignorados",
     "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
-    "Unknown (user, device) pair:": "Parella descoñecida (dispositivo, usuaria):",
-    "Device already verified!": "Dispositivo xa verificado!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "Aviso: o dispositivo xa está verificado só que as chaves NON CONCORDAN!",
-    "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!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para o %(userId)s e  dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Isto podería significar que as súas  comunicacións están a ser interceptadas!",
     "Verified key": "Chave verificada",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibiu do  dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
-    "Unrecognised command:": "Orde non recoñecida:",
     "Reason": "Razón",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s aceptou o convite.",
@@ -135,7 +124,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para todos participantes o historial futuro da sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado de par-a-par (algoritmo %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
@@ -158,8 +146,6 @@
     "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
     "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
     "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
-    "Never send encrypted messages to unverified devices from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados neste dispositivo",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nunca enviar mensaxes cifradas aos dispositivos que non estean verificados nesta sala desde este dispositivo",
     "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL",
     "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só lle afecta a vostede)",
     "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
@@ -181,7 +167,6 @@
     "No display name": "Sen nome público",
     "New passwords don't match": "Os contrasinais novos non coinciden",
     "Passwords can't be empty": "Os contrasinais non poden estar baleiros",
-    "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.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos isto.",
     "Continue": "Continuar",
     "Export E2E room keys": "Exportar chaves E2E da sala",
     "Do you want to set an email address?": "Quere establecer un enderezo de correo electrónico?",
@@ -190,10 +175,7 @@
     "New Password": "Novo contrasinal",
     "Confirm password": "Confirme o contrasinal",
     "Change Password": "Cambiar contrasinal",
-    "Unable to load device list": "Non se puido cargar a lista de dispositivos",
     "Authentication": "Autenticación",
-    "Delete %(count)s devices|other": "Eliminar %(count)s dispositivos",
-    "Delete %(count)s devices|one": "Eliminar dispositivo",
     "Device ID": "ID de dispositivo",
     "Last seen": "Visto por última vez",
     "Failed to set display name": "Fallo ao establecer o nome público",
@@ -213,9 +195,6 @@
     "%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
     "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro",
     "Options": "Axustes",
-    "Undecryptable": "Non descifrable",
-    "Encrypted by an unverified device": "Cifrado por un dispositivo non verificado",
-    "Unencrypted message": "Mensaxe non cifrada",
     "Please select the destination room for this message": "Escolla por favor a sala de destino para esta mensaxe",
     "Blacklisted": "Omitidos",
     "device id: ": "id dispositivo: ",
@@ -234,8 +213,6 @@
     "Failed to change power level": "Fallo ao cambiar o nivel de permisos",
     "Are you sure?": "Está segura?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que lle estará promocionando e outorgándolle a outra persoa os mesmos permisos que os seus.",
-    "No devices with registered encryption keys": "Sen dispositivos con chaves de cifrado rexistradas",
-    "Devices": "Dispositivos",
     "Unignore": "Non ignorar",
     "Ignore": "Ignorar",
     "Jump to read receipt": "Ir ao resgardo de lectura",
@@ -258,20 +235,14 @@
     "Voice call": "Chamada de voz",
     "Video call": "Chamada de vídeo",
     "Upload file": "Subir ficheiro",
-    "Show Text Formatting Toolbar": "Mostrar barra de formato de texto",
     "Send an encrypted reply…": "Enviar unha resposta cifrada…",
     "Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…",
     "Send an encrypted message…": "Enviar unha mensaxe cifrada…",
     "Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…",
     "You do not have permission to post to this room": "Non ten permiso para comentar nesta sala",
-    "Hide Text Formatting Toolbar": "Agochar barra de formato de texto",
     "Server error": "Fallo no servidor",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
     "Command error": "Erro na orde",
-    "bold": "remarcado",
-    "italic": "cursiva",
-    "Markdown is disabled": "Markdown desactivado",
-    "Markdown is enabled": "Markdown activado",
     "Unpin Message": "Desfixar mensaxe",
     "Jump to message": "Ir a mensaxe",
     "No pinned messages.": "Sen mensaxes fixadas.",
@@ -307,7 +278,6 @@
     "Community Invites": "Convites da comunidade",
     "Invites": "Convites",
     "Favourites": "Favoritas",
-    "People": "Xente",
     "Rooms": "Salas",
     "Low priority": "Baixa prioridade",
     "Historical": "Historial",
@@ -342,8 +312,6 @@
     "Cancel": "Cancelar",
     "Jump to first unread message.": "Ir a primeira mensaxe non lida.",
     "Close": "Pechar",
-    "Invalid alias format": "Formato de alias non válido",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' non é un formato válido para un alias",
     "not specified": "non indicado",
     "Remote addresses for this room:": "Enderezos remotos para esta sala:",
     "Local addresses for this room:": "O enderezo local para esta sala:",
@@ -505,20 +473,12 @@
     "Unknown error": "Fallo descoñecido",
     "Incorrect password": "Contrasinal incorrecto",
     "Deactivate Account": "Desactivar conta",
-    "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:": "Para verificar que se pode confiar neste dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle se a clave que ven nos axustes de usuario do se dispositivo coincide coa clave inferior:",
-    "Device name": "Nome do dispositivo",
-    "Device key": "Chave do dispositivo",
-    "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.": "Se concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.",
-    "Verify device": "Verificar dispositivo",
     "I verify that the keys match": "Certifico que coinciden as chaves",
     "An error has occurred.": "Algo fallou.",
     "OK": "OK",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadiu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo non verificado '%(displayName)s' está solicitando chaves de cifrado.",
     "Start verification": "Iniciar verificación",
     "Share without verifying": "Compartir sen verificar",
     "Ignore request": "Ignorar petición",
-    "Loading device info...": "Cargando información do dispositivo...",
     "Encryption key request": "Petición de chave de cifrado",
     "Unable to restore session": "Non se puido restaurar a sesión",
     "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.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volva a versión máis recente.",
@@ -537,11 +497,6 @@
     "To get started, please pick a username!": "Para comezar, escolla un nome de usuaria!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será o nome da súa conta no <span></span> servidor, ou pode escoller un <a>servidor diferente</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se xa ten unha conta Matrix entón pode <a>conectarse</a>.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neste momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.",
-    "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.": "Recomendámoslle que vaia ao proceso de verificación para cada dispositivo para confirmar que pertencen ao seu dono lexítimos, pero se o prefire pode enviar a mensaxe sen ter verificado.",
-    "Room contains unknown devices": "A sala contén dispositivos descoñecidos",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contén dispositivos que vostede non vira antes.",
-    "Unknown devices": "Dispositivos descoñecidos",
     "Private Chat": "Conversa privada",
     "Public Chat": "Conversa pública",
     "Custom": "Personalizada",
@@ -599,8 +554,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
     "You have no visible notifications": "Non ten notificacións visibles",
     "Scroll to bottom of page": "Desprácese ate o final da páxina",
-    "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostrar dispositivos</showDevicesText>, <sendAnywayText>enviar igualmente</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
     "%(count)s of your messages have not been sent.|one": "A súa mensaxe non foi enviada.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> ou ben<cancelText>cancelar todo</cancelText>. Tamén pode seleccionar mensaxes individuais para reenviar ou cancelar.",
@@ -634,13 +587,10 @@
     "Sign out": "Desconectar",
     "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
     "Success": "Parabéns",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "O seu contrasinal cambiouse correctamente. Non recibirá notificacións tipo push en outros dispositivos ate que se conecte novamente en eles",
     "Unable to remove contact information": "Non se puido eliminar a información do contacto",
     "<not supported>": "<non soportado>",
     "Import E2E room keys": "Importar chaves E2E da sala",
     "Cryptography": "Criptografía",
-    "Device ID:": "ID de dispositivo:",
-    "Device key:": "Chave do dispositivo:",
     "Analytics": "Analytics",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
@@ -664,7 +614,6 @@
     "click to reveal": "pulse para revelar",
     "Homeserver is": "O servidor de inicio é",
     "Identity Server is": "O servidor de identidade é",
-    "matrix-react-sdk version:": "versión matrix-react-sdk:",
     "riot-web version:": "versión riot-web:",
     "olm version:": "versión olm:",
     "Failed to send email": "Fallo ao enviar correo electrónico",
@@ -695,7 +644,6 @@
     "Kicks user with given id": "Expulsa usuaria co id proporcionado",
     "Changes your display nickname": "Cambia o alcume mostrado",
     "Searches DuckDuckGo for results": "Buscar en DuckDuckGo por resultados",
-    "Verifies a user, device, and pubkey tuple": "Valida o conxunto de usuaria, dispositivo e chave pública",
     "Ignores a user, hiding their messages from you": "Ignora unha usuaria, agochándolle as súas mensaxes",
     "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar unha usuaria, mostrándolles as súas mensaxes a partir de agora",
     "Commands": "Comandos",
@@ -719,7 +667,6 @@
     "Session ID": "ID de sesión",
     "End-to-end encryption information": "Información do cifrado extremo-a-extremo",
     "Event information": "Información do evento",
-    "Sender device information": "Información do dispositivo do remitente",
     "Passphrases must match": "As frases de paso deben coincidir",
     "Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
     "Export room keys": "Exportar chaves da sala",
@@ -750,11 +697,7 @@
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave -  por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
-    "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.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Se rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se os seus outros dispositivos non teñen as chaves para este mensaxe non poderán descifrala.",
     "Key request sent.": "Petición de chave enviada.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Volver a pedir chaves de cifrado</requestLink> desde os outros dispositivos.",
     "Flair": "Aura",
     "Showing flair for these communities:": "Mostrar a aura para estas comunidades:",
     "Display your community flair in rooms configured to show it.": "Mostrar a aura da súa comunidade nas salas configuradas para que a mostren.",
@@ -823,7 +766,6 @@
     "Files": "Ficheiros",
     "Collecting app version information": "Obtendo información sobre a versión da app",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto permitiralle volver a súa conta tras desconectarse, e conectarse en outros dispositivos.",
     "Keywords": "Palabras chave",
     "Enable notifications for this account": "Activar notificacións para esta conta",
     "Invite to this community": "Convidar a esta comunidade",
@@ -912,8 +854,6 @@
     "Your device resolution": "Resolución do dispositivo",
     "Missing roomId.": "Falta o ID da sala.",
     "Always show encryption icons": "Mostra sempre iconas de cifrado",
-    "Unable to reply": "Non puido responder",
-    "At this time it is not possible to reply with an emote.": "Neste intre non é posible responder con un emote.",
     "Popout widget": "trebello emerxente",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Non se cargou o evento ao que respondía, ou non existe ou non ten permiso para velo.",
     "Send Logs": "Enviar informes",
@@ -958,12 +898,6 @@
     "This event could not be displayed": "Non se puido amosar este evento",
     "Demote yourself?": "Baixarse a si mesmo de rango?",
     "Demote": "Baixar de rango",
-    "deleted": "eliminado",
-    "underlined": "subliñado",
-    "inline-code": "código en liña",
-    "block-quote": "bloque de citas",
-    "bulleted-list": "lista de puntos",
-    "numbered-list": "lista numérica",
     "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.": "Nas salas cifradas, como é esta, está desactivado por defecto a previsualización das URL co fin de asegurarse de que o servidor local (que é onde se gardan as previsualizacións) non poida recoller información sobre das ligazóns que se ven nesta sala.",
     "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.": "Cando alguén pon unha URL na mensaxe, esta previsualízarase para que así se coñezan xa cousas delas como o título, a descrición ou as imaxes que inclúe ese sitio web.",
     "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 335c516105..9c3e383afc 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -3,7 +3,6 @@
     "This phone number is already in use": "מספר הטלפון הזה כבר בשימוש",
     "Failed to verify email address: make sure you clicked the link in the email": "אימות כתובת הדוא\"ל נכשלה: וודא שלחצת על הקישור בדוא\"ל",
     "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.": "ישנם מכשירים לא ידועים בחדר: המשך ללא אימותם יאפשר למישהו לצוטט לשיחתך.",
     "Review Devices": "סקירת מכשירים",
     "Call Anyway": "התקשר בכל זאת",
     "Answer Anyway": "ענה בכל זאת",
@@ -126,7 +125,6 @@
     "Resend": "שלח מחדש",
     "Collecting app version information": "אוסף מידע על גרסת היישום",
     "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.": "זה יאפשר לך לחזור לחשבונך אחרי התנתקות ולהתחבר באמצעות התקנים אחרים.",
     "Keywords": "מילות מפתח",
     "Enable notifications for this account": "אפשר התראות לחשבון זה",
     "Invite to this community": "הזמן לקהילה זו",
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index 5afba35a94..3028566536 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -27,7 +27,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Riot.im को बेहतर बनाने के लिए हमें भेजी गई जानकारी में निम्नलिखित शामिल हैं:",
     "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": "कॉल विफल",
-    "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": "डिवाइस की समीक्षा करें",
     "Call Anyway": "वैसे भी कॉल करें",
     "Answer Anyway": "वैसे भी जवाब दें",
@@ -99,10 +98,6 @@
     "Moderator": "मध्यस्थ",
     "Admin": "व्यवस्थापक",
     "Start a chat": "एक चैट शुरू करें",
-    "Who would you like to communicate with?": "आप किसके साथ संवाद करना चाहते हैं?",
-    "Start Chat": "चैट शुरू करें",
-    "Invite new room members": "नए रूम के सदस्यों को आमंत्रित करें",
-    "Send Invites": "आमंत्रण भेजें",
     "Operation failed": "कार्रवाई विफल",
     "Failed to invite": "आमंत्रित करने में विफल",
     "Failed to invite the following users to the %(roomName)s room:": "निम्नलिखित उपयोगकर्ताओं को %(roomName)s रूम में आमंत्रित करने में विफल:",
@@ -139,16 +134,9 @@
     "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.": "आपके द्वारा प्रदान की गई हस्ताक्षर कुंजी %(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 ने एक निमंत्रण स्वीकार कर लिया।",
@@ -193,7 +181,6 @@
     "%(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 ने रूम के लिए पिन किए गए संदेश को बदल दिया।",
@@ -225,8 +212,6 @@
     "Automatically replace plain text Emoji": "स्वचालित रूप से सादा पाठ इमोजी को प्रतिस्थापित करें",
     "Mirror local video feed": "स्थानीय वीडियो फ़ीड को आईना करें",
     "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": "इस रूम में प्रतिभागियों के लिए डिफ़ॉल्ट रूप से यूआरएल पूर्वावलोकन सक्षम करें",
@@ -261,7 +246,6 @@
     "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?": "क्या आप एक ईमेल पता सेट करना चाहते हैं?",
     "Current password": "वर्तमान पासवर्ड",
@@ -269,10 +253,7 @@
     "New Password": "नया पासवर्ड",
     "Confirm password": "पासवर्ड की पुष्टि कीजिये",
     "Change Password": "पासवर्ड बदलें",
-    "Unable to load device list": "डिवाइस सूची लोड करने में असमर्थ",
     "Authentication": "प्रमाणीकरण",
-    "Delete %(count)s devices|other": "%(count)s यंत्र हटाएं",
-    "Delete %(count)s devices|one": "यंत्र हटाएं",
     "Device ID": "यंत्र आईडी",
     "Last seen": "अंतिम बार देखा गया",
     "Failed to set display name": "प्रदर्शन नाम सेट करने में विफल",
@@ -280,12 +261,7 @@
     "Enable Notifications": "सूचनाएं सक्षम करें",
     "Delete Backup": "बैकअप हटाएं",
     "Unable to load key backup status": "कुंजी बैकअप स्थिति लोड होने में असमर्थ",
-    "Backup has a <validity>valid</validity> signature from this device": "इस डिवाइस से बैकअप में <validity> वैध </ validity> हस्ताक्षर है",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "<verify>असत्यापित</ verify> डिवाइस <device></ device> से बैकअप में <validity>मान्य</validity> हस्ताक्षर है",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "<verify>सत्यापित</ verify> डिवाइस <device></ device> से बैकअप में <validity>अमान्य</validity> हस्ताक्षर है",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "<verify>असत्यापित</ verify> डिवाइस <device></ device> से बैकअप में <validity>अमान्य</validity> हस्ताक्षर है",
     "Verify...": "सत्यापित करें ...",
-    "Backup is not signed by any of your devices": "बैकअप आपके किसी भी डिवाइस द्वारा हस्ताक्षरित नहीं है",
     "Backup version: ": "बैकअप संस्करण: ",
     "Algorithm: ": "कलन विधि: ",
     "Error saving email notification preferences": "ईमेल अधिसूचना प्राथमिकताओं को सहेजने में त्रुटि",
@@ -341,7 +317,6 @@
     "Messages containing @room": "@Room युक्त संदेश",
     "Encrypted messages in one-to-one chats": "एक एक के साथ चैट में एन्क्रिप्टेड संदेश",
     "Encrypted messages in group chats": "समूह चैट में एन्क्रिप्टेड संदेश",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "बैकअप के पास  <verify>सत्यापित</verify> डिवाइस <device></device> से <validity>वैध</validity> हस्ताक्षर है",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "हो सकता है कि आपने उन्हें रायट के अलावा किसी अन्य ग्राहक में कॉन्फ़िगर किया हो। आप उन्हें रायट में ट्यून नहीं कर सकते लेकिन वे अभी भी आवेदन करते हैं",
     "Show message in desktop notification": "डेस्कटॉप अधिसूचना में संदेश दिखाएं",
     "Off": "बंद",
@@ -360,14 +335,7 @@
     "%(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": "डिक्रिप्ट करना संभव नहीं",
-    "Encrypted by an unverified device": "एक असत्यापित डिवाइस द्वारा एन्क्रिप्ट किया गया",
-    "Unencrypted message": "बिना एन्क्रिप्ट वाला संदेश",
     "Please select the destination room for this message": "कृपया इस संदेश के लिए गंतव्य रूम का चयन करें",
     "Blacklisted": "काली सूची में डाला गया",
     "device id: ": "डिवाइस आईडी: ",
@@ -389,8 +357,6 @@
     "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.": "आप इस परिवर्तन को पूर्ववत नहीं कर पाएंगे क्योंकि आप उपयोगकर्ता को अपने आप से समान शक्ति स्तर रखने के लिए प्रोत्साहित कर रहे हैं।",
     "Are you sure?": "क्या आपको यकीन है?",
-    "No devices with registered encryption keys": "पंजीकृत एन्क्रिप्शन कुंजी के साथ कोई डिवाइस नहीं",
-    "Devices": "उपकरण",
     "Unignore": "अनदेखा न करें",
     "Ignore": "अनदेखा करें",
     "Jump to read receipt": "पढ़ी हुई रसीद में कूदें",
@@ -410,20 +376,11 @@
     "Invited": "आमंत्रित",
     "Filter room members": "रूम के सदस्यों को फ़िल्टर करें",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (शक्ति %(powerLevelNumber)s)",
-    "bold": "बोल्ड",
-    "italic": "तिरछा",
-    "deleted": "हटाए गए",
-    "underlined": "रेखांकित",
-    "inline-code": "इनलाइन कोड",
-    "block-quote": "ब्लॉक उद्धरण",
-    "bulleted-list": "बुलेटेड सूची",
-    "numbered-list": "गिने-सूची",
     "Attachment": "आसक्ति",
     "Hangup": "फोन रख देना",
     "Voice call": "आवाज कॉल",
     "Video call": "वीडियो कॉल",
     "Upload file": "फाइल अपलोड करें",
-    "Show Text Formatting Toolbar": "टेक्स्ट स्वरूपण टूलबार दिखाएं",
     "Send an encrypted reply…": "एक एन्क्रिप्टेड उत्तर भेजें …",
     "Send a reply (unencrypted)…": "एक उत्तर भेजें (अनएन्क्रिप्टेड) …",
     "Send an encrypted message…": "एक एन्क्रिप्टेड संदेश भेजें …",
@@ -431,14 +388,9 @@
     "This room has been replaced and is no longer active.": "इस रूम को बदल दिया गया है और अब सक्रिय नहीं है।",
     "The conversation continues here.": "वार्तालाप यहां जारी है।",
     "You do not have permission to post to this room": "आपको इस रूम में पोस्ट करने की अनुमति नहीं है",
-    "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": "मार्कडाउन सक्षम है",
     "No pinned messages.": "कोई पिन संदेश नहीं।",
     "Loading...": "लोड हो रहा है...",
     "Pinned Messages": "पिन किए गए संदेश",
@@ -502,7 +454,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "इस उपयोगकर्ता की पुष्टि करें कि उनकी स्क्रीन पर निम्नलिखित इमोजी दिखाई देते हैं।",
     "Verify this user by confirming the following number appears on their screen.": "निम्न स्क्रीन पर दिखाई देने वाली संख्या की पुष्टि करके इस उपयोगकर्ता को सत्यापित करें।",
     "Unable to find a supported verification method.": "समर्थित सत्यापन विधि खोजने में असमर्थ।",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "अधिकतम सुरक्षा के लिए, हम अनुशंसा करते हैं कि आप इसे व्यक्ति में करें या संचार के किसी अन्य विश्वसनीय साधन का उपयोग करें।",
     "Dog": "कुत्ता",
     "Cat": "बिल्ली",
     "Lion": "शेर",
@@ -548,7 +499,6 @@
     "Book": "पुस्तक",
     "Pencil": "पेंसिल",
     "Paperclip": "पेपर क्लिप",
-    "Padlock": "ताला",
     "Key": "चाबी",
     "Hammer": "हथौड़ा",
     "Telephone": "टेलीफोन",
@@ -566,7 +516,6 @@
     "Headphones": "हेडफोन",
     "Folder": "फ़ोल्डर",
     "Pin": "पिन",
-    "Your homeserver does not support device management.": "आपका होम सर्वर डिवाइस प्रबंधन का समर्थन नहीं करता है।",
     "Unable to remove contact information": "संपर्क जानकारी निकालने में असमर्थ",
     "Yes": "हाँ",
     "No": "नहीं",
@@ -580,21 +529,16 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "क्या आपको यकीन है? यदि आपकी कुंजियाँ ठीक से बैकअप नहीं हैं तो आप अपने एन्क्रिप्टेड संदेशों को खो देंगे।",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "एन्क्रिप्ट किए गए संदेश एंड-टू-एंड एन्क्रिप्शन के साथ सुरक्षित हैं। केवल आपके और प्राप्तकर्ता के पास ही इन संदेशों को पढ़ने की कुंजी है।",
     "Restore from Backup": "बैकअप से बहाल करना",
-    "This device is backing up your keys. ": "यह उपकरण आपकी कुंजी का बैकअप ले रहा है। ",
     "Back up your keys before signing out to avoid losing them.": "उन्हें खोने से बचने के लिए साइन आउट करने से पहले अपनी कुंजियों का बैकअप लें।",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s कुंजी का बैकअप कर रहा है ...",
     "All keys backed up": "सभी कुंजियाँ वापस आ गईं",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "बैकअप में आईडी %(deviceId)s के साथ <verify>अज्ञात</verify> डिवाइस से एक हस्ताक्षर है।",
-    "This backup is trusted because it has been restored on this device": "यह बैकअप विश्वसनीय है क्योंकि इसे इस उपकरण पर पुनर्स्थापित किया गया है",
     "Advanced": "उन्नत",
-    "Your keys are <b>not being backed up from this device</b>.": "आपकी कुंजी <b>इस उपकरण से समर्थित नहीं है</b>।",
     "Start using Key Backup": "कुंजी बैकअप का उपयोग करना शुरू करें",
     "Add an email address to configure email notifications": "ईमेल सूचनाओं को कॉन्फ़िगर करने के लिए एक ईमेल पता जोड़ें",
     "Unable to verify phone number.": "फ़ोन नंबर सत्यापित करने में असमर्थ।",
     "Verification code": "पुष्टि संख्या",
     "Phone Number": "फ़ोन नंबर",
     "Profile picture": "प्रोफ़ाइल फोटो",
-    "Upload profile picture": "प्रोफ़ाइल चित्र अपलोड करें",
     "Display Name": "प्रदर्शित होने वाला नाम",
     "Save": "अमुकनाम्ना",
     "This room is not accessible by remote Matrix servers": "यह रूम रिमोट मैट्रिक्स सर्वर द्वारा सुलभ नहीं है",
@@ -611,7 +555,6 @@
     "URL Previews": "URL पूर्वावलोकन",
     "Failed to change password. Is your password correct?": "पासवर्ड बदलने में विफल। क्या आपका पासवर्ड सही है?",
     "Success": "सफल",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "आपका पासवर्ड सफलतापूर्वक बदल दिया गया था। जब तक आप उन्हें वापस लॉग इन नहीं करेंगे तब तक आपको अन्य डिवाइस पर पुश नोटिफिकेशन नहीं मिलेगा",
     "Profile": "प्रोफाइल",
     "Account": "अकाउंट",
     "Set a new account password...": "नया खाता पासवर्ड सेट करें ...",
@@ -634,7 +577,6 @@
     "Submit debug logs": "डिबग लॉग जमा करें",
     "FAQ": "सामान्य प्रश्न",
     "Versions": "संस्करण",
-    "matrix-react-sdk version:": "मैट्रिक्स-प्रतिक्रिया-एसडीके संस्करण:",
     "riot-web version:": "रायट-वेब संस्करण:",
     "olm version:": "olm संस्करण:",
     "Homeserver is": "होमेसेर्वेर हैं",
@@ -659,8 +601,6 @@
     "<not supported>": "<समर्थित नहीं>",
     "Import E2E room keys": "E2E कक्ष की चाबियां आयात करें",
     "Cryptography": "क्रिप्टोग्राफी",
-    "Device ID:": "डिवाइस आईडी:",
-    "Device key:": "डिवाइस कुंजी:",
     "Ignored users": "अनदेखी उपयोगकर्ताओं",
     "Bulk options": "थोक विकल्प",
     "Reject all %(invitedRooms)s invites": "सभी %(invitedRooms)s की आमंत्रण को अस्वीकार करें",
@@ -689,17 +629,11 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "इस समय किसी फ़ाइल के साथ उत्तर देना संभव नहीं है। क्या आप इस फ़ाइल को बिना उत्तर दिए अपलोड करना चाहेंगे?",
     "The file '%(fileName)s' failed to upload.": "फ़ाइल '%(fileName)s' अपलोड करने में विफल रही।",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "एक सादे पाठ संदेश के लिए ¯\\_(ツ)_/¯ प्रस्तुत करता है",
-    "Room upgrade confirmation": "रूम के उन्नयन की पुष्टि",
-    "Upgrading a room can be destructive and isn't always necessary.": "एक कमरे को अपग्रेड करना विनाशकारी हो सकता है और हमेशा आवश्यक नहीं होता है।",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "एक कमरे के संस्करण को <i>अस्थिर</i> माना जाता है, तो आमतौर पर कमरे के उन्नयन की सिफारिश की जाती है। अस्थिर कमरे के संस्करणों में बग, लापता विशेषताएं या सुरक्षा कमजोरियां हो सकती हैं।",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "रूम का उन्नयन आमतौर पर केवल रूम के <i>सर्वर-साइड</i> को प्रभावित करता है। यदि आपको अपने रायट क्लाइंट के साथ समस्या हो रही है, तो कृपया <issueLink/> के साथ एक समस्या दर्ज करें।",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>चेतावनी</b>: किसी कमरे को अपग्रेड करना <i>कमरे के सदस्यों को कमरे के नए संस्करण में स्वचालित रूप से माइग्रेट नहीं करना है।</i> हम कमरे के पुराने संस्करण में नए कमरे के लिए एक लिंक पोस्ट करेंगे। नए कमरे में शामिल होने के लिए कमरे के सदस्यों को इस लिंक पर क्लिक करना होगा।",
     "Adds a custom widget by URL to the room": "रूम में URL द्वारा एक कस्टम विजेट जोड़ता है",
     "Please supply a https:// or http:// widget URL": "कृपया एक https:// या http:// विजेट URL की आपूर्ति करें",
     "You cannot modify widgets in this room.": "आप इस रूम में विजेट्स को संशोधित नहीं कर सकते।",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ने कमरे में शामिल होने के लिए %(targetDisplayName)s के निमंत्रण को रद्द कर दिया।",
     "User %(userId)s is already in the room": "उपयोगकर्ता %(userId)s पहले से ही रूम में है",
-    "The user must be unbanned before they can be invited.": "उपयोगकर्ता को आमंत्रित करने से पहले उन्हें प्रतिबंधित किया जाना चाहिए।",
-    "Enable desktop notifications for this device": "इस उपकरण के लिए डेस्कटॉप सूचनाएं सक्षम करें",
-    "Enable audible notifications for this device": "इस उपकरण के लिए श्रव्य सूचनाएँ सक्षम करें"
+    "The user must be unbanned before they can be invited.": "उपयोगकर्ता को आमंत्रित करने से पहले उन्हें प्रतिबंधित किया जाना चाहिए।"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0ef0a7eeec..9de0f42ab9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -71,7 +71,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
     "Changes your display nickname": "Becenév megváltoztatása",
-    "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.": "Jelszó megváltoztatása jelenleg alaphelyzetbe állítja a titkosításnál használt kulcsokat minden készüléken, ezzel a régi titkosított üzenetek olvashatatlanok lesznek hacsak először nem mented ki a kulcsokat és újra betöltöd. A jövőben ezen javítunk.",
     "Claimed Ed25519 fingerprint key": "Igényelt Ed25519 ujjlenyomat kulcs",
     "Click here to fix": "A javításhoz kattints ide",
     "Click to mute audio": "Hang némításhoz kattints ide",
@@ -95,12 +94,8 @@
     "Decrypt %(text)s": "%(text)s visszafejtése",
     "Decryption error": "Visszafejtési hiba",
     "Default": "Alapértelmezett",
-    "Device already verified!": "Készülék már ellenőrizve!",
     "Device ID": "Készülék azonosító",
-    "Device ID:": "Készülék azonosító:",
     "device id: ": "készülék azonosító: ",
-    "Device key:": "Készülék kulcs:",
-    "Devices": "Készülékek",
     "Direct chats": "Közvetlen csevegés",
     "Disable Notifications": "Értesítések tiltása",
     "Disinvite": "Meghívás visszavonása",
@@ -112,7 +107,6 @@
     "Email address": "E-mail cím",
     "Emoji": "Emoji",
     "Enable Notifications": "Értesítések bekapcsolása",
-    "Encrypted by an unverified device": "Nem ellenőrzött eszköz által titkosítva",
     "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
     "End-to-end encryption information": "Ponttól pontig való titkosítási információk",
     "Enter passphrase": "Jelmondat megadása",
@@ -148,7 +142,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s : %(fromPowerLevel)s -> %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Vendégek akkor sem csatlakozhatnak ehhez a szobához ha külön meghívók kaptak.",
     "Hangup": "Megszakít",
-    "Hide Text Formatting Toolbar": "Szövegformázási menü elrejtése",
     "Historical": "Archív",
     "Home": "Kezdőlap",
     "Homeserver is": "Matrix szerver:",
@@ -161,15 +154,12 @@
     "Incoming voice call from %(name)s": "Bejövő hívás: %(name)s",
     "Incorrect username and/or password.": "Helytelen felhasználó és/vagy jelszó.",
     "Incorrect verification code": "Hibás azonosítási kód",
-    "Invalid alias format": "Hibás alternatív név formátum",
     "Invalid Email Address": "Hibás e-mail cím",
     "Invalid file%(extra)s": "Hibás fájl%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
-    "Invite new room members": "Új tagok meghívása",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
     "Invites user with given id to current room": "Felhasználó meghívása ebbe a szobába megadott azonosítóval",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nem megfelelő formátum egy alternatív névhez",
     "Sign in with": "Belépés ezzel:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hang</voiceText>gal vagy <videoText>videó</videoText>val.",
     "Join Room": "Belépés a szobába",
@@ -192,16 +182,10 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik bárki.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
     "Manage Integrations": "Integrációk kezelése",
-    "Markdown is disabled": "Markdown kikapcsolva",
-    "Markdown is enabled": "Markdown engedélyezett",
-    "matrix-react-sdk version:": "matrix-react-sdk verzió:",
-    "Message not sent due to unknown devices being present": "Ismeretlen eszköz miatt az üzenet nem küldhető el",
     "Missing room_id in request": "Hiányzó room_id a kérésben",
     "Missing user_id in request": "Hiányzó user_id a kérésben",
     "Moderator": "Moderátor",
     "Name": "Név",
-    "Never send encrypted messages to unverified devices from this device": "Soha ne küldj titkosított üzenetet ellenőrizetlen eszközre erről az eszközről",
-    "Never send encrypted messages to unverified devices in this room from this device": "Soha ne küldj titkosított üzenetet ebből a szobából ellenőrizetlen eszközre erről az eszközről",
     "New address (e.g. #foo:%(localDomain)s)": "Új cím (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "Az új jelszavak nem egyeznek",
     "New passwords must match each other.": "Az új jelszavaknak meg kell egyezniük egymással.",
@@ -210,7 +194,6 @@
     "(not supported by this browser)": "(ebben a böngészőben nem támogatott)",
     "<not supported>": "<nem támogatott>",
     "NOT verified": "NEM ellenőrzött",
-    "No devices with registered encryption keys": "Nincs eszköz a regisztrált titkosítási kulcsokhoz",
     "No display name": "Nincs megjelenítési név",
     "No more results": "Nincs több találat",
     "No results": "Nincs találat",
@@ -219,7 +202,6 @@
     "Only people who have been invited": "Csak akiket meghívtak",
     "Password": "Jelszó",
     "Passwords can't be empty": "A jelszó nem lehet üres",
-    "People": "Emberek",
     "Permissions": "Jogosultságok",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre. Ha ez megvan, kattints a folytatásra.",
@@ -244,7 +226,6 @@
     "riot-web version:": "riot-web verzió:",
     "Room %(roomId)s not visible": "%(roomId)s szoba nem látható",
     "Room Colour": "Szoba színe",
-    "Room contains unknown devices": "A szobában ellenőrizetlen eszközök vannak",
     "%(roomName)s does not exist.": "%(roomName)s nem létezik.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s jelenleg nem érhető el.",
     "Rooms": "Szobák",
@@ -254,8 +235,6 @@
     "Searches DuckDuckGo for results": "Keresés DuckDuckGo-val",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s %(dateTime)s időpontban látta",
     "Send anyway": "Küld mindenképpen",
-    "Sender device information": "Küldő eszközének információja",
-    "Send Invites": "Meghívók elküldése",
     "Send Reset Email": "Visszaállítási e-mail küldése",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
@@ -266,7 +245,6 @@
     "Session ID": "Kapcsolat azonosító",
     "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a megjelenítési nevét megváltoztatta erre: %(displayName)s.",
-    "Show Text Formatting Toolbar": "Szöveg formázási eszköztár megjelenítése",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
     "Signed Out": "Kijelentkezett",
     "Sign in": "Bejelentkezés",
@@ -275,11 +253,9 @@
     "Someone": "Valaki",
     "Start a chat": "Csevegés indítása",
     "Start authentication": "Azonosítás indítása",
-    "Start Chat": "Csevegés indítása",
     "Submit": "Elküld",
     "Success": "Sikeres",
     "The phone number entered looks invalid": "A megadott telefonszám érvénytelennek tűnik",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Az általad megadott aláíró kulcs megegyezik %(userId)s felhasználótól kapott kulccsal amit %(deviceId)s eszközhöz használ. Az eszköz ellenőrzöttnek jelölve.",
     "This email address is already in use": "Ez az e-mail cím már használatban van",
     "This email address was not found": "Az e-mail cím nem található",
     "The email address linked to your account must be entered.": "A fiókodhoz kötött e-mail címet add meg.",
@@ -293,7 +269,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítéshez a találatok betöltését és TAB-bal választhatsz közülük.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nincs jogod a kérdéses üzenetek megjelenítéséhez.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a  titkosítást ponttól pontig (algoritmus %(algorithm)s).",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
     "Unable to remove contact information": "A névjegy információkat nem sikerült törölni",
     "Unable to verify email address.": "Az e-mail cím ellenőrzése sikertelen.",
@@ -301,17 +276,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s visszaengedte %(targetName)s felhasználót.",
     "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
-    "Unable to load device list": "Az eszközlista betöltése sikertelen",
-    "Undecryptable": "Visszafejthetetlen",
     "unencrypted": "titkosítatlan",
-    "Unencrypted message": "Titkosítatlan üzenet",
     "unknown caller": "ismeretlen hívó",
     "unknown device": "ismeretlen eszköz",
     "Unknown room %(roomId)s": "Ismeretlen szoba %(roomId)s",
-    "Unknown (user, device) pair:": "Ismeretlen (felhasználó, eszköz) pár:",
     "Unmute": "Némítás kikapcsolása",
     "Unnamed Room": "Névtelen szoba",
-    "Unrecognised command:": "Ismeretlen parancs:",
     "Unrecognised room alias:": "Ismeretlen szoba becenév:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s feltöltése",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s és még %(count)s db másik feltöltése",
@@ -339,10 +309,8 @@
     "(no answer)": "(nincs válasz)",
     "(unknown failure: %(reason)s)": "(ismeretlen hiba: %(reason)s)",
     "Warning!": "Figyelem!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "Figyelem: Az eszköz már ellenőrzött, de a kulcsok NEM EGYEZNEK!",
     "Who can access this room?": "Ki éri el ezt a szobát?",
     "Who can read history?": "Ki olvashatja a régi üzeneteket?",
-    "Who would you like to communicate with?": "Kivel szeretnél beszélgetni?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s visszavonta %(targetName)s meghívóját.",
     "You are already in a call.": "Már hívásban vagy.",
     "You cannot place a call with yourself.": "Nem hívhatod fel saját magadat.",
@@ -355,7 +323,6 @@
     "You need to be able to invite users to do that.": "Hogy ezt csinálhasd meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix szerveren.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "A jelszavadat sikeresen megváltoztattuk. Addig nem fogsz leküldéses értesítéseket kapni, amíg a többi eszközön vissza nem jelentkezel",
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
@@ -393,8 +360,6 @@
     "(~%(count)s results)|one": "(~%(count)s db eredmény)",
     "(~%(count)s results)|other": "(~%(count)s db eredmény)",
     "Active call": "Folyamatban lévő hívás",
-    "bold": "félkövér",
-    "italic": "dőlt",
     "Please select the destination room for this message": "Kérlek add meg az üzenet cél szobáját",
     "New Password": "Új jelszó",
     "Start automatically after system login": "Rendszerindításkor automatikus elindítás",
@@ -416,13 +381,8 @@
     "Unknown error": "Ismeretlen hiba",
     "Incorrect password": "Helytelen jelszó",
     "To continue, please enter your password.": "A folytatáshoz, kérlek add meg a jelszavadat.",
-    "Device name": "Eszköz neve",
-    "Device key": "Eszköz kulcsa",
-    "Verify device": "Eszköz ellenőrzése",
     "I verify that the keys match": "Megerősítem, hogy a kulcsok egyeznek",
     "Unable to restore session": "A kapcsolatot nem lehet visszaállítani",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" szobában olyan eszközök vannak amiket még nem láttál.",
-    "Unknown devices": "Ismeretlen eszköz",
     "Unknown Address": "Ismeretlen cím",
     "Unblacklist": "Tiltólistáról kivesz",
     "Blacklist": "Tiltólistára",
@@ -458,16 +418,11 @@
     "Do you want to set an email address?": "Meg szeretnéd adni az e-mail címet?",
     "This will allow you to reset your password and receive notifications.": "Ezzel alaphelyzetbe tudod állítani a jelszavad és értesítéseket fogadhatsz.",
     "Deops user with given id": "A megadott azonosítójú felhasználó lefokozása",
-    "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!": "FIGYELEM: A KULCS ELLENŐRZÉS SIKERTELEN! A %(userId)s felhasználóhoz és %(deviceId)s eszközhöz tartozó \"%(fprint)s\" ujjlenyomat nem egyezik meg az ismert \"%(fingerprint)s\" ujjlenyomattal. Ez azt jelenti hogy a kapcsolatot lehallgathatják!",
     "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.": "Ezzel a folyamattal kimentheted a titkosított szobák üzeneteihez tartozó kulcsokat egy helyi fájlba. Ez után be tudod tölteni ezt a fájlt egy másik Matrix kliensbe, így az a kliens is vissza tudja fejteni az üzeneteket.",
     "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.": "A kimentett fájlal bárki el tudja olvasni a titkosított üzeneteket amiket te is, ezért tartsd biztonságban. Ehhez segítségül írj be egy jelmondatot amivel a kimentett adatok titkosításra kerülnek. Az adatok betöltése csak a jelmondat megadásával lehetséges később.",
     "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.": "Ezzel a folyamattal lehetőséged van betölteni a titkosítási kulcsokat amiket egy másik Matrix kliensből mentettél ki. Ez után minden üzenetet vissza tudsz fejteni amit a másik kliens tudott.",
     "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.": "Biztos hogy eltávolítod (törlöd) ezt az eseményt? Figyelem, ha törlöd vagy megváltoztatod a szoba nevét vagy a témát ez a változtatás érvényét vesztheti.",
-    "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:": "Az eszköz megbízhatóságának ellenőrzéséhez, lépj kapcsolatba a tulajdonossal valami más csatornán (pl. személyesen vagy telefon hívással) és kérdezd meg, hogy a kulcs amit a Felhasználói Beállításoknál látnak az eszközhöz megegyezik-e a kulccsal itt:",
-    "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.": "Ha megegyezik, nyomd meg az megerősítő gombot alul. Ha nem akkor valaki más használja az eszközt és inkább a Feketelista gombot szeretnéd használni.",
     "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.": "Ha egy újabb Riot verziót használtál valószínűleg ez kapcsolat nem lesz kompatibilis vele. Zárd be az ablakot és térj vissza az újabb verzióhoz.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Jelenleg fekete listára teszel minden ismeretlen eszközt. Ha üzenetet szeretnél küldeni ezekre az eszközökre először ellenőrizned kell őket.",
-    "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.": "Azt javasoljuk, hogy menj végig ellenőrző folyamaton minden eszköznél, hogy meg megerősítsd minden eszköz a jogos tulajdonosához tartozik, de újraküldheted az üzenetet ellenőrzés nélkül, ha úgy szeretnéd.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ha nem állítasz be e-mail címet nem fogod tudni a jelszavadat alaphelyzetbe állítani. Biztos vagy benne?",
     "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?": "Azonosítás céljából egy harmadik félhez leszel irányítva (%(integrationsUrl)s). Folytatod?",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ez lesz a felhasználói neved a <span></span> Matrix szerveren, vagy választhatsz egy <a>másik szervert</a>.",
@@ -475,8 +430,6 @@
     "Start verification": "Ellenőrzés megkezdése",
     "Share without verifying": "Megosztás ellenőrzés nélkül",
     "Ignore request": "Kérés figyelmen kívül hagyása",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Hozzáadtál egy új eszközt '%(displayName)s', ami titkosítási kulcsokat kér.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Az ellenőrizetlen eszközöd '%(displayName)s' titkosítási kulcsokat kér.",
     "Encryption key request": "Titkosítási kulcs kérés",
     "Check for update": "Frissítések keresése",
     "Add a widget": "Kisalkalmazás hozzáadása",
@@ -491,8 +444,6 @@
     "Unable to create widget.": "Nem lehet kisalkalmazást létrehozni.",
     "You are not in this room.": "Nem vagy ebben a szobában.",
     "You do not have permission to do that in this room.": "Nincs jogod ezt tenni ebben a szobában.",
-    "Verifies a user, device, and pubkey tuple": "A felhasználó, eszköz és publikus kulcs hármas ellenőrzése",
-    "Loading device info...": "Eszköz információk betöltése...",
     "Example": "Példa",
     "Create": "Létrehoz",
     "Featured Rooms:": "Kiemelt szobák:",
@@ -702,8 +653,6 @@
     "Idle for %(duration)s": "%(duration)s óta tétlen",
     "Offline for %(duration)s": "%(duration)s óta elérhetetlen",
     "Unknown for %(duration)s": "%(duration)s óta az állapota ismeretlen",
-    "Delete %(count)s devices|other": "%(count)s darab eszköz törlése",
-    "Delete %(count)s devices|one": "Eszköz törlése",
     "Flair": "Jelvény",
     "Showing flair for these communities:": "Ezekben a közösségekben mutassa a jelvényt:",
     "This room is not showing flair for any communities": "Ez a szoba nem mutat jelvényt egyetlen közösséghez sem",
@@ -713,7 +662,6 @@
     "collapse": "becsuk",
     "expand": "kinyit",
     "Call Failed": "Sikertelen hívás",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ismeretlen eszközök vannak ebben a szobában: ha ellenőrzés nélkül folytatod lehetséges, hogy valaki belehallgat a hívásba.",
     "Review Devices": "Eszközök áttekintése",
     "Call Anyway": "Mindenképpen hívj",
     "Answer Anyway": "Mindenképpen felvesz",
@@ -746,7 +694,6 @@
     "Your identity server's URL": "Az azonosítási szerver URL-t",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
     "Community IDs cannot be empty.": "A közösségi azonosító nem lehet üres.",
     "<a>In reply to</a> <pill>": "<a>Válasz neki</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
@@ -756,11 +703,7 @@
     "Clear filter": "Szűrő törlése",
     "Did you know: you can use communities to filter your Riot.im experience!": "Tudtad, hogy a Riot.im élmény fokozásához használhatsz közösségeket!",
     "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.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "A kulcs megosztási kérést elküldtük - ellenőrizd a többi eszközödön a kulcs megosztási kéréseket.",
-    "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.": "A kulcs megosztási kérelem automatikusan el lett küldve a többi eszközödre. Ha elutasítottad vagy törölted a kérést a másik eszközön ide kattintva újra kérheted a kulcsokat.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ha a másik eszközödön nincs meg a kulcs az üzenet visszafejtéséhez akkor nem tudod visszafejteni.",
     "Key request sent.": "Kulcs kérés elküldve.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Kulcsok újrakérése</requestLink> a többi eszközödtől.",
     "Code": "Kód",
     "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.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
@@ -823,7 +766,6 @@
     "Noisy": "Hangos",
     "Collecting app version information": "Alkalmazás verzió információk összegyűjtése",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba nevét (%(alias)s) és eltávolítod a listából ezt: %(name)s?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Így kijelentkezés után is vissza tudsz lépni a fiókodba, illetve más készülékekről is be tudsz lépni.",
     "Keywords": "Kulcsszavak",
     "Enable notifications for this account": "Értesítések engedélyezése ehhez a fiókhoz",
     "Invite to this community": "Meghívás ebbe a közösségbe",
@@ -918,8 +860,6 @@
     "Refresh": "Frissítés",
     "We encountered an error trying to restore your previous session.": "Hibába ütköztünk megpróbáljuk visszaállítani az előző munkamenetet.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "A böngésződ tárhelyének a törlése megoldhatja a problémát, de ezzel kijelentkezel és a titkosított beszélgetések előzményei olvashatatlanná válnak.",
-    "Unable to reply": "Nem lehet válaszolni",
-    "At this time it is not possible to reply with an emote.": "Jelenleg nem lehet emodzsival válaszolni.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nem lehet betölteni azt az eseményt amire válaszoltál, mert vagy nem létezik, vagy nincs jogod megnézni.",
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
     "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
@@ -962,12 +902,6 @@
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
     "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
-    "deleted": "törölt",
-    "underlined": "aláhúzott",
-    "inline-code": "kód",
-    "block-quote": "idézet",
-    "bulleted-list": "rendezetlen lista",
-    "numbered-list": "rendezett lista",
     "Permission Required": "Engedély szükséges",
     "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
     "A call is currently being placed!": "A hívás indítás alatt!",
@@ -1031,11 +965,6 @@
     "Unable to load! Check your network connectivity and try again.": "A betöltés sikertelen! Ellenőrizd a hálózati kapcsolatot és próbáld újra.",
     "Delete Backup": "Mentés törlése",
     "Unable to load key backup status": "A mentett kulcsok állapotát nem lehet lekérdezni",
-    "Backup has a <validity>valid</validity> signature from this device": "A mentés <validity>érvényes</validity> aláírást tartalmaz az eszközről",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "A mentés <validity>érvényes</validity> aláírást tartalmaz erről az <verify>ellenőrizetlen</verify> eszközről: <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz erről az <verify>ellenőrzött</verify> eszközről: <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz erről az <verify>ellenőrizetlen</verify> eszközről: <device></device>",
-    "Backup is not signed by any of your devices": "A mentés nincs aláírva egyetlen eszközöd által sem",
     "Backup version: ": "Mentés verzió: ",
     "Algorithm: ": "Algoritmus: ",
     "Enter a passphrase...": "Add meg a jelmondatot...",
@@ -1048,12 +977,9 @@
     "Your Recovery Key": "A Helyreállítási kulcsod",
     "Copy to clipboard": "Másolás a vágólapra",
     "Download": "Letölt",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "A Helyreállítási kulcsod a <b>vágólapra lett másolva</b>, beillesztés ide:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "A Helyreállítási kulcs a <b>Letöltések</b> mappádban van.",
     "<b>Print it</b> and store it somewhere safe": "<b>Nyomtad ki</b> és tárold biztonságos helyen",
     "<b>Save it</b> on a USB key or backup drive": "<b>Mentsd el</b> egy Pendrive-ra vagy a biztonsági mentésekhez",
     "<b>Copy it</b> to your personal cloud storage": "<b>Másold fel</b> a személyes felhődbe",
-    "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.": "A Biztonságos üzenet-visszaállítás beállítása nélkül ha kijelentkezel vagy másik eszközt használsz, akkor nem tudod visszaállítani a régi titkosított üzeneteidet.",
     "Set up Secure Message Recovery": "Biztonságos Üzenet Visszaállítás beállítása",
     "Keep it safe": "Tartsd biztonságban",
     "Create Key Backup": "Kulcs mentés készítése",
@@ -1072,7 +998,6 @@
     "This looks like a valid recovery key!": "Ez érvényes helyreállítási kulcsnak tűnik!",
     "Not a valid recovery key": "Nem helyreállítási kulcs",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "A helyreállítási kulcs megadásával hozzáférhetsz a régi biztonságos üzeneteidhez és beállíthatod a biztonságos üzenetküldést.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Ha elfelejtetted a helyreállítási jelmondatot <button>beállíthatsz új helyreállítási paramétereket</button>",
     "Failed to perform homeserver discovery": "A Matrix szerver felderítése sikertelen",
     "Invalid homeserver discovery response": "A Matrix szerver felderítésére kapott válasz érvénytelen",
     "Use a few words, avoid common phrases": "Néhány szót használj és kerüld el a szokásos szövegeket",
@@ -1120,7 +1045,6 @@
     "Checking...": "Ellenőrzés...",
     "Invalid identity server discovery response": "Azonosító szerver felderítésére érkezett válasz érvénytelen",
     "General failure": "Általános hiba",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "A mentésnek <verify>ellenőrzött</verify> eszköztől <device></device> származó <validity>érvényes</validity> aláírása van",
     "New Recovery Method": "Új Visszaállítási Eljárás",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem te állítottad be a visszaállítási eljárást akkor lehet, hogy egy támadó próbálja elérni a fiókodat. Változtasd meg a fiókod jelszavát és állítsd be az új visszaállítási eljárást a Beállításokban amint lehet.",
     "Set up Secure Messages": "Biztonságos Üzenetek beállítása",
@@ -1170,13 +1094,11 @@
     "Email Address": "E-mail cím",
     "Backing up %(sessionsRemaining)s keys...": "Kulcsok biztonsági mentése... (%(sessionsRemaining)s)",
     "All keys backed up": "Minden kulcs elmentve",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "A biztonsági mentésnek <verify>ismeretlen</verify> (azonosító: %(deviceId)s) eszköztől van aláírása.",
     "Add an email address to configure email notifications": "E-mail értesítésekhez e-mail cím hozzáadása",
     "Unable to verify phone number.": "A telefonszámot nem sikerült ellenőrizni.",
     "Verification code": "Ellenőrző kód",
     "Phone Number": "Telefonszám",
     "Profile picture": "Profilkép",
-    "Upload profile picture": "Profilkép feltöltése",
     "Display Name": "Megjelenítési név",
     "Room information": "Szoba információk",
     "Internal room ID:": "Belső szoba azonosító:",
@@ -1218,19 +1140,15 @@
     "Voice & Video": "Hang & Videó",
     "Main address": "Fő cím",
     "Room avatar": "Szoba képe",
-    "Upload room avatar": "Szoba kép feltöltése",
-    "No room avatar": "A szobának nincs képe",
     "Room Name": "Szoba neve",
     "Room Topic": "Szoba témája",
     "Join": "Belép",
     "Use Legacy Verification (for older clients)": "Hagyományos hitelesítés használata (régi kliensekhez)",
     "Verify by comparing a short text string.": "Rövid szöveggel való hitelesítés.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "A maximális biztonság érdekében ezt tedd meg személyesen vagy egy másik biztonságos csatornán.",
     "Begin Verifying": "Hitelesítés megkezdése",
     "Waiting for partner to accept...": "Várjuk, hogy a partner elfogadja...",
     "Use two-way text verification": "Kétirányú hitelesítés",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Ellenőrizd ezt a felhasználót, hogy megbízhatónak tekinthessük. Megbízható felhasználók további nyugalmat jelenthetnek ha végpontól végpontig titkosítást használsz.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "A felhasználó hitelesítése a eszközeit megbízhatónak fogja jelölni és az eszközeidet hitelesnek fogja minősíteni nála.",
     "Waiting for partner to confirm...": "Várakozás a partner megerősítésére...",
     "Incoming Verification Request": "Bejövő Hitelesítési Kérés",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "A duplikált jegyek elkerülése végett kérünk <existingIssuesLink>nézd meg a létező jegyeket</existingIssuesLink> először (és adj neki +1-et) vagy <newIssueLink>készíts egy új jegyet</newIssueLink> ha nem találsz hasonlót.",
@@ -1266,10 +1184,7 @@
     "Keep going...": "Így tovább...",
     "Starting backup...": "Mentés indul...",
     "A new recovery passphrase and key for Secure Messages have been detected.": "A Biztonságos Üzenetekhez új visszaállítási jelmondatot és kulcsot észleltünk.",
-    "This device is encrypting history using the new recovery method.": "Az eszköz az új visszaállítási eljárással titkosítja az üzenet naplót.",
     "Recovery Method Removed": "Visszaállítási eljárás törölve",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ez az eszköz észrevette, hogy a visszaállítási jelmondatot és kulcsot a Biztonságos Üzenetekhez törölték.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Ha véletlenül tetted, a Biztonságos Üzeneteket beállíthatod ezen az eszközön ami újra titkosítja az eszköz üzenet naplóját az új visszaállítási eljárással.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem te törölted a visszaállítási eljárást, akkor egy támadó hozzá akar férni a fiókodhoz. Azonnal változtasd meg a jelszavadat és állíts be egy visszaállítási eljárást a Beállításokban.",
     "Chat with Riot Bot": "Csevegés a Riot Robottal",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' mérete nagyobb mint amekkorát a Matrix szerver megenged feltölteni",
@@ -1329,7 +1244,6 @@
     "Book": "Könyv",
     "Pencil": "Toll",
     "Paperclip": "Gémkapocs",
-    "Padlock": "Lakat",
     "Key": "Kulcs",
     "Hammer": "Kalapács",
     "Telephone": "Telefon",
@@ -1347,12 +1261,6 @@
     "Headphones": "Fejhallgató",
     "Folder": "Dosszié",
     "Pin": "Gombostű",
-    "Your homeserver does not support device management.": "A Matrix szervered nem támogatja a eszközkezelést.",
-    "This backup is trusted because it has been restored on this device": "Ez a mentés megbízható mert ezen az eszközön lett visszaállítva",
-    "Some devices for this user are not trusted": "A felhasználó néhány eszköze nem megbízható",
-    "Some devices in this encrypted room are not trusted": "Néhány eszköz nem megbízható ebben a titkosított szobában",
-    "All devices for this user are trusted": "A felhasználó minden eszköze megbízható",
-    "All devices in this encrypted room are trusted": "A szobában minden eszköz megbízható",
     "Recovery Key Mismatch": "Visszaállítási Kulcs eltérés",
     "Incorrect Recovery Passphrase": "Visszaállítási jelmondat hiba",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "A mentést nem lehet visszafejteni a jelmondattal: kérlek ellenőrizd, hogy helyesen adtad meg a visszaállítási jelmondatot.",
@@ -1362,16 +1270,13 @@
     "This homeserver does not support communities": "Ez a Matrix szerver nem támogatja a közösségeket",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Egy ellenőrző e-mail lesz elküldve a címedre, hogy megerősíthesd az új jelszó beállításodat.",
     "Your password has been reset.": "A jelszavad újra beállításra került.",
-    "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.": "Minden eszközödről ki vagy jelentkeztetve és „push” értesítéseket sem fogsz kapni. Az értesítések újbóli engedélyezéséhez újra be kell jelentkezned minden eszközön.",
     "This homeserver does not support login using email address.": "Ezen a Matrix szerveren nem tudsz e-mail címmel bejelentkezni.",
     "Registration has been disabled on this homeserver.": "A fiókkészítés le van tiltva ezen a Matrix szerveren.",
     "Unable to query for supported registration methods.": "A támogatott regisztrációs módokat nem lehet lekérdezni.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Biztos vagy benne? Ha a kulcsaid nincsenek megfelelően elmentve elveszted a titkosított üzeneteidet.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A titkosított üzenetek végponttól végpontig titkosítással védettek. Csak neked és a címzetteknek lehet meg a kulcs az üzenet visszafejtéséhez.",
     "Restore from Backup": "Visszaállítás mentésből",
-    "This device is backing up your keys. ": "Ez az eszköz elmenti a kulcsaidat. ",
     "Back up your keys before signing out to avoid losing them.": "Ments el a kulcsaidat mielőtt kijelentkezel, hogy ne veszítsd el őket.",
-    "Your keys are <b>not being backed up from this device</b>.": "A kulcsaid <b>erről az eszközről nem lesznek mentve</b>.",
     "Start using Key Backup": "Kulcs mentés használatának megkezdése",
     "Never lose encrypted messages": "Soha ne veszíts el titkosított üzenetet",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A szobában az üzenetek végponttól végpontig titkosítva vannak. Csak neked és a címzetteknek vannak meg a kulcsok az üzenetek visszafejtéséhez.",
@@ -1390,7 +1295,6 @@
     "Set up with a Recovery Key": "Beállítás Visszaállítási Kulccsal",
     "Please enter your passphrase a second time to confirm.": "Kérlek add meg a jelmondatot másodszor is a biztonság kedvéért.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "A Visszaállítási Kulcs egy olyan biztonsági elem amivel visszaállíthatod a hozzáférésed a titkosított üzenetekhez még akkor is, ha a jelmondatot elfelejtetted.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "A Visszaállítási Kulcsot nagyon biztonságos helyen tárold, mint pl. egy jelszókezelőben (vagy széfben)",
     "Your keys are being backed up (the first backup could take a few minutes).": "A kulcsaid mentése folyamatban van (az első mentés több percig is eltarthat).",
     "Secure your backup with a passphrase": "Védd a mentést egy jelmondattal",
     "Confirm your passphrase": "Erősítsd meg a jelmondatot",
@@ -1448,18 +1352,11 @@
     "Power level": "Hozzáférési szint",
     "Want more than a community? <a>Get your own server</a>": "Többet szeretnél, mint egy közösség? <a>Szerezz saját szervert</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Kérlek telepíts <chromeLink>Chrome</chromeLink>ot, <firefoxLink>Firefox</firefoxLink>ot vagy <safariLink>Safari</safariLink>t a jegjobb élményhez.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "A jelszóváltoztatás megváltoztatja minden eszközön az összes végponttól végpontig titkosításhoz használt kulcsodat; így a titkosított csevegések olvashatatlanok lesznek. Készíts biztonsági másolatot vagy mentsd ki a szoba kulcsaidat minden eszközödön mielőtt megváltoztatod a jelszavad.",
-    "Room upgrade confirmation": "Szoba frissítés megerősítése",
-    "Upgrading a room can be destructive and isn't always necessary.": "A szoba frissítése lehet, hogy elront benne dolgokat és nem is feltétlen szükséges.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Szoba frissítése akkor ajánlott ha a szoba verziója <i>instabilnak</i> tekintendő. Az instabil verziójú szobák hibákat tartalmazhatnak, funkciók hiányozhatnak belőlük vagy biztonsági hibák lehetnek bennük.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "A szoba frissítések általában csak <i>szerver oldali</i> feldolgozásban térnek el. Ha a Riot klienssel hibát észlelsz, jelezd azt egy hibajegyben: <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Figyelmeztetés</b>: A szoba frissítése <i>nem fogja automatikusan átvinni a szoba résztvevőit az új verziójú szobába.</i> A régi szobába bekerül egy link az új szobához - a tagoknak rá kell kattintani a linkre az új szobába való belépéshez.",
     "Adds a custom widget by URL to the room": "Egyedi kisalkalmazás hozzáadása a szobához URL-lel",
     "Please supply a https:// or http:// widget URL": "Kérlek add meg a https:// vagy http:// kisalkalmazás URL-t",
     "You cannot modify widgets in this room.": "A kisalkalmazásokat nem módosíthatod a szobában.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s visszavonta %(targetDisplayName)s a szobába való belépéséhez szükséges meghívóját.",
-    "Enable desktop notifications for this device": "Asztali értesítések engedélyezése ehhez az eszközhöz",
-    "Enable audible notifications for this device": "Hallható értesítések engedélyezése ehhez az eszközhöz",
     "Upgrade this room to the recommended room version": "A szoba fejlesztése a javasolt verzióra",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A szoba verziója:  <roomVersion />, amit a Matrix szerver <i>instabilnak</i> tekint.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "A szoba fejlesztése bezárja ezt a szobát és új, frissített verzióval ugyanezen a néven létrehoz egy újat.",
@@ -1502,16 +1399,11 @@
     "Cancel All": "Mindent megszakít",
     "Upload Error": "Feltöltési hiba",
     "The server does not support the room version specified.": "A szerver nem támogatja a megadott szoba verziót.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Kérlek erősítsd meg, hogy a szobát frissíted a <oldVersion /> verzióról <newVersion /> verzióra.",
     "Changes your avatar in this current room only": "A profilképedet csak ebben a szobában változtatja meg",
     "Sends the given message coloured as a rainbow": "A megadott üzenetet szivárvány színben küldi el",
     "Sends the given emote coloured as a rainbow": "A megadott hangulatjelet szivárvány színben küldi el",
     "The user's homeserver does not support the version of the room.": "A felhasználó matrix szervere nem támogatja a megadott szoba verziót.",
     "When rooms are upgraded": "Ha a szobák fejlesztésre kerülnek",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ez az eszköz <b>nem menti el a kulcsaidat</b>, de létezik mentés amit visszaállíthatsz és folytathatod.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Csatlakozz ezzel az eszközzel a kulcs mentéshez kilépés előtt, hogy ne veszíts el kulcsot ami esetleg csak ezen az eszközön van meg.",
-    "Connect this device to Key Backup": "Csatlakozz ezzel az eszközzel a Kulcs Mentéshez",
-    "Backup has an <validity>invalid</validity> signature from this device": "A mentés <validity>érvénytelen</validity> aláírással rendelkezik erről az eszközről",
     "this room": "ez a szoba",
     "View older messages in %(roomName)s.": "Régebbi üzenetek megjelenítése itt: %(roomName)s.",
     "Joining room …": "Szobához csatlakozás …",
@@ -1561,7 +1453,6 @@
     "Identity server URL does not appear to be a valid identity server": "Az Azonosító szerver URL nem tűnik érvényesnek",
     "A conference call could not be started because the integrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
     "Name or Matrix ID": "Név vagy Matrix azon.",
-    "Email, name or Matrix ID": "E-mail, név vagy Matrix azon.",
     "Unbans user with given ID": "Visszaengedi a megadott azonosítójú felhasználót",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>ezzel reagált: %(shortName)s</reactedWith>",
     "edited": "szerkesztve",
@@ -1611,8 +1502,6 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snem változtatott semmit",
     "Changes your avatar in all rooms": "A profilképed megváltozik minden szobában",
     "Removing…": "Eltávolítás…",
-    "Clear all data on this device?": "Az eszközön minden adat törlése?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Minden adat végleges törlése az eszközről. A titkosított üzenetek elvesznek hacsak a kulcsok nincsenek elmentve.",
     "Clear all data": "Minden adat törlése",
     "Your homeserver doesn't seem to support this feature.": "A matrix szervered úgy tűnik nem támogatja ezt a szolgáltatást.",
     "Resend edit": "Szerkesztés újraküldése",
@@ -1620,14 +1509,12 @@
     "Resend removal": "Törlés újraküldése",
     "Failed to re-authenticate due to a homeserver problem": "Az újra bejelentkezés a matrix szerver hibájából meghiusúlt",
     "Failed to re-authenticate": "Újra bejelentkezés sikertelen",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Szerezd vissza a fiókodat és állítsd vissza a titkosítási kulcsokat amiket ezen az eszközön tároltál. Nélkülük nem tudod elolvasni a titkosított üzeneteidet semmilyen eszközön.",
     "Enter your password to sign in and regain access to your account.": "Add meg a jelszavadat a belépéshez, hogy visszaszerezd a hozzáférésed a fiókodhoz.",
     "Forgotten your password?": "Elfelejtetted a jelszavad?",
     "Sign in and regain access to your account.": "Jelentkezz be és szerezd vissza a hozzáférésed a fiókodhoz.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "A fiókodba nem tudsz bejelentkezni. További információkért kérlek vedd fel a kapcsolatot a matrix szerver adminisztrátorával.",
     "You're signed out": "Kijelentkeztél",
     "Clear personal data": "Személyes adatok törlése",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Figyelmeztetés: A személyes adataid (beleértve a titkosító kulcsokat is) továbbra is az eszközön vannak tárolva. Ha az eszközt nem használod tovább vagy másik fiókba szeretnél bejelentkezni, töröld őket.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Kérlek mond el nekünk mi az ami nem működött, vagy még jobb, ha egy GitHub jegyben leírod a problémát.",
     "Identity Server": "Azonosítási szerver",
     "Find others by phone or email": "Keress meg másokat telefonszám vagy e-mail cím alapján",
@@ -1640,7 +1527,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Kérd meg a matrix szerver (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN szervert.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Másik lehetőségként használhatod a nyilvános szervert: <code>turn.matrix.org</code>, de ez nem lesz annyira megbízható és megosztja az IP címedet a szerverrel. A Beállításokban állíthatod be.",
     "Try using turn.matrix.org": "Próbáld meg használni a turn.matrix.org-ot",
-    "Failed to start chat": "A beszélgetést nem lehet elkezdeni",
     "Messages": "Üzenetek",
     "Actions": "Műveletek",
     "Displays list of commands with usages and descriptions": "Parancsok megjelenítése példával és leírással",
@@ -1668,7 +1554,6 @@
     "Discovery": "Felkutatás",
     "Deactivate account": "Fiók zárolása",
     "Always show the window menu bar": "Az ablak menüsávjának folyamatos mutatása",
-    "A device's public name is visible to people you communicate with": "Az eszközöd nyilvános neve látható azoknál az embereknél akikkel beszélgetsz",
     "Unable to revoke sharing for email address": "Az e-mail cím megosztását nem sikerült visszavonni",
     "Unable to share email address": "Az e-mail címet nem sikerült megosztani",
     "Revoke": "Visszavon",
@@ -1681,7 +1566,6 @@
     "Remove %(email)s?": "%(email)s törlése?",
     "Remove %(phone)s?": "%(phone)s törlése?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A szöveges üzenetet elküldtük a +%(msisdn)s számra. Kérlek add meg az ellenőrző kódot amit tartalmazott.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Az eszköz megbízhatóságának ellenőrzéséhez kérlek ellenőrizd, hogy amit a Felhasználó Beállításoknál látsz az eszközön kulcsot megegyezik az alábbi kulccsal:",
     "Command Help": "Parancs Segítség",
     "No identity server is configured: add one in server settings to reset your password.": "Nincs azonosítási szerver beállítva: adj meg egyet a szerver beállításoknál, hogy a jelszavadat vissza tudd állítani.",
     "This account has been deactivated.": "Ez a fiók zárolva van.",
@@ -1768,7 +1652,6 @@
     "Show advanced": "Haladó megmutatása",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Felhasználók más matrix szerverekről a szobába való belépésének megakadályozása (Ezt a beállítást később nem lehet megváltoztatni!)",
     "Close dialog": "Ablak bezárása",
-    "Use the new, faster, composer for writing messages": "Az új gyorsabb szerkesztő használata az üzenetek írásához",
     "Show previews/thumbnails for images": "Előnézet/bélyegkép mutatása a képekhez",
     "Clear cache and reload": "Gyorsítótár ürítése és újratöltés",
     "%(count)s unread messages including mentions.|other": "%(count)s olvasatlan üzenet megemlítéssel.",
@@ -1872,11 +1755,7 @@
     "Custom (%(level)s)": "Egyedi (%(level)s)",
     "Trusted": "Megbízható",
     "Not trusted": "Megbízhatatlan",
-    "Hide verified Sign-In's": "Ellenőrzött belépések elrejtése",
-    "%(count)s verified Sign-In's|other": "%(count)s ellenőrzött belépés",
-    "%(count)s verified Sign-In's|one": "1 ellenőrzött belépés",
     "Direct message": "Közvetlen beszélgetés",
-    "Unverify user": "Ellenőrizetlen felhasználó",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> a szobában: %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Az üzenetek a szobában végponttól végpontig titkosítottak.",
     "Security": "Biztonság",
@@ -1893,7 +1772,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel.",
     "Widget added by": "A kisalkalmazást hozzáadta",
     "This widget may use cookies.": "Ez a kisalkalmazás sütiket használhat.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Ellenőrzés küldése közvetlen üzenetben, beleértve az új ellenőrzési felhasználói élményt a résztvevői panelen.",
     "Enable local event indexing and E2EE search (requires restart)": "Helyi esemény indexálás és végponttól végpontig titkosított események keresésének engedélyezése (újraindítás szükséges)",
     "More options": "További beállítások",
     "Reload": "Újratölt",
@@ -1916,7 +1794,6 @@
     "Manage integrations": "Integrációk kezelése",
     "Verification Request": "Ellenőrzési kérés",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Kereszt-aláírás engedélyezése a felhasználó alapú azonosításhoz az eszköz alapú helyett (fejlesztés alatt)",
     "%(senderName)s placed a voice call.": "%(senderName)s hanghívást kezdeményezett.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hanghívást kezdeményezett. (ebben a böngészőben nem támogatott)",
     "%(senderName)s placed a video call.": "%(senderName)s videóhívást kezdeményezett.",
@@ -1926,7 +1803,6 @@
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Kísérleti labor tulajdonságokkal egyénre szabhatod az élményt. <a>Tudj meg többet</a>.",
     "Error upgrading room": "A szoba verziófrissítésénél hiba történt",
     "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a szervered támogatja-e a szoba verzióját és próbáld újra.",
-    "Invite joined members to the new room automatically": "Tagok meghívása automatikusan az új szobába",
     "This message cannot be decrypted": "Ezt az üzenetet nem lehet visszafejteni",
     "Unencrypted": "Titkosítatlan",
     "Automatically invite users": "Felhasználók automatikus meghívása",
@@ -1944,13 +1820,11 @@
     "Start chatting": "Beszélgetés elkezdése",
     "Send cross-signing keys to homeserver": "Kereszt-aláírás kulcsok küldése a matrix szervernek",
     "Cross-signing public keys:": "Kereszt-aláírás nyilvános kulcsok:",
-    "on device": "eszközön",
     "not found": "nem található",
     "Cross-signing private keys:": "Kereszt-aláírás privát kulcsok:",
     "in secret storage": "biztonsági tárolóban",
     "Secret storage public key:": "Biztonsági tároló nyilvános kulcs:",
     "in account data": "fiók adatokban",
-    "Bootstrap Secure Secret Storage": "Biztonsági Titok Tároló megnyitása",
     "Cross-signing": "Kereszt-aláírás",
     "Enter secret storage passphrase": "Add meg a jelmondatot a biztonsági tárolóhoz",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó jelmondatot adtál-e meg.",
@@ -1961,16 +1835,12 @@
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Ha elfelejtetted a visszaállítási kulcsot <button>állíts be új visszaállítási lehetőséget</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Figyelmeztetés</b>: Csak biztonságos számítógépről állíts be kulcs mentést.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ha elfelejtetted a visszaállítási kulcsot <button>állíts be új visszaállítási lehetőséget</button>",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Figyelem</b>: Csak biztonságos eszközről állíts be biztonságos tárolót.",
     "Set up with a recovery key": "Beállítás visszaállítási kulccsal",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Mint egy biztonsági háló, ha elfelejted a jelmondatot akkor felhasználhatod ahhoz, hogy hozzáférj a titkosított üzeneteidhez.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Használhatod egy biztonsági hálóként a titkosított üzenetekhez való hozzáférés visszaállításához.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "A visszaállítási kulcsod <b>a vágólapra lett másolva</b>, illeszd be ide:",
     "Your recovery key is in your <b>Downloads</b> folder.": "A visszaállítási kulcsod a <b>Letöltések</b> mappában van.",
-    "Your access to encrypted messages is now protected.": "A titkosított üzenetekhez való hozzáférésed védve van.",
-    "Set up secret storage": "Biztonságos tároló beállítása",
-    "Secure your encrypted messages with a passphrase": "Biztosítsd a titkosított üzeneteidet jelmondattal",
     "Storing secrets...": "Titkok tárolása...",
     "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s",
@@ -1991,50 +1861,27 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szerverek voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a kitiltó szabályt erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "Cross-signing and secret storage are enabled.": "Kereszt-aláírás és a biztonsági tároló engedélyezve van.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "A fiókod a biztonsági tárolóban tartalmaz egy személyazonosságot a kereszt-aláíráshoz de egyenlőre nincs megbízhatónak jelölve ezen az eszközön.",
     "Cross-signing and secret storage are not yet set up.": "Kereszt-aláírás és a biztonsági tároló egyenlőre nincs beállítva.",
     "Bootstrap cross-signing and secret storage": "Kereszt-aláírás és biztonsági tároló beállítása",
     "not stored": "nincs mentve",
     "Backup has a <validity>valid</validity> signature from this user": "A mentés <validity>érvényes</validity> aláírást tartalmaz a felhasználótól",
     "Backup has a <validity>invalid</validity> signature from this user": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz a felhasználótól",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "A mentésnek <verify>ismeretlen</verify> felhasználótól származó aláírása van ezzel az azonosítóval: %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "A mentésnek <verify>ismeretlen</verify> eszköztől származó aláírása van ezzel az azonosítóval: %(deviceId)s",
     "Backup key stored: ": "Visszaállítási kulcs tárolva: ",
-    "Start using Key Backup with Secure Secret Storage": "Kulcs Mentés és Biztonsági Titok Tároló használatának megkezdése",
     "Hide verified sessions": "Ellenőrzött munkamenetek eltakarása",
     "%(count)s verified sessions|other": "%(count)s ellenőrzött munkamenet",
     "%(count)s verified sessions|one": "1 ellenőrzött munkamenet",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Visszaállítási kulcs a biztonsági tárolóban van elmentve, de ezen az eszközön ez a lehetőség nincs engedélyezve. Engedélyezd a kulcs mentés állapotának módosításához a kereszt-aláírást a Laborban.",
     "Close preview": "Előnézet bezárása",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Biztonsági tárolót fogunk használni, hogy tárolhassuk a kereszt-aláíráshoz tartozó azonosítót titkosított formában, amivel más eszközöket és üzenet kulcsokat lehet ellenőrizni. Védd a titkosított üzenetekhez való hozzáférést jelmondattal és azt tartsd titokban.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "A biztonsági tároló beállítása nélkül ha kijelentkezel és egy másik eszközön lépsz be nem fogsz hozzáférni a titkosított üzeneteidhez és a kereszt-aláíráshoz tartozó azonosítódhoz amivel más eszközöket ellenőrizhetsz.",
-    "This user has not verified all of their devices.": "Ez a felhasználó még ellenőrizte az összes eszközét.",
-    "You have not verified this user. This user has verified all of their devices.": "Ezt a felhasználót még nem ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.",
-    "You have verified this user. This user has verified all of their devices.": "Ezt a felhasználót ellenőrizted. Minden eszközét ellenőrizte ez a felhasználó.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Néhány felhasználót még nem ellenőriztél ebben a titkosított szobában vagy még ők nem ellenőrizték az összes eszközüket.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Minden felhasználót ellenőriztél ebben a titkosított szobában és ők ellenőrizték az összes eszközüket.",
     "Language Dropdown": "Nyelvválasztó lenyíló menü",
     "Country Dropdown": "Ország lenyíló menü",
     "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a már létező kulcs mentés adatai felhasználásával lesz létrehozva. A biztonsági tároló jelmondata és a visszaállítási kulcs meg fog egyezni a kulcs mentésénél használttal",
-    "Migrate from Key Backup": "Mozgatás a Kulcs Mentésből",
     "Help": "Segítség",
-    "New DM invite dialog (under development)": "Új KB (DM) meghívó párbeszédablak (fejlesztés alatt)",
     "Show more": "Mutass többet",
     "Recent Conversations": "Legújabb Beszélgetések",
     "Direct Messages": "Közvetlen Beszélgetések",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz meg valakit, kérdezd meg a felhasználói nevét vagy oszd meg a te felhasználói nevedet (%(userId)s) vagy a <a>profil hivatkozást</a>.",
     "Go": "Menj",
     "Show info about bridges in room settings": "Híd információk megmutatása a szoba beállításoknál",
-    "This bridge was provisioned by <user />": "Ezt a hidat ez a felhasználó hozta létre: <user />",
     "This bridge is managed by <user />.": "Ezt a hidat ez a felhasználó kezeli: <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Híd ide: <channelLink /> <networkLink />, ezzel a protokollal: <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Ide csatlakozva: <channelIcon /> <channelName /> itt: <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Ezzel a protokollal csatlakozva: %(protocolName)s",
-    "Bridge Info": "Híd információ",
-    "Below is a list of bridges connected to this room.": "Alább látható a lista a szobához kapcsolódó hidakról.",
     "Suggestions": "Javaslatok",
     "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s",
@@ -2054,21 +1901,14 @@
     "%(num)s hours from now": "%(num)s óra múlva",
     "about a day from now": "egy nap múlva",
     "%(num)s days from now": "%(num)s nap múlva",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "A Kulcs Mentés a fiókhoz igen de ehhez a munkamenethez nincs beállítva. A Biztonsági tároló beállításához állítsd vissza a kulcs mentést.",
     "Restore": "Visszaállít",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "A Biztonsági Tároló a meglévő kulcs mentés adatai alapján lesz beállítva. A biztonsági tárolóhoz tartozó jelmondat és a visszaállítási kulcs azonos lesz  ahogy azok a kulcs mentéshez voltak",
-    "Restore your Key Backup": "Kulcs Mentés visszaállítása",
     "Complete security": "Biztonság beállítása",
     "Verify this session to grant it access to encrypted messages.": "A titkosított üzenetekhez való hozzáféréshez hitelesítsd ezt a munkamenetet.",
     "Start": "Indít",
     "Session verified": "Munkamenet hitelesítve",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ez a munkameneted hitelesítve van. A titkosított üzenetekhez hozzáférése van és más felhasználók megbízhatónak látják.",
     "Done": "Kész",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Az eszköz biztonságának beállítása nélkül nem férhet hozzá a titkosított üzenetekhez.",
     "Go Back": "Vissza",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "A Biztonsági Tároló a kulcs mentés adatainak felhasználásával lesz beállítva. A biztonsági tároló jelmondata és a visszaállítási kulcs ugyanaz lesz mint a kulcs mentéshez használt.",
-    "New invite dialog": "Új meghívó párbeszédablak",
-    "New Session": "Új Munkamenet",
     "Other users may not trust it": "Más felhasználók lehet, hogy nem bíznak benne",
     "Later": "Később",
     "Failed to invite the following users to chat: %(csvUsers)s": "Az alábbi felhasználókat nem sikerült meghívni a beszélgetésbe: %(csvUsers)s",
@@ -2079,9 +1919,7 @@
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>.",
     "Verify User": "Felhasználó ellenőrzése",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
-    "For maximum security, do this in person.": "A legnagyobb biztonság érdekében ezt személyesen tedd meg.",
     "Start Verification": "Ellenőrzés elindítása",
-    "Encrypted by a deleted device": "Egy már törölt eszköz titkosította",
     "Unknown Command": "Ismeretlen Parancs",
     "Unrecognised command: %(commandText)s": "Ismeretlen parancs: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Használhatod a <code>/help</code>-et az elérhető parancsok kilistázásához. Ezt üzenetként akartad küldeni?",
@@ -2090,7 +1928,6 @@
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s szoba címnek, %(count)s másikkal együtt, hozzáadta: %(addedAddresses)s",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s %(count)s másikkal együtt törölte a szoba címek közül: %(removedAddresses)s",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s %(countRemoved)s darabot törölt és %(countAdded)s darabot hozzáadott a szoba címekhez",
-    "Someone is using an unknown device": "Valaki ismeretlen eszközt használ",
     "This room is end-to-end encrypted": "Ez a szoba végpontok közötti titkosítást használ",
     "Everyone in this room is verified": "A szobába mindenki ellenőrizve van",
     "Invite only": "Csak meghívóval",
@@ -2112,9 +1949,7 @@
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s bekapcsolta a végpontok közötti titkosítást.",
     "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s).",
     "Enable message search in encrypted rooms": "Üzenetek keresésének engedélyezése titkosított szobákban",
-    "Review & verify your new session": "Az új munkameneted átnézése és ellenőrzése",
     "Review": "Átnéz",
-    "Verify your other devices easier": "Ellenőrizd egyszerűbben a többi eszközöd",
     "This bridge was provisioned by <user />.": "Ezt a hidat az alábbi felhasználó készítette: <user />.",
     "Workspace: %(networkName)s": "Munkahely: %(networkName)s",
     "Channel: %(channelName)s": "Csatorna: %(channelName)s",
@@ -2135,10 +1970,7 @@
     "Use this session to verify your new one, granting it access to encrypted messages:": "Az új munkamenet ellenőrzéséhez használd ezt, amivel hozzáférést adsz a titkosított üzenetekhez:",
     "If you didn’t sign in to this session, your account may be compromised.": "Ha nem te jelentkeztél be ebbe a munkamenetbe akkor a fiókodat feltörték.",
     "This wasn't me": "Nem én voltam",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt az eszközt, hogy ellenőrizhesd a többi eszközödet vele amivel hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Állítsd be a titkosítást ezen az eszközön, hogy ellenőrizhesd a többi eszközödet vele, amivel hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Helyezd biztonságba a titkosítási kulcsaidat egy jelmondattal. A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól:",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ezzel az eszközzel most már ellenőrizheted a többi eszközödet, hozzáférést adhatsz a titkosított üzeneteidhez és megbízhatónak jelölheted őket más felhasználók számára.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ha nincs engedélyezve akkor a titkosított szobák üzenetei nem jelennek meg a keresések között.",
     "Disable": "Tiltás",
     "Not currently downloading messages for any room.": "Jelenleg egy szobából sem folyik üzenet letöltés.",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9b53b6e100..38d2693500 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -21,7 +21,6 @@
     "Current password": "Password sekarang",
     "Deactivate Account": "Nonaktifkan Akun",
     "Device ID": "ID Perangkat",
-    "Devices": "Perangkat",
     "Email": "Email",
     "Email address": "Alamat email",
     "Enable Notifications": "Aktifkan Notifikasi",
@@ -30,7 +29,6 @@
     "Command error": "Perintah gagal",
     "Decline": "Tolak",
     "Default": "Bawaan",
-    "Device ID:": "ID Perangkat:",
     "Direct chats": "Obrolan langsung",
     "Download %(text)s": "Unduh %(text)s",
     "Event information": "Informasi Event",
@@ -49,8 +47,6 @@
     "Leave room": "Meninggalkan ruang",
     "Logout": "Keluar",
     "Low priority": "Prioritas rendah",
-    "Markdown is disabled": "Markdown dinonaktifkan",
-    "Markdown is enabled": "Markdown diaktifkan",
     "Mute": "Bisu",
     "Name": "Nama",
     "New passwords don't match": "Password baru tidak cocok",
@@ -59,7 +55,6 @@
     "No results": "Tidak ada hasil",
     "OK": "OK",
     "Operation failed": "Operasi gagal",
-    "People": "Orang",
     "Passwords can't be empty": "Password tidak boleh kosong",
     "Permissions": "Izin",
     "Private Chat": "Obrolan Privat",
@@ -83,13 +78,11 @@
     "Sign out": "Keluar",
     "Someone": "Seseorang",
     "Submit": "Kirim",
-    "Start Chat": "Mulai Obrolan",
     "Success": "Sukses",
     "This email address was not found": "Alamat email ini tidak ada",
     "This room": "Ruang ini",
     "Unable to add email address": "Tidak dapat menambahkan alamat email",
     "Unable to verify email address.": "Tidak dapat memverifikasi alamat email.",
-    "Unable to load device list": "Tidak dapat memuat daftar perangkat",
     "unencrypted": "tidak terenkripsi",
     "unknown error code": "kode kesalahan tidak diketahui",
     "unknown device": "perangkat tidak diketahui",
@@ -151,15 +144,12 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s telah menghapus nama ruang.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s telah mengubah nama ruang menjadi %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
-    "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.": "Mengubah password saat ini akan mengatur ulang semua kunci enkripsi end-to-end di semua perangkat, menyebabkan sejarah obrolan yang terenkripsi menjadi tidak dapat dibaca, kecuali sebelumnya Anda ekspor dahulu kunci ruang lalu kemudian impor ulang setelahnya. Ke depan hal ini akan diperbaiki.",
     "click to reveal": "Klik untuk menampilkan",
     "Could not connect to the integration server": "Tidak dapat terhubung ke server integrasi",
     "Cryptography": "Kriptografi",
     "Decrypt %(text)s": "Dekrip %(text)s",
     "Decryption error": "Dekripsi gagal",
-    "Device already verified!": "Perangkat telah terverifikasi!",
     "device id: ": "id perangkat: ",
-    "Device key:": "Kunci Perangkat:",
     "Ban": "Blokir",
     "Bans user with given id": "Blokir pengguna dengan id",
     "Fetching third party location failed": "Gagal mengambil lokasi pihak ketiga",
@@ -212,7 +202,6 @@
     "Files": "Files",
     "Collecting app version information": "Mengumpukan informasi versi aplikasi",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Hapus alias ruang %(alias)s dan hapus %(name)s dari direktori?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hal ini akan memperbolehkan anda kembali ke akun setelah keluar dan masuk kembali di perangkat lain.",
     "Enable notifications for this account": "Aktifkan notifikasi untuk akun ini",
     "Messages containing <span>keywords</span>": "Pesan mengandung <span>kata kunci</span>",
     "Room not found": "Ruang tidak ditemukan",
@@ -305,7 +294,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Informasi yang dikirim membantu kami memperbaiki Riot.im, termasuk:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Apabila terdapat informasi yang dapat digunakan untuk pengenalan pada halaman ini, seperti ruang, pengguna, atau ID grup, kami akan menghapusnya sebelum dikirim ke server.",
     "Call Failed": "Panggilan Gagal",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ada perangkat yang belum dikenal di ruang ini: apabila Anda melanjutkan tanpa memverifikasi terlebih dahulu, pembicaraan Anda dapat disadap orang yang tidak diinginkan.",
     "Review Devices": "Telaah Perangkat",
     "Call Anyway": "Tetap Panggil",
     "Answer Anyway": "Tetap Jawab",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 94b311ed0a..2e13f4b231 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -46,7 +46,6 @@
     "Moderator": "Umsjónarmaður",
     "Admin": "Stjórnandi",
     "Start a chat": "Hefja spjall",
-    "Start Chat": "Hefja spjall",
     "Operation failed": "Aðgerð tókst ekki",
     "You need to be logged in.": "Þú þarft að vera skráð/ur inn.",
     "Unable to create widget.": "Gat ekki búið til viðmótshluta.",
@@ -70,8 +69,6 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
     "Always show message timestamps": "Alltaf birta tímamerki skilaboða",
     "Send analytics data": "Senda greiningargögn",
-    "Never send encrypted messages to unverified devices from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja",
-    "Never send encrypted messages to unverified devices in this room from this device": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja á þessari spjallrás",
     "Enable inline URL previews by default": "Sjálfgefið virkja forskoðun innfelldra vefslóða",
     "Room Colour": "Litur spjallrásar",
     "Collecting app version information": "Safna upplýsingum um útgáfu forrits",
@@ -101,8 +98,6 @@
     "Confirm password": "Staðfestu lykilorðið",
     "Change Password": "Breyta lykilorði",
     "Authentication": "Auðkenning",
-    "Delete %(count)s devices|other": "Eyða %(count)s tækjum",
-    "Delete %(count)s devices|one": "Eyða tæki",
     "Device ID": "Auðkenni tækis",
     "Last seen": "Sást síðast",
     "Enable Notifications": "Virkja tilkynningar",
@@ -133,7 +128,6 @@
     "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
     "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
     "Options": "Valkostir",
-    "Unencrypted message": "Ódulrituð skilaboð",
     "Blacklisted": "Á bannlista",
     "device id: ": "Auðkenni tækis: ",
     "Kick": "Sparka",
@@ -142,7 +136,6 @@
     "Unban this user?": "Taka þennan notanda úr banni?",
     "Ban this user?": "Banna þennan notanda?",
     "Are you sure?": "Ertu viss?",
-    "Devices": "Tæki",
     "Unignore": "Byrja að fylgjast með á ný",
     "Ignore": "Hunsa",
     "Mention": "Minnst á",
@@ -165,8 +158,6 @@
     "You do not have permission to post to this room": "Þú hefur ekki heimild til að senda skilaboð á þessa spjallrás",
     "Server error": "Villa á þjóni",
     "Command error": "Skipanavilla",
-    "bold": "feitletrað",
-    "italic": "skáletrað",
     "Loading...": "Hleð inn...",
     "Online": "Nettengt",
     "Idle": "Iðjulaust",
@@ -183,7 +174,6 @@
     "Search": "Leita",
     "Invites": "Boðsgestir",
     "Favourites": "Eftirlæti",
-    "People": "Fólk",
     "Rooms": "Spjallrásir",
     "Low priority": "Lítill forgangur",
     "Historical": "Ferilskráning",
@@ -210,7 +200,6 @@
     "Cancel": "Hætta við",
     "Jump to first unread message.": "Fara í fyrstu ólesin skilaboð.",
     "Close": "Loka",
-    "Invalid alias format": "Ógilt snið samnefnis",
     "not specified": "ekki tilgreint",
     "Invalid community ID": "Ógilt auðkenni samfélags",
     "Flair": "Hlutverksmerki",
@@ -291,9 +280,6 @@
     "Incorrect password": "Rangt lykilorð",
     "Deactivate Account": "Gera notandaaðgang óvirkann",
     "To continue, please enter your password:": "Til að halda áfram, settu inn lykilorðið þitt:",
-    "Device name": "Heiti tækis",
-    "Device key": "Dulritunarlykill tækis",
-    "Verify device": "Sannreyna tæki",
     "I verify that the keys match": "Ég staðfesti að dulritunarlyklarnir samsvari",
     "Back": "Til baka",
     "Send Account Data": "Senda upplýsingar um notandaaðgang",
@@ -319,8 +305,6 @@
     "Failed to change password. Is your password correct?": "Mistókst að breyta lykilorðinu. Er lykilorðið rétt?",
     "(HTTP status %(httpStatus)s)": "(HTTP staða %(httpStatus)s)",
     "Please set a password!": "Stilltu lykilorð!",
-    "Room contains unknown devices": "Spjallrás inniheldur óþekkt tæki",
-    "Unknown devices": "Óþekkt tæki",
     "Custom": "Sérsniðið",
     "Alias (optional)": "Samnefni (valfrjálst)",
     "You cannot delete this message. (%(code)s)": "Þú getur ekki eytt þessum skilaboðum. (%(code)s)",
@@ -371,8 +355,6 @@
     "Success": "Tókst",
     "Import E2E room keys": "Flytja inn E2E dulritunarlykla spjallrásar",
     "Cryptography": "Dulritun",
-    "Device ID:": "Auðkenni tækis:",
-    "Device key:": "Dulritunarlykill tækis:",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.",
     "Labs": "Tilraunir",
     "Check for update": "Athuga með uppfærslu",
@@ -385,7 +367,6 @@
     "Access Token:": "Aðgangsteikn:",
     "click to reveal": "smelltu til að birta",
     "Identity Server is": "Auðkennisþjónn er",
-    "matrix-react-sdk version:": "Útgáfa matrix-react-sdk:",
     "riot-web version:": "Útgáfa riot-web:",
     "olm version:": "Útgáfa olm:",
     "Failed to send email": "Mistókst að senda tölvupóst",
@@ -414,7 +395,6 @@
     "Session ID": "Auðkenni setu",
     "End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
     "Event information": "Upplýsingar um atburð",
-    "Sender device information": "Upplýsingar um tæki sendanda",
     "Export room keys": "Flytja út dulritunarlykla spjallrásar",
     "Enter passphrase": "Settu inn lykilsetningu (passphrase)",
     "Confirm passphrase": "Staðfestu lykilsetningu",
@@ -439,15 +419,11 @@
     "You are already in a call.": "Þú ert nú þegar í samtali.",
     "Invite new community members": "Bjóða nýjum meðlimum í samfélag",
     "Which rooms would you like to add to this community?": "Hvaða spjallrásum myndir þú vilja bæta í þetta samfélag?",
-    "Invite new room members": "Bjóða nýjum meðlimum á spjallrás",
-    "Send Invites": "Senda boðskort",
     "Failed to invite": "Mistókst að bjóða",
     "Missing roomId.": "Vantar spjallrásarauðkenni.",
     "/ddg is not a command": "/ddg er ekki skipun",
     "Ignored user": "Hunsaður notandi",
-    "Device already verified!": "Tæki er þegar sannreynt!",
     "Verified key": "Staðfestur dulritunarlykill",
-    "Unrecognised command:": "Óþekkt skipun:",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s breytti umræðuefninu í \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjarlægði heiti spjallrásarinnar.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s breytti heiti spjallrásarinnar í %(roomName)s.",
@@ -469,9 +445,6 @@
     "State Key": "Stöðulykill",
     "Explore Room State": "Skoða stöðu spjallrásar",
     "Explore Account Data": "Skoða aðgangsgögn",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Þú bættir við nýju tæki '%(displayName)s', sem er að krefjast dulritunarlykla.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "ósannvottaða tækið þitt '%(displayName)s' er að krefjast dulritunarlykla.",
-    "Loading device info...": "Hleð inn upplýsingum um tæki...",
     "Clear Storage and Sign Out": "Hreinsa gagnageymslu og skrá út",
     "Unable to restore session": "Tókst ekki að endurheimta setu",
     "This doesn't appear to be a valid email address": "Þetta lítur ekki út eins og gilt tölvupóstfang",
@@ -480,7 +453,6 @@
     "Username invalid: %(errMessage)s": "Notandanafn er ógilt: %(errMessage)s",
     "An error occurred: %(error_string)s": "Villa kom upp: %(error_string)s",
     "To get started, please pick a username!": "Til að komast í gang, veldu fyrst notandanafn!",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" inniheldur tæki sem þú hefur ekki séð áður.",
     "Private Chat": "Einkaspjall",
     "Public Chat": "Opinbert spjall",
     "Collapse Reply Thread": "Fella saman svarþráð",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d60190ec66..5a3f122ad2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -95,7 +95,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Le informazioni inviate per aiutarci a migliorare Riot.im includono:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, un utente o un ID di un gruppo, tali dati saranno rimossi prima di essere inviati al server.",
     "Call Failed": "Chiamata fallita",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ci sono dispositivi sconosciuti in questa stanza: se procedi senza verificarli, qualcuno avrà la possibilità di intercettare la tua chiamata.",
     "Review Devices": "Controlla i dispositivi",
     "Call Anyway": "Chiama comunque",
     "Answer Anyway": "Rispondi comunque",
@@ -129,10 +128,6 @@
     "Restricted": "Limitato",
     "Moderator": "Moderatore",
     "Start a chat": "Inizia una conversazione",
-    "Who would you like to communicate with?": "Con chi vorresti comunicare?",
-    "Start Chat": "Inizia conversazione",
-    "Invite new room members": "Invita nuovi membri nella stanza",
-    "Send Invites": "Manda inviti",
     "Failed to invite": "Invito fallito",
     "Failed to invite the following users to the %(roomName)s room:": "Invito nella stanza %(roomName)s fallito per i seguenti utenti:",
     "You need to be logged in.": "Devi aver eseguito l'accesso.",
@@ -153,13 +148,7 @@
     "You are now ignoring %(userId)s": "Ora stai ignorando %(userId)s",
     "Unignored user": "Utente non più ignorato",
     "You are no longer ignoring %(userId)s": "Non stai più ignorando %(userId)s",
-    "Unknown (user, device) pair:": "Coppia (utente, dispositivo) sconosciuta:",
-    "Device already verified!": "Dispositivo già verificato!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENZIONE: dispositivo già verificato, ma le chiavi NON CORRISPONDONO!",
-    "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!": "ATTENZIONE: VERIFICA CHIAVI FALLITA! La chiave per %(userId)s e il dispositivo %(deviceId)s è \"%(fprint)s\" , la quale non corrisponde con la chiave fornita \"%(fingerprint)s\". Potrebbe significare che le tue comunicazioni vengono intercettate!",
     "Verified key": "Chiave verificata",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dal dispositivo %(deviceId)s di %(userId)s . Dispositivo segnato come verificato.",
-    "Unrecognised command:": "Comando non riconosciuto:",
     "Reason": "Motivo",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitato %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bandito %(targetName)s.",
@@ -192,7 +181,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a sconosciuti (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crittografia end-to-end (algoritmo %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato i messaggi ancorati della stanza.",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
@@ -212,8 +200,6 @@
     "Autoplay GIFs and videos": "Riproduzione automatica di GIF e video",
     "Enable automatic language detection for syntax highlighting": "Attiva la rilevazione automatica della lingua per l'evidenziazione della sintassi",
     "Automatically replace plain text Emoji": "Sostituisci automaticamente le emoji testuali",
-    "Never send encrypted messages to unverified devices from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati",
-    "Never send encrypted messages to unverified devices in this room from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati in questa stanza",
     "Enable inline URL previews by default": "Attiva le anteprime URL in modo predefinito",
     "Enable URL previews for this room (only affects you)": "Attiva le anteprime URL in questa stanza (riguarda solo te)",
     "Enable URL previews by default for participants in this room": "Attiva le anteprime URL in modo predefinito per i partecipanti in questa stanza",
@@ -233,7 +219,6 @@
     "No display name": "Nessun nome visibile",
     "New passwords don't match": "Le nuove password non corrispondono",
     "Passwords can't be empty": "Le password non possono essere vuote",
-    "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.": "La modifica della password ripristinerà qualsiasi chiave di cifratura end-to-end su tutti i dispositivi, rendendo illeggibile la cronologia delle chat, a meno che prima non esporti le tue chiavi della stanza e poi le importi. In futuro ciò verrà migliorato.",
     "Export E2E room keys": "Esporta chiavi E2E della stanza",
     "Do you want to set an email address?": "Vuoi impostare un indirizzo email?",
     "Current password": "Password attuale",
@@ -241,9 +226,6 @@
     "New Password": "Nuova password",
     "Confirm password": "Conferma password",
     "Change Password": "Modifica password",
-    "Unable to load device list": "Impossibile caricare l'elenco dei dispositivi",
-    "Delete %(count)s devices|other": "Elimina %(count)s dispositivi",
-    "Delete %(count)s devices|one": "Elimina dispositivo",
     "Device ID": "ID dispositivo",
     "Last seen": "Visto l'ultima volta",
     "Failed to set display name": "Impostazione nome visibile fallita",
@@ -259,14 +241,7 @@
     "%(senderName)s sent a video": "%(senderName)s ha inviato un video",
     "%(senderName)s uploaded a file": "%(senderName)s ha inviato un file",
     "Options": "Opzioni",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Richiesta di condivisione chiavi inviata - controlla i tuoi altri dispositivi per richieste di condivisione chiavi.",
-    "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.": "Le richieste di condivisione chiavi sono inviate automaticamente ai tuoi altri dispositivi. Se hai rifiutato o annullato la richiesta negli altri dispositivi, clicca qui per richiederle nuovamente.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se i tuoi altri dispositivi non hanno la chiave per questo messaggio non potrai decriptarli.",
     "Key request sent.": "Richiesta chiave inviata.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Chiedi di nuovo le chiavi di cifratura</requestLink> dai tuoi altri dispositivi.",
-    "Undecryptable": "Indecifrabile",
-    "Encrypted by an unverified device": "Criptato da un dispositivo non verificato",
-    "Unencrypted message": "Messaggio non criptato",
     "Please select the destination room for this message": "Seleziona la stanza di destinazione per questo messaggio",
     "Blacklisted": "In lista nera",
     "device id: ": "ID dispositivo: ",
@@ -286,8 +261,6 @@
     "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.": "Non potrai annullare questa modifica dato che ti stai declassando, se sei l'ultimo utente privilegiato nella stanza sarà impossibile ottenere di nuovo i privilegi.",
     "Are you sure?": "Sei sicuro?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non potrai annullare questa modifica dato che stai promuovendo l'utente al tuo stesso grado.",
-    "No devices with registered encryption keys": "Nessun dispositivo con chiavi di cifratura registrate",
-    "Devices": "Dispositivi",
     "Unignore": "Non ignorare più",
     "Ignore": "Ignora",
     "Mention": "Cita",
@@ -307,20 +280,14 @@
     "Voice call": "Chiamata vocale",
     "Video call": "Chiamata video",
     "Upload file": "Invia file",
-    "Show Text Formatting Toolbar": "Mostra barra di formattazione testo",
     "Send an encrypted reply…": "Invia una risposta criptata…",
     "Send a reply (unencrypted)…": "Invia una risposta (non criptata)…",
     "Send an encrypted message…": "Invia un messaggio criptato…",
     "Send a message (unencrypted)…": "Invia un messaggio (non criptato)…",
     "You do not have permission to post to this room": "Non hai il permesso di inviare in questa stanza",
-    "Hide Text Formatting Toolbar": "Nascondi barra di formattazione testo",
     "Server error": "Errore del server",
     "Server unavailable, overloaded, or something else went wrong.": "Server non disponibile, sovraccarico o qualcos'altro è andato storto.",
     "Command error": "Errore nel comando",
-    "bold": "grassetto",
-    "italic": "corsivo",
-    "Markdown is disabled": "Il markdown è disattivato",
-    "Markdown is enabled": "Il markdown è attivato",
     "Jump to message": "Salta al messaggio",
     "No pinned messages.": "Nessun messaggio ancorato.",
     "Loading...": "Caricamento...",
@@ -349,7 +316,6 @@
     "Community Invites": "Inviti della comunità",
     "Invites": "Inviti",
     "Favourites": "Preferiti",
-    "People": "Persone",
     "Low priority": "Bassa priorità",
     "Historical": "Cronologia",
     "Power level must be positive integer.": "Il livello di poteri deve essere un intero positivo.",
@@ -379,8 +345,6 @@
     "Members only (since they joined)": "Solo i membri (da quando sono entrati)",
     "Permissions": "Autorizzazioni",
     "Jump to first unread message.": "Salta al primo messaggio non letto.",
-    "Invalid alias format": "Formato alias non valido",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' non è un formato valido per un alias",
     "not specified": "non specificato",
     "Remote addresses for this room:": "Indirizzi remoti di questa stanza:",
     "Local addresses for this room:": "Indirizzi locali di questa stanza:",
@@ -539,19 +503,11 @@
     "Unknown error": "Errore sconosciuto",
     "Incorrect password": "Password sbagliata",
     "Deactivate Account": "Disattiva l'account",
-    "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:": "Per verificare se questo dispositivo è fidato, contatta il suo proprietario usando altri metodi (es. di persona o telefonando) e chiedigli se la chiave che vede nelle sue impostazioni utente per questo dispositivo coincide con la chiave sotto:",
-    "Device name": "Nome del dispositivo",
-    "Device key": "Chiave del dispositivo",
-    "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.": "Se coincide, premi il pulsante di verifica sotto. Se non coincide, allora qualcuno sta intercettando questo dispositivo e dovresti premere il pulsante di lista nera.",
-    "Verify device": "Verifica dispositivo",
     "I verify that the keys match": "Confermo che le chiavi coincidono",
     "An error has occurred.": "Si è verificato un errore.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Hai aggiunto un nuovo dispositivo '%(displayName)s', che sta richiedendo chiavi di cifratura.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Il dispositivo non verificato '%(displayName)s' sta richiedendo chiavi di cifratura.",
     "Start verification": "Inizia la verifica",
     "Share without verifying": "Condividi senza verificare",
     "Ignore request": "Ignora la richiesta",
-    "Loading device info...": "Caricamento info dispositivo...",
     "Encryption key request": "Richiesta chiave di cifratura",
     "Unable to restore session": "Impossibile ripristinare la sessione",
     "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.": "Se hai usato precedentemente una versione più recente di Riot, la tua sessione potrebbe essere incompatibile con questa versione. Chiudi questa finestra e torna alla versione più recente.",
@@ -570,11 +526,6 @@
     "To get started, please pick a username!": "Per iniziare, scegli un nome utente!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Questo sarà il tuo account nell'homeserver <span></span>, o puoi scegliere un <a>server diverso</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se invece hai già un account Matrix puoi <a>accedere</a>.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Attualmente stai bloccando i dispositivi non verificati; per inviare messaggi a questi dispositivi devi verificarli.",
-    "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.": "Ti consigliamo di eseguire il processo di verifica per ogni dispositivo per confermare che appartiene al legittimo proprietario, ma puoi reinviare il messaggio senza verifica se lo preferisci.",
-    "Room contains unknown devices": "La stanza contiene dispositivi sconosciuti",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contiene dispositivi che non hai mai visto prima.",
-    "Unknown devices": "Dispositivi sconosciuti",
     "Private Chat": "Conversazione privata",
     "Public Chat": "Chat pubblica",
     "Custom": "Personalizzato",
@@ -634,8 +585,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.",
     "You have no visible notifications": "Non hai alcuna notifica visibile",
     "Scroll to bottom of page": "Scorri in fondo alla pagina",
-    "Message not sent due to unknown devices being present": "Messaggio non inviato data la presenza di dispositivi sconosciuti",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra dispositivi</showDevicesText>, <sendAnywayText>invia comunque</sendAnywayText> o <cancelText>annulla</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Alcuni dei tuoi messaggi non sono stati inviati.",
     "%(count)s of your messages have not been sent.|one": "Il tuo messaggio non è stato inviato.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reinvia tutti</resendText> o <cancelText>annulla tutti</cancelText> adesso. Puoi anche selezionare i singoli messaggi da reinviare o annullare.",
@@ -668,13 +617,10 @@
     "Dark theme": "Tema scuro",
     "Sign out": "Disconnetti",
     "Success": "Successo",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "La tua password è stata cambiata correttamente. Non riceverai notifiche push su altri dispositivi finchè non riesegui l'accesso su di essi",
     "Unable to remove contact information": "Impossibile rimuovere le informazioni di contatto",
     "<not supported>": "<non supportato>",
     "Import E2E room keys": "Importa chiavi E2E stanza",
     "Cryptography": "Crittografia",
-    "Device ID:": "ID dispositivo:",
-    "Device key:": "Chiave dispositivo:",
     "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.": "Se hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
     "Submit debug logs": "Invia log di debug",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot raccoglie statistiche anonime per permetterci di migliorare l'applicazione.",
@@ -690,7 +636,6 @@
     "click to reveal": "clicca per mostrare",
     "Homeserver is": "L'homeserver è",
     "Identity Server is": "Il server di identità è",
-    "matrix-react-sdk version:": "versione matrix-react-sdk:",
     "riot-web version:": "versione riot-web:",
     "olm version:": "versione olm:",
     "Failed to send email": "Invio dell'email fallito",
@@ -722,7 +667,6 @@
     "Kicks user with given id": "Caccia un utente per ID",
     "Changes your display nickname": "Modifica il tuo nick visualizzato",
     "Searches DuckDuckGo for results": "Cerca risultati su DuckDuckGo",
-    "Verifies a user, device, and pubkey tuple": "Verifica una tupla di utente, dispositivo e chiave pubblica",
     "Ignores a user, hiding their messages from you": "Ignora un utente, non mostrandoti i suoi messaggi",
     "Stops ignoring a user, showing their messages going forward": "Smetti di ignorare un utente, mostrando i suoi messaggi successivi",
     "Opens the Developer Tools dialog": "Apre la finestra di strumenti per sviluppatori",
@@ -746,7 +690,6 @@
     "Session ID": "ID sessione",
     "End-to-end encryption information": "Informazioni di cifratura end-to-end",
     "Event information": "Informazioni evento",
-    "Sender device information": "Informazioni dispositivo mittente",
     "Passphrases must match": "Le password devono coincidere",
     "Passphrase must not be empty": "La password non può essere vuota",
     "Export room keys": "Esporta chiavi della stanza",
@@ -820,7 +763,6 @@
     "Resend": "Reinvia",
     "Collecting app version information": "Raccolta di informazioni sulla versione dell'applicazione",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminare l'alias %(alias)s e rimuovere %(name)s dalla lista?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Questo ti permetterà di ritornare al tuo account dopo esserti disconnesso e accedere in altri dispositivi.",
     "Keywords": "Parole chiave",
     "Enable notifications for this account": "Abilita le notifiche per questo account",
     "Invite to this community": "Invita a questa comunità",
@@ -910,8 +852,6 @@
     "Missing roomId.": "ID stanza mancante.",
     "Always show encryption icons": "Mostra sempre icone di cifratura",
     "Enable widget screenshots on supported widgets": "Attiva le schermate dei widget sui widget supportati",
-    "Unable to reply": "Impossibile rispondere",
-    "At this time it is not possible to reply with an emote.": "Al momento non è possibile rispondere con una emoticon.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossibile caricare l'evento a cui si è risposto, o non esiste o non hai il permesso di visualizzarlo.",
     "Refresh": "Aggiorna",
     "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.",
@@ -958,12 +898,6 @@
     "This event could not be displayed": "Questo evento non può essere mostrato",
     "Demote yourself?": "Retrocedi?",
     "Demote": "Retrocedi",
-    "deleted": "cancellato",
-    "underlined": "sottolineato",
-    "inline-code": "codice in linea",
-    "block-quote": "citazione",
-    "bulleted-list": "lista a punti",
-    "numbered-list": "lista a numeri",
     "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.": "Nelle stanze criptate, come questa, le anteprime degli URL sono disabilitate di default per garantire che il tuo server di casa (dove vengono generate le anteprime) non possa raccogliere informazioni sui collegamenti che vedi in questa stanza.",
     "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.": "Quando qualcuno inserisce un URL nel proprio messaggio, è possibile mostrare un'anteprima dell'URL per fornire maggiori informazioni su quel collegamento, come il titolo, la descrizione e un'immagine dal sito web.",
     "The email field must not be blank.": "Il campo email non deve essere vuoto.",
@@ -1055,11 +989,6 @@
     "Unknown server error": "Errore sconosciuto del server",
     "Delete Backup": "Elimina backup",
     "Unable to load key backup status": "Impossibile caricare lo stato del backup delle chiavi",
-    "Backup has a <validity>valid</validity> signature from this device": "Il backup ha una firma <validity>valida</validity> da questo dispositivo",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Il backup ha una firma <validity>valida</validity> dal dispositivo <verify>non verificato</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Il backup ha una firma <validity>non valida</validity> dal dispositivo <verify>verificato</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Il backup ha una firma <validity>non valida</validity> dal dispositivo <verify>non verificato</verify> <device></device>",
-    "Backup is not signed by any of your devices": "Il backup non è firmato da alcun tuo dispositivo",
     "Backup version: ": "Versione backup: ",
     "Algorithm: ": "Algoritmo: ",
     "Please review and accept all of the homeserver's policies": "Si prega di rivedere e accettare tutte le politiche dell'homeserver",
@@ -1081,7 +1010,6 @@
     "This looks like a valid recovery key!": "Sembra essere una chiave di recupero valida!",
     "Not a valid recovery key": "Non è una chiave di recupero valida",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua chiave di recupero.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Se hai dimenticato la password di recupero puoi <button>impostare nuove opzioni di recupero</button>",
     "Failed to load group members": "Caricamento membri del gruppo fallito",
     "Failed to perform homeserver discovery": "Ricerca dell'homeserver fallita",
     "Invalid homeserver discovery response": "Risposta della ricerca homeserver non valida",
@@ -1097,12 +1025,9 @@
     "Your Recovery Key": "La tua chiave di recupero",
     "Copy to clipboard": "Copia negli appunti",
     "Download": "Scarica",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "La tua chiave di recupero è stata <b>copiata negli appunti</b>, incollala in:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "La tua chiave di recupero è nella cartella <b>Download</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Stampala</b> e conservala in un luogo sicuro",
     "<b>Save it</b> on a USB key or backup drive": "<b>Salvala</b> in una chiave USB o disco di backup",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copiala</b> nel tuo archivio cloud personale",
-    "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.": "Senza impostare un ripristino sicuro dei messaggi, non potrai ripristinare la cronologia dei messaggi cifrati se ti disconnetti o utilizzi un altro dispositivo.",
     "Set up Secure Message Recovery": "Imposta ripristino sicuro dei messaggi",
     "Keep it safe": "Tienila al sicuro",
     "Create Key Backup": "Crea backup chiave",
@@ -1123,7 +1048,6 @@
     "Straight rows of keys are easy to guess": "Sequenze di tasti in riga sono facili da indovinare",
     "Short keyboard patterns are easy to guess": "Sequenze di tasti brevi sono facili da indovinare",
     "Custom user status messages": "Messaggi di stato utente personalizzati",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Il backup ha una firma <validity>valida</validity> dal dispositivo <verify>verificato</verify> <device></device>",
     "Unable to load commit detail: %(msg)s": "Caricamento dettagli del commit fallito: %(msg)s",
     "Set a new status...": "Imposta un nuovo stato...",
     "Clear status": "Elimina stato",
@@ -1186,7 +1110,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifica questo utente confermando che la seguente emoji appare sul suo schermo.",
     "Verify this user by confirming the following number appears on their screen.": "Verifica questo utente confermando che il seguente numero appare sul suo schermo.",
     "Unable to find a supported verification method.": "Impossibile trovare un metodo di verifica supportato.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Per la massima sicurezza, ti consigliamo di farlo di persona o di utilizzare un altro mezzo di comunicazione fidato.",
     "Dog": "Cane",
     "Cat": "Gatto",
     "Lion": "Leone",
@@ -1233,7 +1156,6 @@
     "Pencil": "Matita",
     "Paperclip": "Graffetta",
     "Scissors": "Forbici",
-    "Padlock": "Lucchetto",
     "Key": "Chiave",
     "Hammer": "Martello",
     "Telephone": "Telefono",
@@ -1251,7 +1173,6 @@
     "Headphones": "Auricolari",
     "Folder": "Cartella",
     "Pin": "Spillo",
-    "Your homeserver does not support device management.": "Il tuo homeserver non supporta la gestione dei dispositivi.",
     "Yes": "Sì",
     "No": "No",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Ti abbiamo inviato un'email per verificare il tuo indirizzo. Segui le istruzioni contenute e poi clicca il pulsante sotto.",
@@ -1259,20 +1180,15 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Sei sicuro? Perderai i tuoi messaggi cifrati se non hai salvato adeguatamente le tue chiavi.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi criptati sono resi sicuri con una cifratura end-to-end. Solo tu e il/i destinatario/i avete le chiavi per leggere questi messaggi.",
     "Restore from Backup": "Ripristina da un backup",
-    "This device is backing up your keys. ": "Questo dispositivo sta facendo una copia delle tue chiavi. ",
     "Back up your keys before signing out to avoid losing them.": "Fai una copia delle tue chiavi prima di disconnetterti per evitare di perderle.",
     "Backing up %(sessionsRemaining)s keys...": "Copia di %(sessionsRemaining)s chiavi...",
     "All keys backed up": "Tutte le chiavi sono state copiate",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Il backup ha una firma dal dispositivo <verify>sconosciuto</verify> con ID %(deviceId)s.",
-    "This backup is trusted because it has been restored on this device": "Questo backup è fidato perchè è stato ripristinato su questo dispositivo",
-    "Your keys are <b>not being backed up from this device</b>.": "Le tue chiavi <b>non stanno venendo copiate da questo dispositivo</b>.",
     "Start using Key Backup": "Inizia ad usare il backup chiavi",
     "Add an email address to configure email notifications": "Aggiungi un indirizzo email per configurare le notifiche via email",
     "Unable to verify phone number.": "Impossibile verificare il numero di telefono.",
     "Verification code": "Codice di verifica",
     "Phone Number": "Numero di telefono",
     "Profile picture": "Immagine del profilo",
-    "Upload profile picture": "Invia immagine del profilo",
     "<a>Upgrade</a> to your own domain": "<a>Aggiorna</a> ad un tuo dominio personale",
     "Display Name": "Nome visualizzato",
     "Set a new account password...": "Imposta una nuova password dell'account...",
@@ -1335,10 +1251,6 @@
     "Encryption": "Cifratura",
     "Once enabled, encryption cannot be disabled.": "Una volta attivata, la cifratura non può essere disattivata.",
     "Encrypted": "Cifrato",
-    "Some devices for this user are not trusted": "Alcuni dispositivi di questo utente non sono fidati",
-    "Some devices in this encrypted room are not trusted": "Alcuni dispositivi in questa stanza cifrata non sono fidati",
-    "All devices for this user are trusted": "Tutti i dispositivi di questo utente sono fidati",
-    "All devices in this encrypted room are trusted": "Tutti i dispositivi in questa stanza cifrata sono fidati",
     "Never lose encrypted messages": "Non perdere mai i messaggi cifrati",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi in questa stanza sono protetti con crittografia end-to-end. Solo tu e i destinatari avete le chiavi per leggere questi messaggi.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Fai una copia sicura delle chiavi per evitare di perderle. <a>Maggiori informazioni.</a>",
@@ -1354,8 +1266,6 @@
     "Error updating flair": "Errore aggiornamento predisposizione",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Si è verificato un errore nell'aggiornamento della predisposizione di questa stanza. Potrebbe non essere permesso dal server o si è verificato un errore temporaneo.",
     "Room avatar": "Avatar della stanza",
-    "Upload room avatar": "Invia avatar della stanza",
-    "No room avatar": "Nessun avatar della stanza",
     "Room Name": "Nome stanza",
     "Room Topic": "Argomento stanza",
     "Join": "Entra",
@@ -1367,7 +1277,6 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Non compare niente? Non tutti i client supportano ancora la verifica interattiva. <button>Usa la verifica obsoleta</button>.",
     "Use two-way text verification": "Usa la verifica testuale bidirezionale",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica questo utente per contrassegnarlo come affidabile. La fiducia degli utenti offre una maggiore tranquillità quando si utilizzano messaggi cifrati end-to-end.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "La verifica di questo utente contrassegna il suo dispositivo come affidabile a te e viceversa.",
     "Waiting for partner to confirm...": "In attesa che il partner confermi...",
     "Incoming Verification Request": "Richiesta di verifica in arrivo",
     "I don't want my encrypted messages": "Non voglio i miei messaggi cifrati",
@@ -1418,12 +1327,10 @@
     "This homeserver does not support communities": "Questo homeserver non supporta le comunità",
     "Guest": "Ospite",
     "Could not load user profile": "Impossibile caricare il profilo utente",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "La modifica della password reimposta qualsiasi chiave di cifratura end-to-end su tutti i dispositivi, rendendo illeggibile la cronologia della chat cifrata. Imposta il backup chiavi o esporta le chiavi della stanza da un altro dispositivo prima di reimpostare la password.",
     "Your Matrix account on %(serverName)s": "Il tuo account Matrix su %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Ti verrà inviata un'email di verifica per confermare la tua nuova password.",
     "Sign in instead": "Oppure accedi",
     "Your password has been reset.": "La tua password è stata reimpostata.",
-    "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.": "Sei stato disconnesso da tutti i dispositivi e non riceverai più notifiche push. Per riattivare le notifiche, accedi di nuovo su ogni dispositivo.",
     "Set a new password": "Imposta un nuova password",
     "This homeserver does not support login using email address.": "Questo homeserver non supporta l'accesso tramite indirizzo email.",
     "Create account": "Crea account",
@@ -1436,7 +1343,6 @@
     "Set up with a Recovery Key": "Imposta con una chiave di ripristino",
     "Please enter your passphrase a second time to confirm.": "Inserisci la tua password un'altra volta per confermare.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "La tua chiave di ripristino è una rete di sicurezza - puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la tua password.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Conserva la chiave di ripristino in un luogo molto sicuro, come un password manager (o una cassaforte)",
     "Your keys are being backed up (the first backup could take a few minutes).": "Il backup delle chiavi è in corso (il primo backup potrebbe richiedere qualche minuto).",
     "Secure your backup with a passphrase": "Proteggi il tuo backup con una password",
     "Confirm your passphrase": "Conferma la tua password",
@@ -1444,22 +1350,13 @@
     "Starting backup...": "Avvio del backup...",
     "Success!": "Completato!",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Sono state rilevate una nuova password di ripristino e una chiave per i messaggi sicuri.",
-    "This device is encrypting history using the new recovery method.": "Questo dispositivo sta criptando la cronologia utilizzando il nuovo metodo di ripristino.",
     "Recovery Method Removed": "Metodo di ripristino rimosso",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Questo dispositivo ha rilevato che la password di ripristino e la chiave per i messaggi sicuri sono stati rimossi.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Se l'hai fatto per sbaglio, è possibile impostare Messaggi Sicuri su questo dispositivo che cripterà nuovamente la cronologia dei messaggi con un nuovo metodo di ripristino.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non hai rimosso il metodo di ripristino, è possibile che un aggressore stia cercando di accedere al tuo account. Cambia la password del tuo account e imposta immediatamente un nuovo metodo di recupero nelle impostazioni.",
-    "Room upgrade confirmation": "Conferma di aggiornamento stanza",
-    "Upgrading a room can be destructive and isn't always necessary.": "Aggiornare una stanza può essere distruttivo e non sempre è necessario.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gli aggiornamenti delle stanze sono solitamente consigliati quando una versione è considerata <i>non stabile</i>. Le versioni di stanza non stabili possono avere errori, funzioni mancanti o vulnerabilità di sicurezza.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gli aggiornamenti della stanza di solito influenzano solo l'elaborazione <i>lato-server</i> della stanza. Se riscontri un problema con il tuo client Riot, segnalalo con <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Attenzione</b>: aggiornare una stanza <i>non migrerà automaticamente i membri della stanza alla nuova versione.</i> Inseriremo un link alla nuova stanza nella vecchia versione - i membri dovranno cliccare questo link per unirsi alla nuova stanza.",
     "Adds a custom widget by URL to the room": "Aggiunge alla stanza un widget personalizzato da URL",
     "Please supply a https:// or http:// widget URL": "Fornisci un URL https:// o http:// per il widget",
     "You cannot modify widgets in this room.": "Non puoi modificare i widget in questa stanza.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ha revocato l'invito a %(targetDisplayName)s di unirsi alla stanza.",
-    "Enable desktop notifications for this device": "Attiva le notifiche desktop per questo dispositivo",
-    "Enable audible notifications for this device": "Attiva le notifiche audio per questo dispositivo",
     "Upgrade this room to the recommended room version": "Aggiorna questa stanza alla versione consigliata",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "La versione di questa stanza è <roomVersion />, che questo homeserver ha segnalato come <i>non stabile</i>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Aggiornare questa stanza spegnerà l'istanza attuale della stanza e ne creerà una aggiornata con lo stesso nome.",
@@ -1484,8 +1381,6 @@
     "The file '%(fileName)s' failed to upload.": "Invio del file '%(fileName)s' fallito.",
     "The server does not support the room version specified.": "Il server non supporta la versione di stanza specificata.",
     "Name or Matrix ID": "Nome o ID Matrix",
-    "Email, name or Matrix ID": "Email, nome o ID Matrix",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Conferma di volere continuare nell'aggiornamento di questa stanza dalla <oldVersion /> alla <newVersion />.",
     "Changes your avatar in this current room only": "Cambia il tuo avatar solo nella stanza attuale",
     "Unbans user with given ID": "Riammette l'utente con l'ID dato",
     "Sends the given message coloured as a rainbow": "Invia il messaggio dato colorato come un arcobaleno",
@@ -1493,10 +1388,6 @@
     "The user's homeserver does not support the version of the room.": "L'homeserver dell'utente non supporta la versione della stanza.",
     "Show hidden events in timeline": "Mostra eventi nascosti nella timeline",
     "When rooms are upgraded": "Quando le stanze vengono aggiornate",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Questo dispositivo <b>non sta facendo backup delle tue chiavi</b>, ma hai un backup esistente che puoi ripristinare e aggiungere da adesso in poi.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Connetti questo dispositivo al backup chiavi prima di disconnetterti per evitare di perdere chiavi che potrebbero essere solo in questo dispositivo.",
-    "Connect this device to Key Backup": "Connetti questo dispositibo al Backup Chiavi",
-    "Backup has an <validity>invalid</validity> signature from this device": "Il backup ha un firma <validity>non valida</validity> da questo dispositivo",
     "this room": "questa stanza",
     "View older messages in %(roomName)s.": "Vedi messaggi più vecchi in %(roomName)s.",
     "Joining room …": "Ingresso nella stanza …",
@@ -1613,22 +1504,18 @@
     "Resend %(unsentCount)s reaction(s)": "Reinvia %(unsentCount)s reazione/i",
     "Resend removal": "Reinvia la rimozione",
     "Changes your avatar in all rooms": "Cambia il tuo avatar in tutte le stanze",
-    "Clear all data on this device?": "Eliminare tutti i dati in questo dispositivo?",
     "Your homeserver doesn't seem to support this feature.": "Il tuo homeserver non sembra supportare questa funzione.",
     "You're signed out": "Sei disconnesso",
     "Clear all data": "Elimina tutti i dati",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Per favore dicci cos'è andato storto, o meglio, crea una segnalazione su GitHub che descriva il problema.",
     "Removing…": "Rimozione…",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "L'eliminazione di tutti i dati dal dispositivo è permanente. I messaggi cifrati andranno persi a meno che non si abbia un backup delle loro chiavi.",
     "Failed to re-authenticate due to a homeserver problem": "Riautenticazione fallita per un problema dell'homeserver",
     "Failed to re-authenticate": "Riautenticazione fallita",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Ottieni l'accesso al tuo account e ripristina le chiavi di cifratura salvate nel dispositivo. Senza di esse, non potrai leggere tutti i tuoi messaggi sicuri su qualsiasi dispositivo.",
     "Enter your password to sign in and regain access to your account.": "Inserisci la tua password per accedere ed ottenere l'accesso al tuo account.",
     "Forgotten your password?": "Hai dimenticato la password?",
     "Sign in and regain access to your account.": "Accedi ed ottieni l'accesso al tuo account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Non puoi accedere al tuo account. Contatta l'admin del tuo homeserver per maggiori informazioni.",
     "Clear personal data": "Elimina dati personali",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Attenzione: i tuoi dati personali (incluse le chiavi di cifratura) sono ancora in questo dispositivo. Eliminali se hai finito di usare il dispositivo o se vuoi accedere ad un altro account.",
     "Identity Server": "Server identità",
     "Find others by phone or email": "Trova altri per telefono o email",
     "Be found by phone or email": "Trovato per telefono o email",
@@ -1640,7 +1527,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Chiedi all'amministratore del tuo homeserver(<code>%(homeserverDomain)s</code>) per configurare un server TURN affinché le chiamate funzionino in modo affidabile.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "In alternativa, puoi provare a utilizzare il server pubblico all'indirizzo <code>turn.matrix.org</code>, ma questo non sarà così affidabile e condividerà il tuo indirizzo IP con quel server. Puoi anche gestirlo in Impostazioni.",
     "Try using turn.matrix.org": "Prova a usare turn.matrix.org",
-    "Failed to start chat": "Impossibile avviare la chat",
     "Messages": "Messaggi",
     "Actions": "Azioni",
     "Displays list of commands with usages and descriptions": "Visualizza l'elenco dei comandi con usi e descrizioni",
@@ -1670,7 +1556,6 @@
     "Please enter verification code sent via text.": "Inserisci il codice di verifica inviato via SMS.",
     "Discovery options will appear once you have added a phone number above.": "Le opzioni di scoperta appariranno dopo aver aggiunto un numero di telefono sopra.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "È stato inviato un SMS a +%(msisdn)s. Inserisci il codice di verifica contenuto.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Per verificare che questo dispositivo sia affidabile, controlla che la chiave che vedi nelle Impostazioni Utente su quel dispositivo corrisponde alla chiave sotto:",
     "Command Help": "Aiuto comando",
     "No identity server is configured: add one in server settings to reset your password.": "Nessun server di identità configurato: aggiungine uno nelle impostazioni server per ripristinare la password.",
     "This account has been deactivated.": "Questo account è stato disattivato.",
@@ -1682,7 +1567,6 @@
     "Terms of service not accepted or the identity server is invalid.": "Condizioni di servizio non accettate o server di identità non valido.",
     "Enter a new identity server": "Inserisci un nuovo server di identità",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Accetta le condizioni di servizio del server di identità (%(serverName)s) per poter essere trovabile tramite indirizzo email o numero di telefono.",
-    "A device's public name is visible to people you communicate with": "Il nome pubblico di un dispositivo è visibile dalle persone con cui comunichi",
     "Remove %(email)s?": "Rimuovere %(email)s?",
     "Remove %(phone)s?": "Rimuovere %(phone)s?",
     "Multiple integration managers": "Gestori di integrazione multipli",
@@ -1780,7 +1664,6 @@
     "Notification Autocomplete": "Autocompletamento notifiche",
     "Room Autocomplete": "Autocompletamento stanze",
     "User Autocomplete": "Autocompletamento utenti",
-    "Use the new, faster, composer for writing messages": "Usa il compositore nuovo e più veloce per scrivere messaggi",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Stai per rimuovere 1 messaggio da %(user)s. Non può essere annullato. Vuoi continuare?",
     "Remove %(count)s messages|one": "Rimuovi 1 messaggio",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Chiave pubblica di Captcha mancante nella configurazione dell'homeserver. Segnalalo all'amministratore dell'homeserver.",
@@ -1870,11 +1753,7 @@
     "Custom (%(level)s)": "Personalizzato (%(level)s)",
     "Trusted": "Fidato",
     "Not trusted": "Non fidato",
-    "Hide verified Sign-In's": "Nascondi accessi verificati",
-    "%(count)s verified Sign-In's|other": "%(count)s accessi verificati",
-    "%(count)s verified Sign-In's|one": "1 accesso verificato",
     "Direct message": "Messaggio diretto",
-    "Unverify user": "Revoca verifica utente",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "I messaggi in questa stanza sono cifrati end-to-end.",
     "Security": "Sicurezza",
@@ -1891,7 +1770,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s.",
     "Widget added by": "Widget aggiunto da",
     "This widget may use cookies.": "Questo widget può usare cookie.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Invia le richieste di verifica via messaggio diretto, inclusa una nuova esperienza utente per la verifica nel pannello membri.",
     "Enable local event indexing and E2EE search (requires restart)": "Attiva l'indicizzazione di eventi locali e la ricerca E2EE (richiede riavvio)",
     "Connecting to integration manager...": "Connessione al gestore di integrazioni...",
     "Cannot connect to integration manager": "Impossibile connettere al gestore di integrazioni",
@@ -1916,7 +1794,6 @@
     "Ignored/Blocked": "Ignorati/Bloccati",
     "Verification Request": "Richiesta verifica",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Attiva la firma incrociata per la verifica per-utente invece che per-dispositivo (in sviluppo)",
     "Match system theme": "Usa il tema di sistema",
     "%(senderName)s placed a voice call.": "%(senderName)s ha effettuato una chiamata vocale.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ha effettuato una chiamata vocale. (non supportata da questo browser)",
@@ -1958,7 +1835,6 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola di ban che corrispondeva a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s",
     "Send cross-signing keys to homeserver": "Invia chiavi di firma incrociata all'homeserver",
     "Cross-signing public keys:": "Chiavi pubbliche di firma incrociata:",
-    "on device": "sul dispositivo",
     "not found": "non trovato",
     "Cross-signing private keys:": "Chiavi private di firma incrociata:",
     "in secret storage": "in un archivio segreto",
@@ -1971,67 +1847,40 @@
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la password corretta.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Attenzione</b>: dovresti accedere all'archivio segreto solo da un computer fidato.",
     "Cross-signing and secret storage are enabled.": "La firma incrociata e l'archivio segreto sono attivi.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Il tuo account ha un'identità a firma incrociata in archivio segreto, ma non è ancora fidata da questo dispositivo.",
     "Cross-signing and secret storage are not yet set up.": "La firma incrociata e l'archivio segreto non sono ancora impostati.",
     "not stored": "non salvato",
     "Backup has a <validity>valid</validity> signature from this user": "Il backup ha una firma <validity>valida</validity> da questo utente",
     "Backup has a <validity>invalid</validity> signature from this user": "Il backup ha una firma <validity>non valida</validity> da questo utente",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Il backup ha una firma dall'utente <verify>sconosciuto</verify> con ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Il backup ha una firma dal dispositivo <verify>sconosciuto</verify> con ID %(deviceId)s",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Backup chiavi presente nell'archivio segreto, ma questa funzione non è attiva sul dispositivo. Attiva la firma incrociata in Labs per modificare lo stato del backup.",
     "Backup key stored: ": "Backup chiavi salvato: ",
-    "Start using Key Backup with Secure Secret Storage": "Inizia ad usare il Backup Chiavi con l'Archivio Segreto",
     "Hide verified sessions": "Nascondi sessioni verificate",
     "%(count)s verified sessions|other": "%(count)s sessioni verificate",
     "%(count)s verified sessions|one": "1 sessione verificata",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Accedi alla cronologia sicura dei tuoi messaggi e all'identità a firma incrociata per verificare altri dispositivi inserendo la tua password.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se hai dimenticato la password puoi <button1>usare la tua chiave di recupero</button1> o <button2>impostare nuove opzioni di recupero</button2>.",
     "Enter secret storage recovery key": "Inserisci la chiave di recupero dell'archivio segreto",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la chiave di recupero corretta.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Accedi alla cronologia sicura dei tuoi messaggi e all'identità a firma incrociata per verificare altri dispositivi inserendo la tua chiave di recupero.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Se hai dimenticato la tua chiave di recupero puoi <button>impostare nuove opzioni di recupero</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attenzione</b>: dovresti impostare il backup chiavi solo da un computer fidato.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se hai dimenticato la tua chiave di recupero puoi <button>impostare nuove opzioni di recupero</button>",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Attenzione</b>: dovresti impostare l'archivio segreto solo da un computer fidato.",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "Utilizzeremo l'archivio segreto per memorizzare facoltativamente una copia criptata della tua identità a firma incrociata per verificare altri dispositivi e chiavi dei messaggi sul nostro server. Proteggi il tuo accesso ai messaggi cifrati con una password per tenerlo al sicuro.",
     "Set up with a recovery key": "Imposta con una chiave di recupero",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la password.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Tieni la chiave di recupero in un posto molto sicuro, come un gestore di password (o una cassaforte).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "La tua chiave di recupero è stata <b>copiata negli appunti</b>, incollala in:",
     "Your recovery key is in your <b>Downloads</b> folder.": "La chiave di recupero è nella tua cartella <b>Scaricati</b>.",
-    "Your access to encrypted messages is now protected.": "L'accesso ai tuoi messaggi cifrati è ora protetto.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Senza l'impostazione dell'archivio segreto, non sarà possibile recuperare l'accesso ai messaggi cifrati o l'identità a firma incrociata per verificare altri dispositivi se ti disconnetti o utilizzi un altro dispositivo.",
-    "Set up secret storage": "Imposta l'archivio segreto",
-    "Secure your encrypted messages with a passphrase": "Proteggi i tuoi messaggi cifrati con una password",
     "Storing secrets...": "Memorizzo i segreti...",
     "Unable to set up secret storage": "Impossibile impostare un archivio segreto",
     "Close preview": "Chiudi anteprima",
-    "This user has not verified all of their devices.": "Questo utente non ha verificato tutti i suoi dispositivi.",
-    "You have not verified this user. This user has verified all of their devices.": "Non hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.",
-    "You have verified this user. This user has verified all of their devices.": "Hai verificato questo utente. Questo utente ha verificato tutti i suoi dispositivi.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Non hai verificato alcuni utenti in questa stanza criptata o essi non hanno verificato i loro dispositivi.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Hai verificato tutti gli utenti in questa stanza criptata ed essi hanno verificato i loro dispositivi.",
     "Language Dropdown": "Lingua a tendina",
     "Country Dropdown": "Nazione a tendina",
     "The message you are trying to send is too large.": "Il messaggio che stai tentando di inviare è troppo grande.",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli del tuo backup chiavi. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del tuo backup chiavi",
-    "Migrate from Key Backup": "Migra dal backup chiavi",
     "Help": "Aiuto",
-    "New DM invite dialog (under development)": "Nuovo invito via messaggio diretto (in sviluppo)",
     "Show info about bridges in room settings": "Mostra info sui bridge nelle impostazioni stanza",
-    "This bridge was provisioned by <user />": "Questo bridge è stato fornito da <user />",
     "This bridge is managed by <user />.": "Questo bridge è gestito da <user />.",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "Bridge in <channelLink /> <networkLink />, su <protocolName />",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Connesso a <channelIcon /> <channelName /> su <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Connesso via %(protocolName)s",
-    "Bridge Info": "Info bridge",
-    "Below is a list of bridges connected to this room.": "Sotto vedi una lista di brdige connessi a questa stanza.",
     "Recent Conversations": "Conversazioni recenti",
     "Suggestions": "Suggerimenti",
     "Show more": "Mostra altro",
     "Direct Messages": "Messaggi diretti",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Se non riesci a trovare qualcuno, chiedigli il nome utente o condividi il tuo (%(userId)s) o il <a>link al profilo</a>.",
     "Go": "Vai",
     "a few seconds ago": "pochi secondi fa",
     "about a minute ago": "circa un minuto fa",
@@ -2052,12 +1901,7 @@
     "Bootstrap cross-signing and secret storage": "Inizializza firma incrociata e archivio segreto",
     "Failed to find the following users": "Impossibile trovare i seguenti utenti",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "I seguenti utenti potrebbero non esistere o non sono validi, perciò non possono essere invitati: %(csvNames)s",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Il Backup Chiavi è attivo sul tuo account ma non è stato impostato da questa sessione. Per impostare un archivio segreto, ripristina il tuo backup chiavi.",
     "Restore": "Ripristina",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "L'archivio segreto verrà impostato usando i dettagli esistenti del backup chiavi. La password dell'archivio segreto e la chiave di recupero saranno le stesse del backup chiavi",
-    "Restore your Key Backup": "Ripristina il tuo Backup Chiavi",
-    "New Session": "Nuova sessione",
-    "New invite dialog": "Nuova finestra di invito",
     "Other users may not trust it": "Altri utenti potrebbero non fidarsi",
     "Later": "Più tardi",
     "Failed to invite the following users to chat: %(csvUsers)s": "Impossibile invitare i seguenti utenti alla chat: %(csvUsers)s",
@@ -2072,18 +1916,13 @@
     "Session verified": "Sessione verificata",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "La tua sessione ora è verificata. Ha accesso ai tuoi messaggi cifrati e gli altri utenti la vedranno come fidata.",
     "Done": "Fatto",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Se non completi la sicurezza su questo dispositivo, esso non avrà accesso ai messaggi cifrati.",
     "Go Back": "Torna",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "L'archivio segreto verrà impostato usando i dettagli del backup chiavi esistente. La password dell'archivio segreto e la chiave di ripristino saranno le stesse del backup chiavi.",
-    "Encrypted by a deleted device": "Cifrato da un dispositivo eliminato",
     "Verify User": "Verifica utente",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Per maggiore sicurezza, verifica questo utente controllando un codice univoco sui vostri dispositivi.",
-    "For maximum security, do this in person.": "Per massima sicurezza, fatelo di persona.",
     "Start Verification": "Inizia la verifica",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s ha aggiunto %(addedAddresses)s e %(count)s altri indirizzi a questa stanza",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s ha rimosso %(countRemoved)s e aggiunto %(countAdded)s indirizzi a questa stanza",
-    "Someone is using an unknown device": "Qualcuno sta usando un dispositivo sconosciuto",
     "This room is end-to-end encrypted": "Questa stanza è cifrata end-to-end",
     "Everyone in this room is verified": "Tutti in questa stanza sono verificati",
     "Invite only": "Solo a invito",
@@ -2097,12 +1936,9 @@
     "Send as message": "Invia come messaggio",
     "Enter your account password to confirm the upgrade:": "Inserisci la password del tuo account per confermare l'aggiornamento:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Dovrai autenticarti con il server per confermare l'aggiornamento.",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Aggiorna il dispositivo per consentirgli di verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Imposta la cifratura sul dispositivo per consentirgli di verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Proteggi le chiavi di cifratura con una password. Per massima sicurezza questa dovrebbe essere diversa da quella del tuo account:",
     "Enter a passphrase": "Inserisci una password",
     "Enter your passphrase a second time to confirm it.": "Inserisci di nuovo la tua password per confermarla.",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Questo dispositivo ora può verificare altri dispositivi, dando loro accesso ai messaggi cifrati e contrassegnandoli come fidati per gli altri utenti.",
     "Verify other users in their profile.": "Verifica gli altri utenti nel loro profilo.",
     "Upgrade your encryption": "Aggiorna la tua cifratura",
     "Set up encryption": "Imposta la cifratura",
@@ -2116,10 +1952,7 @@
     "Waiting for %(displayName)s to verify…": "In attesa della verifica da %(displayName)s …",
     "They match": "Corrispondono",
     "They don't match": "Non corrispondono",
-    "For ultimate security, do this in person or use another way to communicate.": "Per la massima sicurezza, fatelo di persona o usate un'altra via di comunicazione.",
-    "Review & verify your new session": "Controlla e verifica la tua nuova sessione",
     "Review": "Controlla",
-    "Verify your other devices easier": "Verifica più facilmente gli altri tuoi dispositivi",
     "This bridge was provisioned by <user />.": "Questo bridge è stato fornito da <user />.",
     "Workspace: %(networkName)s": "Spazio di lavoro: %(networkName)s",
     "Channel: %(channelName)s": "Canale: %(channelName)s",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 787dcbc4ca..43e4d5544a 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -30,7 +30,6 @@
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "添付ファイル送信",
     "Use compact timeline layout": "会話表示の行間を狭くする",
-    "Start Chat": "対話へ招待",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riotはアプリケーションを改善するために匿名の分析情報を収集しています。",
     "Add": "追加",
     "No Microphones detected": "マイクが見つかりません",
@@ -150,7 +149,6 @@
     "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.": "これにより、サインアウト後にあなたのアカウントに戻る、また、他の端末でサインインすることができます。",
     "Invite to this community": "このコミュニティに招待する",
     "View Source": "ソースコードを表示する",
     "Back": "戻る",
@@ -206,7 +204,6 @@
     "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": "通話タイムアウト",
@@ -274,9 +271,6 @@
     "Moderator": "仲裁者",
     "Admin": "管理者",
     "Start a chat": "チャットを開始する",
-    "Who would you like to communicate with?": "誰と通信しますか?",
-    "Invite new room members": "新しい部屋のメンバーを招待します",
-    "Send Invites": "招待状を送る",
     "Failed to invite": "招待できませんでした",
     "Failed to invite the following users to the %(roomName)s room:": "次のユーザーを %(roomName)s の部屋に招待できませんでした:",
     "You need to be logged in.": "ログインする必要があります。",
@@ -311,16 +305,9 @@
     "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 は招待を受け入れました。",
@@ -364,7 +351,6 @@
     "%(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 は、その部屋の固定メッセージを変更しました。",
@@ -390,8 +376,6 @@
     "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
     "Mirror local video feed": "ローカルビデオ映像送信",
     "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プレビューを有効にする",
@@ -413,15 +397,11 @@
     "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": "確認のパスワード",
-    "Unable to load device list": "端末リストを読み込めません",
     "Authentication": "認証",
-    "Delete %(count)s devices|other": "%(count)s 件の端末を削除する",
-    "Delete %(count)s devices|one": "端末を削除する",
     "Device ID": "端末ID",
     "Last seen": "最後に表示した時刻",
     "Failed to set display name": "表示名の設定に失敗しました",
@@ -442,14 +422,7 @@
     "%(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": "解読不能",
-    "Encrypted by an unverified device": "未検証の端末によって暗号化されました",
-    "Unencrypted message": "暗号化されていないメッセージ",
     "Please select the destination room for this message": "このメッセージを送り先部屋を選択してください",
     "Blacklisted": "ブラックリストに載せた",
     "device id: ": "端末id: ",
@@ -471,8 +444,6 @@
     "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": "招待",
@@ -485,12 +456,10 @@
     "and %(count)s others...|other": "そして、他 %(count)s ...",
     "and %(count)s others...|one": "そして、もう1つ...",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (パワー %(powerLevelNumber)s）",
-    "deleted": "deleted",
     "Attachment": "付属品",
     "Hangup": "電話を切る",
     "Voice call": "音声通話",
     "Video call": "ビデオ通話",
-    "Show Text Formatting Toolbar": "テキストの書式設定ツールバーを表示する",
     "Send an encrypted reply…": "暗号化された返信を送信する…",
     "Send a reply (unencrypted)…": "(暗号化されていない) 返信を送信する…",
     "Send an encrypted message…": "暗号化されたメッセージを送信する…",
@@ -498,14 +467,9 @@
     "This room has been replaced and is no longer active.": "この部屋は交換されており、もうアクティブではありません。",
     "The conversation continues here.": "会話はここで続けられます。",
     "You do not have permission to post to this room": "この部屋に投稿する権限がありません",
-    "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...": "読み込み中...",
@@ -566,8 +530,6 @@
     "Hide Stickers": "ステッカーを隠す",
     "Show Stickers": "ステッカーを表示",
     "Jump to first unread message.": "最初の未読メッセージにジャンプします。",
-    "Invalid alias format": "無効なエイリアス形式",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' はエイリアスの有効な形式ではありません",
     "not specified": "指定なし",
     "Remote addresses for this room:": "この部屋のリモートアドレス:",
     "Local addresses for this room:": "この部屋のローカルアドレス:",
@@ -746,19 +708,11 @@
     "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:": "続行するには、パスワードを入力してください:",
-    "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.": "一致する場合は下の確認ボタンを押し、そうでない場合は他の誰かがこのデバイスを傍受しているので、代わりにブラックリストボタンを押してください。",
-    "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を使用するように閉じてください。遅延ロードが同時に有効と無効になっていると問題が発生します。",
@@ -808,11 +762,6 @@
     "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": "カスタム",
@@ -887,8 +836,6 @@
     "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>ください。",
@@ -920,13 +867,10 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s アップロード中",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s アップロード中、他 %(count)s 件",
     "Success": "成功",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "パスワードが変更されました。再ログインするまで、他の端末のプッシュ通知を受け取ることはありません",
     "Unable to remove contact information": "連絡先情報を削除できません",
     "<not supported>": "<サポート対象外>",
     "Import E2E room keys": "E2Eルームキーのインポート",
     "Cryptography": "暗号",
-    "Device ID:": "端末ID:",
-    "Device key:": "端末キー:",
     "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.": "アナリティクスの使用方法の詳細については、こちらをご覧ください。",
@@ -947,7 +891,6 @@
     "click to reveal": "クリックすると表示されます",
     "Homeserver is": "ホームサーバーは",
     "Identity Server is": "アイデンティティ・サーバー",
-    "matrix-react-sdk version:": "matrix-react-sdk のバージョン:",
     "riot-web version:": "riot-web のバージョン:",
     "olm version:": "olm のバージョン:",
     "Failed to send email": "メールを送信できませんでした",
@@ -991,7 +934,6 @@
     "Session ID": "セッションID",
     "End-to-end encryption information": "エンドツーエンド暗号化情報",
     "Event information": "イベント情報",
-    "Sender device information": "送信者端末情報",
     "Passphrases must match": "パスフレーズは一致する必要があります",
     "Passphrase must not be empty": "パスフレーズは空であってはいけません",
     "Export room keys": "ルームキーのエクスポート",
@@ -1009,14 +951,6 @@
     "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": "バッジ",
     "Fill screen": "フィルスクリーン",
     "Light theme": "明るいテーマ",
@@ -1059,8 +993,6 @@
     "The server does not support the room version specified.": "このサーバは指定された部屋バージョンに対応していません。",
     "Name or Matrix ID": "名前またはMatrix ID",
     "Identity server has no terms of service": "IDサーバーは利用規約を持っていません",
-    "Email, name or Matrix ID": "メールアドレス、名前、またはMatrix ID",
-    "Failed to start chat": "対話開始に失敗しました",
     "Messages": "メッセージ",
     "Actions": "アクション",
     "Other": "その他",
@@ -1068,7 +1000,6 @@
     "Sends a message as plain text, without interpreting it as markdown": "メッセージをマークダウンと解釈せずプレーンテキストとして送信する",
     "Upgrades a room to a new version": "部屋を新しいバージョンへアップグレードする",
     "You do not have the required permissions to use this command.": "このコマンドを実行するのに必要な権限がありません。",
-    "Room upgrade confirmation": "部屋のアップグレードの確認",
     "Changes your display nickname in the current room only": "表示されるニックネームをこの部屋に関してのみ変更する",
     "Changes the avatar of the current room": "現在の部屋のアバターを変更する",
     "Changes your avatar in this current room only": "アバターをこの部屋に関してのみ変更する",
@@ -1114,7 +1045,6 @@
     "A word by itself is easy to guess": "単語一つだけだと簡単に特定されます",
     "Custom user status messages": "ユーザーステータスのメッセージをカスタマイズする",
     "Render simple counters in room header": "部屋のヘッダーに簡単なカウンターを表示する",
-    "Use the new, faster, composer for writing messages": "メッセージの編集に新しい高速なコンポーザーを使う",
     "Enable Emoji suggestions while typing": "入力中の絵文字提案機能を有効にする",
     "Show avatar changes": "アバターの変更を表示する",
     "Show display name changes": "表示名の変更を表示する",
@@ -1125,7 +1055,6 @@
     "Show recently visited rooms above the room list": "最近訪問した部屋をリストの上位に表示する",
     "Low bandwidth mode": "低帯域通信モード",
     "Public Name": "公開名",
-    "Upload profile picture": "プロフィール画像をアップロード",
     "<a>Upgrade</a> to your own domain": "あなた自身のドメインに<a>アップグレード</a>",
     "Phone numbers": "電話番号",
     "Set a new account password...": "アカウントの新しいパスワードを設定...",
@@ -1134,7 +1063,6 @@
     "General": "一般",
     "Preferences": "環境設定",
     "Security & Privacy": "セキュリティとプライバシー",
-    "A device's public name is visible to people you communicate with": "デバイスの公開名はあなたと会話するすべての人が閲覧できます",
     "Room information": "部屋の情報",
     "Internal room ID:": "内部 部屋ID:",
     "Room version": "部屋のバージョン",
@@ -1185,7 +1113,6 @@
     "Remove messages": "メッセージの削除",
     "Notify everyone": "全員に通知",
     "Select the roles required to change various parts of the room": "部屋の様々な部分の変更に必要な役割を選択",
-    "Upload room avatar": "部屋アバターをアップロード",
     "Room Topic": "部屋のトピック",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>%(shortName)s とリアクションしました</reactedWith>",
     "Next": "次へ",
@@ -1206,8 +1133,6 @@
     "Delete Backup": "バックアップを削除",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと参加者だけです。",
     "Restore from Backup": "バックアップから復元",
-    "This device is backing up your keys. ": "このデバイスは鍵をバックアップしています。 ",
-    "Enable desktop notifications for this device": "このデバイスでデスクトップ通知を有効にする",
     "Credits": "クレジット",
     "For help with using Riot, click <a>here</a>.": "Riotの使用方法に関するヘルプは<a>こちら</a>をご覧ください。",
     "Help & About": "ヘルプと概要",
diff --git a/src/i18n/strings/jbo.json b/src/i18n/strings/jbo.json
index e2183cabd1..8bb052cfe2 100644
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -18,7 +18,6 @@
     "The information being sent to us to help make Riot.im better includes:": ".i ti liste lo datni poi se dunda fi lo favgau te zu'e lo nu xagzengau la nu zunti",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": ".i pu lo nu benji fi lo samtcise'u cu vimcu lo datni poi termi'u no'u mu'a lo termi'u be lo kumfa pe'a .o nai lo pilno .o nai lo girzu",
     "Call Failed": ".i pu fliba lo nu fonjo'e",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": ".i da poi no'e slabu samtciselse'u cu zvati le kumfa pe'a .i je lo nu lo drata cu tirna lo nu fonjo'e cu cumki lo nu do na'e lacri da",
     "Review Devices": "za'u re'u viska lo liste be lo samtciselse'u",
     "Call Anyway": "je'e fonjo'e",
     "Answer Anyway": "je'e spuda",
@@ -95,10 +94,6 @@
     "Moderator": "li so'i",
     "Admin": "li ro",
     "Start a chat": "lo nu co'a tavla",
-    "Who would you like to communicate with?": ".i .au dai do tavla ma",
-    "Start Chat": "co'a tavla",
-    "Invite new room members": "vi'ecpe lo cnino prenu",
-    "Send Invites": "mrilu lo ve vi'ecpe",
     "Power level must be positive integer.": ".i .ei lo ni vlipa cu kacna'u",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": ".i la'o ly. %(senderName)s .ly. gafygau %(powerLevelDiffText)s",
     "Failed to change power level": ".i pu fliba lo nu gafygau lo ni vlipa",
@@ -136,16 +131,9 @@
     "Define the power level of a user": ".i ninga'igau lo ni lo pilno cu vlipa",
     "Deops user with given id": ".i xruti lo ni lo pilno poi se judri ti cu vlipa",
     "Opens the Developer Tools dialog": ".i samymo'i lo favgau se pilno uidje",
-    "Verifies a user, device, and pubkey tuple": ".i xusra lo du'u do lacri lo pilno joi lo samtciselse'u joi lo gubni termifckiku",
-    "Unknown (user, device) pair:": "lo pilno ce'o lo samtciselse'u vu'o poi na te djuno",
-    "Device already verified!": ".i do ca'o pu lacri le samtciselse'u",
-    "WARNING: Device already verified, but keys do NOT MATCH!": ".i ju'i cai do ca'o pu lacri le samtciselse'u .i je ku'i lo termifckiku ba'e na mapti",
-    "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!": ".i ju'i cai pu fliba lo nu lacri lo termifckiku .i zoi ny. %(fprint)s .ny. noi se ponse la'o ny. %(userId)s .ny. .e la'o ny. %(deviceId)s .ny. noi samtciselse'u cu termi'u termifckiku gi'e na mapti le termifckiku poi do dunda no'u zoi ny. %(fingerprint)s .ny. .i la'a cu'i lo drata ju'i prenu cu tcidu lo se mrilu be do",
     "Verified key": "lo termifckiku poi se lacri",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": ".i lo termi'u termifckiku poi do dunda cu mapti lo termi'u termifckiku poi do te benji la'o ny. %(deviceId)s .ny. noi samtciselse'u po'e la'o ny. %(userId)s .ny. .i do co'a lacri le samtciselse'u",
     "Displays action": ".i mrilu lo nu do gasnu",
     "Forces the current outbound group session in an encrypted room to be discarded": ".i macnu vimcu lo ca barkla termifckiku gunma lo kumfa pe'a poi mifra",
-    "Unrecognised command:": "lo se minde poi na te djuno",
     "Reason": "lo krinu",
     "%(targetName)s accepted the invitation for %(displayName)s.": ".i la'o ly. %(targetName)s .ly. fitytu'i lo ve vi'ecpe be fi la'o ly. %(displayName)s .ly.",
     "%(targetName)s accepted an invitation.": ".i la'o ly. %(targetName)s .ly. fitytu'i lo ve vi'ecpe",
@@ -190,7 +178,6 @@
     "%(senderName)s made future room history visible to all room members.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo cmima ka'e viska ro lo ba notci",
     "%(senderName)s made future room history visible to anyone.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo prenu ka'e viska ro lo ba notci",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": ".i la'o ly. %(senderName)s .ly. gasnu lo nu zo'e ka'e viska lo notci to cuxna zoi ny. %(visibility)s .ny. toi",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": ".i gau la'o ly. %(senderName)s .ly. co'a mulno mifra fi la'o ny. %(algorithm)s .ny.",
     "%(senderName)s changed the pinned messages for the room.": ".i la'o ly. %(senderName)s .ly. gafygau lo vitno notci pe le kumfa pe'a",
     "%(widgetName)s widget modified by %(senderName)s": ".i la'o ly. %(senderName)s .ly. gafygau la'o ny. %(widgetName)s .ny. noi uidje",
     "%(widgetName)s widget added by %(senderName)s": ".i la'o ly. %(senderName)s .ly. jmina la'o ny. %(widgetName)s .ny. noi uidje",
@@ -215,8 +202,6 @@
     "Automatically replace plain text Emoji": "lo du'u xu kau zmiku basti lo cinmo lerpoi",
     "Mirror local video feed": "lo du'u xu kau minra lo diklo vidvi",
     "Send analytics data": "lo du'u xu kau benji lo se lanli datni",
-    "Never send encrypted messages to unverified devices from this device": "lo du'u xu kau no roi benji lo notci poi mifra ku lo samtciselse'u poi na'e lacri ku ti poi samtciselse'u",
-    "Never send encrypted messages to unverified devices in this room from this device": "lo du'u xu kau no roi benji lo notci poi mifra ku lo samtciselse'u poi na'e lacri poi zvati le kumfa pe'a ku'o ti poi samtciselse'u",
     "Enable inline URL previews by default": "lo zmiselcu'a pe lo du'u xu kau zmiku purzga lo se urli",
     "Enable URL previews for this room (only affects you)": "lo du'u xu kau do zmiku purzga lo se urli ne'i le kumfa pe'a",
     "Enable URL previews by default for participants in this room": "lo zmiselcu'a pe lo du'u xu kau lo cmima be le kumfa pe'a cu zmiku purzga lo se urli",
@@ -249,7 +234,6 @@
     "New passwords don't match": ".i le'i japyvla poi cnino na simxu lo nu mintu",
     "Passwords can't be empty": ".i lu li'u .e'a nai japyvla",
     "Warning!": ".i ju'i",
-    "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.": ".i lo nu galfi lo japyvla cu rinka lo nu galfi ro lo termifckiku pe lo samtciselse'u kei .e lo nu na kakne lo nu tolmifygau .i ja do barbei lo do kumfa pe'a termifckiku gi'e ba nerbei ri .i ta'o le ti pruce ba zenba lo ka frili",
     "Export E2E room keys": "barbei lo kumfa pe'a termifckiku",
     "Continue": "",
     "Do you want to set an email address?": ".i .au pei do jmina lo te samymri",
@@ -258,10 +242,7 @@
     "New Password": "lo japyvla poi cnino",
     "Confirm password": "lo za'u re'u japyvla poi cnino",
     "Change Password": "galfi lo japyvla",
-    "Unable to load device list": ".i na kakne lo nu samymo'i lo liste be lo'i samtciselse'u",
     "Authentication": "lo nu facki lo du'u do du ma kau",
-    "Delete %(count)s devices|other": "vimcu %(count)s lo samtciselse'u",
-    "Delete %(count)s devices|one": "vimcu le samtciselse'u",
     "Device ID": "lo judri be lo samtciselse'u",
     "Last seen": "lo ro re'u nu viska",
     "Failed to set display name": ".i pu fliba lo nu galfi lo cmene",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 0cad0514ed..1e3eced284 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -49,9 +49,7 @@
     "Custom": "사용자 지정",
     "Device ID": "기기 ID",
     "Default": "기본",
-    "Device already verified!": "이미 인증한 기기입니다!",
     "device id: ": "기기 ID: ",
-    "Devices": "기기",
     "Direct chats": "다이렉트 대화",
     "Disable Notifications": "알림 끄기",
     "Email": "이메일",
@@ -83,7 +81,6 @@
     "%(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\"(으)로 바꿨습니다.",
-    "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.": "비밀번호를 바꾸면 현재 모든 기기의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 대화 기록을 읽을 수 없게 됩니다. 이 부분은 향상시키겠습니다.",
     "Claimed Ed25519 fingerprint key": "Ed25519 핑거프린트 키가 필요함",
     "Click here to fix": "해결하려면 여기를 누르세요",
     "Click to mute audio": "소리를 끄려면 클릭",
@@ -104,8 +101,6 @@
     "Decrypt %(text)s": "%(text)s 복호화",
     "Decryption error": "암호 복호화 오류",
     "Deops user with given id": "받은 ID로 사용자의 등급을 낮추기",
-    "Device ID:": "기기 ID:",
-    "Device key:": "기기 키:",
     "Disinvite": "초대 취소",
     "Displays action": "활동 표시하기",
     "Download %(text)s": "%(text)s 다운로드",
@@ -113,7 +108,6 @@
     "Ed25519 fingerprint": "Ed25519 핑거프린트",
     "Emoji": "이모지",
     "Enable Notifications": "알림 켜기",
-    "Encrypted by an unverified device": "인증되지 않은 기기로 암호화됨",
     "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었습니다.",
     "End-to-end encryption information": "종단간 암호화 정보",
     "Enter passphrase": "암호 입력",
@@ -149,7 +143,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s를 %(fromPowerLevel)s에서 %(toPowerLevel)s로",
     "Guests cannot join this room even if explicitly invited.": "명시적으로 초대 받은 손님이라도 이 방에는 들어가실 수 없습니다.",
     "Hangup": "전화 끊기",
-    "Hide Text Formatting Toolbar": "문자 서식 도구 숨기기",
     "Historical": "기록",
     "Home": "홈",
     "Homeserver is": "홈서버:",
@@ -163,15 +156,12 @@
     "Incoming voice call from %(name)s": "%(name)s님으로부터 음성 통화가 왔습니다",
     "Incorrect username and/or password.": "사용자 이름 혹은 비밀번호가 맞지 않습니다.",
     "Incorrect verification code": "맞지 않은 인증 코드",
-    "Invalid alias format": "잘못된 별칭 형식입니다",
     "Invalid Email Address": "잘못된 이메일 주소",
     "Invalid file%(extra)s": "잘못된 파일%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 초대했습니다.",
-    "Invite new room members": "새 구성원 초대하기",
     "Invited": "초대받음",
     "Invites": "초대",
     "Invites user with given id to current room": "받은 ID로 사용자를 현재 방에 초대하기",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s'이(가) 별칭에 올바른 형식이 아님",
     "Sign in with": "이것으로 로그인",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참가하세요.",
     "Join Room": "방에 참가",
@@ -194,16 +184,10 @@
     "%(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)이 방의 기록을 볼 수 있게 했습니다.",
     "Manage Integrations": "통합 관리",
-    "Markdown is disabled": "마크다운이 꺼져 있음",
-    "Markdown is enabled": "마크다운이 켜져 있음",
-    "matrix-react-sdk version:": "matrix-react-sdk 버전:",
-    "Message not sent due to unknown devices being present": "알 수 없는 기기가 있어 메시지를 보낼 수 없음",
     "Missing room_id in request": "요청에서 room_id가 빠짐",
     "Missing user_id in request": "요청에서 user_id이(가) 빠짐",
     "Moderator": "조정자",
     "Name": "이름",
-    "Never send encrypted messages to unverified devices from this device": "이 기기에서 절대 인증받지 않은 기기에게 암호화한 메시지를 보내지 않기",
-    "Never send encrypted messages to unverified devices in this room from this device": "이 기기에서 이 방의 인증받지 않은 기기로 암호화한 메시지를 보내지 않기",
     "New address (e.g. #foo:%(localDomain)s)": "새 주소 (예: #foo:%(localDomain)s)",
     "New passwords don't match": "새 비밀번호가 맞지 않음",
     "New passwords must match each other.": "새 비밀번호는 서로 같아야 합니다.",
@@ -212,7 +196,6 @@
     "(not supported by this browser)": "(이 브라우저에서 지원하지 않습니다)",
     "<not supported>": "<지원하지 않음>",
     "NOT verified": "인증하지 않음",
-    "No devices with registered encryption keys": "등록된 암호화 키가 있는 기기가 없음",
     "No display name": "표시 이름 없음",
     "No more results": "더 이상 결과 없음",
     "No results": "결과 없음",
@@ -221,7 +204,6 @@
     "Password": "비밀번호",
     "Passwords can't be empty": "비밀번호를 입력해주세요",
     "Permissions": "권한",
-    "People": "사람",
     "Phone": "전화",
     "Only people who have been invited": "초대받은 사람만",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "이메일을 확인하고 안의 링크를 클릭합니다. 모두 마치고 나서, 계속하기를 누르세요.",
@@ -249,7 +231,6 @@
     "riot-web version:": "Riot 웹 버전:",
     "Room %(roomId)s not visible": "방 %(roomId)s이(가) 보이지 않음",
     "Room Colour": "방 색",
-    "Room contains unknown devices": "알 수 없는 기기가 있는 방",
     "%(roomName)s does not exist.": "%(roomName)s은 없는 방이에요.",
     "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없습니다.",
     "Rooms": "방",
@@ -259,8 +240,6 @@
     "Searches DuckDuckGo for results": "DuckDuckGo에서 검색하기",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인함",
     "Send anyway": "무시하고 보내기",
-    "Sender device information": "발신자 기기 정보",
-    "Send Invites": "초대 보내기",
     "Send Reset Email": "초기화 이메일 보내기",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈습니다.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 초대를 보냈습니다.",
@@ -270,7 +249,6 @@
     "Server unavailable, overloaded, or something else went wrong.": "서버를 쓸 수 없거나 과부하거나, 다른 문제가 있습니다.",
     "Session ID": "세션 ID",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s님이 표시 이름을 %(displayName)s(으)로 설정했습니다.",
-    "Show Text Formatting Toolbar": "문자 서식 도구 보이기",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "시간을 12시간제로 보이기(예: 오후 2:30)",
     "Signed Out": "로그아웃함",
     "Sign in": "로그인",
@@ -279,11 +257,9 @@
     "Someone": "다른 사람",
     "Start a chat": "대화 시작하기",
     "Start authentication": "인증 시작",
-    "Start Chat": "대화 시작",
     "Submit": "제출",
     "Success": "성공",
     "The phone number entered looks invalid": "입력한 전화번호가 잘못됨",
-    "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에서 받은 서명 키와 같습니다. 기기가 확인되었습니다.",
     "This email address is already in use": "이 이메일 주소는 이미 사용 중입니다",
     "This email address was not found": "이 이메일 주소를 찾을 수 없음",
     "The email address linked to your account must be entered.": "계정에 연결한 이메일 주소를 입력해야 합니다.",
@@ -297,7 +273,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "이 기능을 사용하려면, 자동 완성 결과가 나오길 기다린 뒤에 탭으로 움직여주세요.",
     "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.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었습니다.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s님이 종단간 암호화를 켰습니다 (%(algorithm)s 알고리즘).",
     "Unable to add email address": "이메일 주소를 추가할 수 없음",
     "Unable to remove contact information": "연락처 정보를 제거할 수 없음",
     "Unable to verify email address.": "이메일 주소를 인증할 수 없습니다.",
@@ -305,17 +280,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님에 대한 출입 금지를 풀었습니다.",
     "Unable to capture screen": "화면을 찍을 수 없음",
     "Unable to enable Notifications": "알림을 사용할 수 없음",
-    "Unable to load device list": "기기 목록을 불러올 수 없음",
-    "Undecryptable": "복호화할 수 없음",
     "unencrypted": "암호화하지 않음",
-    "Unencrypted message": "암호화하지 않은 메시지",
     "unknown caller": "알 수 없는 발신자",
     "unknown device": "알 수 없는 기기",
     "Unknown room %(roomId)s": "알 수 없는 방 %(roomId)s",
-    "Unknown (user, device) pair:": "알 수 없는 (사용자, 기기) 연결:",
     "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
-    "Unrecognised command:": "인식 할 수 없는 명령:",
     "Unrecognised room alias:": "인식할 수 없는 방 별칭:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s을(를) 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s개를 올리는 중",
@@ -342,13 +312,10 @@
     "(no answer)": "(응답 없음)",
     "(unknown failure: %(reason)s)": "(알 수 없는 오류: %(reason)s)",
     "Warning!": "주의!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "경고: 기기는 이미 인증했지만, 키가 맞지 않습니다!",
     "Who can access this room?": "누가 이 방에 들어올 수 있나요?",
     "Who can read history?": "누가 기록을 읽을 수 있나요?",
-    "Who would you like to communicate with?": "누구와 대화하고 싶으세요?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s님이 %(targetName)s님의 초대를 거절했습니다.",
     "You are already in a call.": "이미 통화 중입니다.",
-    "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\"와 맞지 않습니다. 누군가 대화를 엿듣는 중일 수도 있습니다!",
     "You cannot place a call with yourself.": "자기 자신에게는 전화를 걸 수 없습니다.",
     "You cannot place VoIP calls in this browser.": "이 브라우저에서는 VoIP 전화를 걸 수 없습니다.",
     "You do not have permission to post to this room": "이 방에 글을 올릴 권한이 없습니다",
@@ -359,7 +326,6 @@
     "You need to be able to invite users to do that.": "그러려면 사용자를 초대할 수 있어야 합니다.",
     "You need to be logged in.": "로그인을 해야 합니다.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "이메일 주소가 이 홈서버의 Matrix ID와 관련이 없는 것 같습니다.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "비밀번호를 바꿨습니다. 다른 기기에서는 다시 로그인할 때까지 푸시 알림을 받지 않을 겁니다",
     "You seem to be in a call, are you sure you want to quit?": "전화 중인데, 끊겠습니까?",
     "You seem to be uploading files, are you sure you want to quit?": "파일을 업로드 중인데, 그만두겠습니까?",
     "Sun": "일",
@@ -396,8 +362,6 @@
     "(~%(count)s results)|one": "(~%(count)s개의 결과)",
     "(~%(count)s results)|other": "(~%(count)s개의 결과)",
     "Active call": "전화 중",
-    "bold": "굵게",
-    "italic": "기울게",
     "Please select the destination room for this message": "이 메시지를 보낼 방을 골라주세요",
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
@@ -422,18 +386,9 @@
     "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.": "내보낸 파일이 암호로 보호되어 있습니다.  파일을 복호화하려면, 여기에 암호를 입력해야 합니다.",
     "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.": "이 이벤트를 감추길(삭제하길) 원하세요? 방 이름을 삭제하거나 주제를 바꾸면, 다시 생길 수도 있습니다.",
-    "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.": "키가 동일하다면, 아래의 인증 버튼을 누르세요. 혹시 키가 다르다면, 이 기기가 누군가의 공격을 받고 있는 중인 것이므로 블랙리스트에 올려야 합니다.",
-    "Verify device": "기기 인증",
     "I verify that the keys match": "열쇠가 맞는지 인증합니다",
     "Unable to restore 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을 썼다면, 세션이 이 버전과 맞지 않을 것입니다. 창을 닫고 최근 버전으로 돌아가세요.",
-    "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.": "각 기기가 알맞은 소유자에게 속해 있는지 인증 과정을 거치길 추천하지만, 원한다면 그러지 않고도 메시지를 다시 보낼 수 있습니다.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 방에 본 적 없는 기기가 있습니다.",
-    "Unknown devices": "알 수 없는 기기",
     "Unknown Address": "알 수 없는 주소",
     "Unblacklist": "블랙리스트 제외",
     "Blacklist": "블랙리스트 등록",
@@ -476,8 +431,6 @@
     "Start verification": "인증 시작",
     "Share without verifying": "인증하지 않고 공유",
     "Ignore request": "요청 무시하기",
-    "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'이(가) 암호화 키를 요청하고 있습니다.",
     "Encryption key request": "암호화 키 요청",
     "Edit": "편집",
     "Fetching third party location failed": "제 3자 위치를 가져오지 못함",
@@ -527,7 +480,6 @@
     "Files": "파일",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
     "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.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 기기에서 로그인할 수 있습니다.",
     "Enable notifications for this account": "이 계정의 알림 사용하기",
     "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
     "Room not found": "방을 찾을 수 없음",
@@ -637,7 +589,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Riot.im을 발전시키기 위해 저희에게 보내는 정보는 다음을 포함합니다:",
     "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와 같은 식별 가능한 정보를 포함하는 부분이 있는 데이터는 서버에 보내지기 전에 제거됩니다.",
     "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.": "이 방에 모르는 기기가 있습니다: 확인하지 않는다면 누군가가 당신의 대화를 엿들을 가능성이 있습니다.",
     "Review Devices": "기기 검증하기",
     "Call Anyway": "무시하고 걸기",
     "Answer Anyway": "무시하고 받기",
@@ -674,7 +625,6 @@
     "You are no longer ignoring %(userId)s": "%(userId)s님을 더 이상 무시하고 있지 않습니다",
     "Define the power level of a user": "사용자의 권한 등급 정의하기",
     "Opens the Developer Tools dialog": "개발자 도구 대화 열기",
-    "Verifies a user, device, and pubkey tuple": "사용자, 기기, 그리고 공개키 튜플 인증하기",
     "%(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 위젯",
@@ -699,7 +649,6 @@
     "Automatically replace plain text Emoji": "일반 문자로 된 이모지 자동으로 변환하기",
     "Mirror local video feed": "보고 있는 비디오 전송 상태 비추기",
     "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분까지 보지 못할 수 있습니다.",
-    "Delete %(count)s devices|one": "기기 삭제",
     "Invalid community ID": "잘못된 커뮤니티 ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s'은(는) 올바른 커뮤니티 ID가 아님",
     "New community ID (e.g. +foo:%(localDomain)s)": "새 커뮤니티 ID (예시: +foo:%(localDomain)s)",
@@ -712,7 +661,6 @@
     "%(senderName)s sent a video": "%(senderName)s님이 영상을 보냄",
     "%(senderName)s uploaded a file": "%(senderName)s님이 파일을 업로드함",
     "Key request sent.": "키 요청을 보냈습니다.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "당신의 다른 기기에 이 메시지를 읽기 위한 키가 없다면 메시지를 복호화할 수 없습니다.",
     "Disinvite this user?": "이 사용자에 대한 초대를 취소할까요?",
     "Kick this user?": "이 사용자를 추방할까요?",
     "Unban this user?": "이 사용자를 출입 금지에서 풀까요?",
@@ -729,10 +677,8 @@
     "Loading...": "로딩 중...",
     "Unpin Message": "메시지 고정 풀기",
     "No pinned messages.": "고정된 메시지가 없습니다.",
-    "At this time it is not possible to reply with an emote.": "지금은 감정 표현으로 답장할 수 없습니다.",
     "Send a message (unencrypted)…": "(암호화 안 된) 메시지를 보내세요…",
     "Send an encrypted message…": "암호화된 메시지를 보내세요…",
-    "Unable to reply": "답장할 수 없습니다",
     "Send an encrypted reply…": "암호화된 메시지를 보내세요…",
     "Send a reply (unencrypted)…": "(암호화 안 된) 답장을 보내세요…",
     "User Options": "사용자 옵션",
@@ -752,7 +698,6 @@
     "were unbanned %(count)s times|one": "의 출입 금지이 풀렸습니다",
     "was unbanned %(count)s times|other": "님의 출입 금지이 %(count)s번 풀렸습니다",
     "was unbanned %(count)s times|one": "님의 출입 금지이 풀렸습니다",
-    "Delete %(count)s devices|other": "%(count)s개의 기기 삭제",
     "You have entered an invalid address.": "잘못된 주소를 입력했습니다.",
     "This room is not public. You will not be able to rejoin without an invite.": "이 방은 공개되지 않았습니다. 초대 없이는 다시 들어올 수 없습니다.",
     "Enable URL previews for this room (only affects you)": "이 방에서 URL 미리보기 사용하기 (오직 나만 영향을 받음)",
@@ -760,9 +705,6 @@
     "Enable widget screenshots on supported widgets": "지원되는 위젯에 대해 위젯 스크린샷 사용하기",
     "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 미리 보기로 웹사이트에서 온 제목, 설명, 그리고 이미지 등 그 링크에 대한 정보가 표시됩니다.",
     "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 미리 보기가 꺼집니다.",
-    "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.": "자동으로 다른 기기에 키 공유 요청을 보냈습니다. 다른 기기에서 키 공유 요청을 거절하거나 버렸다면, 여기를 눌러 이 세션으로 다시 키를 요청하세요.",
-    "<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.": "자기 자신을 강등하는 것은 되돌릴 수 없고, 자신이 마지막으로 이 방에서 특권을 가진 사용자라면 다시 특권을 얻는 건 불가능합니다.",
     "Jump to read receipt": "읽은 기록으로 건너뛰기",
     "Jump to message": "메세지로 건너뛰기",
@@ -788,8 +730,6 @@
     "A call is currently being placed!": "현재 전화를 걸고 있습니다!",
     "Permission Required": "권한 필요",
     "You do not have permission to start a conference call in this room": "이 방에서는 회의 전화를 시작할 권한이 없습니다",
-    "deleted": "취소선",
-    "underlined": "밑줄",
     "<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",
     "Copied!": "복사했습니다!",
     "Failed to copy": "복사 실패함",
@@ -830,10 +770,6 @@
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s님이 초대를 거절했습니다",
     "were invited %(count)s times|other": "이 %(count)s번 초대받았습니다",
     "were invited %(count)s times|one": "이 초대받았습니다",
-    "inline-code": "인라인 코드",
-    "block-quote": "인용 블록",
-    "bulleted-list": "글머리 기호 목록",
-    "numbered-list": "숫자 목록",
     "Event Content": "이벤트 내용",
     "Event Type": "이벤트 종류",
     "Failed to send custom event.": "맞춤 이벤트를 보내지 못했습니다.",
@@ -931,7 +867,6 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "홈서버 %(homeserverDomain)s을(를) 계속 사용하기 위해서는 저희 이용 약관을 검토하고 동의해주세요.",
     "State Key": "상태 키",
     "Send Account Data": "계정 정보 보내기",
-    "Loading device info...": "기기 정보 받는 중...",
     "Clear Storage and Sign Out": "저장소를 지우고 로그아웃",
     "Send Logs": "로그 보내기",
     "We encountered an error trying to restore your previous session.": "이전 활동을 복구하는 중 에러가 발생했습니다.",
@@ -993,20 +928,13 @@
     "The server does not support the room version specified.": "서버가 지정된 방 버전을 지원하지 않습니다.",
     "Name or Matrix ID": "이름 혹은 Matrix ID",
     "Unable to load! Check your network connectivity and try again.": "불러올 수 없습니다! 네트워크 연결 상태를 확인한 후 다시 시도하세요.",
-    "Email, name or Matrix ID": "이메일, 이름 혹은 Matrix ID",
-    "Failed to start chat": "대화 시작 실패",
     "Failed to invite users to the room:": "방으로 사용자들을 초대하지 못했습니다:",
     "Messages": "메시지",
     "Actions": "활동",
     "Other": "기타",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯\\_(ツ)_/¯ 앞에 일반 문자 메시지를 놓으세요",
     "Upgrades a room to a new version": "새 버전으로 방을 업그레이드하기",
-    "Room upgrade confirmation": "방 업그레이드 확인",
-    "Upgrading a room can be destructive and isn't always necessary.": "방을 업그레이드 하는 것이 파괴로 이어질 수 있으며, 필수적이지 않습니다.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "방 업그레이드는 보통 방 버전이 <i>불안정</i>으로 간주될 때 추천합니다. 불안정한 방 버전은 버그나 부족한 기능, 혹은 보안에 취약할 수 있습니다.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "방 업그레이드는 방의 <i>서버 측</i> 처리에만 영향을 줍니다. Riot 클라이언트에 문제가 있는 경우, <issueLink />에 문제를 제기하세요.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>경고</b>: 방을 업그레이드하는 것은 <i>자동으로 방 구성원 방의 새 버전으로 마이그레이션하지 않습니다.</i> 이전 버전의 방에 새 방의 링크를 게시합니다 - 방 구성원은 링크를 클릭해서 새 방에 들어가야 합니다.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "이 방을 <oldVersion />에서 <newVersion />으로 업그레이드하길 원하는 지 확인해주세요.",
     "Changes your display nickname in the current room only": "현재 방에서만 표시 별명 변경하기",
     "Changes your avatar in this current room only": "현재 방에서만 아바타 변경하기",
     "Changes your avatar in all rooms": "모든 방에서 아바타 변경하기",
@@ -1125,7 +1053,6 @@
     "Pencil": "연필",
     "Paperclip": "클립",
     "Scissors": "가위",
-    "Padlock": "자물쇠",
     "Key": "열쇠",
     "Hammer": "망치",
     "Telephone": "전화기",
@@ -1197,8 +1124,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "다음 이모지가 상대방의 화면에 나타나는 것을 확인하는 것으로 이 사용자를 인증합니다.",
     "Verify this user by confirming the following number appears on their screen.": "다음 숫자가 상대방의 화면에 나타나는 것을 확인하는 것으로 이 사용자를 인증합니다.",
     "Unable to find a supported verification method.": "지원하는 인증 방식을 찾을 수 없습니다.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "보안을 최대화하려면, 상대방과 직접 대면하거나 신뢰할 수 있는 다른 대화 수단을 사용하는 것이 좋습니다.",
-    "Your homeserver does not support device management.": "홈서버는 기기 관리를 지원하지 않습니다.",
     "ID": "ID",
     "Public Name": "공개 이름",
     "Delete Backup": "백업 삭제",
@@ -1206,31 +1131,14 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "암호화된 메시지는 종단간 암호화로 보호됩니다. 오직 당신과 상대방만 이 메시지를 읽을 수 있는 키를 갖습니다.",
     "Unable to load key backup status": "키 백업 상태를 불러올 수 없음",
     "Restore from Backup": "백업에서 복구",
-    "This device is backing up your keys. ": "이 기기는 키를 백업하고 있습니다. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "이 기기는 <b>키를 백업하지 않고 있습니다</b>, 하지만 복구할 수 있는 기존 백업 키가 있습니다.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "이 기기에만 있을 수 있는 키를 잃지 않도록 로그아웃하기 전에 이 기기를 키 백업에 연결하세요.",
-    "Connect this device to Key Backup": "이 기기를 키 백업에 연결",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s 키를 백업 중...",
     "All keys backed up": "모든 키 백업됨",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "백업에 ID %(deviceId)s인 <verify>알 수 없는</verify> 기기의 서명이 있습니다.",
-    "Backup has a <validity>valid</validity> signature from this device": "백업에 이 기기의 <validity>올바른</validity> 서명이 있습니다",
-    "Backup has an <validity>invalid</validity> signature from this device": "백업에 이 기기의 <validity>올바르지 않은</validity> 서명이 있습니다",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "백업에 <verify>인증된</verify> 기기<device></device>의 <validity>올바른</validity> 서명이 있습니다",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "백업에 <verify>인증되지 않은</verify> 기기<device></device>의 <validity>올바른</validity> 서명이 있습니다",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "백업에 <verify>인증된</verify> 기기<device></device>의 <validity>올바르지 않은</validity> 서명이 있습니다",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "백업에 <verify>인증되지 않은</verify> 기기<device></device>의 <validity>올바르지 않은</validity> 서명이 있습니다",
-    "Backup is not signed by any of your devices": "백업이 어떤 기기에도 서명되지 않았습니다",
-    "This backup is trusted because it has been restored on this device": "이 백업은 이 기기에서 복구했기에 신뢰할 수 있습니다",
     "Backup version: ": "백업 버전: ",
     "Algorithm: ": "알고리즘: ",
-    "Your keys are <b>not being backed up from this device</b>.": "키가 <b>이 기기에서 백업되지 않았습니다</b>.",
     "Back up your keys before signing out to avoid losing them.": "잃어버리지 않도록 로그아웃하기 전에 키를 백업하세요.",
     "Start using Key Backup": "키 백업 시작",
     "Add an email address to configure email notifications": "이메일 알림을 설정하려면 이메일 주소를 추가하세요",
-    "Enable desktop notifications for this device": "이 기기에 대해 데스크톱 알림 켜기",
-    "Enable audible notifications for this device": "이 기기에 대해 음성 알림 켜기",
     "Profile picture": "프로필 사진",
-    "Upload profile picture": "프로필 사진 업로드",
     "<a>Upgrade</a> to your own domain": "자체 도메인을 <a>업그레이드</a>하기",
     "Display Name": "표시 이름",
     "Identity Server URL must be HTTPS": "ID 서버 URL은 HTTPS이어야 함",
@@ -1285,7 +1193,6 @@
     "Accept all %(invitedRooms)s invites": "모든 %(invitedRooms)s개의 초대를 수락",
     "Key backup": "키 백업",
     "Security & Privacy": "보안 & 개인",
-    "A device's public name is visible to people you communicate with": "기기의 공개 이름은 대화하는 사람들에게 보입니다",
     "Missing media permissions, click the button below to request.": "미디어 권한이 없습니다, 권한 요청을 보내려면 아래 버튼을 클릭하세요.",
     "Request media permissions": "미디어 권한 요청",
     "Voice & Video": "음성 & 영상",
@@ -1349,10 +1256,6 @@
     "Remove %(phone)s?": "%(phone)s을(를) 제거하겠습니까?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "문자 메시지를 +%(msisdn)s(으)로 보냈습니다. 메시지에 있는 인증 코드를 입력해주세요.",
     "Phone Number": "전화번호",
-    "Some devices for this user are not trusted": "이 사용자의 일부 기기를 신뢰할 수 없음",
-    "Some devices in this encrypted room are not trusted": "이 암호화된 방의 일부 기기를 신뢰할 수 없음",
-    "All devices for this user are trusted": "이 사용자의 모든 기기를 신뢰함",
-    "All devices in this encrypted room are trusted": "이 암호화된 방의 모든 기기를 신뢰함",
     "Edit message": "메시지 편집",
     "Joining room …": "방에 참가하는 중 …",
     "Loading …": "로딩 중 …",
@@ -1402,8 +1305,6 @@
     "Error updating flair": "재능 업데이트 중 오류",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "재능을 업데이트하는 중 오류가 발생했습니다. 서버가 허용하지 않거나 일시적인 오류 발생일 수 있습니다.",
     "Room avatar": "방 아바타",
-    "Upload room avatar": "방 아바타 업로드",
-    "No room avatar": "방 아바타 없음",
     "Room Name": "방 이름",
     "Room Topic": "방 주제",
     "Show all": "전체 보기",
@@ -1445,8 +1346,6 @@
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "언제, 방 ID, 사용자 ID 등, 문제 분석에 도움이 되는 추가 문맥이 있다면, 그것들도 여기에 포함해주세요.",
     "Unable to load commit detail: %(msg)s": "커밋 세부 정보를 불러올 수 없음: %(msg)s",
     "Removing…": "제거 중…",
-    "Clear all data on this device?": "이 기기의 모든 데이터를 지우겠습니까?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "이 기기에서 모든 데이터를 지우는 것은 영구적입니다. 암호화된 메시지는 키를 백업해 놓지 않았다면 읽을 수 없습니다.",
     "Clear all data": "모든 데이터 지우기",
     "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": "대화 기록을 잃지 않으려면, 로그아웃하기 전에 방 키를 내보내야 합니다. 이 작업을 수행하려면 최신 버전의 Riot으로 가야 합니다",
     "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)s에서 Riot의 최신 버전을 사용했습니다. 종단간 암호화로 이 버전을 다시 사용하려면, 로그아웃한 후 다시 로그인하세요. ",
@@ -1459,12 +1358,10 @@
     "Waiting for partner to accept...": "상대방이 수락하기를 기다리는 중...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "아무것도 안 나타나나요? 아직 모든 클라이언트가 상호작용 인증을 지원하지 않습니다. <button>옛날 인증 방식을 사용하세요</button>.",
     "Waiting for %(userId)s to confirm...": "%(userId)s님이 확인하기를 기다리는 중...",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "이 기기를 신뢰할 수 있는 지 인증하려면, 해당 기기에서 사용자 설정에 들어가 보이는 키가 아래 키와 맞는 지 확인해주세요:",
     "Use two-way text verification": "양방향 문자 인증 사용",
     "Explore Room State": "방 상태 탐색",
     "View Servers in Room": "방에 있는 서버 보기",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "이 사용자를 신뢰할 수 있도록 인증합니다. 종단간 암호화 메시지를 사용할 때 사용자를 신뢰하면 안심이 듭니다.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "이 사용자가 기기를 신뢰할 수 있다고 표시하고, 내 기기도 상대방에게 신뢰할 수 있다고 표시했는지 확인하세요.",
     "Waiting for partner to confirm...": "상대방이 확인하기를 기다리는 중...",
     "Incoming Verification 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을 사용했습니다. 이 버전에서 불러오기 지연은 꺼집니다. 로컬 캐시가 이 두 설정 간에 호환되지 않으므로, Riot은 계정을 다시 동기화 해야 합니다.",
@@ -1536,7 +1433,6 @@
     "This looks like a valid recovery key!": "올바른 복구 키입니다!",
     "Not a valid 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>": "복구 암호를 잊어버렸다면 <button>새 복구 옵션을 설정</button>할 수 있음",
     "Resend edit": "편집 다시 보내기",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s개의 리액션 다시 보내기",
     "Resend removal": "삭제 다시 보내기",
@@ -1600,7 +1496,6 @@
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot이 홈서버에서 프로토콜 얻기에 실패했습니다. 홈서버가 제 3자 네트워크를 지원하기에 너무 오래된 것 같습니다.",
     "Riot failed to get the public room list.": "Riot이 공개 방 목록을 가져오는데 실패했습니다.",
     "The homeserver may be unavailable or overloaded.": "홈서버를 이용할 수 없거나 과부화된 상태입니다.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>기기 보기</showDevicesText>, <sendAnywayText>무시하고 보내기</sendAnywayText> 혹은 <cancelText>취소</cancelText>.",
     "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>해주세요.",
     "Add room": "방 추가",
     "You have %(count)s unread notifications in a prior version of this room.|other": "이 방의 이전 버전에서 읽지 않은 %(count)s개의 알림이 있습니다.",
@@ -1608,7 +1503,6 @@
     "Guest": "손님",
     "Your profile": "당신의 프로필",
     "Could not load user profile": "사용자 프로필을 불러올 수 없음",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "비밀번호를 변경하면 모든 기기에서 종단간 암호화 키는 초기화되고, 암호화된 대화 기록을 읽을 수 없게 됩니다. 비밀번호를 초기화하기 전에 키 백업을 설정하거나 다른 기기에 방 키를 내보내 놓으세요.",
     "Your Matrix account on %(serverName)s": "%(serverName)s에서 당신의 Matrix 계정",
     "Your Matrix account on <underlinedServerName />": "<underlinedServerName />에서 당신의 Matrix 계정",
     "No identity server is configured: add one in server settings to reset your password.": "ID 서버가 설정되지 않음: 비밀번호를 초기화하기 위해 서버 설정에서 하나를 추가하세요.",
@@ -1616,7 +1510,6 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "새 비밀번호 설정을 확인할 인증 이메일을 메일함으로 보냈습니다.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s(으)로 이메일을 보냈습니다. 메일에 있는 링크를 따라갔다면, 아래를 클릭하세요.",
     "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.": "모든 기기에서 로그아웃했고 더 이상 푸시 알림을 받을 수 없습니다. 알림을 다시 켜려면, 각 기기마다 다시 로그인하세요.",
     "Set a new password": "새 비밀번호 설정",
     "Invalid homeserver discovery response": "잘못된 홈서버 검색 응답",
     "Failed to get autodiscovery configuration from server": "서버에서 자동 검색 설정 얻기에 실패함",
@@ -1642,14 +1535,12 @@
     "Create your account": "당신의 계정 만들기",
     "Failed to re-authenticate due to a homeserver problem": "홈서버 문제로 다시 인증에 실패함",
     "Failed to re-authenticate": "다시 인증에 실패함",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "계정에 다시 접근하고 이 기기에 있는 암호화 키를 복구합니다. 키가 없으면 모든 기기에서 모든 보안 메시지를 읽을 수 없습닏다.",
     "Enter your password to sign in and regain access to your account.": "로그인하고 계정에 다시 접근하려면 비밀번호를 입력하세요.",
     "Forgotten your password?": "비밀번호를 잊었습니까?",
     "Sign in and regain access to your account.": "로그인하고 계정에 다시 접근하기.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "계정에 로그인할 수 없습니다. 자세한 정보는 홈서버 관리자에게 연락하세요.",
     "You're signed out": "로그아웃됬습니다",
     "Clear personal data": "개인 정보 지우기",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "경고: (암호화 키를 포함한) 개인 정보가 이 기기에 여전히 저장됩니다. 이 기기를 그만 사용하거나, 다른 계정으로 로그인하고 싶다면 개인 정보를 지우세요.",
     "Great! This passphrase looks strong enough.": "멋져요! 이 암호는 충분히 강합니다.",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "우리의 서버에 암호화된 키의 사본을 저장합니다. 보안을 유지하기 위해 백업을 암호로 보호하세요.",
     "For maximum security, this should be different from your account password.": "보안을 최대화하려면, 암호는 계정 비밀번호와 달라야 할 것입니다.",
@@ -1663,17 +1554,13 @@
     "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.": "안전망처럼, 복구 암호를 사용해 암호화된 메시지 기록을 복구할 수 있습니다.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "복구 키는 안전망과 같습니다 - 복구 암호를 잊어버렸다면 복구 키를 사용해 암호화된 메시지에 접근할 수 있습니다.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "복구 키는 비밀번호 관리자 (혹은 금고)처럼 어딘가 매우 안전한 곳에 보관하세요",
     "Your Recovery Key": "당신의 복구 키",
     "Copy to clipboard": "클립보드로 복사",
     "Download": "다운로드",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "복구 키가 <b>클립보드로 복사</b>되었습니다, 여기에 붙여 넣으세요:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "복구 키가 <b>다운로드</b> 폴더로 들어갔습니다.",
     "<b>Print it</b> and store it somewhere safe": "<b>인쇄</b>한 후 안전한 장소에 보관",
     "<b>Save it</b> on a USB key or backup drive": "USB 키나 백업 드라이브에 <b>저장</b>",
     "<b>Copy it</b> to your personal cloud storage": "개인 클라우드 저장소에 <b>복사</b>",
     "Your keys are being backed up (the first backup could take a few minutes).": "키를 백업했습니다 (처음 백업에는 시간이 걸릴 수 있습니다).",
-    "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": "보안 메시지 복구 설정",
     "Secure your backup with a passphrase": "암호로 백업 보호",
     "Confirm your passphrase": "암호 확인",
@@ -1691,12 +1578,9 @@
     "New Recovery Method": "새 복구 방식",
     "A new recovery passphrase and key for Secure Messages have been detected.": "보안 메시지 용 새로운 복구 암호와 키가 감지되었습니다.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "새 복구 방식을 설정하지 않으면, 공격자가 계정에 접근을 시도할 지도 모릅니다. 설정에서 계정 비밀번호를 바꾸고 즉시 새 복구 방식을 설정하세요.",
-    "This device is encrypting history using the new recovery method.": "이 기기는 새 복구 방식을 사용해 기록을 암호화하고 있습니다.",
     "Go to Settings": "설정으로 가기",
     "Set up Secure Messages": "보안 메시지 설정",
     "Recovery Method Removed": "복구 방식 제거됨",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "이 기기에 제거했던 보안 메시지 용 복구 암호와 키가 감지되었습니다.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "실수로 한 경우, 이 기기에서 새 복구 방식으로 이 기기의 메시지를 다시 암호화하도록 보안 메시지를 설정할 수 있습니다.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "이 복구 방식을 제거하지 않으면, 공격자가 계정에 접근을 시도할 지도 모릅니다. 설정에서 계정 비밀번호를 바꾸고 즉시 새 복구 방식을 설정하세요.",
     "Use an identity server": "ID 서버 사용",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "ID 서버를 사용해 이메일로 초대하세요. 기본 ID 서버 (%(defaultIdentityServerName)s)를 사용하려면 계속을 클릭하거나 설정에서 관리하세요.",
@@ -1782,7 +1666,6 @@
     "%(count)s unread messages.|other": "%(count)s개의 읽지 않은 메시지.",
     "Unread mentions.": "읽지 않은 언급.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "이 버그를 조사할 수 있도록 GitHub에 <newIssueLink>새 이슈를 추가</newIssueLink>해주세요.",
-    "Use the new, faster, composer for writing messages": "메시지 입력으로 새롭고 더 빠른 작성기를 사용하기",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "%(user)s님의 1개의 메시지를 삭제합니다. 이것은 되돌릴 수 없습니다. 계속하겠습니까?",
     "Remove %(count)s messages|one": "1개의 메시지 삭제",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "홈서버 설정에서 캡챠 공개 키가 없습니다. 홈서버 관리자에게 이것을 신고해주세요.",
@@ -1871,17 +1754,12 @@
     "Subscribe": "구독",
     "Trusted": "신뢰함",
     "Not trusted": "신뢰하지 않음",
-    "Hide verified Sign-In's": "확인 로그인 숨기기",
-    "%(count)s verified Sign-In's|other": "확인된 %(count)s개의 로그인",
-    "%(count)s verified Sign-In's|one": "확인된 1개의 로그인",
     "Direct message": "다이렉트 메시지",
-    "Unverify user": "사용자 확인 취소",
     "<strong>%(role)s</strong> in %(roomName)s": "%(roomName)s 방의 <strong>%(role)s</strong>",
     "Messages in this room are end-to-end encrypted.": "이 방의 메시지는 종단간 암호화되었습니다.",
     "Security": "보안",
     "Verify": "확인",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "이 사용자를 무시했습니다. 사용자의 메시지는 숨겨집니다. <a>무시하고 보이기.</a>",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "다이렉트 메시지에서 구성원 패널에 새 확인 UX가 적용된 확인 요청을 보냅니다.",
     "Any of the following data may be shared:": "다음 데이터가 공유됩니다:",
     "Your display name": "당신의 표시 이름",
     "Your avatar URL": "당신의 아바타 URL",
@@ -1894,7 +1772,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "이 위젯을 사용하면 <helpIcon /> %(widgetDomain)s와(과) 데이터를 공유합니다.",
     "Widget added by": "위젯을 추가했습니다",
     "This widget may use cookies.": "이 위젯은 쿠키를 사용합니다.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "기기 당 확인이 아닌 사용자 당 확인을 위한 교차 서명 켜기 (개발 중)",
     "Enable local event indexing and E2EE search (requires restart)": "로컬 이벤트 인덱싱 및 종단간 암호화 켜기 (다시 시작해야 합니다)",
     "Decline (%(counter)s)": "거절 (%(counter)s)",
     "Connecting to integration manager...": "통합 관리자로 연결 중...",
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 71b46d67f3..eeb1871a8a 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -69,7 +69,6 @@
     "Noisy": "Triukšmingas",
     "Collecting app version information": "Renkama programėlės versijos informacija",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ar ištrinti kambarį %(alias)s ir %(name)s kambario pavadinimą iš katalogo?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tai leis Jums grįžti prie paskyros po atsijungimo ir prisijungti kituose įrenginiuose.",
     "Keywords": "Raktažodžiai",
     "Unpin Message": "Atsegti žinutę",
     "Enable notifications for this account": "Įjungti pranešimus šiai paskyrai",
@@ -221,8 +220,6 @@
     "This email address was not found": "Šis el. pašto adresas nebuvo rastas",
     "Admin": "Administratorius",
     "Start a chat": "Pradėti pokalbį",
-    "Start Chat": "Pradėti pokalbį",
-    "Send Invites": "Siųsti pakvietimus",
     "Failed to invite": "Nepavyko pakviesti",
     "Failed to invite the following users to the %(roomName)s room:": "Nepavyko pakviesti šių vartotojų į kambarį %(roomName)s:",
     "You need to be logged in.": "Turite būti prisijungę.",
@@ -237,12 +234,8 @@
     "Invites user with given id to current room": "Pakviečia naudotoją su nurodytu id į esamą kambarį",
     "You are now ignoring %(userId)s": "Dabar ignoruojate %(userId)s",
     "Opens the Developer Tools dialog": "Atveria programuotojo įrankių dialogą",
-    "Unknown (user, device) pair:": "Nežinoma pora (naudotojas, įrenginys):",
-    "Device already verified!": "Įrenginys jau patvirtintas!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Įrenginys jau patvirtintas, tačiau raktai NESUTAMPA!",
     "Verified key": "Patvirtintas raktas",
     "Displays action": "Rodo veiksmą",
-    "Unrecognised command:": "Neatpažinta komanda:",
     "Reason": "Priežastis",
     "%(targetName)s accepted an invitation.": "%(targetName)s priėmė pakvietimą.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pakvietė %(targetName)s.",
@@ -282,8 +275,6 @@
     "Current password": "Dabartinis slaptažodis",
     "Password": "Slaptažodis",
     "New Password": "Naujas slaptažodis",
-    "Unable to load device list": "Nepavyko įkelti įrenginių sąrašo",
-    "Delete %(count)s devices|one": "Ištrinti įrenginį",
     "Device ID": "Įrenginio ID",
     "Failed to set display name": "Nepavyko nustatyti rodomą vardą",
     "Disable Notifications": "Išjungti pranešimus",
@@ -298,30 +289,23 @@
     "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
     "Options": "Parametrai",
     "Key request sent.": "Rakto užklausa išsiųsta.",
-    "Unencrypted message": "Nešifruota žinutė",
     "device id: ": "įrenginio id: ",
     "Failed to mute user": "Nepavyko nutildyti naudotoją",
     "Are you sure?": "Ar tikrai?",
-    "Devices": "Įrenginiai",
     "Ignore": "Ignoruoti",
     "Invite": "Pakviesti",
     "User Options": "Naudotojo parametrai",
     "Admin Tools": "Administratoriaus įrankiai",
-    "bold": "pusjuodis",
-    "italic": "kursyvas",
     "Attachment": "Priedas",
     "Voice call": "Balso skambutis",
     "Video call": "Vaizdo skambutis",
     "Upload file": "Įkelti failą",
-    "Show Text Formatting Toolbar": "Rodyti teksto formatavimo įrankių juostą",
     "Send an encrypted reply…": "Siųsti šifruotą atsakymą…",
     "Send a reply (unencrypted)…": "Siųsti atsakymą (nešifruotą)…",
     "Send an encrypted message…": "Siųsti šifruotą žinutę…",
     "Send a message (unencrypted)…": "Siųsti žinutę (nešifruotą)…",
-    "Hide Text Formatting Toolbar": "Slėpti teksto formatavimo įrankių juostą",
     "Server error": "Serverio klaida",
     "Command error": "Komandos klaida",
-    "Unable to reply": "Nepavyko atsakyti",
     "Loading...": "Įkeliama...",
     "Pinned Messages": "Prisegtos žinutės",
     "Unknown": "Nežinoma",
@@ -331,7 +315,6 @@
     "Upload avatar": "Įkelti avatarą",
     "Settings": "Nustatymai",
     "Community Invites": "Bendruomenės pakvietimai",
-    "People": "Žmonės",
     "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s šiuo metu nėra pasiekiamas.",
     "Muted Users": "Nutildyti naudotojai",
@@ -386,7 +369,6 @@
     "Delete widget": "Ištrinti valdiklį",
     "Failed to remove widget": "Nepavyko pašalinti valdiklį",
     "Scroll to bottom of page": "Slinkti į puslapio apačią",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Rodyti įrenginius</showDevicesText>, <sendAnywayText>vis tiek siųsti</sendAnywayText> ar <cancelText>atsisakyti</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Kai kurios iš jūsų žinučių nebuvo išsiųstos.",
     "%(count)s of your messages have not been sent.|one": "Jūsų žinutė nebuvo išsiųsta.",
     "Connectivity to the server has been lost.": "Jungiamumas su šiuo serveriu buvo prarastas.",
@@ -415,8 +397,6 @@
     "Success": "Pavyko",
     "Unable to remove contact information": "Nepavyko pašalinti kontaktinę informaciją",
     "<not supported>": "<nepalaikoma>",
-    "Device ID:": "Įrenginio ID:",
-    "Device key:": "Įrenginio raktas:",
     "Check for update": "Tikrinti, ar yra atnaujinimų",
     "Reject all %(invitedRooms)s invites": "Atmesti visus %(invitedRooms)s pakvietimus",
     "You may need to manually permit Riot to access your microphone/webcam": "Jums gali tekti rankiniu būdu leisti Riot prieigą prie savo mikrofono/kameros",
@@ -431,7 +411,6 @@
     "Profile": "Profilis",
     "Account": "Paskyra",
     "click to reveal": "spustelėkite, norėdami atskleisti",
-    "matrix-react-sdk version:": "matrix-react-sdk versija:",
     "riot-web version:": "riot-web versija:",
     "olm version:": "olm versija:",
     "Failed to send email": "Nepavyko išsiųsti el. laiško",
@@ -458,7 +437,6 @@
     "Session ID": "Seanso ID",
     "End-to-end encryption information": "Ištisinio šifravimo informacija",
     "Event information": "Įvykio informacija",
-    "Sender device information": "Siuntėjo įrenginio informacija",
     "Passphrases must match": "Slaptafrazės privalo sutapti",
     "Passphrase must not be empty": "Slaptafrazė negali būti tuščia",
     "Export room keys": "Eksportuoti kambario raktus",
@@ -474,16 +452,12 @@
     "You do not have permission to start a conference call in this room": "Jūs neturite leidimo šiame kambaryje pradėti konferencinį pokalbį",
     "Room name or alias": "Kambario pavadinimas ar slapyvardis",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Neatrodo, kad jūsų el. pašto adresas šiame serveryje būtų susietas su Matrix ID.",
-    "Who would you like to communicate with?": "Su kuo norėtumėte susisiekti?",
     "Missing room_id in request": "Užklausoje trūksta room_id",
     "Missing user_id in request": "Užklausoje trūksta user_id",
     "Unrecognised room alias:": "Neatpažintas kambario slapyvardis:",
-    "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!": "ĮSPĖJIMAS: RAKTO PATVIRTINIMAS NEPAVYKO! Pasirašymo raktas, skirtas %(userId)s ir įrenginiui %(deviceId)s yra \"%(fprint)s\", o tai nesutampa su pateiktu raktu \"%(fingerprint)s\". Tai gali reikšti, kad jūsų komunikacijos yra perimamos!",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Jūsų pateiktas pasirašymo raktas sutampa su pasirašymo raktu, kurį gavote iš vartotojo %(userId)s įrenginio %(deviceId)s. Įrenginys pažymėtas kaip patvirtintas.",
     "VoIP conference started.": "VoIP konferencija pradėta.",
     "VoIP conference finished.": "VoIP konferencija užbaigta.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s pašalino kambario pavadinimą.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s įjungė end-to-end šifravimą (%(algorithm)s algoritmas).",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s modifikavo %(widgetName)s valdiklį",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridėjo %(widgetName)s valdiklį",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s pašalino %(widgetName)s valdiklį",
@@ -491,14 +465,7 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveris gali būti neprieinamas, per daug apkrautas, arba susidūrėte su klaida.",
     "Use compact timeline layout": "Naudoti kompaktišką laiko juostos išdėstymą",
     "Autoplay GIFs and videos": "Automatiškai atkurti GIF ir vaizdo įrašus",
-    "Never send encrypted messages to unverified devices from this device": "Niekada nesiųsti iš šio įrenginio šifruotų žinučių į nepatvirtintus įrenginius",
-    "Never send encrypted messages to unverified devices in this room from this device": "Niekada nesiųsti iš šio įrenginio šifruotas žinutes į nepatvirtintus įrenginius šiame kambaryje",
-    "Delete %(count)s devices|other": "Ištrinti %(count)s įrenginius",
     "This event could not be displayed": "Nepavyko parodyti šio įvykio",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Jeigu jūsų kituose įrenginiuose nėra rakto šiai žinutei, tuomet jūs negalėsite jos iššifruoti.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Iš naujo užklausti šifravimo raktus</requestLink> iš jūsų kitų įrenginių.",
-    "Undecryptable": "Neiššifruojama",
-    "Encrypted by an unverified device": "Šifruota nepatvirtintu įrenginiu",
     "Kick": "Išmesti",
     "Kick this user?": "Išmesti šį naudotoją?",
     "Failed to kick": "Nepavyko išmesti",
@@ -518,7 +485,6 @@
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s matė ties %(dateTime)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) matė ties %(dateTime)s",
     "Show these rooms to non-members on the community page and room list?": "Rodyti šiuos kambarius ne nariams bendruomenės puslapyje ir kambarių sąraše?",
-    "Invite new room members": "Pakviesti naujus kambario dalyvius",
     "Kicks user with given id": "Išmeta vartotoją su nurodytu id",
     "Bans user with given id": "Užblokuoja vartotoją su nurodytu id",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s užblokavo %(targetName)s.",
@@ -536,14 +502,10 @@
     "Incoming voice call from %(name)s": "Gaunamasis balso skambutis nuo %(name)s",
     "Incoming video call from %(name)s": "Gaunamasis vaizdo skambutis nuo %(name)s",
     "Incoming call from %(name)s": "Gaunamasis skambutis nuo %(name)s",
-    "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.": "Šiuo metu slaptažodžio pakeitimas atstatys bet kokius ištisinio šifravimo raktus visuose įrenginiuose ir tokiu būdu pavers šifruotą pokalbių istoriją neperskaitoma, nebent, iš pradžių, savo kambario raktus eksportuosite, o po to, juos importuosite iš naujo. Ateityje tai bus patobulinta.",
     "Change Password": "Keisti slaptažodį",
     "Authentication": "Tapatybės nustatymas",
     "The maximum permitted number of widgets have already been added to this room.": "Į šį kambarį jau yra pridėtas didžiausias leidžiamas valdiklių skaičius.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Jūsų rakto bendrinimo užklausa išsiųsta - patikrinkite kitus savo įrenginius, ar juose nėra rakto bendrinimo užklausų.",
-    "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.": "Rakto bendrinimo užklausos yra išsiunčiamos į jūsų kitus įrenginius automatiškai. Jeigu savo kitame įrenginyje atmetėte ar nepaisėte rakto užklausos, spustelėkite čia, norėdami dar kartą užklausti raktų šiam seansui.",
     "Please select the destination room for this message": "Pasirinkite šiai žinutei paskirties kambarį",
-    "No devices with registered encryption keys": "Nėra jokių įrenginių su registruotais šifravimo raktais",
     "Make Moderator": "Padaryti moderatoriumi",
     "Hangup": "Padėti ragelį",
     "No pinned messages.": "Nėra jokių prisegtų žinučių.",
@@ -554,7 +516,6 @@
     "Offline": "Atsijungęs",
     "Forget room": "Pamiršti kambarį",
     "Share room": "Bendrinti kambarį",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Šiame kambaryje yra nežinomų įrenginių: jei tęsite jų nepatvirtinę, kam nors bus įmanoma slapta klausytis jūsų skambučio.",
     "Usage": "Naudojimas",
     "Searches DuckDuckGo for results": "Atlieka rezultatų paiešką sistemoje DuckDuckGo",
     "To use it, just wait for autocomplete results to load and tab through them.": "Norėdami tai naudoti, tiesiog palaukite, kol bus įkelti automatiškai užbaigti rezultatai, tuomet pereikite per juos naudodami Tab klavišą.",
@@ -619,11 +580,8 @@
     "Unknown error": "Nežinoma klaida",
     "Incorrect password": "Neteisingas slaptažodis",
     "To continue, please enter your password:": "Norėdami tęsti, įveskite savo slaptažodį:",
-    "Device name": "Įrenginio pavadinimas",
-    "Device key": "Įrenginio raktas",
     "An error has occurred.": "Įvyko klaida.",
     "Ignore request": "Nepaisyti užklausos",
-    "Loading device info...": "Įkeliama įrenginio informacija...",
     "Failed to upgrade room": "Nepavyko atnaujinti kambarį",
     "The room upgrade could not be completed": "Nepavyko užbaigti kambario naujinimo",
     "Sign out": "Atsijungti",
@@ -650,8 +608,6 @@
     "Mention": "Paminėti",
     "This room has been replaced and is no longer active.": "Šis kambarys buvo pakeistas ir daugiau nebėra aktyvus.",
     "You do not have permission to post to this room": "Jūs neturite leidimų rašyti šiame kambaryje",
-    "Markdown is disabled": "Markdown yra išjungta",
-    "Markdown is enabled": "Markdown yra įjungta",
     "System Alerts": "Sistemos įspėjimai",
     "Failed to unban": "Nepavyko atblokuoti",
     "not specified": "nenurodyta",
@@ -691,12 +647,6 @@
     "Ignores a user, hiding their messages from you": "Ignoruoja vartotoją, slepiant nuo jūsų jo žinutes",
     "Stops ignoring a user, showing their messages going forward": "Sustabdo vartotojo ignoravimą, rodant jums jo tolimesnes žinutes",
     "Revoke Moderator": "Panaikinti moderatorių",
-    "deleted": "perbrauktas",
-    "underlined": "pabrauktas",
-    "inline-code": "įterptas kodas",
-    "block-quote": "citatos blokas",
-    "bulleted-list": "suženklintasis sąrašas",
-    "numbered-list": "sąrašas su numeriais",
     "Invites": "Pakvietimai",
     "Historical": "Istoriniai",
     "Every page you use in the app": "Kiekvienas puslapis, kurį jūs naudojate programoje",
@@ -771,9 +721,6 @@
     "Username available": "Naudotojo vardas yra prieinamas",
     "To get started, please pick a username!": "Norėdami pradėti, pasirinkite naudotojo vardą!",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeigu jau turite Matrix paskyrą, tuomet vietoj to, galite <a>prisijungti</a>.",
-    "Room contains unknown devices": "Kambaryje yra nežinomų įrenginių",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "Kambaryje \"%(RoomName)s\" yra jums anksčiau nematytų įrenginių.",
-    "Unknown devices": "Nežinomi įrenginiai",
     "Unable to restore backup": "Nepavyko atkurti atsarginės kopijos",
     "No backup found!": "Nerasta jokios atsarginės kopijos!",
     "Backup Restored": "Atsarginė kopija atkurta",
@@ -793,7 +740,6 @@
     "Your Communities": "Jūsų bendruomenės",
     "Create a new community": "Sukurti naują bendruomenę",
     "You have no visible notifications": "Jūs neturite matomų pranešimų",
-    "Message not sent due to unknown devices being present": "Žinutė neišsiųsta dėl to, kad yra nežinomų įrenginių",
     "Failed to perform homeserver discovery": "Nepavyko atlikti namų serverio aptikimo",
     "Error: Problem communicating with the given homeserver.": "Klaida: Problemos susisiekiant su nurodytu namų serveriu.",
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
@@ -832,8 +778,6 @@
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Šiam veiksmui reikalinga prieiti numatytąjį tapatybės serverį <server />, kad patvirtinti el. pašto adresą arba telefono numerį, bet serveris neturi jokių paslaugos teikimo sąlygų.",
     "Only continue if you trust the owner of the server.": "Tęskite tik tada, jei pasitikite serverio savininku.",
     "Trust": "Pasitikėti",
-    "Email, name or Matrix ID": "El. paštas, vardas arba Matrix ID",
-    "Failed to start chat": "Nepavyko pradėti pokalbio",
     "Failed to invite users to the room:": "Nepavyko pakviesti vartotojų į kambarį:",
     "You need to be able to invite users to do that.": "Norėdami tai atlikti jūs turite turėti galimybę pakviesti vartotojus.",
     "Power level must be positive integer.": "Galios lygis privalo būti teigiamas sveikasis skaičius.",
@@ -844,12 +788,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "SIunčia žinutę, kaip paprastą tekstą, jo neinterpretuodamas kaip pažymėto",
     "Upgrades a room to a new version": "Atnaujina kambarį į naują versiją",
     "You do not have the required permissions to use this command.": "Jūs neturite reikalingų leidimų naudoti šią komandą.",
-    "Room upgrade confirmation": "Kambario atnaujinimo patvirtinimas",
-    "Upgrading a room can be destructive and isn't always necessary.": "Kambario atnaujinimas gali būti destruktyvus ir nėra visada reikalingas.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Kambario atnaujinimai paprastai rekomenduojami, kada kambario versija yra laikoma <i>nestabili</i>. Nestabilios kambario versijos gali turėti klaidų, trūkstamų funkcijų, arba saugumo spragų.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Kambario atnaujinimai paprastai paveikia tik <i>serverio pusės</i> kambario apdorojimą. Jei jūs turite problemų su jūsų Riot klientu, prašome užregistruoti problemą <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Įspėjimas</b>: Kambario atnaujinimas <i>automatiškai nemigruos kambario dalyvių į naują kambario versiją.</i> Mes paskelbsime nuorodą į naują kambarį senojoje kambario versijoje - kambario dalyviai turės ją paspausti, norėdami prisijungti prie naujo kambario.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Prašome patvirtinti, kad jūs norite tęsti šio kambario atnaujinimą iš <oldVersion /> į <newVersion />.",
     "Changes your display nickname in the current room only": "Pakeičia jūsų rodomą slapyvardį tik esamame kambaryje",
     "Changes the avatar of the current room": "Pakeičia esamo kambario avatarą",
     "Changes your avatar in this current room only": "Pakeičia jūsų avatarą tik esamame kambaryje",
@@ -870,7 +809,6 @@
     "Adds a custom widget by URL to the room": "Į kambarį prideda pasirinktinį valdiklį pagal URL",
     "Please supply a https:// or http:// widget URL": "Prašome pateikti https:// arba http:// valdiklio URL",
     "You cannot modify widgets in this room.": "Jūs negalite keisti valdiklių šiame kambaryje.",
-    "Verifies a user, device, and pubkey tuple": "Patikrina vartotoją, įrenginį ir pubkey seką",
     "Forces the current outbound group session in an encrypted room to be discarded": "Priverčia išmesti esamą užsibaigiančią grupės sesiją šifruotame kambaryje",
     "Sends the given message coloured as a rainbow": "Išsiunčia nurodytą žinutę nuspalvintą kaip vaivorykštė",
     "Sends the given emote coloured as a rainbow": "Išsiunčia nurodytą emociją nuspalvintą kaip vaivorykštė",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index d44a26651d..03777f4870 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -48,7 +48,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja tēmas nosaukumu uz \"%(topic)s\".",
     "Changes your display nickname": "Nomaina Tavu publisko segvārdu (niku)",
-    "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.": "Paroles maiņa dzēsīs pašreizējās šifrēšanas atslēgas visās savstarpēji saistītajās ierīcēs, padarot čata vēsturi neizlasāmu, ja vien vien istabas atslēgas nav tikušas iepriekš eksportētas un no jauna importētas atpakaļ. Nākotnē to plānojam uzlabot.",
     "Claimed Ed25519 fingerprint key": "Ed25519 pieprasītā nospieduma (fingerprint) atslēga",
     "Click here to fix": "Klikšķini šeit, lai salabotu",
     "Click to mute audio": "Klikšķini, lai audio skaņu izslēgtu",
@@ -75,12 +74,8 @@
     "Decryption error": "Atšifrēšanas kļūda",
     "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto Id",
     "Default": "Noklusējuma",
-    "Device already verified!": "Ierīce ir jau verificēta!",
     "Device ID": "Ierīces Id",
-    "Device ID:": "Ierīces Id:",
     "device id: ": "ierīces id: ",
-    "Device key:": "Ierīces atslēga:",
-    "Devices": "Ierīces",
     "Direct chats": "Tiešie čati",
     "Disable Notifications": "Izslēgt paziņojumus",
     "Disinvite": "Atsaukt",
@@ -92,7 +87,6 @@
     "Email address": "Epasta adrese",
     "Emoji": "Emocīši (emoji)",
     "Enable Notifications": "Ieslēgt paziņojumus",
-    "Encrypted by an unverified device": "Šifrēts ar neverificētu ierīci",
     "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
     "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
     "Enter passphrase": "Ievadi paroles frāzi",
@@ -134,7 +128,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
     "Hangup": "Beigt zvanu",
-    "Hide Text Formatting Toolbar": "Slēpt teksta formatēšanas rīkjoslu",
     "Historical": "Bijušie",
     "Home": "Mājup",
     "Homeserver is": "Bāzes serveris ir",
@@ -147,15 +140,12 @@
     "Incoming voice call from %(name)s": "Ienākošs AUDIO zvans no %(name)s",
     "Incorrect username and/or password.": "Nepareizs lietotājvārds un/vai parole.",
     "Incorrect verification code": "Nepareizs verifikācijas kods",
-    "Invalid alias format": "Nepareizs aliases (aizstājējvārda) formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s uzaicināja %(targetName)s.",
-    "Invite new room members": "Uzaicināt jaunus istabas biedrus",
     "Invited": "Uzaicināts/a",
     "Invites": "Uzaicinājumi",
     "Invites user with given id to current room": "Uzaicina lietotāju ar norādīto id uz pašreizējo istabu",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nav pareizā aliases (aizstājējvārda) formātā",
     "Sign in with": "Pierakstīties ar",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
@@ -178,17 +168,11 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
     "Manage Integrations": "Pārvaldīt integrācijas",
-    "Markdown is disabled": "\"Markdown\" formatēšana izslēgta",
-    "Markdown is enabled": "\"Markdown\" formatēšana ieslēgta",
-    "matrix-react-sdk version:": "Matrix-react-sdk versija:",
-    "Message not sent due to unknown devices being present": "Ziņa nav nosūtīta, jo tika konstatēta nezināmu ierīču klātbūtne",
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
     "Missing user_id in request": "Iztrūkstošs user_id pieprasījumā",
     "Moderator": "Moderators",
     "Mute": "Noklusināt (izslēgt skaņu)",
     "Name": "Vārds",
-    "Never send encrypted messages to unverified devices from this device": "Nekad nesūtīt no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nekad nesūtīt no šīs ierīces šifrētas ziņas neverificētām ierīcēm šajā istabā",
     "New address (e.g. #foo:%(localDomain)s)": "Jaunā adrese (piemēram #kautkas:%(localDomain)s)",
     "New passwords don't match": "Jaunās paroles nesakrīt",
     "New passwords must match each other.": "Jaunajām parolēm ir jāsakrīt vienai ar otru.",
@@ -198,7 +182,6 @@
     "(not supported by this browser)": "(netiek atbalstīts šajā pārlūkā)",
     "<not supported>": "<netiek atbalstīts>",
     "NOT verified": "NAV verificēts",
-    "No devices with registered encryption keys": "Nav ierīču ar reģistrētām šifrēšanas atslēgām",
     "No display name": "Nav publiski redzamā vārda",
     "No more results": "Nav tālāko rezultātu",
     "No results": "Nav rezultātu",
@@ -209,7 +192,6 @@
     "Operation failed": "Darbība neizdevās",
     "Password": "Parole",
     "Passwords can't be empty": "Paroles nevar būt tukšas",
-    "People": "Cilvēki",
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
@@ -234,7 +216,6 @@
     "riot-web version:": "Riot-web versija:",
     "Unable to enable Notifications": "Nav iespējams iespējot paziņojumus",
     "You have no visible notifications": "Tev nav redzamo paziņojumu",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Tava parole tika veiksmīgi nomainīta. Tu vairs nesaņemsi pašpiegādes (push) paziņojumus citās ierīcēs kamēr tajās nebūs veikta atkārtota pierakstīšanās",
     "This will allow you to reset your password and receive notifications.": "Tas atļaus Tev atiestatīt paroli un saņemt paziņojumus.",
     "Room %(roomId)s not visible": "Istaba %(roomId)s nav redzama",
     "%(roomName)s does not exist.": "%(roomName)s neeksistē.",
@@ -244,8 +225,6 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja attēlojamo/redzamo vārdu uz: %(displayName)s.",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
@@ -254,7 +233,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
-    "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!": "BRĪDINĀJUMS: NEIZDEVĀS VERIFICĒT ATSLĒGU! Pierakstīšanās atslēga priekš %(userId)s un ierīces %(deviceId)s ir \"%(fprint)s\", kura nesakrīt ar ievadīto atslēgu \"%(fingerprint)s\". Tas var nozīmēt, ka Tava saziņa var tikt pārtverta!",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
@@ -264,15 +242,11 @@
     "(~%(count)s results)|other": "(~%(count)s rezultāti)",
     "Reject all %(invitedRooms)s invites": "Noraidīt visus %(invitedRooms)s uzaicinājumus",
     "Failed to invite the following users to the %(roomName)s room:": "Neizdevās uzaicināt sekojošos lietotājus uz %(roomName)s istabu:",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" atrodas ierīces, kuras Tu neesi iepriekš redzējis/usi.",
     "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?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tava neverificētā ierīce '%(displayName)s' pieprasa šifrēšanas atslēgas.",
     "Room Colour": "Istabas krāsa",
-    "Room contains unknown devices": "Istabā konstatētas nepārbaudītas ierīces",
     "Rooms": "Istabas",
     "Save": "Saglabāt",
     "Scroll to bottom of page": "Aizritināt uz lapas apakšu",
@@ -280,8 +254,6 @@
     "Search failed": "Meklēšana neizdevās",
     "Searches DuckDuckGo for results": "Meklēšanai izmanto DuckDuckGo",
     "Send anyway": "Nosūtīt jebkurā gadījumā",
-    "Sender device information": "Nosūtītāja ierīces informācija",
-    "Send Invites": "Nosūtīt uzaicinājumus",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
     "Server error": "Servera kļūda",
     "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
@@ -289,7 +261,6 @@
     "Server unavailable, overloaded, or something else went wrong.": "Serveris ir nesasniedzams, pārslogots, vai arī esi uzdūries kļūdai.",
     "Session ID": "Sesijas Id",
     "Settings": "Iestatījumi",
-    "Show Text Formatting Toolbar": "Rādīt teksta formatēšanas rīkjoslu",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rādīt laiku 12 stundu formātā (piemēram 2:30pm)",
     "Signed Out": "Izrakstījās",
     "Sign in": "Pierakstīties",
@@ -298,7 +269,6 @@
     "Someone": "Kāds",
     "Start a chat": "Sākt čatu",
     "Start authentication": "Sākt autentifikāciju",
-    "Start Chat": "Sākt čatu",
     "Submit": "Iesniegt",
     "Success": "Izdevās",
     "The phone number entered looks invalid": "Ievadītais telefona numurs izskatās nepareizs",
@@ -320,14 +290,10 @@
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
     "Unban": "Atbanot/atcelt pieejas liegumu",
     "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
-    "Unable to load device list": "Nav iespējams ielādēt ierīču sarakstu",
-    "Undecryptable": "Neatšifrējams",
     "unencrypted": "nešifrēts",
-    "Unencrypted message": "Nešifrēta ziņa",
     "unknown caller": "nezināms zvanītājs",
     "unknown device": "nezināma ierīce",
     "unknown error code": "nezināms kļūdas kods",
-    "Unknown (user, device) pair:": "Nezināms (lietotājs, ierīce) pāris:",
     "Unmute": "Ieslēgt skaņu",
     "Unnamed Room": "Istaba bez nosaukuma",
     "Cancel": "Atcelt",
@@ -335,7 +301,6 @@
     "Custom Server Options": "Iestatāmās servera opcijas",
     "Dismiss": "Atteikt",
     "You have <a>enabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir<a>iespējots</a> .",
-    "Unrecognised command:": "Neatpazīta komanda:",
     "Unrecognised room alias:": "Neatpazīta istabas aliase:",
     "Upload avatar": "Augšuplādēt avataru (profila attēlu)",
     "Upload Failed": "Augšupielāde (nosūtīšana) neizdevās",
@@ -349,9 +314,6 @@
     "Verification": "Verifikācija",
     "verified": "verificēts",
     "Verified key": "Verificēta atslēga",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "BRĪDINĀJUMS: Ierīce ir jau verificēta, bet NESAKRĪT atslēgas!",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Tu šobrīd esi iekļāvis/usi neverificētas ierīces melnajā sarakstā. Lai nosūtītu ziņas uz šādām ierīcēm, Tev tās ir jāverificē.",
-    "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.": "Mēs rekomendējam Tev pārskatīt verifikācijas procesu katrai ierīcei, lai apstiprinātu tās piederību īstajam īpašniekam, bet Tu vari nosūtīt ziņu vēlreiz bez verificēšanas, ja vēlies.",
     "Start verification": "Sākt verifikāciju",
     "Video call": "VIDEO zvans",
     "Voice call": "AUDIO zvans",
@@ -363,7 +325,6 @@
     "Warning!": "Brīdinājums!",
     "Who can access this room?": "Kurš var piekļūt istabai?",
     "Who can read history?": "Kas var lasīt vēsturi?",
-    "Who would you like to communicate with?": "Ar kuru vēlies komunicēt?",
     "You are already in a call.": "Tu jau šobrīd esi sarunā.",
     "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
     "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
@@ -404,8 +365,6 @@
     "Connectivity to the server has been lost.": "Savienojums ar serveri pārtrūka.",
     "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
     "Active call": "Aktīvs zvans",
-    "bold": "treknraksts",
-    "italic": "kursīvs",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čalošanu",
@@ -431,15 +390,9 @@
     "Unknown error": "Nezināma kļūda",
     "Incorrect password": "Nepareiza parole",
     "To continue, please enter your password.": "Lai turpinātu, ievadi savu paroli.",
-    "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:": "Lai verificētu šīs ierīces uzticamību, lūdzu sazinies ar tās īpašnieku, izmantojot citu saziņas veidu (piemēram, sazinoties personiski vai telefoniski) un pajautā, vai atslēga, kuru īpašnieks redz savos lietotāja iestatījumos, sakrīt ar šo atslēgu:",
-    "Device name": "Ierīces nosaukums",
-    "Device key": "Ierīces atslēga",
-    "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.": "Ja tā sakrīt, tad nospied zemāk esošo verifikācijas pogu . Ja nesakrīt, tad kāds cits ir piekļuvis šai ierīcei un šādā gadījumā Tu, iespējams, vēlies izmantot \"melnais saraksts\" iespēju.",
-    "Verify device": "Verificēt ierīci",
     "I verify that the keys match": "Es apstiprinu, ka atslēgas sakrīt",
     "Unable to restore session": "Nav iespējams atjaunot sesiju",
     "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.": "Ja Tu iepriekš izmantoji jaunāku Riot versiju, tava sesija var nebūt saderīga ar šo versiju. Aizver šo logu un atgriezies jaunākajā versijā.",
-    "Unknown devices": "Nezināmas ierīces",
     "Unknown Address": "Nezināma adrese",
     "Unblacklist": "Atbloķēšanas saraksts",
     "Blacklist": "Melnais saraksts",
@@ -494,8 +447,6 @@
     "Unable to create widget.": "Nav iespējams izveidot widžetu.",
     "You are not in this room.": "Tu neatrodies šajā istabā.",
     "You do not have permission to do that in this room.": "Tev nav atļaujas šai darbībai šajā istabā.",
-    "Verifies a user, device, and pubkey tuple": "Verificē lietotāju, ierīci, un publiskās atslēgas",
-    "Loading device info...": "Ielādē ierīces informāciju...",
     "Example": "Piemērs",
     "Create": "Izveidot",
     "Featured Rooms:": "Ieteiktās istabas:",
@@ -522,7 +473,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Informācija, kura mums tiek nosūtīta, lai ļautu padarīt Riot.im labāku, ietver:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas Id, šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
     "Call Failed": "Zvans neizdevās",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Šajā istabā ir nepazīstamas ierīces: ja Tu turpināsi bez to pārbaudes, ir iespējams, ka kāda nepiederoša persona var noklausīties Tavas sarunas.",
     "Review Devices": "Ierīču pārskats",
     "Call Anyway": "Vienalga zvanīt",
     "Answer Anyway": "Vienalga atbildēt",
@@ -555,8 +505,6 @@
     "Enable inline URL previews by default": "URL priekšskats pēc noklusējuma",
     "Enable URL previews for this room (only affects you)": "URL priekšskati šai istabai (ietekmē tikai Tevi pašu)",
     "Enable URL previews by default for participants in this room": "URL priekšskati pēc noklusējuma visiem šīs istabas dalībniekiem",
-    "Delete %(count)s devices|other": "Dzēst %(count)s ierīces",
-    "Delete %(count)s devices|one": "Dzēst ierīci",
     "%(senderName)s sent an image": "%(senderName)s nosūtīja bildi",
     "%(senderName)s sent a video": "%(senderName)s nosūtīja video",
     "%(senderName)s uploaded a file": "%(senderName)s augšupielādēja failu",
@@ -707,7 +655,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Radi kopienu, lai apvienotu lietotājus un istabas. Izveido mājaslapu, lai iezīmētu Matrix visumā savu klātbūtni, vietu un telpu.",
     "Error whilst fetching joined communities": "Ielādējot kopienas radās kļūda",
     "%(count)s of your messages have not been sent.|one": "Tava ziņa netika nosūtīta.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Parādīt ierīces</showDevicesText>, <sendAnywayText>vienalga nosūtīt</sendAnywayText> vai <cancelText>sūtīšanu atcelt</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>Atkārtoti sūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Šeit neviena nav. Ja vēlies <inviteText>kādu uzaicināt</inviteText> vai <nowarnText>atslēgt paziņojumu par tukšu istabu</nowarnText>?",
     "Light theme": "Gaiša ādiņa",
@@ -721,11 +668,7 @@
     "Stops ignoring a user, showing their messages going forward": "Atceļ lietotāja ignorēšanu, rādot viņa turpmāk sūtītās ziņas",
     "Notify the whole room": "Paziņot visai istabai",
     "Room Notification": "Istabas paziņojums",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Tavs atslēgu apmaiņas pieprasījums nosūtīts - lūdzu pārbaudi citas savas ierīces attiecībā uz atslēgu apmaiņu.",
-    "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.": "Atslēgu apmaiņas pieprasījumi Tavām citām ierīcēm tiek nosūtīti automātiski. Ja citās savās ierīcēs atslēdzi vai noraidīji atslēgu apmaiņas pieprasījumu, spiediet šeit lai pieprasītu atslēgas šai sesijai atkārtoti.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ja citās Tavās ierīcēs nav atslēgas priekš šīs ziņas, Tu nevarēsi to atšifrēt.",
     "Key request sent.": "Atslēgas pieprasījums nosūtīts.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Atkārtoti pieprasīt šifrēšanas atslēgas</requestLink> no citām savām ierīcēm.",
     "Code": "Kods",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)snoraidīja viņu uzaicinājumu %(count)s reizes",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)snoraidīja uzaicinājumu",
@@ -812,7 +755,6 @@
     "Files": "Faili",
     "Collecting app version information": "Tiek iegūta programmas versijas informācija",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Dzēst istabas aliasi/aizstājējvārdu %(alias)s un dzēst %(name)s no kataloga?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tas atļaus Tev atgriezties savā kontā pēc izrakstīšanās, un pierakstīties no citām ierīcēm.",
     "Keywords": "Atslēgvārdi",
     "Enable notifications for this account": "Iespējot paziņojumus šim kontam",
     "Invite to this community": "Uzaicināt šajā kopienā",
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index cc4a1a64c2..f181e0d65a 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -68,7 +68,6 @@
     "Files": "ഫയലുകള്‍",
     "Collecting app version information": "ആപ്പ് പതിപ്പു വിവരങ്ങള്‍ ശേഖരിക്കുന്നു",
     "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.": "സൈന്‍ ഔട്ട് ചെയ്ത ശേഷം വീണ്ടും നിങ്ങളുടെ അക്കൌണ്ടിലേക്ക് മടങ്ങി വരാനും, മറ്റ് ഡിവൈസുകളില്‍ സൈന്‍ ഇന്‍ ചെയ്യാനും ഇത് സഹായിക്കും.",
     "Keywords": "കീവേഡുകള്‍",
     "Enable notifications for this account": "ഈ അക്കൌണ്ടില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
     "Messages containing <span>keywords</span>": "<span>കീവേഡുകള്‍</span>അടങ്ങിയ സന്ദേശങ്ങള്‍ക്ക്",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 733d3ebb04..66e453e697 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -112,7 +112,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Informasjonen som blir sendt til oss for å hjelpe oss med å lage Riot.im bedre inkluderer:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Hvor denne siden inkluderer identifiserende informasjon, sånn som navnet på rommet, brukeren, og gruppe ID, men denne informasjonen blir fjernet før den blir sendt til tjeneren.",
     "Call Failed": "Oppringning mislyktes",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det er ukjente enheter i dette rommet: Hvis du fortsetter uten å verifisere dem vil det være mulig for noen å tyvlytte på samtalen din.",
     "Review Devices": "Se over enheter",
     "Call Anyway": "Ring likevel",
     "Answer Anyway": "Svar likevel",
@@ -191,10 +190,6 @@
     "Moderator": "Moderator",
     "Admin": "Admin",
     "Start a chat": "Start en samtale",
-    "Who would you like to communicate with?": "Hvem vil du prate med?",
-    "Start Chat": "Start Samtale",
-    "Invite new room members": "Inviter nye rom-medlemmer",
-    "Send Invites": "Send invitasjoner",
     "Operation failed": "Operasjon mislyktes",
     "Failed to invite": "Klarte ikke invitere",
     "Failed to invite users to the room:": "Klarte ikke invitere brukere til rommet:",
@@ -218,10 +213,6 @@
     "Upgrades a room to a new version": "Oppgraderer et rom til en ny versjon",
     "Changes your display nickname": "Endrer visningsnavnet ditt",
     "Chat with Riot Bot": "Chat med Riot Bot",
-    "Email, name or Matrix ID": "Epost, navn eller Matrix ID",
-    "Room upgrade confirmation": "Rom oppgradering bekreftelse",
-    "Upgrading a room can be destructive and isn't always necessary.": "Oppgraderingen av et rom kan være destruktivt, og er ikke alltid nødvendig.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Vennligst bekreft at du vil fortsette med oppgraderingen av dette rommet fra <oldVersion /> til <newVersion />.",
     "Changes your display nickname in the current room only": "Endrer visningsnavnet ditt kun i det nåværende rommet",
     "Changes your avatar in this current room only": "Endrer avataren din kun i det nåværende rommet",
     "Call failed due to misconfigured server": "Oppringingen feilet på grunn av feil-konfigurert tjener",
@@ -236,15 +227,12 @@
     "The file '%(fileName)s' failed to upload.": "Filen '%(fileName)s' kunne ikke lastes opp.",
     "The server does not support the room version specified.": "Tjeneren støtter ikke rom versjonen som ble spesifisert.",
     "Name or Matrix ID": "Navn eller Matrix ID",
-    "Failed to start chat": "Feilet å starte samtale",
     "Messages": "Meldinger",
     "Actions": "Handlinger",
     "Advanced": "Avansert",
     "Other": "Andre",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Forbereder ¯\\_(ツ)_/¯ til en ren-tekst melding",
     "You do not have the required permissions to use this command.": "Du har ikke de rette tilgangene til å bruke denne kommandoen.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Oppgradering av rom anbefales vanligvis når en rom versjon anses som <i>ustabil</i>. Ustabile rom versjoner kan ha feil, manglende funksjoner eller sikkerhetsproblemer.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Oppgraderinger av rommet påvirker vanligvis bare <i>tjenerside</i> behandlingen av rommet. Hvis du har problemer med Riot-klienten din, kan du sende inn et problem med <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Advarsel</b>: Oppgradering av et rom vil <i>ikke automatisk migrere rom medlemmer til den nye versjonen av rommet.</i> Vi legger ut en lenke til det nye rommet i den gamle versjonen av rommet - rom medlemmer må klikke på denne lenken for å bli med i det nye rommet.",
     "Changes your avatar in all rooms": "Endrer avataren din i alle rom",
     "Gets or sets the room topic": "Henter eller setter rommets overskrift",
@@ -269,18 +257,12 @@
     "Adds a custom widget by URL to the room": "Legger til en tilpasset widget med URL i rommet",
     "Please supply a https:// or http:// widget URL": "Oppgi en https: // eller http: // widget-URL",
     "You cannot modify widgets in this room.": "Du kan ikke endre widgets i dette rommet.",
-    "Unknown (user, device) pair:": "Ukjent (bruker,enhet) par:",
-    "Device already verified!": "Enhet allerede verifisert!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ADVARSEL: Enheten er allerede verifisert, men nøkler er IKKE LIKE!",
-    "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!": "ADVARSEL: Nøkkelverifisering mislyktes! Signeringsnøkkelen for %(userId)s og enhet %(deviceId)s er \"%(fprint)s\" som ikke samsvarer med den oppgitte nøkkelen \"%(fingerprint)s\". Dette kan bety at kommunikasjonene dine blir fanget opp!",
     "Verified key": "Verifisert nøkkel",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnøkkelen du oppgav stemmer med signeringsnøkkelen du mottok fra %(userId)s enhet %(deviceId)s. Enheten er merket som bekreftet.",
     "Displays action": "Viser handling",
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvinger den gjeldende utgående gruppeøkten i et kryptert rom til å stoppe",
     "Sends the given message coloured as a rainbow": "Sender gitte melding i regnbuens farger",
     "Sends the given emote coloured as a rainbow": "Sender gitte emote i regnbuens farger",
     "Displays list of commands with usages and descriptions": "Viser liste over kommandoer med bruks eksempler og beskrivelser",
-    "Unrecognised command:": "Ukjent kommando:",
     "Reason": "Årsak",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aksepterte invitasjonen til %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s aksepterte en invitasjon."
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 3dcd215ab4..5fcaf0d71a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -33,7 +33,6 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de gespreksnaam gewijzigd naar %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar ‘%(topic)s’.",
     "Changes your display nickname": "Verandert uw weergavenaam",
-    "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.": "Momenteel stellen wachtwoordveranderingen nog alle sleutels voor eind-tot-eind-versleuteling op alle apparaten opnieuw in, waardoor de versleutelde gespreksgeschiedenis onleesbaar wordt, tenzij u eerst uw gesprekssleutels exporteert en na afloop opnieuw importeert. Dit zal in de toekomst verbeterd worden.",
     "Click here to fix": "Klik hier om dit op te lossen",
     "Click to mute audio": "Klik om het geluid uit te zetten",
     "Click to mute video": "Klik om het geluid van de video uit te zetten",
@@ -87,7 +86,6 @@
     "(not supported by this browser)": "(niet ondersteund door deze browser)",
     "<not supported>": "<niet ondersteund>",
     "NOT verified": "NIET geverifieerd",
-    "No devices with registered encryption keys": "Geen apparaten met geregistreerde versleutelingssleutels",
     "No display name": "Geen weergavenaam",
     "No more results": "Geen resultaten meer",
     "No results": "Geen resultaten",
@@ -95,7 +93,6 @@
     "olm version:": "olm-versie:",
     "Password": "Wachtwoord",
     "Passwords can't be empty": "Wachtwoorden kunnen niet leeg zijn",
-    "People": "Personen",
     "Permissions": "Toestemmingen",
     "Phone": "Telefoonnummer",
     "Private Chat": "Privégesprek",
@@ -108,10 +105,8 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
     "Remote addresses for this room:": "Externe adressen voor dit gesprek:",
-    "Send Invites": "Uitnodigingen versturen",
     "Start a chat": "Gesprek beginnen",
     "Start authentication": "Authenticatie starten",
-    "Start Chat": "Gesprek beginnen",
     "Submit": "Bevestigen",
     "Success": "Klaar",
     "Sun": "Zo",
@@ -149,12 +144,8 @@
     "Decline": "Weigeren",
     "Decrypt %(text)s": "%(text)s ontcijferen",
     "Decryption error": "Ontsleutelingsfout",
-    "Device already verified!": "Apparaat reeds geverifieerd!",
     "Device ID": "Apparaats-ID",
-    "Device ID:": "Apparaats-ID:",
     "device id: ": "apparaats-ID: ",
-    "Device key:": "Apparaatssleutel:",
-    "Devices": "Apparaten",
     "Direct chats": "Tweegesprekken",
     "Disable Notifications": "Meldingen uitschakelen",
     "Disinvite": "Uitnodiging intrekken",
@@ -171,7 +162,6 @@
     "Displays action": "Toont actie",
     "Emoji": "Emoticons",
     "Enable Notifications": "Meldingen inschakelen",
-    "Encrypted by an unverified device": "Versleuteld door een ongeverifieerd apparaat",
     "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "End-to-end encryption information": "Info over eind-tot-eind-versleuteling",
     "Enter passphrase": "Voer wachtwoord in",
@@ -206,7 +196,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s van %(fromPowerLevel)s naar %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Gasten - zelfs speficiek uitgenodigde - kunnen niet aan dit gesprek deelnemen.",
     "Hangup": "Ophangen",
-    "Hide Text Formatting Toolbar": "Tekstopmaakwerkbalk verbergen",
     "Historical": "Historisch",
     "Home": "Thuis",
     "Homeserver is": "Thuisserver is",
@@ -219,15 +208,12 @@
     "Incoming voice call from %(name)s": "Inkomende spraakoproep van %(name)s",
     "Incorrect username and/or password.": "Onjuiste gebruikersnaam en/of wachtwoord.",
     "Incorrect verification code": "Onjuiste verificatiecode",
-    "Invalid alias format": "Ongeldig bijnaamformaat",
     "Invalid Email Address": "Ongeldig e-mailadres",
     "Invalid file%(extra)s": "Ongeldig bestand %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s heeft %(targetName)s uitgenodigd.",
-    "Invite new room members": "Nieuwe gespreksleden uitnodigen",
     "Invited": "Uitgenodigd",
     "Invites": "Uitnodigingen",
     "Invites user with given id to current room": "Nodigt de gebruiker met de gegeven ID uit in het huidige gesprek",
-    "'%(alias)s' is not a valid format for an alias": "‘%(alias)s’ is geen geldig formaat voor een bijnaam",
     "Sign in with": "Aanmelden met",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelnemen met <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Gesprek toetreden",
@@ -247,14 +233,8 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor iedereen.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor onbekend (%(visibility)s).",
     "Manage Integrations": "Integraties beheren",
-    "Markdown is disabled": "Markdown is uitgeschakeld",
-    "Markdown is enabled": "Markdown is ingeschakeld",
-    "matrix-react-sdk version:": "matrix-react-sdk-versie:",
-    "Message not sent due to unknown devices being present": "Bericht niet verstuurd doordat er onbekende apparaten aanwezig zijn",
     "Missing room_id in request": "room_id ontbreekt in verzoek",
     "Missing user_id in request": "user_id ontbreekt in verzoek",
-    "Never send encrypted messages to unverified devices from this device": "Versleutelde berichten vanaf dit apparaat nooit naar ongeverifieerde apparaten versturen",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nooit vanaf dit apparaat versleutelde berichten naar ongeverifieerde apparaten in dit gesprek versturen",
     "New address (e.g. #foo:%(localDomain)s)": "Nieuw adres (bv. #foo:%(localDomain)s)",
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
@@ -272,7 +252,6 @@
     "riot-web version:": "riot-web-versie:",
     "Room %(roomId)s not visible": "Gesprek %(roomId)s is niet zichtbaar",
     "Room Colour": "Gesprekskleur",
-    "Room contains unknown devices": "Aan het gesprek nemen onbekende apparaten deel",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is op dit moment niet toegankelijk.",
     "Rooms": "Gesprekken",
@@ -282,7 +261,6 @@
     "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
     "Seen by %(userName)s at %(dateTime)s": "Gezien door %(userName)s om %(dateTime)s",
     "Send anyway": "Alsnog versturen",
-    "Sender device information": "Info over apparaat van afzender",
     "Send Reset Email": "E-mail voor opnieuw instellen versturen",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s heeft een afbeelding gestuurd.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s heeft %(targetDisplayName)s in het gesprek uitgenodigd.",
@@ -296,7 +274,6 @@
     "Kicks user with given id": "Stuurt de gebruiker met de gegeven ID uit het gesprek",
     "%(senderName)s set a profile picture.": "%(senderName)s heeft een profielfoto ingesteld.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s heeft %(displayName)s als weergavenaam aangenomen.",
-    "Show Text Formatting Toolbar": "Tekstopmaakwerkbalk weergeven",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Tijd in 12-uursformaat weergeven (bv. 2:30pm)",
     "Signed Out": "Afgemeld",
     "Sign in": "Aanmelden",
@@ -304,7 +281,6 @@
     "%(count)s of your messages have not been sent.|other": "Enkele van uw berichten zijn niet verstuurd.",
     "Someone": "Iemand",
     "The phone number entered looks invalid": "Het ingevoerde telefoonnummer ziet er ongeldig uit",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "De versleutelingssleutel die u heeft verstrekt komt overeen met de versleutelingssleutel die u heeft ontvangen van het apparaat %(deviceId)s van %(userId)s. Het apparaat is gemarkeerd als geverifieerd.",
     "This email address is already in use": "Dit e-mailadres is al in gebruik",
     "This email address was not found": "Dit e-mailadres is niet gevonden",
     "The email address linked to your account must be entered.": "Het e-mailadres dat met uw account verbonden is moet ingevoerd worden.",
@@ -318,7 +294,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht u tot de automatisch aangevulde resultaten geladen zijn en tabt u erdoorheen.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U heeft gepoogd een gegeven punt in de tijdslijn van dit gesprek te laden, maar u bent niet bevoegd het desbetreffende bericht te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar kon dit niet vinden.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s heeft eind-tot-eind-versleuteling aangezet (%(algorithm)s-algoritme).",
     "Unable to add email address": "Kan e-mailadres niet toevoegen",
     "Unable to remove contact information": "Kan contactinformatie niet verwijderen",
     "Unable to verify email address.": "Kan e-mailadres niet verifiëren.",
@@ -326,17 +301,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s heeft %(targetName)s ontbannen.",
     "Unable to capture screen": "Kan geen schermafdruk maken",
     "Unable to enable Notifications": "Kan meldingen niet inschakelen",
-    "Unable to load device list": "Kan lijst van apparaten niet laden",
-    "Undecryptable": "Onontsleutelbaar",
     "unencrypted": "onversleuteld",
-    "Unencrypted message": "Onversleuteld bericht",
     "unknown caller": "onbekende beller",
     "unknown device": "onbekend apparaat",
     "Unknown room %(roomId)s": "Onbekend gesprek %(roomId)s",
-    "Unknown (user, device) pair:": "Onbekend paar (gebruiker, apparaat):",
     "Unmute": "Niet dempen",
     "Unnamed Room": "Naamloos gesprek",
-    "Unrecognised command:": "Onbekende opdracht:",
     "Unrecognised room alias:": "Onbekende gespreksbijnaam:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt geüpload",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
@@ -364,11 +334,8 @@
     "(no answer)": "(geen antwoord)",
     "(unknown failure: %(reason)s)": "(onbekende fout: %(reason)s)",
     "Warning!": "Let op!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "LET OP: apparaat reeds geverifieerd, maar de sleutels KOMEN NIET OVEREEN!",
-    "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!": "LET OP: SLEUTELVERIFICATIE IS MISLUKT! De ondertekende sleutel voor %(userId)s en apparaat %(deviceId)s is ‘%(fprint)s’, wat niet overeenkomt met de verschafte sleutel ‘%(fingerprint)s’. Dit kan betekenen dat uw communicatie onderschept wordt!",
     "Who can access this room?": "Wie mag er deelnemen aan dit gesprek?",
     "Who can read history?": "Wie kan de geschiedenis lezen?",
-    "Who would you like to communicate with?": "Met wie zou u willen communiceren?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s heeft de uitnodiging van %(targetName)s ingetrokken.",
     "You are already in a call.": "U bent al in gesprek.",
     "You cannot place a call with yourself.": "U kunt uzelf niet bellen.",
@@ -381,7 +348,6 @@
     "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid gebruikers uit te nodigen.",
     "You need to be logged in.": "Hiervoor dient u aangemeld te zijn.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze thuisserver niet aan een Matrix-ID gekoppeld.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Uw wachtwoord is gewijzigd. U zult op andere apparaten pas weer pushmeldingen ontvangen nadat u zich er opnieuw op aangemeld heeft",
     "You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
     "You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.",
@@ -395,8 +361,6 @@
     "(~%(count)s results)|one": "(~%(count)s resultaat)",
     "(~%(count)s results)|other": "(~%(count)s resultaten)",
     "Active call": "Actieve oproep",
-    "bold": "vetgedrukt",
-    "italic": "schuingedrukt",
     "Please select the destination room for this message": "Selecteer het bestemmingsgesprek voor dit bericht",
     "New Password": "Nieuw wachtwoord",
     "Start automatically after system login": "Automatisch starten na systeemaanmelding",
@@ -422,20 +386,11 @@
     "Unknown error": "Onbekende fout",
     "Incorrect password": "Onjuist wachtwoord",
     "To continue, please enter your password.": "Voer uw wachtwoord in om verder te gaan.",
-    "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:": "Neem op een andere manier (bv. persoonlijk of telefonisch) contact op met de eigenaar om te controleren of dit apparaat vertrouwd kan worden, en vraag of de sleutel voor dit apparaat in hun Gebruikersinstellingen gelijk is aan onderstaande sleutel:",
-    "Device name": "Apparaatnaam",
-    "Device key": "Apparaatssleutel",
-    "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.": "Klik hieronder op de knop ‘Verifiëren’ als de sleutels overeenkomen. Zo niet drukt u op de knop ‘Blokkeren’, want dan onderschept iemand berichten naar dit apparaat.",
     "Blacklist": "Blokkeren",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Momenteel sluit u ongeverifieerde apparaten uit; om daar berichten aan te sturen dient u ze te verifiëren.",
     "Unblacklist": "Deblokkeren",
-    "Verify device": "Apparaat verifiëren",
     "I verify that the keys match": "Ik verifieer dat de sleutels overeenkomen",
     "Unable to restore session": "Sessieherstel lukt niet",
     "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.": "Als u reeds een recentere versie van Riot heeft gebruikt is uw sessie mogelijk onverenigbaar met deze versie. Sluit dit venster en ga terug naar die recentere versie.",
-    "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 raden u aan ieder apparaat te verifiëren om zo vast te stellen of ze tot de rechtmatige eigenaar behoren, maar u kunt het bericht desgewenst ook zonder verificatie versturen.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "Aan ‘%(RoomName)s’ nemen apparaten deel die u nog niet eerder heeft gezien.",
-    "Unknown devices": "Onbekende apparaten",
     "Unknown Address": "Onbekend adres",
     "Unverify": "Ontverifiëren",
     "Verify...": "Verifiëren…",
@@ -476,8 +431,6 @@
     "Start verification": "Verificatie starten",
     "Share without verifying": "Delen zonder verificatie",
     "Ignore request": "Verzoek negeren",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "U heeft een nieuw apparaat ‘%(displayName)s’ toegevoegd, dat om versleutelingssleutels vraagt.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Uw ongeverifieerde apparaat ‘%(displayName)s’ vraagt naar versleutelingssleutels.",
     "Encryption key request": "Verzoek voor versleutelingssleutel",
     "Define the power level of a user": "Bepaal het machtsniveau van een gebruiker",
     "Add a widget": "Widget toevoegen",
@@ -494,8 +447,6 @@
     "Unable to create widget.": "Kan widget niet aanmaken.",
     "You are not in this room.": "U maakt geen deel uit van dit gesprek.",
     "You do not have permission to do that in this room.": "U bent niet bevoegd dat in dit gesprek te doen.",
-    "Verifies a user, device, and pubkey tuple": "Verifieert een combinatie van gebruiker, apparaat en publieke sleutel",
-    "Loading device info...": "Apparaatinformatie wordt geladen…",
     "Example": "Voorbeeld",
     "Create": "Aanmaken",
     "Featured Rooms:": "Prominente gesprekken:",
@@ -517,7 +468,6 @@
     "Which rooms would you like to add to this community?": "Welke gesprekken wilt u toevoegen aan deze gemeenschap?",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widgets verwijderen geldt voor alle deelnemers aan dit gesprek. Weet u zeker dat u deze widget wilt verwijderen?",
     "Delete Widget": "Widget verwijderen",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende apparaten: tenzij u die verifieert zou iemand uw oproep kunnen afluisteren.",
     "Review Devices": "Apparaten nakijken",
     "Call Anyway": "Toch bellen",
     "Answer Anyway": "Toch beantwoorden",
@@ -543,8 +493,6 @@
     "Enable inline URL previews by default": "Inline URL-voorvertoning standaard inschakelen",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoning in dit gesprek inschakelen (geldt alleen voor u)",
     "Enable URL previews by default for participants in this room": "URL-voorvertoning standaard voor alle deelnemers aan dit gesprek inschakelen",
-    "Delete %(count)s devices|other": "%(count)s apparaten verwijderen",
-    "Delete %(count)s devices|one": "Apparaat verwijderen",
     "%(senderName)s sent an image": "%(senderName)s heeft een afbeelding gestuurd",
     "%(senderName)s sent a video": "%(senderName)s heeft een video gestuurd",
     "%(senderName)s uploaded a file": "%(senderName)s heeft een bestand geüpload",
@@ -721,7 +669,6 @@
     "Error whilst fetching joined communities": "Er is een fout opgetreden bij het ophalen van de gemeenschappen waarvan u lid bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en gesprekken bijeen te brengen! Schep met een startpagina op maat uw eigen plaats in het Matrix-universum.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Apparaten weergeven</showDevicesText>, <sendAnywayText>toch versturen</sendAnywayText> of <cancelText>annuleren</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Uw bericht is niet verstuurd.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alles nu opnieuw versturen</resendText> of <cancelText>annuleren</cancelText>. U kunt ook individuele berichten selecteren om opnieuw te versturen of te annuleren.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Bericht opnieuw versturen</resendText> of <cancelText>bericht annuleren</cancelText>.",
@@ -751,11 +698,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek.  Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
     "were unbanned %(count)s times|one": "zijn ontbannen",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft %(displayName)s als weergavenaam aangenomen.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Uw sleuteldeelverzoek is verstuurd - controleer uw andere apparaten voor sleuteldeelverzoeken.",
-    "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.": "Sleuteldeelverzoeken worden automatisch naar andere apparaten verstuurd. Als u het verzoek heeft afgewezen of gesloten, klik dan hier om de sleutels van deze sessie opnieuw aan te vragen.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "U zult dit bericht niet kunnen ontcijferen als geen van uw andere apparaten er de sleutel voor heeft.",
     "Key request sent.": "Sleutelverzoek verstuurd.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Versleutelingssleutels opnieuw aanvragen</requestLink> van uw andere apparaten.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Wist u dat: u gemeenschappen kunt gebruiken om uw Riot.im-beleving te filteren!",
     "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.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en mensen uit die gemeenschap.",
     "Clear filter": "Filter wissen",
@@ -824,7 +767,6 @@
     "Noisy": "Lawaaierig",
     "Collecting app version information": "App-versieinformatie wordt verzameld",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De bijnaam %(alias)s verwijderen en %(name)s uit de catalogus verwijderen?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
     "Keywords": "Trefwoorden",
     "Enable notifications for this account": "Meldingen inschakelen voor deze account",
     "Invite to this community": "Uitnodigen in deze gemeenschap",
@@ -915,8 +857,6 @@
     "Always show encryption icons": "Versleutelingspictogrammen altijd tonen",
     "Send analytics data": "Statistische gegevens (analytics) versturen",
     "Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
-    "Unable to reply": "Kan niet reageren",
-    "At this time it is not possible to reply with an emote.": "Het is nog niet mogelijk met een emoticon te reageren.",
     "Muted Users": "Gedempte gebruikers",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Help Riot.im te verbeteren door <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink> te versturen. Dit zal een cookie gebruiken (bekijk hiervoor ons <PolicyLink>cookiebeleid</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Help Riot.im te verbeteren door <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink> te versturen. Dit zal een cookie gebruiken.",
@@ -948,12 +888,6 @@
     "Demote yourself?": "Uzelf degraderen?",
     "Demote": "Degraderen",
     "Share Link to User": "Koppeling naar gebruiker delen",
-    "deleted": "verwijderd",
-    "underlined": "onderstreept",
-    "inline-code": "code",
-    "block-quote": "citaat",
-    "bulleted-list": "opsomming",
-    "numbered-list": "genummerde lijst",
     "Share room": "Gesprek delen",
     "System Alerts": "Systeemmeldingen",
     "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 versleutelde gesprekken zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw thuisserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
@@ -1080,7 +1014,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm de volgende emoji toont.",
     "Verify this user by confirming the following number appears on their screen.": "Verifieer deze gebruiker door te bevestigen dat hun scherm het volgende getal toont.",
     "Unable to find a supported verification method.": "Kan geen ondersteunde verificatiemethode vinden.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Voor maximale veiligheid kunt u dit het beste persoonlijk, of via een ander vertrouwd communicatiemedium, doen.",
     "Dog": "Hond",
     "Cat": "Kat",
     "Lion": "Leeuw",
@@ -1127,7 +1060,6 @@
     "Pencil": "Potlood",
     "Paperclip": "Paperclip",
     "Scissors": "Schaar",
-    "Padlock": "Hangslot",
     "Key": "Sleutel",
     "Hammer": "Hamer",
     "Telephone": "Telefoon",
@@ -1145,7 +1077,6 @@
     "Headphones": "Koptelefoon",
     "Folder": "Map",
     "Pin": "Speld",
-    "Your homeserver does not support device management.": "Uw thuisserver ondersteunt geen apparaatbeheer.",
     "Yes": "Ja",
     "No": "Nee",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We hebben u een e-mail gestuurd om uw adres te verifiëren. Gelieve de daarin gegeven aanwijzingen op te volgen en dan op de knop hieronder te klikken.",
@@ -1155,30 +1086,19 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Versleutelde berichten zijn beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen.",
     "Unable to load key backup status": "Kan sleutelback-upstatus niet laden",
     "Restore from Backup": "Herstellen uit back-up",
-    "This device is backing up your keys. ": "Dit apparaat maakt een back-up van uw sleutels. ",
     "Back up your keys before signing out to avoid losing them.": "Maak een back-up van uw sleutels vooraleer u zich afmeldt om ze niet te verliezen.",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleutels worden geback-upt…",
     "All keys backed up": "Alle sleutels zijn geback-upt",
-    "Backup has a <validity>valid</validity> signature from this device": "De back-up heeft een <validity>geldige</validity> ondertekening van dit apparaat",
-    "Backup is not signed by any of your devices": "De back-up is door geen van uw apparaten ondertekend",
-    "This backup is trusted because it has been restored on this device": "Deze back-up wordt vertrouwd, omdat hij op dit apparaat hersteld is",
     "Backup version: ": "Back-upversie: ",
     "Algorithm: ": "Algoritme: ",
     "Chat with Riot Bot": "Met Riot-robot chatten",
     "Forces the current outbound group session in an encrypted room to be discarded": "Dwingt tot verwerping van de huidige uitwaartse groepssessie in een versleuteld gesprek",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "De back-up heeft een ondertekening van een <verify>onbekend</verify> apparaat met ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "De back-up heeft een <validity>geldige</validity> ondertekening van een <verify>geverifieerd</verify> apparaat <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "De back-up heeft een <validity>geldige</validity> ondertekening van een <verify>ongeverifieerd</verify> apparaat <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "De back-up heeft een <validity>ongeldige</validity> ondertekening van een <verify>geverifieerd</verify> apparaat <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "De back-up heeft een <validity>ongeldige</validity> ondertekening van een <verify>ongeverifieerd</verify> apparaat <device></device>",
-    "Your keys are <b>not being backed up from this device</b>.": "Uw sleutels worden <b>niet geback-upt van dit apparaat</b>.",
     "Start using Key Backup": "Begin sleutelback-up te gebruiken",
     "Add an email address to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen in te stellen",
     "Unable to verify phone number.": "Kan telefoonnummer niet verifiëren.",
     "Verification code": "Verificatiecode",
     "Phone Number": "Telefoonnummer",
     "Profile picture": "Profielfoto",
-    "Upload profile picture": "Profielfoto uploaden",
     "<a>Upgrade</a> to your own domain": "<a>Waardeer op</a> naar uw eigen domein",
     "Display Name": "Weergavenaam",
     "Set a new account password...": "Stel een nieuw accountwachtwoord in…",
@@ -1240,10 +1160,6 @@
     "Encryption": "Versleuteling",
     "Once enabled, encryption cannot be disabled.": "Eenmaal ingeschakeld kan versleuteling niet meer worden uitgeschakeld.",
     "Encrypted": "Versleuteld",
-    "Some devices for this user are not trusted": "Er worden enkele apparaten van deze gebruiker niet vertrouwd",
-    "Some devices in this encrypted room are not trusted": "Er worden enkele apparaten in dit versleutelde gesprek niet vertrouwd",
-    "All devices for this user are trusted": "Alle apparaten van deze gebruiker worden vertrouwd",
-    "All devices in this encrypted room are trusted": "Alle apparaten in dit versleutelde gesprek worden vertrouwd",
     "This room has been replaced and is no longer active.": "Dit gesprek is vervangen en niet langer actief.",
     "The conversation continues here.": "Het gesprek gaat hier verder.",
     "Never lose encrypted messages": "Verlies nooit uw versleutelde berichten",
@@ -1263,8 +1179,6 @@
     "Error updating flair": "Fout bij bijwerken van badge",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek.  Wellicht ondersteunt de server dit niet, of er is een tijdelijke fout opgetreden.",
     "Room avatar": "Gespreksavatar",
-    "Upload room avatar": "Gespreksavatar uploaden",
-    "No room avatar": "Geen gespreksavatar",
     "Room Name": "Gespreksnaam",
     "Room Topic": "Gespreksonderwerp",
     "This room is a continuation of another conversation.": "Dit gesprek is een voortzetting van een ander gesprek.",
@@ -1294,7 +1208,6 @@
     "Waiting for %(userId)s to confirm...": "Wachten op bevestiging van %(userId)s…",
     "Use two-way text verification": "Tweerichtingstekstverificatie gebruiken",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze gebruiker om hem/haar als vertrouwd te markeren. Gebruikers vertrouwen geeft u extra gemoedsrust bij het gebruik van eind-tot-eind-versleutelde berichten.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Deze gebruiker verifiëren zal hun apparaat als vertrouwd markeren, en ook uw apparaat voor hen als vertrouwd markeren.",
     "Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
     "Incoming Verification Request": "Inkomend verificatieverzoek",
     "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.": "U heeft voorheen Riot op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. Omdat de lokale cache niet compatibel is tussen deze twee instellingen, moet Riot uw account opnieuw synchroniseren.",
@@ -1341,7 +1254,6 @@
     "This looks like a valid recovery key!": "Dit is een geldige herstelsleutel!",
     "Not a valid recovery key": "Geen geldige herstelsleutel",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrijg toegang tot uw beveiligde berichtgeschiedenis en stel beveiligd chatten in door uw herstelsleutel in te voeren.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Als u uw herstelwachtwoord vergeten bent, kunt u <button>nieuwe herstelopties instellen</button>",
     "Share Permalink": "Permalink delen",
     "Clear status": "Status wissen",
     "Update status": "Status bijwerken",
@@ -1382,12 +1294,10 @@
     "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.": "Uw bericht is niet verstuurd omdat deze thuisserver een systeembronlimiet heeft overschreden. Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
     "Guest": "Gast",
     "Could not load user profile": "Kon gebruikersprofiel niet laden",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Uw wachtwoord opnieuw instellen zal alle sleutels voor eind-tot-eind-versleuteling op al uw apparaten opnieuw instellen, waardoor uw versleutelde gesprekgeschiedenis onleesbaar wordt. Stel sleutelback-up in of exporteer uw gesprekssleutels vanaf een ander apparaat vooraleer u uw wachtwoord opnieuw instelt.",
     "Your Matrix account on %(serverName)s": "Uw Matrix-account op %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Er is een verificatie-e-mail naar u gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.",
     "Sign in instead": "Aanmelden",
     "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.",
-    "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.": "U bent afgemeld op al uw apparaten en zult geen pushmeldingen meer ontvangen. Meld u op elk apparaat opnieuw aan om weer meldingen te ontvangen.",
     "Set a new password": "Stel een nieuw wachtwoord in",
     "Invalid homeserver discovery response": "Ongeldig thuisserverontdekkingsantwoord",
     "Invalid identity server discovery response": "Ongeldig identiteitsserverontdekkingsantwoord",
@@ -1414,17 +1324,13 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet kunt u dit gebruiken om uw versleutelde berichtgeschiedenis te herstellen indien u uw herstelwachtwoord zou vergeten.",
     "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet kunt u het gebruiken om uw versleutelde berichtgeschiedenis te herstellen.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Uw herstelsleutel is een veiligheidsnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen indien u uw wachtwoord zou vergeten.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Bewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)",
     "Your Recovery Key": "Uw herstelsleutel",
     "Copy to clipboard": "Kopiëren naar klembord",
     "Download": "Downloaden",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Uw herstelsleutel is <b>gekopieerd naar uw klembord</b>, plak hem in:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
     "<b>Print it</b> and store it somewhere safe": "<b>Druk hem af</b> en bewaar hem op een veilige plaats",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sla hem op</b> op een USB-stick of een back-upschijf",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopieer hem</b> naar uw persoonlijke cloudopslag",
     "Your keys are being backed up (the first backup could take a few minutes).": "Er wordt een back-up van uw sleutels gemaakt (de eerste back-up kan enkele minuten duren).",
-    "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.": "Zonder veilig berichtherstel in te stellen, zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen indien u zich afmeldt of een ander apparaat gebruikt.",
     "Set up Secure Message Recovery": "Veilig berichtherstel instellen",
     "Secure your backup with a passphrase": "Beveilig uw back-up met een wachtwoord",
     "Confirm your passphrase": "Bevestig uw wachtwoord",
@@ -1442,24 +1348,15 @@
     "New Recovery Method": "Nieuwe herstelmethode",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Er zijn een nieuw herstelwachtwoord en een nieuwe herstelsleutel voor beveiligde berichten gedetecteerd.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
-    "This device is encrypting history using the new recovery method.": "Dit apparaat versleutelt de geschiedenis met de nieuwe herstelmethode.",
     "Go to Settings": "Ga naar instellingen",
     "Set up Secure Messages": "Beveiligde berichten instellen",
     "Recovery Method Removed": "Herstelmethode verwijderd",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Dit apparaat heeft gedetecteerd dat uw herstelwachtwoord en -sleutel voor beveiligde berichten verwijderd zijn.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Als u dit per ongeluk heeft gedaan, kunt u beveiligde berichten instellen op dit apparaat, waarmee de berichtgeschiedenis van dit apparaat herversleuteld zal worden met een nieuwe herstelmethode.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
-    "Room upgrade confirmation": "Bevestiging voor bijwerken van gesprek",
-    "Upgrading a room can be destructive and isn't always necessary.": "Het bijwerken van een gesprek is niet altijd nodig, en soms destructief.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gespreksopwaarderingen worden meestal aanbevolen wanneer een bepaalde groepsgespreksversie als <i>onstabiel</i> wordt beschouwd. Onstabiele groepsgespreksversies bevatten mogelijk bugs of beveiligingsproblemen, of beschikken niet over alle functies.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gespreksopwaarderingen beïnvloeden meestal enkel de verwerking van het gesprek <i>aan serverzijde</i>. Indien u problemen ondervindt met uw Riot-cliënt, gelieve dit dan te melden op <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let op</b>: gesprekken bijwerken <i>voegt gespreksleden niet automatisch toe aan de nieuwe versie van het gesprek</i>. Er komt in het oude gesprek een koppeling naar het nieuwe, waarop gespreksleden moeten klikken om aan het nieuwe gesprek deel te nemen.",
     "Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan het gesprek",
     "Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "U kunt de widgets in dit gesprek niet aanpassen.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging voor %(targetDisplayName)s om toe te treden tot het gesprek ingetrokken.",
-    "Enable desktop notifications for this device": "Bureaubladmeldingen inschakelen voor dit apparaat",
-    "Enable audible notifications for this device": "Geluidsmeldingen inschakelen voor dit apparaat",
     "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze thuisserver als <i>onstabiel</i> is gemarkeerd.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Bijwerken zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een bijgewerkte versie starten.",
@@ -1504,8 +1401,6 @@
     "A conference call could not be started because the integrations server is not available": "Daar de integratieserver onbereikbaar is kon het groepsaudiogesprek niet gestart worden",
     "The server does not support the room version specified.": "De server ondersteunt deze versie van gesprekken niet.",
     "Name or Matrix ID": "Naam of Matrix-ID",
-    "Email, name or Matrix ID": "E-mailadres, naam, of matrix-ID",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Gelieve het bijwerken van dit gesprek van <oldVersion /> tot <newVersion /> te bevestigen.",
     "Changes your avatar in this current room only": "Verandert uw avatar enkel in het huidige gesprek",
     "Unbans user with given ID": "Ontbant de gebruiker met de gegeven ID",
     "Sends the given message coloured as a rainbow": "Verstuurt het gegeven bericht in regenboogkleuren",
@@ -1515,10 +1410,6 @@
     "The user's homeserver does not support the version of the room.": "De thuisserver van de gebruiker biedt geen ondersteuning voor de gespreksversie.",
     "Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
     "When rooms are upgraded": "Wanneer gesprekken bijgewerkt worden",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dit apparaat <b>maakt geen back-up van uw sleutels</b>, maar u heeft wel een bestaande back-up die u kunt herstellen, en waaraan u vervolgens nieuwe sleutels kunt toevoegen.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbind dit apparaat met de sleutelback-up vooraleer u zich afmeldt om sleutels die zich enkel op dit apparaat bevinden niet te verliezen.",
-    "Connect this device to Key Backup": "Dit apparaat verbinden met sleutelback-up",
-    "Backup has an <validity>invalid</validity> signature from this device": "De back-up heeft een <validity>ongeldige</validity> ondertekening van dit apparaat",
     "this room": "dit gesprek",
     "View older messages in %(roomName)s.": "Bekijk oudere berichten in %(roomName)s.",
     "Joining room …": "Deelnemen aan gesprek…",
@@ -1611,8 +1502,6 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s heeft niets gewijzigd",
     "Changes your avatar in all rooms": "Verandert uw avatar in alle gesprekken",
     "Removing…": "Bezig met verwijderen…",
-    "Clear all data on this device?": "Alle gegevens op dit apparaat wissen?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Gewiste gegevens kunnen niet teruggehaald worden. Versleutelde berichten zullen verloren gaan, tenzij hun sleutels geback-upt zijn.",
     "Clear all data": "Alle gegevens wissen",
     "Your homeserver doesn't seem to support this feature.": "Uw thuisserver biedt geen ondersteuning voor deze functie.",
     "Resend edit": "Bewerking opnieuw versturen",
@@ -1624,7 +1513,6 @@
     "Forgotten your password?": "Wachtwoord vergeten?",
     "You're signed out": "U bent afgemeld",
     "Clear personal data": "Persoonlijke gegevens wissen",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (inclusief versleutelingssleutels) worden nog steeds op dit apparaat opgeslagen. Wis deze wanneer u klaar bent met het apparaat te gebruiken, of wanneer u zich wilt aanmelden met een andere account.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Laat ons weten wat er verkeerd is gegaan, of nog beter, maak een foutrapport aan op GitHub, waarin u het probleem beschrijft.",
     "Identity Server": "Identiteitsserver",
     "Find others by phone or email": "Vind anderen via telefoonnummer of e-mailadres",
@@ -1633,11 +1521,9 @@
     "Terms of Service": "Gebruiksvoorwaarden",
     "Service": "Dienst",
     "Summary": "Samenvatting",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Verkrijg opnieuw toegang tot uw account en herstel de versleutelingssleutels die opgeslagen zijn op dit apparaat. Zonder deze sleutels zult u uw versleutelde berichten niet kunnen lezen op andere apparaten.",
     "Sign in and regain access to your account.": "Meld u aan en verkrijg opnieuw toegang tot uw account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt zich niet aanmelden met uw account. Neem contact op met de beheerder van uw thuisserver voor meer informatie.",
     "This account has been deactivated.": "Deze account is gedeactiveerd.",
-    "Failed to start chat": "Gesprek beginnen is mislukt",
     "Messages": "Berichten",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toont een lijst van beschikbare opdrachten, met hun gebruiken en beschrijvingen",
@@ -1665,7 +1551,6 @@
     "Please enter verification code sent via text.": "Voer de verificatiecode in die werd verstuurd via sms.",
     "Discovery options will appear once you have added a phone number above.": "Ontdekkingsopties zullen verschijnen wanneer u een telefoonnummer hebt toegevoegd.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Er is een sms verstuurd naar +%(msisdn)s. Voor de verificatiecode in die in het bericht staat.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Controleer of de sleutel die u in uw Gebruikersinstellingen op dat apparaat ziet overeenkomt met de sleutel hieronder om te verifiëren dat het apparaat vertrouwd kan worden:",
     "Command Help": "Hulp bij opdrachten",
     "No identity server is configured: add one in server settings to reset your password.": "Er is geen identiteitsserver geconfigureerd: voeg er één toe in de serverinstellingen om uw wachtwoord opnieuw in te stellen.",
     "Call failed due to misconfigured server": "Oproep mislukt door verkeerd geconfigureerde server",
@@ -1703,7 +1588,6 @@
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aanvaard de gebruiksvoorwaarden van de identiteitsserver (%(serverName)s) om vindbaar te zijn op e-mailadres of telefoonnummer.",
     "Read Marker lifetime (ms)": "Levensduur van leesbevestigingen (ms)",
     "Read Marker off-screen lifetime (ms)": "Levensduur van levensbevestigingen, niet op scherm (ms)",
-    "A device's public name is visible to people you communicate with": "De openbare naam van een apparaat is zichtbaar aan alle mensen met wie u communiceert",
     "Upgrade the room": "Werk het gesprek bij",
     "Enable room encryption": "Gespreksversleuteling inschakelen",
     "Error changing power level requirement": "Fout bij wijzigen van machtsniveauvereiste",
@@ -1752,7 +1636,6 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Zoek een gesprek… (bv. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u het gesprek dat u zoekt niet kunt vinden, vraag dan een uitnodiging, of <a>Maak een nieuw gesprek aan</a>.",
     "Explore rooms": "Gesprekken ontdekken",
-    "Use the new, faster, composer for writing messages": "Gebruik de nieuwe, snellere opsteller om berichten te schrijven",
     "Show previews/thumbnails for images": "Toon voorbeelden voor afbeeldingen",
     "Clear cache and reload": "Cache wissen en herladen",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan worden gemaakt. Wilt u doorgaan?",
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index fc0b042bab..dd95ea89bf 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -6,7 +6,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Informasjonen som vert send til oss for å gjera Riot.im betre er mellom anna:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Der denne sida inneheld gjenkjenneleg informasjon, slik som ein rom-, brukar- eller gruppeID, vert denne informasjonen sletta før han sendast til tenar.",
     "Call Failed": "Oppringjing Mislukkast",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finst ukjende einingar i dette rommet: viss du gjeng frama utan å godkjenna dei, kan nokon mogelegvis tjuvlytta på samtala.",
     "Review Devices": "Sjå Over Einingar",
     "Call Anyway": "Ring Likevel",
     "Answer Anyway": "Svar Likevel",
@@ -71,10 +70,6 @@
     "Moderator": "Moderator",
     "Admin": "Administrator",
     "Start a chat": "Start ei samtale",
-    "Who would you like to communicate with?": "Kven vil du koma i kontakt med?",
-    "Start Chat": "Start ei Samtale",
-    "Invite new room members": "Byd nye rommedlemer inn",
-    "Send Invites": "Send Innbydingar",
     "Operation failed": "Handling mislukkast",
     "Failed to invite": "Fekk ikkje til å byda inn",
     "Failed to invite the following users to the %(roomName)s room:": "Dei fylgjande brukarane lét seg ikkje byda inn til %(roomName)s:",
@@ -122,17 +117,12 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka han, vent på at resultata fyller seg ut og tab gjennom dei.",
     "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
     "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
-    "Verifies a user, device, and pubkey tuple": "Godkjenner ein brukar, eining og offentleg-nykeltuppel",
     "Unverify": "Fjern godkjenning",
     "Verify...": "Godkjenn...",
     "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
     "The remote side failed to pick up": "Den andre sida tok ikkje røret",
-    "Unknown (user, device) pair:": "Ukjend (brukar, eining)-par:",
-    "Device already verified!": "Eininga er allereie godkjend!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ÅTVARING: Eininga er allereie godkjend, men nyklane SAMSVARER IKKJE!",
     "Verified key": "Godkjend nykel",
     "Displays action": "Visar handlingar",
-    "Unrecognised command:": "Ukjend påbod:",
     "Reason": "Grunnlag",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s sa ja til innbydinga frå %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s sa ja til ei innbyding.",
@@ -170,7 +160,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg for alle rommedlemer.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde den framtidige romhistoria tilgjengelg for kven som helst.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg til ukjende (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s skrudde ende-til-ende-kryptering på (%(algorithm)s-algoritmen).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s frå %(fromPowerLevel)s til %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s endra makthøgda til %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s endra dei festa meldingane i rommet.",
@@ -197,8 +186,6 @@
     "Automatically replace plain text Emoji": "Erstatt Emojiar i plaintekst av seg sjølv",
     "Mirror local video feed": "Spegl den lokale videofeeden",
     "Send analytics data": "Send statistikkdata",
-    "Never send encrypted messages to unverified devices from this device": "Send aldri krypterte meldingar til ikkje-godkjende einingar frå denne eininga",
-    "Never send encrypted messages to unverified devices in this room from this device": "Send aldri krypterte meldingar til ikkje-godkjende einingar i dette rommet frå denne eininga",
     "Enable URL previews for this room (only affects you)": "Skru URL-førehandsvisingar på for dette rommet (påverkar deg åleine)",
     "Enable URL previews by default for participants in this room": "Skru URL-førehandsvisingar på som utgangspunkt for deltakarar i dette rommet",
     "Room Colour": "Romfarge",
@@ -238,10 +225,7 @@
     "New Password": "Nytt Passord",
     "Confirm password": "Stadfest passord",
     "Change Password": "Endra Passord",
-    "Unable to load device list": "Klarte ikkje å lasta einingslista",
     "Authentication": "Godkjenning",
-    "Delete %(count)s devices|other": "Slett %(count)s einingar",
-    "Delete %(count)s devices|one": "Slett eining",
     "Device ID": "EiningsID",
     "Last seen": "Sist sedd",
     "Failed to set display name": "Fekk ikkje til å setja visingsnamn",
@@ -280,13 +264,7 @@
     "%(senderName)s sent a video": "%(senderName)s sende ein video",
     "%(senderName)s uploaded a file": "%(senderName)s lasta ei fil opp",
     "Options": "Innstillingar",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Nykeldelingsforespurnaden din vart send - ver venleg og sjekk dei andre einingane dine for nykeldelingsforespurnadar.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Viss dei andre einingane dine ikkje har nykelen til denne meldinga kan du ikkje dekryptera ho.",
     "Key request sent.": "Nykelforespurnad er send.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Spør på nytt om krypteringsnyklar</requestLink> frå dei andre einingane dine.",
-    "Undecryptable": "Kan ikkje dekrypterast",
-    "Encrypted by an unverified device": "Kryptert av ei ikkje-godkjent eining",
-    "Unencrypted message": "Ikkje-kryptert melding",
     "Please select the destination room for this message": "Ver venleg og vel målrommet for denne meldinga",
     "Blacklisted": "Svartelista",
     "device id: ": "einingsID: ",
@@ -308,8 +286,6 @@
     "Failed to change power level": "Fekk ikkje til å endra makthøgda",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kjem ikkje til å kunna gjera om på denne endringa sidan du set brukaren si høgd opp til di eiga.",
     "Are you sure?": "Er du sikker?",
-    "No devices with registered encryption keys": "Ingen einingar med oppskrivne krypteringsnykler",
-    "Devices": "Einingar",
     "Unignore": "Slutt å oversjå",
     "Ignore": "Oversjå",
     "Mention": "Nemn",
@@ -327,32 +303,20 @@
     "and %(count)s others...|one": "og ein til...",
     "Invited": "Innboden",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (makthøgd %(powerLevelNumber)s)",
-    "bold": "feit",
-    "italic": "skeiv",
-    "deleted": "sletta",
-    "underlined": "understreka",
-    "bulleted-list": "punktliste",
-    "numbered-list": "talliste",
     "Attachment": "Vedlegg",
     "Hangup": "Legg på",
     "Voice call": "Røystesamtale",
     "Video call": "Videosamtale",
     "Upload file": "Last ei fil opp",
-    "Show Text Formatting Toolbar": "Vis Tekstformverktøylinje",
     "Send an encrypted reply…": "Send eit kryptert svar…",
     "Send a reply (unencrypted)…": "Send eit svar (ikkje-kryptert)…",
     "Send an encrypted message…": "Send ei kryptert melding…",
     "Send a message (unencrypted)…": "Send ei melding (ikkje-kryptert)…",
     "You do not have permission to post to this room": "Du har ikkje tillating til å senda meldingar i dette rommet",
-    "Hide Text Formatting Toolbar": "Gøym Tekstformverktøylinje",
     "Server error": "Noko gjekk gale med tenaren",
     "Server unavailable, overloaded, or something else went wrong.": "tenaren var utilgjengeleg, overlasta, elles so gjekk noko anna galt.",
     "Command error": "Noko gjekk gale med påbodet",
     "The maximum permitted number of widgets have already been added to this room.": "Det største mogelege talet widgets finst allereie på dette rommet.",
-    "Unable to reply": "Klarte ikkje å svara",
-    "At this time it is not possible to reply with an emote.": "Det er førebels ikkje mogeleg å svara med ein emote.",
-    "Markdown is disabled": "Markdown er skrudd av",
-    "Markdown is enabled": "Markdown er skrudd på",
     "Unpin Message": "Tak ned festa Melding",
     "Jump to message": "Hopp til melding",
     "No pinned messages.": "Inga festa meldingar.",
@@ -388,7 +352,6 @@
     "Community Invites": "Samfunnsinnbydingar",
     "Invites": "Innbydingar",
     "Favourites": "Yndlingar",
-    "People": "Folk",
     "Rooms": "Rom",
     "Low priority": "Lågrett",
     "System Alerts": "Systemvarsel",
@@ -430,8 +393,6 @@
     "Show Stickers": "Vis Klistremerkar",
     "Jump to first unread message.": "Hopp til den fyrste ulesne meldinga.",
     "Close": "Lukk",
-    "Invalid alias format": "Ugangbar aliasform",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' er ikkje ei gangbar aliasform",
     "Remote addresses for this room:": "Fjernadresser for dette rommet:",
     "Local addresses for this room:": "Lokaladresser for dette rommet:",
     "This room has no local addresses": "Dette rommer har ingen lokaladresser",
@@ -633,10 +594,6 @@
     "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.": "Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine tyder at meldingar du har send ikkje vil verta delt med nye, ikkje-innmeldte brukarar, men brukare som er meldt på som allereie har tilgang til desse meldingane vil fortsatt kunne sjå kopien deira.",
     "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)": "Ver venleg og gløym alle meldingane eg har send når brukaren min vert avliven (<b>Åtvaring:</b> dette gjer at framtidige brukarar ikkje fær eit fullstendig oversyn av samtalene)",
     "To continue, please enter your password:": "For å gå fram, ver venleg og skriv passordet ditt inn:",
-    "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:": "For å godkjenna at denne eininga er til å stola på, ver venleg og snakk med eiaren på ei anna måte (t.d. ansikt til ansikt eller på telefon) og spør dei om nykelen dei ser i Brukarinnstillingane for denne eininga samsvarar med nykelen under:",
-    "Device name": "Einingsnamn",
-    "Device key": "Einingsnykel",
-    "Verify device": "Godkjenn eining",
     "I verify that the keys match": "Eg stadfestar at nyklane samsvarar",
     "Back": "Attende",
     "Event sent!": "Hending send!",
@@ -648,12 +605,9 @@
     "Toolbox": "Verktøykasse",
     "Developer Tools": "Utviklarverktøy",
     "An error has occurred.": "Noko gjekk gale.",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Du la til den nye eininga '%(displayName)s', som spør om krypteringsnyklar.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Den ikkje-godkjende eininga di '%(displayName)s' spør om krypteringsnyklar.",
     "Start verification": "Byrj godkjenning",
     "Share without verifying": "Del utan å godkjenna",
     "Ignore request": "Oversjå førespurnad",
-    "Loading device info...": "Lastar einingsinfo inn...",
     "Encryption key request": "Krypteringsnykel-førespurnad",
     "Sign out": "Logg ut",
     "Clear Storage and Sign Out": "Tøm Lager og Logg Ut",
@@ -685,7 +639,6 @@
     "Failed to change password. Is your password correct?": "Fekk ikkje til å skifta passord. Er passordet rett?",
     "(HTTP status %(httpStatus)s)": "(HTTP-tilstand %(httpStatus)s)",
     "Please set a password!": "Ver venleg og set eit passord!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Dette tillèt deg å fara attende til brukaren din etter å ha logga ut, og å logga inn på andre einingar.",
     "Share Room": "Del Rom",
     "Link to most recent message": "Lenk til den nyaste meldinga",
     "Share User": "Del Brukar",
@@ -693,11 +646,6 @@
     "Share Room Message": "Del Rommelding",
     "Link to selected message": "Lenk til den valde meldinga",
     "COPY": "KOPIER",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Du set for augeblunket ikkje-godkjende einingar på svartelista; for å senda meldingar til desse einingane må du godkjenna dei.",
-    "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.": "Vi tilrår deg å gå gjennom godkjenninga for kvar av einingane for å vera sikker på at dei tilhøyrer sine rettmessige eigarar, men du kan senda meldinga på nytt utan å godkjenna viss du vil.",
-    "Room contains unknown devices": "Rommet inneheld ukjende einingar",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" inneheld einingar som du ikkje har sett før.",
-    "Unknown devices": "Ukjende einingar",
     "Private Chat": "Lukka Samtale",
     "Public Chat": "Offentleg Samtale",
     "Alias (optional)": "Alias (valfritt)",
@@ -808,8 +756,6 @@
     "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrixrom",
     "Fetching third party location failed": "Noko gjekk gale med hentinga tredjepartiplasseringa",
     "Scroll to bottom of page": "Blad til botnen",
-    "Message not sent due to unknown devices being present": "Meldinga vart ikkje send fordi ukjende einingar er til stades",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Vis einingar</showDevicesText>, <sendAnywayText>Send likevel</sendAnywayText> eller <cancelText>Bryt av</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kan ikkje senda meldingar før du ser over og seier deg einig i våre <consentLink>Vilkår og Føresetnader</consentLink>.",
     "%(count)s of your messages have not been sent.|other": "Nokre av meldingane dine vart ikkje sende.",
     "%(count)s of your messages have not been sent.|one": "Meldinga di vart ikkje send.",
@@ -840,13 +786,10 @@
     "Light theme": "Ljost preg",
     "Dark theme": "Dimt preg",
     "Success": "Det gjekk",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Passordet ditt vert endra. Du får ikkje push-varsel på andre einingar før du loggar inn att på dei",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
     "Import E2E room keys": "Hent E2E-romnyklar inn",
     "Cryptography": "Kryptografi",
-    "Device ID:": "Einings-ID:",
-    "Device key:": "Einingsnykel:",
     "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.": "Viss du har sendt inn ein bøgg gjennom GitHub, kan debøgg-loggar hjelpa oss med å finna problemet. Debøgg-loggar inneheld data om æpp-bruk, b.a. Brukarnamnet ditt, IDane eller aliasa på romma eller gruppene du har vitja og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at vi kan forbetre æppen.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, so vi samlar ikkje på personleg eller attkjenneleg data for statistikken vår.",
@@ -869,7 +812,6 @@
     "click to reveal": "klikk for å visa",
     "Homeserver is": "Heimtenaren er",
     "Identity Server is": "Identitetstenaren er",
-    "matrix-react-sdk version:": "matrix-react-sdk-utgåve:",
     "riot-web version:": "riot-web-utgåve:",
     "olm version:": "olm-utgåve:",
     "Failed to send email": "Fekk ikkje til å senda eposten",
@@ -910,7 +852,6 @@
     "Session ID": "Økt-ID",
     "End-to-end encryption information": "Ende-til-ende-krypteringsinfo",
     "Event information": "Hendingsinfo",
-    "Sender device information": "Info om avsendareininga",
     "Passphrases must match": "Passfrasane må vere identiske",
     "Passphrase must not be empty": "Passefrasefeltet kan ikkje vera tomt",
     "Enter passphrase": "Skriv inn passfrase",
@@ -918,14 +859,10 @@
     "You must specify an event type!": "Du må oppgje ein handlingssort!",
     "Call Timeout": "Tidsavbrot i Samtala",
     "Enable automatic language detection for syntax highlighting": "Skru automatisk måloppdaging på for syntax-understreking",
-    "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.": "Å endra passordet ditt attendestiller førebelst alle ende-til-ende-krypteringsnyklar på alle einingar, slik at kryptert pratehistorie vert uleseleg, med mindre du fyrst hentar romnyklane dine ut og hentar dei inn att etterpå. I framtida vil denne prosessen vera betre.",
     "Export E2E room keys": "Hent E2E-romnyklar ut",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Det kan henda at du stilte dei inn på ein annan klient enn Riot. Du kan ikkje stilla på dei i Riot men dei gjeld framleis",
-    "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.": "Nykeldelingsførespurnader vert sende til dei andre einingane dine av seg sjølv. Viss du sa nei til eller avviste førespurnadene på dei andre einingane, klikk her for å beda om nyklane for denne øykta på nytt.",
     "Jump to read receipt": "Hopp til lesen-lappen",
     "Filter room members": "Filtrer rommedlemer",
-    "inline-code": "kode-i-tekst",
-    "block-quote": "blokk-sitat",
     "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.": "Når nokon legg ein URL med i meldinga si, kan ei URL-førehandsvising visast for å gje meir info om lenkja slik som tittelen, skildringa, og eit bilete frå nettsida.",
     "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?": "Du held på å verta teken til ei tredje-partisside so du kan godkjenna brukaren din til bruk med %(integrationsUrl)s. Vil du gå fram?",
     "Token incorrect": "Teiknet er gale",
@@ -935,8 +872,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake (ver venleg og sjå på <PolicyLink>Datakakeretningslinene våre</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake.",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
-    "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!": "ÅTVARING: NOKO GJEKK GALT MED NYKELGODKJENNINGA! Signeringsnykelen til %(userId)s og eininga %(deviceId)s er \"%(fprint)s\", som ikkje er lik den gjevne nykelen \"%(fingerprint)s\". Dette kan tyda at nokon tjuvlyttar på kommuniseringa!",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnykelen du oppgav er lik signeringsnykelen du fekk frå %(userId)s si eining %(deviceId)s. Eininga merkast som godkjend.",
     "This room is not accessible by remote Matrix servers": "Rommet er ikkje tilgjengeleg for andre Matrix-heimtenarar",
     "Add an Integration": "Legg tillegg til",
     "Popout widget": "Popp widget ut",
@@ -945,7 +880,6 @@
     "Custom level": "Sjølvsett høgd",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Klarte ikkje å lasta handlinga som vert svara til. Anten finst ho ikkje elles har du ikkje tilgang til å sjå ho.",
     "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.": "Debøgg-loggar inneheld æppbrukdata slik som brukarnamnet ditt, IDane eller aliasane på romma eller gruppene du har vore i og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
-    "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.": "Vis dei er like, trykk på godkjenn-knappen under. Viss dei ikkje gjer det, tjuvlyttar nokon på eininga og du bør sannsynlegvis trykkja på svartelisting-knappen i staden.",
     "Send Custom Event": "Send Sjølvsett Hending",
     "Failed to send custom event.": "Fekk ikkje til å senda sjølvsett hending.",
     "State Key": "Tilstandsnykel",
@@ -992,14 +926,12 @@
     "Guest": "Gjest",
     "Your profile": "Din profil",
     "Could not load user profile": "Klarde ikkje å laste brukarprofilen",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Endring av passordet vil nullstille nøklar for ende-til-ende kryptering på alle eningane dine. Alle tidligare meldingar og historikk vil bli ulesbar. Aktiver sikkerheitskopiering for nøklar (Key Backup) eller eksporter romnøklane på ein annan eining før du nullstiller passordet.",
     "Your Matrix account on %(serverName)s": "Din Matrix-konto på %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Din Matrix-konto på <underlinedServerName />",
     "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetsserver er konfigurert: legg til ein i innstillingane for å nullstille passordet ditt.",
     "Sign in instead": "Logg inn istaden",
     "A verification email will be sent to your inbox to confirm setting your new password.": "For å stadfeste tilbakestilling av passordet, vil ein e-post vil bli sendt til din innboks.",
     "Your password has been reset.": "Passodet ditt vart nullstilt.",
-    "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.": "Du har blitt logga av frå alle einingane og vil ikkje lengre motta push-varslingar. For a reaktivere slike varsel, logg inn på nytt på kvar separate eining.",
     "Set a new password": "Sett nytt passord",
     "Invalid homeserver discovery response": "Ugyldig svar frå heimeserveren (discovery response)",
     "Failed to get autodiscovery configuration from server": "Kladte ikkje å hente automatisk oppsett frå server",
@@ -1025,14 +957,12 @@
     "Create your account": "Lag din konto",
     "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimeserveren",
     "Failed to re-authenticate": "Fekk ikkje til å re-autentisere",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Ta tilbake tilgang til din konto og gjenopprett krypteringsnøklar lagra på denne eininga. Du kan ikkje lese krypterte meldingar viss du ikkje har desse.",
     "Enter your password to sign in and regain access to your account.": "Skriv inn ditt passord for å logge på og ta tilbake tilgang til kontoen din.",
     "Forgotten your password?": "Gløymt passord ?",
     "Sign in and regain access to your account.": "Logg på og ta tilbake tilgang til din konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du har ikkje muligheit til å logge på kontoen din. Kontakt systemadministratoren for meir informasjon.",
     "You're signed out": "Du er no avlogga",
     "Clear personal data": "Fjern personlege data",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Åtvaring: Dine personelge data (inklusive krypteringsnøklar) er fortsatt lagra på denne eininga. Fjern dette viss du ikkje skal bruke kontoen på denne eininga, eller logge på med ein annan konto.",
     "Great! This passphrase looks strong enough.": "Flott! Denne passfrasen virkar til å vere sterk nok.",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Vi vil lagre ein kryptert kopi av nøklane dine på vår server. Vern sikkerheitskopien din med ein passfrase.",
     "For maximum security, this should be different from your account password.": "For maksimal sikkerheit, bør dette vere noko anna enn kontopassordet ditt.",
@@ -1046,17 +976,13 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Som eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken i tilfelle du gløymer gjennopprettingsnøkkelen.",
     "As a safety net, you can use it to restore your encrypted message history.": "Som eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Gjennopprettingsnøkkelen eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken i tilfelle du gløymer passfrasen.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Ta vare på gjenopprettingsnøkkelen din på ein trygg plass, som for eksempel i eit passordhandteringsprogram (eller ein safe)",
     "Your Recovery Key": "Gjenopprettingsnøkkelen din",
     "Copy to clipboard": "Kopier til utklippstavle",
     "Download": "Last ned",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Gjenopprettingsnøkkelen din har blitt <b>kopiert til utklippstavla</b>, lim den til:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Gjenopprettingsnøkkelen ligg i <b>Nedlastnings</b>-mappa.",
     "<b>Print it</b> and store it somewhere safe": "<b>Skriv ut</b> og ta vare på den på ein trygg stad",
     "<b>Save it</b> on a USB key or backup drive": "<b>Lagre</b> til ein USB-pinne eller sikkerheitskopidisk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopier den</b> til personleg skylagring",
     "Your keys are being backed up (the first backup could take a few minutes).": "Nøklane dine blir sikkerheitskopiert (den første kopieringa kan ta nokre minutt).",
-    "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.": "Loggar du av eller brukar ein annan einheit, vil du ikkje ha mulegheit til å hente fram historikk for krypterte meldingar med mindre sikker gjenoppretting for meldingar (Secure Message Recovery) er satt opp.",
     "Set up Secure Message Recovery": "Sett opp sikker gjenoppretting for meldingar",
     "Secure your backup with a passphrase": "Gjer sikkerheitskopien trygg med ein passfrase",
     "Confirm your passphrase": "Stadfest passfrasen din",
@@ -1074,12 +1000,9 @@
     "New Recovery Method": "Ny gjenopprettingsmetode",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Ein ny gjenopprettingspassfrase og nøkkel for sikre meldingar vart funne.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Har du ikkje satt opp den nye gjenopprettingsmetoden, kan ein angripar prøve å bryte seg inn på kontoen din.  Endre ditt kontopassord og sett opp gjenoppretting umiddelbart under instillingane.",
-    "This device is encrypting history using the new recovery method.": "Denne eininga krypterer meldingshistorikken med den nye gjenopprettingsmetoden.",
     "Go to Settings": "Gå til innstillingar",
     "Set up Secure Messages": "Sett opp sikre meldingar (Secure Messages)",
     "Recovery Method Removed": "Gjenopprettingsmetode fjerna",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne eininga har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar er fjerna.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Gjorde du dette ved eit uhell, kan du sette opp sikre meldingar på denne eininga. Dette vil kryptere all meldingshistorikk med ein ny gjenopprettingsmetode.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Viss du ikkje fjerna gjenopprettingsmetoden, kan ein angripar prøve å bryte seg inn på kontoen din. Endre kontopassordet ditt og sett ein opp ein ny gjenopprettingsmetode umidellbart under Innstillingar.",
     "Add Email Address": "Legg til e-postadresse",
     "Add Phone Number": "Legg til telefonnummer",
@@ -1095,8 +1018,6 @@
     "Name or Matrix ID": "Namn eller Matrix ID",
     "Registration Required": "Registrering er obligatorisk",
     "You need to register to do this. Would you like to register now?": "Du må registrera for å gjera dette. Ynskjer du å registrera no?",
-    "Email, name or Matrix ID": "E-post, namn eller Matrix ID",
-    "Failed to start chat": "Fekk ikkje til å starte samtalen",
     "Failed to invite users to the room:": "Fekk ikkje til å invitera brukarar til rommet:",
     "Messages": "Meldingar",
     "Actions": "Handlingar",
@@ -1105,12 +1026,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Sender ein melding som rein-tekst, utan å tolka den som markdown",
     "Upgrades a room to a new version": "Oppgraderer eit rom til ein ny versjon",
     "You do not have the required permissions to use this command.": "Du har ikkje tilgang til å utføra denne kommandoen.",
-    "Room upgrade confirmation": "Stadfesting for rom-oppgradering",
-    "Upgrading a room can be destructive and isn't always necessary.": "Oppgradering av eit rom kan vera destruktivt og er ikkje alltid naudsynt.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Oppgradering av rom er som regel tilrådd når ein versjon av rommet er å rekne som <i>ustabil</i>. Ustabile rom kan ha kodefeil, mangle funksjonar eller ha sikkerheitproblem.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Oppgradering av rom påverkar normalt berre prosessering av rommet på <i>tenar-sida</i> . Om du opplever problem med Riot-klienten din, meld gjerne inn problemet med <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Åtvaring</b>: Oppgradering av eit rom vil <i>ikkje automatisk overføre rom-medlemane  til den nye versjonen av rommet.</i> Vi vil leggje ut ein link til det nye romme i den gamle utgåva av rommet - rom-medlemane må då klikka på denne linken for å medlem av det nye rommet.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Stadfest at du vil fortsetje med å oppgradere dette rommet frå <oldVersion /> til <newVersion />.",
     "Changes your display nickname in the current room only": "Endrar kallenamnet ditt som er synleg i det gjeldande rommet",
     "Changes the avatar of the current room": "Endrar avataren for det gjeldande rommet",
     "Changes your avatar in this current room only": "Endrar din avatar for det gjeldande rommet",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index ed5f0143e9..aed7f01170 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -10,10 +10,6 @@
     "Add User": "Dodaj użytkownika",
     "Verify...": "Zweryfikuj...",
     "Unknown Address": "Nieznany adres",
-    "Unknown devices": "Nieznane urządzenia",
-    "Verify device": "Zweryfikuj urządzenie",
-    "Device key": "Klucz urządzenia",
-    "Device name": "Nazwa urządzenia",
     "To continue, please enter your password.": "Aby kontynuować, proszę wprowadzić swoje hasło.",
     "Incorrect password": "Nieprawidłowe hasło",
     "Unknown error": "Nieznany błąd",
@@ -66,7 +62,6 @@
     "Create Room": "Stwórz Pokój",
     "Cryptography": "Kryptografia",
     "Current password": "Aktualne hasło",
-    "Devices": "Urządzenia",
     "Error": "Błąd",
     "Notifications": "Powiadomienia",
     "Operation failed": "Operacja nie udała się",
@@ -126,7 +121,6 @@
     "%(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 your display nickname": "Zmienia Twój wyświetlany pseudonim",
-    "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.": "Zmiana hasła zresetuje klucze szyfrowania end-to-end na wszystkich urządzeniach, co spowoduje, że nie będzie się dało odczytać zaszyfrowanej historii czatu, chyba że najpierw wyeksportujesz swoje klucze i ponownie je zaimportujesz. W przyszłości będzie to poprawione.",
     "Claimed Ed25519 fingerprint key": "Zażądano odcisk klucza Ed25519",
     "Click here to fix": "Kliknij tutaj, aby naprawić",
     "Click to mute audio": "Kliknij, aby wyciszyć dźwięk",
@@ -148,11 +142,8 @@
     "Delete widget": "Usuń widżet",
     "Default": "Domyślny",
     "Define the power level of a user": "Określ poziom uprawnień użytkownika",
-    "Device already verified!": "Urządzenie jest już zweryfikowane!",
     "Device ID": "Identyfikator urządzenia",
-    "Device ID:": "Identyfikator urządzenia:",
     "device id: ": "identyfikator urządzenia: ",
-    "Device key:": "Klucz urządzenia:",
     "Direct chats": "Rozmowy bezpośrednie",
     "Disable Notifications": "Wyłącz powiadomienia",
     "Disinvite": "Anuluj zaproszenie",
@@ -166,7 +157,6 @@
     "Emoji": "Emoji",
     "Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
     "Enable Notifications": "Włącz powiadomienia",
-    "Encrypted by an unverified device": "Zaszyfrowane przez niezweryfikowane urządzenie",
     "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
     "End-to-end encryption information": "Informacje o szyfrowaniu end-to-end",
     "Enter passphrase": "Wpisz frazę",
@@ -203,7 +193,6 @@
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
     "Guests cannot join this room even if explicitly invited.": "Goście nie mogą dołączać do tego pokoju, nawet jeśli zostali specjalnie zaproszeni.",
     "Hangup": "Rozłącz się",
-    "Hide Text Formatting Toolbar": "Ukryj pasek formatowania tekstu",
     "Home": "Strona startowa",
     "Homeserver is": "Serwer domowy to",
     "Identity Server is": "Serwer Identity to",
@@ -215,15 +204,12 @@
     "Incoming voice call from %(name)s": "Przychodzące połączenie głosowe od %(name)s",
     "Incorrect username and/or password.": "Nieprawidłowa nazwa użytkownika i/lub hasło.",
     "Incorrect verification code": "Nieprawidłowy kod weryfikujący",
-    "Invalid alias format": "Nieprawidłowy format aliasu",
     "Invalid Email Address": "Nieprawidłowy adres e-mail",
     "Invalid file%(extra)s": "Nieprawidłowy plik %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s zaprosił(a) %(targetName)s.",
-    "Invite new room members": "Zaproś nowych członków do pokoju",
     "Invited": "Zaproszeni",
     "Invites": "Zaproszenia",
     "Invites user with given id to current room": "Zaprasza użytkownika o danym ID do obecnego pokoju",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nie jest poprawnym formatem aliasu",
     "Sign in with": "Zaloguj się używając",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Dołącz <voiceText>głosowo</voiceText> lub przez <videoText>wideo</videoText>.",
     "Join Room": "Dołącz do pokoju",
@@ -247,16 +233,10 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
     "Manage Integrations": "Zarządzaj integracjami",
-    "Markdown is disabled": "Markdown jest wyłączony",
-    "Markdown is enabled": "Markdown jest włączony",
-    "matrix-react-sdk version:": "Wersja matrix-react-sdk:",
-    "Message not sent due to unknown devices being present": "Wiadomość nie została wysłana z powodu obecności nieznanych urządzeń",
     "Missing room_id in request": "Brakujące room_id w żądaniu",
     "Missing user_id in request": "Brakujące user_id w żądaniu",
     "Moderator": "Moderator",
     "Name": "Nazwa",
-    "Never send encrypted messages to unverified devices from this device": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych urządzeń z tego urządzenia",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nigdy nie wysyłaj niezaszyfrowanych wiadomości do niezweryfikowanych urządzeń z tego urządzenia",
     "New address (e.g. #foo:%(localDomain)s)": "Nowy adres (np. #foo:%(localDomain)s)",
     "New passwords don't match": "Nowe hasła nie zgadzają się",
     "New passwords must match each other.": "Nowe hasła muszą się zgadzać.",
@@ -267,7 +247,6 @@
     "AM": "AM",
     "PM": "PM",
     "NOT verified": "NIEzweryfikowany",
-    "No devices with registered encryption keys": "Brak urządzeń z zarejestrowanymi kluczami szyfrującymi",
     "No display name": "Brak nazwy ekranowej",
     "No more results": "Nie ma więcej wyników",
     "No results": "Brak wyników",
@@ -276,7 +255,6 @@
     "Only people who have been invited": "Tylko ludzie, którzy zostali zaproszeni",
     "Password": "Hasło",
     "Passwords can't be empty": "Hasła nie mogą być puste",
-    "People": "Ludzie",
     "Permissions": "Uprawnienia",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Sprawdź swój e-mail i kliknij link w nim zawarty. Kiedy już to zrobisz, kliknij \"kontynuuj\".",
@@ -302,7 +280,6 @@
     "riot-web version:": "wersja riot-web:",
     "Room %(roomId)s not visible": "Pokój %(roomId)s nie jest widoczny",
     "Room Colour": "Kolor pokoju",
-    "Room contains unknown devices": "Pokój zawiera nieznane urządzenia",
     "%(roomName)s does not exist.": "%(roomName)s nie istnieje.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s nie jest dostępny w tym momencie.",
     "Rooms": "Pokoje",
@@ -312,8 +289,6 @@
     "Searches DuckDuckGo for results": "Używa DuckDuckGo dla wyników",
     "Seen by %(userName)s at %(dateTime)s": "Widziane przez %(userName)s o %(dateTime)s",
     "Send anyway": "Wyślij mimo to",
-    "Sender device information": "Informacja o urządzeniu nadawcy",
-    "Send Invites": "Wyślij zaproszenia",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
@@ -324,7 +299,6 @@
     "Session ID": "Identyfikator sesji",
     "%(senderName)s set a profile picture.": "%(senderName)s ustawił zdjęcie profilowe.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ustawił swoją nazwę na %(displayName)s.",
-    "Show Text Formatting Toolbar": "Pokaż pasek narzędzi formatowania tekstu",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pokaż czas w formacie 12-sto godzinnym (n.p. 2:30pm)",
     "Signed Out": "Wylogowano",
     "Sign in": "Zaloguj",
@@ -333,12 +307,10 @@
     "Someone": "Ktoś",
     "Start a chat": "Rozpocznij chat",
     "Start authentication": "Rozpocznij uwierzytelnienie",
-    "Start Chat": "Rozpocznij chat",
     "Submit": "Wyślij",
     "Success": "Sukces",
     "The maximum permitted number of widgets have already been added to this room.": "Do tego pokoju dodano już maksymalną dozwoloną liczbę widżetów.",
     "The phone number entered looks invalid": "Wprowadzony numer telefonu wygląda na niepoprawny",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podany klucz podpisu odpowiada kluczowi podpisania otrzymanemu z urządzenia %(userId)s %(deviceId)s. Urządzenie oznaczone jako zweryfikowane.",
     "This email address is already in use": "Podany adres e-mail jest już w użyciu",
     "This email address was not found": "Podany adres e-mail nie został znaleziony",
     "The email address linked to your account must be entered.": "Musisz wpisać adres e-mail połączony z twoim kontem.",
@@ -350,7 +322,6 @@
     "This room": "Ten pokój",
     "This room is not accessible by remote Matrix servers": "Ten pokój nie jest dostępny na zdalnych serwerach Matrix",
     "To get started, please pick a username!": "Aby rozpocząć, wybierz nazwę użytkownika!",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s włączył(a) szyfrowanie end-to-end (algorytm %(algorithm)s).",
     "Unable to add email address": "Nie można dodać adresu e-mail",
     "Unable to create widget.": "Nie można utworzyć widżetu.",
     "Unable to remove contact information": "Nie można usunąć informacji kontaktowych",
@@ -358,16 +329,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s odblokował(a) %(targetName)s.",
     "Unable to capture screen": "Nie można zrobić zrzutu ekranu",
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
-    "Unable to load device list": "Nie można załadować listy urządzeń",
-    "Undecryptable": "Odszyfrowanie niemożliwe",
     "To use it, just wait for autocomplete results to load and tab through them.": "Żeby tego użyć, należy poczekać na załadowanie się autouzupełnienia i naciskać przycisk \"Tab\", by wybierać.",
-    "Unencrypted message": "Niezaszyfrowana wiadomość",
     "unknown caller": "nieznany dzwoniący",
     "unknown device": "nieznane urządzenie",
     "Unknown room %(roomId)s": "Nieznany pokój %(roomId)s",
     "Unmute": "Wyłącz wyciszenie",
     "Unnamed Room": "Pokój bez nazwy",
-    "Unrecognised command:": "Nierozpoznane polecenie:",
     "Unrecognised room alias:": "Nierozpoznany alias pokoju:",
     "Uploading %(filename)s and %(count)s others|zero": "Przesyłanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Przesyłanie %(filename)s oraz %(count)s innych",
@@ -389,10 +356,7 @@
     "(could not connect media)": "(brak możliwości połączenia się z mediami)",
     "(no answer)": "(brak odpowiedzi)",
     "(unknown failure: %(reason)s)": "(nieznany błąd: %(reason)s)",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "OSTRZEŻENIE: Urządzenie już zweryfikowane, ale klucze NIE PASUJĄ DO SIEBIE!",
-    "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!": "OSTRZEŻENIE: BŁĄD WERYFIKACJI KLUCZA! Klucz podpisujący dla %(userId)s i urządzenia %(deviceId)s to \"%(fprint)s\", który nie pasuje do dostarczonego klucza \"%(fingerprint)s\". To może oznaczać, że twoje komunikaty są przejmowane!",
     "Who can access this room?": "Kto może uzyskać dostęp do tego pokoju?",
-    "Who would you like to communicate with?": "Z kim chcesz się komunikować?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s wycofał(a) zaproszenie %(targetName)s.",
     "You are already in a call.": "Jesteś już w trakcie połączenia.",
     "You are not in this room.": "Nie jesteś w tym pokoju.",
@@ -406,22 +370,18 @@
     "You need to be able to invite users to do that.": "Aby to zrobić musisz mieć możliwość zapraszania użytkowników.",
     "You need to be logged in.": "Musisz być zalogowany.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Twój adres e-mail zdaje się nie być powiązany z żadnym Matrix ID na tym serwerze.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Zmiana Twojego hasła powiodła się. Nie będziesz otrzymywał powiadomień push na inne urządzenia aż do momentu ponownego zalogowania się na nich",
     "You seem to be in a call, are you sure you want to quit?": "Wygląda na to, że prowadzisz z kimś rozmowę; jesteś pewien że chcesz wyjść?",
     "You seem to be uploading files, are you sure you want to quit?": "Wygląda na to, że jesteś w trakcie przesyłania plików; jesteś pewien, że chcesz wyjść?",
     "Set a display name:": "Ustaw nazwę ekranową:",
     "This server does not support authentication with a phone number.": "Ten serwer nie wspiera autentykacji za pomocą numeru telefonu.",
     "There are no visible files in this room": "Nie ma widocznych plików w tym pokoju",
     "Connectivity to the server has been lost.": "Połączenie z serwerem zostało utracone.",
-    "bold": "wytłuszczenie",
-    "italic": "kursywa",
     "Create": "Utwórz",
     "Online": "Dostępny(-a)",
     "Offline": "Niedostępny(-a)",
     "Add an Integration": "Dodaj integrację",
     "Token incorrect": "Niepoprawny token",
     "unencrypted": "niezaszyfrowany",
-    "Unknown (user, device) pair:": "Nieznana para (użytkownik, urządzenie):",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nie będziesz mógł cofnąć tej zmiany, ponieważ nadajesz użytkownikowi uprawnienia administratorskie równe Twoim.",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
@@ -451,15 +411,10 @@
     "Failed to invite the following users to the %(roomName)s room:": "Wysłanie zaproszenia do następujących użytkowników do pokoju %(roomName)s nie powiodło się:",
     "Confirm Removal": "Potwierdź usunięcie",
     "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.": "Jesteś pewien że chcesz usunąć to wydarzenie? Pamiętaj, że jeśli usuniesz nazwę pokoju lub aktualizację tematu pokoju, zmiana może zostać cofnięta.",
-    "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:": "Aby sprawdzić czy to urządzenie jest zaufane, skontaktuj się z jego właścicielem używając innych środków (np. osobiście lub telefonicznie) i zapytaj ich czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej:",
-    "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.": "Jeśli klucz pasuje, naciśnij na przycisk \"Zweryfikuj\" poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod to urządzenie i powinieneś nacisnąć przycisk dodania do czarnej listy.",
     "I verify that the keys match": "Upewnię się, że klucze się zgadzają",
     "Unable to restore session": "Przywrócenie sesji jest niemożliwe",
     "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.": "Jeśli wcześniej używałeś/aś nowszej wersji Riot, Twoja sesja może być niekompatybilna z tą wersją. Zamknij to okno i powróć do nowszej wersji.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Aktualnie wpisujesz niezweryfikowane urządzenia na czarną listę; aby wysłać wiadomość do tych urządzeń musisz je zweryfikować.",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot zbiera anonimowe dane analityczne, aby umożliwić nam rozwijanie aplikacji.",
-    "Verifies a user, device, and pubkey tuple": "Weryfikuje krotkę(tuple) użytkownika, urządzenia i klucza publicznego",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" zawiera niewidziane przez Ciebie wcześniej urządzenia.",
     "ex. @bob:example.com": "np. @jan:example.com",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nastąpiła próba załadowania danego punktu w historii tego pokoju, lecz nie masz uprawnień, by zobaczyć określoną wiadomość.",
     "Use compact timeline layout": "Użyj kompaktowego stylu linii czasu",
@@ -485,15 +440,11 @@
     "Authentication check failed: incorrect password?": "Próba autentykacji nieudana: nieprawidłowe hasło?",
     "Do you want to set an email address?": "Czy chcesz ustawić adres e-mail?",
     "Share without verifying": "Udostępnij bez weryfikacji",
-    "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",
-    "Loading device info...": "Wczytywanie informacji o urządzeniu...",
     "Example": "Przykład",
     "Drop file here to upload": "Upuść plik tutaj, aby go przesłać",
     "Automatically replace plain text Emoji": "Automatycznie zastępuj tekstowe emotikony",
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
-    "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.": "Zalecamy Ci przejście przez proces weryfikacyjny dla każdego urządzenia aby potwierdzić, że należy ono do ich prawdziwego właściciela. Możesz jednak wysłać tę wiadomość bez potwierdzania.",
     "Unblacklist": "Usuń z czarnej listy",
     "Blacklist": "Dodaj do czarnej listy",
     "Unverify": "Usuń weryfikację",
@@ -519,7 +470,6 @@
     "Your identity server's URL": "Adres URL Twojego Serwera Tożsamości",
     "The information being sent to us to help make Riot.im better includes:": "Informacje przesyłane do nas, by poprawić Riot.im zawierają:",
     "The platform you're on": "Platforma na której jesteś",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "W tym pokoju są nieznane urządzenia: jeżeli będziesz kontynuować bez ich weryfikacji, możliwe będzie podsłuchiwanie Twojego połączenia.",
     "Answer": "Odbierz",
     "Review Devices": "Przegląd urządzeń",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
@@ -543,16 +493,10 @@
     "Enable inline URL previews by default": "Włącz domyślny podgląd URL w tekście",
     "Enable URL previews for this room (only affects you)": "Włącz podgląd URL dla tego pokoju (dotyczy tylko Ciebie)",
     "Enable URL previews by default for participants in this room": "Włącz domyślny podgląd URL dla uczestników w tym pokoju",
-    "Delete %(count)s devices|other": "Usuń %(count)s urządzeń",
-    "Delete %(count)s devices|one": "Usuń urządzenie",
     "%(senderName)s sent an image": "%(senderName)s wysłał(a) obrazek",
     "%(senderName)s sent a video": "%(senderName)s wysłał(a) wideo",
     "%(senderName)s uploaded a file": "%(senderName)s wysłał(a) plik",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Twoja prośba o podzielenie się kluczem została wysłana - sprawdź swoje inne urządzenie w celu spełnienia prośby.",
-    "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.": "Prośby o podzielenie się kluczem są wysyłane do Twoich innych urządzeń automatycznie. Jeżeli prośba została odrzucona na innym urządzeniu, kliknij tutaj aby ponownie poprosić o podzielenie się kluczem dla tej sesji.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Jeżeli inne Twoje urządzenia nie mają klucza dla tej wiadomości, nie będziesz w stanie ich odszyfrować.",
     "Key request sent.": "Prośba o klucz wysłana.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Poproś ponownie o klucze szyfrujące</requestLink> z Twojego innego urządzenia.",
     "Kick this user?": "Wyrzucić tego użytkownika?",
     "Unban this user?": "Odbanować tego użytkownika?",
     "Ban this user?": "Zbanować tego użytkownika?",
@@ -628,7 +572,6 @@
     "Files": "Pliki",
     "Collecting app version information": "Zbieranie informacji o wersji aplikacji",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Usuń alias %(alias)s i usuń %(name)s z katalogu?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "To pozwoli Ci powrócić do Twojego konta po wylogowaniu i ponownym zalogowaniu się na innych urządzeniach.",
     "Keywords": "Słowa kluczowe",
     "Enable notifications for this account": "Włącz powiadomienia na tym koncie",
     "Invite to this community": "Zaproś do tej społeczności",
@@ -760,8 +703,6 @@
     "Unignore": "Przestań ignorować",
     "Jump to read receipt": "Przeskocz do potwierdzenia odczytu",
     "Share Link to User": "Udostępnij odnośnik do użytkownika",
-    "Unable to reply": "Nie udało się odpowiedzieć",
-    "At this time it is not possible to reply with an emote.": "W tej chwili nie można odpowiedzieć emotikoną.",
     "Replying": "Odpowiadanie",
     "Share room": "Udostępnij pokój",
     "Community Invites": "Zaproszenia do społeczności",
@@ -866,7 +807,6 @@
     "Error whilst fetching joined communities": "Błąd podczas pobierania dołączonych społeczności",
     "Create a new community": "Utwórz nową Społeczność",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Utwórz Społeczność, aby grupować użytkowników i pokoje! Zbuduj niestandardową stronę główną, aby zaznaczyć swoją przestrzeń we wszechświecie Matrix.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Pokaż urządzenia</showDevicesText>, <sendAnywayText>wyślij mimo to</sendAnywayText> lub <cancelText>anuluj</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Twoja wiadomość nie została wysłana.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Nikogo tu nie ma! Czy chcesz <inviteText>zaprosić inne osoby</inviteText> lub <nowarnText>przestać ostrzegać o pustym pokoju</nowarnText>?",
     "Clear filter": "Wyczyść filtr",
@@ -906,11 +846,6 @@
     "Permission Required": "Wymagane Uprawnienia",
     "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",
     "A call is currently being placed!": "W tej chwili trwa rozmowa!",
     "A call is already in progress!": "Połączenie już trwa!",
     "You do not have permission to start a conference call in this room": "Nie posiadasz uprawnień do rozpoczęcia rozmowy grupowej w tym pokoju",
@@ -1050,7 +985,6 @@
     "Messages containing @room": "Wiadomości zawierające @room",
     "This is similar to a commonly used password": "Jest to podobne do powszechnie stosowanego hasła",
     "<b>Print it</b> and store it somewhere safe": "<b>Wydrukuj</b> przechowuj w bezpiecznym miejscu",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Twój Klucz Odzyskiwania znajduje się w Twoim katalogu <b>Pobrane</b>.",
     "That doesn't match.": "To się nie zgadza.",
     "Go to Settings": "Przejdź do ustawień",
     "%(displayName)s is typing …": "%(displayName)s pisze…",
@@ -1107,7 +1041,6 @@
     "Pencil": "Ołówek",
     "Paperclip": "Spinacz",
     "Scissors": "Nożyczki",
-    "Padlock": "Kłódka",
     "Key": "Klucz",
     "Telephone": "Telefon",
     "Flag": "Flaga",
@@ -1122,7 +1055,6 @@
     "Anchor": "Kotwica",
     "Headphones": "Słuchawki",
     "Folder": "Folder",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "W celu zapewnienia maksymalnego bezpieczeństwa zalecamy, abyś zrobił to osobiście lub skorzystał z innego zaufanego środka komunikacji.",
     "Phone Number": "Numer telefonu",
     "Display Name": "Wyświetlana nazwa",
     "Set a new account password...": "Ustaw nowe hasło do konta…",
@@ -1155,7 +1087,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s nie może być wyświetlony. Chcesz do niego dołączyć?",
     "Main address": "Główny adres",
     "Room avatar": "Awatar pokoju",
-    "Upload room avatar": "Prześlij awatar pokoju",
     "Room Name": "Nazwa pokoju",
     "Room Topic": "Temat pokoju",
     "Power level": "Poziom uprawnień",
@@ -1220,17 +1151,10 @@
     "No homeserver URL provided": "Nie podano URL serwera głównego",
     "The server does not support the room version specified.": "Serwer nie wspiera tej wersji pokoju.",
     "Name or Matrix ID": "Imię lub identyfikator Matrix",
-    "Email, name or Matrix ID": "E-mail, imię lub Matrix ID",
-    "Failed to start chat": "Nie udało się rozpocząć chatu",
     "Messages": "Wiadomości",
     "Actions": "Akcje",
     "Other": "Inne",
-    "Room upgrade confirmation": "Potwierdzenie aktualizacji pokoju",
-    "Upgrading a room can be destructive and isn't always necessary.": "Aktualizacja pokoju może mieć negatywne skutki a nie zawsze jest wymagana.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Aktualizacje pokoi są zazwyczaj rekomendowane, gdy wersja pokoju jest <i>niestabilna</i>. Niestabilne pokoje mogą mieć błędy, luki bezpieczeństwa lub nie mieć wszystkich funkcjonalności.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Aktualizacje pokoi zazwyczaj mają wpływ tylko na <i>serwer</i> obsługujący pokój. Jeśli masz problemy ze swoim klientem Riot, proszę zgłoś błąd: <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Uwaga!</b>: Aktualizacja pokoju <i>nie przeniesie członków do nowej wersji pokoju automatycznie.</i> Użytkownicy muszą kliknąć link w starym, nieaktywnym pokoju by dołączyć do nowej wersji pokoju.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Potwierdź, że chcesz zaktualizować pokój z <oldVersion /> do <newVersion />.",
     "Changes your avatar in this current room only": "Zmienia Twój awatar w bieżącym pokoju",
     "Changes your avatar in all rooms": "Zmienia Twój awatar we wszystkich pokojach",
     "Gets or sets the room topic": "Wyświetla lub ustawia temat pokoju",
@@ -1295,35 +1219,17 @@
     "Ball": "Piłka",
     "Pin": "Pinezka",
     "Accept <policyLink /> to continue:": "Zaakceptuj <policyLink /> aby kontynuować:",
-    "Your homeserver does not support device management.": "Twój serwer domowy nie wspiera zarządzania urządzeniami.",
     "ID": "ID",
     "Public Name": "Nazwa publiczna",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Czy jesteś pewien? Stracisz dostęp do wszystkich swoich zaszyfrowanych wiadomości, jeżeli nie utworzyłeś poprawnej kopii zapasowej kluczy.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zaszyfrowane wiadomości są zabezpieczone przy użyciu szyfrowania end-to-end. Tylko Ty oraz ich adresaci posiadają klucze do ich rozszyfrowania.",
     "Unable to load key backup status": "Nie można załadować stanu kopii zapasowej klucza",
-    "This device is backing up your keys. ": "Kopia zapasowa twoich kluczy jest tworzona. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "To urządzenie <b>nie tworzy kopii zapasowej twoich kluczy</b>, ale jest dostępna kopia zapasowa którą można przywrócić i dodać do dalszego działania.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Podłącz to urządzenie do kopii zapasowej kluczy przed wylogowaniem, aby zapobiec utracie kluczy, które mogą być jedyne na tym urządzeniu.",
-    "Connect this device to Key Backup": "Podłącz to urządzenie do kopii zapasowej kluczy",
     "Backing up %(sessionsRemaining)s keys...": "Tworzenie kopii zapasowej %(sessionsRemaining)s kluczy...",
     "All keys backed up": "Utworzono kopię zapasową wszystkich kluczy",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Kopia zapasowa posiada sygnaturę z <verify>nieznanego</verify> urządzenia z ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "Kopia zapasowa posiada <validity>prawidłową</validity> sygnaturę z tego urządzenia",
-    "Backup has an <validity>invalid</validity> signature from this device": "Kopia zapasowa posiada <validity>nieprawidłową</validity> sygnaturę z tego urządzenia",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Kopia zapasowa posiada <validity>prawidłową</validity> sygnaturę ze <verify>zweryfikowanego</verify> urządzenia <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Kopia zapasowa posiada <validity>prawidłową</validity> sygnaturę z <verify>niezweryfikowanego</verify> urządzenia <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Kopia zapasowa posiada <validity>nieprawidłową</validity> sygnaturę ze <verify>zweryfikowanego</verify> urządzenia <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Kopia zapasowa posiada <validity>nieprawidłową</validity> sygnaturę z <verify>niezweryfikowanego</verify> urządzenia <device></device>",
-    "Backup is not signed by any of your devices": "Kopia zapasowa nie jest podpisana przez jakiekolwiek z twoich urządzeń",
-    "This backup is trusted because it has been restored on this device": "Kopia zapasowa jest zaufana, ponieważ może być przywrócona na tym urządzeniu",
-    "Your keys are <b>not being backed up from this device</b>.": "Twoje klucze <b>nie są zapisane na tym urządzeniu</b>.",
     "Back up your keys before signing out to avoid losing them.": "Utwórz kopię zapasową kluczy przed wylogowaniem, aby ich nie utracić.",
     "Start using Key Backup": "Rozpocznij z użyciem klucza kopii zapasowej",
     "Add an email address to configure email notifications": "Dodaj adres poczty elektronicznej, aby skonfigurować powiadomienia pocztowe",
-    "Enable desktop notifications for this device": "Włącz powiadomienia na pulpicie dla tego urządzenia",
-    "Enable audible notifications for this device": "Włącz dźwiękowe powiadomienia dla tego urządzenia",
     "Profile picture": "Obraz profilowy",
-    "Upload profile picture": "Wgraj obraz profilowy",
     "Identity Server URL must be HTTPS": "URL serwera tożsamości musi być HTTPS",
     "Not a valid Identity Server (status code %(code)s)": "Nieprawidłowy serwer tożsamości (kod statusu %(code)s)",
     "Could not connect to Identity Server": "Nie można połączyć z Serwerem Tożsamości",
@@ -1367,7 +1273,6 @@
     "Use an identity server to invite by email. Manage in Settings.": "Użyj serwera tożsamości, by zaprosić za pomocą adresu e-mail. Zarządzaj w ustawieniach.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Wypróbuj nowe sposoby na ignorowanie ludzi (eksperymentalne)",
-    "Use the new, faster, composer for writing messages": "Używaj nowego, szybszego kompozytora do pisania wiadomości",
     "My Ban List": "Moja lista zablokowanych",
     "This is your list of users/servers you have blocked - don't leave the room!": "To jest Twoja lista zablokowanych użytkowników/serwerów – nie opuszczaj tego pokoju!",
     "Change identity server": "Zmień serwer tożsamości",
@@ -1395,7 +1300,6 @@
     "Explore": "Przeglądaj",
     "Filter": "Filtruj",
     "Add room": "Dodaj pokój",
-    "A device's public name is visible to people you communicate with": "Publiczna nazwa urządzenia jest widoczna dla ludzi, z którymi się komunikujesz",
     "Request media permissions": "Zapytaj o uprawnienia",
     "Voice & Video": "Głos & Wideo",
     "this room": "ten pokój",
@@ -1412,7 +1316,6 @@
     "Verification code": "Kod weryfikacyjny",
     "Remove %(email)s?": "Usunąć %(email)s?",
     "Remove %(phone)s?": "Usunąć %(phone)s?",
-    "Some devices in this encrypted room are not trusted": "Niektóre urządzenia w tym zaszyfrowanym pokoju nie są zaufane",
     "Loading …": "Ładowanie…",
     "Loading room preview": "Wczytywanie podglądu pokoju",
     "Try to join anyway": "Spróbuj dołączyć mimo tego",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 1a85eb752d..f0f1ce9860 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -52,7 +52,6 @@
     "I have verified my email address": "Eu verifiquei o meu endereço de email",
     "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
     "Invalid Email Address": "Endereço de email inválido",
-    "Invite new room members": "Convidar novas pessoas para ingressar na sala",
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "Sign in with": "Quero entrar",
@@ -65,8 +64,6 @@
     "Manage Integrations": "Gerenciar integrações",
     "Moderator": "Moderador/a",
     "Name": "Nome",
-    "Never send encrypted messages to unverified devices from this device": "Nunca envie mensagens criptografada para um dispositivo não verificado a partir deste dispositivo",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nunca envie mensagens criptografadas para dispositivos não verificados nesta sala a partir deste dispositivo",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
     "none": "nenhum",
     "Notifications": "Notificações",
@@ -76,7 +73,6 @@
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "Password": "Senha",
     "Passwords can't be empty": "As senhas não podem estar em branco",
-    "People": "Pessoas",
     "Permissions": "Permissões",
     "Phone": "Telefone",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor verifique seu email e clique no link enviado. Quando finalizar este processo, clique para continuar.",
@@ -89,8 +85,6 @@
     "Rooms": "Salas",
     "Scroll to bottom of page": "Ir para o fim da página",
     "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
-    "Sender device information": "Informação do dispositivo emissor",
-    "Send Invites": "Enviar convites",
     "Send Reset Email": "Enviar email para redefinição de senha",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -100,7 +94,6 @@
     "Sign out": "Sair",
     "Someone": "Alguém",
     "Start a chat": "Começar uma conversa",
-    "Start Chat": "Começar conversa",
     "Success": "Sucesso",
     "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
     "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
@@ -125,10 +118,8 @@
     "VoIP conference started.": "Conferência VoIP iniciada.",
     "Who can access this room?": "Quem pode acessar esta sala?",
     "Who can read history?": "Quem pode ler o histórico da sala?",
-    "Who would you like to communicate with?": "Com quem você gostaria de se comunicar?",
     "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
     "You have no visible notifications": "Voce não possui notificações visíveis",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
@@ -198,7 +189,6 @@
     "This room is not recognised.": "Esta sala não é reconhecida.",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
@@ -236,7 +226,6 @@
     "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
-    "Devices": "Dispositivos",
     "Direct chats": "Conversas pessoais",
     "Disinvite": "Desconvidar",
     "Download %(text)s": "Baixar %(text)s",
@@ -250,20 +239,13 @@
     "Failed to set display name": "Houve falha ao definir o nome público",
     "Failed to toggle moderator status": "Houve falha ao alterar o status de moderador/a",
     "Fill screen": "Tela cheia",
-    "Hide Text Formatting Toolbar": "Ocultar a barra de formatação de texto",
     "Incorrect verification code": "Código de verificação incorreto",
-    "Invalid alias format": "Formato de alias é inválido",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' não é um formato válido para um alias",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
     "Kick": "Remover",
     "Local addresses for this room:": "Endereço local desta sala:",
-    "Markdown is disabled": "A formatação 'Markdown' está desabilitada",
-    "Markdown is enabled": "A formatação 'Markdown' está habilitada",
-    "Message not sent due to unknown devices being present": "A mensagem não foi enviada por causa da presença de dispositivos desconhecidos",
     "New address (e.g. #foo:%(localDomain)s)": "Novo endereço (p.ex: #algo:%(localDomain)s)",
     "not specified": "não especificado",
-    "No devices with registered encryption keys": "Não há dispositivos com chaves de criptografia registradas",
     "No more results": "Não há mais resultados",
     "No results": "Sem resultados",
     "OK": "OK",
@@ -278,7 +260,6 @@
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas não o encontrei.",
-    "Unable to load device list": "Não foi possível carregar a lista de dispositivos",
     "Unknown room %(roomId)s": "A sala %(roomId)s é desconhecida",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
@@ -286,19 +267,15 @@
     "Make Moderator": "Tornar moderador(a)",
     "Room": "Sala",
     "Cancel": "Cancelar",
-    "bold": "negrito",
-    "italic": "itálico",
     "Ban": "Banir",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
     "An error has occurred.": "Ocorreu um erro.",
-    "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.": "Alterar a senha irá atualmente apagar todas as chaves de criptografia ponta-a-ponta em todos os dispositivos, fazendo com que o histórico da conversa fique ilegível, a não ser que você exporte antes as chaves de sala e então as reimporte depois. No futuro, isso vai melhorar.",
     "Email": "Email",
     "Email address": "Endereço de email",
     "Error decrypting attachment": "Erro ao descriptografar o anexo",
     "Invalid file%(extra)s": "Arquivo inválido %(extra)s",
-    "matrix-react-sdk version:": "versão do matrix-react-sdk:",
     "Mute": "Silenciar",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
@@ -329,18 +306,9 @@
     "Unknown error": "Erro desconhecido",
     "Incorrect password": "Senha incorreta",
     "To continue, please enter your password.": "Para continuar, por favor insira a sua senha.",
-    "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:": "Para verificar que este dispositivo é confiável, por favor entre em contato com a(o) sua(seu) dona(o) usando outros meios, como por exemplo pessoalmente ou por uma chamada telefônica, e pergunte a esta pessoa se a chave que ela está vendo nas suas configurações de usuário para este dispositivo é igual a esta:",
-    "Device name": "Nome do dispositivo",
-    "Device key": "Chave do dispositivo",
-    "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.": "Se a chave for a mesma, clique no botão \"verificar\" abaixo. Se não for a mesma, então alguma outra pessoa está interceptando este dispositivo e você provavelmente vai querer clicar no botão \"colocar na lista negra\".",
-    "Verify device": "Verificar o dispositivo",
     "I verify that the keys match": "Eu confirmo que as chaves são iguais",
     "Unable to restore session": "Não foi possível restaurar a sessão",
     "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.": "Se você já usou antes uma versão mais recente do Riot, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Você está atualmente bloqueando dispositivos não verificados. Para enviar mensagens para estes dispositivos, você necessita antes verificá-los.",
-    "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.": "Nós recomendamos que você passe pelo processo de verificação para cada dispositivo para confirmar que eles pertencem às pessoas que efetivamente são suas donas, mas você pode reenviar a mensagem sem verificar isso, se assim o desejar.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contém dispositivos que você não viu antes.",
-    "Unknown devices": "Dispositivos desconhecidos",
     "Unknown Address": "Endereço desconhecido",
     "Unblacklist": "Tirar da lista de bloqueados",
     "Blacklist": "Colocar na lista de bloqueados",
@@ -371,20 +339,14 @@
     "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.": "Este processo faz com que você possa importar as chaves de criptografia que tinha previamente exportado de outro cliente Matrix. Você poderá então descriptografar todas as mensagens que o outro cliente pôde criptografar.",
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
     "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?": "Você será levado agora a um site de terceiros para poder autenticar a sua conta para uso com o serviço %(integrationsUrl)s. Você quer continuar?",
-    "Device already verified!": "Dispositivo já verificado!",
     "Export": "Exportar",
     "Import": "Importar",
     "Incorrect username and/or password.": "Nome de usuária(o) e/ou senha incorreto.",
     "Invited": "Convidada(o)",
     "Results from DuckDuckGo": "Resultados de DuckDuckGo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de assinatura que você forneceu é a mesma que a chave de assinatura que você recebeu do dispositivo %(deviceId)s de %(userId)s . O dispositivo foi portanto marcado como verificado.",
-    "Unknown (user, device) pair:": "Par usuária(o)-dispositivo desconhecido:",
-    "Unrecognised command:": "Comando não reconhecido:",
     "Unrecognised room alias:": "Apelido de sala não reconhecido:",
     "Use compact timeline layout": "Usar o layout de linha do tempo compacta",
     "Verified key": "Chave verificada",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
-    "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
@@ -399,9 +361,7 @@
     "Anyone": "Qualquer pessoa",
     "Are you sure you want to leave the room '%(roomName)s'?": "Você tem certeza que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
-    "Device ID:": "ID do dispositivo:",
     "device id: ": "id do dispositivo: ",
-    "Device key:": "Chave do dispositivo:",
     "Register": "Registre-se",
     "Remote addresses for this room:": "Endereços remotos para esta sala:",
     "Save": "Salvar",
@@ -418,15 +378,12 @@
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
     "Public Chat": "Conversa pública",
     "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
-    "Room contains unknown devices": "Esta sala contém dispositivos desconhecidos",
     "Admin Tools": "Ferramentas de administração",
-    "Undecryptable": "Não é possível descriptografar",
     "Incoming video call from %(name)s": "Chamada de vídeo de %(name)s recebida",
     "Alias (optional)": "Apelido (opcional)",
     "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
     "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
     "Failed to upload profile picture!": "Falha ao enviar a imagem de perfil!",
-    "Show Text Formatting Toolbar": "Exibir barra de formatação de texto",
     "Room directory": "Lista de salas",
     "Failed to fetch avatar URL": "Falha ao obter a URL da imagem de perfil",
     "Incoming call from %(name)s": "Chamada de %(name)s recebida",
@@ -446,8 +403,6 @@
     "Incoming voice call from %(name)s": "Chamada de voz de %(name)s recebida",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</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.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
-    "Encrypted by an unverified device": "Criptografado por um dispositivo não verificado",
-    "Unencrypted message": "Mensagem não criptografada",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Participar por <voiceText>voz</voiceText> ou por <videoText>vídeo</videoText>.",
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Username available": "Nome de usuária(o) disponível",
@@ -483,7 +438,6 @@
     "You do not have permission to do that in this room.": "Não tem permissão para fazer isso nesta sala.",
     "Copied!": "Copiado!",
     "Failed to copy": "Falha ao copiar",
-    "Verifies a user, device, and pubkey tuple": "Verifica um utilizador, o dispositivo e o tuplo da chave pública",
     "Check for update": "Procurar atualizações",
     "Your browser does not support the required cryptography extensions": "O seu browser não suporta as extensões de criptografia necessárias",
     "Not a valid Riot keyfile": "Não é um ficheiro de chaves Riot válido",
@@ -494,10 +448,7 @@
     "Start verification": "Iniciar verificação",
     "Share without verifying": "Partilhar sem verificar",
     "Ignore request": "Ignorar pedido",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Adicionou um novo dispositivo '%(displayName)s', que está a pedir chaves de encriptação.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo não verificado '%(displayName)s' está a pedir chaves de encriptação.",
     "Encryption key request": "Pedido de chave de encriptação",
-    "Loading device info...": "A carregar as informações do dispositivo...",
     "Example": "Exemplo",
     "Create": "Criar",
     "Featured Rooms:": "Salas em destaque:",
@@ -575,7 +526,6 @@
     "Files": "Ficheiros",
     "Collecting app version information": "A recolher informação da versão da app",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto irá permitir-lhe voltar à sua conta depois de terminar sessão, assim como iniciar sessão noutros dispositivos.",
     "Keywords": "Palavras-chave",
     "Enable notifications for this account": "Ativar notificações para esta conta",
     "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
@@ -669,7 +619,6 @@
     "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página contém informação de que permitam a sua identificação, como uma sala, ID de utilizador ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
     "Call Failed": "A chamada falhou",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Há dispositivos desconhecidos nesta sala: se continuar sem os verificar, será possível que alguém espie a sua chamada.",
     "Review Devices": "Rever dispositivos",
     "Call Anyway": "Ligar na mesma",
     "Answer Anyway": "Responder na mesma",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8027bb577f..97245ef025 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -52,7 +52,6 @@
     "I have verified my email address": "Eu verifiquei o meu endereço de email",
     "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
     "Invalid Email Address": "Endereço de email inválido",
-    "Invite new room members": "Convidar novas pessoas para ingressar na sala",
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "Sign in with": "Quero entrar",
@@ -65,8 +64,6 @@
     "Manage Integrations": "Gerenciar integrações",
     "Moderator": "Moderador/a",
     "Name": "Nome",
-    "Never send encrypted messages to unverified devices from this device": "Nunca envie mensagens criptografada para um dispositivo não verificado a partir deste dispositivo",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nunca envie mensagens criptografadas para dispositivos não verificados nesta sala a partir deste dispositivo",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
     "none": "nenhum",
     "Notifications": "Notificações",
@@ -76,7 +73,6 @@
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "Password": "Senha",
     "Passwords can't be empty": "As senhas não podem estar em branco",
-    "People": "Pessoas",
     "Permissions": "Permissões",
     "Phone": "Telefone",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor verifique seu email e clique no link enviado. Quando finalizar este processo, clique para continuar.",
@@ -89,8 +85,6 @@
     "Rooms": "Salas",
     "Scroll to bottom of page": "Ir para o fim da página",
     "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
-    "Sender device information": "Informação do dispositivo emissor",
-    "Send Invites": "Enviar convites",
     "Send Reset Email": "Enviar email para redefinição de senha",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -100,7 +94,6 @@
     "Sign out": "Sair",
     "Someone": "Alguém",
     "Start a chat": "Começar uma conversa",
-    "Start Chat": "Começar conversa",
     "Success": "Sucesso",
     "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
     "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
@@ -125,10 +118,8 @@
     "VoIP conference started.": "Conferência VoIP iniciada.",
     "Who can access this room?": "Quem pode acessar esta sala?",
     "Who can read history?": "Quem pode ler o histórico da sala?",
-    "Who would you like to communicate with?": "Com quem você gostaria de se comunicar?",
     "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
     "You have no visible notifications": "Voce não possui notificações visíveis",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
@@ -198,7 +189,6 @@
     "This room is not recognised.": "Esta sala não é reconhecida.",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
@@ -236,7 +226,6 @@
     "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
-    "Devices": "Dispositivos",
     "Direct chats": "Conversas pessoais",
     "Disinvite": "Desconvidar",
     "Download %(text)s": "Baixar %(text)s",
@@ -250,20 +239,13 @@
     "Failed to set display name": "Houve falha ao definir o nome público",
     "Failed to toggle moderator status": "Houve falha ao alterar o status de moderador/a",
     "Fill screen": "Tela cheia",
-    "Hide Text Formatting Toolbar": "Ocultar a barra de formatação de texto",
     "Incorrect verification code": "Código de verificação incorreto",
-    "Invalid alias format": "Formato de alias é inválido",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' não é um formato válido para um alias",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
     "Kick": "Remover",
     "Local addresses for this room:": "Endereço local desta sala:",
-    "Markdown is disabled": "A formatação 'Markdown' está desabilitada",
-    "Markdown is enabled": "A formatação 'Markdown' está habilitada",
-    "Message not sent due to unknown devices being present": "A mensagem não foi enviada por causa da presença de dispositivos desconhecidos",
     "New address (e.g. #foo:%(localDomain)s)": "Novo endereço (p.ex: #algo:%(localDomain)s)",
     "not specified": "não especificado",
-    "No devices with registered encryption keys": "Não há dispositivos com chaves de criptografia registradas",
     "No more results": "Não há mais resultados",
     "No results": "Sem resultados",
     "OK": "Ok",
@@ -278,7 +260,6 @@
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas não o encontrei.",
-    "Unable to load device list": "Não foi possível carregar a lista de dispositivos",
     "Unknown room %(roomId)s": "A sala %(roomId)s é desconhecida",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
@@ -286,19 +267,15 @@
     "Make Moderator": "Tornar moderador(a)",
     "Room": "Sala",
     "Cancel": "Cancelar",
-    "bold": "negrito",
-    "italic": "itálico",
     "Ban": "Banir",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
     "An error has occurred.": "Ocorreu um erro.",
-    "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.": "Alterar a senha irá atualmente apagar todas as chaves de criptografia ponta-a-ponta em todos os dispositivos, fazendo com que o histórico da conversa fique ilegível, a não ser que você exporte antes as chaves de sala e então as reimporte depois. No futuro, isso vai melhorar.",
     "Email": "Email",
     "Email address": "Endereço de email",
     "Error decrypting attachment": "Erro ao descriptografar o anexo",
     "Invalid file%(extra)s": "Arquivo inválido %(extra)s",
-    "matrix-react-sdk version:": "versão do matrix-react-sdk:",
     "Mute": "Mudo",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
@@ -329,18 +306,9 @@
     "Unknown error": "Erro desconhecido",
     "Incorrect password": "Senha incorreta",
     "To continue, please enter your password.": "Para continuar, por favor insira a sua senha.",
-    "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:": "Para verificar que este dispositivo é confiável, por favor entre em contato com a(o) sua(seu) dona(o) usando outros meios, como por exemplo pessoalmente ou por uma chamada telefônica, e pergunte a esta pessoa se a chave que ela está vendo nas suas configurações de usuário para este dispositivo é igual a esta:",
-    "Device name": "Nome do dispositivo",
-    "Device key": "Chave do dispositivo",
-    "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.": "Se a chave for a mesma, clique no botão \"verificar\" abaixo. Se não for a mesma, então alguma outra pessoa está interceptando este dispositivo e você provavelmente vai querer clicar no botão \"colocar na lista negra\".",
-    "Verify device": "Verificar o dispositivo",
     "I verify that the keys match": "Eu confirmo que as chaves são iguais",
     "Unable to restore session": "Não foi possível restaurar a sessão",
     "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.": "Se você já usou antes uma versão mais recente do Riot, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Você está atualmente bloqueando dispositivos não verificados. Para enviar mensagens para estes dispositivos, você necessita antes verificá-los.",
-    "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.": "Nós recomendamos que você passe pelo processo de verificação para cada dispositivo para confirmar que eles pertencem às pessoas que efetivamente são suas donas, mas você pode reenviar a mensagem sem verificar isso, se assim o desejar.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contém dispositivos que você não viu antes.",
-    "Unknown devices": "Dispositivos desconhecidos",
     "Unknown Address": "Endereço desconhecido",
     "Unblacklist": "Tirar da lista de bloqueados",
     "Blacklist": "Colocar na lista de bloqueados",
@@ -371,20 +339,14 @@
     "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.": "Este processo faz com que você possa importar as chaves de criptografia que tinha previamente exportado de outro cliente Matrix. Você poderá então descriptografar todas as mensagens que o outro cliente pôde criptografar.",
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
     "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?": "Você será levado agora a um site de terceiros para poder autenticar a sua conta para uso com o serviço %(integrationsUrl)s. Você quer continuar?",
-    "Device already verified!": "Dispositivo já verificado!",
     "Export": "Exportar",
     "Import": "Importar",
     "Incorrect username and/or password.": "Nome de usuária(o) e/ou senha incorreto.",
     "Invited": "Convidada(o)",
     "Results from DuckDuckGo": "Resultados de DuckDuckGo",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de assinatura que você forneceu é a mesma que a chave de assinatura que você recebeu do dispositivo %(deviceId)s de %(userId)s . O dispositivo foi portanto marcado como verificado.",
-    "Unknown (user, device) pair:": "Par usuária(o)-dispositivo desconhecido:",
-    "Unrecognised command:": "Comando não reconhecido:",
     "Unrecognised room alias:": "Apelido de sala não reconhecido:",
     "Use compact timeline layout": "Usar o layout de linha do tempo compacta",
     "Verified key": "Chave verificada",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
-    "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!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
@@ -399,9 +361,7 @@
     "Anyone": "Qualquer pessoa",
     "Are you sure you want to leave the room '%(roomName)s'?": "Você tem certeza que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
-    "Device ID:": "ID do dispositivo:",
     "device id: ": "id do dispositivo: ",
-    "Device key:": "Chave do dispositivo:",
     "Register": "Registre-se",
     "Remote addresses for this room:": "Endereços remotos para esta sala:",
     "Save": "Salvar",
@@ -437,7 +397,6 @@
     "Disable Notifications": "Desabilitar notificações",
     "Drop File Here": "Arraste o arquivo aqui",
     "Enable Notifications": "Habilitar notificações",
-    "Encrypted by an unverified device": "Criptografado por um dispositivo não verificado",
     "Failed to upload profile picture!": "Falha ao enviar a imagem de perfil!",
     "Incoming call from %(name)s": "Recebendo chamada de %(name)s",
     "Incoming video call from %(name)s": "Recebendo chamada de vídeo de %(name)s",
@@ -447,16 +406,12 @@
     "No display name": "Sem nome público de usuária(o)",
     "Private Chat": "Conversa privada",
     "Public Chat": "Conversa pública",
-    "Room contains unknown devices": "Esta sala contém dispositivos desconhecidos",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento.",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s em %(dateTime)s",
     "Send anyway": "Enviar de qualquer maneira",
-    "Show Text Formatting Toolbar": "Exibir barra de formatação de texto",
     "Start authentication": "Iniciar autenticação",
     "This room": "Esta sala",
-    "Undecryptable": "Não é possível descriptografar",
-    "Unencrypted message": "Mensagem não criptografada",
     "unknown caller": "a pessoa que está chamando é desconhecida",
     "Unnamed Room": "Sala sem nome",
     "Upload new:": "Enviar novo:",
@@ -475,8 +430,6 @@
     "Start verification": "Iniciar a verificação",
     "Share without verifying": "Compartilhar sem verificar",
     "Ignore request": "Ignorar o pedido",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Você adicionou um novo dispositivo '%(displayName)s', que está solicitando chaves de criptografia.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Seu dispositivo não verificado '%(displayName)s' está solicitando chaves de criptografia.",
     "Encryption key request": "Solicitação de chave de criptografia",
     "Invite to Community": "Convidar à comunidade",
     "Restricted": "Restrito",
@@ -503,7 +456,6 @@
     "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página tem informação de identificação, como uma sala, ID de usuária/o ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
     "Call Failed": "A chamada falhou",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Há dispositivos desconhecidos nesta sala: se você continuar sem verificá-los, será possível alguém espiar sua chamada.",
     "Review Devices": "Revisar dispositivos",
     "Call Anyway": "Ligar assim mesmo",
     "Answer Anyway": "Responder assim mesmo",
@@ -534,8 +486,6 @@
     "Enable inline URL previews by default": "Ativar, por padrão, a visualização de resumo de links",
     "Enable URL previews for this room (only affects you)": "Ativar, para esta sala, a visualização de links (só afeta você)",
     "Enable URL previews by default for participants in this room": "Ativar, para todas/os as/os integrantes desta sala, a visualização de links",
-    "Delete %(count)s devices|other": "Removar %(count)s dispositivos",
-    "Delete %(count)s devices|one": "Remover dispositivo",
     "Cannot add any more widgets": "Não é possível adicionar novos widgets",
     "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitidos já foi atingido nesta sala.",
     "Add a widget": "Adicionar um widget",
@@ -688,7 +638,6 @@
     "Community ID": "ID da comunidade",
     "example": "exemplo",
     "Create": "Criar",
-    "Loading device info...": "Carregando informações do dispositivo...",
     "To get started, please pick a username!": "Para começar, escolha um nome de usuária/o!",
     "<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 para a página da sua comunidade</h1>\n<p>\n    Use a descrição longa para apresentar a comunidade para novas/os integrantes ou partilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' do HTML\n</p>\n",
     "Add rooms to the community summary": "Adicionar salas para o índice da comunidade",
@@ -730,7 +679,6 @@
     "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte",
     "Create a new community": "Criar nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crie uma comunidade para agrupar em um mesmo local pessoas e salas! Monte uma página inicial personalizada para dar uma identidade ao seu espaço no universo Matrix.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Exibir dispositivos</showDevicesText>, <sendAnywayText>enviar assim mesmo</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Sua mensagem não foi enviada.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todas</resendText> ou <cancelText>cancelar todas</cancelText> agora. Você também pode selecionar mensagens individualmente a serem reenviadas ou canceladas.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensagem</resendText> ou <cancelText>cancelar mensagem</cancelText> agora.",
@@ -746,7 +694,6 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Note que você está se conectando ao servidor %(hs)s, e não ao servidor matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor de base (homeserver) não oferece fluxos de login que funcionem neste cliente.",
     "Define the power level of a user": "Definir o nível de permissões de um(a) usuário(a)",
-    "Verifies a user, device, and pubkey tuple": "Verifica um(a) usuário(a), dispositivo ou tuplo da chave pública",
     "Ignores a user, hiding their messages from you": "Ignora um(a) usuário(a), ocultando suas mensagens de você",
     "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar um(a) usuário(a), exibindo suas mensagens daqui para frente",
     "Notify the whole room": "Notifica a sala inteira",
@@ -756,11 +703,7 @@
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala",
     "Did you know: you can use communities to filter your Riot.im experience!": "Você sabia? Você pode usar as comunidades para filtrar a sua experiência no Riot!",
     "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.": "Para criar um filtro, arraste a imagem de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na imagem de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Seu pedido de confirmação de chaves foi realizado - favor verificar seus outros dispositivos.",
-    "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.": "Pedidos de confirmação de chaves são enviados aos outros dispositivos automaticamente. Se você rejeitou ou negou uma confirmação de chaves em seus outros dispositivos, clique aqui para enviar novamente.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se seus outros dispositivos não têm a chave para esta mensagem, você não poderá decriptá-las.",
     "Key request sent.": "Requisição de chave enviada.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Requisitar novamente chaves de encriptação</requestLink> de seus outros dispositivos.",
     "Fetching third party location failed": "Falha ao acessar localização de terceiros",
     "A new version of Riot is available.": "Uma nova versão do Riot está disponível.",
     "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
@@ -808,7 +751,6 @@
     "Files": "Arquivos",
     "Collecting app version information": "Coletando informação sobre a versão do app",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
     "Keywords": "Palavras-chave",
     "Enable notifications for this account": "Ativar notificações para esta conta",
     "Invite to this community": "Convidar para essa comunidade",
@@ -957,20 +899,13 @@
     "Encrypted messages in group chats": "Mensagens criptografadas em bate-papos de grupo",
     "Delete Backup": "Deletar Backup",
     "Unable to load key backup status": "Não é possível carregar o status da chave de backup",
-    "Backup has a <validity>valid</validity> signature from this device": "O backup tem uma assinatura <validity>válida</validity> deste dispositivo",
     "Backup version: ": "Versão do Backup: ",
     "Algorithm: ": "Algoritmo: ",
     "This event could not be displayed": "O evento não pôde ser exibido",
     "Use a longer keyboard pattern with more turns": "Use um padrão de teclas em diferentes direções e sentido",
     "Share Link to User": "Compartilhar Link com Usuário",
-    "underlined": "sublinhado",
-    "inline-code": "código inline",
-    "numbered-list": "lista ordenada",
-    "bulleted-list": "lista não-ordenada",
     "This room has been replaced and is no longer active.": "Esta sala foi substituída e não está mais ativa.",
     "The conversation continues here.": "A conversa continua aqui.",
-    "Unable to reply": "Não é possível responder",
-    "At this time it is not possible to reply with an emote.": "Neste momento não é possível responder com um emote.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s (%(userName)s) em %(dateTime)s",
     "Share room": "Compartilhar sala",
     "System Alerts": "Alertas do Sistema",
@@ -982,13 +917,6 @@
     "You don't currently have any stickerpacks enabled": "Atualmente, você não tem nenhum stickerpacks ativado",
     "Demote": "Reduzir privilégio",
     "Demote yourself?": "Reduzir seu próprio privilégio?",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "O backup tem uma assinatura <validity>válida</validity> do dispositivo <verify>verificado</ verify><device></ device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "O backup tem uma assinatura <validity>válida</validity> do dispositivo <verify>não verificado</ verify><device></ device>",
-    "Backup is not signed by any of your devices": "O backup não está assinado por nenhum dos seus dispositivos",
-    "deleted": "excluído",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "O backup tem uma assinatura <validity>inválida</validity> do dispositivo <verify>verificado</ verify> <device></ device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "O backup tem uma assinatura <validity>inválida</validity> do dispositivo <verify>não verificado</ verify> <device></ device>",
-    "block-quote": "bloco de citação",
     "Add some now": "Adicione alguns agora",
     "Stickerpack": "Stickerpack",
     "Hide Stickers": "Esconder Stickers",
@@ -1067,7 +995,6 @@
     "This looks like a valid recovery key!": "Isso parece uma chave de recuperação válida!",
     "Not a valid recovery key": "Não é uma chave de recuperação válida",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Acesse seu histórico seguro de mensagens e configure mensagens seguras inserindo sua chave de recuperação.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Se você esqueceu sua senha de recuperação, você pode <button>configurar novas opções de recuperação</ button>",
     "Share Message": "Compartilhar Mensagem",
     "Popout widget": "Widget Popout",
     "Send Logs": "Enviar relatos de problemas",
@@ -1114,12 +1041,9 @@
     "Your Recovery Key": "Sua chave de recuperação",
     "Copy to clipboard": "Copiar para área de transferência",
     "Download": "Baixar",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Sua chave de recuperação foi <b>copiada para sua área de transferência</ b>, cole-a em:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Sua chave de recuperação está na sua pasta <b>Downloads</ b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Imprima-o</ b> e armazene-o em algum lugar seguro",
     "<b>Save it</b> on a USB key or backup drive": "<b>Salve isto</ b> em uma chave USB ou unidade de backup",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copie isto</ b> para seu armazenamento em nuvem pessoal",
-    "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.": "Sem configurar o Recuperação Segura de Mensagens, você não poderá restaurar o histórico de mensagens criptografadas se fizer logout ou usar outro dispositivo.",
     "Set up Secure Message Recovery": "Configurar Recuperação Segura de Mensagens",
     "Keep it safe": "Mantenha isto seguro",
     "Create Key Backup": "Criar backup de chave",
@@ -1180,7 +1104,6 @@
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Mensagens seguras com este usuário são criptografadas de ponta a ponta e não podem ser lidas por terceiros.",
     "Got It": "Entendi",
     "Unable to find a supported verification method.": "Não é possível encontrar um método de confirmação suportado.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Para segurança máxima, recomendamos que você faça isso pessoalmente ou use outro meio confiável de comunicação.",
     "Dog": "Cachorro",
     "Cat": "Gato",
     "Lion": "Leão",
@@ -1233,7 +1156,6 @@
     "Pencil": "Lápis",
     "Paperclip": "Clipe de papel",
     "Scissors": "Tesouras",
-    "Padlock": "Cadeado",
     "Key": "Chave",
     "Hammer": "Martelo",
     "Telephone": "Telefone",
@@ -1251,7 +1173,6 @@
     "Headphones": "Fones de ouvido",
     "Folder": "Pasta",
     "Pin": "Alfinete",
-    "Your homeserver does not support device management.": "Seu homeserver não suporta gerenciamento de dispositivos.",
     "Yes": "Sim",
     "No": "Não",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Enviamos um e-mail para você confirmar seu endereço. Por favor, siga as instruções e clique no botão abaixo.",
@@ -1259,20 +1180,15 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Você tem certeza? Você perderá suas mensagens criptografadas se não for feito o backup correto de suas chaves.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensagens criptografadas são protegidas com criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.",
     "Restore from Backup": "Restaurar do Backup",
-    "This device is backing up your keys. ": "Este dispositivo está fazendo backup de suas chaves. ",
     "Back up your keys before signing out to avoid losing them.": "Faça o backup das suas chaves antes de sair, para evitar perdê-las.",
     "Backing up %(sessionsRemaining)s keys...": "Fazendo o backup das chaves de %(sessionsRemaining)s...",
     "All keys backed up": "O Backup de todas as chaves foi realizado",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "O Backup tem uma assinatura do dispositivo <verify>unknown</ verify> com ID %(deviceId)s.",
-    "This backup is trusted because it has been restored on this device": "Este backup é confiável porque foi restaurado neste dispositivo",
-    "Your keys are <b>not being backed up from this device</b>.": "Suas chaves <b>não estão sendo copiadas para este dispositivo</ b>.",
     "Start using Key Backup": "Comece a usar o Backup de chave",
     "Add an email address to configure email notifications": "Adicione um endereço de e-mail para configurar notificações por e-mail",
     "Unable to verify phone number.": "Não é possível verificar o número de telefone.",
     "Verification code": "Código de verificação",
     "Phone Number": "Número de telefone",
     "Profile picture": "Foto de Perfil",
-    "Upload profile picture": "Carregar foto do perfil",
     "<a>Upgrade</a> to your own domain": "<a>Atualize</a> para seu próprio domínio",
     "Set a new account password...": "Definir uma nova senha da conta...",
     "Email addresses": "Endereços de e-mail",
diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json
index f2828efc59..6c3059399f 100644
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -19,7 +19,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Informațiile care ne sunt trimise pentru a ne ajuta să facem mai bine Riot.im includ:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "În cazul în care această pagină include informații care pot fi identificate, cum ar fi o cameră, un utilizator sau un ID de grup, aceste date sunt eliminate înainte de a fi trimise la server.",
     "Call Failed": "Apel eșuat",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "În această cameră există dispozitive necunoscute: dacă veți continua fără a le verifica, va fi posibil ca cineva să vă asculte apelul.",
     "Review Devices": "Examinați dispozitivele",
     "Call Anyway": "Sună oricum",
     "Answer Anyway": "Răspunsul Oricum",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 608c7a3328..1d799f3a40 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -48,7 +48,6 @@
     "I have verified my email address": "Я подтвердил свой email",
     "Import E2E room keys": "Импорт ключей шифрования",
     "Invalid Email Address": "Недопустимый email",
-    "Invite new room members": "Пригласить в комнату новых участников",
     "Invites": "Приглашения",
     "Invites user with given id to current room": "Приглашает пользователя с заданным ID в текущую комнату",
     "Sign in with": "Войти с помощью",
@@ -61,8 +60,6 @@
     "Manage Integrations": "Управление интеграциями",
     "Moderator": "Модератор",
     "Name": "Имя",
-    "Never send encrypted messages to unverified devices from this device": "Никогда не отправлять зашифрованные сообщения на непроверенные устройства (с этого устройства)",
-    "Never send encrypted messages to unverified devices in this room from this device": "Никогда не отправлять зашифрованные сообщения на непроверенные устройства (в этой комнате, с этого устройства)",
     "New passwords must match each other.": "Новые пароли должны совпадать.",
     "none": "никто",
     "Notifications": "Уведомления",
@@ -70,7 +67,6 @@
     "NOT verified": "НЕ проверено",
     "No users have specific privileges in this room": "Ни один пользователь не имеет особых прав в этой комнате",
     "Password": "Пароль",
-    "People": "Люди",
     "Permissions": "Права доступа",
     "Phone": "Телефон",
     "Remove": "Удалить",
@@ -78,7 +74,6 @@
     "Send Reset Email": "Отправить письмо со ссылкой для сброса пароля",
     "Settings": "Настройки",
     "Start a chat": "Начать разговор",
-    "Start Chat": "Начать разговор",
     "Unable to add email address": "Не удается добавить email",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
     "Unable to verify email address.": "Не удалось проверить email.",
@@ -100,10 +95,8 @@
     "Warning!": "Внимание!",
     "Who can access this room?": "Кто может войти в эту комнату?",
     "Who can read history?": "Кто может читать историю?",
-    "Who would you like to communicate with?": "С кем бы вы хотели связаться?",
     "You do not have permission to post to this room": "Вы не можете писать в эту комнату",
     "You have no visible notifications": "Нет видимых уведомлений",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Пароль успешно изменен. До повторной авторизации вы не будете получать push-уведомления на других устройствах",
     "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
@@ -170,7 +163,6 @@
     "Sat": "Сб",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш email не связан ни с одним пользователем на этом сервере.",
     "To use it, just wait for autocomplete results to load and tab through them.": "Чтобы воспользоваться этой функцией, дождитесь загрузки результатов в окне автодополнения, а затем используйте Tab для прокрутки.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил(а) в комнате сквозное шифрование (алгоритм %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
     "Unable to capture screen": "Не удается сделать снимок экрана",
     "Unable to enable Notifications": "Не удалось включить уведомления",
@@ -186,7 +178,6 @@
     "Click to unmute video": "Щелкните, чтобы включить видео",
     "Click to unmute audio": "Щелкните, чтобы включить звук",
     "Decrypt %(text)s": "Расшифровать %(text)s",
-    "Devices": "Устройства",
     "Direct chats": "Личные чаты",
     "Disinvite": "Отозвать приглашение",
     "Download %(text)s": "Скачать %(text)s",
@@ -214,20 +205,13 @@
     "Failed to set display name": "Не удалось задать отображаемое имя",
     "Failed to toggle moderator status": "Не удалось переключить статус модератора",
     "Fill screen": "Заполнить экран",
-    "Hide Text Formatting Toolbar": "Скрыть инструменты форматирования текста",
     "Incorrect verification code": "Неверный код подтверждения",
-    "Invalid alias format": "Недопустимый формат имени",
-    "'%(alias)s' is not a valid format for an alias": "Имя '%(alias)s' имеет недопустимый формат",
     "Join Room": "Войти в комнату",
     "Kick": "Выгнать",
     "Local addresses for this room:": "Адреса этой комнаты на вашем сервере:",
-    "Markdown is disabled": "Markdown отключен",
-    "Markdown is enabled": "Markdown включен",
-    "matrix-react-sdk version:": "версия matrix-react-sdk:",
     "New address (e.g. #foo:%(localDomain)s)": "Новый адрес (например, #чтонибудь:%(localDomain)s)",
     "New passwords don't match": "Новые пароли не совпадают",
     "not specified": "не задан",
-    "No devices with registered encryption keys": "Нет устройств с зарегистрированными ключами шифрования",
     "No more results": "Больше никаких результатов",
     "No results": "Нет результатов",
     "OK": "OK",
@@ -251,8 +235,6 @@
     "Scroll to bottom of page": "Перейти к нижней части страницы",
     "Search": "Поиск",
     "Search failed": "Поиск не удался",
-    "Sender device information": "Информация об устройстве отправителя",
-    "Send Invites": "Отправить приглашения",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил(а) изображение.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s пригласил(а) %(targetDisplayName)s в комнату.",
     "Sign in": "Войти",
@@ -275,8 +257,6 @@
     "Make Moderator": "Сделать модератором",
     "Room": "Комната",
     "Cancel": "Отмена",
-    "bold": "жирный",
-    "italic": "курсив",
     "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>.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан URL HTTPS. Используйте HTTPS или <a>либо включите небезопасные сценарии</a>.",
     "Dismiss": "Отклонить",
     "Custom Server Options": "Параметры другого сервера",
@@ -287,7 +267,6 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Отображать время в 12-часовом формате (напр. 2:30 ПП)",
     "Use compact timeline layout": "Использовать компактный вид списка сообщений",
     "No Microphones detected": "Микрофоны не обнаружены",
-    "Unknown devices": "Неизвестное устройство",
     "Camera": "Камера",
     "Microphone": "Микрофон",
     "Start automatically after system login": "Автозапуск при входе в систему",
@@ -301,12 +280,8 @@
     "Anyone": "Все",
     "Are you sure you want to leave the room '%(roomName)s'?": "Вы уверены, что хотите покинуть '%(roomName)s'?",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s удалил(а) имя комнаты.",
-    "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.": "Смена пароля на данный момент сбрасывает ключи сквозного шифрования на всех устройствах, делая историю зашифрованных чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи сквозного шифрования и импортируйте их после смены пароля. В будущем это будет исправлено.",
     "Custom level": "Специальные права",
-    "Device already verified!": "Устройство уже проверено!",
-    "Device ID:": "ID устройства:",
     "device id: ": "ID устройства: ",
-    "Device key:": "Ключ устройства:",
     "Email address": "Email",
     "Error decrypting attachment": "Ошибка расшифровки вложения",
     "Export": "Экспорт",
@@ -315,7 +290,6 @@
     "Invalid file%(extra)s": "Недопустимый файл%(extra)s",
     "Invited": "Приглашен",
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
-    "Message not sent due to unknown devices being present": "Сообщение не отправлено из-за присутствия неизвестных устройств",
     "Privileged Users": "Привилегированные пользователи",
     "Revoke Moderator": "Отозвать права модератора",
     "Register": "Зарегистрироваться",
@@ -331,18 +305,12 @@
     "%(senderName)s set a profile picture.": "%(senderName)s установил(а) себе аватар.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
-    "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. Это устройство помечено как проверенное.",
     "This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
     "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.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден.",
-    "Unable to load device list": "Не удалось загрузить список устройств",
-    "Unknown (user, device) pair:": "Неизвестная пара пользователь-устройство:",
     "Unmute": "Вернуть право речи",
-    "Unrecognised command:": "Нераспознанная команда:",
     "Unrecognised room alias:": "Нераспознанный псевдоним комнаты:",
     "Verified key": "Ключ проверен",
-    "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\". Это может означать, что ваше общение перехватывается!",
     "You have <a>disabled</a> URL previews by default.": "Предпросмотр ссылок по умолчанию <a>выключен</a> для вас.",
     "You have <a>enabled</a> URL previews by default.": "Предпросмотр ссылок по умолчанию <a>включен</a> для вас.",
     "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
@@ -369,17 +337,9 @@
     "Unknown error": "Неизвестная ошибка",
     "Incorrect password": "Неверный пароль",
     "To continue, please enter your 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.": "Если совпадают, нажмите кнопку подтверждения ниже. Если нет — значит, кто-то  перехватил это устройство, и вы, скорее всего, захотите внести его в черный список.",
-    "Verify device": "Проверить устройство",
     "I verify that the keys match": "Я подтверждаю, что ключи совпадают",
     "Unable to restore 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, то ваша сессия может быть несовместима с текущей. Закройте это окно и вернитесь к использованию более новой версии.",
-    "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.": "Мы рекомендуем вам выполнить процедуру проверки каждого устройства, чтобы удостовериться, что они принадлежат их законному владельцу, но вы можете переотправить сообщение без проверки, если хотите.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" содержит неподтвержденные устройства.",
     "Unknown Address": "Неизвестный адрес",
     "Unblacklist": "Разблокировать",
     "Blacklist": "Заблокировать",
@@ -434,7 +394,6 @@
     "Disable Notifications": "Отключить уведомления",
     "Drop File Here": "Перетащите файл сюда",
     "Enable Notifications": "Включить оповещения",
-    "Encrypted by an unverified device": "Зашифровано непроверенным устройством",
     "Failed to upload profile picture!": "Не удалось загрузить аватар!",
     "Incoming call from %(name)s": "Входящий вызов от %(name)s",
     "Incoming video call from %(name)s": "Входящий видеовызов от %(name)s",
@@ -449,14 +408,10 @@
     "(~%(count)s results)|other": "(~%(count)s результатов)",
     "Custom": "Пользовательские",
     "Decline": "Отклонить",
-    "Room contains unknown devices": "Комната содержит непроверенные устройства",
     "%(roomName)s does not exist.": "%(roomName)s не существует.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s на данный момент недоступна.",
     "Seen by %(userName)s at %(dateTime)s": "Прочитано %(userName)s в %(dateTime)s",
     "Send anyway": "Отправить в любом случае",
-    "Show Text Formatting Toolbar": "Показать инструменты форматирования текста",
-    "Undecryptable": "Невозможно расшифровать",
-    "Unencrypted message": "Нешифрованное сообщение",
     "unknown caller": "неизвестный абонент",
     "Unnamed Room": "Комната без названия",
     "Upload new:": "Загрузить новый:",
@@ -475,8 +430,6 @@
     "Start verification": "Начать проверку",
     "Share without verifying": "Поделиться без проверки",
     "Ignore request": "Игнорировать запрос",
-    "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' запрашивает ключи шифрования.",
     "Encryption key request": "Запрос ключа шифрования",
     "Check for update": "Проверить наличие обновлений",
     "Add a widget": "Добавить виджет",
@@ -493,8 +446,6 @@
     "Unable to create widget.": "Не удалось создать виджет.",
     "You are not in this room.": "Вас сейчас нет в этой комнате.",
     "You do not have permission to do that in this room.": "У вас нет разрешения на это в данной комнате.",
-    "Verifies a user, device, and pubkey tuple": "Проверка пользователя, устройства и открытого ключа",
-    "Loading device info...": "Загрузка информации об устройстве...",
     "Example": "Пример",
     "Create": "Создать",
     "Featured Rooms:": "Рекомендуемые комнаты:",
@@ -703,11 +654,8 @@
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
     "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>?",
     "Something went wrong when trying to get your communities.": "Что-то пошло не так при попытке получить список ваших сообществ.",
-    "Delete %(count)s devices|other": "Удалить (%(count)s)",
-    "Delete %(count)s devices|one": "Удалить",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Этот домашний сервер не поддерживает метод входа, поддерживаемый клиентом.",
     "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.": "В этой комнате есть неизвестные устройства: если вы решите их не проверять, имейте в виду, что кто-то, возможно, вас прослушивает.",
     "Review Devices": "Проверка устройств",
     "Call Anyway": "Позвонить в любом случае",
     "Answer Anyway": "Ответить в любом случае",
@@ -746,7 +694,6 @@
     "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",
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
     "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
@@ -756,11 +703,7 @@
     "Clear filter": "Очистить фильтр",
     "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.": "Чтобы настроить фильтр, перетащите аватар сообщества на панель фильтров в левой части экрана. Вы можете нажать на аватар в панели фильтров в любое время, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!",
-    "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> с других устройств.",
-    "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.": "Запросы на передачу ключей автоматически отправляются на другие устройства. Если вы отклонили или отменили запрос на другом устройстве, нажмите, чтобы запросить ключи повторно.",
     "Code": "Код",
     "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, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Submit debug logs": "Отправка журналов отладки",
@@ -825,7 +768,6 @@
     "Resend": "Переотправить",
     "Collecting app version information": "Сбор информации о версии приложения",
     "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.": "Это позволит вам вернуться к учётной записи после выхода из системы и войти на других устройствах.",
     "Keywords": "Ключевые слова",
     "Enable notifications for this account": "Включить уведомления для этой учётной записи",
     "Invite to this community": "Пригласить в это сообщество",
@@ -918,7 +860,6 @@
     "Refresh": "Обновить",
     "We encountered an error trying to restore your previous session.": "Произошла ошибка при попытке восстановить предыдущий сеанс.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена и зашифрованная история чата станет нечитаемой.",
-    "Unable to reply": "Не удается ответить",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
     "Collapse Reply Thread": "Ответить с цитированием",
@@ -961,8 +902,6 @@
     "Demote": "Понижение",
     "Demote yourself?": "Понизить самого себя?",
     "This event could not be displayed": "Это событие отобразить невозможно",
-    "deleted": "удален",
-    "underlined": "подчеркнутый",
     "Permission Required": "Требуется разрешение",
     "You do not have permission to start a conference call in this room": "У вас нет разрешения на запуск конференции в этой комнате",
     "A call is currently being placed!": "Есть активный вызов!",
@@ -1055,7 +994,6 @@
     "You've successfully verified this user.": "Вы успешно верифицировали этого пользователя.",
     "Got It": "Понял",
     "Verify this user by confirming the following number appears on their screen.": "Верифицируйте пользователя, убедившись, что на его экране отображается следующее число.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Для максимальной безопасности мы рекомендуем вам делать это лично или использовать другие надежные средства связи.",
     "Yes": "Да",
     "No": "Нет",
     "Email Address": "Адрес электронной почты",
@@ -1118,10 +1056,7 @@
     "General": "Общие",
     "Set a new account password...": "Установить новый пароль учётной записи...",
     "Legal": "Законный",
-    "At this time it is not possible to reply with an emote.": "В настоящее время невозможно ответить с помощью эмоции.",
     "Room avatar": "Аватар комнаты",
-    "Upload room avatar": "Загрузить аватар комнаты",
-    "No room avatar": "Нет аватара комнаты",
     "The following users may not exist": "Следующих пользователей может не существовать",
     "Invite anyway and never warn me again": "Тем не менее пригласить и больше не предупреждать",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Перед отправкой логов необходимо <a>создать GitHub issue</a>, для описания проблемы.",
@@ -1168,7 +1103,6 @@
     "Go to Settings": "Перейти в настройки",
     "Set up Secure Messages": "Настроить безопасные сообщения",
     "Recovery Method Removed": "Метод восстановления удален",
-    "This device is encrypting history using the new recovery method.": "Устройство шифрует историю, используя новый метод восстановления.",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Обнаружена новая парольная фраза восстановления и ключ для безопасных сообщений.",
     "New Recovery Method": "Новый метод восстановления",
     "If you don't want to set this up now, you can later in Settings.": "Это можно сделать позже в настройках.",
@@ -1223,7 +1157,6 @@
     "Book": "Книга",
     "Pencil": "Карандаш",
     "Paperclip": "Скрепка для бумаг",
-    "Padlock": "Замок",
     "Key": "Ключ",
     "Hammer": "Молоток",
     "Telephone": "Телефон",
@@ -1241,7 +1174,6 @@
     "Headphones": "Наушники",
     "Folder": "Папка",
     "Pin": "Кнопка",
-    "Your homeserver does not support device management.": "Ваш сервер не поддерживает управление устройством.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Выполняется резервная копия ключей  (первый раз это может занять несколько минут).",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает разрешённый предел для текущего сервера",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения",
@@ -1266,20 +1198,9 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифрованные сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
     "Unable to load key backup status": "Не удалось получить статус резервного копирования для ключей шифрования",
     "Restore from Backup": "Восстановить из резервной копии",
-    "This device is backing up your keys. ": "Это устройство хранит резервную копию ключей шифрования. ",
     "Back up your keys before signing out to avoid losing them.": "Перед выходом сохраните резервную копию ключей шифрования, чтобы не потерять их.",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Резервная копия подписана <verify>неизвестным</verify> устройством с ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "Резервная копия заверена <validity>действительной</validity> подписью от этого устройства",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Резервная копия заверена <validity>действительной</validity> подписью от <verify>подтверждённого</verify> устройства <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Резервная копия заверена <validity>действительной</validity> подписью от <verify>неподтверждённого</verify> устройства <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Резервная копия заверена <validity>недействительной</validity> подписью от <verify>подтверждённого</verify> устройства <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Резервная копия заверена <validity>недействительной</validity> подписью от <verify>неподтверждённого</verify> устройства <device></device>",
-    "Backup is not signed by any of your devices": "Резервная копия не заверена ни одним из ваших устройств",
-    "This backup is trusted because it has been restored on this device": "Эта резервная копия считается надёжной потому что была восстановлена на этом устройстве",
-    "Your keys are <b>not being backed up from this device</b>.": "Ключи шифрования с этого устройства <b>не сохраняются в резервную копию</b>.",
     "Start using Key Backup": "Использовать резервную копию ключей шифрования",
     "Profile picture": "Аватар",
-    "Upload profile picture": "Загрузить аватар",
     "Accept all %(invitedRooms)s invites": "Принять все приглашения (%(invitedRooms)s)",
     "Missing media permissions, click the button below to request.": "Отсутствует доступ к источнику медиа. Нажмите кнопку ниже чтобы запросить.",
     "Request media permissions": "Запросить доступ к медиа носителю",
@@ -1312,13 +1233,7 @@
     "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не был загружен.",
     "The server does not support the room version specified.": "Сервер не поддерживает указанную версию комнаты.",
     "Name or Matrix ID": "Имя или Matrix ID",
-    "Email, name or Matrix ID": "Эл. почта, имя или Matrix ID",
-    "Room upgrade confirmation": "Подтверждение модернизации комнаты",
-    "Upgrading a room can be destructive and isn't always necessary.": "Модернизация комнаты может быть разрушительной и не всегда необходимой.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Модернизация версий комнат обычно рекомендуются, если номер версии комнаты считается <i> нестабильным</i>. Нестабильные версии комнат могут содержать ошибки, отсутствующие функции или уязвимости безопасности.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Модернизация комнаты обычно влияет только на обработку <i>серверной стороны</i> комнаты. Если у вас возникли проблемы с вашим Riot-клиентом , пожалуйста, отправьте запрос в <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Предупреждение</b>: Обновление номера <i>не приведет к автоматическому переходу участников комнаты на новую версию комнаты.</i> Мы разместим ссылку на новую комнату в старой версии комнаты - участники комнаты должны будут нажать эту ссылку для присоединения к новой комнате.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Пожалуйста, подтвердите, что вы хотите перейти к обновлению этой комнаты с <oldVersion /> на <newVersion />.",
     "Changes your avatar in this current room only": "Меняет ваш аватар только в этой комнате",
     "Unbans user with given ID": "Разблокирует пользователя с заданным ID",
     "Adds a custom widget by URL to the room": "Добавляет пользовательский виджет по URL-адресу в комнате",
@@ -1333,12 +1248,6 @@
     "Show read receipts sent by other users": "Показать подтверждение прочтения, отправленные другими пользователями",
     "Show hidden events in timeline": "Показать скрытые события в хронологии",
     "When rooms are upgraded": "При обновлении комнат",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Это устройство <b>не выполняет резервное копирование ключей</b>, но у вас есть существующая резервная копия, которую вы можете восстановить и добавить в следующий раз.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Подключите это устройство к резервной копии ключей перед выходом из системы, чтобы избежать потери любых ключей, которые могут находиться только на этом устройстве.",
-    "Connect this device to Key Backup": "Подключите это устройство к функции резервного копирования ключей",
-    "Backup has an <validity>invalid</validity> signature from this device": "Резервная копия имеет <validity>недействительную</validity>подпись с этого устройства",
-    "Enable desktop notifications for this device": "Включить уведомления на рабочем столе для этого устройства",
-    "Enable audible notifications for this device": "Включение звуковых оповещений для данного устройства",
     "<a>Upgrade</a> to your own domain": "<a>Обновление</a> до собственного домена",
     "Credits": "Благодарности",
     "Bulk options": "Групповые опции",
@@ -1360,14 +1269,6 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s выключено для %(groups)s в этой комнате.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s включено для %(newGroups)s и отключено для %(oldGroups)s в этой комнате.",
     "Once enabled, encryption cannot be disabled.": "После включения, шифрование не может быть отключено.",
-    "Some devices for this user are not trusted": "Некоторые устройства для этого пользователя не являются доверенными",
-    "Some devices in this encrypted room are not trusted": "Некоторые устройства в этой зашифрованной комнате являются недоверенными",
-    "All devices for this user are trusted": "Все устройства для этого пользователя являются доверенными",
-    "All devices in this encrypted room are trusted": "Все устройства в этой зашифрованной комнате являются доверенными",
-    "inline-code": "встроенный код",
-    "block-quote": "цитата",
-    "bulleted-list": "маркированный список",
-    "numbered-list": "нумерованный-список",
     "This room has been replaced and is no longer active.": "Эта комната была заменена и больше не активна.",
     "Joining room …": "Вступление в комнату …",
     "Loading …": "Загрузка…",
@@ -1435,7 +1336,6 @@
     "Use two-way text verification": "Использовать двустороннюю проверку текста",
     "View Servers in Room": "Просмотр серверов в комнате",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам дополнительное спокойствие при использовании сквозного шифрования сообщений.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Проверка этого пользователя пометит его устройство как доверенное, а также пометит ваше устройство как доверенное.",
     "Waiting for partner to confirm...": "В ожидании партнера, чтобы подтвердить ...",
     "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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
@@ -1477,7 +1377,6 @@
     "This looks like a valid recovery key!": "Это похоже на действительный ключ восстановления!",
     "Not a valid 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>": "Если вы забыли пароль для восстановления, вы можете <button>настроить новые параметры восстановления</button>",
     "Share Permalink": "Поделиться постоянной ссылкой",
     "Clear status": "Удалить статус",
     "Update status": "Обновить статус",
@@ -1525,13 +1424,11 @@
     "Guest": "Гость",
     "Your profile": "Ваш профиль",
     "Could not load user profile": "Не удалось загрузить профиль пользователя",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Смена пароля приведет к сбросу любых сквозных ключей шифрования на всех ваших устройствах, что сделает историю зашифрованного чата нечитаемой. Настройте Резервное копирование ключей или экспортируйте ключи от вашей комнаты с другого устройства перед сбросом пароля.",
     "Your Matrix account on %(serverName)s": "Ваша учётная запись Matrix на %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Ваша учётная запись Matrix на <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Письмо с подтверждением будет отправлено на ваш почтовый ящик, чтобы подтвердить установку нового пароля.",
     "Sign in instead": "Войдите, вместо этого",
     "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.": "Вы вышли из всех устройств и больше не будете получать push-уведомления. Чтобы снова включить уведомления, войдите в систему повторно на каждом устройстве.",
     "Set a new password": "Установить новый пароль",
     "Invalid homeserver discovery response": "Неверное обнаружения сервера",
     "Failed to get autodiscovery configuration from server": "Не удалось получить конфигурацию автообнаружения с сервера",
@@ -1567,11 +1464,7 @@
     "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.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключ восстановления - это сеть безопасности, с помощью которой можно восстановить доступ к зашифрованным сообщениям, если вы забудете пароль.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Храните ключ восстановления в надежном месте, например в менеджере паролей (или в сейфе)",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Ваш ключ восстановления <b>скопирован в буфер обмена</b>, вставьте его в:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Ваш ключ восстановления находится в папке <b>Загрузки</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Распечатайте его</b> и храните в безопасном месте",
-    "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.": "Без настройки безопасного восстановления сообщений вы не сможете восстановить историю зашифрованных сообщений, если выйдете из системы или используете другое устройство.",
     "Secure your backup with a passphrase": "Защитите вашу резервную копию паролем",
     "Confirm your passphrase": "Подтвердите свой пароль",
     "Recovery key": "Ключ восстановления",
@@ -1580,8 +1473,6 @@
     "Retry": "Попробуйте снова",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Без настройки безопасного восстановления сообщений при выходе из системы вы потеряете историю защищенных сообщений.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не установили новый метод восстановления, злоумышленник может попытаться получить доступ к вашей учётной записи. Измените пароль учётной записи и сразу установите новый способ восстановления в настройках.",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Это устройство обнаружило, что ваш пароль восстановления и ключ для безопасных сообщений были удалены.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Если вы сделали это случайно, вы можете настроить безопасные сообщения на этом устройстве, которые будут повторно зашифровать историю сообщений этого устройства с новым методом восстановления.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не удалили метод восстановления, злоумышленник может попытаться получить доступ к вашей учётной записи. Измените пароль учётной записи и сразу установите новый способ восстановления в настройках.",
     "Cannot reach homeserver": "Не удаётся связаться с сервером",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Убедитесь, что у вас есть стабильное подключение к интернету, или свяжитесь с администратором сервера",
@@ -1607,8 +1498,6 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sне внёс изменений",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Пожалуйста, расскажите нам что пошло не так, либо, ещё лучше, создайте отчёт в GitHub с описанием проблемы.",
     "Removing…": "Удаление…",
-    "Clear all data on this device?": "Очистить все данные на этом устройстве?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Очистка данных на этом устройстве необратима. Шифрованные сообщения будут утеряны, если не было сделано резервной копии их ключей шифрования.",
     "Clear all data": "Очистить все данные",
     "Your homeserver doesn't seem to support this feature.": "Ваш сервер похоже не поддерживает эту возможность.",
     "Message edits": "Правки сообщения",
@@ -1628,18 +1517,15 @@
     "Continue with previous account": "Продолжить с предыдущей учётной записью",
     "Failed to re-authenticate due to a homeserver problem": "Ошибка повторной аутентификации из-за проблем на сервере",
     "Failed to re-authenticate": "Ошибка повторной аутентификации",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Восстановить доступ к Вашей учётной записи и восстановить ключи шифрования, сохранённые на этом устройстве. Без них Вы не сможете читать все ваши зашифрованные сообщения на любом устройстве.",
     "Enter your password to sign in and regain access to your account.": "Введите Ваш пароль для входа и восстановления доступа к Вашей учётной записи.",
     "Forgotten your password?": "Забыли Ваш пароль?",
     "Sign in and regain access to your account.": "Войти и восстановить доступ к Вашей учётной записи.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Вы не можете войти в Вашу учётную запись. Пожалуйста свяжитесь с администратором вашего сервера для более подробной информации.",
     "You're signed out": "Вы вышли из учётной записи",
     "Clear personal data": "Очистить персональные данные",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Внимание: Ваши персональные данные (включая ключи шифрования) всё ещё хранятся на этом устройстви. Очистите их, если Вы закончили использовать это устройство, либо хотите войти в другую учётную запись.",
     "This account has been deactivated.": "Этот аккаунт был деактивирован.",
     "Call failed due to misconfigured server": "Вызов не состоялся из-за неправильно настроенного сервера",
     "Try using turn.matrix.org": "Попробуйте использовать turn.matrix.org",
-    "Failed to start chat": "Не удалось начать чат",
     "Messages": "Сообщения",
     "Actions": "Действия",
     "Displays list of commands with usages and descriptions": "Отображает список команд с описанием и использованием",
@@ -1683,7 +1569,6 @@
     "Create a private room": "Создать приватную комнату",
     "Topic (optional)": "Тема (опционально)",
     "Make this room public": "Сделать комнату публичной",
-    "Use the new, faster, composer for writing messages": "Используйте новый, более быстрый, редактор для написания сообщений",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Отправлять подтверждения о прочтении сообщений (требуется отключение совместимого домашнего сервера)",
     "Show previews/thumbnails for images": "Показать превью / миниатюры для изображений",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Отключиться от сервера идентификации <current /> и вместо этого подключиться к <new />?",
@@ -1703,7 +1588,6 @@
     "Always show the window menu bar": "Всегда показывать строку меню",
     "Read Marker lifetime (ms)": "Читать маркер время жизни (мс)",
     "Read Marker off-screen lifetime (ms)": "Читать маркер вне экрана время жизни (мс)",
-    "A device's public name is visible to people you communicate with": "Публичное имя устройства видно людям, с которыми вы общаетесь",
     "Upgrade the room": "Обновить эту комнату",
     "Enable room encryption": "Включить шифрование комнаты",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Вы должны <b> удалить свои личные данные </b> с сервера идентификации <idserver /> перед отключением. К сожалению, идентификационный сервер <idserver /> в данный момент отключен или недоступен.",
@@ -1780,7 +1664,6 @@
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default> Используйте значение по умолчанию (%(defaultIdentityServerName)s) </default> или  управляйте в <settings> Настройках</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в <settings>Настройки</settings>.",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Чтобы убедиться, что этому устройству можно доверять, проверьте ключ, который вы видите в настройках пользователя на этом устройстве, соответствует указанному ниже ключу:",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Установка адреса электронной почты для восстановления учетной записи. Используйте электронную почту или телефон, чтобы опционально быть обнаруженными существующими контактами.",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 8befc3c18c..f6f0cd3a74 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -57,10 +57,6 @@
     "Moderator": "Moderátor",
     "Admin": "Správca",
     "Start a chat": "Začať konverzáciu",
-    "Who would you like to communicate with?": "S kým si želáte komunikovať?",
-    "Start Chat": "Začať konverzáciu",
-    "Invite new room members": "Pozvať nových členov do miestnosti",
-    "Send Invites": "Poslať pozvánky",
     "Operation failed": "Operácia zlyhala",
     "Failed to invite": "Pozvanie zlyhalo",
     "Failed to invite the following users to the %(roomName)s room:": "Do miestnosti %(roomName)s sa nepodarilo pozvať nasledujúcich používateľov:",
@@ -83,13 +79,7 @@
     "You are now ignoring %(userId)s": "Od teraz ignorujete používateľa %(userId)s",
     "Unignored user": "Ignorácia zrušená",
     "You are no longer ignoring %(userId)s": "Od teraz viac neignorujete používateľa %(userId)s",
-    "Unknown (user, device) pair:": "Neznámy pár (používateľ, zariadenie):",
-    "Device already verified!": "Zariadenie už overené!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "POZOR: Zariadenie je už overené, ale kľúče SA NEZHODUJÚ!",
-    "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!": "POZOR: OVERENIE KĽÚČOV ZLYHALO! Podpisovací kľúč zo zariadenia %(deviceId)s používateľa %(userId)s je \"%(fprint)s\" čo sa nezhoduje s poskytnutým kľúčom \"%(fingerprint)s\". Mohlo by to znamenať, že vaša komunikácia je práve odpočúvaná!",
     "Verified key": "Kľúč overený",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podpisovací kľúč, ktorý ste poskytli súhlasí s podpisovacím kľúčom, ktorý ste dostali zo zariadenia %(deviceId)s používateľa %(userId)s's. Zariadenie je považované za overené.",
-    "Unrecognised command:": "Nerozpoznaný príkaz:",
     "Reason": "Dôvod",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie do %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
@@ -126,7 +116,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre každého.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s povolil E2E šifrovanie (algoritmus %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmenil úroveň moci pre %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s zmenil pripnuté správy pre túto miestnosť.",
@@ -159,7 +148,6 @@
     "No display name": "Žiadne zobrazované meno",
     "New passwords don't match": "Nové heslá sa nezhodujú",
     "Passwords can't be empty": "Heslá nemôžu byť prázdne",
-    "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.": "Zmena hesla momentálne obnoví šifrovacie kľúče na všetkých vašich zariadeniach, čo spôsobí, že história vašich šifrovaných konverzácií sa stane nečitateľná, jedine že si pred zmenou hesla exportujete kľúče miestností do súboru a po zmene kľúče importujete naspäť. V budúcnosti bude táto funkcia vylepšená.",
     "Continue": "Pokračovať",
     "Export E2E room keys": "Exportovať E2E šifrovacie kľúče miestností",
     "Do you want to set an email address?": "Želáte si nastaviť emailovú adresu?",
@@ -168,7 +156,6 @@
     "New Password": "Nové heslo",
     "Confirm password": "Potvrdiť heslo",
     "Change Password": "Zmeniť heslo",
-    "Unable to load device list": "Nie je možné načítať zoznam zariadení",
     "Device ID": "ID zariadenia",
     "Last seen": "Naposledy aktívne",
     "Failed to set display name": "Nepodarilo sa nastaviť zobrazované meno",
@@ -187,9 +174,6 @@
     "%(senderName)s sent a video": "%(senderName)s poslal video",
     "%(senderName)s uploaded a file": "%(senderName)s nahral súbor",
     "Options": "Možnosti",
-    "Undecryptable": "Nedešifrovateľné",
-    "Encrypted by an unverified device": "Zašifrované neovereným zariadením",
-    "Unencrypted message": "Nešifrovaná správa",
     "Please select the destination room for this message": "Prosím, vyberte cieľovú miestnosť pre túto správu",
     "Blacklisted": "Na čiernej listine",
     "device id: ": "ID zariadenia: ",
@@ -208,8 +192,6 @@
     "Failed to change power level": "Nepodarilo sa zmeniť úroveň moci",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Túto zmenu nebudete môcť vrátiť späť pretože tomuto používateľovi udeľujete rovnakú úroveň moci, akú máte vy.",
     "Are you sure?": "Ste si istí?",
-    "No devices with registered encryption keys": "Žiadne zariadenia so zaregistrovanými šifrovacími kľúčmi",
-    "Devices": "Zariadenia",
     "Unignore": "Prestať ignorovať",
     "Ignore": "Ignorovať",
     "Jump to read receipt": "Preskočiť na potvrdenie o prečítaní",
@@ -232,16 +214,10 @@
     "Voice call": "Audio hovor",
     "Video call": "Video hovor",
     "Upload file": "Nahrať súbor",
-    "Show Text Formatting Toolbar": "Zobraziť lištu formátovania textu",
     "You do not have permission to post to this room": "Nemáte povolenie posielať do tejto miestnosti",
-    "Hide Text Formatting Toolbar": "Skryť lištu formátovania textu",
     "Server error": "Chyba servera",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, preťažený, alebo sa pokazilo niečo iné.",
     "Command error": "Chyba príkazu",
-    "bold": "tučné",
-    "italic": "kurzíva",
-    "Markdown is disabled": "Markdown je zakázaný",
-    "Markdown is enabled": "Markdown je povolený",
     "Unpin Message": "Zrušiť pripnutie správy",
     "Jump to message": "Preskočiť na správu",
     "No pinned messages.": "Žiadne pripnuté správy.",
@@ -267,7 +243,6 @@
     "Community Invites": "Pozvánky do komunity",
     "Invites": "Pozvánky",
     "Favourites": "Obľúbené",
-    "People": "Ľudia",
     "Rooms": "Miestnosti",
     "Low priority": "Nízka priorita",
     "Historical": "Historické",
@@ -278,7 +253,6 @@
     "Banned by %(displayName)s": "Vstup zakázal %(displayName)s",
     "unknown error code": "neznámy kód chyby",
     "Failed to forget room %(errCode)s": "Nepodarilo sa zabudnúť miestnosť %(errCode)s",
-    "Never send encrypted messages to unverified devices in this room from this device": "Z tohoto zariadenia nikdy v tejto miestnosti neposielať šifrované správy na neoverené zariadenia",
     "Privileged Users": "Poverení používatelia",
     "No users have specific privileges in this room": "Žiadny používatelia nemajú v tejto miestnosti pridelené konkrétne poverenia",
     "Banned users": "Používatelia, ktorým bol zakázaný vstup",
@@ -304,8 +278,6 @@
     "Cancel": "Zrušiť",
     "Jump to first unread message.": "Preskočiť na prvú neprečítanú správu.",
     "Close": "Zatvoriť",
-    "Invalid alias format": "Nesprávny formát aliasu",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nie je platný formát pre alias",
     "not specified": "nezadané",
     "Remote addresses for this room:": "Vzdialené adresy do tejto miestnosti:",
     "Local addresses for this room:": "Lokálne adresy do tejto miestnosti:",
@@ -458,20 +430,12 @@
     "Unknown error": "Neznáma chyba",
     "Incorrect password": "Nesprávne heslo",
     "Deactivate Account": "Deaktivovať účet",
-    "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:": "Ak chcete overiť, či toto zariadenie je skutočne dôverihodné, kontaktujte jeho vlastníka iným spôsobom (napr. osobne alebo cez telefón) a opýtajte sa ho, či kľúč, ktorý má pre toto zariadenie zobrazený v nastaveniach sa zhoduje s kľúčom zobrazeným nižšie:",
-    "Device name": "Názov zariadenia",
-    "Device key": "Kľúč zariadenia",
-    "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.": "Ak sa kľúče zhodujú, stlačte tlačidlo Overiť nižšie. Ak sa nezhodujú, niekto ďalší odpočúva toto zariadenie a v takomto prípade by ste asi mali namiesto toho stlačiť tlačidlo Pridať na čiernu listinu.",
-    "Verify device": "Overiť zariadenie",
     "I verify that the keys match": "Overil som, kľúče sa zhodujú",
     "An error has occurred.": "Vyskytla sa chyba.",
     "OK": "OK",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Pridali ste nové zariadenie nazvané '%(displayName)s', ktoré žiada o šifrovacie kľúče.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Vaše neoverené zariadenie nazvané '%(displayName)s' žiada o šifrovacie kľúče.",
     "Start verification": "Spustiť overenie",
     "Share without verifying": "Zdieľať bez overenia",
     "Ignore request": "Ignorovať žiadosť",
-    "Loading device info...": "Načítanie informácií o zariadení…",
     "Encryption key request": "Žiadosť o šifrovacie kľúče",
     "Unable to restore session": "Nie je možné obnoviť reláciu",
     "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.": "Ak ste sa v minulosti prihlásili s novšou verziou programu Riot, vaša relácia nemusí byť kompatibilná s touto verziou. Zatvorte prosím toto okno a vráťte sa cez najnovšiu verziu Riot.",
@@ -490,11 +454,6 @@
     "To get started, please pick a username!": "Začnite tým, že si zvolíte používateľské meno!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude názov vašeho účtu na domovskom serveri <span></span>, alebo si môžete zvoliť <a>iný server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ak už máte Matrix účet, môžete sa hneď <a>Prihlásiť</a>.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Momentálne sa ku všetkym neovereným zariadeniam správate ako by boli na čiernej listine; aby ste na tieto zariadenia mohli posielať správy, mali by ste ich overiť.",
-    "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.": "Odporúčame vám prejsť procesom overenia pre všetky tieto zariadenia aby ste si potvrdili, že skutočne patria ich pravým vlastníkom, ak si to však želáte, môžete tiež znovu poslať správu bez overovania.",
-    "Room contains unknown devices": "V miestnosti sú neznáme zariadenia",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "V miestnosti \"%(RoomName)s\" sa našli zariadenia, s ktorými ste doposiaľ nikdy nekomunikovali.",
-    "Unknown devices": "Neznáme zariadenia",
     "Send anyway": "Napriek tomu odoslať",
     "Private Chat": "Súkromná konverzácia",
     "Public Chat": "Verejná konverzácia",
@@ -559,7 +518,6 @@
     "You seem to be uploading files, are you sure you want to quit?": "Zdá sa, že práve nahrávate súbory, ste si istí, že chcete skončiť?",
     "You seem to be in a call, are you sure you want to quit?": "Zdá sa, že máte prebiehajúci hovor, ste si istí, že chcete skončiť?",
     "%(count)s of your messages have not been sent.|other": "Niektoré vaše správy ešte neboli odoslané.",
-    "Message not sent due to unknown devices being present": "Neodoslaná správa kvôli nájdeným neznámym zariadeniam",
     "Search failed": "Hľadanie zlyhalo",
     "Server may be unavailable, overloaded, or search timed out :(": "Server môže byť nedostupný, preťažený, alebo vypršal časový limit hľadania :(",
     "No more results": "Žiadne ďalšie výsledky",
@@ -584,19 +542,15 @@
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
     "Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
     "Mirror local video feed": "Zrkadliť lokálne video",
-    "Never send encrypted messages to unverified devices from this device": "Z tohoto zariadenia nikdy neposielať šifrované správy neovereným zariadeniam",
     "Light theme": "Svetlý vzhľad",
     "Dark theme": "Tmavý vzhľad",
     "Sign out": "Odhlásiť sa",
     "Failed to change password. Is your password correct?": "Nepodarilo sa zmeniť heslo. Zadali ste správne heslo?",
     "Success": "Úspech",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Úspešne ste si zmenili heslo. Na ostatných zariadeniach sa vám nebudú zobrazovať okamžité oznámenia, kým sa aj na nich opätovne neprihlásite",
     "Unable to remove contact information": "Nie je možné odstrániť kontaktné informácie",
     "<not supported>": "<nepodporované>",
     "Import E2E room keys": "Importovať E2E šifrovacie kľúče miestností",
     "Cryptography": "Kryptografia",
-    "Device ID:": "ID zariadenia:",
-    "Device key:": "Kľúč zariadenia:",
     "Analytics": "Analytické údaje",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.",
     "Labs": "Experimenty",
@@ -618,7 +572,6 @@
     "click to reveal": "Odkryjete kliknutím",
     "Homeserver is": "Domovský server je",
     "Identity Server is": "Server totožností je",
-    "matrix-react-sdk version:": "Verzia matrix-react-sdk:",
     "riot-web version:": "Verzia riot-web:",
     "olm version:": "Verzia olm:",
     "Failed to send email": "Nepodarilo sa odoslať email",
@@ -647,7 +600,6 @@
     "Kicks user with given id": "Vykáže používateľa so zadaným ID",
     "Changes your display nickname": "Zmení vaše zobrazované meno",
     "Searches DuckDuckGo for results": "Vyhľadá výsledky na DuckDuckGo",
-    "Verifies a user, device, and pubkey tuple": "Overí zadané údaje používateľa, zariadenie a verejný kľúč",
     "Ignores a user, hiding their messages from you": "Ignoruje používateľa a skrije všetky jeho správy",
     "Stops ignoring a user, showing their messages going forward": "Prestane ignorovať používateľa a začne zobrazovať jeho správy",
     "Commands": "Príkazy",
@@ -671,7 +623,6 @@
     "Session ID": "ID relácie",
     "End-to-end encryption information": "Informácie o šifrovaní E2E",
     "Event information": "Informácie o udalosti",
-    "Sender device information": "Informácie o zariadení odosielateľa",
     "Passphrases must match": "Heslá sa musia zhodovať",
     "Passphrase must not be empty": "Heslo nesmie byť prázdne",
     "Export room keys": "Exportovať kľúče miestností",
@@ -695,15 +646,12 @@
     "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?",
     "Call Failed": "Zlyhanie hovoru",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V tejto miestnosti sú neznáme zariadenia: Ak budete pokračovať bez ich overenia, niekto získa možnosť odpočúvať váš hovor.",
     "Review Devices": "Prezrieť zariadenia",
     "Call Anyway": "Napriek tomu zavolať",
     "Answer Anyway": "Napriek tomu prijať",
     "Call": "Hovor",
     "Answer": "Prijať",
     "Send": "Odoslať",
-    "Delete %(count)s devices|other": "Vymazať %(count)s zariadení",
-    "Delete %(count)s devices|one": "Vymazať zariadenie",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -752,12 +700,7 @@
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
     "<a>In reply to</a> <pill>": "<a>Odpoveď na</a> <pill>",
     "Community IDs cannot be empty.": "ID komunity nemôže ostať prázdne.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>napriek tomu odoslať</sendAnywayText> alebo <cancelText>zrušiť</cancelText>.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Žiadosť o zdieľanie kľúčov bola odoslaná - Overte si zobrazenie žiadosti o zdieľanie kľúčov na vašich ostatných zariadeniach.",
-    "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.": "Žiadosť o zdieľanie kľúčov je automaticky odoslaná na vaše ďalšie zariadenia. Ak ste žiadosť odmietli alebo zrušili dialógové okno so žiadosťou na ostatných zariadeniach, kliknutím sem môžete opätovne vyžiadať kľúče pre túto reláciu.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ak kľúče pre tieto správy nemáte uložené na ostatných vašich zariadeniach, nebudete ich môcť dešifrovať.",
     "Key request sent.": "Žiadosť o kľúče odoslaná.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Znovu vyžiadať šifrovacie kľúče</requestLink> z vašich ostatných zariadení.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) videl %(dateTime)s",
     "Code": "Kód",
     "Unable to join community": "Nie je možné vstúpiť do komunity",
@@ -823,7 +766,6 @@
     "Noisy": "Hlučné",
     "Collecting app version information": "Získavajú sa informácie o verzii aplikácii",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Vymazať alias %(alias)s a odstrániť miestnosť %(name)s z adresára?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Toto vám v budúcnosti umožní vrátiť sa k vašemu účtu aj po odhlásení, alebo tiež prihlásiť sa na iných zariadeniach.",
     "Keywords": "Kľúčové slová",
     "Enable notifications for this account": "Povoliť oznámenia pre tento účet",
     "Invite to this community": "Pozvať do tejto komunity",
@@ -913,8 +855,6 @@
     "Popout widget": "Otvoriť widget v novom okne",
     "Missing roomId.": "Chýba ID miestnosti.",
     "Always show encryption icons": "Vždy zobrazovať ikony stavu šifrovania",
-    "Unable to reply": "Nie je možné odpovedať",
-    "At this time it is not possible to reply with an emote.": "V odpovedi zatiaľ nie je možné vijadriť pocit.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nie je možné načítať udalosť odkazovanú v odpovedi. Takáto udalosť buď neexistuje alebo nemáte povolenie na jej zobrazenie.",
     "Send Logs": "Odoslať záznamy",
     "Clear Storage and Sign Out": "Vymazať úložisko a Odhlásiť sa",
@@ -964,12 +904,6 @@
     "This event could not be displayed": "Nie je možné zobraziť túto udalosť",
     "Demote yourself?": "Znížiť vlastnú úroveň moci?",
     "Demote": "Znížiť",
-    "deleted": "Odstránené",
-    "underlined": "Podčiarknuté",
-    "inline-code": "Vnorený kód",
-    "block-quote": "Citácia",
-    "bulleted-list": "Odrážkový zoznam",
-    "numbered-list": "Číselný zoznam",
     "Failed to remove widget": "Nepodarilo sa odstrániť widget",
     "An error ocurred whilst trying to remove the widget from the room": "Pri odstraňovaní widgetu z  miestnosti sa vyskytla chyba",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Nemôžete posielať žiadne správy, kým si neprečítate a neodsúhlasíte <consentLink>naše zmluvné podmienky</consentLink>.",
@@ -1056,12 +990,6 @@
     "Encrypted messages in group chats": "Šifrované správy v skupinových konverzáciách",
     "Delete Backup": "Vymazať zálohu",
     "Unable to load key backup status": "Nie je možné načítať stav zálohy kľúčov",
-    "Backup has a <validity>valid</validity> signature from this device": "Záloha je podpísaná <validity>platným</validity> kľúčom z tohoto zariadenia",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Podpis zálohy je <validity>platný</validity> a pochádza z <verify>overeného</verify> zariadenia <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Podpis zálohy je <validity>platný</validity> a pochádza z <verify>neovereného</verify> zariadenia <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Podpis zálohy je <validity>neplatný</validity> a pochádza z <verify>overeného</verify> zariadenia <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Záloha je podpísaná <validity>neplatným</validity> kľúčom z <verify>neovereného</verify> zariadenia <device></device>",
-    "Backup is not signed by any of your devices": "Záloha nie je podpísaná žiadnym z vašich zariadení",
     "Backup version: ": "Verzia zálohy: ",
     "Algorithm: ": "Algoritmus: ",
     "Don't ask again": "Viac sa nepýtať",
@@ -1102,7 +1030,6 @@
     "This looks like a valid recovery key!": "Zdá sa, že toto je platný kľúč obnovenia!",
     "Not a valid recovery key": "Neplatný kľúč obnovenia",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním kľúča obnovenia.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Ak ste zabudli heslo obnovenia, <button>nastavte si bezpečné obnovenie znovu</button>",
     "Set a new status...": "Nastaviť nový stav…",
     "Clear status": "Zrušiť stav",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Ste správcom tejto komunity. Nebudete môcť znovu vstúpiť bez pozvania od iného správcu.",
@@ -1122,12 +1049,9 @@
     "Your Recovery Key": "Váš kľúč obnovenia",
     "Copy to clipboard": "Kopírovať do schránky",
     "Download": "Stiahnuť",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Váš kľúč obnovenia bol <b>skopírovaný do schránky</b>, vložte ho do:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Váš kľúč obnovenia je uložený v priečinku so <b>stiahnutými</b> súbormi.",
     "<b>Print it</b> and store it somewhere safe": "<b>Vytlačte si ho</b> a uchovajte na bezpečnom mieste",
     "<b>Save it</b> on a USB key or backup drive": "<b>Uložte si ho</b> na USB kľúč alebo iné zálohovacie médium",
     "<b>Copy it</b> to your personal cloud storage": "<b>Skopírujte si ho</b> na osobné úložisko v cloude",
-    "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.": "Ak si nenastavíte bezpečné obnovenie správ, nebudete si môcť po odhlásení alebo prihlásení sa na inom zariadení čítať históriu šifrovaných konverzácií.",
     "Set up Secure Message Recovery": "Nastaviť bezpečné obnovenie správ",
     "Keep it safe": "Bezpečne ho uchovajte",
     "Create Key Backup": "Vytvoriť zálohu kľúčov",
@@ -1186,7 +1110,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúci emoji.",
     "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
     "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Pre zachovanie maximálnej bezpečnosti odporúčame, aby ste toto vykonali osobne, alebo použili iný dôverihodný komunikačný kanál.",
     "Dog": "Hlava psa",
     "Cat": "Hlava mačky",
     "Lion": "Hlava leva",
@@ -1233,7 +1156,6 @@
     "Pencil": "Ceruzka",
     "Paperclip": "Sponka na papier",
     "Scissors": "Nožnice",
-    "Padlock": "Zatvorená zámka",
     "Key": "Kľúč",
     "Hammer": "Kladivo",
     "Telephone": "Telefón",
@@ -1251,7 +1173,6 @@
     "Headphones": "Slúchadlá",
     "Folder": "Fascikel",
     "Pin": "Špendlík",
-    "Your homeserver does not support device management.": "Váš domovský server nepodporuje správu zariadení.",
     "Yes": "Áno",
     "No": "Nie",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali sme vám email, aby sme mohli overiť vašu adresu. Postupujte podľa odoslaných inštrukcií a potom klepnite na nižšie zobrazené tlačidlo.",
@@ -1259,20 +1180,15 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ste si istí? Ak nemáte správne zálohované šifrovacie kľúče, prídete o históriu šifrovaných konverzácií.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované správy sú zabezpečené E2E šifrov. Ku kľúčom potrebných na ich čítanie máte prístup len vy a ich adresát(i).",
     "Restore from Backup": "Obnoviť zo zálohy",
-    "This device is backing up your keys. ": "Kľúče z tohoto zariadenia sú zálohované. ",
     "Back up your keys before signing out to avoid losing them.": "Zálohujte si šifrovacie kľúče pred odhlásením, aby ste zabránili ich strate.",
     "Backing up %(sessionsRemaining)s keys...": "Zálohovanie %(sessionsRemaining)s kľúčov…",
     "All keys backed up": "Všetky kľúče sú zálohované",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Podpis zálohy pochádza z <verify>neznámeho</verify> zariadenia ID %(deviceId)s.",
-    "This backup is trusted because it has been restored on this device": "Táto záloha je dôverihodná, pretože ste z nej obnovili kľúče v tomto zariadení",
-    "Your keys are <b>not being backed up from this device</b>.": "Kľúče <b>z tohoto zariadenia nemáte zálohované</b>.",
     "Start using Key Backup": "Začnite používať zálohovanie kľúčov",
     "Add an email address to configure email notifications": "Oznámenia emailom nastavíte pridaním emailovej adresy",
     "Unable to verify phone number.": "Nie je možné overiť telefónne číslo.",
     "Verification code": "Overovací kód",
     "Phone Number": "Telefónne číslo",
     "Profile picture": "Obrázok v profile",
-    "Upload profile picture": "Nahrať obrázok v profile",
     "<a>Upgrade</a> to your own domain": "<a>Použiť</a> vlastnú doménu",
     "Display Name": "Zobrazované meno",
     "Set a new account password...": "Nastaviť nové heslo k účtu…",
@@ -1335,10 +1251,6 @@
     "Encryption": "Šifrovanie",
     "Once enabled, encryption cannot be disabled.": "Po aktivovaní šifrovanie nie je možné deaktivovať.",
     "Encrypted": "Zašifrované",
-    "Some devices for this user are not trusted": "Niektoré zariadenia tohoto používateľa nie sú dôverihodné",
-    "Some devices in this encrypted room are not trusted": "Niektoré zariadenia v tejto šifrovanej miestnosti nie sú dôverihodné",
-    "All devices for this user are trusted": "Všetky zariadenia tohoto používateľa sú dôverihodné",
-    "All devices in this encrypted room are trusted": "Všetky zariadenia v tejto šifrovanej miestnosti sú dôverihodné",
     "Never lose encrypted messages": "Nikdy neprídete o zašifrované správy",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Správy v tejto miestnosti sú zabezpečené E2E šifrov. Ku kľúčom potrebných na ich čítanie máte prístup len vy a ich adresát(i).",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Bezpečne si zálohujte šifrovacie kľúče, aby ste o ne neprišli. <a>Zistiť viac.</a>",
@@ -1354,8 +1266,6 @@
     "Error updating flair": "Chyba pri aktualizácii zobrazenia členstva",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pri aktualizácii zobrazenia členstva v skupinách v tejto miestnosti nastala chyba. Nie je to povolené na servery, alebo sa jedná o dočasný problém.",
     "Room avatar": "Obrázok miestnosti",
-    "Upload room avatar": "Nahrať obrázok miestnosti",
-    "No room avatar": "Žiadny obrázok miestnosti",
     "Room Name": "Názov miestnosti",
     "Room Topic": "Téma miestnosti",
     "Join": "Vstúpiť",
@@ -1367,7 +1277,6 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nič sa nezobrazuje? Ešte nie všetky aplikácie podporujú interaktívne overenie. <button>Použiť pôvodný spôsob overenia</button>.",
     "Use two-way text verification": "Použiť obojsmerné textové overenie",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Overte tohoto používateľa a označte ho ako dôveryhodného. Dôverovanie používateľov pridáva pokoj na duši pri posielaní E2E šifrovaných správ.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Overením tohoto používateľa označíte jeho zariadenia ako dôverihodné pre vás a vaše zariadenia ako dôverihodné pre neho.",
     "Waiting for partner to confirm...": "Čakanie na potvrdenie od partnera…",
     "Incoming Verification Request": "Prichádzajúca žiadosť o overenie",
     "I don't want my encrypted messages": "Nezáleží mi na zašifrovaných správach",
@@ -1418,12 +1327,10 @@
     "This homeserver does not support communities": "Tento domovský server nepodporuje komunity",
     "Guest": "Hosť",
     "Could not load user profile": "Nie je možné načítať profil používateľa",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Zmena hesla spôsobí obnovenie E2E šifrovacích kľúčov  na všetkých vašich zariadeniach a história šifrovaných konverzácií sa tak pre vás môže stať nečitateľná. Pred obnovením hesla si prosím nastavte zálohovanie šifrovacích kľúčov alebo si E2E kľúče exportujte na inom zariadení.",
     "Your Matrix account on %(serverName)s": "Váš Matrix účet na serveri %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Na emailovú adresu vám odošleme overovaciu správu, aby bolo možné potvrdiť nastavenie vašeho nového hesla.",
     "Sign in instead": "Radšej sa prihlásiť",
     "Your password has been reset.": "Vaše heslo bolo obnovené.",
-    "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.": "Boli ste odhlásení zo všetkých zariadení a nebudú sa vám viac zobrazovať okamžité oznámenia. Ak chcete zobrazovať oznámenia, musíte sa na každom zariadení znovu prihlásiť.",
     "Set a new password": "Nastaviť nové heslo",
     "This homeserver does not support login using email address.": "Tento domovský server nepodporuje prihlásenie sa zadaním emailovej adresy.",
     "Create account": "Vytvoriť účet",
@@ -1436,7 +1343,6 @@
     "Set up with a Recovery Key": "Nastaviť použitím kľúča obnovenia",
     "Please enter your passphrase a second time to confirm.": "Prosím zadajte heslo obnovenia ešte raz pre potvrdenie.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kľúč obnovenia je bezpečnostný mechanizmus - môžete ho použiť na prístup k šifrovacím kľúčom v prípade, ak zabudnete vaše heslo obnovenia.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Kľúč obnovenia si bezpečne uchovajte, použite napr. správcu hesiel (alebo ho schovajte v trezore)",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zálohovanie kľúčov máte aktívne (prvé zálohovanie môže trvať niekoľko minút).",
     "Secure your backup with a passphrase": "Zabezpečte si zálohu zadaním hesla obnovenia",
     "Confirm your passphrase": "Potvrdiť heslo obnovenia",
@@ -1444,10 +1350,7 @@
     "Starting backup...": "Začína sa zálohovanie…",
     "Success!": "Hotovo!",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Boli zistené nový kľúč a nové heslo obnovenia zálohovania šifrovacích kľúčov.",
-    "This device is encrypting history using the new recovery method.": "Toto zariadenie šifruje históriu použitím novej metódy obnovenia.",
     "Recovery Method Removed": "Odstránený spôsob obnovenia",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Na tomto zariadení bolo zistené, že heslo a kľúč obnovenia šifrovacích kľúčov zo zálohy boli odstránené.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Ak ste ich odstránili omylom, môžete si obnovenie nastaviť znovu, čo zašifruje zálohy použitím novej metódy.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste spôsob obnovenia neodstránili vy, útočník sa pravdepodobne usiluje dostať k vašemu účtu. Zmente si prosím heslo na prihlásenie do Matrix účtu a znovu si ihneď nastavte možnosti obnovenia.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Či používate alebo nie funkcionalitu známu ako „omrvinky“ (obrázky nad zoznamom miestností)",
     "Call failed due to misconfigured server": "Hovor zlyhal kvôli nesprávne nakonfigurovanému serveru",
@@ -1460,16 +1363,9 @@
     "The file '%(fileName)s' failed to upload.": "Nepodarilo sa nahrať súbor „%(fileName)s“.",
     "The server does not support the room version specified.": "Server nepodporuje zadanú verziu miestnosti.",
     "Name or Matrix ID": "Meno alebo Matrix ID",
-    "Email, name or Matrix ID": "Email, meno alebo Matrix ID",
-    "Failed to start chat": "Nepodarilo sa začať konverzáciu",
     "Messages": "Správy",
     "Actions": "Akcie",
-    "Room upgrade confirmation": "Potvrdenie aktualizácii miestnosti",
-    "Upgrading a room can be destructive and isn't always necessary.": "Aktualizácia miestnosti nemusí byť bez následkov a nie je vždy nevyhnutná.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Aktualizácie miestnosti sú obyčajne odporúčané, keď je konkrétna verzia považovaná za <i>nestabilnú</i>. Nestabilné verzie miestností môžu obsahovať chyby, chýbajúce vlastnosti, alebo bezpečnostné zraniteľnosti.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Aktualizácie miestnosti majú vplyv len na spracovanie miestnosti <i>na servery</i>. Ak máte problémy s programom Riot, prosím nahláste chybu <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Pozor</b>: Aktualizáciou miestnosti do novej verzii <i>neprenesiete členov miestnosti</i>. Konverzácia v starej verzii miestnosti bude ukončená odkazom do novej verzii miestnosti - členovia budú môcť vstúpiť do novej verzii miestnosti kliknutím na tento odkaz.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Prosím, potvrďte, či naozaj chcete aktualizovať túto miestnosť z <oldVersion /> na <newVersion />.",
     "Changes your avatar in this current room only": "Zmení váš obrázok len pre túto miestnosť",
     "Changes your avatar in all rooms": "Zmení váš obrázok vo všetkých miestnostiach",
     "Unbans user with given ID": "Zruší zákaz vstúpiť používateľovi so zadaným ID",
@@ -1501,12 +1397,6 @@
     "Accept <policyLink /> to continue:": "Ak chcete pokračovať, musíte prijať <policyLink />:",
     "ID": "ID",
     "Public Name": "Verejný názov",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Toto zariadenie <b>nezálohuje vaše šifrovacie kľúče</b>, ale máte existujúcu zálohu, z ktorej môžete kľúče obnoviť a pokračovať v zálohovaní.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Nastavte zálohu šifrovacích kľúčov pred odhlásením, aby ste neprišli o kľúče, ktoré máte uložené len v tomto zariadení.",
-    "Connect this device to Key Backup": "Nastaviť zálohovanie kľúčov",
-    "Backup has an <validity>invalid</validity> signature from this device": "Podpis zálohy z tohoto zariadenia <validity>nie je platný</validity>",
-    "Enable desktop notifications for this device": "Povoliť oznámenia na pracovnej ploche pre toto zariadenie",
-    "Enable audible notifications for this device": "Povoliť zvukové oznámenia pre toto zariadenie",
     "Identity Server URL must be HTTPS": "URL adresa servera totožností musí začínať HTTPS",
     "Not a valid Identity Server (status code %(code)s)": "Toto nie je funkčný server totožností (kód stavu %(code)s)",
     "Could not connect to Identity Server": "Nie je možné sa pripojiť k serveru totožností",
@@ -1553,10 +1443,7 @@
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Multiple integration managers": "Viacej integračných serverov",
     "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Požiadavky na overenie používateľov posielať v priamych konverzáciách, zahŕňa tiež nové rozhranie overenia v zozname používateľov.",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Povoliť podpisovanie naprieč zariadeniami, umožňuje overovanie používateľov namiesto ich zariadení (vo vývoji)",
     "Enable local event indexing and E2EE search (requires restart)": "Povoliť lokálne indexovanie udalostí a vyhľadávanie v šifrovaných miestnostiach",
-    "Use the new, faster, composer for writing messages": "Používať nový, rýchly, editor pri písaní správ",
     "Match system theme": "Prispôsobiť sa vzhľadu systému",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)",
     "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov",
@@ -1566,11 +1453,9 @@
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!",
     "Upload": "Nahrať",
     "Cross-signing and secret storage are enabled.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko sú aktívne.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Na bezpečnom úložisku vo vašom účte máte uloženú totožnosť podpisovania naprieč zariadeniami, ale v tomto zariadení zatiaľ tejto totožnosti nedôverujete.",
     "Cross-signing and secret storage are not yet set up.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko zatiaľ nie sú nastavené.",
     "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko",
     "Cross-signing public keys:": "Verejné kľúče podpisovania naprieč zariadeniami:",
-    "on device": "na zariadení",
     "not found": "nenájdené",
     "Cross-signing private keys:": "Súkromné kľúče podpisovania naprieč zariadeniami:",
     "in secret storage": "na bezpečnom úložisku",
@@ -1583,10 +1468,7 @@
     "Backup has a <validity>valid</validity> signature from this user": "Záloha je podpísaná <validity>platným</validity> kľúčom od tohoto používateľa",
     "Backup has a <validity>invalid</validity> signature from this user": "Záloha je podpísaná <validity>neplatným</validity> kľúčom od tohoto používateľa",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Podpis zálohy pochádza od <verify>neznámeho</verify> používateľa ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Podpis zálohy pochádza z <verify>neznámeho</verify> zariadenia ID %(deviceId)s",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Záloha kľúčov je uložená na bezpečnom úložisku, ale funkcia podpisovanie naprieč zariadeniami nie je na tomto zariadení aktívna. Ak chcete zmeniť stav zálohy kľúčov, zapnite podpisovanie naprieč zariadeniami v časti experimenty.",
     "Backup key stored: ": "Záloha kľúčov uložená: ",
-    "Start using Key Backup with Secure Secret Storage": "Začnite používať zálohu kľúčov na bezpečnom úložisku",
     "Clear notifications": "Vymazať oznámenia",
     "Change identity server": "Zmeniť server totožností",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Naozaj si želáte odpojiť od servera totožností <current /> a pripojiť sa namiesto toho k serveru <new />?",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index db687780f4..eb0e8653cd 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -13,7 +13,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Të dhënat që na dërgohen për të na ndihmuar ta bëjmë më të mirë Riot.im-in përfshijnë:",
     "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ërfshin të dhëna të identifikueshme, të tilla si një ID dhome përdoruesi apo grupi, këto të dhëna hiqen përpara se të dërgohet te shërbyesi.",
     "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.": "Në këtë dhomë ka pajisje të panjohura: nëse vazhdoni pa i verifikuar ato, për dikë do të jetë e mundur të përgjojë thirrjen tuaj.",
     "Review Devices": "Shqyrtoni Pajisje",
     "Call Anyway": "Thirre Sido Qoftë",
     "Answer Anyway": "Përgjigju Sido Qoftë",
@@ -79,10 +78,6 @@
     "Moderator": "Moderator",
     "Admin": "Përgjegjës",
     "Start a chat": "Nisni një fjalosje",
-    "Who would you like to communicate with?": "Me kë do të donit të komunikonit?",
-    "Start Chat": "Filloni Fjalosje",
-    "Invite new room members": "Ftoni anëtarë të rinj dhome",
-    "Send Invites": "Dërgoni Ftesa",
     "Operation failed": "Veprimi dështoi",
     "Failed to invite": "S’u arrit të ftohej",
     "Failed to invite the following users to the %(roomName)s room:": "S’u arrit të ftoheshin përdoruesit vijues te dhoma %(roomName)s:",
@@ -159,7 +154,6 @@
     "Noisy": "I zhurmshëm",
     "Collecting app version information": "Po grumbullohen të dhëna versioni aplikacioni",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Të fshihet aliasi i dhomës %(alias)s dhe të hiqet %(name)s nga drejtoria?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Kjo do t’ju lejojë të riktheheni te llogaria juaj pasi të keni bërë daljen, dhe të hyni që nga pajisje të tjera.",
     "Keywords": "Fjalëkyçe",
     "Unpin Message": "Shfiksojeni Mesazhin",
     "Enable notifications for this account": "Aktivizo njoftime për këtë llogari",
@@ -263,10 +257,7 @@
     "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!": "Pajisje 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.",
@@ -299,12 +290,10 @@
     "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",
     "Last seen": "Parë së fundi më",
     "Disable Notifications": "Çaktivizo Njoftimet",
     "Enable Notifications": "Aktivizo Njoftimet",
-    "Invalid alias format": "Format i pavlefshëm aliasesh",
     "not specified": "e papërcaktuar",
     "Remote addresses for this room:": "Adresa të largëta për këtë dhomë:",
     "Local addresses for this room:": "Adresa vendore për këtë dhomë:",
@@ -319,8 +308,6 @@
     "%(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 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ë",
     "device id: ": "ID pajisjeje: ",
@@ -331,8 +318,6 @@
     "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",
@@ -348,7 +333,6 @@
     "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…",
@@ -356,10 +340,6 @@
     "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",
@@ -382,7 +362,6 @@
     "Community Invites": "Ftesa Bashkësie",
     "Invites": "Ftesa",
     "Favourites": "Të parapëlqyer",
-    "People": "Persona",
     "Low priority": "Me përparësi të ulët",
     "This room": "Këtë dhomë",
     "%(roomName)s does not exist.": "%(roomName)s s’ekziston.",
@@ -466,16 +445,10 @@
     "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",
@@ -484,8 +457,6 @@
     "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",
@@ -531,8 +502,6 @@
     "Sign out": "Dilni",
     "Success": "Sukses",
     "Cryptography": "Kriptografi",
-    "Device ID:": "ID Pajisjeje:",
-    "Device key:": "Kyç pajisjeje:",
     "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.",
     "Check for update": "Kontrollo për përditësime",
     "No media permissions": "S’ka leje mediash",
@@ -577,7 +546,6 @@
     "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",
@@ -592,13 +560,10 @@
     "Missing user_id in request": "Mungon user_id te kërkesa",
     "Failed to join room": "S’u arrit të hyhej në dhomë",
     "Mirror local video feed": "Pasqyro prurje vendore videoje",
-    "Never send encrypted messages to unverified devices from this device": "Mos dërgo kurrë mesazhe të fshehtëzuar, nga kjo pajisje te pajisje të paverifikuara",
-    "Never send encrypted messages to unverified devices in this room from this device": "Mos dërgo kurrë mesazhe të fshehtëzuar, nga kjo pajisje te pajisje të paverifikuara në këtë dhomë",
     "Incoming voice call from %(name)s": "Thirrje audio ardhëse nga %(name)s",
     "Incoming video call from %(name)s": "Thirrje video ardhëse nga %(name)s",
     "Incoming call from %(name)s": "Thirrje ardhëse nga %(name)s",
     "Failed to upload profile picture!": "S’u arrit të ngarkohej foto profili!",
-    "Unable to load device list": "S’arrihet të ngarkohet listë pajisjesh",
     "New address (e.g. #foo:%(localDomain)s)": "Adresë e re (p.sh. #foo:%(localDomain)s)",
     "New community ID (e.g. +foo:%(localDomain)s)": "ID bashkësie të re (p.sh. +foo:%(localDomain)s)",
     "Ongoing conference call%(supportedText)s.": "Thirrje konference që po zhvillohet%(supportedText)s.",
@@ -610,7 +575,6 @@
     "Unmute": "Ktheji zërin",
     "Invited": "I ftuar",
     "Hangup": "Mbylle Thirrjen",
-    "Hide Text Formatting Toolbar": "Fshih Panel Formatimi Tekstesh",
     "No pinned messages.": "S’ka mesazhe të fiksuar.",
     "Replying": "Po përgjigjet",
     "Failed to unban": "S’u arrit t’i hiqej dëbimi",
@@ -630,8 +594,6 @@
     "Failed to remove room from community": "S’u arrit të hiqej dhoma nga bashkësia",
     "Minimize apps": "Minimizoji aplikacionet",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sndryshoi avatarin e vet",
-    "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:": "Që të verifikoni se kësaj pajisje mund t’i zihet besë, ju lutemi, lidhuni me të zotët e saj përmes ndonjë rruge tjetër (p.sh., personalisht, ose përmes një thirrjeje telefonike) dhe kërkojuni nëse kyçi që shohin te Rregullime të tyret të Përdoruesit për këtë pajisje përputhet me kyçin më poshtë:",
-    "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.": "Nëse përputhet, shtypni butonin e verifikimit më poshtë. Nëse jo, atëherë dikush tjetër po e përgjon këtë pajisje dhe duhet ta kaloni në listë të zezë.",
     "I verify that the keys match": "Verifikoj se kyçet përputhen",
     "Unable to restore session": "S’arrihet të rikthehet sesioni",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet.",
@@ -649,7 +611,6 @@
     "Failed to reject invitation": "S’u arrit të hidhej poshtë ftesa",
     "Failed to leave room": "S’u arrit të braktisej",
     "Scroll to bottom of page": "Rrëshqit te fundi i faqes",
-    "Message not sent due to unknown devices being present": "Mesazhi s’u dërgua, për shkak të pranisë së pajisjeve të panjohura",
     "Unknown room %(roomId)s": "Dhomë e panjohur %(roomId)s",
     "Fill screen": "Mbushe ekranin",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "U provua të ngarkohej një pikë të dhënë prej rrjedhës kohore në këtë dhomë, por s’u arrit të gjendej.",
@@ -657,7 +618,6 @@
     "Unable to remove contact information": "S’arrihet të hiqen të dhëna kontakti",
     "Import E2E room keys": "Importo kyçe E2E dhome",
     "Homeserver is": "Shërbyesi Home është",
-    "matrix-react-sdk version:": "Version matrix-react-sdk:",
     "Failed to send email": "S’u arrit të dërgohej email",
     "I have verified my email address": "E kam verifikuar adresën time email",
     "Failed to fetch avatar URL": "S’u arrit të sillej URL avatari",
@@ -684,12 +644,9 @@
     "(could not connect media)": "(s’lidhi dot median)",
     "(unknown failure: %(reason)s)": "(dështim i panjohur: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s e përfundoi thirrjen.",
-    "Delete %(count)s devices|other": "Fshi %(count)s pajisje",
     "Failed to set display name": "S’u arrit të caktohej emër ekrani",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' s’është format i vlefshëm aliasesh",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' s’është ID i vlefshëm bashkësish",
     "Cannot add any more widgets": "S’mund të shtohen më tepër widget-e",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Rikërkoni kyçe fshehtëzimi</requestLink> prej pajisjesh tuaja të tjera.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (pushtet %(powerLevelNumber)si)",
     "(~%(count)s results)|other": "(~%(count)s përfundime)",
     "(~%(count)s results)|one": "(~%(count)s përfundim)",
@@ -775,8 +732,6 @@
     "%(widgetName)s widget modified by %(senderName)s": "Widget-i %(widgetName)s u modifikua nga %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Widget-i %(widgetName)s u shtua nga %(senderName)s",
     "Always show encryption icons": "Shfaq përherë ikona fshehtëzimi",
-    "block-quote": "bllok citimi",
-    "bulleted-list": "listë me toptha",
     "Add some now": "Shtohen ca tani",
     "Click here to see older messages.": "Klikoni këtu për të parë mesazhe më të vjetër.",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)shynë dhe dolën %(count)s herë",
@@ -801,9 +756,6 @@
     "Please contact your homeserver administrator.": "Ju lutemi, lidhuni me përgjegjësin e shërbyesit tuaj Home.",
     "Send analytics data": "Dërgo të dhëna analitike",
     "This event could not be displayed": "Ky akt s’u shfaq dot",
-    "underlined": "nënvizuar",
-    "inline-code": "kod brendazi",
-    "numbered-list": "listë e numërtuar",
     "The conversation continues here.": "Biseda vazhdon këtu.",
     "System Alerts": "Sinjalizime Sistemi",
     "Muted Users": "Përdorues të Heshtur",
@@ -851,9 +803,7 @@
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s hoqi %(removedAddresses)s si adresa për këtë dhomë.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s hoqi %(removedAddresses)s si adresë për këtë dhomë.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s hoqi adresën kryesore për këtë dhomë.",
-    "deleted": "u fshi",
     "This room has been replaced and is no longer active.": "Kjo dhomë është zëvendësuar dhe s’është më aktive.",
-    "At this time it is not possible to reply with an emote.": "Sot për sot s’është e mundur të përgjigjeni me një <em>emote</em>.",
     "Share room": "Ndani dhomë me të tjerë",
     "You don't currently have any stickerpacks enabled": "Hëpërhë, s’keni të aktivizuar ndonjë pako ngjitësesh",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ndryshoi avatarin e dhomës në <img/>",
@@ -880,7 +830,6 @@
     "Every page you use in the app": "Çdo faqe që përdorni te aplikacioni",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s shtoi %(addedAddresses)s si adresa për këtë dhomë.",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s shtoi %(addedAddresses)s dhe hoqi %(removedAddresses)s si adresa për këtë dhomë.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktivizoi fshehtëzimin skaj-më-skaj (algorithm %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s nga %(fromPowerLevel)s në %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ndryshoi shkallën e pushtetit të %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ndryshoi mesazhin e fiksuar për këtë dhomë.",
@@ -896,7 +845,6 @@
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Përpara se të parashtroni regjistra, duhet <a>të krijoni një çështje në GitHub issue</a> që të përshkruani problemin tuaj.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID-të e bashkësive mund të përmbajnë vetëm shenjat a-z, 0-9, ose '=_-./'",
     "Create a new room with the same name, description and avatar": "Krijoni një dhomë të re me po atë emër, përshkrim dhe avatar",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" përmban pajisje që s’i keni parë më parë.",
     "<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 për faqen e bashkësisë tuaj</h1>\n<p>\n    Përshkrimin e gjatë përdoreni për t’u paraqitur përdoruesve të rinj bashkësinë, ose për të dhënë\n    një a disa <a href=\"foo\">lidhje</a> të rëndësishme\n</p>\n<p>\n    Mund të përdorni madje etiketa 'img'\n</p>\n",
     "Failed to add the following rooms to the summary of %(groupId)s:": "S’u arrit të shtoheshin dhomat vijuese te përmbledhja e %(groupId)s:",
     "Failed to remove the room from the summary of %(groupId)s": "S’u arrit të hiqej dhoma prej përmbledhjes së %(groupId)s",
@@ -907,7 +855,6 @@
     "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.": "Janë pikasur të dhëna nga një version i dikurshëm i Riot-it. Kjo do të bëjë që kriptografia skaj-më-skaj te versioni i dikurshëm të mos punojë si duhet. Mesazhet e fshehtëzuar skaj-më-skaj tani së fundi teksa përdorej versioni i dikurshëm mund të mos jenë të shfshehtëzueshëm në këtë version. Kjo mund bëjë edhe që mesazhet e shkëmbyera me këtë version të dështojnë. Nëse ju dalin probleme, bëni daljen dhe rihyni në llogari. Që të ruhet historiku i mesazheve, eksportoni dhe riimportoni kyçet tuaj.",
     "Did you know: you can use communities to filter your Riot.im experience!": "E dinit se: mund t’i përdorni bashkësitë për të filtruar punimin tuaj në Riot.im?",
     "Error whilst fetching joined communities": "Gabim teksa silleshin bashkësitë ku merret pjesë",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Shfaq pajisje</showDevicesText>, <sendAnywayText>dërgoje sido qoftë</sendAnywayText> ose <cancelText>anuloje</cancelText>.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Ridërgojini krejt</resendText> ose <cancelText>anulojini krejt</cancelText> tani. Për ridërgim ose anulim, mundeni edhe të përzgjidhni mesazhe individualë.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Ridërgojeni mesazhin</resendText> ose <cancelText>anulojeni mesazhin</cancelText> tani.",
     "Audio Output": "Sinjal Audio",
@@ -917,10 +864,7 @@
     "Failed to remove tag %(tagName)s from room": "S’u arrit të hiqej etiketa %(tagName)s nga dhoma",
     "Failed to add tag %(tagName)s to room": "S’u arrit të shtohej në dhomë etiketa %(tagName)s",
     "Enable widget screenshots on supported widgets": "Aktivizo foto ekrani widget-esh për widget-e që e mbulojnë",
-    "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.": "Ndryshimi i fjalëkalimit do të sjellë zerimin e çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt pajisjet, duke e bërë të palexueshëm historikun e fshehtëzuar të bisedave, hiq rastin kur i eksportoni më parë kyçet tuaj të dhomës dhe i ri-importoni ata më pas. Në të ardhmen kjo do të përmirësohet.",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Merrni pjesë me <voiceText>zë</voiceText> ose me <videoText>video</videoText>.",
-    "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.": "Kërkesat për ndarje kyçesh dërgohen automatikisht te pajisjet tuaja të tjera. Nëse s’e pranuat ose e hodhët tej kërkesën për ndarje kyçesh në pajisjet tuaja të tjera, klikoni këtu që të rikërkoni kyçe për këtë sesion.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Nëse pajisjet tuaja të tjera nuk kanë kyçin për këtë mesazh, s’do të jeni në gjendje ta shfshehtëzoni.",
     "Demote yourself?": "Të zhgradohet vetvetja?",
     "Demote": "Zhgradoje",
     "Failed to toggle moderator status": "S’u arrit të këmbehet gjendje moderatori",
@@ -952,19 +896,12 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Ju lutemi, kini parasysh se jeni futur te shërbyesi %(hs)s, jo te matrix.org.",
     "You need to register to do this. Would you like to register now?": "Për ta bërë këtë, lypset të regjistroheni. Doni të regjistroheni që tani?",
     "Stops ignoring a user, showing their messages going forward": "Resht shpërfilljen e një përdoruesi, duke i shfaqur mesazhet e tij të dërgohen",
-    "Verifies a user, device, and pubkey tuple": "Verifikon një përdorues, pajisje dhe një set kyçesh publikë",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "KUJDES: Pajisje tashmë e verifikuar, por kyçet NUK PËRPUTHEN!",
-    "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!": "KUJDES: VERIFIKIMI I KYÇIT DËSHTOI! Kyçi i nënshkrimit për %(userId)s dhe pajisjen %(deviceId)s është \"%(fprint)s\", që nuk përpythet me kyçin e dhënë \"%(fingerprint)s\". Kjo mund të jetë shenjë se komunikimet tuaja po përgjohen!",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Kyçi i nënshkrimit që dhatë përputhet me kyçin e nënshkrimit që morët nga pajisja e %(userId)s %(deviceId)s. Pajisja u shënua si e verifikuar.",
     "Your browser does not support the required cryptography extensions": "Shfletuesi juaj nuk mbulon zgjerimet kriptografike të domosdoshme",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vulat kohore shfaqi në formatin 12 orësh (p.sh. 2:30pm)",
     "Enable inline URL previews by default": "Aktivizo, si parazgjedhje, paraparje URL-sh brendazi",
     "The maximum permitted number of widgets have already been added to this room.": "Në këtë dhomë është shtuar tashmë numri maksimum i lejuar për widget-et.",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Kërkesa juaj për shkëmbim kyçesh u dërgua - ju lutemi, kontrolloni pajisjet tuaja të tjera për kërkesa shkëmbimi kyçesh.",
-    "Undecryptable": "I pashfshehtëzueshëm",
     "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.": "S’do të jeni në gjendje ta zhbëni këtë, ngaqë po zhgradoni veten, nëse jeni përdoruesi i fundit i privilegjuar te dhoma do të jetë e pamundur të rifitoni privilegjet.",
     "Jump to read receipt": "Hidhuni te leximi i faturës",
-    "Unable to reply": "S’arrihet të përgjigjet",
     "Unknown for %(duration)s": "I panjohur për %(duration)s",
     "This room is not accessible by remote Matrix servers": "Kjo dhomë nuk është e përdorshme nga shërbyes Matrix të largët",
     "Stickerpack": "Paketë ngjitësish",
@@ -985,8 +922,6 @@
     "We encountered an error trying to restore your previous session.": "Hasëm një gabim teksa provohej të rikthehej sesioni juaj i dikurshëm.",
     "This will allow you to reset your password and receive notifications.": "Kjo do t’ju lejojë të ricaktoni fjalëkalimin tuaj dhe të merrni njoftime.",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ky do të jetë emri i llogarisë tuaj te <span></span> shërbyesi home, ose mund të zgjidhni një <a>shërbyes tjetër</a>.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Po kaloni në listë të zezë pajisje të paverifikuara; që të dërgoni mesazhe te këto pajisje, duhet t’i verifikoni.",
-    "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.": "Këshillojmë të përshkoni procesin e verifikimit për çdo pajisje, që t’u bindur se u takojnë të zotëve të ligjshëm, por, nëse parapëlqeni, mund ta dërgoni mesazhin pa verifikuar gjë.",
     "You must join the room to see its files": "Duhet të hyni në dhomë, pa të shihni kartelat e saj",
     "The room '%(roomName)s' could not be removed from the summary.": "Dhoma '%(roomName)s' s’u hoq dot nga përmbledhja.",
     "The user '%(displayName)s' could not be removed from the summary.": "Përdoruesi '%(displayName)s' s’u hoq dot nga përmbledhja.",
@@ -1001,7 +936,6 @@
     "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.": "Mesazhi juaj s’u dërgua, ngaqë ky shërbyes Home ka tejkaluar kufirin e një burimi. Ju lutemi, që të vazhdoni ta përdorni këtë shërbim, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "S’ka njeri këtu! Do të donit të <inviteText>ftoni të tjerë</inviteText> apo <nowarnText>të reshtet së njoftuari për dhomë të zbrazët</nowarnText>?",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U provua të ngarkohej një pikë e caktuar në kronologjinë e kësaj dhome, por nuk keni leje për ta parë mesazhin në fjalë.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Fjalëkalimi juaj u ndryshua me sukses. Nuk do të merrni njoftime push në pajisjet tuaja të tjera, veç në hyfshi sërish në llogarinë tuaj në to",
     "Start automatically after system login": "Nisu vetvetiu pas hyrjes në sistem",
     "You may need to manually permit Riot to access your microphone/webcam": "Lypset të lejoni dorazi Riot-in të përdorë mikrofonin/kamerën tuaj web",
     "No Audio Outputs detected": "S’u pikasën Sinjale Audio Në Dalje",
@@ -1024,11 +958,6 @@
     "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",
     "Delete Backup": "Fshije Kopjeruajtjen",
     "Unable to load key backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
-    "Backup has a <validity>valid</validity> signature from this device": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej kësaj pajisjeje",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej pajisjes së <verify>paverifikuar</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej pajisjes së <verify>verifikuar</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej pajisjes së <verify>paverifikuar</verify> <device></device>",
-    "Backup is not signed by any of your devices": "Kopjeruajtja s’është nënshkruar nga ndonjë prej pajisjeve tuaja",
     "Backup version: ": "Version kopjeruajtjeje: ",
     "Algorithm: ": "Algoritëm: ",
     "Enter a passphrase...": "Jepni një frazëkalim…",
@@ -1041,12 +970,9 @@
     "Your Recovery Key": "Kyçi Juaj i Rimarrjeve",
     "Copy to clipboard": "Kopjoje në të papastër",
     "Download": "Shkarkoje",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i Fshehtëzimeve është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Kyçi juaj i Fshehtëzimeve gjendet te dosja juaj <b>Shkarkime</b>.",
     "<b>Print it</b> and store it somewhere safe": "<b>Shtypeni</b> dhe ruajeni diku pa rrezik",
     "<b>Save it</b> on a USB key or backup drive": "<b>Ruajeni</b> në një diskth USB ose disk kopjeruajtjesh",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopjojeni</b> te depoja juaj personale në re",
-    "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.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një pajisje tjetër.",
     "Set up Secure Message Recovery": "Rregulloni Rimarrje të Sigurt Mesazhesh",
     "Keep it safe": "Mbajeni të parrezikuar",
     "Create Key Backup": "Krijo Kopjeruajtje Kyçesh",
@@ -1065,7 +991,6 @@
     "This looks like a valid recovery key!": "Ky duket si kyç i vlefshëm rimarrjesh!",
     "Not a valid recovery key": "Kyç rimarrjesh jo i vlefshëm",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë kyçin tuaj të rimarrjeve.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "Nëse keni harruar frazëkalimin tuaj të rikthimeve, mund të <button>rregulloni mundësi të reja rikthimesh</button>",
     "Sign in with single sign-on": "Bëni hyrjen me hyrje njëshe",
     "Failed to perform homeserver discovery": "S’u arrit të kryhej zbulim shërbyesi Home",
     "Invalid homeserver discovery response": "Përgjigje e pavlefshme zbulimi shërbyesi Home",
@@ -1113,7 +1038,6 @@
     "That doesn't look like a valid email address": "Kjo s’duket si adresë email e vlefshme",
     "Checking...": "Po kontrollohet…",
     "Invalid identity server discovery response": "Përgjigje e pavlefshme zbulimi identiteti shërbyesi",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "Kopjeruajtja ka një nënshkrim <validity>të vlefshëm</validity> prej pajisjes së <verify>verifikuar</verify> <device></device>",
     "New Recovery Method": "Metodë e Re Rimarrjesh",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni caktuar ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.",
     "Set up Secure Messages": "Rregulloni Mesazhi të Sigurt",
@@ -1163,13 +1087,11 @@
     "Email Address": "Adresë Email",
     "Backing up %(sessionsRemaining)s keys...": "Po kopjeruhen kyçet për %(sessionsRemaining)s…",
     "All keys backed up": "U kopjeruajtën krejt kyçet",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Kopjeruajtja ka nënshkrim nga pajisje <verify>e panjohur</verify> me ID %(deviceId)s.",
     "Add an email address to configure email notifications": "Shtoni një adresë email që të formësoni njoftime me email",
     "Unable to verify phone number.": "S’arrihet të verifikohet numër telefoni.",
     "Verification code": "Kod verifikimi",
     "Phone Number": "Numër Telefoni",
     "Profile picture": "Foto profili",
-    "Upload profile picture": "Ngarkoni foto profili",
     "Display Name": "Emër Në Ekran",
     "Room information": "Të dhëna dhome",
     "Internal room ID:": "ID e brendshme dhome:",
@@ -1212,19 +1134,15 @@
     "Share Link to User": "Ndajeni Lidhjen për te Përdoruesi",
     "Main address": "Adresë kryesore",
     "Room avatar": "Avatar dhome",
-    "Upload room avatar": "Ngarkoni avatar dhome",
-    "No room avatar": "S’ka avatar dhome",
     "Room Name": "Emër Dhome",
     "Room Topic": "Temë Dhome",
     "Join": "Bëhuni pjesë",
     "Use Legacy Verification (for older clients)": "Përdor Verifikim të Dikurshëm (për klientë të vjetër)",
     "Verify by comparing a short text string.": "Verifikoje duke krahasuar një varg të shkurtër teksti.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Për siguri maksimale, këshillojmë ta bëni këtë në prani të vetë personit, ose të përdorni një tjetër kanal të besuar komunikimesh.",
     "Begin Verifying": "Po verifikohet",
     "Waiting for partner to accept...": "Po pritet pranimi nga partneri…",
     "Use two-way text verification": "Përdor verifikim të anasjelltë me tekst",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifikojeni këtë përdorues që t’i vihet shenjë si i besuar. Përdoruesit e besuar ju më tepër siguri kur përdorni mesazhe të fshehtëzuar skaj-më-skaj.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifikimi i këtij përdoruesi do të shënojë pajisjen e tij si të besuar, dhe tuajën si të besuar kundrejt tyre.",
     "Waiting for partner to confirm...": "Po pritet ripohimi nga partneri…",
     "Incoming Verification Request": "Kërkesë Verifikimi e Ardhur",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Për të na ndihmuar të shmangim çështje të përsëdytura, ju lutemi, së pari <existingIssuesLink>shihni çështjet ekzistuese</existingIssuesLink> (dhe shtoni një +1) ose <newIssueLink>krijoni një çështje të re</newIssueLink>, nëse nuk gjeni gjë.",
@@ -1261,10 +1179,7 @@
     "Keep going...": "Vazhdoni kështu…",
     "Starting backup...": "Po fillohet kopjeruajtje…",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Janë pikasur një frazëkalim dhe kyç i ri rimarrjesh për Mesazhe të Sigurt.",
-    "This device is encrypting history using the new recovery method.": "Kjo pajisje e fshehtëzon historikun duke përdorur metodë të re rimarrjesh.",
     "Recovery Method Removed": "U hoq Metodë Rimarrje",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Kjo pajisje ka pikasur se frazëkalimi dhe kyçi juaj i rimarrjeve për Mesazhe të Sigurt janë hequr.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë pajisje, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të pajisjes me një metodë të re rimarrjesh.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Nëse metodën e re të rimarrjeve s’e keni hequr ju, dikush mund të jetë duke u rrekur të hyjë në llogarinë tuaj. Ndryshoni menjëherë fjalëkalimin e llogarisë tuaj, te Rregullimet, dhe caktoni një metodë të re rimarrjesh.",
     "Disinvite this user?": "T’i hiqet ftesa këtij përdoruesi?",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Kartela '%(fileName)s' tejkalon kufirin e këtij shërbyesi Home për madhësinë e ngarkimeve",
@@ -1312,7 +1227,6 @@
     "Book": "Libër",
     "Pencil": "Laps",
     "Paperclip": "Kapëse",
-    "Padlock": "Dry",
     "Hammer": "Çekiç",
     "Telephone": "Telefon",
     "Flag": "Flamur",
@@ -1328,10 +1242,7 @@
     "Anchor": "Spirancë",
     "Headphones": "Kufje",
     "Folder": "Dosje",
-    "Your homeserver does not support device management.": "Shërbyesi juaj Home nuk mbulon administrim pajisjesh.",
     "Chat with Riot Bot": "Fjalosuni me Robotin Riot",
-    "Some devices for this user are not trusted": "Disa pajisje për këtë përdorues nuk janë të besuara",
-    "All devices for this user are trusted": "Krejt pajisjet për këtë përdorues janë të besuara",
     "Recovery Key Mismatch": "Mospërputhje Kyçesh Rimarrjeje",
     "Incorrect Recovery Passphrase": "Frazëkalim Rimarrjeje i Pasaktë",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "S’u shfshehtëzua dot kopjeruajtja me këtë frazëkalim: ju lutemi, verifikoni që dhatë frazëkalimin e duhur të rimarrjeve.",
@@ -1340,7 +1251,6 @@
     "Couldn't load page": "S’u ngarkua dot faqja",
     "This homeserver does not support communities": "Ky shërbyes Home s’mbulon bashkësi",
     "Your password has been reset.": "Fjalëkalimi juaj u ricaktua.",
-    "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.": "Jeni nxjerrë jashtë prej krejt pajisjeve dhe s’do të merrni më njoftime push. Që të riaktivizoni njoftimet, bëni sërish hyrjen në çdo pajisje.",
     "This homeserver does not support login using email address.": "Ky shërbyes Home nuk mbulon hyrje përmes adresash email.",
     "Registration has been disabled on this homeserver.": "Në këtë shërbyes Home regjistrimi është çaktivizuar.",
     "Unable to query for supported registration methods.": "S’arrihet të kërkohet për metoda regjistrimi që mbulohen.",
@@ -1355,18 +1265,13 @@
     "Santa": "Babagjyshi i Vitit të Ri",
     "Hourglass": "Klepsidër",
     "Key": "Kyç",
-    "This backup is trusted because it has been restored on this device": "Kjo kopjeruajtje është e besuar, ngaqë është rikthyer në këtë pajisje",
-    "Some devices in this encrypted room are not trusted": "Disa pajisje në këtë dhomë të fshehtëzuar s’janë të besuara",
-    "All devices in this encrypted room are trusted": "Krejt pajisjet në këtë dhomë të fshehtëzuar janë të besuara",
     "Disinvite": "Hiqi ftesën",
     "Disinvite this user from community?": "T’i hiqet ftesa për në bashkësi këtij përdoruesi?",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Te mesazhet tuaj do të dërgohet një email verifikimi, për të ripohuar caktimin e fjalëkalimit tuaj të ri.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Jeni i sigurt? Do të humbni mesazhet tuaj të fshehtëzuar, nëse kopjeruajtja për kyçet tuaj nuk bëhet si duhet.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesazhet e fshehtëzuar sigurohen me fshehtëzim skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
     "Restore from Backup": "Riktheje prej Kopjeruajtje",
-    "This device is backing up your keys. ": "Kjo pajisje po bën kopjeruajtje të kyçeve tuaja. ",
     "Back up your keys before signing out to avoid losing them.": "Kopjeruajini kyçet tuaj, përpara se të dilni, që të shmangni humbjen e tyre.",
-    "Your keys are <b>not being backed up from this device</b>.": "Kyçet tuaj <b>nuk po kopjeruhen nga kjo pajisje</b>.",
     "Start using Key Backup": "Fillo të përdorësh Kopjeruajtje Kyçesh",
     "Never lose encrypted messages": "Mos humbni kurrë mesazhe të fshehtëzuar",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesazhet në këtë dhomë janë të siguruar përmes fshehtëzimi skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
@@ -1385,7 +1290,6 @@
     "Set up with a Recovery Key": "Rregullojeni me një Kyç Rimarrjesh",
     "Please enter your passphrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni frazëkalimin tuaj.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kyçi juaj i rimarrjeve është një masë sigurie - mund ta përdorni për rimarrje hyrjeje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Mbajeni kyçin tuaj të rikthimeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë)",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).",
     "Secure your backup with a passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim",
     "Confirm your passphrase": "Ripohoni frazëkalimin tuaj",
@@ -1444,23 +1348,16 @@
     "Want more than a community? <a>Get your own server</a>": "Doni më shumë se një bashkësi? <a>Merrni një shërbyes tuajin</a>",
     "Power level": "Shkallë pushteti",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Për funksionimin më të mirë, ju lutemi, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Ndryshimi i fjalëkalimit tuaj do të sjellë ricaktim të çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt pajisjet tuaja, duke e bërë të palexueshëm historikun e bisedave të fshehtëzuara. Ujdisni një Kopjeruajtje Kyçesh ose eksportoni kyçet e dhomës tuaj prej një tjetër pajisjeje përpara se të ricaktoni fjalëkalimin tuaj.",
     "A conference call could not be started because the integrations server is not available": "S’u nis dot një thirrje konferencë, ngaqë shërbyesi i integrimit s’është i kapshëm",
     "Replying With Files": "Përgjigje Me Kartela",
     "The file '%(fileName)s' failed to upload.": "Dështoi ngarkimi i kartelës '%(fileName)s'.",
     "Name or Matrix ID": "Emër ose ID Matrix-i",
-    "Email, name or Matrix ID": "Email, emër ose ID matrix",
-    "Room upgrade confirmation": "Ripohim përmirësimi dhome",
     "Changes your avatar in this current room only": "Ndryshon avatarin tuaj vetëm në dhomën e tanishme",
     "Unbans user with given ID": "I heq dëbimin përdoruesit me ID-në e dhënë",
     "You cannot modify widgets in this room.": "S’mund të ndryshoni widget-e në këtë dhomë.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s shfuqizoi ftesën për %(targetDisplayName)s që të marrë pjesë në dhomë.",
     "No homeserver URL provided": "S’u dha URL shërbyesi Home",
     "When rooms are upgraded": "Kur përmirësohen dhomat",
-    "Connect this device to Key Backup": "Lidheni këtë pajisje me Kopjeruajtje Kyçesh",
-    "Backup has an <validity>invalid</validity> signature from this device": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej kësaj pajisjeje",
-    "Enable desktop notifications for this device": "Aktivizo njoftime desktop për këtë pajisje",
-    "Enable audible notifications for this device": "Aktivizo njoftime audio për këtë pajisje",
     "Upgrade this room to the recommended room version": "Përmirësojeni këtë dhomë me versionin e rekomanduar të dhomës",
     "this room": "këtë dhomë",
     "View older messages in %(roomName)s.": "Shihni mesazhe më të vjetër në %(roomName)s.",
@@ -1530,11 +1427,7 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Nëse përdorni apo jo veçorinë 'breadcrumbs' (avatarë sipër listës së dhomës)",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Hëpërhë s’është e mundur përgjigja me një kartelë. Do të donit ta ngarkoni këtë kartelë pa u përgjigjur?",
     "The server does not support the room version specified.": "Shërbyesi nuk e mbulon versionin e specifikuar të dhomës.",
-    "Upgrading a room can be destructive and isn't always necessary.": "Përmirësimi i një dhome mund të jetë shkatërrimtar dhe s’është i nevojshëm përherë.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Përmirësimet e dhomave zakonisht janë të këshilluara kur një version dhome konsiderohet <i>i paqëndrueshëm</i>. Versionet e paqëndrueshëm të dhomave mund të kenë të meta, mungesa veçorish, ose cenueshmëri sigurie.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Përmirësimi i dhomave zakonisht prek vetëm pjesën <i>më anë të shërbyesit</i> të dhomës. Nëse keni probleme me klientin tuaj Riot , ju lutemi, parashtroni një problem me <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Kujdes</b>: Përmirësimi i një dhome <i>s’do të shkaktojë migrim vetvetiu të anëtarëve të dhomës te versioni i ri i dhomës.</i> Do të postojmë në versionin e vjetër të dhomë një lidhje për te dhoma e re - anëtarëve të dhomës do t’u duhet të klikojnë mbi këtë lidhje, që të bëhen pjesë e saj.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Ju lutemi, ripohoni se do të donit të ecej më tej me përmirësimin e kësaj dhome nga <oldVersion /> te <newVersion />.",
     "Adds a custom widget by URL to the room": "Shton te dhoma një widget vetjak përmes URL-je",
     "Please supply a https:// or http:// widget URL": "Ju lutemi, furnizoni një URL https:// ose http:// widget-i",
     "Sends the given message coloured as a rainbow": "E dërgon mesazhin e dhënë të ngjyrosur si ylber",
@@ -1542,8 +1435,6 @@
     "The user's homeserver does not support the version of the room.": "Shërbyesi Home i përdoruesit s’e mbulon versionin e dhomës.",
     "Show hidden events in timeline": "Shfaq te rrjedha kohore veprimtari të fshehura",
     "Low bandwidth mode": "Mënyrë gjerësi e ulët bande",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Kjo pajisje <b>nuk po bën kopjeruajtje të kyçeve tuaja</b>, por keni një kopjeruajtje ekzistuese që mund ta përdorni për rimarrje dhe ta shtoni më tej.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Lidheni këtë pajisje me kopjeruajtje kyçesh, përpara se të dilni, që të shmangni humbje të çfarëdo kyçi që mund të gjendet vetëm në këtë pajisje.",
     "Something went wrong with your invite to %(roomName)s": "Diç shkoi ters me ftesën tuaj për te %(roomName)s",
     "You can only join it with a working invite.": "Mund të merrni pjesë në të vetëm me një ftesë funksionale.",
     "You can still join it because this is a public room.": "Mundeni prapëseprapë të merrni pjesë, ngaqë është një dhomë publike.",
@@ -1607,11 +1498,9 @@
     "Resend %(unsentCount)s reaction(s)": "Ridërgo %(unsentCount)s reagim(e)",
     "Resend removal": "Ridërgo heqjen",
     "Changes your avatar in all rooms": "Ndryshon avatarin tuaj në krejt dhomat",
-    "Clear all data on this device?": "Të spastrohen krejt të dhënat në këtë pajisje?",
     "Your homeserver doesn't seem to support this feature.": "Shërbyesi juaj Home nuk duket se e mbulon këtë veçori.",
     "You're signed out": "Keni bërë dalje",
     "Clear all data": "Spastro krejt të dhënat",
-    "Failed to start chat": "S’u arrit të nisej fjalosje",
     "Messages": "Mesazhe",
     "Actions": "Veprime",
     "Sends the given emote coloured as a rainbow": "E dërgon emote-n e dhënë të ngjyrosur si ylber",
@@ -1628,7 +1517,6 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Te +%(msisdn)s u dërgua një mesazh tekst. Ju lutemi, jepni kodin e verifikimit që përmban.",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Ju lutemi, na tregoni ç’shkoi keq ose, akoma më mirë, krijoni në GitHub një çështje që përshkruan problemin.",
     "Removing…": "Po hiqet…",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Spastrimi i krejt të dhënave prej kësaj pajisjeje është përfundimtar. Mesazhet e fshehtëzuar do të humbin, veç në qofshin kopjeruajtur kyçet e tyre.",
     "Share User": "Ndani Përdorues",
     "Command Help": "Ndihmë Urdhri",
     "Identity Server": "Shërbyes Identitetesh",
@@ -1642,13 +1530,11 @@
     "This account has been deactivated.": "Kjo llogari është çaktivizuar.",
     "Failed to re-authenticate due to a homeserver problem": "S’u arrit të ribëhej mirëfilltësimi, për shkak të një problemi me shërbyesin Home",
     "Failed to re-authenticate": "S’u arrit të ribëhej mirëfilltësimi",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Rifitoni hyrjen te llogaria juaj dhe rimerrni kyçe fshehtëzimi të depozituar në këtë pajisje. Pa ta, s’do të jeni në gjendje të lexoni krejt mesazhet tuaj të siguruar në çfarëdo pajisje.",
     "Enter your password to sign in and regain access to your account.": "Jepni fjalëkalimin tuaj që të bëhet hyrja dhe të rifitoni hyrje në llogarinë tuaj.",
     "Forgotten your password?": "Harruat fjalëkalimin tuaj?",
     "Sign in and regain access to your account.": "Bëni hyrjen dhe rifitoni hyrje në llogarinë tuaj.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "S’mund të bëni hyrjen në llogarinë tuaj. Ju lutemi, për më tepër hollësi, lidhuni me përgjegjësin e shërbyesit tuaj Home.",
     "Clear personal data": "Spastro të dhëna personale",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Kujdes: Të dhënat tuaja personale (përfshi kyçe fshehtëzimi) janë ende të depozituara në këtë pajisje. Spastrojini, nëse keni përfunduar së përdoruri këtë pajisje, ose dëshironi të bëni hyrjen në një tjetër llogari.",
     "Spanner": "Çelës",
     "Identity Server URL must be HTTPS": "URL-ja e Shërbyesit të Identiteteve duhet të jetë HTTPS",
     "Not a valid Identity Server (status code %(code)s)": "Shërbyes Identitetesh i pavlefshëm (kod gjendjeje %(code)s)",
@@ -1675,10 +1561,8 @@
     "Terms of service not accepted or the identity server is invalid.": "S’janë pranuar kushtet e shërbimit ose shërbyesi i identiteteve është i pavlefshëm.",
     "Enter a new identity server": "Jepni një shërbyes të ri identitetesh",
     "Integration Manager": "Përgjegjës Integrimesh",
-    "A device's public name is visible to people you communicate with": "Emri publik i një pajisjeje është i dukshëm për personat me të cilët komunikoni",
     "Remove %(email)s?": "Të hiqet %(email)s?",
     "Remove %(phone)s?": "Të hiqet %(phone)s?",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Që të verifikohet se kjo pajisje mund të besohet, ju lutemi, kontrolloni që kyçi që shihni te Rregullime Përdoruesi në atë pajisje të përputhet me kyçin më poshtë:",
     "You do not have the required permissions to use this command.": "S’keni lejet e domosdoshme për përdorimin e këtij urdhri.",
     "Multiple integration managers": "Përgjegjës të shumtë integrimesh",
     "Accept <policyLink /> to continue:": "Që të vazhdohet, pranoni <policyLink />:",
@@ -1769,7 +1653,6 @@
     "Community Autocomplete": "Vetëplotësim Nga të Bashkësisë",
     "Add Email Address": "Shtoni Adresë Email",
     "Add Phone Number": "Shtoni Numër Telefoni",
-    "Use the new, faster, composer for writing messages": "Përdorni për shkrim mesazhesh hartuesin e ri, më të shpejtë",
     "Show previews/thumbnails for images": "Shfaq për figurat paraparje/miniatura",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Përpara shkëputjes, duhet <b>të hiqni të dhënat tuaja personale</b> nga shërbyesi i identiteteve <idserver />. Mjerisht, shërbyesi i identiteteve <idserver /> hëpërhë është jashtë funksionimi dhe s’mund të kapet.",
     "You should:": "Duhet:",
@@ -1868,11 +1751,7 @@
     "Custom (%(level)s)": "Vetjak (%(level)s)",
     "Trusted": "E besuar",
     "Not trusted": "Jo e besuar",
-    "Hide verified Sign-In's": "Fshihi Hyrjet e verifikuara",
-    "%(count)s verified Sign-In's|other": "%(count)s Hyrje të verifikuara",
-    "%(count)s verified Sign-In's|one": "1 Hyrje e verifikuar",
     "Direct message": "Mesazh i Drejtpërdrejtë",
-    "Unverify user": "Hiqi verifikimin përdoruesit",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> në %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Mesazhet në këtë dhomë janë të fshehtëzuara skaj-më-skaj.",
     "Security": "Siguri",
@@ -1889,7 +1768,6 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s.",
     "Widget added by": "Widget i shtuar nga",
     "This widget may use cookies.": "Ky <em>widget</em> mund të përdorë <em>cookies</em>.",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "Dërgo kërkesa verifikimi në mesazhe të drejtpërdrejtë, përfshi një UX të ri verifikimesh te paneli i anëtarit.",
     "Decline (%(counter)s)": "Hidhe poshtë (%(counter)s)",
     "Connecting to integration manager...": "Po lidhet me përgjegjës integrimesh…",
     "Cannot connect to integration manager": "S’lidhet dot te përgjegjës integrimesh",
@@ -1917,12 +1795,10 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bëri një thirrje zanore. (e pambuluar nga ky shfletues)",
     "%(senderName)s placed a video call.": "%(senderName)s bëri një thirrje video.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bëri një thirrje video. (e pambuluar nga ky shfletues)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Aktivizoni <em>cross-signing</em> për të verifikuar me bazë përdorues në vend se me bazë pajisje (në zhvillim)",
     "Enable local event indexing and E2EE search (requires restart)": "Aktivizoni indeksim aktesh vendore dhe kërkim E2EE (lyp rinisje)",
     "Match system theme": "Përputhe me temën e sistemit",
     "Send cross-signing keys to homeserver": "Dërgo te shërbyesi Home kyçe <em>cross-signing</em>",
     "Cross-signing public keys:": "Kyçe publikë për <em>cross-signing</em>:",
-    "on device": "në pajisje",
     "not found": "s’u gjet",
     "in secret storage": "në depozitë të fshehtë",
     "Secret storage public key:": "Kyç publik depozite të fshehtë:",
@@ -1953,16 +1829,12 @@
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të <button>ujdisni mundësi të reja rimarrjeje</button>",
     "Notification settings": "Rregullime njoftimesh",
     "User Status": "Gjendje Përdoruesi",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Kujdes</b>: Duhet të ujdisni një depozitë të fshehtë vetëm nga një kompjuter i besuar.",
     "Set up with a recovery key": "Rregullojeni me një kyç rimarrjesh",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Si masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar, nëse harroni frazëkalimin tuaj.",
     "As a safety net, you can use it to restore your access to encrypted messages.": "Si një masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i rimarrjeve është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Kyçi juaj i rimarrjeve gjendet te dosja juaj <b>Shkarkime</b>.",
-    "Your access to encrypted messages is now protected.": "Hyrja juaj te mesazhe të fshehtëzuar tani është e mbrojtur.",
-    "Set up secret storage": "Ujdisni depozitë të fshehtë",
-    "Secure your encrypted messages with a passphrase": "Sigurojini mesazhet tuaj të fshehtëzuar me një frazëkalim",
     "Storing secrets...": "Po depozitohen të fshehta…",
     "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s hoqi rregullin për dëbim përdoruesish që kanë përputhje me %(glob)s",
@@ -1983,19 +1855,11 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ndryshoi një rregull që dëbonte shërbyes me përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s përditësoi një rregull dëbimesh mbi përputhje me %(oldGlob)s për përputhje me %(newGlob)s për %(reason)s",
     "The message you are trying to send is too large.": "Mesazhi që po rrekeni të dërgoni është shumë i madh.",
-    "New DM invite dialog (under development)": "Dialog ftese të re për MD (në zhvillim)",
     "not stored": "e padepozituar",
     "Backup has a <validity>valid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej këtij përdoruesi",
     "Backup has a <validity>invalid</validity> signature from this user": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej këtij përdoruesi",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një përdorues i <verify>panjohur</verify> me ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "Kopjeruajtja ka një nënshkrim nga një pajisje e <verify>panjohur</verify> me ID %(deviceId)s",
     "Backup key stored: ": "Kyç kopjeruajtjeje i depozituar: ",
-    "Start using Key Backup with Secure Secret Storage": "Fillo të përdorësh Kopejruajtje Kyçesh me Depozitim Kyçi të Fshehtë",
-    "This user has not verified all of their devices.": "Ky përdorues s’ka verifikuar krejt pajisjet e tij.",
-    "You have not verified this user. This user has verified all of their devices.": "S’e keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.",
-    "You have verified this user. This user has verified all of their devices.": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt pajisjet e veta.",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "Disa përdorues në këtë dhomë të fshehtëzuar nuk janë verifikuar nga ju ose nuk kanë verifikuar pajisjet e tyre.",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "Krejt përdorues në këtë dhomë të fshehtëzuar janë verifikuar nga ju dhe kanë verifikuar pajisjet e tyre.",
     "Close preview": "Mbylle paraparjen",
     "Hide verified sessions": "Fshih sesione të verifikuar",
     "%(count)s verified sessions|other": "%(count)s sesione të verifikuar",
@@ -2004,20 +1868,11 @@
     "Show more": "Shfaq më tepër",
     "Recent Conversations": "Biseda Së Fundi",
     "Direct Messages": "Mesazhe të Drejtpërdrejtë",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Nëse s’gjeni dot dikë, kërkojuni emrin e përdoruesit, ose jepuni emrin tuaj të përdoruesit (%(userId)s) ose <a>profile link</a>.",
     "Go": "Shko",
     "Help": "Ndihmë",
     "Country Dropdown": "Menu Hapmbyll Vendesh",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Depozita e Fshehtë do të ujdiset duke përdorur hollësitë tuaja ekzistuese për kopjeruajtje kyçesh.Frazëkalimi juaj për në depozitën e fshehtë dhe kyçi i rimarrjes do të jenë të njëjtë me ata për kopjeruajtjen tuaj të kyçeve",
-    "Migrate from Key Backup": "Migroji prej Kopjeruajtje Kyçesh",
     "Show info about bridges in room settings": "Shfaq te rregullime dhome të dhëna rreth urash",
-    "This bridge was provisioned by <user />": "Kjo urë është dhënë nga <user />",
     "This bridge is managed by <user />.": "Kjo urë administrohet nga <user />.",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "Lidhur me <channelIcon /> <channelName /> në <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "Lidhur përmes %(protocolName)s",
-    "Bridge Info": "Të dhëna Ure",
-    "Below is a list of bridges connected to this room.": "Më poshtë keni një listë urash të lidhura në këtë dhomë.",
-    "New Session": "Sesion i Ri",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s shtoi %(addedAddresses)s dhe dhe %(count)s adresa të tjera te kjo dhomë",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hoqi %(removedAddresses)s dhe %(count)s adresa të tjera nga kjo dhomë",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hoqi %(countRemoved)s dhe shtoi %(countAdded)s adresa te kjo dhomë",
@@ -2041,16 +1896,12 @@
     "Other users may not trust it": "Përdorues të tjerë mund të mos e besojnë",
     "Later": "Më vonë",
     "Cross-signing and secret storage are enabled.": "<em>Cross-signing</em> dhe depozitimi i fshehtë janë aktivizuar.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "Llogaria juaj ka një identitet <em>cross-signing</em> në depozitë të fshehtë, por s’është ende i besuar në këtë pajisje.",
     "Cross-signing and secret storage are not yet set up.": "<em>Cross-signing</em> dhe depozitimi i fshehtë s’janë ujdisur ende.",
     "Cross-signing private keys:": "Kyçe privatë për <em>cross-signing</em>:",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "Kyçi i kopjeruajtjeve u depozitua në depozitë të fshehtë, po kjo veçori s’është e aktivizuar në këtë pajisje. Ju lutemi, aktivizoni në Labs <em>cross-signing</em> që të modifikoni gjendje kopjeruatjeje kyçesh.",
     "Labs": "Labs",
     "Complete": "E plotë",
-    "Someone is using an unknown device": "Dikush po përdor një pajisje të panjohur",
     "This room is end-to-end encrypted": "Kjo dhomë është e fshehtëzuar skaj-më-skaj",
     "Everyone in this room is verified": "Gjithkush në këtë dhomë është verifikuar",
-    "Encrypted by a deleted device": "Fshehtëzuar nga një pajisje e fshirë",
     "Invite only": "Vetëm me ftesa",
     "Send a reply…": "Dërgoni një përgjigje…",
     "Send a message…": "Dërgoni një mesazh…",
@@ -2062,7 +1913,6 @@
     "Send as message": "Dërgoni një mesazh",
     "Verify User": "Verifikoni Përdoruesin",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Për siguri ekstra, verifikojeni këtë përdorues duke kontrolluar në të dyja pajisjet tuaja një kod njëpërdorimsh.",
-    "For maximum security, do this in person.": "Për siguri maksimum, bëjeni këtë ju vetë.",
     "Start Verification": "Fillo Verifikimin",
     "Failed to invite the following users to chat: %(csvUsers)s": "S’u arrit të ftoheshin për bisedë përdoruesit vijues: %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "S’e krijuam dot DM-në tuaj. Ju lutemi, kontrolloni përdoruesit që doni të ftoni dhe riprovoni.",
@@ -2073,38 +1923,27 @@
     "Suggestions": "Sugjerime",
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit, tregojuni emrin tuaj të përdoruesit (%(userId)s) ose <a>lidhjen e profilit</a>.",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit (p.sh., @përdorues:shërbyes.com) ose <a>tregojuni këtë dhomë</a>.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "Për verifikim pajisjesh të tjera përmes dhënies së frazëkalimit tuaj, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "Për verifikim pajisjesh të tjera përmes dhënies së kyçit tuaj të rimarrjes, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
     "Complete security": "Siguri të plotë",
     "Verify this session to grant it access to encrypted messages.": "Verifikojeni këtë sesion që t’i akordohet hyrje te mesazhe të fshehtëzuar.",
     "Start": "Nise",
     "Session verified": "Sesion i verifikuar",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Ka hyrje te mesazhet tuaj të fshehtëzuar dhe përdoruesit e tjerë do ta shohin si të besuar.",
     "Done": "U bë",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "Pa plotësuar sigurinë në këtë pajisje, s’do të ketë hyrje te mesazhe të fshehtëzuar.",
     "Go Back": "Shko Mbrapsht",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Kopjeruajtja e Kyçeve është e aktivizuar në llogarinë tuaj, por nuk është ujdisur që nga ky sesion. Që të ujdisni depozitim të fshehtë, riktheni kopjeruajtjen tuaj të kyçeve.",
     "Restore": "Riktheje",
     "Enter your account password to confirm the upgrade:": "Që të ripohohet përmirësimi, jepni fjalëkalimin e llogarisë tuaj:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Do t’ju duhet të bëni mirëfilltësimin me shërbyesin që të ripohohet përmirësimi.",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Përmirësojeni këtë pajisje për ta lejuar të verifikojë pajisje të tjera, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuara për përdorues të tjerë.",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Ujdisni fshehtëzim në këtë pajisje që ta lejoni të verifikojë pajisje të tjera, duke u akorduar atyre hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë atyre si të besuara për përdorues të tjerë.",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sigurojini kyçet tuaj të fshehtëzimit me një frazëkalim. Për siguri maksimale, ky do të duhej të ishte i ndryshëm nga fjalëkalimi për llogarinë tuaj:",
     "Enter a passphrase": "Jepni një frazëkalim",
     "Enter your passphrase a second time to confirm it.": "Që të ripohohet, jepeni edhe një herë frazëkalimin tuaj.",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "Kjo pajisje mund të verifikojë pajisje të tjera, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuara për përdorues të tjerë.",
     "Verify other users in their profile.": "Verifikoni përdorues të tjerë në profilin e tyre.",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "Pa ujdisur depozitim të fshehtë, s’do të jeni në gjendje të rimerrni hyrje te mesazhe të fshehtëzuar apo te identiteti juaj <em>cross-signing</em> për verifikim pajisjesh të tjera, nëse dilni nga llogaria juaj ose përdorni një pajisje tjetër.",
-    "Restore your Key Backup": "Riktheni Kopjeruajtjen tuaj të Kyçeve",
     "Upgrade your encryption": "Përmirësoni fshehtëzimin tuaj",
     "Set up encryption": "Ujdisni fshehtëzim",
     "Encryption upgraded": "U përmirësua fshehtëzimi",
     "Encryption setup complete": "Ujdisje fshehtëzimit e plotësuar",
     "Verify this session": "Verifikoni këtë sesion",
     "Encryption upgrade available": "Ka të gatshëm përmirësim fshehtëzimi",
-    "Review & verify your new session": "Shqyrtoni & verifikoni sesionin tuaj të ri",
     "Review": "Shqyrtojeni",
-    "Verify your other devices easier": "Verifikoni më lehtë pajisjet tuaja të tjera",
     "Enable message search in encrypted rooms": "Aktivizo kërkim mesazhesh në dhoma të fshehtëzuara",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi, duke përdorur ",
     " to store messages from ": " për të depozituar mesazhe nga ",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 94e5225d20..e5bd6d6f1a 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -58,10 +58,6 @@
     "Moderator": "Модератор",
     "Admin": "Админ",
     "Start a chat": "Крени са ћаскањем",
-    "Who would you like to communicate with?": "Са киме желите да разговарате?",
-    "Start Chat": "Ћаскај",
-    "Invite new room members": "Позови нове чланове у собу",
-    "Send Invites": "Пошаљи позивнице",
     "Operation failed": "Радња није успела",
     "Failed to invite": "Нисам успео да пошаљем позивницу",
     "Failed to invite the following users to the %(roomName)s room:": "Нисам успео да пошаљем позивницу корисницима за собу %(roomName)s:",
@@ -77,7 +73,6 @@
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
     "Missing user_id in request": "Недостаје user_id у захтеву",
     "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.": "Постоје непознати уређаји у овој соби: уколико наставите без проверавања, можда ће неко прислушкивати ваш позив.",
     "Review Devices": "Испрегледај уређаје",
     "Call Anyway": "Ипак позови",
     "Answer Anyway": "Ипак одговори",
@@ -93,19 +88,13 @@
     "You are now ignoring %(userId)s": "Сада занемарујете корисника %(userId)s",
     "Unignored user": "Незанемарени корисник",
     "You are no longer ignoring %(userId)s": "Више не занемарујете корисника %(userId)s",
-    "Unknown (user, device) pair:": "Непознати пар (корисника, уређаја):",
-    "Device already verified!": "Уређај је већ проверен!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "УПОЗОРЕЊЕ: Уређај је већ проверен али се кључеви НЕ ПОДУДАРАЈУ!",
     "Verified key": "Проверени кључ",
-    "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.",
-    "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“. Ово можда значи да се ваши разговори прате!",
-    "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. Уређај је означен као проверен.",
     "%(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 је себи уклонио профилну слику.",
@@ -136,7 +125,6 @@
     "%(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 је променио закачене поруке у соби.",
@@ -160,8 +148,6 @@
     "Enable automatic language detection for syntax highlighting": "Омогући самостално препознавање језика за истицање синтаксе",
     "Automatically replace plain text Emoji": "Самостално замени емоџије писане обичним текстом",
     "Mirror local video feed": "Копирај довод локалног видеа",
-    "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": "Подразумевано омогући прегледе адреса за чланове ове собе",
@@ -183,7 +169,6 @@
     "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.": "Промена лозинке ће тренутно ресетовати све кључеве за шифровање с краја на крај, на свим уређајима и тиме учинити шифровани историјат ћаскања нечитљивим осим ако прво не извезете кључеве ваше собе па их поново увезете после. Ово ће бити побољшано у будућности.",
     "Continue": "Настави",
     "Export E2E room keys": "Извези E2E кључеве собе",
     "Do you want to set an email address?": "Да ли желите да поставите мејл адресу?",
@@ -192,10 +177,7 @@
     "New Password": "Нова лозинка",
     "Confirm password": "Потврди лозинку",
     "Change Password": "Промени лозинку",
-    "Unable to load device list": "Нисам могао да учитам списак уређаја",
     "Authentication": "Идентификација",
-    "Delete %(count)s devices|other": "Обриши %(count)s уређај(а)",
-    "Delete %(count)s devices|one": "Обриши уређај",
     "Device ID": "ИБ уређаја",
     "Last seen": "Последњи пут виђен",
     "Failed to set display name": "Нисам успео да поставим приказно име",
@@ -213,9 +195,6 @@
     "%(senderName)s sent a video": "Корисник %(senderName)s је послао видео",
     "%(senderName)s uploaded a file": "Корисник %(senderName)s је отпремио датотеку",
     "Options": "Опције",
-    "Undecryptable": "Немогуће дешифровати",
-    "Encrypted by an unverified device": "Шифровано на непровереном уређају",
-    "Unencrypted message": "Нешифрована порука",
     "Please select the destination room for this message": "Изаберите одредишну собу за ову поруку",
     "Blacklisted": "На црном списку",
     "device id: ": "иб уређаја: ",
@@ -235,8 +214,6 @@
     "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.": "Нећете моћи да опозовете ове промене зато што снижавате себе, ако сте последњи овлашћени корисник у соби, немогуће је да поново добијете овлашћења.",
     "Are you sure?": "Да ли сте сигурни?",
     "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": "Уређаји",
     "Unignore": "Не занемаруј више",
     "Ignore": "Занемари",
     "Jump to read receipt": "Скочи на потврду о прочитаности",
@@ -259,20 +236,14 @@
     "Voice call": "Гласовни позив",
     "Video call": "Видео позив",
     "Upload file": "Отпреми датотеку",
-    "Show Text Formatting Toolbar": "Прикажи алатницу за форматирање текста",
     "Send an encrypted reply…": "Пошаљи шифровани одговор…",
     "Send a reply (unencrypted)…": "Пошаљи одговор (нешифровани)…",
     "Send an encrypted message…": "Пошаљи шифровану поруку…",
     "Send a message (unencrypted)…": "Пошаљи поруку (нешифровану)…",
     "You do not have permission to post to this room": "Немате овлашћење за писање у овој соби",
-    "Hide Text Formatting Toolbar": "Сакриј алатницу за форматирање текста",
     "Server error": "Грешка на серверу",
     "Server unavailable, overloaded, or something else went wrong.": "Сервер није доступан или је преоптерећен или је нешто пошло наопако.",
     "Command error": "Грешка у наредби",
-    "bold": "подебљано",
-    "italic": "искошено",
-    "Markdown is disabled": "Маркдаун је искључен",
-    "Markdown is enabled": "Маркдаун је укључен",
     "Unpin Message": "Откачи поруку",
     "Jump to message": "Скочи на поруку",
     "No pinned messages.": "Нема закачених порука.",
@@ -307,7 +278,6 @@
     "Community Invites": "Позивнице заједнице",
     "Invites": "Позивнице",
     "Favourites": "Омиљено",
-    "People": "Особе",
     "Rooms": "Собе",
     "Low priority": "Ниска важност",
     "Historical": "Историјско",
@@ -342,8 +312,6 @@
     "Cancel": "Откажи",
     "Jump to first unread message.": "Скочи на прву непрочитану поруку.",
     "Close": "Затвори",
-    "Invalid alias format": "Неисправан облик алијаса",
-    "'%(alias)s' is not a valid format for an alias": "„%(alias)s 1“ није исправан облик алијаса",
     "not specified": "није наведено",
     "Remote addresses for this room:": "Удаљене адресе за ову собу:",
     "Local addresses for this room:": "Локална адреса ове собе:",
@@ -510,20 +478,12 @@
     "Unknown error": "Непозната грешка",
     "Incorrect password": "Нетачна лозинка",
     "Deactivate Account": "Угаси налог",
-    "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.": "Ако се подудара, притисните дугме за потврду провере испод. Ако се не подудара, неко други прислушкује овај уређај и вероватно желите да притиснете дугме за стављање на црни списак.",
-    "Verify device": "Провери уређај",
     "I verify that the keys match": "Потврђујем да се кључеви подударају",
     "An error has occurred.": "Догодила се грешка.",
     "OK": "У реду",
-    "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": "Захтев за кључ шифровања",
     "Unable to restore 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-а, ваша сесија може бити некомпатибилна са овим издањем. Затворите овај прозор и вратите се на новије издање.",
@@ -542,11 +502,6 @@
     "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.": "Ако већ имате Матрикс налог, можете се већ <a>пријавити</a>.",
-    "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": "Прилагођено",
@@ -621,8 +576,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.",
     "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>.",
     "%(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> сада. Такође можете изабрати појединачне поруке за поновно слање или отказивање.",
@@ -656,13 +609,10 @@
     "Sign out": "Одјави ме",
     "Failed to change password. Is your password correct?": "Нисам успео да променим лозинку. Да ли је ваша лозинка тачна?",
     "Success": "Успех",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ваша лозинка је успешно промењена. Нећете добијати пуш обавештења на вашим другим уређајима док се поново не пријавите на њима",
     "Unable to remove contact information": "Не могу да уклоним контакт податке",
     "<not supported>": "<није подржано>",
     "Import E2E room keys": "Увези E2E кључеве собе",
     "Cryptography": "Криптографија",
-    "Device ID:": "ИБ уређаја:",
-    "Device key:": "Кључ уређаја:",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot прикупља анонимне податке о коришћењу да бисмо побољшали апликацију.",
     "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.": "Сазнајте више о нашем начину употребе аналитике.",
@@ -685,7 +635,6 @@
     "click to reveal": "кликни за приказ",
     "Homeserver is": "Кућни сервер је",
     "Identity Server is": "Идентитетски сервер је",
-    "matrix-react-sdk version:": "matrix-react-sdk издање:",
     "riot-web version:": "riot-web издање:",
     "olm version:": "olm издање:",
     "Failed to send email": "Нисам успео да пошаљем мејл",
@@ -716,7 +665,6 @@
     "Kicks user with given id": "Избацује корисника са датим иб-јем",
     "Changes your display nickname": "Мења ваш приказни надимак",
     "Searches DuckDuckGo for results": "Претражује DuckDuckGo за резултате",
-    "Verifies a user, device, and pubkey tuple": "Проверава корисника, уређај и торку јавног кључа",
     "Ignores a user, hiding their messages from you": "Занемарује корисника и тиме скрива њихове поруке од вас",
     "Stops ignoring a user, showing their messages going forward": "Престаје са занемаривањем корисника и тиме приказује њихове поруке одсад",
     "Commands": "Наредбе",
@@ -740,7 +688,6 @@
     "Session ID": "ИБ сесије",
     "End-to-end encryption information": "Подаци о шифровању с краја на крај",
     "Event information": "Подаци о догађају",
-    "Sender device information": "Подаци о уређају пошиљаоца",
     "Passphrases must match": "Фразе се морају подударати",
     "Passphrase must not be empty": "Фразе не смеју бити празне",
     "Export room keys": "Извези кључеве собе",
@@ -756,11 +703,7 @@
     "Import": "Увези",
     "Did you know: you can use communities to filter your Riot.im experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег Riot.im искуства!",
     "Clear filter": "Очисти филтер",
-    "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> са осталих ваших уређаја.",
     "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.": "Да бисте поставили филтер, повуците аватар заједнице на површ филтрирања скроз на леву страну екрана. Можете кликнути на аватар у површи филтрирања било када да бисте видели само собе и особе везане за ту заједницу.",
     "Fetching third party location failed": "Добављање локације треће стране није успело",
     "A new version of Riot is available.": "Ново издање RIot-а је доступно.",
@@ -807,7 +750,6 @@
     "Noisy": "Бучно",
     "Collecting app version information": "Прикупљам податке о издању апликације",
     "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.": "Ово ће вам омогућити да се вратите у ваш налог након што се одјавите и пријавите, на другим уређајима.",
     "Keywords": "Кључне речи",
     "Enable notifications for this account": "Омогући обавештења за овај налог",
     "Invite to this community": "Позови у ову заједницу",
@@ -921,8 +863,6 @@
     "e.g. %(exampleValue)s": "нпр.: %(exampleValue)s",
     "Send analytics data": "Пошаљи аналитичке податке",
     "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима",
-    "Unable to reply": "Не могу да одговорим",
-    "At this time it is not possible to reply with an emote.": "У овом тренутку није могуће одговорити са емотиконом.",
     "Muted Users": "Утишани корисници",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића (погледајте нашу <PolicyLink>политику о колачићима</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића.",
@@ -959,8 +899,6 @@
     "This event could not be displayed": "Овај догађај не може бити приказан",
     "Demote yourself?": "Снизите чин себи?",
     "Demote": "Снизите чин",
-    "deleted": "обрисано",
-    "underlined": "подвучено",
     "Whether or not you're logged in (we don't record your username)": "Да ли сте пријављени (не бележимо ваше корисничко име)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Датотека „%(fileName)s“ премашује ограничење величине отпремања на овом кућном серверу",
     "Unable to load! Check your network connectivity and try again.": "Нисам могао да учитам! Проверите вашу мрежну везу и пробајте поново.",
diff --git a/src/i18n/strings/sr_Latn.json b/src/i18n/strings/sr_Latn.json
index a1fc3afafd..810f2a97cf 100644
--- a/src/i18n/strings/sr_Latn.json
+++ b/src/i18n/strings/sr_Latn.json
@@ -58,12 +58,6 @@
     "Moderator": "Moderator",
     "Admin": "Administrator",
     "Start a chat": "Pokreni ćaskanje",
-    "Who would you like to communicate with?": "Sa kim bi želeli da komunicirate?",
-    "Email, name or Matrix ID": "Adresa elektronske pošte, ime ili Matriks ID",
-    "Start Chat": "Započni ćaskanje",
-    "Invite new room members": "Pozovi nove članove u sobu",
-    "Send Invites": "Poštalji pozivnice",
-    "Failed to start chat": "Započinjanje ćaskanja nije uspelo",
     "Operation failed": "Operacija nije uspela",
     "Failed to invite": "Slanje pozivnice nije uspelo",
     "Failed to invite users to the room:": "Nije uspelo pozivanje korisnika u sobu:",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 90c03b84f3..e65e4e2099 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -42,7 +42,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes your display nickname": "Ändrar ditt visningsnamn",
-    "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.": "Om du byter lösenord kommer för tillfället alla krypteringsnycklar på alla enheter att nollställas, vilket gör all krypterad meddelandehistorik omöjligt att läsa, om du inte först exporterar rumsnycklarna och sedan importerar dem efteråt. I framtiden kommer det här att förbättras.",
     "Claimed Ed25519 fingerprint key": "Påstådd Ed25519-fingeravtrycksnyckel",
     "Click here to fix": "Klicka här för att fixa",
     "Click to mute audio": "Klicka för att tysta ljud",
@@ -66,12 +65,8 @@
     "Decryption error": "Dekrypteringsfel",
     "Deops user with given id": "Degraderar användare med givet id",
     "Default": "Standard",
-    "Device already verified!": "Enheten är redan verifierad!",
     "Device ID": "Enhets-ID",
-    "Device ID:": "Enhets-ID:",
     "device id: ": "enhets-id: ",
-    "Device key:": "Enhetsnyckel:",
-    "Devices": "Enheter",
     "Direct chats": "Direkt-chattar",
     "Disinvite": "Häv inbjudan",
     "Displays action": "Visar åtgärd",
@@ -120,7 +115,6 @@
     "Disable Notifications": "Slå av aviseringar",
     "Drop File Here": "Dra filen hit",
     "Enable Notifications": "Aktivera aviseringar",
-    "Encrypted by an unverified device": "Krypterat av en overifierad enhet",
     "Enter passphrase": "Ange lösenfras",
     "Error: Problem communicating with the given homeserver.": "Fel: Det gick inte att kommunicera med den angivna hemservern.",
     "Failed to fetch avatar URL": "Det gick inte att hämta avatar-URL",
@@ -134,7 +128,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s från %(fromPowerLevel)s till %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Gäster kan inte gå med i det här rummet fastän de är uttryckligen inbjudna.",
     "Hangup": "Lägg på",
-    "Hide Text Formatting Toolbar": "Göm textformatteringsverktygsfältet",
     "Historical": "Historiska",
     "Home": "Hem",
     "Homeserver is": "Hemserver är",
@@ -147,15 +140,12 @@
     "Incoming voice call from %(name)s": "Inkommande röstsamtal från %(name)s",
     "Incorrect username and/or password.": "Fel användarnamn och/eller lösenord.",
     "Incorrect verification code": "Fel verifieringskod",
-    "Invalid alias format": "Fel alias-format",
     "Invalid Email Address": "Ogiltig epostadress",
     "Invalid file%(extra)s": "Felaktig fil%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s bjöd in %(targetName)s.",
-    "Invite new room members": "Bjud in nya rumsmedlemmar",
     "Invited": "Inbjuden",
     "Invites": "Inbjudningar",
     "Invites user with given id to current room": "Bjuder in användare med givet id till nuvarande rum",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' är inte ett giltigt format för ett alias",
     "Sign in with": "Logga in med",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå med som <voiceText>röst</voiceText> eller <videoText>video</videoText>.",
     "Join Room": "Gå med i rum",
@@ -177,17 +167,11 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde framtida rumshistorik synligt för alla.",
     "Manage Integrations": "Hantera integrationer",
-    "Markdown is disabled": "Markdown är inaktiverat",
-    "Markdown is enabled": "Markdown är aktiverat",
-    "matrix-react-sdk version:": "matrix-react-sdk -version:",
-    "Message not sent due to unknown devices being present": "Meddelandet skickades inte eftersom det finns okända enheter i rummet",
     "Missing room_id in request": "room_id saknas i förfrågan",
     "Missing user_id in request": "user_id saknas i förfrågan",
     "Moderator": "Moderator",
     "Mute": "Tysta",
     "Name": "Namn",
-    "Never send encrypted messages to unverified devices from this device": "Skicka aldrig krypterade meddelanden till overifierade enheter från den här enheten",
-    "Never send encrypted messages to unverified devices in this room from this device": "Skicka aldrig krypterade meddelanden till overifierade enheter i det här rummet från den här enheten",
     "New address (e.g. #foo:%(localDomain)s)": "Ny address (t.ex. #foo:%(localDomain)s)",
     "New passwords don't match": "De nya lösenorden matchar inte",
     "New passwords must match each other.": "De nya lösenorden måste vara de samma.",
@@ -197,7 +181,6 @@
     "(not supported by this browser)": "(stöds inte av webbläsaren)",
     "<not supported>": "<stöds inte>",
     "NOT verified": "INTE verifierad",
-    "No devices with registered encryption keys": "Inga enheter med registrerade krypteringsnycklar",
     "No display name": "Inget visningsnamn",
     "No more results": "Inga fler resultat",
     "No results": "Inga resultat",
@@ -208,7 +191,6 @@
     "Operation failed": "Handlingen misslyckades",
     "Password": "Lösenord",
     "Passwords can't be empty": "Lösenorden kan inte vara tomma",
-    "People": "Personer",
     "Permissions": "Behörigheter",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Öppna meddelandet i din epost och klicka på länken i meddelandet. När du har gjort detta, klicka vidare.",
@@ -234,7 +216,6 @@
     "riot-web version:": "riot-web -version:",
     "Room %(roomId)s not visible": "Rummet %(roomId)s är inte synligt",
     "Room Colour": "Rumsfärg",
-    "Room contains unknown devices": "Det finns okända enheter i rummet",
     "%(roomName)s does not exist.": "%(roomName)s finns inte.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s är inte tillgängligt för tillfället.",
     "Rooms": "Rum",
@@ -245,8 +226,6 @@
     "Searches DuckDuckGo for results": "Söker efter resultat på DuckDuckGo",
     "Seen by %(userName)s at %(dateTime)s": "Sedd av %(userName)s %(dateTime)s",
     "Send anyway": "Skicka ändå",
-    "Sender device information": "Sändarens enhetsinformation",
-    "Send Invites": "Skicka inbjudningar",
     "Send Reset Email": "Skicka återställningsmeddelande",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
@@ -258,7 +237,6 @@
     "%(senderName)s set a profile picture.": "%(senderName)s satte en profilbild.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s bytte sitt visningnamn till %(displayName)s.",
     "Settings": "Inställningar",
-    "Show Text Formatting Toolbar": "Visa textformatteringsverktygsfält",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Visa tidsstämplar i 12-timmarsformat (t.ex. 2:30pm)",
     "Signed Out": "Loggade ut",
     "Sign in": "Logga in",
@@ -267,7 +245,6 @@
     "Someone": "Någon",
     "Start a chat": "Starta en chatt",
     "Start authentication": "Starta autentisering",
-    "Start Chat": "Starta en chatt",
     "Cancel": "Avbryt",
     "Create new room": "Skapa nytt rum",
     "Custom Server Options": "Anpassade serverinställningar",
@@ -289,7 +266,6 @@
     "Submit": "Lämna in",
     "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
     "The phone number entered looks invalid": "Det angivna telefonnumret är ogiltigt",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
     "This email address is already in use": "Den här epostadressen används redan",
     "This email address was not found": "Den här epostadressen finns inte",
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
@@ -386,7 +362,6 @@
     "Files": "Filer",
     "Collecting app version information": "Samlar in appversionsinformation",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Radera rumsadressen %(alias)s och ta bort %(name)s från katalogen?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Detta kommer tillåta dig att återgå till ditt konto efter att ha loggat ut, och logga in på andra enheter.",
     "Keywords": "Nyckelord",
     "Enable notifications for this account": "Aktivera aviseringar för det här kontot",
     "Messages containing <span>keywords</span>": "Meddelanden som innehåller <span>nyckelord</span>",
@@ -474,7 +449,6 @@
     "You cannot place VoIP calls in this browser.": "Du kan inte ringa VoIP-samtal i den här webbläsaren.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din epostadress verkar inte vara kopplad till något Matrix-ID på den här hemservern.",
     "Restricted": "Begränsad",
-    "Who would you like to communicate with?": "Vem vill du kommunicera med?",
     "Failed to invite the following users to the %(roomName)s room:": "Det gick inte att bjuda in följande användare till %(roomName)s-rummet:",
     "Unable to create widget.": "Det går inte att skapa widget.",
     "Ignored user": "Ignorerad användare",
@@ -504,9 +478,6 @@
     "Send an encrypted message…": "Skicka ett krypterat meddelande…",
     "Send a message (unencrypted)…": "Skicka ett meddelande (okrypterat)…",
     "You do not have permission to post to this room": "Du har inte behörighet att posta till detta rum",
-    "Unable to reply": "Det gick inte att svara",
-    "bold": "fet",
-    "italic": "kursiv",
     "Loading...": "Laddar...",
     "%(duration)ss": "%(duration)s",
     "%(duration)sm": "%(duration)sm",
@@ -582,13 +553,9 @@
     "Start automatically after system login": "Starta automatiskt vid systeminloggning",
     "This will allow you to reset your password and receive notifications.": "Det här låter dig återställa lösenordet och ta emot aviseringar.",
     "You have no visible notifications": "Du har inga synliga aviseringar",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ditt lösenord har ändrats. Du kommer inte att få push-aviseringar på andra enheter förrän du har loggat in på dem igen",
     "Failed to upload image": "Det gick inte att ladda upp bild",
     "New Password": "Nytt lösenord",
     "Do you want to set an email address?": "Vill du ange en epostadress?",
-    "Unable to load device list": "Det gick inte att ladda enhetslista",
-    "Delete %(count)s devices|other": "Ta bort %(count)s enheter",
-    "Delete %(count)s devices|one": "Ta bort enhet",
     "Use compact timeline layout": "Använd kompakt tidslinjelayout",
     "Not a valid Riot keyfile": "Inte en giltig Riot-nyckelfil",
     "Authentication check failed: incorrect password?": "Autentiseringskontroll misslyckades: felaktigt lösenord?",
@@ -604,7 +571,6 @@
     "You seem to be uploading files, are you sure you want to quit?": "Du verkar ladda upp filer, är du säker på att du vill avsluta?",
     "You seem to be in a call, are you sure you want to quit?": "Du verkar vara i ett samtal, är du säker på att du vill avsluta?",
     "Active call": "Aktivt samtal",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Visa enheter</showDevicesText>, <sendAnywayText>skicka ändå</sendAnywayText> eller <cancelText>avbryt</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Ditt meddelande skickades inte.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Skicka om alla</resendText> eller <cancelText>ångra alla</cancelText> nu. Du kan även välja enskilda meddelanden för att skicka om eller ångra.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Skicka om meddelande</resendText> eller <cancelText>ångra meddelande</cancelText> nu.",
@@ -627,8 +593,6 @@
     "Removed or unknown message type": "Borttagen eller okänd meddelandetyp",
     "Message removed by %(userId)s": "Meddelande borttaget av %(userId)s",
     "Message removed": "Meddelande borttaget",
-    "Unknown devices": "Okända enheter",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" innehåller enheter som du inte har sett tidigare.",
     "Delete Widget": "Ta bort widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widget tas bort för alla användare i rummet. Är du säker på att du vill ta bort den?",
     "Minimize apps": "Minimera appar",
@@ -661,7 +625,6 @@
     "%(senderName)s sent a video": "%(senderName)s skickade en video",
     "%(senderName)s uploaded a file": "%(senderName)s laddade upp en fil",
     "Options": "Alternativ",
-    "Unencrypted message": "Okrypterat meddelande",
     "Replying": "Svarar",
     "Kick this user?": "Kicka användaren?",
     "This room": "Detta rum",
@@ -681,12 +644,7 @@
     "Create": "Skapa",
     "Unknown error": "Okänt fel",
     "Incorrect password": "Felaktigt lösenord",
-    "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:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:",
-    "Device name": "Enhetsnamn",
-    "Device key": "Enhetsnyckel",
-    "Verify device": "Verifiera enhet",
     "I verify that the keys match": "Jag verifierar att nycklarna matchar",
-    "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.": "Om det matchar, tryck på verifieringsknappen nedan. Om inte så är det risk att någon annan försöker avlyssna enheten och då vill du förmodligen trycka på svartlistsknappen istället.",
     "State Key": "Lägesnyckel",
     "Send Account Data": "Skicka kontodata",
     "Explore Account Data": "Utforska kontodata",
@@ -694,12 +652,9 @@
     "Developer Tools": "Utvecklarverktyg",
     "Unverify": "Ta bort verifiering",
     "Verify...": "Verifiera...",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Du har lagt till en ny enhet '%(displayName)s', som begär krypteringsnycklar.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Din overifierade enhet '%(displayName)s' begär krypteringsnycklar.",
     "Start verification": "Starta verifiering",
     "Share without verifying": "Dela utan att verifiera",
     "Ignore request": "Ignorera begäran",
-    "Loading device info...": "Laddar enhetsinfo...",
     "Encryption key request": "Begäran av krypteringsnyckel",
     "Clear Storage and Sign Out": "Rensa lagring och logga ut",
     "Send Logs": "Skicka loggar",
@@ -708,25 +663,18 @@
     "We encountered an error trying to restore your previous session.": "Ett fel uppstod vid återställning av din tidigare 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.": "Om du nyligen har använt en senare version av Riot kan din session vara inkompatibel med den här versionen. Stäng det här fönstret och använd senare versionen istället.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Att rensa webbläsarens lagring kan lösa problemet, men då loggas du ut och krypterad chatthistorik blir oläslig.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "För tillfället svartlistar du overifierade enheter. För att skicka meddelanden till dessa enheter måste du verifiera dem.",
-    "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.": "Vi rekommenderar att du går igenom verifieringsprocessen för varje enhet för att bekräfta att de tillhör sina rätta ägare, men du kan skicka meddelandet utan att verifiera om du föredrar det.",
     "Collapse Reply Thread": "Dölj svarstråd",
     "Terms and Conditions": "Villkor",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "För att fortsätta använda hemservern %(homeserverDomain)s måste du granska och godkänna våra villkor.",
     "Review terms and conditions": "Granska villkoren",
     "Old cryptography data detected": "Gammal krypteringsdata upptäckt",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finns okända enheter i rummet: om du fortsätter utan att verifiera dem, är det möjligt att någon kan avlyssna ditt samtal.",
     "Unable to capture screen": "Det gick inte att ta skärmdump",
     "Failed to add the following rooms to %(groupId)s:": "Det gick inte att lägga till följande rum till %(groupId)s:",
     "Missing roomId.": "Rums-ID saknas.",
     "This room is not recognised.": "Detta rum känns inte igen.",
     "Usage": "Användning",
     "Unrecognised room alias:": "Oigenkänt rumsalias:",
-    "Unknown (user, device) pair:": "Okänt (användare, enhet) par:",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "VARNING: Enhet redan verifierad, men nycklarna MATCHAR INTE!",
     "Verified key": "Verifierad nyckel",
-    "Unrecognised command:": "Oigenkänt kommando:",
-    "Verifies a user, device, and pubkey tuple": "Verifierar en användare, enhet och offentlig nyckel-tupel",
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)s).",
@@ -745,7 +693,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie (se vår <PolicyLink>Cookiepolicy</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie.",
     "Yes, I want to help!": "Ja, jag vill hjälpa till!",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s aktiverade totalsträckskryptering (algoritm %(algorithm)s).",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
@@ -863,9 +810,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.",
     "User Options": "Användaralternativ",
     "unknown caller": "okänd uppringare",
-    "At this time it is not possible to reply with an emote.": "Det är för närvarande inte möjligt att svara med en emoji.",
     "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.",
-    "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!": "VARNING: NYCKELVERIFIERINGEN MISSLYCKADES! Signeringsnyckeln för %(userId)s och enhet %(deviceId)s är \"%(fprint)s\" som inte matchar den angivna nyckeln \"%(fingerprint)s\". Detta kan betyda att dina kommunikationer avlyssnas!",
     "Enable inline URL previews by default": "Aktivera URL-förhandsvisning som standard",
     "Enable URL previews for this room (only affects you)": "Aktivera URL-förhandsvisning för detta rum (påverkar bara dig)",
     "Enable URL previews by default for participants in this room": "Aktivera URL-förhandsvisning som standard för deltagare i detta rum",
@@ -888,12 +833,7 @@
     "Unable to accept invite": "Det gick inte att acceptera inbjudan",
     "Leave %(groupName)s?": "Lämna %(groupName)s?",
     "Enable widget screenshots on supported widgets": "Aktivera widget-skärmdumpar för widgets som stöder det",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Din nyckeldelningsbegäran har skickats - kolla efter nyckeldelningsbegäran på dina andra enheter.",
-    "Undecryptable": "Odekrypterbar",
-    "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.": "Nyckeldelningsbegäran skickas automatiskt till dina andra enheter. Om du avvisat nyckelbegäran på dina andra enheter, klicka här för att begära nycklarna till den här sessionen igen.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Om dina andra enheter inte har nyckeln till detta meddelande kommer du du att kunna dekryptera det.",
     "Key request sent.": "Nyckelbegäran skickad.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Begär krypteringsnycklar igen</requestLink> från dina andra enheter.",
     "Unban": "Avbanna",
     "Unban this user?": "Avbanna användaren?",
     "Unmute": "Ta bort dämpning",
@@ -957,12 +897,6 @@
     "Permission Required": "Behörighet krävs",
     "You do not have permission to start a conference call in this room": "Du har inte behörighet att starta ett konferenssamtal i detta rum",
     "This event could not be displayed": "Den här händelsen kunde inte visas",
-    "deleted": "borttagen",
-    "underlined": "understruken",
-    "inline-code": "kod",
-    "block-quote": "citat",
-    "bulleted-list": "punktlista",
-    "numbered-list": "nummerlista",
     "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.": "I krypterade rum, som detta, är URL-förhandsvisning inaktiverad som standard för att säkerställa att din hemserver (där förhandsvisningar genereras) inte kan samla information om länkar du ser i rummet.",
     "The email field must not be blank.": "Epost-fältet får inte vara tomt.",
     "The phone number field must not be blank.": "Telefonnummer-fältet får inte vara tomt.",
@@ -1131,7 +1065,6 @@
     "Pencil": "Penna",
     "Paperclip": "Gem",
     "Scissors": "Sax",
-    "Padlock": "Hänglås",
     "Key": "Nyckel",
     "Hammer": "Hammare",
     "Telephone": "Telefon",
@@ -1156,7 +1089,6 @@
     "Verification code": "Verifieringskod",
     "Phone Number": "Telefonnummer",
     "Profile picture": "Profilbild",
-    "Upload profile picture": "Ladda upp profilbild",
     "Display Name": "Visningsnamn",
     "Set a new account password...": "Ange ett nytt lösenord för kontot...",
     "Email addresses": "Epostadresser",
@@ -1261,16 +1193,10 @@
     "Encryption": "Kryptering",
     "Once enabled, encryption cannot be disabled.": "Efter aktivering kan kryptering inte inaktiveras igen.",
     "Encrypted": "Krypterat",
-    "Some devices for this user are not trusted": "Vissa enheter för den här användaren är inte betrodda",
-    "Some devices in this encrypted room are not trusted": "Vissa enheter i det här krypterade rummet är inte betrodda",
-    "All devices for this user are trusted": "Alla enheter för den här användaren är betrodda",
-    "All devices in this encrypted room are trusted": "Alla enheter i det här krypterade rummet är betrodda",
     "Not now": "Inte nu",
     "Don't ask me again": "Fråga mig inte igen",
     "Error updating main address": "Fel vid uppdatering av huvudadress",
     "Room avatar": "Rumsavatar",
-    "Upload room avatar": "Ladda upp rumsavatar",
-    "No room avatar": "Ingen rumsavatar",
     "Room Name": "Rumsnamn",
     "Room Topic": "Rumsämne",
     "The following users may not exist": "Följande användare kanske inte existerar",
@@ -1289,8 +1215,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifiera den här användaren genom att bekräfta följande emoji visas på deras skärm.",
     "Verify this user by confirming the following number appears on their screen.": "Verifiera den här användaren genom att bekräfta att följande nummer visas på deras skärm.",
     "Unable to find a supported verification method.": "Det går inte att hitta en verifieringsmetod som stöds.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "För maximal säkerhet rekommenderar vi att du gör det personligen eller använder ett annat betrott kommunikationsmedel.",
-    "Your homeserver does not support device management.": "Din hemserver stöder inte enhetshantering.",
     "Delete Backup": "Ta bort säkerhetskopia",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Är du säker? Du kommer att förlora dina krypterade meddelanden om dina nycklar inte säkerhetskopieras ordentligt.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krypterade meddelanden är säkrade med totalsträckskryptering. Bara du och mottagaren/na har nycklarna för att läsa dessa meddelanden.",
@@ -1323,15 +1247,10 @@
     "Unable to load backup status": "Det går inte att ladda backupstatus",
     "Guest": "Gäst",
     "Could not load user profile": "Kunde inte ladda användarprofil",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Om du ändrar ditt lösenord återställs eventuella krypteringsnycklar på alla dina enheter, vilket gör att krypterad chatthistorik inte kan läsas. Aktivera nyckelsäkerhetskopiering eller exportera dina rumsnycklar från en annan enhet innan du återställer ditt lösenord.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Om du använder 'breadcrumbs' eller inte (avatarer ovanför rumslistan)",
     "Replying With Files": "Svarar med filer",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Just nu är det inte möjligt att svara med en fil. Vill du ladda upp filen utan att svara?",
     "The file '%(fileName)s' failed to upload.": "Filen '%(fileName)s' kunde inte laddas upp.",
-    "Room upgrade confirmation": "Bekräfta rumsuppgradering",
-    "Upgrading a room can be destructive and isn't always necessary.": "Uppgradering av ett rum kan vara destruktivt och är inte alltid nödvändigt.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Rumsuppgraderingar rekommenderas vanligtvis när en rumversion anses vara <i>instabil</i>. Instabila rumsversioner kan ha fel, sakna funktioner eller ha säkerhetsproblem.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Rumuppgraderingar påverkar vanligtvis bara bearbetningen av rummet på <i>serversidan</i>. Om du har problem med din Riot-klient, vänligen anmäl ett ärende på <issueLink />.",
     "Composer": "Meddelandefält",
     "Key backup": "Nyckelsäkerhetskopiering",
     "Never lose encrypted messages": "Förlora aldrig krypterade meddelanden",
@@ -1377,13 +1296,11 @@
     "Cancel All": "Avbryt alla",
     "Upload Error": "Uppladdningsfel",
     "Name or Matrix ID": "Namn eller Martix-ID",
-    "Email, name or Matrix ID": "Email, namn, eller Matrix-ID",
     "Your Riot is misconfigured": "Riot är felkonfigurerat",
     "Call failed due to misconfigured server": "Anrop misslyckades på grund av felkonfigurerad server",
     "Try using turn.matrix.org": "Prova att använda turn.matrix.org",
     "A conference call could not be started because the integrations server is not available": "Ett konferenssamtal kunde inte startas eftersom integrationsservern inte är tillgänglig",
     "The server does not support the room version specified.": "Servern stöder inte den angivna rumsversionen.",
-    "Failed to start chat": "Det gick inte att starta chatten",
     "Messages": "Meddelanden",
     "Actions": "Åtgärder",
     "Sends a message as plain text, without interpreting it as markdown": "Skickar ett meddelande som vanlig text, utan att tolka det som markdown",
@@ -1440,7 +1357,6 @@
     "Discovery": "Upptäckt",
     "Deactivate account": "Inaktivera konto",
     "Always show the window menu bar": "Visa alltid fönstermenyn",
-    "A device's public name is visible to people you communicate with": "En enhets offentliga namn är synligt för personer du kommunicerar med",
     "this room": "detta rum",
     "View older messages in %(roomName)s.": "Visa äldre meddelanden i %(roomName)s.",
     "Uploaded sound": "Uppladdat ljud",
@@ -1478,8 +1394,6 @@
     "Sign Up": "Registrera dig",
     "Sign In": "Logga in",
     "Prompt before sending invites to potentially invalid matrix IDs": "Fråga innan inbjudningar skickas till potentiellt ogiltiga matrix-IDn",
-    "Enable desktop notifications for this device": "Aktivera skrivbordsaviseringar för denna enhet",
-    "Enable audible notifications for this device": "Aktivera ljudaviseringar för denna enhet",
     "Show all": "Visa alla",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagerade med %(shortName)s</reactedWith>",
     "Edited at %(date)s. Click to view edits.": "Ändrad %(date)s. Klicka för att visa ändringar.",
@@ -1495,7 +1409,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Be administratören för din hemserver (<code>%(homeserverDomain)s</code>) att konfigurera en TURN-server för att samtal ska fungera pålitligt.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativt kan du testa att använda den offentliga servern <code>turn.matrix.org</code>, men det är inte lika pålitligt och det kommer att dela din IP-adress med den servern. Du kan också hantera detta under Inställningar.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varning</b>: Uppgradering av ett rum <i>flyttar inte automatiskt rumsmedlemmar till den nya versionen av rummet.</i> Vi lägger ut en länk till det nya rummet i den gamla versionen av rummet - rumsmedlemmar måste klicka på den här länken för att gå med i det nya rummet.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bekräfta att du vill gå vidare med att uppgradera detta rum från <oldVersion /> till <newVersion />.",
     "Changes the avatar of the current room": "Ändrar avataren i det aktuella rummet",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Använd en identitetsserver för att bjuda in via epost. Klicka på Fortsätt för att använda standardidentitetsservern (%(defaultIdentityServerName)s) eller hantera det i Inställningar.",
     "Use an identity server to invite by email. Manage in Settings.": "Använd en identitetsserver för att bjuda in via epost. Hantera det i inställningar.",
@@ -1504,13 +1417,8 @@
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Tillåt samtalsserver turn.matrix.org som reserv när din hemserver inte erbjuder en (din IP-adress delades under ett samtal)",
     "Unable to load key backup status": "Det går inte att ladda status för nyckelsäkerhetskopiering",
     "Restore from Backup": "Återställ från säkerhetskopiering",
-    "This device is backing up your keys. ": "Den här enheten säkerhetskopierar dina nycklar. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Den här enheten <b>säkerhetskopierar inte dina nycklar</b>, men du har en befintlig säkerhetskopia som du kan återställa från och lägga till i framöver.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Anslut denna enhet till säkerhetskopiering innan du loggar ut för att undvika att förlora några nycklar som kanske bara finns på den här enheten.",
-    "Connect this device to Key Backup": "Anslut den här enheten till nyckelsäkerhetskopiering",
     "Backing up %(sessionsRemaining)s keys...": "Säkerhetskopierar %(sessionsRemaining)s nycklar...",
     "All keys backed up": "Alla nycklar säkerhetskopierade",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Säkerhetskopian har en signatur från <verify>okänd</verify> enhet med ID %(deviceId)s.",
     "Add Email Address": "Lägg till e-postadress",
     "Add Phone Number": "Lägg till telefonnummer",
     "Identity server has no terms of service": "Identitetsserver har inga användarvillkor",
@@ -1518,7 +1426,6 @@
     "Trust": "Förtroende",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Testa nya sätt att ignorera personer (experimentalt)",
-    "Use the new, faster, composer for writing messages": "Använd den nya, snabbare kompositören för att skriva meddelanden",
     "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder",
     "Send cross-signing keys to homeserver": "Skicka korssigneringsnycklar till hemserver",
     "Custom (%(level)s)": "Anpassad (%(level)s)",
@@ -1533,7 +1440,6 @@
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s tog bort regeln som bannar servrar som matchar %(glob)s",
     "Match system theme": "Matcha systemtema",
     "Decline (%(counter)s)": "Avvisa (%(counter)s)",
-    "on device": "på enhet",
     "not found": "hittades inte",
     "Connecting to integration manager...": "Ansluter till integrationshanterare...",
     "Cannot connect to integration manager": "Det går inte att ansluta till integrationshanterare",
@@ -1623,9 +1529,7 @@
     "Suggestions": "Förslag",
     "Show more": "Visa mer",
     "Direct Messages": "Direktmeddelanden",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "Om det är någon du inte kan hitta, be dem om sitt användarnamn eller dela ditt användarnamn (%(userId)s) eller <a>profillänk</a>.",
     "Go": "Gå",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifiering av den här användaren kommer att markera deras enhet som betrodd, men även markera din enhet som den är betrodd för dem.",
     "Waiting for partner to confirm...": "Väntar på att kompanjon ska bekräfta...",
     "Incoming Verification Request": "Inkommande verifieringsbegäran",
     "Integrations are disabled": "Integrationer är inaktiverade",
@@ -1636,8 +1540,6 @@
     "Message edits": "Meddelandedigeringar",
     "Preview": "Förhandsvisa",
     "The message you are trying to send is too large.": "Meddelandet du försöker skicka är för stort.",
-    "New DM invite dialog (under development)": "Ny inbjudningsdialog för direktmeddelanden (under utveckling)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Aktivera korssignering för att verifiera per användare istället för per enhet (under utveckling)",
     "Find others by phone or email": "Hitta andra via telefon eller epost",
     "Be found by phone or email": "Bli hittad via telefon eller e-post",
     "Terms of Service": "Användarvillkor",
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index a1c9cca93c..9bc5ccbfaf 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -151,7 +151,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Riot.im ஐ சிறப்பாகச் செய்ய எங்களுக்கு அனுப்பப்படும் தகவல்களில் பின்வருவன அடங்கும்:",
     "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": "அழைப்பு தோல்வியுற்றது",
-    "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": "சாதனங்களை மதிப்பாய்வு செய்யவும்",
     "Call Anyway": "எப்படியும் அழைக்கவும்",
     "Answer Anyway": "எப்படியும் பதில் சொல்லுங்கள்",
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index dfd5a5b1f4..c5afde7e24 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -47,7 +47,6 @@
     "You cannot place VoIP calls in this browser.": "మీరు ఈ బ్రౌజర్లో కాల్లను చేయలేరు.",
     "You have no visible notifications": "మీకు కనిపించే నోటిఫికేషన్లు లేవు",
     "You need to be able to invite users to do that.": "మీరు దీన్ని చేయడానికి వినియోగదారులను ఆహ్వానించగలరు.",
-    "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.": "పాస్ వర్డ్ మార్చడం వల్ల ప్రస్తుతం అన్ని పరికరాల్లో ఏదైనా ఎండ్-టు-ఎండ్ ఎన్క్రిప్షన్ కీలను రీసెట్ చేస్తుంది, ఎన్క్రిప్టెడ్ చాట్ చరిత్రను చదవటానికి వీలెకుండ చెస్తుంది, మీరు మొదట మీ గది కీలను ఎగుమతి చేసి, తర్వాత వాటిని తిరిగి దిగుమతి చేసుకోకపోతే. భవిష్యత్తులో ఇది మెరుగవుతుంది.",
     "Claimed Ed25519 fingerprint key": "ఎడ్25519 వేలిముద్ర కీ ని పేర్కొన్నారు",
     "Click here to fix": "పరిష్కరించడానికి ఇక్కడ క్లిక్ చేయండి",
     "Click to mute audio": "ఆడియోను మ్యూట్ చేయడానికి క్లిక్ చేయండి",
@@ -73,8 +72,6 @@
     "Decryption error": "గుప్తలేఖన లోపం",
     "Deops user with given id": "ఇచ్చిన ID తో వినియోగదారుని విడదీస్తుంది",
     "Default": "డిఫాల్ట్",
-    "Device already verified!": "పరికరం ఇప్పటికే ధృవీకరించబడింది!",
-    "Devices": "పరికరాలు",
     "Sun": "ఆదివారం",
     "Mon": "సోమవారం",
     "Tue": "మంగళవారం",
@@ -84,8 +81,6 @@
     "Sat": "శనివారం",
     "Jan": "జనవరి",
     "Feb": "ఫిబ్రవరి",
-    "Markdown is disabled": "మార్క్డౌన్ నిలిపివేయబడింది",
-    "Markdown is enabled": "మార్క్డౌన్ ప్రారంభించబడింది",
     "Mar": "మార్చి",
     "Apr": "ఏప్రిల్",
     "Server may be unavailable, overloaded, or search timed out :(": "సర్వర్ అందుబాటులో లేకపోవచ్చు, ఓవర్లోడ్ లేదా శోధన సమయం ముగిసి ఉండవచ్చు :(",
@@ -111,8 +106,6 @@
     "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.",
     "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.",
     "Cancel": "రద్దు",
-    "bold": "బోల్డ్",
-    "italic": "ఇటాలిక్",
     "Failed to forget room %(errCode)s": "గది మర్చిపోవడం విఫలమైంది %(errCode)s",
     "Incorrect verification code": "ధృవీకరణ కోడ్ సరిగా లెదు",
     "unknown error code": "తెలియని కోడ్ లోపం",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 7cc6214592..333beca311 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -13,15 +13,12 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
     "Decrypt %(text)s": "ถอดรหัส %(text)s",
     "Device ID": "ID อุปกรณ์",
-    "Device ID:": "ID อุปกรณ์:",
     "device id: ": "id อุปกรณ์: ",
-    "Devices": "อุปกรณ์",
     "Download %(text)s": "ดาวน์โหลด %(text)s",
     "Emoji": "อีโมจิ",
     "Error": "ข้อผิดพลาด",
     "Kick": "เตะ",
     "Low priority": "ความสำคัญต่ำ",
-    "matrix-react-sdk version:": "เวอร์ชัน matrix-react-sdk:",
     "Name": "ชื่อ",
     "OK": "ตกลง",
     "Password": "รหัสผ่าน",
@@ -88,8 +85,6 @@
     "/ddg is not a command": "/ddg ไม่ใช่คำสั่ง",
     "Deactivate Account": "ปิดการใช้งานบัญชี",
     "Decryption error": "การถอดรหัสผิดพลาด",
-    "Device already verified!": "ยืนยันอุปกรณ์แล้ว!",
-    "Device key:": "Key อุปกรณ์:",
     "Direct chats": "แชทตรง",
     "Disinvite": "ถอนคำเชิญ",
     "Ed25519 fingerprint": "ลายนิ้วมือ Ed25519",
@@ -124,15 +119,12 @@
     "Import": "นำเข้า",
     "Incorrect username and/or password.": "ชื่อผู้ใช้และ/หรือรหัสผ่านไม่ถูกต้อง",
     "Incorrect verification code": "รหัสยืนยันไม่ถูกต้อง",
-    "Invalid alias format": "รูปแบบนามแฝงไม่ถูกต้อง",
     "Invalid Email Address": "ที่อยู่อีเมลไม่ถูกต้อง",
     "Invalid file%(extra)s": "ไฟล์ %(extra)s ไม่ถูกต้อง",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s เชิญ %(targetName)s แล้ว",
-    "Invite new room members": "เชิญสมาชิกใหม่",
     "Invited": "เชิญแล้ว",
     "Invites": "คำเชิญ",
     "Invites user with given id to current room": "เชิญผู้ใช้ พร้อม id ของห้องปัจจุบัน",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ไม่ใช่รูปแบบที่ถูกต้องสำหรับนามแฝง",
     "Sign in with": "เข้าสู่ระบบด้วย",
     "Join Room": "เข้าร่วมห้อง",
     "%(targetName)s joined the room.": "%(targetName)s เข้าร่วมห้องแล้ว",
@@ -142,8 +134,6 @@
     "Leave room": "ออกจากห้อง",
     "%(targetName)s left the room.": "%(targetName)s ออกจากห้องแล้ว",
     "Logout": "ออกจากระบบ",
-    "Markdown is disabled": "ปิดใช้งาน Markdown แล้ว",
-    "Markdown is enabled": "เปิดใช้งาน Markdown แล้ว",
     "Missing user_id in request": "ไม่พบ user_id ในคำขอ",
     "Moderator": "ผู้ช่วยดูแล",
     "New address (e.g. #foo:%(localDomain)s)": "ที่อยู่ใหม่ (เช่น #foo:%(localDomain)s)",
@@ -157,7 +147,6 @@
     "No more results": "ไม่มีผลลัพธ์อื่น",
     "No results": "ไม่มีผลลัพธ์",
     "Passwords can't be empty": "รหัสผ่านต้องไม่ว่าง",
-    "People": "บุคคล",
     "Permissions": "สิทธิ์",
     "Phone": "โทรศัพท์",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "กรุณาเช็คอีเมลและคลิกลิงก์ข้างใน หลังจากนั้น คลิกดำเนินการต่อ",
@@ -176,7 +165,6 @@
     "Scroll to bottom of page": "เลื่อนลงไปล่างสุด",
     "Search failed": "การค้นหาล้มเหลว",
     "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
-    "Send Invites": "ส่งคำเชิญ",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
     "Server error": "เซิร์ฟเวอร์ผิดพลาด",
@@ -192,7 +180,6 @@
     "Always show message timestamps": "แสดงเวลาในแชทเสมอ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "แสดงเวลาในแชทในรูปแบบ 12 ชั่วโมง (เช่น 2:30pm)",
     "Start a chat": "เริ่มแชท",
-    "Start Chat": "เริ่มแชท",
     "Submit": "ส่ง",
     "Success": "สำเร็จ",
     "This email address is already in use": "ที่อยู่อีเมลถูกใช้แล้ว",
@@ -209,19 +196,15 @@
     "Import E2E room keys": "นำเข้ากุญแจถอดรหัส E2E",
     "The phone number entered looks invalid": "ดูเหมือนว่าหมายเลขโทรศัพท์ที่กรอกรมาไม่ถูกต้อง",
     "The email address linked to your account must be entered.": "กรุณากรอกที่อยู่อีเมลที่เชื่อมกับบัญชีของคุณ",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
     "Unable to add email address": "ไมาสามารถเพิ่มที่อยู่อีเมล",
     "Unable to verify email address.": "ไม่สามารถยืนยันที่อยู่อีเมล",
     "Unban": "ปลดแบน",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ปลดแบน %(targetName)s แล้ว",
     "Unable to capture screen": "ไม่สามารถจับภาพหน้าจอ",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
-    "Unable to load device list": "ไม่สามารถโหลดรายชื่ออุปกรณ์",
     "unencrypted": "ยังไม่ได้เข้ารหัส",
     "unknown device": "อุปกรณ์ที่ไม่รู้จัก",
     "Unknown room %(roomId)s": "ห้องที่ไม่รู้จัก %(roomId)s",
-    "Unknown (user, device) pair:": "คู่ (ผู้ใช้, อุปกรณ์) ที่ไม่รู้จัก:",
-    "Unrecognised command:": "คำสั่งที่ไม่รู้จัก:",
     "Unrecognised room alias:": "นามแฝงห้องที่ไม่รู้จัก:",
     "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
@@ -233,12 +216,10 @@
     "Warning!": "คำเตือน!",
     "Who can access this room?": "ใครสามารถเข้าถึงห้องนี้ได้?",
     "Who can read history?": "ใครสามารถอ่านประวัติแชทได้?",
-    "Who would you like to communicate with?": "คุณต้องการคุยกับใคร?",
     "You have <a>disabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>ปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
     "You have <a>enabled</a> URL previews by default.": "ค่าเริ่มต้นของคุณ<a>เปิดใช้งาน</a>ตัวอย่าง URL เอาไว้",
     "You must <a>register</a> to use this functionality": "คุณต้อง<a>ลงทะเบียน</a>เพื่อใช้ฟังก์ชันนี้",
     "You need to be logged in.": "คุณต้องเข้าสู่ระบบก่อน",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "การเปลี่ยนรหัสผ่านเสร็จสมบูณณ์ คุณจะไม่ได้รับการแจ้งเตือนบนอุปกรณ์อื่น ๆ จนกว่าคุณจะกลับเข้าสู่ระบบในอุปกรณ์เหล่านั้น",
     "Sun": "อา.",
     "Mon": "จ.",
     "Tue": "อ.",
@@ -264,8 +245,6 @@
     "Set a display name:": "ตั้งชื่อที่แสดง:",
     "Make Moderator": "เลื่อนขั้นเป็นผู้ช่วยดูแล",
     "Room": "ห้อง",
-    "bold": "หนา",
-    "italic": "เอียง",
     "New Password": "รหัสผ่านใหม่",
     "Options": "ตัวเลือก",
     "Export room keys": "ส่งออกกุณแจห้อง",
@@ -277,9 +256,6 @@
     "Confirm Removal": "ยืนยันการลบ",
     "Unknown error": "ข้อผิดพลาดที่ไม่รู้จัก",
     "Incorrect password": "รหัสผ่านไม่ถูกต้อง",
-    "Device name": "ชื่ออุปกรณ์",
-    "Device key": "Key อุปกรณ์",
-    "Unknown devices": "อุปกรณ์ที่ไม่รู้จัก",
     "Unknown Address": "ที่อยู่ที่ไม่รู้จัก",
     "Unblacklist": "ถอดบัญชีดำ",
     "Blacklist": "ขึ้นบัญชีดำ",
@@ -311,8 +287,6 @@
     "%(roomName)s does not exist.": "ไม่มีห้อง %(roomName)s อยู่จริง",
     "Enter passphrase": "กรอกรหัสผ่าน",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s เห็นแล้วเมื่อเวลา %(dateTime)s",
-    "Undecryptable": "ไม่สามารถถอดรหัสได้",
-    "Unencrypted message": "ข้อความไม่ได้เข้ารหัส",
     "unknown caller": "ไม่ทราบผู้โทร",
     "Upload new:": "อัปโหลดใหม่:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ระดับอำนาจ %(powerLevelNumber)s)",
@@ -377,7 +351,6 @@
     "Noisy": "เสียงดัง",
     "Collecting app version information": "กำลังรวบรวมข้อมูลเวอร์ชันแอป",
     "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.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ",
     "Enable notifications for this account": "เปิดใช้งานการแจ้งเตือนสำหรับบัญชีนี้",
     "Messages containing <span>keywords</span>": "ข้อความที่มี<span>คีย์เวิร์ด</span>",
     "View Source": "ดูซอร์ส",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 222d2802da..1e4650fc32 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -50,7 +50,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s oda adını kaldırdı.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s konuyu \"%(topic)s\" olarak değiştirdi.",
     "Changes your display nickname": "Görünen takma adınızı değiştirir",
-    "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.": "Şifre değiştirme eğer oda anahtarlarınızı dışa aktarmaz ve daha sonra tekrar içe aktarmazsanız , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayacak ve geçmişi okunamaz hale getirecek . Gelecekte bu geliştirilecek.",
     "Claimed Ed25519 fingerprint key": "Ed25519 parmak izi anahtarı istendi",
     "Click here to fix": "Düzeltmek için buraya tıklayın",
     "Click to mute audio": "Sesi kapatmak için  tıklayın",
@@ -77,12 +76,8 @@
     "Decryption error": "Şifre çözme hatası",
     "Deops user with given id": "ID'leriyle birlikte , düşürülmüş kullanıcılar",
     "Default": "Varsayılan",
-    "Device already verified!": "Cihaz zaten doğrulandı!",
     "Device ID": "Cihaz ID",
-    "Device ID:": "Cihaz ID:",
     "device id: ": "cihaz id: ",
-    "Device key:": "Cihaz anahtarı:",
-    "Devices": "Cihazlar",
     "Direct chats": "Doğrudan Sohbetler",
     "Disable Notifications": "Bildirimleri Devre Dışı Bırak",
     "Disinvite": "Daveti İptal Et",
@@ -94,7 +89,6 @@
     "Email address": "E-posta Adresi",
     "Emoji": "Emoji (Karakter)",
     "Enable Notifications": "Bildirimleri Etkinleştir",
-    "Encrypted by an unverified device": "Doğrulanmamış bir cihaz tarafından şifrelendi",
     "%(senderName)s ended the call.": "%(senderName)s çağrıyı bitirdi.",
     "End-to-end encryption information": "Uçtan-uca şifreleme bilgileri",
     "Enter passphrase": "Şifre deyimi Girin",
@@ -134,7 +128,6 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s %(fromPowerLevel)s den %(toPowerLevel)s ' ye",
     "Guests cannot join this room even if explicitly invited.": "Misafirler açıkca davet edilseler bile bu odaya katılamazlar.",
     "Hangup": "Sorun",
-    "Hide Text Formatting Toolbar": "Metin Biçimlendirme Araç Çubuğunu Gizle",
     "Historical": "Tarihi",
     "Home": "Ev",
     "Homeserver is": "Ana Sunucusu",
@@ -147,15 +140,12 @@
     "Incoming voice call from %(name)s": "%(name)s ' den gelen sesli arama",
     "Incorrect username and/or password.": "Yanlış kullanıcı adı ve / veya şifre.",
     "Incorrect verification code": "Yanlış doğrulama kodu",
-    "Invalid alias format": "Geçersiz Takma Ad(nickname) Formatı",
     "Invalid Email Address": "Geçersiz E-posta Adresi",
     "Invalid file%(extra)s": "Geçersiz dosya %(extra)s'ı",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s %(targetName)s ' ı davet etti.",
-    "Invite new room members": "Yeni oda üyelerini davet et",
     "Invited": "Davet Edildi",
     "Invites": "Davetler",
     "Invites user with given id to current room": "Mevcut odaya verilen kimliği olan kullanıcıyı davet eder",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' bir takma ad(nickname) için geçerli değil",
     "Sign in with": "Şununla giriş yap",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText> ses </voiceText> veya <videoText> video </videoText> olarak katılın.",
     "Join Room": "Odaya Katıl",
@@ -178,17 +168,11 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gelecekte oda geçmişini görünür yaptı herhangi biri.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gelecekte oda geçmişini görünür yaptı bilinmeyen (%(visibility)s).",
     "Manage Integrations": "Entegrasyonları Yönet",
-    "Markdown is disabled": "Markdown devre dışı",
-    "Markdown is enabled": "Markdown aktif",
-    "matrix-react-sdk version:": "matrix-react-sdk versiyon:",
-    "Message not sent due to unknown devices being present": "Bilinmeyen cihazlar bulunduğundan mesaj gönderilemedi",
     "Missing room_id in request": "İstekte eksik room_id",
     "Missing user_id in request": "İstekte user_id eksik",
     "Moderator": "Moderatör",
     "Mute": "Sessiz",
     "Name": "İsim",
-    "Never send encrypted messages to unverified devices from this device": "Bu cihazdan doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin",
-    "Never send encrypted messages to unverified devices in this room from this device": "Bu odada bu cihazdan doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin",
     "New address (e.g. #foo:%(localDomain)s)": "Yeni adres (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "Yeni şifreler uyuşmuyor",
     "New passwords must match each other.": "Yeni şifreler birbirleriyle eşleşmelidir.",
@@ -198,7 +182,6 @@
     "(not supported by this browser)": "(Bu tarayıcı tarafından desteklenmiyor)",
     "<not supported>": "<Desteklenmiyor>",
     "NOT verified": "Doğrulanmadı",
-    "No devices with registered encryption keys": "Kayıtlı şifreleme anahtarlı cihazlar yok",
     "No display name": "Görünür isim yok",
     "No more results": "Başka sonuç yok",
     "No results": "Sonuç yok",
@@ -209,7 +192,6 @@
     "Operation failed": "Operasyon başarısız oldu",
     "Password": "Şifre",
     "Passwords can't be empty": "Şifreler boş olamaz",
-    "People": "İnsanlar",
     "Permissions": "İzinler",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lütfen e-postanızı kontrol edin ve içerdiği bağlantıya tıklayın . Bu işlem tamamlandıktan sonra , 'devam et' e tıklayın .",
@@ -235,7 +217,6 @@
     "riot-web version:": "riot-web versiyon:",
     "Room %(roomId)s not visible": "%(roomId)s odası görünür değil",
     "Room Colour": "Oda Rengi",
-    "Room contains unknown devices": "Oda bilinmeyen cihazlar içeriyor",
     "%(roomName)s does not exist.": "%(roomName)s mevcut değil.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s şu anda erişilebilir değil.",
     "Rooms": "Odalar",
@@ -246,8 +227,6 @@
     "Searches DuckDuckGo for results": "Sonuçlar için DuckDuckGo'yu arar",
     "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s ' de %(userName)s tarafından görüldü",
     "Send anyway": "Her durumda gönder",
-    "Sender device information": "Gönderen cihaz bilgileri",
-    "Send Invites": "Davetiye Gönder",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
@@ -259,7 +238,6 @@
     "%(senderName)s set a profile picture.": "%(senderName)s bir profil resmi ayarladı.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s görünür ismini %(displayName)s ' a ayarladı.",
     "Settings": "Ayarlar",
-    "Show Text Formatting Toolbar": "Metin Biçimlendirme Araç Çubuğunu Göster",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zaman damgalarını 12 biçiminde göster (örn. 2:30 pm)",
     "Signed Out": "Oturum Kapatıldı",
     "Sign in": "Giriş Yap",
@@ -268,11 +246,9 @@
     "Someone": "Birisi",
     "Start a chat": "Bir Sohbet Başlat",
     "Start authentication": "Kimlik Doğrulamayı başlatın",
-    "Start Chat": "Sohbet Başlat",
     "Submit": "Gönder",
     "Success": "Başarılı",
     "The phone number entered looks invalid": "Girilen telefon numarası geçersiz görünüyor",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Sağladığınız imza anahtarı %(userId)s aygıtından %(deviceId)s ile eşleşiyor . Aygıt doğrulanmış olarak işaretlendi.",
     "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
     "This email address was not found": "Bu e-posta adresi bulunamadı",
     "The email address linked to your account must be entered.": "Hesabınıza bağlı e-posta adresi girilmelidir.",
@@ -286,7 +262,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Kullanmak için , otomatik tamamlama sonuçlarının yüklenmesini ve bitmesini bekleyin.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bu odanın zaman çizelgesinde belirli bir nokta yüklemeye çalışıldı , ama geçerli mesajı görüntülemeye izniniz yok.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bu odanın akışında belirli bir noktaya yüklemeye çalışıldı , ancak bulunamadı.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s uçtanuca şifrelemeyi açtı (algoritma -> %(algorithm)s).",
     "Unable to add email address": "E-posta adresi eklenemiyor",
     "Unable to remove contact information": "Kişi bilgileri kaldırılamıyor",
     "Unable to verify email address.": "E-posta adresi doğrulanamıyor.",
@@ -294,18 +269,13 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s 'in yasağını kaldırdı.",
     "Unable to capture screen": "Ekran yakalanamadı",
     "Unable to enable Notifications": "Bildirimler aktif edilemedi",
-    "Unable to load device list": "Cihaz listesi yüklenemedi",
-    "Undecryptable": "Şifresi çözülemez",
     "unencrypted": "şifrelenmemiş",
-    "Unencrypted message": "Şifrelenmemiş mesaj",
     "unknown caller": "bilinmeyen arayıcı",
     "unknown device": "bilinmeyen cihaz",
     "unknown error code": "bilinmeyen hata kodu",
     "Unknown room %(roomId)s": "Bilinmeyen oda %(roomId)s",
-    "Unknown (user, device) pair:": "Bilinmeyen (kullanıcı , cihaz) çifti :",
     "Unmute": "Sesi aç",
     "Unnamed Room": "İsimsiz Oda",
-    "Unrecognised command:": "Tanınmayan komut :",
     "Unrecognised room alias:": "Tanınmayan oda isimleri :",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s yükleniyor",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s ve %(count)s kadarı yükleniyor",
@@ -333,11 +303,8 @@
     "(no answer)": "(cevap yok)",
     "(unknown failure: %(reason)s)": "(bilinmeyen hata : %(reason)s)",
     "Warning!": "Uyarı!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "UYARI: Cihaz zaten doğrulandı , ancak anahtarlar UYUŞMUYOR!",
-    "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!": "UYARI: ANAHTAR DOĞRULAMA BAŞARISIZ! (key verification failure). %(userId)s ve %(deviceId)s  imza anahtarı sağlanan imza anahtarı \"%(fingerprint)s\" ile uyuşmayan \"%(fprint)s\". Bu iletişiminizin kesiliyor olabileceği anlamına geliyor!",
     "Who can access this room?": "Bu odaya kimler erişebilir ?",
     "Who can read history?": "Geçmişi kimler okuyabilir ?",
-    "Who would you like to communicate with?": "Kimlerle iletişim kurmak istersiniz ?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s %(targetName)s'nin davetinden çekildi.",
     "You are already in a call.": "Zaten bir çağrıdasınız.",
     "You cannot place a call with yourself.": "Kendinizle görüşme yapamazsınız .",
@@ -350,7 +317,6 @@
     "You need to be able to invite users to do that.": "Bunu yapmak için kullanıcıları davet etmeye ihtiyacınız var.",
     "You need to be logged in.": "Oturum açmanız gerekiyor.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "E-posta adresiniz bu Ana Sunucu'da ki Matrix ID'si ile ilişkili gözükmüyor.",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Parolanız başarıyla değiştirildi . Diğer cihazlara girene kadar onlara bildirim almayacaksınız",
     "You seem to be in a call, are you sure you want to quit?": "Bir çağrıda gözüküyorsunuz , çıkmak istediğinizden emin misiniz ?",
     "You seem to be uploading files, are you sure you want to quit?": "Dosya yüklüyorsunuz gibi görünüyor , çıkmak istediğinizden emin misiniz ?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Kullanıcıyı sizinle aynı güç seviyesine yükseltirken , bu değişikliği geri alamazsınız.",
@@ -389,8 +355,6 @@
     "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
     "Cancel": "İptal Et",
     "Active call": "Aktif çağrı",
-    "bold": "kalın",
-    "italic": "italik",
     "Please select the destination room for this message": "Bu ileti için lütfen hedef oda seçin",
     "Create new room": "Yeni Oda Oluştur",
     "Room directory": "Oda Rehberi",
@@ -419,18 +383,9 @@
     "Unknown error": "Bilinmeyen Hata",
     "Incorrect password": "Yanlış Şifre",
     "To continue, please enter your password.": "Devam etmek için , lütfen şifrenizi girin.",
-    "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:": "Bu cihazın güvenilir olabileceğini doğrulamak için , lütfen sahibiyle başka yollarla iletişim kurun (örn. şahsen veya telefon görüşmesi) ve bu cihazın Kullanıcı Ayarları'nda gördükleri anahtarın aşağıdaki anahtarla eşleşip eşleşmediğini sorun :",
-    "Device name": "Cihaz ismi",
-    "Device key": "Cihaz anahtarı",
-    "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.": "Eğer eşleşirse ,  aşağıdaki doğrulama butonuna basın . Eğer eşleşmezse , o zaman başkası bir bu cihazı tutuyor ve bunun yerine kara liste butonuna basmak istiyor olabilirsiniz.",
-    "Verify device": "Cihazı Doğrula",
     "I verify that the keys match": "Anahtarların uyuştuğunu doğruluyorum",
     "Unable to restore session": "Oturum geri yüklenemiyor",
     "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.": "Eğer daha önce Riot'un daha yeni bir versiyonunu kullandıysanız , oturumunuz bu sürümle uyumsuz olabilir . Bu pencereyi kapatın ve daha yeni sürüme geri dönün.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Şu anda doğrulanmamış cihazları kara listeye alıyorsunuz , bu cihazlara mesaj göndermek için onları doğrulamanız gerekir.",
-    "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.": "Her cihazın yasal sahiplerine ait olduklarını doğrulamak için doğrulama işlemini gerçekleştirmenizi öneririz, ancak tercih edip onaylamadan iletiyi tekrar gönderebilirsiniz.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" daha önce görmediğiniz cihazları içeriyor.",
-    "Unknown devices": "Bilinmeyen cihazlar",
     "Unknown Address": "Bilinmeyen Adres",
     "Unblacklist": "Karaliste Dışı",
     "Blacklist": "Kara Liste",
@@ -475,8 +430,6 @@
     "Start verification": "Doğrulamayı başlat",
     "Share without verifying": "Doğrulamadan paylaş",
     "Ignore request": "İsteği yoksay",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Şifreleme anahtarları isteyen , '%(displayName)s' isminde yeni bir cihaz eklediniz .",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tanımlanmamış cihazınız '%(displayName)s' , şifreleme anahtarlarını istiyor.",
     "Encryption key request": "Şifreleme anahtarı isteği",
     "Fetching third party location failed": "Üçüncü parti konumunu çekemedi",
     "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
@@ -520,7 +473,6 @@
     "Files": "Dosyalar",
     "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias)s oda rumuzu silinsin ve %(name)s dizinden kaldırılsın mı ?",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Bu oturumunuzu kapattıktan sonra hesabınıza dönmenizi ve diğer cihazlarda oturum açmanızı sağlar.",
     "Keywords": "Anahtar kelimeler",
     "Enable notifications for this account": "Bu hesap için bildirimleri etkinleştir",
     "Messages containing <span>keywords</span>": "<span> anahtar kelimeleri </span> içeren mesajlar",
@@ -624,8 +576,6 @@
     "Registration Required": "Kayıt Zorunlu",
     "You need to register to do this. Would you like to register now?": "Bunu yapabilmek için kayıt olmalısınız. Şimdi kayıt olmak ister misiniz?",
     "Restricted": "Sınırlı",
-    "Email, name or Matrix ID": "E-posta, isim yada Matrix ID",
-    "Failed to start chat": "Sohbet başlatma başarısız",
     "Failed to invite users to the room:": "Kullanıcıların odaya daveti başarısız oldu:",
     "Missing roomId.": "roomId eksik.",
     "You are not in this room.": "Bu odada değilsin.",
@@ -708,7 +658,6 @@
     "GitHub issue": "GitHub sorunu",
     "Notes": "Notlar",
     "Removing…": "Siliniyor…",
-    "Clear all data on this device?": "Bu cihazdaki bütün verileri sil?",
     "Clear all data": "Bütün verileri sil",
     "Community IDs cannot be empty.": "Topluluk ID leri boş bırakılamaz.",
     "Something went wrong whilst creating your community": "Topluluğunuz oluşturulurken bir şeyler yanlış gitti",
@@ -740,7 +689,6 @@
     "Developer Tools": "Geliştirici Araçları",
     "Integrations are disabled": "Bütünleştirmeler kapatılmış",
     "Integrations not allowed": "Bütünleştirmelere izin verilmiyor",
-    "Loading device info...": "Cihaz bilgileri yükleniyor...",
     "Incompatible local cache": "Yerel geçici bellek uyumsuz",
     "Clear cache and resync": "Geçici belleği temizle ve yeniden eşle",
     "Updating Riot": "Riot güncelleniyor",
@@ -950,8 +898,6 @@
     "<b>Print it</b> and store it somewhere safe": "<b>Yazdır</b> ve güvenli bir yerde sakla",
     "<b>Save it</b> on a USB key or backup drive": "Bir USB anahtara <b>kaydet</b>  veya sürücüye yedekle",
     "<b>Copy it</b> to your personal cloud storage": "Kişisel bulut depolamaya <b>kopyala</b>",
-    "Your access to encrypted messages is now protected.": "Şifrelenmiş mesajlara erişiminiz şimdi korunuyor.",
-    "Migrate from Key Backup": "Anahtar Yedeğinden Göç Et",
     "Recovery key": "Kurtarma anahtarı",
     "Success!": "Başarılı!",
     "Retry": "Yeniden Dene",
@@ -993,29 +939,21 @@
     "Folder": "Klasör",
     "Accept <policyLink /> to continue:": "Devam etmek için <policyLink /> i kabul ediniz:",
     "Upload": "Yükle",
-    "on device": "cihaz üstünde",
     "not found": "bulunamadı",
     "in account data": "hesap verisinde",
-    "Your homeserver does not support device management.": "Aan sunucunuz aygıt yönetimini desteklemiyor.",
-    "Delete %(count)s devices|other": "%(count)s cihazı silin",
-    "Delete %(count)s devices|one": "Cihaz sil",
     "ID": "ID",
     "Connecting to integration manager...": "Entegrasyon yöneticisine bağlanın...",
     "Cannot connect to integration manager": "Entegrasyon yöneticisine bağlanılamadı",
     "Delete Backup": "Yedek Sil",
     "Unable to load key backup status": "Anahtar yedek durumu yüklenemiyor",
     "Restore from Backup": "Yedekten Geri Dön",
-    "This device is backing up your keys. ": "Bu cihaz anahtarlarınızı yedekliyor. ",
-    "Connect this device to Key Backup": "Anahtar Yedeği için bu cihazı bağlayın",
     "not stored": "depolanmadı",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s anahtar yedekleniyor...",
     "All keys backed up": "Bütün yedekler yedeklendi",
-    "Backup is not signed by any of your devices": "Yedek hiç bir cihazınız tarafından imzalanmadı",
     "Backup version: ": "Yedek sürümü: ",
     "Algorithm: ": "Algoritma: ",
     "Start using Key Backup": "Anahtar Yedekleme kullanmaya başla",
     "Clear notifications": "Bildirimleri temizle",
-    "Enable desktop notifications for this device": "Bu cihaz için masaüstü bildirimlerini aç",
     "Show message in desktop notification": "Masaüstü bildiriminde mesaj göster",
     "Display Name": "Ekran Adı",
     "Profile picture": "Profil resmi",
@@ -1026,7 +964,6 @@
     "Please contact your homeserver administrator.": "Lütfen anasunucu yöneticiniz ile bağlantıya geçin.",
     "Message Pinning": "Mesaj Sabitleme",
     "Multiple integration managers": "Çoklu entegrasyon yöneticileri",
-    "New DM invite dialog (under development)": "Yeni DM davet diyalog kutusu (geliştirilmekte)",
     "Enable Emoji suggestions while typing": "Yazarken Emoji önerilerini aç",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Katılma/ayrılma mesajları göster (davetler/atılmalar/yasaklamalar etkilenmeyecek)",
     "Show avatar changes": "Avatar değişikliklerini göster",
@@ -1157,10 +1094,6 @@
     "Cannot add any more widgets": "Daha fazla görsel bileşen eklenemiyor",
     "The maximum permitted number of widgets have already been added to this room.": "İzin verilen maksimum sayıda görsel bileşen bu odaya zaten eklenmiş.",
     "Add a widget": "Bir görsel bileşen ekle",
-    "Some devices for this user are not trusted": "Bu kullanıcının bazı cihazları güvenilir değil",
-    "All devices for this user are trusted": "Bu kullanıcının tüm cihazları güvenilir",
-    "Some devices in this encrypted room are not trusted": "Bu şifrelenmiş odada bazı cihazlar şifrelenmemiş",
-    "All devices in this encrypted room are trusted": "Bu şifrelenmiş odadaki tüm cihazlar güvenilir",
     "Edit message": "Mesajı düzenle",
     "%(senderName)s sent an image": "%(senderName)s bir resim gönderdi",
     "%(senderName)s sent a video": "%(senderName)s bir video gönderdi",
@@ -1175,7 +1108,6 @@
     "Ban this user?": "Bu kullanıcıyı yasakla?",
     "Remove %(count)s messages|other": "%(count)s mesajı sil",
     "Remove %(count)s messages|one": "1 mesajı sil",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu odada bilinmeyen cihazlar var: bunları doğrulamadan devam ederseniz birilerinin çağrılarınıza göz atma ihtimali var.",
     "A conference call could not be started because the integrations server is not available": "Entegrasyon sunucusu mevcut olmadığından konferans çağrısı başlatılamadı",
     "Send cross-signing keys to homeserver": "Çapraz-imzalama anahtarlarını anasunucuya gönder",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uyarı: Topluluğa eklediğiniz her bir kişi topluluk IDsini bilen herhangi biri tarafından açıkça görünür olacaktır",
@@ -1331,16 +1263,12 @@
     "Upgrade this room to the recommended room version": "Bu odayı önerilen oda sürümüne yükselt",
     "View older messages in %(roomName)s.": "%(roomName)s odasında daha eski mesajları göster.",
     "This bridge is managed by <user />.": "Bu köprü <user /> tarafından yönetiliyor.",
-    "Connected via %(protocolName)s": "%(protocolName)s yoluyla bağlandı",
-    "Bridge Info": "Köprü Bilgisi",
     "Set a new custom sound": "Özel bir ses ayarla",
     "Change main address for the room": "Oda için ana adresi değiştir",
     "Error changing power level requirement": "Güç düzey gereksinimi değiştirmede hata",
     "Error changing power level": "Güç düzeyi değiştirme hatası",
     "Send %(eventType)s events": "%(eventType)s olaylarını gönder",
     "To link to this room, please add an alias.": "Bu odaya bağlanmak için, lütfen bir lakap ekle.",
-    "This user has not verified all of their devices.": "Bu kullanıcı tüm cihazlarda doğrulanmadı.",
-    "You have verified this user. This user has verified all of their devices.": "Bu kullanıcıyı doğruladınız. Bu kullanıcı tüm cihazlarında doğrulandı.",
     "This event could not be displayed": "Bu olay görüntülenemedi",
     "Demote yourself?": "Kendinin rütbeni düşür?",
     "Demote": "Rütbe Düşür",
@@ -1367,7 +1295,6 @@
     "Session verified": "Oturum doğrulandı",
     "Done": "Bitti",
     "Go Back": "Geri dön",
-    "New Session": "Yeni Oturum",
     "Gets or sets the room topic": "Oda başlığını getirir yada ayarlar",
     "Unbans user with given ID": "Verilen ID ile kullanıcı yasağını kaldırır",
     "Ignores a user, hiding their messages from you": "Mesajlarını senden gizleyerek, bir kullanıcıyı yok sayar",
@@ -1375,7 +1302,6 @@
     "You are now ignoring %(userId)s": "Şimdi %(userId)s yı yoksayıyorsunuz",
     "Stops ignoring a user, showing their messages going forward": "Sonraki mesajlarını göstererek, bir kullanıcıyı yoksaymaktan vazgeç",
     "Adds a custom widget by URL to the room": "URL ile odaya özel bir görsel bileşen ekle",
-    "Verifies a user, device, and pubkey tuple": "Bir kullanıcıyı, cihazı ve açık anahtar ikilisini doğrular",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s misafirlerin odaya katılmasına izin verdi.",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s bir geçersiz yasaklama kuralını güncelledi",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s, %(reason)s nedeniyle %(glob)s ile eşleşen yasaklama kuralını güncelledi",
@@ -1416,7 +1342,6 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Özel etiketler ile odaları grupla & filtrele ( değişiklikleri uygulamak için yenile)",
     "Render simple counters in room header": "Oda başlığında basit sayaçları görüntüle",
     "Try out new ways to ignore people (experimental)": "Kişileri yoksaymak için yeni yöntemleri dene (deneysel)",
-    "New invite dialog": "Yeni davet diyalogu",
     "Enable local event indexing and E2EE search (requires restart)": "E2EE arama ve yerel olay indeksini aç (yeniden başlatma gerekli)",
     "Mirror local video feed": "Yerel video beslemesi yansısı",
     "Enable Community Filter Panel": "Toluluk Filtre Panelini Aç",
@@ -1434,9 +1359,6 @@
     "You are not subscribed to any lists": "Herhangi bir listeye aboneliğiniz bulunmuyor",
     "⚠ These settings are meant for advanced users.": "⚠ Bu ayarlar ileri düzey kullanıcılar içindir.",
     "Unignore": "Yoksayma",
-    "This bridge was provisioned by <user />": "Bu körpü <user /> tarafından provize edildi",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "<networkIcon /> <networkName /> ağındaki <channelIcon /> <channelName /> kanala bağlandı",
-    "Below is a list of bridges connected to this room.": "Bu odaya bağlanmış köprülerin bir listesi alttadır.",
     "Change room avatar": "Oda resmini değiştir",
     "Members only (since the point in time of selecting this option)": "Sadece üyeler ( bu seçeneği seçtiğinizden itibaren)",
     "Unable to revoke sharing for email address": "E-posta adresi paylaşımı kaldırılamadı",
@@ -1526,7 +1448,6 @@
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "“abcabcabc” gibi tekrarlar “abc” yi tahmin etmekten çok az daha zor olur",
     "Sequences like abc or 6543 are easy to guess": "abc veya 6543 gibi diziler tahmin için oldukça kolaydır",
     "Common names and surnames are easy to guess": "Yaygın isimleri ve soyisimleri tahmin etmek oldukça kolay",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "Her cihaz yerine her kullanıcıyı doğrulamak için çarpraz-imzalamayı aç (geliştiriliyor)",
     "Show info about bridges in room settings": "Oda ayarlarındaki köprülerin bilgilerini göster",
     "Show a placeholder for removed messages": "Silinen mesajlar için bir yer tutucu göster",
     "Show display name changes": "Ekran isim değişikliklerini göster",
@@ -1541,7 +1462,6 @@
     "Got It": "Anlaşıldı",
     "Subscribing to a ban list will cause you to join it!": "Bir yasak listesine abonelik ona katılmanıza yol açar!",
     "Message search": "Mesaj arama",
-    "A device's public name is visible to people you communicate with": "Bir cihazın halka açık ismi iletişimde olduğunuz kişilere görünür",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Mahremiyet bizim için önemli, bu yüzden hiç bir kişisel ve betimleyici veriyi analizlerimiz için toplamayız.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Uyarı</b>: Bir oda yükseltimi <i> o oda üyelerinin otomatik olarak yeni sürüm odaya göç ettirilmesini sağlamaz.</i> Odanın eski sürümünde yeni sürüm odaya gitmek için bir linki gönderilecektir - yeni odaya katılmak için oda üyeleri bu linke tıklamak zorunda olacaktır.",
     "Internal room ID:": "Dahili oda ID:",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 7795060406..e1db73e8b1 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -137,7 +137,6 @@
     "Files": "Файли",
     "Collecting app version information": "Збір інформації про версію застосунка",
     "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.": "Це дозволить вам повернутися до своєї обліковки після виходу з неї, та заходити з інших пристроїв.",
     "Keywords": "Ключові слова",
     "Enable notifications for this account": "Увімкнути сповіщення для цієї обліковки",
     "Invite to this community": "Запросити в це суспільство",
@@ -243,7 +242,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Інформація, що надсилається нам, щоб допомогти зробити Riot.im кращим, включає в себе:",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Введіть пароль для захисту експортованого файлу. Щоб розшифрувати файл потрібно буде ввести цей пароль.",
     "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.": "У цій кімнаті є невідомі пристрої: якщо ви продовжите без їхньої перевірки, зважайте на те, що вас можна буде прослуховувати.",
     "Review Devices": "Перевірити пристрої",
     "Call Anyway": "Подзвонити все одно",
     "Answer Anyway": "Відповісти все одно",
@@ -313,10 +311,6 @@
     "Restricted": "Обмежено",
     "Moderator": "Модератор",
     "Start a chat": "Розпочати балачку",
-    "Who would you like to communicate with?": "З ким бажаєте спілкуватися?",
-    "Start Chat": "Розпочати балачку",
-    "Invite new room members": "Запросити до кімнати",
-    "Send Invites": "Надіслати запрошення",
     "Failed to invite": "Не вдалося запросити",
     "Failed to invite the following users to the %(roomName)s room:": "Не вдалося запросити таких користувачів до кімнати %(roomName)s:",
     "You need to be logged in.": "Вам потрібно увійти.",
@@ -350,15 +344,8 @@
     "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.",
@@ -397,7 +384,6 @@
     "%(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",
@@ -425,8 +411,6 @@
     "Automatically replace plain text Emoji": "Автоматично замінювати емоційки в простому тексті",
     "Mirror local video feed": "Показувати локальне відео віддзеркалено",
     "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": "Увімкнути попередній перегляд гіперпосилань за умовчанням для учасників цієї кімнати",
@@ -443,16 +427,12 @@
     "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": "Підтвердження пароля",
-    "Unable to load device list": "Не вдалося завантажити перелік пристроїв",
-    "Delete %(count)s devices|other": "Вилучити %(count)s пристроїв",
-    "Delete %(count)s devices|one": "Вилучити пристрій",
     "Device ID": "ID пристрою",
     "Last seen": "Востаннє з'являвся",
     "Failed to set display name": "Не вдалося встановити ім'я для показу",
@@ -469,14 +449,7 @@
     "%(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": "Неможливо розшифрувати",
-    "Encrypted by an unverified device": "Зашифровано неперевіреним пристроєм",
-    "Unencrypted message": "Незашифроване повідомлення",
     "Please select the destination room for this message": "Будь ласка, виберіть кімнату, куди потрібно надіслати це повідомлення",
     "device id: ": "id пристрою: ",
     "Disinvite": "Скасувати запрошення",
@@ -515,8 +488,6 @@
     "Only continue if you trust the owner of the server.": "Продовжуйте тільки якщо довіряєте власнику сервера.",
     "Trust": "Довіра",
     "Unable to load! Check your network connectivity and try again.": "Завантаження неможливе! Перевірте інтернет-зʼєднання та спробуйте ще.",
-    "Email, name or Matrix ID": "Е-пошта, імʼя або Matrix ID",
-    "Failed to start chat": "Не вдалося розпочати чат",
     "Failed to invite users to the room:": "Не вдалося запросити користувачів до кімнати:",
     "Messages": "Повідомлення",
     "Actions": "Дії",
@@ -525,12 +496,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Надсилає повідомлення як чистий текст, не використовуючи markdown",
     "Upgrades a room to a new version": "Покращує кімнату до нової версії",
     "You do not have the required permissions to use this command.": "Вам бракує дозволу на використання цієї команди.",
-    "Room upgrade confirmation": "Підтвердження покращення кімнати",
-    "Upgrading a room can be destructive and isn't always necessary.": "Покращення кімнати може призвести до втрати даних та не є обовʼязковим.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Рекомендується покращувати кімнату, якщо поточна її версія вважається <i>нестабільною</i>. Нестабільні версії кімнат можуть мати вади, відсутні функції або вразливості безпеки.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Покращення кімнати загалом впливає лише на роботу з кімнатою на <i>сервері</i>. Якщо ви маєте проблему із вашим клієнтом Riot, надішліть свою проблему на <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Увага!</b>: Покращення кімнати <i>не перенесе автоматично усіх учасників до нової версії кімнати.</i> Ми опублікуємо посилання на нову кімнату у старій версії кімнати, а учасники мають власноруч клацнути це посилання, щоб приєднатися до нової кімнати.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Підтвердьте, що ви згодні продовжити покращення цієї кімнати з <oldVersion /> до <newVersion />.",
     "Changes your display nickname in the current room only": "Змінює ваше псевдо тільки для поточної кімнати",
     "Changes the avatar of the current room": "Змінює аватар поточної кімнати",
     "Changes your avatar in this current room only": "Змінює ваш аватар для поточної кімнати",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 407a0a9e6f..14575a61ff 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -19,7 +19,6 @@
     "The information being sent to us to help make Riot.im better includes:": "Thông tin gửi lên máy chủ giúp cải thiện Riot.im bao gồm:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Trường hợp trang này chứa thông tin định danh như phòng chat, người dùng hoặc mã nhóm, dữ liệu định danh sẽ được loại bỏ trước khi gửi lên máy chủ.",
     "Call Failed": "Cuộc gọi thất bại",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Có thiết bị chưa được xác thực trong phòng này: nếu bạn tiếp tục mà không xác thực thiết bị, cuộc gọi có thể bị nghe lén.",
     "Review Devices": "Xác nhận thiết bị",
     "Call Anyway": "Vẫn gọi",
     "Answer Anyway": "Vẫn trả lời",
@@ -107,11 +106,6 @@
     "Moderator": "Quản trị viên",
     "Admin": "Admin",
     "Start a chat": "Bắt đầu chat",
-    "Who would you like to communicate with?": "Bạn muốn chat với ai?",
-    "Email, name or Matrix ID": "Email, tên hoặc Matrix ID",
-    "Start Chat": "Bắt đầu chat",
-    "Invite new room members": "Mời thành viên mới",
-    "Send Invites": "Gửi lời mời",
     "Operation failed": "Tác vụ thất bại",
     "Failed to invite": "Không thể mời",
     "Failed to invite users to the room:": "Mời thành viên vào phòng chat thất bại:",
@@ -134,12 +128,7 @@
     "/ddg is not a command": "/ddg không phải là một câu lệnh",
     "To use it, just wait for autocomplete results to load and tab through them.": "Để sử dụng, hãy đợi kết quả tìm kiếm được hiển thị và chọn đối tượng.",
     "Upgrades a room to a new version": "Cập nhật phòng lên phiên bản mới",
-    "Room upgrade confirmation": "Xác nhận phòng nâng cấp",
-    "Upgrading a room can be destructive and isn't always necessary.": "Nâng cấp phòng chat có thể làm hỏng và không phải luôn cần thiết.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Cập nhật phòng được khuyến nghị khi phòng chat được xem là  <i>không ổn định</i>. Phòng không ổn định có thể gây lỗi, thiếu chức năng hoặc có nguy cơ bị tấn công.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Nâng cấp phòng thường chỉ ảnh hưởng ở phía <i>máy chủ</i> cần để xử lý phòng. Nếu bạn đang gặp vấn đề với Riot, vui lòng gửi thông báo lỗi tới <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Cảnh báo</b>: Nâng cấp phòng sẽ <i>không tự động mời thành viên vào phòng mới.</i> Thành viên sẽ phải click vào đường link đến phòng mới để tham gia.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Vui lòng xác nhận bạn muốn nâng cấp phòng từ phiên bản cũ <oldVersion /> lên <newVersion />.",
     "Changes your display nickname": "Đổi tên hiển thị của bạn",
     "Changes your display nickname in the current room only": "Chỉ đổi tên hiển thị của bạn trong phòng này mà thôi",
     "Changes your avatar in this current room only": "Chỉ đổi hình đại diện trong phòng này",
@@ -164,20 +153,13 @@
     "Adds a custom widget by URL to the room": "Thêm một URL widget vào phòng",
     "Please supply a https:// or http:// widget URL": "Vui lòng điền 1 widget với https:// hoặc http://",
     "You cannot modify widgets in this room.": "Bạn không thể sửa đổi widget trong phòng này.",
-    "Verifies a user, device, and pubkey tuple": "Xác thực người dùng hoặc thiết bị",
-    "Unknown (user, device) pair:": "Cặp người dùng - thiết bị chưa xác thực:",
-    "Device already verified!": "Thiết bị đã được xác thực!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "Cảnh báo: thiết bị đã được xác thực, nhưng bộ khóa không trùng khớp!",
     "Which officially provided instance you are using, if any": "Cung cấp máy chủ bạn đang sử dụng, nếu có",
     "Changes your avatar in all rooms": "Đổi hình đại diện của bạn trong mọi phòng",
-    "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!": "CẢNH BÁO: XÁC MINH KHÓA THẤT BẠI! Khóa của %(userId)s và thiết bị %(deviceId)s là \"%(fprint)s\" và không khớp với khóa cần xác minh \"%(fingerprint)s\". Điều này có nghĩa thông tin giao tiếp của bạn có thể bị nghe lén!",
     "Verified key": "Khóa được xác minh",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Khóa đăng nhập trùng với khóa bạn nhận được từ thiết bị %(deviceId)s của %(userId)s. Thiết bị được đánh dấu đã xác minh.",
     "Displays action": "Hiện thị thành động",
     "Forces the current outbound group session in an encrypted room to be discarded": "Buộc bỏ qua phiên làm việc trong phòng chat được mã hóa",
     "Sends the given message coloured as a rainbow": "Gửi nội dung tin nhắn được tô màu cầu vồng",
     "Sends the given emote coloured as a rainbow": "Gửi hình emote được tô màu cầu vồng",
-    "Unrecognised command:": "Lệnh không hợp lệ:",
     "Reason": "Lí do",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s chấp nhận lời mời cho %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s chấp thuận lời mời.",
@@ -234,7 +216,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s đã đặt nội dung mới của phòng chat xem được bởi thành viên.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s đã đặt nội dung mới của phòng chat xem được bởi bất kỳ ai.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s đã đặt lịch sử phòng chat xem được đối với đối tượng (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s đã bật mã hóa đầu cuối (thuật toán %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s đổi từ %(fromPowerLevel)s thành %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s đã đổi mức quyền của %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s đã đổi tin được treo trong phòng.",
@@ -330,8 +311,6 @@
     "Enable Community Filter Panel": "Bật khung bộ lọc cộng đồng",
     "Allow Peer-to-Peer for 1:1 calls": "Cho cuộc gọi trực tiếp 1:1",
     "Send analytics data": "Gửi dữ liệu phân tích",
-    "Never send encrypted messages to unverified devices from this device": "Không bao giờ gửi tin mã hóa từ thiết bị này đến thiết bị chưa được xác minh",
-    "Never send encrypted messages to unverified devices in this room from this device": "Không bao giờ gửi tin mã hóa từ thiết bị này đến các thiết bị chưa được xác minh",
     "Enable inline URL previews by default": "Bật hiển thị mặc định xem trước nội dung đường link",
     "Enable URL previews for this room (only affects you)": "Bật hiển thị xem trước nội dung đường link trong phòng này (chỉ tác dụng với bạn)",
     "Enable URL previews by default for participants in this room": "Bật mặc định xem trước nội dung đường link cho mọi người trong phòng",
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index 4cfe5c437a..b705afc4fe 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -20,7 +20,6 @@
     "The information being sent to us to help make Riot.im better includes:": "D’informoasje da noar uus wor verstuurd vo Riot.im te verbetern betreft:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Woar da da blad hier identificeerboare informoasje bevat, gelyk e gespreks-, gebruukers- of groeps-ID, goan deze gegevens verwyderd wordn voorda ze noa de server gestuurd wordn.",
     "Call Failed": "Iproep mislukt",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "’t Zyn ounbekende toestelln in da gesprek hier: a je deuregoat zounder ze te verifieern goa ’t meuglik zyn da ’t er etwien jen iproep afluustert.",
     "Review Devices": "Toestelln noakykn",
     "Call Anyway": "Algelyk belln",
     "Answer Anyway": "Algelyk beantwoordn",
@@ -108,11 +107,6 @@
     "Moderator": "Moderator",
     "Admin": "Beheerder",
     "Start a chat": "Gesprek beginn",
-    "Who would you like to communicate with?": "Me wien zou je willn communiceern?",
-    "Email, name or Matrix ID": "E-mailadresse, noame, of matrix-ID",
-    "Start Chat": "Gesprek beginn",
-    "Invite new room members": "Nieuwe gespreksleedn uutnodign",
-    "Send Invites": "Uutnodigiengn verstuurn",
     "Operation failed": "Handelienge es mislukt",
     "Failed to invite": "Uutnodign es mislukt",
     "Failed to invite users to the room:": "Kostege de volgende gebruukers hier nie uutnodign:",
@@ -135,12 +129,7 @@
     "/ddg is not a command": "/ddg is geen ipdracht",
     "To use it, just wait for autocomplete results to load and tab through them.": "Voor ’t te gebruukn, wacht je toutda de automatisch angevulde resultoatn zyn geloadn en tab je derdeure.",
     "Upgrades a room to a new version": "Actualiseert ’t gesprek tout e nieuwe versie",
-    "Room upgrade confirmation": "Bevestigienge vo ’t gesprek te actualiseern",
-    "Upgrading a room can be destructive and isn't always necessary.": "’t Ipwoardeern van e gesprek es meuglik destructief en is nie assan noodzoakelik.",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "Gespreksipwoarderiengn wordn meestal anbevooln wanneer da der e bepoalde groepsgespreksversie als <i>ounstabiel</i> wor beschouwd. Ounstabiele groepsgespreksversies bevattn meuglik fouten of beveiligiengsprobleemn, of beschikkn nie over alle functies.",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "Gespreksipwoarderiengn beïnvloedn meestal enkel de verwerkienge van ’t gesprek <i>an serverzyde</i>. Indien da je probleemn zoudt ounderviendn me je Riot-cliënt, gelieve da ton te meldn ip <issueLink />.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Let ip</b>: ’t ipwoardeern van e gesprek goa <i>gespreksleedn nie automatisch verplatsn noa de nieuwe versie van ’t gesprek</i>. We goan e koppelienge noa ’t nieuw gesprek in d’oude versie van ’t gesprek platsn - gespreksleedn goan ton ip deze koppeliengen moetn klikkn vo ’t nieuw gesprek toe te treedn.",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "Bevestigt da je da gesprek hier van <oldVersion /> wilt ipwoardeern noa <newVersion />.",
     "Changes your display nickname": "Verandert je weergavenoame",
     "Changes your display nickname in the current room only": "Stelt je weergavenoame alleene moa in ’t huudig gesprek in",
     "Changes your avatar in this current room only": "Verandert jen avatar alleene moa in ’t huudig gesprek",
@@ -166,18 +155,11 @@
     "Adds a custom widget by URL to the room": "Voegt met een URL een angepaste widget toe an ’t gesprek",
     "Please supply a https:// or http:// widget URL": "Gift een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "J’en kut de widgets in ’t gesprek hier nie anpassn.",
-    "Verifies a user, device, and pubkey tuple": "Verifieert e combinoasje van gebruuker, toestel en publieke sleuter",
-    "Unknown (user, device) pair:": "Ounbekend poar (gebruuker, toestel):",
-    "Device already verified!": "Toestel es al geverifieerd gewist!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "LET IP: toestel es al geverifieerd gewist, moa de sleuters KOMMN NIE OVEREEN!",
-    "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!": "LET IP: SLEUTERVERIFICOASJE ES MISLUKT! Den oundertekende sleuter vo %(userId)s en toestel %(deviceId)s is ‘%(fprint)s’, wuk da nie overeenkomt me de verschafte sleuter ‘%(fingerprint)s’. Da zoudt hier kunn betekenn da je communicoasje ounderschept wordt!",
     "Verified key": "Geverifieerde sleuter",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "De versleuteriengssleuter da j’è verstrekt komt overeen me de versleuteriengssleuter da j’ountvangen èt van ’t toestel %(deviceId)s van %(userId)s. ’t Toestel es gemarkeerd als geverifieerd.",
     "Displays action": "Toogt actie",
     "Forces the current outbound group session in an encrypted room to be discarded": "Forceert de huudige uutwoartsche groepssessie in e versleuterd gesprek vo verworpn te wordn",
     "Sends the given message coloured as a rainbow": "Verstuurt ’t gegeevn bericht in regenboogkleurn",
     "Sends the given emote coloured as a rainbow": "Verstuurt de gegeevn emoticon in regenboogkleurn",
-    "Unrecognised command:": "Ounbekende ipdracht:",
     "Reason": "Reedn",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s èt d’uutnodigienge vo %(displayName)s anveird.",
     "%(targetName)s accepted an invitation.": "%(targetName)s èt een uutnodigienge anveird.",
@@ -233,7 +215,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt voor alle gespreksleedn.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt voor iedereen.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt voor ounbekend (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s èt eind-tout-eind-versleuterienge angezet (%(algorithm)s-algoritme).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s van %(fromPowerLevel)s noa %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s èt ’t machtsniveau van %(powerLevelDiffText)s gewyzigd.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s èt de vastgeprikte boodschappn vo ’t gesprek gewyzigd.",
@@ -320,8 +301,6 @@
     "Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschoakeln",
     "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer toeloatn voor twigesprekkn",
     "Send analytics data": "Statistische gegeevns (analytics) verstuurn",
-    "Never send encrypted messages to unverified devices from this device": "Versleuterde berichtn vanaf dit toestel nooit noar oungeverifieerde toestelln verstuurn",
-    "Never send encrypted messages to unverified devices in this room from this device": "Versleuterde berichtn vanaf dit toestel nooit noar oungeverifieerde toestelln in dit gesprek verstuurn",
     "Enable inline URL previews by default": "Inline URL-voorvertoniengn standoard inschoakeln",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoniengn in dit gesprek inschoakeln (geldt alleene vo joun)",
     "Enable URL previews by default for participants in this room": "URL-voorvertoniengn standoard vo de gebruukers in dit gesprek inschoakeln",
@@ -363,7 +342,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifieert deze gebruuker deur te bevestign da zyn/heur scherm de volgende emoji toogt.",
     "Verify this user by confirming the following number appears on their screen.": "Verifieert deze gebruuker deur te bevestign da zyn/heur scherm ’t volgend getal toogt.",
     "Unable to find a supported verification method.": "Kan geen oundersteunde verificoasjemethode viendn.",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "Vo maximoale veiligheid ku je dit best ounder vier oogn, of via een ander vertrouwd communicoasjemedium, doen.",
     "Dog": "Hound",
     "Cat": "Katte",
     "Lion": "Leeuw",
@@ -410,7 +388,6 @@
     "Pencil": "Potlood",
     "Paperclip": "Paperclip",
     "Scissors": "Schoar",
-    "Padlock": "Hangslot",
     "Key": "Sleuter",
     "Hammer": "Oamer",
     "Telephone": "Telefong",
@@ -434,7 +411,6 @@
     "New passwords don't match": "Nieuwe paswoordn kommn nie overeen",
     "Passwords can't be empty": "Paswoordn kunn nie leeg zyn",
     "Warning!": "Let ip!",
-    "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.": "’t Verandern van ’t paswoord goa vooralsnog alle sleuters voor eind-tout-eind-versleuterienge ip alle toestelln herinstelln, woadeure da de versleuterde gespreksgeschiedenisse ounleesboar wordt, tenzy da je eest je gesprekssleuters exporteert en nadien herimporteert. Dit goat in den toekomst verbeterd wordn.",
     "Export E2E room keys": "E2E-gesprekssleuters exporteern",
     "Do you want to set an email address?": "Wil je een e-mailadresse instelln?",
     "Current password": "Huudig paswoord",
@@ -442,11 +418,7 @@
     "New Password": "Nieuw paswoord",
     "Confirm password": "Bevestig ’t paswoord",
     "Change Password": "Paswoord verandern",
-    "Your homeserver does not support device management.": "Je thuusserver oundersteunt geen toestelbeheer.",
-    "Unable to load device list": "Kan de lyste van toestelln nie loadn",
     "Authentication": "Authenticoasje",
-    "Delete %(count)s devices|other": "%(count)s toestelln verwydern",
-    "Delete %(count)s devices|one": "Toestel verwydern",
     "Device ID": "Toestel-ID",
     "Last seen": "Latst gezien",
     "Failed to set display name": "Instelln van weergavenoame es mislukt",
@@ -469,25 +441,11 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Versleuterde berichtn zyn beveiligd me eind-tout-eind-versleuterienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
     "Unable to load key backup status": "Kostege de sleuterback-upstatus nie loadn",
     "Restore from Backup": "Herstelln uut back-up",
-    "This device is backing up your keys. ": "Dit toestel makt een back-up van je sleuters. ",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Dit toestel <b>makt geen back-up van je sleuters</b>, ma j’èt wel een bestoande back-up da je kut herstelln, en da je vanaf ton nieuwe sleuters an kut toevoegn.",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "Verbindt dit toestel me de sleuterback-up vooraleer da je jen afmeldt vo sleuters die hunder alleene mo ip dit toestel bevindn nie kwyt te speeln.",
-    "Connect this device to Key Backup": "Dit toestel verbindn me de sleuterback-up",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleuters wordn geback-upt…",
     "All keys backed up": "Alle sleuters zyn geback-upt",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "De back-up èt een oundertekenienge van een <verify>ounbekend</verify> toestel met ID %(deviceId)s.",
-    "Backup has a <validity>valid</validity> signature from this device": "De back-up èt e <validity>geldige</validity> oundertekenienge van dit toestel",
-    "Backup has an <validity>invalid</validity> signature from this device": "De back-up èt een <validity>oungeldige</validity> ondertekenienge van dit toestel",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "De back-up èt e <validity>geldige</validity> oundertekenienge van e <verify>geverifieerd</verify> toestel <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "De back-up èt e <validity>geldige</validity> oundertekenienge van een <verify>oungeverifieerd</verify> toestel <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "De back-up èt een <validity>oungeldige</validity> oundertekenienge van e <verify>geverifieerd</verify> toestel <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "De back-up èt een <validity>oungeldige</validity> oundertekenienge van een <verify>oungeverifieerd</verify> toestel <device></device>",
-    "Backup is not signed by any of your devices": "De back-up es door geen van je toestelln oundertekend",
-    "This backup is trusted because it has been restored on this device": "Deze back-up wor vertrouwd, omda t'n ip dit toestel hersteld es gewist",
     "Advanced": "Geavanceerd",
     "Backup version: ": "Back-upversie: ",
     "Algorithm: ": "Algoritme: ",
-    "Your keys are <b>not being backed up from this device</b>.": "Je sleuters wordn <b>nie geback-upt van dit toestel</b>.",
     "Back up your keys before signing out to avoid losing them.": "Makt een back-up van je sleuters vooraleer da je jen afmeldt vo ze nie kwyt te speeln.",
     "Start using Key Backup": "Begint me de sleuterback-up te gebruukn",
     "Error saving email notification preferences": "Foute by ’t ipsloan van de meldingsvoorkeurn voor e-mail",
@@ -511,9 +469,7 @@
     "Advanced notification settings": "Geavanceerde meldiengsinstelliengn",
     "There are advanced notifications which are not shown here": "Der zyn geavanceerde meldiengn dat hier nie getoogd wordn",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "J’è ze meuglik ingesteld in een andere cliënt als Riot. Je ku ze nie anpassn in Riot, moa ze zyn wel actief",
-    "Enable desktop notifications for this device": "Bureaubladmeldiengn inschoakeln vo dit toestel",
     "Show message in desktop notification": "Bericht toogn in bureaubladmeldienge",
-    "Enable audible notifications for this device": "Geluudsmeldiengn inschoakeln vo dit toestel",
     "Off": "Uut",
     "On": "An",
     "Noisy": "Lawoaierig",
@@ -522,14 +478,12 @@
     "Verification code": "Verificoasjecode",
     "Phone Number": "Telefongnumero",
     "Profile picture": "Profielfoto",
-    "Upload profile picture": "Profielfoto iploaden",
     "<a>Upgrade</a> to your own domain": "<a>Ipwoardeert</a> noa jen eigen domein",
     "Display Name": "Weergavenoame",
     "Save": "Ipsloan",
     "Flair": "Badge",
     "Failed to change password. Is your password correct?": "Wyzign van ’t paswoord es mislukt. Es je paswoord wel juste?",
     "Success": "Gereed",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Je paswoord es gewyzigd. Je goat ip andere toestelln geen pushmeldiengn nie meer ountvangn toutda je je der ip heranmeldt",
     "Profile": "Profiel",
     "Account": "Account",
     "Set a new account password...": "Stelt e nieuw accountpaswoord in…",
@@ -555,7 +509,6 @@
     "Submit debug logs": "Foutipsporiengslogboekn indienn",
     "FAQ": "VGV",
     "Versions": "Versies",
-    "matrix-react-sdk version:": "matrix-react-sdk-versie:",
     "riot-web version:": "riot-web-versie:",
     "olm version:": "olm-versie:",
     "Homeserver is": "Thuusserver es",
@@ -574,15 +527,12 @@
     "<not supported>": "<nie oundersteund>",
     "Import E2E room keys": "E2E-gesprekssleuters importeern",
     "Cryptography": "Cryptografie",
-    "Device ID:": "Toestel-ID:",
-    "Device key:": "Toestelsleuter:",
     "Ignored users": "Genegeerde gebruukers",
     "Bulk options": "Bulkopties",
     "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn anveirdn",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn weigern",
     "Key backup": "Sleuterback-up",
     "Security & Privacy": "Veiligheid & privacy",
-    "Devices": "Toestelln",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot verzoamelt anonieme analysegegeevns da ’t meuglik moakn van de toepassienge te verbetern.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy es belangryk voor uus, dus me verzoameln geen persoonlike of identificeerboare gegeevns voor uzze gegeevnsanalyse.",
     "Learn more about how we use analytics.": "Leest meer over hoe da we joun gegeevns gebruukn.",
@@ -663,22 +613,11 @@
     " (unsupported)": " (nie oundersteund)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelneemn me <voiceText>sproak</voiceText> of <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Loopnd vergoaderiengsgesprek %(supportedText)s.",
-    "Some devices for this user are not trusted": "Der wordn enkele toestelln van deze gebruuker nie vertrouwd",
-    "Some devices in this encrypted room are not trusted": "Der wordn enkele toestelln in dit versleuterd gesprek nie vertrouwd",
-    "All devices for this user are trusted": "Alle toestelln van deze gebruuker wordn vertrouwd",
-    "All devices in this encrypted room are trusted": "Alle toestelln in dit versleuterd gesprek wordn vertrouwd",
     "This event could not be displayed": "Deze gebeurtenisse kostege nie weergegeevn wordn",
     "%(senderName)s sent an image": "%(senderName)s èt e fotootje gestuurd",
     "%(senderName)s sent a video": "%(senderName)s èt e filmtje gestuurd",
     "%(senderName)s uploaded a file": "%(senderName)s èt e bestand ipgeloaden",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Je sleuterdeelverzoek es verstuurd - controleer jen andere toestelln vo sleuterdeelverzoekn.",
-    "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.": "Sleuterdeelverzoekn wordn automatisch noar andere toestelln verstuurd. A je ’t verzoek èt afgeweezn of geslootn, klikt ton hier vo de sleuters van deze sessie heran te vroagn.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Je goat dit bericht nie kunn ountsleutern als geen van jen andere toestellen der de sleuter voor èt.",
     "Key request sent.": "Sleuterverzoek verstuurd.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Versleuteriengssleuters heranvroagn</requestLink> van jen andere toestelln.",
-    "Undecryptable": "Ounountsleuterboar",
-    "Encrypted by an unverified device": "Versleuterd deur een oungeverifieerd toestel",
-    "Unencrypted message": "Ounversleuterd bericht",
     "Please select the destination room for this message": "Selecteer ’t bestemmingsgesprek vo dit bericht",
     "Scroll to bottom of page": "Scrollt noa den onderkant van ’t blad",
     "device id: ": "toestel-ID: ",
@@ -698,7 +637,6 @@
     "Failed to toggle moderator status": "Anpassn van moderatorstatus es mislukt",
     "Failed to change power level": "Wyzign van ’t machtsniveau es mislukt",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Je kut deze veranderiengn nie oungedoan moakn angezien da je de gebruuker tout ’tzelfste niveau als jen eigen promoveert.",
-    "No devices with registered encryption keys": "Geen toestelln me geregistreerde versleuteriengssleuters",
     "Ignore": "Negeern",
     "Jump to read receipt": "Noar ’t latst geleezn bericht goan",
     "Mention": "Vermeldn",
@@ -718,34 +656,20 @@
     "Invited": "Uutgenodigd",
     "Filter room members": "Gespreksleedn filtern",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
-    "bold": "vetgedrukt",
-    "italic": "scheefgedrukt",
-    "deleted": "verwyderd",
-    "underlined": "ounderstreept",
-    "inline-code": "code",
-    "block-quote": "citoat",
-    "bulleted-list": "ipsommienge",
-    "numbered-list": "genummerde lyste",
     "Voice call": "Sproakiproep",
     "Video call": "Video-iproep",
     "Hangup": "Iphangn",
-    "Show Text Formatting Toolbar": "Tekstipmoakwerkbalk toogn",
     "Upload file": "Bestand iploadn",
     "Send an encrypted reply…": "Verstuurt e versleuterd antwoord…",
     "Send a reply (unencrypted)…": "Verstuurt een antwoord (ounversleuterd)…",
     "Send an encrypted message…": "Verstuurt e versleuterd bericht…",
     "Send a message (unencrypted)…": "Verstuurt een bericht (ounversleuterd)…",
-    "Markdown is disabled": "Markdown is uutgeschoakeld",
-    "Hide Text Formatting Toolbar": "Tekstipmoakwerkbalk wegsteekn",
     "The conversation continues here.": "’t Gesprek goat hier verder.",
     "This room has been replaced and is no longer active.": "Dit gesprek is vervangn gewist en is nie langer actief.",
     "You do not have permission to post to this room": "J’èt geen toestemmienge voor in dit gesprek te postn",
     "Server error": "Serverfoute",
     "Server unavailable, overloaded, or something else went wrong.": "De server is ounbereikboar of overbelast, of der is etwat anders foutgegoan.",
     "Command error": "Ipdrachtfoute",
-    "Unable to reply": "Kostege nie reageern",
-    "At this time it is not possible to reply with an emote.": "’t Es nog nie meuglik met een emoticon te reageern.",
-    "Markdown is enabled": "Markdown es ingeschoakeld",
     "No pinned messages.": "Geen vastgeprikte berichtn.",
     "Loading...": "Bezig me loadn…",
     "Pinned Messages": "Vastgeprikte berichtn",
@@ -781,7 +705,6 @@
     "Community Invites": "Gemeenschapsuutnodigiengn",
     "Invites": "Uutnodigiengn",
     "Favourites": "Favorietn",
-    "People": "Menschn",
     "Start chat": "Gesprek beginn",
     "Rooms": "Gesprekkn",
     "Low priority": "Leige prioriteit",
@@ -842,8 +765,6 @@
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "’t Es e foute ipgetreedn by ’t bywerkn van ’t hoofdadresse van ’t gesprek. Dit wor meugliks nie toegeloatn deur de server, of der es een tydelik probleem ipgetreedn.",
     "Error creating alias": "Foute by ’t anmoakn van de bynoame",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "’t Es e foute ipgetreedn by ’t anmoakn van die bynoame. Dit wor meugliks nie toegeloatn deur de server, of der is een tydelik probleem ipgetreedn.",
-    "Invalid alias format": "Oungeldig bynoamformoat",
-    "'%(alias)s' is not a valid format for an alias": "‘%(alias)s’ es geen geldig formoat voor e bynoame",
     "Error removing alias": "Foute by ’t verwydern van de bynoame",
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "’t Es e foute ipgetreedn by ’t verwydern van die bynoame. Meugliks bestoa ze nie mi, of der es een tydelike foute ipgetreedn.",
     "Main address": "Hoofdadresse",
@@ -860,8 +781,6 @@
     "This room is not showing flair for any communities": "Dit gesprek toogt geen badges vo gemeenschappn",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nieuwe gemeenschaps-ID (bv. +foo:%(localDomain)s)",
     "Room avatar": "Gespreksavatar",
-    "Upload room avatar": "Gespreksavatar iploadn",
-    "No room avatar": "Geen gespreksavatar",
     "Room Name": "Gespreksnoame",
     "Room Topic": "Gespreksounderwerp",
     "You have <a>enabled</a> URL previews by default.": "J’èt URL-voorvertoniengn standoard <a>ingeschoakeld</a>.",
@@ -1080,7 +999,6 @@
     "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.": "De zichtboarheid van berichtn in Matrix is lik by e-mails. ’t Vergeetn van je berichtn betekent da berichtn da je gy è verstuurd nie mi gedeeld goan wordn me nieuwe of oungeregistreerde gebruukers, mo geregistreerde gebruukers dat al toegank han tout deze berichtn goan nog assan toegank èn tout hunder eigen kopie dervan.",
     "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)": "Vergeet alle berichtn dan ’kik verstuurd ghed èn wanneer da myn account gedeactiveerd gewist es (<b>Let ip:</b> dit goat der voorn zorgn da toekomstige gebruukers een ounvolledig beeld krygn van gesprekkn)",
     "To continue, please enter your password:": "Gif je paswoord in vo verder te goan:",
-    "Verify device": "Toestel verifieern",
     "Use Legacy Verification (for older clients)": "Verouderde verificoasje gebruukn (voor oudere cliëntn)",
     "Verify by comparing a short text string.": "Verifieert deur e korte tekenreekse te vergelykn.",
     "Begin Verifying": "Verificoasje beginn",
@@ -1088,10 +1006,6 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Verschynt er nietent? Nog nie alle cliëntn biedn oundersteunienge voor interactieve verificoasje. <button>Gebruukt verouderde verificoasje</button>.",
     "Waiting for %(userId)s to confirm...": "Wachtn ip bevestigienge van %(userId)s…",
     "Use two-way text verification": "Twirichtiengstekstverificoasje gebruukn",
-    "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:": "Neemt ip een andere manier (bv. ounder vier oogn of telefonisch) contact op me den eigenoar vo te controleern of da dit toestel vertrouwd ku wordn, en vroagt of da de sleuter vo dit toestel in hunder Gebruukersinstelliengn gelyk is an ounderstoande sleuter:",
-    "Device name": "Toestelnoame",
-    "Device key": "Toestelsleuter",
-    "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.": "Klikt hieroundern ip de knop ‘Verifieern’ a de sleuters overeenkommn. Zo niet druk j’ip de knop ‘Blokkeern’, want ton is ’t er etwien da de berichtn noa dit toestel an ’t ounderscheppn is.",
     "I verify that the keys match": "’k Verifieern dan de sleuters overeenkommn",
     "Back": "Were",
     "Send Custom Event": "Angepaste gebeurtenisse verstuurn",
@@ -1110,15 +1024,11 @@
     "Developer Tools": "Ountwikkeliengsgereedschap",
     "An error has occurred.": "’t Is e foute ipgetreedn.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieert deze gebruuker vo n’hem/heur als vertrouwd te markeern. Gebruukers vertrouwn gift je extra gemoedsrust by ’t gebruuk van eind-tout-eind-versleuterde berichtn.",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Deze gebruuker verifieern goat hunder toestel als vertrouwd markeern, en ook joun toestel voor hunder als vertrouwd markeern.",
     "Waiting for partner to confirm...": "Wachtn ip bevestigienge van partner…",
     "Incoming Verification Request": "Inkomend verificoasjeverzoek",
-    "You added a new device '%(displayName)s', which is requesting encryption keys.": "J’èt e nieuw toestel ‘%(displayName)s’ toegevoegd, dat achter versleuteriengssleuters vroagt.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Jen oungeverifieerd toestel ‘%(displayName)s’ vroagt achter versleuteriengssleuters.",
     "Start verification": "Verificoasje beginn",
     "Share without verifying": "Deeln zounder verificoasje",
     "Ignore request": "Verzoek negeern",
-    "Loading device info...": "Toestelinformoasje wor geloadn…",
     "Encryption key request": "Verzoek vo versleuteriengssleuter",
     "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.": "J’èt al e ki Riot ip %(host)s gebruukt me lui loadn van leedn ingeschoakeld. In deze versie is lui laden uutgeschoakeld. Me da de lokoale cache nie compatibel is tusschn deze twi instelliengn, moe Riot jen account hersynchroniseern.",
     "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.": "Indien dat d’andere versie van Riot nog in een ander tabblad is geopend, sluut je da best, want Riot ip dezelfsten host tegelykertyd me lui loadn ingeschoakeld en uutgeschoakeld gebruukn goa vo probleemn zorgn.",
@@ -1171,7 +1081,6 @@
     "Remember, you can always set an email address in user settings if you change your mind.": "Onthoudt da je nog assan een e-mailadresse kut instelln in de gebruukersinstelliengn.",
     "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
     "Please set a password!": "Stelt e paswoord in!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee ku je noa jen account werekeern nada je j’afgemeld èt, en jen anmeldn ip andere toestelln.",
     "Share Room": "Gesprek deeln",
     "Link to most recent message": "Koppelienge noa ’t recentste bericht",
     "Share User": "Gebruuker deeln",
@@ -1183,11 +1092,6 @@
     "Missing session data": "Sessiegegeevns ountbreekn",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Sommige sessiegegeevns, inclusief sleuters vo versleuterde berichtn, ountbreekn. Meldt jen af en were an vo dit ip te lossn, en herstelt de sleuters uut den back-up.",
     "Your browser likely removed this data when running low on disk space.": "Je browser èt deze gegeevns meugliks verwyderd toen da de beschikboare ipslagruumte vul was.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vo de moment sluut je oungeverifieerde toestelln uut; vo berichtn noa deze toestelln te verstuurn moe je ze verifieern.",
-    "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 roadn je an van ieder toestel te verifieern vo te kunn vastestelln of da ze tout de rechtmatigen eigenoar behoorn, moa je kut ’t bericht ook zounder verificoasje verstuurn.",
-    "Room contains unknown devices": "’t Gesprek bevat ounbekende toestelln",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "‘%(RoomName)s’ bevat toestelln da je nog nie gezien ghed èt.",
-    "Unknown devices": "Ounbekende toestelln",
     "Upload files (%(current)s of %(total)s)": "Bestandn wordn ipgeloadn (%(current)s van %(total)s)",
     "Upload files": "Bestandn iploadn",
     "Upload": "Iploadn",
@@ -1221,7 +1125,6 @@
     "This looks like a valid recovery key!": "Dit is e geldigen herstelsleuter!",
     "Not a valid recovery key": "Geen geldigen herstelsleuter",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelsleuter in te geevn.",
-    "If you've forgotten your recovery passphrase you can <button>set up new recovery options</button>": "A je jen herstelpaswoord zy vergeetn, ku je <button>nieuwe herstelopties instelln</button>",
     "Private Chat": "Privégesprek",
     "Public Chat": "Openboar gesprek",
     "Custom": "Angepast",
@@ -1407,8 +1310,6 @@
     "Couldn't find a matching Matrix room": "Kostege geen byhoornd Matrix-gesprek viendn",
     "Fetching third party location failed": "’t Iphoaln van de locoasje van de derde party is mislukt",
     "Unable to look up room ID from server": "Kostege de gesprek-ID nie van de server iphoaln",
-    "Message not sent due to unknown devices being present": "Bericht nie verstuurd doorda der ounbekende toestelln anwezig zyn",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Toestelln toogn</showDevicesText>, <sendAnywayText>algelyk verstuurn</sendAnywayText> of <cancelText>annuleern</cancelText>.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Je ku geen berichtn stuurn toutda je <consentLink>uzze algemene voorwoardn</consentLink> geleezn en anveird ghed èt.",
     "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.": "Je bericht is nie verstuurd gewist omda deze thuusserver z’n limiet vo moandeliks actieve gebruukers bereikt ghed èt. Gelieve <a>contact ip te neemn me jen dienstbeheerder</a> vo de dienst te bluuvn gebruukn.",
     "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.": "Je bericht is nie verstuurd gewist omda deze thuusserver e systeembronlimiet overschreedn ghed èt. Gelieve <a>contact ip te neemn me jen dienstbeheerder</a> vo de dienst te bluuvn gebruukn.",
@@ -1450,7 +1351,6 @@
     "The email address linked to your account must be entered.": "’t E-mailadresse da me joun account verboundn is moet ingegeevn wordn.",
     "A new password must be entered.": "’t Moet e nieuw paswoord ingegeevn wordn.",
     "New passwords must match each other.": "Nieuwe paswoordn moetn overeenkommn.",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Je paswoord herinstelln goat alle sleuters voor eind-tout-eind-versleuterienge ip al je toestelln herinstelln, woadeure da je versleuterde gesprekgeschiedenisse ounleesboar wordt. Stelt de sleuterback-up in of exporteer je gesprekssleuters van ip een ander toestel vooraleer da je je paswoord herinstelt.",
     "Your Matrix account on %(serverName)s": "Je Matrix-account ip %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Je Matrix-account ip <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "’t Is e verificoasje-e-mail noa joun gestuurd gewist vo ’t instelln van je nieuw paswoord te bevestign.",
@@ -1459,7 +1359,6 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "’t Is een e-mail noar %(emailAddress)s verstuurd gewist. Klikt hieroundern van zodra da je de koppelienge derin gevolgd ghed èt.",
     "I have verified my email address": "’k Èn myn e-mailadresse geverifieerd",
     "Your password has been reset.": "Je paswoord is heringesteld.",
-    "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.": "Je zyt afgemeld ip al je toestelln en je goa geen pushmeldiengn nie mi ountvangn. Meldt jen ip ieder toestel heran vo were meldiengn t’ountvangn.",
     "Return to login screen": "Were noa ’t anmeldiengsscherm",
     "Set a new password": "Stelt e nieuw paswoord in",
     "Invalid homeserver discovery response": "Oungeldig thuusserverountdekkiengsantwoord",
@@ -1511,7 +1410,6 @@
     "Decryption error": "Ountsleuteriengsfoute",
     "Session ID": "Sessie-ID",
     "Event information": "Gebeurtenisinformoasje",
-    "Sender device information": "Info over toestel van afzender",
     "Passphrases must match": "Paswoordn moetn overeenkommn",
     "Passphrase must not be empty": "Paswoord meug nie leeg zyn",
     "Export room keys": "Gesprekssleuters exporteern",
@@ -1538,17 +1436,13 @@
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet ku je dit gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln indien da je jen herstelpaswoord zou vergeetn.",
     "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet ku je ’t gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Jen herstelsleuter is e veiligheidsnet - je kut hem gebruukn vo de toegank tou je versleuterde berichtn t’herstelln indien da je je paswoord zou vergeetn.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Bewoar jen herstelsleuter ip e heel veilige plekke, lik e paswoordbeheerder (of e kluuze)",
     "Your Recovery Key": "Jen herstelsleuter",
     "Copy to clipboard": "Kopieern noa ’t klembord",
     "Download": "Downloadn",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "Jen herstelsleuter is <b>gekopieerd noa je klembord</b>, plakt hem in:",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "Jen herstelsleuter bevindt hem in je <b>Downloads</b>-mappe.",
     "<b>Print it</b> and store it somewhere safe": "<b>Print hem af</b> en bewoart hem ip e veilige plekke",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sloat hem ip</b> ip een USB-stick of e back-upschyf",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopieert hem</b> noa je persoonlike cloudipslag",
     "Your keys are being backed up (the first backup could take a few minutes).": "’t Wordt e back-up van je sleuters gemakt (den eesten back-up kut e poar minuutn deurn).",
-    "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.": "Zounder veilig berichtherstel in te stelln, goa je je versleuterde berichtgeschiedenisse nie kunn herstelln indien da je jen afmeldt of een ander toestel gebruukt.",
     "Set up Secure Message Recovery": "Veilig berichtherstel instelln",
     "Secure your backup with a passphrase": "Beveilig je back-up met e paswoord",
     "Confirm your passphrase": "Bevestig je paswoord",
@@ -1566,12 +1460,9 @@
     "New Recovery Method": "Nieuwe herstelmethode",
     "A new recovery passphrase and key for Secure Messages have been detected.": "’t Zyn e nieuw herstelpaswoord en e nieuwen herstelsleuter vo beveiligde berichtn gedetecteerd.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "A je gy deze nieuwe herstelmethode nie èt ingesteld, is ’t meuglik dat der een anvaller toegank tout jen account probeert te verkrygn. Wyzigt ounmiddellik jen accountpaswoord en stelt e nieuwe herstelmethode in in d’instelliengn.",
-    "This device is encrypting history using the new recovery method.": "Dit toestel versleutert de geschiedenisse met de nieuwe herstelmethode.",
     "Go to Settings": "Goa noa d’instelliengn",
     "Set up Secure Messages": "Beveiligde berichtn instelln",
     "Recovery Method Removed": "Herstelmethode verwyderd",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "Dit toestel è gedetecteerd da jen herstelpaswoord en -sleuter vo beveiligde berichtn zyn verwyderd.",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "A je dit per accident è gedoan, ku je beveiligde berichtn instelln ip dit toestel, woamee da de berichtgeschiedenisse van dit toestel herversleuterd goa wordn met e nieuwe herstelmethode.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "A je de herstelmethode nie è verwyderd, is ’t meuglik dat der een anvaller toegank tout jen account probeert te verkrygn. Wyzigt ounmiddellik jen accountpaswoord en stelt e nieuwe herstelmethode in in d’instelliengn.",
     "Failed to set direct chat tag": "Instelln van twigesprekslabel is mislukt",
     "Failed to remove tag %(tagName)s from room": "Verwydern van %(tagName)s-label van gesprek is mislukt",
@@ -1612,8 +1503,6 @@
     "Changes your avatar in all rooms": "Verandert jen avatar in alle gesprekkn",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Vertelt uus wuk dat der verkeerd is geloopn, of nog beter, makt e foutmeldienge an ip GitHub woarin da je 't probleem beschryft.",
     "Removing…": "Bezig me te verwydern…",
-    "Clear all data on this device?": "Alle gegeevns ip dit toestel wissn?",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Gewiste gegeevns kunn nie weregehoald wirdn. Versleuterde berichtn goan verloorn goan, tenzy dad hunder sleuters geback-upt gewist zyn.",
     "Clear all data": "Alle gegeevns wissn",
     "Your homeserver doesn't seem to support this feature.": "Je thuusserver biedt geen oundersteunienge vo deze functie.",
     "Resend edit": "Bewerkienge herverstuurn",
@@ -1629,15 +1518,12 @@
     "Service": "Dienst",
     "Summary": "Soamnvattienge",
     "This account has been deactivated.": "Deezn account is gedeactiveerd gewist.",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "Herkrygt den toegank tou jen account en herstelt de versleuteriengssleuters dan ip dit toestel ipgesloagn gewist zyn. Zounder deze sleuters goa je je versleuterde berichtn nie kunn leezn ip andere toestelln.",
     "Enter your password to sign in and regain access to your account.": "Voert je paswoord in vo jen an te meldn en den toegank tou jen account te herkrygn.",
     "Forgotten your password?": "Paswoord vergeetn?",
     "Sign in and regain access to your account.": "Meldt jen heran en herkrygt den toegank tou jen account.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Je ku je nie anmeldn me jen account. Nimt contact ip me de beheerder van je thuusserver vo meer informoasje.",
     "You're signed out": "Je zyt afgemeld",
     "Clear personal data": "Persoonlike gegeevns wissn",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Let ip: je persoonlike gegeevns (inclusief versleuteriengssleuters) wordn nog alsan ip dit toestel ipgesloagn. Wist ze a je gereed zyt me ’t toestel te gebruukn, of a je je wilt anmeldn me nen andern account.",
-    "Failed to start chat": "Gesprek beginn is mislukt",
     "Messages": "Berichtn",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toogt e lyste van beschikboare ipdrachtn, met hunder gebruukn en beschryviengn",
@@ -1665,7 +1551,6 @@
     "Please enter verification code sent via text.": "Gift de verificoasjecode in da je in een smse gekreegn ghed èt.",
     "Discovery options will appear once you have added a phone number above.": "Ountdekkiengsopties goan verschynn a j’e telefongnumero toegevoegd ghed èt.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "’t Is een smse versteur noa +%(msisdn)s. Gift de verificoasjecode in da derin stoat.",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Controleert of da de sleuter da j’in je Gebruukersinstelliengn ip da toestel ziet overeenkomt me de sleuter hierounder vo te verifieern da ’t toestel ku vertrouwd wordn:",
     "Command Help": "Hulp by ipdrachtn",
     "No identity server is configured: add one in server settings to reset your password.": "’t Is geen identiteitsserver geconfigureerd gewist: voegt der één toe in de serverinstelliengn vo je paswoord herin te stelln.",
     "Call failed due to misconfigured server": "Iproep mislukt door verkeerd gecounfigureerde server",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 5043525676..58e4130d99 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -8,7 +8,6 @@
     "Decryption error": "解密出错",
     "Default": "默认",
     "Device ID": "设备 ID",
-    "Devices": "设备列表",
     "Direct chats": "私聊",
     "Disinvite": "取消邀请",
     "Displays action": "显示操作",
@@ -49,14 +48,12 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 从 %(fromPowerLevel)s 变为 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "即使有人主动邀请，游客也不能加入此聊天室。",
     "Hangup": "挂断",
-    "Hide Text Formatting Toolbar": "隐藏格式工具栏",
     "Historical": "历史",
     "Homeserver is": "主服务器是",
     "Identity Server is": "身份认证服务器是",
     "I have verified my email address": "我已经验证了我的邮箱地址",
     "Import E2E room keys": "导入聊天室端到端加密密钥",
     "Incorrect verification code": "验证码错误",
-    "Invalid alias format": "别名格式无效",
     "Invalid Email Address": "邮箱地址格式错误",
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Return to login screen": "返回登录页面",
@@ -70,8 +67,6 @@
     "Search": "搜索",
     "Search failed": "搜索失败",
     "Searches DuckDuckGo for results": "搜索 DuckDuckGo",
-    "Sender device information": "发送者的设备信息",
-    "Send Invites": "发送邀请",
     "Send Reset Email": "发送密码重设邮件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发送了一张图片。",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。",
@@ -90,7 +85,6 @@
     "%(count)s of your messages have not been sent.|other": "部分消息未发送。",
     "Someone": "某位用户",
     "Start a chat": "创建聊天",
-    "Start Chat": "开始聊天",
     "Submit": "提交",
     "Success": "成功",
     "This email address is already in use": "此邮箱地址已被使用",
@@ -111,7 +105,6 @@
     "Confirm password": "确认密码",
     "Continue": "继续",
     "Ed25519 fingerprint": "Ed25519指纹",
-    "Invite new room members": "邀请新的聊天室成员",
     "Join Room": "加入聊天室",
     "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。",
     "Jump to first unread message.": "跳到第一条未读消息。",
@@ -149,7 +142,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 将话题修改为 “%(topic)s”。",
     "Changes your display nickname": "修改昵称",
-    "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.": "目前，修改密码会导致所有设备上的端到端密钥被重置，使得加密的聊天记录不再可读。除非事先导出你的密钥，并在密码修改后导入回去。此问题将会在未来得到改善。",
     "Click to mute audio": "点此静音",
     "Click to mute video": "点此静音",
     "click to reveal": "点击展开",
@@ -161,14 +153,10 @@
     "Custom": "自定义",
     "Custom level": "自定义级别",
     "Decline": "拒绝",
-    "Device already verified!": "设备已验证！",
-    "Device ID:": "设备 ID:",
     "device id: ": "设备 ID: ",
-    "Device key:": "设备密钥 :",
     "Disable Notifications": "关闭消息通知",
     "Drop File Here": "把文件拖拽到这里",
     "Enable Notifications": "启用消息通知",
-    "Encrypted by an unverified device": "由未验证设备加密",
     "Enter passphrase": "输入密码",
     "Error: Problem communicating with the given homeserver.": "错误: 与指定的主服务器通信时出错。",
     "Export": "导出",
@@ -184,15 +172,12 @@
     "Invited": "已邀请",
     "Invites": "邀请",
     "Invites user with given id to current room": "按照 ID 邀请指定用户加入当前聊天室",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不符合别名的格式",
     "Sign in with": "第三方登录",
-    "Message not sent due to unknown devices being present": "消息未发送，因为有未知的设备存在",
     "Missing room_id in request": "请求中没有 聊天室 ID",
     "Missing user_id in request": "请求中没有 user_id",
     "Moderator": "协管员",
     "Mute": "静音",
     "Name": "姓名",
-    "Never send encrypted messages to unverified devices from this device": "在此设备上，从不对未经验证的设备发送消息",
     "New passwords don't match": "两次输入的新密码不符",
     "none": "无",
     "not specified": "未指定",
@@ -229,9 +214,6 @@
     "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logout": "登出",
     "Low priority": "低优先级",
-    "Markdown is disabled": "Markdown 已禁用",
-    "Markdown is enabled": "Markdown 已启用",
-    "matrix-react-sdk version:": "matrix-react-sdk 版本：",
     "No more results": "没有更多结果",
     "olm version:": "olm 版本：",
     "Only people who have been invited": "只有被邀请的人",
@@ -256,8 +238,6 @@
     "Make Moderator": "使成为主持人",
     "Room": "聊天室",
     "Connectivity to the server has been lost.": "到服务器的连接已经丢失。",
-    "bold": "加粗",
-    "italic": "斜体",
     "New Password": "新密码",
     "Options": "选项",
     "Passphrases must match": "密码必须匹配",
@@ -270,9 +250,6 @@
     "Unknown error": "未知错误",
     "Incorrect password": "密码错误",
     "To continue, please enter your password.": "请输入你的密码继续。",
-    "Device name": "设备名称",
-    "Device key": "设备密钥",
-    "Verify device": "验证设备",
     "I verify that the keys match": "我验证此密钥匹配",
     "Unable to restore session": "无法恢复会话",
     "Blacklist": "列入黑名单",
@@ -290,7 +267,6 @@
     "Skip": "跳过",
     "Start verification": "开始验证",
     "Ignore request": "忽略请求",
-    "Loading device info...": "正在加载设备信息...",
     "Example": "例子",
     "Create": "创建",
     "Failed to upload image": "上传图像失败",
@@ -311,11 +287,9 @@
     "Revoke Moderator": "撤销主持人",
     "Remote addresses for this room:": "此聊天室的远程地址：",
     "Results from DuckDuckGo": "来自 DuckDuckGo 的结果",
-    "Room contains unknown devices": "聊天室包含未知设备",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "Save": "保存",
     "Send anyway": "仍然发送",
-    "Show Text Formatting Toolbar": "显示文本格式工具栏",
     "This room has no local addresses": "此聊天室没有本地地址",
     "This doesn't appear to be a valid email address": "这似乎不是有效的邮箱地址",
     "This phone number is already in use": "此手机号码已被使用",
@@ -325,10 +299,7 @@
     "Unban": "解除封禁",
     "Unable to capture screen": "无法录制屏幕",
     "Unable to enable Notifications": "无法启用通知",
-    "Unable to load device list": "无法加载设备列表",
-    "Undecryptable": "无法解密",
     "unencrypted": "未加密的",
-    "Unencrypted message": "未加密消息",
     "unknown caller": "未知呼叫者",
     "unknown device": "未知设备",
     "Unnamed Room": "未命名的聊天室",
@@ -361,7 +332,6 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 设定历史浏览功能为 未知的 (%(visibility)s).",
     "AM": "上午",
     "PM": "下午",
-    "People": "联系人",
     "Profile": "个人配置",
     "Public Chat": "公开的",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
@@ -375,13 +345,9 @@
     "Automatically replace plain text Emoji": "将符号表情转换为 Emoji",
     "Unable to verify email address.": "无法验证邮箱地址。",
     "Unknown room %(roomId)s": "未知聊天室 %(roomId)s",
-    "Unknown (user, device) pair:": "未知（用户，设备）对：",
-    "Unrecognised command:": "无法识别的命令：",
     "Unrecognised room alias:": "无法识别的聊天室别名：",
     "(no answer)": "（无回复）",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "警告：设备已验证，但密钥不匹配！",
     "Who can access this room?": "谁有权访问此聊天室？",
-    "Who would you like to communicate with?": "你想和谁交流？",
     "You are already in a call.": "您正在通话。",
     "You do not have permission to do that in this room.": "您没有进行此操作的权限。",
     "You cannot place VoIP calls in this browser.": "无法在此浏览器中发起 VoIP 通话。",
@@ -408,7 +374,6 @@
     "Username invalid: %(errMessage)s": "用户名无效： %(errMessage)s",
     "Verification Pending": "验证等待中",
     "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
-    "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 和 device %(deviceId)s 的签名密钥为 \"%(fprint)s\"，与提供的密钥 \"%(fingerprint)s\" 不匹配。这可能意味着你的通信正在被窃听！",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
     "You cannot place a call with yourself.": "你怎么寂寞到要和自己打电话，不支持的啦。",
     "You have <a>disabled</a> URL previews by default.": "你已经默认 <a>禁用</a> 链接预览。",
@@ -446,15 +411,10 @@
     "You must join the room to see its files": "你必须加入聊天室以看到它的文件",
     "Failed to invite the following users to the %(roomName)s room:": "邀请以下用户到 %(roomName)s 聊天室失败：",
     "Confirm Removal": "确认移除",
-    "Verifies a user, device, and pubkey tuple": "验证用户、设备与公钥元组",
-    "Unknown devices": "未知设备",
     "Unknown Address": "未知地址",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)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 收到的签名密钥匹配。设备被标记为已验证。",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据以允许我们改善它。",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
     "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果不指定一个邮箱地址，您将无法重置你的密码。你确定吗？",
     "Add an Integration": "添加集成",
@@ -466,8 +426,6 @@
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
     "This will allow you to reset your password and receive notifications.": "这将允许你重置你的密码和接收通知。",
     "Share without verifying": "不验证就分享",
-    "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' 正在请求加密密钥。",
     "Encryption key request": "加密密钥请求",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s 添加了 %(widgetName)s 小挂件",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s 移除了 %(widgetName)s 小挂件",
@@ -475,7 +433,6 @@
     "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社区",
     "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.": "聊天室中有未知设备：如果您在不验证它们的情况下继续，您的通话可能会被人窃听。",
     "Review Devices": "复查设备",
     "Call Anyway": "仍然呼叫",
     "Answer Anyway": "仍然接听",
@@ -494,11 +451,8 @@
     "Send": "发送",
     "Message Pinning": "消息置顶",
     "Use compact timeline layout": "使用紧凑的时间线布局",
-    "Never send encrypted messages to unverified devices in this room from this device": "在此设备上、此聊天室中，从不对未经验证的设备发送加密的消息",
     "Enable URL previews for this room (only affects you)": "在此聊天室中启用链接预览（仅影响你）",
     "Enable URL previews by default for participants in this room": "对此聊天室的所有成员默认启用链接预览",
-    "Delete %(count)s devices|other": "删除了 %(count)s 个设备",
-    "Delete %(count)s devices|one": "删除设备",
     "%(senderName)s sent an image": "%(senderName)s 发送了一张图片",
     "%(senderName)s sent a video": "%(senderName)s 发送了一个视频",
     "%(senderName)s uploaded a file": "%(senderName)s 上传了一个文件",
@@ -619,14 +573,9 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 将他们的昵称修改成了 %(displayName)s 。",
     "Stickerpack": "贴图集",
     "You don't currently have any stickerpacks enabled": "您目前没有启用任何贴纸包",
-    "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>。",
     "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": "没有注册了加密密钥的设备",
     "Unmute": "取消静音",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（滥权等级 %(powerLevelNumber)s）",
     "Hide Stickers": "隐藏贴图",
@@ -687,7 +636,6 @@
     "Community IDs cannot be empty.": "社区 ID 不能为空。",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "社区 ID 只能包含 a-z、0-9 或 “=_-./” 等字符",
     "Something went wrong whilst creating your community": "创建社区时出现问题",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "您目前默认将未经验证的设备列入黑名单；在发送消息到这些设备上之前，您必须先验证它们。",
     "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，则您的会话可能与当前版本不兼容。请关闭此窗口并使用最新版本。",
     "Showing flair for these communities:": "显示这些社区的个性徽章：",
     "This room is not showing flair for any communities": "此聊天室没有显示任何社区的个性徽章",
@@ -698,9 +646,6 @@
     "Please enter the code it contains:": "请输入其包含的代码：",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix 聊天室 ID",
-    "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:": "为验证此设备是否可信，请通过其他方式（例如面对面交换或拨打电话）与其拥有者联系，并询问他们该设备的用户设置中的密钥是否与以下密钥匹配：",
-    "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.": "如果匹配，请点击下面的验证按钮。 如果不匹配，那么这可能说明其他人正在盗用此设备，而您应当点击黑名单按钮。",
-    "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.": "我们建议您对每台设备进行验证以保证它们属于其合法所有者，但是您可以在不验证它们的情况下重新发送消息。",
     "<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?": "您想要将哪个聊天室添加到社区简介？",
@@ -729,7 +674,6 @@
     "Create a new community": "创建新社区",
     "Error whilst fetching joined communities": "获取已加入社区列表时出现错误",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标出您的私人空间。",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>显示未信任的设备</showDevicesText> 、 <sendAnywayText>不经信任直接发送</sendAnywayText> 或 <cancelText>取消发送</cancelText>。",
     "%(count)s of your messages have not been sent.|one": "您的消息尚未发送。",
     "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
     "Uploading %(filename)s and %(count)s others|zero": "正在上传 %(filename)s",
@@ -747,7 +691,6 @@
     "Ignores a user, hiding their messages from you": "忽略用户，隐藏他们发送的消息",
     "Stops ignoring a user, showing their messages going forward": "解除忽略用户，显示他们的消息",
     "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 提交了一个 bug，调试日志可以帮助我们追踪这个问题。 调试日志包含应用程序使用数据，也就包括您的用户名、您访问的房间或社区的 ID 或别名，以及其他用户的用户名，但不包括聊天记录。",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "密码修改成功。在您在其他设备上重新登录之前，其他设备不会收到推送通知",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "尝试加载此聊天室的时间线的特定时间点，但是无法找到。",
     "%(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> 。",
     "%(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> 。你也可以单独选择消息以重新发送或取消。",
@@ -800,7 +743,6 @@
     "Files": "文件",
     "Collecting app version information": "正在收集应用版本信息",
     "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.": "这将允许你可以在注销后回到您的账号，并在其他设备上登录。",
     "Keywords": "关键词",
     "Enable notifications for this account": "对此账号启用通知",
     "Invite to this community": "邀请加入此社区",
@@ -891,8 +833,6 @@
     "Your User Agent": "您的 User Agent",
     "Your device resolution": "您设备的分辨率",
     "Always show encryption icons": "总是显示加密标志",
-    "Unable to reply": "无法回复",
-    "At this time it is not possible to reply with an emote.": "目前无法使用表情符号作为回复内容。",
     "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?": "您将被带到一个第三方网站以便验证您的账号来使用 %(integrationsUrl)s 提供的集成。您希望继续吗？",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "无法更新聊天室 %(roomName)s 在社区 “%(groupId)s” 中的可见性。",
     "Minimize apps": "最小化应用程序",
@@ -912,12 +852,6 @@
     "You do not have permission to start a conference call in this room": "您没有在此聊天室发起通话会议的权限",
     "This event could not be displayed": "无法显示此事件",
     "Share Link to User": "分享链接给其他用户",
-    "deleted": "删除线",
-    "underlined": "下划线",
-    "inline-code": "代码",
-    "block-quote": "引用",
-    "bulleted-list": "无序列表",
-    "numbered-list": "有序列表",
     "Share room": "分享聊天室",
     "System Alerts": "系统警告",
     "Muted Users": "被禁言的用户",
@@ -1118,7 +1052,6 @@
     "Verify this user by confirming the following emoji appear on their screen.": "通过在其屏幕上显示以下表情符号来验证此用户。",
     "Verify this user by confirming the following number appears on their screen.": "通过在其屏幕上显示以下数字来验证此用户。",
     "Unable to find a supported verification method.": "无法找到支持的验证方法。",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "为了最大限度地提高安全性，我们建议您亲自执行此操作或使用其他可信的通信方式。",
     "Dog": "狗",
     "Cat": "猫",
     "Lion": "狮子",
@@ -1165,7 +1098,6 @@
     "Pencil": "铅笔",
     "Paperclip": "回形针",
     "Scissors": "剪刀",
-    "Padlock": "挂锁",
     "Key": "钥匙",
     "Hammer": "锤子",
     "Telephone": "电话",
@@ -1183,7 +1115,6 @@
     "Headphones": "耳机",
     "Folder": "文件夹",
     "Pin": "别针",
-    "Your homeserver does not support device management.": "您的主服务器不支持设备管理。",
     "Yes": "是",
     "No": "否",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "我们已向您发送了一封电子邮件，以验证您的地址。 请按照里面的说明操作，然后单击下面的按钮。",
@@ -1192,26 +1123,15 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "加密消息已使用端对端加密保护。只有您和拥有密钥的收件人可以阅读这些消息。",
     "Unable to load key backup status": "无法载入密钥备份状态",
     "Restore from Backup": "从备份恢复",
-    "This device is backing up your keys. ": "此设备已备份您的密钥。 ",
     "Back up your keys before signing out to avoid losing them.": "在登出账号之前请备份密钥以免丢失。",
     "Backing up %(sessionsRemaining)s keys...": "正在备份 %(sessionsRemaining)s 个密钥...",
     "All keys backed up": "所有密钥都已备份",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "备份含有一个 ID 为 %(deviceId)s 的 <verify>未知</verify> 设备的签名。",
-    "Backup has a <validity>valid</validity> signature from this device": "备份含有此设备的一个 <validity>有效</validity> 签名",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "备份含有 <verify>已验证</verify>  设备 <device></device> 的一个 <validity>有效</validity> 签名",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "备份含有 <verify>未验证</verify>  设备 <device></device> 的一个 <validity>有效</validity> 签名",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "备份含有 <verify>已验证</verify>  设备 <device></device> 的一个 <validity>无效</validity> 签名",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "备份含有 <verify>未验证</verify>  设备 <device></device> 的一个 <validity>无效</validity> 签名",
-    "Backup is not signed by any of your devices": "您的任何设备均未对备份进行签名",
-    "This backup is trusted because it has been restored on this device": "此备份是受信任的，因为它已在此设备上还原",
-    "Your keys are <b>not being backed up from this device</b>.": "您的密钥 <b>没有从此设备备份</b>。",
     "Start using Key Backup": "开始使用密钥备份",
     "Add an email address to configure email notifications": "添加电子邮件地址以配置电子邮件通知",
     "Unable to verify phone number.": "无法验证电话号码。",
     "Verification code": "验证码",
     "Phone Number": "电话号码",
     "Profile picture": "个人资料头像",
-    "Upload profile picture": "上传个人头像",
     "Display Name": "昵称",
     "Set a new account password...": "设置一个新的账号密码...",
     "Email addresses": "电子邮箱地址",
@@ -1253,10 +1173,6 @@
     "Encryption": "加密",
     "Once enabled, encryption cannot be disabled.": "一旦启用加密就无法停止。",
     "Encrypted": "已加密",
-    "Some devices for this user are not trusted": "此用户的某些设备不被信任",
-    "Some devices in this encrypted room are not trusted": "此加密聊天室中的某些设备不被信任",
-    "All devices for this user are trusted": "此用户的所有设备都已被信任",
-    "All devices in this encrypted room are trusted": "此聊天室中的所有设备都已被信任",
     "Never lose encrypted messages": "永不丢失加密消息",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "此聊天室中的消息已被端对端加密保护。只有您和拥有密钥的收件人才可以于都这些消息。",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "安全地备份您的密钥以免丢失。<a>了解更多。</a>",
@@ -1273,8 +1189,6 @@
     "Error updating flair": "更新个性徽章时发生错误",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "更新此聊天室的个性徽章时发生错误。可能时该服务器不允许，也可能是发生了一个临时错误。",
     "Room avatar": "聊天室头像",
-    "Upload room avatar": "上传聊天室头像",
-    "No room avatar": "没有聊天室头像",
     "Room Name": "聊天室名称",
     "Room Topic": "聊天室话题",
     "Join": "加入",
@@ -1295,7 +1209,6 @@
     "Waiting for %(userId)s to confirm...": "等待 %(userId)s 确认中...",
     "Use two-way text verification": "使用双向文本验证",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "验证此用户并标记为受信任。在使用端到端加密消息时，信任用户可让您更加放心。",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "验证此用户将会标记其设备为受信任，而且您的设备也会被对方标记为受信任。",
     "Waiting for partner to confirm...": "等待对方确认中...",
     "Incoming Verification 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 的成员列表延迟加载设置。目前版本中延迟加载功能已被停用。因为本地缓存在这两个设置项上不相容，Riot 需要重新同步您的账号。",
@@ -1325,7 +1238,6 @@
     "This looks like a valid recovery key!": "看起来是有效的恢复密钥！",
     "Not a valid 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>": "如果忘记了恢复密码，您可以 <button>设置新的恢复选项</button>",
     "Share Permalink": "分享永久链接",
     "Clear status": "清除状态",
     "Update status": "更新状态",
@@ -1366,7 +1278,6 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "一封验证电子邮件将发送到您的邮箱以确认您设置了新密码。",
     "Sign in instead": "登入",
     "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.": "您已从所有设备登出且不会再收到推送通知。要重新开启通知，请在各个设备上再次登入。",
     "Set a new password": "设置新密码",
     "Invalid homeserver discovery response": "无效的主服务器搜索响应",
     "Invalid identity server discovery response": "无效的身份服务器搜索响应",
@@ -1392,15 +1303,11 @@
     "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.": "作为一张安全网，您可以使用它来还原您的加密消息历史记录。",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "恢复密钥是您的一张安全网 - 如果忘记了密码，您可以用它来重获加密消息的访问权。",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "请将您的恢复密钥保存在某个非常安全的地方，比如密码管理器（或保险箱）",
     "Your Recovery Key": "您的恢复密钥",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "您的恢复密钥已 <b>复制到剪贴板</b>，粘贴至：",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "您的恢复密钥保存在 <b>下载</b> 文件夹。",
     "<b>Print it</b> and store it somewhere safe": "<b>打印</b> 并存放在安全的地方",
     "<b>Save it</b> on a USB key or backup drive": "<b>保存</b> 在 U 盘或备份磁盘中",
     "<b>Copy it</b> to your personal cloud storage": "<b>复制</b> 到您的个人云端存储",
     "Your keys are being backed up (the first backup could take a few minutes).": "正在备份您的密钥（第一次备份可能会花费几分钟时间）。",
-    "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": "设置安全消息恢复",
     "Secure your backup with a passphrase": "使用密码保护您的备份",
     "Confirm your passphrase": "确认你的密码",
@@ -1415,11 +1322,8 @@
     "New Recovery Method": "新恢复方式",
     "A new recovery passphrase and key for Secure Messages have been detected.": "检测到安全消息的一个新恢复密码和密钥。",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您没有设置新恢复方式，可能有攻击者正试图侵入您的账号。请立即更改您的账号密码并在设置中设定一个新恢复方式。",
-    "This device is encrypting history using the new recovery method.": "此设备正在使用新恢复方式来加密历史记录。",
     "Set up Secure Messages": "设置安全消息",
     "Recovery Method Removed": "恢复方式已移除",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "此设置已检测到您的安全消息的恢复密码和密钥被移除。",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "如果您意外执行了此操作，您可以在此设备上设置安全消息来使用新恢复方式重新加密此设备上的消息历史记录。",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您没有移除该恢复方式，可能有攻击者正试图侵入您的账号。请立即更改您的账号密码并在设置中设定一个新的恢复方式。",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "将 ¯\\_(ツ)_/¯ 添加到纯文本消息中",
     "User %(userId)s is already in the room": "用户 %(userId)s 已在聊天室中",
@@ -1448,18 +1352,11 @@
     "Power level": "权限级别",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社区？ <a>架设您自己的服务器</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "请安装 <chromeLink>Chrome</chromeLink>，<firefoxLink>Firefox</firefoxLink>，或 <safariLink>Safari</safariLink> 以获得最佳体验。",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "更改您的密码将会重置您所有设备上的端对端加密密钥，让已加密的聊天历史记录无法读取。在重设密码之前，请设置密钥备份或从其他设备导出您的聊天室密钥。",
-    "Room upgrade confirmation": "聊天室升级确认",
-    "Upgrading a room can be destructive and isn't always necessary.": "升级聊天室可能具有破坏性，并不总是必要的。",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "如果聊天室版本被视为是 <i>不稳定</i> 的，通常建议进行聊天室升级。不稳定的聊天室版本可能含有 bug ，缺少功能或有安全漏洞。",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "聊天室升级通常只会影响聊天室 <i>服务器端</i> 的处理。如果您的 Riot 客户端存在问题，请向 <issueLink /> 提 issue。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升级聊天室 <i>不会自动将聊天室成员转移到新版聊天室中。</i> 我们将会在旧版聊天室中发布一个新版聊天室的链接 - 聊天室成员必须点击该链接以加入新聊天室。",
     "Adds a custom widget by URL to the room": "用链接方式为聊天室添加自定义小部件",
     "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的小部件链接",
     "You cannot modify widgets in this room.": "您无法修改此聊天室的小部件。",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s 撤销了对 %(targetDisplayName)s 加入聊天室的邀请。",
-    "Enable desktop notifications for this device": "为此设备启用桌面通知",
-    "Enable audible notifications for this device": "为此设备启用通知声音",
     "Upgrade this room to the recommended room version": "升级此聊天室至推荐版本",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "此聊天室运行的聊天室版本是 <roomVersion /> ，该版本已被主服务器标记为 <i>不稳定</i> 。",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "升级此聊天室将会关闭聊天室的当前实例并创建一个具有相同名称的升级版聊天室。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 4a70441317..35f4a14414 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -36,7 +36,6 @@
     "Decryption error": "解密出錯",
     "Default": "預設",
     "Device ID": "裝置識別碼",
-    "Devices": "裝置列表",
     "Direct chats": "私聊",
     "Disinvite": "取消邀請",
     "Displays action": "顯示操作",
@@ -78,17 +77,14 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s 從 %(fromPowerLevel)s 變為 %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "游客不能加入此聊天室，即使有人主動邀請。.",
     "Hangup": "掛斷",
-    "Hide Text Formatting Toolbar": "隱藏格式工具欄",
     "Historical": "歷史",
     "Homeserver is": "主伺服器是",
     "Identity Server is": "身分認證伺服器是",
     "I have verified my email address": "我已經驗證了我的電子郵件地址",
     "Import E2E room keys": "導入聊天室端對端加密密鑰",
     "Incorrect verification code": "驗證碼錯誤",
-    "Invalid alias format": "別名格式錯誤",
     "Invalid Email Address": "無效的電子郵件地址",
     "Invalid file%(extra)s": "非法文件%(extra)s",
-    "Invite new room members": "邀請新的聊天室成員",
     "Join Room": "加入聊天室",
     "%(targetName)s joined the room.": "%(targetName)s 加入了聊天室。.",
     "Jump to first unread message.": "跳到第一則未讀訊息。",
@@ -105,8 +101,6 @@
     "Search": "搜尋",
     "Search failed": "搜索失敗",
     "Searches DuckDuckGo for results": "搜尋 DuckDuckGo",
-    "Sender device information": "發送者的裝置資訊",
-    "Send Invites": "傳送邀請",
     "Send Reset Email": "發送密碼重設郵件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 傳了一張圖片。",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 傳送了加入聊天室的邀請。",
@@ -125,13 +119,11 @@
     "%(count)s of your messages have not been sent.|other": "部分訊息未送出。",
     "Someone": "某人",
     "Start a chat": "建立聊天",
-    "Start Chat": "開始聊天",
     "Submit": "提交",
     "Success": "成功",
     "This email address is already in use": "這個電子郵件地址已被使用",
     "This email address was not found": "未找到此電子郵件地址",
     "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 啟用端對端加密 (algorithm %(algorithm)s).",
     "Unable to add email address": "無法新增電郵地址",
     "Unable to capture screen": "無法截取畫面",
     "Unable to enable Notifications": "無法啟用通知功能",
@@ -164,7 +156,6 @@
     "Anyone": "任何人",
     "Command error": "指令出錯",
     "Commands": "指令",
-    "Device ID:": "裝置 ID:",
     "device id: ": "裝置 ID： ",
     "Reason": "原因",
     "Register": "註冊",
@@ -202,7 +193,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了聊天室名稱。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 已經變更主題為「%(topic)s」。",
     "Changes your display nickname": "變更您的顯示暱稱",
-    "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.": "目前變更密碼將會重設在所有裝置上的端對端加密金鑰，讓加密的聊天歷史無法讀取，除非您先匯出您的房間金鑰，並在稍後重新匯入它們。這會在未來改進。",
     "Claimed Ed25519 fingerprint key": "已索取 Ed25519 指紋金鑰",
     "Click to mute audio": "點選以靜音",
     "Click to mute video": "點選以讓視訊靜音",
@@ -215,12 +205,9 @@
     "Custom level": "自訂等級",
     "Decline": "拒絕",
     "Deops user with given id": "取消指定 ID 使用者的管理員權限",
-    "Device already verified!": "裝置已驗證！",
-    "Device key:": "裝置金鑰：",
     "Disable Notifications": "停用通知",
     "Drop File Here": "在此放置檔案",
     "Enable Notifications": "啟用通知",
-    "Encrypted by an unverified device": "已透過未驗證過的裝置加密",
     "Enter passphrase": "輸入通關密語",
     "Error: Problem communicating with the given homeserver.": "錯誤：與指定的家伺服器有通訊問題。",
     "Export": "匯出",
@@ -237,7 +224,6 @@
     "Invited": "已邀請",
     "Invites": "邀請",
     "Invites user with given id to current room": "邀請指定 ID 的使用者到目前的聊天室",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' 不是別名的有效格式",
     "Sign in with": "登入使用",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "加入為<voiceText>語音</voiceText>或<videoText>視訊</videoText>。",
     "Joins room with given alias": "以指定的別名加入聊天室",
@@ -254,16 +240,10 @@
     "%(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) 。",
     "Manage Integrations": "管理整合",
-    "Markdown is disabled": "Markdown 已停用",
-    "Markdown is enabled": "Markdown 已啟用",
-    "matrix-react-sdk version:": "matrix-react-sdk 版本：",
-    "Message not sent due to unknown devices being present": "因為未知的裝置存在而未傳送",
     "Missing room_id in request": "在要求中遺失聊天室 ID",
     "Missing user_id in request": "在要求中遺失使用者 ID",
     "Moderator": "仲裁者",
     "Name": "名稱",
-    "Never send encrypted messages to unverified devices from this device": "從不自此裝置傳送加密的訊息到未驗證的裝置",
-    "Never send encrypted messages to unverified devices in this room from this device": "從不在此聊天室中從此裝置上傳送未加密的訊息到未驗證的裝置",
     "New address (e.g. #foo:%(localDomain)s)": "新地址（例如：#foo:%(localDomain)s）",
     "New passwords don't match": "新密碼不相符",
     "New passwords must match each other.": "新密碼必須互相符合。",
@@ -272,7 +252,6 @@
     "(not supported by this browser)": "（不被此瀏覽器支援）",
     "<not supported>": "<不支援>",
     "NOT verified": "未驗證",
-    "No devices with registered encryption keys": "沒有已註冊的加密金鑰的裝置",
     "No display name": "沒有顯示名稱",
     "No more results": "沒有更多結果",
     "No results": "沒有結果",
@@ -281,7 +260,6 @@
     "Only people who have been invited": "僅有被邀請的夥伴",
     "Password": "密碼",
     "Passwords can't be empty": "密碼不能為空",
-    "People": "夥伴",
     "Permissions": "權限",
     "Phone": "電話",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "請檢查您的電子郵件並點選其中包含的連結。只要這個完成了，就點選選繼續。",
@@ -298,16 +276,13 @@
     "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
     "Results from DuckDuckGo": "DuckDuckGo 的結果",
-    "Room contains unknown devices": "包含了未知裝置的房間",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此時無法存取。",
     "Save": "儲存",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s 在 %(dateTime)s 時看過",
     "Send anyway": "無論如何都要傳送",
-    "Show Text Formatting Toolbar": "顯示文字格式化工具列",
     "Start authentication": "開始認證",
     "The phone number entered looks invalid": "輸入的電話號碼看起來無效",
-    "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 remote side failed to pick up": "遠端未能接聽",
     "This room has no local addresses": "此房間沒有本機地址",
     "This room is not recognised.": "此聊天室不被認可。",
@@ -322,17 +297,12 @@
     "Unable to verify email address.": "無法驗證電子郵件。",
     "Unban": "解除禁止",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除阻擋 %(targetName)s。",
-    "Unable to load device list": "無法載入裝置清單",
-    "Undecryptable": "無法解密",
     "unencrypted": "未加密",
-    "Unencrypted message": "未加密的訊息",
     "unknown caller": "不明來電",
     "unknown device": "未知的裝置",
     "Unknown room %(roomId)s": "未知的房間 %(roomId)s",
-    "Unknown (user, device) pair:": "未知的（使用者，裝置）配對：",
     "Unmute": "解除靜音",
     "Unnamed Room": "未命名的聊天室",
-    "Unrecognised command:": "無法識別的命令：",
     "Unrecognised room alias:": "無法辨識的聊天室別名：",
     "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上傳 %(filename)s 與另外 %(count)s 個",
@@ -360,11 +330,8 @@
     "(no answer)": "（未回覆）",
     "(unknown failure: %(reason)s)": "（未知的錯誤：%(reason)s）",
     "Warning!": "警告！",
-    "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」。這可能代表您的通訊已被攔截！",
     "Who can access this room?": "誰可以存取此房間？",
     "Who can read history?": "誰可以讀取歷史紀錄？",
-    "Who would you like to communicate with?": "您想與誰通訊？",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 撤回了 %(targetName)s 的邀請。",
     "You do not have permission to post to this room": "您沒有權限在此房間發言",
     "You have <a>disabled</a> URL previews by default.": "您已預設<a>停用</a> URL 預覽。",
@@ -374,7 +341,6 @@
     "You need to be able to invite users to do that.": "您需要邀請使用者來做這件事。",
     "You need to be logged in.": "您需要登入。",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "您的電子郵件地址似乎未在此主伺服器上與 Matrix ID 關聯。",
-    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "您的密碼已成功變更。您將不會在其他裝置上收到推送通知，一直到您登入回那些裝置為止",
     "You seem to be in a call, are you sure you want to quit?": "您似乎尚在通話中，您確定您想要結束通話嗎？",
     "You seem to be uploading files, are you sure you want to quit?": "您似乎正在上傳檔案，您確定您想要結束嗎？",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "您將無法復原此變更，因為您正在將其他使用者的權限等級提升到與您相同。",
@@ -409,8 +375,6 @@
     "(~%(count)s results)|one": "（~%(count)s 結果）",
     "(~%(count)s results)|other": "（~%(count)s 結果）",
     "Active call": "活躍的通話",
-    "bold": "粗體",
-    "italic": "斜體",
     "Please select the destination room for this message": "請選取此訊息的目標房間",
     "New Password": "新密碼",
     "Start automatically after system login": "在系統登入後自動開始",
@@ -436,18 +400,9 @@
     "Unknown error": "未知的錯誤",
     "Incorrect password": "不正確的密碼",
     "To continue, please enter your 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.": "若其符合，按下下面的驗證按鈕。若其不符合，那麼就是有其他人試圖攔截此裝置，您應該按下黑名單按鈕。",
-    "Verify device": "驗證裝置",
     "I verify that the keys match": "我驗證金鑰相符",
     "Unable to restore 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，您的工作階段可能與此版本不相容。關閉此視窗並回到較新的版本。",
-    "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.": "我們建議您對每一個裝置執行驗證過程以確認它們屬於其合法擁有者，但若您想要的話，您也可以重新傳送訊息而不必驗證它們。",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "「%(RoomName)s」包含了您先前沒看過的裝置。",
-    "Unknown devices": "未知的裝置",
     "Unknown Address": "未知的地址",
     "Unblacklist": "解除黑名單",
     "Blacklist": "黑名單",
@@ -474,8 +429,6 @@
     "Start verification": "開始驗證",
     "Share without verifying": "不驗證就分享",
     "Ignore request": "忽略請求",
-    "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' 正在請求加密金鑰。",
     "Encryption key request": "加密金鑰請求",
     "Add a widget": "新增小工具",
     "Allow": "允許",
@@ -494,8 +447,6 @@
     "Unable to create widget.": "無法建立小工具。",
     "You are not in this room.": "您不在這個聊天室內。",
     "You do not have permission to do that in this room.": "您沒有在這個聊天室做這件事的權限。",
-    "Verifies a user, device, and pubkey tuple": "驗證使用者、裝置與公開金鑰變數組",
-    "Loading device info...": "正在載入裝置資訊……",
     "Example": "範例",
     "Create": "建立",
     "Featured Rooms:": "特色聊天室：",
@@ -509,7 +460,6 @@
     "Failed to copy": "複製失敗",
     "Add rooms to this community": "新增聊天室到此社群",
     "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.": "此聊天室有未知的裝置：若您想要不驗證它們而繼續，可能會有其他人竊聽您的通話。",
     "Review Devices": "審閱裝置",
     "Call Anyway": "無論如何都通話",
     "Answer Anyway": "無論如何都回覆",
@@ -540,8 +490,6 @@
     "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 預覽",
-    "Delete %(count)s devices|other": "刪除 %(count)s 個裝置",
-    "Delete %(count)s devices|one": "刪除裝置",
     "%(senderName)s sent an image": "%(senderName)s 傳送了一張圖片",
     "%(senderName)s sent a video": "%(senderName)s 傳送了一則視訊",
     "%(senderName)s uploaded a file": "%(senderName)s 上傳了一個檔案",
@@ -747,7 +695,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
     "Community IDs cannot be empty.": "社群 ID 不能為空。",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
@@ -756,11 +703,7 @@
     "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.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
     "Clear filter": "清除過濾器",
-    "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>。",
     "Code": "代碼",
     "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 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
     "Submit debug logs": "傳送除錯訊息",
@@ -826,7 +769,6 @@
     "Files": "檔案",
     "Collecting app version information": "收集應用程式版本資訊",
     "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.": "這讓您可以在登入後回到您帳號，並在其他裝置上登入。",
     "Enable notifications for this account": "本帳號啟用通知",
     "Invite to this community": "邀請至此社群",
     "Messages containing <span>keywords</span>": "訊息包含 <span>關鍵字</span>",
@@ -912,8 +854,6 @@
     "Your User Agent": "您的使用者代理字串",
     "Your device resolution": "您的裝置解析度",
     "Always show encryption icons": "總是顯示加密圖示",
-    "Unable to reply": "無法回覆",
-    "At this time it is not possible to reply with an emote.": "目前無法使用表情符號回覆。",
     "Popout widget": "彈出式小工具",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "無法載入要回覆的活動，它可能不存在或是您沒有權限檢視它。",
     "Send Logs": "傳送紀錄",
@@ -964,12 +904,6 @@
     "Permission Required": "需要權限",
     "You do not have permission to start a conference call in this room": "您沒有在此聊天室啟動會議通話的權限",
     "This event could not be displayed": "此活動無法顯示",
-    "deleted": "刪除線",
-    "underlined": "底線",
-    "inline-code": "內嵌程式碼",
-    "block-quote": "區塊引用",
-    "bulleted-list": "項目符號清單",
-    "numbered-list": "編號清單",
     "A call is currently being placed!": "目前正在撥打電話！",
     "Failed to remove widget": "移除小工具失敗",
     "An error ocurred whilst trying to remove the widget from the room": "嘗試從聊天室移除小工具時發生錯誤",
@@ -1025,11 +959,6 @@
     "Unable to load! Check your network connectivity and try again.": "無法載入！請檢查您的網路連線狀態並再試一次。",
     "Delete Backup": "刪除備份",
     "Unable to load key backup status": "無法載入金鑰備份狀態",
-    "Backup has a <validity>valid</validity> signature from this device": "備份有從此裝置而來的<validity>有效</validity>簽章",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> device <device></device>": "備份有從<verify>未驗證的</verify> <device></device> 裝置而來的<validity>有效</validity>簽章",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> device <device></device>": "備份有從<verify>已驗證的</verify> <device></device> 裝置而來的<validity>無效</validity>簽章",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> device <device></device>": "備份有從<verify>未驗證的</verify> <device></device> 裝置而來的<validity>無效</validity>簽章",
-    "Backup is not signed by any of your devices": "備份未被您的任何裝置簽署",
     "Backup version: ": "備份版本： ",
     "Algorithm: ": "演算法： ",
     "Please review and accept all of the homeserver's policies": "請審閱並接受家伺服器的所有政策",
@@ -1047,12 +976,9 @@
     "Your Recovery Key": "您的復原金鑰",
     "Copy to clipboard": "複製到剪貼簿",
     "Download": "下載",
-    "Your Recovery Key has been <b>copied to your clipboard</b>, paste it to:": "您的復原金鑰已<b>複製到您的剪貼簿</b>，將它貼上到：",
-    "Your Recovery Key is in your <b>Downloads</b> folder.": "您的復原金鑰在您的<b>下載</b>資料夾。",
     "<b>Print it</b> and store it somewhere safe": "<b>列印它</b>並存放在安全的地方",
     "<b>Save it</b> on a USB key or backup drive": "<b>將它儲存</b>到 USB 金鑰或備份磁碟上",
     "<b>Copy it</b> to your personal cloud storage": "<b>將它複製</b> 到您的個人雲端儲存",
-    "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": "設定安全訊息復原",
     "Keep it safe": "保持安全",
     "Create Key Backup": "建立金鑰備份",
@@ -1071,7 +997,6 @@
     "This looks like a valid recovery key!": "看起來是有效的復原金鑰！",
     "Not a valid 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>": "如果您忘記您的復原密碼，您可以<button>設定新的復原選項</button>",
     "Failed to perform homeserver discovery": "執行家伺服器探索失敗",
     "Invalid homeserver discovery response": "無效的家伺服器探索回應",
     "Sign in with single sign-on": "以單一登入來登入",
@@ -1119,7 +1044,6 @@
     "That doesn't look like a valid email address": "看起來不像有效的電子郵件地址",
     "Invalid identity server discovery response": "無效的身份伺服器探索回應",
     "General failure": "一般錯誤",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> device <device></device>": "備份有從<verify>驗證過的</verify>裝置<device></device>而來的<validity>有效</validity>簽章",
     "Checking...": "正在檢查……",
     "New Recovery Method": "新復原方法",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您沒有設定新的復原方法，攻擊者可能會嘗試存取您的帳號。在設定中立刻變更您的密碼並設定新的復原方法。",
@@ -1164,20 +1088,17 @@
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "與此使用者的安全訊息是端到端加密的，無法被第三方讀取。",
     "Got It": "我了解了",
     "Verify this user by confirming the following number appears on their screen.": "透過確認在他們的螢幕上顯示的以下號碼來驗證此使用者。",
-    "For maximum security, we recommend you do this in person or use another trusted means of communication.": "為了最大限度地提高安全性，我們建議您面對面執行這個動作，或是使用其他可信的通訊方式。",
     "Yes": "是",
     "No": "否",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "我們已經傳送給您一封電子郵件以驗證您的地址。請遵照那裡的指示，然後點選下面的按鈕。",
     "Email Address": "電子郵件地址",
     "Backing up %(sessionsRemaining)s keys...": "正在備份 %(sessionsRemaining)s 金鑰……",
     "All keys backed up": "所有金鑰都已備份",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "備份有從<verify>未知</verify>裝置，ID %(deviceId)s 而來的簽章。",
     "Add an email address to configure email notifications": "新增電子郵件地址以設定電子郵件通知",
     "Unable to verify phone number.": "無法驗證電話號碼。",
     "Verification code": "驗證碼",
     "Phone Number": "電話號碼",
     "Profile picture": "個人檔案照片",
-    "Upload profile picture": "上傳個人檔案照片",
     "Display Name": "顯示名稱",
     "Room information": "聊天室資訊",
     "Internal room ID:": "內部聊天室 ID：",
@@ -1220,8 +1141,6 @@
     "Voice & Video": "語音與視訊",
     "Main address": "主要地址",
     "Room avatar": "聊天室大頭貼",
-    "Upload room avatar": "上傳聊天室大頭貼",
-    "No room avatar": "沒有聊天室大頭貼",
     "Room Name": "聊天室名稱",
     "Room Topic": "聊天室主題",
     "Join": "加入",
@@ -1231,7 +1150,6 @@
     "Waiting for partner to accept...": "正在等待夥伴接受……",
     "Use two-way text verification": "使用雙向文字驗證",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "驗證此使用者以標記他們為受信任的。信任的使用者可以在使用端到端加密訊息時能更加放心。",
-    "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "驗證此使用者會將他們的裝置標記為受信任，並為他們標記您的裝置為受信任。",
     "Waiting for partner to confirm...": "正在等待夥伴確認……",
     "Incoming Verification Request": "來到的驗證請求",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "要協助避免重覆的問題，請先<existingIssuesLink>檢視既有的議題</existingIssuesLink>（並新增 a+1）或是如果您找不到的話，就<newIssueLink>建立新議題</newIssueLink>。",
@@ -1267,10 +1185,7 @@
     "Keep going...": "繼續……",
     "Starting backup...": "正在開始備份……",
     "A new recovery passphrase and key for Secure Messages have been detected.": "偵測到安全訊息的新復原通關密語與金鑰。",
-    "This device is encrypting history using the new recovery method.": "此裝置正在使用新的復原方法加密歷史紀錄。",
     "Recovery Method Removed": "已移除復原方法",
-    "This device has detected that your recovery passphrase and key for Secure Messages have been removed.": "此裝置已偵測到您的安全訊息復原通關密語與金鑰被移除。",
-    "If you did this accidentally, you can setup Secure Messages on this device which will re-encrypt this device's message history with a new recovery method.": "如果您意外執行了此動作，您可以在此裝置上設定安全訊息來使用新的復原方法重新加密此裝置上的訊息歷史。",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "如果您沒有移除復原方法，攻擊者可能會試圖存取您的帳號。請立刻在設定中變更您帳號的密碼並設定新的復原方式。",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "檔案 %(fileName)s 超過家伺服器的上傳限制",
     "Gets or sets the room topic": "取得或設定聊天室主題",
@@ -1329,7 +1244,6 @@
     "Book": "書",
     "Pencil": "鉛筆",
     "Paperclip": "迴紋針",
-    "Padlock": "掛鎖",
     "Key": "鑰匙",
     "Hammer": "鎚子",
     "Telephone": "電話",
@@ -1347,12 +1261,6 @@
     "Headphones": "耳機",
     "Folder": "資料夾",
     "Pin": "別針",
-    "Your homeserver does not support device management.": "您的家伺服器不支援裝置管理。",
-    "This backup is trusted because it has been restored on this device": "因為此備份已在此裝置上復原，所以其被信任",
-    "Some devices for this user are not trusted": "此使用者的某些裝置不被信任",
-    "Some devices in this encrypted room are not trusted": "此已加密的聊天室中的某些裝置不被信任",
-    "All devices for this user are trusted": "此使用者的所有裝置都被信任",
-    "All devices in this encrypted room are trusted": "此已加密的聊天室中的所有裝置都被信任",
     "Recovery Key Mismatch": "復原金鑰不符合",
     "Incorrect Recovery Passphrase": "不正確的復原通關密語",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "備份無法使用此通關密語解密：請驗證您是否輸入正確的復原通關密語。",
@@ -1362,7 +1270,6 @@
     "This homeserver does not support communities": "此家伺服器不支援社群",
     "A verification email will be sent to your inbox to confirm setting your new password.": "一封驗證用的電子郵件已經傳送到您的收件匣以確認您設定了新密碼。",
     "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.": "您已從所有裝置登出，不會再收到推播通知了。要重新啟用通知，請再次於每個裝置上登入。",
     "This homeserver does not support login using email address.": "此家伺服器不支援使用電子郵件地址登入。",
     "Registration has been disabled on this homeserver.": "註冊已在此家伺服器上停用。",
     "Unable to query for supported registration methods.": "無法查詢支援的註冊方法。",
@@ -1370,9 +1277,7 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "您確定嗎？如果您的金鑰沒有正確備份的話，您將會遺失您的加密訊息。",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "加密訊息是使用端到端加密。只有您和接收者才有金鑰可以閱讀這些訊息。",
     "Restore from Backup": "從備份復原",
-    "This device is backing up your keys. ": "此裝置正在備份您的金鑰。 ",
     "Back up your keys before signing out to avoid losing them.": "在登出前備份您的金鑰以避免遺失它們。",
-    "Your keys are <b>not being backed up from this device</b>.": "您的金鑰<b>並未從此裝置上備份</b>。",
     "Start using Key Backup": "開始使用金鑰備份",
     "Credits": "感謝",
     "Never lose encrypted messages": "永不遺失加密訊息",
@@ -1393,7 +1298,6 @@
     "Set up with a Recovery Key": "使用復原金鑰設定",
     "Please enter your passphrase a second time to confirm.": "請再次輸入您的通關密語以確認。",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "您的復原金鑰是安全網，如果您忘記您的通關密語的話，您還可以使用它來復原您對加密訊息的存取權。",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe)": "把您的復原金鑰放在安全的地方，像是密碼管理員（或保險箱）",
     "Your keys are being backed up (the first backup could take a few minutes).": "您的金鑰正在備份（第一次備份會花費數分鐘）。",
     "Secure your backup with a passphrase": "使用通關密語保障您備份的安全",
     "Confirm your passphrase": "確認您的通關密語",
@@ -1448,18 +1352,11 @@
     "Power level": "權力等級",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社群？<a>架設您自己的伺服器</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以獲得最佳體驗。",
-    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "變更您的密碼將會重設在您所有裝置上的端到端加密金鑰，讓已加密的聊天歷史紀錄無法讀取。在重設您的密碼前，請設定金鑰備份或從其他裝置匯出您的聊天室金鑰。",
-    "Room upgrade confirmation": "確認聊天室升級",
-    "Upgrading a room can be destructive and isn't always necessary.": "升級聊天室可能會弄壞某些東西，而且不一定必要。",
-    "Room upgrades are usually recommended when a room version is considered <i>unstable</i>. Unstable room versions might have bugs, missing features, or security vulnerabilities.": "聊天室升級通常建議在聊天室版本<i>不穩定</i>時使用。不穩定的聊天室版本可能會有臭蟲、缺少功能或安全問題。",
-    "Room upgrades usually only affect <i>server-side</i> processing of the room. If you're having problems with your Riot client, please file an issue with <issueLink />.": "聊天室升級通常只會影響聊天室的<i>伺服器端</i>處理方式。如果您在使用 Riot 客戶端時發生問題，請使用 <issueLink /> 回報問題。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升級聊天室<i>不會自動將聊天室成員遷移到新版的聊天室<i>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
     "Adds a custom widget by URL to the room": "透過 URL 新增自訂小工具到聊天室",
     "Please supply a https:// or http:// widget URL": "請提供 https:// 或 http:// 小工具 URL",
     "You cannot modify widgets in this room.": "您無法在此聊天室中修改小工具。",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s 撤銷了對 %(targetDisplayName)s 加入此聊天室的邀請。",
-    "Enable desktop notifications for this device": "為此裝置啟用桌面通知",
-    "Enable audible notifications for this device": "為此裝置啟用音訊通知",
     "Upgrade this room to the recommended room version": "升級此聊天室到建議的聊天室版本",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "此聊天室正在執行聊天室版本 <roomVersion />，此家伺服器已標記為<i>不穩定</i>。",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "升級此聊天室將會關閉聊天室目前的實體，並建立一個同名的升級版。",
@@ -1504,8 +1401,6 @@
     "A conference call could not be started because the integrations server is not available": "因為沒有整合的伺服器，所以無法啟動會議通話",
     "The server does not support the room version specified.": "伺服器不支援指定的聊天室版本。",
     "Name or Matrix ID": "名稱或 Matrix ID",
-    "Email, name or Matrix ID": "電子郵件、名稱或 Matrix ID",
-    "Please confirm that you'd like to go forward with upgrading this room from <oldVersion /> to <newVersion />.": "請確認您想繼續升級此聊天室，從 <oldVersion /> 到 <newVersion />。",
     "Changes your avatar in this current room only": "僅在目前的聊天室中變更您的大頭貼",
     "Unbans user with given ID": "取消阻擋指定 ID 的使用者",
     "Sends the given message coloured as a rainbow": "將給定的訊息以彩虹顏色的方式傳送",
@@ -1515,10 +1410,6 @@
     "The user's homeserver does not support the version of the room.": "使用者的主伺服器不支援此聊天室版本。",
     "Show hidden events in timeline": "顯示時間軸中隱藏的活動",
     "When rooms are upgraded": "當聊天室升級時",
-    "This device is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "此裝置<b>並未備份您的金鑰</b>，但您有既有的備份，可以從那裡復原並繼續。",
-    "Connect this device to key backup before signing out to avoid losing any keys that may only be on this device.": "在登出前連線此裝置以避免遺失任何可能僅在此裝置上存在的金鑰。",
-    "Connect this device to Key Backup": "將此裝置連線到金鑰備份",
-    "Backup has an <validity>invalid</validity> signature from this device": "從此裝置而來的備份有<validity>無效</validity>的簽章",
     "this room": "此聊天室",
     "View older messages in %(roomName)s.": "檢視 %(roomName)s 中較舊的訊息。",
     "Joining room …": "正在加入聊天室……",
@@ -1614,19 +1505,15 @@
     "Resend removal": "重新傳送移除",
     "Your homeserver doesn't seem to support this feature.": "您的家伺服器似乎並不支援此功能。",
     "Changes your avatar in all rooms": "在所有聊天室變更您的大頭貼",
-    "Clear all data on this device?": "清除此裝置上所有的資料？",
     "You're signed out": "您已登出",
     "Clear all data": "清除所有資料",
     "Removing…": "正在移除……",
-    "Clearing all data from this device is permanent. Encrypted messages will be lost unless their keys have been backed up.": "清除從此裝置而來的所有資料將會是永久的。已加密的訊息將會遺失，除非它們的金鑰已備份。",
     "Failed to re-authenticate due to a homeserver problem": "因為家伺服器的問題，所以重新驗證失敗",
     "Failed to re-authenticate": "重新驗證失敗",
     "Enter your password to sign in and regain access to your account.": "輸入您的密碼以登入並取回對您帳號的控制權。",
     "Forgotten your password?": "忘記您的密碼了？",
     "Clear personal data": "清除個人資料",
-    "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "警告：您的個人資料（包含加密金鑰）仍儲存在此裝置上。如果您已不想要使用此裝置，或是想要登入其他帳號的話，就將其清除吧。",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "請告訴我們發生了什麼錯誤，或更好的是，在 GitHub 上建立描述問題的議題。",
-    "Regain access to your account and recover encryption keys stored on this device. Without them, you won’t be able to read all of your secure messages on any device.": "取回對您的帳號的控制權，並復原儲存在此裝置上的加密金鑰。沒有它們，您就無法在任何裝置上讀取您所有的安全訊息。",
     "Sign in and regain access to your account.": "登入並取回對您帳號的控制權。",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "您無法登入到您的帳號。請聯絡您的家伺服器管理員以取得更多資訊。",
     "Identity Server": "身份識別伺服器",
@@ -1637,7 +1524,6 @@
     "Service": "服務",
     "Summary": "摘要",
     "This account has been deactivated.": "此帳號已停用。",
-    "Failed to start chat": "啟動聊天失敗",
     "Messages": "訊息",
     "Actions": "動作",
     "Displays list of commands with usages and descriptions": "顯示包含用法與描述的指令清單",
@@ -1667,7 +1553,6 @@
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "您目前並未使用身份識別伺服器。要探索及被您所知既有的聯絡人探索，請在下方新增一個。",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "從您的身份識別伺服器斷開連線代表您不再能被其他使用者探索到，而且您也不能透過電子郵件或電話邀請其他人。",
     "Integration Manager": "整合管理員",
-    "To verify that this device can be trusted, please check that the key you see in User Settings on that device matches the key below:": "要驗證此裝置是否可受信任，請檢查您在裝置上的使用者設定裡看到的金鑰是否與下方的金鑰相同：",
     "Call failed due to misconfigured server": "因為伺服器設定錯誤，所以通話失敗",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "請詢問您家伺服器的管理員（<code>%(homeserverDomain)s</code>）以設定 TURN 伺服器讓通話可以正常運作。",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "或是您也可以試著使用公開伺服器 <code>turn.matrix.org</code>，但可能不夠可靠，而且會跟該伺服器分享您的 IP 位置。您也可以在設定中管理這個。",
@@ -1680,7 +1565,6 @@
     "The identity server you have chosen does not have any terms of service.": "您所選擇的身份識別伺服器沒有任何服務條款。",
     "Terms of service not accepted or the identity server is invalid.": "不接受服務條款或身份識別伺服器無效。",
     "Enter a new identity server": "輸入新的身份識別伺服器",
-    "A device's public name is visible to people you communicate with": "與您通訊的所有人都可以看到裝置的公開名稱",
     "Remove %(email)s?": "移除 %(email)s？",
     "Remove %(phone)s?": "移除 %(phone)s？",
     "Accept <policyLink /> to continue:": "接受 <policyLink /> 以繼續：",
@@ -1782,7 +1666,6 @@
     "Unread mentions.": "未讀提及。",
     "Show image": "顯示圖片",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "請在 GitHub 上<newIssueLink>建立新議題</newIssueLink>，這樣我們才能調查這個臭蟲。",
-    "Use the new, faster, composer for writing messages": "使用更新更快的 composer 來編寫訊息",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "家伺服器設定中遺失驗證碼公開金鑰。請向您的家伺服器管理員回報。",
     "Your email address hasn't been verified yet": "您的電子郵件位置尚未被驗證",
     "Click the link in the email you received to verify and then click continue again.": "點擊您收到的電子郵件中的連結以驗證然後再次點擊繼續。",
@@ -1872,16 +1755,11 @@
     "Custom (%(level)s)": "自訂 (%(level)s)",
     "Trusted": "已信任",
     "Not trusted": "不信任",
-    "Hide verified Sign-In's": "隱藏已驗證的登入",
-    "%(count)s verified Sign-In's|other": "%(count)s 個已驗證的登入",
-    "%(count)s verified Sign-In's|one": "1 個已驗證的登入",
     "Direct message": "直接訊息",
-    "Unverify user": "未驗證的使用者",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> 在 %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "在此聊天室中的訊息為端到端加密。",
     "Security": "安全",
     "Verify": "驗證",
-    "Send verification requests in direct message, including a new verification UX in the member panel.": "在直接訊息中傳送驗證請求，包含成員面板中新的驗證使用者體驗。",
     "Any of the following data may be shared:": "可能會分享以下資料：",
     "Your display name": "您的顯示名稱",
     "Your avatar URL": "您的大頭貼 URL",
@@ -1916,7 +1794,6 @@
     "Manage integrations": "管理整合",
     "Verification Request": "驗證請求",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Enable cross-signing to verify per-user instead of per-device (in development)": "啟用交叉簽章以驗證每個使者而非每個裝置（開發中）",
     "Match system theme": "符合系統佈景主題",
     "%(senderName)s placed a voice call.": "%(senderName)s 撥打了語音通話。",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s 撥打了語音通話。（不被此瀏覽器支援）",
@@ -1960,89 +1837,57 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 將封鎖符合 %(oldGlob)s 的規則更新為 %(newGlob)s，因為 %(reason)s",
     "Send cross-signing keys to homeserver": "將交叉簽章的金鑰傳送到家伺服器",
     "Cross-signing public keys:": "交叉簽章的公開金鑰：",
-    "on device": "在裝置上",
     "not found": "找不到",
     "Cross-signing private keys:": "交叉簽章的私密金鑰：",
     "in secret storage": "在秘密儲存空間中",
     "Secret storage public key:": "秘密儲存空間公開金鑰：",
     "in account data": "在帳號資料中",
-    "Bootstrap Secure Secret Storage": "Bootstrap 安全秘密儲存空間",
     "Cross-signing": "交叉簽章",
     "Enter secret storage passphrase": "輸入秘密儲存空間密碼",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的密碼。",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>警告</b>：您應該僅從信任的電腦存取秘密儲存空間。",
     "Cross-signing and secret storage are enabled.": "已啟用交叉簽章與秘密儲存空間。",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this device.": "您的帳號在秘密儲存空間中有交叉簽章的身份，但尚未被此裝置信任。",
     "Cross-signing and secret storage are not yet set up.": "尚未設定交叉簽章與秘密儲存空間。",
     "Bootstrap cross-signing and secret storage": "啟動交叉簽章與秘密儲存空間",
     "not stored": "未儲存",
     "Backup has a <validity>valid</validity> signature from this user": "備份有從此使用者而來的<validity>有效</validity>簽章",
     "Backup has a <validity>invalid</validity> signature from this user": "備份有從此使用者而來的<validity>無效</validity>簽章",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "備份有從<verify>未知的</verify>使用者而來，ID 為 %(deviceId)s 的簽章",
-    "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s": "備份有從<verify>未知的</verify>裝置而來，ID 為 %(deviceId)s 的簽章",
-    "Backup key stored in secret storage, but this feature is not enabled on this device. Please enable cross-signing in Labs to modify key backup state.": "備份金鑰儲存於秘密儲存空間中，但此功能未在此裝置上啟用。請在實驗室中啟用交叉簽章以修改金鑰備份狀態。",
     "Backup key stored: ": "備份金鑰已儲存： ",
-    "Start using Key Backup with Secure Secret Storage": "開始將金鑰備份與安全秘密儲存空間一起使用",
     "Hide verified sessions": "隱藏已驗證的工作階段",
     "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段",
     "%(count)s verified sessions|one": "1 個已驗證的工作階段",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your passphrase.": "透過輸入您的密碼來存取您的安全訊息歷史與您的交叉簽章身份並驗證其他裝置。",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "如果您忘記您的密碼，您可以<button1>使用您的復原金鑰</button1>或<button2>設定新的復原選項</button2>。",
     "Enter secret storage recovery key": "輸入秘密儲存空間復原金鑰",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的復原金鑰。",
-    "Access your secure message history and your cross-signing identity for verifying other devices by entering your recovery key.": "透過輸入您的復原金鑰來存取您的安全訊息歷史與您的交叉簽章身份並驗證其他裝置。",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "如果您忘記您的復原金鑰，您可以<button>設定新的復原選項</button>。",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "如果您忘記您的復原金鑰，您可以<button>設定新的復原選項</button>",
-    "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定秘密儲存空間。",
-    "We'll use secret storage to optionally store an encrypted copy of your cross-signing identity for verifying other devices and message keys on our server. Protect your access to encrypted messages with a passphrase to keep it secure.": "我們將會使用秘密儲存空間來選擇性儲存您用來驗證其他裝置與訊息金鑰的交叉簽章加密副本在我們的伺服器上。使用密碼來保護您對加密訊息的存取權以使其更安全。",
     "Set up with a recovery key": "設定復原金鑰",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "作為安全網，如果您忘記您的密碼的話，您可以使用它來恢復您對加密訊息的存取。",
     "As a safety net, you can use it to restore your access to encrypted messages.": "作為安全網，您可以使用它來恢復您對加密訊息的存取。",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "將您的復原金鑰保留在某個非常安全的地方，如密碼管理員（或保險櫃）中。",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "您的復原金鑰已被<b>複製到您的剪貼簿</b>，請將其貼到：",
     "Your recovery key is in your <b>Downloads</b> folder.": "您的復原金鑰在您的<b>下載</b>資料夾中。",
-    "Your access to encrypted messages is now protected.": "您對加密訊息的存取權已被保護。",
-    "Without setting up secret storage, you won't be able to restore your access to encrypted messages or your cross-signing identity for verifying other devices if you log out or use another device.": "沒有設定秘密儲存空間，您將無法恢復您的加密訊息的存取權，或是您在登出或使用其他裝置時，用以驗證其他裝置的交叉簽章身份。",
-    "Set up secret storage": "設定秘密儲存空間",
-    "Secure your encrypted messages with a passphrase": "使用密碼保護您的加密訊息",
     "Storing secrets...": "正在儲存秘密……",
     "Unable to set up secret storage": "無法設定秘密儲存空間",
     "Close preview": "關閉預覽",
-    "This user has not verified all of their devices.": "這個使用者尚未驗證所有裝置。",
-    "You have not verified this user. This user has verified all of their devices.": "您尚未驗證此使用者。此使用者已驗證所有裝置。",
-    "You have verified this user. This user has verified all of their devices.": "您已驗證此使用者。此使用者已驗證所有裝置。",
-    "Some users in this encrypted room are not verified by you or they have not verified their own devices.": "在此已加密的聊天室中的某些使用者尚未被您驗證，或是他們尚未驗證他們的裝置。",
-    "All users in this encrypted room are verified by you and they have verified their own devices.": "在此已加密的聊天室中的所有使用者已被您驗證，他們也已驗證所有裝置。",
     "Language Dropdown": "語言下拉式選單",
     "Country Dropdown": "國家下拉式選單",
     "The message you are trying to send is too large.": "您正試圖傳送的訊息太大了。",
-    "Secret Storage will be set up using your existing key backup details.Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將使用你既有的金鑰備份資訊來設定。您的秘密儲存空間密碼與復原金鑰會與您的金鑰備份相同",
-    "Migrate from Key Backup": "從金鑰備份導入",
     "Help": "說明",
-    "New DM invite dialog (under development)": "新的直接訊息邀請對話框（開發中）",
     "Show more": "顯示更多",
     "Recent Conversations": "最近的對話",
     "Direct Messages": "直接訊息",
-    "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請向他們詢問他們的使用者名稱，或是分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
     "Go": "到",
     "Show info about bridges in room settings": "顯示關於聊天室設定中橋接相關的資訊",
-    "This bridge was provisioned by <user />": "此橋接由 <user /> 配置",
     "This bridge is managed by <user />.": "此橋接由 <user /> 管理。",
-    "Bridged into <channelLink /> <networkLink />, on <protocolName />": "橋接於 <channelLink /> <networkLink />，在 <protocolName /> 上",
-    "Connected to <channelIcon /> <channelName /> on <networkIcon /> <networkName />": "連線到 <channelIcon /> <channelName /> 於 <networkIcon /> <networkName />",
-    "Connected via %(protocolName)s": "透過 %(protocolName)s 連線",
-    "Bridge Info": "橋接資訊",
-    "Below is a list of bridges connected to this room.": "以下是連線到此聊天室的橋接列表。",
     "Suggestions": "建議",
     "Failed to find the following users": "找不到以下使用者",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s",
     "Show a presence dot next to DMs in the room list": "在聊天室清單中的直接訊息旁顯示上線狀態點",
     "Lock": "鎖定",
-    "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "您的帳號已啟用金鑰備份，但並在此工作階段中設定。要設定秘密儲存空間，請還原金鑰備份。",
     "Restore": "還原",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰會與您的金鑰備份相同",
-    "Restore your Key Backup": "復原您的金鑰備份",
     "a few seconds ago": "數秒前",
     "about a minute ago": "大約一分鐘前",
     "%(num)s minutes ago": "%(num)s 分鐘前",
@@ -2065,11 +1910,7 @@
     "Session verified": "工作階段已驗證",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "您的新工作階段已驗證。其對您的已加密訊息有存取權，其他使用者也將會看到其受信任。",
     "Done": "完成",
-    "Without completing security on this device, it won’t have access to encrypted messages.": "此裝置上沒有完全安全性，其對已加密訊息沒有存取權。",
     "Go Back": "返回",
-    "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as they were for your key backup.": "秘密儲存空間將會使用您既有的金鑰備份詳細資訊設定。您的秘密儲存空間通關密語與復原金鑰將會與您的金鑰備份相同。",
-    "New Session": "新工作階段",
-    "New invite dialog": "新邀請對話框",
     "Other users may not trust it": "其他使用者可能不會信任它",
     "Later": "稍後",
     "Something went wrong trying to invite the users.": "在嘗試邀請使用者時發生錯誤。",
@@ -2078,9 +1919,7 @@
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "如果您找不到某人，請詢問他們的使用者名稱（範例：@user:server.com）或<a>分享此聊天室</a>。",
     "Verify User": "驗證使用者",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "為了提高安全性，請透過檢查您兩個裝置上的一次性代碼來驗證此使用者。",
-    "For maximum security, do this in person.": "為了取得最強的安全性，請親自進行。",
     "Start Verification": "開始驗證",
-    "Encrypted by a deleted device": "被已刪除的裝置加密",
     "Unknown Command": "未知的指令",
     "Unrecognised command: %(commandText)s": "無法識別的指令：%(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "您可以使用 <code>/help</code> 來列出可用的指令。您是要傳送此訊息嗎？",
@@ -2091,7 +1930,6 @@
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s 對此聊天室移除了 %(countRemoved)s 個並新增了 %(countAdded)s 地址到此聊天室",
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s 開啟了端到端加密。",
     "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s 開啟了端到端加密（無法識別的演算法 %(algorithm)s）。",
-    "Someone is using an unknown device": "某人正在使用未知的裝置",
     "This room is end-to-end encrypted": "此聊天室已端到端加密",
     "Everyone in this room is verified": "此聊天室中每個人都已驗證",
     "Invite only": "僅邀請",
@@ -2101,12 +1939,9 @@
     "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請詢問他們以取得他們的使用者名稱，分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
     "Enter your account password to confirm the upgrade:": "輸入您的帳號密碼以確認升級：",
     "You'll need to authenticate with the server to confirm the upgrade.": "您必須透過伺服器驗證以確認升級。",
-    "Upgrade this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "升級此裝置以允許其驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
-    "Set up encryption on this device to allow it to verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "在此裝置上設定加密以允許其驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "使用通關密語保護您的加密金鑰。為了取得最強的安全性，此通關密語應與您的帳號密碼不同：",
     "Enter a passphrase": "輸入通關密語",
     "Enter your passphrase a second time to confirm it.": "輸入您的通關密語兩次以確認。",
-    "This device can now verify other devices, granting them access to encrypted messages and marking them as trusted for other users.": "此裝置現在可以驗證其他裝置，並允許存取加密訊息以及將它們標記為受其他使用者信任。",
     "Verify other users in their profile.": "透過他們的簡介驗證其他使用者。",
     "Upgrade your encryption": "升級您的加密",
     "Set up encryption": "設定加密",

From 6f0d88a1262e16771074100bd7960fe961c36e67 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 16:54:08 +0000
Subject: [PATCH 0831/3235] Relax secret storage account data check

If the homeserver is confused about account data or otherwise explodes here, we
don't want to block login, so just warn in this case.
---
 src/components/structures/MatrixChat.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1b4d0e9609..233ec9e7bb 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1864,7 +1864,9 @@ export default createReactClass({
         try {
             masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
         } catch (e) {
-            if (e.errcode !== "M_NOT_FOUND") throw e;
+            if (e.errcode !== "M_NOT_FOUND") {
+                console.warn("Secret storage account data check failed", e);
+            }
         }
 
         if (masterKeyInStorage) {

From e403169e135a207f921ad48b5b36d20aa04f9ea2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Jan 2020 16:56:12 +0000
Subject: [PATCH 0832/3235] Fix various races that prevented the right panel
 being in the right state for verifications

Fixes https://github.com/vector-im/riot-web/issues/11989
---
 src/components/structures/RightPanel.js       | 22 ++++++++++++++++++-
 .../views/right_panel/EncryptionPanel.js      |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index be10ead7ca..8dd44e37d4 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -48,6 +48,7 @@ export default class RightPanel extends React.Component {
             phase: this._getPhaseFromProps(),
             isUserPrivilegedInGroup: null,
             member: this._getUserForPanel(),
+            verificationRequest: RightPanelStore.getSharedInstance().roomPanelPhaseParams.verificationRequest,
         };
         this.onAction = this.onAction.bind(this);
         this.onRoomStateMember = this.onRoomStateMember.bind(this);
@@ -68,15 +69,34 @@ export default class RightPanel extends React.Component {
         return this.props.user || lastParams['member'];
     }
 
+    // gets the current phase from the props and also maybe the store
     _getPhaseFromProps() {
         const rps = RightPanelStore.getSharedInstance();
+        const userForPanel = this._getUserForPanel();
         if (this.props.groupId) {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.groupPanelPhase)) {
                 dis.dispatch({action: "set_right_panel_phase", phase: RIGHT_PANEL_PHASES.GroupMemberList});
                 return RIGHT_PANEL_PHASES.GroupMemberList;
             }
             return rps.groupPanelPhase;
-        } else if (this._getUserForPanel()) {
+        } else if (userForPanel) {
+            // XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
+            // from its props and some from a store, expect if the contents of the store changes
+            // while it's mounted in which case it replaces all of its state with that of the store,
+            // expect it uses a dispatch instead of a normal store listener?
+            // Unfortunately rewriting this would almost certainly break showing the right panel
+            // in some of the many cases, and I don't have time to re-architect it and test all
+            // the flows now, so adding yet another special case so if the store thinks there is
+            // a verification going on for the member we're displaying, we show that, otherwise
+            // we race if a verification is started while the panel isn't displayed because we're
+            // not mounted in time to get the dispatch.
+            // Until then, let this code serve as a warning from history.
+            if (
+                userForPanel.userId === rps.roomPanelPhaseParams.member.userId &&
+                rps.roomPanelPhaseParams.verificationRequest
+            ) {
+                return rps.roomPanelPhase;
+            }
             return RIGHT_PANEL_PHASES.RoomMemberInfo;
         } else {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.roomPanelPhase)) {
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 6819db8e55..f25a55fa8a 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -36,7 +36,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
         setRequest(verificationRequest);
     }, [verificationRequest]);
 
-    const [phase, setPhase] = useState(undefined);
+    const [phase, setPhase] = useState(request.phase);
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {

From ad458722dcda6444edca663efba844e70c76e0c6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Jan 2020 17:58:23 +0100
Subject: [PATCH 0833/3235] evaluate on mount whether we need to call .verify()

as the request might be in phase started already.
---
 src/components/views/right_panel/VerificationPanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 6f580991f9..3527747a66 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -51,7 +51,7 @@ export default class VerificationPanel extends React.PureComponent {
     constructor(props) {
         super(props);
         this.state = {};
-        this._hasVerifier = !!props.request.verifier;
+        this._hasVerifier = false;
     }
 
     renderQRPhase(pending) {
@@ -234,6 +234,7 @@ export default class VerificationPanel extends React.PureComponent {
 
     componentDidMount() {
         this.props.request.on("change", this._onRequestChange);
+        this._onRequestChange();
     }
 
     componentWillUnmount() {

From de6ef9ec90536ac6e042e17502c3e3e174be85a1 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:51:51 +0000
Subject: [PATCH 0834/3235] words

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/structures/RightPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 8dd44e37d4..bf4e99ee51 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -81,7 +81,7 @@ export default class RightPanel extends React.Component {
             return rps.groupPanelPhase;
         } else if (userForPanel) {
             // XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
-            // from its props and some from a store, expect if the contents of the store changes
+            // from its props and some from a store, except if the contents of the store changes
             // while it's mounted in which case it replaces all of its state with that of the store,
             // expect it uses a dispatch instead of a normal store listener?
             // Unfortunately rewriting this would almost certainly break showing the right panel

From d63bb240aa45eaef28396f609eef7cb05dc1f98e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Jan 2020 17:52:12 +0000
Subject: [PATCH 0835/3235] those words again

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/structures/RightPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index bf4e99ee51..45722caa98 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -83,7 +83,7 @@ export default class RightPanel extends React.Component {
             // XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
             // from its props and some from a store, except if the contents of the store changes
             // while it's mounted in which case it replaces all of its state with that of the store,
-            // expect it uses a dispatch instead of a normal store listener?
+            // except it uses a dispatch instead of a normal store listener?
             // Unfortunately rewriting this would almost certainly break showing the right panel
             // in some of the many cases, and I don't have time to re-architect it and test all
             // the flows now, so adding yet another special case so if the store thinks there is

From 3ff3a3cebdff40e4e9890664c7a65aa5a427ec9a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 19:53:36 +0000
Subject: [PATCH 0836/3235] Fix delete button for one session

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e3738b1175..ea986e6324 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -561,6 +561,7 @@
     "Unable to load session list": "Unable to load session list",
     "Authentication": "Authentication",
     "Delete %(count)s sessions|other": "Delete %(count)s sessions",
+    "Delete %(count)s sessions|one": "Delete %(count)s session",
     "ID": "ID",
     "Public Name": "Public Name",
     "Last seen": "Last seen",

From d854afdfd436653b20ebc658ad07de75c3c0c668 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 29 Jan 2020 18:27:40 +0000
Subject: [PATCH 0837/3235] Translated using Weblate (Turkish)

Currently translated at 70.4% (1475 of 2095 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 1e4650fc32..a552296ac8 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -540,7 +540,7 @@
     "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
     "The platform you're on": "Bulunduğun platform",
     "The version of Riot.im": "Riot.im'in sürümü",
-    "Your language of choice": "",
+    "Your language of choice": "Dil seçeneği",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
     "Add Email Address": "E-posta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
@@ -1467,5 +1467,14 @@
     "Internal room ID:": "Dahili oda ID:",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Kullanıcının güç düzeyini değiştirirken bir hata oluştu. Yeterli izinlere sahip olduğunuza emin olun ve yeniden deneyin.",
     "Select the roles required to change various parts of the room": "Odanın çeşitli bölümlerini değişmek için gerekli rolleri seçiniz",
-    "Click the link in the email you received to verify and then click continue again.": "Aldığınız e-postaki bağlantıyı tıklayarak doğrulayın ve sonra tekrar tıklayarak devam edin."
+    "Click the link in the email you received to verify and then click continue again.": "Aldığınız e-postaki bağlantıyı tıklayarak doğrulayın ve sonra tekrar tıklayarak devam edin.",
+    "Verify this session": "Bu oturumu doğrula",
+    "Encryption upgrade available": "Şifreleme güncellemesi var",
+    "Set up encryption": "Şifrelemeyi ayarla",
+    "Unverified session": "Doğrulanmamış oturum",
+    "You are no longer ignoring %(userId)s": "%(userId)s artık yoksayılmıyor",
+    "Verifies a user, session, and pubkey tuple": "Bir kullanıcı, oturum ve açık anahtar çiftini doğrular",
+    "Unknown (user, session) pair:": "Bilinmeyen (kullanıcı, oturum) çifti:",
+    "Session already verified!": "Oturum zaten doğrulanmış!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "UYARI: Oturum zaten doğrulanmış, ama anahtarlar EŞLEŞMİYOR!"
 }

From d362cc0f41b9713591a7001f4c6b7824c858a101 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 19:55:27 +0000
Subject: [PATCH 0838/3235] Fix room device level send setting

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 83975dd8e9..0ab30e02e1 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -349,7 +349,7 @@ export const SETTINGS = {
         supportedLevelsAreOrdered: true,
         displayName: {
             "default": _td('Never send encrypted messages to unverified sessions from this session'),
-            "room-session": _td('Never send encrypted messages to unverified sessions in this room from this session'),
+            "room-device": _td('Never send encrypted messages to unverified sessions in this room from this session'),
         },
         default: false,
     },

From 7a5bf8f1022562530fd0c1754728404f645f0ca3 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 21:55:27 +0000
Subject: [PATCH 0839/3235] Update user info for device and trust changes

This ensure the user info panel updates automatically for device and trust
changes.

Fixes https://github.com/vector-im/riot-web/issues/12134`
---
 src/DeviceListener.js                        |  4 +--
 src/components/views/right_panel/UserInfo.js | 30 +++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4bc6ce2097..4e7bc8470d 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -77,8 +77,8 @@ export default class DeviceListener {
         this._recheck();
     }
 
-    _onDeviceVerificationChanged = (users) => {
-        if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+    _onDeviceVerificationChanged = (userId) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
         this._recheck();
     }
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 5a5d9a577c..154d564f05 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1092,22 +1092,32 @@ export const useDevices = (userId) => {
     // Listen to changes
     useEffect(() => {
         let cancel = false;
-        const onDeviceVerificationChanged = (_userId, device) => {
-            if (_userId === userId) {
-                // no need to re-download the whole thing; just update our copy of the list.
-
-                // Promise.resolve to handle transition from static result to promise; can be removed in future
-                Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
-                    if (cancel) return;
-                    setDevices(devices);
-                });
-            }
+        const updateDevices = async () => {
+            const newDevices = await cli.getStoredDevicesForUser(userId);
+            if (cancel) return;
+            setDevices(newDevices);
         };
+        const onDevicesUpdated = (users) => {
+            if (!users.includes(userId)) return;
+            updateDevices();
+        };
+        const onDeviceVerificationChanged = (_userId, device) => {
+            if (_userId !== userId) return;
+            updateDevices();
+        };
+        const onUserTrustStatusChanged = (_userId, trustStatus) => {
+            if (_userId !== userId) return;
+            updateDevices();
+        };
+        cli.on("crypto.devicesUpdated", onDevicesUpdated);
         cli.on("deviceVerificationChanged", onDeviceVerificationChanged);
+        cli.on("userTrustStatusChanged", onUserTrustStatusChanged);
         // Handle being unmounted
         return () => {
             cancel = true;
+            cli.removeListener("crypto.devicesUpdated", onDevicesUpdated);
             cli.removeListener("deviceVerificationChanged", onDeviceVerificationChanged);
+            cli.removeListener("userTrustStatusChanged", onUserTrustStatusChanged);
         };
     }, [cli, userId]);
 

From eaa48665d2af50b4e09c9f81548e3c1d25017c9b Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Jan 2020 21:59:30 +0000
Subject: [PATCH 0840/3235] Guard request input

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

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index f25a55fa8a..2b3196f4c1 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -36,7 +36,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
         setRequest(verificationRequest);
     }, [verificationRequest]);
 
-    const [phase, setPhase] = useState(request.phase);
+    const [phase, setPhase] = useState(request && request.phase);
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {

From a180dddc669d9781bdd567c9c88d30b429ec7cdc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 22:31:19 +0000
Subject: [PATCH 0841/3235] Pass an ID to the <Field/> as needed and fix div
 inside p nesting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/secretstorage/_CreateSecretStorageDialog.scss | 4 ++++
 .../dialogs/secretstorage/CreateSecretStorageDialog.js    | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index bbbf3fc1d3..a9ebd54b31 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -37,6 +37,10 @@ limitations under the License.
         flex: 0 0 auto;
         margin-left: 30px;
     }
+
+    details .mx_AccessibleButton {
+        margin: 1em 0; // emulate paragraph spacing because we can't put this button in a paragraph due to HTML rules
+    }
 }
 
 .mx_CreateSecretStorageDialog .mx_Dialog_title {
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index c3b74381ff..64aff467a7 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -480,7 +480,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                <Field type="password"
+                <Field
+                    type="password"
+                    id="mx_CreateSecretStorageDialog_passPhraseField"
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
                     onKeyPress={this._onPassPhraseKeyPress}
@@ -512,9 +514,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
             <details>
                 <summary>{_t("Advanced")}</summary>
-                <p><AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
+                <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
                     {_t("Set up with a recovery key")}
-                </AccessibleButton></p>
+                </AccessibleButton>
             </details>
         </div>;
     }

From 33ec73095e3a35b3399f9414753faee8d97f10ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 22:44:49 +0000
Subject: [PATCH 0842/3235] Apply the Olympic effect to SAS Emoji Verification

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../verification/_VerificationShowSas.scss    | 27 ++++++++++++++++---
 .../views/verification/VerificationShowSas.js |  6 +++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index a0da7e2539..72213072f9 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -28,21 +28,42 @@ limitations under the License.
 
 .mx_VerificationShowSas_emojiSas {
     text-align: center;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 25px 0;
 }
 
 .mx_VerificationShowSas_emojiSas_block {
     display: inline-block;
-    margin-left: 15px;
-    margin-right: 15px;
     text-align: center;
-    margin-bottom: 20px;
+    margin-bottom: 30px;
+    position: relative;
+    // allow the blocks to grow to space themselves evenly up to a limit of 100px
+    flex-grow: 1;
+    max-width: 100px;
 }
 
 .mx_VerificationShowSas_emojiSas_emoji {
     font-size: 48px;
 }
 
+.mx_UserInfo .mx_VerificationShowSas_emojiSas_emoji {
+    font-size: 32px; // in UserInfo use a smaller font-size to fit in a smaller space
+    width: 43px;
+    margin: 0 auto;
+}
+
 .mx_VerificationShowSas_emojiSas_label {
     text-align: center;
     font-weight: bold;
+    // allow the text to overflow the parent by 15px on each side
+    // this is to keep the width of the parent consistent for spacing centrally via flexbox
+    position: absolute;
+    left: -15px;
+    right: -15px;
+}
+
+.mx_VerificationShowSas_emojiSas_break {
+    flex-basis: 100%;
 }
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 40d3b96beb..38bc1bb40a 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -62,7 +62,9 @@ export default class VerificationShowSas extends React.Component {
                 </div>,
             );
             sasDisplay = <div className="mx_VerificationShowSas_emojiSas">
-                {emojiBlocks}
+                {emojiBlocks.slice(0, 4)}
+                <div className="mx_VerificationShowSas_emojiSas_break" />
+                {emojiBlocks.slice(4)}
             </div>;
             sasCaption = _t(
                 "Verify this user by confirming the following emoji appear on their screen.",
@@ -105,8 +107,8 @@ export default class VerificationShowSas extends React.Component {
 
         return <div className="mx_VerificationShowSas">
             <p>{sasCaption}</p>
-            <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
             {sasDisplay}
+            <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
             {confirm}
         </div>;
     }

From d17a2ff80c6f89674323796bca82f3eacfcc80e3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 22:54:45 +0000
Subject: [PATCH 0843/3235] clean up unused CSS rules

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

diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index 72213072f9..32401bc446 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -36,7 +36,6 @@ limitations under the License.
 
 .mx_VerificationShowSas_emojiSas_block {
     display: inline-block;
-    text-align: center;
     margin-bottom: 30px;
     position: relative;
     // allow the blocks to grow to space themselves evenly up to a limit of 100px
@@ -50,12 +49,9 @@ limitations under the License.
 
 .mx_UserInfo .mx_VerificationShowSas_emojiSas_emoji {
     font-size: 32px; // in UserInfo use a smaller font-size to fit in a smaller space
-    width: 43px;
-    margin: 0 auto;
 }
 
 .mx_VerificationShowSas_emojiSas_label {
-    text-align: center;
     font-weight: bold;
     // allow the text to overflow the parent by 15px on each side
     // this is to keep the width of the parent consistent for spacing centrally via flexbox

From afecaa16622f4d2e42ee1842b19519df0cd154e9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Jan 2020 22:54:56 +0000
Subject: [PATCH 0844/3235] fix left margins in UserInfo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 5e5b66f58a..81e4c396e7 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -211,7 +211,7 @@ limitations under the License.
         padding-bottom: 16px;
     }
 
-    .mx_UserInfo_scrollContainer:not(.mx_UserInfo_separator) {
+    .mx_UserInfo_container:not(.mx_UserInfo_separator) {
         padding-top: 16px;
         padding-bottom: 0;
 

From 52ed55d887bacbbaf7f3117ce7ea4c2fc4cac18a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 00:23:19 +0000
Subject: [PATCH 0845/3235] Update placeholder when it changes, not sure how
 this ever worked

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index d2b6f8cbc8..a2a01f4444 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -94,6 +94,17 @@ export default class BasicMessageEditor extends React.Component {
         this._emoticonSettingHandle = null;
     }
 
+    componentDidUpdate(prevProps) {
+        if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
+            const {isEmpty} = this.props.model;
+            if (isEmpty) {
+                this._showPlaceholder();
+            } else {
+                this._hidePlaceholder();
+            }
+        }
+    }
+
     _replaceEmoticon = (caretPosition, inputType, diff) => {
         const {model} = this.props;
         const range = model.startRange(caretPosition);

From 7038481394c7c5518f2b622cdb2640cf525b490e Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 30 Jan 2020 04:05:44 +0000
Subject: [PATCH 0846/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 94.8% (1988 of 2096 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 | 42 ++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 35f4a14414..c48b895fda 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1946,5 +1946,45 @@
     "Upgrade your encryption": "升級您的加密",
     "Set up encryption": "設定加密",
     "Encryption upgraded": "加密已升級",
-    "Encryption setup complete": "加密設定完成"
+    "Encryption setup complete": "加密設定完成",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "聊天室中有未知的工作階段：如果您不驗證它們就繼續，就有可能讓人監聽的您的通話。",
+    "Verify this session": "驗證此工作階段",
+    "Encryption upgrade available": "已提供加密升級",
+    "Unverified session": "未驗證的工作階段",
+    "Verifies a user, session, and pubkey tuple": "驗證使用者、工作階段與公開金鑰組合",
+    "Unknown (user, session) pair:": "未知（使用者、工作階段）配對：",
+    "Session already verified!": "工作階段已驗證！",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：工作階段已驗證、但金鑰不符合！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(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」。這可能代表您的通訊已被攔截！",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "您提供的簽署金鑰符合您從 %(userId)s 工作階段 %(deviceId)s 收到的簽署金鑰。工作階段標記為已驗證。",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "啟用交叉簽章以驗證使用者而非工作階段（開發中）",
+    "Never send encrypted messages to unverified sessions from this session": "不要從此工作階段傳送已加密的訊息給未驗證的工作階段",
+    "Never send encrypted messages to unverified sessions in this room from this session": "不要從此工作階段傳送已加密的訊息給此聊天室中未驗證的工作階段",
+    "Enable message search in encrypted rooms": "在已加密的聊天室中啟用訊息搜尋",
+    "Waiting for %(displayName)s to verify…": "正在等待 %(displayName)s 驗證……",
+    "They match": "它們符合",
+    "They don't match": "它們不符合",
+    "To be secure, do this in person or use a trusted way to communicate.": "為了安全，請親自進行或使用可信的通訊方式。",
+    "Verify your other sessions easier": "更容易地驗證您其他的工作階段",
+    "Review": "評論",
+    "This bridge was provisioned by <user />.": "此橋接是由 <user /> 設定。",
+    "Workspace: %(networkName)s": "工作空間：",
+    "Channel: %(channelName)s": "頻道：",
+    "Show less": "顯示較少",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "變更密碼將會重設所有工作階段上的所有端到端加密金鑰，讓已加密的聊天歷史無法讀取，除非您先匯出您的聊天室金鑰並在稍後重新匯入。未來會有所改善。",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "您的帳號在秘密儲存空間中有交叉簽章的身份，但尚未被此工作階段信任。",
+    "in memory": "在記憶體中",
+    "Your homeserver does not support session management.": "您的家伺服器不支援工作階段管理。",
+    "Unable to load session list": "無法載入工作階段清單",
+    "Delete %(count)s sessions|other": "刪除 %(count)s 個工作階段",
+    "Delete %(count)s sessions|one": "刪除 %(count)s 個工作階段",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "將加密的訊息安全地在本機快取以出現在顯示結果中，使用 ",
+    " to store messages from ": " 以儲存訊息從 ",
+    "rooms.": "聊天室。",
+    "Manage": "管理",
+    "Securely cache encrypted messages locally for them to appear in search results.": "將加密的訊息安全地在本機快取以出現在顯示結果中。",
+    "Enable": "啟用",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot 缺少某些在本機快取已加密訊習所需的元件。如果您想要實驗此功能，請<nativeLink>加入搜尋元件</nativeLink>並自行建構 Riot 桌面版。",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot 無法在網路瀏覽器中安全地在本機快取已加密的訊息。使用 <riotLink>Riot 桌面版</riotLink>來讓已加密的訊息出現在搜尋結果中。",
+    "This session is backing up your keys. ": "此工作階段正在備份您的金鑰。 "
 }

From f2dda28ad3f03eb70c4268c3eaf1ad0377b3288d Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 30 Jan 2020 09:07:04 +0000
Subject: [PATCH 0847/3235] Translated using Weblate (Italian)

Currently translated at 95.5% (2002 of 2096 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 | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 5a3f122ad2..bf20a4f7dc 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1963,5 +1963,42 @@
     "Manage": "Gestisci",
     "Securely cache encrypted messages locally for them to appear in search results.": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca.",
     "Enable": "Attiva",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un Riot Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>."
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un Riot Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ci sono sessioni sconosciute in questa stanza: se procedi senza verificarle, sarà possibile per qualcuno origliare la tua chiamata.",
+    "Unverified session": "Sessione non verificata",
+    "Verifies a user, session, and pubkey tuple": "Verifica un utente, una sessione e una tupla pubblica",
+    "Unknown (user, session) pair:": "Coppia (utente, sessione) sconosciuta:",
+    "Session already verified!": "Sessione già verificata!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ATTENZIONE: sessione già verificata, ma le chiavi NON CORRISPONDONO!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENZIONE: VERIFICA CHIAVI FALLITA! La chiave per %(userId)s e per la sessione %(deviceId)s è \"%(fprint)s\" la quale non corriponde con la chiave \"%(fingerprint)s\" fornita. Ciò può significare che le comunicazioni vengono intercettate!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dalla sessione di %(userId)s %(deviceId)s. Sessione contrassegnata come verificata.",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Attiva la firma incrociata per la verifica per-utente invece di per-sessione (in sviluppo)",
+    "Never send encrypted messages to unverified sessions from this session": "Non inviare mai messaggi cifrati a sessioni non verificate da questa sessione",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Non inviare mai messaggi cifrati a sessioni non verificate in questa stanza da questa sessione",
+    "To be secure, do this in person or use a trusted way to communicate.": "Per sicurezza, fatelo di persona o usate un metodo fidato per comunicare.",
+    "Verify your other sessions easier": "Verifica facilmente le tue altre sessioni",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Il cambio della password reimposterà qualsiasi chiave di cifratura end-to-end in tutte le sessioni, rendendo illeggibile la cronologia di chat, a meno che prima non esporti le chiavi della stanza e le reimporti dopo. In futuro questa cosa verrà migliorata.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Il tuo account ha un'identità a firma incrociata nell'archivio segreto, ma non è ancora fidata da questa sessione.",
+    "in memory": "in memoria",
+    "Your homeserver does not support session management.": "Il tuo homeserver non supporta la gestione della sessione.",
+    "Unable to load session list": "Impossibile caricare l'elenco sessioni",
+    "Delete %(count)s sessions|other": "Elimina %(count)s sessioni",
+    "Delete %(count)s sessions|one": "Elimina %(count)s sessione",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot non può conservare in cache i messaggi cifrati in modo sicuro nella versione browser. Usa <riotLink>Riot Desktop</riotLink> affinché i messaggi cifrati appaiano nei risultati di ricerca.",
+    "This session is backing up your keys. ": "Questa sessione sta facendo il backup delle tue chiavi. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Questa sessione <b>non sta facendo il backup delle tue chiavi</b>, ma hai un backup esistente dal quale puoi ripristinare e che puoi usare da ora in poi.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connetti questa sessione al backup chiavi prima di disconnetterti per non perdere eventuali chiavi che possono essere solo in questa sessione.",
+    "Connect this session to Key Backup": "Connetti questa sessione al backup chiavi",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Il backup ha una firma da una sessione <verify>sconosciuta</verify> con ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Il backup ha una firma <validity>valida</validity> da questa sessione",
+    "Backup has an <validity>invalid</validity> signature from this session": "Il backup ha una firma <validity>non valida</validity> da questa sessione",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Il backup ha una firma <validity>valida</validity> da una sessione <verify>verificata</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Il backup ha una firma <validity>valida</validity> da una sessione <verify>non verificata</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "il backup ha una firma <validity>non valida</validity> da una sessione <verify>verificata</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "il backup ha una firma <validity>non valida</validity> da una sessione <verify>non verificata</verify> <device></device>",
+    "Backup is not signed by any of your sessions": "Il backup non è firmato da nessuna tua sessione",
+    "This backup is trusted because it has been restored on this session": "Questo backup è fidato perchè è stato ripristinato in questa sessione",
+    "Space used:": "Spazio usato:",
+    "Indexed messages:": "Messaggi indicizzati:",
+    "Number of rooms:": "Numero di stanze:"
 }

From 2f4b3272da6aeebf6414399a56695b713ea03f75 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 11:27:54 +0000
Subject: [PATCH 0848/3235] Send initial device display najme on register

Fixes https://github.com/vector-im/riot-web/issues/12140
---
 src/components/structures/MatrixChat.js       |  1 +
 .../structures/auth/Registration.js           | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 233ec9e7bb..d6ef3341da 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1985,6 +1985,7 @@ export default createReactClass({
                     onLoggedIn={this.onRegisterFlowComplete}
                     onLoginClick={this.onLoginClick}
                     onServerConfigChange={this.onServerConfigChange}
+                    defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     {...this.getServerProperties()}
                 />
             );
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 171d3ada26..8593a4b1e2 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ export default createReactClass({
         // registration shouldn't know or care how login is done.
         onLoginClick: PropTypes.func.isRequired,
         onServerConfigChange: PropTypes.func.isRequired,
+        defaultDeviceDisplayName: PropTypes.string,
     },
 
     getInitialState: function() {
@@ -432,15 +433,14 @@ export default createReactClass({
         // session).
         if (!this.state.formVals.password) inhibitLogin = null;
 
-        return this.state.matrixClient.register(
-            this.state.formVals.username,
-            this.state.formVals.password,
-            undefined, // session id: included in the auth dict already
-            auth,
-            null,
-            null,
-            inhibitLogin,
-        );
+        const registerParams = {
+            username: this.state.formVals.username,
+            password: this.state.formVals.password,
+            initial_device_display_name: this.props.defaultDeviceDisplayName,
+        };
+        if (auth) registerParams.auth = auth;
+        if (inhibitLogin !== undefined && inhibitLogin !== null) registerParams.inhibitLogin = inhibitLogin;
+        return this.state.matrixClient.registerRequest(registerParams);
     },
 
     _getUIAuthInputs: function() {

From 4c1cc6feba6c94ade8ef47dfa88f3ea3e68bd515 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 12:21:13 +0000
Subject: [PATCH 0849/3235] fix SAS dialog width

used fixedWidth to accomplish the same goal

clean up css
---
 src/components/views/dialogs/IncomingSasDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index daaa1aff55..3bf7b83291 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -227,6 +227,7 @@ export default class IncomingSasDialog extends React.Component {
             <BaseDialog
                 title={_t("Incoming Verification Request")}
                 onFinished={this._onFinished}
+                fixedWidth={false}
             >
                 {body}
             </BaseDialog>

From fd5798aa87e9205213310fda3428894d91d70eb2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 13:21:51 +0000
Subject: [PATCH 0850/3235] Change verify user text

---
 src/components/views/right_panel/UserInfo.js | 2 +-
 src/i18n/strings/en_EN.json                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 154d564f05..d1713991aa 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1270,7 +1270,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     if (isRoomEncrypted && !userVerified && !isMe) {
         verifyButton = (
             <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
-                {_t("Learn more")}
+                {_t("Verify")}
             </AccessibleButton>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ea986e6324..40d87bfdad 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1171,7 +1171,6 @@
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
-    "Learn more": "Learn more",
     "Security": "Security",
     "Verify by emoji": "Verify by emoji",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",

From 788cb2409390386d4d41c56aa52119ea165e2bf8 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 14:18:12 +0000
Subject: [PATCH 0851/3235] Add advanced option to keep secret storage in
 memory for session

This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
---
 src/CrossSigningManager.js                    | 22 ++++++++++++++-----
 .../settings/tabs/user/LabsUserSettingsTab.js |  1 +
 src/i18n/strings/en_EN.json                   |  1 +
 src/settings/Settings.js                      |  5 +++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 085764214f..6922214d19 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -20,6 +20,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
+import SettingsStore from './settings/SettingsStore';
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
 // only meant to act as a cache to avoid prompting the user multiple times
@@ -27,7 +28,14 @@ import { _t } from './languageHandler';
 // single secret storage operation, as it will clear the cached keys once the
 // operation ends.
 let secretStorageKeys = {};
-let cachingAllowed = false;
+let secretStorageBeingAccessed = false;
+
+function isCachingAllowed() {
+    return (
+        secretStorageBeingAccessed ||
+        SettingsStore.getValue("keepSecretStoragePassphraseForSession")
+    );
+}
 
 async function getSecretStorageKey({ keys: keyInfos }) {
     const keyInfoEntries = Object.entries(keyInfos);
@@ -37,7 +45,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
     const [name, info] = keyInfoEntries[0];
 
     // Check the in-memory cache
-    if (cachingAllowed && secretStorageKeys[name]) {
+    if (isCachingAllowed() && secretStorageKeys[name]) {
         return [name, secretStorageKeys[name]];
     }
 
@@ -71,7 +79,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
     const key = await inputToKey(input);
 
     // Save to cache to avoid future prompts in the current session
-    if (cachingAllowed) {
+    if (isCachingAllowed()) {
         secretStorageKeys[name] = key;
     }
 
@@ -104,7 +112,7 @@ export const crossSigningCallbacks = {
  */
 export async function accessSecretStorage(func = async () => { }) {
     const cli = MatrixClientPeg.get();
-    cachingAllowed = true;
+    secretStorageBeingAccessed = true;
 
     try {
         if (!await cli.hasSecretStorageKey()) {
@@ -143,7 +151,9 @@ export async function accessSecretStorage(func = async () => { }) {
         return await func();
     } finally {
         // Clear secret storage key cache now that work is complete
-        cachingAllowed = false;
-        secretStorageKeys = {};
+        secretStorageBeingAccessed = false;
+        if (!isCachingAllowed()) {
+            secretStorageKeys = {};
+        }
     }
 }
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index ec5f984d46..2b992c7add 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -66,6 +66,7 @@ export default class LabsUserSettingsTab extends React.Component {
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
+                    <SettingsFlag name={"keepSecretStoragePassphraseForSession"} level={SettingLevel.DEVICE} />
                 </div>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ea986e6324..ed660351f5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -415,6 +415,7 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
+    "Keep secret storage passphrase in memory for this session": "Keep secret storage passphrase in memory for this session",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0ab30e02e1..5ea871dc69 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -485,4 +485,9 @@ export const SETTINGS = {
         displayName: _td("Enable message search in encrypted rooms"),
         default: true,
     },
+    "keepSecretStoragePassphraseForSession": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        displayName: _td("Keep secret storage passphrase in memory for this session"),
+        default: false,
+    },
 };

From 318689f40b4de4de1347f957235752836636d470 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:06:36 +0000
Subject: [PATCH 0852/3235] Disable all inputs in login form while busy, not
 just the submit button

---
 src/components/views/auth/PasswordLogin.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index c836b96a89..11717fac00 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -202,6 +202,7 @@ export default class PasswordLogin extends React.Component {
                     value={this.state.username}
                     onChange={this.onUsernameChanged}
                     onBlur={this.onUsernameBlur}
+                    disabled={this.props.disableSubmit}
                     autoFocus
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
@@ -216,6 +217,7 @@ export default class PasswordLogin extends React.Component {
                     value={this.state.username}
                     onChange={this.onUsernameChanged}
                     onBlur={this.onUsernameBlur}
+                    disabled={this.props.disableSubmit}
                     autoFocus
                 />;
             case PasswordLogin.LOGIN_FIELD_PHONE: {
@@ -240,6 +242,7 @@ export default class PasswordLogin extends React.Component {
                     prefix={phoneCountry}
                     onChange={this.onPhoneNumberChanged}
                     onBlur={this.onPhoneNumberBlur}
+                    disabled={this.props.disableSubmit}
                     autoFocus
                 />;
             }
@@ -291,6 +294,7 @@ export default class PasswordLogin extends React.Component {
                         element="select"
                         value={this.state.loginType}
                         onChange={this.onLoginTypeChange}
+                        disabled={this.props.disableSubmit}
                     >
                         <option
                             key={PasswordLogin.LOGIN_FIELD_MXID}
@@ -330,6 +334,7 @@ export default class PasswordLogin extends React.Component {
                         label={_t('Password')}
                         value={this.state.password}
                         onChange={this.onPasswordChanged}
+                        disabled={this.props.disableSubmit}
                     />
                     {forgotPasswordJsx}
                     <input className="mx_Login_submit"

From 7e98ea79d2051c5d8aca2f3e9613b0c471c36e44 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:31:20 +0000
Subject: [PATCH 0853/3235] Fix verification toast timeouts to not stick at 0

Fixes: https://github.com/vector-im/riot-web/issues/12038
---
 .../views/toasts/VerificationRequestToast.js      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index d7b2880b92..fce239f655 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -33,11 +33,13 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     componentDidMount() {
         const {request} = this.props;
-        this._intervalHandle = setInterval(() => {
-            let {counter} = this.state;
-            counter = Math.max(0, counter - 1);
-            this.setState({counter});
-        }, 1000);
+        if (request.timeout && request.timeout > 0) {
+            this._intervalHandle = setInterval(() => {
+                let {counter} = this.state;
+                counter = Math.max(0, counter - 1);
+                this.setState({counter});
+            }, 1000);
+        }
         request.on("change", this._checkRequestIsPending);
         // We should probably have a separate class managing the active verification toasts,
         // rather than monitoring this in the toast component itself, since we'll get problems
@@ -120,10 +122,11 @@ export default class VerificationRequestToast extends React.PureComponent {
                 nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
             }
         }
+        const declineLabel = this.state.counter == 0 ? _t("Decline") : _t("Decline (%(counter)s)", {counter: this.state.counter});
         return (<div>
             <div className="mx_Toast_description">{nameLabel}</div>
             <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Decline (%(counter)s)", {counter: this.state.counter})} kind="danger" onClick={this.cancel} />
+                <FormButton label={declineLabel} kind="danger" onClick={this.cancel} />
                 <FormButton label={_t("Accept")} onClick={this.accept} />
             </div>
         </div>);

From 49d2ed890683e1a3782a0212b85501041dce96ba Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:37:44 +0000
Subject: [PATCH 0854/3235] ... and take action when the counter reaches zero
 in verification toast

---
 src/components/views/toasts/VerificationRequestToast.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index fce239f655..4f2c85acf6 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -38,6 +38,11 @@ export default class VerificationRequestToast extends React.PureComponent {
                 let {counter} = this.state;
                 counter = Math.max(0, counter - 1);
                 this.setState({counter});
+
+                if (counter == 0) {
+                    clearInterval(this._intervalHandle);
+                    this.cancel();
+                }
             }, 1000);
         }
         request.on("change", this._checkRequestIsPending);

From 99b04a6f703cf547d0c40b6369f11cafd9d17c3c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:41:26 +0000
Subject: [PATCH 0855/3235] lint

---
 src/components/views/toasts/VerificationRequestToast.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 4f2c85acf6..61d26c60cc 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -127,7 +127,9 @@ export default class VerificationRequestToast extends React.PureComponent {
                 nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
             }
         }
-        const declineLabel = this.state.counter == 0 ? _t("Decline") : _t("Decline (%(counter)s)", {counter: this.state.counter});
+        const declineLabel = this.state.counter == 0 ?
+            _t("Decline") :
+            _t("Decline (%(counter)s)", {counter: this.state.counter});
         return (<div>
             <div className="mx_Toast_description">{nameLabel}</div>
             <div className="mx_Toast_buttons" aria-live="off">

From 0956d00637166f049a187af8452c728d0a826e54 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 15:59:03 +0000
Subject: [PATCH 0856/3235] Make shields in UserInfo black if user isn't
 verified

---
 res/css/views/right_panel/_UserInfo.scss     |  3 +
 src/components/views/right_panel/UserInfo.js | 83 ++++++++++++--------
 src/i18n/strings/en_EN.json                  |  5 +-
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 81e4c396e7..e5f3aeed3f 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -256,6 +256,9 @@ limitations under the License.
         .mx_UserInfo_expand {
             display: flex;
             margin-top: 11px;
+        }
+
+        .mx_UserInfo_expand_verified {
             color: $accent-color;
         }
     }
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 154d564f05..66341f3ffd 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017, 2018 Vector Creations Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -67,7 +67,9 @@ export const getE2EStatus = (cli, userId, devices) => {
     }
     const isMe = userId === cli.getUserId();
     const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
-    const allDevicesVerified = devices.every(device => {
+    if (!userVerified) return "normal";
+
+    const anyDeviceUnverified = devices.some(device => {
         const { deviceId } = device;
         // For your own devices, we use the stricter check of cross-signing
         // verification to encourage everyone to trust their own devices via
@@ -75,12 +77,9 @@ export const getE2EStatus = (cli, userId, devices) => {
         // For other people's devices, the more general verified check that
         // includes locally verified devices can be used.
         const deviceTrust = cli.checkDeviceTrust(userId, deviceId);
-        return isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
+        return isMe ? !deviceTrust.isCrossSigningVerified() : !deviceTrust.isVerified();
     });
-    if (allDevicesVerified) {
-        return userVerified ? "verified" : "normal";
-    }
-    return "warning";
+    return anyDeviceUnverified ? "warning" : "verified";
 };
 
 async function openDMForUser(matrixClient, userId) {
@@ -156,6 +155,7 @@ function DeviceItem({userId, device}) {
     const cli = useContext(MatrixClientContext);
     const isMe = userId === cli.getUserId();
     const deviceTrust = cli.checkDeviceTrust(userId, device.deviceId);
+    const userTrust = cli.checkUserTrust(userId);
     // For your own devices, we use the stricter check of cross-signing
     // verification to encourage everyone to trust their own devices via
     // cross-signing so that other users can then safely trust you.
@@ -170,8 +170,9 @@ function DeviceItem({userId, device}) {
         mx_UserInfo_device_unverified: !isVerified,
     });
     const iconClasses = classNames("mx_E2EIcon", {
+        mx_E2EIcon_normal: !userTrust.isVerified(),
         mx_E2EIcon_verified: isVerified,
-        mx_E2EIcon_warning: !isVerified,
+        mx_E2EIcon_warning: userTrust.isVerified() && !isVerified,
     });
 
     const onDeviceClick = () => {
@@ -183,7 +184,8 @@ function DeviceItem({userId, device}) {
     const deviceName = device.ambiguous ?
             (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" :
             device.getDisplayName();
-    const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
+    let trustedLabel = null;
+    if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
     return (
         <AccessibleButton
             className={classes}
@@ -200,6 +202,7 @@ function DeviceItem({userId, device}) {
 function DevicesSection({devices, userId, loading}) {
     const Spinner = sdk.getComponent("elements.Spinner");
     const cli = useContext(MatrixClientContext);
+    const userTrust = cli.checkUserTrust(userId);
 
     const [isExpanded, setExpanded] = useState(false);
 
@@ -213,38 +216,54 @@ function DevicesSection({devices, userId, loading}) {
     const isMe = userId === cli.getUserId();
     const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
 
+    let expandSectionDevices = [];
     const unverifiedDevices = [];
-    const verifiedDevices = [];
 
-    for (let i = 0; i < devices.length; ++i) {
-        const device = devices[i];
-        const deviceTrust = deviceTrusts[i];
-        // For your own devices, we use the stricter check of cross-signing
-        // verification to encourage everyone to trust their own devices via
-        // cross-signing so that other users can then safely trust you.
-        // For other people's devices, the more general verified check that
-        // includes locally verified devices can be used.
-        const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
-            deviceTrust.isCrossSigningVerified() :
-            deviceTrust.isVerified();
+    let expandCountCaption;
+    let expandHideCaption;
+    let expandClasses = "mx_UserInfo_expand";
+    let expandIconClasses = "mx_E2EIcon";
 
-        if (isVerified) {
-            verifiedDevices.push(device);
-        } else {
-            unverifiedDevices.push(device);
+    if (userTrust.isVerified()) {
+        for (let i = 0; i < devices.length; ++i) {
+            const device = devices[i];
+            const deviceTrust = deviceTrusts[i];
+            // For your own devices, we use the stricter check of cross-signing
+            // verification to encourage everyone to trust their own devices via
+            // cross-signing so that other users can then safely trust you.
+            // For other people's devices, the more general verified check that
+            // includes locally verified devices can be used.
+            const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
+                deviceTrust.isCrossSigningVerified() :
+                deviceTrust.isVerified();
+
+            if (isVerified) {
+                expandSectionDevices.push(device);
+            } else {
+                unverifiedDevices.push(device);
+            }
         }
+        expandCountCaption = _t("%(count)s verified sessions", {count: expandSectionDevices.length});
+        expandHideCaption = _t("Hide verified sessions");
+        expandClasses += " mx_UserInfo_expand_verified";
+        expandIconClasses += " mx_E2EIcon_verified";
+    } else {
+        expandSectionDevices = devices;
+        expandCountCaption = _t("%(count)s sessions", {count: devices.length});
+        expandHideCaption = _t("Hide sessions");
+        expandIconClasses += " mx_E2EIcon_normal";
     }
 
     let expandButton;
-    if (verifiedDevices.length) {
+    if (expandSectionDevices.length) {
         if (isExpanded) {
-            expandButton = (<AccessibleButton className="mx_UserInfo_expand" onClick={() => setExpanded(false)}>
-                <div>{_t("Hide verified sessions")}</div>
+            expandButton = (<AccessibleButton className={expandClasses} onClick={() => setExpanded(false)}>
+                <div>{expandHideCaption}</div>
             </AccessibleButton>);
         } else {
-            expandButton = (<AccessibleButton className="mx_UserInfo_expand" onClick={() => setExpanded(true)}>
-                <div className="mx_E2EIcon mx_E2EIcon_verified" />
-                <div>{_t("%(count)s verified sessions", {count: verifiedDevices.length})}</div>
+            expandButton = (<AccessibleButton className={expandClasses} onClick={() => setExpanded(true)}>
+                <div className={expandIconClasses} />
+                <div>{expandCountCaption}</div>
             </AccessibleButton>);
         }
     }
@@ -254,7 +273,7 @@ function DevicesSection({devices, userId, loading}) {
     });
     if (isExpanded) {
         const keyStart = unverifiedDevices.length;
-        deviceList = deviceList.concat(verifiedDevices.map((device, i) => {
+        deviceList = deviceList.concat(expandSectionDevices.map((device, i) => {
             return (<DeviceItem key={i + keyStart} userId={userId} device={device} />);
         }));
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ea986e6324..c528c16eda 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1159,9 +1159,12 @@
     "Files": "Files",
     "Trusted": "Trusted",
     "Not trusted": "Not trusted",
-    "Hide verified sessions": "Hide verified sessions",
     "%(count)s verified sessions|other": "%(count)s verified sessions",
     "%(count)s verified sessions|one": "1 verified session",
+    "Hide verified sessions": "Hide verified sessions",
+    "%(count)s sessions|other": "%(count)s sessions",
+    "%(count)s sessions|one": "%(count)s session",
+    "Hide sessions": "Hide sessions",
     "Direct message": "Direct message",
     "Remove from community": "Remove from community",
     "Disinvite this user from community?": "Disinvite this user from community?",

From 9f5f15d1d3a597e6cc12f2e0d95b83255dd94c99 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:58:23 +0000
Subject: [PATCH 0857/3235] Update copy when the user verifies their own
 devices

---
 .../views/dialogs/IncomingSasDialog.js        | 40 ++++++++++++++-----
 src/i18n/strings/en_EN.json                   |  2 +
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 3bf7b83291..1221e0cb91 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -121,6 +121,8 @@ export default class IncomingSasDialog extends React.Component {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
+        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().credentials.userId;
+
         let profile;
         if (this.state.opponentProfile) {
             profile = <div className="mx_IncomingSasDialog_opponentProfile">
@@ -148,20 +150,36 @@ export default class IncomingSasDialog extends React.Component {
             profile = <Spinner />;
         }
 
+        const userDetailText = [
+            <p>{_t(
+                "Verify this user to mark them as trusted. " +
+                "Trusting users gives you extra peace of mind when using " +
+                "end-to-end encrypted messages.",
+            )}</p>,
+            <p>{_t(
+                // NB. Below wording adjusted to singular 'session' until we have
+                // cross-signing
+                "Verifying this user will mark their session as trusted, and " +
+                "also mark your session as trusted to them.",
+            )}</p>
+        ];
+
+        const selfDetailText = [
+            <p>{_t(
+                "Verify this device to mark it as trusted. " +
+                "Trusting this device gives you and other users extra peace of mind when using " +
+                "end-to-end encrypted messages.",
+            )}</p>,
+            <p>{_t(
+                "Verifying this device will mark it as trusted, and users who have verified with " +
+                "you will trust this device.",
+            )}</p>
+        ];
+
         return (
             <div>
                 {profile}
-                <p>{_t(
-                    "Verify this user to mark them as trusted. " +
-                    "Trusting users gives you extra peace of mind when using " +
-                    "end-to-end encrypted messages.",
-                )}</p>
-                <p>{_t(
-                    // NB. Below wording adjusted to singular 'session' until we have
-                    // cross-signing
-                    "Verifying this user will mark their session as trusted, and " +
-                    "also mark your session as trusted to them.",
-                )}</p>
+                {isSelf ? selfDetailText : userDetailText}
                 <DialogButtons
                     primaryButton={_t('Continue')}
                     hasCancel={true}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ea986e6324..595ef689a7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1491,6 +1491,8 @@
     "An error has occurred.": "An error has occurred.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.",
     "Waiting for partner to confirm...": "Waiting for partner to confirm...",
     "Incoming Verification Request": "Incoming Verification Request",
     "Integrations are disabled": "Integrations are disabled",

From 77618d30fdcbb64dcb803b8fd518dad08957c647 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 16:08:42 +0000
Subject: [PATCH 0858/3235] Actually this is green because it's a link

not because the things were verified. Use the linkButton class
---
 res/css/views/right_panel/_UserInfo.scss     | 4 ----
 src/components/views/right_panel/UserInfo.js | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index e5f3aeed3f..46d5e99d64 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -257,10 +257,6 @@ limitations under the License.
             display: flex;
             margin-top: 11px;
         }
-
-        .mx_UserInfo_expand_verified {
-            color: $accent-color;
-        }
     }
 
     .mx_UserInfo_wideButton {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 66341f3ffd..1c6cb58b8f 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -221,7 +221,6 @@ function DevicesSection({devices, userId, loading}) {
 
     let expandCountCaption;
     let expandHideCaption;
-    let expandClasses = "mx_UserInfo_expand";
     let expandIconClasses = "mx_E2EIcon";
 
     if (userTrust.isVerified()) {
@@ -245,7 +244,6 @@ function DevicesSection({devices, userId, loading}) {
         }
         expandCountCaption = _t("%(count)s verified sessions", {count: expandSectionDevices.length});
         expandHideCaption = _t("Hide verified sessions");
-        expandClasses += " mx_UserInfo_expand_verified";
         expandIconClasses += " mx_E2EIcon_verified";
     } else {
         expandSectionDevices = devices;
@@ -257,11 +255,11 @@ function DevicesSection({devices, userId, loading}) {
     let expandButton;
     if (expandSectionDevices.length) {
         if (isExpanded) {
-            expandButton = (<AccessibleButton className={expandClasses} onClick={() => setExpanded(false)}>
+            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton" onClick={() => setExpanded(false)}>
                 <div>{expandHideCaption}</div>
             </AccessibleButton>);
         } else {
-            expandButton = (<AccessibleButton className={expandClasses} onClick={() => setExpanded(true)}>
+            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton" onClick={() => setExpanded(true)}>
                 <div className={expandIconClasses} />
                 <div>{expandCountCaption}</div>
             </AccessibleButton>);

From 4a3ea30e52fa4264c13154bb6a4e57f043ed0375 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 16:11:05 +0000
Subject: [PATCH 0859/3235] copy for verification screen

---
 .../views/dialogs/DeviceVerifyDialog.js       |  1 +
 .../views/dialogs/IncomingSasDialog.js        |  3 ++-
 .../views/verification/VerificationShowSas.js | 21 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  2 ++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 4d0abdc848..d78ef3ca83 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -233,6 +233,7 @@ export default class DeviceVerifyDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
         />;
     }
 
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 1221e0cb91..0095a0cb93 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -121,7 +121,7 @@ export default class IncomingSasDialog extends React.Component {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().credentials.userId;
+        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().getUserId();
 
         let profile;
         if (this.state.opponentProfile) {
@@ -196,6 +196,7 @@ export default class IncomingSasDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
+            isSelf={this.props.verifier.userId == MatrixClientPeg.get().getUserId()}
         />;
     }
 
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 38bc1bb40a..b92e72c3a7 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -32,6 +32,7 @@ export default class VerificationShowSas extends React.Component {
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
+        isSelf: PropTypes.bool,
     };
 
     constructor(props) {
@@ -66,9 +67,13 @@ export default class VerificationShowSas extends React.Component {
                 <div className="mx_VerificationShowSas_emojiSas_break" />
                 {emojiBlocks.slice(4)}
             </div>;
-            sasCaption = _t(
-                "Verify this user by confirming the following emoji appear on their screen.",
-            );
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify the device by confirming the following emoji appers on its screen.",
+                ):
+                _t(
+                    "Verify this user by confirming the following emoji appear on their screen.",
+                );
         } else if (this.props.sas.decimal) {
             const numberBlocks = this.props.sas.decimal.map((num, i) => <span key={i}>
                 {num}
@@ -76,9 +81,13 @@ export default class VerificationShowSas extends React.Component {
             sasDisplay = <div className="mx_VerificationShowSas_decimalSas">
                 {numberBlocks}
             </div>;
-            sasCaption = _t(
-                "Verify this user by confirming the following number appears on their screen.",
-            );
+            sasCaption = this.props.isSelf ?
+                _t(
+                    "Verify this device by confirming the following number appears on its screen.",
+                ):
+                _t(
+                    "Verify this user by confirming the following number appears on their screen.",
+                );
         } else {
             return <div>
                 {_t("Unable to find a supported verification method.")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 595ef689a7..439614d2a8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -444,7 +444,9 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
+    "Verify the device by confirming the following emoji appers on its screen.": "Verify the device by confirming the following emoji appers on its screen.",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
+    "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Cancel": "Cancel",

From 4f62fc16bdeeb0002b3610b052b87027e762fe78 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 16:19:04 +0000
Subject: [PATCH 0860/3235] lint

---
 src/components/views/right_panel/UserInfo.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 1c6cb58b8f..cc84ad451f 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -255,11 +255,15 @@ function DevicesSection({devices, userId, loading}) {
     let expandButton;
     if (expandSectionDevices.length) {
         if (isExpanded) {
-            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton" onClick={() => setExpanded(false)}>
+            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton"
+                onClick={() => setExpanded(false)}
+            >
                 <div>{expandHideCaption}</div>
             </AccessibleButton>);
         } else {
-            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton" onClick={() => setExpanded(true)}>
+            expandButton = (<AccessibleButton className="mx_UserInfo_expand mx_linkButton"
+                onClick={() => setExpanded(true)}
+            >
                 <div className={expandIconClasses} />
                 <div>{expandCountCaption}</div>
             </AccessibleButton>);

From a9d85e1fa33cfb0ba2ddf59421b119078166fe90 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 16:27:35 +0000
Subject: [PATCH 0861/3235] lint

---
 src/components/views/dialogs/IncomingSasDialog.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 0095a0cb93..c612043919 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -151,29 +151,29 @@ export default class IncomingSasDialog extends React.Component {
         }
 
         const userDetailText = [
-            <p>{_t(
+            <p key="p1">{_t(
                 "Verify this user to mark them as trusted. " +
                 "Trusting users gives you extra peace of mind when using " +
                 "end-to-end encrypted messages.",
             )}</p>,
-            <p>{_t(
+            <p key="p2">{_t(
                 // NB. Below wording adjusted to singular 'session' until we have
                 // cross-signing
                 "Verifying this user will mark their session as trusted, and " +
                 "also mark your session as trusted to them.",
-            )}</p>
+            )}</p>,
         ];
 
         const selfDetailText = [
-            <p>{_t(
+            <p key="p1">{_t(
                 "Verify this device to mark it as trusted. " +
                 "Trusting this device gives you and other users extra peace of mind when using " +
                 "end-to-end encrypted messages.",
             )}</p>,
-            <p>{_t(
+            <p key="p2">{_t(
                 "Verifying this device will mark it as trusted, and users who have verified with " +
                 "you will trust this device.",
-            )}</p>
+            )}</p>,
         ];
 
         return (

From f787bde80a9ea824b702232bcb888e69b8e1c4ef Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 16:36:57 +0000
Subject: [PATCH 0862/3235] copy

---
 src/components/views/verification/VerificationShowSas.js | 2 +-
 src/i18n/strings/en_EN.json                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index b92e72c3a7..25f174fb30 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -69,7 +69,7 @@ export default class VerificationShowSas extends React.Component {
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
-                    "Verify the device by confirming the following emoji appers on its screen.",
+                    "Confirm the emoji below are displayed on both devices, in the same order:",
                 ):
                 _t(
                     "Verify this user by confirming the following emoji appear on their screen.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 439614d2a8..558e5220a3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -444,7 +444,7 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
-    "Verify the device by confirming the following emoji appers on its screen.": "Verify the device by confirming the following emoji appers on its screen.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirm the emoji below are displayed on both devices, in the same order:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
     "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",

From ceebb7dc553ce0be8640cc0cd864a0ac62df6b3c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 15:19:35 +0000
Subject: [PATCH 0863/3235] Remove unused Entities, UserTile modules

---
 src/Entities.js                        | 137 -------------------------
 src/components/views/rooms/UserTile.js |  53 ----------
 2 files changed, 190 deletions(-)
 delete mode 100644 src/Entities.js
 delete mode 100644 src/components/views/rooms/UserTile.js

diff --git a/src/Entities.js b/src/Entities.js
deleted file mode 100644
index 872a837f3a..0000000000
--- a/src/Entities.js
+++ /dev/null
@@ -1,137 +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.
-*/
-
-import * as sdk from './index';
-
-function isMatch(query, name, uid) {
-    query = query.toLowerCase();
-    name = name.toLowerCase();
-    uid = uid.toLowerCase();
-
-    // direct prefix matches
-    if (name.indexOf(query) === 0 || uid.indexOf(query) === 0) {
-        return true;
-    }
-
-    // strip @ on uid and try matching again
-    if (uid.length > 1 && uid[0] === "@" && uid.substring(1).indexOf(query) === 0) {
-        return true;
-    }
-
-    // split spaces in name and try matching constituent parts
-    const parts = name.split(" ");
-    for (let i = 0; i < parts.length; i++) {
-        if (parts[i].indexOf(query) === 0) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/*
- * Converts various data models to Entity objects.
- *
- * Entity objects provide an interface for UI components to use to display
- * members in a data-agnostic way. This means they don't need to care if the
- * underlying data model is a RoomMember, User or 3PID data structure, it just
- * cares about rendering.
- */
-
-class Entity {
-    constructor(model) {
-        this.model = model;
-    }
-
-    getJsx() {
-        return null;
-    }
-
-    matches(queryString) {
-        return false;
-    }
-}
-
-class MemberEntity extends Entity {
-    getJsx() {
-        const MemberTile = sdk.getComponent("rooms.MemberTile");
-        return (
-            <MemberTile key={this.model.userId} member={this.model} />
-        );
-    }
-
-    matches(queryString) {
-        return isMatch(queryString, this.model.name, this.model.userId);
-    }
-}
-
-class UserEntity extends Entity {
-    constructor(model, showInviteButton, inviteFn) {
-        super(model);
-        this.showInviteButton = Boolean(showInviteButton);
-        this.inviteFn = inviteFn;
-        this.onClick = this.onClick.bind(this);
-    }
-
-    onClick() {
-        if (this.inviteFn) {
-            this.inviteFn(this.model.userId);
-        }
-    }
-
-    getJsx() {
-        const UserTile = sdk.getComponent("rooms.UserTile");
-        return (
-            <UserTile key={this.model.userId} user={this.model}
-                showInviteButton={this.showInviteButton} onClick={this.onClick} />
-        );
-    }
-
-    matches(queryString) {
-        const name = this.model.displayName || this.model.userId;
-        return isMatch(queryString, name, this.model.userId);
-    }
-}
-
-export function newEntity(jsx, matchFn) {
-    const entity = new Entity();
-    entity.getJsx = function() {
-        return jsx;
-    };
-    entity.matches = matchFn;
-    return entity;
-}
-
-/**
- * @param {RoomMember[]} members
- * @return {Entity[]}
- */
-export function fromRoomMembers(members) {
-    return members.map(function(m) {
-        return new MemberEntity(m);
-    });
-}
-
-/**
- * @param {User[]} users
- * @param {boolean} showInviteButton
- * @param {Function} inviteFn Called with the user ID.
- * @return {Entity[]}
- */
-export function fromUsers(users, showInviteButton, inviteFn) {
-    return users.map(function(u) {
-        return new UserEntity(u, showInviteButton, inviteFn);
-    });
-}
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
deleted file mode 100644
index 01bbe7d4d1..0000000000
--- a/src/components/views/rooms/UserTile.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 createReactClass from 'create-react-class';
-import * as Avatar from '../../../Avatar';
-import * as sdk from "../../../index";
-
-export default createReactClass({
-    displayName: 'UserTile',
-
-    propTypes: {
-        user: PropTypes.any.isRequired, // User
-    },
-
-    render: function() {
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-        const user = this.props.user;
-        const name = user.displayName || user.userId;
-        let active = -1;
-
-        // FIXME: make presence data update whenever User.presence changes...
-        active = user.lastActiveAgo ?
-            (Date.now() - (user.lastPresenceTs - user.lastActiveAgo)) : -1;
-
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-        const avatarJsx = (
-            <BaseAvatar width={36} height={36} name={name} idName={user.userId}
-                        url={Avatar.avatarUrlForUser(user, 36, 36, "crop")} />
-        );
-
-        return (
-            <EntityTile {...this.props} presenceState={user.presence} presenceActiveAgo={active}
-                presenceCurrentlyActive={user.currentlyActive}
-                name={name} title={user.userId} avatarJsx={avatarJsx} />
-        );
-    },
-});

From bae35c0859e3e7ece4d6a25860eeeec9e1d7bc11 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 16:00:09 +0000
Subject: [PATCH 0864/3235] Change power icon to label instead

---
 res/css/views/rooms/_EntityTile.scss     |  8 --------
 src/components/views/rooms/EntityTile.js | 11 +++--------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 2b6b31acb4..92e0d5690c 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -64,14 +64,6 @@ limitations under the License.
     position: relative;
 }
 
-.mx_EntityTile_power {
-    position: absolute;
-    width: 16px;
-    height: 17px;
-    top: 0px;
-    right: 6px;
-}
-
 .mx_EntityTile_name,
 .mx_GroupRoomTile_name {
     flex: 1 1 0;
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 57db1ac240..40bf9f6d78 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -156,18 +156,13 @@ const EntityTile = createReactClass({
             );
         }
 
-        let power;
+        let powerLabel;
         const powerStatus = this.props.powerStatus;
         if (powerStatus) {
-            const src = {
-                [EntityTile.POWER_STATUS_MODERATOR]: require("../../../../res/img/mod.svg"),
-                [EntityTile.POWER_STATUS_ADMIN]: require("../../../../res/img/admin.svg"),
-            }[powerStatus];
-            const alt = {
+            powerLabel = {
                 [EntityTile.POWER_STATUS_MODERATOR]: _t("Moderator"),
                 [EntityTile.POWER_STATUS_ADMIN]: _t("Admin"),
             }[powerStatus];
-            power = <img src={src} className="mx_EntityTile_power" width="16" height="17" alt={alt} />;
         }
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
@@ -181,7 +176,7 @@ const EntityTile = createReactClass({
                                   onClick={this.props.onClick}>
                     <div className="mx_EntityTile_avatar">
                         { av }
-                        { power }
+                        { powerLabel }
                     </div>
                     { nameEl }
                     { inviteButton }

From e58b59c26e198b512471e157d1d120b5d9fa9262 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 30 Jan 2020 16:41:25 +0000
Subject: [PATCH 0865/3235] don't tell users to verify themselves in person

---
 src/components/views/verification/VerificationShowSas.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 25f174fb30..4d3c962385 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -117,7 +117,9 @@ export default class VerificationShowSas extends React.Component {
         return <div className="mx_VerificationShowSas">
             <p>{sasCaption}</p>
             {sasDisplay}
-            <p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
+            <p>{this.props.isSelf ?
+                "":
+                _t("To be secure, do this in person or use a trusted way to communicate.")}</p>
             {confirm}
         </div>;
     }

From 724cff6a2e889aa62b45790a839408476ea436c7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 30 Jan 2020 16:55:43 +0000
Subject: [PATCH 0866/3235] Update QR code rendering to support
 VerificationRequests

Makes for building the QR code easier and more common.
---
 .../elements/crypto/VerificationQRCode.js     | 73 ++++++++++++++++++-
 .../views/right_panel/VerificationPanel.js    | 38 +++++-----
 2 files changed, 89 insertions(+), 22 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 630a06a07c..f9fea2dc78 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -19,6 +19,9 @@ import PropTypes from "prop-types";
 import {replaceableComponent} from "../../../../utils/replaceableComponent";
 import * as qs from "qs";
 import QRCode from "qrcode-react";
+import {MatrixClientPeg} from "../../../../MatrixClientPeg";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {ToDeviceChannel} from "matrix-js-sdk/src/crypto/verification/request/ToDeviceChannel";
 
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
@@ -31,13 +34,81 @@ export default class VerificationQRCode extends React.PureComponent {
         // User verification use case only
         secret: PropTypes.string,
         otherUserKey: PropTypes.string, // Base64 key being verified
-        requestEventId: PropTypes.string,
+        otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (optional)
+        requestEventId: PropTypes.string, // for DM verification only
     };
 
     static defaultProps = {
         action: "verify",
     };
 
+    static async getPropsForRequest(verificationRequest: VerificationRequest) {
+        const cli = MatrixClientPeg.get();
+        const myUserId = cli.getUserId();
+        const otherUserId = verificationRequest.otherUserId;
+        const myDeviceId = cli.getDeviceId();
+        const otherDevice = verificationRequest.estimatedTargetDevice;
+        const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
+
+        const qrProps = {
+            secret: verificationRequest.encodedSharedSecret,
+            keyholderUserId: myUserId,
+            action: "verify",
+            keys: [], // array of pairs: keyId, base64Key
+            otherUserKey: "", // base64key
+            otherUserDeviceKey: "", // base64key
+            requestEventId: "", // we figure this out in a moment
+        };
+
+        const requestEvent = verificationRequest.requestEvent;
+        qrProps.requestEventId = requestEvent.getId()
+            ? requestEvent.getId()
+            : ToDeviceChannel.getTransactionId(requestEvent);
+
+        // Populate the keys we need depending on which direction and users are involved in the verification.
+        if (myUserId === otherUserId) {
+            if (!otherDeviceId) {
+                // New -> Existing session QR code
+                qrProps.otherUserDeviceKey = null;
+            } else {
+                // Existing -> New session QR code
+                const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
+                const device = myDevices.find(d => d.deviceId === otherDeviceId);
+                if (device) qrProps.otherUserDeviceKey = device.getFingerprint();
+            }
+
+            // Either direction shares these next few props
+
+            const xsignInfo = cli.getStoredCrossSigningForUser(myUserId);
+            qrProps.otherUserKey = xsignInfo.getId("master");
+
+            qrProps.keys = [
+                [myDeviceId, cli.getDeviceEd25519Key()],
+                [xsignInfo.getId("master"), xsignInfo.getId("master")],
+            ];
+        } else {
+            // Doesn't matter which direction the verification is, we always show the same QR code
+            // for not-ourself verification.
+            const myXsignInfo = cli.getStoredCrossSigningForUser(myUserId);
+            const otherXsignInfo = cli.getStoredCrossSigningForUser(otherUserId);
+            const otherDevices = (await cli.getStoredDevicesForUser(otherUserId)) || [];
+            const otherDevice = otherDevices.find(d => d.deviceId === otherDeviceId);
+
+            qrProps.keys = [
+                [myDeviceId, cli.getDeviceEd25519Key()],
+                [myXsignInfo.getId("master"), myXsignInfo.getId("master")],
+            ];
+            qrProps.otherUserKey = otherXsignInfo.getId("master");
+            if (otherDevice) qrProps.otherUserDeviceKey = otherDevice.getFingerprint();
+        }
+
+        return qrProps;
+    }
+
+    constructor(props) {
+        super(props);
+    }
+
     render() {
         const query = {
             request: this.props.requestEventId,
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 3527747a66..ad1aaf598c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -20,7 +20,6 @@ import PropTypes from "prop-types";
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {_t} from "../../../languageHandler";
 import E2EIcon from "../rooms/E2EIcon";
 import {
@@ -29,7 +28,7 @@ import {
     PHASE_READY,
     PHASE_DONE,
     PHASE_STARTED,
-    PHASE_CANCELLED,
+    PHASE_CANCELLED, VerificationRequest,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
 
@@ -50,12 +49,24 @@ export default class VerificationPanel extends React.PureComponent {
 
     constructor(props) {
         super(props);
-        this.state = {};
+        this.state = {
+            qrCodeProps: null, // generated by the VerificationQRCode component itself
+        };
         this._hasVerifier = false;
+        this._generateQRCodeProps(props.request);
+    }
+
+    async _generateQRCodeProps(verificationRequest: VerificationRequest) {
+        try {
+            this.setState({qrCodeProps: await VerificationQRCode.getPropsForRequest(verificationRequest)});
+        } catch (e) {
+            console.error(e);
+            // Do nothing - we won't render a QR code.
+        }
     }
 
     renderQRPhase(pending) {
-        const {member, request} = this.props;
+        const {member} = this.props;
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let button;
@@ -69,10 +80,7 @@ export default class VerificationPanel extends React.PureComponent {
             );
         }
 
-        const cli = MatrixClientPeg.get();
-        const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
-        if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
-            // for whatever reason we can't generate a QR code, offer only SAS Verification
+        if (!this.state.qrCodeProps) {
             return <div className="mx_UserInfo_container">
                 <h3>Verify by emoji</h3>
                 <p>{_t("Verify by comparing unique emoji.")}</p>
@@ -81,12 +89,6 @@ export default class VerificationPanel extends React.PureComponent {
             </div>;
         }
 
-        const myKeyId = cli.getCrossSigningId();
-        const qrCodeKeys = [
-            [cli.getDeviceId(), cli.getDeviceEd25519Key()],
-            [myKeyId, myKeyId],
-        ];
-
         // TODO: add way to open camera to scan a QR code
         return <React.Fragment>
             <div className="mx_UserInfo_container">
@@ -96,13 +98,7 @@ export default class VerificationPanel extends React.PureComponent {
                 })}</p>
 
                 <div className="mx_VerificationPanel_qrCode">
-                    <VerificationQRCode
-                        keyholderUserId={MatrixClientPeg.get().getUserId()}
-                        requestEventId={request.requestEvent.getId()}
-                        otherUserKey={crossSigningInfo.getId("master")}
-                        secret={request.encodedSharedSecret}
-                        keys={qrCodeKeys}
-                    />
+                    <VerificationQRCode {...this.state.qrCodeProps} />
                 </div>
             </div>
 

From b84fd245b19b85546953bc9d6f4fb85d5aaea5cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 18:03:45 +0000
Subject: [PATCH 0867/3235] Fix room completion for invited rooms and upgraded
 rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/RoomProvider.js | 2 +-
 src/editor/parts.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index b28c79ac54..fccf1e3524 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -56,7 +56,7 @@ export default class RoomProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection, force);
         if (command) {
             // the only reason we need to do this is because Fuse only matches on properties
-            let matcherObjects = client.getRooms().filter(
+            let matcherObjects = client.getVisibleRooms().filter(
                 (room) => !!room && !!getDisplayAliasForRoom(room),
             ).map((room) => {
                 return {
diff --git a/src/editor/parts.js b/src/editor/parts.js
index 137018d7e9..cb801740d4 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -426,7 +426,7 @@ export class PartCreator {
         let room;
         if (alias[0] === '#') {
             room = this._client.getRooms().find((r) => {
-                return r.getAliases().includes(alias);
+                return r.getAliases().includes(alias) || r.getCanonicalAlias() === alias;
             });
         } else {
             room = this._client.getRoom(alias);

From bc71092b817b73023e80813e43958175cde7aa5c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 19:27:59 +0000
Subject: [PATCH 0868/3235] Use Sets instead of array scans and simplify hiding
 of invalid users to invite

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 25 +++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index f05f0477ee..c370b7c9fe 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -301,18 +301,16 @@ export default class InviteDialog extends React.PureComponent {
             throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
         }
 
-        let alreadyInvited = [];
+        const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get()['welcomeUserId']]);
         if (props.roomId) {
             const room = MatrixClientPeg.get().getRoom(props.roomId);
             if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
-            alreadyInvited = [
-                ...room.getMembersWithMembership('invite'),
-                ...room.getMembersWithMembership('join'),
-                ...room.getMembersWithMembership('ban'), // so we don't try to invite them
-            ].map(m => m.userId);
+            room.getMembersWithMembership('invite').forEach(m => alreadyInvited.add(m.userId));
+            room.getMembersWithMembership('join').forEach(m => alreadyInvited.add(m.userId));
+            // add banned users, so we don't try to invite them
+            room.getMembersWithMembership('ban').forEach(m => alreadyInvited.add(m.userId));
         }
 
-
         this.state = {
             targets: [], // array of Member objects (see interface above)
             filterText: "",
@@ -333,12 +331,12 @@ export default class InviteDialog extends React.PureComponent {
         this._editorRef = createRef();
     }
 
-    _buildRecents(excludedTargetIds: string[]): {userId: string, user: RoomMember, lastActive: number} {
+    _buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
         const recents = [];
         for (const userId in rooms) {
             // Filter out user IDs that are already in the room / should be excluded
-            if (excludedTargetIds.includes(userId)) {
+            if (excludedTargetIds.has(userId)) {
                 console.warn(`[Invite:Recents] Excluding ${userId} from recents`);
                 continue;
             }
@@ -381,10 +379,9 @@ export default class InviteDialog extends React.PureComponent {
         return recents;
     }
 
-    _buildSuggestions(excludedTargetIds: string[]): {userId: string, user: RoomMember} {
+    _buildSuggestions(excludedTargetIds: Set<string>): {userId: string, user: RoomMember} {
         const maxConsideredMembers = 200;
         const client = MatrixClientPeg.get();
-        const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
         const joinedRooms = client.getRooms()
             .filter(r => r.getMyMembership() === 'join')
             .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
@@ -396,10 +393,10 @@ export default class InviteDialog extends React.PureComponent {
                 return members; // Do nothing
             }
 
-            const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
+            const joinedMembers = room.getJoinedMembers().filter(u => !excludedTargetIds.has(u.userId));
             for (const member of joinedMembers) {
                 // Filter out user IDs that are already in the room / should be excluded
-                if (excludedTargetIds.includes(member.userId)) {
+                if (excludedTargetIds.has(member.userId)) {
                     continue;
                 }
 
@@ -456,7 +453,7 @@ export default class InviteDialog extends React.PureComponent {
             const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
             for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) {
                 const ev = events[i];
-                if (excludedUserIds.includes(ev.getSender())) {
+                if (excludedTargetIds.has(ev.getSender())) {
                     continue;
                 }
                 if (ev.getTs() <= earliestAgeConsidered) {

From 39e9bffe1fdd3722c5279a7478f43d236b04d039 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:03:26 +0000
Subject: [PATCH 0869/3235] Make encryption events into bubble-style tiles

Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
---
 res/css/_components.scss                      |  2 +-
 ...nRequest.scss => _common_CryptoEvent.scss} | 38 ++++++++++---------
 src/components/structures/MessagePanel.js     | 17 ++++++++-
 .../messages/MKeyVerificationConclusion.js    | 10 ++---
 .../views/messages/MKeyVerificationRequest.js | 16 ++++----
 src/components/views/rooms/EventTile.js       |  6 ++-
 src/i18n/strings/en_EN.json                   |  4 ++
 7 files changed, 58 insertions(+), 35 deletions(-)
 rename res/css/views/messages/{_MKeyVerificationRequest.scss => _common_CryptoEvent.scss} (61%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 22c9b73dca..bc636eb3c6 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -128,7 +128,6 @@
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
 @import "./views/messages/_MImageBody.scss";
-@import "./views/messages/_MKeyVerificationRequest.scss";
 @import "./views/messages/_MNoticeBody.scss";
 @import "./views/messages/_MStickerBody.scss";
 @import "./views/messages/_MTextBody.scss";
@@ -143,6 +142,7 @@
 @import "./views/messages/_TextualEvent.scss";
 @import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";
+@import "./views/messages/_common_CryptoEvent.scss";
 @import "./views/right_panel/_EncryptionInfo.scss";
 @import "./views/right_panel/_UserInfo.scss";
 @import "./views/right_panel/_VerificationPanel.scss";
diff --git a/res/css/views/messages/_MKeyVerificationRequest.scss b/res/css/views/messages/_common_CryptoEvent.scss
similarity index 61%
rename from res/css/views/messages/_MKeyVerificationRequest.scss
rename to res/css/views/messages/_common_CryptoEvent.scss
index ee20751083..98e1e97e39 100644
--- a/res/css/views/messages/_MKeyVerificationRequest.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,60 +14,62 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_KeyVerification {
+.mx_cryptoEvent {
 
     display: grid;
     grid-template-columns: 24px minmax(0, 1fr) min-content;
 
-    &.mx_KeyVerification_icon::after {
+    &.mx_cryptoEvent_icon::after {
         grid-column: 1;
         grid-row: 1 / 3;
-        width: 12px;
+        width: 16px;
         height: 16px;
         content: "";
-        mask-image: url("$(res)/img/e2e/normal.svg");
-        mask-repeat: no-repeat;
-        mask-size: 100%;
+        background-image: url("$(res)/img/e2e/normal.svg");
+        background-repeat: no-repeat;
+        background-size: 100%;
         margin-top: 4px;
-        background-color: $primary-fg-color;
     }
 
-    &.mx_KeyVerification_icon_verified::after {
-        mask-image: url("$(res)/img/e2e/verified.svg");
-        background-color: $accent-color;
+    &.mx_cryptoEvent_icon_verified::after {
+        background-image: url("$(res)/img/e2e/verified.svg");
     }
 
-    .mx_KeyVerification_title, .mx_KeyVerification_subtitle, .mx_KeyVerification_state {
+    &.mx_cryptoEvent_icon_warning::after {
+        background-image: url("$(res)/img/e2e/warning.svg");
+    }
+
+    .mx_cryptoEvent_title, .mx_cryptoEvent_subtitle, .mx_cryptoEvent_state {
         overflow-wrap: break-word;
     }
 
-    .mx_KeyVerification_title {
+    .mx_cryptoEvent_title {
         font-weight: 600;
         font-size: 15px;
         grid-column: 2;
         grid-row: 1;
     }
 
-    .mx_KeyVerification_subtitle {
+    .mx_cryptoEvent_subtitle {
         grid-column: 2;
         grid-row: 2;
     }
 
-    .mx_KeyVerification_state, .mx_KeyVerification_subtitle {
+    .mx_cryptoEvent_state, .mx_cryptoEvent_subtitle {
         font-size: 12px;
     }
 
-    .mx_KeyVerification_state, .mx_KeyVerification_buttons {
+    .mx_cryptoEvent_state, .mx_cryptoEvent_buttons {
         grid-column: 3;
         grid-row: 1 / 3;
     }
 
-    .mx_KeyVerification_buttons {
+    .mx_cryptoEvent_buttons {
         align-items: center;
         display: flex;
     }
 
-    .mx_KeyVerification_state {
+    .mx_cryptoEvent_state {
         width: 130px;
         padding: 10px 20px;
         margin: auto 0;
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 4ad75eb700..a13278cf68 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -465,6 +465,12 @@ export default class MessagePanel extends React.Component {
                }
                return false;
             };
+            // events that we include in the group but then eject out and place
+            // above the group.
+            const shouldEject = (ev) => {
+                if (ev.getType() === "m.room.encryption") return true;
+                return false;
+            };
             if (mxEv.getType() === "m.room.create") {
                 let summaryReadMarker = null;
                 const ts1 = mxEv.getTs();
@@ -484,6 +490,7 @@ export default class MessagePanel extends React.Component {
                 }
 
                 const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary
+                const ejectedEvents = [];
                 for (;i + 1 < this.props.events.length; i++) {
                     const collapsedMxEv = this.props.events[i + 1];
 
@@ -501,7 +508,11 @@ export default class MessagePanel extends React.Component {
                     // If RM event is in the summary, mark it as such and the RM will be appended after the summary.
                     summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(collapsedMxEv.getId());
 
-                    summarisedEvents.push(collapsedMxEv);
+                    if (shouldEject(collapsedMxEv)) {
+                        ejectedEvents.push(collapsedMxEv);
+                    } else {
+                        summarisedEvents.push(collapsedMxEv);
+                    }
                 }
 
                 // At this point, i = the index of the last event in the summary sequence
@@ -513,6 +524,10 @@ export default class MessagePanel extends React.Component {
                     return this._getTilesForEvent(e, e, e === lastShownEvent);
                 }).reduce((a, b) => a.concat(b), []);
 
+                for (const ejected of ejectedEvents) {
+                    ret.push(...this._getTilesForEvent(mxEv, ejected, last));
+                }
+
                 // Get sender profile from the latest event in the summary as the m.room.create doesn't contain one
                 const ev = this.props.events[i];
                 ret.push(<EventListSummary
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index a17dcd8ab0..c410c7fdff 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -94,12 +94,12 @@ export default class MKeyVerificationConclusion extends React.Component {
 
         if (title) {
             const subtitle = userLabelForEventRoom(request.otherUserId, mxEvent.getRoomId());
-            const classes = classNames("mx_EventTile_bubble", "mx_KeyVerification", "mx_KeyVerification_icon", {
-                mx_KeyVerification_icon_verified: request.done,
+            const classes = classNames("mx_EventTile_bubble", "mx_cryptoEvent", "mx_cryptoEvent_icon", {
+                mx_cryptoEvent_icon_verified: request.done,
             });
             return (<div className={classes}>
-                <div className="mx_KeyVerification_title">{title}</div>
-                <div className="mx_KeyVerification_subtitle">{subtitle}</div>
+                <div className="mx_cryptoEvent_title">{title}</div>
+                <div className="mx_cryptoEvent_subtitle">{subtitle}</div>
             </div>);
         }
 
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ebe5c9adf7..ab02b2e5ad 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -125,30 +125,30 @@ export default class MKeyVerificationRequest extends React.Component {
             } else {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
             }
-            stateNode = (<div className="mx_KeyVerification_state">{stateLabel}</div>);
+            stateNode = (<div className="mx_cryptoEvent_state">{stateLabel}</div>);
         }
 
         if (!request.initiatedByMe) {
             const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId());
-            title = (<div className="mx_KeyVerification_title">{
+            title = (<div className="mx_cryptoEvent_title">{
                 _t("%(name)s wants to verify", {name})}</div>);
-            subtitle = (<div className="mx_KeyVerification_subtitle">{
+            subtitle = (<div className="mx_cryptoEvent_subtitle">{
                 userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
             if (request.requested && !request.observeOnly) {
-                stateNode = (<div className="mx_KeyVerification_buttons">
+                stateNode = (<div className="mx_cryptoEvent_buttons">
                     <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
                     <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
                 </div>);
             }
         } else { // request sent by us
-            title = (<div className="mx_KeyVerification_title">{
+            title = (<div className="mx_cryptoEvent_title">{
                 _t("You sent a verification request")}</div>);
-            subtitle = (<div className="mx_KeyVerification_subtitle">{
+            subtitle = (<div className="mx_cryptoEvent_subtitle">{
                 userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId())}</div>);
         }
 
         if (title) {
-            return (<div className="mx_EventTile_bubble mx_KeyVerification mx_KeyVerification_icon">
+            return (<div className="mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon">
                 {title}
                 {subtitle}
                 {stateNode}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a8e9c7bf81..bba2310281 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -40,12 +40,14 @@ const eventTileTypes = {
     'm.sticker': 'messages.MessageEvent',
     'm.key.verification.cancel': 'messages.MKeyVerificationConclusion',
     'm.key.verification.done': 'messages.MKeyVerificationConclusion',
+    'm.room.encryption': 'messages.EncryptionEvent',
     'm.call.invite': 'messages.TextualEvent',
     'm.call.answer': 'messages.TextualEvent',
     'm.call.hangup': 'messages.TextualEvent',
 };
 
 const stateEventTileTypes = {
+    'm.room.encryption': 'messages.EncryptionEvent',
     'm.room.aliases': 'messages.TextualEvent',
     // 'm.room.aliases': 'messages.RoomAliasesEvent', // too complex
     'm.room.canonical_alias': 'messages.TextualEvent',
@@ -55,7 +57,6 @@ const stateEventTileTypes = {
     'm.room.avatar': 'messages.RoomAvatarEvent',
     'm.room.third_party_invite': 'messages.TextualEvent',
     'm.room.history_visibility': 'messages.TextualEvent',
-    'm.room.encryption': 'messages.TextualEvent',
     'm.room.topic': 'messages.TextualEvent',
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
@@ -600,7 +601,8 @@ export default createReactClass({
 
         // Info messages are basically information about commands processed on a room
         const isBubbleMessage = eventType.startsWith("m.key.verification") ||
-            (eventType === "m.room.message" && msgtype && msgtype.startsWith("m.key.verification"));
+            (eventType === "m.room.message" && msgtype && msgtype.startsWith("m.key.verification")) ||
+            (eventType === "m.room.encryption");
         let isInfoMessage = (
             !isBubbleMessage && eventType !== 'm.room.message' &&
             eventType !== 'm.sticker' && eventType !== 'm.room.create'
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6e58a76283..036d8c92f2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1194,6 +1194,10 @@
     "Today": "Today",
     "Yesterday": "Yesterday",
     "View Source": "View Source",
+    "Encryption enabled": "Encryption enabled",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.",
+    "Encryption not enabled": "Encryption not enabled",
+    "The encryption used by this room isn't supported": "The encryption used by this room isn't supported",
     "Error decrypting audio": "Error decrypting audio",
     "React": "React",
     "Reply": "Reply",

From 5447a04f8e6f8d3a6ba85b3df180e753e4586a52 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:15:15 +0000
Subject: [PATCH 0870/3235] oops, forgot the component

---
 .../views/messages/EncryptionEvent.js         | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 src/components/views/messages/EncryptionEvent.js

diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
new file mode 100644
index 0000000000..b7c13c0a05
--- /dev/null
+++ b/src/components/views/messages/EncryptionEvent.js
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {MatrixClientPeg} from '../../../MatrixClientPeg';
+import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import {getNameForEventRoom, userLabelForEventRoom}
+    from '../../../utils/KeyVerificationStateObserver';
+import dis from "../../../dispatcher";
+import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+
+export default class EncryptionEvent extends React.Component {
+    render() {
+        const {mxEvent} = this.props;
+
+        let body;
+        let classes = "mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon";
+        if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2') {
+            body = <div>
+                <div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
+                <div className="mx_cryptoEvent_subtitle">
+                    {_t(
+                        "Messages in this room are end-to-end encrypted. " +
+                        "Learn more & verify this user in their user profile.",
+                    )}
+                </div>
+            </div>;
+        } else {
+            body = <div>
+                <div className="mx_cryptoEvent_title">{_t("Encryption not enabled")}</div>
+                <div className="mx_cryptoEvent_subtitle">{_t("The encryption used by this room isn't supported")}</div>
+            </div>;
+            classes += " mx_cryptoEvent_icon_warning";
+        }
+
+        return (<div className={classes}>
+            {body}
+        </div>);
+        return null;
+    }
+}
+
+EncryptionEvent.propTypes = {
+    /* the MatrixEvent to show */
+    mxEvent: PropTypes.object.isRequired,
+};

From 2332cdb5d8452e598675b395c96547c82dd32c45 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 30 Jan 2020 20:47:46 +0000
Subject: [PATCH 0871/3235] full stop

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/messages/EncryptionEvent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
index b7c13c0a05..a475666e88 100644
--- a/src/components/views/messages/EncryptionEvent.js
+++ b/src/components/views/messages/EncryptionEvent.js
@@ -43,7 +43,7 @@ export default class EncryptionEvent extends React.Component {
         } else {
             body = <div>
                 <div className="mx_cryptoEvent_title">{_t("Encryption not enabled")}</div>
-                <div className="mx_cryptoEvent_subtitle">{_t("The encryption used by this room isn't supported")}</div>
+                <div className="mx_cryptoEvent_subtitle">{_t("The encryption used by this room isn't supported.")}</div>
             </div>;
             classes += " mx_cryptoEvent_icon_warning";
         }

From 5760e713188738d64386a861690f44f666891cea Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:50:06 +0000
Subject: [PATCH 0872/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 036d8c92f2..ddafdb391b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1197,7 +1197,7 @@
     "Encryption enabled": "Encryption enabled",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.",
     "Encryption not enabled": "Encryption not enabled",
-    "The encryption used by this room isn't supported": "The encryption used by this room isn't supported",
+    "The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.",
     "Error decrypting audio": "Error decrypting audio",
     "React": "React",
     "Reply": "Reply",

From f84795ebaeefe3cf44d858ca9c2ffb25094371c3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:50:12 +0000
Subject: [PATCH 0873/3235] Remove now unused code from TextForEvent

---
 src/TextForEvent.js | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index cdfea45ad7..d4003058c8 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -442,23 +442,6 @@ function textForHistoryVisibilityEvent(event) {
     }
 }
 
-function textForEncryptionEvent(event) {
-    const senderName = event.sender ? event.sender.name : event.getSender();
-    if (event.getContent().algorithm === "m.megolm.v1.aes-sha2") {
-        return _t('%(senderName)s turned on end-to-end encryption.', {
-            senderName,
-        });
-    }
-    return _t(
-        '%(senderName)s turned on end-to-end encryption ' +
-        '(unrecognised algorithm %(algorithm)s).',
-        {
-            senderName,
-            algorithm: event.getContent().algorithm,
-        },
-    );
-}
-
 // Currently will only display a change if a user's power level is changed
 function textForPowerEvent(event) {
     const senderName = event.sender ? event.sender.name : event.getSender();
@@ -636,7 +619,6 @@ const stateHandlers = {
     'm.room.member': textForMemberEvent,
     'm.room.third_party_invite': textForThreePidInviteEvent,
     'm.room.history_visibility': textForHistoryVisibilityEvent,
-    'm.room.encryption': textForEncryptionEvent,
     'm.room.power_levels': textForPowerEvent,
     'm.room.pinned_events': textForPinnedEvent,
     'm.room.server_acl': textForServerACLEvent,

From d56de6a67375ab1d9bd2517b38e8dd44d1de4f82 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:52:37 +0000
Subject: [PATCH 0874/3235] i18n again

---
 src/i18n/strings/en_EN.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ddafdb391b..29ea10728a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -259,8 +259,6 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s made future room history visible to all room members.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s made future room history visible to anyone.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s made future room history visible to unknown (%(visibility)s).",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s turned on end-to-end encryption.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",

From 58d16fea7db4e0ad23da962825779cde192d3489 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Jan 2020 20:59:27 +0000
Subject: [PATCH 0875/3235] lint

---
 src/components/views/messages/EncryptionEvent.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
index a475666e88..e161d050f1 100644
--- a/src/components/views/messages/EncryptionEvent.js
+++ b/src/components/views/messages/EncryptionEvent.js
@@ -16,13 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {getNameForEventRoom, userLabelForEventRoom}
-    from '../../../utils/KeyVerificationStateObserver';
-import dis from "../../../dispatcher";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 
 export default class EncryptionEvent extends React.Component {
     render() {
@@ -51,7 +45,6 @@ export default class EncryptionEvent extends React.Component {
         return (<div className={classes}>
             {body}
         </div>);
-        return null;
     }
 }
 

From 7e45979e00904d039d002a1f598bfa81cc548b30 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 20:59:30 +0000
Subject: [PATCH 0876/3235] change order of if or conditions as
 micro-optimization

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/parts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor/parts.js b/src/editor/parts.js
index cb801740d4..652342405f 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -426,7 +426,7 @@ export class PartCreator {
         let room;
         if (alias[0] === '#') {
             room = this._client.getRooms().find((r) => {
-                return r.getAliases().includes(alias) || r.getCanonicalAlias() === alias;
+                return r.getCanonicalAlias() === alias || r.getAliases().includes(alias);
             });
         } else {
             room = this._client.getRoom(alias);

From 1e09399dd6e8469f6a15382120dae5b617ca7dc2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 21:01:55 +0000
Subject: [PATCH 0877/3235] delint and collapse two consecutive filter
 operations

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index c370b7c9fe..e2741b36f9 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -381,10 +381,8 @@ export default class InviteDialog extends React.PureComponent {
 
     _buildSuggestions(excludedTargetIds: Set<string>): {userId: string, user: RoomMember} {
         const maxConsideredMembers = 200;
-        const client = MatrixClientPeg.get();
-        const joinedRooms = client.getRooms()
-            .filter(r => r.getMyMembership() === 'join')
-            .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
+        const joinedRooms = MatrixClientPeg.get().getRooms()
+            .filter(r => r.getMyMembership() === 'join' && r.getJoinedMemberCount() <= maxConsideredMembers);
 
         // Generates { userId: {member, rooms[]} }
         const memberRooms = joinedRooms.reduce((members, room) => {

From 7db6f89a9fcfa803c22c2b04e59e5f124e6a449b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 30 Jan 2020 21:07:32 +0000
Subject: [PATCH 0878/3235] hmm, there were two things using the client :((

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e2741b36f9..8fec2437f6 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -435,7 +435,7 @@ export default class InviteDialog extends React.PureComponent {
         // room to see who has sent a message in the last few hours, and giving them a score
         // which correlates to the freshness of their message. In theory, this results in suggestions
         // which are closer to "continue this conversation" rather than "this person exists".
-        const trueJoinedRooms = client.getRooms().filter(r => r.getMyMembership() === 'join');
+        const trueJoinedRooms = MatrixClientPeg.get().getRooms().filter(r => r.getMyMembership() === 'join');
         const now = (new Date()).getTime();
         const earliestAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago
         const maxMessagesConsidered = 50; // so we don't iterate over a huge amount of traffic

From 57c4293fc67de4ce2fbb1a41fd4babef83785dd0 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 21:38:40 +0000
Subject: [PATCH 0879/3235] Add verification status icons to room members

This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
---
 res/css/views/rooms/_EntityTile.scss     |  10 ++
 src/components/views/rooms/EntityTile.js |  13 ++-
 src/components/views/rooms/MemberTile.js | 121 ++++++++++++++++++++---
 3 files changed, 126 insertions(+), 18 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 92e0d5690c..e6800ef7b5 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,6 +20,15 @@ limitations under the License.
     align-items: center;
     color: $primary-fg-color;
     cursor: pointer;
+
+    .mx_E2EIcon {
+        margin: 0;
+        position: absolute;
+        bottom: 2px;
+        right: 7px;
+        height: 15px;
+        width: 15px;
+    }
 }
 
 .mx_EntityTile:hover {
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 40bf9f6d78..133205b1a5 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 import classNames from "classnames";
-
+import E2EIcon from './E2EIcon';
 
 const PRESENCE_CLASS = {
     "offline": "mx_EntityTile_offline",
@@ -30,7 +31,6 @@ const PRESENCE_CLASS = {
     "unavailable": "mx_EntityTile_unavailable",
 };
 
-
 function presenceClassForMember(presenceState, lastActiveAgo, showPresence) {
     if (showPresence === false) {
         return 'mx_EntityTile_online_beenactive';
@@ -69,6 +69,7 @@ const EntityTile = createReactClass({
         suppressOnHover: PropTypes.bool,
         showPresence: PropTypes.bool,
         subtextLabel: PropTypes.string,
+        e2eStatus: PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -165,6 +166,12 @@ const EntityTile = createReactClass({
             }[powerStatus];
         }
 
+        let e2eIcon;
+        const { e2eStatus } = this.props;
+        if (e2eStatus) {
+            e2eIcon = <E2EIcon status={e2eStatus} isUser={true} />;
+        }
+
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
         const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} />;
@@ -177,6 +184,7 @@ const EntityTile = createReactClass({
                     <div className="mx_EntityTile_avatar">
                         { av }
                         { powerLabel }
+                        { e2eIcon }
                     </div>
                     { nameEl }
                     { inviteButton }
@@ -189,5 +197,4 @@ const EntityTile = createReactClass({
 EntityTile.POWER_STATUS_MODERATOR = "moderator";
 EntityTile.POWER_STATUS_ADMIN = "admin";
 
-
 export default EntityTile;
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 95e5495339..649e1b4277 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
 import dis from "../../../dispatcher";
 import { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 export default createReactClass({
     displayName: 'MemberTile',
@@ -40,29 +41,101 @@ export default createReactClass({
     getInitialState: function() {
         return {
             statusMessage: this.getStatusMessage(),
+            isRoomEncrypted: false,
+            e2eStatus: null,
         };
     },
 
     componentDidMount() {
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
-            return;
+        const cli = MatrixClientPeg.get();
+
+        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+            const { user } = this.props.member;
+            if (user) {
+                user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+            }
         }
-        const { user } = this.props.member;
-        if (!user) {
-            return;
+
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            const { roomId } = this.props.member;
+            if (roomId) {
+                const isRoomEncrypted = cli.isRoomEncrypted(roomId);
+                this.setState({
+                    isRoomEncrypted,
+                });
+                if (isRoomEncrypted) {
+                    cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
+                    this.updateE2EStatus();
+                } else {
+                    // Listen for room to become encrypted
+                    cli.on("RoomState.events", this.onRoomStateEvents);
+                }
+            }
         }
-        user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
     },
 
     componentWillUnmount() {
+        const cli = MatrixClientPeg.get();
+
         const { user } = this.props.member;
-        if (!user) {
+        if (user) {
+            user.removeListener(
+                "User._unstable_statusMessage",
+                this._onStatusMessageCommitted,
+            );
+        }
+
+        if (cli) {
+            cli.removeListener("RoomState.events", this.onRoomStateEvents);
+            cli.removeListener("userTrustStatusChanged", this.onUserTrustStatusChanged);
+        }
+    },
+
+    onRoomStateEvents: function(ev) {
+        if (ev.getType() !== "m.room.encryption") return;
+        const { roomId } = this.props.member;
+        if (ev.getRoomId() !== roomId) return;
+
+        // The room is encrypted now.
+        const cli = MatrixClientPeg.get();
+        cli.removeListener("RoomState.events", this.onRoomStateEvents);
+        this.setState({
+            isRoomEncrypted: true,
+        });
+        this.updateE2EStatus();
+    },
+
+    onUserTrustStatusChanged: function(userId, trustStatus) {
+        if (userId !== this.props.member.userId) return;
+        this.updateE2EStatus();
+    },
+
+    updateE2EStatus: async function() {
+        const cli = MatrixClientPeg.get();
+        const { userId } = this.props.member;
+        const isMe = userId === cli.getUserId();
+        const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
+        if (!userVerified) {
+            this.setState({
+                e2eStatus: "normal",
+            });
             return;
         }
-        user.removeListener(
-            "User._unstable_statusMessage",
-            this._onStatusMessageCommitted,
-        );
+
+        const devices = await cli.getStoredDevicesForUser(userId);
+        const anyDeviceUnverified = devices.some(device => {
+            const { deviceId } = device;
+            // For your own devices, we use the stricter check of cross-signing
+            // verification to encourage everyone to trust their own devices via
+            // cross-signing so that other users can then safely trust you.
+            // For other people's devices, the more general verified check that
+            // includes locally verified devices can be used.
+            const deviceTrust = cli.checkDeviceTrust(userId, deviceId);
+            return isMe ? !deviceTrust.isCrossSigningVerified() : !deviceTrust.isVerified();
+        });
+        this.setState({
+            e2eStatus: anyDeviceUnverified ? "warning" : "verified",
+        });
     },
 
     getStatusMessage() {
@@ -94,6 +167,12 @@ export default createReactClass({
         ) {
             return true;
         }
+        if (
+            nextState.isRoomEncrypted !== this.state.isRoomEncrypted ||
+            nextState.e2eStatus !== this.state.e2eStatus
+        ) {
+            return true;
+        }
         return false;
     },
 
@@ -153,14 +232,26 @@ export default createReactClass({
 
         const powerStatus = powerStatusMap.get(powerLevel);
 
+        let e2eStatus;
+        if (this.state.isRoomEncrypted) {
+            e2eStatus = this.state.e2eStatus;
+        }
+
         return (
-            <EntityTile {...this.props} presenceState={presenceState}
+            <EntityTile
+                {...this.props}
+                presenceState={presenceState}
                 presenceLastActiveAgo={member.user ? member.user.lastActiveAgo : 0}
                 presenceLastTs={member.user ? member.user.lastPresenceTs : 0}
                 presenceCurrentlyActive={member.user ? member.user.currentlyActive : false}
-                avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
-                name={name} powerStatus={powerStatus} showPresence={this.props.showPresence}
+                avatarJsx={av}
+                title={this.getPowerLabel()}
+                name={name}
+                powerStatus={powerStatus}
+                showPresence={this.props.showPresence}
                 subtextLabel={statusMessage}
+                e2eStatus={e2eStatus}
+                onClick={this.onClick}
             />
         );
     },

From 5933bd15b1d6d211220bde3aad3e652ccab565af Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 21:46:49 +0000
Subject: [PATCH 0880/3235] Remove strange size change on member hover

Unclear why this is here, but removing as it feels quite glitchy, esp on
matrix.org where there's no second line to print.
---
 res/css/views/rooms/_EntityTile.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index e6800ef7b5..e37770066c 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -114,10 +114,6 @@ limitations under the License.
     opacity: 0.25;
 }
 
-.mx_EntityTile:not(.mx_EntityTile_noHover):hover .mx_EntityTile_name {
-    font-size: 13px;
-}
-
 .mx_EntityTile_subtext {
     font-size: 11px;
     opacity: 0.5;

From 3ef7e5113bedaa4172c6d0cec3655aaec5b1df20 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 22:04:47 +0000
Subject: [PATCH 0881/3235] Move power label to right of name

The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
---
 res/css/views/rooms/_EntityTile.scss     | 13 ++++++++++++-
 src/components/views/rooms/EntityTile.js |  7 ++++---
 src/i18n/strings/en_EN.json              |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index e37770066c..bce01af097 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -40,7 +40,7 @@ limitations under the License.
     content: "";
     position: absolute;
     top: calc(50% - 8px); // center
-    right: 10px;
+    right: -8px;
     mask: url('$(res)/img/member_chevron.png');
     mask-repeat: no-repeat;
     width: 16px;
@@ -85,6 +85,7 @@ limitations under the License.
 
 .mx_EntityTile_details {
     overflow: hidden;
+    flex: 1;
 }
 
 .mx_EntityTile_ellipsis .mx_EntityTile_name {
@@ -121,3 +122,13 @@ limitations under the License.
     white-space: nowrap;
     text-overflow: clip;
 }
+
+.mx_EntityTile_power {
+    padding-inline-start: 6px;
+    font-size: 10px;
+    color: $notice-secondary-color;
+}
+
+.mx_EntityTile:hover .mx_EntityTile_power {
+    display: none;
+}
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 133205b1a5..fd92cb8e57 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -160,10 +160,11 @@ const EntityTile = createReactClass({
         let powerLabel;
         const powerStatus = this.props.powerStatus;
         if (powerStatus) {
-            powerLabel = {
-                [EntityTile.POWER_STATUS_MODERATOR]: _t("Moderator"),
+            const powerText = {
+                [EntityTile.POWER_STATUS_MODERATOR]: _t("Mod"),
                 [EntityTile.POWER_STATUS_ADMIN]: _t("Admin"),
             }[powerStatus];
+            powerLabel = <div className="mx_EntityTile_power">{powerText}</div>;
         }
 
         let e2eIcon;
@@ -183,10 +184,10 @@ const EntityTile = createReactClass({
                                   onClick={this.props.onClick}>
                     <div className="mx_EntityTile_avatar">
                         { av }
-                        { powerLabel }
                         { e2eIcon }
                     </div>
                     { nameEl }
+                    { powerLabel }
                     { inviteButton }
                 </AccessibleButton>
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6e58a76283..dde006bbd2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -909,6 +909,7 @@
     "Some sessions in this encrypted room are not trusted": "Some sessions in this encrypted room are not trusted",
     "All sessions in this encrypted room are trusted": "All sessions in this encrypted room are trusted",
     "Edit message": "Edit message",
+    "Mod": "Mod",
     "This event could not be displayed": "This event could not be displayed",
     "%(senderName)s sent an image": "%(senderName)s sent an image",
     "%(senderName)s sent a video": "%(senderName)s sent a video",

From 673fb792e5dc433087482a41527daa1b817a7f32 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 22:08:01 +0000
Subject: [PATCH 0882/3235] Remove unused power level icons

---
 res/img/admin.svg | 17 -----------------
 res/img/mod.svg   | 16 ----------------
 2 files changed, 33 deletions(-)
 delete mode 100644 res/img/admin.svg
 delete mode 100644 res/img/mod.svg

diff --git a/res/img/admin.svg b/res/img/admin.svg
deleted file mode 100644
index 7ea7459304..0000000000
--- a/res/img/admin.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="16px" height="17px" viewBox="-1 -1 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: sketchtool 3.4.4 (395) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_owner</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="02_19-Room-contextual-menu-hover" sketch:type="MSArtboardGroup" transform="translate(-1000.000000, -128.000000)">
-            <g id="people_open" sketch:type="MSLayerGroup" transform="translate(966.000000, 59.000000)">
-                <g id="icons_owner" transform="translate(35.000000, 70.000000)" sketch:type="MSShapeGroup">
-                    <path d="M0.441894529,1.80537109 C2.59277353,3.03442388 4.25305977,2.17675781 5.9832796,0.805371094 C8.01666135,2.17675787 9.50756797,3.12670903 11.6293941,1.80537109 C11.6293941,7.01538067 11.9379879,12.2253912 5.9832796,12.2253906 C0.0285712975,12.2253901 0.441894531,7.01538067 0.441894529,1.80537109 Z" id="Path-2-Copy" stroke="#FFFFFF" fill="#F6A623"></path>
-                    <polygon id="Star-1" fill="#FFFFFF" points="6 8.8 3.88397309 9.91246118 4.28809827 7.55623059 2.57619654 5.88753882 4.94198655 5.54376941 6 3.4 7.05801345 5.54376941 9.42380346 5.88753882 7.71190173 7.55623059 8.11602691 9.91246118 "></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/mod.svg b/res/img/mod.svg
deleted file mode 100644
index 847baf98f9..0000000000
--- a/res/img/mod.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="16px" height="17px" viewBox="-1 -1 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: sketchtool 3.4.4 (395) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_admin</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="02_19-Room-contextual-menu-hover" sketch:type="MSArtboardGroup" transform="translate(-1000.000000, -172.000000)" stroke="#FFFFFF" fill="#C2C5AF">
-            <g id="people_open" sketch:type="MSLayerGroup" transform="translate(966.000000, 59.000000)">
-                <g id="icons_admin" transform="translate(35.000000, 114.000000)" sketch:type="MSShapeGroup">
-                    <path d="M0.441894529,1.80537109 C2.59277353,3.03442388 4.25305977,2.17675781 5.9832796,0.805371094 C8.01666135,2.17675787 9.50756797,3.12670903 11.6293941,1.80537109 C11.6293941,7.01538067 11.9379879,12.2253912 5.9832796,12.2253906 C0.0285712975,12.2253901 0.441894531,7.01538067 0.441894529,1.80537109 Z" id="Path-2-Copy-2"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

From 5c4b91457e131740fcca6a6d89893e843aa71226 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 22:28:56 +0000
Subject: [PATCH 0883/3235] Fix tests

---
 test/components/views/groups/GroupMemberList-test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/components/views/groups/GroupMemberList-test.js b/test/components/views/groups/GroupMemberList-test.js
index 867190f6f4..39720177cc 100644
--- a/test/components/views/groups/GroupMemberList-test.js
+++ b/test/components/views/groups/GroupMemberList-test.js
@@ -112,7 +112,9 @@ describe("GroupMemberList", function() {
             const memberList = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_MemberList_joined");
             const memberListElement = ReactDOM.findDOMNode(memberList);
             expect(memberListElement).toBeTruthy();
-            expect(memberListElement.textContent).toBe("Test");
+            const userNameElement = memberListElement.querySelector(".mx_EntityTile_name");
+            expect(userNameElement).toBeTruthy();
+            expect(userNameElement.textContent).toBe("Test");
         });
 
         httpBackend.when("GET", "/groups/" + groupIdEncoded + "/summary").respond(200, summaryResponse);

From 6f6d6b096a0e752f0ad649d70cd541008334c634 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Jan 2020 22:43:14 +0000
Subject: [PATCH 0884/3235] Ensure QR code, verified hero are centered

---
 res/css/views/right_panel/_VerificationPanel.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 75b469cef9..827f2a2c49 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -16,7 +16,8 @@ limitations under the License.
 
 .mx_UserInfo {
     .mx_VerificationPanel_verified_section .mx_E2EIcon {
-        margin: 0 auto;
+        // Override general user info margin
+        margin: 0 auto !important;
     }
 
     .mx_VerificationPanel_qrCode {
@@ -25,7 +26,8 @@ limitations under the License.
         border-radius: 4px;
         width: max-content;
         max-width: 100%;
-        margin: 0 auto;
+        // Override general user info margin
+        margin: 0 auto !important;
 
         canvas {
             // override height and width which are set on the element directly

From bf9f473ed9689b822263a650aeed1f9e2796b3ab Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <stasiek@michalski.cc>
Date: Fri, 31 Jan 2020 00:09:08 +0100
Subject: [PATCH 0885/3235] Add a class for styling room directory permissions

Fixes vector-im/riot-web#11174
---
 res/css/structures/_RoomDirectory.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index 4b49332af7..5ae8df7176 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -119,6 +119,16 @@ limitations under the License.
     display: inline-block;
 }
 
+.mx_RoomDirectory_perm {
+    border-radius: 10px;
+    display: inline-block;
+    height: 20px;
+    line-height: 20px;
+    padding: 0 5px;
+    color: $accent-fg-color;
+    background-color: $rte-room-pill-color;
+}
+
 .mx_RoomDirectory_topic {
     cursor: initial;
     color: $light-fg-color;

From fde30577e4b370cf952338f058085ef65ef54972 Mon Sep 17 00:00:00 2001
From: BobVul <bob+git@vulpin.com>
Date: Fri, 31 Jan 2020 12:33:10 +1100
Subject: [PATCH 0886/3235] Fix escaped markdown passing backslashes through

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

Signed-off-by: Bob Rao <bob+git@vulpin.com>
---
 src/editor/serialize.js       | 4 ++++
 test/editor/serialize-test.js | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index ba380f2809..075c462b37 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -41,6 +41,10 @@ export function htmlSerializeIfNeeded(model, {forceHTML = false} = {}) {
     if (!parser.isPlainText() || forceHTML) {
         return parser.toHTML();
     }
+    // Format "plain" text to ensure removal of backslash escapes
+    // https://github.com/vector-im/riot-web/issues/11230
+    // https://github.com/vector-im/riot-web/issues/2870
+    return parser.toPlaintext();
 }
 
 export function textSerialize(model) {
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index 7517e46437..f846e0d79e 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -43,4 +43,10 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<em>hello</em> world");
     });
+    it('escaped markdown should not retain backslashes', function() {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.plain('\\*hello\\* world')]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe('*hello* world');
+    })
 });

From eb02c60abe7f3a3688dd052b408b2ee07f2b0776 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 31 Jan 2020 02:47:34 +0000
Subject: [PATCH 0887/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.3% (2083 of 2098 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 | 97 ++++++++++++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c48b895fda..71d3bfb1eb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1986,5 +1986,100 @@
     "Enable": "啟用",
     "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot 缺少某些在本機快取已加密訊習所需的元件。如果您想要實驗此功能，請<nativeLink>加入搜尋元件</nativeLink>並自行建構 Riot 桌面版。",
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot 無法在網路瀏覽器中安全地在本機快取已加密的訊息。使用 <riotLink>Riot 桌面版</riotLink>來讓已加密的訊息出現在搜尋結果中。",
-    "This session is backing up your keys. ": "此工作階段正在備份您的金鑰。 "
+    "This session is backing up your keys. ": "此工作階段正在備份您的金鑰。 ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "此工作階段<b>不會備份您的金鑰</b>，但您已有既有的備份，您可以從那邊復原，或是稍後再做。",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "在登出前，請先將此工作階段連線到金鑰備份以避免遺失任何可能僅在此工作階段中的金鑰。",
+    "Connect this session to Key Backup": "將此工作階段連線到金鑰備份",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "備份有來自<verify>未知</verify>工作階段，ID %(deviceId)s 的簽章",
+    "Backup has a <validity>valid</validity> signature from this session": "備份有來自此工作階段的<validity>有效</validity>簽章",
+    "Backup has an <validity>invalid</validity> signature from this session": "備份有來自此工作階段的<validity>無效</validity>簽章",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "備份有從<verify>已驗證</verify>的工作階段 <device></device> 的<validity>有效</validity>簽章",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "備份有從<verify>未驗證</verify>的工作階段 <device></device> 的<validity>有效</validity>簽章",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "備份有從<verify>已驗證</verify>的工作階段 <device></device> 的<validity>無效</validity>簽章",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "備份有從<verify>未驗證</verify>的工作階段 <device></device> 的<validity>無效</validity>簽章",
+    "Backup is not signed by any of your sessions": "備份未被您的任何工作階段簽署",
+    "This backup is trusted because it has been restored on this session": "此備份已受信任，因為它已在此工作階段上復原",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "備份金鑰已儲存在秘密儲存空間，但此功能未在此工作階段上啟用。請在實驗室中啟用簽章以修改金鑰備份狀態。",
+    "Your keys are <b>not being backed up from this session</b>.": "您的金鑰<b>沒有從此工作階段備份</b>。",
+    "Enable desktop notifications for this session": "為此工作階段啟用桌面通知",
+    "Enable audible notifications for this session": "為此工作階段啟用聲音通知",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "您的密碼已成功變更。您必須登入回其他工作階段才能收到推播通知",
+    "Session ID:": "工作階段 ID：",
+    "Session key:": "工作階段金鑰：",
+    "Message search": "訊息搜尋",
+    "Sessions": "工作階段",
+    "A session's public name is visible to people you communicate with": "工作階段的公開名稱可被您通訊的夥伴看到",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室已橋接訊息到以下平臺。<a>取得更多詳細資訊。",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "此聊天室未橋接訊息到任何平臺。<a>取得更多詳細資訊。</a>",
+    "Bridges": "橋接",
+    "This user has not verified all of their sessions.": "此使用者尚未驗證他們的所有工作階段。",
+    "You have not verified this user. This user has verified all of their sessions.": "您尚未驗證此使用者。此使用者已驗證他們所有的工作階段。",
+    "You have verified this user. This user has verified all of their sessions.": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。",
+    "Someone is using an unknown session": "某人正仔使用未知的工作階段",
+    "Some sessions for this user are not trusted": "此使用者的某些工作階段未受信任",
+    "All sessions for this user are trusted": "此使用者的所有工作階段皆受信任",
+    "Some sessions in this encrypted room are not trusted": "此已加密的聊天室中的某些工作階段未受信任",
+    "All sessions in this encrypted room are trusted": "在此已加密聊天室的所有工作階段都受信任",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "您的金鑰分享請求已傳送，請檢查您其他的工作階段以取得金鑰分享請求",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "金鑰分享請求已自動傳送到您其他的工作階段。如果您在您其他的工作階段上拒絕或忽略金鑰分享請求，點擊此處以再此請求此工作階段的金鑰。",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "如果您的其他工作階段沒有此訊息的金鑰，您就無法解密它們。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "從您的其他工作階段<requestLink>重新請求加密金鑰</requestLink>。",
+    "Encrypted by an unverified session": "已由未驗證的工作階段加密",
+    "Encrypted by a deleted session": "被已刪除的工作階段加密",
+    "No sessions with registered encryption keys": "沒有已註冊加密金鑰的工作階段",
+    "Waiting for %(displayName)s to accept…": "正在等待 %(displayName)s 接受……",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "您的訊息已受保護，只有您與收件人才有獨一無二的金鑰將其解鎖。",
+    "Your messages are not secure": "您的訊息不安全",
+    "One of the following may be compromised:": "以下的其中一項可能會受到威脅：",
+    "Your homeserver": "您的家伺服器",
+    "The homeserver the user you’re verifying is connected to": "您要驗證的使用者連線到的家伺服器",
+    "Yours, or the other users’ internet connection": "您的，或其他使用者的網際網路連線",
+    "Yours, or the other users’ session": "您的，或其他使用者的工作階段",
+    "%(count)s sessions|other": "%(count)s 個工作階段",
+    "%(count)s sessions|one": "%(count)s 個工作階段",
+    "Hide sessions": "隱藏工作階段",
+    "Verify by emoji": "透過表情符號驗證",
+    "Verify by comparing unique emoji.": "透過比較獨一無二的表情符號驗證。",
+    "Ask %(displayName)s to scan your code:": "要求 %(displayName)s 掃描您的條碼：",
+    "If you can't scan the code above, verify by comparing unique emoji.": "如果您無法掃描上面的條碼，請透過比較獨一無二的表情符號驗證。",
+    "You've successfully verified %(displayName)s!": "您已成功驗證 %(displayName)s！",
+    "Got it": "好的",
+    "Verification timed out. Start verification again from their profile.": "驗證逾時。再次從他們的簡介中開始驗證。",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s 已取消驗證。再次從他們的簡介中開始驗證。",
+    "You cancelled verification. Start verification again from their profile.": "您取消了驗證。再次從他們的簡介中開始驗證。",
+    "Clear all data in this session?": "清除所有此工作階段中的資料？",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "將會永久清除此工作階段的所有資料。除發已備份金鑰，否則已加密的訊息將會遺失。",
+    "Verify session": "驗證工作階段",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "要驗證此工作階段是否可受信任，請檢查您在裝置上的使用者設定中看到的金鑰是否與下方的金鑰相符：",
+    "To verify that this session 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 session matches the key below:": "要驗證此工作階段是否可受信任，請透過其他方式（如面對面或電話）聯絡其所有人，並詢問他們在他們的使用者設定中看到的金鑰是否與下面的相同：",
+    "Session name": "工作階段名稱",
+    "Session key": "工作階段金鑰",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "如果其相符，請按下方的驗證按鈕。如果不相符，則表示可能有其他人正在攔截此工作階段，您可能會想要改按黑名單按鈕。",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "驗證此使用者將會把他們的工作階段標記為受信任，並同時為他們標記您的工作階段可受信任。",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "您加入了一個新的工作階段「%(displayName)s」，其正在請求加密金鑰。",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "您的未驗證工作階段「%(displayName)s」正在請求加密金鑰。",
+    "Loading session info...": "正在載入工作階段資訊……",
+    "New session": "新工作階段",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "使用此工作階段以驗證您新的工作階段，並授予其對加密訊息的存取權限：",
+    "If you didn’t sign in to this session, your account may be compromised.": "如果您未登入此工作階段，您的帳號可能已被盜用。",
+    "This wasn't me": "這不是我",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "退出後，您可以回到您的帳號，並登入其他工作階段。",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "您目前正將未驗證的工作階段加入黑名單；要傳送訊息給這些作階段，您必須驗證它們。",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "我們建議您對每個工作階段進行驗證流程以確認它們屬於其合法所有者，但如果您願意的話，您還是可以不經驗證就重新傳送訊息。",
+    "Room contains unknown sessions": "聊天室包含未知的工作階段",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "「%(RoomName)s」包含您以前沒看過的工作階段。",
+    "Unknown sessions": "未知的工作階段",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "透過輸入您的通關密語來存取您的安全訊息歷史，以及用來驗證其他工作階段的交叉簽章身份。",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "透過輸入您的復原金鑰來存取您的安全訊息歷史，以及用來驗證其他工作階段的交叉簽章身份。",
+    "Message not sent due to unknown sessions being present": "因為有未知的工作階段，所以並未傳送訊息",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>顯示工作階段</showSessionsText>，<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
+    "Your new session is now verified. Other users will see it as trusted.": "您新的工作階段已驗證。其他使用者將會看到其已受信任。",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "如果在此工作階段中沒有完成安全性驗證，它將無法存取已加密的訊息。",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "變更您的密碼將會重設您所有的工作階段上任何端到端加密金鑰，讓已加密的聊天歷史無法讀取。設定金鑰備份或在重設您的密碼前從其他工作階段匯出您的聊天室金鑰。",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "您已登出所有工作階段，且將不會再收到推播通知。要重新啟用通知，請在每個裝置上重新登入。",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "重新取得對您的帳號的存取權限，並復原此工作階段中的復原金鑰。沒有它們，您就無法在任何工作階段中閱讀您所有的安全訊息。",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "警告：您的個人資料（包含加密金鑰）仍儲存在此工作階段中。如果您已不用此工作階段了，或是您想登入另一個帳號，就請將其清除。",
+    "Sender session information": "傳送者工作階段資訊",
+    "Restore your key backup to upgrade your encryption": "復原您的金鑰備份以升級您的加密",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，"
 }

From d0ab37ac50658c12a0a388f1cd20f66fe7c2fd49 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 09:58:21 +0000
Subject: [PATCH 0888/3235] Only say the room is encrypted if it actually is

---
 src/components/views/messages/EncryptionEvent.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
index e161d050f1..ab0f3fde2e 100644
--- a/src/components/views/messages/EncryptionEvent.js
+++ b/src/components/views/messages/EncryptionEvent.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 
 export default class EncryptionEvent extends React.Component {
     render() {
@@ -24,7 +25,10 @@ export default class EncryptionEvent extends React.Component {
 
         let body;
         let classes = "mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon";
-        if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2') {
+        if (
+            mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' &&
+            MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId())
+        ) {
             body = <div>
                 <div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
                 <div className="mx_cryptoEvent_subtitle">

From 36d7b8e3ed2941cb62cdd68610d1c62b4ad1958e Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 31 Jan 2020 09:59:24 +0000
Subject: [PATCH 0889/3235] don't close in UI, a js-sdk event will do that

---
 src/components/views/toasts/VerificationRequestToast.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 61d26c60cc..5125e20261 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -38,11 +38,6 @@ export default class VerificationRequestToast extends React.PureComponent {
                 let {counter} = this.state;
                 counter = Math.max(0, counter - 1);
                 this.setState({counter});
-
-                if (counter == 0) {
-                    clearInterval(this._intervalHandle);
-                    this.cancel();
-                }
             }, 1000);
         }
         request.on("change", this._checkRequestIsPending);

From 31476737ea5b59efdeae40bcdbf1537353b05c01 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 10:11:34 +0000
Subject: [PATCH 0890/3235] Enforce a max width on power labels

---
 res/css/views/rooms/_EntityTile.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index bce01af097..a2867de3a7 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -127,6 +127,10 @@ limitations under the License.
     padding-inline-start: 6px;
     font-size: 10px;
     color: $notice-secondary-color;
+    max-width: 6em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .mx_EntityTile:hover .mx_EntityTile_power {

From fe33e2664fdaa0ae762ce4bdcd99be02d2f33a62 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 31 Jan 2020 09:58:40 +0000
Subject: [PATCH 0891/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.2% (2086 of 2102 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 71d3bfb1eb..0c920c3253 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2081,5 +2081,11 @@
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "警告：您的個人資料（包含加密金鑰）仍儲存在此工作階段中。如果您已不用此工作階段了，或是您想登入另一個帳號，就請將其清除。",
     "Sender session information": "傳送者工作階段資訊",
     "Restore your key backup to upgrade your encryption": "復原您的金鑰備份以升級您的加密",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，"
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "",
+    "Back up my encryption keys, securing them with the same passphrase": "",
+    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "沒有設定安全訊息復原，如果您登出的或是用其他工作階段的話，您就無法復原您已加密的訊習歷史。",
+    "This session is encrypting history using the new recovery method.": "此工作階段正在使用新的復原方法加密歷史。",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。"
 }

From 26c9b64c3b6f856b99778695dde20a809e765487 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 10:35:05 +0000
Subject: [PATCH 0892/3235] Log exceptions from accessSecretStorage

Rather than ignoring everything assuming the user cancelled
---
 src/CrossSigningManager.js                         | 8 +++++++-
 src/components/structures/auth/CompleteSecurity.js | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 085764214f..d41580c292 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -29,6 +29,12 @@ import { _t } from './languageHandler';
 let secretStorageKeys = {};
 let cachingAllowed = false;
 
+export class AccessCancelledError extends Error {
+    constructor() {
+        super("Secret storage access canceled");
+    }
+}
+
 async function getSecretStorageKey({ keys: keyInfos }) {
     const keyInfoEntries = Object.entries(keyInfos);
     if (keyInfoEntries.length > 1) {
@@ -66,7 +72,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
     );
     const [input] = await finished;
     if (!input) {
-        throw new Error("Secret storage access canceled");
+        throw new AccessCancelledError();
     }
     const key = await inputToKey(input);
 
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 66834deb2c..6d4abb0607 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { accessSecretStorage } from '../../../CrossSigningManager';
+import { accessSecretStorage, AccessCancelledError } from '../../../CrossSigningManager';
 
 const PHASE_INTRO = 0;
 const PHASE_BUSY = 1;
@@ -73,6 +73,9 @@ export default class CompleteSecurity extends React.Component {
                 });
             }
         } catch (e) {
+            if (!e instanceof AccessCancelledError) {
+                console.log(e);
+            }
             // this will throw if the user hits cancel, so ignore
             this.setState({
                 phase: PHASE_INTRO,

From af0598bbcb406148906884c836ea128d3c823266 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 31 Jan 2020 10:37:40 +0000
Subject: [PATCH 0893/3235] double-check user verification

---
 .../views/messages/MKeyVerificationConclusion.js          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index c410c7fdff..1aaa79be63 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -63,6 +63,14 @@ export default class MKeyVerificationConclusion extends React.Component {
         if (request.pending) {
             return false;
         }
+
+        // User isn't actually verified
+        if (!MatrixClientPeg.get()
+                            .checkUserTrust(mxEvent.verificationRequest.otherUserId)
+                            .isCrossSigningVerified()) {
+            return false;
+        }
+
         return true;
     }
 

From ea7f160950c335810cbded6bfd00ff1a45aee01c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 10:38:20 +0000
Subject: [PATCH 0894/3235] lint

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

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 6d4abb0607..e7071bee0c 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -73,7 +73,7 @@ export default class CompleteSecurity extends React.Component {
                 });
             }
         } catch (e) {
-            if (!e instanceof AccessCancelledError) {
+            if (!(e instanceof AccessCancelledError)) {
                 console.log(e);
             }
             // this will throw if the user hits cancel, so ignore

From 1a95a1d4ba9693d345b1b9ecc2f33db819f3452e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 10:47:58 +0000
Subject: [PATCH 0895/3235] Add title to complete security loading

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

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 66834deb2c..0b646b390f 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -220,7 +220,7 @@ export default class CompleteSecurity extends React.Component {
         } else if (phase === PHASE_BUSY) {
             const Spinner = sdk.getComponent('views.elements.Spinner');
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
-            title = '';
+            title = _t("Complete security");
             body = <Spinner />;
         } else {
             throw new Error(`Unknown phase ${phase}`);

From 96d5fb5ce322fd9a0a323a797fd22f196ea3b623 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 10:59:35 +0000
Subject: [PATCH 0896/3235] Only display the first zxcvbn warning/suggestion

As per comment

Fixes https://github.com/vector-im/riot-web/issues/12150
---
 .../secretstorage/CreateSecretStorageDialog.js  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 64aff467a7..4f0db1eebe 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -453,14 +453,19 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
                 helpText = _t("Great! This passphrase looks strong enough.");
             } else {
-                const suggestions = [];
-                for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
-                    suggestions.push(<div key={i}>{this.state.zxcvbnResult.feedback.suggestions[i]}</div>);
-                }
-                const suggestionBlock = <div>{suggestions.length > 0 ? suggestions : _t("Keep going...")}</div>;
+                // We take the warning from zxcvbn or failing that, the first
+                // suggestion. In practice The first is generally the most relevant
+                // and it's probably better to present the user with one thing to
+                // improve about their password than a whole collection - it can
+                // spit out a warning and multiple suggestions which starts getting
+                // very information-dense.
+                const suggestion = (
+                    this.state.zxcvbnResult.feedback.warning ||
+                    this.state.zxcvbnResult.feedback.suggestions[0]
+                );
+                const suggestionBlock = <div>{suggestion || _t("Keep going...")}</div>;
 
                 helpText = <div>
-                    {this.state.zxcvbnResult.feedback.warning}
                     {suggestionBlock}
                 </div>;
             }

From b64ba1dbbf1c7be6cb40a0946f5f68bbfc11dd25 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 11:09:49 +0000
Subject: [PATCH 0897/3235] Add temporary feature flag to control padlocks

This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
---
 src/components/views/rooms/InviteOnlyIcon.js | 5 +++++
 src/i18n/strings/en_EN.json                  | 1 +
 src/settings/Settings.js                     | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
index 5afaa7f0f2..07156b2973 100644
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
+import SettingsStore from '../../../settings/SettingsStore';
 
 export default class InviteOnlyIcon extends React.Component {
     constructor() {
@@ -36,6 +37,10 @@ export default class InviteOnlyIcon extends React.Component {
     };
 
     render() {
+        if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
+            return null;
+        }
+
         const Tooltip = sdk.getComponent("elements.Tooltip");
         let tooltip;
         if (this.state.hover) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 154e8d0d28..8b89524f69 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -374,6 +374,7 @@
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
+    "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 5ea871dc69..ecaf9cd2e3 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -160,6 +160,12 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
+    "feature_invite_only_padlocks": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Show padlocks on invite only rooms"),
+        default: true,
+    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From 02cada7cc62abafc03516aac82deb5496591bd98 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 12:15:19 +0000
Subject: [PATCH 0898/3235] First pass of copy changes

---
 .../keybackup/CreateKeyBackupDialog.js        | 28 +++---------
 .../CreateSecretStorageDialog.js              | 43 ++++---------------
 .../auth/InteractiveAuthEntryComponents.js    |  2 +-
 .../keybackup/RestoreKeyBackupDialog.js       | 10 ++---
 .../views/toasts/SetupEncryptionToast.js      |  2 +-
 src/i18n/strings/en_EN.json                   | 38 +++++++---------
 6 files changed, 38 insertions(+), 85 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 09abb2677d..8fe9373218 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -71,7 +71,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             copied: false,
             downloaded: false,
             zxcvbnResult: null,
-            setPassPhrase: false,
         };
 
         if (this.state.secureSecretStorage === undefined) {
@@ -219,7 +218,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _onPassPhraseConfirmNextClick = async () => {
         this._keyBackupInfo = await MatrixClientPeg.get().prepareKeyBackupVersion(this.state.passPhrase);
         this.setState({
-            setPassPhrase: true,
             copied: false,
             downloaded: false,
             phase: PHASE_SHOWKEY,
@@ -338,7 +336,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             <details>
                 <summary>{_t("Advanced")}</summary>
                 <p><button onClick={this._onSkipPassPhraseClick} >
-                    {_t("Set up with a Recovery Key")}
+                    {_t("Set up with a recovery key")}
                 </button></p>
             </details>
         </div>;
@@ -401,28 +399,17 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     }
 
     _renderPhaseShowKey() {
-        let bodyText;
-        if (this.state.setPassPhrase) {
-            bodyText = _t(
-                "As a safety net, you can use it to restore your encrypted message " +
-                "history if you forget your Recovery Passphrase.",
-            );
-        } else {
-            bodyText = _t("As a safety net, you can use it to restore your encrypted message history.");
-        }
-
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
                 "access to your encrypted messages if you forget your passphrase.",
             )}</p>
             <p>{_t(
-                "Keep your recovery key somewhere very secure, like a password manager (or a safe).",
+                "Keep a copy of it somewhere secure, like a password manager or even a safe.",
             )}</p>
-            <p>{bodyText}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyHeader">
-                    {_t("Your Recovery Key")}
+                    {_t("Your recovery key")}
                 </div>
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyContainer">
                     <div className="mx_CreateKeyBackupDialog_recoveryKey">
@@ -430,7 +417,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                     </div>
                     <div className="mx_CreateKeyBackupDialog_recoveryKeyButtons">
                         <button className="mx_Dialog_primary" onClick={this._onCopyClick}>
-                            {_t("Copy to clipboard")}
+                            {_t("Copy")}
                         </button>
                         <button className="mx_Dialog_primary" onClick={this._onDownloadClick}>
                             {_t("Download")}
@@ -462,7 +449,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 <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("OK")}
+            <DialogButtons primaryButton={_t("Continue")}
                 onPrimaryButtonClick={this._createBackup}
                 hasCancel={false}>
                 <button onClick={this._onKeepItSafeBackClick}>{_t("Back")}</button>
@@ -515,15 +502,14 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             case PHASE_OPTOUT_CONFIRM:
                 return _t('Warning!');
             case PHASE_SHOWKEY:
-                return _t('Recovery key');
             case PHASE_KEEPITSAFE:
-                return _t('Keep it safe');
+                return _t('Make a copy of your recovery key');
             case PHASE_BACKINGUP:
                 return _t('Starting backup...');
             case PHASE_DONE:
                 return _t('Success!');
             default:
-                return _t("Create Key Backup");
+                return _t("Create key backup");
         }
     }
 
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 4f0db1eebe..eefeaf5db4 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -76,7 +76,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             copied: false,
             downloaded: false,
             zxcvbnResult: null,
-            setPassPhrase: false,
             backupInfo: null,
             backupSigStatus: null,
             // does the server offer a UI auth flow with just m.login.password
@@ -84,9 +83,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             canUploadKeysWithPasswordOnly: null,
             accountPassword: props.accountPassword,
             accountPasswordCorrect: null,
-            // set if we are 'upgrading' encryption (making an SSSS store from
-            // an existing key backup secret).
-            doingUpgrade: null,
             // status of the key backup toggle switch
             useKeyBackup: true,
         };
@@ -117,8 +113,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             phase,
             backupInfo,
             backupSigStatus,
-            // remember this after this phase so we can use appropriate copy
-            doingUpgrade: phase === PHASE_MIGRATE,
         });
     }
 
@@ -325,7 +319,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._keyInfo = keyInfo;
         this._encodedRecoveryKey = encodedRecoveryKey;
         this.setState({
-            setPassPhrase: true,
             copied: false,
             downloaded: false,
             phase: PHASE_SHOWKEY,
@@ -588,19 +581,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _renderPhaseShowKey() {
-        let bodyText;
-        if (this.state.setPassPhrase) {
-            bodyText = _t(
-                "As a safety net, you can use it to restore your access to encrypted " +
-                "messages if you forget your passphrase.",
-            );
-        } else {
-            bodyText = _t(
-                "As a safety net, you can use it to restore your access to encrypted " +
-                "messages.",
-            );
-        }
-
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return <div>
             <p>{_t(
@@ -608,12 +588,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "access to your encrypted messages if you forget your passphrase.",
             )}</p>
             <p>{_t(
-                "Keep your recovery key somewhere very secure, like a password manager (or a safe).",
+                "Keep a copy of it somewhere secure, like a password manager or even a safe.",
             )}</p>
-            <p>{bodyText}</p>
             <div className="mx_CreateSecretStorageDialog_primaryContainer">
                 <div className="mx_CreateSecretStorageDialog_recoveryKeyHeader">
-                    {_t("Your Recovery Key")}
+                    {_t("Your recovery key")}
                 </div>
                 <div className="mx_CreateSecretStorageDialog_recoveryKeyContainer">
                     <div className="mx_CreateSecretStorageDialog_recoveryKey">
@@ -621,7 +600,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
                         <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onCopyClick}>
-                            {_t("Copy to clipboard")}
+                            {_t("Copy")}
                         </AccessibleButton>
                         <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
                             {_t("Download")}
@@ -653,7 +632,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <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("OK")}
+            <DialogButtons primaryButton={_t("Continue")}
                 onPrimaryButtonClick={this._bootstrapSecretStorage}
                 hasCancel={false}>
                 <button onClick={this._onKeepItSafeBackClick}>{_t("Back")}</button>
@@ -672,11 +651,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t(
-                "This session can now verify other sessions, granting them access " +
-                "to encrypted messages and marking them as trusted for other users.",
-            )}</p>
-            <p>{_t(
-                "Verify other users in their profile.",
+                "You can now verify your other devices, " +
+                "and other users to keep your chats safe.",
             )}</p>
             <DialogButtons primaryButton={_t('OK')}
                 onPrimaryButtonClick={this._onDone}
@@ -712,13 +688,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_CONFIRM_SKIP:
                 return _t('Are you sure?');
             case PHASE_SHOWKEY:
-                return _t('Recovery key');
             case PHASE_KEEPITSAFE:
-                return _t('Keep it safe');
+                return _t('Make a copy of your recovery key');
             case PHASE_STORING:
-                return _t('Storing secrets...');
+                return _t('Setting up keys');
             case PHASE_DONE:
-                return this.state.doingUpgrade ? _t('Encryption upgraded') : _t('Encryption setup complete');
+                return _t("You're done!");
             default:
                 return '';
         }
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 801420da95..6f6eb7e2a1 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -142,7 +142,7 @@ export const PasswordAuthEntry = createReactClass({
 
         return (
             <div>
-                <p>{ _t("To continue, please enter your password.") }</p>
+                <p>{ _t("Confirm your identity by entering your account password below.") }</p>
                 <form onSubmit={this._onSubmit} className="mx_InteractiveAuthEntryComponents_passwordSection">
                     <Field
                         id="mx_InteractiveAuthEntryComponents_password"
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 4466775d3a..b04046b9c0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -248,7 +248,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         } else if (this.state.restoreError) {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
-                    title = _t("Recovery Key Mismatch");
+                    title = _t("Recovery key mismatch");
                     content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this key: " +
@@ -256,7 +256,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         )}</p>
                     </div>;
                 } else {
-                    title = _t("Incorrect Recovery Passphrase");
+                    title = _t("Incorrect recovery passphrase");
                     content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this passphrase: " +
@@ -273,7 +273,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            title = _t("Backup Restored");
+            title = _t("Backup restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
                 failedToDecrypt = <p>{_t(
@@ -293,7 +293,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         } else if (backupHasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            title = _t("Enter Recovery Passphrase");
+            title = _t("Enter recovery passphrase");
             content = <div>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
@@ -340,7 +340,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 })}
             </div>;
         } else {
-            title = _t("Enter Recovery Key");
+            title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 31406a6ff3..9016e4c6d7 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -39,7 +39,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
         switch (this.props.kind) {
             case 'set_up_encryption':
             case 'upgrade_encryption':
-                return _t('Verify your other sessions easier');
+                return _t('Verify yourself & others to keep your chats safe');
             case 'verify_this_session':
                 return _t('Other users may not trust it');
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 154e8d0d28..217c917569 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -517,7 +517,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify your other sessions easier": "Verify your other sessions easier",
+    "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
@@ -1648,20 +1648,20 @@
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
     "Unable to load backup status": "Unable to load backup status",
-    "Recovery Key Mismatch": "Recovery Key Mismatch",
+    "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
-    "Incorrect Recovery Passphrase": "Incorrect Recovery Passphrase",
+    "Incorrect recovery passphrase": "Incorrect recovery passphrase",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
-    "Backup Restored": "Backup Restored",
+    "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",
+    "Enter recovery passphrase": "Enter recovery passphrase",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "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",
+    "Enter recovery key": "Enter recovery key",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
     "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 key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
@@ -1716,7 +1716,7 @@
     "Country Dropdown": "Country Dropdown",
     "Custom Server Options": "Custom Server Options",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
-    "To continue, please enter your password.": "To continue, please enter your password.",
+    "Confirm your identity by entering your account password below.": "Confirm your identity by entering your account password below.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
     "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:",
@@ -2042,43 +2042,35 @@
     "Go back to set it again.": "Go back to set it again.",
     "Enter your passphrase a second time to confirm it.": "Enter your passphrase a second time to confirm it.",
     "Confirm your passphrase": "Confirm your passphrase",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "As a safety net, you can use it to restore your access to encrypted messages.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Keep your recovery key somewhere very secure, like a password manager (or a safe).",
-    "Your Recovery Key": "Your Recovery Key",
-    "Copy to clipboard": "Copy to clipboard",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
+    "Your recovery key": "Your recovery key",
+    "Copy": "Copy",
     "Download": "Download",
     "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",
-    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Verify other users in their profile.": "Verify other users in their profile.",
+    "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
-    "Recovery key": "Recovery key",
-    "Keep it safe": "Keep it safe",
-    "Storing secrets...": "Storing secrets...",
-    "Encryption upgraded": "Encryption upgraded",
-    "Encryption setup complete": "Encryption setup complete",
+    "Make a copy of your recovery key": "Make a copy of your recovery key",
+    "Setting up keys": "Setting up keys",
+    "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
     "Enter a passphrase...": "Enter a passphrase...",
-    "Set up with a Recovery Key": "Set up with a Recovery Key",
     "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
     "Repeat your passphrase...": "Repeat your passphrase...",
-    "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.",
-    "As a safety net, you can use it to restore your encrypted message history.": "As a safety net, you can use it to restore your encrypted message history.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
     "Secure your backup with a passphrase": "Secure your backup with a passphrase",
     "Starting backup...": "Starting backup...",
     "Success!": "Success!",
-    "Create Key Backup": "Create Key Backup",
+    "Create key backup": "Create key backup",
     "Unable to create key backup": "Unable to create key backup",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
     "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",

From 2d9b111680cbc79184d4d7bfaf006d6e51c56b8e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 12:28:14 +0000
Subject: [PATCH 0899/3235] Add an override for the theme

So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
---
 src/components/structures/MatrixChat.js     | 11 +++++++++++
 src/settings/controllers/ThemeController.js |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d6ef3341da..a6f279be74 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -53,6 +53,7 @@ import createRoom from "../../createRoom";
 import KeyRequestHandler from '../../KeyRequestHandler';
 import { _t, getCurrentLanguage } from '../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 import ResizeNotifier from "../../utils/ResizeNotifier";
@@ -506,6 +507,8 @@ export default createReactClass({
                     view: VIEWS.LOGIN,
                 });
                 this.notifyNewScreen('login');
+                ThemeController.setIsLogin(true);
+                this._themeWatcher.recheck();
                 break;
             case 'start_post_registration':
                 this.setState({
@@ -760,6 +763,8 @@ export default createReactClass({
         }
 
         this.setStateForNewView(newState);
+        ThemeController.setIsLogin(true);
+        this._themeWatcher.recheck();
         this.notifyNewScreen('register');
     },
 
@@ -910,6 +915,8 @@ export default createReactClass({
             view: VIEWS.WELCOME,
         });
         this.notifyNewScreen('welcome');
+        ThemeController.setIsLogin(true);
+        this._themeWatcher.recheck();
     },
 
     _viewHome: function() {
@@ -919,6 +926,8 @@ export default createReactClass({
         });
         this._setPage(PageTypes.HomePage);
         this.notifyNewScreen('home');
+        ThemeController.setIsLogin(false);
+        this._themeWatcher.recheck();
     },
 
     _viewUser: function(userId, subAction) {
@@ -1231,6 +1240,8 @@ export default createReactClass({
         });
         this.subTitleStatus = '';
         this._setPageSubtitle();
+        ThemeController.setIsLogin(true);
+        this._themeWatcher.recheck();
     },
 
     /**
diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.js
index aae43673bf..1586ab7a7f 100644
--- a/src/settings/controllers/ThemeController.js
+++ b/src/settings/controllers/ThemeController.js
@@ -19,9 +19,17 @@ import SettingController from "./SettingController";
 import {DEFAULT_THEME, enumerateThemes} from "../../theme";
 
 export default class ThemeController extends SettingController {
+    static isLogin = false;
+
+    static setIsLogin(val) {
+        ThemeController.isLogin = val;
+    }
+
     getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
         if (!calculatedValue) return null; // Don't override null themes
 
+        if (ThemeController.isLogin) return 'light';
+
         const themes = enumerateThemes();
         // Override in case some no longer supported theme is stored here
         if (!themes[calculatedValue]) {

From cb9362456ff814f8c5f42bd49853d4b86ff11713 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 13:18:01 +0000
Subject: [PATCH 0900/3235] remove setter

---
 src/components/structures/MatrixChat.js     | 10 +++++-----
 src/settings/controllers/ThemeController.js |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a6f279be74..3ccc4627e1 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -507,7 +507,7 @@ export default createReactClass({
                     view: VIEWS.LOGIN,
                 });
                 this.notifyNewScreen('login');
-                ThemeController.setIsLogin(true);
+                ThemeController.isLogin = true;
                 this._themeWatcher.recheck();
                 break;
             case 'start_post_registration':
@@ -763,7 +763,7 @@ export default createReactClass({
         }
 
         this.setStateForNewView(newState);
-        ThemeController.setIsLogin(true);
+        ThemeController.isLogin = true;
         this._themeWatcher.recheck();
         this.notifyNewScreen('register');
     },
@@ -915,7 +915,7 @@ export default createReactClass({
             view: VIEWS.WELCOME,
         });
         this.notifyNewScreen('welcome');
-        ThemeController.setIsLogin(true);
+        ThemeController.isLogin = true;
         this._themeWatcher.recheck();
     },
 
@@ -926,7 +926,7 @@ export default createReactClass({
         });
         this._setPage(PageTypes.HomePage);
         this.notifyNewScreen('home');
-        ThemeController.setIsLogin(false);
+        ThemeController.isLogin = false;
         this._themeWatcher.recheck();
     },
 
@@ -1240,7 +1240,7 @@ export default createReactClass({
         });
         this.subTitleStatus = '';
         this._setPageSubtitle();
-        ThemeController.setIsLogin(true);
+        ThemeController.isLogin = true;
         this._themeWatcher.recheck();
     },
 
diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.js
index 1586ab7a7f..4098a5ca3e 100644
--- a/src/settings/controllers/ThemeController.js
+++ b/src/settings/controllers/ThemeController.js
@@ -21,10 +21,6 @@ import {DEFAULT_THEME, enumerateThemes} from "../../theme";
 export default class ThemeController extends SettingController {
     static isLogin = false;
 
-    static setIsLogin(val) {
-        ThemeController.isLogin = val;
-    }
-
     getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
         if (!calculatedValue) return null; // Don't override null themes
 

From dacf900a9f969eaeded582428d8d7a6320e7e6f2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 31 Jan 2020 13:38:24 +0000
Subject: [PATCH 0901/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.4% (2093 of 2106 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 0c920c3253..3f5addcfc1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2087,5 +2087,14 @@
     "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "沒有設定安全訊息復原，如果您登出的或是用其他工作階段的話，您就無法復原您已加密的訊習歷史。",
     "This session is encrypting history using the new recovery method.": "此工作階段正在使用新的復原方法加密歷史。",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。"
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。",
+    "Keep secret storage passphrase in memory for this session": "此工作階段會將秘密儲存空間通關密語置於記憶體中",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "確認以下顯示的表情符號以相同的順序顯示在兩個裝置上：",
+    "Verify this device by confirming the following number appears on its screen.": "透過確認以下顯示在螢幕上的數字來驗證此裝置。",
+    "Mod": "模組",
+    "Encryption enabled": "加密已啟用",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的訊息已端到端加密。了解更多資訊並在使用者的個人檔案中驗證使用者。",
+    "Encryption not enabled": "加密未啟用",
+    "The encryption used by this room isn't supported.": "不支援此聊天室使用的加密。",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置以標記其為受信任。"
 }

From 2dbceca8b3823ee30a3f1675991bc141f98b3c43 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 13:46:42 +0000
Subject: [PATCH 0902/3235] Fix size of invite only icon

So it doesn't become tiny with long room names

Fixes https://github.com/vector-im/riot-web/issues/12168
---
 res/css/views/rooms/_InviteOnlyIcon.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index f4d9e4869f..6943d1797b 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -34,5 +34,7 @@ limitations under the License.
         bottom: 0;
         left: 0;
         right: 0;
+        width: 12px;
+        height: 12px;
     }
 }

From 0fad5a62b426c937a4d60043a695807c297137d6 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 14:06:55 +0000
Subject: [PATCH 0903/3235] Fix user trust text to match what was checked

This fixes the unverified users status text to omit devices since they haven't
been checked.

Fixes https://github.com/vector-im/riot-web/issues/12176
---
 src/components/views/rooms/E2EIcon.js | 2 +-
 src/i18n/strings/en_EN.json           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index ade44aa7c8..9480accb1a 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -33,7 +33,7 @@ export const E2E_STATE = {
 
 const crossSigningUserTitles = {
     [E2E_STATE.WARNING]: _td("This user has not verified all of their sessions."),
-    [E2E_STATE.NORMAL]: _td("You have not verified this user. This user has verified all of their sessions."),
+    [E2E_STATE.NORMAL]: _td("You have not verified this user."),
     [E2E_STATE.VERIFIED]: _td("You have verified this user. This user has verified all of their sessions."),
 };
 const crossSigningRoomTitles = {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 154e8d0d28..bbc8a79a2a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -900,7 +900,7 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
     "This user has not verified all of their sessions.": "This user has not verified all of their sessions.",
-    "You have not verified this user. This user has verified all of their sessions.": "You have not verified this user. This user has verified all of their sessions.",
+    "You have not verified this user.": "You have not verified this user.",
     "You have verified this user. This user has verified all of their sessions.": "You have verified this user. This user has verified all of their sessions.",
     "Someone is using an unknown session": "Someone is using an unknown session",
     "This room is end-to-end encrypted": "This room is end-to-end encrypted",

From 2d61a9d39282fc572b41722b1ae8854836dd2061 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 31 Jan 2020 13:44:35 +0000
Subject: [PATCH 0904/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2107 of 2107 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 | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 3f5addcfc1..6e0f43e543 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1968,8 +1968,8 @@
     "Verify your other sessions easier": "更容易地驗證您其他的工作階段",
     "Review": "評論",
     "This bridge was provisioned by <user />.": "此橋接是由 <user /> 設定。",
-    "Workspace: %(networkName)s": "工作空間：",
-    "Channel: %(channelName)s": "頻道：",
+    "Workspace: %(networkName)s": "工作空間：%(networkName)s",
+    "Channel: %(channelName)s": "頻道：%(channelName)s",
     "Show less": "顯示較少",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "變更密碼將會重設所有工作階段上的所有端到端加密金鑰，讓已加密的聊天歷史無法讀取，除非您先匯出您的聊天室金鑰並在稍後重新匯入。未來會有所改善。",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "您的帳號在秘密儲存空間中有交叉簽章的身份，但尚未被此工作階段信任。",
@@ -2009,7 +2009,7 @@
     "Message search": "訊息搜尋",
     "Sessions": "工作階段",
     "A session's public name is visible to people you communicate with": "工作階段的公開名稱可被您通訊的夥伴看到",
-    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室已橋接訊息到以下平臺。<a>取得更多詳細資訊。",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室已橋接訊息到以下平臺。<a>取得更多詳細資訊。</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "此聊天室未橋接訊息到任何平臺。<a>取得更多詳細資訊。</a>",
     "Bridges": "橋接",
     "This user has not verified all of their sessions.": "此使用者尚未驗證他們的所有工作階段。",
@@ -2020,7 +2020,7 @@
     "All sessions for this user are trusted": "此使用者的所有工作階段皆受信任",
     "Some sessions in this encrypted room are not trusted": "此已加密的聊天室中的某些工作階段未受信任",
     "All sessions in this encrypted room are trusted": "在此已加密聊天室的所有工作階段都受信任",
-    "Your key share request has been sent - please check your other sessions for key share requests.": "您的金鑰分享請求已傳送，請檢查您其他的工作階段以取得金鑰分享請求",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "您的金鑰分享請求已傳送，請檢查您其他的工作階段以取得金鑰分享請求。",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "金鑰分享請求已自動傳送到您其他的工作階段。如果您在您其他的工作階段上拒絕或忽略金鑰分享請求，點擊此處以再此請求此工作階段的金鑰。",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "如果您的其他工作階段沒有此訊息的金鑰，您就無法解密它們。",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "從您的其他工作階段<requestLink>重新請求加密金鑰</requestLink>。",
@@ -2081,10 +2081,10 @@
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "警告：您的個人資料（包含加密金鑰）仍儲存在此工作階段中。如果您已不用此工作階段了，或是您想登入另一個帳號，就請將其清除。",
     "Sender session information": "傳送者工作階段資訊",
     "Restore your key backup to upgrade your encryption": "復原您的金鑰備份以升級您的加密",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "",
-    "Back up my encryption keys, securing them with the same passphrase": "",
-    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，給予它們存取加密訊息的權限，並為其他使用者標記它們為受信任。",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "在此工作階段上設定加密以使其可以驗證其他工作階段，給它們對已加密訊息的存取權，並將它們對其他使用者標記為受信任。",
+    "Back up my encryption keys, securing them with the same passphrase": "備份我的加密金鑰，使用相同的通關密語保護它們",
+    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "這個工作階段現在可以驗證其他工作階段，給它們對已加密訊息的存取權，並將它們對其他使用者標記為受信任。",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "沒有設定安全訊息復原，如果您登出的或是用其他工作階段的話，您就無法復原您已加密的訊習歷史。",
     "This session is encrypting history using the new recovery method.": "此工作階段正在使用新的復原方法加密歷史。",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。",
@@ -2096,5 +2096,16 @@
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的訊息已端到端加密。了解更多資訊並在使用者的個人檔案中驗證使用者。",
     "Encryption not enabled": "加密未啟用",
     "The encryption used by this room isn't supported.": "不支援此聊天室使用的加密。",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置以標記其為受信任。"
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "驗證此裝置以標記其為受信任。",
+    "Show padlocks on invite only rooms": "在僅邀請的聊天室上顯示掛鎖",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "驗證此裝置將會將其標記為受信任，且已驗證您的使用者將會信任此裝置。",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "如果您不小心這樣做了，您可以在此工作階段上設定安全訊息，這將會以新的復原方法重新加密此工作階段的訊息歷史。",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "若停用，從已加密的聊天室而來的訊息將不會出現在搜尋結果中。",
+    "Disable": "停用",
+    "Not currently downloading messages for any room.": "目前未下載任何聊天室的訊息。",
+    "Downloading mesages for %(currentRoom)s.": "正在下載 %(currentRoom)s 的訊息。",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot 正在安全地本機快取已加密的訊息以讓它們顯示在搜尋結果中：",
+    "Space used:": "已使用空間：",
+    "Indexed messages:": "已索引的訊息：",
+    "Number of rooms:": "聊天室數量："
 }

From 7234925fa05a89f4edb04e58ade0e36307ccf152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 31 Jan 2020 13:50:10 +0000
Subject: [PATCH 0905/3235] Translated using Weblate (French)

Currently translated at 98.6% (2077 of 2107 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 | 79 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c371846eb3..6789bbe25c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2000,5 +2000,82 @@
     "This wasn't me": "Ce n’était pas moi",
     "Your new session is now verified. Other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Les autres utilisateurs la verront comme fiable.",
     "Restore your key backup to upgrade your encryption": "Restaurez votre sauvegarde de clés pour mettre à niveau votre chiffrement",
-    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec la même phrase de passe"
+    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec la même phrase de passe",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Il y a des sessions inconnues dans ce salon : si vous continuez sans les vérifier, quelqu’un pourra espionner votre appel.",
+    "Unverified session": "Session non vérifiée",
+    "Verifies a user, session, and pubkey tuple": "Vérifie un utilisateur, une session et une collection de clés publiques",
+    "Unknown (user, session) pair:": "Paire (utilisateur, session) inconnue :",
+    "Session already verified!": "Session déjà vérifiée !",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ATTENTION : La session a déjà été vérifiée mais les clés NE CORRESPONDENT PAS !",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENTION : ÉCHEC DE LA VÉRIFICATION DE CLÉ ! La clé de signature pour %(userId)s et la session %(deviceId)s est « %(fprint)s » que ne correspond pas à la clé fournie « %(fingerprint)s ». Cela pourrait signifier que vos communications sont interceptées !",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clé de signature que vous avez fournie correspond à celle que vous avez reçue de la session %(deviceId)s de %(userId)s. Session marquée comme vérifiée.",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Activer la signature croisée pour vérifier par utilisateur plutôt que par session (en développement)",
+    "Show padlocks on invite only rooms": "Afficher des cadenas sur les salons accessibles uniquement par invitation",
+    "Never send encrypted messages to unverified sessions from this session": "Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ne jamais envoyer des messages chiffrés aux sessions non vérifiées dans ce salon depuis cette session",
+    "Keep secret storage passphrase in memory for this session": "Conserver la phrase de passe du coffre secret en mémoire pour cette session",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirmez que les émojis ci-dessous sont affichés sur les deux appareils, dans le même ordre :",
+    "Verify this device by confirming the following number appears on its screen.": "Vérifiez cet appareil en confirmant que le nombre suivant apparaît sur son écran.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Pour être sûr, faites cela en personne ou utilisez un moyen de communication fiable.",
+    "Verify your other sessions easier": "Vérifiez vos autres sessions plus facilement",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changer votre mot de passe réinitialisera toutes les clés de chiffrement sur toutes les sessions, ce qui rendra l’historique de vos messages illisible, sauf si vous exportez d’abord vos clés de chiffrement et si vous les réimportez ensuite. Dans l’avenir, ce processus sera amélioré.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Votre compte à une identité de signature croisée dans le coffre secret, mais cette session ne lui fait pas encore confiance.",
+    "in memory": "en mémoire",
+    "Your homeserver does not support session management.": "Votre serveur d’accueil ne prend pas en charge la gestion de session.",
+    "Unable to load session list": "Impossible de charger la liste de sessions",
+    "Delete %(count)s sessions|other": "Supprimer %(count)s sessions",
+    "Delete %(count)s sessions|one": "Supprimer %(count)s session",
+    "This session is backing up your keys. ": "Cette session sauvegarde vos clés. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Cette session <b>ne sauvegarde pas vos clés</b>, mais vous n’avez pas de sauvegarde existante que vous pouvez restaurer ou compléter à l’avenir.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connectez cette session à la sauvegarde de clés avant de vous déconnecter pour éviter de perdre des clés qui seraient uniquement dans cette session.",
+    "Connect this session to Key Backup": "Connecter cette session à la sauvegarde de clés",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "La sauvegarde a une signature d’une session <verify>inconnue</verify> ayant pour identifiant %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "La sauvegarde a une signature <validity>valide</validity> de cette session",
+    "Backup has an <validity>invalid</validity> signature from this session": "La sauvegarde a une signature <validity>non valide</validity> de cette session",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "La sauvegarde a une signature <validity>valide</validity> de la session <verify>vérifiée</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "La sauvegarde a une signature <validity>valide</validity> de la session <verify>non vérifiée</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "La sauvegarde a une signature <validity>non valide</validity> de la session <verify>vérifiée</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "La sauvegarde a une session <validity>non valide</validity> de la session <verify>non vérifiée</verify> <device></device>",
+    "Backup is not signed by any of your sessions": "La sauvegarde n’est signée par aucune de vos sessions",
+    "This backup is trusted because it has been restored on this session": "Cette sauvegarde est fiable car elle a été restaurée sur cette session",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Une sauvegarde de clés est stockée dans le coffre secret, mais cette fonctionnalité n’est pas activée sur cette session. Activez la signature croisée dans le Labo pour modifier l’état de la sauvegarde de clés.",
+    "Your keys are <b>not being backed up from this session</b>.": "Vos clés <b>ne sont pas sauvegardées sur cette session</b>.",
+    "Enable desktop notifications for this session": "Activer les notifications de l’ordinateur pour cette session",
+    "Enable audible notifications for this session": "Activer les notifications sonores pour cette session",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Votre mot de passe a été modifié. Vous ne recevrez plus de notifications push sur les autres sessions tant que vous ne vous y serez pas reconnecté",
+    "Session ID:": "Identifiant de session :",
+    "Session key:": "Clé de session :",
+    "Sessions": "Sessions",
+    "A session's public name is visible to people you communicate with": "Le nom public d’une session est visible par les personnes avec lesquelles vous communiquez",
+    "This user has not verified all of their sessions.": "Cet utilisateur n’a pas vérifié toutes ses sessions.",
+    "You have not verified this user. This user has verified all of their sessions.": "Vous n’avez pas vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
+    "You have verified this user. This user has verified all of their sessions.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
+    "Someone is using an unknown session": "Quelqu'un utilise une session inconnue",
+    "Some sessions for this user are not trusted": "Certaines sessions de cet utilisateur ne sont par fiables",
+    "All sessions for this user are trusted": "Toutes les sessions de cet utilisateur sont fiables",
+    "Some sessions in this encrypted room are not trusted": "Certaines sessions dans ce salon chiffré ne sont pas fiables",
+    "All sessions in this encrypted room are trusted": "Toutes les sessions dans ce salon chiffré sont fiables",
+    "Mod": "Modo",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Votre demande de partage de clé a été envoyée − vérifiez les demandes de partage de clé sur vos autres sessions.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Les demandes de partage de clé sont envoyées à vos autres sessions automatiquement. Si vous avez rejeté ou ignoré la demande de partage de clé sur vos autres sessions, cliquez ici pour redemander les clés pour cette session.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si vos autres sessions n’ont pas la clé pour ce message vous ne pourrez pas le déchiffrer.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Redemander les clés de chiffrement</requestLink> à vos autres sessions.",
+    "Encrypted by an unverified session": "Chiffré par une session non vérifiée",
+    "Encrypted by a deleted session": "Chiffré par une session supprimée",
+    "No sessions with registered encryption keys": "Aucune session avec les clés de chiffrement enregistrées",
+    "Yours, or the other users’ session": "Votre session ou celle de l’autre utilisateur",
+    "%(count)s sessions|other": "%(count)s sessions",
+    "%(count)s sessions|one": "%(count)s session",
+    "Hide sessions": "Masquer les sessions",
+    "Encryption enabled": "Chiffrement activé",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Les messages dans ce salon sont chiffrés de bout en bout. Apprenez-en plus et vérifiez cet utilisateur dans son profil utilisateur.",
+    "Encryption not enabled": "Chiffrement non activé",
+    "The encryption used by this room isn't supported.": "Le chiffrement utilisé par ce salon n’est pas pris en charge.",
+    "Clear all data in this session?": "Supprimer toutes les données de cette session ?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La suppression de toutes les données de cette session est permanente. Les messages chiffrés seront perdus sauf si les clés ont été sauvegardées.",
+    "Verify session": "Vérifier la session",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, vérifiez que la clé que vous voyez dans les paramètres de l’utilisateur sur cet appareil correspond à la clé ci-dessous :",
+    "To verify that this session 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 session matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, contactez son propriétaire en utilisant un autre moyen (par ex. en personne ou en l’appelant) et demandez-lui si la clé dans ses paramètres de l’utilisateur pour cette session correspond à la clé ci-dessous :",
+    "Session name": "Nom de la session",
+    "Session key": "Clé de la session"
 }

From d5811cad289f6d12d73c73c6aa841b111b297f97 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 31 Jan 2020 15:04:51 +0000
Subject: [PATCH 0906/3235] Change UI auth title for cross-signing

---
 src/CrossSigningManager.js                                     | 2 +-
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js   | 2 +-
 src/i18n/strings/en_EN.json                                    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 2b3886fd94..a560c956f1 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -139,7 +139,7 @@ export async function accessSecretStorage(func = async () => { }) {
                     const { finished } = Modal.createTrackedDialog(
                         'Cross-signing keys dialog', '', InteractiveAuthDialog,
                         {
-                            title: _t("Send cross-signing keys to homeserver"),
+                            title: _t("Setting up keys"),
                             matrixClient: MatrixClientPeg.get(),
                             makeRequest,
                         },
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index eefeaf5db4..679b3907d1 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -199,7 +199,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             const { finished } = Modal.createTrackedDialog(
                 'Cross-signing keys dialog', '', InteractiveAuthDialog,
                 {
-                    title: _t("Send cross-signing keys to homeserver"),
+                    title: _t("Setting up keys"),
                     matrixClient: MatrixClientPeg.get(),
                     makeRequest,
                 },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 217c917569..74d30347b4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -60,7 +60,7 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "The server does not support the room version specified.": "The server does not support the room version specified.",
     "Failure to create room": "Failure to create room",
-    "Send cross-signing keys to homeserver": "Send cross-signing keys to homeserver",
+    "Setting up keys": "Setting up keys",
     "Send anyway": "Send anyway",
     "Send": "Send",
     "Sun": "Sun",
@@ -2055,7 +2055,6 @@
     "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
     "Make a copy of your recovery key": "Make a copy of your recovery key",
-    "Setting up keys": "Setting up keys",
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",

From fcfac9b6edf5322328dddc7824dadfed30c9ad8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 31 Jan 2020 14:48:59 +0000
Subject: [PATCH 0907/3235] Translated using Weblate (French)

Currently translated at 99.9% (2106 of 2107 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 | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 6789bbe25c..ab79751a69 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2077,5 +2077,34 @@
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, vérifiez que la clé que vous voyez dans les paramètres de l’utilisateur sur cet appareil correspond à la clé ci-dessous :",
     "To verify that this session 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 session matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, contactez son propriétaire en utilisant un autre moyen (par ex. en personne ou en l’appelant) et demandez-lui si la clé dans ses paramètres de l’utilisateur pour cette session correspond à la clé ci-dessous :",
     "Session name": "Nom de la session",
-    "Session key": "Clé de la session"
+    "Session key": "Clé de la session",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Si elle correspond, cliquez sur le bouton Vérifier ci-dessous. Si ce n’est pas le cas, quelqu'un est en train d’intercepter cette session et vous devriez plutôt cliquer sur le bouton Ajouter à la liste noire.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Vérifier cet utilisateur marquera sa session comme fiable, et marquera aussi votre session comme fiable pour lui.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet appareil le marquera comme fiable. Faire confiance à cette appareil vous permettra à vous et aux autres utilisateurs d’être sereins lors de l’utilisation de messages chiffrés.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Vérifier cet appareil le marquera comme fiable, et les utilisateurs qui ont vérifié avec vous feront confiance à cet appareil.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Vous avez ajouté une nouvelle session « %(displayName)s » qui demande les clés de chiffrement.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Votre session non vérifiée « %(displayName)s » demande des clés de chiffrement.",
+    "Loading session info...": "Chargement des informations de la session…",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Cela vous permettra de revenir sur votre compte après vous être déconnecté, et de vous connecter sur d’autres sessions.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Vous avez placé les sessions non vérifiées sur liste noire ; pour leur envoyer des messages vous devez les vérifier.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Nous vous recommandons d’accomplir le processus de vérification pour chaque session afin de vérifier qu’elles correspondent à leur propriétaire légitime, mais vous pouvez renvoyer ce message sans vérifier si vous préférez.",
+    "Room contains unknown sessions": "Le salon contient des sessions inconnues",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "« %(RoomName)s » contient des sessions que vous n’avez jamais vues auparavant.",
+    "Unknown sessions": "Sessions inconnues",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre phrase de passe.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre clé de récupération.",
+    "Message not sent due to unknown sessions being present": "Message non envoyé à cause de la présence de sessions inconnues",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Afficher les sessions</showSessionsText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Sans compléter la sécurité sur cette session, elle n’aura pas accès aux messages chiffrés.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Modifier votre mot de passe réinitialisera toutes les clés de chiffrement de bout en bout sur toutes vos sessions, ce qui rendra l’historique de vos messages chiffrés illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Vous avez été déconnecté de toutes les sessions et vous ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Récupérez l’accès à votre compte et restaurez les clés de chiffrement dans cette session. Sans elles, vous ne pourrez pas lire tous vos messages chiffrés dans n’importe quelle session.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Attention : Vos données personnelles (y compris les clés de chiffrement) seront stockées dans cette session. Effacez-les si vous n’utilisez plus cette session ou si vous voulez vous connecter à un autre compte.",
+    "Sender session information": "Informations de session de l’expéditeur",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cette session pour l’autoriser de vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Configurez le chiffrement sur cette session pour lui permettre de vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
+    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Cette session peut à présent vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez  pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
+    "This session is encrypting history using the new recovery method.": "Cette session chiffre l’historique en utilisant la nouvelle méthode de récupération.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et votre clé de récupération pour les messages chiffrés ont été supprimés."
 }

From 29024c5172207624e250cd065f7c657459c5a8c9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Jan 2020 15:28:58 +0000
Subject: [PATCH 0908/3235] Truncate SAS emoji labels to fit

This keeps the layout of the emoji fixed as much as possible.

Other changes:
 * Fix width of each emoji container to static 52px
 * Bump minimum width of right panel from 250px to 264px to match the
   width in the figma
 * Use normal font-weight for labels as per design
 * Smaller vertical gap between emojis, again to match design
---
 res/css/structures/_RightPanel.scss              |  3 ++-
 .../views/verification/_VerificationShowSas.scss | 16 ++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 973f6fe9b3..3c373e8883 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@ limitations under the License.
     overflow-x: hidden;
     flex: 0 0 auto;
     position: relative;
-    min-width: 250px;
+    min-width: 264px;
     display: flex;
     flex-direction: column;
 }
diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index 32401bc446..80677094ba 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -36,11 +37,9 @@ limitations under the License.
 
 .mx_VerificationShowSas_emojiSas_block {
     display: inline-block;
-    margin-bottom: 30px;
+    margin-bottom: 16px;
     position: relative;
-    // allow the blocks to grow to space themselves evenly up to a limit of 100px
-    flex-grow: 1;
-    max-width: 100px;
+    width: 52px;
 }
 
 .mx_VerificationShowSas_emojiSas_emoji {
@@ -52,12 +51,9 @@ limitations under the License.
 }
 
 .mx_VerificationShowSas_emojiSas_label {
-    font-weight: bold;
-    // allow the text to overflow the parent by 15px on each side
-    // this is to keep the width of the parent consistent for spacing centrally via flexbox
-    position: absolute;
-    left: -15px;
-    right: -15px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .mx_VerificationShowSas_emojiSas_break {

From aa35fc4273f3e88219352c416e3dce8294fa13e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 31 Jan 2020 15:14:00 +0000
Subject: [PATCH 0909/3235] Translated using Weblate (French)

Currently translated at 100.0% (2098 of 2098 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 | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ab79751a69..4ead6a4d8e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2106,5 +2106,22 @@
     "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Cette session peut à présent vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez  pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
     "This session is encrypting history using the new recovery method.": "Cette session chiffre l’historique en utilisant la nouvelle méthode de récupération.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et votre clé de récupération pour les messages chiffrés ont été supprimés."
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et votre clé de récupération pour les messages chiffrés ont été supprimés.",
+    "Setting up keys": "Configuration des clés",
+    "Verify yourself & others to keep your chats safe": "Vérifiez-vous et vérifiez les autres afin que vos discussions restent sûres",
+    "You have not verified this user.": "Vous n’avez pas vérifié cet utilisateur.",
+    "Recovery key mismatch": "La clé de récupération ne correspond pas",
+    "Incorrect recovery passphrase": "Phrase de passe de récupération incorrecte",
+    "Backup restored": "Sauvegarde restaurée",
+    "Enter recovery passphrase": "Saisir la phrase de passe de récupération",
+    "Enter recovery key": "Saisir la clé de récupération",
+    "Confirm your identity by entering your account password below.": "Confirmez votre identité en saisissant le mot de passe de votre compte ci-dessous.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gardez-en une copie en lieu sûr, comme un gestionnaire de mots de passe ou même un coffre.",
+    "Your recovery key": "Votre clé de récupération",
+    "Copy": "Copier",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Vous pouvez à présent vérifier vos autres appareils et les autres utilisateurs afin que vos discussions restent sûres.",
+    "Make a copy of your recovery key": "Faire une copie de votre clé de récupération",
+    "You're done!": "Vous avez terminé !",
+    "Create key backup": "Créer une sauvegarde de clé",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération."
 }

From 2b62c6773da4f4386b0872efe92e7186a3d4a84b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 17:10:06 +0000
Subject: [PATCH 0910/3235] Advertise that we can scan QR codes even though we
 can't

This is to fix RiotX not realizing it can scan QR codes. Follow up issue is https://github.com/vector-im/riot-web/issues/12178
---
 src/MatrixClientPeg.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 98fcc85d60..448c6d9e9b 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -32,7 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB
 import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -221,6 +221,7 @@ class _MatrixClientPeg {
             verificationMethods: [
                 verificationMethods.SAS,
                 SHOW_QR_CODE_METHOD,
+                SCAN_QR_CODE_METHOD, // XXX: We don't actually support scanning yet!
                 verificationMethods.RECIPROCATE_QR_CODE,
             ],
             unstableClientRelationAggregation: true,

From 0e5fec5febcf7c3bae9cc24946a5bf214e0de28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 31 Jan 2020 15:37:06 +0100
Subject: [PATCH 0911/3235] EventIndex: Catch errors when removing a crawler
 checkpoint.

---
 src/indexing/EventIndex.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index e1ec0d1d1c..55f8dc9986 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -356,7 +356,11 @@ export default class EventIndex extends EventEmitter {
                 console.log("EventIndex: Done with the checkpoint", checkpoint);
                 // We got to the start/end of our timeline, lets just
                 // delete our checkpoint and go back to sleep.
-                await indexManager.removeCrawlerCheckpoint(checkpoint);
+                try {
+                    await indexManager.removeCrawlerCheckpoint(checkpoint);
+                } catch (e) {
+                    console.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                }
                 continue;
             }
 

From 5eb510387c9aa08a061d5fd17bed3efc104b48eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 31 Jan 2020 16:37:30 +0100
Subject: [PATCH 0912/3235] EventIndex: Don't process checkpoints that don't
 have a valid token.

Some rooms might have null as a token, don't add those to be crawled nor
to the index.

Catch any other errors that might occur during the addition of an
initial checkpoint and log them.
---
 src/indexing/EventIndex.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 55f8dc9986..ba6c1b6509 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -115,10 +115,20 @@ export default class EventIndex extends EventEmitter {
                 direction: "f",
             };
 
-            await indexManager.addCrawlerCheckpoint(backCheckpoint);
-            await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
-            this.crawlerCheckpoints.push(backCheckpoint);
-            this.crawlerCheckpoints.push(forwardCheckpoint);
+            try {
+                if (backCheckpoint.token) {
+                    await indexManager.addCrawlerCheckpoint(backCheckpoint);
+                    this.crawlerCheckpoints.push(backCheckpoint);
+                }
+
+                if (forwardCheckpoint.token) {
+                    await indexManager.addCrawlerCheckpoint(forwardCheckpoint);
+                    this.crawlerCheckpoints.push(forwardCheckpoint);
+                }
+            } catch (e) {
+                console.log("EventIndex: Error adding initial checkpoints for room",
+                            room.roomId, backCheckpoint, forwardCheckpoint, e);
+            }
         }));
     }
 

From 01c1c2364b69e7e0f9ba7c183e0129a954c4e441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 31 Jan 2020 18:44:52 +0100
Subject: [PATCH 0913/3235] ManageEventIndexDialog: Add back a control for the
 crawler sleep time.

---
 .../dialogs/eventindex/ManageEventIndexDialog.js | 16 ++++++++++++++++
 src/i18n/strings/en_EN.json                      |  2 ++
 src/indexing/EventIndex.js                       |  7 ++-----
 src/settings/Settings.js                         |  9 +++++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index b7ea87b1b2..58605a3263 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -18,6 +18,7 @@ import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
+import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 
 import Modal from '../../../../Modal';
 import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
@@ -39,6 +40,8 @@ export default class ManageEventIndexDialog extends React.Component {
             eventCount: 0,
             roomCount: 0,
             currentRoom: null,
+            crawlerSleepTime:
+                SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime'),
         };
     }
 
@@ -104,6 +107,11 @@ export default class ManageEventIndexDialog extends React.Component {
         this.props.onFinished(true);
     }
 
+    _onCrawlerSleepTimeChange = (e) => {
+        this.setState({crawlerSleepTime: e.target.value});
+        SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
+    }
+
     render() {
         let crawlerState;
 
@@ -115,6 +123,8 @@ export default class ManageEventIndexDialog extends React.Component {
             );
         }
 
+        const Field = sdk.getComponent('views.elements.Field');
+
         const eventIndexingSettings = (
             <div>
                 {
@@ -127,6 +137,12 @@ export default class ManageEventIndexDialog extends React.Component {
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
                     {_t("Number of rooms:")} {formatCountLong(this.state.roomCount)}<br />
                     {crawlerState}<br />
+                    <Field
+                        id={"crawlerSleepTimeMs"}
+                        label={_t('Message downloading sleep time(ms)')}
+                        type='number'
+                        value={this.state.crawlerSleepTime}
+                        onChange={this._onCrawlerSleepTimeChange} />
                 </div>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 47032dcddc..78c837986b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -415,6 +415,7 @@
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
     "Keep secret storage passphrase in memory for this session": "Keep secret storage passphrase in memory for this session",
+    "How fast should messages be downloaded.": "How fast should messages be downloaded.",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -2094,6 +2095,7 @@
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
+    "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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"
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index ba6c1b6509..cbd739602c 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -18,6 +18,7 @@ import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 import {EventTimeline, RoomMember} from 'matrix-js-sdk';
 import {sleep} from "../utils/promise";
+import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
 import {EventEmitter} from "events";
 
 /*
@@ -30,7 +31,6 @@ export default class EventIndex extends EventEmitter {
         // The time in ms that the crawler will wait loop iterations if there
         // have not been any checkpoints to consume in the last iteration.
         this._crawlerIdleTime = 5000;
-        this._crawlerSleepTime = 3000;
         // The maximum number of events our crawler should fetch in a single
         // crawl.
         this._eventsPerCrawl = 100;
@@ -299,10 +299,7 @@ export default class EventIndex extends EventEmitter {
         let idle = false;
 
         while (!cancelled) {
-            // This is a low priority task and we don't want to spam our
-            // homeserver with /messages requests so we set a hefty timeout
-            // here.
-            let sleepTime = this._crawlerSleepTime;
+            let sleepTime = SettingsStore.getValueAt(SettingLevel.DEVICE, 'crawlerSleepTime');
 
             // Don't let the user configure a lower sleep time than 100 ms.
             sleepTime = Math.max(sleepTime, 100);
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index ecaf9cd2e3..b5a966523e 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -492,8 +492,13 @@ export const SETTINGS = {
         default: true,
     },
     "keepSecretStoragePassphraseForSession": {
+         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+         displayName: _td("Keep secret storage passphrase in memory for this session"),
+         default: false,
+    },
+    "crawlerSleepTime": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        displayName: _td("Keep secret storage passphrase in memory for this session"),
-        default: false,
+        displayName: _td("How fast should messages be downloaded."),
+        default: 3000,
     },
 };

From 3f706c0eda08dffda7847b2e58a79e62e637196b Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Fri, 31 Jan 2020 19:02:04 +0000
Subject: [PATCH 0914/3235] Translated using Weblate (Turkish)

Currently translated at 70.0% (1469 of 2098 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index a552296ac8..e5f5a8869a 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1476,5 +1476,8 @@
     "Verifies a user, session, and pubkey tuple": "Bir kullanıcı, oturum ve açık anahtar çiftini doğrular",
     "Unknown (user, session) pair:": "Bilinmeyen (kullanıcı, oturum) çifti:",
     "Session already verified!": "Oturum zaten doğrulanmış!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "UYARI: Oturum zaten doğrulanmış, ama anahtarlar EŞLEŞMİYOR!"
+    "WARNING: Session already verified, but keys do NOT MATCH!": "UYARI: Oturum zaten doğrulanmış, ama anahtarlar EŞLEŞMİYOR!",
+    "Your Matrix account on <underlinedServerName />": "Matrix hesabınız <underlinedServerName /> da yer almakta",
+    "No identity server is configured: add one in server settings to reset your password.": "Kimlik sunucusu yapılandırılmamış: sunucu ayarlarından ekleyerek parolanızı sıfırlayabilirsiniz.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Yeni parolanızın ayarlandığını doğrulamak için bir e-posta gelen kutunuza gönderilecek."
 }

From 8c9af0dec63564a9f52c49022e36475b7dff4f61 Mon Sep 17 00:00:00 2001
From: lissitz <pbl1996@gmail.com>
Date: Sat, 1 Feb 2020 00:06:30 +0000
Subject: [PATCH 0915/3235] Translated using Weblate (Czech)

Currently translated at 87.8% (1844 of 2100 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 53126e8ff6..66af5b931e 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -984,7 +984,7 @@
     "Show a placeholder for removed messages": "Zobrazovat zamazání místo smazané zprávy",
     "Show display name changes": "Zobrazovat změny jména",
     "Messages containing my username": "Zprávy obsahující moje uživatelské jméno",
-    "Messages containing @room": "Zprávy obsahující @místnost",
+    "Messages containing @room": "Zprávy obsahující @room",
     "Encrypted messages in one-to-one chats": "Zašifrované zprávy v přímých chatech",
     "Email addresses": "Emailové adresy",
     "Set a new account password...": "Nastavit nové heslo...",

From 6e33d35e877027108f70d80c0da62f0c762e841d Mon Sep 17 00:00:00 2001
From: lissitz <pbl1996@gmail.com>
Date: Fri, 31 Jan 2020 20:46:17 +0000
Subject: [PATCH 0916/3235] Translated using Weblate (Spanish)

Currently translated at 66.5% (1396 of 2100 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 85e24b7ba9..00d14b409f 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1020,7 +1020,7 @@
     "Prompt before sending invites to potentially invalid matrix IDs": "Pedir confirmación antes de enviar invitaciones a IDs de matrix que parezcan inválidos",
     "Show developer tools": "Mostrar herramientas de desarrollador",
     "Messages containing my username": "Mensajes que contengan mi nombre",
-    "Messages containing @room": "Mensajes que contengan @sala",
+    "Messages containing @room": "Mensajes que contengan @room",
     "Encrypted messages in one-to-one chats": "Mensajes cifrados en salas 1 a 1",
     "Encrypted messages in group chats": "Mensajes cifrados en chats grupales",
     "The other party cancelled the verification.": "El otro lado canceló la verificación.",
@@ -1182,13 +1182,13 @@
     "Your Riot is misconfigured": "Riot tiene un error de configuración",
     "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
-    "A conference call could not be started because the integrations server is not available": "No se puede iniciar la llamada porque no hay servidor de integraciones disponible.",
+    "A conference call could not be started because the integrations server is not available": "No se puede iniciar la llamada porque no hay servidor de integraciones disponible",
     "Replying With Files": "Respondiendo con archivos",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
     "The file '%(fileName)s' failed to upload.": "Falló en subir el archivo '%(fileName)s'.",
     "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.",
-    "Name or Matrix ID": "Nombre o identificador (ID) Matrix ",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pone ¯\\_(ツ)_/¯ al principio de un mensaje de texto.",
+    "Name or Matrix ID": "Nombre o identificador (ID) Matrix",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pone ¯\\_(ツ)_/¯ al principio de un mensaje de texto",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizar una sala <i>no migrará automáticamente a sus miembros a la nueva versión de la sala.</i> Incluiremos un enlace a la nueva sala en la versión antigüa de la misma - los miembros tendrán que seguir ese enlace para unirse a la nueva sala.",
     "Changes your display nickname in the current room only": "Cambia tu apodo sólo en la sala actual",
     "Changes your avatar in this current room only": "Cambia tu avatar sólo en la sala actual",
@@ -1202,22 +1202,22 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ha habilitado las insignias para %(newGroups)s y las ha deshabilitado para %(oldGroups)s en esta sala.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ha revocado la invitación para que %(targetDisplayName)s se una a la sala.",
     "Cannot reach homeserver": "No se puede conectar con el servidor",
-    "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de tener conexión a internet, o contacta con el administrador del servidor.",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de Riot que compruebe tu <i>configuración</i> por si hubiera errores o entradas duplicadas.",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de tener conexión a internet, o contacta con el administrador del servidor",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de Riot que compruebe <a>tu configuración</a> por si hubiera errores o entradas duplicadas.",
     "Cannot reach identity server": "No se puede conectar con el servidor de identidad",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Te puedes registrar, pero algunas funcionalidades no estarán disponibles hasta que se pueda conectar con el servidor de identidad. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puedes cambiar tu contraseña, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puedes iniciar sesión, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este mensaje, comprueba tu configuración o contacta con el administrador del servidor.",
-    "No homeserver URL provided": "No se ha indicado la URL del servidor.",
+    "No homeserver URL provided": "No se ha indicado la URL del servidor",
     "Unexpected error resolving homeserver configuration": "Error inesperado en la configuración del servidor",
     "Unexpected error resolving identity server configuration": "Error inesperado en la configuración del servidor de identidad",
     "User %(userId)s is already in the room": "El usuario %(userId)s ya está en la sala",
     "The user must be unbanned before they can be invited.": "El usuario debe ser desbloqueado antes de poder ser invitado.",
     "The user's homeserver does not support the version of the room.": "El servidor del usuario no soporta la versión de la sala.",
-    "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura de otros usuarios.",
+    "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura de otros usuarios",
     "Order rooms in the room list by most important first instead of most recent": "Ordenar la lista de salas por importancia en vez de por reciente",
     "Show recently visited rooms above the room list": "Mostrar salas visitadas recientemente sobre la lista de salas",
-    "Show hidden events in timeline": "Mostrar eventos ocultos en la línea del tiempo.",
+    "Show hidden events in timeline": "Mostrar eventos ocultos en la línea del tiempo",
     "Low bandwidth mode": "Modo de ancho de banda bajo",
     "Got It": "Entendido",
     "Scissors": "Tijeras",
@@ -1275,5 +1275,127 @@
     "Unread messages.": "Mensajes sin leer.",
     "Jump to first unread room.": "Saltar a la primera sala sin leer.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala."
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay sesiones desconocidas en esta sala: si continuas sin verificarlas, será posible que alguien escuche secretamente tu llamada.",
+    "Setting up keys": "Configurando claves",
+    "Verify this session": "Verificar esta sesión",
+    "Encryption upgrade available": "Mejora de encriptación disponible",
+    "Set up encryption": "Configurar la encriptación",
+    "Unverified session": "Sesión sin verificar",
+    "Verifies a user, session, and pubkey tuple": "Verifica a un usuario, sesión y tupla de clave pública",
+    "Unknown (user, session) pair:": "Par (usuario, sesión) desconocido:",
+    "Session already verified!": "¡La sesión ya ha sido verificada!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ATENCIÓN: ¡La sesión ya ha sido verificada, pero las claves NO CONCUERDAN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "¡ATENCIÓN: LA VERIFICACIÓN DE LA CLAVE HA FALLADO! La clave de firma para %(userId)s y sesión %(deviceId)s es \"%(fprint)s\", la cual no coincide con la clave proporcionada \"%(fingerprint)s\". ¡Esto podría significar que tus comunicaciones están siendo interceptadas!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clave de firma que proporcionaste coincide con la clave de firma que reciviste de la sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s añadió %(addedAddresses)s y %(count)s otras direcciones a esta sala",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s eliminó %(removedAddresses)s y %(count)s otras direcciones de esta sala",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s eliminó %(countRemoved)s y añadió %(countAdded)s direcciones a esta sala",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eliminó la regla que banea usuarios que corresponden con %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eliminó la regla que banea salas que corresponden con %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eliminó la regla que banea servidores que corresponden con %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s eliminó una regla correspondiente a %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s actualizó una regla de baneo inválida",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s actualizó una regla que banea usuarios que corresponden a %(glob)s por %(reason)s",
+    "They match": "Corresponden",
+    "They don't match": "No corresponden",
+    "To be secure, do this in person or use a trusted way to communicate.": "Para ser seguro, haz esto en persona o usando una forma de comunicación de confianza.",
+    "Lock": "Bloquear",
+    "Verify yourself & others to keep your chats safe": "Verifícate y verifica a otros para mantener tus chats seguros",
+    "Other users may not trust it": "Puede que otros usuarios no confíen en ello",
+    "Upgrade": "Actualizar",
+    "Verify": "Verificar",
+    "Later": "Más tarde",
+    "Upload": "Subir",
+    "Workspace: %(networkName)s": "Espacio de trabajo: %(networkName)s",
+    "Channel: %(channelName)s": "Canal: %(channelName)s",
+    "Show less": "Mostrar menos",
+    "Show more": "Mostrar más",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Cambiar la contraseña reseteará cualquier clave de encriptación end-to-end en todas las sesiones, haciendo el historial de chat encriptado ilegible, a no ser que primero exportes tus claves de sala y las reimportes después. En un futuro esto será mejorado.",
+    "in memory": "en memoria",
+    "not found": "no encontrado",
+    "Identity Server (%(server)s)": "Servidor de identidad %(server)s",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Estás usando actualmente <server></server>para descubrir y ser descubierto por contactos existentes que conoces. Puedes cambiar tu servidor de identidad más abajo.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Si no quieres usar <server /> para descubrir y ser descubierto por contactos existentes que conoces, introduce otro servidor de identidad más abajo.",
+    "Identity Server": "Servidor de identidad",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No estás usando actualmente un servidor de identidad. Para descubrir y ser descubierto por contactos existentes que conoces, introduce uno más abajo.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Desconectarte de tu servidor de identidad significa que no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Usar un servidor de identidad es opcional. Si eliges no usar un servidor de identidad, no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
+    "Do not use an identity server": "No usar un servidor de identidad",
+    "Enter a new identity server": "Introducir un servidor de identidad nuevo",
+    "Change": "Cambiar",
+    "Manage integrations": "Administrar integraciones",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los administradores de integración reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establece niveles de poder en tu nombre.",
+    "Something went wrong trying to invite the users.": "Algo salió mal al intentar invitar a los usuarios.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "No se pudo invitar a esos usuarios. Por favor, revisa los usuarios que quieres invitar e inténtalo de nuevo.",
+    "Failed to find the following users": "No se encontró a los siguientes usuarios",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Puede que los siguientes usuarios no existan o sean inválidos, y no pueden ser invitados: %(csvNames)s",
+    "Recent Conversations": "Conversaciones Recientes",
+    "Suggestions": "Sugerencias",
+    "Recently Direct Messaged": "Enviado Mensaje Directo recientemente",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si no encuentras a alguien, pídele su usuario, comparte tu usuario (%(userId)s) o un <a>enlace de perfil</a>.",
+    "Go": "Ir",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Si no encuentras a alguien, pídele su usuario (p.ej. @user:server.com) o <a>comparte esta sala</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Has añadido una nueva sesión '%(displayName)s', la cual está pidiendo claves de encriptación.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Tu sesión no verificada '%(displayName)s' esta pidiendo claves de encriptación.",
+    "Loading session info...": "Cargando información de sesión...",
+    "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.": "Has usado Riot anteriormente en %(host)s con carga diferida de usuarios habilitada. En esta versión la carga diferida está deshabilitada. Como el caché local no es compatible entre estas dos configuraciones, Riot necesita resincronizar tu cuenta.",
+    "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 la otra versión de Riot esta todavía abierta en otra pestaña, por favor, ciérrala, ya que usar Riot en el mismo host con la opción de carga diferida habilitada y deshabilitada simultáneamente causará problemas.",
+    "Incompatible local cache": "Caché local incompatible",
+    "Clear cache and resync": "Limpiar la caché y resincronizar",
+    "I don't want my encrypted messages": "No quiero mis mensajes cifrados",
+    "Manually export keys": "Exportar claves manualmente",
+    "You'll lose access to your encrypted messages": "Perderás acceso a tus mensajes encriptados",
+    "Are you sure you want to sign out?": "¿Estás seguro de que quieres salir?",
+    "Message edits": "Ediciones del mensaje",
+    "New session": "Nueva sesión",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar tu nueva sesión, dándola acceso a mensajes encriptados:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Si no te conectaste a esta sesión, es posible que tu cuenta haya sido comprometida.",
+    "This wasn't me": "No fui yo",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si encuentras algún error o quieres compartir una opinión, por favor, contacta con nosotros en GitHub.",
+    "Report bugs & give feedback": "Reportar errores y compartir mi opinión",
+    "Please fill why you're reporting.": "Por favor, explica por qué estás reportando.",
+    "Report Content to Your Homeserver Administrator": "Reportar contenido a tu administrador del homeserver",
+    "Send report": "Enviar reporte",
+    "Room Settings - %(roomName)s": "Configuración de la sala - %(roomName)s",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Actualizar esta sala requiere cerrar la instancia actual de esta sala y crear una nueva sala en su lugar. Para dar a los miembros de la sala la mejor experiencia, haremos lo siguiente:",
+    "Automatically invite users": "Invitar a usuarios automáticamente",
+    "Upgrade private room": "Actualizar sala privada",
+    "Upgrade public room": "Actualizar sala pública",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Actualizar una sala es una acción avanzada y es normalmente recomendada cuando una sala es inestable debido a fallos, funcionalidades no disponibles y vulnerabilidades.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Esto solo afecta a como la sala es procesada en el servidor. Si estás teniendo problemas con tu Riot, por favor<a>reporta un fallo</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de <oldVersion /> a <newVersion />.",
+    "Sign out and remove encryption keys?": "¿Salir y borrar las claves de encriptación?",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Un nombre de usuario solo puede contener letras minúsculas, números y '=_-./'",
+    "Checking...": "Comprobando...",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto te permitirá volver a tu cuenta después de desconectarte, y conectarte en otras sesiones.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Para ayudarnos a prevenir esto en el futuro, por favor, <a>envíanos logs</a>.",
+    "Missing session data": "Faltan datos de sesión",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Algunos datos de sesión, incluyendo claves de mensaje encriptadas, no se encuentran. Desconéctate y vuelve a conectarte para solucionarlo, reestableciendo las claves desde el backup.",
+    "Your browser likely removed this data when running low on disk space.": "Tu navegador probablemente borró estos datos cuando tenía poco espacio de disco.",
+    "Find others by phone or email": "Encontar a otros por teléfono o email",
+    "Be found by phone or email": "Ser encontrado por teléfono o email",
+    "Use bots, bridges, widgets and sticker packs": "Usar robots, puentes, widgets, o packs de pegatinas",
+    "Terms of Service": "Términos de servicio",
+    "To continue you need to accept the terms of this service.": "Para continuar necesitas aceptar estos términos de servicio.",
+    "Service": "Servicio",
+    "Summary": "Resumen",
+    "Document": "Documento",
+    "Next": "Siguiente",
+    "Room contains unknown sessions": "La sala contiene sesiones desconocidas",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contiene sesiones que no has visto antes.",
+    "Unknown sessions": "Sesiones desconocidas",
+    "Upload files (%(current)s of %(total)s)": "Subir archivos  (%(current)s de %(total)s)",
+    "Upload files": "Subir archivos",
+    "Upload all": "Subir todo",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este archivo es <b> demasiado grande</b> para subirse. El limite de tamaño de archivo es %(limit)s pero el archivo es %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Estos archivos son <b> demasiado grandes</b> para ser subidos. El límite de tamaño de archivos es %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Algunos archivos son <b> demasiado grandes</b> para ser subidos. El límite de tamaño de archivos es %(limit)s.",
+    "Upload %(count)s other files|other": "Subir %(count)s otros archivos",
+    "Upload %(count)s other files|one": "Subir %(count)s otro archivo",
+    "Cancel All": "Cancelar todo",
+    "Upload Error": "Error de subida",
+    "A widget would like to verify your identity": "Un widget quisiera verificar tu identidad",
+    "Remember my selection for this widget": "Recordar mi selección para este widget",
+    "Deny": "Rechazar"
 }

From 75fe3c2219c0a7c2857ef4a6417566dcf76a4d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Sat, 1 Feb 2020 12:00:04 +0100
Subject: [PATCH 0917/3235] ManageEventIndexDialog: Show how many rooms are
 being currently crawled.

---
 .../eventindex/ManageEventIndexDialog.js      | 15 ++++++++---
 src/i18n/strings/en_EN.json                   |  1 +
 src/indexing/EventIndex.js                    | 27 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 58605a3263..d6e4eb654d 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -38,6 +38,7 @@ export default class ManageEventIndexDialog extends React.Component {
         this.state = {
             eventIndexSize: 0,
             eventCount: 0,
+            crawlingRoomsCount: 0,
             roomCount: 0,
             currentRoom: null,
             crawlerSleepTime:
@@ -51,11 +52,15 @@ export default class ManageEventIndexDialog extends React.Component {
         let currentRoom = null;
 
         if (room) currentRoom = room.name;
+        const roomStats = eventIndex.crawlingRooms();
+        const crawlingRoomsCount = roomStats.crawlingRooms.size;
+        const roomCount = roomStats.totalRooms.size;
 
         this.setState({
             eventIndexSize: stats.size,
-            roomCount: stats.roomCount,
             eventCount: stats.eventCount,
+            crawlingRoomsCount: crawlingRoomsCount,
+            roomCount: roomCount,
             currentRoom: currentRoom,
         });
     }
@@ -70,6 +75,7 @@ export default class ManageEventIndexDialog extends React.Component {
 
     async componentWillMount(): void {
         let eventIndexSize = 0;
+        let crawlingRoomsCount = 0;
         let roomCount = 0;
         let eventCount = 0;
         let currentRoom = null;
@@ -80,8 +86,10 @@ export default class ManageEventIndexDialog extends React.Component {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
 
             const stats = await eventIndex.getStats();
+            const roomStats = eventIndex.crawlingRooms();
             eventIndexSize = stats.size;
-            roomCount = stats.roomCount;
+            crawlingRoomsCount = roomStats.crawlingRooms.size;
+            roomCount = roomStats.totalRooms.size;
             eventCount = stats.eventCount;
 
             const room = eventIndex.currentRoom();
@@ -91,6 +99,7 @@ export default class ManageEventIndexDialog extends React.Component {
         this.setState({
             eventIndexSize,
             eventCount,
+            crawlingRoomsCount,
             roomCount,
             currentRoom,
         });
@@ -135,7 +144,7 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Number of rooms:")} {formatCountLong(this.state.roomCount)}<br />
+                    {_t("Number of rooms:")} {formatCountLong(this.state.crawlingRoomsCount)} {_t("of")} {formatCountLong(this.state.roomCount)}<br />
                     {crawlerState}<br />
                     <Field
                         id={"crawlerSleepTimeMs"}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 78c837986b..522f6e63de 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2095,6 +2095,7 @@
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
+    "of": "of",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index cbd739602c..5769080511 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -748,4 +748,31 @@ export default class EventIndex extends EventEmitter {
             return client.getRoom(this.crawlerCheckpoints[0].roomId);
         }
     }
+
+    crawlingRooms() {
+        const totalRooms = new Set();
+        const crawlingRooms = new Set();
+
+        this.crawlerCheckpoints.forEach((checkpoint, index) => {
+            crawlingRooms.add(checkpoint.roomId);
+        });
+
+        if (this._currentCheckpoint !== null) {
+            crawlingRooms.add(this._currentCheckpoint.roomId);
+        }
+
+        const client = MatrixClientPeg.get();
+        const rooms = client.getRooms();
+
+        const isRoomEncrypted = (room) => {
+            return client.isRoomEncrypted(room.roomId);
+        };
+
+        const encryptedRooms = rooms.filter(isRoomEncrypted);
+        encryptedRooms.forEach((room, index) => {
+            totalRooms.add(room.roomId);
+        });
+
+        return {crawlingRooms, totalRooms};
+    }
 }

From d8576f23de01ed3ab2ef55b14be478b06f5cc5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Sat, 1 Feb 2020 12:11:49 +0100
Subject: [PATCH 0918/3235] ManageEventINdexDialog: Fix a line length issue.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js         | 3 ++-
 src/i18n/strings/en_EN.json                                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index d6e4eb654d..b98fecf22f 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -144,7 +144,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Number of rooms:")} {formatCountLong(this.state.crawlingRoomsCount)} {_t("of")} {formatCountLong(this.state.roomCount)}<br />
+                    {_t("Number of rooms:")} {formatCountLong(this.state.crawlingRoomsCount)} {_t("of ")}
+                    {formatCountLong(this.state.roomCount)}<br />
                     {crawlerState}<br />
                     <Field
                         id={"crawlerSleepTimeMs"}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 522f6e63de..d125d10cfb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2095,7 +2095,7 @@
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Number of rooms:": "Number of rooms:",
-    "of": "of",
+    "of ": "of ",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",

From dad44d0b1f6836a061ed42ee76db32ca3975ac82 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 1 Feb 2020 09:30:58 +0000
Subject: [PATCH 0919/3235] Translated using Weblate (Basque)

Currently translated at 93.5% (1964 of 2100 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 | 42 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index a7c1be2fdf..bd429fd521 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1946,5 +1946,45 @@
     "Upgrade your encryption": "Eguneratu zure zifratzea",
     "Set up encryption": "Ezarri zifratzea",
     "Encryption upgraded": "Zifratzea eguneratuta",
-    "Encryption setup complete": "Zifratzearen ezarpena egina"
+    "Encryption setup complete": "Zifratzearen ezarpena egina",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Saio ezezagunak daude gela honetan: egiaztatu gabe aurrera jarraitzen baduzu, baten batek zure deian kuxkuxeatu lezake.",
+    "Setting up keys": "Gakoak ezartzea",
+    "Verify this session": "Egiaztatu saio hau",
+    "Encryption upgrade available": "Zifratze eguneratzea eskuragarri",
+    "Unverified session": "Egiaztatu gabeko saioa",
+    "Verifies a user, session, and pubkey tuple": "Erabiltzaile, saio eta gako-publiko tupla egiaztatzen du",
+    "Unknown (user, session) pair:": "(Erabiltzaile, saio) bikote ezezaguna:",
+    "Session already verified!": "Saioa jada egiaztatu da!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ABISUA: Saioa jada egiaztatu da, baina gakoak EZ DATOZ BAT!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ABISUA: GAKO EGIAZTAKETAK HUTS EGIN DU! %(userId)s eta %(deviceId)s saioaren sinatze gakoa %(fprint)s da, eta ez dator bat emandako %(fingerprint)s gakoarekin. Honek esan nahi lezake norbaitek zure komunikazioan esku sartzen ari dela!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Eman duzun sinatze gakoa bat dator %(userId)s eta %(deviceId)s saioarentzat jaso duzun sinatze-gakoarekin. Saioa egiaztatu gisa markatu da.",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Gaitu zeharkako sinatzea erabiltzaileko egiaztatzeko eta ez saioko (garapenean)",
+    "Show padlocks on invite only rooms": "Erakutsi giltzarrapoak soilik gonbidapenarekin diren geletan",
+    "Never send encrypted messages to unverified sessions from this session": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko saioetara saio honetatik",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko saioetara gela honetan saio honetatik",
+    "Enable message search in encrypted rooms": "Gaitu mezuen bilaketa gela zifratuetan",
+    "Keep secret storage passphrase in memory for this session": "Mantendu biltegi sekretuko pasa-esaldia memorian saio honetan",
+    "How fast should messages be downloaded.": "Zeinen azkar deskargatu behar diren mezuak.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Baieztatu azpiko emojiak bi gailuetan ikusten direla, ordena berean:",
+    "Verify this device by confirming the following number appears on its screen.": "Egiaztatu gailu hau honako zenbakia bere pantailan agertzen dela baieztatuz.",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s egiaztatu bitartean zain…",
+    "They match": "Bat datoz",
+    "They don't match": "Ez datoz bat",
+    "To be secure, do this in person or use a trusted way to communicate.": "Ziurtatzeko, egin hau aurrez aurre edo komunikabide seguru baten bidez.",
+    "Verify yourself & others to keep your chats safe": "Egiaztatu zure burua eta besteak txatak seguru mantentzeko",
+    "Review": "Berrikusi",
+    "This bridge was provisioned by <user />.": "Zubi hau <user /> erabiltzaileak hornitu du.",
+    "Workspace: %(networkName)s": "Lan eremua: %(networkName)s",
+    "Channel: %(channelName)s": "Kanala: %(channelName)s",
+    "Show less": "Erakutsi gutxiago",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pasahitza aldatzean oraingo muturretik muturrerako zifratze gako guztiak ezeztatuko ditu saio guztietan, zifratutako txaten historiala ezin izango da irakurri ez badituzu aurretik zure geletako gakoak esportatzen eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Zure kontua zeharkako sinatze identitate bat du biltegi sekretuan, baina saio honek ez du oraindik fidagarritzat.",
+    "in memory": "memorian",
+    "Your homeserver does not support session management.": "Zure hasiera-zerbitzariak ez du saio kudeaketa onartzen.",
+    "Unable to load session list": "Ezin izan da saioen zerrenda kargatu",
+    "Delete %(count)s sessions|other": "Ezabatu %(count)s saio",
+    "Delete %(count)s sessions|one": "Ezabatu saio %(count)s",
+    "rooms.": "gela.",
+    "Manage": "Kudeatu",
+    "Enable": "Gaitu"
 }

From 455b4f9a40c18965145b40f0517d85ca20227851 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 1 Feb 2020 02:23:12 +0000
Subject: [PATCH 0920/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2100 of 2100 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 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6e0f43e543..8fc4e7da99 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2107,5 +2107,23 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot 正在安全地本機快取已加密的訊息以讓它們顯示在搜尋結果中：",
     "Space used:": "已使用空間：",
     "Indexed messages:": "已索引的訊息：",
-    "Number of rooms:": "聊天室數量："
+    "Number of rooms:": "聊天室數量：",
+    "Setting up keys": "設定金鑰",
+    "How fast should messages be downloaded.": "訊息應多快下載一次。",
+    "Verify yourself & others to keep your chats safe": "驗證您自己與其他以保證您的聊天安全",
+    "You have not verified this user.": "您尚未驗證此使用者。",
+    "Recovery key mismatch": "復原金鑰不相符",
+    "Incorrect recovery passphrase": "錯誤的復原通關密語",
+    "Backup restored": "備份已復原",
+    "Enter recovery passphrase": "輸入復原通關密語",
+    "Enter recovery key": "輸入復原金鑰",
+    "Confirm your identity by entering your account password below.": "透過在下方輸入您的帳號密碼來確認身份。",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "將其副本保存在安全的地方，如密碼管理器或保險箱等。",
+    "Your recovery key": "您的復原金鑰",
+    "Copy": "副本",
+    "You can now verify your other devices, and other users to keep your chats safe.": "您現在可以驗證您的其他裝置與其他使用者以保護您的聊天安全。",
+    "Make a copy of your recovery key": "複製您的復原金鑰",
+    "You're done!": "您已經完成了！",
+    "Create key backup": "建立金鑰備份",
+    "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）"
 }

From e946f5f4b8a0f6c120fc2875909b43b895d6612b Mon Sep 17 00:00:00 2001
From: lissitz <pbl1996@gmail.com>
Date: Sat, 1 Feb 2020 00:22:47 +0000
Subject: [PATCH 0921/3235] Translated using Weblate (Spanish)

Currently translated at 67.6% (1420 of 2100 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 00d14b409f..93ccb2d0c3 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1397,5 +1397,29 @@
     "Upload Error": "Error de subida",
     "A widget would like to verify your identity": "Un widget quisiera verificar tu identidad",
     "Remember my selection for this widget": "Recordar mi selección para este widget",
-    "Deny": "Rechazar"
+    "Deny": "Rechazar",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Tu contraseña ha sido cambiada satisfactoriamente. No recibirás notificaciones de push en otras sesiones hasta que te conectes de nuevo a ellas",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aceptar los Términos de Servicio del servidor de identidad %(serverName)s para poder ser descubierto por dirección de email o número de teléfono.",
+    "Discovery": "Descubrimiento",
+    "Deactivate account": "Desactivar cuenta",
+    "Clear cache and reload": "Limpiar caché y recargar",
+    "Ignored/Blocked": "Ignorado/Bloqueado",
+    "Error adding ignored user/server": "Error añadiendo usuario/servidor ignorado",
+    "Error subscribing to list": "Error al suscribirse a la lista",
+    "Please verify the room ID or alias and try again.": "Por favor, verifica el ID de la sala o el alias e inténtalo de nuevo.",
+    "Error removing ignored user/server": "Error al remover usuario/servidor ignorado",
+    "Error unsubscribing from list": "Error al desuscribirse de la lista",
+    "None": "Ninguno",
+    "Server rules": "Reglas del servidor",
+    "User rules": "Reglas de usuario",
+    "You have not ignored anyone.": "No has ignorado a nadie.",
+    "You are currently ignoring:": "Estás ignorando actualmente:",
+    "You are not subscribed to any lists": "No estás suscrito a ninguna lista",
+    "Unsubscribe": "Desuscribirse",
+    "View rules": "Ver reglas",
+    "You are currently subscribed to:": "Estás actualmente suscrito a:",
+    "⚠ These settings are meant for advanced users.": "⚠ Estas opciones son indicadas para usuarios avanzados.",
+    "Personal ban list": "Lista de bans personal",
+    "Server or user ID to ignore": "Servidor o ID de usuario a ignorar",
+    "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org"
 }

From a3ef0aa6e89fbc53f856aaa9b1335ccf3488c308 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 1 Feb 2020 12:09:41 +0000
Subject: [PATCH 0922/3235] Honour the isLogin flag in theme.js

Horrendous hack to fix the fact that if 'match system theme' was
set, the isLogin flag in the controller would do nothing because
theme.js would have decided to use the system theme before even
asking what the theme setting was.
---
 src/theme.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/theme.js b/src/theme.js
index 1ba87a2048..774148dacd 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -21,6 +21,7 @@ export const DEFAULT_THEME = "light";
 import Tinter from "./Tinter";
 import dis from "./dispatcher";
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import ThemeController from "./settings/controllers/ThemeController";
 
 export class ThemeWatcher {
     static _instance = null;
@@ -82,12 +83,22 @@ export class ThemeWatcher {
     getEffectiveTheme() {
         // Dev note: Much of this logic is replicated in the GeneralUserSettingsTab
 
+        // XXX: checking the isLight flag here makes checking it in the ThemeController
+        // itself completely redundant since we just override the result here and we're
+        // now effectively just using the ThemeController as a place to store the static
+        // variable. The system theme setting probably ought to have an equivalent
+        // controller that honours the same flag, although probablt better would be to
+        // have the theme logic in one place rather than split between however many
+        // different places.
+        if (ThemeController.isLogin) return 'light';
+
         // If the user has specifically enabled the system matching option (excluding default),
         // then use that over anything else. We pick the lowest possible level for the setting
         // to ensure the ordering otherwise works.
         const systemThemeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "use_system_theme", null, false, true);
         if (systemThemeExplicit) {
+            console.log("returning explicit system theme");
             if (this._preferDark.matches) return 'dark';
             if (this._preferLight.matches) return 'light';
         }
@@ -97,7 +108,10 @@ export class ThemeWatcher {
         // level for the setting to ensure the ordering otherwise works.
         const themeExplicit = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "theme", null, false, true);
-        if (themeExplicit) return themeExplicit;
+        if (themeExplicit) {
+            console.log("returning explicit theme: " + themeExplicit);
+            return themeExplicit;
+        }
 
         // If the user hasn't really made a preference in either direction, assume the defaults of the
         // settings and use those.
@@ -105,6 +119,7 @@ export class ThemeWatcher {
             if (this._preferDark.matches) return 'dark';
             if (this._preferLight.matches) return 'light';
         }
+        console.log("returning theme value");
         return SettingsStore.getValue('theme');
     }
 

From bc2fa4d31be5393bc8d8a8a229d9d0c5f9e06378 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 1 Feb 2020 11:21:44 +0000
Subject: [PATCH 0923/3235] Translated using Weblate (Basque)

Currently translated at 97.7% (2053 of 2101 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 | 91 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index bd429fd521..d5c7d7b8a8 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1986,5 +1986,94 @@
     "Delete %(count)s sessions|one": "Ezabatu saio %(count)s",
     "rooms.": "gela.",
     "Manage": "Kudeatu",
-    "Enable": "Gaitu"
+    "Enable": "Gaitu",
+    "This session is backing up your keys. ": "Saio honek zure gakoen babes-kopia egiten du. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Saio honek <b>ez du zure gakoen babes-kopia egiten</b>, baina badago berreskuratu eta gehitu deakezun aurreko babes-kopia bat.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Konektatu saio hau gakoen babes-kopiara saioa amaitu aurretik saio honetan bakarrik dauden gakoak ez galtzeko.",
+    "Connect this session to Key Backup": "Konektatu saio hau gakoen babes-kopiara",
+    "Backup has a <validity>valid</validity> signature from this session": "Babes-kopiak saio honen <validity>baliozko</validity> sinadura bat du",
+    "Backup has an <validity>invalid</validity> signature from this session": "Babes-kopiak saio honen <validity>baliogabeko</validity> sinadura bat du",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Babes-kopiak <validity>baliozko</validity> sinadura du, <verify>egiaztatutako</verify> saio batena, <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Babes-kopiak <validity>baliozko</validity> sinadura du, <verify>egiaztatu gabeko</verify> saio batena, <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Babes-kopiak <validity>baliogabeko</validity> sinadura du, <verify>egiaztatutako</verify> saio batena, <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Babes-kopiak <validity>baliogabeko</validity> sinadura du, <verify>egiaztatu gabeko</verify> saio batena, <device></device>",
+    "Backup is not signed by any of your sessions": "Babes-kopia ez dago zure saio batek sinatuta",
+    "This backup is trusted because it has been restored on this session": "Babes-kopia hau fidagarritzat jotzen da saio honetan berrekuratu delako",
+    "Your keys are <b>not being backed up from this session</b>.": "<b>Ez da zure gakoen babes-kopia egiten saio honetatik</b>.",
+    "Enable desktop notifications for this session": "Gaitu mahaigaineko jakinarazpenak saio honentzat",
+    "Enable audible notifications for this session": "Gaitu jakinarazpen entzungarriak saio honentzat",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Zure pasahitza ongi aldatu da. Ez duzu jakinarazpenik jasoko beste saioetan horietan saioa berriro hasi arte",
+    "Session ID:": "Saioaren ID-a:",
+    "Session key:": "Saioaren gakoa:",
+    "Message search": "Mezuen bilaketa",
+    "Sessions": "Saioak",
+    "A session's public name is visible to people you communicate with": "Saio baten izen publikoa zurekin komunikatzen den jendeak ikusi dezake",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Gela honek honako plataformetara kopiatzen ditu mezuak. <a>Argibide gehiago.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Gela honek ez ditu mezuak beste plataformatara kopiatzen. <a>Argibide gehiago.</a>",
+    "Bridges": "Zubiak",
+    "This user has not verified all of their sessions.": "Erabiltzaile honek ez ditu bere saio guztiak egiaztatu.",
+    "You have not verified this user.": "Ez duzu erabiltzaile hau egiaztatu.",
+    "Someone is using an unknown session": "Baten batek saio ezezagun bat erabiltzen du",
+    "Some sessions for this user are not trusted": "Erabiltzaile honen saio batzuk ez dira fidagarritzat jotzen",
+    "All sessions for this user are trusted": "Erabiltzaile honen saio guztiak fidagarritzat jotzen dira",
+    "Some sessions in this encrypted room are not trusted": "Zifratutako gela honetako saio batzuk ez dira fidagarritzat jotzen",
+    "All sessions in this encrypted room are trusted": "Zifratutako gela honetako saio guztiak fidagarritzat jotzen dira",
+    "Encrypted by an unverified session": "Egiaztatu gabeko saio batek zifratua",
+    "Encrypted by a deleted session": "Ezabatutako saio batek zifratua",
+    "Your messages are not secure": "Zure mezuak ez daude babestuta",
+    "Your homeserver": "Zure hasiera-zerbitzaria",
+    "The homeserver the user you’re verifying is connected to": "Egiztatzen ari zaren erabiltzailearen hasiera-zerbitzaria",
+    "Yours, or the other users’ internet connection": "Zure edo bestearen Internet konexioa",
+    "Yours, or the other users’ session": "Zure edo bestearen saioa",
+    "%(count)s sessions|other": "%(count)s saio",
+    "%(count)s sessions|one": "saio %(count)s",
+    "Hide sessions": "Ezkutatu saioak",
+    "Verify by emoji": "Egiaztatu emoji bidez",
+    "Verify by comparing unique emoji.": "Egiaztatu emoji bakanak konparatuz.",
+    "Ask %(displayName)s to scan your code:": "Eskatu %(displayName)s erabiltzaileari zure kodea eskaneatu dezan:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ezin baduzu goiko kodea eskaneatu, egiaztatu emoji bakanak konparatuz.",
+    "You've successfully verified %(displayName)s!": "Ongi egiaztatu duzu %(displayName)s!",
+    "Got it": "Ulertuta",
+    "Verification timed out. Start verification again from their profile.": "Egiaztaketarako denbora-muga agortu da. Hasi egiaztaketa berriro bere profiletik.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s erabiltzaileak egiaztaketa ezeztatu du. Hasi egiaztaketa berriro bere profiletik.",
+    "You cancelled verification. Start verification again from their profile.": "Egiaztaketa ezeztatu duzu. Hasi egiaztaketa berriro bere profiletik.",
+    "Encryption enabled": "Zifratzea gaituta",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Gela honetako mezuak muturretik muturrera zifratuta daude. Ikasi gehiago eta egiaztatu erabiltzaile hau bere erabiltzaile profilean.",
+    "Encryption not enabled": "Zifratzea gaitu gabe",
+    "The encryption used by this room isn't supported.": "Gela honetan erabilitako zifratzea ez da onartzen.",
+    "Clear all data in this session?": "Garbitu saio honetako datu guztiak?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Saio honetako datuak garbitzea behin betirako da. Zifratutako mezuak galdu egingo dira gakoen babes-kopia egin ez bada.",
+    "Verify session": "Egiaztatu saioa",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Saio hau fidagarritzat jo daitekeela egiaztatzeko, egiaztatu gailu horretako erabiltzaile ezarpenetan ikusten duzun gakoa beheko honekin bat datorrela:",
+    "Session name": "Saioaren izena",
+    "Session key": "Saioaren gakoa",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Bat badator, sakatu beheko egiaztatu botoia. Ez badator bat, beste inor saioa antzematen ari da eta zerrenda beltzean sartu beharko zenuke.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Erabiltzaile hau egiaztatzean bere saioa fidagarritzat joko da, eta zure saioak beretzat fidagarritzat ere.",
+    "Loading session info...": "Saioaren informazioa kargatzen...",
+    "New session": "Saio berria",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Erabili saio hau berria egiaztatzeko, honela mezu zifratuetara sarbidea emanez:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Ez baduzu saio hau zuk hasi, agian baten bat zure kontuan sartu da.",
+    "This wasn't me": "Ez naiz ni izan",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Honekin zure kontura itzuli ahalko zara beste saioak amaitu eta berriro hasita.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Egiaztatu gabeko saioak zerrenda beltzean sartzen ari zara, saio hauetara mezuak bidaltzeko egiaztatu behar dituzu.",
+    "Room contains unknown sessions": "Gelak saio ezezagunak ditu",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "%(RoomName)s gelan aurretik ikusi ez dituzun saioak daude.",
+    "Unknown sessions": "Saio ezezagunak",
+    "Recovery key mismatch": "Berreskuratze gakoak ez datoz bat",
+    "Incorrect recovery passphrase": "Berreskuratze pasa-esaldi okerra",
+    "Backup restored": "Babes-kopia berreskuratuta",
+    "Enter recovery passphrase": "Sartu berreskuratze pasa-esaldia",
+    "Enter recovery key": "Sartu berreskuratze gakoa",
+    "Confirm your identity by entering your account password below.": "Baieztatu zure identitatea zure kontuaren pasahitza azpian idatziz.",
+    "Message not sent due to unknown sessions being present": "Ez da mezua bidali saio ezezagunak daudelako",
+    "Your new session is now verified. Other users will see it as trusted.": "Zure saioa egiaztatuta dago orain. Beste erabiltzaileek fidagarri gisa ikusiko dute.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Saio honetan segurtasuna ezarri ezean, ez du zifratutako mezuetara sarbiderik izango.",
+    "Sender session information": "Igorlearen saioaren informazioa",
+    "Back up my encryption keys, securing them with the same passphrase": "Egin nire zifratze gakoen babes-kopia, babestu pasa-esaldi berberarekin",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gorde kopia bat toki seguruan, esaterako pasahitz kudeatzaile batean edo gordailu kutxan.",
+    "Your recovery key": "Zure berreskuratze gakoa",
+    "Copy": "Kopiatu",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Orain zure beste gailuak eta beste erabiltzaileak egiaztatu ditzakezu txatak seguru mantentzeko",
+    "Make a copy of your recovery key": "Egin zure berreskuratze gakoaren kopia",
+    "You're done!": "Bukatu duzu!"
 }

From ffc3cdf7b5ac40759b3a5c3607cb438362cde594 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Sat, 1 Feb 2020 13:48:52 +0100
Subject: [PATCH 0924/3235] Tweak emoji sizes

---
 res/css/views/verification/_VerificationShowSas.scss | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index 80677094ba..5038d40b73 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -42,18 +42,20 @@ limitations under the License.
     width: 52px;
 }
 
-.mx_VerificationShowSas_emojiSas_emoji {
-    font-size: 48px;
+.mx_Dialog .mx_VerificationShowSas_emojiSas_block,
+.mx_AuthPage_modal .mx_VerificationShowSas_emojiSas_block {
+    width: 60px;
 }
 
-.mx_UserInfo .mx_VerificationShowSas_emojiSas_emoji {
-    font-size: 32px; // in UserInfo use a smaller font-size to fit in a smaller space
+.mx_VerificationShowSas_emojiSas_emoji {
+    font-size: 32px;
 }
 
 .mx_VerificationShowSas_emojiSas_label {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    font-size: 12px;
 }
 
 .mx_VerificationShowSas_emojiSas_break {

From 9cf53aa9d89986139c5ea4b7a9447281b882d981 Mon Sep 17 00:00:00 2001
From: Bob <bob+git@vulpin.com>
Date: Sun, 2 Feb 2020 16:34:19 +1100
Subject: [PATCH 0925/3235] Only return formatted text when necessary (for
 escaped chars)

Signed-off-by: Bob Rao <bob+git@vulpin.com>
---
 src/editor/serialize.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index 075c462b37..03f3759ea0 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -44,7 +44,11 @@ export function htmlSerializeIfNeeded(model, {forceHTML = false} = {}) {
     // Format "plain" text to ensure removal of backslash escapes
     // https://github.com/vector-im/riot-web/issues/11230
     // https://github.com/vector-im/riot-web/issues/2870
-    return parser.toPlaintext();
+    const postParsePlaintext = parser.toPlaintext();
+    if (postParsePlaintext !== md) {
+        // only return "formatted" text if it differs from the source text
+        return postParsePlaintext;
+    }
 }
 
 export function textSerialize(model) {

From aa52118fa1b81bad21fa1fd9ba5a8928ce36cf9b Mon Sep 17 00:00:00 2001
From: unknown <rmtestard@gmail.com>
Date: Sun, 2 Feb 2020 17:31:06 +0100
Subject: [PATCH 0926/3235] the width was not properly set to other languages
 than english, a min-width will keep the proper size of the button while
 leaving some room for more word expensive languages such as french

---
 res/css/views/dialogs/_InviteDialog.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 71fab50339..5e0893b8fd 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -62,7 +62,7 @@ limitations under the License.
     }
 
     .mx_InviteDialog_goButton {
-        width: 48px;
+        min-width: 48px;
         margin-left: 10px;
         height: 25px;
         line-height: 25px;
@@ -131,7 +131,7 @@ limitations under the License.
             height: 24px;
             grid-column: 1;
             grid-row: 1;
-            mask-image: url('$(res)/img/feather-customised/check.svg');
+            mask-image: url("$(res)/img/feather-customised/check.svg");
             mask-size: 100%;
             mask-repeat: no-repeat;
             position: absolute;

From 20fc8514a5270db4167cb707bb7a730e7c01551e Mon Sep 17 00:00:00 2001
From: unknown <rmtestard@gmail.com>
Date: Sun, 2 Feb 2020 18:47:16 +0100
Subject: [PATCH 0927/3235] I have added spacing, as devices are very hard to
 read otherwise

---
 res/css/views/settings/_DevicesPanel.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/css/views/settings/_DevicesPanel.scss b/res/css/views/settings/_DevicesPanel.scss
index 581ff47fc1..49debe842f 100644
--- a/res/css/views/settings/_DevicesPanel.scss
+++ b/res/css/views/settings/_DevicesPanel.scss
@@ -18,7 +18,7 @@ limitations under the License.
     display: table;
     table-layout: fixed;
     width: 880px;
-    border-spacing: 2px;
+    border-spacing: 10px;
 }
 
 .mx_DevicesPanel_header {
@@ -32,7 +32,11 @@ limitations under the License.
 
 .mx_DevicesPanel_header > div {
     display: table-cell;
-    vertical-align: bottom;
+    vertical-align: middle;
+}
+
+.mx_DevicesPanel_header .mx_DevicesPanel_deviceName {
+    width: 50%;
 }
 
 .mx_DevicesPanel_header .mx_DevicesPanel_deviceLastSeen {

From a31be025cffa819bfe02221421f71cfbba22ffbe Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 1 Feb 2020 13:26:22 +0000
Subject: [PATCH 0928/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2101 of 2101 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 8fc4e7da99..668725c4aa 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2125,5 +2125,6 @@
     "Make a copy of your recovery key": "複製您的復原金鑰",
     "You're done!": "您已經完成了！",
     "Create key backup": "建立金鑰備份",
-    "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）"
+    "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）",
+    "of ": "的 "
 }

From a71c368994569d153601538c2f47069210810009 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Sun, 2 Feb 2020 20:55:40 +0000
Subject: [PATCH 0929/3235] Translated using Weblate (Dutch)

Currently translated at 79.3% (1667 of 2101 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 5fcaf0d71a..cfd829d718 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -685,7 +685,7 @@
     "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een gebruiker, hierdoor worden de berichten van de gebruiker weer zichtbaar",
     "Notify the whole room": "Laat dit aan het hele groepsgesprek weten",
     "Room Notification": "Groepsgespreksmelding",
-    "The information being sent to us to help make Riot.im better includes:": "De informatie die naar ons wordt verstuurd om Riot.im te verbeteren betreft:",
+    "The information being sent to us to help make Riot.im better includes:": "De naar ons verstuurde informatie om Riot.im te verbeteren behelst:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Waar deze pagina identificeerbare informatie bevat, zoals een gespreks-, gebruikers- of groeps-ID, zullen deze gegevens verwijderd worden voordat ze naar de server gestuurd worden.",
     "The platform you're on": "Het platform dat u gebruikt",
     "The version of Riot.im": "De versie van Riot.im",
@@ -718,7 +718,7 @@
     "Who can join this community?": "Wie kan er tot deze gemeenschap toetreden?",
     "Everyone": "Iedereen",
     "Leave this community": "Deze gemeenschap verlaten",
-    "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.": "Bij het oplossen van in GitHub gemelde problemen helpen foutopsporingslogboeken ons enorm.  Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
+    "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.": "Voor het oplossen van in GitHub gemelde problemen helpen foutopsporingslogboeken ons enorm.  Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
     "Submit debug logs": "Foutopsporingslogboeken indienen",
     "Opens the Developer Tools dialog": "Opent het dialoogvenster met ontwikkelaarsgereedschap",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
@@ -962,7 +962,7 @@
     "Avoid recent years": "Vermijd recente jaren",
     "Avoid years that are associated with you": "Vermijd jaren die op uzelf betrekking hebben",
     "Avoid dates and years that are associated with you": "Vermijd data en jaren die op uzelf betrekking hebben",
-    "Capitalization doesn't help very much": "Schrijven in hoofdletters maakt niet veel uit",
+    "Capitalization doesn't help very much": "Hoofdlettergebruik helpt niet echt",
     "All-uppercase is almost as easy to guess as all-lowercase": "Enkel hoofdletters is nauwelijks moeilijker te raden als enkel kleine letters",
     "Reversed words aren't much harder to guess": "Omgedraaide woorden zijn bijna even gemakkelijk te raden",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Voorspelbare vervangingen (zoals '@' i.p.v. 'a') zijn niet erg zinvol",
@@ -1673,5 +1673,11 @@
     "Add Phone Number": "Telefoonnummer toevoegen",
     "Your email address hasn't been verified yet": "Uw emailadres is nog niet gecontroleerd",
     "Click the link in the email you received to verify and then click continue again.": "Open de link in de ontvangen contrôle-email, en klik dan op \"Doorgaan\".",
-    "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s."
+    "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende sessies.  Tenzij u die verifieert zou iemand u kunnen afluisteren.",
+    "Setting up keys": "Sleutelconfiguratie",
+    "Verify this session": "Deze sessie verifiëren",
+    "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Type <code>/help</code> om alle opdrachten te zien.  Was het uw bedoeling dit als bericht te sturen?",
+    "Help": "Hulp"
 }

From ee9f3c9e188d28415cd164c85ec5042d678810d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 1 Feb 2020 12:55:26 +0000
Subject: [PATCH 0930/3235] Translated using Weblate (French)

Currently translated at 100.0% (2101 of 2101 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 4ead6a4d8e..bd491ad7f5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2123,5 +2123,8 @@
     "Make a copy of your recovery key": "Faire une copie de votre clé de récupération",
     "You're done!": "Vous avez terminé !",
     "Create key backup": "Créer une sauvegarde de clé",
-    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération."
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération.",
+    "How fast should messages be downloaded.": "À quelle fréquence les messages doivent être téléchargés.",
+    "of ": "sur ",
+    "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)"
 }

From c879d4c0abedc0b85c754dcdd0d7cfcaaf90aa3f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 1 Feb 2020 19:50:09 +0000
Subject: [PATCH 0931/3235] Translated using Weblate (Hungarian)

Currently translated at 94.4% (1984 of 2101 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 | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 9de0f42ab9..32f5b237e7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1979,5 +1979,32 @@
     "Space used:": "Hely felhasználva:",
     "Indexed messages:": "Indexált üzenetek:",
     "Number of rooms:": "Szobák száma:",
-    "Restore your key backup to upgrade your encryption": "A titkosítás fejlesztéséhez allítsd vissza a kulcs mentést"
+    "Restore your key backup to upgrade your encryption": "A titkosítás fejlesztéséhez allítsd vissza a kulcs mentést",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ismeretlen munkamenetek vannak a szobában: ha ellenőrzés nélkül folytatod lehet, hogy valaki belehallgat a hívásodba.",
+    "Setting up keys": "Kulcsok beállítása",
+    "Unverified session": "Ellenőrizetlen munkamenet",
+    "Verifies a user, session, and pubkey tuple": "Felhasználó, munkamenet és nyilvános kulcs hármas ellenőrzése",
+    "Unknown (user, session) pair:": "Ismeretlen (felhasználó, munkamenet) páros:",
+    "Session already verified!": "Munkamenet  már ellenőrizve!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "FIGYELEM: A munkamenet már ellenőrizve van de a kulcsok NEM EGYEZNEK!",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Kereszt-aláírás engedélyezése a felhasználó alapú azonosításhoz a munkamenet alapú helyett (fejlesztés alatt)",
+    "Show padlocks on invite only rooms": "Lakat mutatása azoknál a szobáknál amikbe csak meghívóval lehet belépni",
+    "Never send encrypted messages to unverified sessions from this session": "Sose küldj titkosított üzenetet nem ellenőrizetlen munkamenetbe ebből a munkamenetből",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Sose küldjön titkosított üzeneteket ellenőrizetlen munkamenetekbe ebben a szobában ebből a munkamenetből",
+    "Keep secret storage passphrase in memory for this session": "A biztonsági tároló jelmondatát ebben a munkamenetben tartsa a memóriában",
+    "How fast should messages be downloaded.": "Milyen gyorsan legyenek az üzenetek letöltve.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Erősítsd meg, hogy az emoji-k alul mind a két eszközön ugyanazok ugyanabban a sorrendben:",
+    "Verify this device by confirming the following number appears on its screen.": "Ellenőrizd az eszközt azzal, hogy megerősíted az alábbi számok jelentek meg a képernyőjén.",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s felhasználóra várakozás az ellenőrzéshez…",
+    "They match": "Egyeznek",
+    "They don't match": "Nem egyeznek",
+    "To be secure, do this in person or use a trusted way to communicate.": "A biztonság érdekében ezt végezd el személyesen vagy egy megbízható kommunikációs csatornán.",
+    "Verify yourself & others to keep your chats safe": "Ellenőrizd magad és másokat, hogy a csevegéseid biztonságban legyenek",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A fiókodhoz tartozik egy kereszt-aláírás a biztonsági tárolóban de ebben a munkamenetben ez még nem megbízható.",
+    "in memory": "memóriában",
+    "Your homeserver does not support session management.": "A matrix szervered nem támogatja a munkamenetek kezelését.",
+    "Unable to load session list": "A munkamenet listát nem lehet betölteni",
+    "Delete %(count)s sessions|other": "%(count)s munkamenet törlése",
+    "Delete %(count)s sessions|one": "%(count)s munkamenet törlése",
+    "This session is backing up your keys. ": "Ez a munkamenet elmenti a kulcsaidat. "
 }

From f0bd75fcfb46002f78c394ea2cc391bbaafb16ed Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 3 Feb 2020 09:36:31 +0000
Subject: [PATCH 0932/3235] Translated using Weblate (Italian)

Currently translated at 94.5% (1986 of 2101 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index bf20a4f7dc..f6ee0f82ff 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2000,5 +2000,14 @@
     "This backup is trusted because it has been restored on this session": "Questo backup è fidato perchè è stato ripristinato in questa sessione",
     "Space used:": "Spazio usato:",
     "Indexed messages:": "Messaggi indicizzati:",
-    "Number of rooms:": "Numero di stanze:"
+    "Number of rooms:": "Numero di stanze:",
+    "Setting up keys": "Configurazione chiavi",
+    "Show padlocks on invite only rooms": "Mostra lucchetto nelle stanze solo a invito",
+    "Keep secret storage passphrase in memory for this session": "Tieni in memoria la password dell'archivio segreto per questa sessione",
+    "How fast should messages be downloaded.": "Quanto veloce devono essere scaricati i messaggi.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Conferma che le emoji sottostanti sono mostrate in entrambi i dispositivi, nello stesso ordine:",
+    "Verify this device by confirming the following number appears on its screen.": "Verifica questo dispositivo confermando che il seguente numero appare sullo schermo.",
+    "Verify yourself & others to keep your chats safe": "Verifica te stesso e gli altri per mantenere sicure le chat",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Backup chiavi salvato nell'archivio segreto, ma questa funzione non è attiva in questa sessione. Attiva la firma incrociata in Laboratori per modificare lo stato del backup chiavi.",
+    "Your keys are <b>not being backed up from this session</b>.": "Il backup chiavi <b>non viene fatto per questa sessione</b>."
 }

From fb6bb2fd6b2ae64322f3aee4f9aa03af6fe704c9 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 1 Feb 2020 16:37:51 +0000
Subject: [PATCH 0933/3235] Translated using Weblate (Turkish)

Currently translated at 70.7% (1486 of 2101 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index e5f5a8869a..8261d21688 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1479,5 +1479,22 @@
     "WARNING: Session already verified, but keys do NOT MATCH!": "UYARI: Oturum zaten doğrulanmış, ama anahtarlar EŞLEŞMİYOR!",
     "Your Matrix account on <underlinedServerName />": "Matrix hesabınız <underlinedServerName /> da yer almakta",
     "No identity server is configured: add one in server settings to reset your password.": "Kimlik sunucusu yapılandırılmamış: sunucu ayarlarından ekleyerek parolanızı sıfırlayabilirsiniz.",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Yeni parolanızın ayarlandığını doğrulamak için bir e-posta gelen kutunuza gönderilecek."
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Yeni parolanızın ayarlandığını doğrulamak için bir e-posta gelen kutunuza gönderilecek.",
+    "Invalid homeserver discovery response": "Geçersiz anasunucu keşif yanıtı",
+    "Failed to get autodiscovery configuration from server": "Sunucudan otokeşif yapılandırması alınması başarısız",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Anasunucu URL i geçerli bir Matrix anasunucusu olarak gözükmüyor",
+    "Invalid identity server discovery response": "Geçersiz kimlik sunucu keşfi yanıtı",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Bu servisi kullanmaya devam etmek için lütfen <a>servis yöneticinizle bağlantı kurun</a>.",
+    "Failed to perform homeserver discovery": "Anasunucu keşif işlemi başarısız",
+    "Sender session information": "Gönderici oturum bilgisi",
+    "Go back to set it again.": "Geri git ve yeniden ayarla.",
+    "Your recovery key": "Kurtarma anahtarınız",
+    "Copy": "Kopyala",
+    "Upgrade your encryption": "Şifrelemenizi güncelleyin",
+    "Make a copy of your recovery key": "Kurtarma anahtarınızın bir kopyasını oluşturun",
+    "Create key backup": "Anahtar yedeği oluştur",
+    "Set up Secure Messages": "Güvenli Mesajları Ayarla",
+    "Space used:": "Kullanılan alan:",
+    "Indexed messages:": "İndekslenmiş mesajlar:",
+    "Number of rooms:": "Oda sayısı:"
 }

From 11cb3a60b2615b2027436f68a47ef8751198cf2e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 3 Feb 2020 13:33:44 +0000
Subject: [PATCH 0934/3235] Fix listener leak in TagPanel

---
 src/components/structures/TagPanel.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index cefb60653f..622e63d8ce 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017, 2018 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -64,8 +65,8 @@ const TagPanel = createReactClass({
         this.unmounted = true;
         this.context.removeListener("Group.myMembership", this._onGroupMyMembership);
         this.context.removeListener("sync", this._onClientSync);
-        if (this._filterStoreToken) {
-            this._filterStoreToken.remove();
+        if (this._tagOrderStoreToken) {
+            this._tagOrderStoreToken.remove();
         }
     },
 

From aa6eabcf5721d311b046e255da3d2e8625ed057f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 3 Feb 2020 15:49:18 +0000
Subject: [PATCH 0935/3235] Don't crash immediately if the room directory chunk
 is null/empty

Fixes https://github.com/vector-im/riot-web/issues/12197
---
 src/components/structures/RoomDirectory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 42dbc1b4e4..dd089a9776 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -155,7 +155,7 @@ export default createReactClass({
 
             this.nextBatch = data.next_batch;
             this.setState((s) => {
-                s.publicRooms.push(...data.chunk);
+                s.publicRooms.push(...(data.chunk || []));
                 s.loading = false;
                 return s;
             });

From 41f4b38fe8a3f9a8bd2b5e12b591ec218e5ecbb4 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 3 Feb 2020 16:51:36 +0000
Subject: [PATCH 0936/3235] Do not show alarming red shields on large encrypted
 rooms for your own device

Fixes: https://github.com/vector-im/riot-web/issues/12214
---
 src/components/structures/RoomView.js  | 4 +++-
 src/components/views/rooms/RoomTile.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 24eaa7a410..acc87d9616 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -811,7 +811,9 @@ export default createReactClass({
         debuglog("e2e verified", verified, "unverified", unverified);
 
         /* Check all verified user devices. */
-        for (const userId of [...verified, cli.getUserId()]) {
+        /* Don't alarm if no other users are verified  */
+        const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
+        for (const userId of targets) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const anyDeviceNotVerified = devices.some(({deviceId}) => {
                 return !cli.checkDeviceTrust(userId, deviceId).isVerified();
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 41d43476ea..393ed0976f 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -166,7 +166,9 @@ export default createReactClass({
             });
 
         /* Check all verified user devices. */
-        for (const userId of [...verified, cli.getUserId()]) {
+        /* Don't alarm if no other users are verified  */
+        const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
+        for (const userId of targets) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {
                 return cli.checkDeviceTrust(userId, deviceId).isVerified();

From 1df6837649e31dcde0f72458e4568f2331ea126e Mon Sep 17 00:00:00 2001
From: BobVul <bob+git@vulpin.com>
Date: Tue, 4 Feb 2020 10:38:43 +1100
Subject: [PATCH 0937/3235] Missing semicolon

---
 test/editor/serialize-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index f846e0d79e..9d116cdc4b 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -48,5 +48,5 @@ describe('editor/serialize', function() {
         const model = new EditorModel([pc.plain('\\*hello\\* world')]);
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe('*hello* world');
-    })
+    });
 });

From b099c983d6397f4eed948db2e3364982684e1944 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 Feb 2020 10:16:39 +0000
Subject: [PATCH 0938/3235] Use minimist instead of optimist as it is
 deprecated

---
 scripts/reskindex.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 3919295078..81ab111f46 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -2,7 +2,7 @@
 var fs = require('fs');
 var path = require('path');
 var glob = require('glob');
-var args = require('optimist').argv;
+var args = require('minimist')(process.argv);
 var chokidar = require('chokidar');
 
 var componentIndex = path.join('src', 'component-index.js');

From a8f7e381ebcfcaa20cdf4b5a074251554bc40287 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 Feb 2020 10:41:48 +0000
Subject: [PATCH 0939/3235] SettingsStore, use a counter instead of wall clock
 for watcher ids

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

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index b1d61197a0..7c562f3514 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -113,6 +113,9 @@ export default class SettingsStore {
     static _watchers = {}; // { callbackRef => { callbackFn } }
     static _monitors = {}; // { settingName => { roomId => callbackRef } }
 
+    // Counter used for generation of watcher IDs
+    static _watcherCount = 1;
+
     /**
      * Watches for changes in a particular setting. This is done without any local echo
      * wrapping and fires whenever a change is detected in a setting's value, at any level.
@@ -138,7 +141,7 @@ export default class SettingsStore {
             settingName = setting.invertedSettingName;
         }
 
-        const watcherId = `${new Date().getTime()}_${settingName}_${roomId}`;
+        const watcherId = `${SettingsStore._watcherCount++}_${settingName}_${roomId}`;
 
         const localizedCallback = (changedInRoomId, atLevel, newValAtLevel) => {
             const newValue = SettingsStore.getValue(originalSettingName);

From e65404b631e94ace690871381c6915cffc0a40f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 Feb 2020 11:13:18 +0000
Subject: [PATCH 0940/3235] Explicitly (not transitively) depend on minimist as
 bin script uses it

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

diff --git a/package.json b/package.json
index 78bbb5b4c6..2c4d0144d4 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",

From f6c7df8c6946737fd3a9d588e539aae2b9b470ec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 Feb 2020 11:14:49 +0000
Subject: [PATCH 0941/3235] Keep date in Watcher IDs

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

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 7c562f3514..d9acc426bf 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -141,7 +141,7 @@ export default class SettingsStore {
             settingName = setting.invertedSettingName;
         }
 
-        const watcherId = `${SettingsStore._watcherCount++}_${settingName}_${roomId}`;
+        const watcherId = `${new Date().getTime()}_${SettingsStore._watcherCount++}_${settingName}_${roomId}`;
 
         const localizedCallback = (changedInRoomId, atLevel, newValAtLevel) => {
             const newValue = SettingsStore.getValue(originalSettingName);

From 150fe7a45aba14978ab7e8ce0893a39017f8e68b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:25:19 +0000
Subject: [PATCH 0942/3235] Tests for MKeyVerificationConclusion

---
 .../messages/MKeyVerificationConclusion.js    |  13 ++-
 .../MKeyVerificationConclusion-test.js        | 110 ++++++++++++++++++
 2 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 test/components/views/messages/MKeyVerificationConclusion-test.js

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 1aaa79be63..76370ba148 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -32,6 +32,7 @@ export default class MKeyVerificationConclusion extends React.Component {
         if (request) {
             request.on("change", this._onRequestChanged);
         }
+        MatrixClientPeg.get().on("userTrustStatusChanged", this._onTrustChanged);
     }
 
     componentWillUnmount() {
@@ -39,12 +40,22 @@ export default class MKeyVerificationConclusion extends React.Component {
         if (request) {
             request.off("change", this._onRequestChanged);
         }
+        MatrixClientPeg.removeListener("userTrustStatusChanged", this._onTrustChanged);
     }
 
     _onRequestChanged = () => {
         this.forceUpdate();
     };
 
+    _onTrustChanged = (userId, status) => {
+        const { mxEvent } = this.props;
+        const request = mxEvent.verificationRequest;
+        if (!request || request.otherUserId !== userId) {
+            return;
+        }
+        this.forceUpdate();
+    };
+
     _shouldRender(mxEvent, request) {
         // normally should not happen
         if (!request) {
@@ -66,7 +77,7 @@ export default class MKeyVerificationConclusion extends React.Component {
 
         // User isn't actually verified
         if (!MatrixClientPeg.get()
-                            .checkUserTrust(mxEvent.verificationRequest.otherUserId)
+                            .checkUserTrust(request.otherUserId)
                             .isCrossSigningVerified()) {
             return false;
         }
diff --git a/test/components/views/messages/MKeyVerificationConclusion-test.js b/test/components/views/messages/MKeyVerificationConclusion-test.js
new file mode 100644
index 0000000000..c666a7aaa5
--- /dev/null
+++ b/test/components/views/messages/MKeyVerificationConclusion-test.js
@@ -0,0 +1,110 @@
+import React from 'react';
+import TestRenderer from 'react-test-renderer';
+import { EventEmitter } from 'events';
+import * as TestUtils from '../../../test-utils';
+
+import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
+import { MatrixEvent } from 'matrix-js-sdk';
+import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
+
+class UserTrustLevel {
+    constructor(cs) {
+        this.cs = cs;
+    }
+
+    isCrossSigningVerified() {
+        return this.cs;
+    }
+}
+
+describe("MKeyVerificationConclusion", () => {
+    beforeEach(() => {
+        TestUtils.stubClient();
+        const client = MatrixClientPeg.get();
+
+        const userTrust = new UserTrustLevel(true);
+        client.checkUserTrust = () => userTrust;
+
+        const emitter = new EventEmitter();
+        client.on = emitter.on.bind(emitter);
+        client.removeListener = emitter.removeListener.bind(emitter);
+        client.emit = emitter.emit.bind(emitter);
+    });
+
+    it("shouldn't render if there's no verificationRequest", () => {
+        const event = new MatrixEvent({});
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the verificationRequest is pending", () => {
+        const event = new MatrixEvent({});
+        event.verificationRequest = new EventEmitter();
+        event.verificationRequest.pending = true;
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the event type is cancel but the request type isn't", () => {
+        const event = new MatrixEvent({ type: "m.key.verification.cancel" });
+        event.verificationRequest = new EventEmitter();
+        event.verificationRequest.cancelled = false;
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the event type is done but the request type isn't", () => {
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = new EventEmitter();
+        event.verificationRequest.done = false;
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("shouldn't render if the user isn't actually trusted", () => {
+        const client = MatrixClientPeg.get();
+        const userTrust = new UserTrustLevel(false);
+        client.checkUserTrust = () => userTrust;
+
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = new EventEmitter();
+        event.verificationRequest.done = true;
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+    });
+
+    it("should rerender appropriately if user trust status changes", () => {
+        const client = MatrixClientPeg.get();
+        const userTrust = new UserTrustLevel(false);
+        client.checkUserTrust = () => userTrust;
+
+        const event = new MatrixEvent({ type: "m.key.verification.done" });
+        event.verificationRequest = new EventEmitter();
+        event.verificationRequest.done = true;
+        event.verificationRequest.otherUserId = "@someuser:domain";
+        const renderer = TestRenderer.create(
+            <MKeyVerificationConclusion mxEvent={event} />,
+        );
+        expect(renderer.toJSON()).toBeNull();
+
+        client.checkUserTrust = () => new UserTrustLevel(true);
+
+        /* Ensure we don't rerender for every trust status change of any user */
+        client.emit("userTrustStatusChanged", "@anotheruser:domain");
+        expect(renderer.toJSON()).toBeNull();
+
+        /* But when our user changes, we do rerender */
+        client.emit("userTrustStatusChanged", event.verificationRequest.otherUserId);
+        expect(renderer.toJSON()).not.toBeNull();
+    });
+});

From 544479a6ee97e596734355d192ec2106abd60c8a Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:31:16 +0000
Subject: [PATCH 0943/3235] test code cleaned up slightly

---
 .../MKeyVerificationConclusion-test.js        | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/test/components/views/messages/MKeyVerificationConclusion-test.js b/test/components/views/messages/MKeyVerificationConclusion-test.js
index c666a7aaa5..689151fe3f 100644
--- a/test/components/views/messages/MKeyVerificationConclusion-test.js
+++ b/test/components/views/messages/MKeyVerificationConclusion-test.js
@@ -7,23 +7,14 @@ import { MatrixClientPeg } from '../../../../src/MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
 import MKeyVerificationConclusion from '../../../../src/components/views/messages/MKeyVerificationConclusion';
 
-class UserTrustLevel {
-    constructor(cs) {
-        this.cs = cs;
-    }
-
-    isCrossSigningVerified() {
-        return this.cs;
-    }
-}
+const trustworthy = () => ({ isCrossSigningVerified: () => true });
+const untrustworthy = () => ({ isCrossSigningVerified: () => false });
 
 describe("MKeyVerificationConclusion", () => {
     beforeEach(() => {
         TestUtils.stubClient();
         const client = MatrixClientPeg.get();
-
-        const userTrust = new UserTrustLevel(true);
-        client.checkUserTrust = () => userTrust;
+        client.checkUserTrust = trustworthy;
 
         const emitter = new EventEmitter();
         client.on = emitter.on.bind(emitter);
@@ -71,8 +62,7 @@ describe("MKeyVerificationConclusion", () => {
 
     it("shouldn't render if the user isn't actually trusted", () => {
         const client = MatrixClientPeg.get();
-        const userTrust = new UserTrustLevel(false);
-        client.checkUserTrust = () => userTrust;
+        client.checkUserTrust = untrustworthy;
 
         const event = new MatrixEvent({ type: "m.key.verification.done" });
         event.verificationRequest = new EventEmitter();
@@ -85,8 +75,7 @@ describe("MKeyVerificationConclusion", () => {
 
     it("should rerender appropriately if user trust status changes", () => {
         const client = MatrixClientPeg.get();
-        const userTrust = new UserTrustLevel(false);
-        client.checkUserTrust = () => userTrust;
+        client.checkUserTrust = untrustworthy;
 
         const event = new MatrixEvent({ type: "m.key.verification.done" });
         event.verificationRequest = new EventEmitter();
@@ -97,7 +86,7 @@ describe("MKeyVerificationConclusion", () => {
         );
         expect(renderer.toJSON()).toBeNull();
 
-        client.checkUserTrust = () => new UserTrustLevel(true);
+        client.checkUserTrust = trustworthy;
 
         /* Ensure we don't rerender for every trust status change of any user */
         client.emit("userTrustStatusChanged", "@anotheruser:domain");

From f023bcfd63e4f00a493397729950d3014f121b7b Mon Sep 17 00:00:00 2001
From: rtestard <rtestard@opensense.fr>
Date: Tue, 4 Feb 2020 15:05:26 +0100
Subject: [PATCH 0944/3235] I have modified padlocks styling when the left
 panel is collapsed

---
 res/css/views/rooms/_InviteOnlyIcon.scss     | 44 ++++++++++++++------
 src/components/views/rooms/InviteOnlyIcon.js |  4 +-
 src/components/views/rooms/RoomTile.js       |  2 +-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index 6943d1797b..21ab431973 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -14,27 +14,45 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_InviteOnlyIcon {
+@define-mixin mx_InviteOnlyIcon {
     width: 12px;
     height: 12px;
     position: relative;
     display: block !important;
-    // Align the padlock with unencrypted room names
+}
+
+@define-mixin mx_InviteOnlyIcon_padlock {
+    background-color: $roomtile-name-color;
+    mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
+    mask-position: center;
+    mask-repeat: no-repeat;
+    mask-size: contain;
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+
+.mx_InviteOnlyIcon_large {
+    @mixin mx_InviteOnlyIcon;
     margin: 0 4px;
 
     &::before {
-        background-color: $roomtile-name-color;
-        mask-image: url('$(res)/img/feather-customised/lock-solid.svg');
-        mask-position: center;
-        mask-repeat: no-repeat;
-        mask-size: contain;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
+        @mixin mx_InviteOnlyIcon_padlock;
         width: 12px;
         height: 12px;
     }
 }
+
+.mx_InviteOnlyIcon_small {
+    @mixin mx_InviteOnlyIcon;
+    left: -2px;
+
+    &::before {
+        @mixin mx_InviteOnlyIcon_padlock;
+        width: 10px;
+        height: 10px;
+    }
+}
\ No newline at end of file
diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
index 07156b2973..7ca63c8898 100644
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -37,6 +37,8 @@ export default class InviteOnlyIcon extends React.Component {
     };
 
     render() {
+        const style = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
+
         if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
             return null;
         }
@@ -46,7 +48,7 @@ export default class InviteOnlyIcon extends React.Component {
         if (this.state.hover) {
             tooltip = <Tooltip className="mx_InviteOnlyIcon_tooltip" label={_t("Invite only")} dir="auto" />;
         }
-        return (<div className="mx_InviteOnlyIcon"
+        return (<div className={style}
           onMouseEnter={this.onHoverStart}
           onMouseLeave={this.onHoverEnd}
         >
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 41d43476ea..bc781788c0 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -526,7 +526,7 @@ export default createReactClass({
         let privateIcon = null;
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             if (this.state.joinRule == "invite" && !dmUserId) {
-                privateIcon = <InviteOnlyIcon />;
+                privateIcon = <InviteOnlyIcon collapsedPanel={this.props.collapsed} />;
             }
         }
 

From 153703426a96568874f7fc169459c6cfc3b098a3 Mon Sep 17 00:00:00 2001
From: rtestard <rtestard@opensense.fr>
Date: Tue, 4 Feb 2020 16:02:49 +0100
Subject: [PATCH 0945/3235] I have removed the newline at the end of file to
 pass tests

---
 res/css/views/rooms/_InviteOnlyIcon.scss | 58 ++++++++++++------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index 21ab431973..0bc3f30c48 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -15,44 +15,44 @@ limitations under the License.
 */
 
 @define-mixin mx_InviteOnlyIcon {
-    width: 12px;
-    height: 12px;
-    position: relative;
-    display: block !important;
+  width: 12px;
+  height: 12px;
+  position: relative;
+  display: block !important;
 }
 
 @define-mixin mx_InviteOnlyIcon_padlock {
-    background-color: $roomtile-name-color;
-    mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
-    mask-position: center;
-    mask-repeat: no-repeat;
-    mask-size: contain;
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
+  background-color: $roomtile-name-color;
+  mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
+  mask-position: center;
+  mask-repeat: no-repeat;
+  mask-size: contain;
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
 }
 
 .mx_InviteOnlyIcon_large {
-    @mixin mx_InviteOnlyIcon;
-    margin: 0 4px;
+  @mixin mx_InviteOnlyIcon;
+  margin: 0 4px;
 
-    &::before {
-        @mixin mx_InviteOnlyIcon_padlock;
-        width: 12px;
-        height: 12px;
-    }
+  &::before {
+    @mixin mx_InviteOnlyIcon_padlock;
+    width: 12px;
+    height: 12px;
+  }
 }
 
 .mx_InviteOnlyIcon_small {
-    @mixin mx_InviteOnlyIcon;
-    left: -2px;
+  @mixin mx_InviteOnlyIcon;
+  left: -2px;
 
-    &::before {
-        @mixin mx_InviteOnlyIcon_padlock;
-        width: 10px;
-        height: 10px;
-    }
+  &::before {
+    @mixin mx_InviteOnlyIcon_padlock;
+    width: 10px;
+    height: 10px;
+  }
 }
\ No newline at end of file

From e23a3e98be1693a060623d219f3330972b605fd8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 Feb 2020 15:27:38 +0000
Subject: [PATCH 0946/3235] Only enumerate settings handlers which are
 supported currently

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

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index b1d61197a0..a65137631d 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -564,7 +564,7 @@ export default class SettingsStore {
         const handlers = {};
         for (const level of SETTINGS[settingName].supportedLevels) {
             if (!LEVEL_HANDLERS[level]) throw new Error("Unexpected level " + level);
-            handlers[level] = LEVEL_HANDLERS[level];
+            if (SettingsStore.isLevelSupported(level)) handlers[level] = LEVEL_HANDLERS[level];
         }
 
         // Always support 'default'

From b92fe594369c3dffad51d2a20af188d222897f95 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 4 Feb 2020 00:01:58 +0000
Subject: [PATCH 0947/3235] Improve event indexing status strings for
 translation

The strings used for the count of rooms was hard to translate, so this adds a
bit more context.
---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index b98fecf22f..5ae90b694e 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -144,8 +144,10 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Number of rooms:")} {formatCountLong(this.state.crawlingRoomsCount)} {_t("of ")}
-                    {formatCountLong(this.state.roomCount)}<br />
+                    {_t("Indexed rooms:")} {_t("%(crawlingRooms)s out of %(totalRooms)s", {
+                        crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                        totalRooms: formatCountLong(this.state.roomCount),
+                    })} <br />
                     {crawlerState}<br />
                     <Field
                         id={"crawlerSleepTimeMs"}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d125d10cfb..f9e02c9a79 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2094,8 +2094,8 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
-    "Number of rooms:": "Number of rooms:",
-    "of ": "of ",
+    "Indexed rooms:": "Indexed rooms:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",

From 110c5f0e6194d8c9b67c1e1d58e8565f6aeee746 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 4 Feb 2020 23:13:55 +0000
Subject: [PATCH 0948/3235] Fix listener removal in verification tile

Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2202
---
 src/components/views/messages/MKeyVerificationConclusion.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 76370ba148..ececfc60ed 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -40,7 +40,10 @@ export default class MKeyVerificationConclusion extends React.Component {
         if (request) {
             request.off("change", this._onRequestChanged);
         }
-        MatrixClientPeg.removeListener("userTrustStatusChanged", this._onTrustChanged);
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("userTrustStatusChanged", this._onTrustChanged);
+        }
     }
 
     _onRequestChanged = () => {

From a0c2a39dc7d2f4984855306c5711fb65d22fc72b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 3 Feb 2020 17:59:13 +0100
Subject: [PATCH 0949/3235] make a static dialog close again if background is
 clicked

---
 src/Modal.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index b6215b2b5a..54e56edd72 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -217,9 +217,13 @@ class ModalManager {
     }
 
     closeAll() {
-        const modalsToClose = [...this._modals, this._priorityModal];
+        const modalsToClose = this._modals.slice();
         this._modals = [];
-        this._priorityModal = null;
+
+        if (this._priorityModal) {
+            modalsToClose.push(this._priorityModal);
+            this._priorityModal = null;
+        }
 
         if (this._staticModal && modalsToClose.length === 0) {
             modalsToClose.push(this._staticModal);

From b522d785330550404fc6e12f4f9292eacc68f0e4 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 5 Feb 2020 12:43:39 +0000
Subject: [PATCH 0950/3235] Let pointer events fall through to scroll button

This makes it easier to click the entire visible area of the scroll button,
including the green circle at the top.
---
 res/css/views/rooms/_TopUnreadMessagesBar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 505af9691d..a3916f321a 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -32,9 +32,9 @@ limitations under the License.
     width: 4px;
     height: 4px;
     border-radius: 16px;
-    overflow: hidden;
     background-color: $secondary-accent-color;
     border: 6px solid $accent-color;
+    pointer-events: none;
 }
 
 .mx_TopUnreadMessagesBar_scrollUp {

From 7e07a42dc14594e640598ae4613e87e61b9e3155 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 13:07:13 +0100
Subject: [PATCH 0951/3235] resolve finished promise when closing dialog by
 clicking background

... by calling the same close method as otherwise and not
have a special path that just calls the onFinished callback.
This will also not close all the dialogs anymore,
but that sort of seems like the intented behaviour?
---
 src/Modal.js | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index 54e56edd72..33c3140ff1 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -47,7 +47,7 @@ class ModalManager {
                } */
         ];
 
-        this.closeAll = this.closeAll.bind(this);
+        this.onBackgroundClick = this.onBackgroundClick.bind(this);
     }
 
     hasDialogs() {
@@ -124,6 +124,7 @@ class ModalManager {
         );
         modal.onFinished = props ? props.onFinished : null;
         modal.className = className;
+        modal.close = closeDialog;
 
         return {modal, closeDialog, onFinishedProm};
     }
@@ -216,28 +217,16 @@ class ModalManager {
         };
     }
 
-    closeAll() {
-        const modalsToClose = this._modals.slice();
-        this._modals = [];
-
-        if (this._priorityModal) {
-            modalsToClose.push(this._priorityModal);
-            this._priorityModal = null;
+    onBackgroundClick() {
+        const modal = this._getCurrentModal();
+        if (!modal) {
+            return;
         }
+        modal.close();
+    }
 
-        if (this._staticModal && modalsToClose.length === 0) {
-            modalsToClose.push(this._staticModal);
-            this._staticModal = null;
-        }
-
-        for (let i = 0; i < modalsToClose.length; i++) {
-            const m = modalsToClose[i];
-            if (m && m.onFinished) {
-                m.onFinished(false);
-            }
-        }
-
-        this._reRender();
+    _getCurrentModal() {
+        return this._priorityModal ? this._priorityModal : (this._modals[0] || this._staticModal);
     }
 
     _reRender() {
@@ -268,7 +257,7 @@ class ModalManager {
                     <div className="mx_Dialog">
                         { this._staticModal.elem }
                     </div>
-                    <div className="mx_Dialog_background mx_Dialog_staticBackground" onClick={this.closeAll}></div>
+                    <div className="mx_Dialog_background mx_Dialog_staticBackground" onClick={this.onBackgroundClick}></div>
                 </div>
             );
 
@@ -278,8 +267,8 @@ class ModalManager {
             ReactDOM.unmountComponentAtNode(this.getOrCreateStaticContainer());
         }
 
-        const modal = this._priorityModal ? this._priorityModal : this._modals[0];
-        if (modal) {
+        const modal = this._getCurrentModal();
+        if (modal !== this._staticModal) {
             const classes = "mx_Dialog_wrapper "
                 + (this._staticModal ? "mx_Dialog_wrapperWithStaticUnder " : '')
                 + (modal.className ? modal.className : '');
@@ -289,7 +278,7 @@ class ModalManager {
                     <div className="mx_Dialog">
                         {modal.elem}
                     </div>
-                    <div className="mx_Dialog_background" onClick={this.closeAll}></div>
+                    <div className="mx_Dialog_background" onClick={this.onBackgroundClick}></div>
                 </div>
             );
 

From c44ebef06f3298e5abc34cb453a27ddf7ae26287 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 13:10:06 +0100
Subject: [PATCH 0952/3235] add onBeforeClose option to Modal

so we can throw up another "are you sure" dialog
in the cases we want to do so. This also
passes a reason so we can only do so for ways of
dismissing (like backgroundClick)
that are easy to do by accident.
---
 src/Modal.js | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index 33c3140ff1..2e5624aa67 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -106,7 +106,7 @@ class ModalManager {
         return this.appendDialogAsync(...rest);
     }
 
-    _buildModal(prom, props, className) {
+    _buildModal(prom, props, className, options) {
         const modal = {};
 
         // never call this from onFinished() otherwise it will loop
@@ -124,14 +124,27 @@ class ModalManager {
         );
         modal.onFinished = props ? props.onFinished : null;
         modal.className = className;
+        modal.onBeforeClose = options.onBeforeClose;
+        modal.beforeClosePromise = null;
         modal.close = closeDialog;
+        modal.closeReason = null;
 
         return {modal, closeDialog, onFinishedProm};
     }
 
     _getCloseFn(modal, props) {
         const deferred = defer();
-        return [(...args) => {
+        return [async (...args) => {
+            if (modal.beforeClosePromise) {
+                await modal.beforeClosePromise;
+            } else if (modal.onBeforeClose) {
+                modal.beforeClosePromise = modal.onBeforeClose(modal.closeReason);
+                const shouldClose = await modal.beforeClosePromise;
+                modal.beforeClosePromise = null;
+                if (!shouldClose) {
+                    return;
+                }
+            }
             deferred.resolve(args);
             if (props && props.onFinished) props.onFinished.apply(null, args);
             const i = this._modals.indexOf(modal);
@@ -186,9 +199,9 @@ class ModalManager {
      *                                 static at a time.
      * @returns {object} Object with 'close' parameter being a function that will close the dialog
      */
-    createDialogAsync(prom, props, className, isPriorityModal, isStaticModal) {
-        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className);
-
+    createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {
+        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, options);
+        modal.close = closeDialog;
         if (isPriorityModal) {
             // XXX: This is destructive
             this._priorityModal = modal;
@@ -207,7 +220,7 @@ class ModalManager {
     }
 
     appendDialogAsync(prom, props, className) {
-        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className);
+        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, {});
 
         this._modals.push(modal);
         this._reRender();
@@ -222,7 +235,13 @@ class ModalManager {
         if (!modal) {
             return;
         }
+        // we want to pass a reason to the onBeforeClose
+        // callback, but close is currently defined to
+        // pass all number of arguments to the onFinished callback
+        // so, pass the reason to close through a member variable
+        modal.closeReason = "backgroundClick";
         modal.close();
+        modal.closeReason = null;
     }
 
     _getCurrentModal() {

From 70a4d3415eae1356fc3d3228a5a5d9e054264b4e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 13:11:24 +0100
Subject: [PATCH 0953/3235] confirm to close the passphrase dialog if it was
 done by backgroundClick

as it is easy to do by accident
---
 src/CrossSigningManager.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index a560c956f1..8feb651ea5 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -70,6 +70,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
         sdk.getComponent("dialogs.secretstorage.AccessSecretStorageDialog");
     const { finished } = Modal.createTrackedDialog("Access Secret Storage dialog", "",
         AccessSecretStorageDialog,
+        /* props= */
         {
             keyInfo: info,
             checkPrivateKey: async (input) => {
@@ -77,6 +78,22 @@ async function getSecretStorageKey({ keys: keyInfos }) {
                 return MatrixClientPeg.get().checkSecretStoragePrivateKey(key, info.pubkey);
             },
         },
+        /* className= */ null,
+        /* isPriorityModal= */ false,
+        /* isStaticModal= */ false,
+        /* options= */ {
+            onBeforeClose: async (reason) => {
+                if (reason !== "backgroundClick") {
+                    return true;
+                }
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                const [sure] = await Modal.createDialog(QuestionDialog, {
+                    title: _t("Cancel entering passphrase?"),
+                    description: _t("If you cancel now, you won't complete your SSSS operation!"),
+                }).finished;
+                return sure;
+            },
+        },
     );
     const [input] = await finished;
     if (!input) {

From 4cd4110a52d867c4e22bf1ef87f7b43a1f97edd4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 13:13:37 +0100
Subject: [PATCH 0954/3235] fixup: this is already done in _buildModal

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

diff --git a/src/Modal.js b/src/Modal.js
index 2e5624aa67..f55e497e6f 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -201,7 +201,6 @@ class ModalManager {
      */
     createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {
         const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, options);
-        modal.close = closeDialog;
         if (isPriorityModal) {
             // XXX: This is destructive
             this._priorityModal = modal;

From 5b04ad46e0ff77515b56dcaace8c9ccc34a88dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Thu, 6 Feb 2020 10:29:28 +0000
Subject: [PATCH 0955/3235] Translated using Weblate (Czech)

Currently translated at 94.7% (1990 of 2101 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 66af5b931e..3adc393e0a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1419,7 +1419,7 @@
     "View Servers in Room": "Zobrazit servery v místnosti",
     "Sign out and remove encryption keys?": "Odhlásit a odstranit šifrovací klíče?",
     "To help us prevent this in future, please <a>send us logs</a>.": "Abychom tomu mohli pro příště předejít, <a>pošlete nám prosím logy</a>.",
-    "Missing session data": "Chybějící data sezení",
+    "Missing session data": "Chybějící data relace",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Některá data sezení, například klíče od šifrovaných zpráv, nám chybí. Přihlašte se prosím znovu a obnovte si klíče ze zálohy.",
     "Your browser likely removed this data when running low on disk space.": "Prohlížeč data možná smazal aby ušetřil místo na disku.",
     "Upload files (%(current)s of %(total)s)": "Nahrát soubory (%(current)s z %(total)s)",
@@ -1825,7 +1825,7 @@
     "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Toto běžně ovlivňuje jak je místnost zpracovávána na serveru. Pokud máte problém s Riotem, <a>nahlaste nám prosím bug</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Upgradujeme tuto místnost z <oldVersion /> na <newVersion />.",
     "Upgrade": "Upgradovat",
-    "Enter secret storage passphrase": "Zadejte tajné heslo k úložišti",
+    "Enter secret storage passphrase": "Zadejte tajné heslo k bezpečnému úložišti",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Nepovedlo se přistoupit k bezpečnému úložišti. Zkontrolujte prosím, že je zadané správné heslo.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varování</b>: Přistupujte k bezpečnému úložišti pouze z důvěryhodných počítačů.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokud si nepamatujete heslo, můžete použít <button1>váš obnovovací klíč</button1> nebo <button2>si nastavte nové možnosti obnovení</button2>.",
@@ -1861,5 +1861,154 @@
     "%(count)s verified sessions|one": "1 ověřená relace",
     "Language Dropdown": "Menu jazyků",
     "Help": "Pomoc",
-    "Country Dropdown": "Menu států"
+    "Country Dropdown": "Menu států",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V místnosti jsou neověřené relace: pokud budete pokračovat bez ověření, bude možné váš hovor odposlouchávat.",
+    "Verify this session": "Ověřit tuto relaci",
+    "Encryption upgrade available": "Je dostupná aktualizace šifrování",
+    "Set up encryption": "Nastavit šifrování",
+    "Unverified session": "Neověřená relace",
+    "Verifies a user, session, and pubkey tuple": "Ověří uživatele, relaci a veřejné klíče",
+    "Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
+    "Session already verified!": "Relace je už ověřená!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Relace je už ověřená, ale klíče NEODPOVÍDAJÍ!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČŮ SELHALO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je \"%(fprint)s\", což neodpovídá klíči \"%(fingerprint)s\". Může to znamenat, že je vaše komunikace rušena!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisový klíč odpovídá klíči relace %(deviceId)s od uživatele %(userId)s. Relace byla označena za platnou.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s přidal/a této místnosti %(addedAddresses)s a dalších %(count)s adres",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s odstranil/a této místnosti %(removedAddresses)s a dalších %(count)s adres",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s odstranil/a této místnosti %(countRemoved)s adres a přidal/a %(countAdded)s adres",
+    "a few seconds ago": "před pár vteřinami",
+    "about a minute ago": "před minutou",
+    "%(num)s minutes ago": "před %(num)s minutami",
+    "about an hour ago": "asi před hodinou",
+    "%(num)s hours ago": "před %(num)s hodinami",
+    "about a day ago": "před jedním dnem",
+    "%(num)s days ago": "před %(num)s dny",
+    "a few seconds from now": "za pár vteřin",
+    "about a minute from now": "asi za minutu",
+    "%(num)s minutes from now": "za %(num)s minut",
+    "about an hour from now": "asi za hodinu",
+    "%(num)s hours from now": "za %(num)s hodin",
+    "about a day from now": "asi za den",
+    "%(num)s days from now": "za %(num)s dní",
+    "Show a presence dot next to DMs in the room list": "V seznamu místností zobrazovat informaci o přítomnosti",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Povolit cross-signing pro verifikaci uživatelů místo zařízení (experimentální)",
+    "Show info about bridges in room settings": "Zobrazovat v nastavení místnosti informace o propojeních",
+    "Show padlocks on invite only rooms": "Zobrazovat zámek u místností vyžadujících pozvání",
+    "Never send encrypted messages to unverified sessions from this session": "Nikdy neposílat šifrované zprávy neověřených zařízením",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nikdy v této místnosti neposílat šifrované zprávy neověřeným relacím",
+    "Enable message search in encrypted rooms": "Povolit vyhledávání v zašifrovaných místnostech",
+    "Keep secret storage passphrase in memory for this session": "Pro toto přihlášení si uchovat heslo k bezpečnému úložišti",
+    "How fast should messages be downloaded.": "Jak rychle se mají zprávy stahovat.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Ověřte, že následující emotikony jsou zobrazeny na obou zařízeních ve stejném pořadí:",
+    "Verify this device by confirming the following number appears on its screen.": "Ověřit zařízení potvrzením, že jsou následující čísla zobrazena na jeho obrazovce.",
+    "Waiting for %(displayName)s to verify…": "Čekám až nás %(displayName)s ověří…",
+    "They match": "Odpovídají",
+    "They don't match": "Neodpovídají",
+    "To be secure, do this in person or use a trusted way to communicate.": "Aby to bylo bezpečné, udělejte to osobně nebo použijte důvěryhodný komunikační prostředek.",
+    "Lock": "Zamknout",
+    "Verify yourself & others to keep your chats safe": "Ověřte sebe a ostatní, aby byla vaše komunikace bezpečná",
+    "Other users may not trust it": "Ostatní uživatelé této relaci nemusí věřit",
+    "Later": "Později",
+    "Review": "Prohlédnout",
+    "This bridge was provisioned by <user />.": "Toto propojení poskytuje <user />.",
+    "This bridge is managed by <user />.": "Toto propojení spravuje <user />.",
+    "Workspace: %(networkName)s": "Workspace: %(networkName)s",
+    "Channel: %(channelName)s": "Kanál: %(channelName)s",
+    "Show less": "Skrýt detaily",
+    "Show more": "Zobrazit víc",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Změna hesla resetuje šifrovací klíče pro všechny vaše relace. Pokud si nejdřív nevyexportujete klíče místností a po změně je znovu neimportujete, nedostanete se k historickým zprávám. V budoucnu se toto zjednoduší.",
+    "Cross-signing and secret storage are enabled.": "Cross-signing a bezpečné úložiště jsou zapnuté.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má v bezpečném úložišti identitu pro cross-signing, ale v této relaci jí zatím nevěříte.",
+    "Cross-signing and secret storage are not yet set up.": "Zatím nemáte nastavený cross-signing a bezpečné úložiště.",
+    "Bootstrap cross-signing and secret storage": "Zapnout cross-signing a bezpečné úložiště",
+    "Cross-signing public keys:": "Veřejné klíče pro cross-signing:",
+    "in memory": "v paměti",
+    "Cross-signing private keys:": "Soukromé klíče pro cross-signing:",
+    "in secret storage": "v bezpečném úložišti",
+    "Secret storage public key:": "Veřejný klíč bezpečného úložiště:",
+    "in account data": "v datech účtu",
+    "Your homeserver does not support session management.": "Váš domovský server nepodporuje správu relací.",
+    "Unable to load session list": "Nepovedlo se načíst seznam relací",
+    "Delete %(count)s sessions|other": "Smazat %(count)s relací",
+    "Delete %(count)s sessions|one": "Smazat %(count)s relaci",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Bezpečně uchovávat šifrované zprávy na tomto zařízení, aby se v nich dalo vyhledávat pomocí ",
+    " to store messages from ": " na uchování zpráv z ",
+    "rooms.": "místností.",
+    "Manage": "Spravovat",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Bezpečně uchovávat zprávy na tomto zařízení aby se v nich dalo vyhledávat.",
+    "Enable": "Povolit",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot neumí bezpečně uchovávat zprávy když běží v prohlížeči. Pokud chcete vyhledávat v šifrovaných zprávách, použijte <riotLink>Riot Desktop</riotLink>.",
+    "This session is backing up your keys. ": "Tato relace zálohuje vaše klíče. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Tato relace <b>nezálohuje vaše klíče</b>, ale už máte zálohu ze které je můžete obnovit.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Než se odhlásíce, připojte tuto relaci k záloze klíčů abyste nepřišli o klíče, které můžou být jen v této relaci.",
+    "Connect this session to Key Backup": "Připojit k zálohování klíčů",
+    "not stored": "není uložen",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Záloha je podepsaná z <verify>neznámé</verify> relace s ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Záloha má <validity>platný</validity> podpis z této relace",
+    "Backup has an <validity>invalid</validity> signature from this session": "Záloha má <validity>neplatný</validity> podpis z této relace",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Záloha má <validity>platný</validity> podpis z <verify>ověřené</verify> relace <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>platný</validity> podpis z <verify>neověřené</verify> relace <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>ověřené</verify> relace <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>neověřené</verify> relace <device></device>",
+    "Backup is not signed by any of your sessions": "Záloha nemá podpis z žádné vaší relace",
+    "This backup is trusted because it has been restored on this session": "Záloze věříme, protože už byla v této relaci načtena",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Zálohovací klíč je uložen v bezpečném úložišti, ale jeho načtení není v této relaci povolené. Zapněte prosím cross-signing v Experimentálních funkcích abyste mohli modifikovat stav zálohy.",
+    "Backup key stored: ": "Zálohovací klíč je uložen: ",
+    "Your keys are <b>not being backed up from this session</b>.": "Vaše klíče <b>nejsou z této relace zálohovány</b>.",
+    "Enable desktop notifications for this session": "Povolit v této relaci notifikace",
+    "Enable audible notifications for this session": "Povolit v této relaci hlasové notifikace",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Heslo bylo změněno. Dokud se znovu nepřihlásíte na ostatních zařízeních, nebudete na nich dostávat notifikace",
+    "Session ID:": "ID relace:",
+    "Session key:": "Klíč relace:",
+    "Message search": "Vyhledávání ve zprávách",
+    "Cross-signing": "Cross-signing",
+    "Sessions": "Relace",
+    "A session's public name is visible to people you communicate with": "Lidé se kterými komunikujete si můžou jméno relace zobrazit",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tato místnost je propojena s následujícími platformami. <a>Více informací</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Tato místnost není propojená s žádnými dalšími platformami. <a>Více informací.</a>",
+    "Bridges": "Propojení",
+    "This user has not verified all of their sessions.": "Tento uživatel zatím neověřil všechny své relace.",
+    "You have not verified this user.": "Tohoto uživatele jste neověřil.",
+    "You have verified this user. This user has verified all of their sessions.": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
+    "Someone is using an unknown session": "Někdo používá neznámou relaci",
+    "This room is end-to-end encrypted": "Místnost je E2E šifrovaná",
+    "Everyone in this room is verified": "V této místnosti jsou všichni ověřeni",
+    "Some sessions for this user are not trusted": "Některé relace tohoto uživatele jsou nedůvěryhodné",
+    "All sessions for this user are trusted": "Všem relacím tohoto uživatele věříme",
+    "Some sessions in this encrypted room are not trusted": "Některé relace v této místnosti jsou nedůvěryhodné",
+    "All sessions in this encrypted room are trusted": "Všem relacím v této místosti věříme",
+    "Mod": "Moderátor",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek k nasdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Požadavek se sdílení klíčů se vaše ostatní relace odesílá automaticky. Pokud jste ho zamítli nebo ignorovali, tímto tlačítkem si jej můžete poslat znovu.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Pokud vaše ostatní relace nemají klíč pro tuto zprávu, nebudete mít možnost jí dešifrovat.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Znovu zažádat o šifrovací klíče</requestLink> z vašich ostatních relací.",
+    "Encrypted by an unverified session": "Zašifrované v neověřené relaci",
+    "Encrypted by a deleted session": "Zašifrované smazanou relací",
+    "Invite only": "Pouze na pozvání",
+    "No sessions with registered encryption keys": "Žádné relace se šifrovacími klíči",
+    "Send a reply…": "Odpovědět…",
+    "Send a message…": "Napsat zprávu…",
+    "Direct Messages": "Přímé zprávy",
+    "Reject & Ignore user": "Odmítnout & ignorovat uživatele",
+    "Unknown Command": "Neznámý příkaz",
+    "Unrecognised command: %(commandText)s": "Nerozpoznaný příkaz: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Můžete použít <code>/help</code> na vypsání všech příkazů. Nebo jste text chtěli odeslat jako zprávu?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tip: Zprávu můžete začít <code>//</code>, pokud chcete aby začínala lomítkem.",
+    "Send as message": "Odeslat jako zprávu",
+    "Waiting for %(displayName)s to accept…": "Čekáme, než %(displayName)s přijme…",
+    "Start Verification": "Začít s verifikací",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vaše zprávy jsou zabezpečené - pouze Vy a příjemce mají klíče k jejich přečtení.",
+    "Verify User": "Ověřit uživatele",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Pro lepší bezpečnost, ověřte uživatele zkontrolováním jednorázového kódu na vašich zařízeních.",
+    "Your messages are not secure": "Vaše zprávy nejsou zabezpečené",
+    "One of the following may be compromised:": "Něco z následujích věcí může být kompromitováno:",
+    "Your homeserver": "Váš domovský server",
+    "The homeserver the user you’re verifying is connected to": "Domovský server ověřovaného uživatele",
+    "Yours, or the other users’ internet connection": "Vaše připojení k internetu a nebo připojení ověřovaného uživatele",
+    "Yours, or the other users’ session": "Vaše relace a nebo relace ověřovaného uživatele",
+    "%(count)s sessions|other": "%(count)s relací",
+    "%(count)s sessions|one": "%(count)s relace",
+    "Hide sessions": "Skrýt relace",
+    "Verify by emoji": "Ověřit emotikonami",
+    "Verify by comparing unique emoji.": "Oveření porovnáním několika emotikon."
 }

From 05fc6c11b0fd02d3f3d2568c17c5340a5c33f53e Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Mon, 3 Feb 2020 11:23:24 +0000
Subject: [PATCH 0956/3235] Translated using Weblate (Dutch)

Currently translated at 83.6% (1756 of 2101 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index cfd829d718..6574a09bc2 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -388,7 +388,7 @@
     "To continue, please enter your password.": "Voer uw wachtwoord in om verder te gaan.",
     "Blacklist": "Blokkeren",
     "Unblacklist": "Deblokkeren",
-    "I verify that the keys match": "Ik verifieer dat de sleutels overeenkomen",
+    "I verify that the keys match": "Ik verklaar dat de sleutels overeenkomen",
     "Unable to restore session": "Sessieherstel lukt niet",
     "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.": "Als u reeds een recentere versie van Riot heeft gebruikt is uw sessie mogelijk onverenigbaar met deze versie. Sluit dit venster en ga terug naar die recentere versie.",
     "Unknown Address": "Onbekend adres",
@@ -1679,5 +1679,94 @@
     "Verify this session": "Deze sessie verifiëren",
     "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Type <code>/help</code> om alle opdrachten te zien.  Was het uw bedoeling dit als bericht te sturen?",
-    "Help": "Hulp"
+    "Help": "Hulp",
+    "Set up encryption": "Versleuteling instellen",
+    "Unverified session": "Ongeverifieerde sessie",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Dit vergt toegang tot de verstek-identiteitsserver <server /> om emailadres of telefoonummer te valideren, maar die server heeft kent geen gebruiksvoorwaarden.",
+    "Trust": "Vertrouw",
+    "Custom (%(level)s)": "Aangepast (%(level)s)",
+    "Error upgrading room": "Bijwerken gesprek mislukt",
+    "Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen gespreksversie ondersteunt, en probeer dan opnieuw.",
+    "Verifies a user, session, and pubkey tuple": "Verifieert een combinatie van gebruiker+sessie+publieke sleutel",
+    "Unknown (user, session) pair:": "Onbekende combinatie gebruiker+sessie:",
+    "Session already verified!": "Sessie al geverifieerd!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: De sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "PAS OP: Sleutelverificatie MISLUKT! De combinatie %userId)s + sessie %(deviceId)s is ondertekend met \"%(fprint)s\" - maar de opgegeven sleutel is \"%(fingerprint)s\".  Wellicht worden uw berichten onderschept!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen.  De sessie is daarmee geverifieerd.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName) heeft %(addedAddresses)s en %(count)d andere adressen aan dit gesprek toegevoegd",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s heeft dit gesprek ontdaan van %(removedAddresses)s en %(count)s andere adressen",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s heeft dit gesprek ontdaan van %(countRemoved)s adressen, en er %(countAdded)s toegevoegd",
+    "%(senderName)s placed a voice call.": "%(senderName)s probeert u te bellen.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s poogt u te bellen, maar uw browser ondersteunt dat niet",
+    "%(senderName)s placed a video call.": "%(senderName)s doet een video-oproep.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s doet een video-oproep, maar uw browser ondersteunt dat niet",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s heeft de banregel voor gebruikers die met %(glob)s stroken verwijderd",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s heeft de banregel voor gesprekken die met %(glob)s stroken verwijderd",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s heeft de banregel voor servers die met %(glob)s stroken verwijderd",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s heeft een banregel die met %(glob)s strookt verwijderd",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s heeft een ongeldige banregel bijgewerkt",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die gebruikers die met %(glob)s sporen verbant vanwege %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die gesprekken die met %(glob)s sporen verbant vanwege %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft de regel bijgewerkt die servers die met %(glob)s sporen verbant vanwege %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft een banregel vanwege %(reason)s die met %(glob)s spoort bijgewerkt",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat gebruikers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat gesprekken die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat servers die met %(glob)s sporen verbannen worden vanwege %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s heeft geregeld dat alles wat met %(glob)s spoort verbannen wordt vanwege %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gebruikers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gesprekken wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor servers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
+    "The message you are trying to send is too large.": "Uw bericht is te lang om te verzenden.",
+    "a few seconds ago": "enige tellen geleden",
+    "about a minute ago": "een minuut of zo geleden",
+    "%(num)s minutes ago": "%(num)s minuten geleden",
+    "about an hour ago": "een uur of zo geleden",
+    "%(num)s hours ago": "%(num)s uren geleden",
+    "about a day ago": "een dag of zo geleden",
+    "%(num)s days ago": "%(num)s dagen geleden",
+    "a few seconds from now": "over een paar tellen",
+    "about a minute from now": "over een minuut of zo",
+    "%(num)s minutes from now": "over %(num)s minuten",
+    "about an hour from now": "over een uur of zo",
+    "%(num)s hours from now": "over %(num)s uur",
+    "about a day from now": "over een dag of zo",
+    "%(num)s days from now": "over %(num)s dagen",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
+    "Show a presence dot next to DMs in the room list": "Toon aanwezigheid bij tweegesprekken in de gesprekkenlijst",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Gebruik gebruikersverificatie in plaats van sessieverificatie (nog in ontwikkeling)",
+    "Enable local event indexing and E2EE search (requires restart)": "Indexeer lokaal gebeurtenissen en maak zo E2EE-zoeken mogelijk (vergt een herstart)",
+    "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
+    "Show padlocks on invite only rooms": "Toon hangsloten op besloten gesprekken",
+    "Match system theme": "Pas aan aan systeemthema",
+    "Never send encrypted messages to unverified sessions from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek",
+    "Enable message search in encrypted rooms": "Sta zoeken in versleutelde gesprekken toe",
+    "Keep secret storage passphrase in memory for this session": "Onthoud in deze sessie het wachtwoord voor sleutelopslag",
+    "How fast should messages be downloaded.": "Ophaalfrequentie van berichten.",
+    "My Ban List": "Mijn banlijst",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers.  Verlaat dit gesprek niet!",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Bevestig dat beide apparaten dezelfde emojis in dezelfde volgorde tonen:",
+    "Verify this device by confirming the following number appears on its screen.": "Verifieer dit apparaat door te bevestigen dat het scherm het volgende getal toont.",
+    "Waiting for %(displayName)s to verify…": "Wachten tot %(displayName)s geverifieerd heeft…",
+    "They match": "Ze komen overeen",
+    "They don't match": "Ze komen niet overeen",
+    "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid in persona, of via een betrouwbaar communicatiemedium.",
+    "Lock": "Hangslot",
+    "Verify yourself & others to keep your chats safe": "Verifieer jezelf en anderen om je gesprekken veilig te houden",
+    "Other users may not trust it": "Mogelijk wantrouwen anderen het",
+    "Upgrade": "Bijwerken",
+    "Verify": "Verifiëren",
+    "Later": "Later",
+    "Review": "Contrôle",
+    "Decline (%(counter)s)": "Afwijzen (%(counter)s)",
+    "This bridge was provisioned by <user />.": "Dank aan <user /> voor de brug.",
+    "This bridge is managed by <user />.": "Brug onderhouden door <user />.",
+    "Workspace: %(networkName)s": "Werkruimte: %(networkName)s",
+    "Channel: %(channelName)s": "Kanaal: %(channelName)s",
+    "Show less": "Minder tonen",
+    "Show more": "Meer tonen",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest.  Dit zal verbeterd worden.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in.  Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van gebruikers die 'bot' heten op alle servers."
 }

From a6dd0d01e4fe11a24cc64b635e2c0e5393874252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 6 Feb 2020 07:55:40 +0000
Subject: [PATCH 0957/3235] Translated using Weblate (French)

Currently translated at 100.0% (2101 of 2101 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 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index bd491ad7f5..cc79b5c9fc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -387,7 +387,7 @@
     "Accept": "Accepter",
     "Active call (%(roomName)s)": "Appel en cours (%(roomName)s)",
     "Alias (optional)": "Alias (facultatif)",
-    "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.": "Impossible de se connecter au serveur d'accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d'accueil</a> est un certificat de confiance, et qu'aucune extension du navigateur ne bloque les requêtes.",
+    "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.": "Impossible de se connecter au serveur d’accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d’accueil</a> est un certificat de confiance, et qu’aucune extension du navigateur ne bloque les requêtes.",
     "Close": "Fermer",
     "Custom": "Personnaliser",
     "Decline": "Refuser",
@@ -493,7 +493,7 @@
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
     "Jump to read receipt": "Aller à l'accusé de lecture",
     "World readable": "Lisible publiquement",
-    "Guests can join": "Accessible aux invités",
+    "Guests can join": "Accessible aux visiteurs",
     "Invalid community ID": "Identifiant de communauté non valide",
     "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" n'est pas un identifiant de communauté valide",
     "%(senderName)s sent an image": "%(senderName)s a envoyé une image",
@@ -1149,7 +1149,7 @@
     "Begin Verifying": "Commencer la vérification",
     "Waiting for partner to accept...": "Nous attendons que le partenaire accepte…",
     "Use two-way text verification": "Utiliser la vérification textuelle bidirectionnelle",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour que ce soit un utilisateur de confiance. Faire confiance aux utilisateurs vous apporte une tranquillité d’esprit quand vous utilisez des messages chiffrés de bout en bout.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour le marquer comme fiable. Faire confiance aux utilisateurs vous permet d’être serein quand vous utilisez des messages chiffrés de bout en bout.",
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
@@ -1178,7 +1178,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Hébergement premium pour les organisations <a>En savoir plus</a>",
     "Other": "Autre",
     "Find other public servers or use a custom server": "Trouvez d'autres serveurs publics ou utilisez un serveur personnalisé",
-    "Guest": "Invité",
+    "Guest": "Visiteur",
     "Sign in instead": "Se connecter",
     "Set a new password": "Définir un nouveau mot de passe",
     "Create account": "Créer un compte",
@@ -1193,9 +1193,9 @@
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s a rendu le salon public à tous ceux qui en connaissent le lien.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s a rendu le salon disponible sur invitation seulement.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s a changé la règle d’adhésion en %(rule)s",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s a autorisé les invités à rejoindre le salon.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s a empêché les invités de rejoindre le salon.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a changé l'accès des invités en %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s a autorisé les visiteurs à rejoindre le salon.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s a empêché les visiteurs de rejoindre le salon.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a changé l'accès des visiteurs en %(rule)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grouper et filtrer les salons grâce à des étiquettes personnalisées (actualiser pour appliquer les changements)",
     "Verify this user by confirming the following emoji appear on their screen.": "Vérifier cet utilisateur en confirmant que les émojis suivant apparaissent sur son écran.",
     "Unable to find a supported verification method.": "Impossible de trouver une méthode de vérification prise en charge.",
@@ -1754,7 +1754,7 @@
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vous avez ignoré cet utilisateur, donc ses messages sont cachés. <a>Les montrer quand même.</a>",
     "Custom (%(level)s)": "Personnalisé (%(level)s)",
     "Trusted": "Fiable",
-    "Not trusted": "Non vérifié",
+    "Not trusted": "Non fiable",
     "Direct message": "Message direct",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> dans %(roomName)s",
     "Messages in this room are end-to-end encrypted.": "Les messages dans ce salon sont chiffrés de bout en bout.",
@@ -1850,7 +1850,7 @@
     "Enter secret storage recovery key": "Saisir la clé de récupération du coffre secret",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne clé de récupération.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Si vous avez oublié votre clé de récupération vous pouvez <button>définir de nouvelles options de récupération</button>.",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement configurer une sauvegarde de clés depuis un ordinateur de confiance.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attention</b> : Vous ne devriez configurer la sauvegarde de clés que depuis un ordinateur de confiance.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de récupération, vous pouvez <button>définir de nouvelles options de récupération</button>",
     "Set up with a recovery key": "Configurer avec une clé de récupération",
     "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès aux messages chiffrés si vous oubliez votre phrase de passe.",
@@ -1918,7 +1918,7 @@
     "Other users may not trust it": "D’autres utilisateurs pourraient ne pas lui faire confiance",
     "Later": "Plus tard",
     "Verify User": "Vérifier l’utilisateur",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une meilleure sécurité, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Pour une sécurité supplémentaire, vérifiez cet utilisateur en comparant un code à usage unique sur vos deux appareils.",
     "Start Verification": "Commencer la vérification",
     "Unknown Command": "Commande inconnue",
     "Unrecognised command: %(commandText)s": "Commande non reconnue : %(commandText)s",
@@ -2051,7 +2051,7 @@
     "You have not verified this user. This user has verified all of their sessions.": "Vous n’avez pas vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
     "You have verified this user. This user has verified all of their sessions.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
     "Someone is using an unknown session": "Quelqu'un utilise une session inconnue",
-    "Some sessions for this user are not trusted": "Certaines sessions de cet utilisateur ne sont par fiables",
+    "Some sessions for this user are not trusted": "Certaines sessions de cet utilisateur ne sont pas fiables",
     "All sessions for this user are trusted": "Toutes les sessions de cet utilisateur sont fiables",
     "Some sessions in this encrypted room are not trusted": "Certaines sessions dans ce salon chiffré ne sont pas fiables",
     "All sessions in this encrypted room are trusted": "Toutes les sessions dans ce salon chiffré sont fiables",
@@ -2101,7 +2101,7 @@
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Récupérez l’accès à votre compte et restaurez les clés de chiffrement dans cette session. Sans elles, vous ne pourrez pas lire tous vos messages chiffrés dans n’importe quelle session.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Attention : Vos données personnelles (y compris les clés de chiffrement) seront stockées dans cette session. Effacez-les si vous n’utilisez plus cette session ou si vous voulez vous connecter à un autre compte.",
     "Sender session information": "Informations de session de l’expéditeur",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cette session pour l’autoriser de vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cette session pour l’autoriser à vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Configurez le chiffrement sur cette session pour lui permettre de vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Cette session peut à présent vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez  pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",

From 34a67bf1446ecb34718626d92c576b331f889a42 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 5 Feb 2020 18:22:29 +0000
Subject: [PATCH 0958/3235] Translated using Weblate (Hungarian)

Currently translated at 98.4% (2068 of 2101 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 | 86 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 32f5b237e7..b8d14774d6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2006,5 +2006,89 @@
     "Unable to load session list": "A munkamenet listát nem lehet betölteni",
     "Delete %(count)s sessions|other": "%(count)s munkamenet törlése",
     "Delete %(count)s sessions|one": "%(count)s munkamenet törlése",
-    "This session is backing up your keys. ": "Ez a munkamenet elmenti a kulcsaidat. "
+    "This session is backing up your keys. ": "Ez a munkamenet elmenti a kulcsaidat. ",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "FIGYELEM: KULCS ELLENŐRZÉS HIBÁS! %(userId)s aláírási kulcsa és a munkamenet: %(deviceId)s ujjlenyomata \"%(fprint)s\" ami nem egyezik meg a megadott ujjlenyomattal ami \"%(fingerprint)s\". Ez jelentheti azt, hogy a kommunikációt lehallgatják!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A megadott aláírási kulcs megegyezik %(userId)s felhasználótól kapott aláírási kulccsal ebben a munkamenetben: %(deviceId)s. A munkamenet hitelesnek lett jelölve.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Jelenleg a jelszó változtatás minden munkamenet végpontok közötti titkosító kulcsait alaphelyzetbe állítja, ezáltal a titkosított üzenetek olvashatatlanok lesznek, hacsak először nem mented ki a szobák kulcsait és töltöd vissza jelszóváltoztatás után. A jövőben ezt egyszerűsítjük majd.",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ez az munkamenet <b>nem menti el a kulcsaidat</b>, de van létező mentésed ahonnan vissza  tudsz állni és továbbléphetsz.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Állítsd be ezen az munkameneten a Kulcs Mentést kijelentkezés előtt, hogy ne veszíts el olyan kulcsot ami csak ezen az eszközön van meg.",
+    "Connect this session to Key Backup": "Munkamenet csatlakoztatása a Kulcs Mentéshez",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "A mentésnek <verify>ismeretlen</verify> munkamenetből származó aláírása van ezzel az azonosítóval: %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "A mentés <validity>érvényes</validity> aláírást tartalmaz ebből a munkamenetből",
+    "Backup has an <validity>invalid</validity> signature from this session": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz ebből a munkamenetből",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "A mentés <validity>érvénes</validity> aláírást tartalmaz <verify>érvényes</verify> munkamenetből <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "A mentés <validity>érvénes</validity> aláírást tartalmaz <verify>ellenőrizetlen</verify> munkamenetből <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz <verify>érvényes</verify> munkamenetből <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz <verify>ellenőrizetlen</verify> munkamenetből <device></device>",
+    "Backup is not signed by any of your sessions": "A mentés nem tartalmaz aláírást egyetlen munkamenetedből sem",
+    "This backup is trusted because it has been restored on this session": "Ez a mentés megbízható mert ebben a munkamenetben lett visszaállítva",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "A mentési kulcs a biztonsági tárolóban van elmentve, de ebben a munkamenetben ez a lehetőség nincs engedélyezve. Kérlek engedélyezd az eszközök közötti hitelesítést a Laborokban a kulcs mentés állapotának megváltoztatásához.",
+    "Your keys are <b>not being backed up from this session</b>.": "A kulcsaid <b>nem kerülnek elmentésre erről a munkamenetről</b>.",
+    "Enable desktop notifications for this session": "Asztali értesítések engedélyezése ebben a munkamenetben",
+    "Enable audible notifications for this session": "Hallható értesítések engedélyezése ebben a munkamenetben",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "A jelszavad sikeresen megváltozott. Addig nem kapsz push értesítéseket más munkamenetekben amíg nem jelentkezel vissza bennük",
+    "Session ID:": "Munkamenet azonosító:",
+    "Session key:": "Munkamenet kulcs:",
+    "Sessions": "Munkamenetek",
+    "A session's public name is visible to people you communicate with": "A munkamenet nyilvános neve megjelenik azoknál az embereknél, akikkel beszélgetsz",
+    "This user has not verified all of their sessions.": "Ez a felhasználó még nem ellenőrizte az összes munkamenetét.",
+    "You have not verified this user.": "Még nem ellenőrizted ezt a felhasználót.",
+    "You have verified this user. This user has verified all of their sessions.": "Ezt a felhasználót ellenőrizted. Ez a felhasználó hitelesítette az összes munkamenetét.",
+    "Someone is using an unknown session": "Valaki ismeretlen munkamenetet használ",
+    "Some sessions for this user are not trusted": "Ennek a felhasználónak néhány munkamenete nem megbízható",
+    "All sessions for this user are trusted": "A felhasználónak minden munkamenete megbízható",
+    "Some sessions in this encrypted room are not trusted": "Ebben a titkosított szobában nem minden munkamenet megbízható",
+    "All sessions in this encrypted room are trusted": "Ebben a titkosított szobában minden munkamenet megbízható",
+    "Mod": "Mod",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "A kulcs megosztás kérésed el lett küldve - ellenőrizd a többi munkamenetedet a kulcskérések után.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Kulcs megosztás kérés automatikusan el lett küldve neked a másik munkamenetekből. Ha elutasítottad vagy bezártad a kérést másik munkamenetedben, ide kattintva újrakérheted őket ehhez a munkamenethez.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Ha a többi munkameneted közül egyik sem tartalmazza a kulcsot ehhez az üzenethez, akkor ezt az üzenetet nem fogod tudni elolvasni.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Titkosítási kulcsok újrakérése</requestLink> a többi munkamenetből.",
+    "Encrypted by an unverified session": "Ellenőrizetlen munkamenet titkosította",
+    "Encrypted by a deleted session": "Törölt munkamenet által lett titkosítva",
+    "No sessions with registered encryption keys": "Nincs munkamenet regisztrált titkosítási kulcsokkal",
+    "Waiting for %(displayName)s to accept…": "%(displayName)s felhasználóra várakozás az elfogadáshoz…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Az üzeneted biztonságban van  és csak neked és a címzetteknek van meg az egyedi kulcs a visszafejtéshez.",
+    "Your messages are not secure": "Az üzeneteid nincsenek biztonságban",
+    "One of the following may be compromised:": "Valamelyik az alábbiak közül kompromittált:",
+    "Your homeserver": "Matrix szervered",
+    "The homeserver the user you’re verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix szerverhez kapcsolódik:",
+    "Yours, or the other users’ internet connection": "A te vagy a másik felhasználó Internet kapcsolata",
+    "Yours, or the other users’ session": "A te vagy a másik felhasználó munkamenete",
+    "%(count)s sessions|other": "%(count)s munkamenet",
+    "%(count)s sessions|one": "%(count)s munkamenet",
+    "Hide sessions": "Munkamenetek elrejtése",
+    "Verify by emoji": "Ellenőrzés emodzsival",
+    "Verify by comparing unique emoji.": "Ellenőrzés egyedi emodzsik összehasonlításával.",
+    "Ask %(displayName)s to scan your code:": "Kérd meg %(displayName)s felhasználót, hogy olvassa be a kódot:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ha nem tudod beolvasni az alábbi kódot, ellenőrizd az egyedi emodzsik összehasonlításával.",
+    "You've successfully verified %(displayName)s!": "Sikeresen ellenőrizted a felhasználót: %(displayName)s!",
+    "Got it": "Értem",
+    "Verification timed out. Start verification again from their profile.": "Ellenőrzés időtúllépés. Kezd újra az ellenőrzést a másik felhasználó profiljából.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s törölte az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
+    "You cancelled verification. Start verification again from their profile.": "Törölted az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
+    "Encryption enabled": "Titkosítás engedélyezve",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. Tudj meg többet és ellenőrizd ezt a felhasználót a profiljában.",
+    "Encryption not enabled": "Titkosítás nincs engedélyezve",
+    "The encryption used by this room isn't supported.": "A szobában használt titkosítás nem támogatott.",
+    "Clear all data in this session?": "Minden adat törlése ebben a munkamenetben?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Az adatok törlése ebből a munkamenetből végleges. A titkosított üzenetek elvesznek hacsak nincsenek elmentve a kulcsai.",
+    "Verify session": "Munkamenet ellenőrzése",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "A munkamenet megbízhatóságának eldöntéséhez ellenőrizd a kulcsot a Felhasználói Beállításokban ezen az eszközön, hogy megegyezik-e az alábbi kulccsal:",
+    "To verify that this session 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 session matches the key below:": "A munkamenet megbízhatóságának eldöntéséhez vedd fel a kapcsolatot a tulajdonosával valami másik módon (pl. személyesen vagy telefonhívással) és kérdezd meg, hogy a Felhasználói Beállításokban ugyanazt a kulcsot látja-e mint ami alul van:",
+    "Session name": "Munkamenet neve",
+    "Session key": "Munkamenet kulcs",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Ha egyezik akkor nyomd meg az ellenőriz gombot alul. Ha nem akkor valaki lehallgatja a munkamenetet és valószínű, hogy inkább a tiltólista gombra kellene kattintani.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "A felhasználót ellenőrizve a munkamenet megbízhatónak lesz jelölve és ugyanakkor a munkamenetedet is megbízhatónak fogja jelölni náluk.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Eszköz ellenőrzése és beállítás megbízhatónak. Az eszközben való megbízás megnyugtató lehet, ha végpontok közötti titkosítást használsz.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok akik téged ellenőriztek megbíznak majd ebben az eszközödben.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Új munkamenetet adtál hozzá '%(displayName)s' néven ami kéri a titkosítási kulcsokat.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Az ellenőrizetlen munkameneted '%(displayName)s' néven titkosítási kulcsokat kér.",
+    "Loading session info...": "Munkamenet információk betöltése...",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ezzel visszatérhetsz a fiókodba miután kijelentkeztél majd vissza egy másik munkamenetbe.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Jelenleg tiltólistán vannak az ellenőrizetlen munkamenetek; hogy üzeneteket tudj küldeni ezekbe a munkamenetekbe ellenőrizned kell őket.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Javasoljuk, hogy minden munkamenetet ellenőrizz, hogy a tényleges tulajdonosához tartoznak vagy újraküldheted az üzenetet ha akarod anélkül, hogy ellenőriznéd őket.",
+    "Room contains unknown sessions": "A szoba ismeretlen munkameneteket tartalmaz",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" még nem látott munkameneteket tartalmaz.",
+    "Unknown sessions": "Ismeretlen munkamenetek"
 }

From f1d7cf6a564549e18f5632de13a47ee3ee1c5f4c Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 3 Feb 2020 09:44:29 +0000
Subject: [PATCH 0959/3235] Translated using Weblate (Italian)

Currently translated at 99.9% (2100 of 2101 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 | 116 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index f6ee0f82ff..dd6b697fb7 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2009,5 +2009,119 @@
     "Verify this device by confirming the following number appears on its screen.": "Verifica questo dispositivo confermando che il seguente numero appare sullo schermo.",
     "Verify yourself & others to keep your chats safe": "Verifica te stesso e gli altri per mantenere sicure le chat",
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Backup chiavi salvato nell'archivio segreto, ma questa funzione non è attiva in questa sessione. Attiva la firma incrociata in Laboratori per modificare lo stato del backup chiavi.",
-    "Your keys are <b>not being backed up from this session</b>.": "Il backup chiavi <b>non viene fatto per questa sessione</b>."
+    "Your keys are <b>not being backed up from this session</b>.": "Il backup chiavi <b>non viene fatto per questa sessione</b>.",
+    "Enable desktop notifications for this session": "Attiva le notifiche desktop per questa sessione",
+    "Enable audible notifications for this session": "Attiva le notifiche audio per questa sessione",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "La tua password è stata cambiata correttamente. Non riceverai notifiche push in altre sessioni finchè non riesegui l'accesso in esse",
+    "Session ID:": "ID sessione:",
+    "Session key:": "Chiave sessione:",
+    "Message search": "Ricerca messaggio",
+    "Sessions": "Sessioni",
+    "A session's public name is visible to people you communicate with": "Il nome pubblico di una sessione è visibile alle persone con cui comunichi",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Questa stanza fa un bridge dei messaggi con le seguenti piattaforme. <a>Maggiori informazioni.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Questa stanza non fa un bridge dei messaggi con alcuna piattaforma. <a>Maggiori informazioni.</a>",
+    "Bridges": "Bridge",
+    "This user has not verified all of their sessions.": "Questo utente non ha verificato tutte le sue sessioni.",
+    "You have not verified this user.": "Non hai verificato questo utente.",
+    "You have verified this user. This user has verified all of their sessions.": "Hai verificato questo utente. Questo utente ha verificato tutte le sue sessioni.",
+    "Someone is using an unknown session": "Qualcuno sta usando una sessione sconosciuta",
+    "Some sessions for this user are not trusted": "Alcune sessioni di questo utente non sono fidate",
+    "All sessions for this user are trusted": "Tutte le sessioni di questo utente sono fidate",
+    "Some sessions in this encrypted room are not trusted": "Alcune sessioni in questa stanza cifrata non sono fidate",
+    "All sessions in this encrypted room are trusted": "Tutte le sessioni in questa stanza cifrata sono fidate",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "La tua richiesta di condivisione chiavi è stata inviata - controlla le tue altre sessioni per le richieste.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Le richieste di condivisione chiavi vengono inviate alle tue altre sessioni automaticamente. Se sulle altre sessioni l'hai rifiutata o annullata, clicca qui per chiedere di nuovo le chiavi per questa sessione.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se le altre sessioni non hanno la chiave per questo messaggio non sarai in grado di decifrarlo.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Chiedi di nuovo le chiavi di cifratura</requestLink> dalle altre sessioni.",
+    "Encrypted by an unverified session": "Cifrato da una sessione non verificata",
+    "Encrypted by a deleted session": "Cifrato da una sessione eliminata",
+    "No sessions with registered encryption keys": "Nessuna sessione con chiavi di cifratura registrate",
+    "Waiting for %(displayName)s to accept…": "In attesa che %(displayName)s accetti…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "I tuoi messaggi sono protetti e solo tu ed il destinatario avete le chiavi univoche per sbloccarli.",
+    "Your messages are not secure": "I tuoi messaggi non sono sicuri",
+    "One of the following may be compromised:": "Uno dei seguenti potrebbe essere compromesso:",
+    "Your homeserver": "Il tuo homeserver",
+    "The homeserver the user you’re verifying is connected to": "L'homeserver al quale è connesso l'utente che stai verificando",
+    "Yours, or the other users’ internet connection": "La tua connessione internet o quella degli altri utenti",
+    "Yours, or the other users’ session": "La tua sessione o quella degli altri utenti",
+    "%(count)s sessions|other": "%(count)s sessioni",
+    "%(count)s sessions|one": "%(count)s sessione",
+    "Hide sessions": "Nascondi sessione",
+    "Verify by emoji": "Verifica via emoji",
+    "Verify by comparing unique emoji.": "Verifica confrontando emoji specifici.",
+    "Ask %(displayName)s to scan your code:": "Chiedi a %(displayName)s di scansionare il tuo codice:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Se non riesci a scansionare il codice sopra, verifica confrontando emoji specifiche.",
+    "You've successfully verified %(displayName)s!": "Hai verificato correttamente %(displayName)s!",
+    "Got it": "Capito",
+    "Verification timed out. Start verification again from their profile.": "Verifica scaduta. Inizia di nuovo la verifica dal suo profilo.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s ha annullato la verifica. Inizia di nuovo la verifica dal suo profilo.",
+    "You cancelled verification. Start verification again from their profile.": "Hai annullato la verifica. Inizia di nuovo la verifica dal suo profilo.",
+    "Encryption enabled": "Cifratura attivata",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "I messaggi in questa stanza sono cifrati end-to-end. Maggiori info e verifica di questo utente nel suo profilo.",
+    "Encryption not enabled": "Cifratura non attivata",
+    "The encryption used by this room isn't supported.": "La cifratura usata da questa stanza non è supportata.",
+    "Clear all data in this session?": "Svuotare tutti i dati in questa sessione?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Lo svuotamento dei dati di questa sessione è permanente. I messaggi cifrati andranno persi a meno non si abbia un backup delle loro chiavi.",
+    "Verify session": "Verifica sessione",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Per verficare che questa sessione sia fidata, controlla che la chiave che vedi nelle impostazioni utente su quel dispositivo corrisponda a questa sotto:",
+    "To verify that this session 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 session matches the key below:": "Per verificare che questa sessione sia fidata, contatta il suo proprietario usando altri metodi (es. di persona o per telefono) e chiedi se la chiave che vede nelle sue impostazioni utente di questa sessione corrisponde con questa sotto:",
+    "Session name": "Nome sessione",
+    "Session key": "Chiave sessione",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Se corrisponde, premi il pulsante di verifica sottostante. Se non corrisponde, qualcuno sta intercettando questa sessione e dovresti invece premere il pulsante della lista nera.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "La verifica di questo utente contrassegnerà come fidata la sua sessione a te e viceversa.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifica questo dispositivo per segnarlo come fidato. Fidarsi di questo dispositivo offre a te e agli altri utenti una maggiore tranquillità nell'uso di messaggi cifrati end-to-end.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verifica di questo dispositivo lo segnerà come fidato e gli utenti che si sono verificati con te si fideranno di questo dispositivo.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Se non riesci a trovare qualcuno, chiedigli il nome utente, condividi il tuo (%(userId)s) o il <a>collegamento al profilo</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Hai aggiunto una nuova sessione '%(displayName)s', che sta chiedendo le chiavi di cifratura.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "La tua sessione non verificata '%(displayName)s' sta chiedendo le chiavi di cifratura.",
+    "Loading session info...": "Caricamento info di sessione...",
+    "New session": "Nuova sessione",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa questa sessione per verificare quella nuova, dandole accesso ai messaggi cifrati:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Se non hai fatto l'accesso a questa sessione, il tuo account potrebbe essere compromesso.",
+    "This wasn't me": "Non ero io",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ciò ti permetterà di tornare al tuo account dopo la disconnessione e di accedere in altre sessioni.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Stai attualmente bloccando sessioni non verificate; per inviare messaggi a queste sessioni devi verificarle.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ti consigliamo di eseguire il processo di verifica per ogni sessione per confermare l'appartenenza al loro legittimo proprietario, ma puoi reinviare il messaggio senza la verifica se lo preferisci.",
+    "Room contains unknown sessions": "La stanza contiene sessioni sconosciute",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contiene sessioni che non hai mai visto prima.",
+    "Unknown sessions": "Sessioni sconosciute",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accedi alla tua cronologia di messaggi sicuri e all'identità a firma incrociata per verificare altre sessioni inserendo la tua password.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Accedi alla tua cronologia di messaggi sicuri e all'identità a firma incrociata per verificare altre sessioni inserendo la tua chiave di recupero.",
+    "Recovery key mismatch": "La chiave di recupero non corrisponde",
+    "Incorrect recovery passphrase": "Password di recupero errata",
+    "Backup restored": "Backup ripristinato",
+    "Enter recovery passphrase": "Inserisci password di recupero",
+    "Enter recovery key": "Inserisci chiave di recupero",
+    "Confirm your identity by entering your account password below.": "Conferma la tua identità inserendo la password dell'account sotto.",
+    "Message not sent due to unknown sessions being present": "Messaggio non inviato a causa della presenza di sessioni sconosciute",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Mostra le sessioni</showSessionsText>, <sendAnywayText>invia comunque</sendAnywayText> o <cancelText>annulla</cancelText>.",
+    "Your new session is now verified. Other users will see it as trusted.": "La tua nuova sessione è ora verificata. Gli altri utenti la vedranno come fidata.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Senza completare la sicurezza di questa sessione, essa non avrà accesso ai messaggi cifrati.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "La modifica della password reimposterà qualsiasi chiave di cifratura end-to-end su tutte le sessioni, rendendo illeggibile la cronologia delle chat cifrate. Configura il Backup Chiavi o esporta le tue chiavi della stanza da un'altra sessione prima di reimpostare la password.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Sei stato disconnesso da tutte le sessioni e non riceverai più notifiche push. Per riattivare le notifiche, riaccedi su ogni dispositivo.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Riprendi l'accesso al tuo account e recupera le chiavi di cifratura memorizzate in questa sessione. Senza di esse, non sarai in grado di leggere tutti i tuoi messaggi sicuri in qualsiasi sessione.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Attenzione: i tuoi dati personali (incluse le chiavi di cifratura) sono ancora memorizzati in questa sessione. Cancellali se hai finito di usare questa sessione o se vuoi accedere ad un altro account.",
+    "Sender session information": "Informazioni sessione del mittente",
+    "Restore your key backup to upgrade your encryption": "Ripristina il tuo backup chiavi per aggiornare la cifratura",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aggiorna questa sessione per consentirle di verificare altre sessioni, garantendo loro l'accesso ai messaggi cifrati e contrassegnandole come fidate per gli altri utenti.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Imposta la cifratura su questa sessione per consentirle di verificare le altre sessioni, garantendo loro l'accesso ai messaggi cifrati e contrassegnandole come fidate per gli altri utenti.",
+    "Back up my encryption keys, securing them with the same passphrase": "Fai il backup delle mie chiavi di cifratura, proteggendole con la stessa password",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Conservane una copia in un luogo sicuro, come un gestore di password o una cassaforte.",
+    "Your recovery key": "La tua chiave di recupero",
+    "Copy": "Copia",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Ora puoi verificare i tuoi altri dispositivi e gli altri utenti per tenere al sicuro le tue chat.",
+    "Make a copy of your recovery key": "Fai una copia della chiave di recupero",
+    "You're done!": "Hai finito!",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Senza configurare il Recupero Messaggi Sicuri, non potrai ripristinare la cronologia di messaggi cifrati se ti disconnetti o se usi un'altra sessione.",
+    "Create key backup": "Crea backup chiavi",
+    "This session is encrypting history using the new recovery method.": "Questa sessione sta cifrando la cronologia usando il nuovo metodo di recupero.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Questa sessione ha rilevato che la tua password di recupero e la chiave per i Messaggi Sicuri sono state rimosse.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se l'hai fatto accidentalmente, puoi configurare Messaggi Sicuri su questa sessione che cripterà nuovamente la cronologia dei messaggi con un nuovo metodo di recupero.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Se disattivato, i messaggi delle stanze cifrate non appariranno nei risultati di ricerca.",
+    "Disable": "Disattiva",
+    "Not currently downloading messages for any room.": "Nessuno scaricamento di messaggi in corso per alcuna stanza.",
+    "Downloading mesages for %(currentRoom)s.": "Scaricamento messaggi per %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot sta tenendo in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca:",
+    "of ": "di ",
+    "Message downloading sleep time(ms)": "Tempo di attesa scaricamento messaggi (ms)"
 }

From c93e098d4cd3485f6b4c5d11711b7ee15a2f1731 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 6 Feb 2020 13:27:51 +0000
Subject: [PATCH 0960/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2101 of 2101 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 668725c4aa..8cf4f7706e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2126,5 +2126,7 @@
     "You're done!": "您已經完成了！",
     "Create key backup": "建立金鑰備份",
     "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）",
-    "of ": "的 "
+    "of ": "的 ",
+    "Indexed rooms:": "已索引的聊天室：",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(crawlingRooms)s"
 }

From fba314d65f0b7f8bada5077f992a506ea5da0b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Thu, 6 Feb 2020 12:55:20 +0000
Subject: [PATCH 0961/3235] Translated using Weblate (Czech)

Currently translated at 96.1% (2020 of 2101 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 3adc393e0a..5941fdedb4 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2010,5 +2010,35 @@
     "%(count)s sessions|one": "%(count)s relace",
     "Hide sessions": "Skrýt relace",
     "Verify by emoji": "Ověřit emotikonami",
-    "Verify by comparing unique emoji.": "Oveření porovnáním několika emotikon."
+    "Verify by comparing unique emoji.": "Oveření porovnáním několika emotikon.",
+    "Ask %(displayName)s to scan your code:": "Ověříte se, když %(displayName)s naskenuje váš kód:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Pokud vám skenování kódů nefunguje, ověřte se porovnáním emotikon.",
+    "You've successfully verified %(displayName)s!": "%(displayName)s je úspěšně ověřen/a!",
+    "Got it": "Dobře",
+    "Verification timed out. Start verification again from their profile.": "Čas na verifikaci vypršel. Začněte s verifikací znovu z druhého profilu.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s zrušil/a verifikaci. Začněte s verifikací znovu z druhého profilu.",
+    "Encryption enabled": "Šifrování je zapnuté",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Zprávy v této místnosti jsou E2E šifrované. Více informací & verifikace uživatele je v jeho profilu.",
+    "Encryption not enabled": "Šifrování je vypnuté",
+    "The encryption used by this room isn't supported.": "Šifrování používané v této místnosti není podporované.",
+    "Clear all data in this session?": "Smazat všechna data v této relaci?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Výmaz všech dat v relaci je nevratný. Pokud nemáte zálohované šifrovací klíče, přijdete o šifrované zprávy.",
+    "Verify session": "Ověřit relaci",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Abychom ověřili, že je relace důvěryhodná, zkontrolujte prosím, že klíč v uživatelském nastavení na tom zařízení odpovídá následujícímu klíči:",
+    "To verify that this session 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 session matches the key below:": "Abychom ověřili, že tato relace je důvěryhodná, kontaktujte prosím jejího vlastníka nějakým dalším způsobem (osobně, telefonicky, apod.). Zkontrolujte spolu, že klíč v uživatelském nastavení na druhém zařízení odpovídá následujícímu klíči:",
+    "Session name": "Jméno relace",
+    "Session key": "Klíč relace",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Pokud odpovídá, zmáčkněte tlačítko ověřit. Pokud ne, druhé zařízení je pravděpodobně falešné a chcete ho zablokovat.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a Vaše relace budou důvěryhodné pro něj.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dát trochu klidu mysli navíc při používání šifrovaných zpráv.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ověření zařízení ho označí za důvěryhodné a uživatelé, kteří věří vám budou také tomuto zařízení důvěřovat.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Následující uživatele se nepovedlo pozvat do chatu: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Nepovedlo se nám vyrobit soukromou konverzaci. Zkontrolujte prosím, že pozvaný uživatel opravdu existuje a pak to zkuste znovu.",
+    "Something went wrong trying to invite the users.": "Při odesílání pozvánek se něco pokazilo.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Nemůžeme pozvat tyto uživatele. Zkontrolujte prosím, že opravdu existují a zkuste to znovu.",
+    "Failed to find the following users": "Nepovedlo se najít následující uživatele",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Následující uživatelé asi neexistují nebo jsou neplatní a nelze je pozvat: %(csvNames)s",
+    "Recent Conversations": "Nedávné konverzace",
+    "Suggestions": "Návrhy",
+    "Recently Direct Messaged": "Nedávno kontaktovaní"
 }

From cf7ad725a60765f8d98cbe1234e172e895cdaf39 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 15:06:36 +0100
Subject: [PATCH 0962/3235] copy and i18n

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

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 8feb651ea5..15daede92b 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -89,7 +89,7 @@ async function getSecretStorageKey({ keys: keyInfos }) {
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 const [sure] = await Modal.createDialog(QuestionDialog, {
                     title: _t("Cancel entering passphrase?"),
-                    description: _t("If you cancel now, you won't complete your SSSS operation!"),
+                    description: _t("If you cancel now, you won't complete your secret storage operation!"),
                 }).finished;
                 return sure;
             },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d125d10cfb..6fb4b86aac 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -60,6 +60,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "The server does not support the room version specified.": "The server does not support the room version specified.",
     "Failure to create room": "Failure to create room",
+    "Cancel entering passphrase?": "Cancel entering passphrase?",
+    "If you cancel now, you won't complete your secret storage operation!": "If you cancel now, you won't complete your secret storage operation!",
     "Setting up keys": "Setting up keys",
     "Send anyway": "Send anyway",
     "Send": "Send",

From a8958458aae19f546c185b67cc6b6ba153a48fb4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 15:29:35 +0100
Subject: [PATCH 0963/3235] fix lint, add jsdoc

---
 src/Modal.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Modal.js b/src/Modal.js
index f55e497e6f..de441740f1 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -170,6 +170,12 @@ class ModalManager {
         }, deferred.promise];
     }
 
+    /**
+     * @callback onBeforeClose
+     * @param {string?} reason either "backgroundClick" or null
+     * @return {Promise<bool>} whether the dialog should close
+     */
+
     /**
      * Open a modal view.
      *
@@ -197,6 +203,8 @@ class ModalManager {
      *                                 also be removed from the stack. This is not compatible
      *                                 with being a priority modal. Only one modal can be
      *                                 static at a time.
+     * @param {Object} options? extra options for the dialog
+     * @param {onBeforeClose} options.onBeforeClose a callback to decide whether to close the dialog
      * @returns {object} Object with 'close' parameter being a function that will close the dialog
      */
     createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {

From 02d169060daa466df4b3db45b0e373f0c90c057b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 6 Feb 2020 16:51:02 +0100
Subject: [PATCH 0964/3235] differentiate dismiss dialog based on name passed
 from js-sdk

also make dialog a bit nicer with more descriptive button
---
 src/CrossSigningManager.js  | 34 +++++++++++++++++++++++++---------
 src/i18n/strings/en_EN.json |  8 +++++---
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 15daede92b..694b2b0a25 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -43,7 +43,28 @@ export class AccessCancelledError extends Error {
     }
 }
 
-async function getSecretStorageKey({ keys: keyInfos }) {
+async function confirmToDismiss(name) {
+    let description;
+    if (name === "m.cross_signing.user_signing") {
+        description = _t("If you cancel now, you won't complete verifying the other user.");
+    } else if (name === "m.cross_signing.self_signing") {
+        description = _t("If you cancel now, you won't complete verifying your other session.");
+    } else {
+        description = _t("If you cancel now, you won't complete your secret storage operation.");
+    }
+
+    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+    const [sure] = await Modal.createDialog(QuestionDialog, {
+        title: _t("Cancel entering passphrase?"),
+        description,
+        danger: true,
+        cancelButton: _t("Enter passphrase"),
+        button: _t("Cancel"),
+    }).finished;
+    return sure;
+}
+
+async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
     const keyInfoEntries = Object.entries(keyInfos);
     if (keyInfoEntries.length > 1) {
         throw new Error("Multiple storage key requests not implemented");
@@ -83,15 +104,10 @@ async function getSecretStorageKey({ keys: keyInfos }) {
         /* isStaticModal= */ false,
         /* options= */ {
             onBeforeClose: async (reason) => {
-                if (reason !== "backgroundClick") {
-                    return true;
+                if (reason === "backgroundClick") {
+                    return confirmToDismiss(ssssItemName);
                 }
-                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                const [sure] = await Modal.createDialog(QuestionDialog, {
-                    title: _t("Cancel entering passphrase?"),
-                    description: _t("If you cancel now, you won't complete your secret storage operation!"),
-                }).finished;
-                return sure;
+                return true;
             },
         },
     );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6fb4b86aac..2e21f08447 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -60,8 +60,12 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "The server does not support the room version specified.": "The server does not support the room version specified.",
     "Failure to create room": "Failure to create room",
+    "If you cancel now, you won't complete verifying the other user.": "If you cancel now, you won't complete verifying the other user.",
+    "If you cancel now, you won't complete verifying your other session.": "If you cancel now, you won't complete verifying your other session.",
+    "If you cancel now, you won't complete your secret storage operation.": "If you cancel now, you won't complete your secret storage operation.",
     "Cancel entering passphrase?": "Cancel entering passphrase?",
-    "If you cancel now, you won't complete your secret storage operation!": "If you cancel now, you won't complete your secret storage operation!",
+    "Enter passphrase": "Enter passphrase",
+    "Cancel": "Cancel",
     "Setting up keys": "Setting up keys",
     "Send anyway": "Send anyway",
     "Send": "Send",
@@ -452,7 +456,6 @@
     "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
-    "Cancel": "Cancel",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "They match": "They match",
     "They don't match": "They don't match",
@@ -2022,7 +2025,6 @@
     "Export room keys": "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.": "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.",
     "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.": "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": "Enter passphrase",
     "Confirm passphrase": "Confirm passphrase",
     "Export": "Export",
     "Import room keys": "Import room keys",

From 1105c14fdd41dec71a8a531ece2c76c01ab7552b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Thu, 6 Feb 2020 13:53:52 +0000
Subject: [PATCH 0965/3235] Translated using Weblate (Czech)

Currently translated at 98.0% (2059 of 2101 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 5941fdedb4..97ca508e04 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2040,5 +2040,44 @@
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Následující uživatelé asi neexistují nebo jsou neplatní a nelze je pozvat: %(csvNames)s",
     "Recent Conversations": "Nedávné konverzace",
     "Suggestions": "Návrhy",
-    "Recently Direct Messaged": "Nedávno kontaktovaní"
+    "Recently Direct Messaged": "Nedávno kontaktovaní",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Pokud někoho nemůžete nalézt, zeptejte se na username, pošlete jim svůj  (%(userId)s) a nebo pošlete <a>odkaz na svůj profil</a>.",
+    "Go": "Ok",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Pokud někoho nemůžete nalézt, zeptejte se na username (například @user:server.com) a nebo pošlete <a>odkaz na tuto místnost</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Přidali jste novou relaci '%(displayName)s', která požaduje šifrovací klíče.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Vaše neověřená relace '%(displayName)s' požaduje šifrovací klíče.",
+    "Loading session info...": "Načítám informace o relaci...",
+    "New session": "Nová relace",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Použijte tuto relaci abyste ověřili novou a dali jí přístup ke svým šifrovaným zprávám:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Pokud jste se do této nové relace nepřihlásili, váš účet může být kompromitován.",
+    "This wasn't me": "Nebyl/a jsem to já",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Umožní vám to se přihlásit do dalších relací a vrátit se ke svému účtu poté co se odhlásíte.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Máte zakázané posílání zpráv neověřeným relacím; abyste mohli zprávu odeslat, musíte je ověřit.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme si projít ověřovací proces pro každou relaci abyste ověřili, že patří tomu, komu očekáváte. Můžete ale poslat zprávu i bez ověření, pokud chcete.",
+    "Room contains unknown sessions": "V místnosti jsou neověřené relace",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "V místnosti \"%(RoomName)s\" jsou relace, které jste ještě nikdy neviděli.",
+    "Unknown sessions": "Neznámá relace",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Zadejte svoje heslo a získejte přístup k bezpečnému úložišti historie zpráv a k identitě pro cross-signing pro snadné ověřování vašich relací.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Zadejte svůj obnovovací klíč a získejte přístup k bezpečnému úložišti historie zpráv a k identitě pro cross-signing pro snadné ověřování vašich relací.",
+    "Recovery key mismatch": "Obnovovací klíč neodpovídá",
+    "Incorrect recovery passphrase": "Nesprávné heslo pro obnovení",
+    "Backup restored": "Záloha byla nahrána",
+    "Enter recovery passphrase": "Zadejte heslo pro obnovení zálohy",
+    "Enter recovery key": "Zadejte obnovovací klíč",
+    "Confirm your identity by entering your account password below.": "Potvrďte svou identitu zadáním hesla ke svému účtu.",
+    "Message not sent due to unknown sessions being present": "Zpráva nebyla odeslána, protože jsou v místnosti neznámé relace",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Zobrazit relace</showSessionsText>, <sendAnywayText>i tak odeslat</sendAnywayText>, a nebo  <cancelText>zrušit</cancelText>.",
+    "Verify this session to grant it access to encrypted messages.": "Ověřte relaci aby získala přístup k šifrovaným zprávám.",
+    "Start": "Začít",
+    "Session verified": "Relace je ověřena",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaše nová relace je teď ověřená. Má přístup k šifrovaným zprávám a ostatní uživatelé jí budou věřit.",
+    "Your new session is now verified. Other users will see it as trusted.": "Vaše nová relace je teď ověřená. Ostatní uživatelé jí budou věřit.",
+    "Done": "Hotovo",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončení ověření nebude mít nová relace přístup k šifrovaným zprávám.",
+    "Go Back": "Zpět",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Změna hesla resetuje šifrovací klíče ve všech vašich přihlášených relacích a přijdete tak o přístup k historickým zprávám. Před změnou hesla si nastavte zálohu klíčů nebo si klíče pro místnosti exportujte.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Všude jsme Vás odhlásili, takže nedostáváte žádné upozornění. Můžete je znovu povolit tím, že se na všech svych zařízeních znovu přihlásíte.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené v této relaci. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit nebo se přihlašte pod jiný účet.",
+    "Sender session information": "Informace o relaci odesílatele"
 }

From c916ef453490b718854989ca2a74ac476b61934a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 6 Feb 2020 17:57:17 +0000
Subject: [PATCH 0966/3235] Only emit in RoomViewStore when state actually
 changes

This adds a shallow state check to attempt to only emit a store update when
something actually changes.

Fixes https://github.com/vector-im/riot-web/issues/12256
---
 src/stores/RoomViewStore.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 9bcc2815e6..64dfd56b2f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -66,6 +66,20 @@ class RoomViewStore extends Store {
     }
 
     _setState(newState) {
+        // If values haven't changed, there's nothing to do.
+        // This only tries a shallow comparison, so unchanged objects will slip
+        // through, but that's probably okay for now.
+        let stateChanged = false;
+        for (const key of Object.keys(newState)) {
+            if (this._state[key] !== newState[key]) {
+                stateChanged = true;
+                break;
+            }
+        }
+        if (!stateChanged) {
+            return;
+        }
+
         this._state = Object.assign(this._state, newState);
         this.__emitChange();
     }

From f620cc05e24d843a322c1d1443a2e1ea105a2036 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 6 Feb 2020 20:01:09 +0000
Subject: [PATCH 0967/3235] Translated using Weblate (Hungarian)

Currently translated at 99.7% (2097 of 2103 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 | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b8d14774d6..d3a77a6bcc 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2090,5 +2090,35 @@
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Javasoljuk, hogy minden munkamenetet ellenőrizz, hogy a tényleges tulajdonosához tartoznak vagy újraküldheted az üzenetet ha akarod anélkül, hogy ellenőriznéd őket.",
     "Room contains unknown sessions": "A szoba ismeretlen munkameneteket tartalmaz",
     "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" még nem látott munkameneteket tartalmaz.",
-    "Unknown sessions": "Ismeretlen munkamenetek"
+    "Unknown sessions": "Ismeretlen munkamenetek",
+    "Cancel entering passphrase?": "Megszakítod a jelmondat bevitelét?",
+    "If you cancel now, you won't complete your secret storage operation!": "Ha most megszakítod, akkor nem fejezed be a biztonságos tárolóval kapcsolatos műveletet!",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a biztonságos üzeneteidhez és az eszközök közötti hitelesítéshez használt személyazonosságodhoz, hogy más munkameneteket hitelesíthess.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a biztonságos üzeneteidhez és az eszközök közötti hitelesítéshez használt személyazonosságodhoz, hogy más munkameneteket hitelesíthess.",
+    "Recovery key mismatch": "A visszaállítási kulcs nem megfelelő",
+    "Incorrect recovery passphrase": "A visszaállítási jelmondat helytelen",
+    "Backup restored": "Mentés visszaállítva",
+    "Enter recovery passphrase": "Visszaállítási jelmondat megadása",
+    "Enter recovery key": "Visszaállítási kulcs megadása",
+    "Confirm your identity by entering your account password below.": "A fiók jelszó megadásával erősítsd meg a személyazonosságodat.",
+    "Message not sent due to unknown sessions being present": "Ismeretlen munkamenet miatt az üzenet nem került elküldésre",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Munkamenetek megmutatása</showSessionsText>, <sendAnywayText>küldés mindenképpen</sendAnywayText> vagy <cancelText>küldés megszakítása</cancelText>.",
+    "Your new session is now verified. Other users will see it as trusted.": "Az új munkameneted ellenőrizve. Mások megbízhatónak fogják látni.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Amíg a biztonság nincs beállítva a munkameneten nem fér hozzá a titkosított üzenetekhez.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "A jelszó változtatás minden munkamenet végpontok közötti titkosító kulcsait alaphelyzetbe állítja, ezáltal a titkosított üzenetek olvashatatlanok lesznek, hacsak először nem mented ki a szobák kulcsait és töltöd vissza jelszóváltoztatás után. A jövőben ezt egyszerűsítjük majd.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Kijelentkeztettünk minden eszközödből és nem kapsz értesítéseket sem. Az értesítések újra engedélyezéséhez jelentkezz be újra az eszközökön.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Szerezd vissza a hozzáférést a fiókodhoz és állítsd vissza az elmentett titkosítási kulcsokat ebben a munkamenetben. Ezek nélkül egyetlen munkamenetben sem tudod elolvasni a titkosított üzeneteidet.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Figyelmeztetés: A személyes adataid (beleértve a titkosító kulcsokat is) továbbra is az eszközön vannak tárolva. Ha az eszközt nem használod tovább vagy másik fiókba szeretnél bejelentkezni, töröld őket.",
+    "Sender session information": "Küldő munkamenet információ",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt a munkamenetet, hogy más munkamenetet tudj vele hitelesíteni amivel hozzáférnek a titkosított üzenetekhez és megbízhatónak lesznek jelölve más felhasználók számára.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Állítsd be a titkosítást ezen a munkameneten, hogy más munkamenetet tudj vele hitelesíteni amivel hozzáférnek a titkosított üzenetekhez és megbízhatónak lesznek jelölve más felhasználók számára.",
+    "Back up my encryption keys, securing them with the same passphrase": "Mentsd el a titkosítási kulcsaimat és védd őket ugyanazzal a jelmondattal",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "A másolatot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).",
+    "Your recovery key": "Visszaállítási kulcsod",
+    "Copy": "Másol",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Már ellenőrizheted a többi eszközödet és más felhasználókat, hogy a beszélgetéseidet biztonságban tudhasd.",
+    "Make a copy of your recovery key": "Készíts másolatot a visszaállítási kulcsodról",
+    "You're done!": "Kész!",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után vagy másik munkamenetet használva nem tudod visszaállítani a titkosított üzeneteidet.",
+    "Create key backup": "Kulcs mentés készítése"
 }

From 2bafc1ebc895eff36da70932b034363c7d039bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 7 Feb 2020 08:01:44 +0000
Subject: [PATCH 0968/3235] Translated using Weblate (French)

Currently translated at 100.0% (2103 of 2103 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 cc79b5c9fc..e1bf47569d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2126,5 +2126,9 @@
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Si vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération.",
     "How fast should messages be downloaded.": "À quelle fréquence les messages doivent être téléchargés.",
     "of ": "sur ",
-    "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)"
+    "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)",
+    "Cancel entering passphrase?": "Annuler la saisie de la phrase de passe ?",
+    "If you cancel now, you won't complete your secret storage operation!": "Si vous annulez maintenant, vous ne terminerez pas votre opération du coffre secret !",
+    "Indexed rooms:": "Salons indexés :",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s"
 }

From 6d0aab2a2d62d67c0d843a48478f8b1fb69e8572 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Fri, 7 Feb 2020 08:55:03 +0000
Subject: [PATCH 0969/3235] Translated using Weblate (French)

Currently translated at 100.0% (2103 of 2103 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e1bf47569d..940f850df1 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1153,7 +1153,7 @@
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Pour éviter la duplication d'issues, veuillez <existingIssuesLink>voir les issues existants</existingIssuesLink>d'abord (et ajouter un +1) ou <newIssueLink>créer un nouvel issue</newIssueLink> si vous ne le trouvez pas.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Pour éviter la duplication de problèmes, veuillez <existingIssuesLink>voir les problèmes existants</existingIssuesLink> d'abord (et ajouter un +1) ou <newIssueLink>créer un nouveau problème</newIssueLink> si vous ne le trouvez pas.",
     "Report bugs & give feedback": "Rapporter des anomalies & Donner son avis",
     "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "La sauvegarde n'a pas pu être déchiffrée avec cette clé : veuillez vérifier que vous avez saisi la bonne clé de récupération.",
     "Update status": "Mettre à jour le statut",

From 9a0bc15548f9d0eea82e95477462cf11d1116e6d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 6 Feb 2020 21:13:47 +0000
Subject: [PATCH 0970/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2103 of 2103 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d3a77a6bcc..14ba143c10 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2120,5 +2120,11 @@
     "Make a copy of your recovery key": "Készíts másolatot a visszaállítási kulcsodról",
     "You're done!": "Kész!",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után vagy másik munkamenetet használva nem tudod visszaállítani a titkosított üzeneteidet.",
-    "Create key backup": "Kulcs mentés készítése"
+    "Create key backup": "Kulcs mentés készítése",
+    "This session is encrypting history using the new recovery method.": "Ez a munkamenet az új visszaállítási metódussal titkosítja a régi üzeneteket.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a visszaállítási jelmondat és a kulcs a Biztonságos Üzenetekhez törölve lett.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ha véletlenül tetted, beállíthatod a Biztonságos Üzeneteket ezen a munkameneten ami újra titkosítja a régi üzeneteket az visszaállítási eljárással.",
+    "Indexed rooms:": "Indexált szobák:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)"
 }

From fa13bb96893d242efff8250b13d083cea954ce31 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 30 Jan 2020 18:50:44 +0100
Subject: [PATCH 0971/3235] make the verif toast work with to_device request
 that do .request/.ready

---
 .../views/toasts/VerificationRequestToast.js  | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 5125e20261..0c5d29ebe6 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -58,10 +58,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         const {request} = this.props;
-        const isPendingInRoomRequest = request.channel.roomId &&
-            !(request.ready || request.started || request.done || request.cancelled || request.observeOnly);
-        const isPendingDeviceRequest = request.channel.deviceId && request.started;
-        if (!isPendingInRoomRequest && !isPendingDeviceRequest) {
+        if (request.done || request.cancelled || request.observeOnly) {
             ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
     };
@@ -79,6 +76,7 @@ export default class VerificationRequestToast extends React.PureComponent {
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {request} = this.props;
         // no room id for to_device requests
+        const cli = MatrixClientPeg.get();
         try {
             if (request.channel.roomId) {
                 dis.dispatch({
@@ -86,23 +84,29 @@ export default class VerificationRequestToast extends React.PureComponent {
                     room_id: request.channel.roomId,
                     should_peek: false,
                 });
-                await request.accept();
-                const cli = MatrixClientPeg.get();
+            } else {
                 dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    refireParams: {
-                        verificationRequest: request,
-                        member: cli.getUser(request.otherUserId),
-                    },
+                    action: 'view_room',
+                    room_id: cli.getRooms()[0].roomId,
+                    should_peek: false,
                 });
-            } else if (request.channel.deviceId && request.verifier) {
-                // show to_device verifications in dialog still
-                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
-                Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-                    verifier: request.verifier,
-                }, null, /* priority = */ false, /* static = */ true);
             }
+            await request.accept();
+            dis.dispatch({
+                action: "set_right_panel_phase",
+                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                refireParams: {
+                    verificationRequest: request,
+                    member: cli.getUser(request.otherUserId),
+                },
+            });
+            // } else if (request.channel.deviceId && request.verifier) {
+            //     // show to_device verifications in dialog still
+            //     const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
+            //     Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
+            //         verifier: request.verifier,
+            //     }, null, /* priority = */ false, /* static = */ true);
+            // }
         } catch (err) {
             console.error(err.message);
         }

From 049a6d2064605c521e53fe91f19b3e86e4bd3976 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sun, 2 Feb 2020 10:25:05 +0100
Subject: [PATCH 0972/3235] hide toast when request is accepted

if this is a .request > .ready request, dismissing when in .ready is what we want, as that is how you accept the request
if this is a .start request, we shouldn't dismiss

so only add .ready to the phases to hide the toast, not .started
---
 src/components/views/toasts/VerificationRequestToast.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 0c5d29ebe6..a5a26f7ddb 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -58,7 +58,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         const {request} = this.props;
-        if (request.done || request.cancelled || request.observeOnly) {
+        if (request.ready || request.done || request.cancelled || request.observeOnly) {
             ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
     };

From 413a149b4713feded25cc23f912200871c456188 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sun, 2 Feb 2020 10:47:15 +0100
Subject: [PATCH 0973/3235] disable "Accept"/"Decline" buttons on verif tile
 after clicking

to avoid sending double events
---
 src/components/views/messages/MKeyVerificationRequest.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index ab02b2e5ad..9a48858bc7 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -27,6 +27,7 @@ import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
         super(props);
+        this.state = {};
     }
 
     componentDidMount() {
@@ -58,6 +59,7 @@ export default class MKeyVerificationRequest extends React.Component {
     };
 
     _onAcceptClicked = async () => {
+        this.setState({acceptOrCancelClicked: true});
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
@@ -70,6 +72,7 @@ export default class MKeyVerificationRequest extends React.Component {
     };
 
     _onRejectClicked = async () => {
+        this.setState({acceptOrCancelClicked: true});
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
@@ -135,9 +138,10 @@ export default class MKeyVerificationRequest extends React.Component {
             subtitle = (<div className="mx_cryptoEvent_subtitle">{
                 userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
             if (request.requested && !request.observeOnly) {
+                const disabled = this.state.acceptOrCancelClicked;
                 stateNode = (<div className="mx_cryptoEvent_buttons">
-                    <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
-                    <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
+                    <FormButton disabled={disabled} kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
+                    <FormButton disabled={disabled} onClick={this._onAcceptClicked} label={_t("Accept")} />
                 </div>);
             }
         } else { // request sent by us

From 577121e88d43513f66b8803257b186ca23d44f90 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sun, 2 Feb 2020 10:48:02 +0100
Subject: [PATCH 0974/3235] disable "verify by emoji" after clicking it

---
 src/components/views/right_panel/VerificationPanel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 3527747a66..f925508be6 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -62,8 +62,9 @@ export default class VerificationPanel extends React.PureComponent {
         if (pending) {
             button = <Spinner />;
         } else {
+            const disabled = this.state.emojiButtonClicked;
             button = (
-                <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
+                <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
                     {_t("Verify by emoji")}
                 </AccessibleButton>
             );
@@ -196,6 +197,7 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     _startSAS = async () => {
+        this.setState({emojiButtonClicked: true});
         const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
         try {
             await verifier.verify();

From 8fdae73e030546decf346d0f23a9c956faa456e2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 7 Feb 2020 14:55:01 +0000
Subject: [PATCH 0975/3235] Button to reset cross-signing and SSSS keys

---
 src/CrossSigningManager.js                    | 11 ++--
 .../CreateSecretStorageDialog.js              | 10 ++-
 .../ConfirmDestroyCrossSigningDialog.js       | 63 +++++++++++++++++++
 .../views/settings/CrossSigningPanel.js       | 24 ++++++-
 src/i18n/strings/en_EN.json                   |  4 ++
 5 files changed, 104 insertions(+), 8 deletions(-)
 create mode 100644 src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index a560c956f1..08ec459f26 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -116,17 +116,20 @@ export const crossSigningCallbacks = {
  * @param {Function} [func] An operation to perform once secret storage has been
  * bootstrapped. Optional.
  */
-export async function accessSecretStorage(func = async () => { }) {
+export async function accessSecretStorage(func = async () => { }, force = false) {
     const cli = MatrixClientPeg.get();
     secretStorageBeingAccessed = true;
-
     try {
-        if (!await cli.hasSecretStorageKey()) {
+        if (!await cli.hasSecretStorageKey() || force) {
+            console.warn(!force ? "!hasSecretStorageKey()" : "force");
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
                 import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"),
-                null, null, /* priority = */ false, /* static = */ true,
+                {
+                    force,
+                },
+                null, /* priority = */ false, /* static = */ true,
             );
             const [confirmed] = await finished;
             if (!confirmed) {
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 679b3907d1..c3574c0094 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -55,10 +55,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     static propTypes = {
         hasCancel: PropTypes.bool,
         accountPassword: PropTypes.string,
+        force: PropTypes.bool,
     };
 
     static defaultProps = {
         hasCancel: true,
+        force: false,
     };
 
     constructor(props) {
@@ -107,7 +109,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
         );
 
-        const phase = backupInfo ? PHASE_MIGRATE : PHASE_PASSPHRASE;
+        const { force } = this.props;
+        const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
 
         this.setState({
             phase,
@@ -219,12 +222,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         const cli = MatrixClientPeg.get();
 
+        const { force } = this.props;
+
         try {
             await cli.bootstrapSecretStorage({
+                setupNewSecretStorage: force,
                 authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                 createSecretStorageKey: async () => this._keyInfo,
                 keyBackupInfo: this.state.backupInfo,
-                setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
+                setupNewKeyBackup: force || !this.state.backupInfo && this.state.useKeyBackup,
             });
             this.setState({
                 phase: PHASE_DONE,
diff --git a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
new file mode 100644
index 0000000000..942249e07d
--- /dev/null
+++ b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
@@ -0,0 +1,63 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {_t} from "../../../languageHandler";
+import * as sdk from "../../../index";
+
+export default class ConfirmDestroyCrossSigningDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    _onConfirm = () => {
+        this.props.onFinished(true);
+    };
+
+    _onDecline = () => {
+        this.props.onFinished(false);
+    };
+
+    render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+
+        return (
+            <BaseDialog className='mx_ConfirmDestroyCrossSigningDialog' hasCancel={true}
+                        onFinished={this.props.onFinished}
+                        title={_t("Destroy cross-signing keys?")}>
+                <div className='mx_ConfirmDestroyCrossSigningDialog_content'>
+                    <p>
+                        {_t(
+                            "Deleting cross-signing keys is permanent. " +
+                            "Anyone you have verified with will see security alerts. " +
+                            "You almost certainly don't want to do this, unless " +
+                            "you've lost every device you can cross-sign from."
+                        )}
+                    </p>
+                </div>
+                <DialogButtons
+                    primaryButton={_t("Clear cross-signing keys")}
+                    onPrimaryButtonClick={this._onConfirm}
+                    primaryButtonClass="danger"
+                    cancelButton={_t("Cancel")}
+                    onCancel={this._onDecline}
+                />
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index f99968c44f..35f617b83b 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -20,6 +20,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import { accessSecretStorage } from '../../../CrossSigningManager';
+import Modal from '../../../Modal';
 
 export default class CrossSigningPanel extends React.PureComponent {
     constructor(props) {
@@ -87,10 +88,10 @@ export default class CrossSigningPanel extends React.PureComponent {
      *    cross-signing keys as needed.
      * 3. All keys are loaded and there's nothing to do.
      */
-    _bootstrapSecureSecretStorage = async () => {
+    _bootstrapSecureSecretStorage = async (force=false) => {
         this.setState({ error: null });
         try {
-            await accessSecretStorage();
+            await accessSecretStorage(() => undefined, force);
         } catch (e) {
             this.setState({ error: e });
             console.error("Error bootstrapping secret storage", e);
@@ -99,6 +100,19 @@ export default class CrossSigningPanel extends React.PureComponent {
         this._getUpdatedStatus();
     }
 
+    onDestroyStorage = (act) => {
+        if (!act) return;
+        console.log("Destroy secret storage:", act);
+        this._bootstrapSecureSecretStorage(true);
+    }
+
+    _destroySecureSecretStorage = () => {
+        const ConfirmDestoryCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
+        Modal.createDialog(ConfirmDestoryCrossSigningDialog, {
+            onFinished: this.onDestroyStorage
+        });
+    }
+
     render() {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         const {
@@ -142,6 +156,12 @@ export default class CrossSigningPanel extends React.PureComponent {
                     {_t("Bootstrap cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
+        } else {
+            bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
+                <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
+                    {_t("Torpedo cross-signing")}
+                </AccessibleButton>
+            </div>;
         }
 
         return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d125d10cfb..edb0da8780 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -553,6 +553,7 @@
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
+    "Torpedo cross-signing": "Torpedo cross-signing",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",
@@ -1430,6 +1431,9 @@
     "Changelog": "Changelog",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Removing…": "Removing…",
+    "Destroy cross-signing keys?": "Destroy cross-signing keys?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.",
+    "Clear cross-signing keys": "Clear cross-signing keys",
     "Confirm Removal": "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.": "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.",
     "Clear all data in this session?": "Clear all data in this session?",

From 1a5bed5a105f1db0bd219e52983fb03ff65ad704 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 17:16:27 +0100
Subject: [PATCH 0976/3235] open a to_device request in a modal instead of the
 right panel 1st room

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

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index a5a26f7ddb..92402c3f98 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -78,28 +78,28 @@ export default class VerificationRequestToast extends React.PureComponent {
         // no room id for to_device requests
         const cli = MatrixClientPeg.get();
         try {
+            await request.accept();
             if (request.channel.roomId) {
                 dis.dispatch({
                     action: 'view_room',
                     room_id: request.channel.roomId,
                     should_peek: false,
                 });
-            } else {
                 dis.dispatch({
-                    action: 'view_room',
-                    room_id: cli.getRooms()[0].roomId,
-                    should_peek: false,
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {
+                        verificationRequest: request,
+                        member: cli.getUser(request.otherUserId),
+                    },
                 });
-            }
-            await request.accept();
-            dis.dispatch({
-                action: "set_right_panel_phase",
-                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {
+            } else {
+                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
                     verificationRequest: request,
-                    member: cli.getUser(request.otherUserId),
-                },
-            });
+                }, null, /* priority = */ false, /* static = */ true);
+            }
+
             // } else if (request.channel.deviceId && request.verifier) {
             //     // show to_device verifications in dialog still
             //     const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");

From bdeb9cccc42a23ae8143a092a62dfffa4654d6ee Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 7 Feb 2020 15:34:45 +0000
Subject: [PATCH 0977/3235] Rename estimatedTargetDevice to targetDevice

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

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index f9fea2dc78..61177cb833 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -47,7 +47,7 @@ export default class VerificationQRCode extends React.PureComponent {
         const myUserId = cli.getUserId();
         const otherUserId = verificationRequest.otherUserId;
         const myDeviceId = cli.getDeviceId();
-        const otherDevice = verificationRequest.estimatedTargetDevice;
+        const otherDevice = verificationRequest.targetDevice;
         const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
 
         const qrProps = {

From f6abd369cafc49a1b9d8f3d33a4407bf2ec45cd3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 7 Feb 2020 15:36:57 +0000
Subject: [PATCH 0978/3235] Fix comments

---
 src/components/views/elements/crypto/VerificationQRCode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 61177cb833..1c0fdcbf44 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -34,7 +34,7 @@ export default class VerificationQRCode extends React.PureComponent {
         // User verification use case only
         secret: PropTypes.string,
         otherUserKey: PropTypes.string, // Base64 key being verified
-        otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (optional)
+        otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (or what we think it is; optional)
         requestEventId: PropTypes.string, // for DM verification only
     };
 
@@ -68,10 +68,10 @@ export default class VerificationQRCode extends React.PureComponent {
         // Populate the keys we need depending on which direction and users are involved in the verification.
         if (myUserId === otherUserId) {
             if (!otherDeviceId) {
-                // New -> Existing session QR code
+                // Existing scanning New session's QR code
                 qrProps.otherUserDeviceKey = null;
             } else {
-                // Existing -> New session QR code
+                // New scanning Existing session's QR code
                 const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
                 const device = myDevices.find(d => d.deviceId === otherDeviceId);
                 if (device) qrProps.otherUserDeviceKey = device.getFingerprint();

From ce39d1de7076b8deb0deeadedbef1519ff8918b6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 7 Feb 2020 13:25:07 +0000
Subject: [PATCH 0979/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2105 of 2105 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 8cf4f7706e..2570746fc7 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2128,5 +2128,9 @@
     "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）",
     "of ": "的 ",
     "Indexed rooms:": "已索引的聊天室：",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(crawlingRooms)s"
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(crawlingRooms)s",
+    "If you cancel now, you won't complete verifying the other user.": "如果您現在取消，您將無法完成驗證其他使用者。",
+    "If you cancel now, you won't complete verifying your other session.": "如果您現在取消，您將無法完成驗證您其他的工作階段。",
+    "If you cancel now, you won't complete your secret storage operation.": "如果您現在取消，您將無法完成驗證您的秘密儲存空間動作。",
+    "Cancel entering passphrase?": "取消輸入通關密語？"
 }

From 066faa18f19995742a36e78c4cede380867f0863 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 7 Feb 2020 10:31:36 +0000
Subject: [PATCH 0980/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2105 of 2105 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 dd6b697fb7..e3be1a1aae 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2123,5 +2123,12 @@
     "Downloading mesages for %(currentRoom)s.": "Scaricamento messaggi per %(currentRoom)s.",
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot sta tenendo in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca:",
     "of ": "di ",
-    "Message downloading sleep time(ms)": "Tempo di attesa scaricamento messaggi (ms)"
+    "Message downloading sleep time(ms)": "Tempo di attesa scaricamento messaggi (ms)",
+    "If you cancel now, you won't complete verifying the other user.": "Se adesso annulli, non completerai la verifica dell'altro utente.",
+    "If you cancel now, you won't complete verifying your other session.": "Se adesso annulli, non completerai la verifica dell'altra tua sessione.",
+    "If you cancel now, you won't complete your secret storage operation.": "Se adesso annulli, non completerai l'operazione dell'archivio segreto.",
+    "Cancel entering passphrase?": "Annullare l'inserimento della password?",
+    "Mod": "Moderatore",
+    "Indexed rooms:": "Stanze indicizzate:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s di %(totalRooms)s"
 }

From b08c5d84107b0e60b89f932c830b4767d0bc60d7 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 7 Feb 2020 15:46:31 +0000
Subject: [PATCH 0981/3235] lint

---
 src/CrossSigningManager.js                                     | 1 +
 .../views/dialogs/ConfirmDestroyCrossSigningDialog.js          | 2 +-
 src/components/views/settings/CrossSigningPanel.js             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 08ec459f26..3381f3e93b 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -115,6 +115,7 @@ export const crossSigningCallbacks = {
  *
  * @param {Function} [func] An operation to perform once secret storage has been
  * bootstrapped. Optional.
+ * @param {bool} [force] Reset secret storage even if it's already set up
  */
 export async function accessSecretStorage(func = async () => { }, force = false) {
     const cli = MatrixClientPeg.get();
diff --git a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
index 942249e07d..3242afd5f1 100644
--- a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
+++ b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
@@ -46,7 +46,7 @@ export default class ConfirmDestroyCrossSigningDialog extends React.Component {
                             "Deleting cross-signing keys is permanent. " +
                             "Anyone you have verified with will see security alerts. " +
                             "You almost certainly don't want to do this, unless " +
-                            "you've lost every device you can cross-sign from."
+                            "you've lost every device you can cross-sign from.",
                         )}
                     </p>
                 </div>
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 35f617b83b..77cae79324 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -87,6 +87,7 @@ export default class CrossSigningPanel extends React.PureComponent {
      * 2. Access existing secret storage by requesting passphrase and accessing
      *    cross-signing keys as needed.
      * 3. All keys are loaded and there's nothing to do.
+     * @param {bool} [force] Bootstrap again even if keys already present
      */
     _bootstrapSecureSecretStorage = async (force=false) => {
         this.setState({ error: null });
@@ -109,7 +110,7 @@ export default class CrossSigningPanel extends React.PureComponent {
     _destroySecureSecretStorage = () => {
         const ConfirmDestoryCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
         Modal.createDialog(ConfirmDestoryCrossSigningDialog, {
-            onFinished: this.onDestroyStorage
+            onFinished: this.onDestroyStorage,
         });
     }
 

From a260d7a1471d15b8af31dea56f220d457e5dfd1d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 7 Feb 2020 15:53:43 +0000
Subject: [PATCH 0982/3235] manual lint

---
 src/CrossSigningManager.js                                | 1 -
 .../views/dialogs/ConfirmDestroyCrossSigningDialog.js     | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 3381f3e93b..45e0a336d5 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -122,7 +122,6 @@ export async function accessSecretStorage(func = async () => { }, force = false)
     secretStorageBeingAccessed = true;
     try {
         if (!await cli.hasSecretStorageKey() || force) {
-            console.warn(!force ? "!hasSecretStorageKey()" : "force");
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
diff --git a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
index 3242afd5f1..9e1980e98d 100644
--- a/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
+++ b/src/components/views/dialogs/ConfirmDestroyCrossSigningDialog.js
@@ -37,9 +37,11 @@ export default class ConfirmDestroyCrossSigningDialog extends React.Component {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
         return (
-            <BaseDialog className='mx_ConfirmDestroyCrossSigningDialog' hasCancel={true}
-                        onFinished={this.props.onFinished}
-                        title={_t("Destroy cross-signing keys?")}>
+            <BaseDialog
+                    className='mx_ConfirmDestroyCrossSigningDialog'
+                    hasCancel={true}
+                    onFinished={this.props.onFinished}
+                    title={_t("Destroy cross-signing keys?")}>
                 <div className='mx_ConfirmDestroyCrossSigningDialog_content'>
                     <p>
                         {_t(

From e016cbeffff7c2a30e9b6169372c726f6eb7e8b3 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 17:03:10 +0100
Subject: [PATCH 0983/3235] support header image in QuestionDialog

---
 src/components/views/dialogs/QuestionDialog.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index b165bf79e2..3eec497b44 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -31,6 +31,7 @@ export default createReactClass({
         danger: PropTypes.bool,
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
+        headerImage: PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -63,6 +64,7 @@ export default createReactClass({
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
+                headerImage={this.props.headerImage}
                 hasCancel={this.props.hasCancelButton}
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>

From 5c89b41177b832e1d7e7bed28d404c8f00b6bec8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 17:03:36 +0100
Subject: [PATCH 0984/3235] make device verification go over right panel (after
 showing dialog)

dialog should be more or less as in the design
---
 src/components/views/right_panel/UserInfo.js | 68 ++++++++++++++++++--
 src/i18n/strings/en_EN.json                  |  6 +-
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index cd8952fd72..fc1f5bfcc9 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -42,6 +42,8 @@ import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -135,12 +137,66 @@ function useIsEncrypted(cli, room) {
     return isEncrypted;
 }
 
-function verifyDevice(userId, device) {
-    const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-    Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
-        userId: userId,
-        device: device,
-    }, null, /* priority = */ false, /* static = */ true);
+async function verifyDevice(userId, device) {
+    const cli = MatrixClientPeg.get();
+    const member = cli.getUser(userId);
+    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+    Modal.createTrackedDialog("Verification failed", "insecure", QuestionDialog, {
+        headerImage: require("../../../../res/img/e2e/warning.svg"),
+        title: _t("Not Trusted"),
+        description: <div>
+            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: member.displayName, userId})}</p>
+            <p>{device.getDisplayName()} ({device.deviceId})</p>
+            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+        </div>,
+        onFinished: async (doneClicked) => {
+            const manuallyVerifyClicked = !doneClicked;
+            if (!manuallyVerifyClicked) {
+                return;
+            }
+            const cli = MatrixClientPeg.get();
+            const verificationRequest = await cli.requestVerification(
+                userId,
+                [
+                    verificationMethods.SAS,
+                    SHOW_QR_CODE_METHOD,
+                    SCAN_QR_CODE_METHOD,
+                    verificationMethods.RECIPROCATE_QR_CODE,
+                ],
+                [device.deviceId],
+            );
+            dis.dispatch({
+                action: "set_right_panel_phase",
+                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                refireParams: {member, verificationRequest},
+            });
+        },
+        primaryButton: _t("Done"),
+        cancelButton: _t("Manually Verify"),
+    });
+
+    // const cli = MatrixClientPeg.get();
+    // const verificationRequest = await cli.requestVerification(
+    //     userId,
+    //     [
+    //         verificationMethods.SAS,
+    //         SHOW_QR_CODE_METHOD,
+    //         SCAN_QR_CODE_METHOD,
+    //         verificationMethods.RECIPROCATE_QR_CODE,
+    //     ],
+    //     [device.deviceId],
+    // );
+    // dis.dispatch({
+    //     action: "set_right_panel_phase",
+    //     phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+    //     refireParams: {member, verificationRequest},
+    // });
+
+    // const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+    // Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
+    //     userId: userId,
+    //     device: device,
+    // }, null, /* priority = */ false, /* static = */ true);
 }
 
 function verifyUser(user) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 83c15fc385..78a56bbffc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1166,6 +1166,11 @@
     "Yours, or the other users’ session": "Yours, or the other users’ session",
     "Members": "Members",
     "Files": "Files",
+    "Not Trusted": "Not Trusted",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
+    "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Done": "Done",
+    "Manually Verify": "Manually Verify",
     "Trusted": "Trusted",
     "Not trusted": "Not trusted",
     "%(count)s verified sessions|other": "%(count)s verified sessions",
@@ -1928,7 +1933,6 @@
     "Session verified": "Session verified",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
-    "Done": "Done",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
     "Go Back": "Go Back",
     "Failed to send email": "Failed to send email",

From 40b8db84e32a8d66a448fac620f3c4962fe4f229 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 7 Feb 2020 22:07:29 +0000
Subject: [PATCH 0985/3235] Get rid of dependence on usercontent.riot.im

---
 src/components/views/messages/MFileBody.js | 99 ++--------------------
 1 file changed, 6 insertions(+), 93 deletions(-)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 737c229afe..aee7d903aa 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -26,7 +26,7 @@ import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
 import request from 'browser-request';
 import Modal from '../../../Modal';
-import SdkConfig from "../../../SdkConfig";
+import AccessibleButton from "../elements/AccessibleButton";
 
 
 // A cached tinted copy of require("../../../../res/img/download.svg")
@@ -94,84 +94,6 @@ Tinter.registerTintable(updateTintedDownloadImage);
 // The downside of using a second domain is that it complicates hosting,
 // the downside of using a sandboxed iframe is that the browers are overly
 // restrictive in what you are allowed to do with the generated URL.
-//
-// For now given how unusable the blobs generated in sandboxed iframes are we
-// default to using a renderer hosted on "usercontent.riot.im". This is
-// overridable so that people running their own version of the client can
-// choose a different renderer.
-//
-// To that end the current version of the blob generation is the following
-// html:
-//
-//      <html><head><script>
-//      var params = window.location.search.substring(1).split('&');
-//      var lockOrigin;
-//      for (var i = 0; i < params.length; ++i) {
-//          var parts = params[i].split('=');
-//          if (parts[0] == 'origin') lockOrigin = decodeURIComponent(parts[1]);
-//      }
-//      window.onmessage=function(e){
-//          if (lockOrigin === undefined || e.origin === lockOrigin) eval("("+e.data.code+")")(e);
-//      }
-//      </script></head><body></body></html>
-//
-// This waits to receive a message event sent using the window.postMessage API.
-// When it receives the event it evals a javascript function in data.code and
-// runs the function passing the event as an argument. This version adds
-// support for a query parameter controlling the origin from which messages
-// will be processed as an extra layer of security (note that the default URL
-// is still 'v1' since it is backwards compatible).
-//
-// In particular it means that the rendering function can be written as a
-// ordinary javascript function which then is turned into a string using
-// toString().
-//
-const DEFAULT_CROSS_ORIGIN_RENDERER = "https://usercontent.riot.im/v1.html";
-
-/**
- * Render the attachment inside the iframe.
- * We can't use imported libraries here so this has to be vanilla JS.
- */
-function remoteRender(event) {
-    const data = event.data;
-
-    const img = document.createElement("img");
-    img.id = "img";
-    img.src = data.imgSrc;
-
-    const a = document.createElement("a");
-    a.id = "a";
-    a.rel = data.rel;
-    a.target = data.target;
-    a.download = data.download;
-    a.style = data.style;
-    a.style.fontFamily = "Arial, Helvetica, Sans-Serif";
-    a.href = window.URL.createObjectURL(data.blob);
-    a.appendChild(img);
-    a.appendChild(document.createTextNode(data.textContent));
-
-    const body = document.body;
-    // Don't display scrollbars if the link takes more than one line
-    // to display.
-    body.style = "margin: 0px; overflow: hidden";
-    body.appendChild(a);
-}
-
-/**
- * Update the tint inside the iframe.
- * We can't use imported libraries here so this has to be vanilla JS.
- */
-function remoteSetTint(event) {
-    const data = event.data;
-
-    const img = document.getElementById("img");
-    img.src = data.imgSrc;
-    img.style = data.imgStyle;
-
-    const a = document.getElementById("a");
-    a.style = data.style;
-}
-
 
 /**
  * Get the current CSS style for a DOMElement.
@@ -283,7 +205,6 @@ export default createReactClass({
             // will be inside the iframe so we wont be able to update
             // it directly.
             this._iframe.current.contentWindow.postMessage({
-                code: remoteSetTint.toString(),
                 imgSrc: tintedDownloadImageURL,
                 style: computedStyle(this._dummyLink.current),
             }, "*");
@@ -306,7 +227,7 @@ export default createReactClass({
                 // Wait for the user to click on the link before downloading
                 // and decrypting the attachment.
                 let decrypting = false;
-                const decrypt = () => {
+                const decrypt = (e) => {
                     if (decrypting) {
                         return false;
                     }
@@ -323,16 +244,15 @@ export default createReactClass({
                         });
                     }).finally(() => {
                         decrypting = false;
-                        return;
                     });
                 };
 
                 return (
                     <span className="mx_MFileBody">
                         <div className="mx_MFileBody_download">
-                            <a href="javascript:void(0)" onClick={decrypt}>
+                            <AccessibleButton onClick={decrypt}>
                                 { _t("Decrypt %(text)s", { text: text }) }
-                            </a>
+                            </AccessibleButton>
                         </div>
                     </span>
                 );
@@ -341,7 +261,6 @@ export default createReactClass({
             // When the iframe loads we tell it to render a download link
             const onIframeLoad = (ev) => {
                 ev.target.contentWindow.postMessage({
-                    code: remoteRender.toString(),
                     imgSrc: tintedDownloadImageURL,
                     style: computedStyle(this._dummyLink.current),
                     blob: this.state.decryptedBlob,
@@ -355,13 +274,7 @@ export default createReactClass({
                 }, "*");
             };
 
-            // If the attachment is encryped then put the link inside an iframe.
-            let renderer_url = DEFAULT_CROSS_ORIGIN_RENDERER;
-            const appConfig = SdkConfig.get();
-            if (appConfig && appConfig.cross_origin_renderer_url) {
-                renderer_url = appConfig.cross_origin_renderer_url;
-            }
-            renderer_url += "?origin=" + encodeURIComponent(window.location.origin);
+            // If the attachment is encrypted then put the link inside an iframe.
             return (
                 <span className="mx_MFileBody">
                     <div className="mx_MFileBody_download">
@@ -373,7 +286,7 @@ export default createReactClass({
                               */ }
                             <a ref={this._dummyLink} />
                         </div>
-                        <iframe src={renderer_url} onLoad={onIframeLoad} ref={this._iframe} />
+                        <iframe src="usercontent/" onLoad={onIframeLoad} ref={this._iframe} sandbox="allow-scripts allow-downloads" />
                     </div>
                 </span>
             );

From a8da4a3028d723d3084a908c8765cee052b27c58 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 8 Feb 2020 21:21:30 +0000
Subject: [PATCH 0986/3235] allow hiding of who is typing tile

---
 src/components/structures/MessagePanel.js           | 13 ++++++++++++-
 .../tabs/user/PreferencesUserSettingsTab.js         |  1 +
 src/i18n/strings/en_EN.json                         |  1 +
 src/settings/Settings.js                            |  5 +++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a13278cf68..445d9019d1 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -115,6 +115,7 @@ export default class MessagePanel extends React.Component {
             // previous positions the read marker has been in, so we can
             // display 'ghost' read markers that are animating away
             ghostReadMarkers: [],
+            showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
         };
 
         // opaque readreceipt info for each userId; used by ReadReceiptMarker
@@ -164,6 +165,9 @@ export default class MessagePanel extends React.Component {
         this._readMarkerNode = createRef();
         this._whoIsTyping = createRef();
         this._scrollPanel = createRef();
+
+        this._showTypingNotificationsWatcherRef =
+            SettingsStore.watchSetting("showTypingNotifications", this.onShowTypingNotificationsChange);
     }
 
     componentDidMount() {
@@ -172,6 +176,7 @@ export default class MessagePanel extends React.Component {
 
     componentWillUnmount() {
         this._isMounted = false;
+        SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -184,6 +189,12 @@ export default class MessagePanel extends React.Component {
         }
     }
 
+    onShowTypingNotificationsChange = () => {
+        this.setState({
+            showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
+        });
+    };
+
     /* get the DOM node representing the given event */
     getNodeForEventId(eventId) {
         if (!this.eventNodes) {
@@ -921,7 +932,7 @@ export default class MessagePanel extends React.Component {
         );
 
         let whoIsTyping;
-        if (this.props.room && !this.props.tileShape) {
+        if (this.props.room && !this.props.tileShape && this.state.showTypingNotifications) {
             whoIsTyping = (<WhoIsTypingTile
                 room={this.props.room}
                 onShown={this._onTypingShown}
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index bd1b7c2ca4..fea2e8c81f 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -32,6 +32,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
     ];
 
     static TIMELINE_SETTINGS = [
+        'showTypingNotifications',
         'autoplayGifsAndVideos',
         'urlPreviewsEnabled',
         'TextualBody.enableBigEmoji',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 83c15fc385..c084c5936f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -397,6 +397,7 @@
     "Show avatars in user and room mentions": "Show avatars in user and room mentions",
     "Enable big emoji in chat": "Enable big emoji in chat",
     "Send typing notifications": "Send typing notifications",
+    "Show typing notifications": "Show typing notifications",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b5a966523e..f6e3a2ee7f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -263,6 +263,11 @@ export const SETTINGS = {
         default: true,
         invertedSettingName: 'dontSendTypingNotifications',
     },
+    "showTypingNotifications": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Show typing notifications"),
+        default: true,
+    },
     "MessageComposerInput.autoReplaceEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Automatically replace plain text Emoji'),

From 06ba55e1a10c299b9564c66a6bb94b0784756957 Mon Sep 17 00:00:00 2001
From: unknown <rmtestard@gmail.com>
Date: Sun, 9 Feb 2020 15:05:08 +0100
Subject: [PATCH 0987/3235] I have made changes according to turt2live
 recommandations, mainly css indentation and variable definition

---
 res/css/views/rooms/_InviteOnlyIcon.scss     | 58 ++++++++++----------
 src/components/views/rooms/InviteOnlyIcon.js |  4 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index 0bc3f30c48..21ab431973 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -15,44 +15,44 @@ limitations under the License.
 */
 
 @define-mixin mx_InviteOnlyIcon {
-  width: 12px;
-  height: 12px;
-  position: relative;
-  display: block !important;
+    width: 12px;
+    height: 12px;
+    position: relative;
+    display: block !important;
 }
 
 @define-mixin mx_InviteOnlyIcon_padlock {
-  background-color: $roomtile-name-color;
-  mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
-  mask-position: center;
-  mask-repeat: no-repeat;
-  mask-size: contain;
-  content: "";
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+    background-color: $roomtile-name-color;
+    mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
+    mask-position: center;
+    mask-repeat: no-repeat;
+    mask-size: contain;
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
 }
 
 .mx_InviteOnlyIcon_large {
-  @mixin mx_InviteOnlyIcon;
-  margin: 0 4px;
+    @mixin mx_InviteOnlyIcon;
+    margin: 0 4px;
 
-  &::before {
-    @mixin mx_InviteOnlyIcon_padlock;
-    width: 12px;
-    height: 12px;
-  }
+    &::before {
+        @mixin mx_InviteOnlyIcon_padlock;
+        width: 12px;
+        height: 12px;
+    }
 }
 
 .mx_InviteOnlyIcon_small {
-  @mixin mx_InviteOnlyIcon;
-  left: -2px;
+    @mixin mx_InviteOnlyIcon;
+    left: -2px;
 
-  &::before {
-    @mixin mx_InviteOnlyIcon_padlock;
-    width: 10px;
-    height: 10px;
-  }
+    &::before {
+        @mixin mx_InviteOnlyIcon_padlock;
+        width: 10px;
+        height: 10px;
+    }
 }
\ No newline at end of file
diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
index 7ca63c8898..acaa12303b 100644
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -37,7 +37,7 @@ export default class InviteOnlyIcon extends React.Component {
     };
 
     render() {
-        const style = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
+        const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
 
         if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
             return null;
@@ -48,7 +48,7 @@ export default class InviteOnlyIcon extends React.Component {
         if (this.state.hover) {
             tooltip = <Tooltip className="mx_InviteOnlyIcon_tooltip" label={_t("Invite only")} dir="auto" />;
         }
-        return (<div className={style}
+        return (<div className={classes}
           onMouseEnter={this.onHoverStart}
           onMouseLeave={this.onHoverEnd}
         >

From 0393a57b5a571c0dfc2abafa8bab56f72a8a2fe6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 9 Feb 2020 14:49:54 +0000
Subject: [PATCH 0988/3235] fix submit button disabled breaking async task

---
 .../keybackup/_CreateKeyBackupDialog.scss     |  6 ++++++
 .../keybackup/CreateKeyBackupDialog.js        | 19 +++++++++++--------
 .../CreateSecretStorageDialog.js              | 10 ++++------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
index 04ee575867..b9babd05f5 100644
--- a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
@@ -85,3 +85,9 @@ limitations under the License.
     flex: 1;
     white-space: nowrap;
 }
+
+.mx_CreateKeyBackupDialog {
+    details .mx_AccessibleButton {
+        margin: 1em 0; // emulate paragraph spacing because we can't put this button in a paragraph due to HTML rules
+    }
+}
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 2d6a07ad2f..f89fb17448 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -24,6 +24,7 @@ import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
 import SettingsStore from '../../../../settings/SettingsStore';
+import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -191,7 +192,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseNextClick = async () => {
+    _onPassPhraseNextClick = async (e) => {
+        e.preventDefault();
+
         // If we're waiting for the timeout before updating the result at this point,
         // skip ahead and do it now, otherwise we'll deny the attempt to proceed
         // even if the user entered a valid passphrase
@@ -209,7 +212,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         }
     };
 
-    _onPassPhraseConfirmNextClick = async () => {
+    _onPassPhraseConfirmNextClick = async (e) => {
+        e.preventDefault();
+
         if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
 
         this._keyBackupInfo = await MatrixClientPeg.get().prepareKeyBackupVersion(this.state.passPhrase);
@@ -289,7 +294,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             </div>;
         }
 
-        return <form>
+        return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
                 "<b>Warning</b>: You should only set up key backup from a trusted computer.", {},
                 { b: sub => <b>{sub}</b> },
@@ -320,15 +325,14 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                primaryIsSubmit={true}
                 disabled={!this._passPhraseIsValid()}
             />
 
             <details>
                 <summary>{_t("Advanced")}</summary>
-                <p><button onClick={this._onSkipPassPhraseClick} >
+                <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
                     {_t("Set up with a recovery key")}
-                </button></p>
+                </AccessibleButton>
             </details>
         </form>;
     }
@@ -362,7 +366,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             </div>;
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <form>
+        return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
                 "Please enter your passphrase a second time to confirm.",
             )}</p>
@@ -384,7 +388,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
                 hasCancel={false}
-                primaryIsSubmit={true}
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             />
         </form>;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 12ca752421..99f91d4044 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -413,8 +413,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "as trusted for other users.",
             )}</p>
             <div>{authPrompt}</div>
-            <DialogButtons primaryButton={nextCaption}
-                primaryIsSubmit={true}
+            <DialogButtons
+                primaryButton={nextCaption}
                 hasCancel={false}
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             >
@@ -458,7 +458,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         }
 
-        return <form>
+        return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
                 "Set up encryption on this session to allow it to verify other sessions, " +
                 "granting them access to encrypted messages and marking them as trusted for other users.",
@@ -495,7 +495,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
                 disabled={!this._passPhraseIsValid()}
-                primaryIsSubmit={true}
             >
                 <button type="button"
                     onClick={this._onSkipSetupClick}
@@ -542,7 +541,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>;
         }
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <form>
+        return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
                 "Enter your passphrase a second time to confirm it.",
             )}</p>
@@ -565,7 +564,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseConfirmNextClick}
                 hasCancel={false}
-                primaryIsSubmit={true}
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             >
                 <button type="button"

From 2230e746aa41ae42b748f12d025cd19072b3ee79 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 9 Feb 2020 15:03:28 +0000
Subject: [PATCH 0989/3235] sprinkle preventDefaults on form submission
 handlers

---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 99f91d4044..f68ee32a15 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -289,7 +289,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseNextClick = async () => {
+    _onPassPhraseNextClick = async (e) => {
+        e.preventDefault();
+
         // If we're waiting for the timeout before updating the result at this point,
         // skip ahead and do it now, otherwise we'll deny the attempt to proceed
         // even if the user entered a valid passphrase
@@ -307,7 +309,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     };
 
-    _onPassPhraseConfirmNextClick = async () => {
+    _onPassPhraseConfirmNextClick = async (e) => {
+        e.preventDefault();
+
         if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
 
         const [keyInfo, encodedRecoveryKey] =

From 74af4fd764c5f13c57a11e24502a2058596033fd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 9 Feb 2020 15:07:07 +0000
Subject: [PATCH 0990/3235] disabled submit button be disabled

---
 .../secretstorage/AccessSecretStorageDialog.js     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 2d45398a3d..68ae8281c4 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -67,7 +67,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onPassPhraseNext = async () => {
+    _onPassPhraseNext = async (e) => {
+        e.preventDefault();
+
         if (this.state.passPhrase.length <= 0) return;
 
         this.setState({ keyMatches: null });
@@ -80,7 +82,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         }
     }
 
-    _onRecoveryKeyNext = async () => {
+    _onRecoveryKeyNext = async (e) => {
+        e.preventDefault();
+
         if (!this.state.recoveryKeyValid) return;
 
         this.setState({ keyMatches: null });
@@ -140,7 +144,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     "identity for verifying other sessions by entering your passphrase.",
                 )}</p>
 
-                <form className="mx_AccessSecretStorageDialog_primaryContainer">
+                <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onPassPhraseNext}>
                     <input
                         type="password"
                         className="mx_AccessSecretStorageDialog_passPhraseInput"
@@ -156,7 +160,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                         hasCancel={true}
                         onCancel={this._onCancel}
                         focus={false}
-                        primaryIsSubmit={true}
                         primaryDisabled={this.state.passPhrase.length === 0}
                     />
                 </form>
@@ -215,7 +218,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     "identity for verifying other sessions by entering your recovery key.",
                 )}</p>
 
-                <form className="mx_AccessSecretStorageDialog_primaryContainer">
+                <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onRecoveryKeyNext}>
                     <input className="mx_AccessSecretStorageDialog_recoveryKeyInput"
                         onChange={this._onRecoveryKeyChange}
                         value={this.state.recoveryKey}
@@ -228,7 +231,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                         hasCancel={true}
                         onCancel={this._onCancel}
                         focus={false}
-                        primaryIsSubmit={true}
                         primaryDisabled={!this.state.recoveryKeyValid}
                     />
                 </form>

From 91c8ad88d79df2e41916f399de4a662068a782ce Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 7 Feb 2020 20:08:53 +0000
Subject: [PATCH 0991/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2099 of 2105 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 | 179 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 170 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index eb0e8653cd..90ec9d2bc0 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -493,7 +493,7 @@
     "Search failed": "Kërkimi shtoi",
     "No more results": "Jo më tepër përfundime",
     "Room": "Dhomë",
-    "Clear filter": "Pastroje filtrin",
+    "Clear filter": "Spastroje 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",
@@ -741,8 +741,8 @@
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sndryshoi emrin e vet %(count)s herë",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sndryshuan avatarët e tyre %(count)s herë",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sndryshoi avatarin e vet %(count)s herë",
-    "Clear cache and resync": "Pastro fshehtinën dhe rinjëkohëso",
-    "Clear Storage and Sign Out": "Pastro Depon dhe Dil",
+    "Clear cache and resync": "Spastro fshehtinën dhe rinjëkohëso",
+    "Clear Storage and Sign Out": "Spastro Depon dhe Dil",
     "COPY": "KOPJOJE",
     "e.g. %(exampleValue)s": "p.sh., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "p.sh., <CurrentPageURL>",
@@ -883,7 +883,7 @@
     "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-i tani përdor 3 deri 5 herë më pak kujtesë, duke ngarkuar të dhëna mbi përdorues të tjerë vetëm kur duhen. Ju lutemi, prisni, teksa njëkohësojmë të dhënat me shërbyesin!",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Vendosni në krye të dhomës së re një lidhje për te dhoma e vjetër, që njerëzit të mund të shohin mesazhet e vjetër",
     "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.": "Nëse më herët keni përdorur një version më të freskët të Riot-it, sesioni juaj mund të jetë i papërputhshëm me këtë version. Mbylleni këtë dritare dhe kthehuni te versioni më i ri.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Pastrimi i gjërave të depozituara në shfletuesin tuaj mund ta ndreqë problemin, por kjo do të sjellë nxjerrjen tuaj nga llogari dhe do ta bëjë të palexueshëm çfarëdo historiku të fshehtëzuar të bisedës.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Spastrimi i gjërave të depozituara në shfletuesin tuaj mund ta ndreqë problemin, por kjo do të sjellë nxjerrjen tuaj nga llogari dhe do ta bëjë të palexueshëm çfarëdo historiku të fshehtëzuar të bisedës.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Nëse keni tashmë një llogari Matrix, mund <a>të bëni hyrjen</a>.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Krijoni një bashkësi që bëni tok përdorues dhe dhoma! Krijoni një faqe hyrëse vetjake, që të ravijëzoni hapësirën tuaj në universin Matrix.",
     "Sent messages will be stored until your connection has returned.": "Mesazhet e dërguar do të depozitohen deri sa lidhja juaj të jetë rikthyer.",
@@ -1047,7 +1047,7 @@
     "Custom user status messages": "Mesazhe vetjakë për gjendje përdoruesi",
     "Unable to load commit detail: %(msg)s": "S’arrihet të ngarkohen hollësi depozitimi: %(msg)s",
     "Set a new status...": "Caktoni një gjendje të re…",
-    "Clear status": "Pastroji gjendjen",
+    "Clear status": "Spastroji gjendjen",
     "Unrecognised address": "Adresë jo e pranuar",
     "User %(user_id)s may or may not exist": "Përdoruesi %(user_id)s mund të ekzistojë ose jo",
     "Waiting for %(userId)s to confirm...": "Po pritet që %(userId)s të bëjë ripohimin…",
@@ -1079,7 +1079,7 @@
     "Verified!": "U verifikua!",
     "You've successfully verified this user.": "E verifikuat me sukses këtë përdorues.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Mesazhet e sigurt me këtë përdorues fshehtëzohen skaj-më-skaj dhe të palexueshëm nga palë të treta.",
-    "Got It": "E kuptova",
+    "Got It": "E Mora Vesh",
     "Verify this user by confirming the following number appears on their screen.": "Verifikojeni këtë përdorues duke ripohuar shfaqjen e numrit vijues në skenën e tyre.",
     "Yes": "Po",
     "No": "Jo",
@@ -1443,7 +1443,7 @@
     "Try again later, or ask a room admin to check if you have access.": "Riprovoni më vonë, ose kërkojini një përgjegjësi dhome të kontrollojë nëse keni apo jo hyrje.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s erdhi teksa provohej të hyhej në dhomë. Nëse mendoni se po e shihni gabimisht këtë mesazh, ju lutemi, <issueLink>parashtroni një njoftim të mete</issueLink>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Përmirësimi i kësaj dhome do të asgjësojë instancën e tanishme të dhomës dhe do të krijojë një dhomë të përmirësuar me të njëjtin emër.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Kjo dhomë gjendet nën versionin <roomVersion /> e dhomës, të cilin shërbyesi e ka shënuar si <i>të paqëndrueshëm</i>.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Kjo dhomë gjendet nën versionin <roomVersion /> e dhomës, të cilit shërbyesi Home i ka vënë shenjë si <i>i paqëndrueshëm</i>.",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "S’u shfuqizua dot ftesa. Shërbyesi mund të jetë duke kaluar një problem të përkohshëm ose s’keni leje të mjaftueshme për të shfuqizuar ftesën.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagoi me %(shortName)s</reactedWith>",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Nëse ka kontekst shtesë që mund të ndihmonte në analizimin e problemit, b.f., ç’po bënit në atë kohë, ID dhomash, ID përdorueusish, etj, ju lutemi, përfshijini këto gjëra këtu.",
@@ -1659,7 +1659,7 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "të kontrolloni shtojcat e shfletuesit tuaj për çfarëdo që mund të bllokojë shërbyesin e identiteteve (bie fjala, Privacy Badger)",
     "contact the administrators of identity server <idserver />": "të lidheni me përgjegjësit e shërbyesit të identiteteve <idserver />",
     "wait and try again later": "të prisni dhe të riprovoni më vonë",
-    "Clear cache and reload": "Të pastroni fshehtinën dhe të ringarkoni",
+    "Clear cache and reload": "Spastro fshehtinën dhe ringarko",
     "Your email address hasn't been verified yet": "Adresa juaj email s’është verifikuar ende",
     "Click the link in the email you received to verify and then click continue again.": "Për verifkim, klikoni lidhjen te email që morët dhe mandej vazhdoni sërish.",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Ju ndan një hap nga heqja e 1 mesazhi prej %(user)s. Kjo s’mund të zhbëhet. Doni të vazhdohet?",
@@ -1961,5 +1961,166 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot-i po ruan lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi:",
     "Space used:": "Hapësirë e përdorur:",
     "Indexed messages:": "Mesazhe të indeksuar:",
-    "Number of rooms:": "Numër dhomash:"
+    "Number of rooms:": "Numër dhomash:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Në këtë dhomë ka sesione të panjohur: nëse vazhdoni pa i verifikuar ata, për dikë do të jetë e mundur të përgjojë thirrjen tuaj.",
+    "If you cancel now, you won't complete verifying the other user.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e përdoruesit tjetër.",
+    "If you cancel now, you won't complete verifying your other session.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e sesionit tuaj tjetër.",
+    "If you cancel now, you won't complete your secret storage operation.": "Nëse e anuloni tani, s’do të plotësoni veprimin tuaj për depozitë të fshehtë.",
+    "Cancel entering passphrase?": "Të anulohet dhënue frazëkalimi?",
+    "Setting up keys": "Ujdisje kyçesh",
+    "Unverified session": "Sesion i paverifikuar",
+    "Verifies a user, session, and pubkey tuple": "Verifikon një përdorues, sesion dhe një set kyçesh publikë",
+    "Unknown (user, session) pair:": "Çift (përdorues, sesion) i panjohur:",
+    "Session already verified!": "Sesion i tashmë i verifikuar!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "KUJDES: Sesion tashmë i verifikuar, por kyçet NUK PËRPUTHEN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "KUJDES: VERIFIKIMI I KYÇIT DËSHTOI! Kyçi i nënshkrimit për %(userId)s dhe sesionin %(deviceId)s është \"%(fprint)s\", që nuk përputhet me kyçin e dhënë \"%(fingerprint)s\". Kjo mund të jetë shenjë se komunikimet tuaja po përgjohen!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Kyçi i nënshkrimit që dhatë përputhet me kyçin e nënshkrimit që morët nga sesioni i %(userId)s %(deviceId)s. Sesionit iu vu shenjë si i verifikuar.",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Aktivizoni <em>cross-signing</em> për të verifikuar me bazë përdorues në vend se me bazë sesioni (në zhvillim)",
+    "Show padlocks on invite only rooms": "Për dhoma vetëm me ftesa shfaq dryna",
+    "Never send encrypted messages to unverified sessions from this session": "Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar në këtë dhomë",
+    "Keep secret storage passphrase in memory for this session": "Për këtë sesion, frazëkalimin e depozitës së fshehtë mbaje në kujtesë",
+    "How fast should messages be downloaded.": "Sa shpejt duhen shkarkuar mesazhet.",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Ripohoni që emoji-t më poshtë shfaqen në të dyja pajisjet, në të njëjtën radhë:",
+    "Verify this device by confirming the following number appears on its screen.": "Verifikojeni këtë pajisje duke ripohuar shfaqjen e numrit vijues në skenën e tij.",
+    "Waiting for %(displayName)s to verify…": "Po pritet për %(displayName)s të verifikojë…",
+    "They match": "Përputhen",
+    "They don't match": "S’përputhen",
+    "To be secure, do this in person or use a trusted way to communicate.": "Për të qenë i sigurt, bëjeni këtë duke qenë vetë i pranishëm ose përdorni për të komunikuar një rrugë të besuar.",
+    "Verify yourself & others to keep your chats safe": "Verifikoni veten & të tjerët, që t’i mbani bisedat tuaja të sigurta",
+    "This bridge was provisioned by <user />.": "Kjo urë është dhënë nga <user />.",
+    "Workspace: %(networkName)s": "Hapësirë pune: %(networkName)s",
+    "Channel: %(channelName)s": "Kanal: %(channelName)s",
+    "Show less": "Shfaq më pak",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ndryshimi i fjalëkalimit do të sjellë zerimin e çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet, duke e bërë të palexueshëm historikun e fshehtëzuar të bisedave, hiq rastin kur i eksportoni më parë kyçet tuaj të dhomës dhe i ri-importoni ata më pas. Në të ardhmen kjo do të përmirësohet.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Llogaria juaj ka një identitet <em>cross-signing</em> në depozitë të fshehtë, por s’është ende i besuar në këtë sesion.",
+    "in memory": "në kujtesë",
+    "Your homeserver does not support session management.": "Shërbyesi juaj Home nuk mbulon administrim sesionesh.",
+    "Unable to load session list": "S’arrihet të ngarkohet listë sesionesh",
+    "Delete %(count)s sessions|other": "Fshi %(count)s sesione",
+    "Delete %(count)s sessions|one": "Fshi %(count)s sesion",
+    "This session is backing up your keys. ": "Kjo sesion po bën kopjeruajtje të kyçeve tuaja. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ky sesion <b>nuk po bën kopjeruajtje të kyçeve tuaja</b>, por keni një kopjeruajtje ekzistuese që mund ta përdorni për rimarrje dhe ta shtoni më tej.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Lidheni këtë sesion kopjeruajtje kyçesh, përpara se të dilni, që të shmangni humbje të çfarëdo kyçi që mund të gjendet vetëm në këtë pajisje.",
+    "Connect this session to Key Backup": "Lidhe këtë sesion me Kopjeruajtje Kyçesh",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Kopjeruajtja ka nënshkrim nga sesion <verify>i panjohur</verify> me ID %(deviceId)s.",
+    "Backup has a <validity>valid</validity> signature from this session": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej këtij sesioni",
+    "Backup has an <validity>invalid</validity> signature from this session": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej këtij sesioni",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej sesioni të <verify>verifikuar</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej sesioni <verify>paverifikuar</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej sesioni të <verify>verifikuar</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej sesioni të <verify>paverifikuar</verify> <device></device>",
+    "Backup is not signed by any of your sessions": "Kopjeruajtja s’është nënshkruar nga ndonjë prej sesioneve tuaj",
+    "This backup is trusted because it has been restored on this session": "Kjo kopjeruajtje është e besuar, ngaqë është rikthyer në këtë sesion",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Kyçi i kopjeruajtjeve u depozitua në depozitë të fshehtë, po kjo veçori s’është e aktivizuar në këtë sesion. Ju lutemi, aktivizoni në Labs <em>cross-signing</em> që të modifikoni gjendje kopjeruatjeje kyçesh.",
+    "Your keys are <b>not being backed up from this session</b>.": "Kyçet tuaj <b>nuk po kopjeruhen nga ky sesion</b>.",
+    "Enable desktop notifications for this session": "Aktivizo njoftime desktop për këtë sesion",
+    "Enable audible notifications for this session": "Aktivizo njoftime audio për këtë sesion",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Fjalëkalimi juaj u ndryshua me sukses. Nuk do të merrni njoftime push në sesionet tuaj të tjerë, veç në hyfshi sërish në llogarinë tuaj në to",
+    "Session ID:": "ID sesioni:",
+    "Session key:": "Kyç sesioni:",
+    "Sessions": "Sesione",
+    "A session's public name is visible to people you communicate with": "Emri publik i një sesioni është i dukshëm për persona me të cilët komunikoni",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Kjo dhomë po kalon mesazhe përmes ure te platformat vijuese. <a>Mësoni më tepër.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Kjo dhomë s’kalon mesazhe përmes ure te ndonjë platformë. <a>Mësoni më tepër.</a>",
+    "Bridges": "Ura",
+    "This user has not verified all of their sessions.": "Ky përdorues s’ka verifikuar krejt sesionet e tij.",
+    "You have not verified this user.": "S’e keni verifikuar këtë përdorues.",
+    "You have verified this user. This user has verified all of their sessions.": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt sesionet e veta.",
+    "Someone is using an unknown session": "Dikush po përdor një sesion të panjohur",
+    "Some sessions for this user are not trusted": "Disa sesione për këtë përdorues s’janë të besuar",
+    "All sessions for this user are trusted": "Krejt sesionet për këtë përdorues janë të besuar",
+    "Some sessions in this encrypted room are not trusted": "Disa sesione në këtë dhomë të fshehtëzuar s’janë të besuar",
+    "All sessions in this encrypted room are trusted": "Krejt sesionet në këtë dhomë të fshehtëzuar janë të besuar",
+    "Mod": "Moderator",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Kërkesa juaj për shkëmbim kyçesh u dërgua - ju lutemi, kontrolloni sesionet tuaj të tjerë për kërkesa shkëmbimi kyçesh.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Kërkesat për ndarje kyçesh dërgohen automatikisht te sesionet tuaj të tjerë. Nëse s’e pranuat ose e hodhët tej kërkesën për ndarje kyçesh në sesionet tuaj të tjerë, klikoni këtu që të rikërkoni kyçe për këtë sesion.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Nëse sesionet tuaj të tjerë nuk kanë kyçin për këtë mesazh, s’do të jeni në gjendje ta shfshehtëzoni.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Rikërkoni kyçe fshehtëzimi</requestLink> prej sesionesh tuaj të tjerë.",
+    "Encrypted by an unverified session": "Fshehtëzuar nga një sesion i paverifikuar",
+    "Encrypted by a deleted session": "Fshehtëzuar nga një sesion i fshirë",
+    "No sessions with registered encryption keys": "S’ka sesion me kyçe fshehtëzimi të regjistruar",
+    "Waiting for %(displayName)s to accept…": "Po pritet për %(displayName)s të pranojë…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Mesazhet tuaj janë të sigurt dhe vetëm ju dhe marrësi kanë kyçet unikë për t’i shkyçur.",
+    "Your messages are not secure": "Mesazhet tuaj s’janë të sigurt",
+    "One of the following may be compromised:": "Një nga sa vijon mund të jetë komprometuar:",
+    "Your homeserver": "Shërbyesi juaj Home",
+    "The homeserver the user you’re verifying is connected to": "Shërbyesi Home te i cili është lidhur përdoruesi që po verifikoni",
+    "Yours, or the other users’ internet connection": "Lidhja internet e juaja, ose e përdoruesve të tjerë",
+    "Yours, or the other users’ session": "Sesioni juaj, ose i përdoruesve të tjerë",
+    "%(count)s sessions|other": "%(count)s sesione",
+    "%(count)s sessions|one": "%(count)s sesion",
+    "Hide sessions": "Fshih sesione",
+    "Verify by emoji": "Verifikoje përmes emoji-t",
+    "Verify by comparing unique emoji.": "Verifikoje duke krahasuar emoji unik.",
+    "Ask %(displayName)s to scan your code:": "Kërkojini %(displayName)s të skanojë kodin tuaj:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Nëse s’e skanoni dot kodin më sipër, verifikojeni duke krahasuar emoji unik.",
+    "You've successfully verified %(displayName)s!": "E verifikuat me sukses %(displayName)s!",
+    "Got it": "E mora vesh",
+    "Verification timed out. Start verification again from their profile.": "Verifikimit i mbaroi koha. Riniseni verifikimin prej profilit të tij.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s e anuloi verifikimin. Rinisni verifkimin nga profili i tij.",
+    "You cancelled verification. Start verification again from their profile.": "Anuluat verifikimin. Riniseni verifikimin nga profili i tij.",
+    "Encryption enabled": "Fshehtëzim i aktivizuar",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesazhet në këtë dhomë fshehtëzohen skaj-më-skaj. Mësoni më tepër & verifikoni këtë përdorues në profilin e tij.",
+    "Encryption not enabled": "Fshehtëzim jo i aktivizuar",
+    "The encryption used by this room isn't supported.": "Fshehtëzimi i përdorur nga kjo dhomë nuk mbulohet.",
+    "Clear all data in this session?": "Të pastrohen krejt të dhënat në këtë sesion?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Spastrimi i krejt të dhënave prej këtij sesioni është përfundimtar. Mesazhet e fshehtëzuar do të humbin, veç në qofshin kopjeruajtur kyçet e tyre.",
+    "Verify session": "Verifiko sesion",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Që të verifikohet se ky sesion mund të besohet, ju lutemi, kontrolloni se kyçi që shihni te Rregullime Përdoruesi në atë pajisje të përputhet me kyçin më poshtë:",
+    "To verify that this session 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 session matches the key below:": "Që të verifikoni se këtij sesioni mund t’i zihet besë, ju lutemi, lidhuni me të zotët e saj përmes ndonjë rruge tjetër (p.sh., personalisht, ose përmes një thirrjeje telefonike) dhe pyetini nëse përputhet apo jo kyçi që shohin te Rregullime të tyret të Përdoruesit për këtë pajisje me kyçin më poshtë:",
+    "Session name": "Emër sesioni",
+    "Session key": "Kyç sesioni",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Nëse përputhet, shtypni butonin e verifikimit më poshtë. Nëse jo, atëherë dikush tjetër po e përgjon këtë sesion dhe gjasat janë që të doni të shtypni butonin e kalimit në listë bllokimesh.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifikimi i këtij përdoruesi do t’i vërë shenjë sesionit të tij si të besuar dhe sesionit tuaj si të besuar për ta.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Që t’i vihet shenjë si e besuar, verifikojeni këtë pajisje. Besimi i kësaj pajisjeje ju jep juve dhe përdoruesve të tjerë ca qetësi më tepër, kur përdoren mesazhe të fshehtëzuar skaj-më-skaj.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifikimi i kësaj pajisjeje do të t’i vërë shenjë si të besuar dhe përdoruesit që janë verifikuar me ju do ta besojnë këtë pajisje.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Shtuat një sesion të ri '%(displayName)s', i cili po kërkon kyçe fshehtëzimi.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Sesioni juaj i paverifikuar '%(displayName)s' po kërkon kyçe fshehtëzimi.",
+    "Loading session info...": "Po ngarkohen të dhëna sesioni…",
+    "New session": "Sesion i ri",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Përdoreni këtë sesion për të verifikuar atë tuajin të ri, duke i akorduar hyrje te mesazhe të fshehtëzuar:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Nëse s’bëtë hyrjen te ky sesion, llogaria muaj mund të jetë komprometuar.",
+    "This wasn't me": "Ky s’jam unë",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Kjo do t’ju lejojë të riktheheni te llogaria juaj pasi të keni bërë daljen, dhe të hyni në sesione të tjerë.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Po kaloni në listë të bllokimesh sesione të paverifikuar; që të dërgoni mesazhe te këta sesione, duhet t’i verifikoni.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Këshillojmë të përshkoni procesin e verifikimit për çdo sesion, për t’u bindur se u takojnë të zotëve të ligjshëm, por, nëse parapëlqeni, mund ta dërgoni mesazhin pa verifikuar gjë.",
+    "Room contains unknown sessions": "Dhoma përmban sesione të panjohur",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" përmban sesione që s’i keni parë më parë.",
+    "Unknown sessions": "Sesione të panjohur",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Për verifikim sesionesh të tjerë përmes dhënies së frazëkalimit tuaj, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Për verifikim sesionesh të tjerë përmes dhënies së kyçit tuaj të rimarrjes, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
+    "Recovery key mismatch": "Mospërputhje kyçesh rimarrjeje",
+    "Incorrect recovery passphrase": "Frazëkalim rimarrjeje i pasaktë",
+    "Backup restored": "Kopjeruajtja u rikthye",
+    "Enter recovery passphrase": "Jepni frazëkalim rimarrjesh",
+    "Enter recovery key": "Jepni kyç rimarrjesh",
+    "Confirm your identity by entering your account password below.": "Ripohoni identitetin tuaj duke dhënë më poshtë fjalëkalimin e llogarisë tuaj.",
+    "Message not sent due to unknown sessions being present": "Mesazhi s’u dërgua, për shkak të pranisë së sesioneve të panjohur",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Shfaq sesione</showSessionsText>, <sendAnywayText>dërgoje sido qoftë</sendAnywayText> ose <cancelText>anuloje</cancelText>.",
+    "Your new session is now verified. Other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Përdoruesit e tjerë do të shohin si të besuar.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Pa plotësuar sigurinë në këtë sesion, s’do të ketë hyrje te mesazhe të fshehtëzuar.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Ndryshimi i fjalëkalimit tuaj do të sjellë zerim të çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet tuaj, duke e bërë të palexueshëm historikun e bisedave të fshehtëzuara. Ujdisni një Kopjeruajtje Kyçesh ose eksportoni kyçet e dhomës tuaj prej një tjetër sesioni, përpara se të ricaktoni fjalëkalimin tuaj.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jeni nxjerrë jashtë krejt sesioneve dhe nuk do të merrni më njoftime push. Që të riaktivizoni njoftimet, bëni sërish hyrjen në çdo pajisje.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Rifitoni hyrjen te llogaria juaj dhe rimerrni kyçe fshehtëzimi të depozituar në këtë sesion. Pa ta, s’do të jeni në gjendje të lexoni krejt mesazhet tuaj të siguruar në çfarëdo sesion.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Kujdes: Të dhënat tuaja personale (përfshi kyçe fshehtëzimi) janë ende të depozituara në këtë sesion. Spastrojini, nëse keni përfunduar së përdoruri këtë sesion, ose dëshironi të bëni hyrjen në një tjetër llogari.",
+    "Sender session information": "Të dhëna sesioni dërguesi",
+    "Restore your key backup to upgrade your encryption": "Që të përmirësoni fshehtëzimin tuaj, riktheni kopjeruajtjen e kyçeve tuaj",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Përmirësojeni këtë sesion për ta lejuar të verifikojë sesione të tjerë, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuar për përdorues të tjerë.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Ujdisni fshehtëzim në këtë sesion që ta lejoni të verifikojë sesione të tjerë, duke u akorduar atyre hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuar për përdorues të tjerë.",
+    "Back up my encryption keys, securing them with the same passphrase": "Kopjeruaj kyçet e mi të fshehtëzimit, duke i siguruar me të njëjtin frazëkalim",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend pak a shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh ose madje në një kasafortë.",
+    "Your recovery key": "Kyçi juaj i rimarrjeve",
+    "Copy": "Kopjoje",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Tani mund të verifikoni pajisje tuajat të tjera dhe përdorues të tjerë, për t’i mbajtur të sigurta bisedat tuaja.",
+    "Make a copy of your recovery key": "Bëni një kopje të kyçit tuaj të rimarrjeve",
+    "You're done!": "Mbaruat!",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një sesion tjetër.",
+    "Create key backup": "Krijo kopjeruajtje kyçesh",
+    "This session is encrypting history using the new recovery method.": "Ky sesion e fshehtëzon historikun duke përdorur metodë të re rimarrjesh.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ky sesion ka pikasur se frazëkalimi dhe kyçi juaj i rimarrjeve për Mesazhe të Sigurt janë hequr.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë sesion, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të sesionit me një metodë të re rimarrjesh.",
+    "Indexed rooms:": "Dhoma të indeksuara:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s nga %(totalRooms)s gjithsej",
+    "Message downloading sleep time(ms)": "Kohë fjetjeje shkarkimi mesazhi(ms)"
 }

From 7812d821fd9fb08c1dbbf7fc07bb310f273ee3d2 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 8 Feb 2020 11:56:05 +0000
Subject: [PATCH 0992/3235] Translated using Weblate (Basque)

Currently translated at 98.6% (2075 of 2105 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 | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index d5c7d7b8a8..5235eba1c8 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2075,5 +2075,27 @@
     "Copy": "Kopiatu",
     "You can now verify your other devices, and other users to keep your chats safe.": "Orain zure beste gailuak eta beste erabiltzaileak egiaztatu ditzakezu txatak seguru mantentzeko",
     "Make a copy of your recovery key": "Egin zure berreskuratze gakoaren kopia",
-    "You're done!": "Bukatu duzu!"
+    "You're done!": "Bukatu duzu!",
+    "If you cancel now, you won't complete verifying the other user.": "Orain ezeztatzen baduzu, ez duzu beste erabiltzailearen egiaztaketa burutuko.",
+    "If you cancel now, you won't complete verifying your other session.": "Orain ezeztatzen baduzu, ez duzu beste zure beste saioaren egiaztaketa burutuko.",
+    "If you cancel now, you won't complete your secret storage operation.": "Orain ezeztatzen baduzu, ez duzu zure biltegi sekretuko eragiketa burutuko.",
+    "Cancel entering passphrase?": "Ezeztatu pasa-esaldiaren sarrera?",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen.",
+    "You have verified this user. This user has verified all of their sessions.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere saio guztiak egiaztatu ditu.",
+    "Mod": "Moderatzailea",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Zure gako partekatze eskaria bidali da, egiaztatu zure beste saioak gako partekatze eskaera jaso duten.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Automatikoki bidaltzen dira gako partekatze eskaerak zure beste saioetara. Beste saioetan gako partekatze eskaera ukatu edo baztertu baduzu, sakatu hemen saio honentzat gakoak berriro eskatzeko.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Zure beste saioek ez badute mezu honen gakoa ezin izango duzu deszifratu.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Eskatu berriro zifratze gakoak</requestLink> zure beste saioei.",
+    "No sessions with registered encryption keys": "Ez dago zifratze gako hori duen saiorik",
+    "Waiting for %(displayName)s to accept…": "%(displayName)s(e)k onartu bitartean zain…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Zuon mezuak babestuta daude eta soilik zuk eta hartzaileak dituzue hauek irekitzeko giltza.",
+    "One of the following may be compromised:": "Hauetakoren bat konprometituta egon daiteke:",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Egiztatu gailu hau fidagarri gisa markatzeko. Gailu hau fidagarritzat jotzeak lasaitasuna ematen du muturretik-muturrera zifratutako mezuak erabiltzean.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Gailu hau egiaztatzean fidagarri gisa markatuko da, eta egiaztatu zaituzten erabiltzaileek fidagarri gisa ikusiko dute.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "'%(displayName)s' saio berria gehitu duzu, eta zifratze gakoak eskatzen ari da.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Zure egiaztatu gabeko '%(displayName)s' saioa zifratze gakoak eskatzen ari da.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Egiaztaketa prozesua saio bakoitzeko egitea aholkatzen dizugu, benetan jabearenak direla baieztatzeko, baina egiaztaketa egin gabe mezua bidali dezakezu ere.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure pasa-esaldia sartuz.",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Erakutsi saioak</showSessionsText>, <sendAnywayText>bidali edonola ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>."
 }

From c14f67dba8bbea5dad61b87399da7f8416d23248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Fri, 7 Feb 2020 21:28:06 +0000
Subject: [PATCH 0993/3235] Translated using Weblate (Czech)

Currently translated at 98.6% (2075 of 2105 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 97ca508e04..6978a3a5d9 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2079,5 +2079,21 @@
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Všude jsme Vás odhlásili, takže nedostáváte žádné upozornění. Můžete je znovu povolit tím, že se na všech svych zařízeních znovu přihlásíte.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené v této relaci. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit nebo se přihlašte pod jiný účet.",
-    "Sender session information": "Informace o relaci odesílatele"
+    "Sender session information": "Informace o relaci odesílatele",
+    "If you cancel now, you won't complete verifying the other user.": "Pokud teď proces zrušíte, tak nebude druhý uživatel ověřen.",
+    "If you cancel now, you won't complete verifying your other session.": "Pokud teď proces zrušíte, tak nebude druhá relace ověřena.",
+    "If you cancel now, you won't complete your secret storage operation.": "Pokud teď proces zrušíte, tak se nedokončí operace s bezpečným úložištěm.",
+    "Cancel entering passphrase?": "Zrušit zadávání hesla?",
+    "Setting up keys": "Příprava klíčů",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotu chybí nějaké komponenty, které jsou potřeba pro vyhledávání v zabezpečených místnostech. Pokud chcete s touto funkcí experimentovat, tak si pořiďte vlastní Riot Desktop s <nativeLink>přidanými komponentami</nativeLink>.",
+    "Subscribing to a ban list will cause you to join it!": "Odebíráním seznamu zablokovaných uživatelů se přidáte do jeho místnosti!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Pokud to nechcete, tak prosím použijte jiný nástroj na blokování uživatelů.",
+    "You cancelled verification. Start verification again from their profile.": "Zrušili jste verifikaci. Můžete jí začít znovu z druhého profilu.",
+    "Complete security": "Dokončení ověření",
+    "Restore your key backup to upgrade your encryption": "Pro aktualizaci šifrování obnovte klíče ze zálohy",
+    "Restore": "Obnovit",
+    "Enter your account password to confirm the upgrade:": "Potvrďte, že chcete aktualizaci provést zadáním svého uživatelského hesla:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Server si vás potřebuje ověřit, abychom mohli provést aktualizaci.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualizujte tuto přihlášenou relaci abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Zapněte v této přihlášené relaci šifrování abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit."
 }

From 444ec3356058db4486346dedbb1e72bb15074394 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Sat, 8 Feb 2020 13:30:44 +0000
Subject: [PATCH 0994/3235] Translated using Weblate (Dutch)

Currently translated at 83.7% (1762 of 2105 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 6574a09bc2..144c8c321f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1768,5 +1768,11 @@
     "Show less": "Minder tonen",
     "Show more": "Meer tonen",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest.  Dit zal verbeterd worden.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in.  Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van gebruikers die 'bot' heten op alle servers."
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in.  Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van gebruikers die 'bot' heten op alle servers.",
+    "in memory": "in het geheugen",
+    "not found": "niet gevonden",
+    "Your homeserver does not support session management.": "Uw thuisserver ondersteunt geen sessiebeheer.",
+    "Unable to load session list": "Kan sessielijst niet laden",
+    "Delete %(count)s sessions|other": "Verwijder %(count)s sessies",
+    "Delete %(count)s sessions|one": "Verwijder %(count)s sessie"
 }

From 23536a7e35709d74a6d40503a60e4b9b252091a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 8 Feb 2020 07:39:47 +0000
Subject: [PATCH 0995/3235] Translated using Weblate (French)

Currently translated at 100.0% (2105 of 2105 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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 940f850df1..9ff54d55a5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -148,7 +148,7 @@
     "Passwords can't be empty": "Le mot de passe ne peut pas être vide",
     "Permissions": "Permissions",
     "Phone": "Numéro de téléphone",
-    "Operation failed": "L'opération a échoué",
+    "Operation failed": "L’opération a échoué",
     "Default": "Par défaut",
     "Email address": "Adresse e-mail",
     "Error decrypting attachment": "Erreur lors du déchiffrement de la pièce jointe",
@@ -2130,5 +2130,8 @@
     "Cancel entering passphrase?": "Annuler la saisie de la phrase de passe ?",
     "If you cancel now, you won't complete your secret storage operation!": "Si vous annulez maintenant, vous ne terminerez pas votre opération du coffre secret !",
     "Indexed rooms:": "Salons indexés :",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s"
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s",
+    "If you cancel now, you won't complete verifying the other user.": "Si vous annuler maintenant, vous ne terminerez pas la vérification de l’autre utilisateur.",
+    "If you cancel now, you won't complete verifying your other session.": "Si vous annulez maintenant, vous ne terminerez pas la vérification de votre autre session.",
+    "If you cancel now, you won't complete your secret storage operation.": "Si vous annulez maintenant, vous ne terminerez pas votre opération sur le coffre secret."
 }

From 502c32e691d128ac0d56922d743a667607b2f948 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 7 Feb 2020 18:24:43 +0000
Subject: [PATCH 0996/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2105 of 2105 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 14ba143c10..6336a41de8 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2126,5 +2126,8 @@
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ha véletlenül tetted, beállíthatod a Biztonságos Üzeneteket ezen a munkameneten ami újra titkosítja a régi üzeneteket az visszaállítási eljárással.",
     "Indexed rooms:": "Indexált szobák:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
-    "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)"
+    "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)",
+    "If you cancel now, you won't complete verifying the other user.": "A másik felhasználó ellenőrzését nem fejezed be, ha ezt most megszakítod.",
+    "If you cancel now, you won't complete verifying your other session.": "A másik munkameneted ellenőrzését nem fejezed be, ha ezt most megszakítod.",
+    "If you cancel now, you won't complete your secret storage operation.": "A Biztonsági tárolóval kapcsolatos műveletet nem fejezed be ha ezt most megszakítod."
 }

From cc5a82686949b5db70513085ed31608703a6d5cc Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 9 Feb 2020 13:48:54 +0000
Subject: [PATCH 0997/3235] Translated using Weblate (Turkish)

Currently translated at 70.6% (1486 of 2105 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 8261d21688..391c3c8636 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1496,5 +1496,6 @@
     "Set up Secure Messages": "Güvenli Mesajları Ayarla",
     "Space used:": "Kullanılan alan:",
     "Indexed messages:": "İndekslenmiş mesajlar:",
-    "Number of rooms:": "Oda sayısı:"
+    "Number of rooms:": "Oda sayısı:",
+    "Enable inline URL previews by default": "Varsayılan olarak satır içi URL önizlemeleri aç"
 }

From 496dfc618781186a0b3d43eda687e819e9996488 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 30 Jan 2020 18:50:14 +0100
Subject: [PATCH 0998/3235] send a .request and open it in the right panel on
 new session verify

---
 .../views/dialogs/NewSessionReviewDialog.js   | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 2d2bcc8f35..58cb1d7cec 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import dis from "../../../dispatcher";
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
@@ -22,6 +23,9 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 import DeviceVerifyDialog from './DeviceVerifyDialog';
 import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
@@ -35,12 +39,27 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         this.props.onFinished(false);
     }
 
-    onContinueClick = () => {
+    onContinueClick = async () => {
         const { userId, device } = this.props;
-        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
+        const cli = MatrixClientPeg.get();
+        const request = await cli.requestVerification(
             userId,
-            device,
-        }, null, /* priority = */ false, /* static = */ true);
+            [verificationMethods.SAS],
+            [device.deviceId],
+        );
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {
+                        verificationRequest: request,
+                        member: cli.getUser(request.otherUserId),
+                    },
+                });
+
+        // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
+        //     userId,
+        //     device,
+        // }, null, /* priority = */ false, /* static = */ true);
     }
 
     render() {

From 6b85ca2fb93d46767c6dfaade17f5043ff3e367f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 16:17:49 +0100
Subject: [PATCH 0999/3235] add qr code method to new session dialog

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

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 58cb1d7cec..da12bbed62 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -26,6 +26,7 @@ import DialogButtons from '../elements/DialogButtons';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
@@ -44,7 +45,7 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         const cli = MatrixClientPeg.get();
         const request = await cli.requestVerification(
             userId,
-            [verificationMethods.SAS],
+            [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
             [device.deviceId],
         );
                 dis.dispatch({

From 5866d67c883f1c1ce7398a92fbd5482feb0b7f9f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 16:18:44 +0100
Subject: [PATCH 1000/3235] Alterations to DeviceVerifyDialog to support
 picking QR code

---
 .../views/dialogs/DeviceVerifyDialog.js       | 68 ++++++++++++---
 .../VerificationQREmojiOptions.js             | 84 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  7 +-
 3 files changed, 146 insertions(+), 13 deletions(-)
 create mode 100644 src/components/views/verification/VerificationQREmojiOptions.js

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index d78ef3ca83..0b2470c92b 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -27,16 +27,19 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {ensureDMExists} from "../../../createRoom";
 import dis from "../../../dispatcher";
 import SettingsStore from '../../../settings/SettingsStore';
+import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
 
 const MODE_LEGACY = 'legacy';
 const MODE_SAS = 'sas';
 
 const PHASE_START = 0;
 const PHASE_WAIT_FOR_PARTNER_TO_ACCEPT = 1;
-const PHASE_SHOW_SAS = 2;
-const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 3;
-const PHASE_VERIFIED = 4;
-const PHASE_CANCELLED = 5;
+const PHASE_PICK_VERIFICATION_OPTION = 2;
+const PHASE_SHOW_SAS = 3;
+const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 4;
+const PHASE_VERIFIED = 5;
+const PHASE_CANCELLED = 6;
 
 export default class DeviceVerifyDialog extends React.Component {
     static propTypes = {
@@ -49,6 +52,7 @@ export default class DeviceVerifyDialog extends React.Component {
         super();
         this._verifier = null;
         this._showSasEvent = null;
+        this._request = null;
         this.state = {
             phase: PHASE_START,
             mode: MODE_SAS,
@@ -80,6 +84,25 @@ export default class DeviceVerifyDialog extends React.Component {
         this.props.onFinished(false);
     }
 
+    _onUseSasClick = async () => {
+        try {
+            this._verifier = this._request.beginKeyVerification(verificationMethods.SAS);
+            this._verifier.on('show_sas', this._onVerifierShowSas);
+            // throws upon cancellation
+            await this._verifier.verify();
+            this.setState({phase: PHASE_VERIFIED});
+            this._verifier.removeListener('show_sas', this._onVerifierShowSas);
+            this._verifier = null;
+        } catch (e) {
+            console.log("Verification failed", e);
+            this.setState({
+                phase: PHASE_CANCELLED,
+            });
+            this._verifier = null;
+            this._request = null;
+        }
+    };
+
     _onLegacyFinished = (confirm) => {
         if (confirm) {
             MatrixClientPeg.get().setDeviceVerified(
@@ -108,11 +131,20 @@ export default class DeviceVerifyDialog extends React.Component {
                 } else {
                     this._verifier = request.verifier;
                 }
+            } else if (verifyingOwnDevice && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                this._request = await client.requestVerification(this.props.userId,[
+                    verificationMethods.SAS,
+                    SHOW_QR_CODE_METHOD,
+                ]);
+
+                await this._request.waitFor(r => r.ready || r.started);
+                this.setState({phase: PHASE_PICK_VERIFICATION_OPTION});
             } else {
                 this._verifier = client.beginKeyVerification(
                     verificationMethods.SAS, this.props.userId, this.props.device.deviceId,
                 );
             }
+            if (!this._verifier) return;
             this._verifier.on('show_sas', this._onVerifierShowSas);
             // throws upon cancellation
             await this._verifier.verify();
@@ -150,10 +182,13 @@ export default class DeviceVerifyDialog extends React.Component {
         let body;
         switch (this.state.phase) {
             case PHASE_START:
-                body = this._renderSasVerificationPhaseStart();
+                body = this._renderVerificationPhaseStart();
                 break;
             case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT:
-                body = this._renderSasVerificationPhaseWaitAccept();
+                body = this._renderVerificationPhaseWaitAccept();
+                break;
+            case PHASE_PICK_VERIFICATION_OPTION:
+                body = this._renderVerificationPhasePick();
                 break;
             case PHASE_SHOW_SAS:
                 body = this._renderSasVerificationPhaseShowSas();
@@ -162,10 +197,10 @@ export default class DeviceVerifyDialog extends React.Component {
                 body = this._renderSasVerificationPhaseWaitForPartnerToConfirm();
                 break;
             case PHASE_VERIFIED:
-                body = this._renderSasVerificationPhaseVerified();
+                body = this._renderVerificationPhaseVerified();
                 break;
             case PHASE_CANCELLED:
-                body = this._renderSasVerificationPhaseCancelled();
+                body = this._renderVerificationPhaseCancelled();
                 break;
         }
 
@@ -180,7 +215,7 @@ export default class DeviceVerifyDialog extends React.Component {
         );
     }
 
-    _renderSasVerificationPhaseStart() {
+    _renderVerificationPhaseStart() {
         const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
@@ -206,7 +241,7 @@ export default class DeviceVerifyDialog extends React.Component {
         );
     }
 
-    _renderSasVerificationPhaseWaitAccept() {
+    _renderVerificationPhaseWaitAccept() {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
 
@@ -227,6 +262,14 @@ export default class DeviceVerifyDialog extends React.Component {
         );
     }
 
+    _renderVerificationPhasePick() {
+        return <VerificationQREmojiOptions
+            request={this._request}
+            onCancel={this._onCancelClick}
+            onStartEmoji={this._onUseSasClick}
+        />;
+    }
+
     _renderSasVerificationPhaseShowSas() {
         const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
         return <VerificationShowSas
@@ -234,6 +277,7 @@ export default class DeviceVerifyDialog extends React.Component {
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
             isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
+            onStartEmoji={this._onUseSasClick}
         />;
     }
 
@@ -247,12 +291,12 @@ export default class DeviceVerifyDialog extends React.Component {
         </div>;
     }
 
-    _renderSasVerificationPhaseVerified() {
+    _renderVerificationPhaseVerified() {
         const VerificationComplete = sdk.getComponent('views.verification.VerificationComplete');
         return <VerificationComplete onDone={this._onVerifiedDoneClick} />;
     }
 
-    _renderSasVerificationPhaseCancelled() {
+    _renderVerificationPhaseCancelled() {
         const VerificationCancelled = sdk.getComponent('views.verification.VerificationCancelled');
         return <VerificationCancelled onDone={this._onCancelClick} />;
     }
diff --git a/src/components/views/verification/VerificationQREmojiOptions.js b/src/components/views/verification/VerificationQREmojiOptions.js
new file mode 100644
index 0000000000..07f3b30f50
--- /dev/null
+++ b/src/components/views/verification/VerificationQREmojiOptions.js
@@ -0,0 +1,84 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t, _td } from '../../../languageHandler';
+import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
+import AccessibleButton from "../elements/AccessibleButton";
+import DialogButtons from "../elements/DialogButtons";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
+import VerificationQRCode from "../elements/crypto/VerificationQRCode";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import Spinner from "../elements/Spinner";
+
+@replaceableComponent("views.verification.VerificationQREmojiOptions")
+export default class VerificationQREmojiOptions extends React.Component {
+    static propTypes = {
+        request: PropTypes.object.isRequired,
+        onCancel: PropTypes.func.isRequired,
+        onStartEmoji: PropTypes.func.isRequired,
+    };
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            qrProps: null,
+        };
+
+        this._prepareQrCode(props.request);
+    }
+
+    async _prepareQrCode(request: VerificationRequest) {
+        try {
+            const props = await VerificationQRCode.getPropsForRequest(request);
+            this.setState({qrProps: props});
+        } catch (e) {
+            console.error(e);
+            // We just won't show a QR code
+        }
+    }
+
+    render() {
+        let qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
+        if (this.state.qrProps) {
+            qrCode = <VerificationQRCode {...this.state.qrProps} />;
+        }
+        return (
+            <div>
+                {_t("Verify this session by completing one of the following:")}
+                <div className='mx_IncomingSasDialog_startOptions'>
+                    <div className='mx_IncomingSasDialog_startOption'>
+                        <p>{_t("Scan this unique code")}</p>
+                        {qrCode}
+                    </div>
+                    <span>{_t("or")}</span>
+                    <div className='mx_IncomingSasDialog_startOption'>
+                        <p>{_t("Compare unique emoji")}</p>
+                        <span>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
+                        <AccessibleButton onClick={this.props.onStartEmoji} kind='primary'>
+                            {_t("Start")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+                <AccessibleButton onClick={this.props.onCancel} kind='danger'>
+                    {_t("Cancel")}
+                </AccessibleButton>
+            </div>
+        );
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 83c15fc385..3bff66f258 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -451,6 +451,12 @@
     "You've successfully verified this user.": "You've successfully verified this user.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
     "Got It": "Got It",
+    "Verify this session by completing one of the following:": "Verify this session by completing one of the following:",
+    "Scan this unique code": "Scan this unique code",
+    "or": "or",
+    "Compare unique emoji": "Compare unique emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device",
+    "Start": "Start",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Confirm the emoji below are displayed on both devices, in the same order:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
     "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
@@ -1924,7 +1930,6 @@
     "Could not load user profile": "Could not load user profile",
     "Complete security": "Complete security",
     "Verify this session to grant it access to encrypted messages.": "Verify this session to grant it access to encrypted messages.",
-    "Start": "Start",
     "Session verified": "Session verified",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",

From bc5a59339b16c970f05521efb4b8c73216520078 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 11:04:49 +0000
Subject: [PATCH 1001/3235] Send NewSessionReviewDialog through dialogs

---
 .../views/dialogs/NewSessionReviewDialog.js   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index da12bbed62..3979855503 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,24 +43,24 @@ export default class NewSessionReviewDialog extends React.PureComponent {
     onContinueClick = async () => {
         const { userId, device } = this.props;
         const cli = MatrixClientPeg.get();
-        const request = await cli.requestVerification(
-            userId,
-            [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
-            [device.deviceId],
-        );
-                dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    refireParams: {
-                        verificationRequest: request,
-                        member: cli.getUser(request.otherUserId),
-                    },
-                });
-
-        // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
+        // const request = await cli.requestVerification(
         //     userId,
-        //     device,
-        // }, null, /* priority = */ false, /* static = */ true);
+        //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
+        //     [device.deviceId],
+        // );
+        //         dis.dispatch({
+        //             action: "set_right_panel_phase",
+        //             phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        //             refireParams: {
+        //                 verificationRequest: request,
+        //                 member: cli.getUser(request.otherUserId),
+        //             },
+        //         });
+
+        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
+            userId,
+            device,
+        }, null, /* priority = */ false, /* static = */ true);
     }
 
     render() {

From 3d91ff23ec88a87c0607c67d5eb87949cb6d6eb1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 12:20:48 +0100
Subject: [PATCH 1002/3235] cram the EncryptionPanel in CompleteSecurity
 instead of IncomingSasDialog

so we get QR code support and support phases prior to STARTED
---
 src/components/structures/auth/CompleteSecurity.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 2126590736..18000be68e 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -138,9 +138,11 @@ export default class CompleteSecurity extends React.Component {
         let body;
 
         if (this.state.verificationRequest) {
-            const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
-            body = <IncomingSasDialog verifier={this.state.verificationRequest.verifier}
-                onFinished={this.props.onFinished}
+            const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
+            body = <EncryptionPanel
+                verificationRequest={this.state.verificationRequest}
+                onClose={this.props.onFinished}
+                member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;

From 747a4866e2a42db83b8751fbd7bc139cfcab2051 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 12:21:49 +0100
Subject: [PATCH 1003/3235] indenting

---
 .../views/dialogs/NewSessionReviewDialog.js   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 3979855503..41b881a1f2 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,7 +43,20 @@ export default class NewSessionReviewDialog extends React.PureComponent {
     onContinueClick = async () => {
         const { userId, device } = this.props;
         const cli = MatrixClientPeg.get();
-        // const request = await cli.requestVerification(
+        const request = await cli.requestVerification(
+            userId,
+            [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
+            [device.deviceId],
+        );
+        dis.dispatch({
+            action: "set_right_panel_phase",
+            phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+            refireParams: {
+                verificationRequest: request,
+                member: cli.getUser(request.otherUserId),
+            },
+        });
+        // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
         //     userId,
         //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
         //     [device.deviceId],
@@ -56,11 +69,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         //                 member: cli.getUser(request.otherUserId),
         //             },
         //         });
-
-        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
-            userId,
-            device,
-        }, null, /* priority = */ false, /* static = */ true);
     }
 
     render() {

From 469d53396469ed0125388a5a7cfa3b7720009fe2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 11:48:49 +0000
Subject: [PATCH 1004/3235] Apply some CSS

---
 res/css/_components.scss                      |  1 +
 .../_VerificationQREmojiOptions.scss          | 71 +++++++++++++++++++
 .../VerificationQREmojiOptions.js             |  4 +-
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 res/css/views/verification/_VerificationQREmojiOptions.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index bc636eb3c6..ad6bbdc486 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -206,6 +206,7 @@
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
+@import "./views/verification/_VerificationQREmojiOptions.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_IncomingCallbox.scss";
diff --git a/res/css/views/verification/_VerificationQREmojiOptions.scss b/res/css/views/verification/_VerificationQREmojiOptions.scss
new file mode 100644
index 0000000000..6c9b527ba9
--- /dev/null
+++ b/res/css/views/verification/_VerificationQREmojiOptions.scss
@@ -0,0 +1,71 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_IncomingSasDialog_startOptions {
+    display: flex;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    align-items: stretch;
+
+    > .mx_IncomingSasDialog_betweenText {
+        width: 50px;
+        vertical-align: middle;
+        text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .mx_IncomingSasDialog_startOption {
+        background-color: $user-tile-hover-bg-color;
+        border-radius: 10px;
+        flex: 1;
+        display: flex;
+        padding: 10px;
+        align-items: center;
+        flex-direction: column;
+        position: relative;
+
+        canvas, .mx_VerificationQREmojiOptions_noQR {
+            width: 220px !important;
+            height: 220px !important;
+            background-color: #fff;
+            border-radius: 4px;
+            vertical-align: middle;
+            text-align: center;
+            padding: 10px;
+        }
+
+        > p {
+            font-weight: 700;
+        }
+
+        .mx_IncomingSasDialog_helpText {
+            font-size: 14px;
+            margin-top: 71px;
+            text-align: center;
+        }
+
+        .mx_AccessibleButton {
+            position: absolute;
+            bottom: 30px;
+        }
+    }
+}
+
+//mx_IncomingSasDialog_startOptions
+//mx_IncomingSasDialog_startOption > canvas
+//mx_VerificationQREmojiOptions_noQR
diff --git a/src/components/views/verification/VerificationQREmojiOptions.js b/src/components/views/verification/VerificationQREmojiOptions.js
index 07f3b30f50..770b8a44a4 100644
--- a/src/components/views/verification/VerificationQREmojiOptions.js
+++ b/src/components/views/verification/VerificationQREmojiOptions.js
@@ -66,10 +66,10 @@ export default class VerificationQREmojiOptions extends React.Component {
                         <p>{_t("Scan this unique code")}</p>
                         {qrCode}
                     </div>
-                    <span>{_t("or")}</span>
+                    <div className='mx_IncomingSasDialog_betweenText'>{_t("or")}</div>
                     <div className='mx_IncomingSasDialog_startOption'>
                         <p>{_t("Compare unique emoji")}</p>
-                        <span>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
+                        <span className='mx_IncomingSasDialog_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
                         <AccessibleButton onClick={this.props.onStartEmoji} kind='primary'>
                             {_t("Start")}
                         </AccessibleButton>

From b210c9cb769c63f69a9a43008e9489954b1dd3d1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 12:21:57 +0100
Subject: [PATCH 1005/3235] close dialog after clicking continue

---
 src/components/views/dialogs/NewSessionReviewDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 41b881a1f2..c8e3992384 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -56,6 +56,7 @@ export default class NewSessionReviewDialog extends React.PureComponent {
                 member: cli.getUser(request.otherUserId),
             },
         });
+        this.props.onFinished(true);
         // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
         //     userId,
         //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],

From f368339b78824e5b23ad99bb1d0b9acbee1ae864 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 14:01:32 +0100
Subject: [PATCH 1006/3235] cram EncryptionPanel into a Dialog when clicking
 from new session dialog

---
 .../views/dialogs/DeviceVerifyOwnDialog.js    | 36 +++++++++++++++++++
 .../views/dialogs/NewSessionReviewDialog.js   | 22 +++---------
 2 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 src/components/views/dialogs/DeviceVerifyOwnDialog.js

diff --git a/src/components/views/dialogs/DeviceVerifyOwnDialog.js b/src/components/views/dialogs/DeviceVerifyOwnDialog.js
new file mode 100644
index 0000000000..ca562062a8
--- /dev/null
+++ b/src/components/views/dialogs/DeviceVerifyOwnDialog.js
@@ -0,0 +1,36 @@
+/*
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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 {MatrixClientPeg} from '../../../MatrixClientPeg';
+import * as sdk from '../../../index';
+
+export default class DeviceVerifyOwnDialog extends React.Component {
+    static propTypes = {
+        verificationRequest: PropTypes.object.isRequired,
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    render() {
+        const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
+        return <EncryptionPanel
+            verificationRequest={this.props.verificationRequest}
+            onClose={this.props.onFinished}
+            member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
+        />;
+    }
+}
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index c8e3992384..6d074d7045 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from "../../../dispatcher";
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
-import DeviceVerifyDialog from './DeviceVerifyDialog';
+import DeviceVerifyOwnDialog from './DeviceVerifyOwnDialog';
 import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
@@ -48,28 +47,17 @@ export default class NewSessionReviewDialog extends React.PureComponent {
             [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
             [device.deviceId],
         );
-        dis.dispatch({
-            action: "set_right_panel_phase",
-            phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-            refireParams: {
-                verificationRequest: request,
-                member: cli.getUser(request.otherUserId),
-            },
+
+        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyOwnDialog, {
+            verificationRequest: request,
         });
+
         this.props.onFinished(true);
         // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
         //     userId,
         //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
         //     [device.deviceId],
         // );
-        //         dis.dispatch({
-        //             action: "set_right_panel_phase",
-        //             phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-        //             refireParams: {
-        //                 verificationRequest: request,
-        //                 member: cli.getUser(request.otherUserId),
-        //             },
-        //         });
     }
 
     render() {

From ee23bfe625476b2be9d2f956211f0fc8f223c371 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 14:42:02 +0100
Subject: [PATCH 1007/3235] need to close the current dialog before opening a
 new modal

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

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 6d074d7045..cab30c4d14 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -48,11 +48,12 @@ export default class NewSessionReviewDialog extends React.PureComponent {
             [device.deviceId],
         );
 
+        this.props.onFinished(true);
+
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyOwnDialog, {
             verificationRequest: request,
         });
 
-        this.props.onFinished(true);
         // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
         //     userId,
         //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],

From ea4d97fa73b17a1ebe6dfda4acfbf760da089341 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 15:04:44 +0000
Subject: [PATCH 1008/3235] Hack in a layout option

---
 .../structures/auth/CompleteSecurity.js       |  1 +
 .../views/dialogs/DeviceVerifyOwnDialog.js    |  1 +
 .../views/right_panel/EncryptionPanel.js      |  4 ++-
 .../views/right_panel/VerificationPanel.js    | 29 +++++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 18000be68e..1443db0613 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -140,6 +140,7 @@ export default class CompleteSecurity extends React.Component {
         if (this.state.verificationRequest) {
             const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
             body = <EncryptionPanel
+                layout="dialog"
                 verificationRequest={this.state.verificationRequest}
                 onClose={this.props.onFinished}
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
diff --git a/src/components/views/dialogs/DeviceVerifyOwnDialog.js b/src/components/views/dialogs/DeviceVerifyOwnDialog.js
index ca562062a8..4a75cc16ec 100644
--- a/src/components/views/dialogs/DeviceVerifyOwnDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyOwnDialog.js
@@ -28,6 +28,7 @@ export default class DeviceVerifyOwnDialog extends React.Component {
     render() {
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
         return <EncryptionPanel
+            layout="dialog"
             verificationRequest={this.props.verificationRequest}
             onClose={this.props.onFinished}
             member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2b3196f4c1..2e9365fca3 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -30,7 +30,7 @@ import {_t} from "../../../languageHandler";
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
-const EncryptionPanel = ({verificationRequest, member, onClose}) => {
+const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     const [request, setRequest] = useState(verificationRequest);
     useEffect(() => {
         setRequest(verificationRequest);
@@ -77,6 +77,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose}) => {
     } else {
         return (
             <VerificationPanel
+                layout={layout}
                 onClose={onClose}
                 member={member}
                 request={request}
@@ -89,6 +90,7 @@ EncryptionPanel.propTypes = {
     member: PropTypes.object.isRequired,
     onClose: PropTypes.func.isRequired,
     verificationRequest: PropTypes.object,
+    layout: PropTypes.string,
 };
 
 export default EncryptionPanel;
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index ad1aaf598c..b007b6b54c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -31,9 +31,11 @@ import {
     PHASE_CANCELLED, VerificationRequest,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
+import AccessibleButton from "../elements/AccessibleButton";
 
 export default class VerificationPanel extends React.PureComponent {
     static propTypes = {
+        layout: PropTypes.string,
         request: PropTypes.object.isRequired,
         member: PropTypes.object.isRequired,
         phase: PropTypes.oneOf([
@@ -69,6 +71,33 @@ export default class VerificationPanel extends React.PureComponent {
         const {member} = this.props;
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
+        if (this.props.layout === 'dialog') {
+            // HACK: This is a terrible idea.
+            let qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
+            if (this.state.qrCodeProps) {
+                qrCode = <VerificationQRCode {...this.state.qrCodeProps} />;
+            }
+            return (
+                <div>
+                    {_t("Verify this session by completing one of the following:")}
+                    <div className='mx_IncomingSasDialog_startOptions'>
+                        <div className='mx_IncomingSasDialog_startOption'>
+                            <p>{_t("Scan this unique code")}</p>
+                            {qrCode}
+                        </div>
+                        <div className='mx_IncomingSasDialog_betweenText'>{_t("or")}</div>
+                        <div className='mx_IncomingSasDialog_startOption'>
+                            <p>{_t("Compare unique emoji")}</p>
+                            <span className='mx_IncomingSasDialog_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
+                            <AccessibleButton onClick={this._startSAS} kind='primary'>
+                                {_t("Start")}
+                            </AccessibleButton>
+                        </div>
+                    </div>
+                </div>
+            );
+        }
+
         let button;
         if (pending) {
             button = <Spinner />;

From 39fab02fcc64b285092f2fcae73957d120523131 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 17:15:52 +0100
Subject: [PATCH 1009/3235] rename DeviceVerifyOwnDialog to
 VerificationRequestDialog

as it works (and we want to use it) for any verification request,
not just between two devices of the same user
---
 src/components/views/dialogs/NewSessionReviewDialog.js        | 4 ++--
 ...{DeviceVerifyOwnDialog.js => VerificationRequestDialog.js} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/components/views/dialogs/{DeviceVerifyOwnDialog.js => VerificationRequestDialog.js} (94%)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index cab30c4d14..48c15ab06a 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
-import DeviceVerifyOwnDialog from './DeviceVerifyOwnDialog';
+import VerificationRequestDialog from './VerificationRequestDialog';
 import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
@@ -50,7 +50,7 @@ export default class NewSessionReviewDialog extends React.PureComponent {
 
         this.props.onFinished(true);
 
-        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyOwnDialog, {
+        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
             verificationRequest: request,
         });
 
diff --git a/src/components/views/dialogs/DeviceVerifyOwnDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
similarity index 94%
rename from src/components/views/dialogs/DeviceVerifyOwnDialog.js
rename to src/components/views/dialogs/VerificationRequestDialog.js
index 4a75cc16ec..f47d76ab94 100644
--- a/src/components/views/dialogs/DeviceVerifyOwnDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 
-export default class DeviceVerifyOwnDialog extends React.Component {
+export default class VerificationRequestDialog extends React.Component {
     static propTypes = {
         verificationRequest: PropTypes.object.isRequired,
         onFinished: PropTypes.func.isRequired,

From d9b7b28e5ab6a477ed6b370f137cdfad73855168 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 17:45:48 +0100
Subject: [PATCH 1010/3235] add css hacks to make EncryptionPanel look ok in
 Dialog

for the sas and verified phase
---
 .../_VerificationQREmojiOptions.scss          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/res/css/views/verification/_VerificationQREmojiOptions.scss b/res/css/views/verification/_VerificationQREmojiOptions.scss
index 6c9b527ba9..ceaece8853 100644
--- a/res/css/views/verification/_VerificationQREmojiOptions.scss
+++ b/res/css/views/verification/_VerificationQREmojiOptions.scss
@@ -66,6 +66,26 @@ limitations under the License.
     }
 }
 
+// Special case styling for EncryptionPanel in a Modal dialog
+.mx_Dialog {
+    // fixed with for when showing sas and once verified.
+    .mx_VerificationShowSas, .mx_VerificationPanel_verified_section {
+        width: 500px;
+    }
+
+    // EncryptionPanel when verification is done
+    .mx_VerificationPanel_verified_section {
+        // center the big shield icon
+        .mx_E2EIcon {
+            margin: 0 auto;
+        }
+        // right align the "Got it" button
+        .mx_AccessibleButton {
+            float: right;
+        }
+    }
+}
+
 //mx_IncomingSasDialog_startOptions
 //mx_IncomingSasDialog_startOption > canvas
 //mx_VerificationQREmojiOptions_noQR

From a865cfb01362f550b62e10fb227bdc789d68e18c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sat, 1 Feb 2020 18:25:01 +0100
Subject: [PATCH 1011/3235] put encryption in a proper dialog with close button

---
 .../_VerificationQREmojiOptions.scss          |  5 -----
 .../dialogs/VerificationRequestDialog.js      | 20 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/res/css/views/verification/_VerificationQREmojiOptions.scss b/res/css/views/verification/_VerificationQREmojiOptions.scss
index ceaece8853..1f488cc758 100644
--- a/res/css/views/verification/_VerificationQREmojiOptions.scss
+++ b/res/css/views/verification/_VerificationQREmojiOptions.scss
@@ -68,11 +68,6 @@ limitations under the License.
 
 // Special case styling for EncryptionPanel in a Modal dialog
 .mx_Dialog {
-    // fixed with for when showing sas and once verified.
-    .mx_VerificationShowSas, .mx_VerificationPanel_verified_section {
-        width: 500px;
-    }
-
     // EncryptionPanel when verification is done
     .mx_VerificationPanel_verified_section {
         // center the big shield icon
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index f47d76ab94..baed79bd58 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 export default class VerificationRequestDialog extends React.Component {
     static propTypes = {
@@ -26,12 +27,19 @@ export default class VerificationRequestDialog extends React.Component {
     };
 
     render() {
+        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
-        return <EncryptionPanel
-            layout="dialog"
-            verificationRequest={this.props.verificationRequest}
-            onClose={this.props.onFinished}
-            member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
-        />;
+        return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
+                contentId="mx_Dialog_content"
+                title={_t("Verification Request")}
+                hasCancel={true}
+            >
+            <EncryptionPanel
+                layout="dialog"
+                verificationRequest={this.props.verificationRequest}
+                onClose={this.props.onFinished}
+                member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
+            />
+        </BaseDialog>;
     }
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3bff66f258..18df6dc70f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1644,6 +1644,7 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
+    "Verification Request": "Verification Request",
     "A widget would like to verify your identity": "A widget would like to verify your identity",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
     "Remember my selection for this widget": "Remember my selection for this widget",
@@ -1855,7 +1856,6 @@
     "Review terms and conditions": "Review terms and conditions",
     "Old cryptography data detected": "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.": "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.",
-    "Verification Request": "Verification Request",
     "Logout": "Logout",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
     "Your Communities": "Your Communities",

From 8c3004c2ac3e6eb745b996efedf3002d1ca46d33 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 12:20:11 +0100
Subject: [PATCH 1012/3235] to_device requests now can include .request so we
 might need send .ready

---
 src/components/structures/auth/CompleteSecurity.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 1443db0613..6bf3e7f07c 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -83,12 +83,13 @@ export default class CompleteSecurity extends React.Component {
         }
     }
 
-    onVerificationRequest = (request) => {
+    onVerificationRequest = async (request) => {
         if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
 
         if (this.state.verificationRequest) {
             this.state.verificationRequest.off("change", this.onVerificationRequestChange);
         }
+        await request.accept();
         request.on("change", this.onVerificationRequestChange);
         this.setState({
             verificationRequest: request,

From 9059f00b29570ce3f730458607ff679d036373a9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 14:20:54 +0100
Subject: [PATCH 1013/3235] move css to correct file

Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
---
 res/css/_components.scss                      |  1 -
 .../views/right_panel/_VerificationPanel.scss | 68 +++++++++++++++
 .../_VerificationQREmojiOptions.scss          | 86 -------------------
 .../views/right_panel/VerificationPanel.js    | 12 +--
 4 files changed, 74 insertions(+), 93 deletions(-)
 delete mode 100644 res/css/views/verification/_VerificationQREmojiOptions.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index ad6bbdc486..bc636eb3c6 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -206,7 +206,6 @@
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
-@import "./views/verification/_VerificationQREmojiOptions.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_IncomingCallbox.scss";
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 827f2a2c49..8473b860db 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -36,4 +36,72 @@ limitations under the License.
             max-width: 240px;
         }
     }
+
+}
+
+// Special case styling for EncryptionPanel in a Modal dialog
+.mx_Dialog, .mx_CompleteSecurity_body {
+    .mx_VerificationPanel_QRPhase_startOptions {
+        display: flex;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        align-items: stretch;
+
+        > .mx_VerificationPanel_QRPhase_betweenText {
+            width: 50px;
+            vertical-align: middle;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .mx_VerificationPanel_QRPhase_startOption {
+            background-color: $user-tile-hover-bg-color;
+            border-radius: 10px;
+            flex: 1;
+            display: flex;
+            padding: 10px;
+            align-items: center;
+            flex-direction: column;
+            position: relative;
+
+            canvas, .mx_VerificationPanel_QRPhase_noQR {
+                width: 220px !important;
+                height: 220px !important;
+                background-color: #fff;
+                border-radius: 4px;
+                vertical-align: middle;
+                text-align: center;
+                padding: 10px;
+            }
+
+            > p {
+                font-weight: 700;
+            }
+
+            .mx_VerificationPanel_QRPhase_helpText {
+                font-size: 14px;
+                margin-top: 71px;
+                text-align: center;
+            }
+
+            .mx_AccessibleButton {
+                position: absolute;
+                bottom: 30px;
+            }
+        }
+    }
+
+    // EncryptionPanel when verification is done
+    .mx_VerificationPanel_verified_section {
+        // center the big shield icon
+        .mx_E2EIcon {
+            margin: 0 auto;
+        }
+        // right align the "Got it" button
+        .mx_AccessibleButton {
+            float: right;
+        }
+    }
 }
diff --git a/res/css/views/verification/_VerificationQREmojiOptions.scss b/res/css/views/verification/_VerificationQREmojiOptions.scss
deleted file mode 100644
index 1f488cc758..0000000000
--- a/res/css/views/verification/_VerificationQREmojiOptions.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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_IncomingSasDialog_startOptions {
-    display: flex;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    align-items: stretch;
-
-    > .mx_IncomingSasDialog_betweenText {
-        width: 50px;
-        vertical-align: middle;
-        text-align: center;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-
-    .mx_IncomingSasDialog_startOption {
-        background-color: $user-tile-hover-bg-color;
-        border-radius: 10px;
-        flex: 1;
-        display: flex;
-        padding: 10px;
-        align-items: center;
-        flex-direction: column;
-        position: relative;
-
-        canvas, .mx_VerificationQREmojiOptions_noQR {
-            width: 220px !important;
-            height: 220px !important;
-            background-color: #fff;
-            border-radius: 4px;
-            vertical-align: middle;
-            text-align: center;
-            padding: 10px;
-        }
-
-        > p {
-            font-weight: 700;
-        }
-
-        .mx_IncomingSasDialog_helpText {
-            font-size: 14px;
-            margin-top: 71px;
-            text-align: center;
-        }
-
-        .mx_AccessibleButton {
-            position: absolute;
-            bottom: 30px;
-        }
-    }
-}
-
-// Special case styling for EncryptionPanel in a Modal dialog
-.mx_Dialog {
-    // EncryptionPanel when verification is done
-    .mx_VerificationPanel_verified_section {
-        // center the big shield icon
-        .mx_E2EIcon {
-            margin: 0 auto;
-        }
-        // right align the "Got it" button
-        .mx_AccessibleButton {
-            float: right;
-        }
-    }
-}
-
-//mx_IncomingSasDialog_startOptions
-//mx_IncomingSasDialog_startOption > canvas
-//mx_VerificationQREmojiOptions_noQR
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index b007b6b54c..08b90f9114 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -73,22 +73,22 @@ export default class VerificationPanel extends React.PureComponent {
 
         if (this.props.layout === 'dialog') {
             // HACK: This is a terrible idea.
-            let qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
+            let qrCode = <div className='mx_VerificationPanel_QRPhase_noQR'><Spinner /></div>;
             if (this.state.qrCodeProps) {
                 qrCode = <VerificationQRCode {...this.state.qrCodeProps} />;
             }
             return (
                 <div>
                     {_t("Verify this session by completing one of the following:")}
-                    <div className='mx_IncomingSasDialog_startOptions'>
-                        <div className='mx_IncomingSasDialog_startOption'>
+                    <div className='mx_VerificationPanel_QRPhase_startOptions'>
+                        <div className='mx_VerificationPanel_QRPhase_startOption'>
                             <p>{_t("Scan this unique code")}</p>
                             {qrCode}
                         </div>
-                        <div className='mx_IncomingSasDialog_betweenText'>{_t("or")}</div>
-                        <div className='mx_IncomingSasDialog_startOption'>
+                        <div className='mx_VerificationPanel_QRPhase_betweenText'>{_t("or")}</div>
+                        <div className='mx_VerificationPanel_QRPhase_startOption'>
                             <p>{_t("Compare unique emoji")}</p>
-                            <span className='mx_IncomingSasDialog_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
+                            <span className='mx_VerificationPanel_QRPhase_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
                             <AccessibleButton onClick={this._startSAS} kind='primary'>
                                 {_t("Start")}
                             </AccessibleButton>

From 2a8453b9397b241daa62e0dd1124496496ed2b6f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 14:44:20 +0100
Subject: [PATCH 1014/3235] i18n fixes

---
 src/components/views/right_panel/VerificationPanel.js | 7 +++----
 src/i18n/strings/en_EN.json                           | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 08b90f9114..94051686bd 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -111,9 +111,8 @@ export default class VerificationPanel extends React.PureComponent {
 
         if (!this.state.qrCodeProps) {
             return <div className="mx_UserInfo_container">
-                <h3>Verify by emoji</h3>
+                <h3>{_t("Verify by emoji")}</h3>
                 <p>{_t("Verify by comparing unique emoji.")}</p>
-
                 { button }
             </div>;
         }
@@ -121,7 +120,7 @@ export default class VerificationPanel extends React.PureComponent {
         // TODO: add way to open camera to scan a QR code
         return <React.Fragment>
             <div className="mx_UserInfo_container">
-                <h3>Verify by scanning</h3>
+                <h3>{_t("Verify by scanning")}</h3>
                 <p>{_t("Ask %(displayName)s to scan your code:", {
                     displayName: member.displayName || member.name || member.userId,
                 })}</p>
@@ -132,7 +131,7 @@ export default class VerificationPanel extends React.PureComponent {
             </div>
 
             <div className="mx_UserInfo_container">
-                <h3>Verify by emoji</h3>
+                <h3>{_t("Verify by emoji")}</h3>
                 <p>{_t("If you can't scan the code above, verify by comparing unique emoji.")}</p>
 
                 { button }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 18df6dc70f..97e2a7cb5b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1192,6 +1192,7 @@
     "Security": "Security",
     "Verify by emoji": "Verify by emoji",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
+    "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",

From a693af0c6b2ac24798c8fdadc7f8304ccbaf2f5e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 14:48:10 +0100
Subject: [PATCH 1015/3235] fix lint

---
 src/components/views/dialogs/DeviceVerifyDialog.js            | 2 +-
 src/components/views/dialogs/NewSessionReviewDialog.js        | 1 -
 src/components/views/right_panel/VerificationPanel.js         | 1 -
 .../views/verification/VerificationQREmojiOptions.js          | 4 +---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 0b2470c92b..7187aa4d28 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -132,7 +132,7 @@ export default class DeviceVerifyDialog extends React.Component {
                     this._verifier = request.verifier;
                 }
             } else if (verifyingOwnDevice && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-                this._request = await client.requestVerification(this.props.userId,[
+                this._request = await client.requestVerification(this.props.userId, [
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
                 ]);
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 48c15ab06a..2a7281c60e 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -24,7 +24,6 @@ import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 94051686bd..9ec556f4bf 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -31,7 +31,6 @@ import {
     PHASE_CANCELLED, VerificationRequest,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
-import AccessibleButton from "../elements/AccessibleButton";
 
 export default class VerificationPanel extends React.PureComponent {
     static propTypes = {
diff --git a/src/components/views/verification/VerificationQREmojiOptions.js b/src/components/views/verification/VerificationQREmojiOptions.js
index 770b8a44a4..d72c6951fe 100644
--- a/src/components/views/verification/VerificationQREmojiOptions.js
+++ b/src/components/views/verification/VerificationQREmojiOptions.js
@@ -16,10 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { _t, _td } from '../../../languageHandler';
-import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
+import { _t } from '../../../languageHandler';
 import AccessibleButton from "../elements/AccessibleButton";
-import DialogButtons from "../elements/DialogButtons";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
 import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";

From 0e0b0e8d09de7ac6a1382e8d50a384387a08bea4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 15:30:16 +0100
Subject: [PATCH 1016/3235] fix css lint

---
 res/css/views/right_panel/_VerificationPanel.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 8473b860db..2a733d11a7 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -36,7 +36,6 @@ limitations under the License.
             max-width: 240px;
         }
     }
-
 }
 
 // Special case styling for EncryptionPanel in a Modal dialog

From 936b40f6b5d20075619d3370ad2b1fc45ac445fc Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 15:53:36 +0100
Subject: [PATCH 1017/3235] remove commented out code

---
 src/components/views/dialogs/NewSessionReviewDialog.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 2a7281c60e..e0f82df0c0 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -52,12 +52,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
             verificationRequest: request,
         });
-
-        // Modal.createTrackedDialog('New Session Verification', 'Starting dialog', DeviceVerifyDialog, {
-        //     userId,
-        //     [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
-        //     [device.deviceId],
-        // );
     }
 
     render() {

From 69dc725006960053be0fa69cd16f303074c7035d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 10 Feb 2020 15:43:02 +0000
Subject: [PATCH 1018/3235] rename button

---
 src/components/views/settings/CrossSigningPanel.js | 2 +-
 src/i18n/strings/en_EN.json                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 77cae79324..6f68193729 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -160,7 +160,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         } else {
             bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
                 <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
-                    {_t("Torpedo cross-signing")}
+                    {_t("Reset Secret Store and Cross-signing")}
                 </AccessibleButton>
             </div>;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index edb0da8780..1832a6123b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -553,7 +553,7 @@
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
-    "Torpedo cross-signing": "Torpedo cross-signing",
+    "Reset Secret Store and Cross-signing": "Reset Secret Store and Cross-signing",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",

From 1ff1575b427dec63eda52d0ed586f4338dad340e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 16:59:47 +0100
Subject: [PATCH 1019/3235] remove dead code

---
 src/components/views/toasts/VerificationRequestToast.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 92402c3f98..a831505a05 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -99,14 +99,6 @@ export default class VerificationRequestToast extends React.PureComponent {
                     verificationRequest: request,
                 }, null, /* priority = */ false, /* static = */ true);
             }
-
-            // } else if (request.channel.deviceId && request.verifier) {
-            //     // show to_device verifications in dialog still
-            //     const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
-            //     Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-            //         verifier: request.verifier,
-            //     }, null, /* priority = */ false, /* static = */ true);
-            // }
         } catch (err) {
             console.error(err.message);
         }

From 4b8382b5c45f602e88297120e6838a1754140d89 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Feb 2020 17:07:02 +0100
Subject: [PATCH 1020/3235] remove dead code

---
 src/components/views/right_panel/UserInfo.js | 23 --------------------
 1 file changed, 23 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index fc1f5bfcc9..9e0682e380 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -174,29 +174,6 @@ async function verifyDevice(userId, device) {
         primaryButton: _t("Done"),
         cancelButton: _t("Manually Verify"),
     });
-
-    // const cli = MatrixClientPeg.get();
-    // const verificationRequest = await cli.requestVerification(
-    //     userId,
-    //     [
-    //         verificationMethods.SAS,
-    //         SHOW_QR_CODE_METHOD,
-    //         SCAN_QR_CODE_METHOD,
-    //         verificationMethods.RECIPROCATE_QR_CODE,
-    //     ],
-    //     [device.deviceId],
-    // );
-    // dis.dispatch({
-    //     action: "set_right_panel_phase",
-    //     phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-    //     refireParams: {member, verificationRequest},
-    // });
-
-    // const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-    // Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
-    //     userId: userId,
-    //     device: device,
-    // }, null, /* priority = */ false, /* static = */ true);
 }
 
 function verifyUser(user) {

From ea7cb6ba0b8b4eb7cb3e69b6c0981bbbb9877bb0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 2 Feb 2020 14:31:21 +0000
Subject: [PATCH 1021/3235] Support keepSecretStoragePassphraseForSession at
 the config level too

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b5a966523e..f16085dbf7 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -492,7 +492,7 @@ export const SETTINGS = {
         default: true,
     },
     "keepSecretStoragePassphraseForSession": {
-         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+         supportedLevels: ['device', 'config'],
          displayName: _td("Keep secret storage passphrase in memory for this session"),
          default: false,
     },

From afc38b92a0e7050d7c5ab8d4037011ff65e5388c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 11:51:24 +0000
Subject: [PATCH 1022/3235] Always send scan for RiotX (for now)

---
 src/components/views/dialogs/DeviceVerifyDialog.js     | 3 ++-
 src/components/views/dialogs/NewSessionReviewDialog.js | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 7187aa4d28..346af2c2e9 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -27,7 +27,7 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {ensureDMExists} from "../../../createRoom";
 import dis from "../../../dispatcher";
 import SettingsStore from '../../../settings/SettingsStore';
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
 
 const MODE_LEGACY = 'legacy';
@@ -135,6 +135,7 @@ export default class DeviceVerifyDialog extends React.Component {
                 this._request = await client.requestVerification(this.props.userId, [
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
+                    SCAN_QR_CODE_METHOD,
                 ]);
 
                 await this._request.waitFor(r => r.ready || r.started);
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index e0f82df0c0..9d12b5c098 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -24,7 +24,7 @@ import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
@@ -43,12 +43,11 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         const cli = MatrixClientPeg.get();
         const request = await cli.requestVerification(
             userId,
-            [verificationMethods.SAS, SHOW_QR_CODE_METHOD],
+            [verificationMethods.SAS, SHOW_QR_CODE_METHOD, SCAN_QR_CODE_METHOD],
             [device.deviceId],
         );
 
         this.props.onFinished(true);
-
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
             verificationRequest: request,
         });

From ccde5530d26547d5638bcf528e0f36a5dad9ab68 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 31 Jan 2020 12:23:59 +0000
Subject: [PATCH 1023/3235] Add reciprocate as a method

---
 src/components/views/dialogs/DeviceVerifyDialog.js     | 1 +
 src/components/views/dialogs/NewSessionReviewDialog.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 346af2c2e9..f8d66ae641 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -136,6 +136,7 @@ export default class DeviceVerifyDialog extends React.Component {
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
                     SCAN_QR_CODE_METHOD,
+                    verificationMethods.RECIPROCATE_QR_CODE,
                 ]);
 
                 await this._request.waitFor(r => r.ready || r.started);
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 9d12b5c098..b770cfd881 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,7 +43,7 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         const cli = MatrixClientPeg.get();
         const request = await cli.requestVerification(
             userId,
-            [verificationMethods.SAS, SHOW_QR_CODE_METHOD, SCAN_QR_CODE_METHOD],
+            [verificationMethods.SAS, SHOW_QR_CODE_METHOD, SCAN_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE],
             [device.deviceId],
         );
 

From 9dde09d36f3f752f083b7b00661faf5d1c993d4a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 31 Jan 2020 14:42:27 +0100
Subject: [PATCH 1024/3235] cleanup

---
 src/components/views/dialogs/NewSessionReviewDialog.js    | 7 ++++++-
 src/components/views/dialogs/VerificationRequestDialog.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index b770cfd881..643a5a3c5d 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,7 +43,12 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         const cli = MatrixClientPeg.get();
         const request = await cli.requestVerification(
             userId,
-            [verificationMethods.SAS, SHOW_QR_CODE_METHOD, SCAN_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE],
+            [
+                verificationMethods.SAS,
+                SHOW_QR_CODE_METHOD,
+                SCAN_QR_CODE_METHOD,
+                verificationMethods.RECIPROCATE_QR_CODE,
+            ],
             [device.deviceId],
         );
 
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index baed79bd58..8080fa09f3 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 4f4b52d6665ad318c2dae57e1f217587a30ca65a Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:59:17 +0000
Subject: [PATCH 1025/3235] Update
 src/components/views/settings/CrossSigningPanel.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/settings/CrossSigningPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 6f68193729..95b9f76858 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -160,7 +160,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         } else {
             bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
                 <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
-                    {_t("Reset Secret Store and Cross-signing")}
+                    {_t("Reset cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
         }

From 2d425051245763b605f63b6250bc31af80757bd2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 10 Feb 2020 17:00:03 +0000
Subject: [PATCH 1026/3235] and re-run yarn i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1832a6123b..d9bd4c3b14 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -553,7 +553,7 @@
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
-    "Reset Secret Store and Cross-signing": "Reset Secret Store and Cross-signing",
+    "Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",

From 3da630beb8c8d96a3193dfc41d576f42ef5ca233 Mon Sep 17 00:00:00 2001
From: unknown <rmtestard@gmail.com>
Date: Mon, 10 Feb 2020 21:38:31 +0100
Subject: [PATCH 1027/3235] I have removed problematic ligns

---
 res/css/views/rooms/_WhoIsTypingTile.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index ef20c24c84..50aaf49340 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -31,10 +31,6 @@ limitations under the License.
     margin-left: -12px;
 }
 
-.mx_WhoIsTypingTile_avatars .mx_BaseAvatar_image {
-    border: 1px solid $primary-bg-color;
-}
-
 .mx_WhoIsTypingTile_avatars .mx_BaseAvatar_initial {
     padding-top: 1px;
 }

From 86306e3da3d792c9b43b2d2d20454e72b0aecfd7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 10 Feb 2020 20:41:16 +0000
Subject: [PATCH 1028/3235] Recaptcha should always be loaded over https

---
 src/components/views/auth/CaptchaForm.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index efcc450067..1b9dd3a97d 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -61,13 +61,9 @@ export default createReactClass({
         } else {
             console.log("Loading recaptcha script...");
             window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
-            let protocol = global.location.protocol;
-            if (protocol !== "http:") {
-                protocol = "https:";
-            }
             const scriptTag = document.createElement('script');
             scriptTag.setAttribute(
-                'src', `${protocol}//www.recaptcha.net/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit`,
+                'src', `https://www.recaptcha.net/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit`,
             );
             this._recaptchaContainer.current.appendChild(scriptTag);
         }

From f01b4fe241d8320216f5d7b2ade3448dc415ea85 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 10 Feb 2020 20:47:27 +0000
Subject: [PATCH 1029/3235] Allow custom hs url submission on enter

---
 src/components/views/auth/ServerConfig.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index 5e17d50b55..a9e26b8fb7 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -274,15 +274,13 @@ export default class ServerConfig extends React.PureComponent {
             : null;
 
         return (
-            <div className="mx_ServerConfig">
+            <form className="mx_ServerConfig" onSubmit={this.onSubmit} autoComplete="off">
                 <h3>{_t("Other servers")}</h3>
                 {errorText}
                 {this._renderHomeserverSection()}
                 {this._renderIdentityServerSection()}
-                <form onSubmit={this.onSubmit} autoComplete="off" action={null}>
-                    {submitButton}
-                </form>
-            </div>
+                {submitButton}
+            </form>
         );
     }
 }

From f5111a6290ac04059421982991f092f39994fcb6 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 10 Feb 2020 19:49:08 +0000
Subject: [PATCH 1030/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2103 of 2110 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 90ec9d2bc0..051860dca4 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2122,5 +2122,9 @@
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë sesion, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të sesionit me një metodë të re rimarrjesh.",
     "Indexed rooms:": "Dhoma të indeksuara:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s nga %(totalRooms)s gjithsej",
-    "Message downloading sleep time(ms)": "Kohë fjetjeje shkarkimi mesazhi(ms)"
+    "Message downloading sleep time(ms)": "Kohë fjetjeje shkarkimi mesazhi(ms)",
+    "Show typing notifications": "Shfaq njoftime shtypjeje",
+    "Destroy cross-signing keys?": "Të shkatërrohen kyçet <em>cross-signing</em>?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Fshirja e kyçeve <em>cross-signing</em> është e përhershme. Cilido që keni verifikuar me to, do të shohë një sinjalizim sigurie. Thuajse e sigurt që s’keni pse ta bëni një gjë të tillë, veç në paçi humbur çdo pajisje prej nga mund të bëni <em>cross-sign</em>.",
+    "Clear cross-signing keys": "Spastro kyçe <em>cross-signing</em>"
 }

From dd4aaf230a5a9ecad133bbc25ecea48bbd491700 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 11 Feb 2020 02:14:48 +0000
Subject: [PATCH 1031/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2110 of 2110 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2570746fc7..9f49122a69 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2132,5 +2132,10 @@
     "If you cancel now, you won't complete verifying the other user.": "如果您現在取消，您將無法完成驗證其他使用者。",
     "If you cancel now, you won't complete verifying your other session.": "如果您現在取消，您將無法完成驗證您其他的工作階段。",
     "If you cancel now, you won't complete your secret storage operation.": "如果您現在取消，您將無法完成驗證您的秘密儲存空間動作。",
-    "Cancel entering passphrase?": "取消輸入通關密語？"
+    "Cancel entering passphrase?": "取消輸入通關密語？",
+    "Show typing notifications": "顯示打字通知",
+    "Reset cross-signing and secret storage": "重設交叉簽章與秘密儲存空間",
+    "Destroy cross-signing keys?": "摧毀交叉簽章金鑰？",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "永久刪除交叉簽章金鑰。任何您已驗證過的人都會看到安全性警告。除非您遺失了所有可以進行交叉簽章的裝置，否則您平常幾乎不會想要這樣做。",
+    "Clear cross-signing keys": "清除交叉簽章金鑰"
 }

From 5436662d92537c1613fec9e1af1c78f857accc13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Mon, 10 Feb 2020 19:28:35 +0000
Subject: [PATCH 1032/3235] Translated using Weblate (Czech)

Currently translated at 98.7% (2082 of 2110 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 6978a3a5d9..34d646e0a4 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2095,5 +2095,12 @@
     "Enter your account password to confirm the upgrade:": "Potvrďte, že chcete aktualizaci provést zadáním svého uživatelského hesla:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Server si vás potřebuje ověřit, abychom mohli provést aktualizaci.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualizujte tuto přihlášenou relaci abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Zapněte v této přihlášené relaci šifrování abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit."
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Zapněte v této přihlášené relaci šifrování abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
+    "Show typing notifications": "Zobrazovat notifikace \"... právě píše...\"",
+    "Reset cross-signing and secret storage": "Resetovat bezpečné úložiště a cross-signing",
+    "Destroy cross-signing keys?": "Nenávratně smazat klíče pro cross-signing?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Smazání klíčů pro cross-signing je definitivní. Každý kdo vás ověřil teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení ze kterých se můžete ověřit, tak to asi nechcete udělat.",
+    "Clear cross-signing keys": "Smazat klíče pro cross-signing",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Zabezpečte si šifrovací klíče silným heslem. Pro lepší bezpečnost by mělo být jiné než vaše heslo k přihlášení:",
+    "Enter a passphrase": "Zadejte heslo"
 }

From 136dca7837610b8bbf539040b305f252fd486bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 11 Feb 2020 07:25:52 +0000
Subject: [PATCH 1033/3235] Translated using Weblate (French)

Currently translated at 100.0% (2110 of 2110 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9ff54d55a5..3fbff88540 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2133,5 +2133,10 @@
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s",
     "If you cancel now, you won't complete verifying the other user.": "Si vous annuler maintenant, vous ne terminerez pas la vérification de l’autre utilisateur.",
     "If you cancel now, you won't complete verifying your other session.": "Si vous annulez maintenant, vous ne terminerez pas la vérification de votre autre session.",
-    "If you cancel now, you won't complete your secret storage operation.": "Si vous annulez maintenant, vous ne terminerez pas votre opération sur le coffre secret."
+    "If you cancel now, you won't complete your secret storage operation.": "Si vous annulez maintenant, vous ne terminerez pas votre opération sur le coffre secret.",
+    "Show typing notifications": "Afficher les notifications de saisie",
+    "Reset cross-signing and secret storage": "Réinitialiser la signature croisée et le coffre secret",
+    "Destroy cross-signing keys?": "Détruire les clés de signature croisée ?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La suppression des clés de signature croisée est permanente. Tous ceux que vous avez vérifié vont voir des alertes de sécurité. Il est peu probable que ce soit ce que vous voulez faire, sauf si vous avez perdu tous les appareils vous permettant d’effectuer une signature croisée.",
+    "Clear cross-signing keys": "Vider les clés de signature croisée"
 }

From ee819dfdf8871cdbbb07b435bd3a4ba9285c71e1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 11 Feb 2020 09:32:09 +0000
Subject: [PATCH 1034/3235] fix call to SettngsStore.watchSetting, it takes a
 roomID

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

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 445d9019d1..821e370628 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -167,7 +167,7 @@ export default class MessagePanel extends React.Component {
         this._scrollPanel = createRef();
 
         this._showTypingNotificationsWatcherRef =
-            SettingsStore.watchSetting("showTypingNotifications", this.onShowTypingNotificationsChange);
+            SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
     }
 
     componentDidMount() {

From 6b6d612041f98b018b5595569ee73e2f4f7449f1 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 11:59:49 +0000
Subject: [PATCH 1035/3235] Fix error message rendering for key entry

Relates to https://github.com/vector-im/riot-web/issues/12288
---
 .../AccessSecretStorageDialog.js              |   8 +-
 .../dialogs/AccessSecretStorageDialog-test.js | 106 ++++++++++++++++++
 2 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 test/components/views/dialogs/AccessSecretStorageDialog-test.js

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 68ae8281c4..e3a7d7f532 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -190,10 +190,6 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             let keyStatus;
             if (this.state.recoveryKey.length === 0) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
-            } else if (this.state.recoveryKeyValid) {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
-                    {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
-                </div>;
             } else if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
@@ -201,6 +197,10 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                         "entered the correct recovery key.",
                     )}
                 </div>;
+            } else if (this.state.recoveryKeyValid) {
+                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
+                    {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
+                </div>;
             } else {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t("Not a valid recovery key")}
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
new file mode 100644
index 0000000000..4e2ade6069
--- /dev/null
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -0,0 +1,106 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 TestRenderer from 'react-test-renderer';
+import sdk from '../../../skinned-sdk';
+import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
+import { stubClient } from '../../../test-utils';
+
+const AccessSecretStorageDialog = sdk.getComponent("dialogs.secretstorage.AccessSecretStorageDialog");
+
+describe("AccessSecretStorageDialog", function () {
+    it("Closes the dialog if _onRecoveryKeyNext is called with a valid key", (done) => {
+        const testInstance = TestRenderer.create(
+            <AccessSecretStorageDialog
+              checkPrivateKey={(p) => p && p.recoveryKey && p.recoveryKey == "a"}
+              onFinished={(v) => {
+                  if (v) { done() }
+                }}
+            />
+        );
+        testInstance.getInstance().setState({
+            recoveryKeyValid: true,
+            recoveryKey: "a",
+        });
+        const e = { preventDefault: () => {} }
+        testInstance.getInstance()._onRecoveryKeyNext(e);
+    });
+
+    it("Considers a valid key to be valid", function () {
+        const testInstance = TestRenderer.create(
+            <AccessSecretStorageDialog
+              checkPrivateKey={() => true}
+            />
+        );
+        const v = "asfd";
+        const e = { target: { value: v } };
+        stubClient();
+        MatrixClientPeg.get().isValidRecoveryKey = function (k) {
+            return k == v;
+        }
+        testInstance.getInstance()._onRecoveryKeyChange(e);
+        const { recoveryKeyValid } = testInstance.getInstance().state;
+        expect(recoveryKeyValid).toBe(true);
+    });
+
+    it("Notifies the user if they input an invalid recovery key", async function (done) {
+        const testInstance = TestRenderer.create(
+            <AccessSecretStorageDialog
+              checkPrivateKey={async () => false}
+            />
+        );
+        const e = { target: { value: "a" } };
+        stubClient();
+        MatrixClientPeg.get().isValidRecoveryKey = () => true;
+        testInstance.getInstance()._onRecoveryKeyChange(e);
+        await testInstance.getInstance()._onRecoveryKeyNext({ preventDefault: () => {} });
+        const { keyMatches } = testInstance.getInstance().state;
+        expect(keyMatches).toBe(false);
+        const notification = testInstance.root.findByProps({
+            className: "mx_AccessSecretStorageDialog_keyStatus",
+        });
+        expect(notification.props.children).toEqual(
+            ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
+                     "entered the correct recovery key."]);
+        done()
+    });
+
+    it("Notifies the user if they input an invalid passphrase", async function (done) {
+        const testInstance = TestRenderer.create(
+            <AccessSecretStorageDialog
+              checkPrivateKey={() => false}
+              onFinished={() => {}}
+              keyInfo={ { passphrase: {
+                  salt: 'nonempty',
+                  iterations: 2,
+              } } }
+            />
+        );
+        const e = { target: { value: "a" } };
+        stubClient();
+        MatrixClientPeg.get().isValidRecoveryKey = () => false;
+        testInstance.getInstance()._onPassPhraseChange(e);
+        await testInstance.getInstance()._onPassPhraseNext({ preventDefault: () => {} })
+        const notification = testInstance.root.findByProps({
+            className: "mx_AccessSecretStorageDialog_keyStatus",
+        });
+        expect(notification.props.children).toEqual(
+            ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
+                     "entered the correct passphrase."]);
+        done();
+    });
+});

From a67778088977553055866fdcb20b8d5efa6ccd6f Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 12:05:58 +0000
Subject: [PATCH 1036/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 940777c1c7..f6090ce09f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1654,8 +1654,8 @@
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.",
     "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
     "Enter secret storage recovery key": "Enter secret storage recovery key",
-    "This looks like a valid recovery key!": "This looks like a valid recovery key!",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct 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",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",

From 9a5663056d41ca0b3a695ad4a6bc9ee32b53ddf9 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 12:06:40 +0000
Subject: [PATCH 1037/3235] lint

---
 .../dialogs/AccessSecretStorageDialog-test.js | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index 4e2ade6069..30512ca4dd 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -22,46 +22,46 @@ import { stubClient } from '../../../test-utils';
 
 const AccessSecretStorageDialog = sdk.getComponent("dialogs.secretstorage.AccessSecretStorageDialog");
 
-describe("AccessSecretStorageDialog", function () {
+describe("AccessSecretStorageDialog", function() {
     it("Closes the dialog if _onRecoveryKeyNext is called with a valid key", (done) => {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={(p) => p && p.recoveryKey && p.recoveryKey == "a"}
               onFinished={(v) => {
-                  if (v) { done() }
+                  if (v) { done(); }
                 }}
-            />
+            />,
         );
         testInstance.getInstance().setState({
             recoveryKeyValid: true,
             recoveryKey: "a",
         });
-        const e = { preventDefault: () => {} }
+        const e = { preventDefault: () => {} };
         testInstance.getInstance()._onRecoveryKeyNext(e);
     });
 
-    it("Considers a valid key to be valid", function () {
+    it("Considers a valid key to be valid", function() {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={() => true}
-            />
+            />,
         );
         const v = "asfd";
         const e = { target: { value: v } };
         stubClient();
-        MatrixClientPeg.get().isValidRecoveryKey = function (k) {
+        MatrixClientPeg.get().isValidRecoveryKey = function(k) {
             return k == v;
-        }
+        };
         testInstance.getInstance()._onRecoveryKeyChange(e);
         const { recoveryKeyValid } = testInstance.getInstance().state;
         expect(recoveryKeyValid).toBe(true);
     });
 
-    it("Notifies the user if they input an invalid recovery key", async function (done) {
+    it("Notifies the user if they input an invalid recovery key", async function(done) {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={async () => false}
-            />
+            />,
         );
         const e = { target: { value: "a" } };
         stubClient();
@@ -76,10 +76,10 @@ describe("AccessSecretStorageDialog", function () {
         expect(notification.props.children).toEqual(
             ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
                      "entered the correct recovery key."]);
-        done()
+        done();
     });
 
-    it("Notifies the user if they input an invalid passphrase", async function (done) {
+    it("Notifies the user if they input an invalid passphrase", async function(done) {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={() => false}
@@ -88,13 +88,13 @@ describe("AccessSecretStorageDialog", function () {
                   salt: 'nonempty',
                   iterations: 2,
               } } }
-            />
+            />,
         );
         const e = { target: { value: "a" } };
         stubClient();
         MatrixClientPeg.get().isValidRecoveryKey = () => false;
         testInstance.getInstance()._onPassPhraseChange(e);
-        await testInstance.getInstance()._onPassPhraseNext({ preventDefault: () => {} })
+        await testInstance.getInstance()._onPassPhraseNext({ preventDefault: () => {} });
         const notification = testInstance.root.findByProps({
             className: "mx_AccessSecretStorageDialog_keyStatus",
         });

From 627ced3838958ed3653b440031c720017efa65f0 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 13:17:18 +0000
Subject: [PATCH 1038/3235] quick fix for cross-signing reset bug

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

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 95b9f76858..b39ed4808b 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -157,13 +157,13 @@ export default class CrossSigningPanel extends React.PureComponent {
                     {_t("Bootstrap cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
-        } else {
+        } /*else { // TODO https://github.com/vector-im/riot-web/issues/12221
             bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
                 <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
                     {_t("Reset cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
-        }
+        }*/
 
         return (
             <div>

From cbb0ad6621659fc7e403ab064afc06853ff09127 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 13:20:27 +0000
Subject: [PATCH 1039/3235] god i hate the i18n linter

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 940777c1c7..1c1b5158ca 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -559,7 +559,6 @@
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
-    "Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",

From 5267dbf44aa3a1aa88bb610ac3f2831cd3231f1a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 11 Feb 2020 15:21:01 +0000
Subject: [PATCH 1040/3235] Update src/components/views/right_panel/UserInfo.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 9e0682e380..9db8de1ae3 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -141,7 +141,7 @@ async function verifyDevice(userId, device) {
     const cli = MatrixClientPeg.get();
     const member = cli.getUser(userId);
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-    Modal.createTrackedDialog("Verification failed", "insecure", QuestionDialog, {
+    Modal.createTrackedDialog("Verification warning", "unverified session", QuestionDialog, {
         headerImage: require("../../../../res/img/e2e/warning.svg"),
         title: _t("Not Trusted"),
         description: <div>

From 5382a52519341da90191b31600684a9167d85858 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:56:32 +0000
Subject: [PATCH 1041/3235] Fixed bug where key reset didn't always return the
 right key

---
 .../CreateSecretStorageDialog.js              | 22 +++++++++++++------
 .../views/settings/CrossSigningPanel.js       |  5 ++---
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index db2f4c35cc..e3ff8b2143 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -225,13 +225,21 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const { force } = this.props;
 
         try {
-            await cli.bootstrapSecretStorage({
-                setupNewSecretStorage: force,
-                authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                createSecretStorageKey: async () => this._keyInfo,
-                keyBackupInfo: this.state.backupInfo,
-                setupNewKeyBackup: force || !this.state.backupInfo && this.state.useKeyBackup,
-            });
+            if (!force) {
+                await cli.bootstrapSecretStorage({
+                    authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
+                    createSecretStorageKey: async () => this._keyInfo,
+                    keyBackupInfo: this.state.backupInfo,
+                    setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
+                });
+            } else {
+                await cli.bootstrapSecretStorage({
+                    authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
+                    createSecretStorageKey: async () => this._keyInfo,
+                    setupNewKeyBackup: true,
+                    setupNewSecretStorage: true,
+                });
+            }
             this.setState({
                 phase: PHASE_DONE,
             });
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index b39ed4808b..eeccaa61e1 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -103,7 +103,6 @@ export default class CrossSigningPanel extends React.PureComponent {
 
     onDestroyStorage = (act) => {
         if (!act) return;
-        console.log("Destroy secret storage:", act);
         this._bootstrapSecureSecretStorage(true);
     }
 
@@ -157,13 +156,13 @@ export default class CrossSigningPanel extends React.PureComponent {
                     {_t("Bootstrap cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
-        } /*else { // TODO https://github.com/vector-im/riot-web/issues/12221
+        } else {
             bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
                 <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
                     {_t("Reset cross-signing and secret storage")}
                 </AccessibleButton>
             </div>;
-        }*/
+        }
 
         return (
             <div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5b28a58878..7a8642be95 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -565,6 +565,7 @@
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
+    "Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",

From a1844e44f2b9166c3212e12c2fab5660a51ccfc5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 11 Feb 2020 17:44:41 +0100
Subject: [PATCH 1042/3235] remove methods arg to requestVerification(DM)

as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
---
 src/components/views/dialogs/DeviceVerifyDialog.js     | 2 +-
 src/components/views/dialogs/NewSessionReviewDialog.js | 6 ------
 src/components/views/right_panel/UserInfo.js           | 6 ------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index f8d66ae641..835b7daf02 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -123,7 +123,7 @@ export default class DeviceVerifyDialog extends React.Component {
                 const roomId = await ensureDMExistsAndOpen(this.props.userId);
                 // throws upon cancellation before having started
                 const request = await client.requestVerificationDM(
-                    this.props.userId, roomId, [verificationMethods.SAS],
+                    this.props.userId, roomId,
                 );
                 await request.waitFor(r => r.ready || r.started);
                 if (request.ready) {
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 643a5a3c5d..53e97de9e0 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,12 +43,6 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         const cli = MatrixClientPeg.get();
         const request = await cli.requestVerification(
             userId,
-            [
-                verificationMethods.SAS,
-                SHOW_QR_CODE_METHOD,
-                SCAN_QR_CODE_METHOD,
-                verificationMethods.RECIPROCATE_QR_CODE,
-            ],
             [device.deviceId],
         );
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 9db8de1ae3..db73f510a0 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -157,12 +157,6 @@ async function verifyDevice(userId, device) {
             const cli = MatrixClientPeg.get();
             const verificationRequest = await cli.requestVerification(
                 userId,
-                [
-                    verificationMethods.SAS,
-                    SHOW_QR_CODE_METHOD,
-                    SCAN_QR_CODE_METHOD,
-                    verificationMethods.RECIPROCATE_QR_CODE,
-                ],
                 [device.deviceId],
             );
             dis.dispatch({

From 33f3a61b94a48a0ddc9ac7660e51c0861b1edf46 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 11 Feb 2020 17:56:40 +0100
Subject: [PATCH 1043/3235] remove unused imports

---
 src/components/views/dialogs/NewSessionReviewDialog.js | 2 --
 src/components/views/right_panel/UserInfo.js           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 53e97de9e0..0019e0644f 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -22,9 +22,7 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 import VerificationRequestDialog from './VerificationRequestDialog';
 import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index db73f510a0..315035db96 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -42,8 +42,6 @@ import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
-import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);

From c8e65bfa6597e280dda40dbb3c0b42b9a74a50fb Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 11 Feb 2020 17:56:25 +0000
Subject: [PATCH 1044/3235] flip sense of 'force' flag in if statement

---
 .../secretstorage/CreateSecretStorageDialog.js   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index e3ff8b2143..84b94ab64c 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -225,20 +225,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const { force } = this.props;
 
         try {
-            if (!force) {
-                await cli.bootstrapSecretStorage({
-                    authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                    createSecretStorageKey: async () => this._keyInfo,
-                    keyBackupInfo: this.state.backupInfo,
-                    setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
-                });
-            } else {
+            if (force) {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                     createSecretStorageKey: async () => this._keyInfo,
                     setupNewKeyBackup: true,
                     setupNewSecretStorage: true,
                 });
+            } else {
+                await cli.bootstrapSecretStorage({
+                    authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
+                    createSecretStorageKey: async () => this._keyInfo,
+                    keyBackupInfo: this.state.backupInfo,
+                    setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
+                });
             }
             this.setState({
                 phase: PHASE_DONE,

From 078401c58f7f5ae248fe190bc6db7e85bb7b83c4 Mon Sep 17 00:00:00 2001
From: unknown <rmtestard@gmail.com>
Date: Tue, 11 Feb 2020 20:06:07 +0100
Subject: [PATCH 1045/3235] I have reverted and used the styling a bit higher
 in the DOM

---
 res/css/views/rooms/_WhoIsTypingTile.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index 50aaf49340..579ea7e73e 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -35,6 +35,11 @@ limitations under the License.
     padding-top: 1px;
 }
 
+.mx_WhoIsTypingTile_avatars .mx_BaseAvatar {
+    border: 1px solid $primary-bg-color;
+    border-radius: 40px;
+}
+
 .mx_WhoIsTypingTile_remainingAvatarPlaceholder {
     position: relative;
     display: inline-block;

From 4c5046afd5b55aa157afe052fa0ba041f92d8a81 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Tue, 11 Feb 2020 15:19:32 -0500
Subject: [PATCH 1046/3235] refactor event grouping into separate helper
 classes

---
 src/components/structures/MessagePanel.js | 430 +++++++++++++---------
 1 file changed, 248 insertions(+), 182 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a13278cf68..4f4136ed66 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -403,8 +403,6 @@ export default class MessagePanel extends React.Component {
 
     _getEventTiles() {
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
-        const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
-        const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
 
         this.eventNodes = {};
 
@@ -447,199 +445,48 @@ export default class MessagePanel extends React.Component {
             this._readReceiptsByEvent = this._getReadReceiptsByShownEvent();
         }
 
+        let grouper = null;
+
         for (i = 0; i < this.props.events.length; i++) {
             const mxEv = this.props.events[i];
             const eventId = mxEv.getId();
             const last = (mxEv === lastShownEvent);
 
-            // Wrap initial room creation events into an EventListSummary
-            // Grouping only events sent by the same user that sent the `m.room.create` and only until
-            // the first non-state event or membership event which is not regarding the sender of the `m.room.create` event
-            const shouldGroup = (ev) => {
-               if (ev.getType() === "m.room.member"
-                   && (ev.getStateKey() !== mxEv.getSender() || ev.getContent()["membership"] !== "join")) {
-                   return false;
-               }
-               if (ev.isState() && ev.getSender() === mxEv.getSender()) {
-                   return true;
-               }
-               return false;
-            };
-            // events that we include in the group but then eject out and place
-            // above the group.
-            const shouldEject = (ev) => {
-                if (ev.getType() === "m.room.encryption") return true;
-                return false;
-            };
-            if (mxEv.getType() === "m.room.create") {
-                let summaryReadMarker = null;
-                const ts1 = mxEv.getTs();
-
-                if (this._wantsDateSeparator(prevEvent, mxEv.getDate())) {
-                    const dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} /></li>;
-                    ret.push(dateSeparator);
+            if (grouper) {
+                if (grouper.shouldGroup(mxEv)) {
+                    grouper.add(mxEv);
+                    continue;
+                } else {
+                    // not part of group, so get the group tiles, close the
+                    // group, and continue like a normal event
+                    ret.push(...grouper.getTiles());
+                    prevEvent = grouper.getNewPrevEvent();
+                    grouper = null;
                 }
-
-                // If RM event is the first in the summary, append the RM after the summary
-                summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(mxEv.getId());
-
-                // If this m.room.create event should be shown (room upgrade) then show it before the summary
-                if (this._shouldShowEvent(mxEv)) {
-                    // pass in the mxEv as prevEvent as well so no extra DateSeparator is rendered
-                    ret.push(...this._getTilesForEvent(mxEv, mxEv, false));
-                }
-
-                const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary
-                const ejectedEvents = [];
-                for (;i + 1 < this.props.events.length; i++) {
-                    const collapsedMxEv = this.props.events[i + 1];
-
-                    // Ignore redacted/hidden member events
-                    if (!this._shouldShowEvent(collapsedMxEv)) {
-                        // If this hidden event is the RM and in or at end of a summary put RM after the summary.
-                        summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(collapsedMxEv.getId());
-                        continue;
-                    }
-
-                    if (!shouldGroup(collapsedMxEv) || this._wantsDateSeparator(mxEv, collapsedMxEv.getDate())) {
-                        break;
-                    }
-
-                    // If RM event is in the summary, mark it as such and the RM will be appended after the summary.
-                    summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(collapsedMxEv.getId());
-
-                    if (shouldEject(collapsedMxEv)) {
-                        ejectedEvents.push(collapsedMxEv);
-                    } else {
-                        summarisedEvents.push(collapsedMxEv);
-                    }
-                }
-
-                // At this point, i = the index of the last event in the summary sequence
-                const eventTiles = summarisedEvents.map((e) => {
-                    // In order to prevent DateSeparators from appearing in the expanded form
-                    // of EventListSummary, render each member event as if the previous
-                    // one was itself. This way, the timestamp of the previous event === the
-                    // timestamp of the current event, and no DateSeparator is inserted.
-                    return this._getTilesForEvent(e, e, e === lastShownEvent);
-                }).reduce((a, b) => a.concat(b), []);
-
-                for (const ejected of ejectedEvents) {
-                    ret.push(...this._getTilesForEvent(mxEv, ejected, last));
-                }
-
-                // Get sender profile from the latest event in the summary as the m.room.create doesn't contain one
-                const ev = this.props.events[i];
-                ret.push(<EventListSummary
-                    key="roomcreationsummary"
-                    events={summarisedEvents}
-                    onToggle={this._onHeightChanged} // Update scroll state
-                    summaryMembers={[ev.sender]}
-                    summaryText={_t("%(creator)s created and configured the room.", {
-                        creator: ev.sender ? ev.sender.name : ev.getSender(),
-                    })}
-                >
-                    { eventTiles }
-                </EventListSummary>);
-
-                if (summaryReadMarker) {
-                    ret.push(summaryReadMarker);
-                }
-
-                prevEvent = mxEv;
-                continue;
             }
 
-            const wantTile = this._shouldShowEvent(mxEv);
-
-            // Wrap consecutive member events in a ListSummary, ignore if redacted
-            if (isMembershipChange(mxEv) && wantTile) {
-                let summaryReadMarker = null;
-                const ts1 = mxEv.getTs();
-                // Ensure that the key of the MemberEventListSummary does not change with new
-                // member events. This will prevent it from being re-created unnecessarily, and
-                // instead will allow new props to be provided. In turn, the shouldComponentUpdate
-                // method on MELS can be used to prevent unnecessary renderings.
-                //
-                // Whilst back-paginating with a MELS at the top of the panel, prevEvent will be null,
-                // so use the key "membereventlistsummary-initial". Otherwise, use the ID of the first
-                // membership event, which will not change during forward pagination.
-                const key = "membereventlistsummary-" + (prevEvent ? mxEv.getId() : "initial");
-
-                if (this._wantsDateSeparator(prevEvent, mxEv.getDate())) {
-                    const dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} /></li>;
-                    ret.push(dateSeparator);
+            for (const Grouper of groupers) {
+                if (Grouper.canStartGroup(this, mxEv)) {
+                    grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent);
                 }
-
-                // If RM event is the first in the MELS, append the RM after MELS
-                summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(mxEv.getId());
-
-                const summarisedEvents = [mxEv];
-                for (;i + 1 < this.props.events.length; i++) {
-                    const collapsedMxEv = this.props.events[i + 1];
-
-                    // Ignore redacted/hidden member events
-                    if (!this._shouldShowEvent(collapsedMxEv)) {
-                        // If this hidden event is the RM and in or at end of a MELS put RM after MELS.
-                        summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(collapsedMxEv.getId());
-                        continue;
-                    }
-
-                    if (!isMembershipChange(collapsedMxEv) ||
-                        this._wantsDateSeparator(mxEv, collapsedMxEv.getDate())) {
-                        break;
-                    }
-
-                    // If RM event is in MELS mark it as such and the RM will be appended after MELS.
-                    summaryReadMarker = summaryReadMarker || this._readMarkerForEvent(collapsedMxEv.getId());
-
-                    summarisedEvents.push(collapsedMxEv);
-                }
-
-                let highlightInMels = false;
-
-                // At this point, i = the index of the last event in the summary sequence
-                let eventTiles = summarisedEvents.map((e) => {
-                    if (e.getId() === this.props.highlightedEventId) {
-                        highlightInMels = true;
-                    }
-                    // In order to prevent DateSeparators from appearing in the expanded form
-                    // of MemberEventListSummary, render each member event as if the previous
-                    // one was itself. This way, the timestamp of the previous event === the
-                    // timestamp of the current event, and no DateSeparator is inserted.
-                    return this._getTilesForEvent(e, e, e === lastShownEvent);
-                }).reduce((a, b) => a.concat(b), []);
-
-                if (eventTiles.length === 0) {
-                    eventTiles = null;
-                }
-
-                ret.push(<MemberEventListSummary key={key}
-                    events={summarisedEvents}
-                    onToggle={this._onHeightChanged} // Update scroll state
-                    startExpanded={highlightInMels}
-                >
-                        { eventTiles }
-                </MemberEventListSummary>);
-
-                if (summaryReadMarker) {
-                    ret.push(summaryReadMarker);
-                }
-
-                prevEvent = mxEv;
-                continue;
             }
+            if (!grouper) {
+                const wantTile = this._shouldShowEvent(mxEv);
+                if (wantTile) {
+                    // make sure we unpack the array returned by _getTilesForEvent,
+                    // otherwise react will auto-generate keys and we will end up
+                    // replacing all of the DOM elements every time we paginate.
+                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, last));
+                    prevEvent = mxEv;
+                }
 
-            if (wantTile) {
-                // make sure we unpack the array returned by _getTilesForEvent,
-                // otherwise react will auto-generate keys and we will end up
-                // replacing all of the DOM elements every time we paginate.
-                ret.push(...this._getTilesForEvent(prevEvent, mxEv, last));
-                prevEvent = mxEv;
+                const readMarker = this._readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
+                if (readMarker) ret.push(readMarker);
             }
+        }
 
-            const readMarker = this._readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
-            if (readMarker) ret.push(readMarker);
+        if (grouper) {
+            ret.push(...grouper.getTiles());
         }
 
         return ret;
@@ -950,3 +797,222 @@ export default class MessagePanel extends React.Component {
         );
     }
 }
+
+/* Grouper classes determine when events can be grouped together in a summary.
+ * Groupers should have the following methods:
+ * - canStartGroup (static): determines if a new group should be started with the
+ *   given event
+ * - shouldGroup: determines if the given event should be added to an existing group
+ * - add: adds an event to an existing group (should only be called if shouldGroup
+ *   return true)
+ * - getTiles: returns the tiles that represent the group
+ * - getNewPrevEvent: returns the event that should be used as the new prevEvent
+ *   when determining things such as whether a date separator is necessary
+ */
+
+// Wrap initial room creation events into an EventListSummary
+// Grouping only events sent by the same user that sent the `m.room.create` and only until
+// the first non-state event or membership event which is not regarding the sender of the `m.room.create` event
+class CreationGrouper {
+    static canStartGroup = function (panel, ev) {
+        return ev.getType() === "m.room.create";
+    };
+
+    constructor(panel, createEvent, prevEvent, lastShownEvent) {
+        this.panel = panel;
+        this.createEvent = createEvent;
+        this.prevEvent = prevEvent;
+        this.lastShownEvent = lastShownEvent;
+        this.events = [];
+        // events that we include in the group but then eject out and place
+        // above the group.
+        this.ejectedEvents = [];
+        this.readMarker = panel._readMarkerForEvent(createEvent.getId());
+    }
+
+    shouldGroup(ev) {
+        const panel = this.panel;
+        const createEvent = this.createEvent;
+        if (!panel._shouldShowEvent(ev)) {
+            this.readMarker = this.readMarker || panel._readMarkerForEvent(ev.getId());
+            return true;
+        }
+        if (panel._wantsDateSeparator(this.createEvent, ev.getDate())) {
+            return false;
+        }
+        if (ev.getType() === "m.room.member"
+            && (ev.getStateKey() !== createEvent.getSender() || ev.getContent()["membership"] !== "join")) {
+            return false;
+        }
+        if (ev.isState() && ev.getSender() === createEvent.getSender()) {
+            return true;
+        }
+        return false;
+    }
+
+    add(ev) {
+        const panel = this.panel;
+        this.readMarker = this.readMarker || panel._readMarkerForEvent(ev.getId());
+        if (!panel._shouldShowEvent(ev)) {
+            return;
+        }
+        if (ev.getType() === "m.room.encryption") {
+            this.ejectedEvents.push(ev);
+        } else {
+            this.events.push(ev);
+        }
+    }
+
+    getTiles() {
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
+
+        const panel = this.panel;
+        const ret = [];
+        const createEvent = this.createEvent;
+        const lastShownEvent = this.lastShownEvent;
+
+        if (panel._wantsDateSeparator(this.prevEvent, createEvent.getDate())) {
+            const ts = createEvent.getTs();
+            ret.push(
+                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>
+            )
+        }
+
+        // If this m.room.create event should be shown (room upgrade) then show it before the summary
+        if (panel._shouldShowEvent(createEvent)) {
+            // pass in the createEvent as prevEvent as well so no extra DateSeparator is rendered
+            ret.push(...panel._getTilesForEvent(createEvent, createEvent, false));
+        }
+
+        for (const ejected of this.ejectedEvents) {
+            ret.push(...panel._getTilesForEvent(
+                createEvent, ejected, createEvent === lastShownEvent
+            ));
+        }
+
+        const eventTiles = this.events.map((e) => {
+            // In order to prevent DateSeparators from appearing in the expanded form
+            // of EventListSummary, render each member event as if the previous
+            // one was itself. This way, the timestamp of the previous event === the
+            // timestamp of the current event, and no DateSeparator is inserted.
+            return panel._getTilesForEvent(e, e, e === lastShownEvent);
+        }).reduce((a, b) => a.concat(b), []);
+        // Get sender profile from the latest event in the summary as the m.room.create doesn't contain one
+        const ev = this.events[this.events.length - 1];
+        ret.push(
+            <EventListSummary
+                 key="roomcreationsummary"
+                 events={this.events}
+                 onToggle={panel._onHeightChanged} // Update scroll state
+                 summaryMembers={[ev.sender]}
+                 summaryText={_t("%(creator)s created and configured the room.", {
+                     creator: ev.sender ? ev.sender.name : ev.getSender(),
+                 })}
+            >
+                 { eventTiles }
+            </EventListSummary>
+        );
+
+        if (this.readMarker) {
+            ret.push(readMarker);
+        }
+
+        return ret;
+    }
+
+    getNewPrevEvent() {
+        return this.createEvent;
+    }
+}
+
+// Wrap consecutive member events in a ListSummary, ignore if redacted
+class MemberGrouper {
+    static canStartGroup = function (panel, ev) {
+        return panel._shouldShowEvent(ev) && isMembershipChange(ev);
+    }
+
+    constructor(panel, ev, prevEvent, lastShownEvent) {
+        this.panel = panel;
+        this.readMarker = panel._readMarkerForEvent(ev.getId());
+        this.events = [ev];
+        this.prevEvent = prevEvent;
+        this.lastShownEvent = lastShownEvent;
+    }
+
+    shouldGroup(ev) {
+        return isMembershipChange(ev);
+    }
+
+    add(ev) {
+        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(ev.getId());
+        this.events.push(ev);
+    }
+
+    getTiles() {
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
+
+        const panel = this.panel;
+        const lastShownEvent = lastShownEvent;
+        const ret = [];
+
+        if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
+            const ts = this.events[0].getTs();
+            ret.push(
+                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>
+            );
+        }
+
+        // Ensure that the key of the MemberEventListSummary does not change with new
+        // member events. This will prevent it from being re-created unnecessarily, and
+        // instead will allow new props to be provided. In turn, the shouldComponentUpdate
+        // method on MELS can be used to prevent unnecessary renderings.
+        //
+        // Whilst back-paginating with a MELS at the top of the panel, prevEvent will be null,
+        // so use the key "membereventlistsummary-initial". Otherwise, use the ID of the first
+        // membership event, which will not change during forward pagination.
+        const key = "membereventlistsummary-" + (
+            this.prevEvent ? this.events[0].getId() : "initial"
+        );
+
+        let highlightInMels;
+        let eventTiles = this.events.map((e) => {
+            if (e.getId() === panel.props.highlightedEventId) {
+                highlightInMels = true;
+            }
+            // In order to prevent DateSeparators from appearing in the expanded form
+            // of MemberEventListSummary, render each member event as if the previous
+            // one was itself. This way, the timestamp of the previous event === the
+            // timestamp of the current event, and no DateSeparator is inserted.
+            return panel._getTilesForEvent(e, e, e === lastShownEvent);
+        }).reduce((a, b) => a.concat(b), []);
+
+        if (eventTiles.length === 0) {
+            eventTiles = null;
+        }
+
+        ret.push(
+            <MemberEventListSummary key={key}
+                 events={this.events}
+                 onToggle={panel._onHeightChanged} // Update scroll state
+                 startExpanded={highlightInMels}
+            >
+                 { eventTiles }
+            </MemberEventListSummary>
+        );
+
+        if (this.readMarker) {
+            ret.push(this.readMarker);
+        }
+
+        return ret;
+    }
+
+    getNewPrevEvent() {
+        return this.events[0];
+    }
+}
+
+// all the grouper classes that we use
+const groupers = [CreationGrouper, MemberGrouper];

From be70ef44f81521b70f05cbb538edd918f61a1781 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Tue, 11 Feb 2020 15:34:14 -0500
Subject: [PATCH 1047/3235] lint

---
 src/components/structures/MessagePanel.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 4f4136ed66..5835b02333 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -402,8 +402,6 @@ export default class MessagePanel extends React.Component {
     };
 
     _getEventTiles() {
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-
         this.eventNodes = {};
 
         let i;
@@ -814,7 +812,7 @@ export default class MessagePanel extends React.Component {
 // Grouping only events sent by the same user that sent the `m.room.create` and only until
 // the first non-state event or membership event which is not regarding the sender of the `m.room.create` event
 class CreationGrouper {
-    static canStartGroup = function (panel, ev) {
+    static canStartGroup = function(panel, ev) {
         return ev.getType() === "m.room.create";
     };
 
@@ -875,8 +873,8 @@ class CreationGrouper {
         if (panel._wantsDateSeparator(this.prevEvent, createEvent.getDate())) {
             const ts = createEvent.getTs();
             ret.push(
-                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>
-            )
+                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>,
+            );
         }
 
         // If this m.room.create event should be shown (room upgrade) then show it before the summary
@@ -887,7 +885,7 @@ class CreationGrouper {
 
         for (const ejected of this.ejectedEvents) {
             ret.push(...panel._getTilesForEvent(
-                createEvent, ejected, createEvent === lastShownEvent
+                createEvent, ejected, createEvent === lastShownEvent,
             ));
         }
 
@@ -911,11 +909,11 @@ class CreationGrouper {
                  })}
             >
                  { eventTiles }
-            </EventListSummary>
+            </EventListSummary>,
         );
 
         if (this.readMarker) {
-            ret.push(readMarker);
+            ret.push(this.readMarker);
         }
 
         return ret;
@@ -928,7 +926,7 @@ class CreationGrouper {
 
 // Wrap consecutive member events in a ListSummary, ignore if redacted
 class MemberGrouper {
-    static canStartGroup = function (panel, ev) {
+    static canStartGroup = function(panel, ev) {
         return panel._shouldShowEvent(ev) && isMembershipChange(ev);
     }
 
@@ -954,13 +952,13 @@ class MemberGrouper {
         const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
 
         const panel = this.panel;
-        const lastShownEvent = lastShownEvent;
+        const lastShownEvent = this.lastShownEvent;
         const ret = [];
 
         if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
             const ts = this.events[0].getTs();
             ret.push(
-                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>
+                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>,
             );
         }
 
@@ -999,7 +997,7 @@ class MemberGrouper {
                  startExpanded={highlightInMels}
             >
                  { eventTiles }
-            </MemberEventListSummary>
+            </MemberEventListSummary>,
         );
 
         if (this.readMarker) {

From 9acf70c69360c83698d13174e67eafe423d9c776 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 12 Feb 2020 01:55:20 +0000
Subject: [PATCH 1048/3235] Score user ID searches higher when they match
 nearly exactly

---
 src/components/views/dialogs/InviteDialog.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 8fec2437f6..caf94bb8de 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -482,6 +482,15 @@ export default class InviteDialog extends React.PureComponent {
             record.score += scoreBoost;
         }
 
+        // Last chance: if the user ID matches the search term, score it higher
+        if (this.state.filterText && this.state.filterText[0] === '@') {
+            for (const memberId in memberScores) {
+                if (memberId.startsWith(this.state.filterText)) {
+                    memberScores[memberId] += 2; // arbitrary score bump
+                }
+            }
+        }
+
         const members = Object.values(memberScores);
         members.sort((a, b) => {
             if (a.score === b.score) {

From a05dafc3003d9133549d4d0e43c1a04b5734588a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 12 Feb 2020 01:58:21 +0000
Subject: [PATCH 1049/3235] Check for null config settings a bit safer

Fixes https://github.com/vector-im/riot-web/issues/12254
---
 src/settings/handlers/ConfigSettingsHandler.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/settings/handlers/ConfigSettingsHandler.js b/src/settings/handlers/ConfigSettingsHandler.js
index a54ad1cef6..3b5b4b626e 100644
--- a/src/settings/handlers/ConfigSettingsHandler.js
+++ b/src/settings/handlers/ConfigSettingsHandler.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import SettingsHandler from "./SettingsHandler";
 import SdkConfig from "../../SdkConfig";
+import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
 
 /**
  * Gets and sets settings at the "config" level. This handler does not make use of the
@@ -32,7 +33,7 @@ export default class ConfigSettingsHandler extends SettingsHandler {
         }
 
         const settingsConfig = config["settingDefaults"];
-        if (!settingsConfig || !settingsConfig[settingName]) return null;
+        if (!settingsConfig || isNullOrUndefined(settingsConfig[settingName])) return null;
         return settingsConfig[settingName];
     }
 

From 6fe4eb1fc3d03528af451b703312c8c8961fae93 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Wed, 12 Feb 2020 09:36:59 +0100
Subject: [PATCH 1050/3235] Don't render avatars in pills for screen readers.

These don't provide any additional information, but add extraneous noise. The link text and title already provide all information. Therefore, mark the avatar inside pills (the mention links inside messages) as hidden. Note that due to the images being part of something focusable, role "presentation" does not work here.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/elements/Pill.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 1de857e7fe..44413505d6 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -211,7 +211,7 @@ const Pill = createReactClass({
                 if (room) {
                     linkText = "@room";
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <RoomAvatar room={room} width={16} height={16} />;
+                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden='true' />;
                     }
                     pillClass = 'mx_AtRoomPill';
                 }
@@ -225,7 +225,7 @@ const Pill = createReactClass({
                         member.rawDisplayName = member.rawDisplayName || '';
                         linkText = member.rawDisplayName;
                         if (this.props.shouldShowPillAvatar) {
-                            avatar = <MemberAvatar member={member} width={16} height={16} />;
+                            avatar = <MemberAvatar member={member} width={16} height={16} aria-hidden='true'/>;
                         }
                         pillClass = 'mx_UserPill';
                         href = null;
@@ -238,7 +238,7 @@ const Pill = createReactClass({
                 if (room) {
                     linkText = (room ? getDisplayAliasForRoom(room) : null) || resource;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <RoomAvatar room={room} width={16} height={16} />;
+                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden='true' />;
                     }
                     pillClass = 'mx_RoomPill';
                 }
@@ -251,7 +251,7 @@ const Pill = createReactClass({
 
                     linkText = groupId;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <BaseAvatar name={name || groupId} width={16} height={16}
+                        avatar = <BaseAvatar name={name || groupId} width={16} height={16} aria-hidden='true'
                                              url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
                     }
                     pillClass = 'mx_GroupPill';

From 8004a35179b9c3f46e3a90b74c3a5beac57ee206 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Wed, 12 Feb 2020 10:54:08 +0100
Subject: [PATCH 1051/3235] Update to use proper quotes and fix code styling.
 And fix test.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/elements/Pill.js              | 8 ++++----
 test/components/views/messages/TextualBody-test.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 44413505d6..59c0bde177 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -211,7 +211,7 @@ const Pill = createReactClass({
                 if (room) {
                     linkText = "@room";
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden='true' />;
+                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }
                     pillClass = 'mx_AtRoomPill';
                 }
@@ -225,7 +225,7 @@ const Pill = createReactClass({
                         member.rawDisplayName = member.rawDisplayName || '';
                         linkText = member.rawDisplayName;
                         if (this.props.shouldShowPillAvatar) {
-                            avatar = <MemberAvatar member={member} width={16} height={16} aria-hidden='true'/>;
+                            avatar = <MemberAvatar member={member} width={16} height={16} aria-hidden="true" />;
                         }
                         pillClass = 'mx_UserPill';
                         href = null;
@@ -238,7 +238,7 @@ const Pill = createReactClass({
                 if (room) {
                     linkText = (room ? getDisplayAliasForRoom(room) : null) || resource;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden='true' />;
+                        avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }
                     pillClass = 'mx_RoomPill';
                 }
@@ -251,7 +251,7 @@ const Pill = createReactClass({
 
                     linkText = groupId;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <BaseAvatar name={name || groupId} width={16} height={16} aria-hidden='true'
+                        avatar = <BaseAvatar name={name || groupId} width={16} height={16} aria-hidden="true"
                                              url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
                     }
                     pillClass = 'mx_GroupPill';
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 180a2f7e54..4e0785a8b9 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,7 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'width="16" height="16" title="@member:domain.bla" alt="">Member</a>' +
+                'width="16" height="16" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });

From 37435bce45d29d4dca02a4150ebfbd85494e0c18 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 12 Feb 2020 02:46:46 +0000
Subject: [PATCH 1052/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2119 of 2119 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9f49122a69..2596d11629 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2137,5 +2137,15 @@
     "Reset cross-signing and secret storage": "重設交叉簽章與秘密儲存空間",
     "Destroy cross-signing keys?": "摧毀交叉簽章金鑰？",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "永久刪除交叉簽章金鑰。任何您已驗證過的人都會看到安全性警告。除非您遺失了所有可以進行交叉簽章的裝置，否則您平常幾乎不會想要這樣做。",
-    "Clear cross-signing keys": "清除交叉簽章金鑰"
+    "Clear cross-signing keys": "清除交叉簽章金鑰",
+    "Verify this session by completing one of the following:": "透過完成以下任一種動作來驗證此工作階段：",
+    "Scan this unique code": "掃描此獨一無二的條碼",
+    "or": "或",
+    "Compare unique emoji": "比較獨一無二的顏文字",
+    "Compare a unique set of emoji if you don't have a camera on either device": "如果兩個裝置上都沒有相機的話，就比較一組獨一無二的顏文字",
+    "Not Trusted": "未受信任",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) 登入到未驗證的新工作階段：",
+    "Ask this user to verify their session, or manually verify it below.": "要求此使用者驗證他們的工作階段，或在下方手動驗證。",
+    "Manually Verify": "手動驗證",
+    "Verify by scanning": "透過掃描來驗證"
 }

From 790ed65a17fe1660a8286655a91e30760c1ad3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 12 Feb 2020 08:26:57 +0000
Subject: [PATCH 1053/3235] Translated using Weblate (French)

Currently translated at 100.0% (2119 of 2119 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 3fbff88540..7aa6a43c91 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2138,5 +2138,15 @@
     "Reset cross-signing and secret storage": "Réinitialiser la signature croisée et le coffre secret",
     "Destroy cross-signing keys?": "Détruire les clés de signature croisée ?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La suppression des clés de signature croisée est permanente. Tous ceux que vous avez vérifié vont voir des alertes de sécurité. Il est peu probable que ce soit ce que vous voulez faire, sauf si vous avez perdu tous les appareils vous permettant d’effectuer une signature croisée.",
-    "Clear cross-signing keys": "Vider les clés de signature croisée"
+    "Clear cross-signing keys": "Vider les clés de signature croisée",
+    "Verify this session by completing one of the following:": "Vérifiez cette session en réalisant une des actions suivantes :",
+    "Scan this unique code": "Scannez ce code unique",
+    "or": "ou",
+    "Compare unique emoji": "Comparez des émojis uniques",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Comparez une liste unique d’émojis si vous n’avez d’appareil photo sur aucun des deux appareils",
+    "Not Trusted": "Non fiable",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) s’est connecté à une nouvelle session sans la vérifier :",
+    "Ask this user to verify their session, or manually verify it below.": "Demandez à cet utilisateur de vérifier sa session, ou vérifiez-la manuellement ci-dessous.",
+    "Manually Verify": "Vérifier manuellement",
+    "Verify by scanning": "Vérifier en scannant"
 }

From 3c5abf1fc434856de060cc440cf4f821687cd9cd Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 11 Feb 2020 20:23:29 +0000
Subject: [PATCH 1054/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2119 of 2119 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6336a41de8..5f5e1290ee 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2129,5 +2129,19 @@
     "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)",
     "If you cancel now, you won't complete verifying the other user.": "A másik felhasználó ellenőrzését nem fejezed be, ha ezt most megszakítod.",
     "If you cancel now, you won't complete verifying your other session.": "A másik munkameneted ellenőrzését nem fejezed be, ha ezt most megszakítod.",
-    "If you cancel now, you won't complete your secret storage operation.": "A Biztonsági tárolóval kapcsolatos műveletet nem fejezed be ha ezt most megszakítod."
+    "If you cancel now, you won't complete your secret storage operation.": "A Biztonsági tárolóval kapcsolatos műveletet nem fejezed be ha ezt most megszakítod.",
+    "Show typing notifications": "Gépelés visszajelzés megjelenítése",
+    "Verify this session by completing one of the following:": "Ellenőrizd ezt a munkamenetet az alábbiak egyikével:",
+    "Scan this unique code": "Ennek az egyedi kódnak a beolvasása",
+    "or": "vagy",
+    "Compare unique emoji": "Egyedi emodzsik összehasonlítása",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Hasonlítsd össze az egyedi emodzsikat ha valamelyik eszközön nincs kamera",
+    "Not Trusted": "Megbízhatatlan",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) új munkamenetbe lépett be anélkül, hogy ellenőrizte volna:",
+    "Ask this user to verify their session, or manually verify it below.": "Kérd meg a felhasználót, hogy hitelesítse a munkamenetét vagy ellenőrizd kézzel alább.",
+    "Manually Verify": "Manuális ellenőrzés",
+    "Verify by scanning": "Ellenőrzés kód beolvasással",
+    "Destroy cross-signing keys?": "Eszközök közti hitelesítési kulcsok megsemmisítése?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Eszközök közti hitelesítési kulcsok törlése végleges. Mindenki akit ezzel hitelesítettél biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztetted el az összes eszközödet amivel eszközök közti hitelesítést tudsz végezni, nem valószínű, hogy ezt szeretnéd tenni.",
+    "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése"
 }

From e1608509d0e3d0c683db56118d165561c117c8ac Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 12 Feb 2020 13:53:16 +0000
Subject: [PATCH 1055/3235] Disable 'start' button after clicking in
 VerificationPanel

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 58cc42ddc1..a8d4ce733b 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -88,7 +88,7 @@ export default class VerificationPanel extends React.PureComponent {
                         <div className='mx_VerificationPanel_QRPhase_startOption'>
                             <p>{_t("Compare unique emoji")}</p>
                             <span className='mx_VerificationPanel_QRPhase_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
-                            <AccessibleButton onClick={this._startSAS} kind='primary'>
+                            <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this._startSAS} kind='primary'>
                                 {_t("Start")}
                             </AccessibleButton>
                         </div>

From 13e03bb696b4af97f9ee73bb29f249aec30b4d08 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 12 Feb 2020 13:44:36 +0000
Subject: [PATCH 1056/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2113 of 2120 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 051860dca4..4510eec170 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2126,5 +2126,15 @@
     "Show typing notifications": "Shfaq njoftime shtypjeje",
     "Destroy cross-signing keys?": "Të shkatërrohen kyçet <em>cross-signing</em>?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Fshirja e kyçeve <em>cross-signing</em> është e përhershme. Cilido që keni verifikuar me to, do të shohë një sinjalizim sigurie. Thuajse e sigurt që s’keni pse ta bëni një gjë të tillë, veç në paçi humbur çdo pajisje prej nga mund të bëni <em>cross-sign</em>.",
-    "Clear cross-signing keys": "Spastro kyçe <em>cross-signing</em>"
+    "Clear cross-signing keys": "Spastro kyçe <em>cross-signing</em>",
+    "Verify this session by completing one of the following:": "Verifikoni këtë sesion duke plotësuar një nga sa vijon:",
+    "Scan this unique code": "Skanoni këtë kod unik",
+    "or": "ose",
+    "Compare unique emoji": "Krahasoni emoji unik",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Krahasoni një grup unik emoji-sh, nëse s’keni kamera në njërën nga pajisjet",
+    "Not Trusted": "Jo e Besuar",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) bëri hyrjen në një sesion të ri pa e verifikuar:",
+    "Ask this user to verify their session, or manually verify it below.": "Kërkojini këtij përdoruesi të verifikojë sesionin e vet, ose ta verifikojë më poshtë dorazi.",
+    "Manually Verify": "Verifikoje Dorazi",
+    "Verify by scanning": "Verifikoje me skanim"
 }

From d172e1bf85e0f7ac95209c6aafd1c336e315b517 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 12 Feb 2020 10:03:33 -0700
Subject: [PATCH 1057/3235] Revert "Merge pull request #4060 from
 matrix-org/travis/better-invite"

This reverts commit 48860f0a1008770ecbb6d750b2668f248ee3f3e1.
---
 src/components/views/dialogs/InviteDialog.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index caf94bb8de..8fec2437f6 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -482,15 +482,6 @@ export default class InviteDialog extends React.PureComponent {
             record.score += scoreBoost;
         }
 
-        // Last chance: if the user ID matches the search term, score it higher
-        if (this.state.filterText && this.state.filterText[0] === '@') {
-            for (const memberId in memberScores) {
-                if (memberId.startsWith(this.state.filterText)) {
-                    memberScores[memberId] += 2; // arbitrary score bump
-                }
-            }
-        }
-
         const members = Object.values(memberScores);
         members.sort((a, b) => {
             if (a.score === b.score) {

From 8d445d54ec7fc63f0fb9be2357cfa0017fdcaeaa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 00:39:28 +0000
Subject: [PATCH 1058/3235] Use embedded piwik caller rather than piwik.js bcuz
 CSP :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js | 222 +++++++++++++++++++++++++++++------------------
 src/Lifecycle.js |   2 +-
 2 files changed, 139 insertions(+), 85 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index d0c7a52814..fc1b7c5827 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -1,18 +1,21 @@
 /*
- Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
- 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
+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
+    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.
- */
+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 { getCurrentLanguage, _t, _td } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
@@ -106,61 +109,80 @@ function whitelistRedact(whitelist, str) {
     return '<redacted>';
 }
 
+const UID_KEY = "mx_Riot_Analytics_uid";
+const CREATION_TS_KEY = "mx_Riot_Analytics_cts";
+const VISIT_COUNT_KEY = "mx_Riot_Analytics_vc";
+const LAST_VISIT_TS_KEY = "mx_Riot_Analytics_lvts";
+
+function getUid() {
+    try {
+        let data = localStorage.getItem(UID_KEY);
+        if (!data) {
+            localStorage.setItem(UID_KEY, data = [...Array(16)].map(() => Math.random().toString(16)[2]).join(''));
+        }
+        return data;
+    } catch (e) {
+        console.error("Analytics error: ", e);
+        return "";
+    }
+}
+
+const HEARTBEAT_INTERVAL = 30 * 1000; // seconds
+
 class Analytics {
     constructor() {
-        this._paq = null;
-        this.disabled = true;
+        this.baseUrl = null;
+        this.siteId = null;
+        this.visitVariables = {};
+
         this.firstPage = true;
+        this._heartbeatIntervalID = null;
+
+        this.creationTs = localStorage.getItem(CREATION_TS_KEY);
+        if (!this.creationTs) {
+            localStorage.setItem(CREATION_TS_KEY, this.creationTs = new Date().getTime());
+        }
+
+        this.lastVisitTs = localStorage.getItem(LAST_VISIT_TS_KEY);
+        this.visitCount = localStorage.getItem(VISIT_COUNT_KEY) || 0;
+        localStorage.setItem(VISIT_COUNT_KEY, parseInt(this.visitCount, 10) + 1);
+    }
+
+    get disabled() {
+        return !this.baseUrl;
     }
 
     /**
      * Enable Analytics if initialized but disabled
      * otherwise try and initalize, no-op if piwik config missing
      */
-    enable() {
-        if (this._paq || this._init()) {
-            this.disabled = false;
-        }
-    }
+    async enable() {
+        if (!this.disabled) return;
 
-    /**
-     * Disable Analytics calls, will not fully unload Piwik until a refresh,
-     * but this is second best, Piwik should not pull anything implicitly.
-     */
-    disable() {
-        this.trackEvent('Analytics', 'opt-out');
-        // disableHeartBeatTimer is undocumented but exists in the piwik code
-        // the _paq.push method will result in an error being printed in the console
-        // if an unknown method signature is passed
-        this._paq.push(['disableHeartBeatTimer']);
-        this.disabled = true;
-    }
-
-    _init() {
         const config = SdkConfig.get();
         if (!config || !config.piwik || !config.piwik.url || !config.piwik.siteId) return;
 
-        const url = config.piwik.url;
-        const siteId = config.piwik.siteId;
-        const self = this;
-
-        window._paq = this._paq = window._paq || [];
-
-        this._paq.push(['setTrackerUrl', url+'piwik.php']);
-        this._paq.push(['setSiteId', siteId]);
-
-        this._paq.push(['trackAllContentImpressions']);
-        this._paq.push(['discardHashTag', false]);
-        this._paq.push(['enableHeartBeatTimer']);
-        // this._paq.push(['enableLinkTracking', true]);
+        this.baseUrl = new URL("piwik.php", config.piwik.url);
+        // set constants
+        this.baseUrl.searchParams.set("rec", 1); // rec is required for tracking
+        this.baseUrl.searchParams.set("idsite", config.piwik.siteId); // rec is required for tracking
+        this.baseUrl.searchParams.set("apiv", 1); // API version to use
+        this.baseUrl.searchParams.set("send_image", 0); // we want a 204, not a tiny GIF
+        // set user parameters
+        this.baseUrl.searchParams.set("_id", getUid()); // uuid
+        this.baseUrl.searchParams.set("_idts", this.creationTs); // first ts
+        this.baseUrl.searchParams.set("_idvc", parseInt(this.visitCount, 10)+ 1); // visit count
+        if (this.lastVisitTs) {
+            this.baseUrl.searchParams.set("_viewts", this.lastVisitTs); // last visit ts
+        }
 
         const platform = PlatformPeg.get();
         this._setVisitVariable('App Platform', platform.getHumanReadableName());
-        platform.getAppVersion().then((version) => {
-            this._setVisitVariable('App Version', version);
-        }).catch(() => {
+        try {
+            this._setVisitVariable('App Version', await platform.getAppVersion());
+        } catch (e) {
             this._setVisitVariable('App Version', 'unknown');
-        });
+        }
 
         this._setVisitVariable('Chosen Language', getCurrentLanguage());
 
@@ -168,20 +190,61 @@ class Analytics {
             this._setVisitVariable('Instance', window.location.pathname);
         }
 
-        (function() {
-            const g = document.createElement('script');
-            const s = document.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=url+'piwik.js';
+        // start heartbeat
+        this._heartbeatIntervalID = window.setInterval(this.ping.bind(this), HEARTBEAT_INTERVAL);
+    }
 
-            g.onload = function() {
-                console.log('Initialised anonymous analytics');
-                self._paq = window._paq;
-            };
+    /**
+     * Disable Analytics calls, will not fully unload Piwik until a refresh,
+     * but this is second best, Piwik should not pull anything implicitly.
+     */
+    disable() {
+        if (this.disabled) return;
+        this.trackEvent('Analytics', 'opt-out');
+        window.clearInterval(this._heartbeatIntervalID);
+        this.baseUrl = null;
+        this.visitVariables = {};
+    }
 
-            s.parentNode.insertBefore(g, s);
-        })();
+    async _track(data) {
+        if (this.disabled) return;
 
-        return true;
+        const now = new Date();
+        const params = {
+            ...data,
+            url: getRedactedUrl(),
+
+            _cvar: this.visitVariables, // user custom vars
+            res: `${window.screen.width}x${window.screen.height}`, // resolution as WWWWxHHHH
+            rand: String(Math.random()).slice(2, 8), // random nonce to cache-bust
+            h: now.getHours(),
+            m: now.getMinutes(),
+            s: now.getSeconds(),
+        };
+
+        const url = new URL(this.baseUrl);
+        for (const key in params) {
+            url.searchParams.set(key, params[key]);
+        }
+
+        try {
+            await window.fetch(url, {
+                method: "GET",
+                mode: "no-cors",
+                cache: "no-cache",
+                redirect: "follow",
+            });
+        } catch (e) {
+            console.error("Analytics error: ", e);
+            window.err = e;
+        }
+    }
+
+    ping() {
+        this._track({
+            ping: 1,
+        });
+        localStorage.setItem(LAST_VISIT_TS_KEY, new Date().getTime()); // update last visit ts
     }
 
     trackPageChange(generationTimeMs) {
@@ -193,31 +256,29 @@ class Analytics {
             return;
         }
 
-        if (typeof generationTimeMs === 'number') {
-            this._paq.push(['setGenerationTimeMs', generationTimeMs]);
-        } else {
+        if (typeof generationTimeMs !== 'number') {
             console.warn('Analytics.trackPageChange: expected generationTimeMs to be a number');
             // But continue anyway because we still want to track the change
         }
 
-        this._paq.push(['setCustomUrl', getRedactedUrl()]);
-        this._paq.push(['trackPageView']);
+        this._track({
+            gt_ms: generationTimeMs,
+        });
     }
 
     trackEvent(category, action, name, value) {
         if (this.disabled) return;
-        this._paq.push(['setCustomUrl', getRedactedUrl()]);
-        this._paq.push(['trackEvent', category, action, name, value]);
-    }
-
-    logout() {
-        if (this.disabled) return;
-        this._paq.push(['deleteCookies']);
+        this._track({
+            e_c: category,
+            e_a: action,
+            e_n: name,
+            e_v: value,
+        });
     }
 
     _setVisitVariable(key, value) {
         if (this.disabled) return;
-        this._paq.push(['setCustomVariable', customVariables[key].id, key, value, 'visit']);
+        this.visitVariables[customVariables[key].id] = [key, value];
     }
 
     setLoggedIn(isGuest, homeserverUrl, identityServerUrl) {
@@ -234,23 +295,16 @@ class Analytics {
         this._setVisitVariable('Identity Server URL', whitelistRedact(whitelistedISUrls, identityServerUrl));
     }
 
-    setRichtextMode(state) {
-        if (this.disabled) return;
-        this._setVisitVariable('RTE: Uses Richtext Mode', state ? 'on' : 'off');
-    }
-
     setBreadcrumbs(state) {
         if (this.disabled) return;
         this._setVisitVariable('Breadcrumbs', state ? 'enabled' : 'disabled');
     }
 
-    showDetailsModal() {
+    showDetailsModal = () => {
         let rows = [];
-        if (window.Piwik) {
-            const Tracker = window.Piwik.getAsyncTracker();
-            rows = Object.values(customVariables).map((v) => Tracker.getCustomVariable(v.id)).filter(Boolean);
+        if (!this.disabled) {
+            rows = Object.values(this.visitVariables);
         } else {
-            // Piwik may not have been enabled, so show example values
             rows = Object.keys(customVariables).map(
                 (k) => [
                     k,
@@ -300,7 +354,7 @@ class Analytics {
                 </div>
             </div>,
         });
-    }
+    };
 }
 
 if (!global.mxAnalytics) {
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 303bae42b1..24bf99ed24 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -632,7 +632,7 @@ export async function onLoggedOut() {
  * @returns {Promise} promise which resolves once the stores have been cleared
  */
 async function _clearStorage() {
-    Analytics.logout();
+    Analytics.disable();
 
     if (window.localStorage) {
         window.localStorage.clear();

From 98e8fed26e871a9dea34abbcbb76bf067ad0a7bf Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 13 Feb 2020 06:58:47 +0000
Subject: [PATCH 1059/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2120 of 2120 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 5f5e1290ee..09b9e4d6e0 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2143,5 +2143,6 @@
     "Verify by scanning": "Ellenőrzés kód beolvasással",
     "Destroy cross-signing keys?": "Eszközök közti hitelesítési kulcsok megsemmisítése?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Eszközök közti hitelesítési kulcsok törlése végleges. Mindenki akit ezzel hitelesítettél biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztetted el az összes eszközödet amivel eszközök közti hitelesítést tudsz végezni, nem valószínű, hogy ezt szeretnéd tenni.",
-    "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése"
+    "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése",
+    "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló visszaállítása"
 }

From 9649f2a2da62bdf5d2b517df537631d0638d5718 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 13 Feb 2020 10:11:48 +0000
Subject: [PATCH 1060/3235] don't show tooltips on big icons

fixes: https://github.com/vector-im/riot-web/issues/12191
---
 src/components/views/rooms/E2EIcon.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 9480accb1a..39a90d1bec 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -52,6 +52,8 @@ const legacyRoomTitles = {
 };
 
 const E2EIcon = ({isUser, status, className, size, onClick}) => {
+    const sizeThreshold = 25; // the size of an avatar + 1
+
     const [hover, setHover] = useState(false);
 
     const classes = classNames({
@@ -82,7 +84,7 @@ const E2EIcon = ({isUser, status, className, size, onClick}) => {
     const onMouseOut = () => setHover(false);
 
     let tip;
-    if (hover) {
+    if (hover && (!size || size <= sizeThreshold)) {
         tip = <Tooltip label={e2eTitle ? _t(e2eTitle) : ""} />;
     }
 

From 0c4ee0091e43a69e981f021441373849829bba3a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 10:47:50 +0000
Subject: [PATCH 1061/3235] Update comment and clear up localstorage on
 disabling

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index fc1b7c5827..e95887a810 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -195,8 +195,7 @@ class Analytics {
     }
 
     /**
-     * Disable Analytics calls, will not fully unload Piwik until a refresh,
-     * but this is second best, Piwik should not pull anything implicitly.
+     * Disable Analytics, stop the heartbeat and clear identifiers from localStorage
      */
     disable() {
         if (this.disabled) return;
@@ -204,6 +203,10 @@ class Analytics {
         window.clearInterval(this._heartbeatIntervalID);
         this.baseUrl = null;
         this.visitVariables = {};
+        localStorage.removeItem(UID_KEY);
+        localStorage.removeItem(CREATION_TS_KEY);
+        localStorage.removeItem(VISIT_COUNT_KEY);
+        localStorage.removeItem(LAST_VISIT_TS_KEY);
     }
 
     async _track(data) {

From f53c41550459452abc68c2f9445c4777bfa50eb7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 11:50:40 +0000
Subject: [PATCH 1062/3235] Fix sending of visit variables

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index e95887a810..39731a0e7d 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -217,7 +217,7 @@ class Analytics {
             ...data,
             url: getRedactedUrl(),
 
-            _cvar: this.visitVariables, // user custom vars
+            _cvar: JSON.stringify(this.visitVariables), // user custom vars
             res: `${window.screen.width}x${window.screen.height}`, // resolution as WWWWxHHHH
             rand: String(Math.random()).slice(2, 8), // random nonce to cache-bust
             h: now.getHours(),

From d49fbf25f71b124f57ccd9e60821eee7d2c71d13 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 14:32:33 +0100
Subject: [PATCH 1063/3235] check if verifier sasEvent was already set on mount

this allow the verification panel to fully recover
the UI state from an on-going verification request
---
 src/components/views/right_panel/VerificationPanel.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a8d4ce733b..7474f0ef48 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -258,7 +258,11 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     componentDidMount() {
-        this.props.request.on("change", this._onRequestChange);
+        const {request} = this.props;
+        request.on("change", this._onRequestChange);
+        if (request.verifier) {
+            this.setState({sasEvent: request.verifier.sasEvent});
+        }
         this._onRequestChange();
     }
 

From 68197a1d183a4c4a7b19eeeb2859131ced3a64ed Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 14:33:35 +0100
Subject: [PATCH 1064/3235] also update phase after starting request

as it might now be a request that is already ongoing
---
 src/components/views/right_panel/EncryptionPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2e9365fca3..89c9a26e92 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -69,6 +69,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
         const roomId = await ensureDMExists(cli, member.userId);
         const verificationRequest = await cli.requestVerificationDM(member.userId, roomId);
         setRequest(verificationRequest);
+        setPhase(verificationRequest.phase);
     }, [member.userId]);
 
     const requested = request && (phase === PHASE_REQUESTED || phase === undefined);

From 4b7cc12daa7e25b550e028be3399e122a45b2918 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 14:34:44 +0100
Subject: [PATCH 1065/3235] check if there is already a request in progress
 when clicking verify

and go straight there instead of first showing EncryptionInfo panel
---
 src/components/views/right_panel/UserInfo.js | 13 +++++++++++--
 src/createRoom.js                            | 14 ++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 315035db96..1174f45640 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -25,7 +25,7 @@ import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import createRoom from '../../../createRoom';
+import createRoom, {findDMForUser} from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
@@ -169,10 +169,19 @@ async function verifyDevice(userId, device) {
 }
 
 function verifyUser(user) {
+    const cli = MatrixClientPeg.get();
+    const dmRoom = findDMForUser(cli, user.userId);
+    let existingRequest;
+    if (dmRoom) {
+        existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
+    }
     dis.dispatch({
         action: "set_right_panel_phase",
         phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-        refireParams: {member: user},
+        refireParams: {
+            member: user,
+            verificationRequest: existingRequest,
+        },
     });
 }
 
diff --git a/src/createRoom.js b/src/createRoom.js
index c25b618dc6..d4575633b3 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -159,7 +159,7 @@ export default function createRoom(opts) {
     });
 }
 
-export async function ensureDMExists(client, userId) {
+export function findDMForUser(client, userId) {
     const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
     const rooms = roomIds.map(id => client.getRoom(id));
     const suitableDMRooms = rooms.filter(r => {
@@ -169,10 +169,16 @@ export async function ensureDMExists(client, userId) {
         }
         return false;
     });
-    let roomId;
     if (suitableDMRooms.length) {
-        const room = suitableDMRooms[0];
-        roomId = room.roomId;
+        return suitableDMRooms[0];
+    }
+}
+
+export async function ensureDMExists(client, userId) {
+    const existingDMRoom = findDMForUser(client, userId);
+    let roomId;
+    if (existingDMRoom) {
+        roomId = existingDMRoom.roomId;
     } else {
         roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
     }

From c3af1a2f95ff5ed59d093f32a03fec7f8f0f9f25 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 13 Feb 2020 13:47:39 +0000
Subject: [PATCH 1066/3235] don't be too magic about hiding tooltips

---
 src/components/views/right_panel/VerificationPanel.js | 2 +-
 src/components/views/rooms/E2EIcon.js                 | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a8d4ce733b..69eb55f9b2 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -149,7 +149,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <p>{_t("You've successfully verified %(displayName)s!", {
                     displayName: member.displayName || member.name || member.userId,
                 })}</p>
-                <E2EIcon isUser={true} status="verified" size={128} />
+                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true}/>
                 <p>Verify all users in a room to ensure it's secure.</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 39a90d1bec..a2c99fad99 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -51,9 +51,7 @@ const legacyRoomTitles = {
     [E2E_STATE.VERIFIED]: _td("All sessions in this encrypted room are trusted"),
 };
 
-const E2EIcon = ({isUser, status, className, size, onClick}) => {
-    const sizeThreshold = 25; // the size of an avatar + 1
-
+const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
     const [hover, setHover] = useState(false);
 
     const classes = classNames({
@@ -84,7 +82,7 @@ const E2EIcon = ({isUser, status, className, size, onClick}) => {
     const onMouseOut = () => setHover(false);
 
     let tip;
-    if (hover && (!size || size <= sizeThreshold)) {
+    if (hover && !hideTooltip) {
         tip = <Tooltip label={e2eTitle ? _t(e2eTitle) : ""} />;
     }
 

From 37f1104f61acae8962d0dd5920c3983ce7a76777 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:15:08 +0000
Subject: [PATCH 1067/3235] lint

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 69eb55f9b2..08c3935a2c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -149,7 +149,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <p>{_t("You've successfully verified %(displayName)s!", {
                     displayName: member.displayName || member.name || member.userId,
                 })}</p>
-                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true}/>
+                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
                 <p>Verify all users in a room to ensure it's secure.</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>

From 6319407cab89a762a7db0312f468eb36e08653ee Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Thu, 13 Feb 2020 16:02:58 +0100
Subject: [PATCH 1068/3235] Move the sidebar to below the sidebar tab buttons
 for screen readers.

Do this by aria-owning the sidebar into the header wrapper. aria-owned subtrees get added as the last child after all other child elements that are in the DOM. This way, if a sidebar tab is activated, the aside element now is inserted in a position following the tabs, before the main messages list. The association for screen readers is therefore more logical. This has no bearing on the DOM order or CSS properties. aria-owns simply rearranges the accessibility tree.

Fixes vector-im/riot-web/issues/11319

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/structures/RightPanel.js  | 2 +-
 src/components/views/rooms/RoomHeader.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 45722caa98..90e71a770b 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -285,7 +285,7 @@ export default class RightPanel extends React.Component {
         });
 
         return (
-            <aside className={classes}>
+            <aside className={classes} id="sidebarPanel">
                 { panel }
             </aside>
         );
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 3c0f2e3d41..cabfc48ec5 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -314,7 +314,7 @@ export default createReactClass({
 
         return (
             <div className="mx_RoomHeader light-panel">
-                <div className="mx_RoomHeader_wrapper">
+                <div className="mx_RoomHeader_wrapper" aria-owns="sidebarPanel">
                     <div className="mx_RoomHeader_avatar">{ roomAvatar }{ e2eIcon }</div>
                     { privateIcon }
                     { name }

From 163539d9f43c504a21eff63c24d334a1f20998db Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 15:57:48 +0000
Subject: [PATCH 1069/3235] Upgrade JS SDK to 5.0.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 2c4d0144d4..310b1154a6 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "4.0.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index b892ac44f6..232067a99f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,9 +5760,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+matrix-js-sdk@4.0.0:
   version "4.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/21e4c597d9633aef606871cf9ffffaf039142be3"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0.tgz#c81bdc905af2ab1634527e5f542f2f15977d31cf"
+  integrity sha512-Xbe36xL443qtEBH4xk0k39JabolqZfloK7fwYGMb/PgWO26VOzvw94XWahnIr5w83oxBAF9nFmP+7EnPG6IHnA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 3ec0301f9dd9d23f7e7aa41742fa2b54dbaf1f83 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 17:28:10 +0100
Subject: [PATCH 1070/3235] use canAccept in toast, which takes local echo into
 account

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

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index a831505a05..4a881ae852 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -58,7 +58,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
     _checkRequestIsPending = () => {
         const {request} = this.props;
-        if (request.ready || request.done || request.cancelled || request.observeOnly) {
+        if (!request.canAccept) {
             ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         }
     };

From 3eb07465f7709612e1b35865de78d3ea5d496c18 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 17:29:13 +0100
Subject: [PATCH 1071/3235] use canAccept in tile, which takes local echo into
 account

---
 src/components/views/messages/MKeyVerificationRequest.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 9a48858bc7..0f5f417dbc 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -59,7 +59,6 @@ export default class MKeyVerificationRequest extends React.Component {
     };
 
     _onAcceptClicked = async () => {
-        this.setState({acceptOrCancelClicked: true});
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
@@ -72,7 +71,6 @@ export default class MKeyVerificationRequest extends React.Component {
     };
 
     _onRejectClicked = async () => {
-        this.setState({acceptOrCancelClicked: true});
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
@@ -137,11 +135,10 @@ export default class MKeyVerificationRequest extends React.Component {
                 _t("%(name)s wants to verify", {name})}</div>);
             subtitle = (<div className="mx_cryptoEvent_subtitle">{
                 userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
-            if (request.requested && !request.observeOnly) {
-                const disabled = this.state.acceptOrCancelClicked;
+            if (request.canAccept) {
                 stateNode = (<div className="mx_cryptoEvent_buttons">
-                    <FormButton disabled={disabled} kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
-                    <FormButton disabled={disabled} onClick={this._onAcceptClicked} label={_t("Accept")} />
+                    <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
+                    <FormButton onClick={this._onAcceptClicked} label={_t("Accept")} />
                 </div>);
             }
         } else { // request sent by us

From 3292991491b8dec2fc35d91999e135f0fe95b67f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 13 Feb 2020 17:29:38 +0100
Subject: [PATCH 1072/3235] provide specific label for when accepting/declining
 is in progress

also distuingish between cancelling and declining
---
 .../views/messages/MKeyVerificationRequest.js | 24 +++++++++++++++----
 src/i18n/strings/en_EN.json                   |  4 ++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 0f5f417dbc..d02319119e 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -94,10 +94,20 @@ export default class MKeyVerificationRequest extends React.Component {
     _cancelledLabel(userId) {
         const client = MatrixClientPeg.get();
         const myUserId = client.getUserId();
+        const {cancellationCode} = this.props.mxEvent.verificationRequest;
+        const declined = cancellationCode === "m.user";
         if (userId === myUserId) {
-            return _t("You cancelled");
+            if (declined) {
+                return _t("You declined");
+            } else {
+                return _t("You cancelled");
+            }
         } else {
-            return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+            if (declined) {
+                return _t("%(name)s declined", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+            } else {
+                return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+            }
         }
     }
 
@@ -116,15 +126,19 @@ export default class MKeyVerificationRequest extends React.Component {
         let subtitle;
         let stateNode;
 
-        const accepted = request.ready || request.started || request.done;
-        if (accepted || request.cancelled) {
+        if (!request.canAccept) {
             let stateLabel;
+            const accepted = request.ready || request.started || request.done;
             if (accepted) {
                 stateLabel = (<AccessibleButton onClick={this._openRequest}>
                     {this._acceptedLabel(request.receivingUserId)}
                 </AccessibleButton>);
-            } else {
+            } else if (request.cancelled) {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
+            } else if (request.accepting) {
+                stateLabel = _t("accepting …");
+            } else if (request.declining) {
+                stateLabel = _t("declining …");
             }
             stateNode = (<div className="mx_cryptoEvent_state">{stateLabel}</div>);
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7a8642be95..eb0a66b79f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1239,8 +1239,12 @@
     "%(name)s cancelled verifying": "%(name)s cancelled verifying",
     "You accepted": "You accepted",
     "%(name)s accepted": "%(name)s accepted",
+    "You declined": "You declined",
     "You cancelled": "You cancelled",
+    "%(name)s declined": "%(name)s declined",
     "%(name)s cancelled": "%(name)s cancelled",
+    "accepting …": "accepting …",
+    "declining …": "declining …",
     "%(name)s wants to verify": "%(name)s wants to verify",
     "You sent a verification request": "You sent a verification request",
     "Error decrypting video": "Error decrypting video",

From 627a4d4ea44da90b3fa8ec611d90815e00272024 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 16:53:45 +0000
Subject: [PATCH 1073/3235] Update comments and such

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/MFileBody.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index aee7d903aa..f67cd1b2b0 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -268,12 +268,12 @@ export default createReactClass({
                     // will have the correct name when the user tries to download it.
                     // We can't provide a Content-Disposition header like we would for HTTP.
                     download: fileName,
-                    rel: "noopener",
-                    target: "_blank",
                     textContent: _t("Download %(text)s", { text: text }),
                 }, "*");
             };
 
+            const url = "usercontent/"; // XXX: this path should probably be passed from the skin
+
             // If the attachment is encrypted then put the link inside an iframe.
             return (
                 <span className="mx_MFileBody">
@@ -286,7 +286,11 @@ export default createReactClass({
                               */ }
                             <a ref={this._dummyLink} />
                         </div>
-                        <iframe src="usercontent/" onLoad={onIframeLoad} ref={this._iframe} sandbox="allow-scripts allow-downloads" />
+                        <iframe
+                            src={`${url}?origin=${encodeURIComponent(window.location.origin)}`}
+                            onLoad={onIframeLoad}
+                            ref={this._iframe}
+                            sandbox="allow-scripts allow-downloads" />
                     </div>
                 </span>
             );

From 4ed27a4ba65ad5cd5b27d26b45f0a319bef87eae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 16:58:27 +0000
Subject: [PATCH 1074/3235] Move bulk to react-sdk and reference it from
 riot-web land

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 docs/usercontent.md        | 27 +++++++++++++++++++++
 src/usercontent/index.html | 12 ++++++++++
 src/usercontent/index.js   | 49 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 docs/usercontent.md
 create mode 100644 src/usercontent/index.html
 create mode 100644 src/usercontent/index.js

diff --git a/docs/usercontent.md b/docs/usercontent.md
new file mode 100644
index 0000000000..e54851dd0d
--- /dev/null
+++ b/docs/usercontent.md
@@ -0,0 +1,27 @@
+# Usercontent
+
+While decryption itself is safe to be done without a sandbox,
+letting the browser and user interact with the resulting data may be dangerous,
+previously `usercontent.riot.im` was used to act as a sandbox on a different origin to close the attack surface,
+it is now possible to do by using a combination of a sandboxed iframe and some code written into the app which consumes this SDK.
+
+Usercontent is an iframe sandbox target for allowing a user to safely download a decrypted attachment from a sandboxed origin where it cannot be used to XSS your riot session out from under you.
+
+Its function is to create an Object URL for the user/browser to use but bound to an origin different to that of the riot instance to protect against XSS.
+
+It exposes a function over a postMessage API, when sent an object with the matching fields to render a download link with the Object URL:
+
+```json5
+{
+    "imgSrc": "", // the src of the image to display in the download link
+    "imgStyle": "", // the style to apply to the image
+    "style":  "", // the style to apply to the download link
+    "download": "", // download attribute to pass to the <a/> tag
+    "textContent": "", // the text to put inside the download link
+    "blob": "", // the data blob to wrap in an object url and allow the user to download
+}
+```
+
+If only imgSrc, imgStyle and style are passed then just update the existing link without overwriting other things about it.
+
+It is expected that this target be available at `usercontent/` relative to the root of the app, this can be seen in riot-web's webpack config.
diff --git a/src/usercontent/index.html b/src/usercontent/index.html
new file mode 100644
index 0000000000..90a0fe7c16
--- /dev/null
+++ b/src/usercontent/index.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+    <!--
+    Hello! If you're reading this, perhaps you're wondering what this
+    file is doing and why your Riot is using it.
+    In short, this allows Riot to isolate potentially unsafe encrypted
+    attachments into their own origin, away from your Riot.
+    Stay curious!
+    -->
+</head>
+<body></body>
+</html>
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
new file mode 100644
index 0000000000..8e77f6860e
--- /dev/null
+++ b/src/usercontent/index.js
@@ -0,0 +1,49 @@
+var params = window.location.search.substring(1).split('&');
+var lockOrigin;
+for (var i = 0; i < params.length; ++i) {
+    var parts = params[i].split('=');
+    if (parts[0] === 'origin') lockOrigin = decodeURIComponent(parts[1]);
+}
+
+function remoteRender(event) {
+    const data = event.data;
+
+    const img = document.createElement("img");
+    img.id = "img";
+    img.src = data.imgSrc;
+    img.style = data.imgStyle;
+
+    const a = document.createElement("a");
+    a.id = "a";
+    a.rel = "noopener";
+    a.target = "_blank";
+    a.download = data.download;
+    a.style = data.style;
+    a.style.fontFamily = "Arial, Helvetica, Sans-Serif";
+    a.href = window.URL.createObjectURL(data.blob);
+    a.appendChild(img);
+    a.appendChild(document.createTextNode(data.textContent));
+
+    const body = document.body;
+    // Don't display scrollbars if the link takes more than one line to display.
+    body.style = "margin: 0px; overflow: hidden";
+    body.appendChild(a);
+}
+
+function remoteSetTint(event) {
+    const data = event.data;
+
+    const img = document.getElementById("img");
+    img.src = data.imgSrc;
+    img.style = data.imgStyle;
+
+    const a = document.getElementById("a");
+    a.style = data.style;
+}
+
+window.onmessage = function(e) {
+    if (lockOrigin === undefined || e.origin === lockOrigin) {
+        if (e.data.blob) remoteRender(e);
+        else remoteSetTint(e);
+    }
+};

From 8ea13d9b57ec3be24b45db98079fb2b49bd92a78 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2020 17:05:48 +0000
Subject: [PATCH 1075/3235] delint prefer let/const over var

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/usercontent/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 8e77f6860e..0648cbb238 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -1,7 +1,7 @@
-var params = window.location.search.substring(1).split('&');
-var lockOrigin;
-for (var i = 0; i < params.length; ++i) {
-    var parts = params[i].split('=');
+const params = window.location.search.substring(1).split('&');
+let lockOrigin;
+for (let i = 0; i < params.length; ++i) {
+    const parts = params[i].split('=');
     if (parts[0] === 'origin') lockOrigin = decodeURIComponent(parts[1]);
 }
 

From 32c2d848a4ba01de3c35452ffba4f0f9b9cebdd5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 17:35:56 +0000
Subject: [PATCH 1076/3235] Prepare changelog for v2.1.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 881669a1a2..3665636f3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,366 @@
+Changes in [2.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.1) (2020-02-13)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0...v2.1.0-rc.1)
+
+ * Upgrade JS SDK to 5.0.0-rc.1
+ * don't show tooltips on big icons
+   [\#4067](https://github.com/matrix-org/matrix-react-sdk/pull/4067)
+ * Update from Weblate
+   [\#4069](https://github.com/matrix-org/matrix-react-sdk/pull/4069)
+ * Fix sending of visit variables to Matomo
+   [\#4068](https://github.com/matrix-org/matrix-react-sdk/pull/4068)
+ * Use embedded piwik script rather than piwik.js to respect CSP
+   [\#4066](https://github.com/matrix-org/matrix-react-sdk/pull/4066)
+ * remove methods arg to requestVerification(DM)
+   [\#4058](https://github.com/matrix-org/matrix-react-sdk/pull/4058)
+ * Check for null config settings a bit safer
+   [\#4061](https://github.com/matrix-org/matrix-react-sdk/pull/4061)
+ * Score user ID searches higher when they match nearly exactly
+   [\#4060](https://github.com/matrix-org/matrix-react-sdk/pull/4060)
+ * Fix uncentered letter inside avatar for currently typing users
+   [\#4051](https://github.com/matrix-org/matrix-react-sdk/pull/4051)
+ * Disable 'start' button after clicking in VerificationPanel
+   [\#4065](https://github.com/matrix-org/matrix-react-sdk/pull/4065)
+ * Fixed bug where key reset didn't always return the right key
+   [\#4057](https://github.com/matrix-org/matrix-react-sdk/pull/4057)
+ * Don't render avatars in pills for screen readers.
+   [\#4062](https://github.com/matrix-org/matrix-react-sdk/pull/4062)
+ * Make QR self-verification compatible with RiotX
+   [\#4044](https://github.com/matrix-org/matrix-react-sdk/pull/4044)
+ * Verify single device from other user in right panel & Not Trusted dialog
+   [\#4043](https://github.com/matrix-org/matrix-react-sdk/pull/4043)
+ * Disable verification buttons after clicking to avoid double submission
+   [\#4049](https://github.com/matrix-org/matrix-react-sdk/pull/4049)
+ * Verification toast fixes
+   [\#4048](https://github.com/matrix-org/matrix-react-sdk/pull/4048)
+ * Use EncryptionPanel everywhere, part I
+   [\#4042](https://github.com/matrix-org/matrix-react-sdk/pull/4042)
+ * quick fix for cross-signing reset bug
+   [\#4056](https://github.com/matrix-org/matrix-react-sdk/pull/4056)
+ * Fix error message rendering for key entry
+   [\#4055](https://github.com/matrix-org/matrix-react-sdk/pull/4055)
+ * Fix recaptcha blocked by CSP for non-SSL origins
+   [\#4052](https://github.com/matrix-org/matrix-react-sdk/pull/4052)
+ * Fix watcher for showTypingNotifications setting
+   [\#4054](https://github.com/matrix-org/matrix-react-sdk/pull/4054)
+ * Allow custom hs url submission on enter
+   [\#4053](https://github.com/matrix-org/matrix-react-sdk/pull/4053)
+ * Support keepSecretStoragePassphraseForSession at the config level too
+   [\#4045](https://github.com/matrix-org/matrix-react-sdk/pull/4045)
+ * Add setting to allow hiding of typing indicator
+   [\#4047](https://github.com/matrix-org/matrix-react-sdk/pull/4047)
+ * Button to reset cross-signing and SSSS keys
+   [\#4041](https://github.com/matrix-org/matrix-react-sdk/pull/4041)
+ * Use forms to wrap password fields so Chrome doesn't go wild
+   [\#3974](https://github.com/matrix-org/matrix-react-sdk/pull/3974)
+ * Update QR code rendering to support VerificationRequests
+   [\#4001](https://github.com/matrix-org/matrix-react-sdk/pull/4001)
+ * Differentiate AccessSecretStorageDialog dismiss dialog based on which key we
+   want to read
+   [\#4038](https://github.com/matrix-org/matrix-react-sdk/pull/4038)
+ * Only emit in RoomViewStore when state actually changes
+   [\#4039](https://github.com/matrix-org/matrix-react-sdk/pull/4039)
+ * Mark AccessSecretStorageDialog to not be closed by clicking background
+   [\#4029](https://github.com/matrix-org/matrix-react-sdk/pull/4029)
+ * Let pointer events fall through to scroll button
+   [\#4037](https://github.com/matrix-org/matrix-react-sdk/pull/4037)
+ * Improve event indexing status strings for translation
+   [\#4035](https://github.com/matrix-org/matrix-react-sdk/pull/4035)
+ * Button size reviewed for word consuming languages & Settings showing devices
+   are a bit too tight
+   [\#4024](https://github.com/matrix-org/matrix-react-sdk/pull/4024)
+ * Only enumerate settings handlers which are supported
+   [\#4034](https://github.com/matrix-org/matrix-react-sdk/pull/4034)
+ * Fix listener removal in verification tile
+   [\#4036](https://github.com/matrix-org/matrix-react-sdk/pull/4036)
+ * Do not show alarming red shields on large encrypted rooms for your own
+   device
+   [\#4028](https://github.com/matrix-org/matrix-react-sdk/pull/4028)
+ * Add a class for styling room directory permissions
+   [\#4007](https://github.com/matrix-org/matrix-react-sdk/pull/4007)
+ * double-check user verification
+   [\#4010](https://github.com/matrix-org/matrix-react-sdk/pull/4010)
+ * Use minimist instead of optimist as it is deprecated
+   [\#4031](https://github.com/matrix-org/matrix-react-sdk/pull/4031)
+ * SettingsStore, use a counter instead of wall clock for watcher ids
+   [\#4032](https://github.com/matrix-org/matrix-react-sdk/pull/4032)
+ * Don't crash immediately if the room directory chunk is null/empty
+   [\#4027](https://github.com/matrix-org/matrix-react-sdk/pull/4027)
+ * Fix verification toast to close at 0s
+   [\#3998](https://github.com/matrix-org/matrix-react-sdk/pull/3998)
+ * Fix listener leak in TagPanel
+   [\#4026](https://github.com/matrix-org/matrix-react-sdk/pull/4026)
+ * Update from Weblate
+   [\#4025](https://github.com/matrix-org/matrix-react-sdk/pull/4025)
+ * Honour the isLogin flag in theme.js
+   [\#4023](https://github.com/matrix-org/matrix-react-sdk/pull/4023)
+ * ManageEventIndexDialog: Show how many rooms are being currently crawled.
+   [\#4022](https://github.com/matrix-org/matrix-react-sdk/pull/4022)
+ * Advertise that we can scan QR codes even though we can't
+   [\#4021](https://github.com/matrix-org/matrix-react-sdk/pull/4021)
+ * Checkpoint addition fixes and return of the crawler sleep time setting.
+   [\#4020](https://github.com/matrix-org/matrix-react-sdk/pull/4020)
+ * Truncate SAS emoji labels to fit
+   [\#4018](https://github.com/matrix-org/matrix-react-sdk/pull/4018)
+ * Apply copy edits to security setup flow
+   [\#4017](https://github.com/matrix-org/matrix-react-sdk/pull/4017)
+ * Fix user trust text to match what was checked
+   [\#4016](https://github.com/matrix-org/matrix-react-sdk/pull/4016)
+ * Fix size of invite only icon
+   [\#4015](https://github.com/matrix-org/matrix-react-sdk/pull/4015)
+ * Add temporary feature flag to control padlocks
+   [\#4013](https://github.com/matrix-org/matrix-react-sdk/pull/4013)
+ * Add an override for the theme
+   [\#4014](https://github.com/matrix-org/matrix-react-sdk/pull/4014)
+ * Add title to complete security loading
+   [\#4011](https://github.com/matrix-org/matrix-react-sdk/pull/4011)
+ * Only display the first zxcvbn warning/suggestion
+   [\#4012](https://github.com/matrix-org/matrix-react-sdk/pull/4012)
+ * Log exceptions from accessSecretStorage
+   [\#4009](https://github.com/matrix-org/matrix-react-sdk/pull/4009)
+ * Add advanced option to keep secret storage in memory for session
+   [\#3995](https://github.com/matrix-org/matrix-react-sdk/pull/3995)
+ * Add shields to member list, move power label to text
+   [\#4006](https://github.com/matrix-org/matrix-react-sdk/pull/4006)
+ * Make encryption events into bubble-style tiles
+   [\#4005](https://github.com/matrix-org/matrix-react-sdk/pull/4005)
+ * Update copy when the user verifies their own devices
+   [\#4000](https://github.com/matrix-org/matrix-react-sdk/pull/4000)
+ * Use Sets instead of array scans and simplify hiding of invalid users when
+   inviting
+   [\#4004](https://github.com/matrix-org/matrix-react-sdk/pull/4004)
+ * Fix room completion for invited rooms and upgraded rooms
+   [\#4003](https://github.com/matrix-org/matrix-react-sdk/pull/4003)
+ * Make shields in UserInfo black if user isn't verified
+   [\#3999](https://github.com/matrix-org/matrix-react-sdk/pull/3999)
+ * Change verify user text
+   [\#3994](https://github.com/matrix-org/matrix-react-sdk/pull/3994)
+ * Disable all inputs in login form while busy, not just the submit button
+   [\#3996](https://github.com/matrix-org/matrix-react-sdk/pull/3996)
+ * fix SAS dialog width
+   [\#3993](https://github.com/matrix-org/matrix-react-sdk/pull/3993)
+ * Update placeholder in the composer when it gets changed
+   [\#3990](https://github.com/matrix-org/matrix-react-sdk/pull/3990)
+ * Send initial device display name on register
+   [\#3992](https://github.com/matrix-org/matrix-react-sdk/pull/3992)
+ * Update QR code handling for new spec
+   [\#3959](https://github.com/matrix-org/matrix-react-sdk/pull/3959)
+ * Apply the Olympic effect to SAS Emoji Verification
+   [\#3989](https://github.com/matrix-org/matrix-react-sdk/pull/3989)
+ * Pass an ID to the <Field/> as needed and fix div inside p nesting
+   [\#3988](https://github.com/matrix-org/matrix-react-sdk/pull/3988)
+ * Update user info for device and trust changes
+   [\#3987](https://github.com/matrix-org/matrix-react-sdk/pull/3987)
+ * Relax secret storage account data check
+   [\#3985](https://github.com/matrix-org/matrix-react-sdk/pull/3985)
+ * Fix various races that prevented the right panel being in the right state
+   for verifications
+   [\#3984](https://github.com/matrix-org/matrix-react-sdk/pull/3984)
+ * Fix verifying individual devices
+   [\#3986](https://github.com/matrix-org/matrix-react-sdk/pull/3986)
+ * Update from Weblate
+   [\#3982](https://github.com/matrix-org/matrix-react-sdk/pull/3982)
+ * Replace device with session in UI text
+   [\#3980](https://github.com/matrix-org/matrix-react-sdk/pull/3980)
+ * Add missing await causing promises to be leaked as room IDs
+   [\#3981](https://github.com/matrix-org/matrix-react-sdk/pull/3981)
+ * Change new session toast to unverified
+   [\#3978](https://github.com/matrix-org/matrix-react-sdk/pull/3978)
+ * Replace Verify button in UserInfo verification with "Learn more"
+   [\#3975](https://github.com/matrix-org/matrix-react-sdk/pull/3975)
+ * Don't peek until the matrix client is ready
+   [\#3979](https://github.com/matrix-org/matrix-react-sdk/pull/3979)
+ * Verification: don't block UI update on verification finishing
+   [\#3976](https://github.com/matrix-org/matrix-react-sdk/pull/3976)
+ * Adjust icons with in person with design
+   [\#3977](https://github.com/matrix-org/matrix-react-sdk/pull/3977)
+ * Update copy for right panel verification
+   [\#3973](https://github.com/matrix-org/matrix-react-sdk/pull/3973)
+ * Check for timeline in pre-join UISI path
+   [\#3972](https://github.com/matrix-org/matrix-react-sdk/pull/3972)
+ * Let users paste text if they've already started filtering invite targets
+   [\#3970](https://github.com/matrix-org/matrix-react-sdk/pull/3970)
+ * Filter event types when deciding on activity metrics for DM suggestions
+   [\#3969](https://github.com/matrix-org/matrix-react-sdk/pull/3969)
+ * Revert a change causing a login loop
+   [\#3971](https://github.com/matrix-org/matrix-react-sdk/pull/3971)
+ * Improve the docs for the event index and fix some type hints.
+   [\#3960](https://github.com/matrix-org/matrix-react-sdk/pull/3960)
+ * Automatically focus on the invite dialog input
+   [\#3968](https://github.com/matrix-org/matrix-react-sdk/pull/3968)
+ * Restore key backup in Complete Security dialog
+   [\#3966](https://github.com/matrix-org/matrix-react-sdk/pull/3966)
+ * Right Panel Verification improvements
+   [\#3967](https://github.com/matrix-org/matrix-react-sdk/pull/3967)
+ * Cross Signing Right Panel Verification Decoration
+   [\#3950](https://github.com/matrix-org/matrix-react-sdk/pull/3950)
+ * Passing refireParams actually prevented this from working
+   [\#3965](https://github.com/matrix-org/matrix-react-sdk/pull/3965)
+ * Start new key backup in security setup flow
+   [\#3964](https://github.com/matrix-org/matrix-react-sdk/pull/3964)
+ * Tweak styling of the unread indicator circle.
+   [\#3958](https://github.com/matrix-org/matrix-react-sdk/pull/3958)
+ * Add device IDs in user info tooltips
+   [\#3963](https://github.com/matrix-org/matrix-react-sdk/pull/3963)
+ * Improve encryption upgrade on login flow
+   [\#3962](https://github.com/matrix-org/matrix-react-sdk/pull/3962)
+ * Switch back to legacy decorators
+   [\#3961](https://github.com/matrix-org/matrix-react-sdk/pull/3961)
+ * Style bridge settings tab according to design
+   [\#3894](https://github.com/matrix-org/matrix-react-sdk/pull/3894)
+ * Fix skinning and babel targets
+   [\#3957](https://github.com/matrix-org/matrix-react-sdk/pull/3957)
+ * Enable cross-signing lab when key in storage
+   [\#3956](https://github.com/matrix-org/matrix-react-sdk/pull/3956)
+ * Add new session verification details dialog
+   [\#3953](https://github.com/matrix-org/matrix-react-sdk/pull/3953)
+ * Fix issue where we don't notice if our own devices shouldn't be trusted
+   [\#3949](https://github.com/matrix-org/matrix-react-sdk/pull/3949)
+ * Add separate component for post-auth security flows
+   [\#3951](https://github.com/matrix-org/matrix-react-sdk/pull/3951)
+ * Add more logging to settings watchers
+   [\#3952](https://github.com/matrix-org/matrix-react-sdk/pull/3952)
+ * Use https for recaptcha for all non-http protocols
+   [\#3944](https://github.com/matrix-org/matrix-react-sdk/pull/3944)
+ * Add status and management UI for the event indexer
+   [\#3672](https://github.com/matrix-org/matrix-react-sdk/pull/3672)
+ * Remove DM icons if `feature_cross_signing` is enabled; hide padlocks in DM
+   room headers
+   [\#3948](https://github.com/matrix-org/matrix-react-sdk/pull/3948)
+ * Stop rogue verification toast if you verify during login
+   [\#3943](https://github.com/matrix-org/matrix-react-sdk/pull/3943)
+ * Show incoming verification requests in the 'complete security' phase
+   [\#3942](https://github.com/matrix-org/matrix-react-sdk/pull/3942)
+ * Dismiss logged out device toasts
+   [\#3941](https://github.com/matrix-org/matrix-react-sdk/pull/3941)
+ * Verification nag toasts
+   [\#3940](https://github.com/matrix-org/matrix-react-sdk/pull/3940)
+ * Update from Weblate
+   [\#3947](https://github.com/matrix-org/matrix-react-sdk/pull/3947)
+ * Remember password for e2e bootstrapping
+   [\#3939](https://github.com/matrix-org/matrix-react-sdk/pull/3939)
+ * fix compound emoji
+   [\#3946](https://github.com/matrix-org/matrix-react-sdk/pull/3946)
+ * Setup flow for cross-signing on login / registration
+   [\#3937](https://github.com/matrix-org/matrix-react-sdk/pull/3937)
+ * Update profile avatar letter size
+   [\#3935](https://github.com/matrix-org/matrix-react-sdk/pull/3935)
+ * Hide default encryption algorithm
+   [\#3936](https://github.com/matrix-org/matrix-react-sdk/pull/3936)
+ * Resolve default export warnings from Webpack
+   [\#3938](https://github.com/matrix-org/matrix-react-sdk/pull/3938)
+ * Add null check for cross-signing info in verification panel
+   [\#3934](https://github.com/matrix-org/matrix-react-sdk/pull/3934)
+ * Add trace logging to figure out which component is causing weird events
+   [\#3926](https://github.com/matrix-org/matrix-react-sdk/pull/3926)
+ * Remove user lists feature flag, making it the default
+   [\#3906](https://github.com/matrix-org/matrix-react-sdk/pull/3906)
+ * Last bit of polish for user lists
+   [\#3925](https://github.com/matrix-org/matrix-react-sdk/pull/3925)
+ * QR code verification
+   [\#3871](https://github.com/matrix-org/matrix-react-sdk/pull/3871)
+ * Do less unnecessary work on CI
+   [\#3933](https://github.com/matrix-org/matrix-react-sdk/pull/3933)
+ * Re-enable stylelint on CI
+   [\#3932](https://github.com/matrix-org/matrix-react-sdk/pull/3932)
+ * Design pass for room icons
+   [\#3931](https://github.com/matrix-org/matrix-react-sdk/pull/3931)
+ * Populate the file panel using the event index if available.
+   [\#3858](https://github.com/matrix-org/matrix-react-sdk/pull/3858)
+ * Split AsyncWrapper out from Modal
+   [\#3928](https://github.com/matrix-org/matrix-react-sdk/pull/3928)
+ * Fix error in verification code on develop
+   [\#3930](https://github.com/matrix-org/matrix-react-sdk/pull/3930)
+ * Seperates out the padlock icon, and adds a tooltip
+   [\#3929](https://github.com/matrix-org/matrix-react-sdk/pull/3929)
+ * Cross Signing redesign for composer
+   [\#3910](https://github.com/matrix-org/matrix-react-sdk/pull/3910)
+ * Fix verifying your own devices with to_device messages
+   [\#3927](https://github.com/matrix-org/matrix-react-sdk/pull/3927)
+ * Room list reflects encryption state
+   [\#3908](https://github.com/matrix-org/matrix-react-sdk/pull/3908)
+ * Make the entire User Info scrollable, sticky close button
+   [\#3914](https://github.com/matrix-org/matrix-react-sdk/pull/3914)
+ * Remove riot logo from the security setup screens
+   [\#3916](https://github.com/matrix-org/matrix-react-sdk/pull/3916)
+ * Only say the session is verified if it is now verified
+   [\#3917](https://github.com/matrix-org/matrix-react-sdk/pull/3917)
+ * Hide password section if you can't change your password
+   [\#3924](https://github.com/matrix-org/matrix-react-sdk/pull/3924)
+ * Ensure a plaintext version of the composer ends up on the clipboard
+   [\#3922](https://github.com/matrix-org/matrix-react-sdk/pull/3922)
+ * Move & upgrade babel runtime into dependencies (like it wants)
+   [\#3920](https://github.com/matrix-org/matrix-react-sdk/pull/3920)
+ * Don't list every single alias when there's many
+   [\#3918](https://github.com/matrix-org/matrix-react-sdk/pull/3918)
+ * Try to populate user IDs even when the server's directory fails us
+   [\#3907](https://github.com/matrix-org/matrix-react-sdk/pull/3907)
+ * Remove .event property on verification request
+   [\#3912](https://github.com/matrix-org/matrix-react-sdk/pull/3912)
+ * Attempt to fix Safari + VoiceOver misunderstanding the timeline list
+   [\#3911](https://github.com/matrix-org/matrix-react-sdk/pull/3911)
+ * Enable encryption in DMs with device keys
+   [\#3913](https://github.com/matrix-org/matrix-react-sdk/pull/3913)
+ * Fix scrollable area and padding in user lists dialog
+   [\#3905](https://github.com/matrix-org/matrix-react-sdk/pull/3905)
+ * Add Reject & Ignore user button to invites view
+   [\#3909](https://github.com/matrix-org/matrix-react-sdk/pull/3909)
+ * Fix paragraph-awareness of the composer formatting features
+   [\#3891](https://github.com/matrix-org/matrix-react-sdk/pull/3891)
+ * Updated visuals for cross-signing bootstrap
+   [\#3903](https://github.com/matrix-org/matrix-react-sdk/pull/3903)
+ * Implement some parts of new cross signing bootstrap UI
+   [\#3897](https://github.com/matrix-org/matrix-react-sdk/pull/3897)
+ * Treat links as external in report content admin message
+   [\#3904](https://github.com/matrix-org/matrix-react-sdk/pull/3904)
+ * Be consistent about our settings svg, free the other one
+   [\#3902](https://github.com/matrix-org/matrix-react-sdk/pull/3902)
+ * Change prepublish script to prepare
+   [\#3899](https://github.com/matrix-org/matrix-react-sdk/pull/3899)
+ * Remove the react-sdk version
+   [\#3901](https://github.com/matrix-org/matrix-react-sdk/pull/3901)
+ * BuildKite: Retry end-to-end tests automatically once if they fail
+   [\#3900](https://github.com/matrix-org/matrix-react-sdk/pull/3900)
+ * Slash Command improvements around sending messages with leading slash
+   [\#3893](https://github.com/matrix-org/matrix-react-sdk/pull/3893)
+ * Support admin configurable message when reporting content
+   [\#3898](https://github.com/matrix-org/matrix-react-sdk/pull/3898)
+ * Don't warn on unverified users; ensured behavior stays the same with flags
+   off
+   [\#3896](https://github.com/matrix-org/matrix-react-sdk/pull/3896)
+ * Fix roving room list for resizer and ff tabstop a11y
+   [\#3895](https://github.com/matrix-org/matrix-react-sdk/pull/3895)
+ * Verify individual messages via cross-signing
+   [\#3875](https://github.com/matrix-org/matrix-react-sdk/pull/3875)
+ * Fix layering of dependencies in riot-web and e2e tests
+   [\#3882](https://github.com/matrix-org/matrix-react-sdk/pull/3882)
+ * Implement Roving Tab Index and Room List as TreeView
+   [\#3844](https://github.com/matrix-org/matrix-react-sdk/pull/3844)
+ * Move room header shields over the avatar for the room
+   [\#3888](https://github.com/matrix-org/matrix-react-sdk/pull/3888)
+ * Fix toast icon to prevent clipping
+   [\#3890](https://github.com/matrix-org/matrix-react-sdk/pull/3890)
+ * Only show devices and verify actions in E2EE rooms
+   [\#3889](https://github.com/matrix-org/matrix-react-sdk/pull/3889)
+ * Change user info verification checks to use cross-signing
+   [\#3887](https://github.com/matrix-org/matrix-react-sdk/pull/3887)
+ * Fix click-to-ping not inserting colon if composer non-empty
+   [\#3886](https://github.com/matrix-org/matrix-react-sdk/pull/3886)
+ * Fix emoticon space completion for upper case emoticons like :D xD
+   [\#3884](https://github.com/matrix-org/matrix-react-sdk/pull/3884)
+ * Repair cross-signing panel with async status
+   [\#3880](https://github.com/matrix-org/matrix-react-sdk/pull/3880)
+ * Remove temporary key backup button
+   [\#3878](https://github.com/matrix-org/matrix-react-sdk/pull/3878)
+ * Score users who have recently spoken higher in invite suggestions
+   [\#3866](https://github.com/matrix-org/matrix-react-sdk/pull/3866)
+ * Initial support for verification in right panel
+   [\#3796](https://github.com/matrix-org/matrix-react-sdk/pull/3796)
+ * Prevent the invite dialog from jumping around when elements change
+   [\#3868](https://github.com/matrix-org/matrix-react-sdk/pull/3868)
+ * Add prepublish script
+   [\#3876](https://github.com/matrix-org/matrix-react-sdk/pull/3876)
+
 Changes in [2.0.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.0.0) (2020-01-27)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0-rc.2...v2.0.0)

From 242f1afb559b5357e1e841ed5575c6dced76ca48 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 17:35:56 +0000
Subject: [PATCH 1077/3235] v2.1.0-rc.1

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

diff --git a/package.json b/package.json
index 310b1154a6..8e8a206aa8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 1970dbff94582515e3aa701a365b447a9f05dca2 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 17:43:27 +0000
Subject: [PATCH 1078/3235] Try JS SDK upgrade one more time

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8e8a206aa8..7994b54050 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "4.0.0",
+    "matrix-js-sdk": "5.0.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 232067a99f..2e1bd0c481 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,10 +5760,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-4.0.0.tgz#c81bdc905af2ab1634527e5f542f2f15977d31cf"
-  integrity sha512-Xbe36xL443qtEBH4xk0k39JabolqZfloK7fwYGMb/PgWO26VOzvw94XWahnIr5w83oxBAF9nFmP+7EnPG6IHnA==
+matrix-js-sdk@5.0.0-rc.1:
+  version "5.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.0-rc.1.tgz#75a48d999b2eecdbfcc000e05123a00ae80039a7"
+  integrity sha512-g4b7Zf2Ws+yUnRCetpMqCSpesnRu0I+wAvFUYdoKhEGzSihEs6qADvV880Twcun1YFxYBjdB9I7ZfzCkGsi4Lw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 138ad3b1b1acc11460bcb10a6ece498948c77d3f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 17:47:19 +0000
Subject: [PATCH 1079/3235] Prepare changelog for v2.1.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3665636f3c..3c3c6cf371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [2.1.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.2) (2020-02-13)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.1...v2.1.0-rc.2)
+
+ * Fix error in previous attempt to upgrade JS SDK 
+
 Changes in [2.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.1) (2020-02-13)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.0.0...v2.1.0-rc.1)

From ab91e859d9d1e62cb91a4c5def74af0f897d9b0e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 13 Feb 2020 17:47:20 +0000
Subject: [PATCH 1080/3235] v2.1.0-rc.2

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

diff --git a/package.json b/package.json
index 7994b54050..02e3870d0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 7840aa74fdbfe842aa7cd45dedd61e2c9e599966 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Thu, 13 Feb 2020 19:18:21 +0100
Subject: [PATCH 1081/3235] Fix ID to be namespaced

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/structures/RightPanel.js  | 2 +-
 src/components/views/rooms/RoomHeader.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 90e71a770b..eddd26c857 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -285,7 +285,7 @@ export default class RightPanel extends React.Component {
         });
 
         return (
-            <aside className={classes} id="sidebarPanel">
+            <aside className={classes} id="mx_RightPanel">
                 { panel }
             </aside>
         );
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index cabfc48ec5..61abfe86cf 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -314,7 +314,7 @@ export default createReactClass({
 
         return (
             <div className="mx_RoomHeader light-panel">
-                <div className="mx_RoomHeader_wrapper" aria-owns="sidebarPanel">
+                <div className="mx_RoomHeader_wrapper" aria-owns="mx_RightPanel">
                     <div className="mx_RoomHeader_avatar">{ roomAvatar }{ e2eIcon }</div>
                     { privateIcon }
                     { name }

From 908ca6b6efbdec47213e195fa2fc9d3ddb4a6bab Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 13 Feb 2020 17:25:54 -0500
Subject: [PATCH 1082/3235] add test for grouping room creation events

---
 .../structures/MessagePanel-test.js           | 112 ++++++++++++++++++
 test/test-utils.js                            |   4 +-
 2 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 59917057a5..e6332cf7f8 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -34,10 +34,15 @@ import Matrix from 'matrix-js-sdk';
 const test_utils = require('../../test-utils');
 const mockclock = require('../../mock-clock');
 
+import Adapter from "enzyme-adapter-react-16";
+import { configure, mount } from "enzyme";
+
 import Velocity from 'velocity-animate';
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import RoomContext from "../../../src/contexts/RoomContext";
 
+configure({ adapter: new Adapter() });
+
 let client;
 const room = new Matrix.Room();
 
@@ -251,4 +256,111 @@ describe('MessagePanel', function() {
             }, 100);
         }, 100);
     });
+
+    it('should collapse creation events', function() {
+        const mkEvent = test_utils.mkEvent;
+        const mkMembership = test_utils.mkMembership;
+        const roomId = "!someroom";
+        const alice = "@alice:example.org";
+        const ts0 = Date.now();
+        const events = [
+            mkEvent({
+                event: true,
+                type: "m.room.create",
+                room: roomId,
+                user: alice,
+                content: {
+                    creator: alice,
+                    room_version: "5",
+                    predecessor: {
+                        room_id: "!prevroom",
+                        event_id: "$someevent",
+                    },
+                },
+                ts: ts0,
+            }),
+            mkMembership({
+                event: true,
+                room: roomId,
+                user: alice,
+                target: {
+                    userId: alice,
+                    name: "Alice",
+                    getAvatarUrl: () => {
+                        return "avatar.jpeg";
+                    },
+                },
+                ts: ts0 + 1,
+                mship: 'join',
+                name: 'Alice',
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.join_rules",
+                room: roomId,
+                user: alice,
+                content: {
+                    "join_rule": "invite"
+                },
+                ts: ts0 + 2,
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.history_visibility",
+                room: roomId,
+                user: alice,
+                content: {
+                    "history_visibility": "invited",
+                },
+                ts: ts0 + 3,
+            }),
+            mkEvent({
+                event: true,
+                type: "m.room.encryption",
+                room: roomId,
+                user: alice,
+                content: {
+                    "algorithm": "m.megolm.v1.aes-sha2",
+                },
+                ts: ts0 + 4,
+            }),
+            mkMembership({
+                event: true,
+                room: roomId,
+                user: alice,
+                skey: "@bob:example.org",
+                target: {
+                    userId: "@bob:example.org",
+                    name: "Bob",
+                    getAvatarUrl: () => {
+                        return "avatar.jpeg";
+                    },
+                },
+                ts: ts0 + 5,
+                mship: 'invite',
+                name: 'Bob',
+            }),
+        ];
+        const res = mount(
+            <WrappedMessagePanel className="cls" events={events} />,
+        );
+
+        // we expect that
+        // - the room creation event, the room encryption event, and Alice inviting Bob,
+        //   should be outside of the room creation summary
+        // - all other events should be inside the room creation summary
+
+        const tiles = res.find(sdk.getComponent('views.rooms.EventTile'));
+
+        expect(tiles.at(0).props().mxEvent.getType()).toEqual("m.room.create");
+        expect(tiles.at(1).props().mxEvent.getType()).toEqual("m.room.encryption");
+
+        const summaryTiles = res.find(sdk.getComponent('views.elements.EventListSummary'));
+        const summaryTile = summaryTiles.at(0);
+
+        const summaryEventTiles = summaryTile.find(sdk.getComponent('views.rooms.EventTile'));
+        // every event except for the room creation, room encryption, and Bob's
+        // invite event should be in the event summary
+        expect(summaryEventTiles.length).toEqual(tiles.length - 3);
+    });
 });
diff --git a/test/test-utils.js b/test/test-utils.js
index fdd50a8792..d7aa9d5de9 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -51,7 +51,7 @@ export function createTestClient() {
         getUserId: jest.fn().mockReturnValue("@userId:matrix.rog"),
 
         getPushActionsForEvent: jest.fn(),
-        getRoom: jest.fn().mockReturnValue(mkStubRoom()),
+        getRoom: jest.fn().mockImplementation(mkStubRoom),
         getRooms: jest.fn().mockReturnValue([]),
         getVisibleRooms: jest.fn().mockReturnValue([]),
         getGroups: jest.fn().mockReturnValue([]),
@@ -111,7 +111,7 @@ export function mkEvent(opts) {
     if (opts.skey) {
         event.state_key = opts.skey;
     } else if (["m.room.name", "m.room.topic", "m.room.create", "m.room.join_rules",
-         "m.room.power_levels", "m.room.topic",
+         "m.room.power_levels", "m.room.topic", "m.room.history_visibility", "m.room.encryption",
          "com.example.state"].indexOf(opts.type) !== -1) {
         event.state_key = "";
     }

From 42b63fbc811a0bc98acd6baa18d023d843a8fa91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 14 Feb 2020 09:36:10 +0000
Subject: [PATCH 1083/3235] Fix share message context menu option keyboard a11y

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/context_menus/MessageContextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 7215a45be2..136c31803e 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -414,7 +414,7 @@ export default createReactClass({
         }
         // XXX: if we use room ID, we should also include a server where the event can be found (other than in the domain of the event ID)
         const permalinkButton = (
-            <MenuItem className="mx_MessageContextMenu_field">
+            <MenuItem className="mx_MessageContextMenu_field" onClick={this.onPermalinkClick}>
                 <a href={permalink} target="_blank" rel="noopener" onClick={this.onPermalinkClick} tabIndex={-1}>
                     { mxEvent.isRedacted() || mxEvent.getType() !== 'm.room.message'
                         ? _t('Share Permalink') : _t('Share Message') }

From b83bc7db6847c1bdb05b0eb054b26ef325fefb9e Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Fri, 14 Feb 2020 11:12:41 +0100
Subject: [PATCH 1084/3235] Always speak the full text of the typing indicator
 when it updates.

By default, aria-live regions only speak partial updates. However in the case of the typing indicator, if it goes from one person typing to several, and back, the updated text would only be spoken in fragments by screen readers. Adding the aria-atomic attribute with a value of true makes screen readers always speak the full update for this tile, making the experience much nicer.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/rooms/WhoIsTypingTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index e6ffb24621..9683d00e51 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -213,7 +213,7 @@ export default createReactClass({
         }
 
         return (
-            <li className="mx_WhoIsTypingTile">
+            <li className="mx_WhoIsTypingTile" aria-atomic="true">
                 <div className="mx_WhoIsTypingTile_avatars">
                     { this._renderTypingIndicatorAvatars(usersTyping, this.props.whoIsTypingLimit) }
                 </div>

From 8087f18bf786b7780efbdb0f61fda39e104e3624 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 14 Feb 2020 10:32:42 +0000
Subject: [PATCH 1085/3235] Remove unused props

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 2 --
 src/components/views/rooms/RoomList.js   | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 600b418fe0..fa2231328c 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -46,8 +46,6 @@ export default class RoomSubList extends React.PureComponent {
         tagName: PropTypes.string,
         addRoomLabel: PropTypes.string,
 
-        order: PropTypes.string.isRequired,
-
         // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
         isInvite: PropTypes.bool,
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f41400ecfc..ad64ef1a97 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -700,13 +700,11 @@ export default createReactClass({
                 list: [],
                 extraTiles: this._makeGroupInviteTiles(this.props.searchFilter),
                 label: _t('Community Invites'),
-                order: "recent",
                 isInvite: true,
             },
             {
                 list: this.state.lists['im.vector.fake.invite'],
                 label: _t('Invites'),
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.invite'),
                 isInvite: true,
             },
@@ -714,14 +712,12 @@ export default createReactClass({
                 list: this.state.lists['m.favourite'],
                 label: _t('Favourites'),
                 tagName: "m.favourite",
-                order: "manual",
                 incomingCall: incomingCallIfTaggedAs('m.favourite'),
             },
             {
                 list: this.state.lists['im.vector.fake.direct'],
                 label: _t('Direct Messages'),
                 tagName: "im.vector.fake.direct",
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_chat'});},
                 addRoomLabel: _t("Start chat"),
@@ -729,7 +725,6 @@ export default createReactClass({
             {
                 list: this.state.lists['im.vector.fake.recent'],
                 label: _t('Rooms'),
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_room'});},
             },
@@ -744,7 +739,6 @@ export default createReactClass({
                     key: tagName,
                     label: labelForTagName(tagName),
                     tagName: tagName,
-                    order: "manual",
                     incomingCall: incomingCallIfTaggedAs(tagName),
                 };
             });
@@ -754,13 +748,11 @@ export default createReactClass({
                 list: this.state.lists['m.lowpriority'],
                 label: _t('Low priority'),
                 tagName: "m.lowpriority",
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('m.lowpriority'),
             },
             {
                 list: this.state.lists['im.vector.fake.archived'],
                 label: _t('Historical'),
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.archived'),
                 startAsHidden: true,
                 showSpinner: this.state.isLoadingLeftRooms,
@@ -770,7 +762,6 @@ export default createReactClass({
                 list: this.state.lists['m.server_notice'],
                 label: _t('System Alerts'),
                 tagName: "m.lowpriority",
-                order: "recent",
                 incomingCall: incomingCallIfTaggedAs('m.server_notice'),
             },
         ]);

From 3f2dcf2113f017470b568d5deac3d368532eb470 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 14 Feb 2020 11:07:05 +0000
Subject: [PATCH 1086/3235] Add dep version checks for release

---
 release.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/release.sh b/release.sh
index 1f287bc839..4a8acdc5c7 100755
--- a/release.sh
+++ b/release.sh
@@ -9,4 +9,21 @@ set -e
 
 cd `dirname $0`
 
+for i in matrix-js-sdk
+do
+    depver=`cat package.json | jq -r .dependencies[\"$i\"]`
+    latestver=`yarn info -s $i dist-tags.next`
+    if [ "$depver" != "$latestver" ]
+    then
+        echo "The latest version of $i is $latestver but package.json depends on $depver"
+        echo -n "Type 'Yes' to continue anyway: "
+        read resp
+        if [ "$resp" != "Yes" ]
+        then
+            echo "OK, never mind."
+            exit 1
+        fi
+    fi
+done
+
 exec ./node_modules/matrix-js-sdk/release.sh -z "$@"

From c6a8c197794c6264079e593eae1aaec53ed0a031 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 14 Feb 2020 12:10:08 +0000
Subject: [PATCH 1087/3235] Add auto-upgrade support for SDK deps

This automates the SDK upgrade step of the release process.
---
 release.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/release.sh b/release.sh
index 4a8acdc5c7..67a8a58753 100755
--- a/release.sh
+++ b/release.sh
@@ -15,14 +15,23 @@ do
     latestver=`yarn info -s $i dist-tags.next`
     if [ "$depver" != "$latestver" ]
     then
-        echo "The latest version of $i is $latestver but package.json depends on $depver"
-        echo -n "Type 'Yes' to continue anyway: "
+        echo "The latest version of $i is $latestver but package.json depends on $depver."
+        echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
         read resp
-        if [ "$resp" != "Yes" ]
+        if [ "$resp" != "u" ] && [ "$resp" != "c" ]
         then
-            echo "OK, never mind."
+            echo "Aborting."
             exit 1
         fi
+        if [ "$resp" == "u" ]
+        then
+            echo "Upgrading $i to $latestver..."
+            yarn add -E $i@$latestver
+            git add -u
+            # The `-e` flag opens the editor and gives you a chance to check
+            # the upgrade for correctness.
+            git commit -m "Upgrade $i to $latestver" -e
+        fi
     fi
 done
 

From 1938dc443a76660a3b3cd065dbafdeb08a54be40 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 14 Feb 2020 12:27:21 +0000
Subject: [PATCH 1088/3235] Reset SDK deps back to develop after a release

This automates the (frequently forgotten) step of resetting SDK deps back to the
develop branch after merging the release to develop.
---
 release.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/release.sh b/release.sh
index 67a8a58753..c585708326 100755
--- a/release.sh
+++ b/release.sh
@@ -36,3 +36,24 @@ do
 done
 
 exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
+
+release="${1#v}"
+prerelease=0
+# We check if this build is a prerelease by looking to
+# see if the version has a hyphen in it. Crude,
+# but semver doesn't support postreleases so anything
+# with a hyphen is a prerelease.
+echo $release | grep -q '-' && prerelease=1
+
+if [ $prerelease -eq 0 ]
+then
+    # For a release, reset SDK deps back to the `develop` branch.
+    for i in matrix-js-sdk
+    do
+        echo "Resetting $i to develop branch..."
+        yarn add github:matrix-org/$i#develop
+        git add -u
+        git commit -m "Reset $i back to develop branch"
+    done
+    git push origin develop
+fi

From a6c072ab42997208c16167b2de0689bfe4bb45fc Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 14 Feb 2020 13:48:18 +0100
Subject: [PATCH 1089/3235] only show supported verification methods

also an error message if none match
---
 .../views/right_panel/VerificationPanel.js    | 122 +++++++++++-------
 src/i18n/strings/en_EN.json                   |   5 +-
 2 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 08c3935a2c..262d1c873b 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -19,6 +19,8 @@ import PropTypes from "prop-types";
 
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
 import {_t} from "../../../languageHandler";
 import E2EIcon from "../rooms/E2EIcon";
@@ -54,7 +56,9 @@ export default class VerificationPanel extends React.PureComponent {
             qrCodeProps: null, // generated by the VerificationQRCode component itself
         };
         this._hasVerifier = false;
-        this._generateQRCodeProps(props.request);
+        if (this.props.request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD)) {
+            this._generateQRCodeProps(props.request);
+        }
     }
 
     async _generateQRCodeProps(verificationRequest: VerificationRequest) {
@@ -67,59 +71,60 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     renderQRPhase(pending) {
-        const {member} = this.props;
+        const {member, request} = this.props;
+        const showSAS = request.methods.includes(verificationMethods.SAS);
+        const showQR = this.props.request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
+        const noCommonMethodError = !showSAS && !showQR ?
+            <p>{_t("The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.")}</p> :
+            null;
+
         if (this.props.layout === 'dialog') {
             // HACK: This is a terrible idea.
-            let qrCode = <div className='mx_VerificationPanel_QRPhase_noQR'><Spinner /></div>;
-            if (this.state.qrCodeProps) {
-                qrCode = <VerificationQRCode {...this.state.qrCodeProps} />;
+            let qrBlock;
+            let sasBlock;
+            if (showQR) {
+                let qrCode;
+                if (this.state.qrCodeProps) {
+                    qrCode = <VerificationQRCode {...this.state.qrCodeProps} />;
+                } else {
+                    qrCode = <div className='mx_VerificationPanel_QRPhase_noQR'><Spinner /></div>;
+                }
+                qrBlock =
+                    <div className='mx_VerificationPanel_QRPhase_startOption'>
+                        <p>{_t("Scan this unique code")}</p>
+                        {qrCode}
+                    </div>;
             }
+            if (showSAS) {
+                sasBlock =
+                    <div className='mx_VerificationPanel_QRPhase_startOption'>
+                        <p>{_t("Compare unique emoji")}</p>
+                        <span className='mx_VerificationPanel_QRPhase_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
+                        <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this._startSAS} kind='primary'>
+                            {_t("Start")}
+                        </AccessibleButton>
+                    </div>;
+            }
+            const or = qrBlock && sasBlock ?
+                <div className='mx_VerificationPanel_QRPhase_betweenText'>{_t("or")}</div> : null;
             return (
                 <div>
                     {_t("Verify this session by completing one of the following:")}
                     <div className='mx_VerificationPanel_QRPhase_startOptions'>
-                        <div className='mx_VerificationPanel_QRPhase_startOption'>
-                            <p>{_t("Scan this unique code")}</p>
-                            {qrCode}
-                        </div>
-                        <div className='mx_VerificationPanel_QRPhase_betweenText'>{_t("or")}</div>
-                        <div className='mx_VerificationPanel_QRPhase_startOption'>
-                            <p>{_t("Compare unique emoji")}</p>
-                            <span className='mx_VerificationPanel_QRPhase_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
-                            <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this._startSAS} kind='primary'>
-                                {_t("Start")}
-                            </AccessibleButton>
-                        </div>
+                        {qrBlock}
+                        {or}
+                        {sasBlock}
+                        {noCommonMethodError}
                     </div>
                 </div>
             );
         }
 
-        let button;
-        if (pending) {
-            button = <Spinner />;
-        } else {
-            const disabled = this.state.emojiButtonClicked;
-            button = (
-                <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
-                    {_t("Verify by emoji")}
-                </AccessibleButton>
-            );
-        }
-
-        if (!this.state.qrCodeProps) {
-            return <div className="mx_UserInfo_container">
-                <h3>{_t("Verify by emoji")}</h3>
-                <p>{_t("Verify by comparing unique emoji.")}</p>
-                { button }
-            </div>;
-        }
-
-        // TODO: add way to open camera to scan a QR code
-        return <React.Fragment>
-            <div className="mx_UserInfo_container">
+        let qrBlock;
+        if (this.state.qrCodeProps) {
+            qrBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by scanning")}</h3>
                 <p>{_t("Ask %(displayName)s to scan your code:", {
                     displayName: member.displayName || member.name || member.userId,
@@ -128,14 +133,41 @@ export default class VerificationPanel extends React.PureComponent {
                 <div className="mx_VerificationPanel_qrCode">
                     <VerificationQRCode {...this.state.qrCodeProps} />
                 </div>
-            </div>
+            </div>;
+        }
 
-            <div className="mx_UserInfo_container">
+        let sasBlock;
+        if (showSAS) {
+            let button;
+            if (pending) {
+                button = <Spinner />;
+            } else {
+                const disabled = this.state.emojiButtonClicked;
+                button = (
+                    <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
+                        {_t("Verify by emoji")}
+                    </AccessibleButton>
+                );
+            }
+            const sasLabel = this.state.qrCodeProps ?
+                _t("If you can't scan the code above, verify by comparing unique emoji.") :
+                _t("Verify by comparing unique emoji.");
+            sasBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by emoji")}</h3>
-                <p>{_t("If you can't scan the code above, verify by comparing unique emoji.")}</p>
-
+                <p>{sasLabel}</p>
                 { button }
-            </div>
+            </div>;
+        }
+
+        const noCommonMethodBlock = noCommonMethodError ?
+             <div className="mx_UserInfo_container">{noCommonMethodError}</div> :
+             null;
+
+        // TODO: add way to open camera to scan a QR code
+        return <React.Fragment>
+            {qrBlock}
+            {sasBlock}
+            {noCommonMethodBlock}
         </React.Fragment>;
     }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7a8642be95..00d8d426d0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1197,11 +1197,12 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Security": "Security",
-    "Verify by emoji": "Verify by emoji",
-    "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.",
     "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
+    "Verify by emoji": "Verify by emoji",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
+    "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Got it": "Got it",
     "Verification timed out. Start verification again from their profile.": "Verification timed out. Start verification again from their profile.",

From 30718e7fdeabf94c9f4eb916e9e1b1d4bb42b275 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 14 Feb 2020 13:48:38 +0100
Subject: [PATCH 1090/3235] unsent could potentially also happen here

although should not happen in practice
---
 src/components/views/right_panel/EncryptionPanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2e9365fca3..669e50d4ca 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -23,7 +23,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import Modal from "../../../Modal";
-import {PHASE_REQUESTED} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
 import {_t} from "../../../languageHandler";
 
@@ -71,7 +71,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
         setRequest(verificationRequest);
     }, [member.userId]);
 
-    const requested = request && (phase === PHASE_REQUESTED || phase === undefined);
+    const requested = request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined);
     if (!request || requested) {
         return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={requested} />;
     } else {

From ca4f591cb6079ae3f69f8c500442153d96e782f8 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 14 Feb 2020 14:58:37 +0000
Subject: [PATCH 1091/3235] Report installed PWA status in rageshakes,
 analytics

This adds installed PWA status reporting to rageshakes and analytics, as well as
cleaning up some related strings.
---
 src/Analytics.js                  | 28 ++++++++++++++++++++--------
 src/i18n/strings/en_EN.json       |  9 +++++----
 src/rageshake/submit-rageshake.js |  7 +++++++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 39731a0e7d..9f540e46b3 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -64,7 +64,7 @@ const customVariables = {
     },
     'App Version': {
         id: 2,
-        expl: _td('The version of Riot.im'),
+        expl: _td('The version of Riot'),
         example: '15.0.0',
     },
     'User Type': {
@@ -87,11 +87,6 @@ const customVariables = {
         expl: _td('Whether or not you\'re using the Richtext mode of the Rich Text Editor'),
         example: 'off',
     },
-    'Breadcrumbs': {
-        id: 9,
-        expl: _td("Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)"),
-        example: 'disabled',
-    },
     'Homeserver URL': {
         id: 7,
         expl: _td('Your homeserver\'s URL'),
@@ -102,6 +97,16 @@ const customVariables = {
         expl: _td('Your identity server\'s URL'),
         example: 'https://vector.im',
     },
+    'Breadcrumbs': {
+        id: 9,
+        expl: _td("Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)"),
+        example: 'disabled',
+    },
+    'Installed PWA': {
+        id: 10,
+        expl: _td("Whether you're using Riot as an installed Progressive Web App"),
+        example: 'false',
+    },
 };
 
 function whitelistRedact(whitelist, str) {
@@ -190,6 +195,13 @@ class Analytics {
             this._setVisitVariable('Instance', window.location.pathname);
         }
 
+        let installedPWA = "unknown";
+        try {
+            // Known to work at least for desktop Chrome
+            installedPWA = window.matchMedia('(display-mode: standalone)').matches;
+        } catch (e) { }
+        this._setVisitVariable('Installed PWA', installedPWA);
+
         // start heartbeat
         this._heartbeatIntervalID = window.setInterval(this.ping.bind(this), HEARTBEAT_INTERVAL);
     }
@@ -328,7 +340,7 @@ class Analytics {
                     },
                 ),
             },
-            { expl: _td('Your User Agent'), value: navigator.userAgent },
+            { expl: _td('Your user agent'), value: navigator.userAgent },
             { expl: _td('Your device resolution'), value: resolution },
         ];
 
@@ -337,7 +349,7 @@ class Analytics {
             title: _t('Analytics'),
             description: <div className="mx_AnalyticsModal">
                 <div>
-                    { _t('The information being sent to us to help make Riot.im better includes:') }
+                    { _t('The information being sent to us to help make Riot better includes:') }
                 </div>
                 <table>
                     { rows.map((row) => <tr key={row[0]}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7a8642be95..7ac9f131d3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -5,21 +5,22 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
     "Add Phone Number": "Add Phone Number",
     "The platform you're on": "The platform you're on",
-    "The version of Riot.im": "The version of Riot.im",
+    "The version of Riot": "The version of Riot",
     "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",
     "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",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
     "Your homeserver's URL": "Your homeserver's URL",
     "Your identity server's URL": "Your identity server's URL",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
+    "Whether you're using Riot as an installed Progressive Web App": "Whether you're using Riot as an installed Progressive Web App",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
     "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 user agent": "Your user agent",
     "Your device resolution": "Your device resolution",
     "Analytics": "Analytics",
-    "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:",
+    "The information being sent to us to help make Riot better includes:": "The information being sent to us to help make Riot 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.",
     "Error": "Error",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index ed5a9e5946..659a56dffb 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -67,6 +67,12 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         userAgent = window.navigator.userAgent;
     }
 
+    let installedPWA = "UNKNOWN";
+    try {
+        // Known to work at least for desktop Chrome
+        installedPWA = window.matchMedia('(display-mode: standalone)').matches;
+    } catch (e) { }
+
     const client = MatrixClientPeg.get();
 
     console.log("Sending bug report.");
@@ -76,6 +82,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     body.append('app', 'riot-web');
     body.append('version', version);
     body.append('user_agent', userAgent);
+    body.append('installed_pwa', installedPWA);
 
     if (client) {
         body.append('user_id', client.credentials.userId);

From ca28f83841fc6e4d4f858707a7c8e7b217bb81d9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 14 Feb 2020 17:36:14 +0000
Subject: [PATCH 1092/3235] Report touch input status in rageshakes, analytics

This reports whether the device has touch input as a primary input mechanism in
rageshakes and analytics.

For analytics, this replaces the identity server (which ends up being reported
as "<redacted>" by default anyway) because Matomo only supports a limited number
of custom variables.
---
 src/Analytics.js                  | 17 ++++++++++++-----
 src/Lifecycle.js                  |  2 +-
 src/i18n/strings/en_EN.json       |  2 +-
 src/rageshake/submit-rageshake.js |  7 +++++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 9f540e46b3..8eea47ea89 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -57,6 +57,8 @@ function getRedactedUrl() {
 }
 
 const customVariables = {
+    // The Matomo installation at https://matomo.riot.im is currently configured
+    // with a limit of 10 custom variables.
     'App Platform': {
         id: 1,
         expl: _td('The platform you\'re on'),
@@ -92,10 +94,10 @@ const customVariables = {
         expl: _td('Your homeserver\'s URL'),
         example: 'https://matrix.org',
     },
-    'Identity Server URL': {
+    'Touch Input': {
         id: 8,
-        expl: _td('Your identity server\'s URL'),
-        example: 'https://vector.im',
+        expl: _td("Whether you're using Riot on a device where touch is the primary input mechanism"),
+        example: 'false',
     },
     'Breadcrumbs': {
         id: 9,
@@ -202,6 +204,13 @@ class Analytics {
         } catch (e) { }
         this._setVisitVariable('Installed PWA', installedPWA);
 
+        let touchInput = "unknown";
+        try {
+            // MDN claims broad support across browsers
+            touchInput = window.matchMedia('(pointer: coarse)').matches;
+        } catch (e) { }
+        this._setVisitVariable('Touch Input', touchInput);
+
         // start heartbeat
         this._heartbeatIntervalID = window.setInterval(this.ping.bind(this), HEARTBEAT_INTERVAL);
     }
@@ -303,11 +312,9 @@ class Analytics {
         if (!config.piwik) return;
 
         const whitelistedHSUrls = config.piwik.whitelistedHSUrls || [];
-        const whitelistedISUrls = config.piwik.whitelistedISUrls || [];
 
         this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
         this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
-        this._setVisitVariable('Identity Server URL', whitelistRedact(whitelistedISUrls, identityServerUrl));
     }
 
     setBreadcrumbs(state) {
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 24bf99ed24..72cd84bfd9 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -435,7 +435,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
         }
     }
 
-    Analytics.setLoggedIn(credentials.guest, credentials.homeserverUrl, credentials.identityServerUrl);
+    Analytics.setLoggedIn(credentials.guest, credentials.homeserverUrl);
 
     if (localStorage) {
         try {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7ac9f131d3..c1ac0b1434 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -11,7 +11,7 @@
     "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",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Whether you're using Riot on a device where touch is the primary input mechanism",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
     "Whether you're using Riot as an installed Progressive Web App": "Whether you're using Riot as an installed Progressive Web App",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 659a56dffb..091f64bf93 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -73,6 +73,12 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         installedPWA = window.matchMedia('(display-mode: standalone)').matches;
     } catch (e) { }
 
+    let touchInput = "UNKNOWN";
+    try {
+        // MDN claims broad support across browsers
+        touchInput = window.matchMedia('(pointer: coarse)').matches;
+    } catch (e) { }
+
     const client = MatrixClientPeg.get();
 
     console.log("Sending bug report.");
@@ -83,6 +89,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     body.append('version', version);
     body.append('user_agent', userAgent);
     body.append('installed_pwa', installedPWA);
+    body.append('touch_input', touchInput);
 
     if (client) {
         body.append('user_id', client.credentials.userId);

From f8509a40a446a633be106960acbc8357d44076ad Mon Sep 17 00:00:00 2001
From: jja2000 <jja2000@gmail.com>
Date: Thu, 13 Feb 2020 21:27:58 +0000
Subject: [PATCH 1093/3235] Translated using Weblate (Dutch)

Currently translated at 83.1% (1762 of 2120 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 144c8c321f..927332e4ec 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -586,7 +586,7 @@
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is weggegaan en weer toegetreden",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgewezen",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgewezen",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)smaal afgewezen",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal afgewezen",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging afgeslagen",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "De uitnodigingen van %(severalUsers)s zijn %(count)s keer ingetrokken",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken",
@@ -609,11 +609,11 @@
     "was kicked %(count)s times|one": "is uit het gesprek gezet",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s hebben hun naam %(count)s keer gewijzigd",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s hebben hun naam gewijzigd",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)smaal van naam veranderd",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s is %(count)s maal van naam veranderd",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s is van naam veranderd",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s hebben hun avatar %(count)s keer gewijzigd",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s hebben hun avatar gewijzigd",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s is %(count)smaal van profielfoto veranderd",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s is %(count)s maal van profielfoto veranderd",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s is van profielfoto veranderd",
     "%(items)s and %(count)s others|other": "%(items)s en %(count)s andere",
     "%(items)s and %(count)s others|one": "%(items)s en één ander",

From d19cbe4afa8a48f7cecac8898d88289fc823309d Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 15 Feb 2020 10:42:35 +0000
Subject: [PATCH 1094/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2114 of 2121 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 4510eec170..c9be8ebdca 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2136,5 +2136,10 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) bëri hyrjen në një sesion të ri pa e verifikuar:",
     "Ask this user to verify their session, or manually verify it below.": "Kërkojini këtij përdoruesi të verifikojë sesionin e vet, ose ta verifikojë më poshtë dorazi.",
     "Manually Verify": "Verifikoje Dorazi",
-    "Verify by scanning": "Verifikoje me skanim"
+    "Verify by scanning": "Verifikoje me skanim",
+    "The version of Riot": "Versioni i Riot-it",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Nëse po e përdorni Riot-in në një pajisje ku touch-i është mekanizmi parësor për input-e",
+    "Whether you're using Riot as an installed Progressive Web App": "Nëse po e përdorni Riot-in të instaluar si një Aplikacion Web Progresiv",
+    "Your user agent": "Agjenti juaj i përdoruesit",
+    "The information being sent to us to help make Riot better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë Riot-in më të mirë përfshihen:"
 }

From adaef02fca16407e92f622761fd99374efdc9579 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 15 Feb 2020 02:14:21 +0000
Subject: [PATCH 1095/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2121 of 2121 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2596d11629..9d4cf79705 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2147,5 +2147,10 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) 登入到未驗證的新工作階段：",
     "Ask this user to verify their session, or manually verify it below.": "要求此使用者驗證他們的工作階段，或在下方手動驗證。",
     "Manually Verify": "手動驗證",
-    "Verify by scanning": "透過掃描來驗證"
+    "Verify by scanning": "透過掃描來驗證",
+    "The version of Riot": "Riot 版本",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "您是否在以觸控為主要機制的裝置上使用 Riot",
+    "Whether you're using Riot as an installed Progressive Web App": "您是否使用 PWA 形式的 Riot",
+    "Your user agent": "您的使用者代理字串",
+    "The information being sent to us to help make Riot better includes:": "傳送給我們以協助改進 Riot 的資訊包含了："
 }

From 417774f6097d9dcca6b3dfcee74ab1065fbf0b24 Mon Sep 17 00:00:00 2001
From: MadsDyrmann <madsdyrmannlarsen@gmail.com>
Date: Sat, 15 Feb 2020 08:33:37 +0000
Subject: [PATCH 1096/3235] Translated using Weblate (Danish)

Currently translated at 24.3% (515 of 2121 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index e84be8e3c7..e0ed9a9bfa 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -516,5 +516,8 @@
     "Multiple integration managers": "Flere integrationsmanagere",
     "Enable Emoji suggestions while typing": "Aktiver emoji forslag under indtastning",
     "Use compact timeline layout": "Brug kompakt tidslinje",
-    "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder"
+    "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder",
+    "The version of Riot": "Riot versionen",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hvorvidt du benytter Riot på en enhed, hvor touch er den primære input-grænseflade",
+    "Your user agent": "Din user agent"
 }

From 50886ff127dd9c942c32ccced16e82c3f2212a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 15 Feb 2020 07:57:52 +0000
Subject: [PATCH 1097/3235] Translated using Weblate (French)

Currently translated at 100.0% (2121 of 2121 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7aa6a43c91..e756d00aeb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2148,5 +2148,10 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) s’est connecté à une nouvelle session sans la vérifier :",
     "Ask this user to verify their session, or manually verify it below.": "Demandez à cet utilisateur de vérifier sa session, ou vérifiez-la manuellement ci-dessous.",
     "Manually Verify": "Vérifier manuellement",
-    "Verify by scanning": "Vérifier en scannant"
+    "Verify by scanning": "Vérifier en scannant",
+    "The version of Riot": "La version de Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Si vous utilisez Riot sur un appareil où le toucher est le mécanisme primaire de saisie",
+    "Whether you're using Riot as an installed Progressive Web App": "Si vous utilisez Riot en tant qu’application web progressive (PWA)",
+    "Your user agent": "Votre agent utilisateur",
+    "The information being sent to us to help make Riot better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer Riot comportent :"
 }

From f3dd8ecd004f9db0bb60b0ac515011e742077126 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 15 Feb 2020 09:17:04 +0000
Subject: [PATCH 1098/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2121 of 2121 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 09b9e4d6e0..ca701c99e9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2144,5 +2144,10 @@
     "Destroy cross-signing keys?": "Eszközök közti hitelesítési kulcsok megsemmisítése?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Eszközök közti hitelesítési kulcsok törlése végleges. Mindenki akit ezzel hitelesítettél biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztetted el az összes eszközödet amivel eszközök közti hitelesítést tudsz végezni, nem valószínű, hogy ezt szeretnéd tenni.",
     "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése",
-    "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló visszaállítása"
+    "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló visszaállítása",
+    "The version of Riot": "Riot verziója",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hogy olyan eszközön használod a Riotot ahol az érintés az elsődleges beviteli forma",
+    "Whether you're using Riot as an installed Progressive Web App": "Hogy a Riotot mint progresszív webes alkalmazást használod",
+    "Your user agent": "Felhasználói ügynök",
+    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:"
 }

From 9f466477bd1295d96c88f67562b37b2ec57b676e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sat, 15 Feb 2020 10:33:56 +0000
Subject: [PATCH 1099/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2121 of 2121 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 | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index e3be1a1aae..bee64682d1 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2130,5 +2130,25 @@
     "Cancel entering passphrase?": "Annullare l'inserimento della password?",
     "Mod": "Moderatore",
     "Indexed rooms:": "Stanze indicizzate:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s di %(totalRooms)s"
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s di %(totalRooms)s",
+    "The version of Riot": "La versione di Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Se stai usando Riot su un dispositivo dove il tocco è il metodo di input principale",
+    "Whether you're using Riot as an installed Progressive Web App": "Se stai usando Riot installato come Web App Progressiva",
+    "Your user agent": "Il tuo user agent",
+    "The information being sent to us to help make Riot better includes:": "Le informazioni che ci vengono inviate per aiutarci a migliorare Riot includono:",
+    "Show typing notifications": "Mostra notifiche di scrittura",
+    "Verify this session by completing one of the following:": "Verifica questa sessione completando una delle seguenti cose:",
+    "Scan this unique code": "Scansiona questo codice univoco",
+    "or": "o",
+    "Compare unique emoji": "Confronta emoji univoci",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Confrontate un set di emoji univoci se non avete una fotocamera sui dispositivi",
+    "Reset cross-signing and secret storage": "Reimposta la firma incrociata e l'archivio segreto",
+    "Not Trusted": "Non fidato",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) ha fatto l'accesso con una nuova sessione senza verificarla:",
+    "Ask this user to verify their session, or manually verify it below.": "Chiedi a questo utente di verificare la sua sessione o verificala manualmente sotto.",
+    "Manually Verify": "Verifica manualmente",
+    "Verify by scanning": "Verifica con la scansione",
+    "Destroy cross-signing keys?": "Distruggere le chiavi di firma incrociata?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "L'eliminazione delle chiavi di firma incrociata è permanente. Chiunque si sia verificato con te vedrà avvisi di sicurezza. Quasi sicuramente non vuoi fare questa cosa, a meno che tu non abbia perso tutti i dispositivi da cui puoi fare l'accesso.",
+    "Clear cross-signing keys": "Elimina chiavi di firma incrociata"
 }

From 34dbeb06044df7f507f6c8b7f9cac9176bcbb95d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 17 Feb 2020 13:21:07 +0000
Subject: [PATCH 1100/3235] Released js-sdk

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 02e3870d0f..8473da888a 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.0.0-rc.1",
+    "matrix-js-sdk": "5.0.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2e1bd0c481..1ed39459d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,10 +5760,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@5.0.0-rc.1:
-  version "5.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.0-rc.1.tgz#75a48d999b2eecdbfcc000e05123a00ae80039a7"
-  integrity sha512-g4b7Zf2Ws+yUnRCetpMqCSpesnRu0I+wAvFUYdoKhEGzSihEs6qADvV880Twcun1YFxYBjdB9I7ZfzCkGsi4Lw==
+matrix-js-sdk@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.0.tgz#dcbab35f1afdb35ef0364eb232e78e0fb7dc2a5b"
+  integrity sha512-A/aeE2Zn2OHq1n/9wIHCszrQZ7oXfThUHWi5Kz7illVCPUJ3JrZ31XVvx02k6vBasDcUtjAfZblHdTVN62cWLw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 6f206860bd4257b47b634bd5e9328e3d2a69767a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 17 Feb 2020 13:36:06 +0000
Subject: [PATCH 1101/3235] Prepare changelog for v2.1.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c3c6cf371..d4e0b41883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [2.1.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0) (2020-02-17)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.2...v2.1.0)
+
+ * Automate SDK dep upgrades for release
+   [\#4076](https://github.com/matrix-org/matrix-react-sdk/pull/4076)
+
 Changes in [2.1.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.2) (2020-02-13)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.1...v2.1.0-rc.2)

From f99d347b23917194d7f73d83a98e5fe5ac878bee Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 17 Feb 2020 13:36:06 +0000
Subject: [PATCH 1102/3235] v2.1.0

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

diff --git a/package.json b/package.json
index 8473da888a..3c1ef9f0a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.1.0-rc.2",
+  "version": "2.1.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From ed7702b01c46d2e8501542a404c5b4b570919d72 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Sun, 16 Feb 2020 11:38:42 +0000
Subject: [PATCH 1103/3235] Translated using Weblate (Russian)

Currently translated at 80.1% (1699 of 2121 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 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1d799f3a40..ba077d706a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1576,13 +1576,13 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Вы все еще <b> делитесь своими личными данными </b> на сервере идентификации <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Мы рекомендуем вам удалить свои адреса электронной почты и номера телефонов с сервера идентификации перед отключением.",
     "Disconnect anyway": "Отключить в любом случае",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "В настоящее время вы используете <server></server> для обнаружения и быть найденным существующими контактами, которые вы знаете. Вы можете изменить ваш сервер идентификации ниже.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "В настоящее время вы используете <server></server> для поиска вами ваших контактов а также вас вашими оппонентами. Вы можете изменить ваш сервер идентификации ниже.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Если вы не хотите использовать <server /> для обнаружения вас и быть обнаруженным вашими существующими контактами, введите другой идентификационный сервер ниже.",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Вы в настоящее время не используете идентификационный сервер. Чтобы обнаружить и быть обнаруженным существующими контактами, которых вы знаете, добавьте один ниже.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Вы в настоящее время не используете идентификационный сервер. Чтобы найти и быть найденным существующими контактами, которые вы знаете, добавьте один ниже.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Отключение от сервера идентификации будет означать, что другие пользователи не смогут вас обнаружить, и вы не сможете приглашать других по электронной почте или по телефону.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Использование сервера идентификации не обязательно. Если вы решите не использовать сервер идентификации, другие пользователи не смогут обнаружить вас, и вы не сможете пригласить других по электронной почте или телефону.",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Подтвердите условия предоставления услуг сервера идентификации (%(serverName)s), чтобы вас можно было обнаружить по адресу электронной почты или номеру телефона.",
-    "Discovery": "Обнаружение",
+    "Discovery": "Поиск",
     "Deactivate account": "Деактивировать аккаунт",
     "Clear cache and reload": "Очистить кэш и перезагрузить",
     "Always show the window menu bar": "Всегда показывать строку меню",
@@ -1607,11 +1607,11 @@
     "Complete": "Выполнено",
     "Revoke": "Отмена",
     "Share": "Делиться",
-    "Discovery options will appear once you have added an email above.": "Параметры обнаружения появятся после добавления электронной почты выше.",
+    "Discovery options will appear once you have added an email above.": "Параметры поиска по электронной почты появятся после добавления её выше.",
     "Unable to revoke sharing for phone number": "Не удалось отменить общий доступ к номеру телефона",
     "Unable to share phone number": "Не удается предоставить общий доступ к номеру телефона",
     "Please enter verification code sent via text.": "Пожалуйста, введите проверочный код, высланный с помощью текста.",
-    "Discovery options will appear once you have added a phone number above.": "Параметры обнаружения появятся после добавления вышеуказанного номера телефона.",
+    "Discovery options will appear once you have added a phone number above.": "Параметры поиска по номеру телефона появятся после его добавления.",
     "Remove %(email)s?": "Удалить %(email)s?",
     "Remove %(phone)s?": "Удалить %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстовое сообщение было отправлено +%(msisdn)s. Пожалуйста, введите проверочный код, который он содержит.",
@@ -1715,5 +1715,7 @@
     "Error adding ignored user/server": "Ошибка добавления игнорируемого пользователя/сервера",
     "Error subscribing to list": "Ошибка при подписке на список",
     "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер",
-    "Error upgrading room": "Ошибка обновления комнаты"
+    "Error upgrading room": "Ошибка обновления комнаты",
+    "Match system theme": "Изменить тему",
+    "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии"
 }

From 0325fdd37bc12f817c11c04251494f758ec8618a Mon Sep 17 00:00:00 2001
From: progserega <progserega@gmail.com>
Date: Mon, 17 Feb 2020 07:04:12 +0000
Subject: [PATCH 1104/3235] Translated using Weblate (Russian)

Currently translated at 80.1% (1699 of 2121 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ba077d706a..2359cb318f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1717,5 +1717,6 @@
     "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер",
     "Error upgrading room": "Ошибка обновления комнаты",
     "Match system theme": "Изменить тему",
-    "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии"
+    "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии",
+    "The version of Riot": "Версия Riot"
 }

From 281cc223ed6a6ca84218a2342d314eabd960bd5a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 17 Feb 2020 14:16:03 +0000
Subject: [PATCH 1105/3235] back to develop dep

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

diff --git a/package.json b/package.json
index 3c1ef9f0a5..793692d8b4 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",

From 28df1e28cf4234aaf9ecbd8f64006f4e8beec782 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:13:10 +0000
Subject: [PATCH 1106/3235] Start verification sessions in an E2E DM where
 possible

Fixes https://github.com/vector-im/riot-web/issues/12187
---
 src/createRoom.js       | 37 ++++++++++++++++++++++++++++++++++++-
 test/createRoom-test.js | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 test/createRoom-test.js

diff --git a/src/createRoom.js b/src/createRoom.js
index d4575633b3..8924808024 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -23,6 +23,7 @@ import dis from "./dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
 import {getAddressType} from "./UserAddress";
+import SettingsStore from "./settings/SettingsStore";
 
 /**
  * Create a new room, and switch to it.
@@ -174,13 +175,47 @@ export function findDMForUser(client, userId) {
     }
 }
 
+/*
+ * Try to ensure the user is already in the megolm session before continuing
+ * NOTE: this assumes you've just created the room and there's not been an opportunity
+ * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
+ */
+export async function _waitForMember(client, roomId, userId, opts = { timeout: 1500 }) {
+    const { timeout } = opts;
+    let handler;
+    return new Promise((resolve) => {
+        handler = function(_event, _roomstate, member) {
+            if (member.userId !== userId) return;
+            if (member.roomId !== roomId) return;
+            resolve(true);
+        };
+        client.on("RoomState.newMember", handler);
+
+        /* We don't want to hang if this goes wrong, so we proceed and hope the other
+           user is already in the megolm session */
+        setTimeout(resolve, timeout, false);
+    }).finally(() => {
+        client.removeListener("RoomState.newMember", handler);
+    });
+}
+
 export async function ensureDMExists(client, userId) {
     const existingDMRoom = findDMForUser(client, userId);
     let roomId;
     if (existingDMRoom) {
         roomId = existingDMRoom.roomId;
     } else {
-        roomId = await createRoom({dmUserId: userId, spinner: false, andView: false});
+        let encryption;
+        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            /* If the user's devices can all do encryption, start an encrypted DM */
+            const userDeviceMap = await client.downloadKeys([userId]);
+            // => { "@userId:host": { DEVICE: DeviceInfo, ... }}
+            const userDevices = Object.values(userDeviceMap[userId]);
+            // => [DeviceInfo, DeviceInfo...]
+            encryption = userDevices.every((device) => device.keys);
+        }
+        roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
+        await _waitForMember(client, roomId, userId);
     }
     return roomId;
 }
diff --git a/test/createRoom-test.js b/test/createRoom-test.js
new file mode 100644
index 0000000000..4bb92b14a1
--- /dev/null
+++ b/test/createRoom-test.js
@@ -0,0 +1,41 @@
+import {_waitForMember} from '../src/createRoom';
+import {EventEmitter} from 'events';
+
+/* Shorter timeout, we've got tests to run */
+const timeout = 30;
+
+describe("waitForMember", () => {
+    let client;
+
+    beforeEach(() => {
+        client = new EventEmitter();
+    });
+
+    it("resolves with false if the timeout is reached", (done) => {
+        _waitForMember(client, "", "", { timeout: 0 }).then((r) => {
+            expect(r).toBe(false);
+            done();
+        });
+    });
+
+    it("resolves with false if the timeout is reached, even if other RoomState.newMember events fire", (done) => {
+        const roomId = "!roomId:domain";
+        const userId = "@clientId:domain";
+        _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+            expect(r).toBe(false);
+            done();
+        });
+        client.emit("RoomState.newMember", undefined, undefined, { roomId, userId: "@anotherClient:domain" });
+    })
+
+    it("resolves with true if RoomState.newMember fires", (done) => {
+        const roomId = "!roomId:domain";
+        const userId = "@clientId:domain";
+        _waitForMember(client, roomId, userId, { timeout }).then((r) => {
+            expect(r).toBe(true);
+            expect(client.listeners("RoomState.newMember").length).toBe(0);
+            done();
+        });
+        client.emit("RoomState.newMember", undefined, undefined, { roomId, userId });
+    })
+});
\ No newline at end of file

From 23596031db461bf4e5e3d0acd183796a1afb431b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 17 Feb 2020 16:00:25 +0000
Subject: [PATCH 1107/3235] rip foldleft, died of lint issues

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

diff --git a/test/createRoom-test.js b/test/createRoom-test.js
index 4bb92b14a1..5955395c48 100644
--- a/test/createRoom-test.js
+++ b/test/createRoom-test.js
@@ -26,7 +26,7 @@ describe("waitForMember", () => {
             done();
         });
         client.emit("RoomState.newMember", undefined, undefined, { roomId, userId: "@anotherClient:domain" });
-    })
+    });
 
     it("resolves with true if RoomState.newMember fires", (done) => {
         const roomId = "!roomId:domain";
@@ -37,5 +37,5 @@ describe("waitForMember", () => {
             done();
         });
         client.emit("RoomState.newMember", undefined, undefined, { roomId, userId });
-    })
-});
\ No newline at end of file
+    });
+});

From 20a8fc1620d0d089f4d1d6b7481474909a902ea4 Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <20200217translateriot@remi.im>
Date: Mon, 17 Feb 2020 15:53:06 +0000
Subject: [PATCH 1108/3235] Translated using Weblate (Dutch)

Currently translated at 85.2% (1808 of 2121 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 927332e4ec..16903b36bf 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1774,5 +1774,55 @@
     "Your homeserver does not support session management.": "Uw thuisserver ondersteunt geen sessiebeheer.",
     "Unable to load session list": "Kan sessielijst niet laden",
     "Delete %(count)s sessions|other": "Verwijder %(count)s sessies",
-    "Delete %(count)s sessions|one": "Verwijder %(count)s sessie"
+    "Delete %(count)s sessions|one": "Verwijder %(count)s sessie",
+    "The version of Riot": "De versie van Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Of u Riot op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
+    "Whether you're using Riot as an installed Progressive Web App": "Of u Riot gebruikt als een geïnstalleerde Progressive-Web-App",
+    "Your user agent": "Uw browsers user-agent",
+    "The information being sent to us to help make Riot better includes:": "De informatie die naar ons wordt verstuurd om Riot te verbeteren bevat:",
+    "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zul u de andere gebruiker niet verifiëren.",
+    "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zal u uw andere sessie niet verifiëren.",
+    "If you cancel now, you won't complete your secret storage operation.": "Als u nu annuleert zal de sleutelopslag worden afgebroken.",
+    "Cancel entering passphrase?": "Wachtwoord invoer annuleren?",
+    "Show typing notifications": "Typmeldingen weergeven",
+    "Verify this session by completing one of the following:": "Verifieer deze sessie door een van het volgende te doen:",
+    "Scan this unique code": "Scan deze unieke code",
+    "or": "of",
+    "Compare unique emoji": "Vergelijk unieke emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Vergelijk een unieke lijst emoji als beide apparaten geen camera bevatten",
+    "Start": "Start",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten beveiligd op om ze weer te geven in zoekresultaten.",
+    "Enable": "Inschakelen",
+    "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder...",
+    "Cannot connect to integration manager": "Kan geen verbinding maken met de integratiebeheerder",
+    "The integration manager is offline or it cannot reach your homeserver.": "De integratiebeheerder is offline of kan uw thuisserver niet bereiken.",
+    "This session is backing up your keys. ": "Deze sessie maakt back-ups van uw sleutels. ",
+    "not stored": "niet opgeslagen",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zal geen pushmeldingen op uw andere sessies meer ontvangen, totdat u uzelf daarop opnieuw aanmeld",
+    "Ignored/Blocked": "Genegeerd/Geblokkeerd",
+    "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde gebruiker/server",
+    "Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om inzicht te krijgen.",
+    "Error subscribing to list": "Fout bij het abonneren op de lijst",
+    "Please verify the room ID or alias and try again.": "Controleer de gespreks-ID of gespreks(bij)naam en probeer het opnieuw.",
+    "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde gebruiker/server",
+    "Error unsubscribing from list": "Fout bij het opzeggen van een abonnement op de lijst",
+    "Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console om inzicht te krijgen.",
+    "None": "Geen",
+    "You have not ignored anyone.": "U heeft niemand genegeerd.",
+    "You are currently ignoring:": "U negeert op dit moment:",
+    "You are not subscribed to any lists": "U heeft geen abonnement op een lijst",
+    "Unsubscribe": "Zeg abonnement op",
+    "View rules": "Bekijk regels",
+    "You are currently subscribed to:": "U heeft een abonnement op:",
+    "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde gebruikers.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van gebruikers gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het nemen van een abonnement op een banlijst betekend dat je de gebruikers/servers die op de lijst staan niet meer zult zien.",
+    "Personal ban list": "Persoonlijke banlijst",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle gebruikers/server waar u geen berichten meer van wilt zien. Nadat u een gebruiker/server heeft genegeerd, zal een nieuwe kamer worden aangemaakt met de naam \"Mijn Banlijst\". Om de lijst actief te houden dient u de kamer niet te verlaten.",
+    "Server or user ID to ignore": "Server of gebruikers-ID om te negeren",
+    "eg: @bot:* or example.org": "bijvoorbeeld: @bot:* of example.org",
+    "Subscribed lists": "Abonnementen op lijsten",
+    "Subscribing to a ban list will cause you to join it!": "Wanneer u een abonnement neemt zal u worden toegevoegd!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
+    "Room ID or alias of ban list": "Gespreks-ID of (bij)naam of banlijst",
+    "Subscribe": "Abonneer"
 }

From c97bcc39f999d3ddeb499be5b34a73fc6f89f429 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Mon, 17 Feb 2020 21:55:15 +0000
Subject: [PATCH 1109/3235] Translated using Weblate (Finnish)

Currently translated at 89.5% (1899 of 2121 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 1d60b1af60..370f0b5394 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -97,7 +97,7 @@
     "Emoji": "Emoji",
     "Enable Notifications": "Ota ilmoitukset käyttöön",
     "End-to-end encryption information": "Osapuolten välisen salauksen tiedot",
-    "Enter passphrase": "Syötä salasana",
+    "Enter passphrase": "Syötä salalause",
     "Error decrypting attachment": "Virhe purettaessa liitteen salausta",
     "Event information": "Tapahtumatiedot",
     "Export": "Vie",
@@ -1880,5 +1880,45 @@
     "Recent Conversations": "Viimeaikaiset keskustelut",
     "Direct Messages": "Yksityisviestit",
     "Go": "Mene",
-    "Lock": "Lukko"
+    "Lock": "Lukko",
+    "The version of Riot": "Riotin versio",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Käytätkö Riotia laitteella, jossa kosketus on ensisijainen syöttömekanismi",
+    "Whether you're using Riot as an installed Progressive Web App": "Käytätkö Riotia asennettuna PWA:na (Progressive Web App)",
+    "The information being sent to us to help make Riot better includes:": "Tietoihin, joita lähetetään Riotin kehittäjille sovelluksen kehittämiseksi sisältyy:",
+    "Cancel entering passphrase?": "Peruuta salalauseen syöttäminen?",
+    "Encryption upgrade available": "Salauksen päivitys saatavilla",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s lisäsi osoitteet %(addedAddresses)s ja %(count)s muuta osoitetta tähän huoneeseen",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s poisti osoitteet %(removedAddresses)s ja %(count)s muuta osoitetta tästä huoneesta",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s poisti %(countRemoved)s ja lisäsi %(countAdded)s osoitetta tähän huoneeseen",
+    "a few seconds ago": "muutama sekunti sitten",
+    "about a minute ago": "noin minuutti sitten",
+    "%(num)s minutes ago": "%(num)s minuuttia sitten",
+    "about an hour ago": "noin tunti sitten",
+    "%(num)s hours ago": "%(num)s tuntia sitten",
+    "about a day ago": "noin päivä sitten",
+    "%(num)s days ago": "%(num)s päivää sitten",
+    "Show info about bridges in room settings": "Näytä tietoa silloista huoneen asetuksissa",
+    "Show typing notifications": "Näytä kirjoitusilmoitukset",
+    "or": "tai",
+    "Start": "Aloita",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Varmista, että alla olevat emojit näkyvät molemmilla laitteilla, samassa järjestyksessä:",
+    "To be secure, do this in person or use a trusted way to communicate.": "Turvallisuuden varmistamiseksi tee tämä kasvokkain tai käytä luotettua viestintätapaa.",
+    "Later": "Myöhemmin",
+    "Show less": "Näytä vähemmän",
+    "in memory": "muistissa",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Tämä huone ei siltaa viestejä millekään alustalle. <a>Lue lisää.</a>",
+    "Bridges": "Sillat",
+    "Send a reply…": "Lähetä vastaus…",
+    "Send a message…": "Lähetä viesti…",
+    "Unknown Command": "Tuntematon komento",
+    "Unrecognised command: %(commandText)s": "Tunnistamaton komento: %(commandText)s",
+    "Send as message": "Lähetä viestinä",
+    "Waiting for %(displayName)s to accept…": "Odotetaan, että %(displayName)s hyväksyy…",
+    "Done": "Valmis",
+    "Got it": "Asia selvä",
+    "Failed to find the following users": "Seuraavia käyttäjiä ei löytynyt",
+    "Backup restored": "Varmuuskopio palautettu",
+    "Go Back": "Takaisin",
+    "Copy": "Kopioi",
+    "Upgrade your encryption": "Päivitä salauksesi"
 }

From 0c3d2479484eeb98849c1749e693428cb681c6fe Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Mon, 17 Feb 2020 21:20:44 +0000
Subject: [PATCH 1110/3235] Translated using Weblate (Russian)

Currently translated at 80.8% (1714 of 2121 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 | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2359cb318f..831e39bf5a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -21,7 +21,7 @@
     "Curve25519 identity key": "Ключ идентификации Curve25519",
     "Deactivate Account": "Закрыть аккаунт",
     "Decryption error": "Ошибка расшифровки",
-    "Default": "Участник",
+    "Default": "По умолчанию",
     "Deops user with given id": "Снимает полномочия оператора с пользователя с заданным ID",
     "Device ID": "ID устройства",
     "Displays action": "Отображение действий",
@@ -1716,7 +1716,22 @@
     "Error subscribing to list": "Ошибка при подписке на список",
     "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер",
     "Error upgrading room": "Ошибка обновления комнаты",
-    "Match system theme": "Изменить тему",
+    "Match system theme": "Тема системы",
     "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии",
-    "The version of Riot": "Версия Riot"
+    "The version of Riot": "Версия Riot",
+    "Show typing notifications": "Показывать уведомления о наборе",
+    "Delete %(count)s sessions|other": "Удалить %(count)s сессию",
+    "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
+    "Enable audible notifications for this session": "Включить звуковые уведомления для этой сессии",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями для управления ботами, виджетами и стикерами.",
+    "Manage integrations": "Управление интеграциями",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
+    "Sessions": "Сессии",
+    "Direct Messages": "Прямые сообщения",
+    "%(count)s sessions|other": "%(count)s сессий",
+    "Hide sessions": "Скрытые сессии",
+    "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
+    "Unknown sessions": "Неизвестные сессии",
+    "Help": "Помощь"
 }

From 025d028893fcc9d96ab563eaca0760e2ecb283d3 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Mon, 17 Feb 2020 20:07:13 +0000
Subject: [PATCH 1111/3235] Translated using Weblate (Turkish)

Currently translated at 71.7% (1521 of 2121 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 391c3c8636..124dd076ee 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1497,5 +1497,44 @@
     "Space used:": "Kullanılan alan:",
     "Indexed messages:": "İndekslenmiş mesajlar:",
     "Number of rooms:": "Oda sayısı:",
-    "Enable inline URL previews by default": "Varsayılan olarak satır içi URL önizlemeleri aç"
+    "Enable inline URL previews by default": "Varsayılan olarak satır içi URL önizlemeleri aç",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s ın doğrulaması için bekleniyor…",
+    "They match": "Eşleşiyorlar",
+    "They don't match": "Eşleşmiyorlar",
+    "Verify yourself & others to keep your chats safe": "Sohbetlerinizi güvenli tutmak için kendinizi & diğerlerini doğrulayın",
+    "Other users may not trust it": "Diğer kullanıcılar güvenmeyebilirler",
+    "Later": "Sonra",
+    "Review": "Gözden Geçirme",
+    "Workspace: %(networkName)s": "Çalışma alanı: %(networkName)s",
+    "Channel: %(channelName)s": "Kanal: %(channelName)s",
+    "Show less": "Daha az göster",
+    "Show more": "Daha fazla göster",
+    "in memory": "hafızada",
+    "in secret storage": "sır deposunda",
+    "Secret storage public key:": "Sır deposu açık anahtarı:",
+    "Your homeserver does not support session management.": "Anasunucunuz oturum yönetimini desteklemiyor.",
+    "Unable to load session list": "Oturum listesi yüklenemedi",
+    "Delete %(count)s sessions|other": "%(count)s oturumu sil",
+    "Delete %(count)s sessions|one": "%(count)s oturum sil",
+    "Public Name": "Açık İsim",
+    "rooms.": "odalar.",
+    "Manage": "Yönet",
+    "Enable": "Aç",
+    "The integration manager is offline or it cannot reach your homeserver.": "Entegrasyon yöneticisi çevrim dışı veya anasunucunuza erişemiyor.",
+    "Connect this session to Key Backup": "Anahtar Yedekleme için bu oturuma bağlanın",
+    "Backup is not signed by any of your sessions": "Yedek hiç bir oturumunuz tarafından imzalanmadı",
+    "This backup is trusted because it has been restored on this session": "Bu yedek güvenilir çünkü bu oturumda geri döndürüldü",
+    "Backup key stored: ": "Yedek anahtarı depolandı: ",
+    "Enable desktop notifications for this session": "Bu oturum için masaüstü bildirimlerini aç",
+    "<a>Upgrade</a> to your own domain": "Kendi etkinlik alanınızı <a>yükseltin</a>",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Botları, görsel bileşenleri ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.",
+    "Session ID:": "Oturum ID:",
+    "Session key:": "Oturum anahtarı:",
+    "Sessions": "Oturumlar",
+    "This user has not verified all of their sessions.": "Bu kullanıcı bütün oturumlarında doğrulanmamış.",
+    "You have not verified this user.": "Bu kullanıcıyı doğrulamadınız.",
+    "Someone is using an unknown session": "Birisi bilinmeyen bir oturum kullanıyor",
+    "Everyone in this room is verified": "Bu odadaki herkes doğrulanmış",
+    "Some sessions for this user are not trusted": "Bu kullanıcı için bazı oturumlar güvenilir değil",
+    "All sessions for this user are trusted": "Bu kullanıcı için tüm oturumlar güvenilir"
 }

From 46e63fd5715c9c6b96133a445202afb4e3859efb Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 18 Feb 2020 11:14:16 +0100
Subject: [PATCH 1112/3235] cancel on dialog close

---
 .../views/dialogs/VerificationRequestDialog.js       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 8080fa09f3..abcf925f96 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -26,10 +26,15 @@ export default class VerificationRequestDialog extends React.Component {
         onFinished: PropTypes.func.isRequired,
     };
 
+    constructor(...args) {
+        super(...args);
+        this.onFinished = this.onFinished.bind(this);
+    }
+
     render() {
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
-        return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
+        return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"
                 title={_t("Verification Request")}
                 hasCancel={true}
@@ -42,4 +47,9 @@ export default class VerificationRequestDialog extends React.Component {
             />
         </BaseDialog>;
     }
+
+    onFinished() {
+        this.props.verificationRequest.cancel();
+        this.props.onFinished();
+    }
 }

From 164b355ffea785f69c683ede1137bb3926378dc9 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:25:19 +0000
Subject: [PATCH 1113/3235] abstract out the check for available target devices

---
 src/components/views/dialogs/InviteDialog.js |  6 +---
 src/createRoom.js                            | 20 ++++++++----
 test/createRoom-test.js                      | 33 +++++++++++++++++++-
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 8fec2437f6..5a5f2233bf 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -535,11 +535,7 @@ export default class InviteDialog extends React.PureComponent {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const client = MatrixClientPeg.get();
-            const usersToDevicesMap = await client.downloadKeys(targetIds);
-            const allHaveDeviceKeys = Object.values(usersToDevicesMap).every(devices => {
-                // `devices` is an object of the form { deviceId: deviceInfo, ... }.
-                return Object.keys(devices).length > 0;
-            });
+            const allHaveDeviceKeys = await createRoom.canEncryptToAllUsers(client, targetIds);
             if (allHaveDeviceKeys) {
                 createRoomOptions.encryption = true;
             }
diff --git a/src/createRoom.js b/src/createRoom.js
index 8924808024..07eaee3e8f 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -199,6 +199,19 @@ export async function _waitForMember(client, roomId, userId, opts = { timeout: 1
     });
 }
 
+/*
+ * Ensure that for every user in a room, there is at least one device that we
+ * can encrypt to.
+ */
+export async function canEncryptToAllUsers(client, userIds) {
+    const usersDeviceMap = await client.downloadKeys(userIds);
+    // { "@user:host": { "DEVICE": {...}, ... }, ... }
+    return Object.values(usersDeviceMap).every((userDevices) =>
+        // { "DEVICE": {...}, ... }
+        Object.keys(userDevices).length > 0,
+    );
+}
+
 export async function ensureDMExists(client, userId) {
     const existingDMRoom = findDMForUser(client, userId);
     let roomId;
@@ -207,12 +220,7 @@ export async function ensureDMExists(client, userId) {
     } else {
         let encryption;
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            /* If the user's devices can all do encryption, start an encrypted DM */
-            const userDeviceMap = await client.downloadKeys([userId]);
-            // => { "@userId:host": { DEVICE: DeviceInfo, ... }}
-            const userDevices = Object.values(userDeviceMap[userId]);
-            // => [DeviceInfo, DeviceInfo...]
-            encryption = userDevices.every((device) => device.keys);
+            encryption = canEncryptToAllUsers(client, [userId]);
         }
         roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
         await _waitForMember(client, roomId, userId);
diff --git a/test/createRoom-test.js b/test/createRoom-test.js
index 5955395c48..f7e8617c3f 100644
--- a/test/createRoom-test.js
+++ b/test/createRoom-test.js
@@ -1,4 +1,4 @@
-import {_waitForMember} from '../src/createRoom';
+import {_waitForMember, canEncryptToAllUsers} from '../src/createRoom';
 import {EventEmitter} from 'events';
 
 /* Shorter timeout, we've got tests to run */
@@ -39,3 +39,34 @@ describe("waitForMember", () => {
         client.emit("RoomState.newMember", undefined, undefined, { roomId, userId });
     });
 });
+
+describe("canEncryptToAllUsers", () => {
+    const trueUser = {
+        "@goodUser:localhost": {
+            "DEV1": {},
+            "DEV2": {},
+        },
+    };
+    const falseUser = {
+        "@badUser:localhost": {},
+    };
+
+    it("returns true if all devices have crypto", async (done) => {
+        const client = {
+            downloadKeys: async function(userIds) { return trueUser; },
+        };
+        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost"]);
+        expect(response).toBe(true);
+        done();
+    });
+
+
+    it("returns false if not all users have crypto", async (done) => {
+        const client = {
+            downloadKeys: async function(userIds) { return {...trueUser, ...falseUser}; },
+        };
+        const response = await canEncryptToAllUsers(client, ["@goodUser:localhost", "@badUser:localhost"]);
+        expect(response).toBe(false);
+        done();
+    });
+});

From 0e0aadd3f2f555293394bfa46b4f30f0f12cd372 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:30:10 +0000
Subject: [PATCH 1114/3235] fixed inexplicible scope bug

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 5a5f2233bf..8c9c5f75ef 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -31,7 +31,7 @@ import dis from "../../../dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
-import createRoom from "../../../createRoom";
+import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
 import SettingsStore from '../../../settings/SettingsStore';
 
@@ -535,7 +535,7 @@ export default class InviteDialog extends React.PureComponent {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const client = MatrixClientPeg.get();
-            const allHaveDeviceKeys = await createRoom.canEncryptToAllUsers(client, targetIds);
+            const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
             if (allHaveDeviceKeys) {
                 createRoomOptions.encryption = true;
             }

From 01f8a1e01fac10b0cf7981d7d1bf4b8c9dfb58fa Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 18 Feb 2020 12:19:14 +0000
Subject: [PATCH 1115/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2119 of 2126 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index c9be8ebdca..546b6f0766 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2141,5 +2141,10 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Nëse po e përdorni Riot-in në një pajisje ku touch-i është mekanizmi parësor për input-e",
     "Whether you're using Riot as an installed Progressive Web App": "Nëse po e përdorni Riot-in të instaluar si një Aplikacion Web Progresiv",
     "Your user agent": "Agjenti juaj i përdoruesit",
-    "The information being sent to us to help make Riot better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë Riot-in më të mirë përfshihen:"
+    "The information being sent to us to help make Riot better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë Riot-in më të mirë përfshihen:",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Sesioni që po provoni të verifikoni, nuk mbulon skanim kodesh QR apo verifikim emoji-sh, çka janë ato që Riot-i mbulon. Provoni me një tjetër klient.",
+    "You declined": "Hodhët poshtë",
+    "%(name)s declined": "%(name)s hodhi poshtë",
+    "accepting …": "po pranohet …",
+    "declining …": "po hidhet poshtë …"
 }

From 27bae86c0cded0f84723c201938c4464f7aea5ee Mon Sep 17 00:00:00 2001
From: Miren <miren.berasategi@deusto.es>
Date: Tue, 18 Feb 2020 10:24:37 +0000
Subject: [PATCH 1116/3235] Translated using Weblate (Basque)

Currently translated at 97.6% (2074 of 2126 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5235eba1c8..691ff0f9f5 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2097,5 +2097,8 @@
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Zure egiaztatu gabeko '%(displayName)s' saioa zifratze gakoak eskatzen ari da.",
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Egiaztaketa prozesua saio bakoitzeko egitea aholkatzen dizugu, benetan jabearenak direla baieztatzeko, baina egiaztaketa egin gabe mezua bidali dezakezu ere.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure pasa-esaldia sartuz.",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Erakutsi saioak</showSessionsText>, <sendAnywayText>bidali edonola ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>."
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Erakutsi saioak</showSessionsText>, <sendAnywayText>bidali edonola ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
+    "The information being sent to us to help make Riot better includes:": "Riot hobetzeko bidaltzen zaigun informazioa honakoa da, besteren artean:",
+    "Verify this session by completing one of the following:": "Egiaztatu saio hau hauetako bat osatuz:",
+    "or": "ala"
 }

From 932c9b3106e744ae520a75241dc76c3b57520437 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 18 Feb 2020 14:55:12 +0000
Subject: [PATCH 1117/3235] First attempt alpha room list sorting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../tabs/user/PreferencesUserSettingsTab.js   |   1 +
 src/i18n/strings/en_EN.json                   |   5 +-
 src/settings/Settings.js                      |  11 +-
 src/settings/SettingsStore.js                 |   6 +-
 .../controllers/RoomListOrderingController.js |  25 +++
 src/settings/controllers/SettingController.js |  11 ++
 src/stores/RoomListStore.js                   | 180 ++++++++++++------
 7 files changed, 173 insertions(+), 66 deletions(-)
 create mode 100644 src/settings/controllers/RoomListOrderingController.js

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index fea2e8c81f..b7fb895a9a 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -48,6 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
     ];
 
     static ROOM_LIST_SETTINGS = [
+        'RoomList.orderingAlgorithm', // this has a controller which maps the boolean inputs to algorithms
         'RoomList.orderByImportance',
         'breadcrumbs',
     ];
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7a8642be95..1f4d9829ad 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -413,8 +413,9 @@
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
     "Show developer tools": "Show developer tools",
-    "Order rooms in the room list by most important first instead of most recent": "Order rooms in the room list by most important first instead of most recent",
-    "Show recently visited rooms above the room list": "Show recently visited rooms above the room list",
+    "Order rooms by message activity instead of by name": "Order rooms by message activity instead of by name",
+    "Show rooms with unread notifications first": "Show rooms with unread notifications first",
+    "Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
     "Show hidden events in timeline": "Show hidden events in timeline",
     "Low bandwidth mode": "Low bandwidth mode",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 936b651211..87c1526eaa 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -26,6 +26,7 @@ import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
+import RoomListOrderingController from "./controllers/RoomListOrderingController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -433,14 +434,20 @@ export const SETTINGS = {
             deny: [],
         },
     },
+    "RoomList.orderingAlgorithm": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Order rooms by message activity instead of by name"),
+        default: "recent", // XXX controller maps boolean onto algorithm for future flexibility
+        controller: new RoomListOrderingController(),
+    },
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Order rooms in the room list by most important first instead of most recent'),
+        displayName: _td("Show rooms with unread notifications first"),
         default: true,
     },
     "breadcrumbs": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Show recently visited rooms above the room list"),
+        displayName: _td("Show shortcuts to recently viewed rooms above the room list"),
         default: true,
     },
     "showHiddenEventsInTimeline": {
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 0122916bc3..897c2521cc 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -420,9 +420,13 @@ export default class SettingsStore {
             throw new Error("User cannot set " + settingName + " at " + level + " in " + roomId);
         }
 
+        const controller = setting.controller;
+        if (controller) {
+            value = controller.augmentValue(level, roomId, value);
+        }
+
         await handler.setValue(settingName, roomId, value);
 
-        const controller = setting.controller;
         if (controller) {
             controller.onChange(level, roomId, value);
         }
diff --git a/src/settings/controllers/RoomListOrderingController.js b/src/settings/controllers/RoomListOrderingController.js
new file mode 100644
index 0000000000..449e21545a
--- /dev/null
+++ b/src/settings/controllers/RoomListOrderingController.js
@@ -0,0 +1,25 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 SettingController from "./SettingController";
+
+export default class RoomListOrderingController extends SettingController {
+    augmentValue(level, roomId, newValue): * {
+        // currently we expose algorithm as a boolean but store it as a string for future flexibility
+        // where we may want >2 algorithms available for the user to choose between.
+        return newValue ? "recent" : "alphabetic";
+    }
+}
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.js
index a7d0ccf21a..9327f6ab48 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.js
@@ -47,4 +47,15 @@ export default class SettingController {
     onChange(level, roomId, newValue) {
         // do nothing by default
     }
+
+    /**
+     * Gets the value which should actually get written into the store based on the input value from setValue.
+     * @param {string} level The level at which the setting has been modified.
+     * @param {String} roomId The room ID, may be null.
+     * @param {*} newValue The new value for the setting, may be null.
+     * @return {*} The value that should be used, may be null.
+     */
+    augmentValue(level, roomId, newValue) {
+        return newValue;
+    }
 }
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index a0785cf10e..e99214dea1 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -36,29 +36,48 @@ const CATEGORY_GREY = "grey";   // Unread notified messages (not mentions)
 const CATEGORY_BOLD = "bold";   // Unread messages (not notified, 'Mentions Only' rooms)
 const CATEGORY_IDLE = "idle";   // Nothing of interest
 
-const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
-const LIST_ORDERS = {
-    "m.favourite": "manual",
-    "im.vector.fake.invite": "recent",
-    "im.vector.fake.recent": "recent",
-    "im.vector.fake.direct": "recent",
-    "m.lowpriority": "recent",
-    "im.vector.fake.archived": "recent",
-};
-
 /**
- * Identifier for the "breadcrumb" (or "sort by most important room first") algorithm.
- * Includes a provision for keeping the currently open room from flying down the room
- * list.
+ * Identifier for manual sorting behaviour: sort by the user defined order.
  * @type {string}
  */
-const ALGO_IMPORTANCE = "importance";
+export const ALGO_MANUAL = "manual";
+
+/**
+ * Identifier for alphabetic sorting behaviour: sort by the room name alphabetically first.
+ * @type {string}
+ */
+export const ALGO_ALPHABETIC = "alphabetic";
 
 /**
  * Identifier for classic sorting behaviour: sort by the most recent message first.
  * @type {string}
  */
-const ALGO_RECENT = "recent";
+export const ALGO_RECENT = "recent";
+
+const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
+const getListAlgorithm = (listKey, settingAlgorithm) => {
+    switch (listKey) {
+        case "m.favourite":
+            return ALGO_MANUAL;
+        case "im.vector.fake.invite":
+        case "im.vector.fake.recent":
+        case "im.vector.fake.direct":
+        case "im.vector.fake.archived":
+        case "m.lowpriority":
+            return settingAlgorithm;
+        default:
+            return ALGO_MANUAL; // TODO verify this is desired
+    }
+};
+
+const knownLists = new Set([
+    "m.favourite",
+    "im.vector.fake.invite",
+    "im.vector.fake.recent",
+    "im.vector.fake.direct",
+    "im.vector.fake.archived",
+    "m.lowpriority",
+]);
 
 /**
  * A class for storing application state for categorising rooms in
@@ -76,13 +95,12 @@ class RoomListStore extends Store {
     /**
      * Changes the sorting algorithm used by the RoomListStore.
      * @param {string} algorithm The new algorithm to use. Should be one of the ALGO_* constants.
+     * @param {boolean} orderImportantFirst Whether to sort by categories of importance
      */
-    updateSortingAlgorithm(algorithm) {
+    updateSortingAlgorithm(algorithm, orderImportantFirst) {
         // Dev note: We only have two algorithms at the moment, but it isn't impossible that we want
         // multiple in the future. Also constants make things slightly clearer.
-        const byImportance = algorithm === ALGO_IMPORTANCE;
-        console.log("Updating room sorting algorithm: sortByImportance=" + byImportance);
-        this._setState({orderRoomsByImportance: byImportance});
+        this._setState({algorithm, orderImportantFirst});
 
         // Trigger a resort of the entire list to reflect the change in algorithm
         this._generateInitialRoomLists();
@@ -106,10 +124,12 @@ class RoomListStore extends Store {
             presentationLists: defaultLists, // like `lists`, but with arrays of rooms instead
             ready: false,
             stickyRoomId: null,
-            orderRoomsByImportance: true,
+            algorithm: ALGO_RECENT,
+            orderImportantFirst: false,
         };
 
         SettingsStore.monitorSetting('RoomList.orderByImportance', null);
+        SettingsStore.monitorSetting('RoomList.orderingAlgorithm', null);
         SettingsStore.monitorSetting('feature_custom_tags', null);
     }
 
@@ -135,11 +155,17 @@ class RoomListStore extends Store {
             case 'setting_updated': {
                 if (!logicallyReady) break;
 
-                if (payload.settingName === 'RoomList.orderByImportance') {
-                    this.updateSortingAlgorithm(payload.newValue === true ? ALGO_IMPORTANCE : ALGO_RECENT);
-                } else if (payload.settingName === 'feature_custom_tags') {
-                    this._setState({tagsEnabled: payload.newValue});
-                    this._generateInitialRoomLists(); // Tags means we have to start from scratch
+                switch (payload.settingName) {
+                    case "RoomList.orderingAlgorithm":
+                        this.updateSortingAlgorithm(payload.newValue, this._state.orderImportantFirst);
+                        break;
+                    case "RoomList.orderByImportance":
+                        this.updateSortingAlgorithm(this._state.algorithm, payload.newValue);
+                        break;
+                    case "feature_custom_tags":
+                        this._setState({tagsEnabled: payload.newValue});
+                        this._generateInitialRoomLists(); // Tags means we have to start from scratch
+                        break;
                 }
             }
             break;
@@ -157,9 +183,9 @@ class RoomListStore extends Store {
 
                 this._matrixClient = payload.matrixClient;
 
-                const algorithm = SettingsStore.getValue("RoomList.orderByImportance")
-                    ? ALGO_IMPORTANCE : ALGO_RECENT;
-                this.updateSortingAlgorithm(algorithm);
+                const algorithm = SettingsStore.getValue("RoomList.orderingAlgorithm");
+                const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
+                this.updateSortingAlgorithm(algorithm, orderByImportance);
             }
             break;
             case 'MatrixActions.Room.receipt': {
@@ -188,7 +214,8 @@ class RoomListStore extends Store {
                 if (!logicallyReady ||
                     !payload.isLiveEvent ||
                     !payload.isLiveUnfilteredRoomTimelineEvent ||
-                    !this._eventTriggersRecentReorder(payload.event)
+                    !this._eventTriggersRecentReorder(payload.event) ||
+                    this._state.algorithm !== ALGO_RECENT
                 ) {
                     break;
                 }
@@ -302,7 +329,7 @@ class RoomListStore extends Store {
     _filterTags(tags) {
         tags = tags ? Object.keys(tags) : [];
         if (this._state.tagsEnabled) return tags;
-        return tags.filter((t) => !!LIST_ORDERS[t]);
+        return tags.filter((t) => knownLists.has(t));
     }
 
     _getRecommendedTagsForRoom(room) {
@@ -419,9 +446,11 @@ class RoomListStore extends Store {
                     if (changedBoundary) {
                         // If we changed a boundary, then we've gone too far - go to the top of the last
                         // section instead.
+                        console.log("DEBUG changedBoundary", room.name, room, category);
                         newList.splice(desiredCategoryBoundaryIndex, 0, {room, category});
                     } else {
                         // If we're ordering by timestamp, just insert normally
+                        console.log("DEBUG 11push", room.name, room, category);
                         newList.push({room, category});
                     }
                     pushedEntry = true;
@@ -473,16 +502,19 @@ class RoomListStore extends Store {
 
             // Speed optimization: Don't do complicated math if we don't have to.
             if (!shouldHaveRoom) {
+                console.log("DEBUG A");
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-            } else if (LIST_ORDERS[key] !== 'recent') {
+            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL) {
                 // Manually ordered tags are sorted later, so for now we'll just clone the tag
                 // and add our room if needed
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
+                console.log("DEBUG push", room.name, room, category);
                 listsClone[key].push({room, category});
                 insertedIntoTags.push(key);
             } else {
                 listsClone[key] = [];
 
+                console.log("DEBUG slot");
                 const pushedEntry = this._slotRoomIntoList(
                     room, category, key, this._state.lists[key], listsClone[key], lastTimestamp);
 
@@ -529,16 +561,23 @@ class RoomListStore extends Store {
                     console.warn(`!! List for tag ${targetTag} does not exist - creating`);
                     listsClone[targetTag] = [];
                 }
+                console.log("DEBUG123", room.name, room, category);
                 listsClone[targetTag].splice(0, 0, {room, category});
             }
         }
 
+        console.log("DEBUG targetTags", targetTags);
+
         // Sort the favourites before we set the clone
         for (const tag of Object.keys(listsClone)) {
-            if (LIST_ORDERS[tag] === 'recent') continue; // skip recents (pre-sorted)
+            if (getListAlgorithm(tag, this._state.algorithm) !== ALGO_MANUAL) continue; // skip recents (pre-sorted)
+            console.log("DEBUG applying manual sort to", tag);
             listsClone[tag].sort(this._getManualComparator(tag));
         }
 
+        console.log("DEBUG setting lists=listsClone",
+            this._state.lists["im.vector.fake.recent"].map(e => e.room.name),
+            listsClone["im.vector.fake.recent"].map(e => e.room.name));
         this._setState({lists: listsClone});
     }
 
@@ -585,8 +624,10 @@ class RoomListStore extends Store {
 
                         // Default to an arbitrary category for tags which aren't ordered by recents
                         let category = CATEGORY_IDLE;
-                        if (LIST_ORDERS[tagName] === 'recent') category = this._calculateCategory(room);
-                        lists[tagName].push({room, category: category});
+                        if (getListAlgorithm(tagName, this._state.algorithm) !== ALGO_MANUAL) {
+                            category = this._calculateCategory(room);
+                        }
+                        lists[tagName].push({room, category});
                     }
                 } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
@@ -605,33 +646,41 @@ class RoomListStore extends Store {
         // cache only needs to survive the sort operation below and should not be implemented outside
         // of this function, otherwise the room lists will almost certainly be out of date and wrong.
         const latestEventTsCache = {}; // roomId => timestamp
+        const tsOfNewestEventFn = (room) => {
+            if (!room) return Number.MAX_SAFE_INTEGER; // Should only happen in tests
+
+            if (latestEventTsCache[room.roomId]) {
+                return latestEventTsCache[room.roomId];
+            }
+
+            const ts = this._tsOfNewestEvent(room);
+            latestEventTsCache[room.roomId] = ts;
+            return ts;
+        };
 
         Object.keys(lists).forEach((listKey) => {
             let comparator;
-            switch (LIST_ORDERS[listKey]) {
-                case "recent":
+            console.log("DEBUG sorting", listKey, "using", getListAlgorithm(listKey, this._state.algorithm));
+            switch (getListAlgorithm(listKey, this._state.algorithm)) {
+                case ALGO_RECENT:
                     comparator = (entryA, entryB) => {
-                        return this._recentsComparator(entryA, entryB, (room) => {
-                            if (!room) return Number.MAX_SAFE_INTEGER; // Should only happen in tests
-
-                            if (latestEventTsCache[room.roomId]) {
-                                return latestEventTsCache[room.roomId];
-                            }
-
-                            const ts = this._tsOfNewestEvent(room);
-                            latestEventTsCache[room.roomId] = ts;
-                            return ts;
-                        });
+                        return this._recentsComparator(entryA, entryB, tsOfNewestEventFn);
                     };
                     break;
-                case "manual":
+                case ALGO_ALPHABETIC:
+                    comparator = (entryA, entryB) => this._alphabeticComparator(entryA, entryB);
+                    break;
+                case ALGO_MANUAL:
                 default:
                     comparator = this._getManualComparator(listKey);
                     break;
             }
-            lists[listKey].sort(comparator);
+            console.log("DEBUG before", listKey, lists[listKey].map(e => e.room.name));
+            lists[listKey].sort(comparator); // TODO inline the common CATEGORY comparator here?
+            console.log("DEBUG after", listKey, lists[listKey].map(e => e.room.name));
         });
 
+        console.log("DEBUG setting lists after comparator");
         this._setState({
             lists,
             ready: true, // Ready to receive updates to ordering
@@ -668,7 +717,7 @@ class RoomListStore extends Store {
     }
 
     _calculateCategory(room) {
-        if (!this._state.orderRoomsByImportance) {
+        if (!this._state.orderImportantFirst) {
             // Effectively disable the categorization of rooms if we're supposed to
             // be sorting by more recent messages first. This triggers the timestamp
             // comparison bit of _setRoomCategory and _recentsComparator instead of
@@ -689,26 +738,35 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(entryA, entryB, tsOfNewestEventFn) {
-        const roomA = entryA.room;
-        const roomB = entryB.room;
-        const categoryA = entryA.category;
-        const categoryB = entryB.category;
-
-        if (categoryA !== categoryB) {
-            const idxA = CATEGORY_ORDER.indexOf(categoryA);
-            const idxB = CATEGORY_ORDER.indexOf(categoryB);
+        console.trace("DEBUG recents");
+        if (entryA.category !== entryB.category) {
+            const idxA = CATEGORY_ORDER.indexOf(entryA.category);
+            const idxB = CATEGORY_ORDER.indexOf(entryB.category);
             if (idxA > idxB) return 1;
             if (idxA < idxB) return -1;
             return 0; // Technically not possible
         }
 
-        const timestampA = tsOfNewestEventFn(roomA);
-        const timestampB = tsOfNewestEventFn(roomB);
+        const timestampA = tsOfNewestEventFn(entryA.room);
+        const timestampB = tsOfNewestEventFn(entryB.room);
         return timestampB - timestampA;
     }
 
+    _alphabeticComparator(entryA, entryB) {
+        if (entryA.category !== entryB.category) {
+            const idxA = CATEGORY_ORDER.indexOf(entryA.category);
+            const idxB = CATEGORY_ORDER.indexOf(entryB.category);
+            if (idxA > idxB) return 1;
+            if (idxA < idxB) return -1;
+            return 0; // Technically not possible
+        }
+
+        // console.log("DEBUG alphabetic, same category", JSON.stringify(entryA.room.name), JSON.stringify(entryB.room.name), this._lexicographicalComparator(entryA.room, entryB.room));
+        return this._lexicographicalComparator(entryA.room, entryB.room);
+    }
+
     _lexicographicalComparator(roomA, roomB) {
-        return roomA.name > roomB.name ? 1 : -1;
+        return roomA.name.localeCompare(roomB.name);
     }
 
     _getManualComparator(tagName, optimisticRequest) {

From 600cb64d001fca0cd93ed6469ec0e9da2ef577d5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 18 Feb 2020 15:04:57 +0000
Subject: [PATCH 1118/3235] don't nest <a> inside <AccessibleButton>

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/MessageContextMenu.js | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 136c31803e..ea5623fe48 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -414,11 +414,16 @@ export default createReactClass({
         }
         // XXX: if we use room ID, we should also include a server where the event can be found (other than in the domain of the event ID)
         const permalinkButton = (
-            <MenuItem className="mx_MessageContextMenu_field" onClick={this.onPermalinkClick}>
-                <a href={permalink} target="_blank" rel="noopener" onClick={this.onPermalinkClick} tabIndex={-1}>
-                    { mxEvent.isRedacted() || mxEvent.getType() !== 'm.room.message'
-                        ? _t('Share Permalink') : _t('Share Message') }
-                </a>
+            <MenuItem
+                element="a"
+                className="mx_MessageContextMenu_field"
+                onClick={this.onPermalinkClick}
+                href={permalink}
+                target="_blank"
+                rel="noopener"
+            >
+                { mxEvent.isRedacted() || mxEvent.getType() !== 'm.room.message'
+                    ? _t('Share Permalink') : _t('Share Message') }
             </MenuItem>
         );
 
@@ -436,16 +441,15 @@ export default createReactClass({
             isUrlPermitted(mxEvent.event.content.external_url)
         ) {
             externalURLButton = (
-                <MenuItem className="mx_MessageContextMenu_field">
-                    <a
-                        href={mxEvent.event.content.external_url}
-                        target="_blank"
-                        rel="noopener"
-                        onClick={this.closeMenu}
-                        tabIndex={-1}
-                    >
-                        { _t('Source URL') }
-                    </a>
+                <MenuItem
+                    element="a"
+                    className="mx_MessageContextMenu_field"
+                    target="_blank"
+                    rel="noopener"
+                    onClick={this.closeMenu}
+                    href={mxEvent.event.content.external_url}
+                >
+                    { _t('Source URL') }
                 </MenuItem>
           );
         }

From e6ca581f10acfd33f5c43c772e331748a0538445 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 18 Feb 2020 15:57:17 +0100
Subject: [PATCH 1119/3235] get local aliases from /aliases in room settings

---
 .../views/room_settings/AliasSettings.js      | 55 +++++++++++++------
 .../tabs/room/GeneralRoomSettingsTab.js       |  3 +-
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index ee5a505b32..e441ebfb8a 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -74,7 +74,6 @@ export default class AliasSettings extends React.Component {
         roomId: PropTypes.string.isRequired,
         canSetCanonicalAlias: PropTypes.bool.isRequired,
         canSetAliases: PropTypes.bool.isRequired,
-        aliasEvents: PropTypes.array, // [MatrixEvent]
         canonicalAliasEvent: PropTypes.object, // MatrixEvent
     };
 
@@ -94,27 +93,49 @@ export default class AliasSettings extends React.Component {
             updatingCanonicalAlias: false,
         };
 
-        const localDomain = MatrixClientPeg.get().getDomain();
-        state.domainToAliases = this.aliasEventsToDictionary(props.aliasEvents || []);
-        state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
-            return domain !== localDomain && state.domainToAliases[domain].length > 0;
-        });
-
         if (props.canonicalAliasEvent) {
+            const cli = MatrixClientPeg.get();
+            const localDomain = cli.getDomain();
+            state.domainToAliases = this.aliasesToDictionary(this._getAltAliases());
+            state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
+                return domain !== localDomain && state.domainToAliases[domain].length > 0;
+            });
             state.canonicalAlias = props.canonicalAliasEvent.getContent().alias;
         }
 
         this.state = state;
     }
 
-    aliasEventsToDictionary(aliasEvents) { // m.room.alias events
-        const dict = {};
-        aliasEvents.forEach((event) => {
-            dict[event.getStateKey()] = (
-                (event.getContent().aliases || []).slice() // shallow-copy
-            );
-        });
-        return dict;
+    async componentWillMount() {
+        const cli = MatrixClientPeg.get();
+        const response = await cli.getLocalAliases(this.props.roomId);
+        const localAliases = response.aliases;
+        const localDomain = cli.getDomain();
+        const domainToAliases = Object.assign(
+            {},
+            this.state.domainToAliases,
+            {[localDomain]: localAliases || []},
+        );
+        this.setState({ domainToAliases });
+    }
+
+    aliasesToDictionary(aliases) {
+        return aliases.reduce((dict, alias) => {
+            const domain = alias.split(":")[1];
+            dict[domain] = dict[domain] || [];
+            dict[domain].push(alias);
+            return dict;
+        }, {});
+    }
+
+    _getAltAliases() {
+        if (this.props.canonicalAliasEvent) {
+            const altAliases = this.props.canonicalAliasEvent.getContent().alt_aliases;
+            if (Array.isArray(altAliases)) {
+                return altAliases;
+            }
+        }
+        return [];
     }
 
     changeCanonicalAlias(alias) {
@@ -125,7 +146,9 @@ export default class AliasSettings extends React.Component {
             updatingCanonicalAlias: true,
         });
 
-        const eventContent = {};
+        const eventContent = {
+            alt_aliases: this._getAltAliases(),
+        };
         if (alias) eventContent["alias"] = alias;
 
         MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.canonical_alias",
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index b65f8d49a4..098c07b825 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -78,7 +78,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const canActuallySetAliases = room.currentState.mayClientSendStateEvent("m.room.aliases", client);
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
-        const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
 
         const canChangeGroups = room.currentState.mayClientSendStateEvent("m.room.related_groups", client);
         const groupsEvent = room.currentState.getStateEvents("m.room.related_groups", "");
@@ -94,7 +93,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <AliasSettings roomId={this.props.roomId}
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
-                                   canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
+                                   canonicalAliasEvent={canonicalAliasEv} />
                 </div>
                 <div className='mx_SettingsTab_section'>
                     <LabelledToggleSwitch value={this.state.isRoomPublished}

From 4c9c57bfe5b53f1a32c767f091d875f851d79198 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 19 Feb 2020 10:06:52 +0100
Subject: [PATCH 1120/3235] check server feature flag

if not available, revert to old behavior
---
 .../views/room_settings/AliasSettings.js      | 54 ++++++++++++-------
 .../tabs/room/GeneralRoomSettingsTab.js       |  3 +-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index e441ebfb8a..d7befa488d 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -94,12 +94,6 @@ export default class AliasSettings extends React.Component {
         };
 
         if (props.canonicalAliasEvent) {
-            const cli = MatrixClientPeg.get();
-            const localDomain = cli.getDomain();
-            state.domainToAliases = this.aliasesToDictionary(this._getAltAliases());
-            state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
-                return domain !== localDomain && state.domainToAliases[domain].length > 0;
-            });
             state.canonicalAlias = props.canonicalAliasEvent.getContent().alias;
         }
 
@@ -108,15 +102,29 @@ export default class AliasSettings extends React.Component {
 
     async componentWillMount() {
         const cli = MatrixClientPeg.get();
-        const response = await cli.getLocalAliases(this.props.roomId);
-        const localAliases = response.aliases;
-        const localDomain = cli.getDomain();
-        const domainToAliases = Object.assign(
-            {},
-            this.state.domainToAliases,
-            {[localDomain]: localAliases || []},
-        );
-        this.setState({ domainToAliases });
+        if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
+            const response = await cli.unstableGetLocalAliases(this.props.roomId);
+            const localAliases = response.aliases;
+            const localDomain = cli.getDomain();
+            const domainToAliases = Object.assign(
+                {},
+                // FIXME, any localhost alt_aliases will be ignored as they are overwritten by localAliases
+                this.aliasesToDictionary(this._getAltAliases()),
+                {[localDomain]: localAliases || []},
+            );
+            const remoteDomains = Object.keys(domainToAliases).filter((domain) => {
+                return domain !== localDomain && domainToAliases[domain].length > 0;
+            });
+            this.setState({ domainToAliases, remoteDomains });
+        } else {
+            const state = {};
+            const localDomain = cli.getDomain();
+            state.domainToAliases = this.aliasEventsToDictionary(this.props.aliasEvents || []);
+            state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
+                return domain !== localDomain && state.domainToAliases[domain].length > 0;
+            });
+            this.setState(state);
+        }
     }
 
     aliasesToDictionary(aliases) {
@@ -128,6 +136,16 @@ export default class AliasSettings extends React.Component {
         }, {});
     }
 
+    aliasEventsToDictionary(aliasEvents) { // m.room.alias events
+        const dict = {};
+        aliasEvents.forEach((event) => {
+            dict[event.getStateKey()] = (
+                (event.getContent().aliases || []).slice() // shallow-copy
+            );
+        });
+        return dict;
+    }
+
     _getAltAliases() {
         if (this.props.canonicalAliasEvent) {
             const altAliases = this.props.canonicalAliasEvent.getContent().alt_aliases;
@@ -146,9 +164,9 @@ export default class AliasSettings extends React.Component {
             updatingCanonicalAlias: true,
         });
 
-        const eventContent = {
-            alt_aliases: this._getAltAliases(),
-        };
+        const eventContent = {};
+        const altAliases = this._getAltAliases();
+        if (altAliases) eventContent["alt_aliases"] = altAliases;
         if (alias) eventContent["alias"] = alias;
 
         MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.canonical_alias",
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 098c07b825..b65f8d49a4 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -78,6 +78,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const canActuallySetAliases = room.currentState.mayClientSendStateEvent("m.room.aliases", client);
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
+        const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
 
         const canChangeGroups = room.currentState.mayClientSendStateEvent("m.room.related_groups", client);
         const groupsEvent = room.currentState.getStateEvents("m.room.related_groups", "");
@@ -93,7 +94,7 @@ export default class GeneralRoomSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <AliasSettings roomId={this.props.roomId}
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
-                                   canonicalAliasEvent={canonicalAliasEv} />
+                                   canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
                 </div>
                 <div className='mx_SettingsTab_section'>
                     <LabelledToggleSwitch value={this.state.isRoomPublished}

From 650f412acb1d6097596118ee578f5053acb0d235 Mon Sep 17 00:00:00 2001
From: rtestard <rtestard@opensense.fr>
Date: Wed, 19 Feb 2020 10:15:58 +0100
Subject: [PATCH 1121/3235] I have added a new line at the end of the scss file

---
 res/css/views/rooms/_InviteOnlyIcon.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
index 21ab431973..b71fd6348d 100644
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ b/res/css/views/rooms/_InviteOnlyIcon.scss
@@ -55,4 +55,4 @@ limitations under the License.
         width: 10px;
         height: 10px;
     }
-}
\ No newline at end of file
+}

From cb5882d59bb0d3f7efb2d8aff75cc2489d470466 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 19 Feb 2020 10:40:00 +0100
Subject: [PATCH 1122/3235] add null check

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

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index eddd26c857..20df323c10 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -92,6 +92,7 @@ export default class RightPanel extends React.Component {
             // not mounted in time to get the dispatch.
             // Until then, let this code serve as a warning from history.
             if (
+                rps.roomPanelPhaseParams.member &&
                 userForPanel.userId === rps.roomPanelPhaseParams.member.userId &&
                 rps.roomPanelPhaseParams.verificationRequest
             ) {

From d7a6296100208ad5e4e9e2b0c49901de93944263 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 19 Feb 2020 02:49:26 +0000
Subject: [PATCH 1123/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2126 of 2126 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9d4cf79705..0cbbaccb35 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2152,5 +2152,10 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "您是否在以觸控為主要機制的裝置上使用 Riot",
     "Whether you're using Riot as an installed Progressive Web App": "您是否使用 PWA 形式的 Riot",
     "Your user agent": "您的使用者代理字串",
-    "The information being sent to us to help make Riot better includes:": "傳送給我們以協助改進 Riot 的資訊包含了："
+    "The information being sent to us to help make Riot better includes:": "傳送給我們以協助改進 Riot 的資訊包含了：",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "您嘗試驗證的工作階段不支援 Riot 支援的掃描 QR code 或顏文字驗證。請用其他客戶端試試看。",
+    "You declined": "您拒絕了",
+    "%(name)s declined": "%(name)s 拒絕了",
+    "accepting …": "正在接受……",
+    "declining …": "正在拒絕……"
 }

From 2273b8606b1465e0936d5a1f310ffb4321e7d1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 19 Feb 2020 07:57:19 +0000
Subject: [PATCH 1124/3235] Translated using Weblate (French)

Currently translated at 100.0% (2126 of 2126 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e756d00aeb..63e8159924 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2153,5 +2153,10 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Si vous utilisez Riot sur un appareil où le toucher est le mécanisme primaire de saisie",
     "Whether you're using Riot as an installed Progressive Web App": "Si vous utilisez Riot en tant qu’application web progressive (PWA)",
     "Your user agent": "Votre agent utilisateur",
-    "The information being sent to us to help make Riot better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer Riot comportent :"
+    "The information being sent to us to help make Riot better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer Riot comportent :",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La session que vous essayez de vérifier ne prend pas en charge les codes QR ou la vérification d’émojis, qui sont les méthodes prises en charge par Riot. Essayez avec un autre client.",
+    "You declined": "Vous avez refusé",
+    "%(name)s declined": "%(name)s a refusé",
+    "accepting …": "nous acceptons…",
+    "declining …": "nous refusons…"
 }

From 7460ddfada28bd26c5af71da1f4fd5aa0594e446 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Tue, 18 Feb 2020 22:08:12 +0000
Subject: [PATCH 1125/3235] Translated using Weblate (German)

Currently translated at 71.1% (1512 of 2126 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 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 2dcdb43aec..304c166e22 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1542,5 +1542,23 @@
     "Unsubscribe": "Deabonnieren",
     "View rules": "Regeln betrachten",
     "You are currently subscribed to:": "Du abonnierst momentan:",
-    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht."
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
+    "The version of Riot": "Die Version von Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ob Sie Riot auf einem Gerät verwenden, bei dem Berührung der primäre Eingabemechanismus ist",
+    "Whether you're using Riot as an installed Progressive Web App": "Ob Sie Riot als installierte progressive Web-App verwenden",
+    "Your user agent": "Ihr User-Agent",
+    "The information being sent to us to help make Riot better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, Riot besser zu machen, gehören:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Es sind unbekannte Sitzungen in diesem Raum: Wenn Sie ohne Verifizierung fortfahren, wird es für jemanden möglich sein, Ihren Anruf zu belauschen.",
+    "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",
+    "If you cancel now, you won't complete verifying your other session.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung der anderen Sitzung nicht beenden können.",
+    "If you cancel now, you won't complete your secret storage operation.": "Wenn Sie jetzt abbrechen, werden Sie die Geheimlagerungsoperation nicht beenden können.",
+    "Cancel entering passphrase?": "Eingabe der Passphrase abbrechen?",
+    "Setting up keys": "Einrichten der Schlüssel",
+    "Encryption upgrade available": "Verschlüsselungs-Update verfügbar",
+    "Unverified session": "Ungeprüfte Sitzung",
+    "Verifies a user, session, and pubkey tuple": "Verifiziert einen Benutzer, eine Sitzung und Pubkey-Tupel",
+    "Unknown (user, session) pair:": "Unbekanntes (Nutzer-, Sitzungs-) Paar:",
+    "Session already verified!": "Sitzung bereits verifiziert!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ACHTUNG: Sitzung bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem beritgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass Ihre Kommunikation abgehört wird!"
 }

From 6c9d489ef7fe2d69446c19090e1fd1cf9b5ed540 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 18 Feb 2020 20:20:57 +0000
Subject: [PATCH 1126/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2126 of 2126 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index ca701c99e9..018f7a05f6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2149,5 +2149,10 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Hogy olyan eszközön használod a Riotot ahol az érintés az elsődleges beviteli forma",
     "Whether you're using Riot as an installed Progressive Web App": "Hogy a Riotot mint progresszív webes alkalmazást használod",
     "Your user agent": "Felhasználói ügynök",
-    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:"
+    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Az ellenőrizni kívánt munkamenet nem támogatja se a QR kód beolvasást se az emodzsi ellenőrzést, amit a Riot támogat. Próbáld meg egy másik klienssel.",
+    "You declined": "Elutasítottad",
+    "%(name)s declined": "%(name)s elutasította",
+    "accepting …": "elfogadás …",
+    "declining …": "elutasítás …"
 }

From ad8255e31a85c8f838feab139abc302934b41fb5 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 18 Feb 2020 14:44:23 +0000
Subject: [PATCH 1127/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2126 of 2126 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index bee64682d1..d1e12bdd77 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2150,5 +2150,10 @@
     "Verify by scanning": "Verifica con la scansione",
     "Destroy cross-signing keys?": "Distruggere le chiavi di firma incrociata?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "L'eliminazione delle chiavi di firma incrociata è permanente. Chiunque si sia verificato con te vedrà avvisi di sicurezza. Quasi sicuramente non vuoi fare questa cosa, a meno che tu non abbia perso tutti i dispositivi da cui puoi fare l'accesso.",
-    "Clear cross-signing keys": "Elimina chiavi di firma incrociata"
+    "Clear cross-signing keys": "Elimina chiavi di firma incrociata",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La sessione che stai cercando di verificare non supporta la scansione del codice QR o la verifica emoji, che sono supportate da Riot. Prova con un client diverso.",
+    "You declined": "Hai rifiutato",
+    "%(name)s declined": "%(name)s ha rifiutato",
+    "accepting …": "accettazione …",
+    "declining …": "rifiuto …"
 }

From 48ef8e84e6233b1bd37634684ec75d8945d2a4dc Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Wed, 19 Feb 2020 07:16:33 +0000
Subject: [PATCH 1128/3235] Translated using Weblate (Russian)

Currently translated at 80.9% (1719 of 2126 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 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 831e39bf5a..457e828ded 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -924,7 +924,7 @@
     "Failed to invite users to the room:": "Не удалось пригласить пользователей в комнату:",
     "Upgrades a room to a new version": "Модернизирует комнату до новой версии",
     "Sets the room name": "Устанавливает название комнаты",
-    "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": "Принудительно отбрасывает текущая сессия исходящей группы в зашифрованной комнате",
     "%(senderDisplayName)s upgraded this room.": "%(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 к списку адресов комнаты.",
@@ -1733,5 +1733,11 @@
     "Hide sessions": "Скрытые сессии",
     "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
     "Unknown sessions": "Неизвестные сессии",
-    "Help": "Помощь"
+    "Help": "Помощь",
+    "If you cancel now, you won't complete verifying your other session.": "Если вы отмените сейчас, вы не завершите проверку вашей другой сессии.",
+    "Verify this session": "Проверьте эту сессию",
+    "Unverified session": "Непроверенная сессия",
+    "Verifies a user, session, and pubkey tuple": "Проверяет пользователя, сессию и публичные ключи",
+    "Unknown (user, session) pair:": "Неизвестная (пользователь:сессия) пара:",
+    "Session already verified!": "Сессия уже подтверждена!"
 }

From 30ae6dbdbb96210d4514409c0bebf64e7e8c0fba Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 19 Feb 2020 11:18:56 +0100
Subject: [PATCH 1129/3235] also detect aliases using new /aliases endpoint for
 room access settings

---
 .../tabs/room/SecurityRoomSettingsTab.js      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 0c66503c43..480d55c044 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -36,11 +36,12 @@ export default class SecurityRoomSettingsTab extends React.Component {
             joinRule: "invite",
             guestAccess: "can_join",
             history: "shared",
+            hasAliases: false,
             encrypted: false,
         };
     }
 
-    componentWillMount(): void {
+    async componentWillMount(): void {
         MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
 
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
@@ -63,6 +64,8 @@ export default class SecurityRoomSettingsTab extends React.Component {
         );
         const encrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.roomId);
         this.setState({joinRule, guestAccess, history, encrypted});
+        const hasAliases = await this._hasAliases();
+        this.setState({hasAliases});
     }
 
     _pullContentPropertyFromEvent(event, key, defaultValue) {
@@ -201,13 +204,25 @@ export default class SecurityRoomSettingsTab extends React.Component {
         MatrixClientPeg.get().getRoom(this.props.roomId).setBlacklistUnverifiedDevices(checked);
     };
 
+    async _hasAliases() {
+        const cli = MatrixClientPeg.get();
+        if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
+            const response = await cli.unstableGetLocalAliases(this.props.roomId);
+            const localAliases = response.aliases;
+            return Array.isArray(localAliases) && localAliases.length !== 0;
+        } else {
+            const room = cli.getRoom(this.props.roomId);
+            const aliasEvents = room.currentState.getStateEvents("m.room.aliases") || [];
+            const hasAliases = !!aliasEvents.find((ev) => (ev.getContent().aliases || []).length > 0);
+            return hasAliases;
+        }
+    }
+
     _renderRoomAccess() {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
         const joinRule = this.state.joinRule;
         const guestAccess = this.state.guestAccess;
-        const aliasEvents = room.currentState.getStateEvents("m.room.aliases") || [];
-        const hasAliases = !!aliasEvents.find((ev) => (ev.getContent().aliases || []).length > 0);
 
         const canChangeAccess = room.currentState.mayClientSendStateEvent("m.room.join_rules", client)
             && room.currentState.mayClientSendStateEvent("m.room.guest_access", client);
@@ -226,7 +241,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
         }
 
         let aliasWarning = null;
-        if (joinRule === 'public' && !hasAliases) {
+        if (joinRule === 'public' && !this.state.hasAliases) {
             aliasWarning = (
                 <div className='mx_SecurityRoomSettingsTab_warning'>
                     <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />

From 4da5f3276478872404796a3e127983f2d4077f69 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 12:44:46 +0000
Subject: [PATCH 1130/3235] get rid of lockOrigin backwards compatibility

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/usercontent/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 0648cbb238..b87ccb9dbb 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -42,7 +42,7 @@ function remoteSetTint(event) {
 }
 
 window.onmessage = function(e) {
-    if (lockOrigin === undefined || e.origin === lockOrigin) {
+    if (e.origin === lockOrigin) {
         if (e.data.blob) remoteRender(e);
         else remoteSetTint(e);
     }

From 59f8b4f6b1095c49c2eee25c493ba2c607ea7e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 14:13:08 +0100
Subject: [PATCH 1131/3235] EventIndex: Don't index key verification events.

Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
---
 src/indexing/EventIndex.js | 48 +++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 5769080511..475509c2bc 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -240,6 +240,36 @@ export default class EventIndex extends EventEmitter {
         this.crawlerCheckpoints.push(backwardsCheckpoint);
     }
 
+    /**
+     * Check if an event should be added to the event index.
+     *
+     * Most notably we filter events for which decryption failed, are redacted
+     * or aren't of a type that we know how to index.
+     *
+     * @param {MatrixEvent} ev The event that should checked.
+     */
+    isValidEvent(ev) {
+        const validEventType = ([
+            "m.room.message",
+            "m.room.name",
+            "m.room.topic",
+            ].indexOf(ev.getType()) >= 0
+                && !ev.isRedacted() && !ev.isDecryptionFailure()
+        );
+
+        let validMsgType = true;
+
+        if (ev.getType() === "m.room.message" && !ev.isRedacted()) {
+            // Expand this if there are more invalid msgtypes.
+            const msgtype = ev.getContent().msgtype;
+
+            if (!msgtype) validMsgType = false;
+            else validMsgType = !msgtype.startsWith("m.key.verification");
+        }
+
+        return validEventType && validMsgType;
+    }
+
     /**
      * Queue up live events to be added to the event index.
      *
@@ -248,10 +278,7 @@ export default class EventIndex extends EventEmitter {
     async addLiveEventToIndex(ev) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        if (["m.room.message", "m.room.name", "m.room.topic"]
-            .indexOf(ev.getType()) == -1) {
-            return;
-        }
+        if (!this.isValidEvent(ev)) return;
 
         const jsonEvent = ev.toJSON();
         const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
@@ -407,22 +434,11 @@ export default class EventIndex extends EventEmitter {
             // Let us wait for all the events to get decrypted.
             await Promise.all(decryptionPromises);
 
-            // We filter out events for which decryption failed, are redacted
-            // or aren't of a type that we know how to index.
-            const isValidEvent = (value) => {
-                return ([
-                        "m.room.message",
-                        "m.room.name",
-                        "m.room.topic",
-                    ].indexOf(value.getType()) >= 0
-                        && !value.isRedacted() && !value.isDecryptionFailure()
-                );
-            };
 
             // TODO if there are no events at this point we're missing a lot
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
-            const filteredEvents = matrixEvents.filter(isValidEvent);
+            const filteredEvents = matrixEvents.filter(this.isValidEvent);
 
             // Let us convert the events back into a format that EventIndex can
             // consume.

From 156c6b8db8be9025389cb68bd47cde2feea5b933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 14:45:03 +0100
Subject: [PATCH 1132/3235] EventIndex: Document the return value of the
 isValidEvent method.

---
 src/indexing/EventIndex.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 475509c2bc..1d85d83f07 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -247,6 +247,8 @@ export default class EventIndex extends EventEmitter {
      * or aren't of a type that we know how to index.
      *
      * @param {MatrixEvent} ev The event that should checked.
+     * @returns {bool} Returns true if the event can be indexed, false
+     * otherwise.
      */
     isValidEvent(ev) {
         const validEventType = ([

From 7f71e551da203a7412df01bd167dd89e57a4e840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 19 Feb 2020 14:36:21 +0100
Subject: [PATCH 1133/3235] EventIndex: Split out the statements that check for
 a valid event type.

---
 src/indexing/EventIndex.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 1d85d83f07..c8a9a4c1fa 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -251,13 +251,8 @@ export default class EventIndex extends EventEmitter {
      * otherwise.
      */
     isValidEvent(ev) {
-        const validEventType = ([
-            "m.room.message",
-            "m.room.name",
-            "m.room.topic",
-            ].indexOf(ev.getType()) >= 0
-                && !ev.isRedacted() && !ev.isDecryptionFailure()
-        );
+        const isUsefulType = ["m.room.message", "m.room.name", "m.room.topic"].includes(ev.getType());
+        const validEventType = isUsefulType && !ev.isRedacted() && !ev.isDecryptionFailure();
 
         let validMsgType = true;
 

From a5b9682572880379fb196b69b2f4f55ed52a0713 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 19 Feb 2020 15:15:05 +0100
Subject: [PATCH 1134/3235] show spinner while loading local aliases

---
 .../views/room_settings/AliasSettings.js      | 91 +++++++++++--------
 1 file changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index d7befa488d..a52fa09c87 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -91,6 +91,7 @@ export default class AliasSettings extends React.Component {
             remoteDomains: [], // [ domain.com, foobar.com ]
             canonicalAlias: null, // #canonical:domain.com
             updatingCanonicalAlias: false,
+            localAliasesLoading: true,
         };
 
         if (props.canonicalAliasEvent) {
@@ -102,28 +103,32 @@ export default class AliasSettings extends React.Component {
 
     async componentWillMount() {
         const cli = MatrixClientPeg.get();
-        if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
-            const response = await cli.unstableGetLocalAliases(this.props.roomId);
-            const localAliases = response.aliases;
-            const localDomain = cli.getDomain();
-            const domainToAliases = Object.assign(
-                {},
-                // FIXME, any localhost alt_aliases will be ignored as they are overwritten by localAliases
-                this.aliasesToDictionary(this._getAltAliases()),
-                {[localDomain]: localAliases || []},
-            );
-            const remoteDomains = Object.keys(domainToAliases).filter((domain) => {
-                return domain !== localDomain && domainToAliases[domain].length > 0;
-            });
-            this.setState({ domainToAliases, remoteDomains });
-        } else {
-            const state = {};
-            const localDomain = cli.getDomain();
-            state.domainToAliases = this.aliasEventsToDictionary(this.props.aliasEvents || []);
-            state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
-                return domain !== localDomain && state.domainToAliases[domain].length > 0;
-            });
-            this.setState(state);
+        try {
+            if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
+                const response = await cli.unstableGetLocalAliases(this.props.roomId);
+                const localAliases = response.aliases;
+                const localDomain = cli.getDomain();
+                const domainToAliases = Object.assign(
+                    {},
+                    // FIXME, any localhost alt_aliases will be ignored as they are overwritten by localAliases
+                    this.aliasesToDictionary(this._getAltAliases()),
+                    {[localDomain]: localAliases || []},
+                );
+                const remoteDomains = Object.keys(domainToAliases).filter((domain) => {
+                    return domain !== localDomain && domainToAliases[domain].length > 0;
+                });
+                this.setState({ domainToAliases, remoteDomains });
+            } else {
+                const state = {};
+                const localDomain = cli.getDomain();
+                state.domainToAliases = this.aliasEventsToDictionary(this.props.aliasEvents || []);
+                state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
+                    return domain !== localDomain && state.domainToAliases[domain].length > 0;
+                });
+                this.setState(state);
+            }
+        } finally {
+            this.setState({localAliasesLoading: false});
         }
     }
 
@@ -302,26 +307,34 @@ export default class AliasSettings extends React.Component {
             );
         }
 
+        let localAliasesList;
+        if (this.state.localAliasesLoading) {
+            const Spinner = sdk.getComponent("elements.Spinner");
+            localAliasesList = <Spinner />;
+        } else {
+            localAliasesList = <EditableAliasesList
+                id="roomAliases"
+                className={"mx_RoomSettings_localAliases"}
+                items={this.state.domainToAliases[localDomain] || []}
+                newItem={this.state.newAlias}
+                onNewItemChanged={this.onNewAliasChanged}
+                canRemove={this.props.canSetAliases}
+                canEdit={this.props.canSetAliases}
+                onItemAdded={this.onLocalAliasAdded}
+                onItemRemoved={this.onLocalAliasDeleted}
+                itemsLabel={_t('Local addresses for this room:')}
+                noItemsLabel={_t('This room has no local addresses')}
+                placeholder={_t(
+                    'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
+                )}
+                domain={localDomain}
+            />;
+        }
+
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
-                <EditableAliasesList
-                    id="roomAliases"
-                    className={"mx_RoomSettings_localAliases"}
-                    items={this.state.domainToAliases[localDomain] || []}
-                    newItem={this.state.newAlias}
-                    onNewItemChanged={this.onNewAliasChanged}
-                    canRemove={this.props.canSetAliases}
-                    canEdit={this.props.canSetAliases}
-                    onItemAdded={this.onLocalAliasAdded}
-                    onItemRemoved={this.onLocalAliasDeleted}
-                    itemsLabel={_t('Local addresses for this room:')}
-                    noItemsLabel={_t('This room has no local addresses')}
-                    placeholder={_t(
-                        'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
-                    )}
-                    domain={localDomain}
-                />
+                {localAliasesList}
                 {remoteAliasesSection}
             </div>
         );

From 46fcb7d348f41a355ad6979cdc55c6067dfe3031 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Wed, 19 Feb 2020 14:10:00 +0000
Subject: [PATCH 1135/3235] Translated using Weblate (German)

Currently translated at 72.6% (1544 of 2126 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 | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 304c166e22..d37ac290ef 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1250,7 +1250,7 @@
     "I don't want my encrypted messages": "Ich möchte meine verschlüsselten Nachrichten nicht",
     "You'll lose access to your encrypted messages": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Wenn du Fehler bemerkst oder eine Rückmeldung geben möchtest, teile dies uns auf GitHub mit.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Um doppelte Issues zu vermeiden, <existingIssuesLink>schau dir zuerst die existierenden Issues an</existingIssuesLink> (und füge hinzu oder <newIssueLink>erstelle ein neues Issue</newIssueLink>, wenn du keins finden kannst.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Um doppelte Issues zu vermeiden, <existingIssuesLink>schauen Sie bitte zuerst die existierenden Issues an</existingIssuesLink> (und fügen Sie ein \"+1\" hinzu), oder <newIssueLink>erstellen Sie ein neues Issue</newIssueLink>, wenn Sie keines finden können.",
     "Report bugs & give feedback": "Melde Fehler & gebe Rückmeldungen",
     "Recovery Key Mismatch": "Wiederherstellungsschlüssel passt nicht",
     "Update status": "Aktualisiere Status",
@@ -1560,5 +1560,35 @@
     "Unknown (user, session) pair:": "Unbekanntes (Nutzer-, Sitzungs-) Paar:",
     "Session already verified!": "Sitzung bereits verifiziert!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ACHTUNG: Sitzung bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem beritgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass Ihre Kommunikation abgehört wird!"
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem beritgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass Ihre Kommunikation abgehört wird!",
+    "Never send encrypted messages to unverified sessions from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen in diesem Raum",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Durch die Änderung des Passworts werden derzeit alle End-zu-End-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, Sie exportieren zuerst Ihre Raumschlüssel und importieren sie anschließend wieder. In Zukunft wird dies verbessert werden.",
+    "Delete %(count)s sessions|other": "Lösche %(count)s Sitzungen",
+    "Backup is not signed by any of your sessions": "Die Sicherung ist von keiner Ihrer Sitzungen unterzeichnet.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ihr Passwort wurde erfolgreich geändert. Sie erhalten keine Push-Benachrichtigungen zu anderen Sitzungen, bis Sie sich wieder bei diesen anmelden",
+    "Sessions": "Sitzungen",
+    "Notification sound": "Benachrichtigungston",
+    "Set a new custom sound": "Setze einen neuen benutzerdefinierten Sound",
+    "Browse": "Durchsuche",
+    "Direct Messages": "Direkte Nachrichten",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Sie können <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Wollten Sie dies als Nachricht senden?",
+    "Direct message": "Direkte Nachricht",
+    "Set a room alias to easily share your room with other people.": "Setze ein Raum-Alias, um deinen Raum einfach mit anderen Personen zu teilen.",
+    "Suggestions": "Vorschläge",
+    "Recently Direct Messaged": "Kürzlich direkt verschickt",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Wenn Sie niemanden finden können, fragen Sie nach deren Benutzernamen, teilen Sie ihren Benutzernamen (%(userId)s) oder <a>Profil-Link</a>.",
+    "Go": "Los",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Wenn Sie niemanden finden können, fragen Sie nach deren Benutzernamen (z.B. @benutzer:server.de) oder <a>teilen Sie diesen Raum</a>.",
+    "Command Help": "Befehl Hilfe",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>senden Sie uns bitte Logs</a>.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen Ihnen, den Verifizierungsprozess für jede Sitzung zu durchlaufen, um zu bestätigen, dass sie ihrem rechtmäßigen Eigentümer gehören, aber Sie können die Nachricht auch ohne Verifizierung erneut senden, wenn Sie dies bevorzugen.",
+    "Notification settings": "Benachrichtigungseinstellungen",
+    "Help": "Hilfe",
+    "Filter": "Filter",
+    "Filter rooms…": "Räume filtern…",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Sie haben %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
+    "Go Back": "Gehe zurück",
+    "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen."
 }

From ca680e56fc94d9b07271dbab07bbacafe9184e9e Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Wed, 19 Feb 2020 14:34:33 +0000
Subject: [PATCH 1136/3235] Translated using Weblate (German)

Currently translated at 72.6% (1544 of 2126 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d37ac290ef..4adb614dab 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1590,5 +1590,6 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sie haben %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
     "Go Back": "Gehe zurück",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
-    "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen."
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
+    "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert."
 }

From d70a9bd001c9ec85074bc9bb2f3b741148dea7a6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 14:39:36 +0000
Subject: [PATCH 1137/3235] small tweaks, still not working reliably

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/Settings.js                               |  2 +-
 src/settings/controllers/RoomListOrderingController.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 87c1526eaa..2b7dc70623 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -437,7 +437,7 @@ export const SETTINGS = {
     "RoomList.orderingAlgorithm": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Order rooms by message activity instead of by name"),
-        default: "recent", // XXX controller maps boolean onto algorithm for future flexibility
+        default: "recent", // controller maps boolean onto algorithm for future flexibility to >2 algorithms
         controller: new RoomListOrderingController(),
     },
     "RoomList.orderByImportance": {
diff --git a/src/settings/controllers/RoomListOrderingController.js b/src/settings/controllers/RoomListOrderingController.js
index 449e21545a..7c55e607fc 100644
--- a/src/settings/controllers/RoomListOrderingController.js
+++ b/src/settings/controllers/RoomListOrderingController.js
@@ -22,4 +22,14 @@ export default class RoomListOrderingController extends SettingController {
         // where we may want >2 algorithms available for the user to choose between.
         return newValue ? "recent" : "alphabetic";
     }
+
+    getValueOverride(level: string, roomId: String, calculatedValue: *, calculatedAtLevel: string): * {
+        switch (calculatedValue) {
+            case "alphabetic":
+                return false;
+            case "recent":
+            default:
+                return true;
+        }
+    }
 }

From a6edc34e9758295832baa49b03776aa0699b8d27 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 14:52:00 +0000
Subject: [PATCH 1138/3235] Iterate things

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../tabs/user/PreferencesUserSettingsTab.js   |  2 +-
 src/settings/Settings.js                      |  6 +-
 src/settings/SettingsStore.js                 |  6 +-
 .../controllers/RoomListOrderingController.js | 35 --------
 src/stores/RoomListStore.js                   | 84 +++++++------------
 5 files changed, 35 insertions(+), 98 deletions(-)
 delete mode 100644 src/settings/controllers/RoomListOrderingController.js

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index b7fb895a9a..09b9151ddc 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -48,7 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
     ];
 
     static ROOM_LIST_SETTINGS = [
-        'RoomList.orderingAlgorithm', // this has a controller which maps the boolean inputs to algorithms
+        'RoomList.orderByRecents',
         'RoomList.orderByImportance',
         'breadcrumbs',
     ];
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 2b7dc70623..b35301f124 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -26,7 +26,6 @@ import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
-import RoomListOrderingController from "./controllers/RoomListOrderingController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -434,11 +433,10 @@ export const SETTINGS = {
             deny: [],
         },
     },
-    "RoomList.orderingAlgorithm": {
+    "RoomList.orderByRecents": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Order rooms by message activity instead of by name"),
-        default: "recent", // controller maps boolean onto algorithm for future flexibility to >2 algorithms
-        controller: new RoomListOrderingController(),
+        default: true,
     },
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 897c2521cc..0122916bc3 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -420,13 +420,9 @@ export default class SettingsStore {
             throw new Error("User cannot set " + settingName + " at " + level + " in " + roomId);
         }
 
-        const controller = setting.controller;
-        if (controller) {
-            value = controller.augmentValue(level, roomId, value);
-        }
-
         await handler.setValue(settingName, roomId, value);
 
+        const controller = setting.controller;
         if (controller) {
             controller.onChange(level, roomId, value);
         }
diff --git a/src/settings/controllers/RoomListOrderingController.js b/src/settings/controllers/RoomListOrderingController.js
deleted file mode 100644
index 7c55e607fc..0000000000
--- a/src/settings/controllers/RoomListOrderingController.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 SettingController from "./SettingController";
-
-export default class RoomListOrderingController extends SettingController {
-    augmentValue(level, roomId, newValue): * {
-        // currently we expose algorithm as a boolean but store it as a string for future flexibility
-        // where we may want >2 algorithms available for the user to choose between.
-        return newValue ? "recent" : "alphabetic";
-    }
-
-    getValueOverride(level: string, roomId: String, calculatedValue: *, calculatedAtLevel: string): * {
-        switch (calculatedValue) {
-            case "alphabetic":
-                return false;
-            case "recent":
-            default:
-                return true;
-        }
-    }
-}
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index e99214dea1..3c6171f272 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -56,6 +56,8 @@ export const ALGO_RECENT = "recent";
 
 const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
 const getListAlgorithm = (listKey, settingAlgorithm) => {
+    // apply manual sorting only to m.favourite, otherwise respect the global setting
+    // all the known tags are listed explicitly here to simplify future changes
     switch (listKey) {
         case "m.favourite":
             return ALGO_MANUAL;
@@ -64,9 +66,8 @@ const getListAlgorithm = (listKey, settingAlgorithm) => {
         case "im.vector.fake.direct":
         case "im.vector.fake.archived":
         case "m.lowpriority":
-            return settingAlgorithm;
         default:
-            return ALGO_MANUAL; // TODO verify this is desired
+            return settingAlgorithm;
     }
 };
 
@@ -129,7 +130,7 @@ class RoomListStore extends Store {
         };
 
         SettingsStore.monitorSetting('RoomList.orderByImportance', null);
-        SettingsStore.monitorSetting('RoomList.orderingAlgorithm', null);
+        SettingsStore.monitorSetting('RoomList.orderByRecents', null);
         SettingsStore.monitorSetting('feature_custom_tags', null);
     }
 
@@ -156,8 +157,9 @@ class RoomListStore extends Store {
                 if (!logicallyReady) break;
 
                 switch (payload.settingName) {
-                    case "RoomList.orderingAlgorithm":
-                        this.updateSortingAlgorithm(payload.newValue, this._state.orderImportantFirst);
+                    case "RoomList.orderByRecents":
+                        this.updateSortingAlgorithm(payload.newValue ? ALGO_RECENT : ALGO_ALPHABETIC,
+                            this._state.orderImportantFirst);
                         break;
                     case "RoomList.orderByImportance":
                         this.updateSortingAlgorithm(this._state.algorithm, payload.newValue);
@@ -183,9 +185,9 @@ class RoomListStore extends Store {
 
                 this._matrixClient = payload.matrixClient;
 
-                const algorithm = SettingsStore.getValue("RoomList.orderingAlgorithm");
+                const orderByRecents = SettingsStore.getValue("RoomList.orderByRecents");
                 const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
-                this.updateSortingAlgorithm(algorithm, orderByImportance);
+                this.updateSortingAlgorithm(orderByRecents ? ALGO_RECENT : ALGO_ALPHABETIC, orderByImportance);
             }
             break;
             case 'MatrixActions.Room.receipt': {
@@ -446,11 +448,9 @@ class RoomListStore extends Store {
                     if (changedBoundary) {
                         // If we changed a boundary, then we've gone too far - go to the top of the last
                         // section instead.
-                        console.log("DEBUG changedBoundary", room.name, room, category);
                         newList.splice(desiredCategoryBoundaryIndex, 0, {room, category});
                     } else {
                         // If we're ordering by timestamp, just insert normally
-                        console.log("DEBUG 11push", room.name, room, category);
                         newList.push({room, category});
                     }
                     pushedEntry = true;
@@ -502,19 +502,16 @@ class RoomListStore extends Store {
 
             // Speed optimization: Don't do complicated math if we don't have to.
             if (!shouldHaveRoom) {
-                console.log("DEBUG A");
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL) {
+            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL || !this._state.orderImportantFirst) {
                 // Manually ordered tags are sorted later, so for now we'll just clone the tag
                 // and add our room if needed
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-                console.log("DEBUG push", room.name, room, category);
                 listsClone[key].push({room, category});
                 insertedIntoTags.push(key);
             } else {
                 listsClone[key] = [];
 
-                console.log("DEBUG slot");
                 const pushedEntry = this._slotRoomIntoList(
                     room, category, key, this._state.lists[key], listsClone[key], lastTimestamp);
 
@@ -561,23 +558,16 @@ class RoomListStore extends Store {
                     console.warn(`!! List for tag ${targetTag} does not exist - creating`);
                     listsClone[targetTag] = [];
                 }
-                console.log("DEBUG123", room.name, room, category);
                 listsClone[targetTag].splice(0, 0, {room, category});
             }
         }
 
-        console.log("DEBUG targetTags", targetTags);
-
         // Sort the favourites before we set the clone
         for (const tag of Object.keys(listsClone)) {
             if (getListAlgorithm(tag, this._state.algorithm) !== ALGO_MANUAL) continue; // skip recents (pre-sorted)
-            console.log("DEBUG applying manual sort to", tag);
             listsClone[tag].sort(this._getManualComparator(tag));
         }
 
-        console.log("DEBUG setting lists=listsClone",
-            this._state.lists["im.vector.fake.recent"].map(e => e.room.name),
-            listsClone["im.vector.fake.recent"].map(e => e.room.name));
         this._setState({lists: listsClone});
     }
 
@@ -660,27 +650,36 @@ class RoomListStore extends Store {
 
         Object.keys(lists).forEach((listKey) => {
             let comparator;
-            console.log("DEBUG sorting", listKey, "using", getListAlgorithm(listKey, this._state.algorithm));
             switch (getListAlgorithm(listKey, this._state.algorithm)) {
                 case ALGO_RECENT:
-                    comparator = (entryA, entryB) => {
-                        return this._recentsComparator(entryA, entryB, tsOfNewestEventFn);
-                    };
+                    comparator = (entryA, entryB) => this._recentsComparator(entryA, entryB, tsOfNewestEventFn);
                     break;
                 case ALGO_ALPHABETIC:
-                    comparator = (entryA, entryB) => this._alphabeticComparator(entryA, entryB);
+                    comparator = this._lexicographicalComparator;
                     break;
                 case ALGO_MANUAL:
                 default:
                     comparator = this._getManualComparator(listKey);
                     break;
             }
-            console.log("DEBUG before", listKey, lists[listKey].map(e => e.room.name));
-            lists[listKey].sort(comparator); // TODO inline the common CATEGORY comparator here?
-            console.log("DEBUG after", listKey, lists[listKey].map(e => e.room.name));
+
+            if (this._state.orderImportantFirst) {
+                lists[listKey].sort((entryA, entryB) => {
+                    if (entryA.category !== entryB.category) {
+                        const idxA = CATEGORY_ORDER.indexOf(entryA.category);
+                        const idxB = CATEGORY_ORDER.indexOf(entryB.category);
+                        if (idxA > idxB) return 1;
+                        if (idxA < idxB) return -1;
+                        return 0; // Technically not possible
+                    }
+                    return comparator(entryA, entryB);
+                });
+            } else {
+                // skip the category comparison even though it should no-op when orderImportantFirst disabled
+                lists[listKey].sort(comparator);
+            }
         });
 
-        console.log("DEBUG setting lists after comparator");
         this._setState({
             lists,
             ready: true, // Ready to receive updates to ordering
@@ -739,34 +738,13 @@ class RoomListStore extends Store {
 
     _recentsComparator(entryA, entryB, tsOfNewestEventFn) {
         console.trace("DEBUG recents");
-        if (entryA.category !== entryB.category) {
-            const idxA = CATEGORY_ORDER.indexOf(entryA.category);
-            const idxB = CATEGORY_ORDER.indexOf(entryB.category);
-            if (idxA > idxB) return 1;
-            if (idxA < idxB) return -1;
-            return 0; // Technically not possible
-        }
-
         const timestampA = tsOfNewestEventFn(entryA.room);
         const timestampB = tsOfNewestEventFn(entryB.room);
         return timestampB - timestampA;
     }
 
-    _alphabeticComparator(entryA, entryB) {
-        if (entryA.category !== entryB.category) {
-            const idxA = CATEGORY_ORDER.indexOf(entryA.category);
-            const idxB = CATEGORY_ORDER.indexOf(entryB.category);
-            if (idxA > idxB) return 1;
-            if (idxA < idxB) return -1;
-            return 0; // Technically not possible
-        }
-
-        // console.log("DEBUG alphabetic, same category", JSON.stringify(entryA.room.name), JSON.stringify(entryB.room.name), this._lexicographicalComparator(entryA.room, entryB.room));
-        return this._lexicographicalComparator(entryA.room, entryB.room);
-    }
-
-    _lexicographicalComparator(roomA, roomB) {
-        return roomA.name.localeCompare(roomB.name);
+    _lexicographicalComparator(entryA, entryB) {
+        return entryA.room.name.localeCompare(entryB.room.name);
     }
 
     _getManualComparator(tagName, optimisticRequest) {
@@ -791,7 +769,7 @@ class RoomListStore extends Store {
                 return -1;
             }
 
-            return a === b ? this._lexicographicalComparator(roomA, roomB) : (a > b ? 1 : -1);
+            return a === b ? this._lexicographicalComparator(entryA, entryB) : (a > b ? 1 : -1);
         };
     }
 

From d1503d8a65c0a985863c26c8daefa3e192c0c05c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 14:55:49 +0000
Subject: [PATCH 1139/3235] fix edge case

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/RoomListStore.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 3c6171f272..02dd04bda9 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -474,6 +474,12 @@ class RoomListStore extends Store {
     _setRoomCategory(room, category) {
         if (!room) return; // This should only happen in tests
 
+        if (!this._state.orderImportantFirst) {
+            // XXX bail here early to avoid https://github.com/vector-im/riot-web/issues/9216
+            // this may mean that category updates are missed whilst not ordering by importance first
+            return;
+        }
+
         const listsClone = {};
 
         // Micro optimization: Support lazily loading the last timestamp in a room

From 5a31b308cd3b017984d45e558415643b37c23a35 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 15:09:05 +0000
Subject: [PATCH 1140/3235] remove unused clause

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 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 02dd04bda9..5f2ed0f1b7 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -509,7 +509,7 @@ class RoomListStore extends Store {
             // Speed optimization: Don't do complicated math if we don't have to.
             if (!shouldHaveRoom) {
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL || !this._state.orderImportantFirst) {
+            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL) {
                 // Manually ordered tags are sorted later, so for now we'll just clone the tag
                 // and add our room if needed
                 listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);

From a687d158e881186db04ffef39f034dd94479759e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 19 Feb 2020 15:59:37 +0000
Subject: [PATCH 1141/3235] Released js-sdk

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 793692d8b4..5aa4163b51 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "5.0.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 1ed39459d0..6924d7dcc0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,10 +5760,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.0.tgz#dcbab35f1afdb35ef0364eb232e78e0fb7dc2a5b"
-  integrity sha512-A/aeE2Zn2OHq1n/9wIHCszrQZ7oXfThUHWi5Kz7illVCPUJ3JrZ31XVvx02k6vBasDcUtjAfZblHdTVN62cWLw==
+matrix-js-sdk@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.1.tgz#ffbbc89d2436f9eb378cd81bd3993f59ec8fb895"
+  integrity sha512-1Jl18tYDGQNo+PWC2mBdYd6WNrL20jhG9+FF1p2w6paS7IBC74QDCEKP3GLXr3SSmWdNuAYTFB94vZQRJ31HzA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From faf8a5c2db57149a73bb448f98bdf26b310fa7a2 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 19 Feb 2020 16:03:57 +0000
Subject: [PATCH 1142/3235] Prepare changelog for v2.1.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4e0b41883..fa02dc1ae3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+Changes in [2.1.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.1) (2020-02-19)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0...v2.1.1)
+
+ * show spinner while loading local aliases
+   [\#4090](https://github.com/matrix-org/matrix-react-sdk/pull/4090)
+ * Don't index key verification events.
+   [\#4083](https://github.com/matrix-org/matrix-react-sdk/pull/4083)
+ * Get rid of dependence on usercontent.riot.im
+   [\#4046](https://github.com/matrix-org/matrix-react-sdk/pull/4046)
+ * also detect aliases using new /aliases endpoint for room access settings
+   [\#4089](https://github.com/matrix-org/matrix-react-sdk/pull/4089)
+ * get local aliases from /aliases in room settings
+   [\#4086](https://github.com/matrix-org/matrix-react-sdk/pull/4086)
+ * Start verification sessions in an E2E DM where possible
+   [\#4080](https://github.com/matrix-org/matrix-react-sdk/pull/4080)
+ * Only show supported verification methods
+   [\#4077](https://github.com/matrix-org/matrix-react-sdk/pull/4077)
+ * Use local echo in VerificationRequest for accepting/declining a verification
+   request
+   [\#4072](https://github.com/matrix-org/matrix-react-sdk/pull/4072)
+ * Report installed PWA, touch input status in rageshakes, analytics
+   [\#4078](https://github.com/matrix-org/matrix-react-sdk/pull/4078)
+ * refactor event grouping into separate helper classes
+   [\#4059](https://github.com/matrix-org/matrix-react-sdk/pull/4059)
+ * Find existing requests when starting a new verification request
+   [\#4070](https://github.com/matrix-org/matrix-react-sdk/pull/4070)
+ * Always speak the full text of the typing indicator when it updates.
+   [\#4074](https://github.com/matrix-org/matrix-react-sdk/pull/4074)
+ * Fix escaped markdown passing backslashes through
+   [\#4008](https://github.com/matrix-org/matrix-react-sdk/pull/4008)
+ * Move the sidebar to below the sidebar tab buttons for screen readers.
+   [\#4071](https://github.com/matrix-org/matrix-react-sdk/pull/4071)
+
 Changes in [2.1.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0) (2020-02-17)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.2...v2.1.0)

From 2d05205c9e5a8b2aa68fcfe3d44f601fd3a290cd Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 19 Feb 2020 16:03:58 +0000
Subject: [PATCH 1143/3235] v2.1.1

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

diff --git a/package.json b/package.json
index 5aa4163b51..a68dcfddb4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From df897b47348cace70db777d1bcb83ff39594ba6a Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <20200217translateriot@remi.im>
Date: Wed, 19 Feb 2020 15:29:30 +0000
Subject: [PATCH 1144/3235] Translated using Weblate (Dutch)

Currently translated at 86.6% (1841 of 2126 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 16903b36bf..f0fddfd9b4 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1824,5 +1824,38 @@
     "Subscribing to a ban list will cause you to join it!": "Wanneer u een abonnement neemt zal u worden toegevoegd!",
     "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
     "Room ID or alias of ban list": "Gespreks-ID of (bij)naam of banlijst",
-    "Subscribe": "Abonneer"
+    "Subscribe": "Abonneer",
+    "Enable desktop notifications for this session": "Schakel desktopmeldingen in voor deze sessie",
+    "Enable audible notifications for this session": "Schakel meldingen met geluid in voor deze sessie",
+    "You should:": "U zou:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "uw browser extensies bekijken voor extensies die mogelijk de identiteitsserver blokkeren (zoals Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "contact opnemen met de beheerders van de identiteitsserver <idserver />",
+    "wait and try again later": "wachten en het later weer proberen",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder <b>(%(serverName)s)</b> om robots, widgets en stickerpakketten te beheren.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder om robots, widgets en stickerpakketten te beheren.",
+    "Manage integrations": "Beheer integraties",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, uitnodigingen voor de kamer versturen en machtsniveau's namens u aanpassen.",
+    "Ban list rules - %(roomName)s": "Banlijst regels - %(roomName)s",
+    "Server rules": "Server regels",
+    "User rules": "Gebruiker regels",
+    "Show tray icon and minimize window to it on close": "Geef een icoon in de systeembalk weer en minimaliseer het venster wanneer het wordt gesloten",
+    "Session ID:": "Sessie-ID:",
+    "Session key:": "Sessiesleutel:",
+    "Message search": "Berichten zoeken",
+    "Sessions": "Sessies",
+    "A session's public name is visible to people you communicate with": "Een sessie's publieke naam is zichtbaar voor de mensen waarmee u communiceert",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugt naar de volgende platformen. <a>Lees meer</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugt naar andere platformen. <a>Lees meer.</a>",
+    "Bridges": "Overbruggingen",
+    "This user has not verified all of their sessions.": "Deze gebruiker heeft niet al haar sessies geverifieerd.",
+    "You have not verified this user.": "U heeft deze gebruiker niet geverifieerd.",
+    "You have verified this user. This user has verified all of their sessions.": "U heeft deze gebruiker geverifieerd. Deze gebruiker heeft al haar sessies geverifieerd.",
+    "Someone is using an unknown session": "Iemand gebruikt een onbekende sessie",
+    "This room is end-to-end encrypted": "Dit gesprek is van eind-tot-eind versleuteld",
+    "Everyone in this room is verified": "Iedereen in dit gesprek is geverifieerd",
+    "Some sessions for this user are not trusted": "Sommige sessies van deze gebruiker zijn niet vertrouwd",
+    "All sessions for this user are trusted": "Alle sessies van deze gebruiker zijn vertrouwd",
+    "Some sessions in this encrypted room are not trusted": "Sommige sessies in dit versleutelde gesprek zijn niet vertrouwd",
+    "All sessions in this encrypted room are trusted": "Alle sessies in dit versleutelde gesprek zijn vertrouwd",
+    "Mod": "Mod"
 }

From fa390213876b1bdc1583d9153f420383e719fdf6 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Wed, 19 Feb 2020 14:34:46 +0000
Subject: [PATCH 1145/3235] Translated using Weblate (German)

Currently translated at 75.6% (1608 of 2126 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 | 80 ++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4adb614dab..ec7ce416fb 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -869,7 +869,7 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Bitte hilf uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere <PolicyLink>Cookie-Richtlinie</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Bitte hilf uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen.",
     "Yes, I want to help!": "Ja, ich möchte helfen!",
-    "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>": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist irreversibel!</b>",
+    "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>": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar.</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.": "Standardmäßig werden <b>die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht</b>. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.",
     "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.": "Sie Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.",
     "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)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer werden eine unvollständige Konversation sehen)",
@@ -892,7 +892,7 @@
     "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
     "Audio Output": "Ton-Ausgabe",
     "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 verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.",
-    "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.": "Wenn jemand eine Nachricht mit einem Link schickt, kann die Link-Vorschau mehr Informationen, wie Titel, Beschreibung und Bild der Webseite, über den Link anzeigen.",
+    "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.": "Wenn jemand eine URL in seine Nachricht einfügt, kann eine URL-Vorschau angezeigt werden, um mehr Informationen über diesen Link zu erhalten, wie z.B. den Titel, die Beschreibung und ein Bild von der Website.",
     "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
     "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.",
     "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.",
@@ -945,9 +945,9 @@
     "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s fügte %(addedAddresses)s hinzu und entfernte %(removedAddresses)s als Adressen von diesem Raum.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein <a>GitHub-Issue erstellen</a> um dein Problem zu beschreiben.",
-    "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 benutzt nun 3-5x weniger Arbeitsspeicher, indem Informationen über andere Nutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
+    "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 benutzt nun 3-5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
     "Updating Riot": "Aktualisiere Riot",
-    "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.",
+    "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 das verzögerte Laden von Mitgliedern genutzt. In dieser Version war das verzögerte Laden deaktiviert. Da die lokal zwischengespeicherten Daten zwischen diesen Einstellungen nicht kompatibel sind, 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",
@@ -960,7 +960,7 @@
     "Delete Backup": "Sicherung löschen",
     "Backup version: ": "Sicherungsversion: ",
     "Algorithm: ": "Algorithmus: ",
-    "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": "Um deinen Chatverlauf nicht zu verlieren, musst du deine Raum-Schlüssel exportieren, bevor du dich abmeldest. Du musst zurück zu einer neueren Riot-Version gehen, um dies zu tun",
+    "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": "Um zu vermeiden, dass Ihr Chat-Verlauf verloren geht, müssen Sie Ihre Raum-Schlüssel exportieren, bevor Sie sich abmelden. Dazu müssen Sie auf die neuere Version von Riot zurückgehen",
     "Incompatible Database": "Inkompatible Datenbanken",
     "Continue With Encryption Disabled": "Mit deaktivierter Verschlüsselung fortfahren",
     "Enter a passphrase...": "Passphrase eingeben...",
@@ -984,7 +984,7 @@
     "Backup Restored": "Sicherung wiederhergestellt",
     "Enter Recovery Passphrase": "Gebe Wiederherstellungs-Passphrase ein",
     "Enter Recovery Key": "Gebe Wiederherstellungsschlüssel ein",
-    "This looks like a valid recovery key!": "Dies sieht nach einem validen Wiederherstellungsschlüssel aus",
+    "This looks like a valid recovery key!": "Dies sieht wie ein gültiger Wiederherstellungsschlüssel aus!",
     "Not a valid recovery key": "Kein valider Wiederherstellungsschlüssel",
     "There was an error joining the room": "Es gab einen Fehler beim Raum-Beitreten",
     "Use a few words, avoid common phrases": "Benutze einige Worte, vermeide gängige Phrasen",
@@ -1026,7 +1026,7 @@
     "Unable to load key backup status": "Konnte Status des Schlüsselbackups nicht laden",
     "Don't ask again": "Nicht erneut fragen",
     "Set up": "Einrichten",
-    "Please review and accept all of the homeserver's policies": "Bitte sieh dir die Heimserver-Regularien an und akzeptiere sie",
+    "Please review and accept all of the homeserver's policies": "Bitte prüfen und akzeptieren Sie alle Richtlinien des Heimservers",
     "Failed to load group members": "Konnte Gruppenmitglieder nicht laden",
     "That doesn't look like a valid email address": "Sieht nicht nach einer validen E-Mail-Adresse aus",
     "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)s",
@@ -1034,10 +1034,10 @@
     "Unable to load backup status": "Konnte Backupstatus nicht laden",
     "Failed to decrypt %(failedCount)s sessions!": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",
     "Restored %(sessionCount)s session keys": "%(sessionCount)s Sitzungsschlüssel wiederhergestellt",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Greife auf deinen sicheren Chatverlauf zu und richte sicheres Schreiben ein indem du deine Wiederherstellungspassphrase eingibst.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Greifen Sie auf Ihre sichere Nachrichtenhistorie zu und richten Sie einen sicheren Nachrichtenversand ein, indem Sie Ihre Wiederherstellungspassphrase eingeben.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Wenn du deinen Wiederherstellungspassphrase vergessen hast, kannst du <button1>deinen Wiederherstellungsschlüssel benutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
     "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. ": "Du hast kürzlich eine neuere Version von Riot auf %(host)s verwendet. Um diese Version erneut mit Ende-zu-Ende-Verschlüsselung zu nutzen, musst du dich ab- und wieder anmelden. ",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Auf sichere Nachrichtenhistorie zugreifen und sicheren Nachrichtenversand einrichten indem du deinen Wiederherstellungsschlüssel eingibst.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Greifen Sie auf Ihren sicheren Nachrichtenverlauf zu und richten Sie durch Eingabe Ihres Wiederherstellungsschlüssels einen sicheren Nachrichtenversand ein.",
     "Set a new status...": "Setze einen neuen Status...",
     "Clear status": "Status löschen",
     "Invalid homeserver discovery response": "Ungültige Antwort beim Aufspüren des Heimservers",
@@ -1051,10 +1051,10 @@
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.",
     "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.",
     "New Recovery Method": "Neue Wiederherstellungsmethode",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein Angreifer versuchen Zugang zu deinem Konto zu erlangen. Ändere sofort dein Passwort und setze eine neue Wiederherstellungsmethode.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn Sie die neue Wiederherstellungsmethode nicht festgelegt haben, versucht ein Angreifer möglicherweise, auf Ihr Konto zuzugreifen. Ändern Sie Ihr Kontopasswort und legen Sie sofort eine neue Wiederherstellungsmethode in den Einstellungen fest.",
     "Set up Secure Messages": "Richte sichere Nachrichten ein",
     "Go to Settings": "Gehe zu Einstellungen",
-    "Sign in with single sign-on": "Mit Single Sign-On anmelden",
+    "Sign in with single sign-on": "Melden Sie sich mit Single Sign-On an",
     "Waiting for %(userId)s to confirm...": "Warte auf Bestätigung für  %(userId)s ...",
     "Unrecognised address": "Nicht erkannte Adresse",
     "User %(user_id)s may or may not exist": "Existenz der Benutzer %(user_id)s unsicher",
@@ -1246,7 +1246,7 @@
     "Manually export keys": "Manueller Schlüssel Export",
     "Composer": "Nachrichteneingabefeld",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Es ist nichts aufgetaucht? Noch nicht alle Clients unterstützen die interaktive Verifikation. <button>Nutze alte Verifikation</button>.",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifiziere diesen Benutzer und markiere ihn als \"vertraut\". Dies gibt dir bei Ende-zu-Ende-verschlüsselten Nachrichten extra Seelenfrieden.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Überprüfen Sie diesen Benutzer, um ihn als vertrauenswürdig zu kennzeichnen. Benutzern zu vertrauen gibt Ihnen zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende-verschlüsselten Nachrichten.",
     "I don't want my encrypted messages": "Ich möchte meine verschlüsselten Nachrichten nicht",
     "You'll lose access to your encrypted messages": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Wenn du Fehler bemerkst oder eine Rückmeldung geben möchtest, teile dies uns auf GitHub mit.",
@@ -1302,7 +1302,7 @@
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Gib die Adresse deines Modular-Heimservers an. Es kann deine eigene Domain oder eine Subdomain von <a>modular.im</a> sein.",
     "Unable to query for supported registration methods.": "Konnte unterstützte Registrierungsmethoden nicht abrufen.",
     "Bulk options": "Sammeloptionen",
-    "Join millions for free on the largest public server": "Tritt wie Millionen andere kostenlos dem größten öffentlichen Server bei",
+    "Join millions for free on the largest public server": "Schließen Sie sich auf dem größten öffentlichen Server kostenlos Millionen von Menschen an",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Fügt ¯\\_(ツ)_/¯ vor einer Klartextnachricht ein",
     "Changes your display nickname in the current room only": "Ändert den Anzeigenamen ausschließlich für den aktuellen Raum",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen der Gruppen %(groups)s für diesen Raum.",
@@ -1560,7 +1560,7 @@
     "Unknown (user, session) pair:": "Unbekanntes (Nutzer-, Sitzungs-) Paar:",
     "Session already verified!": "Sitzung bereits verifiziert!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ACHTUNG: Sitzung bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem beritgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass Ihre Kommunikation abgehört wird!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass Ihre Kommunikation abgehört wird!",
     "Never send encrypted messages to unverified sessions from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen",
     "Never send encrypted messages to unverified sessions in this room from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen in diesem Raum",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Durch die Änderung des Passworts werden derzeit alle End-zu-End-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, Sie exportieren zuerst Ihre Raumschlüssel und importieren sie anschließend wieder. In Zukunft wird dies verbessert werden.",
@@ -1591,5 +1591,55 @@
     "Go Back": "Gehe zurück",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
-    "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert."
+    "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.",
+    "You have verified this user. This user has verified all of their sessions.": "Sie haben diesen Benutzer verifiziert. Dieser Benutzer hat alle seine Sitzungen verifiziert.",
+    "Some sessions for this user are not trusted": "Einige Sitzungen für diesen Benutzer sind nicht vertrauenswürdig",
+    "All sessions for this user are trusted": "Alle Sitzungen für diesen Benutzer sind vertrauenswürdig",
+    "Some sessions in this encrypted room are not trusted": "Einige Sitzungen in diesem verschlüsselten Raum sind nicht vertrauenswürdig",
+    "All sessions in this encrypted room are trusted": "Alle Sitzungen in diesem verschlüsselten Raum sind vertrauenswürdig",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Ihre Anfrage zur Schlüssel-Teilung wurde gesendet - bitte überprüfen Sie Ihre anderen Sitzungen auf Anfragen zur Schlüssel-Teilung.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Anfragen zum Teilen von Schlüsseln werden automatisch an Ihre anderen Sitzungen gesendet. Wenn Sie die Anfragen zum Teilen von Schlüsseln in Ihren anderen Sitzungen abgelehnt oder abgewiesen haben, klicken Sie hier, um die Schlüssel für diese Sitzung erneut anzufordern.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn Ihre anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, können Sie sie nicht entschlüsseln.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Fordern Sie Verschlüsselungsschlüssel aus Ihren anderen Sitzungen erneut an</requestLink>.",
+    "No sessions with registered encryption keys": "Keine Sitzungen mit registrierten Verschlüsselungsschlüsseln",
+    "Room %(name)s": "Raum %(name)s",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ein Upgrade dieses Raums schaltet die aktuelle Instanz des Raums ab und erstellt einen aktualisierten Raum mit demselben Namen.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu überprüfen:",
+    "%(count)s verified sessions|other": "%(count)s verifizierte Sitzungen",
+    "Hide verified sessions": "Verifizierte Sitzungen ausblenden",
+    "%(count)s sessions|other": "%(count)s Sitzungen",
+    "Hide sessions": "Sitzungen ausblenden",
+    "Encryption enabled": "Verschlüsselung aktiviert",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahren Sie mehr & überprüfen Sie diesen Benutzer in seinem Benutzerprofil.",
+    "Encryption not enabled": "Verschlüsselung nicht aktiviert",
+    "You verified %(name)s": "Du hast %(name)s verifiziert",
+    "You cancelled verifying %(name)s": "Sie haben die Verifizierung von %(name)s abgebrochen",
+    "%(name)s cancelled verifying": "%(name)s hat die Verifizierung abgebrochen",
+    "%(name)s accepted": "%(name)s hat akzeptiert",
+    "%(name)s declined": "%(name)s hat abgelehnt",
+    "%(name)s cancelled": "%(name)s hat abgebrochen",
+    "%(name)s wants to verify": "%(name)s will eine Verifizierung",
+    "Your display name": "Ihr Anzeigename",
+    "Please enter a name for the room": "Bitte geben Sie einen Namen für den Raum ein",
+    "This room is private, and can only be joined by invitation.": "Dieser Raum ist privat und kann nur auf Einladung betreten werden.",
+    "Create a private room": "Erstelle einen privaten Raum",
+    "Topic (optional)": "Thema (optional)",
+    "Make this room public": "Machen Sie diesen Raum öffentlich",
+    "Hide advanced": "Fortgeschrittenes ausblenden",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Hindere Benutzer auf anderen Matrix-Homeservern daran, diesem Raum beizutreten (Diese Einstellung kann später nicht geändert werden!)",
+    "Session name": "Name der Sitzung",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "So können Sie nach der Abmeldung zu Ihrem Konto zurückkehren und sich bei anderen Sitzungen anmelden.",
+    "Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Sie blockieren derzeit nicht verifizierte Sitzungen; um Nachrichten an diese Sitzungen zu senden, müssen Sie sie verifizieren.",
+    "Room contains unknown sessions": "Raum enthält unbekannte Sitzungen",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" enthält Sitzungen, die Sie noch nie zuvor gesehen haben.",
+    "Unknown sessions": "Unbekannte Sitzungen",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Greifen Sie durch Eingabe Ihrer Passphrase auf Ihren sicheren Nachrichtenverlauf und Ihre Quersignatur-Identität zu, um andere Sitzungen zu überprüfen.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Greifen Sie durch Eingabe Ihres Wiederherstellungsschlüssels auf Ihren sicheren Nachrichtenverlauf und Ihre Quersignatur-Identität zur Überprüfung anderer Sitzungen zu.",
+    "Message not sent due to unknown sessions being present": "Nachricht wird nicht gesendet, da unbekannte Sitzungen vorhanden sind",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Sitzungen anzeigen</showSessionsText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn Sie Ihr Passwort ändern, werden alle End-to-End-Verschlüsselungsschlüssel für alle Ihre Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richten Sie ein Schlüssel-Backup ein oder exportieren Sie Ihre Raumschlüssel aus einer anderen Sitzung, bevor Sie Ihr Passwort zurücksetzen.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Sie wurden von allen Sitzungen abgemeldet und erhalten keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melden Sie sich auf jedem Gerät erneut an.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisieren Sie diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Richten Sie für diese Sitzung eine Verschlüsselung ein, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert."
 }

From f074e858634d3e459a9318ffa319506c256322aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 19 Feb 2020 16:35:05 +0000
Subject: [PATCH 1146/3235] tidy up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 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 5f2ed0f1b7..8467b0be58 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -55,6 +55,7 @@ export const ALGO_ALPHABETIC = "alphabetic";
 export const ALGO_RECENT = "recent";
 
 const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
+
 const getListAlgorithm = (listKey, settingAlgorithm) => {
     // apply manual sorting only to m.favourite, otherwise respect the global setting
     // all the known tags are listed explicitly here to simplify future changes
@@ -743,7 +744,6 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(entryA, entryB, tsOfNewestEventFn) {
-        console.trace("DEBUG recents");
         const timestampA = tsOfNewestEventFn(entryA.room);
         const timestampB = tsOfNewestEventFn(entryB.room);
         return timestampB - timestampA;

From 45963adeb41671a893829c1902b1d003716b8fc3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 19 Feb 2020 17:02:14 -0700
Subject: [PATCH 1147/3235] Use binary packing for verification QR codes

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

We do not remove the existing QR code library in this commit because it is still used elsewhere (like the share dialog).

This should be as accurate as possible to what [MSC1543](https://github.com/matrix-org/matrix-doc/pull/1544) asks for.
---
 package.json                                  |   1 +
 .../elements/crypto/VerificationQRCode.js     | 182 +++++++++++-------
 yarn.lock                                     |  55 +++++-
 3 files changed, 164 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index a68dcfddb4..32e78f835f 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
     "prop-types": "^15.5.8",
+    "qrcode": "^1.4.4",
     "qrcode-react": "^0.1.16",
     "qs": "^6.6.0",
     "react": "^16.9.0",
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 1c0fdcbf44..09408fe4dd 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -17,89 +17,87 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {replaceableComponent} from "../../../../utils/replaceableComponent";
-import * as qs from "qs";
-import QRCode from "qrcode-react";
 import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import {ToDeviceChannel} from "matrix-js-sdk/src/crypto/verification/request/ToDeviceChannel";
+import {decodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
+import Spinner from "../Spinner";
+import * as QRCode from "qrcode";
+
+const CODE_VERSION = 0x02;
+const BINARY_PREFIX = "MATRIX"; // ASCII, used to prefix the
+const MODE_VERIFY_OTHER_USER = 0x00;
+const MODE_VERIFY_SELF_TRUSTED = 0x01; // We trust the master key
+const MODE_VERIFY_SELF_UNTRUSTED = 0x02; // We do not trust the master key
 
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
     static propTypes = {
-        // Common for all kinds of QR codes
-        keys: PropTypes.array.isRequired, // array of [Key ID, Base64 Key] pairs
-        action: PropTypes.string.isRequired,
-        keyholderUserId: PropTypes.string.isRequired,
-
-        // User verification use case only
-        secret: PropTypes.string,
-        otherUserKey: PropTypes.string, // Base64 key being verified
-        otherUserDeviceKey: PropTypes.string, // Base64 key of the other user's device (or what we think it is; optional)
-        requestEventId: PropTypes.string, // for DM verification only
-    };
-
-    static defaultProps = {
-        action: "verify",
+        prefix: PropTypes.string.isRequired,
+        version: PropTypes.number.isRequired,
+        mode: PropTypes.number.isRequired,
+        transactionId: PropTypes.string.isRequired, // or requestEventId
+        firstKeyB64: PropTypes.string.isRequired,
+        secondKeyB64: PropTypes.string.isRequired,
+        secretB64: PropTypes.string.isRequired,
     };
 
     static async getPropsForRequest(verificationRequest: VerificationRequest) {
         const cli = MatrixClientPeg.get();
         const myUserId = cli.getUserId();
         const otherUserId = verificationRequest.otherUserId;
-        const myDeviceId = cli.getDeviceId();
-        const otherDevice = verificationRequest.targetDevice;
-        const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
 
-        const qrProps = {
-            secret: verificationRequest.encodedSharedSecret,
-            keyholderUserId: myUserId,
-            action: "verify",
-            keys: [], // array of pairs: keyId, base64Key
-            otherUserKey: "", // base64key
-            otherUserDeviceKey: "", // base64key
-            requestEventId: "", // we figure this out in a moment
-        };
+        let mode = MODE_VERIFY_OTHER_USER;
+        if (myUserId === otherUserId) {
+            // Mode changes depending on whether or not we trust the master cross signing key
+            const myTrust = cli.checkUserTrust(myUserId);
+            if (myTrust.isCrossSigningVerified()) {
+                mode = MODE_VERIFY_SELF_TRUSTED;
+            } else {
+                mode = MODE_VERIFY_SELF_UNTRUSTED;
+            }
+        }
 
         const requestEvent = verificationRequest.requestEvent;
-        qrProps.requestEventId = requestEvent.getId()
+        let transactionId = requestEvent.getId()
             ? requestEvent.getId()
             : ToDeviceChannel.getTransactionId(requestEvent);
 
-        // Populate the keys we need depending on which direction and users are involved in the verification.
-        if (myUserId === otherUserId) {
-            if (!otherDeviceId) {
-                // Existing scanning New session's QR code
-                qrProps.otherUserDeviceKey = null;
-            } else {
-                // New scanning Existing session's QR code
-                const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
-                const device = myDevices.find(d => d.deviceId === otherDeviceId);
-                if (device) qrProps.otherUserDeviceKey = device.getFingerprint();
-            }
+        const qrProps = {
+            prefix: BINARY_PREFIX,
+            version: CODE_VERSION,
+            mode,
+            transactionId,
+            firstKeyB64: '', // worked out shortly
+            secondKeyB64: '', // worked out shortly
+            secretB64: verificationRequest.encodedSharedSecret,
+        };
 
-            // Either direction shares these next few props
+        const myCrossSigningInfo = cli.getStoredCrossSigningForUser(myUserId);
+        const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
 
-            const xsignInfo = cli.getStoredCrossSigningForUser(myUserId);
-            qrProps.otherUserKey = xsignInfo.getId("master");
+        if (mode === MODE_VERIFY_OTHER_USER) {
+            // First key is our master cross signing key
+            qrProps.firstKeyB64 = myCrossSigningInfo.getId("master");
 
-            qrProps.keys = [
-                [myDeviceId, cli.getDeviceEd25519Key()],
-                [xsignInfo.getId("master"), xsignInfo.getId("master")],
-            ];
-        } else {
-            // Doesn't matter which direction the verification is, we always show the same QR code
-            // for not-ourself verification.
-            const myXsignInfo = cli.getStoredCrossSigningForUser(myUserId);
-            const otherXsignInfo = cli.getStoredCrossSigningForUser(otherUserId);
-            const otherDevices = (await cli.getStoredDevicesForUser(otherUserId)) || [];
-            const otherDevice = otherDevices.find(d => d.deviceId === otherDeviceId);
+            // Second key is the other user's master cross signing key
+            const otherUserCrossSigningInfo = cli.getStoredCrossSigningForUser(otherUserId);
+            qrProps.secondKeyB64 = otherUserCrossSigningInfo.getId("master");
+        } else if (mode === MODE_VERIFY_SELF_TRUSTED) {
+            // First key is our master cross signing key
+            qrProps.firstKeyB64 = myCrossSigningInfo.getId("master");
 
-            qrProps.keys = [
-                [myDeviceId, cli.getDeviceEd25519Key()],
-                [myXsignInfo.getId("master"), myXsignInfo.getId("master")],
-            ];
-            qrProps.otherUserKey = otherXsignInfo.getId("master");
-            if (otherDevice) qrProps.otherUserDeviceKey = otherDevice.getFingerprint();
+            // Second key is the other device's device key
+            const otherDevice = verificationRequest.targetDevice;
+            const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
+            const device = myDevices.find(d => d.deviceId === otherDeviceId);
+            qrProps.secondKeyB64 = device.getFingerprint();
+        } else if (mode === MODE_VERIFY_SELF_UNTRUSTED) {
+            // First key is our device's key
+            qrProps.firstKeyB64 = cli.getDeviceEd25519Key();
+
+            // Second key is what we think our master cross signing key is
+            qrProps.secondKeyB64 = myCrossSigningInfo.getId("master");
         }
 
         return qrProps;
@@ -107,21 +105,63 @@ export default class VerificationQRCode extends React.PureComponent {
 
     constructor(props) {
         super(props);
+
+        this.state = {
+            dataUri: null,
+        };
+        this.generateQrCode();
+    }
+
+    componentDidUpdate(prevProps: Readonly<P>): void {
+        if (JSON.stringify(this.props) === JSON.stringify(prevProps)) return; // No prop change
+
+        this.generateQRCode();
+    }
+
+    async generateQrCode() {
+        let buf = Buffer.alloc(0); // we'll concat our way through life
+
+        const appendByte = (b: number) => {
+            const tmpBuf = Buffer.from([b]);
+            buf = Buffer.concat([buf, tmpBuf]);
+        };
+        const appendInt = (i: number) => {
+            const tmpBuf = Buffer.alloc(4);
+            tmpBuf.writeInt8(i, 0);
+            buf = Buffer.concat([buf, tmpBuf]);
+        };
+        const appendStr = (s: string, enc: string) => {
+            const tmpBuf = Buffer.from(s, enc);
+            appendInt(tmpBuf.byteLength);
+            buf = Buffer.concat([buf, tmpBuf]);
+        };
+        const appendEncBase64 = (b64: string) => {
+            const b = decodeBase64(b64);
+            const tmpBuf = Buffer.from(b);
+            buf = Buffer.concat([buf, tmpBuf]);
+        };
+
+        // Actually build the buffer for the QR code
+        appendStr(this.props.prefix, "ascii");
+        appendByte(this.props.version);
+        appendByte(this.props.mode);
+        appendStr(this.props.transactionId, "utf-8");
+        appendEncBase64(this.props.firstKeyB64);
+        appendEncBase64(this.props.secondKeyB64);
+        appendEncBase64(this.props.secretB64);
+
+        // Now actually assemble the QR code's data URI
+        const uri = await QRCode.toDataURL([{data: buf, mode: 'byte'}], {
+            errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
+        });
+        this.setState({dataUri: uri});
     }
 
     render() {
-        const query = {
-            request: this.props.requestEventId,
-            action: this.props.action,
-            other_user_key: this.props.otherUserKey,
-            secret: this.props.secret,
-        };
-        for (const key of this.props.keys) {
-            query[`key_${key[0]}`] = key[1];
+        if (!this.state.dataUri) {
+            return <div className='mx_VerificationQRCode'><Spinner /></div>;
         }
 
-        const uri = `https://matrix.to/#/${this.props.keyholderUserId}?${qs.stringify(query)}`;
-
-        return <QRCode value={uri} size={512} logoWidth={64} logo={require("../../../../../res/img/matrix-m.svg")} />;
+        return <img src={this.state.dataUri} className='mx_VerificationQRCode' />;
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 6924d7dcc0..5aa6a3ed0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2101,7 +2101,25 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-from@^1.0.0:
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0, buffer-from@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
@@ -2120,6 +2138,14 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115"
+  integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
 builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2887,6 +2913,11 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dijkstrajs@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
+  integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
+
 dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -4882,7 +4913,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@^2.0.5:
+isarray@^2.0.1, isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
@@ -6728,6 +6759,11 @@ png-chunks-extract@^1.0.0:
   dependencies:
     crc-32 "^0.3.0"
 
+pngjs@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -7018,6 +7054,19 @@ qrcode-react@^0.1.16:
   dependencies:
     qr.js "0.0.0"
 
+qrcode@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"
+  integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==
+  dependencies:
+    buffer "^5.4.3"
+    buffer-alloc "^1.2.0"
+    buffer-from "^1.1.1"
+    dijkstrajs "^1.0.1"
+    isarray "^2.0.1"
+    pngjs "^3.3.0"
+    yargs "^13.2.4"
+
 qs@^6.5.2, qs@^6.6.0:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
@@ -9260,7 +9309,7 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.3.0:
+yargs@^13.2.4, yargs@^13.3.0:
   version "13.3.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
   integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==

From 3b6a201d4ea80566214e2038adbff80e76c8c8c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 19 Feb 2020 17:03:50 -0700
Subject: [PATCH 1148/3235] Add comments

---
 src/components/views/elements/crypto/VerificationQRCode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 09408fe4dd..407c1adf81 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -24,9 +24,9 @@ import {decodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
 import Spinner from "../Spinner";
 import * as QRCode from "qrcode";
 
-const CODE_VERSION = 0x02;
-const BINARY_PREFIX = "MATRIX"; // ASCII, used to prefix the
-const MODE_VERIFY_OTHER_USER = 0x00;
+const CODE_VERSION = 0x02; // the version of binary QR codes we support
+const BINARY_PREFIX = "MATRIX"; // ASCII, used to prefix the binary format
+const MODE_VERIFY_OTHER_USER = 0x00; // Verifying someone who isn't us
 const MODE_VERIFY_SELF_TRUSTED = 0x01; // We trust the master key
 const MODE_VERIFY_SELF_UNTRUSTED = 0x02; // We do not trust the master key
 

From 760a472be51f6c8550ace4f43a51e6691c4b6133 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 19 Feb 2020 17:05:32 -0700
Subject: [PATCH 1149/3235] Appease the linter

---
 src/components/views/elements/crypto/VerificationQRCode.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 407c1adf81..cbbe2912d6 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -59,7 +59,7 @@ export default class VerificationQRCode extends React.PureComponent {
         }
 
         const requestEvent = verificationRequest.requestEvent;
-        let transactionId = requestEvent.getId()
+        const transactionId = requestEvent.getId()
             ? requestEvent.getId()
             : ToDeviceChannel.getTransactionId(requestEvent);
 
@@ -112,7 +112,7 @@ export default class VerificationQRCode extends React.PureComponent {
         this.generateQrCode();
     }
 
-    componentDidUpdate(prevProps: Readonly<P>): void {
+    componentDidUpdate(prevProps): void {
         if (JSON.stringify(this.props) === JSON.stringify(prevProps)) return; // No prop change
 
         this.generateQRCode();

From ffde11ca912213148ef52a0e118995b2f960c150 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 20 Feb 2020 00:38:08 +0000
Subject: [PATCH 1150/3235] Use Persistent Storage where possible

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js |  3 +++
 src/rageshake/submit-rageshake.js       | 19 +++++++++++++++++++
 src/utils/StorageManager.js             | 10 ++++++++++
 3 files changed, 32 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3ccc4627e1..229c741310 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -65,6 +65,7 @@ import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
+import * as StorageManager from "../../utils/StorageManager";
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {
@@ -1193,6 +1194,8 @@ export default createReactClass({
         } else {
             this._showScreenAfterLogin();
         }
+
+        StorageManager.tryPersistStorage();
     },
 
     _showScreenAfterLogin: function() {
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 091f64bf93..b17dc62168 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -106,6 +106,25 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         body.append('enabled_labs', enabledLabs.join(', '));
     }
 
+    // add storage persistence/quota information
+    if (navigator.storage && navigator.storage.persisted) {
+        try {
+            body.append("storageManager_persisted", await navigator.storage.persisted());
+        } catch (e) {}
+    }
+    if (navigator.storage && navigator.storage.estimate) {
+        try {
+            const estimate = await navigator.storage.estimate();
+            body.append("storageManager_quota", estimate.quota);
+            body.append("storageManager_usage", estimate.usage);
+            if (estimate.usageDetails) {
+                Object.keys(estimate.usageDetails).forEach(k => {
+                    body.append(`storageManager_usage_${k}`, estimate.usageDetails[k]);
+                });
+            }
+        } catch (e) {}
+    }
+
     if (opts.sendLogs) {
         progressCallback(_t("Collecting logs"));
         const logs = await rageshake.getLogsForReport();
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index c5a9f7aeed..4ed118da8a 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -43,6 +43,16 @@ function track(action) {
     Analytics.trackEvent("StorageManager", action);
 }
 
+export function tryPersistStorage() {
+    if (navigator.storage && navigator.storage.persist) {
+        navigator.storage.persist().then(persistent => {
+            console.log("StorageManager: Persistent?", persistent);
+        });
+    } else {
+        console.log("StorageManager: Persistence unsupported");
+    }
+}
+
 export async function checkConsistency() {
     log("Checking storage consistency");
     log(`Local storage supported? ${!!localStorage}`);

From 16bbea0b59aa6e76d1067d637075901b837003e7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 20 Feb 2020 02:35:30 +0000
Subject: [PATCH 1151/3235] Fix various leaks due to method re-binding

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.js                                      | 12 +++++++-----
 .../dialogs/eventindex/ManageEventIndexDialog.js     |  8 ++++----
 src/components/structures/FilePanel.js               |  8 ++++----
 src/components/views/settings/EventIndexPanel.js     |  8 ++++----
 .../views/settings/tabs/room/RolesRoomSettingsTab.js |  8 ++++----
 src/integrations/IntegrationManagers.js              |  8 ++++----
 src/mjolnir/Mjolnir.js                               |  8 ++++----
 7 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index b030f1b6f9..36a6f13bb6 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -153,10 +153,12 @@ const Notifier = {
     },
 
     start: function() {
-        this.boundOnEvent = this.onEvent.bind(this);
-        this.boundOnSyncStateChange = this.onSyncStateChange.bind(this);
-        this.boundOnRoomReceipt = this.onRoomReceipt.bind(this);
-        this.boundOnEventDecrypted = this.onEventDecrypted.bind(this);
+        // do not re-bind in the case of repeated call
+        this.boundOnEvent = this.boundOnEvent || this.onEvent.bind(this);
+        this.boundOnSyncStateChange = this.boundOnSyncStateChange || this.onSyncStateChange.bind(this);
+        this.boundOnRoomReceipt = this.boundOnRoomReceipt || this.onRoomReceipt.bind(this);
+        this.boundOnEventDecrypted = this.boundOnEventDecrypted || this.onEventDecrypted.bind(this);
+
         MatrixClientPeg.get().on('event', this.boundOnEvent);
         MatrixClientPeg.get().on('Room.receipt', this.boundOnRoomReceipt);
         MatrixClientPeg.get().on('Event.decrypted', this.boundOnEventDecrypted);
@@ -166,7 +168,7 @@ const Notifier = {
     },
 
     stop: function() {
-        if (MatrixClientPeg.get() && this.boundOnRoomTimeline) {
+        if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener('Event', this.boundOnEvent);
             MatrixClientPeg.get().removeListener('Room.receipt', this.boundOnRoomReceipt);
             MatrixClientPeg.get().removeListener('Event.decrypted', this.boundOnEventDecrypted);
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 5ae90b694e..6aab777ee1 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -46,7 +46,7 @@ export default class ManageEventIndexDialog extends React.Component {
         };
     }
 
-    async updateCurrentRoom(room) {
+    updateCurrentRoom = async (room) => {
         const eventIndex = EventIndexPeg.get();
         const stats = await eventIndex.getStats();
         let currentRoom = null;
@@ -63,13 +63,13 @@ export default class ManageEventIndexDialog extends React.Component {
             roomCount: roomCount,
             currentRoom: currentRoom,
         });
-    }
+    };
 
     componentWillUnmount(): void {
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
-            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom.bind(this));
+            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom);
         }
     }
 
@@ -83,7 +83,7 @@ export default class ManageEventIndexDialog extends React.Component {
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
-            eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
+            eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
 
             const stats = await eventIndex.getStats();
             const roomStats = eventIndex.crawlingRooms();
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 4c02f925fc..f8c03be864 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -95,8 +95,8 @@ const FilePanel = createReactClass({
         // this could be made more general in the future or the filter logic
         // could be fixed.
         if (EventIndexPeg.get() !== null) {
-            client.on('Room.timeline', this.onRoomTimeline.bind(this));
-            client.on('Event.decrypted', this.onEventDecrypted.bind(this));
+            client.on('Room.timeline', this.onRoomTimeline);
+            client.on('Event.decrypted', this.onEventDecrypted);
         }
     },
 
@@ -107,8 +107,8 @@ const FilePanel = createReactClass({
         if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
 
         if (EventIndexPeg.get() !== null) {
-            client.removeListener('Room.timeline', this.onRoomTimeline.bind(this));
-            client.removeListener('Event.decrypted', this.onEventDecrypted.bind(this));
+            client.removeListener('Room.timeline', this.onRoomTimeline);
+            client.removeListener('Event.decrypted', this.onEventDecrypted);
         }
     },
 
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 68faa53e53..ded62354cb 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -37,7 +37,7 @@ export default class EventIndexPanel extends React.Component {
         };
     }
 
-    async updateCurrentRoom(room) {
+    updateCurrentRoom = async (room) => {
         const eventIndex = EventIndexPeg.get();
         const stats = await eventIndex.getStats();
 
@@ -45,13 +45,13 @@ export default class EventIndexPanel extends React.Component {
             eventIndexSize: stats.size,
             roomCount: stats.roomCount,
         });
-    }
+    };
 
     componentWillUnmount(): void {
         const eventIndex = EventIndexPeg.get();
 
         if (eventIndex !== null) {
-            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom.bind(this));
+            eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom);
         }
     }
 
@@ -68,7 +68,7 @@ export default class EventIndexPanel extends React.Component {
         let roomCount = 0;
 
         if (eventIndex !== null) {
-            eventIndex.on("changedCheckpoint", this.updateCurrentRoom.bind(this));
+            eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
 
             const stats = await eventIndex.getStats();
             eventIndexSize = stats.size;
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index 42947d1fb2..a3a9cb78c5 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -107,20 +107,20 @@ export default class RolesRoomSettingsTab extends React.Component {
     };
 
     componentDidMount(): void {
-        MatrixClientPeg.get().on("RoomState.members", this._onRoomMembership.bind(this));
+        MatrixClientPeg.get().on("RoomState.members", this._onRoomMembership);
     }
 
     componentWillUnmount(): void {
         const client = MatrixClientPeg.get();
         if (client) {
-            client.removeListener("RoomState.members", this._onRoomMembership.bind(this));
+            client.removeListener("RoomState.members", this._onRoomMembership);
         }
     }
 
-    _onRoomMembership(event, state, member) {
+    _onRoomMembership = (event, state, member) => {
         if (state.roomId !== this.props.roomId) return;
         this.forceUpdate();
-    }
+    };
 
     _populateDefaultPlEvents(eventsSection, stateLevel, eventsLevel) {
         for (const desiredEvent of Object.keys(plEventsToShow)) {
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.js
index c933e5c433..3ba1aab135 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.js
@@ -54,14 +54,14 @@ export class IntegrationManagers {
     startWatching(): void {
         this.stopWatching();
         this._client = MatrixClientPeg.get();
-        this._client.on("accountData", this._onAccountData.bind(this));
+        this._client.on("accountData", this._onAccountData);
         this._compileManagers();
         setInterval(() => this._setupHomeserverManagers(), HS_MANAGERS_REFRESH_INTERVAL);
     }
 
     stopWatching(): void {
         if (!this._client) return;
-        this._client.removeListener("accountData", this._onAccountData.bind(this));
+        this._client.removeListener("accountData", this._onAccountData);
         if (this._wellknownRefreshTimerId !== null) clearInterval(this._wellknownRefreshTimerId);
     }
 
@@ -136,11 +136,11 @@ export class IntegrationManagers {
         this._primaryManager = null; // reset primary
     }
 
-    _onAccountData(ev: MatrixEvent): void {
+    _onAccountData = (ev: MatrixEvent): void => {
         if (ev.getType() === 'm.widgets') {
             this._compileManagers();
         }
-    }
+    };
 
     hasManager(): boolean {
         return this._managers.length > 0;
diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 4970d8e8af..0c99306278 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -61,7 +61,7 @@ export class Mjolnir {
     setup() {
         if (!MatrixClientPeg.get()) return;
         this._updateLists(SettingsStore.getValue("mjolnirRooms"));
-        MatrixClientPeg.get().on("RoomState.events", this._onEvent.bind(this));
+        MatrixClientPeg.get().on("RoomState.events", this._onEvent);
     }
 
     stop() {
@@ -76,7 +76,7 @@ export class Mjolnir {
         }
 
         if (!MatrixClientPeg.get()) return;
-        MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent.bind(this));
+        MatrixClientPeg.get().removeListener("RoomState.events", this._onEvent);
     }
 
     async getOrCreatePersonalList(): Promise<BanList> {
@@ -130,13 +130,13 @@ export class Mjolnir {
         this._lists = this._lists.filter(b => b.roomId !== roomId);
     }
 
-    _onEvent(event) {
+    _onEvent = (event) => {
         if (!MatrixClientPeg.get()) return;
         if (!this._roomIds.includes(event.getRoomId())) return;
         if (!ALL_RULE_TYPES.includes(event.getType())) return;
 
         this._updateLists(this._roomIds);
-    }
+    };
 
     _onListsChanged(settingName, roomId, atLevel, newValue) {
         // We know that ban lists are only recorded at one level so we don't need to re-eval them

From 10f90be5afc45b0160cab220c6164c39496062e2 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Wed, 19 Feb 2020 20:02:10 +0000
Subject: [PATCH 1152/3235] Translated using Weblate (Russian)

Currently translated at 81.1% (1725 of 2126 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 457e828ded..abe39b2cbd 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1739,5 +1739,12 @@
     "Unverified session": "Непроверенная сессия",
     "Verifies a user, session, and pubkey tuple": "Проверяет пользователя, сессию и публичные ключи",
     "Unknown (user, session) pair:": "Неизвестная (пользователь:сессия) пара:",
-    "Session already verified!": "Сессия уже подтверждена!"
+    "Session already verified!": "Сессия уже подтверждена!",
+    "Never send encrypted messages to unverified sessions from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессий из этой сессии",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессии в эту комнату из этой сессии",
+    "Your keys are <b>not being backed up from this session</b>.": "Ваши ключи <b>не резервируются с этой сессии</b>.",
+    "Server or user ID to ignore": "ID сервера или пользователя для игнорирования",
+    "Subscribed lists": "Подписанные списки",
+    "Subscribe": "Подписать",
+    "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь"
 }

From c04eef6521cafc6ed4a97ee4e6b6f9ff1cbe787c Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 20 Feb 2020 09:48:46 +0000
Subject: [PATCH 1153/3235] Translated using Weblate (Lithuanian)

Currently translated at 42.1% (894 of 2126 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index eeb1871a8a..4276a933d1 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -625,8 +625,8 @@
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Šis namų serveris viršijo vieno iš savo išteklių limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
     "An error ocurred whilst trying to remove the widget from the room": "Įvyko klaida, bandant pašalinti valdiklį iš kambario",
-    "Blacklist": "Įtraukti į juodąjį sąrašą",
-    "Unblacklist": "Pašalinti iš juodojo sąrašo",
+    "Blacklist": "Blokuoti",
+    "Unblacklist": "Atblokuoti",
     "Verify...": "Patvirtinti...",
     "Communities": "Bendruomenės",
     "Home": "Pradžia",

From fb28bbbaa68a5cf19a6f1f1e565018f1290925c5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 20 Feb 2020 12:06:34 +0100
Subject: [PATCH 1154/3235] dont say we can scan when we dont

---
 src/MatrixClientPeg.js                             | 3 +--
 src/components/views/dialogs/DeviceVerifyDialog.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 448c6d9e9b..98fcc85d60 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -32,7 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB
 import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
-import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -221,7 +221,6 @@ class _MatrixClientPeg {
             verificationMethods: [
                 verificationMethods.SAS,
                 SHOW_QR_CODE_METHOD,
-                SCAN_QR_CODE_METHOD, // XXX: We don't actually support scanning yet!
                 verificationMethods.RECIPROCATE_QR_CODE,
             ],
             unstableClientRelationAggregation: true,
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 835b7daf02..f7826b9c27 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -27,7 +27,7 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {ensureDMExists} from "../../../createRoom";
 import dis from "../../../dispatcher";
 import SettingsStore from '../../../settings/SettingsStore';
-import {SCAN_QR_CODE_METHOD, SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
 
 const MODE_LEGACY = 'legacy';
@@ -135,7 +135,6 @@ export default class DeviceVerifyDialog extends React.Component {
                 this._request = await client.requestVerification(this.props.userId, [
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
-                    SCAN_QR_CODE_METHOD,
                     verificationMethods.RECIPROCATE_QR_CODE,
                 ]);
 

From 766f523c0020ee4e677095d4ac293bc054f2cc78 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 20 Feb 2020 11:41:53 +0000
Subject: [PATCH 1155/3235] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a68dcfddb4..09393f052a 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.0.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 6924d7dcc0..17b0b97ac9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,10 +5760,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@5.0.1:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.0.1.tgz#ffbbc89d2436f9eb378cd81bd3993f59ec8fb895"
-  integrity sha512-1Jl18tYDGQNo+PWC2mBdYd6WNrL20jhG9+FF1p2w6paS7IBC74QDCEKP3GLXr3SSmWdNuAYTFB94vZQRJ31HzA==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a998006842ae558f02819ca84fbaad43685cc10b"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 31e82b8050b04795db02b7ecc42ca19bce88dd76 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 20 Feb 2020 12:05:07 +0000
Subject: [PATCH 1156/3235] Remove exec so release script continues

We now want to do post-processing after the JS SDK release script, so we can't
use `exec` here.
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index c585708326..3c28084bb7 100755
--- a/release.sh
+++ b/release.sh
@@ -35,7 +35,7 @@ do
     fi
 done
 
-exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
+./node_modules/matrix-js-sdk/release.sh -z "$@"
 
 release="${1#v}"
 prerelease=0

From 9e3b0fdf7cd9be0bc7c0e018185705900b6fd22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 11:46:42 +0100
Subject: [PATCH 1157/3235] EventIndexPanel: Fix the removal of the
 updateCurrentRoom listeners.

The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 6aab777ee1..fa00477c1a 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -46,7 +46,7 @@ export default class ManageEventIndexDialog extends React.Component {
         };
     }
 
-    updateCurrentRoom = async (room) => {
+    updateCurrentRoom = async(room) => {
         const eventIndex = EventIndexPeg.get();
         const stats = await eventIndex.getStats();
         let currentRoom = null;

From 1897d67818a1bf1990bf7ed235e015ac8bbffce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 12:21:47 +0100
Subject: [PATCH 1158/3235] EventIndexPanel: Catch getStats failures.

Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
---
 .../eventindex/ManageEventIndexDialog.js      | 21 +++++++++++++++----
 .../views/settings/EventIndexPanel.js         | 19 +++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index fa00477c1a..aea37c1875 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -48,7 +48,16 @@ export default class ManageEventIndexDialog extends React.Component {
 
     updateCurrentRoom = async(room) => {
         const eventIndex = EventIndexPeg.get();
-        const stats = await eventIndex.getStats();
+        let stats;
+
+        // This call may fail if sporadically, not a huge issue as we will try
+        // later again and probably succeed.
+        try {
+            stats = await eventIndex.getStats();
+        } catch {
+            return;
+        }
+
         let currentRoom = null;
 
         if (room) currentRoom = room.name;
@@ -85,12 +94,16 @@ export default class ManageEventIndexDialog extends React.Component {
         if (eventIndex !== null) {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
 
-            const stats = await eventIndex.getStats();
+            try {
+                const stats = await eventIndex.getStats();
+                eventIndexSize = stats.size;
+                eventCount = stats.eventCount;
+            } catch {
+            }
+
             const roomStats = eventIndex.crawlingRooms();
-            eventIndexSize = stats.size;
             crawlingRoomsCount = roomStats.crawlingRooms.size;
             roomCount = roomStats.totalRooms.size;
-            eventCount = stats.eventCount;
 
             const room = eventIndex.currentRoom();
             if (room) currentRoom = room.name;
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index ded62354cb..c74d99cec9 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -39,7 +39,15 @@ export default class EventIndexPanel extends React.Component {
 
     updateCurrentRoom = async (room) => {
         const eventIndex = EventIndexPeg.get();
-        const stats = await eventIndex.getStats();
+        let stats;
+
+        // This call may fail if sporadically, not a huge issue as we will try
+        // later again and probably succeed.
+        try {
+            stats = await eventIndex.getStats();
+        } catch {
+            return;
+        }
 
         this.setState({
             eventIndexSize: stats.size,
@@ -70,9 +78,12 @@ export default class EventIndexPanel extends React.Component {
         if (eventIndex !== null) {
             eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
 
-            const stats = await eventIndex.getStats();
-            eventIndexSize = stats.size;
-            roomCount = stats.roomCount;
+            try {
+                const stats = await eventIndex.getStats();
+                eventIndexSize = stats.size;
+                roomCount = stats.roomCount;
+            } catch {
+            }
         }
 
         this.setState({

From a650c47d6bfc44b7dce9fc652c00190f1e587e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 13:15:28 +0100
Subject: [PATCH 1159/3235] ManageEventIndexDialog: Add a space before the
 function parenthesis.

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

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index aea37c1875..318ef9ec8f 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -46,7 +46,7 @@ export default class ManageEventIndexDialog extends React.Component {
         };
     }
 
-    updateCurrentRoom = async(room) => {
+    updateCurrentRoom = async (room) => {
         const eventIndex = EventIndexPeg.get();
         let stats;
 

From 81e61d6f9d946d0ee9cc6868831573b7c2094f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 19 Feb 2020 14:17:19 +0100
Subject: [PATCH 1160/3235] EventIndexPanel: Move the comments around for the
 getStats calls.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js     | 7 +++++--
 src/components/views/settings/EventIndexPanel.js           | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 318ef9ec8f..f3ea3beb1c 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -50,11 +50,11 @@ export default class ManageEventIndexDialog extends React.Component {
         const eventIndex = EventIndexPeg.get();
         let stats;
 
-        // This call may fail if sporadically, not a huge issue as we will try
-        // later again and probably succeed.
         try {
             stats = await eventIndex.getStats();
         } catch {
+            // This call may fail if sporadically, not a huge issue as we will
+            // try later again and probably succeed.
             return;
         }
 
@@ -99,6 +99,9 @@ export default class ManageEventIndexDialog extends React.Component {
                 eventIndexSize = stats.size;
                 eventCount = stats.eventCount;
             } catch {
+                // This call may fail if sporadically, not a huge issue as we
+                // will try later again in the updateCurrentRoom call and
+                // probably succeed.
             }
 
             const roomStats = eventIndex.crawlingRooms();
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index c74d99cec9..80d93c4562 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -41,11 +41,11 @@ export default class EventIndexPanel extends React.Component {
         const eventIndex = EventIndexPeg.get();
         let stats;
 
-        // This call may fail if sporadically, not a huge issue as we will try
-        // later again and probably succeed.
         try {
             stats = await eventIndex.getStats();
         } catch {
+            // This call may fail if sporadically, not a huge issue as we will
+            // try later again and probably succeed.
             return;
         }
 
@@ -83,6 +83,9 @@ export default class EventIndexPanel extends React.Component {
                 eventIndexSize = stats.size;
                 roomCount = stats.roomCount;
             } catch {
+                // This call may fail if sporadically, not a huge issue as we
+                // will try later again in the updateCurrentRoom call and
+                // probably succeed.
             }
         }
 

From 4cc37d13c71f6a88a40cb18b7dbdf20419647f2f Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 20 Feb 2020 13:55:50 +0000
Subject: [PATCH 1161/3235] Translated using Weblate (Lithuanian)

Currently translated at 42.1% (895 of 2126 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 4276a933d1..98fa314016 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -755,7 +755,7 @@
     "Sign In": "Prisijungti",
     "Explore rooms": "Žvalgyti kambarius",
     "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
-    "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo paskyros %(serverName)s serveryje",
+    "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo Matrix paskyros %(serverName)s serveryje",
     "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Nepriklausomai nuo to ar jūs naudojate 'duonos trupinių' funkciją (avatarai virš kambarių sąrašo)",
     "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 šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
@@ -900,5 +900,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite palikti kambarį %(roomName)s?",
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
     "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
-    "General failure": "Bendras triktis"
+    "General failure": "Bendras triktis",
+    "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas"
 }

From fee9c7d21f533ff3f14f59ab3a7afb092e94b1b5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 20 Feb 2020 17:43:33 +0100
Subject: [PATCH 1162/3235] accept canonical alias for pills

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

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 59c0bde177..cd7277cdeb 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -128,7 +128,8 @@ const Pill = createReactClass({
             case Pill.TYPE_ROOM_MENTION: {
                 const localRoom = resourceId[0] === '#' ?
                     MatrixClientPeg.get().getRooms().find((r) => {
-                        return r.getAliases().includes(resourceId);
+                        return r.getCanonicalAlias() === resourceId ||
+                               r.getAliases().includes(resourceId);
                     }) : MatrixClientPeg.get().getRoom(resourceId);
                 room = localRoom;
                 if (!localRoom) {

From 403895ebb9e809288cdf81da08b5b1d84597540a Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Thu, 20 Feb 2020 16:30:15 +0000
Subject: [PATCH 1163/3235] Translated using Weblate (Dutch)

Currently translated at 86.8% (1846 of 2126 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f0fddfd9b4..22af1bc727 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1857,5 +1857,10 @@
     "All sessions for this user are trusted": "Alle sessies van deze gebruiker zijn vertrouwd",
     "Some sessions in this encrypted room are not trusted": "Sommige sessies in dit versleutelde gesprek zijn niet vertrouwd",
     "All sessions in this encrypted room are trusted": "Alle sessies in dit versleutelde gesprek zijn vertrouwd",
-    "Mod": "Mod"
+    "Mod": "Mod",
+    "rooms.": "gesprekken.",
+    "Recent rooms": "Actuele gesprekken",
+    "Direct Messages": "Tweegesprekken",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aanstaan om te kunnen zoeken in versleutelde gesprekken.",
+    "Indexed rooms:": "Geïndexeerde gesprekken:"
 }

From 2027f410e3c1b949dcaaf6de20c8e71e5d1c4181 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 20 Feb 2020 14:04:30 +0000
Subject: [PATCH 1164/3235] Translated using Weblate (Lithuanian)

Currently translated at 43.1% (916 of 2126 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 | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 98fa314016..cf563c29f3 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -420,7 +420,7 @@
     "I have verified my email address": "Aš patvirtinau savo el. pašto adresą",
     "Return to login screen": "Grįžti į prisijungimo ekraną",
     "Send Reset Email": "Siųsti atstatymo el. laišką",
-    "Incorrect username and/or password.": "Neteisingas naudotojo vardas ir/ar slaptažodis.",
+    "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Turėkite omenyje, kad jūs prisijungiate prie %(hs)s serverio, o ne matrix.org.",
     "Failed to fetch avatar URL": "Nepavyko gauti avataro URL",
     "Commands": "Komandos",
@@ -526,7 +526,7 @@
     "Enable inline URL previews by default": "Įjungti tiesiogines URL nuorodų peržiūras pagal numatymą",
     "Enable URL previews for this room (only affects you)": "Įjungti URL nuorodų peržiūras šiame kambaryje (įtakoja tik jus)",
     "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras pagal numatymą dalyviams šiame kambaryje",
-    "Confirm password": "Pakartokite slaptažodį",
+    "Confirm password": "Patvirtinkite slaptažodį",
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
     "Share Link to User": "Dalintis nuoroda į naudotoją",
@@ -714,12 +714,12 @@
     "Unable to verify email address.": "Nepavyko patvirtinti el. pašto adreso.",
     "This will allow you to reset your password and receive notifications.": "Tai jums leis atstatyti savo slaptažodį ir gauti pranešimus.",
     "Skip": "Praleisti",
-    "Username not available": "Naudotojo vardas neprieinamas",
-    "Username invalid: %(errMessage)s": "Neteisingas naudotojo vardas: %(errMessage)s",
+    "Username not available": "Vartotojo vardas negalimas",
+    "Username invalid: %(errMessage)s": "Neteisingas vartotojo vardas: %(errMessage)s",
     "An error occurred: %(error_string)s": "Įvyko klaida: %(error_string)s",
     "Checking...": "Tikrinama...",
-    "Username available": "Naudotojo vardas yra prieinamas",
-    "To get started, please pick a username!": "Norėdami pradėti, pasirinkite naudotojo vardą!",
+    "Username available": "Vartotojo vardas galimas",
+    "To get started, please pick a username!": "Norėdami pradėti, pasirinkite vartotojo vardą!",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeigu jau turite Matrix paskyrą, tuomet vietoj to, galite <a>prisijungti</a>.",
     "Unable to restore backup": "Nepavyko atkurti atsarginės kopijos",
     "No backup found!": "Nerasta jokios atsarginės kopijos!",
@@ -901,5 +901,26 @@
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
     "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
     "General failure": "Bendras triktis",
-    "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas"
+    "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas",
+    "Set a new account password...": "Nustatyti naują paskyros slaptažodį...",
+    "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.": "Jei jūs pateikėte klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (galia %(powerLevelNumber)s)",
+    "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.": "Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Jei jūs negalite kažkieno surasti, paklauskite jų vartotojo vardo, pasidalinkite savo vartotojo vardu (%(userId)s) arba <a>profilio nuoroda</a>.",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Jei jūs negalite kažkieno surasti, paklauskite jų vartotojo vardo (pvz.: @vartotojas:serveris.lt) arba <a>pasidalinkite šiuo kambariu</a>.",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Vartotojo vardą gali sudaryti tik mažosios raidės, skaičiai ir '=_-./'",
+    "The username field must not be blank.": "Vartotojo vardo laukelis negali būti tuščias.",
+    "Username": "Vartotojo vardas",
+    "Not sure of your password? <a>Set a new one</a>": "Pamiršote slaptažodį? <a>Nustatykite naują</a>",
+    "Enter username": "Įveskite vartotojo vardą",
+    "Confirm": "Patvirtinti",
+    "Create your Matrix account on %(serverName)s": "Sukurkite savo Matrix paskyrą %(serverName)s serveryje",
+    "Create your Matrix account on <underlinedServerName />": "Sukurkite savo Matrix paskyrą <underlinedServerName /> serveryje",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą ar tel. nr. norėdami pasirinktinai būti aptinkami esamų kontaktų.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą norėdami pasirinktinai būti aptinkami esamų kontaktų.",
+    "Sign in instead": "Prisijungti",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Patvirtinimo laiškas bus išsiųstas į jūsų pašto dėžutę tam, kad patvirtintumėte naujo slaptažodžio nustatymą.",
+    "Set a new password": "Nustatykite naują slaptažodį",
+    "Create account": "Sukurti paskyrą",
+    "Create your account": "Sukurkite savo paskyrą"
 }

From 1739b7e0cc500a1ff52504d06a2b8c11ece49b83 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Thu, 20 Feb 2020 20:09:03 -0600
Subject: [PATCH 1165/3235] Don't ask to enable analytics when Do Not Track is
 enabled

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

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 9597f99cd2..023272cef1 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -585,7 +585,8 @@ const LoggedInView = createReactClass({
                 limitType={usageLimitEvent.getContent().limit_type}
             />;
         } else if (this.props.showCookieBar &&
-            this.props.config.piwik
+            this.props.config.piwik &&
+            navigator.doNotTrack != 1
         ) {
             const policyUrl = this.props.config.piwik.policyUrl || null;
             topBar = <CookieBar policyUrl={policyUrl} />;

From 00cc2535941d5e009a25f40a53a9f704e8601e51 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 20 Feb 2020 10:50:35 -0700
Subject: [PATCH 1166/3235] Always suggest a pill for MXID-looking users

Part of https://github.com/vector-im/riot-web/issues/12440
---
 src/components/views/dialogs/InviteDialog.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 8c9c5f75ef..ce653d38ae 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -645,6 +645,13 @@ export default class InviteDialog extends React.PureComponent {
                     } catch (e) {
                         console.warn("Non-fatal error trying to make an invite for a user ID");
                         console.warn(e);
+
+                        // Add a result anyways, just without a profile
+                        r.results.push({
+                            user_id: term,
+                            display_name: term,
+                            avatar_url: null,
+                        });
                     }
                 }
 

From 62aaa0db9a115a434728ed719476fa0dbe95b52a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 20 Feb 2020 23:01:50 -0700
Subject: [PATCH 1167/3235] Always insert suggestions for user IDs

Fixes https://github.com/vector-im/riot-web/issues/12419
---
 src/components/views/dialogs/InviteDialog.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index ce653d38ae..3920cfd249 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -630,13 +630,14 @@ export default class InviteDialog extends React.PureComponent {
 
                 // While we're here, try and autocomplete a search result for the mxid itself
                 // if there's no matches (and the input looks like a mxid).
-                if (term[0] === '@' && term.indexOf(':') > 1 && r.results.length === 0) {
+                if (term[0] === '@' && term.indexOf(':') > 1) {
                     try {
                         const profile = await MatrixClientPeg.get().getProfileInfo(term);
                         if (profile) {
                             // If we have a profile, we have enough information to assume that
-                            // the mxid can be invited - add it to the list
-                            r.results.push({
+                            // the mxid can be invited - add it to the list. We stick it at the
+                            // top so it is most obviously presented to the user.
+                            r.results.splice(0, 0, {
                                 user_id: term,
                                 display_name: profile['displayname'],
                                 avatar_url: profile['avatar_url'],
@@ -646,8 +647,9 @@ export default class InviteDialog extends React.PureComponent {
                         console.warn("Non-fatal error trying to make an invite for a user ID");
                         console.warn(e);
 
-                        // Add a result anyways, just without a profile
-                        r.results.push({
+                        // Add a result anyways, just without a profile. We stick it at the
+                        // top so it is most obviously presented to the user.
+                        r.results.splice(0, 0,{
                             user_id: term,
                             display_name: term,
                             avatar_url: null,

From f491e4222a5aa9f7eb1a87c9cc7634bd5ef7e267 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 20 Feb 2020 23:10:43 -0700
Subject: [PATCH 1168/3235] Convert the user's last filter into a selection if
 possible

Fixes https://github.com/vector-im/riot-web/issues/12440
---
 src/components/views/dialogs/InviteDialog.js | 26 +++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 3920cfd249..fa12f5393a 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -512,9 +512,26 @@ export default class InviteDialog extends React.PureComponent {
         return false;
     }
 
+    _convertFilter(): Member[] {
+        if (!this.state.filterText || !this.state.filterText.includes('@')) return; // nothing to convert
+
+        let newMember: Member;
+        if (this.state.filterText.startsWith('@')) {
+            // Assume mxid
+            newMember = new DirectoryMember({user_id: this.state.filterText, display_name: null, avatar_url: null});
+        } else {
+            // Assume email
+            newMember = new ThreepidMember(this.state.filterText);
+        }
+        const newTargets = [...this.state.targets, newMember];
+        this.setState({targets: newTargets, filterText: ''});
+        return newTargets;
+    }
+
     _startDm = async () => {
         this.setState({busy: true});
-        const targetIds = this.state.targets.map(t => t.userId);
+        const targets = this._convertFilter();
+        const targetIds = targets.map(t => t.userId);
 
         // Check if there is already a DM with these people and reuse it if possible.
         const existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
@@ -573,7 +590,9 @@ export default class InviteDialog extends React.PureComponent {
 
     _inviteUsers = () => {
         this.setState({busy: true});
-        const targetIds = this.state.targets.map(t => t.userId);
+        this._convertFilter();
+        const targets = this._convertFilter();
+        const targetIds = targets.map(t => t.userId);
 
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
         if (!room) {
@@ -1038,6 +1057,7 @@ export default class InviteDialog extends React.PureComponent {
             goButtonFn = this._inviteUsers;
         }
 
+        const hasSelection = this.state.targets.length > 0 || (this.state.filterText && this.state.filterText.includes('@'));
         return (
             <BaseDialog
                 className='mx_InviteDialog'
@@ -1054,7 +1074,7 @@ export default class InviteDialog extends React.PureComponent {
                                 kind="primary"
                                 onClick={goButtonFn}
                                 className='mx_InviteDialog_goButton'
-                                disabled={this.state.busy}
+                                disabled={this.state.busy || !hasSelection}
                             >
                                 {buttonText}
                             </AccessibleButton>

From 8ba274a38263fa500f2a01992919bb8a2c7492eb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 20 Feb 2020 23:16:21 -0700
Subject: [PATCH 1169/3235] Allow creating a room with only yourself in it

Fixes https://github.com/vector-im/riot-web/issues/12092
---
 src/components/views/dialogs/InviteDialog.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index fa12f5393a..03ec242a2e 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -513,7 +513,8 @@ export default class InviteDialog extends React.PureComponent {
     }
 
     _convertFilter(): Member[] {
-        if (!this.state.filterText || !this.state.filterText.includes('@')) return; // nothing to convert
+        // Check to see if there's anything to convert first
+        if (!this.state.filterText || !this.state.filterText.includes('@')) return this.state.targets || [];
 
         let newMember: Member;
         if (this.state.filterText.startsWith('@')) {
@@ -523,7 +524,7 @@ export default class InviteDialog extends React.PureComponent {
             // Assume email
             newMember = new ThreepidMember(this.state.filterText);
         }
-        const newTargets = [...this.state.targets, newMember];
+        const newTargets = [...(this.state.targets || []), newMember];
         this.setState({targets: newTargets, filterText: ''});
         return newTargets;
     }
@@ -561,9 +562,12 @@ export default class InviteDialog extends React.PureComponent {
         // Check if it's a traditional DM and create the room if required.
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
         let createRoomPromise = Promise.resolve();
-        if (targetIds.length === 1) {
+        const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
+        if (targetIds.length === 1 && !isSelf) {
             createRoomOptions.dmUserId = targetIds[0];
             createRoomPromise = createRoom(createRoomOptions);
+        } else if (isSelf) {
+            createRoomPromise = createRoom(createRoomOptions);
         } else {
             // Create a boring room and try to invite the targets manually.
             createRoomPromise = createRoom(createRoomOptions).then(roomId => {

From bcb1d73c3cfb09a2c953aeb716e4a1ad981b73b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 20 Feb 2020 23:21:35 -0700
Subject: [PATCH 1170/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 03ec242a2e..5c222182de 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -672,7 +672,7 @@ export default class InviteDialog extends React.PureComponent {
 
                         // Add a result anyways, just without a profile. We stick it at the
                         // top so it is most obviously presented to the user.
-                        r.results.splice(0, 0,{
+                        r.results.splice(0, 0, {
                             user_id: term,
                             display_name: term,
                             avatar_url: null,
@@ -1061,7 +1061,8 @@ export default class InviteDialog extends React.PureComponent {
             goButtonFn = this._inviteUsers;
         }
 
-        const hasSelection = this.state.targets.length > 0 || (this.state.filterText && this.state.filterText.includes('@'));
+        const hasSelection = this.state.targets.length > 0
+            || (this.state.filterText && this.state.filterText.includes('@'));
         return (
             <BaseDialog
                 className='mx_InviteDialog'

From 7d319bab7f6ef06ac7191ce99ee3f84fc2f60aab Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 18 Feb 2020 17:28:38 +0000
Subject: [PATCH 1171/3235] fix ssss overwrite

---
 src/components/views/settings/CrossSigningPanel.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index eeccaa61e1..6e69227844 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -128,13 +128,12 @@ export default class CrossSigningPanel extends React.PureComponent {
         }
 
         const enabled = (
-            crossSigningPublicKeysOnDevice &&
             crossSigningPrivateKeysInStorage &&
             secretStorageKeyInAccount
         );
 
         let summarisedStatus;
-        if (enabled) {
+        if (enabled && crossSigningPublicKeysOnDevice) {
             summarisedStatus = <p>✅ {_t(
                 "Cross-signing and secret storage are enabled.",
             )}</p>;

From 80c2aa51b63d587ab5240b9a1fab5966a6e1d02f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Feb 2020 10:41:33 +0000
Subject: [PATCH 1172/3235] Transition BaseAvatar to hooks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles                   |   1 -
 src/components/views/avatars/BaseAvatar.js | 311 ++++++++++-----------
 2 files changed, 144 insertions(+), 168 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 36b03b121c..e326f15002 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -7,7 +7,6 @@ src/components/structures/RoomView.js
 src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
 src/components/structures/UploadBar.js
-src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
 src/components/views/dialogs/DeactivateAccountDialog.js
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 4c34cee853..1b5b28e1e3 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,206 +17,183 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
 import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
 import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
 
-export default createReactClass({
-    displayName: 'BaseAvatar',
+const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
+    const [imageUrls, setUrls] = useState([]);
+    const [urlsIndex, setIndex] = useState();
 
-    propTypes: {
-        name: PropTypes.string.isRequired, // The name (first initial used as default)
-        idName: PropTypes.string, // ID for generating hash colours
-        title: PropTypes.string, // onHover title text
-        url: PropTypes.string, // highest priority of them all, shortcut to set in urls[0]
-        urls: PropTypes.array, // [highest_priority, ... , lowest_priority]
-        width: PropTypes.number,
-        height: PropTypes.number,
-        // XXX resizeMethod not actually used.
-        resizeMethod: PropTypes.string,
-        defaultToInitialLetter: PropTypes.bool, // true to add default url
-        inputRef: PropTypes.oneOfType([
-            // Either a function
-            PropTypes.func,
-            // Or the instance of a DOM native element
-            PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
-        ]),
-    },
-
-    statics: {
-        contextType: MatrixClientContext,
-    },
-
-    getDefaultProps: function() {
-        return {
-            width: 40,
-            height: 40,
-            resizeMethod: 'crop',
-            defaultToInitialLetter: true,
-        };
-    },
-
-    getInitialState: function() {
-        return this._getState(this.props);
-    },
-
-    componentDidMount() {
-        this.unmounted = false;
-        this.context.on('sync', this.onClientSync);
-    },
-
-    componentWillUnmount() {
-        this.unmounted = true;
-        this.context.removeListener('sync', this.onClientSync);
-    },
-
-    componentWillReceiveProps: function(nextProps) {
-        // work out if we need to call setState (if the image URLs array has changed)
-        const newState = this._getState(nextProps);
-        const newImageUrls = newState.imageUrls;
-        const oldImageUrls = this.state.imageUrls;
-        if (newImageUrls.length !== oldImageUrls.length) {
-            this.setState(newState); // detected a new entry
-        } else {
-            // check each one to see if they are the same
-            for (let i = 0; i < newImageUrls.length; i++) {
-                if (oldImageUrls[i] !== newImageUrls[i]) {
-                    this.setState(newState); // detected a diff
-                    break;
-                }
-            }
+    const onError = () => {
+        const nextIndex = urlsIndex + 1;
+        if (nextIndex < imageUrls.length) {
+            // try the next one
+            setIndex(nextIndex);
         }
-    },
+    };
 
-    onClientSync: function(syncState, prevState) {
-        if (this.unmounted) return;
+    const defaultImageUrl = useMemo(() => AvatarLogic.defaultAvatarUrlForString(idName || name), [idName, name]);
 
-        // Consider the client reconnected if there is no error with syncing.
-        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
-        const reconnected = syncState !== "ERROR" && prevState !== syncState;
-        if (reconnected &&
-            // Did we fall back?
-            this.state.urlsIndex > 0
-        ) {
-            // Start from the highest priority URL again
-            this.setState({
-                urlsIndex: 0,
-            });
-        }
-    },
-
-    _getState: function(props) {
+    useEffect(() => {
         // work out the full set of urls to try to load. This is formed like so:
-        // imageUrls: [ props.url, props.urls, default image ]
+        // imageUrls: [ props.url, ...props.urls, default image ]
 
-        let urls = [];
+        let _urls = [];
         if (!SettingsStore.getValue("lowBandwidth")) {
-            urls = props.urls || [];
+            _urls = urls || [];
 
-            if (props.url) {
-                urls.unshift(props.url); // put in urls[0]
+            if (url) {
+                _urls.unshift(url); // put in urls[0]
             }
         }
 
-        let defaultImageUrl = null;
-        if (props.defaultToInitialLetter) {
-            defaultImageUrl = AvatarLogic.defaultAvatarUrlForString(
-                props.idName || props.name,
-            );
-            urls.push(defaultImageUrl); // lowest priority
+        if (defaultToInitialLetter) {
+            _urls.push(defaultImageUrl); // lowest priority
         }
 
         // deduplicate URLs
-        urls = Array.from(new Set(urls));
+        _urls = Array.from(new Set(_urls));
 
-        return {
-            imageUrls: urls,
-            defaultImageUrl: defaultImageUrl,
-            urlsIndex: 0,
-        };
-    },
+        setIndex(0);
+        setUrls(_urls);
+    }, [url, ...(urls || [])]); // eslint-disable-line react-hooks/exhaustive-deps
 
-    onError: function(ev) {
-        const nextIndex = this.state.urlsIndex + 1;
-        if (nextIndex < this.state.imageUrls.length) {
-            // try the next one
-            this.setState({
-                urlsIndex: nextIndex,
-            });
+    const cli = useContext(MatrixClientContext);
+    const onClientSync = useCallback((syncState, prevState) => {
+        // Consider the client reconnected if there is no error with syncing.
+        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        if (reconnected && urlsIndex > 0 ) { // Did we fall back?
+            // Start from the highest priority URL again
+            setIndex(0);
         }
-    },
+    }, [urlsIndex]);
+    useEventEmitter(cli, "sync", onClientSync);
 
-    render: function() {
-        const imageUrl = this.state.imageUrls[this.state.urlsIndex];
+    const imageUrl = imageUrls[urlsIndex];
+    return [imageUrl, imageUrl === defaultImageUrl, onError];
+};
 
-        const {
-            name, idName, title, url, urls, width, height, resizeMethod,
-            defaultToInitialLetter, onClick, inputRef,
-            ...otherProps
-        } = this.props;
+const BaseAvatar = (props) => {
+    const {
+        name,
+        idName,
+        title,
+        url,
+        urls,
+        width=40,
+        height=40,
+        resizeMethod="crop", // eslint-disable-line no-unused-vars
+        defaultToInitialLetter=true,
+        onClick,
+        inputRef,
+        ...otherProps
+    } = props;
 
-        if (imageUrl === this.state.defaultImageUrl) {
-            const initialLetter = AvatarLogic.getInitialLetter(name);
-            const textNode = (
-                <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: (width * 0.65) + "px",
+    const [imageUrl, isDefault, onError] = useImageUrl({url, urls, idName, name, defaultToInitialLetter});
+
+    if (isDefault) {
+        const initialLetter = AvatarLogic.getInitialLetter(name);
+        const textNode = (
+            <span
+                className="mx_BaseAvatar_initial"
+                aria-hidden="true"
+                style={{
+                    fontSize: (width * 0.65) + "px",
                     width: width + "px",
-                    lineHeight: height + "px" }}
-                >
-                    { initialLetter }
-                </span>
-            );
-            const imgNode = (
-                <img className="mx_BaseAvatar_image" src={imageUrl}
-                    alt="" title={title} onError={this.onError}
-                    width={width} height={height} aria-hidden="true" />
-            );
-            if (onClick != null) {
-                return (
-                    <AccessibleButton element='span' className="mx_BaseAvatar"
-                        onClick={onClick} inputRef={inputRef} {...otherProps}
-                    >
-                        { textNode }
-                        { imgNode }
-                    </AccessibleButton>
-                );
-            } else {
-                return (
-                    <span className="mx_BaseAvatar" ref={inputRef} {...otherProps}>
-                        { textNode }
-                        { imgNode }
-                    </span>
-                );
-            }
-        }
+                    lineHeight: height + "px",
+                }}
+            >
+                { initialLetter }
+            </span>
+        );
+        const imgNode = (
+            <img
+                className="mx_BaseAvatar_image"
+                src={imageUrl}
+                alt=""
+                title={title}
+                onError={onError}
+                width={width}
+                height={height}
+                aria-hidden="true" />
+        );
+
         if (onClick != null) {
             return (
                 <AccessibleButton
-                    className="mx_BaseAvatar mx_BaseAvatar_image"
-                    element='img'
-                    src={imageUrl}
+                    {...otherProps}
+                    element="span"
+                    className="mx_BaseAvatar"
                     onClick={onClick}
-                    onError={this.onError}
-                    width={width} height={height}
-                    title={title} alt=""
                     inputRef={inputRef}
-                    {...otherProps} />
+                >
+                    { textNode }
+                    { imgNode }
+                </AccessibleButton>
             );
         } else {
             return (
-                <img
-                    className="mx_BaseAvatar mx_BaseAvatar_image"
-                    src={imageUrl}
-                    onError={this.onError}
-                    width={width} height={height}
-                    title={title} alt=""
-                    ref={inputRef}
-                    {...otherProps} />
+                <span className="mx_BaseAvatar" ref={inputRef} {...otherProps}>
+                    { textNode }
+                    { imgNode }
+                </span>
             );
         }
-    },
-});
+    }
+
+    if (onClick != null) {
+        return (
+            <AccessibleButton
+                className="mx_BaseAvatar mx_BaseAvatar_image"
+                element='img'
+                src={imageUrl}
+                onClick={onClick}
+                onError={onError}
+                width={width} height={height}
+                title={title} alt=""
+                inputRef={inputRef}
+                {...otherProps} />
+        );
+    } else {
+        return (
+            <img
+                className="mx_BaseAvatar mx_BaseAvatar_image"
+                src={imageUrl}
+                onError={onError}
+                width={width} height={height}
+                title={title} alt=""
+                ref={inputRef}
+                {...otherProps} />
+        );
+    }
+};
+
+BaseAvatar.displayName = "BaseAvatar";
+
+BaseAvatar.propTypes = {
+    name: PropTypes.string.isRequired, // The name (first initial used as default)
+    idName: PropTypes.string, // ID for generating hash colours
+    title: PropTypes.string, // onHover title text
+    url: PropTypes.string, // highest priority of them all, shortcut to set in urls[0]
+    urls: PropTypes.array, // [highest_priority, ... , lowest_priority]
+    width: PropTypes.number,
+    height: PropTypes.number,
+    // XXX resizeMethod not actually used.
+    resizeMethod: PropTypes.string,
+    defaultToInitialLetter: PropTypes.bool, // true to add default url
+    onClick: PropTypes.func,
+    inputRef: PropTypes.oneOfType([
+        // Either a function
+        PropTypes.func,
+        // Or the instance of a DOM native element
+        PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+    ]),
+};
+
+export default BaseAvatar;

From 558ae1128b05962211d07d8c453e3d5ac5448397 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 13:01:36 +0100
Subject: [PATCH 1173/3235] use alt_aliases rather than aliases for the display
 alias

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

diff --git a/src/Rooms.js b/src/Rooms.js
index f65e0ff218..218e970f35 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -23,7 +23,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
  * of aliases. Otherwise return null;
  */
 export function getDisplayAliasForRoom(room) {
-    return room.getCanonicalAlias() || room.getAliases()[0];
+    return room.getCanonicalAlias() || room.getAltAliases()[0];
 }
 
 /**

From 8870da6c2403074b2d8f41875f1c5522ebdda194 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 12:50:18 +0100
Subject: [PATCH 1174/3235] Add alt_aliases to room completion candidates

but don't match on name otherwise you see multiple entries per room
when searching for a room name

Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
---
 src/autocomplete/RoomProvider.js | 41 +++++++++++++++++++-------------
 src/editor/autocomplete.js       |  2 +-
 src/editor/parts.js              |  8 +++----
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index fccf1e3524..1074197814 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -40,11 +40,19 @@ function score(query, space) {
     }
 }
 
+function matcherObject(room, displayedAlias, matchName = "") {
+    return {
+        room,
+        matchName,
+        displayedAlias,
+    };
+}
+
 export default class RoomProvider extends AutocompleteProvider {
     constructor() {
         super(ROOM_REGEX);
         this.matcher = new QueryMatcher([], {
-            keys: ['displayedAlias', 'name'],
+            keys: ['displayedAlias', 'matchName'],
         });
     }
 
@@ -56,16 +64,16 @@ export default class RoomProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection, force);
         if (command) {
             // the only reason we need to do this is because Fuse only matches on properties
-            let matcherObjects = client.getVisibleRooms().filter(
-                (room) => !!room && !!getDisplayAliasForRoom(room),
-            ).map((room) => {
-                return {
-                    room: room,
-                    name: room.name,
-                    displayedAlias: getDisplayAliasForRoom(room),
-                };
-            });
-
+            let matcherObjects = client.getVisibleRooms().reduce((aliases, room) => {
+                if (room.getCanonicalAlias()) {
+                    aliases = aliases.concat(matcherObject(room, room.getCanonicalAlias(), room.name));
+                }
+                if (room.getAltAliases().length) {
+                    const altAliases = room.getAltAliases().map(alias => matcherObject(room, alias));
+                    aliases = aliases.concat(altAliases);
+                }
+                return aliases;
+            }, []);
             // Filter out any matches where the user will have also autocompleted new rooms
             matcherObjects = matcherObjects.filter((r) => {
                 const tombstone = r.room.currentState.getStateEvents("m.room.tombstone", "");
@@ -84,16 +92,15 @@ export default class RoomProvider extends AutocompleteProvider {
             completions = _sortBy(completions, [
                 (c) => score(matchedString, c.displayedAlias),
                 (c) => c.displayedAlias.length,
-            ]).map((room) => {
-                const displayAlias = getDisplayAliasForRoom(room.room) || room.roomId;
+            completions = completions.map((room) => {
                 return {
-                    completion: displayAlias,
-                    completionId: displayAlias,
+                    completion: room.displayedAlias,
+                    completionId: room.room.roomId,
                     type: "room",
                     suffix: ' ',
-                    href: makeRoomPermalink(displayAlias),
+                    href: makeRoomPermalink(room.displayedAlias),
                     component: (
-                        <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={room.room} />} title={room.name} description={displayAlias} />
+                        <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={room.room} />} title={room.room.name} description={room.displayedAlias} />
                     ),
                     range,
                 };
diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index 1ead3aef07..fcde6e0ce4 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -102,7 +102,7 @@ export default class AutocompleteWrapperModel {
         const text = completion.completion;
         switch (completion.type) {
             case "room":
-                return [this._partCreator.roomPill(completionId), this._partCreator.plain(completion.suffix)];
+                return [this._partCreator.roomPill(text, completionId), this._partCreator.plain(completion.suffix)];
             case "at-room":
                 return [this._partCreator.atRoomPill(completionId), this._partCreator.plain(completion.suffix)];
             case "user":
diff --git a/src/editor/parts.js b/src/editor/parts.js
index 652342405f..083ee38478 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -422,14 +422,14 @@ export class PartCreator {
         return new PillCandidatePart(text, this._autoCompleteCreator);
     }
 
-    roomPill(alias) {
+    roomPill(alias, roomId) {
         let room;
-        if (alias[0] === '#') {
+        if (roomId || alias[0] !== "#") {
+            room = this._client.getRoom(roomId || alias);
+        } else {
             room = this._client.getRooms().find((r) => {
                 return r.getCanonicalAlias() === alias || r.getAliases().includes(alias);
             });
-        } else {
-            room = this._client.getRoom(alias);
         }
         return new RoomPillPart(alias, room);
     }

From 16815a752b569db1f24d1ff2d92fc2da5f6a6572 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 12:58:41 +0100
Subject: [PATCH 1175/3235] use alt_aliases instead of aliases to match a pill
 to a room

when deserializing a pill
---
 src/editor/parts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/editor/parts.js b/src/editor/parts.js
index 083ee38478..0e39e66bad 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -428,7 +428,8 @@ export class PartCreator {
             room = this._client.getRoom(roomId || alias);
         } else {
             room = this._client.getRooms().find((r) => {
-                return r.getCanonicalAlias() === alias || r.getAliases().includes(alias);
+                return r.getCanonicalAlias() === alias ||
+                       r.getAltAliases().includes(alias);
             });
         }
         return new RoomPillPart(alias, room);

From f6313b51e61dd230fd3c895dd5859150f32d719c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 13:00:09 +0100
Subject: [PATCH 1176/3235] also look in alt_aliases to match a pill to a room

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

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index cd7277cdeb..6810e776fe 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -129,7 +129,7 @@ const Pill = createReactClass({
                 const localRoom = resourceId[0] === '#' ?
                     MatrixClientPeg.get().getRooms().find((r) => {
                         return r.getCanonicalAlias() === resourceId ||
-                               r.getAliases().includes(resourceId);
+                               r.getAltAliases().includes(resourceId);
                     }) : MatrixClientPeg.get().getRoom(resourceId);
                 room = localRoom;
                 if (!localRoom) {

From 4219d2fcf6f31c919ad4a37d1f41d1739858b6ac Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 13:00:32 +0100
Subject: [PATCH 1177/3235] style a room pill even if we don't find the room

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

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 6810e776fe..68e4e29337 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -241,8 +241,8 @@ const Pill = createReactClass({
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }
-                    pillClass = 'mx_RoomPill';
                 }
+                pillClass = 'mx_RoomPill';
             }
                 break;
             case Pill.TYPE_GROUP_MENTION: {

From 3c3839f8634f99fe17bd966753c55159e761abb7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 13:00:54 +0100
Subject: [PATCH 1178/3235] show a pill as a moderated alias (canonical or alt)
 if available

otherwise, display as the label in the link
---
 src/components/views/elements/Pill.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 68e4e29337..34c1fd4c32 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -237,7 +237,15 @@ const Pill = createReactClass({
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
-                    linkText = (room ? getDisplayAliasForRoom(room) : null) || resource;
+                    const isModeratedAlias = room.getCanonicalAlias() === resource ||
+                        room.getAltAliases().includes(resource);
+                    if (!isModeratedAlias) {
+                        linkText = getDisplayAliasForRoom(room);
+                    }
+                    // if there are no moderated aliases, stick to resource
+                    if (!linkText) {
+                        linkText = resource;
+                    }
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }

From 2b1964878681fae72a0382f11000a807da76ed2c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 13:35:14 +0100
Subject: [PATCH 1179/3235] fix cp error and lint

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

diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 1074197814..a0f670e769 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -23,7 +23,6 @@ import AutocompleteProvider from './AutocompleteProvider';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
-import {getDisplayAliasForRoom} from '../Rooms';
 import * as sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../utils/permalinks/Permalinks";
@@ -92,6 +91,7 @@ export default class RoomProvider extends AutocompleteProvider {
             completions = _sortBy(completions, [
                 (c) => score(matchedString, c.displayedAlias),
                 (c) => c.displayedAlias.length,
+            ]);
             completions = completions.map((room) => {
                 return {
                     completion: room.displayedAlias,

From fada013f9ecfbf47a002df8671458cd0d2871722 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 14:06:57 +0100
Subject: [PATCH 1180/3235] this isn't doing anything because we don't have a
 room when the alias is not moderated

---
 src/components/views/elements/Pill.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 34c1fd4c32..ff455755e0 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -237,15 +237,7 @@ const Pill = createReactClass({
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
-                    const isModeratedAlias = room.getCanonicalAlias() === resource ||
-                        room.getAltAliases().includes(resource);
-                    if (!isModeratedAlias) {
-                        linkText = getDisplayAliasForRoom(room);
-                    }
-                    // if there are no moderated aliases, stick to resource
-                    if (!linkText) {
-                        linkText = resource;
-                    }
+                    linkText = resource;
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }

From 07d24038a30ad5700a492b0ccccc7db22a5fbf49 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 14:11:30 +0100
Subject: [PATCH 1181/3235] fix lint

---
 src/components/views/elements/Pill.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index ff455755e0..5f143a06a6 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -23,7 +23,6 @@ import classNames from 'classnames';
 import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import { getDisplayAliasForRoom } from '../../../Rooms';
 import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";

From cda281044ddd61eea53401856a2fd3e92bdea242 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 21 Feb 2020 14:18:28 +0100
Subject: [PATCH 1182/3235] ignore node_modules in e2e tests

---
 .eslintignore                             | 3 +++
 .eslintignore.errorfiles                  | 4 ++++
 scripts/generate-eslint-error-ignore-file | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index c4c7fe5067..c4f7298047 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,4 @@
 src/component-index.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/riot/
+test/end-to-end-tests/synapse/
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 36b03b121c..ffd398cb14 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -61,3 +61,7 @@ test/mock-clock.js
 test/notifications/ContentRules-test.js
 test/notifications/PushRuleVectorState-test.js
 test/stores/RoomViewStore-test.js
+src/component-index.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/riot/
+test/end-to-end-tests/synapse/
diff --git a/scripts/generate-eslint-error-ignore-file b/scripts/generate-eslint-error-ignore-file
index 3a635f5a7d..54aacfc9fa 100755
--- a/scripts/generate-eslint-error-ignore-file
+++ b/scripts/generate-eslint-error-ignore-file
@@ -14,8 +14,10 @@ echo "generating $out"
 # autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
 
 EOF
-    
-    ./node_modules/.bin/eslint --no-ignore -f json src test |
+
+    ./node_modules/.bin/eslint -f json src test |
         jq -r '.[] | select((.errorCount + .warningCount) > 0) | .filePath' |
         sed -e 's/.*matrix-react-sdk\///';
 } > "$out"
+# also append rules from eslintignore file
+cat .eslintignore >> $out

From d4972e91a3c7ea04a2a6bb3e8f1d339fcfd80a35 Mon Sep 17 00:00:00 2001
From: Miren <miren.berasategi@deusto.es>
Date: Thu, 20 Feb 2020 19:00:43 +0000
Subject: [PATCH 1183/3235] Translated using Weblate (Basque)

Currently translated at 97.9% (2082 of 2126 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 691ff0f9f5..cea8f63362 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2100,5 +2100,6 @@
     "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Erakutsi saioak</showSessionsText>, <sendAnywayText>bidali edonola ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
     "The information being sent to us to help make Riot better includes:": "Riot hobetzeko bidaltzen zaigun informazioa honakoa da, besteren artean:",
     "Verify this session by completing one of the following:": "Egiaztatu saio hau hauetako bat osatuz:",
-    "or": "ala"
+    "or": "ala",
+    "The version of Riot": "Riot bertsioa"
 }

From 7dac6b9b6502877eb53ad705ed166c25f0e003da Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 20 Feb 2020 19:01:23 +0000
Subject: [PATCH 1184/3235] Translated using Weblate (Basque)

Currently translated at 97.9% (2082 of 2126 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 cea8f63362..91c94865b3 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2101,5 +2101,12 @@
     "The information being sent to us to help make Riot better includes:": "Riot hobetzeko bidaltzen zaigun informazioa honakoa da, besteren artean:",
     "Verify this session by completing one of the following:": "Egiaztatu saio hau hauetako bat osatuz:",
     "or": "ala",
-    "The version of Riot": "Riot bertsioa"
+    "The version of Riot": "Riot bertsioa",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Sarrera mekanismo nagusia ukimena den gailu bat erabiltzen duzun",
+    "Whether you're using Riot as an installed Progressive Web App": "Riot instalatutako aplikazio progresibo gisa erabiltzen duzun",
+    "Your user agent": "Zure erabiltzaile-agentea",
+    "Show typing notifications": "Erakutsi idazketa jakinarazpenak",
+    "Scan this unique code": "Eskaneatu kode bakan hau",
+    "Compare unique emoji": "Konparatu emoji bakana",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Konparatu emoji sorta bakana gailuek kamerarik ez badute"
 }

From c1f40fa4aba1781b982a61d2b0ac370e840257bb Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <20200217translateriot@remi.im>
Date: Fri, 21 Feb 2020 13:31:11 +0000
Subject: [PATCH 1185/3235] Translated using Weblate (Dutch)

Currently translated at 88.3% (1877 of 2126 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 22af1bc727..e57d28d5e5 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1862,5 +1862,36 @@
     "Recent rooms": "Actuele gesprekken",
     "Direct Messages": "Tweegesprekken",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aanstaan om te kunnen zoeken in versleutelde gesprekken.",
-    "Indexed rooms:": "Geïndexeerde gesprekken:"
+    "Indexed rooms:": "Geïndexeerde gesprekken:",
+    "Cross-signing and secret storage are enabled.": "Cross-signing en sleutelopslag zijn ingeschakeld.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een cross-signing identiteit in de sleutelopslag, maar deze is nog niet vertrouwd door de huidige sessie.",
+    "Cross-signing and secret storage are not yet set up.": "Cross-signing en sleutelopslag zijn nog niet ingesteld.",
+    "Bootstrap cross-signing and secret storage": "Cross-signing en sleutelopslag opzetten",
+    "Reset cross-signing and secret storage": "Cross-signing en sleutelopslag resetten",
+    "Cross-signing public keys:": "Cross-signing publieke sleutels:",
+    "Cross-signing private keys:": "Cross-signing privésleutels:",
+    "in secret storage": "in de sleutelopslag",
+    "Secret storage public key:": "Sleutelopslag publieke sleutel:",
+    "in account data": "in accountinformatie",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten beveiligd op om ze weer te geven in de zoekresultaten, door gebruik te maken van ",
+    " to store messages from ": " om berichten op te slaan van ",
+    "Manage": "Beheren",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u uitlogt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
+    "Connect this session to Key Backup": "Verbind deze sessie met de sleutelback-up",
+    "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>correcte</validity> ondertekening van deze gebruiker",
+    "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>incorrecte</validity> ondertekening van deze gebruiker",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van <verify>onbekende</verify> gebruiker met ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "De back-up heeft een ondertekening van <verify>onbekende</verify> sessie met ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "De back-up heeft een <validity>correcte</validity> ondertekening van deze sessie",
+    "Backup has an <validity>invalid</validity> signature from this session": "De back-up heeft een <validity>incorrecte</validity> ondertekening van deze sessie",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>correcte</validity> ondertekening van <verify>geverifieerde</verify> sessie <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>correcte</validity> ondertekening van <verify>ongeverifieerde</verify> sessie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>incorrecte</validity> ondertekening van <verify>geverifieerde</verify> sessie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>incorrecte</validity> ondertekening van <verify>ongeverifieerde</verify> sessie <device></device>",
+    "Backup is not signed by any of your sessions": "De back-up is door geen van uw sessies ondertekend",
+    "This backup is trusted because it has been restored on this session": "Deze back-up is vertrouwd omdat het is hersteld naar deze sessie",
+    "Backup key stored: ": "Back-upsleutel opgeslagen: ",
+    "Your keys are <b>not being backed up from this session</b>.": "Uw sleutels worden <b>niet geback-upt van deze sessie</b>.",
+    "Clear notifications": "Notificaties wissen",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppeld. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is het offline."
 }

From e7996915731ea47b565d42f35729948bd920265e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Feb 2020 14:14:24 +0000
Subject: [PATCH 1186/3235] Apply null-guard to room pills for when we can't
 fetch the room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Avatar.js       | 2 ++
 src/editor/parts.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 5a330c31e9..217b196348 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -102,6 +102,8 @@ export function getInitialLetter(name) {
 }
 
 export function avatarUrlForRoom(room, width, height, resizeMethod) {
+    if (!room) return null; // null-guard
+
     const explicitRoomAvatar = room.getAvatarUrl(
         MatrixClientPeg.get().getHomeserverUrl(),
         width,
diff --git a/src/editor/parts.js b/src/editor/parts.js
index 652342405f..8bb4f8633e 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -254,8 +254,8 @@ class RoomPillPart extends PillPart {
         let initialLetter = "";
         let avatarUrl = Avatar.avatarUrlForRoom(this._room, 16 * window.devicePixelRatio, 16 * window.devicePixelRatio);
         if (!avatarUrl) {
-            initialLetter = Avatar.getInitialLetter(this._room.name);
-            avatarUrl = `../../${Avatar.defaultAvatarUrlForString(this._room.roomId)}`;
+            initialLetter = Avatar.getInitialLetter(this._room ? this._room.name : this.resourceId);
+            avatarUrl = `../../${Avatar.defaultAvatarUrlForString(this._room ? this._room.roomId : this.resourceId)}`;
         }
         this._setAvatarVars(node, avatarUrl, initialLetter);
     }

From b77c2df2be1569b08b44a8d6968bc1bdcbd19c92 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Feb 2020 14:40:42 +0000
Subject: [PATCH 1187/3235] Fix theme being overridden to light even after
 login is completed

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 1 +
 src/theme.js                            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 229c741310..cdd4625dbf 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -674,6 +674,7 @@ export default createReactClass({
                     this.state.view !== VIEWS.E2E_SETUP
                 ) {
                     this._onLoggedIn();
+                    ThemeController.isLogin = false;
                 }
                 break;
             case 'on_client_not_viable':
diff --git a/src/theme.js b/src/theme.js
index 774148dacd..442a89e25f 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -70,7 +70,7 @@ export class ThemeWatcher {
         }
     };
 
-    // XXX: forceTheme param aded here as local echo appears to be unreliable
+    // XXX: forceTheme param added here as local echo appears to be unreliable
     // https://github.com/vector-im/riot-web/issues/11443
     recheck(forceTheme) {
         const oldTheme = this._currentTheme;

From 4ed4d91b48450f3721a7334588429c65cd1e6045 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Feb 2020 14:54:56 +0000
Subject: [PATCH 1188/3235] move to a more reusable code path

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index cdd4625dbf..de916ad7aa 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -674,7 +674,6 @@ export default createReactClass({
                     this.state.view !== VIEWS.E2E_SETUP
                 ) {
                     this._onLoggedIn();
-                    ThemeController.isLogin = false;
                 }
                 break;
             case 'on_client_not_viable':
@@ -1176,6 +1175,7 @@ export default createReactClass({
      * Called when a new logged in session has started
      */
     _onLoggedIn: async function() {
+        ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
         if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);

From 953af6f036d62695d4c5a0a9443677fcc0a85583 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Fri, 21 Feb 2020 10:19:53 -0500
Subject: [PATCH 1189/3235] add device and cross-signing public keys to
 rageshake info (#4097)

---
 src/rageshake/submit-rageshake.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index b17dc62168..53e9f24788 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -96,6 +96,13 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         body.append('device_id', client.deviceId);
     }
 
+    const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+    if (client.getDeviceCurve25519Key) {
+        keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+    }
+    body.append('device_keys', keys.join(', '));
+    body.append('cross_signing_key', client.getCrossSigningId());
+
     if (opts.label) {
         body.append('label', opts.label);
     }

From 72789897a0780f3ca2f2bdc7be7b2f3760325456 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 21 Feb 2020 17:15:53 +0000
Subject: [PATCH 1190/3235] Quick n dirty verificatio request viewer in
 devtools

---
 res/css/views/dialogs/_DevtoolsDialog.scss    | 34 ++++++++
 .../views/dialogs/DevtoolsDialog.js           | 82 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 9d58c999c3..22975f0c52 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -189,3 +189,37 @@ limitations under the License.
         }
     }
 }
+
+.mx_DevTools_VerificationRequest {
+    border: 1px solid #cccccc;
+    border-radius: 3px;
+    padding: 1px 5px;
+    margin-bottom: 6px;
+    font-family: "Inconsolata", courier;
+
+    dl {
+        display: grid;
+        grid-template-columns: max-content auto;
+        margin: 0;
+    }
+
+    dd {
+        grid-column-start: 2;
+    }
+
+    dd:empty {
+        color: #666666;
+        &::after {
+            content: "(empty)";
+        }
+    }
+
+    dt {
+        font-weight: bold;
+        grid-column-start: 1;
+    }
+
+    dt::after {
+        content: ":";
+    }
+}
\ No newline at end of file
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 34b2f5a52b..ade23c90f1 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {useState, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
@@ -23,6 +23,15 @@ import { Room } from "matrix-js-sdk";
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
+import {
+    PHASE_UNSENT,
+    PHASE_REQUESTED,
+    PHASE_READY,
+    PHASE_DONE,
+    PHASE_STARTED,
+    PHASE_CANCELLED,
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"
+
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
 
@@ -605,12 +614,83 @@ class ServersInRoomList extends React.PureComponent {
     }
 }
 
+const PHASE_MAP = {
+    [PHASE_UNSENT]: "unsent",
+    [PHASE_REQUESTED]: "requested",
+    [PHASE_READY]: "ready",
+    [PHASE_DONE]: "done",
+    [PHASE_STARTED]: "started",
+    [PHASE_CANCELLED]: "cancelled",
+}
+
+function VerificationRequest({txnId, request}) {
+    const [, updateState] = useState();
+    const [timeout, setTimeout] = useState(request.timeout);
+
+    /* Re-render if something changes state */
+    useEffect(() => {
+        request.on("change", updateState);
+        return () => request.off("change", updateState);
+    }, []);
+
+    /* Keep re-rendering if there's a timeout */
+    useEffect(() => {
+        if (timeout == 0) return;
+
+        const id = setInterval(() => {
+           setTimeout(request.timeout);
+        }, 500);
+
+        return () => { clearInterval(id); }
+    }, []);
+
+    return (<div className="mx_DevTools_VerificationRequest">
+        <dl>
+            <dt>Transaction</dt>
+            <dd>{txnId}</dd>
+            <dt>Phase</dt>
+            <dd>{PHASE_MAP[request.phase] || request.phase}</dd>
+            <dt>Timeout</dt>
+            <dd>{Math.floor(timeout / 1000)}</dd>
+            <dt>Methods</dt>
+            <dd>{request.methods && request.methods.join(", ")}</dd>
+            <dt>requestingUserId</dt>
+            <dd>{request.requestingUserId}</dd>
+        </dl>
+    </div>);
+}
+
+class VerificationExplorer extends React.PureComponent {
+    static getLabel() {
+        return _t("Verification Requests");
+    }
+
+    /* Ensure this.context is the cli */
+    static contextType = MatrixClientContext;
+
+    render() {
+        const cli = this.context;
+        const room = this.props.room;
+        const inRoomChannel = cli._crypto._inRoomVerificationRequests;
+        const inRoomRequests = (inRoomChannel._requestsByRoomId || new Map()).get(room.roomId) || new Map();
+
+        return (<div>
+            <div className="mx_Dialog_content">
+                {Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
+                    <VerificationRequest txnId={txnId} request={request} key={txnId}/>
+                )}
+            </div>
+        </div>);
+    }
+}
+
 const Entries = [
     SendCustomEvent,
     RoomStateExplorer,
     SendAccountData,
     AccountDataExplorer,
     ServersInRoomList,
+    VerificationExplorer,
 ];
 
 export default class DevtoolsDialog extends React.PureComponent {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b55b28ce97..82eb660d9d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1524,6 +1524,7 @@
     "Explore Room State": "Explore Room State",
     "Explore Account Data": "Explore Account Data",
     "View Servers in Room": "View Servers in Room",
+    "Verification Requests": "Verification Requests",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
     "An error has occurred.": "An error has occurred.",

From 2e18c3c6154ea5493f3dfb0a41c4a9132a31ec27 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Feb 2020 17:21:30 +0000
Subject: [PATCH 1191/3235] Remove buildkite pipeline

Now moved to the pipelines repo
---
 .buildkite/pipeline.yaml | 119 ---------------------------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 .buildkite/pipeline.yaml

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
deleted file mode 100644
index 4bc69a76bd..0000000000
--- a/.buildkite/pipeline.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-steps:
-  - label: ":eslint: JS Lint"
-    command:
-      # We fetch the develop js-sdk to get our latest eslint rules
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh --ignore-scripts"
-      - "echo '+++ Lint'"
-      - "yarn lint:js"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-
-  - label: ":eslint: TS Lint"
-    command:
-      - "echo '--- Install'"
-      - "yarn install --ignore-scripts"
-      - "echo '+++ Lint'"
-      - "yarn lint:ts"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-
-  - label: ":eslint: Types Lint"
-    command:
-      - "echo '--- Install'"
-      - "yarn install --ignore-scripts"
-      - "echo '+++ Lint'"
-      - "yarn lint:types"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-  - label: ":stylelint: Style Lint"
-    command:
-      - "echo '--- Install'"
-      - "yarn install --ignore-scripts"
-      - "yarn lint:style"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-
-  - label: ":jest: Tests"
-    agents:
-      # We use a medium sized instance instead of the normal small ones because
-      # webpack loves to gorge itself on resources.
-      queue: "medium"
-    command:
-      - "echo '--- Install js-sdk'"
-      # We don't use the babel-ed output for anything so we can --ignore-scripts
-      # to save transpiling the files. We run the transpile step explicitly in
-      # the 'build' job.
-      - "./scripts/ci/install-deps.sh --ignore-scripts"
-      - "yarn run reskindex"
-      - "echo '+++ Running Tests'"
-      - "yarn test"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-
-  - label: "🛠 Build"
-    command:
-      - "echo '+++ Install & Build'"
-      - "yarn install"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:12"
-
-  - label: ":chains: End-to-End Tests"
-    agents:
-      # We use a xlarge sized instance instead of the normal small ones because
-      # e2e tests otherwise take +-8min
-      queue: "xlarge"
-    command:
-      - "echo '--- Install js-sdk'"
-      - "./scripts/ci/install-deps.sh --ignore-scripts"
-      - "echo '+++ Running Tests'"
-      - "./scripts/ci/end-to-end-tests.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "matrixdotorg/riotweb-ci-e2etests-env:latest"
-          propagate-environment: true
-          workdir: "/workdir/matrix-react-sdk"
-    retry:
-      automatic:
-        - exit_status: 1 # retry end-to-end tests once as Puppeteer sometimes fails
-          limit: 1
-
-  - label: "🔧 Riot Tests"
-    agents:
-      # We use a medium sized instance instead of the normal small ones because
-      # webpack loves to gorge itself on resources.
-      queue: "medium"
-    command:
-      - "echo '+++ Running Tests'"
-      - "./scripts/ci/riot-unit-tests.sh"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"
-          propagate-environment: true
-          workdir: "/workdir/matrix-react-sdk"
-
-  - label: "🌐 i18n"
-    command:
-      - "echo '--- Fetching Dependencies'"
-      - "yarn install --ignore-scripts"
-      - "echo '+++ Testing i18n output'"
-      - "yarn diff-i18n"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"
-
-  - wait
-
-  - label: "🐴 Trigger riot-web"
-    trigger: "riot-web"
-    branches: "develop"
-    build:
-        branch: "develop"
-        message: "[react-sdk] ${BUILDKITE_MESSAGE}"
-    async: true

From dc6a4854ceb316627863d1ca825d3a5a1de1bd2c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 21 Feb 2020 18:50:42 +0000
Subject: [PATCH 1192/3235] Add shortcuts for beginning / end of composer

This adds Ctrl/Command+Home/End shortcuts for jumping to the start and end of
the composer contents.

Fixes https://github.com/vector-im/riot-web/issues/12438
---
 src/components/views/rooms/BasicMessageComposer.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index a2a01f4444..e478dc590d 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -392,6 +392,20 @@ export default class BasicMessageEditor extends React.Component {
         } else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) {
             this._insertText("\n");
             handled = true;
+        // move selection to start of composer
+        } else if (modKey && event.key === Key.HOME) {
+            setSelection(this._editorRef, model, {
+                index: 0,
+                offset: 0,
+            });
+            handled = true;
+        // move selection to end of composer
+        } else if (modKey && event.key === Key.END) {
+            setSelection(this._editorRef, model, {
+                index: model.parts.length - 1,
+                offset: model.parts[model.parts.length - 1].text.length,
+            });
+            handled = true;
         // autocomplete or enter to send below shouldn't have any modifier keys pressed.
         } else {
             const metaOrAltPressed = event.metaKey || event.altKey;

From c906b9eccf08417aeda7e0f0e525f872c727e6c9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 21 Feb 2020 13:26:37 -0700
Subject: [PATCH 1193/3235] Filter out empty strings when pasting IDs into the
 invite dialog

Fixes https://github.com/vector-im/riot-web/issues/12459
---
 src/components/views/dialogs/InviteDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 5c222182de..587fb9e454 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -801,7 +801,7 @@ export default class InviteDialog extends React.PureComponent {
         ];
         const toAdd = [];
         const failed = [];
-        const potentialAddresses = text.split(/[\s,]+/);
+        const potentialAddresses = text.split(/[\s,]+/).map(p => p.trim()).filter(p => !!p); // filter empty strings
         for (const address of potentialAddresses) {
             const member = possibleMembers.find(m => m.userId === address);
             if (member) {

From d3367834d0b2bbec83395059f7cf4804579dd89d Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 21 Feb 2020 21:53:51 -0600
Subject: [PATCH 1194/3235] Fix redo keyboard shortcut on macOS

I added the correct macOS shortcut for redo which is Cmd+Shift+Z. I had to reorder the if statement so redo is checked first, otherwise it would detect the undo first and never check that I was actually trying to redo.

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 .../views/rooms/BasicMessageComposer.js       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index a2a01f4444..2b0f9a7554 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -370,6 +370,17 @@ export default class BasicMessageEditor extends React.Component {
         } else if (modKey && event.key === Key.GREATER_THAN) {
             this._onFormatAction("quote");
             handled = true;
+        // redo
+        } else if ((modKey && event.key === Key.Y) ||
+                  (IS_MAC && event.shiftKey && event.key === Key.Z)) {
+            debugger;
+            if (this.historyManager.canRedo()) {
+                const {parts, caret} = this.historyManager.redo();
+                // pass matching inputType so historyManager doesn't push echo
+                // when invoked from rerender callback.
+                model.reset(parts, caret, "historyRedo");
+            }
+            handled = true;
         // undo
         } else if (modKey && event.key === Key.Z) {
             if (this.historyManager.canUndo()) {
@@ -379,15 +390,6 @@ export default class BasicMessageEditor extends React.Component {
                 model.reset(parts, caret, "historyUndo");
             }
             handled = true;
-        // redo
-        } else if (modKey && event.key === Key.Y) {
-            if (this.historyManager.canRedo()) {
-                const {parts, caret} = this.historyManager.redo();
-                // pass matching inputType so historyManager doesn't push echo
-                // when invoked from rerender callback.
-                model.reset(parts, caret, "historyRedo");
-            }
-            handled = true;
         // insert newline on Shift+Enter
         } else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) {
             this._insertText("\n");

From 42c6818f952af0dbb159eb56d41dc621d6ca5e67 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 21 Feb 2020 21:59:43 -0600
Subject: [PATCH 1195/3235] Remove debugger;

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/rooms/BasicMessageComposer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 2b0f9a7554..dd6addd062 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -373,7 +373,6 @@ export default class BasicMessageEditor extends React.Component {
         // redo
         } else if ((modKey && event.key === Key.Y) ||
                   (IS_MAC && event.shiftKey && event.key === Key.Z)) {
-            debugger;
             if (this.historyManager.canRedo()) {
                 const {parts, caret} = this.historyManager.redo();
                 // pass matching inputType so historyManager doesn't push echo

From 7696f704b267839f84caf4c26106107effda94ec Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 22 Feb 2020 23:51:30 +0000
Subject: [PATCH 1196/3235] Fix two big DOM leaks which were locking Chrome
 solid.

pillifyLinks leaked Pill components, which if they contained a BaseAvatar
would leak a whole DOM tree retained by the BaseAvatar's onClientSync
event listener.  This tracks the Pill containers so they can be unmounted
via unmountPills.

BasicMessageComposer set an event listener on selectionchange in onFocus
which leaked if onBlur wasn't called.  This removes it in unmount.

We've also seen Velociraptor retaining full DOM trees from RRs, which
this doesn't address as the leak is probably within Velocity, and the plan
is to replace it with CSS animations.

Should fix https://github.com/vector-im/riot-web/issues/12417
---
 .../views/messages/EditHistoryMessage.js      |  6 ++-
 src/components/views/messages/TextualBody.js  |  6 ++-
 .../views/rooms/BasicMessageComposer.js       |  1 +
 src/utils/pillify.js                          | 38 +++++++++++++++++--
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index a28f8e27d8..679a8f7471 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -20,7 +20,7 @@ import * as HtmlUtils from '../../../HtmlUtils';
 import { editBodyDiffToHtml } from '../../../utils/MessageDiffUtils';
 import {formatTime} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
-import {pillifyLinks} from '../../../utils/pillify';
+import {pillifyLinks, unmountPills} from '../../../utils/pillify';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
@@ -53,6 +53,7 @@ export default class EditHistoryMessage extends React.PureComponent {
         this.state = {canRedact, sendStatus: event.getAssociatedStatus()};
 
         this._content = createRef();
+        this._pills = [];
     }
 
     _onAssociatedStatusChanged = () => {
@@ -81,7 +82,7 @@ export default class EditHistoryMessage extends React.PureComponent {
     pillifyLinks() {
         // not present for redacted events
         if (this._content.current) {
-            pillifyLinks(this._content.current.children, this.props.mxEvent);
+            pillifyLinks(this._content.current.children, this.props.mxEvent, this._pills);
         }
     }
 
@@ -90,6 +91,7 @@ export default class EditHistoryMessage extends React.PureComponent {
     }
 
     componentWillUnmount() {
+        unmountPills(this._pills);
         const event = this.props.mxEvent;
         if (event.localRedactionEvent()) {
             event.localRedactionEvent().off("status", this._onAssociatedStatusChanged);
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index e2b6bec3f5..d74170919e 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -30,7 +30,7 @@ import { _t } from '../../../languageHandler';
 import * as ContextMenu from '../../structures/ContextMenu';
 import SettingsStore from "../../../settings/SettingsStore";
 import ReplyThread from "../elements/ReplyThread";
-import {pillifyLinks} from '../../../utils/pillify';
+import {pillifyLinks, unmountPills} from '../../../utils/pillify';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
 import {toRightOf} from "../../structures/ContextMenu";
@@ -92,6 +92,7 @@ export default createReactClass({
 
     componentDidMount: function() {
         this._unmounted = false;
+        this._pills = [];
         if (!this.props.editState) {
             this._applyFormatting();
         }
@@ -103,7 +104,7 @@ export default createReactClass({
         // pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
         // are still sent as plaintext URLs. If these are ever pillified in the composer,
         // we should be pillify them here by doing the linkifying BEFORE the pillifying.
-        pillifyLinks([this._content.current], this.props.mxEvent);
+        pillifyLinks([this._content.current], this.props.mxEvent, this._pills);
         HtmlUtils.linkifyElement(this._content.current);
         this.calculateUrlPreview();
 
@@ -146,6 +147,7 @@ export default createReactClass({
 
     componentWillUnmount: function() {
         this._unmounted = true;
+        unmountPills(this._pills);
     },
 
     shouldComponentUpdate: function(nextProps, nextState) {
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index a2a01f4444..5cc51ee626 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -490,6 +490,7 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     componentWillUnmount() {
+        document.removeEventListener("selectionchange", this._onSelectionChange);
         this._editorRef.removeEventListener("input", this._onInput, true);
         this._editorRef.removeEventListener("compositionstart", this._onCompositionStart, true);
         this._editorRef.removeEventListener("compositionend", this._onCompositionEnd, true);
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index 24cc8a3c67..f708ab7770 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,20 @@ import SettingsStore from "../settings/SettingsStore";
 import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
 import * as sdk from '../index';
 
-export function pillifyLinks(nodes, mxEvent) {
+/**
+ * Recurses depth-first through a DOM tree, converting matrix.to links
+ * into pills based on the context of a given room.  Returns a list of
+ * the resulting React nodes so they can be unmounted rather than leaking.
+ *
+ * @param {Node[]} nodes - a list of sibling DOM nodes to traverse to try
+ *   to turn into pills.
+ * @param {MatrixEvent} mxEvent - the matrix event which the DOM nodes are
+ *   part of representing.
+ * @param {Node[]} pills: an accumulator of the DOM nodes which contain
+ *   React components which have been mounted as part of this.
+ *   The initial caller should pass in an empty array to seed the accumulator.
+ */
+export function pillifyLinks(nodes, mxEvent, pills) {
     const room = MatrixClientPeg.get().getRoom(mxEvent.getRoomId());
     const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
     let node = nodes[0];
@@ -45,6 +58,7 @@ export function pillifyLinks(nodes, mxEvent) {
 
                 ReactDOM.render(pill, pillContainer);
                 node.parentNode.replaceChild(pillContainer, node);
+                pills.push(pillContainer);
                 // Pills within pills aren't going to go well, so move on
                 pillified = true;
 
@@ -102,6 +116,7 @@ export function pillifyLinks(nodes, mxEvent) {
 
                         ReactDOM.render(pill, pillContainer);
                         roomNotifTextNode.parentNode.replaceChild(pillContainer, roomNotifTextNode);
+                        pills.push(pillContainer);
                     }
                     // Nothing else to do for a text node (and we don't need to advance
                     // the loop pointer because we did it above)
@@ -111,9 +126,26 @@ export function pillifyLinks(nodes, mxEvent) {
         }
 
         if (node.childNodes && node.childNodes.length && !pillified) {
-            pillifyLinks(node.childNodes, mxEvent);
+            pillifyLinks(node.childNodes, mxEvent, pills);
         }
 
         node = node.nextSibling;
     }
 }
+
+/**
+ * Unmount all the pill containers from React created by pillifyLinks.
+ *
+ * It's critical to call this after pillifyLinks, otherwise
+ * Pills will leak, leaking entire DOM trees via the event
+ * emitter on BaseAvatar as per
+ * https://github.com/vector-im/riot-web/issues/12417
+ *
+ * @param {Node[]} pills - array of pill containers whose React
+ *   components should be unmounted.
+ */
+export function unmountPills(pills) {
+    for (const pillContainer of pills) {
+        ReactDOM.unmountComponentAtNode(pillContainer);
+    }
+}

From ff4c275b9a27c89f047a733e3675e01ce8b87286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Sat, 22 Feb 2020 16:20:11 +0000
Subject: [PATCH 1197/3235] Translated using Weblate (Czech)

Currently translated at 100.0% (2126 of 2126 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 34d646e0a4..1ef1979a9e 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1865,7 +1865,7 @@
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V místnosti jsou neověřené relace: pokud budete pokračovat bez ověření, bude možné váš hovor odposlouchávat.",
     "Verify this session": "Ověřit tuto relaci",
     "Encryption upgrade available": "Je dostupná aktualizace šifrování",
-    "Set up encryption": "Nastavit šifrování",
+    "Set up encryption": "Připravit šifrování",
     "Unverified session": "Neověřená relace",
     "Verifies a user, session, and pubkey tuple": "Ověří uživatele, relaci a veřejné klíče",
     "Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
@@ -2102,5 +2102,49 @@
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Smazání klíčů pro cross-signing je definitivní. Každý kdo vás ověřil teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení ze kterých se můžete ověřit, tak to asi nechcete udělat.",
     "Clear cross-signing keys": "Smazat klíče pro cross-signing",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Zabezpečte si šifrovací klíče silným heslem. Pro lepší bezpečnost by mělo být jiné než vaše heslo k přihlášení:",
-    "Enter a passphrase": "Zadejte heslo"
+    "Enter a passphrase": "Zadejte heslo",
+    "The version of Riot": "Verze Riotu",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Jestli používáte Riot na dotykovém zařízení",
+    "Whether you're using Riot as an installed Progressive Web App": "Jestli používáte Riot jako nainstalovanou Progresivní Webovou Aplikaci",
+    "Your user agent": "Identifikace vašeho prohlížeče",
+    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat si posíláme následující informace:",
+    "Verify this session by completing one of the following:": "Ověřte tuto relaci dokončením jednoho z následujících:",
+    "Scan this unique code": "Naskenujte tento jedinečný kód",
+    "or": "nebo",
+    "Compare unique emoji": "Porovnejte jedinečnou kombinaci emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Porovnejte jedinečnou kombinaci emoji pokud na žádném zařízení nemáte kameru",
+    "Not Trusted": "Nedůvěryhodné",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace a neověřil ji:",
+    "Ask this user to verify their session, or manually verify it below.": "Poproste tohoto uživatele aby svojí relaci ověřil a nebo jí níže můžete ověřit manuálně.",
+    "Manually Verify": "Ověřit manuálně",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Relace, kterou se snažíte ověřit neumožňuje ověření QR kódem ani pomocí emoji, což je to co Riot podporuje. Zkuste použít jiného klienta.",
+    "Verify by scanning": "Ověřte naskenováním",
+    "You declined": "Odmítli jste",
+    "%(name)s declined": "%(name)s odmítl/a",
+    "accepting …": "přijímání …",
+    "declining …": "odmítání …",
+    "Back up my encryption keys, securing them with the same passphrase": "Zazálohovat šifrovací klíče zabezpečené tím stejným heslem",
+    "Enter your passphrase a second time to confirm it.": "Pro ověření zadejte své heslo podruhé.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Uschovejte si kopii na bezpečném místě, například ve správci hesel nebo v trezoru.",
+    "Your recovery key": "Váš obnovovací klíč",
+    "Copy": "Zkopírovat",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Teď můžete ověřit své ostatní zařízení a další uživatelé, aby vaše komunikace byla bezpečná.",
+    "Upgrade your encryption": "Aktualizovat šifrování",
+    "Make a copy of your recovery key": "Vytvořit kopii svého obnovovacího klíče",
+    "You're done!": "Hotovo!",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Bez nastavení Bezpečného Obnovení Zpráv nebudete moci obnovit historii šifrovaných zpráv pokud se odhlásíte nebo použijete jinou relaci.",
+    "Create key backup": "Vytvořit zálohu klíčů",
+    "This session is encrypting history using the new recovery method.": "Tato relace šifruje historii zpráv s podporou nového způsobu obnovení.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tato relace zjistila, že klíč a heslo k obnovení zpráv byly odstraněny.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Pokud se vám to stalo neůmyslně, můžete znovu nastavit zálohu zpráv pro tuto relaci. To znovu zašifruje historii zpráv novým způsobem.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
+    "Disable": "Zakázat",
+    "Not currently downloading messages for any room.": "Aktuálně se nestahují žádné zprávy.",
+    "Downloading mesages for %(currentRoom)s.": "Stahují se zprávy pro %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot si bezpečně uchovává šifrované zprávy lokálně, aby v nich mohl vyhledávat:",
+    "Space used:": "Použitý prostor:",
+    "Indexed messages:": "Indexované zprávy:",
+    "Indexed rooms:": "Indexované místnosti:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s z %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)"
 }

From d874f48779850c4b3e8895d9eef5d4d5394e2888 Mon Sep 17 00:00:00 2001
From: lissitz <pbl1996@gmail.com>
Date: Sat, 22 Feb 2020 11:17:42 +0000
Subject: [PATCH 1198/3235] Translated using Weblate (Spanish)

Currently translated at 70.8% (1506 of 2126 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 93ccb2d0c3..f7206e1080 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1182,13 +1182,13 @@
     "Your Riot is misconfigured": "Riot tiene un error de configuración",
     "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
-    "A conference call could not be started because the integrations server is not available": "No se puede iniciar la llamada porque no hay servidor de integraciones disponible",
+    "A conference call could not be started because the integrations server is not available": "No se pudo iniciar la conferencia porque el servidor de integraciones no está disponible",
     "Replying With Files": "Respondiendo con archivos",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
     "The file '%(fileName)s' failed to upload.": "Falló en subir el archivo '%(fileName)s'.",
     "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.",
-    "Name or Matrix ID": "Nombre o identificador (ID) Matrix",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pone ¯\\_(ツ)_/¯ al principio de un mensaje de texto",
+    "Name or Matrix ID": "Nombre o Matrix ID",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Añade ¯\\_(ツ)_/¯ al principio de un mensaje de texto plano",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizar una sala <i>no migrará automáticamente a sus miembros a la nueva versión de la sala.</i> Incluiremos un enlace a la nueva sala en la versión antigüa de la misma - los miembros tendrán que seguir ese enlace para unirse a la nueva sala.",
     "Changes your display nickname in the current room only": "Cambia tu apodo sólo en la sala actual",
     "Changes your avatar in this current room only": "Cambia tu avatar sólo en la sala actual",
@@ -1203,7 +1203,7 @@
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ha revocado la invitación para que %(targetDisplayName)s se una a la sala.",
     "Cannot reach homeserver": "No se puede conectar con el servidor",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de tener conexión a internet, o contacta con el administrador del servidor",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de Riot que compruebe <a>tu configuración</a> por si hubiera errores o entradas duplicadas.",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de Riot que compruebe si hay entradas duplicadas o erróneas en <a>tu configuración</a>.",
     "Cannot reach identity server": "No se puede conectar con el servidor de identidad",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Te puedes registrar, pero algunas funcionalidades no estarán disponibles hasta que se pueda conectar con el servidor de identidad. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puedes cambiar tu contraseña, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
@@ -1214,10 +1214,10 @@
     "User %(userId)s is already in the room": "El usuario %(userId)s ya está en la sala",
     "The user must be unbanned before they can be invited.": "El usuario debe ser desbloqueado antes de poder ser invitado.",
     "The user's homeserver does not support the version of the room.": "El servidor del usuario no soporta la versión de la sala.",
-    "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura de otros usuarios",
+    "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura enviadas por otros usuarios",
     "Order rooms in the room list by most important first instead of most recent": "Ordenar la lista de salas por importancia en vez de por reciente",
     "Show recently visited rooms above the room list": "Mostrar salas visitadas recientemente sobre la lista de salas",
-    "Show hidden events in timeline": "Mostrar eventos ocultos en la línea del tiempo",
+    "Show hidden events in timeline": "Mostrar eventos ocultos en la línea de tiempo",
     "Low bandwidth mode": "Modo de ancho de banda bajo",
     "Got It": "Entendido",
     "Scissors": "Tijeras",
@@ -1276,7 +1276,7 @@
     "Jump to first unread room.": "Saltar a la primera sala sin leer.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay sesiones desconocidas en esta sala: si continuas sin verificarlas, será posible que alguien escuche secretamente tu llamada.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay sesiones desconocidas en esta sala: si continúas sin verificarlas, será posible que alguien escuche secretamente tu llamada.",
     "Setting up keys": "Configurando claves",
     "Verify this session": "Verificar esta sesión",
     "Encryption upgrade available": "Mejora de encriptación disponible",
@@ -1287,21 +1287,21 @@
     "Session already verified!": "¡La sesión ya ha sido verificada!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATENCIÓN: ¡La sesión ya ha sido verificada, pero las claves NO CONCUERDAN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "¡ATENCIÓN: LA VERIFICACIÓN DE LA CLAVE HA FALLADO! La clave de firma para %(userId)s y sesión %(deviceId)s es \"%(fprint)s\", la cual no coincide con la clave proporcionada \"%(fingerprint)s\". ¡Esto podría significar que tus comunicaciones están siendo interceptadas!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clave de firma que proporcionaste coincide con la clave de firma que reciviste de la sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clave de firma que proporcionaste coincide con la clave de firma que recibiste de la sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s añadió %(addedAddresses)s y %(count)s otras direcciones a esta sala",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s eliminó %(removedAddresses)s y %(count)s otras direcciones de esta sala",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s eliminó %(countRemoved)s y añadió %(countAdded)s direcciones a esta sala",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eliminó la regla que banea usuarios que corresponden con %(glob)s",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eliminó la regla que banea salas que corresponden con %(glob)s",
-    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eliminó la regla que banea servidores que corresponden con %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a usuarios que coinciden con %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a salas que coinciden con %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a servidores que coinciden con %(glob)s",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s eliminó una regla correspondiente a %(glob)s",
-    "%(senderName)s updated an invalid ban rule": "%(senderName)s actualizó una regla de baneo inválida",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s actualizó una regla que banea usuarios que corresponden a %(glob)s por %(reason)s",
-    "They match": "Corresponden",
-    "They don't match": "No corresponden",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s actualizó una regla de bloqueo inválida",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s actualizó una regla que bloquea a usuarios que coinciden con %(glob)s por %(reason)s",
+    "They match": "Coinciden",
+    "They don't match": "No coinciden",
     "To be secure, do this in person or use a trusted way to communicate.": "Para ser seguro, haz esto en persona o usando una forma de comunicación de confianza.",
     "Lock": "Bloquear",
-    "Verify yourself & others to keep your chats safe": "Verifícate y verifica a otros para mantener tus chats seguros",
+    "Verify yourself & others to keep your chats safe": "Verifícate y verifica a otros para mantener tus conversaciones seguras",
     "Other users may not trust it": "Puede que otros usuarios no confíen en ello",
     "Upgrade": "Actualizar",
     "Verify": "Verificar",
@@ -1311,13 +1311,13 @@
     "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
     "Show more": "Mostrar más",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Cambiar la contraseña reseteará cualquier clave de encriptación end-to-end en todas las sesiones, haciendo el historial de chat encriptado ilegible, a no ser que primero exportes tus claves de sala y las reimportes después. En un futuro esto será mejorado.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Cambiar la contraseña reiniciará cualquier clave de encriptación end-to-end en todas las sesiones, haciendo el historial de conversaciones encriptado ilegible, a no ser que primero exportes tus claves de sala y después las reimportes. En un futuro esto será mejorado.",
     "in memory": "en memoria",
     "not found": "no encontrado",
-    "Identity Server (%(server)s)": "Servidor de identidad %(server)s",
+    "Identity Server (%(server)s)": "Servidor de Identidad %(server)s",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Estás usando actualmente <server></server>para descubrir y ser descubierto por contactos existentes que conoces. Puedes cambiar tu servidor de identidad más abajo.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Si no quieres usar <server /> para descubrir y ser descubierto por contactos existentes que conoces, introduce otro servidor de identidad más abajo.",
-    "Identity Server": "Servidor de identidad",
+    "Identity Server": "Servidor de Identidad",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No estás usando actualmente un servidor de identidad. Para descubrir y ser descubierto por contactos existentes que conoces, introduce uno más abajo.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Desconectarte de tu servidor de identidad significa que no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Usar un servidor de identidad es opcional. Si eliges no usar un servidor de identidad, no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
@@ -1325,15 +1325,15 @@
     "Enter a new identity server": "Introducir un servidor de identidad nuevo",
     "Change": "Cambiar",
     "Manage integrations": "Administrar integraciones",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los administradores de integración reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establece niveles de poder en tu nombre.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los administradores de integración reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establecer niveles de poder en tu nombre.",
     "Something went wrong trying to invite the users.": "Algo salió mal al intentar invitar a los usuarios.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "No se pudo invitar a esos usuarios. Por favor, revisa los usuarios que quieres invitar e inténtalo de nuevo.",
     "Failed to find the following users": "No se encontró a los siguientes usuarios",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Puede que los siguientes usuarios no existan o sean inválidos, y no pueden ser invitados: %(csvNames)s",
-    "Recent Conversations": "Conversaciones Recientes",
+    "Recent Conversations": "Conversaciones recientes",
     "Suggestions": "Sugerencias",
     "Recently Direct Messaged": "Enviado Mensaje Directo recientemente",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si no encuentras a alguien, pídele su usuario, comparte tu usuario (%(userId)s) o un <a>enlace de perfil</a>.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si no encuentras a alguien, pídele su usuario, comparte tu usuario (%(userId)s) o <a>enlace de perfil</a>.",
     "Go": "Ir",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Si no encuentras a alguien, pídele su usuario (p.ej. @user:server.com) o <a>comparte esta sala</a>.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "Has añadido una nueva sesión '%(displayName)s', la cual está pidiendo claves de encriptación.",
@@ -1373,7 +1373,7 @@
     "Missing session data": "Faltan datos de sesión",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Algunos datos de sesión, incluyendo claves de mensaje encriptadas, no se encuentran. Desconéctate y vuelve a conectarte para solucionarlo, reestableciendo las claves desde el backup.",
     "Your browser likely removed this data when running low on disk space.": "Tu navegador probablemente borró estos datos cuando tenía poco espacio de disco.",
-    "Find others by phone or email": "Encontar a otros por teléfono o email",
+    "Find others by phone or email": "Encontrar a otros por teléfono o email",
     "Be found by phone or email": "Ser encontrado por teléfono o email",
     "Use bots, bridges, widgets and sticker packs": "Usar robots, puentes, widgets, o packs de pegatinas",
     "Terms of Service": "Términos de servicio",
@@ -1398,17 +1398,17 @@
     "A widget would like to verify your identity": "Un widget quisiera verificar tu identidad",
     "Remember my selection for this widget": "Recordar mi selección para este widget",
     "Deny": "Rechazar",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Tu contraseña ha sido cambiada satisfactoriamente. No recibirás notificaciones de push en otras sesiones hasta que te conectes de nuevo a ellas",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Tu contraseña ha sido cambiada satisfactoriamente. No recibirás notificaciones push en otras sesiones hasta que te conectes de nuevo a ellas",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aceptar los Términos de Servicio del servidor de identidad %(serverName)s para poder ser descubierto por dirección de email o número de teléfono.",
     "Discovery": "Descubrimiento",
     "Deactivate account": "Desactivar cuenta",
     "Clear cache and reload": "Limpiar caché y recargar",
     "Ignored/Blocked": "Ignorado/Bloqueado",
-    "Error adding ignored user/server": "Error añadiendo usuario/servidor ignorado",
+    "Error adding ignored user/server": "Error al añadir usuario/servidor ignorado",
     "Error subscribing to list": "Error al suscribirse a la lista",
     "Please verify the room ID or alias and try again.": "Por favor, verifica el ID de la sala o el alias e inténtalo de nuevo.",
-    "Error removing ignored user/server": "Error al remover usuario/servidor ignorado",
-    "Error unsubscribing from list": "Error al desuscribirse de la lista",
+    "Error removing ignored user/server": "Error al eliminar usuario/servidor ignorado",
+    "Error unsubscribing from list": "Error al cancelar la suscripción a la lista",
     "None": "Ninguno",
     "Server rules": "Reglas del servidor",
     "User rules": "Reglas de usuario",
@@ -1419,7 +1419,105 @@
     "View rules": "Ver reglas",
     "You are currently subscribed to:": "Estás actualmente suscrito a:",
     "⚠ These settings are meant for advanced users.": "⚠ Estas opciones son indicadas para usuarios avanzados.",
-    "Personal ban list": "Lista de bans personal",
+    "Personal ban list": "Lista de bloqueo personal",
     "Server or user ID to ignore": "Servidor o ID de usuario a ignorar",
-    "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org"
+    "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org",
+    "The version of Riot": "La version de Riot",
+    "Your user agent": "Tu agente de usuario",
+    "The information being sent to us to help make Riot better includes:": "La información que se nos envía para ayudarnos a mejorar Riot incluye:",
+    "If you cancel now, you won't complete verifying the other user.": "Si cancelas ahora, no completarás la verificación del otro usuario.",
+    "If you cancel now, you won't complete verifying your other session.": "Si cancelas ahora, no completarás la verificación de tu otra sesión.",
+    "If you cancel now, you won't complete your secret storage operation.": "Si cancelas ahora, no completarás tu operación de almacén secreto.",
+    "Cancel entering passphrase?": "¿Cancelar la introducción de frase de contraseña?",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando salas que coinciden con %(glob)s por %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando servidores que coinciden con %(glob)s por %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s actualizó una regla de bloqueo correspondiente a %(glob)s por %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s creó una regla bloqueando a usuarios que coinciden con %(glob)s por %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s creó una regla bloqueando a salas que coinciden con %(glob)s por %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s creó una regla bloqueando a servidores que coinciden con %(glob)s por %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s creó una regla de bloqueo correspondiente a %(glob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambió una regla que estaba bloqueando a usuarios que coinciden con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambió una regla que estaba bloqueando a salas que coinciden con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambió una regla que estaba bloqueando a servidores que coinciden con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s actualizó una regla de bloqueo que correspondía a %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "The message you are trying to send is too large.": "El mensaje que estás intentando enviar es demasiado largo.",
+    "a few seconds ago": "hace unos segundos",
+    "about a minute ago": "hace un minuto",
+    "%(num)s minutes ago": "hace %(num)s minutos",
+    "about an hour ago": "hace una hora",
+    "%(num)s hours ago": "hace %(num)s horas",
+    "about a day ago": "hace un día",
+    "%(num)s days ago": "hace %(num)s días",
+    "a few seconds from now": "dentro de unos segundos",
+    "about a minute from now": "dentro de un minuto",
+    "%(num)s minutes from now": "dentro de %(num)s minutos",
+    "about an hour from now": "dentro de una hora",
+    "%(num)s hours from now": "dentro de %(num)s horas",
+    "about a day from now": "dentro de un día",
+    "%(num)s days from now": "dentro de %(num)s días",
+    "Show typing notifications": "Mostrar notificaciones de escritura",
+    "Never send encrypted messages to unverified sessions from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar desde esta sesión",
+    "Never send encrypted messages to unverified sessions in this room from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión",
+    "Enable message search in encrypted rooms": "Habilitar la búsqueda de mensajes en salas cifradas",
+    "Keep secret storage passphrase in memory for this session": "Mantener la frase de contraseña en memoria para esta sesión",
+    "How fast should messages be downloaded.": "Con qué rapidez deben ser descargados los mensajes.",
+    "Verify this session by completing one of the following:": "Verifica esta sesión completando uno de los siguientes:",
+    "Scan this unique code": "Escanea este código único",
+    "or": "o",
+    "Compare unique emoji": "Comparar emoji único",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de emojis si no tienes cámara en ninguno de los dispositivos",
+    "Start": "Comenzar",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirma que los emojis a continuación son mostrados en ambos dispositivos, en el mismo orden:",
+    "Verify this device by confirming the following number appears on its screen.": "Verifica este dispositivo confirmando que el siguiente número aparece en su pantalla.",
+    "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s …",
+    "Review": "Revisar",
+    "in secret storage": "en almacén secreto",
+    "Secret storage public key:": "Clave pública del almacén secreto:",
+    "in account data": "en datos de cuenta",
+    "Unable to load session list": "No se pudo cargar la lista de sesiones",
+    "Delete %(count)s sessions|other": "Borrar %(count)s sesiones",
+    "Delete %(count)s sessions|one": "Borrar %(count)s sesión",
+    "rooms.": "salas.",
+    "Manage": "Administrar",
+    "Enable": "Activar",
+    "This session is backing up your keys. ": "Esta sesión está haciendo una copia de seguridad de tus claves. ",
+    "not stored": "no almacenado",
+    "Message search": "Busqueda de mensajes",
+    "Sessions": "Sesiones",
+    "Upgrade this room to the recommended room version": "Actualizar esta sala a la versión de sala recomendada",
+    "this room": "esta sala",
+    "View older messages in %(roomName)s.": "Ver mensajes más antiguos en %(roomName)s.",
+    "Sounds": "Sonidos",
+    "Notification sound": "Sonido de notificación",
+    "Set a new custom sound": "Usar un nuevo sonido personalizado",
+    "Browse": "Navegar",
+    "Change room avatar": "Cambiar avatar de sala",
+    "Change room name": "Cambiar nombre de sala",
+    "Change main address for the room": "Cambiar dirección principal para la sala",
+    "Change history visibility": "Cambiar visibilidad del historial",
+    "Change permissions": "Cambiar permisos",
+    "Change topic": "Cambiar tema",
+    "Upgrade the room": "Actualizar la sala",
+    "Enable room encryption": "Activar el cifrado de sala",
+    "Modify widgets": "Modificar widgets",
+    "Error changing power level requirement": "Error al cambiar el requerimiento de nivel de poder",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Ocurrió un error cambiando los requerimientos de nivel de poder de la sala. Asegúrate de tener los permisos suficientes e inténtalo de nuevo.",
+    "Error changing power level": "Error al cambiar nivel de poder",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Ocurrió un error cambiando los requerimientos de nivel de poder del usuario. Asegúrate de tener los permisos suficientes e inténtalo de nuevo.",
+    "Default role": "Rol por defecto",
+    "Send messages": "Enviar mensajes",
+    "Invite users": "Invitar usuarios",
+    "Change settings": "Cambiar la configuración",
+    "Kick users": "Echar a usuarios",
+    "Ban users": "Bloquear a usuarios",
+    "Remove messages": "Eliminar mensajes",
+    "Notify everyone": "Notificar a todos",
+    "Send %(eventType)s events": "Enviar eventos %(eventType)s",
+    "Select the roles required to change various parts of the room": "Selecciona los roles requeridos para cambiar varias partes de la sala",
+    "Enable encryption?": "¿Habilitar cifrado?",
+    "Your email address hasn't been verified yet": "Tu dirección de email no ha sido verificada",
+    "Verify the link in your inbox": "Verifica el enlace en tu bandeja de entrada",
+    "Complete": "Completar",
+    "Share": "Compartir",
+    "Remove %(email)s?": "¿Eliminar %(email)s?"
 }

From 330815243950957d23bbacb59473c40cc3d39ad4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Feb 2020 14:07:50 +0000
Subject: [PATCH 1199/3235] Fix a couple of React warnings/errors

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ContextMenu.js      | 2 +-
 src/components/views/rooms/MessageComposer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js
index b4b1b80163..898991f4f2 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.js
@@ -255,7 +255,7 @@ export class ContextMenu extends React.Component {
 
         if (chevronFace === 'top' || chevronFace === 'bottom') {
             chevronOffset.left = props.chevronOffset;
-        } else {
+        } else if (position.top !== undefined) {
             const target = position.top;
 
             // By default, no adjustment is made
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 53e10fa750..557a58412a 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -341,7 +341,7 @@ export default class MessageComposer extends React.Component {
                 </a>
             ) : '';
 
-            controls.push(<div className="mx_MessageComposer_replaced_wrapper">
+            controls.push(<div className="mx_MessageComposer_replaced_wrapper" key="room_replaced">
                 <div className="mx_MessageComposer_replaced_valign">
                     <img className="mx_MessageComposer_roomReplaced_icon" src={require("../../../../res/img/room_replaced.svg")} />
                     <span className="mx_MessageComposer_roomReplaced_header">

From d89b8b51484c68c6fe0b1325b5d59ee809cc2196 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Feb 2020 22:10:36 +0000
Subject: [PATCH 1200/3235] Fix downloading files in electron not being sent
 into browser

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/ImageView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index 7cc2741df7..bbe4487c60 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -216,7 +216,7 @@ export default class ImageView extends React.Component {
                                 { this.getName() }
                             </div>
                             { eventMeta }
-                            <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } target="_blank" rel="noopener">
+                            <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } rel="noreferrer noopener">
                                 <div className="mx_ImageView_download">
                                         { _t('Download this file') }<br />
                                          <span className="mx_ImageView_size">{ sizeRes }</span>

From d783ce86c827bbd6808d78cda95bdb588491581d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Feb 2020 22:14:29 +0000
Subject: [PATCH 1201/3235] Use noreferrer in addition to noopener for edge
 case browsers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js                              |  2 +-
 src/Markdown.js                               |  2 +-
 src/components/structures/GroupView.js        |  4 +--
 src/components/structures/auth/Login.js       |  4 +--
 src/components/views/auth/AuthFooter.js       |  2 +-
 .../auth/InteractiveAuthEntryComponents.js    |  2 +-
 .../views/auth/ModularServerConfig.js         |  2 +-
 .../views/auth/ServerTypeSelector.js          |  2 +-
 .../views/context_menus/MessageContextMenu.js |  4 +--
 .../views/context_menus/TopLeftMenu.js        |  4 +--
 .../views/dialogs/ChangelogDialog.js          |  2 +-
 src/components/views/dialogs/InviteDialog.js  |  4 +--
 src/components/views/dialogs/ShareDialog.js   |  2 +-
 src/components/views/dialogs/TermsDialog.js   |  2 +-
 src/components/views/elements/AppTile.js      |  2 +-
 src/components/views/elements/ImageView.js    |  2 +-
 src/components/views/messages/MFileBody.js    |  2 +-
 src/components/views/rooms/AuxPanel.js        |  2 +-
 .../views/rooms/LinkPreviewWidget.js          |  2 +-
 src/components/views/rooms/RoomPreviewBar.js  |  2 +-
 .../views/settings/ChangePassword.js          |  2 +-
 .../views/settings/EventIndexPanel.js         |  4 +--
 .../views/settings/ProfileSettings.js         |  4 +--
 .../settings/tabs/room/BridgeSettingsTab.js   |  4 +--
 .../tabs/room/SecurityRoomSettingsTab.js      |  2 +-
 .../settings/tabs/user/HelpUserSettingsTab.js | 27 ++++++++++---------
 .../settings/tabs/user/LabsUserSettingsTab.js |  2 +-
 .../views/terms/InlineTermsAgreement.js       |  2 +-
 src/linkify-matrix.js                         |  2 +-
 src/usercontent/index.js                      |  2 +-
 src/utils/AutoDiscoveryUtils.js               |  2 +-
 src/utils/ErrorUtils.js                       |  2 +-
 .../views/messages/TextualBody-test.js        |  2 +-
 33 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 236aa0157e..7dd68e5c61 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -160,7 +160,7 @@ const transformTags = { // custom to matrix
                 delete attribs.target;
             }
         }
-        attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
+        attribs.rel = 'noreferrer noopener'; // https://mathiasbynens.github.io/rel-noopener/
         return { tagName, attribs };
     },
     'img': function(tagName, attribs) {
diff --git a/src/Markdown.js b/src/Markdown.js
index 437ceec88b..fb1f8bf0ea 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -136,7 +136,7 @@ export default class Markdown {
                 // thus opening in a new tab.
                 if (externalLinks) {
                     attrs.push(['target', '_blank']);
-                    attrs.push(['rel', 'noopener']);
+                    attrs.push(['rel', 'noreferrer noopener']);
                 }
                 this.tag('a', attrs);
             } else {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5ae0699a2f..e98dcae1a4 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -821,10 +821,10 @@ export default createReactClass({
                 {_t(
                     "Want more than a community? <a>Get your own server</a>", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noopener">{sub}</a>,
+                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{sub}</a>,
                     },
                 )}
-                <a href={hostingSignupLink} target="_blank" rel="noopener">
+                <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">
                     <img src={require("../../../res/img/external-link.svg")} width="11" height="10" alt='' />
                 </a>
             </div>;
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index c8b2a1ea9c..8a9bbb3ff5 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -481,7 +481,7 @@ export default createReactClass({
                         "Either use HTTPS or <a>enable unsafe scripts</a>.", {},
                         {
                             'a': (sub) => {
-                                return <a target="_blank" rel="noopener"
+                                return <a target="_blank" rel="noreferrer noopener"
                                     href="https://www.google.com/search?&q=enable%20unsafe%20scripts"
                                 >
                                     { sub }
@@ -497,7 +497,7 @@ export default createReactClass({
                         "is not blocking requests.", {},
                         {
                             'a': (sub) => {
-                                return <a target="_blank" rel="noopener" href={this.props.serverConfig.hsUrl}>
+                                return <a target="_blank" rel="noreferrer noopener" href={this.props.serverConfig.hsUrl}>
                                     { sub }
                                 </a>;
                             },
diff --git a/src/components/views/auth/AuthFooter.js b/src/components/views/auth/AuthFooter.js
index 4076141606..1309800772 100644
--- a/src/components/views/auth/AuthFooter.js
+++ b/src/components/views/auth/AuthFooter.js
@@ -26,7 +26,7 @@ export default createReactClass({
     render: function() {
         return (
             <div className="mx_AuthFooter">
-                <a href="https://matrix.org" target="_blank" rel="noopener">{ _t("powered by Matrix") }</a>
+                <a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t("powered by Matrix") }</a>
             </div>
         );
     },
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 6f6eb7e2a1..0b89c82658 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -331,7 +331,7 @@ export const TermsAuthEntry = createReactClass({
             checkboxes.push(
                 <label key={"policy_checkbox_" + policy.id} className="mx_InteractiveAuthEntryComponents_termsPolicy">
                     <input type="checkbox" onChange={() => this._togglePolicy(policy.id)} checked={checked} />
-                    <a href={policy.url} target="_blank" rel="noopener">{ policy.name }</a>
+                    <a href={policy.url} target="_blank" rel="noreferrer noopener">{ policy.name }</a>
                 </label>,
             );
         }
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index 32418d3462..d8ce145e20 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -99,7 +99,7 @@ export default class ModularServerConfig extends ServerConfig {
                     "Enter the location of your Modular homeserver. It may use your own " +
                     "domain name or be a subdomain of <a>modular.im</a>.",
                     {}, {
-                        a: sub => <a href={MODULAR_URL} target="_blank" rel="noopener">
+                        a: sub => <a href={MODULAR_URL} target="_blank" rel="noreferrer noopener">
                             {sub}
                         </a>,
                     },
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
index 341f81c546..fe29b7f76c 100644
--- a/src/components/views/auth/ServerTypeSelector.js
+++ b/src/components/views/auth/ServerTypeSelector.js
@@ -46,7 +46,7 @@ export const TYPES = {
         label: () => _t('Premium'),
         logo: () => <img src={require('../../../../res/img/modular-bw-logo.svg')} />,
         description: () => _t('Premium hosting for organisations <a>Learn more</a>', {}, {
-            a: sub => <a href={MODULAR_URL} target="_blank" rel="noopener">
+            a: sub => <a href={MODULAR_URL} target="_blank" rel="noreferrer noopener">
                 {sub}
             </a>,
         }),
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index ea5623fe48..be1c11ef97 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -420,7 +420,7 @@ export default createReactClass({
                 onClick={this.onPermalinkClick}
                 href={permalink}
                 target="_blank"
-                rel="noopener"
+                rel="noreferrer noopener"
             >
                 { mxEvent.isRedacted() || mxEvent.getType() !== 'm.room.message'
                     ? _t('Share Permalink') : _t('Share Message') }
@@ -445,7 +445,7 @@ export default createReactClass({
                     element="a"
                     className="mx_MessageContextMenu_field"
                     target="_blank"
-                    rel="noopener"
+                    rel="noreferrer noopener"
                     onClick={this.closeMenu}
                     href={mxEvent.event.content.external_url}
                 >
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 51ec202b90..3221c25982 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -68,10 +68,10 @@ export default class TopLeftMenu extends React.Component {
                 {_t(
                     "<a>Upgrade</a> to your own domain", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noopener" tabIndex={-1}>{sub}</a>,
+                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener" tabIndex={-1}>{sub}</a>,
                     },
                 )}
-                <a href={hostingSignupLink} target="_blank" rel="noopener" role="presentation" aria-hidden={true} tabIndex={-1}>
+                <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener" role="presentation" aria-hidden={true} tabIndex={-1}>
                     <img src={require("../../../../res/img/external-link.svg")} width="11" height="10" alt='' />
                 </a>
             </div>;
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index e58f56a639..ab284cdb2e 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -52,7 +52,7 @@ export default class ChangelogDialog extends React.Component {
     _elementsForCommit(commit) {
         return (
             <li key={commit.sha} className="mx_ChangelogDialog_li">
-                <a href={commit.html_url} target="_blank" rel="noopener">
+                <a href={commit.html_url} target="_blank" rel="noreferrer noopener">
                     {commit.commit.message.split('\n')[0]}
                 </a>
             </li>
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 587fb9e454..67d090f3c1 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -1046,7 +1046,7 @@ export default class InviteDialog extends React.PureComponent {
                 "If you can't find someone, ask them for their username, share your " +
                 "username (%(userId)s) or <a>profile link</a>.",
                 {userId},
-                {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>},
+                {a: (sub) => <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{sub}</a>},
             );
             buttonText = _t("Go");
             goButtonFn = this._startDm;
@@ -1055,7 +1055,7 @@ export default class InviteDialog extends React.PureComponent {
             helpText = _t(
                 "If you can't find someone, ask them for their username (e.g. @user:server.com) or " +
                 "<a>share this room</a>.", {},
-                {a: (sub) => <a href={makeRoomPermalink(this.props.roomId)} rel="noopener" target="_blank">{sub}</a>},
+                {a: (sub) => <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>},
             );
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 842c7fc109..b42a88ceac 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -218,7 +218,7 @@ export default class ShareDialog extends React.Component {
                     </div>
                     <div className="mx_ShareDialog_social_container">
                         {
-                            socials.map((social) => <a rel="noopener"
+                            socials.map((social) => <a rel="noreferrer noopener"
                                                        target="_blank"
                                                        key={social.name}
                                                        name={social.name}
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index 2d1e62e01a..402605c545 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -135,7 +135,7 @@ export default class TermsDialog extends React.PureComponent {
                 rows.push(<tr key={termDoc[termsLang].url}>
                     <td className="mx_TermsDialog_service">{serviceName}</td>
                     <td className="mx_TermsDialog_summary">{summary}</td>
-                    <td>{termDoc[termsLang].name} <a rel="noopener" target="_blank" href={termDoc[termsLang].url}>
+                    <td>{termDoc[termsLang].name} <a rel="noreferrer noopener" target="_blank" href={termDoc[termsLang].url}>
                         <span className="mx_TermsDialog_link" />
                     </a></td>
                     <td><TermsCheckbox
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b12ace708d..20d98f5e23 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -552,7 +552,7 @@ export default class AppTile extends React.Component {
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
         // window.open(this._getSafeUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
-            { target: '_blank', href: this._getSafeUrl(), rel: 'noopener'}).click();
+            { target: '_blank', href: this._getSafeUrl(), rel: 'noreferrer noopener'}).click();
     }
 
     _onReloadWidgetClick() {
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index bbe4487c60..f75b735043 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -91,7 +91,7 @@ export default class ImageView extends React.Component {
     getName() {
         let name = this.props.name;
         if (name && this.props.link) {
-            name = <a href={ this.props.link } target="_blank" rel="noopener">{ name }</a>;
+            name = <a href={ this.props.link } target="_blank" rel="noreferrer noopener">{ name }</a>;
         }
         return name;
     }
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index f67cd1b2b0..886afbb666 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -297,7 +297,7 @@ export default createReactClass({
         } else if (contentUrl) {
             const downloadProps = {
                 target: "_blank",
-                rel: "noopener",
+                rel: "noreferrer noopener",
 
                 // We set the href regardless of whether or not we intercept the download
                 // because we don't really want to convert the file to a blob eagerly, and
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 50b25cb96f..0b34739e0e 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -219,7 +219,7 @@ export default createReactClass({
 
                 if (link) {
                     span = (
-                        <a href={link} target="_blank" rel="noopener">
+                        <a href={link} target="_blank" rel="noreferrer noopener">
                             { span }
                         </a>
                     );
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index c6374db464..4169a763b7 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -136,7 +136,7 @@ export default createReactClass({
             <div className="mx_LinkPreviewWidget" >
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
-                    <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noopener">{ p["og:title"] }</a></div>
+                    <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a></div>
                     <div className="mx_LinkPreviewWidget_siteName">{ p["og:site_name"] ? (" - " + p["og:site_name"]) : null }</div>
                     <div className="mx_LinkPreviewWidget_description" ref={this._description}>
                         { description }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 9af06190f7..4ff5dd5198 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -509,7 +509,7 @@ export default createReactClass({
                         "<issueLink>submit a bug report</issueLink>.",
                         { errcode: this.props.error.errcode },
                         { issueLink: label => <a href="https://github.com/vector-im/riot-web/issues/new/choose"
-                            target="_blank" rel="noopener">{ label }</a> },
+                            target="_blank" rel="noreferrer noopener">{ label }</a> },
                     ),
                 ];
                 break;
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 3ba276d1fa..b51ff6cf9d 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -119,7 +119,7 @@ export default createReactClass({
                         'In future this will be improved.',
                     ) }
                     {' '}
-                    <a href="https://github.com/vector-im/riot-web/issues/2671" target="_blank" rel="noopener">
+                    <a href="https://github.com/vector-im/riot-web/issues/2671" target="_blank" rel="noreferrer noopener">
                         https://github.com/vector-im/riot-web/issues/2671
                     </a>
                 </div>,
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 80d93c4562..203a7ee46e 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -172,7 +172,7 @@ export default class EventIndexPanel extends React.Component {
                             {},
                             {
                                 'nativeLink': (sub) => <a href={nativeLink} target="_blank"
-                                    rel="noopener">{sub}</a>,
+                                    rel="noreferrer noopener">{sub}</a>,
                             },
                         )
                     }
@@ -188,7 +188,7 @@ export default class EventIndexPanel extends React.Component {
                             {},
                             {
                                 'riotLink': (sub) => <a href="https://riot.im/download/desktop"
-                                    target="_blank" rel="noopener">{sub}</a>,
+                                    target="_blank" rel="noreferrer noopener">{sub}</a>,
                             },
                         )
                     }
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 8d2c289b15..72dfe7a983 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -132,10 +132,10 @@ export default class ProfileSettings extends React.Component {
                 {_t(
                     "<a>Upgrade</a> to your own domain", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noopener">{sub}</a>,
+                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">{sub}</a>,
                     },
                 )}
-                <a href={hostingSignupLink} target="_blank" rel="noopener">
+                <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener">
                     <img src={require("../../../../res/img/external-link.svg")} width="11" height="10" alt='' />
                 </a>
             </span>;
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index d66732de55..a5d20eae33 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -68,7 +68,7 @@ export default class BridgeSettingsTab extends React.Component {
                     {
                         // TODO: We don't have this link yet: this will prevent the translators
                         // having to re-translate the string when we do.
-                        a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noopener">{sub}</a>,
+                        a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{sub}</a>,
                     },
                 )}</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
@@ -82,7 +82,7 @@ export default class BridgeSettingsTab extends React.Component {
                 {
                     // TODO: We don't have this link yet: this will prevent the translators
                     // having to re-translate the string when we do.
-                    a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noopener">{sub}</a>,
+                    a: sub => <a href={BRIDGES_LINK} target="_blank" rel="noreferrer noopener">{sub}</a>,
                 },
             )}</p>;
         }
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 480d55c044..3ee92c31c8 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -97,7 +97,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                 {},
                 {
                     'a': (sub) => {
-                        return <a rel='noopener' target='_blank'
+                        return <a rel='noreferrer noopener' target='_blank'
                                   href='https://about.riot.im/help#end-to-end-encryption'>{sub}</a>;
                     },
                 },
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index a245c7c7b9..9dbf7467b4 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -37,7 +37,7 @@ const ghVersionLabel = function(repo, token='') {
     } else {
         url = `https://github.com/${repo}/commit/${token.split('-')[0]}`;
     }
-    return <a target="_blank" rel="noopener" href={url}>{ token }</a>;
+    return <a target="_blank" rel="noreferrer noopener" href={url}>{ token }</a>;
 };
 
 export default class HelpUserSettingsTab extends React.Component {
@@ -110,7 +110,7 @@ export default class HelpUserSettingsTab extends React.Component {
         const legalLinks = [];
         for (const tocEntry of SdkConfig.get().terms_and_conditions_links) {
             legalLinks.push(<div key={tocEntry.url}>
-                <a href={tocEntry.url} rel="noopener" target="_blank">{tocEntry.text}</a>
+                <a href={tocEntry.url} rel="noreferrer noopener" target="_blank">{tocEntry.text}</a>
             </div>);
         }
 
@@ -132,27 +132,27 @@ export default class HelpUserSettingsTab extends React.Component {
                 <span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
                 <ul>
                     <li>
-                        The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noopener" target="_blank">
+                        The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noreferrer noopener" target="_blank">
                         default cover photo</a> is ©&nbsp;
-                        <a href="https://www.flickr.com/golan" rel="noopener" target="_blank">Jesús Roncero</a>{' '}
+                        <a href="https://www.flickr.com/golan" rel="noreferrer noopener" target="_blank">Jesús Roncero</a>{' '}
                         used under the terms of&nbsp;
-                        <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noopener" target="_blank">
+                        <a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noreferrer noopener" target="_blank">
                         CC-BY-SA 4.0</a>.
                     </li>
                     <li>
-                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noopener" target="_blank">
+                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noreferrer noopener" target="_blank">
                         twemoji-colr</a> font is ©&nbsp;
-                        <a href="https://mozilla.org" rel="noopener" target="_blank">Mozilla Foundation</a>{' '}
+                        <a href="https://mozilla.org" rel="noreferrer noopener" target="_blank">Mozilla Foundation</a>{' '}
                         used under the terms of&nbsp;
-                        <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noopener" target="_blank">
+                        <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noreferrer noopener" target="_blank">
                         Apache 2.0</a>.
                     </li>
                     <li>
-                        The <a href="https://twemoji.twitter.com/" rel="noopener" target="_blank">
+                        The <a href="https://twemoji.twitter.com/" rel="noreferrer noopener" target="_blank">
                         Twemoji</a> emoji art is ©&nbsp;
-                        <a href="https://twemoji.twitter.com/" rel="noopener" target="_blank">Twitter, Inc and other
+                        <a href="https://twemoji.twitter.com/" rel="noreferrer noopener" target="_blank">Twitter, Inc and other
                         contributors</a> used under the terms of&nbsp;
-                        <a href="https://creativecommons.org/licenses/by/4.0/" rel="noopener" target="_blank">
+                        <a href="https://creativecommons.org/licenses/by/4.0/" rel="noreferrer noopener" target="_blank">
                         CC-BY 4.0</a>.
                     </li>
                 </ul>
@@ -162,7 +162,8 @@ export default class HelpUserSettingsTab extends React.Component {
 
     render() {
         let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
-            'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noopener' target='_blank'>{sub}</a>,
+            'a': (sub) =>
+                <a href="https://about.riot.im/need-help/" rel='noreferrer noopener' target='_blank'>{sub}</a>,
         });
         if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
             faqText = (
@@ -170,7 +171,7 @@ export default class HelpUserSettingsTab extends React.Component {
                     {
                         _t('For help with using Riot, click <a>here</a> or start a chat with our ' +
                             'bot using the button below.', {}, {
-                            'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noopener'
+                            'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noreferrer noopener'
                                              target='_blank'>{sub}</a>,
                         })
                     }
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 2b992c7add..3e69107159 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -55,7 +55,7 @@ export default class LabsUserSettingsTab extends React.Component {
                             '<a>Learn more</a>.', {}, {
                             'a': (sub) => {
                                 return <a href="https://github.com/vector-im/riot-web/blob/develop/docs/labs.md"
-                                    rel='noopener' target='_blank'>{sub}</a>;
+                                    rel='noreferrer noopener' target='_blank'>{sub}</a>;
                             },
                         })
                     }
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.js
index 75e8eccea3..bccd686cd3 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.js
@@ -77,7 +77,7 @@ export default class InlineTermsAgreement extends React.Component {
                 "Accept <policyLink /> to continue:", {}, {
                     policyLink: () => {
                         return (
-                            <a href={policy.url} rel='noopener' target='_blank'>
+                            <a href={policy.url} rel='noreferrer noopener' target='_blank'>
                                 {policy.name}
                                 <span className='mx_InlineTermsAgreement_link' />
                             </a>
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 889bad682c..8870b2d431 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -227,7 +227,7 @@ matrixLinkify.options = {
     },
 
     linkAttributes: {
-        rel: 'noopener',
+        rel: 'noreferrer noopener',
     },
 
     target: function(href, type) {
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index b87ccb9dbb..8c891a4f88 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -15,7 +15,7 @@ function remoteRender(event) {
 
     const a = document.createElement("a");
     a.id = "a";
-    a.rel = "noopener";
+    a.rel = "noreferrer noopener";
     a.target = "_blank";
     a.download = data.download;
     a.style = data.style;
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 49898aae90..328aa9c776 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -78,7 +78,7 @@ export default class AutoDiscoveryUtils {
                         return <a
                             href="https://github.com/vector-im/riot-web/blob/master/docs/config.md"
                             target="_blank"
-                            rel="noopener"
+                            rel="noreferrer noopener"
                         >{sub}</a>;
                     },
                 },
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
index 51b130bdb6..f0a4d7c49e 100644
--- a/src/utils/ErrorUtils.js
+++ b/src/utils/ErrorUtils.js
@@ -36,7 +36,7 @@ export function messageForResourceLimitError(limitType, adminContact, strings, e
 
     const linkSub = sub => {
         if (adminContact) {
-            return <a href={adminContact} target="_blank" rel="noopener">{sub}</a>;
+            return <a href={adminContact} target="_blank" rel="noreferrer noopener">{sub}</a>;
         } else {
             return sub;
         }
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 4e0785a8b9..4ad46586ae 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -121,7 +121,7 @@ describe("<TextualBody />", () => {
             expect(wrapper.text()).toBe(ev.getContent().body);
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body" dir="auto">' +
-                'Visit <a href="https://matrix.org/" class="linkified" target="_blank" rel="noopener">' +
+                'Visit <a href="https://matrix.org/" class="linkified" target="_blank" rel="noreferrer noopener">' +
                 'https://matrix.org/</a></span>');
         });
     });

From b2c1242207af6ae2b033819e35d2e0e62cfd7138 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Feb 2020 22:19:18 +0000
Subject: [PATCH 1202/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/Login.js                    | 7 +++----
 src/components/views/context_menus/TopLeftMenu.js          | 3 ++-
 src/components/views/dialogs/InviteDialog.js               | 5 ++++-
 .../views/settings/tabs/user/HelpUserSettingsTab.js        | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 8a9bbb3ff5..24e4726416 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -496,11 +496,10 @@ export default createReactClass({
                         "<a>homeserver's SSL certificate</a> is trusted, and that a browser extension " +
                         "is not blocking requests.", {},
                         {
-                            'a': (sub) => {
-                                return <a target="_blank" rel="noreferrer noopener" href={this.props.serverConfig.hsUrl}>
+                            'a': (sub) =>
+                                <a target="_blank" rel="noreferrer noopener" href={this.props.serverConfig.hsUrl}>
                                     { sub }
-                                </a>;
-                            },
+                                </a>,
                         },
                     ) }
                 </span>;
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 3221c25982..f1309cac2d 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -68,7 +68,8 @@ export default class TopLeftMenu extends React.Component {
                 {_t(
                     "<a>Upgrade</a> to your own domain", {},
                     {
-                        a: sub => <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener" tabIndex={-1}>{sub}</a>,
+                        a: sub =>
+                            <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener" tabIndex={-1}>{sub}</a>,
                     },
                 )}
                 <a href={hostingSignupLink} target="_blank" rel="noreferrer noopener" role="presentation" aria-hidden={true} tabIndex={-1}>
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 67d090f3c1..15e307fcd0 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -1055,7 +1055,10 @@ export default class InviteDialog extends React.PureComponent {
             helpText = _t(
                 "If you can't find someone, ask them for their username (e.g. @user:server.com) or " +
                 "<a>share this room</a>.", {},
-                {a: (sub) => <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>},
+                {
+                    a: (sub) =>
+                        <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
+                },
             );
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 9dbf7467b4..258b55bb4e 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -140,8 +140,8 @@ export default class HelpUserSettingsTab extends React.Component {
                         CC-BY-SA 4.0</a>.
                     </li>
                     <li>
-                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noreferrer noopener" target="_blank">
-                        twemoji-colr</a> font is ©&nbsp;
+                        The <a href="https://github.com/matrix-org/twemoji-colr" rel="noreferrer noopener"
+                               target="_blank"> twemoji-colr</a> font is ©&nbsp;
                         <a href="https://mozilla.org" rel="noreferrer noopener" target="_blank">Mozilla Foundation</a>{' '}
                         used under the terms of&nbsp;
                         <a href="http://www.apache.org/licenses/LICENSE-2.0" rel="noreferrer noopener" target="_blank">

From 0bcdf062a315f9e9c869394e39919202afb1c725 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Feb 2020 22:22:12 +0000
Subject: [PATCH 1203/3235] reset opener when using window.open

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js                     | 3 ++-
 src/components/views/auth/InteractiveAuthEntryComponents.js | 1 +
 src/components/views/messages/TextualBody.js                | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index de916ad7aa..339ea279ee 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1375,7 +1375,8 @@ export default createReactClass({
                 cancelButton: _t('Dismiss'),
                 onFinished: (confirmed) => {
                     if (confirmed) {
-                        window.open(consentUri, '_blank');
+                        const wnd = window.open(consentUri, '_blank');
+                        wnd.opener = null;
                     }
                 },
             }, null, true);
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 0b89c82658..aaf8c88440 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -604,6 +604,7 @@ export const FallbackAuthEntry = createReactClass({
             this.props.authSessionId,
         );
         this._popupWindow = window.open(url);
+        this._popupWindow.opener = null;
     },
 
     _onReceiveMessage: function(event) {
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index d74170919e..ac0fc65ff4 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -374,7 +374,9 @@ export default createReactClass({
                     const height = window.screen.height > 800 ? 800 : window.screen.height;
                     const left = (window.screen.width - width) / 2;
                     const top = (window.screen.height - height) / 2;
-                    window.open(completeUrl, '_blank', `height=${height}, width=${width}, top=${top}, left=${left},`);
+                    const features = `height=${height}, width=${width}, top=${top}, left=${left},`;
+                    const wnd = window.open(completeUrl, '_blank', features);
+                    wnd.opener = null;
                 },
             });
         });

From d6b39a33b4fbebc67882e857fe971a008a8f25b1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Feb 2020 01:36:48 +0000
Subject: [PATCH 1204/3235] get rid of target=_blank for usercontent also

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/usercontent/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 8c891a4f88..08769d6bd1 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -16,7 +16,6 @@ function remoteRender(event) {
     const a = document.createElement("a");
     a.id = "a";
     a.rel = "noreferrer noopener";
-    a.target = "_blank";
     a.download = data.download;
     a.style = data.style;
     a.style.fontFamily = "Arial, Helvetica, Sans-Serif";

From 0663ab3b87455de6dac8d21337e30c68e294492b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 10:17:33 +0000
Subject: [PATCH 1205/3235] lint, and detect new requests

---
 res/css/views/dialogs/_DevtoolsDialog.scss    |  4 +--
 .../views/dialogs/DevtoolsDialog.js           | 30 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 22975f0c52..500c46b5fd 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -195,7 +195,7 @@ limitations under the License.
     border-radius: 3px;
     padding: 1px 5px;
     margin-bottom: 6px;
-    font-family: "Inconsolata", courier;
+    font-family: $monospace-font-family;
 
     dl {
         display: grid;
@@ -222,4 +222,4 @@ limitations under the License.
     dt::after {
         content: ":";
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index ade23c90f1..0452e88dfa 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -30,7 +30,7 @@ import {
     PHASE_DONE,
     PHASE_STARTED,
     PHASE_CANCELLED,
-} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest"
+} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
@@ -621,7 +621,7 @@ const PHASE_MAP = {
     [PHASE_DONE]: "done",
     [PHASE_STARTED]: "started",
     [PHASE_CANCELLED]: "cancelled",
-}
+};
 
 function VerificationRequest({txnId, request}) {
     const [, updateState] = useState();
@@ -631,18 +631,18 @@ function VerificationRequest({txnId, request}) {
     useEffect(() => {
         request.on("change", updateState);
         return () => request.off("change", updateState);
-    }, []);
+    }, [request]);
 
     /* Keep re-rendering if there's a timeout */
     useEffect(() => {
-        if (timeout == 0) return;
+        if (request.timeout == 0) return;
 
         const id = setInterval(() => {
            setTimeout(request.timeout);
         }, 500);
 
-        return () => { clearInterval(id); }
-    }, []);
+        return () => { clearInterval(id); };
+    }, [request]);
 
     return (<div className="mx_DevTools_VerificationRequest">
         <dl>
@@ -660,7 +660,7 @@ function VerificationRequest({txnId, request}) {
     </div>);
 }
 
-class VerificationExplorer extends React.PureComponent {
+class VerificationExplorer extends React.Component {
     static getLabel() {
         return _t("Verification Requests");
     }
@@ -668,6 +668,20 @@ class VerificationExplorer extends React.PureComponent {
     /* Ensure this.context is the cli */
     static contextType = MatrixClientContext;
 
+    onNewRequest = () => {
+        this.forceUpdate();
+    }
+
+    componentDidMount() {
+        const cli = this.context;
+        cli.on("crypto.verification.request", this.onNewRequest);
+    }
+
+    componentWillUnmount() {
+        const cli = this.context;
+        cli.off("crypto.verification.request", this.onNewRequest);
+    }
+
     render() {
         const cli = this.context;
         const room = this.props.room;
@@ -677,7 +691,7 @@ class VerificationExplorer extends React.PureComponent {
         return (<div>
             <div className="mx_Dialog_content">
                 {Array.from(inRoomRequests.entries()).reverse().map(([txnId, request]) =>
-                    <VerificationRequest txnId={txnId} request={request} key={txnId}/>
+                    <VerificationRequest txnId={txnId} request={request} key={txnId} />,
                 )}
             </div>
         </div>);

From 20f82e79661c49ebcf12ec424a461d8ab75cae98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Sun, 23 Feb 2020 12:57:11 +0000
Subject: [PATCH 1206/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2126 of 2126 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 | 66 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 018f7a05f6..b1531daa42 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -3,7 +3,7 @@
     "Search": "Keresés",
     "OK": "Rendben",
     "Custom Server Options": "Egyedi szerverbeállítások",
-    "Dismiss": "Eltüntet",
+    "Dismiss": "Eltüntetés",
     "Error": "Hiba",
     "Failed to forget room %(errCode)s": "Nem sikerült elfelejteni a szobát: %(errCode)s",
     "Favourite": "Kedvenc",
@@ -31,7 +31,7 @@
     "Default Device": "Alapértelmezett eszköz",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Advanced": "Haladó",
+    "Advanced": "Speciális",
     "Algorithm": "Algoritmus",
     "Always show message timestamps": "Üzenet időbélyeg folyamatos megjelenítése",
     "Authentication": "Azonosítás",
@@ -59,7 +59,7 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s kitiltotta őt: %(targetName)s.",
     "Ban": "Kitilt",
     "Banned users": "Kitiltott felhasználók",
-    "Bans user with given id": "Kitiltja a felhasználót a megadott ID-vel",
+    "Bans user with given id": "Kitiltja a megadott azonosítójú felhasználót",
     "Blacklisted": "Fekete listára téve",
     "Call Timeout": "Hívás időtúllépés",
     "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.": "Nem lehet kapcsolódni a Matrix szerverhez - ellenőrizd a kapcsolatot, biztosítsd, hogy a <a>Matrix szerver tanúsítványa</a> hiteles legyen, és a böngésző kiterjesztések ne blokkolják a kéréseket.",
@@ -221,8 +221,8 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
     "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riotnak nincs jogosultsága értesítést küldeni neked - ellenőrizd  a böngésző beállításait",
-    "Riot was not given permission to send notifications - please try again": "Riotnak nincs jogosultsága értesítést küldeni neked - próbáld újra",
+    "Riot does not have permission to send you notifications - please check your browser settings": "A Riotnak nincs jogosultsága értesítést küldeni neked – ellenőrizd a böngésző beállításait",
+    "Riot was not given permission to send notifications - please try again": "A Riotnak nincs jogosultsága értesítést küldeni neked – próbáld újra",
     "riot-web version:": "riot-web verzió:",
     "Room %(roomId)s not visible": "%(roomId)s szoba nem látható",
     "Room Colour": "Szoba színe",
@@ -232,7 +232,7 @@
     "Save": "Mentés",
     "Scroll to bottom of page": "Az oldal aljára görget",
     "Search failed": "Keresés sikertelen",
-    "Searches DuckDuckGo for results": "Keresés DuckDuckGo-val",
+    "Searches DuckDuckGo for results": "Keresés DuckDuckGóval",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s %(dateTime)s időpontban látta",
     "Send anyway": "Küld mindenképpen",
     "Send Reset Email": "Visszaállítási e-mail küldése",
@@ -326,25 +326,25 @@
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
-    "Sun": "Vas",
-    "Mon": "Hé",
-    "Tue": "K",
-    "Wed": "Sze",
-    "Thu": "Csüt",
-    "Fri": "Pé",
-    "Sat": "Szo",
-    "Jan": "Jan",
-    "Feb": "Feb",
-    "Mar": "Már",
-    "Apr": "Ápr",
-    "May": "Máj",
-    "Jun": "Jún",
-    "Jul": "Júl",
-    "Aug": "Aug",
-    "Sep": "Szept",
-    "Oct": "Okt",
-    "Nov": "Nov",
-    "Dec": "Dec",
+    "Sun": "vas",
+    "Mon": "hé",
+    "Tue": "k",
+    "Wed": "sze",
+    "Thu": "csü",
+    "Fri": "pé",
+    "Sat": "szo",
+    "Jan": "jan",
+    "Feb": "feb",
+    "Mar": "már",
+    "Apr": "ápr",
+    "May": "máj",
+    "Jun": "jún",
+    "Jul": "júl",
+    "Aug": "aug",
+    "Sep": "szept",
+    "Oct": "okt",
+    "Nov": "nov",
+    "Dec": "dec",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
@@ -663,10 +663,10 @@
     "expand": "kinyit",
     "Call Failed": "Sikertelen hívás",
     "Review Devices": "Eszközök áttekintése",
-    "Call Anyway": "Mindenképpen hívj",
-    "Answer Anyway": "Mindenképpen felvesz",
+    "Call Anyway": "Hívás mindenképpen",
+    "Answer Anyway": "Felvétel mindenképpen",
     "Call": "Hívás",
-    "Answer": "Felvesz",
+    "Answer": "Felvétel",
     "Send": "Elküld",
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
     "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.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
@@ -1183,7 +1183,7 @@
     "Create account": "Fiók létrehozása",
     "Keep going...": "Így tovább...",
     "Starting backup...": "Mentés indul...",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A Biztonságos Üzenetekhez új visszaállítási jelmondatot és kulcsot észleltünk.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "A Biztonságos üzenetekhez új visszaállítási jelmondatot és kulcsot észleltünk.",
     "Recovery Method Removed": "Visszaállítási eljárás törölve",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem te törölted a visszaállítási eljárást, akkor egy támadó hozzá akar férni a fiókodhoz. Azonnal változtasd meg a jelszavadat és állíts be egy visszaállítási eljárást a Beállításokban.",
     "Chat with Riot Bot": "Csevegés a Riot Robottal",
@@ -1374,7 +1374,7 @@
     "The homeserver may be unavailable or overloaded.": "A Matrix szerver elérhetetlen vagy túlterhelt.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Használsz vagy nem „morzsákat” (profilképek a szobalista felett)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Használsz-e „morzsákat” (profilképek a szobalista felett)",
     "Replying With Files": "Válasz fájlokkal",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyenlőre nem lehet fájlal válaszolni. Szeretnéd feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
     "The file '%(fileName)s' failed to upload.": "A %(fileName)s fájlt nem sikerült feltölteni.",
@@ -2122,7 +2122,7 @@
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után vagy másik munkamenetet használva nem tudod visszaállítani a titkosított üzeneteidet.",
     "Create key backup": "Kulcs mentés készítése",
     "This session is encrypting history using the new recovery method.": "Ez a munkamenet az új visszaállítási metódussal titkosítja a régi üzeneteket.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a visszaállítási jelmondat és a kulcs a Biztonságos Üzenetekhez törölve lett.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a visszaállítási jelmondat és a kulcs a Biztonságos üzenetekhez törölve lett.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ha véletlenül tetted, beállíthatod a Biztonságos Üzeneteket ezen a munkameneten ami újra titkosítja a régi üzeneteket az visszaállítási eljárással.",
     "Indexed rooms:": "Indexált szobák:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
@@ -2146,8 +2146,8 @@
     "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése",
     "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló visszaállítása",
     "The version of Riot": "Riot verziója",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hogy olyan eszközön használod a Riotot ahol az érintés az elsődleges beviteli forma",
-    "Whether you're using Riot as an installed Progressive Web App": "Hogy a Riotot mint progresszív webes alkalmazást használod",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Olyan eszközön használod-e a Riotot, ahol az érintés az elsődleges beviteli mód",
+    "Whether you're using Riot as an installed Progressive Web App": "A Riotot progresszív webalkalmazásként használod-e",
     "Your user agent": "Felhasználói ügynök",
     "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Az ellenőrizni kívánt munkamenet nem támogatja se a QR kód beolvasást se az emodzsi ellenőrzést, amit a Riot támogat. Próbáld meg egy másik klienssel.",

From 9a965566e3b7b21cc3cfe5ec399b84301b2e2401 Mon Sep 17 00:00:00 2001
From: lissitz <pbl1996@gmail.com>
Date: Sun, 23 Feb 2020 19:45:27 +0000
Subject: [PATCH 1207/3235] Translated using Weblate (Spanish)

Currently translated at 71.6% (1523 of 2126 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index f7206e1080..872bd7ab4c 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1519,5 +1519,22 @@
     "Verify the link in your inbox": "Verifica el enlace en tu bandeja de entrada",
     "Complete": "Completar",
     "Share": "Compartir",
-    "Remove %(email)s?": "¿Eliminar %(email)s?"
+    "Remove %(email)s?": "¿Eliminar %(email)s?",
+    "Backup is not signed by any of your sessions": "La copia de seguridad no está firmada por ninguna de tus sesiones",
+    "This backup is trusted because it has been restored on this session": "Esta copia de seguridad es de confianza porque ha sido restaurada en esta sesión",
+    "Backup key stored: ": "Clave de seguridad almacenada: ",
+    "Your keys are <b>not being backed up from this session</b>.": "<b>No se está haciendo una copia de seguridad de tus claves en esta sesión</b>.",
+    "Clear notifications": "Limpiar notificaciones",
+    "Enable desktop notifications for this session": "Habilitar notificaciones de escritorio para esta sesión",
+    "Enable audible notifications for this session": "Habilitar notificaciones sonoras para esta sesión",
+    "Checking server": "Comprobando servidor",
+    "Change identity server": "Cambiar servidor de identidad",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "¿Desconectarse del servidor de identidad <current /> y conectarse a <new/>?",
+    "Terms of service not accepted or the identity server is invalid.": "Términos de servicio no aceptados o el servidor de identidad es inválido.",
+    "The identity server you have chosen does not have any terms of service.": "El servidor de identidad que has elegido no tiene ningún término de servicio.",
+    "Disconnect identity server": "Desconectar servidor de identidad",
+    "Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
+    "Disconnect": "Desconectarse",
+    "You should:": "Deberías:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s de %(totalRooms)s"
 }

From ef1ba0cc87d559114975152ed21ee56926cd30ec Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 23 Feb 2020 09:47:44 +0000
Subject: [PATCH 1208/3235] Translated using Weblate (Turkish)

Currently translated at 72.2% (1535 of 2126 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 124dd076ee..13840a4601 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1536,5 +1536,19 @@
     "Someone is using an unknown session": "Birisi bilinmeyen bir oturum kullanıyor",
     "Everyone in this room is verified": "Bu odadaki herkes doğrulanmış",
     "Some sessions for this user are not trusted": "Bu kullanıcı için bazı oturumlar güvenilir değil",
-    "All sessions for this user are trusted": "Bu kullanıcı için tüm oturumlar güvenilir"
+    "All sessions for this user are trusted": "Bu kullanıcı için tüm oturumlar güvenilir",
+    "The version of Riot": "Riot sürümü",
+    "Your user agent": "Kullanıcı ajanınız",
+    "If you cancel now, you won't complete verifying the other user.": "Şimdi iptal ederseniz, diğer kullanıcıyı doğrulamayı tamamlamış olmayacaksınız.",
+    "If you cancel now, you won't complete verifying your other session.": "Şimdi iptal ederseniz, diğer oturumu doğrulamış olmayacaksınız.",
+    "Setting up keys": "Anahtarları ayarla",
+    "Custom (%(level)s)": "Özel (%(level)s)",
+    "Room contains unknown sessions": "Oda bilinmeyen oturumlar içeriyor",
+    "Unknown sessions": "Bilinmeyen oturumlar",
+    "Upload %(count)s other files|other": "%(count)s diğer dosyaları yükle",
+    "Upload %(count)s other files|one": "%(count)s dosyayı sağla",
+    "A widget would like to verify your identity": "Bir görsel tasarım kimliğinizi teyit etmek istiyor",
+    "Remember my selection for this widget": "Bu görsel bileşen işin seçimimi hatırla",
+    "Deny": "Reddet",
+    "Recovery key mismatch": "Kurtarma anahtarı uyumsuz"
 }

From 13b08b5fccb51ff93f04e3597473bfac13c09277 Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Mon, 24 Feb 2020 11:27:22 +0000
Subject: [PATCH 1209/3235] Revert "Fix escaped markdown passing backslashes
 through"

---
 src/editor/serialize.js       | 8 --------
 test/editor/serialize-test.js | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index 03f3759ea0..ba380f2809 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -41,14 +41,6 @@ export function htmlSerializeIfNeeded(model, {forceHTML = false} = {}) {
     if (!parser.isPlainText() || forceHTML) {
         return parser.toHTML();
     }
-    // Format "plain" text to ensure removal of backslash escapes
-    // https://github.com/vector-im/riot-web/issues/11230
-    // https://github.com/vector-im/riot-web/issues/2870
-    const postParsePlaintext = parser.toPlaintext();
-    if (postParsePlaintext !== md) {
-        // only return "formatted" text if it differs from the source text
-        return postParsePlaintext;
-    }
 }
 
 export function textSerialize(model) {
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index 9d116cdc4b..7517e46437 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -43,10 +43,4 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<em>hello</em> world");
     });
-    it('escaped markdown should not retain backslashes', function() {
-        const pc = createPartCreator();
-        const model = new EditorModel([pc.plain('\\*hello\\* world')]);
-        const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe('*hello* world');
-    });
 });

From 71bdc5987bf94012f8f10243cdd64b9ba67d9bf7 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 11:33:49 +0000
Subject: [PATCH 1210/3235] added clarifying comment

---
 src/components/views/dialogs/DevtoolsDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 0452e88dfa..53edf88698 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -637,6 +637,7 @@ function VerificationRequest({txnId, request}) {
     useEffect(() => {
         if (request.timeout == 0) return;
 
+        /* Note that request.timeout is a getter, so its value changes */
         const id = setInterval(() => {
            setTimeout(request.timeout);
         }, 500);

From af514385b2fa0d343df153385a35be9e51a50ef9 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 11:53:12 +0000
Subject: [PATCH 1211/3235] Avoid shadowing window.setTimeout

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

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 53edf88698..dc99ed680c 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -625,7 +625,7 @@ const PHASE_MAP = {
 
 function VerificationRequest({txnId, request}) {
     const [, updateState] = useState();
-    const [timeout, setTimeout] = useState(request.timeout);
+    const [timeout, setRequestTimeout] = useState(request.timeout);
 
     /* Re-render if something changes state */
     useEffect(() => {
@@ -639,7 +639,7 @@ function VerificationRequest({txnId, request}) {
 
         /* Note that request.timeout is a getter, so its value changes */
         const id = setInterval(() => {
-           setTimeout(request.timeout);
+           setRequestTimeout(request.timeout);
         }, 500);
 
         return () => { clearInterval(id); };

From 8e39bd8885c3ae0194cc2794ed9817b0bf42202d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 24 Feb 2020 12:36:25 +0000
Subject: [PATCH 1212/3235] Remove unused CIDER setting watcher

This setting watcher for CIDER seems unused and logs a warning at the moment, so
this change removes it.
---
 src/components/structures/RoomView.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index acc87d9616..0efa46416e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -460,8 +460,6 @@ export default createReactClass({
         // (We could use isMounted, but facebook have deprecated that.)
         this.unmounted = true;
 
-        SettingsStore.unwatchSetting(this._ciderWatcherRef);
-
         // update the scroll map before we get unmounted
         if (this.state.roomId) {
             RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());

From 2350d102e32d0e2c2f158bcc3fc1f8556e07bf5e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 24 Feb 2020 13:39:20 +0100
Subject: [PATCH 1213/3235] update phase when request prop changes

---
 src/components/views/right_panel/EncryptionPanel.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index a5685e0617..24d2f9f010 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -32,11 +32,14 @@ const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
 const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     const [request, setRequest] = useState(verificationRequest);
-    useEffect(() => {
-        setRequest(verificationRequest);
-    }, [verificationRequest]);
 
     const [phase, setPhase] = useState(request && request.phase);
+    useEffect(() => {
+        setRequest(verificationRequest);
+        if (verificationRequest) {
+            setPhase(verificationRequest.phase);
+        }
+    }, [verificationRequest]);
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {

From 0d3d837871518200f7ad2d01894b93cd5cd66611 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 13:44:04 +0000
Subject: [PATCH 1214/3235] useEventEmitter hook instead of manually using code

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

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index dc99ed680c..0420c038ca 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -22,6 +22,7 @@ import { _t } from '../../../languageHandler';
 import { Room } from "matrix-js-sdk";
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
 
 import {
     PHASE_UNSENT,
@@ -628,10 +629,7 @@ function VerificationRequest({txnId, request}) {
     const [timeout, setRequestTimeout] = useState(request.timeout);
 
     /* Re-render if something changes state */
-    useEffect(() => {
-        request.on("change", updateState);
-        return () => request.off("change", updateState);
-    }, [request]);
+    useEventEmitter(request, "change", updateState);
 
     /* Keep re-rendering if there's a timeout */
     useEffect(() => {

From f3ac3554a9ad13d0d56f1b70500e890b758941ad Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 14:17:34 +0000
Subject: [PATCH 1215/3235] include observeOnly

---
 src/components/views/dialogs/DevtoolsDialog.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 0420c038ca..348965582b 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -655,6 +655,8 @@ function VerificationRequest({txnId, request}) {
             <dd>{request.methods && request.methods.join(", ")}</dd>
             <dt>requestingUserId</dt>
             <dd>{request.requestingUserId}</dd>
+            <dt>observeOnly</dt>
+            <dd>{JSON.stringify(request.observeOnly)}</dd>
         </dl>
     </div>);
 }

From a71a234622036928d6c69d43b7ebd97df106e422 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 24 Feb 2020 15:04:34 +0000
Subject: [PATCH 1216/3235] Check for cross-signing homeserver support

This checks the homeserver to ensure it supports cross-signing (via the versions
feature flag) before attempting bootstrapping or offering user verification.

Fixes https://github.com/vector-im/riot-web/issues/11863
---
 .../keybackup/CreateKeyBackupDialog.js        | 26 +++++-------
 src/components/views/right_panel/UserInfo.js  | 35 ++++++++++------
 .../views/settings/CrossSigningPanel.js       | 42 +++++++++++++------
 .../views/settings/KeyBackupPanel.js          |  1 -
 src/hooks/useAsyncMemo.js                     | 25 +++++++++++
 src/i18n/strings/en_EN.json                   |  5 ++-
 6 files changed, 92 insertions(+), 42 deletions(-)
 create mode 100644 src/hooks/useAsyncMemo.js

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index f89fb17448..3a480a2579 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -53,7 +53,6 @@ function selectText(target) {
  */
 export default class CreateKeyBackupDialog extends React.PureComponent {
     static propTypes = {
-        secureSecretStorage: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
     }
 
@@ -65,7 +64,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         this._setZxcvbnResultTimeout = null;
 
         this.state = {
-            secureSecretStorage: props.secureSecretStorage,
+            secureSecretStorage: null,
             phase: PHASE_PASSPHRASE,
             passPhrase: '',
             passPhraseConfirm: '',
@@ -73,23 +72,20 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             downloaded: false,
             zxcvbnResult: null,
         };
-
-        if (this.state.secureSecretStorage === undefined) {
-            this.state.secureSecretStorage =
-                SettingsStore.isFeatureEnabled("feature_cross_signing");
-        }
-
-        // If we're using secret storage, skip ahead to the backing up step, as
-        // `accessSecretStorage` will handle passphrases as needed.
-        if (this.state.secureSecretStorage) {
-            this.state.phase = PHASE_BACKINGUP;
-        }
     }
 
-    componentDidMount() {
+    async componentDidMount() {
+        const cli = MatrixClientPeg.get();
+        const secureSecretStorage = (
+            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
+        );
+        this.setState({ secureSecretStorage });
+
         // If we're using secret storage, skip ahead to the backing up step, as
         // `accessSecretStorage` will handle passphrases as needed.
-        if (this.state.secureSecretStorage) {
+        if (secureSecretStorage) {
+            this.setState({ phase: PHASE_BACKINGUP });
             this._createBackup();
         }
     }
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 1174f45640..44770d9ccc 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -42,6 +42,7 @@ import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
+import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -916,6 +917,12 @@ const useIsSynapseAdmin = (cli) => {
     return isAdmin;
 };
 
+const useHomeserverSupportsCrossSigning = (cli) => {
+    return useAsyncMemo(async () => {
+        return cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
+    }, [cli], false);
+};
+
 function useRoomPermissions(cli, room, user) {
     const [roomPermissions, setRoomPermissions] = useState({
         // modifyLevelMax is the max PL we can set this user to, typically min(their PL, our PL) && canSetPL
@@ -1315,19 +1322,23 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
-    const userTrust = cli.checkUserTrust(member.userId);
-    const userVerified = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
-        userTrust.isCrossSigningVerified() :
-        userTrust.isVerified();
-    const isMe = member.userId === cli.getUserId();
-
     let verifyButton;
-    if (isRoomEncrypted && !userVerified && !isMe) {
-        verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
-                {_t("Verify")}
-            </AccessibleButton>
-        );
+    const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli);
+    if (
+        SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+        homeserverSupportsCrossSigning
+    ) {
+        const userTrust = cli.checkUserTrust(member.userId);
+        const userVerified = userTrust.isCrossSigningVerified();
+        const isMe = member.userId === cli.getUserId();
+
+        if (isRoomEncrypted && !userVerified && !isMe) {
+            verifyButton = (
+                <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
+                    {_t("Verify")}
+                </AccessibleButton>
+            );
+        }
     }
 
     let devicesSection;
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 6e69227844..aba2d03ad2 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -72,11 +72,14 @@ export default class CrossSigningPanel extends React.PureComponent {
         const crossSigningPublicKeysOnDevice = crossSigning.getId();
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
         const secretStorageKeyInAccount = await secretStorage.hasKey();
+        const homeserverSupportsCrossSigning =
+            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
 
         this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
+            homeserverSupportsCrossSigning,
         });
     }
 
@@ -120,6 +123,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
+            homeserverSupportsCrossSigning,
         } = this.state;
 
         let errorSection;
@@ -127,13 +131,19 @@ export default class CrossSigningPanel extends React.PureComponent {
             errorSection = <div className="error">{error.toString()}</div>;
         }
 
-        const enabled = (
+        // Whether the various keys exist on your account (but not necessarily
+        // on this device).
+        const enabledForAccount = (
             crossSigningPrivateKeysInStorage &&
             secretStorageKeyInAccount
         );
 
         let summarisedStatus;
-        if (enabled && crossSigningPublicKeysOnDevice) {
+        if (!homeserverSupportsCrossSigning) {
+            summarisedStatus = <p>{_t(
+                "Your homeserver does not support cross-signing.",
+            )}</p>;
+        } else if (enabledForAccount && crossSigningPublicKeysOnDevice) {
             summarisedStatus = <p>✅ {_t(
                 "Cross-signing and secret storage are enabled.",
             )}</p>;
@@ -149,18 +159,18 @@ export default class CrossSigningPanel extends React.PureComponent {
         }
 
         let bootstrapButton;
-        if (!enabled) {
-            bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
-                <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
-                    {_t("Bootstrap cross-signing and secret storage")}
-                </AccessibleButton>
-            </div>;
-        } else {
-            bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
+        if (enabledForAccount) {
+            bootstrapButton = (
                 <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
                     {_t("Reset cross-signing and secret storage")}
                 </AccessibleButton>
-            </div>;
+            );
+        } else if (!enabledForAccount && homeserverSupportsCrossSigning) {
+            bootstrapButton = (
+                <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
+                    {_t("Bootstrap cross-signing and secret storage")}
+                </AccessibleButton>
+            );
         }
 
         return (
@@ -181,10 +191,16 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Secret storage public key:")}</td>
                             <td>{secretStorageKeyInAccount ? _t("in account data") : _t("not found")}</td>
                         </tr>
-                    </tbody></table>
+                        <tr>
+                            <td>{_t("Homeserver feature support:")}</td>
+                            <td>{homeserverSupportsCrossSigning ? _t("exists") : _t("not found")}</td>
+                        </tr>
+                   </tbody></table>
                 </details>
                 {errorSection}
-                {bootstrapButton}
+                <div className="mx_CrossSigningPanel_buttonRow">
+                    {bootstrapButton}
+                </div>
             </div>
         );
     }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index f3fe171e63..73be2bad9f 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,7 +127,6 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
                 onFinished: () => {
                     this._loadBackupStatus();
                 },
diff --git a/src/hooks/useAsyncMemo.js b/src/hooks/useAsyncMemo.js
new file mode 100644
index 0000000000..ef7d256b04
--- /dev/null
+++ b/src/hooks/useAsyncMemo.js
@@ -0,0 +1,25 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { useState, useEffect } from 'react';
+
+export const useAsyncMemo = (fn, deps, initialValue) => {
+    const [value, setValue] = useState(initialValue);
+    useEffect(() => {
+        fn().then(setValue);
+    }, deps); // eslint-disable-line react-hooks/exhaustive-deps
+    return value;
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b55b28ce97..1ddea1149f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -562,11 +562,12 @@
     "New Password": "New Password",
     "Confirm password": "Confirm password",
     "Change Password": "Change Password",
+    "Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
     "Cross-signing and secret storage are enabled.": "Cross-signing and secret storage are enabled.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
-    "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
     "Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
+    "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",
@@ -574,6 +575,8 @@
     "in secret storage": "in secret storage",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
+    "Homeserver feature support:": "Homeserver feature support:",
+    "exists": "exists",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
     "Authentication": "Authentication",

From 818156663aa7878a412289a5ba76be7ed04dfa1e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 24 Feb 2020 13:48:41 +0100
Subject: [PATCH 1217/3235] don't leak if show_sas never comes (or already
 came)

---
 src/components/views/right_panel/VerificationPanel.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 45a9b9eddb..5dd01c9f79 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -270,6 +270,8 @@ export default class VerificationPanel extends React.PureComponent {
     };
 
     _onVerifierShowSas = (sasEvent) => {
+        const {request} = this.props;
+        request.verifier.off('show_sas', this._onVerifierShowSas);
         this.setState({sasEvent});
     };
 
@@ -278,7 +280,7 @@ export default class VerificationPanel extends React.PureComponent {
         const hadVerifier = this._hasVerifier;
         this._hasVerifier = !!request.verifier;
         if (!hadVerifier && this._hasVerifier) {
-            request.verifier.once('show_sas', this._onVerifierShowSas);
+            request.verifier.on('show_sas', this._onVerifierShowSas);
             try {
                 // on the requester side, this is also awaited in _startSAS,
                 // but that's ok as verify should return the same promise.
@@ -299,6 +301,10 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     componentWillUnmount() {
-        this.props.request.off("change", this._onRequestChange);
+        const {request} = this.props;
+        if (request.verifier) {
+            request.verifier.off('show_sas', this._onVerifierShowSas);
+        }
+        request.off("change", this._onRequestChange);
     }
 }

From 91b85cd0605e3e685ed16e387f778ada3b4a7065 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 16:51:06 +0000
Subject: [PATCH 1218/3235] show cancel events as hidden events if we wouldn't
 usually render them

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index bba2310281..3711b5599a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -100,6 +100,15 @@ export function getHandlerTile(ev) {
         }
     }
 
+    // sometimes MKeyVerificationConclusion declines to render.  Jankily decline to render and
+    // fall back to showing hidden events, if we're viewing hidden events
+    if (type === "m.key.verification.cancel" && SettingsStore.getValue("showHiddenEventsInTimeline")) {
+        const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
+        if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
+            return;
+        }
+    }
+
     return ev.isState() ? stateEventTileTypes[type] : eventTileTypes[type];
 }
 

From d01c58bd4139372d7ef727cc0fee5e9a8b163839 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 16:54:10 +0000
Subject: [PATCH 1219/3235] added comment

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 3711b5599a..916ddc3c5b 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -102,6 +102,8 @@ export function getHandlerTile(ev) {
 
     // sometimes MKeyVerificationConclusion declines to render.  Jankily decline to render and
     // fall back to showing hidden events, if we're viewing hidden events
+    // XXX: This is extremely a hack. Possibly these components should have an interface for
+    // declining to render?
     if (type === "m.key.verification.cancel" && SettingsStore.getValue("showHiddenEventsInTimeline")) {
         const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
         if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {

From 9bcea0aecaaa5914aa8306b37fd1fe178db951e1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Feb 2020 17:11:08 +0000
Subject: [PATCH 1220/3235] Notify electron of language changes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js    | 2 ++
 src/languageHandler.js | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 14e34a1f40..295f99f6b4 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -162,4 +162,6 @@ export default class BasePlatform {
     getEventIndexingManager(): BaseEventIndexManager | null {
         return null;
     }
+
+    async setLanguage(preferredLangs: string[]): Promise<void> {}
 }
diff --git a/src/languageHandler.js b/src/languageHandler.js
index ddb7e2718c..79a172015a 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -21,6 +21,7 @@ import request from 'browser-request';
 import counterpart from 'counterpart';
 import React from 'react';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import PlatformPeg from "./PlatformPeg";
 
 // $webapp is a webpack resolve alias pointing to the output directory, see webpack config
 import webpackLangJsonUrl from "$webapp/i18n/languages.json";
@@ -285,6 +286,11 @@ export function setLanguage(preferredLangs) {
         preferredLangs = [preferredLangs];
     }
 
+    const plaf = PlatformPeg.get();
+    if (plaf) {
+        plaf.setLanguage(preferredLangs);
+    }
+
     let langToUse;
     let availLangs;
     return getLangsJson().then((result) => {

From 3302469a2b4368500d20840a1f101781b5ef3711 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 24 Feb 2020 18:04:11 +0000
Subject: [PATCH 1221/3235] Catch errors sooner so users can recover more
 easily

---
 res/css/views/rooms/_EventTile.scss           | 14 ++++
 src/components/structures/MessagePanel.js     | 76 ++++++++++---------
 .../views/messages/TileErrorBoundary.js       | 70 +++++++++++++++++
 src/i18n/strings/en_EN.json                   |  1 +
 4 files changed, 126 insertions(+), 35 deletions(-)
 create mode 100644 src/components/views/messages/TileErrorBoundary.js

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index d292c729dd..68aca63459 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -653,3 +653,17 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
         }
     }
 }
+
+.mx_EventTile_tileError {
+    color: red;
+
+    .mx_EventTile_line span {
+        padding: 4px 8px;
+        border-radius: 11px;
+        box-shadow: 0px 0px 3px red inset;
+    }
+
+    a {
+        margin-left: 1em;
+    }
+}
\ No newline at end of file
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index b8b11fbb31..e6f8de61a9 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -502,6 +502,7 @@ export default class MessagePanel extends React.Component {
     }
 
     _getTilesForEvent(prevEvent, mxEv, last) {
+        const TileErrorBoundary = sdk.getComponent('messages.TileErrorBoundary');
         const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const ret = [];
@@ -575,25 +576,27 @@ export default class MessagePanel extends React.Component {
                 ref={this._collectEventNode.bind(this, eventId)}
                 data-scroll-tokens={scrollToken}
             >
-                <EventTile mxEvent={mxEv}
-                    continuation={continuation}
-                    isRedacted={mxEv.isRedacted()}
-                    replacingEventId={mxEv.replacingEventId()}
-                    editState={isEditing && this.props.editState}
-                    onHeightChanged={this._onHeightChanged}
-                    readReceipts={readReceipts}
-                    readReceiptMap={this._readReceiptMap}
-                    showUrlPreview={this.props.showUrlPreview}
-                    checkUnmounting={this._isUnmounting.bind(this)}
-                    eventSendStatus={mxEv.getAssociatedStatus()}
-                    tileShape={this.props.tileShape}
-                    isTwelveHour={this.props.isTwelveHour}
-                    permalinkCreator={this.props.permalinkCreator}
-                    last={last}
-                    isSelectedEvent={highlight}
-                    getRelationsForEvent={this.props.getRelationsForEvent}
-                    showReactions={this.props.showReactions}
-                />
+                <TileErrorBoundary>
+                    <EventTile mxEvent={mxEv}
+                        continuation={continuation}
+                        isRedacted={mxEv.isRedacted()}
+                        replacingEventId={mxEv.replacingEventId()}
+                        editState={isEditing && this.props.editState}
+                        onHeightChanged={this._onHeightChanged}
+                        readReceipts={readReceipts}
+                        readReceiptMap={this._readReceiptMap}
+                        showUrlPreview={this.props.showUrlPreview}
+                        checkUnmounting={this._isUnmounting.bind(this)}
+                        eventSendStatus={mxEv.getAssociatedStatus()}
+                        tileShape={this.props.tileShape}
+                        isTwelveHour={this.props.isTwelveHour}
+                        permalinkCreator={this.props.permalinkCreator}
+                        last={last}
+                        isSelectedEvent={highlight}
+                        getRelationsForEvent={this.props.getRelationsForEvent}
+                        showReactions={this.props.showReactions}
+                    />
+                </TileErrorBoundary>
             </li>,
         );
 
@@ -755,6 +758,7 @@ export default class MessagePanel extends React.Component {
     }
 
     render() {
+        const ErrorBoundary = sdk.getComponent('elements.ErrorBoundary');
         const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
         const WhoIsTypingTile = sdk.getComponent("rooms.WhoIsTypingTile");
         const Spinner = sdk.getComponent("elements.Spinner");
@@ -787,22 +791,24 @@ export default class MessagePanel extends React.Component {
         }
 
         return (
-            <ScrollPanel
-                ref={this._scrollPanel}
-                className={className}
-                onScroll={this.props.onScroll}
-                onResize={this.onResize}
-                onFillRequest={this.props.onFillRequest}
-                onUnfillRequest={this.props.onUnfillRequest}
-                style={style}
-                stickyBottom={this.props.stickyBottom}
-                resizeNotifier={this.props.resizeNotifier}
-            >
-                { topSpinner }
-                { this._getEventTiles() }
-                { whoIsTyping }
-                { bottomSpinner }
-            </ScrollPanel>
+            <ErrorBoundary>
+                <ScrollPanel
+                    ref={this._scrollPanel}
+                    className={className}
+                    onScroll={this.props.onScroll}
+                    onResize={this.onResize}
+                    onFillRequest={this.props.onFillRequest}
+                    onUnfillRequest={this.props.onUnfillRequest}
+                    style={style}
+                    stickyBottom={this.props.stickyBottom}
+                    resizeNotifier={this.props.resizeNotifier}
+                >
+                    { topSpinner }
+                    { this._getEventTiles() }
+                    { whoIsTyping }
+                    { bottomSpinner }
+                </ScrollPanel>
+            </ErrorBoundary>
         );
     }
 }
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.js
new file mode 100644
index 0000000000..372d402899
--- /dev/null
+++ b/src/components/views/messages/TileErrorBoundary.js
@@ -0,0 +1,70 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 classNames from 'classnames';
+import { _t } from '../../../languageHandler';
+import * as sdk from '../../../index';
+import Modal from '../../../Modal';
+
+export default class TileErrorBoundary extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            error: null,
+        };
+    }
+
+    static getDerivedStateFromError(error) {
+        // Side effects are not permitted here, so we only update the state so
+        // that the next render shows an error message.
+        return { error };
+    }
+
+    _onBugReport = () => {
+        const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
+        if (!BugReportDialog) {
+            return;
+        }
+        Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {
+            label: 'react-soft-crash-tile',
+        });
+    };
+
+    render() {
+        if (this.state.error) {
+            const classes = {
+                mx_EventTile: true,
+                mx_EventTile_info: true,
+                mx_EventTile_content: true,
+                mx_EventTile_tileError: true,
+            };
+            return (<div className={classNames(classes)}>
+                <div className="mx_EventTile_line">
+                    <span>
+                        {_t("An error occurred while rendering this event.")}
+                        <a onClick={this._onBugReport} href="#">
+                            {_t("Submit debug logs")}
+                        </a>
+                    </span>
+                </div>
+            </div>);
+        }
+
+        return this.props.children;
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d030f5118..adce7f9a03 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1268,6 +1268,7 @@
     "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?": "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?",
     "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
     "edited": "edited",
+    "An error occurred while rendering this event.": "An error occurred while rendering this event.",
     "Removed or unknown message type": "Removed or unknown message type",
     "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Message removed": "Message removed",

From 550ee216c64bace5a4b728e77a705d745a5e9cc1 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 24 Feb 2020 18:22:07 -0600
Subject: [PATCH 1222/3235] Apply suggestions from code review

Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index dd6addd062..52947aa6e2 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -371,8 +371,8 @@ export default class BasicMessageEditor extends React.Component {
             this._onFormatAction("quote");
             handled = true;
         // redo
-        } else if ((modKey && event.key === Key.Y) ||
-                  (IS_MAC && event.shiftKey && event.key === Key.Z)) {
+        } else if ((!IS_MAC && modKey && event.key === Key.Y) ||
+                  (IS_MAC && modkey && event.shiftKey && event.key === Key.Z)) {
             if (this.historyManager.canRedo()) {
                 const {parts, caret} = this.historyManager.redo();
                 // pass matching inputType so historyManager doesn't push echo

From 866ed68615fadb80315e89813a235997ea6c96ff Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 24 Feb 2020 19:43:11 -0700
Subject: [PATCH 1223/3235] Ensure DMs tagged outside of account data work in
 the invite dialog

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

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
---
 src/actions/RoomListActions.js               | 14 +++++++-------
 src/components/views/dialogs/InviteDialog.js | 19 ++++++++++++++++++-
 src/components/views/rooms/RoomList.js       |  8 ++++----
 src/stores/RoomListStore.js                  | 13 ++++++++-----
 test/components/views/rooms/RoomList-test.js | 15 ++++++++-------
 5 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index d534fe5d1d..10a3848dda 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { asyncAction } from './actionCreators';
-import RoomListStore from '../stores/RoomListStore';
+import RoomListStore, {TAG_DM} from '../stores/RoomListStore';
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
@@ -73,11 +73,11 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         const roomId = room.roomId;
 
         // Evil hack to get DMs behaving
-        if ((oldTag === undefined && newTag === 'im.vector.fake.direct') ||
-            (oldTag === 'im.vector.fake.direct' && newTag === undefined)
+        if ((oldTag === undefined && newTag === TAG_DM) ||
+            (oldTag === TAG_DM && newTag === undefined)
         ) {
             return Rooms.guessAndSetDMRoom(
-                room, newTag === 'im.vector.fake.direct',
+                room, newTag === TAG_DM,
             ).catch((err) => {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Failed to set direct chat tag " + err);
@@ -91,10 +91,10 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         const hasChangedSubLists = oldTag !== newTag;
 
         // More evilness: We will still be dealing with moving to favourites/low prio,
-        // but we avoid ever doing a request with 'im.vector.fake.direct`.
+        // but we avoid ever doing a request with TAG_DM.
         //
         // if we moved lists, remove the old tag
-        if (oldTag && oldTag !== 'im.vector.fake.direct' &&
+        if (oldTag && oldTag !== TAG_DM &&
             hasChangedSubLists
         ) {
             const promiseToDelete = matrixClient.deleteRoomTag(
@@ -112,7 +112,7 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         }
 
         // if we moved lists or the ordering changed, add the new tag
-        if (newTag && newTag !== 'im.vector.fake.direct' &&
+        if (newTag && newTag !== TAG_DM &&
             (hasChangedSubLists || metaData)
         ) {
             // metaData is the body of the PUT to set the tag, so it must
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 15e307fcd0..d229a4eedd 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -34,6 +34,7 @@ import {humanizeTime} from "../../../utils/humanize";
 import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
 import SettingsStore from '../../../settings/SettingsStore';
+import RoomListStore, {TAG_DM} from "../../../stores/RoomListStore";
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
@@ -332,7 +333,23 @@ export default class InviteDialog extends React.PureComponent {
     }
 
     _buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
-        const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
+        const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
+
+        // Also pull in all the rooms tagged as m.direct so we don't miss anything. Sometimes the
+        // room list doesn't tag the room for the DMRoomMap, but does for the room list.
+        const taggedRooms = RoomListStore.getRoomLists();
+        const dmTaggedRooms = taggedRooms[TAG_DM];
+        const myUserId = MatrixClientPeg.get().getUserId();
+        for (const dmRoom of dmTaggedRooms) {
+            const otherMembers = dmRoom.getJoinedMembers().filter(u => u.userId !== myUserId);
+            for (const member of otherMembers) {
+                if (rooms[member.userId]) continue; // already have a room
+
+                console.warn(`Adding DM room for ${member.userId} as ${dmRoom.roomId} from tag, not DM map`);
+                rooms[member.userId] = dmRoom;
+            }
+        }
+
         const recents = [];
         for (const userId in rooms) {
             // Filter out user IDs that are already in the room / should be excluded
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f41400ecfc..99f30d9ba1 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -28,7 +28,7 @@ import rate_limited_func from "../../../ratelimitedfunc";
 import * as Rooms from '../../../Rooms';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import TagOrderStore from '../../../stores/TagOrderStore';
-import RoomListStore from '../../../stores/RoomListStore';
+import RoomListStore, {TAG_DM} from '../../../stores/RoomListStore';
 import CustomRoomTagStore from '../../../stores/CustomRoomTagStore';
 import GroupStore from '../../../stores/GroupStore';
 import RoomSubList from '../../structures/RoomSubList';
@@ -718,11 +718,11 @@ export default createReactClass({
                 incomingCall: incomingCallIfTaggedAs('m.favourite'),
             },
             {
-                list: this.state.lists['im.vector.fake.direct'],
+                list: this.state.lists[TAG_DM],
                 label: _t('Direct Messages'),
-                tagName: "im.vector.fake.direct",
+                tagName: TAG_DM,
                 order: "recent",
-                incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),
+                incomingCall: incomingCallIfTaggedAs(TAG_DM),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_chat'});},
                 addRoomLabel: _t("Start chat"),
             },
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index a0785cf10e..0a38ac6591 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -37,11 +37,14 @@ const CATEGORY_BOLD = "bold";   // Unread messages (not notified, 'Mentions Only
 const CATEGORY_IDLE = "idle";   // Nothing of interest
 
 const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
+
+export const TAG_DM = "im.vector.fake.direct";
+
 const LIST_ORDERS = {
     "m.favourite": "manual",
     "im.vector.fake.invite": "recent",
     "im.vector.fake.recent": "recent",
-    "im.vector.fake.direct": "recent",
+    [TAG_DM]: "recent",
     "m.lowpriority": "recent",
     "im.vector.fake.archived": "recent",
 };
@@ -95,7 +98,7 @@ class RoomListStore extends Store {
             "im.vector.fake.invite": [],
             "m.favourite": [],
             "im.vector.fake.recent": [],
-            "im.vector.fake.direct": [],
+            [TAG_DM]: [],
             "m.lowpriority": [],
             "im.vector.fake.archived": [],
         };
@@ -323,7 +326,7 @@ class RoomListStore extends Store {
             } else if (dmRoomMap.getUserIdForRoomId(room.roomId) && tags.length === 0) {
                 // We intentionally don't duplicate rooms in other tags into the people list
                 // as a feature.
-                tags.push("im.vector.fake.direct");
+                tags.push(TAG_DM);
             } else if (tags.length === 0) {
                 tags.push("im.vector.fake.recent");
             }
@@ -553,7 +556,7 @@ class RoomListStore extends Store {
             "im.vector.fake.invite": [],
             "m.favourite": [],
             "im.vector.fake.recent": [],
-            "im.vector.fake.direct": [],
+            [TAG_DM]: [],
             "m.lowpriority": [],
             "im.vector.fake.archived": [],
         };
@@ -590,7 +593,7 @@ class RoomListStore extends Store {
                     }
                 } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
-                    lists["im.vector.fake.direct"].push({room, category: this._calculateCategory(room)});
+                    lists[TAG_DM].push({room, category: this._calculateCategory(room)});
                 } else {
                     lists["im.vector.fake.recent"].push({room, category: this._calculateCategory(room)});
                 }
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index dc92221c21..8dc4647920 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -14,6 +14,7 @@ import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
 import GroupStore from '../../../../src/stores/GroupStore.js';
 
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
+import {TAG_DM} from "../../../../src/stores/RoomListStore";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
@@ -152,7 +153,7 @@ describe('RoomList', () => {
         // Set up the room that will be moved such that it has the correct state for a room in
         // the section for oldTag
         if (['m.favourite', 'm.lowpriority'].includes(oldTag)) movingRoom.tags = {[oldTag]: {}};
-        if (oldTag === 'im.vector.fake.direct') {
+        if (oldTag === TAG_DM) {
             // Mock inverse m.direct
             DMRoomMap.shared().roomToUser = {
                 [movingRoom.roomId]: '@someotheruser:domain',
@@ -179,7 +180,7 @@ describe('RoomList', () => {
         // TODO: Re-enable dragging tests when we support dragging again.
         describe.skip('does correct optimistic update when dragging from', () => {
             it('rooms to people', () => {
-                expectCorrectMove(undefined, 'im.vector.fake.direct');
+                expectCorrectMove(undefined, TAG_DM);
             });
 
             it('rooms to favourites', () => {
@@ -194,15 +195,15 @@ describe('RoomList', () => {
             // Whe running the app live, it updates when some other event occurs (likely the
             // m.direct arriving) that these tests do not fire.
             xit('people to rooms', () => {
-                expectCorrectMove('im.vector.fake.direct', undefined);
+                expectCorrectMove(TAG_DM, undefined);
             });
 
             it('people to favourites', () => {
-                expectCorrectMove('im.vector.fake.direct', 'm.favourite');
+                expectCorrectMove(TAG_DM, 'm.favourite');
             });
 
             it('people to lowpriority', () => {
-                expectCorrectMove('im.vector.fake.direct', 'm.lowpriority');
+                expectCorrectMove(TAG_DM, 'm.lowpriority');
             });
 
             it('low priority to rooms', () => {
@@ -210,7 +211,7 @@ describe('RoomList', () => {
             });
 
             it('low priority to people', () => {
-                expectCorrectMove('m.lowpriority', 'im.vector.fake.direct');
+                expectCorrectMove('m.lowpriority', TAG_DM);
             });
 
             it('low priority to low priority', () => {
@@ -222,7 +223,7 @@ describe('RoomList', () => {
             });
 
             it('favourites to people', () => {
-                expectCorrectMove('m.favourite', 'im.vector.fake.direct');
+                expectCorrectMove('m.favourite', TAG_DM);
             });
 
             it('favourites to low priority', () => {

From 0d03a8791dc6ba1cdb7ec7dd1e0290f09fcc0b7f Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 25 Feb 2020 10:20:42 +0000
Subject: [PATCH 1224/3235] style lint

---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 68aca63459..9e683c5fe4 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -666,4 +666,4 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     a {
         margin-left: 1em;
     }
-}
\ No newline at end of file
+}

From adf6dfe4ea831e08730485f85147d9805f711aa8 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 25 Feb 2020 10:30:35 +0000
Subject: [PATCH 1225/3235] Threaded through the event type to the user

---
 src/components/structures/MessagePanel.js          | 2 +-
 src/components/views/messages/TileErrorBoundary.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e6f8de61a9..d35b0fce1f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -576,7 +576,7 @@ export default class MessagePanel extends React.Component {
                 ref={this._collectEventNode.bind(this, eventId)}
                 data-scroll-tokens={scrollToken}
             >
-                <TileErrorBoundary>
+                <TileErrorBoundary mxEvent={mxEv}>
                     <EventTile mxEvent={mxEv}
                         continuation={continuation}
                         isRedacted={mxEv.isRedacted()}
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.js
index 372d402899..a8e7b144f2 100644
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.js
@@ -47,6 +47,7 @@ export default class TileErrorBoundary extends React.Component {
 
     render() {
         if (this.state.error) {
+            const { mxEvent } = this.props;
             const classes = {
                 mx_EventTile: true,
                 mx_EventTile_info: true,
@@ -57,6 +58,7 @@ export default class TileErrorBoundary extends React.Component {
                 <div className="mx_EventTile_line">
                     <span>
                         {_t("An error occurred while rendering this event.")}
+                        { mxEvent && ` [${mxEvent.getType()}]` }
                         <a onClick={this._onBugReport} href="#">
                             {_t("Submit debug logs")}
                         </a>

From e63370799ee8f8defdf343d2e8a220b43b6968cf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Feb 2020 10:57:40 +0000
Subject: [PATCH 1226/3235] make BasePlatform::setLanguage sync, handle
 promises internally

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 295f99f6b4..a935f4a767 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -163,5 +163,5 @@ export default class BasePlatform {
         return null;
     }
 
-    async setLanguage(preferredLangs: string[]): Promise<void> {}
+    setLanguage(preferredLangs: string[]) {}
 }

From 12e8ad8f6bb8d4b68b61e165db104489cc2e2b19 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 25 Feb 2020 11:23:51 +0000
Subject: [PATCH 1227/3235] Show both bootstrap and reset cross-signing where
 appropriate

For cases like having keys on your account but not on the current device, this
ensures we offer both bootstrap and reset as possible paths.
---
 .../views/settings/CrossSigningPanel.js       | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index aba2d03ad2..d583210c9a 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -158,18 +158,27 @@ export default class CrossSigningPanel extends React.PureComponent {
             )}</p>;
         }
 
-        let bootstrapButton;
+        let resetButton;
         if (enabledForAccount) {
-            bootstrapButton = (
-                <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
-                    {_t("Reset cross-signing and secret storage")}
-                </AccessibleButton>
+            resetButton = (
+                <div className="mx_CrossSigningPanel_buttonRow">
+                    <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
+                        {_t("Reset cross-signing and secret storage")}
+                    </AccessibleButton>
+                </div>
             );
-        } else if (!enabledForAccount && homeserverSupportsCrossSigning) {
+        }
+        let bootstrapButton;
+        if (
+            (!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
+            homeserverSupportsCrossSigning
+        ) {
             bootstrapButton = (
-                <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
-                    {_t("Bootstrap cross-signing and secret storage")}
-                </AccessibleButton>
+                <div className="mx_CrossSigningPanel_buttonRow">
+                    <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
+                        {_t("Bootstrap cross-signing and secret storage")}
+                    </AccessibleButton>
+                </div>
             );
         }
 
@@ -198,9 +207,8 @@ export default class CrossSigningPanel extends React.PureComponent {
                    </tbody></table>
                 </details>
                 {errorSection}
-                <div className="mx_CrossSigningPanel_buttonRow">
-                    {bootstrapButton}
-                </div>
+                {bootstrapButton}
+                {resetButton}
             </div>
         );
     }

From 9ed83b8648e9a33443d6f77a9b95fcce1cc1ee9c Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 25 Feb 2020 11:34:01 +0000
Subject: [PATCH 1228/3235] Show a warning dialog when user indicates a new
 session wasn't them

---
 .../views/dialogs/NewSessionReviewDialog.js   | 20 ++++++++++++++++++-
 .../views/toasts/UnverifiedSessionToast.js    |  6 ++++++
 src/i18n/strings/en_EN.json                   |  5 +++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 0019e0644f..4cc8cb54ed 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -23,6 +23,7 @@ import VerificationRequestDialog from './VerificationRequestDialog';
 import BaseDialog from './BaseDialog';
 import DialogButtons from '../elements/DialogButtons';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import * as sdk from '../../../index';
 
 @replaceableComponent("views.dialogs.NewSessionReviewDialog")
 export default class NewSessionReviewDialog extends React.PureComponent {
@@ -33,7 +34,24 @@ export default class NewSessionReviewDialog extends React.PureComponent {
     }
 
     onCancelClick = () => {
-        this.props.onFinished(false);
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        Modal.createTrackedDialog("Verification failed", "insecure", ErrorDialog, {
+            headerImage: require("../../../../res/img/e2e/warning.svg"),
+            title: _t("Your account is not secure"),
+            description: <div>
+                {_t("One of the following may be compromised:")}
+                <ul>
+                    <li>{_t("Your password")}</li>
+                    <li>{_t("Your homeserver")}</li>
+                    <li>{_t("This device, or the other device")}</li>
+                    <li>{_t("The internet connection either device is using")}</li>
+                </ul>
+                <div>
+                    {_t("We recomment you change your password and recovery key in Settings immediately")}
+                </div>
+            </div>,
+            onFinished: () => this.props.onFinished(false),
+        });
     }
 
     onContinueClick = async () => {
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 15cf18f47d..cb0cadcdc8 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -42,6 +42,12 @@ export default class UnverifiedSessionToast extends React.PureComponent {
         Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
             userId: MatrixClientPeg.get().getUserId(),
             device,
+            onFinished: (r) => {
+                if (!r) {
+                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
+                    this._onLaterClick();
+                }
+            },
         }, null, /* priority = */ false, /* static = */ true);
     };
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d030f5118..31e9abd646 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1572,6 +1572,11 @@
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
     "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
     "Message edits": "Message edits",
+    "Your account is not secure": "Your account is not secure",
+    "Your password": "Your password",
+    "This device, or the other device": "This device, or the other device",
+    "The internet connection either device is using": "The internet connection either device is using",
+    "We recomment you change your password and recovery key in Settings immediately": "We recomment you change your password and recovery key in Settings immediately",
     "New session": "New session",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
     "If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",

From 569d5b6156fee2e353ee02ac96feac548a812b3f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:13:31 +0100
Subject: [PATCH 1229/3235] show right panel before waiting for .ready event to
 send

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

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 4a881ae852..c11cefc839 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -78,7 +78,6 @@ export default class VerificationRequestToast extends React.PureComponent {
         // no room id for to_device requests
         const cli = MatrixClientPeg.get();
         try {
-            await request.accept();
             if (request.channel.roomId) {
                 dis.dispatch({
                     action: 'view_room',
@@ -99,6 +98,7 @@ export default class VerificationRequestToast extends React.PureComponent {
                     verificationRequest: request,
                 }, null, /* priority = */ false, /* static = */ true);
             }
+            await request.accept();
         } catch (err) {
             console.error(err.message);
         }

From 2127edb7b8007092ec30648db0e0f8ebba3253c8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:13:51 +0100
Subject: [PATCH 1230/3235] show "Waiting for network" in EncryptionInfo after
 accepting in toast

---
 .../views/right_panel/EncryptionInfo.js           | 15 ++++++++++-----
 .../views/right_panel/EncryptionPanel.js          |  7 ++++++-
 src/i18n/strings/en_EN.json                       |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 299e553769..3638e1058f 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -28,12 +28,17 @@ export const PendingActionSpinner = ({text}) => {
     </div>;
 };
 
-const EncryptionInfo = ({pending, member, onStartVerification}) => {
+const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStartVerification}) => {
     let content;
-    if (pending) {
-        const text = _t("Waiting for %(displayName)s to accept…", {
-            displayName: member.displayName || member.name || member.userId,
-        });
+    if (waitingForOtherParty || waitingForNetwork) {
+        let text;
+        if (waitingForOtherParty) {
+            text = _t("Waiting for %(displayName)s to accept…", {
+                displayName: member.displayName || member.name || member.userId,
+            });
+        } else {
+            text = _t("Waiting for network…");
+        }
         content = <PendingActionSpinner text={text} />;
     } else {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 24d2f9f010..3ba6ca9a8a 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -76,8 +76,13 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     }, [member.userId]);
 
     const requested = request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined);
+    const initiatedByMe = request && request.initiatedByMe;
     if (!request || requested) {
-        return <EncryptionInfo onStartVerification={onStartVerification} member={member} pending={requested} />;
+        return <EncryptionInfo
+            onStartVerification={onStartVerification}
+            member={member}
+            waitingForOtherParty={requested && initiatedByMe}
+            waitingForNetwork={requested && !initiatedByMe} />;
     } else {
         return (
             <VerificationPanel
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d030f5118..6192302d18 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1165,6 +1165,7 @@
     "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.",
     "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.",
     "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
+    "Waiting for network…": "Waiting for network…",
     "Start Verification": "Start Verification",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",

From b0c87b0eaf27428593deb2df179c473600718df6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:18:27 +0100
Subject: [PATCH 1231/3235] UI spinner when clicking "they don't match"

---
 .../views/verification/VerificationShowSas.js  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 4d3c962385..ea81ef3d65 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -48,6 +48,11 @@ export default class VerificationShowSas extends React.Component {
         this.props.onDone();
     };
 
+    onDontMatchClick = () => {
+        this.setState({ cancelling: true });
+        this.props.onCancel();
+    };
+
     render() {
         let sasDisplay;
         let sasCaption;
@@ -98,9 +103,14 @@ export default class VerificationShowSas extends React.Component {
         }
 
         let confirm;
-        if (this.state.pending) {
-            const {displayName} = this.props;
-            const text = _t("Waiting for %(displayName)s to verify…", {displayName});
+        if (this.state.pending || this.state.cancelling) {
+            let text;
+            if (this.state.pending) {
+                const {displayName} = this.props;
+                text = _t("Waiting for %(displayName)s to verify…", {displayName});
+            } else {
+                text = _t("Waiting for network…");
+            }
             confirm = <PendingActionSpinner text={text} />;
         } else {
             // FIXME: stop using DialogButtons here once this component is only used in the right panel verification
@@ -109,7 +119,7 @@ export default class VerificationShowSas extends React.Component {
                 onPrimaryButtonClick={this.onMatchClick}
                 primaryButtonClass="mx_UserInfo_wideButton"
                 cancelButton={_t("They don't match")}
-                onCancel={this.props.onCancel}
+                onCancel={this.onDontMatchClick}
                 cancelButtonClass="mx_UserInfo_wideButton"
             />;
         }

From bd584ab23651ac29eaeb445b1a36844ffb328f0f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:27:19 +0100
Subject: [PATCH 1232/3235] from verification tile, also don't wait to show
 right panel

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

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index d02319119e..df1e14a717 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -62,8 +62,8 @@ export default class MKeyVerificationRequest extends React.Component {
         const request = this.props.mxEvent.verificationRequest;
         if (request) {
             try {
-                await request.accept();
                 this._openRequest();
+                await request.accept();
             } catch (err) {
                 console.error(err.message);
             }

From 682781aa48fb4f2b41ebae6662cd24628c33ddce Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 25 Feb 2020 13:27:59 +0100
Subject: [PATCH 1233/3235] better word smithing

---
 src/components/views/messages/MKeyVerificationRequest.js | 4 ++--
 src/components/views/right_panel/EncryptionInfo.js       | 2 +-
 src/components/views/verification/VerificationShowSas.js | 2 +-
 src/i18n/strings/en_EN.json                              | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index df1e14a717..f49ae1b6b1 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -136,9 +136,9 @@ export default class MKeyVerificationRequest extends React.Component {
             } else if (request.cancelled) {
                 stateLabel = this._cancelledLabel(request.cancellingUserId);
             } else if (request.accepting) {
-                stateLabel = _t("accepting …");
+                stateLabel = _t("Accepting …");
             } else if (request.declining) {
-                stateLabel = _t("declining …");
+                stateLabel = _t("Declining …");
             }
             stateNode = (<div className="mx_cryptoEvent_state">{stateLabel}</div>);
         }
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 3638e1058f..bbedc9b303 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -37,7 +37,7 @@ const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStar
                 displayName: member.displayName || member.name || member.userId,
             });
         } else {
-            text = _t("Waiting for network…");
+            text = _t("Accepting…");
         }
         content = <PendingActionSpinner text={text} />;
     } else {
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index ea81ef3d65..e640a75129 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -109,7 +109,7 @@ export default class VerificationShowSas extends React.Component {
                 const {displayName} = this.props;
                 text = _t("Waiting for %(displayName)s to verify…", {displayName});
             } else {
-                text = _t("Waiting for network…");
+                text = _t("Cancelling…");
             }
             confirm = <PendingActionSpinner text={text} />;
         } else {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6192302d18..3b2bca49a3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -465,6 +465,7 @@
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
+    "Cancelling…": "Cancelling…",
     "They match": "They match",
     "They don't match": "They don't match",
     "To be secure, do this in person or use a trusted way to communicate.": "To be secure, do this in person or use a trusted way to communicate.",
@@ -1165,7 +1166,7 @@
     "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.",
     "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.",
     "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
-    "Waiting for network…": "Waiting for network…",
+    "Accepting…": "Accepting…",
     "Start Verification": "Start Verification",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
@@ -1249,8 +1250,8 @@
     "You cancelled": "You cancelled",
     "%(name)s declined": "%(name)s declined",
     "%(name)s cancelled": "%(name)s cancelled",
-    "accepting …": "accepting …",
-    "declining …": "declining …",
+    "Accepting …": "Accepting …",
+    "Declining …": "Declining …",
     "%(name)s wants to verify": "%(name)s wants to verify",
     "You sent a verification request": "You sent a verification request",
     "Error decrypting video": "Error decrypting video",

From 1d8756b95d7b7230159548911f781e94f55957cf Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 25 Feb 2020 15:40:06 +0000
Subject: [PATCH 1234/3235] text improvements

---
 src/components/views/dialogs/NewSessionReviewDialog.js | 6 +++---
 src/i18n/strings/en_EN.json                            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 4cc8cb54ed..125811115f 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -43,11 +43,11 @@ export default class NewSessionReviewDialog extends React.PureComponent {
                 <ul>
                     <li>{_t("Your password")}</li>
                     <li>{_t("Your homeserver")}</li>
-                    <li>{_t("This device, or the other device")}</li>
-                    <li>{_t("The internet connection either device is using")}</li>
+                    <li>{_t("This session, or the other session")}</li>
+                    <li>{_t("The internet connection either session is using")}</li>
                 </ul>
                 <div>
-                    {_t("We recomment you change your password and recovery key in Settings immediately")}
+                    {_t("We recommend you change your password and recovery key in Settings immediately")}
                 </div>
             </div>,
             onFinished: () => this.props.onFinished(false),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 31e9abd646..f702da6b4c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1574,9 +1574,9 @@
     "Message edits": "Message edits",
     "Your account is not secure": "Your account is not secure",
     "Your password": "Your password",
-    "This device, or the other device": "This device, or the other device",
-    "The internet connection either device is using": "The internet connection either device is using",
-    "We recomment you change your password and recovery key in Settings immediately": "We recomment you change your password and recovery key in Settings immediately",
+    "This session, or the other session": "This session, or the other session",
+    "The internet connection either session is using": "The internet connection either session is using",
+    "We recommend you change your password and recovery key in Settings immediately": "We recommend you change your password and recovery key in Settings immediately",
     "New session": "New session",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
     "If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",

From 8299ee4128599d6676b2c5de7f891de80f8f8174 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 25 Feb 2020 02:28:30 +0000
Subject: [PATCH 1235/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2130 of 2130 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 0cbbaccb35..d14a77744e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2157,5 +2157,9 @@
     "You declined": "您拒絕了",
     "%(name)s declined": "%(name)s 拒絕了",
     "accepting …": "正在接受……",
-    "declining …": "正在拒絕……"
+    "declining …": "正在拒絕……",
+    "Your homeserver does not support cross-signing.": "您的家伺服器不支援交叉簽章。",
+    "Homeserver feature support:": "家伺服器功能支援：",
+    "exists": "存在",
+    "Verification Requests": "驗證請求"
 }

From fe30b63404b5f43e3e8f632c4ca5690d49c6f7f4 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Tue, 25 Feb 2020 14:57:12 +0000
Subject: [PATCH 1236/3235] Translated using Weblate (Dutch)

Currently translated at 88.1% (1877 of 2130 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index e57d28d5e5..8636efee1d 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -247,8 +247,8 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-vergadering aangevraagd.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
     "Return to login screen": "Terug naar het aanmeldscherm",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen toestemming u meldingen te versturen - controleer uw browserinstellingen",
-    "Riot was not given permission to send notifications - please try again": "Riot kreeg geen toestemming u meldingen te sturen - probeer het opnieuw",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen toestemming om u meldingen te versturen - controleer uw browserinstellingen",
+    "Riot was not given permission to send notifications - please try again": "Riot kreeg geen toestemming om u meldingen te sturen - probeer het opnieuw",
     "riot-web version:": "riot-web-versie:",
     "Room %(roomId)s not visible": "Gesprek %(roomId)s is niet zichtbaar",
     "Room Colour": "Gesprekskleur",
@@ -914,7 +914,7 @@
     "You need to register to do this. Would you like to register now?": "Hiervoor dient u zich te registreren. Wilt u dat nu doen?",
     "This homeserver has hit its Monthly Active User limit.": "Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.",
     "This homeserver has exceeded one of its resource limits.": "Deze thuisserver heeft één van zijn systeembronlimieten overschreden.",
-    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan uw gebruiksnaam niet op)",
+    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet aangemeld bent (we slaan uw gebruikersnaam niet op)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Het bestand ‘%(fileName)s’ is groter dan de uploadlimiet van de thuisserver",
     "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer uw netwerktoegang en probeer het nogmaals.",
     "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
@@ -1669,12 +1669,12 @@
     "Notification Autocomplete": "Meldingen automatisch voltooien",
     "Room Autocomplete": "Gesprekken automatisch aanvullen",
     "User Autocomplete": "Gebruikers automatisch aanvullen",
-    "Add Email Address": "Emailadres toevoegen",
+    "Add Email Address": "E-mailadres toevoegen",
     "Add Phone Number": "Telefoonnummer toevoegen",
     "Your email address hasn't been verified yet": "Uw emailadres is nog niet gecontroleerd",
     "Click the link in the email you received to verify and then click continue again.": "Open de link in de ontvangen contrôle-email, en klik dan op \"Doorgaan\".",
     "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende sessies.  Tenzij u die verifieert zou iemand u kunnen afluisteren.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende sessies. Tenzij u die verifieert zou iemand u kunnen afluisteren.",
     "Setting up keys": "Sleutelconfiguratie",
     "Verify this session": "Deze sessie verifiëren",
     "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
@@ -1682,18 +1682,18 @@
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
     "Unverified session": "Ongeverifieerde sessie",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Dit vergt toegang tot de verstek-identiteitsserver <server /> om emailadres of telefoonummer te valideren, maar die server heeft kent geen gebruiksvoorwaarden.",
-    "Trust": "Vertrouw",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Dit vergt toegang tot de standaardidentiteitsserver <server /> om een e-mailadres of telefoonnummer te valideren, maar die server heeft geen gebruiksvoorwaarden.",
+    "Trust": "Vertrouwen",
     "Custom (%(level)s)": "Aangepast (%(level)s)",
-    "Error upgrading room": "Bijwerken gesprek mislukt",
-    "Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen gespreksversie ondersteunt, en probeer dan opnieuw.",
+    "Error upgrading room": "Bijwerken van gesprek mislukt",
+    "Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen gespreksversie ondersteunt, en probeer het dan opnieuw.",
     "Verifies a user, session, and pubkey tuple": "Verifieert een combinatie van gebruiker+sessie+publieke sleutel",
     "Unknown (user, session) pair:": "Onbekende combinatie gebruiker+sessie:",
     "Session already verified!": "Sessie al geverifieerd!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: De sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "PAS OP: Sleutelverificatie MISLUKT! De combinatie %userId)s + sessie %(deviceId)s is ondertekend met \"%(fprint)s\" - maar de opgegeven sleutel is \"%(fingerprint)s\".  Wellicht worden uw berichten onderschept!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen.  De sessie is daarmee geverifieerd.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName) heeft %(addedAddresses)s en %(count)d andere adressen aan dit gesprek toegevoegd",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: de sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "PAS OP: sleutelverificatie MISLUKT! De combinatie %(userId)s + sessie %(deviceId)s is ondertekend met ‘%(fprint)s’ - maar de opgegeven sleutel is ‘%(fingerprint)s’.  Wellicht worden uw berichten onderschept!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen. De sessie is daarmee geverifieerd.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s heeft %(addedAddresses)s en %(count)s andere adressen aan dit gesprek toegevoegd",
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s heeft dit gesprek ontdaan van %(removedAddresses)s en %(count)s andere adressen",
     "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s heeft dit gesprek ontdaan van %(countRemoved)s adressen, en er %(countAdded)s toegevoegd",
     "%(senderName)s placed a voice call.": "%(senderName)s probeert u te bellen.",
@@ -1717,12 +1717,12 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor gesprekken wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel voor servers wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
-    "The message you are trying to send is too large.": "Uw bericht is te lang om te verzenden.",
+    "The message you are trying to send is too large.": "Uw bericht is te lang om te versturen.",
     "a few seconds ago": "enige tellen geleden",
     "about a minute ago": "een minuut of zo geleden",
     "%(num)s minutes ago": "%(num)s minuten geleden",
     "about an hour ago": "een uur of zo geleden",
-    "%(num)s hours ago": "%(num)s uren geleden",
+    "%(num)s hours ago": "%(num)s uur geleden",
     "about a day ago": "een dag of zo geleden",
     "%(num)s days ago": "%(num)s dagen geleden",
     "a few seconds from now": "over een paar tellen",
@@ -1778,12 +1778,12 @@
     "The version of Riot": "De versie van Riot",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Of u Riot op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
     "Whether you're using Riot as an installed Progressive Web App": "Of u Riot gebruikt als een geïnstalleerde Progressive-Web-App",
-    "Your user agent": "Uw browsers user-agent",
+    "Your user agent": "Uw gebruikersagent",
     "The information being sent to us to help make Riot better includes:": "De informatie die naar ons wordt verstuurd om Riot te verbeteren bevat:",
-    "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zul u de andere gebruiker niet verifiëren.",
-    "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zal u uw andere sessie niet verifiëren.",
+    "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zult u de andere gebruiker niet verifiëren.",
+    "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zult u uw andere sessie niet verifiëren.",
     "If you cancel now, you won't complete your secret storage operation.": "Als u nu annuleert zal de sleutelopslag worden afgebroken.",
-    "Cancel entering passphrase?": "Wachtwoord invoer annuleren?",
+    "Cancel entering passphrase?": "Wachtwoordinvoer annuleren?",
     "Show typing notifications": "Typmeldingen weergeven",
     "Verify this session by completing one of the following:": "Verifieer deze sessie door een van het volgende te doen:",
     "Scan this unique code": "Scan deze unieke code",

From ffb82e4ed6118ef529066b356ec46fa03b5770de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 25 Feb 2020 08:14:46 +0000
Subject: [PATCH 1237/3235] Translated using Weblate (French)

Currently translated at 100.0% (2130 of 2130 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 63e8159924..23e574013d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2158,5 +2158,9 @@
     "You declined": "Vous avez refusé",
     "%(name)s declined": "%(name)s a refusé",
     "accepting …": "nous acceptons…",
-    "declining …": "nous refusons…"
+    "declining …": "nous refusons…",
+    "Your homeserver does not support cross-signing.": "Votre serveur d’accueil ne prend pas en charge la signature croisée.",
+    "Homeserver feature support:": "Prise en charge de la fonctionnalité par le serveur d’accueil :",
+    "exists": "existant",
+    "Verification Requests": "Demandes de vérification"
 }

From d3bc735479e890a9f83a7ce587d8e635bf991a8a Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 25 Feb 2020 10:59:03 +0000
Subject: [PATCH 1238/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2130 of 2130 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d1e12bdd77..26a95062fd 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2155,5 +2155,9 @@
     "You declined": "Hai rifiutato",
     "%(name)s declined": "%(name)s ha rifiutato",
     "accepting …": "accettazione …",
-    "declining …": "rifiuto …"
+    "declining …": "rifiuto …",
+    "Your homeserver does not support cross-signing.": "Il tuo homeserver non supporta la firma incrociata.",
+    "Homeserver feature support:": "Funzioni supportate dall'homeserver:",
+    "exists": "esiste",
+    "Verification Requests": "Richieste di verifica"
 }

From 1aefbc771f8716af3109e998a40f1a2450fc06fd Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Mon, 24 Feb 2020 19:33:39 +0000
Subject: [PATCH 1239/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 50.6% (1077 of 2130 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index dd95ea89bf..0bdf358533 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -56,16 +56,16 @@
     "Add rooms to the community": "Legg til rom i samfunnet",
     "Room name or alias": "Romnamn eller alias",
     "Add to community": "Legg til i samfunn",
-    "Failed to invite the following users to %(groupId)s:": "Fylgjande brukarar lét seg ikkje byda inn i %(groupId)s:",
-    "Failed to invite users to community": "Fekk ikkje til å byda brukarar inn til samfunnet",
+    "Failed to invite the following users to %(groupId)s:": "Fekk ikkje til å invitera følgjande brukarar i %(groupId)s:",
+    "Failed to invite users to community": "Fekk ikkje til å invitera brukarar til fellesskapet.",
     "Failed to invite users to %(groupId)s": "Fekk ikkje til å byda brukarar inn til %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "Fylgjande rom lét seg ikkje leggja til i %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Fekk ikkje til å invitera følgjande rom til %(groupId)s:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje tillating til å senda deg varsel - ver venleg og sjekk nettlesarinnstillingane dine",
     "Riot was not given permission to send notifications - please try again": "Riot fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
     "Unable to enable Notifications": "Klarte ikkje å skru på Varsel",
     "This email address was not found": "Denne epostadressa var ikkje funnen",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Epostadressa di ser ikkje ut til å vera tilknytta ein Matrix-ID på denne heimtenaren.",
-    "Default": "Utgangspunktinnstilling",
+    "Default": "Opphavleg innstilling",
     "Restricted": "Avgrensa",
     "Moderator": "Moderator",
     "Admin": "Administrator",
@@ -86,10 +86,10 @@
     "Room %(roomId)s not visible": "Rommet %(roomId)s er ikkje synleg",
     "Missing user_id in request": "Manglande user_id i førespurnad",
     "Usage": "Bruk",
-    "Searches DuckDuckGo for results": "Røkjer DuckDuckGo etter resultat",
+    "Searches DuckDuckGo for results": "Søker på DuckDuckGo for resultat",
     "Your language of choice": "Ditt valde mål",
     "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
-    "/ddg is not a command": "/ddg er ikkje eit påbod",
+    "/ddg is not a command": "/ddg er ikkje ein kommando",
     "Changes your display nickname": "Forandrar kallenamnet ditt",
     "Invites user with given id to current room": "Byd brukarar med den gjevne IDen inn til det noverande rommet",
     "Joins room with given alias": "Gjeng inn i eit rom med det gjevne aliaset",
@@ -114,14 +114,14 @@
     "Analytics": "Statistikk",
     "Unable to capture screen": "Klarte ikkje ta opp skjermen",
     "Existing Call": "Samtale er i gang",
-    "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka han, vent på at resultata fyller seg ut og tab gjennom dei.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka den, vent på at resultata fyller seg ut og tab gjennom dei.",
     "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
     "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
     "Unverify": "Fjern godkjenning",
     "Verify...": "Godkjenn...",
     "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
     "The remote side failed to pick up": "Den andre sida tok ikkje røret",
-    "Verified key": "Godkjend nykel",
+    "Verified key": "Godkjend nøkkel",
     "Displays action": "Visar handlingar",
     "Reason": "Grunnlag",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s sa ja til innbydinga frå %(displayName)s.",
@@ -167,10 +167,10 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget lagt til av %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget fjerna av %(senderName)s",
     "Failure to create room": "Klarte ikkje å laga rommet",
-    "Server may be unavailable, overloaded, or you hit a bug.": "tenaren er kanskje utilgjengeleg, overlasta elles so traff du ein bøgg.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Serveren er kanskje utilgjengeleg, overlasta elles så traff du ein bug.",
     "Send anyway": "Send likevel",
     "Send": "Send",
-    "Unnamed Room": "Rom utan Namn",
+    "Unnamed Room": "Rom utan namn",
     "Your browser does not support the required cryptography extensions": "Nettlesaren din støttar ikkje dei naudsynte kryptografiske utvidingane",
     "Not a valid Riot keyfile": "Ikkje ei gyldig Riot-nykelfil",
     "Authentication check failed: incorrect password?": "Godkjenningssjekk mislukkast: urett passord?",
@@ -290,7 +290,7 @@
     "Ignore": "Oversjå",
     "Mention": "Nemn",
     "Invite": "Byd inn",
-    "Enable inline URL previews by default": "Skru URL-førehandsvisingar i tekstfeltet på",
+    "Enable inline URL previews by default": "Skru URL-førehandsvising i tekstfeltet på",
     "Share Link to User": "Del Brukarlenkje",
     "User Options": "Brukarinnstillingar",
     "Direct chats": "Direktesamtaler",
@@ -1014,7 +1014,7 @@
     "Replying With Files": "Send svar med filer",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Nett no er det ikkje mogleg å senda svar med ei fil. Vil du lasta opp denne fila utan å senda svaret?",
     "The file '%(fileName)s' failed to upload.": "Fila '%(fileName)s' vart ikkje lasta opp.",
-    "The server does not support the room version specified.": "Tenaren støttar ikkje den spesifikke versjonen av rommet.",
+    "The server does not support the room version specified.": "Serveren støttar ikkje den spesifikke versjonen av rommet.",
     "Name or Matrix ID": "Namn eller Matrix ID",
     "Registration Required": "Registrering er obligatorisk",
     "You need to register to do this. Would you like to register now?": "Du må registrera for å gjera dette. Ynskjer du å registrera no?",
@@ -1045,5 +1045,50 @@
     "Sends the given message coloured as a rainbow": "Sender den bestemte meldinga farga som ein regnboge",
     "Displays list of commands with usages and descriptions": "Viser ei liste over kommandoar med bruksområde og skildringar",
     "%(senderName)s made no change.": "%(senderName)s utførde ingen endring.",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet."
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
+    "The version of Riot": "Gjeldande versjon av Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Om du brukar Riot på ein innretning som er satt opp for touch-skjerm",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Om du nyttar funksjonen 'breadcrumbs' (avatarane over romkatalogen)",
+    "Whether you're using Riot as an installed Progressive Web App": "Om din Riot er installert som ein webapplikasjon (Progressive Web App)",
+    "Your user agent": "Din nettlesar (User-Agent)",
+    "The information being sent to us to help make Riot better includes:": "Informasjon sendt til oss for å forbetre Riot inkluderar:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det er ukjende sesjonar i dette rommet: om går vidare utan å verifisere dei, kan andre avlytte samtalen.",
+    "If you cancel now, you won't complete verifying the other user.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre brukaren.",
+    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre sesjonen.",
+    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter no, vil dette stoppe lagringa av den hemmelege passfrasen.",
+    "Cancel entering passphrase?": "Avbryte inntasting av passfrase ?",
+    "Setting up keys": "Setter opp nøklar",
+    "Verify this session": "Stadfest denne sesjonen",
+    "Encryption upgrade available": "Kryptering kan oppgraderast",
+    "Set up encryption": "Sett opp kryptering",
+    "Unverified session": "Uverifisert sesjon",
+    "Identity server has no terms of service": "Identitetsserveren manglar bruksvilkår",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetsserver) for å verifisere e-post eller telefonnummer, men serveren manglar bruksvilkår.",
+    "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av serveren.",
+    "Trust": "Tillat",
+    "Custom (%(level)s)": "Tilpassa (%(level)s)",
+    "Error upgrading room": "Feil ved oppgradering av rom",
+    "Double check that your server supports the room version chosen and try again.": "Sjekk at server støttar romversjon, og prøv på nytt.",
+    "Verifies a user, session, and pubkey tuple": "Verifiser brukar, sesjon eller public key objekt (pubkey tuple)",
+    "Unknown (user, session) pair:": "Ukjent (brukar,sesjon) par:",
+    "Session already verified!": "Sesjon er tidligare verifisert!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ÅTVARING: Sesjon er tidligare verifisert, men nøklane STEMMER IKKJE!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ÅTVARING: NØKKELVERIFIKASJON FEILA! Signeringsnøkkel for %(userId)s og sesjon %(deviceId)s er \"%(fprint)s\" stemmer ikkje med innsendt nøkkel \"%(fingerprint)s\". Dette kan vere teikn på at kommunikasjonen er avlytta!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Innsendt signeringsnøkkel er lik nøkkelen du mottok frå %(userId)s med sesjon %(deviceId)s. Sesjonen no er verifisert.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s satte rommet til offentleg for alle som har linken.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s avgrensa romtilgang til inviterte deltakarar.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s satte tilgangsregelen til %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s har opna for gjestetilgang i rommet.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har hindra gjestetilgang i rommet.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s endra gjestetilgang til %(rule)s",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s satte etikett for %(groups)s i dette rommet.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktiverte etikettar for %(groups)s i dette rommet.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s har aktivert etikettar for %(newGroups)s, og deaktivert etikettar for %(oldGroups)s i dette rommet.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s la til %(addedAddresses)s og %(count)s andre adresser i dette rommet",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s la til %(addedAddresses)s som adresser for dette rommet.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s la til %(addedAddresses)s som adresse for dette rommet.",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s fjerna %(removedAddresses)s og %(count)s andre som adresse for dette rommet",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s fjerna %(removedAddresses)s som adresser for dette rommet.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s fjerna %(removedAddresses)s som adresse for dette rommet.",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s fjerna %(countRemoved)s og la til %(countAdded)s adresser for dette rommet"
 }

From 75f73dad3e2494a1eb6100025e371365a8fdf321 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Mon, 24 Feb 2020 19:21:34 +0000
Subject: [PATCH 1240/3235] Translated using Weblate (Turkish)

Currently translated at 72.7% (1549 of 2130 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 13840a4601..b8926b85cb 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1550,5 +1550,19 @@
     "A widget would like to verify your identity": "Bir görsel tasarım kimliğinizi teyit etmek istiyor",
     "Remember my selection for this widget": "Bu görsel bileşen işin seçimimi hatırla",
     "Deny": "Reddet",
-    "Recovery key mismatch": "Kurtarma anahtarı uyumsuz"
+    "Recovery key mismatch": "Kurtarma anahtarı uyumsuz",
+    "Backup restored": "Yedek geri dönüldü",
+    "Enter recovery key": "Kurtarma anahtarı gir",
+    "Help": "Yardım",
+    "Take picture": "Resim çek",
+    "Premium": "Premium",
+    "Sign in to your Matrix account on %(serverName)s": "%(serverName)s adresindeki Matrix hesabınıza oturum açın",
+    "Sign in to your Matrix account on <underlinedServerName />": "<underlinedServerName /> adresindeki Matrix hesabına oturum açın",
+    "Add to summary": "Özete ekle",
+    "Add users to the community summary": "Topluluk özetine kullanıcıları ekle",
+    "Who would you like to add to this summary?": "Bu özete kimi eklemek istersiniz?",
+    "Failed to update community": "Toluluğu güncelleme başarısız",
+    "Downloading mesages for %(currentRoom)s.": "%(currentRoom)s için mesajlar indiriliyor.",
+    "Indexed rooms:": "İndekslenmiş odalar:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s odadan %(crawlingRooms)s tanesi"
 }

From b7c7b6c33a798c6512dab996f32facd99e4afd65 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Tue, 25 Feb 2020 14:36:30 +0000
Subject: [PATCH 1241/3235] Translated using Weblate (West Flemish)

Currently translated at 72.7% (1548 of 2130 strings)

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

diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index b705afc4fe..b08bc31e5d 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -2,7 +2,7 @@
     "This email address is already in use": "Dat e-mailadresse hier es al in gebruuk",
     "This phone number is already in use": "Dezen telefongnumero es al in gebruuk",
     "Failed to verify email address: make sure you clicked the link in the email": "Kostege ’t e-mailadresse nie verifieern: zorgt dervoor da je de koppelienge in den e-mail èt angeklikt",
-    "The platform you're on": "’t Platform wuk da je gebruukt",
+    "The platform you're on": "’t Platform da je gebruukt",
     "The version of Riot.im": "De versie van Riot.im",
     "Whether or not you're logged in (we don't record your username)": "Of da je al dan nie angemeld zyt (we sloan je gebruukersnoame nie ip)",
     "Your language of choice": "De deur joun gekoozn toale",

From c848489cc143c9dcc7e0a96fb34bb3f45539121b Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Tue, 25 Feb 2020 16:07:56 +0000
Subject: [PATCH 1242/3235] Translated using Weblate (Dutch)

Currently translated at 87.9% (1877 of 2135 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 8636efee1d..f0bee97f03 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -963,7 +963,7 @@
     "Avoid years that are associated with you": "Vermijd jaren die op uzelf betrekking hebben",
     "Avoid dates and years that are associated with you": "Vermijd data en jaren die op uzelf betrekking hebben",
     "Capitalization doesn't help very much": "Hoofdlettergebruik helpt niet echt",
-    "All-uppercase is almost as easy to guess as all-lowercase": "Enkel hoofdletters is nauwelijks moeilijker te raden als enkel kleine letters",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Enkel hoofdletters is nauwelijks moeilijker te raden dan enkel kleine letters",
     "Reversed words aren't much harder to guess": "Omgedraaide woorden zijn bijna even gemakkelijk te raden",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Voorspelbare vervangingen (zoals '@' i.p.v. 'a') zijn niet erg zinvol",
     "Add another word or two. Uncommon words are better.": "Voeg nog een paar (liefst weinig gebruikte) woorden toe.",
@@ -1736,10 +1736,10 @@
     "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
     "Show a presence dot next to DMs in the room list": "Toon aanwezigheid bij tweegesprekken in de gesprekkenlijst",
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Gebruik gebruikersverificatie in plaats van sessieverificatie (nog in ontwikkeling)",
-    "Enable local event indexing and E2EE search (requires restart)": "Indexeer lokaal gebeurtenissen en maak zo E2EE-zoeken mogelijk (vergt een herstart)",
+    "Enable local event indexing and E2EE search (requires restart)": "Indexeer gebeurtenissen lokaal en maak zo E2EE-zoeken mogelijk (vergt een herstart)",
     "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
     "Show padlocks on invite only rooms": "Toon hangsloten op besloten gesprekken",
-    "Match system theme": "Pas aan aan systeemthema",
+    "Match system theme": "Aanpassen aan systeemthema",
     "Never send encrypted messages to unverified sessions from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies",
     "Never send encrypted messages to unverified sessions in this room from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek",
     "Enable message search in encrypted rooms": "Sta zoeken in versleutelde gesprekken toe",
@@ -1747,12 +1747,12 @@
     "How fast should messages be downloaded.": "Ophaalfrequentie van berichten.",
     "My Ban List": "Mijn banlijst",
     "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers.  Verlaat dit gesprek niet!",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Bevestig dat beide apparaten dezelfde emojis in dezelfde volgorde tonen:",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Bevestig dat beide apparaten dezelfde emoji’s in dezelfde volgorde tonen:",
     "Verify this device by confirming the following number appears on its screen.": "Verifieer dit apparaat door te bevestigen dat het scherm het volgende getal toont.",
     "Waiting for %(displayName)s to verify…": "Wachten tot %(displayName)s geverifieerd heeft…",
     "They match": "Ze komen overeen",
     "They don't match": "Ze komen niet overeen",
-    "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid in persona, of via een betrouwbaar communicatiemedium.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid onder vier ogen, of via een betrouwbaar communicatiemedium.",
     "Lock": "Hangslot",
     "Verify yourself & others to keep your chats safe": "Verifieer jezelf en anderen om je gesprekken veilig te houden",
     "Other users may not trust it": "Mogelijk wantrouwen anderen het",
@@ -1789,7 +1789,7 @@
     "Scan this unique code": "Scan deze unieke code",
     "or": "of",
     "Compare unique emoji": "Vergelijk unieke emoji",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Vergelijk een unieke lijst emoji als beide apparaten geen camera bevatten",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Vergelijk een unieke lijst met emoji als geen van beide apparaten een camera heeft",
     "Start": "Start",
     "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten beveiligd op om ze weer te geven in zoekresultaten.",
     "Enable": "Inschakelen",

From 5d1d50645d36a19736d68d19ea05412b226a9fb1 Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Tue, 25 Feb 2020 16:11:37 +0000
Subject: [PATCH 1243/3235] Translated using Weblate (Dutch)

Currently translated at 87.9% (1877 of 2135 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f0bee97f03..7c31dc1e0c 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1753,7 +1753,7 @@
     "They match": "Ze komen overeen",
     "They don't match": "Ze komen niet overeen",
     "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid onder vier ogen, of via een betrouwbaar communicatiemedium.",
-    "Lock": "Hangslot",
+    "Lock": "Slot",
     "Verify yourself & others to keep your chats safe": "Verifieer jezelf en anderen om je gesprekken veilig te houden",
     "Other users may not trust it": "Mogelijk wantrouwen anderen het",
     "Upgrade": "Bijwerken",

From 7091e7a4af4f6e48617c860c589d64cca4d55a53 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 25 Feb 2020 09:19:37 -0700
Subject: [PATCH 1244/3235] Use the right keyword

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index d229a4eedd..20c8fb5b14 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -335,7 +335,7 @@ export default class InviteDialog extends React.PureComponent {
     _buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
 
-        // Also pull in all the rooms tagged as m.direct so we don't miss anything. Sometimes the
+        // Also pull in all the rooms tagged as TAG_DM so we don't miss anything. Sometimes the
         // room list doesn't tag the room for the DMRoomMap, but does for the room list.
         const taggedRooms = RoomListStore.getRoomLists();
         const dmTaggedRooms = taggedRooms[TAG_DM];

From 5ef02fabf9a2b4b340183f53fc55c53490aa9417 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Tue, 25 Feb 2020 16:11:42 +0000
Subject: [PATCH 1245/3235] Translated using Weblate (Dutch)

Currently translated at 88.1% (1880 of 2135 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 7c31dc1e0c..fce04510d4 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -142,7 +142,7 @@
     "/ddg is not a command": "/ddg is geen opdracht",
     "Deactivate Account": "Account deactiveren",
     "Decline": "Weigeren",
-    "Decrypt %(text)s": "%(text)s ontcijferen",
+    "Decrypt %(text)s": "%(text)s ontsleutelen",
     "Decryption error": "Ontsleutelingsfout",
     "Device ID": "Apparaats-ID",
     "device id: ": "apparaats-ID: ",
@@ -165,7 +165,7 @@
     "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "End-to-end encryption information": "Info over eind-tot-eind-versleuteling",
     "Enter passphrase": "Voer wachtwoord in",
-    "Error decrypting attachment": "Fout bij het ontcijferen van de bijlage",
+    "Error decrypting attachment": "Fout bij het ontsleutelen van de bijlage",
     "Error: Problem communicating with the given homeserver.": "Fout: probleem bij communicatie met de gegeven thuisserver.",
     "Event information": "Gebeurtenisinformatie",
     "Existing Call": "Bestaande oproep",
@@ -321,7 +321,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Ongeldige gebruikersnaam: %(errMessage)s",
     "Users": "Gebruikers",
-    "Verification Pending": "Contrôle in afwachting",
+    "Verification Pending": "Verificatie in afwachting",
     "Verification": "Verificatie",
     "verified": "geverifieerd",
     "Verified key": "Geverifieerde sleutel",
@@ -374,10 +374,10 @@
     "Import room keys": "Gesprekssleutels inlezen",
     "File to import": "In te lezen bestand",
     "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.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde gesprekken naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan die ook die berichten ontcijferen.",
-    "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.": "Wie het weggeschreven bestand kan lezen, kan daarmee ook alle versleutelde berichten die u kunt zien ontcijferen - ga er dus zorgvuldig mee om!  Daartoe kunt u hieronder een wachtwoord invoeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan enkel mogelijk de gegevens in te lezen met hetzelfde wachtwoord.",
-    "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.": "Hiermee kunt u  vanuit een andere Matrix-cliënt weggeschreven ontcijferingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontcijferen.",
-    "You must join the room to see its files": "Slechts na toetreding tot het gesprek toetreden zult u de bestanden kunnen zien",
+    "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.": "Wie het weggeschreven bestand kan lezen, kan daarmee ook alle versleutelde berichten die u kunt zien ontcijferen - ga er dus zorgvuldig mee om! Daartoe kunt u hieronder een wachtwoord invoeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan enkel mogelijk de gegevens in te lezen met hetzelfde wachtwoord.",
+    "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.": "Hiermee kunt u  vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
+    "You must join the room to see its files": "Slechts na toetreding tot het gesprek zult u de bestanden kunnen zien",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigingen weigeren",
     "Failed to invite": "Uitnodigen is mislukt",
     "Failed to invite the following users to the %(roomName)s room:": "Kon de volgende gebruikers niet uitnodigen voor gesprek %(roomName)s:",
@@ -400,9 +400,9 @@
     "Token incorrect": "Bewijs onjuist",
     "Please enter the code it contains:": "Voer de code in die het bevat:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als u geen e-mailadres opgeeft, zult u uw wachtwoord niet opnieuw kunnen instellen. Weet u het zeker?",
-    "Error decrypting audio": "Fout bij het ontcijferen van de audio",
-    "Error decrypting image": "Fout bij het ontcijferen van de afbeelding",
-    "Error decrypting video": "Fout bij het ontcijferen van de video",
+    "Error decrypting audio": "Fout bij het ontsleutelen van de audio",
+    "Error decrypting image": "Fout bij het ontsleutelen van de afbeelding",
+    "Error decrypting video": "Fout bij het ontsleutelen van de video",
     "Add an Integration": "Voeg een integratie toe",
     "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?": "U wordt zo dadelijk naar een derdepartijwebsite gebracht zodat u de account kunt legitimeren voor gebruik met %(integrationsUrl)s. Wilt u doorgaan?",
     "Removed or unknown message type": "Verwijderd of onbekend berichttype",
@@ -586,8 +586,8 @@
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is weggegaan en weer toegetreden",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgewezen",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgewezen",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal afgewezen",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging afgeslagen",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal geweigerd",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging geweigerd",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "De uitnodigingen van %(severalUsers)s zijn %(count)s keer ingetrokken",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
@@ -664,7 +664,7 @@
     "Community %(groupId)s not found": "Gemeenschap %(groupId)s is niet gevonden",
     "Failed to load %(groupId)s": "Laden van %(groupId)s is mislukt",
     "Old cryptography data detected": "Oude cryptografiegegevens gedetecteerd",
-    "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.": "Er zijn gegevens van een oudere versie van Riot gevonden, die problemen veroorzaakt hebben met de eind-tot-eind-versleuteling in de oude versie. Onlangs vanuit de oude versie verzonden eind-tot-eind-versleutelde berichten zijn mogelijk onontcijferbaar in deze versie. Ook kunnen berichten die met deze versie gewisseld zijn falen.  Mocht u problemen ervaren, meld u dan opnieuw aan.  Schrijf uw de sleutels weg en lees ze weer in om uw berichtgeschiedenis te behouden.",
+    "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.": "Er zijn gegevens van een oudere versie van Riot gevonden, die problemen veroorzaakt hebben met de eind-tot-eind-versleuteling in de oude versie. Onlangs vanuit de oude versie verzonden eind-tot-eind-versleutelde berichten zijn mogelijk onontsleutelbaar in deze versie. Ook kunnen berichten die met deze versie uitgewisseld zijn falen. Mocht u problemen ervaren, meld u dan opnieuw aan.  Schrijf uw sleutels weg en lees ze weer in om uw berichtgeschiedenis te behouden.",
     "Your Communities": "Uw gemeenschappen",
     "Error whilst fetching joined communities": "Er is een fout opgetreden bij het ophalen van de gemeenschappen waarvan u lid bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
@@ -718,14 +718,14 @@
     "Who can join this community?": "Wie kan er tot deze gemeenschap toetreden?",
     "Everyone": "Iedereen",
     "Leave this community": "Deze gemeenschap verlaten",
-    "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.": "Voor het oplossen van in GitHub gemelde problemen helpen foutopsporingslogboeken ons enorm.  Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
+    "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.": "Voor het oplossen van in GitHub gemelde problemen helpen foutopsporingslogboeken ons enorm. Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
     "Submit debug logs": "Foutopsporingslogboeken indienen",
     "Opens the Developer Tools dialog": "Opent het dialoogvenster met ontwikkelaarsgereedschap",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
     "A new version of Riot is available.": "Er is een nieuwe versie van Riot beschikbaar.",
     "I understand the risks and wish to continue": "Ik begrijp de risico’s en wil graag verdergaan",
     "Send Account Data": "Accountgegevens versturen",
-    "All notifications are currently disabled for all targets.": "Alle meldingen voor alle bestemmingen staan momenteel uit.",
+    "All notifications are currently disabled for all targets.": "Alle meldingen voor alle bestemmingen zijn momenteel uitgeschakeld.",
     "Uploading report": "Rapport wordt geüpload",
     "Sunday": "Zondag",
     "Notification targets": "Meldingsbestemmingen",
@@ -1154,7 +1154,7 @@
     "Roles & Permissions": "Rollen & toestemmingen",
     "Select the roles required to change various parts of the room": "Selecteer de rollen vereist om verschillende delen van het gesprek te wijzigen",
     "Enable encryption?": "Versleuteling inschakelen?",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Gespreksversleuteling is onomkeerbaar.  Berichten in versleutelde gesprekken zijn niet leesbaar voor de server; enkel voor de gespreksdeelnemers.  Veel robots en overbruggingen werken niet correct in versleutelde gesprekken. <a>Lees meer over versleuteling.</a>",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Gespreksversleuteling is onomkeerbaar. Berichten in versleutelde gesprekken zijn niet leesbaar voor de server; enkel voor de gespreksdeelnemers. Veel robots en overbruggingen werken niet correct in versleutelde gesprekken. <a>Lees meer over versleuteling.</a>",
     "To link to this room, please add an alias.": "Voeg een bijnaam toe om naar dit gesprek te verwijzen.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen gelden enkel voor toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
     "Encryption": "Versleuteling",
@@ -1196,7 +1196,7 @@
     "Invite anyway": "Alsnog uitnodigen",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer u logboeken indient, dient u uw probleem te <a>melden op GitHub</a>.",
     "Unable to load commit detail: %(msg)s": "Kan commitdetail niet laden: %(msg)s",
-    "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": "Om uw gespreksgeschiedenis niet te verliezen, moet u vóór het afmelden uw gesprekssleutels wegschrijven.  Dat moet vanuit de nieuwere versie van Riot",
+    "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": "Om uw gespreksgeschiedenis niet te verliezen, moet u vóór het afmelden uw gesprekssleutels wegschrijven. Dat moet vanuit de nieuwere versie van Riot",
     "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. ": "U heeft eerder een nieuwere versie van Riot op %(host)s gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u zich moeten afmelden en opnieuw aanmelden. ",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
@@ -1221,7 +1221,7 @@
     "You'll lose access to your encrypted messages": "U zult de toegang tot uw versleutelde berichten verliezen",
     "Are you sure you want to sign out?": "Weet u zeker dat u zich wilt afmelden?",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Als u fouten zou tegenkomen of voorstellen zou hebben, laat het ons dan weten op GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Voorkom dubbele meldingen: doorzoek eerst de <existingIssuesLink>bestaande meldingen</existingIssuesLink> (en voeg desgewenst een +1 toe).  Maak enkel <newIssueLink>een nieuwe melding</newIssueLink> aan indien u niets kunt vinden.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Voorkom dubbele meldingen: doorzoek eerst de <existingIssuesLink>bestaande meldingen</existingIssuesLink> (en voeg desgewenst een +1 toe). Maak enkel <newIssueLink>een nieuwe melding</newIssueLink> aan indien u niets kunt vinden.",
     "Report bugs & give feedback": "Fouten melden & feedback geven",
     "Go back": "Terug",
     "Room Settings - %(roomName)s": "Gespreksinstellingen - %(roomName)s",
@@ -1232,18 +1232,18 @@
     "Create a new room with the same name, description and avatar": "Een nieuw gesprek aanmaken met dezelfde naam, beschrijving en avatar",
     "Update any local room aliases to point to the new room": "Alle lokale gespreksbijnamen naar het nieuwe gesprek laten verwijzen",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Gebruikers verhinderen aan de oude versie van het gesprek bij te dragen, en daar een bericht plaatsen dat de gebruikers verwijst naar het nieuwe gesprek",
-    "Put a link back to the old room at the start of the new room so people can see old messages": "Bovenaan het nieuwe gesprek naar het oude te verwijzen, om oude berichten te lezen",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Bovenaan het nieuwe gesprek naar het oude verwijzen, om oude berichten te lezen",
     "A username can only contain lower case letters, numbers and '=_-./'": "Een gebruikersnaam mag enkel kleine letters, cijfers en ‘=_-./’ bevatten",
     "Checking...": "Bezig met controleren…",
     "Unable to load backup status": "Kan back-upstatus niet laden",
     "Recovery Key Mismatch": "Herstelsleutel komt niet overeen",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "De back-up kon met deze sleutel niet ontcijferd worden: controleer of u de juiste herstelsleutel heeft ingevoerd.",
+    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "De back-up kon met deze sleutel niet ontsleuteld worden: controleer of u de juiste herstelsleutel heeft ingevoerd.",
     "Incorrect Recovery Passphrase": "Onjuist herstelwachtwoord",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "De back-up kon met dit wachtwoord niet ontcijferd worden: controleer of u het juiste herstelwachtwoord heeft ingevoerd.",
+    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "De back-up kon met dit wachtwoord niet ontsleuteld worden: controleer of u het juiste herstelwachtwoord heeft ingevoerd.",
     "Unable to restore backup": "Kan back-up niet terugzetten",
     "No backup found!": "Geen back-up gevonden!",
     "Backup Restored": "Back-up hersteld",
-    "Failed to decrypt %(failedCount)s sessions!": "Ontcijferen van %(failedCount)s sessies is mislukt!",
+    "Failed to decrypt %(failedCount)s sessions!": "Ontsleutelen van %(failedCount)s sessies is mislukt!",
     "Restored %(sessionCount)s session keys": "%(sessionCount)s sessiesleutels hersteld",
     "Enter Recovery Passphrase": "Voer het herstelwachtwoord in",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
@@ -1386,7 +1386,7 @@
     "Sign out and remove encryption keys?": "Afmelden en versleutelingssleutels verwijderen?",
     "To help us prevent this in future, please <a>send us logs</a>.": "Gelieve <a>ons logboeken te sturen</a> om dit in de toekomst te helpen voorkomen.",
     "Missing session data": "Sessiegegevens ontbreken",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Sommige sessiegegevens, waaronder sleutels voor versleutelde berichten, ontbreken.  Herstel de sleutels uit uw back-up door u af en weer aan te melden.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Sommige sessiegegevens, waaronder sleutels voor versleutelde berichten, ontbreken. Herstel de sleutels uit uw back-up door u af- en weer aan te melden.",
     "Your browser likely removed this data when running low on disk space.": "Uw browser heeft deze gegevens wellicht verwijderd toen de beschikbare opslagruimte vol was.",
     "Upload files (%(current)s of %(total)s)": "Bestanden versturen (%(current)s van %(total)s)",
     "Upload files": "Bestanden versturen",
@@ -1395,9 +1395,9 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Deze bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Sommige bestanden zijn <b>te groot</b> om te versturen. De bestandsgroottelimiet is %(limit)s.",
     "Upload %(count)s other files|other": "%(count)s overige bestanden versturen",
-    "Upload %(count)s other files|one": "%(count)s overig bestanden versturen",
+    "Upload %(count)s other files|one": "%(count)s overig bestand versturen",
     "Cancel All": "Alles annuleren",
-    "Upload Error": "Fout bij versturen bestand",
+    "Upload Error": "Fout bij versturen van bestand",
     "A conference call could not be started because the integrations server is not available": "Daar de integratieserver onbereikbaar is kon het groepsaudiogesprek niet gestart worden",
     "The server does not support the room version specified.": "De server ondersteunt deze versie van gesprekken niet.",
     "Name or Matrix ID": "Naam of Matrix-ID",
@@ -1582,7 +1582,7 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "U deelt nog steeds <b>uw persoonlijke gegevens</b> op de identiteitsserver <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We raden u aan uw e-mailadressen en telefoonnummers van de identiteitsserver te verwijderen vooraleer u de verbinding verbreekt.",
     "Disconnect anyway": "Verbinding toch verbreken",
-    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Mocht u om bekenden te zoeken en vindbaar te zijn niet <server /> willen gebruiken, voer dan hieronder een andere identiteitsserver in.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Mocht u om bekenden te zoeken en zelf vindbaar te zijn <server /> niet willen gebruiken, voer dan hieronder een andere identiteitsserver in.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Een identiteitsserver is niet verplicht, maar zonder identiteitsserver zult u geen bekenden op e-mailadres of telefoonnummer kunnen zoeken, noch door hen vindbaar zijn.",
     "Do not use an identity server": "Geen identiteitsserver gebruiken",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aanvaard de gebruiksvoorwaarden van de identiteitsserver (%(serverName)s) om vindbaar te zijn op e-mailadres of telefoonnummer.",
@@ -1638,7 +1638,7 @@
     "Explore rooms": "Gesprekken ontdekken",
     "Show previews/thumbnails for images": "Toon voorbeelden voor afbeeldingen",
     "Clear cache and reload": "Cache wissen en herladen",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan worden gemaakt. Wilt u doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
     "Remove %(count)s messages|one": "1 bericht verwijderen",
     "%(count)s unread messages including mentions.|other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
     "%(count)s unread messages.|other": "%(count)s ongelezen berichten.",
@@ -1671,14 +1671,14 @@
     "User Autocomplete": "Gebruikers automatisch aanvullen",
     "Add Email Address": "E-mailadres toevoegen",
     "Add Phone Number": "Telefoonnummer toevoegen",
-    "Your email address hasn't been verified yet": "Uw emailadres is nog niet gecontroleerd",
-    "Click the link in the email you received to verify and then click continue again.": "Open de link in de ontvangen contrôle-email, en klik dan op \"Doorgaan\".",
+    "Your email address hasn't been verified yet": "Uw e-mailadres is nog niet geverifieerd",
+    "Click the link in the email you received to verify and then click continue again.": "Open de koppeling in de ontvangen verificatie-e-mail, en klik dan op ‘Doorgaan’.",
     "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende sessies. Tenzij u die verifieert zou iemand u kunnen afluisteren.",
     "Setting up keys": "Sleutelconfiguratie",
     "Verify this session": "Deze sessie verifiëren",
     "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
-    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Type <code>/help</code> om alle opdrachten te zien.  Was het uw bedoeling dit als bericht te sturen?",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Typ <code>/help</code> om alle opdrachten te zien.  Was het uw bedoeling dit als bericht te sturen?",
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
     "Unverified session": "Ongeverifieerde sessie",
@@ -1753,13 +1753,13 @@
     "They match": "Ze komen overeen",
     "They don't match": "Ze komen niet overeen",
     "To be secure, do this in person or use a trusted way to communicate.": "Doe dit voor de zekerheid onder vier ogen, of via een betrouwbaar communicatiemedium.",
-    "Lock": "Slot",
-    "Verify yourself & others to keep your chats safe": "Verifieer jezelf en anderen om je gesprekken veilig te houden",
+    "Lock": "Hangslot",
+    "Verify yourself & others to keep your chats safe": "Verifieer uzelf en anderen om uw gesprekken veilig te houden",
     "Other users may not trust it": "Mogelijk wantrouwen anderen het",
     "Upgrade": "Bijwerken",
     "Verify": "Verifiëren",
     "Later": "Later",
-    "Review": "Contrôle",
+    "Review": "Controle",
     "Decline (%(counter)s)": "Afwijzen (%(counter)s)",
     "This bridge was provisioned by <user />.": "Dank aan <user /> voor de brug.",
     "This bridge is managed by <user />.": "Brug onderhouden door <user />.",
@@ -1767,14 +1767,14 @@
     "Channel: %(channelName)s": "Kanaal: %(channelName)s",
     "Show less": "Minder tonen",
     "Show more": "Meer tonen",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest.  Dit zal verbeterd worden.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in.  Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van gebruikers die 'bot' heten op alle servers.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest. Dit zal verbeterd worden.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in. Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van  alle gebruikers die ‘bot’ heten op alle servers.",
     "in memory": "in het geheugen",
     "not found": "niet gevonden",
     "Your homeserver does not support session management.": "Uw thuisserver ondersteunt geen sessiebeheer.",
     "Unable to load session list": "Kan sessielijst niet laden",
-    "Delete %(count)s sessions|other": "Verwijder %(count)s sessies",
-    "Delete %(count)s sessions|one": "Verwijder %(count)s sessie",
+    "Delete %(count)s sessions|other": "%(count)s sessies verwijderen",
+    "Delete %(count)s sessions|one": "%(count)s sessie verwijderen",
     "The version of Riot": "De versie van Riot",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Of u Riot op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
     "Whether you're using Riot as an installed Progressive Web App": "Of u Riot gebruikt als een geïnstalleerde Progressive-Web-App",
@@ -1793,65 +1793,65 @@
     "Start": "Start",
     "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten beveiligd op om ze weer te geven in zoekresultaten.",
     "Enable": "Inschakelen",
-    "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder...",
+    "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder…",
     "Cannot connect to integration manager": "Kan geen verbinding maken met de integratiebeheerder",
     "The integration manager is offline or it cannot reach your homeserver.": "De integratiebeheerder is offline of kan uw thuisserver niet bereiken.",
     "This session is backing up your keys. ": "Deze sessie maakt back-ups van uw sleutels. ",
     "not stored": "niet opgeslagen",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zal geen pushmeldingen op uw andere sessies meer ontvangen, totdat u uzelf daarop opnieuw aanmeld",
-    "Ignored/Blocked": "Genegeerd/Geblokkeerd",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zult geen pushmeldingen op uw andere sessies meer ontvangen, totdat u zichzelf daarop opnieuw aanmeldt",
+    "Ignored/Blocked": "Genegeerd/geblokkeerd",
     "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde gebruiker/server",
-    "Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om inzicht te krijgen.",
+    "Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om voor meer informatie.",
     "Error subscribing to list": "Fout bij het abonneren op de lijst",
-    "Please verify the room ID or alias and try again.": "Controleer de gespreks-ID of gespreks(bij)naam en probeer het opnieuw.",
+    "Please verify the room ID or alias and try again.": "Controleer de gespreks-ID of -(bij)naam en probeer het opnieuw.",
     "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde gebruiker/server",
     "Error unsubscribing from list": "Fout bij het opzeggen van een abonnement op de lijst",
-    "Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console om inzicht te krijgen.",
+    "Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console voor meer informatie.",
     "None": "Geen",
     "You have not ignored anyone.": "U heeft niemand genegeerd.",
     "You are currently ignoring:": "U negeert op dit moment:",
     "You are not subscribed to any lists": "U heeft geen abonnement op een lijst",
-    "Unsubscribe": "Zeg abonnement op",
+    "Unsubscribe": "Abonnement opzeggen",
     "View rules": "Bekijk regels",
     "You are currently subscribed to:": "U heeft een abonnement op:",
     "⚠ These settings are meant for advanced users.": "⚠ Deze instellingen zijn bedoeld voor gevorderde gebruikers.",
-    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van gebruikers gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het nemen van een abonnement op een banlijst betekend dat je de gebruikers/servers die op de lijst staan niet meer zult zien.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Het negeren van gebruikers gaat via banlijsten. Deze bevatten regels over wie verbannen moet worden. Het abonneren op een banlijst betekent dat u de gebruikers/servers die op de lijst staan niet meer zult zien.",
     "Personal ban list": "Persoonlijke banlijst",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle gebruikers/server waar u geen berichten meer van wilt zien. Nadat u een gebruiker/server heeft genegeerd, zal een nieuwe kamer worden aangemaakt met de naam \"Mijn Banlijst\". Om de lijst actief te houden dient u de kamer niet te verlaten.",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Uw persoonlijke banlijst bevat alle gebruikers/server waar u geen berichten meer van wilt zien. Nadat u een gebruiker/server heeft genegeerd, zal er een nieuw gesprek worden aangemaakt met de naam ‘Mijn banlijst’. Om de lijst actief te houden dient u het gesprek niet te verlaten.",
     "Server or user ID to ignore": "Server of gebruikers-ID om te negeren",
-    "eg: @bot:* or example.org": "bijvoorbeeld: @bot:* of example.org",
+    "eg: @bot:* or example.org": "bijvoorbeeld: @bot:* of voorbeeld.org",
     "Subscribed lists": "Abonnementen op lijsten",
-    "Subscribing to a ban list will cause you to join it!": "Wanneer u een abonnement neemt zal u worden toegevoegd!",
+    "Subscribing to a ban list will cause you to join it!": "Wanneer u zich abonneert op een banlijst zal u eraan worden toegevoegd!",
     "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
-    "Room ID or alias of ban list": "Gespreks-ID of (bij)naam of banlijst",
-    "Subscribe": "Abonneer",
-    "Enable desktop notifications for this session": "Schakel desktopmeldingen in voor deze sessie",
-    "Enable audible notifications for this session": "Schakel meldingen met geluid in voor deze sessie",
-    "You should:": "U zou:",
-    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "uw browser extensies bekijken voor extensies die mogelijk de identiteitsserver blokkeren (zoals Privacy Badger)",
+    "Room ID or alias of ban list": "Gespreks-ID of (bij)naam van banlijst",
+    "Subscribe": "Abonneren",
+    "Enable desktop notifications for this session": "Bureaubladmeldingen inschakelen voor deze sessie",
+    "Enable audible notifications for this session": "Meldingen met geluid inschakelen voor deze sessie",
+    "You should:": "U zou best:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "uw browserextensies bekijken voor extensies die mogelijk de identiteitsserver blokkeren (zoals Privacy Badger)",
     "contact the administrators of identity server <idserver />": "contact opnemen met de beheerders van de identiteitsserver <idserver />",
     "wait and try again later": "wachten en het later weer proberen",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder <b>(%(serverName)s)</b> om robots, widgets en stickerpakketten te beheren.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Gebruik een integratiebeheerder om robots, widgets en stickerpakketten te beheren.",
     "Manage integrations": "Beheer integraties",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, uitnodigingen voor de kamer versturen en machtsniveau's namens u aanpassen.",
-    "Ban list rules - %(roomName)s": "Banlijst regels - %(roomName)s",
-    "Server rules": "Server regels",
-    "User rules": "Gebruiker regels",
-    "Show tray icon and minimize window to it on close": "Geef een icoon in de systeembalk weer en minimaliseer het venster wanneer het wordt gesloten",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integratiebeheerders ontvangen configuratie-informatie en kunnen widgets aanpassen, gespreksuitnodigingen versturen en machtsniveau’s namens u aanpassen.",
+    "Ban list rules - %(roomName)s": "Banlijstregels - %(roomName)s",
+    "Server rules": "Serverregels",
+    "User rules": "Gebruikersregels",
+    "Show tray icon and minimize window to it on close": "Geef een pictogram weer in de systeembalk en minimaliseer het venster wanneer het wordt gesloten",
     "Session ID:": "Sessie-ID:",
     "Session key:": "Sessiesleutel:",
     "Message search": "Berichten zoeken",
     "Sessions": "Sessies",
-    "A session's public name is visible to people you communicate with": "Een sessie's publieke naam is zichtbaar voor de mensen waarmee u communiceert",
-    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugt naar de volgende platformen. <a>Lees meer</a>",
-    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugt naar andere platformen. <a>Lees meer.</a>",
-    "Bridges": "Overbruggingen",
-    "This user has not verified all of their sessions.": "Deze gebruiker heeft niet al haar sessies geverifieerd.",
+    "A session's public name is visible to people you communicate with": "De publieke naam van een sessie is zichtbaar voor de mensen waarmee u communiceert",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugd naar de volgende platformen. <a>Lees meer</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugd naar andere platformen. <a>Lees meer.</a>",
+    "Bridges": "Bruggen",
+    "This user has not verified all of their sessions.": "Deze gebruiker heeft niet al zijn sessies geverifieerd.",
     "You have not verified this user.": "U heeft deze gebruiker niet geverifieerd.",
-    "You have verified this user. This user has verified all of their sessions.": "U heeft deze gebruiker geverifieerd. Deze gebruiker heeft al haar sessies geverifieerd.",
+    "You have verified this user. This user has verified all of their sessions.": "U heeft deze gebruiker geverifieerd. Deze gebruiker heeft al zijn sessies geverifieerd.",
     "Someone is using an unknown session": "Iemand gebruikt een onbekende sessie",
-    "This room is end-to-end encrypted": "Dit gesprek is van eind-tot-eind versleuteld",
+    "This room is end-to-end encrypted": "Dit gesprek is eind-tot-eind-versleuteld",
     "Everyone in this room is verified": "Iedereen in dit gesprek is geverifieerd",
     "Some sessions for this user are not trusted": "Sommige sessies van deze gebruiker zijn niet vertrouwd",
     "All sessions for this user are trusted": "Alle sessies van deze gebruiker zijn vertrouwd",
@@ -1861,37 +1861,40 @@
     "rooms.": "gesprekken.",
     "Recent rooms": "Actuele gesprekken",
     "Direct Messages": "Tweegesprekken",
-    "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aanstaan om te kunnen zoeken in versleutelde gesprekken.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde gesprekken.",
     "Indexed rooms:": "Geïndexeerde gesprekken:",
-    "Cross-signing and secret storage are enabled.": "Cross-signing en sleutelopslag zijn ingeschakeld.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een cross-signing identiteit in de sleutelopslag, maar deze is nog niet vertrouwd door de huidige sessie.",
-    "Cross-signing and secret storage are not yet set up.": "Cross-signing en sleutelopslag zijn nog niet ingesteld.",
-    "Bootstrap cross-signing and secret storage": "Cross-signing en sleutelopslag opzetten",
-    "Reset cross-signing and secret storage": "Cross-signing en sleutelopslag resetten",
-    "Cross-signing public keys:": "Cross-signing publieke sleutels:",
-    "Cross-signing private keys:": "Cross-signing privésleutels:",
+    "Cross-signing and secret storage are enabled.": "Kruiselings ondertekenen en sleutelopslag zijn ingeschakeld.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar deze is nog niet vertrouwd door de huidige sessie.",
+    "Cross-signing and secret storage are not yet set up.": "Kruiselings ondertekenen en sleutelopslag zijn nog niet ingesteld.",
+    "Bootstrap cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag instellen",
+    "Reset cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag opnieuw instellen",
+    "Cross-signing public keys:": "Publieke sleutels voor kruiselings ondertekenen:",
+    "Cross-signing private keys:": "Privésleutels voor kruiselings ondertekenen:",
     "in secret storage": "in de sleutelopslag",
     "Secret storage public key:": "Sleutelopslag publieke sleutel:",
     "in account data": "in accountinformatie",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten beveiligd op om ze weer te geven in de zoekresultaten, door gebruik te maken van ",
     " to store messages from ": " om berichten op te slaan van ",
     "Manage": "Beheren",
-    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u uitlogt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u zich afmeldt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
     "Connect this session to Key Backup": "Verbind deze sessie met de sleutelback-up",
-    "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>correcte</validity> ondertekening van deze gebruiker",
-    "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>incorrecte</validity> ondertekening van deze gebruiker",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van <verify>onbekende</verify> gebruiker met ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "De back-up heeft een ondertekening van <verify>onbekende</verify> sessie met ID %(deviceId)s",
-    "Backup has a <validity>valid</validity> signature from this session": "De back-up heeft een <validity>correcte</validity> ondertekening van deze sessie",
-    "Backup has an <validity>invalid</validity> signature from this session": "De back-up heeft een <validity>incorrecte</validity> ondertekening van deze sessie",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>correcte</validity> ondertekening van <verify>geverifieerde</verify> sessie <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>correcte</validity> ondertekening van <verify>ongeverifieerde</verify> sessie <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>incorrecte</validity> ondertekening van <verify>geverifieerde</verify> sessie <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>incorrecte</validity> ondertekening van <verify>ongeverifieerde</verify> sessie <device></device>",
+    "Backup has a <validity>valid</validity> signature from this user": "De back-up heeft een <validity>geldige</validity> ondertekening van deze gebruiker",
+    "Backup has a <validity>invalid</validity> signature from this user": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze gebruiker",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> gebruiker met ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "De back-up heeft een ondertekening van een <verify>onbekende</verify> sessie met ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "De back-up heeft een <validity>geldige</validity> ondertekening van deze sessie",
+    "Backup has an <validity>invalid</validity> signature from this session": "De back-up heeft een <validity>ongeldige</validity> ondertekening van deze sessie",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>geldige</validity> ondertekening van een <verify>geverifieerde</verify> sessie <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>geldige</validity> ondertekening van een <verify>ongeverifieerde</verify> sessie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "De back-up heeft een <validity>ongeldige</validity> ondertekening van een <verify>geverifieerde</verify> sessie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "De back-up heeft een <validity>ongeldige</validity> ondertekening van een <verify>ongeverifieerde</verify> sessie <device></device>",
     "Backup is not signed by any of your sessions": "De back-up is door geen van uw sessies ondertekend",
-    "This backup is trusted because it has been restored on this session": "Deze back-up is vertrouwd omdat het is hersteld naar deze sessie",
+    "This backup is trusted because it has been restored on this session": "Deze back-up is vertrouwd omdat hij hersteld is naar deze sessie",
     "Backup key stored: ": "Back-upsleutel opgeslagen: ",
     "Your keys are <b>not being backed up from this session</b>.": "Uw sleutels worden <b>niet geback-upt van deze sessie</b>.",
-    "Clear notifications": "Notificaties wissen",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppeld. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is het offline."
+    "Clear notifications": "Meldingen wissen",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppelt. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is hij offline.",
+    "Your homeserver does not support cross-signing.": "Uw thuisserver biedt geen ondersteuning voor kruiselings ondertekenen.",
+    "Homeserver feature support:": "Functies ondersteund door thuisserver:",
+    "exists": "bestaat"
 }

From f6fdddb9bac6d62891eb7c19611c0df1a7ce4b87 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 25 Feb 2020 09:54:48 -0700
Subject: [PATCH 1246/3235] Don't prefix QR codes with the length of the static
 marker string

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

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index cbbe2912d6..88f9608138 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -130,9 +130,9 @@ export default class VerificationQRCode extends React.PureComponent {
             tmpBuf.writeInt8(i, 0);
             buf = Buffer.concat([buf, tmpBuf]);
         };
-        const appendStr = (s: string, enc: string) => {
+        const appendStr = (s: string, enc: string, withLengthPrefix = true) => {
             const tmpBuf = Buffer.from(s, enc);
-            appendInt(tmpBuf.byteLength);
+            if (withLengthPrefix) appendInt(tmpBuf.byteLength);
             buf = Buffer.concat([buf, tmpBuf]);
         };
         const appendEncBase64 = (b64: string) => {
@@ -142,7 +142,7 @@ export default class VerificationQRCode extends React.PureComponent {
         };
 
         // Actually build the buffer for the QR code
-        appendStr(this.props.prefix, "ascii");
+        appendStr(this.props.prefix, "ascii", false);
         appendByte(this.props.version);
         appendByte(this.props.mode);
         appendStr(this.props.transactionId, "utf-8");

From 566db6c406c9b6905fbf154e18a89312258c41f0 Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Tue, 25 Feb 2020 17:29:59 +0000
Subject: [PATCH 1247/3235] link to matrix.org/security-disclosure-policy in
 help screen

---
 .../views/settings/tabs/user/HelpUserSettingsTab.js      | 9 +++++++++
 src/i18n/strings/en_EN.json                              | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 258b55bb4e..1222cc1634 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -225,6 +225,15 @@ export default class HelpUserSettingsTab extends React.Component {
                                 {_t("Clear cache and reload")}
                             </AccessibleButton>
                         </div>
+                        {
+                            _t( "To submit a security-related bug report, please read the Matrix.org " +
+                                "<a>Security Disclosure Policy</a>.", {},
+                                {
+                                    'a': (sub) =>
+                                        <a href="https://matrix.org/security-disclosure-policy/"
+                                        rel='noreferrer noopener' target='_blank'>{sub}</a>,
+                                })
+                        }
                     </div>
                 </div>
                 <div className='mx_SettingsTab_section'>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f702da6b4c..9223c13408 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2133,5 +2133,6 @@
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",
+    "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>."
 }

From 92bc3e83ef08d99739961f81c22eeb529a72ca6a Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Tue, 25 Feb 2020 17:57:31 +0000
Subject: [PATCH 1248/3235] yarn i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9223c13408..c0470af357 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -725,6 +725,7 @@
     "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.": "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.",
     "Submit debug logs": "Submit debug logs",
     "Clear cache and reload": "Clear cache and reload",
+    "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "FAQ": "FAQ",
     "Versions": "Versions",
     "riot-web version:": "riot-web version:",
@@ -2133,6 +2134,5 @@
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",
-    "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>."
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From 30a0d88074542eb538f98e869d04e5ad58d8c853 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 25 Feb 2020 13:13:41 -0700
Subject: [PATCH 1249/3235] Don't print errors when the tab is used with no
 autocomplete present

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

Not a release blocker because the error is caught, and is at the end of the function. Just log spam.
---
 src/components/views/rooms/BasicMessageComposer.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index ff4e5e8385..e366a20326 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -471,10 +471,14 @@ export default class BasicMessageEditor extends React.Component {
                 const addedLen = range.replace([partCreator.pillCandidate(range.text)]);
                 return model.positionForOffset(caret.offset + addedLen, true);
             });
-            await model.autoComplete.onTab();
-            if (!model.autoComplete.hasSelection()) {
-                this.setState({showVisualBell: true});
-                model.autoComplete.close();
+
+            // Don't try to do things with the autocomplete if there is none shown
+            if (model.autoComplete) {
+                await model.autoComplete.onTab();
+                if (!model.autoComplete.hasSelection()) {
+                    this.setState({showVisualBell: true});
+                    model.autoComplete.close();
+                }
             }
         } catch (err) {
             console.error(err);

From 6008124e65da7f21d29e80e781d02d3ae1655f67 Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Tue, 25 Feb 2020 17:52:54 +0000
Subject: [PATCH 1250/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 50.9% (1088 of 2137 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 0bdf358533..c9b98f9a26 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -47,15 +47,15 @@
     "%(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?": "Kven vil du leggja til i dette samfunnet?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Åtvaring: alle du legg til i eit samfunn vert offentleg synleg til alle som kan samfunns-IDen",
-    "Invite new community members": "Byd nye samfunnsmedlemer inn",
-    "Invite to Community": "Byd inn til Samfunn",
-    "Which rooms would you like to add to this community?": "Kva rom vil du leggja til i dette samfunnet?",
-    "Show these rooms to non-members on the community page and room list?": "Vis desse romma til ikkje-medlemer på samfunnssida og romlista?",
-    "Add rooms to the community": "Legg til rom i samfunnet",
+    "Who would you like to add to this community?": "Kven vil du leggja til i dette fellesskapet?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Åtvaring: alle du legg til i eit fellesskap blir offentleg synleg til alle som kan fellesskaps-IDen",
+    "Invite new community members": "Inviter nye fellesskapsmedlem",
+    "Invite to Community": "Inviter til Felleskapet",
+    "Which rooms would you like to add to this community?": "Kva rom vil du leggja til i dette fellesskapet?",
+    "Show these rooms to non-members on the community page and room list?": "Vise desse romma til ikkje-medlem på fellesskapssida og romkatalogen?",
+    "Add rooms to the community": "Legg til rom i fellesskapet",
     "Room name or alias": "Romnamn eller alias",
-    "Add to community": "Legg til i samfunn",
+    "Add to community": "Legg til i fellesskapet",
     "Failed to invite the following users to %(groupId)s:": "Fekk ikkje til å invitera følgjande brukarar i %(groupId)s:",
     "Failed to invite users to community": "Fekk ikkje til å invitera brukarar til fellesskapet.",
     "Failed to invite users to %(groupId)s": "Fekk ikkje til å byda brukarar inn til %(groupId)s",
@@ -127,7 +127,7 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s sa ja til innbydinga frå %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s sa ja til ei innbyding.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s bad om ei VoIP-gruppesamtale.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s baud %(targetName)s inn.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterte %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s stengde %(targetName)s ute.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endra visingsnamnet sitt til %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s sette visingsnamnet sitt som %(displayName)s.",
@@ -149,13 +149,13 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sende eit bilete.",
     "Someone": "Nokon",
     "(not supported by this browser)": "(ikkje støtta av denne nettlesaren)",
-    "%(senderName)s answered the call.": "%(senderName)s tok røret.",
+    "%(senderName)s answered the call.": "%(senderName)s svarde på samtalen.",
     "(could not connect media)": "(klarte ikkje å kopla media saman)",
     "(no answer)": "(ingen svar)",
-    "(unknown failure: %(reason)s)": "(ukjend mislukking: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s enda samtala.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s baud %(targetDisplayName)s inn til rommet.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemer frå då dei vart innbodne.",
+    "(unknown failure: %(reason)s)": "(ukjend feil: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s avslutta samtalen.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterte %(targetDisplayName)s til å bli med i rommet.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemar frå då dei vart invitert.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemer frå då dei kom inn.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg for alle rommedlemer.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde den framtidige romhistoria tilgjengelg for kven som helst.",
@@ -349,7 +349,7 @@
     "Forget room": "Gløym rom",
     "Search": "Søk",
     "Share room": "Del rom",
-    "Community Invites": "Samfunnsinnbydingar",
+    "Community Invites": "Fellesskapsinvitasjonar",
     "Invites": "Innbydingar",
     "Favourites": "Yndlingar",
     "Rooms": "Rom",
@@ -397,12 +397,12 @@
     "Local addresses for this room:": "Lokaladresser for dette rommet:",
     "This room has no local addresses": "Dette rommer har ingen lokaladresser",
     "New address (e.g. #foo:%(localDomain)s)": "Ny adresse (t.d. #foo:%(localDomain)s)",
-    "Invalid community ID": "Ugangbar samfunnsID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gangbar samfunnsID",
+    "Invalid community ID": "Ugyldig fellesskaps-ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gyldig fellesskaps-ID",
     "Flair": "Særpreg",
     "Showing flair for these communities:": "Viser særpreg for desse samfunna:",
     "This room is not showing flair for any communities": "Dette rommet viser ikkje særpreg for nokre samfunn",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Ny samfunnsID (t.d. +foo:%(localDomain)s)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Ny fellesskaps-ID (t.d. +foo:%(localDomain)s)",
     "You have <a>enabled</a> URL previews by default.": "Du har <a>skrudd URL-førehandsvisingar på</a> i utgangspunktet.",
     "You have <a>disabled</a> URL previews by default.": "Du har <a>skrudd URL-førehandsvisingar av</a> i utgangspunktet.",
     "URL previews are enabled by default for participants in this room.": "URL-førehandsvisingar er skrudd på i utgangspunktet for dette rommet.",
@@ -450,23 +450,23 @@
     "Sign in": "Logg inn",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Viss du ikkje seier kva epostadresse du vil bruka vil du ikkje kunna attendestille passordet ditt. Er du sikker?",
     "Register": "Meld deg inn",
-    "Remove from community": "Fjern frå samfunnet",
-    "Disinvite this user from community?": "Fjern denne brukaren si innbyding til samfunnet?",
-    "Remove this user from community?": "Fjern denne brukaren frå samfunnet?",
+    "Remove from community": "Fjern frå fellesskapet",
+    "Disinvite this user from community?": "Fjerne denne brukaren sin invitasjon til fellesskapet?",
+    "Remove this user from community?": "Fjerne denne brukaren frå fellesskapet?",
     "Failed to withdraw invitation": "Fekk ikkje til å taka innbydinga att",
-    "Failed to remove user from community": "Fekk ikkje til å fjerna brukaren frå samfunnet",
+    "Failed to remove user from community": "Fekk ikkje til å fjerna brukaren frå fellesskapet",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Er du sikker på at du vil fjerna '%(roomName)s' frå %(groupId)s?",
-    "Removing a room from the community will also remove it from the community page.": "Å fjerna eit rom frå samfunnet fjernar det frå samfunnssida òg.",
+    "Removing a room from the community will also remove it from the community page.": "Fjerning av rom frå fellesskapet vil i tillegg fjerna det frå fellesskapssida.",
     "Remove": "Fjern",
-    "Failed to remove room from community": "Fekk ikkje til å fjerna rommet frå samfunnet",
+    "Failed to remove room from community": "Fekk ikkje til å fjerna rommet frå fellesskapet",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Fekk ikkje til å fjerna '%(roomName)s' frå %(groupId)s",
     "Something went wrong!": "Noko gjekk gale!",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Kunne ikkje oppdatera synligheita til '%(roomName)s' i %(groupId)s.",
     "Visibility in Room List": "Synligheit i Romlista",
     "Visible to everyone": "Synleg for alle",
-    "Only visible to community members": "Berre synleg for samfunnsmedlemer",
+    "Only visible to community members": "Berre synleg for medlemar av fellesskapet",
     "Something went wrong when trying to get your communities.": "Noko gjekk gale med framhentinga av samfunna dine.",
-    "Display your community flair in rooms configured to show it.": "Vis samfunnssærpreget ditt i rom som er stilt inn til å visa det.",
+    "Display your community flair in rooms configured to show it.": "Vis fellesskapsetiketten din i rom som er stilt inn til å visa det.",
     "You're not currently a member of any communities.": "Du er for augeblunket ikkje medlem i nokre samfunn.",
     "Yes, I want to help!": "Ja, eg vil vera til nytte!",
     "You are not receiving desktop notifications": "Du fær ikkje skrivebordsvarsel",
@@ -571,11 +571,11 @@
     "Send logs": "Send loggar inn",
     "Unavailable": "Utilgjengeleg",
     "Changelog": "Endringslogg",
-    "Something went wrong whilst creating your community": "Noko gjekk gale med laginga av samfunnet ditt",
-    "Create Community": "Lag Samfunn",
-    "Community Name": "Samfunnsnamn",
+    "Something went wrong whilst creating your community": "Noko gjekk gale med laginga av felleskapet ditt",
+    "Create Community": "Lag Fellesskap",
+    "Community Name": "Fellesskapsnamn",
     "Example": "Døme",
-    "Community ID": "Samfunns-ID",
+    "Community ID": "Fellesskap-ID",
     "example": "døme",
     "Create": "Lag",
     "Create Room": "Lag eit Rom",
@@ -584,8 +584,8 @@
     "Minimize apps": "Legg æppar ned",
     "Confirm Removal": "Godkjenn Fjerning",
     "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.": "Er du sikker på at du vil fjerna (sletta) denne hendingen? Merk deg at vis du slettar eit romnamn eller ei emneendring kan det gjera om på endringa.",
-    "Community IDs cannot be empty.": "Samfunns-IDfeltet kan ikkje vera tomt.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Samfunns-IDar kan berre innehalda teikna a-z, 0-9, eller '=_-./'",
+    "Community IDs cannot be empty.": "Feltet Fellesskap-ID kan ikkje vera tomt.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Fellesskap-IDar kan berre innehalda teikna a-z, 0-9, eller '=_-./'",
     "Unknown error": "Noko ukjend gjekk galt",
     "Incorrect password": "Urett passord",
     "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>": "Dette gjer at brukaren din vert ubrukeleg til evig tid. Du kjem ikkje til å kunna logga inn, og ingen andre kjem til å kunna melde seg inn med den gamle brukar-IDen din. Brukaren din forlét òg alle rom han er i, og brukardetaljane dine vil verta fjerna frå identitetstenaren. <b>Denne handlinga kan ikkje gjerast om.</b>",
@@ -642,7 +642,7 @@
     "Share Room": "Del Rom",
     "Link to most recent message": "Lenk til den nyaste meldinga",
     "Share User": "Del Brukar",
-    "Share Community": "Del Samfunn",
+    "Share Community": "Del Fellesskap",
     "Share Room Message": "Del Rommelding",
     "Link to selected message": "Lenk til den valde meldinga",
     "COPY": "KOPIER",
@@ -673,7 +673,7 @@
     "Forget": "Gløym",
     "Low Priority": "Lågrett",
     "Direct Chat": "Direktesamtale",
-    "View Community": "Sjå Samfunn",
+    "View Community": "Sjå Fellesskap",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Orsak, nettlesaren din klarer <b>ikkje</b> å køyra Riot.",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange omfattande nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller i utprøving i nettlesaren din.",
     "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!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
@@ -682,44 +682,44 @@
     "You must <a>register</a> to use this functionality": "Du må <a>melda deg inn</a> for å bruka denne funksjonen",
     "You must join the room to see its files": "Du må fare inn i rommet for å sjå filene dets",
     "There are no visible files in this room": "Det er ingen synlege filer i dette rommet",
-    "<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 samfunnssida di</h1>\n<p>\n    Bruk den Lange Skildringa for å ynskja nye medlemer velkomen, eller gje ut viktige <a href=\"foo\">lenkjer</a>\n</p>\n<p>\n    Du kan til og med bruka 'img'-merkelappar!\n</p>\n",
-    "Add rooms to the community summary": "Legg rom til i samfunnsoppsamanfattinga",
+    "<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 samfunnssida di</h1>\n<p>\n    Bruk den Lange Skildringa for å ynskja nye medlemer velkomen, eller gje ut viktige <a href=\"foo\">lenkjer</a>\n</p>\n<p>\n    Du kan til og med bruka 'img' HTML-taggar!\n</p>\n",
+    "Add rooms to the community summary": "Legg rom til i samandraget for fellesskapet",
     "Which rooms would you like to add to this summary?": "Kva rom ynskjer du å leggja til i samanfattinga?",
     "Add to summary": "Legg til i samanfattinga",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Fekk ikkje til å leggja dei fylgjande romma til i samanfattinga av %(groupId)s:",
     "Add a Room": "Legg eit Rom til",
     "Failed to remove the room from the summary of %(groupId)s": "Fekk ikkje til å fjerna rommet frå samanfattinga av %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Rommet '%(roomName)s' lét seg ikkje fjerna frå samanfattinga.",
-    "Add users to the community summary": "Legg brukarar til i samfunnsamanfattinga",
+    "Add users to the community summary": "Legg brukarar til i samandraget for fellesskapet",
     "Who would you like to add to this summary?": "Kven vil du leggja til i samanfattinga?",
     "Failed to add the following users to the summary of %(groupId)s:": "Fekk ikkje til å leggja fylgjande brukarar til i samanfattinga av %(groupId)s:",
     "Add a User": "Legg ein Brukar til",
     "Failed to remove a user from the summary of %(groupId)s": "Fekk ikkje til å fjerna brukaren frå samanfattinga av %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "Brukaren '%(displayName)s' lét seg ikkje fjerna frå samanfattinga.",
     "Failed to upload image": "Fekk ikkje til å lasta biletet opp",
-    "Failed to update community": "Fekk ikkje til å oppdatera samfunnet",
+    "Failed to update community": "Fekk ikkje til å oppdatera fellesskapet",
     "Unable to accept invite": "Fekk ikkje til å seia ja til innbydinga",
-    "Unable to join community": "Fekk ikkje til å fara inn i samfunnet",
-    "Leave Community": "Far frå Samfunnet",
+    "Unable to join community": "Fekk ikkje til å bli med i fellesskapet",
+    "Leave Community": "Forlat fellesskapet",
     "Leave %(groupName)s?": "Far frå %(groupName)s?",
-    "Unable to leave community": "Fekk ikkje til å fara frå samfunnet",
-    "Community Settings": "Samfunninnstillingar",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Endringar gjort på <bold1>samfunnsnamnet</bold1> og <bold2>samfunnsavataren</bold2> vert kanskje ikkje synleg forandre før opp til 30 minutt har gått.",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Desse romma vert viste for samfunnsmedlemer på samfunnsida. Samfunnsmedlemer kan fara inn i romma ved å klikka på dei.",
-    "Add rooms to this community": "Legg rom til i samfunnet",
+    "Unable to leave community": "Fekk ikkje til å forlate fellesskapet",
+    "Community Settings": "Fellesskapsinnstillingar",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Endringar gjort på <bold1>felleskapsnamn</bold1> og <bold2>felleskapsavatar</bold2> blir kanskje ikkje synleg for andre før etter 30 minutt.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Desse romma vert viste for medlem i felleskapet på felleskapssida. Felleskapsmedlemar kan bli med i romma ved å klikke på dei.",
+    "Add rooms to this community": "Legg rom til i fellesskapet",
     "Featured Rooms:": "Utvalde Rom:",
     "Featured Users:": "Utvalde Brukarar:",
-    "%(inviter)s has invited you to join this community": "%(inviter)s baud deg inn til dette samfunnet",
-    "Join this community": "Far inn i samfunnet",
-    "Leave this community": "Far frå samfunnet",
-    "You are an administrator of this community": "Du er administrator i dette samfunnet",
-    "You are a member of this community": "Du er eit medlem av dette samfunnet",
-    "Who can join this community?": "Kven kan verta med i samfunnet?",
+    "%(inviter)s has invited you to join this community": "%(inviter)s inviterte deg med i dette fellesskapet",
+    "Join this community": "Bli med i dette felleskapet",
+    "Leave this community": "Forlat dette felleskapet",
+    "You are an administrator of this community": "Du er administrator av dette fellesskapet",
+    "You are a member of this community": "Du er medlem av dette fellesskapet",
+    "Who can join this community?": "Kven kan bli med i dette fellesskapet?",
     "Everyone": "Alle",
-    "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!": "Samfunnet ditt har ikkje ei Lang Skilrding (ei HTML-side for å visa til samfunnsmedlem.) <br/>Klikk her for å opna innstillingar og gje det ei!",
+    "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!": "Fellesskapet ditt har ikkje ein lang beskrivelse (HTML-side for å visa til fellesskapsmedlem.) <br/>Klikk her for å opna innstillingar og legge dette til!",
     "Long Description (HTML)": "Lang Skildring (HTML)",
     "Description": "Skildring",
-    "Community %(groupId)s not found": "Fann ikkje samfunnet %(groupId)s",
+    "Community %(groupId)s not found": "Fann ikkje fellesskapet %(groupId)s",
     "Failed to load %(groupId)s": "Fekk ikkje til å lasta %(groupId)s",
     "Failed to reject invitation": "Fekk ikkje til å seia nei til innbyding",
     "This room is not public. You will not be able to rejoin without an invite.": "Dette rommet er ikkje offentleg. Du kjem ikkje til å kunna koma inn att utan ei innbyding.",
@@ -737,13 +737,13 @@
     "Logout": "Loggar ut",
     "Your Communities": "Dine Samfunn",
     "Error whilst fetching joined communities": "Noko gjekk gale med innhentinga av samfunna du er i",
-    "Create a new community": "Lag eit nytt samfunn",
+    "Create a new community": "Lag eit nytt fellesskap",
     "You have no visible notifications": "Du har ingen synlege varsel",
     "Members": "Medlemer",
     "Invite to this room": "Byd inn til rommet",
     "Files": "Filer",
     "Notifications": "Varsel",
-    "Invite to this community": "Byd inn til samfunnet",
+    "Invite to this community": "Inviter til dette fellesskapet",
     "The server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rommaliaset %(alias)s og fjern %(name)s frå utvalet?",
     "Remove %(name)s from the directory?": "Fjern %(name)s frå utvalet?",
@@ -866,9 +866,9 @@
     "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.": "Når nokon legg ein URL med i meldinga si, kan ei URL-førehandsvising visast for å gje meir info om lenkja slik som tittelen, skildringa, og eit bilete frå nettsida.",
     "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?": "Du held på å verta teken til ei tredje-partisside so du kan godkjenna brukaren din til bruk med %(integrationsUrl)s. Vil du gå fram?",
     "Token incorrect": "Teiknet er gale",
-    "Filter community members": "Filtrer samfunnsmedlemer",
+    "Filter community members": "Filtrer fellesskapssmedlemar",
     "Custom Server Options": "Tilpassa tenar-innstillingar",
-    "Filter community rooms": "Filtrer samfunnsrom",
+    "Filter community rooms": "Filtrer rom i fellesskapet",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake (ver venleg og sjå på <PolicyLink>Datakakeretningslinene våre</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake.",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
@@ -887,8 +887,8 @@
     "Custom": "Sjølvsett",
     "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
     "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka samfunn for å filtrera Riot.im-opplevinga di!",
-    "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.": "For å setja opp eit filter, drag ein samfunnsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det samfunnet.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit samfunn for å føra saman brukarar og rom! Bygg di eiga heimeside for å kreva din del av Matrix-verda.",
+    "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.": "For å setja opp eit filter, dra ein fellesskapsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det fellesskapet.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Bygg di eiga heimeside for å kreva din del av Matrix-verda.",
     "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
     "Server may be unavailable, overloaded, or search timed out :(": "Tenaren er kanskje utilgjengeleg, overlasta, elles så vart søket tidsavbrote :(",
     "Clear filter": "Tøm filter",
@@ -1090,5 +1090,15 @@
     "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s fjerna %(removedAddresses)s og %(count)s andre som adresse for dette rommet",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s fjerna %(removedAddresses)s som adresser for dette rommet.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s fjerna %(removedAddresses)s som adresse for dette rommet.",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s fjerna %(countRemoved)s og la til %(countAdded)s adresser for dette rommet"
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s fjerna %(countRemoved)s og la til %(countAdded)s adresser for dette rommet",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s la til %(addedAddresses)s og tok vekk %(removedAddresses)s som adresser for dette rommet.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte standardadressa for dette rommet til %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s fjerna standardadressa for dette rommet.",
+    "%(senderName)s placed a voice call.": "%(senderName)s starta eit taleanrop.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s starta eit taleanrop. (ikkje støtta av denne nettlesaren)",
+    "%(senderName)s placed a video call.": "%(senderName)s starta ein videosamtale.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s starta ein videosamtale. (ikkje støtta av denne nettlesaren)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s trekte tilbake invitasjonen for at %(targetDisplayName)s kan bli medlem i rommet.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du er administrator for dette fellesskapet. Du kan ikkje melde deg inn igjen utan at du har invitasjon frå ein annan administrator.",
+    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>"
 }

From b32fbcb64fef82f1e7c229efd29d849d93a493f9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 25 Feb 2020 15:40:15 -0700
Subject: [PATCH 1251/3235] Don't try to collapse zero events with a group

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

When events are redacted they fail to make it into the Grouper because the `shouldAddEvent` check blocks them from entering. However, the grouper expects that when `getTiles()` is called that there's events to group and dutifully grabs some context from the array. Because JavaScript is the least helpful language, `myArray[-1]` returns `undefined` or `null` and thus you get `cannot read 'sender' of undefined`.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4059
---
 src/components/structures/MessagePanel.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index b8b11fbb31..d0e35e1c2b 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -873,6 +873,11 @@ class CreationGrouper {
     }
 
     getTiles() {
+        // If we don't have any events to group, don't even try to group them. The logic
+        // below assumes that we have a group of events to deal with, but we might not if
+        // the events we were supposed to group were redacted.
+        if (!this.events || !this.events.length) return [];
+
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
 
@@ -959,6 +964,11 @@ class MemberGrouper {
     }
 
     getTiles() {
+        // If we don't have any events to group, don't even try to group them. The logic
+        // below assumes that we have a group of events to deal with, but we might not if
+        // the events we were supposed to group were redacted.
+        if (!this.events || !this.events.length) return [];
+
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
 

From 9673fbfc2ab33dabc58734242b079a9b8204ef64 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Tue, 25 Feb 2020 21:20:16 +0000
Subject: [PATCH 1252/3235] Translated using Weblate (Finnish)

Currently translated at 89.8% (1918 of 2137 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 370f0b5394..769e92ac27 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1920,5 +1920,24 @@
     "Backup restored": "Varmuuskopio palautettu",
     "Go Back": "Takaisin",
     "Copy": "Kopioi",
-    "Upgrade your encryption": "Päivitä salauksesi"
+    "Upgrade your encryption": "Päivitä salauksesi",
+    "Unknown (user, session) pair:": "Tuntematon (käyttäjä, istunto) -pari:",
+    "Your homeserver does not support session management.": "Kotipalvelimesi ei tue istunnonhallintaa.",
+    "Unable to load session list": "Istuntoluettelon lataaminen ei onnistu",
+    "Delete %(count)s sessions|one": "Poista %(count)s istunto",
+    "Backup has a <validity>valid</validity> signature from this session": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus tästä istunnosta",
+    "Backup has an <validity>invalid</validity> signature from this session": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tästä istunnosta",
+    "Enable desktop notifications for this session": "Ota käyttöön työpöytäilmoitukset tälle istunnolle",
+    "Enable audible notifications for this session": "Ota käyttöön ääni-ilmoitukset tälle istunnolle",
+    "A session's public name is visible to people you communicate with": "Istunnon julkinen nimi näkyy ihmisille, joiden kanssa viestit",
+    "Someone is using an unknown session": "Joku käyttää tuntematonta istuntoa",
+    "%(count)s sessions|other": "%(count)s istuntoa",
+    "%(count)s sessions|one": "%(count)s istunto",
+    "Hide sessions": "Piilota istunnot",
+    "Clear all data in this session?": "Poista kaikki tämän istunnon tiedot?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Kaikkien tämän istunnon tietojen poistaminen on pysyvää. Salatut viestit menetetään, ellei niiden avaimia ole varmuuskopioitu.",
+    "Session name": "Istunnon nimi",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Lisäsit uuden istunnon '%(displayName)s', joka pyytää salausavaimia.",
+    "Loading session info...": "Ladataan istunnon tietoja...",
+    "New session": "Uusi istunto"
 }

From 167092d35b62c1c38b2353a983df4c979e6f1a4d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 25 Feb 2020 20:29:50 +0000
Subject: [PATCH 1253/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2137 of 2137 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b1531daa42..4b08fb8294 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2154,5 +2154,18 @@
     "You declined": "Elutasítottad",
     "%(name)s declined": "%(name)s elutasította",
     "accepting …": "elfogadás …",
-    "declining …": "elutasítás …"
+    "declining …": "elutasítás …",
+    "Cancelling…": "Megszakítás…",
+    "Your homeserver does not support cross-signing.": "A matrix szervered nem támogatja az eszközök közti hitelesítést.",
+    "Homeserver feature support:": "Matrix szerver támogatott szolgáltatások:",
+    "exists": "létezik",
+    "Accepting…": "Elfogadás…",
+    "Accepting …": "Elfogadás …",
+    "Declining …": "Elutasítás …",
+    "Verification Requests": "Hitelesítés Kérések",
+    "Your account is not secure": "A fiókod nem biztonságos",
+    "Your password": "A jelszavad",
+    "This session, or the other session": "Ez vagy másik munkamenet",
+    "The internet connection either session is using": "Az egyik munkamenet internet kapcsolata",
+    "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban"
 }

From 9be61497fb33bb3cb52e7e7e631d9b0477b70161 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 25 Feb 2020 16:11:07 -0700
Subject: [PATCH 1254/3235] Handle errors when previewing rooms more safely

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

See https://github.com/matrix-org/synapse/issues/6992 for additional context.
---
 src/components/structures/RoomView.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 0efa46416e..edd916697a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -342,7 +342,7 @@ export default createReactClass({
                         peekLoading: false,
                     });
                     this._onRoomLoaded(room);
-                }, (err) => {
+                }).catch((err) => {
                     if (this.unmounted) {
                         return;
                     }
@@ -355,7 +355,7 @@ export default createReactClass({
                     // This won't necessarily be a MatrixError, but we duck-type
                     // here and say if it's got an 'errcode' key with the right value,
                     // it means we can't peek.
-                    if (err.errcode == "M_GUEST_ACCESS_FORBIDDEN") {
+                    if (err.errcode === "M_GUEST_ACCESS_FORBIDDEN" || err.errcode === 'M_FORBIDDEN') {
                         // This is fine: the room just isn't peekable (we assume).
                         this.setState({
                             peekLoading: false,
@@ -365,8 +365,6 @@ export default createReactClass({
                     }
                 });
             } else if (room) {
-                //viewing a previously joined room, try to lazy load members
-
                 // Stop peeking because we have joined this room previously
                 MatrixClientPeg.get().stopPeeking();
                 this.setState({isPeeking: false});

From 15dd6b319d8dfd5b614a91429e1635bd53d0ef8a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 26 Feb 2020 02:12:30 +0000
Subject: [PATCH 1255/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2137 of 2137 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d14a77744e..0551f2f3ec 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2161,5 +2161,14 @@
     "Your homeserver does not support cross-signing.": "您的家伺服器不支援交叉簽章。",
     "Homeserver feature support:": "家伺服器功能支援：",
     "exists": "存在",
-    "Verification Requests": "驗證請求"
+    "Verification Requests": "驗證請求",
+    "Cancelling…": "正在取消……",
+    "Accepting…": "正在接受……",
+    "Accepting …": "正在接受……",
+    "Declining …": "正在拒絕……",
+    "Your account is not secure": "您的帳號不安全",
+    "Your password": "您的密碼",
+    "This session, or the other session": "此工作階段或其他工作階段",
+    "The internet connection either session is using": "任何一個工作階段正在使用的網際網路連線",
+    "We recommend you change your password and recovery key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與復原金鑰"
 }

From 9a1236a016eb2f6217f3b8c78d44f7813472ffa7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 10:40:33 +0000
Subject: [PATCH 1256/3235] Fix message context menu breaking on invalid
 m.room.pinned_events event

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/context_menus/MessageContextMenu.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index ea5623fe48..a73b0d640e 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -90,7 +90,8 @@ export default createReactClass({
         const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
         const pinnedEvent = room.currentState.getStateEvents('m.room.pinned_events', '');
         if (!pinnedEvent) return false;
-        return pinnedEvent.getContent().pinned.includes(this.props.mxEvent.getId());
+        const content = pinnedEvent.getContent();
+        return content.pinned && Array.isArray(content.pinned) && content.pinned.includes(this.props.mxEvent.getId());
     },
 
     onResendClick: function() {

From c4ce9a310e585a8d6bc469e76242063ffeb66f1c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 13:44:35 +0000
Subject: [PATCH 1257/3235] Limit UserInfo Displayname to 3 lines to get rid of
 scrollbars and ugliness

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 46d5e99d64..074d625963 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -137,12 +137,20 @@ limitations under the License.
             font-size: 18px;
             line-height: 25px;
             flex: 1;
-            overflow-x: auto;
-            max-height: 50px;
             display: flex;
             justify-content: center;
             align-items: center;
 
+            // limit to 2 lines, show an ellipsis if it overflows
+            // this looks webkit specific but is supported by Firefox 68+
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+
+            overflow: hidden;
+            word-break: break-all;
+            text-overflow: ellipsis;
+
             .mx_E2EIcon {
                 margin: 5px;
             }

From 2ce006a9ea5b481621d37e86e35859e5315fc94c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 13:48:22 +0000
Subject: [PATCH 1258/3235] delint css

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 074d625963..0e4b1bda9e 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -137,7 +137,6 @@ limitations under the License.
             font-size: 18px;
             line-height: 25px;
             flex: 1;
-            display: flex;
             justify-content: center;
             align-items: center;
 

From 9afa66364e1a38362528c88fb496fc4466de7663 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 26 Feb 2020 14:24:58 +0000
Subject: [PATCH 1259/3235] Upgrade matrix-js-sdk to 5.1.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 624f2d6ecb..5c18d9119e 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "5.1.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index d57ecfbeb9..b01b64a8b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5791,9 +5791,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.0.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a998006842ae558f02819ca84fbaad43685cc10b"
+matrix-js-sdk@5.1.0-rc.1:
+  version "5.1.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0-rc.1.tgz#48154133f1c8bc19557164a24535d6d45d1cf482"
+  integrity sha512-3pf8NOziyaldtJkYsas9Cq/b8TloGMY89KRA4tJLRDCdMrlBEJoQ4qb9MCmhS53Yb8N4ysI7qUUC21FtBryAVQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 9926b32f24c6c7b5564a4b7ebace3e06b12bb529 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 26 Feb 2020 14:29:31 +0000
Subject: [PATCH 1260/3235] Prepare changelog for v2.2.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa02dc1ae3..e4b86317c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,89 @@
+Changes in [2.2.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.0-rc.1) (2020-02-26)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.1...v2.2.0-rc.1)
+
+ * Upgrade JS SDK to 5.1.0-rc.1
+ * Fix message context menu breaking on invalid m.room.pinned_events event
+   [\#4133](https://github.com/matrix-org/matrix-react-sdk/pull/4133)
+ * Update from Weblate
+   [\#4134](https://github.com/matrix-org/matrix-react-sdk/pull/4134)
+ * Notify platform of language changes
+   [\#4121](https://github.com/matrix-org/matrix-react-sdk/pull/4121)
+ * Handle errors when previewing rooms more safely
+   [\#4132](https://github.com/matrix-org/matrix-react-sdk/pull/4132)
+ * Don't try to collapse zero events with a group
+   [\#4131](https://github.com/matrix-org/matrix-react-sdk/pull/4131)
+ * Don't print errors when the tab is used with no autocomplete present
+   [\#4130](https://github.com/matrix-org/matrix-react-sdk/pull/4130)
+ * Improve UI feedback while waiting for network
+   [\#4126](https://github.com/matrix-org/matrix-react-sdk/pull/4126)
+ * Ensure DMs tagged outside of account data work in the invite dialog
+   [\#4123](https://github.com/matrix-org/matrix-react-sdk/pull/4123)
+ * Show a warning dialog when user indicates a new session wasn't them
+   [\#4125](https://github.com/matrix-org/matrix-react-sdk/pull/4125)
+ * Show cancel events as hidden events if we wouldn't usually render them
+   [\#4120](https://github.com/matrix-org/matrix-react-sdk/pull/4120)
+ * Collapsed room list has unaligned room tiles #4030 version 2
+   [\#4033](https://github.com/matrix-org/matrix-react-sdk/pull/4033)
+ * Check for cross-signing homeserver support
+   [\#4118](https://github.com/matrix-org/matrix-react-sdk/pull/4118)
+ * Don't leak if show_sas never comes (or already came)
+   [\#4119](https://github.com/matrix-org/matrix-react-sdk/pull/4119)
+ * Add verification request viewer in devtools
+   [\#4106](https://github.com/matrix-org/matrix-react-sdk/pull/4106)
+ * update phase when request prop changes
+   [\#4117](https://github.com/matrix-org/matrix-react-sdk/pull/4117)
+ * Handle file downloading locally in electron rather than sending to browser
+   [\#4113](https://github.com/matrix-org/matrix-react-sdk/pull/4113)
+ * Remove unused CIDER setting watcher
+   [\#4116](https://github.com/matrix-org/matrix-react-sdk/pull/4116)
+ * Use alt_aliases for pills and autocomplete
+   [\#4102](https://github.com/matrix-org/matrix-react-sdk/pull/4102)
+ * Add shortcuts for beginning / end of composer
+   [\#4108](https://github.com/matrix-org/matrix-react-sdk/pull/4108)
+ * Update from Weblate
+   [\#4115](https://github.com/matrix-org/matrix-react-sdk/pull/4115)
+ * Revert "Fix escaped markdown passing backslashes through"
+   [\#4114](https://github.com/matrix-org/matrix-react-sdk/pull/4114)
+ * Fix a couple of React warnings/errors
+   [\#4112](https://github.com/matrix-org/matrix-react-sdk/pull/4112)
+ * Fix two big DOM leaks which were locking Chrome solid.
+   [\#4111](https://github.com/matrix-org/matrix-react-sdk/pull/4111)
+ * Filter out empty strings when pasting IDs into the invite dialog
+   [\#4109](https://github.com/matrix-org/matrix-react-sdk/pull/4109)
+ * Remove buildkite pipeline
+   [\#4107](https://github.com/matrix-org/matrix-react-sdk/pull/4107)
+ * Use binary packing for verification QR codes
+   [\#4091](https://github.com/matrix-org/matrix-react-sdk/pull/4091)
+ * Fix several small bugs with the invite/DM dialog
+   [\#4099](https://github.com/matrix-org/matrix-react-sdk/pull/4099)
+ * ignore e2e tests node_modules during linting
+   [\#4103](https://github.com/matrix-org/matrix-react-sdk/pull/4103)
+ * Apply null-guard to room pills for when we can't fetch the room
+   [\#4104](https://github.com/matrix-org/matrix-react-sdk/pull/4104)
+ * Fix theme being overridden to light even after login is completed
+   [\#4105](https://github.com/matrix-org/matrix-react-sdk/pull/4105)
+ * Fix bug where SSSS could be overwritten if user never cross-signs
+   [\#4100](https://github.com/matrix-org/matrix-react-sdk/pull/4100)
+ * Accept canonical alias for pills
+   [\#4096](https://github.com/matrix-org/matrix-react-sdk/pull/4096)
+ * Fix: don't advertise ability to scan a QR code for verification
+   [\#4094](https://github.com/matrix-org/matrix-react-sdk/pull/4094)
+ * Fixes for printing event indexing stats.
+   [\#4082](https://github.com/matrix-org/matrix-react-sdk/pull/4082)
+ * Remove exec so release script continues
+   [\#4095](https://github.com/matrix-org/matrix-react-sdk/pull/4095)
+ * Use Persistent Storage where possible
+   [\#4092](https://github.com/matrix-org/matrix-react-sdk/pull/4092)
+ * Fix user page (missing null check)
+   [\#4088](https://github.com/matrix-org/matrix-react-sdk/pull/4088)
+ * Cancel verification request on dialog close
+   [\#4081](https://github.com/matrix-org/matrix-react-sdk/pull/4081)
+ * Fix various memory leaks due to method re-binding
+   [\#4093](https://github.com/matrix-org/matrix-react-sdk/pull/4093)
+ * Fix share message context menu option keyboard a11y
+   [\#4073](https://github.com/matrix-org/matrix-react-sdk/pull/4073)
+
 Changes in [2.1.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.1) (2020-02-19)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0...v2.1.1)

From c7246f8eabd55f8e2c98bd3ebc7d1c85b21fbb31 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 26 Feb 2020 14:29:31 +0000
Subject: [PATCH 1261/3235] v2.2.0-rc.1

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

diff --git a/package.json b/package.json
index 5c18d9119e..db877edc8c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.1.1",
+  "version": "2.2.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From c8493d5b08242dfe469b6b5d80cdac7dd5f5b6e0 Mon Sep 17 00:00:00 2001
From: Ben Bucksch <ben.bucksch@beonex.com>
Date: Wed, 26 Feb 2020 15:29:51 +0100
Subject: [PATCH 1262/3235] Solve fixed-width digits display in flowed text

Noto Color Emoji contains digits, in fixed-width, therefore causing digits in flowed text to stand out.

Fixes: https://github.com/vector-im/riot-web/issues/12504
Signed-off-by: Ben Bucksch <ben.bucksch@beonex.com>
---
 res/themes/light/css/_light.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index c868c81549..626ccb2e13 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -5,9 +5,12 @@
    Arial empirically gets it right, hence prioritising Arial here. */
 /* We fall through to Twemoji for emoji rather than falling through
    to native Emoji fonts (if any) to ensure cross-browser consistency */
-$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', Arial, Helvetica, Sans-Serif;
+/* Noto Color Emoji contains digits, in fixed-width, therefore causing
+   digits in flowed text to stand out.
+   TODO: Consider putting all emoji fonts to the end rather than the front. */
+$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
 
-$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', Courier, monospace;
+$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
 
 // unified palette
 // try to use these colors when possible

From 65e002cfe90875db40c531e1349b3d10d7792240 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 26 Feb 2020 15:03:24 +0000
Subject: [PATCH 1263/3235] Upgrade deps

---
 yarn.lock | 2619 +++++++++++++++++++++++++----------------------------
 1 file changed, 1244 insertions(+), 1375 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d57ecfbeb9..1dbcc91288 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,9 +3,9 @@
 
 
 "@babel/cli@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.5.tgz#25702cc65418efc06989af3727897b9f4c8690b6"
-  integrity sha512-y2YrMGXM3NUyu1Myg0pxg+Lx6g8XhEyvLHYNRwTBV6fDek3H7Io6b7N/LXscLs4HWn4HxMdy7f2rM1rTMp2mFg==
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
+  integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
@@ -18,198 +18,162 @@
   optionalDependencies:
     chokidar "^2.1.8"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.8.3"
 
-"@babel/core@>=7.2.2":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
-  integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
+"@babel/compat-data@^7.8.4":
+  version "7.8.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz#d28ce872778c23551cbb9432fc68d28495b613b9"
+  integrity sha512-jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg==
   dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    browserslist "^4.8.5"
+    invariant "^2.2.4"
+    semver "^5.5.0"
+
+"@babel/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
+  integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.4"
+    "@babel/helpers" "^7.8.4"
+    "@babel/parser" "^7.8.4"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.4"
+    "@babel/types" "^7.8.3"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
     json5 "^2.1.0"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
-  integrity sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
+  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
   dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.7"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.7"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
-  integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.4.0", "@babel/generator@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
-  integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
-  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
+"@babel/helper-annotate-as-pure@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
   dependencies:
-    "@babel/types" "^7.7.4"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-annotate-as-pure@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
-  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/helper-explode-assignable-expression" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
-  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
+"@babel/helper-builder-react-jsx@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6"
+  integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-builder-react-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66"
-  integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==
-  dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
-  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
+"@babel/helper-call-delegate@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
+  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-create-class-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d"
-  integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==
+"@babel/helper-compilation-targets@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz#03d7ecd454b7ebe19a254f76617e61770aed2c88"
+  integrity sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==
   dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-member-expression-to-functions" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/compat-data" "^7.8.4"
+    browserslist "^4.8.5"
+    invariant "^2.2.4"
+    levenary "^1.1.1"
+    semver "^5.5.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
-  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
+"@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz#5b94be88c255f140fd2c10dd151e7f98f4bff397"
+  integrity sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==
   dependencies:
-    "@babel/helper-regex" "^7.4.4"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
+  integrity sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==
+  dependencies:
+    "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.6.0"
 
-"@babel/helper-define-map@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
-  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
+"@babel/helper-define-map@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
   dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
-  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
+"@babel/helper-explode-assignable-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
   dependencies:
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
-  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+"@babel/helper-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
+  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-get-function-arity@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
-  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
-  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
+"@babel/helper-hoist-variables@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-member-expression-to-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
-  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
   dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-module-imports@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
-  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
 "@babel/helper-module-imports@^7.8.3":
   version "7.8.3"
@@ -218,534 +182,550 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
-  integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==
+"@babel/helper-module-transforms@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590"
+  integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-simple-access" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
-  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
-
-"@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
-"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
-  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
+"@babel/helper-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
-  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
+"@babel/helper-remap-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-wrap-function" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-wrap-function" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
-  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
+"@babel/helper-replace-supers@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
+  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-simple-access@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
-  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
   dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-split-export-declaration@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
-  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
   dependencies:
-    "@babel/types" "^7.7.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-wrap-function@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
-  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
+"@babel/helper-wrap-function@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
   dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
-  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
+"@babel/helpers@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
+  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
   dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/highlight@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
-  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
+"@babel/highlight@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
+  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
-  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
+  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
-  integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==
-
-"@babel/parser@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
-  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
-
-"@babel/plugin-proposal-async-generator-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
-  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
 
 "@babel/plugin-proposal-class-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
-  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-proposal-decorators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b"
-  integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
+  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-decorators" "^7.7.4"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.8.3"
 
-"@babel/plugin-proposal-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
-  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-export-default-from@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.7.4.tgz#890de3c0c475374638292df31f6582160b54d639"
-  integrity sha512-1t6dh7BHYUz4zD1m4pozYYEZy/3m8dgOr9owx3r0mPPI3iGKRUKUbIxfYmcJ4hwljs/dhd0qOTr1ZDUp43ix+w==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
+  integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-export-default-from" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-export-default-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
-  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
 "@babel/plugin-proposal-numeric-separator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.7.4.tgz#7819a17445f4197bb9575e5750ed349776da858a"
-  integrity sha512-CG605v7lLpVgVldSY6kxsN9ui1DxFOyepBfuX2AzU2TNriMAYApoU55mrGw9Jr4TlrTzPCG10CL8YXyi+E/iPw==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
-  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
+"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb"
+  integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
-  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
-  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
+"@babel/plugin-proposal-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"
+  integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-syntax-async-generators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
-  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
+"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
+  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-decorators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b"
-  integrity sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A==
+"@babel/plugin-syntax-async-generators@^7.8.0":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
-  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
+"@babel/plugin-syntax-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-export-default-from@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.7.4.tgz#897f05808298060b52873fa804ff853540790ea1"
-  integrity sha512-j888jpjATLEzOWhKawq46UrpXnCRDbdhBd5io4jgwjJ3+CHHGCRb6PNAVEgs+BXIb+dNRAmnkv36zfB992PRVw==
+"@babel/plugin-syntax-dynamic-import@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-flow@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b"
-  integrity sha512-2AMAWl5PsmM5KPkB22cvOkUyWk6MjUaqhHNU5nSPUl/ns3j5qLfw2SuYP5RbVZ0tfLvePr4zUScbICtDP2CUNw==
+"@babel/plugin-syntax-export-default-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.8.3.tgz#f1e55ce850091442af4ba9c2550106035b29d678"
+  integrity sha512-a1qnnsr73KLNIQcQlcQ4ZHxqqfBKM6iNQZW2OMTyxNbA2WC7SHWHtGVpFzWtQAuS2pspkWVzdEBXXx8Ik0Za4w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
-  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
+"@babel/plugin-syntax-flow@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f"
+  integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec"
-  integrity sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==
+"@babel/plugin-syntax-json-strings@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.7.4.tgz#39818f8042a09d4c6248d85d82555369da4da5c4"
-  integrity sha512-vmlUUBlLuFnbpaR+1kKIdo62xQEN+THWbtAHSEilo+0rHl2dKKCn6GLUVKpI848wL/T0ZPQgAy8asRJ9yYEjog==
+"@babel/plugin-syntax-jsx@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
+  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
-  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
-  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-top-level-await@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
-  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b"
-  integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-arrow-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
-  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
-  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoped-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
-  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
+"@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
+  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoping@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
-  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-remap-async-to-generator" "^7.8.3"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
-  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
+"@babel/plugin-transform-classes@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"
+  integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-define-map" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-define-map" "^7.8.3"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
-  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-destructuring@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
-  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
+"@babel/plugin-transform-destructuring@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b"
+  integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
-  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
+"@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-duplicate-keys@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
-  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
-  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-flow-comments@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.7.4.tgz#663be88fc101b982975bdac4eefc15ba475b3368"
-  integrity sha512-e3nHGPo/wQcQMmNAHyqaM3Cl8dNKLognPi1RPmObnuVwyI6gHAQJtW6sg5HiNP4LBGRlPW8Npihm0/EzS/1Pzw==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.8.3.tgz#0a7e6c49224ac24271e4da25774da0600605ef2c"
+  integrity sha512-SEmbGPsaUig0x3QkB/Nai3Snk1sRxODBN2EGjdQqgBb5TMcbEejV2TtMGi2XiLmw9Cy/BvJX7CAnfJMctuyglg==
   dependencies:
-    "@babel/generator" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.7.4"
+    "@babel/generator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.7.4.tgz#cc73f85944782df1d77d80977bc097920a8bf31a"
-  integrity sha512-w9dRNlHY5ElNimyMYy0oQowvQpwt/PRHI0QS98ZJCTZU2bvSnKXo5zEiD5u76FBPigTm8TkqzmnUTg16T7qbkA==
+"@babel/plugin-transform-flow-strip-types@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz#da705a655466b2a9b36046b57bf0cbcd53551bd4"
+  integrity sha512-g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
-  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
+"@babel/plugin-transform-for-of@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz#6fe8eae5d6875086ee185dd0b098a8513783b47d"
+  integrity sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
-  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
   dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
-  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-member-expression-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
-  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c"
-  integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==
+"@babel/plugin-transform-modules-amd@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5"
+  integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345"
-  integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==
+"@babel/plugin-transform-modules-commonjs@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5"
+  integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
-  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
+"@babel/plugin-transform-modules-systemjs@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"
+  integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
-  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
+"@babel/plugin-transform-modules-umd@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a"
+  integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
-  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
-"@babel/plugin-transform-new-target@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
-  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-object-super@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
-  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
-  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
+"@babel/plugin-transform-parameters@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3"
+  integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==
   dependencies:
-    "@babel/helper-call-delegate" "^7.7.4"
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-call-delegate" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-property-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
-  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-display-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz#9f2b80b14ebc97eef4a9b29b612c58ed9c0d10dd"
-  integrity sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==
+"@babel/plugin-transform-react-display-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
+  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz#81b8fbfd14b2215e8f1c2c3adfba266127b0231c"
-  integrity sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==
+"@babel/plugin-transform-react-jsx-self@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702"
+  integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz#8994b1bf6014b133f5a46d3b7d1ee5f5e3e72c10"
-  integrity sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==
+"@babel/plugin-transform-react-jsx-source@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0"
+  integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.4.tgz#d91205717fae4e2f84d020cd3057ec02a10f11da"
-  integrity sha512-LixU4BS95ZTEAZdPaIuyg/k8FiiqN9laQ0dMHB4MlpydHY53uQdWCUrwjLr5o6ilS6fAgZey4Q14XBjl5tL6xw==
+"@babel/plugin-transform-react-jsx@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a"
+  integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.7.4"
+    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9"
-  integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==
+"@babel/plugin-transform-regenerator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
+  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
   dependencies:
     regenerator-transform "^0.14.0"
 
-"@babel/plugin-transform-reserved-words@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
-  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-runtime@^7.8.3":
   version "7.8.3"
@@ -757,148 +737,154 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
-  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
-  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-sticky-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
-  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-regex" "^7.8.3"
 
-"@babel/plugin-transform-template-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
-  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
-  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636"
-  integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg==
+"@babel/plugin-transform-typescript@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917"
+  integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-typescript" "^7.7.4"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-typescript" "^7.8.3"
 
-"@babel/plugin-transform-unicode-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
-  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/preset-env@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
-  integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"
+  integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
-    "@babel/plugin-proposal-json-strings" "^7.7.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-syntax-top-level-await" "^7.7.4"
-    "@babel/plugin-transform-arrow-functions" "^7.7.4"
-    "@babel/plugin-transform-async-to-generator" "^7.7.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
-    "@babel/plugin-transform-block-scoping" "^7.7.4"
-    "@babel/plugin-transform-classes" "^7.7.4"
-    "@babel/plugin-transform-computed-properties" "^7.7.4"
-    "@babel/plugin-transform-destructuring" "^7.7.4"
-    "@babel/plugin-transform-dotall-regex" "^7.7.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
-    "@babel/plugin-transform-for-of" "^7.7.4"
-    "@babel/plugin-transform-function-name" "^7.7.4"
-    "@babel/plugin-transform-literals" "^7.7.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
-    "@babel/plugin-transform-modules-amd" "^7.7.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
-    "@babel/plugin-transform-modules-umd" "^7.7.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
-    "@babel/plugin-transform-new-target" "^7.7.4"
-    "@babel/plugin-transform-object-super" "^7.7.4"
-    "@babel/plugin-transform-parameters" "^7.7.4"
-    "@babel/plugin-transform-property-literals" "^7.7.4"
-    "@babel/plugin-transform-regenerator" "^7.7.5"
-    "@babel/plugin-transform-reserved-words" "^7.7.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
-    "@babel/plugin-transform-spread" "^7.7.4"
-    "@babel/plugin-transform-sticky-regex" "^7.7.4"
-    "@babel/plugin-transform-template-literals" "^7.7.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
-    "@babel/plugin-transform-unicode-regex" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.4.7"
+    "@babel/compat-data" "^7.8.4"
+    "@babel/helper-compilation-targets" "^7.8.4"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.8.3"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.8.4"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.8.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
+    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.4"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/types" "^7.8.3"
+    browserslist "^4.8.5"
+    core-js-compat "^3.6.2"
     invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
+    levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/preset-flow@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.7.4.tgz#99c1349b6fd7132783196de181e6b32d0949427e"
-  integrity sha512-6LbUqcHD8BcRtXMOp5bc5nJeU8RlKh6q5U8TgZeCrf9ebBdW8Wyy5ujAUnbJfmzQ56Kkq5XtwErC/5+5RHyFYA==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.8.3.tgz#52af74c6a4e80d889bd9436e8e278d0fecac6e18"
+  integrity sha512-iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-flow-strip-types" "^7.8.3"
 
 "@babel/preset-react@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
-  integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2"
+  integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.7.4"
-    "@babel/plugin-transform-react-jsx" "^7.7.4"
-    "@babel/plugin-transform-react-jsx-self" "^7.7.4"
-    "@babel/plugin-transform-react-jsx-source" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-react-display-name" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.8.3"
+    "@babel/plugin-transform-react-jsx-self" "^7.8.3"
+    "@babel/plugin-transform-react-jsx-source" "^7.8.3"
 
 "@babel/preset-typescript@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a"
-  integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz#90af8690121beecd9a75d0cc26c6be39d1595d13"
+  integrity sha512-qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-transform-typescript" "^7.8.3"
 
 "@babel/register@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128"
-  integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.3.tgz#5d5d30cfcc918437535d724b8ac1e4a60c5db1f8"
+  integrity sha512-t7UqebaWwo9nXWClIPLPloa5pN33A2leVs8Hf0e9g9YwUP8/H9NeR7DJU+4CXo23QtjChQv5a3DjEtT83ih1rg==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -906,61 +892,38 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
-  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
+  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b"
-  integrity sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.8.3":
+"@babel/template@^7.4.0", "@babel/template@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
-  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
+  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/template@^7.4.0", "@babel/template@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
-  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
+  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
-  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.4"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.8.4"
+    "@babel/types" "^7.8.3"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
-  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.8.3":
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
   integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
@@ -970,9 +933,9 @@
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
   dependencies:
     exec-sh "^0.3.2"
     minimist "^1.2.0"
@@ -1166,16 +1129,16 @@
     webcrypto-core "^1.0.17"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6"
-  integrity sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1"
+  integrity sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==
   dependencies:
     type-detect "4.0.8"
 
 "@types/babel__core@^7.1.0":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
-  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610"
+  integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1199,9 +1162,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012"
-  integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a"
+  integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1225,9 +1188,9 @@
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
 
 "@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
@@ -1240,9 +1203,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/json-schema@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
-  integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
+  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -1250,9 +1213,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "12.12.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
-  integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
+  version "13.7.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.6.tgz#cb734a7c191472ae6a2b3a502b4dfffcea974113"
+  integrity sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA==
 
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
@@ -1281,36 +1244,36 @@
     "@types/vfile-message" "*"
 
 "@types/yargs-parser@*":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
-  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.5"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.5.tgz#18121bfd39dc12f280cee58f92c5b21d32041908"
-  integrity sha512-CF/+sxTO7FOwbIRL4wMv0ZYLCRfMid2HQpzDRyViH7kSpfoAFiMdGqKIxb1PxWfjtQXQhnQuD33lvRHNwr809Q==
+  version "13.0.8"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
+  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
-  integrity sha512-FZhWq6hWWZBP76aZ7bkrfzTMP31CCefVIImrwP3giPLcoXocmLTmr92NLZxuIcTL4GTEOE33jQMWy9PwelL+yQ==
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz#71de390a3ec00b280b69138d80733406e6e86bfa"
+  integrity sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.10.0"
+    "@typescript-eslint/typescript-estree" "2.21.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/typescript-estree@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.10.0.tgz#89cdabd5e8c774e9d590588cb42fb9afd14dcbd9"
-  integrity sha512-oOYnplddQNm/LGVkqbkAwx4TIBuuZ36cAQq9v3nFIU9FmhemHuVzAesMSXNQDdAzCa5bFgCrfD3JWhYVKlRN2g==
+"@typescript-eslint/typescript-estree@2.21.0":
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz#7e4be29f2e338195a2e8c818949ed0ff727cc943"
+  integrity sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
     glob "^7.1.6"
     is-glob "^4.0.1"
-    lodash.unescape "4.0.1"
+    lodash "^4.17.15"
     semver "^6.3.0"
     tsutils "^3.17.1"
 
@@ -1489,9 +1452,9 @@ acorn-globals@^4.1.0:
     acorn-walk "^6.0.1"
 
 acorn-jsx@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
 acorn-walk@^6.0.1:
   version "6.2.0"
@@ -1556,11 +1519,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
 ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
@@ -1663,13 +1626,14 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+array-includes@^3.0.3, array-includes@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
+  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    is-string "^1.0.5"
 
 array-union@^1.0.2:
   version "1.0.2"
@@ -1678,7 +1642,7 @@ array-union@^1.0.2:
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
@@ -1689,12 +1653,12 @@ array-unique@^0.3.2:
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.find@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz#630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"
-  integrity sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c"
+  integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.13.0"
+    es-abstract "^1.17.4"
 
 array.prototype.flat@^1.2.3:
   version "1.2.3"
@@ -1782,22 +1746,22 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.0.0:
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4"
-  integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
+  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
   dependencies:
-    browserslist "^4.8.0"
-    caniuse-lite "^1.0.30001012"
+    browserslist "^4.8.3"
+    caniuse-lite "^1.0.30001020"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.23"
+    postcss "^7.0.26"
     postcss-value-parser "^4.0.2"
 
 aws-sign2@~0.7.0:
@@ -1806,19 +1770,19 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
-  integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
 babel-eslint@^10.0.3:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
-  integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
@@ -1876,9 +1840,9 @@ babel-runtime@^6.26.0:
     regenerator-runtime "^0.11.0"
 
 bail@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
-  integrity sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -1886,9 +1850,9 @@ balanced-match@^1.0.0:
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base-x@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.7.tgz#1c5a7fafe8f66b4114063e8da102799d4e7c408f"
-  integrity sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.8.tgz#1e1106c2537f0162e8b52474a557ebb09000018d"
+  integrity sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==
   dependencies:
     safe-buffer "^5.0.1"
 
@@ -1932,15 +1896,22 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
   integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
 
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blueimp-canvas-to-blob@^3.5.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.16.0.tgz#eb5932207f9bf23558c8bc2fbcdc5ca2cca35c36"
-  integrity sha512-r5TRlxH5Y0iKrRajCfiW1K4o2U1JniarjLXuNJrC5nnlWV/UopieF8sysw9pAYBauxg2I3Ah1hUp3NEuinwmkA==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.17.0.tgz#d796e72aa1fd37f9471e0396e64d323956564a23"
+  integrity sha512-LcuVZZtKtE4yUrLb0IQA7ndMm19gooDTrzvjjkvmQ1MhkFlSzTw+8Ftp+/ckfGeP2UDQvDsPyy8mIT69itAqbg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2069,23 +2040,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.6.0, browserslist@^4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
-  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
+browserslist@^4.8.3, browserslist@^4.8.5:
+  version "4.8.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
+  integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
   dependencies:
-    caniuse-lite "^1.0.30001015"
-    electron-to-chromium "^1.3.322"
-    node-releases "^1.1.42"
-
-browserslist@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789"
-  integrity sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA==
-  dependencies:
-    caniuse-lite "^1.0.30001012"
-    electron-to-chromium "^1.3.317"
-    node-releases "^1.1.41"
+    caniuse-lite "^1.0.30001027"
+    electron-to-chromium "^1.3.349"
+    node-releases "^1.1.49"
 
 bs58@^4.0.1:
   version "4.0.1"
@@ -2240,10 +2202,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001015:
-  version "1.0.30001015"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
-  integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
+caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001027:
+  version "1.0.30001030"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz#78076c4c6d67d3e41d6eb9399853fb27fe6e44ee"
+  integrity sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2258,9 +2220,9 @@ caseless@~0.12.0:
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 ccount@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386"
-  integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
+  integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
 
 chain-function@^1.0.0:
   version "1.0.1"
@@ -2277,24 +2239,24 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.
     supports-color "^5.3.0"
 
 character-entities-html4@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
-  integrity sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
 
 character-entities-legacy@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"
-  integrity sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
 
 character-entities@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"
-  integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
+  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
 
 character-reference-invalid@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85"
-  integrity sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
+  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -2348,9 +2310,9 @@ chokidar@^3.3.1:
     fsevents "~2.1.2"
 
 chownr@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chrome-trace-event@^1.0.2:
   version "1.0.2"
@@ -2436,9 +2398,9 @@ code-point-at@^1.0.0:
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collapse-white-space@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a"
-  integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2467,15 +2429,15 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.1, commander@^2.19.0, commander@^2.20.0, commander@~2.20.3:
+commander@^2.12.1, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
-  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2571,13 +2533,13 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.4.7:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.5.0.tgz#5a11a619a9e9dd2dcf1c742b2060bc4a2143e5b6"
-  integrity sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==
+core-js-compat@^3.6.2:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
+  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
   dependencies:
-    browserslist "^4.8.2"
-    semver "^6.3.0"
+    browserslist "^4.8.3"
+    semver "7.0.0"
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -2585,9 +2547,9 @@ core-js@^1.0.0:
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
-  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2900,9 +2862,9 @@ diff-sequences@^24.9.0:
   integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
 diff@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
-  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -2951,7 +2913,7 @@ dom-helpers@^3.2.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-dom-serializer@0:
+dom-serializer@0, dom-serializer@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
   integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
@@ -2996,6 +2958,13 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+domhandler@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz#51cd13efca31da95bbb0c5bee3a48300e333b3e9"
+  integrity sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==
+  dependencies:
+    domelementtype "^2.0.1"
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -3012,12 +2981,21 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+domutils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz#15b8278e37bfa8468d157478c58c367718133c08"
+  integrity sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==
   dependencies:
-    is-obj "^1.0.0"
+    dom-serializer "^0.2.1"
+    domelementtype "^2.0.1"
+    domhandler "^3.0.0"
+
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
+  dependencies:
+    is-obj "^2.0.0"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3037,10 +3015,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.317, electron-to-chromium@^1.3.322:
-  version "1.3.322"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
-  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
+electron-to-chromium@^1.3.349:
+  version "1.3.361"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.361.tgz#a820bf52da171c0024314745462cfe0dc944373e"
+  integrity sha512-OzSVjWpsRhJyr9PSAXkeloSe6e9viU2ToGt1wXlXFsGcxuI9vlsnalL+V/AM59Z2pEo3wRxIddtOGsT7Y6x/sQ==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -3066,20 +3044,25 @@ emoji-regex@^8.0.0:
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 emojibase-data@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.1.0.tgz#7fb1ddea4f1750d7f156ff4ed5ed58ac474874eb"
-  integrity sha512-9x59OnrGpX1TgOk5DvePw3D70kVCisgRauazHnXFhLKlgR35CEgRTOoD1vOX12zMBdwKDyX3MmAU7YQmR/lA4w==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
+  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
 
 emojibase-regex@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.1.0.tgz#7ba60828618efddee6cf782231a99a860e522b98"
-  integrity sha512-Ylnk6lMrqbNCOR40N8ix3Mi+J0GT1wu7vnsOjd4YhY6HyLmG8seOD1m/dZBls/dH+OKPVmcSaOc5GCq5IH7BTw==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
+  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
 
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
@@ -3204,26 +3187,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.7.0:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34"
-  integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    string.prototype.trimleft "^2.1.0"
-    string.prototype.trimright "^2.1.0"
-
-es-abstract@^1.13.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
-  integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4:
+  version "1.17.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
+  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -3237,34 +3204,17 @@ es-abstract@^1.13.0:
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
-es-abstract@^1.17.0-next.1:
-  version "1.17.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
-  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.0"
-    string.prototype.trimright "^2.1.0"
-
 es-get-iterator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.1.tgz#ebc4d3bbc2d59dd95a0ecef441ca2dbce7d9e2cd"
-  integrity sha512-pswpctxWRElQDcP0RJy0qmNrpf6nH9SeQl8dra5fFHBPHKfpVIST27Kv4j5enE8JhIssRBI4QPMrNvcyIPhapQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
+  integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
   dependencies:
-    es-abstract "^1.16.2"
+    es-abstract "^1.17.4"
     has-symbols "^1.0.1"
     is-arguments "^1.0.4"
-    is-map "^2.0.0"
-    is-set "^2.0.0"
-    is-string "^1.0.4"
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-string "^1.0.5"
     isarray "^2.0.5"
 
 es-to-primitive@^1.2.1:
@@ -3299,11 +3249,11 @@ escape-string-regexp@^1.0.5:
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
-  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
   dependencies:
-    esprima "^3.1.3"
+    esprima "^4.0.1"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
@@ -3322,11 +3272,6 @@ eslint-plugin-babel@^5.2.1:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-eslint-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
-  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
-
 eslint-plugin-flowtype@^2.30.0:
   version "2.50.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.3.tgz#61379d6dce1d010370acd6681740fd913d68175f"
@@ -3335,32 +3280,32 @@ eslint-plugin-flowtype@^2.30.0:
     lodash "^4.17.10"
 
 eslint-plugin-jest@^23.0.4:
-  version "23.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.1.1.tgz#1220ab53d5a4bf5c3c4cd07c0dabc6199d4064dd"
-  integrity sha512-2oPxHKNh4j1zmJ6GaCBuGcb8FVZU7YjFUOJzGOPnl9ic7VA/MGAskArLJiRIlnFUmi1EUxY+UiATAy8dv8s5JA==
+  version "23.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.0.tgz#c978f959fa8395801742d13c5a3125a986d2661e"
+  integrity sha512-DKXmLxguZ1Lru4u5YM12ko3WLq6gqo7dhV2b63K731+/PNyZ/Ff6NGONQsGUtPLG9zU3kdz/N+2LTbweNZifeg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
 eslint-plugin-react-hooks@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.3.0.tgz#53e073961f1f5ccf8dd19558036c1fac8c29d99a"
-  integrity sha512-gLKCa52G4ee7uXzdLiorca7JIQZPPXRAQDXV83J4bUEeUuc5pIEyZYAZ45Xnxe5IuupxEqHS+hUhSLIimK1EMw==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.4.0.tgz#db6ee1cc953e3a217035da3d4e9d4356d3c672a4"
+  integrity sha512-bH5DOCP6WpuOqNaux2BlaDCrSgv8s5BitP90bTgtZ1ZsRn2bdIfeMDY5F2RnJVnyKDy6KRQRDbipPLZ1y77QtQ==
 
 eslint-plugin-react@^7.7.0:
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
-  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8"
+  integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     doctrine "^2.1.0"
-    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
     jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.0"
-    object.fromentries "^2.0.1"
-    object.values "^1.1.0"
+    object.entries "^1.1.1"
+    object.fromentries "^2.0.2"
+    object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.13.1"
+    resolve "^1.14.2"
+    string.prototype.matchall "^4.0.2"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
@@ -3446,20 +3391,15 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
+  integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
   dependencies:
     estraverse "^4.0.0"
 
@@ -3491,9 +3431,9 @@ esutils@^2.0.0, esutils@^2.0.2:
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -3638,10 +3578,10 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
 fast-glob@^2.2.6:
   version "2.2.7"
@@ -3656,9 +3596,9 @@ fast-glob@^2.2.6:
     micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@~2.0.6:
   version "2.0.6"
@@ -3740,6 +3680,11 @@ file-saver@^1.3.3:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filesize@3.5.6:
   version "3.5.6"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
@@ -3916,12 +3861,12 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
+  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
   dependencies:
+    bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
 
 fsevents@~2.1.2:
   version "2.1.2"
@@ -3948,9 +3893,9 @@ functional-red-black-tree@^1.0.1:
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 functions-have-names@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz#83da7583e4ea0c9ac5ff530f73394b033e0bf77d"
-  integrity sha512-zKXyzksTeaCSw5wIX79iCA40YAa6CJMJgNg9wdkU/ERBrIdPSimPICYiLp65lRbSBqtiHql/HZfS2DyI/AH6tQ==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
+  integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==
 
 fuse.js@^2.2.0:
   version "2.7.4"
@@ -3975,6 +3920,11 @@ gauge@~2.7.3:
   version "1.4.3"
   resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
 
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4139,23 +4089,12 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.1.2:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.6.0.tgz#33af6c3eda930d7a924f5d8f1c6d8edc3180512e"
-  integrity sha512-i1ZUP7Qp2JdkMaFon2a+b0m5geE8Z4ZTLaGkgrObkEd+OkUKyRbRWw4KxuFCoHfdETSY1yf9/574eVoNSiK7pw==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -4238,9 +4177,9 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     minimalistic-assert "^1.0.1"
 
 highlight.js@^9.15.8:
-  version "9.16.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
-  integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
+  version "9.18.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
+  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -4252,9 +4191,9 @@ hmac-drbg@^1.0.0:
     minimalistic-crypto-utils "^1.0.1"
 
 hoist-non-react-statics@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f"
-  integrity sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
@@ -4273,9 +4212,9 @@ hosted-git-info@3.0.0:
     lru-cache "^5.1.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
-  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+  version "2.8.6"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.6.tgz#3a6e6d0324c5371fc8c7ba7175e1e5d14578724d"
+  integrity sha512-Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==
 
 html-element-map@^1.2.0:
   version "1.2.0"
@@ -4296,6 +4235,11 @@ html-entities@^1.2.1:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
+html-escaper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
+  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
+
 html-tags@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
@@ -4313,6 +4257,16 @@ htmlparser2@^3.10.0, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+htmlparser2@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
+  integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^3.0.0"
+    domutils "^2.0.0"
+    entities "^2.0.0"
+
 http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
@@ -4456,7 +4410,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4495,6 +4449,15 @@ inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+internal-slot@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
+  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    has "^1.0.3"
+    side-channel "^1.0.2"
+
 interpret@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -4537,9 +4500,9 @@ is-accessor-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-alphabetical@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz#eb04cc47219a8895d8450ace4715abff2258a1f8"
-  integrity sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
 
 is-alphanumeric@^1.0.0:
   version "1.0.0"
@@ -4547,9 +4510,9 @@ is-alphanumeric@^1.0.0:
   integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
 
 is-alphanumerical@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz#57ae21c374277b3defe0274c640a5704b8f6657c"
-  integrity sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
   dependencies:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
@@ -4590,12 +4553,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
-  integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
-
-is-boolean-object@^1.0.1:
+is-boolean-object@^1.0.0, is-boolean-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
   integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
@@ -4610,12 +4568,7 @@ is-buffer@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
-is-callable@^1.0.4, is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-callable@^1.1.5:
+is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
@@ -4642,14 +4595,14 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
 is-decimal@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz#381068759b9dc807d8c0dc0bfbae2b68e1da48b7"
-  integrity sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -4757,9 +4710,9 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
     is-extglob "^2.1.1"
 
 is-hexadecimal@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
-  integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
 is-ip@^2.0.0:
   version "2.0.0"
@@ -4768,17 +4721,12 @@ is-ip@^2.0.0:
   dependencies:
     ip-regex "^2.0.0"
 
-is-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.0.tgz#1d223ada48a1f5fdb7b3c5c21a45b6a4d48aec3c"
-  integrity sha512-ptj+FffEGJN9hLuakga2S3mYQt5PVN+w7+fL3SAgxKhlCePSt24Q3fiSozhvphbwCQ0+QPA1rJnLSoS2LnbCVw==
+is-map@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
+  integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
 
-is-number-object@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
-  integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
-
-is-number-object@^1.0.4:
+is-number-object@^1.0.3, is-number-object@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
   integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
@@ -4795,10 +4743,10 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
@@ -4817,14 +4765,7 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-regex@^1.0.3, is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
-
-is-regex@^1.0.5:
+is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
   integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
@@ -4836,22 +4777,17 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
-is-set@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.0.tgz#ae93342b1de5560c720b4b71599abc799d183cf4"
-  integrity sha512-So5/xwRDzU3X7kOt2vpvrsj/Asx5E7Q5IyX6itksB96FJgyydSe9tFwfCq7IZ8URDS4h45FhNgfENToTgBfmgw==
+is-set@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
+  integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-string@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
-  integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
-
-is-string@^1.0.5:
+is-string@^1.0.4, is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
   integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
@@ -4878,20 +4814,20 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-weakmap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.0.tgz#88bd0b8ec3a5724477637d58ed96cb00552593fd"
-  integrity sha512-vZKPGTqgcrNWsav9/lvXA4DvZtxqzdkSm624p85UvZV47pk1cvw+JQ5YrZfQ1KqsogYxnIztAtu4WBdPNz/n/w==
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
-is-weakset@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.0.tgz#119577bcf75528e7d5b4c7ebaa4fdee9e2d3e5d7"
-  integrity sha512-bDiKqyPK2GeWiZNsm1zHf0adJJ2I0gNzwjBxu4iajQPgJH3UZiXTGUPMNmbQ3TIBYPs+tVNpiDSF/eF5U4EF7A==
+is-weakset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
+  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
 
 is-whitespace-character@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
-  integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
@@ -4899,9 +4835,9 @@ is-windows@^1.0.1, is-windows@^1.0.2:
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-word-character@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz#264d15541cbad0ba833d3992c34e6b40873b08aa"
-  integrity sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
@@ -4987,11 +4923,11 @@ istanbul-lib-source-maps@^3.0.1:
     source-map "^0.6.1"
 
 istanbul-reports@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
-  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
+  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
   dependencies:
-    handlebars "^4.1.2"
+    html-escaper "^2.0.0"
 
 jest-changed-files@^24.9.0:
   version "24.9.0"
@@ -5347,16 +5283,6 @@ jest@^24.9.0:
     import-local "^2.0.0"
     jest-cli "^24.9.0"
 
-jquery@^3.3.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
-
-js-levenshtein@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5494,9 +5420,9 @@ kind-of@^5.0.0:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
@@ -5530,6 +5456,13 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -5539,13 +5472,9 @@ levn@^0.3.0, levn@~0.3.0:
     type-check "~0.3.2"
 
 linkifyjs@^2.1.6:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.8.tgz#2bee2272674dc196cce3740b8436c43df2162f9c"
-  integrity sha512-j3QpiEr4UYzN5foKhrr9Sr06VI9vSlI4HisDWt+7Mq+TWDwpJ6H/LLpogYsXcyUIJLVhGblXXdUnblHsVNMPpg==
-  optionalDependencies:
-    jquery "^3.3.1"
-    react "^16.4.2"
-    react-dom "^16.4.2"
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.9.tgz#af06e45a2866ff06c4766582590d098a4d584702"
+  integrity sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==
 
 load-json-file@^4.0.0:
   version "4.0.0"
@@ -5562,7 +5491,7 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -5571,6 +5500,15 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -5619,11 +5557,6 @@ lodash.flattendeep@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
   integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -5634,11 +5567,6 @@ lodash.isplainobject@^4.0.6:
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
-lodash.isregexp@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isregexp/-/lodash.isregexp-4.0.1.tgz#e13e647b30cd559752a04cd912086faf7da1c30b"
-  integrity sha1-4T5kezDNVZdSoEzZEghvr32hwws=
-
 lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
@@ -5654,11 +5582,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.unescape@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
-  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
-
 lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -5672,9 +5595,9 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
     chalk "^2.0.1"
 
 loglevel@^1.6.4:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
-  integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56"
+  integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==
 
 lolex@^5.1.2:
   version "5.1.2"
@@ -5684,9 +5607,9 @@ lolex@^5.1.2:
     "@sinonjs/commons" "^1.7.0"
 
 longest-streak@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
-  integrity sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
@@ -5777,9 +5700,9 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 markdown-escapes@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5"
-  integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
 markdown-table@^1.1.0:
   version "1.1.3"
@@ -5787,13 +5710,13 @@ markdown-table@^1.1.0:
   integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
 
 mathml-tag-names@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
-  integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.0.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a998006842ae558f02819ca84fbaad43685cc10b"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ce668d051c8866dbfedae4955e9dbf4b6ac7b81d"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5921,17 +5844,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.42.0:
-  version "1.42.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
-  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
+mime-db@1.43.0:
+  version "1.43.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.25"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
+  version "2.1.26"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
   dependencies:
-    mime-db "1.42.0"
+    mime-db "1.43.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -5983,11 +5906,6 @@ minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
 minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -6034,10 +5952,10 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-moo@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
-  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
+moo@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
+  integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6094,26 +6012,26 @@ natural-compare@^1.4.0:
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz#37717781d0fd0f2bfc95e233ebd75678ca4bda46"
-  integrity sha512-2v52FTw7RPqieZr3Gth1luAXZR7Je6q3KaDHY5bjl/paDUdMu35fZ8ICNgiYJRr3tf3NMvIQQR1r27AvEr9CRA==
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz#4af4006e16645ff800e9f993c3af039857d9dbdc"
+  integrity sha512-xq47GIUGXxU9vQg7g/y1o1xuKnkO7ev4nRWqftmQrLkfnE/FjRqDaGOUakM8XHPn/6pW3bGjU2wgoJyId90rqg==
   dependencies:
     commander "^2.19.0"
-    moo "^0.4.3"
+    moo "^0.5.0"
     railroad-diagrams "^1.0.0"
     randexp "0.4.6"
     semver "^5.4.1"
 
 needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
+  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
@@ -6190,10 +6108,10 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -6204,12 +6122,12 @@ node-pre-gyp@^0.12.0:
     rc "^1.2.7"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^4"
+    tar "^4.4.2"
 
-node-releases@^1.1.41, node-releases@^1.1.42:
-  version "1.1.42"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
-  integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==
+node-releases@^1.1.49:
+  version "1.1.50"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
+  integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==
   dependencies:
     semver "^6.3.0"
 
@@ -6254,17 +6172,25 @@ normalize-selector@^0.2.0:
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
 npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
 npm-packlist@^1.1.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4"
-  integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -6356,17 +6282,7 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.entries@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
-  integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.12.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-object.entries@^1.1.1:
+object.entries@^1.1.0, object.entries@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
   integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
@@ -6376,16 +6292,6 @@ object.entries@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
-  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.15.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
 object.fromentries@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
@@ -6396,7 +6302,7 @@ object.fromentries@^2.0.2:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.getownpropertydescriptors@^2.0.3:
+object.getownpropertydescriptors@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
   integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
@@ -6411,16 +6317,6 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.12.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
 object.values@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
@@ -6445,14 +6341,6 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -6527,9 +6415,9 @@ p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
+  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -6570,9 +6458,9 @@ p-try@^2.0.0:
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pako@^1.0.5, pako@~1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
-  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
 parallel-transform@^1.1.0:
   version "1.2.0"
@@ -6776,9 +6664,9 @@ postcss-html@^0.36.0:
     htmlparser2 "^3.10.0"
 
 postcss-jsx@^0.36.0:
-  version "0.36.3"
-  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.3.tgz#c91113eae2935a1c94f00353b788ece9acae3f46"
-  integrity sha512-yV8Ndo6KzU8eho5mCn7LoLUGPkXrRXRjhMpX4AaYJ9wLJPv099xbtpbRQ8FrPnzVxb/cuMebbPR7LweSt+hTfA==
+  version "0.36.4"
+  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.4.tgz#37a68f300a39e5748d547f19a747b3257240bd50"
+  integrity sha512-jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA==
   dependencies:
     "@babel/core" ">=7.2.2"
 
@@ -6818,11 +6706,11 @@ postcss-resolve-nested-selector@^0.1.1:
   integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
 
 postcss-safe-parser@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"
-  integrity sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
+  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
   dependencies:
-    postcss "^7.0.0"
+    postcss "^7.0.26"
 
 postcss-sass@^0.3.5:
   version "0.3.5"
@@ -6840,11 +6728,11 @@ postcss-scss@^2.0.0:
     postcss "^7.0.0"
 
 postcss-selector-parser@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
-  integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
   dependencies:
-    dot-prop "^4.1.1"
+    dot-prop "^5.2.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -6868,14 +6756,14 @@ postcss-value-parser@^3.3.0:
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss-value-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
-  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
+  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.7:
-  version "7.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1"
-  integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.7:
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
+  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -6937,12 +6825,12 @@ promise@^7.0.3, promise@^7.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
-  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
+  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
   dependencies:
     kleur "^3.0.3"
-    sisteransi "^1.0.3"
+    sisteransi "^1.0.4"
 
 prop-types-exact@^1.2.0:
   version "1.2.0"
@@ -6967,15 +6855,10 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.24:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.5.0.tgz#47fd1292def7fdb1e138cd78afa8814cebcf7b13"
-  integrity sha512-4vqUjKi2huMu1OJiLhi3jN6jeeKvMZdI1tYgi/njW5zV52jNLgSAZSdN16m9bJFe61/cT8ulmw4qFitV9QRsEA==
-
 psl@^1.1.28:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110"
-  integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -7019,7 +6902,7 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
@@ -7171,7 +7054,7 @@ react-clientside-effect@^1.2.2:
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-dom@^16.4.2, react-dom@^16.9.0:
+react-dom@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
   integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
@@ -7252,7 +7135,7 @@ react-transition-group@^1.2.0:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
-react@^16.4.2, react@^16.9.0:
+react@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
   integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
@@ -7296,9 +7179,9 @@ read-pkg@^4.0.1:
     pify "^3.0.0"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -7309,9 +7192,9 @@ read-pkg@^4.0.1:
     util-deprecate "~1.0.1"
 
 readable-stream@^3.1.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -7405,6 +7288,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp.prototype.flags@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -7436,9 +7327,9 @@ regjsgen@^0.5.0:
   integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"
+  integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==
   dependencies:
     jsesc "~0.5.0"
 
@@ -7529,9 +7420,9 @@ request-promise-native@^1.0.5:
     tough-cookie "^2.3.3"
 
 request@^2.87.0, request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -7540,7 +7431,7 @@ request@^2.87.0, request@^2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -7550,7 +7441,7 @@ request@^2.87.0, request@^2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -7614,17 +7505,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
-  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.8.1:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2"
-  integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -7669,17 +7553,17 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     inherits "^2.0.1"
 
 rollup-plugin-terser@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.1.2.tgz#3e41256205cb75f196fc70d4634227d1002c255c"
-  integrity sha512-sWKBCOS+vUkRtHtEiJPAf+WnBqk/C402fBD9AVHxSIXMqjsY7MnYWKYEUqGixtr0c8+1DjzUEPlNgOYQPVrS1g==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.2.0.tgz#ba758adf769347b7f1eaf9ef35978d2e207dccc7"
+  integrity sha512-jQI+nYhtDBc9HFRBz8iGttQg7li9klmzR62RG2W2nN6hJ/FI2K2ItYQ7kJ7/zn+vs+BP1AEccmVRjRN989I+Nw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    jest-worker "^24.6.0"
-    rollup-pluginutils "^2.8.1"
-    serialize-javascript "^1.7.0"
-    terser "^4.1.0"
+    "@babel/code-frame" "^7.5.5"
+    jest-worker "^24.9.0"
+    rollup-pluginutils "^2.8.2"
+    serialize-javascript "^2.1.2"
+    terser "^4.6.2"
 
-rollup-pluginutils@^2.8.1:
+rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
@@ -7700,9 +7584,9 @@ rsvp@^4.8.4:
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
+  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
   dependencies:
     is-promise "^2.1.0"
 
@@ -7714,9 +7598,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.4.0, rxjs@^6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
-  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
   dependencies:
     tslib "^1.9.0"
 
@@ -7758,19 +7642,19 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^1.18.4:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz#f6effdf55dd398807171215a62bfc21811bacf85"
-  integrity sha512-txnH8TQjaQvg2Q0HY06G6CDJLVYCpbnxrdO0WN8gjCKaU5J0KbyGYhZxx5QJg3WLZ1lB7XU9kDkfrCXUozqptA==
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz#9df779c53cf5755adb2322943c21c1c1dffca7bf"
+  integrity sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A==
   dependencies:
     chalk "^2.4.1"
-    htmlparser2 "^3.10.0"
+    htmlparser2 "^4.1.0"
     lodash.clonedeep "^4.5.0"
     lodash.escaperegexp "^4.1.2"
     lodash.isplainobject "^4.0.6"
     lodash.isstring "^4.0.1"
     lodash.mergewith "^4.6.1"
-    postcss "^7.0.5"
-    srcset "^1.0.0"
+    postcss "^7.0.27"
+    srcset "^2.0.1"
     xtend "^4.0.1"
 
 sax@^1.2.4:
@@ -7805,10 +7689,15 @@ semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-serialize-javascript@^1.7.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
-  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -7855,12 +7744,20 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+side-channel@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    object-inspect "^1.7.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-sisteransi@^1.0.3:
+sisteransi@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
   integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
@@ -7944,11 +7841,11 @@ source-map-loader@^0.2.3:
     loader-utils "^1.1.0"
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -8030,13 +7927,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-srcset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
-  integrity sha1-pWad4StC87HV6D7QPHEEb8SPQe8=
-  dependencies:
-    array-uniq "^1.0.2"
-    number-is-nan "^1.0.0"
+srcset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz#8f842d357487eb797f413d9c309de7a5149df5ac"
+  integrity sha512-00kZI87TdRKwt+P8jj8UZxbfp7mK2ufxcIMWvhAOZNJTRROimpHeruWrGvCZneiuVDLqdyHefVp748ECTnyUBQ==
 
 sshpk@^1.7.0:
   version "1.16.1"
@@ -8066,9 +7960,9 @@ stack-utils@^1.0.1:
   integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
 
 state-toggle@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc"
-  integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -8111,9 +8005,9 @@ stream-http@^2.7.2:
     xtend "^4.0.0"
 
 stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 string-length@^2.0.0:
   version "2.0.0"
@@ -8158,6 +8052,18 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string.prototype.matchall@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
+  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    has-symbols "^1.0.1"
+    internal-slot "^1.0.2"
+    regexp.prototype.flags "^1.3.0"
+    side-channel "^1.0.2"
+
 string.prototype.repeat@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
@@ -8172,14 +8078,6 @@ string.prototype.trim@^1.2.1:
     es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
 
-string.prototype.trimleft@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
-  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
 string.prototype.trimleft@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
@@ -8188,14 +8086,6 @@ string.prototype.trimleft@^2.1.1:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
-string.prototype.trimright@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
-  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
 string.prototype.trimright@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
@@ -8287,13 +8177,11 @@ stylelint-config-standard@^18.2.0:
     stylelint-config-recommended "^2.2.0"
 
 stylelint-scss@^3.9.0:
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.13.0.tgz#875c76e61d95333c4f0ae737a310be6f1d27d780"
-  integrity sha512-SaLnvQyndaPcsgVJsMh6zJ1uKVzkRZJx+Wg/stzoB1mTBdEmGketbHrGbMQNymzH/0mJ06zDSpeCDvNxqIJE5A==
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.14.2.tgz#e449a47e0ac410e6909f1a71b49550202c978bf9"
+  integrity sha512-59/BkIEWyFoORiejDIQB2P2kmg0KcqMn7wtj1y5sRvS4N+Qh+Ng3hbKelOzgS+OM2Ezbai0uEev8xckXxkh9TQ==
   dependencies:
-    lodash.isboolean "^3.0.3"
-    lodash.isregexp "^4.0.1"
-    lodash.isstring "^4.0.1"
+    lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.2"
@@ -8410,7 +8298,7 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4:
+tar@^4.4.2:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -8423,25 +8311,25 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.3"
 
-terser-webpack-plugin@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
-  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
+terser-webpack-plugin@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.7.0"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.0, terser@^4.1.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8"
-  integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==
+terser@^4.1.2, terser@^4.6.2:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00"
+  integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -8551,7 +8439,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -8559,14 +8447,6 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -8575,9 +8455,9 @@ tr46@^1.0.1:
     punycode "^2.1.0"
 
 tree-kill@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
-  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
 trim-newlines@^2.0.0:
   version "2.0.0"
@@ -8585,9 +8465,9 @@ trim-newlines@^2.0.0:
   integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-trailing-lines@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
-  integrity sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
+  integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
 
 trim@0.0.1:
   version "0.0.1"
@@ -8595,14 +8475,14 @@ trim@0.0.1:
   integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
 
 trough@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
-  integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
 tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc"
+  integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==
 
 tslint@^5.20.1:
   version "5.20.1"
@@ -8672,35 +8552,27 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.7.3:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
-  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
+  integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==
 
 ua-parser-js@^0.7.18:
-  version "0.7.20"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
-  integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
-
-uglify-js@^3.1.4:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
-  integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
+  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
 
 unherit@^1.0.4:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449"
-  integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
   dependencies:
-    inherits "^2.0.1"
-    xtend "^4.0.1"
+    inherits "^2.0.0"
+    xtend "^4.0.0"
 
 unhomoglyph@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.3.tgz#8d3551622b57754e10a831bf81442d7f15d1ddfd"
-  integrity sha512-PC/OAHE8aiTK0Gfmy0PxOlePazRn+BeCM1r4kFtkHgEnkJZgJoI7yD2yUEjsfSdLXKU1FSt/EcIZvNoKazYUTw==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.4.tgz#38d2ec9de84ab921623ebd9fb60f710963c601f4"
+  integrity sha512-+y+QeEXwm4f0H8Tmy9fFUWHM95YcFjJLlv83/p3+EARUkeJBxnSOBADVyeuSq0TsRJ/UexxCXBKXo40ksu715w==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -8886,12 +8758,14 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
   dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
 
 util@0.10.3:
   version "0.10.3"
@@ -8908,9 +8782,9 @@ util@^0.11.0:
     inherits "2.0.3"
 
 uuid@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 v8-compile-cache@2.0.3:
   version "2.0.3"
@@ -9025,9 +8899,9 @@ webidl-conversions@^4.0.2:
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 webpack-cli@^3.1.1:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
-  integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
+  integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
   dependencies:
     chalk "2.4.2"
     cross-spawn "6.0.5"
@@ -9050,9 +8924,9 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.20.2:
-  version "4.41.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
-  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+  version "4.41.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1"
+  integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -9074,7 +8948,7 @@ webpack@^4.20.2:
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
     tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
+    terser-webpack-plugin "^1.4.3"
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
@@ -9135,14 +9009,14 @@ which-boxed-primitive@^1.0.1:
     is-symbol "^1.0.2"
 
 which-collection@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.0.tgz#303d38022473f4b7048b529b45f6c842d8814269"
-  integrity sha512-mG4RtFHE+17N2AxRNvBQ488oBjrhaOaI/G+soUaRJwdyDbu5zmqoAKPYBlY7Zd+QTwpfvInRLKo40feo2si1yA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
   dependencies:
-    is-map "^2.0.0"
-    is-set "^2.0.0"
-    is-weakmap "^2.0.0"
-    is-weakset "^2.0.0"
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
 
 which-module@^2.0.0:
   version "2.0.0"
@@ -9168,11 +9042,6 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"

From afe45241da8b5714f97329bd69847cf9be5cce8d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 17:14:54 +0000
Subject: [PATCH 1264/3235] Remove debug line from Analytics

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 8eea47ea89..c96cfdefee 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -260,7 +260,6 @@ class Analytics {
             });
         } catch (e) {
             console.error("Analytics error: ", e);
-            window.err = e;
         }
     }
 

From 50b64d8c557c65974f4f4bddd893b1a4f8a92d27 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 26 Feb 2020 18:30:20 +0100
Subject: [PATCH 1265/3235] add local echo for clicking 'start verification'
 button

---
 src/components/views/right_panel/EncryptionPanel.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 3ba6ca9a8a..3e9fa4f8b2 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -37,6 +37,7 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     useEffect(() => {
         setRequest(verificationRequest);
         if (verificationRequest) {
+            setRequesting(false);
             setPhase(verificationRequest.phase);
         }
     }, [verificationRequest]);
@@ -67,7 +68,11 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     }, [onClose, request]);
     useEventEmitter(request, "change", changeHandler);
 
+    // state to show a spinner immediately after clicking "start verification",
+    // before we have a request
+    const [isRequesting, setRequesting] = useState(false);
     const onStartVerification = useCallback(async () => {
+        setRequesting(true);
         const cli = MatrixClientPeg.get();
         const roomId = await ensureDMExists(cli, member.userId);
         const verificationRequest = await cli.requestVerificationDM(member.userId, roomId);
@@ -75,9 +80,11 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
         setPhase(verificationRequest.phase);
     }, [member.userId]);
 
-    const requested = request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined);
-    const initiatedByMe = request && request.initiatedByMe;
+    const requested =
+        (!request && isRequesting) ||
+        (request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
     if (!request || requested) {
+        const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
         return <EncryptionInfo
             onStartVerification={onStartVerification}
             member={member}

From 347f56b983ec515720d9a576fa55ef4f2950bcc7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 26 Feb 2020 13:21:11 -0700
Subject: [PATCH 1266/3235] Ensure verification QR codes use the right buffer
 size

The string length buffer only needs 2 bytes, not 4.
---
 src/components/views/elements/crypto/VerificationQRCode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 88f9608138..b7232048e5 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -126,7 +126,7 @@ export default class VerificationQRCode extends React.PureComponent {
             buf = Buffer.concat([buf, tmpBuf]);
         };
         const appendInt = (i: number) => {
-            const tmpBuf = Buffer.alloc(4);
+            const tmpBuf = Buffer.alloc(2);
             tmpBuf.writeInt8(i, 0);
             buf = Buffer.concat([buf, tmpBuf]);
         };

From 3abd3137c77c97ddbaa8e344588f139ba1efa4f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 26 Feb 2020 13:37:19 -0700
Subject: [PATCH 1267/3235] Use the right function for creating binary
 verification QR codes

`writeInt8` happened to work because the strings we're writing happen to fit within a single byte so the LSB doesn't matter. We actually want a 16 bit (2 byte) number in big-endian format.
---
 src/components/views/elements/crypto/VerificationQRCode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index b7232048e5..3838aa61ff 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -127,7 +127,7 @@ export default class VerificationQRCode extends React.PureComponent {
         };
         const appendInt = (i: number) => {
             const tmpBuf = Buffer.alloc(2);
-            tmpBuf.writeInt8(i, 0);
+            tmpBuf.writeInt16BE(i, 0);
             buf = Buffer.concat([buf, tmpBuf]);
         };
         const appendStr = (s: string, enc: string, withLengthPrefix = true) => {

From aad17a0be5c5285363526f9995f8744bbebc7181 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Tue, 7 Jan 2020 16:47:43 +0000
Subject: [PATCH 1268/3235] Add some buttons

---
 src/Registration.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index ac8baa3cca..5f23854f47 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -67,9 +67,15 @@ export async function startAnyRegistrationFlow(options) {
     //} else {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
-            title: _t("Registration Required"),
-            description: _t("You need to register to do this. Would you like to register now?"),
+            title: _t("Login or Registration Required"),
+            description: _t("You need to login or register to do this."),
             button: _t("Register"),
+            extraButtons: [
+                <button className="mx_Dialog_primary"
+                onClick={() => {dis.dispatch({action: 'start_login'});}}>
+                    { _t('Login') }
+                </button>,
+            ],
             onFinished: (proceed) => {
                 if (proceed) {
                     dis.dispatch({action: 'start_registration'});
@@ -101,4 +107,3 @@ export async function startAnyRegistrationFlow(options) {
 //     }
 //     throw new Error("Register request succeeded when it should have returned 401!");
 // }
-

From 2c6045fe9f7dd6b816727bff61892f2b4bdaf961 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 8 Jan 2020 10:34:47 +0000
Subject: [PATCH 1269/3235] close modal

---
 src/Registration.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index 5f23854f47..5f123a7669 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -66,13 +66,13 @@ export async function startAnyRegistrationFlow(options) {
     //     });
     //} else {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
+        const modal = Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
             title: _t("Login or Registration Required"),
             description: _t("You need to login or register to do this."),
             button: _t("Register"),
             extraButtons: [
                 <button className="mx_Dialog_primary"
-                onClick={() => {dis.dispatch({action: 'start_login'});}}>
+                onClick={() => {modal.close(); dis.dispatch({action: 'start_login'});}}>
                     { _t('Login') }
                 </button>,
             ],

From 32eb2c13bfe283324654f5f4e8a0564df9b33f4d Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Sun, 12 Jan 2020 17:15:19 +0000
Subject: [PATCH 1270/3235] Add support for specifying the screen after
 require_registration

Also use it in start chat and join group

Signed-off-by: Stuart Mumford <stuart@cadair.com>
---
 src/Registration.js                     | 8 ++++++--
 src/components/structures/GroupView.js  | 6 ++++--
 src/components/structures/MatrixChat.js | 5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index 5f123a7669..a6e7127010 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -39,6 +39,8 @@ export const SAFE_LOCALPART_REGEX = /^[a-z0-9=_\-./]+$/;
  *     If true, goes to the home page if the user cancels the action
  * @param {bool} options.go_welcome_on_cancel
  *     If true, goes to the welcome page if the user cancels the action
+ * @param {bool} options.screen_after
+ *     If present the screen to redict to after a successful login or register.
  */
 export async function startAnyRegistrationFlow(options) {
     if (options === undefined) options = {};
@@ -72,13 +74,15 @@ export async function startAnyRegistrationFlow(options) {
             button: _t("Register"),
             extraButtons: [
                 <button className="mx_Dialog_primary"
-                onClick={() => {modal.close(); dis.dispatch({action: 'start_login'});}}>
+                onClick={() => {modal.close(); dis.dispatch({action: 'start_login',
+                                                             screenAfterLogin: options.screen_after});}}>
                     { _t('Login') }
                 </button>,
             ],
             onFinished: (proceed) => {
                 if (proceed) {
-                    dis.dispatch({action: 'start_registration'});
+                    dis.dispatch({action: 'start_registration',
+                                  screenAfterLogin: options.screen_after});
                 } else if (options.go_home_on_cancel) {
                     dis.dispatch({action: 'view_home_page'});
                 } else if (options.go_welcome_on_cancel) {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index e98dcae1a4..2b7f15df7a 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -481,7 +481,8 @@ export default createReactClass({
                         group_id: groupId,
                     },
                 });
-                dis.dispatch({action: 'require_registration'});
+                dis.dispatch({action: 'require_registration',
+                              screen_after: {screen: `group/${groupId}`}});
                 willDoOnboarding = true;
             }
             if (stateKey === GroupStore.STATE_KEY.Summary) {
@@ -726,7 +727,8 @@ export default createReactClass({
 
     _onJoinClick: async function() {
         if (this._matrixClient.isGuest()) {
-            dis.dispatch({action: 'require_registration'});
+            dis.dispatch({action: 'require_registration',
+                          screen_after: {screen: `group/${this.props.groupId}`}});
             return;
         }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 339ea279ee..3175f5b7b8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1008,6 +1008,11 @@ export default createReactClass({
                 // needs to be reset so that they can revisit /user/.. // (and trigger
                 // `_chatCreateOrReuse` again)
                 go_welcome_on_cancel: true,
+                screen_after: {screen: `user/${this.props.config.welcomeUserId}`,
+                               params: {
+                                   action: 'chat'
+                               }
+                              }
             });
             return;
         }

From e454d84e9d04ff304c8027364c64e37fd82d60a3 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Mon, 13 Jan 2020 10:56:41 +0000
Subject: [PATCH 1271/3235] Lint

Signed-off-by: Stuart Mumford <stuart@cadair.com>
---
 src/Registration.js                     | 9 ++++++---
 src/components/structures/MatrixChat.js | 6 +++---
 src/i18n/strings/en_EN.json             | 5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index a6e7127010..c301f36ae1 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -73,9 +73,12 @@ export async function startAnyRegistrationFlow(options) {
             description: _t("You need to login or register to do this."),
             button: _t("Register"),
             extraButtons: [
-                <button className="mx_Dialog_primary"
-                onClick={() => {modal.close(); dis.dispatch({action: 'start_login',
-                                                             screenAfterLogin: options.screen_after});}}>
+                <button className="mx_Dialog_primary" key="start_login"
+                onClick={() => {
+                    modal.close(); dis.dispatch({action: 'start_login',
+                                                 screenAfterLogin: options.screen_after});
+                               }
+                        }>
                     { _t('Login') }
                 </button>,
             ],
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3175f5b7b8..a9bb8e3a7d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1010,9 +1010,9 @@ export default createReactClass({
                 go_welcome_on_cancel: true,
                 screen_after: {screen: `user/${this.props.config.welcomeUserId}`,
                                params: {
-                                   action: 'chat'
-                               }
-                              }
+                                   action: 'chat',
+                               },
+                              },
             });
             return;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 79b045dd34..8692d38788 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -123,9 +123,10 @@
     "Unable to enable Notifications": "Unable to enable Notifications",
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
-    "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?",
+    "Login or Registration Required": "Login or Registration Required",
+    "You need to login or register to do this.": "You need to login or register to do this.",
     "Register": "Register",
+    "Login": "Login",
     "Default": "Default",
     "Restricted": "Restricted",
     "Moderator": "Moderator",

From 5edb0ec9122ffb578afcd8d90c3eb13bb92b621c Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Sat, 18 Jan 2020 23:23:46 +0000
Subject: [PATCH 1272/3235] Resolve correct screen not being shown after new
 registration

---
 src/components/structures/MatrixChat.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a9bb8e3a7d..e226b6aaf7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1182,7 +1182,15 @@ export default createReactClass({
     _onLoggedIn: async function() {
         ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
-        if (MatrixClientPeg.currentUserIsJustRegistered()) {
+        // If a specific screen is set to be shown after login, show that above
+        // all else, as it probably means the user clicked on something already.
+        if (this._screenAfterLogin && this._screenAfterLogin.screen) {
+            this.showScreen(
+                this._screenAfterLogin.screen,
+                this._screenAfterLogin.params,
+            );
+            this._screenAfterLogin = null;
+        } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);
 
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {

From de05965fc05dfbedc8c04e2f2ad6170cb7f75403 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 5 Feb 2020 15:36:00 +0000
Subject: [PATCH 1273/3235] Update src/Registration.js

Co-Authored-By: Will Hunt <will@half-shot.uk>
---
 src/Registration.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index c301f36ae1..149b59f42c 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -40,7 +40,7 @@ export const SAFE_LOCALPART_REGEX = /^[a-z0-9=_\-./]+$/;
  * @param {bool} options.go_welcome_on_cancel
  *     If true, goes to the welcome page if the user cancels the action
  * @param {bool} options.screen_after
- *     If present the screen to redict to after a successful login or register.
+ *     If present the screen to redirect to after a successful login or register.
  */
 export async function startAnyRegistrationFlow(options) {
     if (options === undefined) options = {};
@@ -75,8 +75,9 @@ export async function startAnyRegistrationFlow(options) {
             extraButtons: [
                 <button className="mx_Dialog_primary" key="start_login"
                 onClick={() => {
-                    modal.close(); dis.dispatch({action: 'start_login',
-                                                 screenAfterLogin: options.screen_after});
+                    modal.close();
+                    dis.dispatch({action: 'start_login',
+                                  screenAfterLogin: options.screen_after});
                                }
                         }>
                     { _t('Login') }

From f980bfec9eb60b2adc7e7a2c6392e18c90d36d4c Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 20 Feb 2020 10:24:51 +0000
Subject: [PATCH 1274/3235] Improve copy

---
 src/Registration.js         | 9 +++++----
 src/i18n/strings/en_EN.json | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index 149b59f42c..ad1d59e3ee 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -69,9 +69,10 @@ export async function startAnyRegistrationFlow(options) {
     //} else {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const modal = Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
-            title: _t("Login or Registration Required"),
-            description: _t("You need to login or register to do this."),
-            button: _t("Register"),
+            hasCancelButton: false,
+            title: _t("Sign In or Create Account"),
+            description: _t("Use your account or create a new one to continue."),
+            button: _t("Create Account"),
             extraButtons: [
                 <button className="mx_Dialog_primary" key="start_login"
                 onClick={() => {
@@ -80,7 +81,7 @@ export async function startAnyRegistrationFlow(options) {
                                   screenAfterLogin: options.screen_after});
                                }
                         }>
-                    { _t('Login') }
+                    { _t('Sign In') }
                 </button>,
             ],
             onFinished: (proceed) => {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8692d38788..9a7fbefd2d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -123,9 +123,9 @@
     "Unable to enable Notifications": "Unable to enable Notifications",
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
-    "Login or Registration Required": "Login or Registration Required",
-    "You need to login or register to do this.": "You need to login or register to do this.",
-    "Register": "Register",
+    "Sign In or Create Account": "Sign In or Create Account",
+    "Use your account or create a new one to continue.": "Use your account or create a new one to continue.",
+    "Create Account": "Create Account",
     "Login": "Login",
     "Default": "Default",
     "Restricted": "Restricted",

From ae9c2f2c4acc52fc511e2764aeedb558e75d7efd Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 26 Feb 2020 14:28:50 +0000
Subject: [PATCH 1275/3235] Keep cancel button for now and make login unfilled

---
 src/Registration.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index ad1d59e3ee..8d7354e7ff 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -69,12 +69,12 @@ export async function startAnyRegistrationFlow(options) {
     //} else {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const modal = Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
-            hasCancelButton: false,
+            hasCancelButton: true,
             title: _t("Sign In or Create Account"),
             description: _t("Use your account or create a new one to continue."),
             button: _t("Create Account"),
             extraButtons: [
-                <button className="mx_Dialog_primary" key="start_login"
+                <button key="start_login"
                 onClick={() => {
                     modal.close();
                     dis.dispatch({action: 'start_login',

From 75a4289f54df0f155675067b0673b95a3ee38dbb Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 26 Feb 2020 14:41:38 +0000
Subject: [PATCH 1276/3235] fix i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9a7fbefd2d..25d78aa386 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -126,7 +126,7 @@
     "Sign In or Create Account": "Sign In or Create Account",
     "Use your account or create a new one to continue.": "Use your account or create a new one to continue.",
     "Create Account": "Create Account",
-    "Login": "Login",
+    "Sign In": "Sign In",
     "Default": "Default",
     "Restricted": "Restricted",
     "Moderator": "Moderator",
@@ -1066,7 +1066,6 @@
     "Rejecting invite …": "Rejecting invite …",
     "Join the conversation with an account": "Join the conversation with an account",
     "Sign Up": "Sign Up",
-    "Sign In": "Sign In",
     "Loading room preview": "Loading room preview",
     "You were kicked from %(roomName)s by %(memberName)s": "You were kicked from %(roomName)s by %(memberName)s",
     "Reason: %(reason)s": "Reason: %(reason)s",
@@ -1804,6 +1803,7 @@
     "Phone (optional)": "Phone (optional)",
     "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
+    "Register": "Register",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",

From c96dd9715a90bce8aaef3899680d43352cbbb8b0 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 26 Feb 2020 21:54:45 +0000
Subject: [PATCH 1277/3235] Fix no cancel button just for Registration

---
 src/Registration.js                            | 1 +
 src/components/views/dialogs/QuestionDialog.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Registration.js b/src/Registration.js
index 8d7354e7ff..5f6ac4b68e 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -70,6 +70,7 @@ export async function startAnyRegistrationFlow(options) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const modal = Modal.createTrackedDialog('Registration required', '', QuestionDialog, {
             hasCancelButton: true,
+            quitOnly: true,
             title: _t("Sign In or Create Account"),
             description: _t("Use your account or create a new one to continue."),
             button: _t("Create Account"),
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 3eec497b44..8cb16dd88f 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -32,6 +32,7 @@ export default createReactClass({
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
         headerImage: PropTypes.string,
+        quitOnly: PropTypes.bool, // quitOnly doesn't show the cancel button just the quit [x].
     },
 
     getDefaultProps: function() {
@@ -42,6 +43,7 @@ export default createReactClass({
             focus: true,
             hasCancelButton: true,
             danger: false,
+            quitOnly: false,
         };
     },
 
@@ -73,7 +75,7 @@ export default createReactClass({
                 <DialogButtons primaryButton={this.props.button || _t('OK')}
                     primaryButtonClass={primaryButtonClass}
                     cancelButton={this.props.cancelButton}
-                    hasCancel={this.props.hasCancelButton}
+                    hasCancel={this.props.hasCancelButton && !this.props.quitOnly}
                     onPrimaryButtonClick={this.onOk}
                     focus={this.props.focus}
                     onCancel={this.onCancel}

From 3ad8b6e9ccd221aef9bb1a38fd875549981a39d1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:05:08 +0000
Subject: [PATCH 1278/3235] Use RoomList.orderAlphabetically as the inverse of
 RoomList.orderByRecents for migration

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../settings/tabs/user/PreferencesUserSettingsTab.js   |  2 +-
 src/settings/Settings.js                               |  5 +++--
 src/stores/RoomListStore.js                            | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 09b9151ddc..ba6695ecf1 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -48,7 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
     ];
 
     static ROOM_LIST_SETTINGS = [
-        'RoomList.orderByRecents',
+        'RoomList.orderAlphabetically',
         'RoomList.orderByImportance',
         'breadcrumbs',
     ];
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b35301f124..e384aa8f0f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -433,10 +433,11 @@ export const SETTINGS = {
             deny: [],
         },
     },
-    "RoomList.orderByRecents": {
+    "RoomList.orderAlphabetically": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Order rooms by message activity instead of by name"),
+        displayName: _td("Order rooms alphabetically by name instead of by recent activity"),
         default: true,
+        invertedSettingName: "RoomList.orderByRecents",
     },
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index e0d60c3eac..30b523d35d 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -133,8 +133,8 @@ class RoomListStore extends Store {
             orderImportantFirst: false,
         };
 
+        SettingsStore.monitorSetting('RoomList.orderAlphabetically', null);
         SettingsStore.monitorSetting('RoomList.orderByImportance', null);
-        SettingsStore.monitorSetting('RoomList.orderByRecents', null);
         SettingsStore.monitorSetting('feature_custom_tags', null);
     }
 
@@ -161,8 +161,8 @@ class RoomListStore extends Store {
                 if (!logicallyReady) break;
 
                 switch (payload.settingName) {
-                    case "RoomList.orderByRecents":
-                        this.updateSortingAlgorithm(payload.newValue ? ALGO_RECENT : ALGO_ALPHABETIC,
+                    case "RoomList.orderAlphabetically":
+                        this.updateSortingAlgorithm(payload.newValue ? ALGO_ALPHABETIC : ALGO_RECENT,
                             this._state.orderImportantFirst);
                         break;
                     case "RoomList.orderByImportance":
@@ -189,9 +189,9 @@ class RoomListStore extends Store {
 
                 this._matrixClient = payload.matrixClient;
 
-                const orderByRecents = SettingsStore.getValue("RoomList.orderByRecents");
                 const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
-                this.updateSortingAlgorithm(orderByRecents ? ALGO_RECENT : ALGO_ALPHABETIC, orderByImportance);
+                const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
+                this.updateSortingAlgorithm(orderAlphabetically ? ALGO_ALPHABETIC : ALGO_RECENT, orderByImportance);
             }
             break;
             case 'MatrixActions.Room.receipt': {

From ed650d5b9052158acc3c1fac69cd91f221417308 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:07:43 +0000
Subject: [PATCH 1279/3235] Move Room List preferences section to be first

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../tabs/user/PreferencesUserSettingsTab.js    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index ba6695ecf1..2b8abafdb4 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -25,6 +25,12 @@ import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
 
 export default class PreferencesUserSettingsTab extends React.Component {
+    static ROOM_LIST_SETTINGS = [
+        'RoomList.orderAlphabetically',
+        'RoomList.orderByImportance',
+        'breadcrumbs',
+    ];
+
     static COMPOSER_SETTINGS = [
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
@@ -47,12 +53,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'showImages',
     ];
 
-    static ROOM_LIST_SETTINGS = [
-        'RoomList.orderAlphabetically',
-        'RoomList.orderByImportance',
-        'breadcrumbs',
-    ];
-
     static ADVANCED_SETTINGS = [
         'alwaysShowEncryptionIcons',
         'Pill.shouldShowPillAvatar',
@@ -174,15 +174,15 @@ export default class PreferencesUserSettingsTab extends React.Component {
                 <div className="mx_SettingsTab_heading">{_t("Preferences")}</div>
 
                 <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
+                    {this._renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
+
                     <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
 
                     <span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
 
-                    <span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
-                    {this._renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
-
                     <span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
                     {minimizeToTrayOption}

From cada584c2569f722cce6c44c90812575c4740953 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:09:34 +0000
Subject: [PATCH 1280/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e1cf61c5fe..0994b955ab 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -414,7 +414,7 @@
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
     "Show developer tools": "Show developer tools",
-    "Order rooms by message activity instead of by name": "Order rooms by message activity instead of by name",
+    "Order rooms alphabetically by name instead of by recent activity": "Order rooms alphabetically by name instead of by recent activity",
     "Show rooms with unread notifications first": "Show rooms with unread notifications first",
     "Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
     "Show hidden events in timeline": "Show hidden events in timeline",
@@ -775,9 +775,9 @@
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
     "Preferences": "Preferences",
+    "Room list": "Room list",
     "Composer": "Composer",
     "Timeline": "Timeline",
-    "Room list": "Room list",
     "Autocomplete delay (ms)": "Autocomplete delay (ms)",
     "Read Marker lifetime (ms)": "Read Marker lifetime (ms)",
     "Read Marker off-screen lifetime (ms)": "Read Marker off-screen lifetime (ms)",

From 6a66c4162bb84e9fbf30f7df669d2b98f629c001 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:16:27 +0000
Subject: [PATCH 1281/3235] Space preference sections out more significantly to
 make the section headers obvious

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../tabs/user/_PreferencesUserSettingsTab.scss         | 10 ++++++++--
 .../settings/tabs/user/PreferencesUserSettingsTab.js   |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index d003e175d9..aaa929604d 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -14,6 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_PreferencesUserSettingsTab .mx_Field {
-    @mixin mx_Settings_fullWidthField;
+.mx_PreferencesUserSettingsTab {
+    .mx_Field {
+        @mixin mx_Settings_fullWidthField;
+    }
+
+    .mx_SettingsTab_section {
+        margin-top: 30px;
+    }
 }
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 2b8abafdb4..8df65e6590 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -176,13 +176,19 @@ export default class PreferencesUserSettingsTab extends React.Component {
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.ROOM_LIST_SETTINGS)}
+                </div>
 
+                <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Composer")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS)}
+                </div>
 
+                <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
+                </div>
 
+                <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
                     {minimizeToTrayOption}

From 1875bf4bfe938ecc9573ad2d54aedf8df25e76a2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:18:01 +0000
Subject: [PATCH 1282/3235] remove the first preference section's margin

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/settings/tabs/user/_PreferencesUserSettingsTab.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index aaa929604d..be0af9123b 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -20,6 +20,6 @@ limitations under the License.
     }
 
     .mx_SettingsTab_section {
-        margin-top: 30px;
+        margin-bottom: 30px;
     }
 }

From f036f0bd8362f0664c1d55ed6ec7820f9dbe6f08 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:19:05 +0000
Subject: [PATCH 1283/3235] Fix copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0994b955ab..f5209f8e18 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -414,7 +414,7 @@
     "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
     "Show developer tools": "Show developer tools",
-    "Order rooms alphabetically by name instead of by recent activity": "Order rooms alphabetically by name instead of by recent activity",
+    "Order rooms by name": "Order rooms by name",
     "Show rooms with unread notifications first": "Show rooms with unread notifications first",
     "Show shortcuts to recently viewed rooms above the room list": "Show shortcuts to recently viewed rooms above the room list",
     "Show hidden events in timeline": "Show hidden events in timeline",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index e384aa8f0f..87602f866c 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -435,7 +435,7 @@ export const SETTINGS = {
     },
     "RoomList.orderAlphabetically": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Order rooms alphabetically by name instead of by recent activity"),
+        displayName: _td("Order rooms by name"),
         default: true,
         invertedSettingName: "RoomList.orderByRecents",
     },

From 75c593b2f4891e84fe208238078b47a85bf29a07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:19:50 +0000
Subject: [PATCH 1284/3235] get rid of unused stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/Settings.js                      |  1 -
 src/settings/controllers/SettingController.js | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 87602f866c..4687b57b3b 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -437,7 +437,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Order rooms by name"),
         default: true,
-        invertedSettingName: "RoomList.orderByRecents",
     },
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.js
index 9327f6ab48..a7d0ccf21a 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.js
@@ -47,15 +47,4 @@ export default class SettingController {
     onChange(level, roomId, newValue) {
         // do nothing by default
     }
-
-    /**
-     * Gets the value which should actually get written into the store based on the input value from setValue.
-     * @param {string} level The level at which the setting has been modified.
-     * @param {String} roomId The room ID, may be null.
-     * @param {*} newValue The new value for the setting, may be null.
-     * @return {*} The value that should be used, may be null.
-     */
-    augmentValue(level, roomId, newValue) {
-        return newValue;
-    }
 }

From e0fdfa1c1c25d9a178575030fa044584240c4a8d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 26 Feb 2020 23:21:37 +0000
Subject: [PATCH 1285/3235] fix default value for alphabetic sorting setting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 4687b57b3b..b77fb392e9 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -436,7 +436,7 @@ export const SETTINGS = {
     "RoomList.orderAlphabetically": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Order rooms by name"),
-        default: true,
+        default: false,
     },
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,

From b3fbcd4521ce9ab010f538d694656e0c82d2cb35 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 27 Feb 2020 11:01:22 +0000
Subject: [PATCH 1286/3235] Fix formatting buttons not marking the composer as
 modified

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e366a20326..2bd34b5969 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -563,6 +563,7 @@ export default class BasicMessageEditor extends React.Component {
             return;
         }
         this.historyManager.ensureLastChangesPushed(this.props.model);
+        this._modifiedFlag = true;
         switch (action) {
             case "bold":
                 toggleInlineFormat(range, "**");

From 400cb3324798db72e26160cdd4174e6d8f5b4ea8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 27 Feb 2020 12:35:34 +0100
Subject: [PATCH 1287/3235] put state declaration on top

---
 src/components/views/right_panel/EncryptionPanel.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 3e9fa4f8b2..4723211de4 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -32,7 +32,9 @@ const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
 const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     const [request, setRequest] = useState(verificationRequest);
-
+    // state to show a spinner immediately after clicking "start verification",
+    // before we have a request
+    const [isRequesting, setRequesting] = useState(false);
     const [phase, setPhase] = useState(request && request.phase);
     useEffect(() => {
         setRequest(verificationRequest);
@@ -68,9 +70,6 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
     }, [onClose, request]);
     useEventEmitter(request, "change", changeHandler);
 
-    // state to show a spinner immediately after clicking "start verification",
-    // before we have a request
-    const [isRequesting, setRequesting] = useState(false);
     const onStartVerification = useCallback(async () => {
         setRequesting(true);
         const cli = MatrixClientPeg.get();

From 95bb6f0d7666411b2951ac5ca6c992a44bc91ed3 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 27 Feb 2020 11:38:31 +0000
Subject: [PATCH 1288/3235] Ignore cursor jumping shortcuts with shift

This tweaks the new cursor jumping shortcuts in the composer so that they only
activate without shift. When shift _is_ pressed, you want to extend the
selection instead of just moving.

Fixes https://github.com/vector-im/riot-web/issues/12549
---
 src/components/views/rooms/BasicMessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e366a20326..53d78d7314 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -393,14 +393,14 @@ export default class BasicMessageEditor extends React.Component {
             this._insertText("\n");
             handled = true;
         // move selection to start of composer
-        } else if (modKey && event.key === Key.HOME) {
+        } else if (modKey && event.key === Key.HOME && !event.shiftKey) {
             setSelection(this._editorRef, model, {
                 index: 0,
                 offset: 0,
             });
             handled = true;
         // move selection to end of composer
-        } else if (modKey && event.key === Key.END) {
+        } else if (modKey && event.key === Key.END && !event.shiftKey) {
             setSelection(this._editorRef, model, {
                 index: model.parts.length - 1,
                 offset: model.parts[model.parts.length - 1].text.length,

From 4480abf09c7694db8cc425f7dcb72f9814c5be99 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 27 Feb 2020 12:52:22 +0000
Subject: [PATCH 1289/3235] Clear selected tags when disabling tag panel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/TagOrderStore.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index deb6388461..6d03a2b289 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -19,6 +19,7 @@ import GroupStore from './GroupStore';
 import Analytics from '../Analytics';
 import * as RoomNotifs from "../RoomNotifs";
 import {MatrixClientPeg} from '../MatrixClientPeg';
+import SettingsStore from "../settings/SettingsStore";
 
 const INITIAL_STATE = {
     orderedTags: null,
@@ -40,6 +41,7 @@ class TagOrderStore extends Store {
 
         // Initialise state
         this._state = Object.assign({}, INITIAL_STATE);
+        SettingsStore.monitorSetting("TagPanel.enableTagPanel", null);
     }
 
     _setState(newState) {
@@ -178,6 +180,14 @@ class TagOrderStore extends Store {
                 this._state = Object.assign({}, INITIAL_STATE);
                 break;
             }
+            case 'setting_updated':
+                if (payload.settingName === 'TagPanel.enableTagPanel' && !payload.newValue) {
+                    this._setState({
+                        selectedTags: [],
+                    });
+                    Analytics.trackEvent('FilterStore', 'disable_tags');
+                }
+                break;
         }
     }
 

From b6a21509d5e1946aa36cc075f83be39f6e42d990 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 27 Feb 2020 11:38:31 +0000
Subject: [PATCH 1290/3235] Ignore cursor jumping shortcuts with shift

This tweaks the new cursor jumping shortcuts in the composer so that they only
activate without shift. When shift _is_ pressed, you want to extend the
selection instead of just moving.

Fixes https://github.com/vector-im/riot-web/issues/12549
---
 src/components/views/rooms/BasicMessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e366a20326..53d78d7314 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -393,14 +393,14 @@ export default class BasicMessageEditor extends React.Component {
             this._insertText("\n");
             handled = true;
         // move selection to start of composer
-        } else if (modKey && event.key === Key.HOME) {
+        } else if (modKey && event.key === Key.HOME && !event.shiftKey) {
             setSelection(this._editorRef, model, {
                 index: 0,
                 offset: 0,
             });
             handled = true;
         // move selection to end of composer
-        } else if (modKey && event.key === Key.END) {
+        } else if (modKey && event.key === Key.END && !event.shiftKey) {
             setSelection(this._editorRef, model, {
                 index: model.parts.length - 1,
                 offset: model.parts[model.parts.length - 1].text.length,

From c99db2c38543abc9b983d4ae7ed4142383c2d642 Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Thu, 27 Feb 2020 18:54:11 +0000
Subject: [PATCH 1291/3235] sanitise quotes

---
 .../views/settings/tabs/user/HelpUserSettingsTab.js           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 1222cc1634..84403fe76e 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -163,7 +163,7 @@ export default class HelpUserSettingsTab extends React.Component {
     render() {
         let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
             'a': (sub) =>
-                <a href="https://about.riot.im/need-help/" rel='noreferrer noopener' target='_blank'>{sub}</a>,
+                <a href="https://about.riot.im/need-help/" rel="noreferrer noopener" target="_blank">{sub}</a>,
         });
         if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
             faqText = (
@@ -231,7 +231,7 @@ export default class HelpUserSettingsTab extends React.Component {
                                 {
                                     'a': (sub) =>
                                         <a href="https://matrix.org/security-disclosure-policy/"
-                                        rel='noreferrer noopener' target='_blank'>{sub}</a>,
+                                        rel="noreferrer noopener" target="_blank">{sub}</a>,
                                 })
                         }
                     </div>

From 46a6af0ad15ff40793a6789b129ceb5d47931868 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 27 Feb 2020 17:10:31 -0700
Subject: [PATCH 1292/3235] Ensure errors when creating a DM are raised to the
 user

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

Note: this will still result in an empty room being created, but that's a Synapse issue and not something we can solve.
---
 src/components/views/dialogs/AskInviteAnywayDialog.js | 2 +-
 src/components/views/dialogs/InviteDialog.js          | 2 +-
 src/createRoom.js                                     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
index 7fa6069478..120ad8deca 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.js
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -72,7 +72,7 @@ export default createReactClass({
                     <button onClick={this._onInviteNeverWarnClicked}>
                         { _t('Invite anyway and never warn me again') }
                     </button>
-                    <button onClick={this._onInviteClicked} autoFocus="true">
+                    <button onClick={this._onInviteClicked} autoFocus={true}>
                         { _t('Invite anyway') }
                     </button>
                 </div>
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 20c8fb5b14..e8c39b6d5a 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -564,7 +564,7 @@ export default class InviteDialog extends React.PureComponent {
             return;
         }
 
-        const createRoomOptions = {};
+        const createRoomOptions = {inlineErrors: true};
 
         if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
diff --git a/src/createRoom.js b/src/createRoom.js
index 07eaee3e8f..45e849065d 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -37,6 +37,8 @@ import SettingsStore from "./settings/SettingsStore";
  *     Default: True
  * @param {bool=} opts.encryption Whether to enable encryption.
  *     Default: False
+ * @param {bool=} opts.inlineErrors True to raise errors off the promise instead of resolving to null.
+ *     Default: False
  *
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
@@ -140,6 +142,9 @@ export default function createRoom(opts) {
         }
         return roomId;
     }, function(err) {
+        // Raise the error if the caller requested that we do so.
+        if (opts.inlineErrors) throw err;
+
         // We also failed to join the room (this sets joining to false in RoomViewStore)
         dis.dispatch({
             action: 'join_room_error',

From aec622d5d086ed43ad238935e9908d1b42d1158e Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Fri, 28 Feb 2020 10:47:23 +0000
Subject: [PATCH 1293/3235] Apply suggestions from code review

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/Registration.js                     | 14 ++++----------
 src/components/structures/GroupView.js  |  6 ++----
 src/components/structures/MatrixChat.js |  9 ++++-----
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/Registration.js b/src/Registration.js
index 5f6ac4b68e..ca162bac03 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -75,20 +75,14 @@ export async function startAnyRegistrationFlow(options) {
             description: _t("Use your account or create a new one to continue."),
             button: _t("Create Account"),
             extraButtons: [
-                <button key="start_login"
-                onClick={() => {
+                <button key="start_login" onClick={() => {
                     modal.close();
-                    dis.dispatch({action: 'start_login',
-                                  screenAfterLogin: options.screen_after});
-                               }
-                        }>
-                    { _t('Sign In') }
-                </button>,
+                    dis.dispatch({action: 'start_login', screenAfterLogin: options.screen_after});
+                }}>{ _t('Sign In') }</button>,
             ],
             onFinished: (proceed) => {
                 if (proceed) {
-                    dis.dispatch({action: 'start_registration',
-                                  screenAfterLogin: options.screen_after});
+                    dis.dispatch({action: 'start_registration', screenAfterLogin: options.screen_after});
                 } else if (options.go_home_on_cancel) {
                     dis.dispatch({action: 'view_home_page'});
                 } else if (options.go_welcome_on_cancel) {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 2b7f15df7a..af90fbbe83 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -481,8 +481,7 @@ export default createReactClass({
                         group_id: groupId,
                     },
                 });
-                dis.dispatch({action: 'require_registration',
-                              screen_after: {screen: `group/${groupId}`}});
+                dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${groupId}`}});
                 willDoOnboarding = true;
             }
             if (stateKey === GroupStore.STATE_KEY.Summary) {
@@ -727,8 +726,7 @@ export default createReactClass({
 
     _onJoinClick: async function() {
         if (this._matrixClient.isGuest()) {
-            dis.dispatch({action: 'require_registration',
-                          screen_after: {screen: `group/${this.props.groupId}`}});
+            dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${this.props.groupId}`}});
             return;
         }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e226b6aaf7..448cce933d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1008,11 +1008,10 @@ export default createReactClass({
                 // needs to be reset so that they can revisit /user/.. // (and trigger
                 // `_chatCreateOrReuse` again)
                 go_welcome_on_cancel: true,
-                screen_after: {screen: `user/${this.props.config.welcomeUserId}`,
-                               params: {
-                                   action: 'chat',
-                               },
-                              },
+                screen_after: {
+                    screen: `user/${this.props.config.welcomeUserId}`,
+                    params: { action: 'chat' },
+                },
             });
             return;
         }

From a93c13306cb98fb69caf85242056258faab27b53 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 28 Feb 2020 11:25:04 +0000
Subject: [PATCH 1294/3235] Prefer account password variation of upgrading

This shows the account password variation of upgrade encryption first if it's
possible to do so. This ensures we match the logic that locks the next button.

Fixes https://github.com/vector-im/riot-web/issues/12560
---
 .../secretstorage/CreateSecretStorageDialog.js       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 84b94ab64c..08d1e0638b 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -400,12 +400,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         let authPrompt;
         let nextCaption = _t("Next");
-        if (!this.state.backupSigStatus.usable) {
-            authPrompt = <div>
-                <div>{_t("Restore your key backup to upgrade your encryption")}</div>
-            </div>;
-            nextCaption = _t("Restore");
-        } else if (this.state.canUploadKeysWithPasswordOnly) {
+        if (this.state.canUploadKeysWithPasswordOnly) {
             authPrompt = <div>
                 <div>{_t("Enter your account password to confirm the upgrade:")}</div>
                 <div><Field
@@ -418,6 +413,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     autoFocus={true}
                 /></div>
             </div>;
+        } else if (!this.state.backupSigStatus.usable) {
+            authPrompt = <div>
+                <div>{_t("Restore your key backup to upgrade your encryption")}</div>
+            </div>;
+            nextCaption = _t("Restore");
         } else {
             authPrompt = <p>
                 {_t("You'll need to authenticate with the server to confirm the upgrade.")}

From 41e3e266e475a4fbcc4b2215a73d6c17038c0406 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Fri, 28 Feb 2020 12:40:43 +0100
Subject: [PATCH 1295/3235] Hide user avatars from screen readers in group and
 room user lists.

Like in pill components, these only duplicate information for screen readers, so hide them.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/groups/GroupMemberTile.js | 2 +-
 src/components/views/rooms/EntityTile.js       | 2 +-
 src/components/views/rooms/MemberTile.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 68513cf0db..659cfb5a91 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -59,7 +59,7 @@ export default createReactClass({
         );
 
         const av = (
-            <BaseAvatar
+            <BaseAvatar aria-hidden="true"
                 name={this.props.member.displayname || this.props.member.userId}
                 idName={this.props.member.userId}
                 width={36} height={36}
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index fd92cb8e57..e04e1d4965 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -175,7 +175,7 @@ const EntityTile = createReactClass({
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
-        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} />;
+        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
 
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         return (
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 649e1b4277..1f1d8389b1 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -208,7 +208,7 @@ export default createReactClass({
         }
 
         const av = (
-            <MemberAvatar member={member} width={36} height={36} />
+            <MemberAvatar member={member} width={36} height={36} aria-hidden="true" />
         );
 
         if (member.user) {

From f4937a81cf050995ab3053038e34ffa720289634 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Fri, 28 Feb 2020 12:56:53 +0100
Subject: [PATCH 1296/3235] Fix formatting

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/groups/GroupMemberTile.js | 3 ++-
 src/components/views/rooms/EntityTile.js       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 659cfb5a91..f99d5c768c 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -59,7 +59,8 @@ export default createReactClass({
         );
 
         const av = (
-            <BaseAvatar aria-hidden="true"
+            <BaseAvatar
+                aria-hidden="true"
                 name={this.props.member.displayname || this.props.member.userId}
                 idName={this.props.member.userId}
                 width={36} height={36}
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index e04e1d4965..b6d2bce785 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -175,7 +175,8 @@ const EntityTile = createReactClass({
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
-        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
+        const av = this.props.avatarJsx ||
+            <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
 
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         return (

From 1bcbd2a8be64057ac07755ef955c800e50ddd62a Mon Sep 17 00:00:00 2001
From: Aeris One <pingard.charles@gmail.com>
Date: Wed, 26 Feb 2020 18:34:05 +0000
Subject: [PATCH 1297/3235] Translated using Weblate (French)

Currently translated at 99.9% (2136 of 2137 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 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 23e574013d..32b6819533 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -234,7 +234,7 @@
     "Voice call": "Appel vocal",
     "VoIP conference finished.": "Téléconférence VoIP terminée.",
     "VoIP conference started.": "Téléconférence VoIP démarrée.",
-    "VoIP is unsupported": "Voix sur IP non supportée",
+    "VoIP is unsupported": "VoIP (Appels par Internet) n'est pas supportée",
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
@@ -2162,5 +2162,14 @@
     "Your homeserver does not support cross-signing.": "Votre serveur d’accueil ne prend pas en charge la signature croisée.",
     "Homeserver feature support:": "Prise en charge de la fonctionnalité par le serveur d’accueil :",
     "exists": "existant",
-    "Verification Requests": "Demandes de vérification"
+    "Verification Requests": "Demandes de vérification",
+    "Cancelling…": "Annulation…",
+    "Accepting…": "Acceptation…",
+    "Accepting …": "Acceptation…",
+    "Declining …": "Refus…",
+    "Your account is not secure": "Votre compte n'est pas sécurisé",
+    "Your password": "Votre mot de passe",
+    "This session, or the other session": "Cette session, ou l'autre session",
+    "The internet connection either session is using": "La connection internet de l'une des sessions",
+    "We recommend you change your password and recovery key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et la clé de récupération dans Paramètres dès que possible"
 }

From d0d5b10183dba2d67f2ca941a9fead1823bc32cd Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Thu, 27 Feb 2020 16:45:16 +0000
Subject: [PATCH 1298/3235] Translated using Weblate (German)

Currently translated at 75.5% (1613 of 2137 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 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ec7ce416fb..1d9a96ece0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -449,8 +449,8 @@
     "Featured Users:": "Hervorgehobene Benutzer:",
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
     "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
-    "AM": "a. m.",
-    "PM": "p. m.",
+    "AM": "a.m.",
+    "PM": "p.m.",
     "The maximum permitted number of widgets have already been added to this room.": "Die maximal erlaubte Anzahl an hinzufügbaren Widgets für diesen Raum wurde erreicht.",
     "Cannot add any more widgets": "Kann keine weiteren Widgets hinzufügen",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
@@ -1641,5 +1641,10 @@
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn Sie Ihr Passwort ändern, werden alle End-to-End-Verschlüsselungsschlüssel für alle Ihre Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richten Sie ein Schlüssel-Backup ein oder exportieren Sie Ihre Raumschlüssel aus einer anderen Sitzung, bevor Sie Ihr Passwort zurücksetzen.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Sie wurden von allen Sitzungen abgemeldet und erhalten keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melden Sie sich auf jedem Gerät erneut an.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisieren Sie diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Richten Sie für diese Sitzung eine Verschlüsselung ein, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert."
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Richten Sie für diese Sitzung eine Verschlüsselung ein, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
+    "Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?",
+    "Sign in to your Matrix account on <underlinedServerName />": "Melde dich bei deinem Matrix-Konto auf <underlinedServerName /> an",
+    "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
+    "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deinen Homeserver-Administrator für weitere Informationen."
 }

From d554ab72beaff6fd4d8a05e452b5e6db28339e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Thu, 27 Feb 2020 13:45:28 +0000
Subject: [PATCH 1299/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2137 of 2137 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 4b08fb8294..f27870a80e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -22,7 +22,7 @@
     "Active call (%(roomName)s)": "Hívás folyamatban (%(roomName)s)",
     "Add": "Hozzáad",
     "Add a topic": "Téma megadása",
-    "Admin": "Adminisztrátor",
+    "Admin": "Admin",
     "Admin Tools": "Admin. Eszközök",
     "No Microphones detected": "Nem található mikrofon",
     "No Webcams detected": "Nem található webkamera",

From 7d3223b68ec873a0d6937995a8deb0cec318b7a2 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 27 Feb 2020 19:05:04 +0000
Subject: [PATCH 1300/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2137 of 2137 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 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f27870a80e..26c7fb071f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -105,7 +105,7 @@
     "Ed25519 fingerprint": "Ed25519 ujjlenyomat",
     "Email": "E-mail",
     "Email address": "E-mail cím",
-    "Emoji": "Emoji",
+    "Emoji": "Emodzsi",
     "Enable Notifications": "Értesítések bekapcsolása",
     "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
     "End-to-end encryption information": "Ponttól pontig való titkosítási információk",
@@ -448,7 +448,7 @@
     "Create": "Létrehoz",
     "Featured Rooms:": "Kiemelt szobák:",
     "Featured Users:": "Kiemelt felhasználók:",
-    "Automatically replace plain text Emoji": "Egyszerű szöveg automatikus cseréje Emoji-ra",
+    "Automatically replace plain text Emoji": "Egyszerű szöveg automatikus cseréje Emodzsira",
     "Failed to upload image": "Kép feltöltése sikertelen",
     "Cannot add any more widgets": "Nem lehet több kisalkalmazást hozzáadni",
     "Publish this room to the public in %(domain)s's room directory?": "Publikálod a szobát a(z) %(domain)s szoba listájába?",
@@ -1072,13 +1072,13 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s és még valaki gépelnek …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s és %(lastPerson)s gépelnek …",
     "Render simple counters in room header": "Egyszerű számlálók a szoba fejlécében",
-    "Enable Emoji suggestions while typing": "Emojik felajánlása gépelés közben",
+    "Enable Emoji suggestions while typing": "Emodzsik felajánlása gépelés közben",
     "Show a placeholder for removed messages": "Helykitöltő mutatása a törölt szövegek helyett",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mutasd a be-, kilépéseket (meghívók/kirúgások/kitiltások üzeneteit nem érinti)",
     "Show avatar changes": "Profilkép változás mutatása",
     "Show display name changes": "Megjelenítési név változás mutatása",
     "Show avatars in user and room mentions": "Profilkép mutatása a felhasználó és szoba említéseknél",
-    "Enable big emoji in chat": "Nagy Emojik engedélyezése a csevegésekben",
+    "Enable big emoji in chat": "Nagy Emodzsik engedélyezése a csevegésekben",
     "Send typing notifications": "Gépelés visszajelzés küldése",
     "Enable Community Filter Panel": "Közösségi szűrő panel bekapcsolása",
     "Messages containing my username": "Üzenetek amik a nevemet tartalmazzák",
@@ -1197,7 +1197,7 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s megtiltotta a vendég felhasználóknak, hogy belépjenek a szobába.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a vendég felhasználók belépési jogait erre állította át: %(rule)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Szobák csoportosítása és szűrése egyedi címkékkel (frissíts, hogy a változások érvényre jussanak)",
-    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheted a felhasználót, ha megerősíted, hogy az alábbi emoji az ami megjelent a képernyőjén.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheted a felhasználót, ha megerősíted, hogy az alábbi emodzsi az ami megjelent a képernyőjén.",
     "Unable to find a supported verification method.": "Nem található támogatott hitelesítési eljárás.",
     "Dog": "Kutya",
     "Cat": "Macska",
@@ -1662,7 +1662,7 @@
     "To continue you need to accept the terms of this service.": "A folytatáshoz el kell fogadnod a felhasználási feltételeket.",
     "Document": "Dokumentum",
     "Community Autocomplete": "Közösség automatikus kiegészítése",
-    "Emoji Autocomplete": "Emoji automatikus kiegészítése",
+    "Emoji Autocomplete": "Emodzsi automatikus kiegészítése",
     "Notification Autocomplete": "Értesítés automatikus kiegészítése",
     "Room Autocomplete": "Szoba automatikus kiegészítése",
     "User Autocomplete": "Felhasználó automatikus kiegészítése",
@@ -1916,7 +1916,7 @@
     "Something went wrong trying to invite the users.": "Valami nem sikerült a felhasználók meghívásával.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezeket a felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
     "Recently Direct Messaged": "Nemrég küldött Közvetlen Üzenetek",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>.",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a Matrix címét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>.",
     "Verify User": "Felhasználó ellenőrzése",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
     "Start Verification": "Ellenőrzés elindítása",
@@ -1934,7 +1934,7 @@
     "Send a reply…": "Válasz küldése…",
     "Send a message…": "Üzenet küldése…",
     "Reject & Ignore user": "Felhasználó elutasítása és figyelmen kívül hagyása",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz valakit, akkor kérdezd meg a felhasználói nevét, áruld el neki a felhasználói nevedet (%(userId)s) vagy a <a>profil hivatkozásodat</a>.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz valakit, kérdezd meg a Matrix címét, vagy add meg neki a te Matrix címed (%(userId)s), vagy a <a>profil hivatkozásod</a>.",
     "Enter your account password to confirm the upgrade:": "A fejlesztés megerősítéséhez add meg a fiók jelszavadat:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Azonosítanod kell magad a szerveren a fejlesztés megerősítéséhez.",
     "Enter a passphrase": "Jelmondat bevitele",
@@ -1993,7 +1993,7 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "Sose küldjön titkosított üzeneteket ellenőrizetlen munkamenetekbe ebben a szobában ebből a munkamenetből",
     "Keep secret storage passphrase in memory for this session": "A biztonsági tároló jelmondatát ebben a munkamenetben tartsa a memóriában",
     "How fast should messages be downloaded.": "Milyen gyorsan legyenek az üzenetek letöltve.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Erősítsd meg, hogy az emoji-k alul mind a két eszközön ugyanazok ugyanabban a sorrendben:",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Erősítsd meg, hogy az emodzsik alul mind a két eszközön ugyanazok ugyanabban a sorrendben:",
     "Verify this device by confirming the following number appears on its screen.": "Ellenőrizd az eszközt azzal, hogy megerősíted az alábbi számok jelentek meg a képernyőjén.",
     "Waiting for %(displayName)s to verify…": "%(displayName)s felhasználóra várakozás az ellenőrzéshez…",
     "They match": "Egyeznek",
@@ -2068,7 +2068,7 @@
     "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s törölte az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
     "You cancelled verification. Start verification again from their profile.": "Törölted az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
     "Encryption enabled": "Titkosítás engedélyezve",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. Tudj meg többet és ellenőrizd ezt a felhasználót a profiljában.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. További információkért és ellenőrzéshez nyisd meg a felhasználó profilját.",
     "Encryption not enabled": "Titkosítás nincs engedélyezve",
     "The encryption used by this room isn't supported.": "A szobában használt titkosítás nem támogatott.",
     "Clear all data in this session?": "Minden adat törlése ebben a munkamenetben?",

From 567e882c327c96cbc7c921a62edd8f1515edc2e8 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 28 Feb 2020 12:04:27 +0000
Subject: [PATCH 1301/3235] Add missing click handler

---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 08d1e0638b..712f7d5f95 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -433,6 +433,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             <div>{authPrompt}</div>
             <DialogButtons
                 primaryButton={nextCaption}
+                onPrimaryButtonClick={this._onMigrateFormSubmit}
                 hasCancel={false}
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             >

From b7f5f5a95f4c43749e2e1bdaaa9f4e6d63c48a6d Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Wed, 26 Feb 2020 13:04:20 +0000
Subject: [PATCH 1302/3235] Translated using Weblate (Russian)

Currently translated at 84.1% (1797 of 2137 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 | 104 ++++++++++++++++++++++++++++++++-------
 1 file changed, 87 insertions(+), 17 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index abe39b2cbd..298025ea6a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -350,7 +350,7 @@
     "Please check your email to continue registration.": "Чтобы продолжить регистрацию, проверьте электронную почту.",
     "Token incorrect": "Неверный код проверки",
     "Please enter the code it contains:": "Введите полученный код:",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если не указать email, вы не сможете при необходимости сбросить свой пароль. Уверены?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Вы уверены?",
     "Error decrypting audio": "Ошибка расшифровки аудиозаписи",
     "Error decrypting image": "Ошибка расшифровки изображения",
     "Error decrypting video": "Ошибка расшифровки видео",
@@ -918,13 +918,13 @@
     "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>, чтобы продолжить использовать этот сервис.",
     "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?": "Вам необходимо зарегистрироваться для этого действия. Вы хотели бы зарегистрировать сейчас?",
     "Whether or not you're logged in (we don't record your username)": "Независимо от того, вошли вы или нет (мы не записываем ваше имя пользователя)",
     "Unable to load! Check your network connectivity and try again.": "Не удалось загрузить! Проверьте подключение к сети и попробуйте снова.",
     "Failed to invite users to the room:": "Не удалось пригласить пользователей в комнату:",
     "Upgrades a room to a new version": "Модернизирует комнату до новой версии",
     "Sets the room name": "Устанавливает название комнаты",
-    "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": "Принудительно отбрасывает текущую сессию исходящей группы в зашифрованной комнате",
     "%(senderDisplayName)s upgraded this room.": "%(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 к списку адресов комнаты.",
@@ -939,7 +939,7 @@
     "%(names)s and %(lastPerson)s are typing …": "%(names)s и %(lastPerson)s печатают…",
     "This homeserver has hit its Monthly Active User limit.": "Сервер достиг ежемесячного ограничения активных пользователей.",
     "This homeserver has exceeded one of its resource limits.": "Превышен один из лимитов на ресурсы сервера.",
-    "Unable to connect to Homeserver. Retrying...": "Невозможно подключиться к серверу. Выполняется повторная попытка...",
+    "Unable to connect to Homeserver. Retrying...": "Невозможно соединиться с домашним сервером. Повторить",
     "Unrecognised address": "Нераспознанный адрес",
     "You do not have permission to invite people to this room.": "У вас нет разрешения приглашать людей в эту комнату.",
     "User %(user_id)s may or may not exist": "Пользователя %(user_id)s не существует",
@@ -956,7 +956,7 @@
     "All-uppercase is almost as easy to guess as all-lowercase": "Всё прописными буквами так же легко угадывается как и всё строчными",
     "Reversed words aren't much harder to guess": "Угадать перевёрнутые слова не сильно труднее",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Предсказуемые замены типа «@» вместо «a» не особо помогают",
-    "Add another word or two. Uncommon words are better.": "Добавьте ещё слово или два. Лучше редких.",
+    "Add another word or two. Uncommon words are better.": "Добавить другое слово или два. Необычные слова лучше.",
     "Repeats like \"aaa\" are easy to guess": "Повторы типа \"ааа\" легко угадываемы",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Повторы типа «abcabcabc», лишь немного сложнее угадать, чем «abc»",
     "Sequences like abc or 6543 are easy to guess": "Последовательности типа abc или 6543 легко угадываемы",
@@ -1044,8 +1044,8 @@
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут залогиниться</b>.",
     "Join": "Присоединиться",
     "That doesn't look like a valid email address": "Это не похоже на адрес электронной почты",
-    "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>, чтобы продолжить использование службы.",
+    "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.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Пожалуйста, <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.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использование сервиса.",
     "User %(user_id)s does not exist": "Пользователя %(user_id)s не существует",
     "Enable Community Filter Panel": "Включить панель сообществ",
     "Prompt before sending invites to potentially invalid matrix IDs": "Подтверждать отправку приглашений на потенциально недействительные matrix ID",
@@ -1194,7 +1194,7 @@
     "Scissors": "Ножницы",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Общение с этим пользователем зашифровано сквозным шифрованием и недоступно третьим лицам.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Мы отправили вам сообщение для подтверждения адреса электронной почты. Пожалуйста выполните указания данные в сообщении и нажмите кнопку внизу.",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? Зашифрованные сообщения будут безвозвратно утеряны при отсутствии соответствующего резервного копирования ваших ключей.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? You will lose your encrypted messages if your keys are not backed up properly.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифрованные сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
     "Unable to load key backup status": "Не удалось получить статус резервного копирования для ключей шифрования",
     "Restore from Backup": "Восстановить из резервной копии",
@@ -1229,7 +1229,7 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Используете ли вы функцию \"хлебные крошки\" (аватары над списком комнат) или нет",
     "A conference call could not be started because the integrations server is not available": "Конференц-вызов не может быть запущен, так как сервер интеграции недоступен",
     "Replying With Files": "Ответ файлами",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "В настоящее время нет возможности ответить файлом. Хотели бы вы загрузить этот файл без ответа?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "На данный момент не возможнo ответить с файлом. Хотите загрузить этот файл без ответа?",
     "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не был загружен.",
     "The server does not support the room version specified.": "Сервер не поддерживает указанную версию комнаты.",
     "Name or Matrix ID": "Имя или Matrix ID",
@@ -1481,9 +1481,9 @@
     "Unexpected error resolving identity server configuration": "Неопределённая ошибка при разборе параметра сервера идентификации",
     "Use lowercase letters, numbers, dashes and underscores only": "Используйте только строчные буквы, цифры, тире и подчеркивания",
     "Cannot reach identity server": "Не удаётся связаться с сервером идентификации",
-    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете зарегистрироваться, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
-    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете сбросить пароль, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
-    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете войти в систему, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
     "<a>Log in</a> to your new account.": "<a>Войти</a> в вашу новую учётную запись.",
     "You can now close this window or <a>log in</a> to your new account.": "Вы можете закрыть это окно или <a>войти</a> в вашу новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
@@ -1552,8 +1552,8 @@
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Кроме того, вы можете попытаться использовать общедоступный сервер по адресу <code> turn.matrix.org </code>, но это не будет настолько надежным, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.",
     "Sends a message as plain text, without interpreting it as markdown": "Посылает сообщение в виде простого текста, не интерпретируя его как разметку",
     "Use an identity server": "Используйте сервер идентификации",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Используйте идентификационный сервер для приглашения по электронной почте. Нажмите «Продолжить», чтобы использовать сервер идентификации по умолчанию (%(defaultIdentityServerName)s) или измените его в настройках.",
-    "Use an identity server to invite by email. Manage in Settings.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в меню Настройки.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Используйте сервер идентификации что бы пригласить по электронной почте Нажмите Продолжить, чтобы использовать стандартный сервер идентифицации(%(defaultIdentityServerName)s) или изменить в Настройках.",
+    "Use an identity server to invite by email. Manage in Settings.": "Используйте сервер идентификации что бы пригласить по электронной почте Управление в настройках.",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Разрешить резервный вызов поддержки сервера turn.matrix.org, когда ваш домашний сервер не предлагает такой поддержки (ваш IP-адрес будет использоваться во время вызова)",
     "Add Email Address": "Добавить адрес Email",
     "Add Phone Number": "Добавить номер телефона",
@@ -1661,8 +1661,8 @@
     "This client does not support end-to-end encryption.": "Этот клиент не поддерживает сквозное шифрование.",
     "Messages in this room are not end-to-end encrypted.": "Сообщения в этой комнате не шифруются сквозным шифрованием.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Пожалуйста, <newIssueLink> создайте новую проблему/вопрос </newIssueLink> на GitHub, чтобы мы могли расследовать эту ошибку.",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default> Используйте значение по умолчанию (%(defaultIdentityServerName)s) </default> или  управляйте в <settings> Настройках</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в <settings>Настройки</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте сервер идентификации что бы пригласить по электронной почте <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте сервер идентификации что бы пригласить по электронной почте Manage in <settings>Settings</settings>.",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",
@@ -1746,5 +1746,75 @@
     "Server or user ID to ignore": "ID сервера или пользователя для игнорирования",
     "Subscribed lists": "Подписанные списки",
     "Subscribe": "Подписать",
-    "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь"
+    "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь",
+    "If you cancel now, you won't complete verifying the other user.": "Если вы сейчас отмените, у вас не будет завершена проверка других пользователей.",
+    "If you cancel now, you won't complete your secret storage operation.": "Если вы сейчас отмените, вы не завершите операцию секретного хранения.",
+    "Cancel entering passphrase?": "Отмена ввода пароль?",
+    "Setting up keys": "Настройка ключей",
+    "Encryption upgrade available": "Доступно обновление шифрования",
+    "Set up encryption": "Настройка шифрования",
+    "Double check that your server supports the room version chosen and try again.": "Дважды проверьте, что ваш сервер поддерживает версию комнаты и попробуйте снова.",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ВНИМАНИЕ:Сессия уже подтверждена, но ключи НЕ совпадают!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(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\". Это может означать, что ваши сообщения перехватываются!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Ключ подписи, который вы предоставили, соответствует ключу подписи, который вы получили от %(userId)s's сессии %(deviceId)s. Сессия отмечена как подтверждена.",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s добавил %(addedAddresses)s и %(count)s другие адреса к этой комнате",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s удалил %(removedAddresses)s и %(count)s другие адреса из этой комнаты",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s удалил %(countRemoved)s и добавил %(countAdded)s адреса к этой комнате",
+    "%(senderName)s placed a voice call.": "%(senderName)s сделал голосовой вызов.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s сделал голосовой вызов. (не поддерживается этим браузером)",
+    "%(senderName)s placed a video call.": "%(senderName)s сделал видео вызов.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s сделал видео вызов. (не поддерживается этим браузером)",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s удалил правило, запрещающее пользователям соответствовать %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removed the rule banning rooms matching %(glob)s",
+    "a few seconds ago": "несколько секунд назад",
+    "about a minute ago": "около минуты назад",
+    "%(num)s minutes ago": "%(num)s минут назад",
+    "about an hour ago": "около часа назад",
+    "%(num)s hours ago": "%(num)s часов назад ",
+    "about a day ago": "около суток назад",
+    "%(num)s days ago": "%(num)s дней назад",
+    "a few seconds from now": "несколько секунд назад",
+    "about a minute from now": "примерно через минуту",
+    "%(num)s minutes from now": "%(num)s минут спустя",
+    "about an hour from now": "примерно через час",
+    "%(num)s hours from now": "%(num)s часов спустя",
+    "about a day from now": "примерно через день",
+    "%(num)s days from now": "%(num)s дней спустя",
+    "Show a presence dot next to DMs in the room list": "Показать точку присутствия рядом с DMs в списке комнат",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Включение перекрестной подписи для проверки в расчете на одного пользователя, а не за сессию (в разработке)",
+    "Enable local event indexing and E2EE search (requires restart)": "Включить локальное индексирование событий и E2EE поиска (требуется перезапуск)",
+    "Show info about bridges in room settings": "Показать информацию о мостах в настройках комнаты",
+    "Show padlocks on invite only rooms": "Показывать замки по приглашению только комнаты",
+    "Enable message search in encrypted rooms": "Включить поиск сообщений в зашифрованных комнатах",
+    "Keep secret storage passphrase in memory for this session": "Храните в памяти секретную парольную фразу для этого сеанса",
+    "How fast should messages be downloaded.": "Как быстро сообщения должны быть загружены.",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Это список пользователей/серверов, которые вы заблокировали - не покидайте комнату!",
+    "Verify this session by completing one of the following:": "Проверить эту сессию, выполнив одно из следующих действий:",
+    "Scan this unique code": "Отсканируйте этот уникальный код",
+    "or": "или",
+    "Compare unique emoji": "Сравнитe уникальныe эмодзи",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств.",
+    "Start": "Начать",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Подтвердите, что смайлики, приведенные ниже, отображаются на обоих устройствах в одном и том же порядке:",
+    "Verify this device by confirming the following number appears on its screen.": "Проверьте это устройство, подтвердив, что на его экране появляется следующий номер.",
+    "Waiting for %(displayName)s to verify…": "Ждите %(displayName)s, чтобы проверить...",
+    "Cancelling…": "Отменяется...",
+    "They match": "Они совпадают",
+    "They don't match": "Они не совпадают",
+    "To be secure, do this in person or use a trusted way to communicate.": "Чтобы быть в безопасности, делайте это лично или используйте надежный способ связи.",
+    "Lock": "Заблокировать",
+    "Verify yourself & others to keep your chats safe": "Проверить себя и других, чтобы сохранить ваши чаты безопасными",
+    "Other users may not trust it": "Другие пользователи могут не доверять этому",
+    "Upgrade": "Обновление",
+    "Verify": "Проверить",
+    "Later": "Позже",
+    "Review": "Обзор",
+    "Decline (%(counter)s)": "Сокращение (%(counter)s)",
+    "This bridge was provisioned by <user />.": "Этот мост был подготовлен пользователем <user />.",
+    "This bridge is managed by <user />.": "Этот мост управляется <user />.",
+    "Workspace: %(networkName)s": "Рабочая область: %(networkName)s",
+    "Channel: %(channelName)s": "Канал: %(channelName)s",
+    "Show less": "Показать меньше",
+    "Show more": "Показать больше",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved."
 }

From b1543c414182ff97cf69572d1cc85cae2b579af4 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 28 Feb 2020 12:32:14 +0000
Subject: [PATCH 1303/3235] Regen i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 79b045dd34..ed042d7f96 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2064,9 +2064,9 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
+    "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
     "Restore": "Restore",
-    "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",

From 337c8232313fff63af71381e08bc11f4f7658b0f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 28 Feb 2020 12:08:32 +0000
Subject: [PATCH 1304/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2138 of 2138 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 26c7fb071f..47f87967bb 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2167,5 +2167,8 @@
     "Your password": "A jelszavad",
     "This session, or the other session": "Ez vagy másik munkamenet",
     "The internet connection either session is using": "Az egyik munkamenet internet kapcsolata",
-    "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban"
+    "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban",
+    "Order rooms by name": "Szobák rendezése név szerint",
+    "Show rooms with unread notifications first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
+    "Show shortcuts to recently viewed rooms above the room list": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett"
 }

From d3c7a7ff1fe9f8715d050c8c11ccc3ae23cd5f34 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 28 Feb 2020 13:47:12 +0000
Subject: [PATCH 1305/3235] Use latest backup status directly rather than via
 state

This uses the latest backup status we just retrieved by returning from the
lookup path (instead of using it indirectly via state). This is important
because state updates are batched, so we can't rely on the value to be updated
immediately like we were.

Fixes https://github.com/vector-im/riot-web/issues/12562
---
 .../secretstorage/CreateSecretStorageDialog.js        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 712f7d5f95..c42eb7d8dc 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -117,6 +117,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             backupInfo,
             backupSigStatus,
         });
+
+        return {
+            backupInfo,
+            backupSigStatus,
+        };
     }
 
     async _queryKeyUploadAuth() {
@@ -269,13 +274,13 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
         const { finished } = Modal.createTrackedDialog(
             'Restore Backup', '', RestoreKeyBackupDialog, {showSummary: false}, null,
-            /* priority = */ false, /* static = */ true,
+            /* priority = */ false, /* static = */ false,
         );
 
         await finished;
-        await this._fetchBackupInfo();
+        const { backupSigStatus } = await this._fetchBackupInfo();
         if (
-            this.state.backupSigStatus.usable &&
+            backupSigStatus.usable &&
             this.state.canUploadKeysWithPasswordOnly &&
             this.state.accountPassword
         ) {

From 4db1d04764e554e5234230dfcd821487558da666 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 28 Feb 2020 13:52:24 +0000
Subject: [PATCH 1306/3235] Fix warning about uncontrolled vs. controlled state

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

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index c42eb7d8dc..49b103ecf7 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -83,7 +83,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // does the server offer a UI auth flow with just m.login.password
             // for /keys/device_signing/upload?
             canUploadKeysWithPasswordOnly: null,
-            accountPassword: props.accountPassword,
+            accountPassword: props.accountPassword || "",
             accountPasswordCorrect: null,
             // status of the key backup toggle switch
             useKeyBackup: true,

From fee04d2b8306a20f875df7e81c410ab6ca0baa6e Mon Sep 17 00:00:00 2001
From: Ji-Hyeon Gim <potatogim@potatogim.net>
Date: Fri, 28 Feb 2020 13:16:20 +0000
Subject: [PATCH 1307/3235] Translated using Weblate (Korean)

Currently translated at 83.3% (1781 of 2138 strings)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 1e3eced284..4271864216 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -1776,5 +1776,28 @@
     "Decline (%(counter)s)": "거절 (%(counter)s)",
     "Connecting to integration manager...": "통합 관리자로 연결 중...",
     "Cannot connect to integration manager": "통합 관리자에 연결할 수 없음",
-    "The integration manager is offline or it cannot reach your homeserver.": "통합 관리자가 오프라인이거나 당신의 홈서버에서 접근할 수 없습니다."
+    "The integration manager is offline or it cannot reach your homeserver.": "통합 관리자가 오프라인이거나 당신의 홈서버에서 접근할 수 없습니다.",
+    "The version of Riot": "Riot의 버전",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "터치가 기본 입력 방식인 기기에서 Riot을 사용하는지 여부",
+    "Whether you're using Riot as an installed Progressive Web App": "Riot을 설치형 프로그레시브 웹 앱으로 사용하는지 여부",
+    "Your user agent": "사용자 에이전트",
+    "The information being sent to us to help make Riot better includes:": "Riot을 개선하기 위해 당사에 전송되는 정보에는 다음과 같은 것들이 포함됩니다:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "이 방에는 알 수 없는 세션들이 있습니다: 검증 없이 진행하면 누군가 당신의 전화를 도청할 수도 있습니다.",
+    "If you cancel now, you won't complete verifying the other user.": "지금 취소하면 다른 사용자 확인이 완료될 수 없습니다.",
+    "If you cancel now, you won't complete verifying your other session.": "지금 취소하면 당신의 다른 세션을 검증할 수 없습니다.",
+    "If you cancel now, you won't complete your secret storage operation.": "지금 취소하면 보안 저장 작업을 완료할 수 없습니다.",
+    "Cancel entering passphrase?": "암호 입력을 취소하시겠습니까?",
+    "Setting up keys": "키 설정",
+    "Verify this session": "이 세션 검증",
+    "Encryption upgrade available": "암호화 업그레이드 가능",
+    "Set up encryption": "암호화 설정",
+    "Unverified session": "검증되지 않은 세션",
+    "Error upgrading room": "방 업그레이드 오류",
+    "Double check that your server supports the room version chosen and try again.": "서버가 선택한 방 버전을 지원하는지 확인한 뒤에 다시 시도해주세요.",
+    "Verifies a user, session, and pubkey tuple": "사용자, 세션, 공개키 튜플을 검증합니다",
+    "Unknown (user, session) pair:": "알 수 없는 (사용자, 세션) 쌍:",
+    "Session already verified!": "이미 검증된 세션입니다!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "경고: 이미 검증된 세션이지만 키가 일치하지 않습니다!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "경고: 키 검증 실패! 제공된 키인 \"%(fingerprint)s\"가 사용자 %(userId)s와 %(deviceId)s 세션의 서명 키인 \"%(fprint)s\"와 일치하지 않습니다. 이는 통신이 탈취되고 있는 중일 수도 있다는 뜻입니다!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다."
 }

From 20b66e7088f4ecb27778481f17bc00c9c659d22a Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 28 Feb 2020 16:50:26 +0000
Subject: [PATCH 1308/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2131 of 2138 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 546b6f0766..9cb7191288 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2146,5 +2146,21 @@
     "You declined": "Hodhët poshtë",
     "%(name)s declined": "%(name)s hodhi poshtë",
     "accepting …": "po pranohet …",
-    "declining …": "po hidhet poshtë …"
+    "declining …": "po hidhet poshtë …",
+    "Order rooms by name": "Renditini dhomat sipas emrash",
+    "Show rooms with unread notifications first": "Shfaq së pari dhoma me njoftime të palexuara",
+    "Show shortcuts to recently viewed rooms above the room list": "Shfaq te lista e dhomave shkurtore për te dhoma të para së fundi",
+    "Cancelling…": "Po anulohet…",
+    "Your homeserver does not support cross-signing.": "Shërbyesi juaj Home nuk mbulon <em>cross-signing</em>.",
+    "Homeserver feature support:": "Mbulim veçorish nga shërbyesi Home:",
+    "exists": "ekziston",
+    "Accepting…": "Po pranohet…",
+    "Accepting …": "Po pranohet …",
+    "Declining …": "Po hidhet poshtë …",
+    "Verification Requests": "Kërkesa Verifikimi",
+    "Your account is not secure": "Llogaria juaj s’është e sigurt",
+    "Your password": "Fjalëkalimi juaj",
+    "This session, or the other session": "Ky sesion, ose sesioni tjetër",
+    "The internet connection either session is using": "Lidhja internet që përdor cilido nga dy sesionet",
+    "We recommend you change your password and recovery key in Settings immediately": "Këshillojmë të ndryshoni menjëherë te Rregullimet fjalëkalimin tuaj dhe kyçin e rimarrjeve"
 }

From 8520310e6e3e97a554c737952d9649d0be53e2b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 28 Feb 2020 11:42:16 -0700
Subject: [PATCH 1309/3235] Proof of concept for custom theme adding

For https://github.com/vector-im/riot-web/issues/12517
---
 .../tabs/user/GeneralUserSettingsTab.js       | 52 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  5 ++
 src/settings/Settings.js                      |  6 +++
 3 files changed, 63 insertions(+)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 304bb6449f..7af9aae146 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -61,6 +61,8 @@ export default class GeneralUserSettingsTab extends React.Component {
             emails: [],
             msisdns: [],
             ...this._calculateThemeState(),
+            customThemeUrl: "",
+            customThemeError: "",
         };
 
         this.dispatcherRef = dis.register(this._onAction);
@@ -274,6 +276,33 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
+    _onAddCustomTheme = async () => {
+        let currentThemes = SettingsStore.getValue("custom_themes");
+        if (!currentThemes) currentThemes = [];
+        currentThemes = currentThemes.map(c => c); // cheap clone
+
+        try {
+            const r = await fetch(this.state.customThemeUrl);
+            const themeInfo = await r.json();
+            if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
+                console.log(themeInfo);
+                this.setState({customThemeError: _t("Invalid theme schema.")});
+                return;
+            }
+            currentThemes.push(themeInfo);
+        } catch (e) {
+            console.error(e);
+            this.setState({customThemeError: _t("Error downloading theme information.")});
+        }
+
+        await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
+        this.setState({customThemeUrl: "", customThemeError: ""});
+    };
+
+    _onCustomThemeChange = (e) => {
+        this.setState({customThemeUrl: e.target.value});
+    };
+
     _renderProfileSection() {
         return (
             <div className="mx_SettingsTab_section">
@@ -368,6 +397,28 @@ export default class GeneralUserSettingsTab extends React.Component {
                 />
             </div>;
         }
+
+        let customThemeForm;
+        if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
+            customThemeForm = (
+                <form onSubmit={this._onAddCustomTheme}>
+                    <Field
+                        label={_t("Custom theme URL")}
+                        type='text'
+                        id='mx_GeneralUserSettingsTab_customThemeInput'
+                        autoComplete="off"
+                        onChange={this._onCustomThemeChange}
+                        value={this.state.customThemeUrl}
+                    />
+                    <div className='error'>{this.state.customThemeError}</div>
+                    <AccessibleButton
+                        onClick={this._onAddCustomTheme}
+                        type="submit" kind="primary_sm"
+                    >{_t("Add theme")}</AccessibleButton>
+                </form>
+            );
+        }
+
         return (
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
@@ -380,6 +431,7 @@ export default class GeneralUserSettingsTab extends React.Component {
                         return <option key={theme} value={theme}>{text}</option>;
                     })}
                 </Field>
+                {customThemeForm}
                 <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba48f7cd37..6984e21f06 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -379,6 +379,7 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
+    "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
@@ -702,12 +703,16 @@
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
+    "Invalid theme schema.": "Invalid theme schema.",
+    "Error downloading theme information.": "Error downloading theme information.",
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
+    "Custom theme URL": "Custom theme URL",
+    "Add theme": "Add theme",
     "Theme": "Theme",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",
     "Account management": "Account management",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b77fb392e9..ba6df47a04 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -134,6 +134,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_custom_themes": {
+        isFeature: true,
+        displayName: _td("Support adding custom themes"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],

From 6269780f4b943ce4216faa6d29771dde3a599804 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 28 Feb 2020 13:57:56 -0700
Subject: [PATCH 1310/3235] Suggest the server's results as lower quality

This is a quick win for fixing https://github.com/vector-im/riot-web/issues/12488 but might not be a long-term solution. Idea is to see how this feels and go from there, which may mean scoring the results again to filter them in or altering the debounce timers.
---
 src/components/views/dialogs/InviteDialog.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e8c39b6d5a..b1ad4a34d0 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -906,24 +906,24 @@ export default class InviteDialog extends React.PureComponent {
         // Mix in the server results if we have any, but only if we're searching. We track the additional
         // members separately because we want to filter sourceMembers but trust the mixin arrays to have
         // the right members in them.
-        let additionalMembers = [];
+        let priorityAdditionalMembers = []; // Shows up before our own suggestions, higher quality
+        let otherAdditionalMembers = []; // Shows up after our own suggestions, lower quality
         const hasMixins = this.state.serverResultsMixin || this.state.threepidResultsMixin;
         if (this.state.filterText && hasMixins && kind === 'suggestions') {
             // We don't want to duplicate members though, so just exclude anyone we've already seen.
             const notAlreadyExists = (u: Member): boolean => {
                 return !sourceMembers.some(m => m.userId === u.userId)
-                    && !additionalMembers.some(m => m.userId === u.userId);
+                    && !priorityAdditionalMembers.some(m => m.userId === u.userId)
+                    && !otherAdditionalMembers.some(m => m.userId === u.userId);
             };
 
-            const uniqueServerResults = this.state.serverResultsMixin.filter(notAlreadyExists);
-            additionalMembers = additionalMembers.concat(...uniqueServerResults);
-
-            const uniqueThreepidResults = this.state.threepidResultsMixin.filter(notAlreadyExists);
-            additionalMembers = additionalMembers.concat(...uniqueThreepidResults);
+            otherAdditionalMembers = this.state.serverResultsMixin.filter(notAlreadyExists);
+            priorityAdditionalMembers = this.state.threepidResultsMixin.filter(notAlreadyExists);
         }
+        const hasAdditionalMembers = priorityAdditionalMembers.length > 0 || otherAdditionalMembers.length > 0;
 
         // Hide the section if there's nothing to filter by
-        if (sourceMembers.length === 0 && additionalMembers.length === 0) return null;
+        if (sourceMembers.length === 0 && !hasAdditionalMembers) return null;
 
         // Do some simple filtering on the input before going much further. If we get no results, say so.
         if (this.state.filterText) {
@@ -931,7 +931,7 @@ export default class InviteDialog extends React.PureComponent {
             sourceMembers = sourceMembers
                 .filter(m => m.user.name.toLowerCase().includes(filterBy) || m.userId.toLowerCase().includes(filterBy));
 
-            if (sourceMembers.length === 0 && additionalMembers.length === 0) {
+            if (sourceMembers.length === 0 && !hasAdditionalMembers) {
                 return (
                     <div className='mx_InviteDialog_section'>
                         <h3>{sectionName}</h3>
@@ -943,7 +943,7 @@ export default class InviteDialog extends React.PureComponent {
 
         // Now we mix in the additional members. Again, we presume these have already been filtered. We
         // also assume they are more relevant than our suggestions and prepend them to the list.
-        sourceMembers = [...additionalMembers, ...sourceMembers];
+        sourceMembers = [...priorityAdditionalMembers, ...sourceMembers, ...otherAdditionalMembers];
 
         // If we're going to hide one member behind 'show more', just use up the space of the button
         // with the member's tile instead.

From 7cfaa63aac337462f24aa5ddd1f473fa2ab7cc9a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 28 Feb 2020 14:08:43 -0700
Subject: [PATCH 1311/3235] Fix the last char of people's names being cut off
 in the invite dialog

If someone named "TravisR" was being searched for with just "Travis", the last R in their name would be cut off because of the highlighting. Entering "TravisR" would restore it. Likewise, searching for "vis" would have done the same thing.
---
 src/components/views/dialogs/InviteDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e8c39b6d5a..a01c4cc481 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -219,7 +219,7 @@ class DMRoomTile extends React.PureComponent {
         }
 
         // Push any text we missed (end of text)
-        if (i < (str.length - 1)) {
+        if (i < str.length) {
             result.push(<span key={i + 'end'}>{str.substring(i)}</span>);
         }
 

From 87e717cd397b651c6fef6a6d0a2ab3cc04b6f5df Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 28 Feb 2020 23:12:10 +0000
Subject: [PATCH 1312/3235] Fix Quote on search results page

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 14 ++++++++++----
 src/components/structures/RoomView.js   | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 448cce933d..bc11e66d2c 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -559,13 +559,19 @@ export default createReactClass({
             case 'view_user_info':
                 this._viewUser(payload.userId, payload.subAction);
                 break;
-            case 'view_room':
+            case 'view_room': {
                 // Takes either a room ID or room alias: if switching to a room the client is already
                 // known to be in (eg. user clicks on a room in the recents panel), supply the ID
                 // If the user is clicking on a room in the context of the alias being presented
                 // to them, supply the room alias. If both are supplied, the room ID will be ignored.
-                this._viewRoom(payload);
+                const promise = this._viewRoom(payload);
+                if (payload.deferred_action) {
+                    promise.then(() => {
+                        dis.dispatch(payload.deferred_action);
+                    });
+                }
                 break;
+            }
             case 'view_prev_room':
                 this._viewNextRoom(-1);
                 break;
@@ -862,7 +868,7 @@ export default createReactClass({
             waitFor = this.firstSyncPromise.promise;
         }
 
-        waitFor.then(() => {
+        return waitFor.then(() => {
             let presentedId = roomInfo.room_alias || roomInfo.room_id;
             const room = MatrixClientPeg.get().getRoom(roomInfo.room_id);
             if (room) {
@@ -885,7 +891,7 @@ export default createReactClass({
                 presentedId += "/" + roomInfo.event_id;
             }
             newState.ready = true;
-            this.setState(newState, ()=>{
+            this.setState(newState, () => {
                 this.notifyNewScreen('room/' + presentedId);
             });
         });
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index edd916697a..36e30343e4 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -614,6 +614,22 @@ export default createReactClass({
                     this.onCancelSearchClick();
                 }
                 break;
+            case 'quote':
+                if (this.state.searchResults) {
+                    const roomId = payload.event.getRoomId();
+                    if (roomId === this.state.roomId) {
+                        this.onCancelSearchClick();
+                    }
+
+                    setImmediate(() => {
+                        dis.dispatch({
+                            action: 'view_room',
+                            room_id: roomId,
+                            deferred_action: payload,
+                        });
+                    });
+                }
+                break;
         }
     },
 

From 7cb514fccee44af497ef8a1e01a6f36339ae0a37 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 28 Feb 2020 18:57:06 +0000
Subject: [PATCH 1313/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2139 of 2139 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 47f87967bb..4b9b6e3639 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2170,5 +2170,8 @@
     "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban",
     "Order rooms by name": "Szobák rendezése név szerint",
     "Show rooms with unread notifications first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
-    "Show shortcuts to recently viewed rooms above the room list": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett"
+    "Show shortcuts to recently viewed rooms above the room list": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
+    "Sign In or Create Account": "Belépés vagy Fiók Készítés",
+    "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat vagy készíts egy újat.",
+    "Create Account": "Fiók létrehozása"
 }

From 9ff053c5a9fd48c0516f21183f0621114f5ae062 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 00:09:19 +0000
Subject: [PATCH 1314/3235] Fix MELS not breaking on day boundaries regression

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index d0e35e1c2b..dd47028f8e 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -955,6 +955,9 @@ class MemberGrouper {
     }
 
     shouldGroup(ev) {
+        if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) {
+            return false;
+        }
         return isMembershipChange(ev);
     }
 

From 86a1327259da5c1ed573bd4a3fd29c3acb5ef018 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 00:31:56 +0000
Subject: [PATCH 1315/3235] don't show "This alias is available to use" if an
 alias is not provided

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/RoomAliasField.js | 1 +
 src/components/views/elements/Validation.js     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 007bd07a47..0139a9596b 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -92,6 +92,7 @@ export default class RoomAliasField extends React.PureComponent {
                 invalid: () => _t("Please provide a room alias"),
             }, {
                 key: "taken",
+                skip: ({value}) => !value,
                 test: async ({value}) => {
                     if (!value) {
                         return true;
diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.js
index 31363b87c8..3454ab3aec 100644
--- a/src/components/views/elements/Validation.js
+++ b/src/components/views/elements/Validation.js
@@ -51,9 +51,16 @@ export default function withValidation({ description, rules }) {
                 if (!rule.key || !rule.test) {
                     continue;
                 }
+
+                const data = { value, allowEmpty };
+
+                if (rule.skip && rule.skip.call(this, data)) {
+                    continue;
+                }
+
                 // We're setting `this` to whichever component holds the validation
                 // function. That allows rules to access the state of the component.
-                const ruleValid = await rule.test.call(this, { value, allowEmpty });
+                const ruleValid = await rule.test.call(this, data);
                 valid = valid && ruleValid;
                 if (ruleValid && rule.valid) {
                     // If the rule's result is valid and has text to show for

From 3e85f65d9e7a5b3a64091e061ff1137a9b58fcab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 00:36:01 +0000
Subject: [PATCH 1316/3235] Also skip alias availability check if alias looks
 invalid

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/RoomAliasField.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 0139a9596b..06e608b14c 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -38,6 +38,13 @@ export default class RoomAliasField extends React.PureComponent {
         return `#${localpart}:${this.props.domain}`;
     }
 
+    _isValid(value) {
+        const fullAlias = this._asFullAlias(value);
+        // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
+        return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
+            encodeURI(fullAlias) === fullAlias;
+    }
+
     render() {
         const Field = sdk.getComponent('views.elements.Field');
         const poundSign = (<span>#</span>);
@@ -80,10 +87,7 @@ export default class RoomAliasField extends React.PureComponent {
                     if (!value) {
                         return true;
                     }
-                    const fullAlias = this._asFullAlias(value);
-                    // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
-                    return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
-                        encodeURI(fullAlias) === fullAlias;
+                    return this._isValid(value);
                 },
                 invalid: () => _t("Some characters not allowed"),
             }, {
@@ -92,7 +96,7 @@ export default class RoomAliasField extends React.PureComponent {
                 invalid: () => _t("Please provide a room alias"),
             }, {
                 key: "taken",
-                skip: ({value}) => !value,
+                skip: ({value}) => !value || !this._isValid(value),
                 test: async ({value}) => {
                     if (!value) {
                         return true;

From 3a7454a52f4d39bea227be8184b16e15b68a4249 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 28 Feb 2020 18:37:52 -0600
Subject: [PATCH 1317/3235] Use !== instead

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

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 023272cef1..20217548b7 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -586,7 +586,7 @@ const LoggedInView = createReactClass({
             />;
         } else if (this.props.showCookieBar &&
             this.props.config.piwik &&
-            navigator.doNotTrack != 1
+            navigator.doNotTrack !== "1"
         ) {
             const policyUrl = this.props.config.piwik.policyUrl || null;
             topBar = <CookieBar policyUrl={policyUrl} />;

From 8aaab0a3baa7efd812df05a401c1c7138fdd97ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 01:00:57 +0000
Subject: [PATCH 1318/3235] refactor to add Validation::final

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/RoomAliasField.js | 14 +++++---------
 src/components/views/elements/Validation.js     |  6 ++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 06e608b14c..b38047cd3b 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -38,13 +38,6 @@ export default class RoomAliasField extends React.PureComponent {
         return `#${localpart}:${this.props.domain}`;
     }
 
-    _isValid(value) {
-        const fullAlias = this._asFullAlias(value);
-        // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
-        return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
-            encodeURI(fullAlias) === fullAlias;
-    }
-
     render() {
         const Field = sdk.getComponent('views.elements.Field');
         const poundSign = (<span>#</span>);
@@ -87,7 +80,10 @@ export default class RoomAliasField extends React.PureComponent {
                     if (!value) {
                         return true;
                     }
-                    return this._isValid(value);
+                    const fullAlias = this._asFullAlias(value);
+                    // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
+                    return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
+                        encodeURI(fullAlias) === fullAlias;
                 },
                 invalid: () => _t("Some characters not allowed"),
             }, {
@@ -96,7 +92,7 @@ export default class RoomAliasField extends React.PureComponent {
                 invalid: () => _t("Please provide a room alias"),
             }, {
                 key: "taken",
-                skip: ({value}) => !value || !this._isValid(value),
+                final: true,
                 test: async ({value}) => {
                     if (!value) {
                         return true;
diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.js
index 3454ab3aec..2be526a3c3 100644
--- a/src/components/views/elements/Validation.js
+++ b/src/components/views/elements/Validation.js
@@ -28,9 +28,11 @@ import classNames from 'classnames';
  *     An array of rules describing how to check to input value. Each rule in an object
  *     and may have the following properties:
  *     - `key`: A unique ID for the rule. Required.
+ *     - `skip`: A function used to determine whether the rule should even be evaluated.
  *     - `test`: A function used to determine the rule's current validity. Required.
  *     - `valid`: Function returning text to show when the rule is valid. Only shown if set.
  *     - `invalid`: Function returning text to show when the rule is invalid. Only shown if set.
+ *     - `final`: A Boolean if true states that this rule will only be considered if all rules before it returned valid.
  * @returns {Function}
  *     A validation function that takes in the current input value and returns
  *     the overall validity and a feedback UI that can be rendered for more detail.
@@ -52,6 +54,10 @@ export default function withValidation({ description, rules }) {
                     continue;
                 }
 
+                if (!valid && rule.final) {
+                    continue;
+                }
+
                 const data = { value, allowEmpty };
 
                 if (rule.skip && rule.skip.call(this, data)) {

From a5e664410f9b45d727b2958c11ae4671564ea8a6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 01:29:52 +0000
Subject: [PATCH 1319/3235] Add /whois SlashCommand to open UserInfo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.js        | 20 ++++++++++++++++++++
 src/i18n/strings/en_EN.json |  1 +
 2 files changed, 21 insertions(+)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index b39b8fb9ac..d306978f78 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -893,6 +893,26 @@ export const CommandMap = {
         },
         category: CommandCategories.advanced,
     }),
+
+    whois: new Command({
+        name: "whois",
+        description: _td("Displays information about a user"),
+        args: '<user-id>',
+        runFn: function(roomId, userId) {
+            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
+                return reject(this.getUsage());
+            }
+
+            const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
+
+            dis.dispatch({
+                action: 'view_user',
+                member: member || {userId},
+            });
+            return success();
+        },
+        category: CommandCategories.advanced,
+    }),
 };
 /* eslint-enable babel/no-invalid-this */
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba48f7cd37..ab18c58e90 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -204,6 +204,7 @@
     "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
     "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
     "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
+    "Displays information about a user": "Displays information about a user",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",

From 4996139b1a933cb4baf180ce05de106e907eef0a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 01:56:02 +0000
Subject: [PATCH 1320/3235] word-break in pills and wrap the background
 correctly

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

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 73f0be291f..5066ee10f3 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -13,6 +13,11 @@
     padding-left: 5px;
 }
 
+a.mx_Pill {
+    word-break: break-all;
+    display: inline;
+}
+
 /* More specific to override `.markdown-body a` text-decoration */
 .mx_EventTile_content .markdown-body a.mx_Pill {
     text-decoration: none;

From 1e260565c26068d4d69e577a7c7bd38eb4ebe154 Mon Sep 17 00:00:00 2001
From: Michal Stanke <michal@stanke.cz>
Date: Sat, 29 Feb 2020 21:49:33 +0000
Subject: [PATCH 1321/3235] Translated using Weblate (Czech)

Currently translated at 99.1% (2120 of 2139 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 1ef1979a9e..3b1d7416b1 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1,13 +1,13 @@
 {
     "Close": "Zavřít",
     "Favourites": "Oblíbené",
-    "Filter room members": "Filtrovat členy místnosti",
+    "Filter room members": "Najít člena místnosti",
     "Historical": "Historické",
     "Home": "Úvod",
     "Jump to first unread message.": "Přeskočit na první nepřečtenou zprávu.",
     "Logout": "Odhlásit se",
     "Low priority": "Nízká priorita",
-    "Notifications": "Upozornění",
+    "Notifications": "Oznámení",
     "Rooms": "Místnosti",
     "Search": "Hledání",
     "Settings": "Nastavení",
@@ -36,12 +36,12 @@
     "There are no visible files in this room": "V této místnosti nejsou žádné viditelné soubory",
     "Create new room": "Založit novou místnost",
     "Room directory": "Adresář místností",
-    "Start chat": "Začít chat",
+    "Start chat": "Zahájit konverzaci",
     "Options": "Volby",
     "Register": "Zaregistrovat",
     "Cancel": "Storno",
     "Error": "Chyba",
-    "Favourite": "V oblíbených",
+    "Favourite": "Oblíbené",
     "Mute": "Ztlumit",
     "Continue": "Pokračovat",
     "Failed to change password. Is your password correct?": "Nepodařilo se změnit heslo. Zadáváte své heslo správně?",
@@ -51,13 +51,13 @@
     "OK": "OK",
     "Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s",
     "Dismiss": "Zahodit",
-    "powered by Matrix": "poháněno Matrixem",
-    "Custom Server Options": "Vlastní serverové volby",
+    "powered by Matrix": "používá protokol Matrix",
+    "Custom Server Options": "Vlastní nastavení serveru",
     "Add a widget": "Přidat widget",
     "Accept": "Přijmout",
-    "%(targetName)s accepted an invitation.": "%(targetName)s přijal/a pozvání.",
+    "%(targetName)s accepted an invitation.": "Uživatel %(targetName)s přijal pozvání.",
     "Account": "Účet",
-    "Access Token:": "Přístupový žeton:",
+    "Access Token:": "Přístupový token:",
     "Add": "Přidat",
     "Add a topic": "Přidat téma",
     "Admin": "Správce",
@@ -67,7 +67,7 @@
     "Default Device": "Výchozí zařízení",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Advanced": "Pokročilé",
+    "Advanced": "Rozšířené",
     "Algorithm": "Algoritmus",
     "Always show message timestamps": "Vždy zobrazovat časové značky zpráv",
     "Authentication": "Ověření",
@@ -79,25 +79,25 @@
     "Are you sure you want to reject the invitation?": "Určitě chcete odmítnout pozvání?",
     "Attachment": "Příloha",
     "Autoplay GIFs and videos": "Automaticky přehrávat GIFy a videa",
-    "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.": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zdali je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
-    "Anyone who knows the room's link, apart from guests": "Kdokoliv, kdo má odkaz na místnost, kromě hostů",
-    "Anyone who knows the room's link, including guests": "Kdokoliv, kdo má odkaz na místnost, a to i hosté",
+    "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.": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zda je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
+    "Anyone who knows the room's link, apart from guests": "Kdokoliv s odkazem na místnost, kromě hostů",
+    "Anyone who knows the room's link, including guests": "Kdokoliv s odkazem na místnost, včetně hostů",
     "Banned users": "Vykázaní uživatelé",
     "Ban": "Vykázat",
     "Bans user with given id": "Vykáže uživatele s daným id",
     "Cannot add any more widgets": "Nelze přidat žádné další widgety",
     "Change Password": "Změnit heslo",
-    "%(senderName)s changed their profile picture.": "%(senderName)s změnil/a svůj profilový obrázek.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil/a název místnosti na %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil/a název místnosti.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na „%(topic)s“.",
+    "%(senderName)s changed their profile picture.": "Uživatel %(senderName)s změnil svůj profilový obrázek.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Uživatel %(senderDisplayName)s změnil název místnosti na %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "Uživatel %(senderDisplayName)s odstranil název místnosti.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Uživatel %(senderDisplayName)s změnil téma na „%(topic)s“.",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Command error": "Chyba příkazu",
     "Commands": "Příkazy",
     "Confirm password": "Potvrďte heslo",
     "Could not connect to the integration server": "Nepodařilo se spojit se začleňovacím serverem",
     "Create Room": "Vytvořit místnost",
-    "Cryptography": "Kryptografie",
+    "Cryptography": "Šifrování",
     "Current password": "Současné heslo",
     "Custom": "Vlastní",
     "Custom level": "Vlastní úroveň",
@@ -110,18 +110,18 @@
     "Default": "Výchozí",
     "Device ID": "ID zařízení",
     "device id: ": "id zařízení: ",
-    "Direct chats": "Přímé chaty",
-    "Disable Notifications": "Vypnout upozornění",
+    "Direct chats": "Přímé zprávy",
+    "Disable Notifications": "Vypnout oznámení",
     "Disinvite": "Odvolat pozvání",
     "Download %(text)s": "Stáhnout %(text)s",
     "Drop File Here": "Přetáhněte soubor sem",
     "Edit": "Upravit",
     "Email": "E-mail",
     "Email address": "E-mailová adresa",
-    "Emoji": "Emodži",
-    "Enable automatic language detection for syntax highlighting": "Zapnout kvůli zvýrazňování syntaxe automatické rozpoznávání jazyka",
-    "Enable Notifications": "Zapnout upozornění",
-    "%(senderName)s ended the call.": "%(senderName)s ukončil/a hovor.",
+    "Emoji": "Emoji",
+    "Enable automatic language detection for syntax highlighting": "Zapnout automatické rozpoznávání jazyků pro zvýrazňování syntaxe",
+    "Enable Notifications": "Zapnout oznámení",
+    "%(senderName)s ended the call.": "Uživatel %(senderName)s ukončil hovor.",
     "End-to-end encryption information": "Informace o end-to-end šifrování",
     "Enter passphrase": "Zadejte heslo",
     "Error decrypting attachment": "Chyba při dešifrování přílohy",
@@ -129,7 +129,7 @@
     "Event information": "Informace o události",
     "Existing Call": "Probíhající hovor",
     "Export": "Exportovat",
-    "Export E2E room keys": "Exportovat E2E klíče místnosti",
+    "Export E2E room keys": "Exportovat end-to-end klíče místnosti",
     "Failed to ban user": "Nepodařilo se vykázat uživatele",
     "Failed to join room": "Vstup do místnosti se nezdařil",
     "Failed to kick": "Vykopnutí se nezdařilo",
@@ -147,39 +147,39 @@
     "Forget room": "Zapomenout místnost",
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
     "and %(count)s others...|other": "a %(count)s další...",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget upravil/a %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget odstranil/a %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget přidal/a %(senderName)s",
-    "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emotikony",
+    "%(widgetName)s widget modified by %(senderName)s": "Uživatel %(senderName)s upravil widget %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Uživatel %(senderName)s odstranil widget %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Uživatel  %(senderName)s přidal widget %(widgetName)s",
+    "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emoji",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
-    "%(senderName)s answered the call.": "%(senderName)s přijal/a hovor.",
-    "Click to mute audio": "Kliknutím ztlumíte zvuk",
-    "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste kliknul/a na zaslaný odkaz",
+    "%(senderName)s answered the call.": "Uživatel %(senderName)s přijal hovor.",
+    "Click to mute audio": "Klepněte pro vypnutí zvuku",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste klepli na odkaz v e-mailové zprávě",
     "Guests cannot join this room even if explicitly invited.": "Hosté nemohou vstoupit do této místnosti, i když jsou přímo pozváni.",
     "Homeserver is": "Domovský server je",
     "Identity Server is": "Server identity je",
-    "I have verified my email address": "Ověřil/a jsem svoji e-mailovou adresu",
+    "I have verified my email address": "Ověřil/a jsem svou e-mailovou adresu",
     "Import": "Importovat",
-    "Import E2E room keys": "Importovat E2E klíče místností",
+    "Import E2E room keys": "Importovat end-to-end klíče místností",
     "Incoming call from %(name)s": "Příchozí hovor od %(name)s",
     "Incoming video call from %(name)s": "Příchozí videohovor od %(name)s",
     "Incoming voice call from %(name)s": "Příchozí hlasový hovor od %(name)s",
     "Incorrect username and/or password.": "Nesprávné uživatelské jméno nebo heslo.",
     "Incorrect verification code": "Nesprávný ověřovací kód",
     "Invalid Email Address": "Neplatná e-mailová adresa",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval/a %(targetName)s.",
+    "%(senderName)s invited %(targetName)s.": "Uživatel %(senderName)s pozval uživatele %(targetName)s.",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
     "Join Room": "Vstoupit do místnosti",
-    "%(targetName)s joined the room.": "%(targetName)s vstoupil/a do místnosti.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopnul/a %(targetName)s.",
+    "%(targetName)s joined the room.": "Uživatel %(targetName)s vstoupil do místnosti.",
+    "%(senderName)s kicked %(targetName)s.": "Uživatel %(senderName)s vykopl uživatele %(targetName)s.",
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
-    "Last seen": "Naposledy viděn/a",
+    "Last seen": "Naposledy aktivní",
     "Leave room": "Odejít z místnosti",
     "Local addresses for this room:": "Místní adresy této místnosti:",
     "Moderator": "Moderátor",
-    "Name": "Jméno",
+    "Name": "Název",
     "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (např. #neco:%(localDomain)s)",
     "New passwords don't match": "Nová hesla se neshodují",
     "New passwords must match each other.": "Nová hesla se musí shodovat.",
@@ -198,7 +198,7 @@
     "Passwords can't be empty": "Hesla nemohou být prázdná",
     "Permissions": "Oprávnění",
     "Phone": "Telefon",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s změnil/a úroveň oprávnění o %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Uživatel %(senderName)s změnil úroveň oprávnění o %(powerLevelDiffText)s.",
     "Define the power level of a user": "Stanovte úroveň oprávnění uživatele",
     "Failed to change power level": "Nepodařilo se změnit úroveň oprávnění",
     "Power level must be positive integer.": "Úroveň oprávnění musí být kladné celé číslo.",
@@ -207,8 +207,8 @@
     "Alias (optional)": "Alias (nepovinný)",
     "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
     "Return to login screen": "Vrátit k přihlašovací obrazovce",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot není oprávněn posílat vám upozornění – zkontrolujte prosím nastavení svého prohlížeče",
-    "Riot was not given permission to send notifications - please try again": "Riot nebyl oprávněn k posílání upozornění – zkuste to prosím znovu",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot není oprávněn posílat vám oznámení – zkontrolujte prosím nastavení svého prohlížeče",
+    "Riot was not given permission to send notifications - please try again": "Riot nebyl oprávněn k posílání oznámení – zkuste to prosím znovu",
     "riot-web version:": "verze riot-web:",
     "Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
     "Room Colour": "Barva místnosti",
@@ -218,32 +218,32 @@
     "Scroll to bottom of page": "Přejít na konec stránky",
     "Send anyway": "Přesto poslat",
     "Send Reset Email": "Poslat resetovací e-mail",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
+    "%(senderDisplayName)s sent an image.": "Uživatel %(senderDisplayName)s poslal obrázek.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Uživatel %(senderName)s pozval uživatele %(targetDisplayName)s ke vstupu do místnosti.",
     "Server error": "Chyba serveru",
     "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se něco pokazilo.",
     "Session ID": "ID sezení",
-    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil/a profilový obrázek.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil/a zobrazované jméno na %(displayName)s.",
+    "%(senderName)s set a profile picture.": "Uživatel %(senderName)s si nastavil profilový obrázek.",
+    "%(senderName)s set their display name to %(displayName)s.": "Uživatel %(senderName)s si změnil zobrazované jméno na %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat čas v 12hodinovém formátu (např. 2:30 odp.)",
     "Sign in": "Přihlásit",
     "Sign out": "Odhlásit",
     "%(count)s of your messages have not been sent.|other": "Některé z vašich zpráv nebyly odeslány.",
     "Someone": "Někdo",
-    "Start a chat": "Začít chat",
+    "Start a chat": "Zahájit konverzaci",
     "Start authentication": "Začít ověření",
     "Submit": "Odeslat",
     "Success": "Úspěch",
     "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
-    "This email address is already in use": "Tato e-mailová adresa je již používaná",
+    "This email address is already in use": "Tato e-mailová adresa je již požívána",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
     "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
     "This room is not recognised.": "Tato místnost nebyla rozpoznána.",
     "VoIP is unsupported": "VoIP není podporován",
     "Warning!": "Varování!",
-    "Who can access this room?": "Kdo má přístup k této místnosti?",
+    "Who can access this room?": "Kdo má přístup do této místnosti?",
     "Who can read history?": "Kdo může číst historii?",
     "You are not in this room.": "Nejste v této místnosti.",
     "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
@@ -253,33 +253,33 @@
     "Online": "Online",
     "Offline": "Offline",
     "Check for update": "Zkontrolovat aktualizace",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal/a pozvánku pro %(displayName)s.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "Uživatel %(targetName)s přijal pozvání pro %(displayName)s.",
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal/a %(targetName)s.",
-    "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>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nebezpečné scripty</a>.",
-    "Click here to fix": "Klikněte zde pro opravu",
-    "Click to mute video": "Klikněte pro zakázání videa",
-    "click to reveal": "klikněte pro odhalení",
-    "Click to unmute video": "Klikněte pro povolení videa",
-    "Click to unmute audio": "Klikněte pro povolení zvuku",
+    "%(senderName)s banned %(targetName)s.": "Uživatel %(senderName)s vykázal uživatele %(targetName)s.",
+    "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>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nezabezpečené skripty</a>.",
+    "Click here to fix": "Pro opravu klepněte zde",
+    "Click to mute video": "Klepněte pro zakázání videa",
+    "click to reveal": "pro odhlení klepněte",
+    "Click to unmute video": "Klepněte pro povolení videa",
+    "Click to unmute audio": "Klepněte pro povolení zvuku",
     "Displays action": "Zobrazí akci",
     "Ed25519 fingerprint": "Ed25519 otisk",
     "Fill screen": "Vyplnit obrazovku",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "This doesn't appear to be a valid email address": "Tato e-mailová adresa se zdá být neplatná",
-    "This phone number is already in use": "Toto číslo se již používá",
+    "This phone number is already in use": "Toto telefonní číslo je již používáno",
     "This room is not accessible by remote Matrix servers": "Tato místnost není přístupná vzdáleným Matrix serverům",
     "To use it, just wait for autocomplete results to load and tab through them.": "Použijte tak, že vyčkáte na načtení našeptávaných výsledků a ty pak projdete tabulátorem.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nemáte práva k zobrazení zprávy v daném časovém úseku.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úseku nenalezena.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Pokusili jste se načíst bod v časové ose místnosti, ale pro zobrazení zpráv z daného časového úseku nemáte oprávnění.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Pokusili jste se načíst bod v časové ose místnosti, ale nepodařilo se ho najít.",
     "Unable to add email address": "Nepodařilo se přidat e-mailovou adresu",
     "Unable to create widget.": "Nepodařilo se vytvořit widget.",
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
     "Unban": "Přijmout zpět",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal/a zpět %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "Uživatel %(senderName)s přijal zpět uživatele %(targetName)s.",
     "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
-    "Unable to enable Notifications": "Nepodařilo se povolit upozornění",
+    "Unable to enable Notifications": "Nepodařilo se povolit oznámení",
     "unencrypted": "nešifrované",
     "unknown caller": "neznámý volající",
     "unknown device": "neznámé zařízení",
@@ -287,14 +287,14 @@
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
     "Unrecognised room alias:": "Nerozpoznaný alias místnosti:",
-    "Uploading %(filename)s and %(count)s others|zero": "Nahrávám %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Nahrávám %(filename)s a %(count)s další",
-    "Uploading %(filename)s and %(count)s others|other": "Nahrávám %(filename)s a %(count)s další",
+    "Uploading %(filename)s and %(count)s others|zero": "Nahrávání souboru %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Nahrávání souboru %(filename)s a %(count)s dalších",
+    "Uploading %(filename)s and %(count)s others|other": "Nahrávání souboru %(filename)s a %(count)s dalších",
     "Upload Failed": "Nahrávání selhalo",
     "Upload file": "Nahrát soubor",
     "Upload new:": "Nahrát nový:",
     "Usage": "Použití",
-    "Use compact timeline layout": "Použít kompaktní rozvržení timeline",
+    "Use compact timeline layout": "Použít kompaktní rozvržení časové osy",
     "User ID": "ID uživatele",
     "Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
     "Users": "Uživatelé",
@@ -323,7 +323,7 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Vaše e-mailová adresa zřejmě nepatří k žádnému Matrix ID na tomto domovském serveru.",
     "Failed to invite": "Pozvání se nezdařilo",
     "Failed to invite the following users to the %(roomName)s room:": "Do místnosti %(roomName)s se nepodařilo pozvat následující uživatele:",
-    "You need to be logged in.": "Musíte být přihlášen/a.",
+    "You need to be logged in.": "Musíte být přihlášeni.",
     "You are now ignoring %(userId)s": "Nyní ignorujete %(userId)s",
     "You are no longer ignoring %(userId)s": "Už neignorujete %(userId)s",
     "Add rooms to this community": "Přidat místnosti do této skupiny",
@@ -333,11 +333,11 @@
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
-    "%(targetName)s left the room.": "%(targetName)s opustil/a místnost.",
+    "%(targetName)s left the room.": "Uživatel %(targetName)s opustil místnost.",
     "You are already in a call.": "Již máte probíhající hovor.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s požádal/a o VoIP konferenci.",
-    "%(senderName)s removed their profile picture.": "%(senderName)s odstranil/a svůj profilový obrázek.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s odmítl/a pozvání.",
+    "%(senderName)s requested a VoIP conference.": "Uživatel %(senderName)s požádal o VoIP konferenci.",
+    "%(senderName)s removed their profile picture.": "Uživatel %(senderName)s odstranil svůj profilový obrázek.",
+    "%(targetName)s rejected the invitation.": "Uživatel %(targetName)s odmítl pozvání.",
     "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
@@ -348,29 +348,29 @@
     "Admin Tools": "Nástroje pro správce",
     "No pinned messages.": "Žádné připíchnuté zprávy.",
     "Pinned Messages": "Připíchnuté zprávy",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil/a svoje zobrazované jméno (%(oldDisplayName)s).",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s odvolal/a pozvánku pro %(targetName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich pozvání.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům, a to od chvíle jejich vstupu do místnosti.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou všem členům.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s učinil/a budoucí historii místnosti viditelnou komukoliv.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s změnil/a připíchnuté zprávy této místnosti.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Uživatel %(senderName)s odstranil své zobrazované jméno (%(oldDisplayName)s).",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "Uživatel %(senderName)s zrušil pozvání pro uživatele %(targetName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich pozvání.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich vstupu.",
+    "%(senderName)s made future room history visible to all room members.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy.",
+    "%(senderName)s made future room history visible to anyone.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv pro kohokoliv.",
+    "%(senderName)s changed the pinned messages for the room.": "Uživatel %(senderName)s změnil připíchnuté zprávy této místnosti.",
     "Authentication check failed: incorrect password?": "Kontrola ověření selhala: špatné heslo?",
     "You need to be able to invite users to do that.": "Pro tuto akci musíte mít právo zvát uživatele.",
     "Delete Widget": "Smazat widget",
     "Error decrypting image": "Chyba při dešifrování obrázku",
     "Error decrypting video": "Chyba při dešifrování videa",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstranil/a avatar místnosti.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s změnil/a avatar místnosti na <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "Uživatel %(senderDisplayName)s odstranil avatar místnosti.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "Uživatel %(senderDisplayName)s změnil avatar místnosti na <img/>",
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
     "Removed or unknown message type": "Zpráva odstraněna nebo neznámého typu",
-    "Message removed by %(userId)s": "Zprávu odstranil/a %(userId)s",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Smazáním widgetu jej odstraníte všem uživatelům v této místnosti. Určitě chcete tento widget smazat?",
+    "Message removed by %(userId)s": "Zprávu odstranil uživatel %(userId)s",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Smazáním widgetu ho odstraníte všem uživatelům v této místnosti. Opravdu chcete tento widget smazat?",
     "The maximum permitted number of widgets have already been added to this room.": "V této místnosti již bylo dosaženo limitu pro maximální počet widgetů.",
     "Drop file here to upload": "Přetažením sem nahrajete",
     "Example": "Příklad",
-    "Create Community": "Vytvořit komunitu",
+    "Create Community": "Vytvořit skupinu",
     "Community Name": "Název skupiny",
     "Community ID": "ID skupiny",
     "example": "příklad",
@@ -407,12 +407,12 @@
     "Failed to remove user from community": "Nepodařilo se odebrat uživatele ze skupiny",
     "Failed to remove room from community": "Nepodařilo se odebrat místnost ze skupiny",
     "Failed to remove '%(roomName)s' from %(groupId)s": "'%(roomName)s' se nepodařilo odebrat z %(groupId)s",
-    "Failed to update community": "Nepodařilo se aktualizovat komunitu",
+    "Failed to update community": "Skupinu se nepodařilo aktualizovat",
     "Failed to load %(groupId)s": "Nepodařilo se načíst %(groupId)s",
     "Search failed": "Vyhledávání selhalo",
     "Failed to fetch avatar URL": "Nepodařilo se získat adresu avataru",
     "Error decrypting audio": "Chyba při dešifrování zvuku",
-    "Banned by %(displayName)s": "Vykázán/a uživatelem %(displayName)s",
+    "Banned by %(displayName)s": "Vstup byl zakázán uživatelem %(displayName)s",
     "Privileged Users": "Privilegovaní uživatelé",
     "No users have specific privileges in this room": "Žádní uživatelé v této místnosti nemají zvláštní privilegia",
     "Publish this room to the public in %(domain)s's room directory?": "Zapsat tuto místnost do veřejného adresáře místností na %(domain)s?",
@@ -420,21 +420,21 @@
     "Invalid community ID": "Neplatné ID skupiny",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID skupiny",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID skupiny (např. +neco:%(localDomain)s)",
-    "%(senderName)s sent an image": "%(senderName)s poslal/a obrázek",
-    "%(senderName)s sent a video": "%(senderName)s poslal/a video",
-    "%(senderName)s uploaded a file": "%(senderName)s nahrál/a soubor",
+    "%(senderName)s sent an image": "Uživatel %(senderName)s poslal obrázek",
+    "%(senderName)s sent a video": "Uživatel %(senderName)s poslal video",
+    "%(senderName)s uploaded a file": "Uživatel %(senderName)s nahrál soubor",
     "Disinvite this user?": "Odvolat pozvání tohoto uživatele?",
     "Kick this user?": "Vykopnout tohoto uživatele?",
     "Unban this user?": "Přijmout zpět tohoto uživatele?",
     "Ban this user?": "Vykázat tohoto uživatele?",
-    "Community Invites": "Komunitní pozvánky",
+    "Community Invites": "Pozvánky do skupin",
     "Members only (since the point in time of selecting this option)": "Pouze členové (od chvíle vybrání této volby)",
     "Members only (since they were invited)": "Pouze členové (od chvíle jejich pozvání)",
     "Members only (since they joined)": "Pouze členové (od chvíle jejich vstupu)",
-    "You have <a>disabled</a> URL previews by default.": "<a>Vypnul/a</a> jste automatické náhledy webových adres.",
-    "You have <a>enabled</a> URL previews by default.": "<a>Zapnul/a</a> jste automatické náhledy webových adres.",
+    "You have <a>disabled</a> URL previews by default.": "<a>Vypnuli</a> jste automatické náhledy webových adres.",
+    "You have <a>enabled</a> URL previews by default.": "<a>Zapnuli</a> jste automatické náhledy webových adres.",
     "URL Previews": "Náhledy webových adres",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil/a avatar místnosti %(roomName)s",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Uživatel %(senderDisplayName)s změnil avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
     "Message removed": "Zpráva odstraněna",
     "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail",
@@ -444,7 +444,7 @@
     "Passphrase must not be empty": "Heslo nesmí být prázdné",
     "Export room keys": "Exportovat klíče místnosti",
     "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.": "Tento proces vám umožňuje exportovat do souboru klíče ke zprávám, které jste dostali v šifrovaných místnostech. Když pak tento soubor importujete do jiného Matrix klienta, všechny tyto zprávy bude možné opět dešifrovat.",
-    "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.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měl/a do kolonky níže zadat heslo, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadaného hesla.",
+    "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.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měli do kolonky níže zadat heslo, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadaného hesla.",
     "Confirm passphrase": "Potvrďte heslo",
     "Import room keys": "Importovat klíče místnosti",
     "Call Timeout": "Časový limit hovoru",
@@ -470,25 +470,25 @@
     "Idle for %(duration)s": "Nečinný po dobu %(duration)s",
     "Offline for %(duration)s": "Offline po dobu %(duration)s",
     "Unknown for %(duration)s": "Neznámý po dobu %(duration)s",
-    "Flair": "Vztah ke komunitě",
-    "Showing flair for these communities:": "Místnost má vztah k těmto komunitám:",
-    "This room is not showing flair for any communities": "Tato místnost nemá vztah k žádné komunitě",
+    "Flair": "Příslušnost ke skupině",
+    "Showing flair for these communities:": "Místnost přísluší do těchto skupin:",
+    "This room is not showing flair for any communities": "Tato místnost nemá příslušnost k žádné skupině",
     "URL previews are enabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres povolené pro členy této místnosti.",
     "URL previews are disabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres zakázané pro členy této místnosti.",
     "Invalid file%(extra)s": "Neplatný soubor%(extra)s",
     "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?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s  %(integrationsUrl)s. Chcete pokračovat?",
     "To continue, please enter your password.": "Aby jste mohli pokračovat, zadejte prosím své heslo.",
-    "Please check your email to continue registration.": "Prosím zkontrolujte své emaily, abyste mohli pokračovat v registraci.",
+    "Please check your email to continue registration.": "Pro pokračování v registraci prosím zkontrolujte své e-maily.",
     "Token incorrect": "Neplatný token",
     "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s byla odeslána textová zpráva",
     "Please enter the code it contains:": "Prosím zadejte kód z této zprávy:",
     "Sign in with": "Přihlásit se pomocí",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Pokud nezadáte vaši emailovou adresu, nebude možné obnovit vaše heslo. Opravdu chcete pokračovat?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Pokud nezadáte svou e-mailovou adresu, nebude možné obnovit vaše heslo. Opravdu chcete pokračovat?",
     "Remove from community": "Odstranit ze skupiny",
     "Disinvite this user from community?": "Zrušit pozvání tohoto uživatele?",
     "Remove this user from community?": "Odstranit tohoto uživatele ze skupiny?",
     "Failed to withdraw invitation": "Stažení pozvání selhalo",
-    "Filter community members": "Filtrovat členy skupiny",
+    "Filter community members": "Najít člena skupiny",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Opravdu chcete odstranit místnost '%(roomName)s' z %(groupId)s?",
     "Removing a room from the community will also remove it from the community page.": "Pokud odstraníte místnost ze skupiny, odstraní se i odkaz do místnosti ze stránky skupiny.",
     "Something went wrong!": "Něco se nepodařilo!",
@@ -496,9 +496,9 @@
     "Visibility in Room List": "Zobrazení v Seznamu Místností",
     "Visible to everyone": "Zobrazení pro každého",
     "Only visible to community members": "Zobrazuje se pouze pro členy skupiny",
-    "Filter community rooms": "Filtrovat místnosti skupiny",
+    "Filter community rooms": "Najít místnost ve skupině",
     "Something went wrong when trying to get your communities.": "Při pokusu o nahrání vašich skupin se něco pokazilo.",
-    "Display your community flair in rooms configured to show it.": "Zobrazit vaše vztahy ke komunitám v místnostech.",
+    "Display your community flair in rooms configured to show it.": "Zobrazovat příslušnost ke skupině v místnostech, které to mají nastaveno.",
     "You're not currently a member of any communities.": "V současnosti nejste členem žádné skupiny.",
     "Unknown Address": "Neznámá adresa",
     "Unblacklist": "Odblokovat",
@@ -546,10 +546,10 @@
     "were kicked %(count)s times|one": "byli vyhozeni",
     "was kicked %(count)s times|other": "byl %(count)s krát vyhozen",
     "was kicked %(count)s times|one": "byl vyhozen",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili jméno",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi změnili jméno",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát změnili jméno",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)ssi změnili jméno",
+    "%(severalUsers)schanged their name %(count)s times|other": "Uživatelé %(severalUsers)s si %(count)s krát změnili jméno",
+    "%(severalUsers)schanged their name %(count)s times|one": "Uživatelé %(severalUsers)s si změnili jméno",
+    "%(oneUser)schanged their name %(count)s times|other": "Uživatel %(oneUser)s si %(count)s krát změnil jméno",
+    "%(oneUser)schanged their name %(count)s times|one": "Uživatel %(oneUser)s si změnil jméno",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili avatary",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)ssi změnili avatary",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssi %(count)s krát změnil avatar",
@@ -562,7 +562,7 @@
     "Add User": "Přidat uživatele",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Identifikátor místnosti",
-    "email address": "emailová adresa",
+    "email address": "e-mailová adresa",
     "Try using one of the following valid address types: %(validTypesList)s.": "Zkuste použít jeden z následujících správných tvarů adres: %(validTypesList)s.",
     "You have entered an invalid address.": "Zadali jste neplatnou adresu.",
     "Confirm Removal": "Potvrdit odstranění",
@@ -578,21 +578,21 @@
     "Encryption key request": "Žádost o šifrovací klíč",
     "Unable to restore session": "Nelze obnovit relaci",
     "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.": "Pokud jste se v minulosti již přihlásili s novější verzi programu Riot, vaše relace nemusí být kompatibilní s touto verzí. Zavřete prosím toto okno a přihlaste se znovu pomocí nové verze.",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Prosím, zkontrolujte si email a klikněte na odkaz ve zprávě, kterou jsme vám zaslali. V případě, že jste tak již učinili, klikněte na tlačítko Pokračovat.",
-    "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení emailem.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Zkontrolujte svou e-mailovou schránku a klepněte na odkaz ve zprávě, kterou jsme vám poslali. V případě, že jste to už udělali, klepněte na tlačítko Pokračovat.",
+    "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení e-mailem.",
     "Skip": "Přeskočit",
     "Username not available": "Uživatelské jméno už není dostupné",
     "An error occurred: %(error_string)s": "Vyskytla se chyba: %(error_string)s",
     "Username available": "Dostupné uživatelské jméno",
     "To get started, please pick a username!": "Začněte tím, že si zvolíte uživatelské jméno!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domácím serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
-    "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud již účet Matrix máte, můžete se ihned <a>Přihlásit</a>.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domovském serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud už účet v síti Matrix máte, můžete se ihned <a>Přihlásit</a>.",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil",
-    "Private Chat": "Soukromý chat",
-    "Public Chat": "Veřejný chat",
-    "You must <a>register</a> to use this functionality": "Musíte být <a>zaregistrovaný</a> pokud chcete využívat této funkce",
-    "You must join the room to see its files": "Musíte vstoupit do místnosti pokud chcete soubory zobrazit",
-    "<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 kód vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu představte skupinu novým členům anebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Můžete používat i HTML 'img' značky\n</p>\n",
+    "Private Chat": "Soukromá konverzace",
+    "Public Chat": "Veřejná konverzace",
+    "You must <a>register</a> to use this functionality": "Pro využívání této funkce se <a>zaregistrujte</a>",
+    "You must join the room to see its files": "Pro zobrazení souborů musíte do místnosti vstoupit",
+    "<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 kód stránky vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu nejprve představte skupinu novým členům nebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Pro vložení obrázků můžete používat i HTML značky 'img'\n</p>\n",
     "Add rooms to the community summary": "Přidat místnosti do přehledu skupiny",
     "Which rooms would you like to add to this summary?": "Které místnosti se přejete přidat do tohoto přehledu?",
     "Add to summary": "Přidat do přehledu",
@@ -609,13 +609,13 @@
     "Unable to accept invite": "Nelze přijmout pozvání",
     "Unable to reject invite": "Nelze odmítnout pozvání",
     "Community Settings": "Nastavení skupiny",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tyto místnosti se zobrazují všem členům na stránce skupiny. Členové skupiny mohou vstoupit do místnosti kliknutím.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tyto místnosti se zobrazují všem členům na stránce skupiny. Členové skupiny mohou vstoupit do místnosti klepnutím.",
     "Featured Rooms:": "Hlavní místnosti:",
     "Featured Users:": "Významní uživatelé:",
-    "%(inviter)s has invited you to join this community": "%(inviter)s vás pozval ke vstupu do této místnosti",
+    "%(inviter)s has invited you to join this community": "Uživatel %(inviter)s vás pozval do této skupiny",
     "You are an administrator of this community": "Jste správcem této skupiny",
     "You are a member of this community": "Jste členem této skupiny",
-    "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!": "Vaše skupina nemá vyplněný dlouhý popis, který je součástí HTML stránky skupiny a která se zobrazuje jejím členům.<br />Kliknutím zde otevřete nastavení, kde ho můžete doplnit!",
+    "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!": "Vaše skupina nemá vyplněný dlouhý popis, který je součástí HTML stránky skupiny a která se zobrazuje jejím členům.<br />Klepnutím zde otevřete nastavení, kde ho můžete doplnit!",
     "Long Description (HTML)": "Dlouhý popis (HTML)",
     "Description": "Popis",
     "Community %(groupId)s not found": "Skupina %(groupId)s nenalezena",
@@ -624,16 +624,16 @@
     "Your Communities": "Vaše skupiny",
     "Error whilst fetching joined communities": "Při získávání vašich skupin se vyskytla chyba",
     "Create a new community": "Vytvořit novou skupinu",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak váš prostor ve světe Matrix.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak svůj prostor ve světe Matrix.",
     "You have no visible notifications": "Nejsou dostupná žádná oznámení",
     "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušeno.",
     "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
     "Active call": "Aktivní hovor",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
     "Room": "Místnost",
-    "Failed to load timeline position": "Nepodařilo se načíst pozici na časové ose",
-    "Light theme": "Světlý motiv",
-    "Dark theme": "Tmavý motiv",
+    "Failed to load timeline position": "Bod v časové ose se nepodařilo načíst",
+    "Light theme": "Světlý vzhled",
+    "Dark theme": "Tmavý vzhled",
     "Analytics": "Analytické údaje",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot sbírá anonymní analytické údaje, které nám umožňují aplikaci dále zlepšovat.",
     "Labs": "Experimentální funkce",
@@ -642,9 +642,9 @@
     "No media permissions": "Žádná oprávnění k médiím",
     "You may need to manually permit Riot to access your microphone/webcam": "Je možné, že budete potřebovat manuálně povolit Riot přístup k mikrofonu/webkameře",
     "Profile": "Profil",
-    "The email address linked to your account must be entered.": "Musíte zadat emailovou adresu spojenou s vaším účtem.",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Na adresu %(emailAddress)s byla odeslána zpráva. Potom, co přejdete na odkaz z této zprávy, klikněte níže.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Upozornění: právě se přihlašujete na server %(hs)s, a nikoliv na server matrix.org.",
+    "The email address linked to your account must be entered.": "Musíte zadat e-mailovou adresu spojenou s vaším účtem.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Na adresu %(emailAddress)s byla odeslána zpráva. Potom, co přejdete na odkaz z této zprávy, klepněte níže.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Právě se přihlašujete na server %(hs)s, a nikoliv na server matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domovský server nenabízí žádné přihlašovací toky podporované touto službou/klientem.",
     "Set a display name:": "Nastavit zobrazované jméno:",
     "Upload an avatar:": "Nahrát avatar:",
@@ -669,21 +669,21 @@
     "collapse": "sbalit",
     "expand": "rozbalit",
     "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
-    "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.": "Nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že E2E šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riot. Pokud zaznamenáte některý z uvedených problému, odhlaste se a přihlaste znovu. Pro zachování historie zpráv exportujte a znovu importujte vaše klíče.",
-    "Warning": "Upozornění",
+    "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.": "Byly nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že end-to-end šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riotu. Pokud zaznamenáte některý z uvedených problému, odhlaste se a znovu přihlaste. Pro zachování historie zpráv exportujte a znovu importujte své klíče.",
+    "Warning": "Varování",
     "Fetching third party location failed": "Nepodařilo se zjistit umístění třetí strany",
     "A new version of Riot is available.": "Je dostupná nová verze Riotu.",
     "I understand the risks and wish to continue": "Rozumím rizikům a přeji si pokračovat",
     "Send Account Data": "Poslat data o účtu",
-    "Advanced notification settings": "Pokročilé nastavení upozornění",
-    "Uploading report": "Nahrávám hlášení",
+    "Advanced notification settings": "Rozšířená nastavení oznámení",
+    "Uploading report": "Nahrávání hlášení",
     "Sunday": "Neděle",
     "Messages sent by bot": "Zprávy poslané robotem",
-    "Notification targets": "Cíle upozornění",
-    "Failed to set direct chat tag": "Nepodařilo se nastavit štítek přímého chatu",
+    "Notification targets": "Cíle oznámení",
+    "Failed to set direct chat tag": "Nepodařilo se nastavit štítek přímé konverzace",
     "Today": "Dnes",
     "Files": "Soubory",
-    "You are not receiving desktop notifications": "Nedostáváte upozornění na desktopu",
+    "You are not receiving desktop notifications": "Nedostáváte oznámení na plochu",
     "Friday": "Pátek",
     "Update": "Aktualizace",
     "What's New": "Co je nového",
@@ -691,7 +691,7 @@
     "Changelog": "Seznam změn",
     "Waiting for response from server": "Čekám na odezvu ze serveru",
     "Send Custom Event": "Odeslat vlastní událost",
-    "All notifications are currently disabled for all targets.": "Veškeré notifikace jsou aktuálně pro všechny cíle vypnuty.",
+    "All notifications are currently disabled for all targets.": "Veškerá oznámení jsou aktuálně pro všechny cíle vypnuty.",
     "delete the alias.": "smazat alias.",
     "To return to your account in future you need to <u>set a password</u>": "Abyste se mohli ke svému účtu v budoucnu vrátit, musíte si <u>nastavit heslo</u>",
     "Forget": "Zapomenout",
@@ -703,14 +703,14 @@
     "Messages containing my display name": "Zprávy obsahující mé zobrazované jméno",
     "Remember, you can always set an email address in user settings if you change your mind.": "Vězte, že kdybyste si to rozmysleli, e-mailovou adresu můžete kdykoliv doplnit v uživatelském nastavení.",
     "Unavailable": "Nedostupné",
-    "Error saving email notification preferences": "Chyba při ukládání nastavení e-mailových upozornění",
+    "Error saving email notification preferences": "Chyba při ukládání nastavení e-mailových oznámení",
     "View Decrypted Source": "Zobrazit dešifrovaný zdroj",
     "Failed to update keywords": "Nepodařilo se aktualizovat klíčová slova",
     "remove %(name)s from the directory.": "odebrat %(name)s z adresáře.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Upozornění na následující klíčová slova se řídí pravidly, která zde nelze zobrazit:",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Oznámení na následující klíčová slova se řídí pravidly, která zde nelze zobrazit:",
     "Please set a password!": "Prosím nastavte si heslo!",
     "You have successfully set a password!": "Úspěšně jste si nastavili heslo!",
-    "Explore Room State": "Prohlížet stav místnosti",
+    "Explore Room State": "Zjistit stav místnosti",
     "Source URL": "Zdrojová URL",
     "Failed to add tag %(tagName)s to room": "Nepodařilo se přidat štítek %(tagName)s k místnosti",
     "Filter results": "Filtrovat výsledky",
@@ -720,13 +720,13 @@
     "Collecting app version information": "Sbírání informací o verzi aplikace",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Smazat alias místnosti %(alias)s a odstranit %(name)s z adresáře?",
     "Keywords": "Klíčová slova",
-    "Enable notifications for this account": "Zapnout upozornění na tomto účtu",
-    "Invite to this community": "Pozvat do této komunity",
+    "Enable notifications for this account": "Zapnout oznámení na tomto účtu",
+    "Invite to this community": "Pozvat do této skupiny",
     "Messages containing <span>keywords</span>": "Zprávy obsahující <span>klíčová slova</span>",
     "View Source": "Zobrazit zdroj",
     "Tuesday": "Úterý",
     "Enter keywords separated by a comma:": "Vložte klíčová slova oddělená čárkou:",
-    "Forward Message": "Přeposlat zprávu",
+    "Forward Message": "Přeposlat",
     "You have successfully set a password and an email address!": "Úspěšně jste si nastavili heslo a e-mailovou adresu!",
     "Remove %(name)s from the directory?": "Odebrat %(name)s z adresáře?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot používá mnoho pokročilých funkcí, z nichž některé jsou ve vašem současném prohlížeči nedostupné nebo experimentální.",
@@ -734,16 +734,16 @@
     "Explore Account Data": "Prozkoumat data o účtu",
     "Remove from Directory": "Odebrat z adresáře",
     "Saturday": "Sobota",
-    "Messages in one-to-one chats": "Zprávy v individuálních chatech",
-    "Direct Chat": "Přímý chat",
+    "Messages in one-to-one chats": "Přímé zprávy",
+    "Direct Chat": "Přímá konverzace",
     "The server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
     "Reject": "Odmítnout",
     "Failed to set Direct Message status of room": "Nepodařilo se přiřadit místnosti status Přímé zprávy",
     "Monday": "Pondělí",
-    "All messages (noisy)": "Všechny zprávy (hlasitě)",
+    "All messages (noisy)": "Všechny zprávy (hlučné)",
     "Enable them now": "Povolit nyní",
     "Toolbox": "Sada nástrojů",
-    "Collecting logs": "Sbírání logů",
+    "Collecting logs": "Sběr záznamů",
     "You must specify an event type!": "Musíte určit typ události!",
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Invite to this room": "Pozvat do této místnosti",
@@ -755,8 +755,8 @@
     "Failed to send custom event.": "Nepodařilo se odeslat vlastní událost.",
     "What's new?": "Co je nového?",
     "Notify me for anything else": "Upozorni mě na cokoliv jiného",
-    "When I'm invited to a room": "Pokud jsem pozván do místnosti",
-    "Can't update user notification settings": "Nelze aktualizovat uživatelské nastavení upozornění",
+    "When I'm invited to a room": "Pozvánka do místnosti",
+    "Can't update user notification settings": "Nelze aktualizovat uživatelské nastavení oznámení",
     "Notify for all other messages/rooms": "Upozorni na všechny ostatní zprávy/místnosti",
     "Unable to look up room ID from server": "Nelze získat ID místnosti ze serveru",
     "Couldn't find a matching Matrix room": "Odpovídající Matrix místost nenalezena",
@@ -767,49 +767,49 @@
     "Back": "Zpět",
     "Failed to change settings": "Nepodařilo se změnit nastavení",
     "Reply": "Odpovědět",
-    "Show message in desktop notification": "Zobrazovat zprávu v upozornění na ploše",
+    "Show message in desktop notification": "Zobrazovat zprávu v oznámení na ploše",
     "Unhide Preview": "Zobrazit náhled",
     "Unable to join network": "Nelze se připojit k síti",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Snad jste je nastavili v jiném klientu než Riot. V Riotu je nemůžete upravit, ale přesto platí",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Omlouváme se, váš prohlížeč <b>není</b> schopný spustit Riot.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Omlouváme se, váš prohlížeč <b>není</b> schopný Riot spustit.",
     "Uploaded on %(date)s by %(user)s": "Nahráno %(date)s uživatelem %(user)s",
-    "Messages in group chats": "Zprávy ve skupinových chatech",
+    "Messages in group chats": "Zprávy ve skupinách",
     "Yesterday": "Včera",
     "Error encountered (%(errorDetail)s).": "Nastala chyba (%(errorDetail)s).",
     "Low Priority": "Nízká priorita",
     "Riot does not know how to join a room on this network": "Riot neví, jak vstoupit do místosti na této síti",
     "Set Password": "Nastavit heslo",
-    "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.",
+    "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových oznámení nastala chyba.",
     "Off": "Vypnout",
     "Mentions only": "Pouze zmínky",
     "Failed to remove tag %(tagName)s from room": "Nepodařilo se odstranit štítek %(tagName)s z místnosti",
     "Wednesday": "Středa",
-    "You can now return to your account after signing out, and sign in on other devices.": "Nyní se můžete ke svému účtu vrátit i po odhlášení a používat jej na ostatních zařízeních.",
-    "Enable email notifications": "Zapnout upozornění přes e-mail",
+    "You can now return to your account after signing out, and sign in on other devices.": "Nyní se můžete ke svému účtu vrátit i po odhlášení a používat ho na ostatních zařízeních.",
+    "Enable email notifications": "Zapnout oznámení přes e-mail",
     "Event Type": "Typ události",
     "Download this file": "Stáhnout tento soubor",
     "Pin Message": "Připíchnout zprávu",
     "Thank you!": "Děkujeme vám!",
-    "View Community": "Zobrazit Komunitu",
+    "View Community": "Zobrazit skupinu",
     "Event sent!": "Událost odeslána!",
     "Event Content": "Obsah události",
-    "Unable to fetch notification target list": "Nepodařilo se získat seznam cílů upozornění",
+    "Unable to fetch notification target list": "Nepodařilo se získat seznam cílů oznámení",
     "Quote": "Citovat",
     "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!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
-    "The platform you're on": "Platforma na které jste",
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá oznámení, která zde nejsou zobrazena",
+    "The platform you're on": "Vámi používaná platforma",
     "The version of Riot.im": "Verze Riot.im",
-    "Your language of choice": "Vaše jazyková volba",
+    "Your language of choice": "Váš jazyk",
     "Which officially provided instance you are using, if any": "Kterou oficiální instanci Riot.im používáte (a jestli vůbec)",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Jestli při psaní zpráv používáte rozbalenou lištu formátování textu",
-    "Your homeserver's URL": "URL vámi používaného domovského serveru",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zda při psaní zpráv používáte rozbalenou lištu formátování textu",
+    "Your homeserver's URL": "URL vašeho domovského serveru",
     "Your identity server's URL": "URL Vámi používaného serveru identity",
     "e.g. %(exampleValue)s": "např. %(exampleValue)s",
     "Every page you use in the app": "Každou stránku v aplikaci, kterou navštívíte",
     "e.g. <CurrentPageURL>": "např. <CurrentPageURL>",
     "Your User Agent": "Řetězec User Agent Vašeho zařízení",
-    "Your device resolution": "Rozlišení obrazovky Vašeho zařízení",
+    "Your device resolution": "Rozlišení obrazovky vašeho zařízení",
     "The information being sent to us to help make Riot.im better includes:": "S cílem vylepšovat aplikaci Riot.im shromažďujeme následující údaje:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "V případě, že se na stránce vyskytují identifikační údaje, jako například název místnosti, ID uživatele, místnosti a nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
     "Call in Progress": "Probíhající hovor",
@@ -821,7 +821,7 @@
     "Missing roomId.": "Chybějící ID místnosti.",
     "Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si změnil zobrazované jméno na %(displayName)s.",
-    "Always show encryption icons": "Vždy zobrazovat ikony stavu šifrovaní",
+    "Always show encryption icons": "Vždy zobrazovat ikonu stavu šifrovaní",
     "Send analytics data": "Odesílat analytická data",
     "Enable widget screenshots on supported widgets": "Povolit screenshot widgetu pro podporované widgety",
     "This event could not be displayed": "Tato událost nemohla být zobrazena",
@@ -839,24 +839,24 @@
     "Share room": "Sdílet místnost",
     "System Alerts": "Systémová varování",
     "Muted Users": "Umlčení uživatelé",
-    "Only room administrators will see this warning": "Jen administrátoři místnosti uvidí toto varování",
+    "Only room administrators will see this warning": "Toto varování uvidí jen správci místnosti",
     "You don't currently have any stickerpacks enabled": "Momentálně nemáte aktívní žádné balíčky s nálepkami",
     "Stickerpack": "Balíček s nálepkami",
     "Hide Stickers": "Skrýt nálepky",
     "Show Stickers": "Zobrazit nálepky",
-    "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.": "V šifrovaných místnostech, jako je tato, jsou URL náhledy ve výchozím nastavení zakázané, aby bylo možné zajistit, že váš domácí server nemůže shromažďovat informace o odkazech, které v této místnosti vidíte.",
+    "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.": "V šifrovaných místnostech, jako je tato, jsou URL náhledy ve výchozím nastavení vypnuté, aby bylo možné zajistit, že váš domovský server neshromažďuje informace o odkazech, které v této místnosti vidíte.",
     "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.": "Když někdo ve zprávě pošle URL adresu, může být zobrazen její náhled obsahující informace jako titulek, popis a obrázek z cílové stránky.",
     "Code": "Kód",
     "The email field must not be blank.": "E-mail nemůže být prázdný.",
     "The phone number field must not be blank.": "Telefonní číslo nemůže být prázdné.",
     "The password field must not be blank.": "Heslo nemůže být prázdné.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Prosím pomozte nám vylepšovat Riot.im odesíláním <UsageDataLink>anonymních údajů o používaní</UsageDataLink>. Na tento účel použijeme cookie (přečtěte si <PolicyLink>jak cookies používáme</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Prosím pomozte nám vylepšovat Riot.im odesíláním <UsageDataLink>anonymních údajů o používaní</UsageDataLink>. Použijeme k tomu cookies (přečtěte si <PolicyLink>jak cookies používáme</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Prosím pomozte nám vylepšovat Riot.im odesíláním <UsageDataLink>anonymních údajů o používaní</UsageDataLink>. Na tento účel použijeme cookie.",
     "Yes, I want to help!": "Ano, chci pomoci!",
-    "Please <a>contact your service administrator</a> to continue using the service.": "Please <a>contact your service administrator</a> to continue using the service.\nProsím <a>kontaktujte Vašeho administratora</a> aby jste mohli pokračovat v používání Vašeho zařízení.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Pro další používání vašeho zařízení prosím kontaktujte prosím <a>správce vaší služby</a>.",
     "This homeserver has hit its Monthly Active User limit.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele.",
     "This homeserver has exceeded one of its resource limits.": "Tento domovský server překročil některý z limitů.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Prosím <a>kontaktujte Vašeho administrátora</a> pro zvýšení tohoto limitu.",
+    "Please <a>contact your service administrator</a> to get this limit increased.": "Pro zvýšení tohoto limitu prosím <a>kontaktujte správce své služby</a>.",
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele, proto se <b>někteří uživatelé nebudou moci přihlásit</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Tento domovský server překročil některý z limitů, proto se <b>někteří uživatelé nebudou moci přihlásit</b>.",
     "Failed to remove widget": "Nepovedlo se odstranit widget",
@@ -869,15 +869,15 @@
     "Logs sent": "Záznamy odeslány",
     "Failed to send logs: ": "Nepodařilo se odeslat záznamy: ",
     "Submit debug logs": "Odeslat ladící záznamy",
-    "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.": "Ladící záznamy obsahují data o používání aplikace včetně Vašeho uživatelského jména, ID nebo aliasy navštívených místností a skupin a uživatelská jména jiných uživatelů. Neobsahují zprávy.",
-    "Community IDs cannot be empty.": "ID komunity nemůže být prázdné.",
+    "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.": "Ladící záznamy obsahují data o používání aplikace včetně vašeho uživatelského jména, ID nebo aliasy navštívených místností a skupin a uživatelská jména jiných uživatelů. Neobsahují zprávy.",
+    "Community IDs cannot be empty.": "ID skupiny nemůže být prázdné.",
     "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>": "Toto učiní účet permanentně nepoužitelný. Nebudete se moci přihlásit a nikdo se nebude moci se stejným uživatelskym ID znovu zaregistrovat. Účet bude odstraněn ze všech místnosti a bude vymazán ze serveru identity.<b>Tato akce je nevratná.</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.": "Deaktivace účtu <b>automaticky nesmaže zprávy, které jste poslali.</b> Chcete-li je smazat, zaškrtněte prosím odpovídající pole níže.",
-    "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.": "Viditelnost zpráv v Matrixu je podobná e-mailu. Výmaz Vašich zpráv znamené, že už nebudou sdíleny s žádným novým nebo neregistrovaným uživatelem, ale registrovaní uživatelé, kteří už přístup ke zprávám mají, budou stále mít přístup k jejich kopii.",
+    "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.": "Viditelnost zpráv v Matrixu je podobná e-mailu. Smazání vašich zpráv znamená, že už nebudou sdíleny s žádným novým nebo neregistrovaným uživatelem, ale registrovaní uživatelé, kteří už přístup ke zprávám mají, budou stále mít přístup k jejich kopii.",
     "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)": "S deaktivací účtu si přeji smazat všechny mnou odeslané zprávy (<b>Pozor:</b> způsobí, že noví uživatelé uvidí nekompletní konverzace)",
-    "To continue, please enter your password:": "Pro pokračování, zadejte Vaše heslo:",
+    "To continue, please enter your password:": "Pro pokračování, zadejte své heslo:",
     "Upgrade Room Version": "Upgradeovat verzi místnosti",
-    "Create a new room with the same name, description and avatar": "Vytvoříme místnost se stejným jménem, popisem a avatarem",
+    "Create a new room with the same name, description and avatar": "Vznikne místnost se stejným názvem, popisem a avatarem",
     "Update any local room aliases to point to the new room": "Aktualizujeme všechny lokální aliasy místnosti tak, aby ukazovaly na novou místnost",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Přerušíme konverzace ve staré verzi místnosti a pošleme uživatelům zprávu o přechodu do nové mistnosti",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Na začátek nové místnosti umístíme odkaz na starou místnost tak, aby uživatelé mohli vidět staré zprávy",
@@ -885,22 +885,22 @@
     "Send Logs": "Odeslat záznamy",
     "Refresh": "Obnovit",
     "We encountered an error trying to restore your previous session.": "V průběhu obnovování Vaší minulé relace nastala chyba.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazání uložiště prohlížeče možna opraví Váš problem, zároveň se tím ale odhlásíte a historie Vašich šifrovaných konverzací se pro Vás může stát nečitelnou.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vymazání úložiště prohlížeče možná váš problém opraví, zároveň se tím ale odhlásíte a můžete přijít o historii svých šifrovaných konverzací.",
     "Share Room": "Sdílet místnost",
     "Link to most recent message": "Odkaz na nejnovější zprávu",
     "Share User": "Sdílet uživatele",
-    "Share Community": "Sdílet komunitu",
+    "Share Community": "Sdílet skupinu",
     "Share Room Message": "Sdílet zprávu z místnosti",
     "Link to selected message": "Odkaz na vybranou zprávu",
     "COPY": "Kopírovat",
-    "Share Message": "Sdílet zprávu",
+    "Share Message": "Sdílet",
     "Collapse Reply Thread": "Sbalit vlákno odpovědi",
-    "Unable to join community": "Není možné vstoupit do komunity",
-    "Unable to leave community": "Není možné opustit komunitu",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Změny ve Vaší komunitě <bold1>název</bold1> a <bold2>avatar</bold2> možná nebudou viditelné pro ostatní uživatele po dobu až 30 minut.",
-    "Join this community": "Vstoupit do komunity",
-    "Leave this community": "Opustit komunitu",
-    "Who can join this community?": "Kdo může vstoupit do této komunity?",
+    "Unable to join community": "Není možné vstoupit do skupiny",
+    "Unable to leave community": "Není možné opustit skupinu",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Změny <bold1>názvu</bold1> a <bold2>avataru</bold2> vaší skupiny možná nebudou viditelné pro ostatní uživatele po dobu až 30 minut.",
+    "Join this community": "Vstoupit do skupiny",
+    "Leave this community": "Opustit skupinu",
+    "Who can join this community?": "Kdo může vstoupit do této skupiny?",
     "Everyone": "Všichni",
     "This room is not public. You will not be able to rejoin without an invite.": "Tato místnost není veřejná. Bez pozvánky nebudete moci znovu vstoupit.",
     "Can't leave Server Notices room": "Z místnosti \"Server Notices\" nejde odejit",
@@ -908,88 +908,88 @@
     "Terms and Conditions": "Smluvní podmínky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Chcete-li nadále používat domovský server %(homeserverDomain)s, měli byste si přečíst a odsouhlasit naše smluvní podmínky.",
     "Review terms and conditions": "Přečíst smluvní podmínky",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Věděli jste, že: práci s Riot.im si můžete zpříjemnit s použitím komunit!",
-    "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.": "Pro nastavení filtru přetáhněte avatar komunity na panel filtrování na levé straně obrazovky. Potom můžete kdykoliv kliknout na avatar komunity na tomto panelu a Riot Vám bude zobrazovat jen místnosti a lidi z dané komunity.",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Věděli jste, že práci s Riot.im si můžete zpříjemnit používáním skupin!",
+    "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.": "Pro nastavení filtru přetáhněte avatar skupiny na panel filtrování na levé straně obrazovky. Potom můžete kdykoliv klepnout na avatar skupiny v tomto panelu a Riot vám bude zobrazovat jen místnosti a lidi z dané skupiny.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Dokud si nepřečtete a neodsouhlasíte <consentLink>naše smluvní podmínky</consentLink>, nebudete moci posílat žádné zprávy.",
-    "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.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl svého měsíčního limitu pro aktivní uživatele. Prosím <a>kontaktujte Vašeho administratora</a> pro další využívání služby.",
-    "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.": "Vaše zpráva nebyla odeslána, protože tento domácí server dosáhl limitu. Prosím <a>kontaktujte Vašeho administratora</a> pro další využívání služby.",
+    "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.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele. Pro další využívání služby prosím kontaktujte jejího <a>správce</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.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl limitu svých zdrojů. Pro další využívání služby prosím kontaktujte jejího <a>správce</a>.",
     "%(count)s of your messages have not been sent.|one": "Vaše zpráva nebyla odeslána.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Znovu poslat všechny</resendText> nebo <cancelText>zrušit všechny</cancelText>. Můžete též vybrat jednotlivé zprávy pro znovu odeslání nebo zrušení.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu poslat zprávu</resendText> nebo <cancelText>zrušit zprávu</cancelText>.",
     "Clear filter": "Zrušit filtr",
-    "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.": "Jestli jste odeslali hlášení o chybě na GitHub, ladící záznamy nám pomohou problém najít. Ladicí záznamy obsahuji data o používání aplikate, která obsahují uživatelské jmeno, ID nebo aliasy navštívených místnosti a uživatelská jména dalších uživatelů. Neobsahují zprávy.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Soukromí je pro nás důležité a proto neshromažďujeme osobní údaje ani údaje na základě, kterých by Vás bylo možne identifikovat.",
+    "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.": "Jestli jste odeslali hlášení o chybě na GitHub, ladící záznamy nám pomohou problém najít. Ladicí záznamy obsahuji data o používání aplikace, která obsahují uživatelské jméno, ID nebo aliasy navštívených místnosti a uživatelská jména dalších uživatelů. Neobsahují zprávy.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Soukromí je pro nás důležité a proto neshromažďujeme osobní údaje ani údaje na základě, kterých by vás bylo možné identifikovat.",
     "Learn more about how we use analytics.": "Dozvědět se více o tom, jak zpracováváme analytické údaje.",
     "No Audio Outputs detected": "Nebyly rozpoznány žádné zvukové výstupy",
     "Audio Output": "Zvukový výstup",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Pro pokračování využívání této služby prosím <a>kontaktujte Vašeho administrátora</a>.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Pro pokračování využívání této služby prosím kontaktujte jejího <a>správce</a>.",
     "Manually export keys": "Export klíčů",
     "You'll lose access to your encrypted messages": "Přijdete o přístup k šifrovaným zprávám",
     "Are you sure you want to sign out?": "Opravdu se chcete odhlásit?",
     "Updating Riot": "Aktualizujeme Riot",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jestli máte nějakou zpětnou vazbu nebo máte s Riotem nějaký problém, dejte nám vědět na GitHubu.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Abychom předešli řešení jednoho problému několikrát, podívejte se prosím nejdřív <existingIssuesLink>seznam existijících issue</existingIssuesLink> (a můžete jim dát 👍) nebo můžete <newIssueLink>vyrobit nové</newIssueLink>. Jenom nám prosím pište anglicky.",
-    "Report bugs & give feedback": "Hlášení chyb & zpětná vazba",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Abychom předešli řešení jednoho problému několikrát, podívejte se prosím nejdřív <existingIssuesLink>seznam existujících issue</existingIssuesLink> (a můžete jim dát 👍) nebo můžete <newIssueLink>vyrobit nové</newIssueLink>. Jenom nám prosím pište anglicky.",
+    "Report bugs & give feedback": "Hlášení chyb a zpětná vazba",
     "Go back": "Zpět",
     "Failed to upgrade room": "Nepovedlo se upgradeovat místnost",
     "The room upgrade could not be completed": "Upgrade místnosti se nepovedlo dokončit",
     "Upgrade this room to version %(version)s": "Upgradování místnosti na verzi %(version)s",
-    "Use Legacy Verification (for older clients)": "Použít starší verzi verifikace (funguje staršími klienty)",
+    "Use Legacy Verification (for older clients)": "Použít starší verzi ověření (funguje se staršími klienty)",
     "Verify by comparing a short text string.": "Verfikujete porovnáním krátkého textu.",
-    "Begin Verifying": "Zahájit verifikaci",
+    "Begin Verifying": "Zahájit ověření",
     "Waiting for partner to accept...": "Čekáme až partner přijme žádost...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nic se neděje? Ne všechny klienty podporují interaktivní verifikaci. <button>Použít starší verzi</button>.",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nic se neděje? Ne všichni klienti klienti podporují interaktivní ověření. <button>Použít starší verzi</button>.",
     "Waiting for %(userId)s to confirm...": "Čekáme až to %(userId)s potvrdí...",
-    "Use two-way text verification": "Použít oboustrannou verifikaci",
-    "Security & Privacy": "Bezpečnost & Soukromí",
+    "Use two-way text verification": "Použít oboustranné ověření",
+    "Security & Privacy": "Bezpečnost a soukromí",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Když se šifrování zapne, už nepůjde vypnout.",
     "Encrypted": "Šifrování",
     "General": "Obecné",
     "General failure": "Nějaká chyba",
-    "This homeserver does not support login using email address.": "Tento homeserver neumožňuje přihlášní pomocí emailu.",
+    "This homeserver does not support login using email address.": "Tento domovský serveru neumožňuje přihlášení pomocí e-mailu.",
     "Set a new password": "Nastavit nové heslo",
-    "Room Name": "Jméno místnosti",
+    "Room Name": "Název místnosti",
     "Room Topic": "Téma místnosti",
     "Room avatar": "Avatar místnosti",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Změny toho kdo smí číst historické zprávy se aplikují jenom na další zprávy v této místosti. Viditelnost už poslaných zpráv zůstane jaká byla.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Změny viditelnosti historie této místnosti ovlivní jenom nové zprávy. Viditelnost starších zpráv zůstane, jaká byla v době jejich odeslání.",
     "To link to this room, please add an alias.": "K vytvoření odkazu je potřeba vyrobit místnosti alias.",
-    "Roles & Permissions": "Funkce & Práva",
+    "Roles & Permissions": "Role a oprávnění",
     "Room information": "Informace o místnosti",
     "Internal room ID:": "Interní ID:",
     "Room version": "Verze místnosti",
     "Room version:": "Verze místnosti:",
     "Developer options": "Možnosti pro vývojáře",
-    "Help & About": "Pomoc & O Riotu",
+    "Help & About": "O aplikaci a pomoc",
     "Bug reporting": "Hlášení chyb",
     "FAQ": "Máte dotazy?",
     "Versions": "Verze",
-    "Legal": "Právní věci",
-    "Voice & Video": "Audio & Video",
-    "Missing media permissions, click the button below to request.": "Chybí nám práva na práci audiem/videem. Klikněte na tlačítko a my si o ně požádáme.",
-    "Request media permissions": "Požádat o práva k mikrofonu a kameře",
+    "Legal": "Právní informace",
+    "Voice & Video": "Zvuk a video",
+    "Missing media permissions, click the button below to request.": "Pro práci se zvukem a videem je potřeba oprávnění. Klepněte na tlačítko a my o ně požádáme.",
+    "Request media permissions": "Požádat o oprávnění k mikrofonu a kameře",
     "Allow Peer-to-Peer for 1:1 calls": "Povolit Peer-to-Peer hovory",
-    "Preferences": "Preference",
+    "Preferences": "Předvolby",
     "Composer": "Editor zpráv",
-    "Enable Emoji suggestions while typing": "Povolit napovídání emotikonů",
-    "Send typing notifications": "Posílat notifikace \"... právě píše...\"",
+    "Enable Emoji suggestions while typing": "Napovídat emoji",
+    "Send typing notifications": "Posílat oznámení, když píšete",
     "Room list": "Seznam místností",
-    "Timeline": "Zprávy v místnosti",
+    "Timeline": "Časová osa",
     "Autocomplete delay (ms)": "Zpožnění našeptávače (ms)",
-    "Enable big emoji in chat": "Povolit velké emotikony v chatu",
-    "Show avatars in user and room mentions": "Zobrazovat ikony uživatelů ve zmínkách o nich",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Zeptat před odesláním pozvánky potenciálně neplatným Matrixovým identifikátorům",
+    "Enable big emoji in chat": "Povolit velké emoji",
+    "Show avatars in user and room mentions": "U zmínek uživatelů a místností zobrazovat jejich avatary",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Potvrdit odeslání pozvánky potenciálně neplatným Matrix ID",
     "Show avatar changes": "Zobrazovat změny avatarů",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovat zprávy o připojení/opuštění (netýká se pozvánek/vykopnutí/vykázání)",
-    "Show a placeholder for removed messages": "Zobrazovat zamazání místo smazané zprávy",
-    "Show display name changes": "Zobrazovat změny jména",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovat zprávy o vstupu/opuštění (netýká se pozvánek/vykopnutí/vykázání)",
+    "Show a placeholder for removed messages": "Zobrazovat smazané zprávy jako zamazané",
+    "Show display name changes": "Zobrazovat změny zobrazovaného jména",
     "Messages containing my username": "Zprávy obsahující moje uživatelské jméno",
     "Messages containing @room": "Zprávy obsahující @room",
-    "Encrypted messages in one-to-one chats": "Zašifrované zprávy v přímých chatech",
-    "Email addresses": "Emailové adresy",
+    "Encrypted messages in one-to-one chats": "Šifrované přímé zprávy",
+    "Email addresses": "E-mailové adresy",
     "Set a new account password...": "Nastavit nové heslo...",
     "Language and region": "Jazyk a region",
-    "Theme": "Motiv",
+    "Theme": "Motiv vzhledu",
     "Account management": "Správa účtu",
     "Deactivating your account is a permanent action - be careful!": "Deaktivace účtu je nevratná - buďte opatrní!",
     "Phone numbers": "Telefonní čísla",
@@ -999,19 +999,19 @@
     "Profile picture": "Profilový obrázek",
     "Display Name": "Zobrazované jméno",
     "Room Addresses": "Adresy místnosti",
-    "For help with using Riot, click <a>here</a>.": "Pro pomoc s používáním Riotu, klikněte <a>sem</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pro pomoc s používáním Riotu, klikněte <a>sem</a> nebo následujícím tlačítkem zahajte konverzaci s robotem.",
+    "For help with using Riot, click <a>here</a>.": "Pro pomoc s používáním Riotu klepněte <a>sem</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pro pomoc s používáním Riotu klepněte <a>sem</a> nebo následujícím tlačítkem zahajte konverzaci s robotem.",
     "Chat with Riot Bot": "Konverzovat s Riot Botem",
     "Ignored users": "Ignorovaní uživatelé",
     "Bulk options": "Hromadná možnost",
     "Key backup": "Záloha klíčů",
     "This room has been replaced and is no longer active.": "Tato místnost byla nahrazena a už není používaná.",
     "The conversation continues here.": "Konverzace pokračuje zde.",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali jsme Vám ověřovací email. Následujte prosím instrukce a pak klikněte na následující tlačítko.",
-    "Email Address": "Emailová adresa",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Poslali jsme vám ověřovací e-mail. Postupujte prosím podle instrukcí a pak klepněte na následující tlačítko.",
+    "Email Address": "E-mailová adresa",
     "Delete Backup": "Smazat zálohu",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Opravdu? Pokud klíče nejsou správně zálohované můžete přijít o zašifrované zprávy.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené end-to-end šifrováním. Jenom Vy a příjemci mají dešifrovací klíče.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Opravdu? Pokud klíče nejsou správně zálohované můžete přijít o šifrované zprávy.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Šifrované zprávy jsou zabezpečené end-to-end šifrováním. Klíče pro jejich dešifrování máte jen vy a příjemci zpráv.",
     "Unable to load key backup status": "Nepovedlo se načíst stav zálohy",
     "Restore from Backup": "Obnovit ze zálohy",
     "Back up your keys before signing out to avoid losing them.": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli.",
@@ -1020,37 +1020,37 @@
     "Backup version: ": "Verze zálohy: ",
     "Algorithm: ": "Algoritmus: ",
     "Start using Key Backup": "Začít používat zálohu klíčů",
-    "Add an email address to configure email notifications": "Pro nastavení emailových upozornění je třeba přidat emailovou adresu",
-    "Whether or not you're logged in (we don't record your username)": "Jestli jste přihlášený/á (nezaznamenáváme ale Vaše jméno)",
+    "Add an email address to configure email notifications": "Pro nastavení e-mailových oznámení je třeba přidat e-mailovou adresu",
+    "Whether or not you're logged in (we don't record your username)": "Zda jste nebo nejste přihlášeni (vaše uživatelské jméno se nezaznamenává)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Soubor '%(fileName)s' je větší než povoluje limit domovského serveru",
-    "Unable to load! Check your network connectivity and try again.": "Nepovedlo se načíst! Zkontrolujte si připojení k síti a zkuste to prosím znovu.",
+    "Unable to load! Check your network connectivity and try again.": "Stránku se nepovedlo načíst! Zkontrolujte prosím své připojení k internetu a zkuste to znovu.",
     "Registration Required": "Je vyžadována registrace",
     "You need to register to do this. Would you like to register now?": "Na toto potřebujete registraci. Chcete se zaregistrovat teď hned?",
     "Failed to invite users to the room:": "Nepovedlo se pozvat uživatele do místnosti:",
     "Upgrades a room to a new version": "Upgraduje místnost na novou verzi",
     "This room has no topic.": "Tato místnost nemá žádné specifické téma.",
-    "Sets the room name": "Nastaví jméno místnosti",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgradoval/a místnost.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s udělal/a místnost veřejnou pro všechny s odkazem.",
-    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s udělal/a místnost přístupnou pouze na pozvánky.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s změnil/a pravidlo k připojení na %(rule)s",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s povolil/a hostům přístup.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zakázal/a hostům přístup.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s změnil/a pravidlo pro přístup hostů na %(rule)s",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s přidal/a nové adresy místnosti: %(addedAddresses)s.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s přidal/a novou adresu místnosti: %(addedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s odstranil/a adresy místnosti: %(removedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s odstranil/a adresu místnosti: %(removedAddresses)s.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s přidal/a adresy místnosti %(addedAddresses)s a odebral %(removedAddresses)s.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nastavil/a hlavní addresu této místnosti na %(address)s.",
+    "Sets the room name": "Nastaví název místnosti",
+    "%(senderDisplayName)s upgraded this room.": "Uživatel %(senderDisplayName)s upgradoval místnost.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "Uživatel %(senderDisplayName)s zveřejnil místnost pro všechny s odkazem.",
+    "%(senderDisplayName)s made the room invite only.": "Uživatel %(senderDisplayName)s zpřístupnil místnost pouze na pozvání.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "Uživatel %(senderDisplayName)s změnil pravidlo k připojení na %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "Uživatel %(senderDisplayName)s povolil přístup hostům.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "Uživatel %(senderDisplayName)s zakázal přístup hostům.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "Uživatel %(senderDisplayName)s změnil pravidlo pro přístup hostů na %(rule)s",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "Uživatel %(senderName)s přidal této místnosti nové adresy %(addedAddresses)s.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "Uživatel %(senderName)s přidal této místnosti novou adresu %(addedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "Uživatel %(senderName)s odstranil této místnosti adresy %(removedAddresses)s.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "Uživatel %(senderName)s odstranil této místnosti adresu %(removedAddresses)s.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "Uživatel %(senderName)s přidal této místnosti adresy %(addedAddresses)s a odebral %(removedAddresses)s.",
+    "%(senderName)s set the main address for this room to %(address)s.": "Uživatel %(senderName)s hlavní adresu této místnosti na %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s zrušil hlavní adresu této místnosti.",
     "%(displayName)s is typing …": "%(displayName)s píše …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s a %(count)s dalších píše …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s a jeden další píše …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s a %(lastPerson)s píšou …",
-    "Unable to connect to Homeserver. Retrying...": "Připojení k homeserveru se nezdařilo. Zkoušíme to znovu...",
+    "Unable to connect to Homeserver. Retrying...": "Připojení k domovskému serveru se nezdařilo. Zkoušíme to znovu...",
     "Unrecognised address": "Neznámá adresa",
-    "You do not have permission to invite people to this room.": "Nemáte práva na zvaní lidí do této místnosti.",
+    "You do not have permission to invite people to this room.": "Nemáte oprávnění zvát lidi do této místnosti.",
     "User %(user_id)s does not exist": "Uživatel %(user_id)s neexistuje",
     "User %(user_id)s may or may not exist": "Uživatel %(user_id)s možná neexistuje",
     "Unknown server error": "Neznámá chyba serveru",
@@ -1060,8 +1060,8 @@
     "Avoid repeated words and characters": "Vyvarujte se opakujících se slov a znaků",
     "Avoid sequences": "Vyvarujte se běžných posloupností",
     "Avoid recent years": "Nepoužívejte čísla roků",
-    "Avoid years that are associated with you": "Nepoužívejte roky které s Vámi nějak souvisí",
-    "Avoid dates and years that are associated with you": "Nepoužívejte data a roky která s Vámi nějak souvisí",
+    "Avoid years that are associated with you": "Nepoužívejte roky, které s vámi nějak souvisí",
+    "Avoid dates and years that are associated with you": "Nepoužívejte data ani roky, které s vámi nějak souvisí",
     "Capitalization doesn't help very much": "Zvětšení nějakých písmen zas tolik nepomůže",
     "All-uppercase is almost as easy to guess as all-lowercase": "Všechno velkými je skoro stejně jednoduché jako všechno malými písmeny",
     "Reversed words aren't much harder to guess": "Otočená slova nejsou moc těžká na uhodnutí",
@@ -1077,19 +1077,19 @@
     "This is a very common password": "Toto je velmi používané heslo",
     "This is similar to a commonly used password": "Toto je moc podobné běžně používanému heslu",
     "A word by itself is easy to guess": "Jenom jedno slovo je moc jednoduché uhodnout",
-    "Names and surnames by themselves are easy to guess": "Jména a příjmění je moc jednoduché uhodnout",
-    "Common names and surnames are easy to guess": "Běžná jména a příjmení je moc jednoduché uhodnout",
+    "Names and surnames by themselves are easy to guess": "Jména a příjmení je velmi jednoduché uhodnout",
+    "Common names and surnames are easy to guess": "Běžná jména a příjmení je velmi jednoduché uhodnout",
     "Straight rows of keys are easy to guess": "Řádky na klávesnici je moc jednoduché uhodnout",
     "Short keyboard patterns are easy to guess": "Krátké sekvence kláves je moc jednoduché uhodnout",
-    "There was an error joining the room": "Chyba při připojování k místnosti",
-    "Sorry, your homeserver is too old to participate in this room.": "Pardón, ale Váš domovský server je moc zastaralý aby se sem mohl připojit.",
-    "Please contact your homeserver administrator.": "Kontaktujte prosím administrátora domovského serveru.",
-    "The other party cancelled the verification.": "Druhá strana verifikaci zrušila.",
+    "There was an error joining the room": "Při vstupu do místnosti došlo k chybě",
+    "Sorry, your homeserver is too old to participate in this room.": "Jejda, váš domovský server je moc zastaralý abyste do této místnosti mohli vstoupit.",
+    "Please contact your homeserver administrator.": "Kontaktujte prosím správce domovského serveru.",
+    "The other party cancelled the verification.": "Druhá strana ověření zrušila.",
     "Verified!": "Ověřeno!",
     "You've successfully verified this user.": "Uživatel úspěšně ověřen.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bezpečné zprávy s tímto uživatelem jsou end-to-end šifrované a nikdo další je nemůže číst.",
     "Got It": "OK",
-    "Verify this user by confirming the following emoji appear on their screen.": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné obrázky.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Ověřte uživatele zkontrolováním, že se mu na obrazovce objevily stejné emoji.",
     "Verify this user by confirming the following number appears on their screen.": "Ověřte uživatele zkontrolováním, že se na obrazovce objevila stejná čísla.",
     "Unable to find a supported verification method.": "Nepovedlo se nám najít podporovanou metodu ověření.",
     "Dog": "Pes",
@@ -1156,32 +1156,32 @@
     "Pin": "Připínáček",
     "Yes": "Ano",
     "No": "Ne",
-    "Never lose encrypted messages": "Nikdy nepřijdete o zašifrované zprávy",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zprávy v této místnosti jsou zabezpečené end-to-end šifrováním. Jenom vy a příjemci je můžou číst.",
+    "Never lose encrypted messages": "Nikdy nepřijdete o šifrované zprávy",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Zprávy v této místnosti jsou zabezpečené end-to-end šifrováním. Můžete je číst jen vy a jejich příjemci.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Bezpečně zazálohujte své klíče abyste o ně nepřišli. <a>Více informací.</a>",
     "Not now": "Teď ne",
     "Don't ask me again": "Už se mě na to nikdy neptejte",
     "Add some now": "Přidat nějaké",
     "Main address": "Hlavní adresa",
     "This room is a continuation of another conversation.": "Tato místost je pokračováním jiné konverzace.",
-    "Click here to see older messages.": "Kliknutím zobrazíte starší zprávy.",
+    "Click here to see older messages.": "Klepnutím zobrazíte starší zprávy.",
     "Failed to load group members": "Nepovedlo se načíst členy skupiny",
-    "Join": "Přidat se",
-    "That doesn't look like a valid email address": "To nevypadá jako platná emailová adresa",
+    "Join": "Vstoupit",
+    "That doesn't look like a valid email address": "To nevypadá jako platná e-mailová adresa",
     "The following users may not exist": "Následující uživatel možná neexistuje",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nepovedlo se najít profily následujících Matrix ID - chcete je stejně pozvat?",
     "Invite anyway and never warn me again": "Stejně je pozvat a nikdy mě nevarujte znovu",
     "Invite anyway": "Stejně je pozvat",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Na odeslání zápisu je potřeba <a>vyrobit issue na GitHubu</a> s popisem problému.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Pro odeslání záznamů je potřeba <a>vyrobit issue na GitHubu</a> s popisem problému.",
     "Unable to load commit detail: %(msg)s": "Nepovedlo se načíst detaily revize: %(msg)s",
     "Incompatible Database": "Nekompatibilní databáze",
     "Continue With Encryption Disabled": "Pokračovat bez šifrování",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů Vám dává jistotu, že je komunikace důvěrná.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Po ověření bude uživatel označen jako důvěryhodný. Ověřování uživatelů vám dává jistotu, že je komunikace důvěrná.",
     "Waiting for partner to confirm...": "Čekám až to partner potvrdí...",
-    "Incoming Verification Request": "Přišla Vám žádost o ověření",
+    "Incoming Verification Request": "Přišla vám žádost o ověření",
     "Incompatible local cache": "Nekompatibilní lokální vyrovnávací paměť",
     "Clear cache and resync": "Smazat paměť a sesynchronizovat",
-    "I don't want my encrypted messages": "Nechci svoje zašifrované zprávy",
+    "I don't want my encrypted messages": "Už své zašifrované zprávy nechci",
     "Checking...": "Kontroluji...",
     "Unable to load backup status": "Nepovedlo se načíst stav zálohy",
     "Recovery Key Mismatch": "Klíč zálohy neodpovídá",
@@ -1195,9 +1195,9 @@
     "Restored %(sessionCount)s session keys": "Obnovili jsme %(sessionCount)s klíčů",
     "Enter Recovery Passphrase": "Zadejte heslo k záloze",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varování</b>: záloha by měla být prováděna na důvěryhodném počítači.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zadáním hesla k záloze získáte zpět přístup k zašifrovaným zprávám a zabezpečené komunikaci.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zadáním hesla k záloze získáte zpět přístup k šifrovaným zprávám a zabezpečené komunikaci.",
     "Next": "Další",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Pokud jste zapomněl/a heslo k záloze, použijte <button1>obnovovací klíč</button1> nebo <button2>nastavte další možnosti obnovení</button2>",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Pokud jste zapomněli své obnovovací heslo, použijte <button1>obnovovací klíč</button1> nebo <button2>nastavte další možnosti obnovení</button2>",
     "Enter Recovery Key": "Zadejte obnovovací klíč",
     "This looks like a valid recovery key!": "To vypadá jako správný klíč!",
     "Not a valid recovery key": "To není správný klíč",
@@ -1206,7 +1206,7 @@
     "Go to Settings": "Přejít do nastavení",
     "Enter a passphrase...": "Zadejte silné heslo...",
     "For maximum security, this should be different from your account password.": "Z bezpečnostních důvodů by toto heslo mělo být jiné než přihlašovací heslo.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Uložíme na našich serverech zašifrovanou zálohu Vašich klíčů. Zvolte si silné heslo (např. delší frázi) aby byla záloha v bezpečí.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Na našich serverech uložíme šifrovanou zálohu vašich klíčů. Zvolte si silné heslo (např. delší frázi) aby byla záloha v bezpečí.",
     "Great! This passphrase looks strong enough.": "Super! Na první pohled to vypadá dostatečně silně.",
     "Keep going...": "Pokračujte...",
     "Set up with a Recovery Key": "Nastavit obnovovací klíč",
@@ -1217,7 +1217,7 @@
     "Repeat your passphrase...": "Zopakute heslo...",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie pokud byste zapomněl/a heslo k záloze.",
     "As a safety net, you can use it to restore your encrypted message history.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Obnovovací klíč je záchraná síť - lze použít k obnově zašifrovaných zpráv když zapomenete heslo.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Obnovovací klíč je záchranná síť - lze použít k obnově šifrovaných zpráv i když zapomenete heslo.",
     "Your Recovery Key": "Váš klíč pro obnovu zálohy",
     "Copy to clipboard": "Zkopírovat do schránky",
     "Download": "Stáhnout",
@@ -1235,13 +1235,13 @@
     "Unable to create key backup": "Nepovedlo se vyrobit zálohů klíčů",
     "Retry": "Zkusit znovu",
     "Set up Secure Messages": "Nastavit bezpečné obnovení zpráv",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste způsob obnovy neodstranili Vy, útočníci se můžou pokoušet dostat k vašemu účtu. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste způsob obnovy neodstranili vy, mohou se pokoušet k vašemu účtu dostat útočníci. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
     "Set up": "Nastavit",
     "Don't ask again": "Už se neptat",
     "New Recovery Method": "Nový způsob obnovy",
     "If you don't want to set this up now, you can later in Settings.": "Pokud nechcete nastavení dokončit teď, můžete se k tomu vrátit později v nastavení.",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Detekovali jsme nové heslo a klíč pro bezpečné obnovení.",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste nenastavili nový způsob obnovy Vy, útočníci se můžou pokoušet dostat k vašemu účtu. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Pokud jste nenastavili nový způsob obnovy vy, mohou se pokoušet k vašemu účtu dostat útočníci. Změňte si raději ihned heslo a nastavte nový způsob obnovy v Nastavení.",
     "Set up Secure Message Recovery": "Nastavit bezpečné obnovení zpráv",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Bez nastavení bezpečného obnovení zpráv přijdete po odhlášení o historii šifrované komunikace.",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "V šifrovaných konverzacích zobrazovat upozornění na možnost aktivovat bezpečné obnovení zpráv",
@@ -1250,12 +1250,12 @@
     "Custom user status messages": "Vlastní statusy",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Skupinkování a filtování místností podle štítků (vyžaduje znovunačtení stránky)",
     "Render simple counters in room header": "Zobrazovat stavová počítadla v hlavičce místnosti",
-    "Enable Community Filter Panel": "Povolit panel Filtr komunity",
-    "Show developer tools": "Zobrazit nástoje pro vývojáře",
+    "Enable Community Filter Panel": "Povolit panel Filtr skupiny",
+    "Show developer tools": "Zobrazit nástroje pro vývojáře",
     "Encrypted messages in group chats": "Šifrované zprávy ve skupinových konverzacích",
     "Open Devtools": "Otevřít nástroje pro vývojáře",
     "Credits": "Poděkování",
-    "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. ": "Už jste na adrese %(host)s použili novější verzi Riotu. Jestli chcete znovu používat tuto verzi i s E2E šifrováním, je potřeba se odhlásit a znovu přihlásit. ",
+    "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. ": "Už jste na adrese %(host)s použili novější verzi Riotu. Jestli chcete znovu používat tuto verzi i s end-to-end šifrováním, je potřeba se odhlásit a znovu přihlásit. ",
     "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.": "Na adrese %(host)s už jste použili Riot se zapnutou volbou načítání členů místností až při prvním zobrazení. V této verzi je načítání členů až při prvním zobrazení vypnuté. Protože je s tímto nastavením lokální vyrovnávací paměť nekompatibilní, Riot potřebuje znovu synchronizovat údaje z vašeho účtu.",
     "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.": "Pokud v jiné karťe otevřený jiný Riot, prosím zavřete ji, protože si dvě různé verze můžou navzájem působit problémy.",
     "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 teď používá 3-5× méně paměti, protože si informace o ostatních uživatelích načítá až když je potřebuje. Prosím počkejte na dokončení synchronizace se serverem!",
@@ -1265,25 +1265,25 @@
     "Set a new status...": "Nastavit status...",
     "Hide": "Skrýt",
     "This homeserver would like to make sure you are not a robot.": "Domovský server se potřebuje přesvědčit, že nejste robot.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Ve vlastních serverových volbách si můžete nastavit použití vlastního domovského serveru. To Vám umožní používat tuto aplikaci s existujícím Matrix účtem na jiném serveru.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Ve vlastním nastavení serveru můžete nastavit použití vlastního domovského serveru. To vám umožní používat tuto aplikaci s existujícím Matrix účtem na jiném serveru.",
     "Please review and accept all of the homeserver's policies": "Pročtěte si a odsouhlaste prosím všechna pravidla domovského serveru",
     "Please review and accept the policies of this homeserver:": "Pročtěte si a odsouhlaste prosím pravidla domovského serveru:",
-    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Vložte adresu serveru Modular. Může používat Vaši vlastní doménu a nebo poddoménu <a>modular.im</a>.",
+    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Zadejte adresu serveru Modular. Můžete použít svou vlastní doménu a nebo subdoménu <a>modular.im</a>.",
     "Homeserver URL": "URL domovského serveru",
-    "This homeserver does not support communities": "Tento domovský server nepodporuje komunity",
+    "This homeserver does not support communities": "Tento domovský server nepodporuje skupiny",
     "Invalid homeserver discovery response": "Neplatná odpověd při hledání domovského serveru",
     "Failed to perform homeserver discovery": "Nepovedlo se zjisit adresu domovského serveru",
     "Registration has been disabled on this homeserver.": "Tento domovský server nepovoluje registraci.",
     "Identity Server URL": "URL serveru identity",
     "Invalid identity server discovery response": "Neplatná odpověď při hledání serveru identity",
     "Your Modular server": "Váš server Modular",
-    "Server Name": "Jméno serveru",
+    "Server Name": "Název serveru",
     "The username field must not be blank.": "Je potřeba vyplnit uživatelské jméno.",
     "Username": "Uživatelské jméno",
-    "Not sure of your password? <a>Set a new one</a>": "Napamatujete si heslo? <a>Nastavte si nové</a>",
+    "Not sure of your password? <a>Set a new one</a>": "Nepamatujete si heslo? <a>Nastavte si nové</a>",
     "Change": "Změnit",
     "Create your account": "Vytvořte si účet",
-    "Email (optional)": "Email (nepovinné)",
+    "Email (optional)": "E-mail (nepovinné)",
     "Phone (optional)": "Telefonní číslo (nepovinné)",
     "Confirm": "Potvrdit",
     "Other servers": "Další servery",
@@ -1294,9 +1294,9 @@
     "Other": "Další možnosti",
     "Find other public servers or use a custom server": "Najděte si jiný veřejný server a nebo používejte svůj vlastní",
     "Couldn't load page": "Nepovedlo se načíst stránku",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Jste administrátor této komunity. Bez pozvání od jiného administrátora nebudete mít možnost se připojit zpět.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Jste správcem této skupiny. Bez pozvání od jiného správce nebudete mít možnost se připojit zpět.",
     "Guest": "Host",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Nastavení nového hesla je potřeba potvrdit. Bude Vám odeslán ověřovací email.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Nastavení nového hesla je potřeba potvrdit. Bude vám odeslán ověřovací e-mail.",
     "Sign in instead": "Přihlásit se",
     "Your password has been reset.": "Heslo bylo resetováno.",
     "Sign in with single sign-on": "Přihlásit se přes jednotné přihlašování",
@@ -1305,27 +1305,27 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Vloží ¯\\_(ツ)_/¯ na začátek zprávy",
     "Changes your display nickname in the current room only": "Pro tuto místnost změní vaší přezdívku",
     "User %(userId)s is already in the room": "Uživatel %(userId)s už je v této místnosti",
-    "The user must be unbanned before they can be invited.": "Uživatel je vykázán, nelze jej pozvat.",
+    "The user must be unbanned before they can be invited.": "Uživatel je vykázán, nelze ho pozvat.",
     "Show read receipts sent by other users": "Zobrazovat potvrzení o přijetí",
     "Order rooms in the room list by most important first instead of most recent": "Seřadit místosti v seznamu podle důležitosti místo podle posledního použití",
     "Scissors": "Nůžky",
-    "Accept all %(invitedRooms)s invites": "Přijmout všechny pozvánky: %(invitedRooms)s",
+    "Accept all %(invitedRooms)s invites": "Přijmout pozvání do všech těchto místností: %(invitedRooms)s",
     "Change room avatar": "Změnit avatar místnosti",
-    "Change room name": "Změnit jméno místnosti",
+    "Change room name": "Změnit název místnosti",
     "Change main address for the room": "Změnit hlavní adresu místnosti",
     "Change history visibility": "Změnit viditelnost historie",
     "Change permissions": "Změnit oprávnění",
     "Change topic": "Změnit téma",
-    "Modify widgets": "Pozměnit widgety",
-    "Send messages": "Poslat zprávy",
-    "Invite users": "Pozvat uživatele",
-    "Change settings": "Změnit nastavení",
+    "Modify widgets": "Spravovat widgety",
+    "Send messages": "Posílat zprávy",
+    "Invite users": "Zvát uživatele",
+    "Change settings": "Měnit nastavení",
     "Kick users": "Vykopnout uživatele",
     "Ban users": "Vykázat uživatele",
-    "Remove messages": "Odstranit zprávy",
-    "Notify everyone": "Upozornění pro celou místnost",
+    "Remove messages": "Mazat zprávy",
+    "Notify everyone": "Oznámení pro celou místnost",
     "Enable encryption?": "Povolit šifrování?",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Po zapnutí už nelze šifrování v této místnosti zakázat. Zprávy v šifrovaných místostech můžou číst jenom členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. <a>Více informací o šifrování.</a>",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Po zapnutí už nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jenom členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. <a>Více informací o šifrování.</a>",
     "Error updating main address": "Nepovedlo se změnit hlavní adresu",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Nastala chyba při pokusu o nastavení hlavní adresy místnosti. Mohl to zakázat server, nebo to může být dočasná chyba.",
     "Error creating alias": "Nepovedlo se vyrobit alias",
@@ -1340,15 +1340,15 @@
     "Sign in to your Matrix account on %(serverName)s": "Přihlašte se k účtu Matrix na %(serverName)s",
     "Create your Matrix account on %(serverName)s": "Vytvořte si účet Matrix na %(serverName)s",
     "Could not load user profile": "Nepovedlo se načíst profil uživatele",
-    "Your Matrix account on %(serverName)s": "Váš účet Matrix na %(serverName)s",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Jestli používáte funkci \"breadcrumb\" (ikony nad seznamem místností)",
+    "Your Matrix account on %(serverName)s": "Váš účet Matrix na serveru %(serverName)s",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Zda používáte funkci \"breadcrumb\" (ikony nad seznamem místností)",
     "A conference call could not be started because the integrations server is not available": "Nelze spustit konferenční hovor, protože začleňovací server není dostupný",
     "Replying With Files": "Odpovídání souborem",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Aktuálně nelze odpovědět souborem. Chcete soubor nahrát a poslat bez odpovídání?",
     "The file '%(fileName)s' failed to upload.": "Soubor '%(fileName)s' se nepodařilo nahrát.",
     "The server does not support the room version specified.": "Server nepodporuje určenou verzi místnosti.",
     "Name or Matrix ID": "Jméno nebo Matrix ID",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varování</b>: Upgrade místnosti <i>automaticky převede všechny členy na novou verzi místnosti.</i> Do staré místnosti pošleme odkaz na novou místnost - všichni členové na něj budou muset kliknout, aby se přidali do nové místnosti.",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Varování</b>: Upgrade místnosti <i>automaticky převede všechny členy na novou verzi místnosti.</i> Do staré místnosti pošleme odkaz na novou místnost - všichni členové na něj budou muset klepnout, aby se přidali do nové místnosti.",
     "Changes your avatar in this current room only": "Změní váš avatar jen v této místnosti",
     "Unbans user with given ID": "Přijmout zpět uživatele s daným identifikátorem",
     "Adds a custom widget by URL to the room": "Přidá do místnosti vlastní widget podle adresy URL",
@@ -1356,15 +1356,15 @@
     "You cannot modify widgets in this room.": "V této místnosti nemůžete manipulovat s widgety.",
     "Sends the given message coloured as a rainbow": "Pošle zprávu v barvách duhy",
     "Sends the given emote coloured as a rainbow": "Pošle reakci v barvách duhy",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s přidal této místnosti vztah s komunitou %(groups)s.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s odebral této místnosti vztah s komunitou %(groups)s.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s přidal této místnosti vztah s komunitou %(newGroups)s a odebral vztah s %(oldGroups)s.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Uživatel %(senderDisplayName)s přidal této místnosti příslušnost ke skupině %(groups)s.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Uživatel %(senderDisplayName)s odebral této místnosti příslušnost ke skupině %(groups)s.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Uživatel %(senderDisplayName)s přidal této místnosti příslušnost ke skupině %(newGroups)s a odebral k %(oldGroups)s.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s zrušil pozvání do této místnosti pro uživatele %(targetDisplayName)s.",
     "No homeserver URL provided": "Nebyla zadána URL adresa domovského server",
     "Unexpected error resolving homeserver configuration": "Chyba při zjišťování konfigurace domovského serveru",
     "The user's homeserver does not support the version of the room.": "Uživatelův domovský server nepodporuje verzi této místnosti.",
-    "Show hidden events in timeline": "Zobrazovat skryté události",
-    "When rooms are upgraded": "Když je proveden upgrade místnosti",
+    "Show hidden events in timeline": "Zobrazovat v časové ose skryté události",
+    "When rooms are upgraded": "Upgrade místnosti",
     "<a>Upgrade</a> to your own domain": "<a>Přejít</a> na vlastní doménu",
     "Upgrade this room to the recommended room version": "Provést upgrade místnosti na doporučenou verzi",
     "this room": "tato místnost",
@@ -1372,55 +1372,55 @@
     "Default role": "Výchozí role",
     "Send %(eventType)s events": "Poslat událost %(eventType)s",
     "Select the roles required to change various parts of the room": "Vyberte role potřebné k provedení různých změn v této místnosti",
-    "Joining room …": "Připojování se k místnosti …",
+    "Joining room …": "Vstupování do místnosti…",
     "Loading …": "Načítání …",
-    "Rejecting invite …": "Odmítání pozvánky …",
+    "Rejecting invite …": "Odmítání pozvánky…",
     "Join the conversation with an account": "Připojte se ke konverzaci s účtem",
     "Sign Up": "Zaregistrovat se",
     "Sign In": "Přihlásit se",
-    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s vás vykopl z místnosti %(roomName)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "Uživatel %(memberName)s vás vykopl z místnosti %(roomName)s",
     "Reason: %(reason)s": "Důvod: %(reason)s",
     "Forget this room": "Zapomenout na tuto místnost",
-    "Re-join": "Znovu se přidat",
-    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s vás vykázal z místnosti %(roomName)s",
-    "Something went wrong with your invite to %(roomName)s": "Něco se pokazilo s vaší pozvánkou do místnosti %(roomName)s",
-    "You can only join it with a working invite.": "Můžete se připojit jen s funkční pozvánkou.",
-    "You can still join it because this is a public room.": "Můžete se stejně připojit, tato místnost je veřejná.",
-    "Join the discussion": "Připojit se k diskuzi",
-    "Try to join anyway": "Stejně se zkusit připojit",
+    "Re-join": "Znovu vstoupit",
+    "You were banned from %(roomName)s by %(memberName)s": "Uživatel %(memberName)s vás vykázal z místnosti %(roomName)s",
+    "Something went wrong with your invite to %(roomName)s": "S vaší pozvánkou do místnosti %(roomName)s se něco pokazilo",
+    "You can only join it with a working invite.": "Vstoupit můžete jen s funkční pozvánkou.",
+    "You can still join it because this is a public room.": "I přesto můžete vstoupit, protože tato místnost je veřejná.",
+    "Join the discussion": "Zapojit se do diskuze",
+    "Try to join anyway": "Stejně se pokusit vstoupit",
     "Do you want to chat with %(user)s?": "Chcete si povídat s uživatelem %(user)s?",
-    "Do you want to join %(roomName)s?": "Chcete se přidat do místnosti %(roomName)s?",
-    "<userName/> invited you": "<userName/> vás pozval",
-    "You're previewing %(roomName)s. Want to join it?": "Prohlížíte si místnost %(roomName)s. Chcete se do ní přidat?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s si nelze jen tak prohlížet. Chcete se do ní přidat?",
+    "Do you want to join %(roomName)s?": "Chcete vstoupit do místnosti %(roomName)s?",
+    "<userName/> invited you": "Uživatel <userName/> vás pozval",
+    "You're previewing %(roomName)s. Want to join it?": "Nahlížíte do místnosti %(roomName)s. Chcete do ní vstoupit?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s si nelze jen tak prohlížet. Chcete do ní vstoupit?",
     "This room doesn't exist. Are you sure you're at the right place?": "Tato místnost neexistuje. Jste si jistí, že jste na správném místě?",
-    "Try again later, or ask a room admin to check if you have access.": "Zkuste to znovu nebo se zeptejte administrátora aby zkontrolovat jestli máte přístup.",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Při pokusu o připojení došlo k chybě: %(errcode)s. Pokud si myslíte, že je to bug, můžete ho <issueLink>nahlásit</issueLink>.",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrade místnosti vypne její aktuální verzi a vyrobí novou místnost se stejným jménem a novou verzí.",
+    "Try again later, or ask a room admin to check if you have access.": "Zkuste to znovu nebo se zeptejte správce, zda může zkontrolovat váš přístup.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Při pokusu o vstup do místnosti došlo k chybě: %(errcode)s. Pokud si myslíte, že je to chyba, <issueLink>nahlaste ji</issueLink>.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrade místnosti vypne její aktuální verzi a vyrobí novou místnost se stejným názvem a novou verzí.",
     "This room has already been upgraded.": "V této místnostu už byl proveden upgrade.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Tato místnost běží na verzi <roomVersion />, což domovský server označuje za <i>nestabilní</i>.",
-    "Failed to revoke invite": "Nepovedlo se stáhnout pozvánku",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Nepovedlo se stáhnout pozvánku. Mohlo dojít k dočasnému problému nebo na to nemáte dostatečná práva.",
-    "Revoke invite": "Stáhnout pozvánku",
+    "Failed to revoke invite": "Pozvání se nepovedlo zrušit",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Pozvání se nepovedlo zrušit. Mohlo dojít k dočasnému problému nebo na to nemáte dostatečná práva.",
+    "Revoke invite": "Zrušit pozvání",
     "Invited by %(sender)s": "Pozván od uživatele %(sender)s",
-    "Error updating flair": "Nepovedlo se změnit vztah s komunitou",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pro tutu místnost se nepovedlo změnit vztah s komunitou. Možná to server neumožňuje, nebo došlo k dočasné chybě.",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>regoval/a %(shortName)s</reactedWith>",
+    "Error updating flair": "Nepovedlo se změnit příslušnost ke skupině",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pro tuto místnost se nepovedlo změnit příslušnost ke skupině. Možná to server neumožňuje, nebo došlo k dočasné chybě.",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "Uživatel <reactors/><reactedWith>reagoval s %(shortName)s</reactedWith>",
     "edited": "pozměněno",
     "Maximize apps": "Maximalizovat aplikace",
     "Rotate Left": "Otočit doleva",
     "Rotate counter-clockwise": "Otočit proti směru hodinových ručiček",
     "Rotate Right": "Otočit doprava",
     "Rotate clockwise": "Otočit po směru hodinových ručiček",
-    "Edit message": "Pozměnit zprávu",
+    "Edit message": "Upravit zprávu",
     "GitHub issue": "issue na GitHubu",
     "Notes": "Poznámky",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Pokud máte libovolné další informace, které by nám pomohly najít problém, tak nám je taky napište. Může pomoct kdy k problému došlo, identifikátory místnost a uživatele, ...",
     "View Servers in Room": "Zobrazit servery v místnosti",
     "Sign out and remove encryption keys?": "Odhlásit a odstranit šifrovací klíče?",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Abychom tomu mohli pro příště předejít, <a>pošlete nám prosím logy</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Abychom tomu mohli pro příště předejít, <a>pošlete nám prosím záznamy</a>.",
     "Missing session data": "Chybějící data relace",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Některá data sezení, například klíče od šifrovaných zpráv, nám chybí. Přihlašte se prosím znovu a obnovte si klíče ze zálohy.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Některá data sezení, například klíče od šifrovaných zpráv, nám chybí. Přihlaste se prosím znovu a obnovte si klíče ze zálohy.",
     "Your browser likely removed this data when running low on disk space.": "Prohlížeč data možná smazal aby ušetřil místo na disku.",
     "Upload files (%(current)s of %(total)s)": "Nahrát soubory (%(current)s z %(total)s)",
     "Upload files": "Nahrát soubory",
@@ -1433,20 +1433,20 @@
     "Cancel All": "Zrušit vše",
     "Upload Error": "Chyba při nahrávání",
     "A widget would like to verify your identity": "Widget by chtěl ověřit vaší identitu",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Widget z adresy %(widgetUrl)s by chtěl ověřit vaší identitu. Povolením umožnítě widgetu ověřit vaše uživatelské ID, ale neumožníte mu provádět vaším jménem žádné operace.",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Widget z adresy %(widgetUrl)s by chtěl ověřit vaší identitu. Povolením umožníte widgetu ověřit vaše uživatelské ID, ale neumožníte mu provádět vaším jménem žádné operace.",
     "Remember my selection for this widget": "Zapamatovat si volbu pro tento widget",
     "Deny": "Zakázat",
     "Unable to validate homeserver/identity server": "Nepovedlo se ověřit domovský server nebo server identity",
     "Sign in to your Matrix account on <underlinedServerName />": "Přihlašte se k Matrix účtu na serveru <underlinedServerName />",
-    "Use an email address to recover your account": "Použít emailovou adresu k obnovení přístupu k účtu",
-    "Enter email address (required on this homeserver)": "Zadejte emailovou adresu (vyžaduje jí tento domovský server)",
-    "Doesn't look like a valid email address": "To nevypadá jako emailová adresa",
+    "Use an email address to recover your account": "Použít e-mailovou adresu k obnovení přístupu k účtu",
+    "Enter email address (required on this homeserver)": "Zadejte e-mailovou adresu (tento domovský server ji vyžaduje)",
+    "Doesn't look like a valid email address": "To nevypadá jako e-mailová adresa",
     "Enter password": "Zadejte heslo",
     "Password is allowed, but unsafe": "Heslo můžete použít, ale není bezpečné",
     "Nice, strong password!": "Super, to vypadá jako rozumné heslo!",
     "Passwords don't match": "Hesla nejsou stejná",
-    "Other users can invite you to rooms using your contact details": "Ostatní uživatelá vás můžou pozvat do místností podle kontaktních údajů",
-    "Enter phone number (required on this homeserver)": "Zadejte telefonní číslo (domovský server jej vyžaduje)",
+    "Other users can invite you to rooms using your contact details": "Ostatní uživatelé vás můžou pozvat do místností podle kontaktních údajů",
+    "Enter phone number (required on this homeserver)": "Zadejte telefonní číslo (domovský server ho vyžaduje)",
     "Doesn't look like a valid phone number": "To nevypadá jako telefonní číslo",
     "Enter username": "Zadejte uživatelské jméno",
     "Some characters not allowed": "Nějaké znaky jsou zakázané",
@@ -1457,10 +1457,10 @@
     "Riot failed to get the public room list.": "Riot nemohl načíst seznam veřejných místností.",
     "The homeserver may be unavailable or overloaded.": "Domovský server je nedostupný nebo přetížený.",
     "Add room": "Přidat místnost",
-    "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených notifikací v předchozí verzi této místnosti.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtenou notifikaci v předchozí verzi této místnosti.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Máte jedno nepřečtené oznámení v předchozí verzi této místnosti.",
     "Your profile": "Váš profil",
-    "Your Matrix account on <underlinedServerName />": "Váš Matrix účet na serveru <underlinedServerName />",
+    "Your Matrix account on <underlinedServerName />": "Váš účet Matrix na serveru <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Nepovedlo se automaticky načíst konfiguraci ze serveru",
     "Invalid base_url for m.homeserver": "Neplatná base_url pro m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Na URL domovského serveru asi není funkční Matrix server",
@@ -1470,36 +1470,36 @@
     "Low bandwidth mode": "Mód nízké spotřeby dat",
     "Uploaded sound": "Zvuk nahrán",
     "Sounds": "Zvuky",
-    "Notification sound": "Zvuk notifikace",
-    "Reset": "Resetovat",
+    "Notification sound": "Zvuk oznámení",
+    "Reset": "Obnovit výchozí",
     "Set a new custom sound": "Nastavit vlastní zvuk",
-    "Browse": "Prohlížet",
+    "Browse": "Procházet",
     "Cannot reach homeserver": "Nelze se připojit k domovskému serveru",
-    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ujistěte se, že máte stabilní internetové připojení. Případně problém řešte s administrátorem serveru",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Ujistěte se, že máte stabilní internetové připojení. Případně problém řešte se správcem serveru",
     "Your Riot is misconfigured": "Riot je špatně nakonfigurován",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Zeptejte se svého administrátora, jestli by vám nezkontrolovat <a>konfiguraci Riotu</a>, asi obsahuje chyby nebo duplicity.",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Požádejte správce vašeho Riotu, aby zkontroloval <a>vaši konfiguraci</a>. Pravděpodobně obsahuje chyby nebo duplicity.",
     "Unexpected error resolving identity server configuration": "Chyba při hledání konfigurace serveru identity",
     "Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka",
     "Cannot reach identity server": "Nelze se připojit k serveru identity",
-    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se zaregistrovat, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru.",
-    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete si změnit heslo, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru.",
-    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se přihlásit, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru.",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se zaregistrovat, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete si změnit heslo, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se přihlásit, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte správce serveru.",
     "Call failed due to misconfigured server": "Volání selhalo, protože je rozbitá konfigurace serveru",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Zeptejte se administrátora (<code>%(homeserverDomain)s</code>) jestli by nemohl nakonfigurovat server TURN, aby začalo fungoval volání.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Zeptejte se správce (<code>%(homeserverDomain)s</code>) jestli by nemohl nakonfigurovat server TURN, aby začalo fungoval volání.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Případně můžete zkusit použít veřejný server <code>turn.matrix.org</code>, což nemusí fungovat tak spolehlivě a řekne to tomu cizímu serveru vaší IP adresu. Můžete to udělat v Nastavení.",
     "Try using turn.matrix.org": "Zkuste použít turn.matrix.org",
     "Messages": "Zprávy",
     "Actions": "Akce",
     "Sends a message as plain text, without interpreting it as markdown": "Pošle zprávu jako prostý text, neinterpretuje jí jako Markdown",
     "You do not have the required permissions to use this command.": "Na provedení tohoto příkazu nemáte dostatečná oprávnění.",
-    "Changes the avatar of the current room": "Změní váš avatar pro tuto místnost",
+    "Changes the avatar of the current room": "Změní avatar této místnosti",
     "Changes your avatar in all rooms": "Změní váš avatar pro všechny místnosti",
     "Use an identity server": "Používat server identit",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Použít server identit na odeslání emailové pozvánky. Pokračováním použijete výchozí server identit  (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.",
-    "Use an identity server to invite by email. Manage in Settings.": "Použít server identit na odeslání emailové pozvánky. Můžete spravovat v Nastavení.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Použít server identit k odeslání e-mailové pozvánky. Pokračováním použijete výchozí server identit (%(defaultIdentityServerName)s) nebo ho můžete změnit v Nastavení.",
+    "Use an identity server to invite by email. Manage in Settings.": "Použít server identit na odeslání e-mailové pozvánky. Můžete spravovat v Nastavení.",
     "Displays list of commands with usages and descriptions": "Zobrazuje seznam příkazu s popiskem",
     "%(senderName)s made no change.": "%(senderName)s neudělal žádnou změnu.",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Povolit použití serveru turn.matrix.org na spojení hlasového hovoru pokud váš domovský server tuto služby neposkytuje (sdělí to serveru vaší IP adresu)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Povolit použití serveru turn.matrix.org pro hlasové hovory pokud váš domovský server tuto službu neposkytuje (vaše IP adresu bude během hovoru viditelná)",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Odesílat potvrzení o přijetí (vypnutá volba vyžaduje kompatibilní domovský server)",
     "Accept <policyLink /> to continue:": "Pro pokračování odsouhlaste <policyLink />:",
     "ID": "ID",
@@ -1518,20 +1518,20 @@
     "Disconnect from the identity server <idserver />?": "Odpojit se ze serveru identit <idserver />?",
     "Disconnect": "Odpojit",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Pořád <b>sdílíte osobní údaje</b> se serverem identit <idserver />.",
-    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Předtím než se odpojíte doporučujeme odstranit emailovou adresu a telefonní číslo ze serveru identit.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Než se odpojíte, doporučujeme odstranit e-mailovou adresu a telefonní číslo ze serveru identit.",
     "Disconnect anyway": "Stejně se odpojit",
     "Identity Server (%(server)s)": "Server identit (%(server)s)",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Aktuálně používáte server <server></server> na hledání existujících kontaktů. Níže můžete server identit změnit.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Pro hledání existujících kontaktů používáte server identit <server></server>. Níže ho můžete změnit.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Pokud nechcete na hledání existujících kontaktů používat server <server />, zvolte si jiný server.",
     "Identity Server": "Server identit",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Aktuálně nepoužíváte žádný server identit. Na hledání existujících kontaktů a přidání se do registru kontatů přidejte server identit níže.",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Odpojení ze serveru identit znamená, že vás nepůjde najít podle emailové adresy ani telefonního čísla and vy také nebudete moct hledat ostatní.",
-    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Použití serveru identit je volitelné. Nemusíte server identit používat, ale nepůjde vás pak najít podle emailové adresy ani telefonního čísla a vy také nebudete moct hledat ostatní.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Pro hledání existujících kontaktů nepoužíváte žádný server identit <server></server>. Abyste mohli hledat kontakty, nějaký níže nastavte.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Po odpojení od serveru identit nebude možné vás najít podle e-mailové adresy ani telefonního čísla, a zároveň podle nich ani vy nebudete moci hledat ostatní kontakty.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Použití serveru identit je volitelné. Nemusíte server identit používat, ale nepůjde vás pak najít podle e-mailové adresy ani telefonního čísla a vy také nebudete moci hledat ostatní.",
     "Do not use an identity server": "Nepoužívat server identit",
     "Enter a new identity server": "Zadejte nový server identit",
     "Integration Manager": "Správce integrací",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Musíte odsouhlasit podmínky použití serveru (%(serverName)s) abyste se mohli zapsat do registru emailových adres a telefonních čísel.",
-    "Deactivate account": "Deaktivovat účet",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Pro zapsáním do registru e-mailových adres a telefonních čísel odsouhlaste podmínky používání serveru (%(serverName)s).",
+    "Deactivate account": "Deaktivace účtu",
     "Always show the window menu bar": "Vždy zobrazovat horní lištu okna",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Odeslat pozvánku pomocí serveru identit. <default>Použít výchozí (%(defaultIdentityServerName)s)</default> nebo přenastavit <settings>Nastavení</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Odeslat pozvánku pomocí serveru identit. Přenastavit v <settings>Nastavení</settings>.",
@@ -1539,67 +1539,67 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Napište nám prosím co se pokazilo a nebo nám napište issue na GitHub, kde popíšete problém.",
     "Removing…": "Odstaňování…",
     "Clear all data": "Smazat všechna data",
-    "Please enter a name for the room": "Zadejte prosím jméno místnosti",
+    "Please enter a name for the room": "Zadejte prosím název místnosti",
     "Set a room alias to easily share your room with other people.": "Nastavte alias místnosti, abyste mohli místnost snadno sdílet s ostatními.",
-    "This room is private, and can only be joined by invitation.": "Tato místnost je neveřejná a lze se připojit pouze s pozvánkou.",
+    "This room is private, and can only be joined by invitation.": "Tato místnost je neveřejná a lze do ní vstoupit jen s pozvánkou.",
     "Create a public room": "Vytvořit veřejnou místnost",
     "Create a private room": "Vytvořit neveřejnou místnost",
     "Topic (optional)": "Téma (volitelné)",
     "Make this room public": "Zveřejnit místnost",
     "Hide advanced": "Skrýt pokročilé",
     "Show advanced": "Zobrazit pokročilé",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby se připojili do místnosti (Toto nelze později změnit!)",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby do místnosti vstoupili (nelze později změnit!)",
     "Your homeserver doesn't seem to support this feature.": "Váš domovský server asi tuto funkci nepodporuje.",
     "Message edits": "Editování zpráv",
     "Please fill why you're reporting.": "Vyplňte prosím co chcete nahlásit.",
-    "Report Content to Your Homeserver Administrator": "Nahlásit obsah administrátorovi vašeho domovského serveru",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Nahlášení této zprávy pošle její jedinečné 'event ID' administrátorovi vašeho domovského serveru. Pokud jsou zprávy šifrované, administrátor nebude mít možnost přečíst text zprávy ani se podívat na soubory nebo obrázky.",
+    "Report Content to Your Homeserver Administrator": "Nahlásit obsah správci vašeho domovského serveru",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Nahlášení této zprávy pošle její jedinečné 'event ID' správci vašeho domovského serveru. Pokud jsou zprávy šifrované, správce nebude mít možnost přečíst text zprávy ani se podívat na soubory nebo obrázky.",
     "Send report": "Nahlásit",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Upgrade vyžaduje zrušení této místnosti a vyrobení nové, která jí nahradí. Pro usnadnění procesu pro členy místnosti, provedeme:",
     "Command Help": "Nápověda příkazu",
-    "Find others by phone or email": "Hledat ostatní pomocí emailu nebo telefonu",
-    "Be found by phone or email": "Umožnit ostatním mě nalézt pomocí emailu nebo telefonu",
-    "Add Email Address": "Přidat emailovou adresu",
+    "Find others by phone or email": "Najít ostatní pomocí e-mailu nebo telefonu",
+    "Be found by phone or email": "Umožnit ostatním mě nalézt pomocí e-mailu nebo telefonu",
+    "Add Email Address": "Přidat e-mailovou adresu",
     "Add Phone Number": "Přidat telefonní číslo",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Tato akce vyžaduje přístup k výchozímu serveru identity <server /> aby šlo ověřit email a telefon, ale server nemá podmínky použití.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Tato akce vyžaduje přístup k výchozímu serveru identity <server /> aby šlo ověřit e-mail a telefon, ale server nemá podmínky použití.",
     "Trust": "Důvěra",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Multiple integration managers": "Více správců integrací",
     "Show previews/thumbnails for images": "Zobrazovat náhledy obrázků",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Před odpojením byste měli <b>smazat osobní údaje</b> ze serveru identit <idserver />. Bohužel, server je offline nebo neodpovídá.",
     "You should:": "Měli byste:",
-    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "zkontrolujte, jestli nemáte v prohlížeči nějaký doplněk blokující server identit (například Privacy Badger)",
-    "contact the administrators of identity server <idserver />": "konaktujte administrátora serveru identit <idserver />",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "zkontrolujte, jestli nemáte v prohlížeči nějaký doplněk blokující server identit (např. Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "kontaktujte správce serveru identit <idserver />",
     "wait and try again later": "počkejte z zkuste to znovu později",
-    "Discovery": "Nalezitelnost",
+    "Discovery": "Veřejné",
     "Clear cache and reload": "Smazat mezipaměť a načíst znovu",
     "Show tray icon and minimize window to it on close": "Zobrazovat systémovou ikonu a minimalizovat při zavření",
-    "Read Marker lifetime (ms)": "životnost značky přečteno (ms)",
-    "Read Marker off-screen lifetime (ms)": "životnost značky přečteno mimo obrazovku (ms)",
+    "Read Marker lifetime (ms)": "Platnost značky přečteno (ms)",
+    "Read Marker off-screen lifetime (ms)": "Platnost značky přečteno mimo obrazovku (ms)",
     "Upgrade the room": "Upgradovat místnost",
     "Enable room encryption": "Povolit v místnosti šifrování",
     "Error changing power level requirement": "Chyba změny požadavku na úroveň oprávnění",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Došlo k chybě při změně požadované úrovně oprávnění v místnosti. Ubezpečte se, že na to máte dostatečná práva a zkuste to znovu.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Došlo k chybě při změně požadované úrovně oprávnění v místnosti. Ubezpečte se, že na to máte dostatečná práva, a zkuste to znovu.",
     "Error changing power level": "Chyba při změně úrovně oprávnění",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Došlo k chybě při změně úrovně oprávnění uživatele. Ubezpečte se, že na to máte dostatečná práva a zkuste to znovu.",
-    "Unable to revoke sharing for email address": "Nepovedlo se zrušit sdílení emailové adresy",
-    "Unable to share email address": "Nepovedlo se nasdílet emailovou adresu",
-    "Your email address hasn't been verified yet": "Vaše emailová adresa nebyla zatím verifikována",
-    "Click the link in the email you received to verify and then click continue again.": "Pro verifikaci a pokračování klikněte na odkaz v emailu, který vím přišel.",
-    "Verify the link in your inbox": "Ověřte odkaz v emailové schánce",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Došlo k chybě při změně úrovně oprávnění uživatele. Ubezpečte se, že na to máte dostatečná práva, a zkuste to znovu.",
+    "Unable to revoke sharing for email address": "Nepovedlo se zrušit sdílení e-mailové adresy",
+    "Unable to share email address": "Nepovedlo se nasdílet e-mailovou adresu",
+    "Your email address hasn't been verified yet": "Vaše e-mailová adresa ještě nebyla ověřena",
+    "Click the link in the email you received to verify and then click continue again.": "Pro ověření a pokračování klepněte na odkaz v e-mailu, který vím přišel.",
+    "Verify the link in your inbox": "Ověřte odkaz v e-mailové schránce",
     "Complete": "Dokončit",
     "Revoke": "Zneplatnit",
     "Share": "Sdílet",
-    "Discovery options will appear once you have added an email above.": "Možnosti nalezitelnosti se objeví až výše přidáte svou emailovou adresu.",
+    "Discovery options will appear once you have added an email above.": "Možnosti nastavení veřejného profilu se objeví po přidání e-mailové adresy výše.",
     "Unable to revoke sharing for phone number": "Nepovedlo se zrušit sdílení telefonního čísla",
     "Unable to share phone number": "Nepovedlo se nasdílet telefonní číslo",
     "Please enter verification code sent via text.": "Zadejte prosím ověřovací SMS kód.",
-    "Discovery options will appear once you have added a phone number above.": "Možnosti nalezitelnosti se objeví až zadáte telefonní číslo výše.",
-    "Remove %(email)s?": "Odstranit %(email)s?",
+    "Discovery options will appear once you have added a phone number above.": "Možnosti nastavení veřejného profilu se objeví po přidání telefonního čísla výše.",
+    "Remove %(email)s?": "Odstranit adresu %(email)s?",
     "Remove %(phone)s?": "Odstranit %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "SMS zpráva byla odeslána na +%(msisdn)s. Zadejte prosím ověřovací kód, který obsahuje.",
     "No recent messages by %(user)s found": "Nebyly nalezeny žádné nedávné zprávy od uživatele %(user)s",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Zkuste zascrollovat nahoru, jestli tam nejsou nějaké dřívější.",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Zkuste posunout časovou osu nahoru, jestli tam nejsou nějaké dřívější.",
     "Remove recent messages by %(user)s": "Odstranit nedávné zprávy od uživatele %(user)s",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Odstraňujeme %(count)s zpráv od %(user)s. Nelze to vzít zpět. Chcete pokračovat?",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Odstraňujeme jednu zprávu od %(user)s. Nelze to vzít zpět. Chcete pokračovat?",
@@ -1607,7 +1607,7 @@
     "Remove %(count)s messages|other": "Odstranit %(count)s zpráv",
     "Remove %(count)s messages|one": "Odstranit zprávu",
     "Deactivate user?": "Deaktivovat uživatele?",
-    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deaktivování uživatele ho odhlásí a zabrání mu v opětovném přihlášení. Navíc bude ostraněn ze všech místností. Akci nelze vzít zpět. Jste si jistí, že chcete uživatele deaktivovat?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deaktivování uživatele ho odhlásí a zabrání mu v opětovném přihlášení. Navíc bude odstraněn ze všech místností. Akci nelze vzít zpět. Opravdu chcete uživatele deaktivovat?",
     "Deactivate user": "Deaktivovat uživatele",
     "Remove recent messages": "Odstranit nedávné zprávy",
     "Bold": "Tučně",
@@ -1617,12 +1617,12 @@
     "Room %(name)s": "Místnost %(name)s",
     "Recent rooms": "Nedávné místnosti",
     "Loading room preview": "Načítání náhdledu místnosti",
-    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Při ověřování pozvánky jsme dostali chybu (%(errcode)s). Můžete zkusit tuto informaci předat administrátorovi místnosti.",
-    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Pozvánka do místnosti %(roomName)s byla poslána na %(email)s, který není přidaný k tomuto účtu",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Přidejte si tento email k účtu v Nastavení, abyste dostávali pozvání přímo v Riotu.",
-    "This invite to %(roomName)s was sent to %(email)s": "Pozvánka do %(roomName)s byla odeslána na %(email)s",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Při ověřování pozvánky došlo k chybě (%(errcode)s). Předejte tuto informaci správci místnosti.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Pozvánka do místnosti %(roomName)s byla poslána na adresu %(email)s, která není k tomuto účtu přidána",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Přidejte si tento e-mail k účtu v Nastavení, abyste dostávali pozvání přímo v Riotu.",
+    "This invite to %(roomName)s was sent to %(email)s": "Pozvánka do %(roomName)s byla odeslána na adresu %(email)s",
     "Use an identity server in Settings to receive invites directly in Riot.": "Používat server identit z nastavení k přijímání pozvánek přímo v Riotu.",
-    "Share this email in Settings to receive invites directly in Riot.": "Sdílet tento email v nastavení, abyste mohli dostávat pozvánky přímo v Riotu.",
+    "Share this email in Settings to receive invites directly in Riot.": "Sdílet tento e-mail v nastavení, abyste mohli dostávat pozvánky přímo v Riotu.",
     "%(count)s unread messages including mentions.|other": "%(count)s nepřečtených zpráv a zmínek.",
     "%(count)s unread messages including mentions.|one": "Nepřečtená zmínka.",
     "%(count)s unread messages.|other": "%(count)s nepřečtených zpráv.",
@@ -1637,11 +1637,11 @@
     "Show image": "Zobrazit obrázek",
     "You verified %(name)s": "Ověřili jste %(name)s",
     "You cancelled verifying %(name)s": "Zrušili jste ověření %(name)s",
-    "%(name)s cancelled verifying": "%(name)s zrušil/a ověření",
+    "%(name)s cancelled verifying": "Uživatel %(name)s zrušil ověření",
     "You accepted": "Přijali jste",
-    "%(name)s accepted": "%(name)s přijal/a",
+    "%(name)s accepted": "Uživatel %(name)s přijal",
     "You cancelled": "Zrušili jste",
-    "%(name)s cancelled": "%(name)s zrušil/a",
+    "%(name)s cancelled": "Uživatel %(name)s zrušil",
     "%(name)s wants to verify": "%(name)s chce ověřit",
     "You sent a verification request": "Poslali jste požadavek na ověření",
     "Show all": "Zobrazit vše",
@@ -1658,12 +1658,12 @@
     "Quick Reactions": "Rychlé reakce",
     "Cancel search": "Zrušit hledání",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vyrobte prosím <newIssueLink>nové issue</newIssueLink> na GitHubu abychom mohli chybu opravit.",
-    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neudělali %(count)s krát žádnou změnu",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sneudělali žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sneudělal %(count)s krát žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sneudělal žádnou změnu",
+    "%(severalUsers)smade no changes %(count)s times|other": "Uživatelé %(severalUsers)s neudělali %(count)s krát žádnou změnu",
+    "%(severalUsers)smade no changes %(count)s times|one": "Uživatelé %(severalUsers)s neudělali žádnou změnu",
+    "%(oneUser)smade no changes %(count)s times|other": "Uživatel %(oneUser)s neudělal %(count)s krát žádnou změnu",
+    "%(oneUser)smade no changes %(count)s times|one": "Uživatel %(oneUser)s neudělal žádnou změnu",
     "Room alias": "Alias místnosti",
-    "e.g. my-room": "například moje-mistost",
+    "e.g. my-room": "např. moje-mistnost",
     "Please provide a room alias": "Zadejte prosím alias místnosti",
     "This alias is available to use": "Tento alias je volný",
     "This alias is already in use": "Tento alias už je používán",
@@ -1678,22 +1678,22 @@
     "Resend %(unsentCount)s reaction(s)": "Poslat %(unsentCount)s reakcí znovu",
     "Resend removal": "Odeslat smazání znovu",
     "Report Content": "Nahlásit obsah",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Na domovském serveru chybí veřejný klíč pro captcha. Nahlaste to prosím administrátorovi serveru.",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Žádný server identit není nakonfigurován, takže nemůžete přidat emailovou adresu pro obnovení hesla.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nastavit emailovou adresu pro obnovení hesla. Také můžete použít email nebo telefon, aby vás vaši přátelé snadno nalezli.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nastavit emailovou adresu pro obnovení hesla. Také můžete použít email, aby vás vaši přátelé snadno nalezli.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Zadejte adresu domovského serveru <a>Co to znamená?</a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Zadejte adresu serveru identit <a>Co to znamená?</a>",
-    "Explore": "Prohlížet",
-    "Filter": "Filtrovat",
-    "Filter rooms…": "Filtrovat místnosti…",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Na domovském serveru chybí veřejný klíč pro captcha. Nahlaste to prosím správci serveru.",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Žádný server identit není nakonfigurován, takže nemůžete přidat e-mailovou adresu pro obnovení hesla.",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nastavte si e-mailovou adresu pro obnovení hesla. E-mail nebo telefon můžete také použít, aby vás vaši přátelé snadno našli.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nastavte si e-mailovou adresu pro obnovení hesla. E-mail můžete také použít, aby vás vaši přátelé snadno našli.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Zadejte adresu domovského serveru. <a>Co to znamená?</a>",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Zadejte adresu serveru identit. <a>Co to znamená?</a>",
+    "Explore": "Procházet",
+    "Filter": "Filtr místností",
+    "Filter rooms…": "Najít místnost…",
     "%(creator)s created and configured the room.": "%(creator)s vytvořil a nakonfiguroval místnost.",
     "Preview": "Náhled",
     "View": "Zobrazit",
     "Find a room…": "Najít místnost…",
-    "Find a room… (e.g. %(exampleRoom)s)": "Najít místnost… (například %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Pokud nemůžete nelézt místnost, kterou hledáte, napište si o pozvánku nebo <a>Vytvořte novou</a>.",
-    "Explore rooms": "Prohlížet místnosti",
+    "Find a room… (e.g. %(exampleRoom)s)": "Najít místnost… (např. %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Pokud nemůžete nějakou místnost najít, požádejte stávající členy o pozvánku nebo si <a>Vytvořte novou místnost</a>.",
+    "Explore rooms": "Procházet místnosti",
     "Jump to first unread room.": "Skočit na první nepřečtenou místnost.",
     "Jump to first invite.": "Skočit na první pozvánku.",
     "No identity server is configured: add one in server settings to reset your password.": "Žádný server identit není nakonfigurován: přidejte si ho v nastavení, abyste mohli obnovit heslo.",
@@ -1708,14 +1708,14 @@
     "Enter your password to sign in and regain access to your account.": "Zadejte heslo pro přihlášení a obnovte si přístup k účtu.",
     "Forgotten your password?": "Zapomněli jste heslo?",
     "Sign in and regain access to your account.": "Přihlaste se a získejte přístup ke svému účtu.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Nemůžete se přihlásit do svého účtu. Kontaktujte administrátora domovského serveru pro více informací.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Nemůžete se přihlásit do svého účtu. Kontaktujte správce domovského serveru pro více informací.",
     "You're signed out": "Jste odhlášeni",
     "Clear personal data": "Smazat osobní data",
     "Command Autocomplete": "Automatické doplňování příkazů",
-    "Community Autocomplete": "Automatické doplňování komunit",
+    "Community Autocomplete": "Automatické doplňování skupin",
     "DuckDuckGo Results": "Výsledky hledání DuckDuckGo",
-    "Emoji Autocomplete": "Automatické doplňování Emodži",
-    "Notification Autocomplete": "Automatické doplňování upozornění",
+    "Emoji Autocomplete": "Automatické doplňování emoji",
+    "Notification Autocomplete": "Automatické doplňování oznámení",
     "Room Autocomplete": "Automatické doplňování místností",
     "User Autocomplete": "Automatické doplňování uživatelů",
     "Custom (%(level)s)": "Vlastní (%(level)s)",
@@ -1743,18 +1743,18 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s",
     "Try out new ways to ignore people (experimental)": "Vyzkošejte nové metody ignorování lidí (experimentální)",
-    "Enable local event indexing and E2EE search (requires restart)": "Povolit lokální indexování a vyhledávání v E2E šifrovaných zprávách (vyžaduje restart)",
-    "Match system theme": "Přizpůsobit se systémovému vzhledu",
+    "Enable local event indexing and E2EE search (requires restart)": "Povolit lokální indexování a vyhledávání v end-to-end šifrovaných zprávách (vyžaduje restart)",
+    "Match system theme": "Nastavit podle vzhledu systému",
     "My Ban List": "Můj seznam zablokovaných",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je váš seznam blokovaných uživatelů/serverů - neopouštějte tuto místnost!",
     "Decline (%(counter)s)": "Odmítnout (%(counter)s)",
-    "Connecting to integration manager...": "Připojuji se ke správci integrací...",
+    "Connecting to integration manager...": "Připojování se ke správci integrací...",
     "Cannot connect to integration manager": "Nepovedlo se připojení ke správci integrací",
     "The integration manager is offline or it cannot reach your homeserver.": "Správce integrací neběží nebo se nemůže připojit k vašemu domovskému serveru.",
-    "Clear notifications": "Odstranit notifikace",
+    "Clear notifications": "Odstranit oznámení",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Použít správce integrací <b>(%(serverName)s)</b> na správu botů, widgetů a samolepek.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použít správce integrací na správu botů, widgetů a samolepek.",
-    "Manage integrations": "Spravovat integrace",
+    "Manage integrations": "Správa integrací",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Správce integrací dostává konfigurační data a může za vás modifikovat widgety, posílat pozvánky a nastavovat úrovně oprávnění.",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Přizpůsobte si aplikaci s experimentálními funkcemi. <a>Více informací</a>.",
     "Ignored/Blocked": "Ignorováno/Blokováno",
@@ -1776,10 +1776,10 @@
     "View rules": "Zobrazit pravidla",
     "You are currently subscribed to:": "Odebíráte:",
     "⚠ These settings are meant for advanced users.": "⚠ Tato nastavení jsou pro pokročilé uživatele.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Sem přidejte uživatele a servery, které chcete ignorovat. Můžete použít hvězdičku místo libovolných znaků. Například pravidlo <code>@bot:*</code> bude blokovat všechny uživatele se jménem 'bot' na libovolném serveru.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Sem přidejte uživatele a servery, které chcete ignorovat. Můžete použít hvězdičku místo libovolných znaků. Například pravidlo <code>@bot:*</code> zablokuje všechny uživatele se jménem 'bot' na libovolném serveru.",
     "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Lidé a servery jsou blokováni pomocí seznamů obsahující pravidla koho blokovat. Odebírání blokovacího seznamu znamená, že neuvidíte uživatele a servery na něm uvedené.",
     "Personal ban list": "Osobní seznam blokací",
-    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Váš osobní seznam blokací obsahuje všechny uživatele a server, které nechcete vidět. Po ignorování prvního uživatele/server se vytvoří nová místnost 'Můj seznam blokací' - zůstaňte v ní aby seznam platil.",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Váš osobní seznam blokací obsahuje všechny uživatele a servery, které nechcete vidět. Po ignorování prvního uživatele/serveru se vytvoří nová místnost 'Můj seznam blokací' - zůstaňte v ní, aby seznam platil.",
     "Server or user ID to ignore": "Server nebo ID uživatele",
     "eg: @bot:* or example.org": "např.: @bot:* nebo example.org",
     "Subscribed lists": "Odebírané seznamy",
@@ -1787,24 +1787,24 @@
     "Subscribe": "Odebírat",
     "This message cannot be decrypted": "Zprávu nelze rozšifrovat",
     "Unencrypted": "Nešifrované",
-    "<userName/> wants to chat": "<userName/> chce chatovat",
-    "Start chatting": "Začít chatovat",
+    "<userName/> wants to chat": "<userName/> si chce psát",
+    "Start chatting": "Zahájit konverzaci",
     "Failed to connect to integration manager": "Nepovedlo se připojit ke správci integrací",
     "Trusted": "Důvěryhodné",
     "Not trusted": "Nedůvěryhodné",
     "Direct message": "Přímá zpráva",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> v %(roomName)s",
-    "Messages in this room are end-to-end encrypted.": "V této místosti jsou zprávy E2E šifrované.",
+    "Messages in this room are end-to-end encrypted.": "V této místnosti jsou zprávy šifrované end-to-end.",
     "Security": "Bezpečnost",
     "Verify": "Ověřit",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Tohoto uživatele ignorujete, takže jsou jeho/její zprávy skryté. <a>Přesto zobrazit.</a>",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Tohoto uživatele ignorujete, takže jsou jeho zprávy skryté. <a>Přesto zobrazit.</a>",
     "Reactions": "Reakce",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagoval %(content)s</reactedWith>",
     "Any of the following data may be shared:": "Následující data můžou být sdílena:",
     "Your display name": "Vaše zobrazované jméno",
     "Your avatar URL": "URL vašeho avataru",
     "Your user ID": "Vaše ID",
-    "Your theme": "Váš motiv",
+    "Your theme": "Váš motiv vzhledu",
     "Riot URL": "URL Riotu",
     "Room ID": "ID místnosti",
     "Widget ID": "ID widgetu",
@@ -1815,26 +1815,26 @@
     "This widget may use cookies.": "Widget může používat cookies.",
     "More options": "Více možností",
     "Integrations are disabled": "Integrace jsou zakázané",
-    "Enable 'Manage Integrations' in Settings to do this.": "Abyste mohli akci provést, povolte 'Spravovat integrace' v Nastavení.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Pro provedení této akce povolte v nastavení správu integrací.",
     "Integrations not allowed": "Integrace nejsou povolené",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš Riot neumožňuje použít správce integrací. Kontaktujte prosím administrátora.",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš Riot neumožňuje použít správce integrací. Kontaktujte prosím správce.",
     "Automatically invite users": "Automaticky zvát uživatele",
     "Upgrade private room": "Upgradovat soukromou místnost",
     "Upgrade public room": "Upgradovat veřejnou místnost",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgradování místnosti je pokročilá operace a je doporučeno jí provést pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo zranitelnostem.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Toto běžně ovlivňuje jak je místnost zpracovávána na serveru. Pokud máte problém s Riotem, <a>nahlaste nám prosím bug</a>.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Toto běžně ovlivňuje pouze zpracovávání místnosti na serveru. Pokud máte problém s Riotem, <a>nahlaste nám ho prosím</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Upgradujeme tuto místnost z <oldVersion /> na <newVersion />.",
     "Upgrade": "Upgradovat",
     "Enter secret storage passphrase": "Zadejte tajné heslo k bezpečnému úložišti",
     "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Nepovedlo se přistoupit k bezpečnému úložišti. Zkontrolujte prosím, že je zadané správné heslo.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varování</b>: Přistupujte k bezpečnému úložišti pouze z důvěryhodných počítačů.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokud si nepamatujete heslo, můžete použít <button1>váš obnovovací klíč</button1> nebo <button2>si nastavte nové možnosti obnovení</button2>.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokud si nepamatujete heslo, můžete použít <button1>svůj obnovovací klíč</button1> nebo <button2>si nastavte nové možnosti obnovení</button2>.",
     "Enter secret storage recovery key": "Zadejte klíč k bezpečnému úložišti",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepovedlo se dostat k bezpečnému úložišti. Ověřte prosím, že je zadaný správný klíč.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Pokud si nepamatujete obnovovací klíč, můžete si <button>nastavit nové možnosti obnovení</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varování</b>: Nastavujte zálohu jen z důvěryhodných počítačů.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Pokud si nepamatujete obnovovací klíč, můžete si <button>nastavit nové možnosti obnovení</button>",
-    "Notification settings": "Nastavení notifikací",
+    "Notification settings": "Nastavení oznámení",
     "Reload": "Načíst znovu",
     "Take picture": "Udělat fotku",
     "Remove for everyone": "Odstranit pro všechny",
@@ -1847,7 +1847,7 @@
     "As a safety net, you can use it to restore your access to encrypted messages.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv.",
     "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Uschovejte svůj klíč na velmi bezpečném místě, například ve správci hesel (nebo v trezoru).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Váš obnovovací klíč byl <b>zkopírován do schránky</b>, vložte jej:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Váš obnovací klíč je ve složce <b>Stažené</b>.",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Váš obnovovací klíč je ve složce <b>Stažené</b>.",
     "Storing secrets...": "Ukládám tajná data...",
     "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště",
     "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.",
@@ -1865,7 +1865,7 @@
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V místnosti jsou neověřené relace: pokud budete pokračovat bez ověření, bude možné váš hovor odposlouchávat.",
     "Verify this session": "Ověřit tuto relaci",
     "Encryption upgrade available": "Je dostupná aktualizace šifrování",
-    "Set up encryption": "Připravit šifrování",
+    "Set up encryption": "Nastavit šifrování",
     "Unverified session": "Neověřená relace",
     "Verifies a user, session, and pubkey tuple": "Ověří uživatele, relaci a veřejné klíče",
     "Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
@@ -1873,9 +1873,9 @@
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Relace je už ověřená, ale klíče NEODPOVÍDAJÍ!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČŮ SELHALO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je \"%(fprint)s\", což neodpovídá klíči \"%(fingerprint)s\". Může to znamenat, že je vaše komunikace rušena!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisový klíč odpovídá klíči relace %(deviceId)s od uživatele %(userId)s. Relace byla označena za platnou.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s přidal/a této místnosti %(addedAddresses)s a dalších %(count)s adres",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s odstranil/a této místnosti %(removedAddresses)s a dalších %(count)s adres",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s odstranil/a této místnosti %(countRemoved)s adres a přidal/a %(countAdded)s adres",
+    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "Uživatel %(senderName)s přidal této místnosti adresu %(addedAddresses)s a %(count)s dalších",
+    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "Uživatel %(senderName)s odstranil této místnosti adresu %(removedAddresses)s a %(count)s dalších",
+    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "Uživatel %(senderName)s odstranil této místnosti %(countRemoved)s adres a přidal %(countAdded)s adres",
     "a few seconds ago": "před pár vteřinami",
     "about a minute ago": "před minutou",
     "%(num)s minutes ago": "před %(num)s minutami",
@@ -1891,15 +1891,15 @@
     "about a day from now": "asi za den",
     "%(num)s days from now": "za %(num)s dní",
     "Show a presence dot next to DMs in the room list": "V seznamu místností zobrazovat informaci o přítomnosti",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Povolit cross-signing pro verifikaci uživatelů místo zařízení (experimentální)",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Povolit cross-signing pro ověření uživatelů místo zařízení (experimentální)",
     "Show info about bridges in room settings": "Zobrazovat v nastavení místnosti informace o propojeních",
     "Show padlocks on invite only rooms": "Zobrazovat zámek u místností vyžadujících pozvání",
     "Never send encrypted messages to unverified sessions from this session": "Nikdy neposílat šifrované zprávy neověřených zařízením",
     "Never send encrypted messages to unverified sessions in this room from this session": "Nikdy v této místnosti neposílat šifrované zprávy neověřeným relacím",
-    "Enable message search in encrypted rooms": "Povolit vyhledávání v zašifrovaných místnostech",
+    "Enable message search in encrypted rooms": "Povolit vyhledávání v šifrovaných místnostech",
     "Keep secret storage passphrase in memory for this session": "Pro toto přihlášení si uchovat heslo k bezpečnému úložišti",
     "How fast should messages be downloaded.": "Jak rychle se mají zprávy stahovat.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Ověřte, že následující emotikony jsou zobrazeny na obou zařízeních ve stejném pořadí:",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Ověřte, že jsou následující emoji zobrazeny na obou zařízeních ve stejném pořadí:",
     "Verify this device by confirming the following number appears on its screen.": "Ověřit zařízení potvrzením, že jsou následující čísla zobrazena na jeho obrazovce.",
     "Waiting for %(displayName)s to verify…": "Čekám až nás %(displayName)s ověří…",
     "They match": "Odpovídají",
@@ -1915,7 +1915,7 @@
     "Workspace: %(networkName)s": "Workspace: %(networkName)s",
     "Channel: %(channelName)s": "Kanál: %(channelName)s",
     "Show less": "Skrýt detaily",
-    "Show more": "Zobrazit víc",
+    "Show more": "Více",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Změna hesla resetuje šifrovací klíče pro všechny vaše relace. Pokud si nejdřív nevyexportujete klíče místností a po změně je znovu neimportujete, nedostanete se k historickým zprávám. V budoucnu se toto zjednoduší.",
     "Cross-signing and secret storage are enabled.": "Cross-signing a bezpečné úložiště jsou zapnuté.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má v bezpečném úložišti identitu pro cross-signing, ale v této relaci jí zatím nevěříte.",
@@ -1940,7 +1940,7 @@
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot neumí bezpečně uchovávat zprávy když běží v prohlížeči. Pokud chcete vyhledávat v šifrovaných zprávách, použijte <riotLink>Riot Desktop</riotLink>.",
     "This session is backing up your keys. ": "Tato relace zálohuje vaše klíče. ",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Tato relace <b>nezálohuje vaše klíče</b>, ale už máte zálohu ze které je můžete obnovit.",
-    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Než se odhlásíce, připojte tuto relaci k záloze klíčů abyste nepřišli o klíče, které můžou být jen v této relaci.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Než se odhlásíte, připojte tuto relaci k záloze klíčů, abyste nepřišli o klíče, které mohou být jen v této relaci.",
     "Connect this session to Key Backup": "Připojit k zálohování klíčů",
     "not stored": "není uložen",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Záloha je podepsaná z <verify>neznámé</verify> relace s ID %(deviceId)s",
@@ -1955,15 +1955,15 @@
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Zálohovací klíč je uložen v bezpečném úložišti, ale jeho načtení není v této relaci povolené. Zapněte prosím cross-signing v Experimentálních funkcích abyste mohli modifikovat stav zálohy.",
     "Backup key stored: ": "Zálohovací klíč je uložen: ",
     "Your keys are <b>not being backed up from this session</b>.": "Vaše klíče <b>nejsou z této relace zálohovány</b>.",
-    "Enable desktop notifications for this session": "Povolit v této relaci notifikace",
-    "Enable audible notifications for this session": "Povolit v této relaci hlasové notifikace",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Heslo bylo změněno. Dokud se znovu nepřihlásíte na ostatních zařízeních, nebudete na nich dostávat notifikace",
+    "Enable desktop notifications for this session": "Povolit v této relaci oznámení",
+    "Enable audible notifications for this session": "Povolit v této relaci zvuková oznámení",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Heslo bylo změněno. Dokud se znovu nepřihlásíte na ostatních zařízeních, nebudete na nich dostávat žádná oznámení",
     "Session ID:": "ID relace:",
     "Session key:": "Klíč relace:",
     "Message search": "Vyhledávání ve zprávách",
     "Cross-signing": "Cross-signing",
     "Sessions": "Relace",
-    "A session's public name is visible to people you communicate with": "Lidé se kterými komunikujete si můžou jméno relace zobrazit",
+    "A session's public name is visible to people you communicate with": "Lidé, se kterými komunikujete, mohou veřejný název zobrazit",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tato místnost je propojena s následujícími platformami. <a>Více informací</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Tato místnost není propojená s žádnými dalšími platformami. <a>Více informací.</a>",
     "Bridges": "Propojení",
@@ -1971,19 +1971,19 @@
     "You have not verified this user.": "Tohoto uživatele jste neověřil.",
     "You have verified this user. This user has verified all of their sessions.": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
     "Someone is using an unknown session": "Někdo používá neznámou relaci",
-    "This room is end-to-end encrypted": "Místnost je E2E šifrovaná",
+    "This room is end-to-end encrypted": "Místnost je šifrovaná end-to-end",
     "Everyone in this room is verified": "V této místnosti jsou všichni ověřeni",
     "Some sessions for this user are not trusted": "Některé relace tohoto uživatele jsou nedůvěryhodné",
     "All sessions for this user are trusted": "Všem relacím tohoto uživatele věříme",
     "Some sessions in this encrypted room are not trusted": "Některé relace v této místnosti jsou nedůvěryhodné",
     "All sessions in this encrypted room are trusted": "Všem relacím v této místosti věříme",
     "Mod": "Moderátor",
-    "Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek k nasdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
-    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Požadavek se sdílení klíčů se vaše ostatní relace odesílá automaticky. Pokud jste ho zamítli nebo ignorovali, tímto tlačítkem si jej můžete poslat znovu.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek na sdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Požadavky na sdílení klíčů jsou vašim ostatním relacím odesílány automaticky. Pokud jste nějaký zamítli nebo ignorovali, tímto tlačítkem si ho můžete poslat znovu.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Pokud vaše ostatní relace nemají klíč pro tuto zprávu, nebudete mít možnost jí dešifrovat.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Znovu zažádat o šifrovací klíče</requestLink> z vašich ostatních relací.",
-    "Encrypted by an unverified session": "Zašifrované v neověřené relaci",
-    "Encrypted by a deleted session": "Zašifrované smazanou relací",
+    "Encrypted by an unverified session": "Šifrované neověřenou relací",
+    "Encrypted by a deleted session": "Šifrované smazanou relací",
     "Invite only": "Pouze na pozvání",
     "No sessions with registered encryption keys": "Žádné relace se šifrovacími klíči",
     "Send a reply…": "Odpovědět…",
@@ -1996,8 +1996,8 @@
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tip: Zprávu můžete začít <code>//</code>, pokud chcete aby začínala lomítkem.",
     "Send as message": "Odeslat jako zprávu",
     "Waiting for %(displayName)s to accept…": "Čekáme, než %(displayName)s přijme…",
-    "Start Verification": "Začít s verifikací",
-    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vaše zprávy jsou zabezpečené - pouze Vy a příjemce mají klíče k jejich přečtení.",
+    "Start Verification": "Začít s ověřením",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vaše zprávy jsou zabezpečené - pouze vy a jejich příjemci máte klíče potřebné k jejich přečtení.",
     "Verify User": "Ověřit uživatele",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Pro lepší bezpečnost, ověřte uživatele zkontrolováním jednorázového kódu na vašich zařízeních.",
     "Your messages are not secure": "Vaše zprávy nejsou zabezpečené",
@@ -2009,16 +2009,16 @@
     "%(count)s sessions|other": "%(count)s relací",
     "%(count)s sessions|one": "%(count)s relace",
     "Hide sessions": "Skrýt relace",
-    "Verify by emoji": "Ověřit emotikonami",
-    "Verify by comparing unique emoji.": "Oveření porovnáním několika emotikon.",
-    "Ask %(displayName)s to scan your code:": "Ověříte se, když %(displayName)s naskenuje váš kód:",
-    "If you can't scan the code above, verify by comparing unique emoji.": "Pokud vám skenování kódů nefunguje, ověřte se porovnáním emotikon.",
-    "You've successfully verified %(displayName)s!": "%(displayName)s je úspěšně ověřen/a!",
+    "Verify by emoji": "Ověřit pomocí emoji",
+    "Verify by comparing unique emoji.": "Ověření porovnáním několika emoji.",
+    "Ask %(displayName)s to scan your code:": "Požádejte uživatele %(displayName)s o naskenování tohoto kódu pro vaše ověření:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Pokud vám skenování kódů nefunguje, ověřte se porovnáním emoji.",
+    "You've successfully verified %(displayName)s!": "Úspěšně jste ověřili uživatele %(displayName)s!",
     "Got it": "Dobře",
-    "Verification timed out. Start verification again from their profile.": "Čas na verifikaci vypršel. Začněte s verifikací znovu z druhého profilu.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s zrušil/a verifikaci. Začněte s verifikací znovu z druhého profilu.",
+    "Verification timed out. Start verification again from their profile.": "Čas na ověření vypršel. Začněte znovu z druhého profilu.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "Uživatel %(displayName)s zrušil ověření. Spustit ho můžete znovu z jeho profilu.",
     "Encryption enabled": "Šifrování je zapnuté",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Zprávy v této místnosti jsou E2E šifrované. Více informací & verifikace uživatele je v jeho profilu.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Zprávy v této místnosti jsou šifrované end-to-end. Více informací a možnost ověření uživatele najdete v jeho profilu.",
     "Encryption not enabled": "Šifrování je vypnuté",
     "The encryption used by this room isn't supported.": "Šifrování používané v této místnosti není podporované.",
     "Clear all data in this session?": "Smazat všechna data v této relaci?",
@@ -2026,13 +2026,13 @@
     "Verify session": "Ověřit relaci",
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Abychom ověřili, že je relace důvěryhodná, zkontrolujte prosím, že klíč v uživatelském nastavení na tom zařízení odpovídá následujícímu klíči:",
     "To verify that this session 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 session matches the key below:": "Abychom ověřili, že tato relace je důvěryhodná, kontaktujte prosím jejího vlastníka nějakým dalším způsobem (osobně, telefonicky, apod.). Zkontrolujte spolu, že klíč v uživatelském nastavení na druhém zařízení odpovídá následujícímu klíči:",
-    "Session name": "Jméno relace",
+    "Session name": "Název relace",
     "Session key": "Klíč relace",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Pokud odpovídá, zmáčkněte tlačítko ověřit. Pokud ne, druhé zařízení je pravděpodobně falešné a chcete ho zablokovat.",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a Vaše relace budou důvěryhodné pro něj.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a vaše relace budou důvěryhodné pro něj.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dát trochu klidu mysli navíc při používání šifrovaných zpráv.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ověření zařízení ho označí za důvěryhodné a uživatelé, kteří věří vám budou také tomuto zařízení důvěřovat.",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Následující uživatele se nepovedlo pozvat do chatu: %(csvUsers)s",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Následující uživatele se nepovedlo do konverzace pozvat: %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "Nepovedlo se nám vyrobit soukromou konverzaci. Zkontrolujte prosím, že pozvaný uživatel opravdu existuje a pak to zkuste znovu.",
     "Something went wrong trying to invite the users.": "Při odesílání pozvánek se něco pokazilo.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Nemůžeme pozvat tyto uživatele. Zkontrolujte prosím, že opravdu existují a zkuste to znovu.",
@@ -2041,17 +2041,17 @@
     "Recent Conversations": "Nedávné konverzace",
     "Suggestions": "Návrhy",
     "Recently Direct Messaged": "Nedávno kontaktovaní",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Pokud někoho nemůžete nalézt, zeptejte se na username, pošlete jim svůj  (%(userId)s) a nebo pošlete <a>odkaz na svůj profil</a>.",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Pokud nemůžete někoho najít, zeptejte se na uživatelské jméno, pošlete jim svoje (%(userId)s) a nebo pošlete <a>odkaz na svůj profil</a>.",
     "Go": "Ok",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Pokud někoho nemůžete nalézt, zeptejte se na username (například @user:server.com) a nebo pošlete <a>odkaz na tuto místnost</a>.",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Pokud nemůžete někoho najít, zeptejte se na uživatelské jméno (např. @uzivatel:example.com) a nebo pošlete <a>odkaz na tuto místnost</a>.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "Přidali jste novou relaci '%(displayName)s', která požaduje šifrovací klíče.",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Vaše neověřená relace '%(displayName)s' požaduje šifrovací klíče.",
     "Loading session info...": "Načítám informace o relaci...",
     "New session": "Nová relace",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Použijte tuto relaci abyste ověřili novou a dali jí přístup ke svým šifrovaným zprávám:",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Použijte tuto relaci pro ověření nové a udělení jí přístupu k vašim šifrovaným zprávám:",
     "If you didn’t sign in to this session, your account may be compromised.": "Pokud jste se do této nové relace nepřihlásili, váš účet může být kompromitován.",
-    "This wasn't me": "Nebyl/a jsem to já",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Umožní vám to se přihlásit do dalších relací a vrátit se ke svému účtu poté co se odhlásíte.",
+    "This wasn't me": "To jsem nebyl/a já",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Toto vám umožní se přihlásit do dalších relací a vrátit se ke svému účtu poté, co se odhlásíte.",
     "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Máte zakázané posílání zpráv neověřeným relacím; abyste mohli zprávu odeslat, musíte je ověřit.",
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme si projít ověřovací proces pro každou relaci abyste ověřili, že patří tomu, komu očekáváte. Můžete ale poslat zprávu i bez ověření, pokud chcete.",
     "Room contains unknown sessions": "V místnosti jsou neověřené relace",
@@ -2067,7 +2067,7 @@
     "Confirm your identity by entering your account password below.": "Potvrďte svou identitu zadáním hesla ke svému účtu.",
     "Message not sent due to unknown sessions being present": "Zpráva nebyla odeslána, protože jsou v místnosti neznámé relace",
     "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Zobrazit relace</showSessionsText>, <sendAnywayText>i tak odeslat</sendAnywayText>, a nebo  <cancelText>zrušit</cancelText>.",
-    "Verify this session to grant it access to encrypted messages.": "Ověřte relaci aby získala přístup k šifrovaným zprávám.",
+    "Verify this session to grant it access to encrypted messages.": "Ověřte relaci, aby získala přístup k šifrovaným zprávám.",
     "Start": "Začít",
     "Session verified": "Relace je ověřena",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaše nová relace je teď ověřená. Má přístup k šifrovaným zprávám a ostatní uživatelé jí budou věřit.",
@@ -2076,9 +2076,9 @@
     "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončení ověření nebude mít nová relace přístup k šifrovaným zprávám.",
     "Go Back": "Zpět",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Změna hesla resetuje šifrovací klíče ve všech vašich přihlášených relacích a přijdete tak o přístup k historickým zprávám. Před změnou hesla si nastavte zálohu klíčů nebo si klíče pro místnosti exportujte.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Všude jsme Vás odhlásili, takže nedostáváte žádné upozornění. Můžete je znovu povolit tím, že se na všech svych zařízeních znovu přihlásíte.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Všude jsme vás odhlásili, takže nedostáváte žádná oznámení. Můžete je znovu povolit tím, že se na všech svých zařízeních znovu přihlásíte.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené v této relaci. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
-    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit nebo se přihlašte pod jiný účet.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit, nebo se přihlaste pod jiný účet.",
     "Sender session information": "Informace o relaci odesílatele",
     "If you cancel now, you won't complete verifying the other user.": "Pokud teď proces zrušíte, tak nebude druhý uživatel ověřen.",
     "If you cancel now, you won't complete verifying your other session.": "Pokud teď proces zrušíte, tak nebude druhá relace ověřena.",
@@ -2088,7 +2088,7 @@
     "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotu chybí nějaké komponenty, které jsou potřeba pro vyhledávání v zabezpečených místnostech. Pokud chcete s touto funkcí experimentovat, tak si pořiďte vlastní Riot Desktop s <nativeLink>přidanými komponentami</nativeLink>.",
     "Subscribing to a ban list will cause you to join it!": "Odebíráním seznamu zablokovaných uživatelů se přidáte do jeho místnosti!",
     "If this isn't what you want, please use a different tool to ignore users.": "Pokud to nechcete, tak prosím použijte jiný nástroj na blokování uživatelů.",
-    "You cancelled verification. Start verification again from their profile.": "Zrušili jste verifikaci. Můžete jí začít znovu z druhého profilu.",
+    "You cancelled verification. Start verification again from their profile.": "Zrušili jste ověření. Můžete začít znovu z druhého profilu.",
     "Complete security": "Dokončení ověření",
     "Restore your key backup to upgrade your encryption": "Pro aktualizaci šifrování obnovte klíče ze zálohy",
     "Restore": "Obnovit",
@@ -2096,31 +2096,31 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "Server si vás potřebuje ověřit, abychom mohli provést aktualizaci.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualizujte tuto přihlášenou relaci abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
     "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Zapněte v této přihlášené relaci šifrování abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
-    "Show typing notifications": "Zobrazovat notifikace \"... právě píše...\"",
-    "Reset cross-signing and secret storage": "Resetovat bezpečné úložiště a cross-signing",
+    "Show typing notifications": "Zobrazovat oznámení \"... právě píše...\"",
+    "Reset cross-signing and secret storage": "Obnovit bezpečné úložiště a cross-signing",
     "Destroy cross-signing keys?": "Nenávratně smazat klíče pro cross-signing?",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Smazání klíčů pro cross-signing je definitivní. Každý kdo vás ověřil teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení ze kterých se můžete ověřit, tak to asi nechcete udělat.",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Smazání klíčů pro cross-signing je definitivní. Každý, kdo vás ověřil, teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení, ze kterých se můžete ověřit, tak to asi nechcete udělat.",
     "Clear cross-signing keys": "Smazat klíče pro cross-signing",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Zabezpečte si šifrovací klíče silným heslem. Pro lepší bezpečnost by mělo být jiné než vaše heslo k přihlášení:",
     "Enter a passphrase": "Zadejte heslo",
     "The version of Riot": "Verze Riotu",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Jestli používáte Riot na dotykovém zařízení",
-    "Whether you're using Riot as an installed Progressive Web App": "Jestli používáte Riot jako nainstalovanou Progresivní Webovou Aplikaci",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Zda používáte Riot na dotykovém zařízení",
+    "Whether you're using Riot as an installed Progressive Web App": "Zda používáte Riot jako nainstalovanou Progresivní Webovou Aplikaci",
     "Your user agent": "Identifikace vašeho prohlížeče",
-    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat si posíláme následující informace:",
+    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat, posíláme si následující informace:",
     "Verify this session by completing one of the following:": "Ověřte tuto relaci dokončením jednoho z následujících:",
     "Scan this unique code": "Naskenujte tento jedinečný kód",
     "or": "nebo",
     "Compare unique emoji": "Porovnejte jedinečnou kombinaci emoji",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Porovnejte jedinečnou kombinaci emoji pokud na žádném zařízení nemáte kameru",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Pokud na žádném zařízení nemáte kameru, porovnejte jedinečnou kombinaci emoji",
     "Not Trusted": "Nedůvěryhodné",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace a neověřil ji:",
     "Ask this user to verify their session, or manually verify it below.": "Poproste tohoto uživatele aby svojí relaci ověřil a nebo jí níže můžete ověřit manuálně.",
     "Manually Verify": "Ověřit manuálně",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Relace, kterou se snažíte ověřit neumožňuje ověření QR kódem ani pomocí emoji, což je to co Riot podporuje. Zkuste použít jiného klienta.",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Relace, kterou se snažíte ověřit, neumožňuje ověření QR kódem ani pomocí emoji, což je to, co Riot podporuje. Zkuste použít jiného klienta.",
     "Verify by scanning": "Ověřte naskenováním",
     "You declined": "Odmítli jste",
-    "%(name)s declined": "%(name)s odmítl/a",
+    "%(name)s declined": "Uživatel %(name)s odmítl",
     "accepting …": "přijímání …",
     "declining …": "odmítání …",
     "Back up my encryption keys, securing them with the same passphrase": "Zazálohovat šifrovací klíče zabezpečené tím stejným heslem",
@@ -2136,7 +2136,7 @@
     "Create key backup": "Vytvořit zálohu klíčů",
     "This session is encrypting history using the new recovery method.": "Tato relace šifruje historii zpráv s podporou nového způsobu obnovení.",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tato relace zjistila, že klíč a heslo k obnovení zpráv byly odstraněny.",
-    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Pokud se vám to stalo neůmyslně, můžete znovu nastavit zálohu zpráv pro tuto relaci. To znovu zašifruje historii zpráv novým způsobem.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Pokud se vám to stalo neúmyslně, můžete znovu nastavit zálohu zpráv pro tuto relaci. To znovu zašifruje historii zpráv novým způsobem.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
     "Disable": "Zakázat",
     "Not currently downloading messages for any room.": "Aktuálně se nestahují žádné zprávy.",

From 513a715989396dd6cae902c17d300973c58bbf68 Mon Sep 17 00:00:00 2001
From: Jakub Kalousek <jkalousek@posteo.cz>
Date: Sun, 1 Mar 2020 09:55:52 +0000
Subject: [PATCH 1322/3235] Translated using Weblate (Czech)

Currently translated at 99.1% (2120 of 2139 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 3b1d7416b1..34f43d7cd5 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1303,7 +1303,7 @@
     "Create account": "Vytvořit účet",
     "Unable to query for supported registration methods.": "Nepovedlo se načíst podporované způsoby přihlášení.",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Vloží ¯\\_(ツ)_/¯ na začátek zprávy",
-    "Changes your display nickname in the current room only": "Pro tuto místnost změní vaší přezdívku",
+    "Changes your display nickname in the current room only": "Změní vaši zobrazovanou přezdívku pouze v současné místnosti",
     "User %(userId)s is already in the room": "Uživatel %(userId)s už je v této místnosti",
     "The user must be unbanned before they can be invited.": "Uživatel je vykázán, nelze ho pozvat.",
     "Show read receipts sent by other users": "Zobrazovat potvrzení o přijetí",

From 326045c57d133986a640fb158e7fca55b466d5a0 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 29 Feb 2020 09:38:18 +0000
Subject: [PATCH 1323/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2139 of 2139 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 | 105 +++++++++++++++++++++++++++++++--------
 1 file changed, 83 insertions(+), 22 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 91c94865b3..8b781c2119 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -393,7 +393,7 @@
     "Unable to restore session": "Ezin izan da saioa berreskuratu",
     "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.": "Aurretik Riot bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
     "Unknown Address": "Helbide ezezaguna",
-    "Verify...": "Egiaztatu...",
+    "Verify...": "Egiaztatu…",
     "ex. @bob:example.com": "adib. @urko:adibidea.eus",
     "Add User": "Gehitu erabiltzailea",
     "Please check your email to continue registration.": "Egiaztatu zure e-maila erregistroarekin jarraitzeko.",
@@ -431,8 +431,8 @@
     "Deops user with given id": "Emandako ID-a duen erabiltzailea mailaz jaisten du",
     "Add a widget": "Gehitu trepeta bat",
     "Allow": "Baimendu",
-    "and %(count)s others...|other": "eta beste %(count)s...",
-    "and %(count)s others...|one": "eta beste bat...",
+    "and %(count)s others...|other": "eta beste %(count)s…",
+    "and %(count)s others...|one": "eta beste bat…",
     "Cannot add any more widgets": "Ezin dira trepeta gehiago gehitu",
     "Delete widget": "Ezabatu trepeta",
     "Define the power level of a user": "Zehaztu erabiltzaile baten botere maila",
@@ -509,7 +509,7 @@
     "Invite": "Gonbidatu",
     "Jump to message": "Saltatu mezura",
     "No pinned messages.": "Finkatutako mezurik ez.",
-    "Loading...": "Kargatzen...",
+    "Loading...": "Kargatzen…",
     "Pinned Messages": "Finkatutako mezuak",
     "%(duration)ss": "%(duration)s s",
     "%(duration)sm": "%(duration)s m",
@@ -599,7 +599,7 @@
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s erabiltzaileak bere izena aldatu du",
     "collapse": "tolestu",
     "expand": "hedatu",
-    "And %(count)s more...|other": "Eta %(count)s gehiago...",
+    "And %(count)s more...|other": "Eta %(count)s gehiago…",
     "Matrix ID": "Matrix IDa",
     "Matrix Room ID": "Matrix gela IDa",
     "email address": "e-mail helbidea",
@@ -802,7 +802,7 @@
     "Send logs": "Bidali egunkariak",
     "All messages": "Mezu guztiak",
     "Call invitation": "Dei gonbidapena",
-    "Downloading update...": "Eguneraketa deskargatzen...",
+    "Downloading update...": "Eguneraketa deskargatzen…",
     "State Key": "Egoera gakoa",
     "Failed to send custom event.": "Huts egin du gertaera pertsonalizatua bidaltzean.",
     "What's new?": "Zer dago berri?",
@@ -846,7 +846,7 @@
     "Event Content": "Gertaeraren edukia",
     "Thank you!": "Eskerrik asko!",
     "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!": "Zure oraingo nabigatzailearekin aplikazioaren itxura eta portaera guztiz okerra izan daiteke, eta funtzio batzuk ez dira ibiliko. Hala ere aurrera jarraitu dezakezu saiatu nahi baduzu, baina zure erantzukizunaren menpe geratzen dira aurkitu ditzakezun arazoak!",
-    "Checking for an update...": "Eguneraketarik dagoen egiaztatzen...",
+    "Checking for an update...": "Eguneraketarik dagoen egiaztatzen…",
     "There are advanced notifications which are not shown here": "Hemen erakusten ez diren jakinarazpen aurreratuak daude",
     "Missing roomId.": "Gelaren ID-a falta da.",
     "Every page you use in the app": "Aplikazioan erabilitako orri oro",
@@ -936,7 +936,7 @@
     "Forces the current outbound group session in an encrypted room to be discarded": "Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du",
     "Registration Required": "Erregistratzea ezinbestekoa da",
     "You need to register to do this. Would you like to register now?": "Hau egiteko erregistratu egin behar zara. Orain erregistratu nahi duzu?",
-    "Unable to connect to Homeserver. Retrying...": "Ezin izan da hasiera zerbitzarira konektatu. Berriro saiatzen...",
+    "Unable to connect to Homeserver. Retrying...": "Ezin izan da hasiera zerbitzarira konektatu. Berriro saiatzen…",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzaileak %(addedAddresses)s gehitu du gelako helbide gisa.",
     "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak gehitu dizkio gela honi.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzileak %(removedAddresses)s helbideak kendu ditu gela honetatik.",
@@ -1045,8 +1045,8 @@
     "Straight rows of keys are easy to guess": "Teklatuko errenkadak asmatzeko errazak dira",
     "Short keyboard patterns are easy to guess": "Teklatuko eredu laburrak asmatzeko errazak dira",
     "Custom user status messages": "Erabiltzailearen egoera mezu pertsonalizatuak",
-    "Checking...": "Egiaztatzen...",
-    "Set a new status...": "Ezarri egoera berri bat...",
+    "Checking...": "Egiaztatzen…",
+    "Set a new status...": "Ezarri egoera berri bat…",
     "Clear status": "Garbitu egoera",
     "General failure": "Hutsegite orokorra",
     "New Recovery Method": "Berreskuratze metodo berria",
@@ -1055,7 +1055,7 @@
     "Unable to load commit detail: %(msg)s": "Ezin izan dira xehetasunak kargatu: %(msg)s",
     "Invalid identity server discovery response": "Baliogabeko erantzuna identitate zerbitzariaren bilaketan",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ez baduzu berreskuratze sistema berria ezarri, erasotzaile bat zure kontua atzitzen saiatzen egon daiteke. Aldatu zure kontuaren pasahitza eta ezarri berreskuratze metodo berria berehala ezarpenetan.",
-    "Waiting for %(userId)s to confirm...": "%(userId)s erabiltzaileak berretsi dezan itxaroten...",
+    "Waiting for %(userId)s to confirm...": "%(userId)s erabiltzaileak berretsi dezan itxaroten…",
     "User %(user_id)s may or may not exist": "%(user_id)s erabiltzailea existitu daiteke edo ez",
     "Unrecognised address": "Helbide ezezaguna",
     "Prompt before sending invites to potentially invalid matrix IDs": "Galdetu baliogabeak izan daitezkeen matrix ID-eetara gonbidapenak bidali aurretik",
@@ -1170,7 +1170,7 @@
     "Guest": "Gonbidatua",
     "General": "Orokorra",
     "Room Addresses": "Gelaren helbideak",
-    "Set a new account password...": "Ezarri kontuaren pasahitz berria...",
+    "Set a new account password...": "Ezarri kontuaren pasahitz berria…",
     "Email addresses": "E-mail helbideak",
     "Phone numbers": "Telefono zenbakiak",
     "Language and region": "Hizkuntza eta eskualdea",
@@ -1206,7 +1206,7 @@
     "Your password has been reset.": "Zure pasahitza berrezarri da.",
     "Set a new password": "Ezarri pasahitz berria",
     "Create account": "Sortu kontua",
-    "Keep going...": "Jarraitu...",
+    "Keep going...": "Jarraitu…",
     "Starting backup...": "Babes-kopia hasten...",
     "Recovery Method Removed": "Berreskuratze metodoa kendu da",
     "Missing media permissions, click the button below to request.": "Multimedia baimenak falda dira, sakatu beheko botoia baimenak eskatzeko.",
@@ -1215,7 +1215,7 @@
     "Start using Key Backup": "Hasi gakoen babes-kopia egiten",
     "Restore from Backup": "Berrezarri babes-kopia",
     "Back up your keys before signing out to avoid losing them.": "Egin gakoen babes-kopia bat saioa amaitu aurretik, galdu nahi ez badituzu.",
-    "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s gakoen babes-kopia egiten...",
+    "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s gakoen babes-kopia egiten…",
     "All keys backed up": "Gako guztien babes.kopia egin da",
     "Headphones": "Aurikularrak",
     "Folder": "Karpeta",
@@ -1271,12 +1271,12 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Egin zure gakoen babes-kopia segurua hauek ez galtzeko. <a>Ikasi gehiago.</a>",
     "Not now": "Orain ez",
     "Don't ask me again": "Ez galdetu berriro",
-    "Use Legacy Verification (for older clients)": "Erabili egiaztaketa zaharra (bezero zaharrekin)",
-    "Waiting for partner to accept...": "Kideak onartu bitartean zain...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ez da ezer agertzen? Bezero guztiek ez dute egiaztaketa interaktiborako euskarria.  <button>Erabili egiaztaketa zaharra</button>.",
+    "Use Legacy Verification (for older clients)": "Erabili egiaztaketa zaharra (bezero zaharrentzat)",
+    "Waiting for partner to accept...": "Kideak onartu bitartean zain…",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ez da ezer agertzen? Bezero guztiek ez dute egiaztaketa interaktiborako euskarria. <button>Erabili egiaztaketa zaharra</button>.",
     "Use two-way text verification": "Erabili bi zentzutako testu egiaztaketa",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Egiaztatu erabiltzaile hau fidagarritzat markatzeko. Honek bakea ematen dizu muturretik muturrerako zifratutako mezuak erabiltzean.",
-    "Waiting for partner to confirm...": "Kideak baieztatzearen zain...",
+    "Waiting for partner to confirm...": "Kideak baieztatzearen zain…",
     "Incoming Verification Request": "Jasotako egiaztaketa eskaria",
     "I don't want my encrypted messages": "Ez ditut nire zifratutako mezuak nahi",
     "Manually export keys": "Esportatu gakoak eskuz",
@@ -1729,7 +1729,7 @@
     "My Ban List": "Nire debeku-zerrenda",
     "This is your list of users/servers you have blocked - don't leave the room!": "Hau blokeatu dituzun erabiltzaile edo zerbitzarien zerrenda da, ez atera gelatik!",
     "Decline (%(counter)s)": "Ukatu (%(counter)s)",
-    "Connecting to integration manager...": "Integrazio kudeatzailera konektatzen...",
+    "Connecting to integration manager...": "Integrazio kudeatzailera konektatzen…",
     "Cannot connect to integration manager": "Ezin da integrazio kudeatzailearekin konektatu",
     "The integration manager is offline or it cannot reach your homeserver.": "Integrazio kudeatzailea lineaz kanpo dago edo ezin du zure hasiera-zerbitzaria atzitu.",
     "Clear notifications": "Garbitu jakinarazpenak",
@@ -2049,7 +2049,7 @@
     "Session key": "Saioaren gakoa",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Bat badator, sakatu beheko egiaztatu botoia. Ez badator bat, beste inor saioa antzematen ari da eta zerrenda beltzean sartu beharko zenuke.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Erabiltzaile hau egiaztatzean bere saioa fidagarritzat joko da, eta zure saioak beretzat fidagarritzat ere.",
-    "Loading session info...": "Saioaren informazioa kargatzen...",
+    "Loading session info...": "Saioaren informazioa kargatzen…",
     "New session": "Saio berria",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Erabili saio hau berria egiaztatzeko, honela mezu zifratuetara sarbidea emanez:",
     "If you didn’t sign in to this session, your account may be compromised.": "Ez baduzu saio hau zuk hasi, agian baten bat zure kontuan sartu da.",
@@ -2073,7 +2073,7 @@
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gorde kopia bat toki seguruan, esaterako pasahitz kudeatzaile batean edo gordailu kutxan.",
     "Your recovery key": "Zure berreskuratze gakoa",
     "Copy": "Kopiatu",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Orain zure beste gailuak eta beste erabiltzaileak egiaztatu ditzakezu txatak seguru mantentzeko",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Orain zure beste gailuak eta beste erabiltzaileak egiaztatu ditzakezu txatak seguru mantentzeko.",
     "Make a copy of your recovery key": "Egin zure berreskuratze gakoaren kopia",
     "You're done!": "Bukatu duzu!",
     "If you cancel now, you won't complete verifying the other user.": "Orain ezeztatzen baduzu, ez duzu beste erabiltzailearen egiaztaketa burutuko.",
@@ -2108,5 +2108,66 @@
     "Show typing notifications": "Erakutsi idazketa jakinarazpenak",
     "Scan this unique code": "Eskaneatu kode bakan hau",
     "Compare unique emoji": "Konparatu emoji bakana",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Konparatu emoji sorta bakana gailuek kamerarik ez badute"
+    "Compare a unique set of emoji if you don't have a camera on either device": "Konparatu emoji sorta bakana gailuek kamerarik ez badute",
+    "Sign In or Create Account": "Hasi saioa edo sortu kontua",
+    "Use your account or create a new one to continue.": "Erabili zure kontua edo sortu berri bat jarraitzeko.",
+    "Create Account": "Sortu kontua",
+    "Order rooms by name": "Ordenatu gelak izenez",
+    "Show rooms with unread notifications first": "Erakutsi irakurri gabeko jakinarazpenak dituztenak aurretik",
+    "Show shortcuts to recently viewed rooms above the room list": "Erakutsi ikusitako azken geletara lasterbideak gelen zerrendaren goialdean",
+    "Cancelling…": "Ezeztatzen…",
+    "Your homeserver does not support cross-signing.": "Zure hasiera-zerbitzariak ez du zeharkako sinatzea onartzen.",
+    "Reset cross-signing and secret storage": "Berrezarri zeharkako sinadura eta biltegi sekretua",
+    "Homeserver feature support:": "Hasiera-zerbitzariaren ezaugarrien euskarria:",
+    "exists": "badago",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen, hau erabiliz ",
+    " to store messages from ": " hemengo mezuak gordetzeko ",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot-ek zifratutako mezuak cache lokalean modu seguruan gordetzeko elementu batzuk faltan ditu. Ezaugarri honekin esperimentatu nahi baduzu, konpilatu pertsonalizatutako Riot Desktop <nativeLink> bilaketa osagaiekin</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot-ek ezin ditu zifratutako mezuak cache lokalean gorde web nabigatzaile batetik badabil. Erabili <riotLink>Riot Desktop</riotLink> zifratutako mezuak bilaketen emaitzetan agertzeko.",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile <verify>ezezagun</verify> baten sinadura du",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Babes-kopiaren gakoa biltegi sekretuan gorde da, baina ezaugarri hau ez dago saio honetan aktibatuta. Gaitu zeharkako sinatzea Laborategia atalean gakoen babes-kopiaren egoera aldatzeko.",
+    "Accepting…": "Onartzen…",
+    "Not Trusted": "Ez konfiantzazkoa",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) erabiltzaileak saio berria hasi du hau egiaztatu gabe:",
+    "Ask this user to verify their session, or manually verify it below.": "Eskatu erabiltzaile honi saioa egiaztatu dezala, edo egiaztatu eskuz azpian.",
+    "Manually Verify": "Eskuzko egiaztaketa",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Egiaztatu nahi duzun saioak ez du QR kodea eskaneatzea onartzen, ezta emoji egiaztaketa, eta hau da Riot-ek onartzen duena. Saiatu beste bezero batekin.",
+    "Verify by scanning": "Egiaztatu eskaneatuz",
+    "You declined": "Ukatu egin duzu",
+    "%(name)s declined": "%(name)s erabiltzaileak ukatu du",
+    "Accepting …": "Onartzen…",
+    "Declining …": "Ukatzen…",
+    "Destroy cross-signing keys?": "Suntsitu zeharkako sinatzerako gakoak?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Zeharkako sinatzerako gakoak ezabatzea behin betiko da. Egiaztatu dituzunak segurtasun abisu bat jasoko dute.  Ziur aski ez duzu hau egin nahi, zeharkako sinatzea ahalbidetzen dizun gailu oro galdu ez baduzu.",
+    "Clear cross-signing keys": "Garbitu zeharkako sinatzerako gakoak",
+    "To verify that this session 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 session matches the key below:": "Saio hau fidagarritzat jo daitekeela egiaztatzeko, jarri jabearekin kontaktuan beste bide batetik (adib. aurrez aurre edo telefonoz deituz) eta galdetu saio honentzat erabiltzaile ezarpenetan ikusten duten gakoa beheko honekin bat datorren:",
+    "Verification Requests": "Egiaztatze eskaerak",
+    "Your account is not secure": "Zure kontua ez da segurua",
+    "Your password": "Zure pasahitza",
+    "This session, or the other session": "Saio hau, edo beste saioa",
+    "The internet connection either session is using": "Saioetako batek darabilen internet konexioa",
+    "We recommend you change your password and recovery key in Settings immediately": "Pasahitza eta ezarpenetako berreskuratze gakoa berehala aldatzea aholkatzen dizugu",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure berreskuratze gakoa sartuz.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Zure pasahitza aldatzeak zure saio guztietako muturretik-muturrerako zifratzerako gakoak berrezarriko ditu, eta aurretik zifratutako mezuen historiala ezin izango da irakurri. Ezarri gakoen babes-kopia edo esportatu zure geletako gakoak beste saio batetik pasahitza aldatu aurretik.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Saio guztiak amaitu dituzu eta ez duzu push jakinarazpenik jasoko. Jakinarazpenak berriro aktibatzeko, hasi saioa gailuetan.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Berreskuratu zure kontura sarbidea eta saio honetan gordetako zifratze gakoak. Horiek gabe, ezin izango dituzu zure mezu seguruak beste saioetan irakurri.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Abisua: Zure datu pertsonalak (zure zifratze gakoak barne) saio honetan daude oraindik. Garbitu ezazu saio hau erabiltzen bukatu duzunean, edo beste kontu batekin saioa hasi nahi duzunean.",
+    "Restore your key backup to upgrade your encryption": "Berreskuratu zure gakoen babes-kopia zure zifratzea eguneratzeko",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Eguneratu saio hau beste saioak egiaztatu ahal ditzan, zifratutako mezuetara sarbidea emanez eta beste erabiltzaileei fidagarri gisa agertu daitezen.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Ezarri zifratzea saio honetan beste saioak egiaztatu ahal ditzan, zifratutako mezuetara sarbidea emanez eta beste erabiltzaileei fidagarri gisa agertu daitezen.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Mezuen berreskuratze segurua ezartzen ez baduzu, ezin izango duzu zifratutako mezuen historiala berreskuratu saioa amaitzen baduzu edo beste saio bat erabiltzen baduzu.",
+    "Create key backup": "Sortu gakoen babes-kopia",
+    "This session is encrypting history using the new recovery method.": "Saio honek historiala zifratzen du berreskuratze metodo berria erabiliz.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Saio honek zure berreskuratze pasa-esaldia eta mezu seguruen gakoa kendu direla antzeman du.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Nahi gabe egin baduzu hau, Mezu seguruak ezarri ditzakezu saio honetan eta saioaren mezuen historiala berriro zifratuko da berreskuratze metodo berriarekin.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Desgaituz gero, zifratutako geletako mezuak ez dira bilaketen emaitzetan agertuko.",
+    "Disable": "Desgaitu",
+    "Not currently downloading messages for any room.": "Orain ez da inolako gelatik mezurik deskargatzen ari.",
+    "Downloading mesages for %(currentRoom)s.": "%(currentRoom)s gelako mezuak deskargatzen.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot-ek zifratutako mezuak cache lokalean gordetzen ditu modu seguruan bilaketen emaitzen ager daitezen:",
+    "Space used:": "Erabilitako espazioa:",
+    "Indexed messages:": "Indexatutako mezuak:",
+    "Indexed rooms:": "Indexatutako gelak:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Mezuen deskargaren itxarote tartea (ms)"
 }

From 0968f119c3ca4fcf30c5ce8ee180b92f313c9606 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sun, 1 Mar 2020 04:06:59 +0000
Subject: [PATCH 1324/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2139 of 2139 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 0551f2f3ec..f57ef0e28d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2170,5 +2170,11 @@
     "Your password": "您的密碼",
     "This session, or the other session": "此工作階段或其他工作階段",
     "The internet connection either session is using": "任何一個工作階段正在使用的網際網路連線",
-    "We recommend you change your password and recovery key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與復原金鑰"
+    "We recommend you change your password and recovery key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與復原金鑰",
+    "Sign In or Create Account": "登入或建立帳號",
+    "Use your account or create a new one to continue.": "使用您的帳號或建立新的以繼續。",
+    "Create Account": "建立帳號",
+    "Order rooms by name": "以名稱排序聊天室",
+    "Show rooms with unread notifications first": "先顯示有未讀通知的聊天室",
+    "Show shortcuts to recently viewed rooms above the room list": "在聊天室清單上方顯示最近看過的聊天室的捷徑"
 }

From 3571690e7478055e73afcc71c6309e0cf17d362a Mon Sep 17 00:00:00 2001
From: Michal Stanke <michal@stanke.cz>
Date: Sun, 1 Mar 2020 09:56:26 +0000
Subject: [PATCH 1325/3235] Translated using Weblate (Czech)

Currently translated at 100.0% (2139 of 2139 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 34f43d7cd5..3b8beeddfb 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -74,9 +74,9 @@
     "A new password must be entered.": "Musíte zadat nové heslo.",
     "An error has occurred.": "Nastala chyba.",
     "Anyone": "Kdokoliv",
-    "Are you sure?": "Určitě?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Určitě chcete odejít z místnosti '%(roomName)s'?",
-    "Are you sure you want to reject the invitation?": "Určitě chcete odmítnout pozvání?",
+    "Are you sure?": "Opravdu?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Opravdu chcete opustit místnost '%(roomName)s'?",
+    "Are you sure you want to reject the invitation?": "Opravdu chcete odmítnout pozvání?",
     "Attachment": "Příloha",
     "Autoplay GIFs and videos": "Automaticky přehrávat GIFy a videa",
     "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.": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zda je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
@@ -133,7 +133,7 @@
     "Failed to ban user": "Nepodařilo se vykázat uživatele",
     "Failed to join room": "Vstup do místnosti se nezdařil",
     "Failed to kick": "Vykopnutí se nezdařilo",
-    "Failed to leave room": "Odejití z místnosti se nezdařilo",
+    "Failed to leave room": "Opuštění místnosti se nezdařilo",
     "Failed to mute user": "Ztlumení uživatele se nezdařilo",
     "Failed to send email": "Odeslání e-mailu se nezdařilo",
     "Failed to reject invitation": "Nepodařilo se odmítnout pozvání",
@@ -176,7 +176,7 @@
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy aktivní",
-    "Leave room": "Odejít z místnosti",
+    "Leave room": "Opustit místnost",
     "Local addresses for this room:": "Místní adresy této místnosti:",
     "Moderator": "Moderátor",
     "Name": "Název",
@@ -401,9 +401,9 @@
     "Blacklisted": "Na černé listině",
     "Invited": "Pozvaní",
     "Joins room with given alias": "Vstoupí do místnosti s daným aliasem",
-    "Leave Community": "Odejít ze skupiny",
-    "Leave %(groupName)s?": "Odejít z %(groupName)s?",
-    "Leave": "Odejít",
+    "Leave Community": "Opustit skupinu",
+    "Leave %(groupName)s?": "Opustit %(groupName)s?",
+    "Leave": "Opustit",
     "Failed to remove user from community": "Nepodařilo se odebrat uživatele ze skupiny",
     "Failed to remove room from community": "Nepodařilo se odebrat místnost ze skupiny",
     "Failed to remove '%(roomName)s' from %(groupId)s": "'%(roomName)s' se nepodařilo odebrat z %(groupId)s",
@@ -453,7 +453,7 @@
     "Missing room_id in request": "V zadání chybí room_id",
     "Missing user_id in request": "V zadání chybí user_id",
     "(could not connect media)": "(média se nepodařilo spojit)",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s nastavil viditelnost budoucí zpráv v místnosti neznámým (%(visibility)s).",
     "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
     "Mirror local video feed": "Zrcadlit lokání video",
     "Enable inline URL previews by default": "Nastavit povolení náhledů URL adres jako výchozí",
@@ -903,8 +903,8 @@
     "Who can join this community?": "Kdo může vstoupit do této skupiny?",
     "Everyone": "Všichni",
     "This room is not public. You will not be able to rejoin without an invite.": "Tato místnost není veřejná. Bez pozvánky nebudete moci znovu vstoupit.",
-    "Can't leave Server Notices room": "Z místnosti \"Server Notices\" nejde odejit",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Tato místnost je určena pro důležité zprávy od domovský serveru, a proto z ní nemůžete odejít.",
+    "Can't leave Server Notices room": "Místnost \"Server Notices\" nelze opustit",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Tato místnost je určena pro důležité zprávy od domovského serveru, a proto ji nelze opustit.",
     "Terms and Conditions": "Smluvní podmínky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Chcete-li nadále používat domovský server %(homeserverDomain)s, měli byste si přečíst a odsouhlasit naše smluvní podmínky.",
     "Review terms and conditions": "Přečíst smluvní podmínky",
@@ -962,7 +962,7 @@
     "Developer options": "Možnosti pro vývojáře",
     "Help & About": "O aplikaci a pomoc",
     "Bug reporting": "Hlášení chyb",
-    "FAQ": "Máte dotazy?",
+    "FAQ": "Často kladené dotazy (FAQ)",
     "Versions": "Verze",
     "Legal": "Právní informace",
     "Voice & Video": "Zvuk a video",
@@ -1126,8 +1126,8 @@
     "Robot": "Robot",
     "Hat": "Klobouk",
     "Glasses": "Brýle",
-    "Spanner": "Utahovací klíč",
-    "Santa": "Santa",
+    "Spanner": "Maticový klíč",
+    "Santa": "Santa Klaus",
     "Thumbs up": "Palec nahoru",
     "Umbrella": "Deštník",
     "Hourglass": "Přesýpací hodiny",
@@ -1142,14 +1142,14 @@
     "Telephone": "Telefon",
     "Flag": "Vlajka",
     "Train": "Vlak",
-    "Bicycle": "Jízní kolo",
+    "Bicycle": "Jízdní kolo",
     "Aeroplane": "Letadlo",
     "Rocket": "Raketa",
     "Trophy": "Trofej",
     "Ball": "Míč",
     "Guitar": "Kytara",
     "Trumpet": "Trumpeta",
-    "Bell": "Zvonek",
+    "Bell": "Zvon",
     "Anchor": "Kotva",
     "Headphones": "Sluchátka",
     "Folder": "Desky",
@@ -1303,7 +1303,7 @@
     "Create account": "Vytvořit účet",
     "Unable to query for supported registration methods.": "Nepovedlo se načíst podporované způsoby přihlášení.",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Vloží ¯\\_(ツ)_/¯ na začátek zprávy",
-    "Changes your display nickname in the current room only": "Změní vaši zobrazovanou přezdívku pouze v současné místnosti",
+    "Changes your display nickname in the current room only": "Změní vaši zobrazovanou přezdívku pouze v této místnosti",
     "User %(userId)s is already in the room": "Uživatel %(userId)s už je v této místnosti",
     "The user must be unbanned before they can be invited.": "Uživatel je vykázán, nelze ho pozvat.",
     "Show read receipts sent by other users": "Zobrazovat potvrzení o přijetí",
@@ -1738,7 +1738,7 @@
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s vytvořil blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s.",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s",
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující místnosti odpovídající %(oldGlob)s na místnosti odpovídající %(newGlob)s z důvodu %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s",
@@ -1838,7 +1838,7 @@
     "Reload": "Načíst znovu",
     "Take picture": "Udělat fotku",
     "Remove for everyone": "Odstranit pro všechny",
-    "Remove for me": "Odstranit pro mě",
+    "Remove for me": "Odstranit (jen pro mě)",
     "User Status": "Stav uživatele",
     "Verification Request": "Požadavek na ověření",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
@@ -1905,7 +1905,7 @@
     "They match": "Odpovídají",
     "They don't match": "Neodpovídají",
     "To be secure, do this in person or use a trusted way to communicate.": "Aby to bylo bezpečné, udělejte to osobně nebo použijte důvěryhodný komunikační prostředek.",
-    "Lock": "Zamknout",
+    "Lock": "Zámek",
     "Verify yourself & others to keep your chats safe": "Ověřte sebe a ostatní, aby byla vaše komunikace bezpečná",
     "Other users may not trust it": "Ostatní uživatelé této relaci nemusí věřit",
     "Later": "Později",
@@ -2053,7 +2053,7 @@
     "This wasn't me": "To jsem nebyl/a já",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Toto vám umožní se přihlásit do dalších relací a vrátit se ke svému účtu poté, co se odhlásíte.",
     "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Máte zakázané posílání zpráv neověřeným relacím; abyste mohli zprávu odeslat, musíte je ověřit.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme si projít ověřovací proces pro každou relaci abyste ověřili, že patří tomu, komu očekáváte. Můžete ale poslat zprávu i bez ověření, pokud chcete.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme projít ověřovací proces pro každou relaci abyste ověřili, že patří tomu, komu očekáváte. Můžete ale poslat zprávu i bez ověření, pokud chcete.",
     "Room contains unknown sessions": "V místnosti jsou neověřené relace",
     "\"%(RoomName)s\" contains sessions that you haven't seen before.": "V místnosti \"%(RoomName)s\" jsou relace, které jste ještě nikdy neviděli.",
     "Unknown sessions": "Neznámá relace",
@@ -2146,5 +2146,22 @@
     "Indexed messages:": "Indexované zprávy:",
     "Indexed rooms:": "Indexované místnosti:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s z %(totalRooms)s",
-    "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)"
+    "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)",
+    "Sign In or Create Account": "Přihlásit nebo vytvořit nový účet",
+    "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.",
+    "Create Account": "Vytvořit účet",
+    "Order rooms by name": "Seřadit místnosti podle názvz",
+    "Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu",
+    "Show shortcuts to recently viewed rooms above the room list": "Zobrazovat zkratky do nedávno zobrazených místností navrchu",
+    "Cancelling…": "Rušení…",
+    "Your homeserver does not support cross-signing.": "Váš domovský server nepodporuje cross-signing.",
+    "Homeserver feature support:": "Funkce podporované domovským serverem:",
+    "Accepting…": "Přijímání…",
+    "Accepting …": "Přijímání…",
+    "Declining …": "Odmítání…",
+    "Verification Requests": "Požadavky na ověření",
+    "Your account is not secure": "Váš účet není zabezpečený",
+    "Your password": "Vaše heslo",
+    "This session, or the other session": "Tato relace, nebo jiná",
+    "We recommend you change your password and recovery key in Settings immediately": "Doporučujeme vám si v nastavení okamžitě změnit své heslo a obnovovací klíče"
 }

From 0a2df38ea3c2b6333d0c0508fa260e663352f238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Sun, 1 Mar 2020 14:25:32 +0000
Subject: [PATCH 1326/3235] Translated using Weblate (Czech)

Currently translated at 100.0% (2139 of 2139 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 3b8beeddfb..e5c4cea2ff 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2163,5 +2163,7 @@
     "Your account is not secure": "Váš účet není zabezpečený",
     "Your password": "Vaše heslo",
     "This session, or the other session": "Tato relace, nebo jiná",
-    "We recommend you change your password and recovery key in Settings immediately": "Doporučujeme vám si v nastavení okamžitě změnit své heslo a obnovovací klíče"
+    "We recommend you change your password and recovery key in Settings immediately": "Doporučujeme vám si v nastavení okamžitě změnit své heslo a obnovovací klíče",
+    "exists": "existuje",
+    "The internet connection either session is using": "Internetové připojení používané jednou z relací"
 }

From 6c77b563f2f60170e3aca04ea7c75484b618efa3 Mon Sep 17 00:00:00 2001
From: axel simon <github@axelsimon.net>
Date: Sat, 29 Feb 2020 12:29:00 +0000
Subject: [PATCH 1327/3235] Translated using Weblate (French)

Currently translated at 100.0% (2139 of 2139 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 32b6819533..bbc1d47c93 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1374,7 +1374,7 @@
     "The homeserver may be unavailable or overloaded.": "Le serveur d’accueil est peut-être indisponible ou surchargé.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Vous avez %(count)s notifications non lues dans une version précédente de ce salon.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Vous avez %(count)s notification non lue dans une version précédente de ce salon.",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Si vous utilisez ou non la fonction « fil d’ariane » (les avatars au-dessus de la liste des salons)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Si vous utilisez ou non la fonction « fil d’Ariane » (avatars au-dessus de la liste des salons)",
     "Replying With Files": "Répondre avec des fichiers",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Pour le moment, il n’est pas possible de répondre avec un fichier. Souhaitez-vous envoyer ce fichier sans répondre ?",
     "The file '%(fileName)s' failed to upload.": "Le fichier « %(fileName)s » n’a pas pu être envoyé.",

From ef017fe8f2728468761355c0172d2eb688b2c54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 29 Feb 2020 12:29:18 +0000
Subject: [PATCH 1328/3235] Translated using Weblate (French)

Currently translated at 100.0% (2139 of 2139 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index bbc1d47c93..f9e575291e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2171,5 +2171,11 @@
     "Your password": "Votre mot de passe",
     "This session, or the other session": "Cette session, ou l'autre session",
     "The internet connection either session is using": "La connection internet de l'une des sessions",
-    "We recommend you change your password and recovery key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et la clé de récupération dans Paramètres dès que possible"
+    "We recommend you change your password and recovery key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et la clé de récupération dans Paramètres dès que possible",
+    "Sign In or Create Account": "Se connecter ou créer un compte",
+    "Use your account or create a new one to continue.": "Utilisez votre compte ou créez un nouveau compte pour continuer.",
+    "Create Account": "Créer un compte",
+    "Order rooms by name": "Trier les salons par nom",
+    "Show rooms with unread notifications first": "Afficher en premier les salons avec des notifications non lues",
+    "Show shortcuts to recently viewed rooms above the room list": "Afficher les raccourcis vers les salons vus récemment au-dessus de la liste des salons"
 }

From 4d07480ccee966932b573e912b41e85aff6a78ec Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 29 Feb 2020 10:24:00 +0000
Subject: [PATCH 1329/3235] Translated using Weblate (German)

Currently translated at 75.7% (1619 of 2139 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1d9a96ece0..9a655b041c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1646,5 +1646,15 @@
     "Sign in to your Matrix account on <underlinedServerName />": "Melde dich bei deinem Matrix-Konto auf <underlinedServerName /> an",
     "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
     "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deinen Homeserver-Administrator für weitere Informationen."
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deinen Homeserver-Administrator für weitere Informationen.",
+    "Sign In or Create Account": "Anmelden oder Account erstellen",
+    "Use your account or create a new one to continue.": "Benutze deinen Account oder erstellen einen neuen, um fortzufahren.",
+    "Create Account": "Account erstellen",
+    "Show typing notifications": "Zeige Tipp-Benachrichtigungen",
+    "Order rooms by name": "Sortiere Räume nach Name",
+    "When rooms are upgraded": "Wenn Räume verbessert werden",
+    "Scan this unique code": "Scanne diesen einzigartigen Code",
+    "or": "oder",
+    "Compare unique emoji": "Vergleiche einzigartige Emojis",
+    "Start": "Starte"
 }

From 270d31d4a991b8ba031f19226a08a0a19e30eddb Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 29 Feb 2020 19:11:50 +0000
Subject: [PATCH 1330/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2139 of 2139 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 4b9b6e3639..672101059e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2067,7 +2067,7 @@
     "Verification timed out. Start verification again from their profile.": "Ellenőrzés időtúllépés. Kezd újra az ellenőrzést a másik felhasználó profiljából.",
     "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s törölte az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
     "You cancelled verification. Start verification again from their profile.": "Törölted az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
-    "Encryption enabled": "Titkosítás engedélyezve",
+    "Encryption enabled": "Titkosítás bekapcsolva",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. További információkért és ellenőrzéshez nyisd meg a felhasználó profilját.",
     "Encryption not enabled": "Titkosítás nincs engedélyezve",
     "The encryption used by this room isn't supported.": "A szobában használt titkosítás nem támogatott.",

From f589277bb8852f120739f42cb39e3bd040954265 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sat, 29 Feb 2020 16:34:03 +0000
Subject: [PATCH 1331/3235] Translated using Weblate (Japanese)

Currently translated at 54.7% (1169 of 2139 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, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 43e4d5544a..c142cc2a0e 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1179,5 +1179,11 @@
     "Confirm your passphrase": "パスワードを確認",
     "Recovery key": "リカバリキー",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "キーの暗号化されたコピーがサーバーに保存されます。バックアップを保護するために、パスワードを設定してください。",
-    "Secure your backup with a passphrase": "バックアップをパスワードで保護"
+    "Secure your backup with a passphrase": "バックアップをパスワードで保護",
+    "Display Name": "表示名",
+    "Profile picture": "プロフィール画像",
+    "Encryption enabled": "暗号化が有効です",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "この部屋内のメッセージはエンドツーエンドで暗号化されます。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
+    "Encryption not enabled": "暗号化が無効です",
+    "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。"
 }

From 72ad0a8dbcff3fe2979edcea5b6cc5f99684edb5 Mon Sep 17 00:00:00 2001
From: tctovsli <Tctovsli@gmail.com>
Date: Sun, 1 Mar 2020 20:18:00 +0000
Subject: [PATCH 1332/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 50.9% (1089 of 2139 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index c9b98f9a26..f8e647a20e 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1100,5 +1100,8 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s starta ein videosamtale. (ikkje støtta av denne nettlesaren)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s trekte tilbake invitasjonen for at %(targetDisplayName)s kan bli medlem i rommet.",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du er administrator for dette fellesskapet. Du kan ikkje melde deg inn igjen utan at du har invitasjon frå ein annan administrator.",
-    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>"
+    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>",
+    "Sign In or Create Account": "Logg inn eller opprett konto",
+    "Create Account": "Opprett konto",
+    "Sends the given emote coloured as a rainbow": "Sendar emojien med regnbogefargar"
 }

From c6eef5fe5bbe2b5cb49ea72486ef50127137e183 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 29 Feb 2020 19:43:59 +0000
Subject: [PATCH 1333/3235] Translated using Weblate (Turkish)

Currently translated at 75.3% (1610 of 2139 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index b8926b85cb..bcf7fbbc35 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1564,5 +1564,69 @@
     "Failed to update community": "Toluluğu güncelleme başarısız",
     "Downloading mesages for %(currentRoom)s.": "%(currentRoom)s için mesajlar indiriliyor.",
     "Indexed rooms:": "İndekslenmiş odalar:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s odadan %(crawlingRooms)s tanesi"
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s odadan %(crawlingRooms)s tanesi",
+    "Bridges": "Köprüler",
+    "Send a reply…": "Bir cevap gönder…",
+    "Send a message…": "Bir mesaj gönder…",
+    "Direct Messages": "Doğrudan Mesajlar",
+    "Unknown Command": "Bilinmeyen Komut",
+    "Unrecognised command: %(commandText)s": "Tanınmayan komut: %(commandText)s",
+    "Send as message": "Mesaj olarak gönder",
+    "Start Verification": "Doğrulamayı Başlat",
+    "Verify User": "Kullanıcı Doğrula",
+    "Your messages are not secure": "Mesajlarınız korunmuyor",
+    "Your homeserver": "Ana sunucunuz",
+    "Not Trusted": "Güvenilmiyor",
+    "%(count)s sessions|other": "%(count)s oturum",
+    "%(count)s sessions|one": "%(count)s oturum",
+    "%(name)s cancelled verifying": "%(name)s doğrulama iptal edildi",
+    "Message removed": "Mesaj silindi",
+    "Filter community members": "Topluluk üyeleri filtrelendi",
+    "Invite to this community": "Bu topluluğa davet et",
+    "Failed to remove room from community": "Topluluktan oda silinmesi başarısız",
+    "Visible to everyone": "Herkese görünür",
+    "Only visible to community members": "Sadece topluluk üyelerine görünür",
+    "Add rooms to this community": "Bu topluluğa odaları ekle",
+    "Filter community rooms": "Topluluk odalarını filtrele",
+    "You're not currently a member of any communities.": "Şu anda hiç bir topluluğun bir üyesi değilsiniz.",
+    "Yes, I want to help!": "Evet, Yardım istiyorum!",
+    "Set Password": "Şifre oluştur",
+    "Error encountered (%(errorDetail)s).": "Hata oluştu (%(errorDetail)s).",
+    "Checking for an update...": "Güncelleme kontrolü...",
+    "No update available.": "Güncelleme yok.",
+    "Downloading update...": "Güncelleme indiriliyor...",
+    "Frequently Used": "Sıklıkla Kullanılan",
+    "Animals & Nature": "Hayvanlar & Doğa",
+    "Food & Drink": "Yiyecek & İçecek",
+    "Activities": "Aktiviteler",
+    "Travel & Places": "Seyahat & Yerler",
+    "Objects": "Nesneler",
+    "Symbols": "Semboller",
+    "Flags": "Bayraklar",
+    "Cancel search": "Aramayı iptal et",
+    "Your display name": "Ekran adınız",
+    "Your user ID": "Kullanıcı ID",
+    "Your theme": "Temanız",
+    "Widget ID": "Görsel Bileşen ID si",
+    "Delete Widget": "Görsel Bileşen Sil",
+    "Delete widget": "Görsel bileşen sil",
+    "Failed to remove widget": "Görsel bileşen silme başarısız",
+    "Destroy cross-signing keys?": "Çarpraz-imzalama anahtarlarını imha et?",
+    "Clear cross-signing keys": "Çapraz-imzalama anahtarlarını temizle",
+    "Clear all data in this session?": "Bu oturumdaki tüm verileri temizle?",
+    "Verify session": "Oturum doğrula",
+    "Use Legacy Verification (for older clients)": "Eski Doğrulamayı Kullan (eski istemciler için)",
+    "Session name": "Oturum adı",
+    "Session key": "Oturum anahtarı",
+    "Verification Requests": "Doğrulama İstekleri",
+    "Recent Conversations": "Güncel Sohbetler",
+    "Suggestions": "Öneriler",
+    "Recently Direct Messaged": "Güncel Doğrudan Mesajlar",
+    "Go": "Git",
+    "Loading session info...": "Oturum bilgisi yükleniyor...",
+    "Your account is not secure": "Hesabınız güvende değil",
+    "Your password": "Parolanız",
+    "This session, or the other session": "Bu oturum veya diğer oturum",
+    "New session": "Yeni oturum",
+    "This wasn't me": "Bu ben değildim"
 }

From 8ec83d4a7711452c1c9857b6f9fad1f5343e10ae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 2 Mar 2020 11:20:28 +0000
Subject: [PATCH 1334/3235] Revert to manual sorting for custom tag rooms

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

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 30b523d35d..561d865b66 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -62,15 +62,16 @@ const getListAlgorithm = (listKey, settingAlgorithm) => {
     // apply manual sorting only to m.favourite, otherwise respect the global setting
     // all the known tags are listed explicitly here to simplify future changes
     switch (listKey) {
-        case "m.favourite":
-            return ALGO_MANUAL;
         case "im.vector.fake.invite":
         case "im.vector.fake.recent":
         case "im.vector.fake.archived":
         case "m.lowpriority":
         case TAG_DM:
-        default:
             return settingAlgorithm;
+
+        case "m.favourite":
+        default: // custom-tags
+            return ALGO_MANUAL;
     }
 };
 

From f8045e428bad7a1dde1df56fab1e4a3a62ea021d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 2 Mar 2020 14:59:54 +0000
Subject: [PATCH 1335/3235] riot-desktop open SSO in browser so user doesn't
 have to auth twice

---
 src/BasePlatform.js                          | 24 ++++++++++++
 src/Login.js                                 | 28 ++++---------
 src/components/structures/auth/Login.js      | 12 ++++--
 src/components/structures/auth/SoftLogout.js | 31 ++-------------
 src/components/views/elements/SSOButton.js   | 41 ++++++++++++++++++++
 src/i18n/strings/en_EN.json                  |  2 +-
 6 files changed, 86 insertions(+), 52 deletions(-)
 create mode 100644 src/components/views/elements/SSOButton.js

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index a935f4a767..809fe198d6 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -4,6 +4,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {MatrixClient} from "matrix-js-sdk";
 import dis from './dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
 
@@ -164,4 +166,26 @@ export default class BasePlatform {
     }
 
     setLanguage(preferredLangs: string[]) {}
+
+    getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
+        const url = new URL(window.location.href);
+        // 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 an SSO login.
+        url.hash = "";
+        url.searchParams.set("homeserver", hsUrl);
+        url.searchParams.set("identityServer", isUrl);
+        return url;
+    }
+
+    /**
+     * Begin Single Sign On flows.
+     * @param mxClient the matrix client using which we should start the flow
+     * @param loginType the type of SSO it is, CAS/SSO.
+     */
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
+        const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
+        window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
+    }
 }
diff --git a/src/Login.js b/src/Login.js
index d9ce8adaaa..1590e5ac28 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -3,6 +3,7 @@ Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,8 +20,6 @@ limitations under the License.
 
 import Matrix from "matrix-js-sdk";
 
-import url from 'url';
-
 export default class Login {
     constructor(hsUrl, isUrl, fallbackHsUrl, opts) {
         this._hsUrl = hsUrl;
@@ -29,6 +28,7 @@ export default class Login {
         this._currentFlowIndex = 0;
         this._flows = [];
         this._defaultDeviceDisplayName = opts.defaultDeviceDisplayName;
+        this._tempClient = null; // memoize
     }
 
     getHomeserverUrl() {
@@ -40,10 +40,12 @@ export default class Login {
     }
 
     setHomeserverUrl(hsUrl) {
+        this._tempClient = null; // clear memoization
         this._hsUrl = hsUrl;
     }
 
     setIdentityServerUrl(isUrl) {
+        this._tempClient = null; // clear memoization
         this._isUrl = isUrl;
     }
 
@@ -52,8 +54,9 @@ export default class Login {
      * requests.
      * @returns {MatrixClient}
      */
-    _createTemporaryClient() {
-        return Matrix.createClient({
+    createTemporaryClient() {
+        if (this._tempClient) return this._tempClient; // use memoization
+        return this._tempClient = Matrix.createClient({
             baseUrl: this._hsUrl,
             idBaseUrl: this._isUrl,
         });
@@ -61,7 +64,7 @@ export default class Login {
 
     getFlows() {
         const self = this;
-        const client = this._createTemporaryClient();
+        const client = this.createTemporaryClient();
         return client.loginFlows().then(function(result) {
             self._flows = result.flows;
             self._currentFlowIndex = 0;
@@ -139,21 +142,6 @@ export default class Login {
             throw error;
         });
     }
-
-    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 an SSO login.
-      parsedUrl.hash = "";
-
-      parsedUrl.query["homeserver"] = client.getHomeserverUrl();
-      parsedUrl.query["identityServer"] = client.getIdentityServerUrl();
-      return client.getSsoLoginUrl(url.format(parsedUrl), loginType);
-    }
 }
 
 
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 24e4726416..3813146b5e 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -27,6 +27,7 @@ import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import AuthPage from "../../views/auth/AuthPage";
+import SSOButton from "../../views/elements/SSOButton";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -120,8 +121,8 @@ export default createReactClass({
             'm.login.password': this._renderPasswordStep,
 
             // 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")),
+            'm.login.cas': () => this._renderSsoStep("cas"),
+            'm.login.sso': () => this._renderSsoStep("sso"),
         };
 
         this._initLoginLogic();
@@ -585,7 +586,7 @@ export default createReactClass({
         );
     },
 
-    _renderSsoStep: function(url) {
+    _renderSsoStep: function(loginType) {
         const SignInToText = sdk.getComponent('views.auth.SignInToText');
 
         let onEditServerDetailsClick = null;
@@ -606,7 +607,10 @@ export default createReactClass({
                 <SignInToText serverConfig={this.props.serverConfig}
                     onEditServerDetailsClick={onEditServerDetailsClick} />
 
-                <a href={url} className="mx_Login_sso_link mx_Login_submit">{ _t('Sign in with single sign-on') }</a>
+                <SSOButton
+                    className="mx_Login_sso_link mx_Login_submit"
+                    matrixClient={this._loginLogic.createTemporaryClient()}
+                    loginType={loginType} />
             </div>
         );
     },
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 8481b3fc43..d38fcf3883 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -23,8 +23,8 @@ import * as Lifecycle from '../../../Lifecycle';
 import Modal from '../../../Modal';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {sendLoginRequest} from "../../../Login";
-import url from 'url';
 import AuthPage from "../../views/auth/AuthPage";
+import SSOButton from "../../views/elements/SSOButton";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -55,7 +55,6 @@ export default class SoftLogout extends React.Component {
         this.state = {
             loginView: LOGIN_VIEW.LOADING,
             keyBackupNeeded: true, // assume we do while we figure it out (see componentWillMount)
-            ssoUrl: null,
 
             busy: false,
             password: "",
@@ -105,18 +104,6 @@ export default class SoftLogout extends React.Component {
 
         const chosenView = loginViews.filter(f => !!f)[0] || LOGIN_VIEW.UNSUPPORTED;
         this.setState({loginView: chosenView});
-
-        if (chosenView === LOGIN_VIEW.CAS || chosenView === LOGIN_VIEW.SSO) {
-            const client = MatrixClientPeg.get();
-
-            const appUrl = url.parse(window.location.href, true);
-            appUrl.hash = ""; // Clear #/soft_logout off the URL
-            appUrl.query["homeserver"] = client.getHomeserverUrl();
-            appUrl.query["identityServer"] = client.getIdentityServerUrl();
-
-            const ssoUrl = client.getSsoLoginUrl(url.format(appUrl), chosenView === LOGIN_VIEW.CAS ? "cas" : "sso");
-            this.setState({ssoUrl});
-        }
     }
 
     onPasswordChange = (ev) => {
@@ -195,14 +182,6 @@ export default class SoftLogout extends React.Component {
         });
     }
 
-    onSsoLogin = async (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        this.setState({busy: true});
-        window.location.href = this.state.ssoUrl;
-    };
-
     _renderSignInSection() {
         if (this.state.loginView === LOGIN_VIEW.LOADING) {
             const Spinner = sdk.getComponent("elements.Spinner");
@@ -257,8 +236,6 @@ export default class SoftLogout extends React.Component {
         }
 
         if (this.state.loginView === LOGIN_VIEW.SSO || this.state.loginView === LOGIN_VIEW.CAS) {
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
             if (!introText) {
                 introText = _t("Sign in and regain access to your account.");
             } // else we already have a message and should use it (key backup warning)
@@ -266,9 +243,9 @@ export default class SoftLogout extends React.Component {
             return (
                 <div>
                     <p>{introText}</p>
-                    <AccessibleButton kind='primary' onClick={this.onSsoLogin}>
-                        {_t('Sign in with single sign-on')}
-                    </AccessibleButton>
+                    <SSOButton
+                        matrixClient={MatrixClientPeg.get()}
+                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"} />
                 </div>
             );
         }
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
new file mode 100644
index 0000000000..3e0757924b
--- /dev/null
+++ b/src/components/views/elements/SSOButton.js
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 PlatformPeg from "../../../PlatformPeg";
+import AccessibleButton from "./AccessibleButton";
+import {_t} from "../../../languageHandler";
+
+const SSOButton = ({matrixClient, loginType, ...props}) => {
+    const onClick = () => {
+        PlatformPeg.get().startSingleSignOn(matrixClient, loginType);
+    };
+
+    return (
+        <AccessibleButton {...props} kind="primary" onClick={onClick}>
+            {_t("Sign in with single sign-on")}
+        </AccessibleButton>
+    );
+};
+
+SSOButton.propTypes = {
+    matrixClient: PropTypes.object.isRequired, // does not use context as may use a temporary client
+    loginType: PropTypes.oneOf(["sso", "cas"]), // defaults to "sso" in base-apis
+};
+
+export default SSOButton;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba48f7cd37..9471b62c59 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1429,6 +1429,7 @@
     "This alias is available to use": "This alias is available to use",
     "This alias is already in use": "This alias is already in use",
     "Room directory": "Room directory",
+    "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
@@ -2001,7 +2002,6 @@
     "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",
     "Create account": "Create account",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",

From 4d9d5a1ab7954b1e01be14cbd58754015b990b25 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 2 Mar 2020 15:05:56 +0000
Subject: [PATCH 1336/3235] improve comments

---
 src/BasePlatform.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 809fe198d6..5d809eb28f 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -181,8 +181,8 @@ export default class BasePlatform {
 
     /**
      * Begin Single Sign On flows.
-     * @param mxClient the matrix client using which we should start the flow
-     * @param loginType the type of SSO it is, CAS/SSO.
+     * @param {MatrixClient} mxClient the matrix client using which we should start the flow
+     * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
      */
     startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
         const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());

From 7fcad8c82c1b56736dfb589edce9893f64392f25 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 2 Mar 2020 17:29:36 +0000
Subject: [PATCH 1337/3235] Upgrade matrix-js-sdk to 5.1.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index db877edc8c..188db47416 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.1.0-rc.1",
+    "matrix-js-sdk": "5.1.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index b01b64a8b3..8770bf39e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5791,10 +5791,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
   integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
 
-matrix-js-sdk@5.1.0-rc.1:
-  version "5.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0-rc.1.tgz#48154133f1c8bc19557164a24535d6d45d1cf482"
-  integrity sha512-3pf8NOziyaldtJkYsas9Cq/b8TloGMY89KRA4tJLRDCdMrlBEJoQ4qb9MCmhS53Yb8N4ysI7qUUC21FtBryAVQ==
+matrix-js-sdk@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0.tgz#9b3b02af227ecc2d0cc35fb7312c92b8a6754293"
+  integrity sha512-IGRq5iACiKp3iIxAghwtdBPrbdgORowc0i8YuIMkZZMpRJDXnNaudt2BFwyQdukV7gvzz7F0sfxBUerySfOnKA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 51b10702f07dd2862fc7b6362f1414bff44cf462 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 2 Mar 2020 17:33:23 +0000
Subject: [PATCH 1338/3235] Prepare changelog for v2.2.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4b86317c8..88d1895691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Changes in [2.2.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.0) (2020-03-02)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0-rc.1...v2.2.0)
+
+ * Upgrade JS SDK to 5.1.0
+ * Ignore cursor jumping shortcuts with shift
+   [\#4142](https://github.com/matrix-org/matrix-react-sdk/pull/4142)
+
 Changes in [2.2.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.0-rc.1) (2020-02-26)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.1...v2.2.0-rc.1)

From 134ca31b25b14bcd3e290029311d2127e3a522d6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 2 Mar 2020 17:33:23 +0000
Subject: [PATCH 1339/3235] v2.2.0

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

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

From 00dc187f7165a0659ce1ae5bbd3fd491ba5650db Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 2 Mar 2020 17:43:21 +0000
Subject: [PATCH 1340/3235] Reset matrix-js-sdk back to develop

---
 package.json |   2 +-
 yarn.lock    | 200 ++++-----------------------------------------------
 2 files changed, 14 insertions(+), 188 deletions(-)

diff --git a/package.json b/package.json
index f5bd9ec19f..e453b63a4d 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.1.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 7417fa2a78..87aeccd140 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1438,11 +1438,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1576,19 +1571,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2494,11 +2481,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2734,7 +2716,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2810,11 +2792,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2828,11 +2805,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3833,13 +3805,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3902,20 +3867,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 "gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
   version "1.4.3"
   resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
@@ -4117,11 +4068,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4309,7 +4255,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4326,13 +4272,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5714,10 +5653,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.1.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0.tgz#9b3b02af227ecc2d0cc35fb7312c92b8a6754293"
-  integrity sha512-IGRq5iACiKp3iIxAghwtdBPrbdgORowc0i8YuIMkZZMpRJDXnNaudt2BFwyQdukV7gvzz7F0sfxBUerySfOnKA==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/da96765020b632deb5b433077827a4f4a64e16e9"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5907,21 +5845,6 @@ minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5946,7 +5869,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -6023,15 +5946,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
-  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6109,22 +6023,6 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.49:
   version "1.1.50"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -6132,14 +6030,6 @@ node-releases@^1.1.49:
   dependencies:
     semver "^6.3.0"
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6172,27 +6062,6 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6200,16 +6069,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6359,11 +6218,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6373,19 +6227,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -7015,7 +6861,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7179,7 +7025,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7538,7 +7384,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7700,7 +7546,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8036,7 +7882,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8299,19 +8145,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -9031,13 +8864,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9115,7 +8941,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 677dce75c5fe4827ff24ab742686a6193441cdf1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 2 Mar 2020 17:48:38 +0000
Subject: [PATCH 1341/3235] Use bash for release script

This fixes this repo to use bash for this script, matching the other repos.
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index 3c28084bb7..1b99e870ac 100755
--- a/release.sh
+++ b/release.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Script to perform a release of matrix-react-sdk.
 #

From 07348a65ad66b733c6de899ade6ba47c71c0e710 Mon Sep 17 00:00:00 2001
From: Mark Striemer <mstriemer@mozilla.com>
Date: Mon, 2 Mar 2020 13:59:14 -0600
Subject: [PATCH 1342/3235] Include a mark as read X under the scroll to unread
 button

---
 res/css/views/rooms/_TopUnreadMessagesBar.scss     | 14 ++++++++++++++
 src/components/views/rooms/TopUnreadMessagesBar.js |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index a3916f321a..5f6f869877 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -56,3 +56,17 @@ limitations under the License.
     mask-position: 9px 13px;
     background: $roomtile-name-color;
 }
+
+.mx_TopUnreadMessagesBar_markAsRead {
+    display: block;
+    width: 18px;
+    height: 18px;
+    background-image: url('$(res)/img/cancel.svg');
+    background-position: center;
+    background-size: 10px;
+    background-repeat: no-repeat;
+    background-color: $primary-bg-color;
+    border: 1.3px solid $roomtile-name-color;
+    border-radius: 99px;
+    margin: 5px auto;
+}
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 04805c799f..23d41059c4 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -27,6 +27,7 @@ export default createReactClass({
 
     propTypes: {
         onScrollUpClick: PropTypes.func,
+        onCloseClick: PropTypes.func,
     },
 
     render: function() {
@@ -36,6 +37,10 @@ export default createReactClass({
                     title={_t('Jump to first unread message.')}
                     onClick={this.props.onScrollUpClick}>
                 </AccessibleButton>
+                <AccessibleButton className="mx_TopUnreadMessagesBar_markAsRead"
+                    title={_t('Mark all as read')}
+                    onClick={this.props.onCloseClick}>
+                </AccessibleButton>
             </div>
         );
     },

From df9710907c833aad6275feb191f6d88c0bc8e58f Mon Sep 17 00:00:00 2001
From: Mark Striemer <mstriemer@mozilla.com>
Date: Mon, 2 Mar 2020 15:45:16 -0600
Subject: [PATCH 1343/3235] Add en_US string

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ab18c58e90..58f42ebe34 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1139,6 +1139,7 @@
     "Revoke invite": "Revoke invite",
     "Invited by %(sender)s": "Invited by %(sender)s",
     "Jump to first unread message.": "Jump to first unread message.",
+    "Mark all as read": "Mark all as read",
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "Error creating alias": "Error creating alias",

From d95f843cd0bf16adf17ba1c25c530c124b84241c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 2 Mar 2020 17:52:20 -0700
Subject: [PATCH 1344/3235] Don't group blank membership changes

We already drop noop membership changes when they don't make it into a MELS, so we just need to make the MELS aware enough to drop messages early that are noops.

Fixes https://github.com/vector-im/riot-web/issues/12575
---
 src/components/structures/MessagePanel.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index dd47028f8e..0029090a94 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -962,6 +962,17 @@ class MemberGrouper {
     }
 
     add(ev) {
+        if (ev.getType() === 'm.room.member') {
+            // We'll just double check that it's worth our time to do so...
+            if (ev.getPrevContent()) {
+                const membershipChange = ev.getPrevContent()['membership'] !== ev.getContent()['membership'];
+                const displayNameChange = ev.getPrevContent()['displayname'] !== ev.getContent()['displayname'];
+                const avatarChange = ev.getPrevContent()['avatar_url'] !== ev.getContent()['avatar_url'];
+                if (!membershipChange && !displayNameChange && !avatarChange) {
+                    return; // Not a substantial change - quietly ignore
+                }
+            }
+        }
         this.readMarker = this.readMarker || this.panel._readMarkerForEvent(ev.getId());
         this.events.push(ev);
     }

From 96f125ebdcac2ec6b3849a0cec7ff4802ae9bac4 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Mon, 2 Mar 2020 20:44:01 +0000
Subject: [PATCH 1345/3235] Translated using Weblate (Polish)

Currently translated at 63.3% (1355 of 2140 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 | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index aed7f01170..1eaa11409a 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -631,7 +631,7 @@
     "Unable to join network": "Nie można dołączyć do sieci",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Możliwe, że skofigurowałeś je w innym kliencie, niż Riot. Nie możesz ich zmieniać w Riot, ale nadal mają zastosowanie",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
-    "Uploaded on %(date)s by %(user)s": "Wysłane %(date)s przez %(user)s",
+    "Uploaded on %(date)s by %(user)s": "Wysłano %(date)s przez %(user)s",
     "Messages in group chats": "Wiadomości w czatach grupowych",
     "Yesterday": "Wczoraj",
     "Error encountered (%(errorDetail)s).": "Wystąpił błąd (%(errorDetail)s).",
@@ -1356,5 +1356,17 @@
     "Filter rooms…": "Filtruj pokoje…",
     "Find a room…": "Znajdź pokój…",
     "Find a room… (e.g. %(exampleRoom)s)": "Znajdź pokój… (np. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Jeżeli nie możesz znaleźć szukanego pokoju, poproś o zaproszenie albo <a>Stwórz nowy pokój</a>."
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Jeżeli nie możesz znaleźć szukanego pokoju, poproś o zaproszenie albo <a>stwórz nowy pokój</a>.",
+    "Show typing notifications": "Pokazuj powiadomienia o pisaniu",
+    "Match system theme": "Dopasuj do motywu systemego",
+    "They match": "Pasują do siebie",
+    "They don't match": "Nie pasują do siebie",
+    "Upload": "Prześlij",
+    "Remove recent messages": "Usuń ostatnie wiadomości",
+    "Rotate Left": "Obróć w lewo",
+    "Rotate counter-clockwise": "Obróć w kierunku przeciwnym do ruchu wskazówek zegara",
+    "Rotate Right": "Obróć w prawo",
+    "Rotate clockwise": "Obróć zgodnie z ruchem wskazówek zegara",
+    "Help": "Pomoc",
+    "Passwords don't match": "Hasła nie zgadzają się"
 }

From 88f351d5ca8e113b38f1b126d4b7e2ad5d544e3a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 3 Mar 2020 10:40:58 +0000
Subject: [PATCH 1346/3235] Keep sign in button disabled on success

This changes password login to keep the sign in button locked when proceeding
successfully to avoid the possibility of double device sign in.

Part of https://github.com/vector-im/riot-web/issues/12546
---
 src/components/structures/auth/Login.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 24e4726416..589accacc3 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -245,6 +245,7 @@ export default createReactClass({
             }
 
             this.setState({
+                busy: false,
                 errorText: errorText,
                 // 401 would be the sensible status code for 'incorrect password'
                 // but the login API gives a 403 https://matrix.org/jira/browse/SYN-744
@@ -252,13 +253,6 @@ export default createReactClass({
                 // We treat both as an incorrect password
                 loginIncorrect: error.httpStatus === 401 || error.httpStatus === 403,
             });
-        }).finally(() => {
-            if (this._unmounted) {
-                return;
-            }
-            this.setState({
-                busy: false,
-            });
         });
     },
 

From 0e65d54af298399bb1a2b70a0c1211e3648391b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 3 Mar 2020 11:03:40 +0000
Subject: [PATCH 1347/3235] Fix having to decrypt & download in two steps

---
 src/components/views/messages/MFileBody.js | 4 +++-
 src/usercontent/index.js                   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 886afbb666..312346f412 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -247,6 +247,8 @@ export default createReactClass({
                     });
                 };
 
+                // This button should actually Download because usercontent/ will try to click itself
+                // but it is not guaranteed between various browsers' settings.
                 return (
                     <span className="mx_MFileBody">
                         <div className="mx_MFileBody_download">
@@ -290,7 +292,7 @@ export default createReactClass({
                             src={`${url}?origin=${encodeURIComponent(window.location.origin)}`}
                             onLoad={onIframeLoad}
                             ref={this._iframe}
-                            sandbox="allow-scripts allow-downloads" />
+                            sandbox="allow-scripts allow-downloads allow-downloads-without-user-activation" />
                     </div>
                 </span>
             );
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 08769d6bd1..47eb83964f 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -27,6 +27,7 @@ function remoteRender(event) {
     // Don't display scrollbars if the link takes more than one line to display.
     body.style = "margin: 0px; overflow: hidden";
     body.appendChild(a);
+    a.click(); // try to trigger download automatically
 }
 
 function remoteSetTint(event) {

From 7430277e1312734ff4d27f9c400954ac3a950cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 3 Mar 2020 11:20:43 +0000
Subject: [PATCH 1348/3235] Translated using Weblate (French)

Currently translated at 100.0% (2140 of 2140 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 f9e575291e..d3fea73891 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2177,5 +2177,6 @@
     "Create Account": "Créer un compte",
     "Order rooms by name": "Trier les salons par nom",
     "Show rooms with unread notifications first": "Afficher en premier les salons avec des notifications non lues",
-    "Show shortcuts to recently viewed rooms above the room list": "Afficher les raccourcis vers les salons vus récemment au-dessus de la liste des salons"
+    "Show shortcuts to recently viewed rooms above the room list": "Afficher les raccourcis vers les salons vus récemment au-dessus de la liste des salons",
+    "Displays information about a user": "Affiche des informations à propos de l’utilisateur"
 }

From c0b68ccd53e7c718fd6197f85f885c1e182a421a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 3 Mar 2020 13:23:33 +0000
Subject: [PATCH 1349/3235] only automatically download in usercontent if user
 requested it

---
 src/components/views/messages/MFileBody.js | 2 ++
 src/usercontent/index.js                   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 312346f412..125c538f82 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -271,6 +271,8 @@ export default createReactClass({
                     // We can't provide a Content-Disposition header like we would for HTTP.
                     download: fileName,
                     textContent: _t("Download %(text)s", { text: text }),
+                    // only auto-download if a user triggered this iframe explicitly
+                    auto: !this.props.decryptedBlob,
                 }, "*");
             };
 
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 47eb83964f..2e87e182af 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -27,7 +27,10 @@ function remoteRender(event) {
     // Don't display scrollbars if the link takes more than one line to display.
     body.style = "margin: 0px; overflow: hidden";
     body.appendChild(a);
-    a.click(); // try to trigger download automatically
+
+    if (event.data.auto) {
+        a.click(); // try to trigger download automatically
+    }
 }
 
 function remoteSetTint(event) {

From 357ebb528918b346a085e8aeafe210620b326637 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 3 Mar 2020 13:13:45 +0000
Subject: [PATCH 1350/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2140 of 2140 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 672101059e..971fef5ab3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2173,5 +2173,6 @@
     "Show shortcuts to recently viewed rooms above the room list": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
     "Sign In or Create Account": "Belépés vagy Fiók Készítés",
     "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat vagy készíts egy újat.",
-    "Create Account": "Fiók létrehozása"
+    "Create Account": "Fiók létrehozása",
+    "Displays information about a user": "A felhasználóról információ megjelenítése"
 }

From 59c4e36ba884b7b32cf6d1b0e170092df1abd91d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 3 Mar 2020 14:40:21 +0000
Subject: [PATCH 1351/3235] Lock interactive auth as busy until state change

This keeps interactive auth locked as busy until a state change so that e.g.
accepting a terms step will remain "busy looking" until the next step of the
process appears.

Fixes https://github.com/vector-im/riot-web/issues/12546
---
 src/components/structures/InteractiveAuth.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 3d63029b06..9521dd76ec 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -161,6 +161,7 @@ export default createReactClass({
     _authStateUpdated: function(stageType, stageState) {
         const oldStage = this.state.authStage;
         this.setState({
+            busy: false,
             authStage: stageType,
             stageState: stageState,
             errorText: stageState.error,
@@ -184,10 +185,6 @@ export default createReactClass({
                 errorText: null,
                 stageErrorText: null,
             });
-        } else {
-            this.setState({
-                busy: false,
-            });
         }
     },
 

From f9d2d45b242c1035a68ec3961ca05eafdad39aa2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:42:22 +0100
Subject: [PATCH 1352/3235] use relative scrolling to compensate when changing
 height

---
 src/components/structures/ScrollPanel.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 5121dd3f9d..72d5330451 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -705,17 +705,15 @@ export default createReactClass({
             // the currently filled piece of the timeline
             if (trackedNode) {
                 const oldTop = trackedNode.offsetTop;
-                // changing the height might change the scrollTop
-                // if the new height is smaller than the scrollTop.
-                // We calculate the diff that needs to be applied
-                // ourselves, so be sure to measure the
-                // scrollTop before changing the height.
-                const preexistingScrollTop = sn.scrollTop;
                 itemlist.style.height = `${newHeight}px`;
                 const newTop = trackedNode.offsetTop;
                 const topDiff = newTop - oldTop;
-                sn.scrollTop = preexistingScrollTop + topDiff;
-                debuglog("updateHeight to", {newHeight, topDiff, preexistingScrollTop});
+                // important to scroll by a relative amount as
+                // reading scrollTop and then setting it might
+                // yield out of date values and cause a jump
+                // when setting it
+                sn.scrollBy(0, topDiff);
+                debuglog("updateHeight to", {newHeight, topDiff});
             }
         }
     },

From 223956a206f217e4d6ed5e2abfb1b0558b336414 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:42:44 +0100
Subject: [PATCH 1353/3235] add comment how offset from bottom is calculated

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

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 72d5330451..548dd70748 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -765,6 +765,7 @@ export default createReactClass({
     },
 
     _topFromBottom(node) {
+        // current capped height - distance from top = distance from bottom of container to top of tracked element
         return this._itemlist.current.clientHeight - node.offsetTop;
     },
 

From 3e39cebb8f18006a5e20a44a45f3e21aaf59b17c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:44:59 +0100
Subject: [PATCH 1354/3235] also use relative scrolling when eh ... doing
 relative scrolling

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

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 548dd70748..b81b3ebede 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -523,7 +523,7 @@ export default createReactClass({
     scrollRelative: function(mult) {
         const scrollNode = this._getScrollNode();
         const delta = mult * scrollNode.clientHeight * 0.5;
-        scrollNode.scrollTop = scrollNode.scrollTop + delta;
+        scrollNode.scrollBy(0, delta);
         this._saveScrollState();
     },
 

From 5d6690f74bdcb4f543996e21c733c7c4d4db7905 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 17:59:02 +0100
Subject: [PATCH 1355/3235] document scrollpanel and bacat scrolling

---
 docs/scrolling.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 docs/scrolling.md

diff --git a/docs/scrolling.md b/docs/scrolling.md
new file mode 100644
index 0000000000..71329e5c32
--- /dev/null
+++ b/docs/scrolling.md
@@ -0,0 +1,28 @@
+# ScrollPanel
+
+## Updates
+
+During an onscroll event, we check whether we're getting close to the top or bottom edge of the loaded content. If close enough, we fire a request to load more through the callback passed in the `onFillRequest` prop. This returns a promise is passed down from `TimelinePanel`, where it will call paginate on the `TimelineWindow` and once the events are received back, update its state with the new events. This update trickles down to the `MessagePanel`, which rerenders all tiles and passed that to `ScrollPanel`. ScrollPanels `componentDidUpdate` method gets called, and we do the scroll housekeeping there (read below). Once the rerender has completed, the `setState` callback is called and we resolve the promise returned by `onFillRequest`. Now we check the DOM to see if we need more fill requests.
+
+## Prevent Shrinking
+
+ScrollPanel supports a mode to prevent it shrinking. This is used to prevent a jump when at the bottom of the timeline and people start and stop typing. It gets cleared automatically when 200px above the bottom of the timeline.
+
+
+## BACAT (Bottom-Aligned, Clipped-At-Top) scrolling
+
+BACAT scrolling implements a different way of restoring the scroll position in the timeline while tiles out of view are changing height or tiles are being added or removed. It was added in https://github.com/matrix-org/matrix-react-sdk/pull/2842.
+
+The motivation for the changes is having noticed that setting scrollTop while scrolling tends to not work well, with it interrupting ongoing scrolling and also querying scrollTop reporting outdated values and consecutive scroll adjustments cancelling each out previous ones. This seems to be worse on macOS than other platforms, presumably because of a higher resolution in scroll events there. Also see https://github.com/vector-im/riot-web/issues/528. The BACAT approach allows to only have to change the scroll offset when adding or removing tiles.
+
+The approach taken instead is to vertically align the timeline tiles to the bottom of the scroll container (using flexbox) and give the timeline inside the scroll container an explicit height, initially set to a multiple of the PAGE_SIZE (400px at time of writing) as needed by the content. When scrolled up, we can compensate for anything that grew below the viewport by changing the height of the timeline to maintain what's currently visible in the viewport without adjusting the scrollTop and hence without jumping.
+
+For anything above the viewport growing or shrinking, we don't need to do anything as the timeline is bottom-aligned. We do need to update the height manually to keep all content visible as more is loaded. To maintain scroll position after the portion above the viewport changes height, we need to set the scrollTop, as we cannot balance it out with more height changes. We do this 100ms after the user has stopped scrolling, so setting scrollTop has not nasty side-effects.
+
+As of https://github.com/matrix-org/matrix-react-sdk/pull/4166, we are scrolling to compensate for height changes by calling `scrollBy(0, x)` rather than reading and than setting `scrollTop`, as reading `scrollTop` can (again, especially on macOS) easily return values that are out of sync with what is on the screen, probably because scrolling can be done [off the main thread](https://wiki.mozilla.org/Platform/GFX/APZ) in some circumstances. This seems to further prevent jumps.
+
+### How does it work?
+
+`componentDidUpdate` is called when a tile in the timeline is updated (as we rerender the whole timeline) or tiles are added or removed (see Updates section before). From here, `checkScroll` is called, which calls `_restoreSavedScrollState`. Now, we increase the timeline height if something below the viewport grew by adjusting `this._bottomGrowth`. `bottomGrowth` is the height added to the timeline (on top of the height from the number of pages calculated at the last `_updateHeight` run) to compensate for growth below the viewport. This is cleared during the next run of `_updateHeight`. Remember that the tiles in the timeline are aligned to the bottom.
+
+From `_restoreSavedScrollState` we also call `_updateHeight` which waits until the user stops scrolling for 100ms and then recalculates the amount of pages of 400px the timeline should be sized to, to be able to show all of its (newly added) content. We have to adjust the scroll offset (which is why we wait until scrolling has stopped) now because the space above the viewport has likely changed.

From 13b4ffb94a57affcfefa621e6a2b2ad4e40d8c6f Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <20200217translateriot@remi.im>
Date: Tue, 3 Mar 2020 16:25:48 +0000
Subject: [PATCH 1356/3235] Translated using Weblate (Dutch)

Currently translated at 87.9% (1881 of 2140 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index fce04510d4..adb13f5e0f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1896,5 +1896,10 @@
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppelt. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is hij offline.",
     "Your homeserver does not support cross-signing.": "Uw thuisserver biedt geen ondersteuning voor kruiselings ondertekenen.",
     "Homeserver feature support:": "Functies ondersteund door thuisserver:",
-    "exists": "bestaat"
+    "exists": "bestaat",
+    "Sign In or Create Account": "Aanmelden of Account Aanmaken",
+    "Use your account or create a new one to continue.": "Gebruik uw account of maak een nieuwe om door te gaan.",
+    "Create Account": "Account aanmaken",
+    "Displays information about a user": "Geef informatie weer over deze gebruiker",
+    "Order rooms by name": "Sorteer gesprekken op naam"
 }

From 191dcaab82b41d5659dfa3ba74f74205fec37fc9 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 3 Mar 2020 17:41:28 +0000
Subject: [PATCH 1357/3235] Explain why not busy is ignored

---
 src/components/structures/InteractiveAuth.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 9521dd76ec..f4adb5751f 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -186,6 +186,12 @@ export default createReactClass({
                 stageErrorText: null,
             });
         }
+        // The JS SDK eagerly reports itself as "not busy" right after any
+        // immediate work has completed, but that's not really what we want at
+        // the UI layer, so we ignore this signal and show a spinner until
+        // there's a new screen to show the user. This is implemented by setting
+        // `busy: false` in `_authStateUpdated`.
+        // See also https://github.com/vector-im/riot-web/issues/12546
     },
 
     _setFocus: function() {

From 846170b3718a8748d57158b0b8842fc1a8b53493 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 13:33:07 -0700
Subject: [PATCH 1358/3235] Revert "Fix downloading files in electron not being
 sent into browser"

This reverts commit d89b8b51484c68c6fe0b1325b5d59ee809cc2196.
---
 src/components/views/elements/ImageView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index f75b735043..e675e6b73f 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -216,7 +216,7 @@ export default class ImageView extends React.Component {
                                 { this.getName() }
                             </div>
                             { eventMeta }
-                            <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } rel="noreferrer noopener">
+                            <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 />
                                          <span className="mx_ImageView_size">{ sizeRes }</span>

From 8234b4d656c9afce2c3211bddfbbd8ea9d6a3318 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:11:29 -0700
Subject: [PATCH 1359/3235] Wire up 'create account' to the SSO button when SSO
 is used

For https://github.com/vector-im/riot-web/issues/12362
---
 src/components/structures/auth/Login.js | 31 ++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 24e4726416..0e3792baf5 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -120,8 +120,8 @@ export default createReactClass({
             'm.login.password': this._renderPasswordStep,
 
             // 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")),
+            'm.login.cas': () => this._renderSsoStep(this._getSsoUrl('m.login.cas')),
+            'm.login.sso': () => this._renderSsoStep(this._getSsoUrl('m.login.sso')),
         };
 
         this._initLoginLogic();
@@ -150,6 +150,18 @@ export default createReactClass({
         return this.state.busy || this.props.busy;
     },
 
+    _isSsoStep: function() {
+        return this._getCurrentFlowStep() === 'm.login.sso' || this._getCurrentFlowStep() === 'm.login.cas';
+    },
+
+    _getSsoUrl: function(kind) {
+        if (kind === 'm.login.cas') {
+            return this._loginLogic.getSsoLoginUrl("cas")
+        } else {
+            return this._loginLogic.getSsoLoginUrl("sso");
+        }
+    },
+
     onPasswordLogin: async function(username, phoneCountry, phoneNumber, password) {
         if (!this.state.serverIsAlive) {
             this.setState({busy: true});
@@ -344,6 +356,19 @@ export default createReactClass({
         this.props.onRegisterClick();
     },
 
+    onTryRegisterClick: function(ev) {
+        if (this._isSsoStep()) {
+            // If we're showing SSO it means that registration is also probably disabled,
+            // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
+            ev.preventDefault();
+            ev.stopPropagation();
+            window.location = this._getSsoUrl(this._getCurrentFlowStep());
+        } else {
+            // Don't intercept - just go through to the register page
+            this.onRegisterClick(ev);
+        }
+    },
+
     async onServerDetailsNextPhaseClick() {
         this.setState({
             phase: PHASE_LOGIN,
@@ -654,7 +679,7 @@ export default createReactClass({
                     { serverDeadSection }
                     { this.renderServerComponent() }
                     { this.renderLoginComponentForStep() }
-                    <a className="mx_AuthBody_changeFlow" onClick={this.onRegisterClick} href="#">
+                    <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
                         { _t('Create account') }
                     </a>
                 </AuthBody>

From 04c54dc5a0444266707a1883ca5722734337be84 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:19:36 -0700
Subject: [PATCH 1360/3235] Redirect registration requests to Login when the
 server supports SSO

For https://github.com/vector-im/riot-web/issues/12362
---
 .../structures/auth/Registration.js           | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 8593a4b1e2..7c6a3ea56f 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -31,6 +31,8 @@ import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
+import Login from "../../../Login";
+import dis from "../../../dispatcher";
 
 // Phases
 // Show controls to configure server details
@@ -232,6 +234,13 @@ export default createReactClass({
             serverRequiresIdServer,
             busy: false,
         });
+        const showGenericError = (e) => {
+            this.setState({
+                errorText: _t("Unable to query for supported registration methods."),
+                // add empty flows array to get rid of spinner
+                flows: [],
+            });
+        };
         try {
             await this._makeRegisterRequest({});
             // This should never succeed since we specified an empty
@@ -243,18 +252,32 @@ export default createReactClass({
                     flows: e.data.flows,
                 });
             } else if (e.httpStatus === 403 && e.errcode === "M_UNKNOWN") {
-                this.setState({
-                    errorText: _t("Registration has been disabled on this homeserver."),
-                    // add empty flows array to get rid of spinner
-                    flows: [],
-                });
+                // At this point registration is pretty much disabled, but before we do that let's
+                // quickly check to see if the server supports SSO instead. If it does, we'll send
+                // the user off to the login page to figure their account out.
+                try {
+                    const loginLogic = new Login(hsUrl, isUrl, null, {
+                        defaultDeviceDisplayName: "riot login check", // We shouldn't ever be used
+                    });
+                    const flows = await loginLogic.getFlows();
+                    const hasSsoFlow = flows.find(f => f.type === 'm.login.sso' || f.type === 'm.login.cas');
+                    if (hasSsoFlow) {
+                        // Redirect to login page - server probably expects SSO only
+                        dis.dispatch({action: 'start_login'});
+                    } else {
+                        this.setState({
+                            errorText: _t("Registration has been disabled on this homeserver."),
+                            // add empty flows array to get rid of spinner
+                            flows: [],
+                        });
+                    }
+                } catch (e) {
+                    console.error("Failed to get login flows to check for SSO support", e);
+                    showGenericError(e);
+                }
             } else {
                 console.log("Unable to query for supported registration methods.", e);
-                this.setState({
-                    errorText: _t("Unable to query for supported registration methods."),
-                    // add empty flows array to get rid of spinner
-                    flows: [],
-                });
+                showGenericError(e);
             }
         }
     },

From a12786c1711d2e61671b2b5b1769fd5a35530307 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:23:12 -0700
Subject: [PATCH 1361/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 79b045dd34..67a43ae14f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2004,8 +2004,8 @@
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",
     "Upload an avatar:": "Upload an avatar:",
-    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
+    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
     "Continue with previous account": "Continue with previous account",

From bcfe1fcac521378ecfaabd1273259eaca83f5f3b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:23:53 -0700
Subject: [PATCH 1362/3235] Wire up 'create account' to the SSO button when SSO
 is used

For https://github.com/vector-im/riot-web/issues/12362
---
 src/components/structures/auth/Login.js | 27 ++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index b918334d79..873c9e0c35 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -151,6 +151,18 @@ export default createReactClass({
         return this.state.busy || this.props.busy;
     },
 
+    _isSsoStep: function() {
+        return this._getCurrentFlowStep() === 'm.login.sso' || this._getCurrentFlowStep() === 'm.login.cas';
+    },
+
+    _getSsoUrl: function(kind) {
+        if (kind === 'm.login.cas') {
+            return this._loginLogic.getSsoLoginUrl("cas")
+        } else {
+            return this._loginLogic.getSsoLoginUrl("sso");
+        }
+    },
+
     onPasswordLogin: async function(username, phoneCountry, phoneNumber, password) {
         if (!this.state.serverIsAlive) {
             this.setState({busy: true});
@@ -339,6 +351,19 @@ export default createReactClass({
         this.props.onRegisterClick();
     },
 
+    onTryRegisterClick: function(ev) {
+        if (this._isSsoStep()) {
+            // If we're showing SSO it means that registration is also probably disabled,
+            // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
+            ev.preventDefault();
+            ev.stopPropagation();
+            window.location = this._getSsoUrl(this._getCurrentFlowStep());
+        } else {
+            // Don't intercept - just go through to the register page
+            this.onRegisterClick(ev);
+        }
+    },
+
     async onServerDetailsNextPhaseClick() {
         this.setState({
             phase: PHASE_LOGIN,
@@ -652,7 +677,7 @@ export default createReactClass({
                     { serverDeadSection }
                     { this.renderServerComponent() }
                     { this.renderLoginComponentForStep() }
-                    <a className="mx_AuthBody_changeFlow" onClick={this.onRegisterClick} href="#">
+                    <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
                         { _t('Create account') }
                     </a>
                 </AuthBody>

From e265c92b6e87a434a0633e7ca62624fd0faa5fb2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:19:36 -0700
Subject: [PATCH 1363/3235] Redirect registration requests to Login when the
 server supports SSO

For https://github.com/vector-im/riot-web/issues/12362
---
 .../structures/auth/Registration.js           | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 8593a4b1e2..7c6a3ea56f 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -31,6 +31,8 @@ import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
+import Login from "../../../Login";
+import dis from "../../../dispatcher";
 
 // Phases
 // Show controls to configure server details
@@ -232,6 +234,13 @@ export default createReactClass({
             serverRequiresIdServer,
             busy: false,
         });
+        const showGenericError = (e) => {
+            this.setState({
+                errorText: _t("Unable to query for supported registration methods."),
+                // add empty flows array to get rid of spinner
+                flows: [],
+            });
+        };
         try {
             await this._makeRegisterRequest({});
             // This should never succeed since we specified an empty
@@ -243,18 +252,32 @@ export default createReactClass({
                     flows: e.data.flows,
                 });
             } else if (e.httpStatus === 403 && e.errcode === "M_UNKNOWN") {
-                this.setState({
-                    errorText: _t("Registration has been disabled on this homeserver."),
-                    // add empty flows array to get rid of spinner
-                    flows: [],
-                });
+                // At this point registration is pretty much disabled, but before we do that let's
+                // quickly check to see if the server supports SSO instead. If it does, we'll send
+                // the user off to the login page to figure their account out.
+                try {
+                    const loginLogic = new Login(hsUrl, isUrl, null, {
+                        defaultDeviceDisplayName: "riot login check", // We shouldn't ever be used
+                    });
+                    const flows = await loginLogic.getFlows();
+                    const hasSsoFlow = flows.find(f => f.type === 'm.login.sso' || f.type === 'm.login.cas');
+                    if (hasSsoFlow) {
+                        // Redirect to login page - server probably expects SSO only
+                        dis.dispatch({action: 'start_login'});
+                    } else {
+                        this.setState({
+                            errorText: _t("Registration has been disabled on this homeserver."),
+                            // add empty flows array to get rid of spinner
+                            flows: [],
+                        });
+                    }
+                } catch (e) {
+                    console.error("Failed to get login flows to check for SSO support", e);
+                    showGenericError(e);
+                }
             } else {
                 console.log("Unable to query for supported registration methods.", e);
-                this.setState({
-                    errorText: _t("Unable to query for supported registration methods."),
-                    // add empty flows array to get rid of spinner
-                    flows: [],
-                });
+                showGenericError(e);
             }
         }
     },

From e83a4ddbe5a0b23a5f0dbd10ff8ae72d2d18059c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:23:12 -0700
Subject: [PATCH 1364/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4ec9c1e281..2b1d44bbcd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2007,8 +2007,8 @@
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",
     "Upload an avatar:": "Upload an avatar:",
-    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
+    "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
     "Continue with previous account": "Continue with previous account",

From 3cff6d72394efe8c942841c49c0473459480f6bb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:26:20 -0700
Subject: [PATCH 1365/3235] Appease the linter

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

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 873c9e0c35..cf80c99535 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -157,7 +157,7 @@ export default createReactClass({
 
     _getSsoUrl: function(kind) {
         if (kind === 'm.login.cas') {
-            return this._loginLogic.getSsoLoginUrl("cas")
+            return this._loginLogic.getSsoLoginUrl("cas");
         } else {
             return this._loginLogic.getSsoLoginUrl("sso");
         }

From 93c696f15e61ff75bceafaaf9cd841db45020961 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Mar 2020 23:26:20 -0700
Subject: [PATCH 1366/3235] Appease the linter

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

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 0e3792baf5..e04d311b62 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -156,7 +156,7 @@ export default createReactClass({
 
     _getSsoUrl: function(kind) {
         if (kind === 'm.login.cas') {
-            return this._loginLogic.getSsoLoginUrl("cas")
+            return this._loginLogic.getSsoLoginUrl("cas");
         } else {
             return this._loginLogic.getSsoLoginUrl("sso");
         }

From 91aa8d4a3afa1bb538b00891da8b4a2c9f35bb47 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:42:22 +0100
Subject: [PATCH 1367/3235] use relative scrolling to compensate when changing
 height

---
 src/components/structures/ScrollPanel.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 5121dd3f9d..72d5330451 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -705,17 +705,15 @@ export default createReactClass({
             // the currently filled piece of the timeline
             if (trackedNode) {
                 const oldTop = trackedNode.offsetTop;
-                // changing the height might change the scrollTop
-                // if the new height is smaller than the scrollTop.
-                // We calculate the diff that needs to be applied
-                // ourselves, so be sure to measure the
-                // scrollTop before changing the height.
-                const preexistingScrollTop = sn.scrollTop;
                 itemlist.style.height = `${newHeight}px`;
                 const newTop = trackedNode.offsetTop;
                 const topDiff = newTop - oldTop;
-                sn.scrollTop = preexistingScrollTop + topDiff;
-                debuglog("updateHeight to", {newHeight, topDiff, preexistingScrollTop});
+                // important to scroll by a relative amount as
+                // reading scrollTop and then setting it might
+                // yield out of date values and cause a jump
+                // when setting it
+                sn.scrollBy(0, topDiff);
+                debuglog("updateHeight to", {newHeight, topDiff});
             }
         }
     },

From 462c3411b296cbde217247ac5914c76528e24163 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:42:44 +0100
Subject: [PATCH 1368/3235] add comment how offset from bottom is calculated

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

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 72d5330451..548dd70748 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -765,6 +765,7 @@ export default createReactClass({
     },
 
     _topFromBottom(node) {
+        // current capped height - distance from top = distance from bottom of container to top of tracked element
         return this._itemlist.current.clientHeight - node.offsetTop;
     },
 

From 070b43070205914430267e87aeab91aaf702d6db Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 3 Mar 2020 15:44:59 +0100
Subject: [PATCH 1369/3235] also use relative scrolling when eh ... doing
 relative scrolling

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

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 548dd70748..b81b3ebede 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -523,7 +523,7 @@ export default createReactClass({
     scrollRelative: function(mult) {
         const scrollNode = this._getScrollNode();
         const delta = mult * scrollNode.clientHeight * 0.5;
-        scrollNode.scrollTop = scrollNode.scrollTop + delta;
+        scrollNode.scrollBy(0, delta);
         this._saveScrollState();
     },
 

From fa79bc93cee5fea5a0cbe2a58b3c64c0c762d1fd Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 2 Mar 2020 17:48:38 +0000
Subject: [PATCH 1370/3235] Use bash for release script

This fixes this repo to use bash for this script, matching the other repos.
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index 3c28084bb7..1b99e870ac 100755
--- a/release.sh
+++ b/release.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Script to perform a release of matrix-react-sdk.
 #

From cdcf042f6b5ebb5c28614c0d8cf102b1fe0bf5bf Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Mar 2020 11:30:35 +0000
Subject: [PATCH 1371/3235] Prepare changelog for v2.2.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d1895691..8d436ca690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [2.2.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.1) (2020-03-04)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0...v2.2.1)
+
+ * Adjust scroll offset with relative scrolling
+   [\#4171](https://github.com/matrix-org/matrix-react-sdk/pull/4171)
+ * Disable registration flows on SSO servers
+   [\#4169](https://github.com/matrix-org/matrix-react-sdk/pull/4169)
+
 Changes in [2.2.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.0) (2020-03-02)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0-rc.1...v2.2.0)

From ce879b95cfe27dc9282fc202ffb5eab091550d22 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Mar 2020 11:30:35 +0000
Subject: [PATCH 1372/3235] v2.2.1

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

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

From 141989a51f94300b7a0702be18827e1aa4b7b3c5 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Tue, 3 Mar 2020 23:18:29 +0000
Subject: [PATCH 1373/3235] Translated using Weblate (Dutch)

Currently translated at 100.0% (2140 of 2140 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index adb13f5e0f..3f85b7478f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1897,9 +1897,268 @@
     "Your homeserver does not support cross-signing.": "Uw thuisserver biedt geen ondersteuning voor kruiselings ondertekenen.",
     "Homeserver feature support:": "Functies ondersteund door thuisserver:",
     "exists": "bestaat",
-    "Sign In or Create Account": "Aanmelden of Account Aanmaken",
-    "Use your account or create a new one to continue.": "Gebruik uw account of maak een nieuwe om door te gaan.",
+    "Sign In or Create Account": "Meld u aan of maak een account aan",
+    "Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak er een nieuwe aan om verder te gaan.",
     "Create Account": "Account aanmaken",
-    "Displays information about a user": "Geef informatie weer over deze gebruiker",
-    "Order rooms by name": "Sorteer gesprekken op naam"
+    "Displays information about a user": "Geeft informatie weer over een gebruiker",
+    "Order rooms by name": "Gesprekken sorteren op naam",
+    "Show rooms with unread notifications first": "Gesprekken met ongelezen meldingen eerst tonen",
+    "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de gesprekken die u recent heeft bekeken bovenaan de gesprekslijst weergeven",
+    "Cancelling…": "Bezig met annuleren…",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot beschikt niet over alle onderdelen die nodig zijn om versleutelde berichten veilig in het lokale cachegeheugen te bewaren. Als u deze functie wilt uittesten, kunt u een aangepaste versie van Riot Desktop compileren, waarbij <nativeLink>de zoekonderdelen toegevoegd zijn</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot kan versleutelde berichten niet veilig bewaren in het lokale cachegeheugen wanneer het uitgevoerd wordt in een webbrowser. Gebruik <riotLink>Riot Desktop</riotLink> om versleutelde berichten in de zoekresultaten te laten verschijnen.",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Er is een back-upsleutel opgeslagen in de geheime opslag, maar deze functie is niet ingeschakeld voor deze sessie. Schakel kruiselings ondertekenen in in de experimentele instellingen om de sleutelback-upstatus te wijzigen.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele functies. <a>Klik hier voor meer informatie</a>.",
+    "Cross-signing": "Kruiselings ondertekenen",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Uw sleuteldeelverzoek is verstuurd - controleer de sleuteldeelverzoeken op uw andere sessies.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Sleuteldeelverzoeken worden automatisch naar andere sessies verstuurd. Als u op uw andere sessies het sleuteldeelverzoek geweigerd of genegeerd hebt, kunt u hier klikken op de sleutels voor deze sessie opnieuw aan te vragen.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Als uw andere sessies geen sleutel voor dit bericht hebben, zult u het niet kunnen ontsleutelen.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Versleutelingssleutels opnieuw aanvragen</requestLink> van uw andere sessies.",
+    "This message cannot be decrypted": "Dit bericht kan niet ontsleuteld worden",
+    "Encrypted by an unverified session": "Versleuteld door een niet-geverifieerde sessie",
+    "Unencrypted": "Onversleuteld",
+    "Encrypted by a deleted session": "Versleuteld door een verwijderde sessie",
+    "Invite only": "Enkel op uitnodiging",
+    "Close preview": "Voorbeeld sluiten",
+    "Failed to deactivate user": "Deactiveren van gebruiker is mislukt",
+    "No sessions with registered encryption keys": "Geen sessies met geregistreerde versleutelingssleutels",
+    "Send a reply…": "Verstuur een antwoord…",
+    "Send a message…": "Verstuur een bericht…",
+    "Room %(name)s": "Gesprek %(name)s",
+    "<userName/> wants to chat": "<userName/> wil een gesprek met u beginnen",
+    "Start chatting": "Gesprek beginnen",
+    "Reject & Ignore user": "Weigeren en gebruiker negeren",
+    "%(count)s unread messages including mentions.|one": "1 ongelezen vermelding.",
+    "%(count)s unread messages.|one": "1 ongelezen bericht.",
+    "Unread messages.": "Ongelezen berichten.",
+    "Unknown Command": "Onbekende opdracht",
+    "Unrecognised command: %(commandText)s": "Onbekende opdracht: %(commandText)s",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tip: begin uw bericht met <code>//</code> om het te laten voorafgaan door een schuine streep.",
+    "Send as message": "Versturen als bericht",
+    "Failed to connect to integration manager": "Verbinding met integratiebeheerder is mislukt",
+    "Waiting for %(displayName)s to accept…": "Wachten tot %(displayName)s aanvaardt…",
+    "Accepting…": "Aanvaarden…",
+    "Start Verification": "Verificatie beginnen",
+    "Messages in this room are end-to-end encrypted.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Uw berichten zijn beveiligd, en enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
+    "Verify User": "Gebruiker verifiëren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze gebruiker verifiëren door een eenmalige code op uw toestellen te controleren.",
+    "Your messages are not secure": "Uw berichten zijn niet veilig",
+    "One of the following may be compromised:": "Eén van volgende onderdelen kan gecompromitteerd zijn:",
+    "Your homeserver": "Uw thuisserver",
+    "The homeserver the user you’re verifying is connected to": "De thuisserver waarmee de gebruiker die u tracht te verifiëren verbonden is",
+    "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere gebruiker",
+    "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
+    "Not Trusted": "Niet vertrouwd",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s heeft zich aangemeld bij een nieuwe sessie zonder deze te verifiëren:",
+    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker om zijn/haar sessie te verifiëren, of verifieer deze hieronder handmatig.",
+    "Done": "Klaar",
+    "Manually Verify": "Handmatig verifiëren",
+    "Trusted": "Vertrouwd",
+    "Not trusted": "Niet vertrouwd",
+    "%(count)s verified sessions|other": "%(count)s geverifieerde sessies",
+    "%(count)s verified sessions|one": "1 geverifieerde sessie",
+    "Hide verified sessions": "Geverifieerde sessies verbergen",
+    "%(count)s sessions|other": "%(count)s sessies",
+    "%(count)s sessions|one": "%(count)s sessie",
+    "Hide sessions": "Sessies verbergen",
+    "Direct message": "Tweegesprek",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
+    "This client does not support end-to-end encryption.": "Deze cliënt biedt geen ondersteuning voor eind-tot-eind-versleuteling.",
+    "Messages in this room are not end-to-end encrypted.": "De berichten in dit gesprek worden niet eind-tot-eind-versleuteld.",
+    "Security": "Beveiliging",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "De sessie die u probeert te verifiëren biedt geen ondersteuning voor de door Riot ondersteunde verificatiemethodes, nl. het scannen van QR-codes of het vergelijken van emoji. Probeer met een andere cliënt te verifiëren.",
+    "Verify by scanning": "Verifiëren met scan",
+    "Ask %(displayName)s to scan your code:": "Vraag %(displayName)s om uw code te scannen:",
+    "Verify by emoji": "Verifiëren met emoji",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Als u bovenstaande code niet kunt scannen, verifieer dan door unieke emoji te vergelijken.",
+    "Verify by comparing unique emoji.": "Verifieer door unieke emoji te vergelijken.",
+    "You've successfully verified %(displayName)s!": "U heeft %(displayName)s geverifieerd!",
+    "Got it": "Ik snap het",
+    "Verification timed out. Start verification again from their profile.": "De verificatie is verlopen. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s heeft de verificatie geannuleerd. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
+    "You cancelled verification. Start verification again from their profile.": "U heeft de verificatie geannuleerd. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
+    "Encryption enabled": "Versleuteling ingeschakeld",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld. Kom hier meer over te weten en verifieer de gebruiker via zijn/haar gebruikersprofiel.",
+    "Encryption not enabled": "Versleuteling niet ingeschakeld",
+    "The encryption used by this room isn't supported.": "De versleuteling gebruikt in dit gesprek wordt niet ondersteund.",
+    "React": "Reageren",
+    "Message Actions": "Berichtacties",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "U heeft deze gebruiker genegeerd, dus zijn/haar berichten worden verborgen. <a>Toch tonen?</a>",
+    "You verified %(name)s": "U heeft %(name)s geverifieerd",
+    "You cancelled verifying %(name)s": "U heeft de verificatie van %(name)s geannuleerd",
+    "%(name)s cancelled verifying": "%(name)s heeft de verificatie geannuleerd",
+    "You accepted": "U heeft aanvaard",
+    "%(name)s accepted": "%(name)s heeft aanvaard",
+    "You declined": "U heeft geweigerd",
+    "You cancelled": "U heeft geannuleerd",
+    "%(name)s declined": "%(name)s heeft geweigerd",
+    "%(name)s cancelled": "%(name)s heeft geannuleerd",
+    "Accepting …": "Aanvaarden…",
+    "Declining …": "Weigeren…",
+    "%(name)s wants to verify": "%(name)s wil verifiëren",
+    "You sent a verification request": "U heeft een verificatieverzoek verstuurd",
+    "Reactions": "Reacties",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> heeft gereageerd met %(content)s</reactedWith>",
+    "Frequently Used": "Vaak gebruikt",
+    "Smileys & People": "Smileys en personen",
+    "Animals & Nature": "Dieren en natuur",
+    "Food & Drink": "Eten en drinken",
+    "Activities": "Activiteiten",
+    "Travel & Places": "Reizen en plaatsen",
+    "Objects": "Objecten",
+    "Symbols": "Symbolen",
+    "Flags": "Vlaggen",
+    "Quick Reactions": "Snelle reacties",
+    "Cancel search": "Zoeken annuleren",
+    "Any of the following data may be shared:": "De volgende gegevens worden mogelijk gedeeld:",
+    "Your display name": "Uw weergavenaam",
+    "Your avatar URL": "De URL van uw profielfoto",
+    "Your user ID": "Uw gebruikers-ID",
+    "Your theme": "Uw thema",
+    "Riot URL": "Riot-URL",
+    "Room ID": "Gespreks-ID",
+    "Widget ID": "Widget-ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Deze widget gebruiken deelt mogelijk gegevens <helpIcon /> met %(widgetDomain)s en uw integratiebeheerder.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Deze widget gebruiken deelt mogelijk gegevens <helpIcon /> met %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Widgets gebruiken geen berichtversleuteling.",
+    "Widget added by": "Widget toegevoegd door",
+    "This widget may use cookies.": "Deze widget kan cookies gebruiken.",
+    "More options": "Meer opties",
+    "Language Dropdown": "Taalselectie",
+    "Destroy cross-signing keys?": "Sleutels voor kruiselings ondertekenen verwijderen?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Het verwijderen van sleutels voor kruiselings ondertekenen kan niet ongedaan gemaakt worden. Iedereen waarmee u geverifieerd heeft zal beveiligingswaarschuwingen te zien krijgen. U wilt dit hoogstwaarschijnlijk niet doen, tenzij u alle apparaten heeft verloren waarmee u kruiselings kon ondertekenen.",
+    "Clear cross-signing keys": "Sleutels voor kruiselings ondertekenen wissen",
+    "Clear all data in this session?": "Alle gegevens in deze sessie verwijderen?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Het verwijderen van alle gegevens in deze sessie kan niet ongedaan gemaakt worden. Versleutelde berichten zullen verloren gaan, tenzij u een back-up van hun sleutels heeft.",
+    "Verify session": "Sessie verifiëren",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Controleer of de sleutel in de gebruikersinstellingen op het apparaat overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
+    "To verify that this session 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 session matches the key below:": "Neem contact op met de eigenaar op een andere manier (bv. onder vier ogen of met een telefoongesprek) en vraag of de sleutel in zijn/haar gebruikersinstellingen overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
+    "Session name": "Sessienaam",
+    "Session key": "Sessiesleutel",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Als hij overeenkomt, klik dan op de knop ‘Verifiëren’. Zo niet is het mogelijk dat iemand deze sessie onderschept, en wilt u waarschijnlijk op de knop ‘Blokkeren’ klikken.",
+    "Verification Requests": "Verificatieverzoeken",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze gebruiker verifiëren zal de sessie als vertrouwd markeren voor u en voor hem/haar.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra gemoedsrust aan uzelf en andere gebruikers bij het gebruik van eind-tot-eind-versleutelde berichten.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en gebruikers die met u geverifieerd hebben zullen het vertrouwen.",
+    "Integrations are disabled": "Integraties zijn uitgeschakeld",
+    "Enable 'Manage Integrations' in Settings to do this.": "Schakel ‘Beheer integraties’ in in de instellingen om dit te doen.",
+    "Integrations not allowed": "Integraties niet toegestaan",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Uw Riot laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Het uitnodigen van volgende gebruikers voor gesprek is mislukt: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Uw tweegesprek kon niet aangemaakt worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
+    "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de gebruikers.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze gebruikers konden niet uitgenodigd worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
+    "Failed to find the following users": "Kon volgende gebruikers niet vinden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende gebruikers bestaan mogelijk niet of zijn ongeldig, en kunnen dan ook niet uitgenodigd worden: %(csvNames)s",
+    "Recent Conversations": "Recente gesprekken",
+    "Suggestions": "Suggesties",
+    "Recently Direct Messaged": "Recente tweegesprekken",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Als u iemand niet kunt vinden, vraag dan zijn/haar gebruikersnaam, deel uw eigen gebruikersnaam (%(userId)s) of <a>profielkoppeling</a>.",
+    "Go": "Start",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Als u iemand niet kunt vinden, vraag dan zijn/haar gebruikersnaam (bv. @user:server.com) of <a>deel dit gesprek</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "U heeft een nieuwe sessie ‘%(displayName)s’ toegevoegd, die om versleutelingssleutels vraagt.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Uw ongeverifieerde sessie ‘%(displayName)s’ vraagt om versleutelingssleutels.",
+    "Loading session info...": "Sessie-info wordt geladen…",
+    "Your account is not secure": "Uw account is niet veilig",
+    "Your password": "Uw wachtwoord",
+    "This session, or the other session": "Deze sessie, of de andere sessie",
+    "The internet connection either session is using": "De internetverbinding gebruikt door een van de sessies",
+    "We recommend you change your password and recovery key in Settings immediately": "We raden u aan onmiddellijk uw wachtwoord en herstelsleutel te wijzigen in de instellingen",
+    "New session": "Nieuwe sessie",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Gebruik deze sessie om uw nieuwe sessie te verifiëren, waardoor deze laatste toegang verkrijgt tot versleutelde berichten:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account mogelijk gecompromitteerd.",
+    "This wasn't me": "Dat was ik niet",
+    "Automatically invite users": "Gebruikers automatisch uitnodigen",
+    "Upgrade private room": "Privégesprek bijwerken",
+    "Upgrade public room": "Openbaar gesprek bijwerken",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door fouten, ontbrekende functies of problemen met de beveiliging.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw Riot ondervindt, <a>dien dan een foutmelding in</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U werkt dit gesprek bij van <oldVersion /> naar <newVersion />.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Dit biedt u de mogelijkheid om terug te keren naar uw account nadat u zich heeft afgemeld, en om u aan te melden bij andere sessies.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "U blokkeert momenteel niet-geverifieerde sessies; om berichten te sturen naar deze sessies moet u ze verifiëren.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We raden u aan om het verificatieproces voor elke sessie te doorlopen om te bevestigen dat ze aan hun rechtmatige eigenaar toebehoren, maar u kunt het bericht ook opnieuw versturen zonder verificatie indien u dit wenst.",
+    "Room contains unknown sessions": "Gesprek bevat onbekende sessies",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "‘%(RoomName)s’ bevat sessies die u nog niet eerder gezien heeft.",
+    "Unknown sessions": "Onbekende sessies",
+    "Verification Request": "Verificatieverzoek",
+    "Enter secret storage passphrase": "Voer het wachtwoord voor de geheime opslag in",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Kan geen toegang verkrijgen tot geheime opslag. Controleer of u het juiste wachtwoord heeft ingevoerd.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Let op</b>: open de geheime opslag enkel op een computer die u vertrouwt.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Verkrijg de toegang tot uw beveiligde berichtgeschiedenis en uw identiteit voor kruiselings ondertekenen voor het verifiëren van andere sessies door uw wachtwoord in te voeren.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Als u uw wachtwoord vergeten bent, kunt u <button1>uw herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>.",
+    "Enter secret storage recovery key": "Voer de herstelsleutel voor de geheime opslag in",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Kan geen toegang verkrijgen tot geheime opslag. Controleer of u de juiste herstelsleutel heeft ingevoerd.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Verkrijg de toegang tot uw beveiligde berichtgeschiedenis en uw identiteit voor kruiselings ondertekenen voor het verifiëren van andere sessies door uw herstelsleutel in te voeren.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Als u uw herstelsleutel vergeten bent, kunt u <button>nieuwe herstelopties instellen</button>.",
+    "Recovery key mismatch": "Herstelsleutel komt niet overeen",
+    "Incorrect recovery passphrase": "Onjuist herstelwachtwoord",
+    "Backup restored": "Back-up teruggezet",
+    "Enter recovery passphrase": "Voer het herstelwachtwoord in",
+    "Enter recovery key": "Voer de herstelsleutel in",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Als u uw herstelsleutel vergeten bent, kunt u <button>nieuwe herstelopties instellen</button>",
+    "Notification settings": "Meldingsinstellingen",
+    "Reload": "Herladen",
+    "Take picture": "Neem een foto",
+    "Remove for everyone": "Verwijderen voor iedereen",
+    "Remove for me": "Verwijderen voor mezelf",
+    "User Status": "Gebruikersstatus",
+    "Country Dropdown": "Landselectie",
+    "Confirm your identity by entering your account password below.": "Bevestig uw identiteit door hieronder uw accountwachtwoord in te voeren.",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Er is geen identiteitsserver geconfigureerd, dus u kunt geen e-mailadres toevoegen om in de toekomst een nieuw wachtwoord in te stellen.",
+    "Message not sent due to unknown sessions being present": "Bericht niet verstuurd, er zijn onbekende sessies aanwezig",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Sessies tonen</showSessionsText>, <sendAnywayText>toch versturen</sendAnywayText> of <cancelText>annuleren</cancelText>.",
+    "Jump to first unread room.": "Ga naar het eerste ongelezen gesprek.",
+    "Jump to first invite.": "Ga naar de eerste uitnodiging.",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Complete security": "Vervolledig de beveiliging",
+    "Verify this session to grant it access to encrypted messages.": "Verifieer deze sessie om toegang te verkrijgen tot uw versleutelde berichten.",
+    "Session verified": "Sessie geverifieerd",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze heeft nu toegang tot uw versleutelde berichten, en de sessie zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
+    "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.",
+    "Go Back": "Terugkeren",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel sleutelback-up in of schrijf uw gesprekssleutels van een andere sessie weg vooraleer u een nieuw wachtwoord instelt.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "U bent afgemeld bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Verkrijg opnieuw de toegang tot uw account en herstel de versleutelingssleutels die in deze sessie opgeslagen zijn. Hierzonder zult u niet al uw beveiligde berichten in al uw sessies kunnen lezen.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (versleutelingssleutels inbegrepen) worden nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.",
+    "Command Autocomplete": "Opdrachten automatisch aanvullen",
+    "DuckDuckGo Results": "DuckDuckGo-resultaten",
+    "Sender session information": "Sessie-informatie van afzender",
+    "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het bijwerken te bevestigen:",
+    "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling bij te werken",
+    "Restore": "Herstellen",
+    "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het bijwerken te bevestigen.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Werk deze sessie bij om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Stel versleuteling in voor deze sessie om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Beveilig uw versleutelingssleutels met een wachtwoord. Voor een optimale beveiliging moet dit verschillen van uw accountwachtwoord:",
+    "Enter a passphrase": "Voer een wachtwoord in",
+    "Back up my encryption keys, securing them with the same passphrase": "Maak een back-up van mijn versleutelingssleutels, en beveilig ze met hetzelfde wachtwoord",
+    "Set up with a recovery key": "Instellen met een herstelsleutel",
+    "Enter your passphrase a second time to confirm it.": "Voer uw wachtwoord nogmaals in ter bevestiging.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewaar een kopie op een veilige plaats, zoals in een wachtwoordbeheerder of een kluis.",
+    "Your recovery key": "Uw herstelsleutel",
+    "Copy": "Kopiëren",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Uw herstelsleutel is <b>gekopieerd naar uw klembord</b>, plak hem en:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
+    "You can now verify your other devices, and other users to keep your chats safe.": "U kunt nu uw andere apparaten evenals andere gebruikers verifiëren om uw gesprekken te beveiligen.",
+    "Upgrade your encryption": "Werk uw versleuteling bij",
+    "Make a copy of your recovery key": "Maak een kopie van uw herstelsleutel",
+    "You're done!": "Klaar!",
+    "Unable to set up secret storage": "Kan geheime opslag niet instellen",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Zonder veilig berichtherstel in te stellen zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen als u zich afmeldt of een andere sessie gebruikt.",
+    "Create key backup": "Sleutelback-up aanmaken",
+    "This session is encrypting history using the new recovery method.": "Deze sessie versleutelt uw geschiedenis aan de hand van de nieuwe herstelmethode.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Deze sessie heeft gedetecteerd dat uw herstelwachtwoord en -sleutel voor beveiligde berichten verwijderd zijn.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Als u dit per ongeluk heeft gedaan, kunt u beveiligde berichten op deze sessie instellen, waarmee de berichtgeschiedenis van deze sessie opnieuw zal versleuteld worden aan de hand van een nieuwe herstelmethode.",
+    "Disable": "Uitschakelen",
+    "Not currently downloading messages for any room.": "Er worden momenteel geen berichten gedownload.",
+    "Downloading mesages for %(currentRoom)s.": "Er worden berichten gedownload voor %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot bewaart versleutelde berichten veilig in het lokale cachegeheugen om ze in uw zoekresultaten te laten verschijnen:",
+    "Space used:": "Gebruikte ruimte:",
+    "Indexed messages:": "Geïndexeerde berichten:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s van %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Wachttijd voor downloaden van berichten (ms)"
 }

From b7d9f24625621f8e232371ae2b1990f59aa6c586 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Mar 2020 11:53:01 +0000
Subject: [PATCH 1374/3235] Log packages when checking version

---
 release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.sh b/release.sh
index 1b99e870ac..23b8822041 100755
--- a/release.sh
+++ b/release.sh
@@ -11,6 +11,7 @@ cd `dirname $0`
 
 for i in matrix-js-sdk
 do
+    echo "Checking version of $i..."
     depver=`cat package.json | jq -r .dependencies[\"$i\"]`
     latestver=`yarn info -s $i dist-tags.next`
     if [ "$depver" != "$latestver" ]

From 845656064e802054b3857c2a240aaaf88f94f740 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Mar 2020 11:58:00 +0000
Subject: [PATCH 1375/3235] Reset matrix-js-sdk back to develop branch

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 87aeccd140..20580f26f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5655,7 +5655,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/da96765020b632deb5b433077827a4f4a64e16e9"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 7ad8eeb906ee53184d5c9b1a96642a09d47a2ba3 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 4 Mar 2020 14:35:01 +0000
Subject: [PATCH 1376/3235] Fix composer touch bar flickering on keypress in
 Chrome

This changes our selection state handling to leave things alone if the browser's
state already matches what we want. This avoids strange side effects like the
touch bar flickering on each key press in Chrome.

Fixes https://github.com/vector-im/riot-web/issues/9299
---
 src/editor/caret.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/editor/caret.js b/src/editor/caret.js
index ed4f1b2a2e..8c0090a6f1 100644
--- a/src/editor/caret.js
+++ b/src/editor/caret.js
@@ -38,12 +38,27 @@ function setDocumentRangeSelection(editor, model, range) {
 }
 
 export function setCaretPosition(editor, model, caretPosition) {
-    const sel = document.getSelection();
-    sel.removeAllRanges();
     const range = document.createRange();
     const {node, offset} = getNodeAndOffsetForPosition(editor, model, caretPosition);
     range.setStart(node, offset);
     range.collapse(true);
+
+    const sel = document.getSelection();
+    if (sel.rangeCount === 1) {
+        const existingRange = sel.getRangeAt(0);
+        if (
+            existingRange.startContainer === range.startContainer &&
+            existingRange.startOffset === range.startOffset &&
+            existingRange.collapsed === range.collapsed
+        ) {
+            // If the selection matches, it's important to leave it alone.
+            // Recreating the selection state in at least Chrome can cause
+            // strange side effects, like touch bar flickering on every key.
+            // See https://github.com/vector-im/riot-web/issues/9299
+            return;
+        }
+    }
+    sel.removeAllRanges();
     sel.addRange(range);
 }
 

From c8cd9b4437fdf5fb16c7c32403d46693a10e6657 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Wed, 4 Mar 2020 14:07:04 +0000
Subject: [PATCH 1377/3235] Translated using Weblate (Dutch)

Currently translated at 100.0% (2140 of 2140 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 3f85b7478f..889a8f572f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1196,7 +1196,7 @@
     "Invite anyway": "Alsnog uitnodigen",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer u logboeken indient, dient u uw probleem te <a>melden op GitHub</a>.",
     "Unable to load commit detail: %(msg)s": "Kan commitdetail niet laden: %(msg)s",
-    "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": "Om uw gespreksgeschiedenis niet te verliezen, moet u vóór het afmelden uw gesprekssleutels wegschrijven. Dat moet vanuit de nieuwere versie van Riot",
+    "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": "Schrijf om uw gespreksgeschiedenis niet te verliezen vóór het afmelden uw gesprekssleutels weg. Dat moet vanuit de nieuwere versie van Riot",
     "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. ": "U heeft eerder een nieuwere versie van Riot op %(host)s gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u zich moeten afmelden en opnieuw aanmelden. ",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",

From 4396d85d1f8bf0f6c4f5ed9a2abfa7865d45a5e7 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 2 Mar 2020 16:28:10 +0000
Subject: [PATCH 1378/3235] Share secrets with another device on request

---
 src/CrossSigningManager.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index f19be03574..8549742c05 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -21,6 +21,7 @@ import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
 import SettingsStore from './settings/SettingsStore';
+import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
 // only meant to act as a cache to avoid prompting the user multiple times
@@ -125,8 +126,37 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
     return [name, key];
 }
 
+const onSecretRequested = async function({
+    user_id: userId,
+    device_id: deviceId,
+    request_id: requestId,
+    name,
+    device_trust: deviceTrust,
+}) {
+    console.log("onSecretRequested", userId, deviceId, requestId, name, deviceTrust);
+    const client = MatrixClientPeg.get();
+    if (userId !== client.getUserId()) {
+        return;
+    }
+    if (!deviceTrust || !deviceTrust.isVerified()) {
+        console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
+        return;
+    }
+    const crossSigning = client._crypto._crossSigningInfo;
+    if (!crossSigning._cacheCallbacks.getCrossSigningKeyCache) return;
+    if (name === "m.key.self_signing") {
+        const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("self_signing");
+        return key && encodeBase64(key);
+    } else if (name === "m.key.user_signing") {
+        const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("user_signing");
+        return key && encodeBase64(key);
+    }
+    console.warn("onSecretRequested didn't recognise the secret named ", name);
+};
+
 export const crossSigningCallbacks = {
     getSecretStorageKey,
+    onSecretRequested,
 };
 
 /**

From 29af8add5d5fbfa607be40e74944b64cc4e46f35 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 4 Mar 2020 16:10:06 +0100
Subject: [PATCH 1379/3235] only show verify button if user has uploaded
 cross-signing keys

---
 src/components/views/right_panel/UserInfo.js | 44 ++++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 44770d9ccc..f5b6548a83 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -136,6 +136,27 @@ function useIsEncrypted(cli, room) {
     return isEncrypted;
 }
 
+function useHasCrossSigningKeys(cli, member, canVerify) {
+    const [waitingForCrossSigningKeys, setWaitingForCrossSigningKeys] = useState(false);
+    const [hasCrossSigningKeys, setHasCrossSigningKeys] = useState(false);
+    useEffect(() => {
+        if (canVerify) {
+            setWaitingForCrossSigningKeys(true);
+            (async () => {
+                try {
+                    await cli.downloadKeys([member.userId]);
+                    const xsi = cli.getStoredCrossSigningForUser(member.userId);
+                    const key = xsi && xsi.getId();
+                    setHasCrossSigningKeys(!!key);
+                } finally {
+                    setWaitingForCrossSigningKeys(false);
+                }
+            })();
+        }
+    }, [canVerify, cli, member]);
+    return {waitingForCrossSigningKeys, hasCrossSigningKeys};
+}
+
 async function verifyDevice(userId, device) {
     const cli = MatrixClientPeg.get();
     const member = cli.getUser(userId);
@@ -1324,20 +1345,27 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
 
     let verifyButton;
     const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli);
-    if (
-        SettingsStore.isFeatureEnabled("feature_cross_signing") &&
-        homeserverSupportsCrossSigning
-    ) {
-        const userTrust = cli.checkUserTrust(member.userId);
-        const userVerified = userTrust.isCrossSigningVerified();
-        const isMe = member.userId === cli.getUserId();
 
-        if (isRoomEncrypted && !userVerified && !isMe) {
+    const userTrust = cli.checkUserTrust(member.userId);
+    const userVerified = userTrust.isCrossSigningVerified();
+    const isMe = member.userId === cli.getUserId();
+    const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+                      homeserverSupportsCrossSigning &&
+                      isRoomEncrypted && !userVerified && !isMe;
+
+    const {hasCrossSigningKeys, waitingForCrossSigningKeys} =
+        useHasCrossSigningKeys(cli, member, canVerify);
+
+    if (canVerify) {
+        if (hasCrossSigningKeys) {
             verifyButton = (
                 <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
                     {_t("Verify")}
                 </AccessibleButton>
             );
+        } else if (waitingForCrossSigningKeys) {
+            const Spinner = sdk.getComponent("elements.Spinner");
+            verifyButton = <Spinner />;
         }
     }
 

From afc7273d1002fb69380299b392bd474cc2460644 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 4 Mar 2020 16:58:04 +0100
Subject: [PATCH 1380/3235] use pendingUpdateCount rather, so we don't show
 multiple spinners

---
 src/components/views/right_panel/UserInfo.js | 63 ++++++++++----------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index f5b6548a83..07b2248644 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useMemo, useState, useEffect, useContext} from 'react';
+import React, {useCallback, useMemo, useState, useEffect, useContext, useRef} from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
@@ -136,25 +136,28 @@ function useIsEncrypted(cli, room) {
     return isEncrypted;
 }
 
-function useHasCrossSigningKeys(cli, member, canVerify) {
-    const [waitingForCrossSigningKeys, setWaitingForCrossSigningKeys] = useState(false);
-    const [hasCrossSigningKeys, setHasCrossSigningKeys] = useState(false);
+function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
+    // use a ref to setUpdating because we don't want to rerun
+    // the useAsyncMemo hook when it changes.
+    const updatingRef = useRef();
     useEffect(() => {
-        if (canVerify) {
-            setWaitingForCrossSigningKeys(true);
-            (async () => {
-                try {
-                    await cli.downloadKeys([member.userId]);
-                    const xsi = cli.getStoredCrossSigningForUser(member.userId);
-                    const key = xsi && xsi.getId();
-                    setHasCrossSigningKeys(!!key);
-                } finally {
-                    setWaitingForCrossSigningKeys(false);
-                }
-            })();
+        updatingRef.current = setUpdating;
+    }, [setUpdating]);
+
+    return useAsyncMemo(async () => {
+        if (!canVerify) {
+            return false;
         }
-    }, [canVerify, cli, member]);
-    return {waitingForCrossSigningKeys, hasCrossSigningKeys};
+        updatingRef.current(true);
+        try {
+            await cli.downloadKeys([member.userId]);
+            const xsi = cli.getStoredCrossSigningForUser(member.userId);
+            const key = xsi && xsi.getId();
+            return !!key;
+        } finally {
+            updatingRef.current(false);
+        }
+    }, [cli, member, canVerify], false);
 }
 
 async function verifyDevice(userId, device) {
@@ -1353,20 +1356,18 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
                       homeserverSupportsCrossSigning &&
                       isRoomEncrypted && !userVerified && !isMe;
 
-    const {hasCrossSigningKeys, waitingForCrossSigningKeys} =
-        useHasCrossSigningKeys(cli, member, canVerify);
+    const setUpdating = useCallback((updating) => {
+        setPendingUpdateCount(pendingUpdateCount + (updating ? 1 : -1));
+    }, [setPendingUpdateCount, pendingUpdateCount]);
+    const hasCrossSigningKeys =
+        useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
-    if (canVerify) {
-        if (hasCrossSigningKeys) {
-            verifyButton = (
-                <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
-                    {_t("Verify")}
-                </AccessibleButton>
-            );
-        } else if (waitingForCrossSigningKeys) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            verifyButton = <Spinner />;
-        }
+    if (canVerify && hasCrossSigningKeys) {
+        verifyButton = (
+            <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
+                {_t("Verify")}
+            </AccessibleButton>
+        );
     }
 
     let devicesSection;

From 8a964dbff0c789dc511bf8c445752ea632c1520e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 4 Mar 2020 17:19:06 +0100
Subject: [PATCH 1381/3235] avoid ref by getting count in setter callback

---
 src/components/views/right_panel/UserInfo.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 07b2248644..e844018527 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useCallback, useMemo, useState, useEffect, useContext, useRef} from 'react';
+import React, {useCallback, useMemo, useState, useEffect, useContext} from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
@@ -137,25 +137,18 @@ function useIsEncrypted(cli, room) {
 }
 
 function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
-    // use a ref to setUpdating because we don't want to rerun
-    // the useAsyncMemo hook when it changes.
-    const updatingRef = useRef();
-    useEffect(() => {
-        updatingRef.current = setUpdating;
-    }, [setUpdating]);
-
     return useAsyncMemo(async () => {
         if (!canVerify) {
             return false;
         }
-        updatingRef.current(true);
+        setUpdating(true);
         try {
             await cli.downloadKeys([member.userId]);
             const xsi = cli.getStoredCrossSigningForUser(member.userId);
             const key = xsi && xsi.getId();
             return !!key;
         } finally {
-            updatingRef.current(false);
+            setUpdating(false);
         }
     }, [cli, member, canVerify], false);
 }
@@ -1356,9 +1349,9 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
                       homeserverSupportsCrossSigning &&
                       isRoomEncrypted && !userVerified && !isMe;
 
-    const setUpdating = useCallback((updating) => {
-        setPendingUpdateCount(pendingUpdateCount + (updating ? 1 : -1));
-    }, [setPendingUpdateCount, pendingUpdateCount]);
+    const setUpdating = (updating) => {
+        setPendingUpdateCount(count => count + (updating ? 1 : -1));
+    };
     const hasCrossSigningKeys =
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 

From 3842bce74dc25f242b0cf710efd6d5d6d61ec3f9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 11:41:16 -0700
Subject: [PATCH 1382/3235] Fix SSO for new approach

---
 src/components/structures/auth/Login.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index cf80c99535..6cce8f4444 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -28,6 +28,7 @@ import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDisc
 import classNames from "classnames";
 import AuthPage from "../../views/auth/AuthPage";
 import SSOButton from "../../views/elements/SSOButton";
+import PlatformPeg from '../../../PlatformPeg';
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -155,14 +156,6 @@ export default createReactClass({
         return this._getCurrentFlowStep() === 'm.login.sso' || this._getCurrentFlowStep() === 'm.login.cas';
     },
 
-    _getSsoUrl: function(kind) {
-        if (kind === 'm.login.cas') {
-            return this._loginLogic.getSsoLoginUrl("cas");
-        } else {
-            return this._loginLogic.getSsoLoginUrl("sso");
-        }
-    },
-
     onPasswordLogin: async function(username, phoneCountry, phoneNumber, password) {
         if (!this.state.serverIsAlive) {
             this.setState({busy: true});
@@ -357,7 +350,8 @@ export default createReactClass({
             // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
             ev.preventDefault();
             ev.stopPropagation();
-            window.location = this._getSsoUrl(this._getCurrentFlowStep());
+            const ssoKind = this._getCurrentFlowStep() === 'm.login.sso' ? 'sso' : 'cas';
+            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
         } else {
             // Don't intercept - just go through to the register page
             this.onRegisterClick(ev);

From b06a82ee80b2aa656f1a0114c7fa2fab7fccc8dd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 11:44:12 -0700
Subject: [PATCH 1383/3235] Use textForEvent to determine if an event is worth
 rendering

---
 src/components/structures/MessagePanel.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 0029090a94..a2ac93d282 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -28,6 +28,7 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
+import {textForEvent} from "../../TextForEvent";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -963,15 +964,11 @@ class MemberGrouper {
 
     add(ev) {
         if (ev.getType() === 'm.room.member') {
-            // We'll just double check that it's worth our time to do so...
-            if (ev.getPrevContent()) {
-                const membershipChange = ev.getPrevContent()['membership'] !== ev.getContent()['membership'];
-                const displayNameChange = ev.getPrevContent()['displayname'] !== ev.getContent()['displayname'];
-                const avatarChange = ev.getPrevContent()['avatar_url'] !== ev.getContent()['avatar_url'];
-                if (!membershipChange && !displayNameChange && !avatarChange) {
-                    return; // Not a substantial change - quietly ignore
-                }
-            }
+            // We'll just double check that it's worth our time to do so, through an
+            // ugly hack. If textForEvent returns something, we should group it for
+            // rendering but if it doesn't then we'll exclude it.
+            const renderText = textForEvent(ev);
+            if (!renderText || renderText.trim().length === 0) return; // quietly ignore
         }
         this.readMarker = this.readMarker || this.panel._readMarkerForEvent(ev.getId());
         this.events.push(ev);

From 80b44f0292ff36b87389c7b72a6b498de8c9b5bc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 12:05:47 -0700
Subject: [PATCH 1384/3235] Always calculate the category of a room

All the update triggers for the RoomListStore go through the `setRoomCategory` function, so by returning early we're not actually calculating where a room should be in the list.
---
 src/stores/RoomListStore.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 561d865b66..aec307d28e 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -479,12 +479,6 @@ class RoomListStore extends Store {
     _setRoomCategory(room, category) {
         if (!room) return; // This should only happen in tests
 
-        if (!this._state.orderImportantFirst) {
-            // XXX bail here early to avoid https://github.com/vector-im/riot-web/issues/9216
-            // this may mean that category updates are missed whilst not ordering by importance first
-            return;
-        }
-
         const listsClone = {};
 
         // Micro optimization: Support lazily loading the last timestamp in a room

From 8e3fea9d0fb1a6b097754b656c2c5e8d1dcdb7ae Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 12:09:05 -0700
Subject: [PATCH 1385/3235] Use an algorithmic comparator for room list ops

Not all algorithms are timestamp based.
---
 src/stores/RoomListStore.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index aec307d28e..89edc9a8ef 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -372,6 +372,14 @@ class RoomListStore extends Store {
     _slotRoomIntoList(room, category, tag, existingEntries, newList, lastTimestampFn) {
         const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
 
+        let categoryComparator = (a, b) => lastTimestampFn(a.room) >= lastTimestampFn(b.room);
+        const sortAlgorithm = getListAlgorithm(tag, this._state.algorithm);
+        if (sortAlgorithm === ALGO_RECENT) {
+            categoryComparator = (a, b) => this._recentsComparator(a, b, lastTimestampFn);
+        } else if (sortAlgorithm === ALGO_ALPHABETIC) {
+            categoryComparator = (a, b) => this._lexicographicalComparator(a, b);
+        }
+
         // The slotting algorithm works by trying to position the room in the most relevant
         // category of the list (red > grey > etc). To accomplish this, we need to consider
         // a couple cases: the category existing in the list but having other rooms in it and
@@ -449,7 +457,7 @@ class RoomListStore extends Store {
                 // based on most recent timestamp.
                 const changedBoundary = entryCategoryIndex > targetCategoryIndex;
                 const currentCategory = entryCategoryIndex === targetCategoryIndex;
-                if (changedBoundary || (currentCategory && lastTimestampFn(room) >= lastTimestampFn(entry.room))) {
+                if (changedBoundary || (currentCategory && categoryComparator({room}, entry) <= 0)) {
                     if (changedBoundary) {
                         // If we changed a boundary, then we've gone too far - go to the top of the last
                         // section instead.

From 830c6e7cc819046db0670e3af419ccf6a5a9c1b8 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 4 Mar 2020 17:13:43 +0000
Subject: [PATCH 1386/3235] Translated using Weblate (Albanian)

Currently translated at 99.5% (2129 of 2140 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 9cb7191288..97cf2f820e 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -888,7 +888,7 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Krijoni një bashkësi që bëni tok përdorues dhe dhoma! Krijoni një faqe hyrëse vetjake, që të ravijëzoni hapësirën tuaj në universin Matrix.",
     "Sent messages will be stored until your connection has returned.": "Mesazhet e dërguar do të depozitohen deri sa lidhja juaj të jetë rikthyer.",
     "Server may be unavailable, overloaded, or search timed out :(": "Shërbyesi mund të jetë i pakapshëm, i mbingarkuar, ose kërkimit i mbaroi koha :(",
-    "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.": "Nëse parashtruar një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të ndjekim problemin. Regjistrat e diagnostikimit përmbajnë të dhëna përdorimi, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhet.",
+    "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.": "Nëse parashtruat një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të ndjekim problemin. Regjistrat e diagnostikimit përmbajnë të dhëna përdorimi, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhet.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatësia është e rëndësishme për ne, ndaj nuk grumbullojmë ndonjë të dhënë personale apo të identifikueshme për analizat tona.",
     "Learn more about how we use analytics.": "Mësoni më tepër se si i përdorim analizat.",
     "Reject all %(invitedRooms)s invites": "Mos prano asnjë ftesë për në %(invitedRooms)s",

From 2204785026ceaf504ef29c4f0fe0f4c11979aa90 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 12:26:08 -0700
Subject: [PATCH 1387/3235] Simplify SSO step checking

---
 src/components/structures/auth/Login.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 6cce8f4444..bfabc34a62 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -152,10 +152,6 @@ export default createReactClass({
         return this.state.busy || this.props.busy;
     },
 
-    _isSsoStep: function() {
-        return this._getCurrentFlowStep() === 'm.login.sso' || this._getCurrentFlowStep() === 'm.login.cas';
-    },
-
     onPasswordLogin: async function(username, phoneCountry, phoneNumber, password) {
         if (!this.state.serverIsAlive) {
             this.setState({busy: true});
@@ -345,12 +341,13 @@ export default createReactClass({
     },
 
     onTryRegisterClick: function(ev) {
-        if (this._isSsoStep()) {
+        const step = this._getCurrentFlowStep();
+        if (step === 'm.login.sso' || step === 'm.login.cas') {
             // If we're showing SSO it means that registration is also probably disabled,
             // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
             ev.preventDefault();
             ev.stopPropagation();
-            const ssoKind = this._getCurrentFlowStep() === 'm.login.sso' ? 'sso' : 'cas';
+            const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
             PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
         } else {
             // Don't intercept - just go through to the register page

From d820356990fc836bcdbfb65bc33d203f94f09e3a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 13:56:58 -0700
Subject: [PATCH 1388/3235] Convert alias links in room header topics to local
 permalinks

Fixes https://github.com/vector-im/riot-web/issues/12605
---
 src/linkify-matrix.js              |  4 ++--
 src/utils/permalinks/Permalinks.js | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 8870b2d431..2d2b9c62a5 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {baseUrl} from "./utils/permalinks/SpecPermalinkConstructor";
-import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
+import {tryTransformEntityToPermalink, tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
 
 function matrixLinkify(linkify) {
     // Text tokens
@@ -221,7 +221,7 @@ matrixLinkify.options = {
             case 'userid':
             case 'groupid':
             default: {
-                return tryTransformPermalinkToLocalHref(href);
+                return tryTransformEntityToPermalink(href);
             }
         }
     },
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 1174e59da6..466d1ed57d 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -290,6 +290,25 @@ export function isPermalinkHost(host: string): boolean {
     return getPermalinkConstructor().isPermalinkHost(host);
 }
 
+/**
+ * Transforms an entity (permalink, room alias, user ID, etc) into a local URL
+ * if possible. If the given entity is not found to be valid enough to be converted
+ * then a null value will be returned.
+ * @param {string} entity The entity to transform.
+ * @returns {string|null} The transformed permalink or null if unable.
+ */
+export function tryTransformEntityToPermalink(entity: string): string {
+    if (!entity) return null;
+
+    // Check to see if it is a bare entity for starters
+    if (entity[0] === '#' || entity[0] === '!') return makeRoomPermalink(entity);
+    if (entity[0] === '@') return makeUserPermalink(entity);
+    if (entity[0] === '+') return makeGroupPermalink(entity);
+
+    // Then try and merge it into a permalink
+    return tryTransformPermalinkToLocalHref(entity);
+}
+
 /**
  * Transforms a permalink (or possible permalink) into a local URL if possible. If
  * the given permalink is found to not be a permalink, it'll be returned unaltered.

From c6af591c6e2aa49a9fadd765316226688706210b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 14:14:03 -0700
Subject: [PATCH 1389/3235] Ensure linkified topics in the room directory also
 work

We weren't passing the options object down to linkifyString.

Fixes https://github.com/vector-im/riot-web/issues/12606
---
 src/HtmlUtils.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 7dd68e5c61..a58ea25c8a 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -23,7 +23,6 @@ import ReplyThread from "./components/views/elements/ReplyThread";
 
 import React from 'react';
 import sanitizeHtml from 'sanitize-html';
-import highlight from 'highlight.js';
 import * as linkify from 'linkifyjs';
 import linkifyMatrix from './linkify-matrix';
 import _linkifyElement from 'linkifyjs/element';
@@ -467,11 +466,12 @@ export function bodyToHtml(content, highlights, opts={}) {
 /**
  * Linkifies the given string. This is a wrapper around 'linkifyjs/string'.
  *
- * @param {string} str
- * @returns {string}
+ * @param {string} str string to linkify
+ * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
+ * @returns {string} Linkified string
  */
-export function linkifyString(str) {
-    return _linkifyString(str);
+export function linkifyString(str, options = linkifyMatrix.options) {
+    return _linkifyString(str, options);
 }
 
 /**
@@ -489,10 +489,11 @@ export function linkifyElement(element, options = linkifyMatrix.options) {
  * Linkify the given string and sanitize the HTML afterwards.
  *
  * @param {string} dirtyHtml The HTML string to sanitize and linkify
+ * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
  * @returns {string}
  */
-export function linkifyAndSanitizeHtml(dirtyHtml) {
-    return sanitizeHtml(linkifyString(dirtyHtml), sanitizeHtmlParams);
+export function linkifyAndSanitizeHtml(dirtyHtml, options = linkifyMatrix.options) {
+    return sanitizeHtml(linkifyString(dirtyHtml, options), sanitizeHtmlParams);
 }
 
 /**

From 4a976acb84ff828f2ff5745a26b6841093290f54 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 4 Mar 2020 14:18:56 -0700
Subject: [PATCH 1390/3235] Add a null check to getUniqueRoomsWithIndividuals

Fixes https://github.com/vector-im/riot-web/issues/12611
---
 src/utils/DMRoomMap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index 43ef0035fc..6ce92a0458 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -168,6 +168,7 @@ export default class DMRoomMap {
     }
 
     getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
+        if (!this.roomToUser) return {}; // No rooms means no map.
         return Object.keys(this.roomToUser)
             .map(r => ({userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r)}))
             .filter(r => r.userId && r.room && r.room.getInvitedAndJoinedMemberCount() === 2)

From 98f0a2ab679d4d08c298a0148e3de09b4b9ea790 Mon Sep 17 00:00:00 2001
From: Simeon Keske <ca-git@noemis.me>
Date: Wed, 4 Mar 2020 22:30:24 +0100
Subject: [PATCH 1391/3235] show the room presence indicator, even when
 cross-singing is enabled

---
 src/components/views/rooms/RoomTile.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index a07c81eb21..3245cdb779 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -491,15 +491,15 @@ export default createReactClass({
                 alt="dm"
             />;
 
-            const { room } = this.props;
-            const member = room.getMember(dmUserId);
-            if (
-                member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
-                SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
-            ) {
-                const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
-                dmOnline = <UserOnlineDot userId={dmUserId} />;
-            }
+        }
+        const { room } = this.props;
+        const member = room.getMember(dmUserId);
+        if (
+            member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
+            SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
+        ) {
+            const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
+            dmOnline = <UserOnlineDot userId={dmUserId} />;
         }
 
         // The following labels are written in such a fashion to increase screen reader efficiency (speed).

From cf1d9cc8b5ff65cc127510a310ad0585c1c1dfba Mon Sep 17 00:00:00 2001
From: Simeon Keske <ca-git@noemis.me>
Date: Wed, 4 Mar 2020 22:46:07 +0100
Subject: [PATCH 1392/3235] make the linter happy

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

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 3245cdb779..e1624602f1 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -490,8 +490,8 @@ export default createReactClass({
                 height="13"
                 alt="dm"
             />;
-
         }
+
         const { room } = this.props;
         const member = room.getMember(dmUserId);
         if (

From a5cd0a7d5f120696277974a4e3ba64e7ce4419b5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 5 Mar 2020 11:09:45 +0100
Subject: [PATCH 1393/3235] indent by 4 spaces

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index e844018527..b8ba6968a4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1346,8 +1346,8 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const userVerified = userTrust.isCrossSigningVerified();
     const isMe = member.userId === cli.getUserId();
     const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
-                      homeserverSupportsCrossSigning &&
-                      isRoomEncrypted && !userVerified && !isMe;
+                        homeserverSupportsCrossSigning &&
+                        isRoomEncrypted && !userVerified && !isMe;
 
     const setUpdating = (updating) => {
         setPendingUpdateCount(count => count + (updating ? 1 : -1));

From cc26dc157b4a945b7f1c1d5265ab129b3802a0a6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 5 Mar 2020 03:11:47 +0000
Subject: [PATCH 1394/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2140 of 2140 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 f57ef0e28d..acf3f4feb3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2176,5 +2176,6 @@
     "Create Account": "建立帳號",
     "Order rooms by name": "以名稱排序聊天室",
     "Show rooms with unread notifications first": "先顯示有未讀通知的聊天室",
-    "Show shortcuts to recently viewed rooms above the room list": "在聊天室清單上方顯示最近看過的聊天室的捷徑"
+    "Show shortcuts to recently viewed rooms above the room list": "在聊天室清單上方顯示最近看過的聊天室的捷徑",
+    "Displays information about a user": "顯示關於使用者的資訊"
 }

From 26177a19d5406739d067b9ccc3bf42bc4b8d5d46 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 5 Mar 2020 10:45:37 +0000
Subject: [PATCH 1395/3235] access cross-signing callbacks via method

---
 src/CrossSigningManager.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 8549742c05..0cf2c9e2ac 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -142,13 +142,13 @@ const onSecretRequested = async function({
         console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
         return;
     }
-    const crossSigning = client._crypto._crossSigningInfo;
-    if (!crossSigning._cacheCallbacks.getCrossSigningKeyCache) return;
+    const callbacks = client.getCrossSigningCacheCallbacks();
+    if (!callbacks.getCrossSigningKeyCache) return;
     if (name === "m.key.self_signing") {
-        const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("self_signing");
+        const key = await callbacks.getCrossSigningKeyCache("self_signing");
         return key && encodeBase64(key);
     } else if (name === "m.key.user_signing") {
-        const key = await crossSigning._cacheCallbacks.getCrossSigningKeyCache("user_signing");
+        const key = await callbacks.getCrossSigningKeyCache("user_signing");
         return key && encodeBase64(key);
     }
     console.warn("onSecretRequested didn't recognise the secret named ", name);

From a6882cece188c95b988c1d815771088e36b946bd Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Thu, 5 Mar 2020 14:10:44 +0000
Subject: [PATCH 1396/3235] increase margin between Settings sections

---
 res/css/views/settings/tabs/_SettingsTab.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 794c8106be..9727946893 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -45,6 +45,10 @@ limitations under the License.
     margin: 10px 100px 10px 0; // Align with the rest of the view
 }
 
+.mx_SettingsTab_section {
+    margin-bottom: 24px;
+}
+
 .mx_SettingsTab_section .mx_SettingsFlag {
     margin-right: 100px;
     margin-bottom: 10px;

From ce849672257e395ee0cd21a7e05db86fcebc6ea6 Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Thu, 5 Mar 2020 14:18:12 +0000
Subject: [PATCH 1397/3235] update Security Disclosure Policy link text

---
 src/components/views/settings/tabs/user/HelpUserSettingsTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 84403fe76e..8e7983970a 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -226,7 +226,7 @@ export default class HelpUserSettingsTab extends React.Component {
                             </AccessibleButton>
                         </div>
                         {
-                            _t( "To submit a security-related bug report, please read the Matrix.org " +
+                            _t( "To report a Matrix-related security issue, please read the Matrix.org " +
                                 "<a>Security Disclosure Policy</a>.", {},
                                 {
                                     'a': (sub) =>

From d28d330b330dce39857678f033315f3814eb9dc0 Mon Sep 17 00:00:00 2001
From: Ben Parsons <ben@bpulse.co.uk>
Date: Thu, 5 Mar 2020 14:33:40 +0000
Subject: [PATCH 1398/3235] run yarn i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c0470af357..d3dc1f0652 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -725,7 +725,7 @@
     "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.": "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.",
     "Submit debug logs": "Submit debug logs",
     "Clear cache and reload": "Clear cache and reload",
-    "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To submit a security-related bug report, please read the Matrix.org <a>Security Disclosure Policy</a>.",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "FAQ": "FAQ",
     "Versions": "Versions",
     "riot-web version:": "riot-web version:",

From 7d051d6a1d0d927732adf44ea79534c64ccc326d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 5 Mar 2020 17:44:35 +0100
Subject: [PATCH 1399/3235] await request promise inside encryption panel to
 show spinner

---
 src/components/structures/RightPanel.js           |  2 ++
 .../views/right_panel/EncryptionPanel.js          | 15 ++++++++++++++-
 src/components/views/right_panel/UserInfo.js      |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 20df323c10..8d25116827 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -182,6 +182,7 @@ export default class RightPanel extends React.Component {
                 member: payload.member,
                 event: payload.event,
                 verificationRequest: payload.verificationRequest,
+                verificationRequestPromise: payload.verificationRequestPromise,
             });
         }
     }
@@ -231,6 +232,7 @@ export default class RightPanel extends React.Component {
                         onClose={onClose}
                         phase={this.state.phase}
                         verificationRequest={this.state.verificationRequest}
+                        verificationRequestPromise={this.state.verificationRequestPromise}
                     />;
                 } else {
                     panel = <MemberInfo
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 4723211de4..a14d4a2b7d 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -30,7 +30,7 @@ import {_t} from "../../../languageHandler";
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
-const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
+const EncryptionPanel = ({verificationRequest, verificationRequestPromise, member, onClose, layout}) => {
     const [request, setRequest] = useState(verificationRequest);
     // state to show a spinner immediately after clicking "start verification",
     // before we have a request
@@ -43,6 +43,19 @@ const EncryptionPanel = ({verificationRequest, member, onClose, layout}) => {
             setPhase(verificationRequest.phase);
         }
     }, [verificationRequest]);
+
+    useEffect(() => {
+        async function awaitPromise() {
+            setRequesting(true);
+            const request = await verificationRequestPromise;
+            setRequesting(false);
+            setRequest(request);
+            setPhase(request.phase);
+        }
+        if (verificationRequestPromise) {
+            awaitPromise();
+        }
+    }, [verificationRequestPromise]);
     const changeHandler = useCallback(() => {
         // handle transitions -> cancelled for mismatches which fire a modal instead of showing a card
         if (request && request.cancelled && MISMATCHES.includes(request.cancellationCode)) {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b8ba6968a4..17cb80492e 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -171,14 +171,14 @@ async function verifyDevice(userId, device) {
                 return;
             }
             const cli = MatrixClientPeg.get();
-            const verificationRequest = await cli.requestVerification(
+            const verificationRequestPromise = cli.requestVerification(
                 userId,
                 [device.deviceId],
             );
             dis.dispatch({
                 action: "set_right_panel_phase",
                 phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {member, verificationRequest},
+                refireParams: {member, verificationRequestPromise},
             });
         },
         primaryButton: _t("Done"),

From 597343018d0810b1dfe9771013e337c4b44d210a Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 5 Mar 2020 15:32:14 +0000
Subject: [PATCH 1400/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2134 of 2141 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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 97cf2f820e..2389b430b0 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2003,7 +2003,7 @@
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ky sesion <b>nuk po bën kopjeruajtje të kyçeve tuaja</b>, por keni një kopjeruajtje ekzistuese që mund ta përdorni për rimarrje dhe ta shtoni më tej.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Lidheni këtë sesion kopjeruajtje kyçesh, përpara se të dilni, që të shmangni humbje të çfarëdo kyçi që mund të gjendet vetëm në këtë pajisje.",
     "Connect this session to Key Backup": "Lidhe këtë sesion me Kopjeruajtje Kyçesh",
-    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Kopjeruajtja ka nënshkrim nga sesion <verify>i panjohur</verify> me ID %(deviceId)s.",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Kopjeruajtja ka nënshkrim nga sesion <verify>i panjohur</verify> me ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej këtij sesioni",
     "Backup has an <validity>invalid</validity> signature from this session": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej këtij sesioni",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>vlefshëm</validity> prej sesioni të <verify>verifikuar</verify> <device></device>",
@@ -2162,5 +2162,10 @@
     "Your password": "Fjalëkalimi juaj",
     "This session, or the other session": "Ky sesion, ose sesioni tjetër",
     "The internet connection either session is using": "Lidhja internet që përdor cilido nga dy sesionet",
-    "We recommend you change your password and recovery key in Settings immediately": "Këshillojmë të ndryshoni menjëherë te Rregullimet fjalëkalimin tuaj dhe kyçin e rimarrjeve"
+    "We recommend you change your password and recovery key in Settings immediately": "Këshillojmë të ndryshoni menjëherë te Rregullimet fjalëkalimin tuaj dhe kyçin e rimarrjeve",
+    "Sign In or Create Account": "Hyni ose Krijoni një Llogari",
+    "Use your account or create a new one to continue.": "Që të vazhdohet, përdorni llogarinë tuaj të përdoruesit ose krijoni një të re.",
+    "Create Account": "Krijoni Llogari",
+    "Displays information about a user": "Shfaq të dhëna rreth një përdoruesi",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Që të njoftoni një problem sigurie lidhur me Matrix-in, ju lutemi, lexoni <a>Rregulla Tregimi Çështjes Sigurie</a> te Matrix.org."
 }

From 74fcb103b1d11a408a44a144c1850624904f0f2f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 5 Mar 2020 11:04:33 -0700
Subject: [PATCH 1401/3235] Link to the right contributing guidelines

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0fbed22030..d6fd6db1b7 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ All code lands on the `develop` branch - `master` is only used for stable releas
 **Please file PRs against `develop`!!**
 
 Please follow the standard Matrix contributor's guide:
-https://github.com/matrix-org/synapse/tree/master/CONTRIBUTING.rst
+https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst
 
 Please follow the Matrix JS/React code style as per:
 https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md

From a275d296fe389eb2778ce9cb929f9754e9b82ec0 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 5 Mar 2020 18:59:37 +0000
Subject: [PATCH 1402/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2135 of 2142 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2389b430b0..974acb90c5 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2167,5 +2167,6 @@
     "Use your account or create a new one to continue.": "Që të vazhdohet, përdorni llogarinë tuaj të përdoruesit ose krijoni një të re.",
     "Create Account": "Krijoni Llogari",
     "Displays information about a user": "Shfaq të dhëna rreth një përdoruesi",
-    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Që të njoftoni një problem sigurie lidhur me Matrix-in, ju lutemi, lexoni <a>Rregulla Tregimi Çështjes Sigurie</a> te Matrix.org."
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Që të njoftoni një problem sigurie lidhur me Matrix-in, ju lutemi, lexoni <a>Rregulla Tregimi Çështjes Sigurie</a> te Matrix.org.",
+    "Mark all as read": "Vëru të tërave shenjë si të lexuara"
 }

From e900fe04e87b2ff9047800143cb46ff9d4b5388d Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 5 Mar 2020 18:37:44 +0000
Subject: [PATCH 1403/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2142 of 2142 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 971fef5ab3..65019b7b6f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2174,5 +2174,7 @@
     "Sign In or Create Account": "Belépés vagy Fiók Készítés",
     "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat vagy készíts egy újat.",
     "Create Account": "Fiók létrehozása",
-    "Displays information about a user": "A felhasználóról információ megjelenítése"
+    "Displays information about a user": "A felhasználóról információ megjelenítése",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-szal kapcsolatos biztonsági hibák jelentésével kapcsolatban kérlek olvasd el a Matrix.org <a>Biztonsági hiba közzétételi szabályzatot</a>.",
+    "Mark all as read": "Mindent olvasottnak jelöl"
 }

From 8fe54e5dca8d4293746f15f3a06ce6279651494f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 18 Feb 2020 10:59:42 +0100
Subject: [PATCH 1404/3235] ManageEventIndexDialog: Reword the status for the
 currently indexing rooms.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index f3ea3beb1c..9f00136b89 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -160,10 +160,12 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Indexed rooms:")} {_t("%(crawlingRooms)s out of %(totalRooms)s", {
-                        crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                    {_t("Monitoring %(totalRooms)s rooms in total.", {
                         totalRooms: formatCountLong(this.state.roomCount),
                     })} <br />
+                    {_t("Currently working in %(crawlingRooms)s rooms.", {
+                        crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                    })} <br />
                     {crawlerState}<br />
                     <Field
                         id={"crawlerSleepTimeMs"}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 35c3144241..4595e41598 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2135,8 +2135,8 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
-    "Indexed rooms:": "Indexed rooms:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
+    "Monitoring %(totalRooms)s rooms in total.": "Monitoring %(totalRooms)s rooms in total.",
+    "Currently working in %(crawlingRooms)s rooms.": "Currently working in %(crawlingRooms)s rooms.",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",

From bff3f3e6322aad77478bc7a7a0c27d03163a41e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 6 Mar 2020 15:34:19 +0100
Subject: [PATCH 1405/3235] Revert "ManageEventIndexDialog: Reword the status
 for the currently indexing rooms."

This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 ++----
 src/i18n/strings/en_EN.json                                 | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 9f00136b89..f3ea3beb1c 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -160,11 +160,9 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Monitoring %(totalRooms)s rooms in total.", {
-                        totalRooms: formatCountLong(this.state.roomCount),
-                    })} <br />
-                    {_t("Currently working in %(crawlingRooms)s rooms.", {
+                    {_t("Indexed rooms:")} {_t("%(crawlingRooms)s out of %(totalRooms)s", {
                         crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                        totalRooms: formatCountLong(this.state.roomCount),
                     })} <br />
                     {crawlerState}<br />
                     <Field
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4595e41598..35c3144241 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2135,8 +2135,8 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
-    "Monitoring %(totalRooms)s rooms in total.": "Monitoring %(totalRooms)s rooms in total.",
-    "Currently working in %(crawlingRooms)s rooms.": "Currently working in %(crawlingRooms)s rooms.",
+    "Indexed rooms:": "Indexed rooms:",
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",

From 364899b27dbf972164a9daa003d5a931bcb3d92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 6 Mar 2020 15:43:17 +0100
Subject: [PATCH 1406/3235] ManageEventIndexDialog: Show how many rooms are
 done instead being processed.

---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index f3ea3beb1c..8a5a0a3607 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -150,6 +150,8 @@ export default class ManageEventIndexDialog extends React.Component {
 
         const Field = sdk.getComponent('views.elements.Field');
 
+        const doneRooms = Math.max(0, (this.state.roomCount - this.state.crawlingRoomsCount));
+
         const eventIndexingSettings = (
             <div>
                 {
@@ -160,8 +162,8 @@ export default class ManageEventIndexDialog extends React.Component {
                 <div className='mx_SettingsTab_subsectionText'>
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
-                    {_t("Indexed rooms:")} {_t("%(crawlingRooms)s out of %(totalRooms)s", {
-                        crawlingRooms: formatCountLong(this.state.crawlingRoomsCount),
+                    {_t("Indexed rooms:")} {_t("%(doneRooms)s out of %(totalRooms)s", {
+                        doneRooms: formatCountLong(doneRooms),
                         totalRooms: formatCountLong(this.state.roomCount),
                     })} <br />
                     {crawlerState}<br />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 35c3144241..f6f850d627 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2136,7 +2136,7 @@
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Indexed rooms:": "Indexed rooms:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s",
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",

From 69389823f7fa8da68b3e8c7fa1ecaf9fc553ccf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 6 Mar 2020 16:07:10 +0100
Subject: [PATCH 1407/3235] ManageEventIndexDialog: Reword and move the crawler
 state around a bit.

This reflects now the latests design on Figma.
---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js      | 6 +++---
 src/i18n/strings/en_EN.json                                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 8a5a0a3607..371fdcaf64 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -141,10 +141,10 @@ export default class ManageEventIndexDialog extends React.Component {
         let crawlerState;
 
         if (this.state.currentRoom === null) {
-            crawlerState = _t("Not currently downloading messages for any room.");
+            crawlerState = _t("Not currently indexing messages for any room.");
         } else {
             crawlerState = (
-                    _t("Downloading mesages for %(currentRoom)s.", { currentRoom: this.state.currentRoom })
+                    _t("Currently indexing: %(currentRoom)s.", { currentRoom: this.state.currentRoom })
             );
         }
 
@@ -160,13 +160,13 @@ export default class ManageEventIndexDialog extends React.Component {
                     )
                 }
                 <div className='mx_SettingsTab_subsectionText'>
+                    {crawlerState}<br />
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
                     {_t("Indexed messages:")} {formatCountLong(this.state.eventCount)}<br />
                     {_t("Indexed rooms:")} {_t("%(doneRooms)s out of %(totalRooms)s", {
                         doneRooms: formatCountLong(doneRooms),
                         totalRooms: formatCountLong(this.state.roomCount),
                     })} <br />
-                    {crawlerState}<br />
                     <Field
                         id={"crawlerSleepTimeMs"}
                         label={_t('Message downloading sleep time(ms)')}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f6f850d627..01ba458a2f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2130,8 +2130,8 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
     "Disable": "Disable",
-    "Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
-    "Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
+    "Not currently indexing messages for any room.": "Not currently indexing messages for any room.",
+    "Currently indexing: %(currentRoom)s.": "Currently indexing: %(currentRoom)s.",
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",

From 02d76bdef52cc91cbcda20131bfc2559ad8d8661 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 6 Mar 2020 01:28:21 +0000
Subject: [PATCH 1408/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2142 of 2142 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index acf3f4feb3..83458cfa37 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2177,5 +2177,7 @@
     "Order rooms by name": "以名稱排序聊天室",
     "Show rooms with unread notifications first": "先顯示有未讀通知的聊天室",
     "Show shortcuts to recently viewed rooms above the room list": "在聊天室清單上方顯示最近看過的聊天室的捷徑",
-    "Displays information about a user": "顯示關於使用者的資訊"
+    "Displays information about a user": "顯示關於使用者的資訊",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "要回報與 Matrix 有關的安全性問題，請閱讀 Matrix.org <a>安全性揭露政策</a>。",
+    "Mark all as read": "全部標示為已讀"
 }

From 38ee5c09e4c40f4e37f5486fbbfb39b89d261fc7 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Fri, 6 Mar 2020 00:26:17 +0000
Subject: [PATCH 1409/3235] Translated using Weblate (Dutch)

Currently translated at 99.9% (2141 of 2142 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 889a8f572f..d4c8345392 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -2160,5 +2160,6 @@
     "Space used:": "Gebruikte ruimte:",
     "Indexed messages:": "Geïndexeerde berichten:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s van %(totalRooms)s",
-    "Message downloading sleep time(ms)": "Wachttijd voor downloaden van berichten (ms)"
+    "Message downloading sleep time(ms)": "Wachttijd voor downloaden van berichten (ms)",
+    "Mark all as read": "Alles markeren als gelezen"
 }

From 778251680d71f693a9350d1fe83457790dccc6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 6 Mar 2020 09:14:03 +0000
Subject: [PATCH 1410/3235] Translated using Weblate (French)

Currently translated at 100.0% (2142 of 2142 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 d3fea73891..5a97f54218 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2178,5 +2178,7 @@
     "Order rooms by name": "Trier les salons par nom",
     "Show rooms with unread notifications first": "Afficher en premier les salons avec des notifications non lues",
     "Show shortcuts to recently viewed rooms above the room list": "Afficher les raccourcis vers les salons vus récemment au-dessus de la liste des salons",
-    "Displays information about a user": "Affiche des informations à propos de l’utilisateur"
+    "Displays information about a user": "Affiche des informations à propos de l’utilisateur",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pour signaler un problème de sécurité lié à Matrix, consultez <a>la politique de divulgation de sécurité</a> de Matrix.org.",
+    "Mark all as read": "Tout marquer comme lu"
 }

From a7de5753160ecf1cc657a963493131f386e655d3 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 6 Mar 2020 16:50:39 +0100
Subject: [PATCH 1411/3235] use crypto.verification.request even when xsign is
 disabled

---
 src/components/structures/MatrixChat.js | 41 +++++++++++++------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index bc11e66d2c..e4af503b46 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1495,26 +1495,29 @@ export default createReactClass({
             }
         });
 
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            cli.on("crypto.verification.request", request => {
-                if (request.pending) {
-                    ToastStore.sharedInstance().addOrReplaceToast({
-                        key: 'verifreq_' + request.channel.transactionId,
-                        title: _t("Verification Request"),
-                        icon: "verification",
-                        props: {request},
-                        component: sdk.getComponent("toasts.VerificationRequestToast"),
-                    });
-                }
-            });
-        } else {
-            cli.on("crypto.verification.start", (verifier) => {
-                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
-                Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
-                    verifier,
+        cli.on("crypto.verification.request", request => {
+            const isFlagOn = SettingsStore.isFeatureEnabled("feature_cross_signing");
+
+            if (!isFlagOn && !request.channel.deviceId) {
+                request.cancel({code: "m.invalid_message", reason: "This client has cross-signing disabled"});
+                return;
+            }
+
+            if (request.pending) {
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: 'verifreq_' + request.channel.transactionId,
+                    title: _t("Verification Request"),
+                    icon: "verification",
+                    props: {request},
+                    component: sdk.getComponent("toasts.VerificationRequestToast"),
+                });
+            } else if (request.started) {
+                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
+                    verificationRequest: request,
                 }, null, /* priority = */ false, /* static = */ true);
-            });
-        }
+            }
+        });
         // 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 colorScheme = SettingsStore.getValue("roomColor");

From f8ef5bb6a58a95969dfd181a6e997f882ce28514 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 6 Mar 2020 17:20:08 +0100
Subject: [PATCH 1412/3235] check .started first as it can be both .started and
 pending

---
 src/components/structures/MatrixChat.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e4af503b46..87b0f6773f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1503,7 +1503,12 @@ export default createReactClass({
                 return;
             }
 
-            if (request.pending) {
+            if (request.started) {
+                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
+                    verificationRequest: request,
+                }, null, /* priority = */ false, /* static = */ true);
+            } else if (request.pending) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: 'verifreq_' + request.channel.transactionId,
                     title: _t("Verification Request"),
@@ -1511,11 +1516,6 @@ export default createReactClass({
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
                 });
-            } else if (request.started) {
-                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
-                Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
-                    verificationRequest: request,
-                }, null, /* priority = */ false, /* static = */ true);
             }
         });
         // Fire the tinter right on startup to ensure the default theme is applied

From b0617f10e82a5c60258846e69b97abb877c49e63 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 6 Mar 2020 17:22:56 +0100
Subject: [PATCH 1413/3235] stick to IncomingSasDialog as
 VerificationRequestDialog doesn't show sender yet, makes e2e tests fail

---
 src/components/structures/MatrixChat.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 87b0f6773f..a0b9a8fe57 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1503,10 +1503,10 @@ export default createReactClass({
                 return;
             }
 
-            if (request.started) {
-                const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
-                Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
-                    verificationRequest: request,
+            if (request.verifier) {
+                const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
+                Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
+                    verifier: request.verifier,
                 }, null, /* priority = */ false, /* static = */ true);
             } else if (request.pending) {
                 ToastStore.sharedInstance().addOrReplaceToast({

From 1f9bd55f3b8dfeb426cec63b4eb8f2a6fbc550d0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 6 Mar 2020 17:37:01 +0100
Subject: [PATCH 1414/3235] revert to legacy user verification (over to_device)
 without xsign keys

---
 src/components/views/right_panel/UserInfo.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 17cb80492e..24c5489c4f 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -186,6 +186,16 @@ async function verifyDevice(userId, device) {
     });
 }
 
+async function legacyVerifyUser(member) {
+    const cli = MatrixClientPeg.get();
+    const verificationRequestPromise = cli.requestVerification(member.userId);
+    dis.dispatch({
+        action: "set_right_panel_phase",
+        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        refireParams: {member, verificationRequestPromise},
+    });
+}
+
 function verifyUser(user) {
     const cli = MatrixClientPeg.get();
     const dmRoom = findDMForUser(cli, user.userId);
@@ -1355,9 +1365,15 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const hasCrossSigningKeys =
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
-    if (canVerify && hasCrossSigningKeys) {
+    if (canVerify) {
         verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field" onClick={() => verifyUser(member)}>
+            <AccessibleButton className="mx_UserInfo_field" onClick={() => {
+                if (hasCrossSigningKeys) {
+                    verifyUser(member);
+                } else {
+                    legacyVerifyUser(member);
+                }
+            }}>
                 {_t("Verify")}
             </AccessibleButton>
         );

From a8a499ce7d4c02c82faae74032b3a0395ac4cd64 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 6 Mar 2020 16:30:07 +0000
Subject: [PATCH 1415/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2135 of 2142 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 974acb90c5..29a4aceec7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2168,5 +2168,8 @@
     "Create Account": "Krijoni Llogari",
     "Displays information about a user": "Shfaq të dhëna rreth një përdoruesi",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Që të njoftoni një problem sigurie lidhur me Matrix-in, ju lutemi, lexoni <a>Rregulla Tregimi Çështjes Sigurie</a> te Matrix.org.",
-    "Mark all as read": "Vëru të tërave shenjë si të lexuara"
+    "Mark all as read": "Vëru të tërave shenjë si të lexuara",
+    "Not currently indexing messages for any room.": "Pa indeksuar aktualisht mesazhe nga ndonjë dhomë.",
+    "Currently indexing: %(currentRoom)s.": "Aktualisht nën indeksim: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s nga %(totalRooms)s"
 }

From e4d323d2f29ff61c24fb85784a038791da67a4f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 6 Mar 2020 14:23:20 -0700
Subject: [PATCH 1416/3235] Disable edits on redacted events

Fixes https://github.com/vector-im/riot-web/issues/12633
---
 src/components/views/messages/MessageActionBar.js | 7 +++++++
 src/utils/EventUtils.js                           | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index e07e39b971..fbc864caf2 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -121,10 +121,12 @@ export default class MessageActionBar extends React.PureComponent {
 
     componentDidMount() {
         this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
+        this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
     componentWillUnmount() {
         this.props.mxEvent.removeListener("Event.decrypted", this.onDecrypted);
+        this.props.mxEvent.removeListener("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
     onDecrypted = () => {
@@ -133,6 +135,11 @@ export default class MessageActionBar extends React.PureComponent {
         this.forceUpdate();
     };
 
+    onBeforeRedaction = () => {
+        // When an event is redacted, we can't edit it so update the available actions.
+        this.forceUpdate();
+    };
+
     onFocusChange = (focused) => {
         if (!this.props.onFocusChange) {
             return;
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 8acf5ae396..7e33aaed81 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -46,7 +46,7 @@ export function isContentActionable(mxEvent) {
 }
 
 export function canEditContent(mxEvent) {
-    if (mxEvent.status === EventStatus.CANCELLED || mxEvent.getType() !== "m.room.message") {
+    if (mxEvent.status === EventStatus.CANCELLED || mxEvent.getType() !== "m.room.message" || mxEvent.isRedacted()) {
         return false;
     }
     const content = mxEvent.getOriginalContent();

From 7a640522feb5e9e1acd4ad3559a4d1cfcfbd1cb2 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 6 Mar 2020 17:33:11 +0000
Subject: [PATCH 1417/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2142 of 2142 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 8b781c2119..f326faa3f7 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2169,5 +2169,11 @@
     "Indexed messages:": "Indexatutako mezuak:",
     "Indexed rooms:": "Indexatutako gelak:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
-    "Message downloading sleep time(ms)": "Mezuen deskargaren itxarote tartea (ms)"
+    "Message downloading sleep time(ms)": "Mezuen deskargaren itxarote tartea (ms)",
+    "Displays information about a user": "Erabiltzaileari buruzko informazioa erakusten du",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-ekin lotutako segurtasun arazo baten berri emateko, irakurri <a>Segurtasun ezagutarazte gidalerroak</a>.",
+    "Mark all as read": "Markatu denak irakurrita gisa",
+    "Not currently indexing messages for any room.": "Orain ez da inolako gelako mezurik indexatzen.",
+    "Currently indexing: %(currentRoom)s.": "Orain indexatzen: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
 }

From b138f1921fbbdbb48ab082798caf16aebace08fb Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 6 Mar 2020 17:05:55 +0000
Subject: [PATCH 1418/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2142 of 2142 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 65019b7b6f..18aa375944 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2176,5 +2176,8 @@
     "Create Account": "Fiók létrehozása",
     "Displays information about a user": "A felhasználóról információ megjelenítése",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-szal kapcsolatos biztonsági hibák jelentésével kapcsolatban kérlek olvasd el a Matrix.org <a>Biztonsági hiba közzétételi szabályzatot</a>.",
-    "Mark all as read": "Mindent olvasottnak jelöl"
+    "Mark all as read": "Mindent olvasottnak jelöl",
+    "Not currently indexing messages for any room.": "Jelenleg egyik szoba indexelése sem történik.",
+    "Currently indexing: %(currentRoom)s.": "Indexelés alatt jelenleg: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
 }

From 0be4a15bb2ff7453525624f73eda1c294cee1828 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Fri, 6 Mar 2020 17:26:47 +0000
Subject: [PATCH 1419/3235] Translated using Weblate (Lithuanian)

Currently translated at 43.5% (932 of 2142 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 | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index cf563c29f3..4476c21609 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -89,7 +89,7 @@
     "Remove from Directory": "Šalinti iš katalogo",
     "Download this file": "Atsisiųsti šį failą",
     "Saturday": "Šeštadienis",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad galite, bet kada įrašyti savo el. pašto adresą paskyros nustatymuose.",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad jei persigalvosite, tai bet kada galite nustatyti el. pašto adresą vartotojo nustatymuose.",
     "Direct Chat": "Tiesioginis pokalbis",
     "The server may be unavailable or overloaded": "Gali būti, kad serveris yra neprieinamas arba perkrautas",
     "Online": "Prisijungęs",
@@ -751,7 +751,7 @@
     "Add Email Address": "Pridėti el. pašto adresą",
     "Add Phone Number": "Pridėti telefono numerį",
     "Whether or not you're logged in (we don't record your username)": "Nepriklausomai nuo to ar jūs prisijungę (mes neįrašome jūsų vartotojo vardo)",
-    "Chat with Riot Bot": "Kalbėtis su Riot botu",
+    "Chat with Riot Bot": "Kalbėtis su Riot Botu",
     "Sign In": "Prisijungti",
     "Explore rooms": "Žvalgyti kambarius",
     "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
@@ -922,5 +922,23 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "Patvirtinimo laiškas bus išsiųstas į jūsų pašto dėžutę tam, kad patvirtintumėte naujo slaptažodžio nustatymą.",
     "Set a new password": "Nustatykite naują slaptažodį",
     "Create account": "Sukurti paskyrą",
-    "Create your account": "Sukurkite savo paskyrą"
+    "Create your account": "Sukurkite savo paskyrą",
+    "Change identity server": "Pakeisti tapatybės serverį",
+    "Change": "Keisti",
+    "Change room avatar": "Keisti kambario avatarą",
+    "Change room name": "Keisti kambario pavadinimą",
+    "Change main address for the room": "Keisti pagrindinį kambario adresą",
+    "Change history visibility": "Keisti istorijos matomumą",
+    "Change permissions": "Keisti leidimus",
+    "Change topic": "Keisti temą",
+    "Change settings": "Keisti nustatymus",
+    "Select the roles required to change various parts of the room": "Pasirinkite įvairių kambario dalių keitimui reikalingas roles",
+    "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.": "Jūs neturėsite galimybės atšaukti šio keitimo, kadangi jūs žeminate savo privilegijas kambaryje. Jei jūs esate paskutinis privilegijuotas vartotojas kambaryje, atgauti privilegijas bus neįmanoma.",
+    "Failed to change power level": "Nepavyko pakeisti galios lygio",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Jūs neturėsite galimybės atšaukti šio keitimo, kadangi jūs paaukštinate vartotoją, suteikdami tokį patį galios lygį, kokį turite jūs.",
+    "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.": "Ar tikrai norite pašalinti (ištrinti) šį įvykį? Atkreipkite dėmesį į tai, kad jei jūs ištrinsite kambario pavadinimo arba temos keitimo įvykį, tai gali atšaukti patį pakeitimą.",
+    "We recommend you change your password and recovery key in Settings immediately": "Mes rekomenduojame nedelsiant Nustatymuose pasikeisti jūsų slaptažodį ir atgavimo raktą",
+    "Email (optional)": "El. paštas (neprivaloma)",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą."
 }

From 6aeca7b8533806c6d859339c1dfd0be0c5eda424 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 6 Mar 2020 17:43:10 -0700
Subject: [PATCH 1420/3235] UX polish for custom themes

---
 res/css/_common.scss                          |  7 ++-
 .../tabs/user/GeneralUserSettingsTab.js       | 59 ++++++++++++-------
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index e062e0bd73..a4ef603242 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -42,10 +42,15 @@ pre, code {
     font-size: 100% !important;
 }
 
-.error, .warning {
+.error, .warning,
+.text-error, .text-warning {
     color: $warning-color;
 }
 
+.text-success {
+    color: $accent-color;
+}
+
 b {
     // On Firefox, the default weight for `<b>` is `bolder` which results in no bold
     // effect since we only have specific weights of our fonts available.
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 7af9aae146..d0509644b5 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -62,7 +62,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             msisdns: [],
             ...this._calculateThemeState(),
             customThemeUrl: "",
-            customThemeError: "",
+            customThemeMessage: {isError: false, text: ""},
         };
 
         this.dispatcherRef = dis.register(this._onAction);
@@ -281,22 +281,30 @@ export default class GeneralUserSettingsTab extends React.Component {
         if (!currentThemes) currentThemes = [];
         currentThemes = currentThemes.map(c => c); // cheap clone
 
+        if (this._themeTimer) {
+            clearTimeout(this._themeTimer);
+        }
+
         try {
             const r = await fetch(this.state.customThemeUrl);
             const themeInfo = await r.json();
             if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
-                console.log(themeInfo);
-                this.setState({customThemeError: _t("Invalid theme schema.")});
+                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
                 return;
             }
             currentThemes.push(themeInfo);
         } catch (e) {
             console.error(e);
-            this.setState({customThemeError: _t("Error downloading theme information.")});
+            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
+            return; // Don't continue on error
         }
 
         await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
-        this.setState({customThemeUrl: "", customThemeError: ""});
+        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
+
+        this._themeTimer = setTimeout(() => {
+            this.setState({customThemeMessage: {text: "", isError: false}});
+        }, 3000);
     };
 
     _onCustomThemeChange = (e) => {
@@ -400,22 +408,33 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         let customThemeForm;
         if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
+            let messageElement = null;
+            if (this.state.customThemeMessage.text) {
+                if (this.state.customThemeMessage.isError) {
+                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
+                } else {
+                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
+                }
+            }
             customThemeForm = (
-                <form onSubmit={this._onAddCustomTheme}>
-                    <Field
-                        label={_t("Custom theme URL")}
-                        type='text'
-                        id='mx_GeneralUserSettingsTab_customThemeInput'
-                        autoComplete="off"
-                        onChange={this._onCustomThemeChange}
-                        value={this.state.customThemeUrl}
-                    />
-                    <div className='error'>{this.state.customThemeError}</div>
-                    <AccessibleButton
-                        onClick={this._onAddCustomTheme}
-                        type="submit" kind="primary_sm"
-                    >{_t("Add theme")}</AccessibleButton>
-                </form>
+                <div className='mx_SettingsTab_section'>
+                    <form onSubmit={this._onAddCustomTheme}>
+                        <Field
+                            label={_t("Custom theme URL")}
+                            type='text'
+                            id='mx_GeneralUserSettingsTab_customThemeInput'
+                            autoComplete="off"
+                            onChange={this._onCustomThemeChange}
+                            value={this.state.customThemeUrl}
+                        />
+                        <AccessibleButton
+                            onClick={this._onAddCustomTheme}
+                            type="submit" kind="primary_sm"
+                            disabled={!this.state.customThemeUrl.trim()}
+                        >{_t("Add theme")}</AccessibleButton>
+                        {messageElement}
+                    </form>
+                </div>
             );
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 57e4bcb1cc..6463c7474f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -706,6 +706,7 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
     "Invalid theme schema.": "Invalid theme schema.",
     "Error downloading theme information.": "Error downloading theme information.",
+    "Theme added!": "Theme added!",
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",

From 661508ddf8323d4fc8daad9663376bc9e203965a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 6 Mar 2020 17:52:16 -0700
Subject: [PATCH 1421/3235] Order theme names in the dropdown

---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index d0509644b5..e9b30430a3 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -438,6 +438,12 @@ export default class GeneralUserSettingsTab extends React.Component {
             );
         }
 
+        const themes = Object.entries(enumerateThemes())
+            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
+        const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
+        const customThemes = themes.filter(p => !builtInThemes.includes(p))
+            .sort((a, b) => a.name.localeCompare(b.name));
+        const orderedThemes = [...builtInThemes, ...customThemes];
         return (
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
@@ -446,8 +452,8 @@ export default class GeneralUserSettingsTab extends React.Component {
                        value={this.state.theme} onChange={this._onThemeChange}
                        disabled={this.state.useSystemTheme}
                 >
-                    {Object.entries(enumerateThemes()).map(([theme, text]) => {
-                        return <option key={theme} value={theme}>{text}</option>;
+                    {orderedThemes.map(theme => {
+                        return <option key={theme.id} value={theme.id}>{theme.name}</option>;
                     })}
                 </Field>
                 {customThemeForm}

From 7850c506b78a1e3d76df35b7e5a1c7a6189027a3 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Fri, 6 Mar 2020 22:17:49 -0600
Subject: [PATCH 1422/3235] When room name is changed, show both the old and
 new name

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

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index d4003058c8..79083e351c 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -127,9 +127,11 @@ function textForRoomNameEvent(ev) {
     if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
         return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
     }
-    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
+    debugger;
+    return _t('%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.', {
         senderDisplayName,
-        roomName: ev.getContent().name,
+        oldRoomName: ev.getPrevContent().name,
+        newRoomName: ev.getContent().name,
     });
 }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 01ba458a2f..8b4e9417bb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -228,7 +228,7 @@
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",

From 832f904cdb5bf2413015685267332d65da49242b Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 7 Mar 2020 09:12:29 +0000
Subject: [PATCH 1423/3235] Translated using Weblate (German)

Currently translated at 77.3% (1656 of 2142 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 | 42 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9a655b041c..46f2dfacae 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -110,7 +110,7 @@
     "Upload file": "Datei hochladen",
     "Users": "Benutzer",
     "Verification Pending": "Verifizierung ausstehend",
-    "Video call": "Video-Anruf",
+    "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
     "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
@@ -250,7 +250,7 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden. Dir fehlt jedoch die Berechtigung, die betreffende Nachricht zu sehen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
     "Unknown room %(roomId)s": "Unbekannter Raum %(roomId)s",
-    "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?",
+    "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Gespräch zu sein, bist du sicher, dass du aufhören willst?",
     "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
     "Make Moderator": "Zum Moderator ernennen",
@@ -400,8 +400,8 @@
     "Enable Notifications": "Benachrichtigungen aktivieren",
     "Failed to upload profile picture!": "Hochladen des Profilbild's fehlgeschlagen!",
     "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
-    "Incoming video call from %(name)s": "Eingehender Video-Anruf von %(name)s",
-    "Incoming voice call from %(name)s": "Eingehender Sprach-Anruf von %(name)s",
+    "Incoming video call from %(name)s": "Eingehender Videoanruf von %(name)s",
+    "Incoming voice call from %(name)s": "Eingehender Sprachanruf von %(name)s",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Per <voiceText>Sprachanruf</voiceText> oder <videoText>Videoanruf</videoText> beitreten.",
     "Last seen": "Zuletzt gesehen",
     "No display name": "Kein Anzeigename",
@@ -780,7 +780,7 @@
     "Developer Tools": "Entwicklerwerkzeuge",
     "Preparing to send logs": "Senden von Logs wird vorbereitet",
     "Remember, you can always set an email address in user settings if you change your mind.": "Vergiss nicht, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst, wenn du deine Meinung änderst.",
-    "Explore Account Data": "Benutzerkonto-Daten analysieren",
+    "Explore Account Data": "Konto-Daten erkunden",
     "All messages (noisy)": "Alle Nachrichten (laut)",
     "Saturday": "Samstag",
     "I understand the risks and wish to continue": "Ich verstehe das Risiko und möchte fortfahren",
@@ -906,7 +906,7 @@
     "Permission Required": "Berechtigung benötigt",
     "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung um ein Konferenzgespräch in diesem Raum zu starten",
     "Failed to remove widget": "Widget konnte nicht entfernt werden",
-    "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf, während versucht wurde das Widget aus diesem Raum zu entfernen",
+    "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen",
     "System Alerts": "System-Benachrichtigung",
     "Only room administrators will see this warning": "Nur Raum-Administratoren werden diese Nachricht sehen",
     "Please <a>contact your service administrator</a> to continue using the service.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
@@ -1548,7 +1548,7 @@
     "Whether you're using Riot as an installed Progressive Web App": "Ob Sie Riot als installierte progressive Web-App verwenden",
     "Your user agent": "Ihr User-Agent",
     "The information being sent to us to help make Riot better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, Riot besser zu machen, gehören:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Es sind unbekannte Sitzungen in diesem Raum: Wenn Sie ohne Verifizierung fortfahren, wird es für jemanden möglich sein, Ihren Anruf zu belauschen.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Es sind unbekannte Sitzungen in diesem Raum: Wenn du ohne Verifizierung fortfährst, wird es für jemanden möglich sein, deinen Anruf zu belauschen.",
     "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",
     "If you cancel now, you won't complete verifying your other session.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung der anderen Sitzung nicht beenden können.",
     "If you cancel now, you won't complete your secret storage operation.": "Wenn Sie jetzt abbrechen, werden Sie die Geheimlagerungsoperation nicht beenden können.",
@@ -1604,7 +1604,7 @@
     "No sessions with registered encryption keys": "Keine Sitzungen mit registrierten Verschlüsselungsschlüsseln",
     "Room %(name)s": "Raum %(name)s",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ein Upgrade dieses Raums schaltet die aktuelle Instanz des Raums ab und erstellt einen aktualisierten Raum mit demselben Namen.",
-    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu überprüfen:",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu verifizieren:",
     "%(count)s verified sessions|other": "%(count)s verifizierte Sitzungen",
     "Hide verified sessions": "Verifizierte Sitzungen ausblenden",
     "%(count)s sessions|other": "%(count)s Sitzungen",
@@ -1656,5 +1656,29 @@
     "Scan this unique code": "Scanne diesen einzigartigen Code",
     "or": "oder",
     "Compare unique emoji": "Vergleiche einzigartige Emojis",
-    "Start": "Starte"
+    "Start": "Starte",
+    "Discovery": "Entdeckung",
+    "Done": "Erledigt",
+    "Manually Verify": "Manuell verifizieren",
+    "Trusted": "Vertrauenswürdig",
+    "Not trusted": "Nicht vertrauenswürdig",
+    "%(count)s verified sessions|one": "1 verifizierte Sitzung",
+    "%(count)s sessions|one": "%(count)s Sitzung",
+    "Messages in this room are not end-to-end encrypted.": "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.",
+    "Security": "Sicherheit",
+    "Ask %(displayName)s to scan your code:": "Bitte %(displayName)s, deinen Code zu scannen:",
+    "Verify by emoji": "Verifizierung durch Emojis",
+    "Verify by comparing unique emoji.": "Verifizierung durch den Vergleich einzigartiger Emojis.",
+    "You've successfully verified %(displayName)s!": "Du hast %(displayName)s erfolgreich verifiziert!",
+    "Got it": "Verstanden",
+    "Widget added by": "Widget hinzugefügt von",
+    "This widget may use cookies.": "Dieses Widget kann Cookies verwenden.",
+    "More options": "Weitere Optionen",
+    "Terms of Service": "Nutzungsbedingungen",
+    "To continue you need to accept the terms of this service.": "Um fortzufahren, musst du die Bedingungen dieses Dienstes akzeptieren.",
+    "Service": "Dienst",
+    "Summary": "Zusammenfassung",
+    "Document": "Dokument",
+    "Explore": "Erkunde",
+    "Explore rooms": "Erkunde Räume"
 }

From c0abae29287759b7a1b5e47251087bebcf4be561 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Sat, 7 Mar 2020 09:16:09 +0000
Subject: [PATCH 1424/3235] Translated using Weblate (German)

Currently translated at 77.3% (1656 of 2142 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 46f2dfacae..09fbf1dfe1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -525,7 +525,7 @@
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
     "New community ID (e.g. +foo:%(localDomain)s)": "Neue Community-ID (z. B. +foo:%(localDomain)s)",
-    "Remove from community": "Aus Community entfernen",
+    "Remove from community": "Aus der Community entfernen",
     "Failed to remove user from community": "Entfernen des Benutzers aus der Community fehlgeschlagen",
     "Filter community members": "Community-Mitglieder filtern",
     "Filter community rooms": "Community-Räume filtern",

From 69bfabdcf8db0696709740bd2b59101a73a98515 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Sat, 7 Mar 2020 09:23:52 +0000
Subject: [PATCH 1425/3235] Translated using Weblate (German)

Currently translated at 77.3% (1656 of 2142 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 09fbf1dfe1..9ce8b9140b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -556,7 +556,7 @@
     "Message removed": "Nachricht entfernt",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt das Widget für alle Benutzer in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'",

From dd0d98b997a7f7061f7360d850b50cc483208793 Mon Sep 17 00:00:00 2001
From: natowi <natowi@arcor.de>
Date: Sat, 7 Mar 2020 09:24:32 +0000
Subject: [PATCH 1426/3235] Translated using Weblate (German)

Currently translated at 77.3% (1656 of 2142 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9ce8b9140b..c5ec81b3a1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1680,5 +1680,6 @@
     "Summary": "Zusammenfassung",
     "Document": "Dokument",
     "Explore": "Erkunde",
-    "Explore rooms": "Erkunde Räume"
+    "Explore rooms": "Erkunde Räume",
+    "Maximize apps": "Apps maximieren"
 }

From 356120f0da3ee54190f46313733ed30519d5c45d Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 7 Mar 2020 09:34:40 +0000
Subject: [PATCH 1427/3235] Translated using Weblate (German)

Currently translated at 77.3% (1656 of 2142 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c5ec81b3a1..144362e556 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1681,5 +1681,17 @@
     "Document": "Dokument",
     "Explore": "Erkunde",
     "Explore rooms": "Erkunde Räume",
-    "Maximize apps": "Apps maximieren"
+    "Maximize apps": "Apps maximieren",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zu dem Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.",
+    "Match system theme": "An System-Design anpassen",
+    "Verify this session by completing one of the following:": "Verifiziere diese Sitzung, indem du eine der folgenden Aktionen ausführst:",
+    "Your homeserver does not support session management.": "Dein Heimserver unterstützt keine Sitzungsverwaltung.",
+    "Unable to load session list": "Sitzungsliste kann nicht geladen werden",
+    "Delete %(count)s sessions|one": "%(count)s Sitzung löschen",
+    "This session is backing up your keys. ": "Diese Sitzung sichert deine Schlüssel.",
+    "Connect this session to Key Backup": "Diese Sitzung mit der Schlüsselsicherung verbinden",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Die Sicherung hat eine Signatur von einer <verify>unbekannten</verify> Sitzung mit der ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
+    "Backup has an <validity>invalid</validity> signature from this session": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von dieser Sitzung",
+    "Discovery options will appear once you have added an email above.": "Erkennungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde."
 }

From 47d73e3a644d22a39a3477e71f425c2ad7974467 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 7 Mar 2020 09:41:16 +0000
Subject: [PATCH 1428/3235] Translated using Weblate (German)

Currently translated at 77.4% (1657 of 2142 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 144362e556..3bc50b66f6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1693,5 +1693,5 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Die Sicherung hat eine Signatur von einer <verify>unbekannten</verify> Sitzung mit der ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
     "Backup has an <validity>invalid</validity> signature from this session": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von dieser Sitzung",
-    "Discovery options will appear once you have added an email above.": "Erkennungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde."
+    "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde."
 }

From 36de51d0345446a70baecbc630579093277be4df Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 7 Mar 2020 09:41:21 +0000
Subject: [PATCH 1429/3235] Translated using Weblate (German)

Currently translated at 77.4% (1657 of 2142 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3bc50b66f6..18e52178aa 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1693,5 +1693,6 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Die Sicherung hat eine Signatur von einer <verify>unbekannten</verify> Sitzung mit der ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
     "Backup has an <validity>invalid</validity> signature from this session": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von dieser Sitzung",
-    "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde."
+    "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.",
+    "Discovery options will appear once you have added a phone number above.": "Erkennungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde."
 }

From f2f8e5e2f64b8b6a92883e4a910863133bbe3a25 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 7 Mar 2020 09:41:31 +0000
Subject: [PATCH 1430/3235] Translated using Weblate (German)

Currently translated at 77.5% (1659 of 2142 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 18e52178aa..afd9773f25 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1694,5 +1694,5 @@
     "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
     "Backup has an <validity>invalid</validity> signature from this session": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von dieser Sitzung",
     "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.",
-    "Discovery options will appear once you have added a phone number above.": "Erkennungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde."
+    "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde."
 }

From 212c970d9171038aa560e1fdcb6bf2144386e15f Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 7 Mar 2020 09:42:22 +0000
Subject: [PATCH 1431/3235] Translated using Weblate (German)

Currently translated at 77.5% (1659 of 2142 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 afd9773f25..1f3b295763 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1694,5 +1694,7 @@
     "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
     "Backup has an <validity>invalid</validity> signature from this session": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von dieser Sitzung",
     "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.",
-    "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde."
+    "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde.",
+    "Close preview": "Vorschau schließen",
+    "Loading room preview": "Raumvorschau laden"
 }

From f9f87defa4bfaf108e4f946c237d18881d9e0c25 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sat, 7 Mar 2020 12:36:24 -0600
Subject: [PATCH 1432/3235] Only show old room name if it exists

---
 src/TextForEvent.js         | 13 +++++++++----
 src/i18n/strings/en_EN.json |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 79083e351c..e897ec2911 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -127,11 +127,16 @@ function textForRoomNameEvent(ev) {
     if (!ev.getContent().name || ev.getContent().name.trim().length === 0) {
         return _t('%(senderDisplayName)s removed the room name.', {senderDisplayName});
     }
-    debugger;
-    return _t('%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.', {
+    if (ev.getPrevContent().name) {
+        return _t('%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.', {
+            senderDisplayName,
+            oldRoomName: ev.getPrevContent().name,
+            newRoomName: ev.getContent().name,
+        });
+    }
+    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {
         senderDisplayName,
-        oldRoomName: ev.getPrevContent().name,
-        newRoomName: ev.getContent().name,
+        roomName: ev.getContent().name,
     });
 }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8b4e9417bb..ca955afcc9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -229,6 +229,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",

From 84f7dc9660996640d9e197dd0016778daa0de036 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 7 Mar 2020 02:39:39 +0000
Subject: [PATCH 1433/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2142 of 2142 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 83458cfa37..db7559fbb4 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2179,5 +2179,8 @@
     "Show shortcuts to recently viewed rooms above the room list": "在聊天室清單上方顯示最近看過的聊天室的捷徑",
     "Displays information about a user": "顯示關於使用者的資訊",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "要回報與 Matrix 有關的安全性問題，請閱讀 Matrix.org <a>安全性揭露政策</a>。",
-    "Mark all as read": "全部標示為已讀"
+    "Mark all as read": "全部標示為已讀",
+    "Not currently indexing messages for any room.": "目前未為任何聊天室編寫索引。",
+    "Currently indexing: %(currentRoom)s.": "目前正在製作索引：%(currentRoom)s。",
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(doneRooms)s"
 }

From 7cf4b1238d6335c3411c936d0ed79b79a3f7c030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Sun, 8 Mar 2020 11:37:56 +0000
Subject: [PATCH 1434/3235] Translated using Weblate (Czech)

Currently translated at 99.9% (2141 of 2142 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index e5c4cea2ff..46675489b4 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2165,5 +2165,10 @@
     "This session, or the other session": "Tato relace, nebo jiná",
     "We recommend you change your password and recovery key in Settings immediately": "Doporučujeme vám si v nastavení okamžitě změnit své heslo a obnovovací klíče",
     "exists": "existuje",
-    "The internet connection either session is using": "Internetové připojení používané jednou z relací"
+    "The internet connection either session is using": "Internetové připojení používané jednou z relací",
+    "Displays information about a user": "Zobrazuje informace o uživateli",
+    "Mark all as read": "Označit vše jako přečtené",
+    "Not currently indexing messages for any room.": "Aktuálně neindexujeme žádné zprávy.",
+    "Currently indexing: %(currentRoom)s.": "Aktuálně indexujeme: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s"
 }

From 0e7428f44c1af308acb8f13b433f3e8db51f7477 Mon Sep 17 00:00:00 2001
From: Nathan Follens <nthn@sharklasers.com>
Date: Sat, 7 Mar 2020 23:30:14 +0000
Subject: [PATCH 1435/3235] Translated using Weblate (Dutch)

Currently translated at 100.0% (2142 of 2142 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index d4c8345392..300488b7df 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -2161,5 +2161,9 @@
     "Indexed messages:": "Geïndexeerde berichten:",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s van %(totalRooms)s",
     "Message downloading sleep time(ms)": "Wachttijd voor downloaden van berichten (ms)",
-    "Mark all as read": "Alles markeren als gelezen"
+    "Mark all as read": "Alles markeren als gelezen",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Bekijk eerst het <a>beveiligingsopenbaarmakingsbeleid</a> van Matrix.org als u een probleem met de beveiliging van Matrix wilt melden.",
+    "Not currently indexing messages for any room.": "Er worden momenteel voor geen enkel gesprek berichten geïndexeerd.",
+    "Currently indexing: %(currentRoom)s.": "Wordt geïndexeerd: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s"
 }

From b6a0921bff620f264649a5b7bb880b35f085436c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 7 Mar 2020 08:25:08 +0000
Subject: [PATCH 1436/3235] Translated using Weblate (French)

Currently translated at 100.0% (2142 of 2142 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5a97f54218..b432fbf573 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2180,5 +2180,8 @@
     "Show shortcuts to recently viewed rooms above the room list": "Afficher les raccourcis vers les salons vus récemment au-dessus de la liste des salons",
     "Displays information about a user": "Affiche des informations à propos de l’utilisateur",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pour signaler un problème de sécurité lié à Matrix, consultez <a>la politique de divulgation de sécurité</a> de Matrix.org.",
-    "Mark all as read": "Tout marquer comme lu"
+    "Mark all as read": "Tout marquer comme lu",
+    "Not currently indexing messages for any room.": "N’indexe aucun message en ce moment.",
+    "Currently indexing: %(currentRoom)s.": "En ce moment, indexe : %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s sur %(totalRooms)s"
 }

From 0cf5594b97bacce251759559c73a4aff71f4674b Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 7 Mar 2020 09:43:12 +0000
Subject: [PATCH 1437/3235] Translated using Weblate (German)

Currently translated at 78.2% (1674 of 2142 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1f3b295763..4c47252cb4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1696,5 +1696,11 @@
     "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.",
     "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde.",
     "Close preview": "Vorschau schließen",
-    "Loading room preview": "Raumvorschau laden"
+    "Loading room preview": "Lade Raumvorschau",
+    "Join the discussion": "Trete der Diskussion bei",
+    "Remove for everyone": "Für alle entfernen",
+    "Remove for me": "Für mich entfernen",
+    "Create your Matrix account on <underlinedServerName />": "Erstelle dein Matrix-Konto auf <underlinedServerName />",
+    "Preview": "Vorschau",
+    "Your Matrix account on <underlinedServerName />": "Dein Matrix-Konto auf <underlinedServerName />"
 }

From 291e5152e84bec4f1c85a9aeab59311917883d95 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 7 Mar 2020 09:43:48 +0000
Subject: [PATCH 1438/3235] Translated using Weblate (German)

Currently translated at 78.2% (1674 of 2142 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4c47252cb4..c2f20305d6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1702,5 +1702,14 @@
     "Remove for me": "Für mich entfernen",
     "Create your Matrix account on <underlinedServerName />": "Erstelle dein Matrix-Konto auf <underlinedServerName />",
     "Preview": "Vorschau",
-    "Your Matrix account on <underlinedServerName />": "Dein Matrix-Konto auf <underlinedServerName />"
+    "Your Matrix account on <underlinedServerName />": "Dein Matrix-Konto auf <underlinedServerName />",
+    "Remove %(email)s?": "%(email)s entfernen?",
+    "Remove %(phone)s?": "%(phone)s entfernen?",
+    "Remove recent messages by %(user)s": "Letzte Nachrichten von %(user)s entfernen",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du bist dabei eine Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
+    "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen",
+    "Remove %(count)s messages|one": "Eine Nachricht entfernen",
+    "Remove recent messages": "Letzte Nachrichten entfernen",
+    "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?"
 }

From 0c4aac91a4423ddda076a66f6da2ffe63c7f58b6 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 7 Mar 2020 09:24:51 +0000
Subject: [PATCH 1439/3235] Translated using Weblate (Turkish)

Currently translated at 77.0% (1650 of 2142 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index bcf7fbbc35..36f526d841 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1194,7 +1194,7 @@
     "Failed to revoke invite": "Davetin geri çekilmesi başarısız",
     "Revoke invite": "Davet geri çekildi",
     "Invited by %(sender)s": "%(sender)s tarafından davet",
-    "Error updating main address": "Ana adres güncellemede hata",
+    "Error updating main address": "Ana adresi güncellemede hata",
     "Error removing alias": "Lakap silmede hata",
     "Main address": "Ana adres",
     "Invalid community ID": "Geçersiz topluluk ID si",
@@ -1628,5 +1628,47 @@
     "Your password": "Parolanız",
     "This session, or the other session": "Bu oturum veya diğer oturum",
     "New session": "Yeni oturum",
-    "This wasn't me": "Bu ben değildim"
+    "This wasn't me": "Bu ben değildim",
+    "Sign In or Create Account": "Oturum Açın veya Hesap Oluşturun",
+    "Use your account or create a new one to continue.": "Hesabınızı kullanın veya devam etmek için yeni bir tane oluşturun.",
+    "Create Account": "Hesap Oluştur",
+    "Displays information about a user": "Bir kullanıcı hakkındaki bilgileri görüntüler",
+    "Add another word or two. Uncommon words are better.": "Bir iki kelime daha ekleyin. Yaygın olmayan kelimeler daha iyi olur.",
+    "Recent years are easy to guess": "Güncel yılların tahmini kolaydır",
+    "Show typing notifications": "Yazma bildirimlerini göster",
+    "Order rooms by name": "Odaları isme göre sırala",
+    "Show rooms with unread notifications first": "Okunmamış bildirimlere sahip odaları önce göster",
+    "Enable message search in encrypted rooms": "Şifrelenmiş odalardaki mesaj aramayı aktifleştir",
+    "Messages containing @room": "@room odasındaki mesajlar",
+    "Scan this unique code": "Bu eşsiz kodu tara",
+    "or": "veya",
+    "Cancelling…": "İptal ediliyor…",
+    "Lock": "Kilit",
+    "Pin": "Şifre",
+    "Your homeserver does not support cross-signing.": "Ana sunucunuz çapraz imzalamayı desteklemiyor.",
+    "exists": "mevcut",
+    "This session is backing up your keys. ": "Bu oturum anahtarlarınızı yedekliyor. ",
+    "Your keys are <b>not being backed up from this session</b>.": "Anahtarlarınız <b>bu oturum tarafından yedeklenmiyor</b>.",
+    "Enable audible notifications for this session": "Bu oturum için sesli bildirimleri aktifleştir",
+    "Change topic": "Başlığı değiştir",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Bir metin mesajı gönderildi: +%(msisdn)s. Lütfen içerdiği doğrulama kodunu girin.",
+    "You have verified this user. This user has verified all of their sessions.": "Bu kullanıcıyı doğruladınız. Bu kullanıcı tüm oturumlarını doğruladı.",
+    "This room is end-to-end encrypted": "Bu oda uçtan uça şifreli",
+    "Some sessions in this encrypted room are not trusted": "Şifrelenmiş bu odadaki bazı oturumlar güvenilir değil",
+    "All sessions in this encrypted room are trusted": "Bu odadaki tün oturumlar güvenilir",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "Diğer oturumlardan şifreleme anahtarlarını <requestLink>yeniden talep et</requestLink>.",
+    "Encrypted by an unverified session": "Doğrulanmamış bir oturum tarafından şifrelenmiş",
+    "Encrypted by a deleted session": "Silinen bir oturumla şifrelenmiş",
+    "Invite only": "Sadece davetliler",
+    "Strikethrough": "Üstü çizili",
+    "Recent rooms": "Güncel odalar",
+    "Reject & Ignore user": "Kullanıcı Reddet & Yoksay",
+    "%(count)s unread messages including mentions.|one": "1 okunmamış bahis.",
+    "Unread mentions.": "Okunmamış bahisler.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Davet geri çekilemiyor. Sunucu geçici bir problem yaşıyor olabilir yada daveti geri çekmek için gerekli izinlere sahip değilsin.",
+    "Mark all as read": "Tümünü okunmuş olarak işaretle",
+    "Incoming Verification Request": "Gelen Doğrulama İsteği",
+    "Use bots, bridges, widgets and sticker packs": "Botları, köprüleri, görsel bileşenleri ve çıkartma paketlerini kullan",
+    "Not sure of your password? <a>Set a new one</a>": "Şifrenizden emin değil misiniz? <a>Yenisini ayalarla</a>",
+    "Want more than a community? <a>Get your own server</a>": "Bir topluluktan fazlasınımı istiyorsunuz? <a>Kendi sunucunuzu edinin</a>"
 }

From 47b1552ccc502ac4da4027a806b43af82879fb83 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 9 Mar 2020 13:35:59 +0000
Subject: [PATCH 1440/3235] Fix secret sharing names to match spec

When sharing keys, we should use `m.cross_signing` prefix.

Part of https://github.com/vector-im/riot-web/issues/12661
---
 src/CrossSigningManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 0cf2c9e2ac..2184eaf347 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -144,10 +144,10 @@ const onSecretRequested = async function({
     }
     const callbacks = client.getCrossSigningCacheCallbacks();
     if (!callbacks.getCrossSigningKeyCache) return;
-    if (name === "m.key.self_signing") {
+    if (name === "m.cross_signing.self_signing") {
         const key = await callbacks.getCrossSigningKeyCache("self_signing");
         return key && encodeBase64(key);
-    } else if (name === "m.key.user_signing") {
+    } else if (name === "m.cross_signing.user_signing") {
         const key = await callbacks.getCrossSigningKeyCache("user_signing");
         return key && encodeBase64(key);
     }

From 23774057736f07a314093921b0dc809008d520a2 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 9 Mar 2020 11:01:06 +0000
Subject: [PATCH 1441/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2142 of 2142 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 | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 26a95062fd..a90ca5a2b6 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2159,5 +2159,26 @@
     "Your homeserver does not support cross-signing.": "Il tuo homeserver non supporta la firma incrociata.",
     "Homeserver feature support:": "Funzioni supportate dall'homeserver:",
     "exists": "esiste",
-    "Verification Requests": "Richieste di verifica"
+    "Verification Requests": "Richieste di verifica",
+    "Sign In or Create Account": "Accedi o crea account",
+    "Use your account or create a new one to continue.": "Usa il tuo account o creane uno nuovo per continuare.",
+    "Create Account": "Crea account",
+    "Displays information about a user": "Mostra le informazioni di un utente",
+    "Order rooms by name": "Ordina stanze per nome",
+    "Show rooms with unread notifications first": "Mostra prima le stanze con notifiche non lette",
+    "Show shortcuts to recently viewed rooms above the room list": "Mostra scorciatoie per le stanze viste di recente sopra l'elenco stanze",
+    "Cancelling…": "Annullamento…",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Per segnalare un problema di sicurezza relativo a Matrix, leggi la <a>Politica di divulgazione della sicurezza</a> di Matrix.org .",
+    "Mark all as read": "Segna tutto come letto",
+    "Accepting…": "Accettazione…",
+    "Accepting …": "Accettazione …",
+    "Declining …": "Rifiuto …",
+    "Your account is not secure": "Il tuo account non è sicuro",
+    "Your password": "La tua password",
+    "This session, or the other session": "Questa o l'altra sessione",
+    "The internet connection either session is using": "La connessione internet di una sessione",
+    "We recommend you change your password and recovery key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di recupero nelle impostazioni",
+    "Not currently indexing messages for any room.": "Attualmente non si stanno indicizzando i messaggi di alcuna stanza.",
+    "Currently indexing: %(currentRoom)s.": "Attualmente si indicizzano: %(currentRoom)s.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s"
 }

From c425d7f02f3a0ff1db8bb394d643c56352f8c020 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 9 Mar 2020 15:24:55 +0000
Subject: [PATCH 1442/3235] Make Mjolnir stop more robust

Since Mjolnir is a shared instance, we need to be a bit more careful about
clearing internal state than we do for components. This clears watcher and
dispatcher refs in case `stop` is called multiple times (which can happen in
prod as well as tests).
---
 src/mjolnir/Mjolnir.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 0c99306278..5836ffd57a 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -65,14 +65,14 @@ export class Mjolnir {
     }
 
     stop() {
-        SettingsStore.unwatchSetting(this._mjolnirWatchRef);
+        if (this._mjolnirWatchRef) {
+            SettingsStore.unwatchSetting(this._mjolnirWatchRef);
+            this._mjolnirWatchRef = null;
+        }
 
-        try {
-            if (this._dispatcherRef) dis.unregister(this._dispatcherRef);
-        } catch (e) {
-            console.error(e);
-            // Only the tests cause problems with this particular block of code. We should
-            // never be here in production.
+        if (this._dispatcherRef) {
+            dis.unregister(this._dispatcherRef);
+            this._dispatcherRef = null;
         }
 
         if (!MatrixClientPeg.get()) return;

From ee9558cb0b548afd37330ed24b63c6eddf315096 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:26:43 +0100
Subject: [PATCH 1443/3235] change state from domainToAliases to local and alt
 aliases

---
 .../views/room_settings/AliasSettings.js      | 163 ++++++------------
 src/i18n/strings/en_EN.json                   |   2 +-
 2 files changed, 55 insertions(+), 110 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index a52fa09c87..79317d3d1b 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -87,91 +87,59 @@ export default class AliasSettings extends React.Component {
         super(props);
 
         const state = {
-            domainToAliases: {}, // { domain.com => [#alias1:domain.com, #alias2:domain.com] }
-            remoteDomains: [], // [ domain.com, foobar.com ]
-            canonicalAlias: null, // #canonical:domain.com
+            altAliases: [], // [ #alias:domain.tld, ... ]
+            localAliases: [], // [ #alias:my-hs.tld, ... ]
+            canonicalAlias: null, // #canonical:domain.tld
             updatingCanonicalAlias: false,
-            localAliasesLoading: true,
+            localAliasesLoading: false,
         };
 
         if (props.canonicalAliasEvent) {
-            state.canonicalAlias = props.canonicalAliasEvent.getContent().alias;
+            const content = props.canonicalAliasEvent.getContent();
+            const altAliases = content.alt_aliases;
+            if (Array.isArray(altAliases)) {
+                state.altAliases = altAliases.slice();
+            }
+            state.canonicalAlias = content.alias;
         }
 
         this.state = state;
     }
 
-    async componentWillMount() {
-        const cli = MatrixClientPeg.get();
+    componentDidMount() {
+        return this.loadLocalAliases();
+    }
+
+    async loadLocalAliases() {
+        this.setState({ localAliasesLoading: true });
         try {
+            const cli = MatrixClientPeg.get();
+            let localAliases = [];
             if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
                 const response = await cli.unstableGetLocalAliases(this.props.roomId);
-                const localAliases = response.aliases;
-                const localDomain = cli.getDomain();
-                const domainToAliases = Object.assign(
-                    {},
-                    // FIXME, any localhost alt_aliases will be ignored as they are overwritten by localAliases
-                    this.aliasesToDictionary(this._getAltAliases()),
-                    {[localDomain]: localAliases || []},
-                );
-                const remoteDomains = Object.keys(domainToAliases).filter((domain) => {
-                    return domain !== localDomain && domainToAliases[domain].length > 0;
-                });
-                this.setState({ domainToAliases, remoteDomains });
-            } else {
-                const state = {};
-                const localDomain = cli.getDomain();
-                state.domainToAliases = this.aliasEventsToDictionary(this.props.aliasEvents || []);
-                state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
-                    return domain !== localDomain && state.domainToAliases[domain].length > 0;
-                });
-                this.setState(state);
+                if (Array.isArray(response.aliases)) {
+                    localAliases = response.aliases;
+                }
             }
+            this.setState({ localAliases });
         } finally {
-            this.setState({localAliasesLoading: false});
+            this.setState({ localAliasesLoading: false });
         }
     }
 
-    aliasesToDictionary(aliases) {
-        return aliases.reduce((dict, alias) => {
-            const domain = alias.split(":")[1];
-            dict[domain] = dict[domain] || [];
-            dict[domain].push(alias);
-            return dict;
-        }, {});
-    }
-
-    aliasEventsToDictionary(aliasEvents) { // m.room.alias events
-        const dict = {};
-        aliasEvents.forEach((event) => {
-            dict[event.getStateKey()] = (
-                (event.getContent().aliases || []).slice() // shallow-copy
-            );
-        });
-        return dict;
-    }
-
-    _getAltAliases() {
-        if (this.props.canonicalAliasEvent) {
-            const altAliases = this.props.canonicalAliasEvent.getContent().alt_aliases;
-            if (Array.isArray(altAliases)) {
-                return altAliases;
-            }
-        }
-        return [];
-    }
-
     changeCanonicalAlias(alias) {
         if (!this.props.canSetCanonicalAlias) return;
 
+        const oldAlias = this.state.canonicalAlias;
         this.setState({
             canonicalAlias: alias,
             updatingCanonicalAlias: true,
         });
 
-        const eventContent = {};
-        const altAliases = this._getAltAliases();
-        if (altAliases) eventContent["alt_aliases"] = altAliases;
+        const eventContent = {
+            alt_aliases: this.state.altAliases,
+        };
+
         if (alias) eventContent["alias"] = alias;
 
         MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.canonical_alias",
@@ -184,6 +152,7 @@ export default class AliasSettings extends React.Component {
                     "or a temporary failure occurred.",
                 ),
             });
+            this.setState({canonicalAlias: oldAlias});
         }).finally(() => {
             this.setState({updatingCanonicalAlias: false});
         });
@@ -200,16 +169,10 @@ export default class AliasSettings extends React.Component {
         if (!alias.includes(':')) alias += ':' + localDomain;
 
         MatrixClientPeg.get().createAlias(alias, this.props.roomId).then(() => {
-            const localAliases = this.state.domainToAliases[localDomain] || [];
-            const domainAliases = Object.assign({}, this.state.domainToAliases);
-            domainAliases[localDomain] = [...localAliases, alias];
-
             this.setState({
-                domainToAliases: domainAliases,
-                // Reset the add field
-                newAlias: "",
+                localAliases: this.state.localAliases.concat(alias),
+                newAlias: null,
             });
-
             if (!this.state.canonicalAlias) {
                 this.changeCanonicalAlias(alias);
             }
@@ -226,18 +189,13 @@ export default class AliasSettings extends React.Component {
     };
 
     onLocalAliasDeleted = (index) => {
-        const localDomain = MatrixClientPeg.get().getDomain();
-
-        const alias = this.state.domainToAliases[localDomain][index];
-
+        const alias = this.state.localAliases[index];
         // TODO: In future, we should probably be making sure that the alias actually belongs
         // to this room. See https://github.com/vector-im/riot-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {
-            const localAliases = this.state.domainToAliases[localDomain].filter((a) => a !== alias);
-            const domainAliases = Object.assign({}, this.state.domainToAliases);
-            domainAliases[localDomain] = localAliases;
-
-            this.setState({domainToAliases: domainAliases});
+            const localAliases = this.state.localAliases.slice();
+            localAliases.splice(index);
+            this.setState({localAliases});
 
             if (this.state.canonicalAlias === alias) {
                 this.changeCanonicalAlias(null);
@@ -258,6 +216,15 @@ export default class AliasSettings extends React.Component {
         this.changeCanonicalAlias(event.target.value);
     };
 
+    _getAliases() {
+        return this.state.altAliases.concat(this._getLocalNonAltAliases());
+    }
+
+    _getLocalNonAltAliases() {
+        const {altAliases} = this.state;
+        return this.state.localAliases.filter(alias => !altAliases.includes(alias));
+    }
+
     render() {
         const localDomain = MatrixClientPeg.get().getDomain();
 
@@ -269,15 +236,13 @@ export default class AliasSettings extends React.Component {
                    element='select' id='canonicalAlias' label={_t('Main address')}>
                 <option value="" key="unset">{ _t('not specified') }</option>
                 {
-                    Object.keys(this.state.domainToAliases).map((domain, i) => {
-                        return this.state.domainToAliases[domain].map((alias, j) => {
-                            if (alias === this.state.canonicalAlias) found = true;
-                            return (
-                                <option value={alias} key={i + "_" + j}>
-                                    { alias }
-                                </option>
-                            );
-                        });
+                    this._getAliases().map((alias, i) => {
+                        if (alias === this.state.canonicalAlias) found = true;
+                        return (
+                            <option value={alias} key={i}>
+                                { alias }
+                            </option>
+                        );
                     })
                 }
                 {
@@ -289,53 +254,33 @@ export default class AliasSettings extends React.Component {
             </Field>
         );
 
-        let remoteAliasesSection;
-        if (this.state.remoteDomains.length) {
-            remoteAliasesSection = (
-                <div>
-                    <div>
-                        { _t("Remote addresses for this room:") }
-                    </div>
-                    <ul>
-                        { this.state.remoteDomains.map((domain, i) => {
-                            return this.state.domainToAliases[domain].map((alias, j) => {
-                                return <li key={i + "_" + j}>{alias}</li>;
-                            });
-                        }) }
-                    </ul>
-                </div>
-            );
-        }
-
         let localAliasesList;
         if (this.state.localAliasesLoading) {
             const Spinner = sdk.getComponent("elements.Spinner");
             localAliasesList = <Spinner />;
         } else {
-            localAliasesList = <EditableAliasesList
+            localAliasesList = (<EditableAliasesList
                 id="roomAliases"
                 className={"mx_RoomSettings_localAliases"}
-                items={this.state.domainToAliases[localDomain] || []}
+                items={this.state.localAliases}
                 newItem={this.state.newAlias}
                 onNewItemChanged={this.onNewAliasChanged}
                 canRemove={this.props.canSetAliases}
                 canEdit={this.props.canSetAliases}
                 onItemAdded={this.onLocalAliasAdded}
                 onItemRemoved={this.onLocalAliasDeleted}
-                itemsLabel={_t('Local addresses for this room:')}
                 noItemsLabel={_t('This room has no local addresses')}
                 placeholder={_t(
                     'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
                 )}
                 domain={localDomain}
-            />;
+            />);
         }
 
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
                 {localAliasesList}
-                {remoteAliasesSection}
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 01ba458a2f..ccf232d86d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1149,10 +1149,10 @@
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
     "Main address": "Main address",
     "not specified": "not specified",
-    "Remote addresses for this room:": "Remote addresses for this room:",
     "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)",
+    "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
     "Invalid community ID": "Invalid community ID",

From 38e99f3a68c3debfa56a732835346c40d631998a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:29:04 +0100
Subject: [PATCH 1444/3235] add editable list for alt aliases

---
 .../views/room_settings/AliasSettings.js      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 79317d3d1b..7c766e3e31 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -158,6 +158,38 @@ export default class AliasSettings extends React.Component {
         });
     }
 
+    changeAltAliases(altAliases) {
+        if (!this.props.canSetCanonicalAlias) return;
+
+        this.setState({
+            updatingCanonicalAlias: true,
+            altAliases,
+        });
+
+        const eventContent = {};
+
+        if (this.state.canonicalAlias) {
+            eventContent.alias = this.state.canonicalAlias;
+        }
+        if (altAliases) {
+            eventContent["alt_aliases"] = altAliases;
+        }
+
+        MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.canonical_alias",
+            eventContent, "").catch((err) => {
+            console.error(err);
+            Modal.createTrackedDialog('Error updating alternative addresses', '', ErrorDialog, {
+                title: _t("Error updating main address"),
+                description: _t(
+                    "There was an error updating the room's alternative addresses. It may not be allowed by the server " +
+                    "or a temporary failure occurred.",
+                ),
+            });
+        }).finally(() => {
+            this.setState({updatingCanonicalAlias: false});
+        });
+    }
+
     onNewAliasChanged = (value) => {
         this.setState({newAlias: value});
     };
@@ -216,6 +248,25 @@ export default class AliasSettings extends React.Component {
         this.changeCanonicalAlias(event.target.value);
     };
 
+    onNewAltAliasChanged = (value) => {
+        this.setState({newAltAlias: value});
+    }
+
+    onAltAliasAdded = (alias) => {
+        const altAliases = this.state.altAliases.slice();
+        if (!altAliases.some(a => a.trim() === alias.trim())) {
+            altAliases.push(alias.trim());
+            this.changeAltAliases(altAliases);
+            this.setState({newAltAlias: ""});
+        }
+    }
+
+    onAltAliasDeleted = (index) => {
+        const altAliases = this.state.altAliases.slice();
+        altAliases.splice(index, 1);
+        this.changeAltAliases(altAliases);
+    }
+
     _getAliases() {
         return this.state.altAliases.concat(this._getLocalNonAltAliases());
     }
@@ -281,6 +332,22 @@ export default class AliasSettings extends React.Component {
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
                 {localAliasesList}
+                <EditableAliasesList
+                    id="roomAltAliases"
+                    className={"mx_RoomSettings_altAliases"}
+                    items={this.state.altAliases}
+                    newItem={this.state.newAltAlias}
+                    onNewItemChanged={this.onNewAltAliasChanged}
+                    canRemove={this.props.canSetCanonicalAlias}
+                    canEdit={this.props.canSetCanonicalAlias}
+                    onItemAdded={this.onAltAliasAdded}
+                    onItemRemoved={this.onAltAliasDeleted}
+                    itemsLabel={_t('Alternative addresses for this room:')}
+                    noItemsLabel={_t('This room has no alternative addresses')}
+                    placeholder={_t(
+                        'New address (e.g. #foo:domain)',
+                    )}
+                />
             </div>
         );
     }

From eb539537f2d1bc75022a6d496f220fc8202b0e9b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:31:07 +0100
Subject: [PATCH 1445/3235] add recommendations for alt aliases

---
 src/components/views/elements/EditableItemList.js   | 3 ++-
 src/components/views/elements/Field.js              | 5 ++++-
 src/components/views/room_settings/AliasSettings.js | 6 ++++++
 src/i18n/strings/en_EN.json                         | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index c74fd6a4ee..3eb30c808c 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -123,7 +123,8 @@ export default class EditableItemList extends React.Component {
             <form onSubmit={this._onItemAdded} autoComplete="off"
                   noValidate={true} className="mx_EditableItemList_newItem">
                 <Field id={`mx_EditableItemList_new_${this.props.id}`} label={this.props.placeholder} type="text"
-                       autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged} />
+                       autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged}
+                       list={this.props.suggestionsListId} />
                 <AccessibleButton onClick={this._onItemAdded} kind="primary">
                     {_t("Add")}
                 </AccessibleButton>
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 7d5ccbb72d..8583c91a01 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -32,6 +32,8 @@ export default class Field extends React.PureComponent {
         element: PropTypes.oneOf(["input", "select", "textarea"]),
         // The field's type (when used as an <input>). Defaults to "text".
         type: PropTypes.string,
+        // id of a <datalist> element for suggestions
+        list: PropTypes.string,
         // The field's label string.
         label: PropTypes.string,
         // The field's placeholder string. Defaults to the label.
@@ -157,7 +159,7 @@ export default class Field extends React.PureComponent {
     render() {
         const {
             element, prefix, postfix, className, onValidate, children,
-            tooltipContent, flagInvalid, tooltipClassName, ...inputProps} = this.props;
+            tooltipContent, flagInvalid, tooltipClassName, list, ...inputProps} = this.props;
 
         const inputElement = element || "input";
 
@@ -169,6 +171,7 @@ export default class Field extends React.PureComponent {
         inputProps.onFocus = this.onFocus;
         inputProps.onChange = this.onChange;
         inputProps.onBlur = this.onBlur;
+        inputProps.list = list;
 
         const fieldInput = React.createElement(inputElement, inputProps, children);
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 7c766e3e31..aa6e6069aa 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -332,6 +332,11 @@ export default class AliasSettings extends React.Component {
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
                 {localAliasesList}
+                <datalist id="mx_AliasSettings_altRecommendations">
+                    {this._getLocalNonAltAliases().map(alias => {
+                        return <option value={alias} key={alias} />;
+                    })};
+                </datalist>
                 <EditableAliasesList
                     id="roomAltAliases"
                     className={"mx_RoomSettings_altAliases"}
@@ -342,6 +347,7 @@ export default class AliasSettings extends React.Component {
                     canEdit={this.props.canSetCanonicalAlias}
                     onItemAdded={this.onAltAliasAdded}
                     onItemRemoved={this.onAltAliasDeleted}
+                    suggestionsListId="mx_AliasSettings_altRecommendations"
                     itemsLabel={_t('Alternative addresses for this room:')}
                     noItemsLabel={_t('This room has no alternative addresses')}
                     placeholder={_t(
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ccf232d86d..6174ec7b15 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1143,6 +1143,7 @@
     "Mark all as read": "Mark all as read",
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
     "Error creating alias": "Error creating alias",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
     "Error removing alias": "Error removing alias",
@@ -1152,6 +1153,8 @@
     "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)",
+    "Alternative addresses for this room:": "Alternative addresses for this room:",
+    "This room has no alternative addresses": "This room has no alternative addresses",
     "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",

From 08a31886a75c560a8edb41c6b5d1a436d5780e38 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:31:30 +0100
Subject: [PATCH 1446/3235] make domain postfix optional (not needed for alt
 aliases)

---
 src/components/views/room_settings/AliasSettings.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index aa6e6069aa..e7986cc1f5 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -46,6 +46,11 @@ class EditableAliasesList extends EditableItemList {
     };
 
     _renderNewItemField() {
+        // if we don't need the RoomAliasField,
+        // we don't need to overriden version of _renderNewItemField
+        if (!this.props.domain) {
+            return super._renderNewItemField();
+        }
         const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
         const onChange = (alias) => this._onNewItemChanged({target: {value: alias}});
         return (

From 7079d70f188e3f17a8acff647611022ce81bfd3b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:32:13 +0100
Subject: [PATCH 1447/3235] hide local aliases by default

---
 src/components/views/room_settings/AliasSettings.js | 5 ++++-
 src/i18n/strings/en_EN.json                         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index e7986cc1f5..d2a2c0e5f7 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -336,7 +336,6 @@ export default class AliasSettings extends React.Component {
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
-                {localAliasesList}
                 <datalist id="mx_AliasSettings_altRecommendations">
                     {this._getLocalNonAltAliases().map(alias => {
                         return <option value={alias} key={alias} />;
@@ -359,6 +358,10 @@ export default class AliasSettings extends React.Component {
                         'New address (e.g. #foo:domain)',
                     )}
                 />
+                <details>
+                    <summary>{_t('Local addresses (unmoderated content)')}</summary>
+                    {localAliasesList}
+                </details>
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6174ec7b15..4fa7df4c0f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1156,6 +1156,7 @@
     "Alternative addresses for this room:": "Alternative addresses for this room:",
     "This room has no alternative addresses": "This room has no alternative addresses",
     "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
+    "Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
     "Invalid community ID": "Invalid community ID",

From 053ba1110af9ebb1621add803f956913d72d98a4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:32:31 +0100
Subject: [PATCH 1448/3235] make pressing enter not reload riot when editable
 list is in form

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

diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 3eb30c808c..ae3473ef0d 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -125,7 +125,7 @@ export default class EditableItemList extends React.Component {
                 <Field id={`mx_EditableItemList_new_${this.props.id}`} label={this.props.placeholder} type="text"
                        autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged}
                        list={this.props.suggestionsListId} />
-                <AccessibleButton onClick={this._onItemAdded} kind="primary">
+                <AccessibleButton onClick={this._onItemAdded} kind="primary" type="submit">
                     {_t("Add")}
                 </AccessibleButton>
             </form>

From f7cb633e3d004b60695f1757126529672f157daf Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:43:52 +0100
Subject: [PATCH 1449/3235] only load local aliases on mount when you can edit
 the canonical alias

---
 .../views/room_settings/AliasSettings.js       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index d2a2c0e5f7..c6e4d1e3ba 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -112,7 +112,11 @@ export default class AliasSettings extends React.Component {
     }
 
     componentDidMount() {
-        return this.loadLocalAliases();
+        if (this.props.canSetCanonicalAlias) {
+            // load local aliases for providing recommendations
+            // for the canonical alias and alt_aliases
+            this.loadLocalAliases();
+        }
     }
 
     async loadLocalAliases() {
@@ -249,6 +253,16 @@ export default class AliasSettings extends React.Component {
         });
     };
 
+    onLocalAliasesToggled = (event) => {
+        // expanded
+        if (event.target.open) {
+            // if local aliases haven't been preloaded yet at component mount
+            if (!this.props.canSetCanonicalAlias && this.state.localAliases.length === 0) {
+                this.loadLocalAliases();
+            }
+        }
+    };
+
     onCanonicalAliasChange = (event) => {
         this.changeCanonicalAlias(event.target.value);
     };
@@ -358,7 +372,7 @@ export default class AliasSettings extends React.Component {
                         'New address (e.g. #foo:domain)',
                     )}
                 />
-                <details>
+                <details onToggle={this.onLocalAliasesToggled}>
                     <summary>{_t('Local addresses (unmoderated content)')}</summary>
                     {localAliasesList}
                 </details>

From dcbbf31f042c5a07e0ef74124a39c9810287e3ab Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:50:34 +0100
Subject: [PATCH 1450/3235] fix lint

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

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index c6e4d1e3ba..0a7bd1d333 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -190,8 +190,8 @@ export default class AliasSettings extends React.Component {
             Modal.createTrackedDialog('Error updating alternative addresses', '', ErrorDialog, {
                 title: _t("Error updating main address"),
                 description: _t(
-                    "There was an error updating the room's alternative addresses. It may not be allowed by the server " +
-                    "or a temporary failure occurred.",
+                    "There was an error updating the room's alternative addresses. " +
+                    "It may not be allowed by the server or a temporary failure occurred.",
                 ),
             });
         }).finally(() => {

From 8ee714f86dec46fd85c2f38522dc0599c6c6a635 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:50:48 +0100
Subject: [PATCH 1451/3235] show hand cursor over summary

---
 res/css/views/room_settings/_AliasSettings.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/css/views/room_settings/_AliasSettings.scss b/res/css/views/room_settings/_AliasSettings.scss
index d4ae58e5b0..294902a1f0 100644
--- a/res/css/views/room_settings/_AliasSettings.scss
+++ b/res/css/views/room_settings/_AliasSettings.scss
@@ -26,3 +26,7 @@ limitations under the License.
     outline: none;
     box-shadow: none;
 }
+
+.mx_AliasSettings summary {
+    cursor: pointer;
+}

From 9961f810f12fe11eb4bec46af16b240078d139be Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 16:54:00 +0100
Subject: [PATCH 1452/3235] update i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4fa7df4c0f..2d9fd74ad0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1150,7 +1150,6 @@
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
     "Main address": "Main address",
     "not specified": "not specified",
-    "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)",
     "Alternative addresses for this room:": "Alternative addresses for this room:",

From 5eaf03c3da11944b7636758f38f89d94024cecf0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 17:03:50 +0100
Subject: [PATCH 1453/3235] update e2e tests to expand local aliases when
 adding one

---
 test/end-to-end-tests/src/usecases/room-settings.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index f526312f8a..ab6d66ea6d 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -52,9 +52,11 @@ module.exports = async function changeRoomSettings(session, settings) {
 
     if (settings.alias) {
         session.log.step(`sets alias to ${settings.alias}`);
-        const aliasField = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings input[type=text]");
+        const summary = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings summary");
+        await summary.click();
+        const aliasField = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings details input[type=text]");
         await session.replaceInputText(aliasField, settings.alias.substring(1, settings.alias.lastIndexOf(":")));
-        const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings .mx_AccessibleButton");
+        const addButton = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings details .mx_AccessibleButton");
         await addButton.click();
         await session.delay(10); // delay to give time for the validator to run and check the alias
         session.log.done();

From bc34dfa60aae9a4e154114002309e8dde4c1b023 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 9 Mar 2020 14:12:41 +0000
Subject: [PATCH 1454/3235] Translated using Weblate (Esperanto)

Currently translated at 86.1% (1845 of 2142 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 | 57 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 1513e2dcd8..9767fb9156 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1815,5 +1815,60 @@
     "Verify other users in their profile.": "Kontrolu aliajn uzantojn en iliaj profiloj.",
     "Upgrade your encryption": "Gradaltigi vian ĉifradon",
     "Encryption upgraded": "Ĉifrado gradaltigita",
-    "Encryption setup complete": "Agordo de ĉifrado finita"
+    "Encryption setup complete": "Agordo de ĉifrado finita",
+    "The version of Riot": "La versio de Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ĉu vi uzas Rioton per aparato, kies ĉefa enigilo estas tuŝado",
+    "The information being sent to us to help make Riot better includes:": "La informoj sendataj al ni por plibonigi Rioton inkluzivas:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Nekonataj kunsidoj enas la ĉambron; se vi daŭrigos ne kontrolinte ilin, iu eble povos subaŭskulti vian vokon.",
+    "If you cancel now, you won't complete verifying the other user.": "Se vi nuligos nun, vi ne finos kontrolon de la alia uzanto.",
+    "If you cancel now, you won't complete verifying your other session.": "Se vi nuligos nun, vi ne finos kontrolon de via alia kunsido.",
+    "Cancel entering passphrase?": "Ĉu nuligi enigon de pasfrazo?",
+    "Setting up keys": "Agordo de klavoj",
+    "Verify this session": "Kontroli ĉi tiun kunsidon",
+    "Encryption upgrade available": "Ĝisdatigo de ĉifrado haveblas",
+    "Unverified session": "Nekontrolita kunsido",
+    "Sign In or Create Account": "Salutu aŭ kreu konton",
+    "Use your account or create a new one to continue.": "Por daŭrigi, uzu vian konton aŭ kreu novan.",
+    "Create Account": "Krei konton",
+    "Error upgrading room": "Eraris ĝisdatigo de la ĉambro",
+    "Double check that your server supports the room version chosen and try again.": "Bone kontrolu, ĉu via servilo subtenas la elektitan version de ĉambro, kaj reprovu.",
+    "Verifies a user, session, and pubkey tuple": "Kontrolas opon de uzanto, kunsido, kaj publika ŝlosilo.",
+    "Unknown (user, session) pair:": "Nekonata (uzanto, kunsido) duopo:",
+    "Session already verified!": "Kunsido jam estas kontrolita!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "AVERTO: Kunsido jam estas kontrolita, sed la ŝlosiloj NE AKORDAS!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: MALSUKCESIS KONTROLO DE ŜLOSILOJ! La subskriba ŝlosilo de %(userId)s kaj session %(deviceId)s estas «%(fprint)s», kiu ne akordas la donitan ŝlosilon «%(fingerprint)s». Tio povus signifi, ke via komunikado estas spionata!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la seanco %(deviceId)s de la uzanto %(userId)s. Kunsido estis markita kontrolita.",
+    "Displays information about a user": "Montras informojn pri uzanto",
+    "The message you are trying to send is too large.": "La mesaĝo, kiun vi provas sendi, estas tro granda.",
+    "Show typing notifications": "Montri sciigojn pri tajpado",
+    "Never send encrypted messages to unverified sessions from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj kunsidoj de ĉi tiu kunsido",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj kunsidoj en ĉi tiu ĉambro de ĉi tiu kunsido",
+    "Order rooms by name": "Ordigi ĉambrojn laŭ nomo",
+    "Show rooms with unread notifications first": "Montri ĉambrojn kun nelegitaj sciigoj unue",
+    "Show shortcuts to recently viewed rooms above the room list": "Montri tujirilojn al freŝe rigarditaj ĉambroj super la listo de ĉambroj",
+    "Enable message search in encrypted rooms": "Ŝalti serĉon de mesaĝoj en ĉifritaj ĉambroj",
+    "How fast should messages be downloaded.": "Kiel rapide elŝuti mesaĝojn.",
+    "Verify this session by completing one of the following:": "Kontrolu la kunsidon per plenumado de unu el la jenaj:",
+    "Scan this unique code": "Skanu ĉi tiun unikan kodon",
+    "or": "aŭ",
+    "Compare unique emoji": "Komparu unikajn bildsignojn",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Komparu unikan aron de bildsignoj se vi ne havas kameraon sur la alia aparato",
+    "Confirm the emoji below are displayed on both devices, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj estas montrataj sur ambaŭ aparatoj, samorde:",
+    "Verify this device by confirming the following number appears on its screen.": "Kontrolu ĉi tiun aparaton per kontrolo, ke la jena nombro aperas sur ĝia ekrano.",
+    "Waiting for %(displayName)s to verify…": "Atendas kontrolon de %(displayName)s…",
+    "Cancelling…": "Nuliganta…",
+    "They match": "Ili akordas",
+    "They don't match": "Ili ne akordas",
+    "To be secure, do this in person or use a trusted way to communicate.": "Por plia sekureco, faru tion persone, aŭ uzu alian fidatan komunikilon.",
+    "Verify yourself & others to keep your chats safe": "Kontrolu vin mem kaj aliajn por sekurigi viajn babilojn",
+    "Channel: %(channelName)s": "Kanalo: %(channelName)s",
+    "Show less": "Montri pli",
+    "Show more": "Montri malpli",
+    "Help": "Helpo",
+    "Message not sent due to unknown sessions being present": "Mesaĝo ne sendiĝis pro ĉeesto de nekonataj kunsidoj",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Montri kunsidojn</showSessionsText>, <sendAnywayText>tamen sendi</sendAnywayText> aŭ <cancelText>nuligi</cancelText>.",
+    "Complete security": "Plena sekureco",
+    "Verify this session to grant it access to encrypted messages.": "Kontrolu ĉi tiun kunsidon por doni al ĝi aliron al la ĉifritaj mesaĝoj.",
+    "Session verified": "Kunsido kontrolita",
+    "Copy": "Kopii"
 }

From 5d9f9db3fa78d05a6f79d4414950b4c516313dd5 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Mon, 9 Mar 2020 15:42:18 +0000
Subject: [PATCH 1455/3235] Translated using Weblate (Turkish)

Currently translated at 77.3% (1655 of 2142 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 36f526d841..bd25e66fbf 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1670,5 +1670,10 @@
     "Incoming Verification Request": "Gelen Doğrulama İsteği",
     "Use bots, bridges, widgets and sticker packs": "Botları, köprüleri, görsel bileşenleri ve çıkartma paketlerini kullan",
     "Not sure of your password? <a>Set a new one</a>": "Şifrenizden emin değil misiniz? <a>Yenisini ayalarla</a>",
-    "Want more than a community? <a>Get your own server</a>": "Bir topluluktan fazlasınımı istiyorsunuz? <a>Kendi sunucunuzu edinin</a>"
+    "Want more than a community? <a>Get your own server</a>": "Bir topluluktan fazlasınımı istiyorsunuz? <a>Kendi sunucunuzu edinin</a>",
+    "Explore rooms": "Odaları keşfet",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Oturumları gözat</showSessionsText>, <sendAnywayText>yinede gönder</sendAnywayText> yada <cancelText>iptal</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>Mesajı yeniden gönder</resendText> veya <cancelText> şimdi mesajı iptal et </cancelText>.",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Your new session is now verified. Other users will see it as trusted.": "Yeni oturumunuz şimdi doğrulandı. Diğer kullanıcılar güvenilir olarak görecek."
 }

From 650d3d0e2df93f837329ed4e1794a0a196b267ba Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 9 Mar 2020 16:17:25 +0000
Subject: [PATCH 1456/3235] Un-linkify version in settings

Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
---
 .../settings/tabs/user/HelpUserSettingsTab.js | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 8e7983970a..aca2f010b6 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -25,21 +25,6 @@ import Modal from "../../../../../Modal";
 import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";
 
-// Simple method to help prettify GH Release Tags and Commit Hashes.
-const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
-const ghVersionLabel = function(repo, token='') {
-    const match = token.match(semVerRegex);
-    let url;
-    if (match && match[1]) { // basic semVer string possibly with commit hash
-        url = (match.length > 1 && match[2])
-            ? `https://github.com/${repo}/commit/${match[2]}`
-            : `https://github.com/${repo}/releases/tag/v${match[1]}`;
-    } else {
-        url = `https://github.com/${repo}/commit/${token.split('-')[0]}`;
-    }
-    return <a target="_blank" rel="noreferrer noopener" href={url}>{ token }</a>;
-};
-
 export default class HelpUserSettingsTab extends React.Component {
     static propTypes = {
         closeSettingsFn: PropTypes.func.isRequired,
@@ -184,9 +169,7 @@ export default class HelpUserSettingsTab extends React.Component {
             );
         }
 
-        const vectorVersion = this.state.vectorVersion
-            ? ghVersionLabel('vector-im/riot-web', this.state.vectorVersion)
-            : 'unknown';
+        const vectorVersion = this.state.vectorVersion || 'unknown';
 
         let olmVersion = MatrixClientPeg.get().olmVersion;
         olmVersion = olmVersion ? `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}` : '<not-enabled>';

From 0d8b4ac194fcf5dbccd2884082208cb99a2b04d4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 18:23:32 +0100
Subject: [PATCH 1457/3235] remove timeline tiles for m.room.aliases events

---
 src/TextForEvent.js                     | 65 -------------------------
 src/components/views/rooms/EventTile.js |  2 -
 2 files changed, 67 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index d4003058c8..3d9f5fa900 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -269,70 +269,6 @@ function textForMessageEvent(ev) {
     return message;
 }
 
-function textForRoomAliasesEvent(ev) {
-    // An alternative implementation of this as a first-class event can be found at
-    // https://github.com/matrix-org/matrix-react-sdk/blob/dc7212ec2bd12e1917233ed7153b3e0ef529a135/src/components/views/messages/RoomAliasesEvent.js
-    // This feels a bit overkill though, and it's not clear the i18n really needs it
-    // so instead it's landing as a simple textual event.
-
-    const maxShown = 3;
-
-    const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    const oldAliases = ev.getPrevContent().aliases || [];
-    const newAliases = ev.getContent().aliases || [];
-
-    const addedAliases = newAliases.filter((x) => !oldAliases.includes(x));
-    const removedAliases = oldAliases.filter((x) => !newAliases.includes(x));
-
-    if (!addedAliases.length && !removedAliases.length) {
-        return '';
-    }
-
-    if (addedAliases.length && !removedAliases.length) {
-        if (addedAliases.length > maxShown) {
-            return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
-                senderName: senderName,
-                count: addedAliases.length - maxShown,
-                addedAddresses: addedAliases.slice(0, maxShown).join(', '),
-            });
-        }
-        return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
-            senderName: senderName,
-            count: addedAliases.length,
-            addedAddresses: addedAliases.join(', '),
-        });
-    } else if (!addedAliases.length && removedAliases.length) {
-        if (removedAliases.length > maxShown) {
-            return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
-                senderName: senderName,
-                count: removedAliases.length - maxShown,
-                removedAddresses: removedAliases.slice(0, maxShown).join(', '),
-            });
-        }
-        return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
-            senderName: senderName,
-            count: removedAliases.length,
-            removedAddresses: removedAliases.join(', '),
-        });
-    } else {
-        const combined = addedAliases.length + removedAliases.length;
-        if (combined > maxShown) {
-            return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
-                senderName: senderName,
-                countAdded: addedAliases.length,
-                countRemoved: removedAliases.length,
-            });
-        }
-        return _t(
-            '%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
-                senderName: senderName,
-                addedAddresses: addedAliases.join(', '),
-                removedAddresses: removedAliases.join(', '),
-            },
-        );
-    }
-}
-
 function textForCanonicalAliasEvent(ev) {
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAlias = ev.getPrevContent().alias;
@@ -612,7 +548,6 @@ const handlers = {
 };
 
 const stateHandlers = {
-    'm.room.aliases': textForRoomAliasesEvent,
     'm.room.canonical_alias': textForCanonicalAliasEvent,
     'm.room.name': textForRoomNameEvent,
     'm.room.topic': textForTopicEvent,
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f21f2e1ee9..cdbf725a5c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -48,8 +48,6 @@ const eventTileTypes = {
 
 const stateEventTileTypes = {
     'm.room.encryption': 'messages.EncryptionEvent',
-    'm.room.aliases': 'messages.TextualEvent',
-    // 'm.room.aliases': 'messages.RoomAliasesEvent', // too complex
     'm.room.canonical_alias': 'messages.TextualEvent',
     'm.room.create': 'messages.RoomCreate',
     'm.room.member': 'messages.TextualEvent',

From 378939bed7b92b554ea8c45646311ff12a040e88 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 9 Mar 2020 18:24:48 +0100
Subject: [PATCH 1458/3235] add timeline text descriptions for modifying
 alt_aliases

---
 src/TextForEvent.js         | 42 ++++++++++++++++++++++++++++++-------
 src/i18n/strings/en_EN.json | 14 ++++++-------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 3d9f5fa900..44bec5d925 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -272,15 +272,43 @@ function textForMessageEvent(ev) {
 function textForCanonicalAliasEvent(ev) {
     const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
     const oldAlias = ev.getPrevContent().alias;
+    const oldAltAliases = ev.getPrevContent().alt_aliases || [];
     const newAlias = ev.getContent().alias;
+    const newAltAliases = ev.getContent().alt_aliases || [];
+    const removedAltAliases = oldAltAliases.filter(alias => !newAltAliases.includes(alias));
+    const addedAltAliases = newAltAliases.filter(alias => !oldAltAliases.includes(alias));
 
-    if (newAlias) {
-        return _t('%(senderName)s set the main address for this room to %(address)s.', {
-            senderName: senderName,
-            address: ev.getContent().alias,
-        });
-    } else if (oldAlias) {
-        return _t('%(senderName)s removed the main address for this room.', {
+    if (!removedAltAliases.length && !addedAltAliases.length) {
+        if (newAlias) {
+            return _t('%(senderName)s set the main address for this room to %(address)s.', {
+                senderName: senderName,
+                address: ev.getContent().alias,
+            });
+        } else if (oldAlias) {
+            return _t('%(senderName)s removed the main address for this room.', {
+                senderName: senderName,
+            });
+        }
+    } else if (newAlias === oldAlias) {
+        if (addedAltAliases.length && !removedAltAliases.length) {
+            return _t('%(senderName)s added the alternative addresses %(addresses)s for this room.', {
+                senderName: senderName,
+                addresses: addedAltAliases.join(", "),
+                count: addedAltAliases.length,
+            });
+        } if (removedAltAliases.length && !addedAltAliases.length) {
+            return _t('%(senderName)s removed the alternative addresses %(addresses)s for this room.', {
+                senderName: senderName,
+                addresses: removedAltAliases.join(", "),
+                count: removedAltAliases.length,
+            });
+        } if (removedAltAliases.length && addedAltAliases.length) {
+            return _t('%(senderName)s changed the alternative addresses for this room.', {
+                senderName: senderName,
+            });
+        }
+    } else {
+        return _t('%(senderName)s changed the main and alternative addresses for this room.', {
             senderName: senderName,
         });
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 01ba458a2f..68be1a3e88 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -240,16 +240,14 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s added the alternative addresses %(addresses)s for this room.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s added alternative address %(addresses)s for this room.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s removed the alternative addresses %(addresses)s for this room.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s removed alternative address %(addresses)s for this room.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s changed the alternative addresses for this room.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s changed the main and alternative addresses for this room.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
     "%(senderName)s answered the call.": "%(senderName)s answered the call.",

From c541bc0705877fe00a6681afee1652dc90b690eb Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 9 Mar 2020 17:33:39 +0000
Subject: [PATCH 1459/3235] Fix mark as read button for dark theme

This changes the mark as read button to a mask image so that it can be themed
like other images.

Fixes https://github.com/vector-im/riot-web/issues/12640
---
 .../views/rooms/_TopUnreadMessagesBar.scss    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 5f6f869877..28eddf1fa2 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -51,7 +51,7 @@ limitations under the License.
     position: absolute;
     width: 38px;
     height: 38px;
-    mask: url('$(res)/img/icon-jump-to-first-unread.svg');
+    mask-image: url('$(res)/img/icon-jump-to-first-unread.svg');
     mask-repeat: no-repeat;
     mask-position: 9px 13px;
     background: $roomtile-name-color;
@@ -61,12 +61,20 @@ limitations under the License.
     display: block;
     width: 18px;
     height: 18px;
-    background-image: url('$(res)/img/cancel.svg');
-    background-position: center;
-    background-size: 10px;
-    background-repeat: no-repeat;
-    background-color: $primary-bg-color;
+    background: $primary-bg-color;
     border: 1.3px solid $roomtile-name-color;
-    border-radius: 99px;
+    border-radius: 10px;
     margin: 5px auto;
 }
+
+.mx_TopUnreadMessagesBar_markAsRead::before {
+    content: "";
+    position: absolute;
+    width: 18px;
+    height: 18px;
+    mask-image: url('$(res)/img/cancel.svg');
+    mask-repeat: no-repeat;
+    mask-size: 10px;
+    mask-position: 4px 4px;
+    background: $roomtile-name-color;
+}

From 4cdfda3c7d816fffe9126eede92184f924942cf4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 9 Mar 2020 17:05:13 -0600
Subject: [PATCH 1460/3235] Remove v1 identity server fallbacks

For https://github.com/vector-im/riot-web/issues/10443
---
 src/IdentityAuthClient.js | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index 72432b9a44..4a830d6506 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -181,24 +181,12 @@ export default class IdentityAuthClient {
     }
 
     async registerForToken(check=true) {
-        try {
-            const hsOpenIdToken = await MatrixClientPeg.get().getOpenIdToken();
-            // XXX: The spec is `token`, but we used `access_token` for a Sydent release.
-            const { access_token: accessToken, token } =
-                await this._matrixClient.registerWithIdentityServer(hsOpenIdToken);
-            const identityAccessToken = token ? token : accessToken;
-            if (check) await this._checkToken(identityAccessToken);
-            return identityAccessToken;
-        } catch (e) {
-            if (e.cors === "rejected" || e.httpStatus === 404) {
-                // Assume IS only supports deprecated v1 API for now
-                // TODO: Remove this path once v2 is only supported version
-                // See https://github.com/vector-im/riot-web/issues/10443
-                console.warn("IS doesn't support v2 auth");
-                this.authEnabled = false;
-                return;
-            }
-            throw e;
-        }
+        const hsOpenIdToken = await MatrixClientPeg.get().getOpenIdToken();
+        // XXX: The spec is `token`, but we used `access_token` for a Sydent release.
+        const { access_token: accessToken, token } =
+            await this._matrixClient.registerWithIdentityServer(hsOpenIdToken);
+        const identityAccessToken = token ? token : accessToken;
+        if (check) await this._checkToken(identityAccessToken);
+        return identityAccessToken;
     }
 }

From 3bff5c55cfa34d8ac6405664330c84f93ff674d8 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Tue, 10 Mar 2020 16:24:42 +0100
Subject: [PATCH 1461/3235] Remove extraneous tab stop from room tree view.

This was introduced some time ago when the room list became scrollable. Divs with overflow:scroll; become focusable for the keyboard in Firefox, but since we have keyboard handling for the whole compound widget, we don't need that tab stop on the tree view container div. Putting tabindex="-1" on it fixes it.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/rooms/RoomList.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ad67d8e308..0fe0ff3d8c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -778,6 +778,9 @@ export default createReactClass({
                     className="mx_RoomList"
                     role="tree"
                     aria-label={_t("Rooms")}
+                    // Firefox sometimes makes this element focusable due to
+                    // overflow:scroll;, so force it out of tab order.
+                    tabindex="-1"
                     onMouseMove={this.onMouseMove}
                     onMouseLeave={this.onMouseLeave}
                 >

From ddbfe4e1fadca5e74aaf82c106a04bab734b8a64 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 16:31:40 +0100
Subject: [PATCH 1462/3235] enable 4S if needed when trying to verify

---
 src/components/views/right_panel/UserInfo.js |  65 +-----------
 src/verification.js                          | 106 +++++++++++++++++++
 2 files changed, 109 insertions(+), 62 deletions(-)
 create mode 100644 src/verification.js

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 24c5489c4f..4219da690e 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -25,7 +25,7 @@ import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import createRoom, {findDMForUser} from '../../../createRoom';
+import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
@@ -43,6 +43,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
+import { verifyUser, legacyVerifyUser, verifyDevice } from '../../../verification';
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -153,66 +154,6 @@ function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
     }, [cli, member, canVerify], false);
 }
 
-async function verifyDevice(userId, device) {
-    const cli = MatrixClientPeg.get();
-    const member = cli.getUser(userId);
-    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-    Modal.createTrackedDialog("Verification warning", "unverified session", QuestionDialog, {
-        headerImage: require("../../../../res/img/e2e/warning.svg"),
-        title: _t("Not Trusted"),
-        description: <div>
-            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: member.displayName, userId})}</p>
-            <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
-        </div>,
-        onFinished: async (doneClicked) => {
-            const manuallyVerifyClicked = !doneClicked;
-            if (!manuallyVerifyClicked) {
-                return;
-            }
-            const cli = MatrixClientPeg.get();
-            const verificationRequestPromise = cli.requestVerification(
-                userId,
-                [device.deviceId],
-            );
-            dis.dispatch({
-                action: "set_right_panel_phase",
-                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {member, verificationRequestPromise},
-            });
-        },
-        primaryButton: _t("Done"),
-        cancelButton: _t("Manually Verify"),
-    });
-}
-
-async function legacyVerifyUser(member) {
-    const cli = MatrixClientPeg.get();
-    const verificationRequestPromise = cli.requestVerification(member.userId);
-    dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-        refireParams: {member, verificationRequestPromise},
-    });
-}
-
-function verifyUser(user) {
-    const cli = MatrixClientPeg.get();
-    const dmRoom = findDMForUser(cli, user.userId);
-    let existingRequest;
-    if (dmRoom) {
-        existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
-    }
-    dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-        refireParams: {
-            member: user,
-            verificationRequest: existingRequest,
-        },
-    });
-}
-
 function DeviceItem({userId, device}) {
     const cli = useContext(MatrixClientContext);
     const isMe = userId === cli.getUserId();
@@ -239,7 +180,7 @@ function DeviceItem({userId, device}) {
 
     const onDeviceClick = () => {
         if (!isVerified) {
-            verifyDevice(userId, device);
+            verifyDevice(cli.getUser(userId), device);
         }
     };
 
diff --git a/src/verification.js b/src/verification.js
new file mode 100644
index 0000000000..f110a9632a
--- /dev/null
+++ b/src/verification.js
@@ -0,0 +1,106 @@
+/*
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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 {MatrixClientPeg} from './MatrixClientPeg';
+import dis from "./dispatcher";
+import Modal from './Modal';
+import * as sdk from './index';
+import { _t } from './languageHandler';
+import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
+import {findDMForUser} from './createRoom';
+import {accessSecretStorage} from './CrossSigningManager';
+import SettingsStore from './settings/SettingsStore';
+
+async function enable4SIfNeeded() {
+    const cli = MatrixClientPeg.get();
+    if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        return false;
+    }
+    const masterPK = cli.getCrossSigningId();
+    if (!masterPK) {
+        await accessSecretStorage();
+        return false;
+    }
+
+    return true;
+}
+
+export async function verifyDevice(user, device) {
+    if (!await enable4SIfNeeded()) {
+        return;
+    }
+    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+    Modal.createTrackedDialog("Verification warning", "unverified session", QuestionDialog, {
+        headerImage: require("../res/img/e2e/warning.svg"),
+        title: _t("Not Trusted"),
+        description: <div>
+            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+            <p>{device.getDisplayName()} ({device.deviceId})</p>
+            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+        </div>,
+        onFinished: async (doneClicked) => {
+            const manuallyVerifyClicked = !doneClicked;
+            if (!manuallyVerifyClicked) {
+                return;
+            }
+            const cli = MatrixClientPeg.get();
+            const verificationRequestPromise = cli.requestVerification(
+                user.userId,
+                [device.deviceId],
+            );
+            dis.dispatch({
+                action: "set_right_panel_phase",
+                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                refireParams: {member: user, verificationRequestPromise},
+            });
+        },
+        primaryButton: _t("Done"),
+        cancelButton: _t("Manually Verify"),
+    });
+}
+
+export async function legacyVerifyUser(user) {
+    if (!await enable4SIfNeeded()) {
+        return;
+    }
+    const cli = MatrixClientPeg.get();
+    const verificationRequestPromise = cli.requestVerification(user.userId);
+    dis.dispatch({
+        action: "set_right_panel_phase",
+        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        refireParams: {member: user, verificationRequestPromise},
+    });
+}
+
+export async function verifyUser(user) {
+    if (!await enable4SIfNeeded()) {
+        return;
+    }
+    const cli = MatrixClientPeg.get();
+    const dmRoom = findDMForUser(cli, user.userId);
+    let existingRequest;
+    if (dmRoom) {
+        existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
+    }
+    dis.dispatch({
+        action: "set_right_panel_phase",
+        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        refireParams: {
+            member: user,
+            verificationRequest: existingRequest,
+        },
+    });
+}

From ab2e3a346599a4f092d43dc8d2de94954ac34f88 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 16:54:49 +0100
Subject: [PATCH 1463/3235] also enable 4s when accepting a verification
 request

---
 src/components/views/toasts/VerificationRequestToast.js | 4 ++++
 src/verification.js                                     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index c11cefc839..f590cecc3e 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -24,6 +24,7 @@ import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver
 import dis from "../../../dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
+import {enable4SIfNeeded} from "../../../verification";
 
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
@@ -73,6 +74,9 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     accept = async () => {
+        if (!await enable4SIfNeeded()) {
+            return;
+        }
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {request} = this.props;
         // no room id for to_device requests
diff --git a/src/verification.js b/src/verification.js
index f110a9632a..cdce9c6d32 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -24,7 +24,7 @@ import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
 
-async function enable4SIfNeeded() {
+export async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
     if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
         return false;

From e34a37102a73f49903d56fbc8c0acb9ff73c6137 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 16:56:20 +0100
Subject: [PATCH 1464/3235] move i18n strings around as script desires

---
 src/i18n/strings/en_EN.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 01ba458a2f..4e371cacb0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -293,6 +293,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "Light theme": "Light theme",
     "Dark theme": "Dark theme",
+    "Not Trusted": "Not Trusted",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
+    "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Done": "Done",
+    "Manually Verify": "Manually Verify",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
     "%(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 …",
@@ -1184,11 +1189,6 @@
     "Yours, or the other users’ session": "Yours, or the other users’ session",
     "Members": "Members",
     "Files": "Files",
-    "Not Trusted": "Not Trusted",
-    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
-    "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
-    "Done": "Done",
-    "Manually Verify": "Manually Verify",
     "Trusted": "Trusted",
     "Not trusted": "Not trusted",
     "%(count)s verified sessions|other": "%(count)s verified sessions",

From f33c930c418475fbe8f02c0fbc73a86f7100e3b2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 5 Mar 2020 17:24:51 -0700
Subject: [PATCH 1465/3235] Revert "Merge pull request #3892 from
 krkc/move-read-receipts-to-bottom"

This reverts commit 191abb5b0d9e642c69ea8a9cad44b05f59ce06f4.
---
 res/css/views/rooms/_EventTile.scss     | 17 ++++++++++++++++-
 src/components/views/rooms/EventTile.js |  6 +++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 09827fe3bb..d292c729dd 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -289,11 +289,17 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     display: inline-block;
     width: 14px;
     height: 14px;
-    top: -19px;
+    top: 29px;
     user-select: none;
     z-index: 1;
 }
 
+.mx_EventTile_continuation .mx_EventTile_readAvatars,
+.mx_EventTile_info .mx_EventTile_readAvatars,
+.mx_EventTile_emote .mx_EventTile_readAvatars {
+    top: 7px;
+}
+
 .mx_EventTile_readAvatars .mx_BaseAvatar {
     position: absolute;
     display: inline-block;
@@ -628,6 +634,15 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
         top: 27px;
     }
 
+    .mx_EventTile_continuation .mx_EventTile_readAvatars,
+    .mx_EventTile_emote .mx_EventTile_readAvatars {
+        top: 5px;
+    }
+
+    .mx_EventTile_info .mx_EventTile_readAvatars {
+        top: 4px;
+    }
+
     .mx_RoomView_MessageList h2 {
         margin-top: 6px;
     }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index cdbf725a5c..26c8a54f4e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -878,6 +878,9 @@ export default createReactClass({
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
                     <div className={classes} tabIndex={-1}>
+                        <div className="mx_EventTile_msgOption">
+                            { readAvatars }
+                        </div>
                         { sender }
                         <div className="mx_EventTile_line">
                             <a
@@ -901,9 +904,6 @@ export default createReactClass({
                             { reactionsRow }
                             { actionBar }
                         </div>
-                        <div className="mx_EventTile_msgOption">
-                            { readAvatars }
-                        </div>
                         {
                             // The avatar goes after the event tile as it's absolutely positioned to be over the
                             // event tile line, so needs to be later in the DOM so it appears on top (this avoids

From 84f6bf06ddf1dc2dafa921605ae21d11e8a96d76 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 10 Mar 2020 16:13:42 +0000
Subject: [PATCH 1466/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2133 of 2140 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 29a4aceec7..5a6f192809 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2171,5 +2171,11 @@
     "Mark all as read": "Vëru të tërave shenjë si të lexuara",
     "Not currently indexing messages for any room.": "Pa indeksuar aktualisht mesazhe nga ndonjë dhomë.",
     "Currently indexing: %(currentRoom)s.": "Aktualisht nën indeksim: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s nga %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s nga %(totalRooms)s",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s shtoi adresat alternative %(addresses)s për këtë dhomë.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s shtoi adresën alternative %(addresses)s për këtë dhomë.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hoqi adresat alternative %(addresses)s për këtë dhomë.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hoqi adresën alternative %(addresses)s për këtë dhomë.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ndryshoi adresat alternative për këtë dhomë.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ndryshoi adresat kryesore dhe alternative për këtë dhomë."
 }

From 1eb5bdf847f2c5badd014e865f71e297c20869d6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 18:40:24 +0100
Subject: [PATCH 1467/3235] use USK as we'll only have that around when using
 key sharing

---
 src/verification.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/verification.js b/src/verification.js
index cdce9c6d32..235828dc92 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -29,8 +29,8 @@ export async function enable4SIfNeeded() {
     if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
         return false;
     }
-    const masterPK = cli.getCrossSigningId();
-    if (!masterPK) {
+    const usk = cli.getCrossSigningId("user_signing");
+    if (!usk) {
         await accessSecretStorage();
         return false;
     }

From 5d7f2f96e74792abdb76439ca6146470992cf014 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 18:45:51 +0100
Subject: [PATCH 1468/3235] add fallback label for canonical alias events that
 dont change anything

---
 src/TextForEvent.js         | 6 ++++++
 src/i18n/strings/en_EN.json | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 44bec5d925..8757ff4ed6 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -308,10 +308,16 @@ function textForCanonicalAliasEvent(ev) {
             });
         }
     } else {
+        // both alias and alt_aliases where modified
         return _t('%(senderName)s changed the main and alternative addresses for this room.', {
             senderName: senderName,
         });
     }
+    // in case there is no difference between the two events,
+    // say something as we can't simply hide the tile from here
+    return _t('%(senderName)s changed the addresses for this room.', {
+        senderName: senderName,
+    });
 }
 
 function textForCallAnswerEvent(event) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 15a050d783..715ca082ad 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -248,6 +248,7 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s removed alternative address %(addresses)s for this room.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s changed the alternative addresses for this room.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s changed the main and alternative addresses for this room.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s changed the addresses for this room.",
     "Someone": "Someone",
     "(not supported by this browser)": "(not supported by this browser)",
     "%(senderName)s answered the call.": "%(senderName)s answered the call.",

From 91de7fd7b66f86215c43e8775689582f672b1ed9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Mar 2020 18:59:45 +0100
Subject: [PATCH 1469/3235] also allow passing a promise to a verif request to
 the verification dialog

---
 .../views/dialogs/NewSessionReviewDialog.js      |  7 ++++---
 .../views/dialogs/VerificationRequestDialog.js   | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 125811115f..2613dcc6e6 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -54,17 +54,18 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         });
     }
 
-    onContinueClick = async () => {
+    onContinueClick = () => {
         const { userId, device } = this.props;
         const cli = MatrixClientPeg.get();
-        const request = await cli.requestVerification(
+        const requestPromise = cli.requestVerification(
             userId,
             [device.deviceId],
         );
 
         this.props.onFinished(true);
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
-            verificationRequest: request,
+            verificationRequestPromise: requestPromise,
+            member: cli.getUser(userId),
         });
     }
 
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index abcf925f96..30bff80f03 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -22,7 +22,8 @@ import { _t } from '../../../languageHandler';
 
 export default class VerificationRequestDialog extends React.Component {
     static propTypes = {
-        verificationRequest: PropTypes.object.isRequired,
+        verificationRequest: PropTypes.object,
+        verificationRequestPromise: PropTypes.object,
         onFinished: PropTypes.func.isRequired,
     };
 
@@ -34,6 +35,8 @@ export default class VerificationRequestDialog extends React.Component {
     render() {
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
+        const member = this.props.member ||
+            MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId);
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"
                 title={_t("Verification Request")}
@@ -42,14 +45,19 @@ export default class VerificationRequestDialog extends React.Component {
             <EncryptionPanel
                 layout="dialog"
                 verificationRequest={this.props.verificationRequest}
+                verificationRequestPromise={this.props.verificationRequestPromise}
                 onClose={this.props.onFinished}
-                member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
+                member={member}
             />
         </BaseDialog>;
     }
 
-    onFinished() {
-        this.props.verificationRequest.cancel();
+    async onFinished() {
         this.props.onFinished();
+        let request = this.props.verificationRequest;
+        if (!request && this.props.verificationRequestPromise) {
+            request = await this.props.verificationRequestPromise;
+        }
+        request.cancel();
     }
 }

From 78ffb3ddf43d677a34302dec7f4d098cd64d9575 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Mar 2020 20:09:40 +0000
Subject: [PATCH 1470/3235] Don't remount main split children on rhs collapse

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MainSplit.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.js
index 772be358cf..7c66f21a04 100644
--- a/src/components/structures/MainSplit.js
+++ b/src/components/structures/MainSplit.js
@@ -93,14 +93,19 @@ export default class MainSplit extends React.Component {
         const bodyView = React.Children.only(this.props.children);
         const panelView = this.props.panel;
 
-        if (this.props.collapsedRhs || !panelView) {
-            return bodyView;
-        } else {
-            return <div className="mx_MainSplit" ref={this._setResizeContainerRef}>
-                { bodyView }
+        const hasResizer = !this.props.collapsedRhs && panelView;
+
+        let children;
+        if (hasResizer) {
+            children = <React.Fragment>
                 <ResizeHandle reverse={true} />
                 { panelView }
-            </div>;
+            </React.Fragment>;
         }
+
+        return <div className="mx_MainSplit" ref={hasResizer ? this._setResizeContainerRef : undefined}>
+            { bodyView }
+            { children }
+        </div>;
     }
 }

From 5c582037ceb6522c4f1344c693af6a6a7cda5041 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Mar 2020 23:11:48 +0000
Subject: [PATCH 1471/3235] Tweak padding to match Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RoomDirectory.scss     | 6 +++---
 src/components/structures/RoomDirectory.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index 5ae8df7176..241c921f20 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -46,8 +46,8 @@ limitations under the License.
 
 .mx_RoomDirectory_listheader {
     display: flex;
-    margin-top: 12px;
-    margin-bottom: 12px;
+    margin-top: 13px;
+    margin-bottom: 13px;
 }
 
 .mx_RoomDirectory_searchbox {
@@ -148,7 +148,7 @@ limitations under the License.
     padding: 0;
 }
 
-.mx_RoomDirectory p {
+.mx_RoomDirectory > span {
     font-size: 14px;
     margin-top: 0;
 
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index dd089a9776..3c3d67578e 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -628,7 +628,7 @@ export default createReactClass({
                 title={_t("Explore rooms")}
             >
                 <div className="mx_RoomDirectory">
-                    <p>{explanation}</p>
+                    {explanation}
                     <div className="mx_RoomDirectory_list">
                         {listHeader}
                         {content}

From 73980422e6f516c40b985516e447ad5c03226784 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 11 Mar 2020 06:09:25 +0000
Subject: [PATCH 1472/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2143 of 2143 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index db7559fbb4..eff96f88b5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2182,5 +2182,16 @@
     "Mark all as read": "全部標示為已讀",
     "Not currently indexing messages for any room.": "目前未為任何聊天室編寫索引。",
     "Currently indexing: %(currentRoom)s.": "目前正在製作索引：%(currentRoom)s。",
-    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(doneRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(doneRooms)s",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 為此聊天室新增了替代位置 %(addresses)s。",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 為此聊天室移除了替代位置 %(addresses)s。",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s 為此聊天是變更了替代位置。",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s 為此聊天是變更了主要及替代位置。",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "更新聊天室的替代位置時發生錯誤。伺服器可能不允許這麼做，或是昱到了暫時性的故障。",
+    "Alternative addresses for this room:": "此聊天是的替代位置：",
+    "This room has no alternative addresses": "此聊天室沒有替代位置",
+    "New address (e.g. #foo:domain)": "新位置（例如：#foo:domain）",
+    "Local addresses (unmoderated content)": "本機位置（未經審核的內容）"
 }

From 58d3ad515f500871bf5b48c303f176883ffb7ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 11 Mar 2020 08:36:26 +0000
Subject: [PATCH 1473/3235] Translated using Weblate (French)

Currently translated at 100.0% (2143 of 2143 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b432fbf573..d46bd45d0f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2183,5 +2183,16 @@
     "Mark all as read": "Tout marquer comme lu",
     "Not currently indexing messages for any room.": "N’indexe aucun message en ce moment.",
     "Currently indexing: %(currentRoom)s.": "En ce moment, indexe : %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s sur %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s sur %(totalRooms)s",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s a ajouté les adresses alternatives %(addresses)s pour ce salon.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s a ajouté l’adresse alternative %(addresses)s pour ce salon.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s a supprimé les adresses alternatives %(addresses)s pour ce salon.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s a supprimé l’adresse alternative %(addresses)s pour ce salon.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s a modifié les adresses alternatives de ce salon.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s a modifié l’adresse principale et les adresses alternatives pour ce salon.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la mise à jour des adresses alternatives du salon. Ce n’est peut-être pas permis par le serveur ou une défaillance temporaire est survenue.",
+    "Alternative addresses for this room:": "Adresses alternatives pour ce salon :",
+    "This room has no alternative addresses": "Ce salon n’a pas d’adresse alternative",
+    "New address (e.g. #foo:domain)": "Nouvelle adresse (par ex. #foo:domaine)",
+    "Local addresses (unmoderated content)": "Adresses locales (contenu non modéré)"
 }

From 8e647e539fe3e08747a5d3019fc8670a9643af17 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 10 Mar 2020 18:37:12 +0000
Subject: [PATCH 1474/3235] Translated using Weblate (Turkish)

Currently translated at 78.3% (1678 of 2143 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index bd25e66fbf..84cb229a46 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1675,5 +1675,30 @@
     "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Oturumları gözat</showSessionsText>, <sendAnywayText>yinede gönder</sendAnywayText> yada <cancelText>iptal</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>Mesajı yeniden gönder</resendText> veya <cancelText> şimdi mesajı iptal et </cancelText>.",
     " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Your new session is now verified. Other users will see it as trusted.": "Yeni oturumunuz şimdi doğrulandı. Diğer kullanıcılar güvenilir olarak görecek."
+    "Your new session is now verified. Other users will see it as trusted.": "Yeni oturumunuz şimdi doğrulandı. Diğer kullanıcılar güvenilir olarak görecek.",
+    "Invalid base_url for m.homeserver": "m.anasunucu için geçersiz base_url",
+    "Invalid base_url for m.identity_server": "m.kimlik_sunucu için geçersiz base_url",
+    "Identity server URL does not appear to be a valid identity server": "Kimlik sunucu adresi geçerli bir kimlik sunucu adresi gibi gözükmüyor",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Lütfen %(hs)s sunucusuna oturum açtığınızın farkında olun. Bu sunucu matrix.org değil.",
+    "Registration has been disabled on this homeserver.": "Bu anasunucuda kayıt işlemleri kapatılmış.",
+    "You can now close this window or <a>log in</a> to your new account.": "Şimdi bu pencereyi kapatabilirsin yada yeni hesabına <a>oturum aç</a>.",
+    "Enter your password to sign in and regain access to your account.": "Oturum açmak için şifreni gir ve hesabına yeniden erişimi sağla.",
+    "Enter your account password to confirm the upgrade:": "Güncellemeyi başlatmak için hesap şifreni gir:",
+    "Restore": "Geri yükle",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Güncellemeyi teyit etmek için sunucuda oturum açmaya ihtiyacınız var.",
+    "Great! This passphrase looks strong enough.": "Harika! Bu parola yeterince güçlü gözüküyor.",
+    "Enter a passphrase": "Bir parola girin",
+    "Back up my encryption keys, securing them with the same passphrase": "Şifreleme anahtarlarımı aynı parola ile güvenli hale getirerek yedekle",
+    "Enter your passphrase a second time to confirm it.": "Parolanızı ikinci kez girerek teyit edin.",
+    "Confirm your passphrase": "Parolanızı teyit edin",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Kurtarma anahtarı <b>İndirilenler</b> klasörünüzde.",
+    "Unable to set up secret storage": "Sır deposu ayarlanamıyor",
+    "For maximum security, this should be different from your account password.": "En üst düzey güvenlik için, bu şifre hesap şifrenizden farklı olmalı.",
+    "Enter a passphrase...": "Bir parola girin...",
+    "Please enter your passphrase a second time to confirm.": "Lütfen parolanızı ikinci kez girerek teyit edin.",
+    "Repeat your passphrase...": "Parolanızı tekrarlayın...",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Anahtarlarınız yedekleniyor (ilk yedek bir kaç dakika sürebilir).",
+    "Secure your backup with a passphrase": "Yedeğinizi bir parola ile koruyun",
+    "If you don't want to set this up now, you can later in Settings.": "Şimdi ayarlamak istemiyorsanız daha sonra Ayarlar menüsünden yapabilirsiniz.",
+    "Set up": "Ayarla"
 }

From 13a4f4190f16303f9e3c935297f400e405ea0164 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 11 Mar 2020 10:11:54 +0100
Subject: [PATCH 1475/3235] Revert "also enable 4s when accepting a
 verification request"

This reverts commit ab2e3a346599a4f092d43dc8d2de94954ac34f88.
---
 src/components/views/toasts/VerificationRequestToast.js | 4 ----
 src/verification.js                                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index f590cecc3e..c11cefc839 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -24,7 +24,6 @@ import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver
 import dis from "../../../dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
-import {enable4SIfNeeded} from "../../../verification";
 
 export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
@@ -74,9 +73,6 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     accept = async () => {
-        if (!await enable4SIfNeeded()) {
-            return;
-        }
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
         const {request} = this.props;
         // no room id for to_device requests
diff --git a/src/verification.js b/src/verification.js
index 235828dc92..6f1bb07344 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -24,7 +24,7 @@ import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
 
-export async function enable4SIfNeeded() {
+async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
     if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
         return false;

From 3baaaaab079257eed7ea8edf9faf4f77b8fc8d09 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 11 Mar 2020 12:03:16 +0100
Subject: [PATCH 1476/3235] use splice correctly after removing a local alias

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

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 0a7bd1d333..1d6b29c3ce 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -235,7 +235,7 @@ export default class AliasSettings extends React.Component {
         // to this room. See https://github.com/vector-im/riot-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {
             const localAliases = this.state.localAliases.slice();
-            localAliases.splice(index);
+            localAliases.splice(index, 1);
             this.setState({localAliases});
 
             if (this.state.canonicalAlias === alias) {

From cccf7cd07ff585f974c805aeab7f1a94cd85e86d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 11 Mar 2020 12:13:28 +0100
Subject: [PATCH 1477/3235] specific error for lack of permissions when trying
 to delete an alias

---
 .../views/room_settings/AliasSettings.js           | 14 ++++++++++----
 src/i18n/strings/en_EN.json                        |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 1d6b29c3ce..eab41c5ccd 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -243,12 +243,18 @@ export default class AliasSettings extends React.Component {
             }
         }).catch((err) => {
             console.error(err);
-            Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
-                title: _t("Error removing alias"),
-                description: _t(
+            let description;
+            if (err.errcode === "M_FORBIDDEN") {
+                description = _t("You don't have permission to delete the alias.");
+            } else {
+                description = _t(
                     "There was an error removing that alias. It may no longer exist or a temporary " +
                     "error occurred.",
-                ),
+                );
+            }
+            Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
+                title: _t("Error removing alias"),
+                description,
             });
         });
     };
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 10ae7fb455..d0e01917f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1150,8 +1150,9 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
     "Error creating alias": "Error creating alias",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "Error removing alias": "Error removing alias",
+    "You don't have permission to delete the alias.": "You don't have permission to delete the alias.",
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
+    "Error removing alias": "Error removing alias",
     "Main address": "Main address",
     "not specified": "not specified",
     "This room has no local addresses": "This room has no local addresses",

From 80e7cbf2e1ee44c3f405b8f5f3f5608501aa96e8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Mar 2020 14:30:10 +0000
Subject: [PATCH 1478/3235] Translated using Weblate (Russian)

Currently translated at 83.2% (1783 of 2144 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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 298025ea6a..c79be28838 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1044,8 +1044,8 @@
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут залогиниться</b>.",
     "Join": "Присоединиться",
     "That doesn't look like a valid email address": "Это не похоже на адрес электронной почты",
-    "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.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Пожалуйста, <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.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использование сервиса.",
+    "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>, чтобы продолжить использование службы.",
     "User %(user_id)s does not exist": "Пользователя %(user_id)s не существует",
     "Enable Community Filter Panel": "Включить панель сообществ",
     "Prompt before sending invites to potentially invalid matrix IDs": "Подтверждать отправку приглашений на потенциально недействительные matrix ID",
@@ -1194,7 +1194,7 @@
     "Scissors": "Ножницы",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Общение с этим пользователем зашифровано сквозным шифрованием и недоступно третьим лицам.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Мы отправили вам сообщение для подтверждения адреса электронной почты. Пожалуйста выполните указания данные в сообщении и нажмите кнопку внизу.",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? You will lose your encrypted messages if your keys are not backed up properly.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? Зашифрованные сообщения будут безвозвратно утеряны при отсутствии соответствующего резервного копирования ваших ключей.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифрованные сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
     "Unable to load key backup status": "Не удалось получить статус резервного копирования для ключей шифрования",
     "Restore from Backup": "Восстановить из резервной копии",
@@ -1481,9 +1481,9 @@
     "Unexpected error resolving identity server configuration": "Неопределённая ошибка при разборе параметра сервера идентификации",
     "Use lowercase letters, numbers, dashes and underscores only": "Используйте только строчные буквы, цифры, тире и подчеркивания",
     "Cannot reach identity server": "Не удаётся связаться с сервером идентификации",
-    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
-    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
-    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете зарегистрироваться, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
+    "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете сбросить пароль, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
+    "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете войти в систему, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
     "<a>Log in</a> to your new account.": "<a>Войти</a> в вашу новую учётную запись.",
     "You can now close this window or <a>log in</a> to your new account.": "Вы можете закрыть это окно или <a>войти</a> в вашу новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
@@ -1661,8 +1661,8 @@
     "This client does not support end-to-end encryption.": "Этот клиент не поддерживает сквозное шифрование.",
     "Messages in this room are not end-to-end encrypted.": "Сообщения в этой комнате не шифруются сквозным шифрованием.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Пожалуйста, <newIssueLink> создайте новую проблему/вопрос </newIssueLink> на GitHub, чтобы мы могли расследовать эту ошибку.",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте сервер идентификации что бы пригласить по электронной почте <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте сервер идентификации что бы пригласить по электронной почте Manage in <settings>Settings</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default> Используйте значение по умолчанию (%(defaultIdentityServerName)s) </default> или  управляйте в <settings> Настройках</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в <settings>Настройки</settings>.",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",

From e373dbd616aba62b9c7f082085cd16eae9f7710c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 11 Mar 2020 15:52:48 +0100
Subject: [PATCH 1479/3235] use new legacy verif method for a single device

---
 src/verification.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/verification.js b/src/verification.js
index 6f1bb07344..4443079b95 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -23,6 +23,7 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
+import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
@@ -57,9 +58,10 @@ export async function verifyDevice(user, device) {
                 return;
             }
             const cli = MatrixClientPeg.get();
-            const verificationRequestPromise = cli.requestVerification(
+            const verificationRequestPromise = cli.legacyDeviceVerification(
                 user.userId,
-                [device.deviceId],
+                device.deviceId,
+                verificationMethods.SAS,
             );
             dis.dispatch({
                 action: "set_right_panel_phase",
@@ -77,7 +79,7 @@ export async function legacyVerifyUser(user) {
         return;
     }
     const cli = MatrixClientPeg.get();
-    const verificationRequestPromise = cli.requestVerification(user.userId);
+    const verificationRequestPromise = cli.beginKeyVerification(user.userId);
     dis.dispatch({
         action: "set_right_panel_phase",
         phase: RIGHT_PANEL_PHASES.EncryptionPanel,

From 6b4d3cad7cb329900841e63319dfee7fa72bf271 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Mar 2020 14:54:03 +0000
Subject: [PATCH 1480/3235] yarn upgrade

---
 yarn.lock | 695 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 449 insertions(+), 246 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 20580f26f9..5e4fa6b5a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,27 +25,27 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.4":
-  version "7.8.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz#d28ce872778c23551cbb9432fc68d28495b613b9"
-  integrity sha512-jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg==
+"@babel/compat-data@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35"
+  integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==
   dependencies:
     browserslist "^4.8.5"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
-  integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
+  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
+    "@babel/generator" "^7.8.7"
     "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.4"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.8.7"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -55,12 +55,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
-  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.7.tgz#870b3cf7984f5297998152af625c4f3e341400f7"
+  integrity sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.8.7"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -88,43 +88,44 @@
     "@babel/types" "^7.8.3"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-call-delegate@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab"
+  integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
     "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.8.7"
 
-"@babel/helper-compilation-targets@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz#03d7ecd454b7ebe19a254f76617e61770aed2c88"
-  integrity sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
-    "@babel/compat-data" "^7.8.4"
-    browserslist "^4.8.5"
+    "@babel/compat-data" "^7.8.6"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz#5b94be88c255f140fd2c10dd151e7f98f4bff397"
-  integrity sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0"
+  integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==
   dependencies:
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
 
 "@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
-  integrity sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz#7fa040c97fb8aebe1247a5c645330c32d083066b"
+  integrity sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==
   dependencies:
+    "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.6.0"
 
@@ -183,15 +184,16 @@
     "@babel/types" "^7.8.3"
 
 "@babel/helper-module-transforms@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz#d305e35d02bee720fbc2c3c3623aa0c316c01590"
-  integrity sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz#6a13b5eecadc35692047073a64e42977b97654a4"
+  integrity sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-simple-access" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.8.6"
     lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
@@ -224,15 +226,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
-  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
+  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.6"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -277,10 +279,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
-  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.7.tgz#7b8facf95d25fef9534aad51c4ffecde1a61e26a"
+  integrity sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -509,17 +511,17 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz#46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"
-  integrity sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==
+"@babel/plugin-transform-classes@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d"
+  integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
@@ -577,10 +579,10 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz#6fe8eae5d6875086ee185dd0b098a8513783b47d"
-  integrity sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==
+"@babel/plugin-transform-for-of@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085"
+  integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -665,12 +667,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3"
-  integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==
+"@babel/plugin-transform-parameters@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395"
+  integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
+    "@babel/helper-call-delegate" "^7.8.7"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -713,12 +715,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -775,9 +777,9 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz#be6f01a7ef423be68e65ace1f04fc407e6d88917"
-  integrity sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz#48bccff331108a7b3a28c3a4adc89e036dc3efda"
+  integrity sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -792,12 +794,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/preset-env@^7.7.6":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz#9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"
-  integrity sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
+  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
   dependencies:
-    "@babel/compat-data" "^7.8.4"
-    "@babel/helper-compilation-targets" "^7.8.4"
+    "@babel/compat-data" "^7.8.6"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
@@ -820,13 +822,13 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.8.6"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
     "@babel/plugin-transform-destructuring" "^7.8.3"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.4"
+    "@babel/plugin-transform-for-of" "^7.8.6"
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
@@ -837,9 +839,9 @@
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.4"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
@@ -847,7 +849,7 @@
     "@babel/plugin-transform-template-literals" "^7.8.3"
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.8.7"
     browserslist "^4.8.5"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -882,9 +884,9 @@
     "@babel/plugin-transform-typescript" "^7.8.3"
 
 "@babel/register@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.3.tgz#5d5d30cfcc918437535d724b8ac1e4a60c5db1f8"
-  integrity sha512-t7UqebaWwo9nXWClIPLPloa5pN33A2leVs8Hf0e9g9YwUP8/H9NeR7DJU+4CXo23QtjChQv5a3DjEtT83ih1rg==
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.6.tgz#a1066aa6168a73a70c35ef28cc5865ccc087ea69"
+  integrity sha512-7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -892,41 +894,49 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
-  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+"@babel/runtime-corejs3@^7.8.3":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c"
+  integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    core-js-pure "^3.0.0"
+    regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.4.0", "@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
+  integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
-  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
+  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
+    "@babel/generator" "^7.8.6"
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
+  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
@@ -1109,7 +1119,7 @@
     asn1js "^2.0.22"
     tslib "^1.9.3"
 
-"@peculiar/json-schema@^1.1.6":
+"@peculiar/json-schema@^1.1.9":
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.9.tgz#b746e046b787607a1b2804f64437fda2527b3e62"
   integrity sha512-F2ST2y/IQPgY+1QMw1Q33sqJbGDCeO3lGqI69SL3Hgo0++7iHqprUB1QyxB/A7bN3tuM65MBxoM2JLbwh42lsQ==
@@ -1117,15 +1127,15 @@
     tslib "^1.10.0"
 
 "@peculiar/webcrypto@^1.0.22":
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.22.tgz#9dae652fce6bacd9df15bc91965797cee33adf67"
-  integrity sha512-NP6H6ZGXUvJnQJCWzUgnRcQv+9nMCNwLUDhTwOxRUwPFvtHauMOl0oPTKUjbhInCMaE55gJqB4yc0YKbde6Exw==
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.23.tgz#5519b839fba2cf8603bbbd6764dc41b108093dad"
+  integrity sha512-Ssb4xpQI3BJ0itAtT9y9jyeeiWNjcFvP6Wt/ehITxRYrEnlSfnrP7Ytc7BwN8XtnKmXDS2cWvppPldw5QsFCcw==
   dependencies:
     "@peculiar/asn1-schema" "^1.0.3"
-    "@peculiar/json-schema" "^1.1.6"
+    "@peculiar/json-schema" "^1.1.9"
     asn1js "^2.0.26"
     pvtsutils "^1.0.9"
-    tslib "^1.10.0"
+    tslib "^1.11.1"
     webcrypto-core "^1.0.17"
 
 "@sinonjs/commons@^1.7.0":
@@ -1213,9 +1223,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "13.7.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.6.tgz#cb734a7c191472ae6a2b3a502b4dfffcea974113"
-  integrity sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA==
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
+  integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==
 
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
@@ -1256,18 +1266,18 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz#71de390a3ec00b280b69138d80733406e6e86bfa"
-  integrity sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA==
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242"
+  integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.21.0"
+    "@typescript-eslint/typescript-estree" "2.23.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/typescript-estree@2.21.0":
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz#7e4be29f2e338195a2e8c818949ed0ff727cc943"
-  integrity sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw==
+"@typescript-eslint/typescript-estree@2.23.0":
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36"
+  integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -1438,6 +1448,11 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1457,14 +1472,14 @@ acorn-walk@^6.0.1:
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
-  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
@@ -1571,11 +1586,19 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1951,10 +1974,10 @@ browser-encrypt-attachment@^0.3.0:
   resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
   integrity sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw=
 
-browser-process-hrtime@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
-  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browser-request@^0.3.3:
   version "0.3.3"
@@ -2027,14 +2050,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.8.3, browserslist@^4.8.5:
-  version "4.8.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
-  integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
+browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
+  integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
   dependencies:
-    caniuse-lite "^1.0.30001027"
-    electron-to-chromium "^1.3.349"
-    node-releases "^1.1.49"
+    caniuse-lite "^1.0.30001030"
+    electron-to-chromium "^1.3.363"
+    node-releases "^1.1.50"
 
 bs58@^4.0.1:
   version "4.0.1"
@@ -2088,9 +2111,9 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115"
-  integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce"
+  integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -2189,10 +2212,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001027:
-  version "1.0.30001030"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz#78076c4c6d67d3e41d6eb9399853fb27fe6e44ee"
-  integrity sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==
+caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030:
+  version "1.0.30001033"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz#60c328fb56860de60f9a2cb419c31fb80587cba0"
+  integrity sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2481,6 +2504,11 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2523,6 +2551,11 @@ core-js-compat@^3.6.2:
     browserslist "^4.8.3"
     semver "7.0.0"
 
+core-js-pure@^3.0.0:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
+  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -2716,7 +2749,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
+debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2792,6 +2825,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2805,6 +2843,11 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -2987,10 +3030,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.349:
-  version "1.3.361"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.361.tgz#a820bf52da171c0024314745462cfe0dc944373e"
-  integrity sha512-OzSVjWpsRhJyr9PSAXkeloSe6e9viU2ToGt1wXlXFsGcxuI9vlsnalL+V/AM59Z2pEo3wRxIddtOGsT7Y6x/sQ==
+electron-to-chromium@^1.3.363:
+  version "1.3.375"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.375.tgz#e290d59d316024e5499057944c10d05c518b7a24"
+  integrity sha512-zmaFnYVBtfpF8bGRYxgPeVAlXB7N3On8rjBE2ROc6wOpTPpzRWaiHo6KkbJMvlH07CH33uks/TEb6kuMMn8q6A==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -3252,21 +3295,21 @@ eslint-plugin-flowtype@^2.30.0:
     lodash "^4.17.10"
 
 eslint-plugin-jest@^23.0.4:
-  version "23.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.0.tgz#c978f959fa8395801742d13c5a3125a986d2661e"
-  integrity sha512-DKXmLxguZ1Lru4u5YM12ko3WLq6gqo7dhV2b63K731+/PNyZ/Ff6NGONQsGUtPLG9zU3kdz/N+2LTbweNZifeg==
+  version "23.8.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
+  integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
 eslint-plugin-react-hooks@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.4.0.tgz#db6ee1cc953e3a217035da3d4e9d4356d3c672a4"
-  integrity sha512-bH5DOCP6WpuOqNaux2BlaDCrSgv8s5BitP90bTgtZ1ZsRn2bdIfeMDY5F2RnJVnyKDy6KRQRDbipPLZ1y77QtQ==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.0.tgz#c50ab7ca5945ce6d1cf8248d9e185c80b54171b6"
+  integrity sha512-bzvdX47Jx847bgAYf0FPX3u1oxU+mKU8tqrpj4UX9A96SbAmj/HVEefEy6rJUog5u8QIlOPTKZcBpGn5kkKfAQ==
 
 eslint-plugin-react@^7.7.0:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8"
-  integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
+  integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==
   dependencies:
     array-includes "^3.1.1"
     doctrine "^2.1.0"
@@ -3276,8 +3319,10 @@ eslint-plugin-react@^7.7.0:
     object.fromentries "^2.0.2"
     object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.14.2"
+    resolve "^1.15.1"
+    semver "^6.3.0"
     string.prototype.matchall "^4.0.2"
+    xregexp "^4.3.0"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
@@ -3805,6 +3850,13 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3867,6 +3919,20 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 "gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
   version "1.4.3"
   resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
@@ -4068,6 +4134,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4158,9 +4229,9 @@ hosted-git-info@3.0.0:
     lru-cache "^5.1.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.6.tgz#3a6e6d0324c5371fc8c7ba7175e1e5d14578724d"
-  integrity sha512-Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 html-element-map@^1.2.0:
   version "1.2.0"
@@ -4255,7 +4326,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4272,6 +4343,13 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5655,7 +5733,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/86304fd037ac43a493000fa42f393eaafc0480ac"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5840,11 +5918,31 @@ minimist@1.1.x:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
   integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
 
-minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
+minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
+  integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
+
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5869,7 +5967,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -5946,6 +6044,15 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
+needle@^2.2.1:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
+  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6023,13 +6130,37 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.49:
-  version "1.1.50"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
-  integrity sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
+node-releases@^1.1.50:
+  version "1.1.51"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0"
+  integrity sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==
   dependencies:
     semver "^6.3.0"
 
+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6062,6 +6193,27 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6069,6 +6221,16 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6218,6 +6380,11 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6227,11 +6394,19 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6631,7 +6806,7 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-private@^0.1.6:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -6861,7 +7036,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6902,14 +7077,14 @@ react-clientside-effect@^1.2.2:
     "@babel/runtime" "^7.0.0"
 
 react-dom@^16.9.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
-  integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866"
+  integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-focus-lock@^2.2.1:
   version "2.2.1"
@@ -6930,9 +7105,9 @@ react-focus-lock@^2.2.1:
     gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
 react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
+  integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
 
 react-lifecycles-compat@^3.0.0:
   version "3.0.4"
@@ -6962,14 +7137,14 @@ react-redux@^5.0.6:
     react-lifecycles-compat "^3.0.0"
 
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz#11417ffda579306d4e841a794d32140f3da1b43f"
-  integrity sha512-Vj/teSqt2oayaWxkbhQ6gKis+t5JrknXfPVo+aIJ8QwYAqMPH77uptOdrlphyxl8eQI/rtkOYg86i/UWkpFu0w==
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.0.tgz#39ba3bf72cedc8210c3f81983f0bb061b14a3014"
+  integrity sha512-NQ2S9gdMUa7rgPGpKGyMcwl1d6D9MCF0lftdI3kts6kkiX+qvpC955jNjAZXlIDTjnN9jwFI8A8XhRh/9v0spA==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     react-is "^16.8.6"
-    scheduler "^0.18.0"
+    scheduler "^0.19.0"
 
 react-transition-group@^1.2.0:
   version "1.2.1"
@@ -6983,9 +7158,9 @@ react-transition-group@^1.2.0:
     warning "^3.0.0"
 
 react@^16.9.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
-  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
+  version "16.13.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7"
+  integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7025,7 +7200,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7115,17 +7290,18 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
 
-regenerator-transform@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
-  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
+regenerator-transform@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2"
+  integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -7174,9 +7350,9 @@ regjsgen@^0.5.0:
   integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.6.0:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"
-  integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
   dependencies:
     jsesc "~0.5.0"
 
@@ -7352,7 +7528,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
   integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
@@ -7384,7 +7560,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7400,9 +7576,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     inherits "^2.0.1"
 
 rollup-plugin-terser@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.2.0.tgz#ba758adf769347b7f1eaf9ef35978d2e207dccc7"
-  integrity sha512-jQI+nYhtDBc9HFRBz8iGttQg7li9klmzR62RG2W2nN6hJ/FI2K2ItYQ7kJ7/zn+vs+BP1AEccmVRjRN989I+Nw==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz#9c0dd33d5771df9630cd027d6a2559187f65885e"
+  integrity sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g==
   dependencies:
     "@babel/code-frame" "^7.5.5"
     jest-worker "^24.9.0"
@@ -7509,10 +7685,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
-  integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
+scheduler@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d"
+  integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7546,7 +7722,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -7882,7 +8058,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8145,6 +8321,19 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -8161,9 +8350,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.2:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00"
-  integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863"
+  integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -8313,10 +8502,10 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc"
-  integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
 
 tslint@^5.20.1:
   version "5.20.1"
@@ -8386,9 +8575,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.7.3:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
-  integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
+  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"
@@ -8404,9 +8593,9 @@ unherit@^1.0.4:
     xtend "^4.0.0"
 
 unhomoglyph@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.4.tgz#38d2ec9de84ab921623ebd9fb60f710963c601f4"
-  integrity sha512-+y+QeEXwm4f0H8Tmy9fFUWHM95YcFjJLlv83/p3+EARUkeJBxnSOBADVyeuSq0TsRJ/UexxCXBKXo40ksu715w==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.5.tgz#a68c6244f0ec140bfe58293a1f66a9bd2a244343"
+  integrity sha512-rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -8499,9 +8688,9 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
   integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
 
 unist-util-stringify-position@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.2.tgz#5a3866e7138d55974b640ec69a94bc19e0f3fa12"
-  integrity sha512-nK5n8OGhZ7ZgUwoUbL8uiVRwAbZyzBsB/Ddrlbu6jwwubFza4oe15KlyEaLNMXQW1svOQq4xesUeqA85YrIUQA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
   dependencies:
     "@types/unist" "^2.0.2"
 
@@ -8653,9 +8842,9 @@ vfile-location@^2.0.0:
   integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
 
 vfile-message@*:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.2.tgz#75ba05090ec758fa8420f2c11ce049bcddd8cf3e"
-  integrity sha512-gNV2Y2fDvDOOqq8bEe7cF3DXU6QgV4uA9zMR2P8tix11l1r7zju3zry3wZ8sx+BEfuO6WQ7z2QzfWTvqHQiwsA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.3.tgz#0dd4f6879fb240a8099b22bd3755536c92e59ba5"
+  integrity sha512-qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
@@ -8683,11 +8872,11 @@ vm-browserify@^1.0.1:
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 w3c-hr-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
-    browser-process-hrtime "^0.1.2"
+    browser-process-hrtime "^1.0.0"
 
 walk@^2.3.9:
   version "2.3.14"
@@ -8758,9 +8947,9 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.20.2:
-  version "4.41.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1"
-  integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==
+  version "4.42.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8"
+  integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -8787,9 +8976,9 @@ webpack@^4.20.2:
     webpack-sources "^1.4.1"
 
 what-input@^5.2.6:
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.6.tgz#ac6f003bf8d3592a0031dea7a03565469b00020b"
-  integrity sha512-a0BcI5YR7xp87vSzGcbN0IszJKpUQuTmrZaTSQBl7TLDIdKj6rDhluQ7b/7lYGG81gWDvkySsEvwv4BW5an9kg==
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.7.tgz#81afbb6b82882cff8c43fa7ff1054aa46f288ffa"
+  integrity sha512-ruCP2skyygi0ZHnMicHuZP7vXnJh8uJXs9R7RX488HlWigSdzngdmKo5Ti11Iatp1dnYp55VfioP/WevPaK+xQ==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
@@ -8864,6 +9053,13 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -8931,6 +9127,13 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xregexp@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
+  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.8.3"
+
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -8941,7 +9144,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 15d5190b9b145f63d9b6fbb5d1baa0fba4846d4f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 16:18:08 +0000
Subject: [PATCH 1481/3235] js-sdk rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6380eabd9e..31fb2ea83d 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "5.1.1-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 20580f26f9..965e156e39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5653,9 +5653,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bc53f8fdec7222b6ca44a63cafbc7ae8c4cc396f"
+matrix-js-sdk@5.1.1-rc.1:
+  version "5.1.1-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a"
+  integrity sha512-55F4jvJSVYJb5DDmso6Mld3HJ9v1UW0eT///SMcJtHVIJd5ZSLvsGV7rvMny7w6MHy5enfH4E2yItjjvlAL9dA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 5e3d6517319ccf95cc12171ad948fa4f56139e67 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 16:23:53 +0000
Subject: [PATCH 1482/3235] Prepare changelog for v2.2.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d436ca690..94909f9df4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,138 @@
+Changes in [2.2.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.2) (2020-03-11)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.1...v2.2.2)
+
+ * Update from Weblate
+   [\#4200](https://github.com/matrix-org/matrix-react-sdk/pull/4200)
+ * Revert "enable 4s when accepting a verification request"
+   [\#4198](https://github.com/matrix-org/matrix-react-sdk/pull/4198)
+ * Don't remount main split children on rhs collapse
+   [\#4197](https://github.com/matrix-org/matrix-react-sdk/pull/4197)
+ * Add fallback label for canonical alias events that dont change anything
+   [\#4195](https://github.com/matrix-org/matrix-react-sdk/pull/4195)
+ * Immediately switch to verification dialog when clicking [Continue] from new
+   session dialog
+   [\#4196](https://github.com/matrix-org/matrix-react-sdk/pull/4196)
+ * Enable 4S if needed when trying to verify or accepting verification
+   [\#4194](https://github.com/matrix-org/matrix-react-sdk/pull/4194)
+ * Remove extraneous tab stop from room tree view.
+   [\#4193](https://github.com/matrix-org/matrix-react-sdk/pull/4193)
+ * Remove v1 identity server fallbacks
+   [\#4191](https://github.com/matrix-org/matrix-react-sdk/pull/4191)
+ * Allow editing of alt_aliases according to MSC2432
+   [\#4187](https://github.com/matrix-org/matrix-react-sdk/pull/4187)
+ * Update timeline rendering of aliases
+   [\#4189](https://github.com/matrix-org/matrix-react-sdk/pull/4189)
+ * Fix mark as read button for dark theme
+   [\#4190](https://github.com/matrix-org/matrix-react-sdk/pull/4190)
+ * Un-linkify version in settings
+   [\#4188](https://github.com/matrix-org/matrix-react-sdk/pull/4188)
+ * Make Mjolnir stop more robust
+   [\#4186](https://github.com/matrix-org/matrix-react-sdk/pull/4186)
+ * Fix secret sharing names to match spec
+   [\#4185](https://github.com/matrix-org/matrix-react-sdk/pull/4185)
+ * Share secrets with another device on request
+   [\#4172](https://github.com/matrix-org/matrix-react-sdk/pull/4172)
+ * Fall back to to_device verification if other user hasn't uploaded cross-
+   signing keys
+   [\#4181](https://github.com/matrix-org/matrix-react-sdk/pull/4181)
+ * Disable edits on redacted events
+   [\#4182](https://github.com/matrix-org/matrix-react-sdk/pull/4182)
+ * Use crypto.verification.request even when xsign is disabled
+   [\#4180](https://github.com/matrix-org/matrix-react-sdk/pull/4180)
+ * Reword the status for the currently indexing rooms.
+   [\#4084](https://github.com/matrix-org/matrix-react-sdk/pull/4084)
+ * Moved read receipts to the bottom of the message
+   [\#3892](https://github.com/matrix-org/matrix-react-sdk/pull/3892)
+ * Include a mark as read X under the scroll to unread button
+   [\#4159](https://github.com/matrix-org/matrix-react-sdk/pull/4159)
+ * Show the room presence indicator, even when cross-singing is enabled
+   [\#4178](https://github.com/matrix-org/matrix-react-sdk/pull/4178)
+ * Add local echo when clicking "Manually Verify" in unverified session dialog
+   [\#4179](https://github.com/matrix-org/matrix-react-sdk/pull/4179)
+ * link to matrix.org/security-disclosure-policy in help screen
+   [\#4129](https://github.com/matrix-org/matrix-react-sdk/pull/4129)
+ * only show verify button if user has uploaded cross-signing keys
+   [\#4174](https://github.com/matrix-org/matrix-react-sdk/pull/4174)
+ * Fix room alias references in topics
+   [\#4176](https://github.com/matrix-org/matrix-react-sdk/pull/4176)
+ * Fix not being able to start chats when you have no rooms
+   [\#4177](https://github.com/matrix-org/matrix-react-sdk/pull/4177)
+ * Disable registration flows on SSO servers
+   [\#4170](https://github.com/matrix-org/matrix-react-sdk/pull/4170)
+ * Don't group blank membership changes
+   [\#4160](https://github.com/matrix-org/matrix-react-sdk/pull/4160)
+ * Ensure the room list always triggers updates on itself
+   [\#4175](https://github.com/matrix-org/matrix-react-sdk/pull/4175)
+ * Fix composer touch bar flickering on keypress in Chrome
+   [\#4173](https://github.com/matrix-org/matrix-react-sdk/pull/4173)
+ * Document scrollpanel and BACAT scrolling
+   [\#4167](https://github.com/matrix-org/matrix-react-sdk/pull/4167)
+ * riot-desktop open SSO in browser so user doesn't have to auth twice
+   [\#4158](https://github.com/matrix-org/matrix-react-sdk/pull/4158)
+ * Lock login and registration buttons after submit
+   [\#4165](https://github.com/matrix-org/matrix-react-sdk/pull/4165)
+ * Suggest the server's results as lower quality in the invite dialog
+   [\#4149](https://github.com/matrix-org/matrix-react-sdk/pull/4149)
+ * Adjust scroll offset with relative scrolling
+   [\#4166](https://github.com/matrix-org/matrix-react-sdk/pull/4166)
+ * only automatically download in usercontent if user requested it
+   [\#4163](https://github.com/matrix-org/matrix-react-sdk/pull/4163)
+ * Fix having to decrypt & download in two steps
+   [\#4162](https://github.com/matrix-org/matrix-react-sdk/pull/4162)
+ * Use bash for release script
+   [\#4161](https://github.com/matrix-org/matrix-react-sdk/pull/4161)
+ * Revert to manual sorting for custom tag rooms
+   [\#4157](https://github.com/matrix-org/matrix-react-sdk/pull/4157)
+ * Fix the last char of people's names being cut off in the invite dialog
+   [\#4150](https://github.com/matrix-org/matrix-react-sdk/pull/4150)
+ * Add /whois SlashCommand to open UserInfo
+   [\#4154](https://github.com/matrix-org/matrix-react-sdk/pull/4154)
+ * word-break in pills and wrap the background correctly
+   [\#4155](https://github.com/matrix-org/matrix-react-sdk/pull/4155)
+ * don't show "This alias is available to use" if the alias is invalid
+   [\#4153](https://github.com/matrix-org/matrix-react-sdk/pull/4153)
+ * Don't ask to enable analytics when Do Not Track is enabled
+   [\#4098](https://github.com/matrix-org/matrix-react-sdk/pull/4098)
+ * Fix MELS not breaking on day boundaries regression
+   [\#4152](https://github.com/matrix-org/matrix-react-sdk/pull/4152)
+ * Fix Quote on search results page
+   [\#4151](https://github.com/matrix-org/matrix-react-sdk/pull/4151)
+ * Ensure errors when creating a DM are raised to the user
+   [\#4144](https://github.com/matrix-org/matrix-react-sdk/pull/4144)
+ * Add a Login button to startAnyRegistrationFlow
+   [\#3829](https://github.com/matrix-org/matrix-react-sdk/pull/3829)
+ * Use latest backup status directly rather than via state
+   [\#4147](https://github.com/matrix-org/matrix-react-sdk/pull/4147)
+ * Prefer account password variation of upgrading
+   [\#4146](https://github.com/matrix-org/matrix-react-sdk/pull/4146)
+ * Hide user avatars from screen readers in group and room user lists.
+   [\#4145](https://github.com/matrix-org/matrix-react-sdk/pull/4145)
+ * Room List sorting algorithms
+   [\#4085](https://github.com/matrix-org/matrix-react-sdk/pull/4085)
+ * Clear selected tags when disabling tag panel
+   [\#4143](https://github.com/matrix-org/matrix-react-sdk/pull/4143)
+ * Ignore cursor jumping shortcuts with shift
+   [\#4142](https://github.com/matrix-org/matrix-react-sdk/pull/4142)
+ * add local echo for clicking 'start verification' button
+   [\#4138](https://github.com/matrix-org/matrix-react-sdk/pull/4138)
+ * Fix formatting buttons not marking the composer as modified
+   [\#4141](https://github.com/matrix-org/matrix-react-sdk/pull/4141)
+ * Upgrade deps
+   [\#4136](https://github.com/matrix-org/matrix-react-sdk/pull/4136)
+ * Remove debug line from Analytics
+   [\#4137](https://github.com/matrix-org/matrix-react-sdk/pull/4137)
+ * Use the right function for creating binary verification QR codes
+   [\#4140](https://github.com/matrix-org/matrix-react-sdk/pull/4140)
+ * Ensure verification QR codes use the right buffer size
+   [\#4139](https://github.com/matrix-org/matrix-react-sdk/pull/4139)
+ * Don't prefix QR codes with the length of the static marker string
+   [\#4128](https://github.com/matrix-org/matrix-react-sdk/pull/4128)
+ * Solve fixed-width digit display in flowed text
+   [\#4127](https://github.com/matrix-org/matrix-react-sdk/pull/4127)
+ * Limit UserInfo Displayname to 3 lines to get rid of scrollbars
+   [\#4135](https://github.com/matrix-org/matrix-react-sdk/pull/4135)
+
 Changes in [2.2.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.1) (2020-03-04)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0...v2.2.1)

From 0e08e4bd0e4cd55aac8f74f5be4af9fae36dae9f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 16:23:53 +0000
Subject: [PATCH 1483/3235] v2.2.2

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

diff --git a/package.json b/package.json
index 31fb2ea83d..370f4e5d95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 57022d9355155d1c7016eb679f23bf960437d9a4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 16:25:15 +0000
Subject: [PATCH 1484/3235] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 370f4e5d95..26e6a6bf2e 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.1.1-rc.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 965e156e39..f6c4915a84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5653,10 +5653,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.1.1-rc.1:
-  version "5.1.1-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a"
-  integrity sha512-55F4jvJSVYJb5DDmso6Mld3HJ9v1UW0eT///SMcJtHVIJd5ZSLvsGV7rvMny7w6MHy5enfH4E2yItjjvlAL9dA==
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "5.1.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/86304fd037ac43a493000fa42f393eaafc0480ac"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 5d4651578f7cbf7b8edae3ffc6ecce66137c5a95 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 17:33:57 +0000
Subject: [PATCH 1485/3235] Prepare changelog for v2.2.3-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d436ca690..34a6e6bfd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,138 @@
+Changes in [2.2.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.3-rc.1) (2020-03-11)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.1...v2.2.3-rc.1)
+
+ * Update from Weblate
+   [\#4200](https://github.com/matrix-org/matrix-react-sdk/pull/4200)
+ * Revert "enable 4s when accepting a verification request"
+   [\#4198](https://github.com/matrix-org/matrix-react-sdk/pull/4198)
+ * Don't remount main split children on rhs collapse
+   [\#4197](https://github.com/matrix-org/matrix-react-sdk/pull/4197)
+ * Add fallback label for canonical alias events that dont change anything
+   [\#4195](https://github.com/matrix-org/matrix-react-sdk/pull/4195)
+ * Immediately switch to verification dialog when clicking [Continue] from new
+   session dialog
+   [\#4196](https://github.com/matrix-org/matrix-react-sdk/pull/4196)
+ * Enable 4S if needed when trying to verify or accepting verification
+   [\#4194](https://github.com/matrix-org/matrix-react-sdk/pull/4194)
+ * Remove extraneous tab stop from room tree view.
+   [\#4193](https://github.com/matrix-org/matrix-react-sdk/pull/4193)
+ * Remove v1 identity server fallbacks
+   [\#4191](https://github.com/matrix-org/matrix-react-sdk/pull/4191)
+ * Allow editing of alt_aliases according to MSC2432
+   [\#4187](https://github.com/matrix-org/matrix-react-sdk/pull/4187)
+ * Update timeline rendering of aliases
+   [\#4189](https://github.com/matrix-org/matrix-react-sdk/pull/4189)
+ * Fix mark as read button for dark theme
+   [\#4190](https://github.com/matrix-org/matrix-react-sdk/pull/4190)
+ * Un-linkify version in settings
+   [\#4188](https://github.com/matrix-org/matrix-react-sdk/pull/4188)
+ * Make Mjolnir stop more robust
+   [\#4186](https://github.com/matrix-org/matrix-react-sdk/pull/4186)
+ * Fix secret sharing names to match spec
+   [\#4185](https://github.com/matrix-org/matrix-react-sdk/pull/4185)
+ * Share secrets with another device on request
+   [\#4172](https://github.com/matrix-org/matrix-react-sdk/pull/4172)
+ * Fall back to to_device verification if other user hasn't uploaded cross-
+   signing keys
+   [\#4181](https://github.com/matrix-org/matrix-react-sdk/pull/4181)
+ * Disable edits on redacted events
+   [\#4182](https://github.com/matrix-org/matrix-react-sdk/pull/4182)
+ * Use crypto.verification.request even when xsign is disabled
+   [\#4180](https://github.com/matrix-org/matrix-react-sdk/pull/4180)
+ * Reword the status for the currently indexing rooms.
+   [\#4084](https://github.com/matrix-org/matrix-react-sdk/pull/4084)
+ * Moved read receipts to the bottom of the message
+   [\#3892](https://github.com/matrix-org/matrix-react-sdk/pull/3892)
+ * Include a mark as read X under the scroll to unread button
+   [\#4159](https://github.com/matrix-org/matrix-react-sdk/pull/4159)
+ * Show the room presence indicator, even when cross-singing is enabled
+   [\#4178](https://github.com/matrix-org/matrix-react-sdk/pull/4178)
+ * Add local echo when clicking "Manually Verify" in unverified session dialog
+   [\#4179](https://github.com/matrix-org/matrix-react-sdk/pull/4179)
+ * link to matrix.org/security-disclosure-policy in help screen
+   [\#4129](https://github.com/matrix-org/matrix-react-sdk/pull/4129)
+ * only show verify button if user has uploaded cross-signing keys
+   [\#4174](https://github.com/matrix-org/matrix-react-sdk/pull/4174)
+ * Fix room alias references in topics
+   [\#4176](https://github.com/matrix-org/matrix-react-sdk/pull/4176)
+ * Fix not being able to start chats when you have no rooms
+   [\#4177](https://github.com/matrix-org/matrix-react-sdk/pull/4177)
+ * Disable registration flows on SSO servers
+   [\#4170](https://github.com/matrix-org/matrix-react-sdk/pull/4170)
+ * Don't group blank membership changes
+   [\#4160](https://github.com/matrix-org/matrix-react-sdk/pull/4160)
+ * Ensure the room list always triggers updates on itself
+   [\#4175](https://github.com/matrix-org/matrix-react-sdk/pull/4175)
+ * Fix composer touch bar flickering on keypress in Chrome
+   [\#4173](https://github.com/matrix-org/matrix-react-sdk/pull/4173)
+ * Document scrollpanel and BACAT scrolling
+   [\#4167](https://github.com/matrix-org/matrix-react-sdk/pull/4167)
+ * riot-desktop open SSO in browser so user doesn't have to auth twice
+   [\#4158](https://github.com/matrix-org/matrix-react-sdk/pull/4158)
+ * Lock login and registration buttons after submit
+   [\#4165](https://github.com/matrix-org/matrix-react-sdk/pull/4165)
+ * Suggest the server's results as lower quality in the invite dialog
+   [\#4149](https://github.com/matrix-org/matrix-react-sdk/pull/4149)
+ * Adjust scroll offset with relative scrolling
+   [\#4166](https://github.com/matrix-org/matrix-react-sdk/pull/4166)
+ * only automatically download in usercontent if user requested it
+   [\#4163](https://github.com/matrix-org/matrix-react-sdk/pull/4163)
+ * Fix having to decrypt & download in two steps
+   [\#4162](https://github.com/matrix-org/matrix-react-sdk/pull/4162)
+ * Use bash for release script
+   [\#4161](https://github.com/matrix-org/matrix-react-sdk/pull/4161)
+ * Revert to manual sorting for custom tag rooms
+   [\#4157](https://github.com/matrix-org/matrix-react-sdk/pull/4157)
+ * Fix the last char of people's names being cut off in the invite dialog
+   [\#4150](https://github.com/matrix-org/matrix-react-sdk/pull/4150)
+ * Add /whois SlashCommand to open UserInfo
+   [\#4154](https://github.com/matrix-org/matrix-react-sdk/pull/4154)
+ * word-break in pills and wrap the background correctly
+   [\#4155](https://github.com/matrix-org/matrix-react-sdk/pull/4155)
+ * don't show "This alias is available to use" if the alias is invalid
+   [\#4153](https://github.com/matrix-org/matrix-react-sdk/pull/4153)
+ * Don't ask to enable analytics when Do Not Track is enabled
+   [\#4098](https://github.com/matrix-org/matrix-react-sdk/pull/4098)
+ * Fix MELS not breaking on day boundaries regression
+   [\#4152](https://github.com/matrix-org/matrix-react-sdk/pull/4152)
+ * Fix Quote on search results page
+   [\#4151](https://github.com/matrix-org/matrix-react-sdk/pull/4151)
+ * Ensure errors when creating a DM are raised to the user
+   [\#4144](https://github.com/matrix-org/matrix-react-sdk/pull/4144)
+ * Add a Login button to startAnyRegistrationFlow
+   [\#3829](https://github.com/matrix-org/matrix-react-sdk/pull/3829)
+ * Use latest backup status directly rather than via state
+   [\#4147](https://github.com/matrix-org/matrix-react-sdk/pull/4147)
+ * Prefer account password variation of upgrading
+   [\#4146](https://github.com/matrix-org/matrix-react-sdk/pull/4146)
+ * Hide user avatars from screen readers in group and room user lists.
+   [\#4145](https://github.com/matrix-org/matrix-react-sdk/pull/4145)
+ * Room List sorting algorithms
+   [\#4085](https://github.com/matrix-org/matrix-react-sdk/pull/4085)
+ * Clear selected tags when disabling tag panel
+   [\#4143](https://github.com/matrix-org/matrix-react-sdk/pull/4143)
+ * Ignore cursor jumping shortcuts with shift
+   [\#4142](https://github.com/matrix-org/matrix-react-sdk/pull/4142)
+ * add local echo for clicking 'start verification' button
+   [\#4138](https://github.com/matrix-org/matrix-react-sdk/pull/4138)
+ * Fix formatting buttons not marking the composer as modified
+   [\#4141](https://github.com/matrix-org/matrix-react-sdk/pull/4141)
+ * Upgrade deps
+   [\#4136](https://github.com/matrix-org/matrix-react-sdk/pull/4136)
+ * Remove debug line from Analytics
+   [\#4137](https://github.com/matrix-org/matrix-react-sdk/pull/4137)
+ * Use the right function for creating binary verification QR codes
+   [\#4140](https://github.com/matrix-org/matrix-react-sdk/pull/4140)
+ * Ensure verification QR codes use the right buffer size
+   [\#4139](https://github.com/matrix-org/matrix-react-sdk/pull/4139)
+ * Don't prefix QR codes with the length of the static marker string
+   [\#4128](https://github.com/matrix-org/matrix-react-sdk/pull/4128)
+ * Solve fixed-width digit display in flowed text
+   [\#4127](https://github.com/matrix-org/matrix-react-sdk/pull/4127)
+ * Limit UserInfo Displayname to 3 lines to get rid of scrollbars
+   [\#4135](https://github.com/matrix-org/matrix-react-sdk/pull/4135)
+
 Changes in [2.2.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.1) (2020-03-04)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0...v2.2.1)

From 9b6986e86286fd59df154e12ae8543eba683797b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Mar 2020 17:33:57 +0000
Subject: [PATCH 1486/3235] v2.2.3-rc.1

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

diff --git a/package.json b/package.json
index 31fb2ea83d..3ab8247afb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.2.1",
+  "version": "2.2.3-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 7dd7417f1248e10f3fe84fdc471d6da58cb5ce5c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Mar 2020 17:47:18 -0600
Subject: [PATCH 1487/3235] Enable support for TypeScript in components

Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.

TypeScript component have to import PropTypes and React with `import * as React from 'react';`
---
 package.json                      |  3 ++-
 scripts/gen-i18n.js               |  2 +-
 scripts/reskindex.js              | 11 +++++++----
 src/utils/replaceableComponent.ts |  2 +-
 tsconfig.json                     |  3 ++-
 yarn.lock                         | 18 ++++++++++++++++++
 6 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 26e6a6bf2e..e9bd23b58a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "rethemendex": "res/css/rethemendex.sh",
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
-    "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",
+    "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
     "build:types": "tsc --emitDeclarationOnly",
     "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
@@ -118,6 +118,7 @@
     "@babel/preset-typescript": "^7.7.4",
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
+    "@types/react": "16.9",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "chokidar": "^3.3.1",
diff --git a/scripts/gen-i18n.js b/scripts/gen-i18n.js
index 3d3d5af116..a4d53aea2f 100755
--- a/scripts/gen-i18n.js
+++ b/scripts/gen-i18n.js
@@ -237,7 +237,7 @@ const walkOpts = {
             const fullPath = path.join(root, fileStats.name);
 
             let trs;
-            if (fileStats.name.endsWith('.js')) {
+            if (fileStats.name.endsWith('.js') || fileStats.name.endsWith('.tsx')) {
                 trs = getTranslationsJs(fullPath);
             } else if (fileStats.name.endsWith('.html')) {
                 trs = getTranslationsOther(fullPath);
diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 81ab111f46..9fb0e1a7c0 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -8,11 +8,14 @@ var chokidar = require('chokidar');
 var componentIndex = path.join('src', 'component-index.js');
 var componentIndexTmp = componentIndex+".tmp";
 var componentsDir = path.join('src', 'components');
-var componentGlob = '**/*.js';
+var componentJsGlob = '**/*.js';
+var componentTsGlob = '**/*.tsx';
 var prevFiles = [];
 
 function reskindex() {
-    var files = glob.sync(componentGlob, {cwd: componentsDir}).sort();
+    var jsFiles = glob.sync(componentJsGlob, {cwd: componentsDir}).sort();
+    var tsFiles = glob.sync(componentTsGlob, {cwd: componentsDir}).sort();
+    var files = [...tsFiles, ...jsFiles];
     if (!filesHaveChanged(files, prevFiles)) {
         return;
     }
@@ -36,7 +39,7 @@ function reskindex() {
     strm.write("let components = {};\n");
 
     for (var i = 0; i < files.length; ++i) {
-        var file = files[i].replace('.js', '');
+        var file = files[i].replace('.js', '').replace('.tsx', '');
 
         var moduleName = (file.replace(/\//g, '.'));
         var importName = moduleName.replace(/\./g, "$");
@@ -79,7 +82,7 @@ if (!args.w) {
 }
 
 var watchDebouncer = null;
-chokidar.watch(path.join(componentsDir, componentGlob)).on('all', (event, path) => {
+chokidar.watch(path.join(componentsDir, componentJsGlob)).on('all', (event, path) => {
     if (path === componentIndex) return;
     if (watchDebouncer) clearTimeout(watchDebouncer);
     watchDebouncer = setTimeout(reskindex, 1000);
diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 9f617b27f3..8c29fdf037 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
 import * as sdk from '../index';
 
 /**
diff --git a/tsconfig.json b/tsconfig.json
index ec1531e429..ecb524e22e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,8 @@
     "outDir": "./lib",
     "declaration": true,
     "types": [
-      "node"
+      "node",
+      "react"
     ]
   },
   "include": [
diff --git a/yarn.lock b/yarn.lock
index f6c4915a84..8056f3d435 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1217,6 +1217,19 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.6.tgz#cb734a7c191472ae6a2b3a502b4dfffcea974113"
   integrity sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA==
 
+"@types/prop-types@*":
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+
+"@types/react@16.9":
+  version "16.9.23"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
+  integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -2664,6 +2677,11 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
+csstype@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
+  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"

From cccd27fe8465e6ddee1f212be390e023f6b2c5dd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Mar 2020 18:02:17 -0600
Subject: [PATCH 1488/3235] Convert TabbedView to TypeScript to prove it works

---
 .../{TabbedView.js => TabbedView.tsx}         | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)
 rename src/components/structures/{TabbedView.js => TabbedView.tsx} (80%)

diff --git a/src/components/structures/TabbedView.js b/src/components/structures/TabbedView.tsx
similarity index 80%
rename from src/components/structures/TabbedView.js
rename to src/components/structures/TabbedView.tsx
index 20af183af8..ea485acc1a 100644
--- a/src/components/structures/TabbedView.js
+++ b/src/components/structures/TabbedView.tsx
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Travis Ralston
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,41 +18,54 @@ limitations under the License.
 
 import * as React from "react";
 import {_t} from '../../languageHandler';
-import PropTypes from "prop-types";
+import * as PropTypes from "prop-types";
 import * as sdk from "../../index";
+import { ReactNode } from "react";
 
 /**
  * Represents a tab for the TabbedView.
  */
 export class Tab {
+    public label: string;
+    public icon: string;
+    public body: React.ReactNode;
+
     /**
      * Creates a new tab.
      * @param {string} tabLabel The untranslated tab label.
      * @param {string} tabIconClass The class for the tab icon. This should be a simple mask.
-     * @param {string} tabJsx The JSX for the tab container.
+     * @param {React.ReactNode} tabJsx The JSX for the tab container.
      */
-    constructor(tabLabel, tabIconClass, tabJsx) {
+    constructor(tabLabel: string, tabIconClass: string, tabJsx: React.ReactNode) {
         this.label = tabLabel;
         this.icon = tabIconClass;
         this.body = tabJsx;
     }
 }
 
-export default class TabbedView extends React.Component {
+interface IProps {
+    tabs: Tab[];
+}
+
+interface IState {
+    activeTabIndex: number;
+}
+
+export default class TabbedView extends React.Component<IProps, IState> {
     static propTypes = {
         // The tabs to show
         tabs: PropTypes.arrayOf(PropTypes.instanceOf(Tab)).isRequired,
     };
 
-    constructor() {
-        super();
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
             activeTabIndex: 0,
         };
     }
 
-    _getActiveTabIndex() {
+    private _getActiveTabIndex() {
         if (!this.state || !this.state.activeTabIndex) return 0;
         return this.state.activeTabIndex;
     }
@@ -62,7 +75,7 @@ export default class TabbedView extends React.Component {
      * @param {Tab} tab the tab to show
      * @private
      */
-    _setActiveTab(tab) {
+    private _setActiveTab(tab: Tab) {
         const idx = this.props.tabs.indexOf(tab);
         if (idx !== -1) {
             this.setState({activeTabIndex: idx});
@@ -71,7 +84,7 @@ export default class TabbedView extends React.Component {
         }
     }
 
-    _renderTabLabel(tab) {
+    private _renderTabLabel(tab: Tab) {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let classes = "mx_TabbedView_tabLabel ";
@@ -97,7 +110,7 @@ export default class TabbedView extends React.Component {
         );
     }
 
-    _renderTabPanel(tab) {
+    private _renderTabPanel(tab: Tab): React.ReactNode {
         return (
             <div className="mx_TabbedView_tabPanel" key={"mx_tabpanel_" + tab.label}>
                 <div className='mx_TabbedView_tabPanelContent'>
@@ -107,7 +120,7 @@ export default class TabbedView extends React.Component {
         );
     }
 
-    render() {
+    public render(): React.ReactNode {
         const labels = this.props.tabs.map(tab => this._renderTabLabel(tab));
         const panel = this._renderTabPanel(this.props.tabs[this._getActiveTabIndex()]);
 

From 5a5e7171bcbb4e9ed9d56833a813c134848394e3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Mar 2020 18:17:35 -0600
Subject: [PATCH 1489/3235] Also tsconfig

---
 tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index ecb524e22e..3e4db4baa1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,7 @@
     ]
   },
   "include": [
-    "./src/**/*.ts"
+    "./src/**/*.ts",
+    "./src/**/*.tsx"
   ]
 }

From 751bcfb1f593428616a2a27ae2966f8f8ba57864 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Mar 2020 18:24:01 -0600
Subject: [PATCH 1490/3235] Supply `--jsx react` to tsc

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e9bd23b58a..eeca614aa2 100644
--- a/package.json
+++ b/package.json
@@ -41,14 +41,14 @@
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
     "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
-    "build:types": "tsc --emitDeclarationOnly",
+    "build:types": "tsc --emitDeclarationOnly --jsx react",
     "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
     "start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
     "lint": "yarn lint:types && yarn lint:ts && yarn lint:js && yarn lint:style",
     "lint:js": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
     "lint:ts": "tslint --project ./tsconfig.json -t stylish",
-    "lint:types": "tsc --noEmit",
+    "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
     "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"

From cd515f1922988dc79c7cbe88914393d6f9cfd016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 12 Mar 2020 11:42:02 +0100
Subject: [PATCH 1491/3235] EventIndex: Add support to delete events from the
 index.

---
 src/indexing/BaseEventIndexManager.js |  4 ++++
 src/indexing/EventIndex.js            | 31 ++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.js
index 66904f9264..f780c8e9ce 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.js
@@ -123,6 +123,10 @@ export default class BaseEventIndexManager {
         throw new Error("Unimplemented");
     }
 
+    async deleteEvent(eventId: string): Promise<boolean> {
+        throw new Error("Unimplemented");
+    }
+
     /**
      * Check if our event index is empty.
      */
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c8a9a4c1fa..128b4bb42d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -61,6 +61,7 @@ export default class EventIndex extends EventEmitter {
         client.on('Room.timeline', this.onRoomTimeline);
         client.on('Event.decrypted', this.onEventDecrypted);
         client.on('Room.timelineReset', this.onTimelineReset);
+        client.on('Room.redaction', this.onRedaction);
     }
 
     /**
@@ -74,6 +75,7 @@ export default class EventIndex extends EventEmitter {
         client.removeListener('Room.timeline', this.onRoomTimeline);
         client.removeListener('Event.decrypted', this.onEventDecrypted);
         client.removeListener('Room.timelineReset', this.onTimelineReset);
+        client.removeListener('Room.redaction', this.onRedaction);
     }
 
     /**
@@ -210,6 +212,23 @@ export default class EventIndex extends EventEmitter {
         await this.addLiveEventToIndex(ev);
     }
 
+    /*
+     * The Room.redaction listener.
+     *
+     * Removes a redacted event from our event index.
+     */
+    onRedaction = async (ev, room) => {
+        // We only index encrypted rooms locally.
+        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+
+        try {
+            await indexManager.deleteEvent(ev.getAssociatedId());
+        } catch (e) {
+            console.log("EventIndex: Error deleting event from index", e);
+        }
+    }
+
     /*
      * The Room.timelineReset listener.
      *
@@ -431,12 +450,17 @@ export default class EventIndex extends EventEmitter {
             // Let us wait for all the events to get decrypted.
             await Promise.all(decryptionPromises);
 
-
             // TODO if there are no events at this point we're missing a lot
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
             const filteredEvents = matrixEvents.filter(this.isValidEvent);
 
+            // Collect the redaction events so we can delete the redacted events
+            // from the index.
+            const redactionEvents = matrixEvents.filter((ev) => {
+                return ev.getType() === "m.room.redaction";
+            });
+
             // Let us convert the events back into a format that EventIndex can
             // consume.
             const events = filteredEvents.map((ev) => {
@@ -468,6 +492,11 @@ export default class EventIndex extends EventEmitter {
             );
 
             try {
+                for (var i = 0; i < redactionEvents.length; i++) {
+                    let ev = redactionEvents[i];
+                    await indexManager.deleteEvent(ev.getAssociatedId());
+                }
+
                 const eventsAlreadyAdded = await indexManager.addHistoricEvents(
                     events, newCheckpoint, checkpoint);
                 // If all events were already indexed we assume that we catched

From c02e839e9dba2390e1a2cf776c244031fb570c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 12 Mar 2020 12:15:46 +0100
Subject: [PATCH 1492/3235] EventIndex: Use a const instead of a let binding.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 128b4bb42d..245427d425 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -493,7 +493,7 @@ export default class EventIndex extends EventEmitter {
 
             try {
                 for (var i = 0; i < redactionEvents.length; i++) {
-                    let ev = redactionEvents[i];
+                    const ev = redactionEvents[i];
                     await indexManager.deleteEvent(ev.getAssociatedId());
                 }
 

From 25568fa15cc9ddf899f5265cf433d3263a8b24fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 12 Mar 2020 12:20:46 +0100
Subject: [PATCH 1493/3235] EventIndex: More lint fixes.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 245427d425..a4a9302601 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -492,7 +492,7 @@ export default class EventIndex extends EventEmitter {
             );
 
             try {
-                for (var i = 0; i < redactionEvents.length; i++) {
+                for (let i = 0; i < redactionEvents.length; i++) {
                     const ev = redactionEvents[i];
                     await indexManager.deleteEvent(ev.getAssociatedId());
                 }

From 6a3a93bf55b4b5e89d17e93e4e0312d196862268 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 12 Mar 2020 03:12:14 +0000
Subject: [PATCH 1494/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2145 of 2145 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index eff96f88b5..395b8988b5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2193,5 +2193,7 @@
     "Alternative addresses for this room:": "此聊天是的替代位置：",
     "This room has no alternative addresses": "此聊天室沒有替代位置",
     "New address (e.g. #foo:domain)": "新位置（例如：#foo:domain）",
-    "Local addresses (unmoderated content)": "本機位置（未經審核的內容）"
+    "Local addresses (unmoderated content)": "本機位置（未經審核的內容）",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 將聊天室名稱從 %(oldRoomName)s 變更為 %(newRoomName)s。",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s 變更了此聊天室的位置。"
 }

From 6bcf929fce6068525f5cac813ce7a04ac1c8f0aa Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 11 Mar 2020 18:27:34 +0000
Subject: [PATCH 1495/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2145 of 2145 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 18aa375944..cfa5fd352a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2179,5 +2179,18 @@
     "Mark all as read": "Mindent olvasottnak jelöl",
     "Not currently indexing messages for any room.": "Jelenleg egyik szoba indexelése sem történik.",
     "Currently indexing: %(currentRoom)s.": "Indexelés alatt jelenleg: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s a szoba nevét megváltoztatta erről: %(oldRoomName)s erre: %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s egy alternatív nevet (%(addresses)s) adott hozzá a szobához.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s egy alternatív címet (%(addresses)s) adott hozzá a szobához.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s egy alternatív címet (%(addresses)s) eltávolított a szobáról.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eltávolította ezt az alternatív címet a szobáról: %(addresses)s.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s megváltoztatta az alternatív címét ennek a szobának.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ennek a szobának megváltoztatta az elsődleges és az alternatív címét.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s megváltoztatta ennek a szobának a címét.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "A szoba címének megváltoztatásakor hiba történt. Lehet, hogy a szerver nem engedélyezi vagy átmeneti hiba történt.",
+    "Alternative addresses for this room:": "A szoba alternatív címei:",
+    "This room has no alternative addresses": "A szobának nincsen alternatív címe",
+    "New address (e.g. #foo:domain)": "Új cím (pl.: #foo:domain)",
+    "Local addresses (unmoderated content)": "Helyi cím (nem moderált tartalom)"
 }

From 255e57963ef21e58735920ec5a1c3a10768fa8ba Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 12 Mar 2020 09:01:40 +0000
Subject: [PATCH 1496/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2145 of 2145 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a90ca5a2b6..4c111b2e68 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2180,5 +2180,18 @@
     "We recommend you change your password and recovery key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di recupero nelle impostazioni",
     "Not currently indexing messages for any room.": "Attualmente non si stanno indicizzando i messaggi di alcuna stanza.",
     "Currently indexing: %(currentRoom)s.": "Attualmente si indicizzano: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ha cambiato il nome della stanza da %(oldRoomName)s a %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ha aggiunto gli indirizzi alternativi %(addresses)s per questa stanza.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ha aggiunto l'indirizzo alternativo %(addresses)s per questa stanza.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ha rimosso gli indirizzi alternativi %(addresses)s per questa stanza.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s ha rimosso l'indirizzo alternativo %(addresses)s per questa stanza.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ha cambiato gli indirizzi alternativi per questa stanza.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ha cambiato gli indirizzi principali ed alternativi per questa stanza.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s ha cambiato gli indirizzi per questa stanza.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore aggiornando gli indirizzi alternativi della stanza. Potrebbe non essere consentito dal server o essere un errore temporaneo.",
+    "Alternative addresses for this room:": "Indirizzi alternativi per questa stanza:",
+    "This room has no alternative addresses": "Questa stanza non ha indirizzi alternativi",
+    "New address (e.g. #foo:domain)": "Nuovo indirizzo (es. #abc:dominio)",
+    "Local addresses (unmoderated content)": "Indirizzi locali (contenuto non moderato)"
 }

From 57a61efabf308ca16f41333ab9ca4c7759df740d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Mar 2020 10:46:42 -0600
Subject: [PATCH 1497/3235] Remove stuff that yarn install doesn't think we
 need

---
 yarn.lock | 195 +++---------------------------------------------------
 1 file changed, 11 insertions(+), 184 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7f00976cbc..705b02e3e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1461,11 +1461,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1599,19 +1594,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2517,11 +2504,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2767,7 +2749,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2843,11 +2825,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2861,11 +2838,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3868,13 +3840,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3937,20 +3902,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 "gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
   version "1.4.3"
   resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
@@ -4152,11 +4103,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4344,7 +4290,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4361,13 +4307,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5946,21 +5885,6 @@ minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
   integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -5985,7 +5909,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -6062,15 +5986,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
-  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6148,22 +6063,6 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.50:
   version "1.1.51"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0"
@@ -6171,14 +6070,6 @@ node-releases@^1.1.50:
   dependencies:
     semver "^6.3.0"
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6211,27 +6102,6 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6239,16 +6109,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6398,11 +6258,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6412,19 +6267,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -7054,7 +6901,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7218,7 +7065,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7578,7 +7425,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7740,7 +7587,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8076,7 +7923,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8339,19 +8186,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -9071,13 +8905,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9162,7 +8989,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From b5d532b8cd64bc017369ef63431d8355d522d76e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 12 Mar 2020 18:03:18 +0000
Subject: [PATCH 1498/3235] Test for cross-signing homeserver support during
 login, toasts

This adds more checking of homeserver support for cross-signing at login and in
toasts.

Fixes https://github.com/vector-im/riot-web/issues/12228
---
 src/DeviceListener.js                              | 6 +++++-
 src/components/structures/MatrixChat.js            | 5 ++++-
 src/components/structures/auth/CompleteSecurity.js | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4e7bc8470d..6a506db496 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -99,9 +99,13 @@ export default class DeviceListener {
     }
 
     async _recheck() {
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) return;
         const cli = MatrixClientPeg.get();
 
+        if (
+            !SettingsStore.isFeatureEnabled("feature_cross_signing") ||
+            !await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
+        ) return;
+
         if (!cli.isCryptoEnabled()) return;
         if (!cli.getCrossSigningId()) {
             if (this._dismissedThisDeviceToast) {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a0b9a8fe57..f1a5a372be 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1911,7 +1911,10 @@ export default createReactClass({
             // secret storage.
             SettingsStore.setFeatureEnabled("feature_cross_signing", true);
             this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
-        } else if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        } else if (
+            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
+        ) {
             // This will only work if the feature is set to 'enable' in the config,
             // since it's too early in the lifecycle for users to have turned the
             // labs flag on.
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 6bf3e7f07c..2e95f668a6 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -59,9 +59,10 @@ export default class CompleteSecurity extends React.Component {
             phase: PHASE_BUSY,
         });
         const cli = MatrixClientPeg.get();
-        const backupInfo = await cli.getKeyBackupVersion();
-        this.setState({backupInfo});
         try {
+            const backupInfo = await cli.getKeyBackupVersion();
+            this.setState({backupInfo});
+
             await accessSecretStorage(async () => {
                 await cli.checkOwnCrossSigningTrust();
                 if (backupInfo) await cli.restoreKeyBackupWithSecretStorage(backupInfo);

From b825be281efe0992c8ff9286c99b6eb41ba669e5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Mar 2020 13:36:02 -0600
Subject: [PATCH 1499/3235] Declare jsx in tsconfig for IDEs

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

diff --git a/tsconfig.json b/tsconfig.json
index 3e4db4baa1..d70e0a85f0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,7 @@
     "sourceMap": false,
     "outDir": "./lib",
     "declaration": true,
+    "jsx": "react",
     "types": [
       "node",
       "react"

From 35b673ce9bf8993abec2ad7ebf68514848c6aec0 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 12 Mar 2020 14:45:45 +0000
Subject: [PATCH 1500/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2146 of 2146 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 cfa5fd352a..b37b18fe83 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2192,5 +2192,6 @@
     "Alternative addresses for this room:": "A szoba alternatív címei:",
     "This room has no alternative addresses": "A szobának nincsen alternatív címe",
     "New address (e.g. #foo:domain)": "Új cím (pl.: #foo:domain)",
-    "Local addresses (unmoderated content)": "Helyi cím (nem moderált tartalom)"
+    "Local addresses (unmoderated content)": "Helyi cím (nem moderált tartalom)",
+    "You don't have permission to delete the alias.": "Ezt az alternatív nevet nincs jogod törölni."
 }

From 86e53ea2c31f99a60a6d0113584400b7fa87aff4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:02:50 +0000
Subject: [PATCH 1501/3235] Initial attempt to redesign explore servers in room
 directory

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RoomDirectory.scss        |   3 +-
 res/css/views/directory/_NetworkDropdown.scss | 180 +++++---
 .../views/elements/_DirectorySearchBox.scss   |   1 -
 src/components/structures/MatrixChat.js       |   5 +-
 src/components/structures/RoomDirectory.js    |  44 +-
 .../views/dialogs/TextInputDialog.js          |  11 +-
 .../views/directory/NetworkDropdown.js        | 383 +++++++++---------
 src/i18n/strings/en_EN.json                   |   9 +
 src/settings/Settings.js                      |   4 +
 9 files changed, 362 insertions(+), 278 deletions(-)

diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index 241c921f20..d6ae0bb739 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -45,7 +46,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_listheader {
-    display: flex;
+    display: block;
     margin-top: 13px;
     margin-bottom: 13px;
 }
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index d402f6c48f..3dc3a99dd4 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,70 +16,143 @@ limitations under the License.
 */
 
 .mx_NetworkDropdown {
+    height: 32px;
     position: relative;
-}
+    width: max-content;
+    padding-right: 32px;
+    margin-left: auto;
+    margin-right: 9px;
+    margin-top: 12px;
 
-.mx_NetworkDropdown_input {
-    position: relative;
-    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
-    font-weight: 300;
-    font-size: 13px;
-    user-select: none;
-}
-
-.mx_NetworkDropdown_arrow {
-    border-color: $primary-fg-color transparent transparent;
-    border-style: solid;
-    border-width: 5px 5px 0;
-    display: block;
-    height: 0;
-    position: absolute;
-    right: 10px;
-    top: 16px;
-    width: 0;
-}
-
-.mx_NetworkDropdown_networkoption {
-    height: 37px;
-    line-height: 37px;
-    padding-left: 8px;
-    padding-right: 8px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.mx_NetworkDropdown_networkoption img {
-    margin: 5px;
-    width: 25px;
-    vertical-align: middle;
-}
-
-input.mx_NetworkDropdown_networkoption, input.mx_NetworkDropdown_networkoption:focus {
-    border: 0;
-    padding-top: 0;
-    padding-bottom: 0;
+    .mx_AccessibleButton {
+        width: max-content;
+    }
 }
 
 .mx_NetworkDropdown_menu {
-    position: absolute;
-    left: -1px;
-    right: -1px;
-    top: 100%;
-    z-index: 2;
+    //position: absolute;
+    //left: -1px;
+    //right: -1px;
+    //top: 100%;
+    //z-index: 2;
+    width: 204px;
     margin: 0;
-    padding: 0px;
-    border-radius: 3px;
+    box-sizing: border-box;
+    border-radius: 4px;
     border: 1px solid $accent-color;
     background-color: $primary-bg-color;
 }
 
-.mx_NetworkDropdown_menu .mx_NetworkDropdown_networkoption:hover {
-    background-color: $focus-bg-color;
-}
-
 .mx_NetworkDropdown_menu_network {
     font-weight: bold;
 }
 
+.mx_NetworkDropdown_server {
+    padding: 12px 0;
+    border-bottom: 1px solid $input-darker-fg-color;
+
+    .mx_NetworkDropdown_server_title {
+        padding: 0 10px;
+        font-size: 15px;
+        font-weight: 600;
+        line-height: 20px;
+        margin-bottom: 4px;
+
+        // remove server button
+        .mx_AccessibleButton {
+            position: absolute;
+            display: inline;
+            right: 0;
+
+            &::before {
+                content: "";
+                position: absolute;
+                width: 16px;
+                height: 16px;
+                right: 12px;
+                top: 4px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+                mask-image: url('$(res)/img/feather-customised/x.svg');
+                background-color: $notice-primary-color;
+            }
+        }
+    }
+
+    .mx_NetworkDropdown_server_subtitle {
+        padding: 0 10px;
+        font-size: 10px;
+        line-height: 14px;
+        margin-top: -4px;
+        margin-bottom: 4px;
+        color: $muted-fg-color;
+    }
+
+    .mx_NetworkDropdown_server_network {
+        font-size: 12px;
+        line-height: 16px;
+        padding: 4px 10px;
+        cursor: pointer;
+        position: relative;
+
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
+        &[aria-checked=true]::after {
+            content: "";
+            position: absolute;
+            width: 16px;
+            height: 16px;
+            right: 10px;
+            mask-repeat: no-repeat;
+            mask-position: center;
+            mask-size: contain;
+            mask-image: url('$(res)/img/feather-customised/check.svg');
+            background-color: $input-valid-border-color;
+        }
+    }
+}
+
+.mx_NetworkDropdown_server_add,
+.mx_NetworkDropdown_server_network {
+    &:hover {
+        background-color: $header-panel-bg-color;
+    }
+}
+
+.mx_NetworkDropdown_server_add {
+    padding: 16px 10px 16px 32px;
+    position: relative;
+
+    &::before {
+        content: "";
+        position: absolute;
+        width: 16px;
+        height: 16px;
+        left: 7px;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        mask-image: url('$(res)/img/feather-customised/plus.svg');
+        background-color: $muted-fg-color;
+    }
+}
+
+.mx_NetworkDropdown_handle {
+    position: relative;
+
+    &::after {
+        content: "";
+        position: absolute;
+        width: 24px;
+        height: 24px;
+        right: -28px; // - (24 + 4)
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+        background-color: $primary-fg-color;
+    }
+}
diff --git a/res/css/views/elements/_DirectorySearchBox.scss b/res/css/views/elements/_DirectorySearchBox.scss
index ef944f6fa0..75ef3fbabd 100644
--- a/res/css/views/elements/_DirectorySearchBox.scss
+++ b/res/css/views/elements/_DirectorySearchBox.scss
@@ -18,7 +18,6 @@ limitations under the License.
     display: flex;
     padding-left: 9px;
     padding-right: 9px;
-    margin: 0 5px 0 0 !important;
 }
 
 .mx_DirectorySearchBox_joinButton {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a0b9a8fe57..0099af8398 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -600,9 +600,8 @@ export default createReactClass({
             break;
             case 'view_room_directory': {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
-                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
-                    config: this.props.config,
-                }, 'mx_RoomDirectory_dialogWrapper');
+                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
+                    'mx_RoomDirectory_dialogWrapper', false, true);
 
                 // View the welcome or home page if we need something to look at
                 this._viewSomethingBehindModal();
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 3c3d67578e..ddc172fca7 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -28,6 +28,7 @@ import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import {ALL_ROOMS} from "../views/directory/NetworkDropdown";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 160;
@@ -40,25 +41,17 @@ export default createReactClass({
     displayName: 'RoomDirectory',
 
     propTypes: {
-        config: PropTypes.object,
         onFinished: PropTypes.func.isRequired,
     },
 
-    getDefaultProps: function() {
-        return {
-            config: {},
-        };
-    },
-
     getInitialState: function() {
         return {
             publicRooms: [],
             loading: true,
             protocolsLoading: true,
             error: null,
-            instanceId: null,
-            includeAll: false,
-            roomServer: null,
+            instanceId: undefined,
+            roomServer: MatrixClientPeg.getHomeserverName(),
             filterString: null,
         };
     },
@@ -98,6 +91,10 @@ export default createReactClass({
         });
     },
 
+    componentDidMount: function() {
+        this.refreshRoomList();
+    },
+
     componentWillUnmount: function() {
         if (this.filterTimeout) {
             clearTimeout(this.filterTimeout);
@@ -130,10 +127,10 @@ export default createReactClass({
         if (my_server != MatrixClientPeg.getHomeserverName()) {
             opts.server = my_server;
         }
-        if (this.state.instanceId) {
-            opts.third_party_instance_id = this.state.instanceId;
-        } else if (this.state.includeAll) {
+        if (this.state.instanceId === ALL_ROOMS) {
             opts.include_all_networks = true;
+        } else if (this.state.instanceId) {
+            opts.third_party_instance_id = this.state.instanceId;
         }
         if (this.nextBatch) opts.since = this.nextBatch;
         if (my_filter_string) opts.filter = { generic_search_term: my_filter_string };
@@ -247,7 +244,7 @@ export default createReactClass({
         }
     },
 
-    onOptionChange: function(server, instanceId, includeAll) {
+    onOptionChange: function(server, instanceId) {
         // clear next batch so we don't try to load more rooms
         this.nextBatch = null;
         this.setState({
@@ -257,7 +254,6 @@ export default createReactClass({
             publicRooms: [],
             roomServer: server,
             instanceId: instanceId,
-            includeAll: includeAll,
             error: null,
         }, this.refreshRoomList);
         // We also refresh the room list each time even though this
@@ -305,7 +301,7 @@ export default createReactClass({
 
     onJoinFromSearchClick: function(alias) {
         // If we don't have a particular instance id selected, just show that rooms alias
-        if (!this.state.instanceId) {
+        if (!this.state.instanceId || this.state.instanceId === ALL_ROOMS) {
             // If the user specified an alias without a domain, add on whichever server is selected
             // in the dropdown
             if (alias.indexOf(':') == -1) {
@@ -587,7 +583,7 @@ export default createReactClass({
             }
 
             let placeholder = _t('Find a room…');
-            if (!this.state.instanceId) {
+            if (!this.state.instanceId || this.state.instanceId === ALL_ROOMS) {
                 placeholder = _t("Find a room… (e.g. %(exampleRoom)s)", {exampleRoom: "#example:" + this.state.roomServer});
             } else if (instance_expected_field_type) {
                 placeholder = instance_expected_field_type.placeholder;
@@ -604,10 +600,18 @@ export default createReactClass({
             listHeader = <div className="mx_RoomDirectory_listheader">
                 <DirectorySearchBox
                     className="mx_RoomDirectory_searchbox"
-                    onChange={this.onFilterChange} onClear={this.onFilterClear} onJoinClick={this.onJoinFromSearchClick}
-                    placeholder={placeholder} showJoinButton={showJoinButton}
+                    onChange={this.onFilterChange}
+                    onClear={this.onFilterClear}
+                    onJoinClick={this.onJoinFromSearchClick}
+                    placeholder={placeholder}
+                    showJoinButton={showJoinButton}
+                />
+                <NetworkDropdown
+                    protocols={this.protocols}
+                    onOptionChange={this.onOptionChange}
+                    selectedServerName={this.state.roomServer}
+                    selectedInstanceId={this.state.instanceId}
                 />
-                <NetworkDropdown config={this.props.config} protocols={this.protocols} onOptionChange={this.onOptionChange} />
             </div>;
         }
         const explanation =
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 0ffc072cc0..4b21e8206e 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -28,9 +28,11 @@ export default createReactClass({
             PropTypes.string,
         ]),
         value: PropTypes.string,
+        placeholder: PropTypes.string,
         button: PropTypes.string,
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
+        hasCancel: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -39,6 +41,7 @@ export default createReactClass({
             value: "",
             description: "",
             focus: true,
+            hasCancel: true,
         };
     },
 
@@ -80,13 +83,17 @@ export default createReactClass({
                                 className="mx_TextInputDialog_input"
                                 defaultValue={this.props.value}
                                 autoFocus={this.props.focus}
+                                placeholder={this.props.placeholder}
                                 size="64" />
                         </div>
                     </div>
                 </form>
-                <DialogButtons primaryButton={this.props.button}
+                <DialogButtons
+                    primaryButton={this.props.button}
                     onPrimaryButtonClick={this.onOk}
-                    onCancel={this.onCancel} />
+                    onCancel={this.onCancel}
+                    hasCancel={this.props.hasCancel}
+                />
             </BaseDialog>
         );
     },
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index cb6a015d86..229f80ef29 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,239 +18,225 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {instanceForInstanceId} from '../../../utils/DirectoryUtils';
+import {ContextMenu, useContextMenu, ContextMenuButton, MenuItemRadio, MenuItem} from "../../structures/ContextMenu";
+import {_t} from "../../../languageHandler";
+import SdkConfig from "../../../SdkConfig";
+import {useSettingValue} from "../../../hooks/useSettings";
+import * as sdk from "../../../index";
+import Modal from "../../../Modal";
+import SettingsStore from "../../../settings/SettingsStore";
+import AccessibleButton from "../elements/AccessibleButton";
 
-const DEFAULT_ICON_URL = require("../../../../res/img/network-matrix.svg");
+export const ALL_ROOMS = Symbol("ALL_ROOMS");
 
-export default class NetworkDropdown extends React.Component {
-    constructor(props) {
-        super(props);
+const SETTING_NAME = "room_directory_servers";
 
-        this.dropdownRootElement = null;
-        this.ignoreEvent = null;
+const inPlaceOf = (elementRect) => ({
+    right: window.innerWidth - elementRect.right,
+    top: elementRect.top,
+    chevronOffset: 0,
+    chevronFace: "none",
+});
 
-        this.onInputClick = this.onInputClick.bind(this);
-        this.onRootClick = this.onRootClick.bind(this);
-        this.onDocumentClick = this.onDocumentClick.bind(this);
-        this.onMenuOptionClick = this.onMenuOptionClick.bind(this);
-        this.onInputKeyUp = this.onInputKeyUp.bind(this);
-        this.collectRoot = this.collectRoot.bind(this);
-        this.collectInputTextBox = this.collectInputTextBox.bind(this);
+// This dropdown sources homeservers from three places:
+// + your currently connected homeserver
+// + homeservers in config.json["roomDirectory"]
+// + homeservers in SettingsStore["room_directory_servers"]
+// if a server exists in multiple, only keep the top-most entry.
 
-        this.inputTextBox = null;
+const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, selectedInstanceId}) => {
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
+    const userDefinedServers = useSettingValue(SETTING_NAME);
 
-        const server = MatrixClientPeg.getHomeserverName();
-        this.state = {
-            expanded: false,
-            selectedServer: server,
-            selectedInstanceId: null,
-            includeAllNetworks: false,
+    const handlerFactory = (server, instanceId) => {
+        return () => {
+            onOptionChange(server, instanceId);
+            closeMenu();
         };
-    }
+    };
 
-    componentWillMount() {
-        // Listen for all clicks on the document so we can close the
-        // menu when the user clicks somewhere else
-        document.addEventListener('click', this.onDocumentClick, false);
+    // we either show the button or the dropdown in its place.
+    let content;
+    if (menuDisplayed) {
+        const config = SdkConfig.get();
+        const roomDirectory = config.roomDirectory || {};
 
-        // fire this now so the defaults can be set up
-        const {selectedServer, selectedInstanceId, includeAllNetworks} = this.state;
-        this.props.onOptionChange(selectedServer, selectedInstanceId, includeAllNetworks);
-    }
+        const hsName = MatrixClientPeg.getHomeserverName();
+        const configServers = new Set(roomDirectory.servers);
 
-    componentWillUnmount() {
-        document.removeEventListener('click', this.onDocumentClick, false);
-    }
-
-    componentDidUpdate() {
-        if (this.state.expanded && this.inputTextBox) {
-            this.inputTextBox.focus();
-        }
-    }
-
-    onDocumentClick(ev) {
-        // Close the dropdown if the user clicks anywhere that isn't
-        // within our root element
-        if (ev !== this.ignoreEvent) {
-            this.setState({
-                expanded: false,
-            });
-        }
-    }
-
-    onRootClick(ev) {
-        // This captures any clicks that happen within our elements,
-        // such that we can then ignore them when they're seen by the
-        // click listener on the document handler, ie. not close the
-        // dropdown immediately after opening it.
-        // NB. We can't just stopPropagation() because then the event
-        // doesn't reach the React onClick().
-        this.ignoreEvent = ev;
-    }
-
-    onInputClick(ev) {
-        this.setState({
-            expanded: !this.state.expanded,
-        });
-        ev.preventDefault();
-    }
-
-    onMenuOptionClick(server, instance, includeAll) {
-        this.setState({
-            expanded: false,
-            selectedServer: server,
-            selectedInstanceId: instance ? instance.instance_id : null,
-            includeAllNetworks: includeAll,
-        });
-        this.props.onOptionChange(server, instance ? instance.instance_id : null, includeAll);
-    }
-
-    onInputKeyUp(e) {
-        if (e.key === 'Enter') {
-            this.setState({
-                expanded: false,
-                selectedServer: e.target.value,
-                selectedNetwork: null,
-                includeAllNetworks: false,
-            });
-            this.props.onOptionChange(e.target.value, null);
-        }
-    }
-
-    collectRoot(e) {
-        if (this.dropdownRootElement) {
-            this.dropdownRootElement.removeEventListener('click', this.onRootClick, false);
-        }
-        if (e) {
-            e.addEventListener('click', this.onRootClick, false);
-        }
-        this.dropdownRootElement = e;
-    }
-
-    collectInputTextBox(e) {
-        this.inputTextBox = e;
-    }
-
-    _getMenuOptions() {
-        const options = [];
-        const roomDirectory = this.props.config.roomDirectory || {};
-
-        let servers = [];
-        if (roomDirectory.servers) {
-            servers = servers.concat(roomDirectory.servers);
-        }
-
-        if (!servers.includes(MatrixClientPeg.getHomeserverName())) {
-            servers.unshift(MatrixClientPeg.getHomeserverName());
-        }
+        // configured servers take preference over user-defined ones, if one occurs in both ignore the latter one.
+        const removableServers = new Set(userDefinedServers.filter(s => !configServers.has(s) && s !== hsName));
+        const servers = [
+            // we always show our connected HS, this takes precedence over it being configured or user-defined
+            hsName,
+            ...Array.from(configServers).filter(s => s !== hsName).sort(),
+            ...Array.from(removableServers).sort(),
+        ];
 
         // For our own HS, we can use the instance_ids given in the third party protocols
         // response to get the server to filter the room list by network for us.
         // We can't get thirdparty protocols for remote server yet though, so for those
         // we can only show the default room list.
-        for (const server of servers) {
-            options.push(this._makeMenuOption(server, null, true));
-            if (server === MatrixClientPeg.getHomeserverName()) {
-                options.push(this._makeMenuOption(server, null, false));
-                if (this.props.protocols) {
-                    for (const proto of Object.keys(this.props.protocols)) {
-                        if (!this.props.protocols[proto].instances) continue;
+        const options = servers.map(server => {
+            const serverSelected = server === selectedServerName;
+            const entries = [];
 
-                        const sortedInstances = this.props.protocols[proto].instances;
-                        sortedInstances.sort(function(x, y) {
-                            const a = x.desc;
-                            const b = y.desc;
-                            if (a < b) {
-                                return -1;
-                            } else if (a > b) {
-                                return 1;
-                            } else {
-                                return 0;
-                            }
-                        });
-
-                        for (const instance of sortedInstances) {
-                            if (!instance.instance_id) continue;
-                            options.push(this._makeMenuOption(server, instance, false));
-                        }
-                    }
-                }
+            const protocolsList = server === hsName ? Object.values(protocols) : [];
+            if (protocolsList.length > 0) {
+                // add a fake protocol with the ALL_ROOMS symbol
+                protocolsList.push({
+                    instances: [{
+                        instance_id: ALL_ROOMS,
+                        desc: _t("All rooms"),
+                    }],
+                });
             }
-        }
 
-        return options;
-    }
+            protocolsList.forEach(({instances=[]}) => {
+                [...instances].sort((b, a) => {
+                    return a.desc.localeCompare(b.desc);
+                }).forEach(({desc, instance_id: instanceId}) => {
+                    entries.push(
+                        <MenuItemRadio
+                            key={String(instanceId)}
+                            active={serverSelected && instanceId === selectedInstanceId}
+                            onClick={handlerFactory(server, instanceId)}
+                            label={desc}
+                            className="mx_NetworkDropdown_server_network"
+                        >
+                            { desc }
+                        </MenuItemRadio>);
+                });
+            });
 
-    _makeMenuOption(server, instance, includeAll, handleClicks) {
-        if (handleClicks === undefined) handleClicks = true;
+            let subtitle;
+            if (server === hsName) {
+                subtitle = (
+                    <div className="mx_NetworkDropdown_server_subtitle">
+                        {_t("Your server")}
+                    </div>
+                );
+            }
 
-        let icon;
-        let name;
-        let key;
+            let removeButton;
+            if (removableServers.has(server)) {
+                const onClick = async () => {
+                    closeMenu();
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    const {finished} = Modal.createTrackedDialog("Network Dropdown", "Remove server", QuestionDialog, {
+                        title: _t("Are you sure?"),
+                        description: _t("Are you sure you want to remove <b>%(serverName)s</b>", {
+                            serverName: server,
+                        }, {
+                            b: serverName => <b>{ serverName }</b>,
+                        }),
+                        button: _t("Remove"),
+                    });
 
-        if (!instance && includeAll) {
-            key = server;
-            name = server;
-        } else if (!instance) {
-            key = server + '_all';
-            name = 'Matrix';
-            icon = <img src={require("../../../../res/img/network-matrix.svg")} />;
-        } else {
-            key = server + '_inst_' + instance.instance_id;
-            const imgUrl = instance.icon ?
-                MatrixClientPeg.get().mxcUrlToHttp(instance.icon, 25, 25, 'crop', true) :
-                DEFAULT_ICON_URL;
-            icon = <img src={imgUrl} />;
-            name = instance.desc;
-        }
+                    const [ok] = await finished;
+                    if (!ok) return;
 
-        const clickHandler = handleClicks ? this.onMenuOptionClick.bind(this, server, instance, includeAll) : null;
+                    // delete from setting
+                    await SettingsStore.setValue(SETTING_NAME, null, "account", servers.filter(s => s !== server));
 
-        return <div key={key} className="mx_NetworkDropdown_networkoption" onClick={clickHandler}>
-            {icon}
-            <span className="mx_NetworkDropdown_menu_network">{name}</span>
-        </div>;
-    }
+                    // the selected server is being removed, reset to our HS
+                    if (serverSelected === server) {
+                        onOptionChange(hsName, undefined);
+                    }
+                };
+                removeButton = <AccessibleButton onClick={onClick} />;
+            }
 
-    render() {
-        let currentValue;
+            return (
+                <div className="mx_NetworkDropdown_server" key={server}>
+                    <div className="mx_NetworkDropdown_server_title">
+                        { server }
+                        { removeButton }
+                    </div>
+                    { subtitle }
 
-        let menu;
-        if (this.state.expanded) {
-            const menuOptions = this._getMenuOptions();
-            menu = <div className="mx_NetworkDropdown_menu">
-                {menuOptions}
-            </div>;
-            currentValue = <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);
-            currentValue = this._makeMenuOption(
-                this.state.selectedServer, instance, this.state.includeAllNetworks, false,
+                    <MenuItemRadio
+                        active={serverSelected && !selectedInstanceId}
+                        onClick={handlerFactory(server, undefined)}
+                        label={_t("Matrix")}
+                        className="mx_NetworkDropdown_server_network"
+                    >
+                        {_t("Matrix")}
+                    </MenuItemRadio>
+                    { entries }
+                </div>
             );
+        });
+
+        const onClick = async () => {
+            closeMenu();
+            const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
+            const { finished } = Modal.createTrackedDialog("Network Dropdown", "Add a new server", TextInputDialog, {
+                title: _t("Add a new server"),
+                description: _t("Enter the address of a new server you want to explore."),
+                button: _t("Add"),
+                hasCancel: false,
+                placeholder: _t("Server address"),
+            });
+
+            const [ok, newServer] = await finished;
+            if (!ok) return;
+
+            if (!userDefinedServers.includes(newServer)) {
+                const servers = [...userDefinedServers, newServer];
+                await SettingsStore.setValue(SETTING_NAME, null, "account", servers);
+            }
+
+            onOptionChange(newServer); // change filter to the new server
+        };
+
+        const buttonRect = handle.current.getBoundingClientRect();
+        content = <ContextMenu {...inPlaceOf(buttonRect)} onFinished={closeMenu} managed={false}>
+            <div className="mx_NetworkDropdown_menu">
+                {options}
+                <MenuItem className="mx_NetworkDropdown_server_add" label={undefined} onClick={onClick}>
+                    {_t("Add a new server...")}
+                </MenuItem>
+            </div>
+        </ContextMenu>;
+    } else {
+        let currentValue;
+        if (selectedInstanceId === ALL_ROOMS) {
+            currentValue = _t("All rooms");
+        } else if (selectedInstanceId) {
+            const instance = instanceForInstanceId(protocols, selectedInstanceId);
+            currentValue = _t("%(networkName)s rooms", {
+                networkName: instance.desc,
+            });
+        } else {
+            currentValue = _t("Matrix rooms");
         }
 
-        return <div className="mx_NetworkDropdown" ref={this.collectRoot}>
-            <div className="mx_NetworkDropdown_input mx_no_textinput" onClick={this.onInputClick}>
+        content = <ContextMenuButton
+            className="mx_NetworkDropdown_handle"
+            label={_t("React")}
+            onClick={openMenu}
+            isExpanded={menuDisplayed}
+        >
+            <span>
                 {currentValue}
-                <span className="mx_NetworkDropdown_arrow" />
-                {menu}
-            </div>
-        </div>;
+            </span> <span>
+                ({selectedServerName})
+            </span>
+        </ContextMenuButton>;
     }
-}
+
+    return <div className="mx_NetworkDropdown" ref={handle}>
+        {content}
+    </div>;
+};
 
 NetworkDropdown.propTypes = {
     onOptionChange: PropTypes.func.isRequired,
     protocols: PropTypes.object,
-    // The room directory config. May have a 'servers' key that is a list of server names to include in the dropdown
-    config: PropTypes.object,
 };
 
-NetworkDropdown.defaultProps = {
-    protocols: {},
-    config: {},
-};
+export default NetworkDropdown;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2f8f5c48ad..a5763fe5c5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1437,6 +1437,15 @@
     "And %(count)s more...|other": "And %(count)s more...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
+    "All rooms": "All rooms",
+    "Your server": "Your server",
+    "Matrix": "Matrix",
+    "Add a new server": "Add a new server",
+    "Enter the address of a new server you want to explore.": "Enter the address of a new server you want to explore.",
+    "Server address": "Server address",
+    "Add a new server...": "Add a new server...",
+    "%(networkName)s rooms": "%(networkName)s rooms",
+    "Matrix rooms": "Matrix rooms",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b77fb392e9..8024c411f7 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -324,6 +324,10 @@ export const SETTINGS = {
         supportedLevels: ['account'],
         default: [],
     },
+    "room_directory_servers": {
+        supportedLevels: ['account'],
+        default: [],
+    },
     "integrationProvisioning": {
         supportedLevels: ['account'],
         default: true,

From dd4dc054aef404745299eb5838d6707eeb532360 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:06:41 +0000
Subject: [PATCH 1502/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a5763fe5c5..b7ba70b62f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1439,6 +1439,7 @@
     "Add User": "Add User",
     "All rooms": "All rooms",
     "Your server": "Your server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Are you sure you want to remove <b>%(serverName)s</b>",
     "Matrix": "Matrix",
     "Add a new server": "Add a new server",
     "Enter the address of a new server you want to explore.": "Enter the address of a new server you want to explore.",

From 343403f1efcdf8b4150d903e0a4d21e49b59d23d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:09:56 +0000
Subject: [PATCH 1503/3235] clean up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 3dc3a99dd4..f3c2f4757a 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -1,5 +1,4 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,11 +29,6 @@ limitations under the License.
 }
 
 .mx_NetworkDropdown_menu {
-    //position: absolute;
-    //left: -1px;
-    //right: -1px;
-    //top: 100%;
-    //z-index: 2;
     width: 204px;
     margin: 0;
     box-sizing: border-box;

From 359b07b8efc667945d3f3476fbd9658dd1f8b21c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:11:09 +0000
Subject: [PATCH 1504/3235] allow it to expand for longer content

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index f3c2f4757a..1f55531602 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -29,7 +29,7 @@ limitations under the License.
 }
 
 .mx_NetworkDropdown_menu {
-    width: 204px;
+    min-width: 204px;
     margin: 0;
     box-sizing: border-box;
     border-radius: 4px;

From 642dd08ca25065237d157e5759efae77d94fe315 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:16:11 +0000
Subject: [PATCH 1505/3235] remove erroneous margin

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RoomDirectory.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index d6ae0bb739..b5ead78b8b 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -48,7 +48,6 @@ limitations under the License.
 .mx_RoomDirectory_listheader {
     display: block;
     margin-top: 13px;
-    margin-bottom: 13px;
 }
 
 .mx_RoomDirectory_searchbox {

From 3628fd2ea26b12ee25d96ef453acd47edca3bc34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:18:33 +0000
Subject: [PATCH 1506/3235] add missing asset

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/feather-customised/chevron-down.svg | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 res/img/feather-customised/chevron-down.svg

diff --git a/res/img/feather-customised/chevron-down.svg b/res/img/feather-customised/chevron-down.svg
new file mode 100644
index 0000000000..bcb185ede7
--- /dev/null
+++ b/res/img/feather-customised/chevron-down.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 9L12 15L18 9" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

From 5a27fa7d97eb6f85171730179cba4cdd3dc9b34f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 00:18:53 +0000
Subject: [PATCH 1507/3235] fix styling of server name in handle

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss     | 5 +++++
 src/components/views/directory/NetworkDropdown.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 1f55531602..f017ed9dcd 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -149,4 +149,9 @@ limitations under the License.
         mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         background-color: $primary-fg-color;
     }
+
+    .mx_NetworkDropdown_handle_server {
+        color: $muted-fg-color;
+        font-size: 12px;
+    }
 }
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 229f80ef29..8369926fb4 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -223,7 +223,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
         >
             <span>
                 {currentValue}
-            </span> <span>
+            </span> <span className="mx_NetworkDropdown_handle_server">
                 ({selectedServerName})
             </span>
         </ContextMenuButton>;

From 949ac2953e1038261ac82dc2817bea491ca9904a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 13 Mar 2020 10:21:37 +0100
Subject: [PATCH 1508/3235] pass current server as via server to join room

---
 src/components/structures/RoomDirectory.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index dd089a9776..6310efffb9 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -406,6 +406,12 @@ export default createReactClass({
                 // would normally decide what the name is.
                 name: room.name || room_alias || _t('Unnamed room'),
             };
+
+            if (this.state.roomServer) {
+                payload.opts = {
+                    viaServers: [this.state.roomServer],
+                };
+            }
         }
         // It's not really possible to join Matrix rooms by ID because the HS has no way to know
         // which servers to start querying. However, there's no other way to join rooms in

From 480dbad887d633e6ce67e38f3172f0c69d33d9df Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 13 Mar 2020 01:58:08 +0000
Subject: [PATCH 1509/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2146 of 2146 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 395b8988b5..c8d520d5a3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2195,5 +2195,6 @@
     "New address (e.g. #foo:domain)": "新位置（例如：#foo:domain）",
     "Local addresses (unmoderated content)": "本機位置（未經審核的內容）",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 將聊天室名稱從 %(oldRoomName)s 變更為 %(newRoomName)s。",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s 變更了此聊天室的位置。"
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s 變更了此聊天室的位置。",
+    "You don't have permission to delete the alias.": "您沒有刪除別名的權限。"
 }

From a612a66b69b9a36da89d9146c648377c7733df04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 13 Mar 2020 11:33:58 +0100
Subject: [PATCH 1510/3235] EventIndex: Properly await the index closing.

---
 src/indexing/EventIndex.js    | 3 ++-
 src/indexing/EventIndexPeg.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a4a9302601..f52e2596bd 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -549,7 +549,8 @@ export default class EventIndex extends EventEmitter {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         this.removeListeners();
         this.stopCrawler();
-        return indexManager.closeEventIndex();
+        await indexManager.closeEventIndex();
+        return;
     }
 
     /**
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 067aea3a7f..9aa7e78eda 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -135,7 +135,7 @@ class EventIndexPeg {
      */
     async unset() {
         if (this.index === null) return;
-        this.index.close();
+        await this.index.close();
         this.index = null;
     }
 
@@ -151,7 +151,7 @@ class EventIndexPeg {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         if (indexManager !== null) {
-            this.unset();
+            await this.unset();
             console.log("EventIndex: Deleting event index.");
             await indexManager.deleteEventIndex();
         }

From 6b44254b4c1a84b6fedf9e8a9c56b17c0d6a669e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 13 Mar 2020 10:21:37 +0100
Subject: [PATCH 1511/3235] pass current server as via server to join room

---
 src/components/structures/RoomDirectory.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index dd089a9776..6310efffb9 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -406,6 +406,12 @@ export default createReactClass({
                 // would normally decide what the name is.
                 name: room.name || room_alias || _t('Unnamed room'),
             };
+
+            if (this.state.roomServer) {
+                payload.opts = {
+                    viaServers: [this.state.roomServer],
+                };
+            }
         }
         // It's not really possible to join Matrix rooms by ID because the HS has no way to know
         // which servers to start querying. However, there's no other way to join rooms in

From b83c1d04e7bbc953bc33fee0e680b5dd6735db6d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 13 Mar 2020 13:59:56 +0100
Subject: [PATCH 1512/3235] wrap room name in room preview bar

---
 res/css/views/rooms/_RoomPreviewBar.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 85b6916226..b3f6a12103 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -25,6 +25,9 @@ limitations under the License.
     h3 {
         font-size: 18px;
         font-weight: 600;
+        // break-word, with fallback to break-all, which is wider supported
+        word-break: break-all;
+        word-break: break-word;
 
         &.mx_RoomPreviewBar_spinnerTitle {
             display: flex;

From cb368a06012918289e1cb14362497cdaae27ecda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 13 Mar 2020 14:12:48 +0100
Subject: [PATCH 1513/3235] EventIndex: Remove a checkpoint if the HTTP request
 returns a 403.

This fixes https://github.com/vector-im/riot-web/issues/12722.
---
 src/indexing/EventIndex.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c8a9a4c1fa..a9c27a254f 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -373,6 +373,21 @@ export default class EventIndex extends EventEmitter {
                     checkpoint.roomId, checkpoint.token, this._eventsPerCrawl,
                     checkpoint.direction);
             } catch (e) {
+                if (e.httpStatus === 403) {
+                    console.log("EventIndex: Removing checkpoint as we don't have ",
+                                "permissions to fetch messages from this room.", checkpoint);
+                    try {
+                        await indexManager.removeCrawlerCheckpoint(checkpoint);
+                    } catch (e) {
+                        console.log("EventIndex: Error removing checkpoint", checkpoint, e);
+                        // We don't push the checkpoint here back, it will
+                        // hopefully be removed after a restart. But let us
+                        // ignore it for now as we don't want to hammer the
+                        // endpoint.
+                    }
+                    continue;
+                }
+
                 console.log("EventIndex: Error crawling events:", e);
                 this.crawlerCheckpoints.push(checkpoint);
                 continue;

From 9237cf956640f73d79ddb884b127b8cb46f2ad33 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 14:19:38 +0000
Subject: [PATCH 1514/3235] update font sizes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_RoomDirectory.scss        | 5 +++--
 res/css/views/directory/_NetworkDropdown.scss | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index b5ead78b8b..f3a7b0e243 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -64,7 +64,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_table {
-    font-size: 14px;
+    font-size: 12px;
     color: $primary-fg-color;
     width: 100%;
     text-align: left;
@@ -112,6 +112,7 @@ limitations under the License.
 
 .mx_RoomDirectory_name {
     display: inline-block;
+    font-size: 18px;
     font-weight: 600;
 }
 
@@ -149,7 +150,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory > span {
-    font-size: 14px;
+    font-size: 15px;
     margin-top: 0;
 
     .mx_AccessibleButton {
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index f017ed9dcd..7e8a2e16d1 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -58,7 +58,7 @@ limitations under the License.
             display: inline;
             right: 0;
 
-            &::before {
+            &::after {
                 content: "";
                 position: absolute;
                 width: 16px;

From af368a4736f546aec0ff24e29ead2aa16bf9b692 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 14:38:36 +0000
Subject: [PATCH 1515/3235] Improve accessibility

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss |  5 +++--
 src/components/structures/ContextMenu.js      |  3 +--
 .../views/directory/NetworkDropdown.js        | 20 +++++++++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 7e8a2e16d1..28dd1ed628 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -56,14 +56,15 @@ limitations under the License.
         .mx_AccessibleButton {
             position: absolute;
             display: inline;
-            right: 0;
+            right: 12px;
+            height: 16px;
+            width: 16px;
 
             &::after {
                 content: "";
                 position: absolute;
                 width: 16px;
                 height: 16px;
-                right: 12px;
                 top: 4px;
                 mask-repeat: no-repeat;
                 mask-position: center;
diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js
index 898991f4f2..b4647a6c30 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.js
@@ -350,7 +350,7 @@ export const ContextMenuButton = ({ label, isExpanded, children, ...props }) =>
 };
 ContextMenuButton.propTypes = {
     ...AccessibleButton.propTypes,
-    label: PropTypes.string.isRequired,
+    label: PropTypes.string,
     isExpanded: PropTypes.bool.isRequired, // whether or not the context menu is currently open
 };
 
@@ -377,7 +377,6 @@ export const MenuGroup = ({children, label, ...props}) => {
     </div>;
 };
 MenuGroup.propTypes = {
-    ...AccessibleButton.propTypes,
     label: PropTypes.string.isRequired,
     className: PropTypes.string, // optional
 };
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 8369926fb4..637fb09c18 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -21,7 +21,14 @@ import PropTypes from 'prop-types';
 
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {instanceForInstanceId} from '../../../utils/DirectoryUtils';
-import {ContextMenu, useContextMenu, ContextMenuButton, MenuItemRadio, MenuItem} from "../../structures/ContextMenu";
+import {
+    ContextMenu,
+    useContextMenu,
+    ContextMenuButton,
+    MenuItemRadio,
+    MenuItem,
+    MenuGroup
+} from "../../structures/ContextMenu";
 import {_t} from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import {useSettingValue} from "../../../hooks/useSettings";
@@ -147,11 +154,13 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                         onOptionChange(hsName, undefined);
                     }
                 };
-                removeButton = <AccessibleButton onClick={onClick} />;
+                removeButton = <MenuItem onClick={onClick} label={_t("Remove server")} />;
             }
 
+            // ARIA: in actual fact the entire menu is one large radio group but for better screen reader support
+            // we use group to notate server wrongly.
             return (
-                <div className="mx_NetworkDropdown_server" key={server}>
+                <MenuGroup label={server} className="mx_NetworkDropdown_server" key={server}>
                     <div className="mx_NetworkDropdown_server_title">
                         { server }
                         { removeButton }
@@ -167,7 +176,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                         {_t("Matrix")}
                     </MenuItemRadio>
                     { entries }
-                </div>
+                </MenuGroup>
             );
         });
 
@@ -194,7 +203,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
         };
 
         const buttonRect = handle.current.getBoundingClientRect();
-        content = <ContextMenu {...inPlaceOf(buttonRect)} onFinished={closeMenu} managed={false}>
+        content = <ContextMenu {...inPlaceOf(buttonRect)} onFinished={closeMenu}>
             <div className="mx_NetworkDropdown_menu">
                 {options}
                 <MenuItem className="mx_NetworkDropdown_server_add" label={undefined} onClick={onClick}>
@@ -217,7 +226,6 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
 
         content = <ContextMenuButton
             className="mx_NetworkDropdown_handle"
-            label={_t("React")}
             onClick={openMenu}
             isExpanded={menuDisplayed}
         >

From 401d85ea6fd156bd2f2f46ce7a86db694a4deeaf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 14:42:19 +0000
Subject: [PATCH 1516/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/directory/NetworkDropdown.js | 3 +--
 src/i18n/strings/en_EN.json                       | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 637fb09c18..22f919b162 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -27,7 +27,7 @@ import {
     ContextMenuButton,
     MenuItemRadio,
     MenuItem,
-    MenuGroup
+    MenuGroup,
 } from "../../structures/ContextMenu";
 import {_t} from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
@@ -35,7 +35,6 @@ import {useSettingValue} from "../../../hooks/useSettings";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import SettingsStore from "../../../settings/SettingsStore";
-import AccessibleButton from "../elements/AccessibleButton";
 
 export const ALL_ROOMS = Symbol("ALL_ROOMS");
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b7ba70b62f..59bc643539 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1440,6 +1440,7 @@
     "All rooms": "All rooms",
     "Your server": "Your server",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Are you sure you want to remove <b>%(serverName)s</b>",
+    "Remove server": "Remove server",
     "Matrix": "Matrix",
     "Add a new server": "Add a new server",
     "Enter the address of a new server you want to explore.": "Enter the address of a new server you want to explore.",

From 84332184b518b9609cda77e7becb75d4761d0bb7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 14:50:41 +0000
Subject: [PATCH 1517/3235] no need to await here as settings take a while to
 effect, we watch them elsewhere

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss     | 2 +-
 src/components/views/directory/NetworkDropdown.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 28dd1ed628..61f9825143 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -59,13 +59,13 @@ limitations under the License.
             right: 12px;
             height: 16px;
             width: 16px;
+            margin-top: 4px;
 
             &::after {
                 content: "";
                 position: absolute;
                 width: 16px;
                 height: 16px;
-                top: 4px;
                 mask-repeat: no-repeat;
                 mask-position: center;
                 mask-size: contain;
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 22f919b162..c4a70c112e 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -146,7 +146,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                     if (!ok) return;
 
                     // delete from setting
-                    await SettingsStore.setValue(SETTING_NAME, null, "account", servers.filter(s => s !== server));
+                    SettingsStore.setValue(SETTING_NAME, null, "account", servers.filter(s => s !== server));
 
                     // the selected server is being removed, reset to our HS
                     if (serverSelected === server) {
@@ -195,7 +195,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
 
             if (!userDefinedServers.includes(newServer)) {
                 const servers = [...userDefinedServers, newServer];
-                await SettingsStore.setValue(SETTING_NAME, null, "account", servers);
+                SettingsStore.setValue(SETTING_NAME, null, "account", servers);
             }
 
             onOptionChange(newServer); // change filter to the new server

From 4de0e21a4b596a0ef6083c00afd860c407a14dda Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 15:28:22 +0000
Subject: [PATCH 1518/3235] fix styling mistakes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 61f9825143..b23af0b2a0 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -33,7 +33,7 @@ limitations under the License.
     margin: 0;
     box-sizing: border-box;
     border-radius: 4px;
-    border: 1px solid $accent-color;
+    border: 1px solid $dialog-close-fg-color;
     background-color: $primary-bg-color;
 }
 
@@ -120,6 +120,7 @@ limitations under the License.
 .mx_NetworkDropdown_server_add {
     padding: 16px 10px 16px 32px;
     position: relative;
+    border-radius: 0 0 4px 4px;
 
     &::before {
         content: "";

From ee1659625cfa7affa8ec873279cca35d3b5cd518 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 17:32:02 +0000
Subject: [PATCH 1519/3235] Add Field validation to TextInputDialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/TextInputDialog.js          | 59 +++++++++++++++----
 .../views/directory/NetworkDropdown.js        | 30 ++++++++++
 src/i18n/strings/en_EN.json                   |  3 +
 3 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 4b21e8206e..e56e9f2b87 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -18,6 +18,7 @@ import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
+import Field from "../elements/Field";
 
 export default createReactClass({
     displayName: 'TextInputDialog',
@@ -33,6 +34,7 @@ export default createReactClass({
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
         hasCancel: PropTypes.bool,
+        validator: PropTypes.func, // result of withValidation
     },
 
     getDefaultProps: function() {
@@ -45,25 +47,57 @@ export default createReactClass({
         };
     },
 
+    getInitialState: function() {
+        return {
+            value: this.props.value,
+            valid: false,
+        };
+    },
+
     UNSAFE_componentWillMount: function() {
-        this._textinput = createRef();
+        this._field = createRef();
     },
 
     componentDidMount: function() {
         if (this.props.focus) {
             // Set the cursor at the end of the text input
-            this._textinput.current.value = this.props.value;
+            // this._field.current.value = this.props.value;
+            this._field.current.focus();
         }
     },
 
-    onOk: function() {
-        this.props.onFinished(true, this._textinput.current.value);
+    onOk: async function(ev) {
+        ev.preventDefault();
+        if (this.props.validator) {
+            await this._field.current.validate({ allowEmpty: false });
+
+            if (!this._field.current.state.valid) {
+                this._field.current.focus();
+                this._field.current.validate({ allowEmpty: false, focused: true });
+                return;
+            }
+        }
+        this.props.onFinished(true, this.state.value);
     },
 
     onCancel: function() {
         this.props.onFinished(false);
     },
 
+    onChange: function(ev) {
+        this.setState({
+            value: ev.target.value,
+        });
+    },
+
+    onValidate: async function(fieldState) {
+        const result = await this.props.validator(fieldState);
+        this.setState({
+            valid: result.valid,
+        });
+        return result;
+    },
+
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -77,14 +111,17 @@ export default createReactClass({
                             <label htmlFor="textinput"> { this.props.description } </label>
                         </div>
                         <div>
-                            <input
-                                id="textinput"
-                                ref={this._textinput}
+                            <Field
+                                id="mx_TextInputDialog_field"
                                 className="mx_TextInputDialog_input"
-                                defaultValue={this.props.value}
-                                autoFocus={this.props.focus}
-                                placeholder={this.props.placeholder}
-                                size="64" />
+                                ref={this._field}
+                                type="text"
+                                label={this.props.placeholder}
+                                value={this.state.value}
+                                onChange={this.onChange}
+                                onValidate={this.props.validator ? this.onValidate : undefined}
+                                size="64"
+                            />
                         </div>
                     </div>
                 </form>
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index c4a70c112e..6d1501ca57 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -35,6 +35,7 @@ import {useSettingValue} from "../../../hooks/useSettings";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import SettingsStore from "../../../settings/SettingsStore";
+import withValidation from "../elements/Validation";
 
 export const ALL_ROOMS = Symbol("ALL_ROOMS");
 
@@ -47,6 +48,34 @@ const inPlaceOf = (elementRect) => ({
     chevronFace: "none",
 });
 
+const validServer = withValidation({
+    rules: [
+        {
+            key: "required",
+            test: async ({ value }) => !!value,
+            invalid: () => _t("Enter a server address"),
+        }, {
+            key: "available",
+            final: true,
+            test: async ({ value }) => {
+                try {
+                    const opts = {
+                        limit: 1,
+                        server: value,
+                    };
+                    // check if we can successfully load this server's room directory
+                    await MatrixClientPeg.get().publicRooms(opts);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            },
+            valid: () => _t("Looks good"),
+            invalid: () => _t("Can't find this server or its room list"),
+        },
+    ],
+});
+
 // This dropdown sources homeservers from three places:
 // + your currently connected homeserver
 // + homeservers in config.json["roomDirectory"]
@@ -188,6 +217,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                 button: _t("Add"),
                 hasCancel: false,
                 placeholder: _t("Server address"),
+                validator: validServer,
             });
 
             const [ok, newServer] = await finished;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 59bc643539..3f20d4ec61 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1437,6 +1437,9 @@
     "And %(count)s more...|other": "And %(count)s more...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
+    "Enter a server address": "Enter a server address",
+    "Looks good": "Looks good",
+    "Can't find this server or its room list": "Can't find this server or its room list",
     "All rooms": "All rooms",
     "Your server": "Your server",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Are you sure you want to remove <b>%(serverName)s</b>",

From 6137e5d5d8d5881d4f3765e3cff34365bbd439c8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 17:52:06 +0000
Subject: [PATCH 1520/3235] Fix typo in tabIndex to make React happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 0fe0ff3d8c..2143c7f1a8 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -780,7 +780,7 @@ export default createReactClass({
                     aria-label={_t("Rooms")}
                     // Firefox sometimes makes this element focusable due to
                     // overflow:scroll;, so force it out of tab order.
-                    tabindex="-1"
+                    tabIndex="-1"
                     onMouseMove={this.onMouseMove}
                     onMouseLeave={this.onMouseLeave}
                 >

From 714f9dbfcbfb23a8060ed94af8743c37b2d69f92 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 13 Mar 2020 15:57:38 +0000
Subject: [PATCH 1521/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2145 of 2152 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 5a6f192809..a5f896bc43 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2177,5 +2177,19 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hoqi adresat alternative %(addresses)s për këtë dhomë.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hoqi adresën alternative %(addresses)s për këtë dhomë.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ndryshoi adresat alternative për këtë dhomë.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ndryshoi adresat kryesore dhe alternative për këtë dhomë."
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ndryshoi adresat kryesore dhe alternative për këtë dhomë.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ndryshoi emrin e dhomës nga %(oldRoomName)s në %(newRoomName)s.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s ndryshoi adresat për këtë dhomë.",
+    "Support adding custom themes": "Mbulim shtimi temash vetjake",
+    "Invalid theme schema.": "Skemë e pavlefshme teme.",
+    "Error downloading theme information.": "Gabim në shkarkim të dhënash teme.",
+    "Theme added!": "Tema u shtua!",
+    "Custom theme URL": "URL teme vetjake",
+    "Add theme": "Shtoni temë",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Pati një gabim gjatë përditësimit të adresave alternative të dhomës. Mund të mos lejohet nga shërbyesi pse ndodhi një gabim i përkohshëm.",
+    "You don't have permission to delete the alias.": "S’keni leje të fshini aliasin.",
+    "Alternative addresses for this room:": "Adresa alternative për këtë dhomë:",
+    "This room has no alternative addresses": "Kjo dhomë nuk ka adresa alternative",
+    "New address (e.g. #foo:domain)": "Adresë e re (p.sh., #foo:domain)",
+    "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)"
 }

From e927ab6ad4292e56ed5081ee423e66369643739c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 13 Mar 2020 22:21:34 +0000
Subject: [PATCH 1522/3235] Move to composer when typing letters with Shift
 held

We already jump to the composer for unshifted typing, but we should also do so
with Shift as well.

Fixes https://github.com/vector-im/riot-web/issues/12734
---
 src/components/structures/LoggedInView.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 20217548b7..d643c82120 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -337,13 +337,13 @@ const LoggedInView = createReactClass({
 
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
-        const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey ||
-            ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
+        const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
+        const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
 
         switch (ev.key) {
             case Key.PAGE_UP:
             case Key.PAGE_DOWN:
-                if (!hasModifier) {
+                if (!hasModifier && !isModifier) {
                     this._onScrollKeyPressed(ev);
                     handled = true;
                 }
@@ -384,7 +384,10 @@ const LoggedInView = createReactClass({
         if (handled) {
             ev.stopPropagation();
             ev.preventDefault();
-        } else if (!hasModifier) {
+        } else if (!isModifier && !ev.altKey && !ev.ctrlKey && !ev.metaKey) {
+            // The above condition is crafted to _allow_ characters with Shift
+            // already pressed (but not the Shift key down itself).
+
             const isClickShortcut = ev.target !== document.body &&
                 (ev.key === Key.SPACE || ev.key === Key.ENTER);
 

From 1347d61671e9939ccfd725c93c9da079996a2c85 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:22:13 +0000
Subject: [PATCH 1523/3235] Remove low hanging Gemini consumers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/groups/GroupMemberInfo.js | 6 +++---
 src/components/views/groups/GroupMemberList.js | 6 +++---
 src/components/views/groups/GroupRoomInfo.js   | 6 +++---
 src/components/views/groups/GroupRoomList.js   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index e659352b74..f70c769ad7 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -27,6 +27,7 @@ import { GroupMemberType } from '../../../groups';
 import GroupStore from '../../../stores/GroupStore';
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 export default createReactClass({
     displayName: 'GroupMemberInfo',
@@ -182,10 +183,9 @@ export default createReactClass({
             this.props.groupMember.displayname || this.props.groupMember.userId
         );
 
-        const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
         return (
             <div className="mx_MemberInfo" role="tabpanel">
-                <GeminiScrollbarWrapper autoshow={true}>
+                <AutoHideScrollbar>
                     <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
                         <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" className="mx_filterFlipColor" />
                     </AccessibleButton>
@@ -199,7 +199,7 @@ export default createReactClass({
                     </div>
 
                     { adminTools }
-                </GeminiScrollbarWrapper>
+                </AutoHideScrollbar>
             </div>
         );
     },
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 05af70b266..2853e70afa 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -26,6 +26,7 @@ import { showGroupInviteDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
 import TintableSvg from '../elements/TintableSvg';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 
@@ -172,7 +173,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.state.fetching || this.state.fetchingInvitedMembers) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return (<div className="mx_MemberList">
@@ -225,10 +225,10 @@ export default createReactClass({
         return (
             <div className="mx_MemberList" role="tabpanel">
                 { inviteButton }
-                <GeminiScrollbarWrapper autoshow={true}>
+                <AutoHideScrollbar>
                     { joined }
                     { invited }
-                </GeminiScrollbarWrapper>
+                </AutoHideScrollbar>
                 { inputBox }
             </div>
         );
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 7b9f43f15f..91d84be4d1 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -24,6 +24,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import GroupStore from '../../../stores/GroupStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 export default createReactClass({
     displayName: 'GroupRoomInfo',
@@ -153,7 +154,6 @@ export default createReactClass({
     render: function() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.state.groupRoomRemoveLoading || !this.state.groupRoom) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return <div className="mx_MemberInfo">
@@ -216,7 +216,7 @@ export default createReactClass({
         const groupRoomName = this.state.groupRoom.displayname;
         return (
             <div className="mx_MemberInfo" role="tabpanel">
-                <GeminiScrollbarWrapper autoshow={true}>
+                <AutoHideScrollbar>
                     <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
                         <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" className="mx_filterFlipColor" />
                     </AccessibleButton>
@@ -231,7 +231,7 @@ export default createReactClass({
                     </div>
 
                     { adminTools }
-                </GeminiScrollbarWrapper>
+                </AutoHideScrollbar>
             </div>
         );
     },
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 5fd8c9f31d..dee304e1f6 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -22,6 +22,7 @@ import PropTypes from 'prop-types';
 import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
 import TintableSvg from '../elements/TintableSvg';
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 const INITIAL_LOAD_NUM_ROOMS = 30;
 
@@ -150,17 +151,16 @@ export default createReactClass({
                     placeholder={_t('Filter community rooms')} autoComplete="off" />
         );
 
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return (
             <div className="mx_GroupRoomList" role="tabpanel">
                 { inviteButton }
-                <GeminiScrollbarWrapper autoshow={true} className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
+                <AutoHideScrollbar className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
                     <TruncatedList className="mx_GroupRoomList_wrapper" truncateAt={this.state.truncateAt}
                             createOverflowElement={this._createOverflowTile}>
                         { this.makeGroupRoomTiles(this.state.searchQuery) }
                     </TruncatedList>
-                </GeminiScrollbarWrapper>
+                </AutoHideScrollbar>
                 { inputBox }
             </div>
         );

From a9f414dafed7a00ffab9eec4494367c0ce1c1cc4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:23:23 +0000
Subject: [PATCH 1524/3235] Remove unused SearchableEntityList.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |   1 -
 .../views/rooms/_SearchableEntityList.scss    |  77 --------
 src/components/structures/RoomView.js         |  15 --
 .../views/rooms/SearchableEntityList.js       | 186 ------------------
 4 files changed, 279 deletions(-)
 delete mode 100644 res/css/views/rooms/_SearchableEntityList.scss
 delete mode 100644 src/components/views/rooms/SearchableEntityList.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index bc636eb3c6..68322b9660 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -177,7 +177,6 @@
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
-@import "./views/rooms/_SearchableEntityList.scss";
 @import "./views/rooms/_SendMessageComposer.scss";
 @import "./views/rooms/_Stickers.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
diff --git a/res/css/views/rooms/_SearchableEntityList.scss b/res/css/views/rooms/_SearchableEntityList.scss
deleted file mode 100644
index 37a663123d..0000000000
--- a/res/css/views/rooms/_SearchableEntityList.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 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.
-*/
-
-.mx_SearchableEntityList {
-    display: flex;
-
-    flex-direction: column;
-}
-
-.mx_SearchableEntityList_query {
-    font-family: $font-family;
-    border-radius: 3px;
-    border: 1px solid $input-border-color;
-    padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
-    margin-left: 3px;
-    font-size: 15px;
-    margin-bottom: 8px;
-    width: 189px;
-}
-
-.mx_SearchableEntityList_query::-moz-placeholder {
-    color: $primary-fg-color;
-    opacity: 0.5;
-    font-size: 12px;
-}
-
-.mx_SearchableEntityList_query::-webkit-input-placeholder {
-    color: $primary-fg-color;
-    opacity: 0.5;
-    font-size: 12px;
-}
-
-.mx_SearchableEntityList_listWrapper {
-    flex: 1;
-
-    overflow-y: auto;
-}
-
-.mx_SearchableEntityList_list {
-    display: table;
-    table-layout: fixed;
-    width: 100%;
-}
-
-.mx_SearchableEntityList_list .mx_EntityTile_chevron {
-    display: none;
-}
-
-.mx_SearchableEntityList_hrWrapper {
-    width: 100%;
-    flex: 0 0 auto;
-}
-
-.mx_SearchableEntityList hr {
-    height: 1px;
-    border: 0px;
-    color: $primary-fg-color;
-    background-color: $primary-fg-color;
-    margin-right: 15px;
-    margin-top: 11px;
-    margin-bottom: 11px;
-}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 36e30343e4..17a496b037 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -405,21 +405,6 @@ export default createReactClass({
         this.onResize();
 
         document.addEventListener("keydown", this.onKeyDown);
-
-        // XXX: EVIL HACK to autofocus inviting on empty rooms.
-        // We use the setTimeout to avoid racing with focus_composer.
-        if (this.state.room &&
-            this.state.room.getJoinedMemberCount() == 1 &&
-            this.state.room.getLiveTimeline() &&
-            this.state.room.getLiveTimeline().getEvents() &&
-            this.state.room.getLiveTimeline().getEvents().length <= 6) {
-            const inviteBox = document.getElementById("mx_SearchableEntityList_query");
-            setTimeout(function() {
-                if (inviteBox) {
-                    inviteBox.focus();
-                }
-            }, 50);
-        }
     },
 
     shouldComponentUpdate: function(nextProps, nextState) {
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
deleted file mode 100644
index 807ddbf729..0000000000
--- a/src/components/views/rooms/SearchableEntityList.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 createReactClass from 'create-react-class';
-import * as sdk from "../../../index";
-import { _t } from '../../../languageHandler';
-
-// A list capable of displaying entities which conform to the SearchableEntity
-// interface which is an object containing getJsx(): Jsx and matches(query: string): boolean
-const SearchableEntityList = createReactClass({
-    displayName: 'SearchableEntityList',
-
-    propTypes: {
-        emptyQueryShowsAll: PropTypes.bool,
-        showInputBox: PropTypes.bool,
-        onQueryChanged: PropTypes.func, // fn(inputText)
-        onSubmit: PropTypes.func, // fn(inputText)
-        entities: PropTypes.array,
-        truncateAt: PropTypes.number,
-    },
-
-    getDefaultProps: function() {
-        return {
-            showInputBox: true,
-            entities: [],
-            emptyQueryShowsAll: false,
-            onSubmit: function() {},
-            onQueryChanged: function(input) {},
-        };
-    },
-
-    getInitialState: function() {
-        return {
-            query: "",
-            focused: false,
-            truncateAt: this.props.truncateAt,
-            results: this.getSearchResults("", this.props.entities),
-        };
-    },
-
-    componentWillReceiveProps: function(newProps) {
-        // recalculate the search results in case we got new entities
-        this.setState({
-            results: this.getSearchResults(this.state.query, newProps.entities),
-        });
-    },
-
-    componentWillUnmount: function() {
-        // pretend the query box was blanked out else filters could still be
-        // applied to other components which rely on onQueryChanged.
-        this.props.onQueryChanged("");
-    },
-
-    /**
-     * Public-facing method to set the input query text to the given input.
-     * @param {string} input
-     */
-    setQuery: function(input) {
-        this.setState({
-            query: input,
-            results: this.getSearchResults(input, this.props.entities),
-        });
-    },
-
-    onQueryChanged: function(ev) {
-        const q = ev.target.value;
-        this.setState({
-            query: q,
-            // reset truncation if they back out the entire text
-            truncateAt: (q.length === 0 ? this.props.truncateAt : this.state.truncateAt),
-            results: this.getSearchResults(q, this.props.entities),
-        }, () => {
-            // invoke the callback AFTER we've flushed the new state. We need to
-            // do this because onQueryChanged can result in new props being passed
-            // to this component, which will then try to recalculate the search
-            // list. If we do this without flushing, we'll recalc with the last
-            // search term and not the current one!
-            this.props.onQueryChanged(q);
-        });
-    },
-
-    onQuerySubmit: function(ev) {
-        ev.preventDefault();
-        this.props.onSubmit(this.state.query);
-    },
-
-    getSearchResults: function(query, entities) {
-        if (!query || query.length === 0) {
-            return this.props.emptyQueryShowsAll ? entities : [];
-        }
-        return entities.filter(function(e) {
-            return e.matches(query);
-        });
-    },
-
-    _showAll: function() {
-        this.setState({
-            truncateAt: -1,
-        });
-    },
-
-    _createOverflowEntity: function(overflowCount, totalCount) {
-        const EntityTile = sdk.getComponent("rooms.EntityTile");
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        const text = _t("and %(count)s others...", { count: overflowCount });
-        return (
-            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
-                <BaseAvatar url={require("../../../../res/img/ellipsis.svg")} name="..." width={36} height={36} />
-            } name={text} presenceState="online" suppressOnHover={true}
-            onClick={this._showAll} />
-        );
-    },
-
-    render: function() {
-        let inputBox;
-
-        if (this.props.showInputBox) {
-            inputBox = (
-                <form onSubmit={this.onQuerySubmit} autoComplete="off">
-                    <input className="mx_SearchableEntityList_query" id="mx_SearchableEntityList_query" type="text"
-                        onChange={this.onQueryChanged} value={this.state.query}
-                        onFocus= {() => { this.setState({ focused: true }); }}
-                        onBlur= {() => { this.setState({ focused: false }); }}
-                        placeholder={_t("Search")} />
-                </form>
-            );
-        }
-
-        let list;
-        if (this.state.results.length > 1 || this.state.focused) {
-            if (this.props.truncateAt) { // caller wants list truncated
-                const TruncatedList = sdk.getComponent("elements.TruncatedList");
-                list = (
-                    <TruncatedList className="mx_SearchableEntityList_list"
-                            truncateAt={this.state.truncateAt} // use state truncation as it may be expanded
-                            createOverflowElement={this._createOverflowEntity}>
-                        { this.state.results.map((entity) => {
-                            return entity.getJsx();
-                        }) }
-                    </TruncatedList>
-                );
-            } else {
-                list = (
-                    <div className="mx_SearchableEntityList_list">
-                        { this.state.results.map((entity) => {
-                            return entity.getJsx();
-                        }) }
-                    </div>
-                );
-            }
-            const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
-            list = (
-                <GeminiScrollbarWrapper autoshow={true}
-                                 className="mx_SearchableEntityList_listWrapper">
-                    { list }
-                </GeminiScrollbarWrapper>
-            );
-        }
-
-        return (
-            <div className={"mx_SearchableEntityList " + (list ? "mx_SearchableEntityList_expanded" : "")}>
-                { inputBox }
-                { list }
-                { list ? <div className="mx_SearchableEntityList_hrWrapper"><hr /></div> : '' }
-            </div>
-        );
-    },
-});
-
-export default SearchableEntityList;

From 30d971b81970215cb3719afc343e3e5e1fa7c8b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:36:52 +0000
Subject: [PATCH 1525/3235] migrate MyGroups away from Gemini

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_MyGroups.scss     | 8 +++++---
 src/components/structures/MyGroups.js | 6 ++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index d25789ab94..9556fd57e3 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -67,9 +67,6 @@ limitations under the License.
     }
 }
 
-
-
-
 .mx_MyGroups_headerCard_header {
     font-weight: bold;
     margin-bottom: 10px;
@@ -100,6 +97,11 @@ limitations under the License.
     flex-direction: column;
 }
 
+.mx_MyGroups_content,
+.mx_MyGroups_scrollable {
+    overflow-y: scroll;
+}
+
 .mx_MyGroups_placeholder {
     background-color: $info-plinth-bg-color;
     color: $info-plinth-fg-color;
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index b26ab5ff70..b7efa2d00a 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -62,8 +62,6 @@ export default createReactClass({
         const Loader = sdk.getComponent("elements.Spinner");
         const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         const GroupTile = sdk.getComponent("groups.GroupTile");
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
-
 
         let content;
         let contentHeader;
@@ -74,7 +72,7 @@ export default createReactClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <GeminiScrollbarWrapper>
+                <div className="mx_MyGroups_scrollable">
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(
@@ -93,7 +91,7 @@ export default createReactClass({
                     <div className="mx_MyGroups_joinedGroups">
                         { groupNodes }
                     </div>
-                </GeminiScrollbarWrapper> :
+                </div> :
                 <div className="mx_MyGroups_placeholder">
                     { _t(
                         "You're not currently a member of any communities.",

From c77ba71f895b3d87f42020bcfa2525ffa8b174f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:39:42 +0000
Subject: [PATCH 1526/3235] migrate EmbeddedPage away from Gemini

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/EmbeddedPage.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index 6d734c3838..f854dc955f 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -23,11 +23,11 @@ import PropTypes from 'prop-types';
 import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
-import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "./AutoHideScrollbar";
 
 export default class EmbeddedPage extends React.PureComponent {
     static propTypes = {
@@ -117,10 +117,9 @@ export default class EmbeddedPage extends React.PureComponent {
         </div>;
 
         if (this.props.scrollbar) {
-            const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
-            return <GeminiScrollbarWrapper autoshow={true} className={classes}>
+            return <AutoHideScrollbar className={classes}>
                 {content}
-            </GeminiScrollbarWrapper>;
+            </AutoHideScrollbar>;
         } else {
             return <div className={classes}>
                 {content}

From b68d4583d19bcf0d5e6f3fcda3652a84faf32587 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:49:28 +0000
Subject: [PATCH 1527/3235] migrate UnknownDeviceDialog away from Gemini

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_UnknownDeviceDialog.scss     | 1 +
 src/components/views/dialogs/UnknownDeviceDialog.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
index 02e0fb1fe5..4c3bb9bdd3 100644
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -44,6 +44,7 @@ limitations under the License.
 
 .mx_UnknownDeviceDialog .mx_Dialog_content {
     margin-bottom: 24px;
+    overflow-y: scroll;
 }
 
 .mx_UnknownDeviceDialog_deviceList > li {
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index d58961f964..3d5300fe92 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -168,7 +168,7 @@ export default createReactClass({
                 title={_t('Room contains unknown sessions')}
                 contentId='mx_Dialog_content'
             >
-                <GeminiScrollbarWrapper autoshow={false} className="mx_Dialog_content" id='mx_Dialog_content'>
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     <h4>
                         { _t('"%(RoomName)s" contains sessions that you haven\'t seen before.', {RoomName: this.props.room.name}) }
                     </h4>
@@ -176,7 +176,7 @@ export default createReactClass({
                     { _t("Unknown sessions") }:
 
                     <UnknownDeviceList devices={this.props.devices} />
-                </GeminiScrollbarWrapper>
+                </div>
                 <DialogButtons primaryButton={sendButtonLabel}
                     onPrimaryButtonClick={sendButtonOnClick}
                     onCancel={this._onDismissClicked} />

From 1b933b7bfebd78631b0f80bdf7399006409829e0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Mar 2020 23:54:13 +0000
Subject: [PATCH 1528/3235] remove UnknownDeviceDialog gemini specific css

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_UnknownDeviceDialog.scss | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
index 4c3bb9bdd3..2b0f8dceca 100644
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -14,14 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// CSS voodoo to support a gemini-scrollbar for the contents of the dialog
-.mx_Dialog_unknownDevice .mx_Dialog {
-    // ideally we'd shrink the height to fit when needed, but in practice this
-    // is a pain in the ass. plus might as well make the dialog big given how
-    // important it is.
-    height: 100%;
-}
-
 .mx_UnknownDeviceDialog {
     height: 100%;
     display: flex;

From 19421504366ca3714c7a43235f44534bc3fdc2b4 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 13 Mar 2020 19:36:07 +0000
Subject: [PATCH 1529/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2148 of 2152 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 | 463 ++++++++++++++++++++++++++++++++-------
 1 file changed, 388 insertions(+), 75 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 9767fb9156..209057e36d 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -4,12 +4,12 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Kontrolo de via retpoŝtadreso malsukcesis: certigu, ke vi alklakis la ligilon en la retmesaĝo",
     "Call Timeout": "Voka tempolimo",
     "The remote side failed to pick up": "La defora flanko malsukcesis respondi",
-    "Unable to capture screen": "Ne eblas registri ekranon",
+    "Unable to capture screen": "Ne povas registri ekranon",
     "You cannot place a call with yourself.": "Vi ne povas voki vin mem.",
     "Warning!": "Averto!",
     "Sign in with": "Saluti per",
     "Sign in": "Saluti",
-    "For security, this session has been signed out. Please sign in again.": "Pro sekurecaj kialoj, la seanco finiĝis. Bonvolu resaluti.",
+    "For security, this session has been signed out. Please sign in again.": "Pro sekurecaj kialoj, la salutaĵo adiaŭiĝis. Bonvolu resaluti.",
     "Upload Failed": "Alŝuto malsukcesis",
     "Sun": "Dim",
     "Mon": "Lun",
@@ -54,7 +54,7 @@
     "Failed to add the following rooms to %(groupId)s:": "Malsukcesis aldoni jenajn ĉambrojn al %(groupId)s:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot ne havas permeson sciigi vin – bonvolu kontroli la agordojn de via foliumilo",
     "Riot was not given permission to send notifications - please try again": "Riot ne ricevis permeson sendi sciigojn – bonvolu reprovi",
-    "Unable to enable Notifications": "Sciigoj ne sendeblas",
+    "Unable to enable Notifications": "Ne povas ŝalti sciigojn",
     "This email address was not found": "Tiu ĉi retpoŝtadreso ne troviĝis",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Via retpoŝtareso ŝajne ne ligiĝas al Matrix-identigilo sur tiu ĉi hejmservilo.",
     "Default": "Norma",
@@ -67,7 +67,7 @@
     "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
     "You need to be logged in.": "Vi devas esti salutinta.",
     "You need to be able to invite users to do that.": "Vi bezonas permeson inviti uzantojn por tio.",
-    "Unable to create widget.": "Fenestraĵo ne kreeblas.",
+    "Unable to create widget.": "Ne povas krei fenestraĵon.",
     "Failed to send request.": "Malsukcesis sendi peton.",
     "This room is not recognised.": "Ĉi tiu ĉambro ne estas rekonita.",
     "Power level must be positive integer.": "Nivelo de potenco devas esti entjero pozitiva.",
@@ -132,7 +132,7 @@
     "Unnamed Room": "Sennoma Ĉambro",
     "Your browser does not support the required cryptography extensions": "Via foliumilo ne subtenas la bezonatajn ĉifrajn kromprogramojn",
     "Not a valid Riot keyfile": "Nevalida ŝlosila dosiero de Riot",
-    "Authentication check failed: incorrect password?": "Aŭtentiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
+    "Authentication check failed: incorrect password?": "Aŭtentikiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
     "Failed to join room": "Malsukcesis aliĝi al ĉambro",
     "Message Pinning": "Fikso de mesaĝoj",
     "Use compact timeline layout": "Uzi densan okazordan aranĝon",
@@ -169,7 +169,7 @@
     "Failed to upload profile picture!": "Malsukcesis alŝuti vian profilbildon!",
     "Upload new:": "Alŝuti novan:",
     "No display name": "Sen vidiga nomo",
-    "New passwords don't match": "Novaj pasvortoj ne kongruas",
+    "New passwords don't match": "Novaj pasvortoj ne akordas",
     "Passwords can't be empty": "Pasvortoj ne povas esti malplenaj",
     "Continue": "Daŭrigi",
     "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la ĉambro",
@@ -179,7 +179,7 @@
     "New Password": "Nova pasvorto",
     "Confirm password": "Konfirmi pasvorton",
     "Change Password": "Ŝanĝi pasvorton",
-    "Authentication": "Aŭtentigo",
+    "Authentication": "Aŭtentikigo",
     "Device ID": "Aparata identigilo",
     "Last seen": "Laste vidita",
     "Failed to set display name": "Malsukcesis agordi vidigan nomon",
@@ -218,7 +218,7 @@
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
-    "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?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
+    "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?": "Vi estas direktota al ekstera retejo por aŭtentikigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
     "Jump to read receipt": "Salti al legokonfirmo",
     "Mention": "Mencio",
     "Invite": "Inviti",
@@ -354,7 +354,7 @@
     "Token incorrect": "Malĝusta ĵetono",
     "A text message has been sent to %(msisdn)s": "Tekstmesaĝo sendiĝîs al %(msisdn)s",
     "Please enter the code it contains:": "Bonvolu enigi la enhavatan kodon:",
-    "Start authentication": "Komenci aŭtentigon",
+    "Start authentication": "Komenci aŭtentikigon",
     "Email address": "Retpoŝtadreso",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se vi ne enigos retpoŝtadreson, vi ne povos restarigi vian pasvorton. Ĉu vi certas?",
     "Remove from community": "Forigi de komunumo",
@@ -470,20 +470,20 @@
     "Unknown error": "Nekonata eraro",
     "Incorrect password": "Malĝusta pasvorto",
     "Deactivate Account": "Malaktivigi konton",
-    "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj kongruas",
+    "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj akordas",
     "An error has occurred.": "Okazis eraro.",
     "OK": "Bone",
     "Start verification": "Komenci kontrolon",
     "Share without verifying": "Kunhavigi sen kontrolo",
     "Ignore request": "Malatenti peton",
     "Encryption key request": "Peto por ĉifra ŝlosilo",
-    "Unable to restore session": "Seanco ne restaŭreblas",
-    "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.": "Se vi antaŭe uzis pli novan version de Riot, via seanco eble ne kongruos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
+    "Unable to restore session": "Salutaĵo ne rehaveblas",
+    "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.": "Se vi antaŭe uzis pli novan version de Riot, via salutaĵo eble ne akordos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
     "Invalid Email Address": "Malvalida retpoŝtadreso",
     "This doesn't appear to be a valid email address": "Tio ĉi ne ŝajnas esti valida retpoŝtadreso",
     "Verification Pending": "Atendanta kontrolon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bonvolu kontroli vian retpoŝton, kaj alklaki la ligilon enhavatan en la sendita mesaĝo. Farinte tion, klaku je 'daŭrigi'.",
-    "Unable to add email address": "Retpoŝtadreso ne aldoneblas",
+    "Unable to add email address": "Ne povas aldoni retpoŝtadreson",
     "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
     "This will allow you to reset your password and receive notifications.": "Tio ĉi permesos al vi restarigi vian pasvorton kaj ricevi sciigojn.",
     "Skip": "Preterpasi",
@@ -516,8 +516,8 @@
     "The user '%(displayName)s' could not be removed from the summary.": "Uzanto '%(displayName)s' ne forigeblas de la superrigardo.",
     "Failed to upload image": "Malsukcesis alŝuti bildon",
     "Failed to update community": "Malskucesis ĝisdatigi la komunumon",
-    "Unable to accept invite": "Invito ne akcepteblas",
-    "Unable to reject invite": "Invito ne rifuzeblas",
+    "Unable to accept invite": "Ne povas akcepti inviton",
+    "Unable to reject invite": "Ne povas rifuzi inviton",
     "Leave Community": "Forlasi komunumon",
     "Leave %(groupName)s?": "Ĉu foriri el %(groupName)s?",
     "Community Settings": "Komunumaj agordoj",
@@ -554,7 +554,7 @@
     "You seem to be uploading files, are you sure you want to quit?": "Ŝajne vi alŝutas dosierojn nun; ĉu vi tamen volas foriri?",
     "You seem to be in a call, are you sure you want to quit?": "Ŝajne vi vokas nun; ĉu vi tamen volas foriri?",
     "Search failed": "Serĉo malsukcesis",
-    "Server may be unavailable, overloaded, or search timed out :(": "Aŭ la servilo estas neatingebla aŭ troŝargita, aŭ la serĉo eltempiĝis :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "Aŭ la servilo estas neatingebla aŭ troŝarĝita, aŭ la serĉo eltempiĝis :(",
     "No more results": "Neniuj pliaj rezultoj",
     "Unknown room %(roomId)s": "Nekonata ĉambro %(roomId)s",
     "Room": "Ĉambro",
@@ -574,7 +574,7 @@
     "Dark theme": "Malhela haŭto",
     "Sign out": "Adiaŭi",
     "Success": "Sukceso",
-    "Unable to remove contact information": "Kontaktaj informoj ne forigeblas",
+    "Unable to remove contact information": "Ne povas forigi kontaktajn informojn",
     "<not supported>": "<nesubtenata>",
     "Import E2E room keys": "Enporti ĝiscele ĉifrajn ĉambrajn ŝlosilojn",
     "Cryptography": "Kriptografio",
@@ -604,7 +604,7 @@
     "Failed to send email": "Malsukcesis sendi retleteron",
     "The email address linked to your account must be entered.": "Vi devas enigi retpoŝtadreson ligitan al via konto.",
     "A new password must be entered.": "Vi devas enigi novan pasvorton.",
-    "New passwords must match each other.": "Novaj pasvortoj devas kongrui.",
+    "New passwords must match each other.": "Novaj pasvortoj devas akordi.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Retletero sendiĝis al %(emailAddress)s. Irinte al la ligilo en tiu mesaĝo, klaku sube.",
     "I have verified my email address": "Mi kontrolis mian retpoŝtadreson",
     "Return to login screen": "Reiri al saluta paĝo",
@@ -614,11 +614,11 @@
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tiu ĉi hejmservilo ne proponas salutajn fluojn subtenatajn de tiu ĉi kliento.",
     "Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
     "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>.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ <a>ŝaltu malsekurajn skriptojn</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.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.",
+    "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.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo blokas petojn.",
     "Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
     "Set a display name:": "Agordi vidigan nomon:",
     "Upload an avatar:": "Alŝuti profilbildon:",
-    "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentigon per telefona numero.",
+    "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentikigon per telefona numero.",
     "Displays action": "Montras agon",
     "Bans user with given id": "Forbaras uzanton kun la donita identigilo",
     "Define the power level of a user": "Difini la potencan nivelon de uzanto",
@@ -647,10 +647,10 @@
     "Algorithm": "Algoritmo",
     "unencrypted": "neĉifritaj",
     "Decryption error": "Malĉifra eraro",
-    "Session ID": "Seanca identigilo",
+    "Session ID": "Identigilo de salutaĵo",
     "End-to-end encryption information": "Informoj pri tutvoja ĉifrado",
     "Event information": "Informoj pri okazaĵo",
-    "Passphrases must match": "Pasfrazoj devas kongrui",
+    "Passphrases must match": "Pasfrazoj devas akordi",
     "Passphrase must not be empty": "Pasfrazoj maldevas esti malplenaj",
     "Export room keys": "Elporti ĉambrajn ŝlosilojn",
     "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.": "Tio ĉi permesos al vi elporti al loka dosiero ŝlosilojn por la mesaĝoj ricevitaj en ĉifritaj ĉambroj. Poste vi povos enporti la dosieron en alian klienton de Matrix, por povigi ĝin malĉifri tiujn mesaĝojn.",
@@ -682,7 +682,7 @@
     "The platform you're on": "Via platformo",
     "Which officially provided instance you are using, if any": "Kiun oficiale disponeblan nodon vi uzas, se iun ajn",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ĉu vi uzas la riĉtekstan reĝimon de la riĉteksta redaktilo aŭ ne",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kiam ĉi tiu paĝo enhavas identigeblajn informojn, ekzemple ĉambron, uzantan aŭ grupan identigilon, ili estas formetataj antaŭ ol sendado al la servilo.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kiam ĉi tiu paĝo enhavas identigeblajn informojn, ekzemple ĉambron, uzantulan aŭ grupan identigilon, ili estas formetataj antaŭ sendado al la servilo.",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al ĉambro",
     "Submit debug logs": "Sendi sencimigan protokolon",
@@ -751,7 +751,7 @@
     "Direct Chat": "Rekta babilo",
     "The server may be unavailable or overloaded": "La servilo povas esti nedisponebla aŭ troŝarĝita",
     "Reject": "Rifuzi",
-    "Failed to set Direct Message status of room": "Malsukcesis agordi staton de rekta mesaĝo al la ĉambro",
+    "Failed to set Direct Message status of room": "Malsukcesis agordi staton de rekteco al la ĉambro",
     "Monday": "Lundo",
     "Remove from Directory": "Forigi de ujo",
     "Enable them now": "Ŝalti ilin nun",
@@ -762,7 +762,7 @@
     "Invite to this room": "Inviti al ĉi tiu ĉambro",
     "Wednesday": "Merkredo",
     "You cannot delete this message. (%(code)s)": "Vi ne povas forigi tiun ĉi mesaĝon. (%(code)s)",
-    "Quote": "Citi",
+    "Quote": "Citaĵo",
     "Send logs": "Sendi protokolojn",
     "All messages": "Ĉiuj mesaĝoj",
     "Call invitation": "Invito al voko",
@@ -775,8 +775,8 @@
     "Keywords": "Ŝlosilvortoj",
     "Can't update user notification settings": "Agordoj de sciigoj al uzanto ne ĝisdatigeblas",
     "Notify for all other messages/rooms": "Sciigu min por ĉiuj aliaj mesaĝoj/ĉambroj",
-    "Unable to look up room ID from server": "Ĉambra identigilo ne akireblas de la servilo",
-    "Couldn't find a matching Matrix room": "Malsukcesis trovi kongruan ĉambron en Matrix",
+    "Unable to look up room ID from server": "Ne povas akiri ĉambran identigilon de la servilo",
+    "Couldn't find a matching Matrix room": "Malsukcesis trovi akordan ĉambron en Matrix",
     "All Rooms": "Ĉiuj ĉambroj",
     "Thursday": "Ĵaŭdo",
     "Forward Message": "Plusendi mesaĝon",
@@ -785,7 +785,7 @@
     "Reply": "Respondi",
     "Show message in desktop notification": "Montradi mesaĝojn en labortablaj sciigoj",
     "Unhide Preview": "Malkaŝi antaŭrigardon",
-    "Unable to join network": "Malsukcesis konektiĝi al la reto",
+    "Unable to join network": "Ne povas konektiĝi al la reto",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vi eble agordis ilin en alia kliento. Vi ne povas agordi ilin en Riot, sed ili ankoraŭ validas",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Pardonon, via foliumilo <b>ne kapablas</b> funkciigi klienton Riot.",
     "Uploaded on %(date)s by %(user)s": "Alŝutita je %(date)s de %(user)s",
@@ -793,7 +793,7 @@
     "Yesterday": "Hieraŭ",
     "Error encountered (%(errorDetail)s).": "Okazis eraro (%(errorDetail)s).",
     "Low Priority": "Malalta prioritato",
-    "Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj",
+    "Unable to fetch notification target list": "Ne povas akiri la liston de celoj por sciigoj",
     "Set Password": "Agordi pasvorton",
     "Off": "For",
     "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto",
@@ -820,12 +820,12 @@
     "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
     "e.g. <CurrentPageURL>": "ekz. <CurrentPageURL>",
     "Your User Agent": "Via klienta aplikaĵo",
-    "Your device resolution": "La distingo de via aparato",
+    "Your device resolution": "La distingumo de via aparato",
     "Call in Progress": "Voko farata",
     "A call is already in progress!": "Voko estas jam farata!",
     "Always show encryption icons": "Ĉiam montri bildetojn de ĉifrado",
     "Send analytics data": "Sendi statistikajn datumojn",
-    "Key request sent.": "Demando de ŝlosilo sendita.",
+    "Key request sent.": "Peto de ŝlosilo sendita.",
     "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?",
@@ -839,7 +839,7 @@
     "%(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.",
     "A call is currently being placed!": "Alia voko nun dumas!",
-    "Unable to load! Check your network connectivity and try again.": "Ne eblas ŝargi! Kontrolu vian retan konekton kaj reprovu.",
+    "Unable to load! Check your network connectivity and try again.": "Ne eblas enlegi! Kontrolu vian retan konekton kaj reprovu.",
     "Failed to invite users to the room:": "Malsukcesis inviti uzantojn al la ĉambro:",
     "Opens the Developer Tools dialog": "Maflermas evoluigistan interagujon",
     "This homeserver has hit its Monthly Active User limit.": "Tiu ĉi hejmservilo atingis sian monatan limon de aktivaj uzantoj.",
@@ -965,7 +965,7 @@
     "For help with using Riot, click <a>here</a>.": "Por helpo kun uzo de Riot, alklaku <a>ĉi tie</a>.",
     "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Por helpo kun uzo de Riot, alklaku <a>ĉi tie</a> aŭ komencu babilon kun nia roboto uzante la butonon sube.",
     "Chat with Riot Bot": "Babilu kun la roboto Riot Bot",
-    "Help & About": "Helpo & Pri",
+    "Help & About": "Helpo kaj Prio",
     "Bug reporting": "Cim-raportado",
     "FAQ": "Oftaj demandoj",
     "Versions": "Versioj",
@@ -1047,9 +1047,9 @@
     "Identity Server URL": "URL de identiga servilo",
     "Free": "Senpaga",
     "Other": "Alia",
-    "Couldn't load page": "Ne povis ŝargi paĝon",
-    "Unable to join community": "Ne eblas aliĝi al komunumo",
-    "Unable to leave community": "Ne eblas forlasi komunumon",
+    "Couldn't load page": "Ne povis enlegi paĝon",
+    "Unable to join community": "Ne povas aliĝi al komunumo",
+    "Unable to leave community": "Ne povas forlasi komunumon",
     "Join this community": "Aliĝi al ĉi tiu komunumo",
     "Leave this community": "Forlasi ĉi tiun komunumon",
     "Everyone": "Ĉiuj",
@@ -1058,7 +1058,7 @@
     "%(count)s of your messages have not been sent.|one": "Via mesaĝo ne sendiĝis.",
     "Clear filter": "Vakigi filtrilon",
     "Guest": "Gasto",
-    "Could not load user profile": "Ne povis ŝargi uzantan profilon",
+    "Could not load user profile": "Ne povis enlegi profilon de uzanto",
     "Your Matrix account on %(serverName)s": "Via Matrix-konto sur %(serverName)s",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrola retpoŝtmesaĝo estos sendita al via enirkesto por kontroli agordadon de via nova pasvorto.",
     "Sign in instead": "Anstataŭe saluti",
@@ -1070,8 +1070,8 @@
     "Great! This passphrase looks strong enough.": "Bonege! Ĉi tiu pasfrazo ŝajnas sufiĉe forta.",
     "Keep going...": "Daŭrigu…",
     "Enter a passphrase...": "Enigu pasfrazon…",
-    "That matches!": "Tio kongruas!",
-    "That doesn't match.": "Tio ne kongruas.",
+    "That matches!": "Tio akordas!",
+    "That doesn't match.": "Tio ne akordas.",
     "Repeat your passphrase...": "Ripetu vian pasfrazon...",
     "Download": "Elŝuti",
     "Success!": "Sukceso!",
@@ -1276,7 +1276,7 @@
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Fenestraĵo de %(widgetUrl)s volas kontroli vian identecon. Se vi permesos tion, ĝi povos kontroli vian identigilon de uzanto, sed ne agi per vi.",
     "Remember my selection for this widget": "Memoru mian elekton por tiu ĉi fenestraĵo",
     "Deny": "Rifuzi",
-    "Unable to load backup status": "Ne eblas legi staton de savkopio",
+    "Unable to load backup status": "Ne povas legi staton de savkopio",
     "Collapse Reply Thread": "Maletendi respondan fadenon",
     "This homeserver would like to make sure you are not a robot.": "Ĉi tiu hejmservilo volas certigi, ke vi ne estas roboto.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix per alia hejmservila URL. Tio ebligos uzi ĉi tiun aplikaĵon kun jama Matrix-konto en alia hejmservilo.",
@@ -1319,7 +1319,7 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ĉu vi uzas la funkcion « spuroj » (profilbildoj super la listo de ĉambroj)",
     "Adds a custom widget by URL to the room": "Aldonas propran fenestraĵon al la ĉambro per URL",
     "You cannot modify widgets in this room.": "Vi ne rajtas modifi fenestraĵojn en ĉi tiu ĉambro.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Devigas la aktualan eliran grupan kunsidon en ĉifrita ĉambro forĵetiĝi",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Devigas la aktualan eliran grupan salutaĵon en ĉifrita ĉambro forĵetiĝi",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ŝaltis etikedojn por %(groups)s en ĉi tiu ĉambro.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s malŝaltis etikedojn por %(groups)s en ĉi tiu ĉambro.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ŝaltis etikedojn por %(newGroups)s kaj malŝaltis etikedojn por %(oldGroups)s en ĉi tiu ĉambro.",
@@ -1401,11 +1401,11 @@
     "Community IDs cannot be empty.": "Identigilo de komunumo ne estu malplena.",
     "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": "Por eviti perdon de via babila historio, vi devas elporti la ŝlosilojn de viaj ĉambroj antaŭ adiaŭo. Por tio vi bezonos reveni al la pli nova versio de Riot",
     "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. ": "Vi antaŭe uzis pli novan version de Riot je %(host)s. Por ree uzi ĉi tiun version kun ĉifrado, vi devos adiaŭi kaj resaluti. ",
-    "Incompatible Database": "Nekongrua datumbazo",
+    "Incompatible Database": "Neakorda datumbazo",
     "View Servers in Room": "Montri servilojn en ĉambro",
-    "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.": "Vi antaŭe uzis Riot-on je %(host)s kun ŝaltita malfrua enlegado de anoj. En ĉi tiu versio, malfrua enlegado estas malŝaltita. Ĉar la loka kaŝmemoro de ambaŭ versioj ne kongruas, Riot bezonas respeguli vian konton.",
+    "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.": "Vi antaŭe uzis Riot-on je %(host)s kun ŝaltita malfrua enlegado de anoj. En ĉi tiu versio, malfrua enlegado estas malŝaltita. Ĉar la loka kaŝmemoro de ambaŭ versioj ne akordas, Riot bezonas respeguli vian konton.",
     "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 la alia versio de Riot ankoraŭ estas malfermita en alia langeto, bonvolu tiun fermi, ĉar uzado de Riot je la sama gastiganto, kun malfrua enlegado samtempe ŝaltita kaj malŝaltita, kaŭzos problemojn.",
-    "Incompatible local cache": "Nekongrua loka kaŝmemoro",
+    "Incompatible local cache": "Neakorda loka kaŝmemoro",
     "Clear cache and resync": "Vakigi kaŝmemoron kaj respeguli",
     "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 nun uzas 3–5-oble malpli da memoro, ĉar ĝi enlegas informojn pri aliaj uzantoj nur tiam, kiam ĝi bezonas. Bonvolu atendi ĝis ni respegulos la servilon!",
     "You'll lose access to your encrypted messages": "Vi perdos aliron al viaj ĉifritaj mesaĝoj",
@@ -1416,18 +1416,18 @@
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Por eviti duoblajn raportojn, bonvolu unue <existingIssuesLink>rigardi jamajn raportojn</existingIssuesLink> (kaj meti +1) aŭ <newIssueLink>raporti novan problemon</newIssueLink> se vi neniun trovos.",
     "Report bugs & give feedback": "Raporti erarojn kaj sendi prikomentojn",
     "Clear Storage and Sign Out": "Vakigi memoron kaj adiaŭi",
-    "We encountered an error trying to restore your previous session.": "Ni renkontis eraron provante rehavi vian antaŭan kunsidon.",
+    "We encountered an error trying to restore your previous session.": "Ni renkontis eraron provante rehavi vian antaŭan salutaĵon.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Vakigo de la memoro de via foliumilo eble korektos la problemon, sed adiaŭigos vin, kaj malebligos legadon de historio de ĉifritaj babiloj.",
-    "Missing session data": "Mankas kunsidaj datumoj",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Iuj kunsidaj datumoj, inkluzive viajn ĉifrajn ŝlosilojn, mankas. Por tion korekti, resalutu, kaj rehavu la ŝlosilojn el savkopio.",
+    "Missing session data": "Mankas datumoj de salutaĵo",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Iuj datumoj de salutaĵo, inkluzive viajn ĉifrajn ŝlosilojn, mankas. Por tion korekti, resalutu, kaj rehavu la ŝlosilojn el savkopio.",
     "Your browser likely removed this data when running low on disk space.": "Via foliumilo probable forigos ĉi tiujn datumojn kiam al ĝi mankos spaco sur disko.",
     "Recovery Key Mismatch": "Malakordo de rehava ŝlosilo",
     "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Savkopio ne povas esti malĉifrita per ĉi tiu ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
     "Incorrect Recovery Passphrase": "Malĝusta rehava pasfrazo",
     "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Savkopio ne sukcesis malĉifriĝi per ĉi tiu pasfrazo: bonvolu kontroli, ĉu vi enigis la ĝustan rehavan pasfrazon.",
     "Unable to restore backup": "Ne povas rehavi savkopion",
-    "Failed to decrypt %(failedCount)s sessions!": "Malsukcesis malĉifri%(failedCount)s kunsidojn!",
-    "Restored %(sessionCount)s session keys": "Rehavis %(sessionCount)s kunsidajn ŝlosilojn",
+    "Failed to decrypt %(failedCount)s sessions!": "Malsukcesis malĉifri%(failedCount)s salutaĵojn!",
+    "Restored %(sessionCount)s session keys": "Rehavis %(sessionCount)s ŝlosilojn de salutaĵo",
     "Enter Recovery Passphrase": "Enigu rehavan pasfrazon",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Averto</b>: vi agordu ŝlosilan savkopion nur per fidata komputilo.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava pasfrazo.",
@@ -1439,7 +1439,7 @@
     "Resend %(unsentCount)s reaction(s)": "Resendi %(unsentCount)s reago(j)n",
     "Resend removal": "Resendi forigon",
     "Share Permalink": "Kunhavi daŭran ligilon",
-    "Passwords don't match": "Pasvortoj ne kongruas",
+    "Passwords don't match": "Pasvortoj ne akordas",
     "Other users can invite you to rooms using your contact details": "Aliaj uzantoj povas inviti vin al ĉambroj per viaj kontaktaj detaloj",
     "Enter phone number (required on this homeserver)": "Enigu telefonnumeron (bezonata sur ĉi tiu hejmservilo)",
     "Doesn't look like a valid phone number": "Ne ŝajnas esti valida telefonnumero",
@@ -1473,7 +1473,7 @@
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se vi ne forigis la rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
     "Use a longer keyboard pattern with more turns": "Uzu pli longan tekston kun plia varieco",
     "Unable to load key backup status": "Ne povas enlegi staton de ŝlosila savkopio",
-    "Reset": "Reagordi",
+    "Reset": "Restarigi",
     "Demote yourself?": "Ĉu malrangaltigi vin mem?",
     "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.": "Vi ne povos malfari tiun ŝanĝon, ĉar vi malrangaltigas vin mem; se vi estas la lasta povohava uzanto en la ĉambro, estos neeble vian povon rehavi.",
     "Demote": "Malrangaltigi",
@@ -1486,8 +1486,8 @@
     "Invalid identity server discovery response": "Nevalida eltrova respondo de identiga servilo",
     "Identity server URL does not appear to be a valid identity server": "URL por identiga servilo ŝajne ne ligas al valida identiga servilo",
     "Sign in with single sign-on": "Salutu per ununura saluto",
-    "Failed to re-authenticate due to a homeserver problem": "Malsukcesis reaŭtentigi pro hejmservila problemo",
-    "Failed to re-authenticate": "Malsukcesis reaŭtentigi",
+    "Failed to re-authenticate due to a homeserver problem": "Malsukcesis reaŭtentikigi pro hejmservila problemo",
+    "Failed to re-authenticate": "Malsukcesis reaŭtentikigi",
     "Enter your password to sign in and regain access to your account.": "Enigu vian pasvorton por saluti kaj rehavi aliron al via konto.",
     "Sign in and regain access to your account.": "Saluti kaj rehavi aliron al via konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Vi ne povas saluti per via konto. Bonvolu kontakti administranton de via hejmservilo por akiri pliajn informojn.",
@@ -1680,8 +1680,8 @@
     "Please provide a room alias": "Bonvolu doni kromnomon de ĉambro",
     "This alias is available to use": "Ĉi tiu kromnomo estas disponebla",
     "This alias is already in use": "Ĉi tiu kromnomo jam estas uzata",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. <default>Uzu la norman (%(defaultIdentityServerName)s)</default> aŭ mastrumu per <settings>Agordoj</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. Mastrumu per <settings>Agordoj</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. <default>Uzu la norman (%(defaultIdentityServerName)s)</default> aŭ administru per <settings>Agordoj</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. Administru per <settings>Agordoj</settings>.",
     "Close dialog": "Fermi interagujon",
     "Please enter a name for the room": "Bonvolu enigi nomon por la ĉambro",
     "Set a room alias to easily share your room with other people.": "Agordu kromnomon de la ĉambro por facile ĝin kunhavigi al aliaj homoj.",
@@ -1724,7 +1724,7 @@
     "Try out new ways to ignore people (experimental)": "Elprovi novajn manierojn malatenti homojn (eksperimente)",
     "Match system theme": "Similiĝi la sisteman haŭton",
     "My Ban List": "Mia listo de forbaroj",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Ĉi tio estas la listo de uzantoj/serviloj, kiujn vi forbaris – ne eliru el la ĉambro!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Ĉi tio estas la listo de uzantoj/serviloj, kiujn vi blokis – ne eliru el la ĉambro!",
     "Decline (%(counter)s)": "Malakcepti (%(counter)s)",
     "Clear notifications": "Vakigi sciigojn",
     "Error subscribing to list": "Eraris abono al listo",
@@ -1776,7 +1776,7 @@
     "Set up encryption": "Agordi ĉifradon",
     "Upgrade": "Gradaltigi",
     "Cannot connect to integration manager": "Ne povas konektiĝi al kunigilo",
-    "The integration manager is offline or it cannot reach your homeserver.": "La kunigilo estas eksterreta aŭ ne povas atingi vian hejmservilon",
+    "The integration manager is offline or it cannot reach your homeserver.": "La kunigilo estas eksterreta aŭ ne povas atingi vian hejmservilon.",
     "Backup has a <validity>valid</validity> signature from this user": "Savkopio havas <validity>validan</validity> subskribon de ĉi tiu uzanto",
     "Backup has a <validity>invalid</validity> signature from this user": "Savkopio havas <validity>nevalidan</validity> subskribon de ĉi tiu uzanto",
     "This room is end-to-end encrypted": "Ĉi tiu ĉambro uzas tutvojan ĉifradon",
@@ -1785,7 +1785,7 @@
     "Unencrypted": "Neĉifrita",
     "Send a reply…": "Sendi respondon…",
     "Send a message…": "Sendi mesaĝon…",
-    "Direct Messages": "Rektaj mesaĝoj",
+    "Direct Messages": "Rektaj ĉambroj",
     "<userName/> wants to chat": "<userName/> volas babili",
     "Start chatting": "Ekbabili",
     "Reject & Ignore user": "Rifuzi kaj malatenti uzanton",
@@ -1797,7 +1797,7 @@
     "Start Verification": "Komenci kontrolon",
     "Trusted": "Fidata",
     "Not trusted": "Nefidata",
-    "Direct message": "Rekta mesaĝo",
+    "Direct message": "Rekta ĉambro",
     "Security": "Sekureco",
     "Reactions": "Reagoj",
     "More options": "Pliaj elektebloj",
@@ -1819,36 +1819,36 @@
     "The version of Riot": "La versio de Riot",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Ĉu vi uzas Rioton per aparato, kies ĉefa enigilo estas tuŝado",
     "The information being sent to us to help make Riot better includes:": "La informoj sendataj al ni por plibonigi Rioton inkluzivas:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Nekonataj kunsidoj enas la ĉambron; se vi daŭrigos ne kontrolinte ilin, iu eble povos subaŭskulti vian vokon.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Nekonataj salutaĵoj ĉeestas la ĉambron; se vi daŭrigos ne kontrolinte ilin, iu povos subaŭskulti vian vokon.",
     "If you cancel now, you won't complete verifying the other user.": "Se vi nuligos nun, vi ne finos kontrolon de la alia uzanto.",
-    "If you cancel now, you won't complete verifying your other session.": "Se vi nuligos nun, vi ne finos kontrolon de via alia kunsido.",
+    "If you cancel now, you won't complete verifying your other session.": "Se vi nuligos nun, vi ne finos kontrolon de via alia salutaĵo.",
     "Cancel entering passphrase?": "Ĉu nuligi enigon de pasfrazo?",
     "Setting up keys": "Agordo de klavoj",
-    "Verify this session": "Kontroli ĉi tiun kunsidon",
+    "Verify this session": "Kontroli ĉi tiun salutaĵon",
     "Encryption upgrade available": "Ĝisdatigo de ĉifrado haveblas",
-    "Unverified session": "Nekontrolita kunsido",
+    "Unverified session": "Nekontrolita salutaĵo",
     "Sign In or Create Account": "Salutu aŭ kreu konton",
     "Use your account or create a new one to continue.": "Por daŭrigi, uzu vian konton aŭ kreu novan.",
     "Create Account": "Krei konton",
     "Error upgrading room": "Eraris ĝisdatigo de la ĉambro",
     "Double check that your server supports the room version chosen and try again.": "Bone kontrolu, ĉu via servilo subtenas la elektitan version de ĉambro, kaj reprovu.",
-    "Verifies a user, session, and pubkey tuple": "Kontrolas opon de uzanto, kunsido, kaj publika ŝlosilo.",
-    "Unknown (user, session) pair:": "Nekonata (uzanto, kunsido) duopo:",
+    "Verifies a user, session, and pubkey tuple": "Kontrolas opon de uzanto, salutaĵo, kaj publika ŝlosilo",
+    "Unknown (user, session) pair:": "Nekonata duopo (uzanto, salutaĵo):",
     "Session already verified!": "Kunsido jam estas kontrolita!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "AVERTO: Kunsido jam estas kontrolita, sed la ŝlosiloj NE AKORDAS!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "AVERTO: Salutaĵo jam estas kontrolita, sed la ŝlosiloj NE AKORDAS!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: MALSUKCESIS KONTROLO DE ŜLOSILOJ! La subskriba ŝlosilo de %(userId)s kaj session %(deviceId)s estas «%(fprint)s», kiu ne akordas la donitan ŝlosilon «%(fingerprint)s». Tio povus signifi, ke via komunikado estas spionata!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la seanco %(deviceId)s de la uzanto %(userId)s. Kunsido estis markita kontrolita.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la salutaĵo %(deviceId)s de la uzanto %(userId)s. Salutaĵo estis markita kontrolita.",
     "Displays information about a user": "Montras informojn pri uzanto",
     "The message you are trying to send is too large.": "La mesaĝo, kiun vi provas sendi, estas tro granda.",
     "Show typing notifications": "Montri sciigojn pri tajpado",
-    "Never send encrypted messages to unverified sessions from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj kunsidoj de ĉi tiu kunsido",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj kunsidoj en ĉi tiu ĉambro de ĉi tiu kunsido",
+    "Never send encrypted messages to unverified sessions from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj salutaĵoj de ĉi tiu salutaĵo",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj salutaĵoj en ĉi tiu ĉambro de ĉi tiu salutaĵo",
     "Order rooms by name": "Ordigi ĉambrojn laŭ nomo",
     "Show rooms with unread notifications first": "Montri ĉambrojn kun nelegitaj sciigoj unue",
     "Show shortcuts to recently viewed rooms above the room list": "Montri tujirilojn al freŝe rigarditaj ĉambroj super la listo de ĉambroj",
     "Enable message search in encrypted rooms": "Ŝalti serĉon de mesaĝoj en ĉifritaj ĉambroj",
     "How fast should messages be downloaded.": "Kiel rapide elŝuti mesaĝojn.",
-    "Verify this session by completing one of the following:": "Kontrolu la kunsidon per plenumado de unu el la jenaj:",
+    "Verify this session by completing one of the following:": "Kontrolu la salutaĵon per plenumado de unu el la jenaj:",
     "Scan this unique code": "Skanu ĉi tiun unikan kodon",
     "or": "aŭ",
     "Compare unique emoji": "Komparu unikajn bildsignojn",
@@ -1865,10 +1865,323 @@
     "Show less": "Montri pli",
     "Show more": "Montri malpli",
     "Help": "Helpo",
-    "Message not sent due to unknown sessions being present": "Mesaĝo ne sendiĝis pro ĉeesto de nekonataj kunsidoj",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Montri kunsidojn</showSessionsText>, <sendAnywayText>tamen sendi</sendAnywayText> aŭ <cancelText>nuligi</cancelText>.",
+    "Message not sent due to unknown sessions being present": "Mesaĝo ne sendiĝis pro ĉeesto de nekonataj salutaĵoj",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Montri salutaĵojn</showSessionsText>, <sendAnywayText>tamen sendi</sendAnywayText> aŭ <cancelText>nuligi</cancelText>.",
     "Complete security": "Plena sekureco",
-    "Verify this session to grant it access to encrypted messages.": "Kontrolu ĉi tiun kunsidon por doni al ĝi aliron al la ĉifritaj mesaĝoj.",
-    "Session verified": "Kunsido kontrolita",
-    "Copy": "Kopii"
+    "Verify this session to grant it access to encrypted messages.": "Kontrolu ĉi tiun salutaĵon por doni al ĝi aliron al la ĉifritaj mesaĝoj.",
+    "Session verified": "Salutaĵo kontroliĝis",
+    "Copy": "Kopii",
+    "Your user agent": "Via klienta aplikaĵo",
+    "If you cancel now, you won't complete your secret storage operation.": "Se vi nuligos nun, vi ne finos la operacion de la sekreta deponejo.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro de %(oldRoomName)s al %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s aldonis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s aldonis alternativan adreson %(addresses)s por ĉi tiu ĉambro.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s forigis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s forigis alternativan adreson %(addresses)s por ĉi tiu ĉambro.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ŝanĝis la alternativan adreson de ĉi tiu ĉambro.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ŝanĝis la ĉefan kaj alternativan adresojn de ĉi tiu ĉambro.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s ŝanĝis la adresojn de ĉi tiu ĉambro.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s forigis la regulon forbarantan uzantojn, kiuj akordas kun %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s forigis la regulon forbarantan ĉambrojn, kiuj akordas kun %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s forigis la regulon forbarantan servilojn, kiuj akordas kun %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s forigis forbaran regulon, kiu akordas kun %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s ĝisdatigis nevalidan forbaran regulon",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s ĝisdatigis la regulon forbarantan uzantojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s ĝisdatigis la regulon forbarantan ĉambrojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s ĝisdatigis la regulon forbarantan servilojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s ĝisdatigis forbaran regulon, kiu akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s kreis regulon forbarantan uzantojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s kreis regulon forbarantan ĉambrojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s kreis regulon forbarantan servilojn, kiuj akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s kreis forbaran regulon, kiu akordas kun %(glob)s, pro %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ŝanĝis regulon forbarintan uzantojn, kiuj akordis kun %(oldGlob)s, al akordo kun %(newGlob)s, pro %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ŝanĝis regulon forbarintan ĉambrojn, kiuj akordis kun %(oldGlob)s, al akordo kun %(newGlob)s, pro %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ŝanĝis regulon forbarintan servilojn, kiuj akordis kun %(oldGlob)s, al akordo kun %(newGlob)s, pro %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ĝisdatigis forbaran regulon, kiu akordis kun %(oldGlob)s, al akordo kun %(newGlob)s, pro %(reason)s",
+    "Not Trusted": "Nefidata",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) salutis novan salutaĵon ne kontrolante ĝin:",
+    "Ask this user to verify their session, or manually verify it below.": "Petu, ke ĉi tiu la uzanto kontrolu sian salutaĵon, aŭ kontrolu ĝin permane sube.",
+    "Manually Verify": "Permane kontroli",
+    "Show a presence dot next to DMs in the room list": "Montri punkton de ĉeesteco apud rektaj ĉambroj en la listo de ĉambroj",
+    "Support adding custom themes": "Subteni aldonadon de propraj haŭtoj",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Ŝalti transirajn subskribojn por kontroli uzantojn anstataŭ aparatojn (ankoraŭ evoluigate)",
+    "Enable local event indexing and E2EE search (requires restart)": "Ŝalti lokan indeksadon de okazoj kaj serĉon en tutvoja ĉifrado (bezonas restartigon)",
+    "Show info about bridges in room settings": "Montri informon pri pontoj en agordoj de ĉambro",
+    "Show padlocks on invite only rooms": "Montri serurojn sur ĉambroj por invititaj",
+    "Keep secret storage passphrase in memory for this session": "Teni pasfrazon de sekreta deponejo en memoro dum ĉi tiu salutaĵo",
+    "Review": "Rekontroli",
+    "This bridge was provisioned by <user />.": "Ĉi tiu ponto estas provizita de <user />.",
+    "This bridge is managed by <user />.": "Ĉi tiu ponto estas administrata de <user />.",
+    "Workspace: %(networkName)s": "Labortablo: %(networkName)s",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Ŝanĝo de pasvorto nuntempe restarigos ĉiujn tutvoje ĉifrajn ŝlosilojn en ĉiuj salutaĵoj, malebligante legadon de ĉifrita historio, malse vi unue elportus la ŝlosilojn de viaj ĉambroj kaj reenportus ilin poste. Ĉi tion ni plibonigos ose.",
+    "Your homeserver does not support cross-signing.": "Via hejmservilo ne subtenas transirajn subskribojn.",
+    "Cross-signing and secret storage are enabled.": "Transiraj subskriboj kaj sekreta deponejo estas ŝaltitaj.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Via konto havas identecon de transiraj subskriboj en sekreta deponejo, sed ĉi tiu salutaĵo ankoraŭ ne fidas ĝin.",
+    "Cross-signing and secret storage are not yet set up.": "Transiraj subskriboj kaj sekreta deponejo ankoraŭ ne agordiĝis.",
+    "Reset cross-signing and secret storage": "Remeti transirajn subskribojn kaj sekretan deponejon",
+    "Bootstrap cross-signing and secret storage": "Praŝargi transirajn subskribojn kaj sekretan deponejon",
+    "Cross-signing public keys:": "Transiraj publikaj ŝlosiloj:",
+    "in memory": "en memoro",
+    "not found": "ne trovita",
+    "Cross-signing private keys:": "Transiraj privataj ŝlosiloj:",
+    "in secret storage": "en sekreta deponejo",
+    "Secret storage public key:": "Publika ŝlosilo de sekreta deponejo:",
+    "in account data": "en datumoj de konto",
+    "Homeserver feature support:": "Funkciaj kapabloj de hejmservilo:",
+    "exists": "ekzistas",
+    "Your homeserver does not support session management.": "Via hejmservilo ne subtenas administradon de salutaĵoj.",
+    "Unable to load session list": "Ne povas enlegi liston de salutaĵoj",
+    "Delete %(count)s sessions|other": "Forigi %(count)s salutaĵojn",
+    "Delete %(count)s sessions|one": "Forigi %(count)s salutaĵon",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj, uzante ",
+    " to store messages from ": " por deponi mesaĝojn el ",
+    "rooms.": "ĉambroj.",
+    "Manage": "Administri",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj.",
+    "Enable": "Ŝalti",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot malhavas kelkajn partojn bezonajn por sekura loka kaŝmemorado de ĉirfitaj mesaĝoj. Se vi volas eksperimenti pri ĉi tiu kapablo, kunmetu propran klienton «Riot Dekstop» kun <nativeLink>aldonitaj serĉopartoj</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ne povas sekure loke kaŝmemori ĉifritajn mesaĝojn, rulate en reta foliumilo. Uzu la klienton <riotLink>Riot Desktop</riotLink> por aperigi ĉirfritajn mesaĝojn en serĉorezultoj.",
+    "Connecting to integration manager...": "Konektante al kunigilo…",
+    "This session is backing up your keys. ": "Ĉi tiu salutaĵo savkopias viajn ŝlosilojn. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ĉi tiu salutaĵo <b>ne savkopias viajn ŝlosilojn</b>, sed vi jam havas savkopion, el kiu vi povas rehavi datumojn, kaj ilin kreskigi plue.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Konektu ĉi tiun salutaĵon al savkopiado de ŝlosiloj antaŭ ol vi adiaŭos, por ne perdi ŝlosilojn, kiuj povus troviĝi nur en ĉi tiu salutaĵo.",
+    "Connect this session to Key Backup": "Konekti ĉi tiun salutaĵon al Savkopiado de ŝlosiloj",
+    "not stored": "ne deponita",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Savkopio havas subskribon de <verify>nekonata</verify> uzanto kun la identigilo %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Savkopio havas subskribon de <verify>nekonata</verify> salutaĵo kun la identigilo %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Savkopio havas <validity>validan</validity> subskribon de ĉi tiu salutaĵo",
+    "Backup has an <validity>invalid</validity> signature from this session": "Savkopio havas <validity>nevalidan</validity> subskribon de ĉi tiu salutaĵo",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Savkopio havas <validity>validan</validity> subskribon de <verify>kontrolita</verify> salutaĵo <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Savkopio havas <validity>validan</validity> subskribon de <verify>nekontrolita</verify> salutaĵo <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>kontrolita</verify> salutaĵo <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>nekontrolita</verify> salutaĵo <device></device>",
+    "Backup is not signed by any of your sessions": "Savkopio estas subskribita de neniu el viaj salutaĵoj",
+    "This backup is trusted because it has been restored on this session": "Ĉi tiu savkopio estas fidata, ĉar ĝi estis rehavita en ĉi tiu salutaĵo",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Savkopia ŝlosilo estas deponita en sekreta deponejo, sed tiu funkcio ne estas ŝaltita en ĉi tiu salutaĵo. Bonvolu ŝalti transirajn subskribojn en Laboratorio por modifi la staton de savkopiado.",
+    "Backup key stored: ": "Savkopia ŝlosilo deponita: ",
+    "Your keys are <b>not being backed up from this session</b>.": "Viaj ŝlosiloj <b>ne estas savkopiataj el ĉi tiu salutaĵo</b>.",
+    "Enable desktop notifications for this session": "Ŝalti labortablajn sciigojn por ĉi tiu salutaĵo",
+    "Enable audible notifications for this session": "Ŝalti aŭdeblajn sciigojn por ĉi tiu salutaĵo",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Uzu kunigilon <b>(%(serverName)s)</b> por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
+    "Manage integrations": "Administri kunigojn",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi nivelojn de potenco.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevados pasivajn sciigojn en aliaj salutaĵoj, ĝis vi ilin resalutos",
+    "Error downloading theme information.": "Eraris elŝuto de informoj pri haŭto.",
+    "Theme added!": "Haŭto aldoniĝis!",
+    "Custom theme URL": "Propra URL al haŭto",
+    "Add theme": "Aldoni haŭton",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Por raparto de sekureca problemo rilata al Matrix, bonvolu legi la <a>Eldiran Politikon pri Sekureco</a> de Matrix.org.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Alĝustigu vian sperton per eksperimentaj laboratoriaj funkcioj. <a>Eksciu plion</a>.",
+    "Ignored/Blocked": "Malatentita/Blokita",
+    "Error adding ignored user/server": "Eraris aldono de malatentita uzanto/servilo",
+    "Something went wrong. Please try again or view your console for hints.": "Io eraris. Bonvolu reprovi aŭ serĉi helpilojn en via konzolo.",
+    "None": "Neniu",
+    "Ban list rules - %(roomName)s": "Reguloj de listo de forbaroj – %(roomName)s",
+    "Server rules": "Servilaj reguloj",
+    "User rules": "Uzantulaj reguloj",
+    "You are currently ignoring:": "Vi nun malatentas:",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Aldonu ĉi tien uzantojn kaj servilojn, kiujn vi volas malatenti. Uzu steleton por akordigi ĉiajn signojn. Ekzemple, <code>@bot:*</code> malatentigus ĉiujn uzantojn kun la nomo «bot» sur ĉiu servilo.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Malatento de homoj okazas per listoj de forbaroj, kiuj enhavas regulojn pri tio, kiun forbari. Abono de listo de forbaroj signifas, ke la uzantoj/serviloj blokataj de la listo estos kaŝitaj de vi.",
+    "Personal ban list": "Persona listo de forbaroj",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Via persona listo de forbaroj tenas ĉiujn uzantojn/servilojn, kies mesaĝoj vi persone ne volas vidi. Post via unua malatento, nova ĉambro aperos en via listo de ĉambroj, nomita «Mia listo de forbaroj» – restu en ĝi por efikigi la liston de forbaroj.",
+    "Server or user ID to ignore": "Malatentota servilo aŭ identigilo de uzanto",
+    "eg: @bot:* or example.org": "ekz: @bot:* aŭ ekzemplo.org",
+    "Subscribing to a ban list will cause you to join it!": "Abono de listo de forbaroj aligos vin al ĝi!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Se vi ne volas tion, bonvolu uzi alian ilon por malatenti uzantojn.",
+    "Room ID or alias of ban list": "Identigilo de ĉambro aŭ kromnomo de listo de forbaroj",
+    "Session ID:": "Identigilo de salutaĵo:",
+    "Session key:": "Ŝlosilo de salutaĵo:",
+    "Message search": "Serĉado de mesaĝoj",
+    "Cross-signing": "Transiraj subskriboj",
+    "Sessions": "Salutaĵoj",
+    "A session's public name is visible to people you communicate with": "Publika nomo de salutaĵo estas videbla al homoj, kun kiuj vi komunikas",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ĉi tiu ĉambro transpontigas mesaĝojn al la jenaj platformoj. <a>Eksciu plion.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ĉi tiu ĉambro transpontigas mesaĝojn al neniu platformo. <a>Eksciu plion.</a>",
+    "Bridges": "Pontoj",
+    "This user has not verified all of their sessions.": "Ĉi tiu uzanto ne kontrolis ĉiomon da siaj salutaĵoj.",
+    "You have not verified this user.": "Vi ne kontrolis tiun ĉi uzanton.",
+    "You have verified this user. This user has verified all of their sessions.": "Vi kontrolis tiun ĉi uzanton. Ĝi kontrolis ĉiomon da siaj salutaĵoj.",
+    "Someone is using an unknown session": "Iu uzas nekonatan salutaĵon",
+    "Some sessions for this user are not trusted": "Iuj salutaĵoj de ĉi tiu uzanto ne estas fidataj",
+    "All sessions for this user are trusted": "Ĉiuj salutaĵoj de ĉi tiu uzanto estas fidataj",
+    "Some sessions in this encrypted room are not trusted": "Iuj salutaĵoj en ĉi tiu ĉifrita ĉambro ne estas fidataj",
+    "All sessions in this encrypted room are trusted": "Ĉiuj salutaĵoj en ĉi tiu ĉifrita ĉambro estas fidataj",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Via peto pri havigo de ŝlosilo estas sendita – bonvolu kontroli viajn aliajn salutaĵojn je petojn pri havigo de ŝlosiloj.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Petoj pri havigo de ŝlosiloj estas memage sendataj al viaj aliaj salutaĵoj. Se vi rifuzis aŭ forigis la peton pri havigo de ŝlosiloj en aliaj viaj salutaĵoj, klaku ĉi tien por ree peti ŝlosilojn por ĉi tiu salutaĵo.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj salutaĵoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos ilin malĉifri.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Repeti viajn ĉifrajn ŝlosilojn</requestLink> de ceteraj viaj salutaĵoj.",
+    "Encrypted by an unverified session": "Ĉifrita de nekontrolita salutaĵo",
+    "Encrypted by a deleted session": "Ĉifrita de forigita salutaĵo",
+    "Invite only": "Nur por invititaj",
+    "Close preview": "Fermi antaŭrigardon",
+    "No sessions with registered encryption keys": "Neniuj salutaĵoj kun registritaj ĉifraj ŝlosiloj",
+    "Unrecognised command: %(commandText)s": "Nerekonita komando: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vi povas komandi <code>/help</code> por listigi uzeblajn komandojn. Ĉu vi intencis sendi ĉi tion kiel mesaĝon?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Helpeto: Komencu vian mesaĝon per <code>//</code> por komenci ĝin per suprenstreko.",
+    "Mark all as read": "Marki ĉion legita",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Eraris ĝisdatigo de la alternativaj adresoj de la ĉambro. Eble la servilo ne permesas tion, aŭ io dumtempe ne funkcias.",
+    "You don't have permission to delete the alias.": "Vi ne havas permeson forigi la kromnomon.",
+    "Alternative addresses for this room:": "Alternativaj adresoj de ĉi tiu ĉambro:",
+    "This room has no alternative addresses": "Ĉi tiu ĉambro ne havas alternativajn adresojn",
+    "New address (e.g. #foo:domain)": "Nova adreso (ekz. #foo:domain)",
+    "Local addresses (unmoderated content)": "Lokaj adresoj (nereguligata enhavo)",
+    "Waiting for %(displayName)s to accept…": "Atendante akcepton de %(displayName)s…",
+    "Accepting…": "Akceptante…",
+    "Messages in this room are end-to-end encrypted.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Viaj mesaĝoj estas sekurigitaj, kaj nur vi kaj la ricevanto posedas la unikan ŝlosilojn, kiuj ilin povas malĉifri.",
+    "Your messages are not secure": "Viaj mesaĝoj ne estas sekuraj",
+    "One of the following may be compromised:": "Unu el la jenaj eble estas malkonfidencigita:",
+    "Your homeserver": "Via hejmservilo",
+    "The homeserver the user you’re verifying is connected to": "La hejmservilo, al kiu konektiĝis la kontrolata uzanto",
+    "Yours, or the other users’ internet connection": "Interreta konekto de vi aŭ la aliaj uzantoj",
+    "Yours, or the other users’ session": "Salutaĵo de vi aŭ la aliaj uzantoj",
+    "%(count)s verified sessions|other": "%(count)s kontrolitaj salutaĵoj",
+    "%(count)s verified sessions|one": "1 kontrolita salutaĵo",
+    "Hide verified sessions": "Kaŝi kontrolitajn salutaĵojn",
+    "%(count)s sessions|other": "%(count)s salutaĵoj",
+    "%(count)s sessions|one": "%(count)s salutaĵo",
+    "Hide sessions": "Kaŝi salutaĵojn",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La salutaĵo, kiun vi provas kontroli, ne subtenas skanadon de rapidrespondaj kodoj nek kontrolon per bildsignoj, kiujn subtenas Riot. Provu per alia kliento.",
+    "Verify by scanning": "Kontroli per skanado",
+    "Ask %(displayName)s to scan your code:": "Petu de %(displayName)s skani vian kodon:",
+    "Verify by emoji": "Kontroli per bildsignoj",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Se vi ne povas skani la supran kodon, kontrolu per komparo de unikaj bildsignoj.",
+    "Verify by comparing unique emoji.": "Kontrolu per komparo de unikaj bildsignoj.",
+    "You've successfully verified %(displayName)s!": "Vi sukcese kontrolis uzanton %(displayName)s!",
+    "Got it": "Komprenite",
+    "Verification timed out. Start verification again from their profile.": "Kontrolo atingis tempolimon. Rekomencu la kontrolon de ĝia profilo.",
+    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
+    "You cancelled verification. Start verification again from their profile.": "Vi nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
+    "Encryption enabled": "Ĉifrado estas ŝaltita",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝojn en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton el ĝia profilo.",
+    "Encryption not enabled": "Ĉifrado ne estas ŝaltita",
+    "The encryption used by this room isn't supported.": "La ĉifro uzata de ĉi tiu ĉambro ne estas subtenata.",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vi malatentis ĉi tiun uzanton, ĝia mesaĝo estas do kaŝita. <a>Tamen montri.</a>",
+    "You declined": "Vi rifuzis",
+    "%(name)s declined": "%(name)s rifuzis",
+    "Accepting …": "Akceptante…",
+    "Declining …": "Rifuzante…",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagis per %(content)s</reactedWith>",
+    "Any of the following data may be shared:": "Ĉiu el la jenaj datumoj povas kunhaviĝi:",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s kaj via kunigilo.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s.",
+    "Language Dropdown": "Lingva falmenuo",
+    "Destroy cross-signing keys?": "Ĉu detrui transire ĉifrajn ŝlosilojn?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Forigo de transire ĉifraj ŝlosiloj estas porĉiama. Ĉiu, kun kiu vi interkontrolis, vidos avertojn pri sekureco. Vi preskaŭ certe ne volas ĉi tion fari, malse vi perdis ĉiun aparaton, el kiu vi povus transire subskribadi.",
+    "Clear cross-signing keys": "Vakigi transire ĉifrajn ŝlosilojn",
+    "Clear all data in this session?": "Ĉu vakigi ĉiujn datumojn en ĉi tiu salutaĵo?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Vakigo de ĉiuj datumoj el ĉi tiu salutaĵo estas porĉiama. Ĉifritaj mesaĝoj perdiĝos, malse iliaj ŝlosiloj savkopiiĝis.",
+    "Verify session": "Kontroli salutaĵon",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Por kontroli, ke ĉi tiu salutaĵo estas fidinda, bonvolu kontroli, ke la ŝlosilo, kiun vi vidas en Agordoj de uzanto en tiu aparato, akordas kun la suba:",
+    "To verify that this session 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 session matches the key below:": "Por kontroli, ke ĉi tiu salutaĵo estas fidinda, bonvolu kontakti ĝian posedanton alimaniere (ekz. persone aŭ telefone), kaj demandu al ĝi, ĉu la ŝlosilo, kiun ĝi vidas en siaj Agordoj de uzanto por ĉi tiu salutaĵo akordas kun la suba:",
+    "Session name": "Nomo de salutaĵo",
+    "Session key": "Ŝlosilo de salutaĵo",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Se ĝi akordas, premu la kontrolan butonon sube. Se ne, iu alia spionas la salutaĵon kaj vi probable volos premi la forlistigan butonon anstataŭe.",
+    "Verification Requests": "Petoj de kontrolo",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Kontrolo de tiu ĉi uzanto markos ĝian salutaĵon fidata, kaj ankaŭ markos vian salutaĵon fidata por ĝi.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Kontrolu ĉi tiun aparaton por marki ĝin fidata. Fidado povas pacigi la menson de vi kaj aliaj uzantoj dum uzado de tutvoje ĉifrataj mesaĝoj.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Kontrolo de ĉi tiu aparato markos ĝin fidata, kaj ankaŭ la uzantoj, kiuj interkontrolis kun vi, fidos ĉi tiun aparaton.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Ŝaltu «Administri kunigojn» en Agordoj, por fari ĉi tion.",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Via Rioto ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Malsukcesis inviti la jenajn uzantojn al babilo: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Ni ne povis krei vian rektan ĉambron. Bonvolu kontroli, kiujn uzantojn vi invitas, kaj reprovu.",
+    "Something went wrong trying to invite the users.": "Io eraris dum invito de la uzantoj.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Ni ne povis inviti tiujn uzantojn. Bonvolu kontroli, kiujn uzantojn vi invitas, kaj reprovu.",
+    "Failed to find the following users": "Malsukcesis trovi la jenajn uzantojn",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "La jenaj uzantoj eble ne ekzistas aŭ ne validas, kaj ne povas invitiĝi: %(csvNames)s",
+    "Recent Conversations": "Freŝaj interparoloj",
+    "Recently Direct Messaged": "Freŝaj rektaj ĉambroj",
+    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Se vi ne povas iun trovi, petu ĝian uzantonomon, kaj havigu al ĝi vian uzantonomon (%(userId)s) aŭ <a>ligilon al profilo</a>.",
+    "Go": "Iri",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Se vi ne povas iun trovi, petu ĝian uzantonomon (ekz. @uzanto:servilo.net), aŭ prezentu al ĝi <a>tiun ĉi ĉambron</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novas salutaĵon «%(displayName)s», kiu petas ĉifrajn ŝlosilojn.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Via nekontrolita salutaĵo «%(displayName)s» petas ĉifrajn ŝlosilojn.",
+    "Loading session info...": "Enlegante informojn pri salutaĵo…",
+    "Your account is not secure": "Via konto ne estas sekura",
+    "Your password": "Via pasvorto",
+    "This session, or the other session": "Ĉi tiu salutaĵo, aŭ la alia salutaĵo",
+    "The internet connection either session is using": "La retkonekto uzata de iu el la salutaĵoj",
+    "We recommend you change your password and recovery key in Settings immediately": "Ni rekomendas, ke vi tuj ŝanĝu viajn pasvorton kaj rehavan ŝlosilon en Agordoj",
+    "New session": "Nova salutaĵo",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Uzu ĉi tiun salutaĵon por kontroli vian novan, donante al ĝi aliron al ĉifritaj mesaĝoj:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Se vi ne salutis ĉi tiun salutaĵon, via konto eble estas malkonfidencigita.",
+    "This wasn't me": "Tio ne estis mi",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gradaltigo de ĉambro estas altnivela ago kaj estas kutime rekomendata kiam ĉambro estas malstabila pro eraroj, mankantaj funkcioj, aŭ malsekuraĵoj.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Ĉi tio kutime influas nur traktadon de la ĉambro de la servilo. Se vi spertas problemojn pri Riot, bonvolu <a>raporti problemon</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vi gradaltigos ĉi tiun ĉambron de <oldVersion /> al <newVersion />.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ĉi tio ebligos revenon al via konto post adiaŭo kaj resaluto en aliaj salutaĵoj.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Vi nun forlistigas nekontrolitajn salutaĵojn; por sendi mesaĝojn al tiuj salutaĵoj, vi devas ilin kontroli.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ni rekomendas, ke vi trairu la kontrolon de ĉiu salutaĵo por konfirmi, ke ili apartenas al siaj ĝustaj posedantoj, sed laŭplaĉe vi povas ankaŭ sendi la mesaĝon sen kontrolo.",
+    "Room contains unknown sessions": "Ĉambro enhavas nekonatajn salutaĵojn",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "«%(RoomName)s» enhavas salutaĵojn, kiujn vi ne vidis antaŭe.",
+    "Unknown sessions": "Nekonataj salutaĵoj",
+    "Verification Request": "Kontrolpeto",
+    "Enter secret storage passphrase": "Enigu pasfrazon de sekreta deponejo",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Ne povis atingi sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan pasfrazon.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Averto</b>: vi aliru sekretan deponejon nur de fidata komputilo.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Aliru viajn sekuran historion de mesaĝoj kaj identecon de transiraj subskriboj por kontrolo de aliaj salutaĵoj per enigo de via pasfrazo.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se vi forgesis vian pasfrazon, vi povas <button1>uzi vian rehavan ŝlosilon</button1> aŭ <button2>reagordi rehavon</button2>.",
+    "Enter secret storage recovery key": "Enigu rehavan ŝlosilon de la sekreta deponejo",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ne povas atingi sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Aliru vian sekuran historion de mesaĝoj kaj vian identecon de transiraj subskriboj por kontrolo de aliaj salutaĵoj per enigo de via rehava ŝlosilo.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Se vi forgesis vian rehavan ŝlosilon, vi povas <button>reagordi rehavon</button>.",
+    "Recovery key mismatch": "Malakordo de rehavaj ŝlosiloj",
+    "Incorrect recovery passphrase": "Malĝusta rehava pasfrazo",
+    "Backup restored": "Savkopio rehavita",
+    "Enter recovery passphrase": "Enigu la rehavan pasfrazon",
+    "Enter recovery key": "Enigu la rehavan ŝlosilon",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Averto</b>: savkopiadon de ŝlosiloj vi starigu nur el fidata komputilo.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se vi forgesis vian rehavan ŝlosilon, vi povas <button>reagordi rehavon</button>",
+    "Reload": "Relegi",
+    "Remove for everyone": "Forigi por ĉiuj",
+    "Remove for me": "Forigi por mi mem",
+    "User Status": "Stato de uzanto",
+    "Country Dropdown": "Landa falmenuo",
+    "Confirm your identity by entering your account password below.": "Konfirmu vian identecon per enigo de la pasvorto de via konto sube.",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Mankas publika ŝlosilo por testo de homeco en hejmservila agordaro. Bonvolu raporti tion al la administranto de via hejmservilo.",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Ĝi povas atingi viajn ĉifritajn mesaĝojn, kaj aliaj uzantoj vidos ĝin fidata.",
+    "Your new session is now verified. Other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Aliaj uzantoj vidos ĝin fidata.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Sen plenigo de sekureco en ĉi tiu salutaĵo, ĝi ne povos atingi ĉifritajn mesaĝojn.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Ŝanĝo de via pasvorto restarigos ĉiujn tutvoje ĉifrajn ŝlosilojn en ĉiuj viaj salutaĵoj, igante ĉifritan historion de babilo nelegebla. Agordu Savkopiadon de ŝlosiloj aŭ elportu viajn ĉambrajn ŝlosilojn el alia salutaĵo, antaŭ ol vi restarigos vian pasvorton.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Vi adiaŭis ĉiujn viajn salutaĵojn kaj ne plu ricevados pasivajn sciigojn. Por reŝalti sciigojn, vi resalutu per ĉiu el viaj aparatoj.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Reprenu aliron al via konto kaj rehavu ĉifrajn ŝlosilojn deponitajn en ĉi tiu salutaĵo. Sen ili, vi ne povos legi ĉiujn viajn sekurajn mesaĝojn en iu ajn salutaĵo.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Viaj personaj datumoj (inkluzive ĉifrajn ŝlosilojn) estas ankorŭ deponitaj en ĉi tiu salutaĵo. Vakigu ĝin, se vi ne plu uzos ĉi tiun salutaĵon, aŭ volas saluti alian konton.",
+    "Sender session information": "Informoj pri salutaĵo de sendinto",
+    "Enter your account password to confirm the upgrade:": "Enigu pasvorton de via konto por konfirmi la gradaltigon:",
+    "Restore your key backup to upgrade your encryption": "Rehavu vian savkopion de ŝlosiloj por gradaltigi vian ĉifradon",
+    "Restore": "Rehavi",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Vi devos aŭtentikigi kun la servilo por konfirmi la gradaltigon.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Gradaltigu ĉi tiun salutaĵon por ebligi al ĝi kontroladon de aliaj salutaĵoj, donante al ili aliron al ĉifritaj mesaĵoj, kaj markante ilin fidataj por aliaj uzantoj.",
+    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Starigu ĉifradon en ĉi tiu salutaĵo por ebligi al ĝi kontroladon de aliaj salutaĵoj, donante al ili aliron al ĉifritaj mesaĵoj, kaj markante ilin fidataj por aliaj uzantoj.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sekurigu viajn ĉifrajn ŝlosilojn per pasfrazo. Por plejgranda sekureco, ĝi malsamu la pasvorton de via konto:",
+    "Enter a passphrase": "Enigu pasfrazon",
+    "Back up my encryption keys, securing them with the same passphrase": "Savkopiu miajn ĉifrajn ŝlosilojn, sekurigante ilin per la sama pasfrazo",
+    "Set up with a recovery key": "Starigi kun rehava ŝlosilo",
+    "Enter your passphrase a second time to confirm it.": "Enigu vian pasfrazon duan fojon por konfirmi ĝin.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Tenu ĝian kopion en sekura loko, ekzemple mastrumilo de pasvortoj, aŭ eĉ sekurkesto.",
+    "Your recovery key": "Via rehava ŝlosilo",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Via rehava ŝlosilo estis <b>kopiita al via tondujo</b>, algluu ĝin al:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Via rehava ŝlosilo estas en via dosierujo kun <b>Elŝutoj</b>.",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Vi nun povas kontroli aliajn viajn aparatojn, kaj aliajn uzantojn, por teni viajn babilojn sekurajn.",
+    "Make a copy of your recovery key": "Fari kopionde via rehava ŝlosilo",
+    "You're done!": "Vi finis!",
+    "Unable to set up secret storage": "Ne povas starigi sekretan deponejon",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Sen Sekura rehavo de mesaĝoj, vi ne povos rehavi vian historion de ĉifritaj mesaĝoj se vi adiaŭos aŭ uzos alian salutaĵon.",
+    "Create key backup": "Krei savkopion de ŝlosiloj",
+    "This session is encrypting history using the new recovery method.": "Ĉi tiu salutaĵo nun ĉifras historion kun la nova rehava metodo.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ĉi tiu salutaĵo trovis, ke viaj rehava pasfrazo kaj ŝlosilo por Sekuraj mesaĝoj estis forigitaj.",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Se vi faris tion akcidente, vi povas agordi Sekurajn mesaĝojn en ĉi tiu salutaĵo, kio reĉifros la historion de mesaj de ĉi tiu salutaĵo kun nova rehava metodo.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Post malŝalto, mesaĝoj el ĉifritaj ĉambroj ne aperos en serĉorezultoj.",
+    "Disable": "Malŝalti",
+    "Not currently indexing messages for any room.": "Mesaĝoj estas indeksataj en neniu ĉambro.",
+    "Currently indexing: %(currentRoom)s.": "Nun indeksante: %(currentRoom)s.",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot sekure loke kaŝmemoras ĉifritajn mesaĝojn por aperigi ilin en serĉorezultoj:",
+    "Space used:": "Spaco uzita:",
+    "Indexed messages:": "Indeksitaj masaĝoj:",
+    "Indexed rooms:": "Indeksitaj ĉambroj:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s el %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Dormotempo de elŝuto de mesaĝoj (milonsekunde)"
 }

From ca78337d20654b1b8a44e0d644f76b91c2bef205 Mon Sep 17 00:00:00 2001
From: Madison Scott-Clary <makyo@drab-makyo.com>
Date: Sun, 15 Mar 2020 18:20:02 +0000
Subject: [PATCH 1530/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2148 of 2152 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 209057e36d..da3201ebec 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2183,5 +2183,6 @@
     "Indexed messages:": "Indeksitaj masaĝoj:",
     "Indexed rooms:": "Indeksitaj ĉambroj:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s el %(totalRooms)s",
-    "Message downloading sleep time(ms)": "Dormotempo de elŝuto de mesaĝoj (milonsekunde)"
+    "Message downloading sleep time(ms)": "Dormotempo de elŝuto de mesaĝoj (milonsekunde)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permesi fala vokhelpa servilo turn.matrix.org, kiam vian hejmservilo ne ofertas unu (vian IP-adreso estus dividita dum voko)"
 }

From 06fce7158a1595ee71e6299898403d7a231a16e2 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sun, 15 Mar 2020 13:46:26 -0500
Subject: [PATCH 1531/3235] Rename Review Devices to Review Sessions

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

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 1551b57313..2988e90f40 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -143,7 +143,7 @@ function _setCallListeners(call) {
                     "if you proceed without verifying them, it will be "+
                     "possible for someone to eavesdrop on your call.",
                 ),
-                button: _t('Review Devices'),
+                button: _t('Review Sessions'),
                 onFinished: function(confirmed) {
                     if (confirmed) {
                         const room = MatrixClientPeg.get().getRoom(call.roomId);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 42120588c3..5f3ead1490 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -27,7 +27,7 @@
     "Dismiss": "Dismiss",
     "Call Failed": "Call Failed",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
-    "Review Devices": "Review Devices",
+    "Review Sessions": "Review Sessions",
     "Call Anyway": "Call Anyway",
     "Answer Anyway": "Answer Anyway",
     "Call": "Call",

From b331cb42027a6265e1deb63c4a3f94e663154cbf Mon Sep 17 00:00:00 2001
From: tsdgeos <aacid@kde.org>
Date: Sat, 14 Mar 2020 09:31:03 +0000
Subject: [PATCH 1532/3235] Translated using Weblate (Catalan)

Currently translated at 34.9% (750 of 2152 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 87e90fec9d..490af39fc7 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -598,7 +598,7 @@
     "Uploading %(filename)s and %(count)s others|zero": "Pujant %(filename)s",
     "Light theme": "Tema clar",
     "Dark theme": "Tema fosc",
-    "Sign out": "Tancar sessió",
+    "Sign out": "Tanca la sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
     "Cryptography": "Criptografia",
     "Labs": "Laboraroris",
@@ -872,5 +872,12 @@
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostra un recordatori per activar la Recuperació de missatges segurs en sales encriptades",
     "Show avatars in user and room mentions": "Mostra avatars en mencions d'usuaris i sales",
     "Enable big emoji in chat": "Activa Emojis grans en xats",
-    "Send analytics data": "Envia dades d'anàlisi"
+    "Send analytics data": "Envia dades d'anàlisi",
+    "Upload": "Puja",
+    "Email addresses": "Adreces de correu electrònic",
+    "Phone numbers": "Números de telèfon",
+    "Language and region": "Idioma i regió",
+    "Theme": "Tema",
+    "Phone Number": "Número de telèfon",
+    "Help": "Ajuda"
 }

From 099e56cd6b6faa692142475ac50130c8c2b7a8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0?= <adria@fsfe.org>
Date: Sat, 14 Mar 2020 09:42:30 +0000
Subject: [PATCH 1533/3235] Translated using Weblate (Catalan)

Currently translated at 34.9% (750 of 2152 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 490af39fc7..f1e354e7c8 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -115,7 +115,7 @@
     "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
     "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
     "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
-    "Missing user_id in request": "Falta el user_id a la sol·licitud",
+    "Missing user_id in request": "Falta l'user_id a la vostra sol·licitud",
     "Usage": "Ús",
     "/ddg is not a command": "/ddg no és un comandament",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
@@ -633,7 +633,7 @@
     "The platform you're on": "La plataforma a la que estàs",
     "Your language of choice": "El teu idioma preferit",
     "Which officially provided instance you are using, if any": "Quina instància oficial estàs utilitzant, si escau",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si estàs utilitzant el mode Richtext del Rich Text Editor o no",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si esteu utilitzant el mode Richtext del Rich Text Editor o no",
     "The information being sent to us to help make Riot.im better includes:": "La informació enviada a Riot.im per ajudar-nos a millorar inclou:",
     "Fetching third party location failed": "S'ha produït un error en obtenir la ubicació de tercers",
     "A new version of Riot is available.": "Hi ha una versió nova del Riot disponible.",
@@ -879,5 +879,6 @@
     "Language and region": "Idioma i regió",
     "Theme": "Tema",
     "Phone Number": "Número de telèfon",
-    "Help": "Ajuda"
+    "Help": "Ajuda",
+    "Send typing notifications": "Envia notificacions d'escriptura"
 }

From 9cd7a94e82340f25985c6078c346f4978031cfa6 Mon Sep 17 00:00:00 2001
From: Evilham <github@evilham.com>
Date: Sat, 14 Mar 2020 09:44:48 +0000
Subject: [PATCH 1534/3235] Translated using Weblate (Catalan)

Currently translated at 34.9% (750 of 2152 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index f1e354e7c8..aee9559eb7 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -113,7 +113,7 @@
     "Power level must be positive integer.": "El nivell de poders ha de ser un enter positiu.",
     "You are not in this room.": "No heu entrat a aquesta sala.",
     "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
-    "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
+    "Missing room_id in request": "Falta el room_id en la vostra sol·licitud",
     "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
     "Missing user_id in request": "Falta l'user_id a la vostra sol·licitud",
     "Usage": "Ús",

From e1b2272a93ff82f6460608c416f6fca246b43716 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sun, 15 Mar 2020 03:30:00 +0000
Subject: [PATCH 1535/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2152 of 2152 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c8d520d5a3..2df131f757 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2196,5 +2196,11 @@
     "Local addresses (unmoderated content)": "本機位置（未經審核的內容）",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 將聊天室名稱從 %(oldRoomName)s 變更為 %(newRoomName)s。",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s 變更了此聊天室的位置。",
-    "You don't have permission to delete the alias.": "您沒有刪除別名的權限。"
+    "You don't have permission to delete the alias.": "您沒有刪除別名的權限。",
+    "Support adding custom themes": "支援新增自訂佈景主題",
+    "Invalid theme schema.": "無效的佈景主題架構。",
+    "Error downloading theme information.": "下載佈景主題資訊時發生錯誤。",
+    "Theme added!": "已新增佈景主題！",
+    "Custom theme URL": "自訂佈景主題 URL",
+    "Add theme": "新增佈景主題"
 }

From b2258ab159dec0534d7067736308c3f73b1462f9 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 15 Mar 2020 18:21:27 +0000
Subject: [PATCH 1536/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2148 of 2152 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index da3201ebec..2684f32747 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2184,5 +2184,5 @@
     "Indexed rooms:": "Indeksitaj ĉambroj:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s el %(totalRooms)s",
     "Message downloading sleep time(ms)": "Dormotempo de elŝuto de mesaĝoj (milonsekunde)",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permesi fala vokhelpa servilo turn.matrix.org, kiam vian hejmservilo ne ofertas unu (vian IP-adreso estus dividita dum voko)"
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permesi repaŝan vokasistan servilon turn.matrix.org, kiam via hejmservilo iun ne disponigas (via IP-adreso estus havigata dum voko)"
 }

From f91ab660fd792fc19c69c7b03dafb4e5f9ed3e92 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Fri, 13 Mar 2020 19:10:21 +0000
Subject: [PATCH 1537/3235] Translated using Weblate (Finnish)

Currently translated at 90.7% (1951 of 2152 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 769e92ac27..a6ad64a55d 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1024,7 +1024,7 @@
     "Don't ask me again": "Älä kysy uudelleen",
     "Not now": "Ei nyt",
     "The conversation continues here.": "Keskustelu jatkuu täällä.",
-    "Share Link to User": "Jaa linkki käyttäjälle",
+    "Share Link to User": "Jaa linkki käyttäjään",
     "Muted Users": "Mykistetyt käyttäjät",
     "Timeline": "Aikajana",
     "Submit debug logs": "Lähetä vianjäljityslokit",
@@ -1939,5 +1939,52 @@
     "Session name": "Istunnon nimi",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "Lisäsit uuden istunnon '%(displayName)s', joka pyytää salausavaimia.",
     "Loading session info...": "Ladataan istunnon tietoja...",
-    "New session": "Uusi istunto"
+    "New session": "Uusi istunto",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Raportoidaksesi Matrixiin liittyvän tietoturvaongelman, lue Matrix.orgin <a>tietoturvaongelmien julkaisukäytäntö</a>.",
+    "Message search": "Viestihaku",
+    "Sessions": "Istunnot",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tämä huone siltaa viestejä seuraaville alustoille. <a>Lue lisää.</a>",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Pyydä uudelleen salausavaimia </requestLink> muista istunnoistasi.",
+    "Mark all as read": "Merkitse kaikki luetuiksi",
+    "Alternative addresses for this room:": "Tämän huoneen vaihtoehtoiset osoitteet:",
+    "This room has no alternative addresses": "Tällä huoneella ei ole vaihtoehtoisia osoitteita",
+    "Accepting…": "Hyväksytään…",
+    "One of the following may be compromised:": "Jokin seuraavista saattaa olla vaarantunut:",
+    "Your homeserver": "Kotipalvelimesi",
+    "Yours, or the other users’ internet connection": "Omasi tai muiden käyttäjien internet-yhteys",
+    "Yours, or the other users’ session": "Omasi tai muiden käyttäjien istunto",
+    "Encryption enabled": "Salaus käytössä",
+    "Encryption not enabled": "Salaus pois käytöstä",
+    "The encryption used by this room isn't supported.": "Tämän huoneen käyttämää salausta ei tueta.",
+    "You declined": "Kieltäydyit",
+    "%(name)s declined": "%(name)s kieltäytyi",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Seuraavien käyttäjien kutsuminen keskusteluun epäonnistui: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Käyttäjien kutsumisessa meni jotain pieleen.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Emme voineet kutsua kyseisiä käyttäjiä. Tarkista käyttäjät, jotka haluat kutsua ja yritä uudelleen.",
+    "Suggestions": "Ehdotukset",
+    "Your account is not secure": "Tilisi ei ole turvallinen",
+    "Your password": "Salasanasi",
+    "Room contains unknown sessions": "Huoneessa on tuntemattomia istuntoja",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" sisältää istuntoja, joita et ole nähnyt aiemmin.",
+    "Incorrect recovery passphrase": "Virheellinen palautuksen salalause",
+    "Enter recovery passphrase": "Syötä palautuksen salalause",
+    "Enter recovery key": "Syötä palautusavain",
+    "Confirm your identity by entering your account password below.": "Vahvista henkilöllisyytesi syöttämällä tilisi salasana alle.",
+    "Message not sent due to unknown sessions being present": "Viestiä ei lähetetty, koska läsnä on tuntemattomia istuntoja",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Näytä istunnot</showSessionsText>, <sendAnywayText>lähetä silti</sendAnywayText> tai <cancelText>peruuta</cancelText>.",
+    "Sender session information": "Tietoa lähettäjän istunnosta",
+    "Enter your account password to confirm the upgrade:": "Syötä tilisi salasana vahvistaaksesi päivityksen:",
+    "Restore": "Palauta",
+    "Enter a passphrase": "Syötä salalause",
+    "Back up my encryption keys, securing them with the same passphrase": "Varmuuskopioi salausavaimeni, suojaten ne samalla salalauseella",
+    "Enter your passphrase a second time to confirm it.": "Syötä salalauseesi uudestaan vahvistaaksesi sen.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Säilytä sitä turvallisessa paikassa, kuten salasanojen hallintaohjelmassa tai jopa kassakaapissa.",
+    "Your recovery key": "Palautusavaimesi",
+    "Make a copy of your recovery key": "Tee kopio palautusavaimestasi",
+    "You're done!": "Valmis!",
+    "Not currently indexing messages for any room.": "Minkään huoneen viestejä ei tällä hetkellä indeksoida.",
+    "Space used:": "Käytetty tila:",
+    "Indexed messages:": "Indeksoidut viestit:",
+    "Indexed rooms:": "Indeksoidut huoneet:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
 }

From d06fa6693f69c15d08db661aa49cfa01fb2018bb Mon Sep 17 00:00:00 2001
From: Jean-Abou-Samra <jean@abou-samra.fr>
Date: Sun, 15 Mar 2020 08:35:28 +0000
Subject: [PATCH 1538/3235] Translated using Weblate (French)

Currently translated at 99.9% (2150 of 2152 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 | 65 +++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index d46bd45d0f..635033c009 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -288,16 +288,16 @@
     "Analytics": "Collecte de données",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collecte des données anonymes qui nous permettent d’améliorer l’application.",
     "Passphrases must match": "Les phrases de passe doivent être identiques",
-    "Passphrase must not be empty": "La phrase de passe ne peut pas être vide",
+    "Passphrase must not be empty": "Le mot de passe ne peut pas être vide",
     "Export room keys": "Exporter les clés de salon",
-    "Enter passphrase": "Saisir la phrase de passe",
-    "Confirm passphrase": "Confirmer la phrase de passe",
+    "Enter passphrase": "Saisir le mot de passe",
+    "Confirm passphrase": "Confirmer le mot de passe",
     "Import room keys": "Importer les clés de salon",
     "File to import": "Fichier à importer",
     "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.": "Ce processus vous permet d’exporter dans un fichier local les clés pour les messages que vous avez reçus dans des salons chiffrés. Il sera ensuite possible d’importer ce fichier dans un autre client Matrix, afin de permettre à ce client de pouvoir déchiffrer ces messages.",
     "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.": "Le fichier exporté permettra à tous ceux qui peuvent le lire de déchiffrer tous les messages chiffrés auxquels vous avez accès, vous devez donc être vigilant et le stocker dans un endroit sûr. Afin de protéger ce fichier, saisissez ci-dessous une phrase secrète qui sera utilisée pour chiffrer les données exportées. Seule l’utilisation de la même phrase secrète permettra de déchiffrer et importer les données.",
     "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.": "Ce processus vous permet d’importer les clés de chiffrement que vous avez précédemment exportées depuis un autre client Matrix. Vous serez alors capable de déchiffrer n’importe quel message que l’autre client pouvait déchiffrer.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté est protégé par une phrase de passe. Vous devez saisir cette phrase de passe ici pour déchiffrer le fichier.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Le fichier exporté sera protégé par un mot de passe. Vous devez saisir ce mot de passe ici, pour déchiffrer le fichier.",
     "You must join the room to see its files": "Vous devez rejoindre le salon pour voir ses fichiers",
     "Reject all %(invitedRooms)s invites": "Rejeter la totalité des %(invitedRooms)s invitations",
     "Failed to invite": "Échec de l’invitation",
@@ -967,12 +967,12 @@
     "Unable to load key backup status": "Impossible de charger l'état de sauvegarde des clés",
     "Backup version: ": "Version de la sauvegarde : ",
     "Algorithm: ": "Algorithme : ",
-    "Enter a passphrase...": "Saisissez une phrase de passe…",
+    "Enter a passphrase...": "Saisissez un mot de passe…",
     "Next": "Suivant",
     "That matches!": "Ça correspond !",
     "That doesn't match.": "Ça ne correspond pas.",
     "Go back to set it again.": "Retournez en arrière pour la redéfinir.",
-    "Repeat your passphrase...": "Répétez votre phrase de passe…",
+    "Repeat your passphrase...": "Répétez votre mot de passe…",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Par précaution, vous pouvez l'utiliser pour restaurer l'historique de vos messages chiffrés si vous oubliez votre phrase de récupération.",
     "Your Recovery Key": "Votre clé de récupération",
     "Copy to clipboard": "Copier dans le presse-papier",
@@ -1025,7 +1025,7 @@
     "Names and surnames by themselves are easy to guess": "Les noms et prénoms seuls sont faciles à deviner",
     "Common names and surnames are easy to guess": "Les noms et prénoms répandus sont faciles à deviner",
     "Use a longer keyboard pattern with more turns": "Utilisez un schéma plus long et avec plus de variations",
-    "Great! This passphrase looks strong enough.": "Super ! Cette phrase de passe a l'air assez forte.",
+    "Great! This passphrase looks strong enough.": "Super ! Ce mot de passe a l'air assez fort.",
     "As a safety net, you can use it to restore your encrypted message history.": "En cas de problème, vous pouvez l'utiliser pour restaurer l'historique de vos messages chiffrés.",
     "Failed to load group members": "Échec du chargement des membres du groupe",
     "Failed to invite users to the room:": "Échec de l'invitation d'utilisateurs dans le salon :",
@@ -1184,7 +1184,7 @@
     "Create account": "Créer un compte",
     "Keep going...": "Continuer…",
     "Starting backup...": "Début de la sauvegarde…",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Une nouvelle phrase de passe et une nouvelle clé de récupération pour les messages sécurisés ont été détectées.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Un nouveau mot de passe et une nouvelle clé de récupération pour les messages sécurisés ont été détectés.",
     "Recovery Method Removed": "Méthode de récupération supprimée",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas supprimé la méthode de récupération, un attaquant peut être en train d'essayer d'accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier \"%(fileName)s\" dépasse la taille limite autorisée par ce serveur pour les téléchargements",
@@ -1263,7 +1263,7 @@
     "Pin": "Épingle",
     "Recovery Key Mismatch": "La clé de récupération ne correspond pas",
     "Incorrect Recovery Passphrase": "Phrase de passe de récupération incorrecte",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n'a pas pu être déchiffrée avec cette phrase de passe : vérifiez que vous avez saisi la bonne phrase de passe de récupération.",
+    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n'a pas pu être déchiffrée avec ce mot de passe : vérifiez que vous avez saisi le bon mot de passe de récupération.",
     "This homeserver would like to make sure you are not a robot.": "Ce serveur d'accueil veut s'assurer que vous n'êtes pas un robot.",
     "Change": "Changer",
     "Couldn't load page": "Impossible de charger la page",
@@ -1290,14 +1290,14 @@
     "Are you sure you want to sign out?": "Voulez-vous vraiment vous déconnecter ?",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Attention</b> : vous ne devriez configurer la sauvegarde des clés que depuis un ordinateur de confiance.",
     "Hide": "Masquer",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec une phrase de passe pour qu'elle reste sécurisée.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec un mot de passe pour qu'elle reste sécurisée.",
     "For maximum security, this should be different from your account password.": "Pour une sécurité maximale, ceci devrait être différent du mot de passe de votre compte.",
     "Set up with a Recovery Key": "Configurer une clé de récupération",
-    "Please enter your passphrase a second time to confirm.": "Veuillez saisir votre phrase de passe une seconde fois pour la confirmer.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Votre clé de récupération est une mesure de précaution. Vous pouvez l’utiliser pour restaurer l’accès à vos messages chiffrés si vous oubliez votre phrase de passe.",
+    "Please enter your passphrase a second time to confirm.": "Veuillez saisir votre mot de passe une seconde fois pour le confirmer.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Votre clé de récupération est une mesure de précaution. Vous pouvez l’utiliser pour restaurer l’accès à vos messages chiffrés si vous oubliez votre mot de passe.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
-    "Secure your backup with a passphrase": "Protégez votre sauvegarde avec une phrase de passe",
-    "Confirm your passphrase": "Confirmez votre phrase de passe",
+    "Secure your backup with a passphrase": "Protégez votre sauvegarde avec un mot de passe",
+    "Confirm your passphrase": "Confirmez votre mot de passe",
     "Recovery key": "Clé de récupération",
     "Success!": "Terminé !",
     "Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels",
@@ -1843,10 +1843,10 @@
     "Secret storage public key:": "Clé publique du coffre secret :",
     "in account data": "dans les données du compte",
     "Cross-signing": "Signature croisée",
-    "Enter secret storage passphrase": "Saisir la phrase de passe du coffre secret",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne phrase de passe.",
+    "Enter secret storage passphrase": "Saisir le mot de passe du coffre secret",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que le mot de passe saisi est correct.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement accéder au coffre secret depuis un ordinateur de confiance.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre phrase de passe, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre mot de passe, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
     "Enter secret storage recovery key": "Saisir la clé de récupération du coffre secret",
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne clé de récupération.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Si vous avez oublié votre clé de récupération vous pouvez <button>définir de nouvelles options de récupération</button>.",
@@ -1931,9 +1931,9 @@
     "Reject & Ignore user": "Rejeter et ignorer l’utilisateur",
     "Enter your account password to confirm the upgrade:": "Saisissez le mot de passe de votre compte pour confirmer la mise à niveau :",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vous devrez vous identifier avec le serveur pour confirmer la mise à niveau.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sécurisez vos clés de chiffrement avec une phrase de passe. Pour une sécurité maximale, elle devrait être différente du mot de passe de votre compte :",
-    "Enter a passphrase": "Saisissez une phrase de passe",
-    "Enter your passphrase a second time to confirm it.": "Saisissez votre phrase de passe une seconde fois pour la confirmer.",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sécurisez vos clés de chiffrement avec un mot de passe. Pour une sécurité maximale, il devrait être différent du mot de passe de votre compte :",
+    "Enter a passphrase": "Saisissez un mot de passe",
+    "Enter your passphrase a second time to confirm it.": "Saisissez votre mot de passe une seconde fois pour le confirmer.",
     "Verify other users in their profile.": "Vérifiez d’autres utilisateurs dans leur profil.",
     "Upgrade your encryption": "Mettre à niveau votre chiffrement",
     "Set up encryption": "Configurer le chiffrement",
@@ -2000,7 +2000,7 @@
     "This wasn't me": "Ce n’était pas moi",
     "Your new session is now verified. Other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Les autres utilisateurs la verront comme fiable.",
     "Restore your key backup to upgrade your encryption": "Restaurez votre sauvegarde de clés pour mettre à niveau votre chiffrement",
-    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec la même phrase de passe",
+    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec le même mot de passe",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Il y a des sessions inconnues dans ce salon : si vous continuez sans les vérifier, quelqu’un pourra espionner votre appel.",
     "Unverified session": "Session non vérifiée",
     "Verifies a user, session, and pubkey tuple": "Vérifie un utilisateur, une session et une collection de clés publiques",
@@ -2013,7 +2013,7 @@
     "Show padlocks on invite only rooms": "Afficher des cadenas sur les salons accessibles uniquement par invitation",
     "Never send encrypted messages to unverified sessions from this session": "Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ne jamais envoyer des messages chiffrés aux sessions non vérifiées dans ce salon depuis cette session",
-    "Keep secret storage passphrase in memory for this session": "Conserver la phrase de passe du coffre secret en mémoire pour cette session",
+    "Keep secret storage passphrase in memory for this session": "Conserver le mot de passe du coffre secret en mémoire pour cette session",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Confirmez que les émojis ci-dessous sont affichés sur les deux appareils, dans le même ordre :",
     "Verify this device by confirming the following number appears on its screen.": "Vérifiez cet appareil en confirmant que le nombre suivant apparaît sur son écran.",
     "To be secure, do this in person or use a trusted way to communicate.": "Pour être sûr, faites cela en personne ou utilisez un moyen de communication fiable.",
@@ -2091,7 +2091,7 @@
     "Room contains unknown sessions": "Le salon contient des sessions inconnues",
     "\"%(RoomName)s\" contains sessions that you haven't seen before.": "« %(RoomName)s » contient des sessions que vous n’avez jamais vues auparavant.",
     "Unknown sessions": "Sessions inconnues",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre phrase de passe.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre mot de passe.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre clé de récupération.",
     "Message not sent due to unknown sessions being present": "Message non envoyé à cause de la présence de sessions inconnues",
     "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Afficher les sessions</showSessionsText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
@@ -2106,14 +2106,14 @@
     "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Cette session peut à présent vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez  pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
     "This session is encrypting history using the new recovery method.": "Cette session chiffre l’historique en utilisant la nouvelle méthode de récupération.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et votre clé de récupération pour les messages chiffrés ont été supprimés.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre mot de passe et votre clé de récupération pour les messages chiffrés ont été supprimés.",
     "Setting up keys": "Configuration des clés",
     "Verify yourself & others to keep your chats safe": "Vérifiez-vous et vérifiez les autres afin que vos discussions restent sûres",
     "You have not verified this user.": "Vous n’avez pas vérifié cet utilisateur.",
     "Recovery key mismatch": "La clé de récupération ne correspond pas",
-    "Incorrect recovery passphrase": "Phrase de passe de récupération incorrecte",
+    "Incorrect recovery passphrase": "Mot de passe de récupération incorrecte",
     "Backup restored": "Sauvegarde restaurée",
-    "Enter recovery passphrase": "Saisir la phrase de passe de récupération",
+    "Enter recovery passphrase": "Saisir le mot de passe de récupération",
     "Enter recovery key": "Saisir la clé de récupération",
     "Confirm your identity by entering your account password below.": "Confirmez votre identité en saisissant le mot de passe de votre compte ci-dessous.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gardez-en une copie en lieu sûr, comme un gestionnaire de mots de passe ou même un coffre.",
@@ -2127,7 +2127,7 @@
     "How fast should messages be downloaded.": "À quelle fréquence les messages doivent être téléchargés.",
     "of ": "sur ",
     "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)",
-    "Cancel entering passphrase?": "Annuler la saisie de la phrase de passe ?",
+    "Cancel entering passphrase?": "Annuler la saisie du mot de passe ?",
     "If you cancel now, you won't complete your secret storage operation!": "Si vous annulez maintenant, vous ne terminerez pas votre opération du coffre secret !",
     "Indexed rooms:": "Salons indexés :",
     "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s",
@@ -2194,5 +2194,14 @@
     "Alternative addresses for this room:": "Adresses alternatives pour ce salon :",
     "This room has no alternative addresses": "Ce salon n’a pas d’adresse alternative",
     "New address (e.g. #foo:domain)": "Nouvelle adresse (par ex. #foo:domaine)",
-    "Local addresses (unmoderated content)": "Adresses locales (contenu non modéré)"
+    "Local addresses (unmoderated content)": "Adresses locales (contenu non modéré)",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s a changé le nom du salon de %(oldRoomName)s en %(newRoomName)s.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s a changé les adresses de ce salon.",
+    "Support adding custom themes": "Autoriser l'ajout de thèmes personnalisés",
+    "Invalid theme schema.": "Schéma du thème invalide.",
+    "Error downloading theme information.": "Une erreur s'est produite en téléchargeant les informations du thème.",
+    "Theme added!": "Thème ajouté !",
+    "Custom theme URL": "URL personnalisée pour le thème",
+    "Add theme": "Ajouter le thème",
+    "You don't have permission to delete the alias.": "Vous n'avez pas la permission de supprimer l'alias."
 }

From edff8a916c73d2ed08d3e93ee399c61702f28b12 Mon Sep 17 00:00:00 2001
From: Jan Renz <jan.renz@gmail.com>
Date: Sun, 15 Mar 2020 21:59:48 +0000
Subject: [PATCH 1539/3235] Translated using Weblate (German)

Currently translated at 77.4% (1666 of 2152 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 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c2f20305d6..636ee1e861 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -176,10 +176,10 @@
     "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s gekickt.",
     "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie beigetreten sind).",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für Alle.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
@@ -1468,10 +1468,10 @@
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Überprüfe deinen Browser auf Erweiterungen, die den Identitätsserver blockieren könnten (z.B. Privacy Badger)",
     "Error upgrading room": "Fehler beim Raum-Aufrüsten",
     "Double check that your server supports the room version chosen and try again.": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.",
-    "%(senderName)s placed a voice call.": "%(senderName)s tätigte einen Sprachanruf.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s tätigte einen Sprachanruf (Nicht von diesem Browser unterstützt)",
-    "%(senderName)s placed a video call.": "%(senderName)s tätigte einen Videoanruf.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s tätigte einen Videoanruf (Nicht von diesem Browser unterstützt)",
+    "%(senderName)s placed a voice call.": "%(senderName)s hat einen Sprachanruf getätigt.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
+    "%(senderName)s placed a video call.": "%(senderName)s hat einen Sprachanruf getätigt.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
     "Verify this session": "Sitzung verifizieren",
     "Set up encryption": "Verschlüsselung einrichten",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s hat %(addedAddresses)s und %(count)s Adressen zu diesem Raum hinzugefügt",
@@ -1711,5 +1711,7 @@
     "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen",
     "Remove %(count)s messages|one": "Eine Nachricht entfernen",
     "Remove recent messages": "Letzte Nachrichten entfernen",
-    "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?"
+    "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert."
 }

From c2e2894ab2d787972ffe25e97364bd1da63a6bc6 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 13 Mar 2020 19:39:36 +0000
Subject: [PATCH 1540/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2152 of 2152 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b37b18fe83..d1e7aeebe7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2193,5 +2193,11 @@
     "This room has no alternative addresses": "A szobának nincsen alternatív címe",
     "New address (e.g. #foo:domain)": "Új cím (pl.: #foo:domain)",
     "Local addresses (unmoderated content)": "Helyi cím (nem moderált tartalom)",
-    "You don't have permission to delete the alias.": "Ezt az alternatív nevet nincs jogod törölni."
+    "You don't have permission to delete the alias.": "Ezt az alternatív nevet nincs jogod törölni.",
+    "Support adding custom themes": "Egyedi téma támogatás hozzáadása",
+    "Invalid theme schema.": "Téma séma érvénytelen.",
+    "Error downloading theme information.": "A téma információk letöltése sikertelen.",
+    "Theme added!": "Téma hozzáadva!",
+    "Custom theme URL": "Egyedi téma URL",
+    "Add theme": "Téma hozzáadása"
 }

From 7eb9f205e50b13b232beabf98bd2428939d8a187 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sat, 14 Mar 2020 10:25:02 +0000
Subject: [PATCH 1541/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2152 of 2152 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 4c111b2e68..8c61eda6e0 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2193,5 +2193,12 @@
     "Alternative addresses for this room:": "Indirizzi alternativi per questa stanza:",
     "This room has no alternative addresses": "Questa stanza non ha indirizzi alternativi",
     "New address (e.g. #foo:domain)": "Nuovo indirizzo (es. #abc:dominio)",
-    "Local addresses (unmoderated content)": "Indirizzi locali (contenuto non moderato)"
+    "Local addresses (unmoderated content)": "Indirizzi locali (contenuto non moderato)",
+    "Support adding custom themes": "Supporta l'aggiunta di temi personalizzati",
+    "Invalid theme schema.": "Schema del tema non valido.",
+    "Error downloading theme information.": "Errore scaricando informazioni sul tema.",
+    "Theme added!": "Tema aggiunto!",
+    "Custom theme URL": "URL tema personalizzato",
+    "Add theme": "Aggiungi tema",
+    "You don't have permission to delete the alias.": "Non hai l'autorizzazione per eliminare l'alias."
 }

From a19b67b97053c4ea86a1635fa123eb0e86b26915 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sun, 15 Mar 2020 21:36:10 +0000
Subject: [PATCH 1542/3235] Translated using Weblate (Japanese)

Currently translated at 54.6% (1176 of 2152 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 | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index c142cc2a0e..6aaa03a0ff 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -207,7 +207,7 @@
     "Answer Anyway": "とにかく応答",
     "Call Anyway": "とにかく通話",
     "Call Timeout": "通話タイムアウト",
-    "The remote side failed to pick up": "相手が応答しなかった",
+    "The remote side failed to pick up": "相手が応答しませんでした",
     "Unable to capture screen": "画面をキャプチャできません",
     "Existing Call": "既存の通話",
     "You are already in a call.": "すでに通話中です。",
@@ -346,14 +346,14 @@
     "(unknown failure: %(reason)s)": "(不明なエラー: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)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 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) に部屋履歴を参照できるようにしました。",
     "%(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 は、その部屋の固定メッセージを変更しました。",
+    "%(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 によって削除されました",
@@ -403,7 +403,7 @@
     "Confirm password": "確認のパスワード",
     "Authentication": "認証",
     "Device ID": "端末ID",
-    "Last seen": "最後に表示した時刻",
+    "Last seen": "最近の使用履歴",
     "Failed to set display name": "表示名の設定に失敗しました",
     "Disable Notifications": "通知を無効にする",
     "Enable Notifications": "通知を有効にする",
@@ -1139,7 +1139,7 @@
     "Bug reporting": "バグの報告",
     "FAQ": "よくある質問",
     "Versions": "バージョン",
-    "Key backup": "キーのバックアップ",
+    "Key backup": "鍵のバックアップ",
     "Voice & Video": "音声とビデオ",
     "Remove recent messages": "最近のメッセージを削除する",
     "%(creator)s created and configured the room.": "%(creator)s が部屋を作成して構成しました。",
@@ -1185,5 +1185,19 @@
     "Encryption enabled": "暗号化が有効です",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "この部屋内のメッセージはエンドツーエンドで暗号化されます。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
     "Encryption not enabled": "暗号化が無効です",
-    "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。"
+    "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。",
+    "Cross-signing public keys:": "クロス署名公開鍵:",
+    "Cross-signing private keys:": "クロス署名秘密鍵:",
+    "Delete %(count)s sessions|other": "%(count)s 件のセッションを削除",
+    "Delete %(count)s sessions|one": "%(count)s 件のセッションを削除",
+    "ID": "ID",
+    "Clear cache and reload": "キャッシュを削除して再読み込み",
+    "Session ID:": "セッションID:",
+    "Session key:": "セッション鍵:",
+    "Cross-signing": "クロス署名",
+    "Sessions": "セッション",
+    "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます。",
+    "Session name": "セッション名",
+    "Session key": "セッション鍵",
+    "Sender session information": "送信者のセッション情報"
 }

From acd3087b0ff6796f525f9ba3b66e2ca717864008 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 16 Mar 2020 02:46:31 +0000
Subject: [PATCH 1543/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2152 of 2152 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 2df131f757..6ab657ee72 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2202,5 +2202,6 @@
     "Error downloading theme information.": "下載佈景主題資訊時發生錯誤。",
     "Theme added!": "已新增佈景主題！",
     "Custom theme URL": "自訂佈景主題 URL",
-    "Add theme": "新增佈景主題"
+    "Add theme": "新增佈景主題",
+    "Review Sessions": "檢閱工作階段"
 }

From 7510ac72f533929bc2ee86dc2eba7881872730f8 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sun, 15 Mar 2020 22:32:52 +0000
Subject: [PATCH 1544/3235] Translated using Weblate (Japanese)

Currently translated at 56.4% (1214 of 2152 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 | 59 +++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 6aaa03a0ff..6be319d794 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -25,7 +25,7 @@
     "Failed to change password. Is your password correct?": "パスワード変更に失敗しました。パスワードは正しいですか?",
     "Only people who have been invited": "この部屋に招待された人のみ参加可能",
     "Always show message timestamps": "発言時刻を常に表示",
-    "Filter room members": "部屋メンバーの絞り込み",
+    "Filter room members": "部屋メンバーを検索",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "添付ファイル送信",
@@ -71,7 +71,7 @@
     "Analytics": "分析",
     "The information being sent to us to help make Riot.im better includes:": "Riot.imをよりよくするために私達に送信される情報は以下を含みます:",
     "Thursday": "木曜日",
-    "Messages in one-to-one chats": "一対一のチャットでのメッセージ",
+    "Messages in one-to-one chats": "1対1のチャットでのメッセージ",
     "A new version of Riot is available.": "新しいバージョンのRiotが利用可能です。",
     "All Rooms": "全ての部屋",
     "You cannot delete this message. (%(code)s)": "あなたはこの発言を削除できません (%(code)s)",
@@ -86,7 +86,7 @@
     "Set Password": "パスワードを設定",
     "Sorry, your browser is <b>not</b> able to run Riot.": "申し訳ありません。あなたのブラウザではRiotは<b>動作できません</b>。",
     "Monday": "月曜日",
-    "Messages in group chats": "グループチャットのメッセージ",
+    "Messages in group chats": "グループチャットでのメッセージ",
     "Friday": "金曜日",
     "All messages (noisy)": "全ての発言(通知音あり)",
     "Yesterday": "昨日",
@@ -383,9 +383,9 @@
     "Enable widget screenshots on supported widgets": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
     "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 からの着信コール",
+    "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": "受諾",
     "Incorrect verification code": "認証コードの誤りです",
@@ -485,7 +485,7 @@
     "Idle": "アイドル",
     "Offline": "オフライン",
     "Unknown": "未知の",
-    "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s に %(userName)s が見た",
+    "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": "返信中",
     "Save": "保存",
@@ -755,7 +755,7 @@
     "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": "共有部屋",
+    "Share Room": "部屋を共有",
     "Link to most recent message": "最新のメッセージへのリンク",
     "Share User": "ユーザーを共有",
     "Share Community": "コミュニティを共有",
@@ -1077,7 +1077,7 @@
     "Roles & Permissions": "役割と権限",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "誰が履歴を読み取れるかに関する変更は、今後送信されるメッセージにのみ適用されます。既に存在する履歴の表示は変更されません。",
     "Encryption": "暗号化",
-    "Once enabled, encryption cannot be disabled.": "もし有効化された場合、二度と無効化できません。",
+    "Once enabled, encryption cannot be disabled.": "暗号化は一度有効にすると、二度と無効にできません。",
     "Encrypted": "暗号化",
     "Email Address": "メールアドレス",
     "Main address": "メインアドレス",
@@ -1199,5 +1199,44 @@
     "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます。",
     "Session name": "セッション名",
     "Session key": "セッション鍵",
-    "Sender session information": "送信者のセッション情報"
+    "Sender session information": "送信者のセッション情報",
+    "Never send encrypted messages to unverified sessions from this session": "このセッションでは、未検証のセッションに対して暗号化されたメッセージを送信しない",
+    "Never send encrypted messages to unverified sessions in this room from this session": "このセッションでは、この部屋の未検証のセッションに対して暗号化されたメッセージを送信しない",
+    "Encrypted messages in one-to-one chats": "1対1のチャットでの暗号化されたメッセージ",
+    "Encrypted messages in group chats": "グループチャットでの暗号化されたメッセージ",
+    "Upload": "アップロード",
+    "Enable desktop notifications for this session": "このセッションでデスクトップ通知を行う",
+    "Email addresses": "メールアドレス",
+    "This room is end-to-end encrypted": "この部屋はエンドツーエンド暗号化されています",
+    "Some sessions for this user are not trusted": "このユーザーの一部のセッションは信頼されていません",
+    "All sessions for this user are trusted": "このユーザーの全てのセッションを信頼しています",
+    "Some sessions in this encrypted room are not trusted": "この暗号化された部屋の一部のセッションは信頼されていません",
+    "All sessions in this encrypted room are trusted": "この暗号化された部屋の全てのセッションを信頼しています",
+    "Encrypted by an unverified session": "未検証のセッションによる暗号化",
+    "Close preview": "プレビューを閉じる",
+    "Direct Messages": "ダイレクトメッセージ",
+    "Loading …": "読み込み中 …",
+    "Direct message": "ダイレクトメッセージ",
+    "Your display name": "あなたの表示名",
+    "Power level": "権限レベル",
+    "Removing…": "削除中…",
+    "Destroy cross-signing keys?": "クロス署名鍵を破棄してよろしいですか？",
+    "Clear cross-signing keys": "クロス署名鍵を削除",
+    "Clear all data in this session?": "このセッションの全てのデータを削除してよろしいですか？",
+    "Clear all data": "全てのデータを削除",
+    "Create a public room": "公開された部屋を作成",
+    "Make this room public": "この部屋を公開する",
+    "Loading session info...": "セッション情報を読み込み中...",
+    "Message edits": "メッセージの編集履歴",
+    "Report Content to Your Homeserver Administrator": "あなたのホームサーバーの管理者にコンテンツを報告",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。この部屋内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示することはできません。",
+    "Send report": "報告を送信する",
+    "Sign out and remove encryption keys?": "ログアウトおよび暗号鍵の削除を実行してよろしいですか？",
+    "Terms of Service": "利用規約",
+    "To continue you need to accept the terms of this service.": "続行するには、このサービスの利用規約に同意する必要があります。",
+    "Report Content": "コンテンツを報告",
+    "Hide": "隠す",
+    "Help": "ヘルプ",
+    "Filter rooms…": "部屋を検索…",
+    "Preview": "プレビュー"
 }

From 6f27c4c17af4e47272ff21815c57b35da9d23456 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Mar 2020 11:45:51 +0000
Subject: [PATCH 1545/3235] s/Server address/Server name/

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/directory/NetworkDropdown.js | 4 ++--
 src/i18n/strings/en_EN.json                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 6d1501ca57..e56cfcf185 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -53,7 +53,7 @@ const validServer = withValidation({
         {
             key: "required",
             test: async ({ value }) => !!value,
-            invalid: () => _t("Enter a server address"),
+            invalid: () => _t("Enter a server name"),
         }, {
             key: "available",
             final: true,
@@ -216,7 +216,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                 description: _t("Enter the address of a new server you want to explore."),
                 button: _t("Add"),
                 hasCancel: false,
-                placeholder: _t("Server address"),
+                placeholder: _t("Server name"),
                 validator: validServer,
             });
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3f20d4ec61..e990f76519 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1437,7 +1437,7 @@
     "And %(count)s more...|other": "And %(count)s more...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
-    "Enter a server address": "Enter a server address",
+    "Enter a server name": "Enter a server name",
     "Looks good": "Looks good",
     "Can't find this server or its room list": "Can't find this server or its room list",
     "All rooms": "All rooms",
@@ -1447,7 +1447,7 @@
     "Matrix": "Matrix",
     "Add a new server": "Add a new server",
     "Enter the address of a new server you want to explore.": "Enter the address of a new server you want to explore.",
-    "Server address": "Server address",
+    "Server name": "Server name",
     "Add a new server...": "Add a new server...",
     "%(networkName)s rooms": "%(networkName)s rooms",
     "Matrix rooms": "Matrix rooms",

From 82a37ba0ad429c09c101e175dd0650773dd67a2d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Mar 2020 12:00:56 +0000
Subject: [PATCH 1546/3235] Fix styling of NetworkDropdown dialogs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss     | 4 ++++
 src/components/views/dialogs/QuestionDialog.js    | 6 +++++-
 src/components/views/dialogs/TextInputDialog.js   | 6 +++++-
 src/components/views/directory/NetworkDropdown.js | 6 ++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index b23af0b2a0..e60c481e45 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -157,3 +157,7 @@ limitations under the License.
         font-size: 12px;
     }
 }
+
+.mx_NetworkDropdown_dialog .mx_Dialog {
+    width: 557px;
+}
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 8cb16dd88f..07a1eae5d5 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -33,6 +33,7 @@ export default createReactClass({
         onFinished: PropTypes.func.isRequired,
         headerImage: PropTypes.string,
         quitOnly: PropTypes.bool, // quitOnly doesn't show the cancel button just the quit [x].
+        fixedWidth: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -63,11 +64,14 @@ export default createReactClass({
             primaryButtonClass = "danger";
         }
         return (
-            <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_QuestionDialog"
+                onFinished={this.props.onFinished}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
                 headerImage={this.props.headerImage}
                 hasCancel={this.props.hasCancelButton}
+                fixedWidth={this.props.fixedWidth}
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     { this.props.description }
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index e56e9f2b87..b9f6f6ebce 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -35,6 +35,7 @@ export default createReactClass({
         onFinished: PropTypes.func.isRequired,
         hasCancel: PropTypes.bool,
         validator: PropTypes.func, // result of withValidation
+        fixedWidth: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -102,8 +103,11 @@ export default createReactClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
-            <BaseDialog className="mx_TextInputDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_TextInputDialog"
+                onFinished={this.props.onFinished}
                 title={this.props.title}
+                fixedWidth={this.props.fixedWidth}
             >
                 <form onSubmit={this.onOk}>
                     <div className="mx_Dialog_content">
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index e56cfcf185..85d72e33f0 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -169,7 +169,8 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                             b: serverName => <b>{ serverName }</b>,
                         }),
                         button: _t("Remove"),
-                    });
+                        fixedWidth: false,
+                    }, "mx_NetworkDropdown_dialog");
 
                     const [ok] = await finished;
                     if (!ok) return;
@@ -218,7 +219,8 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                 hasCancel: false,
                 placeholder: _t("Server name"),
                 validator: validServer,
-            });
+                fixedWidth: false,
+            }, "mx_NetworkDropdown_dialog");
 
             const [ok, newServer] = await finished;
             if (!ok) return;

From 454b32400dbc9d190dc594ebf3115bfe9e8cb277 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Mar 2020 12:12:59 +0000
Subject: [PATCH 1547/3235] improve width

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index e60c481e45..106392f880 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -159,5 +159,5 @@ limitations under the License.
 }
 
 .mx_NetworkDropdown_dialog .mx_Dialog {
-    width: 557px;
+    width: 45vw;
 }

From eabaf5801388e40cba45322335be01d765472cbb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Mar 2020 12:20:52 +0000
Subject: [PATCH 1548/3235] Add local-echo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/directory/NetworkDropdown.js        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 85d72e33f0..425b951929 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {useEffect, useState} from 'react';
 import PropTypes from 'prop-types';
 
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
@@ -84,7 +84,8 @@ const validServer = withValidation({
 
 const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, selectedInstanceId}) => {
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
-    const userDefinedServers = useSettingValue(SETTING_NAME);
+    const _userDefinedServers = useSettingValue(SETTING_NAME);
+    const [userDefinedServers, _setUserDefinedServers] = useState(_userDefinedServers);
 
     const handlerFactory = (server, instanceId) => {
         return () => {
@@ -93,6 +94,15 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
         };
     };
 
+    const setUserDefinedServers = servers => {
+        _setUserDefinedServers(servers);
+        SettingsStore.setValue(SETTING_NAME, null, "account", servers);
+    };
+    // keep local echo up to date with external changes
+    useEffect(() => {
+        _setUserDefinedServers(_userDefinedServers);
+    }, [_userDefinedServers]);
+
     // we either show the button or the dropdown in its place.
     let content;
     if (menuDisplayed) {
@@ -176,7 +186,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
                     if (!ok) return;
 
                     // delete from setting
-                    SettingsStore.setValue(SETTING_NAME, null, "account", servers.filter(s => s !== server));
+                    setUserDefinedServers(servers.filter(s => s !== server));
 
                     // the selected server is being removed, reset to our HS
                     if (serverSelected === server) {
@@ -226,8 +236,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
             if (!ok) return;
 
             if (!userDefinedServers.includes(newServer)) {
-                const servers = [...userDefinedServers, newServer];
-                SettingsStore.setValue(SETTING_NAME, null, "account", servers);
+                setUserDefinedServers([...userDefinedServers, newServer]);
             }
 
             onOptionChange(newServer); // change filter to the new server

From 78543da7f4bb989499bbfac56d7ec27d21164177 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Mar 2020 12:28:20 +0000
Subject: [PATCH 1549/3235] Fix missed copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/directory/NetworkDropdown.js | 2 +-
 src/i18n/strings/en_EN.json                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index 425b951929..2fabda1a74 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -224,7 +224,7 @@ const NetworkDropdown = ({onOptionChange, protocols = {}, selectedServerName, se
             const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
             const { finished } = Modal.createTrackedDialog("Network Dropdown", "Add a new server", TextInputDialog, {
                 title: _t("Add a new server"),
-                description: _t("Enter the address of a new server you want to explore."),
+                description: _t("Enter the name of a new server you want to explore."),
                 button: _t("Add"),
                 hasCancel: false,
                 placeholder: _t("Server name"),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e990f76519..a14e275a51 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1446,7 +1446,7 @@
     "Remove server": "Remove server",
     "Matrix": "Matrix",
     "Add a new server": "Add a new server",
-    "Enter the address of a new server you want to explore.": "Enter the address of a new server you want to explore.",
+    "Enter the name of a new server you want to explore.": "Enter the name of a new server you want to explore.",
     "Server name": "Server name",
     "Add a new server...": "Add a new server...",
     "%(networkName)s rooms": "%(networkName)s rooms",

From 7239f5149a02db6e62e28eae2149ae3cc60bd26d Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 16 Mar 2020 12:00:18 +0000
Subject: [PATCH 1550/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2145 of 2152 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index a5f896bc43..2a89531c03 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2191,5 +2191,6 @@
     "Alternative addresses for this room:": "Adresa alternative për këtë dhomë:",
     "This room has no alternative addresses": "Kjo dhomë nuk ka adresa alternative",
     "New address (e.g. #foo:domain)": "Adresë e re (p.sh., #foo:domain)",
-    "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)"
+    "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)",
+    "Review Sessions": "Shqyrtoni Sesione"
 }

From 5d5d28df40282b3e86a0ac278f72e4874fdd28f0 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Mon, 16 Mar 2020 15:09:14 +0000
Subject: [PATCH 1551/3235] Translated using Weblate (German)

Currently translated at 77.6% (1669 of 2152 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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 636ee1e861..4a81253308 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1688,7 +1688,7 @@
     "Your homeserver does not support session management.": "Dein Heimserver unterstützt keine Sitzungsverwaltung.",
     "Unable to load session list": "Sitzungsliste kann nicht geladen werden",
     "Delete %(count)s sessions|one": "%(count)s Sitzung löschen",
-    "This session is backing up your keys. ": "Diese Sitzung sichert deine Schlüssel.",
+    "This session is backing up your keys. ": "Diese Sitzung sichert deine Schlüssel. ",
     "Connect this session to Key Backup": "Diese Sitzung mit der Schlüsselsicherung verbinden",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Die Sicherung hat eine Signatur von einer <verify>unbekannten</verify> Sitzung mit der ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Die Sicherung hat eine <validity>gültige</validity> Signatur von dieser Sitzung",
@@ -1713,5 +1713,8 @@
     "Remove recent messages": "Letzte Nachrichten entfernen",
     "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert."
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
+    "Review Sessions": "Sitzungen überprüfen",
+    "Displays information about a user": "Zeigt Informationen über einen Benutzer",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert."
 }

From 639f20e37a8eb81df3acdcda84294b899f9949ef Mon Sep 17 00:00:00 2001
From: Jan Renz <jan.renz@gmail.com>
Date: Mon, 16 Mar 2020 15:10:58 +0000
Subject: [PATCH 1552/3235] Translated using Weblate (German)

Currently translated at 77.6% (1669 of 2152 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4a81253308..3ef5b09a89 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1716,5 +1716,6 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
     "Review Sessions": "Sitzungen überprüfen",
     "Displays information about a user": "Zeigt Informationen über einen Benutzer",
-    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert."
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt."
 }

From 26f62039852260912cbe99f4ff6712a0f55b12db Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:27:06 +0100
Subject: [PATCH 1553/3235] move room publish toggle below canonical alias

also to own component to not contaminate alias settings too much
with this
---
 .../views/room_settings/AliasSettings.js      |  2 +
 .../views/room_settings/RoomPublishSetting.js | 60 +++++++++++++++++++
 .../tabs/room/GeneralRoomSettingsTab.js       | 31 ----------
 3 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 src/components/views/room_settings/RoomPublishSetting.js

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index eab41c5ccd..57dfa16ada 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -25,6 +25,7 @@ import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
+import RoomPublishSetting from "./RoomPublishSetting";
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {
@@ -356,6 +357,7 @@ export default class AliasSettings extends React.Component {
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
+                <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">
                     {this._getLocalNonAltAliases().map(alias => {
                         return <option value={alias} key={alias} />;
diff --git a/src/components/views/room_settings/RoomPublishSetting.js b/src/components/views/room_settings/RoomPublishSetting.js
new file mode 100644
index 0000000000..bac2dfc656
--- /dev/null
+++ b/src/components/views/room_settings/RoomPublishSetting.js
@@ -0,0 +1,60 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import {_t} from "../../../languageHandler";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+
+export default class RoomPublishSetting extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        this.state = {isRoomPublished: false};
+    }
+
+    onRoomPublishChange = (e) => {
+        const valueBefore = this.state.isRoomPublished;
+        const newValue = !valueBefore;
+        this.setState({isRoomPublished: newValue});
+        const client = MatrixClientPeg.get();
+
+        client.setRoomDirectoryVisibility(
+            this.props.roomId,
+            newValue ? 'public' : 'private',
+        ).catch(() => {
+            // Roll back the local echo on the change
+            this.setState({isRoomPublished: valueBefore});
+        });
+    };
+
+    componentDidMount() {
+        const client = MatrixClientPeg.get();
+        client.getRoomDirectoryVisibility(this.props.roomId).then((result => {
+            this.setState({isRoomPublished: result.visibility === 'public'});
+        }));
+    }
+
+    render() {
+        const client = MatrixClientPeg.get();
+
+        return (<LabelledToggleSwitch value={this.state.isRoomPublished}
+            onChange={this.onRoomPublishChange}
+            disabled={!this.props.canSetCanonicalAlias}
+            label={_t("Publish this room to the public in %(domain)s's room directory?", {
+              domain: client.getDomain(),
+            })} />);
+    }
+}
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index b65f8d49a4..5aface4f3b 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -21,7 +21,6 @@ import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 export default class GeneralRoomSettingsTab extends React.Component {
@@ -39,26 +38,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
         };
     }
 
-    componentWillMount() {
-        this.context.getRoomDirectoryVisibility(this.props.roomId).then((result => {
-            this.setState({isRoomPublished: result.visibility === 'public'});
-        }));
-    }
-
-    onRoomPublishChange = (e) => {
-        const valueBefore = this.state.isRoomPublished;
-        const newValue = !valueBefore;
-        this.setState({isRoomPublished: newValue});
-
-        this.context.setRoomDirectoryVisibility(
-            this.props.roomId,
-            newValue ? 'public' : 'private',
-        ).catch(() => {
-            // Roll back the local echo on the change
-            this.setState({isRoomPublished: valueBefore});
-        });
-    };
-
     _onLeaveClick = () => {
         dis.dispatch({
             action: 'leave_room',
@@ -75,7 +54,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const room = client.getRoom(this.props.roomId);
 
         const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
-        const canActuallySetAliases = room.currentState.mayClientSendStateEvent("m.room.aliases", client);
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
         const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
@@ -96,15 +74,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
                                    canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
                 </div>
-                <div className='mx_SettingsTab_section'>
-                    <LabelledToggleSwitch value={this.state.isRoomPublished}
-                                          onChange={this.onRoomPublishChange}
-                                          disabled={!canActuallySetAliases}
-                                          label={_t("Publish this room to the public in %(domain)s's room directory?", {
-                                              domain: client.getDomain(),
-                                          })} />
-                </div>
-
                 <span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <RelatedGroupSettings roomId={room.roomId}

From 31cb257eb9e4f793dfd7cfec3f5e9f8523cbb88d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:28:45 +0100
Subject: [PATCH 1554/3235] add headers and copy to lessen confusion of new
 alias workings

---
 src/components/views/room_settings/AliasSettings.js    |  9 +++++++--
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js |  3 ++-
 src/i18n/strings/en_EN.json                            | 10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 57dfa16ada..34e07e31dc 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -356,6 +356,9 @@ export default class AliasSettings extends React.Component {
 
         return (
             <div className='mx_AliasSettings'>
+                <span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
+                <p>{_t("Published addresses can be used by anyone on any server to join your room. " +
+                    "To publish an address it needs to be set as a local address first.")}</p>
                 {canonicalAliasSection}
                 <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">
@@ -374,12 +377,14 @@ export default class AliasSettings extends React.Component {
                     onItemAdded={this.onAltAliasAdded}
                     onItemRemoved={this.onAltAliasDeleted}
                     suggestionsListId="mx_AliasSettings_altRecommendations"
-                    itemsLabel={_t('Alternative addresses for this room:')}
-                    noItemsLabel={_t('This room has no alternative addresses')}
+                    itemsLabel={_t('Other published addresses:')}
+                    noItemsLabel={_t('No other published addresses yet, add one below')}
                     placeholder={_t(
                         'New address (e.g. #foo:domain)',
                     )}
                 />
+                <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
+                <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
                     <summary>{_t('Local addresses (unmoderated content)')}</summary>
                     {localAliasesList}
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 5aface4f3b..99882ae400 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -68,12 +68,13 @@ export default class GeneralRoomSettingsTab extends React.Component {
                     <RoomProfileSettings roomId={this.props.roomId} />
                 </div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Room Addresses")}</span>
+                <div className="mx_SettingsTab_heading">{_t("Room Addresses")}</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <AliasSettings roomId={this.props.roomId}
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
                                    canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
                 </div>
+                <div className="mx_SettingsTab_heading">{_t("Other")}</div>
                 <span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <RelatedGroupSettings roomId={room.roomId}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f3ead1490..547b7e64cf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -840,7 +840,6 @@
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
     "Bridges": "Bridges",
     "Room Addresses": "Room Addresses",
-    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "URL Previews": "URL Previews",
     "Uploaded sound": "Uploaded sound",
     "Sounds": "Sounds",
@@ -1164,9 +1163,13 @@
     "not specified": "not specified",
     "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)",
-    "Alternative addresses for this room:": "Alternative addresses for this room:",
-    "This room has no alternative addresses": "This room has no alternative addresses",
+    "Published Addresses": "Published Addresses",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
+    "Other published addresses:": "Other published addresses:",
+    "No other published addresses yet, add one below": "No other published addresses yet, add one below",
     "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
+    "Local Addresses": "Local Addresses",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
     "Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
@@ -1178,6 +1181,7 @@
     "Room Name": "Room Name",
     "Room Topic": "Room Topic",
     "Room avatar": "Room avatar",
+    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "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.",

From f7eecc09212d3b6550ce61983c4323665ee6fa14 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:29:15 +0100
Subject: [PATCH 1555/3235] avoid double margin-right for toggle

---
 res/css/views/settings/tabs/_SettingsTab.scss | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 9727946893..64d6f04711 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -49,9 +49,15 @@ limitations under the License.
     margin-bottom: 24px;
 }
 
-.mx_SettingsTab_section .mx_SettingsFlag {
-    margin-right: 100px;
-    margin-bottom: 10px;
+.mx_SettingsTab_section {
+    .mx_SettingsFlag {
+        margin-right: 100px;
+        margin-bottom: 10px;
+    }
+
+    &.mx_SettingsTab_subsectionText .mx_SettingsFlag {
+        margin-right: 0px !important;
+    }
 }
 
 .mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {

From db10fcd2b7e936c892f8c24d7fa37edc22d68b6f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:29:35 +0100
Subject: [PATCH 1556/3235] make editable list look like something closer to
 design

---
 res/css/views/elements/_EditableItemList.scss    | 16 +++++++++++++++-
 .../views/elements/EditableItemList.js           |  3 +--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index 51fa4c4423..ef60f006cc 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -20,14 +20,21 @@ limitations under the License.
 }
 
 .mx_EditableItem {
+    display: flex;
     margin-bottom: 5px;
-    margin-left: 15px;
 }
 
 .mx_EditableItem_delete {
+    order: 3;
     margin-right: 5px;
     cursor: pointer;
     vertical-align: middle;
+    width: 14px;
+    height: 14px;
+    mask-image: url('$(res)/img/feather-customised/cancel.svg');
+    mask-repeat: no-repeat;
+    background-color: $warning-color;
+    mask-size: 100%;
 }
 
 .mx_EditableItem_email {
@@ -36,12 +43,19 @@ limitations under the License.
 
 .mx_EditableItem_promptText {
     margin-right: 10px;
+    order: 2;
 }
 
 .mx_EditableItem_confirmBtn {
     margin-right: 5px;
 }
 
+.mx_EditableItem_item {
+    flex: auto 1 0;
+    order: 1;
+}
+
 .mx_EditableItemList_label {
     margin-bottom: 5px;
 }
+
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index ae3473ef0d..6e649e777a 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -78,8 +78,7 @@ export class EditableItem extends React.Component {
 
         return (
             <div className="mx_EditableItem">
-                <img src={require("../../../../res/img/feather-customised/cancel.svg")} width={14} height={14}
-                     onClick={this._onRemove} className="mx_EditableItem_delete" alt={_t("Remove")} />
+                <div onClick={this._onRemove} className="mx_EditableItem_delete" title={_t("Remove")} role="button" />
                 <span className="mx_EditableItem_item">{this.props.value}</span>
             </div>
         );

From 78fb95aa9e1e88251a16a723e38ffadb07f82d76 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:24:49 +0100
Subject: [PATCH 1557/3235] change <details> appearance for local aliases

---
 res/css/views/room_settings/_AliasSettings.scss     | 8 ++++++++
 src/components/views/room_settings/AliasSettings.js | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/css/views/room_settings/_AliasSettings.scss b/res/css/views/room_settings/_AliasSettings.scss
index 294902a1f0..8ae3acbbd3 100644
--- a/res/css/views/room_settings/_AliasSettings.scss
+++ b/res/css/views/room_settings/_AliasSettings.scss
@@ -29,4 +29,12 @@ limitations under the License.
 
 .mx_AliasSettings summary {
     cursor: pointer;
+    color: $accent-color;
+    font-weight: 600;
+    list-style: none;
+
+    // list-style doesn't do it for webkit
+    &::-webkit-details-marker {
+        display: none;
+    }
 }
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 34e07e31dc..e8fc700d50 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -98,6 +98,7 @@ export default class AliasSettings extends React.Component {
             canonicalAlias: null, // #canonical:domain.tld
             updatingCanonicalAlias: false,
             localAliasesLoading: false,
+            detailsOpen: false,
         };
 
         if (props.canonicalAliasEvent) {
@@ -268,6 +269,7 @@ export default class AliasSettings extends React.Component {
                 this.loadLocalAliases();
             }
         }
+        this.setState({detailsOpen: event.target.open});
     };
 
     onCanonicalAliasChange = (event) => {
@@ -386,7 +388,7 @@ export default class AliasSettings extends React.Component {
                 <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
-                    <summary>{_t('Local addresses (unmoderated content)')}</summary>
+                    <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more")}</summary>
                     {localAliasesList}
                 </details>
             </div>

From d6ddc5096ff806dfa64022bb393e3c6ff80a34e0 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:25:13 +0100
Subject: [PATCH 1558/3235] tweak labels, etc

---
 src/components/views/room_settings/AliasSettings.js | 8 ++------
 src/i18n/strings/en_EN.json                         | 5 ++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index e8fc700d50..84e2120e1a 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -349,9 +349,7 @@ export default class AliasSettings extends React.Component {
                 onItemAdded={this.onLocalAliasAdded}
                 onItemRemoved={this.onLocalAliasDeleted}
                 noItemsLabel={_t('This room has no local addresses')}
-                placeholder={_t(
-                    'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
-                )}
+                placeholder={_t('Local address')}
                 domain={localDomain}
             />);
         }
@@ -381,9 +379,7 @@ export default class AliasSettings extends React.Component {
                     suggestionsListId="mx_AliasSettings_altRecommendations"
                     itemsLabel={_t('Other published addresses:')}
                     noItemsLabel={_t('No other published addresses yet, add one below')}
-                    placeholder={_t(
-                        'New address (e.g. #foo:domain)',
-                    )}
+                    placeholder={_t('New published address (e.g. #alias:server)')}
                 />
                 <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 547b7e64cf..f2272b294a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1162,15 +1162,14 @@
     "Main address": "Main address",
     "not specified": "not specified",
     "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)",
+    "Local address": "Local address",
     "Published Addresses": "Published Addresses",
     "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
     "Other published addresses:": "Other published addresses:",
     "No other published addresses yet, add one below": "No other published addresses yet, add one below",
-    "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
+    "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",
     "Local Addresses": "Local Addresses",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
-    "Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
     "Invalid community ID": "Invalid community ID",

From 3253d0b93dc8a61a9a1b230ae441dfa83aeda4ab Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:30:40 +0100
Subject: [PATCH 1559/3235] more margin between published and local addresses

---
 .../views/room_settings/_AliasSettings.scss   | 22 ++++++++++++-------
 .../views/room_settings/AliasSettings.js      |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/res/css/views/room_settings/_AliasSettings.scss b/res/css/views/room_settings/_AliasSettings.scss
index 8ae3acbbd3..f8d92e7828 100644
--- a/res/css/views/room_settings/_AliasSettings.scss
+++ b/res/css/views/room_settings/_AliasSettings.scss
@@ -27,14 +27,20 @@ limitations under the License.
     box-shadow: none;
 }
 
-.mx_AliasSettings summary {
-    cursor: pointer;
-    color: $accent-color;
-    font-weight: 600;
-    list-style: none;
+.mx_AliasSettings {
+    summary {
+        cursor: pointer;
+        color: $accent-color;
+        font-weight: 600;
+        list-style: none;
 
-    // list-style doesn't do it for webkit
-    &::-webkit-details-marker {
-        display: none;
+        // list-style doesn't do it for webkit
+        &::-webkit-details-marker {
+            display: none;
+        }
+    }
+
+    .mx_AliasSettings_localAliasHeader {
+        margin-top: 35px;
     }
 }
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 84e2120e1a..ae9b085375 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -381,7 +381,7 @@ export default class AliasSettings extends React.Component {
                     noItemsLabel={_t('No other published addresses yet, add one below')}
                     placeholder={_t('New published address (e.g. #alias:server)')}
                 />
-                <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
+                <span className='mx_SettingsTab_subheading mx_AliasSettings_localAliasHeader'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
                     <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more")}</summary>

From 351398ada98dab4f7fabdf27b2efee93c2cb6e55 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:34:09 +0100
Subject: [PATCH 1560/3235] fix style lint

---
 res/css/views/settings/tabs/_SettingsTab.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 64d6f04711..01a1d94956 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -47,9 +47,7 @@ limitations under the License.
 
 .mx_SettingsTab_section {
     margin-bottom: 24px;
-}
 
-.mx_SettingsTab_section {
     .mx_SettingsFlag {
         margin-right: 100px;
         margin-bottom: 10px;

From 6c4b572c7e1d4df1a9fdd32de8c12035e1b139d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Mar 2020 17:47:56 +0000
Subject: [PATCH 1561/3235] Wait for verification request on login

Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
---
 .../structures/auth/_CompleteSecurity.scss    |  4 ++++
 .../structures/auth/CompleteSecurity.js       | 20 +++++++++++--------
 src/i18n/strings/en_EN.json                   |  4 +++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 2bf51d9574..601492d43c 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -37,6 +37,10 @@ limitations under the License.
     font-size: 15px;
 }
 
+.mx_CompleteSecurity_waiting {
+    color: $notice-secondary-color;
+}
+
 .mx_CompleteSecurity_actionRow {
     display: flex;
     justify-content: flex-end;
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 2e95f668a6..2516abbb74 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -54,7 +54,7 @@ export default class CompleteSecurity extends React.Component {
         }
     }
 
-    onStartClick = async () => {
+    _onUsePassphraseClick = async () => {
         this.setState({
             phase: PHASE_BUSY,
         });
@@ -148,13 +148,23 @@ export default class CompleteSecurity extends React.Component {
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
+            const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
             title = _t("Complete security");
             body = (
                 <div>
                     <p>{_t(
-                        "Verify this session to grant it access to encrypted messages.",
+                        "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
                     )}</p>
+                    <p className="mx_CompleteSecurity_waiting"><InlineSpinner />{_t("Waiting…")}</p>
+                    <p>{_t(
+                        "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+                    {}, {
+                        button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onUsePassphraseClick}>
+                            {sub}
+                        </AccessibleButton>,
+                    })}</p>
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
                             kind="danger"
@@ -162,12 +172,6 @@ export default class CompleteSecurity extends React.Component {
                         >
                             {_t("Skip")}
                         </AccessibleButton>
-                        <AccessibleButton
-                            kind="primary"
-                            onClick={this.onStartClick}
-                        >
-                            {_t("Start")}
-                        </AccessibleButton>
                     </div>
                 </div>
             );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f3ead1490..183acea3e6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1973,7 +1973,9 @@
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
     "Complete security": "Complete security",
-    "Verify this session to grant it access to encrypted messages.": "Verify this session to grant it access to encrypted messages.",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
+    "Waiting…": "Waiting…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
     "Session verified": "Session verified",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",

From 6c8bfe3293b2732b380ccda118180cb826426785 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Mar 2020 17:58:37 +0000
Subject: [PATCH 1562/3235] Lint

---
 src/components/structures/auth/CompleteSecurity.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 2516abbb74..e8a5e3db49 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -155,13 +155,17 @@ export default class CompleteSecurity extends React.Component {
             body = (
                 <div>
                     <p>{_t(
-                        "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
+                        "Open an existing session & use it to verify this one, " +
+                        "granting it access to encrypted messages.",
                     )}</p>
                     <p className="mx_CompleteSecurity_waiting"><InlineSpinner />{_t("Waiting…")}</p>
                     <p>{_t(
                         "If you can’t access one, <button>use your recovery key or passphrase.</button>",
                     {}, {
-                        button: sub => <AccessibleButton element="span" className="mx_linkButton" onClick={this._onUsePassphraseClick}>
+                        button: sub => <AccessibleButton element="span"
+                            className="mx_linkButton"
+                            onClick={this._onUsePassphraseClick}
+                        >
                             {sub}
                         </AccessibleButton>,
                     })}</p>

From cc27894fc92e5e3c9ce35f11fbebe2a973e43224 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 16 Mar 2020 18:59:07 +0000
Subject: [PATCH 1563/3235] Fix key backup trust text for cross-signing

This fixes the key backup panel to use the correct object when checking whether
a device is verified or unverified via cross-signing trust.
---
 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 73be2bad9f..27fdb2cb56 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -277,25 +277,25 @@ export default class KeyBackupPanel extends React.PureComponent {
                         "Backup has an <validity>invalid</validity> signature from this session",
                         {}, { validity },
                     );
-                } else if (sig.valid && sig.device.isVerified()) {
+                } else if (sig.valid && sig.deviceTrust.isVerified()) {
                     sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
                         "<verify>verified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
-                } else if (sig.valid && !sig.device.isVerified()) {
+                } else if (sig.valid && !sig.deviceTrust.isVerified()) {
                     sigStatus = _t(
                         "Backup has a <validity>valid</validity> signature from " +
                         "<verify>unverified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
-                } else if (!sig.valid && sig.device.isVerified()) {
+                } else if (!sig.valid && sig.deviceTrust.isVerified()) {
                     sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
                         "<verify>verified</verify> session <device></device>",
                         {}, { validity, verify, device },
                     );
-                } else if (!sig.valid && !sig.device.isVerified()) {
+                } else if (!sig.valid && !sig.deviceTrust.isVerified()) {
                     sigStatus = _t(
                         "Backup has an <validity>invalid</validity> signature from " +
                         "<verify>unverified</verify> session <device></device>",

From d30618fe0ebd26c7497208fc114f436569c240f0 Mon Sep 17 00:00:00 2001
From: Mejans <farga@mejans.fr>
Date: Mon, 16 Mar 2020 20:14:10 +0000
Subject: [PATCH 1564/3235] Added translation using Weblate (Occitan)

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

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

From 7b6a78bfb86a14196573342928bc41a49320b13f Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Mon, 16 Mar 2020 17:31:06 -0400
Subject: [PATCH 1565/3235] don't check public key if there is none

---
 src/CrossSigningManager.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 2184eaf347..f428697e74 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -96,6 +96,9 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
         {
             keyInfo: info,
             checkPrivateKey: async (input) => {
+                if (!info.pubkey) {
+                    return true;
+                }
                 const key = await inputToKey(input);
                 return MatrixClientPeg.get().checkSecretStoragePrivateKey(key, info.pubkey);
             },

From f7dddfc1a7c773e2e66f82735b56e4d9f9dfa8d1 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Mon, 16 Mar 2020 17:31:26 -0400
Subject: [PATCH 1566/3235] show encryption upgrade when SSSS needs upgrading

---
 src/DeviceListener.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4e7bc8470d..28f0d49c0e 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -143,6 +143,15 @@ export default class DeviceListener {
                 }
             }
             return;
+        } else if (await cli.secretStorageKeyNeedsUpgrade()) {
+            // FIXME: do we a different message?
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: THIS_DEVICE_TOAST_KEY,
+                title: _t("Encryption upgrade available"),
+                icon: "verification_warning",
+                props: {kind: 'upgrade_encryption'},
+                component: sdk.getComponent("toasts.SetupEncryptionToast"),
+            });
         } else {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         }

From c245c6932cdfe60b480be0cd0f33790f8f4ae78b Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 16 Mar 2020 19:00:13 +0000
Subject: [PATCH 1567/3235] Restore key backup in background after complete
 security

We were blocking the complete security flow on waiting for a key backup restore
to complete, which could take multiple minutes with no visible progress.

Fixes https://github.com/vector-im/riot-web/issues/12426
---
 .../structures/auth/CompleteSecurity.js       | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 2e95f668a6..70732f4d9a 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -63,9 +63,30 @@ export default class CompleteSecurity extends React.Component {
             const backupInfo = await cli.getKeyBackupVersion();
             this.setState({backupInfo});
 
-            await accessSecretStorage(async () => {
-                await cli.checkOwnCrossSigningTrust();
-                if (backupInfo) await cli.restoreKeyBackupWithSecretStorage(backupInfo);
+            // The control flow is fairly twisted here...
+            // For the purposes of completing security, we only wait on getting
+            // as far as the trust check and then show a green shield.
+            // We also begin the key backup restore as well, which we're
+            // awaiting inside `accessSecretStorage` only so that it keeps your
+            // passphase cached for that work. This dialog itself will only wait
+            // on the first trust check, and the key backup restore will happen
+            // in the background.
+            await new Promise((resolve, reject) => {
+                try {
+                    accessSecretStorage(async () => {
+                        await cli.checkOwnCrossSigningTrust();
+                        resolve();
+                        if (backupInfo) {
+                            // A complete restore can take many minutes for large
+                            // accounts / slow servers, so we allow the dialog
+                            // to advance before this.
+                            await cli.restoreKeyBackupWithSecretStorage(backupInfo);
+                        }
+                    });
+                } catch (e) {
+                    console.error(e);
+                    reject(e);
+                }
             });
 
             if (cli.getCrossSigningId()) {

From 43f0013dda8a5c67e1e4eb7c15d6f6772986960c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Mar 2020 10:09:47 +0000
Subject: [PATCH 1568/3235] Migrate GroupView away from Gemini

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_GroupView.scss     | 4 ++--
 res/css/structures/_MainSplit.scss     | 1 +
 src/components/structures/GroupView.js | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 517b8b1922..7072307b9d 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -341,8 +341,8 @@ limitations under the License.
     display: none;
 }
 
-.mx_GroupView_body .gm-scroll-view > * {
-    margin: 11px 50px 0px 68px;
+.mx_GroupView_body .mx_AutoHideScrollbar_offset > * {
+    margin: 11px 50px 50px 68px;
 }
 
 .mx_GroupView_groupDesc textarea {
diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 4d73953cd7..25e1153fce 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -18,6 +18,7 @@ limitations under the License.
     display: flex;
     flex-direction: row;
     min-width: 0;
+    height: 100%;
 }
 
 // move hit area 5px to the right so it doesn't overlap with the timeline scrollbar
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index af90fbbe83..cadc511fc3 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -39,6 +39,7 @@ import {makeGroupPermalink, makeUserPermalink} from "../../utils/permalinks/Perm
 import {Group} from "matrix-js-sdk";
 import {allSettled, sleep} from "../../utils/promise";
 import RightPanelStore from "../../stores/RightPanelStore";
+import AutoHideScrollbar from "./AutoHideScrollbar";
 
 const LONG_DESC_PLACEHOLDER = _td(
 `<h1>HTML for your community's page</h1>
@@ -1173,7 +1174,6 @@ export default createReactClass({
     render: function() {
         const GroupAvatar = sdk.getComponent("avatars.GroupAvatar");
         const Spinner = sdk.getComponent("elements.Spinner");
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         if (this.state.summaryLoading && this.state.error === null || this.state.saving) {
             return <Spinner />;
@@ -1332,10 +1332,10 @@ export default createReactClass({
                         <GroupHeaderButtons />
                     </div>
                     <MainSplit panel={rightPanel}>
-                        <GeminiScrollbarWrapper className="mx_GroupView_body">
+                        <AutoHideScrollbar className="mx_GroupView_body">
                             { this._getMembershipSection() }
                             { this._getGroupSection() }
-                        </GeminiScrollbarWrapper>
+                        </AutoHideScrollbar>
                     </MainSplit>
                 </main>
             );

From 8dfc15a3288d685fb3c6e664ce71e5deeeb1ee60 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Mar 2020 10:23:12 +0000
Subject: [PATCH 1569/3235] Migrate TagPanel away from Gemini

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_TagPanel.scss     | 2 ++
 src/components/structures/TagPanel.js | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index dddd2e324c..77f016f05f 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -57,6 +57,8 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagPanel_scroller {
     flex-grow: 1;
+    width: 100%;
+    height: 100vh;
 }
 
 .mx_TagPanel .mx_TagPanel_tagTileContainer {
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 622e63d8ce..f1a39d6fcf 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -28,6 +28,7 @@ import { _t } from '../../languageHandler';
 import { Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "./AutoHideScrollbar";
 
 const TagPanel = createReactClass({
     displayName: 'TagPanel',
@@ -106,7 +107,6 @@ const TagPanel = createReactClass({
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const ActionButton = sdk.getComponent('elements.ActionButton');
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
@@ -138,9 +138,8 @@ const TagPanel = createReactClass({
                 { clearButton }
             </div>
             <div className="mx_TagPanel_divider" />
-            <GeminiScrollbarWrapper
+            <AutoHideScrollbar
                 className="mx_TagPanel_scroller"
-                autoshow={true}
                 // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
                 // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6253
                 onMouseDown={this.onMouseDown}
@@ -166,7 +165,7 @@ const TagPanel = createReactClass({
                             </div>
                     ) }
                 </Droppable>
-            </GeminiScrollbarWrapper>
+            </AutoHideScrollbar>
         </div>;
     },
 });

From 44b0aa2d88a3d30eba1c8fc44e9fa8397e7958c4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Mar 2020 10:31:45 +0000
Subject: [PATCH 1570/3235] Remove remainders of gemini-scrollbar and
 react-gemini-scrollbar

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |  2 --
 res/css/_common.scss                          | 31 ----------------
 res/css/structures/_GroupView.scss            |  2 +-
 res/css/structures/_MatrixChat.scss           |  7 ----
 res/themes/dark/css/_dark.scss                |  4 ---
 src/components/structures/ScrollPanel.js      |  2 +-
 .../views/dialogs/UnknownDeviceDialog.js      |  1 -
 .../views/elements/GeminiScrollbarWrapper.js  | 35 -------------------
 yarn.lock                                     | 10 ------
 9 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 src/components/views/elements/GeminiScrollbarWrapper.js

diff --git a/package.json b/package.json
index eeca614aa2..075295ba0e 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "flux": "2.1.1",
     "focus-visible": "^5.0.2",
     "fuse.js": "^2.2.0",
-    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.1",
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
@@ -93,7 +92,6 @@
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
     "react-focus-lock": "^2.2.1",
-    "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
     "text-encoding-utf-8": "^1.0.1",
diff --git a/res/css/_common.scss b/res/css/_common.scss
index a4ef603242..ad64aced50 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -207,37 +207,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     transition: opacity 0.2s ease-in-out;
 }
 
-/* XXX: critical hack to GeminiScrollbar to allow them to work in FF 42 and Chrome 48.
-   Stop the scrollbar view from pushing out the container's overall sizing, which causes
-   flexbox to adapt to the new size and cause the view to keep growing.
- */
-.gm-scrollbar-container .gm-scroll-view {
-    position: absolute;
-}
-
-/* Expand thumbs on hoverover */
-.gm-scrollbar {
-    border-radius: 5px !important;
-}
-.gm-scrollbar.-vertical {
-    width: 6px;
-    transition: width 120ms ease-out !important;
-}
-.gm-scrollbar.-vertical:hover,
-.gm-scrollbar.-vertical:active {
-    width: 8px;
-    transition: width 120ms ease-out !important;
-}
-.gm-scrollbar.-horizontal {
-    height: 6px;
-    transition: height 120ms ease-out !important;
-}
-.gm-scrollbar.-horizontal:hover,
-.gm-scrollbar.-horizontal:active {
-    height: 8px;
-    transition: height 120ms ease-out !important;
-}
-
 // These are magic constants which are excluded from tinting, to let themes
 // (which only have CSS, unlike skins) tell the app what their non-tinted
 // colourscheme is by inspecting the stylesheet DOM.
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 7072307b9d..6963f8a160 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -370,7 +370,7 @@ limitations under the License.
     padding: 40px 20px;
 }
 
-.mx_GroupView .mx_MemberInfo .gm-scroll-view > :not(.mx_MemberInfo_avatar) {
+.mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar_offset > :not(.mx_MemberInfo_avatar) {
     padding-left: 16px;
     padding-right: 16px;
 }
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index f2ce7e1d5c..c5a5d50068 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -76,13 +76,6 @@ limitations under the License.
     flex: 1 1 0;
     min-width: 0;
 
-    /* Experimental fix for https://github.com/vector-im/vector-web/issues/947
-       and https://github.com/vector-im/vector-web/issues/946.
-       Empirically this stops the MessagePanel's width exploding outwards when
-       gemini is in 'prevented' mode
-       */
-    overflow-x: auto;
-
     /* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
        needed height 100% all the way down to the HomePage. Height does not
        have to be auto, empirically.
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index a3515a9d99..33670c39bf 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -219,10 +219,6 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
     filter: invert(1);
 }
 
-.gm-scrollbar .thumb {
-    filter: invert(1);
-}
-
 // markdown overrides:
 .mx_EventTile_content .markdown-body pre:hover {
     border-color: #808080 !important; // inverted due to rules below
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index b81b3ebede..c218fee5d6 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -782,7 +782,7 @@ export default createReactClass({
         if (!this._divScroll) {
             // Likewise, we should have the ref by this point, but if not
             // turn the NPE into something meaningful.
-            throw new Error("ScrollPanel._getScrollNode called before gemini ref collected");
+            throw new Error("ScrollPanel._getScrollNode called before AutoHideScrollbar ref collected");
         }
 
         return this._divScroll;
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 3d5300fe92..69ebb72a6f 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -122,7 +122,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.props.devices === null) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return <Spinner />;
diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
deleted file mode 100644
index 13eb14ecc3..0000000000
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ /dev/null
@@ -1,35 +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 GeminiScrollbar from 'react-gemini-scrollbar';
-
-function GeminiScrollbarWrapper(props) {
-    const {wrappedRef, ...wrappedProps} = props;
-
-    // Enable forceGemini so that gemini is always enabled. This is
-    // to avoid future issues where a feature is implemented without
-    // doing QA on every OS/browser combination.
-    //
-    // By default GeminiScrollbar allows native scrollbars to be used
-    // on macOS. Use forceGemini to enable Gemini's non-native
-    // scrollbars on all OSs.
-    return <GeminiScrollbar ref={wrappedRef} forceGemini={true} {...wrappedProps}>
-        { props.children }
-    </GeminiScrollbar>;
-}
-export default GeminiScrollbarWrapper;
-
diff --git a/yarn.lock b/yarn.lock
index 705b02e3e4..c6fd3432cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3902,10 +3902,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-"gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
-  version "1.4.3"
-  resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -6963,12 +6959,6 @@ react-focus-lock@^2.2.1:
     use-callback-ref "^1.2.1"
     use-sidecar "^1.0.1"
 
-"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594":
-  version "2.1.5"
-  resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/9cf17f63b7c0b0ec5f31df27da0f82f7238dc594"
-  dependencies:
-    gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
-
 react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
   version "16.13.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"

From 76703d99f5617560536d7135c7ded2f4bec5ed90 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 16 Mar 2020 19:45:02 +0000
Subject: [PATCH 1571/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2148 of 2152 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 2684f32747..b3a06ea3ed 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2111,7 +2111,7 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gradaltigo de ĉambro estas altnivela ago kaj estas kutime rekomendata kiam ĉambro estas malstabila pro eraroj, mankantaj funkcioj, aŭ malsekuraĵoj.",
     "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Ĉi tio kutime influas nur traktadon de la ĉambro de la servilo. Se vi spertas problemojn pri Riot, bonvolu <a>raporti problemon</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vi gradaltigos ĉi tiun ĉambron de <oldVersion /> al <newVersion />.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ĉi tio ebligos revenon al via konto post adiaŭo kaj resaluto en aliaj salutaĵoj.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ĉi tio ebligos saluti aliajn salutaĵojn, kaj reveni al via konto post adiaŭo.",
     "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Vi nun forlistigas nekontrolitajn salutaĵojn; por sendi mesaĝojn al tiuj salutaĵoj, vi devas ilin kontroli.",
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ni rekomendas, ke vi trairu la kontrolon de ĉiu salutaĵo por konfirmi, ke ili apartenas al siaj ĝustaj posedantoj, sed laŭplaĉe vi povas ankaŭ sendi la mesaĝon sen kontrolo.",
     "Room contains unknown sessions": "Ĉambro enhavas nekonatajn salutaĵojn",

From e3ce197145700fe2cb180d03163fd387883a7333 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Mon, 16 Mar 2020 18:06:53 +0000
Subject: [PATCH 1572/3235] Translated using Weblate (Japanese)

Currently translated at 56.5% (1216 of 2152 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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 6be319d794..1dbbcad09e 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -66,7 +66,7 @@
     "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": "リッチテキストエディタのリッチテキストモードを利用しているか否か",
-    "Your homeserver's URL": "あなたのホームサーバーのURL",
+    "Your homeserver's URL": "あなたのホームサーバーの URL",
     "Your identity server's URL": "あなたのアイデンティティサーバーの URL",
     "Analytics": "分析",
     "The information being sent to us to help make Riot.im better includes:": "Riot.imをよりよくするために私達に送信される情報は以下を含みます:",
@@ -1238,5 +1238,7 @@
     "Hide": "隠す",
     "Help": "ヘルプ",
     "Filter rooms…": "部屋を検索…",
-    "Preview": "プレビュー"
+    "Preview": "プレビュー",
+    "The version of Riot": "Riot のバージョン",
+    "Your user agent": "あなたの User Agent"
 }

From 2ef53cb50a2cc26792b19551b206afd83a49b822 Mon Sep 17 00:00:00 2001
From: Mejans <farga@mejans.fr>
Date: Mon, 16 Mar 2020 20:16:29 +0000
Subject: [PATCH 1573/3235] Translated using Weblate (Occitan)

Currently translated at 2.2% (48 of 2152 strings)

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

diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index 0967ef424b..f67d7291ce 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -1 +1,50 @@
-{}
+{
+    "Add Email Address": "Ajustar una adreça electronica",
+    "Add Phone Number": "Ajustar un numèro de telefòn",
+    "The platform you're on": "La plataforma ont sètz",
+    "The version of Riot": "La version de Riot",
+    "Your language of choice": "La lenga que volètz",
+    "User Options": "Opcions utilizaire",
+    "Start a chat": "Començar una discussion",
+    "Unmute": "Restablir lo son",
+    "Mute": "Copar lo son",
+    "Admin Tools": "Aisinas d’administrator",
+    "Invite to this room": "Convidar a aquesta sala",
+    "Invited": "Convidat",
+    "Voice call": "Sonada vocala",
+    "Video call": "Sonada vidèo",
+    "Upload file": "Enviar un fichièr",
+    "Send an encrypted reply…": "Enviar una responsa chifrada …",
+    "Send a reply…": "Enviar una responsa…",
+    "Send an encrypted message…": "Enviar un messatge chifrat…",
+    "Send a message…": "Enviar un messatge…",
+    "Bold": "Gras",
+    "Quote": "Citacion",
+    "Loading...": "Cargament…",
+    "Pinned Messages": "Messatges penjats",
+    "Unpin Message": "Despenjar lo messatge",
+    "Online for %(duration)s": "En linha dempuèi %(duration)s",
+    "Idle for %(duration)s": "Inactiu dempuèi %(duration)s",
+    "Offline for %(duration)s": "Fòra linha dempuèi %(duration)s",
+    "Unknown for %(duration)s": "Desconegut dempuèi %(duration)s",
+    "Online": "En linha",
+    "Idle": "Inactiu",
+    "Offline": "Fòra linha",
+    "Unknown": "Desconegut",
+    "Recent rooms": "Salas recentas",
+    "No rooms to show": "Cap de sala a mostrar",
+    "Unnamed room": "Sala sens nom",
+    "Settings": "Paramètres",
+    "Search": "Recercar",
+    "Share room": "Partejar la sala",
+    "Favourites": "Favorits",
+    "Start chat": "Començar una discussion",
+    "Rooms": "Salas",
+    "Low priority": "Febla prioritat",
+    "System Alerts": "Alèrtas sistèma",
+    "This room": "Aquesta sala",
+    "Loading …": "Cargament…",
+    "Reason: %(reason)s": "Rason : %(reason)s",
+    "Forget this room": "Oblidar aquesta sala",
+    "Disable": "Desactivar"
+}

From 1f4e92885bcb9ebb88589385e43d12d884058dd6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Mar 2020 10:43:01 +0000
Subject: [PATCH 1574/3235] Update
 src/components/views/room_settings/AliasSettings.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/room_settings/AliasSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index ae9b085375..f8e2151c4f 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -358,7 +358,7 @@ export default class AliasSettings extends React.Component {
             <div className='mx_AliasSettings'>
                 <span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
                 <p>{_t("Published addresses can be used by anyone on any server to join your room. " +
-                    "To publish an address it needs to be set as a local address first.")}</p>
+                    "To publish an address, it needs to be set as a local address first.")}</p>
                 {canonicalAliasSection}
                 <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">

From 010661249b355b2b8b85abec48fe147dcd9c1ddd Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Mar 2020 11:47:56 +0100
Subject: [PATCH 1575/3235] run i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f2272b294a..a7d0887c32 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1164,7 +1164,7 @@
     "This room has no local addresses": "This room has no local addresses",
     "Local address": "Local address",
     "Published Addresses": "Published Addresses",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.",
     "Other published addresses:": "Other published addresses:",
     "No other published addresses yet, add one below": "No other published addresses yet, add one below",
     "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",

From 57b2dd92f5b5d9fce4e308ec9f17abae5b8f9863 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:27:06 +0100
Subject: [PATCH 1576/3235] move room publish toggle below canonical alias

also to own component to not contaminate alias settings too much
with this
---
 .../views/room_settings/AliasSettings.js      |  2 +
 .../views/room_settings/RoomPublishSetting.js | 60 +++++++++++++++++++
 .../tabs/room/GeneralRoomSettingsTab.js       | 31 ----------
 3 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 src/components/views/room_settings/RoomPublishSetting.js

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 0a7bd1d333..7b0302c714 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -25,6 +25,7 @@ import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
+import RoomPublishSetting from "./RoomPublishSetting";
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {
@@ -350,6 +351,7 @@ export default class AliasSettings extends React.Component {
         return (
             <div className='mx_AliasSettings'>
                 {canonicalAliasSection}
+                <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">
                     {this._getLocalNonAltAliases().map(alias => {
                         return <option value={alias} key={alias} />;
diff --git a/src/components/views/room_settings/RoomPublishSetting.js b/src/components/views/room_settings/RoomPublishSetting.js
new file mode 100644
index 0000000000..bac2dfc656
--- /dev/null
+++ b/src/components/views/room_settings/RoomPublishSetting.js
@@ -0,0 +1,60 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import {_t} from "../../../languageHandler";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+
+export default class RoomPublishSetting extends React.PureComponent {
+    constructor(props) {
+        super(props);
+        this.state = {isRoomPublished: false};
+    }
+
+    onRoomPublishChange = (e) => {
+        const valueBefore = this.state.isRoomPublished;
+        const newValue = !valueBefore;
+        this.setState({isRoomPublished: newValue});
+        const client = MatrixClientPeg.get();
+
+        client.setRoomDirectoryVisibility(
+            this.props.roomId,
+            newValue ? 'public' : 'private',
+        ).catch(() => {
+            // Roll back the local echo on the change
+            this.setState({isRoomPublished: valueBefore});
+        });
+    };
+
+    componentDidMount() {
+        const client = MatrixClientPeg.get();
+        client.getRoomDirectoryVisibility(this.props.roomId).then((result => {
+            this.setState({isRoomPublished: result.visibility === 'public'});
+        }));
+    }
+
+    render() {
+        const client = MatrixClientPeg.get();
+
+        return (<LabelledToggleSwitch value={this.state.isRoomPublished}
+            onChange={this.onRoomPublishChange}
+            disabled={!this.props.canSetCanonicalAlias}
+            label={_t("Publish this room to the public in %(domain)s's room directory?", {
+              domain: client.getDomain(),
+            })} />);
+    }
+}
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index b65f8d49a4..5aface4f3b 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -21,7 +21,6 @@ import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
-import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 export default class GeneralRoomSettingsTab extends React.Component {
@@ -39,26 +38,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
         };
     }
 
-    componentWillMount() {
-        this.context.getRoomDirectoryVisibility(this.props.roomId).then((result => {
-            this.setState({isRoomPublished: result.visibility === 'public'});
-        }));
-    }
-
-    onRoomPublishChange = (e) => {
-        const valueBefore = this.state.isRoomPublished;
-        const newValue = !valueBefore;
-        this.setState({isRoomPublished: newValue});
-
-        this.context.setRoomDirectoryVisibility(
-            this.props.roomId,
-            newValue ? 'public' : 'private',
-        ).catch(() => {
-            // Roll back the local echo on the change
-            this.setState({isRoomPublished: valueBefore});
-        });
-    };
-
     _onLeaveClick = () => {
         dis.dispatch({
             action: 'leave_room',
@@ -75,7 +54,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
         const room = client.getRoom(this.props.roomId);
 
         const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
-        const canActuallySetAliases = room.currentState.mayClientSendStateEvent("m.room.aliases", client);
         const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
         const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
         const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
@@ -96,15 +74,6 @@ export default class GeneralRoomSettingsTab extends React.Component {
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
                                    canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
                 </div>
-                <div className='mx_SettingsTab_section'>
-                    <LabelledToggleSwitch value={this.state.isRoomPublished}
-                                          onChange={this.onRoomPublishChange}
-                                          disabled={!canActuallySetAliases}
-                                          label={_t("Publish this room to the public in %(domain)s's room directory?", {
-                                              domain: client.getDomain(),
-                                          })} />
-                </div>
-
                 <span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <RelatedGroupSettings roomId={room.roomId}

From 76b7194a4fe48a70fb4dadfee0bbbc4756d9e19f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:28:45 +0100
Subject: [PATCH 1577/3235] add headers and copy to lessen confusion of new
 alias workings

---
 src/components/views/room_settings/AliasSettings.js    |  9 +++++++--
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js |  3 ++-
 src/i18n/strings/en_EN.json                            | 10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 7b0302c714..435dd9b7a3 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -350,6 +350,9 @@ export default class AliasSettings extends React.Component {
 
         return (
             <div className='mx_AliasSettings'>
+                <span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
+                <p>{_t("Published addresses can be used by anyone on any server to join your room. " +
+                    "To publish an address it needs to be set as a local address first.")}</p>
                 {canonicalAliasSection}
                 <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">
@@ -368,12 +371,14 @@ export default class AliasSettings extends React.Component {
                     onItemAdded={this.onAltAliasAdded}
                     onItemRemoved={this.onAltAliasDeleted}
                     suggestionsListId="mx_AliasSettings_altRecommendations"
-                    itemsLabel={_t('Alternative addresses for this room:')}
-                    noItemsLabel={_t('This room has no alternative addresses')}
+                    itemsLabel={_t('Other published addresses:')}
+                    noItemsLabel={_t('No other published addresses yet, add one below')}
                     placeholder={_t(
                         'New address (e.g. #foo:domain)',
                     )}
                 />
+                <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
+                <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
                     <summary>{_t('Local addresses (unmoderated content)')}</summary>
                     {localAliasesList}
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 5aface4f3b..99882ae400 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -68,12 +68,13 @@ export default class GeneralRoomSettingsTab extends React.Component {
                     <RoomProfileSettings roomId={this.props.roomId} />
                 </div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Room Addresses")}</span>
+                <div className="mx_SettingsTab_heading">{_t("Room Addresses")}</div>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <AliasSettings roomId={this.props.roomId}
                                    canSetCanonicalAlias={canSetCanonical} canSetAliases={canSetAliases}
                                    canonicalAliasEvent={canonicalAliasEv} aliasEvents={aliasEvents} />
                 </div>
+                <div className="mx_SettingsTab_heading">{_t("Other")}</div>
                 <span className='mx_SettingsTab_subheading'>{_t("Flair")}</span>
                 <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
                     <RelatedGroupSettings roomId={room.roomId}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 10ae7fb455..bebec32b4f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -833,7 +833,6 @@
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "This room isn’t bridging messages to any platforms. <a>Learn more.</a>",
     "Bridges": "Bridges",
     "Room Addresses": "Room Addresses",
-    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "URL Previews": "URL Previews",
     "Uploaded sound": "Uploaded sound",
     "Sounds": "Sounds",
@@ -1156,9 +1155,13 @@
     "not specified": "not specified",
     "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)",
-    "Alternative addresses for this room:": "Alternative addresses for this room:",
-    "This room has no alternative addresses": "This room has no alternative addresses",
+    "Published Addresses": "Published Addresses",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
+    "Other published addresses:": "Other published addresses:",
+    "No other published addresses yet, add one below": "No other published addresses yet, add one below",
     "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
+    "Local Addresses": "Local Addresses",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
     "Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
@@ -1170,6 +1173,7 @@
     "Room Name": "Room Name",
     "Room Topic": "Room Topic",
     "Room avatar": "Room avatar",
+    "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
     "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.",

From cb271fe027ee6000e7a3df83e90e0dffc55344a1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:29:15 +0100
Subject: [PATCH 1578/3235] avoid double margin-right for toggle

---
 res/css/views/settings/tabs/_SettingsTab.scss | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 9727946893..64d6f04711 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -49,9 +49,15 @@ limitations under the License.
     margin-bottom: 24px;
 }
 
-.mx_SettingsTab_section .mx_SettingsFlag {
-    margin-right: 100px;
-    margin-bottom: 10px;
+.mx_SettingsTab_section {
+    .mx_SettingsFlag {
+        margin-right: 100px;
+        margin-bottom: 10px;
+    }
+
+    &.mx_SettingsTab_subsectionText .mx_SettingsFlag {
+        margin-right: 0px !important;
+    }
 }
 
 .mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {

From 42ff9f2c9eb3c9735e2f92c4384eff9947530f55 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 17:29:35 +0100
Subject: [PATCH 1579/3235] make editable list look like something closer to
 design

---
 res/css/views/elements/_EditableItemList.scss    | 16 +++++++++++++++-
 .../views/elements/EditableItemList.js           |  3 +--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index 51fa4c4423..ef60f006cc 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -20,14 +20,21 @@ limitations under the License.
 }
 
 .mx_EditableItem {
+    display: flex;
     margin-bottom: 5px;
-    margin-left: 15px;
 }
 
 .mx_EditableItem_delete {
+    order: 3;
     margin-right: 5px;
     cursor: pointer;
     vertical-align: middle;
+    width: 14px;
+    height: 14px;
+    mask-image: url('$(res)/img/feather-customised/cancel.svg');
+    mask-repeat: no-repeat;
+    background-color: $warning-color;
+    mask-size: 100%;
 }
 
 .mx_EditableItem_email {
@@ -36,12 +43,19 @@ limitations under the License.
 
 .mx_EditableItem_promptText {
     margin-right: 10px;
+    order: 2;
 }
 
 .mx_EditableItem_confirmBtn {
     margin-right: 5px;
 }
 
+.mx_EditableItem_item {
+    flex: auto 1 0;
+    order: 1;
+}
+
 .mx_EditableItemList_label {
     margin-bottom: 5px;
 }
+
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index ae3473ef0d..6e649e777a 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -78,8 +78,7 @@ export class EditableItem extends React.Component {
 
         return (
             <div className="mx_EditableItem">
-                <img src={require("../../../../res/img/feather-customised/cancel.svg")} width={14} height={14}
-                     onClick={this._onRemove} className="mx_EditableItem_delete" alt={_t("Remove")} />
+                <div onClick={this._onRemove} className="mx_EditableItem_delete" title={_t("Remove")} role="button" />
                 <span className="mx_EditableItem_item">{this.props.value}</span>
             </div>
         );

From 5537e6dcd4f8a0c654ddb5c72e178ea315f53128 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:24:49 +0100
Subject: [PATCH 1580/3235] change <details> appearance for local aliases

---
 res/css/views/room_settings/_AliasSettings.scss     | 8 ++++++++
 src/components/views/room_settings/AliasSettings.js | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/css/views/room_settings/_AliasSettings.scss b/res/css/views/room_settings/_AliasSettings.scss
index 294902a1f0..8ae3acbbd3 100644
--- a/res/css/views/room_settings/_AliasSettings.scss
+++ b/res/css/views/room_settings/_AliasSettings.scss
@@ -29,4 +29,12 @@ limitations under the License.
 
 .mx_AliasSettings summary {
     cursor: pointer;
+    color: $accent-color;
+    font-weight: 600;
+    list-style: none;
+
+    // list-style doesn't do it for webkit
+    &::-webkit-details-marker {
+        display: none;
+    }
 }
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 435dd9b7a3..0f2e3ad4eb 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -98,6 +98,7 @@ export default class AliasSettings extends React.Component {
             canonicalAlias: null, // #canonical:domain.tld
             updatingCanonicalAlias: false,
             localAliasesLoading: false,
+            detailsOpen: false,
         };
 
         if (props.canonicalAliasEvent) {
@@ -262,6 +263,7 @@ export default class AliasSettings extends React.Component {
                 this.loadLocalAliases();
             }
         }
+        this.setState({detailsOpen: event.target.open});
     };
 
     onCanonicalAliasChange = (event) => {
@@ -380,7 +382,7 @@ export default class AliasSettings extends React.Component {
                 <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
-                    <summary>{_t('Local addresses (unmoderated content)')}</summary>
+                    <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more")}</summary>
                     {localAliasesList}
                 </details>
             </div>

From a591e5016fd6391a5d30b009baec32ae5beae494 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:25:13 +0100
Subject: [PATCH 1581/3235] tweak labels, etc

---
 src/components/views/room_settings/AliasSettings.js | 8 ++------
 src/i18n/strings/en_EN.json                         | 5 ++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 0f2e3ad4eb..9e97a1c881 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -343,9 +343,7 @@ export default class AliasSettings extends React.Component {
                 onItemAdded={this.onLocalAliasAdded}
                 onItemRemoved={this.onLocalAliasDeleted}
                 noItemsLabel={_t('This room has no local addresses')}
-                placeholder={_t(
-                    'New address (e.g. #foo:%(localDomain)s)', {localDomain: localDomain},
-                )}
+                placeholder={_t('Local address')}
                 domain={localDomain}
             />);
         }
@@ -375,9 +373,7 @@ export default class AliasSettings extends React.Component {
                     suggestionsListId="mx_AliasSettings_altRecommendations"
                     itemsLabel={_t('Other published addresses:')}
                     noItemsLabel={_t('No other published addresses yet, add one below')}
-                    placeholder={_t(
-                        'New address (e.g. #foo:domain)',
-                    )}
+                    placeholder={_t('New published address (e.g. #alias:server)')}
                 />
                 <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bebec32b4f..acc6df19b1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1154,15 +1154,14 @@
     "Main address": "Main address",
     "not specified": "not specified",
     "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)",
+    "Local address": "Local address",
     "Published Addresses": "Published Addresses",
     "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
     "Other published addresses:": "Other published addresses:",
     "No other published addresses yet, add one below": "No other published addresses yet, add one below",
-    "New address (e.g. #foo:domain)": "New address (e.g. #foo:domain)",
+    "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",
     "Local Addresses": "Local Addresses",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
-    "Local addresses (unmoderated content)": "Local addresses (unmoderated content)",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
     "Invalid community ID": "Invalid community ID",

From dd19f27964907a7951a2e4ae2755997053b9b0fc Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:30:40 +0100
Subject: [PATCH 1582/3235] more margin between published and local addresses

---
 .../views/room_settings/_AliasSettings.scss   | 22 ++++++++++++-------
 .../views/room_settings/AliasSettings.js      |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/res/css/views/room_settings/_AliasSettings.scss b/res/css/views/room_settings/_AliasSettings.scss
index 8ae3acbbd3..f8d92e7828 100644
--- a/res/css/views/room_settings/_AliasSettings.scss
+++ b/res/css/views/room_settings/_AliasSettings.scss
@@ -27,14 +27,20 @@ limitations under the License.
     box-shadow: none;
 }
 
-.mx_AliasSettings summary {
-    cursor: pointer;
-    color: $accent-color;
-    font-weight: 600;
-    list-style: none;
+.mx_AliasSettings {
+    summary {
+        cursor: pointer;
+        color: $accent-color;
+        font-weight: 600;
+        list-style: none;
 
-    // list-style doesn't do it for webkit
-    &::-webkit-details-marker {
-        display: none;
+        // list-style doesn't do it for webkit
+        &::-webkit-details-marker {
+            display: none;
+        }
+    }
+
+    .mx_AliasSettings_localAliasHeader {
+        margin-top: 35px;
     }
 }
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 9e97a1c881..608e4553cd 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -375,7 +375,7 @@ export default class AliasSettings extends React.Component {
                     noItemsLabel={_t('No other published addresses yet, add one below')}
                     placeholder={_t('New published address (e.g. #alias:server)')}
                 />
-                <span className='mx_SettingsTab_subheading'>{_t("Local Addresses")}</span>
+                <span className='mx_SettingsTab_subheading mx_AliasSettings_localAliasHeader'>{_t("Local Addresses")}</span>
                 <p>{_t("Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)", {localDomain})}</p>
                 <details onToggle={this.onLocalAliasesToggled}>
                     <summary>{ this.state.detailsOpen ? _t('Show less') : _t("Show more")}</summary>

From 048d3f0e423a5382bd31e8ed2be642e1956c710f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 16 Mar 2020 18:34:09 +0100
Subject: [PATCH 1583/3235] fix style lint

---
 res/css/views/settings/tabs/_SettingsTab.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 64d6f04711..01a1d94956 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -47,9 +47,7 @@ limitations under the License.
 
 .mx_SettingsTab_section {
     margin-bottom: 24px;
-}
 
-.mx_SettingsTab_section {
     .mx_SettingsFlag {
         margin-right: 100px;
         margin-bottom: 10px;

From 26f2bcd073b771445885fd36466fe29623286477 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Mar 2020 10:43:01 +0000
Subject: [PATCH 1584/3235] Update
 src/components/views/room_settings/AliasSettings.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/room_settings/AliasSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 608e4553cd..a01f02f487 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -352,7 +352,7 @@ export default class AliasSettings extends React.Component {
             <div className='mx_AliasSettings'>
                 <span className='mx_SettingsTab_subheading'>{_t("Published Addresses")}</span>
                 <p>{_t("Published addresses can be used by anyone on any server to join your room. " +
-                    "To publish an address it needs to be set as a local address first.")}</p>
+                    "To publish an address, it needs to be set as a local address first.")}</p>
                 {canonicalAliasSection}
                 <RoomPublishSetting roomId={this.props.roomId} canSetCanonicalAlias={this.props.canSetCanonicalAlias} />
                 <datalist id="mx_AliasSettings_altRecommendations">

From 663ccb7796131b96fc9dfbe68285c1060e7d6dce Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Mar 2020 11:47:56 +0100
Subject: [PATCH 1585/3235] run i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index acc6df19b1..40f44d4b1d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1156,7 +1156,7 @@
     "This room has no local addresses": "This room has no local addresses",
     "Local address": "Local address",
     "Published Addresses": "Published Addresses",
-    "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address it needs to be set as a local address first.",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.",
     "Other published addresses:": "Other published addresses:",
     "No other published addresses yet, add one below": "No other published addresses yet, add one below",
     "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",

From 59b1cbd4b21c388b03ec0d1d11797bb40fe78e12 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 17 Mar 2020 11:33:10 +0000
Subject: [PATCH 1586/3235] Add default on config setting to control call
 button in composer

This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
---
 src/components/views/rooms/MessageComposer.js | 17 ++++++++++++++---
 src/settings/Settings.js                      |  4 ++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 557a58412a..c86bcb2ff0 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -178,6 +178,7 @@ export default class MessageComposer extends React.Component {
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
+            showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
         };
     }
 
@@ -325,10 +326,20 @@ export default class MessageComposer extends React.Component {
                     permalinkCreator={this.props.permalinkCreator} />,
                 <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
                 <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
-                callInProgress ? <HangupButton key="controls_hangup" roomId={this.props.room.roomId} /> : null,
-                callInProgress ? null : <CallButton key="controls_call" roomId={this.props.room.roomId} />,
-                callInProgress ? null : <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
             );
+
+            if (this.state.showCallButtons) {
+                if (callInProgress) {
+                    controls.push(
+                        <HangupButton key="controls_hangup" roomId={this.props.room.roomId} />,
+                    );
+                } else {
+                    controls.push(
+                        <CallButton key="controls_call" roomId={this.props.room.roomId} />,
+                        <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
+                    );
+                }
+            }
         } else if (this.state.tombstone) {
             const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
 
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index ba6df47a04..abcfd21902 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -517,4 +517,8 @@ export const SETTINGS = {
         displayName: _td("How fast should messages be downloaded."),
         default: 3000,
     },
+    "showCallButtonsInComposer": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
+        default: true,
+    },
 };

From ec4e81de74fea0edc91c03fa69d79f4c52c22221 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 17 Mar 2020 11:33:10 +0000
Subject: [PATCH 1587/3235] Add default on config setting to control call
 button in composer

This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
---
 src/components/views/rooms/MessageComposer.js | 17 ++++++++++++++---
 src/settings/Settings.js                      |  4 ++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 557a58412a..c86bcb2ff0 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -178,6 +178,7 @@ export default class MessageComposer extends React.Component {
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
+            showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
         };
     }
 
@@ -325,10 +326,20 @@ export default class MessageComposer extends React.Component {
                     permalinkCreator={this.props.permalinkCreator} />,
                 <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
                 <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
-                callInProgress ? <HangupButton key="controls_hangup" roomId={this.props.room.roomId} /> : null,
-                callInProgress ? null : <CallButton key="controls_call" roomId={this.props.room.roomId} />,
-                callInProgress ? null : <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
             );
+
+            if (this.state.showCallButtons) {
+                if (callInProgress) {
+                    controls.push(
+                        <HangupButton key="controls_hangup" roomId={this.props.room.roomId} />,
+                    );
+                } else {
+                    controls.push(
+                        <CallButton key="controls_call" roomId={this.props.room.roomId} />,
+                        <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
+                    );
+                }
+            }
         } else if (this.state.tombstone) {
             const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
 
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b77fb392e9..29b6f1cbce 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -511,4 +511,8 @@ export const SETTINGS = {
         displayName: _td("How fast should messages be downloaded."),
         default: 3000,
     },
+    "showCallButtonsInComposer": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
+        default: true,
+    },
 };

From ea99eebb7bfbca43b6726742f8ae4ef7e5f4cf41 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 17 Mar 2020 10:20:58 +0000
Subject: [PATCH 1588/3235] Report to the user when a key signature upload
 fails

---
 src/components/structures/MatrixChat.js       |  10 ++
 .../dialogs/KeySignatureUploadFailedDialog.js | 108 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  10 ++
 3 files changed, 128 insertions(+)
 create mode 100644 src/components/views/dialogs/KeySignatureUploadFailedDialog.js

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f1a5a372be..e3a239663e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1495,6 +1495,16 @@ export default createReactClass({
             }
         });
 
+        cli.on("crypto.keySignatureUploadFailure", (failures, source, continuation) => {
+            const KeySignatureUploadFailedDialog =
+                sdk.getComponent('views.dialogs.KeySignatureUploadFailedDialog');
+            Modal.createTrackedDialog(
+                'Failed to upload key signatures',
+                'Failed to upload key signatures',
+                KeySignatureUploadFailedDialog,
+                { failures, source, continuation });
+        });
+
         cli.on("crypto.verification.request", request => {
             const isFlagOn = SettingsStore.isFeatureEnabled("feature_cross_signing");
 
diff --git a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
new file mode 100644
index 0000000000..a04c4a389f
--- /dev/null
+++ b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
@@ -0,0 +1,108 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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, {useState, useCallback, useRef} from 'react';
+import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+
+export default function KeySignatureUploadFailedDialog({
+        failures,
+        source,
+        continuation,
+        onFinished,
+    }) {
+    const RETRIES = 2;
+    const BaseDialog = sdk.getComponent('dialogs.BaseDialog');
+    const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    const Spinner = sdk.getComponent('elements.Spinner');
+    const [retry, setRetry] = useState(RETRIES);
+    const [cancelled, setCancelled] = useState(false);
+    const [retrying, setRetrying] = useState(false);
+    const [success, setSuccess] = useState(false);
+    const onCancel = useRef(onFinished);
+
+    const causes = new Map([
+        ["_afterCrossSigningLocalKeyChange", _t("a new master key signature")],
+        ["checkOwnCrossSigningTrust", _t("a new cross-signing key signature")],
+        ["setDeviceVerification", _t("a device cross-signing signature")],
+    ]);
+    const defaultCause = _t("a key signature");
+
+    const onRetry = useCallback(async () => {
+        try {
+            setRetrying(true);
+            const cancel = new Promise((resolve, reject) => {
+                onCancel.current = reject;
+            }).finally(() => {
+                setCancelled(true);
+            });
+            await Promise.race([
+                continuation(),
+                cancel,
+            ]);
+            setSuccess(true);
+        } catch (e) {
+            setRetry(r => r-1);
+        } finally {
+            onCancel.current = onFinished;
+            setRetrying(false);
+        }
+    }, [continuation, onFinished]);
+
+    let body;
+    if (!success && !cancelled && continuation && retry > 0) {
+        const reason = causes.get(source) || defaultCause;
+
+        body = (<div>
+            <p>{_t("Riot encountered an error during upload of:")}</p>
+            <p>{reason}</p>
+            {retrying && <Spinner />}
+            <pre>{JSON.stringify(failures, null, 2)}</pre>
+            <DialogButtons
+                primaryButton='Retry'
+                hasCancel={true}
+                onPrimaryButtonClick={onRetry}
+                onCancel={onCancel.current}
+                primaryDisabled={retrying}
+            />
+        </div>);
+    } else {
+        body = (<div>
+            {success ?
+              <span>{_t("Upload completed")}</span> :
+              cancelled ?
+                <span>{_t("Cancelled signature upload")}</span> :
+                <span>{_t("Unabled to upload")}</span>}
+            <DialogButtons
+                primaryButton={_t("OK")}
+                hasCancel={false}
+                onPrimaryButtonClick={onFinished}
+            />
+        </div>);
+    }
+
+    return (
+        <BaseDialog
+            title={success ?
+                _t("Signature upload success") :
+                _t("Signature upload failed")}
+            fixedWidth={false}
+            onFinished={() => {}}
+        >
+            {body}
+        </BaseDialog>
+    );
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f3ead1490..971e6037e4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1577,6 +1577,16 @@
     "Ignore request": "Ignore request",
     "Loading session info...": "Loading session info...",
     "Encryption key request": "Encryption key request",
+    "a new master key signature": "a new master key signature",
+    "a new cross-signing key signature": "a new cross-signing key signature",
+    "a device cross-signing signature": "a device cross-signing signature",
+    "a key signature": "a key signature",
+    "Riot encountered an error during upload of:": "Riot encountered an error during upload of:",
+    "Upload completed": "Upload completed",
+    "Cancelled signature upload": "Cancelled signature upload",
+    "Unabled to upload": "Unabled to upload",
+    "Signature upload success": "Signature upload success",
+    "Signature upload failed": "Signature upload failed",
     "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",

From 8fd3b96b7231661b1c5d8298933b69ace4ad0447 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Mar 2020 11:53:19 +0000
Subject: [PATCH 1589/3235] fix styling/heights

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_GroupView.scss    | 4 ----
 res/css/structures/_MyGroups.scss     | 5 +++++
 res/css/structures/_TagPanel.scss     | 2 +-
 src/components/structures/MyGroups.js | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 6963f8a160..2575169664 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -180,10 +180,6 @@ limitations under the License.
     line-height: 2em;
 }
 
-.mx_GroupView > .mx_MainSplit {
-    flex: 1;
-}
-
 .mx_GroupView_body {
     flex-grow: 1;
 }
diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index 9556fd57e3..47a5ea5a77 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -95,6 +95,11 @@ limitations under the License.
 
     display: flex;
     flex-direction: column;
+    overflow-y: auto;
+}
+
+.mx_MyGroups_scrollable {
+    overflow-y: inherit;
 }
 
 .mx_MyGroups_content,
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 77f016f05f..03f5ce230c 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -23,6 +23,7 @@ limitations under the License.
     flex-direction: column;
     align-items: center;
     justify-content: space-between;
+    height: 100%;
 }
 
 .mx_TagPanel_items_selected {
@@ -58,7 +59,6 @@ limitations under the License.
 .mx_TagPanel .mx_TagPanel_scroller {
     flex-grow: 1;
     width: 100%;
-    height: 100vh;
 }
 
 .mx_TagPanel .mx_TagPanel_tagTileContainer {
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index b7efa2d00a..f75fc86fc8 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -72,7 +72,7 @@ export default createReactClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <div className="mx_MyGroups_scrollable">
+                <div className="mx_MyGroups_scrollable mx_AutoHideScrollbar">
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(

From 638629c2fa6fcba33080c77e9d83f4134217fbbb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 17 Mar 2020 13:28:07 +0000
Subject: [PATCH 1590/3235] fix MyGroups scrollbar

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_MyGroups.scss     | 5 -----
 src/components/structures/MyGroups.js | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index 47a5ea5a77..36150c33a5 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -102,11 +102,6 @@ limitations under the License.
     overflow-y: inherit;
 }
 
-.mx_MyGroups_content,
-.mx_MyGroups_scrollable {
-    overflow-y: scroll;
-}
-
 .mx_MyGroups_placeholder {
     background-color: $info-plinth-bg-color;
     color: $info-plinth-fg-color;
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index f75fc86fc8..f1209b7b9e 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -22,6 +22,7 @@ import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "./AutoHideScrollbar";
 
 export default createReactClass({
     displayName: 'MyGroups',
@@ -72,7 +73,7 @@ export default createReactClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <div className="mx_MyGroups_scrollable mx_AutoHideScrollbar">
+                <AutoHideScrollbar className="mx_MyGroups_scrollable">
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(
@@ -91,7 +92,7 @@ export default createReactClass({
                     <div className="mx_MyGroups_joinedGroups">
                         { groupNodes }
                     </div>
-                </div> :
+                </AutoHideScrollbar> :
                 <div className="mx_MyGroups_placeholder">
                     { _t(
                         "You're not currently a member of any communities.",

From 83b6155637d821d707ea00d03955afc6016c4d6f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Mar 2020 14:12:15 +0000
Subject: [PATCH 1591/3235] Upgrade matrix-js-sdk to 5.1.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3ab8247afb..93f0f46227 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.1.1-rc.1",
+    "matrix-js-sdk": "5.1.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 965e156e39..05c8d60348 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5653,10 +5653,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.1.1-rc.1:
-  version "5.1.1-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1-rc.1.tgz#e3872696b8e6ec3fcae2d1ba1491e6a08d20954a"
-  integrity sha512-55F4jvJSVYJb5DDmso6Mld3HJ9v1UW0eT///SMcJtHVIJd5ZSLvsGV7rvMny7w6MHy5enfH4E2yItjjvlAL9dA==
+matrix-js-sdk@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1.tgz#d93c2db08acf07e894fb85345d3eaa8d4736b56c"
+  integrity sha512-zCkylD/oia9v/9Fbx54k/aBNd3szDflscViXq0gf2fQlKzTJRT3LoCAXZ9Uwr7gJ8AE8kFquyZ7revk3Y5YmPQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 5b96408bc5c3e89c54348acf717e297728c716b3 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Mar 2020 14:18:14 +0000
Subject: [PATCH 1592/3235] Prepare changelog for v2.2.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a6e6bfd2..07e478fa02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+Changes in [2.2.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.3) (2020-03-17)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.3-rc.1...v2.2.3)
+
+ * Upgrade JS SDK to 5.1.1
+ * Add default on config setting to control call button in composer
+   [\#4228](https://github.com/matrix-org/matrix-react-sdk/pull/4228)
+ * Fix: make alternative addresses UX less confusing
+   [\#4226](https://github.com/matrix-org/matrix-react-sdk/pull/4226)
+ * Fix: best-effort to join room without canonical alias over federation from
+   room directory
+   [\#4211](https://github.com/matrix-org/matrix-react-sdk/pull/4211)
+
 Changes in [2.2.3-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.3-rc.1) (2020-03-11)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.1...v2.2.3-rc.1)

From 1e3b917aededf13998bd7d9ee676f44d989a4454 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Mar 2020 14:18:15 +0000
Subject: [PATCH 1593/3235] v2.2.3

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

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

From 51012702f2365c3c115e085d7ab2d58c61114afa Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 17 Mar 2020 12:10:30 +0000
Subject: [PATCH 1594/3235] Translated using Weblate (Albanian)

Currently translated at 99.3% (2141 of 2157 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2a89531c03..912f75e361 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2192,5 +2192,7 @@
     "This room has no alternative addresses": "Kjo dhomë nuk ka adresa alternative",
     "New address (e.g. #foo:domain)": "Adresë e re (p.sh., #foo:domain)",
     "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)",
-    "Review Sessions": "Shqyrtoni Sesione"
+    "Review Sessions": "Shqyrtoni Sesione",
+    "Local address": "Adresë vendore",
+    "Published Addresses": "Adresa të Publikuara"
 }

From b09c063d1b2cae9e26b336de0b0ed69f3d6afcc8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Mar 2020 14:25:44 +0000
Subject: [PATCH 1595/3235] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5c5c9cce80..8cda349e03 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.1.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9794a93612..ac511949ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5688,10 +5688,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.1.1:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.1.tgz#d93c2db08acf07e894fb85345d3eaa8d4736b56c"
-  integrity sha512-zCkylD/oia9v/9Fbx54k/aBNd3szDflscViXq0gf2fQlKzTJRT3LoCAXZ9Uwr7gJ8AE8kFquyZ7revk3Y5YmPQ==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b2e154377a4268441a3b27b183dd7f7018187035"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From af023a2d7c3788c107ad046126f0fd4a925862c3 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 17 Mar 2020 11:13:52 -0600
Subject: [PATCH 1596/3235] rename 'jump to bottom' to avoid ublock block

---
 src/components/views/rooms/JumpToBottomButton.js | 2 +-
 src/i18n/strings/en_EN.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.js
index 487071855f..d3305f498a 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.js
@@ -24,7 +24,7 @@ export default (props) => {
     }
     return (<div className="mx_JumpToBottomButton">
         <AccessibleButton className="mx_JumpToBottomButton_scrollDown"
-            title={_t("Scroll to bottom of page")}
+            title={_t("Scroll to most recent messages")}
             onClick={props.onScrollToBottomClick}>
         </AccessibleButton>
         { badge }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d92cf41f5b..bf46586651 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -955,7 +955,7 @@
     "Encrypted by a deleted session": "Encrypted by a deleted session",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Invite only": "Invite only",
-    "Scroll to bottom of page": "Scroll to bottom of page",
+    "Scroll to most recent messages": "Scroll to most recent messages",
     "Close preview": "Close preview",
     "device id: ": "device id: ",
     "Disinvite": "Disinvite",

From 84a8ca69828a5934e5ea077c86d83b8e0e4806e9 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Tue, 17 Mar 2020 13:18:22 -0500
Subject: [PATCH 1597/3235] Fix typo

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/rooms/BasicMessageComposer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 52947aa6e2..3c5c698f51 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -372,7 +372,7 @@ export default class BasicMessageEditor extends React.Component {
             handled = true;
         // redo
         } else if ((!IS_MAC && modKey && event.key === Key.Y) ||
-                  (IS_MAC && modkey && event.shiftKey && event.key === Key.Z)) {
+                  (IS_MAC && modKey && event.shiftKey && event.key === Key.Z)) {
             if (this.historyManager.canRedo()) {
                 const {parts, caret} = this.historyManager.redo();
                 // pass matching inputType so historyManager doesn't push echo

From 7b1b4cda14625fced42cf43641f00e175c8c5af7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Mar 2020 20:37:40 +0100
Subject: [PATCH 1598/3235] ensure local state for aliases doesn't get garbled
 up

when removing another alias before the response of the first comes back
---
 src/components/views/room_settings/AliasSettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f8e2151c4f..bdcb22342c 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -233,11 +233,11 @@ export default class AliasSettings extends React.Component {
 
     onLocalAliasDeleted = (index) => {
         const alias = this.state.localAliases[index];
+        console.log("removing local alias", index, alias);
         // TODO: In future, we should probably be making sure that the alias actually belongs
         // to this room. See https://github.com/vector-im/riot-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {
-            const localAliases = this.state.localAliases.slice();
-            localAliases.splice(index, 1);
+            const localAliases = this.state.localAliases.filter(a => a !== alias);
             this.setState({localAliases});
 
             if (this.state.canonicalAlias === alias) {

From f8c6097c397438e9f8a3b70f530e0e1f05d9c9fe Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 18 Mar 2020 11:18:48 +0100
Subject: [PATCH 1599/3235] remove logging

---
 src/components/views/room_settings/AliasSettings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index bdcb22342c..857a80c34a 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -233,7 +233,6 @@ export default class AliasSettings extends React.Component {
 
     onLocalAliasDeleted = (index) => {
         const alias = this.state.localAliases[index];
-        console.log("removing local alias", index, alias);
         // TODO: In future, we should probably be making sure that the alias actually belongs
         // to this room. See https://github.com/vector-im/riot-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {

From bc410e0cd2432bffa82603c89b9ce4e07e270dad Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 18 Mar 2020 02:58:53 +0000
Subject: [PATCH 1600/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2157 of 2157 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6ab657ee72..4ebdb441de 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2203,5 +2203,17 @@
     "Theme added!": "已新增佈景主題！",
     "Custom theme URL": "自訂佈景主題 URL",
     "Add theme": "新增佈景主題",
-    "Review Sessions": "檢閱工作階段"
+    "Review Sessions": "檢閱工作階段",
+    "Scroll to most recent messages": "捲動到最新訊息",
+    "Local address": "本機位置",
+    "Published Addresses": "發佈的位置",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "發佈的位置可以讓在任何伺服器上的任何人用來加入您的聊天室。要發佈位置，您必須先設定本機位置。",
+    "Other published addresses:": "其他已發佈的位置：",
+    "No other published addresses yet, add one below": "尚無其他已發佈的位置，在下方新增一個",
+    "New published address (e.g. #alias:server)": "新的已發佈位置（例如：#alias:server）",
+    "Local Addresses": "本機位置",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "為此聊天室設定位置讓使用者可以透過您的家伺服器找到此聊天室 (%(localDomain)s)",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "開啟既有的工作階段並使用它來驗證此工作階段，並授予其存取已加密訊息的權限。",
+    "Waiting…": "等待中……",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "如果您無法存取裝置，<button>使用您的復原金鑰或通關密語。</button>"
 }

From 660bbfb2a92fcb0dcdb48c924cd811366df8ec8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 18 Mar 2020 07:48:18 +0000
Subject: [PATCH 1601/3235] Translated using Weblate (French)

Currently translated at 100.0% (2157 of 2157 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 | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 635033c009..6ad6a6b011 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2197,11 +2197,24 @@
     "Local addresses (unmoderated content)": "Adresses locales (contenu non modéré)",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s a changé le nom du salon de %(oldRoomName)s en %(newRoomName)s.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s a changé les adresses de ce salon.",
-    "Support adding custom themes": "Autoriser l'ajout de thèmes personnalisés",
+    "Support adding custom themes": "Autoriser l’ajout de thèmes personnalisés",
     "Invalid theme schema.": "Schéma du thème invalide.",
     "Error downloading theme information.": "Une erreur s'est produite en téléchargeant les informations du thème.",
     "Theme added!": "Thème ajouté !",
     "Custom theme URL": "URL personnalisée pour le thème",
     "Add theme": "Ajouter le thème",
-    "You don't have permission to delete the alias.": "Vous n'avez pas la permission de supprimer l'alias."
+    "You don't have permission to delete the alias.": "Vous n'avez pas la permission de supprimer l'alias.",
+    "Review Sessions": "Vérifier les sessions",
+    "Scroll to most recent messages": "Sauter aux messages les plus récents",
+    "Local address": "Adresse locale",
+    "Published Addresses": "Adresses publiées",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Les adresses publiées peuvent être utilisées par n’importe qui sur n’importe quel serveur pour rejoindre votre salon. Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
+    "Other published addresses:": "Autres adresses publiques :",
+    "No other published addresses yet, add one below": "Aucune autre adresse n’est publiée, ajoutez-en une ci-dessous",
+    "New published address (e.g. #alias:server)": "Nouvelles adresses publiées (par ex. #alias:serveur)",
+    "Local Addresses": "Adresses locales",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Définissez les adresses de ce salon pour que les utilisateurs puissent trouver ce salon avec votre serveur d’accueil (%(localDomain)s)",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ouvrez une session existante et utilisez-la pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
+    "Waiting…": "Patientez…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Si vous n’avez accès à aucune session, <button>utilisez votre clé de récupération ou votre phrase de passe.</button>"
 }

From 61c3132cc5e40ae2eeec079e33d7a4ab2b742d45 Mon Sep 17 00:00:00 2001
From: Mejans <farga@mejans.fr>
Date: Tue, 17 Mar 2020 19:59:51 +0000
Subject: [PATCH 1602/3235] Translated using Weblate (Occitan)

Currently translated at 2.7% (59 of 2157 strings)

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

diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index f67d7291ce..6e8969da35 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -46,5 +46,16 @@
     "Loading …": "Cargament…",
     "Reason: %(reason)s": "Rason : %(reason)s",
     "Forget this room": "Oblidar aquesta sala",
-    "Disable": "Desactivar"
+    "Disable": "Desactivar",
+    "Do you want to chat with %(user)s?": "Volètz charrar amb %(user)s ?",
+    "<userName/> wants to chat": "<userName/> vòl charrar",
+    "Start chatting": "Començar de charrar",
+    "Do you want to join %(roomName)s?": "Volètz rejonher %(roomName)s ?",
+    "<userName/> invited you": "<userName/> vos convidèt",
+    "Reject": "Regetar",
+    "Reject & Ignore user": "Regetar e ignorar",
+    "%(roomName)s does not exist.": "%(roomName)s existís pas.",
+    "Not now": "Pas ara",
+    "Don't ask me again": "Me demandar pas mai",
+    "Options": "Opcions"
 }

From c43dd8ce92420a9ea952e827ceacbff14bbc2062 Mon Sep 17 00:00:00 2001
From: Pedro Silva <sparta14gaming@gmail.com>
Date: Tue, 17 Mar 2020 23:33:15 +0000
Subject: [PATCH 1603/3235] Translated using Weblate (Portuguese)

Currently translated at 28.3% (611 of 2157 strings)

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

diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index f0f1ce9860..6c64a10696 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -321,7 +321,7 @@
     "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar o processo de registro.",
     "Token incorrect": "Token incorreto",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
-    "powered by Matrix": "rodando a partir do Matrix",
+    "powered by Matrix": "powered by Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se não especificar um endereço de e-mail, você não poderá redefinir sua senha. Tem certeza?",
     "Error decrypting audio": "Erro ao descriptografar o áudio",
     "Error decrypting image": "Erro ao descriptografar a imagem",
@@ -627,5 +627,9 @@
     "Call failed due to misconfigured server": "Chamada falhada devido a um erro de configuração do servidor",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Peça ao administrador do seu servidor inicial (<code>%(homeserverDomain)s</code>) de configurar um servidor TURN para que as chamadas funcionem fiavelmente.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativamente, pode tentar usar o servidor público em <code>turn.matrix.org</code>, mas não será tão fiável e partilhará o seu IP com esse servidor. Também pode gerir isso nas definições.",
-    "Try using turn.matrix.org": "Tente utilizar turn.matrix.org"
+    "Try using turn.matrix.org": "Tente utilizar turn.matrix.org",
+    "The version of Riot": "A versão do Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Quer esteja a usar o Riot num dispositivo onde o touch é o mecanismo de entrada primário",
+    "Whether you're using Riot as an installed Progressive Web App": "Quer esteja a usar o Riot como uma Progressive Web App (PWA)",
+    "Your user agent": "O seu user agent"
 }

From a34e8478d98b3ff6bb25dcb42e28f1f9c0d60791 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 17 Mar 2020 19:52:46 +0000
Subject: [PATCH 1604/3235] Translated using Weblate (Turkish)

Currently translated at 77.8% (1679 of 2157 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 84cb229a46..28e9108902 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -353,7 +353,7 @@
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
     "(~%(count)s results)|one": "(~%(count)s sonuç)",
     "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
-    "Cancel": "İptal Et",
+    "Cancel": "İptal",
     "Active call": "Aktif çağrı",
     "Please select the destination room for this message": "Bu ileti için lütfen hedef oda seçin",
     "Create new room": "Yeni Oda Oluştur",
@@ -1700,5 +1700,10 @@
     "Your keys are being backed up (the first backup could take a few minutes).": "Anahtarlarınız yedekleniyor (ilk yedek bir kaç dakika sürebilir).",
     "Secure your backup with a passphrase": "Yedeğinizi bir parola ile koruyun",
     "If you don't want to set this up now, you can later in Settings.": "Şimdi ayarlamak istemiyorsanız daha sonra Ayarlar menüsünden yapabilirsiniz.",
-    "Set up": "Ayarla"
+    "Set up": "Ayarla",
+    "Review Sessions": "Oturumlar Gözden Geçir",
+    "Cancel entering passphrase?": "Parola girişini iptal et?",
+    "%(senderName)s changed the alternative addresses for this room.": "Bu oda için alternatif adresler %(senderName)s tarafından değiştirildi.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "Bu oda için ana ve alternatif adresler %(senderName)s tarafından değiştirildi.",
+    "%(senderName)s changed the addresses for this room.": "Bu oda adresleri %(senderName)s tarafından değiştirildi."
 }

From d5b6392120719b7b82e853927e3c6bf223bb673b Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 18 Mar 2020 11:31:55 +0000
Subject: [PATCH 1605/3235] Translated using Weblate (Italian)

Currently translated at 99.6% (2148 of 2157 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 8c61eda6e0..0aa4bfbca6 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2200,5 +2200,9 @@
     "Theme added!": "Tema aggiunto!",
     "Custom theme URL": "URL tema personalizzato",
     "Add theme": "Aggiungi tema",
-    "You don't have permission to delete the alias.": "Non hai l'autorizzazione per eliminare l'alias."
+    "You don't have permission to delete the alias.": "Non hai l'autorizzazione per eliminare l'alias.",
+    "Review Sessions": "Controlla sessioni",
+    "Scroll to most recent messages": "Scorri ai messaggi più recenti",
+    "Local address": "Indirizzo locale",
+    "Published Addresses": "Indirizzi pubblicati"
 }

From 87cb4a98a78286f02645b22bb4be29dcd8449b98 Mon Sep 17 00:00:00 2001
From: Mejans <farga@mejans.fr>
Date: Wed, 18 Mar 2020 11:17:08 +0000
Subject: [PATCH 1606/3235] Translated using Weblate (Occitan)

Currently translated at 2.9% (63 of 2157 strings)

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

diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index 6e8969da35..e62d44f51d 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -57,5 +57,9 @@
     "%(roomName)s does not exist.": "%(roomName)s existís pas.",
     "Not now": "Pas ara",
     "Don't ask me again": "Me demandar pas mai",
-    "Options": "Opcions"
+    "Options": "Opcions",
+    "This Room": "Aquesta sala",
+    "All Rooms": "Totas les salas",
+    "Search…": "Cercar…",
+    "Server error": "Error servidor"
 }

From 5ee2a33faae91a4da3c294a9c8e7103c1b8b530c Mon Sep 17 00:00:00 2001
From: Elwyn Malethan <elwyn@malethan.com>
Date: Wed, 18 Mar 2020 11:20:32 +0000
Subject: [PATCH 1607/3235] Translated using Weblate (Welsh)

Currently translated at 0.4% (9 of 2157 strings)

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

diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index 951468c747..5795f3b5de 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -7,5 +7,6 @@
     "The platform you're on": "Y platfform rydych chi arno",
     "The version of Riot.im": "Fersiwn Riot.im",
     "Whether or not you're logged in (we don't record your username)": "Os ydych wedi mewngofnodi ai peidio (nid ydym yn cofnodi'ch enw defnyddiwr)",
-    "Your language of choice": "Eich iaith o ddewis"
+    "Your language of choice": "Eich iaith o ddewis",
+    "The version of Riot": "Fersiwn Riot"
 }

From 863d0206d26fd1045f689b819eded64c7b5c53e1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 18 Mar 2020 11:34:52 +0000
Subject: [PATCH 1608/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2157 of 2157 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 0aa4bfbca6..6614a7aa6d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2204,5 +2204,14 @@
     "Review Sessions": "Controlla sessioni",
     "Scroll to most recent messages": "Scorri ai messaggi più recenti",
     "Local address": "Indirizzo locale",
-    "Published Addresses": "Indirizzi pubblicati"
+    "Published Addresses": "Indirizzi pubblicati",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Gli indirizzi pubblicati possono essere usati da chiunque su qualsiasi server per entrare nella stanza. Per pubblicare un indirizzo, deve essere prima impostato come indirizzo locale.",
+    "Other published addresses:": "Altri indirizzi pubblicati:",
+    "No other published addresses yet, add one below": "Nessun altro indirizzo ancora pubblicato, aggiungine uno sotto",
+    "New published address (e.g. #alias:server)": "Nuovo indirizzo pubblicato (es. #alias:server)",
+    "Local Addresses": "Indirizzi locali",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Imposta gli indirizzi per la stanza affinché gli utenti la trovino attraverso il tuo homeserver (%(localDomain)s)",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Apri una sessione esistente e usala per verificare questa, dandole accesso ai messaggi cifrati.",
+    "Waiting…": "In attesa…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se non puoi accedere a nessuna, <button>usa la chiave di recupero o la password.</button>"
 }

From a99b61a14b4eff09724ac0eb43263643398cc1f8 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 18 Mar 2020 13:56:15 +0000
Subject: [PATCH 1609/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2167 of 2171 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 | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index b3a06ea3ed..4849862f99 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2184,5 +2184,31 @@
     "Indexed rooms:": "Indeksitaj ĉambroj:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s el %(totalRooms)s",
     "Message downloading sleep time(ms)": "Dormotempo de elŝuto de mesaĝoj (milonsekunde)",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permesi repaŝan vokasistan servilon turn.matrix.org, kiam via hejmservilo iun ne disponigas (via IP-adreso estus havigata dum voko)"
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permesi repaŝan vokasistan servilon turn.matrix.org, kiam via hejmservilo iun ne disponigas (via IP-adreso estus havigata dum voko)",
+    "Scroll to most recent messages": "Rulumi al plej freŝaj mesaĝoj",
+    "Local address": "Loka adreso",
+    "Published Addresses": "Publikigitaj adresoj",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publikigitan adreson povas uzi ĉiu persono el ĉiu servilo por aliĝi al via ĉambro. Por ke adreso publikiĝu, ĝi unue estu agordita kiel adreso loka.",
+    "Other published addresses:": "Aliaj publikigitaj adresoj:",
+    "No other published addresses yet, add one below": "Ankoraŭ neniuj aliaj publikigitaj adresoj; aldonu iun sube",
+    "New published address (e.g. #alias:server)": "Nova publikigita adreso (ekz. #kromnomo:servilo)",
+    "Local Addresses": "Lokaj adresoj",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Agordu adresojn por ĉi tiu ĉambro, por ke uzantoj povu ĝin trovi per via hejmservilo (%(localDomain)s)",
+    "Enter a server name": "Enigu nomon de servilo",
+    "Looks good": "Ŝajnas en ordo",
+    "Can't find this server or its room list": "Ne povas trovi ĉi tiun servilon aŭ ĝian liston de ĉambroj",
+    "All rooms": "Ĉiuj ĉambroj",
+    "Your server": "Via servilo",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ĉu vi certe volas forigi servilon <b>%(serverName)s</b>",
+    "Remove server": "Forigi servilon",
+    "Matrix": "Matrix",
+    "Add a new server": "Aldoni novan servilon",
+    "Enter the name of a new server you want to explore.": "Enigu la nomon de nova servilo, kiun vi volas esplori.",
+    "Server name": "Nomo de servilo",
+    "Add a new server...": "Aldoni novan servilon…",
+    "%(networkName)s rooms": "Ĉambroj de %(networkName)s",
+    "Matrix rooms": "Ĉambroj de Matrix",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Malfermi jaman salutaĵon kaj kontroli ĉi tiun per ĝi, permesante al ĝi aliron al ĉifritaj mesaĝoj.",
+    "Waiting…": "Atendante…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se vi ne povas iun atingi, <button>uzu vian rehavan ŝlosilon aŭ pasfrazon.</button>"
 }

From cad28c81c00ec434dd06c31bc102f4ba25a424c9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 16:40:21 +0000
Subject: [PATCH 1610/3235] Add Keyboard shortcuts dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |   1 +
 res/css/_components.scss                      |   1 +
 .../dialogs/_KeyboardShortcutsDialog.scss     |  65 ++++
 src/{Keyboard.js => Keyboard.ts}              |   5 +-
 src/accessibility/KeyboardShortcuts.tsx       | 313 ++++++++++++++++++
 src/components/structures/LoggedInView.js     |  10 +-
 src/components/views/dialogs/InfoDialog.js    |   6 +-
 .../settings/tabs/user/HelpUserSettingsTab.js |   4 +
 src/i18n/strings/en_EN.json                   |  40 ++-
 yarn.lock                                     |   5 +
 10 files changed, 444 insertions(+), 6 deletions(-)
 create mode 100644 res/css/views/dialogs/_KeyboardShortcutsDialog.scss
 rename src/{Keyboard.js => Keyboard.ts} (92%)
 create mode 100644 src/accessibility/KeyboardShortcuts.tsx

diff --git a/package.json b/package.json
index 8cda349e03..2316482f87 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "@babel/preset-typescript": "^7.7.4",
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
+    "@types/classnames": "^2.2.10",
     "@types/react": "16.9",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/res/css/_components.scss b/res/css/_components.scss
index bc636eb3c6..8f05394a48 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -65,6 +65,7 @@
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
+@import "./views/dialogs/_KeyboardShortcutsDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
 @import "./views/dialogs/_NewSessionReviewDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
diff --git a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
new file mode 100644
index 0000000000..231623f6ef
--- /dev/null
+++ b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_KeyboardShortcutsDialog {
+    display: flex;
+    flex-wrap: wrap;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    flex-direction: column;
+    margin-bottom: -50px;
+    max-height: 700px; // XXX: this may need adjusting when adding new shortcuts
+
+    .mx_KeyboardShortcutsDialog_category {
+        width: 33.3333%; // 3 columns
+        margin: 0 0 40px;
+
+        & > div {
+            padding-left: 5px;
+        }
+    }
+
+    h3 {
+        margin: 0 0 10px;
+    }
+
+    h5 {
+        margin: 15px 0 5px;
+        font-weight: normal;
+    }
+
+    kbd {
+        padding: 5px;
+        border-radius: 4px;
+        background: $roomheader-addroom-bg-color;
+        margin-right: 5px;
+        min-width: 20px;
+        text-align: center;
+        display: inline-block;
+        border: 1px solid black;
+        box-shadow: 0 2px black;
+        margin-bottom: 4px;
+        text-transform: capitalize;
+
+        & + kbd {
+            margin-left: 5px;
+        }
+    }
+
+    .mx_KeyboardShortcutsDialog_inline div {
+        display: inline;
+    }
+}
diff --git a/src/Keyboard.js b/src/Keyboard.ts
similarity index 92%
rename from src/Keyboard.js
rename to src/Keyboard.ts
index 478d75acc1..f5cf0a5492 100644
--- a/src/Keyboard.js
+++ b/src/Keyboard.ts
@@ -40,6 +40,7 @@ export const Key = {
     GREATER_THAN: ">",
     BACKTICK: "`",
     SPACE: " ",
+    SLASH: "/",
     A: "a",
     B: "b",
     C: "c",
@@ -68,8 +69,9 @@ export const Key = {
     Z: "z",
 };
 
+export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+
 export function isOnlyCtrlOrCmdKeyEvent(ev) {
-    const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
     if (isMac) {
         return ev.metaKey && !ev.altKey && !ev.ctrlKey && !ev.shiftKey;
     } else {
@@ -78,7 +80,6 @@ export function isOnlyCtrlOrCmdKeyEvent(ev) {
 }
 
 export function isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) {
-    const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
     if (isMac) {
         return ev.metaKey && !ev.altKey && !ev.ctrlKey;
     } else {
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
new file mode 100644
index 0000000000..ceec3f94bc
--- /dev/null
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -0,0 +1,313 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as React from "react";
+import classNames from "classnames";
+
+import * as sdk from "../index";
+import Modal from "../Modal";
+import { _t, _td } from "../languageHandler";
+import {isMac, Key} from "../Keyboard";
+
+// TS: once languageHandler is TS we can probably inline this into the enum
+_td("Navigation");
+_td("Calls");
+_td("Composer");
+_td("Room List");
+_td("Autocomplete");
+
+export enum Categories {
+    NAVIGATION="Navigation",
+    CALLS="Calls",
+    COMPOSER="Composer",
+    ROOM_LIST="Room List",
+    AUTOCOMPLETE="Autocomplete",
+}
+
+// TS: once languageHandler is TS we can probably inline this into the enum
+_td("Alt");
+_td("Alt Gr");
+_td("Shift");
+_td("Super");
+_td("Ctrl");
+
+export enum Modifiers {
+    ALT="Alt",
+    OPTION="Option", // This gets displayed as an Icon
+    ALT_GR="Alt Gr",
+    SHIFT="Shift",
+    SUPER="Super", // should this be "Windows"?
+    // Instead of using below, consider CMD_OR_CTRL
+    COMMAND="Command", // This gets displayed as an Icon
+    CONTROL="Ctrl",
+}
+
+// Meta-modifier: isMac ? CMD : CONTROL
+export const CMD_OR_CTRL = isMac ? Modifiers.COMMAND : Modifiers.CONTROL;
+
+interface IKeybind {
+    modifiers?: Modifiers[];
+    key: string; // TS: fix this once Key is an enum
+}
+
+interface IShortcut {
+    keybinds: IKeybind[];
+    description: string;
+}
+
+const shortcuts: Record<Categories, IShortcut[]> = {
+    [Categories.COMPOSER]: [
+        {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.B,
+            }],
+            description: _td("Toggle Bold"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.I,
+            }],
+            description: _td("Toggle Italics"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.GREATER_THAN,
+            }],
+            description: _td("Toggle Quote"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.M,
+            }],
+            description: _td("Toggle Markdown"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.SHIFT],
+                key: Key.ENTER,
+            }],
+            description: _td("New line"),
+        }, {
+            keybinds: [{
+                key: Key.ARROW_UP,
+            }, {
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Navigate recent messages to edit"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.HOME,
+            }, {
+                modifiers: [CMD_OR_CTRL],
+                key: Key.END,
+            }],
+            description: _td("Jump to start/end of the composer"),
+        },
+    ],
+
+    [Categories.CALLS]: [
+        {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.D,
+            }],
+            description: _td("Toggle microphone mute"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.E,
+            }],
+            description: _td("Toggle video on/off"),
+        },
+    ],
+
+    [Categories.ROOM_LIST]: [
+        {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.K,
+            }],
+            description: _td("Jump to room search"),
+        }, {
+            keybinds: [{
+                key: Key.ARROW_UP,
+            }, {
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Navigate up/down in the room list"),
+        }, {
+            keybinds: [{
+                key: Key.ENTER,
+            }],
+            description: _td("Select room from the room list"),
+        }, {
+            keybinds: [{
+                key: Key.ARROW_LEFT,
+            }],
+            description: _td("Collapse room list section"),
+        }, {
+            keybinds: [{
+                key: Key.ARROW_RIGHT,
+            }],
+            description: _td("Expand room list section"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Clear room list filter field"),
+        },
+    ],
+
+    [Categories.NAVIGATION]: [
+        {
+            keybinds: [{
+                key: Key.PAGE_UP,
+            }, {
+                key: Key.PAGE_DOWN,
+            }],
+            description: _td("Scroll up/down in the timeline"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.BACKTICK,
+            }],
+            description: _td("Toggle the top left menu"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Close dialog or context menu"),
+        }, {
+            keybinds: [{
+                key: Key.ENTER,
+            }, {
+                key: Key.SPACE,
+            }],
+            description: _td("Activate selected button"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.SLASH,
+            }],
+            description: _td("Toggle this dialog"),
+        },
+    ],
+
+    [Categories.AUTOCOMPLETE]: [
+        {
+            keybinds: [{
+                key: Key.ARROW_UP,
+            }, {
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Move autocomplete selection up/down"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Cancel autocomplete"),
+        },
+    ],
+};
+
+interface IModal {
+    close: () => void;
+    finished: Promise<any[]>;
+}
+
+const modifierIcon: Record<Modifiers, string> = {
+    [Modifiers.COMMAND]: "⌘",
+    [Modifiers.OPTION]: "⌥",
+};
+
+const alternateKeyName: Record<string, string> = { // TS: fix this once Key is an enum
+    [Key.PAGE_UP]: _td("Page Up"),
+    [Key.PAGE_DOWN]: _td("Page Down"),
+    [Key.ESCAPE]: _td("Esc"),
+    [Key.ENTER]: _td("Enter"),
+    [Key.SPACE]: _td("Space"),
+    [Key.HOME]: _td("Home"),
+    [Key.END]: _td("End"),
+};
+const keyIcon: Record<string, string> = { // TS: fix this once Key is an enum
+    [Key.ARROW_UP]: "↑",
+    [Key.ARROW_DOWN]: "↓",
+    [Key.ARROW_LEFT]: "←",
+    [Key.ARROW_RIGHT]: "→",
+};
+
+const Shortcut: React.FC<{
+    shortcut: IShortcut;
+}> = ({shortcut}) => {
+    const classes = classNames({
+        "mx_KeyboardShortcutsDialog_inline": shortcut.keybinds.every(k => !k.modifiers || k.modifiers.length === 0),
+    });
+
+    return <div className={classes}>
+        <h5>{ _t(shortcut.description) }</h5>
+        { shortcut.keybinds.map(s => {
+            let text = s.key;
+            if (alternateKeyName[s.key]) {
+                text = _t(alternateKeyName[s.key]);
+            } else if (keyIcon[s.key]) {
+                text = keyIcon[s.key];
+            }
+
+            return <div key={s.key}>
+                { s.modifiers && s.modifiers.map(m => {
+                    return <React.Fragment key={m}>
+                        <kbd>{ modifierIcon[m] || _t(m) }</kbd>+
+                    </React.Fragment>;
+                }) }
+                <kbd>{ text }</kbd>
+            </div>;
+        }) }
+    </div>;
+};
+
+let activeModal: IModal = null;
+export const toggleDialog = () => {
+    if (activeModal) {
+        activeModal.close();
+        activeModal = null;
+        return;
+    }
+
+    const sections = Object.entries(shortcuts).map(([category, list]) => {
+        return <div className="mx_KeyboardShortcutsDialog_category" key={category}>
+            <h3>{_t(category)}</h3>
+            <div>{list.map(shortcut => <Shortcut key={shortcut.description} shortcut={shortcut} />)}</div>
+        </div>;
+    });
+
+    const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
+    activeModal = Modal.createTrackedDialog("Keyboard Shortcuts", "", InfoDialog, {
+        className: "mx_KeyboardShortcutsDialog",
+        title: _t("Keyboard Shortcuts"),
+        description: sections,
+        hasCloseButton: true,
+        onKeyDown: (ev) => {
+            if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey && ev.key === Key.SLASH) { // Ctrl + /
+                ev.stopPropagation();
+                activeModal.close();
+            }
+        },
+        onFinished: () => {
+            activeModal = null;
+        },
+    });
+};
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index d643c82120..576ae2b276 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -39,6 +39,7 @@ import RoomListActions from '../../actions/RoomListActions';
 import ResizeHandle from '../views/elements/ResizeHandle';
 import {Resizer, CollapseDistributor} from '../../resizer';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -365,8 +366,6 @@ const LoggedInView = createReactClass({
                 }
                 break;
             case Key.BACKTICK:
-                if (ev.key !== "`") break;
-
                 // Ideally this would be CTRL+P for "Profile", but that's
                 // taken by the print dialog. CTRL+I for "Information"
                 // was previously chosen but conflicted with italics in
@@ -379,6 +378,13 @@ const LoggedInView = createReactClass({
                     handled = true;
                 }
                 break;
+
+            case Key.SLASH:
+                if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
+                    KeyboardShortcuts.toggleDialog();
+                    handled = true;
+                }
+                break;
         }
 
         if (handled) {
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 8a8f51c25a..b63f6ba9c6 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -32,6 +32,7 @@ export default createReactClass({
         button: PropTypes.string,
         onFinished: PropTypes.func,
         hasCloseButton: PropTypes.bool,
+        onKeyDown: PropTypes.func,
     },
 
     getDefaultProps: function() {
@@ -50,10 +51,13 @@ export default createReactClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
-            <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
+            <BaseDialog
+                className="mx_InfoDialog"
+                onFinished={this.props.onFinished}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
                 hasCancel={this.props.hasCloseButton}
+                onKeyDown={this.props.onKeyDown}
             >
                 <div className={classNames("mx_Dialog_content", this.props.className)} id="mx_Dialog_content">
                     { this.props.description }
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index aca2f010b6..9a2db8113e 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -24,6 +24,7 @@ import createRoom from "../../../../../createRoom";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";
+import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
 
 export default class HelpUserSettingsTab extends React.Component {
     static propTypes = {
@@ -224,6 +225,9 @@ export default class HelpUserSettingsTab extends React.Component {
                     <div className='mx_SettingsTab_subsectionText'>
                         {faqText}
                     </div>
+                    <AccessibleButton kind="primary" onClick={KeyboardShortcuts.toggleDialog}>
+                        { _t("Keyboard Shortcuts") }
+                    </AccessibleButton>
                 </div>
                 <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
                     <span className='mx_SettingsTab_subheading'>{_t("Versions")}</span>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d9b8f4f0bd..cdfc3cbb89 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -742,6 +742,7 @@
     "Clear cache and reload": "Clear cache and reload",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "FAQ": "FAQ",
+    "Keyboard Shortcuts": "Keyboard Shortcuts",
     "Versions": "Versions",
     "riot-web version:": "riot-web version:",
     "olm version:": "olm version:",
@@ -2155,5 +2156,42 @@
     "Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
     "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",
+    "Navigation": "Navigation",
+    "Calls": "Calls",
+    "Room List": "Room List",
+    "Autocomplete": "Autocomplete",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Toggle Bold",
+    "Toggle Italics": "Toggle Italics",
+    "Toggle Quote": "Toggle Quote",
+    "Toggle Markdown": "Toggle Markdown",
+    "New line": "New line",
+    "Navigate recent messages to edit": "Navigate recent messages to edit",
+    "Jump to start/end of the composer": "Jump to start/end of the composer",
+    "Toggle microphone mute": "Toggle microphone mute",
+    "Toggle video on/off": "Toggle video on/off",
+    "Jump to room search": "Jump to room search",
+    "Navigate up/down in the room list": "Navigate up/down in the room list",
+    "Select room from the room list": "Select room from the room list",
+    "Collapse room list section": "Collapse room list section",
+    "Expand room list section": "Expand room list section",
+    "Clear room list filter field": "Clear room list filter field",
+    "Scroll up/down in the timeline": "Scroll up/down in the timeline",
+    "Toggle the top left menu": "Toggle the top left menu",
+    "Close dialog or context menu": "Close dialog or context menu",
+    "Activate selected button": "Activate selected button",
+    "Toggle this dialog": "Toggle this dialog",
+    "Move autocomplete selection up/down": "Move autocomplete selection up/down",
+    "Cancel autocomplete": "Cancel autocomplete",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End"
 }
diff --git a/yarn.lock b/yarn.lock
index ac511949ce..ac921a619a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1178,6 +1178,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/classnames@^2.2.10":
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
+  integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"

From 9cda84c675e20636bf3c7f60893065a50d75762d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 16:54:46 +0000
Subject: [PATCH 1611/3235] fix kbd background colour

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_KeyboardShortcutsDialog.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
index 231623f6ef..ce7dd90d33 100644
--- a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
+++ b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
@@ -44,7 +44,7 @@ limitations under the License.
     kbd {
         padding: 5px;
         border-radius: 4px;
-        background: $roomheader-addroom-bg-color;
+        background: $other-user-pill-bg-color;
         margin-right: 5px;
         min-width: 20px;
         text-align: center;

From 36cedc58bb09e03fe4c8de030bec9c5bfb26d0b1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 17:03:00 +0000
Subject: [PATCH 1612/3235] Make ts happier

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/KeyboardShortcuts.tsx | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index ceec3f94bc..97b3a69bd5 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -30,11 +30,11 @@ _td("Room List");
 _td("Autocomplete");
 
 export enum Categories {
-    NAVIGATION="Navigation",
-    CALLS="Calls",
-    COMPOSER="Composer",
-    ROOM_LIST="Room List",
-    AUTOCOMPLETE="Autocomplete",
+    NAVIGATION = "Navigation",
+    CALLS = "Calls",
+    COMPOSER = "Composer",
+    ROOM_LIST = "Room List",
+    AUTOCOMPLETE = "Autocomplete",
 }
 
 // TS: once languageHandler is TS we can probably inline this into the enum
@@ -45,14 +45,14 @@ _td("Super");
 _td("Ctrl");
 
 export enum Modifiers {
-    ALT="Alt",
-    OPTION="Option", // This gets displayed as an Icon
-    ALT_GR="Alt Gr",
-    SHIFT="Shift",
-    SUPER="Super", // should this be "Windows"?
+    ALT = "Alt",
+    OPTION = "Option", // This gets displayed as an Icon
+    ALT_GR = "Alt Gr",
+    SHIFT = "Shift",
+    SUPER = "Super", // should this be "Windows"?
     // Instead of using below, consider CMD_OR_CTRL
-    COMMAND="Command", // This gets displayed as an Icon
-    CONTROL="Ctrl",
+    COMMAND = "Command", // This gets displayed as an Icon
+    CONTROL = "Ctrl",
 }
 
 // Meta-modifier: isMac ? CMD : CONTROL
@@ -229,12 +229,12 @@ interface IModal {
     finished: Promise<any[]>;
 }
 
-const modifierIcon: Record<Modifiers, string> = {
+const modifierIcon: Record<string, string> = {
     [Modifiers.COMMAND]: "⌘",
     [Modifiers.OPTION]: "⌥",
 };
 
-const alternateKeyName: Record<string, string> = { // TS: fix this once Key is an enum
+const alternateKeyName: Record<string, string> = {
     [Key.PAGE_UP]: _td("Page Up"),
     [Key.PAGE_DOWN]: _td("Page Down"),
     [Key.ESCAPE]: _td("Esc"),
@@ -243,7 +243,7 @@ const alternateKeyName: Record<string, string> = { // TS: fix this once Key is a
     [Key.HOME]: _td("Home"),
     [Key.END]: _td("End"),
 };
-const keyIcon: Record<string, string> = { // TS: fix this once Key is an enum
+const keyIcon: Record<string, string> = {
     [Key.ARROW_UP]: "↑",
     [Key.ARROW_DOWN]: "↓",
     [Key.ARROW_LEFT]: "←",

From 1d5001544c57fc2d08452865c4f5fde3d9f6c196 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 17:32:36 +0000
Subject: [PATCH 1613/3235] Improve colouring

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_KeyboardShortcutsDialog.scss | 6 +++---
 res/themes/dark/css/_dark.scss                      | 2 ++
 res/themes/light/css/_light.scss                    | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
index ce7dd90d33..f529b11059 100644
--- a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
+++ b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
@@ -44,13 +44,13 @@ limitations under the License.
     kbd {
         padding: 5px;
         border-radius: 4px;
-        background: $other-user-pill-bg-color;
+        background-color: $reaction-row-button-bg-color;
         margin-right: 5px;
         min-width: 20px;
         text-align: center;
         display: inline-block;
-        border: 1px solid black;
-        box-shadow: 0 2px black;
+        border: 1px solid $kbd-border-color;
+        box-shadow: 0 2px $kbd-border-color;
         margin-bottom: 4px;
         text-transform: capitalize;
 
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index a3515a9d99..77360c870a 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -165,6 +165,8 @@ $reaction-row-button-hover-border-color: $header-panel-text-primary-color;
 $reaction-row-button-selected-bg-color: #1f6954;
 $reaction-row-button-selected-border-color: $accent-color;
 
+$kbd-border-color: #000000;
+
 $tooltip-timeline-bg-color: $tagpanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 626ccb2e13..9bdd712e07 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -290,6 +290,8 @@ $reaction-row-button-hover-border-color: $focus-bg-color;
 $reaction-row-button-selected-bg-color: #e9fff9;
 $reaction-row-button-selected-border-color: $accent-color;
 
+$kbd-border-color: $reaction-row-button-border-color;
+
 $tooltip-timeline-bg-color: $tagpanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 

From 544e2c9971d78729922a04c035ef468b49a7b6e4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 18 Mar 2020 20:53:05 +0000
Subject: [PATCH 1614/3235] Don't use buildkite agent to upload logs

---
 scripts/ci/end-to-end-tests.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 9bdb512940..2f907dffa2 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -6,16 +6,8 @@
 
 set -ev
 
-upload_logs() {
-    echo "--- Uploading logs"
-    buildkite-agent artifact upload "logs/**/*;synapse/installations/consent/homeserver.log"
-}
-
 handle_error() {
     EXIT_CODE=$?
-    if [ $TESTS_STARTED -eq 1 ]; then
-        upload_logs
-    fi
     exit $EXIT_CODE
 }
 

From 7a448c5ba2065035adf90d9bd9ff31067df543c6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 20:56:28 +0000
Subject: [PATCH 1615/3235] Fix Alt being Option on Mac

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/KeyboardShortcuts.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 97b3a69bd5..618ed4755a 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -45,8 +45,7 @@ _td("Super");
 _td("Ctrl");
 
 export enum Modifiers {
-    ALT = "Alt",
-    OPTION = "Option", // This gets displayed as an Icon
+    ALT = "Alt", // Option on Mac and displayed as an Icon
     ALT_GR = "Alt Gr",
     SHIFT = "Shift",
     SUPER = "Super", // should this be "Windows"?
@@ -231,9 +230,12 @@ interface IModal {
 
 const modifierIcon: Record<string, string> = {
     [Modifiers.COMMAND]: "⌘",
-    [Modifiers.OPTION]: "⌥",
 };
 
+if (isMac) {
+    modifierIcon[Modifiers.ALT] = "⌥";
+}
+
 const alternateKeyName: Record<string, string> = {
     [Key.PAGE_UP]: _td("Page Up"),
     [Key.PAGE_DOWN]: _td("Page Down"),

From 22c8df9f2309842708ea9b567d73f73017a9feb5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 21:08:37 +0000
Subject: [PATCH 1616/3235] Update DM invite copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 9 +++++----
 src/i18n/strings/en_EN.json                  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index d27a66165e..84ce69e174 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -1060,10 +1060,11 @@ export default class InviteDialog extends React.PureComponent {
 
             title = _t("Direct Messages");
             helpText = _t(
-                "If you can't find someone, ask them for their username, share your " +
-                "username (%(userId)s) or <a>profile link</a>.",
-                {userId},
-                {a: (sub) => <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{sub}</a>},
+                "Start a conversation with someone using their name, username (like <userId/>) or email address.",
+                {},
+                {userId: () => {
+                    return <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>;
+                }},
             );
             buttonText = _t("Go");
             goButtonFn = this._startDm;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f8c8ad0200..2f800f8d21 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1584,7 +1584,7 @@
     "Recent Conversations": "Recent Conversations",
     "Suggestions": "Suggestions",
     "Recently Direct Messaged": "Recently Direct Messaged",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",

From dd9ead0166181da4c7dd5471a84d7feb42dbb7e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 21:09:52 +0000
Subject: [PATCH 1617/3235] Invite dialog: backspace on empty field remove
 right-most target

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 84ce69e174..8cf3967ac5 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -35,6 +35,7 @@ import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
 import SettingsStore from '../../../settings/SettingsStore';
 import RoomListStore, {TAG_DM} from "../../../stores/RoomListStore";
+import {Key} from "../../../Keyboard";
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
@@ -647,6 +648,14 @@ export default class InviteDialog extends React.PureComponent {
         this.props.onFinished();
     };
 
+    _onKeyDown = (e) => {
+        // when the field is empty and the user hits backspace remove the right-most target
+        if (!e.target.value && this.state.targets.length > 0 && e.key === Key.BACKSPACE && !e.ctrlKey && !e.shiftKey) {
+            e.preventDefault();
+            this._removeMember(this.state.targets[this.state.targets.length - 1]);
+        }
+    };
+
     _updateFilter = (e) => {
         const term = e.target.value;
         this.setState({filterText: term});
@@ -988,8 +997,8 @@ export default class InviteDialog extends React.PureComponent {
         ));
         const input = (
             <textarea
-                key={"input"}
                 rows={1}
+                onKeyDown={this._onKeyDown}
                 onChange={this._updateFilter}
                 value={this.state.filterText}
                 ref={this._editorRef}

From 963c0a7b3f0451c19110c8a1b25d23271a06700c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Mar 2020 21:16:41 +0000
Subject: [PATCH 1618/3235] Hide remove target buttons when busy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 8cf3967ac5..ad5db69947 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -126,7 +126,7 @@ class ThreepidMember extends Member {
 class DMUserTile extends React.PureComponent {
     static propTypes = {
         member: PropTypes.object.isRequired, // Should be a Member (see interface above)
-        onRemove: PropTypes.func.isRequired, // takes 1 argument, the member being removed
+        onRemove: PropTypes.func, // takes 1 argument, the member being removed
     };
 
     _onRemove = (e) => {
@@ -157,18 +157,25 @@ class DMUserTile extends React.PureComponent {
                 width={avatarSize}
                 height={avatarSize} />;
 
-        return (
-            <span className='mx_InviteDialog_userTile'>
-                <span className='mx_InviteDialog_userTile_pill'>
-                    {avatar}
-                    <span className='mx_InviteDialog_userTile_name'>{this.props.member.name}</span>
-                </span>
+        let closeButton;
+        if (this.props.onRemove) {
+            closeButton = (
                 <AccessibleButton
                     className='mx_InviteDialog_userTile_remove'
                     onClick={this._onRemove}
                 >
                     <img src={require("../../../../res/img/icon-pill-remove.svg")} alt={_t('Remove')} width={8} height={8} />
                 </AccessibleButton>
+            );
+        }
+
+        return (
+            <span className='mx_InviteDialog_userTile'>
+                <span className='mx_InviteDialog_userTile_pill'>
+                    {avatar}
+                    <span className='mx_InviteDialog_userTile_name'>{this.props.member.name}</span>
+                </span>
+                { closeButton }
             </span>
         );
     }
@@ -650,7 +657,9 @@ export default class InviteDialog extends React.PureComponent {
 
     _onKeyDown = (e) => {
         // when the field is empty and the user hits backspace remove the right-most target
-        if (!e.target.value && this.state.targets.length > 0 && e.key === Key.BACKSPACE && !e.ctrlKey && !e.shiftKey) {
+        if (!e.target.value && !this.state.busy && this.state.targets.length > 0 && e.key === Key.BACKSPACE &&
+            !e.ctrlKey && !e.shiftKey && !e.metaKey
+        ) {
             e.preventDefault();
             this._removeMember(this.state.targets[this.state.targets.length - 1]);
         }
@@ -993,7 +1002,7 @@ export default class InviteDialog extends React.PureComponent {
 
     _renderEditor() {
         const targets = this.state.targets.map(t => (
-            <DMUserTile member={t} onRemove={this._removeMember} key={t.userId} />
+            <DMUserTile member={t} onRemove={!this.state.busy && this._removeMember} key={t.userId} />
         ));
         const input = (
             <textarea

From a4bee08a183cb5871cc3db3b131e267e5de4e40b Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Wed, 18 Mar 2020 15:52:56 +0000
Subject: [PATCH 1619/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 24.6% (535 of 2171 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 66e453e697..15f1372fb4 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -265,5 +265,282 @@
     "Displays list of commands with usages and descriptions": "Viser liste over kommandoer med bruks eksempler og beskrivelser",
     "Reason": "Årsak",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aksepterte invitasjonen til %(displayName)s.",
-    "%(targetName)s accepted an invitation.": "%(targetName)s aksepterte en invitasjon."
+    "%(targetName)s accepted an invitation.": "%(targetName)s aksepterte en invitasjon.",
+    "Add Email Address": "Legg til E-postadresse",
+    "Add Phone Number": "Legg til telefonnummer",
+    "The version of Riot": "Riot-versjonen",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hvorvidt du bruker Riot på en enhet som primært mottar inndata gjennom touchskjerm",
+    "Your user agent": "Brukeragenten din",
+    "Cancel": "Avbryt",
+    "Trust": "Stol på",
+    "Sign In": "Logg inn",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterte %(targetName)s.",
+    "%(targetName)s joined the room.": "%(targetName)s ble med i rommet.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et bilde.",
+    "Someone": "Noen",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendte en invitasjon til %(targetDisplayName)s om å bli med i rommet.",
+    "Light theme": "Lyst tema",
+    "Dark theme": "Mørkt tema",
+    "Done": "Fullført",
+    "%(displayName)s is typing …": "%(displayName)s skriver …",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriver …",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s og én annen bruker skriver …",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriver …",
+    "%(num)s minutes ago": "%(num)s minutter siden",
+    "%(num)s hours ago": "%(num)s timer siden",
+    "This is a very common password": "Dette er et veldig vanlig passord",
+    "Decline": "Avslå",
+    "Accept": "Godta",
+    "Start": "Begynn",
+    "Dog": "Hund",
+    "Cat": "Katt",
+    "Horse": "Hest",
+    "Unicorn": "Enhjørning",
+    "Elephant": "Elefant",
+    "Panda": "Panda",
+    "Penguin": "Pingvin",
+    "Fish": "Fisk",
+    "Octopus": "Blekksprut",
+    "Flower": "Blomst",
+    "Mushroom": "Sopp",
+    "Moon": "Måne",
+    "Banana": "Banan",
+    "Strawberry": "Jordbær",
+    "Pizza": "Pizza",
+    "Cake": "Kaker",
+    "Robot": "Robot",
+    "Glasses": "Briller",
+    "Umbrella": "Paraply",
+    "Clock": "Klokke",
+    "Pencil": "Blyant",
+    "Scissors": "Saks",
+    "Key": "Nøkkel",
+    "Hammer": "Hammer",
+    "Flag": "Flagg",
+    "Bicycle": "Sykkel",
+    "Trumpet": "Trompet",
+    "Bell": "Bjelle",
+    "Anchor": "Anker",
+    "Headphones": "Hodetelefoner",
+    "Folder": "Mappe",
+    "Upgrade": "Oppgrader",
+    "Verify": "Bekreft",
+    "Review": "Gjennomgang",
+    "Upload": "Last opp",
+    "Show less": "Vis mindre",
+    "Current password": "Nåværende passord",
+    "Password": "Passord",
+    "New Password": "Nytt passord",
+    "Confirm password": "Bekreft passord",
+    "Change Password": "Endre passordet",
+    "ID": "ID",
+    "rooms.": "rom.",
+    "Manage": "Administrér",
+    "Enable": "Slå på",
+    "<a>Upgrade</a> to your own domain": "<a>Oppgrader</a> til ditt eget domene",
+    "Display Name": "Visningsnavn",
+    "Save": "Lagre",
+    "Disconnect": "Koble fra",
+    "Go back": "Gå tilbake",
+    "Change": "Endre",
+    "Success": "Vellykket",
+    "Profile": "Profil",
+    "Email addresses": "E-postadresser",
+    "Phone numbers": "Telefonnumre",
+    "Account": "Konto",
+    "Language and region": "Språk og område",
+    "Theme": "Tema",
+    "Warning": "Advarsel",
+    "General": "Generelt",
+    "Legal": "Juridisk",
+    "Credits": "Takk til",
+    "FAQ": "Ofte Stilte Spørsmål",
+    "Versions": "Versjoner",
+    "None": "Ingen",
+    "Unsubscribe": "Meld ut",
+    "Ignore": "Ignorer",
+    "Subscribe": "Abonnér",
+    "Preferences": "Brukervalg",
+    "Composer": "Komposør",
+    "Timeline": "Tidslinje",
+    "Security & Privacy": "Sikkerhet og personvern",
+    "Sessions": "Sesjoner",
+    "Camera": "Kamera",
+    "Reset": "Nullstill",
+    "Browse": "Bla",
+    "Unban": "Opphev utestengelse",
+    "Banned users": "Bannlyste brukere",
+    "Permissions": "Tillatelser",
+    "Anyone": "Alle",
+    "Encryption": "Kryptering",
+    "Encrypted": "Kryptert",
+    "Complete": "Fullført",
+    "Revoke": "Tilbakekall",
+    "Share": "Del",
+    "Unable to verify phone number.": "Klarte ikke å verifisere telefonnummeret.",
+    "Verification code": "Verifikasjonskode",
+    "Add": "Legg til",
+    "Email Address": "E-postadresse",
+    "Phone Number": "Telefonnummer",
+    "Mod": "Mod",
+    "%(senderName)s sent an image": "%(senderName)s sendte et bilde",
+    "%(senderName)s sent a video": "%(senderName)s sendte en video",
+    "Ban": "Utesteng",
+    "Are you sure?": "Er du sikker?",
+    "Invite": "Inviter",
+    "Unmute": "Opphev demp",
+    "Mute": "Demp",
+    "Admin Tools": "Adminverktøy",
+    "Invited": "Invitert",
+    "Upload file": "Last opp fil",
+    "Send an encrypted reply…": "Send et kryptert svar …",
+    "Send an encrypted message…": "Send en kryptert beskjed …",
+    "Send a message…": "Send en melding …",
+    "Send a message (unencrypted)…": "Send en melding (ukryptert) …",
+    "Bold": "Fet",
+    "Italics": "Kursiv",
+    "Strikethrough": "Gjennomstreking",
+    "Loading...": "Laster ...",
+    "Online": "Tilkoblet",
+    "Idle": "Rolig",
+    "Offline": "Frakoblet",
+    "Unknown": "Ukjent",
+    "Recent rooms": "Nylige rom",
+    "Settings": "Innstillinger",
+    "Search": "Søk",
+    "Direct Messages": "Direktemeldinger",
+    "Rooms": "Rom",
+    "Joining room …": "Blir med i rommet …",
+    "Sign Up": "Registrer deg",
+    "Not now": "Ikke nå",
+    "Options": "Innstillinger",
+    "All Rooms": "Alle rom",
+    "Search…": "Søk …",
+    "Security": "Sikkerhet",
+    "Got it": "Jeg forstår",
+    "Reply": "Svar",
+    "Edit": "Rediger ",
+    "Attachment": "Vedlegg",
+    "Download %(text)s": "Last ned %(text)s",
+    "Show all": "Vis alt",
+    "Reactions": "Reaksjoner",
+    "Copied!": "Kopiert!",
+    "Filter community members": "Filtrer samfunnsmedlemmer",
+    "Filter community rooms": "Filtrer samfunnsrom",
+    "What's New": "Hva er nytt",
+    "Update": "Oppdater",
+    "Frequently Used": "Ofte brukte",
+    "Smileys & People": "Smilefjes og folk",
+    "Animals & Nature": "Dyreliv og natur",
+    "Food & Drink": "Mat og drikke",
+    "Activities": "Aktiviteter",
+    "Travel & Places": "Reise og steder",
+    "Objects": "Objekter",
+    "Symbols": "Symboler",
+    "Flags": "Flagg",
+    "Quick Reactions": "Hurtigreaksjoner",
+    "Cancel search": "Avbryt søket",
+    "More options": "Flere alternativer",
+    "Blacklist": "Svarteliste",
+    "Join": "Bli med",
+    "Yes": "Ja",
+    "No": "Nei",
+    "collapse": "skjul",
+    "expand": "utvid",
+    "Communities": "Samfunn",
+    "Rotate counter-clockwise": "Roter mot klokken",
+    "Rotate clockwise": "Roter med klokken",
+    "Add User": "Legg til bruker",
+    "All rooms": "Alle rom",
+    "%(networkName)s rooms": "%(networkName)s-rom",
+    "Matrix rooms": "Matrix-rom",
+    "email address": "E-postadresse",
+    "Close dialog": "Lukk dialog",
+    "Notes": "Merknader",
+    "Unavailable": "Ikke tilgjengelig",
+    "Changelog": "Endringslogg",
+    "Confirm Removal": "Bekreft fjerning",
+    "Example": "Eksempel",
+    "Create": "Lag",
+    "Name": "Navn",
+    "Sign out": "Logg ut",
+    "Unknown error": "Ukjent feil",
+    "Incorrect password": "Feil passord",
+    "Session name": "Øktens navn",
+    "Back": "tilbake",
+    "Filter results": "Filtrerresultater",
+    "Toolbox": "Verktøykasse",
+    "An error has occurred.": "En feil har oppstått.",
+    "Suggestions": "Forslag",
+    "Go": "Gå",
+    "New session": "Ny økt",
+    "Refresh": "Oppdater",
+    "Email address": "E-postadresse",
+    "Skip": "Hopp over",
+    "Share Room Message": "Del rommelding",
+    "COPY": "KOPIER",
+    "Terms of Service": "Vilkår for bruk",
+    "Service": "Tjeneste",
+    "Summary": "Oppsummering",
+    "Document": "Dokument",
+    "Next": "Neste",
+    "Cancel All": "Avbryt alt",
+    "Allow": "Tillat",
+    "Deny": "Avvis",
+    "Enter recovery key": "Skriv inn gjenopprettingsnøkkel",
+    "Custom": "Tilpasset",
+    "Forward Message": "Videresend melding",
+    "Share Message": "Del melding",
+    "Report Content": "Rapporter innhold",
+    "Notification settings": "Varslingsvalg",
+    "Set status": "Sett status",
+    "Hide": "Skjul",
+    "Home": "Hjem",
+    "Sign in": "Logg inn",
+    "Help": "Hjelp",
+    "Reload": "Last på nytt",
+    "Take picture": "Ta bilde",
+    "User Status": "Brukerstatus",
+    "Code": "Kode",
+    "Submit": "Send",
+    "Email": "E-post",
+    "Username": "Brukernavn",
+    "Phone": "Telefon",
+    "Enter password": "Skriv inn passord",
+    "Enter username": "Skriv inn brukernavn",
+    "Confirm": "Bekreft",
+    "Free": "Gratis",
+    "Premium": "Premium",
+    "Featured Rooms:": "Fremhevede rom:",
+    "Everyone": "Alle",
+    "Description": "Beskrivelse",
+    "Explore": "Utforsk",
+    "Filter": "Filter",
+    "Logout": "Logg ut",
+    "Preview": "Forhåndsvisning",
+    "View": "Vis",
+    "Explore rooms": "Utforsk rom",
+    "Room": "Rom",
+    "Clear filter": "Tøm filtret",
+    "Guest": "Gjest",
+    "Go Back": "Gå tilbake",
+    "Failed to send email": "Kunne ikke sende e-post",
+    "Your password has been reset.": "Passordet ditt har blitt tilbakestilt.",
+    "Create account": "Opprett konto",
+    "Commands": "Kommandoer",
+    "Emoji": "Emoji",
+    "Users": "Brukere",
+    "verified": "bekreftet",
+    "User ID": "Brukerens ID",
+    "none": "ingen",
+    "Algorithm": "Algoritme",
+    "Export": "Eksporter",
+    "Import": "Importer",
+    "Restore": "Gjenopprett",
+    "Copy": "Kopier",
+    "Download": "Nedlastning",
+    "Retry": "Prøv igjen",
+    "Success!": "Suksess!",
+    "Set up": "Sett opp",
+    "Disable": "Slå av"
 }

From 9da57817d17c51d200e3a69a2ca96f303cce294a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 18 Mar 2020 15:50:05 -0600
Subject: [PATCH 1620/3235] Use a local wrapper for Jitsi calls

Requires https://github.com/vector-im/riot-web/pull/12780
---
 docs/jitsi.md                            |  31 +++++
 src/CallHandler.js                       |  53 ++-------
 src/SdkConfig.ts                         |   7 ++
 src/components/views/elements/AppTile.js |   8 +-
 src/utils/WidgetUtils.js                 |  32 ++++++
 src/widgets/WidgetApi.ts                 | 140 +++++++++++++++++++++++
 6 files changed, 225 insertions(+), 46 deletions(-)
 create mode 100644 docs/jitsi.md
 create mode 100644 src/widgets/WidgetApi.ts

diff --git a/docs/jitsi.md b/docs/jitsi.md
new file mode 100644
index 0000000000..3f1b6c4377
--- /dev/null
+++ b/docs/jitsi.md
@@ -0,0 +1,31 @@
+# Jitsi Wrapper
+
+**Note**: these are developer docs. Please consult your client's documentation for
+instructions on setting up Jitsi.
+
+The react-sdk wraps all Jitsi call widgets in a local wrapper called `jitsi.html`
+which takes several parameters:
+
+*Query string*:
+* `widgetId`: The ID of the widget. This is needed for communication back to the 
+  react-sdk.
+* `parentUrl`: The URL of the parent window. This is also ideally needed for
+  communication back to the react-sdk.
+
+*Hash/fragment (formatted as a query string)*:
+* `conferenceDomain`: The domain to connect Jitsi Meet to.
+* `conferenceId`: The room or conference ID to connect Jitsi Meet to.
+* `isAudioOnly`: Boolean for whether this is a voice-only conference. May not
+  be present, should default to `false`.
+* `displayName`: The display name of the user viewing the widget. May not
+  be present or could be null.
+* `avatarUrl`: The HTTP(S) URL for the avatar of the user viewing the widget. May
+  not be present or could be null.
+* `userId`: The MXID of the user viewing the widget. May not be present or could
+  be null.
+
+The react-sdk will assume that `jitsi.html` is at the path of wherever it is currently
+being served. For example, `https://riot.im/develop/jitsi.html` or `vector://webapp/jitsi.html`.
+
+The `jitsi.html` wrapper can use the react-sdk's `WidgetApi` to communicate, making
+it easier to actually implement the feature.
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 2988e90f40..4817523f0d 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -395,32 +395,6 @@ function _onAction(payload) {
 }
 
 async function _startCallApp(roomId, type) {
-    // check for a working integration manager. Technically we could put
-    // the state event in anyway, but the resulting widget would then not
-    // work for us. Better that the user knows before everyone else in the
-    // room sees it.
-    const managers = IntegrationManagers.sharedInstance();
-    let haveScalar = false;
-    if (managers.hasManager()) {
-        try {
-            const scalarClient = managers.getPrimaryManager().getScalarClient();
-            await scalarClient.connect();
-            haveScalar = scalarClient.hasCredentials();
-        } catch (e) {
-            // ignore
-        }
-    }
-
-    if (!haveScalar) {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-
-        Modal.createTrackedDialog('Could not connect to the integration server', '', ErrorDialog, {
-            title: _t('Could not connect to the integration server'),
-            description: _t('A conference call could not be started because the integrations server is not available'),
-        });
-        return;
-    }
-
     dis.dispatch({
         action: 'appsDrawer',
         show: true,
@@ -460,27 +434,16 @@ async function _startCallApp(roomId, type) {
     // the event. It's just a random string to make the Jitsi URLs unique.
     const widgetSessionId = Math.random().toString(36).substring(2);
     const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
-    // NB. we can't just encodeURICompoent all of these because the $ signs need to be there
-    // (but currently the only thing that needs encoding is the confId)
-    const queryString = [
-        'confId='+encodeURIComponent(confId),
-        'isAudioConf='+(type === 'voice' ? 'true' : 'false'),
-        'displayName=$matrix_display_name',
-        'avatarUrl=$matrix_avatar_url',
-        'email=$matrix_user_id',
-    ].join('&');
+    const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
-    let widgetUrl;
-    if (SdkConfig.get().integrations_jitsi_widget_url) {
-        // Try this config key. This probably isn't ideal as a way of discovering this
-        // URL, but this will at least allow the integration manager to not be hardcoded.
-        widgetUrl = SdkConfig.get().integrations_jitsi_widget_url + '?' + queryString;
-    } else {
-        const apiUrl = IntegrationManagers.sharedInstance().getPrimaryManager().apiUrl;
-        widgetUrl = apiUrl + '/widgets/jitsi.html?' + queryString;
-    }
+    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
 
-    const widgetData = { widgetSessionId };
+    const widgetData = {
+        widgetSessionId, // TODO: Remove this eventually
+        conferenceId: confId,
+        isAudioOnly: type === 'voice',
+        domain: jitsiDomain,
+    };
 
     const widgetId = (
         'jitsi_' +
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index 8177a6c5b8..34f3402334 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -26,6 +26,13 @@ export const DEFAULTS: ConfigOptions = {
     integrations_rest_url: "https://scalar.vector.im/api",
     // Where to send bug reports. If not specified, bugs cannot be sent.
     bug_report_endpoint_url: null,
+    // Jitsi conference options
+    jitsi: {
+        // Default conference domain
+        preferredDomain: "jitsi.riot.im",
+        // Default Jitsi Meet API location
+        externalApiUrl: "https://jitsi.riot.im/libs/external_api.min.js",
+    },
 };
 
 export default class SdkConfig {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 20d98f5e23..a26478c461 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -520,7 +520,13 @@ export default class AppTile extends React.Component {
             parsedWidgetUrl.query.react_perf = true;
         }
         let safeWidgetUrl = '';
-        if (ALLOWED_APP_URL_SCHEMES.indexOf(parsedWidgetUrl.protocol) !== -1) {
+        if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol) || (
+            // Check if the widget URL is a Jitsi widget in Electron
+            parsedWidgetUrl.protocol === 'vector:'
+            && parsedWidgetUrl.host === 'vector'
+            && parsedWidgetUrl.pathname === '/webapp/jitsi.html'
+            && this.props.type === 'jitsi'
+        )) {
             safeWidgetUrl = url.format(parsedWidgetUrl);
         }
         return safeWidgetUrl;
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index c09cd8a858..fa6bd664a2 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -430,6 +430,11 @@ export default class WidgetUtils {
             app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
         }
 
+        if (app.type === 'jitsi') {
+            console.log("Replacing Jitsi widget URL with local wrapper");
+            app.url = WidgetUtils.getLocalJitsiWrapperUrl(true);
+        }
+
         app.url = encodeUri(app.url, params);
 
         return app;
@@ -468,4 +473,31 @@ export default class WidgetUtils {
 
         return encodeURIComponent(`${widgetLocation}::${widgetUrl}`);
     }
+
+    static getLocalJitsiWrapperUrl(forLocalRender = false) {
+        // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
+        const queryString = [
+            'conferenceDomain=$domain',
+            'conferenceId=$conferenceId',
+            'isAudioOnly=$isAudioOnly',
+            'displayName=$matrix_display_name',
+            'avatarUrl=$matrix_avatar_url',
+            'userId=$matrix_user_id',
+        ].join('&');
+
+        let currentUrl = window.location.href.split('#')[0];
+        if (!currentUrl.startsWith("https://") && !forLocalRender) {
+            // Use an external wrapper if we're not locally rendering the widget. This is usually
+            // the URL that will end up in the widget event, so we want to make sure it's relatively
+            // safe to send.
+            // We'll end up using a local render URL when we see a Jitsi widget anyways, so this is
+            // really just for backwards compatibility and to appease the spec.
+            currentUrl = "https://riot.im/app"
+        }
+        if (!currentUrl.endsWith('/')) {
+            currentUrl = `${currentUrl}/`;
+        }
+
+        return currentUrl + "jitsi.html#" + queryString;
+    }
 }
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
new file mode 100644
index 0000000000..c19e34ae43
--- /dev/null
+++ b/src/widgets/WidgetApi.ts
@@ -0,0 +1,140 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+// Dev note: This is largely inspired by Dimension. Used with permission.
+// https://github.com/turt2live/matrix-dimension/blob/4f92d560266635e5a3c824606215b84e8c0b19f5/web/app/shared/services/scalar/scalar-widget.api.ts
+
+import { randomString } from "matrix-js-sdk/src/randomstring";
+
+export enum Capability {
+    Screenshot = "m.capability.screenshot",
+    Sticker = "m.sticker",
+    AlwaysOnScreen = "m.always_on_screen",
+}
+
+export enum KnownWidgetActions {
+    GetSupportedApiVersions = "supported_api_versions",
+    TakeScreenshot = "screenshot",
+    GetCapabilities = "capabilities",
+    SendEvent = "send_event",
+    UpdateVisibility = "visibility",
+    ReceiveOpenIDCredentials = "openid_credentials",
+    SetAlwaysOnScreen = "set_always_on_screen",
+}
+export type WidgetAction = KnownWidgetActions | string;
+
+export enum WidgetApiType {
+    ToWidget = "toWidget",
+    FromWidget = "fromWidget",
+}
+
+export interface WidgetRequest {
+    api: WidgetApiType;
+    widgetId: string;
+    requestId: string;
+    data: any;
+    action: WidgetAction;
+}
+
+export interface ToWidgetRequest extends WidgetRequest {
+    api: WidgetApiType.ToWidget;
+}
+
+export interface FromWidgetRequest extends WidgetRequest {
+    api: WidgetApiType.FromWidget;
+    response: any;
+}
+
+/**
+ * Handles Riot <--> Widget interactions for embedded/standalone widgets.
+ */
+export class WidgetApi {
+    private origin: string;
+    private inFlightRequests: {[requestId: string]: (reply: FromWidgetRequest) => void} = {};
+    private readyPromise: Promise<any>;
+    private readyPromiseResolve: () => void;
+
+    constructor(currentUrl: string, private widgetId: string, private requestedCapabilities: string[]) {
+        this.origin = new URL(currentUrl).origin;
+
+        this.readyPromise = new Promise<any>(resolve => this.readyPromiseResolve = resolve);
+
+        window.addEventListener("message", event => {
+            if (event.origin !== this.origin) return; // ignore: invalid origin
+            if (!event.data) return; // invalid schema
+            if (event.data.widgetId !== this.widgetId) return; // not for us
+
+            const payload = <WidgetRequest>event.data;
+            if (payload.api === WidgetApiType.ToWidget && payload.action) {
+                console.log(`[WidgetAPI] Got request: ${JSON.stringify(payload)}`);
+
+                if (payload.action === KnownWidgetActions.GetCapabilities) {
+                    this.onCapabilitiesRequest(<ToWidgetRequest>payload);
+                    this.readyPromiseResolve();
+                } else {
+                    console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
+                }
+            } else if (payload.api === WidgetApiType.FromWidget && this.inFlightRequests[payload.requestId]) {
+                console.log(`[WidgetAPI] Got reply: ${JSON.stringify(payload)}`);
+                const handler = this.inFlightRequests[payload.requestId];
+                delete this.inFlightRequests[payload.requestId];
+                handler(<FromWidgetRequest>payload);
+            } else {
+                console.warn(`[WidgetAPI] Unhandled payload: ${JSON.stringify(payload)}`);
+            }
+        });
+    }
+
+    public waitReady(): Promise<any> {
+        return this.readyPromise;
+    }
+
+    private replyToRequest(payload: ToWidgetRequest, reply: any) {
+        if (!window.parent) return;
+
+        const request = JSON.parse(JSON.stringify(payload));
+        request.response = reply;
+
+        window.parent.postMessage(request, this.origin);
+    }
+
+    private onCapabilitiesRequest(payload: ToWidgetRequest) {
+        return this.replyToRequest(payload, {capabilities: this.requestedCapabilities});
+    }
+
+    public callAction(action: WidgetAction, payload: any, callback: (reply: FromWidgetRequest) => void) {
+        if (!window.parent) return;
+
+        const request: FromWidgetRequest = {
+            api: WidgetApiType.FromWidget,
+            widgetId: this.widgetId,
+            action: action,
+            requestId: randomString(160),
+            data: payload,
+            response: {}, // Not used at this layer - it's used when the client responds
+        };
+        this.inFlightRequests[request.requestId] = callback;
+
+        console.log(`[WidgetAPI] Sending request: `, request);
+        window.parent.postMessage(request, "*");
+    }
+
+    public setAlwaysOnScreen(onScreen: boolean): Promise<any> {
+        return new Promise<any>(resolve => {
+            this.callAction(KnownWidgetActions.SetAlwaysOnScreen, {value: onScreen}, resolve);
+        });
+    }
+}

From 2a68479f5a747511b73d92a06a7a6863ec22fa5b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 18 Mar 2020 15:53:05 -0600
Subject: [PATCH 1621/3235] Remove unused strings

---
 src/i18n/strings/en_EN.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f8c8ad0200..528a4d11a5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -45,8 +45,6 @@
     "VoIP is unsupported": "VoIP is unsupported",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
-    "Could not connect to the integration server": "Could not connect to the integration server",
-    "A conference call could not be started because the integrations 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!",

From 8519a83b6139df47cef8df4b61df02d0605fb361 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 18 Mar 2020 15:58:57 -0600
Subject: [PATCH 1622/3235] Appease the linter

---
 src/CallHandler.js       | 1 -
 src/utils/WidgetUtils.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 4817523f0d..7ec4e7d8bb 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -64,7 +64,6 @@ import SdkConfig from './SdkConfig';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
-import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore, { SettingLevel } from './settings/SettingsStore';
 
 global.mxCalls = {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index fa6bd664a2..e68ec8483c 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -492,7 +492,7 @@ export default class WidgetUtils {
             // safe to send.
             // We'll end up using a local render URL when we see a Jitsi widget anyways, so this is
             // really just for backwards compatibility and to appease the spec.
-            currentUrl = "https://riot.im/app"
+            currentUrl = "https://riot.im/app";
         }
         if (!currentUrl.endsWith('/')) {
             currentUrl = `${currentUrl}/`;

From 3bb1422f93a188e2de7c09055bac2964d799ac60 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 18 Mar 2020 19:23:36 -0400
Subject: [PATCH 1623/3235] pre-send megolm keys when possible when a user
 starts typing

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

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 63e58bf738..31085ad6db 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -42,6 +42,8 @@ import {_t, _td} from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
 import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import RateLimitedFunc from '../../../ratelimitedfunc';
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -102,6 +104,12 @@ export default class SendMessageComposer extends React.Component {
         this.model = null;
         this._editorRef = null;
         this.currentlyComposedEditorState = null;
+        const cli = MatrixClientPeg.get();
+        if (cli.isCryptoEnabled() && cli.isRoomEncrypted(this.props.room.roomId)) {
+            this._prepareToEncrypt = new RateLimitedFunc(() => {
+                cli.prepareToEncrypt(this.props.room);
+            }, 60000);
+        }
     }
 
     _setEditorRef = ref => {
@@ -121,6 +129,8 @@ export default class SendMessageComposer extends React.Component {
             this.onVerticalArrow(event, true);
         } else if (event.key === Key.ARROW_DOWN) {
             this.onVerticalArrow(event, false);
+        } else if (this._prepareToEncrypt) {
+            this._prepareToEncrypt();
         }
     }
 

From 1dc30beb95aa6990c48d7bad7658d8ebda62c3ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 09:58:04 +0000
Subject: [PATCH 1624/3235] disable textarea when busy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index ad5db69947..88f7c8d404 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -1013,6 +1013,7 @@ export default class InviteDialog extends React.PureComponent {
                 ref={this._editorRef}
                 onPaste={this._onPaste}
                 autoFocus={true}
+                disabled={this.state.busy}
             />
         );
         return (

From fa6a937896b0994c3f6b8370c6f1cee8e039d8ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 09:58:49 +0000
Subject: [PATCH 1625/3235] don't block onFinished as there are other ways to
 close modal

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 88f7c8d404..f0d5443cac 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -648,13 +648,6 @@ export default class InviteDialog extends React.PureComponent {
         });
     };
 
-    _cancel = () => {
-        // We do not want the user to close the dialog while an action is in progress
-        if (this.state.busy) return;
-
-        this.props.onFinished();
-    };
-
     _onKeyDown = (e) => {
         // when the field is empty and the user hits backspace remove the right-most target
         if (!e.target.value && !this.state.busy && this.state.targets.length > 0 && e.key === Key.BACKSPACE &&
@@ -907,7 +900,7 @@ export default class InviteDialog extends React.PureComponent {
     _onManageSettingsClick = (e) => {
         e.preventDefault();
         dis.dispatch({ action: 'view_user_settings' });
-        this._cancel();
+        this.props.onFinished();
     };
 
     _renderSection(kind: "recents"|"suggestions") {
@@ -1107,7 +1100,7 @@ export default class InviteDialog extends React.PureComponent {
             <BaseDialog
                 className='mx_InviteDialog'
                 hasCancel={true}
-                onFinished={this._cancel}
+                onFinished={this.props.onFinished}
                 title={title}
             >
                 <div className='mx_InviteDialog_content'>

From b6755234497c5fa4d480ef69793f0d550a76507a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 10:45:08 +0000
Subject: [PATCH 1626/3235] Fix custom tags causing left panel to over-expand

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_LeftPanel.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 85fdfa092d..fdd671b78c 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -36,6 +36,7 @@ limitations under the License.
 .mx_LeftPanel_tagPanelContainer {
     flex: 0 0 70px;
     height: 100%;
+    display: -webkit-box;
 }
 
 .mx_LeftPanel_hideButton {

From f0fdd8444372c62601e89124df1cf19e5d99f7c9 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 18 Mar 2020 22:08:14 +0000
Subject: [PATCH 1627/3235] Translated using Weblate (Albanian)

Currently translated at 99.6% (2163 of 2171 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 | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 912f75e361..a6e8bb10a5 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2194,5 +2194,28 @@
     "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)",
     "Review Sessions": "Shqyrtoni Sesione",
     "Local address": "Adresë vendore",
-    "Published Addresses": "Adresa të Publikuara"
+    "Published Addresses": "Adresa të Publikuara",
+    "Scroll to most recent messages": "Rrëshqit te mesazhet më të freskët",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Adresat e publikuara mund të përdoren nga cilido në çfarëdo shërbyesi për të hyrë në dhomën tuaj. Që të publikoni një adresë, lypset së pari të caktohet si adresë vendore.",
+    "Other published addresses:": "Adresa të tjera të publikuara:",
+    "No other published addresses yet, add one below": "Ende pa adresa të tjera të publikuara, shtoni një më poshtë",
+    "New published address (e.g. #alias:server)": "Adresë e re e publikuar (p.sh., #alias:server)",
+    "Local Addresses": "Adresa Vendore",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Caktoni adresa për këtë dhomë, që kështu përdoruesit të gjejnë këtë dhomë përmes shërbyesit tuaj Home (%(localDomain)s)",
+    "Enter a server name": "Jepni një emër shërbyesi",
+    "Looks good": "Duket mirë",
+    "Can't find this server or its room list": "S’gjendet dot ky shërbyes ose lista e dhomave të tij",
+    "All rooms": "Krejt dhomat",
+    "Your server": "Shërbyesi juaj",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Jeni i sigurt se doni të hiqet <b>%(serverName)s</b>",
+    "Remove server": "Hiqe shërbyesin",
+    "Add a new server": "Shtoni një shërbyes të ri",
+    "Enter the name of a new server you want to explore.": "Jepni emrin e një shërbyesi të ri që doni të eksploroni.",
+    "Server name": "Emër shërbyesi",
+    "Add a new server...": "Shtoni një shërbyes të ri…",
+    "%(networkName)s rooms": "Dhoma %(networkName)s",
+    "Matrix rooms": "Dhoma Matrix",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Hapni një sesion ekzistues & përdoreni për të verifikuar këtë këtu, duke i akorduar hyrje te mesazhe të fshehtëzuar.",
+    "Waiting…": "Po pritet…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Nëse s’hapni dot një, <button>përdorni kyçin ose frazëkalimin tuaj të rimarrjes.</button>"
 }

From 847b96ac67c961ea6b99a3fe515fee897daa3468 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 19 Mar 2020 08:12:09 +0000
Subject: [PATCH 1628/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2171 of 2171 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 | 45 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index f326faa3f7..9edad65ff9 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2175,5 +2175,48 @@
     "Mark all as read": "Markatu denak irakurrita gisa",
     "Not currently indexing messages for any room.": "Orain ez da inolako gelako mezurik indexatzen.",
     "Currently indexing: %(currentRoom)s.": "Orain indexatzen: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
+    "Review Sessions": "Berrikusi saioak",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du%(oldRoomName)s izatetik %(newRoomName)s izatera.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak gehitu dizkio gela honi.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s erabiltzaileak %(addresses)s helbideak gehitu dizkio gela honi.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s erabiltzaileak %(addresses)s helbideak kendu dizkio gela honi.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak kendu dizkio gela honi.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen ordezko helbideak aldatu ditu.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbide nagusia eta ordezko helbideak aldatu ditu.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbideak aldatu ditu.",
+    "Support adding custom themes": "Gai pertsonalizatua gehitzea onartzen du",
+    "Invalid theme schema.": "Baliogabeko gai eskema.",
+    "Error downloading theme information.": "Errorea gaiaren informazioa deskargatzean.",
+    "Theme added!": "Gaia gehituta!",
+    "Custom theme URL": "Gai pertsonalizatuaren URLa",
+    "Add theme": "Gehitu gaia",
+    "Scroll to most recent messages": "Korritu azken mezuetara",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da gelaren ordezko helbideak eguneratzean. Agian zerbitzariak ez du onartzen edo une bateko akatsa izan da.",
+    "You don't have permission to delete the alias.": "Ez duzu ezizena ezabatzeko baimenik.",
+    "Local address": "Helbide lokala",
+    "Published Addresses": "Argitaratutako helbideak",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Argitaratutako helbideak edonork erabili ditzake edozein zerbitzaritik zure gelara elkartzeko. Helbide bat argitaratzeko aurretik helbide lokal gisa ezarri behar da.",
+    "Other published addresses:": "Argitaratutako beste helbideak:",
+    "No other published addresses yet, add one below": "Ez dago argitaratutako beste helbiderik, gehitu bat azpian",
+    "New published address (e.g. #alias:server)": "Argitaratutako helbide berria (adib. #ezizena:zerbitzaria)",
+    "Local Addresses": "Helbide lokalak",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Ezarri gela honen helbideak erabiltzaileek gela aurki dezaten zure hasiera-zerbitzariaren bidez (%(localDomain)s)",
+    "Enter a server name": "Sartu zerbitzari-izena",
+    "Looks good": "Itxura ona du",
+    "Can't find this server or its room list": "Ezin da zerbitzaria aurkitu edo honen gelen zerrenda",
+    "All rooms": "Gela guztiak",
+    "Your server": "Zure zerbitzaria",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ziur <b>%(serverName)s</b> kendu nahi duzula",
+    "Remove server": "Kendu zerbitzaria",
+    "Matrix": "Matrix",
+    "Add a new server": "Gehitu zerbitzari berria",
+    "Enter the name of a new server you want to explore.": "Sartu arakatu nahi duzun zerbitzari berriaren izena.",
+    "Server name": "Zerbitzari-izena",
+    "Add a new server...": "Gehitu zerbitzari berria...",
+    "%(networkName)s rooms": "%(networkName)s(e)ko gelak",
+    "Matrix rooms": "Matrix gelak",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ireki badagoen saio bat eta erabili hura hau egiaztatzeko, mezu zifratuetara sarbidea emanez.",
+    "Waiting…": "Itxaroten…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ezin baduzu bat atzitu, <button>erabili berreskuratze gakoa edo pasahitza.</button>"
 }

From b3d447d5831d2deb043e23b8503b607b455b85e9 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 19 Mar 2020 03:33:34 +0000
Subject: [PATCH 1629/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2171 of 2171 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 4ebdb441de..148f301fd3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2215,5 +2215,19 @@
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "為此聊天室設定位置讓使用者可以透過您的家伺服器找到此聊天室 (%(localDomain)s)",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "開啟既有的工作階段並使用它來驗證此工作階段，並授予其存取已加密訊息的權限。",
     "Waiting…": "等待中……",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "如果您無法存取裝置，<button>使用您的復原金鑰或通關密語。</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "如果您無法存取裝置，<button>使用您的復原金鑰或通關密語。</button>",
+    "Enter a server name": "輸入伺服器名稱",
+    "Looks good": "看起來不錯",
+    "Can't find this server or its room list": "找不到此伺服器或其聊天室清單",
+    "All rooms": "所有聊天室",
+    "Your server": "您的伺服器",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "您確定您想要移除 <b>%(serverName)s</b> 嗎",
+    "Remove server": "移除伺服器",
+    "Matrix": "Matrix",
+    "Add a new server": "加入新的伺服器",
+    "Enter the name of a new server you want to explore.": "輸入您想要探索的新伺服器的名稱。",
+    "Server name": "伺服器名稱",
+    "Add a new server...": "加入新的伺服器……",
+    "%(networkName)s rooms": "%(networkName)s 聊天室",
+    "Matrix rooms": "Matrix 聊天室"
 }

From b49c02709a61edfcbdd5ed8167083f34411f035a Mon Sep 17 00:00:00 2001
From: Miro Rauhala <miro.rauhala.99@gmail.com>
Date: Thu, 19 Mar 2020 00:21:52 +0000
Subject: [PATCH 1630/3235] Translated using Weblate (Finnish)

Currently translated at 90.7% (1969 of 2171 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index a6ad64a55d..0d21381f55 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -399,7 +399,7 @@
     "Authentication check failed: incorrect password?": "Autentikointi epäonnistui: virheellinen salasana?",
     "Do you want to set an email address?": "Haluatko asettaa sähköpostiosoitteen?",
     "This will allow you to reset your password and receive notifications.": "Tämä sallii sinun uudelleenalustaa salasanasi ja vastaanottaa ilmoituksia.",
-    "Skip": "Hyppää yli",
+    "Skip": "Ohita",
     "Start verification": "Aloita varmennus",
     "Share without verifying": "Jaa ilman varmennusta",
     "Ignore request": "Jätä pyyntö huomioimatta",
@@ -1986,5 +1986,28 @@
     "Space used:": "Käytetty tila:",
     "Indexed messages:": "Indeksoidut viestit:",
     "Indexed rooms:": "Indeksoidut huoneet:",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
+    "Your user agent": "Käyttäjäagenttisi",
+    "Verify this session": "Vahvista tämä istunto",
+    "Set up encryption": "Ota salaus käyttöön",
+    "Unverified session": "Vahvistamaton istunto",
+    "Sign In or Create Account": "Kirjaudu sisään tai luo tili",
+    "Use your account or create a new one to continue.": "Käytä tiliäsi tai luo uusi jatkaaksesi.",
+    "Create Account": "Luo tili",
+    "Session already verified!": "Istunto on jo vahvistettu!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROITUS: Istunto on jo vahvistettu, mutta avaimet EIVÄT VASTAA!",
+    "Not Trusted": "Ei luotettu",
+    "Ask this user to verify their session, or manually verify it below.": "Pyydä tätä käyttäjää vahvistamaan heidän istuntonsa, tai manuaalisesti vahvista se alla.",
+    "Manually Verify": "Manuaalisesti vahvista",
+    "a few seconds from now": "muutama sekunti sitten",
+    "about a minute from now": "noin minuutti sitten",
+    "%(num)s minutes from now": "%(num)s minuuttia sitten",
+    "about an hour from now": "noin tunti sitten",
+    "%(num)s hours from now": "%(num)s tuntia sitten",
+    "about a day from now": "noin päivä sitten",
+    "%(num)s days from now": "%(num)s päivää sitten",
+    "Show padlocks on invite only rooms": "Näytä lukko vain-kutsu huoneissa",
+    "Never send encrypted messages to unverified sessions from this session": "Älä koskaan lähetä salattuja viestejä vahvistamattomiin istuntoihin tästä istunnosta",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Älä lähetä salattuja viestejä vahvistamattomiin istuntoihin tässä huoneessa tässä istunnossa",
+    "Order rooms by name": "Suodata huoneet nimellä"
 }

From 2a62c7bdf9b081025e2dd933bdcd7dbb1a466649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 19 Mar 2020 07:21:12 +0000
Subject: [PATCH 1631/3235] Translated using Weblate (French)

Currently translated at 100.0% (2171 of 2171 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 6ad6a6b011..4d52d8ae09 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2216,5 +2216,19 @@
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Définissez les adresses de ce salon pour que les utilisateurs puissent trouver ce salon avec votre serveur d’accueil (%(localDomain)s)",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ouvrez une session existante et utilisez-la pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
     "Waiting…": "Patientez…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Si vous n’avez accès à aucune session, <button>utilisez votre clé de récupération ou votre phrase de passe.</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Si vous n’avez accès à aucune session, <button>utilisez votre clé de récupération ou votre phrase de passe.</button>",
+    "Enter a server name": "Saisissez le nom d’un serveur",
+    "Looks good": "Ça a l’air correct",
+    "Can't find this server or its room list": "Impossible de trouver ce serveur ou sa liste de salons",
+    "All rooms": "Tous les salons",
+    "Your server": "Votre serveur",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Voulez-vous vraiment supprimer <b>%(serverName)s</b>",
+    "Remove server": "Supprimer le serveur",
+    "Matrix": "Matrix",
+    "Add a new server": "Ajouter un nouveau serveur",
+    "Enter the name of a new server you want to explore.": "Saisissez le nom du nouveau serveur que vous voulez explorer.",
+    "Server name": "Nom du serveur",
+    "Add a new server...": "Ajouter un nouveau serveur…",
+    "%(networkName)s rooms": "%(networkName)s salons",
+    "Matrix rooms": "Salons Matrix"
 }

From 937a9fe551fa510ba0250bcb92ce818fe37bec35 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 19 Mar 2020 08:50:37 +0000
Subject: [PATCH 1632/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2171 of 2171 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 6614a7aa6d..c4d6d2e512 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2213,5 +2213,19 @@
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Imposta gli indirizzi per la stanza affinché gli utenti la trovino attraverso il tuo homeserver (%(localDomain)s)",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Apri una sessione esistente e usala per verificare questa, dandole accesso ai messaggi cifrati.",
     "Waiting…": "In attesa…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se non puoi accedere a nessuna, <button>usa la chiave di recupero o la password.</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se non puoi accedere a nessuna, <button>usa la chiave di recupero o la password.</button>",
+    "Enter a server name": "Inserisci il nome di un server",
+    "Looks good": "Sembra giusto",
+    "Can't find this server or its room list": "Impossibile trovare questo server o l'elenco delle sue stanze",
+    "All rooms": "Tutte le stanze",
+    "Your server": "Il tuo server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Sei sicuro di volere rimuovere <b>%(serverName)s</b>",
+    "Remove server": "Rimuovi server",
+    "Matrix": "Matrix",
+    "Add a new server": "Aggiungi un nuovo server",
+    "Enter the name of a new server you want to explore.": "Inserisci il nome di un nuovo server che vuoi esplorare.",
+    "Server name": "Nome server",
+    "Add a new server...": "Aggiungi un nuovo server...",
+    "%(networkName)s rooms": "Stanze di %(networkName)s",
+    "Matrix rooms": "Stanze di Matrix"
 }

From c5a6f6390d5398ed0ebbfe9267ec390c44d75bf2 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Thu, 19 Mar 2020 01:35:42 +0000
Subject: [PATCH 1633/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 38.6% (838 of 2171 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 15f1372fb4..f16ff2a771 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -231,7 +231,7 @@
     "Actions": "Handlinger",
     "Advanced": "Avansert",
     "Other": "Andre",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Forbereder ¯\\_(ツ)_/¯ til en ren-tekst melding",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Føyer til ¯\\_(ツ)_/¯ på en råtekstmelding",
     "You do not have the required permissions to use this command.": "Du har ikke de rette tilgangene til å bruke denne kommandoen.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Advarsel</b>: Oppgradering av et rom vil <i>ikke automatisk migrere rom medlemmer til den nye versjonen av rommet.</i> Vi legger ut en lenke til det nye rommet i den gamle versjonen av rommet - rom medlemmer må klikke på denne lenken for å bli med i det nye rommet.",
     "Changes your avatar in all rooms": "Endrer avataren din i alle rom",
@@ -249,7 +249,7 @@
     "Ignored user": "Ignorert(e) bruker",
     "You are now ignoring %(userId)s": "%(userId)s er nå ignorert",
     "Stops ignoring a user, showing their messages going forward": "Fjerner ignorering av bruker og viser meldingene fra nå av",
-    "Unignored user": "Ikke ignorert bruker",
+    "Unignored user": "Uignorert bruker",
     "You are no longer ignoring %(userId)s": "%(userId)s blir ikke lengre ignorert",
     "Define the power level of a user": "Definer tilgangnivå til en bruker",
     "Deops user with given id": "Fjerner OP nivå til bruker med gitt ID",
@@ -542,5 +542,306 @@
     "Retry": "Prøv igjen",
     "Success!": "Suksess!",
     "Set up": "Sett opp",
-    "Disable": "Slå av"
+    "Disable": "Slå av",
+    "Review Sessions": "Gå gjennom økter",
+    "Identity server has no terms of service": "Identitetstjeneren har ingen brukervilkår",
+    "Enable Emoji suggestions while typing": "Skru på emoji-forslag mens du skriver",
+    "Use compact timeline layout": "Bruk det kompakte tidslinjeoppsettet",
+    "Show a placeholder for removed messages": "Vis en stattholder for fjernede meldinger",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Vis meldinger om innvielser/forlatinger (ekskl. invitasjoner/sparkinger/bannlysninger)",
+    "Show avatar changes": "Vis avatarendringer",
+    "Show display name changes": "Vis visningsnavnendringer",
+    "Show read receipts sent by other users": "Vis lesekvitteringer sendt av andre brukere",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidsstempler i 12-timersformat (f.eks. 2:30pm)",
+    "Always show message timestamps": "Alltid vis meldingenes tidsstempler",
+    "Autoplay GIFs and videos": "Auto-avspill GIF-er og videoer",
+    "Always show encryption icons": "Alltid vis krypteringsikoner",
+    "Enable automatic language detection for syntax highlighting": "Skru på automatisk kodespråkoppdagelse for syntaksfremheving",
+    "Show avatars in user and room mentions": "Vis avatarer i bruker- og romnevninger",
+    "Enable big emoji in chat": "Skru på store emojier i chatrom",
+    "Send typing notifications": "Send varsler om at du skriver",
+    "Show typing notifications": "Vis varsler om at det skrives",
+    "Automatically replace plain text Emoji": "Bytt automatisk ut råtekst-emojier",
+    "Mirror local video feed": "Speil den lokale videostrømmen",
+    "Enable Community Filter Panel": "Skru på samfunnsfilterpanelet",
+    "Match system theme": "Bind fast til systemtemaet",
+    "Allow Peer-to-Peer for 1:1 calls": "Tillat P2P for samtaler under fire øyne",
+    "Send analytics data": "Send analytiske data",
+    "Enable inline URL previews by default": "Skru på URL-forhåndsvisninger inni meldinger som standard",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Si ifra før det sendes invitasjoner til potensielt ugyldig Matrix-ID-er",
+    "Show developer tools": "Vis utviklerverktøy",
+    "Order rooms by name": "Sorter rom etter navn",
+    "Show rooms with unread notifications first": "Vis rom med uleste varsler først",
+    "Show shortcuts to recently viewed rooms above the room list": "Vis snarveier til de nyligst viste rommene ovenfor romlisten",
+    "Show hidden events in timeline": "Vis skjulte hendelser i tidslinjen",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Tillat tilbakefalloppringingsassistenttjeneren turn.matrix.org dersom hjemmetjeneren din ikke tilbyr en (IP-adressen din ville blitt delt under en samtale)",
+    "Show previews/thumbnails for images": "Vis forhåndsvisninger for bilder",
+    "Messages containing my username": "Meldinger som nevner brukernavnet mitt",
+    "Messages containing @room": "Medlinger som inneholder @room",
+    "Encrypted messages in one-to-one chats": "Krypterte meldinger i samtaler under fire øyne",
+    "Encrypted messages in group chats": "Krypterte meldinger i gruppesamtaler",
+    "When rooms are upgraded": "Når rom blir oppgradert",
+    "My Ban List": "Min bannlysningsliste",
+    "Verified!": "Verifisert!",
+    "Got It": "Skjønner",
+    "Scan this unique code": "Skann denne unike koden",
+    "or": "eller",
+    "Lion": "Løve",
+    "Pig": "Gris",
+    "Rabbit": "Kanin",
+    "Rooster": "Hane",
+    "Turtle": "Skilpadde",
+    "Butterfly": "Sommerfugl",
+    "Tree": "Tre",
+    "Cactus": "Kaktus",
+    "Globe": "Klode",
+    "Heart": "Hjerte",
+    "Smiley": "Smilefjes",
+    "Hat": "Hatt",
+    "Thumbs up": "Tommel opp",
+    "Hourglass": "Timeglass",
+    "Gift": "Gave",
+    "Light bulb": "Lyspære",
+    "Paperclip": "Binders",
+    "Telephone": "Telefon",
+    "Rocket": "Rakett",
+    "Trophy": "Trofé",
+    "Ball": "Ball",
+    "Guitar": "Gitar",
+    "Later": "Senere",
+    "Accept <policyLink /> to continue:": "Aksepter <policyLink /> for å fortsette:",
+    "Public Name": "Offentlig navn",
+    "Last seen": "Sist sett",
+    "Algorithm: ": "Algoritme: ",
+    "Enable desktop notifications for this session": "Skru på skrivebordsvarsler for denne økten",
+    "Show message in desktop notification": "Vis meldingen i skrivebordsvarselet",
+    "Enable audible notifications for this session": "Skru på hørbare varsler for denne økten",
+    "Profile picture": "Profilbilde",
+    "Checking server": "Sjekker tjeneren",
+    "Change identity server": "Bytt ut identitetstjener",
+    "You should:": "Du burde:",
+    "Identity Server": "Identitetstjener",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Å bruke en identitetstjener er valgfritt. Dersom du velger å ikke en identitetstjener, vil du ikke kunne oppdages av andre brukere, og du vil ikke kunne invitere andre ut i fra E-postadresse eller telefonnummer.",
+    "Do not use an identity server": "Ikke bruk en identitetstjener",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler <b>(%(serverName)s)</b> til å behandle botter, moduler, og klistremerkepakker.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Bruk en integreringsbehandler til å behandle botter, moduler, og klistremerkepakker.",
+    "Manage integrations": "Behandle integreringer",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integreringsbehandlere mottar oppsettsdata, og kan endre på moduler, sende rominvitasjoner, og bestemme styrkenivåer på dine vegne.",
+    "Flair": "Merkeskilt",
+    "Theme added!": "Temaet er lagt til!",
+    "Set a new account password...": "Velg et nytt kontopassord …",
+    "Add theme": "Legg til tema",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Godkjenn identitetstjenerens (%(serverName)s) brukervilkår, slik at du kan bli oppdaget ut i fra E-postadresse eller telefonnummer.",
+    "Account management": "Kontobehandling",
+    "Deactivating your account is a permanent action - be careful!": "Å deaktivere kontoen din er en permanent handling - vær forsiktig!",
+    "Deactivate Account": "Deaktiver kontoen",
+    "Discovery": "Oppdagelse",
+    "Deactivate account": "Deaktiver kontoen",
+    "Check for update": "Let etter oppdateringer",
+    "Help & About": "Hjelp/Om",
+    "Bug reporting": "Feilrapportering",
+    "riot-web version:": "'riot-web'-versjon:",
+    "olm version:": "olm-versjon:",
+    "click to reveal": "klikk for å avsløre",
+    "Ignored/Blocked": "Ignorert/Blokkert",
+    "Server rules": "Tjenerregler",
+    "User rules": "Brukerregler",
+    "View rules": "Vis reglene",
+    "Ignored users": "Ignorerte brukere",
+    "⚠ These settings are meant for advanced users.": "⚠ Disse innstillingene er ment for avanserte brukere.",
+    "Room list": "Romliste",
+    "Autocomplete delay (ms)": "Autofullføringsforsinkelse (ms)",
+    "Unignore": "Opphev ignorering",
+    "Cryptography": "Kryptografi",
+    "Session ID:": "Økt-ID:",
+    "Session key:": "Øktnøkkel:",
+    "Key backup": "Nøkkel-sikkerhetskopiering",
+    "Message search": "Meldingssøk",
+    "A session's public name is visible to people you communicate with": "Det offentlige navnet til en økt er synlig for folkene du kommuniserer med",
+    "No media permissions": "Ingen mediatillatelser",
+    "Missing media permissions, click the button below to request.": "Manglende mediatillatelser, klikk på knappen nedenfor for å be om dem.",
+    "Request media permissions": "Be om mediatillatelser",
+    "No Audio Outputs detected": "Ingen lydutdataer ble oppdaget",
+    "No Microphones detected": "Ingen mikrofoner ble oppdaget",
+    "No Webcams detected": "Ingen USB-kameraer ble oppdaget",
+    "Default Device": "Standardenhet",
+    "Audio Output": "Lydutdata",
+    "Microphone": "Mikrofon",
+    "Voice & Video": "Stemme og video",
+    "this room": "dette rommet",
+    "Room information": "Rominformasjon",
+    "Room version": "Romversjon",
+    "Room version:": "Romversjon:",
+    "Developer options": "Utviklerverktøy",
+    "Open Devtools": "Åpne utviklerverktøy",
+    "Room Addresses": "Rom-adresser",
+    "URL Previews": "URL-forhåndsvisninger",
+    "Sounds": "Lyder",
+    "Notification sound": "Varslingslyd",
+    "Set a new custom sound": "Velg en ny selvvalgt lyd",
+    "Change permissions": "Endre tillatelser",
+    "Change topic": "Endre samtaletema",
+    "Upgrade the room": "Oppgrader rommet",
+    "Modify widgets": "Endre på moduler",
+    "Banned by %(displayName)s": "Bannlyst av %(displayName)s",
+    "Send messages": "Send meldinger",
+    "Invite users": "Inviter brukere",
+    "Change settings": "Endre innstillinger",
+    "Kick users": "Spark ut brukere",
+    "Ban users": "Bannlys brukere",
+    "Remove messages": "Fjern meldinger",
+    "Roles & Permissions": "Roller og tillatelser",
+    "Enable encryption?": "Vil du skru på kryptering?",
+    "Click here to fix": "Klikk her for å fikse det",
+    "Add a widget": "Legg til en modul",
+    "Drop File Here": "Slipp ned filen her",
+    "Drop file here to upload": "Slipp ned en fil her for å laste opp",
+    " (unsupported)": " (ikke støttet)",
+    "Edit message": "Rediger meldingen",
+    "Unencrypted": "Ukryptert",
+    "device id: ": "enhets-id: ",
+    "Disinvite": "Trekk tilbake invitasjon",
+    "Kick": "Spark ut",
+    "Deactivate user?": "Vil du deaktivere brukeren?",
+    "Deactivate user": "Deaktiver brukeren",
+    "Voice call": "Stemmesamtale",
+    "Video call": "Videosamtale",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)st",
+    "%(duration)sd": "%(duration)sd",
+    "Join Room": "Bli med i rommet",
+    "Forget room": "Glem rommet",
+    "Share room": "Del rommet",
+    "Invites": "Invitasjoner",
+    "Low priority": "Lavprioritet",
+    "Historical": "Historisk",
+    "This room": "Dette rommet",
+    "Loading …": "Laster inn …",
+    "Forget this room": "Glem dette rommet",
+    "Re-join": "Bli med igjen",
+    "Join the discussion": "Bli med i diskusjonen",
+    "<userName/> wants to chat": "<userName/> ønsker å chatte",
+    "<userName/> invited you": "<userName/> inviterte deg",
+    "%(roomName)s does not exist.": "%(roomName)s eksisterer ikke.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s er ikke tilgjengelig for øyeblikket.",
+    "Never lose encrypted messages": "Aldri mist krypterte beskjeder",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldinger i dette rommet er sikret med start-til-mål-kryptering. Bare du og mottakeren(e) har nøklene til å lese disse beskjedene.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Ta sikkerhetskopier av nøklene dine på en sikker måte for å unngå å miste dem <a>Lær mer.</a>",
+    "Don't ask me again": "Ikke spør meg igjen",
+    "This Room": "Dette rommet",
+    "Server error": "Serverfeil",
+    "Stickerpack": "Klistremerkepakke",
+    "Main address": "Hovedadresse",
+    "not specified": "ikke spesifisert",
+    "Local address": "Lokal adresse",
+    "Published Addresses": "Publiserte adresser",
+    "Local Addresses": "Lokale adresser",
+    "Accepting…": "Aksepterer …",
+    "Hide sessions": "Skjul økter",
+    "Show image": "Vis bilde",
+    "You accepted": "Du aksepterte",
+    "You declined": "Du avslo",
+    "You cancelled": "Du avbrøt",
+    "Accepting …": "Aksepterer …",
+    "Declining …": "Avslår …",
+    "edited": "redigert",
+    "You're not currently a member of any communities.": "Du er ikke medlem av noen samfunn for øyeblikket.",
+    "Yes, I want to help!": "Ja, jeg vil hjelpe til!",
+    "What's new?": "Hva er nytt?",
+    "Set Password": "Bestem passord",
+    "Your user ID": "Din bruker-ID",
+    "Your theme": "Ditt tema",
+    "Riot URL": "Riot-URL",
+    "Room ID": "Rom-ID",
+    "Widget ID": "Modul-ID",
+    "Delete Widget": "Slett modul",
+    "Delete widget": "Slett modul",
+    "No results": "Ingen treff",
+    "Rotate Left": "Roter til venstre",
+    "Rotate Right": "Roter til høyre",
+    "were invited %(count)s times|one": "ble invitert",
+    "was invited %(count)s times|one": "ble invitert",
+    "were banned %(count)s times|one": "ble bannlyst",
+    "was banned %(count)s times|one": "ble bannlyst",
+    "were kicked %(count)s times|one": "ble sparket ut",
+    "was kicked %(count)s times|one": "ble sparket ut",
+    "Power level": "Styrkenivå",
+    "e.g. my-room": "f.eks. mitt-rom",
+    "Enter a server name": "Skriv inn et tjenernavn",
+    "Looks good": "Ser bra ut",
+    "Your server": "Tjeneren din",
+    "Add a new server": "Legg til en ny tjener",
+    "Server name": "Tjenernavn",
+    "Matrix ID": "Matrix-ID",
+    "Matrix Room ID": "Matrix-rom-ID",
+    "That doesn't look like a valid email address": "Det ser ikke ut som en gyldig E-postadresse",
+    "Thank you!": "Tusen takk!",
+    "Removing…": "Fjerner …",
+    "Community ID": "Samfunns-ID",
+    "example": "eksempel",
+    "Create Room": "Opprett et rom",
+    "Session ID": "Økt-ID",
+    "Session key": "Øktnøkkel",
+    "Updating Riot": "Oppdaterer Riot",
+    "Message edits": "Meldingsredigeringer",
+    "This wasn't me": "Det var ikke meg",
+    "Send report": "Send inn rapport",
+    "Checking...": "Sjekker …",
+    "Upload files": "Last opp filer",
+    "Upload all": "Last opp alle",
+    "Upload Error": "Opplastingsfeil",
+    "Verification Request": "Verifiseringsforespørsel",
+    "No backup found!": "Ingen sikkerhetskopier ble funnet!",
+    "Backup restored": "Sikkerhetskopien ble gjenopprettet",
+    "Update status": "Oppdater statusen",
+    "Country Dropdown": "Nedfallsmeny over land",
+    "Server Name": "Tjenernavn",
+    "Sign in with": "Logg inn med",
+    "Passwords don't match": "Passordene samsvarer ikke",
+    "Email (optional)": "E-post (valgfritt)",
+    "Phone (optional)": "Telefonnummer (valgfritt)",
+    "Homeserver URL": "Hjemmetjener-URL",
+    "Identity Server URL": "Identitetstjener-URL",
+    "Other servers": "Andre tjenere",
+    "Add a Room": "Legg til et rom",
+    "Add a User": "Legg til en bruker",
+    "Leave Community": "Forlat samfunnet",
+    "Leave %(groupName)s?": "Vil du forlate %(groupName)s?",
+    "Community Settings": "Samfunnsinnstillinger",
+    "Join this community": "Bli med i dette samfunnet",
+    "Leave this community": "Forlat dette samfunnet",
+    "Upload avatar": "Last opp en avatar",
+    "Terms and Conditions": "Betingelser og vilkår",
+    "Your Communities": "Dine samfunn",
+    "Create a new community": "Opprett et nytt samfunn",
+    "Find a room…": "Finn et rom …",
+    "Add room": "Legg til et rom",
+    "Search failed": "Søket mislyktes",
+    "No more results": "Ingen flere resultater",
+    "Fill screen": "Fyll skjermen",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Your profile": "Din profil",
+    "Waiting…": "Venter …",
+    "Session verified": "Økten er verifisert",
+    "Sign in instead": "Logg inn i stedet",
+    "I have verified my email address": "Jeg har verifisert E-postadressen min",
+    "Return to login screen": "Gå tilbake til påloggingsskjermen",
+    "Set a new password": "Velg et nytt passord",
+    "Upload an avatar:": "Last opp en avatar:",
+    "You're signed out": "Du er logget av",
+    "Results from DuckDuckGo": "Resultater fra DuckDuckGo",
+    "DuckDuckGo Results": "DuckDuckGo-resultater",
+    "unknown device": "ukjent enhet",
+    "Device ID": "Enhets-ID",
+    "Verification": "Verifisering",
+    "unencrypted": "ukryptert",
+    "Event information": "Hendelsesinformasjon",
+    "File to import": "Filen som skal importeres",
+    "Your recovery key": "Din gjenopprettingsnøkkel",
+    "Upgrade your encryption": "Oppgrader krypteringen din",
+    "Starting backup...": "Begynner sikkerhetskopieringen …",
+    "Don't ask again": "Ikke spør igjen",
+    "Space used:": "Plass brukt:",
+    "Indexed rooms:": "Indekserte rom:"
 }

From bea6787201f70ede73ec16c9ca4d1a8d8f307409 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 11:39:00 +0000
Subject: [PATCH 1634/3235] Fix left left panel betterer

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_LeftPanel.scss | 1 -
 res/css/structures/_TagPanel.scss  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index fdd671b78c..85fdfa092d 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -36,7 +36,6 @@ limitations under the License.
 .mx_LeftPanel_tagPanelContainer {
     flex: 0 0 70px;
     height: 100%;
-    display: -webkit-box;
 }
 
 .mx_LeftPanel_hideButton {
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 03f5ce230c..472831c0d9 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -23,7 +23,7 @@ limitations under the License.
     flex-direction: column;
     align-items: center;
     justify-content: space-between;
-    height: 100%;
+    min-height: 0;
 }
 
 .mx_TagPanel_items_selected {

From fb462585280a1f4dff9b0a3b64154b068e52791c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 13:57:36 +0000
Subject: [PATCH 1635/3235] we don't do mx_fadable anymore so get rid of broken
 RLS disabling

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/GroupView.js       | 4 ----
 src/components/views/rooms/ForwardMessage.js | 2 --
 src/stores/RightPanelStore.js                | 9 +--------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index cadc511fc3..0d10dd6d8f 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -555,10 +555,6 @@ export default createReactClass({
                         GROUP_JOINPOLICY_INVITE,
             },
         });
-        dis.dispatch({
-            action: 'panel_disable',
-            sideDisabled: true,
-        });
     },
 
     _onShareClick: function() {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index c7c954dc9f..78466f7cb5 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -33,7 +33,6 @@ export default createReactClass({
     componentWillMount: function() {
         dis.dispatch({
             action: 'panel_disable',
-            rightDisabled: true,
             middleDisabled: true,
         });
     },
@@ -45,7 +44,6 @@ export default createReactClass({
     componentWillUnmount: function() {
         dis.dispatch({
             action: 'panel_disable',
-            sideDisabled: false,
             middleDisabled: false,
         });
         document.removeEventListener('keydown', this._onKeyDown);
diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 1b3cb3d64b..ccdeb006f4 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -42,8 +42,6 @@ const GROUP_PHASES = Object.keys(RIGHT_PANEL_PHASES).filter(k => k.startsWith("G
 export default class RightPanelStore extends Store {
     static _instance;
 
-    _inhibitUpdates = false;
-
     constructor() {
         super(dis);
 
@@ -116,11 +114,6 @@ export default class RightPanelStore extends Store {
     }
 
     __onDispatch(payload) {
-        if (payload.action === 'panel_disable') {
-            this._inhibitUpdates = payload.rightDisabled || payload.sideDisabled || false;
-            return;
-        }
-
         if (payload.action === 'view_room' || payload.action === 'view_group') {
             // Reset to the member list if we're viewing member info
             const memberInfoPhases = [
@@ -138,7 +131,7 @@ export default class RightPanelStore extends Store {
             }
         }
 
-        if (payload.action !== 'set_right_panel_phase' || this._inhibitUpdates) return;
+        if (payload.action !== 'set_right_panel_phase') return;
 
         const targetPhase = payload.phase;
         if (!RIGHT_PANEL_PHASES[targetPhase]) {

From f14257926ec4839d4bd7c31f8dae7ecd326278ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 15:24:28 +0000
Subject: [PATCH 1636/3235] RoomPreviewBar word-break the sender name too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_RoomPreviewBar.scss | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index b3f6a12103..981cf06c69 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -25,9 +25,6 @@ limitations under the License.
     h3 {
         font-size: 18px;
         font-weight: 600;
-        // break-word, with fallback to break-all, which is wider supported
-        word-break: break-all;
-        word-break: break-word;
 
         &.mx_RoomPreviewBar_spinnerTitle {
             display: flex;
@@ -36,6 +33,13 @@ limitations under the License.
         }
     }
 
+    h3,
+    .mx_RoomPreviewBar_message p {
+        // break-word, with fallback to break-all, which is wider supported
+        word-break: break-all;
+        word-break: break-word;
+    }
+
     .mx_Spinner {
         width: auto;
         height: auto;

From 3c2101fa313cb44b48fd56b1b301eb14bbffa206 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 15:52:17 +0000
Subject: [PATCH 1637/3235] Fix ctrlOrCmd + Slash shortcut to match the guide

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 576ae2b276..f923c50b44 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -380,7 +380,7 @@ const LoggedInView = createReactClass({
                 break;
 
             case Key.SLASH:
-                if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
+                if (ctrlCmdOnly) {
                     KeyboardShortcuts.toggleDialog();
                     handled = true;
                 }

From b588d6eb62f41eac703f0e3709eed4222511c815 Mon Sep 17 00:00:00 2001
From: Julien <julien.thomas018@live.fr>
Date: Thu, 19 Mar 2020 15:34:53 +0000
Subject: [PATCH 1638/3235] Translated using Weblate (French)

Currently translated at 98.3% (2172 of 2209 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 4d52d8ae09..8f0d526115 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2230,5 +2230,6 @@
     "Server name": "Nom du serveur",
     "Add a new server...": "Ajouter un nouveau serveur…",
     "%(networkName)s rooms": "%(networkName)s salons",
-    "Matrix rooms": "Salons Matrix"
+    "Matrix rooms": "Salons Matrix",
+    "Keyboard Shortcuts": "Raccourcis clavier"
 }

From a519e74410721ab7919bde7058fd94c041ef50a8 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 19 Mar 2020 16:18:39 +0000
Subject: [PATCH 1639/3235] Translated using Weblate (Albanian)

Currently translated at 99.6% (2211 of 2219 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 | 50 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index a6e8bb10a5..0dc35005ce 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2217,5 +2217,53 @@
     "Matrix rooms": "Dhoma Matrix",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Hapni një sesion ekzistues & përdoreni për të verifikuar këtë këtu, duke i akorduar hyrje te mesazhe të fshehtëzuar.",
     "Waiting…": "Po pritet…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Nëse s’hapni dot një, <button>përdorni kyçin ose frazëkalimin tuaj të rimarrjes.</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Nëse s’hapni dot një, <button>përdorni kyçin ose frazëkalimin tuaj të rimarrjes.</button>",
+    "Reset cross-signing and secret storage": "Rikthe te parazgjedhjet <em>cross-signing</em> dhe depozitën e fshehtë",
+    "Keyboard Shortcuts": "Shkurtore Tastiere",
+    "Matrix": "Matrix",
+    "a new master key signature": "një nënshkrim i ri kyçi të përgjithshëm",
+    "a new cross-signing key signature": "një nënshkrim i ri kyçi <em>cross-signing</em>",
+    "a device cross-signing signature": "një nënshkrim <em>cross-signing</em> pajisjeje",
+    "a key signature": "një nënshkrim kyçi",
+    "Riot encountered an error during upload of:": "Riot-i hasi një gabim gjatë ngarkimit të:",
+    "Upload completed": "Ngarkimi u plotësua",
+    "Cancelled signature upload": "Ngarkim i anuluar nënshkrimi",
+    "Unabled to upload": "S’u arrit të ngarkohej",
+    "Signature upload success": "Sukses ngarkimi nënshkrimi",
+    "Signature upload failed": "Ngarkimi i nënshkrimit dështoi",
+    "Navigation": "Lëvizje",
+    "Calls": "Thirrje",
+    "Room List": "Listë Dhomash",
+    "Autocomplete": "Vetëplotëso",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Aktivizo/çaktivizo Të trasha",
+    "Toggle Italics": "Aktivizo/çaktivizo Të pjerrëta",
+    "Toggle Quote": "Aktivizo/çaktivizo Thonjëza",
+    "Toggle Markdown": "Aktivizo/çaktivizo Markdown",
+    "New line": "Rresht i ri",
+    "Navigate recent messages to edit": "Shihni mesazhe së fundi për përpunim",
+    "Jump to start/end of the composer": "Hidhu te fillimi/fundi i hartuesit",
+    "Toggle microphone mute": "Aktivizo/çaktivizon heshtje mikrofoni",
+    "Jump to room search": "Hidhu te kërkim në dhomë",
+    "Navigate up/down in the room list": "Lëvizni sipër/poshtë në listën e dhomave",
+    "Select room from the room list": "Përzgjidhni dhomë prej listës së dhomave",
+    "Collapse room list section": "Tkurre pjesën e listës së dhomave",
+    "Expand room list section": "Zgjeroje pjesën e listës së dhomave",
+    "Clear room list filter field": "Spastro fushën e filtrit të listës së dhomave",
+    "Scroll up/down in the timeline": "Rrëshqitni sipër/poshtë nëpër rrjedhën kohore",
+    "Toggle the top left menu": "Shfaq/fshih menunë e epërme majtas",
+    "Close dialog or context menu": "Mbyllni dialog ose menu konteksti",
+    "Activate selected button": "Aktivizo buton të përzgjedhur",
+    "Toggle this dialog": "Hap/mbyll këtë dialog",
+    "Move autocomplete selection up/down": "Kaloje përzgjedhjen e vetëplotësimit sipër/poshtë",
+    "Cancel autocomplete": "Anulo vetëplotësim",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End"
 }

From af97ec57d064ca47da5ec021ee2e1c1c1072a0aa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Mar 2020 11:45:17 -0600
Subject: [PATCH 1640/3235] Apply suggestions from code review

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 docs/jitsi.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/jitsi.md b/docs/jitsi.md
index 3f1b6c4377..779ef79d3a 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -1,6 +1,6 @@
 # Jitsi Wrapper
 
-**Note**: these are developer docs. Please consult your client's documentation for
+**Note**: These are developer docs. Please consult your client's documentation for
 instructions on setting up Jitsi.
 
 The react-sdk wraps all Jitsi call widgets in a local wrapper called `jitsi.html`
@@ -9,7 +9,7 @@ which takes several parameters:
 *Query string*:
 * `widgetId`: The ID of the widget. This is needed for communication back to the 
   react-sdk.
-* `parentUrl`: The URL of the parent window. This is also ideally needed for
+* `parentUrl`: The URL of the parent window. This is also needed for
   communication back to the react-sdk.
 
 *Hash/fragment (formatted as a query string)*:

From 92251316a3bf90c19b0097c7235e818884f7c09a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Mar 2020 11:51:01 -0600
Subject: [PATCH 1641/3235] Switch to named object

---
 src/utils/WidgetUtils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index e68ec8483c..7d6bf5e90d 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -432,7 +432,7 @@ export default class WidgetUtils {
 
         if (app.type === 'jitsi') {
             console.log("Replacing Jitsi widget URL with local wrapper");
-            app.url = WidgetUtils.getLocalJitsiWrapperUrl(true);
+            app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
         }
 
         app.url = encodeUri(app.url, params);
@@ -474,7 +474,7 @@ export default class WidgetUtils {
         return encodeURIComponent(`${widgetLocation}::${widgetUrl}`);
     }
 
-    static getLocalJitsiWrapperUrl(forLocalRender = false) {
+    static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean}) {
         // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
         const queryString = [
             'conferenceDomain=$domain',
@@ -486,7 +486,7 @@ export default class WidgetUtils {
         ].join('&');
 
         let currentUrl = window.location.href.split('#')[0];
-        if (!currentUrl.startsWith("https://") && !forLocalRender) {
+        if (!currentUrl.startsWith("https://") && !opts.forLocalRender) {
             // Use an external wrapper if we're not locally rendering the widget. This is usually
             // the URL that will end up in the widget event, so we want to make sure it's relatively
             // safe to send.

From 578b3f2b97d907bbba1bb7a8366e7d61ae0b4ed5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 19:07:33 +0000
Subject: [PATCH 1642/3235] Improve Keyboard Shortcuts. Add alt-arrows &
 alt-shift-arrows.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/_KeyboardShortcutsDialog.scss     |  2 +-
 src/accessibility/KeyboardShortcuts.tsx       | 44 ++++++++++++---
 src/components/structures/LoggedInView.js     | 12 +++++
 src/components/views/rooms/RoomList.js        | 53 +++++++++++++++++++
 src/components/views/rooms/RoomTile.js        | 18 ++++++-
 .../views/rooms/SendMessageComposer.js        |  8 +--
 src/i18n/strings/en_EN.json                   |  4 +-
 7 files changed, 127 insertions(+), 14 deletions(-)

diff --git a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
index f529b11059..638cacd41f 100644
--- a/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
+++ b/res/css/views/dialogs/_KeyboardShortcutsDialog.scss
@@ -21,7 +21,7 @@ limitations under the License.
     -webkit-box-direction: normal;
     flex-direction: column;
     margin-bottom: -50px;
-    max-height: 700px; // XXX: this may need adjusting when adding new shortcuts
+    max-height: 1100px; // XXX: this may need adjusting when adding new shortcuts
 
     .mx_KeyboardShortcutsDialog_category {
         width: 33.3333%; // 3 columns
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 618ed4755a..9ffeb9f72c 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -87,12 +87,6 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.GREATER_THAN,
             }],
             description: _td("Toggle Quote"),
-        }, {
-            keybinds: [{
-                modifiers: [CMD_OR_CTRL],
-                key: Key.M,
-            }],
-            description: _td("Toggle Markdown"),
         }, {
             keybinds: [{
                 modifiers: [Modifiers.SHIFT],
@@ -115,6 +109,15 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.END,
             }],
             description: _td("Jump to start/end of the composer"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.CONTROL, Modifiers.ALT],
+                key: Key.ARROW_UP,
+            }, {
+                modifiers: [Modifiers.CONTROL, Modifiers.ALT],
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Navigate composer history"),
         },
     ],
 
@@ -179,6 +182,24 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.PAGE_DOWN,
             }],
             description: _td("Scroll up/down in the timeline"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.ALT, Modifiers.SHIFT],
+                key: Key.ARROW_UP,
+            }, {
+                modifiers: [Modifiers.ALT, Modifiers.SHIFT],
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Previous/next unread room or DM"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.ALT],
+                key: Key.ARROW_UP,
+            }, {
+                modifiers: [Modifiers.ALT],
+                key: Key.ARROW_DOWN,
+            }],
+            description: _td("Previous/next room or DM"),
         }, {
             keybinds: [{
                 modifiers: [CMD_OR_CTRL],
@@ -223,6 +244,14 @@ const shortcuts: Record<Categories, IShortcut[]> = {
     ],
 };
 
+const categoryOrder = [
+    Categories.COMPOSER,
+    Categories.CALLS,
+    Categories.ROOM_LIST,
+    Categories.AUTOCOMPLETE,
+    Categories.NAVIGATION,
+];
+
 interface IModal {
     close: () => void;
     finished: Promise<any[]>;
@@ -289,7 +318,8 @@ export const toggleDialog = () => {
         return;
     }
 
-    const sections = Object.entries(shortcuts).map(([category, list]) => {
+    const sections = categoryOrder.map(category => {
+        const list = shortcuts[category];
         return <div className="mx_KeyboardShortcutsDialog_category" key={category}>
             <h3>{_t(category)}</h3>
             <div>{list.map(shortcut => <Shortcut key={shortcut.description} shortcut={shortcut} />)}</div>
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index f923c50b44..41fbd54991 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -385,6 +385,18 @@ const LoggedInView = createReactClass({
                     handled = true;
                 }
                 break;
+
+            case Key.ARROW_UP:
+            case Key.ARROW_DOWN:
+                if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
+                    dis.dispatch({
+                        action: 'view_room_delta',
+                        delta: ev.key === Key.ARROW_UP ? -1 : 1,
+                        unread: ev.shiftKey,
+                    });
+                    handled = true;
+                }
+                break;
         }
 
         if (handled) {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 2143c7f1a8..aa4c106bb6 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017, 2018 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -40,6 +41,8 @@ import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
 import {RovingTabIndexProvider} from "../../../accessibility/RovingTabIndex";
+import * as Unread from "../../../Unread";
+import RoomViewStore from "../../../stores/RoomViewStore";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
@@ -242,6 +245,56 @@ export default createReactClass({
                     });
                 }
                 break;
+            case 'view_room_delta': {
+                const currentRoomId = RoomViewStore.getRoomId();
+                const {
+                    "im.vector.fake.invite": inviteRooms,
+                    "m.favourite": favouriteRooms,
+                    [TAG_DM]: dmRooms,
+                    "im.vector.fake.recent": recentRooms,
+                    "m.lowpriority": lowPriorityRooms,
+                    "im.vector.fake.archived": historicalRooms,
+                    "m.server_notice": serverNoticeRooms,
+                    ...tags
+                } = this.state.lists;
+
+                const shownCustomTagRooms = Object.keys(tags).filter(tagName => {
+                    return (!this.state.customTags || this.state.customTags[tagName]) &&
+                        !tagName.match(STANDARD_TAGS_REGEX);
+                }).map(tagName => tags[tagName]);
+
+                // this order matches the one when generating the room sublists below.
+                let rooms = this._applySearchFilter([
+                    ...inviteRooms,
+                    ...favouriteRooms,
+                    ...dmRooms,
+                    ...recentRooms,
+                    // eslint-disable-next-line prefer-spread
+                    ...[].concat.apply([], shownCustomTagRooms),
+                    ...lowPriorityRooms,
+                    ...historicalRooms,
+                    ...serverNoticeRooms,
+                ], this.props.searchFilter); // TODO optimize
+
+                if (payload.unread) {
+                    // filter to only notification rooms (and our current active room so we can index properly)
+                    rooms = rooms.filter(room => {
+                        return room.roomId === currentRoomId || Unread.doesRoomHaveUnreadMessages(room);
+                    });
+                }
+
+                const currentIndex = rooms.findIndex(room => room.roomId === currentRoomId);
+
+                const [room] = rooms.slice((currentIndex + payload.delta) % rooms.length);
+                // console.log("DEBUG", currentIndex, room, rooms);
+                if (room) {
+                    dis.dispatch({
+                        action: 'view_room',
+                        room_id: room.roomId,
+                    });
+                }
+                break;
+            }
         }
     },
 
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index e1624602f1..d4ccd243cf 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
@@ -225,6 +225,16 @@ export default createReactClass({
             case 'feature_custom_status_changed':
                 this.forceUpdate();
                 break;
+
+            case 'view_room':
+                // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcuts
+                if (payload.room_id === this.props.room.roomId && this._roomTile.current) {
+                    this._roomTile.current.scrollIntoView({
+                        block: "nearest",
+                        behavior: "auto",
+                    });
+                }
+                break;
         }
     },
 
@@ -234,6 +244,10 @@ export default createReactClass({
         });
     },
 
+    UNSAFE_componentWillMount: function() {
+        this._roomTile = createRef();
+    },
+
     componentDidMount: function() {
         /* We bind here rather than in the definition because otherwise we wind up with the
            method only being callable once every 500ms across all instances, which would be wrong */
@@ -538,7 +552,7 @@ export default createReactClass({
         }
 
         return <React.Fragment>
-            <RovingTabIndexWrapper>
+            <RovingTabIndexWrapper inputRef={this._roomTile}>
                 {({onFocus, isActive, ref}) =>
                     <AccessibleButton
                         onFocus={onFocus}
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 63e58bf738..05205f3605 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -125,10 +125,12 @@ export default class SendMessageComposer extends React.Component {
     }
 
     onVerticalArrow(e, up) {
-        if (e.ctrlKey || e.shiftKey || e.metaKey) return;
+        // arrows from an initial-caret composer navigates recent messages to edit
+        // ctrl-alt-arrows navigate send history
+        if (e.shiftKey || e.metaKey) return;
 
-        const shouldSelectHistory = e.altKey;
-        const shouldEditLastMessage = !e.altKey && up && !RoomViewStore.getQuotingEvent();
+        const shouldSelectHistory = e.altKey && e.ctrlKey;
+        const shouldEditLastMessage = !e.altKey && !e.ctrlKey && up && !RoomViewStore.getQuotingEvent();
 
         if (shouldSelectHistory) {
             // Try select composer history
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 37ac1ee947..339ad12a23 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2183,10 +2183,10 @@
     "Toggle Bold": "Toggle Bold",
     "Toggle Italics": "Toggle Italics",
     "Toggle Quote": "Toggle Quote",
-    "Toggle Markdown": "Toggle Markdown",
     "New line": "New line",
     "Navigate recent messages to edit": "Navigate recent messages to edit",
     "Jump to start/end of the composer": "Jump to start/end of the composer",
+    "Navigate composer history": "Navigate composer history",
     "Toggle microphone mute": "Toggle microphone mute",
     "Toggle video on/off": "Toggle video on/off",
     "Jump to room search": "Jump to room search",
@@ -2196,6 +2196,8 @@
     "Expand room list section": "Expand room list section",
     "Clear room list filter field": "Clear room list filter field",
     "Scroll up/down in the timeline": "Scroll up/down in the timeline",
+    "Previous/next unread room or DM": "Previous/next unread room or DM",
+    "Previous/next room or DM": "Previous/next room or DM",
     "Toggle the top left menu": "Toggle the top left menu",
     "Close dialog or context menu": "Close dialog or context menu",
     "Activate selected button": "Activate selected button",

From 9bfc19f367acac92a3d998034899f26f324d0b3f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Mar 2020 20:40:08 +0000
Subject: [PATCH 1643/3235] Fix bug where cross-signing keys would be
 unintentionally reset

Don't pass the boostrap function directly as a an event handler
as that gets used as the force argument.
---
 src/components/views/settings/CrossSigningPanel.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index d583210c9a..20e2ca01e9 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -60,6 +60,10 @@ export default class CrossSigningPanel extends React.PureComponent {
         }
     };
 
+    _onBootstrapClick = () => {
+        this._bootstrapSecureSecretStorage(false);
+    };
+
     onStatusChanged = () => {
         this._getUpdatedStatus();
     };
@@ -175,7 +179,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         ) {
             bootstrapButton = (
                 <div className="mx_CrossSigningPanel_buttonRow">
-                    <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
+                    <AccessibleButton kind="primary" onClick={this._onBootstrapClick}>
                         {_t("Bootstrap cross-signing and secret storage")}
                     </AccessibleButton>
                 </div>

From c8691c73ff6089246087a56c3c9dfedb973488a9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 19 Mar 2020 20:42:16 +0000
Subject: [PATCH 1644/3235] Allow key backup restore to get the key backup
 passphrase

And pass this in as the new callback to bootstrap to get the old
key backup passphrase.
---
 src/CrossSigningManager.js                       | 15 +++++++++++++++
 .../secretstorage/CreateSecretStorageDialog.js   |  2 ++
 .../dialogs/keybackup/RestoreKeyBackupDialog.js  | 16 ++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index f428697e74..b43af7b8b2 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -162,6 +162,20 @@ export const crossSigningCallbacks = {
     onSecretRequested,
 };
 
+export async function promptForBackupPassphrase() {
+    let key;
+
+    const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
+    const { finished } = Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
+            showSummary: false, keyCallback: k => key = k,
+    }, null, /* priority = */ false, /* static = */ false);
+
+    const success = await finished;
+    if (!success) throw new Error("Key backup prompt cancelled");
+
+    return key;
+}
+
 /**
  * This helper should be used whenever you need to access secret storage. It
  * ensures that secret storage (and also cross-signing since they each depend on
@@ -218,6 +232,7 @@ export async function accessSecretStorage(func = async () => { }, force = false)
                         throw new Error("Cross-signing key upload auth canceled");
                     }
                 },
+                getBackupPassphrase: promptForBackupPassphrase,
             });
         }
 
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 49b103ecf7..35529fbc5b 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -23,6 +23,7 @@ import { scorePassword } from '../../../../utils/PasswordScorer';
 import FileSaver from 'file-saver';
 import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
+import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 
 const PHASE_LOADING = 0;
 const PHASE_MIGRATE = 1;
@@ -243,6 +244,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     createSecretStorageKey: async () => this._keyInfo,
                     keyBackupInfo: this.state.backupInfo,
                     setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
+                    getKeyBackupPassphrase: promptForBackupPassphrase,
                 });
             }
             this.setState({
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 438806bf82..8e4a4e1e60 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -36,6 +36,9 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         // if false, will close the dialog as soon as the restore completes succesfully
         // default: true
         showSummary: PropTypes.bool,
+        // If specified, gather the key from the user but then call the function with the backup
+        // key rather than actually (necessarily) restoring the backup.
+        keyCallback: PropTypes.func,
     };
 
     static defaultProps = {
@@ -103,9 +106,18 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             restoreType: RESTORE_TYPE_PASSPHRASE,
         });
         try {
+            // We do still restore the key backup: we must ensure that the key backup key
+            // is the right one and restoring it is currently the only way we can do this.
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
                 this.state.passPhrase, undefined, undefined, this.state.backupInfo,
             );
+            if (this.props.keyCallback) {
+                const key = await MatrixClientPeg.get().keyBackupKeyFromPassword(
+                    this.state.passPhrase, this.state.backupInfo,
+                );
+                this.props.keyCallback(key);
+            }
+
             if (!this.props.showSummary) {
                 this.props.onFinished(true);
                 return;
@@ -135,6 +147,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo,
             );
+            if (this.props.keyCallback) {
+                const key = MatrixClientPeg.get().keyBackupKeyFromRecoveryKey(this.state.recoveryKey);
+                this.props.keyCallback(key);
+            }
             if (!this.props.showSummary) {
                 this.props.onFinished(true);
                 return;

From d7ca374991c404b350ce01c8a1f8b0c6f1db42f3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 22:07:22 +0000
Subject: [PATCH 1645/3235] open room sublist when using alt-arrows to navigate
 into it, refire scroll event

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 36 ++++++++++++++++--------
 src/components/views/rooms/RoomTile.js   |  1 +
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index fa2231328c..5ab8ab60ee 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -111,17 +111,31 @@ export default class RoomSubList extends React.PureComponent {
     }
 
     onAction = (payload) => {
-        // XXX: Previously RoomList would forceUpdate whenever on_room_read is dispatched,
-        // but this is no longer true, so we must do it here (and can apply the small
-        // optimisation of checking that we care about the room being read).
-        //
-        // Ultimately we need to transition to a state pushing flow where something
-        // explicitly notifies the components concerned that the notif count for a room
-        // has change (e.g. a Flux store).
-        if (payload.action === 'on_room_read' &&
-            this.props.list.some((r) => r.roomId === payload.roomId)
-        ) {
-            this.forceUpdate();
+        switch (payload.action) {
+            case 'on_room_read':
+                // XXX: Previously RoomList would forceUpdate whenever on_room_read is dispatched,
+                // but this is no longer true, so we must do it here (and can apply the small
+                // optimisation of checking that we care about the room being read).
+                //
+                // Ultimately we need to transition to a state pushing flow where something
+                // explicitly notifies the components concerned that the notif count for a room
+                // has change (e.g. a Flux store).
+                if (this.props.list.some((r) => r.roomId === payload.roomId)) {
+                    this.forceUpdate();
+                }
+                break;
+
+            case 'view_room':
+                if (this.state.hidden && !this.props.forceExpand &&
+                    this.props.list.some((r) => r.roomId === payload.room_id)
+                ) {
+                    this.onClick();
+                    // re-fire to scroll the room tile, normally it catches `view_room` but here it wasn't rendered yet.
+                    dis.dispatch({
+                        action: 'scroll_room_tile',
+                        room_id: payload.room_id,
+                    });
+                }
         }
     };
 
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index d4ccd243cf..9a04887483 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -226,6 +226,7 @@ export default createReactClass({
                 this.forceUpdate();
                 break;
 
+            case 'scroll_room_tile':
             case 'view_room':
                 // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcuts
                 if (payload.room_id === this.props.room.roomId && this._roomTile.current) {

From f5d490ee78559b7b0889f3d36424bb311293131f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 23:11:28 +0000
Subject: [PATCH 1646/3235] Tidy up code

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js |  5 -----
 src/components/views/rooms/RoomTile.js   | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 5ab8ab60ee..5ae240013c 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -130,11 +130,6 @@ export default class RoomSubList extends React.PureComponent {
                     this.props.list.some((r) => r.roomId === payload.room_id)
                 ) {
                     this.onClick();
-                    // re-fire to scroll the room tile, normally it catches `view_room` but here it wasn't rendered yet.
-                    dis.dispatch({
-                        action: 'scroll_room_tile',
-                        room_id: payload.room_id,
-                    });
                 }
         }
     };
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 9a04887483..0f44f5077a 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -226,19 +226,23 @@ export default createReactClass({
                 this.forceUpdate();
                 break;
 
-            case 'scroll_room_tile':
             case 'view_room':
-                // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcuts
-                if (payload.room_id === this.props.room.roomId && this._roomTile.current) {
-                    this._roomTile.current.scrollIntoView({
-                        block: "nearest",
-                        behavior: "auto",
-                    });
+                // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcut access
+                if (payload.room_id === this.props.room.roomId) {
+                    this._scrollIntoView();
                 }
                 break;
         }
     },
 
+    _scrollIntoView: function() {
+        if (!this._roomTile.current) return;
+        this._roomTile.current.scrollIntoView({
+            block: "nearest",
+            behavior: "auto",
+        });
+    },
+
     _onActiveRoomChange: function() {
         this.setState({
             selected: this.props.room.roomId === RoomViewStore.getRoomId(),
@@ -272,6 +276,11 @@ export default createReactClass({
                 statusUser.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
             }
         }
+
+        // when we're first rendered (or our sublist is expanded) make sure we are visible if we're active
+        if (this.state.selected) {
+            this._scrollIntoView();
+        }
     },
 
     componentWillUnmount: function() {

From 4da7ce10de46eff134d93d3f2fda7dd1ce639e23 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 23:15:05 +0000
Subject: [PATCH 1647/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index aa4c106bb6..c00f0c920b 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -269,12 +269,11 @@ export default createReactClass({
                     ...favouriteRooms,
                     ...dmRooms,
                     ...recentRooms,
-                    // eslint-disable-next-line prefer-spread
-                    ...[].concat.apply([], shownCustomTagRooms),
+                    ...[].concat.apply([], shownCustomTagRooms), // eslint-disable-line prefer-spread
                     ...lowPriorityRooms,
                     ...historicalRooms,
                     ...serverNoticeRooms,
-                ], this.props.searchFilter); // TODO optimize
+                ], this.props.searchFilter);
 
                 if (payload.unread) {
                     // filter to only notification rooms (and our current active room so we can index properly)
@@ -284,9 +283,8 @@ export default createReactClass({
                 }
 
                 const currentIndex = rooms.findIndex(room => room.roomId === currentRoomId);
-
+                // use slice to account for looping around the start
                 const [room] = rooms.slice((currentIndex + payload.delta) % rooms.length);
-                // console.log("DEBUG", currentIndex, room, rooms);
                 if (room) {
                     dis.dispatch({
                         action: 'view_room',

From de581b2a5a64337a2fc2435ba068fd34efa56b50 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 19 Mar 2020 23:42:08 +0000
Subject: [PATCH 1648/3235] Register Mac electron specific Cmd+, shortcut to
 User Settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/KeyboardShortcuts.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 618ed4755a..841eed2dc6 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -313,3 +313,7 @@ export const toggleDialog = () => {
         },
     });
 };
+
+export const registerShortcut = (category: Categories, defn: IShortcut) => {
+    shortcuts[category].push(defn);
+};

From 2b40bb905a02e6b34d0539e024e921994bf2afb9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 00:18:24 +0000
Subject: [PATCH 1649/3235] Add shortcut CmdOrCtrl+. to toggle right panel.
 Gets rid of forced-update on right panel changes which may not be the ones we
 care about.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Keyboard.ts                           |   1 +
 src/accessibility/KeyboardShortcuts.tsx   |   6 ++
 src/components/structures/GroupView.js    |  21 ++--
 src/components/structures/LoggedInView.js |   9 ++
 src/components/structures/RoomView.js     |  19 ++--
 src/i18n/strings/en_EN.json               |   1 +
 src/stores/RightPanelStore.js             | 120 ++++++++++++----------
 7 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index f5cf0a5492..817d0a0b97 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -36,6 +36,7 @@ export const Key = {
     CONTEXT_MENU: "ContextMenu",
 
     COMMA: ",",
+    PERIOD: ".",
     LESS_THAN: "<",
     GREATER_THAN: ">",
     BACKTICK: "`",
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 618ed4755a..ad3da9565f 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -197,6 +197,12 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.SPACE,
             }],
             description: _td("Activate selected button"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.PERIOD,
+            }],
+            description: _td("Toggle right panel"),
         }, {
             keybinds: [{
                 modifiers: [CMD_OR_CTRL],
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 0d10dd6d8f..524694fe95 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -424,6 +424,7 @@ export default createReactClass({
             membershipBusy: false,
             publicityBusy: false,
             inviterProfile: null,
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForGroup,
         };
     },
 
@@ -436,12 +437,18 @@ export default createReactClass({
         this._initGroupStore(this.props.groupId, true);
 
         this._dispatcherRef = dis.register(this._onAction);
+        this._rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this._onRightPanelStoreUpdate);
     },
 
     componentWillUnmount: function() {
         this._unmounted = true;
         this._matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
         dis.unregister(this._dispatcherRef);
+
+        // Remove RightPanelStore listener
+        if (this._rightPanelStoreToken) {
+            this._rightPanelStoreToken.remove();
+        }
     },
 
     componentWillReceiveProps: function(newProps) {
@@ -455,6 +462,12 @@ export default createReactClass({
         }
     },
 
+    _onRightPanelStoreUpdate: function() {
+        this.setState({
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForGroup,
+        });
+    },
+
     _onGroupMyMembership: function(group) {
         if (this._unmounted || group.groupId !== this.props.groupId) return;
         if (group.myMembership === 'leave') {
@@ -577,10 +590,6 @@ export default createReactClass({
                     profileForm: null,
                 });
                 break;
-            case 'after_right_panel_phase_change':
-                // We don't keep state on the right panel, so just re-render to update
-                this.forceUpdate();
-                break;
             default:
                 break;
         }
@@ -1295,9 +1304,7 @@ export default createReactClass({
                 );
             }
 
-            const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
-                ? <RightPanel groupId={this.props.groupId} />
-                : undefined;
+            const rightPanel = this.state.showRightPanel ? <RightPanel groupId={this.props.groupId} /> : undefined;
 
             const headerClasses = {
                 "mx_GroupView_header": true,
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 576ae2b276..734a8dde88 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -385,6 +385,15 @@ const LoggedInView = createReactClass({
                     handled = true;
                 }
                 break;
+
+            case Key.PERIOD:
+                if (ctrlCmdOnly && (this.props.page_type === "room_view" || this.props.page_type === "group_view")) {
+                    dis.dispatch({
+                        action: 'toggle_right_panel',
+                        type: this.props.page_type === "room_view" ? "room" : "group",
+                    });
+                    handled = true;
+                }
         }
 
         if (handled) {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 17a496b037..e3020389da 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -131,6 +131,7 @@ export default createReactClass({
             isAlone: false,
             isPeeking: false,
             showingPinned: false,
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -176,6 +177,7 @@ export default createReactClass({
         MatrixClientPeg.get().on("userTrustStatusChanged", this.onUserVerificationChanged);
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        this._rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this._onRightPanelStoreUpdate);
         this._onRoomViewStoreUpdate(true);
 
         WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
@@ -488,6 +490,10 @@ export default createReactClass({
         if (this._roomStoreToken) {
             this._roomStoreToken.remove();
         }
+        // Remove RightPanelStore listener
+        if (this._rightPanelStoreToken) {
+            this._rightPanelStoreToken.remove();
+        }
 
         WidgetEchoStore.removeListener('update', this._onWidgetEchoStoreUpdate);
 
@@ -499,6 +505,12 @@ export default createReactClass({
         // Tinter.tint(); // reset colourscheme
     },
 
+    _onRightPanelStoreUpdate: function() {
+        this.setState({
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+        });
+    },
+
     onPageUnload(event) {
         if (ContentMessages.sharedInstance().getCurrentUploads().length > 0) {
             return event.returnValue =
@@ -538,10 +550,6 @@ export default createReactClass({
 
     onAction: function(payload) {
         switch (payload.action) {
-            case 'after_right_panel_phase_change':
-                // We don't keep state on the right panel, so just re-render to update
-                this.forceUpdate();
-                break;
             case 'message_send_failed':
             case 'message_sent':
                 this._checkIfAlone(this.state.room);
@@ -1997,8 +2005,7 @@ export default createReactClass({
             },
         );
 
-        const showRightPanel = !forceHideRightPanel && this.state.room
-            && RightPanelStore.getSharedInstance().isOpenForRoom;
+        const showRightPanel = !forceHideRightPanel && this.state.room && this.state.showRightPanel;
         const rightPanel = showRightPanel
             ? <RightPanel roomId={this.state.room.roomId} resizeNotifier={this.props.resizeNotifier} />
             : null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c3befa2298..d9679fde13 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2207,6 +2207,7 @@
     "Toggle the top left menu": "Toggle the top left menu",
     "Close dialog or context menu": "Close dialog or context menu",
     "Activate selected button": "Activate selected button",
+    "Toggle right panel": "Toggle right panel",
     "Toggle this dialog": "Toggle this dialog",
     "Move autocomplete selection up/down": "Move autocomplete selection up/down",
     "Cancel autocomplete": "Cancel autocomplete",
diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index ccdeb006f4..625ccc668f 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -35,6 +35,12 @@ const INITIAL_STATE = {
 
 const GROUP_PHASES = Object.keys(RIGHT_PANEL_PHASES).filter(k => k.startsWith("Group"));
 
+const MEMBER_INFO_PHASES = [
+    RIGHT_PANEL_PHASES.RoomMemberInfo,
+    RIGHT_PANEL_PHASES.Room3pidMemberInfo,
+    RIGHT_PANEL_PHASES.EncryptionPanel,
+];
+
 /**
  * A class for tracking the state of the right panel between layouts and
  * sessions.
@@ -114,62 +120,70 @@ export default class RightPanelStore extends Store {
     }
 
     __onDispatch(payload) {
-        if (payload.action === 'view_room' || payload.action === 'view_group') {
-            // Reset to the member list if we're viewing member info
-            const memberInfoPhases = [
-                RIGHT_PANEL_PHASES.RoomMemberInfo,
-                RIGHT_PANEL_PHASES.Room3pidMemberInfo,
-                RIGHT_PANEL_PHASES.EncryptionPanel,
-            ];
-            if (memberInfoPhases.includes(this._state.lastRoomPhase)) {
-                this._setState({lastRoomPhase: RIGHT_PANEL_PHASES.RoomMemberList, lastRoomPhaseParams: {}});
+        switch (payload.action) {
+            case 'view_room':
+            case 'view_group':
+                // Reset to the member list if we're viewing member info
+                if (MEMBER_INFO_PHASES.includes(this._state.lastRoomPhase)) {
+                    this._setState({lastRoomPhase: RIGHT_PANEL_PHASES.RoomMemberList, lastRoomPhaseParams: {}});
+                }
+
+                // Do the same for groups
+                if (this._state.lastGroupPhase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
+                    this._setState({lastGroupPhase: RIGHT_PANEL_PHASES.GroupMemberList});
+                }
+                break;
+
+            case 'set_right_panel_phase': {
+                const targetPhase = payload.phase;
+                if (!RIGHT_PANEL_PHASES[targetPhase]) {
+                    console.warn(`Tried to switch right panel to unknown phase: ${targetPhase}`);
+                    return;
+                }
+
+                if (GROUP_PHASES.includes(targetPhase)) {
+                    if (targetPhase === this._state.lastGroupPhase) {
+                        this._setState({
+                            showGroupPanel: !this._state.showGroupPanel,
+                        });
+                    } else {
+                        this._setState({
+                            lastGroupPhase: targetPhase,
+                            showGroupPanel: true,
+                        });
+                    }
+                } else {
+                    if (targetPhase === this._state.lastRoomPhase && !payload.refireParams) {
+                        this._setState({
+                            showRoomPanel: !this._state.showRoomPanel,
+                        });
+                    } else {
+                        this._setState({
+                            lastRoomPhase: targetPhase,
+                            showRoomPanel: true,
+                            lastRoomPhaseParams: payload.refireParams || {},
+                        });
+                    }
+                }
+
+                // Let things like the member info panel actually open to the right member.
+                dis.dispatch({
+                    action: 'after_right_panel_phase_change',
+                    phase: targetPhase,
+                    ...(payload.refireParams || {}),
+                });
+                break;
             }
 
-            // Do the same for groups
-            if (this._state.lastGroupPhase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
-                this._setState({lastGroupPhase: RIGHT_PANEL_PHASES.GroupMemberList});
-            }
+            case 'toggle_right_panel':
+                if (payload.type === "room") {
+                    this._setState({ showRoomPanel: !this._state.showRoomPanel });
+                } else { // group
+                    this._setState({ showGroupPanel: !this._state.showGroupPanel });
+                }
+                break;
+
         }
-
-        if (payload.action !== 'set_right_panel_phase') return;
-
-        const targetPhase = payload.phase;
-        if (!RIGHT_PANEL_PHASES[targetPhase]) {
-            console.warn(`Tried to switch right panel to unknown phase: ${targetPhase}`);
-            return;
-        }
-
-        if (GROUP_PHASES.includes(targetPhase)) {
-            if (targetPhase === this._state.lastGroupPhase) {
-                this._setState({
-                    showGroupPanel: !this._state.showGroupPanel,
-                });
-            } else {
-                this._setState({
-                    lastGroupPhase: targetPhase,
-                    showGroupPanel: true,
-                });
-            }
-        } else {
-            if (targetPhase === this._state.lastRoomPhase && !payload.refireParams) {
-                this._setState({
-                    showRoomPanel: !this._state.showRoomPanel,
-                });
-            } else {
-                this._setState({
-                    lastRoomPhase: targetPhase,
-                    showRoomPanel: true,
-                    lastRoomPhaseParams: payload.refireParams || {},
-                });
-            }
-        }
-
-        // Let things like the member info panel actually open to the right member.
-        dis.dispatch({
-            action: 'after_right_panel_phase_change',
-            phase: targetPhase,
-            ...(payload.refireParams || {}),
-        });
     }
 
     static getSharedInstance(): RightPanelStore {

From 1c2c2cbc7cb2c63a6748fac7a91ac6cab68f6ee1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 00:20:55 +0000
Subject: [PATCH 1650/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/RightPanelStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 625ccc668f..814f54b454 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -182,7 +182,6 @@ export default class RightPanelStore extends Store {
                     this._setState({ showGroupPanel: !this._state.showGroupPanel });
                 }
                 break;
-
         }
     }
 

From 2fcca5d4e4eb6873b20ad536c04c62a863d72359 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 00:42:44 +0000
Subject: [PATCH 1651/3235] Handle matrix.to user permalink in-room rather than
 solo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 2d2b9c62a5..def1e80736 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -16,7 +16,11 @@ limitations under the License.
 */
 
 import {baseUrl} from "./utils/permalinks/SpecPermalinkConstructor";
-import {tryTransformEntityToPermalink, tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
+import {
+    parsePermalink,
+    tryTransformEntityToPermalink,
+    tryTransformPermalinkToLocalHref
+} from "./utils/permalinks/Permalinks";
 
 function matrixLinkify(linkify) {
     // Text tokens
@@ -194,6 +198,18 @@ matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
 matrixLinkify.options = {
     events: function(href, type) {
         switch (type) {
+            case "url": {
+                // intercept local permalinks to users and show them like userids (in userinfo of current room)
+                const permalink = parsePermalink(href);
+                if (permalink && permalink.userId) {
+                    return {
+                        click: function(e) {
+                            matrixLinkify.onUserClick(e, permalink.userId);
+                        },
+                    };
+                }
+                break;
+            }
             case "userid":
                 return {
                     click: function(e) {

From 61a9dd0ee3805575ccb631b1f9a9741c6df87579 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 00:56:41 +0000
Subject: [PATCH 1652/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index def1e80736..cff7a93d08 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -19,7 +19,7 @@ import {baseUrl} from "./utils/permalinks/SpecPermalinkConstructor";
 import {
     parsePermalink,
     tryTransformEntityToPermalink,
-    tryTransformPermalinkToLocalHref
+    tryTransformPermalinkToLocalHref,
 } from "./utils/permalinks/Permalinks";
 
 function matrixLinkify(linkify) {

From 1c0c3c46958f06cd4cf4ef9d8fec956883f81157 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 09:29:59 +0000
Subject: [PATCH 1653/3235] Watch for show-RR settings changes, use
 room-specific and fix margins

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_EventTile.scss   |  9 +++++++--
 src/components/structures/RoomView.js | 29 +++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index d292c729dd..2fa9994155 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -112,8 +112,6 @@ limitations under the License.
 
 .mx_EventTile_line, .mx_EventTile_reply {
     position: relative;
-    /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
-    margin-right: 110px;
     padding-left: 65px; /* left gutter */
     padding-top: 4px;
     padding-bottom: 2px;
@@ -122,6 +120,13 @@ limitations under the License.
     line-height: 22px;
 }
 
+.mx_RoomView_timeline_rr_enabled {
+    .mx_EventTile_line, .mx_EventTile_reply {
+        /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
+        margin-right: 110px;
+    }
+}
+
 .mx_EventTile_bubbleContainer {
     display: grid;
     grid-template-columns: 1fr 100px;
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 17a496b037..78f32cf63e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -131,6 +131,7 @@ export default createReactClass({
             isAlone: false,
             isPeeking: false,
             showingPinned: false,
+            showReadReceipts: true,
 
             // error object, as from the matrix client/server API
             // If we failed to load information about the room,
@@ -179,11 +180,19 @@ export default createReactClass({
         this._onRoomViewStoreUpdate(true);
 
         WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
+        this._showReadReceiptsWatchRef = SettingsStore.watchSetting("showReadReceipts", null,
+            this._onReadReceiptsChange);
 
         this._roomView = createRef();
         this._searchResultsPanel = createRef();
     },
 
+    _onReadReceiptsChange: function() {
+        this.setState({
+            showReadReceipts: SettingsStore.getValue("showReadReceipts", this.state.roomId),
+        });
+    },
+
     _onRoomViewStoreUpdate: function(initial) {
         if (this.unmounted) {
             return;
@@ -204,8 +213,10 @@ export default createReactClass({
             return;
         }
 
+        const roomId = RoomViewStore.getRoomId();
+
         const newState = {
-            roomId: RoomViewStore.getRoomId(),
+            roomId,
             roomAlias: RoomViewStore.getRoomAlias(),
             roomLoading: RoomViewStore.isRoomLoading(),
             roomLoadError: RoomViewStore.getRoomLoadError(),
@@ -214,7 +225,8 @@ export default createReactClass({
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
             shouldPeek: RoomViewStore.shouldPeek(),
-            showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", RoomViewStore.getRoomId()),
+            showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", roomId),
+            showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
         };
 
         // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
@@ -491,6 +503,11 @@ export default createReactClass({
 
         WidgetEchoStore.removeListener('update', this._onWidgetEchoStoreUpdate);
 
+        if (this._showReadReceiptsWatchRef) {
+            SettingsStore.unwatchSetting(this._showReadReceiptsWatchRef);
+            this._showReadReceiptsWatchRef = null;
+        }
+
         // cancel any pending calls to the rate_limited_funcs
         this._updateRoomMembers.cancelPendingCall();
 
@@ -1948,7 +1965,7 @@ export default createReactClass({
             <TimelinePanel
                 ref={this._gatherTimelinePanelRef}
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
-                showReadReceipts={SettingsStore.getValue('showReadReceipts')}
+                showReadReceipts={this.state.showReadReceipts}
                 manageReadReceipts={!this.state.isPeeking}
                 manageReadMarkers={!this.state.isPeeking}
                 hidden={hideMessagePanel}
@@ -2003,6 +2020,10 @@ export default createReactClass({
             ? <RightPanel roomId={this.state.room.roomId} resizeNotifier={this.props.resizeNotifier} />
             : null;
 
+        const timelineClasses = classNames("mx_RoomView_timeline", {
+            mx_RoomView_timeline_rr_enabled: this.state.showReadReceipts,
+        });
+
         return (
             <RoomContext.Provider value={this.state}>
                 <main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref={this._roomView}>
@@ -2026,7 +2047,7 @@ export default createReactClass({
                         >
                             <div className={fadableSectionClasses}>
                                 {auxPanel}
-                                <div className="mx_RoomView_timeline">
+                                <div className={timelineClasses}>
                                     {topUnreadMessagesBar}
                                     {jumpToBottom}
                                     {messagePanel}

From 7224243e00e94144c33e86414fe366c852c06116 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 09:41:43 +0000
Subject: [PATCH 1654/3235] Break continuation on showHiddenEvents-rendered
 events

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a2ac93d282..4fd57d95e6 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -523,7 +523,8 @@ export default class MessagePanel extends React.Component {
         // if there is a previous event and it has the same sender as this event
         // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
         if (prevEvent !== null && prevEvent.sender && mxEv.sender && mxEv.sender.userId === prevEvent.sender.userId &&
-            (mxEv.getType() === prevEvent.getType() || eventTypeContinues) &&
+            // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
+            haveTileForEvent(prevEvent) && (mxEv.getType() === prevEvent.getType() || eventTypeContinues) &&
             (mxEv.getTs() - prevEvent.getTs() <= CONTINUATION_MAX_INTERVAL)) {
             continuation = true;
         }

From 759f71cb53c669c08721ed614cb04de0d7217b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 20 Mar 2020 11:38:43 +0100
Subject: [PATCH 1655/3235] Searching: Return an empty result if the search
 term is an empty string.

This mimics the behaviour we get from synapse as, this fixes
https://github.com/vector-im/riot-web/issues/12715.
---
 src/Searching.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Searching.js b/src/Searching.js
index a5d945f64b..663328fe41 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -87,6 +87,13 @@ async function localSearch(searchTerm, roomId = undefined) {
         searchArgs.room_id = roomId;
     }
 
+    const emptyResult = {
+        results: [],
+        highlights: [],
+    };
+
+    if (searchTerm === "") return emptyResult;
+
     const eventIndex = EventIndexPeg.get();
 
     const localResult = await eventIndex.search(searchArgs);
@@ -97,11 +104,6 @@ async function localSearch(searchTerm, roomId = undefined) {
         },
     };
 
-    const emptyResult = {
-        results: [],
-        highlights: [],
-    };
-
     const result = MatrixClientPeg.get()._processRoomEventsSearch(
         emptyResult, response);
 

From 7031698314c1262c5f3b2513bc86607cb3b814a7 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 20 Mar 2020 03:01:38 +0000
Subject: [PATCH 1656/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2217 of 2217 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 | 51 ++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 148f301fd3..51910d0a5d 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2229,5 +2229,54 @@
     "Server name": "伺服器名稱",
     "Add a new server...": "加入新的伺服器……",
     "%(networkName)s rooms": "%(networkName)s 聊天室",
-    "Matrix rooms": "Matrix 聊天室"
+    "Matrix rooms": "Matrix 聊天室",
+    "Keyboard Shortcuts": "鍵盤快捷鍵",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "使用他們的名字、使用者名稱（如 <userId/>）或電子郵件地址來與某人開始對話。",
+    "a new master key signature": "新的主控金鑰簽章",
+    "a new cross-signing key signature": "新的交叉簽署金鑰簽章",
+    "a device cross-signing signature": "裝置交叉簽署簽章",
+    "a key signature": "金鑰簽章",
+    "Riot encountered an error during upload of:": "Riot 在上傳以下內容時遇到錯誤：",
+    "Upload completed": "上傳完成",
+    "Cancelled signature upload": "已取消簽章上傳",
+    "Unabled to upload": "無法上傳",
+    "Signature upload success": "簽章上傳成功",
+    "Signature upload failed": "簽章上傳失敗",
+    "Navigation": "導航",
+    "Calls": "通話",
+    "Room List": "聊天室清單",
+    "Autocomplete": "自動完成",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "切換粗體",
+    "Toggle Italics": "切換斜體",
+    "Toggle Quote": "切換引用",
+    "Toggle Markdown": "切換 Markdown",
+    "New line": "新行",
+    "Navigate recent messages to edit": "瀏覽最近的消息以進行編輯",
+    "Jump to start/end of the composer": "跳到編輯區的開頭／結尾",
+    "Toggle microphone mute": "切換麥克風靜音",
+    "Toggle video on/off": "切換影片開啟／關閉",
+    "Jump to room search": "調到聊天室搜尋",
+    "Navigate up/down in the room list": "在聊天室清單中向上／向下瀏覽",
+    "Select room from the room list": "從聊天室清單中選取聊天室",
+    "Collapse room list section": "折疊聊天室清單部份",
+    "Expand room list section": "展開聊天室清單部份",
+    "Clear room list filter field": "清除聊天室清單過濾器欄位",
+    "Scroll up/down in the timeline": "在時間軸中向上／向下捲動",
+    "Toggle the top left menu": "切換左上方選單",
+    "Close dialog or context menu": "關閉對話框或右鍵選單",
+    "Activate selected button": "啟動已選取按鈕",
+    "Toggle this dialog": "切換此對話框",
+    "Move autocomplete selection up/down": "上下移動自動完成選擇",
+    "Cancel autocomplete": "取消自動完成",
+    "Page Up": "向上翻頁",
+    "Page Down": "向下翻頁",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End"
 }

From 0db36b92ca9a2fa9cb485bba026d05b0b8fe8fdd Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Fri, 20 Mar 2020 07:11:19 +0000
Subject: [PATCH 1657/3235] Translated using Weblate (Finnish)

Currently translated at 90.7% (2010 of 2217 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 0d21381f55..8f44d21c19 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2009,5 +2009,48 @@
     "Show padlocks on invite only rooms": "Näytä lukko vain-kutsu huoneissa",
     "Never send encrypted messages to unverified sessions from this session": "Älä koskaan lähetä salattuja viestejä vahvistamattomiin istuntoihin tästä istunnosta",
     "Never send encrypted messages to unverified sessions in this room from this session": "Älä lähetä salattuja viestejä vahvistamattomiin istuntoihin tässä huoneessa tässä istunnossa",
-    "Order rooms by name": "Suodata huoneet nimellä"
+    "Order rooms by name": "Suodata huoneet nimellä",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Tässä huoneessa on tuntemattomia istuntoja: jos jatkat varmentamatta niitä, saattaa olla, että joku kuuntelee puheluasi.",
+    "Review Sessions": "Tarkasta istunnot",
+    "If you cancel now, you won't complete verifying the other user.": "Jo peruutat nyt, toista käyttäjää ei varmenneta.",
+    "If you cancel now, you won't complete verifying your other session.": "Jos peruutat nyt, toista istuntoasi ei varmenneta.",
+    "If you cancel now, you won't complete your secret storage operation.": "Jos peruutat nyt, salavarasto-toimintoa ei suoriteta.",
+    "Setting up keys": "Otetaan avaimet käyttöön",
+    "Verifies a user, session, and pubkey tuple": "Varmentaa käyttäjän, istunnon ja julkiset avaimet",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROITUS: AVAIMEN VARMENTAMINEN EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s istunnon allekirjoitusavain on ”%(fprint)s”, mikä ei täsmää annettuun avaimeen ”%(fingerprint)s”. Tämä voi tarkoittaa, että yhteyksiänne peukaloidaan!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Antamasi allekirjoitusavain täsmää käyttäjältä %(userId)s saamaasi istunnon %(deviceId)s allekirjoitusavaimeen. Istunto on varmennettu.",
+    "Displays information about a user": "Näyttää tietoa käyttäjästä",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimen %(oldRoomName)s nimeksi %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisäsi vaihtoehtoisia osoitteita %(addresses)s tälle huoneelle.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisäsi vaihtoehtoisen osoitteen %(addresses)s tälle huoneelle.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s poisti vaihtoehtoisia osoitteita %(addresses)s tältä huoneelta.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s poisti vaihtoehtoisen osoitteitteen %(addresses)s tältä huoneelta.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutti tämän huoneen vaihtoehtoisia osoitteita.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutti tämän huoneen pää- sekä vaihtoehtoisia osoitteita.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s muutti tämän huoneen osoitteita.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) kirjautui uudella istunnolla varmentamatta sitä:",
+    "Show a presence dot next to DMs in the room list": "Näytä huonelistassa piste läsnäolon merkiksi yksityisviestien vieressä",
+    "Support adding custom themes": "Tue mukaututettujen teemojen lisäämistä",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Ota ristivarmennus käyttöön varmentaaksesi käyttäjät istuntojen sijaan (kehitysversio)",
+    "Show rooms with unread notifications first": "Näytä ensin huoneet, joissa on lukemattomia viestejä",
+    "Show shortcuts to recently viewed rooms above the room list": "Näytä oikotiet viimeiseksi katsottuihin huoneisiin huonelistan yläpuolella",
+    "Enable message search in encrypted rooms": "Ota viestihaku salausta käyttävissä huoneissa käyttöön",
+    "Keep secret storage passphrase in memory for this session": "Pidä salavaraston salalause muistissa tämän istunnon ajan",
+    "How fast should messages be downloaded.": "Kuinka nopeasti viestit pitäisi ladata.",
+    "Verify this session by completing one of the following:": "Varmenna tämä istunto tekemällä yhden seuraavista:",
+    "Scan this unique code": "Skannaa tämä uniikki koodi",
+    "Compare unique emoji": "Vertaa uniikkia emojia",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Vertaa kokoelmaa uniikkeja emojeja, jos kummassakaan laitteessa ei ole kameraa",
+    "Verify this device by confirming the following number appears on its screen.": "Varmenna tämä laite varmistamalla, että seuraava numero ilmestyy sen näytölle.",
+    "Waiting for %(displayName)s to verify…": "Odotetaan käyttäjän %(displayName)s varmennusta…",
+    "Cancelling…": "Peruutetaan…",
+    "They match": "Ne täsmäävät",
+    "They don't match": "Ne eivät täsmää",
+    "Verify yourself & others to keep your chats safe": "Varmenna itsesi ja muut pitääksesi keskustelunne suojassa",
+    "Other users may not trust it": "Muut eivät välttämättä luota siihen",
+    "Review": "Katselmoi",
+    "This bridge was provisioned by <user />.": "Tämän sillan tarjoaa käyttäjä <user />.",
+    "This bridge is managed by <user />.": "Tätä siltaa hallinnoi käyttäjä <user />.",
+    "Workspace: %(networkName)s": "Työtila: %(networkName)s",
+    "Channel: %(channelName)s": "Kanava: %(channelName)s"
 }

From ad367b1f54e84ac0ff54fa96dc6d522acadb02cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 20 Mar 2020 07:59:04 +0000
Subject: [PATCH 1658/3235] Translated using Weblate (French)

Currently translated at 100.0% (2217 of 2217 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 | 50 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8f0d526115..ca506aaecf 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2231,5 +2231,53 @@
     "Add a new server...": "Ajouter un nouveau serveur…",
     "%(networkName)s rooms": "%(networkName)s salons",
     "Matrix rooms": "Salons Matrix",
-    "Keyboard Shortcuts": "Raccourcis clavier"
+    "Keyboard Shortcuts": "Raccourcis clavier",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Commencez une conversation avec quelqu'un en utilisant son nom, son nom d’utilisateur (comme <userId/>) ou son adresse e-mail.",
+    "a new master key signature": "une nouvelle signature de clé principale",
+    "a new cross-signing key signature": "une nouvelle signature de clé de signature croisée",
+    "a device cross-signing signature": "une signature de signature croisée d’un appareil",
+    "a key signature": "une signature de clé",
+    "Riot encountered an error during upload of:": "Riot a rencontré une erreur pendant l’envoi de :",
+    "Upload completed": "Envoi terminé",
+    "Cancelled signature upload": "Envoi de signature annulé",
+    "Unabled to upload": "Envoi impossible",
+    "Signature upload success": "Succès de l’envoi de signature",
+    "Signature upload failed": "Échec de l’envoi de signature",
+    "Navigation": "Navigation",
+    "Calls": "Appels",
+    "Room List": "Liste de salons",
+    "Autocomplete": "Autocomplétion",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Maj",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "(Dés)activer le gras",
+    "Toggle Italics": "(Dés)activer l’italique",
+    "Toggle Quote": "(Dés)activer la citation",
+    "Toggle Markdown": "(Dés)activer le Markdown",
+    "New line": "Nouvelle ligne",
+    "Navigate recent messages to edit": "Parcourir les messages récents pour éditer",
+    "Jump to start/end of the composer": "Sauter au début/à la fin du compositeur",
+    "Toggle microphone mute": "(Dés)activer la sourdine du micro",
+    "Toggle video on/off": "Dés(activer) la vidéo",
+    "Jump to room search": "Sauter à la recherche de salon",
+    "Navigate up/down in the room list": "Parcourir avec haut/bas dans la liste des salons",
+    "Select room from the room list": "Sélectionner un salon de la liste des salons",
+    "Collapse room list section": "Réduire la section de la liste des salons",
+    "Expand room list section": "Développer la section de la liste des salons",
+    "Clear room list filter field": "Effacer le champ de filtrage de la liste des salons",
+    "Scroll up/down in the timeline": "Défiler vers le haut/le bas dans l’historique",
+    "Toggle the top left menu": "Afficher/masquer le menu en haut à gauche",
+    "Close dialog or context menu": "Fermer le dialogue ou le menu contextuel",
+    "Activate selected button": "Activer le bouton sélectionné",
+    "Toggle this dialog": "Afficher/masquer ce dialogue",
+    "Move autocomplete selection up/down": "Déplacer la sélection d’autocomplétion vers le haut/le bas",
+    "Cancel autocomplete": "Annuler l’autocomplétion",
+    "Page Up": "Page Haut",
+    "Page Down": "Page Bas",
+    "Esc": "Échap",
+    "Enter": "Entrée",
+    "Space": "Espace",
+    "End": "Fin"
 }

From d199468d0c9724bb8e267bc9cbf72dc43a0fc9e3 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 20 Mar 2020 10:25:26 +0000
Subject: [PATCH 1659/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2217 of 2217 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 | 51 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c4d6d2e512..a18aa8f760 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2227,5 +2227,54 @@
     "Server name": "Nome server",
     "Add a new server...": "Aggiungi un nuovo server...",
     "%(networkName)s rooms": "Stanze di %(networkName)s",
-    "Matrix rooms": "Stanze di Matrix"
+    "Matrix rooms": "Stanze di Matrix",
+    "Keyboard Shortcuts": "Scorciatoie da tastiera",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Inizia una conversazione con qualcuno usando il suo nome, nome utente (come <userId/>) o indirizzo email.",
+    "a new master key signature": "una nuova firma della chiave principale",
+    "a new cross-signing key signature": "una nuova firma della chiave a firma incrociata",
+    "a device cross-signing signature": "una firma incrociata di dispositivo",
+    "a key signature": "una firma di chiave",
+    "Riot encountered an error during upload of:": "Riot ha riscontrato un errore durante l'invio di:",
+    "Upload completed": "Invio completato",
+    "Cancelled signature upload": "Invio della firma annullato",
+    "Unabled to upload": "Impossibile inviare",
+    "Signature upload success": "Firma inviata correttamente",
+    "Signature upload failed": "Invio della firma fallito",
+    "Navigation": "Navigazione",
+    "Calls": "Chiamate",
+    "Room List": "Elenco stanze",
+    "Autocomplete": "Autocompletamento",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Grassetto sì/no",
+    "Toggle Italics": "Corsivo sì/no",
+    "Toggle Quote": "Cita sì/no",
+    "Toggle Markdown": "Markdown sì/no",
+    "New line": "Nuova riga",
+    "Navigate recent messages to edit": "Naviga i messaggi recenti da modificare",
+    "Jump to start/end of the composer": "Salta all'inizio/fine del compositore",
+    "Toggle microphone mute": "Attiva/disattiva microfono",
+    "Toggle video on/off": "Attiva/disattiva video",
+    "Jump to room search": "Salta alla ricerca stanze",
+    "Navigate up/down in the room list": "Naviga su/giù nell'elenco stanze",
+    "Select room from the room list": "Seleziona stanza dall'elenco stanze",
+    "Collapse room list section": "Riduci sezione elenco stanze",
+    "Expand room list section": "Espandi sezione elenco stanze",
+    "Clear room list filter field": "Svuota campo filtri elenco stanze",
+    "Scroll up/down in the timeline": "Scorri su/giù nella cronologia",
+    "Toggle the top left menu": "Attiva/disattiva menu in alto a sinistra",
+    "Close dialog or context menu": "Chiudi finestra o menu contestuale",
+    "Activate selected button": "Attiva pulsante selezionato",
+    "Toggle this dialog": "Commuta questa finestra",
+    "Move autocomplete selection up/down": "Sposta su/giù selezione autocompletamento",
+    "Cancel autocomplete": "Annulla autocompletamento",
+    "Page Up": "Pagina su",
+    "Page Down": "Pagina giù",
+    "Esc": "Esc",
+    "Enter": "Invio",
+    "Space": "Barra spaziatrice",
+    "End": "Fine"
 }

From 301b484371aca5204f94fdf34a48f79869b83e39 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Mar 2020 13:37:00 +0100
Subject: [PATCH 1660/3235] ask request if method is supported rather than
 checking ourselves

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 5dd01c9f79..38ee31c8b7 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -72,8 +72,8 @@ export default class VerificationPanel extends React.PureComponent {
 
     renderQRPhase(pending) {
         const {member, request} = this.props;
-        const showSAS = request.methods.includes(verificationMethods.SAS);
-        const showQR = this.props.request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
+        const showSAS = request.otherPartySupportsMethod(verificationMethods.SAS);
+        const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         const noCommonMethodError = !showSAS && !showQR ?

From 3185d6baf5e443db5f802b60cdd4a7b93b76c701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 20 Mar 2020 13:57:29 +0100
Subject: [PATCH 1661/3235] EventIndex: Add some logging to the file panel
 populating.

---
 src/indexing/EventIndex.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index abd6bcab6c..9e27451a78 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -716,14 +716,20 @@ export default class EventIndex extends EventEmitter {
             }
         });
 
+        let ret = false;
+        let paginationToken = "";
+
         // Set the pagination token to the oldest event that we retrieved.
         if (matrixEvents.length > 0) {
-            timeline.setPaginationToken(matrixEvents[matrixEvents.length - 1].getId(), EventTimeline.BACKWARDS);
-            return true;
-        } else {
-            timeline.setPaginationToken("", EventTimeline.BACKWARDS);
-            return false;
+            paginationToken = matrixEvents[matrixEvents.length - 1].getId();
+            ret = true;
         }
+
+        console.log("EventIndex: Populating file panel with", matrixEvents.length,
+                    "events and setting the pagination token to", paginationToken);
+
+        timeline.setPaginationToken(paginationToken, EventTimeline.BACKWARDS);
+        return ret;
     }
 
     /**

From 510b71b0e5c63cbef5c92f8cd490e38426266db6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Mar 2020 16:30:49 +0100
Subject: [PATCH 1662/3235] extract manual device verification out of device
 verify dialog

as the plan is to remove the latter
---
 .../ManualDeviceKeyVerificationDialog.js      | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
new file mode 100644
index 0000000000..35cd0ea20d
--- /dev/null
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -0,0 +1,91 @@
+/*
+Copyright 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2019 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+
+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 {MatrixClientPeg} from '../../../MatrixClientPeg';
+import * as sdk from '../../../index';
+import * as FormattingUtils from '../../../utils/FormattingUtils';
+import { _t } from '../../../languageHandler';
+
+export default class ManualDeviceKeyVerificationDialog extends React.Component {
+    static propTypes = {
+        userId: PropTypes.string.isRequired,
+        device: PropTypes.object.isRequired,
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    _onCancelClick = () => {
+        this.props.onFinished(false);
+    }
+
+    _onLegacyFinished = (confirm) => {
+        if (confirm) {
+            MatrixClientPeg.get().setDeviceVerified(
+                this.props.userId, this.props.device.deviceId, true,
+            );
+        }
+        this.props.onFinished(confirm);
+    }
+
+    render() {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
+
+        let text;
+        if (MatrixClientPeg.get().getUserId() === this.props.userId) {
+            text = _t("To verify that this session can be trusted, please check that the key you see " +
+                "in User Settings on that device matches the key below:");
+        } else {
+            text = _t("To verify that this session 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 session matches the key below:");
+        }
+
+        const key = FormattingUtils.formatCryptoKey(this.props.device.getFingerprint());
+        const body = (
+            <div>
+                <p>
+                    { text }
+                </p>
+                <div className="mx_DeviceVerifyDialog_cryptoSection">
+                    <ul>
+                        <li><label>{ _t("Session name") }:</label> <span>{ this.props.device.getDisplayName() }</span></li>
+                        <li><label>{ _t("Session ID") }:</label> <span><code>{ this.props.device.deviceId }</code></span></li>
+                        <li><label>{ _t("Session key") }:</label> <span><code><b>{ key }</b></code></span></li>
+                    </ul>
+                </div>
+                <p>
+                    { _t("If it matches, press the verify button below. " +
+                        "If it doesn't, then someone else is intercepting this session " +
+                        "and you probably want to press the blacklist button instead.") }
+                </p>
+            </div>
+        );
+
+        return (
+            <QuestionDialog
+                title={_t("Verify session")}
+                description={body}
+                button={_t("I verify that the keys match")}
+                onFinished={this._onLegacyFinished}
+            />
+        );
+    }
+}

From 073c2c525f6a9270b9666b573a7d28ba8510f9b8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Mar 2020 16:31:23 +0100
Subject: [PATCH 1663/3235] Add "legacy verify" button to untrusted session
 dialog

---
 src/i18n/strings/en_EN.json |  3 +-
 src/verification.js         | 69 +++++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c3befa2298..e04946b5a3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -294,8 +294,9 @@
     "Not Trusted": "Not Trusted",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Legacy Verify Device": "Legacy Verify Device",
+    "Verify Device by Emoji": "Verify Device by Emoji",
     "Done": "Done",
-    "Manually Verify": "Manually Verify",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
     "%(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 …",
diff --git a/src/verification.js b/src/verification.js
index 4443079b95..00905acf8e 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -39,38 +39,55 @@ async function enable4SIfNeeded() {
     return true;
 }
 
+function UntrustedDeviceDialog(props) {
+    const {device, user, onFinished} = props;
+    const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
+    const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    return <BaseDialog
+        onFinished={onFinished}
+        headerImage={require("../res/img/e2e/warning.svg")}
+        title={_t("Not Trusted")}>
+        <div className="mx_Dialog_content" id='mx_Dialog_content'>
+            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+            <p>{device.getDisplayName()} ({device.deviceId})</p>
+            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+        </div>
+        <div className='mx_Dialog_buttons'>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Legacy Verify Device")}</AccessibleButton>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("sas")}>{_t("Verify Device by Emoji")}</AccessibleButton>
+            <AccessibleButton kind="primary" onClick={() => onFinished()}>{_t("Done")}</AccessibleButton>
+        </div>
+    </BaseDialog>;
+}
+
 export async function verifyDevice(user, device) {
     if (!await enable4SIfNeeded()) {
         return;
     }
-    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-    Modal.createTrackedDialog("Verification warning", "unverified session", QuestionDialog, {
-        headerImage: require("../res/img/e2e/warning.svg"),
-        title: _t("Not Trusted"),
-        description: <div>
-            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
-            <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
-        </div>,
-        onFinished: async (doneClicked) => {
-            const manuallyVerifyClicked = !doneClicked;
-            if (!manuallyVerifyClicked) {
-                return;
+    Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
+        user,
+        device,
+        onFinished: async (action) => {
+            if (action === "sas") {
+                const cli = MatrixClientPeg.get();
+                const verificationRequestPromise = cli.legacyDeviceVerification(
+                    user.userId,
+                    device.deviceId,
+                    verificationMethods.SAS,
+                );
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {member: user, verificationRequestPromise},
+                });
+            } else if (action === "legacy") {
+                const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                Modal.createTrackedDialog("Legacy verify session", "legacy verify session", ManualDeviceKeyVerificationDialog, {
+                    userId: user.userId,
+                    device,
+                });
             }
-            const cli = MatrixClientPeg.get();
-            const verificationRequestPromise = cli.legacyDeviceVerification(
-                user.userId,
-                device.deviceId,
-                verificationMethods.SAS,
-            );
-            dis.dispatch({
-                action: "set_right_panel_phase",
-                phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                refireParams: {member: user, verificationRequestPromise},
-            });
         },
-        primaryButton: _t("Done"),
-        cancelButton: _t("Manually Verify"),
     });
 }
 

From b97b8873054491476735fbc6080f0974da0797c5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 19 Mar 2020 16:35:41 +0100
Subject: [PATCH 1664/3235] fix lint

---
 .../dialogs/ManualDeviceKeyVerificationDialog.js      |  1 -
 src/verification.js                                   | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
index 35cd0ea20d..3d944d279f 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -46,7 +46,6 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
 
     render() {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
 
         let text;
         if (MatrixClientPeg.get().getUserId() === this.props.userId) {
diff --git a/src/verification.js b/src/verification.js
index 00905acf8e..e33a569a73 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -82,10 +82,13 @@ export async function verifyDevice(user, device) {
                 });
             } else if (action === "legacy") {
                 const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
-                Modal.createTrackedDialog("Legacy verify session", "legacy verify session", ManualDeviceKeyVerificationDialog, {
-                    userId: user.userId,
-                    device,
-                });
+                Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
+                    ManualDeviceKeyVerificationDialog,
+                    {
+                        userId: user.userId,
+                        device,
+                    },
+                );
             }
         },
     });

From 1620f2159bbf03bbaffce77e5ec2e4e25b6a37b2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Mar 2020 14:45:22 +0100
Subject: [PATCH 1665/3235] add 2020 foundation copyright

---
 .../views/dialogs/ManualDeviceKeyVerificationDialog.js           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
index 3d944d279f..2db090a901 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -3,6 +3,7 @@ Copyright 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 39bd1da1d0b2d1c23554c8cb3a55cc7fcfda4f54 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 20 Mar 2020 15:30:17 +0100
Subject: [PATCH 1666/3235] update copy

---
 .../dialogs/ManualDeviceKeyVerificationDialog.js    | 13 ++++---------
 src/i18n/strings/en_EN.json                         |  7 +++++--
 src/verification.js                                 |  4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
index 2db090a901..4b9d7239e6 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -50,12 +50,9 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
 
         let text;
         if (MatrixClientPeg.get().getUserId() === this.props.userId) {
-            text = _t("To verify that this session can be trusted, please check that the key you see " +
-                "in User Settings on that device matches the key below:");
+            text = _t("Confirm by comparing the following with the User Settings in your other session:");
         } else {
-            text = _t("To verify that this session 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 session matches the key below:");
+            text = _t("Confirm this user's session by comparing the following with their User Settings:");
         }
 
         const key = FormattingUtils.formatCryptoKey(this.props.device.getFingerprint());
@@ -72,9 +69,7 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
                     </ul>
                 </div>
                 <p>
-                    { _t("If it matches, press the verify button below. " +
-                        "If it doesn't, then someone else is intercepting this session " +
-                        "and you probably want to press the blacklist button instead.") }
+                    { _t("If they don't match, the security of your communication may be compromised.") }
                 </p>
             </div>
         );
@@ -83,7 +78,7 @@ export default class ManualDeviceKeyVerificationDialog extends React.Component {
             <QuestionDialog
                 title={_t("Verify session")}
                 description={body}
-                button={_t("I verify that the keys match")}
+                button={_t("Verify session")}
                 onFinished={this._onLegacyFinished}
             />
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e04946b5a3..4ff7ebc9c1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -294,8 +294,8 @@
     "Not Trusted": "Not Trusted",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
-    "Legacy Verify Device": "Legacy Verify Device",
-    "Verify Device by Emoji": "Verify Device by Emoji",
+    "Manually Verify by Text": "Manually Verify by Text",
+    "Interactively verify by Emoji": "Interactively verify by Emoji",
     "Done": "Done",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
@@ -1614,6 +1614,9 @@
     "Manually export keys": "Manually export keys",
     "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
+    "Confirm by comparing the following with the User Settings in your other session:": "Confirm by comparing the following with the User Settings in your other session:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirm this user's session by comparing the following with their User Settings:",
+    "If they don't match, the security of your communication may be compromised.": "If they don't match, the security of your communication may be compromised.",
     "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
     "Message edits": "Message edits",
     "Your account is not secure": "Your account is not secure",
diff --git a/src/verification.js b/src/verification.js
index e33a569a73..d0f6fd7806 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -53,8 +53,8 @@ function UntrustedDeviceDialog(props) {
             <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
         </div>
         <div className='mx_Dialog_buttons'>
-            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Legacy Verify Device")}</AccessibleButton>
-            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("sas")}>{_t("Verify Device by Emoji")}</AccessibleButton>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>
+            <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("sas")}>{_t("Interactively verify by Emoji")}</AccessibleButton>
             <AccessibleButton kind="primary" onClick={() => onFinished()}>{_t("Done")}</AccessibleButton>
         </div>
     </BaseDialog>;

From 8a0ee2fd34adfd5d7cdd03e625284458892f427a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 20 Mar 2020 16:00:50 +0000
Subject: [PATCH 1667/3235] iterate PR

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 5ae240013c..9428de3e22 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -129,12 +129,12 @@ export default class RoomSubList extends React.PureComponent {
                 if (this.state.hidden && !this.props.forceExpand &&
                     this.props.list.some((r) => r.roomId === payload.room_id)
                 ) {
-                    this.onClick();
+                    this.toggle();
                 }
         }
     };
 
-    onClick = (ev) => {
+    toggle = () => {
         if (this.isCollapsibleOnClick()) {
             // The header isCollapsible, so the click is to be interpreted as collapse and truncation logic
             const isHidden = !this.state.hidden;
@@ -147,6 +147,10 @@ export default class RoomSubList extends React.PureComponent {
         }
     };
 
+    onClick = (ev) => {
+        this.toggle();
+    };
+
     onHeaderKeyDown = (ev) => {
         switch (ev.key) {
             case Key.ARROW_LEFT:

From 252972e159899a96c79e18e27223dd36edb637f4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Mar 2020 18:53:31 +0000
Subject: [PATCH 1668/3235] Dismiss SSSS migration toast once migration done

---
 src/DeviceListener.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 03a701d715..1835347838 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -50,6 +50,7 @@ export default class DeviceListener {
         MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
         MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+        MatrixClientPeg.get().on('accountData', this._onAccountData);
         this._recheck();
     }
 
@@ -58,6 +59,7 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
             MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
+            MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
         }
         this._dismissed.clear();
     }
@@ -87,6 +89,13 @@ export default class DeviceListener {
         this._recheck();
     }
 
+    _onAccountData = (ev) => {
+        // User may have migrated SSSS to symmetric, in which case we can dismiss that toast
+        if (ev.getType().startsWith('m.secret_storage.key.')) {
+            this._recheck();
+        }
+    }
+
     // The server doesn't tell us when key backup is set up, so we poll
     // & cache the result
     async _getKeyBackupInfo() {

From ba1d245af92b2235864253f263145fbe7eacaa74 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Mar 2020 19:01:26 +0000
Subject: [PATCH 1669/3235] Make SSSS migration toast dismissable

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 1835347838..a03119f37c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -157,6 +157,11 @@ export default class DeviceListener {
             }
             return;
         } else if (await cli.secretStorageKeyNeedsUpgrade()) {
+            if (this._dismissedThisDeviceToast) {
+                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+                return;
+            }
+
             // FIXME: do we a different message?
             ToastStore.sharedInstance().addOrReplaceToast({
                 key: THIS_DEVICE_TOAST_KEY,

From 94d23c815adbaec0bd24adb4809a902f8a7100b3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Mar 2020 14:19:47 -0600
Subject: [PATCH 1670/3235] Improve naming of Jitsi conferences

Fixes https://github.com/vector-im/riot-web/issues/12812
---
 package.json             |  1 +
 src/CallHandler.js       |  7 ++-----
 src/utils/NamingUtils.ts | 29 +++++++++++++++++++++++++++++
 src/utils/WidgetUtils.js |  2 ++
 yarn.lock                | 10 +++++++++-
 5 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 src/utils/NamingUtils.ts

diff --git a/package.json b/package.json
index f1dec0195c..1ff0fb6f55 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
+    "project-name-generator": "^2.1.7",
     "prop-types": "^15.5.8",
     "qrcode": "^1.4.4",
     "qrcode-react": "^0.1.16",
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7ec4e7d8bb..b21f07ad4f 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -65,6 +65,7 @@ import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore, { SettingLevel } from './settings/SettingsStore';
+import {generateHumanReadableId} from "./utils/NamingUtils";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -429,16 +430,12 @@ async function _startCallApp(roomId, type) {
         return;
     }
 
-    // This inherits its poor naming from the field of the same name that goes into
-    // the event. It's just a random string to make the Jitsi URLs unique.
-    const widgetSessionId = Math.random().toString(36).substring(2);
-    const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
+    const confId = `JitsiConference_${generateHumanReadableId()}`;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
     const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
 
     const widgetData = {
-        widgetSessionId, // TODO: Remove this eventually
         conferenceId: confId,
         isAudioOnly: type === 'voice',
         domain: jitsiDomain,
diff --git a/src/utils/NamingUtils.ts b/src/utils/NamingUtils.ts
new file mode 100644
index 0000000000..44ccb9b030
--- /dev/null
+++ b/src/utils/NamingUtils.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as projectNameGenerator from "project-name-generator";
+
+/**
+ * Generates a human readable identifier. This should not be used for anything
+ * which needs secure/cryptographic random: just a level uniquness that is offered
+ * by something like Date.now().
+ * @returns {string} The randomly generated ID
+ */
+export function generateHumanReadableId(): string {
+    return projectNameGenerator({words: 3}).raw.map(w => {
+        return w[0].toUpperCase() + w.substring(1).toLowerCase();
+    }).join('');
+}
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 7d6bf5e90d..7823ca2531 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -475,6 +475,8 @@ export default class WidgetUtils {
     }
 
     static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean}) {
+        if (!opts) opts = {};
+
         // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
         const queryString = [
             'conferenceDomain=$domain',
diff --git a/yarn.lock b/yarn.lock
index d0934ffc31..582d89137e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2444,7 +2444,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.1, commander@^2.19.0, commander@^2.20.0:
+commander@^2.12.1, commander@^2.15.1, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -6692,6 +6692,14 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+project-name-generator@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/project-name-generator/-/project-name-generator-2.1.7.tgz#504c68a2a843247aa3af493a226ecf78ce8beceb"
+  integrity sha512-kLGQGiyvkZsWtqhPhUs85UkSgmH5OnZJLNrtlqkK+GZPR0cybe8Nr9jG3bD52w2siH9EE3l/a9y56bn0YX5wYw==
+  dependencies:
+    commander "^2.15.1"
+    lodash "^4.17.10"
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"

From d0afd65652bbfcc2888b73219310bb02794be8e5 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Sat, 21 Mar 2020 10:12:55 +0100
Subject: [PATCH 1671/3235] fix view community link icon contrast

Signed-off-by: thobyv-kismat <vivee18@gmail.com>
---
 res/css/structures/_TagPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 472831c0d9..c1c5d92d3c 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -137,7 +137,7 @@ limitations under the License.
     top: -8px;
     border-radius: 8px;
     background-color: $neutral-badge-color;
-    color: #ffffff;
+    color: #000;
     font-weight: 600;
     font-size: 10px;
     text-align: center;

From ca02ff493c6cd8cef6dc74fd3696b9884f521b2c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 21 Mar 2020 10:42:07 +0000
Subject: [PATCH 1672/3235] Fix local jitsi build url fail and missing argument

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallHandler.js       |  2 +-
 src/utils/WidgetUtils.js | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 7ec4e7d8bb..86674afd7d 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -435,7 +435,7 @@ async function _startCallApp(roomId, type) {
     const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
-    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
+    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({});
 
     const widgetData = {
         widgetSessionId, // TODO: Remove this eventually
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 7d6bf5e90d..26e29b49f8 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -485,19 +485,16 @@ export default class WidgetUtils {
             'userId=$matrix_user_id',
         ].join('&');
 
-        let currentUrl = window.location.href.split('#')[0];
-        if (!currentUrl.startsWith("https://") && !opts.forLocalRender) {
+        let baseUrl = window.location;
+        if (window.location.protocol !== "https:" && !opts.forLocalRender) {
             // Use an external wrapper if we're not locally rendering the widget. This is usually
             // the URL that will end up in the widget event, so we want to make sure it's relatively
             // safe to send.
             // We'll end up using a local render URL when we see a Jitsi widget anyways, so this is
             // really just for backwards compatibility and to appease the spec.
-            currentUrl = "https://riot.im/app";
+            baseUrl = "https://riot.im/app";
         }
-        if (!currentUrl.endsWith('/')) {
-            currentUrl = `${currentUrl}/`;
-        }
-
-        return currentUrl + "jitsi.html#" + queryString;
+        const url = new URL("jitsi.html#" + queryString, baseUrl); // this strips hash fragment from baseUrl
+        return url.href;
     }
 }

From 506927ad8aa7cdd1337b60dfd02db65c22a29169 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 21 Mar 2020 10:49:55 +0000
Subject: [PATCH 1673/3235] change to defaults

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CallHandler.js       | 2 +-
 src/utils/WidgetUtils.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 86674afd7d..7ec4e7d8bb 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -435,7 +435,7 @@ async function _startCallApp(roomId, type) {
     const confId = room.roomId.replace(/[^A-Za-z0-9]/g, '') + widgetSessionId;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
-    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({});
+    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
 
     const widgetData = {
         widgetSessionId, // TODO: Remove this eventually
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 26e29b49f8..e92fd1ed27 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -474,7 +474,7 @@ export default class WidgetUtils {
         return encodeURIComponent(`${widgetLocation}::${widgetUrl}`);
     }
 
-    static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean}) {
+    static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean}={}) {
         // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
         const queryString = [
             'conferenceDomain=$domain',

From f57dc8e8ae789928958eca3b7617f4652eeafc63 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sat, 21 Mar 2020 02:14:42 +0000
Subject: [PATCH 1674/3235] Translated using Weblate (German)

Currently translated at 74.9% (1666 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3ef5b09a89..b543a49bfd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1565,7 +1565,7 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen in diesem Raum",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Durch die Änderung des Passworts werden derzeit alle End-zu-End-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, Sie exportieren zuerst Ihre Raumschlüssel und importieren sie anschließend wieder. In Zukunft wird dies verbessert werden.",
     "Delete %(count)s sessions|other": "Lösche %(count)s Sitzungen",
-    "Backup is not signed by any of your sessions": "Die Sicherung ist von keiner Ihrer Sitzungen unterzeichnet.",
+    "Backup is not signed by any of your sessions": "Die Sicherung ist von keiner Ihrer Sitzungen unterzeichnet",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ihr Passwort wurde erfolgreich geändert. Sie erhalten keine Push-Benachrichtigungen zu anderen Sitzungen, bis Sie sich wieder bei diesen anmelden",
     "Sessions": "Sitzungen",
     "Notification sound": "Benachrichtigungston",

From e0e07d63695acc9ee3fb31dafb9c88d128f06fec Mon Sep 17 00:00:00 2001
From: simon klemenc <simon@booya.at>
Date: Sat, 21 Mar 2020 15:26:57 +0000
Subject: [PATCH 1675/3235] Translated using Weblate (German)

Currently translated at 74.9% (1666 of 2224 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b543a49bfd..700eec9ee5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1717,5 +1717,8 @@
     "Review Sessions": "Sitzungen überprüfen",
     "Displays information about a user": "Zeigt Informationen über einen Benutzer",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt."
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert"
 }

From 5ef0d4bef688a9269af07bcc6fdd977c7e74bc54 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:27:20 +0000
Subject: [PATCH 1676/3235] Translated using Weblate (German)

Currently translated at 75.0% (1667 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 700eec9ee5..7d48d914be 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1720,5 +1720,5 @@
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
-    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert"
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert."
 }

From a3c86ec5a8d81fb97885f4f725ab8f0d025cc220 Mon Sep 17 00:00:00 2001
From: simon klemenc <simon@booya.at>
Date: Sat, 21 Mar 2020 15:27:24 +0000
Subject: [PATCH 1677/3235] Translated using Weblate (German)

Currently translated at 75.0% (1667 of 2224 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7d48d914be..0a92f0f379 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1720,5 +1720,6 @@
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
-    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert."
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert"
 }

From 011e4c2beddbce088eb9ad2791ab5fc19a21e502 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:27:34 +0000
Subject: [PATCH 1678/3235] Translated using Weblate (German)

Currently translated at 75.0% (1668 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0a92f0f379..727f8265de 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1721,5 +1721,5 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert"
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert."
 }

From bf7a79be6a9e9488cc89c33bd2dc3e0cbc02fcda Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:27:52 +0000
Subject: [PATCH 1679/3235] Translated using Weblate (German)

Currently translated at 75.0% (1668 of 2224 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 727f8265de..ae1fe68d1a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1721,5 +1721,6 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert."
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für User, die %(glob)s entsprechen"
 }

From 8120b373be84f4dbee537ce907589f22fe6ed402 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:28:06 +0000
Subject: [PATCH 1680/3235] Translated using Weblate (German)

Currently translated at 75.2% (1672 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ae1fe68d1a..542e299086 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1722,5 +1722,5 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert.",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für User, die %(glob)s entsprechen"
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer, die %(glob)s entsprechen"
 }

From f794372483f3eccd582e2529040066a05b0222b1 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:28:15 +0000
Subject: [PATCH 1681/3235] Translated using Weblate (German)

Currently translated at 75.2% (1672 of 2224 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 542e299086..98714328e3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1722,5 +1722,9 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert.",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer, die %(glob)s entsprechen"
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer, die %(glob)s entsprechen",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für User, die aufgrund von %(reason)s %(glob)s entsprechen"
 }

From 2a44767911651500b3c45bec2f89930f6132240b Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:29:10 +0000
Subject: [PATCH 1682/3235] Translated using Weblate (German)

Currently translated at 75.4% (1676 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 98714328e3..a369723fbc 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1726,5 +1726,5 @@
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für User, die aufgrund von %(reason)s %(glob)s entsprechen"
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer, die aufgrund von %(reason)s %(glob)s entsprechen"
 }

From c3e29ad56bb42a0bebe97347188e67ce00f2fbc9 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:29:18 +0000
Subject: [PATCH 1683/3235] Translated using Weblate (German)

Currently translated at 75.4% (1676 of 2224 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a369723fbc..f028cb3f9f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1726,5 +1726,9 @@
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer, die aufgrund von %(reason)s %(glob)s entsprechen"
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für User, die wegen %(reason)s %(glob)s entspricht"
 }

From ed00da768b0144eff34eaf7de28f5791b7dd5798 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:30:16 +0000
Subject: [PATCH 1684/3235] Translated using Weblate (German)

Currently translated at 75.4% (1677 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f028cb3f9f..45c9be1c8d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1730,5 +1730,5 @@
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für User, die wegen %(reason)s %(glob)s entspricht"
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht"
 }

From b1fc5b5cb36d0bdd3d77d64c79a631410c726ab1 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:30:22 +0000
Subject: [PATCH 1685/3235] Translated using Weblate (German)

Currently translated at 75.4% (1677 of 2224 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 45c9be1c8d..2f7f1bb995 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1730,5 +1730,6 @@
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht"
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht"
 }

From b86deab8373c3bbaa09652d3914c37889779c477 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:30:33 +0000
Subject: [PATCH 1686/3235] Translated using Weblate (German)

Currently translated at 75.4% (1678 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 2f7f1bb995..0de7c0708e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1731,5 +1731,5 @@
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht"
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht"
 }

From 2b40fb477531966fe56fcbc9c537262fabbfb139 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:30:36 +0000
Subject: [PATCH 1687/3235] Translated using Weblate (German)

Currently translated at 75.4% (1678 of 2224 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0de7c0708e..e3d9ef5804 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1731,5 +1731,6 @@
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht"
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen"
 }

From e1c57c97488358dc8ecef783d2f0b2ebd3eb1411 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 21 Mar 2020 03:07:37 +0000
Subject: [PATCH 1688/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2224 of 2224 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 51910d0a5d..6c60acc60f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2278,5 +2278,14 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "Manually Verify by Text": "手動驗證文字",
+    "Interactively verify by Emoji": "透過表情符號進行互動式驗證",
+    "Confirm by comparing the following with the User Settings in your other session:": "透過比較以下內容與您其他的工作階段中的使用者設定來確認：",
+    "Confirm this user's session by comparing the following with their User Settings:": "透過將以下內容與其他使用者的使用者設定比較來確認他們的工作階段：",
+    "If they don't match, the security of your communication may be compromised.": "如果它們不相符，則可能會威脅到您的通訊安全。",
+    "Navigate composer history": "瀏覽編輯區歷史紀錄",
+    "Previous/next unread room or DM": "上一下／下一個未讀聊天室或直接訊息",
+    "Previous/next room or DM": "上一個／下一個聊天室或直接訊息",
+    "Toggle right panel": "切換右側面板"
 }

From f895eb5a0891250e05ecb53cad68ccab440a87ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 21 Mar 2020 08:51:59 +0000
Subject: [PATCH 1689/3235] Translated using Weblate (French)

Currently translated at 100.0% (2224 of 2224 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ca506aaecf..258d9950b5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2279,5 +2279,14 @@
     "Esc": "Échap",
     "Enter": "Entrée",
     "Space": "Espace",
-    "End": "Fin"
+    "End": "Fin",
+    "Manually Verify by Text": "Vérifier manuellement avec un texte",
+    "Interactively verify by Emoji": "Vérifier de façon interactive avec des émojis",
+    "Confirm by comparing the following with the User Settings in your other session:": "Confirmez en comparant ceci avec les paramètres utilisateurs de votre autre session :",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirmez la session de cet utilisateur en comparant ceci avec ses paramètres utilisateur :",
+    "If they don't match, the security of your communication may be compromised.": "S’ils ne correspondent pas, la sécurité de vos communications est peut-être compromise.",
+    "Navigate composer history": "Explorer l’historique du compositeur",
+    "Previous/next unread room or DM": "Salon ou message direct non lu précédent/suivant",
+    "Previous/next room or DM": "Salon ou message direct précédent/suivant",
+    "Toggle right panel": "Afficher/masquer le panneau de droite"
 }

From 945f0d77f0bbb566ed517b0153f987e4719cb335 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Sat, 21 Mar 2020 15:30:49 +0000
Subject: [PATCH 1690/3235] Translated using Weblate (German)

Currently translated at 75.5% (1679 of 2224 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e3d9ef5804..9657d3fe71 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1732,5 +1732,5 @@
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen"
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen"
 }

From 610daf5e6b114a8f83f44900aa2e0e0d13376d6b Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 21 Mar 2020 15:31:12 +0000
Subject: [PATCH 1691/3235] Translated using Weblate (German)

Currently translated at 75.5% (1679 of 2224 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9657d3fe71..2eb24c29bf 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1732,5 +1732,6 @@
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht",
-    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen"
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel, die aufgrund von %(reason)s %(glob)s entsprechen"
 }

From 7520c75b41b15c217ab911884e558ebcaa79ab2b Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Fri, 20 Mar 2020 23:42:14 +0000
Subject: [PATCH 1692/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 48.3% (1074 of 2224 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index f8e647a20e..bb2e51a5af 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -395,7 +395,7 @@
     "Close": "Lukk",
     "Remote addresses for this room:": "Fjernadresser for dette rommet:",
     "Local addresses for this room:": "Lokaladresser for dette rommet:",
-    "This room has no local addresses": "Dette rommer har ingen lokaladresser",
+    "This room has no local addresses": "Dette rommet har ingen lokaladresser",
     "New address (e.g. #foo:%(localDomain)s)": "Ny adresse (t.d. #foo:%(localDomain)s)",
     "Invalid community ID": "Ugyldig fellesskaps-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gyldig fellesskaps-ID",

From 4c08bd6bad63de0ff43e5c50efeee56f341d2e24 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 21 Mar 2020 11:51:39 +0000
Subject: [PATCH 1693/3235] Translated using Weblate (Polish)

Currently translated at 60.6% (1348 of 2224 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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 1eaa11409a..fbe8ac86ca 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -195,7 +195,7 @@
     "Hangup": "Rozłącz się",
     "Home": "Strona startowa",
     "Homeserver is": "Serwer domowy to",
-    "Identity Server is": "Serwer Identity to",
+    "Identity Server is": "Serwer tożsamości to",
     "I have verified my email address": "Zweryfikowałem swój adres e-mail",
     "Import": "Importuj",
     "Import E2E room keys": "Importuj klucze pokoju E2E",
@@ -1144,7 +1144,7 @@
     "The file '%(fileName)s' failed to upload.": "Nie udało się przesłać pliku '%(fileName)s'.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Plik '%(fileName)s' przekracza limit rozmiaru dla tego serwera głównego",
     "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Poproś swojego administratora Riot by sprawdzić <a>Twoją konfigurację</a> względem niewłaściwych lub zduplikowanych elementów.",
-    "Cannot reach identity server": "Nie można połączyć się z Serwerem Tożsamości",
+    "Cannot reach identity server": "Nie można połączyć się z serwerem tożsamości",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Możesz się zarejestrować, lecz niektóre funkcje nie będą dostępne dopóki Serwer Tożsamości nie będzie znów online. Jeśli ciągle widzisz to ostrzeżenie, sprawdź swoją konfigurację lub skontaktuj się z administratorem serwera.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Możesz zresetować hasło, lecz niektóre funkcje nie będą dostępne dopóki Serwer Tożsamości nie będzie znów online. Jeśli ciągle widzisz to ostrzeżenie, sprawdź swoją konfigurację lub skontaktuj się z administratorem serwera.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Możesz się zalogować, lecz niektóre funkcje nie będą dostępne dopóki Serwer Tożsamości nie będzie znów online. Jeśli ciągle widzisz to ostrzeżenie, sprawdź swoją konfigurację lub skontaktuj się z administratorem serwera.",
@@ -1301,7 +1301,7 @@
     "Filter": "Filtruj",
     "Add room": "Dodaj pokój",
     "Request media permissions": "Zapytaj o uprawnienia",
-    "Voice & Video": "Głos & Wideo",
+    "Voice & Video": "Głos i wideo",
     "this room": "ten pokój",
     "View older messages in %(roomName)s.": "Wyświetl starsze wiadomości w %(roomName)s.",
     "Room information": "Informacje o pokoju",
@@ -1368,5 +1368,10 @@
     "Rotate Right": "Obróć w prawo",
     "Rotate clockwise": "Obróć zgodnie z ruchem wskazówek zegara",
     "Help": "Pomoc",
-    "Passwords don't match": "Hasła nie zgadzają się"
+    "Passwords don't match": "Hasła nie zgadzają się",
+    "Never send encrypted messages to unverified sessions from this session": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji z tej sesji",
+    "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
+    "Enable audible notifications for this session": "Włącz powiadomienia dźwiękowe dla tej sesji",
+    "Sessions": "Sesje",
+    "Direct Messages": "Wiadomości bezpośrednie"
 }

From c17c47d88b6217296ce505ec58cdf68d89adaf43 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 21 Mar 2020 11:35:07 -0600
Subject: [PATCH 1694/3235] Remove null check that was fixed in another PR

See https://github.com/matrix-org/matrix-react-sdk/pull/4255
---
 src/utils/WidgetUtils.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 7823ca2531..7d6bf5e90d 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -475,8 +475,6 @@ export default class WidgetUtils {
     }
 
     static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean}) {
-        if (!opts) opts = {};
-
         // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
         const queryString = [
             'conferenceDomain=$domain',

From c417245945d1d219f210b68d78d0c2292cb11043 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sat, 21 Mar 2020 09:08:19 +0000
Subject: [PATCH 1695/3235] Translated using Weblate (Turkish)

Currently translated at 76.5% (1701 of 2224 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 28e9108902..d0582a7e49 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1705,5 +1705,29 @@
     "Cancel entering passphrase?": "Parola girişini iptal et?",
     "%(senderName)s changed the alternative addresses for this room.": "Bu oda için alternatif adresler %(senderName)s tarafından değiştirildi.",
     "%(senderName)s changed the main and alternative addresses for this room.": "Bu oda için ana ve alternatif adresler %(senderName)s tarafından değiştirildi.",
-    "%(senderName)s changed the addresses for this room.": "Bu oda adresleri %(senderName)s tarafından değiştirildi."
+    "%(senderName)s changed the addresses for this room.": "Bu oda adresleri %(senderName)s tarafından değiştirildi.",
+    "Upgrade public room": "Açık odayı güncelle",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Bu odayı <oldVersion /> versiyonundan <newVersion /> versiyonuna güncelleyeceksiniz.",
+    "We encountered an error trying to restore your previous session.": "Önceki oturumunuzu geri yüklerken bir hatayla karşılaştık.",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Bir kullanıcı adı sadece küçük karakterler, numaralar ve  '=_-./' karakterlerini içerebilir",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Bunun gelecekte de olmasının önüne geçmek için lütfen <a>günceleri bize gönderin</a>.",
+    "To continue you need to accept the terms of this service.": "Devam etmek için bu servisi kullanma şartlarını kabul etmeniz gerekiyor.",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "“%(RoomName)s” odası sizin daha önce görmediğiniz oturumlar içeriyor.",
+    "Upload files (%(current)s of %(total)s)": "Dosyaları yükle (%(current)s / %(total)s)",
+    "Incorrect recovery passphrase": "Hatalı kurtarma parolası",
+    "Failed to decrypt %(failedCount)s sessions!": "Çözümlemesi başarısız olan  %(failedCount)s oturum!",
+    "Restored %(sessionCount)s session keys": "Geri yüklenen %(sessionCount)s oturum anahtarı",
+    "Enter recovery passphrase": "Kurtarma parolasını girin",
+    "Confirm your identity by entering your account password below.": "Hesabınızın şifresini aşağıya girerek kimliğinizi teyit edin.",
+    "An email has been sent to %(emailAddress)s": "%(emailAddress)s adresine bir e-posta gönderildi",
+    "A text message has been sent to %(msisdn)s": "%(msisdn)s ye bir metin mesajı gönderildi",
+    "Use lowercase letters, numbers, dashes and underscores only": "Sadece küçük harfler, numara, tire ve alt tire kullanın",
+    "Join millions for free on the largest public server": "En büyük açık sunucu üzerindeki milyonlara ücretsiz ulaşmak için katılın",
+    "Find other public servers or use a custom server": "Diğer açık sunucuları bulun ya da özel bir sunucu kullanın",
+    "Add rooms to the community summary": "Topluluk özetine odaları ekleyin",
+    "Which rooms would you like to add to this summary?": "Hangi odaları bu özete eklemek istersiniz?",
+    "%(inviter)s has invited you to join this community": "%(inviter)s sizi bu topluluğa katılmanız için davet etti",
+    "This room is not public. You will not be able to rejoin without an invite.": "Bu oda açık bir oda değil. Davet almadan tekrar katılamayacaksınız.",
+    "%(creator)s created and configured the room.": "%(creator)s odayı oluşturdu ve yapılandırdı.",
+    "Riot failed to get the public room list.": "Açık oda listesini getirirken Riot başarısız oldu."
 }

From 8822bb06f1b4a4a9cf8b2f210f469710c50b81d5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 22 Mar 2020 02:14:50 +0000
Subject: [PATCH 1696/3235] Update WidgetUtils.js

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

diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index e92fd1ed27..45ca7602bd 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -492,7 +492,7 @@ export default class WidgetUtils {
             // safe to send.
             // We'll end up using a local render URL when we see a Jitsi widget anyways, so this is
             // really just for backwards compatibility and to appease the spec.
-            baseUrl = "https://riot.im/app";
+            baseUrl = "https://riot.im/app/";
         }
         const url = new URL("jitsi.html#" + queryString, baseUrl); // this strips hash fragment from baseUrl
         return url.href;

From 27ec81f1a2632e20d907f1220cf5e0521f606f39 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 22 Mar 2020 09:41:14 +0000
Subject: [PATCH 1697/3235] Migrate RoomView to React Contexts in the hope for
 better temporal stability

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles              |   5 -
 src/components/structures/RoomView.js | 149 ++++++++++++--------------
 2 files changed, 71 insertions(+), 83 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index ffd398cb14..9973cfb120 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -1,6 +1,5 @@
 # autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
 
-src/component-index.js
 src/components/structures/RoomDirectory.js
 src/components/structures/RoomStatusBar.js
 src/components/structures/RoomView.js
@@ -10,7 +9,6 @@ src/components/structures/UploadBar.js
 src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
-src/components/views/dialogs/DeactivateAccountDialog.js
 src/components/views/dialogs/SetPasswordDialog.js
 src/components/views/dialogs/UnknownDeviceDialog.js
 src/components/views/elements/AddressSelector.js
@@ -31,7 +29,6 @@ src/components/views/rooms/MemberInfo.js
 src/components/views/rooms/MemberList.js
 src/components/views/rooms/RoomList.js
 src/components/views/rooms/RoomPreviewBar.js
-src/components/views/rooms/SearchBar.js
 src/components/views/rooms/SearchResultTile.js
 src/components/views/settings/ChangeAvatar.js
 src/components/views/settings/ChangePassword.js
@@ -44,7 +41,6 @@ src/notifications/ContentRules.js
 src/notifications/PushRuleVectorState.js
 src/PlatformPeg.js
 src/rageshake/rageshake.js
-src/rageshake/submit-rageshake.js
 src/ratelimitedfunc.js
 src/Rooms.js
 src/Unread.js
@@ -60,7 +56,6 @@ test/components/views/dialogs/InteractiveAuthDialog-test.js
 test/mock-clock.js
 test/notifications/ContentRules-test.js
 test/notifications/PushRuleVectorState-test.js
-test/stores/RoomViewStore-test.js
 src/component-index.js
 test/end-to-end-tests/node_modules/
 test/end-to-end-tests/riot/
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 0bdbf44bcd..5fd5f42f78 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -30,7 +30,6 @@ import classNames from 'classnames';
 import { _t } from '../../languageHandler';
 import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks';
 
-import {MatrixClientPeg} from '../../MatrixClientPeg';
 import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
 import * as sdk from '../../index';
@@ -55,6 +54,7 @@ import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -97,8 +97,12 @@ export default createReactClass({
         viaServers: PropTypes.arrayOf(PropTypes.string),
     },
 
+    statics: {
+        contextType: MatrixClientContext,
+    },
+
     getInitialState: function() {
-        const llMembers = MatrixClientPeg.get().hasLazyLoadMembersEnabled();
+        const llMembers = this.context.hasLazyLoadMembersEnabled();
         return {
             room: null,
             roomId: null,
@@ -165,17 +169,17 @@ export default createReactClass({
 
     componentWillMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
-        MatrixClientPeg.get().on("Room", this.onRoom);
-        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
-        MatrixClientPeg.get().on("Room.name", this.onRoomName);
-        MatrixClientPeg.get().on("Room.accountData", this.onRoomAccountData);
-        MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
-        MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
-        MatrixClientPeg.get().on("Room.myMembership", this.onMyMembership);
-        MatrixClientPeg.get().on("accountData", this.onAccountData);
-        MatrixClientPeg.get().on("crypto.keyBackupStatus", this.onKeyBackupStatus);
-        MatrixClientPeg.get().on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        MatrixClientPeg.get().on("userTrustStatusChanged", this.onUserVerificationChanged);
+        this.context.on("Room", this.onRoom);
+        this.context.on("Room.timeline", this.onRoomTimeline);
+        this.context.on("Room.name", this.onRoomName);
+        this.context.on("Room.accountData", this.onRoomAccountData);
+        this.context.on("RoomState.events", this.onRoomStateEvents);
+        this.context.on("RoomState.members", this.onRoomStateMember);
+        this.context.on("Room.myMembership", this.onMyMembership);
+        this.context.on("accountData", this.onAccountData);
+        this.context.on("crypto.keyBackupStatus", this.onKeyBackupStatus);
+        this.context.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        this.context.on("userTrustStatusChanged", this.onUserVerificationChanged);
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this._onRightPanelStoreUpdate);
@@ -245,7 +249,7 @@ export default createReactClass({
         // NB: This does assume that the roomID will not change for the lifetime of
         // the RoomView instance
         if (initial) {
-            newState.room = MatrixClientPeg.get().getRoom(newState.roomId);
+            newState.room = this.context.getRoom(newState.roomId);
             if (newState.room) {
                 newState.showApps = this._shouldShowApps(newState.room);
                 this._onRoomLoaded(newState.room);
@@ -347,7 +351,7 @@ export default createReactClass({
                     peekLoading: true,
                     isPeeking: true, // this will change to false if peeking fails
                 });
-                MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
+                this.context.peekInRoom(roomId).then((room) => {
                     if (this.unmounted) {
                         return;
                     }
@@ -380,7 +384,7 @@ export default createReactClass({
                 });
             } else if (room) {
                 // Stop peeking because we have joined this room previously
-                MatrixClientPeg.get().stopPeeking();
+                this.context.stopPeeking();
                 this.setState({isPeeking: false});
             }
         }
@@ -477,18 +481,18 @@ export default createReactClass({
             roomView.removeEventListener('dragend', this.onDragLeaveOrEnd);
         }
         dis.unregister(this.dispatcherRef);
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room", this.onRoom);
-            MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
-            MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
-            MatrixClientPeg.get().removeListener("Room.accountData", this.onRoomAccountData);
-            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
-            MatrixClientPeg.get().removeListener("Room.myMembership", this.onMyMembership);
-            MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
-            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
-            MatrixClientPeg.get().removeListener("crypto.keyBackupStatus", this.onKeyBackupStatus);
-            MatrixClientPeg.get().removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
-            MatrixClientPeg.get().removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
+        if (this.context) {
+            this.context.removeListener("Room", this.onRoom);
+            this.context.removeListener("Room.timeline", this.onRoomTimeline);
+            this.context.removeListener("Room.name", this.onRoomName);
+            this.context.removeListener("Room.accountData", this.onRoomAccountData);
+            this.context.removeListener("RoomState.events", this.onRoomStateEvents);
+            this.context.removeListener("Room.myMembership", this.onMyMembership);
+            this.context.removeListener("RoomState.members", this.onRoomStateMember);
+            this.context.removeListener("accountData", this.onAccountData);
+            this.context.removeListener("crypto.keyBackupStatus", this.onKeyBackupStatus);
+            this.context.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
+            this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -538,7 +542,6 @@ export default createReactClass({
         }
     },
 
-
     onKeyDown: function(ev) {
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
@@ -578,9 +581,7 @@ export default createReactClass({
                   payload.data.description || payload.data.name);
               break;
             case 'picture_snapshot':
-                ContentMessages.sharedInstance().sendContentListToRoom(
-                    [payload.file], this.state.room.roomId, MatrixClientPeg.get(),
-                );
+                ContentMessages.sharedInstance().sendContentListToRoom([payload.file], this.state.room.roomId, this.context);
                 break;
             case 'notifier_enabled':
             case 'upload_started':
@@ -669,7 +670,7 @@ export default createReactClass({
         // we'll only be showing a spinner.
         if (this.state.joining) return;
 
-        if (ev.getSender() !== MatrixClientPeg.get().credentials.userId) {
+        if (ev.getSender() !== this.context.credentials.userId) {
             // update unread count when scrolled up
             if (!this.state.searchResults && this.state.atEndOfLiveTimeline) {
                 // no change
@@ -725,8 +726,7 @@ export default createReactClass({
 
     _loadMembersIfJoined: async function(room) {
         // lazy load members if enabled
-        const cli = MatrixClientPeg.get();
-        if (cli.hasLazyLoadMembersEnabled()) {
+        if (this.context.hasLazyLoadMembersEnabled()) {
             if (room && room.getMyMembership() === 'join') {
                 try {
                     await room.loadMembersIfNeeded();
@@ -761,7 +761,7 @@ export default createReactClass({
 
     _updatePreviewUrlVisibility: function({roomId}) {
         // URL Previews in E2EE rooms can be a privacy leak so use a different setting which is per-room explicit
-        const key = MatrixClientPeg.get().isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
+        const key = this.context.isRoomEncrypted(roomId) ? 'urlPreviewsEnabled_e2ee' : 'urlPreviewsEnabled';
         this.setState({
             showUrlPreview: SettingsStore.getValue(key, roomId),
         });
@@ -795,11 +795,10 @@ export default createReactClass({
     },
 
     _updateE2EStatus: async function(room) {
-        const cli = MatrixClientPeg.get();
-        if (!cli.isRoomEncrypted(room.roomId)) {
+        if (!this.context.isRoomEncrypted(room.roomId)) {
             return;
         }
-        if (!cli.isCryptoEnabled()) {
+        if (!this.context.isCryptoEnabled()) {
             // If crypto is not currently enabled, we aren't tracking devices at all,
             // so we don't know what the answer is. Let's error on the safe side and show
             // a warning for this case.
@@ -824,21 +823,21 @@ export default createReactClass({
         const verified = [];
         const unverified = [];
         e2eMembers.map(({userId}) => userId)
-            .filter((userId) => userId !== cli.getUserId())
+            .filter((userId) => userId !== this.context.getUserId())
             .forEach((userId) => {
-                (cli.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId)
+                (this.context.checkUserTrust(userId).isCrossSigningVerified() ?
+                verified : unverified).push(userId);
             });
 
         debuglog("e2e verified", verified, "unverified", unverified);
 
         /* Check all verified user devices. */
         /* Don't alarm if no other users are verified  */
-        const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
+        const targets = (verified.length > 0) ? [...verified, this.context.getUserId()] : verified;
         for (const userId of targets) {
-            const devices = await cli.getStoredDevicesForUser(userId);
+            const devices = await this.context.getStoredDevicesForUser(userId);
             const anyDeviceNotVerified = devices.some(({deviceId}) => {
-                return !cli.checkDeviceTrust(userId, deviceId).isVerified();
+                return !this.context.checkDeviceTrust(userId, deviceId).isVerified();
             });
             if (anyDeviceNotVerified) {
                 this.setState({
@@ -920,7 +919,7 @@ export default createReactClass({
 
     _updatePermissions: function(room) {
         if (room) {
-            const me = MatrixClientPeg.get().getUserId();
+            const me = this.context.getUserId();
             const canReact = room.getMyMembership() === "join" && room.currentState.maySendEvent("m.reaction", me);
             const canReply = room.maySendMessage();
 
@@ -1004,7 +1003,7 @@ export default createReactClass({
 
         if (this.state.searchResults.next_batch) {
             debuglog("requesting more search results");
-            const searchPromise = MatrixClientPeg.get().backPaginateRoomEventsSearch(
+            const searchPromise = this.context.backPaginateRoomEventsSearch(
                 this.state.searchResults);
             return this._handleSearchResult(searchPromise);
         } else {
@@ -1030,10 +1029,8 @@ export default createReactClass({
     },
 
     onJoinButtonClicked: function(ev) {
-        const cli = MatrixClientPeg.get();
-
         // If the user is a ROU, allow them to transition to a PWLU
-        if (cli && cli.isGuest()) {
+        if (this.context && this.context.isGuest()) {
             // Join this room once the user has registered and logged in
             // (If we failed to peek, we may not have a valid room object.)
             dis.dispatch({
@@ -1130,7 +1127,7 @@ export default createReactClass({
         ev.stopPropagation();
         ev.preventDefault();
         ContentMessages.sharedInstance().sendContentListToRoom(
-            ev.dataTransfer.files, this.state.room.roomId, MatrixClientPeg.get(),
+            ev.dataTransfer.files, this.state.room.roomId, this.context,
         );
         this.setState({ draggingFile: false });
         dis.dispatch({action: 'focus_composer'});
@@ -1143,12 +1140,12 @@ export default createReactClass({
     },
 
     injectSticker: function(url, info, text) {
-        if (MatrixClientPeg.get().isGuest()) {
+        if (this.context.isGuest()) {
             dis.dispatch({action: 'require_registration'});
             return;
         }
 
-        ContentMessages.sharedInstance().sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
+        ContentMessages.sharedInstance().sendStickerContentToRoom(url, this.state.room.roomId, info, text, this.context)
             .then(undefined, (error) => {
                 if (error.name === "UnknownDeviceError") {
                     // Let the staus bar handle this
@@ -1239,12 +1236,9 @@ export default createReactClass({
     },
 
     getSearchResultTiles: function() {
-        const EventTile = sdk.getComponent('rooms.EventTile');
         const SearchResultTile = sdk.getComponent('rooms.SearchResultTile');
         const Spinner = sdk.getComponent("elements.Spinner");
 
-        const cli = MatrixClientPeg.get();
-
         // XXX: todo: merge overlapping results somehow?
         // XXX: why doesn't searching on name work?
 
@@ -1252,21 +1246,21 @@ export default createReactClass({
 
         if (this.state.searchInProgress) {
             ret.push(<li key="search-spinner">
-                         <Spinner />
-                     </li>);
+                 <Spinner />
+             </li>);
         }
 
         if (!this.state.searchResults.next_batch) {
             if (this.state.searchResults.results.length == 0) {
                 ret.push(<li key="search-top-marker">
-                         <h2 className="mx_RoomView_topMarker">{ _t("No results") }</h2>
-                         </li>,
-                        );
+                     <h2 className="mx_RoomView_topMarker">{ _t("No results") }</h2>
+                 </li>,
+                );
             } else {
                 ret.push(<li key="search-top-marker">
-                         <h2 className="mx_RoomView_topMarker">{ _t("No more results") }</h2>
-                         </li>,
-                        );
+                     <h2 className="mx_RoomView_topMarker">{ _t("No more results") }</h2>
+                 </li>,
+                );
             }
         }
 
@@ -1286,7 +1280,7 @@ export default createReactClass({
 
             const mxEv = result.context.getEvent();
             const roomId = mxEv.getRoomId();
-            const room = cli.getRoom(roomId);
+            const room = this.context.getRoom(roomId);
 
             if (!haveTileForEvent(mxEv)) {
                 // XXX: can this ever happen? It will make the result count
@@ -1353,7 +1347,7 @@ export default createReactClass({
     },
 
     onForgetClick: function() {
-        MatrixClientPeg.get().forget(this.state.room.roomId).then(function() {
+        this.context.forget(this.state.room.roomId).then(function() {
             dis.dispatch({ action: 'view_next_room' });
         }, function(err) {
             const errCode = err.errcode || _t("unknown error code");
@@ -1370,7 +1364,7 @@ export default createReactClass({
         this.setState({
             rejecting: true,
         });
-        MatrixClientPeg.get().leave(this.state.roomId).then(function() {
+        this.context.leave(this.state.roomId).then(function() {
             dis.dispatch({ action: 'view_next_room' });
             self.setState({
                 rejecting: false,
@@ -1397,15 +1391,14 @@ export default createReactClass({
             rejecting: true,
         });
 
-        const cli = MatrixClientPeg.get();
         try {
-            const myMember = this.state.room.getMember(cli.getUserId());
+            const myMember = this.state.room.getMember(this.context.getUserId());
             const inviteEvent = myMember.events.member;
-            const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
+            const ignoredUsers = this.context.getIgnoredUsers();
             ignoredUsers.push(inviteEvent.getSender()); // de-duped internally in the js-sdk
-            await cli.setIgnoredUsers(ignoredUsers);
+            await this.context.setIgnoredUsers(ignoredUsers);
 
-            await cli.leave(this.state.roomId);
+            await this.context.leave(this.state.roomId);
             dis.dispatch({ action: 'view_next_room' });
             this.setState({
                 rejecting: false,
@@ -1624,7 +1617,7 @@ export default createReactClass({
         const createEvent = this.state.room.currentState.getStateEvents("m.room.create", "");
         if (!createEvent || !createEvent.getContent()['predecessor']) return null;
 
-        return MatrixClientPeg.get().getRoom(createEvent.getContent()['predecessor']['room_id']);
+        return this.context.getRoom(createEvent.getContent()['predecessor']['room_id']);
     },
 
     _getHiddenHighlightCount: function() {
@@ -1718,7 +1711,7 @@ export default createReactClass({
                     </ErrorBoundary>
                 );
             } else {
-                const myUserId = MatrixClientPeg.get().credentials.userId;
+                const myUserId = this.context.credentials.userId;
                 const myMember = this.state.room.getMember(myUserId);
                 const inviteEvent = myMember.events.member;
                 var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
@@ -1785,13 +1778,13 @@ export default createReactClass({
         const showRoomUpgradeBar = (
             roomVersionRecommendation &&
             roomVersionRecommendation.needsUpgrade &&
-            this.state.room.userMayUpgradeRoom(MatrixClientPeg.get().credentials.userId)
+            this.state.room.userMayUpgradeRoom(this.context.credentials.userId)
         );
 
         const showRoomRecoveryReminder = (
             SettingsStore.getValue("showRoomRecoveryReminder") &&
-            MatrixClientPeg.get().isRoomEncrypted(this.state.room.roomId) &&
-            !MatrixClientPeg.get().getKeyBackupEnabled()
+            this.context.isRoomEncrypted(this.state.room.roomId) &&
+            !this.context.getKeyBackupEnabled()
         );
 
         const hiddenHighlightCount = this._getHiddenHighlightCount();
@@ -1862,7 +1855,7 @@ export default createReactClass({
         const auxPanel = (
             <AuxPanel room={this.state.room}
               fullHeight={false}
-              userId={MatrixClientPeg.get().credentials.userId}
+              userId={this.context.credentials.userId}
               conferenceHandler={this.props.ConferenceHandler}
               draggingFile={this.state.draggingFile}
               displayConfCallNotification={this.state.displayConfCallNotification}

From a8861f8893b79178df9c96fc8275306f88a4a2e0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 22 Mar 2020 09:47:00 +0000
Subject: [PATCH 1698/3235] add await for _clearStorage

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Lifecycle.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 72cd84bfd9..b9fbf4f1bc 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -313,7 +313,7 @@ async function _restoreFromLocalStorage(opts) {
     }
 }
 
-function _handleLoadSessionFailure(e) {
+async function _handleLoadSessionFailure(e) {
     console.error("Unable to load session", e);
 
     const SessionRestoreErrorDialog =
@@ -323,16 +323,15 @@ function _handleLoadSessionFailure(e) {
         error: e.message,
     });
 
-    return modal.finished.then(([success]) => {
-        if (success) {
-            // user clicked continue.
-            _clearStorage();
-            return false;
-        }
+    const [success] = await modal.finished;
+    if (success) {
+        // user clicked continue.
+        await _clearStorage();
+        return false;
+    }
 
-        // try, try again
-        return loadSession();
-    });
+    // try, try again
+    return loadSession();
 }
 
 /**

From 94cda51f97f89b4772e117a259c440ac35e21f40 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 22 Mar 2020 16:51:46 +0000
Subject: [PATCH 1699/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2224 of 2224 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 | 59 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9edad65ff9..5610493999 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2218,5 +2218,62 @@
     "Matrix rooms": "Matrix gelak",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ireki badagoen saio bat eta erabili hura hau egiaztatzeko, mezu zifratuetara sarbidea emanez.",
     "Waiting…": "Itxaroten…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ezin baduzu bat atzitu, <button>erabili berreskuratze gakoa edo pasahitza.</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ezin baduzu bat atzitu, <button>erabili berreskuratze gakoa edo pasahitza.</button>",
+    "Manually Verify by Text": "Egiaztatu eskuz testu bidez",
+    "Interactively verify by Emoji": "Egiaztatu interaktiboki Emoji bidez",
+    "Keyboard Shortcuts": "Teklatu lasterbideak",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Hasi elkarrizketa norbaitekin bere izena, erabiltzaile izena (esaterako <userId/>) edo e-mail helbidea erabiliz.",
+    "a new master key signature": "gako nagusiaren sinadura berria",
+    "a new cross-signing key signature": "zeharkako sinatze gako sinadura berria",
+    "a device cross-signing signature": "gailuz zeharkako sinadura berria",
+    "a key signature": "gako sinadura",
+    "Riot encountered an error during upload of:": "Riotek errorea aurkitu du hau igotzean:",
+    "Upload completed": "Igoera burututa",
+    "Cancelled signature upload": "Sinadura igoera ezeztatuta",
+    "Unabled to upload": "Ezin izan da igo",
+    "Signature upload success": "Sinaduren igoera ongi burutu da",
+    "Signature upload failed": "Sinaduren igoerak huts egin du",
+    "Confirm by comparing the following with the User Settings in your other session:": "Berretsi honako hau zure beste saioaren erabiltzaile-ezarpenetan agertzen denarekin alderatuz:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Baieztatu erabiltzaile saio hau, honako hau bestearen erabiltzaile-ezarpenekin alderatuz:",
+    "If they don't match, the security of your communication may be compromised.": "Ez badatoz bat, komunikazioaren segurtasuna konprometitua egon daiteke.",
+    "Navigation": "Nabigazioa",
+    "Calls": "Deiak",
+    "Room List": "Gelen zerrenda",
+    "Autocomplete": "Osatze automatikoa",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Maius.",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Txandakatu lodia",
+    "Toggle Italics": "Txandakatu etzana",
+    "Toggle Quote": "Txandakatu aipamena",
+    "New line": "Lerro berria",
+    "Navigate recent messages to edit": "Nabigatu azken mezuetara editatzeko",
+    "Jump to start/end of the composer": "Jauzi konposatzailearen hasierara/amaierara",
+    "Navigate composer history": "Nabigatu konposatzailearen historiala",
+    "Toggle microphone mute": "Txandakatu mikrofonoa mututzea",
+    "Toggle video on/off": "Txandakatu bideoa bai/ez",
+    "Jump to room search": "Jauzi gelaren bilaketara",
+    "Navigate up/down in the room list": "Nabigatu gora/behera gelen zerrendan",
+    "Select room from the room list": "Hautatu gela gelen zerrendan",
+    "Collapse room list section": "Tolestu gelen zerrendako hautaketa",
+    "Expand room list section": "Hedatu gelen zerrendako hautaketa",
+    "Clear room list filter field": "Garbitu gelen zerrendaren iragazki eremua",
+    "Scroll up/down in the timeline": "Korritu gora/behera denbora-lerroan",
+    "Previous/next unread room or DM": "Aurreko/hurrengo irakurri gabeko gela edo mezu zuzena",
+    "Previous/next room or DM": "Aurreko/hurrengo gela edo mezu zuzena",
+    "Toggle the top left menu": "Txandakatu goi ezkerreko menua",
+    "Close dialog or context menu": "Itxi elkarrizketa-koadroa edo laster-menua",
+    "Activate selected button": "Aktibatu hautatutako botoia",
+    "Toggle right panel": "Txandakatu eskumako panela",
+    "Toggle this dialog": "Txandakatu elkarrizketa-koadro hau",
+    "Move autocomplete selection up/down": "Mugitu osatze automatikoaren hautaketa gora/behera",
+    "Cancel autocomplete": "Ezeztatu osatze automatikoa",
+    "Page Up": "Orrialdea gora",
+    "Page Down": "Orrialdea behera",
+    "Esc": "Esc",
+    "Enter": "Sartu",
+    "Space": "Zuriune-barra",
+    "End": "Amaiera"
 }

From cccdf03d6416f62de0e00b7180629bea1f401deb Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 22 Mar 2020 09:10:39 +0000
Subject: [PATCH 1700/3235] Translated using Weblate (Bulgarian)

Currently translated at 83.4% (1855 of 2224 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index a62f66edfb..4fbe3b2903 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1884,5 +1884,13 @@
     "Direct Messages": "Директни съобщения",
     "Go": "Давай",
     "Failed to find the following users": "Неуспешно откриване на следните потребители",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следните потребители не съществуват или са невалидни и не могат да бъдат поканени: %(csvNames)s"
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следните потребители не съществуват или са невалидни и не могат да бъдат поканени: %(csvNames)s",
+    "The version of Riot": "Версията на Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Дали използвате Riot на устройство, на което основния механизъм за достъп е докосване",
+    "Whether you're using Riot as an installed Progressive Web App": "Дали използвате Riot като инсталирано прогресивно уеб приложение (PWA)",
+    "Your user agent": "Информация за браузъра ви",
+    "The information being sent to us to help make Riot better includes:": "Информацията, която се изпраща за да ни помогне да подобрим Riot включва:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В тази стая има непознати сесии: ако продължите без да ги потвърдите, ще е възможно някой да подслуша обаждането ви.",
+    "Review Sessions": "Прегледай сесиите",
+    "If you cancel now, you won't complete verifying the other user.": "Ако се откажете сега, няма да завършите верификацията на другия потребител."
 }

From 093213a41ef67a4861619bf63b51700e9da9ea69 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Sun, 22 Mar 2020 11:28:14 +0000
Subject: [PATCH 1701/3235] Translated using Weblate (Dutch)

Currently translated at 95.5% (2124 of 2224 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 300488b7df..874ae9bf3a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -573,7 +573,7 @@
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s is %(count)s keer toegetreden",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s is toegetreden",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s is %(count)s keer weggegaan",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s is weggegaan",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s zijn weggegaan",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s is %(count)s keer weggegaan",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s is weggegaan",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s zijn %(count)s keer toegetreden en weggegaan",

From fe7084e8546cef599acc6713bb33a7b42ec2b723 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sun, 22 Mar 2020 19:40:59 +0000
Subject: [PATCH 1702/3235] Translated using Weblate (Japanese)

Currently translated at 54.7% (1217 of 2224 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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 1dbbcad09e..bbc698b3ff 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -923,11 +923,11 @@
     "NOT verified": "検証されていない",
     "verified": "検証済み",
     "Verification": "検証",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "Ed25519 fingerprint": "Ed25519フィンガープリント",
     "User ID": "ユーザーID",
-    "Curve25519 identity key": "Curve25519 identity key",
+    "Curve25519 identity key": "Curve25519 ID鍵",
     "none": "無し",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
+    "Claimed Ed25519 fingerprint key": "Claimed Ed25519フィンガープリント鍵",
     "Algorithm": "アルゴリズム",
     "unencrypted": "暗号化されていない",
     "Decryption error": "復号化エラー",
@@ -1240,5 +1240,10 @@
     "Filter rooms…": "部屋を検索…",
     "Preview": "プレビュー",
     "The version of Riot": "Riot のバージョン",
-    "Your user agent": "あなたの User Agent"
+    "Your user agent": "あなたの User Agent",
+    "Bold": "太字",
+    "Italics": "イタリック体",
+    "React": "リアクション",
+    "Quick Reactions": "一般的なリアクション",
+    "Share Permalink": "パーマリンクを共有"
 }

From 00b9435f7fe74b810d15efcae676350fc1b2a393 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Sun, 22 Mar 2020 19:37:15 +0000
Subject: [PATCH 1703/3235] Translated using Weblate (Turkish)

Currently translated at 77.5% (1724 of 2224 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index d0582a7e49..4728cdd319 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1729,5 +1729,28 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s sizi bu topluluğa katılmanız için davet etti",
     "This room is not public. You will not be able to rejoin without an invite.": "Bu oda açık bir oda değil. Davet almadan tekrar katılamayacaksınız.",
     "%(creator)s created and configured the room.": "%(creator)s odayı oluşturdu ve yapılandırdı.",
-    "Riot failed to get the public room list.": "Açık oda listesini getirirken Riot başarısız oldu."
+    "Riot failed to get the public room list.": "Açık oda listesini getirirken Riot başarısız oldu.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu odada bilinmeyen oturumlar mevcut: eğer doğrulamadan devam ederseniz, birilerinin çağrılarınıza göz atma durumu ortaya çıkabilir.",
+    "If you cancel now, you won't complete your secret storage operation.": "Eğer şimdi iptal ederseniz, sır depolama operasyonunu tamamlamış olmayacaksınız.",
+    "Show these rooms to non-members on the community page and room list?": "Bu odaları oda listesinde ve topluluğun sayfasında üye olmayanlara göster?",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu odaya alternatif olarak %(addresses)s adreslerini ekledi.",
+    "Waiting for partner to accept...": "Partnerin kabul etmesi için bekleniyor...",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Sohbet için gönderilen davetin başarısız olduğu kullanıcılar: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Kullanıcıların davet edilmesinde bir şeyler yanlış gitti.",
+    "a new master key signature": "yeni bir master anahtar imzası",
+    "a new cross-signing key signature": "yeni bir çapraz-imzalama anahtarı imzası",
+    "a key signature": "bir anahtar imzası",
+    "Upload completed": "Yükleme tamamlandı",
+    "Cancelled signature upload": "anahtar yükleme iptal edildi",
+    "Unabled to upload": "Yüklenemedi",
+    "Signature upload success": "Anahtar yükleme başarılı",
+    "Signature upload failed": "İmza yükleme başarısız",
+    "If you didn’t sign in to this session, your account may be compromised.": "Eğer bu oturuma bağlanmadıysanız, hesabınız ele geçirilmiş olabilir.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Bu dosyalar yükleme için <b>çok büyük</b>. Dosya boyut limiti %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Bazı dosyalar yükleme için <b>çok büyük</b>. Dosya boyutu limiti %(limit)s.",
+    "Waiting…": "Bekleniyor…",
+    "Failed to re-authenticate due to a homeserver problem": "Anasunucu problemi yüzünden yeniden kimlik doğrulama başarısız",
+    "Failed to re-authenticate": "Yeniden kimlik doğrulama başarısız",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Yeni bir kurtarma parolası ve Güvenli Mesajlar için anahtar tespit edildi.",
+    "Not currently indexing messages for any room.": "Şu an hiç bir odada mesaj indeksleme yapılmıyor."
 }

From 51c78809e6b9a55244175ef385f3703d65272a7f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 23 Mar 2020 12:34:23 +0100
Subject: [PATCH 1704/3235] filter room list by canonical and alternative
 aliases

---
 src/components/views/rooms/RoomList.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 2143c7f1a8..4327f93d9f 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -596,8 +596,13 @@ export default createReactClass({
         // case insensitive if room name includes filter,
         // or if starts with `#` and one of room's aliases starts with filter
         return list.filter((room) => {
-            if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
-                return true;
+            if (filter[0] === "#") {
+                if (room.getCanonicalAlias() && room.getCanonicalAlias().toLowerCase().startsWith(lcFilter)) {
+                    return true;
+                }
+                if (room.getAltAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
+                    return true;
+                }
             }
             return room.name && utils.removeHiddenChars(room.name.toLowerCase()).toLowerCase().includes(fuzzyFilter);
         });

From 146969083538019ce73ba9e451c4fd8a6d463a84 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 23 Mar 2020 14:48:55 +0000
Subject: [PATCH 1705/3235] Fix logout when Olm failed to load.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/LogoutDialog.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index fed1310469..23a6692b39 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -21,7 +21,6 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import SettingsStore from "../../../settings/SettingsStore";
 
 export default class LogoutDialog extends React.Component {
     defaultProps = {
@@ -36,8 +35,8 @@ export default class LogoutDialog extends React.Component {
         this._onSetRecoveryMethodClick = this._onSetRecoveryMethodClick.bind(this);
         this._onLogoutConfirm = this._onLogoutConfirm.bind(this);
 
-        const lowBandwidth = SettingsStore.getValue("lowBandwidth");
-        const shouldLoadBackupStatus = !lowBandwidth && !MatrixClientPeg.get().getKeyBackupEnabled();
+        const cli = MatrixClientPeg.get();
+        const shouldLoadBackupStatus = cli.isCryptoEnabled() && !cli.getKeyBackupEnabled();
 
         this.state = {
             shouldLoadBackupStatus: shouldLoadBackupStatus,

From eae690f3efdfa7177eca3356b507cc515e3e5159 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Mar 2020 15:52:59 +0000
Subject: [PATCH 1706/3235] Always display verification request toasts on top

As they're interactive and time-sensitive.

Fixes https://github.com/vector-im/riot-web/issues/12141
---
 src/components/structures/MatrixChat.js |  1 +
 src/stores/ToastStore.js                | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b2f4493d5b..52002f0591 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1524,6 +1524,7 @@ export default createReactClass({
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
+                    priority: ToastStore.PRIORITY_REALTIME,
                 });
             }
         });
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index 2c4464813b..f17d13bf9e 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -20,6 +20,9 @@ import EventEmitter from 'events';
  * Holds the active toasts
  */
 export default class ToastStore extends EventEmitter {
+    static PRIORITY_REALTIME = 1;
+    static PRIORITY_DEFAULT = 0;
+
     static sharedInstance() {
         if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
         return global.mx_ToastStore;
@@ -36,9 +39,16 @@ export default class ToastStore extends EventEmitter {
     }
 
     addOrReplaceToast(newToast) {
+        if (newToast.priority === undefined) newToast.priority = ToastStore.PRIORITY_DEFAULT;
+
         const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
-            this._toasts.push(newToast);
+            // we only have two priorities so just push realtime ones onto the front
+            if (newToast.priority) {
+                this._toasts.unshift(newToast);
+            } else {
+                this._toasts.push(newToast);
+            }
         } else {
             this._toasts[oldIndex] = newToast;
         }

From f7bf0d013c54111c903468010b878994f118a13e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 23 Mar 2020 10:17:45 -0600
Subject: [PATCH 1707/3235] Support sending and receiving v1 Jitsi widgets

Fixes https://github.com/vector-im/riot-web/issues/12816
Fixes https://github.com/vector-im/riot-web/issues/12814
---
 src/CallHandler.js       |  8 +++++++-
 src/utils/WidgetUtils.js | 21 ++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index b21f07ad4f..362db939a3 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -433,7 +433,13 @@ async function _startCallApp(roomId, type) {
     const confId = `JitsiConference_${generateHumanReadableId()}`;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
-    const widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
+    let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
+
+    // TODO: Remove URL hacks when the mobile clients eventually support v2 widgets
+    const parsedUrl = new URL(widgetUrl);
+    parsedUrl.search = ''; // set to empty string to make the URL class use searchParams instead
+    parsedUrl.searchParams.set('confId', confId);
+    widgetUrl = parsedUrl.toString();
 
     const widgetData = {
         conferenceId: confId,
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 45ca7602bd..74e5f82c35 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -422,6 +422,22 @@ export default class WidgetUtils {
         app.eventId = eventId;
         app.name = app.name || app.type;
 
+        if (app.type === 'jitsi') {
+            console.log("Replacing Jitsi widget URL with local wrapper");
+            if (!app.data || !app.data.conferenceId) {
+                // Assumed to be a v1 widget: add a data object for visibility on the wrapper
+                // TODO: Remove this once mobile supports v2 widgets
+                console.log("Replacing v1 Jitsi widget with v2 equivalent");
+                const parsed = new URL(app.url);
+                app.data = {
+                    conferenceId: parsed.searchParams.get("confId"),
+                    domain: "jitsi.riot.im", // v1 widgets have this hardcoded
+                };
+            }
+
+            app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
+        }
+
         if (app.data) {
             Object.keys(app.data).forEach((key) => {
                 params['$' + key] = app.data[key];
@@ -430,11 +446,6 @@ export default class WidgetUtils {
             app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
         }
 
-        if (app.type === 'jitsi') {
-            console.log("Replacing Jitsi widget URL with local wrapper");
-            app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
-        }
-
         app.url = encodeUri(app.url, params);
 
         return app;

From 281bc09c9a06e47e35ac026ef913f8078359abd8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Mar 2020 18:36:37 +0000
Subject: [PATCH 1708/3235] Use unified function to check cross-signing is
 ready

Fixes mismatches where the Cross signing panel would say cross
signing was not ready but no toasts would appear.

Fixes https://github.com/vector-im/riot-web/issues/12796
Fixes https://github.com/vector-im/riot-web/issues/12798
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1279
---
 src/DeviceListener.js                              |  5 ++++-
 src/components/views/settings/CrossSigningPanel.js | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 6a506db496..346be4bd13 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -107,7 +107,10 @@ export default class DeviceListener {
         ) return;
 
         if (!cli.isCryptoEnabled()) return;
-        if (!cli.getCrossSigningId()) {
+
+        const crossSigningReady = await cli.crossSigningReady();
+
+        if (!crossSigningReady) {
             if (this._dismissedThisDeviceToast) {
                 ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
                 return;
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index d583210c9a..0df75f16bc 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -74,12 +74,14 @@ export default class CrossSigningPanel extends React.PureComponent {
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
+        const crossSigningReady = await cli.crossSigningReady();
 
         this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
+            crossSigningReady,
         });
     }
 
@@ -124,6 +126,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
+            crossSigningReady,
         } = this.state;
 
         let errorSection;
@@ -139,11 +142,14 @@ export default class CrossSigningPanel extends React.PureComponent {
         );
 
         let summarisedStatus;
-        if (!homeserverSupportsCrossSigning) {
+        if (homeserverSupportsCrossSigning === undefined) {
+            const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
+            summarisedStatus = <p><InlineSpinner /></p>;
+        } else if (!homeserverSupportsCrossSigning) {
             summarisedStatus = <p>{_t(
                 "Your homeserver does not support cross-signing.",
             )}</p>;
-        } else if (enabledForAccount && crossSigningPublicKeysOnDevice) {
+        } else if (crossSigningReady) {
             summarisedStatus = <p>✅ {_t(
                 "Cross-signing and secret storage are enabled.",
             )}</p>;

From 629d85c9388208bce0c539afc60beabc92263dfc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Mar 2020 19:01:30 +0000
Subject: [PATCH 1709/3235] No, it's fine

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index a03119f37c..5abddd7a58 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -162,7 +162,6 @@ export default class DeviceListener {
                 return;
             }
 
-            // FIXME: do we a different message?
             ToastStore.sharedInstance().addOrReplaceToast({
                 key: THIS_DEVICE_TOAST_KEY,
                 title: _t("Encryption upgrade available"),

From b05e704524029a589db56207af7ccae23be846db Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 23 Mar 2020 19:04:59 +0000
Subject: [PATCH 1710/3235] Use staic dialog

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

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index b43af7b8b2..5c254bbd00 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -168,7 +168,7 @@ export async function promptForBackupPassphrase() {
     const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
     const { finished } = Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
             showSummary: false, keyCallback: k => key = k,
-    }, null, /* priority = */ false, /* static = */ false);
+    }, null, /* priority = */ false, /* static = */ true);
 
     const success = await finished;
     if (!success) throw new Error("Key backup prompt cancelled");

From d6d15bc5c70d41b9e3306f6b56679293715ea852 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Mar 2020 11:17:33 +0000
Subject: [PATCH 1711/3235] Add secret storage outdated section to advanced

---
 src/components/views/settings/CrossSigningPanel.js | 8 ++++++++
 src/i18n/strings/en_EN.json                        | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 20e2ca01e9..c2aba6aee7 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -33,6 +33,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPublicKeysOnDevice: false,
             crossSigningPrivateKeysInStorage: false,
             secretStorageKeyInAccount: false,
+            secretStorageKeyNeedsUpgrade: null,
         };
     }
 
@@ -78,12 +79,14 @@ export default class CrossSigningPanel extends React.PureComponent {
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
+        const secretStorageKeyNeedsUpgrade = await cli.secretStorageKeyNeedsUpgrade();
 
         this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
+            secretStorageKeyNeedsUpgrade,
         });
     }
 
@@ -128,6 +131,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPrivateKeysInStorage,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
+            secretStorageKeyNeedsUpgrade,
         } = this.state;
 
         let errorSection;
@@ -208,6 +212,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Homeserver feature support:")}</td>
                             <td>{homeserverSupportsCrossSigning ? _t("exists") : _t("not found")}</td>
                         </tr>
+                        <tr>
+                            <td>{_t("Secret Storage key format:")}</td>
+                            <td>{secretStorageKeyNeedsUpgrade ? _t("outdated") : _t("up to date")}</td>
+                        </tr>
                    </tbody></table>
                 </details>
                 {errorSection}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c3befa2298..98183e8fb4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -585,6 +585,9 @@
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",
     "exists": "exists",
+    "Secret Storage key format:": "Secret Storage key format:",
+    "outdated": "outdated",
+    "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
     "Authentication": "Authentication",

From d7953dfa6dfc18ce0161ab8cf1a46359bab83068 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Tue, 24 Mar 2020 13:09:06 +0100
Subject: [PATCH 1712/3235] fix formatbar not hidden on highlighted message
 sent

---
 src/components/views/rooms/BasicMessageComposer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 147f3c0af8..899b3360d8 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -152,6 +152,7 @@ export default class BasicMessageEditor extends React.Component {
         if (this.props.placeholder) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {
+                this._formatBarRef.hide();
                 this._showPlaceholder();
             } else {
                 this._hidePlaceholder();

From 5e1a46c656096daf9e774ae2cce38d20749981c4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Mar 2020 13:03:07 +0000
Subject: [PATCH 1713/3235] Update for new name

---
 src/DeviceListener.js                              | 2 +-
 src/components/views/settings/CrossSigningPanel.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 346be4bd13..3992a587ae 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -108,7 +108,7 @@ export default class DeviceListener {
 
         if (!cli.isCryptoEnabled()) return;
 
-        const crossSigningReady = await cli.crossSigningReady();
+        const crossSigningReady = await cli.isCrossSigningReady();
 
         if (!crossSigningReady) {
             if (this._dismissedThisDeviceToast) {
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 0df75f16bc..9fb47d8bbd 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -74,7 +74,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
-        const crossSigningReady = await cli.crossSigningReady();
+        const crossSigningReady = await cli.isCrossSigningReady();
 
         this.setState({
             crossSigningPublicKeysOnDevice,

From a43281b9a6fe207480580cfd24fa3425c452e870 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 24 Mar 2020 08:16:30 +0000
Subject: [PATCH 1714/3235] Translated using Weblate (Turkish)

Currently translated at 77.5% (1724 of 2224 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 4728cdd319..6e46c7ad81 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -538,9 +538,9 @@
     "View Source": "Kaynağı Görüntüle",
     "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!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
     "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
-    "The platform you're on": "Bulunduğun platform",
+    "The platform you're on": "Platformunuz",
     "The version of Riot.im": "Riot.im'in sürümü",
-    "Your language of choice": "Dil seçeneği",
+    "Your language of choice": "Dil seçiminiz",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
     "Add Email Address": "E-posta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",

From 0fce57f891d985e6219e9a4c80e9e5a69ca18772 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Mar 2020 13:13:28 +0000
Subject: [PATCH 1715/3235] Probably OK for debugging info to access private
 stuff

---
 src/components/views/settings/CrossSigningPanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 9fb47d8bbd..5bf36b1ae8 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -65,7 +65,6 @@ export default class CrossSigningPanel extends React.PureComponent {
     };
 
     async _getUpdatedStatus() {
-        // XXX: Add public accessors if we keep this around in production
         const cli = MatrixClientPeg.get();
         const crossSigning = cli._crypto._crossSigningInfo;
         const secretStorage = cli._crypto._secretStorage;

From 1d665bcba425e16b51a0811afbc8a83d4201a1e1 Mon Sep 17 00:00:00 2001
From: roket1428 <meorhan@protonmail.com>
Date: Tue, 24 Mar 2020 14:18:53 +0000
Subject: [PATCH 1716/3235] Translated using Weblate (Turkish)

Currently translated at 77.4% (1724 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 6e46c7ad81..493deb9008 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -602,7 +602,7 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…",
     "Cannot reach homeserver": "Ana sunucuya erişilemiyor",
-    "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış",
+    "Your Riot is misconfigured": "Riot hatalı yapılandırılmış",
     "Cannot reach identity server": "Kimlik sunucu erişilemiyor",
     "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş",
     "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata",

From f7fa9613e0fa2441e214155a46b577cc32726a8b Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Tue, 24 Mar 2020 14:21:04 +0000
Subject: [PATCH 1717/3235] Translated using Weblate (Turkish)

Currently translated at 77.4% (1724 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 493deb9008..6015eb4ab7 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -542,7 +542,7 @@
     "The version of Riot.im": "Riot.im'in sürümü",
     "Your language of choice": "Dil seçiminiz",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
-    "Add Email Address": "E-posta Adresi Ekle",
+    "Add Email Address": "E-posta Adres Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
     "Your identity server's URL": "Kimlik sunucunuzun linki",
     "e.g. %(exampleValue)s": "örn.%(exampleValue)s",

From 30db3f2a4cbc817c2873692c8f1d07b7040fcd54 Mon Sep 17 00:00:00 2001
From: roket1428 <meorhan@protonmail.com>
Date: Tue, 24 Mar 2020 14:21:21 +0000
Subject: [PATCH 1718/3235] Translated using Weblate (Turkish)

Currently translated at 77.4% (1724 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 6015eb4ab7..493deb9008 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -542,7 +542,7 @@
     "The version of Riot.im": "Riot.im'in sürümü",
     "Your language of choice": "Dil seçiminiz",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
-    "Add Email Address": "E-posta Adres Ekle",
+    "Add Email Address": "E-posta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
     "Your identity server's URL": "Kimlik sunucunuzun linki",
     "e.g. %(exampleValue)s": "örn.%(exampleValue)s",

From 483bd509f5d36c177a79cdf40ee916a052515af1 Mon Sep 17 00:00:00 2001
From: Ege <alikemal@riseup.net>
Date: Tue, 24 Mar 2020 14:22:00 +0000
Subject: [PATCH 1719/3235] Translated using Weblate (Turkish)

Currently translated at 77.4% (1724 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 493deb9008..ce600e49b4 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -602,7 +602,7 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…",
     "Cannot reach homeserver": "Ana sunucuya erişilemiyor",
-    "Your Riot is misconfigured": "Riot hatalı yapılandırılmış",
+    "Your Riot is misconfigured": "Riot hatalı ayarlanmış",
     "Cannot reach identity server": "Kimlik sunucu erişilemiyor",
     "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş",
     "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata",

From aa904761eeb04c636f6e81d7cb9fb1a48c157daa Mon Sep 17 00:00:00 2001
From: vejetaryenvampir <vejetaryenvampir@mail.ru>
Date: Tue, 24 Mar 2020 14:22:46 +0000
Subject: [PATCH 1720/3235] Translated using Weblate (Turkish)

Currently translated at 77.4% (1724 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index ce600e49b4..daefb766b3 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -398,7 +398,7 @@
     "Please check your email to continue registration.": "Kayıt işlemine devam etmek için lütfen e-postanızı kontrol edin.",
     "Token incorrect": "Belirteç(Token) hatalı",
     "Please enter the code it contains:": "Lütfen içerdiği kodu girin:",
-    "powered by Matrix": "Matrix'den besleniyor",
+    "powered by Matrix": "Matrix tarafından dest",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Eğer bir e-posta adresi belirtmezseniz , şifrenizi sıfırlayamazsınız . Emin misiniz ?",
     "Error decrypting audio": "Ses şifre çözme hatası",
     "Error decrypting image": "Resim şifre çözme hatası",

From ca51690bbfdaf7031f53ad4ccaf50c70c36e3ea5 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 24 Mar 2020 14:23:17 +0000
Subject: [PATCH 1721/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2227 of 2227 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a18aa8f760..4829d4cf7a 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2276,5 +2276,17 @@
     "Esc": "Esc",
     "Enter": "Invio",
     "Space": "Barra spaziatrice",
-    "End": "Fine"
+    "End": "Fine",
+    "Manually Verify by Text": "Verifica manualmente con testo",
+    "Interactively verify by Emoji": "Verifica interattivamente con emoji",
+    "Secret Storage key format:": "Formato chiave di archivio segreto:",
+    "outdated": "non aggiornato",
+    "up to date": "aggiornato",
+    "Confirm by comparing the following with the User Settings in your other session:": "Conferma confrontando il seguente con le impostazioni utente nell'altra sessione:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Conferma questa sessione confrontando il seguente con le sue impostazioni utente:",
+    "If they don't match, the security of your communication may be compromised.": "Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.",
+    "Navigate composer history": "Naviga cronologia compositore",
+    "Previous/next unread room or DM": "Stanza o msg non letti successivi/precedenti",
+    "Previous/next room or DM": "Stanza o msg successivi/precedenti",
+    "Toggle right panel": "Apri/chiudi pannello a destra"
 }

From 8ed9feb5053ee6423d2918a2fb85719259420651 Mon Sep 17 00:00:00 2001
From: roket1428 <meorhan@protonmail.com>
Date: Tue, 24 Mar 2020 14:23:58 +0000
Subject: [PATCH 1722/3235] Translated using Weblate (Turkish)

Currently translated at 77.8% (1733 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index daefb766b3..8f90bfe936 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -398,7 +398,7 @@
     "Please check your email to continue registration.": "Kayıt işlemine devam etmek için lütfen e-postanızı kontrol edin.",
     "Token incorrect": "Belirteç(Token) hatalı",
     "Please enter the code it contains:": "Lütfen içerdiği kodu girin:",
-    "powered by Matrix": "Matrix tarafından dest",
+    "powered by Matrix": "Matrix'den besleniyor",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Eğer bir e-posta adresi belirtmezseniz , şifrenizi sıfırlayamazsınız . Emin misiniz ?",
     "Error decrypting audio": "Ses şifre çözme hatası",
     "Error decrypting image": "Resim şifre çözme hatası",
@@ -839,7 +839,7 @@
     "Set a new password": "Yeni bir şifre belirle",
     "General failure": "Genel başarısızlık",
     "This homeserver does not support login using email address.": "Bu ana sunucu e-posta adresiyle oturum açmayı desteklemiyor.",
-    "This account has been deactivated.": "Bu hesap pasifleştirilmiş.",
+    "This account has been deactivated.": "Hesap devre dışı bırakıldı.",
     "Create account": "Yeni hesap",
     "Unable to query for supported registration methods.": "Desteklenen kayıt yöntemleri için sorgulama yapılamıyor.",
     "Continue with previous account": "Önceki hesapla devam et",
@@ -983,7 +983,7 @@
     "Cat": "Kedi",
     "Lion": "Aslan",
     "Horse": "At",
-    "Unicorn": "Tek boynuzlu at",
+    "Unicorn": "Midilli",
     "Pig": "Domuz",
     "Elephant": "Fil",
     "Rabbit": "Tavşan",
@@ -1752,5 +1752,11 @@
     "Failed to re-authenticate due to a homeserver problem": "Anasunucu problemi yüzünden yeniden kimlik doğrulama başarısız",
     "Failed to re-authenticate": "Yeniden kimlik doğrulama başarısız",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Yeni bir kurtarma parolası ve Güvenli Mesajlar için anahtar tespit edildi.",
-    "Not currently indexing messages for any room.": "Şu an hiç bir odada mesaj indeksleme yapılmıyor."
+    "Not currently indexing messages for any room.": "Şu an hiç bir odada mesaj indeksleme yapılmıyor.",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Riot'u ana giriş yöntemi dokunma olan bir cihazda kullanıyor olsanızda",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Breadcrumbs' özelliğini kullanıp kullanmadığınız (oda listesi üzerinde avatarlar)",
+    "Whether you're using Riot as an installed Progressive Web App": "Riot'u gelişmiş web uygulaması olarak yükleyip yüklemediğinizi",
+    "The information being sent to us to help make Riot better includes:": "Riot'u geliştirmemizde bize yardım etmek için gönderdiğiniz bilgiler şunları içeriyor:",
+    "A call is currently being placed!": "Bir çağrı şu anda başlatılıyor!",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Şu anda dosya ile birlikte mesaj yollamak mümkün değil. Dosyayı mesajsız yüklemek ister misiniz?"
 }

From 4ff847c8a32fcefef52a0e872704e6f4f9caeba3 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 24 Mar 2020 15:57:04 +0100
Subject: [PATCH 1723/3235] put CompleteSecurity state management in store

and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
---
 .../structures/auth/CompleteSecurity.js       | 235 ++----------------
 .../structures/auth/SetupEncryptionBody.js    | 196 +++++++++++++++
 src/stores/SetupEncryptionStore.js            | 147 +++++++++++
 3 files changed, 366 insertions(+), 212 deletions(-)
 create mode 100644 src/components/structures/auth/SetupEncryptionBody.js
 create mode 100644 src/stores/SetupEncryptionStore.js

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 3154564cd3..06cece0af2 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -18,13 +18,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { accessSecretStorage, AccessCancelledError } from '../../../CrossSigningManager';
-
-const PHASE_INTRO = 0;
-const PHASE_BUSY = 1;
-const PHASE_DONE = 2;
-const PHASE_CONFIRM_SKIP = 3;
+import {
+    SetupEncryptionStore,
+    PHASE_INTRO,
+    PHASE_BUSY,
+    PHASE_DONE,
+    PHASE_CONFIRM_SKIP,
+} from '../../../stores/SetupEncryptionStore';
+import SetupEncryptionBody from "./SetupEncryptionBody";
 
 export default class CompleteSecurity extends React.Component {
     static propTypes = {
@@ -33,232 +34,42 @@ export default class CompleteSecurity extends React.Component {
 
     constructor() {
         super();
-
-        this.state = {
-            phase: PHASE_INTRO,
-            // this serves dual purpose as the object for the request logic and
-            // the presence of it insidicating that we're in 'verify mode'.
-            // Because of the latter, it lives in the state.
-            verificationRequest: null,
-            backupInfo: null,
-        };
-        MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+        const store = SetupEncryptionStore.sharedInstance();
+        store.on("update", this._onStoreUpdate);
+        store.start();
+        this.state = {phase: store.phase};
     }
 
+    _onStoreUpdate = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        this.setState({phase: store.phase});
+    };
+
     componentWillUnmount() {
-        if (this.state.verificationRequest) {
-            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
-        }
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
-        }
-    }
-
-    _onUsePassphraseClick = async () => {
-        this.setState({
-            phase: PHASE_BUSY,
-        });
-        const cli = MatrixClientPeg.get();
-        try {
-            const backupInfo = await cli.getKeyBackupVersion();
-            this.setState({backupInfo});
-
-            // The control flow is fairly twisted here...
-            // For the purposes of completing security, we only wait on getting
-            // as far as the trust check and then show a green shield.
-            // We also begin the key backup restore as well, which we're
-            // awaiting inside `accessSecretStorage` only so that it keeps your
-            // passphase cached for that work. This dialog itself will only wait
-            // on the first trust check, and the key backup restore will happen
-            // in the background.
-            await new Promise((resolve, reject) => {
-                try {
-                    accessSecretStorage(async () => {
-                        await cli.checkOwnCrossSigningTrust();
-                        resolve();
-                        if (backupInfo) {
-                            // A complete restore can take many minutes for large
-                            // accounts / slow servers, so we allow the dialog
-                            // to advance before this.
-                            await cli.restoreKeyBackupWithSecretStorage(backupInfo);
-                        }
-                    });
-                } catch (e) {
-                    console.error(e);
-                    reject(e);
-                }
-            });
-
-            if (cli.getCrossSigningId()) {
-                this.setState({
-                    phase: PHASE_DONE,
-                });
-            }
-        } catch (e) {
-            if (!(e instanceof AccessCancelledError)) {
-                console.log(e);
-            }
-            // this will throw if the user hits cancel, so ignore
-            this.setState({
-                phase: PHASE_INTRO,
-            });
-        }
-    }
-
-    onVerificationRequest = async (request) => {
-        if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
-
-        if (this.state.verificationRequest) {
-            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
-        }
-        await request.accept();
-        request.on("change", this.onVerificationRequestChange);
-        this.setState({
-            verificationRequest: request,
-        });
-    }
-
-    onVerificationRequestChange = () => {
-        if (this.state.verificationRequest.cancelled) {
-            this.state.verificationRequest.off("change", this.onVerificationRequestChange);
-            this.setState({
-                verificationRequest: null,
-            });
-        }
-    }
-
-    onSkipClick = () => {
-        this.setState({
-            phase: PHASE_CONFIRM_SKIP,
-        });
-    }
-
-    onSkipConfirmClick = () => {
-        this.props.onFinished();
-    }
-
-    onSkipBackClick = () => {
-        this.setState({
-            phase: PHASE_INTRO,
-        });
-    }
-
-    onDoneClick = () => {
-        this.props.onFinished();
+        const store = SetupEncryptionStore.sharedInstance();
+        store.off("update", this._onStoreUpdate);
+        store.stop();
     }
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
         const CompleteSecurityBody = sdk.getComponent("auth.CompleteSecurityBody");
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-
-        const {
-            phase,
-        } = this.state;
-
+        const {phase} = this.state;
         let icon;
         let title;
-        let body;
-
-        if (this.state.verificationRequest) {
-            const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
-            body = <EncryptionPanel
-                layout="dialog"
-                verificationRequest={this.state.verificationRequest}
-                onClose={this.props.onFinished}
-                member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
-            />;
-        } else if (phase === PHASE_INTRO) {
-            const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
 
+        if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
             title = _t("Complete security");
-            body = (
-                <div>
-                    <p>{_t(
-                        "Open an existing session & use it to verify this one, " +
-                        "granting it access to encrypted messages.",
-                    )}</p>
-                    <p className="mx_CompleteSecurity_waiting"><InlineSpinner />{_t("Waiting…")}</p>
-                    <p>{_t(
-                        "If you can’t access one, <button>use your recovery key or passphrase.</button>",
-                    {}, {
-                        button: sub => <AccessibleButton element="span"
-                            className="mx_linkButton"
-                            onClick={this._onUsePassphraseClick}
-                        >
-                            {sub}
-                        </AccessibleButton>,
-                    })}</p>
-                    <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton
-                            kind="danger"
-                            onClick={this.onSkipClick}
-                        >
-                            {_t("Skip")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-            );
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified"></span>;
             title = _t("Session verified");
-            let message;
-            if (this.state.backupInfo) {
-                message = <p>{_t(
-                    "Your new session is now verified. It has access to your " +
-                    "encrypted messages, and other users will see it as trusted.",
-                )}</p>;
-            } else {
-                message = <p>{_t(
-                    "Your new session is now verified. Other users will see it as trusted.",
-                )}</p>;
-            }
-            body = (
-                <div>
-                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
-                    {message}
-                    <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton
-                            kind="primary"
-                            onClick={this.onDoneClick}
-                        >
-                            {_t("Done")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-            );
         } else if (phase === PHASE_CONFIRM_SKIP) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
             title = _t("Are you sure?");
-            body = (
-                <div>
-                    <p>{_t(
-                        "Without completing security on this session, it won’t have " +
-                        "access to encrypted messages.",
-                    )}</p>
-                    <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton
-                            className="warning"
-                            kind="secondary"
-                            onClick={this.onSkipConfirmClick}
-                        >
-                            {_t("Skip")}
-                        </AccessibleButton>
-                        <AccessibleButton
-                            kind="danger"
-                            onClick={this.onSkipBackClick}
-                        >
-                            {_t("Go Back")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-            );
         } else if (phase === PHASE_BUSY) {
-            const Spinner = sdk.getComponent('views.elements.Spinner');
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
             title = _t("Complete security");
-            body = <Spinner />;
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
@@ -271,7 +82,7 @@ export default class CompleteSecurity extends React.Component {
                         {title}
                     </h2>
                     <div className="mx_CompleteSecurity_body">
-                        {body}
+                        <SetupEncryptionBody onFinished={this.props.onFinished} />
                     </div>
                 </CompleteSecurityBody>
             </AuthPage>
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
new file mode 100644
index 0000000000..a59fa08b32
--- /dev/null
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -0,0 +1,196 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import * as sdk from '../../../index';
+import {
+    SetupEncryptionStore,
+    PHASE_INTRO,
+    PHASE_BUSY,
+    PHASE_DONE,
+    PHASE_CONFIRM_SKIP,
+    PHASE_FINISHED,
+} from '../../../stores/SetupEncryptionStore';
+
+export default class SetupEncryptionBody extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+        const store = SetupEncryptionStore.sharedInstance();
+        store.on("update", this._onStoreUpdate);
+        store.start();
+        this.state = {
+            phase: store.phase,
+            // this serves dual purpose as the object for the request logic and
+            // the presence of it insidicating that we're in 'verify mode'.
+            // Because of the latter, it lives in the state.
+            verificationRequest: store.verificationRequest,
+            backupInfo: store.backupInfo,
+        };
+    }
+
+    _onStoreUpdate = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        if (store.phase === PHASE_FINISHED) {
+            this.props.onFinished();
+            return;
+        }
+        this.setState({
+            phase: store.phase,
+            verificationRequest: store.verificationRequest,
+            backupInfo: store.backupInfo,
+        });
+    };
+
+    componentWillUnmount() {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.off("update", this._onStoreUpdate);
+        store.stop();
+    }
+
+    _onUsePassphraseClick = async () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.usePassPhrase();
+    }
+
+    onSkipClick = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.skip();
+    }
+
+    onSkipConfirmClick = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.skipConfirm();
+    }
+
+    onSkipBackClick = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.returnAfterSkip();
+    }
+
+    onDoneClick = () => {
+        const store = SetupEncryptionStore.sharedInstance();
+        store.done();
+    }
+
+    render() {
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        const {
+            phase,
+        } = this.state;
+
+        if (this.state.verificationRequest) {
+            const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
+            return <EncryptionPanel
+                layout="dialog"
+                verificationRequest={this.state.verificationRequest}
+                onClose={this.props.onFinished}
+                member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
+            />;
+        } else if (phase === PHASE_INTRO) {
+            const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+            return (
+                <div>
+                    <p>{_t(
+                        "Open an existing session & use it to verify this one, " +
+                        "granting it access to encrypted messages.",
+                    )}</p>
+                    <p className="mx_CompleteSecurity_waiting"><InlineSpinner />{_t("Waiting…")}</p>
+                    <p>{_t(
+                        "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+                    {}, {
+                        button: sub => <AccessibleButton element="span"
+                            className="mx_linkButton"
+                            onClick={this._onUsePassphraseClick}
+                        >
+                            {sub}
+                        </AccessibleButton>,
+                    })}</p>
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            kind="danger"
+                            onClick={this.onSkipClick}
+                        >
+                            {_t("Skip")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else if (phase === PHASE_DONE) {
+            let message;
+            if (this.state.backupInfo) {
+                message = <p>{_t(
+                    "Your new session is now verified. It has access to your " +
+                    "encrypted messages, and other users will see it as trusted.",
+                )}</p>;
+            } else {
+                message = <p>{_t(
+                    "Your new session is now verified. Other users will see it as trusted.",
+                )}</p>;
+            }
+            return (
+                <div>
+                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
+                    {message}
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            kind="primary"
+                            onClick={this.onDoneClick}
+                        >
+                            {_t("Done")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else if (phase === PHASE_CONFIRM_SKIP) {
+            return (
+                <div>
+                    <p>{_t(
+                        "Without completing security on this session, it won’t have " +
+                        "access to encrypted messages.",
+                    )}</p>
+                    <div className="mx_CompleteSecurity_actionRow">
+                        <AccessibleButton
+                            className="warning"
+                            kind="secondary"
+                            onClick={this.onSkipConfirmClick}
+                        >
+                            {_t("Skip")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            kind="danger"
+                            onClick={this.onSkipBackClick}
+                        >
+                            {_t("Go Back")}
+                        </AccessibleButton>
+                    </div>
+                </div>
+            );
+        } else if (phase === PHASE_BUSY) {
+            const Spinner = sdk.getComponent('views.elements.Spinner');
+            return <Spinner />;
+        } else {
+            throw new Error(`Unknown phase ${phase}`);
+        }
+    }
+}
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
new file mode 100644
index 0000000000..93c1770b1f
--- /dev/null
+++ b/src/stores/SetupEncryptionStore.js
@@ -0,0 +1,147 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 EventEmitter from 'events';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager';
+
+export const PHASE_INTRO = 0;
+export const PHASE_BUSY = 1;
+export const PHASE_DONE = 2;    //final done stage, but still showing UX
+export const PHASE_CONFIRM_SKIP = 3;
+export const PHASE_FINISHED = 4; //UX can be closed
+
+/**
+ * Holds the active "Complete Security" session
+ */
+export class SetupEncryptionStore extends EventEmitter {
+    static sharedInstance() {
+        if (!global.mx_SetupEncryptionStore) global.mx_SetupEncryptionStore = new SetupEncryptionStore();
+        return global.mx_SetupEncryptionStore;
+    }
+
+    start() {
+        if (this._started) {
+            return;
+        }
+        this._started = true;
+        this.phase = PHASE_INTRO;
+        this.verificationRequest = null;
+        this.backupInfo = null;
+        MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+    }
+
+    stop() {
+        if (!this._started) {
+            return;
+        }
+        this._started = false;
+        if (this.verificationRequest) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+        }
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
+        }
+    }
+
+    async usePassPhrase() {
+        this.phase = PHASE_BUSY;
+        this.emit("update");
+        const cli = MatrixClientPeg.get();
+        try {
+            const backupInfo = await cli.getKeyBackupVersion();
+            this.backupInfo = backupInfo;
+            this.emit("update");
+            // The control flow is fairly twisted here...
+            // For the purposes of completing security, we only wait on getting
+            // as far as the trust check and then show a green shield.
+            // We also begin the key backup restore as well, which we're
+            // awaiting inside `accessSecretStorage` only so that it keeps your
+            // passphase cached for that work. This dialog itself will only wait
+            // on the first trust check, and the key backup restore will happen
+            // in the background.
+            await new Promise((resolve, reject) => {
+                try {
+                    accessSecretStorage(async () => {
+                        await cli.checkOwnCrossSigningTrust();
+                        resolve();
+                        if (backupInfo) {
+                            // A complete restore can take many minutes for large
+                            // accounts / slow servers, so we allow the dialog
+                            // to advance before this.
+                            await cli.restoreKeyBackupWithSecretStorage(backupInfo);
+                        }
+                    }).catch(reject);
+                } catch (e) {
+                    console.error(e);
+                    reject(e);
+                }
+            });
+
+            if (cli.getCrossSigningId()) {
+                this.phase = PHASE_DONE;
+                this.emit("update");
+            }
+        } catch (e) {
+            if (!(e instanceof AccessCancelledError)) {
+                console.log(e);
+            }
+            // this will throw if the user hits cancel, so ignore
+            this.phase = PHASE_INTRO;
+            this.emit("update");
+        }
+    }
+
+    onVerificationRequest = async (request) => {
+        if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
+
+        if (this.verificationRequest) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+        }
+        this.verificationRequest = request;
+        await request.accept();
+        request.on("change", this.onVerificationRequestChange);
+        this.emit("update");
+    }
+
+    onVerificationRequestChange = () => {
+        if (this.verificationRequest.cancelled) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+            this.verificationRequest = null;
+            this.emit("update");
+        }
+    }
+
+    skip() {
+        this.phase = PHASE_CONFIRM_SKIP;
+        this.emit("update");
+    }
+
+    skipConfirm() {
+        this.phase = PHASE_FINISHED;
+        this.emit("update");
+    }
+
+    returnAfterSkip() {
+        this.phase = PHASE_INTRO;
+        this.emit("update");
+    }
+
+    done() {
+        this.phase = PHASE_FINISHED;
+        this.emit("update");
+    }
+}

From 3e59127d12a83e55def0f7003c39c7e82cc33a2f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 24 Mar 2020 16:10:43 +0100
Subject: [PATCH 1724/3235] use SetupEncryptionBody to show a dialog from
 "Verify this session"

---
 .../views/dialogs/SetupEncryptionDialog.js    | 29 +++++++++++++++++++
 .../views/toasts/SetupEncryptionToast.js      |  9 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/components/views/dialogs/SetupEncryptionDialog.js

diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
new file mode 100644
index 0000000000..f32a289a29
--- /dev/null
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 SetupEncryptionBody from '../../structures/auth/SetupEncryptionBody';
+import BaseDialog from './BaseDialog';
+import { _t } from '../../../languageHandler';
+
+export default function SetupEncryptionDialog({onFinished}) {
+    return <BaseDialog
+        headerImage={require("../../../../res/img/e2e/warning.svg")}
+        onFinished={onFinished}
+        title={_t("Verify this session")}
+    >
+        <SetupEncryptionBody onFinished={onFinished} />
+    </BaseDialog>;
+}
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 9016e4c6d7..ad6488a9bb 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
+import Modal from '../../../Modal';
 import DeviceListener from '../../../DeviceListener';
+import SetupEncryptionDialog from "../dialogs/SetupEncryptionDialog";
 import { accessSecretStorage } from '../../../CrossSigningManager';
 
 export default class SetupEncryptionToast extends React.PureComponent {
@@ -32,7 +34,12 @@ export default class SetupEncryptionToast extends React.PureComponent {
     };
 
     _onSetupClick = async () => {
-        accessSecretStorage();
+        if (this.props.kind === "verify_this_session") {
+            Modal.createTrackedDialog('Verify session', 'Verify session', SetupEncryptionDialog,
+                {}, null, /* priority = */ false, /* static = */ true);
+        } else {
+            accessSecretStorage();
+        }
     };
 
     getDescription() {

From c53b07a35a73d8a83c0e1bfaebdb0284e03b398d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 24 Mar 2020 15:49:51 +0000
Subject: [PATCH 1725/3235] Add logging when secrets are missing from cache

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

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 5c254bbd00..097464ee43 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -149,9 +149,15 @@ const onSecretRequested = async function({
     if (!callbacks.getCrossSigningKeyCache) return;
     if (name === "m.cross_signing.self_signing") {
         const key = await callbacks.getCrossSigningKeyCache("self_signing");
+        if (!key) {
+            console.log(`self_signing requested by ${deviceId}, but not found in cache`);
+        }
         return key && encodeBase64(key);
     } else if (name === "m.cross_signing.user_signing") {
         const key = await callbacks.getCrossSigningKeyCache("user_signing");
+        if (!key) {
+            console.log(`user_signing requested by ${deviceId}, but not found in cache`);
+        }
         return key && encodeBase64(key);
     }
     console.warn("onSecretRequested didn't recognise the secret named ", name);

From 1c802cc6afd6e27effc791238e07da13e8dcbf86 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 24 Mar 2020 15:50:08 +0000
Subject: [PATCH 1726/3235] Show private key cache state in debug panel

---
 .../views/settings/CrossSigningPanel.js         | 17 +++++++++++++++++
 src/i18n/strings/en_EN.json                     |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cf47c797fc..b960434ca1 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -32,6 +32,8 @@ export default class CrossSigningPanel extends React.PureComponent {
             error: null,
             crossSigningPublicKeysOnDevice: false,
             crossSigningPrivateKeysInStorage: false,
+            selfSigningPrivateKeyCached: false,
+            userSigningPrivateKeyCached: false,
             secretStorageKeyInAccount: false,
             secretStorageKeyNeedsUpgrade: null,
         };
@@ -71,10 +73,13 @@ export default class CrossSigningPanel extends React.PureComponent {
 
     async _getUpdatedStatus() {
         const cli = MatrixClientPeg.get();
+        const pkCache = cli.getCrossSigningCacheCallbacks();
         const crossSigning = cli._crypto._crossSigningInfo;
         const secretStorage = cli._crypto._secretStorage;
         const crossSigningPublicKeysOnDevice = crossSigning.getId();
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
+        const selfSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"));
+        const userSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"));
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
@@ -84,6 +89,8 @@ export default class CrossSigningPanel extends React.PureComponent {
         this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
+            selfSigningPrivateKeyCached,
+            userSigningPrivateKeyCached,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -130,6 +137,8 @@ export default class CrossSigningPanel extends React.PureComponent {
             error,
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
+            selfSigningPrivateKeyCached,
+            userSigningPrivateKeyCached,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -209,6 +218,14 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Cross-signing private keys:")}</td>
                             <td>{crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found")}</td>
                         </tr>
+                        <tr>
+                            <td>{_t("Self signing private key:")}</td>
+                            <td>{selfSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                        </tr>
+                        <tr>
+                            <td>{_t("User signing private key:")}</td>
+                            <td>{userSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                        </tr>
                         <tr>
                             <td>{_t("Secret storage public key:")}</td>
                             <td>{secretStorageKeyInAccount ? _t("in account data") : _t("not found")}</td>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 57b39309b0..12bd462937 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -582,6 +582,10 @@
     "not found": "not found",
     "Cross-signing private keys:": "Cross-signing private keys:",
     "in secret storage": "in secret storage",
+    "Self signing private key:": "Self signing private key:",
+    "cached locally": "cached locally",
+    "not found locally": "not found locally",
+    "User signing private key:": "User signing private key:",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",

From bdcb65de77107a45875c0854441594720439cb84 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 24 Mar 2020 09:55:54 -0600
Subject: [PATCH 1727/3235] Support and send the config over to capable widgets

For https://github.com/vector-im/riot-web/pull/12845
---
 src/FromWidgetPostMessageApi.js          | 11 +++++++-
 src/WidgetMessaging.js                   | 11 ++++++++
 src/components/views/elements/AppTile.js |  6 +++++
 src/utils/WidgetUtils.js                 |  8 ++++--
 src/widgets/WidgetApi.ts                 | 34 +++++++++++++++++++++---
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 64caba0fdf..ea76c85643 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -24,6 +24,8 @@ import {MatrixClientPeg} from "./MatrixClientPeg";
 import RoomViewStore from "./stores/RoomViewStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore from "./settings/SettingsStore";
+import {Capability, KnownWidgetActions} from "./widgets/WidgetApi";
+import SdkConfig from "./SdkConfig";
 
 const WIDGET_API_VERSION = '0.0.2'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -213,11 +215,18 @@ export default class FromWidgetPostMessageApi {
             const data = event.data.data;
             const val = data.value;
 
-            if (ActiveWidgetStore.widgetHasCapability(widgetId, 'm.always_on_screen')) {
+            if (ActiveWidgetStore.widgetHasCapability(widgetId, Capability.AlwaysOnScreen)) {
                 ActiveWidgetStore.setWidgetPersistence(widgetId, val);
             }
         } else if (action === 'get_openid') {
             // Handled by caller
+        } else if (action === KnownWidgetActions.GetRiotWebConfig) {
+            if (ActiveWidgetStore.widgetHasCapability(widgetId, Capability.GetRiotWebConfig)) {
+                this.sendResponse(event, {
+                    api: INBOUND_API_NAME,
+                    config: SdkConfig.get(),
+                });
+            }
         } else {
             console.warn('Widget postMessage event unhandled');
             this.sendError(event, {message: 'The postMessage was unhandled'});
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index d40a8ab637..b0cfe963f3 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -27,6 +27,7 @@ import {MatrixClientPeg} from "./MatrixClientPeg";
 import SettingsStore from "./settings/SettingsStore";
 import WidgetOpenIDPermissionsDialog from "./components/views/dialogs/WidgetOpenIDPermissionsDialog";
 import WidgetUtils from "./utils/WidgetUtils";
+import {KnownWidgetActions} from "./widgets/WidgetApi";
 
 if (!global.mxFromWidgetMessaging) {
     global.mxFromWidgetMessaging = new FromWidgetPostMessageApi();
@@ -75,6 +76,16 @@ export default class WidgetMessaging {
         });
     }
 
+    /**
+     * Tells the widget that the client is ready to handle further widget requests.
+     */
+    flagReadyToContinue() {
+        return this.messageToWidget({
+            api: OUTBOUND_API_NAME,
+            action: KnownWidgetActions.ClientReady,
+        });
+    }
+
     /**
      * Request a screenshot from a widget
      * @return {Promise} To be resolved with screenshot data when it has been generated
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a26478c461..0a8bf7443b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -419,6 +419,12 @@ export default class AppTile extends React.Component {
             if (this.props.onCapabilityRequest) {
                 this.props.onCapabilityRequest(requestedCapabilities);
             }
+
+            // We only tell Jitsi widgets that we're ready because they're realistically the only ones
+            // using this custom extension to the widget API.
+            if (this.props.type === 'jitsi') {
+                widgetMessaging.flagReadyToContinue();
+            }
         }).catch((err) => {
             console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
         });
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 74e5f82c35..eea995cfea 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -28,6 +28,7 @@ const WIDGET_WAIT_TIME = 20000;
 import SettingsStore from "../settings/SettingsStore";
 import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
+import {Capability} from "../widgets/WidgetApi";
 
 /**
  * Encodes a URI according to a set of template variables. Variables will be
@@ -454,12 +455,15 @@ export default class WidgetUtils {
     static getCapWhitelistForAppTypeInRoomId(appType, roomId) {
         const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", roomId);
 
-        const capWhitelist = enableScreenshots ? ["m.capability.screenshot"] : [];
+        const capWhitelist = enableScreenshots ? [Capability.Screenshot] : [];
 
         // Obviously anyone that can add a widget can claim it's a jitsi widget,
         // so this doesn't really offer much over the set of domains we load
         // widgets from at all, but it probably makes sense for sanity.
-        if (appType == 'jitsi') capWhitelist.push("m.always_on_screen");
+        if (appType === 'jitsi') {
+            capWhitelist.push(Capability.AlwaysOnScreen);
+            capWhitelist.push(Capability.GetRiotWebConfig);
+        }
 
         return capWhitelist;
     }
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index c19e34ae43..d6d1c79a99 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -23,6 +23,7 @@ export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
+    GetRiotWebConfig = "im.vector.web.riot_config",
 }
 
 export enum KnownWidgetActions {
@@ -33,7 +34,10 @@ export enum KnownWidgetActions {
     UpdateVisibility = "visibility",
     ReceiveOpenIDCredentials = "openid_credentials",
     SetAlwaysOnScreen = "set_always_on_screen",
+    GetRiotWebConfig = "im.vector.web.riot_config",
+    ClientReady = "im.vector.ready",
 }
+
 export type WidgetAction = KnownWidgetActions | string;
 
 export enum WidgetApiType {
@@ -63,10 +67,15 @@ export interface FromWidgetRequest extends WidgetRequest {
  */
 export class WidgetApi {
     private origin: string;
-    private inFlightRequests: {[requestId: string]: (reply: FromWidgetRequest) => void} = {};
+    private inFlightRequests: { [requestId: string]: (reply: FromWidgetRequest) => void } = {};
     private readyPromise: Promise<any>;
     private readyPromiseResolve: () => void;
 
+    /**
+     * Set this to true if your widget is expecting a ready message from the client. False otherwise (default).
+     */
+    public expectingExplicitReady = false;
+
     constructor(currentUrl: string, private widgetId: string, private requestedCapabilities: string[]) {
         this.origin = new URL(currentUrl).origin;
 
@@ -83,7 +92,14 @@ export class WidgetApi {
 
                 if (payload.action === KnownWidgetActions.GetCapabilities) {
                     this.onCapabilitiesRequest(<ToWidgetRequest>payload);
+                    if (!this.expectingExplicitReady) {
+                        this.readyPromiseResolve();
+                    }
+                } else if (payload.action === KnownWidgetActions.ClientReady) {
                     this.readyPromiseResolve();
+
+                    // Automatically acknowledge so we can move on
+                    this.replyToRequest(<ToWidgetRequest>payload, {});
                 } else {
                     console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
                 }
@@ -126,7 +142,10 @@ export class WidgetApi {
             data: payload,
             response: {}, // Not used at this layer - it's used when the client responds
         };
-        this.inFlightRequests[request.requestId] = callback;
+
+        if (callback) {
+            this.inFlightRequests[request.requestId] = callback;
+        }
 
         console.log(`[WidgetAPI] Sending request: `, request);
         window.parent.postMessage(request, "*");
@@ -134,7 +153,16 @@ export class WidgetApi {
 
     public setAlwaysOnScreen(onScreen: boolean): Promise<any> {
         return new Promise<any>(resolve => {
-            this.callAction(KnownWidgetActions.SetAlwaysOnScreen, {value: onScreen}, resolve);
+            this.callAction(KnownWidgetActions.SetAlwaysOnScreen, {value: onScreen}, null);
+            resolve(); // SetAlwaysOnScreen is currently fire-and-forget, but that could change.
+        });
+    }
+
+    public getRiotConfig(): Promise<any> {
+        return new Promise<any>(resolve => {
+            this.callAction(KnownWidgetActions.GetRiotWebConfig, {}, response => {
+                resolve(response.response.config);
+            });
         });
     }
 }

From 7cded53cdb118c3fee1bc21e60148d60a88f0c74 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 24 Mar 2020 17:02:36 +0100
Subject: [PATCH 1728/3235] fix i18n

---
 src/i18n/strings/en_EN.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 57b39309b0..9dcea47cc8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2006,14 +2006,7 @@
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
     "Complete security": "Complete security",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
-    "Waiting…": "Waiting…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
     "Session verified": "Session verified",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
-    "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
-    "Go Back": "Go Back",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",
@@ -2063,6 +2056,13 @@
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
+    "Waiting…": "Waiting…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
+    "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
+    "Go Back": "Go Back",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Failed to re-authenticate": "Failed to re-authenticate",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.",

From 7d4e4982575d9bc97f5ba8a2eb47a927f36ecf4f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 24 Mar 2020 17:03:40 +0100
Subject: [PATCH 1729/3235] fix lint

---
 src/stores/SetupEncryptionStore.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 93c1770b1f..7b42e1552d 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -24,9 +24,6 @@ export const PHASE_DONE = 2;    //final done stage, but still showing UX
 export const PHASE_CONFIRM_SKIP = 3;
 export const PHASE_FINISHED = 4; //UX can be closed
 
-/**
- * Holds the active "Complete Security" session
- */
 export class SetupEncryptionStore extends EventEmitter {
     static sharedInstance() {
         if (!global.mx_SetupEncryptionStore) global.mx_SetupEncryptionStore = new SetupEncryptionStore();

From 7ea61e41055fef1ba199e78af6420dbd7405dce4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 24 Mar 2020 10:05:57 -0600
Subject: [PATCH 1730/3235] Appease the linter

---
 src/WidgetMessaging.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index b0cfe963f3..30c2389b1e 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -78,6 +78,7 @@ export default class WidgetMessaging {
 
     /**
      * Tells the widget that the client is ready to handle further widget requests.
+     * @returns {Promise<*>} Resolves after the widget has acknowledged the ready message.
      */
     flagReadyToContinue() {
         return this.messageToWidget({

From 91b9a04ede6ebb18bd6a53e756a1f2f6a24399d4 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Tue, 24 Mar 2020 19:00:43 +0100
Subject: [PATCH 1731/3235] refactor:consider checking if no placeholder

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 899b3360d8..707dc12a97 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -149,15 +149,17 @@ export default class BasicMessageEditor extends React.Component {
             const position = selection.end || selection;
             this._setLastCaretFromPosition(position);
         }
+        const {isEmpty} = this.props.model;
         if (this.props.placeholder) {
-            const {isEmpty} = this.props.model;
             if (isEmpty) {
-                this._formatBarRef.hide();
                 this._showPlaceholder();
             } else {
                 this._hidePlaceholder();
             }
         }
+        if(isEmpty) {
+            this._formatBarRef.hide();
+        }
         this.setState({autoComplete: this.props.model.autoComplete});
         this.historyManager.tryPush(this.props.model, selection, inputType, diff);
         TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, !this.props.model.isEmpty);

From b817c06c6e6259b0f23c21c1329a061490ae3c10 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Tue, 24 Mar 2020 19:09:50 +0100
Subject: [PATCH 1732/3235] fix failing linter tests

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 707dc12a97..75455518a1 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -157,7 +157,7 @@ export default class BasicMessageEditor extends React.Component {
                 this._hidePlaceholder();
             }
         }
-        if(isEmpty) {
+        if (isEmpty) {
             this._formatBarRef.hide();
         }
         this.setState({autoComplete: this.props.model.autoComplete});

From be50f803145455aa37d25fc95478c67348c12771 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 24 Mar 2020 19:02:57 +0000
Subject: [PATCH 1733/3235] Wait for SSSS upgrade to complete

and show a spinner while it completes
---
 src/DeviceListener.js                         |  2 +-
 .../views/toasts/SetupEncryptionToast.js      | 38 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 7878a1a670..0151a45c18 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -169,7 +169,7 @@ export default class DeviceListener {
                 key: THIS_DEVICE_TOAST_KEY,
                 title: _t("Encryption upgrade available"),
                 icon: "verification_warning",
-                props: {kind: 'upgrade_encryption'},
+                props: {kind: 'upgrade_ssss'},
                 component: sdk.getComponent("toasts.SetupEncryptionToast"),
             });
         } else {
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 9016e4c6d7..f25d8fd506 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import Modal from '../../../Modal';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import DeviceListener from '../../../DeviceListener';
@@ -24,21 +26,52 @@ import { accessSecretStorage } from '../../../CrossSigningManager';
 export default class SetupEncryptionToast extends React.PureComponent {
     static propTypes = {
         toastKey: PropTypes.string.isRequired,
-        kind: PropTypes.oneOf(['set_up_encryption', 'verify_this_session', 'upgrade_encryption']).isRequired,
+        kind: PropTypes.oneOf([
+            'set_up_encryption',
+            'verify_this_session',
+            'upgrade_encryption',
+            'upgrade_ssss',
+        ]).isRequired,
     };
 
     _onLaterClick = () => {
         DeviceListener.sharedInstance().dismissEncryptionSetup();
     };
 
+    async _waitForCompletion() {
+        if (this.props.kind === 'upgrade_ssss') {
+            return new Promise(resolve => {
+                const recheck = async () => {
+                    const needsUpgrade = await MatrixClientPeg.get().secretStorageKeyNeedsUpgrade();
+                    if (!needsUpgrade) {
+                        MatrixClientPeg.get().removeListener('accountData', recheck);
+                        resolve();
+                    }
+                };
+                MatrixClientPeg.get().on('accountData', recheck);
+                recheck();
+            });
+        } else {
+            return;
+        }
+    }
+
     _onSetupClick = async () => {
-        accessSecretStorage();
+        const Spinner = sdk.getComponent("elements.Spinner");
+        const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
+        try {
+            await accessSecretStorage();
+            await this._waitForCompletion();
+        } finally {
+            modal.close();
+        }
     };
 
     getDescription() {
         switch (this.props.kind) {
             case 'set_up_encryption':
             case 'upgrade_encryption':
+            case 'upgrade_ssss':
                 return _t('Verify yourself & others to keep your chats safe');
             case 'verify_this_session':
                 return _t('Other users may not trust it');
@@ -49,6 +82,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
         switch (this.props.kind) {
             case 'set_up_encryption':
             case 'upgrade_encryption':
+            case 'upgrade_ssss':
                 return _t('Upgrade');
             case 'verify_this_session':
                 return _t('Verify');

From 76104edeca3b8ba37d4a24903fa1e0193dad56c2 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Tue, 24 Mar 2020 21:35:17 -0500
Subject: [PATCH 1734/3235] Mark room as read when escape is pressed

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5fd5f42f78..9405a26ab2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -560,6 +560,12 @@ export default createReactClass({
                     handled = true;
                 }
                 break;
+
+            case Key.ESCAPE:
+                this._messagePanel.forgetReadMarker();
+                this.jumpToLiveTimeline();
+                handled = true;
+                break;
         }
 
         if (handled) {

From 8f10223be8fe436396c4c06740ae65a208ca5591 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 24 Mar 2020 16:58:55 +0000
Subject: [PATCH 1735/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2220 of 2227 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 0dc35005ce..543b5fadb3 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2265,5 +2265,20 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "Manually Verify by Text": "Verifikojeni Dorazi përmes Teksti",
+    "Interactively verify by Emoji": "Verifikojeni në mënyrë ndërvepruese përmes Emoji-sh",
+    "Secret Storage key format:": "Format kyçesh Depozite të Fshehtë:",
+    "outdated": "e vjetruar",
+    "up to date": "e përditësuar",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Nisni një bisedë me dikë duke përdorur emrin e tij, emrin e përdoruesit për të (bie fjala, <userId/>) ose adresë email.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Ripohojeni duke krahasuar sa vijon me Rregullimet e Përdoruesit te sesioni juaj tjetër:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Ripohojeni këtë sesion përdoruesi duke krahasuar sa vijon me Rregullimet e tij të Përdoruesit:",
+    "If they don't match, the security of your communication may be compromised.": "Nëse s’përputhen, siguria e komunikimeve tuaja mund të jetë komprometuar.",
+    "Super": "Super",
+    "Navigate composer history": "Lëvizni nëpër historikun e hartuesit",
+    "Toggle video on/off": "Aktivizoni/çaktivizoni videon",
+    "Previous/next unread room or DM": "Dhoma ose MD i palexuar i mëparshëm/pasues",
+    "Previous/next room or DM": "Dhoma ose MD i mëparshëm/pasues",
+    "Toggle right panel": "Hap/mbyll panelin djathtas"
 }

From c23aba51c31bc6ff18356d039998900584943b3f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 25 Mar 2020 04:19:03 +0000
Subject: [PATCH 1736/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2227 of 2227 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 6c60acc60f..99ed5d843e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2287,5 +2287,8 @@
     "Navigate composer history": "瀏覽編輯區歷史紀錄",
     "Previous/next unread room or DM": "上一下／下一個未讀聊天室或直接訊息",
     "Previous/next room or DM": "上一個／下一個聊天室或直接訊息",
-    "Toggle right panel": "切換右側面板"
+    "Toggle right panel": "切換右側面板",
+    "Secret Storage key format:": "秘密儲存金鑰格式：",
+    "outdated": "太舊了",
+    "up to date": "已為最新"
 }

From 297abac07231a69babbb35edfb2d1a51a64f2bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 25 Mar 2020 08:51:51 +0000
Subject: [PATCH 1737/3235] Translated using Weblate (French)

Currently translated at 100.0% (2227 of 2227 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 258d9950b5..941fd209f2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2288,5 +2288,8 @@
     "Navigate composer history": "Explorer l’historique du compositeur",
     "Previous/next unread room or DM": "Salon ou message direct non lu précédent/suivant",
     "Previous/next room or DM": "Salon ou message direct précédent/suivant",
-    "Toggle right panel": "Afficher/masquer le panneau de droite"
+    "Toggle right panel": "Afficher/masquer le panneau de droite",
+    "Secret Storage key format:": "Format de clé du coffre secret :",
+    "outdated": "obsolète",
+    "up to date": "à jour"
 }

From 718eeeade6d46a6c67305cdf328cc47cbab96844 Mon Sep 17 00:00:00 2001
From: Kilian Koeltzsch <me@kilian.io>
Date: Tue, 24 Mar 2020 19:48:03 +0000
Subject: [PATCH 1738/3235] Translated using Weblate (German)

Currently translated at 75.4% (1679 of 2227 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 2eb24c29bf..0f19660c2e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -701,7 +701,7 @@
     "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
-    "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.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
+    "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.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
     "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.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",

From 19b17db803bc4672d9331b125b325ab3930a7a99 Mon Sep 17 00:00:00 2001
From: roket1428 <meorhan@protonmail.com>
Date: Tue, 24 Mar 2020 14:57:50 +0000
Subject: [PATCH 1739/3235] Translated using Weblate (Turkish)

Currently translated at 80.1% (1783 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 8f90bfe936..69f23032e5 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -81,7 +81,7 @@
     "Direct chats": "Doğrudan Sohbetler",
     "Disable Notifications": "Bildirimleri Devre Dışı Bırak",
     "Disinvite": "Daveti İptal Et",
-    "Displays action": "Görünür eylem",
+    "Displays action": "Eylemi görüntüler",
     "Download %(text)s": "%(text)s metnini indir",
     "Drop File Here": "Dosyayı Buraya Bırak",
     "Ed25519 fingerprint": "Ed25519 parmak izi",
@@ -117,7 +117,7 @@
     "Failed to toggle moderator status": "Moderatör durumunu değiştirmek başarısız oldu",
     "Failed to unban": "Yasağı kaldırmak başarısız oldu",
     "Failed to upload profile picture!": "Profil resmi yükleme başarısız oldu!",
-    "Failed to verify email address: make sure you clicked the link in the email": "E-posta adresini doğrulama başarısız : e-postadaki bağlantıya tıkladığınızdan emin olun",
+    "Failed to verify email address: make sure you clicked the link in the email": "Eposta adresini doğrulamadı: epostadaki bağlantıya tıkladığınızdan emin olun",
     "Failure to create room": "Oda oluşturulamadı",
     "Favourite": "Favori",
     "Favourites": "Favoriler",
@@ -249,7 +249,7 @@
     "Submit": "Gönder",
     "Success": "Başarılı",
     "The phone number entered looks invalid": "Girilen telefon numarası geçersiz görünüyor",
-    "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
+    "This email address is already in use": "Bu eposta adresi zaten kullanımda",
     "This email address was not found": "Bu e-posta adresi bulunamadı",
     "The email address linked to your account must be entered.": "Hesabınıza bağlı e-posta adresi girilmelidir.",
     "The remote side failed to pick up": "Uzak taraf toplanamadı(alınamadı)",
@@ -541,12 +541,12 @@
     "The platform you're on": "Platformunuz",
     "The version of Riot.im": "Riot.im'in sürümü",
     "Your language of choice": "Dil seçiminiz",
-    "Which officially provided instance you are using, if any": "Hangi resmi destekli örneği(eğer varsa) kullanmaktasınız",
-    "Add Email Address": "E-posta Adresi Ekle",
+    "Which officially provided instance you are using, if any": "Hangi resmi destekli platformu kullanmaktasınız (eğer varsa)",
+    "Add Email Address": "Eposta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
     "Your identity server's URL": "Kimlik sunucunuzun linki",
     "e.g. %(exampleValue)s": "örn.%(exampleValue)s",
-    "Every page you use in the app": "uygulamadaki kullandığınız tüm sayfalar",
+    "Every page you use in the app": "Uygulamadaki kullandığınız tüm sayfalar",
     "e.g. <CurrentPageURL>": "örn. <CurrentPageURL>",
     "Your User Agent": "Kullanıcı Ajanınız",
     "Your device resolution": "Cihazınızın çözünürlüğü",
@@ -643,7 +643,7 @@
     "Power level": "Güç düzeyi",
     "e.g. my-room": "örn. odam",
     "Some characters not allowed": "Bazı karakterlere izin verilmiyor",
-    "Matrix ID": "Matrix ID",
+    "Matrix ID": "Matrix Kimliği",
     "Matrix Room ID": "Matrix Oda ID",
     "email address": "e-posta adresi",
     "That doesn't look like a valid email address": "Geçerli bir e-posta adresi gibi gözükmüyor",
@@ -848,8 +848,8 @@
     "Create your account": "Hesabınızı oluşturun",
     "Forgotten your password?": "Parolanızı mı unuttunuz?",
     "Sign in and regain access to your account.": "Oturum açın ve yeniden hesabınıza ulaşın.",
-    "Whether or not you're logged in (we don't record your username)": "İster oturum açın yasa açmayın (biz kullanıcı adınızı kaydetmiyoruz)",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zengin Metin Düzenleyicinin Zengin metin modunu kullanıyor ya da kullanmıyorsunuz",
+    "Whether or not you're logged in (we don't record your username)": "İster oturum açın yada açmayın (biz kullanıcı adınızı kaydetmiyoruz)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zengin Metin Düzenleyicisinin Zengin metin modunu kullanıyor ya da kullanmıyorsunuz",
     "Your homeserver's URL": "Ana sunucunuzun URL’i",
     "The information being sent to us to help make Riot.im better includes:": "Riot.im i daha iyi yapmamıza yardımcı olacak bize gönderdiğiniz bilgilerin içeriği:",
     "Try using turn.matrix.org": "turn.matrix.org i kullanarak dene",
@@ -1230,7 +1230,7 @@
     "Failed to copy": "Kopyalama başarısız",
     "edited": "düzenlendi",
     "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu <idserver /> üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz \n<idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Kimlik sunucusundan bağlantıyı kesmeden önce telefon numaranızı ve e-posta adreslerinizi silmenizi tavsiye ederiz.",
     "Set a new account password...": "Yeni bir hesap parolası belirle...",
     "Deactivating your account is a permanent action - be careful!": "Hesabınızı pasifleştirmek bir kalıcı eylemdir - dikkat edin!",
@@ -1363,7 +1363,7 @@
     "Members only (since the point in time of selecting this option)": "Sadece üyeler ( bu seçeneği seçtiğinizden itibaren)",
     "Unable to revoke sharing for email address": "E-posta adresi paylaşımı kaldırılamadı",
     "Unable to revoke sharing for phone number": "Telefon numarası paylaşımı kaldırılamıyor",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Bu sayfadaki oda, kullanıcı veya grup ID si gibi betimleyici bilgiler sunucuya gönderilmeden önce silindi.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Bu sayfadaki oda, kullanıcı veya grup kimliği gibi betimleyici bilgiler sunucuya gönderilmeden önce silindi.",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Çağrıların sağlıklı bir şekide yapılabilmesi için lütfen anasunucunuzun (<code>%(homeserverDomain)s</code>) yöneticisinden bir TURN sunucusu yapılandırmasını isteyin.",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s kullanıcıları isimlerini %(count)s kez değiştirdiler",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s ismini %(count)s kez değiştirdi",
@@ -1538,7 +1538,7 @@
     "Some sessions for this user are not trusted": "Bu kullanıcı için bazı oturumlar güvenilir değil",
     "All sessions for this user are trusted": "Bu kullanıcı için tüm oturumlar güvenilir",
     "The version of Riot": "Riot sürümü",
-    "Your user agent": "Kullanıcı ajanınız",
+    "Your user agent": "Kullanıcı aracınız",
     "If you cancel now, you won't complete verifying the other user.": "Şimdi iptal ederseniz, diğer kullanıcıyı doğrulamayı tamamlamış olmayacaksınız.",
     "If you cancel now, you won't complete verifying your other session.": "Şimdi iptal ederseniz, diğer oturumu doğrulamış olmayacaksınız.",
     "Setting up keys": "Anahtarları ayarla",
@@ -1758,5 +1758,55 @@
     "Whether you're using Riot as an installed Progressive Web App": "Riot'u gelişmiş web uygulaması olarak yükleyip yüklemediğinizi",
     "The information being sent to us to help make Riot better includes:": "Riot'u geliştirmemizde bize yardım etmek için gönderdiğiniz bilgiler şunları içeriyor:",
     "A call is currently being placed!": "Bir çağrı şu anda başlatılıyor!",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Şu anda dosya ile birlikte mesaj yollamak mümkün değil. Dosyayı mesajsız yüklemek ister misiniz?"
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Şu anda dosya ile birlikte mesaj yollamak mümkün değil. Dosyayı mesajsız yüklemek ister misiniz?",
+    "PM": "24:00",
+    "AM": "12:00",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Bu eylem, bir e-posta adresini veya telefon numarasını doğrulamak için varsayılan kimlik sunucusuna <server /> erişilmesini gerektirir, ancak sunucunun herhangi bir hizmet şartı yoktur.",
+    "Sends a message as plain text, without interpreting it as markdown": "Mesajı markdown kullanmadan basit metin olarak iletir",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-posta ile davet etmek için kimlik sunucusu kullan. Varsayılan kimlik sunucusunu (%(defaultIdentityServerName)s) kullanmak için devam edin ya da ayarlardan değiştirin.",
+    "Unignored user": "Reddedilmemiş kullanıcı",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "UYARI: ANAHTAR DOĞRULAMASI BAŞARISIZ! %(userld)s'nin/nın %(deviceld)s oturumu için imza anahtarı \"%(fprint)s\" verilen anahtar ile uyumsuz \"%(fingerprint)s\". Bu iletişiminizin engellendiği anlamına gelebilir!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Verilen imza anahtarı %(userld)s'nin/nın %(deviceld)s oturumundan gelen anahtar ile uyumlu. Oturum doğrulanmış olarak işaretlendi.",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Şifreli bir odadaki geçerli giden grup oturumunun atılmasını zorlar",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s oda ismini %(oldRoomName)s bununla değiştirdi %(newRoomName)s.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s bu odada %(groups)s için etiketleri etkinleştirdi.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s bu odada %(groups)s için etiketleri devre dışı bıraktı.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s bu odada etiketleri %(newGroups)s için etkinleştirdi ve %(oldGroups)s için devre dışı bıraktı.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bu oda için alternatif adres %(addresses)s ekledi.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu oda için alternatif adresleri %(addresses)s sildi.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s bu oda için alternatif adresi %(addresses)s sildi.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s, %(targetDisplayName)s'nin odaya katılması için daveti iptal etti.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen kullanıcıları banlama kuralını kaldırdı",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen odaları banlama kuralını kaldırdı",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen sunucuları banlama kuralını kaldırdı",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s %(glob)s ile eşleşen banlama kuralını kaldırdı",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s %(glob)s ile eşleşen kullanıcıları banlama kuralını bu sebepten dolayı güncelledi %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s %(glob)s ile eşleşen odaları banlama kuralını bu sebepten dolayı güncelledi %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s %(glob)s ile eşleşen sunucuları banlama kuralını bu sebepten dolayı güncelledi %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s %(oldGlob)s ile eşleşen kullanıcıları banlama kuralını %(newGlob)s ile eşleşen olarak değiştirdi sebebi %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s %(oldGlob)s ile eşleşen odaları banlama kuralını %(newGlob)s ile eşleşen olarak değiştirdi sebebi %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s %(oldGlob)s ile eşleşen sunucuları banlama kuralını %(newGlob)s ile eşleşen olarak değiştirdi sebebi %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s %(oldGlob)s ile eşleşen banlama kuralını %(newGlob)s ile eşleşen olarak değiştirdi sebebi %(reason)s",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) yeni oturuma doğrulamadan giriş yaptı:",
+    "Ask this user to verify their session, or manually verify it below.": "Kullanıcıya oturumunu doğrulamasını söyle, ya da aşağıdan doğrula.",
+    "Manually Verify by Text": "Metin ile Doğrula",
+    "Interactively verify by Emoji": "Emoji ile etkileşimli olarak doğrula",
+    "Use a longer keyboard pattern with more turns": "Daha karmaşık ve uzun bir klavye deseni kullan",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Tahmin edilebilir harf değişimleri örneğin 'a' yerine '@' pek yardımcı olmuyor",
+    "A word by itself is easy to guess": "Kelime zaten kolay tahmin edilir",
+    "Straight rows of keys are easy to guess": "Aynı klavye satırındaki ardışık tuşlar kolay tahmin edilir",
+    "Short keyboard patterns are easy to guess": "Kısa klavye desenleri kolay tahmin edilir",
+    "Show a presence dot next to DMs in the room list": "Oda listesinde DM'lerin yanında varlık noktası göster",
+    "Support adding custom themes": "Özel tema eklemeyi destekle",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Oturum başına doğrulamak yerine kullanıcı başına doğrulama yapmak için çapraz giriş yapmayı etkinleştir (geliştirmede)",
+    "Show padlocks on invite only rooms": "Sadece davetle girilen odalarda kilit işareti göster",
+    "Show read receipts sent by other users": "Diğer kullanıcılar tarafından gönderilen okundu bilgisini göster",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Şifrelenmiş odalarda güvenli mesaj kurtarmayı etkinleştirmek için hatırlatıcı göster",
+    "Enable automatic language detection for syntax highlighting": "Sözdizimi vurgularken otomatik dil algılamayı etkinleştir",
+    "Show avatars in user and room mentions": "Kullanıcı veya odadan bahsedilirken avatarlarını göster",
+    "Automatically replace plain text Emoji": "Düz metini otomatik olarak emoji ile değiştir",
+    "Never send encrypted messages to unverified sessions from this session": "Şifreli mesajları asla bu oturumdaki doğrulanmamış oturumlara iletme",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Şifreli mesajları asla oturumdaki bu odadaki doğrulanmamış oturumlara iletme",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Potansiyel olarak geçersiz matrix kimliği olanlara davet gönderirken uyarı ver",
+    "Show shortcuts to recently viewed rooms above the room list": "Oda listesinin üzerinde en son kullanılan odaları göster"
 }

From f6e9c32c48081be68a6b9bbf5ff3b86a0d56704a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 12:04:09 +0100
Subject: [PATCH 1740/3235] fall back to non-standard persisted api for Safari

---
 src/rageshake/submit-rageshake.js | 6 ++++++
 src/utils/StorageManager.js       | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 53e9f24788..5a7039a913 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -119,6 +119,12 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
             body.append("storageManager_persisted", await navigator.storage.persisted());
         } catch (e) {}
     }
+    // Safari
+    if (document.hasStorageAccess) {
+        try {
+            body.append("storageManager_persisted", await document.hasStorageAccess());
+        } catch (e) {}
+    }
     if (navigator.storage && navigator.storage.estimate) {
         try {
             const estimate = await navigator.storage.estimate();
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index 4ed118da8a..175772903d 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -48,6 +48,11 @@ export function tryPersistStorage() {
         navigator.storage.persist().then(persistent => {
             console.log("StorageManager: Persistent?", persistent);
         });
+    } else if (document.requestStorageAccess) { //Safari
+        document.requestStorageAccess().then(
+            () => console.log("StorageManager: Persistent?", true),
+            () => console.log("StorageManager: Persistent?", false),
+        );
     } else {
         console.log("StorageManager: Persistence unsupported");
     }

From 9a5f4d9b22b2dadaddcdca3e0e17acbd969bc9dd Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 12:07:11 +0100
Subject: [PATCH 1741/3235] fall back, don't do both on FF

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

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 5a7039a913..00ef87f89c 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -118,9 +118,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         try {
             body.append("storageManager_persisted", await navigator.storage.persisted());
         } catch (e) {}
-    }
-    // Safari
-    if (document.hasStorageAccess) {
+    } else if (document.hasStorageAccess) { // Safari
         try {
             body.append("storageManager_persisted", await document.hasStorageAccess());
         } catch (e) {}

From 8b2ae3e20ff2eb67ff508afd97e40d24c6a2cb9d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:24:12 +0000
Subject: [PATCH 1742/3235] If cached keys are present in the key backup
 dialog, use them

---
 .../keybackup/RestoreKeyBackupDialog.js       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 8e4a4e1e60..5f6f08453d 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -200,6 +200,24 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         }
     }
 
+    async _restoreWithCachedKey(backupInfo) {
+        if (!backupInfo) return false;
+        try {
+            const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithCache(
+                undefined, /* targetRoomId */
+                undefined, /* targetSessionId */
+                backupInfo
+            );
+            this.setState({
+                recoverInfo
+            });
+            return true;
+        } catch (e) {
+            console.log("restoreWithCachedKey failed:", e);
+            return false;
+        }
+    }
+
     async _loadBackupStatus() {
         this.setState({
             loading: true,
@@ -213,6 +231,15 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 backupKeyStored,
             });
 
+            const gotCache = await this._restoreWithCachedKey(backupInfo);
+            if (gotCache) {
+                console.log("RestoreKeyBackupDialog: found cached backup key");
+                this.setState({
+                    loading: false,
+                });
+                return;
+            }
+
             // If the backup key is stored, we can proceed directly to restore.
             if (backupKeyStored) {
                 return this._restoreWithSecretStorage();

From 936a4a00225871442e82a3bb99ff9002f2196316 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 25 Mar 2020 11:47:07 +0000
Subject: [PATCH 1743/3235] lint

---
 .../views/dialogs/keybackup/RestoreKeyBackupDialog.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 5f6f08453d..aecfa9bfd1 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -206,10 +206,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithCache(
                 undefined, /* targetRoomId */
                 undefined, /* targetSessionId */
-                backupInfo
+                backupInfo,
             );
             this.setState({
-                recoverInfo
+                recoverInfo,
             });
             return true;
         } catch (e) {

From 792a7b395394f5bffe7d0009b4d9089509a7d03e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 13:07:07 +0100
Subject: [PATCH 1744/3235] don't throw here

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

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index a59fa08b32..e8c15bd1af 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -190,7 +190,7 @@ export default class SetupEncryptionBody extends React.Component {
             const Spinner = sdk.getComponent('views.elements.Spinner');
             return <Spinner />;
         } else {
-            throw new Error(`Unknown phase ${phase}`);
+            console.log(`SetupEncryptionBody: Unknown phase ${phase}`);
         }
     }
 }

From 78b167a7ea4f6a055c248c1d3e24c01f71345108 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 13:40:09 +0100
Subject: [PATCH 1745/3235] fix typo

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

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index e8c15bd1af..c7c73cd616 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -41,7 +41,7 @@ export default class SetupEncryptionBody extends React.Component {
         this.state = {
             phase: store.phase,
             // this serves dual purpose as the object for the request logic and
-            // the presence of it insidicating that we're in 'verify mode'.
+            // the presence of it indicating that we're in 'verify mode'.
             // Because of the latter, it lives in the state.
             verificationRequest: store.verificationRequest,
             backupInfo: store.backupInfo,

From 9dd81216fb6678fa48d651c1e1d859ea56b9f5ef Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 25 Mar 2020 14:21:17 +0000
Subject: [PATCH 1746/3235] rename secret storage force-reset variable to avoid
 confusion

---
 src/CrossSigningManager.js                         | 8 ++++----
 src/components/views/settings/CrossSigningPanel.js | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 5c254bbd00..f5a6663dfd 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -195,19 +195,19 @@ export async function promptForBackupPassphrase() {
  *
  * @param {Function} [func] An operation to perform once secret storage has been
  * bootstrapped. Optional.
- * @param {bool} [force] Reset secret storage even if it's already set up
+ * @param {bool} [forceReset] Reset secret storage even if it's already set up
  */
-export async function accessSecretStorage(func = async () => { }, force = false) {
+export async function accessSecretStorage(func = async () => { }, forceReset = false) {
     const cli = MatrixClientPeg.get();
     secretStorageBeingAccessed = true;
     try {
-        if (!await cli.hasSecretStorageKey() || force) {
+        if (!await cli.hasSecretStorageKey() || forceReset) {
             // This dialog calls bootstrap itself after guiding the user through
             // passphrase creation.
             const { finished } = Modal.createTrackedDialogAsync('Create Secret Storage dialog', '',
                 import("./async-components/views/dialogs/secretstorage/CreateSecretStorageDialog"),
                 {
-                    force,
+                    force: forceReset,
                 },
                 null, /* priority = */ false, /* static = */ true,
             );
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cf47c797fc..649ca4a950 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -98,12 +98,12 @@ export default class CrossSigningPanel extends React.PureComponent {
      * 2. Access existing secret storage by requesting passphrase and accessing
      *    cross-signing keys as needed.
      * 3. All keys are loaded and there's nothing to do.
-     * @param {bool} [force] Bootstrap again even if keys already present
+     * @param {bool} [forceReset] Bootstrap again even if keys already present
      */
-    _bootstrapSecureSecretStorage = async (force=false) => {
+    _bootstrapSecureSecretStorage = async (forceReset=false) => {
         this.setState({ error: null });
         try {
-            await accessSecretStorage(() => undefined, force);
+            await accessSecretStorage(() => undefined, forceReset);
         } catch (e) {
             this.setState({ error: e });
             console.error("Error bootstrapping secret storage", e);

From 2b600e74c4d092e34f5de3348bc7ab946dacc506 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 25 Mar 2020 13:23:47 +0000
Subject: [PATCH 1747/3235] Translated using Weblate (Turkish)

Currently translated at 80.9% (1801 of 2227 strings)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 69f23032e5..7b5a0ac3ec 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1808,5 +1808,23 @@
     "Never send encrypted messages to unverified sessions from this session": "Şifreli mesajları asla bu oturumdaki doğrulanmamış oturumlara iletme",
     "Never send encrypted messages to unverified sessions in this room from this session": "Şifreli mesajları asla oturumdaki bu odadaki doğrulanmamış oturumlara iletme",
     "Prompt before sending invites to potentially invalid matrix IDs": "Potansiyel olarak geçersiz matrix kimliği olanlara davet gönderirken uyarı ver",
-    "Show shortcuts to recently viewed rooms above the room list": "Oda listesinin üzerinde en son kullanılan odaları göster"
+    "Show shortcuts to recently viewed rooms above the room list": "Oda listesinin üzerinde en son kullanılan odaları göster",
+    "Secret Storage key format:": "Sır Depolama anahtar biçemi:",
+    "Error downloading theme information.": "Tema bilgisi indirilirken hata.",
+    "Theme added!": "Tema eklendi!",
+    "Add theme": "Tema ekle",
+    "Keyboard Shortcuts": "Klavye Kısayolları",
+    "%(count)s unread messages including mentions.|other": "anmalar dahil okunmayan %(count)s mesaj.",
+    "Local address": "Yerel adres",
+    "Local Addresses": "Yerel Adresler",
+    "Yours, or the other users’ session": "Sizin yada diğer kullanıcıların oturumları",
+    "Trusted": "Güvenilir",
+    "Not trusted": "Güvenilir değil",
+    "Hide sessions": "Oturumları gizle",
+    "Verify by scanning": "Taramayla doğrula",
+    "Verify by emoji": "Emojiyle doğrula",
+    "Verify by comparing unique emoji.": "Eşsiz emoji eşleştirme ile doğrulama.",
+    "Edited at %(date)s. Click to view edits.": "%(date)s tarihinde düzenlendi. Düzenlemeleri görmek için tıkla.",
+    "Failed to load group members": "Grup üyeleri yüklenirken başarısız",
+    "Visibility in Room List": "Oda Listesindeki Görünürlük"
 }

From 4d63c11f260f78e93d01f025d55ae028a2897cd8 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 25 Mar 2020 14:06:47 +0000
Subject: [PATCH 1748/3235] Respond to backup key sharing requests

---
 src/CrossSigningManager.js | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 097464ee43..5def8d9fd5 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -145,18 +145,33 @@ const onSecretRequested = async function({
         console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
         return;
     }
-    const callbacks = client.getCrossSigningCacheCallbacks();
-    if (!callbacks.getCrossSigningKeyCache) return;
-    if (name === "m.cross_signing.self_signing") {
-        const key = await callbacks.getCrossSigningKeyCache("self_signing");
-        if (!key) {
-            console.log(`self_signing requested by ${deviceId}, but not found in cache`);
+    if (name.startsWith("m.cross_signing")) {
+        const callbacks = client.getCrossSigningCacheCallbacks();
+        if (!callbacks.getCrossSigningKeyCache) return;
+        /* Explicit enumeration here is deliberate – never share the master key! */
+        if (name === "m.cross_signing.self_signing") {
+            const key = await callbacks.getCrossSigningKeyCache("self_signing");
+            if (!key) {
+                console.log(
+                    `self_signing requested by ${deviceId}, but not found in cache`
+                );
+            }
+            return key && encodeBase64(key);
+        } else if (name === "m.cross_signing.user_signing") {
+            const key = await callbacks.getCrossSigningKeyCache("user_signing");
+            if (!key) {
+                console.log(
+                    `user_signing requested by ${deviceId}, but not found in cache`
+                );
+            }
+            return key && encodeBase64(key);
         }
-        return key && encodeBase64(key);
-    } else if (name === "m.cross_signing.user_signing") {
-        const key = await callbacks.getCrossSigningKeyCache("user_signing");
+    } else if (name === "m.megolm_backup.v1") {
+        const key = await client._crypto.getSessionBackupPrivateKey();
         if (!key) {
-            console.log(`user_signing requested by ${deviceId}, but not found in cache`);
+            console.log(
+                `session backup key requested by ${deviceId}, but not found in cache`
+            );
         }
         return key && encodeBase64(key);
     }

From f891f3e9fa70ffc83fb679d5364d5dfc909ad42b Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 25 Mar 2020 16:08:26 +0000
Subject: [PATCH 1749/3235] lint

---
 src/CrossSigningManager.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 5def8d9fd5..29eb3cb8be 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -153,7 +153,7 @@ const onSecretRequested = async function({
             const key = await callbacks.getCrossSigningKeyCache("self_signing");
             if (!key) {
                 console.log(
-                    `self_signing requested by ${deviceId}, but not found in cache`
+                    `self_signing requested by ${deviceId}, but not found in cache`,
                 );
             }
             return key && encodeBase64(key);
@@ -161,7 +161,7 @@ const onSecretRequested = async function({
             const key = await callbacks.getCrossSigningKeyCache("user_signing");
             if (!key) {
                 console.log(
-                    `user_signing requested by ${deviceId}, but not found in cache`
+                    `user_signing requested by ${deviceId}, but not found in cache`,
                 );
             }
             return key && encodeBase64(key);
@@ -170,7 +170,7 @@ const onSecretRequested = async function({
         const key = await client._crypto.getSessionBackupPrivateKey();
         if (!key) {
             console.log(
-                `session backup key requested by ${deviceId}, but not found in cache`
+                `session backup key requested by ${deviceId}, but not found in cache`,
             );
         }
         return key && encodeBase64(key);

From 0097134ade4c3953d57fa64e33c70d3b45d92c5f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 17:56:35 +0000
Subject: [PATCH 1750/3235] Update src/utils/StorageManager.js

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/utils/StorageManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index 175772903d..e29b6d9b0e 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -48,7 +48,7 @@ export function tryPersistStorage() {
         navigator.storage.persist().then(persistent => {
             console.log("StorageManager: Persistent?", persistent);
         });
-    } else if (document.requestStorageAccess) { //Safari
+    } else if (document.requestStorageAccess) { // Safari
         document.requestStorageAccess().then(
             () => console.log("StorageManager: Persistent?", true),
             () => console.log("StorageManager: Persistent?", false),

From 0fb4c51b2c55f30391b6a6c1c9107ebe37653cd9 Mon Sep 17 00:00:00 2001
From: Max Klenk <max@klenk.biz>
Date: Wed, 25 Mar 2020 17:17:09 +0000
Subject: [PATCH 1751/3235] Translated using Weblate (German)

Currently translated at 75.5% (1685 of 2231 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0f19660c2e..306a1a1f69 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1733,5 +1733,9 @@
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Räume, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
-    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel, die aufgrund von %(reason)s %(glob)s entsprechen"
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?",
+    "<userName/> wants to chat": "<userName/> möchte mit dir chatten",
+    "Start chatting": "Chat starten",
+    "Reject & Ignore user": "Ablehnen & Nutzer ignorieren"
 }

From 2c1fbfb69c88506ed804606c679d55a49528748e Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Wed, 25 Mar 2020 17:25:02 +0000
Subject: [PATCH 1752/3235] Translated using Weblate (German)

Currently translated at 75.5% (1685 of 2231 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 306a1a1f69..9565299b8d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1737,5 +1737,7 @@
     "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?",
     "<userName/> wants to chat": "<userName/> möchte mit dir chatten",
     "Start chatting": "Chat starten",
-    "Reject & Ignore user": "Ablehnen & Nutzer ignorieren"
+    "Reject & Ignore user": "Ablehnen & Nutzer ignorieren",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
 }

From 25e7bde7bcfb1fbacd1b3a489cac20171a4ff116 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Mar 2020 18:38:12 +0000
Subject: [PATCH 1753/3235] Add a flag to control whether cross-signing
 signatures are trusted

Fixes: https://github.com/vector-im/riot-web/issues/12616
---
 res/css/_components.scss                              |  1 +
 src/MatrixClientPeg.js                                |  3 +++
 src/components/views/rooms/MemberTile.js              |  7 +++++++
 .../settings/tabs/user/SecurityUserSettingsTab.js     |  3 +++
 src/i18n/strings/en_EN.json                           |  2 ++
 src/settings/Settings.js                              | 11 +++++++++++
 6 files changed, 27 insertions(+)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 6890a1ffd1..b959b1f1cd 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -186,6 +186,7 @@
 @import "./views/settings/_AvatarSetting.scss";
 @import "./views/settings/_CrossSigningPanel.scss";
 @import "./views/settings/_DevicesPanel.scss";
+@import "./views/settings/_E2eAdvancedPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
 @import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_KeyBackupPanel.scss";
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 98fcc85d60..21f05b9759 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -148,6 +148,9 @@ class _MatrixClientPeg {
             // check that we have a version of the js-sdk which includes initCrypto
             if (!SettingsStore.getValue("lowBandwidth") && this.matrixClient.initCrypto) {
                 await this.matrixClient.initCrypto();
+                this.matrixClient.setCryptoTrustCrossSignedDevices(
+                    !SettingsStore.getValue('e2ee.manuallyVerifyAllSessions'),
+                );
                 StorageManager.setCryptoInitialised(true);
             }
         } catch (e) {
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 1f1d8389b1..a0e900b5fc 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -65,6 +65,7 @@ export default createReactClass({
                 });
                 if (isRoomEncrypted) {
                     cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
+                    cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
                     this.updateE2EStatus();
                 } else {
                     // Listen for room to become encrypted
@@ -88,6 +89,7 @@ export default createReactClass({
         if (cli) {
             cli.removeListener("RoomState.events", this.onRoomStateEvents);
             cli.removeListener("userTrustStatusChanged", this.onUserTrustStatusChanged);
+            cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         }
     },
 
@@ -110,6 +112,11 @@ export default createReactClass({
         this.updateE2EStatus();
     },
 
+    onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {
+        if (userId !== this.props.member.userId) return;
+        this.updateE2EStatus();
+    },
+
     updateE2EStatus: async function() {
         const cli = MatrixClientPeg.get();
         const { userId } = this.props.member;
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 2e35a6bf6f..3dca6e2490 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -281,6 +281,8 @@ export default class SecurityUserSettingsTab extends React.Component {
             );
         }
 
+        const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');
+
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
@@ -311,6 +313,7 @@ export default class SecurityUserSettingsTab extends React.Component {
                 </div>
                 {this._renderIgnoredUsers()}
                 {this._renderManageInvites()}
+                <E2eAdvancedPanel />
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 57b39309b0..3602134f08 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -432,6 +432,7 @@
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
     "Keep secret storage passphrase in memory for this session": "Keep secret storage passphrase in memory for this session",
     "How fast should messages be downloaded.": "How fast should messages be downloaded.",
+    "Manually verify all remote sessions": "Manually verify all remote sessions",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",
@@ -598,6 +599,7 @@
     "Public Name": "Public Name",
     "Last seen": "Last seen",
     "Failed to set display name": "Failed to set display name",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Securely cache encrypted messages locally for them to appear in search results, using ",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 461761dfa2..0d72017878 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {MatrixClient} from 'matrix-js-sdk';
+
 import {_td} from '../languageHandler';
 import {
     AudioNotificationsEnabledController,
@@ -24,6 +26,7 @@ import {
 } from "./controllers/NotificationControllers";
 import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
+import PushToMatrixClientController from './controllers/PushToMatrixClientController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
 
@@ -525,4 +528,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: true,
     },
+    "e2ee.manuallyVerifyAllSessions": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        displayName: _td("Manually verify all remote sessions"),
+        default: false,
+        controller: new PushToMatrixClientController(
+            MatrixClient.prototype.setCryptoTrustCrossSignedDevices, true,
+        ),
+    },
 };

From 327b3c860b4f0c622654f83e08454a75a4d5e195 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Mar 2020 18:47:57 +0000
Subject: [PATCH 1754/3235] Adding the files would help

---
 res/css/views/settings/_E2eAdvancedPanel.scss | 20 ++++++++++
 .../views/settings/E2eAdvancedPanel.js        | 39 +++++++++++++++++++
 .../PushToMatrixClientController.js           | 37 ++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 res/css/views/settings/_E2eAdvancedPanel.scss
 create mode 100644 src/components/views/settings/E2eAdvancedPanel.js
 create mode 100644 src/settings/controllers/PushToMatrixClientController.js

diff --git a/res/css/views/settings/_E2eAdvancedPanel.scss b/res/css/views/settings/_E2eAdvancedPanel.scss
new file mode 100644
index 0000000000..9e32685d12
--- /dev/null
+++ b/res/css/views/settings/_E2eAdvancedPanel.scss
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_E2eAdvancedPanel_settingLongDescription {
+    margin-right: 150px;
+}
+
diff --git a/src/components/views/settings/E2eAdvancedPanel.js b/src/components/views/settings/E2eAdvancedPanel.js
new file mode 100644
index 0000000000..709465bcb0
--- /dev/null
+++ b/src/components/views/settings/E2eAdvancedPanel.js
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from '../../../index';
+import {_t} from "../../../languageHandler";
+import {SettingLevel} from "../../../settings/SettingsStore";
+
+const SETTING_MANUALLY_VERIFY_ALL_SESSIONS = "e2ee.manuallyVerifyAllSessions";
+
+const E2eAdvancedPanel = props => {
+    const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
+    return <div className="mx_SettingsTab_section">
+        <span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
+
+        <SettingsFlag name={SETTING_MANUALLY_VERIFY_ALL_SESSIONS}
+            level={SettingLevel.DEVICE}
+        />
+        <div className="mx_E2eAdvancedPanel_settingLongDescription">{_t(
+            "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
+        )}</div>
+    </div>;
+};
+
+export default E2eAdvancedPanel;
diff --git a/src/settings/controllers/PushToMatrixClientController.js b/src/settings/controllers/PushToMatrixClientController.js
new file mode 100644
index 0000000000..b7c285227f
--- /dev/null
+++ b/src/settings/controllers/PushToMatrixClientController.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { MatrixClientPeg } from '../../MatrixClientPeg';
+
+/**
+ * When the value changes, call a setter function on the matrix client with the new value
+ */
+export default class PushToMatrixClientController {
+    constructor(setter, inverse) {
+        this._setter = setter;
+        this._inverse = inverse;
+    }
+
+    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
+        return null; // no override
+    }
+
+    onChange(level, roomId, newValue) {
+        // XXX does this work? This surely isn't necessarily the effective value,
+        // but it's what NotificationsEnabledController does...
+        this._setter.call(MatrixClientPeg.get(), this._inverse ? !newValue : newValue);
+    }
+}

From d098c91c3043d319a89ce047e9439cc92f05695c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 25 Mar 2020 22:38:11 +0000
Subject: [PATCH 1755/3235] Update cross-signing verification copy and fix i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/right_panel/EncryptionInfo.js       | 22 +++++++++++++++----
 .../views/right_panel/EncryptionPanel.js      |  5 ++++-
 src/components/views/right_panel/UserInfo.js  |  5 ++---
 .../views/right_panel/VerificationPanel.js    | 16 ++++++++++----
 src/i18n/strings/en_EN.json                   |  8 ++++++-
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index bbedc9b303..610ea99511 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -28,7 +28,7 @@ export const PendingActionSpinner = ({text}) => {
     </div>;
 };
 
-const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStartVerification}) => {
+const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStartVerification, isRoomEncrypted}) => {
     let content;
     if (waitingForOtherParty || waitingForNetwork) {
         let text;
@@ -49,13 +49,27 @@ const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStar
         );
     }
 
-    return <React.Fragment>
-        <div className="mx_UserInfo_container">
-            <h3>{_t("Encryption")}</h3>
+    let description;
+    if (isRoomEncrypted) {
+        description = (
             <div>
                 <p>{_t("Messages in this room are end-to-end encrypted.")}</p>
                 <p>{_t("Your messages are secured and only you and the recipient have the unique keys to unlock them.")}</p>
             </div>
+        );
+    } else {
+        description = (
+            <div>
+                <p>{_t("Messages in this room are not end-to-end encrypted.")}</p>
+                <p>{_t("In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.")}</p>
+            </div>
+        );
+    }
+
+    return <React.Fragment>
+        <div className="mx_UserInfo_container">
+            <h3>{_t("Encryption")}</h3>
+            { description }
         </div>
         <div className="mx_UserInfo_container">
             <h3>{_t("Verify User")}</h3>
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index a14d4a2b7d..3a4aa2edc3 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -30,7 +30,8 @@ import {_t} from "../../../languageHandler";
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
-const EncryptionPanel = ({verificationRequest, verificationRequestPromise, member, onClose, layout}) => {
+const EncryptionPanel = (props) => {
+    const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted} = props;
     const [request, setRequest] = useState(verificationRequest);
     // state to show a spinner immediately after clicking "start verification",
     // before we have a request
@@ -98,6 +99,7 @@ const EncryptionPanel = ({verificationRequest, verificationRequestPromise, membe
     if (!request || requested) {
         const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
         return <EncryptionInfo
+            isRoomEncrypted={isRoomEncrypted}
             onStartVerification={onStartVerification}
             member={member}
             waitingForOtherParty={requested && initiatedByMe}
@@ -105,6 +107,7 @@ const EncryptionPanel = ({verificationRequest, verificationRequestPromise, membe
     } else {
         return (
             <VerificationPanel
+                isRoomEncrypted={isRoomEncrypted}
                 layout={layout}
                 onClose={onClose}
                 member={member}
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 4219da690e..3a415fa8a7 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1297,8 +1297,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const userVerified = userTrust.isCrossSigningVerified();
     const isMe = member.userId === cli.getUserId();
     const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
-                        homeserverSupportsCrossSigning &&
-                        isRoomEncrypted && !userVerified && !isMe;
+                        homeserverSupportsCrossSigning && !userVerified && !isMe;
 
     const setUpdating = (updating) => {
         setPendingUpdateCount(count => count + (updating ? 1 : -1));
@@ -1496,7 +1495,7 @@ const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.Room
         case RIGHT_PANEL_PHASES.EncryptionPanel:
             classes.push("mx_UserInfo_smallAvatar");
             content = (
-                <EncryptionPanel {...props} member={member} onClose={onClose} />
+                <EncryptionPanel {...props} member={member} onClose={onClose} isRoomEncrypted={isRoomEncrypted} />
             );
             break;
     }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 38ee31c8b7..a5cb796531 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -48,6 +48,7 @@ export default class VerificationPanel extends React.PureComponent {
             PHASE_DONE,
         ]).isRequired,
         onClose: PropTypes.func.isRequired,
+        isRoomEncrypted: PropTypes.bool,
     };
 
     constructor(props) {
@@ -174,15 +175,22 @@ export default class VerificationPanel extends React.PureComponent {
     renderVerifiedPhase() {
         const {member} = this.props;
 
+        let text;
+        if (this.props.isRoomEncrypted) {
+            text = _t("Verify all users in a room to ensure it's secure.");
+        } else {
+            text = _t("In encrypted rooms, verify all users in a room to ensure it’s secure.");
+        }
+
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
-                <h3>Verified</h3>
+                <h3>{_t("Verified")}</h3>
                 <p>{_t("You've successfully verified %(displayName)s!", {
                     displayName: member.displayName || member.name || member.userId,
                 })}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
-                <p>Verify all users in a room to ensure it's secure.</p>
+                <p>{ text }</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
                     {_t("Got it")}
@@ -209,7 +217,7 @@ export default class VerificationPanel extends React.PureComponent {
 
         return (
             <div className="mx_UserInfo_container">
-                <h3>Verification cancelled</h3>
+                <h3>{_t("Verification cancelled")}</h3>
                 <p>{ text }</p>
 
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
@@ -231,7 +239,7 @@ export default class VerificationPanel extends React.PureComponent {
                 if (this.state.sasEvent) {
                     const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
                     return <div className="mx_UserInfo_container">
-                        <h3>Compare emoji</h3>
+                        <h3>{_t("Compare emoji")}</h3>
                         <VerificationShowSas
                             displayName={displayName}
                             sas={this.state.sasEvent.sas}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 12bd462937..7dec09d30a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1199,6 +1199,8 @@
     "Start Verification": "Start Verification",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Your messages are secured and only you and the recipient have the unique keys to unlock them.",
+    "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.",
     "Verify User": "Verify User",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "For extra security, verify this user by checking a one-time code on both of your devices.",
     "Your messages are not secure": "Your messages are not secure",
@@ -1225,7 +1227,6 @@
     "Failed to remove user from community": "Failed to remove user from community",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
-    "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Security": "Security",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.",
     "Verify by scanning": "Verify by scanning",
@@ -1233,11 +1234,16 @@
     "Verify by emoji": "Verify by emoji",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
+    "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
+    "In encrypted rooms, verify all users in a room to ensure it’s secure.": "In encrypted rooms, verify all users in a room to ensure it’s secure.",
+    "Verified": "Verified",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Got it": "Got it",
     "Verification timed out. Start verification again from their profile.": "Verification timed out. Start verification again from their profile.",
     "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s cancelled verification. Start verification again from their profile.",
     "You cancelled verification. Start verification again from their profile.": "You cancelled verification. Start verification again from their profile.",
+    "Verification cancelled": "Verification cancelled",
+    "Compare emoji": "Compare emoji",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",

From be3167c87042e65ae38aadd11655031670f3ea7c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 25 Mar 2020 22:44:09 +0000
Subject: [PATCH 1756/3235] always show Devices section

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 3a415fa8a7..34d0047892 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1319,20 +1319,15 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
         );
     }
 
-    let devicesSection;
-    if (isRoomEncrypted) {
-        devicesSection = <DevicesSection
-            loading={devices === undefined}
-            devices={devices}
-            userId={member.userId} />;
-    }
-
     const securitySection = (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>
             <p>{ text }</p>
             { verifyButton }
-            { devicesSection }
+            <DevicesSection
+                loading={devices === undefined}
+                devices={devices}
+                userId={member.userId} />
         </div>
     );
 

From 7ca6a4b7770e1b2940d60791cceff8432a851c8e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 25 Mar 2020 23:00:46 +0000
Subject: [PATCH 1757/3235] Iterate copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/VerificationPanel.js | 2 +-
 src/i18n/strings/en_EN.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a5cb796531..1cb2737005 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -179,7 +179,7 @@ export default class VerificationPanel extends React.PureComponent {
         if (this.props.isRoomEncrypted) {
             text = _t("Verify all users in a room to ensure it's secure.");
         } else {
-            text = _t("In encrypted rooms, verify all users in a room to ensure it’s secure.");
+            text = _t("In encrypted rooms, verify all users to ensure it’s secure.");
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7dec09d30a..ef6dc6d821 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1235,7 +1235,7 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
-    "In encrypted rooms, verify all users in a room to ensure it’s secure.": "In encrypted rooms, verify all users in a room to ensure it’s secure.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
     "Verified": "Verified",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Got it": "Got it",

From c41b39488b46ac772d3b0c0ba5c9c3b060e495e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 25 Mar 2020 23:35:36 +0000
Subject: [PATCH 1758/3235] Automatically redirect to SSO when the user clicks
 through to Login

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/Login.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index bfabc34a62..36df08627e 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -53,6 +53,10 @@ _td("Invalid base_url for m.identity_server");
 _td("Identity server URL does not appear to be a valid identity server");
 _td("General failure");
 
+const M_LOGIN_CAS = "m.login.cas";
+const M_LOGIN_SSO = "m.login.sso";
+const SSO_FLOWS = [M_LOGIN_SSO, M_LOGIN_CAS];
+
 /**
  * A wire component which glues together login UI components and Login logic
  */
@@ -122,11 +126,11 @@ export default createReactClass({
             'm.login.password': this._renderPasswordStep,
 
             // CAS and SSO are the same thing, modulo the url we link to
-            'm.login.cas': () => this._renderSsoStep("cas"),
-            'm.login.sso': () => this._renderSsoStep("sso"),
+            [M_LOGIN_CAS]: () => this._renderSsoStep("cas"),
+            [M_LOGIN_SSO]: () => this._renderSsoStep("sso"),
         };
 
-        this._initLoginLogic();
+        this._initLoginLogic(true);
     },
 
     componentWillUnmount: function() {
@@ -138,7 +142,7 @@ export default createReactClass({
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
         // Ensure that we end up actually logging in to the right place
-        this._initLoginLogic(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
+        this._initLoginLogic(false, newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
     },
 
     onPasswordLoginError: function(errorText) {
@@ -342,12 +346,12 @@ export default createReactClass({
 
     onTryRegisterClick: function(ev) {
         const step = this._getCurrentFlowStep();
-        if (step === 'm.login.sso' || step === 'm.login.cas') {
+        if (SSO_FLOWS.includes(step)) {
             // If we're showing SSO it means that registration is also probably disabled,
             // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
             ev.preventDefault();
             ev.stopPropagation();
-            const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
+            const ssoKind = step === M_LOGIN_SSO ? 'sso' : 'cas';
             PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
         } else {
             // Don't intercept - just go through to the register page
@@ -369,7 +373,7 @@ export default createReactClass({
         });
     },
 
-    _initLoginLogic: async function(hsUrl, isUrl) {
+    _initLoginLogic: async function(initial, hsUrl, isUrl) {
         hsUrl = hsUrl || this.props.serverConfig.hsUrl;
         isUrl = isUrl || this.props.serverConfig.isUrl;
 
@@ -429,6 +433,13 @@ export default createReactClass({
                     continue;
                 }
 
+                // if this is the initial render and the flow we choose is SSO/CAS then go to it automatically
+                // we do not do this when the user has changed to the server manually as that may be jarring.
+                if (initial && SSO_FLOWS.includes(flows[i].type)) {
+                    const tmpCli = this._loginLogic.createTemporaryClient();
+                    PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas");
+                }
+
                 // we just pick the first flow where we support all the
                 // steps. (we don't have a UI for multiple logins so let's skip
                 // that for now).

From f448f456e1f2f56eb461026e6c9da499237b825f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 26 Mar 2020 02:37:38 +0000
Subject: [PATCH 1759/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2231 of 2231 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 99ed5d843e..eb4f94172e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2290,5 +2290,9 @@
     "Toggle right panel": "切換右側面板",
     "Secret Storage key format:": "秘密儲存金鑰格式：",
     "outdated": "太舊了",
-    "up to date": "已為最新"
+    "up to date": "已為最新",
+    "Self signing private key:": "自行簽章私鑰：",
+    "cached locally": "本機快取",
+    "not found locally": "在本機找不到",
+    "User signing private key:": "使用者簽章私鑰："
 }

From 7d924308319fdb135aefd47d2748aeda330521f1 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 25 Mar 2020 21:52:01 +0000
Subject: [PATCH 1760/3235] Translated using Weblate (Esperanto)

Currently translated at 99.8% (2227 of 2231 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 | 68 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4849862f99..f4bb6ec244 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -111,7 +111,7 @@
     "Someone": "Iu",
     "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
     "%(senderName)s answered the call.": "%(senderName)s akceptis la vokon.",
-    "(could not connect media)": "(aŭdvidaĵoj ne kunigeblis)",
+    "(could not connect media)": "(ne povis kunigi aŭdovidaĵojn)",
     "(no answer)": "(sen respondo)",
     "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
@@ -2210,5 +2210,69 @@
     "Matrix rooms": "Ĉambroj de Matrix",
     "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Malfermi jaman salutaĵon kaj kontroli ĉi tiun per ĝi, permesante al ĝi aliron al ĉifritaj mesaĝoj.",
     "Waiting…": "Atendante…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se vi ne povas iun atingi, <button>uzu vian rehavan ŝlosilon aŭ pasfrazon.</button>"
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se vi ne povas iun atingi, <button>uzu vian rehavan ŝlosilon aŭ pasfrazon.</button>",
+    "Manually Verify by Text": "Permane kontroli tekste",
+    "Interactively verify by Emoji": "Interage kontroli bildosigne",
+    "Self signing private key:": "Memsubskriba privata ŝlosilo",
+    "cached locally": "kaŝmemorita loke",
+    "not found locally": "ne trovita loke",
+    "User signing private key:": "Uzantosubskriba privata ŝlosilo:",
+    "Secret Storage key format:": "Ŝlosila formo de sekreta deponejo:",
+    "outdated": "eksdata",
+    "up to date": "ĝisdata",
+    "Keyboard Shortcuts": "Klavkombinoj",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Komencu interparolon kun iu per ĝia nomo, uzantonomo (kiel <userId/>), aŭ retpoŝtadreso.",
+    "a new master key signature": "nova ĉefŝlosila subskribo",
+    "a new cross-signing key signature": "nova transire subskriba ŝlosila subskribo",
+    "a device cross-signing signature": "aparata transire subskriba ŝlosila subskribo",
+    "a key signature": "ŝlosila subskribo",
+    "Riot encountered an error during upload of:": "Riot eraris dum alŝuto de:",
+    "Upload completed": "Alŝuto finiĝis",
+    "Cancelled signature upload": "Alŝuto de subskribo nuliĝis",
+    "Unabled to upload": "Ne povas alŝuti",
+    "Signature upload success": "Alŝuto de subskribo sukcesis",
+    "Signature upload failed": "Alŝuto de subskribo malsukcesis",
+    "Confirm by comparing the following with the User Settings in your other session:": "Konfirmu per komparo de la sekva kun la agardoj de uzanto en via alia salutaĵo:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Konfirmu la salutaĵon de ĉi tiu uzanto per komparo de la sekva kun ĝiaj agordoj de uzanto",
+    "If they don't match, the security of your communication may be compromised.": "Se ili ne akordas, la sekureco de via komunikado eble estas rompita.",
+    "Navigation": "Navigado",
+    "Calls": "Vokoj",
+    "Room List": "Listo de ĉambroj",
+    "Autocomplete": "Memkompletigo",
+    "Alt": "Alt-klavo",
+    "Alt Gr": "Alt-Gr-klavo",
+    "Shift": "Majuskliga klavo",
+    "Super": "Super-klavo",
+    "Ctrl": "Stir-klavo",
+    "Toggle Bold": "Ŝalti grason",
+    "Toggle Italics": "Ŝalti kursivon",
+    "Toggle Quote": "Ŝalti citaĵon",
+    "New line": "Nova linio",
+    "Navigate recent messages to edit": "Navigi freŝajn mesaĝojn redaktotajn",
+    "Jump to start/end of the composer": "Salti al komenco/fino de la komponilo",
+    "Navigate composer history": "Navigi historion de la komponilo",
+    "Toggle microphone mute": "Baskuligi silentigon de mikrofono",
+    "Toggle video on/off": "Baskuligi filmojn",
+    "Jump to room search": "Salti al serĉo de ĉambroj",
+    "Navigate up/down in the room list": "Navigi supren/malsupren en la listo de ĉambroj",
+    "Select room from the room list": "Elekti ĉambron el la listo de ĉambroj",
+    "Collapse room list section": "Maletendi parton kun listo de ĉambroj",
+    "Expand room list section": "Etendi parton kun listo de ĉambroj",
+    "Clear room list filter field": "Vakigi filtrilon de la listo de ĉambroj",
+    "Scroll up/down in the timeline": "Rulumi supren/suben en la historio",
+    "Previous/next unread room or DM": "Antaŭa/sekva nelegita ĉambro",
+    "Previous/next room or DM": "Antaŭa/sekva ĉambro",
+    "Toggle the top left menu": "Baskuligi la supran maldekstran menuon",
+    "Close dialog or context menu": "Fermi interagujon aŭ kuntekstan menuon",
+    "Activate selected button": "Aktivigi la elektitan butonon",
+    "Toggle right panel": "Baskuligi la dekstran panelon",
+    "Toggle this dialog": "Baskuligi ĉi tiun interagujon",
+    "Move autocomplete selection up/down": "Movi memkompletigan elekton supren/suben",
+    "Cancel autocomplete": "Nuligi memkompletigon",
+    "Page Up": "Paĝosupren-klavo",
+    "Page Down": "Paĝosuben-klavo",
+    "Esc": "Eskapa klavo",
+    "Enter": "Eniga klavo",
+    "Space": "Spaco",
+    "End": "Finen-klavo"
 }

From 883b0afea0c3dbc5788582ba83570b44cc0bfedf Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 25 Mar 2020 19:42:58 +0000
Subject: [PATCH 1761/3235] Translated using Weblate (Hungarian)

Currently translated at 97.1% (2167 of 2231 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 | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d1e7aeebe7..7e78c367f7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2199,5 +2199,32 @@
     "Error downloading theme information.": "A téma információk letöltése sikertelen.",
     "Theme added!": "Téma hozzáadva!",
     "Custom theme URL": "Egyedi téma URL",
-    "Add theme": "Téma hozzáadása"
+    "Add theme": "Téma hozzáadása",
+    "Review Sessions": "Munkamenetek átnézése",
+    "Manually Verify by Text": "Manuális szöveges ellenőrzés",
+    "Interactively verify by Emoji": "Közös ellenőrzés Emodzsival",
+    "Self signing private key:": "Titkos önaláíró kulcs:",
+    "cached locally": "helyben gyorsítótárazott",
+    "not found locally": "helyben nem található",
+    "User signing private key:": "Titkos felhasználó aláíró kulcs:",
+    "Secret Storage key format:": "Biztonsági tároló kulcs formátum:",
+    "outdated": "lejárt",
+    "up to date": "friss",
+    "Keyboard Shortcuts": "Billentyűzet kombinációk",
+    "Scroll to most recent messages": "A legfrissebb üzenethez görget",
+    "Local address": "Helyi cím",
+    "Published Addresses": "Nyilvánosságra hozott cím",
+    "Other published addresses:": "Másik nyilvánosságra hozott cím:",
+    "No other published addresses yet, add one below": "Nincs másik nyilvánosságra hozott cím, alább adj hozzá egyet",
+    "New published address (e.g. #alias:server)": "Új nyilvános cím (pl.: #becenév:szerver)",
+    "Local Addresses": "Helyi címek",
+    "Enter a server name": "Add meg a szerver nevét",
+    "Looks good": "Jól néz ki",
+    "Can't find this server or its room list": "A szerver vagy a szoba listája nem található",
+    "All rooms": "Minden szoba",
+    "Your server": "Matrix szervered",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Biztos, hogy törölni szeretnéd: <b>%(serverName)s</b>",
+    "Remove server": "Szerver törlése",
+    "Matrix": "Matrix",
+    "Add a new server": "Új szerver hozzáadása"
 }

From 0436507574704d700a73eccd0b82b9f7d0a6c02e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 19:24:32 +0100
Subject: [PATCH 1762/3235] use transparent scrollbars on not hover to emulate
 scrolbar on hover

allows us to get rid of the margin-right hack as well
---
 res/css/structures/_AutoHideScrollbar.scss    | 78 +++++--------------
 .../structures/AutoHideScrollbar.js           | 57 +-------------
 2 files changed, 21 insertions(+), 114 deletions(-)

diff --git a/res/css/structures/_AutoHideScrollbar.scss b/res/css/structures/_AutoHideScrollbar.scss
index 6e4484157c..3d91293c98 100644
--- a/res/css/structures/_AutoHideScrollbar.scss
+++ b/res/css/structures/_AutoHideScrollbar.scss
@@ -14,76 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* This file has CSS for both native and non-native scrollbars in an order
- * that's fairly logical to read but duplicates a selector to separate the
- * hiding/showing from the sizing.
- */
-/* stylelint-disable no-duplicate-selectors */
-
-/*
-1. for browsers that support native overlay auto-hiding scrollbars
-*/
 .mx_AutoHideScrollbar {
     overflow-x: hidden;
     overflow-y: auto;
+    overflow-y: overlay;    // where supported
     -ms-overflow-style: -ms-autohiding-scrollbar;
-}
-/*
-2. webkit also supports overflow:overlay where the scrollbars don't take any space
-in the layout but they don't autohide, so do that only on hover
-*/
-body.mx_scrollbar_overlay_noautohide .mx_AutoHideScrollbar {
-    overflow-y: hidden;
-}
 
-body.mx_scrollbar_overlay_noautohide .mx_AutoHideScrollbar:hover {
-    overflow-y: overlay;
-}
-/*
-3. as a last fallback, compensate for the scrollbar taking up space in the layout
-by having giving the child element (.mx_AutoHideScrollbar_offset) a
-negative right margin of the width of the scrollbar when the container
-is overflowing. This is what Firefox ends up using. Overflow is detected
-in javascript, and adds the mx_AutoHideScrollbar_overflow class to the container.
-This only works in Firefox, which should be fine as this fallback is only needed there.
-*/
-body.mx_scrollbar_nooverlay {
-    .mx_AutoHideScrollbar {
-        overflow-y: hidden;
+    &::-webkit-scrollbar {
+        width: 6px;
+        height: 6px;
+        background-color: transparent;
     }
 
-    .mx_AutoHideScrollbar:hover {
-        overflow-y: auto;
+    &::-webkit-scrollbar-thumb {
+        border-radius: 3px;
+        background-color: transparent;
     }
 
-    /*
-    offset scrollbar width with negative margin-right
-
-    include before and after psuedo-elements here so they can
-    be used to do something interesting like scroll-indicating
-    gradients (see IndicatorScrollBar)
-    */
-    .mx_AutoHideScrollbar:hover.mx_AutoHideScrollbar_overflow > .mx_AutoHideScrollbar_offset,
-    .mx_AutoHideScrollbar:hover.mx_AutoHideScrollbar_overflow::before,
-    .mx_AutoHideScrollbar:hover.mx_AutoHideScrollbar_overflow::after {
-        margin-right: calc(-1 * var(--scrollbar-width));
-    }
-}
-
-// style the native scrollbars ...
-// ... standard css scrollbars (firefox at time of writing)
-.mx_AutoHideScrollbar {
-    scrollbar-color: $scrollbar-thumb-color $scrollbar-track-color;
+    scrollbar-color: transparent transparent;
     scrollbar-width: thin;
 }
-// or fallback for webkit browsers
-::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
-    background-color: $scrollbar-track-color;
-}
 
-::-webkit-scrollbar-thumb {
-    background-color: $scrollbar-thumb-color;
-    border-radius: 3px;
+.mx_AutoHideScrollbar:hover {
+    &::-webkit-scrollbar {
+        background-color: $scrollbar-track-color;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background-color: $scrollbar-thumb-color;
+    }
+    scrollbar-color: $scrollbar-thumb-color $scrollbar-track-color;
 }
diff --git a/src/components/structures/AutoHideScrollbar.js b/src/components/structures/AutoHideScrollbar.js
index 3f27f51f18..398b07e2d4 100644
--- a/src/components/structures/AutoHideScrollbar.js
+++ b/src/components/structures/AutoHideScrollbar.js
@@ -18,7 +18,7 @@ import React from "react";
 
 // derived from code from github.com/noeldelgado/gemini-scrollbar
 // Copyright (c) Noel Delgado <pixelia.me@gmail.com> (pixelia.me)
-function getScrollbarWidth(alternativeOverflow) {
+function getScrollbarWidth() {
     const div = document.createElement('div');
     div.className = 'mx_AutoHideScrollbar'; //to get width of css scrollbar
     div.style.position = 'absolute';
@@ -26,9 +26,6 @@ function getScrollbarWidth(alternativeOverflow) {
     div.style.width = '100px';
     div.style.height = '100px';
     div.style.overflow = "scroll";
-    if (alternativeOverflow) {
-        div.style.overflow = alternativeOverflow;
-    }
     div.style.msOverflowStyle = '-ms-autohiding-scrollbar';
     document.body.appendChild(div);
     const scrollbarWidth = (div.offsetWidth - div.clientWidth);
@@ -39,18 +36,7 @@ function getScrollbarWidth(alternativeOverflow) {
 function install() {
     const scrollbarWidth = getScrollbarWidth();
     if (scrollbarWidth !== 0) {
-        const hasForcedOverlayScrollbar = getScrollbarWidth('overlay') === 0;
-        // overflow: overlay on webkit doesn't auto hide the scrollbar
-        if (hasForcedOverlayScrollbar) {
-            document.body.classList.add("mx_scrollbar_overlay_noautohide");
-        } else {
-            document.body.classList.add("mx_scrollbar_nooverlay");
-            const style = document.createElement('style');
-            style.type = 'text/css';
-            style.innerText =
-                `body.mx_scrollbar_nooverlay { --scrollbar-width: ${scrollbarWidth}px; }`;
-            document.head.appendChild(style);
-        }
+        document.body.classList.add("mx_scrollbar_noautohide");
     }
 }
 
@@ -67,42 +53,7 @@ const installBodyClassesIfNeeded = (function() {
 export default class AutoHideScrollbar extends React.Component {
     constructor(props) {
         super(props);
-        this.onOverflow = this.onOverflow.bind(this);
-        this.onUnderflow = this.onUnderflow.bind(this);
         this._collectContainerRef = this._collectContainerRef.bind(this);
-        this._needsOverflowListener = null;
-    }
-
-    onOverflow() {
-        this.containerRef.classList.add("mx_AutoHideScrollbar_overflow");
-        this.containerRef.classList.remove("mx_AutoHideScrollbar_underflow");
-    }
-
-    onUnderflow() {
-        this.containerRef.classList.remove("mx_AutoHideScrollbar_overflow");
-        this.containerRef.classList.add("mx_AutoHideScrollbar_underflow");
-    }
-
-    checkOverflow() {
-        if (!this._needsOverflowListener) {
-            return;
-        }
-        if (this.containerRef.scrollHeight > this.containerRef.clientHeight) {
-            this.onOverflow();
-        } else {
-            this.onUnderflow();
-        }
-    }
-
-    componentDidUpdate() {
-        this.checkOverflow();
-    }
-
-    componentDidMount() {
-        installBodyClassesIfNeeded();
-        this._needsOverflowListener =
-            document.body.classList.contains("mx_scrollbar_nooverlay");
-        this.checkOverflow();
     }
 
     _collectContainerRef(ref) {
@@ -126,9 +77,7 @@ export default class AutoHideScrollbar extends React.Component {
                     onScroll={this.props.onScroll}
                     onWheel={this.props.onWheel}
                 >
-            <div className="mx_AutoHideScrollbar_offset">
-                { this.props.children }
-            </div>
+            { this.props.children }
         </div>);
     }
 }

From 75cbc1dc07627a7c82e080bce8994e91fd6734a9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 19:26:15 +0100
Subject: [PATCH 1763/3235] Adjust IndicatorScrollbar to not rely on
 AutoHideScrollbar for overflow

---
 .../structures/IndicatorScrollbar.js          | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/IndicatorScrollbar.js b/src/components/structures/IndicatorScrollbar.js
index f14d99f730..05ad4f7561 100644
--- a/src/components/structures/IndicatorScrollbar.js
+++ b/src/components/structures/IndicatorScrollbar.js
@@ -66,6 +66,22 @@ export default class IndicatorScrollbar extends React.Component {
         this._autoHideScrollbar = autoHideScrollbar;
     }
 
+
+    componentDidUpdate(prevProps) {
+        const prevLen = prevProps && prevProps.children && prevProps.children.length || 0;
+        const curLen = this.props.children && this.props.children.length || 0;
+        // check overflow only if amount of children changes.
+        // if we don't guard here, we end up with an infinite
+        // render > componentDidUpdate > checkOverflow > setState > render loop
+        if (prevLen !== curLen) {
+            this.checkOverflow();
+        }
+    }
+
+    componentDidMount() {
+        this.checkOverflow();
+    }
+
     checkOverflow() {
         const hasTopOverflow = this._scrollElement.scrollTop > 0;
         const hasBottomOverflow = this._scrollElement.scrollHeight >
@@ -95,10 +111,6 @@ export default class IndicatorScrollbar extends React.Component {
             this._scrollElement.classList.remove("mx_IndicatorScrollbar_rightOverflow");
         }
 
-        if (this._autoHideScrollbar) {
-            this._autoHideScrollbar.checkOverflow();
-        }
-
         if (this.props.trackHorizontalOverflow) {
             this.setState({
                 // Offset from absolute position of the container

From 2186023e4334d5121a27f038cc1b3c205d5c4820 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 19:26:59 +0100
Subject: [PATCH 1764/3235] css adjustments because mx_AutoHideScrollBar_offset
 was removed

---
 res/css/structures/_GroupView.scss        |  4 ++--
 res/css/structures/_RoomSubList.scss      | 22 +++-------------------
 res/css/views/rooms/_RoomBreadcrumbs.scss |  2 +-
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 2575169664..72a1132c15 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -337,7 +337,7 @@ limitations under the License.
     display: none;
 }
 
-.mx_GroupView_body .mx_AutoHideScrollbar_offset > * {
+.mx_GroupView_body .mx_AutoHideScrollbar > * {
     margin: 11px 50px 50px 68px;
 }
 
@@ -366,7 +366,7 @@ limitations under the License.
     padding: 40px 20px;
 }
 
-.mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar_offset > :not(.mx_MemberInfo_avatar) {
+.mx_GroupView .mx_MemberInfo .mx_AutoHideScrollbar > :not(.mx_MemberInfo_avatar) {
     padding-left: 16px;
     padding-right: 16px;
 }
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index be44563cfb..0a8ae00f1e 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -166,8 +166,7 @@ limitations under the License.
 
 // overflow indicators
 .mx_RoomSubList:not(.resized-all) > .mx_RoomSubList_scroll {
-    &.mx_IndicatorScrollbar_topOverflow::before,
-    &.mx_IndicatorScrollbar_bottomOverflow::after {
+    &.mx_IndicatorScrollbar_topOverflow::before {
         position: sticky;
         left: 0;
         right: 0;
@@ -178,29 +177,14 @@ limitations under the License.
         pointer-events: none;
     }
 
-    &.mx_IndicatorScrollbar_topOverflow > .mx_AutoHideScrollbar_offset {
+
+    &.mx_IndicatorScrollbar_topOverflow {
         margin-top: -8px;
     }
-    &.mx_IndicatorScrollbar_bottomOverflow > .mx_AutoHideScrollbar_offset {
-        margin-bottom: -8px;
-    }
 
     &.mx_IndicatorScrollbar_topOverflow::before {
         top: 0;
         transition: background-image 0.1s ease-in;
         background: linear-gradient(to top, $panel-gradient);
     }
-
-    /*
-    // for now, we remove the bottomOverflow entirely as we don't want to
-    // lose the screen real-estate due to a bg-colored gradient, but we also
-    // don't want to use drop shadows and risk a confusing hierarchy of cards.
-    // so, instead, we hard-clip at the bottom but soft-clip at the top.
-    &.mx_IndicatorScrollbar_bottomOverflow::after {
-        bottom: 0;
-        transition: background-image 0.1s ease-in;
-        margin: 0px -8px;
-        background: linear-gradient(to bottom, rgba(0,0,0,0.1), rgba(0,0,0,0.0));
-    }
-    */
 }
diff --git a/res/css/views/rooms/_RoomBreadcrumbs.scss b/res/css/views/rooms/_RoomBreadcrumbs.scss
index 67350aac34..3858d836e6 100644
--- a/res/css/views/rooms/_RoomBreadcrumbs.scss
+++ b/res/css/views/rooms/_RoomBreadcrumbs.scss
@@ -41,7 +41,7 @@ limitations under the License.
         overflow-x: visible;
     }
 
-    .mx_AutoHideScrollbar_offset {
+    .mx_AutoHideScrollbar {
         display: flex;
         flex-direction: row;
         height: 100%;

From aed85a2183eabdf64cc2cf2eeb2d89a613db1da8 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 25 Mar 2020 19:33:55 +0100
Subject: [PATCH 1765/3235] fix style lint

---
 res/css/structures/_RoomSubList.scss | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 0a8ae00f1e..1934e681c2 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -168,23 +168,20 @@ limitations under the License.
 .mx_RoomSubList:not(.resized-all) > .mx_RoomSubList_scroll {
     &.mx_IndicatorScrollbar_topOverflow::before {
         position: sticky;
+        content: "";
+        top: 0;
         left: 0;
         right: 0;
         height: 8px;
-        content: "";
-        display: block;
         z-index: 100;
+        display: block;
         pointer-events: none;
+        transition: background-image 0.1s ease-in;
+        background: linear-gradient(to top, $panel-gradient);
     }
 
 
     &.mx_IndicatorScrollbar_topOverflow {
         margin-top: -8px;
     }
-
-    &.mx_IndicatorScrollbar_topOverflow::before {
-        top: 0;
-        transition: background-image 0.1s ease-in;
-        background: linear-gradient(to top, $panel-gradient);
-    }
 }

From 785d0e99fb29d74c25ab8605a2686fa443ef4017 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 11:05:27 +0100
Subject: [PATCH 1766/3235] remove some remaining dead code

---
 .../structures/AutoHideScrollbar.js           | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/components/structures/AutoHideScrollbar.js b/src/components/structures/AutoHideScrollbar.js
index 398b07e2d4..04323bb548 100644
--- a/src/components/structures/AutoHideScrollbar.js
+++ b/src/components/structures/AutoHideScrollbar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,40 +17,6 @@ limitations under the License.
 
 import React from "react";
 
-// derived from code from github.com/noeldelgado/gemini-scrollbar
-// Copyright (c) Noel Delgado <pixelia.me@gmail.com> (pixelia.me)
-function getScrollbarWidth() {
-    const div = document.createElement('div');
-    div.className = 'mx_AutoHideScrollbar'; //to get width of css scrollbar
-    div.style.position = 'absolute';
-    div.style.top = '-9999px';
-    div.style.width = '100px';
-    div.style.height = '100px';
-    div.style.overflow = "scroll";
-    div.style.msOverflowStyle = '-ms-autohiding-scrollbar';
-    document.body.appendChild(div);
-    const scrollbarWidth = (div.offsetWidth - div.clientWidth);
-    document.body.removeChild(div);
-    return scrollbarWidth;
-}
-
-function install() {
-    const scrollbarWidth = getScrollbarWidth();
-    if (scrollbarWidth !== 0) {
-        document.body.classList.add("mx_scrollbar_noautohide");
-    }
-}
-
-const installBodyClassesIfNeeded = (function() {
-    let installed = false;
-    return function() {
-        if (!installed) {
-            install();
-            installed = true;
-        }
-    };
-})();
-
 export default class AutoHideScrollbar extends React.Component {
     constructor(props) {
         super(props);

From 9c20bf22ce47de52796bd1d44db80554f56a856e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Mar 2020 10:45:26 +0000
Subject: [PATCH 1767/3235] Fix soft-crash on bad permalinks

Fixes https://github.com/vector-im/riot-web/issues/12880
---
 src/linkify-matrix.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index cff7a93d08..ee9f703136 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -200,13 +200,17 @@ matrixLinkify.options = {
         switch (type) {
             case "url": {
                 // intercept local permalinks to users and show them like userids (in userinfo of current room)
-                const permalink = parsePermalink(href);
-                if (permalink && permalink.userId) {
-                    return {
-                        click: function(e) {
-                            matrixLinkify.onUserClick(e, permalink.userId);
-                        },
-                    };
+                try {
+                    const permalink = parsePermalink(href);
+                    if (permalink && permalink.userId) {
+                        return {
+                            click: function(e) {
+                                matrixLinkify.onUserClick(e, permalink.userId);
+                            },
+                        };
+                    }
+                } catch (e) {
+                    // OK fine, it's not actually a permalink
                 }
                 break;
             }

From 8532c72fcecf873d014399d15cea03f24847c2c9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Mar 2020 11:12:00 +0000
Subject: [PATCH 1768/3235] Update copy on SSSS symmetric upgrade toast

Fixes https://github.com/vector-im/riot-web/issues/12881
---
 src/components/views/toasts/SetupEncryptionToast.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index f7d242caac..e24cb0b234 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -78,10 +78,11 @@ export default class SetupEncryptionToast extends React.PureComponent {
         switch (this.props.kind) {
             case 'set_up_encryption':
             case 'upgrade_encryption':
-            case 'upgrade_ssss':
                 return _t('Verify yourself & others to keep your chats safe');
             case 'verify_this_session':
                 return _t('Other users may not trust it');
+            case 'upgrade_ssss':
+                return _t('Update your secure storage');
         }
     }
 

From 95828ce751896ab01b5c30e6af030db848b98cca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Mar 2020 11:13:57 +0000
Subject: [PATCH 1769/3235] Remove duplicate import

---
 src/components/views/toasts/SetupEncryptionToast.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index f7d242caac..fbd04ae443 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -20,7 +20,6 @@ import Modal from '../../../Modal';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
-import Modal from '../../../Modal';
 import DeviceListener from '../../../DeviceListener';
 import SetupEncryptionDialog from "../dialogs/SetupEncryptionDialog";
 import { accessSecretStorage } from '../../../CrossSigningManager';

From f7e9cf4552a7d4345c6b6b7dd04c7d4efac5f78e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Mar 2020 11:15:07 +0000
Subject: [PATCH 1770/3235] i18n

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5d923e0a24..d964d48e64 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -543,6 +543,7 @@
     "Pin": "Pin",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
+    "Update your secure storage": "Update your secure storage",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Later": "Later",

From c95b23f3ec3ca2567d73db981bcb1c1896a53529 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Tue, 24 Mar 2020 19:50:37 +0100
Subject: [PATCH 1771/3235] fix formatBar not hidden after
 highlight-backspacing text partially

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 75455518a1..8d46146e18 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -447,6 +447,8 @@ export default class BasicMessageEditor extends React.Component {
             } else if (event.key === Key.TAB) {
                 this._tabCompleteName();
                 handled = true;
+            } else if (event.key === Key.BACKSPACE) {
+                this._formatBarRef.hide();
             }
         }
         if (handled) {

From 2bd112ca7cfddf0601556e17c4e6ea26ed843f86 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Thu, 26 Mar 2020 08:37:46 +0100
Subject: [PATCH 1772/3235] add delete support and to keyboard shortcuts

---
 src/Keyboard.ts                                    | 1 +
 src/components/views/rooms/BasicMessageComposer.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index 817d0a0b97..23e2bbf0d6 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -22,6 +22,7 @@ export const Key = {
     PAGE_UP: "PageUp",
     PAGE_DOWN: "PageDown",
     BACKSPACE: "Backspace",
+    DELETE: "Delete",
     ARROW_UP: "ArrowUp",
     ARROW_DOWN: "ArrowDown",
     ARROW_LEFT: "ArrowLeft",
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 8d46146e18..ab6a3b584d 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -447,7 +447,7 @@ export default class BasicMessageEditor extends React.Component {
             } else if (event.key === Key.TAB) {
                 this._tabCompleteName();
                 handled = true;
-            } else if (event.key === Key.BACKSPACE) {
+            } else if (event.key === Key.BACKSPACE || Key.DELETE) {
                 this._formatBarRef.hide();
             }
         }

From a1c83a4f0e56316bdcb3d98cc70f8346e26abb4a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Mar 2020 13:02:54 +0000
Subject: [PATCH 1773/3235] Upgrade matrix-js-sdk to 5.2.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 1ff0fb6f55..29e4809e49 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "5.2.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 582d89137e..04dcab02ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,9 +5689,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.1.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b2e154377a4268441a3b27b183dd7f7018187035"
+matrix-js-sdk@5.2.0-rc.1:
+  version "5.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0-rc.1.tgz#014239eb713ea3b648b7a573785d01edff1efd03"
+  integrity sha512-Jv/0kyZEtkfrD6mlq3g2YoFI2+eOBFOz5D186jJAvFg1W7UaQ5gn6iualR+2AKa1AIk2AT6lDcgPb1djZ7/3Vw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 1713006958becbbad6996bd403aa98ca70e4f5cd Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Thu, 26 Mar 2020 14:03:38 +0100
Subject: [PATCH 1774/3235] recommit bwindels commited changes to refactor
 check logic after rebase mistake

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index ab6a3b584d..df62823360 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -447,7 +447,7 @@ export default class BasicMessageEditor extends React.Component {
             } else if (event.key === Key.TAB) {
                 this._tabCompleteName();
                 handled = true;
-            } else if (event.key === Key.BACKSPACE || Key.DELETE) {
+            } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
                 this._formatBarRef.hide();
             }
         }

From 91f706260b9f90984646555d2d444937765053c6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Mar 2020 13:21:10 +0000
Subject: [PATCH 1775/3235] Prepare changelog for v2.3.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07e478fa02..378ba6f1d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,153 @@
+Changes in [2.3.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.0-rc.1) (2020-03-26)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.3...v2.3.0-rc.1)
+
+ * Upgrade JS SDK to 5.2.0-rc.1
+ * Add a flag to control whether cross-signing signatures are trusted
+   [\#4277](https://github.com/matrix-org/matrix-react-sdk/pull/4277)
+ * Update from Weblate
+   [\#4282](https://github.com/matrix-org/matrix-react-sdk/pull/4282)
+ * Update copy on SSSS symmetric upgrade toast
+   [\#4281](https://github.com/matrix-org/matrix-react-sdk/pull/4281)
+ * Wait for SSSS upgrade to complete
+   [\#4270](https://github.com/matrix-org/matrix-react-sdk/pull/4270)
+ * Update cross-signing verification copy and fix i18n
+   [\#4278](https://github.com/matrix-org/matrix-react-sdk/pull/4278)
+ * Fix soft-crash on bad permalinks
+   [\#4280](https://github.com/matrix-org/matrix-react-sdk/pull/4280)
+ * Fix: make self-verification wait for incoming request
+   [\#4267](https://github.com/matrix-org/matrix-react-sdk/pull/4267)
+ * Fall back to non-standard persisted api for Safari
+   [\#4272](https://github.com/matrix-org/matrix-react-sdk/pull/4272)
+ * Respond to backup key sharing requests
+   [\#4275](https://github.com/matrix-org/matrix-react-sdk/pull/4275)
+ * Log and display secret sharing cache state
+   [\#4268](https://github.com/matrix-org/matrix-react-sdk/pull/4268)
+ * Support sending config and ready events to capable widgets (Jitsi)
+   [\#4266](https://github.com/matrix-org/matrix-react-sdk/pull/4266)
+ * If cached keys are present in the key backup dialog, use them
+   [\#4273](https://github.com/matrix-org/matrix-react-sdk/pull/4273)
+ * Fix formatbar not hidden on highlighted message sent
+   [\#4265](https://github.com/matrix-org/matrix-react-sdk/pull/4265)
+ * Support Jitsi conferences sent/received on Riot Mobile and older Riot Webs
+   [\#4252](https://github.com/matrix-org/matrix-react-sdk/pull/4252)
+ * Use unified function to check cross-signing is ready
+   [\#4263](https://github.com/matrix-org/matrix-react-sdk/pull/4263)
+ * Migrate SSSS to symmetric
+   [\#4224](https://github.com/matrix-org/matrix-react-sdk/pull/4224)
+ * Migration to symmetric SSSS
+   [\#4242](https://github.com/matrix-org/matrix-react-sdk/pull/4242)
+ * Always display verification request toasts on top
+   [\#4262](https://github.com/matrix-org/matrix-react-sdk/pull/4262)
+ * Fix: assume SAS is supported when starting request with .start
+   [\#4249](https://github.com/matrix-org/matrix-react-sdk/pull/4249)
+ * Fix logout when Olm failed to load.
+   [\#4261](https://github.com/matrix-org/matrix-react-sdk/pull/4261)
+ * Improve naming of Jitsi conferences
+   [\#4251](https://github.com/matrix-org/matrix-react-sdk/pull/4251)
+ * Handle matrix.to user permalink in-room rather than solo
+   [\#4245](https://github.com/matrix-org/matrix-react-sdk/pull/4245)
+ * Fix: filter room list (again) by canonical and alternative aliases
+   [\#4260](https://github.com/matrix-org/matrix-react-sdk/pull/4260)
+ * EventIndex: Add some logging to the file panel populating.
+   [\#4250](https://github.com/matrix-org/matrix-react-sdk/pull/4250)
+ * Update from Weblate
+   [\#4259](https://github.com/matrix-org/matrix-react-sdk/pull/4259)
+ * Migrate RoomView to React Contexts in the hope for better temporal stability
+   [\#4258](https://github.com/matrix-org/matrix-react-sdk/pull/4258)
+ * Update WidgetUtils.js fix Jitsi path
+   [\#4256](https://github.com/matrix-org/matrix-react-sdk/pull/4256)
+ * Fix local jitsi build url fail and missing argument
+   [\#4255](https://github.com/matrix-org/matrix-react-sdk/pull/4255)
+ * Add shortcut CmdOrCtrl+. to toggle right panel
+   [\#4244](https://github.com/matrix-org/matrix-react-sdk/pull/4244)
+ * Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows
+   [\#4241](https://github.com/matrix-org/matrix-react-sdk/pull/4241)
+ * Bring back legacy verification by comparing public device keys
+   [\#4240](https://github.com/matrix-org/matrix-react-sdk/pull/4240)
+ * Searching: Return an empty result if the search term is an empty string.
+   [\#4248](https://github.com/matrix-org/matrix-react-sdk/pull/4248)
+ * Break continuation on showHiddenEvents-rendered events
+   [\#4247](https://github.com/matrix-org/matrix-react-sdk/pull/4247)
+ * Watch for show-RR settings changes, use room-specific and fix margins
+   [\#4246](https://github.com/matrix-org/matrix-react-sdk/pull/4246)
+ * Register Mac electron specific Cmd+, shortcut to User Settings
+   [\#4243](https://github.com/matrix-org/matrix-react-sdk/pull/4243)
+ * Use a local wrapper for Jitsi calls
+   [\#4234](https://github.com/matrix-org/matrix-react-sdk/pull/4234)
+ * Invite Dialog fixes
+   [\#4233](https://github.com/matrix-org/matrix-react-sdk/pull/4233)
+ * RoomPreviewBar word-break the sender name too
+   [\#4239](https://github.com/matrix-org/matrix-react-sdk/pull/4239)
+ * Report to the user when a key signature upload fails
+   [\#4229](https://github.com/matrix-org/matrix-react-sdk/pull/4229)
+ * pre-send megolm keys when possible when a user starts typing
+   [\#4235](https://github.com/matrix-org/matrix-react-sdk/pull/4235)
+ * we don't do mx_fadable anymore so get rid of broken RightPanel disabling
+   [\#4238](https://github.com/matrix-org/matrix-react-sdk/pull/4238)
+ * Fix left left panel overflowing vertically
+   [\#4237](https://github.com/matrix-org/matrix-react-sdk/pull/4237)
+ * Fix custom tags causing left panel to over-expand
+   [\#4236](https://github.com/matrix-org/matrix-react-sdk/pull/4236)
+ * Add Keyboard shortcuts dialog
+   [\#4231](https://github.com/matrix-org/matrix-react-sdk/pull/4231)
+ * Don't use buildkite agent to upload logs
+   [\#4232](https://github.com/matrix-org/matrix-react-sdk/pull/4232)
+ * Remove Gemini Scrollbars
+   [\#4217](https://github.com/matrix-org/matrix-react-sdk/pull/4217)
+ * Room Directory Explore Servers redesign
+   [\#4209](https://github.com/matrix-org/matrix-react-sdk/pull/4209)
+ * Fix redo keyboard shortcut on macOS
+   [\#4110](https://github.com/matrix-org/matrix-react-sdk/pull/4110)
+ * Fix: ensure local state for aliases doesn't get garbled up
+   [\#4230](https://github.com/matrix-org/matrix-react-sdk/pull/4230)
+ * Rename 'jump to bottom' to avoid ublock block
+   [\#4208](https://github.com/matrix-org/matrix-react-sdk/pull/4208)
+ * Restore key backup in background after complete security
+   [\#4225](https://github.com/matrix-org/matrix-react-sdk/pull/4225)
+ * Fix key backup trust text for cross-signing
+   [\#4223](https://github.com/matrix-org/matrix-react-sdk/pull/4223)
+ * Add default on config setting to control call button in composer
+   [\#4227](https://github.com/matrix-org/matrix-react-sdk/pull/4227)
+ * Fix: make alternative addresses UX less confusing
+   [\#4221](https://github.com/matrix-org/matrix-react-sdk/pull/4221)
+ * Wait for verification request on login
+   [\#4222](https://github.com/matrix-org/matrix-react-sdk/pull/4222)
+ * EventIndex: Add support to delete events from the index.
+   [\#4204](https://github.com/matrix-org/matrix-react-sdk/pull/4204)
+ * EventIndex: Remove a checkpoint if the HTTP request returns a 403.
+   [\#4214](https://github.com/matrix-org/matrix-react-sdk/pull/4214)
+ * Move to composer when typing letters with Shift held
+   [\#4216](https://github.com/matrix-org/matrix-react-sdk/pull/4216)
+ * Wrap large room names when previewing them
+   [\#4213](https://github.com/matrix-org/matrix-react-sdk/pull/4213)
+ * Rename Review Devices to Review Sessions
+   [\#4219](https://github.com/matrix-org/matrix-react-sdk/pull/4219)
+ * Fix typo in tabIndex to make React happy
+   [\#4215](https://github.com/matrix-org/matrix-react-sdk/pull/4215)
+ * Proof of concept for custom theme adding
+   [\#4148](https://github.com/matrix-org/matrix-react-sdk/pull/4148)
+ * Remove stuff that yarn install doesn't think we need
+   [\#4205](https://github.com/matrix-org/matrix-react-sdk/pull/4205)
+ * Declare jsx in tsconfig for IDEs
+   [\#4207](https://github.com/matrix-org/matrix-react-sdk/pull/4207)
+ * Fix: best-effort to join room without canonical alias over federation from
+   room directory
+   [\#4210](https://github.com/matrix-org/matrix-react-sdk/pull/4210)
+ * Test for cross-signing homeserver support during login, toasts
+   [\#4206](https://github.com/matrix-org/matrix-react-sdk/pull/4206)
+ * Send verification request to a single device in a way compatible with non-
+   cross-signing
+   [\#4202](https://github.com/matrix-org/matrix-react-sdk/pull/4202)
+ * Fixes for removing local alias
+   [\#4199](https://github.com/matrix-org/matrix-react-sdk/pull/4199)
+ * yarn upgrade
+   [\#4201](https://github.com/matrix-org/matrix-react-sdk/pull/4201)
+ * Support TypeScript for React components
+   [\#4203](https://github.com/matrix-org/matrix-react-sdk/pull/4203)
+ * When room name is changed, show both the old and new name
+   [\#4183](https://github.com/matrix-org/matrix-react-sdk/pull/4183)
+
 Changes in [2.2.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.3) (2020-03-17)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.3-rc.1...v2.2.3)

From 2fe0edd3eb7202fb352fa1f12ef9f12a0ce72ee0 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Mar 2020 13:21:11 +0000
Subject: [PATCH 1776/3235] v2.3.0-rc.1

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

diff --git a/package.json b/package.json
index 29e4809e49..7579cab714 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.2.3",
+  "version": "2.3.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 04849f7f0d91ed9bee30db744d8397cf9e835800 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Thu, 26 Mar 2020 13:47:32 +0000
Subject: [PATCH 1777/3235] incorporated design feedback

---
 res/css/views/rooms/_EventTile.scss                | 3 +--
 src/components/views/messages/TileErrorBoundary.js | 6 +++---
 src/i18n/strings/en_EN.json                        | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 2f89c96d57..59f82808dc 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -661,11 +661,10 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_tileError {
     color: red;
+    text-align: center;
 
     .mx_EventTile_line span {
         padding: 4px 8px;
-        border-radius: 11px;
-        box-shadow: 0px 0px 3px red inset;
     }
 
     a {
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.js
index a8e7b144f2..e42ddab16a 100644
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.js
@@ -57,10 +57,10 @@ export default class TileErrorBoundary extends React.Component {
             return (<div className={classNames(classes)}>
                 <div className="mx_EventTile_line">
                     <span>
-                        {_t("An error occurred while rendering this event.")}
-                        { mxEvent && ` [${mxEvent.getType()}]` }
+                        {_t("Can't load this message")}
+                        { mxEvent && ` (${mxEvent.getType()})` }
                         <a onClick={this._onBugReport} href="#">
-                            {_t("Submit debug logs")}
+                            {_t("Submit logs")}
                         </a>
                     </span>
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf170fce62..40b1cab99d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1294,7 +1294,8 @@
     "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?": "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?",
     "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
     "edited": "edited",
-    "An error occurred while rendering this event.": "An error occurred while rendering this event.",
+    "Can't load this message": "Can't load this message",
+    "Submit logs": "Submit logs",
     "Removed or unknown message type": "Removed or unknown message type",
     "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Message removed": "Message removed",

From 9b54d15fcd2395fe9b5465f630db3e1044c43664 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 16:51:24 +0100
Subject: [PATCH 1778/3235] add cancel button to verification panel

---
 .../views/right_panel/_VerificationPanel.scss | 15 +++++++++
 .../views/right_panel/EncryptionPanel.js      | 32 ++++++++++++++-----
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 2a733d11a7..a717495e43 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -15,6 +15,21 @@ limitations under the License.
 */
 
 .mx_UserInfo {
+    .mx_EncryptionPanel_cancel {
+        mask: url('$(res)/img/feather-customised/cancel.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: cover;
+        width: 14px;
+        height: 14px;
+        background-color: $dialog-close-fg-color;
+        cursor: pointer;
+        position: absolute;
+        z-index: 100;
+        top: 14px;
+        right: 14px;
+    }
+
     .mx_VerificationPanel_verified_section .mx_E2EIcon {
         // Override general user info margin
         margin: 0 auto !important;
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 3a4aa2edc3..7ee9225a38 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -84,6 +84,18 @@ const EncryptionPanel = (props) => {
     }, [onClose, request]);
     useEventEmitter(request, "change", changeHandler);
 
+    const onCancel = useCallback(function() {
+        if (request) {
+            request.cancel();
+        }
+    }, [request]);
+
+    let cancelButton;
+    if (request && request.pending) {
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+        cancelButton = <AccessibleButton className="mx_EncryptionPanel_cancel" onClick={onCancel} title={_t('Cancel')}></AccessibleButton>;
+    }
+
     const onStartVerification = useCallback(async () => {
         setRequesting(true);
         const cli = MatrixClientPeg.get();
@@ -98,14 +110,18 @@ const EncryptionPanel = (props) => {
         (request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
     if (!request || requested) {
         const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
-        return <EncryptionInfo
-            isRoomEncrypted={isRoomEncrypted}
-            onStartVerification={onStartVerification}
-            member={member}
-            waitingForOtherParty={requested && initiatedByMe}
-            waitingForNetwork={requested && !initiatedByMe} />;
+        return <React.Fragment>
+            {cancelButton}
+            <EncryptionInfo
+                isRoomEncrypted={isRoomEncrypted}
+                onStartVerification={onStartVerification}
+                member={member}
+                waitingForOtherParty={requested && initiatedByMe}
+                waitingForNetwork={requested && !initiatedByMe} />
+        </React.Fragment>;
     } else {
-        return (
+        return <React.Fragment>
+            {cancelButton}
             <VerificationPanel
                 isRoomEncrypted={isRoomEncrypted}
                 layout={layout}
@@ -114,7 +130,7 @@ const EncryptionPanel = (props) => {
                 request={request}
                 key={request.channel.transactionId}
                 phase={phase} />
-        );
+        </React.Fragment>;
     }
 };
 EncryptionPanel.propTypes = {

From 34b0c1b1e75907a6568ffdc7776c2fb98ff3cab5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 16:54:31 +0100
Subject: [PATCH 1779/3235] fix lint & other cleanup

---
 .../views/right_panel/EncryptionPanel.js           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 7ee9225a38..e67af0805a 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -93,7 +93,11 @@ const EncryptionPanel = (props) => {
     let cancelButton;
     if (request && request.pending) {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-        cancelButton = <AccessibleButton className="mx_EncryptionPanel_cancel" onClick={onCancel} title={_t('Cancel')}></AccessibleButton>;
+        cancelButton = (<AccessibleButton
+            className="mx_EncryptionPanel_cancel"
+            onClick={onCancel}
+            title={_t('Cancel')}
+        ></AccessibleButton>);
     }
 
     const onStartVerification = useCallback(async () => {
@@ -110,7 +114,7 @@ const EncryptionPanel = (props) => {
         (request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
     if (!request || requested) {
         const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
-        return <React.Fragment>
+        return (<React.Fragment>
             {cancelButton}
             <EncryptionInfo
                 isRoomEncrypted={isRoomEncrypted}
@@ -118,9 +122,9 @@ const EncryptionPanel = (props) => {
                 member={member}
                 waitingForOtherParty={requested && initiatedByMe}
                 waitingForNetwork={requested && !initiatedByMe} />
-        </React.Fragment>;
+        </React.Fragment>);
     } else {
-        return <React.Fragment>
+        return (<React.Fragment>
             {cancelButton}
             <VerificationPanel
                 isRoomEncrypted={isRoomEncrypted}
@@ -130,7 +134,7 @@ const EncryptionPanel = (props) => {
                 request={request}
                 key={request.channel.transactionId}
                 phase={phase} />
-        </React.Fragment>;
+        </React.Fragment>);
     }
 };
 EncryptionPanel.propTypes = {

From 4f3842d75e23e10f623509df0442bfe5911bbed6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 16:58:17 +0100
Subject: [PATCH 1780/3235] pick color similar to chevron for cancel X button

---
 res/css/views/right_panel/_VerificationPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index a717495e43..459622b277 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -22,7 +22,7 @@ limitations under the License.
         mask-size: cover;
         width: 14px;
         height: 14px;
-        background-color: $dialog-close-fg-color;
+        background-color: $settings-subsection-fg-color;
         cursor: pointer;
         position: absolute;
         z-index: 100;

From a6fbb9825247faa2b93bf9019fb6fe9bc568891f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:02:32 +0100
Subject: [PATCH 1781/3235] only show close button when not in a dialog, which
 already has one

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

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index e67af0805a..2c51662111 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -91,7 +91,7 @@ const EncryptionPanel = (props) => {
     }, [request]);
 
     let cancelButton;
-    if (request && request.pending) {
+    if (layout !== "dialog" && request && request.pending) {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         cancelButton = (<AccessibleButton
             className="mx_EncryptionPanel_cancel"

From abf12a3ddf2bcda8399b85abf971561b32ad5a0a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:31:31 +0100
Subject: [PATCH 1782/3235] Show EncryptionPanel straight away when there is an
 ongoing verification request for a user

---
 src/stores/RightPanelStore.js | 22 ++++++++++++++++++----
 src/verification.js           | 15 +++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 814f54b454..8869d0be42 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import dis from '../dispatcher';
+import {pendingVerificationRequestForUser} from '../verification';
 import {Store} from 'flux/utils';
 import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
@@ -135,7 +136,20 @@ export default class RightPanelStore extends Store {
                 break;
 
             case 'set_right_panel_phase': {
-                const targetPhase = payload.phase;
+                let targetPhase = payload.phase;
+                let refireParams = payload.refireParams;
+                // redirect to EncryptionPanel if there is an ongoing verification request
+                if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+                    const {member} = payload.refireParams;
+                    const pendingRequest = pendingVerificationRequestForUser(member);
+                    if (pendingRequest) {
+                        targetPhase = RIGHT_PANEL_PHASES.EncryptionPanel;
+                        refireParams = {
+                            verificationRequest: pendingRequest,
+                            member,
+                        };
+                    }
+                }
                 if (!RIGHT_PANEL_PHASES[targetPhase]) {
                     console.warn(`Tried to switch right panel to unknown phase: ${targetPhase}`);
                     return;
@@ -153,7 +167,7 @@ export default class RightPanelStore extends Store {
                         });
                     }
                 } else {
-                    if (targetPhase === this._state.lastRoomPhase && !payload.refireParams) {
+                    if (targetPhase === this._state.lastRoomPhase && !refireParams) {
                         this._setState({
                             showRoomPanel: !this._state.showRoomPanel,
                         });
@@ -161,7 +175,7 @@ export default class RightPanelStore extends Store {
                         this._setState({
                             lastRoomPhase: targetPhase,
                             showRoomPanel: true,
-                            lastRoomPhaseParams: payload.refireParams || {},
+                            lastRoomPhaseParams: refireParams || {},
                         });
                     }
                 }
@@ -170,7 +184,7 @@ export default class RightPanelStore extends Store {
                 dis.dispatch({
                     action: 'after_right_panel_phase_change',
                     phase: targetPhase,
-                    ...(payload.refireParams || {}),
+                    ...(refireParams || {}),
                 });
                 break;
             }
diff --git a/src/verification.js b/src/verification.js
index d0f6fd7806..2231346478 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -111,12 +111,7 @@ export async function verifyUser(user) {
     if (!await enable4SIfNeeded()) {
         return;
     }
-    const cli = MatrixClientPeg.get();
-    const dmRoom = findDMForUser(cli, user.userId);
-    let existingRequest;
-    if (dmRoom) {
-        existingRequest = cli.findVerificationRequestDMInProgress(dmRoom.roomId);
-    }
+    const existingRequest = pendingVerificationRequestForUser(user);
     dis.dispatch({
         action: "set_right_panel_phase",
         phase: RIGHT_PANEL_PHASES.EncryptionPanel,
@@ -126,3 +121,11 @@ export async function verifyUser(user) {
         },
     });
 }
+
+export function pendingVerificationRequestForUser(user) {
+    const cli = MatrixClientPeg.get();
+    const dmRoom = findDMForUser(cli, user.userId);
+    if (dmRoom) {
+        return cli.findVerificationRequestDMInProgress(dmRoom.roomId);
+    }
+}

From ce77593cf9aac0ee61743303004d5b3198142762 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:37:44 +0100
Subject: [PATCH 1783/3235] rename toast title

---
 src/DeviceListener.js       | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 0151a45c18..9161a462eb 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -189,7 +189,7 @@ export default class DeviceListener {
                 this._activeNagToasts.add(device.deviceId);
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: toastKey(device.deviceId),
-                    title: _t("Unverified session"),
+                    title: _t("Unverified login. Was this you?"),
                     icon: "verification_warning",
                     props: { device },
                     component: sdk.getComponent("toasts.UnverifiedSessionToast"),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c79717e352..85e382bdb6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -96,7 +96,7 @@
     "Verify this session": "Verify this session",
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
-    "Unverified session": "Unverified session",
+    "Unverified login. Was this you?": "Unverified login. Was this you?",
     "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",

From e3e40ace819ff025d1c48f5b0e9ec60bc5f9b7a4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:45:59 +0100
Subject: [PATCH 1784/3235] Fix: pick last active DM for verification request

---
 src/createRoom.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/createRoom.js b/src/createRoom.js
index 45e849065d..66d4d1908e 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -174,6 +174,9 @@ export function findDMForUser(client, userId) {
             return member && (member.membership === "invite" || member.membership === "join");
         }
         return false;
+    }).sort((r1, r2) => {
+        return r2.getLastActiveTimestamp() -
+            r1.getLastActiveTimestamp();
     });
     if (suitableDMRooms.length) {
         return suitableDMRooms[0];

From b21cf5edc6fa2ef68fbeec2984c165867f2679db Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 26 Mar 2020 16:45:55 +0000
Subject: [PATCH 1785/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2240 of 2240 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5610493999..68162c1010 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2275,5 +2275,21 @@
     "Esc": "Esc",
     "Enter": "Sartu",
     "Space": "Zuriune-barra",
-    "End": "Amaiera"
+    "End": "Amaiera",
+    "Manually verify all remote sessions": "Egiaztatu eskuz urruneko saio guztiak",
+    "Update your secure storage": "Eguneratu zure biltegi segurua",
+    "Self signing private key:": "Norberak sinatutako gako pribatua:",
+    "cached locally": "cache lokalean",
+    "not found locally": "ez da lokalean aurkitu",
+    "User signing private key:": "Erabiltzaileak sinatzeko gako pribatua:",
+    "Secret Storage key format:": "Biltegi sekretuaren gakoaren formatua:",
+    "outdated": "zaharkitua",
+    "up to date": "egunean",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Egiaztatu erabiltzaile baten saio bakoitza hau fidagarri gisa markatzeko, ez dira zeharka sinatutako gailuak fidagarritzat jotzen.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Gela zifratuetan, zuon mezuak babestuta daude, zuk zeuk eta hartzaileak bakarrik duzue hauek deszifratzeko gako bakanak.",
+    "Verify all users in a room to ensure it's secure.": "Egiaztatu gela bateko erabiltzaile guztiak segurua dela baieztatzeko.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Gela zifratuetan, egiaztatu erabiltzaile guztiak segurua dela baieztatzeko.",
+    "Verified": "Egiaztatuta",
+    "Verification cancelled": "Egiaztaketa ezeztatuta",
+    "Compare emoji": "Konparatu emojiak"
 }

From 1110735df9eaafcd1b98775ca5dbacce721222c5 Mon Sep 17 00:00:00 2001
From: Kenneth Larsson <kenneth.larsson@cgi.com>
Date: Thu, 26 Mar 2020 14:58:40 +0000
Subject: [PATCH 1786/3235] Translated using Weblate (Swedish)

Currently translated at 68.3% (1529 of 2240 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 | 94 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index e65e4e2099..3edb02df92 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -953,7 +953,7 @@
     "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.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Filen '%(fileName)s' överstiger denna hemserverns storleksgräns för uppladdningar",
     "Unable to load! Check your network connectivity and try again.": "Kan inte ladda! Kolla din nätverksuppkoppling och försök igen.",
-    "Whether or not you're logged in (we don't record your username)": "Huruvida du är inloggad (vi sparar inte ditt användarnamn)",
+    "Whether or not you're logged in (we don't record your username)": "Om du är inloggad eller inte (vi sparar inte ditt användarnamn)",
     "Failed to invite users to the room:": "Kunde inte bjuda in användare till rummet:",
     "Upgrades a room to a new version": "Uppgraderar ett num till en ny version",
     "Gets or sets the room topic": "Ger eller sätter ämnet för ett rum",
@@ -1349,8 +1349,8 @@
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Om du inte vill använda <server /> för att upptäcka och upptäckas av befintliga kontakter som du känner, ange en annan identitetsserver nedan.",
     "Identity Server": "Identitetsserver",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Du använder för närvarande inte en identitetsserver. Lägg till en nedan om du vill upptäcka och bli upptäckbar av befintliga kontakter som du känner.",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att koppla från din identitetsserver betyder att du inte kan upptäckas av andra användare och att du inte kommer att kunna bjuda in andra via e-post eller telefon.",
-    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att använda en identitetsserver är valfritt. Om du väljer att inte använda en identitetsserver kan du inte upptäckas av andra användare och inte heller bjuda in andra via e-post eller telefon.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att koppla från din identitetsserver betyder att du inte kan upptäckas av andra användare och att du inte kommer att kunna bjuda in andra via epost eller telefon.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Att använda en identitetsserver är valfritt. Om du väljer att inte använda en identitetsserver kan du inte upptäckas av andra användare och inte heller bjuda in andra via epost eller telefon.",
     "Do not use an identity server": "Använd inte en identitetsserver",
     "Enter a new identity server": "Ange en ny identitetsserver",
     "Integration Manager": "Integrationshanterare",
@@ -1541,10 +1541,94 @@
     "Preview": "Förhandsvisa",
     "The message you are trying to send is too large.": "Meddelandet du försöker skicka är för stort.",
     "Find others by phone or email": "Hitta andra via telefon eller epost",
-    "Be found by phone or email": "Bli hittad via telefon eller e-post",
+    "Be found by phone or email": "Bli hittad via telefon eller epost",
     "Terms of Service": "Användarvillkor",
     "To continue you need to accept the terms of this service.": "För att fortsätta måste du acceptera villkoren för denna tjänst.",
     "Service": "Tjänst",
     "Summary": "Sammanfattning",
-    "Document": "Dokument"
+    "Document": "Dokument",
+    "The version of Riot": "Version av Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Om du använder Riot på en enhet där pekskärm är den primära inmatningsmekanismen",
+    "Whether you're using Riot as an installed Progressive Web App": "Om du använder Riot som en installerad progressiv webbapp",
+    "Your user agent": "Din användaragent",
+    "The information being sent to us to help make Riot better includes:": "Informationen som skickas till oss för att förbättra Riot inkluderar:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finns okända sessioner i det här rummet: om du fortsätter utan att verifiera dem kommer det att vara möjligt för någon att lyssna på ditt samtal.",
+    "Review Sessions": "Granska sessioner",
+    "If you cancel now, you won't complete verifying the other user.": "Om du avbryter nu kommer du inte att verifiera den andra användaren.",
+    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter nu kommer du inte att verifiera din andra session.",
+    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter nu slutför du inte din operation för hemlig lagring.",
+    "Cancel entering passphrase?": "Avbryta att ange lösenfras?",
+    "Setting up keys": "Sätter upp nycklar",
+    "Verify this session": "Verifiera denna session",
+    "Encryption upgrade available": "Krypteringsuppgradering tillgänglig",
+    "Set up encryption": "Ställ in kryptering",
+    "Unverified session": "Overifierad session",
+    "Sign In or Create Account": "Logga in eller skapa konto",
+    "Use your account or create a new one to continue.": "Använd ditt konto eller skapa ett nytt för att fortsätta.",
+    "Create Account": "Skapa konto",
+    "Verifies a user, session, and pubkey tuple": "Verifierar en användar-, session- och pubkey-tupel",
+    "Unknown (user, session) pair:": "Okänt par (användare, session):",
+    "Session already verified!": "Sessionen är redan verifierad!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VARNING: Sessionen har redan verifierats, men nycklarna MATCHAR INTE!",
+    "Unable to revoke sharing for email address": "Det gick inte att återkalla delning för e-postadress",
+    "Unable to share email address": "Det gick inte att dela e-postadress",
+    "Your email address hasn't been verified yet": "Din e-postadress har inte verifierats än",
+    "Click the link in the email you received to verify and then click continue again.": "Klicka på länken i e-postmeddelandet för att bekräfta och klicka sedan på Fortsätt igen.",
+    "Verify the link in your inbox": "Verifiera länken i din inkorg",
+    "Complete": "Färdigställ",
+    "Unable to revoke sharing for phone number": "Det gick inte att återkalla delning för telefonnummer",
+    "Unable to share phone number": "Det gick inte att dela telefonnummer",
+    "Please enter verification code sent via text.": "Ange verifieringskod skickad via textmeddelande.",
+    "Discovery options will appear once you have added a phone number above.": "Upptäcktsalternativ visas när du har lagt till ett telefonnummer ovan.",
+    "Verify session": "Verifiera sessionen",
+    "Use Legacy Verification (for older clients)": "Använd gammal verifiering (för äldre klienter)",
+    "Verify by comparing a short text string.": "Verifiera genom att jämföra en kort textsträng.",
+    "Begin Verifying": "Börja verifiera",
+    "Waiting for partner to accept...": "Väntar på partner att acceptera...",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Dyker inget upp? Alla klienter stöder inte interaktiv verifiering ännu. <button>Använd äldre verifiering</button>.",
+    "Waiting for %(userId)s to confirm...": "Väntar på att %(userId)s ska bekräfta...",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "För att verifiera att den här sessionen är betrodd, kontrollera att nyckeln du ser i Användarinställningar på den enheten stämmer med nyckeln nedan:",
+    "To verify that this session 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 session matches the key below:": "För att verifiera att den här sessionen är betrodd, vänligen kontakta dess ägare på annat sätt (t.ex. personligen eller via ett telefonsamtal) och fråga om nyckeln i deras användarinställningar för denna session stämmer med nyckeln nedan:",
+    "Use two-way text verification": "Använd tvåvägs textverifiering",
+    "Session name": "Sessionsnamn",
+    "Session key": "Sessionsnyckel",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Om det matchar, tryck på verifieringsknappen nedan. Om det inte gör det, avlyssnar någon annan den här sessionen och du vill förmodligen trycka på svartlistaknappen istället.",
+    "Automatically invite users": "Bjud in användare automatiskt",
+    "Upgrade private room": "Uppgradera privat rum",
+    "Upgrade public room": "Uppgradera publikt rum",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Att uppgradera ett rum är en avancerad åtgärd och rekommenderas vanligtvis när ett rum är instabilt på grund av buggar, saknade funktioner eller säkerhetsproblem.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Detta påverkar vanligtvis bara hur rummet bearbetas på servern. Om du har problem med Riot, <a>rapportera ett fel</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du kommer att uppgradera detta rum från <oldVersion /> till <newVersion />.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Detta gör att du kan återgå till ditt konto efter att du har loggat ut, och logga in på andra sessioner.",
+    "Help": "Hjälp",
+    "Reload": "Ladda om",
+    "Take picture": "Ta bild",
+    "Remove for everyone": "Ta bort för alla",
+    "Remove for me": "Ta bort för mig",
+    "User Status": "Användarstatus",
+    "Confirm your identity by entering your account password below.": "Bekräfta din identitet genom att ange ditt kontolösenord nedan.",
+    "Space used:": "Använt utrymme:",
+    "Indexed messages:": "Indexerade meddelanden:",
+    "Indexed rooms:": "Indexerade rum:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s av %(totalRooms)s",
+    "Navigation": "Navigering",
+    "Calls": "Samtal",
+    "Room List": "Rumslista",
+    "Autocomplete": "Komplettera automatiskt",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Växla fet stil",
+    "Toggle Italics": "Växla kursiv",
+    "Toggle Quote": "Växla citat",
+    "New line": "Ny rad",
+    "Jump to room search": "Hoppa till rumssökning",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End"
 }

From ccb3283fd3e59c39ee67db79dbde4f082f688e73 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Mar 2020 18:50:31 +0000
Subject: [PATCH 1787/3235] Show whether backup key is cached

in cross signing debug panel
---
 src/components/views/settings/CrossSigningPanel.js | 8 ++++++++
 src/i18n/strings/en_EN.json                        | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index b960434ca1..1242c35df8 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -34,6 +34,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPrivateKeysInStorage: false,
             selfSigningPrivateKeyCached: false,
             userSigningPrivateKeyCached: false,
+            sessionBackupKeyCached: false,
             secretStorageKeyInAccount: false,
             secretStorageKeyNeedsUpgrade: null,
         };
@@ -80,6 +81,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
         const selfSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"));
         const userSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"));
+        const sessionBackupKeyCached = !!(await cli._crypto.getSessionBackupPrivateKey());
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
@@ -91,6 +93,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPrivateKeysInStorage,
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
+            sessionBackupKeyCached,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -139,6 +142,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             crossSigningPrivateKeysInStorage,
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
+            sessionBackupKeyCached,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -226,6 +230,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("User signing private key:")}</td>
                             <td>{userSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
                         </tr>
+                        <tr>
+                            <td>{_t("Session backup key:")}</td>
+                            <td>{sessionBackupKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                        </tr>
                         <tr>
                             <td>{_t("Secret storage public key:")}</td>
                             <td>{secretStorageKeyInAccount ? _t("in account data") : _t("not found")}</td>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c79717e352..c1f8df1371 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -588,6 +588,7 @@
     "cached locally": "cached locally",
     "not found locally": "not found locally",
     "User signing private key:": "User signing private key:",
+    "Session backup key:": "Session backup key:",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",

From b489a7c0d53fa5a6484b605f03249164330c5b76 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 00:50:41 +0000
Subject: [PATCH 1788/3235] Allow reacting to stickers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/utils/EventUtils.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 7e33aaed81..ac7ac8c9ec 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -31,13 +31,13 @@ export function isContentActionable(mxEvent) {
     // status is SENT before remote-echo, null after
     const isSent = !eventStatus || eventStatus === EventStatus.SENT;
 
-    if (isSent && mxEvent.getType() === 'm.room.message') {
-        const content = mxEvent.getContent();
-        if (
-            content.msgtype &&
-            content.msgtype !== 'm.bad.encrypted' &&
-            content.hasOwnProperty('body')
-        ) {
+    if (isSent) {
+        if (mxEvent.getType() === 'm.room.message') {
+            const content = mxEvent.getContent();
+            if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
+                return true;
+            }
+        } else if (mxEvent.getType() === 'm.sticker') {
             return true;
         }
     }

From 7fbfd73e11e03a192d2bb74e3146b9ea07189e5d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 01:17:42 +0000
Subject: [PATCH 1789/3235] Show modal on "instant SSO"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js                     | 19 ++++++++++++++++++-
 src/components/structures/auth/Login.js |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 5d809eb28f..489d9474a1 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -22,6 +22,11 @@ limitations under the License.
 import {MatrixClient} from "matrix-js-sdk";
 import dis from './dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
+import Modal from "./Modal";
+import InfoDialog from "./components/views/dialogs/InfoDialog";
+import {_t} from "./languageHandler";
+import Spinner from "./components/views/elements/Spinner";
+import React from "react";
 
 /**
  * Base class for classes that provide platform-specific functionality
@@ -183,9 +188,21 @@ export default class BasePlatform {
      * Begin Single Sign On flows.
      * @param {MatrixClient} mxClient the matrix client using which we should start the flow
      * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
+     * @param {boolean} showModal whether or not to show the spinner modal.
      */
-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas", showModal: boolean) {
         const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
+        if (showModal) {
+            Modal.createTrackedDialog('BasePlatform', 'SSO', InfoDialog, {
+                title: _t("Single sign-on"),
+                description: <div>
+                    <Spinner />
+                    <a href={callbackUrl} rel="noreferrer noopener">
+                        {_t("Click here if you're not redirected automatically")}
+                    </a>
+                </div>,
+            });
+        }
         window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
     }
 }
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 36df08627e..6c6a8bedbd 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -437,7 +437,7 @@ export default createReactClass({
                 // we do not do this when the user has changed to the server manually as that may be jarring.
                 if (initial && SSO_FLOWS.includes(flows[i].type)) {
                     const tmpCli = this._loginLogic.createTemporaryClient();
-                    PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas");
+                    PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas", true);
                 }
 
                 // we just pick the first flow where we support all the

From bfee6d83194ff6d0bb16de12dac3685e9c90ec1d Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 26 Mar 2020 18:35:19 +0000
Subject: [PATCH 1790/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2233 of 2240 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 543b5fadb3..7fd06eca15 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2280,5 +2280,19 @@
     "Toggle video on/off": "Aktivizoni/çaktivizoni videon",
     "Previous/next unread room or DM": "Dhoma ose MD i palexuar i mëparshëm/pasues",
     "Previous/next room or DM": "Dhoma ose MD i mëparshëm/pasues",
-    "Toggle right panel": "Hap/mbyll panelin djathtas"
+    "Toggle right panel": "Hap/mbyll panelin djathtas",
+    "Unverified login. Was this you?": "Hyrje e paverifikuar. A qetë ju?",
+    "Manually verify all remote sessions": "Verifikoni dorazi krejt sesionet e largët",
+    "Update your secure storage": "Përditësoni depozitën tuaj të sigurt",
+    "Self signing private key:": "Kyç privat vetënënshkrimi:",
+    "cached locally": "ruajtur në fshehtinë lokalisht",
+    "not found locally": "i pagjetur lokalisht",
+    "User signing private key:": "Kyç privat nënshkrimesh përdoruesi:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifikoni individualisht çdo sesion të përdorur nga një përdorues, për t’i vënë shenjë si i besuar, duke mos besuar pajisje <em>cross-signed</em>.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Në dhoma të fshehtëzuara, mesazhet tuaj sigurohen dhe vetëm ju dhe marrësi ka kyçet unikë për shkyçjen e tyre.",
+    "Verify all users in a room to ensure it's secure.": "Verifiko krejt përdoruesit në dhomë, për të garantuar se është e sigurt.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Në dhoma të fshehtëzuara, verifikoni krejt përdoruesi për të garantuar se është e sigurt.",
+    "Verified": "I verifikuar",
+    "Verification cancelled": "Verifikimi u anulua",
+    "Compare emoji": "Krahasoni emoji"
 }

From 538816a62608c1f7c47d2a279ff475c1841b58d3 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 27 Mar 2020 02:42:44 +0000
Subject: [PATCH 1791/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2240 of 2240 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index eb4f94172e..58ebe3767a 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2294,5 +2294,15 @@
     "Self signing private key:": "自行簽章私鑰：",
     "cached locally": "本機快取",
     "not found locally": "在本機找不到",
-    "User signing private key:": "使用者簽章私鑰："
+    "User signing private key:": "使用者簽章私鑰：",
+    "Unverified login. Was this you?": "未驗證的登入。是您嗎？",
+    "Manually verify all remote sessions": "手動驗證所有遠端工作階段",
+    "Update your secure storage": "更新您的安全儲存空間",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "單獨驗證使用者使用的每個工作階段以將其標記為受信任，而非信任交叉簽章的裝置。",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "在已加密的聊天室中，您的訊息相當安全，只有您與接收者有獨一無二的金鑰可以將其解鎖。",
+    "Verify all users in a room to ensure it's secure.": "驗證所有在聊天室中的使用者以確保其安全。",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "在已加密的聊天室中，驗證所有使用者以確保其安全。",
+    "Verified": "已驗證",
+    "Verification cancelled": "驗證已取消",
+    "Compare emoji": "比較顏文字"
 }

From 2ec6210ebdbbf83a558b9230e153a3ce5fbd0881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Thu, 26 Mar 2020 19:50:11 +0000
Subject: [PATCH 1792/3235] Translated using Weblate (Czech)

Currently translated at 96.7% (2167 of 2240 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 46675489b4..ef2e95949a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2170,5 +2170,50 @@
     "Mark all as read": "Označit vše jako přečtené",
     "Not currently indexing messages for any room.": "Aktuálně neindexujeme žádné zprávy.",
     "Currently indexing: %(currentRoom)s.": "Aktuálně indexujeme: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s",
+    "Review Sessions": "Prověřit relace",
+    "Unverified login. Was this you?": "Neověřené přihlášeni. Jste to vy?",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s změnil/a jméno místnosti z %(oldRoomName)s na %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s přidal/a této místnosti alternativní adresy %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s přidal/a této místnosti alternativní adresu %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odebral/a této místnosti alternativní adresy %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odebral/a této místnosti alternativní adresu %(addresses)s.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s změnil/a této místnosti alternativní adresy.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s změnil/a této místnosti hlavní a alternativní adresy.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s změnil/a této místnosti adresy.",
+    "Manually Verify by Text": "Manuální textové ověření",
+    "Interactively verify by Emoji": "Interaktivní ověření s emotikonami",
+    "Support adding custom themes": "Umožnit přidání vlastního vzhledu",
+    "Manually verify all remote sessions": "Manuálně ověřit všechny relace",
+    "Update your secure storage": "Aktualizovat vaše bezpečné úložistě",
+    "cached locally": "uložen lokálně",
+    "not found locally": "nenalezen lolálně",
+    "Secret Storage key format:": "Formát klíče Bezpečného Úložistě:",
+    "outdated": "zastaralý",
+    "up to date": "aktuální",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individuálně ověřit každou uživatelovu relaci a označit jí za důvěryhodnou, bez důvěry v cross-signing.",
+    "Invalid theme schema.": "Neplatné schéma vzhledu.",
+    "Error downloading theme information.": "Nepovedlo se stáhnout informace o vzhledu.",
+    "Theme added!": "Motiv vzhledu přidán!",
+    "Custom theme URL": "URL adresa vlastního vzhledu",
+    "Add theme": "Přidat motiv vzhledu",
+    "Keyboard Shortcuts": "Klávesové zkratky",
+    "Scroll to most recent messages": "Přejít na poslední zprávy",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Nepovedlo se změnit alternativní adresy místnosti. Možná to server neumožňuje a nebo je to dočasná chyba.",
+    "You don't have permission to delete the alias.": "Nemáte oprávnění odebrat alias.",
+    "Local address": "Lokální adresa",
+    "Published Addresses": "Publikovaná adresa",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publikovaná adresa může být použíta kýmkoli na libovolném serveru pro přidání se do místnosti. Abyste mohli adresu publikovat, musí být nejdříve nastavená jako lokální.",
+    "Other published addresses:": "Další publikované adresy:",
+    "No other published addresses yet, add one below": "Zatím žádné další publikované adresy, přidejte nějakou níže",
+    "New published address (e.g. #alias:server)": "Nové publikované adresy (například #alias:server)",
+    "Local Addresses": "Lokální Adresy",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nastavit adresy pro tuto místnost, aby uživatelé mohli místnost najít zkrze váš domovský server (%(localDomain)s)",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "V šifrovaných místnostech jsou vaše zprávy bezpečné a pouze vy a příjemce má klíče k jejich rozšifrování.",
+    "Verify all users in a room to ensure it's secure.": "Ověřit všechny uživatele v místnosti, abyste se přesvědčili o bezpečnosti.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "V šifrovaných místnostech ověřit všechny uživatele, abyste se přesvědčili o bezpečnosti.",
+    "Verified": "Oveřený",
+    "Verification cancelled": "Oveření bylo zrušeno",
+    "Compare emoji": "Porovnejte emotikony",
+    "Enter a server name": "Zadejte jméno serveru"
 }

From b538bfa7dad40d3bae986cec8b6d07ce684d0747 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 26 Mar 2020 20:18:17 +0000
Subject: [PATCH 1793/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2240 of 2240 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 | 78 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7e78c367f7..271d7c5bc7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1650,7 +1650,7 @@
     "Make this room public": "A szoba legyen nyilvános",
     "Hide advanced": "Haladó elrejtése",
     "Show advanced": "Haladó megmutatása",
-    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Felhasználók más matrix szerverekről a szobába való belépésének megakadályozása (Ezt a beállítást később nem lehet megváltoztatni!)",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Más szervereken lévő felhasználók belépésének letiltása-csak helyi szoba (Ezt a beállítást később nem lehet megváltoztatni!)",
     "Close dialog": "Ablak bezárása",
     "Show previews/thumbnails for images": "Előnézet/bélyegkép mutatása a képekhez",
     "Clear cache and reload": "Gyorsítótár ürítése és újratöltés",
@@ -2226,5 +2226,79 @@
     "Are you sure you want to remove <b>%(serverName)s</b>": "Biztos, hogy törölni szeretnéd: <b>%(serverName)s</b>",
     "Remove server": "Szerver törlése",
     "Matrix": "Matrix",
-    "Add a new server": "Új szerver hozzáadása"
+    "Add a new server": "Új szerver hozzáadása",
+    "Unverified login. Was this you?": "Ellenőrizetlen bejelentkezés. Te voltál?",
+    "Manually verify all remote sessions": "Az összes távoli munkamenet manuális ellenőrzése",
+    "Update your secure storage": "A biztonsági tárolód frissítése",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "A felhasználó által használt munkamenetek ellenőrzése egyenként, a kereszt-aláírással hitelesített eszközökben nem bízol meg.",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "A nyilvánosságra hozott címeket bárki bármelyik szerveren használhatja a szobádba való belépéshez. A cím közzétételéhez először helyi címnek kell beállítani.",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Állíts be címet ehhez a szobához, hogy a felhasználók a matrix szervereden megtalálhassák (%(localDomain)s)",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "A titkosított szobákban az üzeneted biztonságban van  és csak neked és a címzetteknek van meg az egyedi kulcs a visszafejtéshez.",
+    "Verify all users in a room to ensure it's secure.": "Ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Titkosított szobákban ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
+    "Verified": "Hitelesített",
+    "Verification cancelled": "Ellenőrzés megszakítva",
+    "Compare emoji": "Emodzsik összehasonlítása",
+    "Enter the name of a new server you want to explore.": "Add meg a felfedezni kívánt új szerver nevét.",
+    "Server name": "Szerver neve",
+    "Add a new server...": "Új szerver hozzáadása…",
+    "%(networkName)s rooms": "%(networkName)s szobák",
+    "Matrix rooms": "Matrix szobák",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Indíts beszélgetést valakinek a nevével, felhasználói nevével (mint <userId/>) vagy e-mail címével.",
+    "a new master key signature": "az új mester kulcs aláírás",
+    "a new cross-signing key signature": "az új eszközök közötti kulcs aláírása",
+    "a device cross-signing signature": "az eszköz eszközök közötti aláírása",
+    "a key signature": "kulcs aláírás",
+    "Riot encountered an error during upload of:": "Riot hibába ütközött a feltöltés közben:",
+    "Upload completed": "A feltöltés befejeződött",
+    "Cancelled signature upload": "Az aláírás feltöltése megszakítva",
+    "Unabled to upload": "A feltöltés nem lehetséges",
+    "Signature upload success": "Az aláírások feltöltése sikeres",
+    "Signature upload failed": "Az aláírások feltöltése sikertelen",
+    "Confirm by comparing the following with the User Settings in your other session:": "Erősítsd meg a felhasználói beállítások összehasonlításával a többi munkamenetedben:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Ezt a munkamenetet hitelesítsd az ő felhasználói beállításának az összehasonlításával:",
+    "If they don't match, the security of your communication may be compromised.": "Ha nem egyeznek akkor a kommunikációtok biztonsága veszélyben lehet.",
+    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Nyiss meg egy meglévő munkamenetet és használd ennek az ellenőrzéséhez, hogy a titkosított üzenetekhez hozzáférhessen.",
+    "Waiting…": "Várakozik…",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ha nem érsz el egyet sem, <button>használd a visszaállítási kulcsodat vagy jelmondatot.</button>",
+    "Navigation": "Navigálás",
+    "Calls": "Hívások",
+    "Room List": "Szoba lista",
+    "Autocomplete": "Automatikus kiegészítés",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Félkövér váltása",
+    "Toggle Italics": "Dőlt váltása",
+    "Toggle Quote": "Idézet váltása",
+    "New line": "Új sor",
+    "Navigate recent messages to edit": "Friss üzenetekben navigálás a szerkesztéshez",
+    "Jump to start/end of the composer": "Az üzenet elejére/végére ugrás a szerkesztőben",
+    "Navigate composer history": "A szerkesztő korábbi üzeneteiben navigálás",
+    "Toggle microphone mute": "Mikrofon némítás váltása",
+    "Toggle video on/off": "Videó ki-/bekapcsolás váltása",
+    "Jump to room search": "A szoba keresésre ugrás",
+    "Navigate up/down in the room list": "A szoba listában fel/le navigál",
+    "Select room from the room list": "Szoba kiválasztása a szoba listából",
+    "Collapse room list section": "Szoba lista rész bezárása",
+    "Expand room list section": "Szoba lista rész kinyitása",
+    "Clear room list filter field": "Szoba lista szűrő mező törlése",
+    "Scroll up/down in the timeline": "Az idővonalon görgetés fel/le",
+    "Previous/next unread room or DM": "Előző/következő olvasatlan szoba vagy közvetlen üzenet",
+    "Previous/next room or DM": "Előző/következő szoba vagy közvetlen üzenet",
+    "Toggle the top left menu": "Bal felső menü ki-/bekapcsolása",
+    "Close dialog or context menu": "Párbeszédablak vagy menü bezárása",
+    "Activate selected button": "Kiválasztott gomb aktiválása",
+    "Toggle right panel": "Jobb oldali panel váltása",
+    "Toggle this dialog": "Ennek a párbeszédablaknak a váltása",
+    "Move autocomplete selection up/down": "Automatikus kiegészítés kijelölésének mozgatása fel/le",
+    "Cancel autocomplete": "Automatikus kiegészítés megszakítása",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Szóköz",
+    "End": "End"
 }

From a974f0fe469fe6bf854701e6ce0061813d47b480 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 09:59:18 +0000
Subject: [PATCH 1794/3235] blank out UserInfo avatar when changing between
 members

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 4219da690e..112423a0f2 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1388,6 +1388,7 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
             <div>
                 <div>
                     <MemberAvatar
+                        key={member.userId} // to instantly blank the avatar when UserInfo changes members
                         member={member}
                         width={2 * 0.3 * window.innerHeight} // 2x@30vh
                         height={2 * 0.3 * window.innerHeight} // 2x@30vh

From 98f9f1e956235c290586f95e9b10fcfe2231c487 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 09:59:43 +0000
Subject: [PATCH 1795/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 12bd462937..4677f40ce1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -25,6 +25,8 @@
     "Error": "Error",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
+    "Single sign-on": "Single sign-on",
+    "Click here if you're not redirected automatically": "Click here if you're not redirected automatically",
     "Call Failed": "Call Failed",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
     "Review Sessions": "Review Sessions",

From 15f61dca3503912d7e83390fae487721956fcdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 27 Mar 2020 09:43:34 +0000
Subject: [PATCH 1796/3235] Translated using Weblate (French)

Currently translated at 100.0% (2241 of 2241 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 941fd209f2..eb7e11c0f2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2291,5 +2291,20 @@
     "Toggle right panel": "Afficher/masquer le panneau de droite",
     "Secret Storage key format:": "Format de clé du coffre secret :",
     "outdated": "obsolète",
-    "up to date": "à jour"
+    "up to date": "à jour",
+    "Unverified login. Was this you?": "Connexion non vérifiée. Était-ce vous ?",
+    "Manually verify all remote sessions": "Vérifier manuellement toutes les sessions à distance",
+    "Update your secure storage": "Mettre à jour votre coffre sécurisé",
+    "Self signing private key:": "Clé privée d’auto-signature :",
+    "cached locally": "mise en cache localement",
+    "not found locally": "non trouvée localement",
+    "User signing private key:": "Clé privée de signature de l’utilisateur :",
+    "Session backup key:": "Clé de sauvegarde de session :",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Vérifiez individuellement chaque session utilisée par un utilisateur pour la marquer comme fiable, sans faire confiance aux appareils signés avec la signature croisée.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Dans les salons chiffrés, vos messages sont sécurisés et seuls vous et le destinataire avez les clés uniques pour les déchiffrer.",
+    "Verify all users in a room to ensure it's secure.": "Vérifiez tous les utilisateurs d’un salon pour vous assurer qu’il est sécurisé.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Dans les salons chiffrés, vérifiez tous les utilisateurs pour vous assurer qu’il est sécurisé.",
+    "Verified": "Vérifié",
+    "Verification cancelled": "Vérification annulée",
+    "Compare emoji": "Comparer des émojis"
 }

From 548e9184372d9a7c8a74a07841f97134ee55fbb4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 12:01:10 +0000
Subject: [PATCH 1797/3235] only auto-sso when disable_custom_urls is true

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/Login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 6c6a8bedbd..134f6fa6f3 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -435,7 +435,8 @@ export default createReactClass({
 
                 // if this is the initial render and the flow we choose is SSO/CAS then go to it automatically
                 // we do not do this when the user has changed to the server manually as that may be jarring.
-                if (initial && SSO_FLOWS.includes(flows[i].type)) {
+                // Only allow it when disable_custom_urls is asserted so that we don't prevent user from changing HS URL
+                if (initial && SdkConfig.get()['disable_custom_urls'] && SSO_FLOWS.includes(flows[i].type)) {
                     const tmpCli = this._loginLogic.createTemporaryClient();
                     PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas", true);
                 }

From 0f2e2ea069e9cdd5f05319370744aa354d450758 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 11:58:54 +0000
Subject: [PATCH 1798/3235] Update shield display rules

---
 src/components/structures/RoomView.js  | 8 +++++++-
 src/components/views/rooms/RoomTile.js | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5fd5f42f78..dd453667e0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -40,6 +40,7 @@ import rate_limited_func from '../../ratelimitedfunc';
 import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
 import eventSearch from '../../Searching';
+import DMRoomMap from '../../utils/DMRoomMap';
 
 import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
 
@@ -833,7 +834,12 @@ export default createReactClass({
 
         /* Check all verified user devices. */
         /* Don't alarm if no other users are verified  */
-        const targets = (verified.length > 0) ? [...verified, this.context.getUserId()] : verified;
+        const isDM = !!DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
+                            !isDM &&                    // Don't alarm for self in DMs with other users
+                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
+                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
+        const targets = includeUser ? [...verified, this.context.getUserId()] : verified;
         for (const userId of targets) {
             const devices = await this.context.getStoredDevicesForUser(userId);
             const anyDeviceNotVerified = devices.some(({deviceId}) => {
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0f44f5077a..6f9cd7f1be 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -167,7 +167,12 @@ export default createReactClass({
 
         /* Check all verified user devices. */
         /* Don't alarm if no other users are verified  */
-        const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
+        const isDM = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
+                            !isDM &&                    // Don't alarm for self in DMs with other users
+                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
+                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
+        const targets = includeUser ? [...verified, cli.getUserId()] : verified;
         for (const userId of targets) {
             const devices = await cli.getStoredDevicesForUser(userId);
             const allDevicesVerified = devices.every(({deviceId}) => {

From 5d7adef0a2a7d5de0ca9a7d7931c90e5fb52a213 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 13:45:21 +0000
Subject: [PATCH 1799/3235] Factor out shield display rules into one file

---
 src/components/structures/RoomView.js  | 39 ++--------------------
 src/components/views/rooms/RoomTile.js | 36 ++-------------------
 src/utils/ShieldUtils.ts               | 45 ++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 70 deletions(-)
 create mode 100644 src/utils/ShieldUtils.ts

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index dd453667e0..7ce50348c9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -56,6 +56,7 @@ import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { shieldStatusForMembership } from '../../utils/ShieldUtils';
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -818,45 +819,9 @@ export default createReactClass({
             return;
         }
 
-        // Duplication between here and _updateE2eStatus in RoomTile
         /* At this point, the user has encryption on and cross-signing on */
-        const e2eMembers = await room.getEncryptionTargetMembers();
-        const verified = [];
-        const unverified = [];
-        e2eMembers.map(({userId}) => userId)
-            .filter((userId) => userId !== this.context.getUserId())
-            .forEach((userId) => {
-                (this.context.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId);
-            });
-
-        debuglog("e2e verified", verified, "unverified", unverified);
-
-        /* Check all verified user devices. */
-        /* Don't alarm if no other users are verified  */
-        const isDM = !!DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
-                            !isDM &&                    // Don't alarm for self in DMs with other users
-                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
-                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
-        const targets = includeUser ? [...verified, this.context.getUserId()] : verified;
-        for (const userId of targets) {
-            const devices = await this.context.getStoredDevicesForUser(userId);
-            const anyDeviceNotVerified = devices.some(({deviceId}) => {
-                return !this.context.checkDeviceTrust(userId, deviceId).isVerified();
-            });
-            if (anyDeviceNotVerified) {
-                this.setState({
-                    e2eStatus: "warning",
-                });
-                debuglog("e2e status set to warning as not all users trust all of their sessions." +
-                         " Aborted on user", userId);
-                return;
-            }
-        }
-
         this.setState({
-            e2eStatus: unverified.length === 0 ? "verified" : "normal",
+            e2eStatus: await shieldStatusForMembership(this.context, room),
         });
     },
 
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 6f9cd7f1be..478d6703b4 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -37,6 +37,7 @@ import E2EIcon from './E2EIcon';
 import InviteOnlyIcon from './InviteOnlyIcon';
 // eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
+import { shieldStatusForMembership } from '../../../utils/ShieldUtils';
 
 export default createReactClass({
     displayName: 'RoomTile',
@@ -154,40 +155,9 @@ export default createReactClass({
             return;
         }
 
-        // Duplication between here and _updateE2eStatus in RoomView
-        const e2eMembers = await this.props.room.getEncryptionTargetMembers();
-        const verified = [];
-        const unverified = [];
-        e2eMembers.map(({userId}) => userId)
-            .filter((userId) => userId !== cli.getUserId())
-            .forEach((userId) => {
-                (cli.checkUserTrust(userId).isCrossSigningVerified() ?
-                verified : unverified).push(userId);
-            });
-
-        /* Check all verified user devices. */
-        /* Don't alarm if no other users are verified  */
-        const isDM = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-        const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
-                            !isDM &&                    // Don't alarm for self in DMs with other users
-                            (e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
-                            (e2eMembers.length == 1);   // Do alarm for self if we're alone in a room
-        const targets = includeUser ? [...verified, cli.getUserId()] : verified;
-        for (const userId of targets) {
-            const devices = await cli.getStoredDevicesForUser(userId);
-            const allDevicesVerified = devices.every(({deviceId}) => {
-                return cli.checkDeviceTrust(userId, deviceId).isVerified();
-            });
-            if (!allDevicesVerified) {
-                this.setState({
-                    e2eStatus: "warning",
-                });
-                return;
-            }
-        }
-
+        /* At this point, the user has encryption on and cross-signing on */
         this.setState({
-            e2eStatus: unverified.length === 0 ? "verified" : "normal",
+            e2eStatus: await shieldStatusForMembership(cli, this.props.room),
         });
     },
 
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
new file mode 100644
index 0000000000..407dae8e97
--- /dev/null
+++ b/src/utils/ShieldUtils.ts
@@ -0,0 +1,45 @@
+import DMRoomMap from './DMRoomMap';
+
+/* For now, a cut-down type spec for the client */
+interface Client {
+    getUserId: () => string;
+    checkUserTrust: (userId: string) => {
+        isCrossSigningVerified: () => boolean
+    };
+    getStoredDevicesForUser: (userId: string) => Promise<[{ deviceId: string }]>;
+    checkDeviceTrust: (userId: string, deviceId: string) => {
+        isVerified: () => boolean
+    }
+}
+
+export async function shieldStatusForMembership(client: Client, room) {
+    const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
+    const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+
+    const verified = [];
+    const unverified = [];
+    members.filter((userId) => userId !== client.getUserId())
+        .forEach((userId) => {
+            (client.checkUserTrust(userId).isCrossSigningVerified() ?
+            verified : unverified).push(userId);
+        });
+
+    /* Check all verified user devices. */
+    /* Don't alarm if no other users are verified  */
+    const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
+                        !inDMMap &&                 // Don't alarm for self in DMs with other users
+                        (members.length != 2) || // Don't alarm for self in 1:1 chats with other users
+                        (members.length == 1);   // Do alarm for self if we're alone in a room
+    const targets = includeUser ? [...verified, client.getUserId()] : verified;
+    for (const userId of targets) {
+        const devices = await client.getStoredDevicesForUser(userId);
+        const anyDeviceNotVerified = devices.some(({deviceId}) => {
+            return !client.checkDeviceTrust(userId, deviceId).isVerified();
+        });
+        if (anyDeviceNotVerified) {
+            return "warning";
+        }
+    }
+
+    return unverified.length === 0 ? "verified" : "normal";
+}

From 5b7e7f49d1cbc4733769f16a042b0a383d21c6c5 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 13:50:03 +0000
Subject: [PATCH 1800/3235] lint

---
 src/components/structures/RoomView.js |  1 -
 src/utils/ShieldUtils.ts              | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 7ce50348c9..74572b962a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -40,7 +40,6 @@ import rate_limited_func from '../../ratelimitedfunc';
 import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
 import eventSearch from '../../Searching';
-import DMRoomMap from '../../utils/DMRoomMap';
 
 import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
 
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 407dae8e97..30b1dab7fc 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -12,12 +12,17 @@ interface Client {
     }
 }
 
-export async function shieldStatusForMembership(client: Client, room) {
+interface Room {
+    getEncryptionTargetMembers: () => Promise<[{userId: string}]>;
+    roomId: string;
+}
+
+export async function shieldStatusForMembership(client: Client, room: Room) {
     const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
     const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
 
-    const verified = [];
-    const unverified = [];
+    const verified: string[] = [];
+    const unverified: string[] = [];
     members.filter((userId) => userId !== client.getUserId())
         .forEach((userId) => {
             (client.checkUserTrust(userId).isCrossSigningVerified() ?
@@ -28,8 +33,8 @@ export async function shieldStatusForMembership(client: Client, room) {
     /* Don't alarm if no other users are verified  */
     const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
                         !inDMMap &&                 // Don't alarm for self in DMs with other users
-                        (members.length != 2) || // Don't alarm for self in 1:1 chats with other users
-                        (members.length == 1);   // Do alarm for self if we're alone in a room
+                        (members.length !== 2) || // Don't alarm for self in 1:1 chats with other users
+                        (members.length === 1);   // Do alarm for self if we're alone in a room
     const targets = includeUser ? [...verified, client.getUserId()] : verified;
     for (const userId of targets) {
         const devices = await client.getStoredDevicesForUser(userId);

From 1f0d7923d71fa1bc35d5774e5957a332ac427938 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 13:51:30 +0000
Subject: [PATCH 1801/3235] with output type

---
 src/utils/ShieldUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 30b1dab7fc..3c7cae8c8d 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -17,7 +17,7 @@ interface Room {
     roomId: string;
 }
 
-export async function shieldStatusForMembership(client: Client, room: Room) {
+export async function shieldStatusForMembership(client: Client, room: Room): Promise<string> {
     const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
     const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
 

From db6f88c66a76736ce72ec0d22df6e6627b0a59ed Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 14:02:32 +0000
Subject: [PATCH 1802/3235] Welcome page, support $ssoUrl and $casUrl
 placeholders

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/EmbeddedPage.js |  9 +++++++++
 src/components/structures/MatrixChat.js   |  2 +-
 src/components/views/auth/Welcome.js      | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index f854dc955f..a0a95ac6f1 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -37,6 +37,8 @@ export default class EmbeddedPage extends React.PureComponent {
         className: PropTypes.string,
         // Whether to wrap the page in a scrollbar
         scrollbar: PropTypes.bool,
+        // Map of keys to replace with values, e.g {$placeholder: "value"}
+        replaceMap: PropTypes.object,
     };
 
     static contextType = MatrixClientContext;
@@ -81,6 +83,13 @@ export default class EmbeddedPage extends React.PureComponent {
                 }
 
                 body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
+
+                if (this.props.replaceMap) {
+                    Object.keys(this.props.replaceMap).forEach(key => {
+                        body = body.split(key).join(this.props.replaceMap[key]);
+                    });
+                }
+
                 this.setState({ page: body });
             },
         );
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 52002f0591..e6702e385e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -2021,7 +2021,7 @@ export default createReactClass({
             }
         } else if (this.state.view === VIEWS.WELCOME) {
             const Welcome = sdk.getComponent('auth.Welcome');
-            view = <Welcome />;
+            view = <Welcome {...this.getServerProperties()} />;
         } else if (this.state.view === VIEWS.REGISTER) {
             const Registration = sdk.getComponent('structures.auth.Registration');
             view = (
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 58f117ea36..60ceae5343 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -18,6 +18,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
+import * as Matrix from "matrix-js-sdk";
 
 export default class Welcome extends React.PureComponent {
     render() {
@@ -33,11 +34,23 @@ export default class Welcome extends React.PureComponent {
             pageUrl = 'welcome.html';
         }
 
+        const {hsUrl, isUrl} = this.props.serverConfig;
+        const tmpClient = Matrix.createClient({
+            baseUrl: hsUrl,
+            idBaseUrl: isUrl,
+        });
+        const callbackUrl = this.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl());
+
         return (
             <AuthPage>
                 <div className="mx_Welcome">
-                    <EmbeddedPage className="mx_WelcomePage"
+                    <EmbeddedPage
+                        className="mx_WelcomePage"
                         url={pageUrl}
+                        replaceMap={{
+                            "$ssoUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "sso"),
+                            "$casUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "cas"),
+                        }}
                     />
                     <LanguageSelector />
                 </div>

From f4d3cc8ee62671336981f486561be58d4e3e0f6c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 14:05:14 +0000
Subject: [PATCH 1803/3235] revert stale changes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js                     | 19 +-----------------
 src/components/structures/auth/Login.js | 26 +++++++------------------
 src/components/views/auth/Welcome.js    |  4 ++++
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 489d9474a1..5d809eb28f 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -22,11 +22,6 @@ limitations under the License.
 import {MatrixClient} from "matrix-js-sdk";
 import dis from './dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
-import Modal from "./Modal";
-import InfoDialog from "./components/views/dialogs/InfoDialog";
-import {_t} from "./languageHandler";
-import Spinner from "./components/views/elements/Spinner";
-import React from "react";
 
 /**
  * Base class for classes that provide platform-specific functionality
@@ -188,21 +183,9 @@ export default class BasePlatform {
      * Begin Single Sign On flows.
      * @param {MatrixClient} mxClient the matrix client using which we should start the flow
      * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
-     * @param {boolean} showModal whether or not to show the spinner modal.
      */
-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas", showModal: boolean) {
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
         const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
-        if (showModal) {
-            Modal.createTrackedDialog('BasePlatform', 'SSO', InfoDialog, {
-                title: _t("Single sign-on"),
-                description: <div>
-                    <Spinner />
-                    <a href={callbackUrl} rel="noreferrer noopener">
-                        {_t("Click here if you're not redirected automatically")}
-                    </a>
-                </div>,
-            });
-        }
         window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
     }
 }
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 134f6fa6f3..bfabc34a62 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -53,10 +53,6 @@ _td("Invalid base_url for m.identity_server");
 _td("Identity server URL does not appear to be a valid identity server");
 _td("General failure");
 
-const M_LOGIN_CAS = "m.login.cas";
-const M_LOGIN_SSO = "m.login.sso";
-const SSO_FLOWS = [M_LOGIN_SSO, M_LOGIN_CAS];
-
 /**
  * A wire component which glues together login UI components and Login logic
  */
@@ -126,11 +122,11 @@ export default createReactClass({
             'm.login.password': this._renderPasswordStep,
 
             // CAS and SSO are the same thing, modulo the url we link to
-            [M_LOGIN_CAS]: () => this._renderSsoStep("cas"),
-            [M_LOGIN_SSO]: () => this._renderSsoStep("sso"),
+            'm.login.cas': () => this._renderSsoStep("cas"),
+            'm.login.sso': () => this._renderSsoStep("sso"),
         };
 
-        this._initLoginLogic(true);
+        this._initLoginLogic();
     },
 
     componentWillUnmount: function() {
@@ -142,7 +138,7 @@ export default createReactClass({
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
         // Ensure that we end up actually logging in to the right place
-        this._initLoginLogic(false, newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
+        this._initLoginLogic(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
     },
 
     onPasswordLoginError: function(errorText) {
@@ -346,12 +342,12 @@ export default createReactClass({
 
     onTryRegisterClick: function(ev) {
         const step = this._getCurrentFlowStep();
-        if (SSO_FLOWS.includes(step)) {
+        if (step === 'm.login.sso' || step === 'm.login.cas') {
             // If we're showing SSO it means that registration is also probably disabled,
             // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
             ev.preventDefault();
             ev.stopPropagation();
-            const ssoKind = step === M_LOGIN_SSO ? 'sso' : 'cas';
+            const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
             PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
         } else {
             // Don't intercept - just go through to the register page
@@ -373,7 +369,7 @@ export default createReactClass({
         });
     },
 
-    _initLoginLogic: async function(initial, hsUrl, isUrl) {
+    _initLoginLogic: async function(hsUrl, isUrl) {
         hsUrl = hsUrl || this.props.serverConfig.hsUrl;
         isUrl = isUrl || this.props.serverConfig.isUrl;
 
@@ -433,14 +429,6 @@ export default createReactClass({
                     continue;
                 }
 
-                // if this is the initial render and the flow we choose is SSO/CAS then go to it automatically
-                // we do not do this when the user has changed to the server manually as that may be jarring.
-                // Only allow it when disable_custom_urls is asserted so that we don't prevent user from changing HS URL
-                if (initial && SdkConfig.get()['disable_custom_urls'] && SSO_FLOWS.includes(flows[i].type)) {
-                    const tmpCli = this._loginLogic.createTemporaryClient();
-                    PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas", true);
-                }
-
                 // we just pick the first flow where we support all the
                 // steps. (we don't have a UI for multiple logins so let's skip
                 // that for now).
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 60ceae5343..70c5569cd9 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -19,6 +19,10 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
 import * as Matrix from "matrix-js-sdk";
+import {_td} from "../../../languageHandler";
+
+// translatable strings for Welcome pages
+_td("Sign in with SSO");
 
 export default class Welcome extends React.PureComponent {
     render() {

From 6664535a269da603a88562f1cf943d405d2c425e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 14:05:32 +0000
Subject: [PATCH 1804/3235] change welcome page placeholders

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/auth/Welcome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 70c5569cd9..1893b04d76 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -52,8 +52,8 @@ export default class Welcome extends React.PureComponent {
                         className="mx_WelcomePage"
                         url={pageUrl}
                         replaceMap={{
-                            "$ssoUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "sso"),
-                            "$casUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "cas"),
+                            "$riot:ssoUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "sso"),
+                            "$riot:casUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "cas"),
                         }}
                     />
                     <LanguageSelector />

From de0895b88193aca8e01c61b4e175a7812317dfa2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 14:06:21 +0000
Subject: [PATCH 1805/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4677f40ce1..fbb3fd9f6f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -25,8 +25,6 @@
     "Error": "Error",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
-    "Single sign-on": "Single sign-on",
-    "Click here if you're not redirected automatically": "Click here if you're not redirected automatically",
     "Call Failed": "Call Failed",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
     "Review Sessions": "Review Sessions",
@@ -1872,6 +1870,7 @@
     "Find other public servers or use a custom server": "Find other public servers or use a custom server",
     "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
     "Sign in to your Matrix account on <underlinedServerName />": "Sign in to your Matrix account on <underlinedServerName />",
+    "Sign in with SSO": "Sign in with SSO",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",

From 9d0ed6e80040502fb8d8c3db359826133c97ab53 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 14:19:43 +0000
Subject: [PATCH 1806/3235] fix copy-pasta error

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/auth/Welcome.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 1893b04d76..7cbcf65d3c 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -20,6 +20,7 @@ import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
 import * as Matrix from "matrix-js-sdk";
 import {_td} from "../../../languageHandler";
+import PlatformPeg from "../../../PlatformPeg";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
@@ -43,7 +44,8 @@ export default class Welcome extends React.PureComponent {
             baseUrl: hsUrl,
             idBaseUrl: isUrl,
         });
-        const callbackUrl = this.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl());
+        const plaf = PlatformPeg.get();
+        const callbackUrl = plaf.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl());
 
         return (
             <AuthPage>

From fda533ab48321e09de49ccb3b356171a09918bda Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 15:25:44 +0000
Subject: [PATCH 1807/3235] test for shield behaviour

---
 test/utils/ShieldUtils-test.js | 170 +++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 test/utils/ShieldUtils-test.js

diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
new file mode 100644
index 0000000000..5030d9c5c8
--- /dev/null
+++ b/test/utils/ShieldUtils-test.js
@@ -0,0 +1,170 @@
+import { shieldStatusForMembership } from '../../src/utils/ShieldUtils';
+import DMRoomMap from '../../src/utils/DMRoomMap';
+
+function mkClient (selfTrust) {
+    return {
+        getUserId: () => "@self:localhost",
+        checkUserTrust: (userId) => ({
+            isCrossSigningVerified: () => userId[1] == "T"
+        }),
+        checkDeviceTrust: (userId, deviceId) => ({
+            isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T"
+        }),
+        getStoredDevicesForUser: async (userId) => ["DEVICE"],
+    }
+}
+
+describe("mkClient self-test", function () {
+    test.each([true, false])("behaves well for self-trust=%s", (v) => {
+        const client = mkClient(v);
+        expect(client.checkDeviceTrust("@self:localhost", "DEVICE").isVerified()).toBe(v);
+    });
+
+    test.each([
+        ["@TT:h", true],
+        ["@TF:h", true],
+        ["@FT:h", false],
+        ["@FF:h", false]])
+    ("behaves well for user trust %s", (userId, trust) => {
+        expect(mkClient().checkUserTrust(userId).isCrossSigningVerified()).toBe(trust);
+    });
+
+    test.each([
+        ["@TT:h", true],
+        ["@TF:h", false],
+        ["@FT:h", true],
+        ["@FF:h", false]])
+    ("behaves well for device trust %s", (userId, trust) => {
+        expect(mkClient().checkDeviceTrust(userId, "device").isVerified()).toBe(trust);
+    });
+});
+
+describe("shieldStatusForMembership self-trust behaviour", function () {
+    beforeAll(() => {
+        DMRoomMap._sharedInstance = {
+            getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
+        };
+    });
+
+    it.each(
+        [[true, true], [true, false],
+        [false, true], [false, false]]
+    )("2 unverified: returns 'normal', self-trust = %s, DM = %s", async (trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF1:h", "@FF2:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual("normal");
+    });
+
+    it.each(
+        [["verified", true, true], ["verified", true, false],
+        ["verified", false, true], ["warning", false, false]]
+    )("2 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@TT2:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["normal", true, true], ["normal", true, false],
+        ["normal", false, true], ["warning", false, false]]
+    )("2 mixed: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@FF2:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["verified", true, true], ["verified", true, false],
+        ["warning", false, true], ["warning", false, false]]
+    )("0 others: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["verified", true, true], ["verified", true, false],
+        ["verified", false, true], ["verified", false, false]]
+    )("1 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TT:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["normal", true, true], ["normal", true, false],
+        ["normal", false, true], ["normal", false, false]]
+    )("1 unverified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
+        const client = mkClient(trusted);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+});
+
+describe("shieldStatusForMembership other-trust behaviour", function () {
+    beforeAll(() => {
+        DMRoomMap._sharedInstance = {
+            getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
+        };
+    });
+
+    it.each(
+        [["warning", true], ["warning", false]]
+    )("1 verified/untrusted: returns '%s', DM = %s", async (result, dm) => {
+        const client = mkClient(true);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["warning", true], ["warning", false]]
+    )("2 verified/untrusted: returns '%s', DM = %s", async (result, dm) => {
+        const client = mkClient(true);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT: h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["normal", true], ["normal", false]]
+    )("2 unverified/untrusted: returns '%s', DM = %s", async (result, dm) => {
+        const client = mkClient(true);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT: h"].map((userId) => ({userId})),
+        }
+        const status = await shieldStatusForMembership(client, room);
+        expect(status).toEqual(result);
+    });
+});

From 4f3d4426ea05a9d7a8a0846f3422d13039eab27d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 27 Mar 2020 15:37:59 +0000
Subject: [PATCH 1808/3235] lint

---
 test/utils/ShieldUtils-test.js | 58 +++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 5030d9c5c8..973798fa4b 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -1,20 +1,20 @@
 import { shieldStatusForMembership } from '../../src/utils/ShieldUtils';
 import DMRoomMap from '../../src/utils/DMRoomMap';
 
-function mkClient (selfTrust) {
+function mkClient(selfTrust) {
     return {
         getUserId: () => "@self:localhost",
         checkUserTrust: (userId) => ({
-            isCrossSigningVerified: () => userId[1] == "T"
+            isCrossSigningVerified: () => userId[1] == "T",
         }),
         checkDeviceTrust: (userId, deviceId) => ({
-            isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T"
+            isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T",
         }),
         getStoredDevicesForUser: async (userId) => ["DEVICE"],
-    }
+    };
 }
 
-describe("mkClient self-test", function () {
+describe("mkClient self-test", function() {
     test.each([true, false])("behaves well for self-trust=%s", (v) => {
         const client = mkClient(v);
         expect(client.checkDeviceTrust("@self:localhost", "DEVICE").isVerified()).toBe(v);
@@ -24,8 +24,8 @@ describe("mkClient self-test", function () {
         ["@TT:h", true],
         ["@TF:h", true],
         ["@FT:h", false],
-        ["@FF:h", false]])
-    ("behaves well for user trust %s", (userId, trust) => {
+        ["@FF:h", false]],
+        )("behaves well for user trust %s", (userId, trust) => {
         expect(mkClient().checkUserTrust(userId).isCrossSigningVerified()).toBe(trust);
     });
 
@@ -33,13 +33,13 @@ describe("mkClient self-test", function () {
         ["@TT:h", true],
         ["@TF:h", false],
         ["@FT:h", true],
-        ["@FF:h", false]])
-    ("behaves well for device trust %s", (userId, trust) => {
+        ["@FF:h", false]],
+        )("behaves well for device trust %s", (userId, trust) => {
         expect(mkClient().checkDeviceTrust(userId, "device").isVerified()).toBe(trust);
     });
 });
 
-describe("shieldStatusForMembership self-trust behaviour", function () {
+describe("shieldStatusForMembership self-trust behaviour", function() {
     beforeAll(() => {
         DMRoomMap._sharedInstance = {
             getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
@@ -48,84 +48,84 @@ describe("shieldStatusForMembership self-trust behaviour", function () {
 
     it.each(
         [[true, true], [true, false],
-        [false, true], [false, false]]
+        [false, true], [false, false]],
     )("2 unverified: returns 'normal', self-trust = %s, DM = %s", async (trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF1:h", "@FF2:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual("normal");
     });
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["verified", false, true], ["warning", false, false]]
+        ["verified", false, true], ["warning", false, false]],
     )("2 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@TT2:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
         [["normal", true, true], ["normal", true, false],
-        ["normal", false, true], ["warning", false, false]]
+        ["normal", false, true], ["warning", false, false]],
     )("2 mixed: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@FF2:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["warning", false, true], ["warning", false, false]]
+        ["warning", false, true], ["warning", false, false]],
     )("0 others: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
         [["verified", true, true], ["verified", true, false],
-        ["verified", false, true], ["verified", false, false]]
+        ["verified", false, true], ["verified", false, false]],
     )("1 verified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
         [["normal", true, true], ["normal", true, false],
-        ["normal", false, true], ["normal", false, false]]
+        ["normal", false, true], ["normal", false, false]],
     )("1 unverified: returns '%s', self-trust = %s, DM = %s", async (result, trusted, dm) => {
         const client = mkClient(trusted);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 });
 
-describe("shieldStatusForMembership other-trust behaviour", function () {
+describe("shieldStatusForMembership other-trust behaviour", function() {
     beforeAll(() => {
         DMRoomMap._sharedInstance = {
             getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
@@ -133,37 +133,37 @@ describe("shieldStatusForMembership other-trust behaviour", function () {
     });
 
     it.each(
-        [["warning", true], ["warning", false]]
+        [["warning", true], ["warning", false]],
     )("1 verified/untrusted: returns '%s', DM = %s", async (result, dm) => {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
-        [["warning", true], ["warning", false]]
+        [["warning", true], ["warning", false]],
     )("2 verified/untrusted: returns '%s', DM = %s", async (result, dm) => {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT: h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });
 
     it.each(
-        [["normal", true], ["normal", false]]
+        [["normal", true], ["normal", false]],
     )("2 unverified/untrusted: returns '%s', DM = %s", async (result, dm) => {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT: h"].map((userId) => ({userId})),
-        }
+        };
         const status = await shieldStatusForMembership(client, room);
         expect(status).toEqual(result);
     });

From 29bb7e38fe0cf3258f986a5ade66fc71578b5618 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 27 Mar 2020 16:45:46 +0100
Subject: [PATCH 1809/3235] fix undismissable toasts

---
 src/DeviceListener.js | 138 ++++++++++++++++++++----------------------
 1 file changed, 67 insertions(+), 71 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 9161a462eb..f8555c7602 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -119,89 +119,85 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
-        if (!crossSigningReady) {
-            if (this._dismissedThisDeviceToast) {
-                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
-                return;
-            }
-
-            // cross signing isn't enabled - nag to enable it
-            // There are 3 different toasts for:
-            if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
-                // Cross-signing on account but this device doesn't trust the master key (verify this session)
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: THIS_DEVICE_TOAST_KEY,
-                    title: _t("Verify this session"),
-                    icon: "verification_warning",
-                    props: {kind: 'verify_this_session'},
-                    component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                });
-            } else {
-                const backupInfo = await this._getKeyBackupInfo();
-                if (backupInfo) {
-                    // No cross-signing on account but key backup available (upgrade encryption)
+        if (this._dismissedThisDeviceToast) {
+            ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+        } else {
+            if (!crossSigningReady) {
+                // cross signing isn't enabled - nag to enable it
+                // There are 3 different toasts for:
+                if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
+                    // Cross-signing on account but this device doesn't trust the master key (verify this session)
                     ToastStore.sharedInstance().addOrReplaceToast({
                         key: THIS_DEVICE_TOAST_KEY,
-                        title: _t("Encryption upgrade available"),
+                        title: _t("Verify this session"),
                         icon: "verification_warning",
-                        props: {kind: 'upgrade_encryption'},
+                        props: {kind: 'verify_this_session'},
                         component: sdk.getComponent("toasts.SetupEncryptionToast"),
                     });
                 } else {
-                    // No cross-signing or key backup on account (set up encryption)
+                    const backupInfo = await this._getKeyBackupInfo();
+                    if (backupInfo) {
+                        // No cross-signing on account but key backup available (upgrade encryption)
+                        ToastStore.sharedInstance().addOrReplaceToast({
+                            key: THIS_DEVICE_TOAST_KEY,
+                            title: _t("Encryption upgrade available"),
+                            icon: "verification_warning",
+                            props: {kind: 'upgrade_encryption'},
+                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                        });
+                    } else {
+                        // No cross-signing or key backup on account (set up encryption)
+                        ToastStore.sharedInstance().addOrReplaceToast({
+                            key: THIS_DEVICE_TOAST_KEY,
+                            title: _t("Set up encryption"),
+                            icon: "verification_warning",
+                            props: {kind: 'set_up_encryption'},
+                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                        });
+                    }
+                }
+                return;
+            } else if (await cli.secretStorageKeyNeedsUpgrade()) {
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: THIS_DEVICE_TOAST_KEY,
+                    title: _t("Encryption upgrade available"),
+                    icon: "verification_warning",
+                    props: {kind: 'upgrade_ssss'},
+                    component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                });
+            }
+        }
+
+        // as long as cross-signing isn't ready,
+        // you can't see or dismiss any device toasts
+        if (crossSigningReady) {
+            const newActiveToasts = new Set();
+
+            const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+            for (const device of devices) {
+                if (device.deviceId == cli.deviceId) continue;
+
+                const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
+                if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
+                    ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
+                } else {
+                    this._activeNagToasts.add(device.deviceId);
                     ToastStore.sharedInstance().addOrReplaceToast({
-                        key: THIS_DEVICE_TOAST_KEY,
-                        title: _t("Set up encryption"),
+                        key: toastKey(device.deviceId),
+                        title: _t("Unverified login. Was this you?"),
                         icon: "verification_warning",
-                        props: {kind: 'set_up_encryption'},
-                        component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                        props: { device },
+                        component: sdk.getComponent("toasts.UnverifiedSessionToast"),
                     });
+                    newActiveToasts.add(device.deviceId);
                 }
             }
-            return;
-        } else if (await cli.secretStorageKeyNeedsUpgrade()) {
-            if (this._dismissedThisDeviceToast) {
-                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
-                return;
+
+            // clear any other outstanding toasts (eg. logged out devices)
+            for (const deviceId of this._activeNagToasts) {
+                if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
             }
-
-            ToastStore.sharedInstance().addOrReplaceToast({
-                key: THIS_DEVICE_TOAST_KEY,
-                title: _t("Encryption upgrade available"),
-                icon: "verification_warning",
-                props: {kind: 'upgrade_ssss'},
-                component: sdk.getComponent("toasts.SetupEncryptionToast"),
-            });
-        } else {
-            ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+            this._activeNagToasts = newActiveToasts;
         }
-
-        const newActiveToasts = new Set();
-
-        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
-        for (const device of devices) {
-            if (device.deviceId == cli.deviceId) continue;
-
-            const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-            if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
-                ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
-            } else {
-                this._activeNagToasts.add(device.deviceId);
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: toastKey(device.deviceId),
-                    title: _t("Unverified login. Was this you?"),
-                    icon: "verification_warning",
-                    props: { device },
-                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                });
-                newActiveToasts.add(device.deviceId);
-            }
-        }
-
-        // clear any other outstanding toasts (eg. logged out devices)
-        for (const deviceId of this._activeNagToasts) {
-            if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
-        }
-        this._activeNagToasts = newActiveToasts;
     }
 }

From f90dfa242184ecb3fb35f46152f5d15f8479ee66 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 27 Mar 2020 12:03:12 +0000
Subject: [PATCH 1810/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2234 of 2241 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7fd06eca15..9c15bbaa3b 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2294,5 +2294,6 @@
     "In encrypted rooms, verify all users to ensure it’s secure.": "Në dhoma të fshehtëzuara, verifikoni krejt përdoruesi për të garantuar se është e sigurt.",
     "Verified": "I verifikuar",
     "Verification cancelled": "Verifikimi u anulua",
-    "Compare emoji": "Krahasoni emoji"
+    "Compare emoji": "Krahasoni emoji",
+    "Session backup key:": "Kyç kopjeruajtjeje sesioni:"
 }

From 71f8a49e60d32afbeb235e6699f73efc015f57d0 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 27 Mar 2020 14:55:06 +0000
Subject: [PATCH 1811/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2241 of 2241 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 68162c1010..69de024887 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2291,5 +2291,7 @@
     "In encrypted rooms, verify all users to ensure it’s secure.": "Gela zifratuetan, egiaztatu erabiltzaile guztiak segurua dela baieztatzeko.",
     "Verified": "Egiaztatuta",
     "Verification cancelled": "Egiaztaketa ezeztatuta",
-    "Compare emoji": "Konparatu emojiak"
+    "Compare emoji": "Konparatu emojiak",
+    "Unverified login. Was this you?": "Egiaztatu gabeko saioa. Zu izan zara?",
+    "Session backup key:": "Saioaren babes-kopia gakoa:"
 }

From 39889a6e2b285f5b3f9ea7f3f0ffe1f1663c78b1 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Fri, 27 Mar 2020 15:36:21 +0000
Subject: [PATCH 1812/3235] Translated using Weblate (Finnish)

Currently translated at 92.0% (2062 of 2241 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 8f44d21c19..797acf90a6 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1174,7 +1174,7 @@
     "Only room administrators will see this warning": "Vain huoneen ylläpitäjät näkevät tämän varoituksen",
     "Add some now": "Lisää muutamia",
     "Error updating main address": "Pääosoitteen päivityksessä tapahtui virhe",
-    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Huoneen pääosoitteen päivityksessä tapahtui virhe. Se ei välttämättä ole sallittua tällä palevlimella tai kyseessä on väliaikainen virhe.",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Huoneen pääosoitteen päivityksessä tapahtui virhe. Se ei välttämättä ole sallittua tällä palvelimella tai kyseessä on väliaikainen virhe.",
     "Error creating alias": "Aliaksen luonnissa tapahtui virhe",
     "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Aliaksen luonnissa tapahtui virhe. Se ei välttämättä ole sallittua tällä palvelimella tai kyseessä on väliaikainen virhe.",
     "Error removing alias": "Aliaksen poistossa tapahtui virhe",
@@ -2052,5 +2052,59 @@
     "This bridge was provisioned by <user />.": "Tämän sillan tarjoaa käyttäjä <user />.",
     "This bridge is managed by <user />.": "Tätä siltaa hallinnoi käyttäjä <user />.",
     "Workspace: %(networkName)s": "Työtila: %(networkName)s",
-    "Channel: %(channelName)s": "Kanava: %(channelName)s"
+    "Channel: %(channelName)s": "Kanava: %(channelName)s",
+    "outdated": "vanhentunut",
+    "up to date": "ajan tasalla",
+    "Delete %(count)s sessions|other": "Poista %(count)s istuntoa",
+    "Enable": "Ota käyttöön",
+    "Backup is not signed by any of your sessions": "Mikään istuntosi ei ole allekirjoittanut varmuuskopiota",
+    "Theme added!": "Teema lisätty!",
+    "Add theme": "Lisää teema",
+    "Scroll to most recent messages": "Vieritä tuoreimpiin viesteihin",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Huoneen vaihtoehtoisten osoitteiden päivittämisessä tapahtui virhe. Palvelin ei ehkä salli sitä tai syynä oli tilapäinen virhe.",
+    "You don't have permission to delete the alias.": "Sinulla ei ole lupaa poistaa aliasta.",
+    "Local address": "Paikallinen osoite",
+    "Local Addresses": "Paikalliset osoitteet",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Aseta osoitteita tälle huoneelle, jotta käyttäjät löytävät tämän huoneen kotipalvelimeltasi (%(localDomain)s)",
+    "Your messages are not secure": "Viestisi eivät ole turvassa",
+    "Accepting …": "Hyväksytään …",
+    "Declining …": "Kieltäydytään …",
+    "Enter a server name": "Syötä palvelimen nimi",
+    "Looks good": "Hyvältä näyttää",
+    "Can't find this server or its room list": "Tätä palvelinta tai sen huoneluetteloa ei löydy",
+    "All rooms": "Kaikki huoneet",
+    "Your server": "Palvelimesi",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Haluatko varmasti poistaa palvelimen <b>%(serverName)s</b>",
+    "Remove server": "Poista palvelin",
+    "Matrix": "Matrix",
+    "Add a new server": "Lisää uusi palvelin",
+    "Server name": "Palvelimen nimi",
+    "Add a new server...": "Lisää uusi palvelin...",
+    "If you didn’t sign in to this session, your account may be compromised.": "Jos et kirjautunut tähän istuntoon, käyttäjätilisi saattaa olla vaarantunut.",
+    "This wasn't me": "Tämä en ollut minä",
+    "Unknown sessions": "Tuntemattomat istunnot",
+    "Waiting…": "Odotetaan…",
+    "Disable": "Poista käytöstä",
+    "Calls": "Puhelut",
+    "Room List": "Huoneluettelo",
+    "Autocomplete": "Automaattinen täydennys",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Vaihto",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Lihavointi päälle/pois",
+    "Toggle Italics": "Kursivointi päälle/pois",
+    "Toggle Quote": "Lainaus päälle/pois",
+    "New line": "Rivinvaihto",
+    "Toggle microphone mute": "Mikrofonin mykistys päälle/pois",
+    "Toggle video on/off": "Video päälle/pois",
+    "Scroll up/down in the timeline": "Vieritä aikajanaa ylöspäin/alaspäin",
+    "Activate selected button": "Aktivoi valittu painike",
+    "Cancel autocomplete": "Peruuta automaattinen täydennys",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Välilyönti",
+    "End": "End"
 }

From 984f9ea4aabbac033ee70470713ddff948b41ba3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 27 Mar 2020 13:44:32 -0600
Subject: [PATCH 1813/3235] Fix fallback auth link to act and look like a link

---
 .../views/auth/InteractiveAuthEntryComponents.js           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index aaf8c88440..db73467ff7 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -598,7 +598,10 @@ export const FallbackAuthEntry = createReactClass({
         }
     },
 
-    _onShowFallbackClick: function() {
+    _onShowFallbackClick: function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
         const url = this.props.matrixClient.getFallbackAuthUrl(
             this.props.loginType,
             this.props.authSessionId,
@@ -627,7 +630,7 @@ export const FallbackAuthEntry = createReactClass({
         }
         return (
             <div>
-                <a ref={this._fallbackButton} onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
+                <a href="" ref={this._fallbackButton} onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
                 {errorSection}
             </div>
         );

From 1e30bdb73956e0d103b5d5168645aa635cca6b33 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 27 Mar 2020 14:39:59 -0600
Subject: [PATCH 1814/3235] Early proof of concept for SSO UIA

It works well enough to start doing design.
---
 .../auth/InteractiveAuthEntryComponents.js    | 66 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  1 +
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index db73467ff7..9f0d5f1534 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -565,6 +565,67 @@ export const MsisdnAuthEntry = createReactClass({
     },
 });
 
+export class SSOAuthEntry extends React.Component {
+    static propTypes = {
+        matrixClient: PropTypes.object.isRequired,
+        authSessionId: PropTypes.string.isRequired,
+        loginType: PropTypes.string.isRequired,
+        submitAuthDict: PropTypes.func.isRequired,
+        errorText: PropTypes.string,
+    };
+
+    static LOGIN_TYPE = "m.login.sso";
+    static UNSTABLE_LOGIN_TYPE = "org.matrix.login.sso";
+
+    static STAGE_PREAUTH = 1; // button to start SSO
+    static STAGE_POSTAUTH = 2; // button to confirm SSO completed
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            // We actually send the user through fallback auth so we don't have to
+            // deal with a redirect back to us, losing application context.
+            ssoUrl: props.matrixClient.getFallbackAuthUrl(
+                this.props.loginType,
+                this.props.authSessionId,
+            ),
+            stage: SSOAuthEntry.STAGE_PREAUTH,
+        };
+    }
+
+    onStartAuthClick = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+
+        // Note: We don't use PlatformPeg's startSsoAuth functions because we almost
+        // certainly will need to open the thing in a new tab to avoid loosing application
+        // context.
+
+        window.open(e.target.href, '_blank');
+        this.setState({stage: SSOAuthEntry.STAGE_POSTAUTH});
+    };
+
+    onConfirmClick = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.props.submitAuthDict({});
+    };
+
+    render () {
+        if (this.state.stage === SSOAuthEntry.STAGE_PREAUTH) {
+            return <a href={this.state.ssoUrl} target='_blank' rel='noopener' onClick={this.onStartAuthClick}>
+                {_t("Single Sign On")}
+            </a>;
+        } else {
+            return <a href='' target='_blank' rel='noopener' onClick={this.onConfirmClick}>
+                {_t("Continue")}
+            </a>;
+        }
+    }
+}
+
 export const FallbackAuthEntry = createReactClass({
     displayName: 'FallbackAuthEntry',
 
@@ -643,11 +704,12 @@ const AuthEntryComponents = [
     EmailIdentityAuthEntry,
     MsisdnAuthEntry,
     TermsAuthEntry,
+    SSOAuthEntry,
 ];
 
 export default function getEntryComponentForLoginType(loginType) {
     for (const c of AuthEntryComponents) {
-        if (c.LOGIN_TYPE == loginType) {
+        if (c.LOGIN_TYPE === loginType || c.UNSTABLE_LOGIN_TYPE === loginType) {
             return c;
         }
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6e195aa16..ed89068f91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1831,6 +1831,7 @@
     "Please enter the code it contains:": "Please enter the code it contains:",
     "Code": "Code",
     "Submit": "Submit",
+    "Single Sign On": "Single Sign On",
     "Start authentication": "Start authentication",
     "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
     "Your Modular server": "Your Modular server",

From 37619dd127b8d76858452bac016c40f49cfed094 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Sat, 28 Mar 2020 00:21:17 +0000
Subject: [PATCH 1815/3235] Show red shield for users that become unverified

For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.

Fixes https://github.com/vector-im/riot-web/issues/12808
---
 src/components/views/right_panel/UserInfo.js | 6 ++++--
 src/components/views/rooms/MemberTile.js     | 6 +++---
 src/utils/ShieldUtils.ts                     | 8 ++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index ee47f08aa2..a2081dc9e4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -68,8 +68,10 @@ export const getE2EStatus = (cli, userId, devices) => {
         return hasUnverifiedDevice ? "warning" : "verified";
     }
     const isMe = userId === cli.getUserId();
-    const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
-    if (!userVerified) return "normal";
+    const userTrust = cli.checkUserTrust(userId);
+    if (!userTrust.isCrossSigningVerified()) {
+        return userTrust.wasCrossSigningVerified() ? "warning" : "normal";
+    }
 
     const anyDeviceUnverified = devices.some(device => {
         const { deviceId } = device;
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index a0e900b5fc..bf2a1bee23 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -121,10 +121,10 @@ export default createReactClass({
         const cli = MatrixClientPeg.get();
         const { userId } = this.props.member;
         const isMe = userId === cli.getUserId();
-        const userVerified = cli.checkUserTrust(userId).isCrossSigningVerified();
-        if (!userVerified) {
+        const userTrust = cli.checkUserTrust(userId);
+        if (!userTrust.isCrossSigningVerified()) {
             this.setState({
-                e2eStatus: "normal",
+                e2eStatus: userTrust.wasCrossSigningVerified() ? "warning" : "normal",
             });
             return;
         }
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 3c7cae8c8d..f427b0b0b6 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -5,6 +5,7 @@ interface Client {
     getUserId: () => string;
     checkUserTrust: (userId: string) => {
         isCrossSigningVerified: () => boolean
+        wasCrossSigningVerified: () => boolean
     };
     getStoredDevicesForUser: (userId: string) => Promise<[{ deviceId: string }]>;
     checkDeviceTrust: (userId: string, deviceId: string) => {
@@ -29,6 +30,13 @@ export async function shieldStatusForMembership(client: Client, room: Room): Pro
             verified : unverified).push(userId);
         });
 
+    /* Alarm if any unverified users were verified before. */
+    for (const userId of unverified) {
+        if (client.checkUserTrust(userId).wasCrossSigningVerified()) {
+            return "warning";
+        }
+    }
+
     /* Check all verified user devices. */
     /* Don't alarm if no other users are verified  */
     const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified

From f586aaab358004217ecc7071c0acf77c60605e19 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 28 Mar 2020 00:51:01 +0000
Subject: [PATCH 1816/3235] Fix ugly scrollbars in TabbedView (settings),
 emojipicker and widgets

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/TabbedView.tsx        | 5 +++--
 src/components/views/emojipicker/EmojiPicker.js | 5 +++--
 src/components/views/rooms/AuxPanel.js          | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index ea485acc1a..c0e0e58db8 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -20,6 +20,7 @@ import * as React from "react";
 import {_t} from '../../languageHandler';
 import * as PropTypes from "prop-types";
 import * as sdk from "../../index";
+import AutoHideScrollbar from './AutoHideScrollbar';
 import { ReactNode } from "react";
 
 /**
@@ -113,9 +114,9 @@ export default class TabbedView extends React.Component<IProps, IState> {
     private _renderTabPanel(tab: Tab): React.ReactNode {
         return (
             <div className="mx_TabbedView_tabPanel" key={"mx_tabpanel_" + tab.label}>
-                <div className='mx_TabbedView_tabPanelContent'>
+                <AutoHideScrollbar className='mx_TabbedView_tabPanelContent'>
                     {tab.body}
-                </div>
+                </AutoHideScrollbar>
             </div>
         );
     }
diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index ca8f0c0565..cacc15a5f9 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -22,6 +22,7 @@ import { _t } from '../../../languageHandler';
 
 import * as recent from '../../../emojipicker/recent';
 import {DATA_BY_CATEGORY, getEmojiFromUnicode} from "../../../emoji";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 export const CATEGORY_HEADER_HEIGHT = 22;
 export const EMOJI_HEIGHT = 37;
@@ -214,7 +215,7 @@ class EmojiPicker extends React.Component {
             <div className="mx_EmojiPicker">
                 <Header categories={this.categories} defaultCategory="recent" onAnchorClick={this.scrollToCategory} />
                 <Search query={this.state.filter} onChange={this.onChangeFilter} />
-                <div className="mx_EmojiPicker_body" ref={this.bodyRef} onScroll={this.onScroll}>
+                <AutoHideScrollbar className="mx_EmojiPicker_body" wrappedRef={e => this.bodyRef.current = e} onScroll={this.onScroll}>
                     {this.categories.map(category => {
                         const emojis = this.memoizedDataByCategory[category.id];
                         const categoryElement = (<Category key={category.id} id={category.id} name={category.name}
@@ -226,7 +227,7 @@ class EmojiPicker extends React.Component {
                         heightBefore += height;
                         return categoryElement;
                     })}
-                </div>
+                </AutoHideScrollbar>
                 {this.state.previewEmoji || !this.props.showQuickReactions
                     ? <Preview emoji={this.state.previewEmoji} />
                     : <QuickReactions onClick={this.onClickEmoji} selectedEmojis={this.props.selectedEmojis} /> }
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 0b34739e0e..e102b0dba4 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -27,6 +27,7 @@ import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 
 export default createReactClass({
@@ -264,14 +265,14 @@ export default createReactClass({
         }
 
         return (
-            <div className={classes} style={style} >
+            <AutoHideScrollbar className={classes} style={style} >
                 { stateViews }
                 { appsDrawer }
                 { fileDropTarget }
                 { callView }
                 { conferenceCallNotification }
                 { this.props.children }
-            </div>
+            </AutoHideScrollbar>
         );
     },
 });

From 164854b4f8fff0354347048f1de422ce0757e0e4 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 28 Mar 2020 02:43:37 +0000
Subject: [PATCH 1817/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2241 of 2241 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 58ebe3767a..a2d6f82c6b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2304,5 +2304,6 @@
     "In encrypted rooms, verify all users to ensure it’s secure.": "在已加密的聊天室中，驗證所有使用者以確保其安全。",
     "Verified": "已驗證",
     "Verification cancelled": "驗證已取消",
-    "Compare emoji": "比較顏文字"
+    "Compare emoji": "比較顏文字",
+    "Session backup key:": "工作階段備份金鑰："
 }

From b7d33a4c9ba1e824f1b1cfe8f82deb5801f7b7a3 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 28 Mar 2020 12:54:38 +0000
Subject: [PATCH 1818/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2241 of 2241 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 | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index f4bb6ec244..582b635ee1 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2213,7 +2213,7 @@
     "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se vi ne povas iun atingi, <button>uzu vian rehavan ŝlosilon aŭ pasfrazon.</button>",
     "Manually Verify by Text": "Permane kontroli tekste",
     "Interactively verify by Emoji": "Interage kontroli bildosigne",
-    "Self signing private key:": "Memsubskriba privata ŝlosilo",
+    "Self signing private key:": "Memsubskriba privata ŝlosilo:",
     "cached locally": "kaŝmemorita loke",
     "not found locally": "ne trovita loke",
     "User signing private key:": "Uzantosubskriba privata ŝlosilo:",
@@ -2233,7 +2233,7 @@
     "Signature upload success": "Alŝuto de subskribo sukcesis",
     "Signature upload failed": "Alŝuto de subskribo malsukcesis",
     "Confirm by comparing the following with the User Settings in your other session:": "Konfirmu per komparo de la sekva kun la agardoj de uzanto en via alia salutaĵo:",
-    "Confirm this user's session by comparing the following with their User Settings:": "Konfirmu la salutaĵon de ĉi tiu uzanto per komparo de la sekva kun ĝiaj agordoj de uzanto",
+    "Confirm this user's session by comparing the following with their User Settings:": "Konfirmu la salutaĵon de ĉi tiu uzanto per komparo de la sekva kun ĝiaj agordoj de uzanto:",
     "If they don't match, the security of your communication may be compromised.": "Se ili ne akordas, la sekureco de via komunikado eble estas rompita.",
     "Navigation": "Navigado",
     "Calls": "Vokoj",
@@ -2274,5 +2274,20 @@
     "Esc": "Eskapa klavo",
     "Enter": "Eniga klavo",
     "Space": "Spaco",
-    "End": "Finen-klavo"
+    "End": "Finen-klavo",
+    "Whether you're using Riot as an installed Progressive Web App": "Ĉu vi uzas Rioton kiel Progresan retan aplikaĵon",
+    "Review Sessions": "Rekontroli salutaĵojn",
+    "Unverified login. Was this you?": "Nekontrolita salutaĵo. Ĉu tio estis vi?",
+    "Manually verify all remote sessions": "Permane kontroli ĉiujn forajn salutaĵojn",
+    "Update your secure storage": "Ĝisdatigi vian sekuran deponejon",
+    "Session backup key:": "Savkopia ŝlosilo de salutaĵo:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Unuope kontroli ĉiun salutaĵon de uzanto por marki ĝin fidata, ne fidante transire subskribitajn aparatojn.",
+    "Invalid theme schema.": "Nevalida skemo de haŭto.",
+    "Mod": "Reguligisto",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "En ĉifritaj ĉambroj, viaj mesaĝoj estas sekurigitaj, kaj nur vi kaj la ricevanto havas la unikajn malĉifrajn ŝlosilojn.",
+    "Verify all users in a room to ensure it's secure.": "Kontroli ĉiujn uzantojn en ĉambro por certigi, ke ĝi sekuras.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "En ĉifritaj ĉambroj, kontroli ĉiujn uzantojn por certigi, ke ili sekuras.",
+    "Verified": "Kontrolita",
+    "Verification cancelled": "Kontrolo nuliĝis",
+    "Compare emoji": "Kompari bildsignojn"
 }

From 78e46f04768249fb2aa3f62b5dc1d49f0b62dfae Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 27 Mar 2020 19:11:58 +0000
Subject: [PATCH 1819/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2241 of 2241 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 271d7c5bc7..68cad86807 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2300,5 +2300,6 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Szóköz",
-    "End": "End"
+    "End": "End",
+    "Session backup key:": "Munkamenet másolat kulcs:"
 }

From b2d905ef2c7c53ba4f07e442a6414c1a7c0976be Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 20:07:32 +0100
Subject: [PATCH 1820/3235] Make FormatButton use AccessibleButtons

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/MessageComposerFormatBar.js      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js
index 79ae9f34e8..42d54f5987 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.js
@@ -19,12 +19,13 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import classNames from 'classnames';
+import AccessibleButton from "../elements/AccessibleButton";
 
 export default class MessageComposerFormatBar extends React.PureComponent {
     static propTypes = {
         onAction: PropTypes.func.isRequired,
         shortcuts: PropTypes.object.isRequired,
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -64,7 +65,7 @@ class FormatButton extends React.PureComponent {
         icon: PropTypes.string.isRequired,
         shortcut: PropTypes.string,
         visible: PropTypes.bool,
-    }
+    };
 
     render() {
         const InteractiveTooltip = sdk.getComponent('elements.InteractiveTooltip');
@@ -82,11 +83,12 @@ class FormatButton extends React.PureComponent {
 
         return (
             <InteractiveTooltip content={tooltipContent} forceHidden={!this.props.visible}>
-                <span aria-label={this.props.label}
-                   role="button"
-                   onClick={this.props.onClick}
-                   className={className}>
-                </span>
+                <AccessibleButton
+                    as="span"
+                    role="button"
+                    onClick={this.props.onClick}
+                    aria-label={this.props.label}
+                    className={className} />
             </InteractiveTooltip>
         );
     }

From 2ff16844e5b1b97f3de5ca391a96b2ad59129fc4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 20:12:10 +0100
Subject: [PATCH 1821/3235] Make ELS somewhat more accessible

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/elements/EventListSummary.js        | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index 7a69398071..79c84293c2 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -20,6 +20,7 @@ import MemberAvatar from '../avatars/MemberAvatar';
 import { _t } from '../../../languageHandler';
 import {MatrixEvent, RoomMember} from "matrix-js-sdk";
 import {useStateToggle} from "../../../hooks/useStateToggle";
+import AccessibleButton from "./AccessibleButton";
 
 const EventListSummary = ({events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText}) => {
     const [expanded, toggleExpanded] = useStateToggle(startExpanded);
@@ -42,24 +43,15 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande
         );
     }
 
+    let body;
     if (expanded) {
-        return (
-            <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
-                <div className={"mx_EventListSummary_toggle"} onClick={toggleExpanded}>
-                    { _t('collapse') }
-                </div>
-                <div className="mx_EventListSummary_line">&nbsp;</div>
-                { children }
-            </div>
-        );
-    }
-
-    const avatars = summaryMembers.map((m) => <MemberAvatar key={m.userId} member={m} width={14} height={14} />);
-    return (
-        <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
-            <div className={"mx_EventListSummary_toggle"} onClick={toggleExpanded}>
-                { _t('expand') }
-            </div>
+        body = <React.Fragment>
+            <div className="mx_EventListSummary_line">&nbsp;</div>
+            { children }
+        </React.Fragment>;
+    } else {
+        const avatars = summaryMembers.map((m) => <MemberAvatar key={m.userId} member={m} width={14} height={14} />);
+        body = (
             <div className="mx_EventTile_line">
                 <div className="mx_EventTile_info">
                     <span className="mx_EventListSummary_avatars" onClick={toggleExpanded}>
@@ -70,6 +62,15 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande
                     </span>
                 </div>
             </div>
+        );
+    }
+
+    return (
+        <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
+            <AccessibleButton className="mx_EventListSummary_toggle" onClick={toggleExpanded} aria-expanded={expanded}>
+                { expanded ? _t('collapse') : _t('expand') }
+            </AccessibleButton>
+            { body }
         </div>
     );
 };

From 2a54a8aa859a5a20e4693211ca1e0534587a581f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 20:33:01 +0100
Subject: [PATCH 1822/3235] Escape should cancel a reply

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/SendMessageComposer.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 90c37780fe..d87d99dc46 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -131,8 +131,13 @@ export default class SendMessageComposer extends React.Component {
             this.onVerticalArrow(event, false);
         } else if (this._prepareToEncrypt) {
             this._prepareToEncrypt();
+        } else if (event.key === Key.ESCAPE) {
+            dis.dispatch({
+                action: 'reply_to_event',
+                event: null,
+            });
         }
-    }
+    };
 
     onVerticalArrow(e, up) {
         // arrows from an initial-caret composer navigates recent messages to edit

From acc41585abf3c5608a9661b7fb552ca488d713a4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 20:33:27 +0100
Subject: [PATCH 1823/3235] Fix CmdOrCtrl+K for collapsed LHS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 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 52002f0591..9d17cd8647 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -657,6 +657,7 @@ export default createReactClass({
                     collapseLhs: true,
                 });
                 break;
+            case 'focus_room_filter': // for CtrlOrCmd+K to work by expanding the left panel first
             case 'show_left_panel':
                 this.setState({
                     collapseLhs: false,

From 167f953ac7653df88ee7378d846147d9ba8b2721 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 20:35:35 +0100
Subject: [PATCH 1824/3235] Document Composer:Escape to cancel a reply

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/KeyboardShortcuts.tsx | 5 +++++
 src/i18n/strings/en_EN.json             | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index c2739beefa..bcbf3d6810 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -118,6 +118,11 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.ARROW_DOWN,
             }],
             description: _td("Navigate composer history"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Cancel replying to a message"),
         },
     ],
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6e195aa16..2f19fc982c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2216,6 +2216,7 @@
     "Navigate recent messages to edit": "Navigate recent messages to edit",
     "Jump to start/end of the composer": "Jump to start/end of the composer",
     "Navigate composer history": "Navigate composer history",
+    "Cancel replying to a message": "Cancel replying to a message",
     "Toggle microphone mute": "Toggle microphone mute",
     "Toggle video on/off": "Toggle video on/off",
     "Jump to room search": "Jump to room search",

From 19aae087e032157a7f2787f3ca39685c4315ce7b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 22:59:15 +0100
Subject: [PATCH 1825/3235] Field: make id optional, generate one if not
 provided

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/eventindex/ManageEventIndexDialog.js    |  1 -
 .../secretstorage/CreateSecretStorageDialog.js      |  3 ---
 src/components/structures/auth/ForgotPassword.js    |  3 ---
 src/components/structures/auth/SoftLogout.js        |  1 -
 .../views/auth/InteractiveAuthEntryComponents.js    |  1 -
 src/components/views/auth/ModularServerConfig.js    |  3 ++-
 src/components/views/auth/PasswordLogin.js          |  5 -----
 src/components/views/auth/RegistrationForm.js       |  2 --
 src/components/views/auth/ServerConfig.js           |  5 +++--
 src/components/views/dialogs/BugReportDialog.js     |  2 --
 src/components/views/dialogs/CreateRoomDialog.js    |  6 +++---
 .../views/dialogs/DeactivateAccountDialog.js        |  1 -
 src/components/views/dialogs/DevtoolsDialog.js      |  2 +-
 src/components/views/dialogs/ReportEventDialog.js   |  1 -
 src/components/views/dialogs/TextInputDialog.js     |  1 -
 src/components/views/elements/EditableItemList.js   |  2 +-
 src/components/views/elements/Field.js              | 13 +++++++++++--
 src/components/views/elements/PowerSelector.js      |  4 ++--
 src/components/views/elements/RoomAliasField.js     |  2 --
 src/components/views/room_settings/AliasSettings.js |  1 -
 .../views/room_settings/RoomProfileSettings.js      |  2 +-
 src/components/views/settings/ChangePassword.js     |  4 +---
 src/components/views/settings/ProfileSettings.js    |  2 +-
 src/components/views/settings/SetIdServer.js        |  4 ++--
 .../views/settings/account/EmailAddresses.js        |  2 +-
 .../views/settings/account/PhoneNumbers.js          |  4 ++--
 .../views/settings/discovery/PhoneNumbers.js        |  2 +-
 .../settings/tabs/user/GeneralUserSettingsTab.js    |  3 +--
 .../settings/tabs/user/MjolnirUserSettingsTab.js    |  2 --
 .../tabs/user/PreferencesUserSettingsTab.js         |  3 ---
 .../settings/tabs/user/VoiceUserSettingsTab.js      |  6 +++---
 31 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 371fdcaf64..3d7249b5a1 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -168,7 +168,6 @@ export default class ManageEventIndexDialog extends React.Component {
                         totalRooms: formatCountLong(this.state.roomCount),
                     })} <br />
                     <Field
-                        id={"crawlerSleepTimeMs"}
                         label={_t('Message downloading sleep time(ms)')}
                         type='number'
                         value={this.state.crawlerSleepTime}
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 35529fbc5b..78e750b817 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -412,7 +412,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <div>{_t("Enter your account password to confirm the upgrade:")}</div>
                 <div><Field
                     type="password"
-                    id="mx_CreateSecretStorage_accountPassword"
                     label={_t("Password")}
                     value={this.state.accountPassword}
                     onChange={this._onAccountPasswordChange}
@@ -497,7 +496,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <Field
                     type="password"
-                    id="mx_CreateSecretStorageDialog_passPhraseField"
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
                     value={this.state.passPhrase}
@@ -574,7 +572,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <Field
                     type="password"
-                    id="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseConfirmChange}
                     value={this.state.passPhraseConfirm}
                     className="mx_CreateSecretStorageDialog_passPhraseField"
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index e921951512..c849edf260 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -296,7 +296,6 @@ export default createReactClass({
             <form onSubmit={this.onSubmitForm}>
                 <div className="mx_AuthBody_fieldRow">
                     <Field
-                        id="mx_ForgotPassword_email"
                         name="reset_email" // define a name so browser's password autofill gets less confused
                         type="text"
                         label={_t('Email')}
@@ -307,7 +306,6 @@ export default createReactClass({
                 </div>
                 <div className="mx_AuthBody_fieldRow">
                     <Field
-                        id="mx_ForgotPassword_password"
                         name="reset_password"
                         type="password"
                         label={_t('Password')}
@@ -315,7 +313,6 @@ export default createReactClass({
                         onChange={this.onInputChanged.bind(this, "password")}
                     />
                     <Field
-                        id="mx_ForgotPassword_passwordConfirm"
                         name="reset_password_confirm"
                         type="password"
                         label={_t('Confirm')}
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index d38fcf3883..287f7e5605 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -213,7 +213,6 @@ export default class SoftLogout extends React.Component {
                     <p>{introText}</p>
                     {error}
                     <Field
-                        id="softlogout_password"
                         type="password"
                         label={_t("Password")}
                         onChange={this.onPasswordChange}
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index aaf8c88440..e731b4cc01 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -145,7 +145,6 @@ export const PasswordAuthEntry = createReactClass({
                 <p>{ _t("Confirm your identity by entering your account password below.") }</p>
                 <form onSubmit={this._onSubmit} className="mx_InteractiveAuthEntryComponents_passwordSection">
                     <Field
-                        id="mx_InteractiveAuthEntryComponents_password"
                         className={passwordBoxClass}
                         type="password"
                         name="passwordField"
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index d8ce145e20..1216202a23 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -106,7 +106,8 @@ export default class ModularServerConfig extends ServerConfig {
                 )}
                 <form onSubmit={this.onSubmit} autoComplete="off" action={null}>
                     <div className="mx_ServerConfig_fields">
-                        <Field id="mx_ServerConfig_hsUrl"
+                        <Field
+                            id="mx_ServerConfig_hsUrl"
                             label={_t("Server Name")}
                             placeholder={this.props.serverConfig.hsUrl}
                             value={this.state.hsUrl}
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 11717fac00..e64b8360c3 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -193,7 +193,6 @@ export default class PasswordLogin extends React.Component {
                 classes.error = this.props.loginIncorrect && !this.state.username;
                 return <Field
                     className={classNames(classes)}
-                    id="mx_PasswordLogin_email"
                     name="username" // make it a little easier for browser's remember-password
                     key="email_input"
                     type="text"
@@ -209,7 +208,6 @@ export default class PasswordLogin extends React.Component {
                 classes.error = this.props.loginIncorrect && !this.state.username;
                 return <Field
                     className={classNames(classes)}
-                    id="mx_PasswordLogin_username"
                     name="username" // make it a little easier for browser's remember-password
                     key="username_input"
                     type="text"
@@ -233,7 +231,6 @@ export default class PasswordLogin extends React.Component {
 
                 return <Field
                     className={classNames(classes)}
-                    id="mx_PasswordLogin_phoneNumber"
                     name="phoneNumber"
                     key="phone_input"
                     type="text"
@@ -290,7 +287,6 @@ export default class PasswordLogin extends React.Component {
                 <div className="mx_Login_type_container">
                     <label className="mx_Login_type_label">{ _t('Sign in with') }</label>
                     <Field
-                        id="mx_PasswordLogin_type"
                         element="select"
                         value={this.state.loginType}
                         onChange={this.onLoginTypeChange}
@@ -328,7 +324,6 @@ export default class PasswordLogin extends React.Component {
                     {loginField}
                     <Field
                         className={pwFieldClass}
-                        id="mx_PasswordLogin_password"
                         type="password"
                         name="password"
                         label={_t('Password')}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 8ca454dabd..a89f8c6298 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -470,7 +470,6 @@ export default createReactClass({
             _t("Email") :
             _t("Email (optional)");
         return <Field
-            id="mx_RegistrationForm_email"
             ref={field => this[FIELD_EMAIL] = field}
             type="text"
             label={emailPlaceholder}
@@ -524,7 +523,6 @@ export default createReactClass({
             onOptionChange={this.onPhoneCountryChange}
         />;
         return <Field
-            id="mx_RegistrationForm_phoneNumber"
             ref={field => this[FIELD_PHONE_NUMBER] = field}
             type="text"
             label={phoneLabel}
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index a9e26b8fb7..37517c7484 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -223,7 +223,8 @@ export default class ServerConfig extends React.PureComponent {
                     {sub}
                 </a>,
             })}
-            <Field id="mx_ServerConfig_hsUrl"
+            <Field
+                id="mx_ServerConfig_hsUrl"
                 label={_t("Homeserver URL")}
                 placeholder={this.props.serverConfig.hsUrl}
                 value={this.state.hsUrl}
@@ -246,7 +247,7 @@ export default class ServerConfig extends React.PureComponent {
                     {sub}
             </a>,
             })}
-            <Field id="mx_ServerConfig_isUrl"
+            <Field
                 label={_t("Identity Server URL")}
                 placeholder={this.props.serverConfig.isUrl}
                 value={this.state.isUrl || ''}
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index fe95041373..6e337d53dc 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -166,7 +166,6 @@ export default class BugReportDialog extends React.Component {
                         ) }
                     </b></p>
                     <Field
-                        id="mx_BugReportDialog_issueUrl"
                         type="text"
                         className="mx_BugReportDialog_field_input"
                         label={_t("GitHub issue")}
@@ -175,7 +174,6 @@ export default class BugReportDialog extends React.Component {
                         placeholder="https://github.com/vector-im/riot-web/issues/..."
                     />
                     <Field
-                        id="mx_BugReportDialog_notes"
                         className="mx_BugReportDialog_field_input"
                         element="textarea"
                         label={_t("Notes")}
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 9380226381..77014db21d 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -174,7 +174,7 @@ export default createReactClass({
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
-                    <RoomAliasField id="alias" ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} value={this.state.alias} />
+                    <RoomAliasField ref={ref => this._aliasFieldRef = ref} onChange={this.onAliasChange} domain={domain} value={this.state.alias} />
                 </div>
             );
         } else {
@@ -188,8 +188,8 @@ export default createReactClass({
             >
                 <form onSubmit={this.onOk} onKeyDown={this._onKeyDown}>
                     <div className="mx_Dialog_content">
-                        <Field id="name" ref={ref => this._nameFieldRef = ref} label={ _t('Name') } onChange={this.onNameChange} onValidate={this.onNameValidate} value={this.state.name} className="mx_CreateRoomDialog_name" />
-                        <Field id="topic" label={ _t('Topic (optional)') } onChange={this.onTopicChange} value={this.state.topic} />
+                        <Field ref={ref => this._nameFieldRef = ref} label={ _t('Name') } onChange={this.onNameChange} onValidate={this.onNameValidate} value={this.state.name} className="mx_CreateRoomDialog_name" />
+                        <Field label={ _t('Topic (optional)') } onChange={this.onTopicChange} value={this.state.topic} />
                         <LabelledToggleSwitch label={ _t("Make this room public")} onChange={this.onPublicChange} value={this.state.isPublic} />
                         { privateLabel }
                         { publicLabel }
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index d7468933df..4c14f356e4 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -174,7 +174,6 @@ export default class DeactivateAccountDialog extends React.Component {
 
                         <p>{ _t("To continue, please enter your password:") }</p>
                         <Field
-                            id="mx_DeactivateAccountDialog_password"
                             type="password"
                             label={_t('Password')}
                             onChange={this._onPasswordFieldChange}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 348965582b..0f3fa8f5b5 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -302,7 +302,7 @@ class FilteredList extends React.PureComponent {
     render() {
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return <div>
-            <Field id="DevtoolsDialog_FilteredList_filter" label={_t('Filter results')} autoFocus={true} size={64}
+            <Field label={_t('Filter results')} autoFocus={true} size={64}
                    type="text" autoComplete="off" value={this.props.query} onChange={this.onQuery}
                    className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
                    // force re-render so that autoFocus is applied when this component is re-used
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 99853582dd..f5509dec4d 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -123,7 +123,6 @@ export default class ReportEventDialog extends PureComponent {
                     </p>
                     {adminMessage}
                     <Field
-                        id="mx_ReportEventDialog_reason"
                         className="mx_ReportEventDialog_reason"
                         element="textarea"
                         label={_t("Reason")}
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index b9f6f6ebce..b6b29f4350 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -116,7 +116,6 @@ export default createReactClass({
                         </div>
                         <div>
                             <Field
-                                id="mx_TextInputDialog_field"
                                 className="mx_TextInputDialog_input"
                                 ref={this._field}
                                 type="text"
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 6e649e777a..50d5a3d10f 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -121,7 +121,7 @@ export default class EditableItemList extends React.Component {
         return (
             <form onSubmit={this._onItemAdded} autoComplete="off"
                   noValidate={true} className="mx_EditableItemList_newItem">
-                <Field id={`mx_EditableItemList_new_${this.props.id}`} label={this.props.placeholder} type="text"
+                <Field label={this.props.placeholder} type="text"
                        autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged}
                        list={this.props.suggestionsListId} />
                 <AccessibleButton onClick={this._onItemAdded} kind="primary" type="submit">
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 8583c91a01..862b2cda96 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -23,9 +23,15 @@ import { debounce } from 'lodash';
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
 
+const BASE_ID = "mx_Field";
+let count = 1;
+function getId() {
+    return `${BASE_ID}_${count++}`;
+}
+
 export default class Field extends React.PureComponent {
     static propTypes = {
-        // The field's ID, which binds the input and label together.
+        // The field's ID, which binds the input and label together. Immutable.
         id: PropTypes.string.isRequired,
         // The element to create. Defaults to "input".
         // To define options for a select, use <Field><option ... /></Field>
@@ -70,6 +76,8 @@ export default class Field extends React.PureComponent {
             feedback: undefined,
             focused: false,
         };
+
+        this.id = this.props.id || getId();
     }
 
     onFocus = (ev) => {
@@ -167,6 +175,7 @@ export default class Field extends React.PureComponent {
         inputProps.type = inputProps.type || "text";
         inputProps.ref = input => this.input = input;
         inputProps.placeholder = inputProps.placeholder || inputProps.label;
+        inputProps.id = this.id; // this overwrites the id from props
 
         inputProps.onFocus = this.onFocus;
         inputProps.onChange = this.onChange;
@@ -211,7 +220,7 @@ export default class Field extends React.PureComponent {
         return <div className={fieldClasses}>
             {prefixContainer}
             {fieldInput}
-            <label htmlFor={this.props.id}>{this.props.label}</label>
+            <label htmlFor={this.id}>{this.props.label}</label>
             {postfixContainer}
             {fieldTooltip}
         </div>;
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index 2f4c08922a..eff14979a9 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -132,7 +132,7 @@ export default createReactClass({
         const label = typeof this.props.label === "undefined" ? _t("Power level") : this.props.label;
         if (this.state.custom) {
             picker = (
-                <Field id={`powerSelector_custom_${this.props.powerLevelKey}`} type="number"
+                <Field type="number"
                        label={label} max={this.props.maxValue}
                        onBlur={this.onCustomBlur} onKeyDown={this.onCustomKeyDown} onChange={this.onCustomChange}
                        value={String(this.state.customValue)} disabled={this.props.disabled} />
@@ -151,7 +151,7 @@ export default createReactClass({
             });
 
             picker = (
-                <Field id={`powerSelector_notCustom_${this.props.powerLevelKey}`} element="select"
+                <Field element="select"
                        label={label} onChange={this.onSelectChange}
                        value={String(this.state.selectValue)} disabled={this.props.disabled}>
                     {options}
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index b38047cd3b..d3de6a5d34 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -23,7 +23,6 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 // Controlled form component wrapping Field for inputting a room alias scoped to a given domain
 export default class RoomAliasField extends React.PureComponent {
     static propTypes = {
-        id: PropTypes.string.isRequired,
         domain: PropTypes.string.isRequired,
         onChange: PropTypes.func,
         value: PropTypes.string.isRequired,
@@ -50,7 +49,6 @@ export default class RoomAliasField extends React.PureComponent {
                     className="mx_RoomAliasField"
                     prefix={poundSign}
                     postfix={domain}
-                    id={this.props.id}
                     ref={ref => this._fieldRef = ref}
                     onValidate={this._onValidate}
                     placeholder={_t("e.g. my-room")}
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 857a80c34a..3994d78390 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -62,7 +62,6 @@ class EditableAliasesList extends EditableItemList {
                 className="mx_EditableItemList_newItem"
             >
                 <RoomAliasField
-                    id={`mx_EditableItemList_new_${this.props.id}`}
                     ref={this._aliasField}
                     onChange={onChange}
                     value={this.props.newItem || ""}
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index a1816df71a..f657fbf509 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -155,7 +155,7 @@ export default class RoomProfileSettings extends React.Component {
                        onChange={this._onAvatarChanged} accept="image/*" />
                 <div className="mx_ProfileSettings_profile">
                     <div className="mx_ProfileSettings_controls">
-                        <Field id="profileDisplayName" label={_t("Room Name")}
+                        <Field label={_t("Room Name")}
                                type="text" value={this.state.displayName} autoComplete="off"
                                onChange={this._onDisplayNameChanged} disabled={!this.state.canSetName} />
                         <Field id="profileTopic" label={_t("Room Topic")} disabled={!this.state.canSetTopic}
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index b51ff6cf9d..6607458b40 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -235,7 +235,7 @@ export default createReactClass({
         if (!this.state.cachedPassword) {
             currentPassword = (
                 <div className={rowClassName}>
-                    <Field id="mx_ChangePassword_oldPassword"
+                    <Field
                         type="password"
                         label={_t('Current password')}
                         value={this.state.oldPassword}
@@ -254,7 +254,6 @@ export default createReactClass({
                         { currentPassword }
                         <div className={rowClassName}>
                             <Field
-                                id="mx_ChangePassword_newPassword"
                                 type="password"
                                 label={passwordLabel}
                                 value={this.state.newPassword}
@@ -265,7 +264,6 @@ export default createReactClass({
                         </div>
                         <div className={rowClassName}>
                             <Field
-                                id="mx_ChangePassword_newPasswordConfirm"
                                 type="password"
                                 label={_t("Confirm password")}
                                 value={this.state.newPasswordConfirm}
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 72dfe7a983..23ab60423a 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -153,7 +153,7 @@ export default class ProfileSettings extends React.Component {
                             {this.state.userId}
                             {hostingSignup}
                         </p>
-                        <Field id="profileDisplayName" label={_t("Display Name")}
+                        <Field label={_t("Display Name")}
                                type="text" value={this.state.displayName} autoComplete="off"
                                onChange={this._onDisplayNameChanged} />
                     </div>
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index 995959dc90..cb37271452 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -403,8 +403,8 @@ export default class SetIdServer extends React.Component {
                 <span className="mx_SettingsTab_subsectionText">
                     {bodyText}
                 </span>
-                <Field label={_t("Enter a new identity server")}
-                    id="mx_SetIdServer_idServer"
+                <Field
+                    label={_t("Enter a new identity server")}
                     type="text"
                     autoComplete="off"
                     placeholder={this.state.defaultIdServer}
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index 5c7f9b24d3..ca66d5df65 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -237,7 +237,7 @@ export default class EmailAddresses extends React.Component {
                 {existingEmailElements}
                 <form onSubmit={this._onAddClick} autoComplete="off"
                       noValidate={true} className="mx_EmailAddresses_new">
-                    <Field id="mx_EmailAddressses_newEmailAddress"
+                    <Field
                         type="text"
                         label={_t("Email Address")}
                         autoComplete="off"
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index a59fd60eca..ad2dabd8ae 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -232,7 +232,7 @@ export default class PhoneNumbers extends React.Component {
                         {this.state.verifyError}
                     </div>
                     <form onSubmit={this._onContinueClick} autoComplete="off" noValidate={true}>
-                        <Field id="mx_PhoneNumbers_newPhoneNumberCode"
+                        <Field
                             type="text"
                             label={_t("Verification code")}
                             autoComplete="off"
@@ -262,7 +262,7 @@ export default class PhoneNumbers extends React.Component {
                 {existingPhoneElements}
                 <form onSubmit={this._onAddClick} autoComplete="off" noValidate={true} className="mx_PhoneNumbers_new">
                     <div className="mx_PhoneNumbers_input">
-                        <Field id="mx_PhoneNumbers_newPhoneNumber"
+                        <Field
                             type="text"
                             label={_t("Phone Number")}
                             autoComplete="off"
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 17fc99458f..9addcda093 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -208,7 +208,7 @@ export class PhoneNumber extends React.Component {
                     {this.state.verifyError}
                 </span>
                 <form onSubmit={this.onContinueClick} autoComplete="off" noValidate={true}>
-                    <Field id="mx_PhoneNumbers_newPhoneNumberCode"
+                    <Field
                         type="text"
                         label={_t("Verification code")}
                         autoComplete="off"
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index e9b30430a3..f67c56f3d6 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -422,7 +422,6 @@ export default class GeneralUserSettingsTab extends React.Component {
                         <Field
                             label={_t("Custom theme URL")}
                             type='text'
-                            id='mx_GeneralUserSettingsTab_customThemeInput'
                             autoComplete="off"
                             onChange={this._onCustomThemeChange}
                             value={this.state.customThemeUrl}
@@ -448,7 +447,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 {systemThemeSection}
-                <Field id="theme" label={_t("Theme")} element="select"
+                <Field label={_t("Theme")} element="select"
                        value={this.state.theme} onChange={this._onThemeChange}
                        disabled={this.state.useSystemTheme}
                 >
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index 7f3a2c401d..d22b7ec183 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -272,7 +272,6 @@ export default class MjolnirUserSettingsTab extends React.Component {
                     <div>
                         <form onSubmit={this._onAddPersonalRule} autoComplete="off">
                             <Field
-                                id="mx_MjolnirUserSettingsTab_personalAdd"
                                 type="text"
                                 label={_t("Server or user ID to ignore")}
                                 placeholder={_t("eg: @bot:* or example.org")}
@@ -305,7 +304,6 @@ export default class MjolnirUserSettingsTab extends React.Component {
                     <div>
                         <form onSubmit={this._onSubscribeList} autoComplete="off">
                             <Field
-                                id="mx_MjolnirUserSettingsTab_subscriptionAdd"
                                 type="text"
                                 label={_t("Room ID or alias of ban list")}
                                 value={this.state.newList}
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 8df65e6590..bdcb25dd51 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -195,19 +195,16 @@ export default class PreferencesUserSettingsTab extends React.Component {
                     {autoHideMenuOption}
                     {autoLaunchOption}
                     <Field
-                        id={"autocompleteDelay"}
                         label={_t('Autocomplete delay (ms)')}
                         type='number'
                         value={this.state.autocompleteDelay}
                         onChange={this._onAutocompleteDelayChange} />
                     <Field
-                        id={"readMarkerInViewThresholdMs"}
                         label={_t('Read Marker lifetime (ms)')}
                         type='number'
                         value={this.state.readMarkerInViewThresholdMs}
                         onChange={this._onReadMarkerInViewThresholdMs} />
                     <Field
-                        id={"readMarkerOutOfViewThresholdMs"}
                         label={_t('Read Marker off-screen lifetime (ms)')}
                         type='number'
                         value={this.state.readMarkerOutOfViewThresholdMs}
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index f4fbcada3a..71ed2bab65 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -163,7 +163,7 @@ export default class VoiceUserSettingsTab extends React.Component {
             if (audioOutputs.length > 0) {
                 const defaultDevice = getDefaultDevice(audioOutputs);
                 speakerDropdown = (
-                    <Field element="select" label={_t("Audio Output")} id="audioOutput"
+                    <Field element="select" label={_t("Audio Output")}
                            value={this.state.activeAudioOutput || defaultDevice}
                            onChange={this._setAudioOutput}>
                         {this._renderDeviceOptions(audioOutputs, 'audioOutput')}
@@ -175,7 +175,7 @@ export default class VoiceUserSettingsTab extends React.Component {
             if (audioInputs.length > 0) {
                 const defaultDevice = getDefaultDevice(audioInputs);
                 microphoneDropdown = (
-                    <Field element="select" label={_t("Microphone")} id="audioInput"
+                    <Field element="select" label={_t("Microphone")}
                            value={this.state.activeAudioInput || defaultDevice}
                            onChange={this._setAudioInput}>
                         {this._renderDeviceOptions(audioInputs, 'audioInput')}
@@ -187,7 +187,7 @@ export default class VoiceUserSettingsTab extends React.Component {
             if (videoInputs.length > 0) {
                 const defaultDevice = getDefaultDevice(videoInputs);
                 webcamDropdown = (
-                    <Field element="select" label={_t("Camera")} id="videoInput"
+                    <Field element="select" label={_t("Camera")}
                            value={this.state.activeVideoInput || defaultDevice}
                            onChange={this._setVideoInput}>
                         {this._renderDeviceOptions(videoInputs, 'videoInput')}

From 55c2d985715462db03145fb57260a30ff115eef8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 29 Mar 2020 23:16:57 +0100
Subject: [PATCH 1826/3235] Fix Field ctor

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Field.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 862b2cda96..797c83bc06 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -69,8 +69,8 @@ export default class Field extends React.PureComponent {
         // All other props pass through to the <input>.
     };
 
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
         this.state = {
             valid: undefined,
             feedback: undefined,

From 21a41fa343e4b2f7829c2d84ca82341b6a7098ab Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 30 Mar 2020 10:05:40 +0100
Subject: [PATCH 1827/3235] Update link to css location.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6fd6db1b7..69aafeb724 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Code should be committed as follows:
    * In practice, `matrix-react-sdk` is still evolving so fast that the maintenance
      burden of customising and overriding these components for Riot can seriously
      impede development.  So right now, there should be very few (if any) customisations for Riot.
- * CSS: https://github.com/vector-im/riot-web/tree/master/src/skins/vector/css/matrix-react-sdk
+ * CSS: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/css
  * Theme specific CSS & resources: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/themes
 
 React components in matrix-react-sdk are come in two different flavours:

From 098df07c67ed41b7698b9cda0b0beaa2ecf525db Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 30 Mar 2020 10:18:47 +0100
Subject: [PATCH 1828/3235] review feedback

---
 src/components/structures/RoomView.js  |  4 ++--
 src/components/views/rooms/RoomTile.js |  4 ++--
 src/utils/ShieldUtils.ts               |  6 +++---
 test/utils/ShieldUtils-test.js         | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 74572b962a..1a1f60c7bd 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -55,7 +55,7 @@ import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import { shieldStatusForMembership } from '../../utils/ShieldUtils';
+import { shieldStatusForRoom } from '../../utils/ShieldUtils';
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -820,7 +820,7 @@ export default createReactClass({
 
         /* At this point, the user has encryption on and cross-signing on */
         this.setState({
-            e2eStatus: await shieldStatusForMembership(this.context, room),
+            e2eStatus: await shieldStatusForRoom(this.context, room),
         });
     },
 
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 478d6703b4..0c913b32da 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -37,7 +37,7 @@ import E2EIcon from './E2EIcon';
 import InviteOnlyIcon from './InviteOnlyIcon';
 // eslint-disable-next-line camelcase
 import rate_limited_func from '../../../ratelimitedfunc';
-import { shieldStatusForMembership } from '../../../utils/ShieldUtils';
+import { shieldStatusForRoom } from '../../../utils/ShieldUtils';
 
 export default createReactClass({
     displayName: 'RoomTile',
@@ -157,7 +157,7 @@ export default createReactClass({
 
         /* At this point, the user has encryption on and cross-signing on */
         this.setState({
-            e2eStatus: await shieldStatusForMembership(cli, this.props.room),
+            e2eStatus: await shieldStatusForRoom(cli, this.props.room),
         });
     },
 
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 3c7cae8c8d..ef2d475293 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -17,7 +17,7 @@ interface Room {
     roomId: string;
 }
 
-export async function shieldStatusForMembership(client: Client, room: Room): Promise<string> {
+export async function shieldStatusForRoom(client: Client, room: Room): Promise<string> {
     const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
     const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
 
@@ -33,8 +33,8 @@ export async function shieldStatusForMembership(client: Client, room: Room): Pro
     /* Don't alarm if no other users are verified  */
     const includeUser = (verified.length > 0) &&    // Don't alarm for self in rooms where nobody else is verified
                         !inDMMap &&                 // Don't alarm for self in DMs with other users
-                        (members.length !== 2) || // Don't alarm for self in 1:1 chats with other users
-                        (members.length === 1);   // Do alarm for self if we're alone in a room
+                        (members.length !== 2) ||   // Don't alarm for self in 1:1 chats with other users
+                        (members.length === 1);     // Do alarm for self if we're alone in a room
     const targets = includeUser ? [...verified, client.getUserId()] : verified;
     for (const userId of targets) {
         const devices = await client.getStoredDevicesForUser(userId);
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 973798fa4b..949f0ed42b 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -1,4 +1,4 @@
-import { shieldStatusForMembership } from '../../src/utils/ShieldUtils';
+import { shieldStatusForRoom } from '../../src/utils/ShieldUtils';
 import DMRoomMap from '../../src/utils/DMRoomMap';
 
 function mkClient(selfTrust) {
@@ -55,7 +55,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF1:h", "@FF2:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual("normal");
     });
 
@@ -68,7 +68,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@TT2:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -81,7 +81,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT1:h", "@FF2:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -94,7 +94,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -107,7 +107,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TT:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -120,7 +120,7 @@ describe("shieldStatusForMembership self-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 });
@@ -140,7 +140,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -152,7 +152,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT: h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 
@@ -164,7 +164,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
             roomId: dm ? "DM" : "other",
             getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT: h"].map((userId) => ({userId})),
         };
-        const status = await shieldStatusForMembership(client, room);
+        const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
     });
 });

From eff9db42736fd6b77458dd0cb302f7637f651728 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 30 Mar 2020 12:41:05 +0200
Subject: [PATCH 1829/3235] bring back global style rules for thin scrollbars
 (also FF now!)

---
 res/css/structures/_AutoHideScrollbar.scss | 58 +++++++++++++++-------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/res/css/structures/_AutoHideScrollbar.scss b/res/css/structures/_AutoHideScrollbar.scss
index 3d91293c98..50842c71bc 100644
--- a/res/css/structures/_AutoHideScrollbar.scss
+++ b/res/css/structures/_AutoHideScrollbar.scss
@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_AutoHideScrollbar {
-    overflow-x: hidden;
-    overflow-y: auto;
-    overflow-y: overlay;    // where supported
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-
-    &::-webkit-scrollbar {
-        width: 6px;
-        height: 6px;
-        background-color: transparent;
-    }
-
-    &::-webkit-scrollbar-thumb {
-        border-radius: 3px;
-        background-color: transparent;
-    }
-
-    scrollbar-color: transparent transparent;
+// make any scrollbar grey and thin
+html {
+    scrollbar-color: $scrollbar-thumb-color $scrollbar-track-color;
+}
+// scrollbar-width is not inherited (but -color is, why?!),
+// so declare it on every element
+* {
     scrollbar-width: thin;
 }
 
+::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    background-color: $scrollbar-track-color;
+}
+
+::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background-color: $scrollbar-thumb-color;
+}
+
+// make auto-hide scrollbars not transparent again on hover
 .mx_AutoHideScrollbar:hover {
+    scrollbar-color: $scrollbar-thumb-color $scrollbar-track-color;
+
     &::-webkit-scrollbar {
         background-color: $scrollbar-track-color;
     }
@@ -43,5 +46,22 @@ limitations under the License.
     &::-webkit-scrollbar-thumb {
         background-color: $scrollbar-thumb-color;
     }
-    scrollbar-color: $scrollbar-thumb-color $scrollbar-track-color;
+}
+
+// make scrollbars transparent for autohide scrollbars
+.mx_AutoHideScrollbar {
+    overflow-x: hidden;
+    overflow-y: auto;
+    overflow-y: overlay;    // where supported
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+
+    &::-webkit-scrollbar {
+        background-color: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background-color: transparent;
+    }
+
+    scrollbar-color: transparent transparent;
 }

From b5c45b7d127bad0e269cdf2a58f691e11a8c44e6 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 30 Mar 2020 10:16:01 +0000
Subject: [PATCH 1830/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2242 of 2242 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 4829d4cf7a..f3aed44b05 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2288,5 +2288,21 @@
     "Navigate composer history": "Naviga cronologia compositore",
     "Previous/next unread room or DM": "Stanza o msg non letti successivi/precedenti",
     "Previous/next room or DM": "Stanza o msg successivi/precedenti",
-    "Toggle right panel": "Apri/chiudi pannello a destra"
+    "Toggle right panel": "Apri/chiudi pannello a destra",
+    "Unverified login. Was this you?": "Accesso non verificato. Eri tu?",
+    "Manually verify all remote sessions": "Verifica manualmente tutte le sessioni remote",
+    "Update your secure storage": "Aggiorna la tua archiviazione sicura",
+    "Self signing private key:": "Chiave privata di auto-firma:",
+    "cached locally": "in cache locale",
+    "not found locally": "non trovato in locale",
+    "User signing private key:": "Chiave privata di firma utente:",
+    "Session backup key:": "Chiave di backup sessione:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifica individualmente ogni sessione usata da un utente per segnarla come fidata, senza fidarsi dei dispositivi a firma incrociata.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Nelle stanze cifrate, i tuoi messaggi sono protetti e solo tu ed il destinatario avete le chiavi univoche per sbloccarli.",
+    "Verify all users in a room to ensure it's secure.": "Verifica tutti gli utenti in una stanza per confermare che sia sicura.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Nelle stanze cifrate, verifica tutti gli utenti per confermare che siano sicure.",
+    "Verified": "Verificato",
+    "Verification cancelled": "Verifica annullata",
+    "Compare emoji": "Confronta emoji",
+    "Cancel replying to a message": "Annulla la risposta a un messaggio"
 }

From d369695e2229dc270bcaf4ba7a4d991dea5c3cc9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 30 Mar 2020 13:31:42 +0100
Subject: [PATCH 1831/3235] Upgrade matrix-js-sdk to 5.2.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7579cab714..ce3ebea03f 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.2.0-rc.1",
+    "matrix-js-sdk": "5.2.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 04dcab02ed..bb6c69cb2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,10 +5689,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.2.0-rc.1:
-  version "5.2.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0-rc.1.tgz#014239eb713ea3b648b7a573785d01edff1efd03"
-  integrity sha512-Jv/0kyZEtkfrD6mlq3g2YoFI2+eOBFOz5D186jJAvFg1W7UaQ5gn6iualR+2AKa1AIk2AT6lDcgPb1djZ7/3Vw==
+matrix-js-sdk@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0.tgz#f213fd7671538a57c6d7e0665a2178ab23b950da"
+  integrity sha512-IscXYNx+k7wq5fuwsvKlXSI6Z1/nQ7TBI8AkStHJOAR8rz1DRoxICLFJtWzpOUSrgQuSaUYpOm4+6hS6IVlmtA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From af1446e0ff87e73d4437d22f863e8cc3320d0feb Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 30 Mar 2020 13:41:02 +0100
Subject: [PATCH 1832/3235] Prepare changelog for v2.3.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378ba6f1d1..02c085d0b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [2.3.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.0) (2020-03-30)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.0-rc.1...v2.3.0)
+
+ * Upgrade JS SDK to 5.2.0
+
 Changes in [2.3.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.0-rc.1) (2020-03-26)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.3...v2.3.0-rc.1)

From e32e9cec06ca7f9a91da6aac33604b6e6cdec3e8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 30 Mar 2020 13:41:02 +0100
Subject: [PATCH 1833/3235] v2.3.0

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

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

From 78fd8e4569096043b22210821d20e085802bbcff Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 30 Mar 2020 13:42:52 +0100
Subject: [PATCH 1834/3235] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6e3b4e912f..7001b1cb21 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.2.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index bb6c69cb2c..c5fc8268a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,10 +5689,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.2.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.2.0.tgz#f213fd7671538a57c6d7e0665a2178ab23b950da"
-  integrity sha512-IscXYNx+k7wq5fuwsvKlXSI6Z1/nQ7TBI8AkStHJOAR8rz1DRoxICLFJtWzpOUSrgQuSaUYpOm4+6hS6IVlmtA==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 4371006c58b4565de1ef29d8d591333967fdcf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 30 Mar 2020 14:32:35 +0200
Subject: [PATCH 1835/3235] EventIndex: Better logging on how many events are
 added.

This adds a bit more info to how many events are added, how many skipped
and if they are skipped because they are undecryptable.
---
 src/indexing/EventIndex.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 9e27451a78..65e536b4a1 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -469,6 +469,9 @@ export default class EventIndex extends EventEmitter {
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
             const filteredEvents = matrixEvents.filter(this.isValidEvent);
+            const undecryptableEvents = matrixEvents.filter((ev) => {
+                return ev.isDecryptionFailure();
+            });
 
             // Collect the redaction events so we can delete the redacted events
             // from the index.
@@ -503,7 +506,10 @@ export default class EventIndex extends EventEmitter {
             console.log(
                 "EventIndex: Crawled room",
                 client.getRoom(checkpoint.roomId).name,
-                "and fetched", events.length, "events.",
+                "and fetched total", matrixEvents.length, "events of which",
+                events.length, "are being added,", redactionEvents.length,
+                "are redacted,", matrixEvents.length - events.length,
+                "are being skipped, undecryptable", undecryptableEvents.length
             );
 
             try {

From 836b348bff796dae1d56f2f19ea08dd258636333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 30 Mar 2020 14:39:01 +0200
Subject: [PATCH 1836/3235] EventIndex: Add a trailing comma.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 65e536b4a1..14257af014 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -509,7 +509,7 @@ export default class EventIndex extends EventEmitter {
                 "and fetched total", matrixEvents.length, "events of which",
                 events.length, "are being added,", redactionEvents.length,
                 "are redacted,", matrixEvents.length - events.length,
-                "are being skipped, undecryptable", undecryptableEvents.length
+                "are being skipped, undecryptable", undecryptableEvents.length,
             );
 
             try {

From 8c2b910c03e1e2dc26cba810bc74c0ff97459ce7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 30 Mar 2020 13:59:08 +0100
Subject: [PATCH 1837/3235] rework SlashCommands to better expose aliases

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/{SlashCommands.js => SlashCommands.tsx}   | 270 ++++++++----------
 src/autocomplete/CommandProvider.js           |  46 +--
 .../views/dialogs/SlashCommandHelpDialog.js   |   6 +-
 3 files changed, 155 insertions(+), 167 deletions(-)
 rename src/{SlashCommands.js => SlashCommands.tsx} (91%)

diff --git a/src/SlashCommands.js b/src/SlashCommands.tsx
similarity index 91%
rename from src/SlashCommands.js
rename to src/SlashCommands.tsx
index d306978f78..e69afbde48 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.tsx
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +18,8 @@ limitations under the License.
 */
 
 
-import React from 'react';
+import * as React from 'react';
+
 import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher';
 import * as sdk from './index';
@@ -34,11 +36,16 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/I
 import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
 import {inviteUsersToRoom} from "./RoomInvite";
 
-const singleMxcUpload = async () => {
+// XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
+interface HTMLInputEvent extends Event {
+    target: HTMLInputElement & EventTarget;
+}
+
+const singleMxcUpload = async (): Promise<any> => {
     return new Promise((resolve) => {
         const fileSelector = document.createElement('input');
         fileSelector.setAttribute('type', 'file');
-        fileSelector.onchange = (ev) => {
+        fileSelector.onchange = (ev: HTMLInputEvent) => {
             const file = ev.target.files[0];
 
             const UploadConfirmDialog = sdk.getComponent("dialogs.UploadConfirmDialog");
@@ -62,9 +69,36 @@ export const CommandCategories = {
     "other": _td("Other"),
 };
 
+type RunFn = ((roomId: string, args: string, cmd: string) => {error: any} | {promise: Promise<any>});
+
 class Command {
-    constructor({name, args='', description, runFn, category=CommandCategories.other, hideCompletionAfterSpace=false}) {
-        this.command = '/' + name;
+    command: string;
+    aliases: string[];
+    args: undefined | string;
+    description: string;
+    runFn: undefined | RunFn;
+    category: string;
+    hideCompletionAfterSpace: boolean;
+
+    constructor({
+        command,
+        aliases=[],
+        args='',
+        description,
+        runFn=undefined,
+        category=CommandCategories.other,
+        hideCompletionAfterSpace=false,
+    }: {
+        command: string;
+        aliases?: string[];
+        args?: string;
+        description: string;
+        runFn?: RunFn;
+        category: string;
+        hideCompletionAfterSpace?: boolean;
+    }) {
+        this.command = command;
+        this.aliases = aliases;
         this.args = args;
         this.description = description;
         this.runFn = runFn;
@@ -73,17 +107,17 @@ class Command {
     }
 
     getCommand() {
-        return this.command;
+        return `/${this.command}`;
     }
 
     getCommandWithArgs() {
         return this.getCommand() + " " + this.args;
     }
 
-    run(roomId, args) {
+    run(roomId: string, args: string, cmd: string) {
         // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
         if (!this.runFn) return;
-        return this.runFn.bind(this)(roomId, args);
+        return this.runFn.bind(this)(roomId, args, cmd);
     }
 
     getUsage() {
@@ -95,7 +129,7 @@ function reject(error) {
     return {error};
 }
 
-function success(promise) {
+function success(promise?: Promise<any>) {
     return {promise};
 }
 
@@ -103,11 +137,9 @@ function success(promise) {
  * functions are called with `this` bound to the Command instance.
  */
 
-/* eslint-disable babel/no-invalid-this */
-
-export const CommandMap = {
-    shrug: new Command({
-        name: 'shrug',
+export const Commands = [
+    new Command({
+        command: 'shrug',
         args: '<message>',
         description: _td('Prepends ¯\\_(ツ)_/¯ to a plain-text message'),
         runFn: function(roomId, args) {
@@ -119,8 +151,8 @@ export const CommandMap = {
         },
         category: CommandCategories.messages,
     }),
-    plain: new Command({
-        name: 'plain',
+    new Command({
+        command: 'plain',
         args: '<message>',
         description: _td('Sends a message as plain text, without interpreting it as markdown'),
         runFn: function(roomId, messages) {
@@ -128,11 +160,11 @@ export const CommandMap = {
         },
         category: CommandCategories.messages,
     }),
-    ddg: new Command({
-        name: 'ddg',
+    new Command({
+        command: 'ddg',
         args: '<query>',
         description: _td('Searches DuckDuckGo for results'),
-        runFn: function(roomId, args) {
+        runFn: function() {
             const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             // TODO Don't explain this away, actually show a search UI here.
             Modal.createTrackedDialog('Slash Commands', '/ddg is not a command', ErrorDialog, {
@@ -144,9 +176,8 @@ export const CommandMap = {
         category: CommandCategories.actions,
         hideCompletionAfterSpace: true,
     }),
-
-    upgraderoom: new Command({
-        name: 'upgraderoom',
+    new Command({
+        command: 'upgraderoom',
         args: '<new_version>',
         description: _td('Upgrades a room to a new version'),
         runFn: function(roomId, args) {
@@ -215,9 +246,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    nick: new Command({
-        name: 'nick',
+    new Command({
+        command: 'nick',
         args: '<display_name>',
         description: _td('Changes your display nickname'),
         runFn: function(roomId, args) {
@@ -228,9 +258,9 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    myroomnick: new Command({
-        name: 'myroomnick',
+    new Command({
+        command: 'myroomnick',
+        aliases: ['roomnick'],
         args: '<display_name>',
         description: _td('Changes your display nickname in the current room only'),
         runFn: function(roomId, args) {
@@ -239,7 +269,7 @@ export const CommandMap = {
                 const ev = cli.getRoom(roomId).currentState.getStateEvents('m.room.member', cli.getUserId());
                 const content = {
                     ...ev ? ev.getContent() : { membership: 'join' },
-                    displayname: args,
+                    displaycommand: args,
                 };
                 return success(cli.sendStateEvent(roomId, 'm.room.member', content, cli.getUserId()));
             }
@@ -247,9 +277,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    roomavatar: new Command({
-        name: 'roomavatar',
+    new Command({
+        command: 'roomavatar',
         args: '[<mxc_url>]',
         description: _td('Changes the avatar of the current room'),
         runFn: function(roomId, args) {
@@ -265,9 +294,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    myroomavatar: new Command({
-        name: 'myroomavatar',
+    new Command({
+        command: 'myroomavatar',
         args: '[<mxc_url>]',
         description: _td('Changes your avatar in this current room only'),
         runFn: function(roomId, args) {
@@ -292,9 +320,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    myavatar: new Command({
-        name: 'myavatar',
+    new Command({
+        command: 'myavatar',
         args: '[<mxc_url>]',
         description: _td('Changes your avatar in all rooms'),
         runFn: function(roomId, args) {
@@ -310,9 +337,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    topic: new Command({
-        name: 'topic',
+    new Command({
+        command: 'topic',
         args: '[<topic>]',
         description: _td('Gets or sets the room topic'),
         runFn: function(roomId, args) {
@@ -336,9 +362,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    roomname: new Command({
-        name: 'roomname',
+    new Command({
+        command: 'roomname',
         args: '<name>',
         description: _td('Sets the room name'),
         runFn: function(roomId, args) {
@@ -349,9 +374,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    invite: new Command({
-        name: 'invite',
+    new Command({
+        command: 'invite',
         args: '<user-id>',
         description: _td('Invites user with given id to current room'),
         runFn: function(roomId, args) {
@@ -390,7 +414,7 @@ export const CommandMap = {
                         }
                     }
                     const inviter = new MultiInviter(roomId);
-                    return success(finished.then(([useDefault] = []) => {
+                    return success(finished.then(([useDefault]: any) => {
                         if (useDefault) {
                             useDefaultIdentityServer();
                         } else if (useDefault === false) {
@@ -408,9 +432,9 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    join: new Command({
-        name: 'join',
+    new Command({
+        command: 'join',
+        aliases: ['j', 'goto'],
         args: '<room-alias>',
         description: _td('Joins room with given alias'),
         runFn: function(roomId, args) {
@@ -521,9 +545,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    part: new Command({
-        name: 'part',
+    new Command({
+        command: 'part',
         args: '[<room-alias>]',
         description: _td('Leave room'),
         runFn: function(roomId, args) {
@@ -569,9 +592,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    kick: new Command({
-        name: 'kick',
+    new Command({
+        command: 'kick',
         args: '<user-id> [reason]',
         description: _td('Kicks user with given id'),
         runFn: function(roomId, args) {
@@ -585,10 +607,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    // Ban a user from the room with an optional reason
-    ban: new Command({
-        name: 'ban',
+    new Command({
+        command: 'ban',
         args: '<user-id> [reason]',
         description: _td('Bans user with given id'),
         runFn: function(roomId, args) {
@@ -602,10 +622,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    // Unban a user from ythe room
-    unban: new Command({
-        name: 'unban',
+    new Command({
+        command: 'unban',
         args: '<user-id>',
         description: _td('Unbans user with given ID'),
         runFn: function(roomId, args) {
@@ -620,9 +638,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    ignore: new Command({
-        name: 'ignore',
+    new Command({
+        command: 'ignore',
         args: '<user-id>',
         description: _td('Ignores a user, hiding their messages from you'),
         runFn: function(roomId, args) {
@@ -651,9 +668,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    unignore: new Command({
-        name: 'unignore',
+    new Command({
+        command: 'unignore',
         args: '<user-id>',
         description: _td('Stops ignoring a user, showing their messages going forward'),
         runFn: function(roomId, args) {
@@ -683,10 +699,8 @@ export const CommandMap = {
         },
         category: CommandCategories.actions,
     }),
-
-    // Define the power level of a user
-    op: new Command({
-        name: 'op',
+    new Command({
+        command: 'op',
         args: '<user-id> [<power-level>]',
         description: _td('Define the power level of a user'),
         runFn: function(roomId, args) {
@@ -712,10 +726,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    // Reset the power level of a user
-    deop: new Command({
-        name: 'deop',
+    new Command({
+        command: 'deop',
         args: '<user-id>',
         description: _td('Deops user with given id'),
         runFn: function(roomId, args) {
@@ -734,9 +746,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    devtools: new Command({
-        name: 'devtools',
+    new Command({
+        command: 'devtools',
         description: _td('Opens the Developer Tools dialog'),
         runFn: function(roomId) {
             const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
@@ -745,9 +756,8 @@ export const CommandMap = {
         },
         category: CommandCategories.advanced,
     }),
-
-    addwidget: new Command({
-        name: 'addwidget',
+    new Command({
+        command: 'addwidget',
         args: '<url>',
         description: _td('Adds a custom widget by URL to the room'),
         runFn: function(roomId, args) {
@@ -766,10 +776,8 @@ export const CommandMap = {
         },
         category: CommandCategories.admin,
     }),
-
-    // Verify a user, device, and pubkey tuple
-    verify: new Command({
-        name: 'verify',
+    new Command({
+        command: 'verify',
         args: '<user-id> <device-id> <device-signing-key>',
         description: _td('Verifies a user, session, and pubkey tuple'),
         runFn: function(roomId, args) {
@@ -834,20 +842,9 @@ export const CommandMap = {
         },
         category: CommandCategories.advanced,
     }),
-
-    // Command definitions for autocompletion ONLY:
-
-    // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
-    me: new Command({
-        name: 'me',
-        args: '<message>',
-        description: _td('Displays action'),
-        category: CommandCategories.messages,
-        hideCompletionAfterSpace: true,
-    }),
-
-    discardsession: new Command({
-        name: 'discardsession',
+    new Command({
+        command: 'discardsession',
+        aliases: ['newballsplease'],
         description: _td('Forces the current outbound group session in an encrypted room to be discarded'),
         runFn: function(roomId) {
             try {
@@ -859,9 +856,8 @@ export const CommandMap = {
         },
         category: CommandCategories.advanced,
     }),
-
-    rainbow: new Command({
-        name: "rainbow",
+    new Command({
+        command: "rainbow",
         description: _td("Sends the given message coloured as a rainbow"),
         args: '<message>',
         runFn: function(roomId, args) {
@@ -870,9 +866,8 @@ export const CommandMap = {
         },
         category: CommandCategories.messages,
     }),
-
-    rainbowme: new Command({
-        name: "rainbowme",
+    new Command({
+        command: "rainbowme",
         description: _td("Sends the given emote coloured as a rainbow"),
         args: '<message>',
         runFn: function(roomId, args) {
@@ -881,9 +876,8 @@ export const CommandMap = {
         },
         category: CommandCategories.messages,
     }),
-
-    help: new Command({
-        name: "help",
+    new Command({
+        command: "help",
         description: _td("Displays list of commands with usages and descriptions"),
         runFn: function() {
             const SlashCommandHelpDialog = sdk.getComponent('dialogs.SlashCommandHelpDialog');
@@ -894,36 +888,25 @@ export const CommandMap = {
         category: CommandCategories.advanced,
     }),
 
-    whois: new Command({
-        name: "whois",
-        description: _td("Displays information about a user"),
-        args: '<user-id>',
-        runFn: function(roomId, userId) {
-            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
-                return reject(this.getUsage());
-            }
-
-            const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
-
-            dis.dispatch({
-                action: 'view_user',
-                member: member || {userId},
-            });
-            return success();
-        },
-        category: CommandCategories.advanced,
+    // Command definitions for autocompletion ONLY:
+    // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
+    new Command({
+        command: 'me',
+        args: '<message>',
+        description: _td('Displays action'),
+        category: CommandCategories.messages,
+        hideCompletionAfterSpace: true,
     }),
-};
-/* eslint-enable babel/no-invalid-this */
+];
 
-
-// helpful aliases
-const aliases = {
-    j: "join",
-    newballsplease: "discardsession",
-    goto: "join", // because it handles event permalinks magically
-    roomnick: "myroomnick",
-};
+// build a map from names and aliases to the Command objects.
+export const CommandMap = new Map();
+Commands.forEach(cmd => {
+    CommandMap.set(cmd.command, cmd);
+    cmd.aliases.forEach(alias => {
+        CommandMap.set(alias, cmd);
+    });
+});
 
 
 /**
@@ -950,10 +933,7 @@ export function getCommand(roomId, input) {
         cmd = input;
     }
 
-    if (aliases[cmd]) {
-        cmd = aliases[cmd];
-    }
-    if (CommandMap[cmd]) {
-        return () => CommandMap[cmd].run(roomId, args);
+    if (CommandMap.has(cmd)) {
+        return () => CommandMap.get(cmd).run(roomId, args, cmd);
     }
 }
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index da8fa3ed3c..0b8af4d6f9 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -23,17 +23,16 @@ import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
 import {TextualCompletion} from './Components';
 import type {Completion, SelectionRange} from "./Autocompleter";
-import {CommandMap} from '../SlashCommands';
-
-const COMMANDS = Object.values(CommandMap);
+import {Commands, CommandMap} from '../SlashCommands';
 
 const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
 export default class CommandProvider extends AutocompleteProvider {
     constructor() {
         super(COMMAND_RE);
-        this.matcher = new QueryMatcher(COMMANDS, {
-           keys: ['command', 'args', 'description'],
+        this.matcher = new QueryMatcher(Commands, {
+            keys: ['command', 'args', 'description'],
+            funcs: [({aliases}) => aliases.join(" ")], // aliases
         });
     }
 
@@ -46,31 +45,40 @@ export default class CommandProvider extends AutocompleteProvider {
         if (command[0] !== command[1]) {
             // The input looks like a command with arguments, perform exact match
             const name = command[1].substr(1); // strip leading `/`
-            if (CommandMap[name]) {
+            if (CommandMap.has(name)) {
                 // some commands, namely `me` and `ddg` don't suit having the usage shown whilst typing their arguments
-                if (CommandMap[name].hideCompletionAfterSpace) return [];
-                matches = [CommandMap[name]];
+                if (CommandMap.get(name).hideCompletionAfterSpace) return [];
+                matches = [CommandMap.get(name)];
             }
         } else {
             if (query === '/') {
                 // If they have just entered `/` show everything
-                matches = COMMANDS;
+                matches = Commands;
             } else {
                 // otherwise fuzzy match against all of the fields
                 matches = this.matcher.match(command[1]);
             }
         }
 
-        return matches.map((result) => ({
-            // If the command is the same as the one they entered, we don't want to discard their arguments
-            completion: result.command === command[1] ? command[0] : (result.command + ' '),
-            type: "command",
-            component: <TextualCompletion
-                title={result.command}
-                subtitle={result.args}
-                description={_t(result.description)} />,
-            range,
-        }));
+
+        return matches.map((result) => {
+            let completion = result.getCommand() + ' ';
+            const usedAlias = result.aliases.find(alias => `/${alias}` === command[1]);
+            // If the command (or an alias) is the same as the one they entered, we don't want to discard their arguments
+            if (usedAlias || result.getCommand() === command[1]) {
+                completion = command[0];
+            }
+
+            return {
+                completion,
+                type: "command",
+                component: <TextualCompletion
+                    title={`/${usedAlias || result.command}`}
+                    subtitle={result.args}
+                    description={_t(result.description)} />,
+                range,
+            };
+        });
     }
 
     getName() {
diff --git a/src/components/views/dialogs/SlashCommandHelpDialog.js b/src/components/views/dialogs/SlashCommandHelpDialog.js
index 9e48a92ed1..bae5b37993 100644
--- a/src/components/views/dialogs/SlashCommandHelpDialog.js
+++ b/src/components/views/dialogs/SlashCommandHelpDialog.js
@@ -16,14 +16,14 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../languageHandler";
-import {CommandCategories, CommandMap} from "../../../SlashCommands";
+import {CommandCategories, Commands} from "../../../SlashCommands";
 import * as sdk from "../../../index";
 
 export default ({onFinished}) => {
     const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
 
     const categories = {};
-    Object.values(CommandMap).forEach(cmd => {
+    Commands.forEach(cmd => {
         if (!categories[cmd.category]) {
             categories[cmd.category] = [];
         }
@@ -41,7 +41,7 @@ export default ({onFinished}) => {
 
         categories[category].forEach(cmd => {
             rows.push(<tr key={cmd.command}>
-                <td><strong>{cmd.command}</strong></td>
+                <td><strong>{cmd.getCommand()}</strong></td>
                 <td>{cmd.args}</td>
                 <td>{cmd.description}</td>
             </tr>);

From c6d69f3d3fa072052d11f989671d7deea4311a3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 30 Mar 2020 14:09:10 +0100
Subject: [PATCH 1838/3235] de-tslint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index e69afbde48..728f67987a 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -82,12 +82,12 @@ class Command {
 
     constructor({
         command,
-        aliases=[],
-        args='',
+        aliases = [],
+        args = '',
         description,
         runFn=undefined,
-        category=CommandCategories.other,
-        hideCompletionAfterSpace=false,
+        category = CommandCategories.other,
+        hideCompletionAfterSpace = false,
     }: {
         command: string;
         aliases?: string[];
@@ -437,7 +437,7 @@ export const Commands = [
         aliases: ['j', 'goto'],
         args: '<room-alias>',
         description: _td('Joins room with given alias'),
-        runFn: function(roomId, args) {
+        runFn: function(_, 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
@@ -710,7 +710,7 @@ export const Commands = [
                 if (matches) {
                     const userId = matches[1];
                     if (matches.length === 4 && undefined !== matches[3]) {
-                        powerLevel = parseInt(matches[3]);
+                        powerLevel = parseInt(matches[3], 10);
                     }
                     if (!isNaN(powerLevel)) {
                         const cli = MatrixClientPeg.get();

From 559b8e174ba355c6151157be09d6a7d43de5f904 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 30 Mar 2020 14:13:08 +0100
Subject: [PATCH 1839/3235] undo accidental changes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx       | 20 +++++++++++++++++++-
 src/i18n/strings/en_EN.json |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 728f67987a..8351013a5a 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -269,7 +269,7 @@ export const Commands = [
                 const ev = cli.getRoom(roomId).currentState.getStateEvents('m.room.member', cli.getUserId());
                 const content = {
                     ...ev ? ev.getContent() : { membership: 'join' },
-                    displaycommand: args,
+                    displayname: args,
                 };
                 return success(cli.sendStateEvent(roomId, 'm.room.member', content, cli.getUserId()));
             }
@@ -887,6 +887,24 @@ export const Commands = [
         },
         category: CommandCategories.advanced,
     }),
+    new Command({
+        command: "whois",
+        description: _td("Displays information about a user"),
+        args: "<user-id>",
+        runFn: function (roomId, userId) {
+            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
+                return reject(this.getUsage());
+            }
+
+            const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
+            dis.dispatch({
+                action: 'view_user',
+                member: member || {userId},
+            });
+            return success();
+        },
+        category: CommandCategories.advanced,
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2f19fc982c..151d5a2b0d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -197,12 +197,12 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
     "Verified key": "Verified key",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.",
-    "Displays action": "Displays action",
     "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",
     "Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
     "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
     "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
     "Displays information about a user": "Displays information about a user",
+    "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",

From b53b5cc45de7d70b8686246f2c8037845b1ba2a1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 30 Mar 2020 15:24:43 +0100
Subject: [PATCH 1840/3235] Add wasCrossSigningVerified in test

---
 test/utils/ShieldUtils-test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 949f0ed42b..66dfab4234 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -6,6 +6,7 @@ function mkClient(selfTrust) {
         getUserId: () => "@self:localhost",
         checkUserTrust: (userId) => ({
             isCrossSigningVerified: () => userId[1] == "T",
+            wasCrossSigningVerified: () => userId[1] == "T",
         }),
         checkDeviceTrust: (userId, deviceId) => ({
             isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T",

From 520b4c3e65331913647ceb3fec04333478267174 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 30 Mar 2020 16:33:16 +0100
Subject: [PATCH 1841/3235] Add tests for was verified case

---
 test/utils/ShieldUtils-test.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 66dfab4234..5f676579fa 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -6,7 +6,7 @@ function mkClient(selfTrust) {
         getUserId: () => "@self:localhost",
         checkUserTrust: (userId) => ({
             isCrossSigningVerified: () => userId[1] == "T",
-            wasCrossSigningVerified: () => userId[1] == "T",
+            wasCrossSigningVerified: () => userId[1] == "T" || userId[1] == "W",
         }),
         checkDeviceTrust: (userId, deviceId) => ({
             isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T",
@@ -151,7 +151,7 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT: h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@TF:h", "@TT:h"].map((userId) => ({userId})),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);
@@ -163,7 +163,19 @@ describe("shieldStatusForMembership other-trust behaviour", function() {
         const client = mkClient(true);
         const room = {
             roomId: dm ? "DM" : "other",
-            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT: h"].map((userId) => ({userId})),
+            getEncryptionTargetMembers: () => ["@self:localhost", "@FF:h", "@FT:h"].map((userId) => ({userId})),
+        };
+        const status = await shieldStatusForRoom(client, room);
+        expect(status).toEqual(result);
+    });
+
+    it.each(
+        [["warning", true], ["warning", false]],
+    )("2 was verified: returns '%s', DM = %s", async (result, dm) => {
+        const client = mkClient(true);
+        const room = {
+            roomId: dm ? "DM" : "other",
+            getEncryptionTargetMembers: () => ["@self:localhost", "@WF:h", "@FT:h"].map((userId) => ({userId})),
         };
         const status = await shieldStatusForRoom(client, room);
         expect(status).toEqual(result);

From ca5d54031162d19379ddec255e8eeeff33d2b750 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 10:40:26 -0600
Subject: [PATCH 1842/3235] Remove underscore from Jitsi conference names

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

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
---
 src/CallHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 362db939a3..8284e788b4 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -430,7 +430,7 @@ async function _startCallApp(roomId, type) {
         return;
     }
 
-    const confId = `JitsiConference_${generateHumanReadableId()}`;
+    const confId = `JitsiConference${generateHumanReadableId()}`;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
     let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();

From da34e6241dd521a41354e10db8e1bf10810c97f8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 30 Mar 2020 18:18:10 +0100
Subject: [PATCH 1843/3235] Make all 'font-size's and 'line-height's rem

Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.

I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.

This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly.
---
 res/css/_common.scss                          | 20 +++++++------
 res/css/structures/_ContextualMenu.scss       |  2 +-
 res/css/structures/_CreateRoom.scss           |  2 +-
 res/css/structures/_FilePanel.scss            |  8 +++---
 res/css/structures/_GroupView.scss            | 10 +++----
 res/css/structures/_LeftPanel.scss            |  2 +-
 res/css/structures/_MyGroups.scss             |  8 +++---
 res/css/structures/_NotificationPanel.scss    |  4 +--
 res/css/structures/_RightPanel.scss           |  2 +-
 res/css/structures/_RoomDirectory.scss        | 10 +++----
 res/css/structures/_RoomStatusBar.scss        | 14 +++++-----
 res/css/structures/_RoomSubList.scss          |  4 +--
 res/css/structures/_RoomView.scss             |  4 +--
 res/css/structures/_TabbedView.scss           |  2 +-
 res/css/structures/_TagPanel.scss             |  4 +--
 res/css/structures/_ToastContainer.scss       |  6 ++--
 res/css/structures/_TopLeftMenuButton.scss    |  2 +-
 res/css/structures/_ViewSource.scss           |  2 +-
 .../structures/auth/_CompleteSecurity.scss    |  2 +-
 res/css/views/auth/_AuthBody.scss             |  8 +++---
 res/css/views/auth/_AuthButtons.scss          |  2 +-
 res/css/views/auth/_AuthFooter.scss           |  2 +-
 res/css/views/auth/_CompleteSecurityBody.scss |  4 +--
 res/css/views/auth/_LanguageSelector.scss     |  2 +-
 res/css/views/auth/_ServerTypeSelector.scss   |  2 +-
 .../context_menus/_RoomTileContextMenu.scss   |  2 +-
 .../_StatusMessageContextMenu.scss            |  2 +-
 .../context_menus/_TagTileContextMenu.scss    |  2 +-
 res/css/views/context_menus/_TopLeftMenu.scss |  4 +--
 .../views/dialogs/_AddressPickerDialog.scss   |  4 +--
 .../dialogs/_ConfirmUserActionDialog.scss     |  8 +++---
 res/css/views/dialogs/_CreateGroupDialog.scss |  4 +--
 res/css/views/dialogs/_CreateRoomDialog.scss  |  2 +-
 res/css/views/dialogs/_DevtoolsDialog.scss    |  4 +--
 res/css/views/dialogs/_InviteDialog.scss      | 18 ++++++------
 .../dialogs/_MessageEditHistoryDialog.scss    |  4 +--
 .../dialogs/_NewSessionReviewDialog.scss      |  2 +-
 res/css/views/dialogs/_SetEmailDialog.scss    |  2 +-
 res/css/views/dialogs/_SetMxIdDialog.scss     |  2 +-
 res/css/views/dialogs/_SetPasswordDialog.scss |  2 +-
 res/css/views/dialogs/_TermsDialog.scss       |  2 +-
 .../views/dialogs/_UnknownDeviceDialog.scss   |  2 +-
 res/css/views/directory/_NetworkDropdown.scss | 14 +++++-----
 res/css/views/elements/_AccessibleButton.scss |  2 +-
 res/css/views/elements/_AddressTile.scss      |  4 +--
 .../views/elements/_DirectorySearchBox.scss   |  2 +-
 res/css/views/elements/_Dropdown.scss         |  4 +--
 res/css/views/elements/_EventListSummary.scss | 14 +++++-----
 res/css/views/elements/_Field.scss            |  6 ++--
 res/css/views/elements/_FormButton.scss       |  4 +--
 res/css/views/elements/_ImageView.scss        | 10 +++----
 .../views/elements/_InteractiveTooltip.scss   |  2 +-
 res/css/views/elements/_RichText.scss         |  2 +-
 res/css/views/elements/_Tooltip.scss          |  6 ++--
 res/css/views/elements/_TooltipButton.scss    |  4 +--
 res/css/views/emojipicker/_EmojiPicker.scss   |  8 +++---
 res/css/views/messages/_DateSeparator.scss    |  2 +-
 res/css/views/messages/_MessageActionBar.scss |  2 +-
 res/css/views/messages/_MessageTimestamp.scss |  2 +-
 res/css/views/messages/_ReactionsRow.scss     |  2 +-
 .../views/messages/_ReactionsRowButton.scss   |  2 +-
 res/css/views/messages/_ViewSourceEvent.scss  |  2 +-
 .../views/messages/_common_CryptoEvent.scss   |  4 +--
 res/css/views/right_panel/_UserInfo.scss      | 18 ++++++------
 .../views/right_panel/_VerificationPanel.scss |  2 +-
 res/css/views/rooms/_AppsDrawer.scss          | 10 +++----
 .../views/rooms/_BasicMessageComposer.scss    |  4 +--
 res/css/views/rooms/_EntityTile.scss          |  6 ++--
 res/css/views/rooms/_EventTile.scss           | 28 +++++++++----------
 res/css/views/rooms/_JumpToBottomButton.scss  |  4 +--
 res/css/views/rooms/_MemberDeviceInfo.scss    |  2 +-
 res/css/views/rooms/_MemberInfo.scss          | 14 +++++-----
 res/css/views/rooms/_MemberList.scss          |  2 +-
 res/css/views/rooms/_MessageComposer.scss     |  6 ++--
 .../rooms/_MessageComposerFormatBar.scss      |  4 +--
 res/css/views/rooms/_PresenceLabel.scss       |  2 +-
 res/css/views/rooms/_RoomDropTarget.scss      |  4 +--
 res/css/views/rooms/_RoomHeader.scss          |  8 +++---
 res/css/views/rooms/_RoomList.scss            |  4 +--
 res/css/views/rooms/_RoomPreviewBar.scss      |  6 ++--
 res/css/views/rooms/_RoomTile.scss            |  6 ++--
 res/css/views/rooms/_SearchBar.scss           |  4 +--
 res/css/views/rooms/_SendMessageComposer.scss |  2 +-
 res/css/views/rooms/_WhoIsTypingTile.scss     |  4 +--
 res/css/views/settings/tabs/_SettingsTab.scss |  8 +++---
 .../views/terms/_InlineTermsAgreement.scss    |  2 +-
 .../verification/_VerificationShowSas.scss    |  4 +--
 res/css/views/voip/_CallView.scss             |  2 +-
 res/css/views/voip/_IncomingCallbox.scss      |  2 +-
 res/themes/dark/css/_dark.scss                |  2 +-
 res/themes/light/css/_light.scss              |  4 +--
 91 files changed, 230 insertions(+), 226 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index ad64aced50..657fb21244 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -16,6 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+:root {
+    font-size: 15px;
+}
+
 html {
     /* hack to stop overscroll bounce on OSX and iOS.
        N.B. Breaks things when we have legitimate horizontal overscroll */
@@ -25,7 +29,7 @@ html {
 
 body {
     font-family: $font-family;
-    font-size: 15px;
+    font-size: 1rem;
     background-color: $primary-bg-color;
     color: $primary-fg-color;
     border: 0px;
@@ -60,7 +64,7 @@ b {
 h2 {
     color: $primary-fg-color;
     font-weight: 400;
-    font-size: 18px;
+    font-size: 1.2rem;
     margin-top: 16px;
     margin-bottom: 16px;
 }
@@ -76,7 +80,7 @@ input[type=search],
 input[type=password] {
     padding: 9px;
     font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
     font-weight: 600;
     min-width: 0;
 }
@@ -253,7 +257,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     color: $light-fg-color;
     z-index: 4012;
     font-weight: 300;
-    font-size: 15px;
+    font-size: 1rem;
     position: relative;
     padding: 25px 30px 30px 30px;
     max-height: 80%;
@@ -321,8 +325,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_Dialog_title {
-    font-size: 22px;
-    line-height: 36px;
+    font-size: 1.467rem;
+    line-height: 2.400rem;
     color: $dialog-title-fg-color;
 }
 
@@ -350,7 +354,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 
 .mx_Dialog_content {
     margin: 24px 0 68px;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $primary-fg-color;
     word-wrap: break-word;
 }
@@ -446,7 +450,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_TextInputDialog_input {
-    font-size: 15px;
+    font-size: 1rem;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index fa2d87029d..67e7a7a8d6 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -36,7 +36,7 @@ limitations under the License.
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;
-    font-size: 14px;
+    font-size: 0.933rem;
     z-index: 5001;
 }
 
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/structures/_CreateRoom.scss
index 10f9e23a02..3a66805bfe 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/structures/_CreateRoom.scss
@@ -26,7 +26,7 @@ limitations under the License.
     border-radius: 3px;
     border: 1px solid $strong-input-border-color;
     font-weight: 300;
-    font-size: 13px;
+    font-size: 0.867rem;
     padding: 9px;
     margin-top: 6px;
 }
diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index 87e885e668..eceeab2e1b 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -49,7 +49,7 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile .mx_MFileBody_download {
     display: flex;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $event-timestamp-color;
 }
 
@@ -60,7 +60,7 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody_size {
     flex: 1 0 0;
-    font-size: 11px;
+    font-size: 0.733rem;
     text-align: right;
     white-space: nowrap;
 }
@@ -80,7 +80,7 @@ limitations under the License.
     flex: 1 1 auto;
     line-height: initial;
     padding: 0px;
-    font-size: 11px;
+    font-size: 0.733rem;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
@@ -90,7 +90,7 @@ limitations under the License.
     text-align: right;
     visibility: visible;
     position: initial;
-    font-size: 11px;
+    font-size: 0.733rem;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 72a1132c15..6eb5e33462 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -134,7 +134,7 @@ limitations under the License.
     overflow: hidden;
     color: $primary-fg-color;
     font-weight: bold;
-    font-size: 22px;
+    font-size: 1.467rem;
     padding-left: 19px;
     padding-right: 16px;
     /* why isn't text-overflow working? */
@@ -148,7 +148,7 @@ limitations under the License.
     max-height: 42px;
     color: $settings-grey-fg-color;
     font-weight: 300;
-    font-size: 13px;
+    font-size: 0.867rem;
     padding-left: 19px;
     margin-right: 16px;
     overflow: hidden;
@@ -196,7 +196,7 @@ limitations under the License.
     text-transform: uppercase;
     color: $h3-color;
     font-weight: 600;
-    font-size: 13px;
+    font-size: 0.867rem;
     margin-bottom: 10px;
 }
 
@@ -226,7 +226,7 @@ limitations under the License.
 .mx_GroupView_rooms_header_addRow_label {
     display: inline-block;
     vertical-align: top;
-    line-height: 24px;
+    line-height: 1.600rem;
     padding-left: 28px;
     color: $accent-color;
 }
@@ -258,7 +258,7 @@ limitations under the License.
 
 .mx_GroupView_membershipSection_description {
     /* To match textButton */
-    line-height: 34px;
+    line-height: 2.267rem;
 }
 
 .mx_GroupView_membershipSection_description .mx_BaseAvatar {
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 85fdfa092d..6af4b54f91 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -147,7 +147,7 @@ limitations under the License.
     }
 
     .mx_AccessibleButton {
-        font-size: 14px;
+        font-size: 0.933rem;
         margin: 4px 0 1px 9px;
         padding: 9px;
         padding-left: 42px;
diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index 36150c33a5..042994e48c 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -105,7 +105,7 @@ limitations under the License.
 .mx_MyGroups_placeholder {
     background-color: $info-plinth-bg-color;
     color: $info-plinth-fg-color;
-    line-height: 400px;
+    line-height: 26.667rem;
     border-radius: 10px;
     text-align: center;
 }
@@ -149,11 +149,11 @@ limitations under the License.
 
 .mx_GroupTile_profile .mx_GroupTile_name {
     margin: 0px;
-    font-size: 15px;
+    font-size: 1rem;
 }
 
 .mx_GroupTile_profile .mx_GroupTile_groupId {
-    font-size: 13px;
+    font-size: 0.867rem;
     opacity: 0.7;
 }
 
@@ -161,7 +161,7 @@ limitations under the License.
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    font-size: 13px;
+    font-size: 0.867rem;
     max-height: 36px;
     overflow: hidden;
 }
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index c9e0261ec9..ff95cc2dba 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -39,7 +39,7 @@ limitations under the License.
 
 .mx_NotificationPanel .mx_EventTile_roomName {
     font-weight: bold;
-    font-size: 14px;
+    font-size: 0.933rem;
 }
 
 .mx_NotificationPanel .mx_EventTile_roomName a {
@@ -54,7 +54,7 @@ limitations under the License.
 .mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
     color: $primary-fg-color;
-    font-size: 12px;
+    font-size: 0.8rem;
     display: inline;
     padding-left: 0px;
 }
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 3c373e8883..b0c2b4650f 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -96,7 +96,7 @@ limitations under the License.
 }
 
 .mx_RightPanel_headerButton_badge {
-    font-size: 8px;
+    font-size: 0.533rem;
     border-radius: 8px;
     color: $accent-fg-color;
     background-color: $accent-color;
diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index f3a7b0e243..b62f726d09 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -64,7 +64,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_table {
-    font-size: 12px;
+    font-size: 0.8rem;
     color: $primary-fg-color;
     width: 100%;
     text-align: left;
@@ -112,7 +112,7 @@ limitations under the License.
 
 .mx_RoomDirectory_name {
     display: inline-block;
-    font-size: 18px;
+    font-size: 1.2rem;
     font-weight: 600;
 }
 
@@ -124,7 +124,7 @@ limitations under the License.
     border-radius: 10px;
     display: inline-block;
     height: 20px;
-    line-height: 20px;
+    line-height: 1.333rem;
     padding: 0 5px;
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
@@ -136,7 +136,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_alias {
-    font-size: 12px;
+    font-size: 0.8rem;
     color: $settings-grey-fg-color;
 }
 
@@ -150,7 +150,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory > span {
-    font-size: 15px;
+    font-size: 1rem;
     margin-top: 0;
 
     .mx_AccessibleButton {
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index 090a40235f..1dc99b26f0 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -32,7 +32,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_callBar {
     height: 50px;
-    line-height: 50px;
+    line-height: 3.333rem;
 }
 
 .mx_RoomStatusBar_placeholderIndicator span {
@@ -94,7 +94,7 @@ limitations under the License.
     border-radius: 40px;
     width: 24px;
     height: 24px;
-    line-height: 24px;
+    line-height: 1.600rem;
     font-size: 0.8em;
     vertical-align: top;
     text-align: center;
@@ -132,7 +132,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_connectionLostBar_desc {
     color: $primary-fg-color;
-    font-size: 13px;
+    font-size: 0.867rem;
     opacity: 0.5;
     padding-bottom: 20px;
 }
@@ -145,7 +145,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_typingBar {
     height: 50px;
-    line-height: 50px;
+    line-height: 3.333rem;
 
     color: $primary-fg-color;
     opacity: 0.5;
@@ -155,7 +155,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_isAlone {
     height: 50px;
-    line-height: 50px;
+    line-height: 3.333rem;
 
     color: $primary-fg-color;
     opacity: 0.5;
@@ -174,11 +174,11 @@ limitations under the License.
 
     .mx_RoomStatusBar_callBar {
         height: 40px;
-        line-height: 40px;
+        line-height: 2.667rem;
     }
 
     .mx_RoomStatusBar_typingBar {
         height: 40px;
-        line-height: 40px;
+        line-height: 2.667rem;
     }
 }
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 1934e681c2..a76872a745 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -68,7 +68,7 @@ limitations under the License.
     text-transform: uppercase;
     color: $roomsublist-label-fg-color;
     font-weight: 700;
-    font-size: 12px;
+    font-size: 0.8rem;
     margin-left: 8px;
 }
 
@@ -76,7 +76,7 @@ limitations under the License.
     flex: 0 0 auto;
     border-radius: 8px;
     font-weight: 600;
-    font-size: 12px;
+    font-size: 0.8rem;
     padding: 0 5px;
     color: $roomtile-badge-fg-color;
     background-color: $roomtile-name-color;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 5e826306c6..52de9384d7 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -23,7 +23,7 @@ limitations under the License.
 .mx_RoomView_fileDropTarget {
     min-width: 0px;
     width: 100%;
-    font-size: 18px;
+    font-size: 1.2rem;
     text-align: center;
 
     pointer-events: none;
@@ -186,7 +186,7 @@ limitations under the License.
 
 .mx_RoomView_empty {
     flex: 1 1 auto;
-    font-size: 13px;
+    font-size: 0.867rem;
     padding-left: 3em;
     padding-right: 3em;
     margin-right: 20px;
diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 7904df5a82..20e2120bfd 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -39,7 +39,7 @@ limitations under the License.
     cursor: pointer;
     display: block;
     border-radius: 3px;
-    font-size: 14px;
+    font-size: 0.933rem;
     min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
     margin-bottom: 6px;
     position: relative;
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 472831c0d9..5173358bcc 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -139,7 +139,7 @@ limitations under the License.
     background-color: $neutral-badge-color;
     color: #ffffff;
     font-weight: 600;
-    font-size: 10px;
+    font-size: 0.667rem;
     text-align: center;
     padding-top: 1px;
     padding-left: 4px;
@@ -157,7 +157,7 @@ limitations under the License.
     border-radius: 8px;
     color: $accent-fg-color;
     font-weight: 600;
-    font-size: 14px;
+    font-size: 0.933rem;
     padding: 0 5px;
     background-color: $roomtile-name-color;
 }
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index d1687743d6..07daf3f865 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -77,7 +77,7 @@ limitations under the License.
             grid-column: 1 / 3;
             grid-row: 1;
             margin: 0;
-            font-size: 15px;
+            font-size: 1rem;
             font-weight: 600;
         }
 
@@ -96,11 +96,11 @@ limitations under the License.
             white-space: nowrap;
             text-overflow: ellipsis;
             margin: 4px 0 11px 0;
-            font-size: 12px;
+            font-size: 0.8rem;
         }
 
         .mx_Toast_deviceID {
-            font-size: 10px;
+            font-size: 0.667rem;
         }
     }
 }
diff --git a/res/css/structures/_TopLeftMenuButton.scss b/res/css/structures/_TopLeftMenuButton.scss
index ee03978f18..9bdffb530a 100644
--- a/res/css/structures/_TopLeftMenuButton.scss
+++ b/res/css/structures/_TopLeftMenuButton.scss
@@ -32,7 +32,7 @@ limitations under the License.
 
 .mx_TopLeftMenuButton_name {
     margin: 0 7px;
-    font-size: 18px;
+    font-size: 1.2rem;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index b908861c6f..c84c48240e 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -29,7 +29,7 @@ limitations under the License.
 
 .mx_ViewSource pre {
     text-align: left;
-    font-size: 12px;
+    font-size: 0.8rem;
     padding: 0.5em 1em 0.5em 1em;
     word-wrap: break-word;
     white-space: pre-wrap;
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 601492d43c..9367c2c996 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -34,7 +34,7 @@ limitations under the License.
 }
 
 .mx_CompleteSecurity_body {
-    font-size: 15px;
+    font-size: 1rem;
 }
 
 .mx_CompleteSecurity_waiting {
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 7c5b008535..219bf6d0e7 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -17,7 +17,7 @@ limitations under the License.
 
 .mx_AuthBody {
     width: 500px;
-    font-size: 12px;
+    font-size: 0.8rem;
     color: $authpage-secondary-color;
     background-color: $authpage-body-bg-color;
     border-radius: 0 4px 4px 0;
@@ -25,14 +25,14 @@ limitations under the License.
     box-sizing: border-box;
 
     h2 {
-        font-size: 24px;
+        font-size: 1.600rem;
         font-weight: 600;
         margin-top: 8px;
         color: $authpage-primary-color;
     }
 
     h3 {
-        font-size: 14px;
+        font-size: 0.933rem;
         font-weight: 600;
         color: $authpage-primary-color;
     }
@@ -98,7 +98,7 @@ limitations under the License.
 
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
-    font-size: 12px;
+    font-size: 0.8rem;
     font-weight: normal;
 }
 
diff --git a/res/css/views/auth/_AuthButtons.scss b/res/css/views/auth/_AuthButtons.scss
index 553adeee14..109a1f4670 100644
--- a/res/css/views/auth/_AuthButtons.scss
+++ b/res/css/views/auth/_AuthButtons.scss
@@ -43,7 +43,7 @@ limitations under the License.
 
     cursor: pointer;
 
-    font-size: 15px;
+    font-size: 1rem;
     padding: 0 11px;
     word-break: break-word;
 }
diff --git a/res/css/views/auth/_AuthFooter.scss b/res/css/views/auth/_AuthFooter.scss
index ab169a6898..b1bdcb697e 100644
--- a/res/css/views/auth/_AuthFooter.scss
+++ b/res/css/views/auth/_AuthFooter.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_AuthFooter {
     text-align: center;
     width: 100%;
-    font-size: 14px;
+    font-size: 0.933rem;
     opacity: 0.72;
     padding: 20px 0;
     background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
diff --git a/res/css/views/auth/_CompleteSecurityBody.scss b/res/css/views/auth/_CompleteSecurityBody.scss
index c7860fbe74..af0620c329 100644
--- a/res/css/views/auth/_CompleteSecurityBody.scss
+++ b/res/css/views/auth/_CompleteSecurityBody.scss
@@ -24,13 +24,13 @@ limitations under the License.
     box-sizing: border-box;
 
     h2 {
-        font-size: 24px;
+        font-size: 1.600rem;
         font-weight: 600;
         margin-top: 0;
     }
 
     h3 {
-        font-size: 14px;
+        font-size: 0.933rem;
         font-weight: 600;
     }
 
diff --git a/res/css/views/auth/_LanguageSelector.scss b/res/css/views/auth/_LanguageSelector.scss
index 6f7eac0cf6..e9ac8688ed 100644
--- a/res/css/views/auth/_LanguageSelector.scss
+++ b/res/css/views/auth/_LanguageSelector.scss
@@ -20,7 +20,7 @@ limitations under the License.
 
 .mx_AuthBody_language .mx_Dropdown_input {
     border: none;
-    font-size: 14px;
+    font-size: 0.933rem;
     font-weight: 600;
     color: $authpage-lang-color;
 }
diff --git a/res/css/views/auth/_ServerTypeSelector.scss b/res/css/views/auth/_ServerTypeSelector.scss
index ed781726b7..2042358b8a 100644
--- a/res/css/views/auth/_ServerTypeSelector.scss
+++ b/res/css/views/auth/_ServerTypeSelector.scss
@@ -65,5 +65,5 @@ limitations under the License.
 }
 
 .mx_ServerTypeSelector_description {
-    font-size: 10px;
+    font-size: 0.667rem;
 }
diff --git a/res/css/views/context_menus/_RoomTileContextMenu.scss b/res/css/views/context_menus/_RoomTileContextMenu.scss
index 308cecfe1e..1e1a5f889f 100644
--- a/res/css/views/context_menus/_RoomTileContextMenu.scss
+++ b/res/css/views/context_menus/_RoomTileContextMenu.scss
@@ -38,7 +38,7 @@ limitations under the License.
     white-space: nowrap;
     display: flex;
     align-items: center;
-    line-height: 16px;
+    line-height: 1.067rem;
 }
 
 .mx_RoomTileContextMenu_tag_field.mx_RoomTileContextMenu_tag_fieldSet {
diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index 2c8d608950..b68d16281a 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -44,7 +44,7 @@ input.mx_StatusMessageContextMenu_message {
 .mx_StatusMessageContextMenu_clear {
     @mixin mx_DialogButton;
     align-self: start;
-    font-size: 12px;
+    font-size: 0.8rem;
     padding: 6px 1em;
     border: 1px solid transparent;
     margin-right: 10px;
diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
index 46b279ce2d..20f95d7f84 100644
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ b/res/css/views/context_menus/_TagTileContextMenu.scss
@@ -22,7 +22,7 @@ limitations under the License.
     white-space: nowrap;
     display: flex;
     align-items: center;
-    line-height: 16px;
+    line-height: 1.067rem;
 }
 
 .mx_TagTileContextMenu_item object {
diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss
index ed0d0106bc..abcaa4fcb5 100644
--- a/res/css/views/context_menus/_TopLeftMenu.scss
+++ b/res/css/views/context_menus/_TopLeftMenu.scss
@@ -19,12 +19,12 @@ limitations under the License.
     border-radius: 4px;
 
     .mx_TopLeftMenu_greyedText {
-        font-size: 12px;
+        font-size: 0.8rem;
         opacity: 0.5;
     }
 
     .mx_TopLeftMenu_upgradeLink {
-        font-size: 12px;
+        font-size: 0.8rem;
 
         img {
             margin-left: 5px;
diff --git a/res/css/views/dialogs/_AddressPickerDialog.scss b/res/css/views/dialogs/_AddressPickerDialog.scss
index 39a9260ba3..6b107b3253 100644
--- a/res/css/views/dialogs/_AddressPickerDialog.scss
+++ b/res/css/views/dialogs/_AddressPickerDialog.scss
@@ -28,7 +28,7 @@ limitations under the License.
 .mx_AddressPickerDialog_input,
 .mx_AddressPickerDialog_input:focus {
     height: 26px;
-    font-size: 14px;
+    font-size: 0.933rem;
     font-family: $font-family;
     padding-left: 12px;
     padding-right: 12px;
@@ -50,7 +50,7 @@ limitations under the License.
 .mx_AddressPickerDialog_inputContainer {
     border-radius: 3px;
     border: solid 1px $input-border-color;
-    line-height: 36px;
+    line-height: 2.400rem;
     padding-left: 4px;
     padding-right: 4px;
     padding-top: 1px;
diff --git a/res/css/views/dialogs/_ConfirmUserActionDialog.scss b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
index b859d6bf4d..e589ef0450 100644
--- a/res/css/views/dialogs/_ConfirmUserActionDialog.scss
+++ b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
@@ -26,22 +26,22 @@ limitations under the License.
 }
 
 .mx_ConfirmUserActionDialog_name {
-    font-size: 18px;
+    font-size: 1.2rem;
 }
 
 .mx_ConfirmUserActionDialog_userId {
-    font-size: 13px;
+    font-size: 0.867rem;
 }
 
 .mx_ConfirmUserActionDialog_reasonField {
     font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
 
     border-radius: 3px;
     border: solid 1px $input-border-color;
-    line-height: 36px;
+    line-height: 2.400rem;
     padding-left: 16px;
     padding-right: 16px;
     padding-top: 1px;
diff --git a/res/css/views/dialogs/_CreateGroupDialog.scss b/res/css/views/dialogs/_CreateGroupDialog.scss
index 128eacc3ce..4159944e5d 100644
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ b/res/css/views/dialogs/_CreateGroupDialog.scss
@@ -25,7 +25,7 @@ limitations under the License.
 }
 
 .mx_CreateGroupDialog_input {
-    font-size: 15px;
+    font-size: 1rem;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
@@ -44,7 +44,7 @@ limitations under the License.
 .mx_CreateGroupDialog_prefix,
 .mx_CreateGroupDialog_suffix {
     padding: 0px 5px;
-    line-height: 37px;
+    line-height: 2.467rem;
     background-color: $input-darker-bg-color;
     border: 1px solid $input-border-color;
     text-align: center;
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 7416ec2ef4..1cdbe99843 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -49,7 +49,7 @@ limitations under the License.
 }
 
 .mx_CreateRoomDialog_input {
-    font-size: 15px;
+    font-size: 1rem;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 500c46b5fd..399c7225f6 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -68,11 +68,11 @@ limitations under the License.
     width: 240px;
     color: $input-fg-color;
     font-family: $font-family;
-    font-size: 16px;
+    font-size: 1.067rem;
 }
 
 .mx_DevTools_textarea {
-    font-size: 12px;
+    font-size: 0.8rem;
     max-width: 684px;
     min-height: 250px;
     padding: 10px;
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 5e0893b8fd..22b1867002 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -40,8 +40,8 @@ limitations under the License.
         textarea,
         textarea:focus {
             height: 34px;
-            line-height: 34px;
-            font-size: 14px;
+            line-height: 2.267rem;
+            font-size: 0.933rem;
             padding-left: 12px;
             margin: 0 !important;
             border: 0 !important;
@@ -65,7 +65,7 @@ limitations under the License.
         min-width: 48px;
         margin-left: 10px;
         height: 25px;
-        line-height: 25px;
+        line-height: 1.667rem;
     }
 
     .mx_InviteDialog_buttonAndSpinner {
@@ -84,7 +84,7 @@ limitations under the License.
     padding-bottom: 10px;
 
     h3 {
-        font-size: 12px;
+        font-size: 0.8rem;
         color: $muted-fg-color;
         font-weight: bold;
         text-transform: uppercase;
@@ -143,23 +143,23 @@ limitations under the License.
 
     .mx_InviteDialog_roomTile_name {
         font-weight: 600;
-        font-size: 14px;
+        font-size: 0.933rem;
         color: $primary-fg-color;
         margin-left: 7px;
     }
 
     .mx_InviteDialog_roomTile_userId {
-        font-size: 12px;
+        font-size: 0.8rem;
         color: $muted-fg-color;
         margin-left: 7px;
     }
 
     .mx_InviteDialog_roomTile_time {
         text-align: right;
-        font-size: 12px;
+        font-size: 0.8rem;
         color: $muted-fg-color;
         float: right;
-        line-height: 36px; // Height of the avatar to keep the time vertically aligned
+        line-height: 2.400rem; // Height of the avatar to keep the time vertically aligned
     }
 
     .mx_InviteDialog_roomTile_highlight {
@@ -176,7 +176,7 @@ limitations under the License.
         border-radius: 12px;
         display: inline-block;
         height: 24px;
-        line-height: 24px;
+        line-height: 1.600rem;
         padding-left: 8px;
         padding-right: 8px;
         color: #ffffff; // this is fine without a var because it's for both themes
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.scss b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
index 0066faccae..8d989f6a00 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -35,7 +35,7 @@ limitations under the License.
 
 .mx_MessageEditHistoryDialog_edits {
     list-style-type: none;
-    font-size: 14px;
+    font-size: 0.933rem;
     padding: 0;
     color: $primary-fg-color;
 
@@ -60,7 +60,7 @@ limitations under the License.
     }
 
     .mx_MessageActionBar .mx_AccessibleButton {
-        font-size: 10px;
+        font-size: 0.667rem;
         padding: 0 8px;
     }
 }
diff --git a/res/css/views/dialogs/_NewSessionReviewDialog.scss b/res/css/views/dialogs/_NewSessionReviewDialog.scss
index 7e35fe941e..633b3a063b 100644
--- a/res/css/views/dialogs/_NewSessionReviewDialog.scss
+++ b/res/css/views/dialogs/_NewSessionReviewDialog.scss
@@ -32,6 +32,6 @@ limitations under the License.
 }
 
 .mx_NewSessionReviewDialog_deviceID {
-    font-size: 12px;
+    font-size: 0.8rem;
     color: $notice-secondary-color;
 }
diff --git a/res/css/views/dialogs/_SetEmailDialog.scss b/res/css/views/dialogs/_SetEmailDialog.scss
index 9d09a208df..a5013f79b1 100644
--- a/res/css/views/dialogs/_SetEmailDialog.scss
+++ b/res/css/views/dialogs/_SetEmailDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
     padding: 9px;
     color: $input-fg-color;
     background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
     width: 100%;
     max-width: 280px;
     margin-bottom: 10px;
diff --git a/res/css/views/dialogs/_SetMxIdDialog.scss b/res/css/views/dialogs/_SetMxIdDialog.scss
index f7d8a3d001..8208a679fd 100644
--- a/res/css/views/dialogs/_SetMxIdDialog.scss
+++ b/res/css/views/dialogs/_SetMxIdDialog.scss
@@ -29,7 +29,7 @@ limitations under the License.
     padding: 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
     width: 100%;
     max-width: 280px;
 }
diff --git a/res/css/views/dialogs/_SetPasswordDialog.scss b/res/css/views/dialogs/_SetPasswordDialog.scss
index 325ff6c6ed..cff11c8afb 100644
--- a/res/css/views/dialogs/_SetPasswordDialog.scss
+++ b/res/css/views/dialogs/_SetPasswordDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
     padding: 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
     max-width: 280px;
     margin-bottom: 10px;
 }
diff --git a/res/css/views/dialogs/_TermsDialog.scss b/res/css/views/dialogs/_TermsDialog.scss
index beb507e778..e9805d1b35 100644
--- a/res/css/views/dialogs/_TermsDialog.scss
+++ b/res/css/views/dialogs/_TermsDialog.scss
@@ -31,7 +31,7 @@ limitations under the License.
 }
 
 .mx_TermsDialog_termsTable {
-    font-size: 12px;
+    font-size: 0.8rem;
     width: 100%;
 }
 
diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
index 2b0f8dceca..8bb0ed4ff4 100644
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -27,7 +27,7 @@ limitations under the License.
 // userid
 .mx_UnknownDeviceDialog p {
     font-weight: bold;
-    font-size: 16px;
+    font-size: 1.067rem;
 }
 
 .mx_UnknownDeviceDialog .mx_DeviceVerifyButtons {
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 106392f880..2f0e3e6a17 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -47,9 +47,9 @@ limitations under the License.
 
     .mx_NetworkDropdown_server_title {
         padding: 0 10px;
-        font-size: 15px;
+        font-size: 1rem;
         font-weight: 600;
-        line-height: 20px;
+        line-height: 1.333rem;
         margin-bottom: 4px;
 
         // remove server button
@@ -77,16 +77,16 @@ limitations under the License.
 
     .mx_NetworkDropdown_server_subtitle {
         padding: 0 10px;
-        font-size: 10px;
-        line-height: 14px;
+        font-size: 0.667rem;
+        line-height: 0.933rem;
         margin-top: -4px;
         margin-bottom: 4px;
         color: $muted-fg-color;
     }
 
     .mx_NetworkDropdown_server_network {
-        font-size: 12px;
-        line-height: 16px;
+        font-size: 0.8rem;
+        line-height: 1.067rem;
         padding: 4px 10px;
         cursor: pointer;
         position: relative;
@@ -154,7 +154,7 @@ limitations under the License.
 
     .mx_NetworkDropdown_handle_server {
         color: $muted-fg-color;
-        font-size: 12px;
+        font-size: 0.8rem;
     }
 }
 
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index b87071745d..b7439d5856 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -27,7 +27,7 @@ limitations under the License.
     text-align: center;
     border-radius: 4px;
     display: inline-block;
-    font-size: 14px;
+    font-size: 0.933rem;
 }
 
 .mx_AccessibleButton_kind_primary {
diff --git a/res/css/views/elements/_AddressTile.scss b/res/css/views/elements/_AddressTile.scss
index 0ecfb17c83..94028481d4 100644
--- a/res/css/views/elements/_AddressTile.scss
+++ b/res/css/views/elements/_AddressTile.scss
@@ -19,9 +19,9 @@ limitations under the License.
     border-radius: 3px;
     background-color: rgba(74, 73, 74, 0.1);
     border: solid 1px $input-border-color;
-    line-height: 26px;
+    line-height: 1.733rem;
     color: $primary-fg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
     font-weight: normal;
     margin-right: 4px;
 }
diff --git a/res/css/views/elements/_DirectorySearchBox.scss b/res/css/views/elements/_DirectorySearchBox.scss
index 75ef3fbabd..35fb80f5df 100644
--- a/res/css/views/elements/_DirectorySearchBox.scss
+++ b/res/css/views/elements/_DirectorySearchBox.scss
@@ -32,7 +32,7 @@ limitations under the License.
     background-repeat: no-repeat;
     text-indent: 18px;
     font-weight: 600;
-    font-size: 12px;
+    font-size: 0.8rem;
     user-select: none;
     cursor: pointer;
 }
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 102ac56bf9..64bcf7a33a 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -29,7 +29,7 @@ limitations under the License.
     position: relative;
     border-radius: 3px;
     border: 1px solid $strong-input-border-color;
-    font-size: 12px;
+    font-size: 0.8rem;
     user-select: none;
 }
 
@@ -53,7 +53,7 @@ limitations under the License.
 
 .mx_Dropdown_option {
     height: 35px;
-    line-height: 35px;
+    line-height: 2.333rem;
     padding-left: 8px;
     padding-right: 8px;
 }
diff --git a/res/css/views/elements/_EventListSummary.scss b/res/css/views/elements/_EventListSummary.scss
index 99a5c06a5f..a40c1384d7 100644
--- a/res/css/views/elements/_EventListSummary.scss
+++ b/res/css/views/elements/_EventListSummary.scss
@@ -19,7 +19,7 @@ limitations under the License.
 }
 
 .mx_TextualEvent.mx_EventListSummary_summary {
-    font-size: 14px;
+    font-size: 0.933rem;
     display: inline-flex;
 }
 
@@ -27,7 +27,7 @@ limitations under the License.
     display: inline-block;
     margin-right: 8px;
     padding-top: 8px;
-    line-height: 12px;
+    line-height: 0.8rem;
 }
 
 .mx_EventListSummary_avatars .mx_BaseAvatar {
@@ -46,19 +46,19 @@ limitations under the License.
 .mx_EventListSummary_line {
     border-bottom: 1px solid $primary-hairline-color;
     margin-left: 63px;
-    line-height: 30px;
+    line-height: 2.000rem;
 }
 
 .mx_MatrixChat_useCompactLayout {
     .mx_EventListSummary {
-        font-size: 13px;
+        font-size: 0.867rem;
         .mx_EventTile_line {
-            line-height: 20px;
+            line-height: 1.333rem;
         }
     }
 
     .mx_EventListSummary_line {
-        line-height: 22px;
+        line-height: 1.467rem;
     }
 
     .mx_EventListSummary_toggle {
@@ -66,6 +66,6 @@ limitations under the License.
     }
 
     .mx_TextualEvent.mx_EventListSummary_summary {
-        font-size: 13px;
+        font-size: 0.867rem;
     }
 }
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index b260d4b097..26d24dba3a 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -40,7 +40,7 @@ limitations under the License.
 .mx_Field textarea {
     font-weight: normal;
     font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
     border: none;
     // Even without a border here, we still need this avoid overlapping the rounded
     // corners on the field above.
@@ -102,7 +102,7 @@ limitations under the License.
         background-color 0.25s ease-out 0.1s;
     color: $primary-fg-color;
     background-color: transparent;
-    font-size: 14px;
+    font-size: 0.933rem;
     position: absolute;
     left: 0px;
     top: 0px;
@@ -126,7 +126,7 @@ limitations under the License.
         color 0.25s ease-out 0s,
         top 0.25s ease-out 0s,
         background-color 0.25s ease-out 0s;
-    font-size: 10px;
+    font-size: 0.667rem;
     top: -13px;
     padding: 0 2px;
     background-color: $field-focused-label-bg-color;
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
index 1483fe2091..c23ab6ee30 100644
--- a/res/css/views/elements/_FormButton.scss
+++ b/res/css/views/elements/_FormButton.scss
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 .mx_FormButton {
-    line-height: 16px;
+    line-height: 1.067rem;
     padding: 5px 15px;
-    font-size: 12px;
+    font-size: 0.8rem;
     height: min-content;
 
     &:not(:last-child) {
diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 67b0d6d7df..cc7fca67d3 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -102,13 +102,13 @@ limitations under the License.
 }
 
 .mx_ImageView_name {
-    font-size: 18px;
+    font-size: 1.2rem;
     margin-bottom: 6px;
     word-wrap: break-word;
 }
 
 .mx_ImageView_metadata {
-    font-size: 15px;
+    font-size: 1rem;
     opacity: 0.5;
 }
 
@@ -118,13 +118,13 @@ limitations under the License.
     margin-bottom: 6px;
     border-radius: 5px;
     background-color: $lightbox-bg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
     padding: 9px;
     border: 1px solid $lightbox-border-color;
 }
 
 .mx_ImageView_size {
-    font-size: 11px;
+    font-size: 0.733rem;
 }
 
 .mx_ImageView_link {
@@ -133,7 +133,7 @@ limitations under the License.
 }
 
 .mx_ImageView_button {
-    font-size: 15px;
+    font-size: 1rem;
     opacity: 0.5;
     margin-top: 18px;
     cursor: pointer;
diff --git a/res/css/views/elements/_InteractiveTooltip.scss b/res/css/views/elements/_InteractiveTooltip.scss
index 17a76436e8..07441ef85d 100644
--- a/res/css/views/elements/_InteractiveTooltip.scss
+++ b/res/css/views/elements/_InteractiveTooltip.scss
@@ -24,7 +24,7 @@ limitations under the License.
     background-color: $interactive-tooltip-bg-color;
     color: $interactive-tooltip-fg-color;
     position: absolute;
-    font-size: 10px;
+    font-size: 0.667rem;
     font-weight: 600;
     padding: 6px;
     z-index: 5001;
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 5066ee10f3..d821f52e3d 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -9,7 +9,7 @@
     border-radius: 16px;
     display: inline-block;
     height: 20px;
-    line-height: 20px;
+    line-height: 1.333rem;
     padding-left: 5px;
 }
 
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index cc4eb409df..61762ced92 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -58,8 +58,8 @@ limitations under the License.
     z-index: 4000; // Higher than dialogs so tooltips can be used in dialogs
     padding: 10px;
     pointer-events: none;
-    line-height: 14px;
-    font-size: 12px;
+    line-height: 0.933rem;
+    font-size: 0.8rem;
     font-weight: 600;
     color: $primary-fg-color;
     max-width: 200px;
@@ -82,7 +82,7 @@ limitations under the License.
     text-align: center;
     border: none;
     border-radius: 3px;
-    font-size: 14px;
+    font-size: 0.933rem;
     line-height: 1.2;
     padding: 6px 8px;
 
diff --git a/res/css/views/elements/_TooltipButton.scss b/res/css/views/elements/_TooltipButton.scss
index 6ea36c800e..c350fc22e2 100644
--- a/res/css/views/elements/_TooltipButton.scss
+++ b/res/css/views/elements/_TooltipButton.scss
@@ -28,7 +28,7 @@ limitations under the License.
     transition: opacity 0.2s ease-in;
     opacity: 0.6;
 
-    line-height: 11px;
+    line-height: 0.733rem;
     text-align: center;
 
     cursor: pointer;
@@ -47,6 +47,6 @@ limitations under the License.
 .mx_TooltipButton_helpText {
     width: 400px;
     text-align: start;
-    line-height: 17px !important;
+    line-height: 1.133rem !important;
 }
 
diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 5d9b3f2687..64b27b9ab3 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -163,7 +163,7 @@ limitations under the License.
 
 .mx_EmojiPicker_item {
     display: inline-block;
-    font-size: 20px;
+    font-size: 1.333rem;
     padding: 5px;
     width: 100%;
     height: 100%;
@@ -183,7 +183,7 @@ limitations under the License.
 }
 
 .mx_EmojiPicker_category_label, .mx_EmojiPicker_preview_name {
-    font-size: 16px;
+    font-size: 1.067rem;
     font-weight: 600;
     margin: 0;
 }
@@ -197,7 +197,7 @@ limitations under the License.
 }
 
 .mx_EmojiPicker_preview_emoji {
-    font-size: 32px;
+    font-size: 2.133rem;
     padding: 8px 16px;
 }
 
@@ -212,7 +212,7 @@ limitations under the License.
 
 .mx_EmojiPicker_shortcode {
     color: $light-fg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
 
     &::before, &::after {
         content: ":";
diff --git a/res/css/views/messages/_DateSeparator.scss b/res/css/views/messages/_DateSeparator.scss
index 935ee1aba3..b02e72814f 100644
--- a/res/css/views/messages/_DateSeparator.scss
+++ b/res/css/views/messages/_DateSeparator.scss
@@ -19,7 +19,7 @@ limitations under the License.
     margin: 4px 0;
     display: flex;
     align-items: center;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $roomtopic-color;
 }
 
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index c032051c36..66ba0b227d 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -21,7 +21,7 @@ limitations under the License.
     cursor: pointer;
     display: flex;
     height: 24px;
-    line-height: 24px;
+    line-height: 1.600rem;
     border-radius: 4px;
     background: $message-action-bar-bg-color;
     top: -18px;
diff --git a/res/css/views/messages/_MessageTimestamp.scss b/res/css/views/messages/_MessageTimestamp.scss
index e5c228aa68..3a2a8d6336 100644
--- a/res/css/views/messages/_MessageTimestamp.scss
+++ b/res/css/views/messages/_MessageTimestamp.scss
@@ -16,5 +16,5 @@ limitations under the License.
 
 .mx_MessageTimestamp {
     color: $event-timestamp-color;
-    font-size: 10px;
+    font-size: 0.667rem;
 }
diff --git a/res/css/views/messages/_ReactionsRow.scss b/res/css/views/messages/_ReactionsRow.scss
index 57c02ed3e5..ee816e0fc0 100644
--- a/res/css/views/messages/_ReactionsRow.scss
+++ b/res/css/views/messages/_ReactionsRow.scss
@@ -21,7 +21,7 @@ limitations under the License.
 
 .mx_ReactionsRow_showAll {
     text-decoration: none;
-    font-size: 10px;
+    font-size: 0.667rem;
     font-weight: 600;
     margin-left: 6px;
     vertical-align: top;
diff --git a/res/css/views/messages/_ReactionsRowButton.scss b/res/css/views/messages/_ReactionsRowButton.scss
index e54201d963..7160c223be 100644
--- a/res/css/views/messages/_ReactionsRowButton.scss
+++ b/res/css/views/messages/_ReactionsRowButton.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_ReactionsRowButton {
     display: inline-flex;
     height: 20px;
-    line-height: 21px;
+    line-height: 1.400rem;
     margin-right: 6px;
     padding: 0 6px;
     border: 1px solid $reaction-row-button-border-color;
diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss
index a15924e759..088b66445d 100644
--- a/res/css/views/messages/_ViewSourceEvent.scss
+++ b/res/css/views/messages/_ViewSourceEvent.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_EventTile_content.mx_ViewSourceEvent {
     display: flex;
     opacity: 0.6;
-    font-size: 12px;
+    font-size: 0.8rem;
 
     pre, code {
         flex: 1;
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index 98e1e97e39..c9499b763f 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -45,7 +45,7 @@ limitations under the License.
 
     .mx_cryptoEvent_title {
         font-weight: 600;
-        font-size: 15px;
+        font-size: 1rem;
         grid-column: 2;
         grid-row: 1;
     }
@@ -56,7 +56,7 @@ limitations under the License.
     }
 
     .mx_cryptoEvent_state, .mx_cryptoEvent_subtitle {
-        font-size: 12px;
+        font-size: 0.8rem;
     }
 
     .mx_cryptoEvent_state, .mx_cryptoEvent_buttons {
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 0e4b1bda9e..acc5e4641f 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: column;
     flex: 1;
     overflow-y: auto;
-    font-size: 12px;
+    font-size: 0.8rem;
 
     .mx_UserInfo_cancel {
         cursor: pointer;
@@ -43,7 +43,7 @@ limitations under the License.
     }
 
     h2 {
-        font-size: 18px;
+        font-size: 1.2rem;
         font-weight: 600;
         margin: 18px 0 0 0;
     }
@@ -109,7 +109,7 @@ limitations under the License.
         justify-content: center;
 
         // override the calculated sizes so that the letter isn't HUGE
-        font-size: 56px !important;
+        font-size: 3.733rem !important;
         width: 100% !important;
         transition: font-size 0.5s;
     }
@@ -122,7 +122,7 @@ limitations under the License.
         text-transform: uppercase;
         color: $notice-secondary-color;
         font-weight: bold;
-        font-size: 12px;
+        font-size: 0.8rem;
         margin: 4px 0;
     }
 
@@ -134,8 +134,8 @@ limitations under the License.
         text-align: center;
 
         h2 {
-            font-size: 18px;
-            line-height: 25px;
+            font-size: 1.2rem;
+            line-height: 1.667rem;
             flex: 1;
             justify-content: center;
             align-items: center;
@@ -197,7 +197,7 @@ limitations under the License.
     .mx_UserInfo_field {
         cursor: pointer;
         color: $accent-color;
-        line-height: 16px;
+        line-height: 1.067rem;
         margin: 8px 0;
 
         &.mx_UserInfo_destructive {
@@ -206,7 +206,7 @@ limitations under the License.
     }
 
     .mx_UserInfo_statusMessage {
-        font-size: 11px;
+        font-size: 0.733rem;
         opacity: 0.5;
         overflow: hidden;
         white-space: nowrap;
@@ -282,6 +282,6 @@ limitations under the License.
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar_initial {
-        font-size: 40px !important; // override the other override because here the avatar is smaller
+        font-size: 2.667rem !important; // override the other override because here the avatar is smaller
     }
 }
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 459622b277..4a10dcbbcd 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -95,7 +95,7 @@ limitations under the License.
             }
 
             .mx_VerificationPanel_QRPhase_helpText {
-                font-size: 14px;
+                font-size: 0.933rem;
                 margin-top: 71px;
                 text-align: center;
             }
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index a3fe573ad0..171cf49ba5 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -46,7 +46,7 @@ $AppsDrawerBodyHeight: 273px;
     padding: 0;
     margin: 5px auto 5px auto;
     color: $accent-color;
-    font-size: 12px;
+    font-size: 0.8rem;
 }
 
 .mx_AddWidget_button_full_width {
@@ -59,7 +59,7 @@ $AppsDrawerBodyHeight: 273px;
     padding: 9px;
     color: $primary-hairline-color;
     background-color: $primary-bg-color;
-    font-size: 15px;
+    font-size: 1rem;
 }
 
 .mx_AppTile {
@@ -102,7 +102,7 @@ $AppsDrawerBodyHeight: 273px;
 
 .mx_AppTileMenuBar {
     margin: 0;
-    font-size: 12px;
+    font-size: 0.8rem;
     background-color: $widget-menu-bar-bg-color;
     display: flex;
     flex-direction: row;
@@ -272,7 +272,7 @@ form.mx_Custom_Widget_Form div {
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    font-size: 16px;
+    font-size: 1.067rem;
 }
 
 .mx_AppPermissionWarning_row {
@@ -280,7 +280,7 @@ form.mx_Custom_Widget_Form div {
 }
 
 .mx_AppPermissionWarning_smallText {
-    font-size: 12px;
+    font-size: 0.8rem;
 }
 
 .mx_AppPermissionWarning_bolder {
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index ce519b1ea7..c1f9663ea3 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -63,8 +63,8 @@ limitations under the License.
                 border-radius: 8px;
                 text-align: center;
                 font-weight: normal;
-                line-height: 16px;
-                font-size: 10.4px;
+                line-height: 1.067rem;
+                font-size: 0.667rem;
             }
         }
     }
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index a2867de3a7..d66e4efe5c 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -78,7 +78,7 @@ limitations under the License.
 .mx_GroupRoomTile_name {
     flex: 1 1 0;
     overflow: hidden;
-    font-size: 14px;
+    font-size: 0.933rem;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
@@ -116,7 +116,7 @@ limitations under the License.
 }
 
 .mx_EntityTile_subtext {
-    font-size: 11px;
+    font-size: 0.733rem;
     opacity: 0.5;
     overflow: hidden;
     white-space: nowrap;
@@ -125,7 +125,7 @@ limitations under the License.
 
 .mx_EntityTile_power {
     padding-inline-start: 6px;
-    font-size: 10px;
+    font-size: 0.667rem;
     color: $notice-secondary-color;
     max-width: 6em;
     overflow: hidden;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 2fa9994155..436b158644 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -19,7 +19,7 @@ limitations under the License.
     max-width: 100%;
     clear: both;
     padding-top: 18px;
-    font-size: 14px;
+    font-size: 0.933rem;
     position: relative;
 }
 
@@ -64,7 +64,7 @@ limitations under the License.
 
 .mx_EventTile .mx_SenderProfile {
     color: $primary-fg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
     display: inline-block; /* anti-zalgo, with overflow hidden */
     overflow: hidden;
     cursor: pointer;
@@ -72,7 +72,7 @@ limitations under the License.
     padding-bottom: 0px;
     padding-top: 0px;
     margin: 0px;
-    line-height: 17px;
+    line-height: 1.133rem;
     /* the next three lines, along with overflow hidden, truncate long display names */
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -117,7 +117,7 @@ limitations under the License.
     padding-bottom: 2px;
     border-radius: 4px;
     min-height: 24px;
-    line-height: 22px;
+    line-height: 1.467rem;
 }
 
 .mx_RoomView_timeline_rr_enabled {
@@ -152,8 +152,8 @@ limitations under the License.
 
 /* HACK to override line-height which is already marked important elsewhere */
 .mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
-    font-size: 48px !important;
-    line-height: 57px !important;
+    font-size: 3.200rem !important;
+    line-height: 3.800rem !important;
 }
 
 .mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
@@ -312,7 +312,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_readAvatarRemainder {
     color: $event-timestamp-color;
-    font-size: 11px;
+    font-size: 0.733rem;
     position: absolute;
 }
 
@@ -341,7 +341,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_spoiler_reason {
     color: $event-timestamp-color;
-    font-size: 11px;
+    font-size: 0.733rem;
 }
 
 .mx_EventTile_spoiler_content {
@@ -393,7 +393,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 }
 
 .mx_EventTile_keyRequestInfo {
-    font-size: 12px;
+    font-size: 0.8rem;
 }
 
 .mx_EventTile_keyRequestInfo_text {
@@ -471,7 +471,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_content .mx_EventTile_edited {
     user-select: none;
-    font-size: 12px;
+    font-size: 0.8rem;
     color: $roomtopic-color;
     display: inline-block;
     margin-left: 9px;
@@ -489,7 +489,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     white-space: normal !important;
     line-height: inherit !important;
     color: inherit; // inherit the colour from the dark or light theme by default (but not for code blocks)
-    font-size: 14px;
+    font-size: 0.933rem;
 
     pre, code {
         font-family: $monospace-font-family !important;
@@ -589,9 +589,9 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     .mx_EventTile.mx_EventTile_info {
         // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
         padding-top: 0px;
-        font-size: 13px;
+        font-size: 0.867rem;
         .mx_EventTile_line, .mx_EventTile_reply {
-            line-height: 20px;
+            line-height: 1.333rem;
         }
         .mx_EventTile_avatar {
             top: 4px;
@@ -599,7 +599,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     }
 
     .mx_EventTile .mx_SenderProfile {
-        font-size: 13px;
+        font-size: 0.867rem;
     }
 
     .mx_EventTile.mx_EventTile_emote {
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 7f458092fb..2c44eed1b8 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -34,8 +34,8 @@ limitations under the License.
     top: -12px;
     border-radius: 16px;
     font-weight: bold;
-    font-size: 12px;
-    line-height: 14px;
+    font-size: 0.8rem;
+    line-height: 0.933rem;
     text-align: center;
     // to be able to get it centered
     // with text-align in parent
diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss
index 15b4832dc5..fe5a4b7659 100644
--- a/res/css/views/rooms/_MemberDeviceInfo.scss
+++ b/res/css/views/rooms/_MemberDeviceInfo.scss
@@ -59,7 +59,7 @@ limitations under the License.
 
 .mx_MemberDeviceInfo_deviceId {
     word-break: break-word;
-    font-size: 13px;
+    font-size: 0.867rem;
 }
 
 .mx_MemberDeviceInfo_deviceInfo {
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index e3f746e9d3..d4c8fbb097 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -48,7 +48,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo h2 {
-    font-size: 18px;
+    font-size: 1.2rem;
     font-weight: 600;
     margin: 16px 0 16px 15px;
 }
@@ -94,12 +94,12 @@ limitations under the License.
     text-transform: uppercase;
     color: $input-darker-fg-color;
     font-weight: bold;
-    font-size: 12px;
+    font-size: 0.8rem;
     margin: 4px 0;
 }
 
 .mx_MemberInfo_profileField {
-    font-size: 15px;
+    font-size: 1rem;
     position: relative;
 }
 
@@ -109,10 +109,10 @@ limitations under the License.
 
 .mx_MemberInfo_field {
     cursor: pointer;
-    font-size: 15px;
+    font-size: 1rem;
     color: $primary-fg-color;
     margin-left: 8px;
-    line-height: 23px;
+    line-height: 1.533rem;
 }
 
 .mx_MemberInfo_createRoom {
@@ -128,7 +128,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo label {
-    font-size: 13px;
+    font-size: 0.867rem;
 }
 
 .mx_MemberInfo label .mx_MemberInfo_label_text {
@@ -144,7 +144,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo_statusMessage {
-    font-size: 11px;
+    font-size: 0.733rem;
     opacity: 0.5;
     overflow: hidden;
     white-space: nowrap;
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 6e4465583c..0f676645a9 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -30,7 +30,7 @@ limitations under the License.
         text-transform: uppercase;
         color: $h3-color;
         font-weight: 600;
-        font-size: 13px;
+        font-size: 0.867rem;
         padding-left: 3px;
         padding-right: 12px;
         margin-top: 8px;
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index a05b4c0c0e..3777acf423 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -105,7 +105,7 @@ limitations under the License.
     min-height: 60px;
     justify-content: flex-start;
     align-items: flex-start;
-    font-size: 14px;
+    font-size: 0.933rem;
     margin-right: 6px;
 }
 
@@ -161,7 +161,7 @@ limitations under the License.
     box-shadow: none;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
     max-height: 120px;
     overflow: auto;
     /* needed for FF */
@@ -242,7 +242,7 @@ limitations under the License.
 
     flex-direction: row;
     align-items: center;
-    font-size: 10px;
+    font-size: 0.667rem;
     color: $greyed-fg-color;
 }
 
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss
index 1b5a21bed0..0558cd48cf 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.scss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.scss
@@ -97,13 +97,13 @@ limitations under the License.
 
 .mx_MessageComposerFormatBar_buttonTooltip {
     white-space: nowrap;
-    font-size: 13px;
+    font-size: 0.867rem;
     font-weight: 600;
     min-width: 54px;
     text-align: center;
 
     .mx_MessageComposerFormatBar_tooltipShortcut {
-        font-size: 9px;
+        font-size: 0.600rem;
         opacity: 0.7;
     }
 }
diff --git a/res/css/views/rooms/_PresenceLabel.scss b/res/css/views/rooms/_PresenceLabel.scss
index 26ed1aa6a3..6d044a69b5 100644
--- a/res/css/views/rooms/_PresenceLabel.scss
+++ b/res/css/views/rooms/_PresenceLabel.scss
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 .mx_PresenceLabel {
-    font-size: 11px;
+    font-size: 0.733rem;
     opacity: 0.5;
 }
diff --git a/res/css/views/rooms/_RoomDropTarget.scss b/res/css/views/rooms/_RoomDropTarget.scss
index 1076a0563a..1ae8f73e88 100644
--- a/res/css/views/rooms/_RoomDropTarget.scss
+++ b/res/css/views/rooms/_RoomDropTarget.scss
@@ -28,7 +28,7 @@ limitations under the License.
 }
 
 .mx_RoomDropTarget {
-    font-size: 13px;
+    font-size: 0.867rem;
     padding-top: 5px;
     padding-bottom: 5px;
     border: 1px dashed $accent-color;
@@ -41,7 +41,7 @@ limitations under the License.
 .mx_RoomDropTarget_label {
     position: relative;
     margin-top: 3px;
-    line-height: 21px;
+    line-height: 1.400rem;
     z-index: 1;
     text-align: center;
 }
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 47b8131ef0..1737014248 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -77,9 +77,9 @@ limitations under the License.
 }
 
 .mx_RoomHeader_simpleHeader {
-    line-height: 52px;
+    line-height: 3.467rem;
     color: $roomheader-color;
-    font-size: 18px;
+    font-size: 1.2rem;
     font-weight: 600;
     overflow: hidden;
     margin-left: 63px;
@@ -102,7 +102,7 @@ limitations under the License.
     overflow: hidden;
     color: $roomheader-color;
     font-weight: 600;
-    font-size: 18px;
+    font-size: 1.2rem;
     margin: 0 7px;
     border-bottom: 1px solid transparent;
     display: flex;
@@ -161,7 +161,7 @@ limitations under the License.
     flex: 1;
     color: $roomtopic-color;
     font-weight: 400;
-    font-size: 13px;
+    font-size: 0.867rem;
     margin: 0 7px;
     margin-top: 4px; // to align baseline of topic with room name
     overflow: hidden;
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 5ed22f997d..b9cb2dc8e4 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -47,13 +47,13 @@ limitations under the License.
 }
 
 .mx_RoomList_emptySubListTip {
-    font-size: 13px;
+    font-size: 0.867rem;
     padding: 5px;
     border: 1px dashed $accent-color;
     color: $primary-fg-color;
     background-color: $droptarget-bg-color;
     border-radius: 4px;
-    line-height: 16px;
+    line-height: 1.067rem;
 }
 
 .mx_RoomList_emptySubListTip .mx_RoleButton {
diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 981cf06c69..8e61524fda 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -23,7 +23,7 @@ limitations under the License.
     -webkit-align-items: center;
 
     h3 {
-        font-size: 18px;
+        font-size: 1.2rem;
         font-weight: 600;
 
         &.mx_RoomPreviewBar_spinnerTitle {
@@ -48,8 +48,8 @@ limitations under the License.
     }
 
     .mx_RoomPreviewBar_footer {
-        font-size: 12px;
-        line-height: 20px;
+        font-size: 0.8rem;
+        line-height: 1.333rem;
 
         .mx_Spinner {
             vertical-align: middle;
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 31d887cbbb..57d42f6be2 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -64,7 +64,7 @@ limitations under the License.
 
 .mx_RoomTile_subtext {
     display: inline-block;
-    font-size: 11px;
+    font-size: 0.733rem;
     padding: 0 0 0 7px;
     margin: 0;
     overflow: hidden;
@@ -112,7 +112,7 @@ limitations under the License.
 }
 
 .mx_RoomTile_name {
-    font-size: 14px;
+    font-size: 0.933rem;
     padding: 0 4px;
     color: $roomtile-name-color;
     white-space: nowrap;
@@ -126,7 +126,7 @@ limitations under the License.
     padding: 0 0.4em;
     color: $roomtile-badge-fg-color;
     font-weight: 600;
-    font-size: 12px;
+    font-size: 0.8rem;
 }
 
 .collapsed {
diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss
index b6748e5ad2..5b80585cef 100644
--- a/res/css/views/rooms/_SearchBar.scss
+++ b/res/css/views/rooms/_SearchBar.scss
@@ -22,7 +22,7 @@ limitations under the License.
 
     .mx_SearchBar_input {
         // border: 1px solid $input-border-color;
-        // font-size: 15px;
+        // font-size: 1rem;
         flex: 1 1 0;
         margin-left: 22px;
     }
@@ -45,7 +45,7 @@ limitations under the License.
         border: 0;
         margin: 0 0 0 22px;
         padding: 5px;
-        font-size: 15px;
+        font-size: 1rem;
         cursor: pointer;
         color: $primary-fg-color;
         border-bottom: 2px solid $accent-color;
diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss
index d20f7107b3..7233d373a3 100644
--- a/res/css/views/rooms/_SendMessageComposer.scss
+++ b/res/css/views/rooms/_SendMessageComposer.scss
@@ -18,7 +18,7 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
-    font-size: 14px;
+    font-size: 0.933rem;
     justify-content: center;
     margin-right: 6px;
     // don't grow wider than available space
diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index 579ea7e73e..a1e6f3a3bf 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -49,7 +49,7 @@ limitations under the License.
     border-radius: 40px;
     width: 24px;
     height: 24px;
-    line-height: 24px;
+    line-height: 1.600rem;
     font-size: 0.8em;
     vertical-align: top;
     text-align: center;
@@ -57,7 +57,7 @@ limitations under the License.
 
 .mx_WhoIsTypingTile_label {
     flex: 1;
-    font-size: 14px;
+    font-size: 0.933rem;
     font-weight: 600;
     color: $eventtile-meta-color;
 }
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 01a1d94956..03bd3221cd 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -19,7 +19,7 @@ limitations under the License.
 }
 
 .mx_SettingsTab_heading {
-    font-size: 20px;
+    font-size: 1.333rem;
     font-weight: 600;
     color: $primary-fg-color;
 }
@@ -29,7 +29,7 @@ limitations under the License.
 }
 
 .mx_SettingsTab_subheading {
-    font-size: 16px;
+    font-size: 1.067rem;
     display: block;
     font-family: $font-family;
     font-weight: 600;
@@ -40,7 +40,7 @@ limitations under the License.
 
 .mx_SettingsTab_subsectionText {
     color: $settings-subsection-fg-color;
-    font-size: 14px;
+    font-size: 0.933rem;
     display: block;
     margin: 10px 100px 10px 0; // Align with the rest of the view
 }
@@ -61,7 +61,7 @@ limitations under the License.
 .mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {
     vertical-align: middle;
     display: inline-block;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $primary-fg-color;
     max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
     box-sizing: border-box;
diff --git a/res/css/views/terms/_InlineTermsAgreement.scss b/res/css/views/terms/_InlineTermsAgreement.scss
index e00dcf31d1..1f9ea7a33d 100644
--- a/res/css/views/terms/_InlineTermsAgreement.scss
+++ b/res/css/views/terms/_InlineTermsAgreement.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_InlineTermsAgreement_cbContainer {
     margin-bottom: 10px;
-    font-size: 14px;
+    font-size: 0.933rem;
 
     a {
         color: $accent-color;
diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index 5038d40b73..fd83bf7ad4 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -48,14 +48,14 @@ limitations under the License.
 }
 
 .mx_VerificationShowSas_emojiSas_emoji {
-    font-size: 32px;
+    font-size: 2.133rem;
 }
 
 .mx_VerificationShowSas_emojiSas_label {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size: 12px;
+    font-size: 0.8rem;
 }
 
 .mx_VerificationShowSas_emojiSas_break {
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index b01fbf8c66..06c9f7bed6 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -21,5 +21,5 @@ limitations under the License.
     text-align: center;
     padding: 6px;
     font-weight: bold;
-    font-size: 13px;
+    font-size: 0.867rem;
 }
diff --git a/res/css/views/voip/_IncomingCallbox.scss b/res/css/views/voip/_IncomingCallbox.scss
index 64eac25d01..3c8ed46639 100644
--- a/res/css/views/voip/_IncomingCallbox.scss
+++ b/res/css/views/voip/_IncomingCallbox.scss
@@ -54,7 +54,7 @@ limitations under the License.
     vertical-align: middle;
     width: 80px;
     height: 36px;
-    line-height: 36px;
+    line-height: 2.400rem;
     border-radius: 36px;
     color: $accent-fg-color;
     margin: auto;
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index bfa2272283..1f11fd5620 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -185,7 +185,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
     border: 0px;
     border-radius: 4px;
     font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $button-fg-color;
     background-color: $button-bg-color;
     width: auto;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 9bdd712e07..2a993a7934 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -310,7 +310,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
     border: 0px;
     border-radius: 4px;
     font-family: $font-family;
-    font-size: 14px;
+    font-size: 0.933rem;
     color: $button-fg-color;
     background-color: $button-bg-color;
     width: auto;
@@ -331,7 +331,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
 
 @define-mixin mx_DialogButton_small {
     @mixin mx_DialogButton;
-    font-size: 15px;
+    font-size: 1rem;
     padding: 0px 1.5em 0px 1.5em;
 }
 

From 147e7bc57ea5332fdf25129599773c3ed4e974fa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 30 Mar 2020 18:42:47 +0100
Subject: [PATCH 1844/3235] Field: mark id as optional in propTypes

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Field.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 797c83bc06..2ebb90da26 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -32,7 +32,7 @@ function getId() {
 export default class Field extends React.PureComponent {
     static propTypes = {
         // The field's ID, which binds the input and label together. Immutable.
-        id: PropTypes.string.isRequired,
+        id: PropTypes.string,
         // The element to create. Defaults to "input".
         // To define options for a select, use <Field><option ... /></Field>
         element: PropTypes.oneOf(["input", "select", "textarea"]),

From dd4331cd18ee048dd684bd879dd0ddc4a83e1f0a Mon Sep 17 00:00:00 2001
From: waylon531 <waylon.cude@finzdani.net>
Date: Sun, 29 Mar 2020 12:45:06 -0700
Subject: [PATCH 1845/3235] Added the /html command

This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
---
 src/SlashCommands.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d306978f78..72ca4b1566 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -128,6 +128,15 @@ export const CommandMap = {
         },
         category: CommandCategories.messages,
     }),
+    html: new Command({
+        name: 'html',
+        args: '<message>',
+        description: _td('Sends a message as html, without interpreting it as markdown'),
+        runFn: function(roomId, messages) {
+            return success(MatrixClientPeg.get().sendHtmlMessage(roomId, messages, messages));
+        },
+        category: CommandCategories.messages,
+    }),
     ddg: new Command({
         name: 'ddg',
         args: '<query>',

From 9cf82d8743846efbaf1f40914cf24ffbbcb4f417 Mon Sep 17 00:00:00 2001
From: waylon531 <waylon.cude@finzdani.net>
Date: Sun, 29 Mar 2020 13:10:53 -0700
Subject: [PATCH 1846/3235] Updated strings

I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6e195aa16..3962899223 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -153,6 +153,7 @@
     "Usage": "Usage",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
     "Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
+    "Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
     "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
     "/ddg is not a command": "/ddg is not a command",
     "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",

From 690b5945d01134d8fd88672432a93befb03ce710 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 30 Mar 2020 21:40:09 +0100
Subject: [PATCH 1847/3235] Pass new secret storage key to bootstrap path

This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.

Fixes https://github.com/vector-im/riot-web/issues/12867
---
 .../CreateSecretStorageDialog.js              | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 78e750b817..1149f230ef 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -69,6 +69,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         this._keyInfo = null;
         this._encodedRecoveryKey = null;
+        this._recoveryKey = null;
         this._recoveryKeyNode = null;
         this._setZxcvbnResultTimeout = null;
 
@@ -234,14 +235,22 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             if (force) {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                    createSecretStorageKey: async () => this._keyInfo,
+                    createSecretStorageKey: async () => [
+                        this._keyInfo,
+                        this._encodedRecoveryKey,
+                        this._recoveryKey,
+                    ],
                     setupNewKeyBackup: true,
                     setupNewSecretStorage: true,
                 });
             } else {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                    createSecretStorageKey: async () => this._keyInfo,
+                    createSecretStorageKey: async () => [
+                        this._keyInfo,
+                        this._encodedRecoveryKey,
+                        this._recoveryKey,
+                    ],
                     keyBackupInfo: this.state.backupInfo,
                     setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
                     getKeyBackupPassphrase: promptForBackupPassphrase,
@@ -299,10 +308,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onSkipPassPhraseClick = async () => {
-        const [keyInfo, encodedRecoveryKey] =
+        const [keyInfo, encodedRecoveryKey, recoveryKey] =
             await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
         this._keyInfo = keyInfo;
         this._encodedRecoveryKey = encodedRecoveryKey;
+        this._recoveryKey = recoveryKey;
         this.setState({
             copied: false,
             downloaded: false,
@@ -335,10 +345,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
 
-        const [keyInfo, encodedRecoveryKey] =
+        const [keyInfo, encodedRecoveryKey, recoveryKey] =
             await MatrixClientPeg.get().createRecoveryKeyFromPassphrase(this.state.passPhrase);
         this._keyInfo = keyInfo;
         this._encodedRecoveryKey = encodedRecoveryKey;
+        this._recoveryKey = recoveryKey;
         this.setState({
             copied: false,
             downloaded: false,

From bbb9a67ced8f431c0a7a91d76d387d55959a2169 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Mon, 30 Mar 2020 17:28:01 -0400
Subject: [PATCH 1848/3235] use new method for checking key

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

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 5c254bbd00..f6a4c914b7 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -96,11 +96,8 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
         {
             keyInfo: info,
             checkPrivateKey: async (input) => {
-                if (!info.pubkey) {
-                    return true;
-                }
                 const key = await inputToKey(input);
-                return MatrixClientPeg.get().checkSecretStoragePrivateKey(key, info.pubkey);
+                return await MatrixClientPeg.get().checkSecretStorageKey(key, info);
             },
         },
         /* className= */ null,

From ffa75ef48c47a0d75caeb1490bb1d4066ede2728 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 20:03:46 -0600
Subject: [PATCH 1849/3235] Wire up all the dialog parts for SSO, using device
 deletion as a POC

---
 .../auth/_InteractiveAuthEntryComponents.scss |  11 ++
 res/css/views/elements/_AccessibleButton.scss |  17 ++-
 src/components/structures/InteractiveAuth.js  |  29 ++++-
 .../auth/InteractiveAuthEntryComponents.js    | 100 ++++++++++++++----
 .../views/dialogs/InteractiveAuthDialog.js    |  68 +++++++++++-
 src/components/views/settings/DevicesPanel.js |  19 ++++
 src/i18n/strings/en_EN.json                   |   9 +-
 7 files changed, 224 insertions(+), 29 deletions(-)

diff --git a/res/css/views/auth/_InteractiveAuthEntryComponents.scss b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
index 85007aeecb..05cddf2c48 100644
--- a/res/css/views/auth/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
@@ -60,3 +60,14 @@ limitations under the License.
 .mx_InteractiveAuthEntryComponents_passwordSection {
     width: 300px;
 }
+
+.mx_InteractiveAuthEntryComponents_sso_buttons {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    margin-top: 20px;
+
+    .mx_AccessibleButton {
+        margin-left: 5px;
+    }
+}
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index b87071745d..0c48a07ccf 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -36,6 +36,13 @@ limitations under the License.
     font-weight: 600;
 }
 
+.mx_AccessibleButton_kind_primary_outline {
+    color: $button-primary-bg-color;
+    background-color: $button-secondary-bg-color;
+    border: 1px solid $button-primary-bg-color;
+    font-weight: 600;
+}
+
 .mx_AccessibleButton_kind_secondary {
     color: $accent-color;
     font-weight: 600;
@@ -60,7 +67,15 @@ limitations under the License.
     background-color: $button-danger-bg-color;
 }
 
-.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
+.mx_AccessibleButton_kind_danger_outline {
+    color: $button-danger-bg-color;
+    background-color: $button-secondary-bg-color;
+    border: 1px solid $button-danger-bg-color;
+}
+
+.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled,
+mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled
+{
     color: $button-danger-disabled-fg-color;
     background-color: $button-danger-disabled-bg-color;
 }
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index f4adb5751f..2492bf79a0 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import getEntryComponentForLoginType from '../views/auth/InteractiveAuthEntryCom
 
 import * as sdk from '../../index';
 
+export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
+
 export default createReactClass({
     displayName: 'InteractiveAuth',
 
@@ -47,7 +49,7 @@ export default createReactClass({
         // @param {bool} status True if the operation requiring
         //     auth was completed sucessfully, false if canceled.
         // @param {object} result The result of the authenticated call
-        //     if successful, otherwise the error object
+        //     if successful, otherwise the error object.
         // @param {object} extra Additional information about the UI Auth
         //     process:
         //      * emailSid {string} If email auth was performed, the sid of
@@ -75,6 +77,15 @@ export default createReactClass({
         // is managed by some other party and should not be managed by
         // the component itself.
         continueIsManaged: PropTypes.bool,
+
+        // Called when the stage changes, or the stage's phase changes. First
+        // argument is the stage, second is the phase. Some stages do not have
+        // phases and will be counted as 0 (numeric).
+        onStagePhaseChange: PropTypes.func,
+
+        // continueText and continueKind are passed straight through to the AuthEntryComponent.
+        continueText: PropTypes.string,
+        continueKind: PropTypes.string,
     },
 
     getInitialState: function() {
@@ -204,6 +215,16 @@ export default createReactClass({
         this._authLogic.submitAuthDict(authData);
     },
 
+    _onPhaseChange: function(newPhase) {
+        if (this.props.onStagePhaseChange) {
+            this.props.onStagePhaseChange(this.state.authStage, newPhase || 0);
+        }
+    },
+
+    _onStageCancel: function() {
+        this.props.onAuthFinished(false, ERROR_USER_CANCELLED);
+    },
+
     _renderCurrentStage: function() {
         const stage = this.state.authStage;
         if (!stage) {
@@ -232,6 +253,10 @@ export default createReactClass({
                 fail={this._onAuthStageFailed}
                 setEmailSid={this._setEmailSid}
                 showContinue={!this.props.continueIsManaged}
+                onPhaseChange={this._onPhaseChange}
+                continueText={this.props.continueText}
+                continueKind={this.props.continueKind}
+                onCancel={this._onStageCancel}
             />
         );
     },
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 26a293724a..d262a5525d 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -25,6 +25,7 @@ import classnames from 'classnames';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
+import AccessibleButton from "../elements/AccessibleButton";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -59,11 +60,21 @@ import SettingsStore from "../../../settings/SettingsStore";
  *                         session to be failed and the process to go back to the start.
  * setEmailSid:            m.login.email.identity only: a function to be called with the
  *                         email sid after a token is requested.
+ * onPhaseChange:          A function which is called when the stage's phase changes. If
+ *                         the stage has no phases, call this with DEFAULT_PHASE. Takes
+ *                         one argument, the phase, and is always defined/required.
+ * continueText:           For stages which have a continue button, the text to use.
+ * continueKind:           For stages which have a continue button, the style of button to
+ *                         use. For example, 'danger' or 'primary'.
+ * onCancel                A function with no arguments which is called by the stage if the
+ *                         user knowingly cancelled/dismissed the authentication attempt.
  *
  * Each component may also provide the following functions (beyond the standard React ones):
  *    focus: set the input focus appropriately in the form.
  */
 
+export const DEFAULT_PHASE = 0;
+
 export const PasswordAuthEntry = createReactClass({
     displayName: 'PasswordAuthEntry',
 
@@ -78,6 +89,11 @@ export const PasswordAuthEntry = createReactClass({
         // is the auth logic currently waiting for something to
         // happen?
         busy: PropTypes.bool,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     getInitialState: function() {
@@ -175,6 +191,11 @@ export const RecaptchaAuthEntry = createReactClass({
         stageParams: PropTypes.object.isRequired,
         errorText: PropTypes.string,
         busy: PropTypes.bool,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     _onCaptchaResponse: function(response) {
@@ -236,6 +257,11 @@ export const TermsAuthEntry = createReactClass({
         errorText: PropTypes.string,
         busy: PropTypes.bool,
         showContinue: PropTypes.bool,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     componentWillMount: function() {
@@ -378,6 +404,11 @@ export const EmailIdentityAuthEntry = createReactClass({
         stageState: PropTypes.object.isRequired,
         fail: PropTypes.func.isRequired,
         setEmailSid: PropTypes.func.isRequired,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     getInitialState: function() {
@@ -420,6 +451,11 @@ export const MsisdnAuthEntry = createReactClass({
         clientSecret: PropTypes.func,
         submitAuthDict: PropTypes.func.isRequired,
         matrixClient: PropTypes.object,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     getInitialState: function() {
@@ -571,13 +607,17 @@ export class SSOAuthEntry extends React.Component {
         loginType: PropTypes.string.isRequired,
         submitAuthDict: PropTypes.func.isRequired,
         errorText: PropTypes.string,
+        onPhaseChange: PropTypes.func.isRequired,
+        continueText: PropTypes.string,
+        continueKind: PropTypes.string,
+        onCancel: PropTypes.func,
     };
 
     static LOGIN_TYPE = "m.login.sso";
     static UNSTABLE_LOGIN_TYPE = "org.matrix.login.sso";
 
-    static STAGE_PREAUTH = 1; // button to start SSO
-    static STAGE_POSTAUTH = 2; // button to confirm SSO completed
+    static PHASE_PREAUTH = 1; // button to start SSO
+    static PHASE_POSTAUTH = 2; // button to confirm SSO completed
 
     constructor(props) {
         super(props);
@@ -589,39 +629,56 @@ export class SSOAuthEntry extends React.Component {
                 this.props.loginType,
                 this.props.authSessionId,
             ),
-            stage: SSOAuthEntry.STAGE_PREAUTH,
+            phase: SSOAuthEntry.PHASE_PREAUTH,
         };
     }
 
-    onStartAuthClick = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
+    componentDidMount(): void {
+        this.props.onPhaseChange(SSOAuthEntry.PHASE_PREAUTH);
+    }
 
+    onStartAuthClick = () => {
         // Note: We don't use PlatformPeg's startSsoAuth functions because we almost
         // certainly will need to open the thing in a new tab to avoid loosing application
         // context.
 
-        window.open(e.target.href, '_blank');
-        this.setState({stage: SSOAuthEntry.STAGE_POSTAUTH});
+        window.open(this.state.ssoUrl, '_blank');
+        this.setState({phase: SSOAuthEntry.PHASE_POSTAUTH});
+        this.props.onPhaseChange(SSOAuthEntry.PHASE_POSTAUTH);
     };
 
-    onConfirmClick = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-
+    onConfirmClick = () => {
         this.props.submitAuthDict({});
     };
 
     render () {
-        if (this.state.stage === SSOAuthEntry.STAGE_PREAUTH) {
-            return <a href={this.state.ssoUrl} target='_blank' rel='noopener' onClick={this.onStartAuthClick}>
-                {_t("Single Sign On")}
-            </a>;
+        let continueButton = null;
+        const cancelButton = (
+            <AccessibleButton
+                onClick={this.props.onCancel}
+                kind={this.props.continueKind ? (this.props.continueKind + '_outline') : 'primary_outline'}
+            >{_t("Cancel")}</AccessibleButton>
+        );
+        if (this.state.phase === SSOAuthEntry.PHASE_PREAUTH) {
+            continueButton = (
+                <AccessibleButton
+                    onClick={this.onStartAuthClick}
+                    kind={this.props.continueKind || 'primary'}
+                >{this.props.continueText || _t("Single Sign On")}</AccessibleButton>
+            );
         } else {
-            return <a href='' target='_blank' rel='noopener' onClick={this.onConfirmClick}>
-                {_t("Continue")}
-            </a>;
+            continueButton = (
+                <AccessibleButton
+                    onClick={this.onConfirmClick}
+                    kind={this.props.continueKind || 'primary'}
+                >{this.props.continueText || _t("Confirm")}</AccessibleButton>
+            );
         }
+
+        return <div className='mx_InteractiveAuthEntryComponents_sso_buttons'>
+            {cancelButton}
+            {continueButton}
+        </div>;
     }
 }
 
@@ -634,6 +691,11 @@ export const FallbackAuthEntry = createReactClass({
         loginType: PropTypes.string.isRequired,
         submitAuthDict: PropTypes.func.isRequired,
         errorText: PropTypes.string,
+        onPhaseChange: PropTypes.func.isRequired,
+    },
+
+    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
     componentWillMount: function() {
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index ff9f55cb74..c070cc6589 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 import AccessibleButton from '../elements/AccessibleButton';
+import {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 
 export default createReactClass({
     displayName: 'InteractiveAuthDialog',
@@ -44,12 +46,36 @@ export default createReactClass({
 
         onFinished: PropTypes.func.isRequired,
 
+        // Optional title and body to show when not showing a particular stage
         title: PropTypes.string,
+        body: PropTypes.string,
+
+        // Optional title and body pairs for particular stages and phases within
+        // those stages. Object structure/example is:
+        // {
+        //     "org.example.stage_type": {
+        //         1: {
+        //             "body": "This is a body for phase 1" of org.example.stage_type,
+        //             "title": "Title for phase 1 of org.example.stage_type"
+        //         },
+        //         2: {
+        //             "body": "This is a body for phase 2 of org.example.stage_type",
+        //             "title": "Title for phase 2 of org.example.stage_type"
+        //             "continueText": "Confirm identity with Example Auth",
+        //             "continueKind": "danger"
+        //         }
+        //     }
+        // }
+        aestheticsForStagePhases: PropTypes.object,
     },
 
     getInitialState: function() {
         return {
             authError: null,
+
+            // See _onUpdateStagePhase()
+            uiaStage: null,
+            uiaStagePhase: null,
         };
     },
 
@@ -57,12 +83,22 @@ export default createReactClass({
         if (success) {
             this.props.onFinished(true, result);
         } else {
-            this.setState({
-                authError: result,
-            });
+            if (result === ERROR_USER_CANCELLED) {
+                this.props.onFinished(false, null);
+            } else {
+                this.setState({
+                    authError: result,
+                });
+            }
         }
     },
 
+    _onUpdateStagePhase: function(newStage, newPhase) {
+        console.log({newStage, newPhase});
+        // We copy the stage and stage phase params into state for title selection in render()
+        this.setState({uiaStage: newStage, uiaStagePhase: newPhase});
+    },
+
     _onDismissClick: function() {
         this.props.onFinished(false);
     },
@@ -71,6 +107,23 @@ export default createReactClass({
         const InteractiveAuth = sdk.getComponent("structures.InteractiveAuth");
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
+        // Let's pick a title, body, and other params text that we'll show to the user. The order
+        // is most specific first, so stagePhase > our props > defaults.
+
+        let title = this.state.authError ? 'Error' : (this.props.title || _t('Authentication'));
+        let body = this.state.authError ? null : this.props.body;
+        let continueText = null;
+        let continueKind = null;
+        if (!this.state.authError && this.props.aestheticsForStagePhases) {
+            if (this.props.aestheticsForStagePhases[this.state.uiaStage]) {
+                const aesthetics = this.props.aestheticsForStagePhases[this.state.uiaStage][this.state.uiaStagePhase];
+                if (aesthetics && aesthetics.title) title = aesthetics.title;
+                if (aesthetics && aesthetics.body) body = aesthetics.body;
+                if (aesthetics && aesthetics.continueText) continueText = aesthetics.continueText;
+                if (aesthetics && aesthetics.continueKind) continueKind = aesthetics.continueKind;
+            }
+        }
+
         let content;
         if (this.state.authError) {
             content = (
@@ -88,11 +141,16 @@ export default createReactClass({
         } else {
             content = (
                 <div id='mx_Dialog_content'>
-                    <InteractiveAuth ref={this._collectInteractiveAuth}
+                    {body}
+                    <InteractiveAuth
+                        ref={this._collectInteractiveAuth}
                         matrixClient={this.props.matrixClient}
                         authData={this.props.authData}
                         makeRequest={this.props.makeRequest}
                         onAuthFinished={this._onAuthFinished}
+                        onStagePhaseChange={this._onUpdateStagePhase}
+                        continueText={continueText}
+                        continueKind={continueKind}
                     />
                 </div>
             );
@@ -101,7 +159,7 @@ export default createReactClass({
         return (
             <BaseDialog className="mx_InteractiveAuthDialog"
                 onFinished={this.props.onFinished}
-                title={this.state.authError ? 'Error' : (this.props.title || _t('Authentication'))}
+                title={title}
                 contentId='mx_Dialog_content'
             >
                 { content }
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 2120801a81..61e7724a6f 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -23,6 +23,7 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
+import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 
 export default class DevicesPanel extends React.Component {
     constructor(props) {
@@ -123,11 +124,29 @@ export default class DevicesPanel extends React.Component {
             // pop up an interactive auth dialog
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
+            const dialogAesthetics = {
+                [SSOAuthEntry.PHASE_PREAUTH]: {
+                    title: _t("Use Single Sign On to continue"),
+                    body: _t("Confirm deleting these sessions by using Single Sign On to prove your identity."),
+                    continueText: _t("Single Sign On"),
+                    continueKind: "primary",
+                },
+                [SSOAuthEntry.PHASE_POSTAUTH]: {
+                    title: _t("Confirm deleting these sessions"),
+                    body: _t("Click the button below to confirm deleting these sessions."),
+                    continueText: _t("Delete sessions"),
+                    continueKind: "danger",
+                },
+            };
             Modal.createTrackedDialog('Delete Device Dialog', '', InteractiveAuthDialog, {
                 title: _t("Authentication"),
                 matrixClient: MatrixClientPeg.get(),
                 authData: error.data,
                 makeRequest: this._makeDeleteRequest.bind(this),
+                aestheticsForStagePhases: {
+                    [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+                    [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+                },
             });
         }).catch((e) => {
             console.error("Error deleting sessions", e);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e867623cc9..ecc2698f6d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -598,6 +598,12 @@
     "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
+    "Use Single Sign On to continue": "Use Single Sign On to continue",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
+    "Single Sign On": "Single Sign On",
+    "Confirm deleting these sessions": "Confirm deleting these sessions",
+    "Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.",
+    "Delete sessions": "Delete sessions",
     "Authentication": "Authentication",
     "Delete %(count)s sessions|other": "Delete %(count)s sessions",
     "Delete %(count)s sessions|one": "Delete %(count)s session",
@@ -1831,7 +1837,7 @@
     "Please enter the code it contains:": "Please enter the code it contains:",
     "Code": "Code",
     "Submit": "Submit",
-    "Single Sign On": "Single Sign On",
+    "Confirm": "Confirm",
     "Start authentication": "Start authentication",
     "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
     "Your Modular server": "Your Modular server",
@@ -1862,7 +1868,6 @@
     "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
     "Enter username": "Enter username",
     "Email (optional)": "Email (optional)",
-    "Confirm": "Confirm",
     "Phone (optional)": "Phone (optional)",
     "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",

From 6112d92f809c952fe80520a93b0f98d0993057d3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 20:11:23 -0600
Subject: [PATCH 1850/3235] Remove debugging

---
 src/components/views/dialogs/InteractiveAuthDialog.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index c070cc6589..af5dc5108c 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -94,7 +94,6 @@ export default createReactClass({
     },
 
     _onUpdateStagePhase: function(newStage, newPhase) {
-        console.log({newStage, newPhase});
         // We copy the stage and stage phase params into state for title selection in render()
         this.setState({uiaStage: newStage, uiaStagePhase: newPhase});
     },

From de7952015086e8e5d3bab204fd23665def9435c2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 20:18:52 -0600
Subject: [PATCH 1851/3235] Add SSO dialog copy for 3PID adding (email/phone)

---
 src/AddThreepid.js          | 38 +++++++++++++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json | 12 +++++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 7a3250d0ca..1fc492ef85 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -21,6 +21,7 @@ import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 import IdentityAuthClient from './IdentityAuthClient';
+import {SSOAuthEntry} from "./components/views/auth/InteractiveAuthEntryComponents";
 
 function getIdServerDomain() {
     return MatrixClientPeg.get().idBaseUrl.split("://")[1];
@@ -188,11 +189,30 @@ export default class AddThreepid {
                         // pop up an interactive auth dialog
                         const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
+
+                        const dialogAesthetics = {
+                            [SSOAuthEntry.PHASE_PREAUTH]: {
+                                title: _t("Use Single Sign On to continue"),
+                                body: _t("Confirm adding this email address by using Single Sign On to prove your identity."),
+                                continueText: _t("Single Sign On"),
+                                continueKind: "primary",
+                            },
+                            [SSOAuthEntry.PHASE_POSTAUTH]: {
+                                title: _t("Confirm adding email"),
+                                body: _t("Click the button below to confirm adding this email address."),
+                                continueText: _t("Confirm"),
+                                continueKind: "primary",
+                            },
+                        };
                         const { finished } = Modal.createTrackedDialog('Add Email', '', InteractiveAuthDialog, {
                             title: _t("Add Email Address"),
                             matrixClient: MatrixClientPeg.get(),
                             authData: e.data,
                             makeRequest: this._makeAddThreepidOnlyRequest,
+                            aestheticsForStagePhases: {
+                                [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+                                [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+                            },
                         });
                         return finished;
                     }
@@ -285,11 +305,29 @@ export default class AddThreepid {
                     // pop up an interactive auth dialog
                     const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
+                    const dialogAesthetics = {
+                        [SSOAuthEntry.PHASE_PREAUTH]: {
+                            title: _t("Use Single Sign On to continue"),
+                            body: _t("Confirm adding this phone number by using Single Sign On to prove your identity."),
+                            continueText: _t("Single Sign On"),
+                            continueKind: "primary",
+                        },
+                        [SSOAuthEntry.PHASE_POSTAUTH]: {
+                            title: _t("Confirm adding phone number"),
+                            body: _t("Click the button below to confirm adding this phone number."),
+                            continueText: _t("Confirm"),
+                            continueKind: "primary",
+                        },
+                    };
                     const { finished } = Modal.createTrackedDialog('Add MSISDN', '', InteractiveAuthDialog, {
                         title: _t("Add Phone Number"),
                         matrixClient: MatrixClientPeg.get(),
                         authData: e.data,
                         makeRequest: this._makeAddThreepidOnlyRequest,
+                        aestheticsForStagePhases: {
+                            [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+                            [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+                        },
                     });
                     return finished;
                 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ecc2698f6d..572268f90d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,8 +1,17 @@
 {
     "This email address is already in use": "This email address is already in use",
     "This phone number is already in use": "This phone number is already in use",
+    "Use Single Sign On to continue": "Use Single Sign On to continue",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirm adding this email address by using Single Sign On to prove your identity.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Confirm adding email",
+    "Click the button below to confirm adding this email address.": "Click the button below to confirm adding this email address.",
+    "Confirm": "Confirm",
     "Add Email Address": "Add Email Address",
     "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirm adding this phone number by using Single Sign On to prove your identity.",
+    "Confirm adding phone number": "Confirm adding phone number",
+    "Click the button below to confirm adding this phone number.": "Click the button below to confirm adding this phone number.",
     "Add Phone Number": "Add Phone Number",
     "The platform you're on": "The platform you're on",
     "The version of Riot": "The version of Riot",
@@ -598,9 +607,7 @@
     "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
-    "Use Single Sign On to continue": "Use Single Sign On to continue",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
-    "Single Sign On": "Single Sign On",
     "Confirm deleting these sessions": "Confirm deleting these sessions",
     "Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.",
     "Delete sessions": "Delete sessions",
@@ -1837,7 +1844,6 @@
     "Please enter the code it contains:": "Please enter the code it contains:",
     "Code": "Code",
     "Submit": "Submit",
-    "Confirm": "Confirm",
     "Start authentication": "Start authentication",
     "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
     "Your Modular server": "Your Modular server",

From 8bc86deaaaf93928c722a077bd17ece980a0821d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 20:23:34 -0600
Subject: [PATCH 1852/3235] Appease the style linter

---
 res/css/views/elements/_AccessibleButton.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index 0c48a07ccf..de39525588 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -48,7 +48,8 @@ limitations under the License.
     font-weight: 600;
 }
 
-.mx_AccessibleButton_kind_primary.mx_AccessibleButton_disabled {
+.mx_AccessibleButton_kind_primary.mx_AccessibleButton_disabled,
+.mx_AccessibleButton_kind_primary_outline.mx_AccessibleButton_disabled {
     opacity: 0.4;
 }
 
@@ -74,8 +75,7 @@ limitations under the License.
 }
 
 .mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled,
-mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled
-{
+.mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled {
     color: $button-danger-disabled-fg-color;
     background-color: $button-danger-disabled-bg-color;
 }

From d899576578b6b2bfc66ceef7a8b13c857c8857f3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 20:24:53 -0600
Subject: [PATCH 1853/3235] Appease the linter

---
 src/AddThreepid.js                                          | 6 ++++--
 src/components/views/auth/InteractiveAuthEntryComponents.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 1fc492ef85..f06f7c187d 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -193,7 +193,8 @@ export default class AddThreepid {
                         const dialogAesthetics = {
                             [SSOAuthEntry.PHASE_PREAUTH]: {
                                 title: _t("Use Single Sign On to continue"),
-                                body: _t("Confirm adding this email address by using Single Sign On to prove your identity."),
+                                body: _t("Confirm adding this email address by using " +
+                                    "Single Sign On to prove your identity."),
                                 continueText: _t("Single Sign On"),
                                 continueKind: "primary",
                             },
@@ -308,7 +309,8 @@ export default class AddThreepid {
                     const dialogAesthetics = {
                         [SSOAuthEntry.PHASE_PREAUTH]: {
                             title: _t("Use Single Sign On to continue"),
-                            body: _t("Confirm adding this phone number by using Single Sign On to prove your identity."),
+                            body: _t("Confirm adding this phone number by using " +
+                                "Single Sign On to prove your identity."),
                             continueText: _t("Single Sign On"),
                             continueKind: "primary",
                         },
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index d262a5525d..a59b1354b6 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -651,7 +651,7 @@ export class SSOAuthEntry extends React.Component {
         this.props.submitAuthDict({});
     };
 
-    render () {
+    render() {
         let continueButton = null;
         const cancelButton = (
             <AccessibleButton

From 98c663a41dd298f2055881428e7f0210cf97229b Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Mon, 30 Mar 2020 19:05:47 +0000
Subject: [PATCH 1854/3235] Translated using Weblate (German)

Currently translated at 77.2% (1730 of 2242 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 | 58 +++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9565299b8d..a808ebd33c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1526,7 +1526,7 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsmanager um Bots, Widgets und Sticker Packs zu verwalten.",
     "Manage integrations": "Integrationen verwalten",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Stimme den Nutzungsbedingungen des Identitätsservers %(serverName)s zu, um dich per Email Adresse und Telefonnummer auffindbar zu machen.",
-    "Clear cache and reload": "Cache löschen und neu laden",
+    "Clear cache and reload": "Zwischenspeicher löschen und neu laden",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Passe deine Erfahrung mit experimentellen Lab Funktionen an. <a>Mehr erfahren</a>.",
     "Ignored/Blocked": "Ignoriert/Blockiert",
     "Something went wrong. Please try again or view your console for hints.": "Etwas ist schief gelaufen. Bitte versuche es erneut oder sieh für weitere Hinweise in deiner Konsole nach.",
@@ -1571,9 +1571,9 @@
     "Notification sound": "Benachrichtigungston",
     "Set a new custom sound": "Setze einen neuen benutzerdefinierten Sound",
     "Browse": "Durchsuche",
-    "Direct Messages": "Direkte Nachrichten",
+    "Direct Messages": "Direktnachrichten",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Sie können <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Wollten Sie dies als Nachricht senden?",
-    "Direct message": "Direkte Nachricht",
+    "Direct message": "Direktnachricht",
     "Set a room alias to easily share your room with other people.": "Setze ein Raum-Alias, um deinen Raum einfach mit anderen Personen zu teilen.",
     "Suggestions": "Vorschläge",
     "Recently Direct Messaged": "Kürzlich direkt verschickt",
@@ -1625,7 +1625,7 @@
     "Create a private room": "Erstelle einen privaten Raum",
     "Topic (optional)": "Thema (optional)",
     "Make this room public": "Machen Sie diesen Raum öffentlich",
-    "Hide advanced": "Fortgeschrittenes ausblenden",
+    "Hide advanced": "Weitere Einstellungen ausblenden",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Hindere Benutzer auf anderen Matrix-Homeservern daran, diesem Raum beizutreten (Diese Einstellung kann später nicht geändert werden!)",
     "Session name": "Name der Sitzung",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "So können Sie nach der Abmeldung zu Ihrem Konto zurückkehren und sich bei anderen Sitzungen anmelden.",
@@ -1657,7 +1657,7 @@
     "or": "oder",
     "Compare unique emoji": "Vergleiche einzigartige Emojis",
     "Start": "Starte",
-    "Discovery": "Entdeckung",
+    "Discovery": "Kontakte",
     "Done": "Erledigt",
     "Manually Verify": "Manuell verifizieren",
     "Trusted": "Vertrauenswürdig",
@@ -1739,5 +1739,51 @@
     "Start chatting": "Chat starten",
     "Reject & Ignore user": "Ablehnen & Nutzer ignorieren",
     "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Erlaube den Standard-Server zur Anrufunterstützung (turn.matrix.org) zu verwenden wenn dein Heimserver keinen eigenen anbietet (deine IP Adresse wird bei dem Anruf übermittelt)",
+    "Show more": "mehr",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Diese Sitzung <b>speichert deine Schlüssel nicht</b>, du kannst sie aber an die Schlüsselsicherung anschließen.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbinde diese Sitzung mit deiner Schlüsselsicherung bevor du dich abmeldest, um den Verlust von Schlüsseln zu vermeiden.",
+    "This backup is trusted because it has been restored on this session": "Dieser Sicherung wird vertraut, da sie während dieser Sitzung wiederhergestellt wurde",
+    "Enable desktop notifications for this session": "Desktop-Benachrichtigungen für diese Sitzung aktivieren",
+    "Enable audible notifications for this session": "Aktiviere die akustischen Benachrichtigungen für diese Sitzung",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsserver können für dich Widgets einstellen, Raum-Einladungen verschicken oder deine Berechtigungen setzen.",
+    "Read Marker lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung (ms)",
+    "Read Marker off-screen lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung außerhalb des Bildschirms (ms)",
+    "Session key:": "Sitzungsschlüssel:",
+    "A session's public name is visible to people you communicate with": "Der Sitzungsname ist sichtbar für die Personen mit denen du kommunizierst",
+    "Sounds": "Töne",
+    "Upgrade the room": "Raum hochstufen",
+    "Enable room encryption": "Verschlüsselung aktivieren",
+    "This message cannot be decrypted": "Diese Nachricht konnte nicht entschlüsselt werden",
+    "Encrypted by an unverified session": "Verschlüsselt von einer unbekannten Sitzung",
+    "Unencrypted": "Unverschlüsselt",
+    "Encrypted by a deleted session": "Verschlüsselt von einer gelöschten Sitzung",
+    "The encryption used by this room isn't supported.": "Die Verschlüsselung, die dieser Raum verwendet, wird nicht unterstützt.",
+    "React": "Reaktion hinzufügen",
+    "e.g. my-room": "z.B. mein-raum",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver um mit einer E-Mail-Adresse einzuladen. <default>Benutzer den Standard-Identitätsserver (%(defaultIdentityServerName)s)</default> oder konfiguriere einen in den <settings>Einstellungen</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver um mit einer E-Mail-Adresse einzuladen. Diese können in den <settings>Einstellungen</settings> konfiguriert werden.",
+    "Create a public room": "Erstelle einen öffentlichen Raum",
+    "Show advanced": "Weitere Einstellungen anzeigen",
+    "Verify session": "Sitzung verifizieren",
+    "To verify that this session 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 session matches the key below:": "Um diese Sitzung zu verifizieren kontaktiere bitte den Benutzer über einen anderen Kanal (z.B. persönlich oder mit einem Telefonanruf) und frage ihn ob der Sitzungsschlüssel in seinen Benutzereinstellungen mit dem hier angezeigten übereinstimmt:",
+    "Session key": "Sitzungsschlüssel",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Wenn die Sitzungsschlüssel übereinstimmen, drücke den Knopf zur Bestätigung. Stimmen sie nicht überein versucht jemand diese Sitzung abzufangen und du solltest diese Sitzung blockieren.",
+    "Recent Conversations": "Letzte Unterhaltungen",
+    "Report Content to Your Homeserver Administrator": "Inhalte an den Administrator deines Heimservers melden",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Wenn du diese Nachricht meldest wird dessen einzigartige 'event ID' an den Administrator deines Heimservers übermittelt. Wenn die Nachrichten in diesem Raum verschlüsselt sind wird dein Administrator nicht in der Lage sein den Text zu lesen oder Medien einzusehen.",
+    "Send report": "Bericht senden",
+    "Enter recovery passphrase": "Gib die Wiederherstellungspassphrase ein",
+    "Enter recovery key": "Wiederherstellungspassphrase eingeben",
+    "Report Content": "Inhalte melden",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Gib eine E-Mail-Adresse an um dein Konto wiederherstellen zu können. Die E-Mail-Adresse kann auch genutzt werden um deinen Kontakt zu finden.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Gib eine andere Heimserver-Adresse an <a>Was bedeutet das?</a>",
+    "%(creator)s created and configured the room.": "%(creator)s hat den Raum erstellt und konfiguriert.",
+    "Sender session information": "Absender Sitzungsinformationen",
+    "Set up with a recovery key": "Mit einem Wiederherstellungsschlüssel einrichten",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewahre ihn sicher auf, wie in einem Passwort-Manager oder einem Safe.",
+    "Your recovery key": "Dein Wiederherstellungsschlüssel",
+    "Copy": "In Zwischenablage kopieren",
+    "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel"
 }

From b44c83aad7fc60575e0121140ab60734fd059df0 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 31 Mar 2020 06:05:09 +0000
Subject: [PATCH 1855/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2243 of 2243 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a2d6f82c6b..03d49e0499 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2305,5 +2305,7 @@
     "Verified": "已驗證",
     "Verification cancelled": "驗證已取消",
     "Compare emoji": "比較顏文字",
-    "Session backup key:": "工作階段備份金鑰："
+    "Session backup key:": "工作階段備份金鑰：",
+    "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown",
+    "Cancel replying to a message": "取消回覆訊息"
 }

From a2a9dc6cd066da25a0fd609f7ac22215ebd72173 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 31 Mar 2020 10:37:56 +0100
Subject: [PATCH 1856/3235] Fix peeking keeping two timeline update mechanisms
 in play

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js |  5 +++++
 src/stores/RoomViewStore.js           | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1a1f60c7bd..50b66bee93 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -236,6 +236,11 @@ export default createReactClass({
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
         };
 
+        if (!initial && this.state.shouldPeek && !newState.shouldPeek) {
+            // Stop peeking because we have joined this room now
+            this.context.stopPeeking();
+        }
+
         // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
         console.log(
             'RVS update:',
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 64dfd56b2f..b32e088a76 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -123,6 +123,9 @@ class RoomViewStore extends Store {
             case 'join_room_error':
                 this._joinRoomError(payload);
                 break;
+            case 'join_room_ready':
+                this._setState({ shouldPeek: false });
+                break;
             case 'on_client_not_viable':
             case 'on_logged_out':
                 this.reset();
@@ -259,11 +262,10 @@ class RoomViewStore extends Store {
         MatrixClientPeg.get().joinRoom(
             this._state.roomAlias || this._state.roomId, payload.opts,
         ).then(() => {
-            // We don't actually need to do anything here: we do *not*
-            // clear the 'joining' flag because the Room object and/or
-            // our 'joined' member event may not have come down the sync
-            // stream yet, and that's the point at which we'd consider
-            // the user joined to the room.
+            // We do *not* clear the 'joining' flag because the Room object and/or our 'joined' member event may not
+            // have come down the sync stream yet, and that's the point at which we'd consider the user joined to the
+            // room.
+            dis.dispatch({ action: 'join_room_ready' });
         }, (err) => {
             dis.dispatch({
                 action: 'join_room_error',

From 24c09cc4c8e647db9c6bfe69a681606cce4a3e68 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 31 Mar 2020 10:45:53 +0100
Subject: [PATCH 1857/3235] Convert secret storage key creation to object

---
 .../CreateSecretStorageDialog.js              | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 1149f230ef..01a2856df0 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -67,8 +67,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     constructor(props) {
         super(props);
 
-        this._keyInfo = null;
-        this._encodedRecoveryKey = null;
         this._recoveryKey = null;
         this._recoveryKeyNode = null;
         this._setZxcvbnResultTimeout = null;
@@ -181,7 +179,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onDownloadClick = () => {
-        const blob = new Blob([this._encodedRecoveryKey], {
+        const blob = new Blob([this._recoveryKey.encodedPrivateKey], {
             type: 'text/plain;charset=us-ascii',
         });
         FileSaver.saveAs(blob, 'recovery-key.txt');
@@ -235,22 +233,14 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             if (force) {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                    createSecretStorageKey: async () => [
-                        this._keyInfo,
-                        this._encodedRecoveryKey,
-                        this._recoveryKey,
-                    ],
+                    createSecretStorageKey: async () => this._recoveryKey,
                     setupNewKeyBackup: true,
                     setupNewSecretStorage: true,
                 });
             } else {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
-                    createSecretStorageKey: async () => [
-                        this._keyInfo,
-                        this._encodedRecoveryKey,
-                        this._recoveryKey,
-                    ],
+                    createSecretStorageKey: async () => this._recoveryKey,
                     keyBackupInfo: this.state.backupInfo,
                     setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
                     getKeyBackupPassphrase: promptForBackupPassphrase,
@@ -308,11 +298,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onSkipPassPhraseClick = async () => {
-        const [keyInfo, encodedRecoveryKey, recoveryKey] =
+        this._recoveryKey =
             await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
-        this._keyInfo = keyInfo;
-        this._encodedRecoveryKey = encodedRecoveryKey;
-        this._recoveryKey = recoveryKey;
         this.setState({
             copied: false,
             downloaded: false,
@@ -345,11 +332,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         if (this.state.passPhrase !== this.state.passPhraseConfirm) return;
 
-        const [keyInfo, encodedRecoveryKey, recoveryKey] =
+        this._recoveryKey =
             await MatrixClientPeg.get().createRecoveryKeyFromPassphrase(this.state.passPhrase);
-        this._keyInfo = keyInfo;
-        this._encodedRecoveryKey = encodedRecoveryKey;
-        this._recoveryKey = recoveryKey;
         this.setState({
             copied: false,
             downloaded: false,
@@ -624,7 +608,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 </div>
                 <div className="mx_CreateSecretStorageDialog_recoveryKeyContainer">
                     <div className="mx_CreateSecretStorageDialog_recoveryKey">
-                        <code ref={this._collectRecoveryKeyNode}>{this._encodedRecoveryKey}</code>
+                        <code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
                         <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onCopyClick}>

From 80479195c82e2c91da865962724846429b9461b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 31 Mar 2020 11:53:26 +0100
Subject: [PATCH 1858/3235] iterate PR based on feedback. Remove newballsplease
 cmd alias

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 45 ++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 9fb0a151cf..c62aa9c3e5 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -71,6 +71,16 @@ export const CommandCategories = {
 
 type RunFn = ((roomId: string, args: string, cmd: string) => {error: any} | {promise: Promise<any>});
 
+interface ICommandOpts {
+    command: string;
+    aliases?: string[];
+    args?: string;
+    description: string;
+    runFn?: RunFn;
+    category: string;
+    hideCompletionAfterSpace?: boolean;
+}
+
 class Command {
     command: string;
     aliases: string[];
@@ -80,30 +90,14 @@ class Command {
     category: string;
     hideCompletionAfterSpace: boolean;
 
-    constructor({
-        command,
-        aliases = [],
-        args = '',
-        description,
-        runFn = undefined,
-        category = CommandCategories.other,
-        hideCompletionAfterSpace = false,
-    }: {
-        command: string;
-        aliases?: string[];
-        args?: string;
-        description: string;
-        runFn?: RunFn;
-        category: string;
-        hideCompletionAfterSpace?: boolean;
-    }) {
-        this.command = command;
-        this.aliases = aliases;
-        this.args = args;
-        this.description = description;
-        this.runFn = runFn;
-        this.category = category;
-        this.hideCompletionAfterSpace = hideCompletionAfterSpace;
+    constructor(opts: ICommandOpts) {
+        this.command = opts.command;
+        this.aliases = opts.aliases || [];
+        this.args = opts.args || "";
+        this.description = opts.description;
+        this.runFn = opts.runFn;
+        this.category = opts.category || CommandCategories.other;
+        this.hideCompletionAfterSpace = opts.hideCompletionAfterSpace || false;
     }
 
     getCommand() {
@@ -853,7 +847,6 @@ export const Commands = [
     }),
     new Command({
         command: 'discardsession',
-        aliases: ['newballsplease'],
         description: _td('Forces the current outbound group session in an encrypted room to be discarded'),
         runFn: function(roomId) {
             try {
@@ -900,7 +893,7 @@ export const Commands = [
         command: "whois",
         description: _td("Displays information about a user"),
         args: "<user-id>",
-        runFn: function (roomId, userId) {
+        runFn: function(roomId, userId) {
             if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
                 return reject(this.getUsage());
             }

From 9e8a401dc88af6fc09ed711b9aa13a911bb8acd4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 31 Mar 2020 12:29:58 +0100
Subject: [PATCH 1859/3235] Fix EventListSummary when RR rendering is disabled

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

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 2fa9994155..1cf9fb6edb 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -120,7 +120,9 @@ limitations under the License.
     line-height: 22px;
 }
 
-.mx_RoomView_timeline_rr_enabled {
+.mx_RoomView_timeline_rr_enabled,
+// on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
+.mx_EventListSummary {
     .mx_EventTile_line, .mx_EventTile_reply {
         /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
         margin-right: 110px;

From 2624017ab9a4c2837a3d04cbad49cd7bae992414 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 31 Mar 2020 12:51:03 +0100
Subject: [PATCH 1860/3235] Also stop peeking on unmount

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 50b66bee93..2c9e798bd8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -472,6 +472,10 @@ export default createReactClass({
             RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
         }
 
+        if (this.state.shouldPeek) {
+            this.context.stopPeeking();
+        }
+
         // stop tracking room changes to format permalinks
         this._stopAllPermalinkCreators();
 

From 6cf9166c4a3e4a85406679e997a9e0e8c3538468 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 31 Mar 2020 15:26:23 +0100
Subject: [PATCH 1861/3235] Use variables for the rem values.

It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
---
 res/css/_common.scss                          | 18 +++----
 res/css/_font-sizes.scss                      | 47 +++++++++++++++++++
 res/css/rethemendex.sh                        |  2 +-
 res/css/structures/_ContextualMenu.scss       |  2 +-
 res/css/structures/_CreateRoom.scss           |  2 +-
 res/css/structures/_FilePanel.scss            |  8 ++--
 res/css/structures/_GroupView.scss            | 10 ++--
 res/css/structures/_LeftPanel.scss            |  2 +-
 res/css/structures/_MyGroups.scss             |  8 ++--
 res/css/structures/_NotificationPanel.scss    |  4 +-
 res/css/structures/_RightPanel.scss           |  2 +-
 res/css/structures/_RoomDirectory.scss        | 10 ++--
 res/css/structures/_RoomStatusBar.scss        | 14 +++---
 res/css/structures/_RoomSubList.scss          |  4 +-
 res/css/structures/_RoomView.scss             |  4 +-
 res/css/structures/_TabbedView.scss           |  2 +-
 res/css/structures/_TagPanel.scss             |  4 +-
 res/css/structures/_ToastContainer.scss       |  6 +--
 res/css/structures/_TopLeftMenuButton.scss    |  2 +-
 res/css/structures/_ViewSource.scss           |  2 +-
 .../structures/auth/_CompleteSecurity.scss    |  2 +-
 res/css/views/auth/_AuthBody.scss             |  8 ++--
 res/css/views/auth/_AuthButtons.scss          |  2 +-
 res/css/views/auth/_AuthFooter.scss           |  2 +-
 res/css/views/auth/_CompleteSecurityBody.scss |  4 +-
 res/css/views/auth/_LanguageSelector.scss     |  2 +-
 res/css/views/auth/_ServerTypeSelector.scss   |  2 +-
 .../context_menus/_RoomTileContextMenu.scss   |  2 +-
 .../_StatusMessageContextMenu.scss            |  2 +-
 .../context_menus/_TagTileContextMenu.scss    |  2 +-
 res/css/views/context_menus/_TopLeftMenu.scss |  4 +-
 .../views/dialogs/_AddressPickerDialog.scss   |  4 +-
 .../dialogs/_ConfirmUserActionDialog.scss     |  8 ++--
 res/css/views/dialogs/_CreateGroupDialog.scss |  4 +-
 res/css/views/dialogs/_CreateRoomDialog.scss  |  2 +-
 res/css/views/dialogs/_DevtoolsDialog.scss    |  4 +-
 res/css/views/dialogs/_InviteDialog.scss      | 18 +++----
 .../dialogs/_MessageEditHistoryDialog.scss    |  4 +-
 .../dialogs/_NewSessionReviewDialog.scss      |  2 +-
 res/css/views/dialogs/_SetEmailDialog.scss    |  2 +-
 res/css/views/dialogs/_SetMxIdDialog.scss     |  2 +-
 res/css/views/dialogs/_SetPasswordDialog.scss |  2 +-
 res/css/views/dialogs/_TermsDialog.scss       |  2 +-
 .../views/dialogs/_UnknownDeviceDialog.scss   |  2 +-
 res/css/views/directory/_NetworkDropdown.scss | 14 +++---
 res/css/views/elements/_AccessibleButton.scss |  2 +-
 res/css/views/elements/_AddressTile.scss      |  4 +-
 .../views/elements/_DirectorySearchBox.scss   |  2 +-
 res/css/views/elements/_Dropdown.scss         |  4 +-
 res/css/views/elements/_EventListSummary.scss | 14 +++---
 res/css/views/elements/_Field.scss            |  6 +--
 res/css/views/elements/_FormButton.scss       |  4 +-
 res/css/views/elements/_ImageView.scss        | 10 ++--
 .../views/elements/_InteractiveTooltip.scss   |  2 +-
 res/css/views/elements/_RichText.scss         |  2 +-
 res/css/views/elements/_Tooltip.scss          |  6 +--
 res/css/views/elements/_TooltipButton.scss    |  4 +-
 res/css/views/emojipicker/_EmojiPicker.scss   |  8 ++--
 res/css/views/messages/_DateSeparator.scss    |  2 +-
 res/css/views/messages/_MessageActionBar.scss |  2 +-
 res/css/views/messages/_MessageTimestamp.scss |  2 +-
 res/css/views/messages/_ReactionsRow.scss     |  2 +-
 .../views/messages/_ReactionsRowButton.scss   |  2 +-
 res/css/views/messages/_ViewSourceEvent.scss  |  2 +-
 .../views/messages/_common_CryptoEvent.scss   |  4 +-
 res/css/views/right_panel/_UserInfo.scss      | 18 +++----
 .../views/right_panel/_VerificationPanel.scss |  2 +-
 res/css/views/rooms/_AppsDrawer.scss          | 10 ++--
 .../views/rooms/_BasicMessageComposer.scss    |  4 +-
 res/css/views/rooms/_EntityTile.scss          |  6 +--
 res/css/views/rooms/_EventTile.scss           | 28 +++++------
 res/css/views/rooms/_JumpToBottomButton.scss  |  4 +-
 res/css/views/rooms/_MemberDeviceInfo.scss    |  2 +-
 res/css/views/rooms/_MemberInfo.scss          | 14 +++---
 res/css/views/rooms/_MemberList.scss          |  2 +-
 res/css/views/rooms/_MessageComposer.scss     |  6 +--
 .../rooms/_MessageComposerFormatBar.scss      |  4 +-
 res/css/views/rooms/_PresenceLabel.scss       |  2 +-
 res/css/views/rooms/_RoomDropTarget.scss      |  4 +-
 res/css/views/rooms/_RoomHeader.scss          |  8 ++--
 res/css/views/rooms/_RoomList.scss            |  4 +-
 res/css/views/rooms/_RoomPreviewBar.scss      |  6 +--
 res/css/views/rooms/_RoomTile.scss            |  6 +--
 res/css/views/rooms/_SearchBar.scss           |  4 +-
 res/css/views/rooms/_SendMessageComposer.scss |  2 +-
 res/css/views/rooms/_WhoIsTypingTile.scss     |  4 +-
 res/css/views/settings/tabs/_SettingsTab.scss |  8 ++--
 .../views/terms/_InlineTermsAgreement.scss    |  2 +-
 .../verification/_VerificationShowSas.scss    |  4 +-
 res/css/views/voip/_CallView.scss             |  2 +-
 res/css/views/voip/_IncomingCallbox.scss      |  2 +-
 res/themes/dark-custom/css/dark-custom.scss   |  1 +
 res/themes/dark/css/_dark.scss                |  2 +-
 res/themes/dark/css/dark.scss                 |  1 +
 res/themes/light-custom/css/light-custom.scss |  1 +
 res/themes/light/css/_light.scss              |  4 +-
 res/themes/light/css/light.scss               |  1 +
 97 files changed, 280 insertions(+), 227 deletions(-)
 create mode 100644 res/css/_font-sizes.scss

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 657fb21244..03442ca510 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+@import "./_font-sizes.scss";
+
 :root {
     font-size: 15px;
 }
@@ -29,7 +31,7 @@ html {
 
 body {
     font-family: $font-family;
-    font-size: 1rem;
+    font-size: $font-15px;
     background-color: $primary-bg-color;
     color: $primary-fg-color;
     border: 0px;
@@ -64,7 +66,7 @@ b {
 h2 {
     color: $primary-fg-color;
     font-weight: 400;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     margin-top: 16px;
     margin-bottom: 16px;
 }
@@ -80,7 +82,7 @@ input[type=search],
 input[type=password] {
     padding: 9px;
     font-family: $font-family;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     font-weight: 600;
     min-width: 0;
 }
@@ -257,7 +259,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     color: $light-fg-color;
     z-index: 4012;
     font-weight: 300;
-    font-size: 1rem;
+    font-size: $font-15px;
     position: relative;
     padding: 25px 30px 30px 30px;
     max-height: 80%;
@@ -325,8 +327,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_Dialog_title {
-    font-size: 1.467rem;
-    line-height: 2.400rem;
+    font-size: $font-22px;
+    line-height: $font-36px;
     color: $dialog-title-fg-color;
 }
 
@@ -354,7 +356,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 
 .mx_Dialog_content {
     margin: 24px 0 68px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $primary-fg-color;
     word-wrap: break-word;
 }
@@ -450,7 +452,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_TextInputDialog_input {
-    font-size: 1rem;
+    font-size: $font-15px;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
new file mode 100644
index 0000000000..6baf11e9d6
--- /dev/null
+++ b/res/css/_font-sizes.scss
@@ -0,0 +1,47 @@
+$font-8px: 0.533rem;
+$font-9px: 0.600rem;
+$font-10px: 0.667rem;
+$font-10-4px: 0.693rem;
+$font-11px: 0.733rem;
+$font-12px: 0.800rem;
+$font-13px: 0.867rem;
+$font-14px: 0.933rem;
+$font-15px: 1.000rem;
+$font-16px: 1.067rem;
+$font-17px: 1.133rem;
+$font-18px: 1.200rem;
+$font-19px: 1.267rem;
+$font-20px: 1.333rem;
+$font-21px: 1.400rem;
+$font-22px: 1.467rem;
+$font-23px: 1.533rem;
+$font-24px: 1.600rem;
+$font-25px: 1.667rem;
+$font-26px: 1.733rem;
+$font-27px: 1.800rem;
+$font-28px: 1.867rem;
+$font-29px: 1.933rem;
+$font-30px: 2.000rem;
+$font-31px: 2.067rem;
+$font-32px: 2.133rem;
+$font-33px: 2.200rem;
+$font-34px: 2.267rem;
+$font-35px: 2.333rem;
+$font-36px: 2.400rem;
+$font-37px: 2.467rem;
+$font-38px: 2.533rem;
+$font-39px: 2.600rem;
+$font-40px: 2.667rem;
+$font-41px: 2.733rem;
+$font-42px: 2.800rem;
+$font-43px: 2.867rem;
+$font-44px: 2.933rem;
+$font-45px: 3.000rem;
+$font-46px: 3.067rem;
+$font-47px: 3.133rem;
+$font-48px: 3.200rem;
+$font-49px: 3.267rem;
+$font-50px: 3.333rem;
+$font-51px: 3.400rem;
+$font-52px: 3.467rem;
+$font-400px: 26.667rem;
diff --git a/res/css/rethemendex.sh b/res/css/rethemendex.sh
index 13be73f9a9..5d9e789982 100755
--- a/res/css/rethemendex.sh
+++ b/res/css/rethemendex.sh
@@ -8,7 +8,7 @@ cd `dirname $0`
     # we used to have exclude /themes from the find at this point.
     # as themes are no longer a spurious subdirectory of css/, we don't
     # need it any more.
-    find . -iname _\*.scss | fgrep -v _components.scss | LC_ALL=C sort |
+    find . -iname _\*.scss | sort | fgrep -v _components.scss | LC_ALL=C sort |
         while read i; do
             echo "@import \"$i\";"
         done
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index 67e7a7a8d6..61070a0541 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -36,7 +36,7 @@ limitations under the License.
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     z-index: 5001;
 }
 
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/structures/_CreateRoom.scss
index 3a66805bfe..e859beb20e 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/structures/_CreateRoom.scss
@@ -26,7 +26,7 @@ limitations under the License.
     border-radius: 3px;
     border: 1px solid $strong-input-border-color;
     font-weight: 300;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     padding: 9px;
     margin-top: 6px;
 }
diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index eceeab2e1b..859ee28035 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -49,7 +49,7 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile .mx_MFileBody_download {
     display: flex;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $event-timestamp-color;
 }
 
@@ -60,7 +60,7 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody_size {
     flex: 1 0 0;
-    font-size: 0.733rem;
+    font-size: $font-11px;
     text-align: right;
     white-space: nowrap;
 }
@@ -80,7 +80,7 @@ limitations under the License.
     flex: 1 1 auto;
     line-height: initial;
     padding: 0px;
-    font-size: 0.733rem;
+    font-size: $font-11px;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
@@ -90,7 +90,7 @@ limitations under the License.
     text-align: right;
     visibility: visible;
     position: initial;
-    font-size: 0.733rem;
+    font-size: $font-11px;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 6eb5e33462..ed0cf121a4 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -134,7 +134,7 @@ limitations under the License.
     overflow: hidden;
     color: $primary-fg-color;
     font-weight: bold;
-    font-size: 1.467rem;
+    font-size: $font-22px;
     padding-left: 19px;
     padding-right: 16px;
     /* why isn't text-overflow working? */
@@ -148,7 +148,7 @@ limitations under the License.
     max-height: 42px;
     color: $settings-grey-fg-color;
     font-weight: 300;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     padding-left: 19px;
     margin-right: 16px;
     overflow: hidden;
@@ -196,7 +196,7 @@ limitations under the License.
     text-transform: uppercase;
     color: $h3-color;
     font-weight: 600;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     margin-bottom: 10px;
 }
 
@@ -226,7 +226,7 @@ limitations under the License.
 .mx_GroupView_rooms_header_addRow_label {
     display: inline-block;
     vertical-align: top;
-    line-height: 1.600rem;
+    line-height: $font-24px;
     padding-left: 28px;
     color: $accent-color;
 }
@@ -258,7 +258,7 @@ limitations under the License.
 
 .mx_GroupView_membershipSection_description {
     /* To match textButton */
-    line-height: 2.267rem;
+    line-height: $font-34px;
 }
 
 .mx_GroupView_membershipSection_description .mx_BaseAvatar {
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 6af4b54f91..7d57425f6f 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -147,7 +147,7 @@ limitations under the License.
     }
 
     .mx_AccessibleButton {
-        font-size: 0.933rem;
+        font-size: $font-14px;
         margin: 4px 0 1px 9px;
         padding: 9px;
         padding-left: 42px;
diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index 042994e48c..73f1332cd0 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -105,7 +105,7 @@ limitations under the License.
 .mx_MyGroups_placeholder {
     background-color: $info-plinth-bg-color;
     color: $info-plinth-fg-color;
-    line-height: 26.667rem;
+    line-height: $font-400px;
     border-radius: 10px;
     text-align: center;
 }
@@ -149,11 +149,11 @@ limitations under the License.
 
 .mx_GroupTile_profile .mx_GroupTile_name {
     margin: 0px;
-    font-size: 1rem;
+    font-size: $font-15px;
 }
 
 .mx_GroupTile_profile .mx_GroupTile_groupId {
-    font-size: 0.867rem;
+    font-size: $font-13px;
     opacity: 0.7;
 }
 
@@ -161,7 +161,7 @@ limitations under the License.
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     max-height: 36px;
     overflow: hidden;
 }
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index ff95cc2dba..44205b1f01 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -39,7 +39,7 @@ limitations under the License.
 
 .mx_NotificationPanel .mx_EventTile_roomName {
     font-weight: bold;
-    font-size: 0.933rem;
+    font-size: $font-14px;
 }
 
 .mx_NotificationPanel .mx_EventTile_roomName a {
@@ -54,7 +54,7 @@ limitations under the License.
 .mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
     color: $primary-fg-color;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     display: inline;
     padding-left: 0px;
 }
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index b0c2b4650f..10878322e3 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -96,7 +96,7 @@ limitations under the License.
 }
 
 .mx_RightPanel_headerButton_badge {
-    font-size: 0.533rem;
+    font-size: $font-8px;
     border-radius: 8px;
     color: $accent-fg-color;
     background-color: $accent-color;
diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index b62f726d09..e0814182f5 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -64,7 +64,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_table {
-    font-size: 0.8rem;
+    font-size: $font-12px;
     color: $primary-fg-color;
     width: 100%;
     text-align: left;
@@ -112,7 +112,7 @@ limitations under the License.
 
 .mx_RoomDirectory_name {
     display: inline-block;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     font-weight: 600;
 }
 
@@ -124,7 +124,7 @@ limitations under the License.
     border-radius: 10px;
     display: inline-block;
     height: 20px;
-    line-height: 1.333rem;
+    line-height: $font-20px;
     padding: 0 5px;
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
@@ -136,7 +136,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_alias {
-    font-size: 0.8rem;
+    font-size: $font-12px;
     color: $settings-grey-fg-color;
 }
 
@@ -150,7 +150,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory > span {
-    font-size: 1rem;
+    font-size: $font-15px;
     margin-top: 0;
 
     .mx_AccessibleButton {
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index 1dc99b26f0..cd4390ee5c 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -32,7 +32,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_callBar {
     height: 50px;
-    line-height: 3.333rem;
+    line-height: $font-50px;
 }
 
 .mx_RoomStatusBar_placeholderIndicator span {
@@ -94,7 +94,7 @@ limitations under the License.
     border-radius: 40px;
     width: 24px;
     height: 24px;
-    line-height: 1.600rem;
+    line-height: $font-24px;
     font-size: 0.8em;
     vertical-align: top;
     text-align: center;
@@ -132,7 +132,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_connectionLostBar_desc {
     color: $primary-fg-color;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     opacity: 0.5;
     padding-bottom: 20px;
 }
@@ -145,7 +145,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_typingBar {
     height: 50px;
-    line-height: 3.333rem;
+    line-height: $font-50px;
 
     color: $primary-fg-color;
     opacity: 0.5;
@@ -155,7 +155,7 @@ limitations under the License.
 
 .mx_RoomStatusBar_isAlone {
     height: 50px;
-    line-height: 3.333rem;
+    line-height: $font-50px;
 
     color: $primary-fg-color;
     opacity: 0.5;
@@ -174,11 +174,11 @@ limitations under the License.
 
     .mx_RoomStatusBar_callBar {
         height: 40px;
-        line-height: 2.667rem;
+        line-height: $font-40px;
     }
 
     .mx_RoomStatusBar_typingBar {
         height: 40px;
-        line-height: 2.667rem;
+        line-height: $font-40px;
     }
 }
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index a76872a745..2e0c94263e 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -68,7 +68,7 @@ limitations under the License.
     text-transform: uppercase;
     color: $roomsublist-label-fg-color;
     font-weight: 700;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     margin-left: 8px;
 }
 
@@ -76,7 +76,7 @@ limitations under the License.
     flex: 0 0 auto;
     border-radius: 8px;
     font-weight: 600;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     padding: 0 5px;
     color: $roomtile-badge-fg-color;
     background-color: $roomtile-name-color;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 52de9384d7..f2154ef448 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -23,7 +23,7 @@ limitations under the License.
 .mx_RoomView_fileDropTarget {
     min-width: 0px;
     width: 100%;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     text-align: center;
 
     pointer-events: none;
@@ -186,7 +186,7 @@ limitations under the License.
 
 .mx_RoomView_empty {
     flex: 1 1 auto;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     padding-left: 3em;
     padding-right: 3em;
     margin-right: 20px;
diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 20e2120bfd..4a4bb125a3 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -39,7 +39,7 @@ limitations under the License.
     cursor: pointer;
     display: block;
     border-radius: 3px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
     margin-bottom: 6px;
     position: relative;
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 5173358bcc..f56b318e70 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -139,7 +139,7 @@ limitations under the License.
     background-color: $neutral-badge-color;
     color: #ffffff;
     font-weight: 600;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     text-align: center;
     padding-top: 1px;
     padding-left: 4px;
@@ -157,7 +157,7 @@ limitations under the License.
     border-radius: 8px;
     color: $accent-fg-color;
     font-weight: 600;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     padding: 0 5px;
     background-color: $roomtile-name-color;
 }
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 07daf3f865..af595aaeee 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -77,7 +77,7 @@ limitations under the License.
             grid-column: 1 / 3;
             grid-row: 1;
             margin: 0;
-            font-size: 1rem;
+            font-size: $font-15px;
             font-weight: 600;
         }
 
@@ -96,11 +96,11 @@ limitations under the License.
             white-space: nowrap;
             text-overflow: ellipsis;
             margin: 4px 0 11px 0;
-            font-size: 0.8rem;
+            font-size: $font-12px;
         }
 
         .mx_Toast_deviceID {
-            font-size: 0.667rem;
+            font-size: $font-10px;
         }
     }
 }
diff --git a/res/css/structures/_TopLeftMenuButton.scss b/res/css/structures/_TopLeftMenuButton.scss
index 9bdffb530a..53d44e7c24 100644
--- a/res/css/structures/_TopLeftMenuButton.scss
+++ b/res/css/structures/_TopLeftMenuButton.scss
@@ -32,7 +32,7 @@ limitations under the License.
 
 .mx_TopLeftMenuButton_name {
     margin: 0 7px;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index c84c48240e..421d1f03cd 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -29,7 +29,7 @@ limitations under the License.
 
 .mx_ViewSource pre {
     text-align: left;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     padding: 0.5em 1em 0.5em 1em;
     word-wrap: break-word;
     white-space: pre-wrap;
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 9367c2c996..3050840fe8 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -34,7 +34,7 @@ limitations under the License.
 }
 
 .mx_CompleteSecurity_body {
-    font-size: 1rem;
+    font-size: $font-15px;
 }
 
 .mx_CompleteSecurity_waiting {
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 219bf6d0e7..468a4b3d62 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -17,7 +17,7 @@ limitations under the License.
 
 .mx_AuthBody {
     width: 500px;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     color: $authpage-secondary-color;
     background-color: $authpage-body-bg-color;
     border-radius: 0 4px 4px 0;
@@ -25,14 +25,14 @@ limitations under the License.
     box-sizing: border-box;
 
     h2 {
-        font-size: 1.600rem;
+        font-size: $font-24px;
         font-weight: 600;
         margin-top: 8px;
         color: $authpage-primary-color;
     }
 
     h3 {
-        font-size: 0.933rem;
+        font-size: $font-14px;
         font-weight: 600;
         color: $authpage-primary-color;
     }
@@ -98,7 +98,7 @@ limitations under the License.
 
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     font-weight: normal;
 }
 
diff --git a/res/css/views/auth/_AuthButtons.scss b/res/css/views/auth/_AuthButtons.scss
index 109a1f4670..8deb0f80ac 100644
--- a/res/css/views/auth/_AuthButtons.scss
+++ b/res/css/views/auth/_AuthButtons.scss
@@ -43,7 +43,7 @@ limitations under the License.
 
     cursor: pointer;
 
-    font-size: 1rem;
+    font-size: $font-15px;
     padding: 0 11px;
     word-break: break-word;
 }
diff --git a/res/css/views/auth/_AuthFooter.scss b/res/css/views/auth/_AuthFooter.scss
index b1bdcb697e..0bc2743d54 100644
--- a/res/css/views/auth/_AuthFooter.scss
+++ b/res/css/views/auth/_AuthFooter.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_AuthFooter {
     text-align: center;
     width: 100%;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     opacity: 0.72;
     padding: 20px 0;
     background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
diff --git a/res/css/views/auth/_CompleteSecurityBody.scss b/res/css/views/auth/_CompleteSecurityBody.scss
index af0620c329..46b7abe2cc 100644
--- a/res/css/views/auth/_CompleteSecurityBody.scss
+++ b/res/css/views/auth/_CompleteSecurityBody.scss
@@ -24,13 +24,13 @@ limitations under the License.
     box-sizing: border-box;
 
     h2 {
-        font-size: 1.600rem;
+        font-size: $font-24px;
         font-weight: 600;
         margin-top: 0;
     }
 
     h3 {
-        font-size: 0.933rem;
+        font-size: $font-14px;
         font-weight: 600;
     }
 
diff --git a/res/css/views/auth/_LanguageSelector.scss b/res/css/views/auth/_LanguageSelector.scss
index e9ac8688ed..781561f876 100644
--- a/res/css/views/auth/_LanguageSelector.scss
+++ b/res/css/views/auth/_LanguageSelector.scss
@@ -20,7 +20,7 @@ limitations under the License.
 
 .mx_AuthBody_language .mx_Dropdown_input {
     border: none;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     font-weight: 600;
     color: $authpage-lang-color;
 }
diff --git a/res/css/views/auth/_ServerTypeSelector.scss b/res/css/views/auth/_ServerTypeSelector.scss
index 2042358b8a..fbd3d2655d 100644
--- a/res/css/views/auth/_ServerTypeSelector.scss
+++ b/res/css/views/auth/_ServerTypeSelector.scss
@@ -65,5 +65,5 @@ limitations under the License.
 }
 
 .mx_ServerTypeSelector_description {
-    font-size: 0.667rem;
+    font-size: $font-10px;
 }
diff --git a/res/css/views/context_menus/_RoomTileContextMenu.scss b/res/css/views/context_menus/_RoomTileContextMenu.scss
index 1e1a5f889f..9697ac9bef 100644
--- a/res/css/views/context_menus/_RoomTileContextMenu.scss
+++ b/res/css/views/context_menus/_RoomTileContextMenu.scss
@@ -38,7 +38,7 @@ limitations under the License.
     white-space: nowrap;
     display: flex;
     align-items: center;
-    line-height: 1.067rem;
+    line-height: $font-16px;
 }
 
 .mx_RoomTileContextMenu_tag_field.mx_RoomTileContextMenu_tag_fieldSet {
diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss
index b68d16281a..fceb7fba34 100644
--- a/res/css/views/context_menus/_StatusMessageContextMenu.scss
+++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss
@@ -44,7 +44,7 @@ input.mx_StatusMessageContextMenu_message {
 .mx_StatusMessageContextMenu_clear {
     @mixin mx_DialogButton;
     align-self: start;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     padding: 6px 1em;
     border: 1px solid transparent;
     margin-right: 10px;
diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
index 20f95d7f84..e4ccc030a2 100644
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ b/res/css/views/context_menus/_TagTileContextMenu.scss
@@ -22,7 +22,7 @@ limitations under the License.
     white-space: nowrap;
     display: flex;
     align-items: center;
-    line-height: 1.067rem;
+    line-height: $font-16px;
 }
 
 .mx_TagTileContextMenu_item object {
diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss
index abcaa4fcb5..973c306695 100644
--- a/res/css/views/context_menus/_TopLeftMenu.scss
+++ b/res/css/views/context_menus/_TopLeftMenu.scss
@@ -19,12 +19,12 @@ limitations under the License.
     border-radius: 4px;
 
     .mx_TopLeftMenu_greyedText {
-        font-size: 0.8rem;
+        font-size: $font-12px;
         opacity: 0.5;
     }
 
     .mx_TopLeftMenu_upgradeLink {
-        font-size: 0.8rem;
+        font-size: $font-12px;
 
         img {
             margin-left: 5px;
diff --git a/res/css/views/dialogs/_AddressPickerDialog.scss b/res/css/views/dialogs/_AddressPickerDialog.scss
index 6b107b3253..136e497994 100644
--- a/res/css/views/dialogs/_AddressPickerDialog.scss
+++ b/res/css/views/dialogs/_AddressPickerDialog.scss
@@ -28,7 +28,7 @@ limitations under the License.
 .mx_AddressPickerDialog_input,
 .mx_AddressPickerDialog_input:focus {
     height: 26px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     font-family: $font-family;
     padding-left: 12px;
     padding-right: 12px;
@@ -50,7 +50,7 @@ limitations under the License.
 .mx_AddressPickerDialog_inputContainer {
     border-radius: 3px;
     border: solid 1px $input-border-color;
-    line-height: 2.400rem;
+    line-height: $font-36px;
     padding-left: 4px;
     padding-right: 4px;
     padding-top: 1px;
diff --git a/res/css/views/dialogs/_ConfirmUserActionDialog.scss b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
index e589ef0450..823f4d1e28 100644
--- a/res/css/views/dialogs/_ConfirmUserActionDialog.scss
+++ b/res/css/views/dialogs/_ConfirmUserActionDialog.scss
@@ -26,22 +26,22 @@ limitations under the License.
 }
 
 .mx_ConfirmUserActionDialog_name {
-    font-size: 1.2rem;
+    font-size: $font-18px;
 }
 
 .mx_ConfirmUserActionDialog_userId {
-    font-size: 0.867rem;
+    font-size: $font-13px;
 }
 
 .mx_ConfirmUserActionDialog_reasonField {
     font-family: $font-family;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
 
     border-radius: 3px;
     border: solid 1px $input-border-color;
-    line-height: 2.400rem;
+    line-height: $font-36px;
     padding-left: 16px;
     padding-right: 16px;
     padding-top: 1px;
diff --git a/res/css/views/dialogs/_CreateGroupDialog.scss b/res/css/views/dialogs/_CreateGroupDialog.scss
index 4159944e5d..f7bfc61a98 100644
--- a/res/css/views/dialogs/_CreateGroupDialog.scss
+++ b/res/css/views/dialogs/_CreateGroupDialog.scss
@@ -25,7 +25,7 @@ limitations under the License.
 }
 
 .mx_CreateGroupDialog_input {
-    font-size: 1rem;
+    font-size: $font-15px;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
@@ -44,7 +44,7 @@ limitations under the License.
 .mx_CreateGroupDialog_prefix,
 .mx_CreateGroupDialog_suffix {
     padding: 0px 5px;
-    line-height: 2.467rem;
+    line-height: $font-37px;
     background-color: $input-darker-bg-color;
     border: 1px solid $input-border-color;
     text-align: center;
diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 1cdbe99843..c542741c30 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -49,7 +49,7 @@ limitations under the License.
 }
 
 .mx_CreateRoomDialog_input {
-    font-size: 1rem;
+    font-size: $font-15px;
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 399c7225f6..35cb6bc7ab 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -68,11 +68,11 @@ limitations under the License.
     width: 240px;
     color: $input-fg-color;
     font-family: $font-family;
-    font-size: 1.067rem;
+    font-size: $font-16px;
 }
 
 .mx_DevTools_textarea {
-    font-size: 0.8rem;
+    font-size: $font-12px;
     max-width: 684px;
     min-height: 250px;
     padding: 10px;
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 22b1867002..a77d0bfbba 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -40,8 +40,8 @@ limitations under the License.
         textarea,
         textarea:focus {
             height: 34px;
-            line-height: 2.267rem;
-            font-size: 0.933rem;
+            line-height: $font-34px;
+            font-size: $font-14px;
             padding-left: 12px;
             margin: 0 !important;
             border: 0 !important;
@@ -65,7 +65,7 @@ limitations under the License.
         min-width: 48px;
         margin-left: 10px;
         height: 25px;
-        line-height: 1.667rem;
+        line-height: $font-25px;
     }
 
     .mx_InviteDialog_buttonAndSpinner {
@@ -84,7 +84,7 @@ limitations under the License.
     padding-bottom: 10px;
 
     h3 {
-        font-size: 0.8rem;
+        font-size: $font-12px;
         color: $muted-fg-color;
         font-weight: bold;
         text-transform: uppercase;
@@ -143,23 +143,23 @@ limitations under the License.
 
     .mx_InviteDialog_roomTile_name {
         font-weight: 600;
-        font-size: 0.933rem;
+        font-size: $font-14px;
         color: $primary-fg-color;
         margin-left: 7px;
     }
 
     .mx_InviteDialog_roomTile_userId {
-        font-size: 0.8rem;
+        font-size: $font-12px;
         color: $muted-fg-color;
         margin-left: 7px;
     }
 
     .mx_InviteDialog_roomTile_time {
         text-align: right;
-        font-size: 0.8rem;
+        font-size: $font-12px;
         color: $muted-fg-color;
         float: right;
-        line-height: 2.400rem; // Height of the avatar to keep the time vertically aligned
+        line-height: $font-36px; // Height of the avatar to keep the time vertically aligned
     }
 
     .mx_InviteDialog_roomTile_highlight {
@@ -176,7 +176,7 @@ limitations under the License.
         border-radius: 12px;
         display: inline-block;
         height: 24px;
-        line-height: 1.600rem;
+        line-height: $font-24px;
         padding-left: 8px;
         padding-right: 8px;
         color: #ffffff; // this is fine without a var because it's for both themes
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.scss b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
index 8d989f6a00..e9d777effd 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -35,7 +35,7 @@ limitations under the License.
 
 .mx_MessageEditHistoryDialog_edits {
     list-style-type: none;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     padding: 0;
     color: $primary-fg-color;
 
@@ -60,7 +60,7 @@ limitations under the License.
     }
 
     .mx_MessageActionBar .mx_AccessibleButton {
-        font-size: 0.667rem;
+        font-size: $font-10px;
         padding: 0 8px;
     }
 }
diff --git a/res/css/views/dialogs/_NewSessionReviewDialog.scss b/res/css/views/dialogs/_NewSessionReviewDialog.scss
index 633b3a063b..b35c570c80 100644
--- a/res/css/views/dialogs/_NewSessionReviewDialog.scss
+++ b/res/css/views/dialogs/_NewSessionReviewDialog.scss
@@ -32,6 +32,6 @@ limitations under the License.
 }
 
 .mx_NewSessionReviewDialog_deviceID {
-    font-size: 0.8rem;
+    font-size: $font-12px;
     color: $notice-secondary-color;
 }
diff --git a/res/css/views/dialogs/_SetEmailDialog.scss b/res/css/views/dialogs/_SetEmailDialog.scss
index a5013f79b1..37bee7a9ff 100644
--- a/res/css/views/dialogs/_SetEmailDialog.scss
+++ b/res/css/views/dialogs/_SetEmailDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
     padding: 9px;
     color: $input-fg-color;
     background-color: $primary-bg-color;
-    font-size: 1rem;
+    font-size: $font-15px;
     width: 100%;
     max-width: 280px;
     margin-bottom: 10px;
diff --git a/res/css/views/dialogs/_SetMxIdDialog.scss b/res/css/views/dialogs/_SetMxIdDialog.scss
index 8208a679fd..1df34f3408 100644
--- a/res/css/views/dialogs/_SetMxIdDialog.scss
+++ b/res/css/views/dialogs/_SetMxIdDialog.scss
@@ -29,7 +29,7 @@ limitations under the License.
     padding: 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 1rem;
+    font-size: $font-15px;
     width: 100%;
     max-width: 280px;
 }
diff --git a/res/css/views/dialogs/_SetPasswordDialog.scss b/res/css/views/dialogs/_SetPasswordDialog.scss
index cff11c8afb..1f99353298 100644
--- a/res/css/views/dialogs/_SetPasswordDialog.scss
+++ b/res/css/views/dialogs/_SetPasswordDialog.scss
@@ -20,7 +20,7 @@ limitations under the License.
     padding: 9px;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 1rem;
+    font-size: $font-15px;
     max-width: 280px;
     margin-bottom: 10px;
 }
diff --git a/res/css/views/dialogs/_TermsDialog.scss b/res/css/views/dialogs/_TermsDialog.scss
index e9805d1b35..939a31dee6 100644
--- a/res/css/views/dialogs/_TermsDialog.scss
+++ b/res/css/views/dialogs/_TermsDialog.scss
@@ -31,7 +31,7 @@ limitations under the License.
 }
 
 .mx_TermsDialog_termsTable {
-    font-size: 0.8rem;
+    font-size: $font-12px;
     width: 100%;
 }
 
diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
index 8bb0ed4ff4..daa6bd2352 100644
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ b/res/css/views/dialogs/_UnknownDeviceDialog.scss
@@ -27,7 +27,7 @@ limitations under the License.
 // userid
 .mx_UnknownDeviceDialog p {
     font-weight: bold;
-    font-size: 1.067rem;
+    font-size: $font-16px;
 }
 
 .mx_UnknownDeviceDialog .mx_DeviceVerifyButtons {
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 2f0e3e6a17..269b507e3c 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -47,9 +47,9 @@ limitations under the License.
 
     .mx_NetworkDropdown_server_title {
         padding: 0 10px;
-        font-size: 1rem;
+        font-size: $font-15px;
         font-weight: 600;
-        line-height: 1.333rem;
+        line-height: $font-20px;
         margin-bottom: 4px;
 
         // remove server button
@@ -77,16 +77,16 @@ limitations under the License.
 
     .mx_NetworkDropdown_server_subtitle {
         padding: 0 10px;
-        font-size: 0.667rem;
-        line-height: 0.933rem;
+        font-size: $font-10px;
+        line-height: $font-14px;
         margin-top: -4px;
         margin-bottom: 4px;
         color: $muted-fg-color;
     }
 
     .mx_NetworkDropdown_server_network {
-        font-size: 0.8rem;
-        line-height: 1.067rem;
+        font-size: $font-12px;
+        line-height: $font-16px;
         padding: 4px 10px;
         cursor: pointer;
         position: relative;
@@ -154,7 +154,7 @@ limitations under the License.
 
     .mx_NetworkDropdown_handle_server {
         color: $muted-fg-color;
-        font-size: 0.8rem;
+        font-size: $font-12px;
     }
 }
 
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index b7439d5856..0ee1186934 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -27,7 +27,7 @@ limitations under the License.
     text-align: center;
     border-radius: 4px;
     display: inline-block;
-    font-size: 0.933rem;
+    font-size: $font-14px;
 }
 
 .mx_AccessibleButton_kind_primary {
diff --git a/res/css/views/elements/_AddressTile.scss b/res/css/views/elements/_AddressTile.scss
index 94028481d4..c42f52f8f4 100644
--- a/res/css/views/elements/_AddressTile.scss
+++ b/res/css/views/elements/_AddressTile.scss
@@ -19,9 +19,9 @@ limitations under the License.
     border-radius: 3px;
     background-color: rgba(74, 73, 74, 0.1);
     border: solid 1px $input-border-color;
-    line-height: 1.733rem;
+    line-height: $font-26px;
     color: $primary-fg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     font-weight: normal;
     margin-right: 4px;
 }
diff --git a/res/css/views/elements/_DirectorySearchBox.scss b/res/css/views/elements/_DirectorySearchBox.scss
index 35fb80f5df..e4b1ac5574 100644
--- a/res/css/views/elements/_DirectorySearchBox.scss
+++ b/res/css/views/elements/_DirectorySearchBox.scss
@@ -32,7 +32,7 @@ limitations under the License.
     background-repeat: no-repeat;
     text-indent: 18px;
     font-weight: 600;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     user-select: none;
     cursor: pointer;
 }
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 64bcf7a33a..0dd9656c9c 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -29,7 +29,7 @@ limitations under the License.
     position: relative;
     border-radius: 3px;
     border: 1px solid $strong-input-border-color;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     user-select: none;
 }
 
@@ -53,7 +53,7 @@ limitations under the License.
 
 .mx_Dropdown_option {
     height: 35px;
-    line-height: 2.333rem;
+    line-height: $font-35px;
     padding-left: 8px;
     padding-right: 8px;
 }
diff --git a/res/css/views/elements/_EventListSummary.scss b/res/css/views/elements/_EventListSummary.scss
index a40c1384d7..f3e9f77aa3 100644
--- a/res/css/views/elements/_EventListSummary.scss
+++ b/res/css/views/elements/_EventListSummary.scss
@@ -19,7 +19,7 @@ limitations under the License.
 }
 
 .mx_TextualEvent.mx_EventListSummary_summary {
-    font-size: 0.933rem;
+    font-size: $font-14px;
     display: inline-flex;
 }
 
@@ -27,7 +27,7 @@ limitations under the License.
     display: inline-block;
     margin-right: 8px;
     padding-top: 8px;
-    line-height: 0.8rem;
+    line-height: $font-12px;
 }
 
 .mx_EventListSummary_avatars .mx_BaseAvatar {
@@ -46,19 +46,19 @@ limitations under the License.
 .mx_EventListSummary_line {
     border-bottom: 1px solid $primary-hairline-color;
     margin-left: 63px;
-    line-height: 2.000rem;
+    line-height: $font-30px;
 }
 
 .mx_MatrixChat_useCompactLayout {
     .mx_EventListSummary {
-        font-size: 0.867rem;
+        font-size: $font-13px;
         .mx_EventTile_line {
-            line-height: 1.333rem;
+            line-height: $font-20px;
         }
     }
 
     .mx_EventListSummary_line {
-        line-height: 1.467rem;
+        line-height: $font-22px;
     }
 
     .mx_EventListSummary_toggle {
@@ -66,6 +66,6 @@ limitations under the License.
     }
 
     .mx_TextualEvent.mx_EventListSummary_summary {
-        font-size: 0.867rem;
+        font-size: $font-13px;
     }
 }
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 26d24dba3a..cf5bc7ab41 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -40,7 +40,7 @@ limitations under the License.
 .mx_Field textarea {
     font-weight: normal;
     font-family: $font-family;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     border: none;
     // Even without a border here, we still need this avoid overlapping the rounded
     // corners on the field above.
@@ -102,7 +102,7 @@ limitations under the License.
         background-color 0.25s ease-out 0.1s;
     color: $primary-fg-color;
     background-color: transparent;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     position: absolute;
     left: 0px;
     top: 0px;
@@ -126,7 +126,7 @@ limitations under the License.
         color 0.25s ease-out 0s,
         top 0.25s ease-out 0s,
         background-color 0.25s ease-out 0s;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     top: -13px;
     padding: 0 2px;
     background-color: $field-focused-label-bg-color;
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
index c23ab6ee30..7ec01f17e6 100644
--- a/res/css/views/elements/_FormButton.scss
+++ b/res/css/views/elements/_FormButton.scss
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 .mx_FormButton {
-    line-height: 1.067rem;
+    line-height: $font-16px;
     padding: 5px 15px;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     height: min-content;
 
     &:not(:last-child) {
diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index cc7fca67d3..0a4ed2a194 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -102,13 +102,13 @@ limitations under the License.
 }
 
 .mx_ImageView_name {
-    font-size: 1.2rem;
+    font-size: $font-18px;
     margin-bottom: 6px;
     word-wrap: break-word;
 }
 
 .mx_ImageView_metadata {
-    font-size: 1rem;
+    font-size: $font-15px;
     opacity: 0.5;
 }
 
@@ -118,13 +118,13 @@ limitations under the License.
     margin-bottom: 6px;
     border-radius: 5px;
     background-color: $lightbox-bg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     padding: 9px;
     border: 1px solid $lightbox-border-color;
 }
 
 .mx_ImageView_size {
-    font-size: 0.733rem;
+    font-size: $font-11px;
 }
 
 .mx_ImageView_link {
@@ -133,7 +133,7 @@ limitations under the License.
 }
 
 .mx_ImageView_button {
-    font-size: 1rem;
+    font-size: $font-15px;
     opacity: 0.5;
     margin-top: 18px;
     cursor: pointer;
diff --git a/res/css/views/elements/_InteractiveTooltip.scss b/res/css/views/elements/_InteractiveTooltip.scss
index 07441ef85d..db98d95709 100644
--- a/res/css/views/elements/_InteractiveTooltip.scss
+++ b/res/css/views/elements/_InteractiveTooltip.scss
@@ -24,7 +24,7 @@ limitations under the License.
     background-color: $interactive-tooltip-bg-color;
     color: $interactive-tooltip-fg-color;
     position: absolute;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     font-weight: 600;
     padding: 6px;
     z-index: 5001;
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index d821f52e3d..e3f88cc779 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -9,7 +9,7 @@
     border-radius: 16px;
     display: inline-block;
     height: 20px;
-    line-height: 1.333rem;
+    line-height: $font-20px;
     padding-left: 5px;
 }
 
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index 61762ced92..73ac9b3558 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -58,8 +58,8 @@ limitations under the License.
     z-index: 4000; // Higher than dialogs so tooltips can be used in dialogs
     padding: 10px;
     pointer-events: none;
-    line-height: 0.933rem;
-    font-size: 0.8rem;
+    line-height: $font-14px;
+    font-size: $font-12px;
     font-weight: 600;
     color: $primary-fg-color;
     max-width: 200px;
@@ -82,7 +82,7 @@ limitations under the License.
     text-align: center;
     border: none;
     border-radius: 3px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     line-height: 1.2;
     padding: 6px 8px;
 
diff --git a/res/css/views/elements/_TooltipButton.scss b/res/css/views/elements/_TooltipButton.scss
index c350fc22e2..0c85dac818 100644
--- a/res/css/views/elements/_TooltipButton.scss
+++ b/res/css/views/elements/_TooltipButton.scss
@@ -28,7 +28,7 @@ limitations under the License.
     transition: opacity 0.2s ease-in;
     opacity: 0.6;
 
-    line-height: 0.733rem;
+    line-height: $font-11px;
     text-align: center;
 
     cursor: pointer;
@@ -47,6 +47,6 @@ limitations under the License.
 .mx_TooltipButton_helpText {
     width: 400px;
     text-align: start;
-    line-height: 1.133rem !important;
+    line-height: 17px !important;
 }
 
diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 64b27b9ab3..24561eeeb9 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -163,7 +163,7 @@ limitations under the License.
 
 .mx_EmojiPicker_item {
     display: inline-block;
-    font-size: 1.333rem;
+    font-size: $font-20px;
     padding: 5px;
     width: 100%;
     height: 100%;
@@ -183,7 +183,7 @@ limitations under the License.
 }
 
 .mx_EmojiPicker_category_label, .mx_EmojiPicker_preview_name {
-    font-size: 1.067rem;
+    font-size: $font-16px;
     font-weight: 600;
     margin: 0;
 }
@@ -197,7 +197,7 @@ limitations under the License.
 }
 
 .mx_EmojiPicker_preview_emoji {
-    font-size: 2.133rem;
+    font-size: $font-32px;
     padding: 8px 16px;
 }
 
@@ -212,7 +212,7 @@ limitations under the License.
 
 .mx_EmojiPicker_shortcode {
     color: $light-fg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
 
     &::before, &::after {
         content: ":";
diff --git a/res/css/views/messages/_DateSeparator.scss b/res/css/views/messages/_DateSeparator.scss
index b02e72814f..867f58d860 100644
--- a/res/css/views/messages/_DateSeparator.scss
+++ b/res/css/views/messages/_DateSeparator.scss
@@ -19,7 +19,7 @@ limitations under the License.
     margin: 4px 0;
     display: flex;
     align-items: center;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $roomtopic-color;
 }
 
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 66ba0b227d..9f3971ecf0 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -21,7 +21,7 @@ limitations under the License.
     cursor: pointer;
     display: flex;
     height: 24px;
-    line-height: 1.600rem;
+    line-height: $font-24px;
     border-radius: 4px;
     background: $message-action-bar-bg-color;
     top: -18px;
diff --git a/res/css/views/messages/_MessageTimestamp.scss b/res/css/views/messages/_MessageTimestamp.scss
index 3a2a8d6336..f8d91cc083 100644
--- a/res/css/views/messages/_MessageTimestamp.scss
+++ b/res/css/views/messages/_MessageTimestamp.scss
@@ -16,5 +16,5 @@ limitations under the License.
 
 .mx_MessageTimestamp {
     color: $event-timestamp-color;
-    font-size: 0.667rem;
+    font-size: $font-10px;
 }
diff --git a/res/css/views/messages/_ReactionsRow.scss b/res/css/views/messages/_ReactionsRow.scss
index ee816e0fc0..2f5695e1fb 100644
--- a/res/css/views/messages/_ReactionsRow.scss
+++ b/res/css/views/messages/_ReactionsRow.scss
@@ -21,7 +21,7 @@ limitations under the License.
 
 .mx_ReactionsRow_showAll {
     text-decoration: none;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     font-weight: 600;
     margin-left: 6px;
     vertical-align: top;
diff --git a/res/css/views/messages/_ReactionsRowButton.scss b/res/css/views/messages/_ReactionsRowButton.scss
index 7160c223be..941153ca5b 100644
--- a/res/css/views/messages/_ReactionsRowButton.scss
+++ b/res/css/views/messages/_ReactionsRowButton.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_ReactionsRowButton {
     display: inline-flex;
     height: 20px;
-    line-height: 1.400rem;
+    line-height: $font-21px;
     margin-right: 6px;
     padding: 0 6px;
     border: 1px solid $reaction-row-button-border-color;
diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss
index 088b66445d..076932ee97 100644
--- a/res/css/views/messages/_ViewSourceEvent.scss
+++ b/res/css/views/messages/_ViewSourceEvent.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_EventTile_content.mx_ViewSourceEvent {
     display: flex;
     opacity: 0.6;
-    font-size: 0.8rem;
+    font-size: $font-12px;
 
     pre, code {
         flex: 1;
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index c9499b763f..637d25d7a1 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -45,7 +45,7 @@ limitations under the License.
 
     .mx_cryptoEvent_title {
         font-weight: 600;
-        font-size: 1rem;
+        font-size: $font-15px;
         grid-column: 2;
         grid-row: 1;
     }
@@ -56,7 +56,7 @@ limitations under the License.
     }
 
     .mx_cryptoEvent_state, .mx_cryptoEvent_subtitle {
-        font-size: 0.8rem;
+        font-size: $font-12px;
     }
 
     .mx_cryptoEvent_state, .mx_cryptoEvent_buttons {
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index acc5e4641f..b45858e491 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: column;
     flex: 1;
     overflow-y: auto;
-    font-size: 0.8rem;
+    font-size: $font-12px;
 
     .mx_UserInfo_cancel {
         cursor: pointer;
@@ -43,7 +43,7 @@ limitations under the License.
     }
 
     h2 {
-        font-size: 1.2rem;
+        font-size: $font-18px;
         font-weight: 600;
         margin: 18px 0 0 0;
     }
@@ -109,7 +109,7 @@ limitations under the License.
         justify-content: center;
 
         // override the calculated sizes so that the letter isn't HUGE
-        font-size: 3.733rem !important;
+        font-size: 56px !important;
         width: 100% !important;
         transition: font-size 0.5s;
     }
@@ -122,7 +122,7 @@ limitations under the License.
         text-transform: uppercase;
         color: $notice-secondary-color;
         font-weight: bold;
-        font-size: 0.8rem;
+        font-size: $font-12px;
         margin: 4px 0;
     }
 
@@ -134,8 +134,8 @@ limitations under the License.
         text-align: center;
 
         h2 {
-            font-size: 1.2rem;
-            line-height: 1.667rem;
+            font-size: $font-18px;
+            line-height: $font-25px;
             flex: 1;
             justify-content: center;
             align-items: center;
@@ -197,7 +197,7 @@ limitations under the License.
     .mx_UserInfo_field {
         cursor: pointer;
         color: $accent-color;
-        line-height: 1.067rem;
+        line-height: $font-16px;
         margin: 8px 0;
 
         &.mx_UserInfo_destructive {
@@ -206,7 +206,7 @@ limitations under the License.
     }
 
     .mx_UserInfo_statusMessage {
-        font-size: 0.733rem;
+        font-size: $font-11px;
         opacity: 0.5;
         overflow: hidden;
         white-space: nowrap;
@@ -282,6 +282,6 @@ limitations under the License.
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar_initial {
-        font-size: 2.667rem !important; // override the other override because here the avatar is smaller
+        font-size: 40px !important; // override the other override because here the avatar is smaller
     }
 }
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 4a10dcbbcd..6165420275 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -95,7 +95,7 @@ limitations under the License.
             }
 
             .mx_VerificationPanel_QRPhase_helpText {
-                font-size: 0.933rem;
+                font-size: $font-14px;
                 margin-top: 71px;
                 text-align: center;
             }
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 171cf49ba5..1b1bab67bc 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -46,7 +46,7 @@ $AppsDrawerBodyHeight: 273px;
     padding: 0;
     margin: 5px auto 5px auto;
     color: $accent-color;
-    font-size: 0.8rem;
+    font-size: $font-12px;
 }
 
 .mx_AddWidget_button_full_width {
@@ -59,7 +59,7 @@ $AppsDrawerBodyHeight: 273px;
     padding: 9px;
     color: $primary-hairline-color;
     background-color: $primary-bg-color;
-    font-size: 1rem;
+    font-size: $font-15px;
 }
 
 .mx_AppTile {
@@ -102,7 +102,7 @@ $AppsDrawerBodyHeight: 273px;
 
 .mx_AppTileMenuBar {
     margin: 0;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     background-color: $widget-menu-bar-bg-color;
     display: flex;
     flex-direction: row;
@@ -272,7 +272,7 @@ form.mx_Custom_Widget_Form div {
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    font-size: 1.067rem;
+    font-size: $font-16px;
 }
 
 .mx_AppPermissionWarning_row {
@@ -280,7 +280,7 @@ form.mx_Custom_Widget_Form div {
 }
 
 .mx_AppPermissionWarning_smallText {
-    font-size: 0.8rem;
+    font-size: $font-12px;
 }
 
 .mx_AppPermissionWarning_bolder {
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index c1f9663ea3..cc76623a8c 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -63,8 +63,8 @@ limitations under the License.
                 border-radius: 8px;
                 text-align: center;
                 font-weight: normal;
-                line-height: 1.067rem;
-                font-size: 0.667rem;
+                line-height: $font-16px;
+                font-size: $font-10-4px;
             }
         }
     }
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index d66e4efe5c..966d2c4e70 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -78,7 +78,7 @@ limitations under the License.
 .mx_GroupRoomTile_name {
     flex: 1 1 0;
     overflow: hidden;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
@@ -116,7 +116,7 @@ limitations under the License.
 }
 
 .mx_EntityTile_subtext {
-    font-size: 0.733rem;
+    font-size: $font-11px;
     opacity: 0.5;
     overflow: hidden;
     white-space: nowrap;
@@ -125,7 +125,7 @@ limitations under the License.
 
 .mx_EntityTile_power {
     padding-inline-start: 6px;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     color: $notice-secondary-color;
     max-width: 6em;
     overflow: hidden;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 436b158644..9d798dcb20 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -19,7 +19,7 @@ limitations under the License.
     max-width: 100%;
     clear: both;
     padding-top: 18px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     position: relative;
 }
 
@@ -64,7 +64,7 @@ limitations under the License.
 
 .mx_EventTile .mx_SenderProfile {
     color: $primary-fg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     display: inline-block; /* anti-zalgo, with overflow hidden */
     overflow: hidden;
     cursor: pointer;
@@ -72,7 +72,7 @@ limitations under the License.
     padding-bottom: 0px;
     padding-top: 0px;
     margin: 0px;
-    line-height: 1.133rem;
+    line-height: $font-17px;
     /* the next three lines, along with overflow hidden, truncate long display names */
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -117,7 +117,7 @@ limitations under the License.
     padding-bottom: 2px;
     border-radius: 4px;
     min-height: 24px;
-    line-height: 1.467rem;
+    line-height: $font-22px;
 }
 
 .mx_RoomView_timeline_rr_enabled {
@@ -152,8 +152,8 @@ limitations under the License.
 
 /* HACK to override line-height which is already marked important elsewhere */
 .mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
-    font-size: 3.200rem !important;
-    line-height: 3.800rem !important;
+    font-size: 48px !important;
+    line-height: 57px !important;
 }
 
 .mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
@@ -312,7 +312,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_readAvatarRemainder {
     color: $event-timestamp-color;
-    font-size: 0.733rem;
+    font-size: $font-11px;
     position: absolute;
 }
 
@@ -341,7 +341,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_spoiler_reason {
     color: $event-timestamp-color;
-    font-size: 0.733rem;
+    font-size: $font-11px;
 }
 
 .mx_EventTile_spoiler_content {
@@ -393,7 +393,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 }
 
 .mx_EventTile_keyRequestInfo {
-    font-size: 0.8rem;
+    font-size: $font-12px;
 }
 
 .mx_EventTile_keyRequestInfo_text {
@@ -471,7 +471,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_content .mx_EventTile_edited {
     user-select: none;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     color: $roomtopic-color;
     display: inline-block;
     margin-left: 9px;
@@ -489,7 +489,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     white-space: normal !important;
     line-height: inherit !important;
     color: inherit; // inherit the colour from the dark or light theme by default (but not for code blocks)
-    font-size: 0.933rem;
+    font-size: $font-14px;
 
     pre, code {
         font-family: $monospace-font-family !important;
@@ -589,9 +589,9 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     .mx_EventTile.mx_EventTile_info {
         // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
         padding-top: 0px;
-        font-size: 0.867rem;
+        font-size: $font-13px;
         .mx_EventTile_line, .mx_EventTile_reply {
-            line-height: 1.333rem;
+            line-height: $font-20px;
         }
         .mx_EventTile_avatar {
             top: 4px;
@@ -599,7 +599,7 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     }
 
     .mx_EventTile .mx_SenderProfile {
-        font-size: 0.867rem;
+        font-size: $font-13px;
     }
 
     .mx_EventTile.mx_EventTile_emote {
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 2c44eed1b8..63cf574596 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -34,8 +34,8 @@ limitations under the License.
     top: -12px;
     border-radius: 16px;
     font-weight: bold;
-    font-size: 0.8rem;
-    line-height: 0.933rem;
+    font-size: $font-12px;
+    line-height: $font-14px;
     text-align: center;
     // to be able to get it centered
     // with text-align in parent
diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss
index fe5a4b7659..71b05a93fc 100644
--- a/res/css/views/rooms/_MemberDeviceInfo.scss
+++ b/res/css/views/rooms/_MemberDeviceInfo.scss
@@ -59,7 +59,7 @@ limitations under the License.
 
 .mx_MemberDeviceInfo_deviceId {
     word-break: break-word;
-    font-size: 0.867rem;
+    font-size: $font-13px;
 }
 
 .mx_MemberDeviceInfo_deviceInfo {
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index d4c8fbb097..fb082843f1 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -48,7 +48,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo h2 {
-    font-size: 1.2rem;
+    font-size: $font-18px;
     font-weight: 600;
     margin: 16px 0 16px 15px;
 }
@@ -94,12 +94,12 @@ limitations under the License.
     text-transform: uppercase;
     color: $input-darker-fg-color;
     font-weight: bold;
-    font-size: 0.8rem;
+    font-size: $font-12px;
     margin: 4px 0;
 }
 
 .mx_MemberInfo_profileField {
-    font-size: 1rem;
+    font-size: $font-15px;
     position: relative;
 }
 
@@ -109,10 +109,10 @@ limitations under the License.
 
 .mx_MemberInfo_field {
     cursor: pointer;
-    font-size: 1rem;
+    font-size: $font-15px;
     color: $primary-fg-color;
     margin-left: 8px;
-    line-height: 1.533rem;
+    line-height: $font-23px;
 }
 
 .mx_MemberInfo_createRoom {
@@ -128,7 +128,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo label {
-    font-size: 0.867rem;
+    font-size: $font-13px;
 }
 
 .mx_MemberInfo label .mx_MemberInfo_label_text {
@@ -144,7 +144,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo_statusMessage {
-    font-size: 0.733rem;
+    font-size: $font-11px;
     opacity: 0.5;
     overflow: hidden;
     white-space: nowrap;
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 0f676645a9..99dc2338d4 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -30,7 +30,7 @@ limitations under the License.
         text-transform: uppercase;
         color: $h3-color;
         font-weight: 600;
-        font-size: 0.867rem;
+        font-size: $font-13px;
         padding-left: 3px;
         padding-right: 12px;
         margin-top: 8px;
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 3777acf423..7b223be3a4 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -105,7 +105,7 @@ limitations under the License.
     min-height: 60px;
     justify-content: flex-start;
     align-items: flex-start;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     margin-right: 6px;
 }
 
@@ -161,7 +161,7 @@ limitations under the License.
     box-shadow: none;
     color: $primary-fg-color;
     background-color: $primary-bg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     max-height: 120px;
     overflow: auto;
     /* needed for FF */
@@ -242,7 +242,7 @@ limitations under the License.
 
     flex-direction: row;
     align-items: center;
-    font-size: 0.667rem;
+    font-size: $font-10px;
     color: $greyed-fg-color;
 }
 
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss
index 0558cd48cf..27ee7b9795 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.scss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.scss
@@ -97,13 +97,13 @@ limitations under the License.
 
 .mx_MessageComposerFormatBar_buttonTooltip {
     white-space: nowrap;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     font-weight: 600;
     min-width: 54px;
     text-align: center;
 
     .mx_MessageComposerFormatBar_tooltipShortcut {
-        font-size: 0.600rem;
+        font-size: $font-9px;
         opacity: 0.7;
     }
 }
diff --git a/res/css/views/rooms/_PresenceLabel.scss b/res/css/views/rooms/_PresenceLabel.scss
index 6d044a69b5..5be83c77d7 100644
--- a/res/css/views/rooms/_PresenceLabel.scss
+++ b/res/css/views/rooms/_PresenceLabel.scss
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 .mx_PresenceLabel {
-    font-size: 0.733rem;
+    font-size: $font-11px;
     opacity: 0.5;
 }
diff --git a/res/css/views/rooms/_RoomDropTarget.scss b/res/css/views/rooms/_RoomDropTarget.scss
index 1ae8f73e88..2e8145c2c9 100644
--- a/res/css/views/rooms/_RoomDropTarget.scss
+++ b/res/css/views/rooms/_RoomDropTarget.scss
@@ -28,7 +28,7 @@ limitations under the License.
 }
 
 .mx_RoomDropTarget {
-    font-size: 0.867rem;
+    font-size: $font-13px;
     padding-top: 5px;
     padding-bottom: 5px;
     border: 1px dashed $accent-color;
@@ -41,7 +41,7 @@ limitations under the License.
 .mx_RoomDropTarget_label {
     position: relative;
     margin-top: 3px;
-    line-height: 1.400rem;
+    line-height: $font-21px;
     z-index: 1;
     text-align: center;
 }
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 1737014248..969106c9ea 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -77,9 +77,9 @@ limitations under the License.
 }
 
 .mx_RoomHeader_simpleHeader {
-    line-height: 3.467rem;
+    line-height: $font-52px;
     color: $roomheader-color;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     font-weight: 600;
     overflow: hidden;
     margin-left: 63px;
@@ -102,7 +102,7 @@ limitations under the License.
     overflow: hidden;
     color: $roomheader-color;
     font-weight: 600;
-    font-size: 1.2rem;
+    font-size: $font-18px;
     margin: 0 7px;
     border-bottom: 1px solid transparent;
     display: flex;
@@ -161,7 +161,7 @@ limitations under the License.
     flex: 1;
     color: $roomtopic-color;
     font-weight: 400;
-    font-size: 0.867rem;
+    font-size: $font-13px;
     margin: 0 7px;
     margin-top: 4px; // to align baseline of topic with room name
     overflow: hidden;
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index b9cb2dc8e4..50a9e7ee1f 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -47,13 +47,13 @@ limitations under the License.
 }
 
 .mx_RoomList_emptySubListTip {
-    font-size: 0.867rem;
+    font-size: $font-13px;
     padding: 5px;
     border: 1px dashed $accent-color;
     color: $primary-fg-color;
     background-color: $droptarget-bg-color;
     border-radius: 4px;
-    line-height: 1.067rem;
+    line-height: $font-16px;
 }
 
 .mx_RoomList_emptySubListTip .mx_RoleButton {
diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 8e61524fda..8708f13ada 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -23,7 +23,7 @@ limitations under the License.
     -webkit-align-items: center;
 
     h3 {
-        font-size: 1.2rem;
+        font-size: $font-18px;
         font-weight: 600;
 
         &.mx_RoomPreviewBar_spinnerTitle {
@@ -48,8 +48,8 @@ limitations under the License.
     }
 
     .mx_RoomPreviewBar_footer {
-        font-size: 0.8rem;
-        line-height: 1.333rem;
+        font-size: $font-12px;
+        line-height: $font-20px;
 
         .mx_Spinner {
             vertical-align: middle;
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 57d42f6be2..7be2a4e3d4 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -64,7 +64,7 @@ limitations under the License.
 
 .mx_RoomTile_subtext {
     display: inline-block;
-    font-size: 0.733rem;
+    font-size: $font-11px;
     padding: 0 0 0 7px;
     margin: 0;
     overflow: hidden;
@@ -112,7 +112,7 @@ limitations under the License.
 }
 
 .mx_RoomTile_name {
-    font-size: 0.933rem;
+    font-size: $font-14px;
     padding: 0 4px;
     color: $roomtile-name-color;
     white-space: nowrap;
@@ -126,7 +126,7 @@ limitations under the License.
     padding: 0 0.4em;
     color: $roomtile-badge-fg-color;
     font-weight: 600;
-    font-size: 0.8rem;
+    font-size: $font-12px;
 }
 
 .collapsed {
diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss
index 5b80585cef..fecc8d78d8 100644
--- a/res/css/views/rooms/_SearchBar.scss
+++ b/res/css/views/rooms/_SearchBar.scss
@@ -22,7 +22,7 @@ limitations under the License.
 
     .mx_SearchBar_input {
         // border: 1px solid $input-border-color;
-        // font-size: 1rem;
+        // font-size: $font-15px;
         flex: 1 1 0;
         margin-left: 22px;
     }
@@ -45,7 +45,7 @@ limitations under the License.
         border: 0;
         margin: 0 0 0 22px;
         padding: 5px;
-        font-size: 1rem;
+        font-size: $font-15px;
         cursor: pointer;
         color: $primary-fg-color;
         border-bottom: 2px solid $accent-color;
diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss
index 7233d373a3..0b646666e7 100644
--- a/res/css/views/rooms/_SendMessageComposer.scss
+++ b/res/css/views/rooms/_SendMessageComposer.scss
@@ -18,7 +18,7 @@ limitations under the License.
     flex: 1;
     display: flex;
     flex-direction: column;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     justify-content: center;
     margin-right: 6px;
     // don't grow wider than available space
diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index a1e6f3a3bf..8b135152d6 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -49,7 +49,7 @@ limitations under the License.
     border-radius: 40px;
     width: 24px;
     height: 24px;
-    line-height: 1.600rem;
+    line-height: $font-24px;
     font-size: 0.8em;
     vertical-align: top;
     text-align: center;
@@ -57,7 +57,7 @@ limitations under the License.
 
 .mx_WhoIsTypingTile_label {
     flex: 1;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     font-weight: 600;
     color: $eventtile-meta-color;
 }
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 03bd3221cd..1fbfb35927 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -19,7 +19,7 @@ limitations under the License.
 }
 
 .mx_SettingsTab_heading {
-    font-size: 1.333rem;
+    font-size: $font-20px;
     font-weight: 600;
     color: $primary-fg-color;
 }
@@ -29,7 +29,7 @@ limitations under the License.
 }
 
 .mx_SettingsTab_subheading {
-    font-size: 1.067rem;
+    font-size: $font-16px;
     display: block;
     font-family: $font-family;
     font-weight: 600;
@@ -40,7 +40,7 @@ limitations under the License.
 
 .mx_SettingsTab_subsectionText {
     color: $settings-subsection-fg-color;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     display: block;
     margin: 10px 100px 10px 0; // Align with the rest of the view
 }
@@ -61,7 +61,7 @@ limitations under the License.
 .mx_SettingsTab_section .mx_SettingsFlag .mx_SettingsFlag_label {
     vertical-align: middle;
     display: inline-block;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $primary-fg-color;
     max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
     box-sizing: border-box;
diff --git a/res/css/views/terms/_InlineTermsAgreement.scss b/res/css/views/terms/_InlineTermsAgreement.scss
index 1f9ea7a33d..1d0e3ea8c5 100644
--- a/res/css/views/terms/_InlineTermsAgreement.scss
+++ b/res/css/views/terms/_InlineTermsAgreement.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_InlineTermsAgreement_cbContainer {
     margin-bottom: 10px;
-    font-size: 0.933rem;
+    font-size: $font-14px;
 
     a {
         color: $accent-color;
diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index fd83bf7ad4..6e26943640 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -48,14 +48,14 @@ limitations under the License.
 }
 
 .mx_VerificationShowSas_emojiSas_emoji {
-    font-size: 2.133rem;
+    font-size: $font-32px;
 }
 
 .mx_VerificationShowSas_emojiSas_label {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size: 0.8rem;
+    font-size: $font-12px;
 }
 
 .mx_VerificationShowSas_emojiSas_break {
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index 06c9f7bed6..4650f30c1d 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -21,5 +21,5 @@ limitations under the License.
     text-align: center;
     padding: 6px;
     font-weight: bold;
-    font-size: 0.867rem;
+    font-size: $font-13px;
 }
diff --git a/res/css/views/voip/_IncomingCallbox.scss b/res/css/views/voip/_IncomingCallbox.scss
index 3c8ed46639..ed33de470d 100644
--- a/res/css/views/voip/_IncomingCallbox.scss
+++ b/res/css/views/voip/_IncomingCallbox.scss
@@ -54,7 +54,7 @@ limitations under the License.
     vertical-align: middle;
     width: 80px;
     height: 36px;
-    line-height: 2.400rem;
+    line-height: $font-36px;
     border-radius: 36px;
     color: $accent-fg-color;
     margin: auto;
diff --git a/res/themes/dark-custom/css/dark-custom.scss b/res/themes/dark-custom/css/dark-custom.scss
index aff647ce26..03ceef45c6 100644
--- a/res/themes/dark-custom/css/dark-custom.scss
+++ b/res/themes/dark-custom/css/dark-custom.scss
@@ -1,3 +1,4 @@
+@import "../../../../res/css/_font-sizes.scss";
 @import "../../light/css/_paths.scss";
 @import "../../light/css/_fonts.scss";
 @import "../../light/css/_light.scss";
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 1f11fd5620..5d6ba033c8 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -185,7 +185,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
     border: 0px;
     border-radius: 4px;
     font-family: $font-family;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $button-fg-color;
     background-color: $button-bg-color;
     width: auto;
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index e7ae7c8cf8..d81db4595f 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -1,3 +1,4 @@
+@import "../../../../res/css/_font-sizes.scss";
 @import "../../light/css/_paths.scss";
 @import "../../light/css/_fonts.scss";
 @import "../../light/css/_light.scss";
diff --git a/res/themes/light-custom/css/light-custom.scss b/res/themes/light-custom/css/light-custom.scss
index 278ca5f0b1..4f80647eba 100644
--- a/res/themes/light-custom/css/light-custom.scss
+++ b/res/themes/light-custom/css/light-custom.scss
@@ -1,3 +1,4 @@
+@import "../../../../res/css/_font-sizes.scss";
 @import "../../light/css/_paths.scss";
 @import "../../light/css/_fonts.scss";
 @import "../../light/css/_light.scss";
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 2a993a7934..f5f3013354 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -310,7 +310,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
     border: 0px;
     border-radius: 4px;
     font-family: $font-family;
-    font-size: 0.933rem;
+    font-size: $font-14px;
     color: $button-fg-color;
     background-color: $button-bg-color;
     width: auto;
@@ -331,7 +331,7 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
 
 @define-mixin mx_DialogButton_small {
     @mixin mx_DialogButton;
-    font-size: 1rem;
+    font-size: $font-15px;
     padding: 0px 1.5em 0px 1.5em;
 }
 
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
index 6acb2d9d94..4f48557648 100644
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -1,3 +1,4 @@
+@import "../../../../res/css/_font-sizes.scss";
 @import "_paths.scss";
 @import "_fonts.scss";
 @import "_light.scss";

From e2685b1cf0c1300af3fe794eb76379f610f8adb3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 31 Mar 2020 15:29:40 +0100
Subject: [PATCH 1862/3235] Licensing info

---
 res/css/_font-sizes.scss | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index 6baf11e9d6..be6d43d3a8 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 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.
+*/
+
 $font-8px: 0.533rem;
 $font-9px: 0.600rem;
 $font-10px: 0.667rem;

From 4a9bc5e5bf46fe93e5f050aac9c10256c22bd7f7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 08:29:42 -0600
Subject: [PATCH 1863/3235] Update
 src/components/views/auth/InteractiveAuthEntryComponents.js

Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
---
 src/components/views/auth/InteractiveAuthEntryComponents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index a59b1354b6..14a8791cda 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -639,7 +639,7 @@ export class SSOAuthEntry extends React.Component {
 
     onStartAuthClick = () => {
         // Note: We don't use PlatformPeg's startSsoAuth functions because we almost
-        // certainly will need to open the thing in a new tab to avoid loosing application
+        // certainly will need to open the thing in a new tab to avoid losing application
         // context.
 
         window.open(this.state.ssoUrl, '_blank');

From dcd75a801ebfd7934677d4ab51d0d56aa5982419 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 31 Mar 2020 14:33:01 +0000
Subject: [PATCH 1864/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2244 of 2244 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 f3aed44b05..628c857d6e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2304,5 +2304,7 @@
     "Verified": "Verificato",
     "Verification cancelled": "Verifica annullata",
     "Compare emoji": "Confronta emoji",
-    "Cancel replying to a message": "Annulla la risposta a un messaggio"
+    "Cancel replying to a message": "Annulla la risposta a un messaggio",
+    "Sends a message as html, without interpreting it as markdown": "Invia un messaggio come html, senza interpretarlo come markdown",
+    "Sign in with SSO": "Accedi con SSO"
 }

From eb901441cdda2c77c5cc377892ddc348b9cb3dc5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 31 Mar 2020 16:14:18 +0100
Subject: [PATCH 1865/3235] Fix alignment of e2e icon in userinfo and expose
 full displayname in title

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss     | 23 +++++++++++---------
 src/components/views/right_panel/UserInfo.js |  6 +++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 0e4b1bda9e..d2753f5825 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -134,24 +134,27 @@ limitations under the License.
         text-align: center;
 
         h2 {
+            display: flex;
             font-size: 18px;
             line-height: 25px;
             flex: 1;
             justify-content: center;
-            align-items: center;
 
-            // limit to 2 lines, show an ellipsis if it overflows
-            // this looks webkit specific but is supported by Firefox 68+
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
+            span {
+                // limit to 2 lines, show an ellipsis if it overflows
+                // this looks webkit specific but is supported by Firefox 68+
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
 
-            overflow: hidden;
-            word-break: break-all;
-            text-overflow: ellipsis;
+                overflow: hidden;
+                word-break: break-all;
+                text-overflow: ellipsis;
+            }
 
             .mx_E2EIcon {
-                margin: 5px;
+                margin: 4px 4px 4px 0; // no left-margin to improve visual centering
+                min-width: 18px; // convince flexbox to not collapse it
             }
         }
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index a2081dc9e4..82e410b361 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1444,9 +1444,11 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
         <div className="mx_UserInfo_container mx_UserInfo_separator">
             <div className="mx_UserInfo_profile">
                 <div>
-                    <h2 aria-label={displayName}>
+                    <h2 title={displayName} aria-label={displayName}>
                         { e2eIcon }
-                        { displayName }
+                        <span>
+                            { displayName }
+                        </span>
                     </h2>
                 </div>
                 <div>{ member.userId }</div>

From 64c11c35650fe37a6cbf7edb115f11383a91ef89 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 09:26:17 -0600
Subject: [PATCH 1866/3235] Move ssoUrl to a class property

---
 .../auth/InteractiveAuthEntryComponents.js      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 14a8791cda..4e2f444844 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -619,16 +619,19 @@ export class SSOAuthEntry extends React.Component {
     static PHASE_PREAUTH = 1; // button to start SSO
     static PHASE_POSTAUTH = 2; // button to confirm SSO completed
 
+    _ssoUrl: string;
+
     constructor(props) {
         super(props);
 
+        // We actually send the user through fallback auth so we don't have to
+        // deal with a redirect back to us, losing application context.
+        this._ssoUrl = props.matrixClient.getFallbackAuthUrl(
+            this.props.loginType,
+            this.props.authSessionId,
+        );
+
         this.state = {
-            // We actually send the user through fallback auth so we don't have to
-            // deal with a redirect back to us, losing application context.
-            ssoUrl: props.matrixClient.getFallbackAuthUrl(
-                this.props.loginType,
-                this.props.authSessionId,
-            ),
             phase: SSOAuthEntry.PHASE_PREAUTH,
         };
     }
@@ -642,7 +645,7 @@ export class SSOAuthEntry extends React.Component {
         // certainly will need to open the thing in a new tab to avoid losing application
         // context.
 
-        window.open(this.state.ssoUrl, '_blank');
+        window.open(this._ssoUrl, '_blank');
         this.setState({phase: SSOAuthEntry.PHASE_POSTAUTH});
         this.props.onPhaseChange(SSOAuthEntry.PHASE_POSTAUTH);
     };

From a0e5169b59088f91419cf829baaf540949178708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A4rt=20P=C3=B5der?= <tramm@p6drad-teel.net>
Date: Tue, 31 Mar 2020 19:48:13 +0000
Subject: [PATCH 1867/3235] Added translation using Weblate (Estonian)

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

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

From c86d75693bbd34513b8b431961a15272bbfe9c12 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 14:05:56 -0600
Subject: [PATCH 1868/3235] Fix a number of minor code quality issues

Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
---
 .../views/dialogs/EncryptedEventDialog.js              |  2 +-
 .../views/dialogs/eventindex/ManageEventIndexDialog.js | 10 +++-------
 src/components/structures/GroupView.js                 |  1 -
 src/components/structures/auth/SoftLogout.js           |  2 +-
 src/components/views/dialogs/RoomSettingsDialog.js     |  2 +-
 src/components/views/elements/AppTile.js               |  2 +-
 src/components/views/elements/LanguageDropdown.js      |  4 ++--
 src/components/views/elements/Pill.js                  |  2 +-
 src/components/views/rooms/AppsDrawer.js               |  2 +-
 src/components/views/rooms/RoomRecoveryReminder.js     |  1 -
 test/components/views/rooms/RoomSettings-test.js       |  2 +-
 11 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index b602cf60fe..3e5c74335f 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -79,7 +79,7 @@ export default createReactClass({
     },
 
     onDeviceVerificationChanged: function(userId, device) {
-        if (userId == this.props.event.getSender()) {
+        if (userId === this.props.event.getSender()) {
             this.refreshDevice().then((dev) => {
                 this.setState({ device: dev });
             });
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 3d7249b5a1..4ac9bf52a3 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -30,7 +30,7 @@ import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 export default class ManageEventIndexDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
-    }
+    };
 
     constructor(props) {
         super(props);
@@ -126,16 +126,12 @@ export default class ManageEventIndexDialog extends React.Component {
             import("./DisableEventIndexDialog"),
             null, null, /* priority = */ false, /* static = */ true,
         );
-    }
-
-    _onDone = () => {
-        this.props.onFinished(true);
-    }
+    };
 
     _onCrawlerSleepTimeChange = (e) => {
         this.setState({crawlerSleepTime: e.target.value});
         SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
-    }
+    };
 
     render() {
         let crawlerState;
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 524694fe95..af205f7e1b 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -433,7 +433,6 @@ export default createReactClass({
         this._matrixClient = MatrixClientPeg.get();
         this._matrixClient.on("Group.myMembership", this._onGroupMyMembership);
 
-        this._changeAvatarComponent = null;
         this._initGroupStore(this.props.groupId, true);
 
         this._dispatcherRef = dis.register(this._onAction);
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 287f7e5605..08ab7e8a61 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -54,7 +54,7 @@ export default class SoftLogout extends React.Component {
 
         this.state = {
             loginView: LOGIN_VIEW.LOADING,
-            keyBackupNeeded: true, // assume we do while we figure it out (see componentWillMount)
+            keyBackupNeeded: true, // assume we do while we figure it out (see componentDidMount)
 
             busy: false,
             password: "",
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 76faf60eef..5d369862b8 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -41,7 +41,7 @@ export default class RoomSettingsDialog extends React.Component {
     }
 
     componentWillUnmount() {
-        dis.unregister(this._dispatcherRef);
+        if (this._dispatcherRef) dis.unregister(this._dispatcherRef);
     }
 
     _onAction = (payload) => {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0a8bf7443b..d74d8fa485 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -161,7 +161,7 @@ export default class AppTile extends React.Component {
 
     componentWillUnmount() {
         // Widget action listeners
-        dis.unregister(this.dispatcherRef);
+        if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
 
         // if it's not remaining on screen, get rid of the PersistedElement container
         if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index cb4e2e4da6..d2546644a0 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -24,8 +24,8 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 
 function languageMatchesSearchQuery(query, language) {
-    if (language.label.toUpperCase().indexOf(query.toUpperCase()) == 0) return true;
-    if (language.value.toUpperCase() == query.toUpperCase()) return true;
+    if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
+    if (language.value.toUpperCase() === query.toUpperCase()) return true;
     return false;
 }
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 5f143a06a6..627c51967a 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -158,7 +158,7 @@ const Pill = createReactClass({
     componentWillMount() {
         this._unmounted = false;
         this._matrixClient = MatrixClientPeg.get();
-        this.componentWillReceiveProps(this.props);
+        this.componentWillReceiveProps(this.props); // HACK: We shouldn't be calling lifecycle functions ourselves.
     },
 
     componentWillUnmount() {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f81a5630a4..56c7476060 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -71,7 +71,7 @@ export default createReactClass({
             MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
         WidgetEchoStore.removeListener('update', this._updateApps);
-        dis.unregister(this.dispatcherRef);
+        if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
     },
 
     componentWillReceiveProps(newProps) {
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 50521cdd37..4fe1e0bc54 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -61,7 +61,6 @@ export default class RoomRecoveryReminder extends React.PureComponent {
                 loading: false,
                 error: e,
             });
-            return;
         }
     }
 
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 870d7f0aab..5e21f729d0 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -134,7 +134,7 @@ describe.skip('RoomSettings', () => {
         });
     });
 
-    // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
+    // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentDidMount`
     xit('should set room directory publicity when set to true', (done) => {
         const isRoomPublished = true;
         roomSettings.setState({

From 3f99332f4b985fbd23a437e2ac06e23d8d96d5d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 14:14:17 -0600
Subject: [PATCH 1869/3235] Use componentDidMount in place of
 componentWillMount where possible

This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
---
 src/AsyncWrapper.js                                       | 2 +-
 .../views/dialogs/EncryptedEventDialog.js                 | 2 +-
 .../views/dialogs/eventindex/ManageEventIndexDialog.js    | 2 +-
 src/components/structures/CustomRoomTagPanel.js           | 2 +-
 src/components/structures/EmbeddedPage.js                 | 2 +-
 src/components/structures/GroupView.js                    | 2 +-
 src/components/structures/LeftPanel.js                    | 2 +-
 src/components/structures/MatrixChat.js                   | 4 +---
 src/components/structures/MyGroups.js                     | 2 +-
 src/components/structures/RightPanel.js                   | 2 +-
 src/components/structures/RoomDirectory.js                | 4 +---
 src/components/structures/RoomStatusBar.js                | 2 +-
 src/components/structures/TagPanel.js                     | 2 +-
 src/components/structures/UserView.js                     | 2 +-
 src/components/structures/auth/ForgotPassword.js          | 2 +-
 src/components/structures/auth/Login.js                   | 2 +-
 src/components/structures/auth/PostRegistration.js        | 2 +-
 src/components/structures/auth/Registration.js            | 2 +-
 src/components/views/auth/CountryDropdown.js              | 2 +-
 .../views/auth/InteractiveAuthEntryComponents.js          | 2 +-
 src/components/views/avatars/MemberStatusMessageAvatar.js | 2 +-
 src/components/views/context_menus/MessageContextMenu.js  | 2 +-
 src/components/views/context_menus/RoomTileContextMenu.js | 2 +-
 .../views/context_menus/StatusMessageContextMenu.js       | 2 +-
 src/components/views/dialogs/ConfirmUserActionDialog.js   | 2 +-
 src/components/views/dialogs/RoomSettingsDialog.js        | 2 +-
 src/components/views/dialogs/RoomUpgradeDialog.js         | 2 +-
 src/components/views/dialogs/SetPasswordDialog.js         | 4 ++--
 src/components/views/dialogs/ShareDialog.js               | 2 +-
 src/components/views/dialogs/UnknownDeviceDialog.js       | 2 +-
 src/components/views/elements/AppTile.js                  | 4 +---
 src/components/views/elements/DeviceVerifyButtons.js      | 2 +-
 src/components/views/elements/EditableTextContainer.js    | 2 +-
 src/components/views/elements/LanguageDropdown.js         | 2 +-
 src/components/views/elements/PersistentApp.js            | 2 +-
 src/components/views/elements/Pill.js                     | 2 +-
 src/components/views/elements/PowerSelector.js            | 2 +-
 src/components/views/elements/ReplyThread.js              | 2 +-
 src/components/views/elements/TintableSvg.js              | 6 ++----
 src/components/views/groups/GroupMemberInfo.js            | 2 +-
 src/components/views/groups/GroupMemberList.js            | 2 +-
 src/components/views/groups/GroupPublicityToggle.js       | 2 +-
 src/components/views/groups/GroupRoomInfo.js              | 2 +-
 src/components/views/groups/GroupRoomList.js              | 2 +-
 src/components/views/groups/GroupTile.js                  | 2 +-
 src/components/views/groups/GroupUserSettings.js          | 2 +-
 src/components/views/messages/MImageBody.js               | 8 +++-----
 src/components/views/messages/SenderProfile.js            | 2 +-
 src/components/views/right_panel/HeaderButtons.js         | 2 +-
 src/components/views/rooms/AppsDrawer.js                  | 5 +----
 src/components/views/rooms/EditMessageComposer.js         | 2 +-
 src/components/views/rooms/ForwardMessage.js              | 4 +---
 src/components/views/rooms/MemberInfo.js                  | 4 +---
 src/components/views/rooms/MemberList.js                  | 2 +-
 src/components/views/rooms/RoomBreadcrumbs.js             | 2 +-
 src/components/views/rooms/RoomNameEditor.js              | 2 +-
 src/components/views/rooms/RoomPreviewBar.js              | 2 +-
 src/components/views/rooms/RoomRecoveryReminder.js        | 2 +-
 src/components/views/rooms/RoomTopicEditor.js             | 2 +-
 src/components/views/rooms/RoomUpgradeWarningBar.js       | 2 +-
 src/components/views/rooms/ThirdPartyMemberInfo.js        | 2 +-
 src/components/views/rooms/WhoIsTypingTile.js             | 2 +-
 src/components/views/settings/ChangeAvatar.js             | 2 +-
 src/components/views/settings/ChangePassword.js           | 2 +-
 src/components/views/settings/EventIndexPanel.js          | 2 +-
 src/components/views/settings/KeyBackupPanel.js           | 2 +-
 src/components/views/settings/Notifications.js            | 2 +-
 .../views/settings/tabs/user/HelpUserSettingsTab.js       | 2 +-
 .../settings/tabs/user/PreferencesUserSettingsTab.js      | 2 +-
 src/components/views/voip/CallPreview.js                  | 2 +-
 70 files changed, 74 insertions(+), 91 deletions(-)

diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.js
index b7b81688e1..05054cf63a 100644
--- a/src/AsyncWrapper.js
+++ b/src/AsyncWrapper.js
@@ -38,7 +38,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         // XXX: temporary logging to try to diagnose
         // https://github.com/vector-im/riot-web/issues/3148
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index b602cf60fe..1aed623010 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -37,7 +37,7 @@ export default createReactClass({
         return { device: null };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         const client = MatrixClientPeg.get();
 
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 3d7249b5a1..ef4f2672d4 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -82,7 +82,7 @@ export default class ManageEventIndexDialog extends React.Component {
         }
     }
 
-    async componentWillMount(): void {
+    async componentDidMount(): void {
         let eventIndexSize = 0;
         let crawlingRoomsCount = 0;
         let roomCount = 0;
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index e8ff6e814e..6e392ea505 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -30,7 +30,7 @@ class CustomRoomTagPanel extends React.Component {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._tagStoreToken = CustomRoomTagStore.addListener(() => {
             this.setState({tags: CustomRoomTagStore.getSortedTags()});
         });
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index a0a95ac6f1..0aababf030 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -58,7 +58,7 @@ export default class EmbeddedPage extends React.PureComponent {
         return sanitizeHtml(_t(s));
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._unmounted = false;
 
         if (!this.props.url) {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 524694fe95..843f1401c4 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -428,7 +428,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this._matrixClient = MatrixClientPeg.get();
         this._matrixClient.on("Group.myMembership", this._onGroupMyMembership);
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index f5e0bca67e..bbeaeb10e0 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -44,7 +44,7 @@ const LeftPanel = createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this.focusedElement = null;
 
         this._breadcrumbsWatcherRef = SettingsStore.watchSetting(
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 258972d18d..b0d08b7673 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -221,7 +221,7 @@ export default createReactClass({
         return {serverConfig: props};
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         SdkConfig.put(this.props.config);
 
         // Used by _viewRoom before getting state from sync
@@ -261,9 +261,7 @@ export default createReactClass({
 
         this._accountPassword = null;
         this._accountPasswordTimer = null;
-    },
 
-    componentDidMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
         this._themeWatcher = new ThemeWatcher();
         this._themeWatcher.start();
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index f1209b7b9e..f179cab6ad 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -38,7 +38,7 @@ export default createReactClass({
         contextType: MatrixClientContext,
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._fetch();
     },
 
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 8d25116827..5e556419cc 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -108,7 +108,7 @@ export default class RightPanel extends React.Component {
         }
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         const cli = this.context;
         cli.on("RoomState.members", this.onRoomStateMember);
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 664aaaf21f..eabf097950 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -56,7 +56,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this.nextBatch = null;
         this.filterTimeout = null;
@@ -89,9 +89,7 @@ export default createReactClass({
                 ),
             });
         });
-    },
 
-    componentDidMount: function() {
         this.refreshRoomList();
     },
 
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 13b73ec02b..639f38a119 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -96,7 +96,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         MatrixClientPeg.get().on("sync", this.onSyncStateChange);
         MatrixClientPeg.get().on("Room.localEchoUpdated", this._onRoomLocalEchoUpdated);
 
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index f1a39d6fcf..6642cce098 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -44,7 +44,7 @@ const TagPanel = createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this.unmounted = false;
         this.context.on("Group.myMembership", this._onGroupMyMembership);
         this.context.on("sync", this._onClientSync);
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index 94159a1da4..c4fba137cc 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -35,7 +35,7 @@ export default class UserView extends React.Component {
         this.state = {};
     }
 
-    componentWillMount() {
+    componentDidMount() {
         if (this.props.userId) {
             this._loadProfileInfo();
         }
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index c849edf260..dc3f4a0a2b 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -69,7 +69,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this.reset = null;
         this._checkServerLiveliness(this.props.serverConfig);
     },
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index bfabc34a62..817472552a 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -113,7 +113,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
 
         // map from login step type to a function which will render a control
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
index 8eef8dce11..687ab9a195 100644
--- a/src/components/structures/auth/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -37,7 +37,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         // There is some assymetry between ChangeDisplayName and ChangeAvatar,
         // as ChangeDisplayName will auto-get the name but ChangeAvatar expects
         // the URL to be passed to you (because it's also used for room avatars).
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 7c6a3ea56f..45d775059c 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -120,7 +120,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this._replaceClient();
     },
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index 63dc9d1ada..14a974668b 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -60,7 +60,7 @@ export default class CountryDropdown extends React.Component {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         if (!this.props.value) {
             // If no value is given, we start with the default
             // country selected, but our parent component
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index e731b4cc01..04f7dc109b 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -429,7 +429,7 @@ export const MsisdnAuthEntry = createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._submitUrl = null;
         this._sid = null;
         this._msisdn = null;
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index 54f11e8e91..eef3f86d9a 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -49,7 +49,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
         this._button = createRef();
     }
 
-    componentWillMount() {
+    componentDidMount() {
         if (this.props.member.userId !== MatrixClientPeg.get().getUserId()) {
             throw new Error("Cannot use MemberStatusMessageAvatar on anyone but the logged in user");
         }
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 4fc6dd58cc..452489aa65 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -61,7 +61,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkPermissions);
         this._checkPermissions();
     },
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index 2d8dec29c7..d281656bbe 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -82,7 +82,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
     },
 
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index d5cba45956..5e6f06dd5d 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -35,7 +35,7 @@ export default class StatusMessageContextMenu extends React.Component {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         const { user } = this.props;
         if (!user) {
             return;
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 14910fbf6d..d7b86d43d5 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -55,7 +55,7 @@ export default createReactClass({
         askReason: false,
     }),
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._reasonField = null;
     },
 
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 76faf60eef..96523d1e94 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -36,7 +36,7 @@ export default class RoomSettingsDialog extends React.Component {
         onFinished: PropTypes.func.isRequired,
     };
 
-    componentWillMount() {
+    componentDidMount() {
         this._dispatcherRef = dis.register(this._onAction);
     }
 
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.js
index dc734718d5..c45d82303b 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeDialog.js
@@ -30,7 +30,7 @@ export default createReactClass({
         onFinished: PropTypes.func.isRequired,
     },
 
-    componentWillMount: async function() {
+    componentDidMount: async function() {
         const recommended = await this.props.room.getRecommendedVersion();
         this._targetVersion = recommended.version;
         this.setState({busy: false});
diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index c48690bb48..fcc6e67656 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -75,8 +75,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
-        console.info('SetPasswordDialog component will mount');
+    componentDidMount: function() {
+        console.info('SetPasswordDialog component did mount');
     },
 
     _onPasswordChanged: function(res) {
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index b42a88ceac..cf4735f608 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -121,7 +121,7 @@ export default class ShareDialog extends React.Component {
         });
     }
 
-    componentWillMount() {
+    componentDidMount() {
         if (this.props.target instanceof Room) {
             const permalinkCreator = new RoomPermalinkCreator(this.props.target);
             permalinkCreator.load();
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 69ebb72a6f..4cad13b047 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -87,7 +87,7 @@ export default createReactClass({
         onSend: PropTypes.func.isRequired,
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         MatrixClientPeg.get().on("deviceVerificationChanged", this._onDeviceVerificationChanged);
     },
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0a8bf7443b..539eba489c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -147,14 +147,12 @@ export default class AppTile extends React.Component {
         return false;
     }
 
-    componentWillMount() {
+    componentDidMount() {
         // Only fetch IM token on mount if we're showing and have permission to load
         if (this.props.show && this.state.hasPermissionToLoad) {
             this.setScalarToken();
         }
-    }
 
-    componentDidMount() {
         // Widget action listeners
         this.dispatcherRef = dis.register(this._onAction);
     }
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index b4d78bb9bc..7328d50328 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -38,7 +38,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         const cli = MatrixClientPeg.get();
         cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
     },
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 57e1b3d2cd..bbc5560557 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -42,7 +42,7 @@ export default class EditableTextContainer extends React.Component {
         this._onValueChanged = this._onValueChanged.bind(this);
     }
 
-    componentWillMount() {
+    componentDidMount() {
         if (this.props.getInitialValue === undefined) {
             // use whatever was given in the initialValue property.
             return;
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index cb4e2e4da6..465176778c 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -40,7 +40,7 @@ export default class LanguageDropdown extends React.Component {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         languageHandler.getAllLanguagesFromJson().then((langs) => {
             langs.sort(function(a, b) {
                 if (a.label < b.label) return -1;
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index a807ed3b93..ee7bc46e74 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -33,7 +33,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         ActiveWidgetStore.on('update', this._onActiveWidgetStoreUpdate);
     },
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 5f143a06a6..8eda4b30b5 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -155,7 +155,7 @@ const Pill = createReactClass({
         this.setState({resourceId, pillType, member, group, room});
     },
 
-    componentWillMount() {
+    componentDidMount() {
         this._unmounted = false;
         this._matrixClient = MatrixClientPeg.get();
         this.componentWillReceiveProps(this.props);
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index eff14979a9..8d17c2be57 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -62,7 +62,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._initStateFromProps(this.props);
     },
 
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 0e1f230e57..eae2d13f8a 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -184,7 +184,7 @@ export default class ReplyThread extends React.Component {
             ref={ref} permalinkCreator={permalinkCreator} />;
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this.unmounted = false;
         this.room = this.context.getRoom(this.props.parentEv.getRoomId());
         this.room.on("Room.redaction", this.onRoomRedaction);
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
index 3e0e41f411..66625c7b87 100644
--- a/src/components/views/elements/TintableSvg.js
+++ b/src/components/views/elements/TintableSvg.js
@@ -36,11 +36,9 @@ const TintableSvg = createReactClass({
         idSequence: 0,
     },
 
-    componentWillMount: function() {
-        this.fixups = [];
-    },
-
     componentDidMount: function() {
+        this.fixups = [];
+
         this.id = TintableSvg.idSequence++;
         TintableSvg.mounts[this.id] = this;
     },
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index f70c769ad7..95517ef548 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -49,7 +49,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this._initGroupStore(this.props.groupId);
     },
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 2853e70afa..ca374d1309 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -47,7 +47,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this._initGroupStore(this.props.groupId);
     },
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index 602f9036d8..81f0f469ef 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -36,7 +36,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._initGroupStore(this.props.groupId);
     },
 
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 91d84be4d1..789396e719 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -47,7 +47,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._initGroupStore(this.props.groupId);
     },
 
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index dee304e1f6..5c3e1587db 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -39,7 +39,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._unmounted = false;
         this._initGroupStore(this.props.groupId);
     },
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 12e2427e69..b845a83c2a 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -55,7 +55,7 @@ const GroupTile = createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         FlairStore.getGroupProfileCached(this.context, this.props.groupId).then((profile) => {
             this.setState({profile});
         }).catch((err) => {
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index a65d23bed7..8f57eccd05 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -34,7 +34,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this.context.getJoinedGroups().then((result) => {
             this.setState({groups: result.groups || [], error: null});
         }, (err) => {
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 64f2611caf..ad238a728e 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -67,11 +67,6 @@ export default class MImageBody extends React.Component {
         this._image = createRef();
     }
 
-    componentWillMount() {
-        this.unmounted = false;
-        this.context.on('sync', this.onClientSync);
-    }
-
     // FIXME: factor this out and aplpy it to MVideoBody and MAudioBody too!
     onClientSync(syncState, prevState) {
         if (this.unmounted) return;
@@ -258,6 +253,9 @@ export default class MImageBody extends React.Component {
     }
 
     componentDidMount() {
+        this.unmounted = false;
+        this.context.on('sync', this.onClientSync);
+
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index f7da1029e1..bed93b68c3 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -42,7 +42,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount() {
+    componentDidMount() {
         this.unmounted = false;
         this._updateRelatedGroups();
 
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index dbcae4529a..03b03218ee 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -40,7 +40,7 @@ export default class HeaderButtons extends React.Component {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._storeToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelUpdate.bind(this));
         this._dispatcherRef = dis.register(this.onAction.bind(this)); // used by subclasses
     }
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f81a5630a4..508b149322 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -55,13 +55,10 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         ScalarMessaging.startListening();
         MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
         WidgetEchoStore.on('update', this._updateApps);
-    },
-
-    componentDidMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
     },
 
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 1d01f68551..d6ea0ec5f0 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -223,7 +223,7 @@ export default class EditMessageComposer extends React.Component {
         this.props.editState.setEditorState(caret, parts);
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._createEditorModel();
     }
 
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 78466f7cb5..a3c00598a7 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -30,14 +30,12 @@ export default createReactClass({
         onCancelClick: PropTypes.func.isRequired,
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         dis.dispatch({
             action: 'panel_disable',
             middleDisabled: true,
         });
-    },
 
-    componentDidMount: function() {
         document.addEventListener('keydown', this._onKeyDown);
     },
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 7c187bd17a..f83e183b85 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -79,7 +79,7 @@ export default createReactClass({
         contextType: MatrixClientContext,
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._cancelDeviceList = null;
         const cli = this.context;
 
@@ -98,9 +98,7 @@ export default createReactClass({
         cli.on("accountData", this.onAccountData);
 
         this._checkIgnoreState();
-    },
 
-    componentDidMount: function() {
         this._updateStateForNewMember(this.props.member);
     },
 
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index edd2f52496..dfa7e856b4 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -49,7 +49,7 @@ export default createReactClass({
         }
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._mounted = true;
         const cli = MatrixClientPeg.get();
         if (cli.hasLazyLoadMembersEnabled()) {
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index f9408d3259..ad8a5cfef9 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -49,7 +49,7 @@ export default class RoomBreadcrumbs extends React.Component {
         this._scroller = createRef();
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._dispatcherRef = dis.register(this.onAction);
 
         const storedRooms = SettingsStore.getValue("breadcrumb_rooms");
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index b65d89ee6f..ab355b1f9e 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -34,7 +34,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         const room = this.props.room;
         const name = room.currentState.getStateEvents('m.room.name', '');
         const myId = MatrixClientPeg.get().credentials.userId;
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 4ff5dd5198..85c41f30ec 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -97,7 +97,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._checkInvitedEmail();
     },
 
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index 50521cdd37..3678193af2 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -44,7 +44,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._loadBackupStatus();
     }
 
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index 5decce02a9..0adc0ff1d6 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -33,7 +33,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         const room = this.props.room;
         const topic = room.currentState.getStateEvents('m.room.topic', '');
         this.setState({
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index 1240900e28..7d5bc89034 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -31,7 +31,7 @@ export default createReactClass({
         recommendation: PropTypes.object.isRequired,
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
         this.setState({upgraded: tombstone && tombstone.getContent().replacement_room});
 
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index f8d9069ca6..3e6ed16aa4 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -51,7 +51,7 @@ export default class ThirdPartyMemberInfo extends React.Component {
         };
     }
 
-    componentWillMount(): void {
+    componentDidMount(): void {
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
     }
 
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index 9683d00e51..b56a75582f 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -54,7 +54,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         MatrixClientPeg.get().on("RoomMember.typing", this.onRoomMemberTyping);
         MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
     },
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 5b6b6ae3de..76644d38bc 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -55,7 +55,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
     },
 
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 6607458b40..7c88573e9c 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -78,7 +78,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._sessionStore = sessionStore;
         this._sessionStoreToken = this._sessionStore.addListener(
             this._setStateFromSessionStore,
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 203a7ee46e..c9c6a5ec4f 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -63,7 +63,7 @@ export default class EventIndexPanel extends React.Component {
         }
     }
 
-    async componentWillMount(): void {
+    async componentDidMount(): void {
         this.updateState();
     }
 
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 27fdb2cb56..9d60ed1188 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -38,7 +38,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         };
     }
 
-    componentWillMount() {
+    componentDidMount() {
         this._checkKeyBackupStatus();
 
         MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatus);
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 1f4bde6eab..a3173f18bb 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -87,7 +87,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._refreshFromServer();
     },
 
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 9a2db8113e..146d841d58 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -40,7 +40,7 @@ export default class HelpUserSettingsTab extends React.Component {
         };
     }
 
-    componentWillMount(): void {
+    componentDidMount(): void {
         PlatformPeg.get().getAppVersion().then((ver) => this.setState({vectorVersion: ver})).catch((e) => {
             console.error("Error getting vector version: ", e);
         });
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index bdcb25dd51..bdb2a9ffc4 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -81,7 +81,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         };
     }
 
-    async componentWillMount(): void {
+    async componentDidMount(): void {
         const platform = PlatformPeg.get();
 
         const autoLaunchSupported = await platform.supportsAutoLaunch();
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 57bf35a719..049dd8a3c6 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -40,7 +40,7 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    componentDidMount: function() {
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this.dispatcherRef = dis.register(this._onAction);
     },

From 0a6f54da335b80ec4fb18812b5c93b6ac2380485 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 14:12:52 -0600
Subject: [PATCH 1870/3235] Label and use UNSAFE_componentWillMount to minimize
 warnings

These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
---
 src/async-components/views/dialogs/ExportE2eKeysDialog.js    | 3 ++-
 src/async-components/views/dialogs/ImportE2eKeysDialog.js    | 3 ++-
 src/components/structures/InteractiveAuth.js                 | 3 ++-
 src/components/structures/LoggedInView.js                    | 3 ++-
 src/components/structures/RoomView.js                        | 3 ++-
 src/components/structures/ScrollPanel.js                     | 5 ++---
 src/components/structures/SearchBox.js                       | 1 +
 src/components/structures/TimelinePanel.js                   | 3 ++-
 src/components/views/auth/CaptchaForm.js                     | 3 ++-
 src/components/views/auth/InteractiveAuthEntryComponents.js  | 4 +++-
 src/components/views/dialogs/AddressPickerDialog.js          | 1 +
 src/components/views/dialogs/BaseDialog.js                   | 3 ++-
 src/components/views/dialogs/SetMxIdDialog.js                | 1 +
 src/components/views/dialogs/TextInputDialog.js              | 1 +
 src/components/views/elements/Dropdown.js                    | 3 ++-
 src/components/views/elements/EditableText.js                | 3 ++-
 src/components/views/elements/PowerSelector.js               | 1 +
 src/components/views/elements/UserSelector.js                | 1 +
 src/components/views/messages/MFileBody.js                   | 1 +
 src/components/views/messages/MessageEvent.js                | 1 +
 src/components/views/messages/TextualBody.js                 | 1 +
 src/components/views/rooms/EventTile.js                      | 3 ++-
 src/components/views/rooms/LinkPreviewWidget.js              | 3 ++-
 src/components/views/rooms/ReadReceiptMarker.js              | 1 +
 src/components/views/rooms/RoomDetailRow.js                  | 1 +
 src/components/views/rooms/RoomHeader.js                     | 1 +
 src/components/views/rooms/RoomList.js                       | 3 ++-
 src/components/views/rooms/RoomTile.js                       | 1 +
 src/components/views/rooms/SearchBar.js                      | 1 +
 src/components/views/rooms/SendMessageComposer.js            | 3 ++-
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js      | 3 ++-
 .../views/settings/tabs/room/NotificationSettingsTab.js      | 3 ++-
 .../views/settings/tabs/room/SecurityRoomSettingsTab.js      | 3 ++-
 .../views/settings/tabs/user/GeneralUserSettingsTab.js       | 3 ++-
 src/components/views/voip/CallView.js                        | 1 +
 src/components/views/voip/VideoFeed.js                       | 1 +
 src/components/views/voip/VideoView.js                       | 1 +
 37 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index 481075d0fa..7ec9da39de 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -42,7 +42,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this._unmounted = false;
 
         this._passphrase1 = createRef();
diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index 591c84f5d3..6b9d2c7e45 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -54,7 +54,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this._unmounted = false;
 
         this._file = createRef();
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index f4adb5751f..b2441f1bf8 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -87,7 +87,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this._unmounted = false;
         this._authLogic = new InteractiveAuth({
             authData: this.props.authData,
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index e7a6f4c1a9..02ca8df0a7 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -94,7 +94,8 @@ const LoggedInView = createReactClass({
         this._loadResizerPreferences();
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         // stash the MatrixClient in case we log out before we are unmounted
         this._matrixClient = this.props.matrixClient;
 
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 2c9e798bd8..4a3666fc38 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -168,7 +168,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
         this.context.on("Room", this.onRoom);
         this.context.on("Room.timeline", this.onRoomTimeline);
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index c218fee5d6..4f44c1a169 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -156,9 +156,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
-        this._fillRequestWhileRunning = false;
-        this._isFilling = false;
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this._pendingFillRequests = {b: null, f: null};
 
         if (this.props.resizeNotifier) {
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index e169e09752..0f3f8a6be9 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -53,6 +53,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._search = createRef();
     },
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 25526c3139..1bea707fd3 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -202,7 +202,8 @@ const TimelinePanel = createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         debuglog("TimelinePanel: mounting");
 
         this.lastRRSentEventId = undefined;
diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index 1b9dd3a97d..e162603b01 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -46,7 +46,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this._captchaWidgetId = null;
 
         this._recaptchaContainer = createRef();
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index e731b4cc01..794f270cf3 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -238,6 +238,7 @@ export const TermsAuthEntry = createReactClass({
         showContinue: PropTypes.bool,
     },
 
+    // TODO: [REACT-WARNING] Move this to constructor
     componentWillMount: function() {
         // example stageParams:
         //
@@ -575,7 +576,8 @@ export const FallbackAuthEntry = createReactClass({
         errorText: PropTypes.string,
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         // we have to make the user click a button, as browsers will block
         // the popup if we open it immediately.
         this._popupWindow = null;
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index e309c3a0cf..451ec9cfde 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -107,6 +107,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._textinput = createRef();
     },
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 9238024b60..67d70aabe4 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -86,7 +86,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount() {
         this._matrixClient = MatrixClientPeg.get();
     },
 
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 611ea64e49..f99d065e7e 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -62,6 +62,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._input_value = createRef();
         this._uiAuth = createRef();
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index b6b29f4350..d7ca3f144d 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -55,6 +55,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._field = createRef();
     },
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 03ab8c5c68..6c73592dbb 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -116,7 +116,8 @@ export default class Dropdown extends React.Component {
         };
     }
 
-    componentWillMount() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount() {
         this._button = createRef();
         // Listen for all clicks on the document so we can close the
         // menu when the user clicks somewhere else
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index fbac63cbba..af05600e3c 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -71,7 +71,8 @@ export default createReactClass({
         }
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         // we track value as an JS object field rather than in React state
         // as React doesn't play nice with contentEditable.
         this.value = '';
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index eff14979a9..5d89207024 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -63,6 +63,7 @@ export default createReactClass({
     },
 
     componentWillMount: function() {
+        // TODO: [REACT-WARNING] Move this to class constructor
         this._initStateFromProps(this.props);
     },
 
diff --git a/src/components/views/elements/UserSelector.js b/src/components/views/elements/UserSelector.js
index 706c6ed2e5..ffb577e090 100644
--- a/src/components/views/elements/UserSelector.js
+++ b/src/components/views/elements/UserSelector.js
@@ -35,6 +35,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._user_id_input = createRef();
     },
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 125c538f82..2f2521f02d 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -170,6 +170,7 @@ export default createReactClass({
         return MatrixClientPeg.get().mxcUrlToHttp(content.url);
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._iframe = createRef();
         this._dummyLink = createRef();
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 604cd19c93..beba986104 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -47,6 +47,7 @@ export default createReactClass({
         maxImageHeight: PropTypes.number,
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._body = createRef();
     },
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index ac0fc65ff4..c1de376385 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -86,6 +86,7 @@ export default createReactClass({
         return successful;
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._content = createRef();
     },
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 26c8a54f4e..a381a02d80 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -233,7 +233,8 @@ export default createReactClass({
         contextType: MatrixClientContext,
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         // don't do RR animations until we are mounted
         this._suppressReadReceiptAnimation = true;
         this._verifyEvent(this.props.mxEvent);
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 4169a763b7..1fe70dc61c 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -43,7 +43,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount: function() {
         this.unmounted = false;
         MatrixClientPeg.get().getUrlPreview(this.props.link, this.props.mxEvent.getTs()).then((res)=>{
             if (this.unmounted) {
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 7704291631..dcb8fd4310 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -87,6 +87,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._avatar = createRef();
     },
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 2210406c18..a88fae9e42 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -54,6 +54,7 @@ export default createReactClass({
         }
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._topic = createRef();
     },
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 61abfe86cf..71f774248f 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -58,6 +58,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._topic = createRef();
     },
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 87299281ff..6d89f17e87 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -118,7 +118,8 @@ export default createReactClass({
         };
     },
 
-    componentWillMount: function() {
+    // TODO: [REACT-WARNING] Replace component with real class, put this in the constructor.
+    UNSAFE_componentWillMount: function() {
         this.mounted = false;
 
         const cli = MatrixClientPeg.get();
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0c913b32da..f0ed34ce8b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -224,6 +224,7 @@ export default createReactClass({
         });
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._roomTile = createRef();
     },
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index 1f9ec87163..1d2e7ed602 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -30,6 +30,7 @@ export default createReactClass({
         });
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._search_term = createRef();
     },
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index d87d99dc46..a1caf6ee94 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -331,7 +331,8 @@ export default class SendMessageComposer extends React.Component {
         this._editorRef.getEditableRootNode().removeEventListener("paste", this._onPaste, true);
     }
 
-    componentWillMount() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount() {
         const partCreator = new CommandPartCreator(this.props.room, this.context);
         const parts = this._restoreStoredEditorState(partCreator) || [];
         this.model = new EditorModel(parts, partCreator);
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 6be868dc40..bbc0aa7fae 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -38,7 +38,8 @@ export default class AdvancedRoomSettingsTab extends React.Component {
         };
     }
 
-    componentWillMount() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount() {
         // we handle lack of this object gracefully later, so don't worry about it failing here.
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
         room.getRecommendedVersion().then((v) => {
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 9db27651c0..478f6c2118 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -37,7 +37,8 @@ export default class NotificationsSettingsTab extends React.Component {
         };
     }
 
-    componentWillMount() {
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
+    UNSAFE_componentWillMount() {
         Notifier.getSoundForRoom(this.props.roomId).then((soundData) => {
             if (!soundData) {
                 return;
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 3ee92c31c8..0e77a4d81f 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -41,7 +41,8 @@ export default class SecurityRoomSettingsTab extends React.Component {
         };
     }
 
-    async componentWillMount(): void {
+    // TODO: [REACT-WARNING] Move this to constructor
+    async UNSAFE_componentWillMount(): void {
         MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
 
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index f67c56f3d6..1ab43dcd7a 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -68,7 +68,8 @@ export default class GeneralUserSettingsTab extends React.Component {
         this.dispatcherRef = dis.register(this._onAction);
     }
 
-    async componentWillMount() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    async UNSAFE_componentWillMount() {
         const cli = MatrixClientPeg.get();
 
         const serverSupportsSeparateAddAndBind = await cli.doesServerSupportSeparateAddAndBind();
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 70d7963bcb..4a5f3923e2 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -57,6 +57,7 @@ export default createReactClass({
         };
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._video = createRef();
     },
diff --git a/src/components/views/voip/VideoFeed.js b/src/components/views/voip/VideoFeed.js
index 4210c60177..527b071942 100644
--- a/src/components/views/voip/VideoFeed.js
+++ b/src/components/views/voip/VideoFeed.js
@@ -31,6 +31,7 @@ export default createReactClass({
         onResize: PropTypes.func,
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount() {
         this._vid = createRef();
     },
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index eabf29813a..51be6db81d 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -50,6 +50,7 @@ export default createReactClass({
         onResize: PropTypes.func,
     },
 
+    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._local = createRef();
         this._remote = createRef();

From 6d0d77f98e6132ff895a291cba313fec0fa73c34 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 31 Mar 2020 14:21:12 -0600
Subject: [PATCH 1871/3235] Disable the linter on lines it complaints about
 UNSAFE_componentWillMount

---
 src/components/views/elements/Dropdown.js                       | 2 +-
 src/components/views/rooms/SendMessageComposer.js               | 2 +-
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js         | 2 +-
 .../views/settings/tabs/room/NotificationSettingsTab.js         | 2 +-
 .../views/settings/tabs/room/SecurityRoomSettingsTab.js         | 2 +-
 .../views/settings/tabs/user/GeneralUserSettingsTab.js          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 6c73592dbb..ed5928eb08 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -117,7 +117,7 @@ export default class Dropdown extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount() {
+    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         this._button = createRef();
         // Listen for all clicks on the document so we can close the
         // menu when the user clicks somewhere else
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index a1caf6ee94..233bb110be 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -332,7 +332,7 @@ export default class SendMessageComposer extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() {
+    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         const partCreator = new CommandPartCreator(this.props.room, this.context);
         const parts = this._restoreStoredEditorState(partCreator) || [];
         this.model = new EditorModel(parts, partCreator);
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index bbc0aa7fae..9ee9c8d130 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -39,7 +39,7 @@ export default class AdvancedRoomSettingsTab extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() {
+    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         // we handle lack of this object gracefully later, so don't worry about it failing here.
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
         room.getRecommendedVersion().then((v) => {
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 478f6c2118..96e6b3d354 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -38,7 +38,7 @@ export default class NotificationsSettingsTab extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount() {
+    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         Notifier.getSoundForRoom(this.props.roomId).then((soundData) => {
             if (!soundData) {
                 return;
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 0e77a4d81f..eb2b885a22 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -42,7 +42,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    async UNSAFE_componentWillMount(): void {
+    async UNSAFE_componentWillMount(): void { // eslint-disable-line camelcase
         MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
 
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 1ab43dcd7a..801062bff4 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -69,7 +69,7 @@ export default class GeneralUserSettingsTab extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    async UNSAFE_componentWillMount() {
+    async UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         const cli = MatrixClientPeg.get();
 
         const serverSupportsSeparateAddAndBind = await cli.doesServerSupportSeparateAddAndBind();

From 538147f7fa492e0a21262c6b5d97b7e65da9f4af Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 10:00:33 +0100
Subject: [PATCH 1872/3235] Better support for widgets overriding their URLs

Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
---
 src/components/views/elements/AppTile.js      | 172 ++++++++++++------
 .../views/elements/PersistentApp.js           |   8 +-
 src/components/views/rooms/AppsDrawer.js      |   6 +-
 src/components/views/rooms/Stickerpicker.js   |  13 +-
 src/utils/AutoDiscoveryUtils.js               |   9 +-
 src/utils/WidgetUtils.js                      |  58 ------
 6 files changed, 135 insertions(+), 131 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0a8bf7443b..1eb4e5bf90 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -2,6 +2,7 @@
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,12 +42,30 @@ import PersistedElement from "./PersistedElement";
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
 
+/**
+ * Does template substitution on a URL (or any string). Variables will be
+ * passed through encodeURIComponent.
+ * @param {string} uriTemplate The path with template variables e.g. '/foo/$bar'.
+ * @param {Object} variables The key/value pairs to replace the template
+ * variables with. E.g. { '$bar': 'baz' }.
+ * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
+ */
+function uriFromTemplate(uriTemplate, variables) {
+    let out = uriTemplate;
+    for (const [key, val] of Object.entries(variables)) {
+        out = out.replace(
+            '$' + key, encodeURIComponent(val),
+        );
+    }
+    return out;
+}
+
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
 
         // The key used for PersistedElement
-        this._persistKey = 'widget_' + this.props.id;
+        this._persistKey = 'widget_' + this.props.app.id;
 
         this.state = this._getNewState(props);
 
@@ -78,7 +97,7 @@ export default class AppTile extends React.Component {
         // This is a function to make the impact of calling SettingsStore slightly less
         const hasPermissionToLoad = () => {
             const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", newProps.room.roomId);
-            return !!currentlyAllowedWidgets[newProps.eventId];
+            return !!currentlyAllowedWidgets[newProps.app.eventId];
         };
 
         const PersistedElement = sdk.getComponent("elements.PersistedElement");
@@ -86,7 +105,7 @@ export default class AppTile extends React.Component {
             initialising: true, // True while we are mangling the widget URL
             // True while the iframe content is loading
             loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
-            widgetUrl: this._addWurlParams(newProps.url),
+            widgetUrl: this._addWurlParams(newProps.app.url),
             // Assume that widget has permission to load if we are the user who
             // added it to the room, or if explicitly granted by the user
             hasPermissionToLoad: newProps.userId === newProps.creatorUserId || hasPermissionToLoad(),
@@ -103,7 +122,7 @@ export default class AppTile extends React.Component {
      * @return {Boolean}            True if capability supported
      */
     _hasCapability(capability) {
-        return ActiveWidgetStore.widgetHasCapability(this.props.id, capability);
+        return ActiveWidgetStore.widgetHasCapability(this.props.app.id, capability);
     }
 
     /**
@@ -125,7 +144,7 @@ export default class AppTile extends React.Component {
 
         const params = qs.parse(u.query);
         // Append widget ID to query parameters
-        params.widgetId = this.props.id;
+        params.widgetId = this.props.app.id;
         // Append current / parent URL, minus the hash because that will change when
         // we view a different room (ie. may change for persistent widgets)
         params.parentUrl = window.location.href.split('#', 2)[0];
@@ -137,11 +156,11 @@ export default class AppTile extends React.Component {
 
     isMixedContent() {
         const parentContentProtocol = window.location.protocol;
-        const u = url.parse(this.props.url);
+        const u = url.parse(this.props.app.url);
         const childContentProtocol = u.protocol;
         if (parentContentProtocol === 'https:' && childContentProtocol !== 'https:') {
             console.warn("Refusing to load mixed-content app:",
-            parentContentProtocol, childContentProtocol, window.location, this.props.url);
+            parentContentProtocol, childContentProtocol, window.location, this.props.app.url);
             return true;
         }
         return false;
@@ -164,8 +183,8 @@ export default class AppTile extends React.Component {
         dis.unregister(this.dispatcherRef);
 
         // if it's not remaining on screen, get rid of the PersistedElement container
-        if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
-            ActiveWidgetStore.destroyPersistentWidget(this.props.id);
+        if (!ActiveWidgetStore.getWidgetPersistence(this.props.app.id)) {
+            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
             const PersistedElement = sdk.getComponent("elements.PersistedElement");
             PersistedElement.destroyElement(this._persistKey);
         }
@@ -176,11 +195,11 @@ export default class AppTile extends React.Component {
      * Component initialisation is only complete when this function has resolved
      */
     setScalarToken() {
-        if (!WidgetUtils.isScalarUrl(this.props.url)) {
+        if (!WidgetUtils.isScalarUrl(this.props.app.url)) {
             console.warn('Non-scalar widget, not setting scalar token!', url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -191,7 +210,7 @@ export default class AppTile extends React.Component {
             console.warn("No integration manager - not setting scalar token", url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -204,7 +223,7 @@ export default class AppTile extends React.Component {
             console.warn('Non-scalar manager, not setting scalar token!', url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -217,7 +236,7 @@ export default class AppTile extends React.Component {
         this._scalarClient.getScalarToken().then((token) => {
             // Append scalar_token as a query param if not already present
             this._scalarClient.scalarToken = token;
-            const u = url.parse(this._addWurlParams(this.props.url));
+            const u = url.parse(this._addWurlParams(this.props.app.url));
             const params = qs.parse(u.query);
             if (!params.scalar_token) {
                 params.scalar_token = encodeURIComponent(token);
@@ -246,7 +265,7 @@ export default class AppTile extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (nextProps.url !== this.props.url) {
+        if (nextProps.app.url !== this.props.app.url) {
             this._getNewState(nextProps);
             // Fetch IM token for new URL if we're showing and have permission to load
             if (this.props.show && this.state.hasPermissionToLoad) {
@@ -280,7 +299,7 @@ export default class AppTile extends React.Component {
     }
 
     _onEditClick() {
-        console.log("Edit widget ID ", this.props.id);
+        console.log("Edit widget ID ", this.props.app.id);
         if (this.props.onEditClick) {
             this.props.onEditClick();
         } else {
@@ -289,13 +308,13 @@ export default class AppTile extends React.Component {
                 IntegrationManagers.sharedInstance().openAll(
                     this.props.room,
                     'type_' + this.props.type,
-                    this.props.id,
+                    this.props.app.id,
                 );
             } else {
                 IntegrationManagers.sharedInstance().getPrimaryManager().open(
                     this.props.room,
                     'type_' + this.props.type,
-                    this.props.id,
+                    this.props.app.id,
                 );
             }
         }
@@ -303,7 +322,7 @@ export default class AppTile extends React.Component {
 
     _onSnapshotClick() {
         console.warn("Requesting widget snapshot");
-        ActiveWidgetStore.getWidgetMessaging(this.props.id).getScreenshot()
+        ActiveWidgetStore.getWidgetMessaging(this.props.app.id).getScreenshot()
             .catch((err) => {
                 console.error("Failed to get screenshot", err);
             })
@@ -351,7 +370,7 @@ export default class AppTile extends React.Component {
 
                     WidgetUtils.setRoomWidget(
                         this.props.room.roomId,
-                        this.props.id,
+                        this.props.app.id,
                     ).catch((e) => {
                         console.error('Failed to delete widget', e);
                         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -369,7 +388,7 @@ export default class AppTile extends React.Component {
     }
 
     _onRevokeClicked() {
-        console.info("Revoke widget permissions - %s", this.props.id);
+        console.info("Revoke widget permissions - %s", this.props.app.id);
         this._revokeWidgetPermission();
     }
 
@@ -380,10 +399,10 @@ export default class AppTile extends React.Component {
         // Destroy the old widget messaging before starting it back up again. Some widgets
         // have startup routines that run when they are loaded, so we just need to reinitialize
         // the messaging for them.
-        ActiveWidgetStore.delWidgetMessaging(this.props.id);
+        ActiveWidgetStore.delWidgetMessaging(this.props.app.id);
         this._setupWidgetMessaging();
 
-        ActiveWidgetStore.setRoomId(this.props.id, this.props.room.roomId);
+        ActiveWidgetStore.setRoomId(this.props.app.id, this.props.room.roomId);
         this.setState({loading: false});
     }
 
@@ -391,10 +410,10 @@ export default class AppTile extends React.Component {
         // FIXME: There's probably no reason to do this here: it should probably be done entirely
         // in ActiveWidgetStore.
         const widgetMessaging = new WidgetMessaging(
-            this.props.id, this.props.url, this.props.userWidget, this._appFrame.current.contentWindow);
-        ActiveWidgetStore.setWidgetMessaging(this.props.id, widgetMessaging);
+            this.props.app.id, this._getRenderedUrl(), this.props.userWidget, this._appFrame.current.contentWindow);
+        ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
-            console.log(`Widget ${this.props.id} requested capabilities: ` + requestedCapabilities);
+            console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);
             requestedCapabilities = requestedCapabilities || [];
 
             // Allow whitelisted capabilities
@@ -406,7 +425,7 @@ export default class AppTile extends React.Component {
                 }, this.props.whitelistCapabilities);
 
                 if (requestedWhitelistCapabilies.length > 0 ) {
-                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties: ` +
+                    console.warn(`Widget ${this.props.app.id} allowing requested, whitelisted properties: ` +
                         requestedWhitelistCapabilies,
                     );
                 }
@@ -414,7 +433,7 @@ export default class AppTile extends React.Component {
 
             // TODO -- Add UI to warn about and optionally allow requested capabilities
 
-            ActiveWidgetStore.setWidgetCapabilities(this.props.id, requestedWhitelistCapabilies);
+            ActiveWidgetStore.setWidgetCapabilities(this.props.app.id, requestedWhitelistCapabilies);
 
             if (this.props.onCapabilityRequest) {
                 this.props.onCapabilityRequest(requestedCapabilities);
@@ -422,16 +441,16 @@ export default class AppTile extends React.Component {
 
             // We only tell Jitsi widgets that we're ready because they're realistically the only ones
             // using this custom extension to the widget API.
-            if (this.props.type === 'jitsi') {
+            if (this.props.app.type === 'jitsi') {
                 widgetMessaging.flagReadyToContinue();
             }
         }).catch((err) => {
-            console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
+            console.log(`Failed to get capabilities for widget type ${this.props.app.type}`, this.props.app.id, err);
         });
     }
 
     _onAction(payload) {
-        if (payload.widgetId === this.props.id) {
+        if (payload.widgetId === this.props.app.id) {
             switch (payload.action) {
                 case 'm.sticker':
                 if (this._hasCapability('m.sticker')) {
@@ -460,9 +479,9 @@ export default class AppTile extends React.Component {
 
     _grantWidgetPermission() {
         const roomId = this.props.room.roomId;
-        console.info("Granting permission for widget to load: " + this.props.eventId);
+        console.info("Granting permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
-        current[this.props.eventId] = true;
+        current[this.props.app.eventId] = true;
         SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
             this.setState({hasPermissionToLoad: true});
 
@@ -476,14 +495,14 @@ export default class AppTile extends React.Component {
 
     _revokeWidgetPermission() {
         const roomId = this.props.room.roomId;
-        console.info("Revoking permission for widget to load: " + this.props.eventId);
+        console.info("Revoking permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
-        current[this.props.eventId] = false;
+        current[this.props.app.eventId] = false;
         SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
             this.setState({hasPermissionToLoad: false});
 
             // Force the widget to be non-persistent (able to be deleted/forgotten)
-            ActiveWidgetStore.destroyPersistentWidget(this.props.id);
+            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
             const PersistedElement = sdk.getComponent("elements.PersistedElement");
             PersistedElement.destroyElement(this._persistKey);
         }).catch(err => {
@@ -494,8 +513,8 @@ export default class AppTile extends React.Component {
 
     formatAppTileName() {
         let appTileName = "No name";
-        if (this.props.name && this.props.name.trim()) {
-            appTileName = this.props.name.trim();
+        if (this.props.app.name && this.props.app.name.trim()) {
+            appTileName = this.props.app.name.trim();
         }
         return appTileName;
     }
@@ -519,6 +538,60 @@ export default class AppTile extends React.Component {
         }
     }
 
+    /**
+     * Replace the widget template variables in a url with their values
+     *
+     * @returns {string} url with temlate variables replaced
+     */
+    _templatedUrl(u) {
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const myUser = MatrixClientPeg.get().getUser(myUserId);
+        const vars = Object.assign({
+            domain: "jitsi.riot.im", // v1 widgets have this hardcoded
+        }, this.props.app.data, {
+            'matrix_user_id': myUserId,
+            'matrix_room_id': this.props.room.roomId,
+            'matrix_display_name': myUser ? myUser.displayName : myUserId,
+            'matrix_avatar_url': myUser ? MatrixClientPeg.get().mxcUrlToHttp(myUser.avatarUrl) : '',
+
+            // TODO: Namespace themes through some standard
+            'theme': SettingsStore.getValue("theme"),
+        });
+
+        if (vars.conferenceId === undefined) {
+            // we'll need to parse the conference ID out of the URL for v1 Jitsi widgets
+            const parsedUrl = new URL(this.props.app.url);
+            vars.conferenceId = parsedUrl.searchParams.get("confId");
+        }
+
+        return uriFromTemplate(u, vars);
+    }
+
+    /**
+     * Get the URL used in the iframe
+     * In cases where we supply our own UI for a widget, this is an internal
+     * URL different to the one used if the widget is popped out to a separate
+     * tab / browser
+     *
+     * @returns {string} url
+     */
+    _getRenderedUrl() {
+        let url;
+
+        if (this.props.app.type === 'jitsi') {
+            console.log("Replacing Jitsi widget URL with local wrapper");
+            url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
+            url = this._addWurlParams(url);
+        } else {
+            url = this._getSafeUrl();
+        }
+        return this._templatedUrl(url);
+    }
+
+    _getPopoutUrl() {
+        return this._templatedUrl(this._getSafeUrl());
+    }
+
     _getSafeUrl() {
         const parsedWidgetUrl = url.parse(this.state.widgetUrl, true);
         if (ENABLE_REACT_PERF) {
@@ -526,13 +599,7 @@ export default class AppTile extends React.Component {
             parsedWidgetUrl.query.react_perf = true;
         }
         let safeWidgetUrl = '';
-        if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol) || (
-            // Check if the widget URL is a Jitsi widget in Electron
-            parsedWidgetUrl.protocol === 'vector:'
-            && parsedWidgetUrl.host === 'vector'
-            && parsedWidgetUrl.pathname === '/webapp/jitsi.html'
-            && this.props.type === 'jitsi'
-        )) {
+        if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol)) {
             safeWidgetUrl = url.format(parsedWidgetUrl);
         }
         return safeWidgetUrl;
@@ -562,9 +629,9 @@ export default class AppTile extends React.Component {
 
     _onPopoutWidgetClick() {
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
-        // window.open(this._getSafeUrl(), '_blank', 'noopener=yes');
+        // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
-            { target: '_blank', href: this._getSafeUrl(), rel: 'noreferrer noopener'}).click();
+            { target: '_blank', href: this._getPopoutUrl(), rel: 'noreferrer noopener'}).click();
     }
 
     _onReloadWidgetClick() {
@@ -641,7 +708,7 @@ export default class AppTile extends React.Component {
                             <iframe
                                 allow={iframeFeatures}
                                 ref={this._appFrame}
-                                src={this._getSafeUrl()}
+                                src={this._getRenderedUrl()}
                                 allowFullScreen={true}
                                 sandbox={sandboxFlags}
                                 onLoad={this._onLoaded} />
@@ -706,7 +773,7 @@ export default class AppTile extends React.Component {
         }
 
         return <React.Fragment>
-            <div className={appTileClass} id={this.props.id}>
+            <div className={appTileClass} id={this.props.app.id}>
                 { this.props.showMenubar &&
                 <div ref={this._menu_bar} className={menuBarClasses} onClick={this.onClickMenuBar}>
                     <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>
@@ -753,12 +820,8 @@ export default class AppTile extends React.Component {
 AppTile.displayName = 'AppTile';
 
 AppTile.propTypes = {
-    id: PropTypes.string.isRequired,
-    eventId: PropTypes.string, // required for room widgets
-    url: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
+    app: PropTypes.object.isRequired,
     room: PropTypes.object.isRequired,
-    type: PropTypes.string.isRequired,
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
     fullWidth: PropTypes.bool,
@@ -805,7 +868,6 @@ AppTile.propTypes = {
 };
 
 AppTile.defaultProps = {
-    url: "",
     waitForIframeLoad: true,
     showMenubar: true,
     showTitle: true,
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index a807ed3b93..83763f6c56 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -75,11 +75,7 @@ export default createReactClass({
                 const AppTile = sdk.getComponent('elements.AppTile');
                 return <AppTile
                     key={app.id}
-                    id={app.id}
-                    eventId={app.eventId}
-                    url={app.url}
-                    name={app.name}
-                    type={app.type}
+                    app={app}
                     fullWidth={true}
                     room={persistentWidgetInRoom}
                     userId={MatrixClientPeg.get().credentials.userId}
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f81a5630a4..2474fee4a2 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -160,11 +160,7 @@ export default createReactClass({
 
             return (<AppTile
                 key={app.id}
-                id={app.id}
-                eventId={app.eventId}
-                url={app.url}
-                name={app.name}
-                type={app.type}
+                app={app}
                 fullWidth={arr.length<2 ? true : false}
                 room={this.props.room}
                 userId={this.props.userId}
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 07e9be7a9a..da5f129a42 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -240,6 +240,14 @@ export default class Stickerpicker extends React.Component {
             // Set default name
             stickerpickerWidget.content.name = stickerpickerWidget.name || _t("Stickerpack");
 
+            // FIXME: could this use the same code as other apps?
+            const stickerApp = {
+                id: stickerpickerWidget.id,
+                url: stickerpickerWidget.content.url,
+                name: stickerpickerWidget.content.name,
+                type: stickerpickerWidget.content.type,
+            };
+
             stickersContent = (
                 <div className='mx_Stickers_content_container'>
                     <div
@@ -253,11 +261,8 @@ export default class Stickerpicker extends React.Component {
                     >
                     <PersistedElement persistKey={PERSISTED_ELEMENT_KEY} style={{zIndex: STICKERPICKER_Z_INDEX}}>
                         <AppTile
-                            id={stickerpickerWidget.id}
-                            url={stickerpickerWidget.content.url}
-                            name={stickerpickerWidget.content.name}
+                            app={stickerApp}
                             room={this.props.room}
-                            type={stickerpickerWidget.content.type}
                             fullWidth={true}
                             userId={MatrixClientPeg.get().credentials.userId}
                             creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 328aa9c776..5114fa278f 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -22,6 +22,7 @@ import {makeType} from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
 
 const LIVELINESS_DISCOVERY_ERRORS = [
+    AutoDiscovery.ERROR_INVALID,
     AutoDiscovery.ERROR_INVALID_HOMESERVER,
     AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
 ];
@@ -232,8 +233,8 @@ export default class AutoDiscoveryUtils {
         const preferredHomeserverUrl = hsResult["base_url"];
         let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
 
-        const url = new URL(preferredHomeserverUrl);
-        if (!preferredHomeserverName) preferredHomeserverName = url.hostname;
+        const url = preferredHomeserverUrl ? new URL(preferredHomeserverUrl) : null;
+        if (!preferredHomeserverName && url) preferredHomeserverName = url.hostname;
 
         // It should have been set by now, so check it
         if (!preferredHomeserverName) {
@@ -241,10 +242,12 @@ export default class AutoDiscoveryUtils {
             throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
         }
 
+        const hsNameIsDifferent = url ? (url.hostname !== preferredHomeserverName) : null;
+
         return makeType(ValidatedServerConfig, {
             hsUrl: preferredHomeserverUrl,
             hsName: preferredHomeserverName,
-            hsNameIsDifferent: url.hostname !== preferredHomeserverName,
+            hsNameIsDifferent,
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index eea995cfea..d41e249a42 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -30,26 +30,6 @@ import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {Capability} from "../widgets/WidgetApi";
 
-/**
- * Encodes a URI according to a set of template variables. Variables will be
- * passed through encodeURIComponent.
- * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
- * @param {Object} variables The key/value pairs to replace the template
- * variables with. E.g. { '$bar': 'baz' }.
- * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
- */
-function encodeUri(pathTemplate, variables) {
-    for (const key in variables) {
-        if (!variables.hasOwnProperty(key)) {
-            continue;
-        }
-        pathTemplate = pathTemplate.replace(
-            key, encodeURIComponent(variables[key]),
-        );
-    }
-    return pathTemplate;
-}
-
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
      * (Does not apply to non-room-based / user widgets)
@@ -402,18 +382,6 @@ export default class WidgetUtils {
     }
 
     static makeAppConfig(appId, app, senderUserId, roomId, eventId) {
-        const myUserId = MatrixClientPeg.get().credentials.userId;
-        const user = MatrixClientPeg.get().getUser(myUserId);
-        const params = {
-            '$matrix_user_id': myUserId,
-            '$matrix_room_id': roomId,
-            '$matrix_display_name': user ? user.displayName : myUserId,
-            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
-
-            // TODO: Namespace themes through some standard
-            '$theme': SettingsStore.getValue("theme"),
-        };
-
         if (!senderUserId) {
             throw new Error("Widgets must be created by someone - provide a senderUserId");
         }
@@ -423,32 +391,6 @@ export default class WidgetUtils {
         app.eventId = eventId;
         app.name = app.name || app.type;
 
-        if (app.type === 'jitsi') {
-            console.log("Replacing Jitsi widget URL with local wrapper");
-            if (!app.data || !app.data.conferenceId) {
-                // Assumed to be a v1 widget: add a data object for visibility on the wrapper
-                // TODO: Remove this once mobile supports v2 widgets
-                console.log("Replacing v1 Jitsi widget with v2 equivalent");
-                const parsed = new URL(app.url);
-                app.data = {
-                    conferenceId: parsed.searchParams.get("confId"),
-                    domain: "jitsi.riot.im", // v1 widgets have this hardcoded
-                };
-            }
-
-            app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
-        }
-
-        if (app.data) {
-            Object.keys(app.data).forEach((key) => {
-                params['$' + key] = app.data[key];
-            });
-
-            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
-        }
-
-        app.url = encodeUri(app.url, params);
-
         return app;
     }
 

From 8bc54ae2058321fae6a0f3b5e392c1fb63add892 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 10:08:26 +0100
Subject: [PATCH 1873/3235] Only auto-scroll to RoomTile when clicking on
 RoomTile or via shortcuts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomSubList.js | 3 ++-
 src/components/views/rooms/RoomList.js   | 1 +
 src/components/views/rooms/RoomTile.js   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 9428de3e22..2ae2d71100 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -126,7 +126,7 @@ export default class RoomSubList extends React.PureComponent {
                 break;
 
             case 'view_room':
-                if (this.state.hidden && !this.props.forceExpand &&
+                if (this.state.hidden && !this.props.forceExpand && payload.show_room_tile &&
                     this.props.list.some((r) => r.roomId === payload.room_id)
                 ) {
                     this.toggle();
@@ -193,6 +193,7 @@ export default class RoomSubList extends React.PureComponent {
     onRoomTileClick = (roomId, ev) => {
         dis.dispatch({
             action: 'view_room',
+            show_room_tile: true, // to make sure the room gets scrolled into view
             room_id: roomId,
             clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)),
         });
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 87299281ff..41482eaa5f 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -289,6 +289,7 @@ export default createReactClass({
                     dis.dispatch({
                         action: 'view_room',
                         room_id: room.roomId,
+                        show_room_tile: true, // to make sure the room gets scrolled into view
                     });
                 }
                 break;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0c913b32da..c4c83b69a7 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -203,7 +203,7 @@ export default createReactClass({
 
             case 'view_room':
                 // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcut access
-                if (payload.room_id === this.props.room.roomId) {
+                if (payload.room_id === this.props.room.roomId && payload.show_room_tile) {
                     this._scrollIntoView();
                 }
                 break;

From 6bb6dbc0ff08583ccfba8ee1d3301d546096dac6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 10:14:15 +0100
Subject: [PATCH 1874/3235] Fix Ctrl+/ for Finnish keyboard where it includes
 Shift

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index e7a6f4c1a9..e23e0699d6 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -22,7 +22,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import { Key, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
+import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
@@ -380,7 +380,7 @@ const LoggedInView = createReactClass({
                 break;
 
             case Key.SLASH:
-                if (ctrlCmdOnly) {
+                if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev)) {
                     KeyboardShortcuts.toggleDialog();
                     handled = true;
                 }

From 6dc7bf4bdf651bf6be39239d7634b7feff217265 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 1 Apr 2020 10:32:27 +0200
Subject: [PATCH 1875/3235] fix legacy verify user

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

diff --git a/src/verification.js b/src/verification.js
index 2231346478..3170eb8825 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -99,7 +99,7 @@ export async function legacyVerifyUser(user) {
         return;
     }
     const cli = MatrixClientPeg.get();
-    const verificationRequestPromise = cli.beginKeyVerification(user.userId);
+    const verificationRequestPromise = cli.requestVerification(user.userId);
     dis.dispatch({
         action: "set_right_panel_phase",
         phase: RIGHT_PANEL_PHASES.EncryptionPanel,

From d30db00cf174be026ac0e29a9ba02f7c7f9ae686 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 31 Mar 2020 17:38:55 +0000
Subject: [PATCH 1876/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2244 of 2244 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 69de024887..1283a7a379 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -2293,5 +2293,8 @@
     "Verification cancelled": "Egiaztaketa ezeztatuta",
     "Compare emoji": "Konparatu emojiak",
     "Unverified login. Was this you?": "Egiaztatu gabeko saioa. Zu izan zara?",
-    "Session backup key:": "Saioaren babes-kopia gakoa:"
+    "Session backup key:": "Saioaren babes-kopia gakoa:",
+    "Sends a message as html, without interpreting it as markdown": "Bidali mezua html gisa, markdown balitz aztertu gabe",
+    "Sign in with SSO": "Hasi saioa SSO-rekin",
+    "Cancel replying to a message": "Utzi mezua erantzuteari"
 }

From 79b8fd80c9cd575d4e6d0432b51badf294877395 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 1 Apr 2020 06:19:45 +0000
Subject: [PATCH 1877/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2244 of 2244 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 03d49e0499..32dc7532f4 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2307,5 +2307,6 @@
     "Compare emoji": "比較顏文字",
     "Session backup key:": "工作階段備份金鑰：",
     "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown",
-    "Cancel replying to a message": "取消回覆訊息"
+    "Cancel replying to a message": "取消回覆訊息",
+    "Sign in with SSO": "使用單一登入系統登入"
 }

From 918309f4da8b8066d6de40494b9322c62d90e167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 1 Apr 2020 07:29:12 +0000
Subject: [PATCH 1878/3235] Translated using Weblate (French)

Currently translated at 100.0% (2244 of 2244 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index eb7e11c0f2..f138f81647 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2306,5 +2306,8 @@
     "In encrypted rooms, verify all users to ensure it’s secure.": "Dans les salons chiffrés, vérifiez tous les utilisateurs pour vous assurer qu’il est sécurisé.",
     "Verified": "Vérifié",
     "Verification cancelled": "Vérification annulée",
-    "Compare emoji": "Comparer des émojis"
+    "Compare emoji": "Comparer des émojis",
+    "Sends a message as html, without interpreting it as markdown": "Envoie un message en HTML, sans l’interpréter comme du Markdown",
+    "Sign in with SSO": "Se connecter avec l’authentification unique",
+    "Cancel replying to a message": "Annuler la réponse à un message"
 }

From 6727024e46516f0efbc6ff803e94ca07d23df8b4 Mon Sep 17 00:00:00 2001
From: Peter Pan <jorgi@posteo.de>
Date: Tue, 31 Mar 2020 21:48:54 +0000
Subject: [PATCH 1879/3235] Translated using Weblate (German)

Currently translated at 77.1% (1731 of 2244 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 a808ebd33c..1a33195f79 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1785,5 +1785,7 @@
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewahre ihn sicher auf, wie in einem Passwort-Manager oder einem Safe.",
     "Your recovery key": "Dein Wiederherstellungsschlüssel",
     "Copy": "In Zwischenablage kopieren",
-    "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel"
+    "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel",
+    "Unverified login. Was this you?": "Nicht verifzierte Anmeldung. Bist du es gewesen?",
+    "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren"
 }

From cb176dd235a0d978231485037cef0cbb059c8b82 Mon Sep 17 00:00:00 2001
From: Dvir Berebi <dberebi@gmail.com>
Date: Wed, 1 Apr 2020 02:09:29 +0000
Subject: [PATCH 1880/3235] Translated using Weblate (Hebrew)

Currently translated at 9.3% (209 of 2244 strings)

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

diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 9c3e383afc..2883da0abb 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -207,5 +207,6 @@
     "Thank you!": "רב תודות!",
     "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...": "בודק עדכונים...",
-    "There are advanced notifications which are not shown here": "ישנן התראות מתקדמות אשר אינן מוצגות כאן"
+    "There are advanced notifications which are not shown here": "ישנן התראות מתקדמות אשר אינן מוצגות כאן",
+    "Your Riot is misconfigured": "ה Riot שלך מוגדר באופן שגוי"
 }

From 1cc2162d47d3e649b08e7ee89dbd605da99f1134 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Wed, 1 Apr 2020 01:15:24 +0000
Subject: [PATCH 1881/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 47.2% (1059 of 2244 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index f16ff2a771..433c650de6 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -158,10 +158,10 @@
     "Dec": "Des",
     "PM": "PM",
     "AM": "AM",
-    "%(weekDayName)s %(time)s": "%(weekDayName)s. %(time)s",
-    "%(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",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s kl. %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s kl. %(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 kl. %(time)s",
     "Who would you like to add to this community?": "Hvem ønsker du å legge til i dette samfunnet?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advarsel: Enhver person som du legger til i et samfunn vil bli offentlig synlig til alle som kan samfunns IDen",
     "Invite new community members": "Inviter nye samfunnsmedlemmer",
@@ -240,7 +240,7 @@
     "Sets the room name": "Setter rommets navn",
     "Invites user with given id to current room": "Inviterer brukeren med gitt id til dette rommet",
     "Joins room with given alias": "Går inn i rommet med gitt alias",
-    "Leave room": "Forlate rom",
+    "Leave room": "Forlat rommet",
     "Unrecognised room alias:": "Ukjent rom alias:",
     "Kicks user with given id": "Sparker ut bruker med gitt id",
     "Bans user with given id": "Nekter tilgang til bruker med gitt id",
@@ -364,7 +364,7 @@
     "Composer": "Komposør",
     "Timeline": "Tidslinje",
     "Security & Privacy": "Sikkerhet og personvern",
-    "Sessions": "Sesjoner",
+    "Sessions": "Økter",
     "Camera": "Kamera",
     "Reset": "Nullstill",
     "Browse": "Bla",
@@ -568,7 +568,7 @@
     "Allow Peer-to-Peer for 1:1 calls": "Tillat P2P for samtaler under fire øyne",
     "Send analytics data": "Send analytiske data",
     "Enable inline URL previews by default": "Skru på URL-forhåndsvisninger inni meldinger som standard",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Si ifra før det sendes invitasjoner til potensielt ugyldig Matrix-ID-er",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Si ifra før det sendes invitasjoner til potensielt ugyldige Matrix-ID-er",
     "Show developer tools": "Vis utviklerverktøy",
     "Order rooms by name": "Sorter rom etter navn",
     "Show rooms with unread notifications first": "Vis rom med uleste varsler først",
@@ -843,5 +843,228 @@
     "Starting backup...": "Begynner sikkerhetskopieringen …",
     "Don't ask again": "Ikke spør igjen",
     "Space used:": "Plass brukt:",
-    "Indexed rooms:": "Indekserte rom:"
+    "Indexed rooms:": "Indekserte rom:",
+    "Verify this session": "Verifiser denne økten",
+    "Set up encryption": "Sett opp kryptering",
+    "Create Account": "Opprett konto",
+    "%(senderName)s set a profile picture.": "%(senderName)s ordnet seg et profilbilde.",
+    "%(targetName)s left the room.": "%(targetName)s forlot rommet.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endret rommets navn fra %(oldRoomName)s til %(newRoomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s endret rommets navn til %(roomName)s.",
+    "(not supported by this browser)": "(ikke støttet av denne nettleseren)",
+    "%(senderName)s ended the call.": "%(senderName)s avsluttet samtalen.",
+    "Not Trusted": "Ikke betrodd",
+    "%(items)s and %(count)s others|other": "%(items)s og %(count)s andre",
+    "%(items)s and %(count)s others|one": "%(items)s og én annen",
+    "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
+    "a few seconds ago": "noen sekunder siden",
+    "about a minute ago": "cirka 1 minutt siden",
+    "about an hour ago": "cirka 1 time siden",
+    "about a day ago": "cirka 1 dag siden",
+    "%(num)s days ago": "%(num)s dager siden",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Aldri send krypterte meldinger til uverifiserte økter i dette rommet fra denne økten",
+    "Enable URL previews for this room (only affects you)": "Skru på URL-forhåndsvisninger for dette rommet (Påvirker bare deg)",
+    "Enable URL previews by default for participants in this room": "Skru på URL-forhåndsvisninger som standard for deltakerne i dette rommet",
+    "Room Colour": "Romfarge",
+    "Low bandwidth mode": "Modus for lav båndbredde",
+    "Manually verify all remote sessions": "Verifiser alle eksterne økter manuelt",
+    "Show more": "Vis mer",
+    "Warning!": "Advarsel!",
+    "Export E2E room keys": "Eksporter E2E-romnøkler",
+    "not found": "ikke funnet",
+    "exists": "finnes",
+    "Authentication": "Autentisering",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verifiser hver brukerøkt individuelt for å stemple den som at du stoler på den, ikke stol på kryss-signerte enheter.",
+    "Connecting to integration manager...": "Kobler til integreringsbehandleren …",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krypterte meldinger er sikret med punkt-til-punkt-kryptering. Bare du og mottakeren(e) har nøklene til å lese disse meldingene.",
+    "Your keys are <b>not being backed up from this session</b>.": "Dine nøkler <b>har ikke blitt sikkerhetskopiert fra denne økten</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Ta sikkerhetskopi av nøklene dine før du logger av for å unngå å miste dem.",
+    "Start using Key Backup": "Begynn å bruke Nøkkelsikkerhetskopiering",
+    "Add an email address to configure email notifications": "Legg til en E-postadresse for å sette opp E-postvarsler",
+    "Identity Server (%(server)s)": "Identitetstjener (%(server)s)",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Hvis du ikke ønsker å bruke <server /> til å oppdage og bli oppdaget av eksisterende kontakter som du kjenner, skriv inn en annen identitetstjener nedenfor.",
+    "Enter a new identity server": "Skriv inn en ny identitetstjener",
+    "For help with using Riot, click <a>here</a>.": "For å få hjelp til å bruke Riot, klikk <a>her</a>.",
+    "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.": "Dersom du har sendt inn en feilrapport på GitHub, kan avlusingsloggbøker hjelpe oss med å finne frem til problemet. Avlusingsloggbøker inneholder programbruksdata inkl. ditt brukernavn, ID-ene eller aliasene til rommene eller gruppene du har besøkt, og brukernavnene til andre brukere. De inneholder ikke noen meldinger.",
+    "Submit debug logs": "Send inn avlusingsloggbøker",
+    "Clear cache and reload": "Tøm mellomlageret og last inn siden på nytt",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "For å rapportere inn et Matrix-relatert sikkerhetsproblem, vennligst less Matrix.org sine <a>Retningslinjer for sikkerhetspublisering</a>.",
+    "Keyboard Shortcuts": "Tastatursnarveier",
+    "Homeserver is": "Hjemmetjeneren er",
+    "Identity Server is": "Identitetstjeneren er",
+    "Access Token:": "Tilgangssjetong:",
+    "Import E2E room keys": "Importer E2E-romnøkler",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatlivet er viktig for oss, så vi samler ikke inn noe personlig eller identifiserbar data for våre analyser.",
+    "Internal room ID:": "Intern rom-ID:",
+    "Change room avatar": "Endre rommets avatar",
+    "Change room name": "Endre rommets navn",
+    "Change main address for the room": "Endre hovedadressen til rommet",
+    "Change history visibility": "Endre historikkens synlighet",
+    "Enable room encryption": "Skru på kryptering av rommet",
+    "Default role": "Forvalgt rolle",
+    "Privileged Users": "Priviligerte brukere",
+    "Send %(eventType)s events": "Send %(eventType)s-hendelser",
+    "Select the roles required to change various parts of the room": "Velg rollene som kreves for å endre på diverse deler av rommet",
+    "Only people who have been invited": "Kun folk som har blitt invitert",
+    "Anyone who knows the room's link, apart from guests": "Alle som kjenner til rommets lenke, bortsett fra gjester",
+    "Anyone who knows the room's link, including guests": "Alle som kjenner til rommets lenke, inkludert gjester",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Endringer for hvem som kan lese historikken, vil kun bli benyttet for fremtidige meldinger i dette rommet. Synligheten til den eksisterende historikken vil forbli uendret.",
+    "Members only (since the point in time of selecting this option)": "Kun medlemmer (f.o.m. da denne innstillingen ble valgt)",
+    "Members only (since they were invited)": "Kun medlemmer (f.o.m. da de ble invitert)",
+    "Members only (since they joined)": "Kun medlemmer (f.o.m. de ble med)",
+    "Once enabled, encryption cannot be disabled.": "Dersom dette først har blitt skrudd på, kan kryptering aldri bli skrudd av.",
+    "Who can access this room?": "Hvem kan gå inn i dette rommet?",
+    "Who can read history?": "Hvem kan lese historikken?",
+    "Scroll to most recent messages": "Hopp bort til de nyeste meldingene",
+    "Share Link to User": "Del en lenke til brukeren",
+    "User Options": "Brukerinnstillinger",
+    "Filter room members": "Filtrer rommets medlemmer",
+    "Send a reply…": "Send et svar …",
+    "Send a reply (unencrypted)…": "Send et svar (ukryptert) …",
+    "Code block": "Kodefelt",
+    "Replying": "Svarer på",
+    "Room %(name)s": "Rom %(name)s",
+    "Start chatting": "Begynn å chatte",
+    "%(count)s unread messages.|one": "1 ulest melding.",
+    "Unread mentions.": "Uleste nevninger.",
+    "Unread messages.": "Uleste meldinger.",
+    "Send as message": "Send som en melding",
+    "You don't currently have any stickerpacks enabled": "Du har ikke skrudd på noen klistremerkepakker for øyeblikket",
+    "Add some now": "Legg til noen nå",
+    "Hide Stickers": "Skjul klistremerker",
+    "Show Stickers": "Vis klistremerker",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan brukes av alle på enhver tjener til å bli med i rommet ditt. For å publisere en adresse, må den bli satt til å være en lokal adresse først.",
+    "No other published addresses yet, add one below": "Det er ingen publiserte adresser enda, legg til en nedenfor",
+    "New published address (e.g. #alias:server)": "Ny publisert adresse (f.eks. #alias:tjener)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Velg adresser for dette rommet slik at brukere kan finne dette rommet gjennom hjemmetjeneren din (%(localDomain)s)",
+    "This room is not showing flair for any communities": "Dette rommet viser ikke merkeskilter for noen samfunn",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Ny samfunns-ID (f.eks. +foo:%(localDomain)s)",
+    "Room Name": "Rommets navn",
+    "Room Topic": "Rommets tema",
+    "Publish this room to the public in %(domain)s's room directory?": "Vil du publisere dette rommet til offentligheten i %(domain)s sitt rom-arkiv?",
+    "You have <a>enabled</a> URL previews by default.": "Du har <a>skrudd på</a> URL-forhåndsvisninger som standard.",
+    "You have <a>disabled</a> URL previews by default.": "Du har <a>skrudd av</a> URL-forhåndsvisninger som standard.",
+    "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.": "Når noen legger til en URL i meldingene deres, kan en URL-forhåndsvisning bli vist for å gi mere informasjonen om den lenken, f.eks. tittelen, beskrivelsen, og et bilde fra nettstedet.",
+    "Trusted": "Betrodd",
+    "Not trusted": "Ikke betrodd",
+    "Direct message": "Direktemelding",
+    "Verified": "Verifisert",
+    "Compare emoji": "Sammenlign emojier",
+    "Encryption enabled": "Kryptering er skrudd på",
+    "Encryption not enabled": "Kryptering er ikke skrudd på",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s endret rommets avatar til <img/>",
+    "Message removed": "Meldingen ble fjernet",
+    "Something went wrong!": "Noe gikk galt!",
+    "Visible to everyone": "Synlig for alle",
+    "Checking for an update...": "Leter etter en oppdatering …",
+    "No update available.": "Ingen oppdateringer er tilgjengelige.",
+    "Downloading update...": "Laster ned oppdatering …",
+    "Unknown Address": "Ukjent adresse",
+    "Your display name": "Ditt visningsnavn",
+    "Your avatar URL": "Din avatars URL",
+    "Widget added by": "Modulen ble lagt til av",
+    "Create new room": "Opprett et nytt rom",
+    "Unverify": "Av-verifiser",
+    "Verify...": "Verifiser …",
+    "Language Dropdown": "Språk-nedfallsmeny",
+    "Manage Integrations": "Behandle integreringer",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s ble med %(count)s ganger",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s ble med",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s ble med %(count)s ganger",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s ble med",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s forlot rommet %(count)s ganger",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s forlot rommet",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s forlot rommet %(count)s ganger",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s forlot rommet",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s endret navnene sine",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s endret navnet sitt",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s endret avatarene sine",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s endret avataren sin",
+    "Custom level": "Tilpasset nivå",
+    "Room alias": "Rom-alias",
+    "Please provide a room alias": "Vennligst skriv inn et rom-alias",
+    "And %(count)s more...|other": "Og %(count)s til...",
+    "Remove server": "Fjern tjeneren",
+    "Matrix": "Matrix",
+    "Add a new server...": "Legg til en ny tjener …",
+    "Logs sent": "Loggbøkene ble sendt",
+    "GitHub issue": "Github-saksrapport",
+    "Send logs": "Send loggbøker",
+    "Create Community": "Opprett et samfunn",
+    "Please enter a name for the room": "Vennligst skriv inn et navn for rommet",
+    "Set a room alias to easily share your room with other people.": "Velg et rom-alias for å dele rommet ditt enkelt med andre.",
+    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon",
+    "Create a public room": "Opprett et offentlig rom",
+    "Create a private room": "Opprett et privat rom",
+    "Topic (optional)": "Tema (valgfritt)",
+    "Make this room public": "Gjør dette rommet offentlig",
+    "Hide advanced": "Skjul avansert",
+    "Show advanced": "Vis avansert",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Blokker brukere fra andre Matrix-hjemmetjenere fra å bli med i dette rommet (Denne innstillingen kan ikke bli endret på senere!)",
+    "To continue, please enter your password:": "For å gå videre, vennligst skriv inn passordet ditt:",
+    "Event Type": "Hendelsestype",
+    "Developer Tools": "Utviklerverktøy",
+    "Recent Conversations": "Nylige samtaler",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start en samtale med noen ut ifra deres navn, brukernavn (slik som <userId/>), eller E-postadresse.",
+    "Your account is not secure": "Kontoen din er ikke sikker",
+    "Your password": "Passordet ditt",
+    "Room Settings - %(roomName)s": "Rominnstillinger - %(roomName)s",
+    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
+    "Please set a password!": "Vennligst velg et passord!",
+    "Integration Manager": "Integreringsbehandler",
+    "To continue you need to accept the terms of this service.": "For å gå videre må du akseptere brukervilkårene til denne tjenesten.",
+    "Private Chat": "Privat chat",
+    "Public Chat": "Offentlig chat",
+    "Pin Message": "Fest fast meldingen",
+    "Mentions only": "Kun nevninger",
+    "Set a new status...": "Velg en ny status …",
+    "View Community": "Vis samfunnet",
+    "Confirm your identity by entering your account password below.": "Bekreft identiteten din ved å skrive inn kontopassordet ditt nedenfor.",
+    "Use an email address to recover your account": "Bruk en E-postadresse til å gjenopprette kontoen din",
+    "Enter email address (required on this homeserver)": "Skriv inn en E-postadresse (Påkrevd på denne hjemmetjeneren)",
+    "Doesn't look like a valid email address": "Det ser ikke ut som en gyldig E-postadresse",
+    "Password is allowed, but unsafe": "Passordet er tillatt, men er ikke trygt",
+    "Nice, strong password!": "Strålende, passordet er sterkt!",
+    "Keep going...": "Fortsett sånn …",
+    "Doesn't look like a valid phone number": "Det ser ikke ut som et gyldig telefonnummer",
+    "Use lowercase letters, numbers, dashes and underscores only": "Bruk kun småbokstaver, numre, streker og understreker",
+    "You must join the room to see its files": "Du må bli med i rommet for å se filene dens",
+    "There are no visible files in this room": "Det er ingen synlig filer i dette rommet",
+    "Failed to upload image": "Mislyktes i å laste opp bildet",
+    "Featured Users:": "Fremhevede brukere:",
+    "Filter rooms…": "Filtrer rom …",
+    "Signed Out": "Avlogget",
+    "%(creator)s created and configured the room.": "%(creator)s opprettet og satte opp rommet.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Opprett et samfunn for å samle sammen brukere og rom! Lag en tilpasset hjemmeside for å markere territoriet ditt i Matrix-universet.",
+    "You have no visible notifications": "Du har ingen synlige varsler",
+    "Find a room… (e.g. %(exampleRoom)s)": "Finn et rom… (f.eks. %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Hvis du ikke finner rommet du leter etter, be om en invitasjon eller <a>Opprett et nytt rom</a>.",
+    "Active call": "Aktiv samtale",
+    "Send Reset Email": "Send tilbakestillings-E-post",
+    "Registration Successful": "Registreringen var vellykket",
+    "Create your account": "Opprett kontoen din",
+    "Forgotten your password?": "Har du glemt passordet ditt?",
+    "Blacklisted": "Svartelistet",
+    "Export room keys": "Eksporter romnøkler",
+    "Import room keys": "Importer romnøkler",
+    "Go to Settings": "Gå til Innstillinger",
+    "Indexed messages:": "Indekserte meldinger:",
+    "Navigation": "Navigering",
+    "Autocomplete": "Autofullfør",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "New line": "Ny linje",
+    "Cancel replying to a message": "Avbryt å svare på en melding",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Send",
+    "Space": "Mellomrom",
+    "End": "Slutt"
 }

From 50bb556bc7144b70f6f1ca8060f6e1508640b09d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 1 Apr 2020 09:36:50 +0000
Subject: [PATCH 1882/3235] Update docs/settings.md

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 docs/settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.md b/docs/settings.md
index 30818625d2..c22345bc22 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -51,7 +51,7 @@ Settings are the different options a user may set or experience in the applicati
 }
 ```
 
-Settings that support the config level can be set in the config file under the `settingDefaults` key (note that the "theme" setting is special cased to the `default_theme` in the config file):
+Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some settings, like the "theme" setting, are special cased in the config file):
 ```
 {
   ...

From ce8f7eaace012a6462a8b45814c93cfb727ec1df Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 1 Apr 2020 09:37:17 +0000
Subject: [PATCH 1883/3235] Apply suggestions from code review

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 docs/settings.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/settings.md b/docs/settings.md
index c22345bc22..777636359e 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -52,11 +52,11 @@ Settings are the different options a user may set or experience in the applicati
 ```
 
 Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some settings, like the "theme" setting, are special cased in the config file):
-```
+```json
 {
   ...
-  settingDefaults: {
-    settingName: true
+  "settingDefaults": {
+    "settingName": true
   },
   ...
 }

From 274eb75c3825c73bd23dcdcc12b69bb8860ef073 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 10:40:03 +0100
Subject: [PATCH 1884/3235] Remove get-config API

which is no longer necessary now the jitsi wrapper has its own
external-api script
---
 src/FromWidgetPostMessageApi.js |  7 -------
 src/SdkConfig.ts                |  2 --
 src/utils/WidgetUtils.js        |  1 -
 src/widgets/WidgetApi.ts        | 10 ----------
 4 files changed, 20 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index ea76c85643..2811358a36 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -220,13 +220,6 @@ export default class FromWidgetPostMessageApi {
             }
         } else if (action === 'get_openid') {
             // Handled by caller
-        } else if (action === KnownWidgetActions.GetRiotWebConfig) {
-            if (ActiveWidgetStore.widgetHasCapability(widgetId, Capability.GetRiotWebConfig)) {
-                this.sendResponse(event, {
-                    api: INBOUND_API_NAME,
-                    config: SdkConfig.get(),
-                });
-            }
         } else {
             console.warn('Widget postMessage event unhandled');
             this.sendError(event, {message: 'The postMessage was unhandled'});
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index 34f3402334..400d29a20f 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -30,8 +30,6 @@ export const DEFAULTS: ConfigOptions = {
     jitsi: {
         // Default conference domain
         preferredDomain: "jitsi.riot.im",
-        // Default Jitsi Meet API location
-        externalApiUrl: "https://jitsi.riot.im/libs/external_api.min.js",
     },
 };
 
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index d41e249a42..9fb6358c1f 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -404,7 +404,6 @@ export default class WidgetUtils {
         // widgets from at all, but it probably makes sense for sanity.
         if (appType === 'jitsi') {
             capWhitelist.push(Capability.AlwaysOnScreen);
-            capWhitelist.push(Capability.GetRiotWebConfig);
         }
 
         return capWhitelist;
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index d6d1c79a99..05237d258f 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -23,7 +23,6 @@ export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
-    GetRiotWebConfig = "im.vector.web.riot_config",
 }
 
 export enum KnownWidgetActions {
@@ -34,7 +33,6 @@ export enum KnownWidgetActions {
     UpdateVisibility = "visibility",
     ReceiveOpenIDCredentials = "openid_credentials",
     SetAlwaysOnScreen = "set_always_on_screen",
-    GetRiotWebConfig = "im.vector.web.riot_config",
     ClientReady = "im.vector.ready",
 }
 
@@ -157,12 +155,4 @@ export class WidgetApi {
             resolve(); // SetAlwaysOnScreen is currently fire-and-forget, but that could change.
         });
     }
-
-    public getRiotConfig(): Promise<any> {
-        return new Promise<any>(resolve => {
-            this.callAction(KnownWidgetActions.GetRiotWebConfig, {}, response => {
-                resolve(response.response.config);
-            });
-        });
-    }
 }

From 6b11ee56613448c066aa4521a46fb087dd093eab Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 09:43:04 +0000
Subject: [PATCH 1885/3235] Translated using Weblate (Russian)

Currently translated at 79.2% (1777 of 2244 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 | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c79be28838..9f06f614a0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -43,8 +43,8 @@
     "For security, this session has been signed out. Please sign in again.": "Для обеспечения безопасности ваша сессия была завершена. Пожалуйста, войдите снова.",
     "Hangup": "Повесить трубку",
     "Historical": "Архив",
-    "Homeserver is": "Домашний сервер:",
-    "Identity Server is": "Сервер идентификации:",
+    "Homeserver is": "Домашний сервер",
+    "Identity Server is": "Сервер идентификации",
     "I have verified my email address": "Я подтвердил свой email",
     "Import E2E room keys": "Импорт ключей шифрования",
     "Invalid Email Address": "Недопустимый email",
@@ -752,7 +752,7 @@
     "Messages in one-to-one chats": "Сообщения в 1:1 чатах",
     "Unavailable": "Недоступен",
     "Error saving email notification preferences": "Ошибка сохранения настроек email-уведомлений",
-    "View Decrypted Source": "Просмотр расшифрованного источника",
+    "View Decrypted Source": "Расшифрованный исходный код",
     "Failed to update keywords": "Не удалось обновить ключевые слова",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по этим ключевым словам соответствуют правилам, которые нельзя отобразить здесь:",
@@ -772,7 +772,7 @@
     "Enable notifications for this account": "Включить уведомления для этой учётной записи",
     "Invite to this community": "Пригласить в это сообщество",
     "Messages containing <span>keywords</span>": "Сообщения, содержащие определённые <span>ключевые слова</span>",
-    "View Source": "Просмотр источника",
+    "View Source": "Исходный код",
     "Tuesday": "Вторник",
     "Enter keywords separated by a comma:": "Введите ключевые слова, разделённые запятой:",
     "Search…": "Поиск…",
@@ -896,8 +896,8 @@
     "The password field must not be blank.": "Поле пароля не должно быть пустым.",
     "Call in Progress": "Выполнение вызова",
     "A call is already in progress!": "Вызов выполняется!",
-    "Share Room Message": "Обмен сообщениями в комнате",
-    "Share Message": "Обмен сообщениями",
+    "Share Room Message": "Поделиться сообщением",
+    "Share Message": "Поделиться сообщением",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Вы не можете отправлять сообщения до тех пор, пока вы не примете <consentLink>наши правила и положения</consentLink>.",
     "Demote": "Понижение",
     "Demote yourself?": "Понизить самого себя?",
@@ -939,7 +939,7 @@
     "%(names)s and %(lastPerson)s are typing …": "%(names)s и %(lastPerson)s печатают…",
     "This homeserver has hit its Monthly Active User limit.": "Сервер достиг ежемесячного ограничения активных пользователей.",
     "This homeserver has exceeded one of its resource limits.": "Превышен один из лимитов на ресурсы сервера.",
-    "Unable to connect to Homeserver. Retrying...": "Невозможно соединиться с домашним сервером. Повторить",
+    "Unable to connect to Homeserver. Retrying...": "Невозможно соединиться с домашним сервером. Пробуем снова...",
     "Unrecognised address": "Нераспознанный адрес",
     "You do not have permission to invite people to this room.": "У вас нет разрешения приглашать людей в эту комнату.",
     "User %(user_id)s may or may not exist": "Пользователя %(user_id)s не существует",
@@ -992,7 +992,7 @@
     "The other party cancelled the verification.": "Другая сторона отменила проверку.",
     "Verified!": "Верифицировано!",
     "You've successfully verified this user.": "Вы успешно верифицировали этого пользователя.",
-    "Got It": "Понял",
+    "Got It": "Понятно",
     "Verify this user by confirming the following number appears on their screen.": "Верифицируйте пользователя, убедившись, что на его экране отображается следующее число.",
     "Yes": "Да",
     "No": "Нет",
@@ -1192,7 +1192,7 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Проверьте собеседника, убедившись, что на его экране отображаются следующие символы (смайлы).",
     "Unable to find a supported verification method.": "Невозможно определить поддерживаемый метод верификации.",
     "Scissors": "Ножницы",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Общение с этим пользователем зашифровано сквозным шифрованием и недоступно третьим лицам.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Защищённые сообщения с этим пользователем зашифрованы сквозным шифрованием и недоступны третьим лицам.",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Мы отправили вам сообщение для подтверждения адреса электронной почты. Пожалуйста выполните указания данные в сообщении и нажмите кнопку внизу.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? Зашифрованные сообщения будут безвозвратно утеряны при отсутствии соответствующего резервного копирования ваших ключей.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифрованные сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
@@ -1624,7 +1624,7 @@
     "Remove %(count)s messages|other": "Удалить %(count)s сообщений",
     "Remove %(count)s messages|one": "Удалить 1 сообщение",
     "Deactivate user?": "Деактивировать пользователя?",
-    "Deactivate user": "Пользователь деактивирован",
+    "Deactivate user": "Деактивировать пользователя",
     "Remove recent messages": "Удалить последние сообщения",
     "Bold": "Жирный",
     "Italics": "Курсив",
@@ -1648,7 +1648,7 @@
     "Command Help": "Помощь команды",
     "To continue you need to accept the terms of this service.": "Для продолжения Вам необходимо принять условия данного сервиса.",
     "Document": "Документ",
-    "Report Content": "Содержание отчета",
+    "Report Content": "Пожаловаться на сообщение",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Деактивация этого пользователя приведет к его выходу из системы и запрету повторного входа. Кроме того, они оставит все комнаты, в которых он участник. Это действие безповоротно. Вы уверены, что хотите деактивировать этого пользователя?",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "При попытке подтвердить приглашение была возвращена ошибка (%(errcode)s). Вы можете попробовать передать эту информацию администратору комнаты.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Это приглашение в %(roomName)s было отправлено на %(email)s, которое не связано с вашей учетной записью",
@@ -1765,12 +1765,12 @@
     "%(senderName)s placed a video call.": "%(senderName)s сделал видео вызов.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s сделал видео вызов. (не поддерживается этим браузером)",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s удалил правило, запрещающее пользователям соответствовать %(glob)s",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removed the rule banning rooms matching %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s удалил правило, банящее комнаты по шаблону %(glob)s",
     "a few seconds ago": "несколько секунд назад",
     "about a minute ago": "около минуты назад",
     "%(num)s minutes ago": "%(num)s минут назад",
     "about an hour ago": "около часа назад",
-    "%(num)s hours ago": "%(num)s часов назад ",
+    "%(num)s hours ago": "%(num)s часов назад",
     "about a day ago": "около суток назад",
     "%(num)s days ago": "%(num)s дней назад",
     "a few seconds from now": "несколько секунд назад",
@@ -1789,16 +1789,16 @@
     "Keep secret storage passphrase in memory for this session": "Храните в памяти секретную парольную фразу для этого сеанса",
     "How fast should messages be downloaded.": "Как быстро сообщения должны быть загружены.",
     "This is your list of users/servers you have blocked - don't leave the room!": "Это список пользователей/серверов, которые вы заблокировали - не покидайте комнату!",
-    "Verify this session by completing one of the following:": "Проверить эту сессию, выполнив одно из следующих действий:",
+    "Verify this session by completing one of the following:": "Проверьте эту сессию, выполнив одно из следующих действий:",
     "Scan this unique code": "Отсканируйте этот уникальный код",
     "or": "или",
     "Compare unique emoji": "Сравнитe уникальныe эмодзи",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств.",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств",
     "Start": "Начать",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Подтвердите, что смайлики, приведенные ниже, отображаются на обоих устройствах в одном и том же порядке:",
     "Verify this device by confirming the following number appears on its screen.": "Проверьте это устройство, подтвердив, что на его экране появляется следующий номер.",
-    "Waiting for %(displayName)s to verify…": "Ждите %(displayName)s, чтобы проверить...",
-    "Cancelling…": "Отменяется...",
+    "Waiting for %(displayName)s to verify…": "Ожидание %(displayName)s для проверки…",
+    "Cancelling…": "Отмена…",
     "They match": "Они совпадают",
     "They don't match": "Они не совпадают",
     "To be secure, do this in person or use a trusted way to communicate.": "Чтобы быть в безопасности, делайте это лично или используйте надежный способ связи.",
@@ -1816,5 +1816,5 @@
     "Channel: %(channelName)s": "Канал: %(channelName)s",
     "Show less": "Показать меньше",
     "Show more": "Показать больше",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved."
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Если вы не экспортируете ключи для этой комнаты и не импортируете их в будущем, смена пароля приведёт к сбросу всех ключей сквозного шифрования и сделает невозможным чтение истории чата. В будущем это будет улучшено."
 }

From 7adc9429b5f02577d29680871bdc4e6df719068b Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 09:57:51 +0000
Subject: [PATCH 1886/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9f06f614a0..fbb6392c49 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -486,7 +486,7 @@
     "Add to summary": "Добавить в сводку",
     "Failed to add the following users to the summary of %(groupId)s:": "Не удалось добавить следующих пользователей в сводку %(groupId)s:",
     "Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
-    "Room name or alias": "Название комнаты или псевдоним",
+    "Room name or alias": "Название или псевдоним комнаты",
     "Pinned Messages": "Закреплённые сообщения",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закреплённые в этой комнате сообщения.",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
@@ -1175,7 +1175,7 @@
     "Folder": "Папка",
     "Pin": "Кнопка",
     "Your keys are being backed up (the first backup could take a few minutes).": "Выполняется резервная копия ключей  (первый раз это может занять несколько минут).",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает разрешённый предел для текущего сервера",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает допустимый размер для этого сервера",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения",
     "Changes your display nickname in the current room only": "Изменяет ваш псевдоним только для текущей комнаты",
     "Gets or sets the room topic": "Читает или устанавливает тему комнаты",
@@ -1743,7 +1743,7 @@
     "Never send encrypted messages to unverified sessions from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессий из этой сессии",
     "Never send encrypted messages to unverified sessions in this room from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессии в эту комнату из этой сессии",
     "Your keys are <b>not being backed up from this session</b>.": "Ваши ключи <b>не резервируются с этой сессии</b>.",
-    "Server or user ID to ignore": "ID сервера или пользователя для игнорирования",
+    "Server or user ID to ignore": "Сервер или ID пользователя для игнорирования",
     "Subscribed lists": "Подписанные списки",
     "Subscribe": "Подписать",
     "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь",

From d565c209c811438205cb69b01bee5d8de9f6750b Mon Sep 17 00:00:00 2001
From: Alexey Murz Korepov <murznn@gmail.com>
Date: Wed, 1 Apr 2020 10:14:12 +0000
Subject: [PATCH 1887/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index fbb6392c49..a8185cef55 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1487,7 +1487,7 @@
     "<a>Log in</a> to your new account.": "<a>Войти</a> в вашу новую учётную запись.",
     "You can now close this window or <a>log in</a> to your new account.": "Вы можете закрыть это окно или <a>войти</a> в вашу новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
-    "Changes your avatar in all rooms": "Изменить Ваш аватар во всех комнатах",
+    "Changes your avatar in all rooms": "Изменяет Ваш аватар во всех комнатах",
     "%(senderName)s made no change.": "%(senderName)s не внёс изменений.",
     "Loading room preview": "Загрузка предпросмотра комнаты",
     "Show all": "Показать все",

From 07d817e8e0f2337a7bfe4e4c944b6e820e19db5f Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 10:14:22 +0000
Subject: [PATCH 1888/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a8185cef55..9f5b6aa6bd 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1245,7 +1245,7 @@
     "No homeserver URL provided": "URL-адрес домашнего сервера не указан",
     "Unexpected error resolving homeserver configuration": "Неожиданная ошибка в настройках домашнего сервера",
     "The user's homeserver does not support the version of the room.": "Домашний сервер пользователя не поддерживает версию комнаты.",
-    "Show read receipts sent by other users": "Показать подтверждение прочтения, отправленные другими пользователями",
+    "Show read receipts sent by other users": "Показать отметки о прочтении, посылаемые другими пользователями",
     "Show hidden events in timeline": "Показать скрытые события в хронологии",
     "When rooms are upgraded": "При обновлении комнат",
     "<a>Upgrade</a> to your own domain": "<a>Обновление</a> до собственного домена",
@@ -1254,7 +1254,7 @@
     "Upgrade this room to the recommended room version": "Обновите комнату до рекомендованной версии",
     "this room": "эта комната",
     "View older messages in %(roomName)s.": "Просмотр старых сообщений в %(roomName)s.",
-    "Change history visibility": "Изменить отображения истории",
+    "Change history visibility": "Изменить видимость истории",
     "Change topic": "Изменить тему",
     "Modify widgets": "Изменить виджеты",
     "Invite users": "Пригласить пользователей",
@@ -1487,7 +1487,7 @@
     "<a>Log in</a> to your new account.": "<a>Войти</a> в вашу новую учётную запись.",
     "You can now close this window or <a>log in</a> to your new account.": "Вы можете закрыть это окно или <a>войти</a> в вашу новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
-    "Changes your avatar in all rooms": "Изменяет Ваш аватар во всех комнатах",
+    "Changes your avatar in all rooms": "Изменяет ваш аватар во всех комнатах",
     "%(senderName)s made no change.": "%(senderName)s не внёс изменений.",
     "Loading room preview": "Загрузка предпросмотра комнаты",
     "Show all": "Показать все",

From 322b36771fa3c650a076cffe04be5bd25b6c4359 Mon Sep 17 00:00:00 2001
From: Vladimir Hodakov <vladimir@hodakov.me>
Date: Wed, 1 Apr 2020 10:14:54 +0000
Subject: [PATCH 1889/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9f5b6aa6bd..f54694150b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -116,7 +116,7 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s вошел(-ла) в комнату.",
+    "%(targetName)s joined the room.": "К комнате присоединяется %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",

From 6f82149824057c8a6033664f99deb10226ff397e Mon Sep 17 00:00:00 2001
From: progserega <progserega@gmail.com>
Date: Wed, 1 Apr 2020 10:17:35 +0000
Subject: [PATCH 1890/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f54694150b..ae2bc23e53 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1261,7 +1261,7 @@
     "Kick users": "Выгнать пользователей",
     "Ban users": "Запрет пользователей",
     "Send %(eventType)s events": "Отправить %(eventType)s события",
-    "Select the roles required to change various parts of the room": "Выбор ролей, необходимых для изменения различных частей комнат",
+    "Select the roles required to change various parts of the room": "Выберите роли, которые смогут изменять различные части комнаты",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Включенное шифрование комнаты не может быть отключено. Сообщения, отправленные в зашифрованном помещении, не могут быть просмотрены сервером, только участниками комнаты. Включение шифрования может помешать нормальной работе многих ботов и мостов. <a>Узнайте больше о шифровании.</a>",
     "To link to this room, please add an alias.": "Чтобы связаться с этой комнатой, пожалуйста, добавьте псевдоним.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",

From a2f92e93a7eb3f4f577efeae739d3a70a33727fb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:18:45 +0100
Subject: [PATCH 1891/3235] Use URL without wurl params for popout

The popout can't be assumed to have the widget API available, so
just leave these params out.
---
 src/components/views/elements/AppTile.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 1eb4e5bf90..329e5e6707 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -583,17 +583,17 @@ export default class AppTile extends React.Component {
             url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
             url = this._addWurlParams(url);
         } else {
-            url = this._getSafeUrl();
+            url = this._getSafeUrl(this.state.widgetUrl);
         }
         return this._templatedUrl(url);
     }
 
     _getPopoutUrl() {
-        return this._templatedUrl(this._getSafeUrl());
+        return this._templatedUrl(this._getSafeUrl(this.props.app.url));
     }
 
-    _getSafeUrl() {
-        const parsedWidgetUrl = url.parse(this.state.widgetUrl, true);
+    _getSafeUrl(u) {
+        const parsedWidgetUrl = url.parse(u, true);
         if (ENABLE_REACT_PERF) {
             parsedWidgetUrl.search = null;
             parsedWidgetUrl.query.react_perf = true;

From f47f7a3ac1f9dd63da50be6ee4a981075920cb03 Mon Sep 17 00:00:00 2001
From: progserega <progserega@gmail.com>
Date: Wed, 1 Apr 2020 10:18:08 +0000
Subject: [PATCH 1892/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ae2bc23e53..899af017c2 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1262,7 +1262,7 @@
     "Ban users": "Запрет пользователей",
     "Send %(eventType)s events": "Отправить %(eventType)s события",
     "Select the roles required to change various parts of the room": "Выберите роли, которые смогут изменять различные части комнаты",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Включенное шифрование комнаты не может быть отключено. Сообщения, отправленные в зашифрованном помещении, не могут быть просмотрены сервером, только участниками комнаты. Включение шифрования может помешать нормальной работе многих ботов и мостов. <a>Узнайте больше о шифровании.</a>",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "После включения шифрования в комнате - оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам или мостам. <a>Узнать больше о шифровании.</a>\n",
     "To link to this room, please add an alias.": "Чтобы связаться с этой комнатой, пожалуйста, добавьте псевдоним.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s включено для %(groups)s в этой комнате.",

From e5bfa8a85b08dce55be5333edcd8dbf565e42041 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 10:18:51 +0000
Subject: [PATCH 1893/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 899af017c2..5dd450a5c7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1262,8 +1262,8 @@
     "Ban users": "Запрет пользователей",
     "Send %(eventType)s events": "Отправить %(eventType)s события",
     "Select the roles required to change various parts of the room": "Выберите роли, которые смогут изменять различные части комнаты",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "После включения шифрования в комнате - оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам или мостам. <a>Узнать больше о шифровании.</a>\n",
-    "To link to this room, please add an alias.": "Чтобы связаться с этой комнатой, пожалуйста, добавьте псевдоним.",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "После включения шифрования в комнате оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам и мостам. <a>Подробнее о шифровании.</a>",
+    "To link to this room, please add an alias.": "Для ссылки на эту комнату, пожалуйста, добавьте псевдоним.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s включено для %(groups)s в этой комнате.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s выключено для %(groups)s в этой комнате.",
@@ -1295,7 +1295,7 @@
     "Try again later, or ask a room admin to check if you have access.": "Повторите попытку позже или попросите администратора комнаты проверить, есть ли у вас доступ.",
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s был возвращен при попытке доступа в комнату. Если вы считаете, что видите это сообщение по ошибке, пожалуйста, <issueLink> отправьте отчет об ошибке </issueLink>.",
     "Never lose encrypted messages": "Никогда не теряйте зашифрованные сообщения",
-    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Сообщения в этой комнате защищены сквозным шифрованием. Только вы и получатель(и) имеют ключи для чтения этих сообщений.",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Сообщения в этой комнате защищены сквозным шифрованием. Только у вас и получателя(ей) есть ключи для чтения этих сообщений.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Надежно сохраните резервную копию ключей, чтобы не потерять их. <a>Подробнее</a>",
     "Don't ask me again": "Не спрашивай меня больше",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновление этой комнаты отключит текущий экземпляр комнаты и создаст обновлённую комнату с тем же именем.",

From 4d2efe213869add20ff9c178a25f77423054e40a Mon Sep 17 00:00:00 2001
From: i47320673 <alexeya@list.ru>
Date: Wed, 1 Apr 2020 10:21:34 +0000
Subject: [PATCH 1894/3235] Translated using Weblate (Russian)

Currently translated at 79.3% (1779 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5dd450a5c7..edc8397a8f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1297,7 +1297,7 @@
     "Never lose encrypted messages": "Никогда не теряйте зашифрованные сообщения",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Сообщения в этой комнате защищены сквозным шифрованием. Только у вас и получателя(ей) есть ключи для чтения этих сообщений.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Надежно сохраните резервную копию ключей, чтобы не потерять их. <a>Подробнее</a>",
-    "Don't ask me again": "Не спрашивай меня больше",
+    "Don't ask me again": "Больше не спрашивать",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновление этой комнаты отключит текущий экземпляр комнаты и создаст обновлённую комнату с тем же именем.",
     "This room has already been upgraded.": "Эта комната уже была обновлена.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Эта комната работает под управлением версии комнаты <roomVersion />, которую этот сервер пометил как <i>unstable</i>.",

From 9b4ce02eaff3adee44cf63cc59623eb3af7ed292 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:28:02 +0100
Subject: [PATCH 1895/3235] lint

---
 src/FromWidgetPostMessageApi.js          | 3 +--
 src/components/views/elements/AppTile.js | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 2811358a36..3c4494c09d 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -24,8 +24,7 @@ import {MatrixClientPeg} from "./MatrixClientPeg";
 import RoomViewStore from "./stores/RoomViewStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore from "./settings/SettingsStore";
-import {Capability, KnownWidgetActions} from "./widgets/WidgetApi";
-import SdkConfig from "./SdkConfig";
+import {Capability} from "./widgets/WidgetApi";
 
 const WIDGET_API_VERSION = '0.0.2'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 329e5e6707..ef69acb1fb 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -541,6 +541,8 @@ export default class AppTile extends React.Component {
     /**
      * Replace the widget template variables in a url with their values
      *
+     * @param {string} u The URL with template variables
+     *
      * @returns {string} url with temlate variables replaced
      */
     _templatedUrl(u) {

From 072d9f12c73af40fa129569050d6b5ffb028fab3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:41:32 +0100
Subject: [PATCH 1896/3235] Remove unintentional changes

---
 src/utils/AutoDiscoveryUtils.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 5114fa278f..328aa9c776 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -22,7 +22,6 @@ import {makeType} from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
 
 const LIVELINESS_DISCOVERY_ERRORS = [
-    AutoDiscovery.ERROR_INVALID,
     AutoDiscovery.ERROR_INVALID_HOMESERVER,
     AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
 ];
@@ -233,8 +232,8 @@ export default class AutoDiscoveryUtils {
         const preferredHomeserverUrl = hsResult["base_url"];
         let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
 
-        const url = preferredHomeserverUrl ? new URL(preferredHomeserverUrl) : null;
-        if (!preferredHomeserverName && url) preferredHomeserverName = url.hostname;
+        const url = new URL(preferredHomeserverUrl);
+        if (!preferredHomeserverName) preferredHomeserverName = url.hostname;
 
         // It should have been set by now, so check it
         if (!preferredHomeserverName) {
@@ -242,12 +241,10 @@ export default class AutoDiscoveryUtils {
             throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
         }
 
-        const hsNameIsDifferent = url ? (url.hostname !== preferredHomeserverName) : null;
-
         return makeType(ValidatedServerConfig, {
             hsUrl: preferredHomeserverUrl,
             hsName: preferredHomeserverName,
-            hsNameIsDifferent,
+            hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,

From 7792cb8b9bc1d168a46717784984510c0a8ee98e Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Wed, 1 Apr 2020 10:15:10 +0000
Subject: [PATCH 1897/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 47.3% (1062 of 2244 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 433c650de6..e18dafdc5d 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1066,5 +1066,8 @@
     "Esc": "Esc",
     "Enter": "Send",
     "Space": "Mellomrom",
-    "End": "Slutt"
+    "End": "Slutt",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Hvis du støter på noen programfeil eller har tilbakemeldinger som du vil dele, vennligst fortell oss om det på GitHub.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "For å unngå å lage duplikatrapporter, vennligst <existingIssuesLink>sjekk gjennom de eksisterende sakene</existingIssuesLink> først (og gi en tommel opp), eller <newIssueLink>opprett en ny saksrapport</newIssueLink> dersom du ikke finner noen tilsvarende saker.",
+    "Report bugs & give feedback": "Meld ifra om feil og gi tilbakemeldinger"
 }

From 91365a1e1a2792e7ee312aba0d4c9b005bda0e54 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 10:23:08 +0000
Subject: [PATCH 1898/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 57 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index edc8397a8f..4c0f5ed19b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1764,8 +1764,8 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s сделал голосовой вызов. (не поддерживается этим браузером)",
     "%(senderName)s placed a video call.": "%(senderName)s сделал видео вызов.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s сделал видео вызов. (не поддерживается этим браузером)",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s удалил правило, запрещающее пользователям соответствовать %(glob)s",
-    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s удалил правило, банящее комнаты по шаблону %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s удалил(а) правило блокировки пользователей по шаблону %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s удалил правило блокировки комнат по шаблону %(glob)s",
     "a few seconds ago": "несколько секунд назад",
     "about a minute ago": "около минуты назад",
     "%(num)s minutes ago": "%(num)s минут назад",
@@ -1816,5 +1816,56 @@
     "Channel: %(channelName)s": "Канал: %(channelName)s",
     "Show less": "Показать меньше",
     "Show more": "Показать больше",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Если вы не экспортируете ключи для этой комнаты и не импортируете их в будущем, смена пароля приведёт к сбросу всех ключей сквозного шифрования и сделает невозможным чтение истории чата. В будущем это будет улучшено."
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Если вы не экспортируете ключи для этой комнаты и не импортируете их в будущем, смена пароля приведёт к сбросу всех ключей сквозного шифрования и сделает невозможным чтение истории чата. В будущем это будет улучшено.",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Используете ли вы Riot на устройстве с тач-дисплеем в качестве основного способа ввода",
+    "Whether you're using Riot as an installed Progressive Web App": "Используете ли вы Riot в виде установленного прогрессивного веб-приложения",
+    "Your user agent": "Ваш юзер-агент",
+    "The information being sent to us to help make Riot better includes:": "Информация, которая отправляется нам для улучшения Riot, включает в себя:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В комнате присутствуют неизвестные сессии: если вы продолжите без подтверждения, возможно, кто-то сможет подслушать ваш звонок.",
+    "Review Sessions": "Просмотреть сессии",
+    "Unverified login. Was this you?": "Неподтверждённый вход. Это были вы?",
+    "Sign In or Create Account": "Войти или создать аккаунт",
+    "Use your account or create a new one to continue.": "Воспользуйтесь своим аккаунтом или создайте новый, чтобы продолжить.",
+    "Create Account": "Создать аккаунт",
+    "Sends a message as html, without interpreting it as markdown": "Отправить сообщение как html, не интерпретируя его как markdown",
+    "Displays information about a user": "Показать информацию о пользователе",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s изменил(а) название комнаты с %(oldRoomName)s на %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s добавил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s удалил(а) альтернативные адреса %(addresses)s для этой комнаты.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s изменил(а) альтернативные адреса для этой комнаты.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s изменил(а) главный и альтернативные адреса для этой комнаты.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s изменил(а) адреса для этой комнаты.",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s удалил(а) правило блокировки серверов по шаблону %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s удалил(а) правило блокировки по шаблону %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s обновил(а) неверное правило блокировки",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s обновил(а) правило блокировки пользователей по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s обновил(а) правило блокировки комнат по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s обновил(а) правило блокировки серверов по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s обновил(а) правило блокировки по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s создал(а) правило блокировки пользователей по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s создал(а) правило блокировки комнат по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s создал(а) правило блокировки серверов по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s создал(а) правило блокировки по шаблону %(glob)s за %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s изменил(а) правило блокировки пользователей по шаблону %(oldGlob)s на шаблон %(newGlob)s за %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s изменил(а) правило блокировки комнат по шаблону %(oldGlob)s на шаблон %(newGlob)s за %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s изменил(а) правило блокировки серверов по шаблону %(oldGlob)s на шаблон %(newGlob)s за %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s обновил(а) правило блокировки по шаблону %(oldGlob)s на шаблон %(newGlob)s за %(reason)s",
+    "Not Trusted": "Недоверенное",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) начал(а) новую сессию без её подтверждения:",
+    "Ask this user to verify their session, or manually verify it below.": "Попросите этого пользователя подтвердить сессию или подтвердите её вручную ниже.",
+    "Manually Verify by Text": "Ручная проверка с помощью текста",
+    "Interactively verify by Emoji": "Интерактивная проверка со смайлами",
+    "Done": "Готово",
+    "The message you are trying to send is too large.": "Ваше сообщение слишком большое.",
+    "Support adding custom themes": "Поддержка сторонних тем",
+    "Order rooms by name": "Сортировать комнаты по названию",
+    "Show rooms with unread notifications first": "Показывать в начале комнаты с непрочитанными уведомлениями",
+    "Show shortcuts to recently viewed rooms above the room list": "Показывать ссылки на недавние комнаты над списком комнат",
+    "Manually verify all remote sessions": "Подтверждать все удалённые сессии вручную",
+    "Update your secure storage": "Обновите ваше безопасное хранилище",
+    "Your homeserver does not support cross-signing.": "Ваш домашний сервер не поддерживает кросс-подпись.",
+    "Cross-signing and secret storage are enabled.": "Кросс-подпись и хранилище секретов разрешены.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Попробуйте экспериментальные возможности. <a>Подробнее</a>."
 }

From 4a4a13ac75574f1aefcb2d9a45819a4bc50f555d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 12:21:18 +0100
Subject: [PATCH 1899/3235] Fix UserInfo e2e buttons to match Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss      | 23 ++++++++++++++++---
 .../views/dialogs/DeviceVerifyDialog.js       |  1 +
 .../views/dialogs/IncomingSasDialog.js        |  3 ++-
 .../dialogs/VerificationRequestDialog.js      |  1 +
 .../views/right_panel/EncryptionPanel.js      |  4 +++-
 .../views/right_panel/VerificationPanel.js    |  1 +
 .../views/verification/VerificationShowSas.js | 12 +++++++++-
 7 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 0e4b1bda9e..fab930b1cf 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -266,12 +266,29 @@ limitations under the License.
         }
     }
 
+    .mx_AccessibleButton {
+        &.mx_AccessibleButton_kind_primary {
+            color: $accent-color;
+            background-color: $accent-bg-color;
+        }
+
+        &.mx_AccessibleButton_kind_danger {
+            color: $notice-primary-color;
+            background-color: $notice-primary-bg-color;
+        }
+    }
+
+    .mx_VerificationShowSas .mx_AccessibleButton,
     .mx_UserInfo_wideButton {
         display: block;
-        margin: 16px 0;
+        margin: 16px 0 8px;
     }
-    button.mx_UserInfo_wideButton {
-        width: 100%; // FIXME get rid of this once we get rid of DialogButtons here
+
+
+    .mx_VerificationShowSas {
+        .mx_AccessibleButton + .mx_AccessibleButton {
+            margin: 8px 0; // space between buttons
+        }
     }
 }
 
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index f7826b9c27..39e391269c 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -279,6 +279,7 @@ export default class DeviceVerifyDialog extends React.Component {
             onDone={this._onSasMatchesClick}
             isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
             onStartEmoji={this._onUseSasClick}
+            inDialog={true}
         />;
     }
 
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index c612043919..2a4ff9cec3 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -196,7 +196,8 @@ export default class IncomingSasDialog extends React.Component {
             sas={this._showSasEvent.sas}
             onCancel={this._onCancelClick}
             onDone={this._onSasMatchesClick}
-            isSelf={this.props.verifier.userId == MatrixClientPeg.get().getUserId()}
+            isSelf={this.props.verifier.userId === MatrixClientPeg.get().getUserId()}
+            inDialog={true}
         />;
     }
 
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 30bff80f03..bbf3482a41 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -48,6 +48,7 @@ export default class VerificationRequestDialog extends React.Component {
                 verificationRequestPromise={this.props.verificationRequestPromise}
                 onClose={this.props.onFinished}
                 member={member}
+                inDialog={true}
             />
         </BaseDialog>;
     }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 2c51662111..6f884c4abf 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -31,7 +31,7 @@ import {_t} from "../../../languageHandler";
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
 const EncryptionPanel = (props) => {
-    const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted} = props;
+    const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted, inDialog} = props;
     const [request, setRequest] = useState(verificationRequest);
     // state to show a spinner immediately after clicking "start verification",
     // before we have a request
@@ -133,6 +133,7 @@ const EncryptionPanel = (props) => {
                 member={member}
                 request={request}
                 key={request.channel.transactionId}
+                inDialog={inDialog}
                 phase={phase} />
         </React.Fragment>);
     }
@@ -142,6 +143,7 @@ EncryptionPanel.propTypes = {
     onClose: PropTypes.func.isRequired,
     verificationRequest: PropTypes.object,
     layout: PropTypes.string,
+    inDialog: PropTypes.bool,
 };
 
 export default EncryptionPanel;
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 1cb2737005..7ba1fb829a 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -245,6 +245,7 @@ export default class VerificationPanel extends React.PureComponent {
                             sas={this.state.sasEvent.sas}
                             onCancel={this._onSasMismatchesClick}
                             onDone={this._onSasMatchesClick}
+                            inDialog={this.props.inDialog}
                         />
                     </div>;
                 } else {
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index e640a75129..9b4ea4f2bd 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -33,6 +33,7 @@ export default class VerificationShowSas extends React.Component {
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
         isSelf: PropTypes.bool,
+        inDialog: PropTypes.bool, // whether this component is being shown in a dialog and to use DialogButtons
     };
 
     constructor(props) {
@@ -112,7 +113,7 @@ export default class VerificationShowSas extends React.Component {
                 text = _t("Cancelling…");
             }
             confirm = <PendingActionSpinner text={text} />;
-        } else {
+        } else if (this.props.inDialog) {
             // FIXME: stop using DialogButtons here once this component is only used in the right panel verification
             confirm = <DialogButtons
                 primaryButton={_t("They match")}
@@ -122,6 +123,15 @@ export default class VerificationShowSas extends React.Component {
                 onCancel={this.onDontMatchClick}
                 cancelButtonClass="mx_UserInfo_wideButton"
             />;
+        } else {
+            confirm = <React.Fragment>
+                <AccessibleButton onClick={this.onMatchClick} kind="primary">
+                    { _t("They match") }
+                </AccessibleButton>
+                <AccessibleButton onClick={this.onDontMatchClick} kind="danger">
+                    { _t("They don't match") }
+                </AccessibleButton>
+            </React.Fragment>;
         }
 
         return <div className="mx_VerificationShowSas">

From 759de88b43ee620fbd0b50f85736bc76adc3de65 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 12:25:48 +0100
Subject: [PATCH 1900/3235] match padding too

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

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index fab930b1cf..d0e13aa06b 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -267,6 +267,8 @@ limitations under the License.
     }
 
     .mx_AccessibleButton {
+        padding: 8px 18px;
+
         &.mx_AccessibleButton_kind_primary {
             color: $accent-color;
             background-color: $accent-bg-color;

From 6293684218474e3f8a005edad702baa83fcc0eea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 12:57:28 +0100
Subject: [PATCH 1901/3235] Fix Room Settings Dialog Notifications tab icon

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_RoomSettingsDialog.scss     | 4 ++++
 src/components/views/dialogs/RoomSettingsDialog.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 2a4e62f9aa..3751c15643 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -29,6 +29,10 @@ limitations under the License.
     mask-image: url('$(res)/img/feather-customised/users-sm.svg');
 }
 
+.mx_RoomSettingsDialog_notificationsIcon::before {
+    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+}
+
 .mx_RoomSettingsDialog_bridgesIcon::before {
     // This icon is pants, please improve :)
     mask-image: url('$(res)/img/feather-customised/bridge.svg');
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 76faf60eef..96fb23cee2 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -72,7 +72,7 @@ export default class RoomSettingsDialog extends React.Component {
         ));
         tabs.push(new Tab(
             _td("Notifications"),
-            "mx_RoomSettingsDialog_rolesIcon",
+            "mx_RoomSettingsDialog_notificationsIcon",
             <NotificationSettingsTab roomId={this.props.roomId} />,
         ));
 

From 6df4a44cc1cdae510fcc961f2af1f20fb960caed Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 10:00:33 +0100
Subject: [PATCH 1902/3235] Better support for widgets overriding their URLs

Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
---
 src/components/views/elements/AppTile.js      | 172 ++++++++++++------
 .../views/elements/PersistentApp.js           |   8 +-
 src/components/views/rooms/AppsDrawer.js      |   6 +-
 src/components/views/rooms/Stickerpicker.js   |  13 +-
 src/utils/AutoDiscoveryUtils.js               |   9 +-
 src/utils/WidgetUtils.js                      |  58 ------
 6 files changed, 135 insertions(+), 131 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0a8bf7443b..1eb4e5bf90 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -2,6 +2,7 @@
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,12 +42,30 @@ import PersistedElement from "./PersistedElement";
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
 
+/**
+ * Does template substitution on a URL (or any string). Variables will be
+ * passed through encodeURIComponent.
+ * @param {string} uriTemplate The path with template variables e.g. '/foo/$bar'.
+ * @param {Object} variables The key/value pairs to replace the template
+ * variables with. E.g. { '$bar': 'baz' }.
+ * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
+ */
+function uriFromTemplate(uriTemplate, variables) {
+    let out = uriTemplate;
+    for (const [key, val] of Object.entries(variables)) {
+        out = out.replace(
+            '$' + key, encodeURIComponent(val),
+        );
+    }
+    return out;
+}
+
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
 
         // The key used for PersistedElement
-        this._persistKey = 'widget_' + this.props.id;
+        this._persistKey = 'widget_' + this.props.app.id;
 
         this.state = this._getNewState(props);
 
@@ -78,7 +97,7 @@ export default class AppTile extends React.Component {
         // This is a function to make the impact of calling SettingsStore slightly less
         const hasPermissionToLoad = () => {
             const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", newProps.room.roomId);
-            return !!currentlyAllowedWidgets[newProps.eventId];
+            return !!currentlyAllowedWidgets[newProps.app.eventId];
         };
 
         const PersistedElement = sdk.getComponent("elements.PersistedElement");
@@ -86,7 +105,7 @@ export default class AppTile extends React.Component {
             initialising: true, // True while we are mangling the widget URL
             // True while the iframe content is loading
             loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
-            widgetUrl: this._addWurlParams(newProps.url),
+            widgetUrl: this._addWurlParams(newProps.app.url),
             // Assume that widget has permission to load if we are the user who
             // added it to the room, or if explicitly granted by the user
             hasPermissionToLoad: newProps.userId === newProps.creatorUserId || hasPermissionToLoad(),
@@ -103,7 +122,7 @@ export default class AppTile extends React.Component {
      * @return {Boolean}            True if capability supported
      */
     _hasCapability(capability) {
-        return ActiveWidgetStore.widgetHasCapability(this.props.id, capability);
+        return ActiveWidgetStore.widgetHasCapability(this.props.app.id, capability);
     }
 
     /**
@@ -125,7 +144,7 @@ export default class AppTile extends React.Component {
 
         const params = qs.parse(u.query);
         // Append widget ID to query parameters
-        params.widgetId = this.props.id;
+        params.widgetId = this.props.app.id;
         // Append current / parent URL, minus the hash because that will change when
         // we view a different room (ie. may change for persistent widgets)
         params.parentUrl = window.location.href.split('#', 2)[0];
@@ -137,11 +156,11 @@ export default class AppTile extends React.Component {
 
     isMixedContent() {
         const parentContentProtocol = window.location.protocol;
-        const u = url.parse(this.props.url);
+        const u = url.parse(this.props.app.url);
         const childContentProtocol = u.protocol;
         if (parentContentProtocol === 'https:' && childContentProtocol !== 'https:') {
             console.warn("Refusing to load mixed-content app:",
-            parentContentProtocol, childContentProtocol, window.location, this.props.url);
+            parentContentProtocol, childContentProtocol, window.location, this.props.app.url);
             return true;
         }
         return false;
@@ -164,8 +183,8 @@ export default class AppTile extends React.Component {
         dis.unregister(this.dispatcherRef);
 
         // if it's not remaining on screen, get rid of the PersistedElement container
-        if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
-            ActiveWidgetStore.destroyPersistentWidget(this.props.id);
+        if (!ActiveWidgetStore.getWidgetPersistence(this.props.app.id)) {
+            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
             const PersistedElement = sdk.getComponent("elements.PersistedElement");
             PersistedElement.destroyElement(this._persistKey);
         }
@@ -176,11 +195,11 @@ export default class AppTile extends React.Component {
      * Component initialisation is only complete when this function has resolved
      */
     setScalarToken() {
-        if (!WidgetUtils.isScalarUrl(this.props.url)) {
+        if (!WidgetUtils.isScalarUrl(this.props.app.url)) {
             console.warn('Non-scalar widget, not setting scalar token!', url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -191,7 +210,7 @@ export default class AppTile extends React.Component {
             console.warn("No integration manager - not setting scalar token", url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -204,7 +223,7 @@ export default class AppTile extends React.Component {
             console.warn('Non-scalar manager, not setting scalar token!', url);
             this.setState({
                 error: null,
-                widgetUrl: this._addWurlParams(this.props.url),
+                widgetUrl: this._addWurlParams(this.props.app.url),
                 initialising: false,
             });
             return;
@@ -217,7 +236,7 @@ export default class AppTile extends React.Component {
         this._scalarClient.getScalarToken().then((token) => {
             // Append scalar_token as a query param if not already present
             this._scalarClient.scalarToken = token;
-            const u = url.parse(this._addWurlParams(this.props.url));
+            const u = url.parse(this._addWurlParams(this.props.app.url));
             const params = qs.parse(u.query);
             if (!params.scalar_token) {
                 params.scalar_token = encodeURIComponent(token);
@@ -246,7 +265,7 @@ export default class AppTile extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (nextProps.url !== this.props.url) {
+        if (nextProps.app.url !== this.props.app.url) {
             this._getNewState(nextProps);
             // Fetch IM token for new URL if we're showing and have permission to load
             if (this.props.show && this.state.hasPermissionToLoad) {
@@ -280,7 +299,7 @@ export default class AppTile extends React.Component {
     }
 
     _onEditClick() {
-        console.log("Edit widget ID ", this.props.id);
+        console.log("Edit widget ID ", this.props.app.id);
         if (this.props.onEditClick) {
             this.props.onEditClick();
         } else {
@@ -289,13 +308,13 @@ export default class AppTile extends React.Component {
                 IntegrationManagers.sharedInstance().openAll(
                     this.props.room,
                     'type_' + this.props.type,
-                    this.props.id,
+                    this.props.app.id,
                 );
             } else {
                 IntegrationManagers.sharedInstance().getPrimaryManager().open(
                     this.props.room,
                     'type_' + this.props.type,
-                    this.props.id,
+                    this.props.app.id,
                 );
             }
         }
@@ -303,7 +322,7 @@ export default class AppTile extends React.Component {
 
     _onSnapshotClick() {
         console.warn("Requesting widget snapshot");
-        ActiveWidgetStore.getWidgetMessaging(this.props.id).getScreenshot()
+        ActiveWidgetStore.getWidgetMessaging(this.props.app.id).getScreenshot()
             .catch((err) => {
                 console.error("Failed to get screenshot", err);
             })
@@ -351,7 +370,7 @@ export default class AppTile extends React.Component {
 
                     WidgetUtils.setRoomWidget(
                         this.props.room.roomId,
-                        this.props.id,
+                        this.props.app.id,
                     ).catch((e) => {
                         console.error('Failed to delete widget', e);
                         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -369,7 +388,7 @@ export default class AppTile extends React.Component {
     }
 
     _onRevokeClicked() {
-        console.info("Revoke widget permissions - %s", this.props.id);
+        console.info("Revoke widget permissions - %s", this.props.app.id);
         this._revokeWidgetPermission();
     }
 
@@ -380,10 +399,10 @@ export default class AppTile extends React.Component {
         // Destroy the old widget messaging before starting it back up again. Some widgets
         // have startup routines that run when they are loaded, so we just need to reinitialize
         // the messaging for them.
-        ActiveWidgetStore.delWidgetMessaging(this.props.id);
+        ActiveWidgetStore.delWidgetMessaging(this.props.app.id);
         this._setupWidgetMessaging();
 
-        ActiveWidgetStore.setRoomId(this.props.id, this.props.room.roomId);
+        ActiveWidgetStore.setRoomId(this.props.app.id, this.props.room.roomId);
         this.setState({loading: false});
     }
 
@@ -391,10 +410,10 @@ export default class AppTile extends React.Component {
         // FIXME: There's probably no reason to do this here: it should probably be done entirely
         // in ActiveWidgetStore.
         const widgetMessaging = new WidgetMessaging(
-            this.props.id, this.props.url, this.props.userWidget, this._appFrame.current.contentWindow);
-        ActiveWidgetStore.setWidgetMessaging(this.props.id, widgetMessaging);
+            this.props.app.id, this._getRenderedUrl(), this.props.userWidget, this._appFrame.current.contentWindow);
+        ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
-            console.log(`Widget ${this.props.id} requested capabilities: ` + requestedCapabilities);
+            console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);
             requestedCapabilities = requestedCapabilities || [];
 
             // Allow whitelisted capabilities
@@ -406,7 +425,7 @@ export default class AppTile extends React.Component {
                 }, this.props.whitelistCapabilities);
 
                 if (requestedWhitelistCapabilies.length > 0 ) {
-                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties: ` +
+                    console.warn(`Widget ${this.props.app.id} allowing requested, whitelisted properties: ` +
                         requestedWhitelistCapabilies,
                     );
                 }
@@ -414,7 +433,7 @@ export default class AppTile extends React.Component {
 
             // TODO -- Add UI to warn about and optionally allow requested capabilities
 
-            ActiveWidgetStore.setWidgetCapabilities(this.props.id, requestedWhitelistCapabilies);
+            ActiveWidgetStore.setWidgetCapabilities(this.props.app.id, requestedWhitelistCapabilies);
 
             if (this.props.onCapabilityRequest) {
                 this.props.onCapabilityRequest(requestedCapabilities);
@@ -422,16 +441,16 @@ export default class AppTile extends React.Component {
 
             // We only tell Jitsi widgets that we're ready because they're realistically the only ones
             // using this custom extension to the widget API.
-            if (this.props.type === 'jitsi') {
+            if (this.props.app.type === 'jitsi') {
                 widgetMessaging.flagReadyToContinue();
             }
         }).catch((err) => {
-            console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
+            console.log(`Failed to get capabilities for widget type ${this.props.app.type}`, this.props.app.id, err);
         });
     }
 
     _onAction(payload) {
-        if (payload.widgetId === this.props.id) {
+        if (payload.widgetId === this.props.app.id) {
             switch (payload.action) {
                 case 'm.sticker':
                 if (this._hasCapability('m.sticker')) {
@@ -460,9 +479,9 @@ export default class AppTile extends React.Component {
 
     _grantWidgetPermission() {
         const roomId = this.props.room.roomId;
-        console.info("Granting permission for widget to load: " + this.props.eventId);
+        console.info("Granting permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
-        current[this.props.eventId] = true;
+        current[this.props.app.eventId] = true;
         SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
             this.setState({hasPermissionToLoad: true});
 
@@ -476,14 +495,14 @@ export default class AppTile extends React.Component {
 
     _revokeWidgetPermission() {
         const roomId = this.props.room.roomId;
-        console.info("Revoking permission for widget to load: " + this.props.eventId);
+        console.info("Revoking permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
-        current[this.props.eventId] = false;
+        current[this.props.app.eventId] = false;
         SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
             this.setState({hasPermissionToLoad: false});
 
             // Force the widget to be non-persistent (able to be deleted/forgotten)
-            ActiveWidgetStore.destroyPersistentWidget(this.props.id);
+            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
             const PersistedElement = sdk.getComponent("elements.PersistedElement");
             PersistedElement.destroyElement(this._persistKey);
         }).catch(err => {
@@ -494,8 +513,8 @@ export default class AppTile extends React.Component {
 
     formatAppTileName() {
         let appTileName = "No name";
-        if (this.props.name && this.props.name.trim()) {
-            appTileName = this.props.name.trim();
+        if (this.props.app.name && this.props.app.name.trim()) {
+            appTileName = this.props.app.name.trim();
         }
         return appTileName;
     }
@@ -519,6 +538,60 @@ export default class AppTile extends React.Component {
         }
     }
 
+    /**
+     * Replace the widget template variables in a url with their values
+     *
+     * @returns {string} url with temlate variables replaced
+     */
+    _templatedUrl(u) {
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const myUser = MatrixClientPeg.get().getUser(myUserId);
+        const vars = Object.assign({
+            domain: "jitsi.riot.im", // v1 widgets have this hardcoded
+        }, this.props.app.data, {
+            'matrix_user_id': myUserId,
+            'matrix_room_id': this.props.room.roomId,
+            'matrix_display_name': myUser ? myUser.displayName : myUserId,
+            'matrix_avatar_url': myUser ? MatrixClientPeg.get().mxcUrlToHttp(myUser.avatarUrl) : '',
+
+            // TODO: Namespace themes through some standard
+            'theme': SettingsStore.getValue("theme"),
+        });
+
+        if (vars.conferenceId === undefined) {
+            // we'll need to parse the conference ID out of the URL for v1 Jitsi widgets
+            const parsedUrl = new URL(this.props.app.url);
+            vars.conferenceId = parsedUrl.searchParams.get("confId");
+        }
+
+        return uriFromTemplate(u, vars);
+    }
+
+    /**
+     * Get the URL used in the iframe
+     * In cases where we supply our own UI for a widget, this is an internal
+     * URL different to the one used if the widget is popped out to a separate
+     * tab / browser
+     *
+     * @returns {string} url
+     */
+    _getRenderedUrl() {
+        let url;
+
+        if (this.props.app.type === 'jitsi') {
+            console.log("Replacing Jitsi widget URL with local wrapper");
+            url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
+            url = this._addWurlParams(url);
+        } else {
+            url = this._getSafeUrl();
+        }
+        return this._templatedUrl(url);
+    }
+
+    _getPopoutUrl() {
+        return this._templatedUrl(this._getSafeUrl());
+    }
+
     _getSafeUrl() {
         const parsedWidgetUrl = url.parse(this.state.widgetUrl, true);
         if (ENABLE_REACT_PERF) {
@@ -526,13 +599,7 @@ export default class AppTile extends React.Component {
             parsedWidgetUrl.query.react_perf = true;
         }
         let safeWidgetUrl = '';
-        if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol) || (
-            // Check if the widget URL is a Jitsi widget in Electron
-            parsedWidgetUrl.protocol === 'vector:'
-            && parsedWidgetUrl.host === 'vector'
-            && parsedWidgetUrl.pathname === '/webapp/jitsi.html'
-            && this.props.type === 'jitsi'
-        )) {
+        if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol)) {
             safeWidgetUrl = url.format(parsedWidgetUrl);
         }
         return safeWidgetUrl;
@@ -562,9 +629,9 @@ export default class AppTile extends React.Component {
 
     _onPopoutWidgetClick() {
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
-        // window.open(this._getSafeUrl(), '_blank', 'noopener=yes');
+        // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
-            { target: '_blank', href: this._getSafeUrl(), rel: 'noreferrer noopener'}).click();
+            { target: '_blank', href: this._getPopoutUrl(), rel: 'noreferrer noopener'}).click();
     }
 
     _onReloadWidgetClick() {
@@ -641,7 +708,7 @@ export default class AppTile extends React.Component {
                             <iframe
                                 allow={iframeFeatures}
                                 ref={this._appFrame}
-                                src={this._getSafeUrl()}
+                                src={this._getRenderedUrl()}
                                 allowFullScreen={true}
                                 sandbox={sandboxFlags}
                                 onLoad={this._onLoaded} />
@@ -706,7 +773,7 @@ export default class AppTile extends React.Component {
         }
 
         return <React.Fragment>
-            <div className={appTileClass} id={this.props.id}>
+            <div className={appTileClass} id={this.props.app.id}>
                 { this.props.showMenubar &&
                 <div ref={this._menu_bar} className={menuBarClasses} onClick={this.onClickMenuBar}>
                     <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>
@@ -753,12 +820,8 @@ export default class AppTile extends React.Component {
 AppTile.displayName = 'AppTile';
 
 AppTile.propTypes = {
-    id: PropTypes.string.isRequired,
-    eventId: PropTypes.string, // required for room widgets
-    url: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
+    app: PropTypes.object.isRequired,
     room: PropTypes.object.isRequired,
-    type: PropTypes.string.isRequired,
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
     fullWidth: PropTypes.bool,
@@ -805,7 +868,6 @@ AppTile.propTypes = {
 };
 
 AppTile.defaultProps = {
-    url: "",
     waitForIframeLoad: true,
     showMenubar: true,
     showTitle: true,
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index a807ed3b93..83763f6c56 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -75,11 +75,7 @@ export default createReactClass({
                 const AppTile = sdk.getComponent('elements.AppTile');
                 return <AppTile
                     key={app.id}
-                    id={app.id}
-                    eventId={app.eventId}
-                    url={app.url}
-                    name={app.name}
-                    type={app.type}
+                    app={app}
                     fullWidth={true}
                     room={persistentWidgetInRoom}
                     userId={MatrixClientPeg.get().credentials.userId}
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f81a5630a4..2474fee4a2 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -160,11 +160,7 @@ export default createReactClass({
 
             return (<AppTile
                 key={app.id}
-                id={app.id}
-                eventId={app.eventId}
-                url={app.url}
-                name={app.name}
-                type={app.type}
+                app={app}
                 fullWidth={arr.length<2 ? true : false}
                 room={this.props.room}
                 userId={this.props.userId}
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 07e9be7a9a..da5f129a42 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -240,6 +240,14 @@ export default class Stickerpicker extends React.Component {
             // Set default name
             stickerpickerWidget.content.name = stickerpickerWidget.name || _t("Stickerpack");
 
+            // FIXME: could this use the same code as other apps?
+            const stickerApp = {
+                id: stickerpickerWidget.id,
+                url: stickerpickerWidget.content.url,
+                name: stickerpickerWidget.content.name,
+                type: stickerpickerWidget.content.type,
+            };
+
             stickersContent = (
                 <div className='mx_Stickers_content_container'>
                     <div
@@ -253,11 +261,8 @@ export default class Stickerpicker extends React.Component {
                     >
                     <PersistedElement persistKey={PERSISTED_ELEMENT_KEY} style={{zIndex: STICKERPICKER_Z_INDEX}}>
                         <AppTile
-                            id={stickerpickerWidget.id}
-                            url={stickerpickerWidget.content.url}
-                            name={stickerpickerWidget.content.name}
+                            app={stickerApp}
                             room={this.props.room}
-                            type={stickerpickerWidget.content.type}
                             fullWidth={true}
                             userId={MatrixClientPeg.get().credentials.userId}
                             creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 328aa9c776..5114fa278f 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -22,6 +22,7 @@ import {makeType} from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
 
 const LIVELINESS_DISCOVERY_ERRORS = [
+    AutoDiscovery.ERROR_INVALID,
     AutoDiscovery.ERROR_INVALID_HOMESERVER,
     AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
 ];
@@ -232,8 +233,8 @@ export default class AutoDiscoveryUtils {
         const preferredHomeserverUrl = hsResult["base_url"];
         let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
 
-        const url = new URL(preferredHomeserverUrl);
-        if (!preferredHomeserverName) preferredHomeserverName = url.hostname;
+        const url = preferredHomeserverUrl ? new URL(preferredHomeserverUrl) : null;
+        if (!preferredHomeserverName && url) preferredHomeserverName = url.hostname;
 
         // It should have been set by now, so check it
         if (!preferredHomeserverName) {
@@ -241,10 +242,12 @@ export default class AutoDiscoveryUtils {
             throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
         }
 
+        const hsNameIsDifferent = url ? (url.hostname !== preferredHomeserverName) : null;
+
         return makeType(ValidatedServerConfig, {
             hsUrl: preferredHomeserverUrl,
             hsName: preferredHomeserverName,
-            hsNameIsDifferent: url.hostname !== preferredHomeserverName,
+            hsNameIsDifferent,
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index eea995cfea..d41e249a42 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -30,26 +30,6 @@ import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {Capability} from "../widgets/WidgetApi";
 
-/**
- * Encodes a URI according to a set of template variables. Variables will be
- * passed through encodeURIComponent.
- * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
- * @param {Object} variables The key/value pairs to replace the template
- * variables with. E.g. { '$bar': 'baz' }.
- * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
- */
-function encodeUri(pathTemplate, variables) {
-    for (const key in variables) {
-        if (!variables.hasOwnProperty(key)) {
-            continue;
-        }
-        pathTemplate = pathTemplate.replace(
-            key, encodeURIComponent(variables[key]),
-        );
-    }
-    return pathTemplate;
-}
-
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
      * (Does not apply to non-room-based / user widgets)
@@ -402,18 +382,6 @@ export default class WidgetUtils {
     }
 
     static makeAppConfig(appId, app, senderUserId, roomId, eventId) {
-        const myUserId = MatrixClientPeg.get().credentials.userId;
-        const user = MatrixClientPeg.get().getUser(myUserId);
-        const params = {
-            '$matrix_user_id': myUserId,
-            '$matrix_room_id': roomId,
-            '$matrix_display_name': user ? user.displayName : myUserId,
-            '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
-
-            // TODO: Namespace themes through some standard
-            '$theme': SettingsStore.getValue("theme"),
-        };
-
         if (!senderUserId) {
             throw new Error("Widgets must be created by someone - provide a senderUserId");
         }
@@ -423,32 +391,6 @@ export default class WidgetUtils {
         app.eventId = eventId;
         app.name = app.name || app.type;
 
-        if (app.type === 'jitsi') {
-            console.log("Replacing Jitsi widget URL with local wrapper");
-            if (!app.data || !app.data.conferenceId) {
-                // Assumed to be a v1 widget: add a data object for visibility on the wrapper
-                // TODO: Remove this once mobile supports v2 widgets
-                console.log("Replacing v1 Jitsi widget with v2 equivalent");
-                const parsed = new URL(app.url);
-                app.data = {
-                    conferenceId: parsed.searchParams.get("confId"),
-                    domain: "jitsi.riot.im", // v1 widgets have this hardcoded
-                };
-            }
-
-            app.url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
-        }
-
-        if (app.data) {
-            Object.keys(app.data).forEach((key) => {
-                params['$' + key] = app.data[key];
-            });
-
-            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
-        }
-
-        app.url = encodeUri(app.url, params);
-
         return app;
     }
 

From d92a19ecffbba3572323cc836d3ad86f7393cd3c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 10:40:03 +0100
Subject: [PATCH 1903/3235] Remove get-config API

which is no longer necessary now the jitsi wrapper has its own
external-api script
---
 src/FromWidgetPostMessageApi.js |  7 -------
 src/SdkConfig.ts                |  2 --
 src/utils/WidgetUtils.js        |  1 -
 src/widgets/WidgetApi.ts        | 10 ----------
 4 files changed, 20 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index ea76c85643..2811358a36 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -220,13 +220,6 @@ export default class FromWidgetPostMessageApi {
             }
         } else if (action === 'get_openid') {
             // Handled by caller
-        } else if (action === KnownWidgetActions.GetRiotWebConfig) {
-            if (ActiveWidgetStore.widgetHasCapability(widgetId, Capability.GetRiotWebConfig)) {
-                this.sendResponse(event, {
-                    api: INBOUND_API_NAME,
-                    config: SdkConfig.get(),
-                });
-            }
         } else {
             console.warn('Widget postMessage event unhandled');
             this.sendError(event, {message: 'The postMessage was unhandled'});
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index 34f3402334..400d29a20f 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -30,8 +30,6 @@ export const DEFAULTS: ConfigOptions = {
     jitsi: {
         // Default conference domain
         preferredDomain: "jitsi.riot.im",
-        // Default Jitsi Meet API location
-        externalApiUrl: "https://jitsi.riot.im/libs/external_api.min.js",
     },
 };
 
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index d41e249a42..9fb6358c1f 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -404,7 +404,6 @@ export default class WidgetUtils {
         // widgets from at all, but it probably makes sense for sanity.
         if (appType === 'jitsi') {
             capWhitelist.push(Capability.AlwaysOnScreen);
-            capWhitelist.push(Capability.GetRiotWebConfig);
         }
 
         return capWhitelist;
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index d6d1c79a99..05237d258f 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -23,7 +23,6 @@ export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
-    GetRiotWebConfig = "im.vector.web.riot_config",
 }
 
 export enum KnownWidgetActions {
@@ -34,7 +33,6 @@ export enum KnownWidgetActions {
     UpdateVisibility = "visibility",
     ReceiveOpenIDCredentials = "openid_credentials",
     SetAlwaysOnScreen = "set_always_on_screen",
-    GetRiotWebConfig = "im.vector.web.riot_config",
     ClientReady = "im.vector.ready",
 }
 
@@ -157,12 +155,4 @@ export class WidgetApi {
             resolve(); // SetAlwaysOnScreen is currently fire-and-forget, but that could change.
         });
     }
-
-    public getRiotConfig(): Promise<any> {
-        return new Promise<any>(resolve => {
-            this.callAction(KnownWidgetActions.GetRiotWebConfig, {}, response => {
-                resolve(response.response.config);
-            });
-        });
-    }
 }

From 3087f816fea62843bd52259cdf9048cafe5a3e74 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:18:45 +0100
Subject: [PATCH 1904/3235] Use URL without wurl params for popout

The popout can't be assumed to have the widget API available, so
just leave these params out.
---
 src/components/views/elements/AppTile.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 1eb4e5bf90..329e5e6707 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -583,17 +583,17 @@ export default class AppTile extends React.Component {
             url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
             url = this._addWurlParams(url);
         } else {
-            url = this._getSafeUrl();
+            url = this._getSafeUrl(this.state.widgetUrl);
         }
         return this._templatedUrl(url);
     }
 
     _getPopoutUrl() {
-        return this._templatedUrl(this._getSafeUrl());
+        return this._templatedUrl(this._getSafeUrl(this.props.app.url));
     }
 
-    _getSafeUrl() {
-        const parsedWidgetUrl = url.parse(this.state.widgetUrl, true);
+    _getSafeUrl(u) {
+        const parsedWidgetUrl = url.parse(u, true);
         if (ENABLE_REACT_PERF) {
             parsedWidgetUrl.search = null;
             parsedWidgetUrl.query.react_perf = true;

From 293c8f0e7c2b816ab48e03850a9016cb04479431 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:28:02 +0100
Subject: [PATCH 1905/3235] lint

---
 src/FromWidgetPostMessageApi.js          | 3 +--
 src/components/views/elements/AppTile.js | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 2811358a36..3c4494c09d 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -24,8 +24,7 @@ import {MatrixClientPeg} from "./MatrixClientPeg";
 import RoomViewStore from "./stores/RoomViewStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore from "./settings/SettingsStore";
-import {Capability, KnownWidgetActions} from "./widgets/WidgetApi";
-import SdkConfig from "./SdkConfig";
+import {Capability} from "./widgets/WidgetApi";
 
 const WIDGET_API_VERSION = '0.0.2'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 329e5e6707..ef69acb1fb 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -541,6 +541,8 @@ export default class AppTile extends React.Component {
     /**
      * Replace the widget template variables in a url with their values
      *
+     * @param {string} u The URL with template variables
+     *
      * @returns {string} url with temlate variables replaced
      */
     _templatedUrl(u) {

From 2cc938a576a7f86814c2c40b4e159631aac51ba7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 11:41:32 +0100
Subject: [PATCH 1906/3235] Remove unintentional changes

---
 src/utils/AutoDiscoveryUtils.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 5114fa278f..328aa9c776 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -22,7 +22,6 @@ import {makeType} from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
 
 const LIVELINESS_DISCOVERY_ERRORS = [
-    AutoDiscovery.ERROR_INVALID,
     AutoDiscovery.ERROR_INVALID_HOMESERVER,
     AutoDiscovery.ERROR_INVALID_IDENTITY_SERVER,
 ];
@@ -233,8 +232,8 @@ export default class AutoDiscoveryUtils {
         const preferredHomeserverUrl = hsResult["base_url"];
         let preferredHomeserverName = serverName ? serverName : hsResult["server_name"];
 
-        const url = preferredHomeserverUrl ? new URL(preferredHomeserverUrl) : null;
-        if (!preferredHomeserverName && url) preferredHomeserverName = url.hostname;
+        const url = new URL(preferredHomeserverUrl);
+        if (!preferredHomeserverName) preferredHomeserverName = url.hostname;
 
         // It should have been set by now, so check it
         if (!preferredHomeserverName) {
@@ -242,12 +241,10 @@ export default class AutoDiscoveryUtils {
             throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));
         }
 
-        const hsNameIsDifferent = url ? (url.hostname !== preferredHomeserverName) : null;
-
         return makeType(ValidatedServerConfig, {
             hsUrl: preferredHomeserverUrl,
             hsName: preferredHomeserverName,
-            hsNameIsDifferent,
+            hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,

From ce68b960f4079031acd4f74e7796a2552505a5a5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 13:58:44 +0100
Subject: [PATCH 1907/3235] Use our own jitsi widget for the popout URL

rather than the URL supplied by the widget
---
 src/components/views/elements/AppTile.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ef69acb1fb..97c137074b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -591,7 +591,13 @@ export default class AppTile extends React.Component {
     }
 
     _getPopoutUrl() {
-        return this._templatedUrl(this._getSafeUrl(this.props.app.url));
+        if (this.props.app.type === 'jitsi') {
+            return WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false});
+        } else {
+            // use app.url, not state.widgetUrl, because we want the one without
+            // the wURL params for the popped-out version.
+            return this._templatedUrl(this._getSafeUrl(this.props.app.url));
+        }
     }
 
     _getSafeUrl(u) {

From 66d292f7225a31198c4321da9c9f8815ee8aeada Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 13:58:44 +0100
Subject: [PATCH 1908/3235] Use our own jitsi widget for the popout URL

rather than the URL supplied by the widget
---
 src/components/views/elements/AppTile.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ef69acb1fb..97c137074b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -591,7 +591,13 @@ export default class AppTile extends React.Component {
     }
 
     _getPopoutUrl() {
-        return this._templatedUrl(this._getSafeUrl(this.props.app.url));
+        if (this.props.app.type === 'jitsi') {
+            return WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false});
+        } else {
+            // use app.url, not state.widgetUrl, because we want the one without
+            // the wURL params for the popped-out version.
+            return this._templatedUrl(this._getSafeUrl(this.props.app.url));
+        }
     }
 
     _getSafeUrl(u) {

From bec061239a2d489a803c5cde2523ab039d7402f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 1 Apr 2020 15:17:59 +0200
Subject: [PATCH 1909/3235] EventIndex: Mark the initial checkpoints for a full
 crawl.

The logic determining if a batch of events is already in the database
has been reported to be faulty. Since we know that when we add initial
checkpoints they need to go to the start of the timeline we can mark
them to do a full crawl which will skip the test if the events are
already in the database.

This is a quick fix for this and checkpoints that are added after a gap
in the timeline might incorrectly conclude the same resulting in missing
events if there was a gap and the issue is triggered.
---
 src/indexing/EventIndex.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 14257af014..69939d0f32 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -109,6 +109,7 @@ export default class EventIndex extends EventEmitter {
                 roomId: room.roomId,
                 token: token,
                 direction: "b",
+                fullCrawl: true,
             };
 
             const forwardCheckpoint = {

From cf635c66db360378b1f8f66879203a488daa6c35 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 30 Mar 2020 10:40:26 -0600
Subject: [PATCH 1910/3235] Remove underscore from Jitsi conference names

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

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
---
 src/CallHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 362db939a3..8284e788b4 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -430,7 +430,7 @@ async function _startCallApp(roomId, type) {
         return;
     }
 
-    const confId = `JitsiConference_${generateHumanReadableId()}`;
+    const confId = `JitsiConference${generateHumanReadableId()}`;
     const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
 
     let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();

From 8aa24f898797e0f631a8576b65ebf07fc6f77bff Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 14:42:17 +0100
Subject: [PATCH 1911/3235] Fix jitsi popout URL

Needs the template variables filled in
---
 src/components/views/elements/AppTile.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 97c137074b..72d68d6f78 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -592,7 +592,9 @@ export default class AppTile extends React.Component {
 
     _getPopoutUrl() {
         if (this.props.app.type === 'jitsi') {
-            return WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false});
+            return this._templatedUrl(
+                WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
+            );
         } else {
             // use app.url, not state.widgetUrl, because we want the one without
             // the wURL params for the popped-out version.

From 666f4201dab7cf5c43ebca993f8d00888d6b7200 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:35:51 +0000
Subject: [PATCH 1912/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 4c0f5ed19b..29d1f71809 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -861,7 +861,7 @@
     "We encountered an error trying to restore your previous session.": "Произошла ошибка при попытке восстановить предыдущий сеанс.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена и зашифрованная история чата станет нечитаемой.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
-    "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
+    "Enable widget screenshots on supported widgets": "Включить скриншоты виджетов для поддерживаемых виджетов",
     "Collapse Reply Thread": "Ответить с цитированием",
     "Send analytics data": "Отправить данные аналитики",
     "Muted Users": "Приглушённые пользователи",
@@ -1245,7 +1245,7 @@
     "No homeserver URL provided": "URL-адрес домашнего сервера не указан",
     "Unexpected error resolving homeserver configuration": "Неожиданная ошибка в настройках домашнего сервера",
     "The user's homeserver does not support the version of the room.": "Домашний сервер пользователя не поддерживает версию комнаты.",
-    "Show read receipts sent by other users": "Показать отметки о прочтении, посылаемые другими пользователями",
+    "Show read receipts sent by other users": "Показывать отметки о прочтении, посылаемые другими пользователями",
     "Show hidden events in timeline": "Показать скрытые события в хронологии",
     "When rooms are upgraded": "При обновлении комнат",
     "<a>Upgrade</a> to your own domain": "<a>Обновление</a> до собственного домена",
@@ -1261,7 +1261,7 @@
     "Kick users": "Выгнать пользователей",
     "Ban users": "Запрет пользователей",
     "Send %(eventType)s events": "Отправить %(eventType)s события",
-    "Select the roles required to change various parts of the room": "Выберите роли, которые смогут изменять различные части комнаты",
+    "Select the roles required to change various parts of the room": "Выберите роли, которые смогут менять различные параметры комнаты",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "После включения шифрования в комнате оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам и мостам. <a>Подробнее о шифровании.</a>",
     "To link to this room, please add an alias.": "Для ссылки на эту комнату, пожалуйста, добавьте псевдоним.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",
@@ -1269,7 +1269,7 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s выключено для %(groups)s в этой комнате.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s включено для %(newGroups)s и отключено для %(oldGroups)s в этой комнате.",
     "Once enabled, encryption cannot be disabled.": "После включения, шифрование не может быть отключено.",
-    "This room has been replaced and is no longer active.": "Эта комната была заменена и больше не активна.",
+    "This room has been replaced and is no longer active.": "Эта комната была замещена и больше не активна.",
     "Joining room …": "Вступление в комнату …",
     "Loading …": "Загрузка…",
     "Rejecting invite …": "Отказ от приглашения …",
@@ -1296,7 +1296,7 @@
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s был возвращен при попытке доступа в комнату. Если вы считаете, что видите это сообщение по ошибке, пожалуйста, <issueLink> отправьте отчет об ошибке </issueLink>.",
     "Never lose encrypted messages": "Никогда не теряйте зашифрованные сообщения",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Сообщения в этой комнате защищены сквозным шифрованием. Только у вас и получателя(ей) есть ключи для чтения этих сообщений.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Надежно сохраните резервную копию ключей, чтобы не потерять их. <a>Подробнее</a>",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Надежно сохраните резервную копию ваших ключей, чтобы избежать их потери. <a>Подробнее</a>",
     "Don't ask me again": "Больше не спрашивать",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновление этой комнаты отключит текущий экземпляр комнаты и создаст обновлённую комнату с тем же именем.",
     "This room has already been upgraded.": "Эта комната уже была обновлена.",
@@ -1322,7 +1322,7 @@
     "Rotate clockwise": "Повернуть по часовой стрелке",
     "Edit message": "Редактировать сообщение",
     "Power level": "Уровень прав",
-    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Не удалось найти профили для Matrix ID, перечисленных ниже. Вы всё равно хотите их пригласить?",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Не удалось найти профили для перечисленных ниже Matrix ID. Вы всё равно хотите их пригласить?",
     "Invite anyway": "Пригласить в любом случае",
     "GitHub issue": "GitHub вопрос",
     "Notes": "Заметка",
@@ -1569,7 +1569,7 @@
     "Create a private room": "Создать приватную комнату",
     "Topic (optional)": "Тема (опционально)",
     "Make this room public": "Сделать комнату публичной",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Отправлять подтверждения о прочтении сообщений (требуется отключение совместимого домашнего сервера)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Отправлять подтверждения о прочтении сообщений (требуется совместимый домашний сервер для отключения)",
     "Show previews/thumbnails for images": "Показать превью / миниатюры для изображений",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Отключиться от сервера идентификации <current /> и вместо этого подключиться к <new />?",
     "Disconnect identity server": "Отключить идентификационный сервер",

From e1bc7493a7d61fd2955f50c9f64349ae4c6c35cf Mon Sep 17 00:00:00 2001
From: Valex <xvalex@mail.ru>
Date: Wed, 1 Apr 2020 13:42:49 +0000
Subject: [PATCH 1913/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 29d1f71809..5d6383be2c 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1323,7 +1323,7 @@
     "Edit message": "Редактировать сообщение",
     "Power level": "Уровень прав",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Не удалось найти профили для перечисленных ниже Matrix ID. Вы всё равно хотите их пригласить?",
-    "Invite anyway": "Пригласить в любом случае",
+    "Invite anyway": "Все равно пригласить",
     "GitHub issue": "GitHub вопрос",
     "Notes": "Заметка",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Если есть дополнительный контекст, который может помочь в анализе проблемы, такой как то, что вы делали в то время, ID комнат, ID пользователей и т. д., пожалуйста, включите эти данные.",

From 53c854efba658a7edd461e3991477fede231f2f5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Apr 2020 14:42:17 +0100
Subject: [PATCH 1914/3235] Fix jitsi popout URL

Needs the template variables filled in
---
 src/components/views/elements/AppTile.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 97c137074b..72d68d6f78 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -592,7 +592,9 @@ export default class AppTile extends React.Component {
 
     _getPopoutUrl() {
         if (this.props.app.type === 'jitsi') {
-            return WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false});
+            return this._templatedUrl(
+                WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
+            );
         } else {
             // use app.url, not state.widgetUrl, because we want the one without
             // the wURL params for the popped-out version.

From 6ced71443cc4437fc89b81c2ee90d80cc550bb9d Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 1 Apr 2020 13:14:51 +0000
Subject: [PATCH 1915/3235] Translated using Weblate (Japanese)

Currently translated at 54.6% (1225 of 2244 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 | 46 +++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index bbc698b3ff..ea4bd0e2db 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -309,25 +309,25 @@
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
     "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 はプロフィール画像を設定しました。",
+    "%(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 がプロフィール画像を設定しました。",
     "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\" に変更しました。",
+    "%(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 はイメージを送信しました。",
@@ -544,7 +544,7 @@
     "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プレビューはデフォルトで無効になっており、あなたのホームサーバー（プレビューが生成された場所）がこの部屋に表示されているリンクに関する情報を収集できないようにしています。",
+    "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プレビュー",
     "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プレビューが表示され、タイトル、説明、ウェブサイトからの画像など、そのリンクに関する詳細情報が表示されます。",
@@ -1245,5 +1245,13 @@
     "Italics": "イタリック体",
     "React": "リアクション",
     "Quick Reactions": "一般的なリアクション",
-    "Share Permalink": "パーマリンクを共有"
+    "Share Permalink": "パーマリンクを共有",
+    "Keyboard Shortcuts": "キーボードショートカット",
+    "Local address": "ローカルアドレス",
+    "Calls": "通話",
+    "Alt": "Alt",
+    "Shift": "Shift",
+    "Ctrl": "Ctrl",
+    "Toggle microphone mute": "マイクのミュート切り替え",
+    "Toggle video on/off": "ビデオのオンオフ切り替え"
 }

From 53987b093e0fd333fcb8a1fafcd0fc9236d79775 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:42:54 +0000
Subject: [PATCH 1916/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5d6383be2c..5fb147aa35 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1323,7 +1323,7 @@
     "Edit message": "Редактировать сообщение",
     "Power level": "Уровень прав",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Не удалось найти профили для перечисленных ниже Matrix ID. Вы всё равно хотите их пригласить?",
-    "Invite anyway": "Все равно пригласить",
+    "Invite anyway": "Всё равно пригласить",
     "GitHub issue": "GitHub вопрос",
     "Notes": "Заметка",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Если есть дополнительный контекст, который может помочь в анализе проблемы, такой как то, что вы делали в то время, ID комнат, ID пользователей и т. д., пожалуйста, включите эти данные.",

From 46aa0229421783d9a1a169006e012117908ec093 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:44:32 +0000
Subject: [PATCH 1917/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5fb147aa35..d1393b0d48 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1328,7 +1328,7 @@
     "Notes": "Заметка",
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Если есть дополнительный контекст, который может помочь в анализе проблемы, такой как то, что вы делали в то время, ID комнат, ID пользователей и т. д., пожалуйста, включите эти данные.",
     "Unable to load commit detail: %(msg)s": "Невозможно загрузить детали: %(msg)s",
-    "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": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Вам нужно будет вернуться к более новой версии Riot, чтобы сделать это",
+    "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": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Для этого вам нужно будет вернуться к более новой версии Riot",
     "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
     "Waiting for partner to accept...": "В ожидании партнера, чтобы принять ...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную верификацию. <button> Использовать устаревшую проверку</button>.",

From 436126362f260bd4ccac24f1d6e7cfd1d93e4108 Mon Sep 17 00:00:00 2001
From: i47320673 <alexeya@list.ru>
Date: Wed, 1 Apr 2020 13:45:28 +0000
Subject: [PATCH 1918/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d1393b0d48..26a5e5bf8a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1330,7 +1330,7 @@
     "Unable to load commit detail: %(msg)s": "Невозможно загрузить детали: %(msg)s",
     "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": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Для этого вам нужно будет вернуться к более новой версии Riot",
     "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
-    "Waiting for partner to accept...": "В ожидании партнера, чтобы принять ...",
+    "Waiting for partner to accept...": "Ожидание подтверждения партнера",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную верификацию. <button> Использовать устаревшую проверку</button>.",
     "Waiting for %(userId)s to confirm...": "Ожидание %(userId)s для подтверждения ...",
     "Use two-way text verification": "Использовать двустороннюю проверку текста",

From 1f35343d90e04c68f8400bbc73a7321989534493 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:45:35 +0000
Subject: [PATCH 1919/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 26a5e5bf8a..cfe712f47f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1330,8 +1330,8 @@
     "Unable to load commit detail: %(msg)s": "Невозможно загрузить детали: %(msg)s",
     "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": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Для этого вам нужно будет вернуться к более новой версии Riot",
     "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
-    "Waiting for partner to accept...": "Ожидание подтверждения партнера",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную верификацию. <button> Использовать устаревшую проверку</button>.",
+    "Waiting for partner to accept...": "Ожидание подтверждения партнера...",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную проверку. <button> Использовать устаревшую проверку</button>.",
     "Waiting for %(userId)s to confirm...": "Ожидание %(userId)s для подтверждения ...",
     "Use two-way text verification": "Использовать двустороннюю проверку текста",
     "View Servers in Room": "Просмотр серверов в комнате",

From 814adb8d5d4974a27fbc66896807debf2c906288 Mon Sep 17 00:00:00 2001
From: i47320673 <alexeya@list.ru>
Date: Wed, 1 Apr 2020 13:46:01 +0000
Subject: [PATCH 1920/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index cfe712f47f..65a036d992 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1332,7 +1332,7 @@
     "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
     "Waiting for partner to accept...": "Ожидание подтверждения партнера...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную проверку. <button> Использовать устаревшую проверку</button>.",
-    "Waiting for %(userId)s to confirm...": "Ожидание %(userId)s для подтверждения ...",
+    "Waiting for %(userId)s to confirm...": "Ожидание подтверждения от %(userId)s ...",
     "Use two-way text verification": "Использовать двустороннюю проверку текста",
     "View Servers in Room": "Просмотр серверов в комнате",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам дополнительное спокойствие при использовании сквозного шифрования сообщений.",

From b9d07738b49ec97b5d0a246d61262c03a850554e Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:46:15 +0000
Subject: [PATCH 1921/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 65a036d992..b0e7336be8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1332,10 +1332,10 @@
     "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
     "Waiting for partner to accept...": "Ожидание подтверждения партнера...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную проверку. <button> Использовать устаревшую проверку</button>.",
-    "Waiting for %(userId)s to confirm...": "Ожидание подтверждения от %(userId)s ...",
+    "Waiting for %(userId)s to confirm...": "Ожидание подтверждения от %(userId)s...",
     "Use two-way text verification": "Использовать двустороннюю проверку текста",
     "View Servers in Room": "Просмотр серверов в комнате",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам дополнительное спокойствие при использовании сквозного шифрования сообщений.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам больше уверенности при использовании шифрованных сообщений.",
     "Waiting for partner to confirm...": "В ожидании партнера, чтобы подтвердить ...",
     "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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",

From 3e09c8b32f5ac6205c5204ea68a88b09d223d57f Mon Sep 17 00:00:00 2001
From: i47320673 <alexeya@list.ru>
Date: Wed, 1 Apr 2020 13:49:51 +0000
Subject: [PATCH 1922/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b0e7336be8..6418949432 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1336,7 +1336,7 @@
     "Use two-way text verification": "Использовать двустороннюю проверку текста",
     "View Servers in Room": "Просмотр серверов в комнате",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам больше уверенности при использовании шифрованных сообщений.",
-    "Waiting for partner to confirm...": "В ожидании партнера, чтобы подтвердить ...",
+    "Waiting for partner to confirm...": "Ожидание подтверждения партнера...",
     "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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
     "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 раз меньше памяти, загружая информацию только о других пользователях, когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",

From 66bf5b6fc4992d74d202b9eb3ab1b64d987c0136 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 13:50:51 +0000
Subject: [PATCH 1923/3235] Translated using Weblate (Russian)

Currently translated at 81.6% (1830 of 2244 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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6418949432..eb18a346b4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -195,7 +195,7 @@
     "Ban": "Заблокировать",
     "Change Password": "Сменить пароль",
     "Command error": "Ошибка команды",
-    "Confirm password": "Подтвердите новый пароль",
+    "Confirm password": "Подтвердите пароль",
     "Current password": "Текущий пароль",
     "Email": "Электронная почта",
     "Failed to kick": "Не удалось выгнать",
@@ -1339,11 +1339,11 @@
     "Waiting for partner to confirm...": "Ожидание подтверждения партнера...",
     "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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
-    "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 раз меньше памяти, загружая информацию только о других пользователях, когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
-    "I don't want my encrypted messages": "Продолжить выход, мне не нужны мои зашифрованные сообщения",
-    "Manually export keys": "Ручной экспорт ключей",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы столкнулись с какими-либо ошибками или хотите оставить отзыв, которым хотите поделиться, сообщите нам об этом на GitHub.",
-    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала <existingIssuesLink> просмотрите существующие проблемы </existingIssuesLink> (и добавьте +1), либо <newIssueLink> создайте новую проблему </newIssueLink>, если вы не можете ее найти.",
+    "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 раз меньше памяти, загружая информацию о других пользователях только когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
+    "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
+    "Manually export keys": "Экспортировать ключи вручную",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы заметили ошибку или хотите оставить отзыв, пожалуйста, сообщите нам на GitHub.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Чтобы избежать повторяющихся проблем, сначала <existingIssuesLink>просмотрите существующие задачи</existingIssuesLink> (и добавьте +1), либо <newIssueLink>создайте новую задачу</newIssueLink>, если вы не можете ее найти.",
     "Sign out and remove encryption keys?": "Выйти и удалить ключи шифрования?",
     "Low bandwidth mode": "Режим низкой пропускной способности",
     "To help us prevent this in future, please <a>send us logs</a>.": "Чтобы помочь нам предотвратить это в будущем, пожалуйста, <a>отправьте нам логи</a>.",

From abb8564c5d2f566876e693ee83d57ebe41fcf2d9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 1 Apr 2020 14:57:53 +0100
Subject: [PATCH 1924/3235] Prepare changelog for v2.3.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02c085d0b5..b6f25f1858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Changes in [2.3.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.1) (2020-04-01)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.0...v2.3.1)
+
+ * Fix jitsi popout URL
+   [\#4327](https://github.com/matrix-org/matrix-react-sdk/pull/4327)
+ * Remove underscore from Jitsi conference names
+   [\#4324](https://github.com/matrix-org/matrix-react-sdk/pull/4324)
+ * Fix popout support for jitsi widgets
+   [\#4322](https://github.com/matrix-org/matrix-react-sdk/pull/4322)
+
 Changes in [2.3.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.0) (2020-03-30)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.0-rc.1...v2.3.0)

From adb2fc89e28db04a375f936b7615bd63a5683f4c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 1 Apr 2020 14:57:53 +0100
Subject: [PATCH 1925/3235] v2.3.1

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

diff --git a/package.json b/package.json
index 6e3b4e912f..8363c1f331 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 2ae83526dc949cb1e1cca05770aaa03fce5b4e5c Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 1 Apr 2020 13:45:09 +0000
Subject: [PATCH 1926/3235] Translated using Weblate (Japanese)

Currently translated at 54.8% (1229 of 2244 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 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index ea4bd0e2db..23eaaf9f0f 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -328,8 +328,8 @@
     "%(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 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 を追加しました。",
@@ -1015,15 +1015,15 @@
     "Sends the given emote coloured as a rainbow": "与えられたエモートを虹色で送信する",
     "Displays list of commands with usages and descriptions": "使い方と説明付きのコマンド一覧を表示する",
     "%(senderName)s made no change.": "%(senderName)s は変更されませんでした。",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s はこの部屋をアップグレードしました。",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s はこの部屋をリンクを知っている人全てに公開しました。",
-    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s はこの部屋を招待者のみに変更しました。",
-    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s はゲストがこの部屋に参加できるようにしました。",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s がこの部屋をアップグレードしました。",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s がこの部屋を「リンクを知っている人全員」に公開しました。",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s がこの部屋を「招待者のみ参加可能」に変更しました。",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s がこの部屋へのゲストによる参加を許可しました。",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "「パンくずリスト」機能（部屋リストの上のアバター）を使っているかどうか",
     "Only continue if you trust the owner of the server.": "そのサーバーの所有者を信頼する場合のみ続ける。",
     "Trust": "信頼",
     "Use an identity server to invite by email. Manage in Settings.": "メールによる招待のためにIDサーバーを用いる。設定画面で管理する。",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s は参加ルールを %(rule)s に変更しました",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s が参加ルールを「%(rule)s」に変更しました。",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s はゲストの部屋への参加を差し止めています。",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s はゲストのアクセスを %(rule)s に変更しました",
     "%(displayName)s is typing …": "%(displayName)s が入力中 …",
@@ -1253,5 +1253,9 @@
     "Shift": "Shift",
     "Ctrl": "Ctrl",
     "Toggle microphone mute": "マイクのミュート切り替え",
-    "Toggle video on/off": "ビデオのオンオフ切り替え"
+    "Toggle video on/off": "ビデオのオンオフ切り替え",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s が部屋名を %(oldRoomName)s から %(newRoomName)s に変更しました。",
+    "Unknown Command": "不明なコマンド",
+    "Unrecognised command: %(commandText)s": "認識されていないコマンド: %(commandText)s",
+    "Send as message": "メッセージとして送信"
 }

From 84da483264c0ee7844415c4d1e9eb9dac161a9d4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 1 Apr 2020 15:00:05 +0100
Subject: [PATCH 1927/3235] Reset matrix-js-sdk back to develop branch

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index c5fc8268a1..acd474ffd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5691,7 +5691,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 430a9ef9484caaff26fc4f20ccf8d7e1f0b0e023 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 15:09:19 +0100
Subject: [PATCH 1928/3235] tweak e2e icon margins

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index d2753f5825..1d1374cf1f 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -153,7 +153,8 @@ limitations under the License.
             }
 
             .mx_E2EIcon {
-                margin: 4px 4px 4px 0; // no left-margin to improve visual centering
+                margin-top: 3px; // visual vertical centering to the top line of text
+                margin-right: 4px; // margin from displyname
                 min-width: 18px; // convince flexbox to not collapse it
             }
         }

From 8736867dcf531f3cee1797e9ab9dbae009a08e21 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 16:53:25 +0100
Subject: [PATCH 1929/3235] fix /invite Slash Command

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index c62aa9c3e5..d60434cf97 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -412,17 +412,20 @@ export const Commands = [
                                     button: _t("Continue"),
                                 },
                             ));
+
+                            finished = finished.then(([useDefault]: any) => {
+                                if (useDefault) {
+                                    useDefaultIdentityServer();
+                                    return;
+                                }
+                                throw new Error(_t("Use an identity server to invite by email. Manage in Settings."));
+                            });
                         } else {
                             return reject(_t("Use an identity server to invite by email. Manage in Settings."));
                         }
                     }
                     const inviter = new MultiInviter(roomId);
-                    return success(finished.then(([useDefault]: any) => {
-                        if (useDefault) {
-                            useDefaultIdentityServer();
-                        } else if (useDefault === false) {
-                            throw new Error(_t("Use an identity server to invite by email. Manage in Settings."));
-                        }
+                    return success(finished.then(() => {
                         return inviter.invite([address]);
                     }).then(() => {
                         if (inviter.getCompletionState(address) !== "invited") {

From d520af255eee4342219ab6297ccffa69c39733e2 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 15:30:53 +0000
Subject: [PATCH 1930/3235] Translated using Weblate (Russian)

Currently translated at 84.4% (1893 of 2244 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 | 80 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index eb18a346b4..94b21fa76e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -450,7 +450,7 @@
     "Create": "Создать",
     "Featured Rooms:": "Рекомендуемые комнаты:",
     "Featured Users:": "Избранные пользователи:",
-    "Automatically replace plain text Emoji": "Автоматически заменять текстовые смайлики на Emoji",
+    "Automatically replace plain text Emoji": "Автоматически заменять текстовые смайлики на графические",
     "Failed to upload image": "Не удалось загрузить изображение",
     "%(widgetName)s widget added by %(senderName)s": "Виджет %(widgetName)s был добавлен %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Виджет %(widgetName)s был удален %(senderName)s",
@@ -975,7 +975,7 @@
     "Sorry, your homeserver is too old to participate in this room.": "Извините, ваш сервер слишком старый, для участия в этой комнате.",
     "Please contact your homeserver administrator.": "Пожалуйста, свяжитесь с администратором вашего сервера.",
     "Render simple counters in room header": "Отображать простые счетчики в заголовке комнаты",
-    "Enable Emoji suggestions while typing": "Включить предложения эмоджи при наборе",
+    "Enable Emoji suggestions while typing": "Включить предложения смайликов при наборе",
     "Show a placeholder for removed messages": "Показывать плашки вместо удалённых сообщений",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о вступлении | выходе (не влияет на приглашения, исключения и запреты)",
     "Show avatar changes": "Показывать изменения аватара",
@@ -1680,7 +1680,7 @@
     "Command Autocomplete": "Автозаполнение команды",
     "Community Autocomplete": "Автозаполнение сообщества",
     "DuckDuckGo Results": "DuckDuckGo результаты",
-    "Emoji Autocomplete": "Emoji Автозаполнение",
+    "Emoji Autocomplete": "Автодополнение смайлов",
     "Notification Autocomplete": "Автозаполнение уведомлений",
     "Room Autocomplete": "Автозаполнение комнаты",
     "User Autocomplete": "Автозаполнение пользователя",
@@ -1745,7 +1745,7 @@
     "Your keys are <b>not being backed up from this session</b>.": "Ваши ключи <b>не резервируются с этой сессии</b>.",
     "Server or user ID to ignore": "Сервер или ID пользователя для игнорирования",
     "Subscribed lists": "Подписанные списки",
-    "Subscribe": "Подписать",
+    "Subscribe": "Подписаться",
     "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь",
     "If you cancel now, you won't complete verifying the other user.": "Если вы сейчас отмените, у вас не будет завершена проверка других пользователей.",
     "If you cancel now, you won't complete your secret storage operation.": "Если вы сейчас отмените, вы не завершите операцию секретного хранения.",
@@ -1792,7 +1792,7 @@
     "Verify this session by completing one of the following:": "Проверьте эту сессию, выполнив одно из следующих действий:",
     "Scan this unique code": "Отсканируйте этот уникальный код",
     "or": "или",
-    "Compare unique emoji": "Сравнитe уникальныe эмодзи",
+    "Compare unique emoji": "Сравнитe уникальныe смайлики",
     "Compare a unique set of emoji if you don't have a camera on either device": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств",
     "Start": "Начать",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Подтвердите, что смайлики, приведенные ниже, отображаются на обоих устройствах в одном и том же порядке:",
@@ -1856,7 +1856,7 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) начал(а) новую сессию без её подтверждения:",
     "Ask this user to verify their session, or manually verify it below.": "Попросите этого пользователя подтвердить сессию или подтвердите её вручную ниже.",
     "Manually Verify by Text": "Ручная проверка с помощью текста",
-    "Interactively verify by Emoji": "Интерактивная проверка со смайлами",
+    "Interactively verify by Emoji": "Интерактивная проверка со смайликами",
     "Done": "Готово",
     "The message you are trying to send is too large.": "Ваше сообщение слишком большое.",
     "Support adding custom themes": "Поддержка сторонних тем",
@@ -1867,5 +1867,71 @@
     "Update your secure storage": "Обновите ваше безопасное хранилище",
     "Your homeserver does not support cross-signing.": "Ваш домашний сервер не поддерживает кросс-подпись.",
     "Cross-signing and secret storage are enabled.": "Кросс-подпись и хранилище секретов разрешены.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Попробуйте экспериментальные возможности. <a>Подробнее</a>."
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Попробуйте экспериментальные возможности. <a>Подробнее</a>.",
+    "Cross-signing and secret storage are not yet set up.": "Кросс-подпись и хранилище секретов ещё не настроены.",
+    "Reset cross-signing and secret storage": "Сбросить кросс-подпись и хранилище секретов",
+    "Cross-signing public keys:": "Публичные ключи для кросс-подписи:",
+    "in memory": "в памяти",
+    "not found": "не найдено",
+    "Cross-signing private keys:": "Приватные ключи для кросс-подписи:",
+    "in secret storage": "в хранилище секретов",
+    "cached locally": "сохранено локально",
+    "not found locally": "не найдено локально",
+    "User signing private key:": "Приватный ключ подписи пользователей:",
+    "Session backup key:": "Резервная копия сессионного ключа:",
+    "Secret storage public key:": "Публичный ключ хранилища секретов:",
+    "in account data": "в данных аккаунта",
+    "Homeserver feature support:": "Возможности домашнего сервера:",
+    "exists": "существует",
+    "Secret Storage key format:": "Формат ключа хранилища секретов:",
+    "outdated": "устарел",
+    "up to date": "свежий",
+    "Your homeserver does not support session management.": "Ваш домашний сервер не поддерживает управление сессиями.",
+    "Unable to load session list": "Не удалось загрузить список сессий",
+    "Enable": "Разрешить",
+    "Connecting to integration manager...": "Подключение к менеджеру интеграций...",
+    "Cannot connect to integration manager": "Не удалось подключиться к менеджеру интеграций",
+    "The integration manager is offline or it cannot reach your homeserver.": "Менеджер интеграций не работает или не может подключиться к вашему домашнему серверу.",
+    "This session is backing up your keys. ": "Эта сессия сохраняет ваши ключи. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Эта сессия <b>не сохраняет ваши ключи</b>, но у вас есть резервная копия, из которой вы можете их восстановить.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Подключите эту сессию к резервированию ключей до выхода, чтобы избежать утраты ключей, которые могут быть доступны только в этой сессии.",
+    "Connect this session to Key Backup": "Подключить эту сессию к резервированию ключей",
+    "Backup is not signed by any of your sessions": "Резервная копия не подписана ни одной из ваших сессий",
+    "This backup is trusted because it has been restored on this session": "Эта резервная копия является доверенной, потому что она была восстановлена в этой сессии",
+    "Clear notifications": "Убрать уведомления",
+    "Invalid theme schema.": "Неверная схема темы.",
+    "Error downloading theme information.": "Ошибка при загрузке информации темы.",
+    "Theme added!": "Тема добавлена!",
+    "Add theme": "Добавить тему",
+    "Keyboard Shortcuts": "Горячие клавиши",
+    "Something went wrong. Please try again or view your console for hints.": "Что-то пошло не так. Попробуйте снова или поищите подсказки в консоли.",
+    "Error unsubscribing from list": "Не удалось отписаться от списка",
+    "None": "Нет",
+    "Server rules": "Правила сервера",
+    "User rules": "Правила пользователей",
+    "You have not ignored anyone.": "Вы никого не игнорируете.",
+    "You are currently ignoring:": "Вы игнорируете:",
+    "You are not subscribed to any lists": "Вы не подписаны ни на один список",
+    "Unsubscribe": "Отписаться",
+    "View rules": "Посмотреть правила",
+    "You are currently subscribed to:": "",
+    "Security": "Безопасность",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Сессия, которую вы подтверждаете, не поддерживает проверку с помощью сканирования QR-кодов или смайлов, как в Riot. Попробуйте другой клиент.",
+    "Verify by scanning": "Подтверждение сканированием",
+    "Ask %(displayName)s to scan your code:": "Попросите %(displayName)s отсканировать ваш код:",
+    "Verify by emoji": "Подтверждение с помощью смайлов",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Если вы не можете отсканировать код выше, попробуйте сравнить уникальные смайлы.",
+    "Verify by comparing unique emoji.": "Подтверждение сравнением уникальных смайлов.",
+    "Verify all users in a room to ensure it's secure.": "Подтвердите всех пользователей в комнате, чтобы обеспечить безопасность.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "В зашифрованных комнатах проверьте всех пользователей, чтобы обеспечить безопасность.",
+    "Verified": "Подтверждено",
+    "You've successfully verified %(displayName)s!": "Вы успешно подтвердили %(displayName)s!",
+    "Got it": "Понятно",
+    "Compare emoji": "Сравните смайлы",
+    "Activate selected button": "Активировать выбранную кнопку",
+    "Toggle right panel": "Переключить правую панель",
+    "Toggle this dialog": "Переключить этот диалог",
+    "Cancel autocomplete": "Отменить автодополнение",
+    "Esc": "",
+    "Enter": ""
 }

From dabf8f3870790c7b4b1083716f4b53289d4ad2d3 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 1 Apr 2020 14:01:16 +0000
Subject: [PATCH 1931/3235] Translated using Weblate (Japanese)

Currently translated at 54.8% (1229 of 2244 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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 23eaaf9f0f..8254426ce3 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -330,14 +330,14 @@
     "%(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 はイメージを送信しました。",
+    "%(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 はこの部屋の主アドレスを削除しました。",
+    "%(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 が応答しました。",
@@ -1024,8 +1024,8 @@
     "Trust": "信頼",
     "Use an identity server to invite by email. Manage in Settings.": "メールによる招待のためにIDサーバーを用いる。設定画面で管理する。",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s が参加ルールを「%(rule)s」に変更しました。",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s はゲストの部屋への参加を差し止めています。",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s はゲストのアクセスを %(rule)s に変更しました",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s がこの部屋へのゲストによる参加を拒否しました。",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s はゲストによるアクセスを %(rule)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 ともう一人が入力中 …",
@@ -1144,9 +1144,9 @@
     "Remove recent messages": "最近のメッセージを削除する",
     "%(creator)s created and configured the room.": "%(creator)s が部屋を作成して構成しました。",
     "Add room": "部屋を追加",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)sがこの部屋に%(groups)sのバッジを追加しました。",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)sがこの部屋から%(groups)sのバッジを削除しました。",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)sが%(newGroups)sのバッジを追加し、%(oldGroups)sのバッジを削除しました。",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s がこの部屋に %(groups)s のバッジを追加しました。",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s がこの部屋から %(groups)s のバッジを削除しました。",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s が %(newGroups)s のバッジを追加し、 %(oldGroups)s のバッジを削除しました。",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "キーが正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。本当によろしいですか？",
     "not stored": "保存されていません",
     "All keys backed up": "すべてのキーがバックアップされました",

From 0d8fd83e4d8622e59142b2b05d4e8389cf15dffd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Apr 2020 17:16:28 +0100
Subject: [PATCH 1932/3235] move aria-label and title so that it doesn't wrap
 the e2e icon

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 82e410b361..abe54b355e 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1444,9 +1444,9 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
         <div className="mx_UserInfo_container mx_UserInfo_separator">
             <div className="mx_UserInfo_profile">
                 <div>
-                    <h2 title={displayName} aria-label={displayName}>
+                    <h2>
                         { e2eIcon }
-                        <span>
+                        <span title={displayName} aria-label={displayName}>
                             { displayName }
                         </span>
                     </h2>

From f295bb6c12e07e883ee13dfa49f4388588cff10c Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 16:04:03 +0000
Subject: [PATCH 1933/3235] Translated using Weblate (Russian)

Currently translated at 84.5% (1896 of 2244 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 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 94b21fa76e..56754f84ba 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -19,7 +19,7 @@
     "Create Room": "Создать комнату",
     "Cryptography": "Криптография",
     "Curve25519 identity key": "Ключ идентификации Curve25519",
-    "Deactivate Account": "Закрыть аккаунт",
+    "Deactivate Account": "Деактивировать аккаунт",
     "Decryption error": "Ошибка расшифровки",
     "Default": "По умолчанию",
     "Deops user with given id": "Снимает полномочия оператора с пользователя с заданным ID",
@@ -257,7 +257,7 @@
     "Make Moderator": "Сделать модератором",
     "Room": "Комната",
     "Cancel": "Отмена",
-    "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>.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан URL HTTPS. Используйте HTTPS или <a>либо включите небезопасные сценарии</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>.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан адрес HTTPS. Используйте HTTPS или <a>включите небезопасные скрипты</a>.",
     "Dismiss": "Отклонить",
     "Custom Server Options": "Параметры другого сервера",
     "Mute": "Приглушить",
@@ -1546,7 +1546,7 @@
     "Disconnect from the identity server <idserver />?": "Отсоединиться от сервера идентификации <idserver />?",
     "Disconnect": "Отключить",
     "Identity Server (%(server)s)": "Сервер идентификации (%(server)s)",
-    "Do not use an identity server": "Не используйте сервер идентификации",
+    "Do not use an identity server": "Не использовать сервер идентификации",
     "Enter a new identity server": "Введите новый идентификационный сервер",
     "Integration Manager": "Менеджер интеграции",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Кроме того, вы можете попытаться использовать общедоступный сервер по адресу <code> turn.matrix.org </code>, но это не будет настолько надежным, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.",
@@ -1578,11 +1578,11 @@
     "Disconnect anyway": "Отключить в любом случае",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "В настоящее время вы используете <server></server> для поиска вами ваших контактов а также вас вашими оппонентами. Вы можете изменить ваш сервер идентификации ниже.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Если вы не хотите использовать <server /> для обнаружения вас и быть обнаруженным вашими существующими контактами, введите другой идентификационный сервер ниже.",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Вы в настоящее время не используете идентификационный сервер. Чтобы найти и быть найденным существующими контактами, которые вы знаете, добавьте один ниже.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Вы в настоящее время не используете сервер идентификации. Чтобы найти известные вам контакты, и чтобы они могли найти вас, укажите сервер ниже.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Отключение от сервера идентификации будет означать, что другие пользователи не смогут вас обнаружить, и вы не сможете приглашать других по электронной почте или по телефону.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Использование сервера идентификации не обязательно. Если вы решите не использовать сервер идентификации, другие пользователи не смогут обнаружить вас, и вы не сможете пригласить других по электронной почте или телефону.",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Подтвердите условия предоставления услуг сервера идентификации (%(serverName)s), чтобы вас можно было обнаружить по адресу электронной почты или номеру телефона.",
-    "Discovery": "Поиск",
+    "Discovery": "Обнаружение",
     "Deactivate account": "Деактивировать аккаунт",
     "Clear cache and reload": "Очистить кэш и перезагрузить",
     "Always show the window menu bar": "Всегда показывать строку меню",
@@ -1723,7 +1723,7 @@
     "Delete %(count)s sessions|other": "Удалить %(count)s сессию",
     "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
     "Enable audible notifications for this session": "Включить звуковые уведомления для этой сессии",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями для управления ботами, виджетами и стикерами.",
     "Manage integrations": "Управление интеграциями",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
@@ -1914,7 +1914,7 @@
     "You are not subscribed to any lists": "Вы не подписаны ни на один список",
     "Unsubscribe": "Отписаться",
     "View rules": "Посмотреть правила",
-    "You are currently subscribed to:": "",
+    "You are currently subscribed to:": "Вы подписаны на:",
     "Security": "Безопасность",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Сессия, которую вы подтверждаете, не поддерживает проверку с помощью сканирования QR-кодов или смайлов, как в Riot. Попробуйте другой клиент.",
     "Verify by scanning": "Подтверждение сканированием",
@@ -1933,5 +1933,6 @@
     "Toggle this dialog": "Переключить этот диалог",
     "Cancel autocomplete": "Отменить автодополнение",
     "Esc": "",
-    "Enter": ""
+    "Enter": "Enter",
+    "Delete %(count)s sessions|one": "Удалить %(count)s сессий"
 }

From 8f04746e4eefbb33f65a14bf40b2806523bd3d79 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 11:05:49 -0600
Subject: [PATCH 1934/3235] Revert to UNSAFE_componentWillMount where
 componentDidMount will not work

---
 src/components/structures/MatrixChat.js                 | 3 ++-
 src/components/structures/RoomDirectory.js              | 3 ++-
 src/components/structures/auth/Login.js                 | 3 ++-
 src/components/views/dialogs/ConfirmUserActionDialog.js | 3 ++-
 src/components/views/rooms/MemberInfo.js                | 3 ++-
 src/components/views/rooms/MemberList.js                | 3 ++-
 src/components/views/rooms/RoomNameEditor.js            | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b0d08b7673..4ef0f60e4b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -221,7 +221,8 @@ export default createReactClass({
         return {serverConfig: props};
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         SdkConfig.put(this.props.config);
 
         // Used by _viewRoom before getting state from sync
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index eabf097950..0b07c10c8a 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -56,7 +56,8 @@ export default createReactClass({
         };
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this._unmounted = false;
         this.nextBatch = null;
         this.filterTimeout = null;
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 817472552a..ef9d4c59c0 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -113,7 +113,8 @@ export default createReactClass({
         };
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this._unmounted = false;
 
         // map from login step type to a function which will render a control
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index d7b86d43d5..2495c46327 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -55,7 +55,8 @@ export default createReactClass({
         askReason: false,
     }),
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this._reasonField = null;
     },
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index f83e183b85..b387cefe91 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -79,7 +79,8 @@ export default createReactClass({
         contextType: MatrixClientContext,
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this._cancelDeviceList = null;
         const cli = this.context;
 
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index dfa7e856b4..3779d461bb 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -49,7 +49,8 @@ export default createReactClass({
         }
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this._mounted = true;
         const cli = MatrixClientPeg.get();
         if (cli.hasLazyLoadMembersEnabled()) {
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index ab355b1f9e..e0c31321c3 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -34,7 +34,8 @@ export default createReactClass({
         };
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         const room = this.props.room;
         const name = room.currentState.getStateEvents('m.room.name', '');
         const myId = MatrixClientPeg.get().credentials.userId;

From 72badf3b6ace1d2ea4d92e22d8b79f0488c95f4b Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Wed, 1 Apr 2020 16:56:53 +0000
Subject: [PATCH 1935/3235] Translated using Weblate (Russian)

Currently translated at 84.0% (1896 of 2256 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 56754f84ba..41cd901692 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -706,7 +706,7 @@
     "Key request sent.": "Запрос ключа отправлен.",
     "Code": "Код",
     "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, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
-    "Submit debug logs": "Отправка журналов отладки",
+    "Submit debug logs": "Отправить отладочные журналы",
     "Opens the Developer Tools dialog": "Открывает Инструменты разработчика",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Прочитано %(displayName)s (%(userName)s) в %(dateTime)s",
     "Unable to join community": "Не удалось присоединиться к сообществу",
@@ -797,7 +797,7 @@
     "You must specify an event type!": "Необходимо указать тип мероприятия!",
     "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "Invite to this room": "Пригласить в комнату",
-    "Send logs": "Отправка журналов",
+    "Send logs": "Отправить журналы",
     "All messages": "Все сообщения",
     "Call invitation": "Звонки",
     "Downloading update...": "Загрузка обновления…",

From c0ffa8b59a33ce2b3431d7146343a8bbbff18062 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 11:32:13 -0600
Subject: [PATCH 1936/3235] Fix merge conflict between react warnings and SSO

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

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 0ed93ed7d3..327451be17 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -455,10 +455,6 @@ export const MsisdnAuthEntry = createReactClass({
         onPhaseChange: PropTypes.func.isRequired,
     },
 
-    componentDidMount: function() {
-        this.props.onPhaseChange(DEFAULT_PHASE);
-    },
-
     getInitialState: function() {
         return {
             token: '',
@@ -467,6 +463,8 @@ export const MsisdnAuthEntry = createReactClass({
     },
 
     componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
+
         this._submitUrl = null;
         this._sid = null;
         this._msisdn = null;

From e741d0d577bdbc32d14f42b356b0d115b0a23033 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 13:41:24 -0600
Subject: [PATCH 1937/3235] Revert componentDidMount changes on breadcrumbs

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

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
---
 src/components/structures/LeftPanel.js        | 3 ++-
 src/components/views/rooms/RoomBreadcrumbs.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index bbeaeb10e0..a9cd12199b 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -44,7 +44,8 @@ const LeftPanel = createReactClass({
         };
     },
 
-    componentDidMount: function() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount: function() {
         this.focusedElement = null;
 
         this._breadcrumbsWatcherRef = SettingsStore.watchSetting(
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index ad8a5cfef9..98018130e4 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -49,7 +49,8 @@ export default class RoomBreadcrumbs extends React.Component {
         this._scroller = createRef();
     }
 
-    componentDidMount() {
+    // TODO: [REACT-WARNING] Move this to constructor
+    UNSAFE_componentWillMount() {
         this._dispatcherRef = dis.register(this.onAction);
 
         const storedRooms = SettingsStore.getValue("breadcrumb_rooms");

From 620c2effdade236ba1a5cea2cae508b4451eaf21 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 13:52:49 -0600
Subject: [PATCH 1938/3235] Appease the linter by turning it off

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

diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 98018130e4..1d433c9a40 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -50,7 +50,7 @@ export default class RoomBreadcrumbs extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() {
+    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
         this._dispatcherRef = dis.register(this.onAction);
 
         const storedRooms = SettingsStore.getValue("breadcrumb_rooms");

From ba0a9c8439096193d2678731e7d3c4bcdb76d145 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 13:59:48 -0600
Subject: [PATCH 1939/3235] Use console.log in place of console.warn for less
 warnings

These aren't react warnings, but they are distracting in the logs.
---
 src/FromWidgetPostMessageApi.js             | 2 +-
 src/WidgetMessaging.js                      | 6 +++---
 src/components/views/elements/AppTile.js    | 4 ++--
 src/components/views/rooms/Stickerpicker.js | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index 3c4494c09d..c7d1714b69 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -165,7 +165,7 @@ export default class FromWidgetPostMessageApi {
         const action = event.data.action;
         const widgetId = event.data.widgetId;
         if (action === 'content_loaded') {
-            console.warn('Widget reported content loaded for', widgetId);
+            console.log('Widget reported content loaded for', widgetId);
             dis.dispatch({
                 action: 'widget_content_loaded',
                 widgetId: widgetId,
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 30c2389b1e..5f877bd48a 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -92,7 +92,7 @@ export default class WidgetMessaging {
      * @return {Promise} To be resolved with screenshot data when it has been generated
      */
     getScreenshot() {
-        console.warn('Requesting screenshot for', this.widgetId);
+        console.log('Requesting screenshot for', this.widgetId);
         return this.messageToWidget({
                 api: OUTBOUND_API_NAME,
                 action: "screenshot",
@@ -106,12 +106,12 @@ export default class WidgetMessaging {
      * @return {Promise} To be resolved with an array of requested widget capabilities
      */
     getCapabilities() {
-        console.warn('Requesting capabilities for', this.widgetId);
+        console.log('Requesting capabilities for', this.widgetId);
         return this.messageToWidget({
                 api: OUTBOUND_API_NAME,
                 action: "capabilities",
             }).then((response) => {
-                console.warn('Got capabilities for', this.widgetId, response.capabilities);
+                console.log('Got capabilities for', this.widgetId, response.capabilities);
                 return response.capabilities;
             });
     }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index db738664c8..8940a175e9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -319,7 +319,7 @@ export default class AppTile extends React.Component {
     }
 
     _onSnapshotClick() {
-        console.warn("Requesting widget snapshot");
+        console.log("Requesting widget snapshot");
         ActiveWidgetStore.getWidgetMessaging(this.props.app.id).getScreenshot()
             .catch((err) => {
                 console.error("Failed to get screenshot", err);
@@ -423,7 +423,7 @@ export default class AppTile extends React.Component {
                 }, this.props.whitelistCapabilities);
 
                 if (requestedWhitelistCapabilies.length > 0 ) {
-                    console.warn(`Widget ${this.props.app.id} allowing requested, whitelisted properties: ` +
+                    console.log(`Widget ${this.props.app.id} allowing requested, whitelisted properties: ` +
                         requestedWhitelistCapabilies,
                     );
                 }
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index da5f129a42..3af9ff4f65 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -84,11 +84,11 @@ export default class Stickerpicker extends React.Component {
 
     async _removeStickerpickerWidgets() {
         const scalarClient = await this._acquireScalarClient();
-        console.warn('Removing Stickerpicker widgets');
+        console.log('Removing Stickerpicker widgets');
         if (this.state.widgetId) {
             if (scalarClient) {
                 scalarClient.disableWidgetAssets(widgetType, this.state.widgetId).then(() => {
-                    console.warn('Assets disabled');
+                    console.log('Assets disabled');
                 }).catch((err) => {
                     console.error('Failed to disable assets');
                 });

From 0bb8973ee6245cb9d5c8c0129c2e6ddfb00c9a7c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:30:57 -0600
Subject: [PATCH 1940/3235] Move rendering of PersistedElements into other
 lifecycle stages

For https://github.com/vector-im/riot-web/issues/12877

Original error:
```
Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.

Check the render method of PersistedElement.
    in PersistedElement (created by AppTile)
    in div (created by AppTile)
    in div (created by AppTile)
    in AppTile (created by AppsDrawer)
    in div (created by AppsDrawer)
    in div (created by AppsDrawer)
    in AppsDrawer (created by AuxPanel)
    in div (created by AutoHideScrollbar)
    in AutoHideScrollbar (created by AuxPanel)
    in AuxPanel (created by RoomView)
    in div (created by RoomView)
    in div (created by MainSplit)
    in MainSplit (created by RoomView)
    in ErrorBoundary (created by RoomView)
    in main (created by RoomView)
    in RoomView (created by LoggedInView)
    in div (created by LoggedInView)
    in DragDropContext (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in ErrorBoundary (created by MatrixChat)
    in MatrixChat
```
---
 .../views/elements/PersistedElement.js           | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index d23d6488b6..53f2501f19 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -113,10 +113,12 @@ export default class PersistedElement extends React.Component {
 
     componentDidMount() {
         this.updateChild();
+        this.renderApp();
     }
 
     componentDidUpdate() {
         this.updateChild();
+        this.renderApp();
     }
 
     componentWillUnmount() {
@@ -141,6 +143,14 @@ export default class PersistedElement extends React.Component {
         this.updateChildVisibility(this.child, true);
     }
 
+    renderApp() {
+        const content = <div ref={this.collectChild} style={this.props.style}>
+            {this.props.children}
+        </div>;
+
+        ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
+    }
+
     updateChildVisibility(child, visible) {
         if (!child) return;
         child.style.display = visible ? 'block' : 'none';
@@ -160,12 +170,6 @@ export default class PersistedElement extends React.Component {
     }
 
     render() {
-        const content = <div ref={this.collectChild} style={this.props.style}>
-            {this.props.children}
-        </div>;
-
-        ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
-
         return <div ref={this.collectChildContainer}></div>;
     }
 }

From ab6bd4104f42e7bacbab1a206cc224dd8a40193b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:32:35 -0600
Subject: [PATCH 1941/3235] Flag componentWillUpdate as UNSAFE in MatrixChat

For https://github.com/vector-im/riot-web/issues/12877
---
 src/components/structures/MatrixChat.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4ef0f60e4b..09d4740c73 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -360,7 +360,8 @@ export default createReactClass({
         if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
     },
 
-    componentWillUpdate: function(props, state) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
+    UNSAFE_componentWillUpdate: function(props, state) {
         if (this.shouldTrackPageChange(this.state, state)) {
             this.startPageChangeTimer();
         }
@@ -381,7 +382,7 @@ export default createReactClass({
         // Tor doesn't support performance
         if (!performance || !performance.mark) return null;
 
-        // This shouldn't happen because componentWillUpdate and componentDidUpdate
+        // This shouldn't happen because UNSAFE_componentWillUpdate and componentDidUpdate
         // are used.
         if (this._pageChanging) {
             console.warn('MatrixChat.startPageChangeTimer: timer already started');

From 47e5cfecf211e56046be53a24837e266b87e7730 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:35:39 -0600
Subject: [PATCH 1942/3235] Silence usages of componentWillReceiveProps

For https://github.com/vector-im/riot-web/issues/12877
---
 src/components/structures/GroupView.js                    | 5 +++--
 src/components/structures/RightPanel.js                   | 3 ++-
 src/components/structures/TimelinePanel.js                | 3 ++-
 src/components/structures/auth/ForgotPassword.js          | 3 ++-
 src/components/structures/auth/Login.js                   | 3 ++-
 src/components/structures/auth/Registration.js            | 3 ++-
 src/components/views/auth/ServerConfig.js                 | 3 ++-
 src/components/views/avatars/BaseAvatar.js                | 3 ++-
 src/components/views/avatars/MemberAvatar.js              | 3 ++-
 src/components/views/avatars/RoomAvatar.js                | 3 ++-
 src/components/views/dialogs/DevtoolsDialog.js            | 3 ++-
 src/components/views/elements/AddressSelector.js          | 3 ++-
 src/components/views/elements/AppTile.js                  | 3 ++-
 src/components/views/elements/Dropdown.js                 | 3 ++-
 src/components/views/elements/EditableText.js             | 3 ++-
 src/components/views/elements/Flair.js                    | 3 ++-
 src/components/views/elements/Pill.js                     | 5 +++--
 src/components/views/elements/PowerSelector.js            | 3 ++-
 src/components/views/elements/SyntaxHighlight.js          | 1 -
 src/components/views/groups/GroupMemberInfo.js            | 3 ++-
 src/components/views/groups/GroupRoomInfo.js              | 3 ++-
 src/components/views/rooms/AppsDrawer.js                  | 3 ++-
 src/components/views/rooms/EventTile.js                   | 3 ++-
 src/components/views/rooms/MemberInfo.js                  | 3 ++-
 src/components/views/rooms/RoomTile.js                    | 3 ++-
 src/components/views/settings/ChangeAvatar.js             | 3 ++-
 src/components/views/settings/discovery/EmailAddresses.js | 3 ++-
 src/components/views/settings/discovery/PhoneNumbers.js   | 3 ++-
 28 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 73a8879f6d..3b32e5c907 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -450,8 +450,9 @@ export default createReactClass({
         }
     },
 
-    componentWillReceiveProps: function(newProps) {
-        if (this.props.groupId != newProps.groupId) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
+        if (this.props.groupId !== newProps.groupId) {
             this.setState({
                 summary: null,
                 error: null,
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 5e556419cc..856a3764a1 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -123,7 +123,8 @@ export default class RightPanel extends React.Component {
         this._unregisterGroupStore(this.props.groupId);
     }
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.groupId !== this.props.groupId) {
             this._unregisterGroupStore(this.props.groupId);
             this._initGroupStore(newProps.groupId);
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1bea707fd3..6a08cd78eb 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -235,7 +235,8 @@ const TimelinePanel = createReactClass({
         this._initTimeline(this.props);
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         if (newProps.timelineSet !== this.props.timelineSet) {
             // throw new Error("changing timelineSet on a TimelinePanel is not supported");
 
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index dc3f4a0a2b..9877c53106 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -74,7 +74,8 @@ export default createReactClass({
         this._checkServerLiveliness(this.props.serverConfig);
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index ef9d4c59c0..836e5bd93d 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -134,7 +134,8 @@ export default createReactClass({
         this._unmounted = true;
     },
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 45d775059c..08c2a11641 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -125,7 +125,8 @@ export default createReactClass({
         this._replaceClient();
     },
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index 37517c7484..7ec4311d2f 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -72,7 +72,8 @@ export default class ServerConfig extends React.PureComponent {
         };
     }
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.serverConfig.hsUrl === this.state.hsUrl &&
             newProps.serverConfig.isUrl === this.state.isUrl) return;
 
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 4c34cee853..3e3a2e6bd9 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -74,7 +74,8 @@ export default createReactClass({
         this.context.removeListener('sync', this.onClientSync);
     },
 
-    componentWillReceiveProps: function(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(nextProps) {
         // work out if we need to call setState (if the image URLs array has changed)
         const newState = this._getState(nextProps);
         const newImageUrls = newState.imageUrls;
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index a07a184aa1..826aa5fddf 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -51,7 +51,8 @@ export default createReactClass({
         return this._getState(this.props);
     },
 
-    componentWillReceiveProps: function(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(nextProps) {
         this.setState(this._getState(nextProps));
     },
 
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index c79e1827da..a72d318b8d 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -63,7 +63,8 @@ export default createReactClass({
         }
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         this.setState({
             urls: this.getImageUrls(newProps),
         });
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 0f3fa8f5b5..a07750a768 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -267,7 +267,8 @@ class FilteredList extends React.PureComponent {
         };
     }
 
-    componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(nextProps) {
         if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
         this.setState({
             filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index febe0ff480..ab29723a45 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -46,7 +46,8 @@ export default createReactClass({
         };
     },
 
-    componentWillReceiveProps: function(props) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(props) {
         // Make sure the selected item isn't outside the list bounds
         const selected = this.state.selected;
         const maxSelected = this._maxSelected(props.addressList);
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 8940a175e9..7696db9cf6 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -262,7 +262,8 @@ export default class AppTile extends React.Component {
         });
     }
 
-    componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(nextProps) {
         if (nextProps.app.url !== this.props.app.url) {
             this._getNewState(nextProps);
             // Fetch IM token for new URL if we're showing and have permission to load
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index ed5928eb08..2651f8e039 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -128,7 +128,8 @@ export default class Dropdown extends React.Component {
         document.removeEventListener('click', this._onDocumentClick, false);
     }
 
-    componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(nextProps) {
         if (!nextProps.children || nextProps.children.length === 0) {
             return;
         }
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index af05600e3c..82f5eef125 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -62,7 +62,8 @@ export default createReactClass({
         };
     },
 
-    componentWillReceiveProps: function(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(nextProps) {
         if (nextProps.initialValue !== this.props.initialValue) {
             this.value = nextProps.initialValue;
             if (this._editable_div.current) {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 0af772466b..a8c804c534 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -81,7 +81,8 @@ export default class Flair extends React.Component {
         this._unmounted = true;
     }
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         this._generateAvatars(newProps.groups);
     }
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 28a26be06c..1e31c634f7 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -82,7 +82,8 @@ const Pill = createReactClass({
         };
     },
 
-    async componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    async UNSAFE_componentWillReceiveProps(nextProps) {
         let resourceId;
         let prefix;
 
@@ -158,7 +159,7 @@ const Pill = createReactClass({
     componentDidMount() {
         this._unmounted = false;
         this._matrixClient = MatrixClientPeg.get();
-        this.componentWillReceiveProps(this.props); // HACK: We shouldn't be calling lifecycle functions ourselves.
+        this.UNSAFE_componentWillReceiveProps(this.props); // HACK: We shouldn't be calling lifecycle functions ourselves.
     },
 
     componentWillUnmount() {
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index 43fd3c2f84..948b4835d5 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -67,7 +67,8 @@ export default createReactClass({
         this._initStateFromProps(this.props);
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         this._initStateFromProps(newProps);
     },
 
diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.js
index bce65cf1a9..a4dc97d46e 100644
--- a/src/components/views/elements/SyntaxHighlight.js
+++ b/src/components/views/elements/SyntaxHighlight.js
@@ -31,7 +31,6 @@ export default class SyntaxHighlight extends React.Component {
     }
 
     // componentDidUpdate used here for reusability
-    // componentWillReceiveProps fires too early to call highlightBlock on.
     componentDidUpdate() {
         if (this._el) highlightBlock(this._el);
     }
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 95517ef548..9f5660386b 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -54,7 +54,8 @@ export default createReactClass({
         this._initGroupStore(this.props.groupId);
     },
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.groupId !== this.props.groupId) {
             this._unregisterGroupStore(this.props.groupId);
             this._initGroupStore(newProps.groupId);
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 789396e719..3a20de7eca 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -51,7 +51,8 @@ export default createReactClass({
         this._initGroupStore(this.props.groupId);
     },
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         if (newProps.groupId !== this.props.groupId) {
             this._unregisterGroupStore(this.props.groupId);
             this._initGroupStore(newProps.groupId);
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 785d7ecccb..f7c5e8122f 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -71,7 +71,8 @@ export default createReactClass({
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
     },
 
-    componentWillReceiveProps(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(newProps) {
         // Room has changed probably, update apps
         this._updateApps();
     },
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a381a02d80..aed2d4b25b 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -254,7 +254,8 @@ export default createReactClass({
         }
     },
 
-    componentWillReceiveProps: function(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(nextProps) {
         // re-check the sender verification as outgoing events progress through
         // the send process.
         if (nextProps.eventSendStatus !== this.props.eventSendStatus) {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index b387cefe91..9fdd2abedf 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -103,7 +103,8 @@ export default createReactClass({
         this._updateStateForNewMember(this.props.member);
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         if (this.props.member.userId !== newProps.member.userId) {
             this._updateStateForNewMember(newProps.member);
         }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 2c7ef8b6c0..0b06be48af 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -283,7 +283,8 @@ export default createReactClass({
         }
     },
 
-    componentWillReceiveProps: function(props) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(props) {
         // XXX: This could be a lot better - this makes the assumption that
         // the notification count may have changed when the properties of
         // the room tile change.
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 76644d38bc..d8baafd1bb 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -59,7 +59,8 @@ export default createReactClass({
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
     },
 
-    componentWillReceiveProps: function(newProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps: function(newProps) {
         if (this.avatarSet) {
             // don't clobber what the user has just set
             return;
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index afc538bd33..3a5a28fc43 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -58,7 +58,8 @@ export class EmailAddress extends React.Component {
         };
     }
 
-    componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(nextProps) {
         const { bound } = nextProps.email;
         this.setState({ bound });
     }
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 9addcda093..813623b7b9 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -50,7 +50,8 @@ export class PhoneNumber extends React.Component {
         };
     }
 
-    componentWillReceiveProps(nextProps) {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
+    UNSAFE_componentWillReceiveProps(nextProps) {
         const { bound } = nextProps.msisdn;
         this.setState({ bound });
     }

From f2c41a5da76a2088515be02a7b23b282d503fed4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:40:51 -0600
Subject: [PATCH 1943/3235] Silence another console.warn that should have been
 a log

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

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index c7d1714b69..c9793d40f7 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -100,7 +100,7 @@ export default class FromWidgetPostMessageApi {
             console.warn('Add FromWidgetPostMessageApi - Endpoint already registered');
             return;
         } else {
-            console.warn(`Adding fromWidget messaging endpoint for ${widgetId}`, endpoint);
+            console.log(`Adding fromWidget messaging endpoint for ${widgetId}`, endpoint);
             this.widgetMessagingEndpoints.push(endpoint);
         }
     }

From 5c2841323e58d5b22f488a3fc47607b9387a8463 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:45:54 -0600
Subject: [PATCH 1944/3235] Appease the linter by turning it off

---
 src/components/structures/RightPanel.js                   | 2 +-
 src/components/views/auth/ServerConfig.js                 | 2 +-
 src/components/views/dialogs/DevtoolsDialog.js            | 2 +-
 src/components/views/elements/AppTile.js                  | 2 +-
 src/components/views/elements/Dropdown.js                 | 2 +-
 src/components/views/elements/Flair.js                    | 2 +-
 src/components/views/elements/Pill.js                     | 2 +-
 src/components/views/settings/discovery/EmailAddresses.js | 2 +-
 src/components/views/settings/discovery/PhoneNumbers.js   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 856a3764a1..3c97d2f4ae 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -124,7 +124,7 @@ export default class RightPanel extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {
+    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
         if (newProps.groupId !== this.props.groupId) {
             this._unregisterGroupStore(this.props.groupId);
             this._initGroupStore(newProps.groupId);
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index 7ec4311d2f..ee6f57a521 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -73,7 +73,7 @@ export default class ServerConfig extends React.PureComponent {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {
+    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
         if (newProps.serverConfig.hsUrl === this.state.hsUrl &&
             newProps.serverConfig.isUrl === this.state.isUrl) return;
 
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index a07750a768..de0923306f 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -268,7 +268,7 @@ class FilteredList extends React.PureComponent {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         if (this.props.children === nextProps.children && this.props.query === nextProps.query) return;
         this.setState({
             filteredChildren: FilteredList.filterChildren(nextProps.children, nextProps.query),
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 7696db9cf6..c49510b8b6 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -263,7 +263,7 @@ export default class AppTile extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         if (nextProps.app.url !== this.props.app.url) {
             this._getNewState(nextProps);
             // Fetch IM token for new URL if we're showing and have permission to load
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 2651f8e039..6b3efb5ee1 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -129,7 +129,7 @@ export default class Dropdown extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         if (!nextProps.children || nextProps.children.length === 0) {
             return;
         }
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index a8c804c534..bc657e9e91 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -82,7 +82,7 @@ export default class Flair extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {
+    UNSAFE_componentWillReceiveProps(newProps) {  // eslint-disable-line camelcase
         this._generateAvatars(newProps.groups);
     }
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 1e31c634f7..0b60d7093b 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -83,7 +83,7 @@ const Pill = createReactClass({
     },
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    async UNSAFE_componentWillReceiveProps(nextProps) {
+    async UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line new-cap
         let resourceId;
         let prefix;
 
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index 3a5a28fc43..f9a1ba1818 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -59,7 +59,7 @@ export class EmailAddress extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         const { bound } = nextProps.email;
         this.setState({ bound });
     }
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 813623b7b9..03f459ee15 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -51,7 +51,7 @@ export class PhoneNumber extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(nextProps) {
+    UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         const { bound } = nextProps.msisdn;
         this.setState({ bound });
     }

From 31ec984c861e37173a1b89f669cebe9b6b60ec82 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 14:49:39 -0600
Subject: [PATCH 1945/3235] Actually appease the linter

---
 src/components/views/elements/Pill.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 0b60d7093b..1df12738c5 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -83,7 +83,7 @@ const Pill = createReactClass({
     },
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    async UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line new-cap
+    async UNSAFE_componentWillReceiveProps(nextProps) {
         let resourceId;
         let prefix;
 
@@ -159,6 +159,8 @@ const Pill = createReactClass({
     componentDidMount() {
         this._unmounted = false;
         this._matrixClient = MatrixClientPeg.get();
+
+        // eslint-disable-next-line new-cap
         this.UNSAFE_componentWillReceiveProps(this.props); // HACK: We shouldn't be calling lifecycle functions ourselves.
     },
 

From 8e405dda2e5ec77f9063ced1abd0154eab96bad4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 16:22:42 -0600
Subject: [PATCH 1946/3235] Fix soft crash when editing message

Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
---
 src/components/views/rooms/BasicMessageComposer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index df62823360..a967488ad3 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -94,7 +94,8 @@ export default class BasicMessageEditor extends React.Component {
         this._emoticonSettingHandle = null;
     }
 
-    componentDidUpdate(prevProps) {
+    // TODO: [REACT-WARNING] Move into better lifecycle position
+    UNSAFE_componentWillUpdate(prevProps) {
         if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {

From c5cf04f6d2566e4ab46e951290aa0cc2c8a6d73a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 16:25:59 -0600
Subject: [PATCH 1947/3235] More appeasing of the linter

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

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index a967488ad3..7042cdc00d 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -95,7 +95,7 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Move into better lifecycle position
-    UNSAFE_componentWillUpdate(prevProps) {
+    UNSAFE_componentWillUpdate(prevProps) { // eslint-disable-line camelcase
         if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {

From faa4f54c971c15b59d70ad6c4dd635c7a9ade507 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 2 Apr 2020 00:12:48 +0100
Subject: [PATCH 1948/3235] Only apply padding to standard textual buttons
 (kind buttons)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/right_panel/_UserInfo.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index d0e13aa06b..d4ea823131 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -266,7 +266,7 @@ limitations under the License.
         }
     }
 
-    .mx_AccessibleButton {
+    .mx_AccessibleButton.mx_AccessibleButton_hasKind {
         padding: 8px 18px;
 
         &.mx_AccessibleButton_kind_primary {

From 4402398d9074b7bddebfc707da31576b83e433d0 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Wed, 1 Apr 2020 21:24:27 +0000
Subject: [PATCH 1949/3235] Translated using Weblate (Dutch)

Currently translated at 94.1% (2123 of 2256 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 874ae9bf3a..95a49bce8c 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -254,7 +254,7 @@
     "Room Colour": "Gesprekskleur",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is op dit moment niet toegankelijk.",
-    "Rooms": "Gesprekken",
+    "Rooms": "Groepsgesprekken",
     "Save": "Opslaan",
     "Scroll to bottom of page": "Scroll naar de onderkant van de pagina",
     "Search failed": "Zoeken mislukt",

From 9d33d16104e7aa236fd98c737b53541dc559f132 Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Wed, 1 Apr 2020 20:59:44 +0000
Subject: [PATCH 1950/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 52.9% (1194 of 2256 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index bb2e51a5af..bae0f650b3 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -58,7 +58,7 @@
     "Add to community": "Legg til i fellesskapet",
     "Failed to invite the following users to %(groupId)s:": "Fekk ikkje til å invitera følgjande brukarar i %(groupId)s:",
     "Failed to invite users to community": "Fekk ikkje til å invitera brukarar til fellesskapet.",
-    "Failed to invite users to %(groupId)s": "Fekk ikkje til å byda brukarar inn til %(groupId)s",
+    "Failed to invite users to %(groupId)s": "Fekk ikkje til å invitera brukarar til %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Fekk ikkje til å invitera følgjande rom til %(groupId)s:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje tillating til å senda deg varsel - ver venleg og sjekk nettlesarinnstillingane dine",
     "Riot was not given permission to send notifications - please try again": "Riot fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
@@ -69,17 +69,17 @@
     "Restricted": "Avgrensa",
     "Moderator": "Moderator",
     "Admin": "Administrator",
-    "Start a chat": "Start ei samtale",
+    "Start a chat": "Start ein samtale",
     "Operation failed": "Handling mislukkast",
-    "Failed to invite": "Fekk ikkje til å byda inn",
-    "Failed to invite the following users to the %(roomName)s room:": "Dei fylgjande brukarane lét seg ikkje byda inn til %(roomName)s:",
+    "Failed to invite": "Fekk ikkje til å invitera",
+    "Failed to invite the following users to the %(roomName)s room:": "Fekk ikkje til å invitera følgjande brukarar til %(roomName)s:",
     "You need to be logged in.": "Du må vera logga inn.",
-    "You need to be able to invite users to do that.": "Du må kunna byda brukarar inn for å gjera det.",
+    "You need to be able to invite users to do that.": "Du må ha lov til å invitera brukarar for å gjera det.",
     "Unable to create widget.": "Klarte ikkje å laga widget.",
     "Missing roomId.": "Manglande roomId.",
     "Failed to send request.": "Fekk ikkje til å senda førespurnad.",
     "This room is not recognised.": "Rommet er ikkje attkjend.",
-    "Power level must be positive integer.": "Makthøgda må vera eit positivt heiltal.",
+    "Power level must be positive integer.": "Tilgangsnivået må vera eit positivt heiltal.",
     "You are not in this room.": "Du er ikkje i dette rommet.",
     "You do not have permission to do that in this room.": "Du har ikkje lov til å gjera det i dette rommet.",
     "Missing room_id in request": "Manglande room_Id i førespurnad",
@@ -91,7 +91,7 @@
     "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
     "/ddg is not a command": "/ddg er ikkje ein kommando",
     "Changes your display nickname": "Forandrar kallenamnet ditt",
-    "Invites user with given id to current room": "Byd brukarar med den gjevne IDen inn til det noverande rommet",
+    "Invites user with given id to current room": "Inviter brukarar med fylgjande ID inn i gjeldande rom",
     "Joins room with given alias": "Gjeng inn i eit rom med det gjevne aliaset",
     "Leave room": "Far frå rommet",
     "Unrecognised room alias:": "Ukjend romalias:",
@@ -103,12 +103,12 @@
     "Stops ignoring a user, showing their messages going forward": "Sluttar å oversjå ein brukar, slik at meldingane deira no kan sjåast",
     "Unignored user": "Avoversedd brukar",
     "You are no longer ignoring %(userId)s": "Du overser ikkje %(userId)s no lenger",
-    "Define the power level of a user": "Set ein brukar si makthøgd",
+    "Define the power level of a user": "Sett tilgangsnivået til ein brukar",
     "This email address is already in use": "Denne e-postadressa er allereie i bruk",
     "The platform you're on": "Platformen du er på",
     "Failed to verify email address: make sure you clicked the link in the email": "Fekk ikkje til å stadfesta e-postadressa: sjå til at du klikka på den rette lenkja i e-posten",
     "Your identity server's URL": "Din identitetstenar si nettadresse",
-    "Every page you use in the app": "Alle sider du brukar i æppen",
+    "Every page you use in the app": "Alle sider du brukar i programmet",
     "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
     "Your User Agent": "Din Brukaragent",
     "Analytics": "Statistikk",
@@ -155,13 +155,13 @@
     "(unknown failure: %(reason)s)": "(ukjend feil: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s avslutta samtalen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterte %(targetDisplayName)s til å bli med i rommet.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemar frå då dei vart invitert.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemer frå då dei kom inn.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg for alle rommedlemer.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde slik at den framtidige romhistoria er tilgjengeleg for alle rommedlemmar frå då dei vart invitert.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s gjorde slik at framtidig romhistorie er tilgjengeleg for alle rommedlemmar frå då dei kom inn.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s gjorde framtidig romhistorie tilgjengeleg for alle rommedlemmar.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s gjorde den framtidige romhistoria tilgjengelg for kven som helst.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde den framtidige romhistoria tilgjengeleg til ukjende (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s frå %(fromPowerLevel)s til %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s endra makthøgda til %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s endra tilgangsnivået til %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s endra dei festa meldingane i rommet.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget endra av %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget lagt til av %(senderName)s",
@@ -190,19 +190,19 @@
     "Enable URL previews by default for participants in this room": "Skru URL-førehandsvisingar på som utgangspunkt for deltakarar i dette rommet",
     "Room Colour": "Romfarge",
     "Enable widget screenshots on supported widgets": "Skru widget-skjermbilete på for støtta widgetar",
-    "Collecting app version information": "Samlar æppversjoninfo",
+    "Collecting app version information": "Samlar versjonsinfo for programmet",
     "Collecting logs": "Samlar loggar",
     "Uploading report": "Lastar rapport opp",
     "Waiting for response from server": "Ventar på svar frå tenaren",
     "Messages containing my display name": "Meldingar som inneheld visingsnamnet mitt",
     "Messages in one-to-one chats": "Meldingar i ein-til-ein-samtaler",
     "Messages in group chats": "Meldingar i gruppesamtaler",
-    "When I'm invited to a room": "Når eg er boden inn til eit rom",
+    "When I'm invited to a room": "Når eg blir invitert til eit rom",
     "Call invitation": "Samtaleinnbydingar",
     "Messages sent by bot": "Meldingar sendt frå ein bot",
     "Active call (%(roomName)s)": "Pågåande samtale (%(roomName)s)",
     "unknown caller": "ukjend ringar",
-    "Incoming voice call from %(name)s": "%(name)s ynskjer ei røystsamtale",
+    "Incoming voice call from %(name)s": "Innkommande talesamtale frå %(name)s",
     "Incoming video call from %(name)s": "%(name)s ynskjer ei videosamtale",
     "Incoming call from %(name)s": "%(name)s ynskjer ei samtale",
     "Decline": "Sei nei",
@@ -246,8 +246,8 @@
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nykelord følgjer reglar som ikkje kan visast her:",
     "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
     "Notification targets": "Varselmål",
-    "Advanced notification settings": "Omfattande varselinnstillingar",
-    "There are advanced notifications which are not shown here": "Det er omfattande varsel som ikkje er vist her",
+    "Advanced notification settings": "Avanserte varslingsinnstillingar",
+    "There are advanced notifications which are not shown here": "Det finst avanserte varslingar som ikkje er synlege her",
     "Show message in desktop notification": "Vis meldinga i eit skriverbordsvarsel",
     "Off": "Av",
     "On": "På",
@@ -257,7 +257,7 @@
     "Drop File Here": "Slepp Fila Her",
     "Drop file here to upload": "Slipp ein fil her for å lasta opp",
     " (unsupported)": " (ustøtta)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå inn som <voiceText>røyst</voiceText> eller <videoText>video</videoText>.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå inn med <voiceText>tale</voiceText> eller <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Ein gruppesamtale er i gang%(supportedText)s.",
     "This event could not be displayed": "Denne hendingen kunne ikkje visast",
     "%(senderName)s sent an image": "%(senderName)s sende eit bilete",
@@ -265,63 +265,63 @@
     "%(senderName)s uploaded a file": "%(senderName)s lasta ei fil opp",
     "Options": "Innstillingar",
     "Key request sent.": "Nykelforespurnad er send.",
-    "Please select the destination room for this message": "Ver venleg og vel målrommet for denne meldinga",
+    "Please select the destination room for this message": "Vel kva rom som skal få denne meldinga",
     "Blacklisted": "Svartelista",
     "device id: ": "einingsID: ",
-    "Disinvite": "Fjern innbyding",
+    "Disinvite": "Fjern invitasjon",
     "Kick": "Spark ut",
-    "Disinvite this user?": "Fjern innbydinga til denne brukaren?",
+    "Disinvite this user?": "Fjern invitasjonen for denne brukaren?",
     "Kick this user?": "Spark denne brukaren ut?",
     "Failed to kick": "Fekk ikkje til å sparka ut",
     "Unban": "Slepp inn att",
     "Ban": "Steng ute",
     "Unban this user?": "Slepp denne brukaren inn att?",
     "Ban this user?": "Steng denne brukaren ute?",
-    "Failed to ban user": "Fekk ikkje til å utestenga brukar",
-    "Demote yourself?": "Senk høgda di?",
-    "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.": "Du kan ikkje gjera om på denne endringa sidan du senkar høgda di. Viss du er den siste opphøgda brukaren i rommet vert det umogeleg å få høgda att.",
-    "Demote": "Senk høgda",
-    "Failed to mute user": "Fekk ikkje til å stilne brukar",
-    "Failed to toggle moderator status": "Fekk ikkje til å veksla moderatorhøgd",
-    "Failed to change power level": "Fekk ikkje til å endra makthøgda",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kjem ikkje til å kunna gjera om på denne endringa sidan du set brukaren si høgd opp til di eiga.",
+    "Failed to ban user": "Fekk ikkje til å stenge ute brukaren",
+    "Demote yourself?": "Senke ditt eige tilgangsnivå?",
+    "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.": "Du kan ikkje gjera om på denne endringa sidan du senkar tilgangsnivået ditt. Viss du er den siste privilegerte brukaren i rommet vil det bli umogleg å få tilbake tilgangsrettane.",
+    "Demote": "Degrader",
+    "Failed to mute user": "Fekk ikkje til å dempe brukaren",
+    "Failed to toggle moderator status": "Fekk ikkje til å skifte moderatorstatus",
+    "Failed to change power level": "Fekk ikkje til å endra tilgangsnivået",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kan ikkje angre denne endringa, fordi brukaren du forfremmar vil få same tilgangsnivå som du har no.",
     "Are you sure?": "Er du sikker?",
     "Unignore": "Slutt å oversjå",
     "Ignore": "Oversjå",
     "Mention": "Nemn",
-    "Invite": "Byd inn",
+    "Invite": "Inviter",
     "Enable inline URL previews by default": "Skru URL-førehandsvising i tekstfeltet på",
-    "Share Link to User": "Del Brukarlenkje",
+    "Share Link to User": "Del ei lenke til brukaren",
     "User Options": "Brukarinnstillingar",
-    "Direct chats": "Direktesamtaler",
-    "Unmute": "Fjern stilning",
-    "Mute": "Stiln",
-    "Revoke Moderator": "Fjern Moderatorrett",
+    "Direct chats": "Direktesamtalar",
+    "Unmute": "Fjern demping",
+    "Mute": "Demp",
+    "Revoke Moderator": "Fjern Moderatorrettigheit",
     "Make Moderator": "Gjer til Moderator",
     "Admin Tools": "Administratorverktøy",
-    "and %(count)s others...|other": "og %(count)s til...",
-    "and %(count)s others...|one": "og ein til...",
-    "Invited": "Innboden",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (makthøgd %(powerLevelNumber)s)",
+    "and %(count)s others...|other": "og %(count)s andre...",
+    "and %(count)s others...|one": "og ein annan...",
+    "Invited": "Invitert",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tilgangsnivå %(powerLevelNumber)s)",
     "Attachment": "Vedlegg",
     "Hangup": "Legg på",
-    "Voice call": "Røystesamtale",
+    "Voice call": "Taleanrop",
     "Video call": "Videosamtale",
-    "Upload file": "Last ei fil opp",
+    "Upload file": "Last opp fil",
     "Send an encrypted reply…": "Send eit kryptert svar…",
-    "Send a reply (unencrypted)…": "Send eit svar (ikkje-kryptert)…",
+    "Send a reply (unencrypted)…": "Send eit svar (ukryptert)…",
     "Send an encrypted message…": "Send ei kryptert melding…",
-    "Send a message (unencrypted)…": "Send ei melding (ikkje-kryptert)…",
-    "You do not have permission to post to this room": "Du har ikkje tillating til å senda meldingar i dette rommet",
+    "Send a message (unencrypted)…": "Send ei melding (ukryptert)…",
+    "You do not have permission to post to this room": "Du har ikkje lov til å senda meldingar i dette rommet",
     "Server error": "Noko gjekk gale med tenaren",
-    "Server unavailable, overloaded, or something else went wrong.": "tenaren var utilgjengeleg, overlasta, elles so gjekk noko anna galt.",
-    "Command error": "Noko gjekk gale med påbodet",
+    "Server unavailable, overloaded, or something else went wrong.": "Tenar utilgjengeleg, overlasta eller har eit anna problem.",
+    "Command error": "Noko gjekk gale med kommandoen",
     "The maximum permitted number of widgets have already been added to this room.": "Det største mogelege talet widgets finst allereie på dette rommet.",
-    "Unpin Message": "Tak ned festa Melding",
+    "Unpin Message": "Fjern festa melding",
     "Jump to message": "Hopp til melding",
-    "No pinned messages.": "Inga festa meldingar.",
+    "No pinned messages.": "Ingen festa meldingar.",
     "Loading...": "Lastar...",
-    "Pinned Messages": "Festa Meldingar",
+    "Pinned Messages": "Festa meldingar",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)st",
@@ -334,74 +334,74 @@
     "Idle": "Fråverande",
     "Offline": "Fråkopla",
     "Unknown": "Ukjend",
-    "Seen by %(userName)s at %(dateTime)s": "%(userName)s såg dette %(dateTime)s",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s %(userName)s såg dette %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Sett av %(userName)s %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Sett av %(displayName)s %(userName)s %(dateTime)s",
     "Replying": "Svarar",
     "No rooms to show": "Ingen rom å visa",
     "Unnamed room": "Rom utan namn",
-    "Guests can join": "Gjester kan koma inn",
+    "Guests can join": "Gjester kan bli med",
     "Save": "Lagr",
     "(~%(count)s results)|other": "(~%(count)s resultat)",
     "(~%(count)s results)|one": "(~%(count)s resultat)",
-    "Join Room": "Far inn i Rom",
+    "Join Room": "Bli med i rom",
     "Upload avatar": "Last avatar opp",
     "Settings": "Innstillingar",
     "Forget room": "Gløym rom",
     "Search": "Søk",
     "Share room": "Del rom",
     "Community Invites": "Fellesskapsinvitasjonar",
-    "Invites": "Innbydingar",
-    "Favourites": "Yndlingar",
+    "Invites": "Invitasjonar",
+    "Favourites": "Favorittar",
     "Rooms": "Rom",
-    "Low priority": "Lågrett",
+    "Low priority": "Låg prioritet",
     "System Alerts": "Systemvarsel",
     "Historical": "Historiske",
     "This room": "Dette rommet",
-    "%(roomName)s does not exist.": "%(roomName)s finst ikkje.",
+    "%(roomName)s does not exist.": "%(roomName)s eksisterar ikkje.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s er ikkje tilgjengeleg no.",
     "Failed to unban": "Fekk ikkje til å lata inn att",
     "Banned by %(displayName)s": "Stengd ute av %(displayName)s",
-    "unknown error code": "ukjend errorkode",
+    "unknown error code": "ukjend feilkode",
     "Failed to forget room %(errCode)s": "Fekk ikkje til å gløyma rommet %(errCode)s",
     "No users have specific privileges in this room": "Ingen brukarar har særeigne rettar i dette rommet",
     "Privileged Users": "Brukarar med Særrett",
     "Muted Users": "Stilna Brukarar",
     "Banned users": "Utestengde Brukarar",
     "Favourite": "Yndling",
-    "Guests cannot join this room even if explicitly invited.": "Gjester kan ikkje koma inn i dette rommet sjølv viss dei er tydeleg innbodne.",
+    "Guests cannot join this room even if explicitly invited.": "Gjester kan ikkje bli med i dette rommet, sjølv om dei vart spesifikt invitert.",
     "Click here to fix": "Klikk her for å retta opp i det",
     "Who can access this room?": "Kven har tilgang til rommet?",
-    "Only people who have been invited": "Berre dei som er bodne inn",
+    "Only people who have been invited": "Berre dei som har vorte inviterte",
     "Anyone who knows the room's link, apart from guests": "Dei som kjenner lenkja til rommet, sett vekk frå gjester",
     "Anyone who knows the room's link, including guests": "Dei som kjenner lenkja til rommet, gjester òg",
     "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sitt romutval?",
     "Who can read history?": "Kven kan lesa historia?",
     "Anyone": "Kven som helst",
-    "Members only (since the point in time of selecting this option)": "Berre medlemer (frå då denne innstillinga vert skrudd på)",
-    "Members only (since they were invited)": "Berre medlemmer (frå då dei vart bodne inn)",
-    "Members only (since they joined)": "Berre medlemer (frå då dei kom inn)",
+    "Members only (since the point in time of selecting this option)": "Berre medlemmar (frå då denne innstillinga vart skrudd på)",
+    "Members only (since they were invited)": "Berre medlemmar (frå då dei vart inviterte inn)",
+    "Members only (since they joined)": "Berre medlemmar (frå då dei kom inn)",
     "Permissions": "Tillatinger",
-    "Advanced": "Omfattande",
-    "Add a topic": "Legg eit emne til",
+    "Advanced": "Avansert",
+    "Add a topic": "Legg til eit emne",
     "Search…": "Søk…",
-    "This Room": "Dette Rommet",
-    "All Rooms": "Alle Rom",
+    "This Room": "Dette rommet",
+    "All Rooms": "Alle rom",
     "Cancel": "Bryt av",
     "You don't currently have any stickerpacks enabled": "Du har for tida ikkje skrudd nokre klistremerkepakkar på",
     "Stickerpack": "Klistremerkepakke",
-    "Hide Stickers": "Gøym Klistremerkar",
-    "Show Stickers": "Vis Klistremerkar",
-    "Jump to first unread message.": "Hopp til den fyrste ulesne meldinga.",
+    "Hide Stickers": "Gøym klistremerker",
+    "Show Stickers": "Vis klistremerker",
+    "Jump to first unread message.": "Hopp til den fyrste uleste meldinga.",
     "Close": "Lukk",
     "Remote addresses for this room:": "Fjernadresser for dette rommet:",
     "Local addresses for this room:": "Lokaladresser for dette rommet:",
-    "This room has no local addresses": "Dette rommet har ingen lokaladresser",
+    "This room has no local addresses": "Dette rommet har ingen lokale adresser",
     "New address (e.g. #foo:%(localDomain)s)": "Ny adresse (t.d. #foo:%(localDomain)s)",
     "Invalid community ID": "Ugyldig fellesskaps-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gyldig fellesskaps-ID",
-    "Flair": "Særpreg",
-    "Showing flair for these communities:": "Viser særpreg for desse samfunna:",
-    "This room is not showing flair for any communities": "Dette rommet viser ikkje særpreg for nokre samfunn",
+    "Flair": "Etikett",
+    "Showing flair for these communities:": "Viser etikettar for desse fellesskapa:",
+    "This room is not showing flair for any communities": "Dette rommet viser ikkje etikettar for nokre fellesskap",
     "New community ID (e.g. +foo:%(localDomain)s)": "Ny fellesskaps-ID (t.d. +foo:%(localDomain)s)",
     "You have <a>enabled</a> URL previews by default.": "Du har <a>skrudd URL-førehandsvisingar på</a> i utgangspunktet.",
     "You have <a>disabled</a> URL previews by default.": "Du har <a>skrudd URL-førehandsvisingar av</a> i utgangspunktet.",
@@ -464,17 +464,17 @@
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Kunne ikkje oppdatera synligheita til '%(roomName)s' i %(groupId)s.",
     "Visibility in Room List": "Synligheit i Romlista",
     "Visible to everyone": "Synleg for alle",
-    "Only visible to community members": "Berre synleg for medlemar av fellesskapet",
-    "Something went wrong when trying to get your communities.": "Noko gjekk gale med framhentinga av samfunna dine.",
-    "Display your community flair in rooms configured to show it.": "Vis fellesskapsetiketten din i rom som er stilt inn til å visa det.",
-    "You're not currently a member of any communities.": "Du er for augeblunket ikkje medlem i nokre samfunn.",
+    "Only visible to community members": "Berre synleg for medlemmar av fellesskapet",
+    "Something went wrong when trying to get your communities.": "Noko gjekk gale under innlasting av fellesskapa du er med i.",
+    "Display your community flair in rooms configured to show it.": "Vis fellesskaps-etiketten din i rom som er stilt inn til å visa det.",
+    "You're not currently a member of any communities.": "Du er for tida ikkje medlem i nokon fellesskap.",
     "Yes, I want to help!": "Ja, eg vil vera til nytte!",
     "You are not receiving desktop notifications": "Du fær ikkje skrivebordsvarsel",
     "Enable them now": "Skru dei på no",
     "What's New": "Kva er nytt",
     "Update": "Oppdatering",
     "What's new?": "Kva er nytt?",
-    "A new version of Riot is available.": "Ei ny utgåve av Riot er tilgjengeleg.",
+    "A new version of Riot is available.": "Ein ny versjon av Riot er tilgjengeleg.",
     "To return to your account in future you need to <u>set a password</u>": "For å gå tilbake til brukaren din i framtida må du <u>setja eit passord</u>",
     "Set Password": "Set Passord",
     "Error encountered (%(errorDetail)s).": "Noko gjekk gale (%(errorDetail)s).",
@@ -494,7 +494,7 @@
     "Unblacklist": "Fjern frå svartelista",
     "Blacklist": "Legg til i svartelista",
     "No results": "Ingen resultat",
-    "Communities": "Samfunn",
+    "Communities": "Fellesskap",
     "Home": "Heim",
     "You cannot delete this image. (%(code)s)": "Du kan ikkje sletta dette biletet. (%(code)s)",
     "Uploaded on %(date)s by %(user)s": "Lasta opp %(date)s av %(user)s",
@@ -554,7 +554,7 @@
     "expand": "Utvid",
     "<a>In reply to</a> <pill>": "<a>Som svar til</a> <pill>",
     "Room directory": "Romutval",
-    "Start chat": "Byrj samtale",
+    "Start chat": "Start samtale",
     "And %(count)s more...|other": "Og %(count)s til...",
     "ex. @bob:example.com": "t.d. @ivar:eksempel.no",
     "Add User": "Legg Brukar til",
@@ -567,7 +567,7 @@
     "Logs sent": "Loggar sende",
     "Thank you!": "Takk skal du ha!",
     "Failed to send logs: ": "Fekk ikkje til å senda loggar: ",
-    "Submit debug logs": "Send debøgg-loggar inn",
+    "Submit debug logs": "Send inn feil-logg",
     "Send logs": "Send loggar inn",
     "Unavailable": "Utilgjengeleg",
     "Changelog": "Endringslogg",
@@ -580,8 +580,8 @@
     "Create": "Lag",
     "Create Room": "Lag eit Rom",
     "World readable": "Kan lesast av alle",
-    "not specified": "Ikkje oppgjeven",
-    "Minimize apps": "Legg æppar ned",
+    "not specified": "Ikkje spesifisert",
+    "Minimize apps": "Minimer applikasjonar",
     "Confirm Removal": "Godkjenn Fjerning",
     "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.": "Er du sikker på at du vil fjerna (sletta) denne hendingen? Merk deg at vis du slettar eit romnamn eller ei emneendring kan det gjera om på endringa.",
     "Community IDs cannot be empty.": "Feltet Fellesskap-ID kan ikkje vera tomt.",
@@ -615,7 +615,7 @@
     "Refresh": "Hent fram på nytt",
     "Unable to restore session": "Kunne ikkje henta øykta fram att",
     "We encountered an error trying to restore your previous session.": "Noko gjekk gale med framhentinga av den førre øykta di.",
-    "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.": "Viss du har bruka ei nyare utgåve av Riot før, kan det henda at øykta di ikkje passar inn i denne utgåva. Lukk dette vindauget og gå attende til den nyare utgåva.",
+    "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.": "Viss du har tidligare brukt ein nyare versjon av Riot, kan sesjons-data vere inkompatibel med denne versjonen. Lukk dette vindauget og bytt til ein nyare versjon.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Det kan henda at å tømma nettlesarlageret rettar opp i det, men det loggar deg ut og kan gjera den krypterte pratehistoria uleseleg.",
     "Invalid Email Address": "Ugangbar Epostadresse",
     "This doesn't appear to be a valid email address": "Det ser ikkje ut til at epostadressa er gangbar",
@@ -652,7 +652,7 @@
     "Reject invitation": "Sei nei til innbyding",
     "Are you sure you want to reject the invitation?": "Er du sikker på at du vil seia nei til innbydinga?",
     "Unable to reject invite": "Klarte ikkje å seia nei til innbydinga",
-    "Reject": "Sei nei",
+    "Reject": "Avslå",
     "You cannot delete this message. (%(code)s)": "Du kan ikkje sletta meldinga. (%(code)s)",
     "Resend": "Send på nytt",
     "Cancel Sending": "Bryt Sending av",
@@ -675,14 +675,14 @@
     "Direct Chat": "Direktesamtale",
     "View Community": "Sjå Fellesskap",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Orsak, nettlesaren din klarer <b>ikkje</b> å køyra Riot.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange omfattande nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller i utprøving i nettlesaren din.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange avanserte nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller under utprøving i nettlesaren din.",
     "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!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
     "I understand the risks and wish to continue": "Eg forstår farane og vil gå fram",
     "Name": "Namn",
     "You must <a>register</a> to use this functionality": "Du må <a>melda deg inn</a> for å bruka denne funksjonen",
     "You must join the room to see its files": "Du må fare inn i rommet for å sjå filene dets",
     "There are no visible files in this room": "Det er ingen synlege filer i dette rommet",
-    "<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 samfunnssida di</h1>\n<p>\n    Bruk den Lange Skildringa for å ynskja nye medlemer velkomen, eller gje ut viktige <a href=\"foo\">lenkjer</a>\n</p>\n<p>\n    Du kan til og med bruka 'img' HTML-taggar!\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": "<h1>HTML for fellesskapssida di</h1>\n<p>\n    Bruk den Lange Skildringa for å ynskja nye medlemmar velkomen, eller gje ut viktige <a href=\"foo\">lenkjer</a>\n</p>\n<p>\n    Du kan til og med bruka 'img' HTML-taggar!\n</p>\n",
     "Add rooms to the community summary": "Legg rom til i samandraget for fellesskapet",
     "Which rooms would you like to add to this summary?": "Kva rom ynskjer du å leggja til i samanfattinga?",
     "Add to summary": "Legg til i samanfattinga",
@@ -705,7 +705,7 @@
     "Unable to leave community": "Fekk ikkje til å forlate fellesskapet",
     "Community Settings": "Fellesskapsinnstillingar",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Endringar gjort på <bold1>felleskapsnamn</bold1> og <bold2>felleskapsavatar</bold2> blir kanskje ikkje synleg for andre før etter 30 minutt.",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Desse romma vert viste for medlem i felleskapet på felleskapssida. Felleskapsmedlemar kan bli med i romma ved å klikke på dei.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Desse romma vert viste for medlem i felleskapet på felleskapssida. Felleskapsmedlemmar kan bli med i romma ved å klikka på dei.",
     "Add rooms to this community": "Legg rom til i fellesskapet",
     "Featured Rooms:": "Utvalde Rom:",
     "Featured Users:": "Utvalde Brukarar:",
@@ -733,14 +733,14 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "For å framleis bruka %(homeserverDomain)s sin heimtenar må du sjå over og seia deg einig i våre Vilkår og Føresetnader.",
     "Review terms and conditions": "Sjå over Vilkår og Føresetnader",
     "Old cryptography data detected": "Gamal kryptografidata vart oppdagen",
-    "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.": "Data frå ei eldre utgåve av Riot vart oppdagen. I den eldre utgåva hadde dette gjort at ende-til-ende-kryptografi ikkje verkar som det skal. Ende-til-ende-krypterte meldingar som vert utveksla nyleg med den gamle utgåva er det kanskje ikkje mogeleg å dekryptera i denne utgåva. Dette fører kanskje òg til at meldingar som vart utveksla med denne utgåva ikkje verkar. Viss du opplever vansker, logg ut og inn att. For å spara på meldingshistoria, hent nyklane dine ut og inn at.",
+    "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.": "Data frå ein eldre versjon av Riot er oppdaga. Dette kan ha gjort at ende-til-ende kryptering feilar i den eldre versjonen. Krypterte meldingar som er utveksla med den gamle versjonen er kanskje ikkje dekrypterbare i denne versjonen. Dette kan forårsake at meldingar utveksla mot denne versjonen vil feile. Opplever du problem med dette, kan du logge inn og ut igjen. For å behalde meldingshistorikk, eksporter og importer nøklane dine på nytt.",
     "Logout": "Loggar ut",
-    "Your Communities": "Dine Samfunn",
-    "Error whilst fetching joined communities": "Noko gjekk gale med innhentinga av samfunna du er i",
+    "Your Communities": "Dine fellesskap",
+    "Error whilst fetching joined communities": "Noko gjekk gale under innlasting av fellesskapa du med er i",
     "Create a new community": "Lag eit nytt fellesskap",
     "You have no visible notifications": "Du har ingen synlege varsel",
     "Members": "Medlemer",
-    "Invite to this room": "Byd inn til rommet",
+    "Invite to this room": "Inviter til dette rommet",
     "Files": "Filer",
     "Notifications": "Varsel",
     "Invite to this community": "Inviter til dette fellesskapet",
@@ -785,18 +785,18 @@
     "Uploading %(filename)s and %(count)s others|one": "Lastar opp %(filename)s og %(count)s andre",
     "Light theme": "Ljost preg",
     "Dark theme": "Dimt preg",
-    "Success": "Det gjekk",
+    "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
     "Import E2E room keys": "Hent E2E-romnyklar inn",
     "Cryptography": "Kryptografi",
-    "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.": "Viss du har sendt inn ein bøgg gjennom GitHub, kan debøgg-loggar hjelpa oss med å finna problemet. Debøgg-loggar inneheld data om æpp-bruk, b.a. Brukarnamnet ditt, IDane eller aliasa på romma eller gruppene du har vitja og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at vi kan forbetre æppen.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, so vi samlar ikkje på personleg eller attkjenneleg data for statistikken vår.",
+    "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.": "Viss du har rapportert inn feil via GitHub, kan feil-loggar hjelpa oss med å finna problemet. Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at ein kan forbetre applikasjonen.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, så vi samlar ikkje personlege eller identifiserbare data for statistikken vår.",
     "Learn more about how we use analytics.": "Finn ut meir om korleis vi brukar statistikk.",
     "Labs": "Labben",
     "Check for update": "Sjå etter oppdateringar",
-    "Reject all %(invitedRooms)s invites": "Sei nei til alle innbydingar frå %(invitedRooms)s",
+    "Reject all %(invitedRooms)s invites": "Kanseller alle invitasjonar frå %(invitedRooms)s",
     "Start automatically after system login": "Byrj av seg sjølv etter systeminnlogging",
     "No media permissions": "Ingen mediatilgang",
     "You may need to manually permit Riot to access your microphone/webcam": "Det kan henda at du må gje Riot tilgang til mikrofonen/nettkameraet for hand",
@@ -812,8 +812,8 @@
     "click to reveal": "klikk for å visa",
     "Homeserver is": "Heimtenaren er",
     "Identity Server is": "Identitetstenaren er",
-    "riot-web version:": "riot-web-utgåve:",
-    "olm version:": "olm-utgåve:",
+    "riot-web version:": "riot-web versjon:",
+    "olm version:": "olm versjon:",
     "Failed to send email": "Fekk ikkje til å senda eposten",
     "The email address linked to your account must be entered.": "Du må skriva epostadressa som er tilknytta brukaren din inn.",
     "A new password must be entered.": "Du må skriva eit nytt passord inn.",
@@ -862,11 +862,11 @@
     "Export E2E room keys": "Hent E2E-romnyklar ut",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Det kan henda at du stilte dei inn på ein annan klient enn Riot. Du kan ikkje stilla på dei i Riot men dei gjeld framleis",
     "Jump to read receipt": "Hopp til lesen-lappen",
-    "Filter room members": "Filtrer rommedlemer",
+    "Filter room members": "Filtrer rommedlemmar",
     "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.": "Når nokon legg ein URL med i meldinga si, kan ei URL-førehandsvising visast for å gje meir info om lenkja slik som tittelen, skildringa, og eit bilete frå nettsida.",
     "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?": "Du held på å verta teken til ei tredje-partisside so du kan godkjenna brukaren din til bruk med %(integrationsUrl)s. Vil du gå fram?",
     "Token incorrect": "Teiknet er gale",
-    "Filter community members": "Filtrer fellesskapssmedlemar",
+    "Filter community members": "Filtrer fellesskapssmedlemmar",
     "Custom Server Options": "Tilpassa tenar-innstillingar",
     "Filter community rooms": "Filtrer rom i fellesskapet",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake (ver venleg og sjå på <PolicyLink>Datakakeretningslinene våre</PolicyLink>).",
@@ -877,16 +877,16 @@
     "Popout widget": "Popp widget ut",
     "Manage Integrations": "Sjå over Innlegg",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
-    "Custom level": "Sjølvsett høgd",
+    "Custom level": "Tilpassa nivå",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Klarte ikkje å lasta handlinga som vert svara til. Anten finst ho ikkje elles har du ikkje tilgang til å sjå ho.",
-    "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.": "Debøgg-loggar inneheld æppbrukdata slik som brukarnamnet ditt, IDane eller aliasane på romma eller gruppene du har vore i og brukarnamna til andre brukarar. Dei inneheld ikkje meldingar.",
+    "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.": "Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
     "Send Custom Event": "Send Sjølvsett Hending",
     "Failed to send custom event.": "Fekk ikkje til å senda sjølvsett hending.",
     "State Key": "Tilstandsnykel",
     "Filter results": "Filtrer resultat",
     "Custom": "Sjølvsett",
     "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka samfunn for å filtrera Riot.im-opplevinga di!",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka fellesskap for å filtrera Riot.im-opplevinga di!",
     "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.": "For å setja opp eit filter, dra ein fellesskapsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det fellesskapet.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Bygg di eiga heimeside for å kreva din del av Matrix-verda.",
     "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
@@ -908,7 +908,7 @@
     "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.": "Å henta filen ut tillèt kven som helst som kan lesa ho å dekryptera alle krypterte meldingar du kan sjå, so du bør passa på å halda ho trygg. For å hjelpa til med dette bør du skriva ei passetning inn i feltet under, som vil brukast til å kryptere den uthenta dataen. Det vil berre vera mogeleg å henta dataen inn med den same passetninga.",
     "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.": "Dette tillèt deg å importere krypteringsnøklar som du tidlegare har eksportert frå ein annan Matrix-klient. Du har deretter moglegheit for å dekryptere alle meldingane som den andre klienten kunne dekryptere.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den eksporterte fila vil bli verna med ein passfrase. Du bør skriva passfrasen her, for å dekryptere fila.",
-    "Only room administrators will see this warning": "Berre romadministratorar vil sjå denne åtvaringa",
+    "Only room administrators will see this warning": "Berre rom-administratorar vil sjå denne åtvaringa",
     "Please <a>contact your service administrator</a> to continue using the service.": "Ver venleg og <a>tak kontakt med tenesteadministratoren</a> for å halda fram med å bruka tenesten.",
     "This homeserver has hit its Monthly Active User limit.": "Heimtenaren har truffe den Månadlege Grensa si for Aktive Brukarar.",
     "This homeserver has exceeded one of its resource limits.": "Heimtenaren har gått over ei av ressursgrensene sine.",
@@ -1026,7 +1026,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Sender ein melding som rein-tekst, utan å tolka den som markdown",
     "Upgrades a room to a new version": "Oppgraderer eit rom til ein ny versjon",
     "You do not have the required permissions to use this command.": "Du har ikkje tilgang til å utføra denne kommandoen.",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Åtvaring</b>: Oppgradering av eit rom vil <i>ikkje automatisk overføre rom-medlemane  til den nye versjonen av rommet.</i> Vi vil leggje ut ein link til det nye romme i den gamle utgåva av rommet - rom-medlemane må då klikka på denne linken for å medlem av det nye rommet.",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Åtvaring</b>: Oppgradering av eit rom vil <i>ikkje automatisk overføre rom-medlemmane  til den nye versjonen av rommet.</i> Vi vil leggje ut ein link til det nye romme i den gamle utgåva av rommet - rom-medlemmane må då klikka på denne linken for å medlem av det nye rommet.",
     "Changes your display nickname in the current room only": "Endrar kallenamnet ditt som er synleg i det gjeldande rommet",
     "Changes the avatar of the current room": "Endrar avataren for det gjeldande rommet",
     "Changes your avatar in this current room only": "Endrar din avatar for det gjeldande rommet",
@@ -1103,5 +1103,125 @@
     "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>",
     "Sign In or Create Account": "Logg inn eller opprett konto",
     "Create Account": "Opprett konto",
-    "Sends the given emote coloured as a rainbow": "Sendar emojien med regnbogefargar"
+    "Sends the given emote coloured as a rainbow": "Sendar emojien med regnbogefargar",
+    "You do not have permission to invite people to this room.": "Du har ikkje lov til å invitera andre til dette rommet.",
+    "The user must be unbanned before they can be invited.": "Blokkeringa av brukaren må fjernast før dei kan bli inviterte.",
+    "Show padlocks on invite only rooms": "Vis hengelås på lukka rom (invite-only)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Vis bli-med/forlat meldingar (ekskluderer invitasjonar/utkasting/blokkeringar)",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Spør før utsending av invitasjonar til potensielle ugyldige Matrix-IDar",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ved å fjerne koplinga mot din identitetstenar, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan heller ikkje invitera andre med e-post eller telefonnummer.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Å bruke ein identitetstenar er frivillig. Om du vel å ikkje bruke dette, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan ikkje invitera andre med e-post eller telefonnummer.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Passordet ditt vart endra. Du vil ikkje motta push-varslingar på andre sesjonar, før etter til at du har logga inn på nytt der",
+    "Error downloading theme information.": "Feil under nedlasting av temainformasjon.",
+    "Theme added!": "Tema lagt til!",
+    "Email addresses": "E-postadresser",
+    "Phone numbers": "Telefonnummer",
+    "Set a new account password...": "Lag nytt kontopassord...",
+    "Help & About": "Hjelp & Om",
+    "Bug reporting": "Feilrapportering",
+    "Accept all %(invitedRooms)s invites": "Aksepter alle invitasjonar frå %(invitedRooms)s",
+    "Security & Privacy": "Sikkerheit og personvern",
+    "Error changing power level requirement": "Feil under endring av krav for tilgangsnivå",
+    "Error changing power level": "Feil under endring av tilgangsnivå",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Ein feil skjedde under endring av tilgangsnivå. Sjekk at du har lov til dette, deretter prøv på nytt.",
+    "Invite users": "Inviter brukarar",
+    "Invite only": "Berre invitasjonar",
+    "Scroll to most recent messages": "Gå til dei nyaste meldingane",
+    "Close preview": "Lukk førehandsvisninga",
+    "No recent messages by %(user)s found": "Fann ingen nyare meldingar frå %(user)s",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Prøv å rulle oppover i historikken for å sjå om det finst nokon eldre.",
+    "Remove recent messages by %(user)s": "Fjern nyare meldingar frå %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du prøver å fjerna %(count)s meldingar frå %(user)s. Dette kan ikkje angrast. Ynskjer du å gå vidare?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du prøver å fjerna 1 melding frå %(user)s. Dette kan ikkje angrast. Ynskjer du å gå vidare?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Ved store mengder meldingar kan dette ta tid. Ver venleg å ikkje last om klienten din mens dette pågår.",
+    "Remove %(count)s messages|other": "Fjern %(count)s meldingar",
+    "Remove %(count)s messages|one": "Fjern 1 melding",
+    "Deactivate user?": "Deaktivere brukar?",
+    "Deactivate user": "Deaktiver brukar",
+    "Failed to deactivate user": "Fekk ikkje til å deaktivere brukaren",
+    "No sessions with registered encryption keys": "Ingen sesjonar med registrerte krypteringsnøklar",
+    "Remove recent messages": "Fjern nyare meldingar",
+    "Send a reply…": "Send eit svar…",
+    "Send a message…": "Send melding…",
+    "The conversation continues here.": "Samtalen held fram her.",
+    "This room has been replaced and is no longer active.": "Dette rommet er erstatta og er ikkje lenger aktivt.",
+    "Bold": "Feit",
+    "Italics": "Kursiv",
+    "Strikethrough": "Gjennomstreka",
+    "Code block": "Kodeblokk",
+    "Room %(name)s": "Rom %(name)s",
+    "Recent rooms": "Siste rom",
+    "Direct Messages": "Direktemeldingar",
+    "Joining room …": "Blir med i rommet…",
+    "Loading …": "Lastar…",
+    "Rejecting invite …": "Avviser invitasjon…",
+    "Join the conversation with an account": "Bli med i samtalen med ein konto",
+    "Sign Up": "Registrer deg",
+    "Loading room preview": "Lastar førehandsvisning av rommet",
+    "You were kicked from %(roomName)s by %(memberName)s": "Du vart sparka frå %(roomName)s av %(memberName)s",
+    "Reason: %(reason)s": "Grunn: %(reason)s",
+    "Forget this room": "Gløym dette rommet",
+    "Re-join": "Bli med på nytt",
+    "You were banned from %(roomName)s by %(memberName)s": "Du vart blokkert frå %(roomName)s av %(memberName)s",
+    "Something went wrong with your invite to %(roomName)s": "Noko gjekk gale med invitasjonen din for %(roomName)s",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Ein feilkode %(errcode)s vart returnert under validering av invitasjonen din. Send gjerne denne informasjonen til ein rom-administrator.",
+    "You can only join it with a working invite.": "Du kan berre bli med med ein fungerande invitasjon.",
+    "Try to join anyway": "Prøv å bli med likevel",
+    "You can still join it because this is a public room.": "Du kan fortsatt bli med fordi dette er eit offentleg rom.",
+    "Join the discussion": "Bli med i diskusjonen",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Invitasjonen til %(roomName)s vart sendt til %(email)s, som ikkje er tilknytta din konto",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Knytt denne e-posten opp til kontoen din under Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
+    "This invite to %(roomName)s was sent to %(email)s": "Denne invitasjonen for %(roomName)s vart sendt til %(email)s",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Bruk ein identitetstenar under Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
+    "Share this email in Settings to receive invites directly in Riot.": "Del denne e-postadresa i Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
+    "Do you want to chat with %(user)s?": "Ynskjer du å chatte med %(user)s?",
+    "<userName/> wants to chat": "<userName/> vil chatte med deg",
+    "Start chatting": "Start chatting",
+    "Do you want to join %(roomName)s?": "Ynskjer du å bli med i %(roomName)s?",
+    "<userName/> invited you": "<userName/> inviterte deg",
+    "Reject & Ignore user": "Avslå og ignorer brukar",
+    "You're previewing %(roomName)s. Want to join it?": "Du førehandsviser %(roomName)s. Ynskjer du å bli med ?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikkje førehandsvisast. Ynskjer du å bli med ?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Dette rommet eksisterar ikkje. Er du sikker på at du er på rett plass?",
+    "Try again later, or ask a room admin to check if you have access.": "Prøv igjen seinare, eller spør ein rom-administrator om du har tilgang.",
+    "Never lose encrypted messages": "Aldri la krypterte meldingar gå tapt",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldingane i rommet er sikra med ende-til-ende kryptering. Berre du og mottakarane har krypteringsnøklane for desse meldingane.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopier nøklane dine for å unngå i miste dei. <a>Les meir.</a>",
+    "Not now": "Ikkje no",
+    "Don't ask me again": "Ikkje spør meg igjen",
+    "%(count)s unread messages.|other": "%(count)s uleste meldingar.",
+    "%(count)s unread messages.|one": "1 ulesen melding.",
+    "Unread messages.": "Uleste meldingar.",
+    "Unknown Command": "Ukjend kommando",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kan bruke <code>/help</code> for å liste kommandoar. Meinte du å sende dette som ein melding ?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hint: Start meldinga med <code>//</code> for å starte den med skråstrek.",
+    "Send as message": "Send som melding",
+    "Failed to revoke invite": "Fekk ikkje til å trekke invitasjonen",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Fekk ikkje til å trekke invitasjonen. Det kan ha oppstått eit midlertidig problem på serveren, eller så har ikkje du tilstrekkelege rettigheiter for å trekke invitasjonen.",
+    "Revoke invite": "Trekk invitasjon",
+    "Invited by %(sender)s": "Invitert av %(sender)s",
+    "Mark all as read": "Merk alle som lesne",
+    "Error updating main address": "Feil under oppdatering av hovedadresse",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovedadressa for rommet. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av sekundæradresse. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
+    "Error creating alias": "Feil under oppretting av alias",
+    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppretting av dette aliaset. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
+    "You don't have permission to delete the alias.": "Du har ikkje lov å slette aliaset.",
+    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Det skjedde ein feil under fjerning av aliaset. Det kan hende at dette er midlertidig, eller at det ikkje eksisterar lengre.",
+    "Error removing alias": "Feil ved fjerning av alias",
+    "Main address": "Hovudadresse",
+    "Local address": "Lokal adresse",
+    "Published Addresses": "Publisert adresse",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Publiserte adresser kan bli brukt av alle uansett server for å bli med i rommet. For å publisere ei adresse, må den vere sett som ei lokal adresse fyrst.",
+    "Other published addresses:": "Andre publiserte adresser:",
+    "No other published addresses yet, add one below": "Ingen publiserte adresser til no, legg til ei under",
+    "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:server)",
+    "Local Addresses": "Lokale adresser",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimeserver (%(localDomain)s)",
+    "Error updating flair": "Oppdatering av etikett gjekk gale",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på server , eller så oppstod det ein feil.",
+    "Room Name": "Romnamn",
+    "Room Topic": "Rom-emne",
+    "Room avatar": "Rom-avatar",
+    "Power level": "Tilgangsnivå"
 }

From ec49dccadc1e132ff4db4ab1e4c35fe50ec2712c Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Wed, 1 Apr 2020 23:51:05 +0000
Subject: [PATCH 1951/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 52.9% (1194 of 2256 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index bae0f650b3..f44cf1e7e7 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1223,5 +1223,6 @@
     "Room Name": "Romnamn",
     "Room Topic": "Rom-emne",
     "Room avatar": "Rom-avatar",
-    "Power level": "Tilgangsnivå"
+    "Power level": "Tilgangsnivå",
+    "Voice & Video": "Tale & Video"
 }

From d19ef7cddd7314b307e83884d4c03b07447367c2 Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Wed, 1 Apr 2020 23:51:42 +0000
Subject: [PATCH 1952/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 55.4% (1250 of 2256 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index f44cf1e7e7..e4cba0347f 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -13,7 +13,7 @@
     "Answer": "Svar",
     "You are already in a call.": "Du er allereie i ei samtale.",
     "VoIP is unsupported": "VoIP er ikkje støtta",
-    "You cannot place VoIP calls in this browser.": "Du kan ikkje samtala med VoIP i denne nettlesaren.",
+    "You cannot place VoIP calls in this browser.": "Du kan ikkje utføre med anrop med VoIP i denne nettlesaren.",
     "You cannot place a call with yourself.": "Du kan ikkje samtala med deg sjølv.",
     "Could not connect to the integration server": "Kunne ikkje kopla til integreringstenaren",
     "Call in Progress": "Ei Samtale er i Gang",
@@ -21,7 +21,7 @@
     "A call is already in progress!": "Ei samtale er i gang allereie!",
     "Permission Required": "Tillating er Naudsynt",
     "You do not have permission to start a conference call in this room": "Du har ikkje tillating til å starta ei gruppesamtale i dette rommet",
-    "Upload Failed": "Opplasting Mislukkast",
+    "Upload Failed": "Opplasting mislukkast",
     "Sun": "sø",
     "Mon": "må",
     "Tue": "ty",
@@ -52,7 +52,7 @@
     "Invite new community members": "Inviter nye fellesskapsmedlem",
     "Invite to Community": "Inviter til Felleskapet",
     "Which rooms would you like to add to this community?": "Kva rom vil du leggja til i dette fellesskapet?",
-    "Show these rooms to non-members on the community page and room list?": "Vise desse romma til ikkje-medlem på fellesskapssida og romkatalogen?",
+    "Show these rooms to non-members on the community page and room list?": "Vis desse romma til ikkje-medlem på fellesskapssida og romkatalogen?",
     "Add rooms to the community": "Legg til rom i fellesskapet",
     "Room name or alias": "Romnamn eller alias",
     "Add to community": "Legg til i fellesskapet",
@@ -60,7 +60,7 @@
     "Failed to invite users to community": "Fekk ikkje til å invitera brukarar til fellesskapet.",
     "Failed to invite users to %(groupId)s": "Fekk ikkje til å invitera brukarar til %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Fekk ikkje til å invitera følgjande rom til %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje tillating til å senda deg varsel - ver venleg og sjekk nettlesarinnstillingane dine",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje lov til å senda deg varsel - sjekk nettlesarinnstillingane dine",
     "Riot was not given permission to send notifications - please try again": "Riot fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
     "Unable to enable Notifications": "Klarte ikkje å skru på Varsel",
     "This email address was not found": "Denne epostadressa var ikkje funnen",
@@ -93,7 +93,7 @@
     "Changes your display nickname": "Forandrar kallenamnet ditt",
     "Invites user with given id to current room": "Inviter brukarar med fylgjande ID inn i gjeldande rom",
     "Joins room with given alias": "Gjeng inn i eit rom med det gjevne aliaset",
-    "Leave room": "Far frå rommet",
+    "Leave room": "Forlat rommet",
     "Unrecognised room alias:": "Ukjend romalias:",
     "Kicks user with given id": "Sparkar brukarar med gjeven ID",
     "Bans user with given id": "Stengjer brukarar med den gjevne IDen ute",
@@ -117,7 +117,7 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka den, vent på at resultata fyller seg ut og tab gjennom dei.",
     "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
     "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
-    "Unverify": "Fjern godkjenning",
+    "Unverify": "Fjern verifikasjon",
     "Verify...": "Godkjenn...",
     "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
     "The remote side failed to pick up": "Den andre sida tok ikkje røret",
@@ -130,8 +130,8 @@
     "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterte %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s stengde %(targetName)s ute.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endra visingsnamnet sitt til %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s sette visingsnamnet sitt som %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjerna visingsnamnet sitt (%(oldDisplayName)s).",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s sette visningsnamnet sitt som %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjerna visningsnamnet sitt (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s fjerna profilbiletet sitt.",
     "%(senderName)s changed their profile picture.": "%(senderName)s endra profilbiletet sitt.",
     "%(senderName)s set a profile picture.": "%(senderName)s sette seg eit profilbilete.",
@@ -173,10 +173,10 @@
     "Unnamed Room": "Rom utan namn",
     "Your browser does not support the required cryptography extensions": "Nettlesaren din støttar ikkje dei naudsynte kryptografiske utvidingane",
     "Not a valid Riot keyfile": "Ikkje ei gyldig Riot-nykelfil",
-    "Authentication check failed: incorrect password?": "Godkjenningssjekk mislukkast: urett passord?",
+    "Authentication check failed: incorrect password?": "Authentiseringsforsøk mislukkast: feil passord?",
     "Failed to join room": "Fekk ikkje til å gå inn i rom",
     "Message Pinning": "Meldingsfesting",
-    "Use compact timeline layout": "Bruk smal tidslinjeutforming",
+    "Use compact timeline layout": "Bruk kompakt utforming for historikk",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidspunkt i 12-timarsform (t.d. 2:30pm)",
     "Always show message timestamps": "Vis alltid meldingstidspunkt",
     "Autoplay GIFs and videos": "Spel av GIFar og videoar med ein gong",
@@ -214,7 +214,7 @@
     "Add": "Legg til",
     "Failed to upload profile picture!": "Fekk ikkje til å lasta opp profilbilete!",
     "Upload new:": "Last opp ny:",
-    "No display name": "Ingen visingsnamn",
+    "No display name": "Ingen visningsnamn",
     "New passwords don't match": "Dei nye passorda samsvarar ikkje",
     "Passwords can't be empty": "Passordsfelta kan ikkje vera tomme",
     "Warning!": "Åtvaring!",
@@ -225,12 +225,12 @@
     "New Password": "Nytt Passord",
     "Confirm password": "Stadfest passord",
     "Change Password": "Endra Passord",
-    "Authentication": "Godkjenning",
+    "Authentication": "Authentisering",
     "Device ID": "EiningsID",
     "Last seen": "Sist sedd",
-    "Failed to set display name": "Fekk ikkje til å setja visingsnamn",
-    "Error saving email notification preferences": "Klarte ikkje å lagra foretrukne epostvarselinnstillingar",
-    "An error occurred whilst saving your email notification preferences.": "Noko gjekk gale med lagringa av dine foretrukne epostvarselinstillingar.",
+    "Failed to set display name": "Fekk ikkje til å setja visningsnamn",
+    "Error saving email notification preferences": "Klarte ikkje å lagra varslingsinnstillingar for e-post",
+    "An error occurred whilst saving your email notification preferences.": "Noko gjekk gale med lagringa av varslingsinnstillingar for e-post.",
     "Keywords": "Nykelord",
     "Enter keywords separated by a comma:": "Skriv inn nykelord med komma imellom:",
     "OK": "Greitt",
@@ -241,7 +241,7 @@
     "Notify for all other messages/rooms": "Varsl for alle andre meldingar/rom",
     "Notify me for anything else": "Varsl meg for kva som helst anna",
     "Enable notifications for this account": "Skru varsel på for denne brukaren",
-    "All notifications are currently disabled for all targets.": "Alle varsel er for augeblunket skrudd av for alle mål.",
+    "All notifications are currently disabled for all targets.": "Alle varsel er for akkurat no skrudd av for alle mål.",
     "Enable email notifications": "Skru epostvarsel på",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nykelord følgjer reglar som ikkje kan visast her:",
     "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
@@ -340,7 +340,7 @@
     "No rooms to show": "Ingen rom å visa",
     "Unnamed room": "Rom utan namn",
     "Guests can join": "Gjester kan bli med",
-    "Save": "Lagr",
+    "Save": "Lagre",
     "(~%(count)s results)|other": "(~%(count)s resultat)",
     "(~%(count)s results)|one": "(~%(count)s resultat)",
     "Join Room": "Bli med i rom",
@@ -363,10 +363,10 @@
     "Banned by %(displayName)s": "Stengd ute av %(displayName)s",
     "unknown error code": "ukjend feilkode",
     "Failed to forget room %(errCode)s": "Fekk ikkje til å gløyma rommet %(errCode)s",
-    "No users have specific privileges in this room": "Ingen brukarar har særeigne rettar i dette rommet",
-    "Privileged Users": "Brukarar med Særrett",
-    "Muted Users": "Stilna Brukarar",
-    "Banned users": "Utestengde Brukarar",
+    "No users have specific privileges in this room": "Ingen brukarar har spesifikke rettigheiter i dette rommet",
+    "Privileged Users": "Privilegerte brukarar",
+    "Muted Users": "Dempa brukarar",
+    "Banned users": "Utestengde brukarar",
     "Favourite": "Yndling",
     "Guests cannot join this room even if explicitly invited.": "Gjester kan ikkje bli med i dette rommet, sjølv om dei vart spesifikt invitert.",
     "Click here to fix": "Klikk her for å retta opp i det",
@@ -374,13 +374,13 @@
     "Only people who have been invited": "Berre dei som har vorte inviterte",
     "Anyone who knows the room's link, apart from guests": "Dei som kjenner lenkja til rommet, sett vekk frå gjester",
     "Anyone who knows the room's link, including guests": "Dei som kjenner lenkja til rommet, gjester òg",
-    "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sitt romutval?",
+    "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sitt romkatalog?",
     "Who can read history?": "Kven kan lesa historia?",
     "Anyone": "Kven som helst",
     "Members only (since the point in time of selecting this option)": "Berre medlemmar (frå då denne innstillinga vart skrudd på)",
     "Members only (since they were invited)": "Berre medlemmar (frå då dei vart inviterte inn)",
     "Members only (since they joined)": "Berre medlemmar (frå då dei kom inn)",
-    "Permissions": "Tillatinger",
+    "Permissions": "Tillatelsar",
     "Advanced": "Avansert",
     "Add a topic": "Legg til eit emne",
     "Search…": "Søk…",
@@ -440,7 +440,7 @@
     "A text message has been sent to %(msisdn)s": "Ei tekstmelding vart send til %(msisdn)s",
     "Please enter the code it contains:": "Ver venleg og skriv koden den inneheld inn:",
     "Code": "Kode",
-    "Start authentication": "Byrj godkjenning",
+    "Start authentication": "Start authentisering",
     "powered by Matrix": "Matrixdriven",
     "The email field must not be blank.": "Epostfeltet kan ikkje vera tomt.",
     "The phone number field must not be blank.": "Telefonnummerfeltet kan ikkje vera tomt.",
@@ -462,7 +462,7 @@
     "Failed to remove '%(roomName)s' from %(groupId)s": "Fekk ikkje til å fjerna '%(roomName)s' frå %(groupId)s",
     "Something went wrong!": "Noko gjekk gale!",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Kunne ikkje oppdatera synligheita til '%(roomName)s' i %(groupId)s.",
-    "Visibility in Room List": "Synligheit i Romlista",
+    "Visibility in Room List": "Synllegheit i romkatalogen",
     "Visible to everyone": "Synleg for alle",
     "Only visible to community members": "Berre synleg for medlemmar av fellesskapet",
     "Something went wrong when trying to get your communities.": "Noko gjekk gale under innlasting av fellesskapa du er med i.",
@@ -553,7 +553,7 @@
     "collapse": "Slå saman",
     "expand": "Utvid",
     "<a>In reply to</a> <pill>": "<a>Som svar til</a> <pill>",
-    "Room directory": "Romutval",
+    "Room directory": "Romkatalog",
     "Start chat": "Start samtale",
     "And %(count)s more...|other": "Og %(count)s til...",
     "ex. @bob:example.com": "t.d. @ivar:eksempel.no",
@@ -605,7 +605,7 @@
     "Toolbox": "Verktøykasse",
     "Developer Tools": "Utviklarverktøy",
     "An error has occurred.": "Noko gjekk gale.",
-    "Start verification": "Byrj godkjenning",
+    "Start verification": "Start verifikasjon",
     "Share without verifying": "Del utan å godkjenna",
     "Ignore request": "Oversjå førespurnad",
     "Encryption key request": "Krypteringsnykel-førespurnad",
@@ -619,7 +619,7 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Det kan henda at å tømma nettlesarlageret rettar opp i det, men det loggar deg ut og kan gjera den krypterte pratehistoria uleseleg.",
     "Invalid Email Address": "Ugangbar Epostadresse",
     "This doesn't appear to be a valid email address": "Det ser ikkje ut til at epostadressa er gangbar",
-    "Verification Pending": "Ventar på Godkjenning",
+    "Verification Pending": "Ventar på verifikasjon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ver venleg og sjekk eposten din og klikk på lenkja du har fått. Når det er gjort, klikk gå fram.",
     "Unable to add email address": "Klarte ikkje å leggja epostadressa til",
     "Unable to verify email address.": "Klarte ikkje å stadfesta epostadressa.",
@@ -669,12 +669,12 @@
     "All messages (noisy)": "Alle meldingar (bråket)",
     "All messages": "Alle meldingar",
     "Mentions only": "Berre når eg vert nemnd",
-    "Leave": "Far frå",
+    "Leave": "Forlat",
     "Forget": "Gløym",
     "Low Priority": "Lågrett",
     "Direct Chat": "Direktesamtale",
     "View Community": "Sjå Fellesskap",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Orsak, nettlesaren din klarer <b>ikkje</b> å køyra Riot.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklagar, nettlesaren din klarer <b>ikkje</b> å køyra Riot.",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange avanserte nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller under utprøving i nettlesaren din.",
     "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!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
     "I understand the risks and wish to continue": "Eg forstår farane og vil gå fram",
@@ -701,7 +701,7 @@
     "Unable to accept invite": "Fekk ikkje til å seia ja til innbydinga",
     "Unable to join community": "Fekk ikkje til å bli med i fellesskapet",
     "Leave Community": "Forlat fellesskapet",
-    "Leave %(groupName)s?": "Far frå %(groupName)s?",
+    "Leave %(groupName)s?": "Forlat %(groupName)s?",
     "Unable to leave community": "Fekk ikkje til å forlate fellesskapet",
     "Community Settings": "Fellesskapsinnstillingar",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Endringar gjort på <bold1>felleskapsnamn</bold1> og <bold2>felleskapsavatar</bold2> blir kanskje ikkje synleg for andre før etter 30 minutt.",
@@ -723,10 +723,10 @@
     "Failed to load %(groupId)s": "Fekk ikkje til å lasta %(groupId)s",
     "Failed to reject invitation": "Fekk ikkje til å seia nei til innbyding",
     "This room is not public. You will not be able to rejoin without an invite.": "Dette rommet er ikkje offentleg. Du kjem ikkje til å kunna koma inn att utan ei innbyding.",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Er du sikker på at du vil fara frå rommet '%(roomName)s'?",
-    "Failed to leave room": "Fekk ikkje til å fara frå rommet",
-    "Can't leave Server Notices room": "Kan ikkje fara frå Tenarvarsel-rommet",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dette rommet er for viktige meldingar frå Heimtenaren, so du kan ikkje fara frå det.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Er du sikker på at du vil forlate rommet '%(roomName)s'?",
+    "Failed to leave room": "Fekk ikkje til å forlate rommet",
+    "Can't leave Server Notices room": "Kan ikkje forlate Systemvarsel-rommet",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dette rommet er for viktige meldingar frå Heimtenaren, så du kan ikkje forlate det.",
     "Signed Out": "Logga Ut",
     "For security, this session has been signed out. Please sign in again.": "Av sikkerheitsgrunnar har denne øykta vorte logga ut. Ver venleg og logg inn att.",
     "Terms and Conditions": "Vilkår og Føresetnader",
@@ -762,7 +762,7 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan ogso velja enkelte meldingar til sending på nytt eller avbryting.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Send melding på nytt</resendText> eller <cancelText>avbryt</cancelText>.",
     "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
-    "Sent messages will be stored until your connection has returned.": "Sende meldingar lagrast ikkje før tilkoplinga di er attende.",
+    "Sent messages will be stored until your connection has returned.": "Sendte meldingar lagrast ikkje før tilkoplinga di er tilbake.",
     "Active call": "Pågåande samtale",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>byda andre inn</inviteText> eller <nowarnText>enda åtvaringa om det tomme rommet?</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar opp filer, er du sikker på at du vil avslutte?",
@@ -777,14 +777,14 @@
     "Click to mute video": "Klikk for å stilna videoen",
     "Click to unmute audio": "Klikk for å avstilna ljoden",
     "Click to mute audio": "Klikk for å dempe lyden",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Prøvde å laste eit bestemt punkt i rommet si tidslinje, men du har ikkje lov til å sjå den spesifike meldingen.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet si tidslinje, men klarde ikkje å finna det.",
-    "Failed to load timeline position": "Fekk ikkje til å lasta tidslinjestillinga",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Prøvde å laste eit bestemt punkt i rommet sin historikk, men du har ikkje lov til å sjå den spesifike meldingen.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet sin historikk, men klarde ikkje å finna det.",
+    "Failed to load timeline position": "Innlasting av punkt i historikken feila.",
     "Uploading %(filename)s and %(count)s others|other": "Lastar opp %(filename)s og %(count)s andre",
     "Uploading %(filename)s and %(count)s others|zero": "Lastar opp %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Lastar opp %(filename)s og %(count)s andre",
-    "Light theme": "Ljost preg",
-    "Dark theme": "Dimt preg",
+    "Light theme": "Lyst tema",
+    "Dark theme": "Mørkt tema",
     "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
@@ -797,7 +797,7 @@
     "Labs": "Labben",
     "Check for update": "Sjå etter oppdateringar",
     "Reject all %(invitedRooms)s invites": "Kanseller alle invitasjonar frå %(invitedRooms)s",
-    "Start automatically after system login": "Byrj av seg sjølv etter systeminnlogging",
+    "Start automatically after system login": "Start automagisk etter systeminnlogging",
     "No media permissions": "Ingen mediatilgang",
     "You may need to manually permit Riot to access your microphone/webcam": "Det kan henda at du må gje Riot tilgang til mikrofonen/nettkameraet for hand",
     "No Audio Outputs detected": "Ingen ljodavspelingseiningar funne",
@@ -829,7 +829,7 @@
     "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>.": "Kan ikkje koble til heimeserveren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</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.": "Kan ikkje kopla til heimtenaren - ver venleg og sjekk tilkoplinga di, og sjå til at <a>heimtenaren din sitt CCL-sertifikat</a> er stolt på og at ein nettlesartillegg ikkje hindrar førespurnader.",
     "Failed to fetch avatar URL": "Klarte ikkje å henta avatar-URLen",
-    "Set a display name:": "Set eit visingsnamn:",
+    "Set a display name:": "Set eit visningsnamn:",
     "Upload an avatar:": "Last opp ein avatar:",
     "This server does not support authentication with a phone number.": "Denne tenaren støttar ikkje stadfesting gjennom telefonnummer.",
     "Commands": "Kommandoar",
@@ -841,7 +841,7 @@
     "unknown device": "ukjend eining",
     "NOT verified": "IKKJE godkjend",
     "verified": "godkjend",
-    "Verification": "Godkjenning",
+    "Verification": "Verifikasjon",
     "Ed25519 fingerprint": "Ed25519-fingeravtrykk",
     "User ID": "Brukar-ID",
     "Curve25519 identity key": "Curve25519-identitetsnøkkel",
@@ -912,7 +912,7 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Ver venleg og <a>tak kontakt med tenesteadministratoren</a> for å halda fram med å bruka tenesten.",
     "This homeserver has hit its Monthly Active User limit.": "Heimtenaren har truffe den Månadlege Grensa si for Aktive Brukarar.",
     "This homeserver has exceeded one of its resource limits.": "Heimtenaren har gått over ei av ressursgrensene sine.",
-    "Whether or not you're logged in (we don't record your username)": "Anten du er innlogga eller ikkje ( lagrar vi ikkje brukarnamnet ditt)",
+    "Whether or not you're logged in (we don't record your username)": "Uansett om du er innlogga eller ikkje (så lagrar vi ikkje brukarnamnet ditt)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Fila %(fileName)s er større enn heimetenaren si grense for opplastningar",
     "Unable to load! Check your network connectivity and try again.": "Klarte ikkje lasta! Sjå på nettilkoplinga di og prøv igjen.",
     "Your Riot is misconfigured": "Riot-klienten din er feilkonfiguert",
@@ -1224,5 +1224,63 @@
     "Room Topic": "Rom-emne",
     "Room avatar": "Rom-avatar",
     "Power level": "Tilgangsnivå",
-    "Voice & Video": "Tale & Video"
+    "Voice & Video": "Tale & Video",
+    "Show a presence dot next to DMs in the room list": "Vis ein status-dot ved sida av DM-ar i romkatalogen",
+    "Show info about bridges in room settings": "Vis info om bruer under rominnstillingar",
+    "Show display name changes": "Vis endringar for visningsnamn",
+    "Match system theme": "Følg systemtema",
+    "Show shortcuts to recently viewed rooms above the room list": "Vis snarvegar til sist synte rom over romkatalogen",
+    "Show hidden events in timeline": "Vis skjulte hendelsar i historikken",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dette er di liste over brukarar/serverar du har blokkert - ikkje forlat rommet!",
+    "Upload": "Last opp",
+    "Show less": "Vis mindre",
+    "Show more": "Vis meir",
+    "Display Name": "Visningsnamn",
+    "Invalid theme schema.": "",
+    "Language and region": "Språk og region",
+    "General": "Generelt",
+    "Preferences": "Innstillingar",
+    "Room list": "Romkatalog",
+    "Timeline": "Historikk",
+    "Autocomplete delay (ms)": "Forsinkelse på autofullfør (ms)",
+    "Room information": "Rominformasjon",
+    "Developer options": "Utviklaralternativ",
+    "Open Devtools": "Opne Utviklingsverktøy",
+    "Room Addresses": "Romadresser",
+    "Sounds": "Lydar",
+    "Browse": "Bla gjennom",
+    "Change room avatar": "Endre rom-avatar",
+    "Change room name": "Endre romnamn",
+    "Change main address for the room": "Endre hovudadresse for rommet",
+    "Change history visibility": "Endre synlegheit for historikk",
+    "Change permissions": "Endre rettigheiter",
+    "Change topic": "Endre emne",
+    "Upgrade the room": "Oppgradere rommet",
+    "Enable room encryption": "Aktivere romkryptering",
+    "Modify widgets": "Endre programtillegg (widgets)",
+    "Default role": "Standard-rolle",
+    "Send messages": "Sende melding",
+    "Change settings": "Endre innstillingar",
+    "Kick users": "Sparke brukarar",
+    "Ban users": "Stenge ute brukarar",
+    "Remove messages": "Fjerne meldingar",
+    "Notify everyone": "Varsle alle",
+    "Send %(eventType)s events": "Sende %(eventType)s hendelsar",
+    "Roles & Permissions": "Roller & Tilgangsrettar",
+    "Select the roles required to change various parts of the room": "Juster roller som er påkrevd for å endre ulike deler av rommet",
+    "Once enabled, encryption cannot be disabled.": "Etter aktivering, kan ikkje kryptering bli deaktivert.",
+    "Your display name": "Ditt visningsnamn",
+    "Can't find this server or its room list": "Klarde ikkje å finne serveren eller romkatalogen til den",
+    "Upload completed": "Opplasting fullført",
+    "Cancelled signature upload": "Kansellerte opplasting av signatur",
+    "Unabled to upload": "Klarte ikkje å laste opp",
+    "Room Settings - %(roomName)s": "Rominnstillingar - %(roomName)s",
+    "Riot failed to get the public room list.": "Riot fekk ikkje til å hente offentleg romkatalog.",
+    "Room List": "Romkatalog",
+    "Navigate up/down in the room list": "Naviger opp/ned i romkatalogen",
+    "Select room from the room list": "Vel rom frå romkatalogen",
+    "Collapse room list section": "Minimer romkatalog-seksjonen",
+    "Expand room list section": "Utvid romkatalog-seksjonen",
+    "Clear room list filter field": "Nullstill filteret for romkatalogen",
+    "Scroll up/down in the timeline": "Rull opp/ned i historikken"
 }

From 87ba5f4c8a7852eaceea496e6972485a75bcc376 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 2 Apr 2020 03:16:02 +0000
Subject: [PATCH 1953/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2256 of 2256 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 32dc7532f4..e7c0e118d6 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2308,5 +2308,17 @@
     "Session backup key:": "工作階段備份金鑰：",
     "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown",
     "Cancel replying to a message": "取消回覆訊息",
-    "Sign in with SSO": "使用單一登入系統登入"
+    "Sign in with SSO": "使用單一登入系統登入",
+    "Use Single Sign On to continue": "使用單一登入繼續",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認新增此電子郵件地址。",
+    "Single Sign On": "單一登入",
+    "Confirm adding email": "確任新增電子郵件",
+    "Click the button below to confirm adding this email address.": "點擊下方按鈕以確認新增此電子郵件地址。",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認新增此電話號碼。",
+    "Confirm adding phone number": "確任新增電話號碼",
+    "Click the button below to confirm adding this phone number.": "點擊下方按鈕以確認新增此電話號碼。",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認刪除這些工作階段。",
+    "Confirm deleting these sessions": "確認刪除這些工作階段",
+    "Click the button below to confirm deleting these sessions.": "點擊下方按鈕以確認刪除這些工作階段。",
+    "Delete sessions": "刪除工作階段"
 }

From 0f1ebb01072e0bb99e5f43a1a2f892c3ef6a398a Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Thu, 2 Apr 2020 00:56:47 +0000
Subject: [PATCH 1954/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 57.0% (1287 of 2256 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index e4cba0347f..f71ab4fa94 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -183,7 +183,7 @@
     "Always show encryption icons": "Vis alltid krypteringsikon",
     "Disable Notifications": "Skru Varsel av",
     "Enable Notifications": "Skru Varsel på",
-    "Automatically replace plain text Emoji": "Erstatt Emojiar i plaintekst av seg sjølv",
+    "Automatically replace plain text Emoji": "Erstatt Emojiar i klartekst av seg sjølv",
     "Mirror local video feed": "Spegl den lokale videofeeden",
     "Send analytics data": "Send statistikkdata",
     "Enable URL previews for this room (only affects you)": "Skru URL-førehandsvisingar på for dette rommet (påverkar deg åleine)",
@@ -195,10 +195,10 @@
     "Uploading report": "Lastar rapport opp",
     "Waiting for response from server": "Ventar på svar frå tenaren",
     "Messages containing my display name": "Meldingar som inneheld visingsnamnet mitt",
-    "Messages in one-to-one chats": "Meldingar i ein-til-ein-samtaler",
-    "Messages in group chats": "Meldingar i gruppesamtaler",
+    "Messages in one-to-one chats": "Meldingar i ein-til-ein-samtalar",
+    "Messages in group chats": "Meldingar i gruppesamtalar",
     "When I'm invited to a room": "Når eg blir invitert til eit rom",
-    "Call invitation": "Samtaleinnbydingar",
+    "Call invitation": "Samtaleinvitasjonar",
     "Messages sent by bot": "Meldingar sendt frå ein bot",
     "Active call (%(roomName)s)": "Pågåande samtale (%(roomName)s)",
     "unknown caller": "ukjend ringar",
@@ -220,7 +220,7 @@
     "Warning!": "Åtvaring!",
     "Continue": "Gå fram",
     "Do you want to set an email address?": "Vil du setja ei epostadresse?",
-    "Current password": "Noverande passord",
+    "Current password": "Gjeldande passord",
     "Password": "Passord",
     "New Password": "Nytt Passord",
     "Confirm password": "Stadfest passord",
@@ -231,19 +231,19 @@
     "Failed to set display name": "Fekk ikkje til å setja visningsnamn",
     "Error saving email notification preferences": "Klarte ikkje å lagra varslingsinnstillingar for e-post",
     "An error occurred whilst saving your email notification preferences.": "Noko gjekk gale med lagringa av varslingsinnstillingar for e-post.",
-    "Keywords": "Nykelord",
-    "Enter keywords separated by a comma:": "Skriv inn nykelord med komma imellom:",
+    "Keywords": "Nøkkelord",
+    "Enter keywords separated by a comma:": "Skriv inn nøkkelord med komma imellom:",
     "OK": "Greitt",
     "Failed to change settings": "Klarte ikkje å endra innstillingar",
     "Can't update user notification settings": "Kan ikkje oppdatera brukarvarselinstillingar",
-    "Failed to update keywords": "Fekk ikkje til å oppdatera nykelord",
-    "Messages containing <span>keywords</span>": "Meldingar som inneheld <span>nykelord</span>",
+    "Failed to update keywords": "Fekk ikkje til å oppdatera nøkkelord",
+    "Messages containing <span>keywords</span>": "Meldingar som inneheld <span>nøkkelord</span>",
     "Notify for all other messages/rooms": "Varsl for alle andre meldingar/rom",
     "Notify me for anything else": "Varsl meg for kva som helst anna",
-    "Enable notifications for this account": "Skru varsel på for denne brukaren",
+    "Enable notifications for this account": "Aktiver varslingar for denne kontoen",
     "All notifications are currently disabled for all targets.": "Alle varsel er for akkurat no skrudd av for alle mål.",
     "Enable email notifications": "Skru epostvarsel på",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nykelord følgjer reglar som ikkje kan visast her:",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Varsel på fylgjande nøkkelord følgjer reglar som ikkje kan visast her:",
     "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
     "Notification targets": "Varselmål",
     "Advanced notification settings": "Avanserte varslingsinnstillingar",
@@ -251,7 +251,7 @@
     "Show message in desktop notification": "Vis meldinga i eit skriverbordsvarsel",
     "Off": "Av",
     "On": "På",
-    "Noisy": "Bråket",
+    "Noisy": "Bråkete",
     "Cannot add any more widgets": "Kan ikkje leggja fleire widgets til",
     "Add a widget": "Legg til ein widget",
     "Drop File Here": "Slepp Fila Her",
@@ -666,7 +666,7 @@
     "Quote": "Sitat",
     "Source URL": "Kjelde-URL",
     "Collapse Reply Thread": "Slå Svartråden saman",
-    "All messages (noisy)": "Alle meldingar (bråket)",
+    "All messages (noisy)": "Alle meldingar (bråkete)",
     "All messages": "Alle meldingar",
     "Mentions only": "Berre når eg vert nemnd",
     "Leave": "Forlat",
@@ -788,7 +788,7 @@
     "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
-    "Import E2E room keys": "Hent E2E-romnyklar inn",
+    "Import E2E room keys": "Hent E2E-romnøklar inn",
     "Cryptography": "Kryptografi",
     "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.": "Viss du har rapportert inn feil via GitHub, kan feil-loggar hjelpa oss med å finna problemet. Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at ein kan forbetre applikasjonen.",
@@ -859,7 +859,7 @@
     "You must specify an event type!": "Du må oppgje ein handlingssort!",
     "Call Timeout": "Tidsavbrot i Samtala",
     "Enable automatic language detection for syntax highlighting": "Skru automatisk måloppdaging på for syntax-understreking",
-    "Export E2E room keys": "Hent E2E-romnyklar ut",
+    "Export E2E room keys": "Hent E2E-romnøklar ut",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Det kan henda at du stilte dei inn på ein annan klient enn Riot. Du kan ikkje stilla på dei i Riot men dei gjeld framleis",
     "Jump to read receipt": "Hopp til lesen-lappen",
     "Filter room members": "Filtrer rommedlemmar",
@@ -893,7 +893,7 @@
     "Server may be unavailable, overloaded, or search timed out :(": "Tenaren er kanskje utilgjengeleg, overlasta, elles så vart søket tidsavbrote :(",
     "Clear filter": "Tøm filter",
     "Profile": "Brukar",
-    "Access Token:": "Tilgangs-Teikn:",
+    "Access Token:": "Tilgangs-token:",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Heimeserveren tilbyr ingen påloggingsmetodar som er støtta av denne klienten.",
     "Claimed Ed25519 fingerprint key": "Gjorde krav på Ed25519-fingeravtrykksnøkkel",
     "Export room keys": "Eksporter romnøklar",
@@ -1282,5 +1282,42 @@
     "Collapse room list section": "Minimer romkatalog-seksjonen",
     "Expand room list section": "Utvid romkatalog-seksjonen",
     "Clear room list filter field": "Nullstill filteret for romkatalogen",
-    "Scroll up/down in the timeline": "Rull opp/ned i historikken"
+    "Scroll up/down in the timeline": "Rull opp/ned i historikken",
+    "%(displayName)s is typing …": "%(displayName)s skriv…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriv…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s og ein annan skriv…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriv…",
+    "Enable Emoji suggestions while typing": "Aktiver Emoji-forslag under skriving",
+    "Show a placeholder for removed messages": "Vis ein plassholdar for sletta meldingar",
+    "Show avatar changes": "Vis avatar-endringar",
+    "Show read receipts sent by other users": "Vis lest-rapportar sendt av andre brukarar",
+    "Enable big emoji in chat": "Aktiver store emolji-ar i samtalen",
+    "Send typing notifications": "Kringkast \"skriv...\"-status til andre",
+    "Show typing notifications": "Vis \"skriv...\"-status frå andre",
+    "Show previews/thumbnails for images": "Vis førehandsvisningar/thumbnails for bilete",
+    "Manually verify all remote sessions": "Manuelt verifiser alle eksterne sesjonar",
+    "Messages containing my username": "Meldingar som inneheld mitt brukarnamn",
+    "Messages containing @room": "Meldingar som inneheld @room",
+    "Encrypted messages in one-to-one chats": "Krypterte meldingar i ein-til-ein-samtalar",
+    "Encrypted messages in group chats": "Krypterte meldingar i gruppesamtalar",
+    "When rooms are upgraded": "Når rom blir oppgraderte",
+    "My Ban List": "Mi blokkeringsliste",
+    "Upgrade": "Oppgrader",
+    "Add an email address to configure email notifications": "Legg til ei e-postadresse for å sette opp e-postvarslingar",
+    "Enable desktop notifications for this session": "Aktiver skrivebordsvarslingar for denne øka",
+    "Enable audible notifications for this session": "Aktiver høyrbare varslingar for denne økta",
+    "<a>Upgrade</a> to your own domain": "<a>Oppgrader</a> til ditt eige domene",
+    "Custom theme URL": "Tilpassa tema-URL",
+    "Add theme": "Legg til tema",
+    "Theme": "Tema",
+    "Credits": "Bidragsytarar",
+    "For help with using Riot, click <a>here</a>.": "For hjelp med å bruke Riot, klikk <a>her</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For hjelp med å bruke Riot, klikk <a>her</a>, eller start ein samtale med vår bot ved å bruke knappen under.",
+    "Clear cache and reload": "Tøm buffer og last inn på nytt",
+    "Composer": "Teksteditor",
+    "Upgrade this room to the recommended room version": "Oppgrader dette rommet til anbefalt romversjon",
+    "Your theme": "Ditt tema",
+    "Failed to upgrade room": "Fekk ikkje til å oppgradere rom",
+    "Jump to start/end of the composer": "Hopp til start/slutt av teksteditoren",
+    "Navigate composer history": "Naviger historikk for teksteditor"
 }

From 74186740eef3db4cc6063e9610cf38caa7ecfc8b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Apr 2020 11:30:43 +0100
Subject: [PATCH 1955/3235] Fix the edit messager composer

Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
---
 src/components/views/rooms/EditMessageComposer.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index d6ea0ec5f0..8353940c90 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -107,14 +107,15 @@ export default class EditMessageComposer extends React.Component {
 
     static contextType = MatrixClientContext;
 
-    constructor(props) {
-        super(props);
+    constructor(props, context) {
+        super(props, context);
         this.model = null;
         this._editorRef = null;
 
         this.state = {
             saveDisabled: true,
         };
+        this._createEditorModel();
     }
 
     _setEditorRef = ref => {
@@ -223,10 +224,6 @@ export default class EditMessageComposer extends React.Component {
         this.props.editState.setEditorState(caret, parts);
     }
 
-    componentDidMount() {
-        this._createEditorModel();
-    }
-
     _createEditorModel() {
         const {editState} = this.props;
         const room = this._getRoom();

From 43bfa3127e9caa08a8416251d28eab3ebfc10a88 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 2 Apr 2020 09:01:54 +0000
Subject: [PATCH 1956/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2256 of 2256 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 628c857d6e..fbb3b2f210 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2306,5 +2306,17 @@
     "Compare emoji": "Confronta emoji",
     "Cancel replying to a message": "Annulla la risposta a un messaggio",
     "Sends a message as html, without interpreting it as markdown": "Invia un messaggio come html, senza interpretarlo come markdown",
-    "Sign in with SSO": "Accedi con SSO"
+    "Sign in with SSO": "Accedi con SSO",
+    "Use Single Sign On to continue": "Usa Single Sign On per continuare",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Conferma aggiungendo questa email usando Single Sign On per provare la tua identità.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Conferma aggiungendo email",
+    "Click the button below to confirm adding this email address.": "Clicca il pulsante sotto per confermare l'aggiunta di questa email.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Conferma aggiungendo questo numero di telefono usando Single Sign On per provare la tua identità.",
+    "Confirm adding phone number": "Conferma aggiungendo un numero di telefono",
+    "Click the button below to confirm adding this phone number.": "Clicca il pulsante sotto per confermare l'aggiunta di questo numero di telefono.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Conferma eliminando queste sessioni usando Single Sign On per provare la tua identità.",
+    "Confirm deleting these sessions": "Conferma eliminando queste sessioni",
+    "Click the button below to confirm deleting these sessions.": "Clicca il pulsante sotto per confermare l'eliminazione di queste sessioni.",
+    "Delete sessions": "Elimina sessioni"
 }

From a327cf9d604e54a8972676e704930ab7c1e958ad Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Thu, 2 Apr 2020 09:49:46 +0000
Subject: [PATCH 1957/3235] Translated using Weblate (Japanese)

Currently translated at 55.1% (1244 of 2256 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 8254426ce3..79950ab4fc 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1257,5 +1257,20 @@
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s が部屋名を %(oldRoomName)s から %(newRoomName)s に変更しました。",
     "Unknown Command": "不明なコマンド",
     "Unrecognised command: %(commandText)s": "認識されていないコマンド: %(commandText)s",
-    "Send as message": "メッセージとして送信"
+    "Send as message": "メッセージとして送信",
+    "Confirm": "確認",
+    "Enable audible notifications for this session": "このセッションでは音声通知を有効にする",
+    "Enable encryption?": "暗号化を有効にしますか？",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "一度有効にした部屋の暗号化は無効にすることはできません。暗号化された部屋で送信されたメッセージは、サーバーからは見ることができず、その部屋の参加者だけが見ることができます。暗号化を有効にすると、多くのボットやブリッジが正常に動作しなくなる場合があります。<a>暗号化についての詳細はこちらをご覧ください</a>。",
+    "Enter username": "ユーザー名を入力",
+    "Email (optional)": "メールアドレス (任意)",
+    "Phone (optional)": "電話番号 (任意)",
+    "Create your Matrix account on %(serverName)s": "あなたの Matrix アカウントを %(serverName)s に作成",
+    "Create your Matrix account on <underlinedServerName />": "あなたの Matrix アカウントを <underlinedServerName /> に作成",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "アカウント回復のためのメールアドレスを設定できます。また、メールアドレスや電話番号を既存の知り合いにこのアカウントを発見してもらうために使うこともできます。",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "アカウント回復のためのメールアドレスを設定できます。また、メールアドレスを既存の知り合いにこのアカウントを発見してもらうために使うこともできます。",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "独自のホームサーバー URL を入力 <a>詳細情報</a>",
+    "Homeserver URL": "ホームサーバー URL",
+    "Sign in instead": "サインインする",
+    "Create your account": "アカウントの作成"
 }

From 1353ddaa96a20514a697cd11d514ba2e99bd241f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 31 Mar 2020 15:46:11 +0200
Subject: [PATCH 1958/3235] move qr code data generation to js-sdk

---
 .../elements/crypto/VerificationQRCode.js     | 113 +-----------------
 .../views/right_panel/VerificationPanel.js    |  32 +----
 2 files changed, 8 insertions(+), 137 deletions(-)

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 3838aa61ff..5848107b61 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -17,95 +17,17 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {replaceableComponent} from "../../../../utils/replaceableComponent";
-import {MatrixClientPeg} from "../../../../MatrixClientPeg";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
-import {ToDeviceChannel} from "matrix-js-sdk/src/crypto/verification/request/ToDeviceChannel";
-import {decodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
 import Spinner from "../Spinner";
 import * as QRCode from "qrcode";
 
-const CODE_VERSION = 0x02; // the version of binary QR codes we support
-const BINARY_PREFIX = "MATRIX"; // ASCII, used to prefix the binary format
-const MODE_VERIFY_OTHER_USER = 0x00; // Verifying someone who isn't us
-const MODE_VERIFY_SELF_TRUSTED = 0x01; // We trust the master key
-const MODE_VERIFY_SELF_UNTRUSTED = 0x02; // We do not trust the master key
-
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
     static propTypes = {
-        prefix: PropTypes.string.isRequired,
-        version: PropTypes.number.isRequired,
-        mode: PropTypes.number.isRequired,
-        transactionId: PropTypes.string.isRequired, // or requestEventId
-        firstKeyB64: PropTypes.string.isRequired,
-        secondKeyB64: PropTypes.string.isRequired,
-        secretB64: PropTypes.string.isRequired,
+        qrCodeData: PropTypes.Object.isRequired,
     };
 
-    static async getPropsForRequest(verificationRequest: VerificationRequest) {
-        const cli = MatrixClientPeg.get();
-        const myUserId = cli.getUserId();
-        const otherUserId = verificationRequest.otherUserId;
-
-        let mode = MODE_VERIFY_OTHER_USER;
-        if (myUserId === otherUserId) {
-            // Mode changes depending on whether or not we trust the master cross signing key
-            const myTrust = cli.checkUserTrust(myUserId);
-            if (myTrust.isCrossSigningVerified()) {
-                mode = MODE_VERIFY_SELF_TRUSTED;
-            } else {
-                mode = MODE_VERIFY_SELF_UNTRUSTED;
-            }
-        }
-
-        const requestEvent = verificationRequest.requestEvent;
-        const transactionId = requestEvent.getId()
-            ? requestEvent.getId()
-            : ToDeviceChannel.getTransactionId(requestEvent);
-
-        const qrProps = {
-            prefix: BINARY_PREFIX,
-            version: CODE_VERSION,
-            mode,
-            transactionId,
-            firstKeyB64: '', // worked out shortly
-            secondKeyB64: '', // worked out shortly
-            secretB64: verificationRequest.encodedSharedSecret,
-        };
-
-        const myCrossSigningInfo = cli.getStoredCrossSigningForUser(myUserId);
-        const myDevices = (await cli.getStoredDevicesForUser(myUserId)) || [];
-
-        if (mode === MODE_VERIFY_OTHER_USER) {
-            // First key is our master cross signing key
-            qrProps.firstKeyB64 = myCrossSigningInfo.getId("master");
-
-            // Second key is the other user's master cross signing key
-            const otherUserCrossSigningInfo = cli.getStoredCrossSigningForUser(otherUserId);
-            qrProps.secondKeyB64 = otherUserCrossSigningInfo.getId("master");
-        } else if (mode === MODE_VERIFY_SELF_TRUSTED) {
-            // First key is our master cross signing key
-            qrProps.firstKeyB64 = myCrossSigningInfo.getId("master");
-
-            // Second key is the other device's device key
-            const otherDevice = verificationRequest.targetDevice;
-            const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
-            const device = myDevices.find(d => d.deviceId === otherDeviceId);
-            qrProps.secondKeyB64 = device.getFingerprint();
-        } else if (mode === MODE_VERIFY_SELF_UNTRUSTED) {
-            // First key is our device's key
-            qrProps.firstKeyB64 = cli.getDeviceEd25519Key();
-
-            // Second key is what we think our master cross signing key is
-            qrProps.secondKeyB64 = myCrossSigningInfo.getId("master");
-        }
-
-        return qrProps;
-    }
-
     constructor(props) {
         super(props);
-
         this.state = {
             dataUri: null,
         };
@@ -119,39 +41,8 @@ export default class VerificationQRCode extends React.PureComponent {
     }
 
     async generateQrCode() {
-        let buf = Buffer.alloc(0); // we'll concat our way through life
-
-        const appendByte = (b: number) => {
-            const tmpBuf = Buffer.from([b]);
-            buf = Buffer.concat([buf, tmpBuf]);
-        };
-        const appendInt = (i: number) => {
-            const tmpBuf = Buffer.alloc(2);
-            tmpBuf.writeInt16BE(i, 0);
-            buf = Buffer.concat([buf, tmpBuf]);
-        };
-        const appendStr = (s: string, enc: string, withLengthPrefix = true) => {
-            const tmpBuf = Buffer.from(s, enc);
-            if (withLengthPrefix) appendInt(tmpBuf.byteLength);
-            buf = Buffer.concat([buf, tmpBuf]);
-        };
-        const appendEncBase64 = (b64: string) => {
-            const b = decodeBase64(b64);
-            const tmpBuf = Buffer.from(b);
-            buf = Buffer.concat([buf, tmpBuf]);
-        };
-
-        // Actually build the buffer for the QR code
-        appendStr(this.props.prefix, "ascii", false);
-        appendByte(this.props.version);
-        appendByte(this.props.mode);
-        appendStr(this.props.transactionId, "utf-8");
-        appendEncBase64(this.props.firstKeyB64);
-        appendEncBase64(this.props.secondKeyB64);
-        appendEncBase64(this.props.secretB64);
-
         // Now actually assemble the QR code's data URI
-        const uri = await QRCode.toDataURL([{data: buf, mode: 'byte'}], {
+        const uri = await QRCode.toDataURL([{data: this.props.qrCodeData.buffer, mode: 'byte'}], {
             errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
         });
         this.setState({dataUri: uri});
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 7ba1fb829a..62a552e9a4 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -30,7 +30,7 @@ import {
     PHASE_READY,
     PHASE_DONE,
     PHASE_STARTED,
-    PHASE_CANCELLED, VerificationRequest,
+    PHASE_CANCELLED,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
 
@@ -53,22 +53,8 @@ export default class VerificationPanel extends React.PureComponent {
 
     constructor(props) {
         super(props);
-        this.state = {
-            qrCodeProps: null, // generated by the VerificationQRCode component itself
-        };
+        this.state = {};
         this._hasVerifier = false;
-        if (this.props.request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD)) {
-            this._generateQRCodeProps(props.request);
-        }
-    }
-
-    async _generateQRCodeProps(verificationRequest: VerificationRequest) {
-        try {
-            this.setState({qrCodeProps: await VerificationQRCode.getPropsForRequest(verificationRequest)});
-        } catch (e) {
-            console.error(e);
-            // Do nothing - we won't render a QR code.
-        }
     }
 
     renderQRPhase(pending) {
@@ -86,16 +72,10 @@ export default class VerificationPanel extends React.PureComponent {
             let qrBlock;
             let sasBlock;
             if (showQR) {
-                let qrCode;
-                if (this.state.qrCodeProps) {
-                    qrCode = <VerificationQRCode {...this.state.qrCodeProps} />;
-                } else {
-                    qrCode = <div className='mx_VerificationPanel_QRPhase_noQR'><Spinner /></div>;
-                }
                 qrBlock =
                     <div className='mx_VerificationPanel_QRPhase_startOption'>
                         <p>{_t("Scan this unique code")}</p>
-                        {qrCode}
+                        <VerificationQRCode qrCodeData={request.qrCodeData} />
                     </div>;
             }
             if (showSAS) {
@@ -124,7 +104,7 @@ export default class VerificationPanel extends React.PureComponent {
         }
 
         let qrBlock;
-        if (this.state.qrCodeProps) {
+        if (showQR) {
             qrBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by scanning")}</h3>
                 <p>{_t("Ask %(displayName)s to scan your code:", {
@@ -132,7 +112,7 @@ export default class VerificationPanel extends React.PureComponent {
                 })}</p>
 
                 <div className="mx_VerificationPanel_qrCode">
-                    <VerificationQRCode {...this.state.qrCodeProps} />
+                    <VerificationQRCode qrCodeData={request.qrCodeData} />
                 </div>
             </div>;
         }
@@ -150,7 +130,7 @@ export default class VerificationPanel extends React.PureComponent {
                     </AccessibleButton>
                 );
             }
-            const sasLabel = this.state.qrCodeProps ?
+            const sasLabel = showQR ?
                 _t("If you can't scan the code above, verify by comparing unique emoji.") :
                 _t("Verify by comparing unique emoji.");
             sasBlock = <div className="mx_UserInfo_container">

From 00b1afe0fa88a1fa53b743bdc3f6919c54682a95 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 31 Mar 2020 15:46:41 +0200
Subject: [PATCH 1959/3235] first go at reciprocate UX

---
 .../views/right_panel/VerificationPanel.js    | 96 ++++++++++++-------
 1 file changed, 62 insertions(+), 34 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 62a552e9a4..58d07e318c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -57,7 +57,7 @@ export default class VerificationPanel extends React.PureComponent {
         this._hasVerifier = false;
     }
 
-    renderQRPhase(pending) {
+    renderQRPhase() {
         const {member, request} = this.props;
         const showSAS = request.otherPartySupportsMethod(verificationMethods.SAS);
         const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
@@ -119,24 +119,16 @@ export default class VerificationPanel extends React.PureComponent {
 
         let sasBlock;
         if (showSAS) {
-            let button;
-            if (pending) {
-                button = <Spinner />;
-            } else {
-                const disabled = this.state.emojiButtonClicked;
-                button = (
-                    <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
-                        {_t("Verify by emoji")}
-                    </AccessibleButton>
-                );
-            }
+            const disabled = this.state.emojiButtonClicked;
             const sasLabel = showQR ?
                 _t("If you can't scan the code above, verify by comparing unique emoji.") :
                 _t("Verify by comparing unique emoji.");
             sasBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by emoji")}</h3>
                 <p>{sasLabel}</p>
-                { button }
+                <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
+                    {_t("Verify by emoji")}
+                </AccessibleButton>
             </div>;
         }
 
@@ -152,6 +144,30 @@ export default class VerificationPanel extends React.PureComponent {
         </React.Fragment>;
     }
 
+    renderQRReciprocatePhase() {
+        const {member} = this.props;
+        const FormButton = sdk.getComponent("elements.FormButton");
+
+        let body;
+        if (this.state.reciprocateQREvent) {
+            // riot web doesn't support scanning yet, so assume here we're the client being scanned.
+            body = <React.Fragment>
+                <p>{_t("Almost there! Is %(displayName)s show the same shield?", {
+                        displayName: member.displayName || member.name || member.userId,
+                    })}</p>
+                <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
+                <p><FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} /></p>
+                <p><FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} /></p>
+            </React.Fragment>;
+        } else {
+            body = <p><Spinner/></p>;
+        }
+        return <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
+            <h3>{_t("Verify by scanning")}</h3>
+            { body }
+        </div>;
+    }
+
     renderVerifiedPhase() {
         const {member} = this.props;
 
@@ -208,7 +224,7 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     render() {
-        const {member, phase} = this.props;
+        const {member, phase, request} = this.props;
 
         const displayName = member.displayName || member.name || member.userId;
 
@@ -216,20 +232,26 @@ export default class VerificationPanel extends React.PureComponent {
             case PHASE_READY:
                 return this.renderQRPhase();
             case PHASE_STARTED:
-                if (this.state.sasEvent) {
-                    const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
-                    return <div className="mx_UserInfo_container">
-                        <h3>{_t("Compare emoji")}</h3>
-                        <VerificationShowSas
-                            displayName={displayName}
-                            sas={this.state.sasEvent.sas}
-                            onCancel={this._onSasMismatchesClick}
-                            onDone={this._onSasMatchesClick}
-                            inDialog={this.props.inDialog}
-                        />
-                    </div>;
-                } else {
-                    return this.renderQRPhase(true); // keep showing same phase but with a spinner
+                switch (request.chosenMethod) {
+                    case verificationMethods.RECIPROCATE_QR_CODE:
+                        return this.renderQRReciprocatePhase();
+                    case verificationMethods.SAS: {
+                        const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
+                        const emojis = this.state.sasEvent ?
+                            <VerificationShowSas
+                                displayName={displayName}
+                                sas={this.state.sasEvent.sas}
+                                onCancel={this._onSasMismatchesClick}
+                                onDone={this._onSasMatchesClick}
+                                inDialog={this.props.inDialog}
+                            /> : <Spinner />;
+                        return <div className="mx_UserInfo_container">
+                            <h3>{_t("Compare emoji")}</h3>
+                            { emojis }
+                        </div>;
+                    }
+                    default:
+                        return null;
                 }
             case PHASE_DONE:
                 return this.renderVerifiedPhase();
@@ -258,10 +280,12 @@ export default class VerificationPanel extends React.PureComponent {
         this.state.sasEvent.mismatch();
     };
 
-    _onVerifierShowSas = (sasEvent) => {
+    _updateVerifierState = () => {
         const {request} = this.props;
-        request.verifier.off('show_sas', this._onVerifierShowSas);
-        this.setState({sasEvent});
+        const {sasEvent, reciprocateQREvent} = request;
+        request.verifier.off('show_sas', this._updateVerifierState);
+        request.verifier.off('show_reciprocate_qr', this._updateVerifierState);
+        this.setState({sasEvent, reciprocateQREvent});
     };
 
     _onRequestChange = async () => {
@@ -269,7 +293,8 @@ export default class VerificationPanel extends React.PureComponent {
         const hadVerifier = this._hasVerifier;
         this._hasVerifier = !!request.verifier;
         if (!hadVerifier && this._hasVerifier) {
-            request.verifier.on('show_sas', this._onVerifierShowSas);
+            request.verifier.on('show_sas', this._updateVerifierState);
+            request.verifier.on('show_reciprocate_qr', this._updateVerifierState);
             try {
                 // on the requester side, this is also awaited in _startSAS,
                 // but that's ok as verify should return the same promise.
@@ -284,7 +309,9 @@ export default class VerificationPanel extends React.PureComponent {
         const {request} = this.props;
         request.on("change", this._onRequestChange);
         if (request.verifier) {
-            this.setState({sasEvent: request.verifier.sasEvent});
+            const {request} = this.props;
+            const {sasEvent, reciprocateQREvent} = request;
+            this.setState({sasEvent, reciprocateQREvent});
         }
         this._onRequestChange();
     }
@@ -292,7 +319,8 @@ export default class VerificationPanel extends React.PureComponent {
     componentWillUnmount() {
         const {request} = this.props;
         if (request.verifier) {
-            request.verifier.off('show_sas', this._onVerifierShowSas);
+            request.verifier.off('show_sas', this._updateVerifierState);
+            request.verifier.off('show_reciprocate_qr', this._updateVerifierState);
         }
         request.off("change", this._onRequestChange);
     }

From fd04f248c43e645eb95ef9aed759083b09392e84 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 1 Apr 2020 09:42:24 +0200
Subject: [PATCH 1960/3235] fix proptype typo

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

diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 5848107b61..08cd0c772e 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -23,7 +23,7 @@ import * as QRCode from "qrcode";
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
     static propTypes = {
-        qrCodeData: PropTypes.Object.isRequired,
+        qrCodeData: PropTypes.object.isRequired,
     };
 
     constructor(props) {

From 119fd2f5191a039314ad64b7db6e9e277dd267d4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 11:27:00 +0200
Subject: [PATCH 1961/3235] fixup: these are actually on the verifier

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

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 58d07e318c..c640c73055 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -282,7 +282,7 @@ export default class VerificationPanel extends React.PureComponent {
 
     _updateVerifierState = () => {
         const {request} = this.props;
-        const {sasEvent, reciprocateQREvent} = request;
+        const {sasEvent, reciprocateQREvent} = request.verifier;
         request.verifier.off('show_sas', this._updateVerifierState);
         request.verifier.off('show_reciprocate_qr', this._updateVerifierState);
         this.setState({sasEvent, reciprocateQREvent});
@@ -310,7 +310,7 @@ export default class VerificationPanel extends React.PureComponent {
         request.on("change", this._onRequestChange);
         if (request.verifier) {
             const {request} = this.props;
-            const {sasEvent, reciprocateQREvent} = request;
+            const {sasEvent, reciprocateQREvent} = request.verifier;
             this.setState({sasEvent, reciprocateQREvent});
         }
         this._onRequestChange();

From a4f448d4ca34512c00ae2cda5cf63c59e6bffdfe Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 11:36:05 +0200
Subject: [PATCH 1962/3235] update i18n

---
 src/i18n/strings/en_EN.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 24a6568d82..50dc06ce8b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1249,9 +1249,12 @@
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.",
     "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
-    "Verify by emoji": "Verify by emoji",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
+    "Verify by emoji": "Verify by emoji",
+    "Almost there! Is %(displayName)s show the same shield?": "Almost there! Is %(displayName)s show the same shield?",
+    "No": "No",
+    "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
     "Verified": "Verified",
@@ -1397,8 +1400,6 @@
     "Verify...": "Verify...",
     "Join": "Join",
     "No results": "No results",
-    "Yes": "Yes",
-    "No": "No",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
     "collapse": "collapse",
     "expand": "expand",

From ccf6c9efdc407b9562ccd26704fbe72fdd255acb Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 12:54:14 +0200
Subject: [PATCH 1963/3235] fixup: more i18n

---
 .../views/right_panel/_VerificationPanel.scss | 20 ++++++++++++++++---
 .../views/right_panel/VerificationPanel.js    |  6 +++---
 src/i18n/strings/en_EN.json                   |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 459622b277..ba74d46eaf 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -30,11 +30,15 @@ limitations under the License.
         right: 14px;
     }
 
-    .mx_VerificationPanel_verified_section .mx_E2EIcon {
-        // Override general user info margin
-        margin: 0 auto !important;
+    .mx_VerificationPanel_verified_section,
+    .mx_VerificationPanel_reciprocate_section {
+        .mx_E2EIcon {
+            // Override general user info margin
+            margin: 20px auto !important;
+        }
     }
 
+
     .mx_VerificationPanel_qrCode {
         padding: 4px 4px 0 4px;
         background: white;
@@ -51,6 +55,16 @@ limitations under the License.
             max-width: 240px;
         }
     }
+
+    .mx_VerificationPanel_reciprocate_section {
+        .mx_FormButton {
+            width: 100%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: block;
+            margin: 10px 0;
+        }
+    }
 }
 
 // Special case styling for EncryptionPanel in a Modal dialog
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index c640c73055..e2dd1f0408 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -156,13 +156,13 @@ export default class VerificationPanel extends React.PureComponent {
                         displayName: member.displayName || member.name || member.userId,
                     })}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
-                <p><FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} /></p>
-                <p><FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} /></p>
+                <FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} />
+                <FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} />
             </React.Fragment>;
         } else {
             body = <p><Spinner/></p>;
         }
-        return <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
+        return <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">
             <h3>{_t("Verify by scanning")}</h3>
             { body }
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 50dc06ce8b..26dcfb7ee8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1252,7 +1252,7 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "Verify by emoji": "Verify by emoji",
-    "Almost there! Is %(displayName)s show the same shield?": "Almost there! Is %(displayName)s show the same shield?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
     "No": "No",
     "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",

From 1f65cfb7f69934a06161060e9a205742f47aa93a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 13:00:45 +0200
Subject: [PATCH 1964/3235] polish design and disable buttons after click

---
 .../views/right_panel/_VerificationPanel.scss | 15 ++++++++++
 .../views/right_panel/VerificationPanel.js    | 28 ++++++++++++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index ba74d46eaf..3313e47c66 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -132,4 +132,19 @@ limitations under the License.
             float: right;
         }
     }
+
+    .mx_VerificationPanel_reciprocate_section {
+        .mx_FormButton {
+            margin: 0 10px;
+            padding: 10px;
+            flex: 1;
+        }
+
+        // show Yes/No buttons next to each other
+        .mx_VerificationPanel_reciprocateButtons {
+            display: flex;
+            flex-direction: row;
+        }
+    }
+
 }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index e2dd1f0408..103497169f 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -144,6 +144,16 @@ export default class VerificationPanel extends React.PureComponent {
         </React.Fragment>;
     }
 
+    _onReciprocateYesClick = () => {
+        this.setState({reciprocateButtonClicked: true});
+        this.state.reciprocateQREvent.confirm();
+    };
+
+    _onReciprocateNoClick = () => {
+        this.setState({reciprocateButtonClicked: true});
+        this.state.reciprocateQREvent.cancel();
+    };
+
     renderQRReciprocatePhase() {
         const {member} = this.props;
         const FormButton = sdk.getComponent("elements.FormButton");
@@ -152,15 +162,25 @@ export default class VerificationPanel extends React.PureComponent {
         if (this.state.reciprocateQREvent) {
             // riot web doesn't support scanning yet, so assume here we're the client being scanned.
             body = <React.Fragment>
-                <p>{_t("Almost there! Is %(displayName)s show the same shield?", {
+                <p>{_t("Almost there! Is %(displayName)s showing the same shield?", {
                         displayName: member.displayName || member.name || member.userId,
                     })}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
-                <FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} />
-                <FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} />
+                <div className="mx_VerificationPanel_reciprocateButtons">
+                    <FormButton
+                        label={_t("No")} kind="danger"
+                        disabled={this.state.reciprocateButtonClicked}
+                        onClick={this._onReciprocateNoClick}
+                    />
+                    <FormButton
+                        label={_t("Yes")}
+                        disabled={this.state.reciprocateButtonClicked}
+                        onClick={this._onReciprocateYesClick}
+                    />
+                </div>
             </React.Fragment>;
         } else {
-            body = <p><Spinner/></p>;
+            body = <p><Spinner /></p>;
         }
         return <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">
             <h3>{_t("Verify by scanning")}</h3>

From 31ca52dedec20eeedbfac1b8f4e0cf88e75b84bd Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 13:10:04 +0200
Subject: [PATCH 1965/3235] fix stylelint

---
 res/css/views/right_panel/_VerificationPanel.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 3313e47c66..e4e7e2dddc 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -146,5 +146,4 @@ limitations under the License.
             flex-direction: row;
         }
     }
-
 }

From df1a8b288bca47ce209689af7fae3430a71b7ce8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 2 Apr 2020 13:35:12 +0100
Subject: [PATCH 1966/3235] Change copyright

---
 res/css/_font-sizes.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index be6d43d3a8..ad9e2e7103 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 202ad9f98ac43323a0ccf2a4362aaf67230e928a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 2 Apr 2020 13:42:59 +0100
Subject: [PATCH 1967/3235] Remove sort and include new scss file in components

---
 res/css/_components.scss | 1 +
 res/css/rethemendex.sh   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index b959b1f1cd..8706772ad9 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -1,5 +1,6 @@
 // autogenerated by rethemendex.sh
 @import "./_common.scss";
+@import "./_font-sizes.scss";
 @import "./structures/_AutoHideScrollbar.scss";
 @import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
diff --git a/res/css/rethemendex.sh b/res/css/rethemendex.sh
index 5d9e789982..13be73f9a9 100755
--- a/res/css/rethemendex.sh
+++ b/res/css/rethemendex.sh
@@ -8,7 +8,7 @@ cd `dirname $0`
     # we used to have exclude /themes from the find at this point.
     # as themes are no longer a spurious subdirectory of css/, we don't
     # need it any more.
-    find . -iname _\*.scss | sort | fgrep -v _components.scss | LC_ALL=C sort |
+    find . -iname _\*.scss | fgrep -v _components.scss | LC_ALL=C sort |
         while read i; do
             echo "@import \"$i\";"
         done

From ee61a3aff6b359c07a8422ec4855f7878f049040 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 16:07:55 +0200
Subject: [PATCH 1968/3235] dismiss setup encryption toast if cross-signing is
 ready

---
 src/DeviceListener.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index f8555c7602..ddeacedd75 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -165,6 +165,9 @@ export default class DeviceListener {
                     props: {kind: 'upgrade_ssss'},
                     component: sdk.getComponent("toasts.SetupEncryptionToast"),
                 });
+            } else {
+                // cross-signing is ready, and we don't need to upgrade encryption
+                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
             }
         }
 

From 705fd57a4bacf594e295f9110ac7bd36cb434069 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Apr 2020 15:09:33 +0100
Subject: [PATCH 1969/3235] Fix spurious extra devices on registration

We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.

Fixes https://github.com/vector-im/riot-web/issues/12865
---
 src/components/structures/auth/Registration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 08c2a11641..c74f6ed6e3 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -463,7 +463,7 @@ export default createReactClass({
             initial_device_display_name: this.props.defaultDeviceDisplayName,
         };
         if (auth) registerParams.auth = auth;
-        if (inhibitLogin !== undefined && inhibitLogin !== null) registerParams.inhibitLogin = inhibitLogin;
+        if (inhibitLogin !== undefined && inhibitLogin !== null) registerParams.inhibit_login = inhibitLogin;
         return this.state.matrixClient.registerRequest(registerParams);
     },
 

From 36120738525816f8442ab49aded73a7e0f96f766 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 2 Apr 2020 15:12:19 +0100
Subject: [PATCH 1970/3235] Nuke the icon_person.svg DM Indicator as it causes
 more confusion than it solves.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/icon_person.svg                       | 23 -------------------
 src/components/views/rooms/RoomBreadcrumbs.js | 12 ----------
 src/components/views/rooms/RoomTile.js        | 14 -----------
 3 files changed, 49 deletions(-)
 delete mode 100644 res/img/icon_person.svg

diff --git a/res/img/icon_person.svg b/res/img/icon_person.svg
deleted file mode 100644
index 4be70df0db..0000000000
--- a/res/img/icon_person.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="11px" height="13px" viewBox="0 0 11 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>815EF7DE-169A-4322-AE2A-B65CBE91DCED</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Left-menu" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Left-menu-option-B" transform="translate(-33.000000, -223.000000)" fill="#FFFFFF" stroke="#76CFA6">
-            <g id="Left-panel">
-                <g id="Room-list" transform="translate(0.000000, 69.000000)">
-                    <g id="Group-3" transform="translate(16.000000, 144.000000)">
-                        <g id="icon_person" transform="translate(18.000000, 11.000000)">
-                            <g>
-                                <path d="M5.34291667,5.8555 C5.51425,5.86608333 5.68525,5.88091667 5.85566667,5.90108333 C5.987,5.91666667 6.118,5.93533333 6.24825,5.95783333 C6.96516667,6.08175 7.69391667,6.32633333 8.23175,6.83591667 C8.32116667,6.92058333 8.40433333,7.01166667 8.48041667,7.1085 C8.59608333,7.25566667 8.69475,7.41583333 8.77633333,7.58425 C8.92233333,7.8855 9.0125,8.21083333 9.06841667,8.54008333 C9.13758333,8.9475 9.15758333,9.36266667 9.1635,9.77533333 C9.1685,10.1279167 9.167,10.4805833 9.16725,10.8331667 L8.33333344e-05,10.8331667 C0.000250000001,10.4805833 -0.00125,10.1279167 0.00375,9.77533333 C0.00916666667,9.39616667 0.0268333333,9.01533333 0.083,8.63991667 C0.134833333,8.29291667 0.221666667,7.94891667 0.369333333,7.62966667 C0.44775,7.46033333 0.543,7.29875 0.65525,7.14958333 C0.729,7.05166667 0.809833333,6.95925 0.897,6.87308333 C1.41916667,6.35725 2.13533333,6.10216667 2.84408333,5.97125 C2.97233333,5.94758333 3.10125,5.92775 3.23058333,5.91108333 C3.39841667,5.8895 3.56683333,5.87333333 3.73558333,5.86133333 C3.95191667,5.846 4.16858333,5.8385 4.38533333,5.83458333 C4.48475,5.8335 4.58408333,5.83316667 4.6835,5.8335 C4.9035,5.83583333 5.12333333,5.84183333 5.34291667,5.8555 Z" id="Fill-1" stroke-linejoin="round"></path>
-                                <path d="M4.99558333,0.031 C5.28133333,0.0745833333 5.55966667,0.1645 5.81691667,0.29625 C6.32075,0.554333333 6.7375,0.971 6.9955,1.47483333 C7.11691667,1.712 7.20291667,1.967 7.24975,2.22916667 C7.30216667,2.52283333 7.30583333,2.82525 7.26083333,3.12008333 C7.2205,3.38416667 7.14066667,3.642 7.02475,3.88266667 C6.88325,4.17633333 6.68833333,4.44375 6.45233333,4.66866667 C6.21591667,4.89408333 5.93891667,5.07633333 5.638,5.20358333 C5.30525,5.34433333 4.94491667,5.4165 4.58366667,5.4165 C4.22233333,5.4165 3.86208333,5.34433333 3.52925,5.20358333 C3.22833333,5.07633333 2.95133333,4.89408333 2.71491667,4.66866667 C2.479,4.44375 2.284,4.17633333 2.1425,3.88266667 C2.02658333,3.642 1.94675,3.38416667 1.90641667,3.12008333 C1.86141667,2.82525 1.86508333,2.52291667 1.91758333,2.22925 C1.96433333,1.967 2.05033333,1.712 2.17175,1.47483333 C2.42975,0.971 2.8465,0.554333333 3.35033333,0.29625 C3.60758333,0.1645 3.88591667,0.0745833333 4.17166667,0.031 C4.28525,0.0136666667 4.39916667,0.005 4.51391667,0.000666666667 C4.58391667,-0.000166666667 4.58366667,-0.000166666667 4.65333333,0.000666666667 C4.76808333,0.005 4.882,0.0136666667 4.99558333,0.031 Z" id="Fill-2"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 1d433c9a40..86c0d7ca96 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -363,17 +363,6 @@ export default class RoomBreadcrumbs extends React.Component {
                 badge = <div className={badgeClasses}>{r.formattedCount}</div>;
             }
 
-            let dmIndicator;
-            if (this._isDmRoom(r.room) && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-                dmIndicator = <img
-                    src={require("../../../../res/img/icon_person.svg")}
-                    className="mx_RoomBreadcrumbs_dmIndicator"
-                    width="13"
-                    height="15"
-                    alt={_t("Direct Chat")}
-                />;
-            }
-
             return (
                 <AccessibleButton
                     className={classes}
@@ -385,7 +374,6 @@ export default class RoomBreadcrumbs extends React.Component {
                 >
                     <RoomAvatar room={r.room} width={32} height={32} />
                     {badge}
-                    {dmIndicator}
                     {tooltip}
                 </AccessibleButton>
             );
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b06be48af..448f856b50 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -479,20 +479,7 @@ export default createReactClass({
 
         let ariaLabel = name;
 
-        let dmIndicator;
         let dmOnline;
-        /* Post-cross-signing we don't show DM indicators at all, instead relying on user
-           context to let them know when that is. */
-        if (dmUserId && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            dmIndicator = <img
-                src={require("../../../../res/img/icon_person.svg")}
-                className="mx_RoomTile_dm"
-                width="11"
-                height="13"
-                alt="dm"
-            />;
-        }
-
         const { room } = this.props;
         const member = room.getMember(dmUserId);
         if (
@@ -557,7 +544,6 @@ export default createReactClass({
                         <div className={avatarClasses}>
                             <div className="mx_RoomTile_avatar_container">
                                 <RoomAvatar room={this.props.room} width={24} height={24} />
-                                { dmIndicator }
                                 { e2eIcon }
                             </div>
                         </div>

From a28aa4c0b44702ede672f252e161aed37bd7aa03 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 2 Apr 2020 15:13:19 +0100
Subject: [PATCH 1971/3235] Tweak user online dot in room tile, make it occupy
 same space and inverse behaviour of the context menu button

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_RoomTile.scss      | 31 +++++++++++++++++--------
 res/css/views/rooms/_UserOnlineDot.scss |  4 ++--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 31d887cbbb..aa8a77de78 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -24,6 +24,20 @@ limitations under the License.
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;
+
+    .mx_RoomTile_menuButton {
+        display: none;
+        flex: 0 0 16px;
+        height: 16px;
+        background-image: url('$(res)/img/icon_context.svg');
+        background-repeat: no-repeat;
+        background-position: center;
+    }
+
+    .mx_UserOnlineDot {
+        display: block;
+        margin-right: 5px;
+    }
 }
 
 .mx_RoomTile:focus {
@@ -31,15 +45,6 @@ limitations under the License.
     background-color: $roomtile-focused-bg-color;
 }
 
-.mx_RoomTile_menuButton {
-    display: none;
-    flex: 0 0 16px;
-    height: 16px;
-    background-image: url('$(res)/img/icon_context.svg');
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
 .mx_RoomTile_tooltip {
     display: inline-block;
     position: relative;
@@ -151,7 +156,10 @@ limitations under the License.
     }
 
     .mx_RoomTile_menuButton {
-        display: none;  //no design for this for now
+        display: none; // no design for this for now
+    }
+    .mx_UserOnlineDot {
+        display: none; // no design for this for now
     }
 }
 
@@ -164,6 +172,9 @@ limitations under the License.
     .mx_RoomTile_menuButton {
         display: block;
     }
+    .mx_UserOnlineDot {
+        display: none;
+    }
 }
 
 .mx_RoomTile_unreadNotify .mx_RoomTile_badge,
diff --git a/res/css/views/rooms/_UserOnlineDot.scss b/res/css/views/rooms/_UserOnlineDot.scss
index 339e5cc48a..f9da8648ed 100644
--- a/res/css/views/rooms/_UserOnlineDot.scss
+++ b/res/css/views/rooms/_UserOnlineDot.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_UserOnlineDot {
     border-radius: 50%;
     background-color: $accent-color;
-    height: 5px;
-    width: 5px;
+    height: 6px;
+    width: 6px;
     display: inline-block;
 }

From 1ae370b97eca7d9d6ef13b1c05fc6776968528ca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 2 Apr 2020 15:20:35 +0100
Subject: [PATCH 1972/3235] Pull feature_presence_in_room_list out of labs.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomTile.js | 5 +----
 src/i18n/strings/en_EN.json            | 3 +--
 src/settings/Settings.js               | 6 ------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 448f856b50..87d288561c 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -482,10 +482,7 @@ export default createReactClass({
         let dmOnline;
         const { room } = this.props;
         const member = room.getMember(dmUserId);
-        if (
-            member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
-            SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
-        ) {
+        if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
             const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
             dmOnline = <UserOnlineDot userId={dmUserId} />;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 24a6568d82..163b3ad341 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -393,7 +393,6 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
@@ -1075,7 +1074,6 @@
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
     "Replying": "Replying",
-    "Direct Chat": "Direct Chat",
     "Room %(name)s": "Room %(name)s",
     "Recent rooms": "Recent rooms",
     "No rooms to show": "No rooms to show",
@@ -1815,6 +1813,7 @@
     "Forget": "Forget",
     "Favourite": "Favourite",
     "Low Priority": "Low Priority",
+    "Direct Chat": "Direct Chat",
     "Clear status": "Clear status",
     "Update status": "Update status",
     "Set status": "Set status",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0d72017878..df3bf91b17 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -131,12 +131,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_presence_in_room_list": {
-        isFeature: true,
-        displayName: _td("Show a presence dot next to DMs in the room list"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_custom_themes": {
         isFeature: true,
         displayName: _td("Support adding custom themes"),

From 2b7bbe701380ff09cdeac67a888c56df94cd5d86 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Thu, 2 Apr 2020 11:29:01 +0000
Subject: [PATCH 1973/3235] Translated using Weblate (Japanese)

Currently translated at 55.1% (1244 of 2256 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 79950ab4fc..7e7c1443a4 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -844,7 +844,7 @@
     "%(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.": "送信されたメッセージは、接続が返されるまで保存されます。",
+    "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?": "ファイルをアップロードしているようですが、中止しますか?",

From 63ed6c3dac931a6b1007802b82d1546a904f3098 Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Thu, 2 Apr 2020 11:14:09 +0000
Subject: [PATCH 1974/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 59.6% (1345 of 2256 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index f71ab4fa94..197212fb09 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -100,7 +100,7 @@
     "Ignores a user, hiding their messages from you": "Overser ein brukar, slik at meldingane deira ikkje synast for deg",
     "Ignored user": "Oversedd brukar",
     "You are now ignoring %(userId)s": "Du overser no %(userId)s",
-    "Stops ignoring a user, showing their messages going forward": "Sluttar å oversjå ein brukar, slik at meldingane deira no kan sjåast",
+    "Stops ignoring a user, showing their messages going forward": "Sluttar å ignorer ein brukar, slik at meldingane deira no kan sjåast",
     "Unignored user": "Avoversedd brukar",
     "You are no longer ignoring %(userId)s": "Du overser ikkje %(userId)s no lenger",
     "Define the power level of a user": "Sett tilgangsnivået til ein brukar",
@@ -286,8 +286,8 @@
     "Failed to change power level": "Fekk ikkje til å endra tilgangsnivået",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kan ikkje angre denne endringa, fordi brukaren du forfremmar vil få same tilgangsnivå som du har no.",
     "Are you sure?": "Er du sikker?",
-    "Unignore": "Slutt å oversjå",
-    "Ignore": "Oversjå",
+    "Unignore": "Slutt å ignorer",
+    "Ignore": "Ignorer",
     "Mention": "Nemn",
     "Invite": "Inviter",
     "Enable inline URL previews by default": "Skru URL-førehandsvising i tekstfeltet på",
@@ -600,14 +600,14 @@
     "Event Type": "Hendingsort",
     "Event Content": "Hendingsinnhald",
     "Send Account Data": "Send Brukardata",
-    "Explore Room State": "Undersøk Romtilstanden",
-    "Explore Account Data": "Undersøk Brukardata",
+    "Explore Room State": "Undersøk tilstand for rommet",
+    "Explore Account Data": "Undersøk kontodata",
     "Toolbox": "Verktøykasse",
     "Developer Tools": "Utviklarverktøy",
     "An error has occurred.": "Noko gjekk gale.",
     "Start verification": "Start verifikasjon",
     "Share without verifying": "Del utan å godkjenna",
-    "Ignore request": "Oversjå førespurnad",
+    "Ignore request": "Ignorer førespurnad",
     "Encryption key request": "Krypteringsnykel-førespurnad",
     "Sign out": "Logg ut",
     "Clear Storage and Sign Out": "Tøm Lager og Logg Ut",
@@ -615,7 +615,7 @@
     "Refresh": "Hent fram på nytt",
     "Unable to restore session": "Kunne ikkje henta øykta fram att",
     "We encountered an error trying to restore your previous session.": "Noko gjekk gale med framhentinga av den førre øykta di.",
-    "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.": "Viss du har tidligare brukt ein nyare versjon av Riot, kan sesjons-data vere inkompatibel med denne versjonen. Lukk dette vindauget og bytt til ein nyare versjon.",
+    "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.": "Viss du har tidligare brukt ein nyare versjon av Riot, kan økts-data vere inkompatibel med denne versjonen. Lukk dette vindauget og bytt til ein nyare versjon.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Det kan henda at å tømma nettlesarlageret rettar opp i det, men det loggar deg ut og kan gjera den krypterte pratehistoria uleseleg.",
     "Invalid Email Address": "Ugangbar Epostadresse",
     "This doesn't appear to be a valid email address": "Det ser ikkje ut til at epostadressa er gangbar",
@@ -661,7 +661,7 @@
     "Pin Message": "Fest Meldinga",
     "View Source": "Sjå Kjelda",
     "View Decrypted Source": "Sjå den Dekrypterte Kjelda",
-    "Unhide Preview": "Slutt å Gøyma Førehandsvising",
+    "Unhide Preview": "Vis førehandsvising",
     "Share Message": "Del Melding",
     "Quote": "Sitat",
     "Source URL": "Kjelde-URL",
@@ -734,37 +734,37 @@
     "Review terms and conditions": "Sjå over Vilkår og Føresetnader",
     "Old cryptography data detected": "Gamal kryptografidata vart oppdagen",
     "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.": "Data frå ein eldre versjon av Riot er oppdaga. Dette kan ha gjort at ende-til-ende kryptering feilar i den eldre versjonen. Krypterte meldingar som er utveksla med den gamle versjonen er kanskje ikkje dekrypterbare i denne versjonen. Dette kan forårsake at meldingar utveksla mot denne versjonen vil feile. Opplever du problem med dette, kan du logge inn og ut igjen. For å behalde meldingshistorikk, eksporter og importer nøklane dine på nytt.",
-    "Logout": "Loggar ut",
+    "Logout": "Logg ut",
     "Your Communities": "Dine fellesskap",
     "Error whilst fetching joined communities": "Noko gjekk gale under innlasting av fellesskapa du med er i",
-    "Create a new community": "Lag eit nytt fellesskap",
+    "Create a new community": "Opprett nytt fellesskap",
     "You have no visible notifications": "Du har ingen synlege varsel",
-    "Members": "Medlemer",
+    "Members": "Medlemmar",
     "Invite to this room": "Inviter til dette rommet",
     "Files": "Filer",
     "Notifications": "Varsel",
     "Invite to this community": "Inviter til dette fellesskapet",
     "The server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rommaliaset %(alias)s og fjern %(name)s frå utvalet?",
-    "Remove %(name)s from the directory?": "Fjern %(name)s frå utvalet?",
-    "Remove from Directory": "Fjern frå Utvalet",
-    "remove %(name)s from the directory.": "fjern %(name)s frå utvalet.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slette rommaliaset %(alias)s og fjern %(name)s frå romkatalogen?",
+    "Remove %(name)s from the directory?": "Fjern %(name)s frå romkatalogen?",
+    "Remove from Directory": "Fjern frå romkatalog",
+    "remove %(name)s from the directory.": "fjern %(name)s frå romkatalogen.",
     "delete the alias.": "slett aliaset.",
-    "Unable to join network": "Klarte ikkje å verta med i nettverket",
-    "Riot does not know how to join a room on this network": "Riot veit ikkje korleis ein fer inn i eit rom på dette nettverket",
+    "Unable to join network": "Klarte ikkje å bli med i nettverket",
+    "Riot does not know how to join a room on this network": "Riot veit ikkje korleis den kan bli med i rom på dette nettverket",
     "Room not found": "Fann ikkje rommet",
-    "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrixrom",
-    "Fetching third party location failed": "Noko gjekk gale med hentinga tredjepartiplasseringa",
+    "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrix-rom",
+    "Fetching third party location failed": "Noko gjekk gale under henting av tredjepartslokasjon",
     "Scroll to bottom of page": "Blad til botnen",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kan ikkje senda meldingar før du ser over og seier deg einig i våre <consentLink>Vilkår og Føresetnader</consentLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kan ikkje senda meldingar før du les over og godkjenner våre <consentLink>bruksvilkår</consentLink>.",
     "%(count)s of your messages have not been sent.|other": "Nokre av meldingane dine vart ikkje sende.",
     "%(count)s of your messages have not been sent.|one": "Meldinga di vart ikkje send.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan ogso velja enkelte meldingar til sending på nytt eller avbryting.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan og markere enkelte meldingar for å sende på nytt eller avbryte.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Send melding på nytt</resendText> eller <cancelText>avbryt</cancelText>.",
     "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
-    "Sent messages will be stored until your connection has returned.": "Sendte meldingar lagrast ikkje før tilkoplinga di er tilbake.",
+    "Sent messages will be stored until your connection has returned.": "Sendte meldingar vil blir lagra lokalt fram til nettverket er oppe igjen.",
     "Active call": "Pågåande samtale",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>byda andre inn</inviteText> eller <nowarnText>enda åtvaringa om det tomme rommet?</nowarnText>?",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>invitera andre</inviteText> eller <nowarnText>skru av varselet om det tomme rommet?</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar opp filer, er du sikker på at du vil avslutte?",
     "You seem to be in a call, are you sure you want to quit?": "Det ser ut til at du er i ein samtale, er du sikker på at du vil avslutte?",
     "Search failed": "Søket feila",
@@ -773,10 +773,10 @@
     "Room": "Rom",
     "Failed to reject invite": "Fekk ikkje til å avstå invitasjonen",
     "Fill screen": "Fyll skjermen",
-    "Click to unmute video": "Klikk for å avstilna videoen",
-    "Click to mute video": "Klikk for å stilna videoen",
-    "Click to unmute audio": "Klikk for å avstilna ljoden",
-    "Click to mute audio": "Klikk for å dempe lyden",
+    "Click to unmute video": "Klikk for slå på video",
+    "Click to mute video": "Klikk for å slå av video",
+    "Click to unmute audio": "Klikk for å slå på lyd",
+    "Click to mute audio": "Klikk for å slå av lyd",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Prøvde å laste eit bestemt punkt i rommet sin historikk, men du har ikkje lov til å sjå den spesifike meldingen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet sin historikk, men klarde ikkje å finna det.",
     "Failed to load timeline position": "Innlasting av punkt i historikken feila.",
@@ -853,7 +853,7 @@
     "End-to-end encryption information": "Ende-til-ende-krypteringsinfo",
     "Event information": "Hendingsinfo",
     "Passphrases must match": "Passfrasane må vere identiske",
-    "Passphrase must not be empty": "Passefrasefeltet kan ikkje vera tomt",
+    "Passphrase must not be empty": "Passfrasefeltet kan ikkje stå tomt",
     "Enter passphrase": "Skriv inn passfrase",
     "Confirm passphrase": "Stadfest passfrase",
     "You must specify an event type!": "Du må oppgje ein handlingssort!",
@@ -869,8 +869,8 @@
     "Filter community members": "Filtrer fellesskapssmedlemmar",
     "Custom Server Options": "Tilpassa tenar-innstillingar",
     "Filter community rooms": "Filtrer rom i fellesskapet",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake (ver venleg og sjå på <PolicyLink>Datakakeretningslinene våre</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Ver venleg og hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar ei datakake.",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar informasjonskapslar (les gjerne vår <PolicyLink>Cookie-policy</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar informasjonskapslar (cookies).",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
     "This room is not accessible by remote Matrix servers": "Rommet er ikkje tilgjengeleg for andre Matrix-heimtenarar",
     "Add an Integration": "Legg tillegg til",
@@ -888,7 +888,7 @@
     "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
     "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka fellesskap for å filtrera Riot.im-opplevinga di!",
     "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.": "For å setja opp eit filter, dra ein fellesskapsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det fellesskapet.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Bygg di eiga heimeside for å kreva din del av Matrix-verda.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Lag ei tilpassa heimeside for å markere din del av Matrix-universet.",
     "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
     "Server may be unavailable, overloaded, or search timed out :(": "Tenaren er kanskje utilgjengeleg, overlasta, elles så vart søket tidsavbrote :(",
     "Clear filter": "Tøm filter",
@@ -905,7 +905,7 @@
     "Failed to remove tag %(tagName)s from room": "Fekk ikkje til å fjerna merket %(tagName)s frå rommet",
     "Failed to add tag %(tagName)s to room": "Fekk ikkje til å leggja merket %(tagName)s til i rommet",
     "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.": "Dette tillèt deg å henta nøklane for meldingar du har sendt i krypterte rom ut til ei lokal fil. Då kan du importera fila i ein annan Matrix-klient i framtida, slik at den klienten òg kan dekryptera meldingane.",
-    "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.": "Å henta filen ut tillèt kven som helst som kan lesa ho å dekryptera alle krypterte meldingar du kan sjå, so du bør passa på å halda ho trygg. For å hjelpa til med dette bør du skriva ei passetning inn i feltet under, som vil brukast til å kryptere den uthenta dataen. Det vil berre vera mogeleg å henta dataen inn med den same passetninga.",
+    "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.": "Å henta fila ut tillèt kven som helst som kan lesa ho, samt dekryptera alle krypterte meldingar du kan sjå.  Du bør passa på å halda ho trygg. For å hjelpa til med dette bør du skriva ein passfrase inn i feltet under, som vil brukast til å kryptere den eksporterte dataen. Det vil berre vera mogeleg å importera data inn med den same passfrasen.",
     "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.": "Dette tillèt deg å importere krypteringsnøklar som du tidlegare har eksportert frå ein annan Matrix-klient. Du har deretter moglegheit for å dekryptere alle meldingane som den andre klienten kunne dekryptere.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Den eksporterte fila vil bli verna med ein passfrase. Du bør skriva passfrasen her, for å dekryptere fila.",
     "Only room administrators will see this warning": "Berre rom-administratorar vil sjå denne åtvaringa",
@@ -1041,7 +1041,7 @@
     "Adds a custom widget by URL to the room": "Legg til eit tilpassa miniprogram til rommet med ein URL",
     "Please supply a https:// or http:// widget URL": "Skriv inn https:// eller http:// URL-en for miniprogrammet",
     "You cannot modify widgets in this room.": "Du kan ikkje endra miniprogram i dette rommet.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar i eit kryptert rom kassering av gjeldande utgåande gruppe-sesjon",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar i eit kryptert rom kassering av gjeldande utgåande gruppe-økt",
     "Sends the given message coloured as a rainbow": "Sender den bestemte meldinga farga som ein regnboge",
     "Displays list of commands with usages and descriptions": "Viser ei liste over kommandoar med bruksområde og skildringar",
     "%(senderName)s made no change.": "%(senderName)s utførde ingen endring.",
@@ -1052,13 +1052,13 @@
     "Whether you're using Riot as an installed Progressive Web App": "Om din Riot er installert som ein webapplikasjon (Progressive Web App)",
     "Your user agent": "Din nettlesar (User-Agent)",
     "The information being sent to us to help make Riot better includes:": "Informasjon sendt til oss for å forbetre Riot inkluderar:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det er ukjende sesjonar i dette rommet: om går vidare utan å verifisere dei, kan andre avlytte samtalen.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det er ukjende økter i dette rommet: om går vidare utan å verifisere dei, kan andre avlytte samtalen.",
     "If you cancel now, you won't complete verifying the other user.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre brukaren.",
-    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre sesjonen.",
-    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter no, vil dette stoppe lagringa av den hemmelege passfrasen.",
+    "If you cancel now, you won't complete verifying your other session.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre økta.",
+    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter no, vil dette stoppe opprettinga av det hemmelege lageret.",
     "Cancel entering passphrase?": "Avbryte inntasting av passfrase ?",
     "Setting up keys": "Setter opp nøklar",
-    "Verify this session": "Stadfest denne sesjonen",
+    "Verify this session": "Stadfest denne økta",
     "Encryption upgrade available": "Kryptering kan oppgraderast",
     "Set up encryption": "Sett opp kryptering",
     "Unverified session": "Uverifisert sesjon",
@@ -1069,12 +1069,12 @@
     "Custom (%(level)s)": "Tilpassa (%(level)s)",
     "Error upgrading room": "Feil ved oppgradering av rom",
     "Double check that your server supports the room version chosen and try again.": "Sjekk at server støttar romversjon, og prøv på nytt.",
-    "Verifies a user, session, and pubkey tuple": "Verifiser brukar, sesjon eller public key objekt (pubkey tuple)",
-    "Unknown (user, session) pair:": "Ukjent (brukar,sesjon) par:",
+    "Verifies a user, session, and pubkey tuple": "Verifiser brukar, økt eller public-key objekt (pubkey tuple)",
+    "Unknown (user, session) pair:": "Ukjent (brukar,økt) par:",
     "Session already verified!": "Sesjon er tidligare verifisert!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ÅTVARING: Sesjon er tidligare verifisert, men nøklane STEMMER IKKJE!",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ÅTVARING: NØKKELVERIFIKASJON FEILA! Signeringsnøkkel for %(userId)s og sesjon %(deviceId)s er \"%(fprint)s\" stemmer ikkje med innsendt nøkkel \"%(fingerprint)s\". Dette kan vere teikn på at kommunikasjonen er avlytta!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Innsendt signeringsnøkkel er lik nøkkelen du mottok frå %(userId)s med sesjon %(deviceId)s. Sesjonen no er verifisert.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ÅTVARING: NØKKELVERIFIKASJON FEILA! Signeringsnøkkel for %(userId)s og økt %(deviceId)s er \"%(fprint)s\" stemmer ikkje med innsendt nøkkel \"%(fingerprint)s\". Dette kan vere teikn på at kommunikasjonen er avlytta!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Innsendt signeringsnøkkel er lik nøkkelen du mottok frå %(userId)s med økt %(deviceId)s. Sesjonen no er verifisert.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s satte rommet til offentleg for alle som har linken.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s avgrensa romtilgang til inviterte deltakarar.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s satte tilgangsregelen til %(rule)s",
@@ -1111,7 +1111,7 @@
     "Prompt before sending invites to potentially invalid matrix IDs": "Spør før utsending av invitasjonar til potensielle ugyldige Matrix-IDar",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ved å fjerne koplinga mot din identitetstenar, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan heller ikkje invitera andre med e-post eller telefonnummer.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Å bruke ein identitetstenar er frivillig. Om du vel å ikkje bruke dette, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan ikkje invitera andre med e-post eller telefonnummer.",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Passordet ditt vart endra. Du vil ikkje motta push-varslingar på andre sesjonar, før etter til at du har logga inn på nytt der",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Passordet ditt vart endra. Du vil ikkje motta push-varslingar på andre økter, før etter til at du har logga inn på nytt der",
     "Error downloading theme information.": "Feil under nedlasting av temainformasjon.",
     "Theme added!": "Tema lagt til!",
     "Email addresses": "E-postadresser",
@@ -1139,7 +1139,7 @@
     "Deactivate user?": "Deaktivere brukar?",
     "Deactivate user": "Deaktiver brukar",
     "Failed to deactivate user": "Fekk ikkje til å deaktivere brukaren",
-    "No sessions with registered encryption keys": "Ingen sesjonar med registrerte krypteringsnøklar",
+    "No sessions with registered encryption keys": "Ingen økter med registrerte krypteringsnøklar",
     "Remove recent messages": "Fjern nyare meldingar",
     "Send a reply…": "Send eit svar…",
     "Send a message…": "Send melding…",
@@ -1221,7 +1221,7 @@
     "Error updating flair": "Oppdatering av etikett gjekk gale",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på server , eller så oppstod det ein feil.",
     "Room Name": "Romnamn",
-    "Room Topic": "Rom-emne",
+    "Room Topic": "Romemne",
     "Room avatar": "Rom-avatar",
     "Power level": "Tilgangsnivå",
     "Voice & Video": "Tale & Video",
@@ -1295,7 +1295,7 @@
     "Send typing notifications": "Kringkast \"skriv...\"-status til andre",
     "Show typing notifications": "Vis \"skriv...\"-status frå andre",
     "Show previews/thumbnails for images": "Vis førehandsvisningar/thumbnails for bilete",
-    "Manually verify all remote sessions": "Manuelt verifiser alle eksterne sesjonar",
+    "Manually verify all remote sessions": "Manuelt verifiser alle eksterne økter",
     "Messages containing my username": "Meldingar som inneheld mitt brukarnamn",
     "Messages containing @room": "Meldingar som inneheld @room",
     "Encrypted messages in one-to-one chats": "Krypterte meldingar i ein-til-ein-samtalar",
@@ -1319,5 +1319,67 @@
     "Your theme": "Ditt tema",
     "Failed to upgrade room": "Fekk ikkje til å oppgradere rom",
     "Jump to start/end of the composer": "Hopp til start/slutt av teksteditoren",
-    "Navigate composer history": "Naviger historikk for teksteditor"
+    "Navigate composer history": "Naviger historikk for teksteditor",
+    "Use Single Sign On to continue": "Bruk Single-sign-on for å fortsette",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Stadfest at du legger til denne e-postadressa, ved å bruke Single-sign-on for å bevise identiteten din.",
+    "Single Sign On": "Single-sign-on",
+    "Review Sessions": "Sjå gjennom økter",
+    "Capitalization doesn't help very much": "Store bokstavar hjelp dessverre lite",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Forutsigbare teiknbytte som '@' istaden for 'a' hjelp dessverre lite",
+    "Try out new ways to ignore people (experimental)": "Prøv ut nye måtar å ignorere folk på (eksperimentelt)",
+    "Keep secret storage passphrase in memory for this session": "Hald passfrase for hemmeleg lager i systemminnet for denne økta",
+    "Cross-signing and secret storage are enabled.": "Krysssignering og hemmeleg lager er aktivert.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Kontoen din har ein kryss-signert identitet det hemmelege lageret, økta di stolar ikkje på denne enno.",
+    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje konfiguert.",
+    "Reset cross-signing and secret storage": "Tilbakestill krysssignering og hemmeleg lager",
+    "Bootstrap cross-signing and secret storage": "Førebur krysssignering og hemmeleg lager",
+    "in secret storage": "i hemmeleg lager",
+    "Secret storage public key:": "Public-nøkkel for hemmeleg lager:",
+    "Secret Storage key format:": "Nøkkel-format for hemmeleg lager:",
+    "Keyboard Shortcuts": "Tastatursnarvegar",
+    "Ignored users": "Ignorerte brukarar",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Legg til brukarar og serverar du vil ignorera her. Bruk stjerne/wildcard (*) for at markere eitkvart teikn. Til dømes, <code>@bot*</code> vil ignorere alle brukarar med namn 'bot' på uansett server.",
+    "Server or user ID to ignore": "Server eller brukar-ID for å ignorere",
+    "If this isn't what you want, please use a different tool to ignore users.": "Om det ikkje var dette du ville, bruk eit anna verktøy til å ignorera brukarar.",
+    "Enter the name of a new server you want to explore.": "Skriv inn namn på ny server du ynskjer å utforske.",
+    "Matrix rooms": "Matrix-rom",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Om du har meir info rundt korleis problemet oppstod, som kva du prøvde å gjere på det tidspunktet, brukar-IDar m.m ,inkluder gjerne den informasjonen her.",
+    "Topic (optional)": "Emne (valfritt)",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "For å unngå duplikate feilrapportar, sjekk <existingIssuesLink>eksisterande innmeldte feil</existingIssuesLink> fyrst (og legg på ein +1) eller <newIssueLink>meld inn ny feil</newIssueLink> viss du ikkje finn den der.",
+    "Command Help": "Kommandohjelp",
+    "To help us prevent this in future, please <a>send us logs</a>.": "For å bistå med å forhindre dette i framtida, gjerne <a>send oss loggar</a>.",
+    "Enter secret storage passphrase": "Skriv inn passfrase for hemmeleg lager",
+    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Tilgang til hemmeleg lager vart feila. Sjekk at du har skrive inn korrekt passfrase.",
+    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Åtvaring</b>: Du bør berre nytte hemmeleg lager frå ei sikker,personleg datamaskin.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Skriv inn passfrasen din for å få tilgang til sikker samtalehistorikk og identiet nytta ved krysssignering for å verifisere andre økter.",
+    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Om du har gløymt passfrasen din kan du <button1>bruke gjennopprettingsnøkkel</button1> eller <button2>opprette nye gjenopprettingsalternativ</button2>.",
+    "Enter secret storage recovery key": "Skriv inn gjenopprettingsnøkkel for hemmeleg lagring",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Fekk ikkje tilgang til hemmeleg lager. Sjekk at du skreiv inn korrekt gjenopprettingsnøkkel.",
+    "Incorrect recovery passphrase": "Feil gjenopprettingspassfrase",
+    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Fekk ikkje til å dekryptere sikkerheitkopien med denne passfrasen: sjekk at du har skrive inn korrekt gjenopprettingspassfrase.",
+    "Enter recovery passphrase": "Skriv inn gjennopprettingspassfrase",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Få tilgang til sikker meldingshistorikk og sett opp sikker meldingsutveksling, ved å skrive inn gjennopprettingspassfrasen.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Har du gløymt gjennopprettingspassfrasen kan du <button1>bruke gjennopprettingsnøkkel</button1> eller <button2>sette opp nye gjennopprettingsval</button2>",
+    "Help": "Hjelp",
+    "Explore": "Utforsk",
+    "%(creator)s created and configured the room.": "%(creator)s oppretta og konfiguerte dette rommet.",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot klarde ikkje å hente protokolllister frå heimeserveren. Det kan hende at serveren er for gammal til å støtte tredjeparts-nettverk",
+    "The homeserver may be unavailable or overloaded.": "Heimeserveren kan vere overlasta eller utilgjengeleg.",
+    "Preview": "Førehandsvis",
+    "View": "Vis",
+    "Find a room…": "Finn eit rom…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Finn eit rom... (t.d. %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Om du ikkje kan finne rommet du ser etter, spør etter ein invitasjon eller <a>opprett eit nytt rom</a>.",
+    "Message not sent due to unknown sessions being present": "Meldinga vart ikkje sendt fordi ukjende økter er tilstades",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Vis økter</showSessionsText>, <sendAnywayText>send likevel</sendAnywayText> eller<cancelText>avbryt</cancelText>.",
+    "Jump to first unread room.": "Hopp til fyrste uleste rom.",
+    "Jump to first invite.": "Hopp til fyrste invitasjon.",
+    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Har du ikkje tilgang til ein, <button>bruk gjennopprettingsnøkkel eller passfrase.</button>",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Hald krypteringsnøkklane dine sikre med ein passfrase. For maksimal sikkerheit bør denne vere forskjellig frå kontopassordet ditt:",
+    "Enter a passphrase": "Skriv inn ein passfrase",
+    "Back up my encryption keys, securing them with the same passphrase": "Sikkerheitskopier mine krypteringsnøklar, sikre dei med same passfrase",
+    "Enter your passphrase a second time to confirm it.": "Stadfest passfrasen ved å skrive den inn ein gong til.",
+    "Unable to set up secret storage": "Oppsett av hemmeleg lager feila",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne økta har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar vart fjerna.",
+    "Toggle microphone mute": "Slå av/på demping av mikrofon"
 }

From 0307361fa2b815e841707d034bc58102d7d61c85 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 16:42:39 +0200
Subject: [PATCH 1975/3235] more polish for self-verification

---
 .../views/right_panel/_VerificationPanel.scss | 33 ++++++++----------
 .../views/right_panel/VerificationPanel.js    | 34 ++++++++++++-------
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index e4e7e2dddc..f8e5a54afb 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -13,6 +13,17 @@ 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_VerificationPanel_verified_section,
+.mx_VerificationPanel_reciprocate_section {
+    // center the big shield icon
+    .mx_E2EIcon {
+        // Override general user info margin
+        margin: 20px auto !important;
+    }
+}
+
 
 .mx_UserInfo {
     .mx_EncryptionPanel_cancel {
@@ -30,15 +41,6 @@ limitations under the License.
         right: 14px;
     }
 
-    .mx_VerificationPanel_verified_section,
-    .mx_VerificationPanel_reciprocate_section {
-        .mx_E2EIcon {
-            // Override general user info margin
-            margin: 20px auto !important;
-        }
-    }
-
-
     .mx_VerificationPanel_qrCode {
         padding: 4px 4px 0 4px;
         background: white;
@@ -123,10 +125,6 @@ limitations under the License.
 
     // EncryptionPanel when verification is done
     .mx_VerificationPanel_verified_section {
-        // center the big shield icon
-        .mx_E2EIcon {
-            margin: 0 auto;
-        }
         // right align the "Got it" button
         .mx_AccessibleButton {
             float: right;
@@ -134,16 +132,15 @@ limitations under the License.
     }
 
     .mx_VerificationPanel_reciprocate_section {
-        .mx_FormButton {
-            margin: 0 10px;
-            padding: 10px;
-            flex: 1;
+        .mx_AccessibleButton {
+            margin-left: 10px;
+            padding: 7px 40px;
         }
 
-        // show Yes/No buttons next to each other
         .mx_VerificationPanel_reciprocateButtons {
             display: flex;
             flex-direction: row;
+            justify-content: flex-end;
         }
     }
 }
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 103497169f..840ece873c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -18,6 +18,7 @@ import React from "react";
 import PropTypes from "prop-types";
 
 import * as sdk from '../../../index';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
@@ -154,29 +155,38 @@ export default class VerificationPanel extends React.PureComponent {
         this.state.reciprocateQREvent.cancel();
     };
 
+    get _isSelfVerification() {
+        return this.props.request.otherUserId === MatrixClientPeg.get().getUserId();
+    }
+
     renderQRReciprocatePhase() {
         const {member} = this.props;
-        const FormButton = sdk.getComponent("elements.FormButton");
-
+        let Button;
+        if (this.props.inDialog) {
+            Button = sdk.getComponent("elements.AccessibleButton");
+        } else {
+            Button = sdk.getComponent("elements.FormButton");
+        }
+        const description = this._isSelfVerification ?
+            _t("Almost there! Is your other session showing the same shield?") :
+            _t("Almost there! Is %(displayName)s showing the same shield?", {
+                displayName: member.displayName || member.name || member.userId,
+            });
         let body;
         if (this.state.reciprocateQREvent) {
             // riot web doesn't support scanning yet, so assume here we're the client being scanned.
             body = <React.Fragment>
-                <p>{_t("Almost there! Is %(displayName)s showing the same shield?", {
-                        displayName: member.displayName || member.name || member.userId,
-                    })}</p>
+                <p>{description}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
                 <div className="mx_VerificationPanel_reciprocateButtons">
-                    <FormButton
+                    <Button
                         label={_t("No")} kind="danger"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this._onReciprocateNoClick}
-                    />
-                    <FormButton
-                        label={_t("Yes")}
+                        onClick={this._onReciprocateNoClick}>{_t("No")}</Button>
+                    <Button
+                        label={_t("Yes")} kind="primary"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this._onReciprocateYesClick}
-                    />
+                        onClick={this._onReciprocateYesClick}>{_t("Yes")}</Button>
                 </div>
             </React.Fragment>;
         } else {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 26dcfb7ee8..389a30fe8f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1252,6 +1252,7 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
     "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
     "Verify by emoji": "Verify by emoji",
+    "Almost there! Is your other session showing the same shield?": "Almost there! Is your other session showing the same shield?",
     "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
     "No": "No",
     "Yes": "Yes",

From 1baaafe7b9174dcb6b11da4edbd3be1c6abc13b7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 16:44:42 +0200
Subject: [PATCH 1976/3235] some comments to explain the mess

---
 src/components/views/right_panel/VerificationPanel.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 840ece873c..579cd2c000 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -162,6 +162,8 @@ export default class VerificationPanel extends React.PureComponent {
     renderQRReciprocatePhase() {
         const {member} = this.props;
         let Button;
+        // a bit of a hack, but the FormButton should only be used in the right panel
+        // they should probably just be the same component with a css class applied to it?
         if (this.props.inDialog) {
             Button = sdk.getComponent("elements.AccessibleButton");
         } else {
@@ -175,6 +177,9 @@ export default class VerificationPanel extends React.PureComponent {
         let body;
         if (this.state.reciprocateQREvent) {
             // riot web doesn't support scanning yet, so assume here we're the client being scanned.
+            //
+            // we're passing both a label and a child string to Button as
+            // FormButton and AccessibleButton expect this differently
             body = <React.Fragment>
                 <p>{description}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />

From fffd5a4a5ee4449d3a0949ecb429c206b82824f9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 16:46:29 +0200
Subject: [PATCH 1977/3235] fix stylelint

---
 res/css/views/right_panel/_VerificationPanel.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index f8e5a54afb..01a654b523 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -13,7 +13,6 @@ 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_VerificationPanel_verified_section,
 .mx_VerificationPanel_reciprocate_section {

From 081baa23592c0a6d2677dcd09e4b67d44a2a474b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 17:12:10 +0200
Subject: [PATCH 1978/3235] set dialog title for self-verification

use request.isSelfVerification helper
---
 .../views/dialogs/VerificationRequestDialog.js  | 17 +++++++++++++++--
 .../views/right_panel/VerificationPanel.js      |  8 ++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index bbf3482a41..88ca0bc337 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -30,16 +30,29 @@ export default class VerificationRequestDialog extends React.Component {
     constructor(...args) {
         super(...args);
         this.onFinished = this.onFinished.bind(this);
+        this.state = {};
+        if (this.props.verificationRequest) {
+            this.state.verificationRequest = this.props.verificationRequest;
+        } else if (this.props.verificationRequestPromise) {
+            this.props.verificationRequestPromise.then(r => {
+                this.setState({verificationRequest: r});
+            });
+        }
     }
 
     render() {
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
+        const request = this.state.verificationRequest;
+        const otherUserId = request && request.otherUserId;
         const member = this.props.member ||
-            MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId);
+            otherUserId && MatrixClientPeg.get().getUser(otherUserId);
+        const title = request && request.isSelfVerification ?
+            _t("Verify this session") : _t("Verification Request");
+
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"
-                title={_t("Verification Request")}
+                title={title}
                 hasCancel={true}
             >
             <EncryptionPanel
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 579cd2c000..f407d5f792 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -155,12 +155,8 @@ export default class VerificationPanel extends React.PureComponent {
         this.state.reciprocateQREvent.cancel();
     };
 
-    get _isSelfVerification() {
-        return this.props.request.otherUserId === MatrixClientPeg.get().getUserId();
-    }
-
     renderQRReciprocatePhase() {
-        const {member} = this.props;
+        const {member, request} = this.props;
         let Button;
         // a bit of a hack, but the FormButton should only be used in the right panel
         // they should probably just be the same component with a css class applied to it?
@@ -169,7 +165,7 @@ export default class VerificationPanel extends React.PureComponent {
         } else {
             Button = sdk.getComponent("elements.FormButton");
         }
-        const description = this._isSelfVerification ?
+        const description = request.isSelfVerification ?
             _t("Almost there! Is your other session showing the same shield?") :
             _t("Almost there! Is %(displayName)s showing the same shield?", {
                 displayName: member.displayName || member.name || member.userId,

From cc9c5cabb32a76cc6f0a93706aaf5e5d3a95fa84 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 17:51:25 +0200
Subject: [PATCH 1979/3235] adapt encryption info to self-verification

 - hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
---
 .../views/right_panel/EncryptionInfo.js       | 24 +++++++++++++++----
 .../views/right_panel/EncryptionPanel.js      |  7 +++++-
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js
index 610ea99511..007e2831ce 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.js
@@ -28,14 +28,26 @@ export const PendingActionSpinner = ({text}) => {
     </div>;
 };
 
-const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStartVerification, isRoomEncrypted}) => {
+const EncryptionInfo = ({
+    waitingForOtherParty,
+    waitingForNetwork,
+    member,
+    onStartVerification,
+    isRoomEncrypted,
+    inDialog,
+    isSelfVerification,
+}) => {
     let content;
     if (waitingForOtherParty || waitingForNetwork) {
         let text;
         if (waitingForOtherParty) {
-            text = _t("Waiting for %(displayName)s to accept…", {
-                displayName: member.displayName || member.name || member.userId,
-            });
+            if (isSelfVerification) {
+                text = _t("Waiting for you to accept on your other session…");
+            } else {
+                text = _t("Waiting for %(displayName)s to accept…", {
+                    displayName: member.displayName || member.name || member.userId,
+                });
+            }
         } else {
             text = _t("Accepting…");
         }
@@ -66,6 +78,10 @@ const EncryptionInfo = ({waitingForOtherParty, waitingForNetwork, member, onStar
         );
     }
 
+    if (inDialog) {
+        return content;
+    }
+
     return <React.Fragment>
         <div className="mx_UserInfo_container">
             <h3>{_t("Encryption")}</h3>
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 6f884c4abf..152f4c0aa0 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -112,6 +112,9 @@ const EncryptionPanel = (props) => {
     const requested =
         (!request && isRequesting) ||
         (request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
+    const isSelfVerification = request ?
+        request.isSelfVerification :
+        member.userId === MatrixClientPeg.get().getUserId();
     if (!request || requested) {
         const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
         return (<React.Fragment>
@@ -120,8 +123,10 @@ const EncryptionPanel = (props) => {
                 isRoomEncrypted={isRoomEncrypted}
                 onStartVerification={onStartVerification}
                 member={member}
+                isSelfVerification={isSelfVerification}
                 waitingForOtherParty={requested && initiatedByMe}
-                waitingForNetwork={requested && !initiatedByMe} />
+                waitingForNetwork={requested && !initiatedByMe}
+                inDialog={inDialog} />
         </React.Fragment>);
     } else {
         return (<React.Fragment>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 389a30fe8f..68ff781ceb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1212,6 +1212,7 @@
     "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.",
     "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.",
+    "Waiting for you to accept on your other session…": "Waiting for you to accept on your other session…",
     "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
     "Accepting…": "Accepting…",
     "Start Verification": "Start Verification",

From 6bb6885578b6b5847ba2dd17ed692e50c3097dde Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 18:28:01 +0200
Subject: [PATCH 1980/3235] adjust sas copy to use device -> session

---
 src/components/views/verification/VerificationShowSas.js | 4 ++--
 src/i18n/strings/en_EN.json                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 9b4ea4f2bd..36f2df6360 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -75,7 +75,7 @@ export default class VerificationShowSas extends React.Component {
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
-                    "Confirm the emoji below are displayed on both devices, in the same order:",
+                    "Confirm the emoji below are displayed on both sessions, in the same order:",
                 ):
                 _t(
                     "Verify this user by confirming the following emoji appear on their screen.",
@@ -89,7 +89,7 @@ export default class VerificationShowSas extends React.Component {
             </div>;
             sasCaption = this.props.isSelf ?
                 _t(
-                    "Verify this device by confirming the following number appears on its screen.",
+                    "Verify this session by confirming the following number appears on its screen.",
                 ):
                 _t(
                     "Verify this user by confirming the following number appears on their screen.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 68ff781ceb..912a86446f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -478,9 +478,9 @@
     "Compare unique emoji": "Compare unique emoji",
     "Compare a unique set of emoji if you don't have a camera on either device": "Compare a unique set of emoji if you don't have a camera on either device",
     "Start": "Start",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirm the emoji below are displayed on both devices, in the same order:",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirm the emoji below are displayed on both sessions, in the same order:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
-    "Verify this device by confirming the following number appears on its screen.": "Verify this device by confirming the following number appears on its screen.",
+    "Verify this session by confirming the following number appears on its screen.": "Verify this session by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",

From 2ee780caa2785b4c234b2a70d2a66f7440728cb5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 2 Apr 2020 18:28:14 +0200
Subject: [PATCH 1981/3235] pass isSelf flag to sas component

---
 src/components/views/right_panel/VerificationPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index f407d5f792..22cf855d2c 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -275,6 +275,7 @@ export default class VerificationPanel extends React.PureComponent {
                                 onCancel={this._onSasMismatchesClick}
                                 onDone={this._onSasMatchesClick}
                                 inDialog={this.props.inDialog}
+                                isSelf={request.isSelfVerification}
                             /> : <Spinner />;
                         return <div className="mx_UserInfo_container">
                             <h3>{_t("Compare emoji")}</h3>

From 86f39ee0eee2e18e86b3e92b2b7d8c0a56da9bdd Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 2 Apr 2020 15:07:50 +0100
Subject: [PATCH 1982/3235] Fix read marker visibility for grouped events

The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
---
 src/components/structures/MessagePanel.js     |  21 +-
 .../structures/MessagePanel-test.js           | 306 +++++++++++-------
 2 files changed, 209 insertions(+), 118 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 4fd57d95e6..c3a2bdbc59 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -838,14 +838,16 @@ class CreationGrouper {
         // events that we include in the group but then eject out and place
         // above the group.
         this.ejectedEvents = [];
-        this.readMarker = panel._readMarkerForEvent(createEvent.getId());
+        this.readMarker = panel._readMarkerForEvent(
+            createEvent.getId(),
+            createEvent === lastShownEvent,
+        );
     }
 
     shouldGroup(ev) {
         const panel = this.panel;
         const createEvent = this.createEvent;
         if (!panel._shouldShowEvent(ev)) {
-            this.readMarker = this.readMarker || panel._readMarkerForEvent(ev.getId());
             return true;
         }
         if (panel._wantsDateSeparator(this.createEvent, ev.getDate())) {
@@ -863,7 +865,10 @@ class CreationGrouper {
 
     add(ev) {
         const panel = this.panel;
-        this.readMarker = this.readMarker || panel._readMarkerForEvent(ev.getId());
+        this.readMarker = this.readMarker || panel._readMarkerForEvent(
+            ev.getId(),
+            ev === this.lastShownEvent,
+        );
         if (!panel._shouldShowEvent(ev)) {
             return;
         }
@@ -950,7 +955,10 @@ class MemberGrouper {
 
     constructor(panel, ev, prevEvent, lastShownEvent) {
         this.panel = panel;
-        this.readMarker = panel._readMarkerForEvent(ev.getId());
+        this.readMarker = panel._readMarkerForEvent(
+            ev.getId(),
+            ev === lastShownEvent,
+        );
         this.events = [ev];
         this.prevEvent = prevEvent;
         this.lastShownEvent = lastShownEvent;
@@ -971,7 +979,10 @@ class MemberGrouper {
             const renderText = textForEvent(ev);
             if (!renderText || renderText.trim().length === 0) return; // quietly ignore
         }
-        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(ev.getId());
+        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+            ev.getId(),
+            ev === this.lastShownEvent,
+        );
         this.events.push(ev);
     }
 
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index e6332cf7f8..3ac70bdac9 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -142,128 +142,42 @@ describe('MessagePanel', function() {
         return events;
     }
 
-    it('should show the events', function() {
-        const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={events} />,
-        );
+    // A list of membership events only with nothing else
+    function mkMelsEventsOnly() {
+        const events = [];
+        const ts0 = Date.now();
 
-        // just check we have the right number of tiles for now
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'));
-        expect(tiles.length).toEqual(10);
-    });
+        let i = 0;
 
-    it('should collapse adjacent member events', function() {
-        const res = TestUtils.renderIntoDocument(
-            <WrappedMessagePanel className="cls" events={mkMelsEvents()} />,
-        );
+        for (i = 0; i < 10; i++) {
+            events.push(test_utils.mkMembership({
+                event: true, room: "!room:id", user: "@user:id",
+                target: {
+                    userId: "@user:id",
+                    name: "Bob",
+                    getAvatarUrl: () => {
+                        return "avatar.jpeg";
+                    },
+                },
+                ts: ts0 + i*1000,
+                mship: 'join',
+                prevMship: 'join',
+                name: 'A user',
+            }));
+        }
 
-        // just check we have the right number of tiles for now
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'),
-        );
-        expect(tiles.length).toEqual(2);
+        return events;
+    }
 
-        const summaryTiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('elements.MemberEventListSummary'),
-        );
-        expect(summaryTiles.length).toEqual(1);
-    });
-
-    it('should show the read-marker in the right place', function() {
-        const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
-                    readMarkerVisible={true} />,
-        );
-
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            res, sdk.getComponent('rooms.EventTile'));
-
-        // find the <li> which wraps the read marker
-        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
-
-        // it should follow the <li> which wraps the event tile for event 4
-        const eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode;
-        expect(rm.previousSibling).toEqual(eventContainer);
-    });
-
-    it('should show the read-marker that fall in summarised events after the summary', function() {
-        const melsEvents = mkMelsEvents();
-        const res = TestUtils.renderIntoDocument(
-                <WrappedMessagePanel className="cls" events={melsEvents} readMarkerEventId={melsEvents[4].getId()}
-                    readMarkerVisible={true} />,
-        );
-
-        const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
-
-        // find the <li> which wraps the read marker
-        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
-
-        expect(rm.previousSibling).toEqual(summary);
-    });
-
-    it('shows a ghost read-marker when the read-marker moves', function(done) {
-        // fake the clock so that we can test the velocity animation.
-        clock.install();
-        clock.mockDate();
-
-        const parentDiv = document.createElement('div');
-
-        // first render with the RM in one place
-        let mp = ReactDOM.render(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
-                    readMarkerVisible={true}
-                />, parentDiv);
-
-        const tiles = TestUtils.scryRenderedComponentsWithType(
-            mp, sdk.getComponent('rooms.EventTile'));
-        const tileContainers = tiles.map(function(t) {
-            return ReactDOM.findDOMNode(t).parentNode;
-        });
-
-        // find the <li> which wraps the read marker
-        const rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container');
-        expect(rm.previousSibling).toEqual(tileContainers[4]);
-
-        // now move the RM
-        mp = ReactDOM.render(
-                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[6].getId()}
-                    readMarkerVisible={true}
-                />, parentDiv);
-
-        // now there should be two RM containers
-        const found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
-        expect(found.length).toEqual(2);
-
-        // the first should be the ghost
-        expect(found[0].previousSibling).toEqual(tileContainers[4]);
-        const hr = found[0].children[0];
-
-        // the second should be the real thing
-        expect(found[1].previousSibling).toEqual(tileContainers[6]);
-
-        // advance the clock, and then let the browser run an animation frame,
-        // to let the animation start
-        clock.tick(1500);
-
-        realSetTimeout(() => {
-            // then advance it again to let it complete
-            clock.tick(1000);
-            realSetTimeout(() => {
-                // the ghost should now have finished
-                expect(hr.style.opacity).toEqual('0');
-                done();
-            }, 100);
-        }, 100);
-    });
-
-    it('should collapse creation events', function() {
+    // A list of room creation, encryption, and invite events.
+    function mkCreationEvents() {
         const mkEvent = test_utils.mkEvent;
         const mkMembership = test_utils.mkMembership;
         const roomId = "!someroom";
         const alice = "@alice:example.org";
         const ts0 = Date.now();
-        const events = [
+
+        return [
             mkEvent({
                 event: true,
                 type: "m.room.create",
@@ -341,6 +255,150 @@ describe('MessagePanel', function() {
                 name: 'Bob',
             }),
         ];
+    }
+
+    function isReadMarkerVisible(rmContainer) {
+        return rmContainer && rmContainer.children.length > 0;
+    }
+
+    it('should show the events', function() {
+        const res = TestUtils.renderIntoDocument(
+                <WrappedMessagePanel className="cls" events={events} />,
+        );
+
+        // just check we have the right number of tiles for now
+        const tiles = TestUtils.scryRenderedComponentsWithType(
+            res, sdk.getComponent('rooms.EventTile'));
+        expect(tiles.length).toEqual(10);
+    });
+
+    it('should collapse adjacent member events', function() {
+        const res = TestUtils.renderIntoDocument(
+            <WrappedMessagePanel className="cls" events={mkMelsEvents()} />,
+        );
+
+        // just check we have the right number of tiles for now
+        const tiles = TestUtils.scryRenderedComponentsWithType(
+            res, sdk.getComponent('rooms.EventTile'),
+        );
+        expect(tiles.length).toEqual(2);
+
+        const summaryTiles = TestUtils.scryRenderedComponentsWithType(
+            res, sdk.getComponent('elements.MemberEventListSummary'),
+        );
+        expect(summaryTiles.length).toEqual(1);
+    });
+
+    it('should insert the read-marker in the right place', function() {
+        const res = TestUtils.renderIntoDocument(
+                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
+                    readMarkerVisible={true} />,
+        );
+
+        const tiles = TestUtils.scryRenderedComponentsWithType(
+            res, sdk.getComponent('rooms.EventTile'));
+
+        // find the <li> which wraps the read marker
+        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
+
+        // it should follow the <li> which wraps the event tile for event 4
+        const eventContainer = ReactDOM.findDOMNode(tiles[4]).parentNode;
+        expect(rm.previousSibling).toEqual(eventContainer);
+    });
+
+    it('should show the read-marker that fall in summarised events after the summary', function() {
+        const melsEvents = mkMelsEvents();
+        const res = TestUtils.renderIntoDocument(
+                <WrappedMessagePanel className="cls" events={melsEvents} readMarkerEventId={melsEvents[4].getId()}
+                    readMarkerVisible={true} />,
+        );
+
+        const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
+
+        // find the <li> which wraps the read marker
+        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
+
+        expect(rm.previousSibling).toEqual(summary);
+
+        // read marker should be visible given props and not at the last event
+        expect(isReadMarkerVisible(rm)).toBeTruthy();
+    });
+
+    it('should hide the read-marker at the end of summarised events', function() {
+        const melsEvents = mkMelsEventsOnly();
+        const res = TestUtils.renderIntoDocument(
+                <WrappedMessagePanel className="cls" events={melsEvents} readMarkerEventId={melsEvents[9].getId()}
+                    readMarkerVisible={true} />,
+        );
+
+        const summary = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_EventListSummary');
+
+        // find the <li> which wraps the read marker
+        const rm = TestUtils.findRenderedDOMComponentWithClass(res, 'mx_RoomView_myReadMarker_container');
+
+        expect(rm.previousSibling).toEqual(summary);
+
+        // read marker should be hidden given props and at the last event
+        expect(isReadMarkerVisible(rm)).toBeFalsy();
+    });
+
+    it('shows a ghost read-marker when the read-marker moves', function(done) {
+        // fake the clock so that we can test the velocity animation.
+        clock.install();
+        clock.mockDate();
+
+        const parentDiv = document.createElement('div');
+
+        // first render with the RM in one place
+        let mp = ReactDOM.render(
+                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[4].getId()}
+                    readMarkerVisible={true}
+                />, parentDiv);
+
+        const tiles = TestUtils.scryRenderedComponentsWithType(
+            mp, sdk.getComponent('rooms.EventTile'));
+        const tileContainers = tiles.map(function(t) {
+            return ReactDOM.findDOMNode(t).parentNode;
+        });
+
+        // find the <li> which wraps the read marker
+        const rm = TestUtils.findRenderedDOMComponentWithClass(mp, 'mx_RoomView_myReadMarker_container');
+        expect(rm.previousSibling).toEqual(tileContainers[4]);
+
+        // now move the RM
+        mp = ReactDOM.render(
+                <WrappedMessagePanel className="cls" events={events} readMarkerEventId={events[6].getId()}
+                    readMarkerVisible={true}
+                />, parentDiv);
+
+        // now there should be two RM containers
+        const found = TestUtils.scryRenderedDOMComponentsWithClass(mp, 'mx_RoomView_myReadMarker_container');
+        expect(found.length).toEqual(2);
+
+        // the first should be the ghost
+        expect(found[0].previousSibling).toEqual(tileContainers[4]);
+        const hr = found[0].children[0];
+
+        // the second should be the real thing
+        expect(found[1].previousSibling).toEqual(tileContainers[6]);
+
+        // advance the clock, and then let the browser run an animation frame,
+        // to let the animation start
+        clock.tick(1500);
+
+        realSetTimeout(() => {
+            // then advance it again to let it complete
+            clock.tick(1000);
+            realSetTimeout(() => {
+                // the ghost should now have finished
+                expect(hr.style.opacity).toEqual('0');
+                done();
+            }, 100);
+        }, 100);
+    });
+
+    it('should collapse creation events', function() {
+        const events = mkCreationEvents();
         const res = mount(
             <WrappedMessagePanel className="cls" events={events} />,
         );
@@ -363,4 +421,26 @@ describe('MessagePanel', function() {
         // invite event should be in the event summary
         expect(summaryEventTiles.length).toEqual(tiles.length - 3);
     });
+
+    it('should hide read-marker at the end of creation event summary', function() {
+        const events = mkCreationEvents();
+        const res = mount(
+            <WrappedMessagePanel
+                className="cls"
+                events={events}
+                readMarkerEventId={events[5].getId()}
+                readMarkerVisible={true}
+            />,
+        );
+
+        // find the <li> which wraps the read marker
+        const rm = res.find('.mx_RoomView_myReadMarker_container').getDOMNode();
+
+        const rows = res.find('.mx_RoomView_MessageList').children();
+        expect(rows.length).toEqual(6);
+        expect(rm.previousSibling).toEqual(rows.at(4).getDOMNode());
+
+        // read marker should be hidden given props and at the last event
+        expect(isReadMarkerVisible(rm)).toBeFalsy();
+    });
 });

From 4b5e2198fd784c6ff9ea6fdb682449b742353c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 3 Apr 2020 06:55:13 +0000
Subject: [PATCH 1983/3235] Translated using Weblate (French)

Currently translated at 100.0% (2256 of 2256 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f138f81647..47cee69682 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2309,5 +2309,17 @@
     "Compare emoji": "Comparer des émojis",
     "Sends a message as html, without interpreting it as markdown": "Envoie un message en HTML, sans l’interpréter comme du Markdown",
     "Sign in with SSO": "Se connecter avec l’authentification unique",
-    "Cancel replying to a message": "Annuler la réponse à un message"
+    "Cancel replying to a message": "Annuler la réponse à un message",
+    "Use Single Sign On to continue": "Utiliser l’authentification unique pour continuer",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirmez l’ajout de cette adresse e-mail en utilisant l’authentification unique pour prouver votre identité.",
+    "Single Sign On": "Authentification unique",
+    "Confirm adding email": "Confirmer l’ajout de l’e-mail",
+    "Click the button below to confirm adding this email address.": "Cliquez sur le bouton ci-dessous pour confirmer l’ajout de l’adresse e-mail.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirmez l’ajout de ce numéro de téléphone en utilisant l’authentification unique pour prouver votre identité.",
+    "Confirm adding phone number": "Confirmer l’ajout du numéro de téléphone",
+    "Click the button below to confirm adding this phone number.": "Cliquez sur le bouton ci-dessous pour confirmer l’ajout de ce numéro de téléphone.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirmez la suppression de ces sessions en utilisant l’authentification unique pour prouver votre identité.",
+    "Confirm deleting these sessions": "Confirmer la suppression de ces sessions",
+    "Click the button below to confirm deleting these sessions.": "Cliquez sur le bouton ci-dessous pour confirmer la suppression de ces sessions.",
+    "Delete sessions": "Supprimer les sessions"
 }

From 0102876e40e3decc484186618d8cf5ab069a2549 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 3 Apr 2020 11:49:08 +0100
Subject: [PATCH 1984/3235] Re-request room keys after auth

---
 src/stores/SetupEncryptionStore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 7b42e1552d..cbbbefb129 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -140,5 +140,7 @@ export class SetupEncryptionStore extends EventEmitter {
     done() {
         this.phase = PHASE_FINISHED;
         this.emit("update");
+        // async - ask other clients for keys, if necessary
+        MatrixClientPeg.get()._crypto.cancelAndResendAllOutgoingKeyRequests();
     }
 }

From 94236de63719a9ac5585f421f739244b0250fb6b Mon Sep 17 00:00:00 2001
From: JungEon Kim <me@jungeon.kim>
Date: Fri, 3 Apr 2020 03:36:25 +0900
Subject: [PATCH 1985/3235] Fix Hangul typing does not work properly

compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
---
 src/components/views/rooms/BasicMessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 7042cdc00d..5b597e1999 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -203,9 +203,9 @@ export default class BasicMessageEditor extends React.Component {
         if (isSafari) {
             this._onInput({inputType: "insertCompositionText"});
         } else {
-            setTimeout(() => {
+            Promise.resolve().then(() => {
                 this._onInput({inputType: "insertCompositionText"});
-            }, 0);
+            });
         }
     }
 

From 030d594e67ec09f451da928d5b177188c6c7c35a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Apr 2020 17:03:37 +0200
Subject: [PATCH 1986/3235] for self-verif, mention which device, not user
 we're verifying in panel

---
 .../views/right_panel/EncryptionPanel.js           | 10 +++++++++-
 .../views/right_panel/VerificationPanel.js         | 14 +++++++++++---
 .../views/verification/VerificationShowSas.js      | 11 +++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 152f4c0aa0..da06c37f75 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -22,6 +22,7 @@ import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import {useAsyncMemo} from "../../../hooks/useAsyncMemo";
 import Modal from "../../../Modal";
 import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
@@ -45,6 +46,12 @@ const EncryptionPanel = (props) => {
         }
     }, [verificationRequest]);
 
+    const deviceId = request && request.channel.deviceId;
+    const device = useAsyncMemo(() => {
+        const cli = MatrixClientPeg.get();
+        return cli.getStoredDevice(cli.getUserId(), deviceId);
+    }, [deviceId]);
+
     useEffect(() => {
         async function awaitPromise() {
             setRequesting(true);
@@ -139,7 +146,8 @@ const EncryptionPanel = (props) => {
                 request={request}
                 key={request.channel.transactionId}
                 inDialog={inDialog}
-                phase={phase} />
+                phase={phase}
+                device={device} />
         </React.Fragment>);
     }
 };
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 22cf855d2c..e114b60b28 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -210,12 +210,19 @@ export default class VerificationPanel extends React.PureComponent {
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const description = request.isSelfVerification ?
+            _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
+                deviceName: this.props.device.getDisplayName(),
+                deviceId: this.props.device.deviceId,
+            }):
+            _t("You've successfully verified %(displayName)s!", {
+                displayName: member.displayName || member.name || member.userId,
+            });
+
         return (
             <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
                 <h3>{_t("Verified")}</h3>
-                <p>{_t("You've successfully verified %(displayName)s!", {
-                    displayName: member.displayName || member.name || member.userId,
-                })}</p>
+                <p>{description}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
                 <p>{ text }</p>
 
@@ -276,6 +283,7 @@ export default class VerificationPanel extends React.PureComponent {
                                 onDone={this._onSasMatchesClick}
                                 inDialog={this.props.inDialog}
                                 isSelf={request.isSelfVerification}
+                                device={this.props.device}
                             /> : <Spinner />;
                         return <div className="mx_UserInfo_container">
                             <h3>{_t("Compare emoji")}</h3>
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 36f2df6360..7e9096e8fe 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -107,8 +107,15 @@ export default class VerificationShowSas extends React.Component {
         if (this.state.pending || this.state.cancelling) {
             let text;
             if (this.state.pending) {
-                const {displayName} = this.props;
-                text = _t("Waiting for %(displayName)s to verify…", {displayName});
+                if (this.props.isSelf) {
+                    text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
+                        deviceName: this.props.device.getDisplayName(),
+                        deviceId: this.props.device.deviceId,
+                    });
+                } else {
+                    const {displayName} = this.props;
+                    text = _t("Waiting for %(displayName)s to verify…", {displayName});
+                }
             } else {
                 text = _t("Cancelling…");
             }

From cdbd4da0e4e45d8fa64b5458f3f226d74ac5862a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Apr 2020 17:04:29 +0200
Subject: [PATCH 1987/3235] adjust copy for self-verification in verification
 panel

---
 .../views/right_panel/VerificationPanel.js    | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index e114b60b28..b60cc234eb 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -18,7 +18,6 @@ import React from "react";
 import PropTypes from "prop-types";
 
 import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
@@ -200,13 +199,15 @@ export default class VerificationPanel extends React.PureComponent {
     }
 
     renderVerifiedPhase() {
-        const {member} = this.props;
+        const {member, request} = this.props;
 
         let text;
-        if (this.props.isRoomEncrypted) {
-            text = _t("Verify all users in a room to ensure it's secure.");
-        } else {
-            text = _t("In encrypted rooms, verify all users to ensure it’s secure.");
+        if (!request.isSelfVerification) {
+            if (this.props.isRoomEncrypted) {
+                text = _t("Verify all users in a room to ensure it's secure.");
+            } else {
+                text = _t("In encrypted rooms, verify all users to ensure it’s secure.");
+            }
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
@@ -224,8 +225,7 @@ export default class VerificationPanel extends React.PureComponent {
                 <h3>{_t("Verified")}</h3>
                 <p>{description}</p>
                 <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
-                <p>{ text }</p>
-
+                { text ? <p>{ text }</p> : null }
                 <AccessibleButton kind="primary" className="mx_UserInfo_wideButton" onClick={this.props.onClose}>
                     {_t("Got it")}
                 </AccessibleButton>
@@ -238,15 +238,27 @@ export default class VerificationPanel extends React.PureComponent {
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
+        let startAgainInstruction;
+        if (request.isSelfVerification) {
+            startAgainInstruction = _t("Start verification again from the notification.");
+        } else {
+            startAgainInstruction = _t("Start verification again from their profile.");
+        }
+
         let text;
         if (request.cancellationCode === "m.timeout") {
-            text = _t("Verification timed out. Start verification again from their profile.");
+            text = _t("Verification timed out.") + ` ${startAgainInstruction}`;
         } else if (request.cancellingUserId === request.otherUserId) {
-            text = _t("%(displayName)s cancelled verification. Start verification again from their profile.", {
-                displayName: member.displayName || member.name || member.userId,
-            });
+            if (request.isSelfVerification) {
+                text = _t("You cancelled verification on your other session.");
+            } else {
+                text = _t("%(displayName)s cancelled verification.", {
+                    displayName: member.displayName || member.name || member.userId,
+                });
+            }
+            text = `${text} ${startAgainInstruction}`;
         } else {
-            text = _t("You cancelled verification. Start verification again from their profile.");
+            text = _t("You cancelled verification.") + ` ${startAgainInstruction}`;
         }
 
         return (

From 364421b08896e93cd10050c5e5a89292686dd503 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Apr 2020 17:04:58 +0200
Subject: [PATCH 1988/3235] adjust self-verification copy in incoming verif req
 toast

---
 src/components/structures/MatrixChat.js       |  2 +-
 .../views/toasts/VerificationRequestToast.js  | 35 +++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 09d4740c73..7d3b7dd0d9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1521,7 +1521,7 @@ export default createReactClass({
             } else if (request.pending) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: 'verifreq_' + request.channel.transactionId,
-                    title: _t("Verification Request"),
+                    title: request.isSelfVerification ? _t("Self-verification request") : _t("Verification Request"),
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index c11cefc839..6ca582fbc7 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -31,7 +31,7 @@ export default class VerificationRequestToast extends React.PureComponent {
         this.state = {counter: Math.ceil(props.request.timeout / 1000)};
     }
 
-    componentDidMount() {
+    async componentDidMount() {
         const {request} = this.props;
         if (request.timeout && request.timeout > 0) {
             this._intervalHandle = setInterval(() => {
@@ -48,6 +48,11 @@ export default class VerificationRequestToast extends React.PureComponent {
         // As a quick & dirty fix, check the toast is still relevant when it mounts (this prevents
         // a toast hanging around after logging in if you did a verification as part of login).
         this._checkRequestIsPending();
+
+        if (request.isSelfVerification) {
+            const cli = MatrixClientPeg.get();
+            this.setState({device: await cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
+        }
     }
 
     componentWillUnmount() {
@@ -107,15 +112,25 @@ export default class VerificationRequestToast extends React.PureComponent {
     render() {
         const FormButton = sdk.getComponent("elements.FormButton");
         const {request} = this.props;
-        const userId = request.otherUserId;
-        const roomId = request.channel.roomId;
-        let nameLabel = roomId ? userLabelForEventRoom(userId, roomId) : userId;
-        // for legacy to_device verification requests
-        if (nameLabel === userId) {
-            const client = MatrixClientPeg.get();
-            const user = client.getUser(userId);
-            if (user && user.displayName) {
-                nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
+        let nameLabel;
+        if (request.isSelfVerification) {
+            if (this.state.device) {
+                nameLabel = _t("From %(deviceName)s (%(deviceId)s)", {
+                    deviceName: this.state.device.getDisplayName(),
+                    deviceId: this.state.device.deviceId,
+                });
+            }
+        } else {
+            const userId = request.otherUserId;
+            const roomId = request.channel.roomId;
+            nameLabel = roomId ? userLabelForEventRoom(userId, roomId) : userId;
+            // for legacy to_device verification requests
+            if (nameLabel === userId) {
+                const client = MatrixClientPeg.get();
+                const user = client.getUser(userId);
+                if (user && user.displayName) {
+                    nameLabel = _t("%(name)s (%(userId)s)", {name: user.displayName, userId});
+                }
             }
         }
         const declineLabel = this.state.counter == 0 ?

From 37289bc832cbe6fa02fde12dbd9da426a098ce23 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Apr 2020 17:05:20 +0200
Subject: [PATCH 1989/3235] i18n

---
 src/i18n/strings/en_EN.json | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 912a86446f..3007db1b44 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -483,6 +483,7 @@
     "Verify this session by confirming the following number appears on its screen.": "Verify this session by confirming the following number appears on its screen.",
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "Cancelling…": "Cancelling…",
     "They match": "They match",
@@ -559,6 +560,7 @@
     "Verify": "Verify",
     "Later": "Later",
     "Review": "Review",
+    "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Upload": "Upload",
@@ -1259,12 +1261,16 @@
     "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
-    "Verified": "Verified",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "You've successfully verified %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
+    "Verified": "Verified",
     "Got it": "Got it",
-    "Verification timed out. Start verification again from their profile.": "Verification timed out. Start verification again from their profile.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s cancelled verification. Start verification again from their profile.",
-    "You cancelled verification. Start verification again from their profile.": "You cancelled verification. Start verification again from their profile.",
+    "Start verification again from the notification.": "Start verification again from the notification.",
+    "Start verification again from their profile.": "Start verification again from their profile.",
+    "Verification timed out.": "Verification timed out.",
+    "You cancelled verification on your other session.": "You cancelled verification on your other session.",
+    "%(displayName)s cancelled verification.": "%(displayName)s cancelled verification.",
+    "You cancelled verification.": "You cancelled verification.",
     "Verification cancelled": "Verification cancelled",
     "Compare emoji": "Compare emoji",
     "Sunday": "Sunday",
@@ -1964,6 +1970,7 @@
     "Review terms and conditions": "Review terms and conditions",
     "Old cryptography data detected": "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.": "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.",
+    "Self-verification request": "Self-verification request",
     "Logout": "Logout",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
     "Your Communities": "Your Communities",

From 2cf55fb2a0a166eca9bf5217edcfb44e88550dc9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 3 Apr 2020 17:32:09 +0200
Subject: [PATCH 1990/3235] adjust start options styling

---
 res/css/views/right_panel/_VerificationPanel.scss | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 01a654b523..7634706d51 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -75,6 +75,7 @@ limitations under the License.
         margin-top: 10px;
         margin-bottom: 10px;
         align-items: stretch;
+        justify-content: center;
 
         > .mx_VerificationPanel_QRPhase_betweenText {
             width: 50px;
@@ -90,10 +91,12 @@ limitations under the License.
             border-radius: 10px;
             flex: 1;
             display: flex;
-            padding: 10px;
+            padding: 20px;
             align-items: center;
             flex-direction: column;
             position: relative;
+            max-width: 310px;
+            justify-content: space-between;
 
             canvas, .mx_VerificationPanel_QRPhase_noQR {
                 width: 220px !important;
@@ -106,19 +109,15 @@ limitations under the License.
             }
 
             > p {
+                margin-top: 0;
                 font-weight: 700;
             }
 
             .mx_VerificationPanel_QRPhase_helpText {
                 font-size: 14px;
-                margin-top: 71px;
+                margin: 30px 0;
                 text-align: center;
             }
-
-            .mx_AccessibleButton {
-                position: absolute;
-                bottom: 30px;
-            }
         }
     }
 

From aaad265190f129de3ca73969240adf72aa09c91b Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 3 Apr 2020 15:54:53 +0000
Subject: [PATCH 1991/3235] Translated using Weblate (German)

Currently translated at 76.7% (1731 of 2258 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1a33195f79..4cd4a0a72e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -64,7 +64,7 @@
     "For security, this session has been signed out. Please sign in again.": "Aus Sicherheitsgründen wurde diese Sitzung beendet. Bitte melde dich erneut an.",
     "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Hangup": "Auflegen",
-    "Homeserver is": "Heimserver:",
+    "Homeserver is": "Heimserver ist",
     "Identity Server is": "Identitätsserver:",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raum-Schlüssel importieren",

From 2c29172d702fb23c23dcb81d2a4390db27e5a08d Mon Sep 17 00:00:00 2001
From: Jonathan <jon02@jon02.ch>
Date: Fri, 3 Apr 2020 15:55:03 +0000
Subject: [PATCH 1992/3235] Translated using Weblate (German)

Currently translated at 76.7% (1731 of 2258 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4cd4a0a72e..0e798e0808 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -64,7 +64,7 @@
     "For security, this session has been signed out. Please sign in again.": "Aus Sicherheitsgründen wurde diese Sitzung beendet. Bitte melde dich erneut an.",
     "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Hangup": "Auflegen",
-    "Homeserver is": "Heimserver ist",
+    "Homeserver is": "Der Heimserver ist",
     "Identity Server is": "Identitätsserver:",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raum-Schlüssel importieren",

From e8848892f29ea5017ca85056acf2c09766973f2b Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 3 Apr 2020 15:55:11 +0000
Subject: [PATCH 1993/3235] Translated using Weblate (German)

Currently translated at 76.7% (1731 of 2258 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0e798e0808..8a2167b8c0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -65,7 +65,7 @@
     "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Hangup": "Auflegen",
     "Homeserver is": "Der Heimserver ist",
-    "Identity Server is": "Identitätsserver:",
+    "Identity Server is": "Identitätsserver ist",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raum-Schlüssel importieren",
     "Invalid Email Address": "Ungültige E-Mail-Adresse",

From c0dff262352a9a8c99998afb6d1fb302e0a77e7b Mon Sep 17 00:00:00 2001
From: Jonathan <jon02@jon02.ch>
Date: Fri, 3 Apr 2020 15:55:20 +0000
Subject: [PATCH 1994/3235] Translated using Weblate (German)

Currently translated at 76.7% (1731 of 2258 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8a2167b8c0..23f95b002e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -65,7 +65,7 @@
     "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten, auch wenn sie explizit eingeladen wurden.",
     "Hangup": "Auflegen",
     "Homeserver is": "Der Heimserver ist",
-    "Identity Server is": "Identitätsserver ist",
+    "Identity Server is": "Der Identitätsserver ist",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
     "Import E2E room keys": "E2E-Raum-Schlüssel importieren",
     "Invalid Email Address": "Ungültige E-Mail-Adresse",
@@ -1718,8 +1718,8 @@
     "Displays information about a user": "Zeigt Informationen über einen Benutzer",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer, die %(glob)s entsprechen",

From fd5a7ad74df088bf2b2035028a9e23a8d7eeece9 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 3 Apr 2020 15:58:20 +0000
Subject: [PATCH 1995/3235] Translated using Weblate (German)

Currently translated at 76.7% (1731 of 2258 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 23f95b002e..c0c1b5508d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -692,7 +692,7 @@
     "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.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Nutzer- oder Gruppen-ID enthält, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
     "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
@@ -1544,9 +1544,9 @@
     "You are currently subscribed to:": "Du abonnierst momentan:",
     "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
     "The version of Riot": "Die Version von Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ob Sie Riot auf einem Gerät verwenden, bei dem Berührung der primäre Eingabemechanismus ist",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ob du Riot auf einem Gerät verwendest, bei dem Berührung der primäre Eingabemechanismus ist",
     "Whether you're using Riot as an installed Progressive Web App": "Ob Sie Riot als installierte progressive Web-App verwenden",
-    "Your user agent": "Ihr User-Agent",
+    "Your user agent": "Dein User-Agent",
     "The information being sent to us to help make Riot better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, Riot besser zu machen, gehören:",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Es sind unbekannte Sitzungen in diesem Raum: Wenn du ohne Verifizierung fortfährst, wird es für jemanden möglich sein, deinen Anruf zu belauschen.",
     "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",

From 4c46ae18643cf3c4a3223c36933da0c9837e5b3a Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 3 Apr 2020 13:25:47 +0000
Subject: [PATCH 1996/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2258 of 2258 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 | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fbb3b2f210..f78cbd315d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -215,7 +215,7 @@
     "Submit": "Invia",
     "Phone": "Telefono",
     "Failed to upload profile picture!": "Invio dell'immagine profilo fallito!",
-    "Upload new:": "Invia nuovo:",
+    "Upload new:": "Carica nuovo:",
     "No display name": "Nessun nome visibile",
     "New passwords don't match": "Le nuove password non corrispondono",
     "Passwords can't be empty": "Le password non possono essere vuote",
@@ -896,8 +896,8 @@
     "Permission Required": "Permesso richiesto",
     "You do not have permission to start a conference call in this room": "Non hai il permesso di avviare una chiamata di gruppo in questa stanza",
     "This event could not be displayed": "Questo evento non può essere mostrato",
-    "Demote yourself?": "Retrocedi?",
-    "Demote": "Retrocedi",
+    "Demote yourself?": "Vuoi declassarti?",
+    "Demote": "Declassa",
     "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.": "Nelle stanze criptate, come questa, le anteprime degli URL sono disabilitate di default per garantire che il tuo server di casa (dove vengono generate le anteprime) non possa raccogliere informazioni sui collegamenti che vedi in questa stanza.",
     "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.": "Quando qualcuno inserisce un URL nel proprio messaggio, è possibile mostrare un'anteprima dell'URL per fornire maggiori informazioni su quel collegamento, come il titolo, la descrizione e un'immagine dal sito web.",
     "The email field must not be blank.": "Il campo email non deve essere vuoto.",
@@ -1004,7 +1004,7 @@
     "Restored %(sessionCount)s session keys": "Ripristinate le chiavi di %(sessionCount)s sessioni",
     "Enter Recovery Passphrase": "Inserisci la password di recupero",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua password di recupero.",
-    "Next": "Prossimo",
+    "Next": "Avanti",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se hai dimenticato la password di recupero puoi <button1>usare la tua chiave di recupero</button1> o <button2>impostare nuove opzioni di recupero</button2>",
     "Enter Recovery Key": "Inserisci la chiave di recupero",
     "This looks like a valid recovery key!": "Sembra essere una chiave di recupero valida!",
@@ -1215,7 +1215,7 @@
     "Ignored users": "Utenti ignorati",
     "Bulk options": "Opzioni generali",
     "Accept all %(invitedRooms)s invites": "Accetta tutti i %(invitedRooms)s inviti",
-    "Key backup": "Backup chiave",
+    "Key backup": "Backup chiavi",
     "Security & Privacy": "Sicurezza e privacy",
     "Missing media permissions, click the button below to request.": "Autorizzazione multimediale mancante, clicca il pulsante sotto per richiederla.",
     "Request media permissions": "Richiedi autorizzazioni multimediali",
@@ -1342,7 +1342,7 @@
     "For maximum security, this should be different from your account password.": "Per la massima sicurezza, questa dovrebbe essere diversa dalla password del tuo account.",
     "Set up with a Recovery Key": "Imposta con una chiave di ripristino",
     "Please enter your passphrase a second time to confirm.": "Inserisci la tua password un'altra volta per confermare.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "La tua chiave di ripristino è una rete di sicurezza - puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la tua password.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "La tua chiave di recupero è come una rete di sicurezza - puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la tua password.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Il backup delle chiavi è in corso (il primo backup potrebbe richiedere qualche minuto).",
     "Secure your backup with a passphrase": "Proteggi il tuo backup con una password",
     "Confirm your passphrase": "Conferma la tua password",
@@ -1433,7 +1433,7 @@
     "Your browser likely removed this data when running low on disk space.": "Probabilmente il tuo browser ha rimosso questi dati per mancanza di spazio su disco.",
     "Upload files (%(current)s of %(total)s)": "Invio dei file (%(current)s di %(total)s)",
     "Upload files": "Invia i file",
-    "Upload": "Invia",
+    "Upload": "Carica",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Questo file è <b>troppo grande</b> da inviare. Il limite di dimensione è %(limit)s ma questo file è di %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Questi file sono <b>troppo grandi</b> da inviare. Il limite di dimensione è %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Alcuni file sono <b>troppo grandi</b> da inviare. Il limite di dimensione è %(limit)s.",
@@ -1522,7 +1522,7 @@
     "Use bots, bridges, widgets and sticker packs": "Usa bot, bridge, widget e pacchetti di adesivi",
     "Terms of Service": "Condizioni di servizio",
     "Service": "Servizio",
-    "Summary": "Sommario",
+    "Summary": "Riepilogo",
     "Call failed due to misconfigured server": "Chiamata non riuscita a causa di un server non configurato correttamente",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Chiedi all'amministratore del tuo homeserver(<code>%(homeserverDomain)s</code>) per configurare un server TURN affinché le chiamate funzionino in modo affidabile.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "In alternativa, puoi provare a utilizzare il server pubblico all'indirizzo <code>turn.matrix.org</code>, ma questo non sarà così affidabile e condividerà il tuo indirizzo IP con quel server. Puoi anche gestirlo in Impostazioni.",
@@ -2318,5 +2318,7 @@
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Conferma eliminando queste sessioni usando Single Sign On per provare la tua identità.",
     "Confirm deleting these sessions": "Conferma eliminando queste sessioni",
     "Click the button below to confirm deleting these sessions.": "Clicca il pulsante sotto per confermare l'eliminazione di queste sessioni.",
-    "Delete sessions": "Elimina sessioni"
+    "Delete sessions": "Elimina sessioni",
+    "Almost there! Is your other session showing the same shield?": "Quasi fatto! L'altra tua sessione sta mostrando lo stesso scudo?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Quasi fatto! %(displayName)s sta mostrando lo stesso scudo?"
 }

From fc74d927c0d13bd533408fc7b6c4bed8f63a4cb1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 4 Apr 2020 17:23:19 +0100
Subject: [PATCH 1997/3235] import VelocityBounce sync as it is *tiny* (481B)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/ReadReceiptMarker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index dcb8fd4310..be0ca1f8d6 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import('../../../VelocityBounce');
+import '../../../VelocityBounce';
 import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";

From 5ac68d4ce04e9314c19d8c13300804834b0ede7f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 6 Apr 2020 11:10:00 +0100
Subject: [PATCH 1998/3235] Update emojibase for fixed emoji codepoints and
 Emoji 13 support

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index c9300a13ca..616f3f541e 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "create-react-class": "^15.6.0",
     "diff-dom": "^4.1.3",
     "diff-match-patch": "^1.0.4",
-    "emojibase-data": "^4.0.2",
-    "emojibase-regex": "^3.0.0",
+    "emojibase-data": "^5.0.1",
+    "emojibase-regex": "^4.0.1",
     "escape-html": "^1.0.3",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
diff --git a/yarn.lock b/yarn.lock
index acd474ffd7..0391132786 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3053,15 +3053,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
-  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
+emojibase-data@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
+  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
 
-emojibase-regex@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
-  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
+emojibase-regex@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
+  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
 
 emojis-list@^2.0.0:
   version "2.1.0"

From 1395cb02edaab4f9f589814cc58e79cdc261ab1d Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:44:46 +0100
Subject: [PATCH 1999/3235] Fixup alignment

---
 res/css/views/rooms/_EventTile.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0f324cc082..3c91089dc9 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -665,6 +665,13 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     color: red;
     text-align: center;
 
+    // Remove some of the default tile padding so that the error is centered
+    margin-right: 0;
+    .mx_EventTile_line {
+        padding-left: 0;
+        margin-right: 0;
+    }
+
     .mx_EventTile_line span {
         padding: 4px 8px;
     }

From a5856042b12e54c14190128511c6fd25e9cff6e0 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 4 Apr 2020 17:12:06 +0000
Subject: [PATCH 2000/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2259 of 2266 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 | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 9c15bbaa3b..8be33f1e20 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2295,5 +2295,35 @@
     "Verified": "I verifikuar",
     "Verification cancelled": "Verifikimi u anulua",
     "Compare emoji": "Krahasoni emoji",
-    "Session backup key:": "Kyç kopjeruajtjeje sesioni:"
+    "Session backup key:": "Kyç kopjeruajtjeje sesioni:",
+    "Use Single Sign On to continue": "Që të vazhdohet, përdorni Hyrje Njëshe",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Ripohoni shtimin e kësaj adrese email duke përdorur Hyrje Njëshe për të provuar identitetin tuaj.",
+    "Single Sign On": "Hyrje Njëshe",
+    "Confirm adding email": "Ripohoni shtim email-i",
+    "Click the button below to confirm adding this email address.": "Klikoni butonin më poshtë që të ripohoni shtimin e kësaj adrese email.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Ripohojeni shtimin e këtij numri telefoni duke përdorur Hyrje Njëshe që të provoni identitetin tuaj.",
+    "Confirm adding phone number": "Ripohoni shtim numri telefoni",
+    "Click the button below to confirm adding this phone number.": "Klikoni mbi butonin më poshtë që të ripohoni shtimin e këtij numri telefoni.",
+    "Sends a message as html, without interpreting it as markdown": "E dërgon një mesazh si html, pa e interpretuar si markdown",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Ripohoni se emoxhit më poshtë shfaqen në të dy sesionet, nën të njëjtën radhë:",
+    "Verify this session by confirming the following number appears on its screen.": "Verifikojeni këtë sesion duke ripohuar se numri vijues shfaqet në ekranin e sesionit.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Po pritet që të verifikohet sesioni juaj tjetër, %(deviceName)s (%(deviceId)s)…",
+    "From %(deviceName)s (%(deviceId)s)": "Nga %(deviceName)s (%(deviceId)s)",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Ripohoni fshirjen e këtyre sesioneve duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
+    "Confirm deleting these sessions": "Ripohoni fshirjen e këtyre sesioneve",
+    "Click the button below to confirm deleting these sessions.": "Që të ripohoni fshirjen e këtyre sesioneve, klikoni mbi butonin më poshtë.",
+    "Delete sessions": "Fshini sesione",
+    "Waiting for you to accept on your other session…": "Po pritet që të pranoni në sesionin tuaj tjetër…",
+    "Almost there! Is your other session showing the same shield?": "Thuajse mbërritëm! A shfaq sesioni juaj tjetër të njëjtën mburojë?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Thuaje mbërritëm! A shfaq %(displayName)s të njëjtën mburojë?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Keni verifikuar me sukses %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "Rifillo verifikimin prej njoftimit.",
+    "Start verification again from their profile.": "Rifillo verifikimin prej profilit të tyre.",
+    "Verification timed out.": "Verifikimit i mbaroi koha.",
+    "You cancelled verification on your other session.": "Anuluat verifikimin në sesionin tuaj tjetër.",
+    "%(displayName)s cancelled verification.": "%(displayName)s anuloi verifikimin.",
+    "You cancelled verification.": "Anuluat verifikimin.",
+    "Sign in with SSO": "Hyni me HNj",
+    "Self-verification request": "Kërkesë vetë-verifikimi",
+    "Cancel replying to a message": "Anulo përgjigjen te një mesazh"
 }

From 0b549ddf7f52aad906630b2900091c01f79ee6a2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 4 Apr 2020 04:11:33 +0000
Subject: [PATCH 2001/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2266 of 2266 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e7c0e118d6..a87ba36d33 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2320,5 +2320,20 @@
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認刪除這些工作階段。",
     "Confirm deleting these sessions": "確認刪除這些工作階段",
     "Click the button below to confirm deleting these sessions.": "點擊下方按鈕以確認刪除這些工作階段。",
-    "Delete sessions": "刪除工作階段"
+    "Delete sessions": "刪除工作階段",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "確認以下的顏文字以相同的順序顯示在兩個工作階段中：",
+    "Verify this session by confirming the following number appears on its screen.": "透過確認螢幕上顯示以下的數字來確認此工作階段。",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "正在等待您的其他工作階段，%(deviceName)s (%(deviceId)s)，進行驗證……",
+    "From %(deviceName)s (%(deviceId)s)": "從 %(deviceName)s (%(deviceId)s)",
+    "Waiting for you to accept on your other session…": "正在等待您接受其他工作階段……",
+    "Almost there! Is your other session showing the same shield?": "差不多了！您的其他工作階段是否顯示相同的盾牌？",
+    "Almost there! Is %(displayName)s showing the same shield?": "差不多了！%(displayName)s 是否顯示相同的盾牌？",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "您已成功驗證了 %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "從通知再次開始驗證。",
+    "Start verification again from their profile.": "從他們的個人簡介再次開始驗證。",
+    "Verification timed out.": "驗證逾時。",
+    "You cancelled verification on your other session.": "您已在其他工作階段取消驗證。",
+    "%(displayName)s cancelled verification.": "%(displayName)s 取消驗證。",
+    "You cancelled verification.": "您取消了驗證。",
+    "Self-verification request": "自我驗證請求"
 }

From da9fbba37dfb7f0ed86eccf9b97c227fb63d30cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Sun, 5 Apr 2020 11:31:16 +0000
Subject: [PATCH 2002/3235] Translated using Weblate (Czech)

Currently translated at 96.4% (2184 of 2266 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index ef2e95949a..a3314dd920 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -80,7 +80,7 @@
     "Attachment": "Příloha",
     "Autoplay GIFs and videos": "Automaticky přehrávat GIFy a videa",
     "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.": "Nelze se připojit k domovskému serveru – zkontrolujte prosím své připojení, prověřte, zda je <a>SSL certifikát</a> vašeho domovského serveru důvěryhodný, a že některé z rozšíření prohlížeče neblokuje komunikaci.",
-    "Anyone who knows the room's link, apart from guests": "Kdokoliv s odkazem na místnost, kromě hostů",
+    "Anyone who knows the room's link, apart from guests": "Kdokoliv s odkazem na místnost, ale pouze registrovaní uživatelé",
     "Anyone who knows the room's link, including guests": "Kdokoliv s odkazem na místnost, včetně hostů",
     "Banned users": "Vykázaní uživatelé",
     "Ban": "Vykázat",
@@ -941,9 +941,9 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nic se neděje? Ne všichni klienti klienti podporují interaktivní ověření. <button>Použít starší verzi</button>.",
     "Waiting for %(userId)s to confirm...": "Čekáme až to %(userId)s potvrdí...",
     "Use two-way text verification": "Použít oboustranné ověření",
-    "Security & Privacy": "Bezpečnost a soukromí",
+    "Security & Privacy": "Zabezpečení",
     "Encryption": "Šifrování",
-    "Once enabled, encryption cannot be disabled.": "Když se šifrování zapne, už nepůjde vypnout.",
+    "Once enabled, encryption cannot be disabled.": "Po zapnutí, už nepůjde šifrování vypnout.",
     "Encrypted": "Šifrování",
     "General": "Obecné",
     "General failure": "Nějaká chyba",
@@ -1546,8 +1546,8 @@
     "Create a private room": "Vytvořit neveřejnou místnost",
     "Topic (optional)": "Téma (volitelné)",
     "Make this room public": "Zveřejnit místnost",
-    "Hide advanced": "Skrýt pokročilé",
-    "Show advanced": "Zobrazit pokročilé",
+    "Hide advanced": "Skrýt pokročilé možnosti",
+    "Show advanced": "Zobrazit pokročilé možnosti",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby do místnosti vstoupili (nelze později změnit!)",
     "Your homeserver doesn't seem to support this feature.": "Váš domovský server asi tuto funkci nepodporuje.",
     "Message edits": "Editování zpráv",
@@ -2215,5 +2215,27 @@
     "Verified": "Oveřený",
     "Verification cancelled": "Oveření bylo zrušeno",
     "Compare emoji": "Porovnejte emotikony",
-    "Enter a server name": "Zadejte jméno serveru"
+    "Enter a server name": "Zadejte jméno serveru",
+    "Use Single Sign On to continue": "Pokračovat pomocí Jednotného přihlášení",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Potvrďte přidání této adresy pomocí Jednotného přihlášení.",
+    "Single Sign On": "Jednotné přihlášení",
+    "Confirm adding email": "Potvrdit přidání emailu",
+    "Click the button below to confirm adding this email address.": "Kliknutím na tlačítko potvrdíte přidání emailové adresy.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potvrďte přidání telefonního čísla pomocí Jednotného přihlášení.",
+    "Confirm adding phone number": "Potrvrdit přidání telefonního čísla",
+    "Click the button below to confirm adding this phone number.": "Kliknutím na tlačítko potvrdíte přidání telefonního čísla.",
+    "Sends a message as html, without interpreting it as markdown": "Pošle zprávu jako HTML a nebude jí interpretovat jako Markdown",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Potvrďte, že následující emotikony se zobrazují ve stejném pořadí na obou zařízeních:",
+    "Verify this session by confirming the following number appears on its screen.": "Ověřtě tuto relaci potrvrzením, že se následující čísla objevily na její obrazovce.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Čekám na ověření od relace %(deviceName)s (%(deviceId)s)…",
+    "From %(deviceName)s (%(deviceId)s)": "Od %(deviceName)s (%(deviceId)s)",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Potvrďte odstranění těchto relací pomocí Jednotného přihlášení.",
+    "Confirm deleting these sessions": "Potvrdit odstranění těchto relací",
+    "Click the button below to confirm deleting these sessions.": "Kliknutím na tlačítko potvrdíte odstranění těchto relací.",
+    "Delete sessions": "Odstranit relace",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pro hlášení bezpečnostních problémů s Matrixem si prosím přečtěte <a>naší Bezpečnostní politiku</a> (anglicky).",
+    "Waiting for you to accept on your other session…": "Čekáme na vaše přijetí v druhé relaci…",
+    "Almost there! Is your other session showing the same shield?": "Téměř hotovo! Je vaše druhá relace také ověřená?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Téměř hotovo! Je relace %(displayName)s také ověřená?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!"
 }

From 340fd6914f21e9fca340925c4b9a6dc304666ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 4 Apr 2020 07:30:16 +0000
Subject: [PATCH 2003/3235] Translated using Weblate (French)

Currently translated at 100.0% (2266 of 2266 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 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 47cee69682..7c3c2ca255 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2321,5 +2321,20 @@
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirmez la suppression de ces sessions en utilisant l’authentification unique pour prouver votre identité.",
     "Confirm deleting these sessions": "Confirmer la suppression de ces sessions",
     "Click the button below to confirm deleting these sessions.": "Cliquez sur le bouton ci-dessous pour confirmer la suppression de ces sessions.",
-    "Delete sessions": "Supprimer les sessions"
+    "Delete sessions": "Supprimer les sessions",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirmez que les émojis ci-dessous s’affichent dans les deux sessions et dans le même ordre :",
+    "Verify this session by confirming the following number appears on its screen.": "Vérifiez cette session en confirmant que le nombre suivant s’affiche sur son écran.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Dans l’attente que votre autre session, %(deviceName)s (%(deviceId)s), vérifie…",
+    "From %(deviceName)s (%(deviceId)s)": "Depuis %(deviceName)s (%(deviceId)s)",
+    "Waiting for you to accept on your other session…": "Dans l’attente que vous acceptiez dans votre autre session…",
+    "Almost there! Is your other session showing the same shield?": "On y est presque ! Est-ce que votre autre session affiche le même bouclier ?",
+    "Almost there! Is %(displayName)s showing the same shield?": "On y est presque ! Est-ce que %(displayName)s affiche le même bouclier ?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Vous avez bien vérifié %(deviceName)s (%(deviceId)s) !",
+    "Start verification again from the notification.": "Recommencer la vérification depuis la notification.",
+    "Start verification again from their profile.": "Recommencer la vérification depuis son profil.",
+    "Verification timed out.": "La vérification a expiré.",
+    "You cancelled verification on your other session.": "Vous avez annulé la vérification dans votre autre session.",
+    "%(displayName)s cancelled verification.": "%(displayName)s a annulé la vérification.",
+    "You cancelled verification.": "Vous avez annulé la vérification.",
+    "Self-verification request": "Demande d’auto-vérification"
 }

From 39edfc7c056a5e1542532925a01543577c261075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melvyn=20La=C3=AFly?= <melvyn.laily@gmail.com>
Date: Sun, 5 Apr 2020 17:21:24 +0000
Subject: [PATCH 2004/3235] Translated using Weblate (French)

Currently translated at 100.0% (2266 of 2266 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7c3c2ca255..37bada3c0e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -787,7 +787,7 @@
     "Reject": "Rejeter",
     "Failed to set Direct Message status of room": "Échec du réglage de l'état du salon en Discussion directe",
     "Monday": "Lundi",
-    "All messages (noisy)": "Tous les messages (fort)",
+    "All messages (noisy)": "Tous les messages (sonore)",
     "Enable them now": "Les activer maintenant",
     "Toolbox": "Boîte à outils",
     "Collecting logs": "Récupération des journaux",
@@ -2040,7 +2040,7 @@
     "This backup is trusted because it has been restored on this session": "Cette sauvegarde est fiable car elle a été restaurée sur cette session",
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Une sauvegarde de clés est stockée dans le coffre secret, mais cette fonctionnalité n’est pas activée sur cette session. Activez la signature croisée dans le Labo pour modifier l’état de la sauvegarde de clés.",
     "Your keys are <b>not being backed up from this session</b>.": "Vos clés <b>ne sont pas sauvegardées sur cette session</b>.",
-    "Enable desktop notifications for this session": "Activer les notifications de l’ordinateur pour cette session",
+    "Enable desktop notifications for this session": "Activer les notifications de bureau pour cette session",
     "Enable audible notifications for this session": "Activer les notifications sonores pour cette session",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Votre mot de passe a été modifié. Vous ne recevrez plus de notifications push sur les autres sessions tant que vous ne vous y serez pas reconnecté",
     "Session ID:": "Identifiant de session :",

From faae7d0b1b4c4bdeb36561d83b603468b5d5b135 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sun, 5 Apr 2020 10:11:29 +0000
Subject: [PATCH 2005/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2266 of 2266 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index f78cbd315d..fdd79fe074 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2320,5 +2320,18 @@
     "Click the button below to confirm deleting these sessions.": "Clicca il pulsante sotto per confermare l'eliminazione di queste sessioni.",
     "Delete sessions": "Elimina sessioni",
     "Almost there! Is your other session showing the same shield?": "Quasi fatto! L'altra tua sessione sta mostrando lo stesso scudo?",
-    "Almost there! Is %(displayName)s showing the same shield?": "Quasi fatto! %(displayName)s sta mostrando lo stesso scudo?"
+    "Almost there! Is %(displayName)s showing the same shield?": "Quasi fatto! %(displayName)s sta mostrando lo stesso scudo?",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Conferma che gli emoji sottostanti sono mostrati in entrambe le sessioni, nello stesso ordine:",
+    "Verify this session by confirming the following number appears on its screen.": "Verifica questa sessione confermando che il seguente numero compare nel suo schermo.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "In attesa che la tua altra sessione, %(deviceName)s (%(deviceId)s), verifichi…",
+    "From %(deviceName)s (%(deviceId)s)": "Da %(deviceName)s (%(deviceId)s)",
+    "Waiting for you to accept on your other session…": "In attesa che tu accetti nella tua altra sessione…",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Hai verificato %(deviceName)s (%(deviceId)s) correttamente!",
+    "Start verification again from the notification.": "Inizia di nuovo la verifica dalla notifica.",
+    "Start verification again from their profile.": "Inizia di nuovo la verifica dal suo profilo.",
+    "Verification timed out.": "Verifica scaduta.",
+    "You cancelled verification on your other session.": "Hai annullato la verifica nell'altra sessione.",
+    "%(displayName)s cancelled verification.": "%(displayName)s ha annullato la verifica.",
+    "You cancelled verification.": "Hai annullato la verifica.",
+    "Self-verification request": "Richiesta di auto-verifica"
 }

From 2778f1fa5101b7b83fc3bb0d73c7d965e62c5843 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Sat, 4 Apr 2020 20:35:35 +0000
Subject: [PATCH 2006/3235] Translated using Weblate (Lithuanian)

Currently translated at 43.6% (987 of 2266 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 | 76 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 4476c21609..5defb98281 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -90,10 +90,10 @@
     "Download this file": "Atsisiųsti šį failą",
     "Saturday": "Šeštadienis",
     "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad jei persigalvosite, tai bet kada galite nustatyti el. pašto adresą vartotojo nustatymuose.",
-    "Direct Chat": "Tiesioginis pokalbis",
+    "Direct Chat": "Privatus pokalbis",
     "The server may be unavailable or overloaded": "Gali būti, kad serveris yra neprieinamas arba perkrautas",
     "Online": "Prisijungęs",
-    "Failed to set Direct Message status of room": "Nepavyko nustatyti tiesioginio pranešimo kambario būklės",
+    "Failed to set Direct Message status of room": "Nepavyko nustatyti privačios žinutės kambario statuso",
     "Monday": "Pirmadienis",
     "All messages (noisy)": "Visos žinutės (triukšmingas)",
     "Enable them now": "Įjungti juos dabar",
@@ -530,7 +530,7 @@
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
     "Share Link to User": "Dalintis nuoroda į naudotoją",
-    "Direct chats": "Tiesioginiai pokalbiai",
+    "Direct chats": "Privatūs pokalbiai",
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
     "Jump to message": "Pereiti prie žinutės",
     "Favourites": "Mėgstami",
@@ -940,5 +940,73 @@
     "We recommend you change your password and recovery key in Settings immediately": "Mes rekomenduojame nedelsiant Nustatymuose pasikeisti jūsų slaptažodį ir atgavimo raktą",
     "Email (optional)": "El. paštas (neprivaloma)",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą."
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
+    "Help & About": "Pagalba ir Apie",
+    "Direct Messages": "Privačios žinutės",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nustatykite adresus šiam kambariui, kad vartotojai galėtų surasti šį kambarį per jūsų serverį (%(localDomain)s)",
+    "Direct message": "Privati žinutė",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s prisijungė",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s prisijungė",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s prisijungė ir išėjo %(count)s kartų(-us)",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s prisijungė ir išėjo",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s prisijungė ir išėjo %(count)s kartų(-us)",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s prisijungė ir išėjo",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s išėjo ir vėl prisijungė",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s išėjo ir vėl prisijungė",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s atmetė jų kvietimus %(count)s kartų(-us)",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s atmetė jų kvietimus",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s atmetė jų kvietimą %(count)s kartų(-us)",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s atmetė jų kvietimą",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atšaukė savo pakvietimus %(count)s kartų(-us)",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s atšaukė savo pakvietimus",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s atšaukė savo pakvietimą %(count)s kartų(-us)",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s atšaukė savo pakvietimą",
+    "were invited %(count)s times|other": "buvo pakviesti %(count)s kartų(-us)",
+    "were invited %(count)s times|one": "buvo pakviesti",
+    "was invited %(count)s times|other": "buvo pakviestas %(count)s kartų(-us)",
+    "was invited %(count)s times|one": "buvo pakviestas",
+    "were banned %(count)s times|other": "buvo užblokuoti %(count)s kartų(-us)",
+    "were banned %(count)s times|one": "buvo užblokuoti",
+    "was banned %(count)s times|other": "buvo užblokuotas %(count)s kartų(-us)",
+    "was banned %(count)s times|one": "buvo užblokuotas",
+    "were unbanned %(count)s times|other": "buvo atblokuoti %(count)s kartų(-us)",
+    "were unbanned %(count)s times|one": "buvo atblokuoti",
+    "was unbanned %(count)s times|other": "buvo atblokuotas %(count)s kartų(-us)",
+    "was unbanned %(count)s times|one": "buvo atblokuotas",
+    "were kicked %(count)s times|other": "buvo išmesti %(count)s kartų(-us)",
+    "were kicked %(count)s times|one": "buvo išmesti",
+    "was kicked %(count)s times|other": "buvo išmestas %(count)s kartų(-us)",
+    "was kicked %(count)s times|one": "buvo išmestas",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s pasikeitė vardus %(count)s kartų(-us)",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neatliko jokių pakeitimų %(count)s kartų(-us)",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s neatliko jokių pakeitimų",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neatliko jokių pakeitimų %(count)s kartų(-us)",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s neatliko jokių pakeitimų",
+    "Power level": "Galios lygis",
+    "Custom level": "Pritaikytas lygis",
+    "Can't find this server or its room list": "Negalime rasti šio serverio arba jo kambarių sąrašo",
+    "Matrix rooms": "Matrix kambariai",
+    "Recently Direct Messaged": "Neseniai siųsta privati žinutė",
+    "Command Help": "Komandų pagalba",
+    "Help": "Pagalba",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sukurkite bendruomenę, kad kartu sugrupuotumėte vartotojus ir kambarius! Sukurkite pagrindinį puslapį, kad pažymėtumėte savo vietą Matrix visatoje.",
+    "Find a room…": "Rasti kambarį…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Rasti kambarį... (pvz.: %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Jei jūs negalite rasti kambario, kurio ieškote, paprašykite pakvietimo arba <a>Sukurkite naują kambarį</a>.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bandyta įkelti konkrečią vietą šio kambario laiko juostoje, bet nepavyko jos rasti.",
+    "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.": "Šis procesas leidžia jums eksportuoti užšifruotuose kambariuose gautų žinučių raktus į lokalų failą. Tada jūs turėsite galimybę ateityje importuoti šį failą į kitą Matrix klientą, kad tas klientas taip pat galėtų iššifruoti tas žinutes.",
+    "Failed to set direct chat tag": "Nepavyko nustatyti privataus pokalbio žymos",
+    "Navigation": "Navigacija",
+    "Calls": "Skambučiai",
+    "Room List": "Kambarių sąrašas",
+    "Autocomplete": "Autorašymas",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl"
 }

From 60e3f55f5a3fe950b7e911a2aa59bbe3c3383387 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 4 Apr 2020 12:03:02 +0000
Subject: [PATCH 2007/3235] Translated using Weblate (Polish)

Currently translated at 61.3% (1388 of 2266 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 | 42 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index fbe8ac86ca..d71013d999 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1373,5 +1373,45 @@
     "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
     "Enable audible notifications for this session": "Włącz powiadomienia dźwiękowe dla tej sesji",
     "Sessions": "Sesje",
-    "Direct Messages": "Wiadomości bezpośrednie"
+    "Direct Messages": "Wiadomości bezpośrednie",
+    "Create Account": "Utwórz konto",
+    "Sign In": "Zaloguj się",
+    "a few seconds ago": "kilka sekund temu",
+    "%(num)s minutes ago": "%(num)s minut temu",
+    "%(num)s hours ago": "%(num)s godzin temu",
+    "%(num)s days ago": "%(num)s dni temu",
+    "Later": "Później",
+    "Show less": "Pokaż mniej",
+    "Show more": "Pokaż więcej",
+    "Clear notifications": "Wyczyść powiadomienia",
+    "Theme added!": "Dodano motyw!",
+    "Custom theme URL": "Niestandardowy adres URL motywu",
+    "Add theme": "Dodaj motyw",
+    "Keyboard Shortcuts": "Skróty klawiszowe",
+    "Ignored users": "Zignorowani użytkownicy",
+    "⚠ These settings are meant for advanced users.": "⚠ Te ustawienia są przeznaczone dla zaawansowanych użytkowników.",
+    "Subscribe": "Subskrybuj",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ten pokój nie łączy wiadomości z żadnymi platformami. <a>Dowiedz się więcej.</a>",
+    "Reset": "Resetuj",
+    "Local address": "Lokalny adres",
+    "Published Addresses": "Opublikowane adresy",
+    "Local Addresses": "Lokalne adresy",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Ustaw adresy tego pokoju, aby użytkownicy mogli go znaleźć za pośrednictwem Twojego serwera domowego (%(localDomain)s)",
+    "Sign in to your Matrix account on %(serverName)s": "Zaloguj się do Twojego konta Matrix na %(serverName)s",
+    "Couldn't load page": "Nie można załadować strony",
+    "Create account": "Utwórz konto",
+    "Navigation": "Nawigacja",
+    "Calls": "Połączenia",
+    "Room List": "Lista pokoi",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Ctrl": "Ctrl",
+    "New line": "Nowa linia",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Spacja",
+    "End": "End"
 }

From 959801cf2fce2022fd0bd005ab5ffa46111b0e10 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 6 Apr 2020 16:10:40 +0100
Subject: [PATCH 2008/3235] Special-case certain msgtypes for notifications

---
 src/Notifier.js             | 23 +++++++++++++++++++++--
 src/i18n/strings/en_EN.json |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index 36a6f13bb6..ec92840998 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -37,6 +37,18 @@ import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 
 const MAX_PENDING_ENCRYPTED = 20;
 
+/*
+Override both the content body and the TextForEvent handler for specific msgtypes, in notifications.
+This is useful when the content body contains fallback text that would explain that the client can't handle a particular
+type of tile.
+*/
+const typehandlers = {
+    "m.key.verification.request": (event) => {
+        const name = (event.sender || {}).name;
+        return _t("%(name)s is requesting verification", { name });
+    },
+};
+
 const Notifier = {
     notifsByRoom: {},
 
@@ -46,6 +58,9 @@ const Notifier = {
     pendingEncryptedEventIds: [],
 
     notificationMessageForEvent: function(ev) {
+        if (typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+            return typehandlers[ev.getContent().msgtype](ev);
+        }
         return TextForEvent.textForEvent(ev);
     },
 
@@ -69,7 +84,9 @@ const Notifier = {
             title = room.name;
             // notificationMessageForEvent includes sender,
             // but we already have the sender here
-            if (ev.getContent().body) msg = ev.getContent().body;
+            if (ev.getContent().body && !typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+                msg = ev.getContent().body;
+            }
         } else if (ev.getType() === 'm.room.member') {
             // context is all in the message here, we don't need
             // to display sender info
@@ -78,7 +95,9 @@ const Notifier = {
             title = ev.sender.name + " (" + room.name + ")";
             // notificationMessageForEvent includes sender,
             // but we've just out sender in the title
-            if (ev.getContent().body) msg = ev.getContent().body;
+            if (ev.getContent().body && !typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+                msg = ev.getContent().body;
+            }
         }
 
         if (!this.isBodyEnabled()) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3007db1b44..e193c19444 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -125,6 +125,7 @@
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.",
     "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
     "Trust": "Trust",
+    "%(name)s is requesting verification": "%(name)s is requesting verification",
     "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",

From a0d54bd43ad4771fe6d3348e1f668a3e204aaeee Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 6 Apr 2020 16:40:53 +0100
Subject: [PATCH 2009/3235] Clear sessionStorage on sign out

The browser's `sessionStorage` is only used for composer history today, but
still we should also clear this on sign out for those on shared computers, etc.

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

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index b9fbf4f1bc..305a73fbad 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -637,6 +637,10 @@ async function _clearStorage() {
         window.localStorage.clear();
     }
 
+    if (window.sessionStorage) {
+        window.sessionStorage.clear();
+    }
+
     // create a temporary client to clear out the persistent stores.
     const cli = createMatrixClient({
         // we'll never make any requests, so can pass a bogus HS URL

From bdeba252ec89ae7755148b0b6fea0c167c76f25c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Apr 2020 15:42:06 -0600
Subject: [PATCH 2010/3235] Support deactivating your account with SSO

Fixes https://github.com/vector-im/riot-web/issues/12940
---
 .../views/dialogs/DeactivateAccountDialog.js  | 194 ++++++++++--------
 src/i18n/strings/en_EN.json                   |  12 +-
 2 files changed, 117 insertions(+), 89 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 4c14f356e4..3889f0989a 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,71 +23,109 @@ import Analytics from '../../../Analytics';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
+import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
+import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
+
+const dialogAesthetics = {
+    [SSOAuthEntry.PHASE_PREAUTH]: {
+        body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
+        continueText: _t("Single Sign On"),
+        continueKind: "danger",
+    },
+    [SSOAuthEntry.PHASE_POSTAUTH]: {
+        body: _t("Are you sure you want to deactivate your account? This is irreversible."),
+        continueText: _t("Confirm account deactivation"),
+        continueKind: "danger",
+    },
+};
+
+// This is the same as aestheticsForStagePhases in InteractiveAuthDialog minus the `title`
+const DEACTIVATE_AESTHETICS = {
+    [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+    [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+    [PasswordAuthEntry.LOGIN_TYPE]: {
+        [DEFAULT_PHASE]: {
+            body: _t("To continue, please enter your password:"),
+        },
+    },
+};
 
 export default class DeactivateAccountDialog extends React.Component {
     constructor(props) {
         super(props);
 
-        this._onOk = this._onOk.bind(this);
-        this._onCancel = this._onCancel.bind(this);
-        this._onPasswordFieldChange = this._onPasswordFieldChange.bind(this);
-        this._onEraseFieldChange = this._onEraseFieldChange.bind(this);
-
         this.state = {
-            password: "",
-            busy: false,
             shouldErase: false,
             errStr: null,
+            authData: null, // for UIA
+
+            // A few strings that are passed to InteractiveAuth for design or are displayed
+            // next to the InteractiveAuth component.
+            bodyText: null,
+            continueText: null,
+            continueKind: null,
         };
-    }
 
-    _onPasswordFieldChange(ev) {
-        this.setState({
-            password: ev.target.value,
-        });
-    }
-
-    _onEraseFieldChange(ev) {
-        this.setState({
-            shouldErase: ev.target.checked,
-        });
-    }
-
-    async _onOk() {
-        this.setState({busy: true});
-
-        try {
-            // This assumes that the HS requires password UI auth
-            // for this endpoint. In reality it could be any UI auth.
-            const auth = {
-                type: 'm.login.password',
-                // TODO: Remove `user` once servers support proper UIA
-                // See https://github.com/vector-im/riot-web/issues/10312
-                user: MatrixClientPeg.get().credentials.userId,
-                identifier: {
-                    type: "m.id.user",
-                    user: MatrixClientPeg.get().credentials.userId,
-                },
-                password: this.state.password,
-            };
-            await MatrixClientPeg.get().deactivateAccount(auth, this.state.shouldErase);
-        } catch (err) {
-            let errStr = _t('Unknown error');
-            // https://matrix.org/jira/browse/SYN-744
-            if (err.httpStatus === 401 || err.httpStatus === 403) {
-                errStr = _t('Incorrect password');
+        MatrixClientPeg.get().deactivateAccount(null, false).then(r => {
+            // If we got here, oops. The server didn't require any auth.
+            // Our application lifecycle will catch the error and do the logout bits.
+            // We'll try to log something in an vain attempt to record what happened (storage
+            // is also obliterated on logout).
+            console.warn("User's account got deactivated without confirmation: Server had no auth");
+            this.setState({errStr: _t("Server did not require any authentication")});
+        }).catch(e => {
+            if (e && e.httpStatus === 401 && e.data) {
+                // Valid UIA response
+                this.setState({authData: e.data});
+            } else {
+                this.setState({errStr: _t("Server did not return valid authentication information.")});
             }
-            this.setState({
-                busy: false,
-                errStr: errStr,
-            });
+        });
+    }
+
+    _onStagePhaseChange = (stage, phase) => {
+        const aesthetics = DEACTIVATE_AESTHETICS[stage];
+        let bodyText = null;
+        let continueText = null;
+        let continueKind = null;
+        if (aesthetics) {
+            const phaseAesthetics = aesthetics[phase];
+            if (phaseAesthetics && phaseAesthetics.body) bodyText = phaseAesthetics.body;
+            if (phaseAesthetics && phaseAesthetics.continueText) continueText = phaseAesthetics.continueText;
+            if (phaseAesthetics && phaseAesthetics.continueKind) continueKind = phaseAesthetics.continueKind;
+        }
+        this.setState({bodyText, continueText, continueKind});
+    };
+
+    _onUIAuthFinished = (success, result, extra) => {
+        if (success) return; // great! makeRequest() will be called too.
+
+        if (result === ERROR_USER_CANCELLED) {
+            this._onCancel();
             return;
         }
 
-        Analytics.trackEvent('Account', 'Deactivate Account');
-        Lifecycle.onLoggedOut();
-        this.props.onFinished(true);
-    }
+        console.error("Error during UI Auth:", {result, extra});
+        this.setState({errStr: _t("There was a problem communicating with the server. Please try again.")});
+    };
+
+    _onUIAuthComplete = (auth) => {
+        MatrixClientPeg.get().deactivateAccount(auth, this.state.shouldErase).then(r => {
+            // Deactivation worked - logout & close this dialog
+            Analytics.trackEvent('Account', 'Deactivate Account');
+            Lifecycle.onLoggedOut();
+            this.props.onFinished(true);
+        }).catch(e => {
+            console.error(e);
+            this.setState({errStr: _t("There was a problem communicating with the server. Please try again.")});
+        });
+    };
+
+    _onEraseFieldChange = (ev) => {
+        this.setState({
+            shouldErase: ev.target.checked,
+        });
+    };
 
     _onCancel() {
         this.props.onFinished(false);
@@ -95,34 +133,36 @@ export default class DeactivateAccountDialog extends React.Component {
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Loader = sdk.getComponent("elements.Spinner");
-        let passwordBoxClass = '';
 
         let error = null;
         if (this.state.errStr) {
             error = <div className="error">
                 { this.state.errStr }
             </div>;
-            passwordBoxClass = 'error';
         }
 
-        const okLabel = this.state.busy ? <Loader /> : _t('Deactivate Account');
-        const okEnabled = this.state.password && !this.state.busy;
-
-        let cancelButton = null;
-        if (!this.state.busy) {
-            cancelButton = <button onClick={this._onCancel} autoFocus={true}>
-                { _t("Cancel") }
-            </button>;
+        let auth = <div>{_t("Loading...")}</div>;
+        if (this.state.authData) {
+            auth = (
+                <div>
+                    {this.state.bodyText}
+                    <InteractiveAuth
+                        matrixClient={MatrixClientPeg.get()}
+                        authData={this.state.authData}
+                        makeRequest={this._onUIAuthComplete}
+                        onAuthFinished={this._onUIAuthFinished}
+                        onStagePhaseChange={this._onStagePhaseChange}
+                        continueText={this.state.continueText}
+                        continueKind={this.state.continueKind}
+                    />
+                </div>
+            );
         }
 
-        const Field = sdk.getComponent('elements.Field');
-
         // this is on purpose not a <form /> to prevent Enter triggering submission, to further prevent accidents
         return (
             <BaseDialog className="mx_DeactivateAccountDialog"
                 onFinished={this.props.onFinished}
-                onEnterPressed={this.onOk}
                 titleClass="danger"
                 title={_t("Deactivate Account")}
             >
@@ -172,28 +212,10 @@ export default class DeactivateAccountDialog extends React.Component {
                             </label>
                         </p>
 
-                        <p>{ _t("To continue, please enter your password:") }</p>
-                        <Field
-                            type="password"
-                            label={_t('Password')}
-                            onChange={this._onPasswordFieldChange}
-                            value={this.state.password}
-                            className={passwordBoxClass}
-                        />
+                        {error}
+                        {auth}
                     </div>
 
-                    { error }
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button
-                        className="mx_Dialog_primary danger"
-                        onClick={this._onOk}
-                        disabled={!okEnabled}
-                    >
-                        { okLabel }
-                    </button>
-
-                    { cancelButton }
                 </div>
             </BaseDialog>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3007db1b44..ce678284b7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1566,13 +1566,17 @@
     "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",
-    "Unknown error": "Unknown error",
-    "Incorrect password": "Incorrect password",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
+    "Confirm account deactivation": "Confirm account deactivation",
+    "To continue, please enter your password:": "To continue, please enter your password:",
+    "Server did not require any authentication": "Server did not require any authentication",
+    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
+    "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
     "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>": "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>",
     "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.": "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.",
     "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.": "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.",
     "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)": "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)",
-    "To continue, please enter your password:": "To continue, please enter your password:",
     "Verify session": "Verify session",
     "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
     "Verify by comparing a short text string.": "Verify by comparing a short text string.",
@@ -1963,6 +1967,7 @@
     "Failed to leave room": "Failed to leave room",
     "Can't leave Server Notices room": "Can't leave Server Notices room",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "This room is used for important messages from the Homeserver, so you cannot leave it.",
+    "Unknown error": "Unknown error",
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "Terms and Conditions": "Terms and Conditions",
@@ -2102,6 +2107,7 @@
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
     "Go Back": "Go Back",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
+    "Incorrect password": "Incorrect password",
     "Failed to re-authenticate": "Failed to re-authenticate",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.",
     "Enter your password to sign in and regain access to your account.": "Enter your password to sign in and regain access to your account.",

From 2ec7f2290c07e5152c5d1da7f8326813143773c3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Apr 2020 16:04:41 -0600
Subject: [PATCH 2011/3235] Support Jitsi information from client .well-known

It can be useful for the homeserver to support a dedicated Jitsi instance instead of requiring that all their users change/update their configs manually.
---
 src/CallHandler.js   |  3 +-
 src/Lifecycle.js     |  4 +++
 src/widgets/Jitsi.ts | 73 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 src/widgets/Jitsi.ts

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 8284e788b4..fdd0d5ae45 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -66,6 +66,7 @@ import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore, { SettingLevel } from './settings/SettingsStore';
 import {generateHumanReadableId} from "./utils/NamingUtils";
+import {Jitsi} from "./widgets/Jitsi";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -431,7 +432,7 @@ async function _startCallApp(roomId, type) {
     }
 
     const confId = `JitsiConference${generateHumanReadableId()}`;
-    const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
+    const jitsiDomain = Jitsi.getInstance().preferredDomain;
 
     let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
 
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 305a73fbad..b3d777240b 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -40,6 +40,7 @@ import ToastStore from "./stores/ToastStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import {Mjolnir} from "./mjolnir/Mjolnir";
 import DeviceListener from "./DeviceListener";
+import {Jitsi} from "./widgets/Jitsi";
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -604,6 +605,9 @@ async function startMatrixClient(startSyncing=true) {
     // This needs to be started after crypto is set up
     DeviceListener.sharedInstance().start();
 
+    // Now that we have a MatrixClientPeg, update the Jitsi info
+    await Jitsi.getInstance().update();
+
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.
     dis.dispatch({action: 'client_started'});
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
new file mode 100644
index 0000000000..988131e045
--- /dev/null
+++ b/src/widgets/Jitsi.ts
@@ -0,0 +1,73 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 SdkConfig from "../SdkConfig";
+import {MatrixClientPeg} from "../MatrixClientPeg";
+import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
+
+const JITSI_WK_PROPERTY = "im.vector.riot.jitsi";
+const JITSI_WK_CHECK_INTERVAL = 2 * 60 * 60 * 1000; // 2 hours, arbitrarily selected
+
+export class Jitsi {
+    private static instance: Jitsi;
+
+    private domain: string;
+
+    public get preferredDomain(): string {
+        return this.domain || 'jitsi.riot.im';
+    }
+
+    constructor() {
+        // We rely on the first call to be an .update() instead of doing one here. Doing one
+        // here could result in duplicate calls to the homeserver.
+
+        // Start a timer to update the server info regularly
+        setInterval(() => this.update(), JITSI_WK_CHECK_INTERVAL);
+    }
+
+    public async update(): Promise<any> {
+        // Start with a default of the config's domain
+        let domain = (SdkConfig.get()['jitsi'] || {})['preferredDomain'] || 'jitsi.riot.im';
+
+        // Now request the .well-known config to see if it changed
+        if (MatrixClientPeg.get()) {
+            try {
+                console.log("Attempting to get Jitsi conference information from homeserver");
+
+                const homeserverDomain = MatrixClientPeg.getHomeserverName();
+                const discoveryResponse = await AutoDiscovery.getRawClientConfig(homeserverDomain);
+                if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
+                    const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
+                    if (wkPreferredDomain) domain = wkPreferredDomain;
+                }
+            } catch (e) {
+                // These are non-fatal errors
+                console.error(e);
+            }
+        }
+
+        // Put the result into memory for us to use later
+        this.domain = domain;
+        console.log("Jitsi conference domain:", this.preferredDomain);
+    }
+
+    public static getInstance(): Jitsi {
+        if (!Jitsi.instance) {
+            Jitsi.instance = new Jitsi();
+        }
+        return Jitsi.instance;
+    }
+}

From 53f4820e8e738ff8e790918013568b6e353742c3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 6 Apr 2020 16:08:43 -0600
Subject: [PATCH 2012/3235] Appease the linter

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

diff --git a/src/CallHandler.js b/src/CallHandler.js
index fdd0d5ae45..c63bfe309a 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -60,7 +60,6 @@ import * as sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher';
-import SdkConfig from './SdkConfig';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';

From faab35738f3686a609d6e0f2072f05e4a20ddc7f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 10:48:56 +0100
Subject: [PATCH 2013/3235] Add new default home page fallback

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_HomePage.scss             | 79 +++++++++++++++++++
 src/components/structures/HomePage.tsx        | 67 ++++++++++++++++
 src/components/structures/LoggedInView.js     |  9 +--
 .../views/context_menus/TopLeftMenu.js        | 11 +--
 src/i18n/strings/en_EN.json                   |  5 ++
 5 files changed, 155 insertions(+), 16 deletions(-)
 create mode 100644 src/components/structures/HomePage.tsx

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 3aa80f6f59..2f2f27f377 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -23,3 +23,82 @@ limitations under the License.
     margin-left: auto;
     margin-right: auto;
 }
+
+.mx_HomePage_default {
+    text-align: center;
+
+    .mx_HomePage_default_wrapper {
+        padding: 25vh 0 12px;
+    }
+
+    img {
+        width: 40px;
+    }
+
+    h1 {
+        font-weight: 600;
+        font-size: $font-32px;
+        line-height: $font-44px;
+        margin-bottom: 4px;
+    }
+
+    h4 {
+        margin-top: 4px;
+        font-weight: 600;
+        font-size: $font-18px;
+        line-height: $font-25px;
+        color: $muted-fg-color;
+    }
+
+    .mx_HomePage_default_buttons {
+        margin: 80px auto 0;
+        width: fit-content;
+
+        .mx_AccessibleButton {
+            padding: 73px 8px 15px; // top: 20px top padding + 40px icon + 13px margin
+
+            width: 104px; // 120px - 2* 8px
+            margin: 0 39px; // 55px - 2* 8px
+            position: relative;
+            display: inline-block;
+            border-radius: 8px;
+
+            font-weight: 600;
+            font-size: $font-15px;
+            line-height: $font-20px;
+            color: $muted-fg-color;
+
+            &:hover {
+                color: $accent-color;
+                background: rgba(#03b381, 0.06);
+
+                &::before {
+                    background-color: $accent-color;
+                }
+            }
+
+            &::before {
+                top: 20px;
+                left: 40px; // (120px-40px)/2
+                width: 40px;
+                height: 40px;
+
+                content: '';
+                position: absolute;
+                background-color: $muted-fg-color;
+                mask-repeat: no-repeat;
+                mask-size: contain;
+            }
+
+            &.mx_HomePage_button_sendDm::before {
+                mask-image: url('$(res)/img/feather-customised/message-circle.svg');
+            }
+            &.mx_HomePage_button_explore::before {
+                mask-image: url('$(res)/img/feather-customised/explore.svg');
+            }
+            &.mx_HomePage_button_createGroup::before {
+                mask-image: url('$(res)/img/feather-customised/group.svg');
+            }
+        }
+    }
+}
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
new file mode 100644
index 0000000000..ecc56ef0e5
--- /dev/null
+++ b/src/components/structures/HomePage.tsx
@@ -0,0 +1,67 @@
+/*
+Copyright 2020 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 * as React from "react";
+
+import AutoHideScrollbar from './AutoHideScrollbar';
+import { getHomePageUrl } from "../../utils/pages";
+import { _t } from "../../languageHandler";
+import SdkConfig from "../../SdkConfig";
+import * as sdk from "../../index";
+import dis from "../../dispatcher";
+
+
+const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
+const onClickExplore = () => dis.dispatch({action: 'view_room_directory'});
+const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});
+
+const HomePage = () => {
+    const config = SdkConfig.get();
+    const pageUrl = getHomePageUrl(config);
+
+    if (pageUrl) {
+        const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
+        return <EmbeddedPage className="mx_HomePage" url={pageUrl} scrollbar={true} />;
+    }
+
+    const brandingConfig = config.branding;
+    let logoUrl = "themes/riot/img/logos/riot-logo.svg";
+    if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+        logoUrl = brandingConfig.authHeaderLogoUrl;
+    }
+
+    const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    return <AutoHideScrollbar className="mx_HomePage mx_HomePage_default">
+        <div className="mx_HomePage_default_wrapper">
+            <img src={logoUrl} alt="Riot" />
+            <h1>{ _t("Welcome to %(appName)s", { appName: config.brand || "Riot" }) }</h1>
+            <h4>{ _t("Liberate your communication") }</h4>
+            <div className="mx_HomePage_default_buttons">
+                <AccessibleButton onClick={onClickSendDm} className="mx_HomePage_button_sendDm">
+                    { _t("Send a Direct Message") }
+                </AccessibleButton>
+                <AccessibleButton onClick={onClickExplore} className="mx_HomePage_button_explore">
+                    { _t("Explore Public Rooms") }
+                </AccessibleButton>
+                <AccessibleButton onClick={onClickNewRoom} className="mx_HomePage_button_createGroup">
+                    { _t("Create a Group Chat") }
+                </AccessibleButton>
+            </div>
+        </div>
+    </AutoHideScrollbar>;
+};
+
+export default HomePage;
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 51ce41e36f..53c2d61642 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -40,6 +40,7 @@ import ResizeHandle from '../views/elements/ResizeHandle';
 import {Resizer, CollapseDistributor} from '../../resizer';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
+import HomePage from "./HomePage";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -577,13 +578,7 @@ const LoggedInView = createReactClass({
                 break;
 
             case PageTypes.HomePage:
-                {
-                    const pageUrl = getHomePageUrl(this.props.config);
-                    pageElement = <EmbeddedPage className="mx_HomePage"
-                        url={pageUrl}
-                        scrollbar={true}
-                    />;
-                }
+                pageElement = <HomePage />;
                 break;
 
             case PageTypes.UserView:
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index f1309cac2d..4448ecd041 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -26,6 +26,7 @@ import { getHostingLink } from '../../../utils/HostingLink';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
 import * as sdk from "../../../index";
+import {getHomePageUrl} from "../../../utils/pages";
 
 export default class TopLeftMenu extends React.Component {
     static propTypes = {
@@ -47,15 +48,7 @@ export default class TopLeftMenu extends React.Component {
     }
 
     hasHomePage() {
-        const config = SdkConfig.get();
-        const pagesConfig = config.embeddedPages;
-        if (pagesConfig && pagesConfig.homeUrl) {
-            return true;
-        }
-        // This is a deprecated config option for the home page
-        // (despite the name, given we also now have a welcome
-        // page, which is not the same).
-        return !!config.welcomePageUrl;
+        return !!getHomePageUrl(SdkConfig.get());
     }
 
     render() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3007db1b44..b7ad92757a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1954,6 +1954,11 @@
     "Community %(groupId)s not found": "Community %(groupId)s not found",
     "This homeserver does not support communities": "This homeserver does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
+    "Welcome to %(appName)s": "Welcome to %(appName)s",
+    "Liberate your communication": "Liberate your communication",
+    "Send a Direct Message": "Send a Direct Message",
+    "Explore Public Rooms": "Explore Public Rooms",
+    "Create a Group Chat": "Create a Group Chat",
     "Explore": "Explore",
     "Filter": "Filter",
     "Filter rooms…": "Filter rooms…",

From 4d002bd24d5b63ebdabb71bf65036842642835d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 10:51:51 +0100
Subject: [PATCH 2014/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 53c2d61642..d9980aeca6 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -32,7 +32,6 @@ import sessionStore from '../../stores/SessionStore';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "../../stores/RoomListStore";
-import { getHomePageUrl } from '../../utils/pages';
 
 import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
@@ -539,7 +538,6 @@ const LoggedInView = createReactClass({
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RoomView = sdk.getComponent('structures.RoomView');
         const UserView = sdk.getComponent('structures.UserView');
-        const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
         const ToastContainer = sdk.getComponent('structures.ToastContainer');

From 971c57552bc4b234053be4846ba83e962668745f Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 7 Apr 2020 10:57:10 +0100
Subject: [PATCH 2015/3235] Check more account data in toast listener

Since any change to cross-signing or secret storage account data may affect the
outcome of checks in the toast listener, we need to broaden the account data
listener there to re-run for changes to all such bits of account data.

Fixes https://github.com/vector-im/riot-web/issues/13048
---
 src/DeviceListener.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index ddeacedd75..80ea693a38 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -90,8 +90,15 @@ export default class DeviceListener {
     }
 
     _onAccountData = (ev) => {
-        // User may have migrated SSSS to symmetric, in which case we can dismiss that toast
-        if (ev.getType().startsWith('m.secret_storage.key.')) {
+        // User may have:
+        // * migrated SSSS to symmetric
+        // * uploaded keys to secret storage
+        // * completed secret storage creation
+        // which result in account data changes affecting checks below.
+        if (
+            ev.getType().startsWith('m.secret_storage.') ||
+            ev.getType().startsWith('m.cross_signing.')
+        ) {
             this._recheck();
         }
     }

From 5c8ad71a15193ad76c43ca554b4ccecaa428c95f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 11:03:49 +0100
Subject: [PATCH 2016/3235] add missing assets

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/feather-customised/explore.svg        | 8 ++++++++
 res/img/feather-customised/group.svg          | 7 +++++++
 res/img/feather-customised/message-circle.svg | 3 +++
 3 files changed, 18 insertions(+)
 create mode 100644 res/img/feather-customised/explore.svg
 create mode 100644 res/img/feather-customised/group.svg
 create mode 100644 res/img/feather-customised/message-circle.svg

diff --git a/res/img/feather-customised/explore.svg b/res/img/feather-customised/explore.svg
new file mode 100644
index 0000000000..45be889bb7
--- /dev/null
+++ b/res/img/feather-customised/explore.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="11.5" stroke="#2E2F32" stroke-linecap="round"/>
+<circle cx="12" cy="4" r="0.8" fill="#2E2F32" stroke="#2E2F32" stroke-width="0.4"/>
+<circle cx="12" cy="20" r="0.8" fill="#2E2F32" stroke="#2E2F32" stroke-width="0.4"/>
+<circle cx="20" cy="12" r="0.8" fill="#2E2F32" stroke="#2E2F32" stroke-width="0.4"/>
+<circle cx="4" cy="12" r="0.8" fill="#2E2F32" stroke="#2E2F32" stroke-width="0.4"/>
+<path d="M10.7272 10.4443L18.3639 5.63602L13.5556 13.2728L5.636 18.3639L10.7272 10.4443Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/group.svg b/res/img/feather-customised/group.svg
new file mode 100644
index 0000000000..7051860e62
--- /dev/null
+++ b/res/img/feather-customised/group.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.7273 16.8V15.6666C14.7273 14.4148 13.7504 13.4 12.5455 13.4H8.18182C6.97683 13.4 6 14.4148 6 15.6666V16.8" stroke="#27303A" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.3636 11.1333C11.5686 11.1333 12.5455 10.1185 12.5455 8.86664C12.5455 7.6148 11.5686 6.59998 10.3636 6.59998C9.15866 6.59998 8.18182 7.6148 8.18182 8.86664C8.18182 10.1185 9.15866 11.1333 10.3636 11.1333Z" stroke="#27303A" stroke-linecap="round"/>
+<path d="M18 16.8V15.6666C17.9993 14.6337 17.3264 13.7319 16.3636 13.4736" stroke="#27303A" stroke-linecap="round"/>
+<path d="M14.1818 6.67352C15.1472 6.93032 15.8225 7.83405 15.8225 8.86936C15.8225 9.90466 15.1472 10.8084 14.1818 11.0652" stroke="#27303A" stroke-linecap="round"/>
+<circle cx="12" cy="12" r="11.5" stroke="#27303A" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/feather-customised/message-circle.svg b/res/img/feather-customised/message-circle.svg
new file mode 100644
index 0000000000..acc6d2fb0f
--- /dev/null
+++ b/res/img/feather-customised/message-circle.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.5 11.3334L23.5 11.3347C23.5043 13.0157 23.1116 14.6741 22.3537 16.1746L22.3527 16.1765C20.5186 19.8462 16.769 22.1651 12.6665 22.1667L12.6653 22.1667C10.9843 22.1711 9.32594 21.7783 7.82541 21.0204C7.70642 20.9603 7.56835 20.9502 7.44187 20.9923L1.73925 22.8932C1.34837 23.0235 0.976504 22.6516 1.1068 22.2607L3.00767 16.5581C3.04983 16.4317 3.03973 16.2936 2.97963 16.1746C2.22171 14.6741 1.82895 13.0157 1.83333 11.3347L1.83333 11.3335C1.83492 7.23102 4.15379 3.48136 7.82352 1.64729L7.82352 1.64729L7.82541 1.64634C9.32594 0.888416 10.9843 0.495653 12.6653 0.500038H12.6666H13.3194C18.8084 0.809695 23.1903 5.19159 23.5 10.6806L23.5 11.3334Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

From 90255be4992d27f2070a0b19c32b2ac6a003fa34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 11:17:19 +0100
Subject: [PATCH 2017/3235] Fix copy button on code blocks when there is no
 code just pre

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/TextualBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index c1de376385..27514d0e23 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -278,7 +278,7 @@ export default createReactClass({
             const button = document.createElement("span");
             button.className = "mx_EventTile_copyButton";
             button.onclick = (e) => {
-                const copyCode = button.parentNode.getElementsByTagName("code")[0];
+                const copyCode = button.parentNode.getElementsByTagName("pre")[0];
                 const successful = this.copyToClipboard(copyCode.textContent);
 
                 const buttonRect = e.target.getBoundingClientRect();

From 0dd3ded2a9d6e77424ae945fc82af5e6ba4da4bf Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 6 Apr 2020 17:54:16 +0000
Subject: [PATCH 2018/3235] Translated using Weblate (Bulgarian)

Currently translated at 84.9% (1924 of 2266 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 | 71 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4fbe3b2903..b31498ef0b 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1892,5 +1892,74 @@
     "The information being sent to us to help make Riot better includes:": "Информацията, която се изпраща за да ни помогне да подобрим Riot включва:",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В тази стая има непознати сесии: ако продължите без да ги потвърдите, ще е възможно някой да подслуша обаждането ви.",
     "Review Sessions": "Прегледай сесиите",
-    "If you cancel now, you won't complete verifying the other user.": "Ако се откажете сега, няма да завършите верификацията на другия потребител."
+    "If you cancel now, you won't complete verifying the other user.": "Ако се откажете сега, няма да завършите верификацията на другия потребител.",
+    "Use Single Sign On to continue": "Използвайте Single Sign On за да продължите",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Потвърдете добавянето на този имейл адрес като потвърдите идентичността си чрез Single Sign On.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Потвърдете добавянето на имейл",
+    "Click the button below to confirm adding this email address.": "Кликнете бутона по-долу за да потвърдите добавянето на имейл адреса.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Потвърдете добавянето на този телефонен номер като докажете идентичността си чрез използване на Single Sign On.",
+    "Confirm adding phone number": "Потвърдете добавянето на телефонен номер",
+    "Click the button below to confirm adding this phone number.": "Кликнете бутона по-долу за да потвърдите добавянето на телефонния номер.",
+    "If you cancel now, you won't complete verifying your other session.": "Ако се откажете сега, няма да завършите потвърждаването на другата ви сесия.",
+    "If you cancel now, you won't complete your secret storage operation.": "Ако се откажете сега, няма да завърши операцията по секретно складиране.",
+    "Cancel entering passphrase?": "Откажете въвеждането на парола?",
+    "Setting up keys": "Настройка на ключове",
+    "Verify this session": "Потвърди тази сесия",
+    "Encryption upgrade available": "Има обновление на шифроването",
+    "Set up encryption": "Настрой шифроване",
+    "Unverified login. Was this you?": "Непотвърден вход. Вие ли бяхте?",
+    "Sign In or Create Account": "Влезте или Създайте профил",
+    "Use your account or create a new one to continue.": "Използвайте профила си или създайте нов за да продължите.",
+    "Create Account": "Създай профил",
+    "Sends a message as html, without interpreting it as markdown": "Изпраща съобщението като HTML, без да го интерпретира като Markdown",
+    "Verifies a user, session, and pubkey tuple": "Потвърждава потребител, сесия и двойка ключове",
+    "Unknown (user, session) pair:": "Непозната двойка (потребител, сесия):",
+    "Session already verified!": "Сесията вече е потвърдена!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Сесията вече е потвърдена, но ключовете НЕ СЪВПАДАТ!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(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\". Това може би означава, че комуникацията ви бива прихваната!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Предоставения от вас ключ за подписване съвпада с ключа за подписване получен от сесия %(deviceId)s на %(userId)s. Сесията е маркирана като потвърдена.",
+    "Displays information about a user": "Показва информация за потребителя",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s промени името на стаята от %(oldRoomName)s на %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s добави алтернативните адреси %(addresses)s към стаята.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s добави алтернативният адрес %(addresses)s към стаята.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s премахна алтернативните адреси %(addresses)s от стаята.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s премахна алтернативният адрес %(addresses)s от стаята.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s промени алтернативните адреси на стаята.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s промени основният и алтернативните адреси на стаята.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s промени адресите на стаята.",
+    "Not Trusted": "Недоверено",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) влезе в нова сесия без да я потвърди:",
+    "Ask this user to verify their session, or manually verify it below.": "Поискайте от този потребител да потвърди сесията си, или я потвърдете ръчно по-долу.",
+    "Manually Verify by Text": "Ръчно потвърждаване чрез текст",
+    "Interactively verify by Emoji": "Потвърдете интерактивно с Емоджи",
+    "Done": "Готово",
+    "a few seconds ago": "преди няколко секунди",
+    "about a minute ago": "преди около минута",
+    "%(num)s minutes ago": "преди %(num)s минути",
+    "about an hour ago": "преди около час",
+    "%(num)s hours ago": "преди %(num)s часа",
+    "about a day ago": "преди около ден",
+    "%(num)s days ago": "преди %(num)s дни",
+    "a few seconds from now": "след няколко секунди",
+    "about a minute from now": "след около минута",
+    "%(num)s minutes from now": "след %(num)s минути",
+    "about an hour from now": "след около час",
+    "%(num)s hours from now": "след %(num)s часа",
+    "about a day from now": "след около ден",
+    "%(num)s days from now": "след %(num)s дни",
+    "Show a presence dot next to DMs in the room list": "Показвай точка за присъствие до директните съобщения в списъка със стаи",
+    "Support adding custom themes": "Включи поддръжка за добавяне на собствени теми",
+    "Enable cross-signing to verify per-user instead of per-session (in development)": "Включи кръстосано-подписване за потвърждаване на потребител, вместо на отделни сесии (в процес на разработка)",
+    "Show padlocks on invite only rooms": "Показвай катинари на стаите изискващи покана",
+    "Show typing notifications": "Показвай уведомления за писане",
+    "Never send encrypted messages to unverified sessions from this session": "Никога не изпращай шифровани съобщения към непотвърдени сесии от тази сесия",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Никога не изпращай шифровани съобщения към непотвърдени сесии в тази стая от тази сесия",
+    "Order rooms by name": "Подреждай стаите по име",
+    "Show rooms with unread notifications first": "Показвай първи стаите с непрочетени уведомления",
+    "Show shortcuts to recently viewed rooms above the room list": "Показвай преки пътища до скоро-прегледаните стаи над списъка със стаи",
+    "Enable message search in encrypted rooms": "Включи търсенето на съобщения в шифровани стаи",
+    "Keep secret storage passphrase in memory for this session": "Съхрани паролата за секретното складиране в паметта за тази сесия",
+    "How fast should messages be downloaded.": "Колко бързо да се изтеглят съобщенията.",
+    "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии"
 }

From 8d68a4ab52e28e14d3710c7638a9b633b2ae7413 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Apr 2020 12:07:41 +0100
Subject: [PATCH 2019/3235] Don't try to send presence updates until the client
 is started

Otherwise we can start making API reqiests which can fail which
can trigger things like the soft logout code.

Fixes https://github.com/vector-im/riot-web/issues/12943
---
 src/Lifecycle.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index b9fbf4f1bc..6dabdc0912 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -578,9 +578,6 @@ async function startMatrixClient(startSyncing=true) {
     UserActivity.sharedInstance().start();
     TypingStore.sharedInstance().reset(); // just in case
     ToastStore.sharedInstance().reset();
-    if (!SettingsStore.getValue("lowBandwidth")) {
-        Presence.start();
-    }
     DMRoomMap.makeShared().start();
     IntegrationManagers.sharedInstance().startWatching();
     ActiveWidgetStore.start();
@@ -603,6 +600,11 @@ async function startMatrixClient(startSyncing=true) {
 
     // This needs to be started after crypto is set up
     DeviceListener.sharedInstance().start();
+    // Similarly, don't start sending presence updates until we've started
+    // the client
+    if (!SettingsStore.getValue("lowBandwidth")) {
+        Presence.start();
+    }
 
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.

From bce22c620fa8245e94ebcdcd2586d530b87a0f89 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 7 Apr 2020 13:08:18 +0100
Subject: [PATCH 2020/3235] Don't show spinner over encryption setup dialogs

Fixes https://github.com/vector-im/riot-web/issues/13051
---
 src/components/views/toasts/SetupEncryptionToast.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 6e2df12658..3c1f42b526 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -63,7 +63,9 @@ export default class SetupEncryptionToast extends React.PureComponent {
                 {}, null, /* priority = */ false, /* static = */ true);
         } else {
             const Spinner = sdk.getComponent("elements.Spinner");
-            const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
+            const modal = Modal.createDialog(
+                Spinner, null, 'mx_Dialog_spinner', /* priority */ false, /* static */ true,
+            );
             try {
                 await accessSecretStorage();
                 await this._waitForCompletion();

From b5e6f8b8c199066221699a49d8d577e1916b9994 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 13:34:10 +0100
Subject: [PATCH 2021/3235] Iterate PR

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_HomePage.scss      | 3 ++-
 src/components/structures/HomePage.tsx | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 2f2f27f377..a4c39c8e06 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -32,7 +32,7 @@ limitations under the License.
     }
 
     img {
-        width: 40px;
+        height: 48px;
     }
 
     h1 {
@@ -62,6 +62,7 @@ limitations under the License.
             position: relative;
             display: inline-block;
             border-radius: 8px;
+            vertical-align: top;
 
             font-weight: 600;
             font-size: $font-15px;
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index ecc56ef0e5..ddf9cd6d00 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
 import dis from "../../dispatcher";
 
-
 const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
 const onClickExplore = () => dis.dispatch({action: 'view_room_directory'});
 const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});

From 3e4e7953ed9ec897ed160c89caf323dd525dd138 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 13:40:25 +0100
Subject: [PATCH 2022/3235] word-break: break-word;

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_HomePage.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index a4c39c8e06..0160cf368b 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -63,6 +63,7 @@ limitations under the License.
             display: inline-block;
             border-radius: 8px;
             vertical-align: top;
+            word-break: break-word;
 
             font-weight: 600;
             font-size: $font-15px;

From 13545abb20cdb4e848aa821c93bf73ed27c71d44 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Tue, 7 Apr 2020 14:49:10 +0000
Subject: [PATCH 2023/3235] Translated using Weblate (Russian)

Currently translated at 83.4% (1894 of 2271 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 41cd901692..5e98b25ace 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1430,7 +1430,7 @@
     "Sign in instead": "Войдите, вместо этого",
     "Your password has been reset.": "Ваш пароль был сброшен.",
     "Set a new password": "Установить новый пароль",
-    "Invalid homeserver discovery response": "Неверное обнаружения сервера",
+    "Invalid homeserver discovery response": "Неверный ответ при попытке обнаружения домашнего сервера",
     "Failed to get autodiscovery configuration from server": "Не удалось получить конфигурацию автообнаружения с сервера",
     "Show recently visited rooms above the room list": "Показать недавно посещённые комнаты над списком комнат",
     "Invalid base_url for m.homeserver": "Неверный base_url для m.homeserver",

From 3be197cf86057799605d4f4806f54d724c79657b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Apr 2020 11:19:56 -0600
Subject: [PATCH 2024/3235] Use singular copy when only deleting one device

---
 src/components/views/settings/DevicesPanel.js | 9 +++++++--
 src/i18n/strings/en_EN.json                   | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 61e7724a6f..70e0bf0109 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -124,16 +124,21 @@ export default class DevicesPanel extends React.Component {
             // pop up an interactive auth dialog
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
+            const singularDevice = this.state.selectedDevices.length === 1;
             const dialogAesthetics = {
                 [SSOAuthEntry.PHASE_PREAUTH]: {
                     title: _t("Use Single Sign On to continue"),
-                    body: _t("Confirm deleting these sessions by using Single Sign On to prove your identity."),
+                    body: singularDevice
+                        ? _t("Confirm deleting this session by using Single Sign On to prove your identity.")
+                        : _t("Confirm deleting these sessions by using Single Sign On to prove your identity."),
                     continueText: _t("Single Sign On"),
                     continueKind: "primary",
                 },
                 [SSOAuthEntry.PHASE_POSTAUTH]: {
                     title: _t("Confirm deleting these sessions"),
-                    body: _t("Click the button below to confirm deleting these sessions."),
+                    body: singularDevice
+                        ? _t("Click the button below to confirm deleting this session.")
+                        : _t("Click the button below to confirm deleting these sessions."),
                     continueText: _t("Delete sessions"),
                     continueKind: "danger",
                 },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b7ad92757a..164b999825 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -610,8 +610,10 @@
     "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
+    "Confirm deleting this session by using Single Sign On to prove your identity.": "Confirm deleting this session by using Single Sign On to prove your identity.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
     "Confirm deleting these sessions": "Confirm deleting these sessions",
+    "Click the button below to confirm deleting this session.": "Click the button below to confirm deleting this session.",
     "Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.",
     "Delete sessions": "Delete sessions",
     "Authentication": "Authentication",

From 3ab96342493b62c84af0d6ceb694d84dd0c27573 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Apr 2020 11:46:53 -0600
Subject: [PATCH 2025/3235] Pluralize more differently

---
 src/components/views/settings/DevicesPanel.js | 14 +++++++-------
 src/i18n/strings/en_EN.json                   |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 70e0bf0109..e097ef9e47 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -124,21 +124,21 @@ export default class DevicesPanel extends React.Component {
             // pop up an interactive auth dialog
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
-            const singularDevice = this.state.selectedDevices.length === 1;
+            const numDevices = this.state.selectedDevices.length;
             const dialogAesthetics = {
                 [SSOAuthEntry.PHASE_PREAUTH]: {
                     title: _t("Use Single Sign On to continue"),
-                    body: singularDevice
-                        ? _t("Confirm deleting this session by using Single Sign On to prove your identity.")
-                        : _t("Confirm deleting these sessions by using Single Sign On to prove your identity."),
+                    body: _t("Confirm deleting these sessions by using Single Sign On to prove your identity.", {
+                        count: numDevices,
+                    }),
                     continueText: _t("Single Sign On"),
                     continueKind: "primary",
                 },
                 [SSOAuthEntry.PHASE_POSTAUTH]: {
                     title: _t("Confirm deleting these sessions"),
-                    body: singularDevice
-                        ? _t("Click the button below to confirm deleting this session.")
-                        : _t("Click the button below to confirm deleting these sessions."),
+                    body: _t("Click the button below to confirm deleting these sessions.", {
+                        count: numDevices,
+                    }),
                     continueText: _t("Delete sessions"),
                     continueKind: "danger",
                 },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 164b999825..4a2edf66a6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -610,11 +610,11 @@
     "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
-    "Confirm deleting this session by using Single Sign On to prove your identity.": "Confirm deleting this session by using Single Sign On to prove your identity.",
-    "Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirm deleting this session by using Single Sign On to prove your identity.",
     "Confirm deleting these sessions": "Confirm deleting these sessions",
-    "Click the button below to confirm deleting this session.": "Click the button below to confirm deleting this session.",
-    "Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.",
+    "Click the button below to confirm deleting these sessions.|other": "Click the button below to confirm deleting these sessions.",
+    "Click the button below to confirm deleting these sessions.|one": "Click the button below to confirm deleting this session.",
     "Delete sessions": "Delete sessions",
     "Authentication": "Authentication",
     "Delete %(count)s sessions|other": "Delete %(count)s sessions",

From 712e6e8c4999fb89b7b591c5bfb14768409e01ae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2020 19:03:12 +0100
Subject: [PATCH 2026/3235] Fix sas verification buttons to match figma and
 remove useless inDialog prop from EncryptionPanel.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../verification/_VerificationShowSas.scss     | 18 ++++++++++++++++++
 .../views/dialogs/VerificationRequestDialog.js |  1 -
 .../views/right_panel/EncryptionPanel.js       |  6 +++---
 .../views/verification/VerificationShowSas.js  |  4 ++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/res/css/views/verification/_VerificationShowSas.scss b/res/css/views/verification/_VerificationShowSas.scss
index 6e26943640..af003112f7 100644
--- a/res/css/views/verification/_VerificationShowSas.scss
+++ b/res/css/views/verification/_VerificationShowSas.scss
@@ -61,3 +61,21 @@ limitations under the License.
 .mx_VerificationShowSas_emojiSas_break {
     flex-basis: 100%;
 }
+
+.mx_VerificationShowSas {
+    .mx_Dialog_buttons {
+        // this is more specific than the DialogButtons css so gets preference
+        button.mx_VerificationShowSas_matchButton {
+            color: $accent-color;
+            background-color: $accent-bg-color;
+            border: none;
+        }
+
+        // this is more specific than the DialogButtons css so gets preference
+        button.mx_VerificationShowSas_noMatchButton {
+            color: $notice-primary-color;
+            background-color: $notice-primary-bg-color;
+            border: none;
+        }
+    }
+}
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 88ca0bc337..7ff2cb8f50 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -61,7 +61,6 @@ export default class VerificationRequestDialog extends React.Component {
                 verificationRequestPromise={this.props.verificationRequestPromise}
                 onClose={this.props.onFinished}
                 member={member}
-                inDialog={true}
             />
         </BaseDialog>;
     }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index da06c37f75..476b6cace9 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -32,7 +32,7 @@ import {_t} from "../../../languageHandler";
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
 const EncryptionPanel = (props) => {
-    const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted, inDialog} = props;
+    const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted} = props;
     const [request, setRequest] = useState(verificationRequest);
     // state to show a spinner immediately after clicking "start verification",
     // before we have a request
@@ -133,7 +133,7 @@ const EncryptionPanel = (props) => {
                 isSelfVerification={isSelfVerification}
                 waitingForOtherParty={requested && initiatedByMe}
                 waitingForNetwork={requested && !initiatedByMe}
-                inDialog={inDialog} />
+                inDialog={layout === "dialog"} />
         </React.Fragment>);
     } else {
         return (<React.Fragment>
@@ -145,7 +145,7 @@ const EncryptionPanel = (props) => {
                 member={member}
                 request={request}
                 key={request.channel.transactionId}
-                inDialog={inDialog}
+                inDialog={layout === "dialog"}
                 phase={phase}
                 device={device} />
         </React.Fragment>);
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 7e9096e8fe..5fd0dca267 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -125,10 +125,10 @@ export default class VerificationShowSas extends React.Component {
             confirm = <DialogButtons
                 primaryButton={_t("They match")}
                 onPrimaryButtonClick={this.onMatchClick}
-                primaryButtonClass="mx_UserInfo_wideButton"
+                primaryButtonClass="mx_UserInfo_wideButton mx_VerificationShowSas_matchButton"
                 cancelButton={_t("They don't match")}
                 onCancel={this.onDontMatchClick}
-                cancelButtonClass="mx_UserInfo_wideButton"
+                cancelButtonClass="mx_UserInfo_wideButton mx_VerificationShowSas_noMatchButton"
             />;
         } else {
             confirm = <React.Fragment>

From c21dccc397860d288e181c2df91712c619a31f68 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 7 Apr 2020 19:11:06 +0100
Subject: [PATCH 2027/3235] Add debug status for cached backup key format

Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
---
 .../views/settings/CrossSigningPanel.js       | 21 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  2 ++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 2217a0f2ee..cb04d2a018 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -81,7 +81,9 @@ export default class CrossSigningPanel extends React.PureComponent {
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
         const selfSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"));
         const userSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"));
-        const sessionBackupKeyCached = !!(await cli._crypto.getSessionBackupPrivateKey());
+        const sessionBackupKeyFromCache = await cli._crypto.getSessionBackupPrivateKey();
+        const sessionBackupKeyCached = !!(sessionBackupKeyFromCache);
+        const sessionBackupKeyWellFormed = sessionBackupKeyFromCache instanceof Uint8Array;
         const secretStorageKeyInAccount = await secretStorage.hasKey();
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
@@ -94,6 +96,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
             sessionBackupKeyCached,
+            sessionBackupKeyWellFormed,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -143,6 +146,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
             sessionBackupKeyCached,
+            sessionBackupKeyWellFormed,
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
@@ -208,6 +212,16 @@ export default class CrossSigningPanel extends React.PureComponent {
             );
         }
 
+        let sessionBackupKeyWellFormedText = "";
+        if (sessionBackupKeyCached) {
+            sessionBackupKeyWellFormedText = ", ";
+            if (sessionBackupKeyWellFormed) {
+                sessionBackupKeyWellFormedText += _t("well formed");
+            } else {
+                sessionBackupKeyWellFormedText += _t("unexpected type");
+            }
+        }
+
         return (
             <div>
                 {summarisedStatus}
@@ -232,7 +246,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                         </tr>
                         <tr>
                             <td>{_t("Session backup key:")}</td>
-                            <td>{sessionBackupKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                            <td>
+                                {sessionBackupKeyCached ? _t("cached locally") : _t("not found locally")}
+                                {sessionBackupKeyWellFormedText}
+                            </td>
                         </tr>
                         <tr>
                             <td>{_t("Secret storage public key:")}</td>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b7ad92757a..3336c50472 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -601,6 +601,8 @@
     "not found locally": "not found locally",
     "User signing private key:": "User signing private key:",
     "Session backup key:": "Session backup key:",
+    "well formed": "well formed",
+    "unexpected type": "unexpected type",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",

From 3196c1a0315446cebf5c236b9aa09857529766f0 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 7 Apr 2020 19:24:07 +0100
Subject: [PATCH 2028/3235] Update i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3336c50472..82e87c3ac6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -591,6 +591,8 @@
     "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
     "Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
     "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
+    "well formed": "well formed",
+    "unexpected type": "unexpected type",
     "Cross-signing public keys:": "Cross-signing public keys:",
     "in memory": "in memory",
     "not found": "not found",
@@ -601,8 +603,6 @@
     "not found locally": "not found locally",
     "User signing private key:": "User signing private key:",
     "Session backup key:": "Session backup key:",
-    "well formed": "well formed",
-    "unexpected type": "unexpected type",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",

From 900a05366e2175ea1c7e48faf6f5059be4644198 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Apr 2020 15:22:38 -0600
Subject: [PATCH 2029/3235] Fix share dialog correctly

componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
---
 src/components/views/dialogs/ShareDialog.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index cf4735f608..1bc9decd39 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -70,9 +70,16 @@ export default class ShareDialog extends React.Component {
         this.onCopyClick = this.onCopyClick.bind(this);
         this.onLinkSpecificEventCheckboxClick = this.onLinkSpecificEventCheckboxClick.bind(this);
 
+        let permalinkCreator: RoomPermalinkCreator = null;
+        if (props.target instanceof Room) {
+            permalinkCreator = new RoomPermalinkCreator(props.target);
+            permalinkCreator.load();
+        }
+
         this.state = {
             // MatrixEvent defaults to share linkSpecificEvent
             linkSpecificEvent: this.props.target instanceof MatrixEvent,
+            permalinkCreator,
         };
 
         this._link = createRef();
@@ -121,14 +128,6 @@ export default class ShareDialog extends React.Component {
         });
     }
 
-    componentDidMount() {
-        if (this.props.target instanceof Room) {
-            const permalinkCreator = new RoomPermalinkCreator(this.props.target);
-            permalinkCreator.load();
-            this.setState({permalinkCreator});
-        }
-    }
-
     componentWillUnmount() {
         // if the Copied tooltip is open then get rid of it, there are ways to close the modal which wouldn't close
         // the tooltip otherwise, such as pressing Escape or clicking X really quickly

From 23ccd6de1cfb3f1447a3c6154c2f799f32528880 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 8 Apr 2020 05:24:57 +0000
Subject: [PATCH 2030/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2273 of 2273 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a87ba36d33..46d32a2af5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2335,5 +2335,14 @@
     "You cancelled verification on your other session.": "您已在其他工作階段取消驗證。",
     "%(displayName)s cancelled verification.": "%(displayName)s 取消驗證。",
     "You cancelled verification.": "您取消了驗證。",
-    "Self-verification request": "自我驗證請求"
+    "Self-verification request": "自我驗證請求",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "透過使用單一登入系統來證明您的身份以確認刪除這些工作階段。",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "透過使用單一登入系統來證明您的身份以確認刪除此工作階段。",
+    "Click the button below to confirm deleting these sessions.|other": "點擊下方按鈕以確認刪除這些工作階段。",
+    "Click the button below to confirm deleting these sessions.|one": "點擊下方按鈕以確認刪除此工作階段。",
+    "Welcome to %(appName)s": "歡迎使用 %(appName)s",
+    "Liberate your communication": "讓您的通訊自由",
+    "Send a Direct Message": "傳送直接訊息",
+    "Explore Public Rooms": "探索公開聊天室",
+    "Create a Group Chat": "建立群組聊天"
 }

From b9d28f09c848d0bb4e113832d30c59a5de057471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 8 Apr 2020 06:43:37 +0000
Subject: [PATCH 2031/3235] Translated using Weblate (French)

Currently translated at 100.0% (2273 of 2273 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 37bada3c0e..c4343432d2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2336,5 +2336,14 @@
     "You cancelled verification on your other session.": "Vous avez annulé la vérification dans votre autre session.",
     "%(displayName)s cancelled verification.": "%(displayName)s a annulé la vérification.",
     "You cancelled verification.": "Vous avez annulé la vérification.",
-    "Self-verification request": "Demande d’auto-vérification"
+    "Self-verification request": "Demande d’auto-vérification",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirmez la suppression de ces sessions en utilisant l’authentification unique pour prouver votre identité.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirmez la suppression de cette session en utilisant l’authentification unique pour prouver votre identité.",
+    "Click the button below to confirm deleting these sessions.|other": "Cliquez sur le bouton ci-dessous pour confirmer la suppression de ces sessions.",
+    "Click the button below to confirm deleting these sessions.|one": "Cliquez sur le bouton ci-dessous pour confirmer la suppression de cette session.",
+    "Welcome to %(appName)s": "Bienvenue sur %(appName)s",
+    "Liberate your communication": "Libérez votre communication",
+    "Send a Direct Message": "Envoyez un message direct",
+    "Explore Public Rooms": "Explorez les salons publics",
+    "Create a Group Chat": "Créez une discussion de groupe"
 }

From 755374743318c257f8d89ebae295ae7c222a8eb0 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Tue, 7 Apr 2020 22:44:40 +0000
Subject: [PATCH 2032/3235] Translated using Weblate (Lithuanian)

Currently translated at 46.3% (1052 of 2273 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 | 87 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 5defb98281..2652433075 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -15,7 +15,7 @@
     "A new version of Riot is available.": "Yra prieinama nauja Riot versija.",
     "I understand the risks and wish to continue": "Aš suprantu riziką ir noriu tęsti",
     "Send Account Data": "Siųsti paskyros duomenis",
-    "Advanced notification settings": "Išplėstiniai pranešimų nustatymai",
+    "Advanced notification settings": "Sudėtingesni pranešimų nustatymai",
     "Uploading report": "Išsiunčiama ataskaita",
     "Sunday": "Sekmadienis",
     "Guests can join": "Svečiai gali prisijungti",
@@ -276,7 +276,7 @@
     "Password": "Slaptažodis",
     "New Password": "Naujas slaptažodis",
     "Device ID": "Įrenginio ID",
-    "Failed to set display name": "Nepavyko nustatyti rodomą vardą",
+    "Failed to set display name": "Nepavyko nustatyti rodomo vardo",
     "Disable Notifications": "Išjungti pranešimus",
     "Enable Notifications": "Įjungti pranešimus",
     "Cannot add any more widgets": "Nepavyksta pridėti daugiau valdiklių",
@@ -324,7 +324,7 @@
     "Anyone who knows the room's link, including guests": "Bet kas, žinantis kambario nuorodą, įskaitant svečius",
     "Anyone": "Bet kas",
     "Permissions": "Leidimai",
-    "Advanced": "Išplėstiniai",
+    "Advanced": "Sudėtingesni nustatymai",
     "Add a topic": "Pridėti temą",
     "Local addresses for this room:": "Vietiniai šio kambario adresai:",
     "This room has no local addresses": "Šis kambarys neturi jokių vietinių adresų",
@@ -499,9 +499,9 @@
     "Not a valid Riot keyfile": "Negaliojantis Riot rakto failas",
     "Authentication check failed: incorrect password?": "Autentifikavimo patikra nepavyko: neteisingas slaptažodis?",
     "Send analytics data": "Siųsti analitinius duomenis",
-    "Incoming voice call from %(name)s": "Gaunamasis balso skambutis nuo %(name)s",
-    "Incoming video call from %(name)s": "Gaunamasis vaizdo skambutis nuo %(name)s",
-    "Incoming call from %(name)s": "Gaunamasis skambutis nuo %(name)s",
+    "Incoming voice call from %(name)s": "Įeinantis balso skambutis nuo %(name)s",
+    "Incoming video call from %(name)s": "Įeinantis vaizdo skambutis nuo %(name)s",
+    "Incoming call from %(name)s": "Įeinantis skambutis nuo %(name)s",
     "Change Password": "Keisti slaptažodį",
     "Authentication": "Tapatybės nustatymas",
     "The maximum permitted number of widgets have already been added to this room.": "Į šį kambarį jau yra pridėtas didžiausias leidžiamas valdiklių skaičius.",
@@ -743,7 +743,7 @@
     "Failed to perform homeserver discovery": "Nepavyko atlikti namų serverio aptikimo",
     "Error: Problem communicating with the given homeserver.": "Klaida: Problemos susisiekiant su nurodytu namų serveriu.",
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
-    "Great! This passphrase looks strong enough.": "Puiku! Ši slaptafrazė atrodo pakankamai stipri.",
+    "Great! This passphrase looks strong enough.": "Puiku! Ši slapta frazė atrodo pakankamai stipri.",
     "Your Recovery Key": "Jūsų atkūrimo raktas",
     "Copy to clipboard": "Kopijuoti į iškarpinę",
     "Download": "Atsisiųsti",
@@ -809,7 +809,7 @@
     "Adds a custom widget by URL to the room": "Į kambarį prideda pasirinktinį valdiklį pagal URL",
     "Please supply a https:// or http:// widget URL": "Prašome pateikti https:// arba http:// valdiklio URL",
     "You cannot modify widgets in this room.": "Jūs negalite keisti valdiklių šiame kambaryje.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Priverčia išmesti esamą užsibaigiančią grupės sesiją šifruotame kambaryje",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Priverčia išmesti esamą užsibaigiantį grupės seansą užšifruotame kambaryje",
     "Sends the given message coloured as a rainbow": "Išsiunčia nurodytą žinutę nuspalvintą kaip vaivorykštė",
     "Sends the given emote coloured as a rainbow": "Išsiunčia nurodytą emociją nuspalvintą kaip vaivorykštė",
     "Displays list of commands with usages and descriptions": "Parodo komandų sąrašą su naudojimo būdais ir aprašymais",
@@ -835,7 +835,7 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s galios lygį.",
     "%(displayName)s is typing …": "%(displayName)s rašo …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s ir %(count)s kiti rašo …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s ir vienas kitas rašo …",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s ir dar vienas rašo …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ir %(lastPerson)s rašo …",
     "Cannot reach homeserver": "Serveris nepasiekiamas",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Įsitikinkite, kad jūsų interneto ryšys yra stabilus, arba susisiekite su serverio administratoriumi",
@@ -848,7 +848,7 @@
     "Unexpected error resolving homeserver configuration": "Netikėta klaida nustatant serverio konfigūraciją",
     "Unexpected error resolving identity server configuration": "Netikėta klaida nustatant tapatybės serverio konfigūraciją",
     "%(items)s and %(count)s others|other": "%(items)s ir %(count)s kiti",
-    "%(items)s and %(count)s others|one": "%(items)s ir vienas kitas",
+    "%(items)s and %(count)s others|one": "%(items)s ir dar vienas",
     "%(items)s and %(lastItem)s": "%(items)s ir %(lastItem)s",
     "Unrecognised address": "Neatpažintas adresas",
     "You do not have permission to invite people to this room.": "Jūs neturite leidimo pakviesti žmones į šį kambarį.",
@@ -1008,5 +1008,70 @@
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
     "Super": "Super",
-    "Ctrl": "Ctrl"
+    "Ctrl": "Ctrl",
+    "If you cancel now, you won't complete verifying the other user.": "Jei atšauksite dabar, neužbaigsite kito vartotojo patvirtinimo.",
+    "If you cancel now, you won't complete verifying your other session.": "Jei atšauksite dabar, neužbaigsite kito seanso patvirtinimo.",
+    "Verify this session": "Patvirtinti šį seansą",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą iš %(oldRoomName)s į %(newRoomName)s.",
+    "Show display name changes": "Rodyti vardo pakeitimus",
+    "Show read receipts sent by other users": "Rodyti kitų vartotojų siųstus perskaitymo kvitus",
+    "Order rooms by name": "Rūšiuoti kambarius pagal pavadinimą",
+    "The other party cancelled the verification.": "Kita šalis atšaukė patvirtinimą.",
+    "Public Name": "Viešas Vardas",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Užšifruotos žinutės yra apsaugotos su \"end-to-end\" šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
+    "Back up your keys before signing out to avoid losing them.": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad jų neprarastumėte.",
+    "Start using Key Backup": "Pradėti naudoti Atsarginę Raktų Kopiją",
+    "Display Name": "Rodomas Vardas",
+    "Please verify the room ID or alias and try again.": "Prašome patikrinti kambario ID arba slapyvardį ir bandyti dar kartą.",
+    "Room %(name)s": "Kambarys %(name)s",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Atnaujinimas išjungs dabartinę kambario instanciją ir sukurs atnaujintą kambarį tuo pačiu vardu.",
+    "Other published addresses:": "Kiti paskelbti adresai:",
+    "No other published addresses yet, add one below": "Kol kas nėra kitų paskelbtų adresų, pridėkite vieną žemiau",
+    "Room Name": "Kambario Pavadinimas",
+    "You verified %(name)s": "Jūs patvirtinote %(name)s",
+    "You cancelled verifying %(name)s": "Jūs atšaukėte %(name)s patvirtinimą",
+    "%(name)s cancelled verifying": "%(name)s atšaukė patvirtinimą",
+    "%(name)s accepted": "%(name)s priimtas",
+    "%(name)s declined": "%(name)s atmestas",
+    "%(name)s cancelled": "%(name)s atšauktas",
+    "%(name)s wants to verify": "%(name)s nori patvirtinti",
+    "Your display name": "Jūsų rodomas vardas",
+    "Rotate Left": "Pasukti Kairėn",
+    "Room alias": "Kambario slapyvardis",
+    "e.g. my-room": "pvz.: mano-kambarys",
+    "Please provide a room alias": "Įveskite kambario slapyvardį",
+    "Enter a server name": "Įveskite serverio pavadinimą",
+    "Enter the name of a new server you want to explore.": "Įveskite naujo, norimo žvalgyti serverio pavadinimą.",
+    "Server name": "Serverio pavadinimas",
+    "Please enter a name for the room": "Įveskite kambario pavadinimą",
+    "Set a room alias to easily share your room with other people.": "Nustatykite kambario slapyvardį, kad galėtumėte nesunkiai pasidalinti juo su kitais.",
+    "This room is private, and can only be joined by invitation.": "Šis kambarys yra privatus, prie jo prisijungti galima tik su pakvietimu.",
+    "Create a private room": "Sukurti privatų kambarį",
+    "Name": "Pavadinimas",
+    "Topic (optional)": "Tema (nebūtina)",
+    "Hide advanced": "Paslėpti sudėtingesnius nustatymus",
+    "Show advanced": "Rodyti sudėtingesnius nustatymus",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Neleisti kitų matrix serverių vartotojams prisijungti prie šio kambario (Šis nustatymas negali būti vėliau pakeistas!)",
+    "Session name": "Seanso pavadinimas",
+    "Session key": "Seanso raktas",
+    "I don't want my encrypted messages": "Man nereikalingos užšifruotos žinutės",
+    "You'll lose access to your encrypted messages": "Jūs prarasite prieigą prie savo užšifruotų žinučių",
+    "New session": "Naujas seansas",
+    "Enter secret storage passphrase": "Įveskite slaptos saugyklos slaptafrazę",
+    "Enter recovery passphrase": "Įveskite atstatymo slaptafrazę",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: Atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
+    "Server Name": "Serverio Pavadinimas",
+    "Other servers": "Kiti serveriai",
+    "Add room": "Sukurti kambarį",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas ištrins visų jūsų seansų šifravimo raktus, todėl nebebus galima perskaityti užšifruotos pokalbių istorijos. Nustatykite Raktų Atsarginę Kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš atstatydami slaptažodį.",
+    "Set a display name:": "Nustatyti rodomą vardą:",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Apsaugokite savo šifravimo raktus slaptafraze. Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio:",
+    "Enter a passphrase": "Įveskite slaptafrazę",
+    "Enter your passphrase a second time to confirm it.": "Įveskite slaptafrazę antrą kartą, kad ją patvirtintumėte.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Mes saugosime užšifruotą jūsų raktų kopiją mūsų serveryje. Apsaugokite savo atsarginę kopiją slaptafraze, kad ji būtų saugi.",
+    "For maximum security, this should be different from your account password.": "Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio.",
+    "Enter a passphrase...": "Įveskite slaptafrazę...",
+    "Please enter your passphrase a second time to confirm.": "Įveskite slaptafrazę antrą kartą, kad ją patvirtintumėte.",
+    "Secure your backup with a passphrase": "Apsaugokite savo atsarginę kopiją slaptafraze"
 }

From c6fcaf86ffafe79dde4b55423999028d98bfc9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 8 Apr 2020 11:15:13 +0200
Subject: [PATCH 2033/3235] EventIndex: Log if we had all events in a
 checkpoint but are continuing.

---
 src/indexing/EventIndex.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 69939d0f32..1226b84b5b 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -530,6 +530,10 @@ export default class EventIndex extends EventEmitter {
                                 "added, stopping the crawl", checkpoint);
                     await indexManager.removeCrawlerCheckpoint(newCheckpoint);
                 } else {
+                    if (eventsAlreadyAdded === true) {
+                        console.log("EventIndex: Checkpoint had already all events",
+                                    "added, but continuing due to a full crawl", checkpoint);
+                    }
                     this.crawlerCheckpoints.push(newCheckpoint);
                 }
             } catch (e) {

From 44473707648f1fffcb4b6af8d0a83d3c38692e9d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 10:19:52 +0100
Subject: [PATCH 2034/3235] Fix composer placeholder not updating

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index 5b597e1999..e3cffd59f8 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -94,8 +94,7 @@ export default class BasicMessageEditor extends React.Component {
         this._emoticonSettingHandle = null;
     }
 
-    // TODO: [REACT-WARNING] Move into better lifecycle position
-    UNSAFE_componentWillUpdate(prevProps) { // eslint-disable-line camelcase
+    componentDidUpdate(prevProps) {
         if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {

From ada860f163b66a54c0518cb5a21b547b472b5934 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 10:50:22 +0100
Subject: [PATCH 2035/3235] Add toggle for e2ee when creating private room in
 x-signing world

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_CreateRoomDialog.scss  |  1 +
 .../views/dialogs/CreateRoomDialog.js         | 20 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index c542741c30..ac46b8e91a 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -78,6 +78,7 @@ limitations under the License.
 
     .mx_SettingsFlag {
         display: flex;
+        margin-top: 4px;
     }
 
     .mx_SettingsFlag_label {
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 77014db21d..2431a4d32f 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -24,6 +24,7 @@ import withValidation from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {Key} from "../../../Keyboard";
+import SettingsStore from "../../../settings/SettingsStore";
 
 export default createReactClass({
     displayName: 'CreateRoomDialog',
@@ -35,6 +36,7 @@ export default createReactClass({
         const config = SdkConfig.get();
         return {
             isPublic: false,
+            isEncrypted: true,
             name: "",
             topic: "",
             alias: "",
@@ -62,6 +64,11 @@ export default createReactClass({
         if (this.state.noFederate) {
             createOpts.creation_content = {'m.federate': false};
         }
+
+        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            createOpts.encryption = this.state.isEncrypted;
+        }
+
         return opts;
     },
 
@@ -127,6 +134,10 @@ export default createReactClass({
         this.setState({isPublic});
     },
 
+    onEncryptedChange(isEncrypted) {
+        this.setState({isEncrypted});
+    },
+
     onAliasChange(alias) {
         this.setState({alias});
     },
@@ -181,6 +192,14 @@ export default createReactClass({
             privateLabel = (<p>{_t("This room is private, and can only be joined by invitation.")}</p>);
         }
 
+        let e2eeSection;
+        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            e2eeSection = <React.Fragment>
+                <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
+                { _t("Bridges and most bots will not function in end-to-end encrypted rooms.") }
+            </React.Fragment>;
+        }
+
         const title = this.state.isPublic ? _t('Create a public room') : _t('Create a private room');
         return (
             <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished}
@@ -191,6 +210,7 @@ export default createReactClass({
                         <Field ref={ref => this._nameFieldRef = ref} label={ _t('Name') } onChange={this.onNameChange} onValidate={this.onNameValidate} value={this.state.name} className="mx_CreateRoomDialog_name" />
                         <Field label={ _t('Topic (optional)') } onChange={this.onTopicChange} value={this.state.topic} />
                         <LabelledToggleSwitch label={ _t("Make this room public")} onChange={this.onPublicChange} value={this.state.isPublic} />
+                        { e2eeSection }
                         { privateLabel }
                         { publicLabel }
                         { aliasField }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index aa2f0aa819..2e33445821 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1555,6 +1555,8 @@
     "Please enter a name for the room": "Please enter a name for the room",
     "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
+    "Enable end-to-end encryption": "Enable end-to-end encryption",
+    "Bridges and most bots will not function in end-to-end encrypted rooms.": "Bridges and most bots will not function in end-to-end encrypted rooms.",
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Name": "Name",

From 3a05d74ae83ae0268e553f09780200449f590b55 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 8 Apr 2020 10:52:33 +0000
Subject: [PATCH 2036/3235] Translated using Weblate (Albanian)

Currently translated at 99.6% (2268 of 2276 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 8be33f1e20..c467873553 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2325,5 +2325,16 @@
     "You cancelled verification.": "Anuluat verifikimin.",
     "Sign in with SSO": "Hyni me HNj",
     "Self-verification request": "Kërkesë vetë-verifikimi",
-    "Cancel replying to a message": "Anulo përgjigjen te një mesazh"
+    "Cancel replying to a message": "Anulo përgjigjen te një mesazh",
+    "%(name)s is requesting verification": "%(name)s po kërkon verifikim",
+    "unexpected type": "lloj i papritur",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Ripohoni fshirjen e këtyre sesioneve duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Ripohoni fshirjen e këtij sesioni duke përdorur Hyrje Njëshe për të dëshmuar identitetin tuaj.",
+    "Click the button below to confirm deleting these sessions.|other": "Klikoni butonin më poshtë që të ripohoni fshirjen e këtyre sesioneve.",
+    "Click the button below to confirm deleting these sessions.|one": "Klikoni mbi butonin më poshtë që të ripohoni fshirjen e këtij sesioni.",
+    "Welcome to %(appName)s": "Mirë se vini te %(appName)s",
+    "Liberate your communication": "Çlironi komunikimin tuaj",
+    "Send a Direct Message": "Dërgoni Mesazh të Drejtpërdrejtë",
+    "Explore Public Rooms": "Eksploroni Dhoma Publike",
+    "Create a Group Chat": "Krijoni një Fjalosje Grupi"
 }

From eec28ce38ad504c3b27555a256e578a2d527f12d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 13:47:15 +0100
Subject: [PATCH 2037/3235] Update styling and copy to match Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_CreateRoomDialog.scss  | 22 +++++++++++++++++--
 .../views/dialogs/CreateRoomDialog.js         | 14 +++++-------
 src/i18n/strings/en_EN.json                   |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index ac46b8e91a..6800722802 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 .mx_CreateRoomDialog_details {
+    margin-top: 15px;
+
     .mx_CreateRoomDialog_details_summary {
         outline: none;
         list-style: none;
@@ -71,14 +73,17 @@ limitations under the License.
 }
 
 .mx_CreateRoomDialog {
-
     &.mx_Dialog_fixedWidth {
         width: 450px;
     }
 
+    p,
+    .mx_Field_input label {
+        color: $muted-fg-color;
+    }
+
     .mx_SettingsFlag {
         display: flex;
-        margin-top: 4px;
     }
 
     .mx_SettingsFlag_label {
@@ -91,5 +96,18 @@ limitations under the License.
         flex: 0 0 auto;
         margin-left: 30px;
     }
+
+    .mx_CreateRoomDialog_topic {
+        margin-bottom: 36px;
+    }
+
+    .mx_Dialog_content > .mx_SettingsFlag {
+        margin-top: 20px;
+    }
+
+    p {
+        margin: 0 85px 0 0;
+        line-height: $font-24px;
+    }
 }
 
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 2431a4d32f..5f723234b0 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -177,11 +177,10 @@ export default createReactClass({
         const LabelledToggleSwitch = sdk.getComponent('views.elements.LabelledToggleSwitch');
         const RoomAliasField = sdk.getComponent('views.elements.RoomAliasField');
 
-        let privateLabel;
-        let publicLabel;
+        let publicPrivateLabel;
         let aliasField;
         if (this.state.isPublic) {
-            publicLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
+            publicPrivateLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
@@ -189,14 +188,14 @@ export default createReactClass({
                 </div>
             );
         } else {
-            privateLabel = (<p>{_t("This room is private, and can only be joined by invitation.")}</p>);
+            publicPrivateLabel = (<p>{_t("This room is private, and can only be joined by invitation.")}</p>);
         }
 
         let e2eeSection;
         if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
-                { _t("Bridges and most bots will not function in end-to-end encrypted rooms.") }
+                <p>{ _t("You can’t disable this later. Bridges & most bots currently won’t work.") }</p>
             </React.Fragment>;
         }
 
@@ -208,11 +207,10 @@ export default createReactClass({
                 <form onSubmit={this.onOk} onKeyDown={this._onKeyDown}>
                     <div className="mx_Dialog_content">
                         <Field ref={ref => this._nameFieldRef = ref} label={ _t('Name') } onChange={this.onNameChange} onValidate={this.onNameValidate} value={this.state.name} className="mx_CreateRoomDialog_name" />
-                        <Field label={ _t('Topic (optional)') } onChange={this.onTopicChange} value={this.state.topic} />
+                        <Field label={ _t('Topic (optional)') } onChange={this.onTopicChange} value={this.state.topic} className="mx_CreateRoomDialog_topic" />
                         <LabelledToggleSwitch label={ _t("Make this room public")} onChange={this.onPublicChange} value={this.state.isPublic} />
+                        { publicPrivateLabel }
                         { e2eeSection }
-                        { privateLabel }
-                        { publicLabel }
                         { aliasField }
                         <details ref={this.collectDetailsRef} className="mx_CreateRoomDialog_details">
                             <summary className="mx_CreateRoomDialog_details_summary">{ this.state.detailsOpen ? _t('Hide advanced') : _t('Show advanced') }</summary>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2e33445821..4fbb32e241 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1556,7 +1556,7 @@
     "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
     "Enable end-to-end encryption": "Enable end-to-end encryption",
-    "Bridges and most bots will not function in end-to-end encrypted rooms.": "Bridges and most bots will not function in end-to-end encrypted rooms.",
+    "You can’t disable this later. Bridges & most bots currently won’t work.": "You can’t disable this later. Bridges & most bots currently won’t work.",
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Name": "Name",

From 6095a00703cd320281a432d65b80eca9027167a9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2020 13:52:46 +0100
Subject: [PATCH 2038/3235] Upgrade matrix-js-sdk to 5.3.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 616f3f541e..d610b35692 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "5.3.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0391132786..bf43c92bde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,9 +5689,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
+matrix-js-sdk@5.3.0-rc.1:
+  version "5.3.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.0-rc.1.tgz#9a962a0c821266e02e214591e9cbe58b102945a0"
+  integrity sha512-k/4xw114zk2ugAUkKDL51tN7bmddvNPYek0nttnipgnooU7HLnojRiMvTzSROkqNwic+8iRx7F2xn/hPCKGTvg==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 9a1ac39f495f6e3430f510bb6a98307b475435ce Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2020 13:59:22 +0100
Subject: [PATCH 2039/3235] Prepare changelog for v2.4.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f25f1858..e9f7c0eddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,164 @@
+Changes in [2.4.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.4.0-rc.1) (2020-04-08)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.1...v2.4.0-rc.1)
+
+ * Upgrade to JS SDK to 5.3.0-rc.1
+ * EventIndex: Log if we had all events in a checkpoint but are continuing.
+   [\#4363](https://github.com/matrix-org/matrix-react-sdk/pull/4363)
+ * Update from Weblate
+   [\#4364](https://github.com/matrix-org/matrix-react-sdk/pull/4364)
+ * Support deactivating your account with SSO
+   [\#4356](https://github.com/matrix-org/matrix-react-sdk/pull/4356)
+ * Add debug status for cached backup key format
+   [\#4359](https://github.com/matrix-org/matrix-react-sdk/pull/4359)
+ * Fix composer placeholder not updating
+   [\#4361](https://github.com/matrix-org/matrix-react-sdk/pull/4361)
+ * Fix sas verification buttons to match figma
+   [\#4358](https://github.com/matrix-org/matrix-react-sdk/pull/4358)
+ * Don't show fallback text for verification requests
+   [\#4345](https://github.com/matrix-org/matrix-react-sdk/pull/4345)
+ * Fix share dialog correctly
+   [\#4360](https://github.com/matrix-org/matrix-react-sdk/pull/4360)
+ * Use singular copy when only deleting one device
+   [\#4357](https://github.com/matrix-org/matrix-react-sdk/pull/4357)
+ * Deem m.sticker events as actionable for reacting
+   [\#4288](https://github.com/matrix-org/matrix-react-sdk/pull/4288)
+ * Don't show spinner over encryption setup dialogs
+   [\#4354](https://github.com/matrix-org/matrix-react-sdk/pull/4354)
+ * Support Jitsi information from client .well-known
+   [\#4348](https://github.com/matrix-org/matrix-react-sdk/pull/4348)
+ * Add new default home page fallback
+   [\#4350](https://github.com/matrix-org/matrix-react-sdk/pull/4350)
+ * Check more account data in toast listener
+   [\#4351](https://github.com/matrix-org/matrix-react-sdk/pull/4351)
+ * Don't try to send presence updates until the client is started
+   [\#4353](https://github.com/matrix-org/matrix-react-sdk/pull/4353)
+ * Fix copy button on code blocks when there is no code tag just pre
+   [\#4352](https://github.com/matrix-org/matrix-react-sdk/pull/4352)
+ * Clear sessionStorage on sign out
+   [\#4346](https://github.com/matrix-org/matrix-react-sdk/pull/4346)
+ * Re-request room keys after auth
+   [\#4341](https://github.com/matrix-org/matrix-react-sdk/pull/4341)
+ * Update emojibase for fixed emoji codepoints and Emoji 13 support
+   [\#4344](https://github.com/matrix-org/matrix-react-sdk/pull/4344)
+ * App load order tweaks for code splitting
+   [\#4343](https://github.com/matrix-org/matrix-react-sdk/pull/4343)
+ * Fix alignment of e2e icon in userinfo and expose full displayname in title
+   [\#4312](https://github.com/matrix-org/matrix-react-sdk/pull/4312)
+ * Adjust copy & UX for self-verification
+   [\#4342](https://github.com/matrix-org/matrix-react-sdk/pull/4342)
+ * QR code reciprocation
+   [\#4334](https://github.com/matrix-org/matrix-react-sdk/pull/4334)
+ * Fix Hangul typing does not work properly
+   [\#4339](https://github.com/matrix-org/matrix-react-sdk/pull/4339)
+ * Fix: dismiss setup encryption toast if cross-signing is ready
+   [\#4336](https://github.com/matrix-org/matrix-react-sdk/pull/4336)
+ * Fix read marker visibility for grouped events
+   [\#4340](https://github.com/matrix-org/matrix-react-sdk/pull/4340)
+ * Make all 'font-size's and 'line-height's rem
+   [\#4305](https://github.com/matrix-org/matrix-react-sdk/pull/4305)
+ * Fix spurious extra devices on registration
+   [\#4337](https://github.com/matrix-org/matrix-react-sdk/pull/4337)
+ * Fix the edit messager composer
+   [\#4333](https://github.com/matrix-org/matrix-react-sdk/pull/4333)
+ * Fix Room Settings Dialog Notifications tab icon
+   [\#4321](https://github.com/matrix-org/matrix-react-sdk/pull/4321)
+ * Fix various cases of React warnings by silencing them
+   [\#4331](https://github.com/matrix-org/matrix-react-sdk/pull/4331)
+ * Only apply padding to standard textual buttons (kind buttons)
+   [\#4332](https://github.com/matrix-org/matrix-react-sdk/pull/4332)
+ * Use console.log in place of console.warn for less warnings
+   [\#4330](https://github.com/matrix-org/matrix-react-sdk/pull/4330)
+ * Revert componentDidMount changes on breadcrumbs
+   [\#4329](https://github.com/matrix-org/matrix-react-sdk/pull/4329)
+ * Use new method for checking secret storage key
+   [\#4309](https://github.com/matrix-org/matrix-react-sdk/pull/4309)
+ * Label and use UNSAFE_componentWillMount to minimize warnings
+   [\#4315](https://github.com/matrix-org/matrix-react-sdk/pull/4315)
+ * Fix a number of minor code quality issues
+   [\#4314](https://github.com/matrix-org/matrix-react-sdk/pull/4314)
+ * Use componentDidMount in place of componentWillMount where possible
+   [\#4313](https://github.com/matrix-org/matrix-react-sdk/pull/4313)
+ * EventIndex: Mark the initial checkpoints for a full crawl.
+   [\#4325](https://github.com/matrix-org/matrix-react-sdk/pull/4325)
+ * Fix UserInfo e2e buttons to match Figma
+   [\#4320](https://github.com/matrix-org/matrix-react-sdk/pull/4320)
+ * Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
+   [\#4316](https://github.com/matrix-org/matrix-react-sdk/pull/4316)
+ * Support SSO for interactive authentication
+   [\#4292](https://github.com/matrix-org/matrix-react-sdk/pull/4292)
+ * Fix /invite Slash Command
+   [\#4328](https://github.com/matrix-org/matrix-react-sdk/pull/4328)
+ * Fix jitsi popout URL
+   [\#4326](https://github.com/matrix-org/matrix-react-sdk/pull/4326)
+ * Use our own jitsi widget for the popout URL
+   [\#4323](https://github.com/matrix-org/matrix-react-sdk/pull/4323)
+ * Fix popout support for jitsi widgets
+   [\#4319](https://github.com/matrix-org/matrix-react-sdk/pull/4319)
+ * Fix: legacy verify user throwing error
+   [\#4318](https://github.com/matrix-org/matrix-react-sdk/pull/4318)
+ * Document settingDefaults
+   [\#3046](https://github.com/matrix-org/matrix-react-sdk/pull/3046)
+ * Fix Ctrl+/ for Finnish keyboard where it includes Shift
+   [\#4317](https://github.com/matrix-org/matrix-react-sdk/pull/4317)
+ * Rework SlashCommands to better expose aliases
+   [\#4302](https://github.com/matrix-org/matrix-react-sdk/pull/4302)
+ * Fix EventListSummary when RR rendering is disabled
+   [\#4311](https://github.com/matrix-org/matrix-react-sdk/pull/4311)
+ * Update link to css location.
+   [\#4299](https://github.com/matrix-org/matrix-react-sdk/pull/4299)
+ * Fix peeking keeping two timeline update mechanisms in play
+   [\#4310](https://github.com/matrix-org/matrix-react-sdk/pull/4310)
+ * Pass new secret storage key to bootstrap path
+   [\#4308](https://github.com/matrix-org/matrix-react-sdk/pull/4308)
+ * Show red shield for users that become unverified
+   [\#4303](https://github.com/matrix-org/matrix-react-sdk/pull/4303)
+ * Accessibility fixed for Event List Summary and Composer Format Bar
+   [\#4295](https://github.com/matrix-org/matrix-react-sdk/pull/4295)
+ * Support $riot: Templates for SSO/CAS urls in the welcome.html page
+   [\#4279](https://github.com/matrix-org/matrix-react-sdk/pull/4279)
+ * Added the /html command
+   [\#4296](https://github.com/matrix-org/matrix-react-sdk/pull/4296)
+ * EventIndex: Better logging on how many events are added.
+   [\#4301](https://github.com/matrix-org/matrix-react-sdk/pull/4301)
+ * Field: mark id as optional in propTypes
+   [\#4307](https://github.com/matrix-org/matrix-react-sdk/pull/4307)
+ * Fix view community link icon contrast
+   [\#4254](https://github.com/matrix-org/matrix-react-sdk/pull/4254)
+ * Remove underscore from Jitsi conference names
+   [\#4304](https://github.com/matrix-org/matrix-react-sdk/pull/4304)
+ * Refactor shield display logic; changed rules for DMs
+   [\#4290](https://github.com/matrix-org/matrix-react-sdk/pull/4290)
+ * Fix: bring back global thin scrollbars
+   [\#4300](https://github.com/matrix-org/matrix-react-sdk/pull/4300)
+ * Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
+   [\#4297](https://github.com/matrix-org/matrix-react-sdk/pull/4297)
+ * Field: make id optional, generate one if not provided
+   [\#4298](https://github.com/matrix-org/matrix-react-sdk/pull/4298)
+ * Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
+   [\#4293](https://github.com/matrix-org/matrix-react-sdk/pull/4293)
+ * Rename secret storage force-reset variable to avoid confusion
+   [\#4274](https://github.com/matrix-org/matrix-react-sdk/pull/4274)
+ * Fix: can't dismiss unverified session toast when encryption hasn't been
+   upgraded
+   [\#4291](https://github.com/matrix-org/matrix-react-sdk/pull/4291)
+ * Blank out UserInfo avatar when changing between members
+   [\#4289](https://github.com/matrix-org/matrix-react-sdk/pull/4289)
+ * Add cancel button to verification panel
+   [\#4283](https://github.com/matrix-org/matrix-react-sdk/pull/4283)
+ * Show ongoing verification request straight away when navigating to member
+   [\#4284](https://github.com/matrix-org/matrix-react-sdk/pull/4284)
+ * Fix: allow scrolling while window is not focused & remove scrollbar hack
+   [\#4276](https://github.com/matrix-org/matrix-react-sdk/pull/4276)
+ * Show whether backup key is cached
+   [\#4287](https://github.com/matrix-org/matrix-react-sdk/pull/4287)
+ * Rename unverified session toast
+   [\#4285](https://github.com/matrix-org/matrix-react-sdk/pull/4285)
+ * Fix: pick last active DM for verification request
+   [\#4286](https://github.com/matrix-org/matrix-react-sdk/pull/4286)
+ * Fix formatBar not hidden after highlight and backspacing some text
+   [\#4269](https://github.com/matrix-org/matrix-react-sdk/pull/4269)
+
 Changes in [2.3.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.1) (2020-04-01)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.0...v2.3.1)

From 0d1b7b99631e8ce526fb169e02b86f805c92826b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2020 13:59:23 +0100
Subject: [PATCH 2040/3235] v2.4.0-rc.1

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

diff --git a/package.json b/package.json
index d610b35692..0a9f081998 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.3.1",
+  "version": "2.4.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 4041c030a559f85d48a35a7db0938bc200073a4f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 14:44:34 +0100
Subject: [PATCH 2041/3235] Apply changes from Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_CreateRoomDialog.scss     | 7 ++++++-
 src/components/views/dialogs/CreateRoomDialog.js | 2 +-
 src/i18n/strings/en_EN.json                      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 6800722802..2ec0011729 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -77,6 +77,10 @@ limitations under the License.
         width: 450px;
     }
 
+    .mx_Dialog_content {
+        margin-bottom: 40px;
+    }
+
     p,
     .mx_Field_input label {
         color: $muted-fg-color;
@@ -102,11 +106,12 @@ limitations under the License.
     }
 
     .mx_Dialog_content > .mx_SettingsFlag {
-        margin-top: 20px;
+        margin-top: 12px;
     }
 
     p {
         margin: 0 85px 0 0;
+        font-size: $font-12px;
         line-height: $font-24px;
     }
 }
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 5f723234b0..88e90627e8 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -195,7 +195,7 @@ export default createReactClass({
         if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
-                <p>{ _t("You can’t disable this later. Bridges & most bots currently won’t work.") }</p>
+                <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
             </React.Fragment>;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4fbb32e241..072863c2c4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1556,7 +1556,7 @@
     "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
     "Enable end-to-end encryption": "Enable end-to-end encryption",
-    "You can’t disable this later. Bridges & most bots currently won’t work.": "You can’t disable this later. Bridges & most bots currently won’t work.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Name": "Name",

From ffecf03b2a12d7f67e032ed64535537a233bfc40 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 14:48:50 +0100
Subject: [PATCH 2042/3235] Update margins to improve grouping

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/dialogs/_CreateRoomDialog.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss
index 2ec0011729..2678f7b4ad 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.scss
+++ b/res/css/views/dialogs/_CreateRoomDialog.scss
@@ -106,13 +106,12 @@ limitations under the License.
     }
 
     .mx_Dialog_content > .mx_SettingsFlag {
-        margin-top: 12px;
+        margin-top: 24px;
     }
 
     p {
         margin: 0 85px 0 0;
         font-size: $font-12px;
-        line-height: $font-24px;
     }
 }
 

From c87d6c22dfa62e5270b54526786836ae9b91dafe Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 8 Apr 2020 14:49:52 +0100
Subject: [PATCH 2043/3235] yarn upgrade

---
 yarn.lock | 1405 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 816 insertions(+), 589 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0391132786..538a049bff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,42 +25,43 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.6.tgz#7eeaa0dfa17e50c7d9c0832515eee09b56f04e35"
-  integrity sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==
+"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
+  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
-  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
+  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.7"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.7"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.0"
+    "@babel/parser" "^7.9.0"
     "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.7"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
+    json5 "^2.1.2"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.7.tgz#870b3cf7984f5297998152af625c4f3e341400f7"
-  integrity sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
+  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
   dependencies:
-    "@babel/types" "^7.8.7"
+    "@babel/types" "^7.9.5"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -80,22 +81,22 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz#dee98d7d79cc1f003d80b76fe01c7f8945665ff6"
-  integrity sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==
+"@babel/helper-builder-react-jsx-experimental@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
+  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
   dependencies:
-    "@babel/types" "^7.8.3"
-    esutils "^2.0.0"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/types" "^7.9.5"
 
-"@babel/helper-call-delegate@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab"
-  integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==
+"@babel/helper-builder-react-jsx@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
+  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.7"
+    "@babel/helper-annotate-as-pure" "^7.8.3"
+    "@babel/types" "^7.9.0"
 
 "@babel/helper-compilation-targets@^7.8.7":
   version "7.8.7"
@@ -109,25 +110,25 @@
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0"
-  integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
+  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz#7fa040c97fb8aebe1247a5c645330c32d083066b"
-  integrity sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.6.0"
+    regexpu-core "^4.7.0"
 
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
@@ -146,14 +147,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.9.5"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -183,17 +184,17 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-transforms@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz#6a13b5eecadc35692047073a64e42977b97654a4"
-  integrity sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-simple-access" "^7.8.3"
     "@babel/helper-split-export-declaration" "^7.8.3"
     "@babel/template" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
@@ -251,6 +252,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -261,28 +267,28 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
-  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
+"@babel/helpers@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
+  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
   dependencies:
     "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.9.0"
+    "@babel/types" "^7.9.0"
 
 "@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.7.tgz#7b8facf95d25fef9534aad51c4ffecde1a61e26a"
-  integrity sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
+  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -342,7 +348,7 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.7.4":
+"@babel/plugin-proposal-numeric-separator@^7.7.4", "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
   integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
@@ -350,13 +356,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz#eb5ae366118ddca67bed583b53d7554cad9951bb"
-  integrity sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==
+"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
+  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.9.5"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.8.3"
@@ -366,20 +373,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz#ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"
-  integrity sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
-  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.8.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
@@ -438,7 +445,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
   integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
@@ -511,14 +518,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz#77534447a477cbe5995ae4aee3e39fbc8090c46d"
-  integrity sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==
+"@babel/plugin-transform-classes@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.6"
@@ -532,14 +539,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz#20ddfbd9e4676906b1056ee60af88590cc7aaa0b"
-  integrity sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==
+"@babel/plugin-transform-destructuring@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
   integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
@@ -571,18 +578,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz#da705a655466b2a9b36046b57bf0cbcd53551bd4"
-  integrity sha512-g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==
+"@babel/plugin-transform-flow-strip-types@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
+  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz#a051bd1b402c61af97a27ff51b468321c7c2a085"
-  integrity sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==
+"@babel/plugin-transform-for-of@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -608,41 +615,41 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz#65606d44616b50225e76f5578f33c568a0b876a5"
-  integrity sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==
+"@babel/plugin-transform-modules-amd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
+  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz#df251706ec331bd058a34bdd72613915f82928a5"
-  integrity sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==
+"@babel/plugin-transform-modules-commonjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
+  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz#d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"
-  integrity sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==
+"@babel/plugin-transform-modules-systemjs@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
+  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz#592d578ce06c52f5b98b02f913d653ffe972661a"
-  integrity sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==
+"@babel/plugin-transform-modules-umd@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
@@ -667,12 +674,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395"
-  integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==
+"@babel/plugin-transform-parameters@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.7"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -690,28 +696,38 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz#c4f178b2aa588ecfa8d077ea80d4194ee77ed702"
-  integrity sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==
+"@babel/plugin-transform-react-jsx-development@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
+  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+  dependencies:
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-jsx" "^7.8.3"
+
+"@babel/plugin-transform-react-jsx-self@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
+  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz#951e75a8af47f9f120db731be095d2b2c34920e0"
-  integrity sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==
+"@babel/plugin-transform-react-jsx-source@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
+  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz#4220349c0390fdefa505365f68c103562ab2fc4a"
-  integrity sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==
+"@babel/plugin-transform-react-jsx@^7.9.4":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
+  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.8.3"
+    "@babel/helper-builder-react-jsx" "^7.9.0"
+    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
@@ -730,9 +746,9 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-runtime@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
-  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
+  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -776,10 +792,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.8.3":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz#48bccff331108a7b3a28c3a4adc89e036dc3efda"
-  integrity sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==
+"@babel/plugin-transform-typescript@^7.9.0":
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
+  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -794,11 +810,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/preset-env@^7.7.6":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
-  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
+  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
   dependencies:
-    "@babel/compat-data" "^7.8.6"
+    "@babel/compat-data" "^7.9.0"
     "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -806,14 +822,16 @@
     "@babel/plugin-proposal-dynamic-import" "^7.8.3"
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
@@ -822,24 +840,24 @@
     "@babel/plugin-transform-async-to-generator" "^7.8.3"
     "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.6"
+    "@babel/plugin-transform-classes" "^7.9.5"
     "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.9.5"
     "@babel/plugin-transform-dotall-regex" "^7.8.3"
     "@babel/plugin-transform-duplicate-keys" "^7.8.3"
     "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.6"
+    "@babel/plugin-transform-for-of" "^7.9.0"
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.9.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-umd" "^7.9.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
+    "@babel/plugin-transform-parameters" "^7.9.5"
     "@babel/plugin-transform-property-literals" "^7.8.3"
     "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
@@ -849,44 +867,57 @@
     "@babel/plugin-transform-template-literals" "^7.8.3"
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.7"
-    browserslist "^4.8.5"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.9.5"
+    browserslist "^4.9.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
     semver "^5.5.0"
 
 "@babel/preset-flow@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.8.3.tgz#52af74c6a4e80d889bd9436e8e278d0fecac6e18"
-  integrity sha512-iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.9.0.tgz#fee847c3e090b0b2d9227c1949e4da1d1379280d"
+  integrity sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-flow-strip-types" "^7.8.3"
+    "@babel/plugin-transform-flow-strip-types" "^7.9.0"
+
+"@babel/preset-modules@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
 
 "@babel/preset-react@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz#23dc63f1b5b0751283e04252e78cf1d6589273d2"
-  integrity sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==
+  version "7.9.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
+  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-self" "^7.8.3"
-    "@babel/plugin-transform-react-jsx-source" "^7.8.3"
+    "@babel/plugin-transform-react-jsx" "^7.9.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
 "@babel/preset-typescript@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz#90af8690121beecd9a75d0cc26c6be39d1595d13"
-  integrity sha512-qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
+  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.8.3"
+    "@babel/plugin-transform-typescript" "^7.9.0"
 
 "@babel/register@^7.7.4":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.6.tgz#a1066aa6168a73a70c35ef28cc5865ccc087ea69"
-  integrity sha512-7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
+  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -895,17 +926,17 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime-corejs3@^7.8.3":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz#8209d9dff2f33aa2616cb319c83fe159ffb07b8c"
-  integrity sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"
+  integrity sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
-  integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -918,27 +949,27 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
-  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
+  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.6"
-    "@babel/helper-function-name" "^7.8.3"
+    "@babel/generator" "^7.9.5"
+    "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.5"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
-  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
+  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
   dependencies:
-    esutils "^2.0.2"
+    "@babel/helper-validator-identifier" "^7.9.5"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -1111,44 +1142,43 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@peculiar/asn1-schema@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.3.tgz#e55ff9e98a1cf31832629aabacf85be3edf13a48"
-  integrity sha512-Tfgj9eNJ6cTKEtEuidKenLHMx/Q5M8KEE9hnohHqvdpqHJXWYr5RlT3GjAHPjGXy5+mr7sSfuXfzE6aAkEGN7A==
+"@peculiar/asn1-schema@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.5.tgz#aa5a2c51225d213d1d6a5499ada926da3f556ff5"
+  integrity sha512-rzzorGYnQNmVHleLvC8gJSbbdNYtg+EB9s075dHvwpxs10teXHYnRmTWhCVuWjbSVSofwdm7IYPtMTWTbcNUWA==
   dependencies:
-    asn1js "^2.0.22"
-    tslib "^1.9.3"
+    asn1js "^2.0.26"
+    tslib "^1.11.1"
 
-"@peculiar/json-schema@^1.1.9":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.9.tgz#b746e046b787607a1b2804f64437fda2527b3e62"
-  integrity sha512-F2ST2y/IQPgY+1QMw1Q33sqJbGDCeO3lGqI69SL3Hgo0++7iHqprUB1QyxB/A7bN3tuM65MBxoM2JLbwh42lsQ==
+"@peculiar/json-schema@^1.1.10":
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.10.tgz#d772b4323c9a4b5352b5ad52dc821a07b0db4877"
+  integrity sha512-kbpnG9CkF1y6wwGkW7YtSA+yYK4X5uk4rAwsd1hxiaYE3Hkw2EsGlbGh/COkMLyFf+Fe830BoFiMSB3QnC/ItA==
   dependencies:
-    tslib "^1.10.0"
+    tslib "^1.11.1"
 
 "@peculiar/webcrypto@^1.0.22":
-  version "1.0.23"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.23.tgz#5519b839fba2cf8603bbbd6764dc41b108093dad"
-  integrity sha512-Ssb4xpQI3BJ0itAtT9y9jyeeiWNjcFvP6Wt/ehITxRYrEnlSfnrP7Ytc7BwN8XtnKmXDS2cWvppPldw5QsFCcw==
+  version "1.0.27"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.27.tgz#f32c58656267c8f8419a6b574322573a1b83a683"
+  integrity sha512-sERMakD19gNhwBVXGGoJjBfc28bDbd2YWaio7/x8jKtvwMKNuljM7ANQ6LzEkEvqFAyjf3bhBZktJ6UXy/0Plg==
   dependencies:
-    "@peculiar/asn1-schema" "^1.0.3"
-    "@peculiar/json-schema" "^1.1.9"
-    asn1js "^2.0.26"
-    pvtsutils "^1.0.9"
+    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/json-schema" "^1.1.10"
+    pvtsutils "^1.0.10"
     tslib "^1.11.1"
-    webcrypto-core "^1.0.17"
+    webcrypto-core "^1.0.19-next.0"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1"
-  integrity sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
+  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
   dependencies:
     type-detect "4.0.8"
 
 "@types/babel__core@^7.1.0":
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610"
-  integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
+  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1172,9 +1202,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a"
-  integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.10.tgz#d9a99f017317d9b3d1abc2ced45d3bca68df0daf"
+  integrity sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1228,9 +1258,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "13.9.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
-  integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==
+  version "13.11.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
+  integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
 
 "@types/prop-types@*":
   version "15.7.3"
@@ -1238,9 +1268,9 @@
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
 "@types/react@16.9":
-  version "16.9.23"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
-  integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
+  version "16.9.32"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
+  integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -1284,18 +1314,19 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242"
-  integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
+  integrity sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.23.0"
+    "@typescript-eslint/typescript-estree" "2.27.0"
     eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
 
-"@typescript-eslint/typescript-estree@2.23.0":
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36"
-  integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==
+"@typescript-eslint/typescript-estree@2.27.0":
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
+  integrity sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -1305,150 +1336,149 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
 
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
 
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
 
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
 
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
 
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
+    "@webassemblyjs/ast" "1.9.0"
 
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
 
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
 
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
 
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
 
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
 
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
 
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -1466,6 +1496,11 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1599,11 +1634,19 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1709,7 +1752,7 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-asn1js@^2.0.22, asn1js@^2.0.26:
+asn1js@^2.0.26:
   version "2.0.26"
   resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-2.0.26.tgz#0a6d435000f556a96c6012969d9704d981b71251"
   integrity sha512-yG89F0j9B4B0MKIcFyWWxnpZPLaNTjCj4tkE3fjbAoo0qmpGw0PYYqSbX/4ebnd9Icn8ZgK4K1fvDyEtW1JYtQ==
@@ -1767,17 +1810,17 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.0.0:
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
-  integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
+  version "9.7.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
+  integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
   dependencies:
-    browserslist "^4.8.3"
-    caniuse-lite "^1.0.30001020"
+    browserslist "^4.11.1"
+    caniuse-lite "^1.0.30001039"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.26"
-    postcss-value-parser "^4.0.2"
+    postcss "^7.0.27"
+    postcss-value-parser "^4.0.3"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1924,9 +1967,9 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blueimp-canvas-to-blob@^3.5.0:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.17.0.tgz#d796e72aa1fd37f9471e0396e64d323956564a23"
-  integrity sha512-LcuVZZtKtE4yUrLb0IQA7ndMm19gooDTrzvjjkvmQ1MhkFlSzTw+8Ftp+/ckfGeP2UDQvDsPyy8mIT69itAqbg==
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.18.0.tgz#15f67cd1469f0be4d90c4619a0499a76bb835f79"
+  integrity sha512-AkYW5KQ0kTMrmcXvSVi+2TsWDXVZwrJM3g4o7r2z6OA3IlMhlAnoBNWI1ow45jfRr/co7tNch4OdNyb3WU3Pxw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2055,14 +2098,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
-  integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
+browserslist@^4.11.1, browserslist@^4.8.3, browserslist@^4.9.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
+  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
   dependencies:
-    caniuse-lite "^1.0.30001030"
-    electron-to-chromium "^1.3.363"
-    node-releases "^1.1.50"
+    caniuse-lite "^1.0.30001038"
+    electron-to-chromium "^1.3.390"
+    node-releases "^1.1.53"
+    pkg-up "^2.0.0"
 
 bs58@^4.0.1:
   version "4.0.1"
@@ -2134,9 +2178,9 @@ builtin-status-codes@^3.0.0:
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 cacache@^12.0.0, cacache@^12.0.2:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
-  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
   dependencies:
     bluebird "^3.5.5"
     chownr "^1.1.1"
@@ -2217,10 +2261,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030:
-  version "1.0.30001033"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz#60c328fb56860de60f9a2cb419c31fb80587cba0"
-  integrity sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==
+caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039:
+  version "1.0.30001039"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe"
+  integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2290,7 +2334,7 @@ cheerio@^1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^2.0.2, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -2509,6 +2553,11 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2698,9 +2747,9 @@ cssstyle@^1.0.0:
     cssom "0.3.x"
 
 csstype@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
-  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
+  integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -2754,7 +2803,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
+debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2830,6 +2879,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2843,6 +2897,11 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3025,10 +3084,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.363:
-  version "1.3.375"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.375.tgz#e290d59d316024e5499057944c10d05c518b7a24"
-  integrity sha512-zmaFnYVBtfpF8bGRYxgPeVAlXB7N3On8rjBE2ROc6wOpTPpzRWaiHo6KkbJMvlH07CH33uks/TEb6kuMMn8q6A==
+electron-to-chromium@^1.3.390:
+  version "1.3.398"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d"
+  integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -3197,10 +3256,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4:
-  version "1.17.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
-  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -3297,9 +3356,9 @@ eslint-plugin-jest@^23.0.4:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
 eslint-plugin-react-hooks@^2.0.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.0.tgz#c50ab7ca5945ce6d1cf8248d9e185c80b54171b6"
-  integrity sha512-bzvdX47Jx847bgAYf0FPX3u1oxU+mKU8tqrpj4UX9A96SbAmj/HVEefEy6rJUog5u8QIlOPTKZcBpGn5kkKfAQ==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0"
+  integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g==
 
 eslint-plugin-react@^7.7.0:
   version "7.19.0"
@@ -3347,6 +3406,13 @@ eslint-utils@^1.3.1:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -3409,11 +3475,11 @@ esprima@^4.0.0, esprima@^4.0.1:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
-  integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe"
+  integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.0.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -3422,11 +3488,16 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22"
+  integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==
+
 estree-walker@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
@@ -3437,7 +3508,7 @@ estree-walker@^0.6.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
-esutils@^2.0.0, esutils@^2.0.2:
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -3654,9 +3725,9 @@ fbjs@^0.8.4, fbjs@^0.8.9:
     ua-parser-js "^0.7.18"
 
 figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
 figures@^2.0.0:
   version "2.0.0"
@@ -3736,7 +3807,7 @@ find-up@4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^2.0.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -3770,9 +3841,9 @@ flat-cache@^2.0.1:
     write "1.0.3"
 
 flatted@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
-  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 flow-parser@^0.57.3:
   version "0.57.3"
@@ -3802,9 +3873,9 @@ focus-lock@^0.6.6:
   integrity sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw==
 
 focus-visible@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.0.2.tgz#4fae9cf40458b73c10701c9774c462e3ccd53caf"
-  integrity sha512-zT2fj/bmOgEBjqGbURGlowTmCwsIs3bRDMr/sFZz8Ly7VkEiwuCn9swNTL3pPuf8Oua2de7CLuKdnuNajWdDsQ==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.1.0.tgz#4b9d40143b865f53eafbd93ca66672b3bf9e7b6a"
+  integrity sha512-nPer0rjtzdZ7csVIu233P2cUm/ks/4aVSI+5KUkYrYpgA7ujgC3p6J7FtFU+AIMWwnwYQOB/yeiOITxFeYIXiw==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -3845,6 +3916,13 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3866,9 +3944,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
-  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
@@ -3907,6 +3985,20 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -3960,9 +4052,9 @@ glob-parent@^3.1.0:
     path-dirname "^1.0.0"
 
 glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
@@ -4060,11 +4152,11 @@ globjoin@^0.1.4:
   integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
 
 gonzales-pe@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2"
-  integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
   dependencies:
-    minimist "1.1.x"
+    minimist "^1.2.5"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.2.3"
@@ -4104,6 +4196,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4218,9 +4315,9 @@ html-entities@^1.2.1:
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 html-escaper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
-  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html-tags@^2.0.0:
   version "2.0.0"
@@ -4291,7 +4388,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4308,6 +4405,13 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5350,12 +5454,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -5547,7 +5651,7 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
-lodash.mergewith@^4.6.1:
+lodash.mergewith@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
@@ -5640,11 +5744,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -5691,7 +5790,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/84637c6ebd442346623bce562b441e1093d40270"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5866,25 +5965,30 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@1.1.x:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
-
 minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@^1.1.1, minimist@^1.2.0, "minimist@~ 1.2.0":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
-  integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, "minimist@~ 1.2.0":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -5910,12 +6014,12 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
 
 moo@^0.5.0:
   version "0.5.1"
@@ -5987,6 +6091,15 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
+needle@^2.2.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
+  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -5998,9 +6111,9 @@ nice-try@^1.0.4:
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
-  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
+  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -6064,12 +6177,34 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.50:
-  version "1.1.51"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0"
-  integrity sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
   dependencies:
-    semver "^6.3.0"
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
+node-releases@^1.1.53:
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+
+nopt@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
@@ -6103,6 +6238,27 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6110,6 +6266,16 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6259,6 +6425,11 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6268,11 +6439,19 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6303,9 +6482,9 @@ p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -6489,9 +6668,9 @@ performance-now@^2.1.0:
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 picomatch@^2.0.4, picomatch@^2.0.7:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
 pify@^3.0.0:
   version "3.0.0"
@@ -6517,6 +6696,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
 pluralizers@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
@@ -6643,7 +6829,7 @@ postcss-value-parser@^3.3.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.2:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
   integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
@@ -6721,9 +6907,9 @@ promise@^7.0.3, promise@^7.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
-  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
+  integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.4"
@@ -6752,9 +6938,9 @@ prr@~1.0.1:
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 psl@^1.1.28:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
-  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -6808,10 +6994,10 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pvtsutils@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.9.tgz#0eb6106f27878ccaa55e7dfbf6bd2c75af461dee"
-  integrity sha512-/kDsuCKPqJuIzn37w6+iN+TiSrN+zrwPEd7FjT61oNbRvceGdsS94fMEWZ4/h6QZU5EZhBMiV+79IYedroP/Yw==
+pvtsutils@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.10.tgz#157d0fcb853f570d32e0f8788179f3057eacdf38"
+  integrity sha512-8ZKQcxnZKTn+fpDh7wL4yKax5fdl3UJzT8Jv49djZpB/dzPxacyN1Sez90b6YLdOmvIr9vaySJ5gw4aUA1EdSw==
   dependencies:
     tslib "^1.10.0"
 
@@ -6846,9 +7032,9 @@ qrcode@^1.4.4:
     yargs "^13.2.4"
 
 qs@^6.5.2, qs@^6.6.0:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
-  integrity sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
 
 qs@~6.5.2:
   version "6.5.2"
@@ -6910,7 +7096,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -6951,14 +7137,14 @@ react-clientside-effect@^1.2.2:
     "@babel/runtime" "^7.0.0"
 
 react-dom@^16.9.0:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.0.tgz#cdde54b48eb9e8a0ca1b3dc9943d9bb409b81866"
-  integrity sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
+  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.19.0"
+    scheduler "^0.19.1"
 
 react-focus-lock@^2.2.1:
   version "2.2.1"
@@ -6973,9 +7159,9 @@ react-focus-lock@^2.2.1:
     use-sidecar "^1.0.1"
 
 react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
-  integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-lifecycles-compat@^3.0.0:
   version "3.0.4"
@@ -7005,14 +7191,14 @@ react-redux@^5.0.6:
     react-lifecycles-compat "^3.0.0"
 
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.0.tgz#39ba3bf72cedc8210c3f81983f0bb061b14a3014"
-  integrity sha512-NQ2S9gdMUa7rgPGpKGyMcwl1d6D9MCF0lftdI3kts6kkiX+qvpC955jNjAZXlIDTjnN9jwFI8A8XhRh/9v0spA==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
+  integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     react-is "^16.8.6"
-    scheduler "^0.19.0"
+    scheduler "^0.19.1"
 
 react-transition-group@^1.2.0:
   version "1.2.1"
@@ -7026,9 +7212,9 @@ react-transition-group@^1.2.0:
     warning "^3.0.0"
 
 react@^16.9.0:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7"
-  integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7068,7 +7254,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7141,10 +7327,10 @@ reflect.ownkeys@^0.2.0:
   resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
   integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
 
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
   dependencies:
     regenerate "^1.4.0"
 
@@ -7159,14 +7345,14 @@ regenerator-runtime@^0.11.0:
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-runtime@^0.13.4:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
-  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
 regenerator-transform@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2"
-  integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
   dependencies:
     "@babel/runtime" "^7.8.4"
     private "^0.1.8"
@@ -7192,17 +7378,17 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
+regexpu-core@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
+    unicode-match-property-value-ecmascript "^1.2.0"
 
 registry-auth-token@4.0.0:
   version "4.0.0"
@@ -7212,12 +7398,12 @@ registry-auth-token@4.0.0:
     rc "^1.2.8"
     safe-buffer "^5.0.1"
 
-regjsgen@^0.5.0:
+regjsgen@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
   integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
-regjsparser@^0.6.0:
+regjsparser@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
   integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
@@ -7428,7 +7614,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7489,9 +7675,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.4.0, rxjs@^6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -7533,9 +7719,9 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^1.18.4:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz#9df779c53cf5755adb2322943c21c1c1dffca7bf"
-  integrity sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A==
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz#5b36c92ab27917ddd2775396815c2bc1a6268310"
+  integrity sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==
   dependencies:
     chalk "^2.4.1"
     htmlparser2 "^4.1.0"
@@ -7543,7 +7729,7 @@ sanitize-html@^1.18.4:
     lodash.escaperegexp "^4.1.2"
     lodash.isplainobject "^4.0.6"
     lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.1"
+    lodash.mergewith "^4.6.2"
     postcss "^7.0.27"
     srcset "^2.0.1"
     xtend "^4.0.1"
@@ -7553,10 +7739,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.0.tgz#a715d56302de403df742f4a9be11975b32f5698d"
-  integrity sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==
+scheduler@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7590,7 +7776,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -7644,14 +7830,14 @@ side-channel@^1.0.2:
     object-inspect "^1.7.0"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 sisteransi@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
-  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^2.0.0:
   version "2.0.0"
@@ -7926,7 +8112,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -7969,21 +8155,39 @@ string.prototype.trim@^1.2.1:
     es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
-  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+string.prototype.trimend@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
+  integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==
   dependencies:
     define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
 
 string.prototype.trimright@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
-  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
   dependencies:
     define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2"
+  integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -8068,9 +8272,9 @@ stylelint-config-standard@^18.2.0:
     stylelint-config-recommended "^2.2.0"
 
 stylelint-scss@^3.9.0:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.14.2.tgz#e449a47e0ac410e6909f1a71b49550202c978bf9"
-  integrity sha512-59/BkIEWyFoORiejDIQB2P2kmg0KcqMn7wtj1y5sRvS4N+Qh+Ng3hbKelOzgS+OM2Ezbai0uEev8xckXxkh9TQ==
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.16.0.tgz#6928fe57bcfc924110d09847c1f720472a9b7bd6"
+  integrity sha512-dAWs/gagdPYO3VDdvgRv5drRBMcWI4E//z3AXPAY1qYkSdXCEVJtEW+R9JtinG0U2rcJIu5XWaVddPQeaaufzw==
   dependencies:
     lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
@@ -8189,6 +8393,19 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -8205,9 +8422,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.2:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863"
-  integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==
+  version "4.6.10"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2"
+  integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -8465,15 +8682,15 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
-  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
 unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
-  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 unified@^7.0.0:
   version "7.1.0"
@@ -8697,9 +8914,9 @@ vfile-location@^2.0.0:
   integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
 
 vfile-message@*:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.3.tgz#0dd4f6879fb240a8099b22bd3755536c92e59ba5"
-  integrity sha512-qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
@@ -8755,21 +8972,24 @@ warning@^3.0.0:
     loose-envify "^1.0.0"
 
 watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
   dependencies:
-    chokidar "^2.0.2"
+    chokidar "^2.1.8"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webcrypto-core@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.17.tgz#a9354bc0b1ba6735e882f4137ede2c4366e6ad9b"
-  integrity sha512-7jxTLgtM+TahBPErx/Dd2XvxFDfWJrHxjVeTSvIa4LSgiYrmCPlC2INiAMAfb8MbtHiwJKKqF5sPS0AWNjBbXw==
+webcrypto-core@^1.0.19-next.0:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.19.tgz#521a0b082afecd914b8e968efb5dc381b8416c6f"
+  integrity sha512-6XHExtfMJrpkFDh9MiJ/y7ptX0dfZi0ogxFyelqxMu1eFowxivHfIp6DKzT+ZjU66xTuNfJkfkUk1bIB3tEOgA==
   dependencies:
-    pvtsutils "^1.0.9"
-    tslib "^1.10.0"
+    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/json-schema" "^1.1.10"
+    asn1js "^2.0.26"
+    pvtsutils "^1.0.10"
+    tslib "^1.11.1"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
@@ -8802,14 +9022,14 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.20.2:
-  version "4.42.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8"
-  integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==
+  version "4.42.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
+  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
   dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
     acorn "^6.2.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -8821,7 +9041,7 @@ webpack@^4.20.2:
     loader-utils "^1.2.3"
     memory-fs "^0.4.1"
     micromatch "^3.1.10"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     neo-async "^2.6.1"
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
@@ -8908,6 +9128,13 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -8992,7 +9219,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
@@ -9012,10 +9239,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0, yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+yargs-parser@^13.1.0, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -9056,9 +9283,9 @@ yargs@^12.0.5:
     yargs-parser "^11.1.1"
 
 yargs@^13.2.4, yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
     cliui "^5.0.0"
     find-up "^3.0.0"
@@ -9069,7 +9296,7 @@ yargs@^13.2.4, yargs@^13.3.0:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    yargs-parser "^13.1.2"
 
 zxcvbn@^4.4.2:
   version "4.4.2"

From b5aaae1c27f0ce43b49c0611c8d3ec3f0a9905ad Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 8 Apr 2020 12:58:52 -0600
Subject: [PATCH 2044/3235] Fix encoding of widget arguments

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

This is done by using a more modern API and de-encoding dollar signs.
---
 src/components/views/elements/AppTile.js | 29 ++++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index c49510b8b6..678384add0 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -136,22 +136,21 @@ export default class AppTile extends React.Component {
      * If url can not be parsed, it is returned unmodified.
      */
     _addWurlParams(urlString) {
-        const u = url.parse(urlString);
-        if (!u) {
-            console.error("_addWurlParams", "Invalid URL", urlString);
-            return url;
+        try {
+            const parsed = new URL(urlString);
+
+            // TODO: Replace these with proper widget params
+            // See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833
+            parsed.searchParams.set('widgetId', this.props.app.id);
+            parsed.searchParams.set('parentUrl', window.location.href.split('#', 2)[0]);
+
+            // Replace the encoded dollar signs back to dollar signs. They have no special meaning
+            // in HTTP, but URL parsers encode them anyways.
+            return parsed.toString().replace(/%24/g, '$');
+        } catch (e) {
+            console.error("Failed to add widget URL params:", e);
+            return urlString;
         }
-
-        const params = qs.parse(u.query);
-        // Append widget ID to query parameters
-        params.widgetId = this.props.app.id;
-        // Append current / parent URL, minus the hash because that will change when
-        // we view a different room (ie. may change for persistent widgets)
-        params.parentUrl = window.location.href.split('#', 2)[0];
-        u.search = undefined;
-        u.query = params;
-
-        return u.format();
     }
 
     isMixedContent() {

From 68608c2bcb52a53e2441e0c07d9f9316d2beb209 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 21:42:12 +0100
Subject: [PATCH 2045/3235] Fix gen-i18n.js script for .ts files

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 scripts/gen-i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gen-i18n.js b/scripts/gen-i18n.js
index a4d53aea2f..a1823cdf50 100755
--- a/scripts/gen-i18n.js
+++ b/scripts/gen-i18n.js
@@ -237,7 +237,7 @@ const walkOpts = {
             const fullPath = path.join(root, fileStats.name);
 
             let trs;
-            if (fileStats.name.endsWith('.js') || fileStats.name.endsWith('.tsx')) {
+            if (fileStats.name.endsWith('.js') || fileStats.name.endsWith('.ts') || fileStats.name.endsWith('.tsx')) {
                 trs = getTranslationsJs(fullPath);
             } else if (fileStats.name.endsWith('.html')) {
                 trs = getTranslationsOther(fullPath);

From cef9dbe254321cb93884e1e168b55850e7d140f7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 8 Apr 2020 21:42:58 +0100
Subject: [PATCH 2046/3235] Analytics.js gets executed during times where
 localStorage is not ensured to exist

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index c96cfdefee..e55612c4f1 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -123,8 +123,8 @@ const LAST_VISIT_TS_KEY = "mx_Riot_Analytics_lvts";
 
 function getUid() {
     try {
-        let data = localStorage.getItem(UID_KEY);
-        if (!data) {
+        let data = localStorage && localStorage.getItem(UID_KEY);
+        if (!data && localStorage) {
             localStorage.setItem(UID_KEY, data = [...Array(16)].map(() => Math.random().toString(16)[2]).join(''));
         }
         return data;
@@ -145,14 +145,16 @@ class Analytics {
         this.firstPage = true;
         this._heartbeatIntervalID = null;
 
-        this.creationTs = localStorage.getItem(CREATION_TS_KEY);
-        if (!this.creationTs) {
+        this.creationTs = localStorage && localStorage.getItem(CREATION_TS_KEY);
+        if (!this.creationTs && localStorage) {
             localStorage.setItem(CREATION_TS_KEY, this.creationTs = new Date().getTime());
         }
 
-        this.lastVisitTs = localStorage.getItem(LAST_VISIT_TS_KEY);
-        this.visitCount = localStorage.getItem(VISIT_COUNT_KEY) || 0;
-        localStorage.setItem(VISIT_COUNT_KEY, parseInt(this.visitCount, 10) + 1);
+        this.lastVisitTs = localStorage && localStorage.getItem(LAST_VISIT_TS_KEY);
+        this.visitCount = localStorage && localStorage.getItem(VISIT_COUNT_KEY) || 0;
+        if (localStorage) {
+            localStorage.setItem(VISIT_COUNT_KEY, parseInt(this.visitCount, 10) + 1);
+        }
     }
 
     get disabled() {

From 291fae649328a3493d475c844a4954ec55a36087 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 9 Apr 2020 13:43:30 +0200
Subject: [PATCH 2047/3235] update room trust when cross-signing gets
 en/disabled

---
 src/components/structures/RoomView.js  | 9 +++++++++
 src/components/views/rooms/RoomTile.js | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4a3666fc38..c68b10d33f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -182,6 +182,7 @@ export default createReactClass({
         this.context.on("crypto.keyBackupStatus", this.onKeyBackupStatus);
         this.context.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.context.on("userTrustStatusChanged", this.onUserVerificationChanged);
+        this.context.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
         // Start listening for RoomViewStore updates
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this._onRightPanelStoreUpdate);
@@ -504,6 +505,7 @@ export default createReactClass({
             this.context.removeListener("crypto.keyBackupStatus", this.onKeyBackupStatus);
             this.context.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
+            this.context.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -805,6 +807,13 @@ export default createReactClass({
         this._updateE2EStatus(room);
     },
 
+    onCrossSigningKeysChanged: function() {
+        const room = this.state.room;
+        if (room) {
+            this._updateE2EStatus(room);
+        }
+    },
+
     _updateE2EStatus: async function(room) {
         if (!this.context.isRoomEncrypted(room.roomId)) {
             return;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b06be48af..d264b087a0 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -130,6 +130,10 @@ export default createReactClass({
         this._updateE2eStatus();
     },
 
+    onCrossSigningKeysChanged: function() {
+        this._updateE2eStatus();
+    },
+
     onRoomTimeline: function(ev, room) {
         if (!room) return;
         if (room.roomId != this.props.room.roomId) return;
@@ -142,7 +146,7 @@ export default createReactClass({
         const cli = MatrixClientPeg.get();
         cli.on("RoomState.members", this.onRoomStateMember);
         cli.on("userTrustStatusChanged", this.onUserVerificationChanged);
-
+        cli.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
         this._updateE2eStatus();
     },
 
@@ -267,6 +271,7 @@ export default createReactClass({
             cli.removeListener("RoomState.events", this.onJoinRule);
             cli.removeListener("RoomState.members", this.onRoomStateMember);
             cli.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
+            cli.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
             cli.removeListener("Room.timeline", this.onRoomTimeline);
         }
         ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);

From 282577cefb9560dc9104747d75066beeb9aba60c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 9 Apr 2020 13:43:51 +0200
Subject: [PATCH 2048/3235] recalculate toasts when cross-signing gets
 en/disabled

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 80ea693a38..21c844e11c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -50,6 +50,7 @@ export default class DeviceListener {
         MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
         MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+        MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
         MatrixClientPeg.get().on('accountData', this._onAccountData);
         this._recheck();
     }
@@ -59,6 +60,7 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
             MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
+            MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
             MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
         }
         this._dismissed.clear();
@@ -89,6 +91,10 @@ export default class DeviceListener {
         this._recheck();
     }
 
+    _onCrossSingingKeysChanged = () => {
+        this._recheck();
+    }
+
     _onAccountData = (ev) => {
         // User may have:
         // * migrated SSSS to symmetric

From 60808ef6d24e00bbe58650ff406ca9bd6fea4138 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Apr 2020 13:36:53 +0100
Subject: [PATCH 2049/3235] apply clear:both to fix automatic margins for
 continuation events

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

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index b26312cebf..e015f30e48 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -111,6 +111,7 @@ limitations under the License.
 }
 
 .mx_EventTile_line, .mx_EventTile_reply {
+    clear: both;
     position: relative;
     padding-left: 65px; /* left gutter */
     padding-top: 4px;

From b6ef30af8f286576f17773bce13c333bcb8baab2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 9 Apr 2020 13:40:46 +0100
Subject: [PATCH 2050/3235] Retry the request for the master key from SSSS on
 login

If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
---
 src/components/structures/MatrixChat.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7d3b7dd0d9..da416142f8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1907,13 +1907,19 @@ export default createReactClass({
         }
 
         // Test for the master cross-signing key in SSSS as a quick proxy for
-        // whether cross-signing has been set up on the account.
-        let masterKeyInStorage = false;
-        try {
-            masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
-        } catch (e) {
-            if (e.errcode !== "M_NOT_FOUND") {
-                console.warn("Secret storage account data check failed", e);
+        // whether cross-signing has been set up on the account. We can't
+        // really continue until we know whether it's there or not so retry
+        // if this fails.
+        let masterKeyInStorage;
+        while (masterKeyInStorage === undefined) {
+            try {
+                masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
+            } catch (e) {
+                if (e.errcode === "M_NOT_FOUND") {
+                    masterKeyInStorage = false;
+                } else {
+                    console.warn("Secret storage account data check failed: retrying...", e);
+                }
             }
         }
 

From 53b753789a925c2e6f875bd3f5081bd680c04c66 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 9 Apr 2020 16:04:14 +0100
Subject: [PATCH 2051/3235] Fix logging for failed searches

error is an object so appending it to a string is not helpful
---
 src/components/structures/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4a3666fc38..7d4cc6faa2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1203,7 +1203,7 @@ export default createReactClass({
             });
         }, function(error) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            console.error("Search failed: " + error);
+            console.error("Search failed", error);
             Modal.createTrackedDialog('Search failed', '', ErrorDialog, {
                 title: _t("Search failed"),
                 description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or search timed out :(")),

From 197a2145b6e25c613fa5c8a1305a9244d22adc05 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 9 Apr 2020 03:00:58 +0000
Subject: [PATCH 2052/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2282 of 2282 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 46d32a2af5..668e3ed158 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2344,5 +2344,14 @@
     "Liberate your communication": "讓您的通訊自由",
     "Send a Direct Message": "傳送直接訊息",
     "Explore Public Rooms": "探索公開聊天室",
-    "Create a Group Chat": "建立群組聊天"
+    "Create a Group Chat": "建立群組聊天",
+    "%(name)s is requesting verification": "%(name)s 正在要求驗證",
+    "well formed": "結構良好",
+    "unexpected type": "預料之外的類型",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "透過使用單一登入系統來證您的身份以確認刪除您的帳號。",
+    "Are you sure you want to deactivate your account? This is irreversible.": "您確定您想要停用您的帳號嗎？此為不可逆的操作。",
+    "Confirm account deactivation": "確認停用帳號",
+    "Server did not require any authentication": "伺服器不需要任何驗證",
+    "Server did not return valid authentication information.": "伺服器沒有回傳有效的驗證資訊。",
+    "There was a problem communicating with the server. Please try again.": "與伺服器通訊時發生問題。請再試一次。"
 }

From 75a665ec2ed319cd31ac78b604a1a221e97637cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 9 Apr 2020 06:49:35 +0000
Subject: [PATCH 2053/3235] Translated using Weblate (French)

Currently translated at 100.0% (2282 of 2282 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c4343432d2..ea885c6202 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2345,5 +2345,14 @@
     "Liberate your communication": "Libérez votre communication",
     "Send a Direct Message": "Envoyez un message direct",
     "Explore Public Rooms": "Explorez les salons publics",
-    "Create a Group Chat": "Créez une discussion de groupe"
+    "Create a Group Chat": "Créez une discussion de groupe",
+    "%(name)s is requesting verification": "%(name)s demande une vérification",
+    "well formed": "bien formée",
+    "unexpected type": "type inattendu",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirmez la désactivation de votre compte en utilisant l’authentification unique pour prouver votre identité.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Voulez-vous vraiment désactiver votre compte ? Ceci est irréversible.",
+    "Confirm account deactivation": "Confirmez la désactivation de votre compte",
+    "Server did not require any authentication": "Le serveur n’a pas demandé d’authentification",
+    "Server did not return valid authentication information.": "Le serveur n’a pas renvoyé des informations d’authentification valides.",
+    "There was a problem communicating with the server. Please try again.": "Un problème est survenu en essayant de communiquer avec le serveur. Veuillez réessayer."
 }

From e1a496f231619c7c2dde03f6b5be35cb9e89e4c2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 9 Apr 2020 17:30:10 +0100
Subject: [PATCH 2054/3235] Pass along key backup for bootstrap

If we ask for the key backup key early in creating secret storage to ensure we
trust the backup, then we stash it to ensure it's available to bootstrap as well
without prompting again.

Fixes https://github.com/vector-im/riot-web/issues/12958
---
 src/CrossSigningManager.js                    |  2 +-
 .../CreateSecretStorageDialog.js              | 23 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 1bcf1ba706..07ec776bd1 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -185,7 +185,7 @@ export async function promptForBackupPassphrase() {
 
     const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
     const { finished } = Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
-            showSummary: false, keyCallback: k => key = k,
+        showSummary: false, keyCallback: k => key = k,
     }, null, /* priority = */ false, /* static = */ true);
 
     const success = await finished;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 01a2856df0..d63db617d5 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -70,6 +70,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._recoveryKey = null;
         this._recoveryKeyNode = null;
         this._setZxcvbnResultTimeout = null;
+        this._backupKey = null;
 
         this.state = {
             phase: PHASE_LOADING,
@@ -243,7 +244,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     createSecretStorageKey: async () => this._recoveryKey,
                     keyBackupInfo: this.state.backupInfo,
                     setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
-                    getKeyBackupPassphrase: promptForBackupPassphrase,
+                    getKeyBackupPassphrase: () => {
+                        // We may already have the backup key if we earlier went
+                        // through the restore backup path, so pass it along
+                        // rather than prompting again.
+                        if (this._backupKey) {
+                            return this._backupKey;
+                        }
+                        return promptForBackupPassphrase();
+                    },
                 });
             }
             this.setState({
@@ -272,10 +281,18 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _restoreBackup = async () => {
+        // It's possible we'll need the backup key later on for bootstrapping,
+        // so let's stash it here, rather than prompting for it twice.
+        const keyCallback = k => this._backupKey = k;
+
         const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
         const { finished } = Modal.createTrackedDialog(
-            'Restore Backup', '', RestoreKeyBackupDialog, {showSummary: false}, null,
-            /* priority = */ false, /* static = */ false,
+            'Restore Backup', '', RestoreKeyBackupDialog,
+            {
+                showSummary: false,
+                keyCallback,
+            },
+            null, /* priority = */ false, /* static = */ false,
         );
 
         await finished;

From 0cd8d067426cd42535504cedaff870ad0299f846 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 9 Apr 2020 17:51:21 +0000
Subject: [PATCH 2055/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2284 of 2284 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 | 53 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1283a7a379..1edea6c518 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1236,8 +1236,8 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s bisitariak gelara elkartzea eragotzi du.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s erabiltzaileak bisitarien araua aldatu du: %(rule)s",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Erabiltzaile honekin dauzkazun mezu seguruak muturretik muturrera zifratuta daude eta ezin ditu beste inork irakurri.",
-    "Verify this user by confirming the following emoji appear on their screen.": "Baieztatu erabiltzaile hau beheko emojiak bere pantailan agertzen direla egiaztatuz.",
-    "Verify this user by confirming the following number appears on their screen.": "Baieztatu erabiltzaile hau honako zenbakia bere pantailan agertzen dela egiaztatuz.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Egiaztatu erabiltzaile hau beheko emojiak bere pantailan agertzen direla baieztatuz.",
+    "Verify this user by confirming the following number appears on their screen.": "Egiaztatu erabiltzaile hau honako zenbakia bere pantailan agertzen dela baieztatuz.",
     "Unable to find a supported verification method.": "Ezin izan da onartutako egiaztaketa metodorik aurkitu.",
     "Thumbs up": "Ederto",
     "Hourglass": "Harea-erlojua",
@@ -2234,7 +2234,7 @@
     "Signature upload success": "Sinaduren igoera ongi burutu da",
     "Signature upload failed": "Sinaduren igoerak huts egin du",
     "Confirm by comparing the following with the User Settings in your other session:": "Berretsi honako hau zure beste saioaren erabiltzaile-ezarpenetan agertzen denarekin alderatuz:",
-    "Confirm this user's session by comparing the following with their User Settings:": "Baieztatu erabiltzaile saio hau, honako hau bestearen erabiltzaile-ezarpenekin alderatuz:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Egiaztatu erabiltzailearen saio hau, honako hau bestearen erabiltzaile-ezarpenekin alderatuz:",
     "If they don't match, the security of your communication may be compromised.": "Ez badatoz bat, komunikazioaren segurtasuna konprometitua egon daiteke.",
     "Navigation": "Nabigazioa",
     "Calls": "Deiak",
@@ -2296,5 +2296,50 @@
     "Session backup key:": "Saioaren babes-kopia gakoa:",
     "Sends a message as html, without interpreting it as markdown": "Bidali mezua html gisa, markdown balitz aztertu gabe",
     "Sign in with SSO": "Hasi saioa SSO-rekin",
-    "Cancel replying to a message": "Utzi mezua erantzuteari"
+    "Cancel replying to a message": "Utzi mezua erantzuteari",
+    "Use Single Sign On to continue": "Erabili Single sign-on jarraitzeko",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Baieztatu e-mail hau gehitzea Single sign-on bidez zure identitatea frogatuz.",
+    "Single Sign On": "Single sign-on",
+    "Confirm adding email": "Baieztatu e-maila gehitzea",
+    "Click the button below to confirm adding this email address.": "Sakatu beheko botoia e-mail helbide hau gehitzea berresteko.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Baieztatu telefono zenbaki hau gehitzea Single sign-on bidez zure identitatea frogatuz.",
+    "Confirm adding phone number": "Berretsi telefono zenbakia gehitzea",
+    "Click the button below to confirm adding this phone number.": "Sakatu beheko botoia telefono zenbaki hau gehitzea berresteko.",
+    "%(name)s is requesting verification": "%(name)s egiaztaketa eskatzen ari da",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Baieztatu beheko emojiak bi saioetan ikusten direla, ordena berean:",
+    "Verify this session by confirming the following number appears on its screen.": "Egiaztatu saio hau honako zenbakia bere pantailan agertzen dela baieztatuz.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Beste saioaren zain, %(deviceName)s (%(deviceId)s), egiaztatzeko…",
+    "From %(deviceName)s (%(deviceId)s)": "%(deviceName)s (%(deviceId)s) gailutik",
+    "well formed": "ongi osatua",
+    "unexpected type": "ustekabeko mota",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Berretsi saio hauek ezabatzea Single sign-on bidez zure identitatea frogatuz.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Berretsi saio hau ezabatzea Single sign-on bidez zure identitatea frogatuz.",
+    "Confirm deleting these sessions": "Berretsi saio hauek ezabatzea",
+    "Click the button below to confirm deleting these sessions.|other": "Sakatu beheko botoia saio hauek ezabatzea berresteko.",
+    "Click the button below to confirm deleting these sessions.|one": "Sakatu beheko botoia saio hau ezabatzea berresteko.",
+    "Delete sessions": "Ezabatu saioak",
+    "Waiting for you to accept on your other session…": "Zu beste saioa onartu bitartean zain…",
+    "Almost there! Is your other session showing the same shield?": "Ia amaitu duzu! Zure beste saioak ezkutu bera erakusten du?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Ia amaitu duzu! %(displayName)s gailuak ezkutu bera erakusten du?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ongi egiaztatu duzu %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "Hasi egiaztaketa berriro jakinarazpenetik.",
+    "Start verification again from their profile.": "Hasi egiaztaketa berriro bere profiletik.",
+    "Verification timed out.": "Egiaztaketarako denbora-muga agortu da.",
+    "You cancelled verification on your other session.": "Egiaztaketa ezeztatu duzu zure beste saioan.",
+    "%(displayName)s cancelled verification.": "%(displayName)s-k egiaztaketa ezeztatu du.",
+    "You cancelled verification.": "Egiaztaketa ezeztatu duzu.",
+    "Enable end-to-end encryption": "Gaitu muturretik-muturrera zifratzea",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Ezin duzu hau gero desgaitu: Zubiak eta bot gehienak ez dabiltza oraindik.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Berretsi zure kontua desgaitzea Single sign-on bidez zure identitatea frogatuz.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ziur kontua desaktibatu nahi duzula? Ez dago gero atzera egiterik.",
+    "Confirm account deactivation": "Baieztatu kontua desaktibatzea",
+    "Server did not require any authentication": "Zerbitzariak ez du autentifikaziorik eskatu",
+    "Server did not return valid authentication information.": "Zerbitzariak ez du baliozko autentifikazio informaziorik itzuli.",
+    "There was a problem communicating with the server. Please try again.": "Arazo bat egon da zerbitzariarekin komunikatzeko. Saiatu berriro.",
+    "Welcome to %(appName)s": "Ongi etorri %(appName)s-era",
+    "Liberate your communication": "Askatu zure komunikazioa",
+    "Send a Direct Message": "Bidali mezu zuzena",
+    "Explore Public Rooms": "Arakatu gela publikoak",
+    "Create a Group Chat": "Sortu talde-txata",
+    "Self-verification request": "Auto-egiaztaketa eskaria"
 }

From 474e46fcca32aed60efcd88cd56622960b2e95d3 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Thu, 9 Apr 2020 16:51:44 +0000
Subject: [PATCH 2056/3235] Translated using Weblate (Finnish)

Currently translated at 91.7% (2094 of 2284 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 797acf90a6..11d4a33545 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2106,5 +2106,39 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Välilyönti",
-    "End": "End"
+    "End": "End",
+    "Use Single Sign On to continue": "Jatka kertakirjautumista käyttäen",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Vahvista tämän sähköpostiosoitteen lisääminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+    "Single Sign On": "Kertakirjautuminen",
+    "Confirm adding email": "Vahvista sähköpostin lisääminen",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Vahvista tämän puhelinnumeron lisääminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+    "Confirm adding phone number": "Vahvista puhelinnumeron lisääminen",
+    "From %(deviceName)s (%(deviceId)s)": "Laitteelta %(deviceName)s (%(deviceId)s)",
+    "cached locally": "paikallisessa välimuistissa",
+    "not found locally": "ei paikallisessa välimuistissa",
+    "exists": "on olemassa",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Vahvista näiden istuntojen poistaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Vahvista tämän istunnon poistaminen todistamalla henkilöllisyytesi kertakirjautumista käyttäen.",
+    "Confirm deleting these sessions": "Vahvista näiden istuntojen poistaminen",
+    "Delete sessions": "Poista istunnot",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code> näyttää luettelon käytettävissä olevista komennoista. Oliko tarkoituksesi lähettää se viestinä?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vinkki: <code>//</code> aloittaa viestin kauttaviivalla.",
+    "Published Addresses": "Julkaistut osoitteet",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Kuka tahansa millä tahansa palvelimella voi käyttää julkaistuja osoitteita liittyäksesi huoneeseesi. Osoitteen julkaisemiseksi se on ensin asetettava paikalliseksi osoitteeksi.",
+    "Other published addresses:": "Muut julkaistut osoitteet:",
+    "No other published addresses yet, add one below": "Toistaiseksi ei muita julkaistuja osoitteita, lisää alle",
+    "New published address (e.g. #alias:server)": "Uusi julkaistu osoite (esim. #alias:palvelin)",
+    "Ask %(displayName)s to scan your code:": "Pyydä käyttäjää %(displayName)s lukemaan koodisi:",
+    "Matrix rooms": "Matrix-huoneet",
+    "The internet connection either session is using": "Jomman kumman istunnon käyttämä internet-yhteys",
+    "Sign in with SSO": "Kirjaudu kertakirjautumista käyttäen",
+    "Welcome to %(appName)s": "Tervetuloa %(appName)s-sovellukseen",
+    "Liberate your communication": "Vapauta viestintäsi",
+    "Send a Direct Message": "Lähetä yksityisviesti",
+    "Explore Public Rooms": "Selaa julkisia huoneita",
+    "Create a Group Chat": "Luo ryhmäkeskustelu",
+    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Suojaa salausavaimesi salalauseella. Parhaan turvallisuuden takaamiseksi sen tulisi olla eri kuin käyttäjätilisi salasana:",
+    "Super": "Super",
+    "Cancel replying to a message": "Peruuta viestiin vastaaminen",
+    "Jump to room search": "Siirry huonehakuun"
 }

From db3c7a8f1ca9f81df00c1ccae796516d535b21f5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 14:31:46 -0600
Subject: [PATCH 2057/3235] Obliterate widgets when they are minimized

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

We do this to all widgets as we can't guarantee what sorts of other widgets might need similar treatment.
---
 src/components/views/elements/AppTile.js | 47 +++++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 678384add0..73ed605edd 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -269,7 +269,9 @@ export default class AppTile extends React.Component {
             if (this.props.show && this.state.hasPermissionToLoad) {
                 this.setScalarToken();
             }
-        } else if (nextProps.show && !this.props.show) {
+        }
+
+        if (nextProps.show && !this.props.show) {
             // We assume that persisted widgets are loaded and don't need a spinner.
             if (this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey)) {
                 this.setState({
@@ -280,7 +282,9 @@ export default class AppTile extends React.Component {
             if (this.state.hasPermissionToLoad) {
                 this.setScalarToken();
             }
-        } else if (nextProps.widgetPageTitle !== this.props.widgetPageTitle) {
+        }
+
+        if (nextProps.widgetPageTitle !== this.props.widgetPageTitle) {
             this.setState({
                 widgetPageTitle: nextProps.widgetPageTitle,
             });
@@ -332,6 +336,28 @@ export default class AppTile extends React.Component {
             });
     }
 
+    /**
+     * Ends all widget interaction, such as cancelling calls and disabling webcams.
+     * @private
+     */
+    _endWidgetActions() {
+        // 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._appFrame.current) {
+            // 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._appFrame.current.src = 'about:blank';
+        }
+
+        // Delete the widget from the persisted store for good measure.
+        PersistedElement.destroyElement(this._persistKey);
+    }
+
     /* If user has permission to modify widgets, delete the widget,
      * otherwise revoke access for the widget to load in the user's browser
     */
@@ -353,18 +379,7 @@ 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._appFrame.current) {
-                        // 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._appFrame.current.src = 'about:blank';
-                    }
+                    this._endWidgetActions();
 
                     WidgetUtils.setRoomWidget(
                         this.props.room.roomId,
@@ -529,6 +544,10 @@ export default class AppTile extends React.Component {
         if (this.props.userWidget) {
             this._onMinimiseClick();
         } else {
+            if (this.props.show) {
+                // if we were being shown, end the widget as we're about to be minimized.
+                this._endWidgetActions();
+            }
             dis.dispatch({
                 action: 'appsDrawer',
                 show: !this.props.show,

From 3dc03ba0896969c54f1cc7c768b3a2f3304defe9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 14:40:23 -0600
Subject: [PATCH 2058/3235] Pass widget data through from sticker picker

This allows for sticker pickers to have custom template variables.

Fixes https://github.com/vector-im/riot-web/issues/6716
---
 src/components/views/rooms/Stickerpicker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 3af9ff4f65..67537c4cee 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -246,6 +246,7 @@ export default class Stickerpicker extends React.Component {
                 url: stickerpickerWidget.content.url,
                 name: stickerpickerWidget.content.name,
                 type: stickerpickerWidget.content.type,
+                data: stickerpickerWidget.content.data,
             };
 
             stickersContent = (

From 34be024b21c2c52a2c77c74b084e8752e8c66d4d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 14:47:20 -0600
Subject: [PATCH 2059/3235] Minimize widgets by default

Fixes https://github.com/vector-im/riot-web/issues/12921
---
 src/components/structures/RoomView.js    | 11 +++--------
 src/components/views/rooms/AppsDrawer.js |  6 ++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 90bf3a5a99..78bd34bf7f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -49,7 +49,6 @@ import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
-import WidgetUtils from '../../utils/WidgetUtils';
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
@@ -406,13 +405,9 @@ export default createReactClass({
         const hideWidgetDrawer = localStorage.getItem(
             room.roomId + "_hide_widget_drawer");
 
-        if (hideWidgetDrawer === "true") {
-            return false;
-        }
-
-        const widgets = WidgetEchoStore.getEchoedRoomWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
-
-        return widgets.length > 0 || WidgetEchoStore.roomHasPendingWidgets(room.roomId, WidgetUtils.getRoomWidgets(room));
+        // This is confusing, but it means to say that we default to the tray being
+        // hidden unless the user clicked to open it.
+        return hideWidgetDrawer === "false";
     },
 
     componentDidMount: function() {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index f7c5e8122f..b64eb33435 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -81,12 +81,14 @@ export default createReactClass({
         const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
             case 'appsDrawer':
+                // Note: these booleans are awkward because localstorage is fundamentally
+                // string-based. We also do exact equality on the strings later on.
                 if (action.show) {
-                    localStorage.removeItem(hideWidgetKey);
+                    localStorage.setItem(hideWidgetKey, "false");
                 } else {
                     // Store hidden state of widget
                     // Don't show if previously hidden
-                    localStorage.setItem(hideWidgetKey, true);
+                    localStorage.setItem(hideWidgetKey, "true");
                 }
 
                 break;

From dc92f557fd8ec8e65b7088a006dd993071c002ed Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 15:11:57 -0600
Subject: [PATCH 2060/3235] Support m.jitsi-typed widgets as Jitsi widgets

Fixes https://github.com/vector-im/riot-web/issues/9268
---
 src/CallHandler.js                       | 10 ++++-----
 src/components/views/elements/AppTile.js |  7 ++++---
 src/stores/WidgetEchoStore.js            |  5 +++--
 src/utils/WidgetUtils.js                 | 22 +++++++++++++++-----
 src/widgets/WidgetType.ts                | 26 ++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 src/widgets/WidgetType.ts

diff --git a/src/CallHandler.js b/src/CallHandler.js
index c63bfe309a..2bfe10850a 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -66,6 +66,7 @@ import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore, { SettingLevel } from './settings/SettingsStore';
 import {generateHumanReadableId} from "./utils/NamingUtils";
 import {Jitsi} from "./widgets/Jitsi";
+import {WidgetType} from "./widgets/WidgetType";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -401,9 +402,9 @@ async function _startCallApp(roomId, type) {
     });
 
     const room = MatrixClientPeg.get().getRoom(roomId);
-    const currentRoomWidgets = WidgetUtils.getRoomWidgets(room);
+    const currentJitsiWidgets = WidgetUtils.getRoomWidgetsOfType(room, WidgetType.JITSI);
 
-    if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
+    if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentJitsiWidgets, WidgetType.JITSI)) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
         Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
@@ -413,9 +414,6 @@ async function _startCallApp(roomId, type) {
         return;
     }
 
-    const currentJitsiWidgets = currentRoomWidgets.filter((ev) => {
-        return ev.getContent().type === 'jitsi';
-    });
     if (currentJitsiWidgets.length > 0) {
         console.warn(
             "Refusing to start conference call widget in " + roomId +
@@ -454,7 +452,7 @@ async function _startCallApp(roomId, type) {
         Date.now()
     );
 
-    WidgetUtils.setRoomWidget(roomId, widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData).then(() => {
+    WidgetUtils.setRoomWidget(roomId, widgetId, WidgetType.JITSI, widgetUrl, 'Jitsi', widgetData).then(() => {
         console.log('Jitsi widget added');
     }).catch((e) => {
         if (e.errcode === 'M_FORBIDDEN') {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 73ed605edd..58bfda8d22 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -38,6 +38,7 @@ import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
+import {WidgetType} from "../../../widgets/WidgetType";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -454,7 +455,7 @@ export default class AppTile extends React.Component {
 
             // We only tell Jitsi widgets that we're ready because they're realistically the only ones
             // using this custom extension to the widget API.
-            if (this.props.app.type === 'jitsi') {
+            if (WidgetType.JITSI.matches(this.props.app.type)) {
                 widgetMessaging.flagReadyToContinue();
             }
         }).catch((err) => {
@@ -597,7 +598,7 @@ export default class AppTile extends React.Component {
     _getRenderedUrl() {
         let url;
 
-        if (this.props.app.type === 'jitsi') {
+        if (WidgetType.JITSI.matches(this.props.app.type)) {
             console.log("Replacing Jitsi widget URL with local wrapper");
             url = WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: true});
             url = this._addWurlParams(url);
@@ -608,7 +609,7 @@ export default class AppTile extends React.Component {
     }
 
     _getPopoutUrl() {
-        if (this.props.app.type === 'jitsi') {
+        if (WidgetType.JITSI.matches(this.props.app.type)) {
             return this._templatedUrl(
                 WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
             );
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 33fa45c635..a5e7b12da0 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import EventEmitter from 'events';
+import {WidgetType} from "../widgets/WidgetType";
 
 /**
  * Acts as a place to get & set widget state, storing local echo state and
@@ -64,7 +65,7 @@ class WidgetEchoStore extends EventEmitter {
         return echoedWidgets;
     }
 
-    roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
+    roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type: WidgetType) {
         const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
 
         // any widget IDs that are already in the room are not pending, so
@@ -79,7 +80,7 @@ class WidgetEchoStore extends EventEmitter {
             return Object.keys(roomEchoState).length > 0;
         } else {
             return Object.values(roomEchoState).some((widget) => {
-                return widget.type === type;
+                return type.matches(widget.type);
             });
         }
     }
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 9fb6358c1f..bebed54438 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -29,6 +29,8 @@ import SettingsStore from "../settings/SettingsStore";
 import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {Capability} from "../widgets/WidgetApi";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {WidgetType} from "../widgets/WidgetType";
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -249,14 +251,16 @@ export default class WidgetUtils {
         });
     }
 
-    static setRoomWidget(roomId, widgetId, widgetType, widgetUrl, widgetName, widgetData) {
+    static setRoomWidget(roomId, widgetId, widgetType: WidgetType, widgetUrl, widgetName, widgetData) {
         let content;
 
         const addingWidget = Boolean(widgetUrl);
 
         if (addingWidget) {
             content = {
-                type: widgetType,
+                // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+                // For now we'll send the legacy event type for compatibility with older apps/riots
+                type: widgetType.legacy,
                 url: widgetUrl,
                 name: widgetName,
                 data: widgetData,
@@ -279,10 +283,10 @@ export default class WidgetUtils {
 
     /**
      * Get room specific widgets
-     * @param  {object} room The room to get widgets force
+     * @param  {Room} room The room to get widgets force
      * @return {[object]} Array containing current / active room widgets
      */
-    static getRoomWidgets(room) {
+    static getRoomWidgets(room: Room) {
         const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
         if (!appsStateEvents) {
             return [];
@@ -335,6 +339,14 @@ export default class WidgetUtils {
         return widgets.filter(w => w.content && w.content.type === "m.integration_manager");
     }
 
+    static getRoomWidgetsOfType(room: Room, type: WidgetType) {
+        const widgets = WidgetUtils.getRoomWidgets(room);
+        return (widgets || []).filter(w => {
+            const content = w.getContent();
+            return content.url && type.matches(content.type);
+        });
+    }
+
     static removeIntegrationManagerWidgets() {
         const client = MatrixClientPeg.get();
         if (!client) {
@@ -402,7 +414,7 @@ export default class WidgetUtils {
         // Obviously anyone that can add a widget can claim it's a jitsi widget,
         // so this doesn't really offer much over the set of domains we load
         // widgets from at all, but it probably makes sense for sanity.
-        if (appType === 'jitsi') {
+        if (WidgetType.JITSI.matches(appType)) {
             capWhitelist.push(Capability.AlwaysOnScreen);
         }
 
diff --git a/src/widgets/WidgetType.ts b/src/widgets/WidgetType.ts
new file mode 100644
index 0000000000..7608819bb9
--- /dev/null
+++ b/src/widgets/WidgetType.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+export class WidgetType {
+    public static readonly JITSI = new WidgetType("m.jitsi", "jitsi");
+
+    constructor(public readonly preferred: string, public readonly legacy: string) {
+    }
+
+    public matches(type: string): boolean {
+        return type === this.preferred || type === this.legacy;
+    }
+}

From b4b0c4c6dfd944346e7ea82bc607e2f83fcf228a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 15:14:07 -0600
Subject: [PATCH 2061/3235] Add comments to highlight where we'll need m.widget
 support

For https://github.com/vector-im/riot-web/issues/13111
---
 src/ScalarMessaging.js                                     | 2 ++
 src/TextForEvent.js                                        | 1 +
 src/components/views/rooms/EventTile.js                    | 1 +
 .../views/settings/tabs/room/RolesRoomSettingsTab.js       | 2 ++
 src/stores/ActiveWidgetStore.js                            | 1 +
 src/utils/WidgetUtils.js                                   | 7 +++++--
 test/components/views/rooms/RoomSettings-test.js           | 1 +
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 2211e513c3..ca8ca103e1 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -172,6 +172,7 @@ Request:
 Response:
 [
     {
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
         type: "im.vector.modular.widgets",
         state_key: "wid1",
         content: {
@@ -190,6 +191,7 @@ Example:
     room_id: "!foo:bar",
     response: [
         {
+            // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
             type: "im.vector.modular.widgets",
             state_key: "wid1",
             content: {
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 6b1c1dcd2d..3607d7a676 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -603,6 +603,7 @@ const stateHandlers = {
     'm.room.guest_access': textForGuestAccessEvent,
     'm.room.related_groups': textForRelatedGroupsEvent,
 
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
     'im.vector.modular.widgets': textForWidgetEvent,
 };
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index aed2d4b25b..75fbe5caa3 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -59,6 +59,7 @@ const stateEventTileTypes = {
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
     'm.room.server_acl': 'messages.TextualEvent',
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
     'im.vector.modular.widgets': 'messages.TextualEvent',
     'm.room.tombstone': 'messages.TextualEvent',
     'm.room.join_rules': 'messages.TextualEvent',
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index a3a9cb78c5..b812bb6b68 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -33,6 +33,7 @@ const plEventsToLabels = {
     "m.room.tombstone": _td("Upgrade the room"),
     "m.room.encryption": _td("Enable room encryption"),
 
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
     "im.vector.modular.widgets": _td("Modify widgets"),
 };
 
@@ -47,6 +48,7 @@ const plEventsToShow = {
     "m.room.tombstone": {isState: true},
     "m.room.encryption": {isState: true},
 
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
     "im.vector.modular.widgets": {isState: true},
 };
 
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index 60ea3f9106..c6f8dc69b7 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -64,6 +64,7 @@ class ActiveWidgetStore extends EventEmitter {
         // Everything else relies on views listening for events and calling setters
         // on this class which is terrible. This store should just listen for events
         // and keep itself up to date.
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
         if (ev.getType() !== 'im.vector.modular.widgets') return;
 
         if (ev.getStateKey() === this._persistentWidgetId) {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 9fb6358c1f..6768119d8f 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -66,6 +66,7 @@ export default class WidgetUtils {
             return false;
         }
 
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
         return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
     }
 
@@ -180,6 +181,7 @@ export default class WidgetUtils {
             }
 
             const room = MatrixClientPeg.get().getRoom(roomId);
+            // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
             const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
             if (eventsInIntendedState(startingWidgetEvents)) {
                 resolve();
@@ -189,6 +191,7 @@ export default class WidgetUtils {
             function onRoomStateEvents(ev) {
                 if (ev.getRoomId() !== roomId) return;
 
+                // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
                 const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
 
                 if (eventsInIntendedState(currentWidgetEvents)) {
@@ -268,8 +271,7 @@ export default class WidgetUtils {
         WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
 
         const client = MatrixClientPeg.get();
-        // TODO - Room widgets need to be moved to 'm.widget' state events
-        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
         return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
             return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
         }).finally(() => {
@@ -283,6 +285,7 @@ export default class WidgetUtils {
      * @return {[object]} Array containing current / active room widgets
      */
     static getRoomWidgets(room) {
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
         const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
         if (!appsStateEvents) {
             return [];
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 5e21f729d0..b3790b2507 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -177,6 +177,7 @@ describe.skip('RoomSettings', () => {
                         'm.room.history_visibility': 50,
                         'm.room.power_levels': 50,
                         'm.room.topic': 50,
+                        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
                         'im.vector.modular.widgets': 50,
                     },
                 },

From 4510499987b8244f24b41e958dc1990f39bebf7c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 15:25:11 -0600
Subject: [PATCH 2062/3235] Fix widgets for all other sources too

---
 src/ScalarMessaging.js    |  6 +++++-
 src/SlashCommands.tsx     |  3 ++-
 src/widgets/WidgetType.ts | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 2211e513c3..9be7730c3a 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -239,6 +239,7 @@ import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
+import {WidgetType} from "./widgets/WidgetType";
 
 function sendResponse(event, res) {
     const data = JSON.parse(JSON.stringify(event.data));
@@ -290,7 +291,7 @@ function inviteUser(event, roomId, userId) {
 
 function setWidget(event, roomId) {
     const widgetId = event.data.widget_id;
-    const widgetType = event.data.type;
+    let widgetType = event.data.type;
     const widgetUrl = event.data.url;
     const widgetName = event.data.name; // optional
     const widgetData = event.data.data; // optional
@@ -322,6 +323,9 @@ function setWidget(event, roomId) {
         }
     }
 
+    // convert the widget type to a known widget type
+    widgetType = WidgetType.fromString(widgetType);
+
     if (userWidget) {
         WidgetUtils.setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData).then(() => {
             sendResponse(event, {
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index d60434cf97..0afea63a78 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -35,6 +35,7 @@ import { abbreviateUrl } from './utils/UrlUtils';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/IdentityServerUtils';
 import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
 import {inviteUsersToRoom} from "./RoomInvite";
+import { WidgetType } from "./widgets/WidgetType";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -775,7 +776,7 @@ export const Commands = [
                 const nowMs = (new Date()).getTime();
                 const widgetId = encodeURIComponent(`${roomId}_${userId}_${nowMs}`);
                 return success(WidgetUtils.setRoomWidget(
-                    roomId, widgetId, "m.custom", args, "Custom Widget", {}));
+                    roomId, widgetId, WidgetType.CUSTOM, args, "Custom Widget", {}));
             } else {
                 return reject(_t("You cannot modify widgets in this room."));
             }
diff --git a/src/widgets/WidgetType.ts b/src/widgets/WidgetType.ts
index 7608819bb9..09c30430dd 100644
--- a/src/widgets/WidgetType.ts
+++ b/src/widgets/WidgetType.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 export class WidgetType {
     public static readonly JITSI = new WidgetType("m.jitsi", "jitsi");
+    public static readonly CUSTOM = new WidgetType("m.custom", "m.custom");
 
     constructor(public readonly preferred: string, public readonly legacy: string) {
     }
@@ -23,4 +24,14 @@ export class WidgetType {
     public matches(type: string): boolean {
         return type === this.preferred || type === this.legacy;
     }
+
+    static fromString(type: string): WidgetType {
+        // First try and match it against something we're already aware of
+        const known = Object.values(WidgetType).filter(v => v instanceof WidgetType);
+        const knownMatch = known.find(w => w.matches(type));
+        if (knownMatch) return knownMatch;
+
+        // If that fails, invent a new widget type
+        return new WidgetType(type, type);
+    }
 }

From 0153f39c10bedae25cd04abd74ffa0406ccb07dd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Apr 2020 22:55:28 +0100
Subject: [PATCH 2063/3235] Rageshake, remind user of unsupported browser and
 report missing features in report

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/BugReportDialog.js | 8 ++++++++
 src/rageshake/submit-rageshake.js               | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 6e337d53dc..2f7ad4163d 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -137,12 +137,20 @@ export default class BugReportDialog extends React.Component {
             );
         }
 
+        let warning;
+        if (window.Modernizr && Object.values(window.Modernizr).some(support => support === false)) {
+            warning = <p><b>
+                { _t("Your browser is unsupported, you accepted that things may not work.") }
+            </b></p>;
+        }
+
         return (
             <BaseDialog className="mx_BugReportDialog" onFinished={this._onCancel}
                     title={_t('Submit debug logs')}
                 contentId='mx_Dialog_content'
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
+                    { warning }
                     <p>
                         { _t(
                             "Debug logs contain application usage data including your " +
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 00ef87f89c..2c529ea0b9 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -136,6 +136,13 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         } catch (e) {}
     }
 
+    if (window.Modernizr) {
+        const missingFeatures = Object.keys(window.Modernizr).filter(key => window.Modernizr[key] === false);
+        if (missingFeatures.length > 0) {
+            body.append("modernizr_missing_features", missingFeatures.join(", "));
+        }
+    }
+
     if (opts.sendLogs) {
         progressCallback(_t("Collecting logs"));
         const logs = await rageshake.getLogsForReport();

From 0165ff0bc9b2c9c44a400f72d1c1ab1fb7ab574b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 16:02:49 -0600
Subject: [PATCH 2064/3235] Allow iframes and Jitsi URLs in /addwidget

Fixes https://github.com/vector-im/riot-web/issues/12784
---
 package.json          |   1 +
 src/SlashCommands.tsx |  44 ++++++++--
 src/widgets/Jitsi.ts  |  22 +++++
 yarn.lock             | 200 ++++--------------------------------------
 4 files changed, 78 insertions(+), 189 deletions(-)

diff --git a/package.json b/package.json
index 616f3f541e..2bf2b7c5a9 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
+    "parse5": "^5.1.1",
     "png-chunks-extract": "^1.0.0",
     "project-name-generator": "^2.1.7",
     "prop-types": "^15.5.8",
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 0afea63a78..ff9ebbc70a 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -36,6 +36,8 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/I
 import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
 import {inviteUsersToRoom} from "./RoomInvite";
 import { WidgetType } from "./widgets/WidgetType";
+import { Jitsi } from "./widgets/Jitsi";
+import { parseFragment as parseHtml } from "parse5";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -765,18 +767,50 @@ export const Commands = [
     }),
     new Command({
         command: 'addwidget',
-        args: '<url>',
+        args: '<url | embed code | jitsi url>',
         description: _td('Adds a custom widget by URL to the room'),
-        runFn: function(roomId, args) {
-            if (!args || (!args.startsWith("https://") && !args.startsWith("http://"))) {
+        runFn: function(roomId, widgetUrl) {
+            if (!widgetUrl) {
+                return reject(_t("Please supply a widget URL or embed code"));
+            }
+
+            // Try and parse out a widget URL from iframes
+            if (widgetUrl.toLowerCase().startsWith("<iframe ")) {
+                // We use parse5, which doesn't render/create a DOM node. It instead runs
+                // some superfast regex over the text so we don't have to.
+                const embed = parseHtml(widgetUrl);
+                if (embed && embed.childNodes && embed.childNodes.length === 1) {
+                    const iframe = embed.childNodes[0];
+                    if (iframe.tagName.toLowerCase() === 'iframe' && iframe.attrs) {
+                        const srcAttr = iframe.attrs.find(a => a.name === 'src');
+                        console.log("Pulling URL out of iframe (embed code)");
+                        widgetUrl = srcAttr.value;
+                    }
+                }
+            }
+
+            if (!widgetUrl.startsWith("https://") && !widgetUrl.startsWith("http://")) {
                 return reject(_t("Please supply a https:// or http:// widget URL"));
             }
             if (WidgetUtils.canUserModifyWidgets(roomId)) {
                 const userId = MatrixClientPeg.get().getUserId();
                 const nowMs = (new Date()).getTime();
                 const widgetId = encodeURIComponent(`${roomId}_${userId}_${nowMs}`);
-                return success(WidgetUtils.setRoomWidget(
-                    roomId, widgetId, WidgetType.CUSTOM, args, "Custom Widget", {}));
+                let type = WidgetType.CUSTOM;
+                let name = "Custom Widget";
+                let data = {};
+
+                // Make the widget a Jitsi widget if it looks like a Jitsi widget
+                const jitsiData = Jitsi.getInstance().parsePreferredConferenceUrl(widgetUrl);
+                if (jitsiData) {
+                    console.log("Making /addwidget widget a Jitsi conference");
+                    type = WidgetType.JITSI;
+                    name = "Jitsi Conference";
+                    data = jitsiData;
+                    widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
+                }
+
+                return success(WidgetUtils.setRoomWidget(roomId, widgetId, type, widgetUrl, name, data));
             } else {
                 return reject(_t("You cannot modify widgets in this room."));
             }
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
index 988131e045..15df4953aa 100644
--- a/src/widgets/Jitsi.ts
+++ b/src/widgets/Jitsi.ts
@@ -21,6 +21,12 @@ import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
 const JITSI_WK_PROPERTY = "im.vector.riot.jitsi";
 const JITSI_WK_CHECK_INTERVAL = 2 * 60 * 60 * 1000; // 2 hours, arbitrarily selected
 
+export interface JitsiWidgetData {
+    conferenceId: string;
+    isAudioOnly: boolean;
+    domain: string;
+}
+
 export class Jitsi {
     private static instance: Jitsi;
 
@@ -64,6 +70,22 @@ export class Jitsi {
         console.log("Jitsi conference domain:", this.preferredDomain);
     }
 
+    /**
+     * Parses the given URL into the data needed for a Jitsi widget, if the widget
+     * URL matches the preferredDomain for the app.
+     * @param {string} url The URL to parse.
+     * @returns {JitsiWidgetData} The widget data if eligible, otherwise null.
+     */
+    public parsePreferredConferenceUrl(url: string): JitsiWidgetData {
+        const parsed = new URL(url);
+        if (parsed.hostname !== this.preferredDomain) return null; // invalid
+        return {
+            conferenceId: parsed.pathname,
+            domain: parsed.hostname,
+            isAudioOnly: false,
+        };
+    }
+
     public static getInstance(): Jitsi {
         if (!Jitsi.instance) {
             Jitsi.instance = new Jitsi();
diff --git a/yarn.lock b/yarn.lock
index 538a049bff..dfa0476a2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1496,11 +1496,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1634,19 +1629,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2553,11 +2540,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2803,7 +2785,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2879,11 +2861,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2897,11 +2874,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3916,13 +3888,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3985,20 +3950,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -4196,11 +4147,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4388,7 +4334,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4405,13 +4351,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5975,21 +5914,6 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6014,7 +5938,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
+mkdirp@^0.5.1, mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -6091,15 +6015,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6177,35 +6092,11 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.53:
   version "1.1.53"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
   integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6238,27 +6129,6 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6266,16 +6136,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6425,11 +6285,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6439,19 +6294,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6594,6 +6441,11 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "*"
 
+parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -7096,7 +6948,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7254,7 +7106,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7614,7 +7466,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7776,7 +7628,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8112,7 +7964,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8393,19 +8245,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -9128,13 +8967,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9219,7 +9051,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From b518fdd8ee04b09529a8aa150a8feaeff68fee33 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 16:05:31 -0600
Subject: [PATCH 2065/3235] i18n

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 067d5d8eee..88d0215fef 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -199,6 +199,7 @@
     "Deops user with given id": "Deops user with given id",
     "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Adds a custom widget by URL to the room": "Adds a custom widget by URL to the room",
+    "Please supply a widget URL or embed code": "Please supply a widget URL or embed code",
     "Please supply a https:// or http:// widget URL": "Please supply a https:// or http:// widget URL",
     "You cannot modify widgets in this room.": "You cannot modify widgets in this room.",
     "Verifies a user, session, and pubkey tuple": "Verifies a user, session, and pubkey tuple",

From 879b4e15e56aa54e621c069282e19162e9631578 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 9 Apr 2020 16:18:12 -0600
Subject: [PATCH 2066/3235] Use singular text on 'delete sessions' button for
 SSO

Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357

Not a release blocker at this time.
---
 src/components/views/settings/DevicesPanel.js | 2 +-
 src/i18n/strings/en_EN.json                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index e097ef9e47..fe4a4abfdc 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -139,7 +139,7 @@ export default class DevicesPanel extends React.Component {
                     body: _t("Click the button below to confirm deleting these sessions.", {
                         count: numDevices,
                     }),
-                    continueText: _t("Delete sessions"),
+                    continueText: _t("Delete sessions", {count: numDevices}),
                     continueKind: "danger",
                 },
             };
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 067d5d8eee..ae8ed90402 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -618,7 +618,8 @@
     "Confirm deleting these sessions": "Confirm deleting these sessions",
     "Click the button below to confirm deleting these sessions.|other": "Click the button below to confirm deleting these sessions.",
     "Click the button below to confirm deleting these sessions.|one": "Click the button below to confirm deleting this session.",
-    "Delete sessions": "Delete sessions",
+    "Delete sessions|other": "Delete sessions",
+    "Delete sessions|one": "Delete session",
     "Authentication": "Authentication",
     "Delete %(count)s sessions|other": "Delete %(count)s sessions",
     "Delete %(count)s sessions|one": "Delete %(count)s session",

From 6b69e932864eaefd4aa34713b2bf9643070fde9c Mon Sep 17 00:00:00 2001
From: MorbidMind <milosz.janas@protonmail.ch>
Date: Thu, 9 Apr 2020 21:27:27 +0000
Subject: [PATCH 2067/3235] Translated using Weblate (Polish)

Currently translated at 64.4% (1470 of 2284 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 d71013d999..6b5526c1d9 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1179,7 +1179,7 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
     "Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
-    "Your Riot is misconfigured": "Twój Riot jest źle skonfigurowany",
+    "Your Riot is misconfigured": " Twój Riot jest źle skonfigurowany",
     "Unexpected error resolving homeserver configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera domowego",
     "Unexpected error resolving identity server configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera tożsamości",
     "User %(userId)s is already in the room": "Użytkownik %(userId)s jest już w pokoju",

From 4289413a3cf53c23926b7eb7494f4b5207ee944a Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 9 Apr 2020 22:24:02 +0000
Subject: [PATCH 2068/3235] Translated using Weblate (Polish)

Currently translated at 64.4% (1470 of 2284 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 | 84 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 6b5526c1d9..629d30bdac 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1413,5 +1413,87 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Spacja",
-    "End": "End"
+    "End": "End",
+    "Confirm": "Potwierdź",
+    "Sign In or Create Account": "Zaloguj się lub utwórz konto",
+    "Use your account or create a new one to continue.": "Użyj konta lub utwórz nowe, aby kontynuować.",
+    "No sessions with registered encryption keys": "Brak sesji z zarejestrowanymi kluczami szyfrującymi",
+    "No": "Nie",
+    "Yes": "Tak",
+    "React": "Zareaguj",
+    "Edited at %(date)s. Click to view edits.": "Edytowano w %(date)s. Kliknij, aby zobaczyć zmiany.",
+    "Frequently Used": "Często używane",
+    "Smileys & People": "Buźki i osoby",
+    "Animals & Nature": "Zwierzęta i natura",
+    "Food & Drink": "Żywność i napoje",
+    "Activities": "Aktywności",
+    "Travel & Places": "Podróże i miejsca",
+    "Objects": "Przedmioty",
+    "Symbols": "Symbole",
+    "Flags": "Flagi",
+    "Looks good": "Wygląda dobrze",
+    "All rooms": "Wszystkie pokoje",
+    "Your server": "Twój serwer",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Czy na pewno chcesz usunąć <b>%(serverName)s</b>",
+    "Remove server": "Usuń serwer",
+    "Matrix": "Matrix",
+    "Add a new server": "Dodaj nowy serwer",
+    "Enter the name of a new server you want to explore.": "Wpisz nazwę nowego serwera, którego chcesz przeglądać.",
+    "Server name": "Nazwa serwera",
+    "Add a new server...": "Dodaj nowy serwer…",
+    "Please enter a name for the room": "Proszę podać nazwę pokoju",
+    "Set a room alias to easily share your room with other people.": "Ustaw alias pokoju, aby łatwo udostępniać swój pokój innym osobom.",
+    "This room is private, and can only be joined by invitation.": "Ten pokój jest prywatny i można do niego dołączyć tylko za zaproszeniem.",
+    "Enable end-to-end encryption": "Włącz szyfrowanie end-to-end",
+    "Create a public room": "Utwórz publiczny pokój",
+    "Create a private room": "Utwórz prywatny pokój",
+    "Topic (optional)": "Temat (opcjonalnie)",
+    "Make this room public": "Upublicznij ten pokój.",
+    "Hide advanced": "Ukryj zaawansowane",
+    "Show advanced": "Pokaż zaawansowane",
+    "Recent Conversations": "Najnowsze rozmowy",
+    "Suggestions": "Propozycje",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Rozpocznij rozmowę z kimś, kto używa swojej nazwy, nazwy użytkownika (jak <userId/>) lub adresu e-mail.",
+    "Your password": "Twoje hasło",
+    "Upload files (%(current)s of %(total)s)": "Prześlij pliki (%(current)s z %(total)s)",
+    "Upload files": "Prześlij pliki",
+    "Upload all": "Prześlij wszystko",
+    "Cancel All": "Anuluj wszystko",
+    "Resend edit": "Wyślij ponownie edycję",
+    "Share Permalink": "Udostępnij odnośnik bezpośredni",
+    "Report Content": "Zgłoś treść",
+    "Notification settings": "Ustawienia powiadomień",
+    "Clear status": "Wyczyść status",
+    "Update status": "Zaktualizuj status",
+    "Set status": "Ustaw status",
+    "Set a new status...": "Ustaw nowy status…",
+    "Hide": "Ukryj",
+    "Take picture": "Zrób zdjęcie",
+    "Remove for everyone": "Usuń dla wszystkich",
+    "Remove for me": "Usuń dla mnie",
+    "User Status": "Status użytkownika",
+    "Server Name": "Nazwa serwera",
+    "The username field must not be blank.": "Pole nazwy użytkownika nie może być puste.",
+    "Username": "Nazwa użytkownika",
+    "Not sure of your password? <a>Set a new one</a>": "Nie jesteś pewien swojego hasła? <a>Ustaw nowe</a>",
+    "Enter password": "Wprowadź hasło",
+    "Password is allowed, but unsafe": "Hasło jest dozwolone, ale niebezpieczne",
+    "Nice, strong password!": "Ładne, silne hasło!",
+    "Enter phone number (required on this homeserver)": "Wprowadź numer telefonu (wymagane na tym serwerze domowym)",
+    "Enter username": "Wprowadź nazwę użytkownika",
+    "Homeserver URL": "Adres URL serwera domowego",
+    "Other servers": "Inne serwery",
+    "Sign in to your Matrix account on <underlinedServerName />": "Zaloguj się do swojego konta Matrix na <underlinedServerName />",
+    "Explore rooms": "Przeglądaj pokoje",
+    "Your profile": "Twój profil",
+    "Your Matrix account on %(serverName)s": "Twoje konto Matrix na %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Twoje konto Matrix na <underlinedServerName />",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "E-mail weryfikacyjny zostanie wysłany do skrzynki odbiorczej w celu potwierdzenia ustawienia nowego hasła.",
+    "Set a new password": "Ustaw nowe hasło",
+    "Go Back": "Wróć",
+    "Forgotten your password?": "Nie pamiętasz hasła?",
+    "Restore": "Przywróć",
+    "Copy": "Kopiuj",
+    "Success!": "Sukces!",
+    "Disable": "Wyłącz"
 }

From 3d7ff5caeff49c051c3674220ea47a0f5aaa9160 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Thu, 9 Apr 2020 21:24:51 +0000
Subject: [PATCH 2069/3235] Translated using Weblate (Russian)

Currently translated at 87.0% (1986 of 2284 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 | 102 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5e98b25ace..a19510917f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1193,7 +1193,7 @@
     "Unable to find a supported verification method.": "Невозможно определить поддерживаемый метод верификации.",
     "Scissors": "Ножницы",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Защищённые сообщения с этим пользователем зашифрованы сквозным шифрованием и недоступны третьим лицам.",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Мы отправили вам сообщение для подтверждения адреса электронной почты. Пожалуйста выполните указания данные в сообщении и нажмите кнопку внизу.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Мы отправили вам сообщение для подтверждения адреса электронной почты. Пожалуйста, следуйте указаниям в сообщении, после чего нажмите кнопку ниже.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Вы уверены? Зашифрованные сообщения будут безвозвратно утеряны при отсутствии соответствующего резервного копирования ваших ключей.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифрованные сообщения защищены сквозным шифрованием. Только вы и ваш собеседник имеете ключи для их расшифровки и чтения.",
     "Unable to load key backup status": "Не удалось получить статус резервного копирования для ключей шифрования",
@@ -1202,11 +1202,11 @@
     "Start using Key Backup": "Использовать резервную копию ключей шифрования",
     "Profile picture": "Аватар",
     "Accept all %(invitedRooms)s invites": "Принять все приглашения (%(invitedRooms)s)",
-    "Missing media permissions, click the button below to request.": "Отсутствует доступ к источнику медиа. Нажмите кнопку ниже чтобы запросить.",
+    "Missing media permissions, click the button below to request.": "Отсутствуют разрешения для доступа к камере/микрофону. Нажмите кнопку ниже, чтобы запросить их.",
     "Request media permissions": "Запросить доступ к медиа носителю",
     "Change room name": "Изменить название комнаты",
     "For help with using Riot, click <a>here</a>.": "Для получения помощи по использованию Riot, нажмите <a>здесь</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Для получения помощи по использованию Riot, нажмите <a>здесь</a> или начните чат с нашим ботом, используюя кнопку ниже.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Для получения помощи по использованию Riot, нажмите <a>здесь</a> или начните чат с нашим ботом с помощью кнопки ниже.",
     "Bug reporting": "Сообщить об ошибке",
     "Open Devtools": "Открыть инструменты разработчика",
     "Change room avatar": "Изменить аватар комнаты",
@@ -1728,7 +1728,7 @@
     "Manage integrations": "Управление интеграциями",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
     "Sessions": "Сессии",
-    "Direct Messages": "Прямые сообщения",
+    "Direct Messages": "Диалоги",
     "%(count)s sessions|other": "%(count)s сессий",
     "Hide sessions": "Скрытые сессии",
     "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
@@ -1934,5 +1934,97 @@
     "Cancel autocomplete": "Отменить автодополнение",
     "Esc": "",
     "Enter": "Enter",
-    "Delete %(count)s sessions|one": "Удалить %(count)s сессий"
+    "Delete %(count)s sessions|one": "Удалить %(count)s сессий",
+    "Use Single Sign On to continue": "Воспользуйтесь единой точкой входа для продолжения",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Подтвердите добавление этого почтового адреса с помощью единой точки входа.",
+    "Single Sign On": "Единая точка входа",
+    "Confirm adding email": "Подтвердите добавление почтового адреса",
+    "Click the button below to confirm adding this email address.": "Нажмите кнопку ниже для подтверждения этого почтового адреса.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Подтвердите добавление этого номера телефона с помощью единой точки входа.",
+    "Confirm adding phone number": "Подтвердите добавление номера телефона",
+    "Click the button below to confirm adding this phone number.": "Нажмите кнопку ниже для добавления этого номера телефона.",
+    "%(name)s is requesting verification": "%(name)s запрашивает проверку",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Убедитесь, что смайлики ниже отображаются в обеих сессиях в том же порядке:",
+    "Verify this session by confirming the following number appears on its screen.": "Подтвердите эту сессию, убедившись, что следующее число отображается на экране.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ожидание других ваших сессий, %(deviceName)s %(deviceId)s, для подтверждения…",
+    "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашего аккаунта есть кросс-подпись в хранилище секретов, но она пока не является доверенной в этой сессии.",
+    "Bootstrap cross-signing and secret storage": "Инициализировать кросс-подпись и хранилище секретов",
+    "well formed": "корректный",
+    "unexpected type": "непредвиденный тип",
+    "Self signing private key:": "Самоподписанный приватный ключ:",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Подтвердите удаление этих сессий с помощью единой точки входа.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Подтвердите удаление этой сессии с помощью единой точки входа.",
+    "Confirm deleting these sessions": "Подтвердите удаление этих сессий",
+    "Click the button below to confirm deleting these sessions.|other": "Нажмите кнопку ниже для удаления этих сессий.",
+    "Click the button below to confirm deleting these sessions.|one": "Нажмите кнопку ниже для удаления этой сессии.",
+    "Delete sessions": "Удалить сессии",
+    "rooms.": "комнаты.",
+    "Manage": "Управление",
+    "Custom theme URL": "Ссылка на стороннюю тему",
+    "⚠ These settings are meant for advanced users.": "⚠ Эти настройки рассчитаны для опытных пользователей.",
+    "Personal ban list": "Личный список игнора",
+    "eg: @bot:* or example.org": "например: @bot:* или example.org",
+    "Session ID:": "ID сессии:",
+    "Session key:": "Ключ сессии:",
+    "Message search": "Поиск по сообщениям",
+    "Cross-signing": "Кросс-подпись",
+    "Bridges": "Мосты",
+    "This user has not verified all of their sessions.": "Этот пользователь не подтвердил все свои сессии.",
+    "You have not verified this user.": "Вы не подтвердили этого пользователя.",
+    "You have verified this user. This user has verified all of their sessions.": "Вы подтвердили этого пользователя. Пользователь подтвердил все свои сессии.",
+    "Someone is using an unknown session": "Кто-то использует неизвестную сессию",
+    "This room is end-to-end encrypted": "Эта комната зашифрована сквозным шифрованием",
+    "Everyone in this room is verified": "Все в этой комнате подтверждены",
+    "Some sessions for this user are not trusted": "К некоторым сессиям этого пользователя нет доверия",
+    "All sessions for this user are trusted": "Все сессии этого пользователя доверенные",
+    "Some sessions in this encrypted room are not trusted": "К некоторым сессиям в этой зашифрованной комнате нет доверия",
+    "All sessions in this encrypted room are trusted": "Все сессии в этой зашифрованной комнате доверенные",
+    "Mod": "Модератор",
+    "This message cannot be decrypted": "Не удалось расшифровать это сообщение",
+    "Encrypted by an unverified session": "Зашифровано неподтверждённой сессией",
+    "Unencrypted": "Не зашифровано",
+    "Encrypted by a deleted session": "Зашифровано удалённой сессией",
+    "Invite only": "Только по приглашениям",
+    "Scroll to most recent messages": "Перейти к последним сообщениям",
+    "Close preview": "Закрыть предпросмотр",
+    "Send a reply…": "Отправить ответ…",
+    "Send a message…": "Отправить сообщение…",
+    "<userName/> wants to chat": "<userName/> хочет поговорить",
+    "Start chatting": "Начать беседу",
+    "Reject & Ignore user": "Отклонить и заигнорить пользователя",
+    "Unknown Command": "Неизвестная команда",
+    "Unrecognised command: %(commandText)s": "Нераспознанная команда: %(commandText)s",
+    "Send as message": "Отправить как сообщение",
+    "Failed to connect to integration manager": "Не удалось подключиться к менеджеру интеграций",
+    "Mark all as read": "Отметить всё как прочитанное",
+    "You don't have permission to delete the alias.": "У вас нет прав для удаления этого псевдонима.",
+    "Local address": "Локальный адрес",
+    "Published Addresses": "Публичные адреса",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Публичные адреса позволяют кому угодно зайти в вашу комнату с любого сервера. Чтобы опубликовать адрес, сначала задайте его в качестве локального адреса.",
+    "Other published addresses:": "Прочие публичные адреса:",
+    "No other published addresses yet, add one below": "Пока нет других публичных адресов, добавьте их ниже",
+    "New published address (e.g. #alias:server)": "Новый публичный адрес (напр. #alias:server)",
+    "Local Addresses": "Локальные адреса",
+    "Waiting for you to accept on your other session…": "Ожидание принятия в другой вашей сессии…",
+    "Waiting for %(displayName)s to accept…": "Ожидание принятия от %(displayName)s…",
+    "Accepting…": "Принятие…",
+    "Start Verification": "Начать проверку",
+    "Messages in this room are end-to-end encrypted.": "Сообщения в этой комнате зашифрованы сквозным шифрованием.",
+    "Verify User": "Подтвердить пользователя",
+    "Your messages are not secure": "Ваши сообщения не защищены",
+    "Your homeserver": "Ваш домашний сервер",
+    "The homeserver the user you’re verifying is connected to": "Домашний сервер пользователя, которого вы подтверждаете",
+    "Trusted": "Доверенный",
+    "Not trusted": "Не доверенный",
+    "%(count)s verified sessions|other": "%(count)s подтверждённых сессий",
+    "%(count)s verified sessions|one": "1 подтверждённая сессия",
+    "Hide verified sessions": "Скрыть подтверждённые сессии",
+    "%(count)s sessions|one": "%(count)s сессия",
+    "Direct message": "Начать диалог",
+    "Verification timed out.": "Таймаут подтверждения.",
+    "You cancelled verification on your other session.": "Вы отменили подтверждение в другой вашей сессии.",
+    "You cancelled verification.": "Вы отменили подтверждение.",
+    "Verification cancelled": "Подтверждение отменено",
+    "Encryption enabled": "Шифрование включено"
 }

From 740b6f6cac91d3beff5658b1411b33311e68e947 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 10 Apr 2020 09:30:19 +0100
Subject: [PATCH 2070/3235] Composer pills respect showPillAvatar setting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/rooms/_BasicMessageComposer.scss    | 42 ++++++++++---------
 .../views/rooms/BasicMessageComposer.js       | 28 +++++++++----
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index cc76623a8c..e9013eb7b7 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -44,27 +44,29 @@ limitations under the License.
         outline: none;
         overflow-x: hidden;
 
-        span.mx_UserPill, span.mx_RoomPill {
-            padding-left: 21px;
-            position: relative;
+        &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
+            span.mx_UserPill, span.mx_RoomPill {
+                padding-left: 21px;
+                position: relative;
 
-            // avatar psuedo element
-            &::before {
-                position: absolute;
-                left: 2px;
-                top: 2px;
-                content: var(--avatar-letter);
-                width: 16px;
-                height: 16px;
-                background: var(--avatar-background), $avatar-bg-color;
-                color: $avatar-initial-color;
-                background-repeat: no-repeat;
-                background-size: 16px;
-                border-radius: 8px;
-                text-align: center;
-                font-weight: normal;
-                line-height: $font-16px;
-                font-size: $font-10-4px;
+                // avatar psuedo element
+                &::before {
+                    position: absolute;
+                    left: 2px;
+                    top: 2px;
+                    content: var(--avatar-letter);
+                    width: 16px;
+                    height: 16px;
+                    background: var(--avatar-background), $avatar-bg-color;
+                    color: $avatar-initial-color;
+                    background-repeat: no-repeat;
+                    background-size: 16px;
+                    border-radius: 8px;
+                    text-align: center;
+                    font-weight: normal;
+                    line-height: $font-16px;
+                    font-size: $font-10-4px;
+                }
             }
         }
     }
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e3cffd59f8..880bc352de 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -84,6 +84,7 @@ export default class BasicMessageEditor extends React.Component {
         super(props);
         this.state = {
             autoComplete: null,
+            showPillAvatar: SettingsStore.getValue("Pill.shouldShowPillAvatar"),
         };
         this._editorRef = null;
         this._autocompleteRef = null;
@@ -92,6 +93,7 @@ export default class BasicMessageEditor extends React.Component {
         this._isIMEComposing = false;
         this._hasTextSelected = false;
         this._emoticonSettingHandle = null;
+        this._shouldShowPillAvatarSettingHandle = null;
     }
 
     componentDidUpdate(prevProps) {
@@ -508,10 +510,15 @@ export default class BasicMessageEditor extends React.Component {
         this.setState({completionIndex});
     }
 
-    _configureEmoticonAutoReplace() {
+    _configureEmoticonAutoReplace = () => {
         const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
         this.props.model.setTransformCallback(shouldReplace ? this._replaceEmoticon : null);
-    }
+    };
+
+    _configureShouldShowPillAvatar = () => {
+        const showPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
+        this.setState({ showPillAvatar });
+    };
 
     componentWillUnmount() {
         document.removeEventListener("selectionchange", this._onSelectionChange);
@@ -519,15 +526,17 @@ export default class BasicMessageEditor extends React.Component {
         this._editorRef.removeEventListener("compositionstart", this._onCompositionStart, true);
         this._editorRef.removeEventListener("compositionend", this._onCompositionEnd, true);
         SettingsStore.unwatchSetting(this._emoticonSettingHandle);
+        SettingsStore.unwatchSetting(this._shouldShowPillAvatarSettingHandle);
     }
 
     componentDidMount() {
         const model = this.props.model;
         model.setUpdateCallback(this._updateEditorState);
-        this._emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null, () => {
-            this._configureEmoticonAutoReplace();
-        });
+        this._emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null,
+            this._configureEmoticonAutoReplace);
         this._configureEmoticonAutoReplace();
+        this._shouldShowPillAvatarSettingHandle = SettingsStore.watchSetting("Pill.shouldShowPillAvatar", null,
+            this._configureShouldShowPillAvatar);
         const partCreator = model.partCreator;
         // TODO: does this allow us to get rid of EditorStateTransfer?
         // not really, but we could not serialize the parts, and just change the autoCompleter
@@ -605,9 +614,12 @@ export default class BasicMessageEditor extends React.Component {
                 />
             </div>);
         }
-        const classes = classNames("mx_BasicMessageComposer", {
+        const wrapperClasses = classNames("mx_BasicMessageComposer", {
             "mx_BasicMessageComposer_input_error": this.state.showVisualBell,
         });
+        const classes = classNames("mx_BasicMessageComposer_input", {
+            "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar,
+        });
 
         const MessageComposerFormatBar = sdk.getComponent('rooms.MessageComposerFormatBar');
         const shortcuts = {
@@ -618,11 +630,11 @@ export default class BasicMessageEditor extends React.Component {
 
         const {completionIndex} = this.state;
 
-        return (<div className={classes}>
+        return (<div className={wrapperClasses}>
             { autoComplete }
             <MessageComposerFormatBar ref={ref => this._formatBarRef = ref} onAction={this._onFormatAction} shortcuts={shortcuts} />
             <div
-                className="mx_BasicMessageComposer_input"
+                className={classes}
                 contentEditable="true"
                 tabIndex="0"
                 onBlur={this._onBlur}

From f91565c231278bbf510bcd33ac9ffded38983987 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 10 Apr 2020 13:33:57 +0100
Subject: [PATCH 2071/3235] only append crypto details if crypto is enabled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/rageshake/submit-rageshake.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 2c529ea0b9..55c89427c5 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -96,12 +96,14 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         body.append('device_id', client.deviceId);
     }
 
-    const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
-    if (client.getDeviceCurve25519Key) {
-        keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+    if (client.isCryptoEnabled()) {
+        const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+        if (client.getDeviceCurve25519Key) {
+            keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+        }
+        body.append('device_keys', keys.join(', '));
+        body.append('cross_signing_key', client.getCrossSigningId());
     }
-    body.append('device_keys', keys.join(', '));
-    body.append('cross_signing_key', client.getCrossSigningId());
 
     if (opts.label) {
         body.append('label', opts.label);

From caf0b25bd0346ff5dcbd8f899b1badc2352133e7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 10 Apr 2020 13:59:01 +0100
Subject: [PATCH 2072/3235] Only send typing notification when composing
 commands which send messages

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx                         | 27 +++++++++++--------
 .../views/rooms/BasicMessageComposer.js       | 12 ++++++++-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index d60434cf97..aac42b6740 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -914,7 +914,7 @@ export const Commands = [
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
     new Command({
-        command: 'me',
+        command: "me",
         args: '<message>',
         description: _td('Displays action'),
         category: CommandCategories.messages,
@@ -931,16 +931,7 @@ Commands.forEach(cmd => {
     });
 });
 
-
-/**
- * Process the given text for /commands and return a bound method to perform them.
- * @param {string} roomId The room in which the command was performed.
- * @param {string} input The raw text input by the user.
- * @return {null|function(): Object} Function returning an object with the property 'error' if there was an error
- * processing the command, or 'promise' if a request was sent out.
- * Returns null if the input didn't match a command.
- */
-export function getCommand(roomId, input) {
+export function parseCommandString(input) {
     // trim any trailing whitespace, as it can confuse the parser for
     // IRC-style commands
     input = input.replace(/\s+$/, '');
@@ -956,6 +947,20 @@ export function getCommand(roomId, input) {
         cmd = input;
     }
 
+    return {cmd, args};
+}
+
+/**
+ * Process the given text for /commands and return a bound method to perform them.
+ * @param {string} roomId The room in which the command was performed.
+ * @param {string} input The raw text input by the user.
+ * @return {null|function(): Object} Function returning an object with the property 'error' if there was an error
+ * processing the command, or 'promise' if a request was sent out.
+ * Returns null if the input didn't match a command.
+ */
+export function getCommand(roomId, input) {
+    const {cmd, args} = parseCommandString(input);
+
     if (CommandMap.has(cmd)) {
         return () => CommandMap.get(cmd).run(roomId, args, cmd);
     }
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index e3cffd59f8..bbfc2780e8 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -39,6 +39,7 @@ import EMOTICON_REGEX from 'emojibase-regex/emoticon';
 import * as sdk from '../../../index';
 import {Key} from "../../../Keyboard";
 import {EMOTICON_TO_EMOJI} from "../../../emoji";
+import {CommandCategories, CommandMap, parseCommandString} from "../../../SlashCommands";
 
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
 
@@ -162,7 +163,16 @@ export default class BasicMessageEditor extends React.Component {
         }
         this.setState({autoComplete: this.props.model.autoComplete});
         this.historyManager.tryPush(this.props.model, selection, inputType, diff);
-        TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, !this.props.model.isEmpty);
+
+        let isTyping = !this.props.model.isEmpty;
+        // If the user is entering a command, only consider them typing if it is one which sends a message into the room
+        if (isTyping && this.props.model.parts[0].type === "command") {
+            const {cmd} = parseCommandString(this.props.model.parts[0].text);
+            if (CommandMap.get(cmd).category !== CommandCategories.messages) {
+                isTyping = false;
+            }
+        }
+        TypingStore.sharedInstance().setSelfTyping(this.props.room.roomId, isTyping);
 
         if (this.props.onChange) {
             this.props.onChange();

From 22558f090de18599cdac83d8ff3d19fa6498f22a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 10 Apr 2020 15:38:17 +0100
Subject: [PATCH 2073/3235] Reverse order of they match/they don't match
 buttons

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/verification/VerificationShowSas.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 5fd0dca267..0a8947f2c2 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -132,12 +132,12 @@ export default class VerificationShowSas extends React.Component {
             />;
         } else {
             confirm = <React.Fragment>
-                <AccessibleButton onClick={this.onMatchClick} kind="primary">
-                    { _t("They match") }
-                </AccessibleButton>
                 <AccessibleButton onClick={this.onDontMatchClick} kind="danger">
                     { _t("They don't match") }
                 </AccessibleButton>
+                <AccessibleButton onClick={this.onMatchClick} kind="primary">
+                    { _t("They match") }
+                </AccessibleButton>
             </React.Fragment>;
         }
 

From fb837fb962142ca9cb06c706702c0729e28ea985 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 10 Apr 2020 01:37:22 +0000
Subject: [PATCH 2074/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2285 of 2285 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 668e3ed158..a731e62af2 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2353,5 +2353,9 @@
     "Confirm account deactivation": "確認停用帳號",
     "Server did not require any authentication": "伺服器不需要任何驗證",
     "Server did not return valid authentication information.": "伺服器沒有回傳有效的驗證資訊。",
-    "There was a problem communicating with the server. Please try again.": "與伺服器通訊時發生問題。請再試一次。"
+    "There was a problem communicating with the server. Please try again.": "與伺服器通訊時發生問題。請再試一次。",
+    "Delete sessions|other": "刪除工作階段",
+    "Delete sessions|one": "刪除工作階段",
+    "Enable end-to-end encryption": "啟用端到端加密",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "您無法在稍後停用此功能。橋接與大多數機器人也尚無法運作。"
 }

From 60bf43b6dc17f4f3e26eaca3e0967aaeab8f71e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 10 Apr 2020 07:01:03 +0000
Subject: [PATCH 2075/3235] Translated using Weblate (French)

Currently translated at 100.0% (2285 of 2285 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 ea885c6202..677c48a2dc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2354,5 +2354,9 @@
     "Confirm account deactivation": "Confirmez la désactivation de votre compte",
     "Server did not require any authentication": "Le serveur n’a pas demandé d’authentification",
     "Server did not return valid authentication information.": "Le serveur n’a pas renvoyé des informations d’authentification valides.",
-    "There was a problem communicating with the server. Please try again.": "Un problème est survenu en essayant de communiquer avec le serveur. Veuillez réessayer."
+    "There was a problem communicating with the server. Please try again.": "Un problème est survenu en essayant de communiquer avec le serveur. Veuillez réessayer.",
+    "Delete sessions|other": "Supprimer les sessions",
+    "Delete sessions|one": "Supprimer la session",
+    "Enable end-to-end encryption": "Activer le chiffrement de bout en bout",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Vous ne pourrez pas le désactiver plus tard. Les passerelles et la plupart des bots ne fonctionneront pas pour le moment."
 }

From b7fdaf31f6e6c96e830c3b99822920a4dc6176b8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 10 Apr 2020 13:09:48 +0000
Subject: [PATCH 2076/3235] Translated using Weblate (Hungarian)

Currently translated at 99.6% (2275 of 2285 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 | 41 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 68cad86807..f74e9d48fd 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2301,5 +2301,44 @@
     "Enter": "Enter",
     "Space": "Szóköz",
     "End": "End",
-    "Session backup key:": "Munkamenet másolat kulcs:"
+    "Session backup key:": "Munkamenet másolat kulcs:",
+    "Use Single Sign On to continue": "A folytatáshoz használd az egyszeri bejelentkezést (SSO)",
+    "Single Sign On": "Egyszeri bejelentkezés",
+    "%(name)s is requesting verification": "%(name)s ellenőrzést kér",
+    "Sends a message as html, without interpreting it as markdown": "Az üzenet elküldése html szövegként anélkül, hogy „markdown” formázás lenne",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Erősítsd meg, hogy az alábbi emodzsik mindkét munkamenetben azonos sorrendben jelentek meg:",
+    "Verify this session by confirming the following number appears on its screen.": "Ellenőrizd ezt a munkamenetet azzal, hogy megerősíted, hogy az alábbi szám jelent meg a kijelzőjén.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Az ellenőrzéshez a másik munkamenetedre várakozunk, %(deviceName)s (%(deviceId)s)…",
+    "From %(deviceName)s (%(deviceId)s)": "Innen: %(deviceName)s (%(deviceId)s)",
+    "well formed": "helyes formátum",
+    "unexpected type": "váratlan típus",
+    "Confirm deleting these sessions": "Megerősíted ennek a munkamenetnek a törlését",
+    "Click the button below to confirm deleting these sessions.|other": "Ezeknek a munkamenetek törlésének a megerősítéséhez kattints a gombra lent.",
+    "Click the button below to confirm deleting these sessions.|one": "Ennek a munkamenet törlésének a megerősítéséhez kattints a gombra lent.",
+    "Delete sessions|other": "Munkamenetek törlése",
+    "Delete sessions|one": "Munkamenet törlése",
+    "Waiting for you to accept on your other session…": "Az elfogadást várjuk a másik munkamenetedből…",
+    "Almost there! Is your other session showing the same shield?": "Majdnem kész! A másik munkameneted is ugyanazt a pajzsot mutatja?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Majdnem kész! %(displayName)s is ugyanazt a pajzsot mutatja?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Sikeresen ellenőrizted: %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "Ellenőrzés újrakezdése az értesítésből.",
+    "Start verification again from their profile.": "Ellenőrzés újraindítása a profiljából.",
+    "Verification timed out.": "Az ellenőrzés időtúllépés miatt megszakadt.",
+    "You cancelled verification on your other session.": "Az ellenőrzést megszakítottad a másik munkamenetedben.",
+    "%(displayName)s cancelled verification.": "%(displayName)s megszakította az ellenőrzést.",
+    "You cancelled verification.": "Megszakítottad az ellenőrzést.",
+    "Enable end-to-end encryption": "Végpontok közötti titkosítás engedélyezése",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Ezt később nem lehet kikapcsolni. A hidak és a legtöbb bot nem fog működni egyenlőre.",
+    "Confirm account deactivation": "Fiók felfüggesztésének megerősítése",
+    "Server did not require any authentication": "A szerver nem követelt meg semmilyen azonosítást",
+    "Server did not return valid authentication information.": "A szerver semmilyen érvényes azonosítási információt sem küldött vissza.",
+    "There was a problem communicating with the server. Please try again.": "A szerverrel való kommunikációval probléma történt. Kérlek próbáld újra.",
+    "Sign in with SSO": "Belépés SSO-val",
+    "Welcome to %(appName)s": "Üdv itt: %(appName)s",
+    "Liberate your communication": "Szabadítsd fel a kommunikációdat",
+    "Send a Direct Message": "Közvetlen üzenet küldése",
+    "Explore Public Rooms": "Nyilvános szobák felderítése",
+    "Create a Group Chat": "Készíts Csoportos Beszélgetést",
+    "Self-verification request": "Ön ellenőrzés kérése",
+    "Cancel replying to a message": "Üzenet válasz megszakítása"
 }

From f406d4d7da1c7c736b53c3849a6045975a0a29f5 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 9 Apr 2020 22:43:53 +0000
Subject: [PATCH 2077/3235] Translated using Weblate (Polish)

Currently translated at 64.9% (1482 of 2285 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 629d30bdac..183bce6007 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1495,5 +1495,17 @@
     "Restore": "Przywróć",
     "Copy": "Kopiuj",
     "Success!": "Sukces!",
-    "Disable": "Wyłącz"
+    "Disable": "Wyłącz",
+    "Verify": "Weryfikuj",
+    "Manage integrations": "Zarządzaj integracjami",
+    "%(count)s verified sessions|other": "%(count)s zweryfikowanych sesji",
+    "%(count)s verified sessions|one": "1 zweryfikowana sesja",
+    "Hide verified sessions": "Ukryj zweryfikowane sesje",
+    "%(count)s sessions|other": "%(count)s sesji",
+    "%(count)s sessions|one": "%(count)s sesja",
+    "Hide sessions": "Ukryj sesje",
+    "Direct message": "Wiadomość bezpośrednia",
+    "Security": "Bezpieczeństwo",
+    "Integrations are disabled": "Integracje są wyłączone",
+    "Enable 'Manage Integrations' in Settings to do this.": "Włącz „Zarządzaj integracjami” w ustawieniach, aby to zrobić."
 }

From c74d41b1053b9d032be9f9c025a372050c312dda Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 10 Apr 2020 08:32:42 +0000
Subject: [PATCH 2078/3235] Translated using Weblate (Russian)

Currently translated at 87.5% (1999 of 2285 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 | 112 ++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 49 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a19510917f..51b3da7f44 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1,5 +1,5 @@
 {
-    "Account": "Аккаунт",
+    "Account": "Учётная запись",
     "Admin": "Администратор",
     "Advanced": "Подробности",
     "Algorithm": "Алгоритм",
@@ -19,7 +19,7 @@
     "Create Room": "Создать комнату",
     "Cryptography": "Криптография",
     "Curve25519 identity key": "Ключ идентификации Curve25519",
-    "Deactivate Account": "Деактивировать аккаунт",
+    "Deactivate Account": "Деактивировать учётную запись",
     "Decryption error": "Ошибка расшифровки",
     "Default": "По умолчанию",
     "Deops user with given id": "Снимает полномочия оператора с пользователя с заданным ID",
@@ -245,7 +245,7 @@
     "Success": "Успех",
     "This email address is already in use": "Этот email уже используется",
     "This email address was not found": "Этот адрес электронной почты не найден",
-    "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учётной записью.",
+    "The email address linked to your account must be entered.": "Введите адрес электронной почты, связанный с вашей учётной записью.",
     "The remote side failed to pick up": "Собеседник не ответил на ваш звонок",
     "This room has no local addresses": "У этой комнаты нет адресов на вашем сервере",
     "This room is not recognised.": "Эта комната не опознана.",
@@ -383,7 +383,7 @@
     "Username available": "Имя пользователя доступно",
     "Username not available": "Имя пользователя недоступно",
     "Something went wrong!": "Что-то пошло не так!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Это будет имя вашей учётной записи на  <span></span> домашнем сервере, или вы можете выбрать <a>другой сервер</a>.",
+    "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>.",
     "Home": "Начало",
     "Accept": "Принять",
@@ -722,7 +722,7 @@
     "Fetching third party location failed": "Не удалось извлечь местоположение третьей стороны",
     "A new version of Riot is available.": "Доступна новая версия Riot.",
     "I understand the risks and wish to continue": "Я понимаю риски и желаю продолжить",
-    "Send Account Data": "Отправить данные аккаунта",
+    "Send Account Data": "Отправка данных учётной записи",
     "All notifications are currently disabled for all targets.": "Все оповещения для всех устройств отключены.",
     "Uploading report": "Отправка отчета",
     "Sunday": "Воскресенье",
@@ -741,7 +741,7 @@
     "Advanced notification settings": "Дополнительные параметры уведомлений",
     "Failed to send logs: ": "Не удалось отправить журналы: ",
     "delete the alias.": "удалить псевдоним.",
-    "To return to your account in future you need to <u>set a password</u>": "Чтобы вы могли вернуться в свою учётную запись в будущем, вам необходимо <u>задать пароль</u>",
+    "To return to your account in future you need to <u>set a password</u>": "Чтобы вы могли использовать свою учётную запись позже, вам необходимо <u>задать пароль</u>",
     "Forget": "Забыть",
     "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
     "Cancel Sending": "Отменить отправку",
@@ -781,7 +781,7 @@
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
     "Developer Tools": "Инструменты разработчика",
     "Preparing to send logs": "Подготовка к отправке журналов",
-    "Explore Account Data": "Просмотр данных аккаунта",
+    "Explore Account Data": "Просмотр данных учётной записи",
     "All messages (noisy)": "Все сообщения (со звуком)",
     "Saturday": "Суббота",
     "Remember, you can always set an email address in user settings if you change your mind.": "Помните, что вы всегда сможете задать email в настройках пользователя, если передумаете.",
@@ -833,7 +833,7 @@
     "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
     "Mentions only": "Только при упоминаниях",
     "Wednesday": "Среда",
-    "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.": "Теперь вы сможете вернуться к своей учётной записи после выхода и войти на других устройствах.",
     "Enable email notifications": "Включить уведомления на email",
     "Event Type": "Тип мероприятия",
     "Download this file": "Скачать файл",
@@ -859,7 +859,7 @@
     "Clear Storage and Sign Out": "Очистить хранилище и выйти",
     "Refresh": "Обновить",
     "We encountered an error trying to restore your previous session.": "Произошла ошибка при попытке восстановить предыдущий сеанс.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена и зашифрованная история чата станет нечитаемой.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена, и зашифрованная история чата станет нечитаемой.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджетов для поддерживаемых виджетов",
     "Collapse Reply Thread": "Ответить с цитированием",
@@ -869,10 +869,10 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
     "Review terms and conditions": "Просмотр условий и положений",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
-    "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>": "Это навсегда сделает вашу учётную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведёт к тому, что ваша учётная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учётной записи с сервера идентификации. <b>Это действие необратимо.</b>",
+    "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>": "Ваша учётная запись будет заблокирована. Вы не сможете войти в систему, и никто не сможет в дальнейшем заререгистрироваться под этим именем пользователя. В результате ваша учётная запись выйдет из всех комнат, в которых она находится, а с сервера идентификации будут удалены все связанные с ней данные. <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> будущие пользователи увидят неполный вид разговоров)",
+    "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:": "Чтобы продолжить, введите пароль:",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie (ознакомьтесь с нашей<PolicyLink>Политикой cookie</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
@@ -1014,7 +1014,7 @@
     "Phone numbers": "Телефонные номера",
     "Language and region": "Язык и регион",
     "Theme": "Тема",
-    "Account management": "Управление аккаунтом",
+    "Account management": "Управление учётной записью",
     "Deactivating your account is a permanent action - be careful!": "Деактивация вашей учётной записи — это необратимое действие. Будьте осторожны!",
     "Chat with Riot Bot": "Чат с ботом Riot",
     "Help & About": "Помощь & О программе",
@@ -1259,7 +1259,7 @@
     "Modify widgets": "Изменить виджеты",
     "Invite users": "Пригласить пользователей",
     "Kick users": "Выгнать пользователей",
-    "Ban users": "Запрет пользователей",
+    "Ban users": "Блокировка пользователей",
     "Send %(eventType)s events": "Отправить %(eventType)s события",
     "Select the roles required to change various parts of the room": "Выберите роли, которые смогут менять различные параметры комнаты",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "После включения шифрования в комнате оно не может быть отключено. Сообщения, отправленные в шифрованной комнате, смогут прочитать только участники комнаты, но не сервер. Включенное шифрование может помешать корректной работе многим ботам и мостам. <a>Подробнее о шифровании.</a>",
@@ -1274,8 +1274,8 @@
     "Loading …": "Загрузка…",
     "Rejecting invite …": "Отказ от приглашения …",
     "Join the conversation with an account": "Присоединиться к разговору с учётной записью",
-    "Sign Up": "Подписаться",
-    "Sign In": "Войти в систему",
+    "Sign Up": "Зарегистрироваться",
+    "Sign In": "Войти",
     "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны %(memberName)s из %(roomName)s",
     "Reason: %(reason)s": "Причина: %(reason)s",
     "Forget this room": "Забудь эту комнату",
@@ -1329,7 +1329,7 @@
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Если есть дополнительный контекст, который может помочь в анализе проблемы, такой как то, что вы делали в то время, ID комнат, ID пользователей и т. д., пожалуйста, включите эти данные.",
     "Unable to load commit detail: %(msg)s": "Невозможно загрузить детали: %(msg)s",
     "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": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Для этого вам нужно будет вернуться к более новой версии Riot",
-    "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. ": "Ранее вы использовали более новую версию Riot на %(host)s. Чтобы снова использовать эту версию с сквозным шифрованием, вам нужно выйти и снова войти. ",
+    "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. ": "В прошлый раз вы использовали более новую версию Riot на сервере %(host)s. Чтобы снова использовать эту версию со сквозным шифрованием, вам нужно выйти и снова войти. ",
     "Waiting for partner to accept...": "Ожидание подтверждения партнера...",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную проверку. <button> Использовать устаревшую проверку</button>.",
     "Waiting for %(userId)s to confirm...": "Ожидание подтверждения от %(userId)s...",
@@ -1348,7 +1348,7 @@
     "Low bandwidth mode": "Режим низкой пропускной способности",
     "To help us prevent this in future, please <a>send us logs</a>.": "Чтобы помочь нам предотвратить это в будущем, пожалуйста, <a>отправьте нам логи</a>.",
     "Missing session data": "Отсутствуют данные сессии",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Некоторые данные сессии, включая зашифрованные ключи сообщений, отсутствуют. Выйдите и войдите, чтобы исправить ситуацию, восстанавливая ключи из резервной копии.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Отсутствуют некоторые данные сессии, в том числе ключи шифрования сообщений. Выйдите и войдите, чтобы восстановить ключи из резервной копии.",
     "Your browser likely removed this data when running low on disk space.": "Вероятно, ваш браузер удалил эти данные, когда на дисковом пространстве оставалось мало места.",
     "Upload files (%(current)s of %(total)s)": "Загрузка файлов %(current)s от %(total)s",
     "Upload files": "Загрузка файлов",
@@ -1384,15 +1384,15 @@
     "Set a new status...": "Установка нового статуса...",
     "Hide": "Скрыть",
     "This homeserver would like to make sure you are not a robot.": "Этот сервер хотел бы убедиться, что вы не робот.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Пользовательские параметры сервера можно использовать для входа на другие серверы Matrix, указав другой URL-адрес сервера. Это позволяет использовать это приложение с существующей учётной записью Matrix на другом домашнем сервере.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Пользовательские серверные параметры можно использовать для входа на другой сервер Matrix по его адресу. Таким образом, вы сможете использовать это приложение с существующим аккаунтом Matrix на другом домашнем сервере.",
     "Please review and accept all of the homeserver's policies": "Пожалуйста, просмотрите и примите все правила сервера",
     "Please review and accept the policies of this homeserver:": "Пожалуйста, просмотрите и примите политику этого сервера:",
     "Unable to validate homeserver/identity server": "Невозможно проверить сервер/сервер идентификации",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Введите местоположение вашего Modula homeserver. Он может использовать ваше собственное доменное имя или быть поддоменом <a>modular.im</a>.",
-    "Sign in to your Matrix account on %(serverName)s": "Войдите в свою учётную запись Matrix на %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Войдите в свою учётную запись Matrix с помощью <underlinedServerName />",
+    "Sign in to your Matrix account on %(serverName)s": "Вход в учётную запись Matrix на сервере %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Вход в учётную запись Matrix на сервере <underlinedServerName />",
     "Change": "Изменить",
-    "Use an email address to recover your account": "Используйте email, чтобы восстановить свой аккаунт",
+    "Use an email address to recover your account": "Используйте почтовый адрес, чтобы восстановить доступ к учётной записи",
     "Enter email address (required on this homeserver)": "Введите адрес электронной почты (требуется для этого сервера)",
     "Doesn't look like a valid email address": "Не похоже на действительный адрес электронной почты",
     "Enter password": "Введите пароль",
@@ -1406,7 +1406,7 @@
     "Enter username": "Введите имя пользователя",
     "Some characters not allowed": "Некоторые символы не разрешены",
     "Create your Matrix account on %(serverName)s": "Создайте свою учётную запись Matrix на %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Создайте свою учётную запись Matrix на <underlinedServerName />",
+    "Create your Matrix account on <underlinedServerName />": "Создайте учётную запись Matrix на <underlinedServerName />",
     "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам  на крупнейшем общедоступном сервере",
     "Premium hosting for organisations <a>Learn more</a>": "Премиум-хостинг для организаций <a>Подробнее</a>",
     "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать пользовательский сервер",
@@ -1424,8 +1424,8 @@
     "Guest": "Гость",
     "Your profile": "Ваш профиль",
     "Could not load user profile": "Не удалось загрузить профиль пользователя",
-    "Your Matrix account on %(serverName)s": "Ваша учётная запись Matrix на %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Ваша учётная запись Matrix на <underlinedServerName />",
+    "Your Matrix account on %(serverName)s": "Ваша учётная запись Matrix на сервере %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Ваша учётная запись Matrix на сервере <underlinedServerName />",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Письмо с подтверждением будет отправлено на ваш почтовый ящик, чтобы подтвердить установку нового пароля.",
     "Sign in instead": "Войдите, вместо этого",
     "Your password has been reset.": "Ваш пароль был сброшен.",
@@ -1441,7 +1441,7 @@
     "General failure": "Общая ошибка",
     "This homeserver does not support login using email address.": "Этот сервер не поддерживает вход с использованием адреса электронной почты.",
     "Failed to perform homeserver discovery": "Не удалось выполнить обнаружение сервера",
-    "Sign in with single sign-on": "Войдите в систему с единой регистрацией",
+    "Sign in with single sign-on": "Войти в систему с помощью единой точки входа",
     "Create account": "Создать учётную запись",
     "Registration has been disabled on this homeserver.": "Регистрация на этом сервере отключена.",
     "Unable to query for supported registration methods.": "Невозможно запросить поддерживаемые методы регистрации.",
@@ -1472,8 +1472,8 @@
     "Unable to create key backup": "Невозможно создать резервную копию ключа",
     "Retry": "Попробуйте снова",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Без настройки безопасного восстановления сообщений при выходе из системы вы потеряете историю защищенных сообщений.",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не установили новый метод восстановления, злоумышленник может попытаться получить доступ к вашей учётной записи. Измените пароль учётной записи и сразу установите новый способ восстановления в настройках.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не удалили метод восстановления, злоумышленник может попытаться получить доступ к вашей учётной записи. Измените пароль учётной записи и сразу установите новый способ восстановления в настройках.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не задали новый способ восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу же задайте новый способ восстановления в настройках.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Если вы не убрали метод восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу задайте новый способ восстановления в настройках.",
     "Cannot reach homeserver": "Не удаётся связаться с сервером",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Убедитесь, что у вас есть стабильное подключение к интернету, или свяжитесь с администратором сервера",
     "Your Riot is misconfigured": "Ваш Riot неправильно настроен",
@@ -1484,8 +1484,8 @@
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете зарегистрироваться, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете сбросить пароль, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Вы можете войти в систему, но некоторые возможности не будет доступны, пока сервер идентификации не станет доступным. Если вы продолжаете видеть это предупреждение, проверьте вашу конфигурацию или свяжитесь с администратором сервера.",
-    "<a>Log in</a> to your new account.": "<a>Войти</a> в вашу новую учётную запись.",
-    "You can now close this window or <a>log in</a> to your new account.": "Вы можете закрыть это окно или <a>войти</a> в вашу новую учётную запись.",
+    "<a>Log in</a> to your new account.": "<a>Войти</a> в новую учётную запись.",
+    "You can now close this window or <a>log in</a> to your new account.": "Можно закрыть это окно или <a>войти</a> в новую учётную запись.",
     "Registration Successful": "Регистрация успешно завершена",
     "Changes your avatar in all rooms": "Изменяет ваш аватар во всех комнатах",
     "%(senderName)s made no change.": "%(senderName)s не внёс изменений.",
@@ -1513,17 +1513,17 @@
     "Resend edit": "Отправить исправление повторно",
     "Resend %(unsentCount)s reaction(s)": "Отправить повторно %(unsentCount)s реакций",
     "Resend removal": "Отправить удаление повторно",
-    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Ваша новая учётная запись (%(newAccountId)s) зарегистрирована, но Вы уже вошли в другую учётную запись (%(loggedInUserId)s).",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Учётная запись (%(newAccountId)s) зарегистрирована, но вы уже вошли в другую учётную запись (%(loggedInUserId)s).",
     "Continue with previous account": "Продолжить с предыдущей учётной записью",
     "Failed to re-authenticate due to a homeserver problem": "Ошибка повторной аутентификации из-за проблем на сервере",
     "Failed to re-authenticate": "Ошибка повторной аутентификации",
-    "Enter your password to sign in and regain access to your account.": "Введите Ваш пароль для входа и восстановления доступа к Вашей учётной записи.",
+    "Enter your password to sign in and regain access to your account.": "Введите пароль для входа и восстановите доступ к учётной записи.",
     "Forgotten your password?": "Забыли Ваш пароль?",
-    "Sign in and regain access to your account.": "Войти и восстановить доступ к Вашей учётной записи.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Вы не можете войти в Вашу учётную запись. Пожалуйста свяжитесь с администратором вашего сервера для более подробной информации.",
+    "Sign in and regain access to your account.": "Войти и восстановить доступ к учётной записи.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Не удаётся войти в учётную запись. Пожалуйста, обратитесь к администратору домашнего сервера за подробностями.",
     "You're signed out": "Вы вышли из учётной записи",
     "Clear personal data": "Очистить персональные данные",
-    "This account has been deactivated.": "Этот аккаунт был деактивирован.",
+    "This account has been deactivated.": "Эта учётная запись была деактивирована.",
     "Call failed due to misconfigured server": "Вызов не состоялся из-за неправильно настроенного сервера",
     "Try using turn.matrix.org": "Попробуйте использовать turn.matrix.org",
     "Messages": "Сообщения",
@@ -1583,11 +1583,11 @@
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Использование сервера идентификации не обязательно. Если вы решите не использовать сервер идентификации, другие пользователи не смогут обнаружить вас, и вы не сможете пригласить других по электронной почте или телефону.",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Подтвердите условия предоставления услуг сервера идентификации (%(serverName)s), чтобы вас можно было обнаружить по адресу электронной почты или номеру телефона.",
     "Discovery": "Обнаружение",
-    "Deactivate account": "Деактивировать аккаунт",
+    "Deactivate account": "Деактивировать учётную запись",
     "Clear cache and reload": "Очистить кэш и перезагрузить",
     "Always show the window menu bar": "Всегда показывать строку меню",
-    "Read Marker lifetime (ms)": "Читать маркер время жизни (мс)",
-    "Read Marker off-screen lifetime (ms)": "Читать маркер вне экрана время жизни (мс)",
+    "Read Marker lifetime (ms)": "Через какое время помечать сообщение прочитанным (мс)",
+    "Read Marker off-screen lifetime (ms)": "Через какое время помечать сообщение прочитанным при отсутствии активности (мс)",
     "Upgrade the room": "Обновить эту комнату",
     "Enable room encryption": "Включить шифрование комнаты",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Вы должны <b> удалить свои личные данные </b> с сервера идентификации <idserver /> перед отключением. К сожалению, идентификационный сервер <idserver /> в данный момент отключен или недоступен.",
@@ -1651,8 +1651,8 @@
     "Report Content": "Пожаловаться на сообщение",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Деактивация этого пользователя приведет к его выходу из системы и запрету повторного входа. Кроме того, они оставит все комнаты, в которых он участник. Это действие безповоротно. Вы уверены, что хотите деактивировать этого пользователя?",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "При попытке подтвердить приглашение была возвращена ошибка (%(errcode)s). Вы можете попробовать передать эту информацию администратору комнаты.",
-    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Это приглашение в %(roomName)s было отправлено на %(email)s, которое не связано с вашей учетной записью",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Свяжите это письмо с вашей учетной записью в Настройках, чтобы получать приглашения непосредственно в Riot.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Приглашение в %(roomName)s было отправлено на %(email)s, но этот адрес не связан с вашей учётной записью",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Свяжите этот адрес с вашей учетной записью в настройках, чтобы получать приглашения непосредственно в Riot.",
     "This invite to %(roomName)s was sent to %(email)s": "Это приглашение в %(roomName)s было отправлено на %(email)s",
     "Use an identity server in Settings to receive invites directly in Riot.": "Используйте сервер идентификации в Настройках для получения приглашений непосредственно в Riot.",
     "Share this email in Settings to receive invites directly in Riot.": "Введите адрес эл.почты в Настройках, чтобы получать приглашения прямо в Riot.",
@@ -1666,8 +1666,8 @@
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Установка адреса электронной почты для восстановления учетной записи. Используйте электронную почту или телефон, чтобы опционально быть обнаруженными существующими контактами.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Установите адрес электронной почты для восстановления аккаунта. Используйте электронную почту, чтобы опционально быть обнаруженными существующими контактами.",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты или номер телефона.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного домашнего сервера <a> Что это значит? </a>",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного сервера идентификации <a>Что это значит?</a>",
     "%(creator)s created and configured the room.": "%(creator)s создал и настроил комнату.",
@@ -1710,7 +1710,7 @@
     "Custom (%(level)s)": "Пользовательский (%(level)s)",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Попробуйте новые способы игнорировать людей (экспериментальные)",
-    "My Ban List": "Мой список запрещенных",
+    "My Ban List": "Мой список блокировки",
     "Ignored/Blocked": "Игнорируемые/Заблокированные",
     "Error adding ignored user/server": "Ошибка добавления игнорируемого пользователя/сервера",
     "Error subscribing to list": "Ошибка при подписке на список",
@@ -1824,9 +1824,9 @@
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В комнате присутствуют неизвестные сессии: если вы продолжите без подтверждения, возможно, кто-то сможет подслушать ваш звонок.",
     "Review Sessions": "Просмотреть сессии",
     "Unverified login. Was this you?": "Неподтверждённый вход. Это были вы?",
-    "Sign In or Create Account": "Войти или создать аккаунт",
-    "Use your account or create a new one to continue.": "Воспользуйтесь своим аккаунтом или создайте новый, чтобы продолжить.",
-    "Create Account": "Создать аккаунт",
+    "Sign In or Create Account": "Войдите или создайте учётную запись",
+    "Use your account or create a new one to continue.": "Воспользуйтесь своей учётной записью или создайте новую, чтобы продолжить.",
+    "Create Account": "Создать учётную запись",
     "Sends a message as html, without interpreting it as markdown": "Отправить сообщение как html, не интерпретируя его как markdown",
     "Displays information about a user": "Показать информацию о пользователе",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s изменил(а) название комнаты с %(oldRoomName)s на %(newRoomName)s.",
@@ -1880,7 +1880,7 @@
     "User signing private key:": "Приватный ключ подписи пользователей:",
     "Session backup key:": "Резервная копия сессионного ключа:",
     "Secret storage public key:": "Публичный ключ хранилища секретов:",
-    "in account data": "в данных аккаунта",
+    "in account data": "в данных учётной записи",
     "Homeserver feature support:": "Возможности домашнего сервера:",
     "exists": "существует",
     "Secret Storage key format:": "Формат ключа хранилища секретов:",
@@ -1948,7 +1948,7 @@
     "Verify this session by confirming the following number appears on its screen.": "Подтвердите эту сессию, убедившись, что следующее число отображается на экране.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ожидание других ваших сессий, %(deviceName)s %(deviceId)s, для подтверждения…",
     "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашего аккаунта есть кросс-подпись в хранилище секретов, но она пока не является доверенной в этой сессии.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашей учётной записи есть кросс-подпись в хранилище секретов, но она пока не является доверенной в этой сессии.",
     "Bootstrap cross-signing and secret storage": "Инициализировать кросс-подпись и хранилище секретов",
     "well formed": "корректный",
     "unexpected type": "непредвиденный тип",
@@ -1963,7 +1963,7 @@
     "Manage": "Управление",
     "Custom theme URL": "Ссылка на стороннюю тему",
     "⚠ These settings are meant for advanced users.": "⚠ Эти настройки рассчитаны для опытных пользователей.",
-    "Personal ban list": "Личный список игнора",
+    "Personal ban list": "Личный список блокировки",
     "eg: @bot:* or example.org": "например: @bot:* или example.org",
     "Session ID:": "ID сессии:",
     "Session key:": "Ключ сессии:",
@@ -2026,5 +2026,19 @@
     "You cancelled verification on your other session.": "Вы отменили подтверждение в другой вашей сессии.",
     "You cancelled verification.": "Вы отменили подтверждение.",
     "Verification cancelled": "Подтверждение отменено",
-    "Encryption enabled": "Шифрование включено"
+    "Encryption enabled": "Шифрование включено",
+    "Delete sessions|other": "Удалить сессии",
+    "Delete sessions|one": "Удалить сессию",
+    "Please verify the room ID or alias and try again.": "Пожалуйста, проверьте ID комнаты или псевдоним и попробуйте снова.",
+    "Error removing ignored user/server": "Ошибка при удалении игнорируемого пользователя/сервера",
+    "Please try again or view your console for hints.": "Попробуйте снова или посмотрите сообщения в консоли.",
+    "Ban list rules - %(roomName)s": "Правила блокировки -",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Игнорирование людей реализовано через списки правил блокировки. Подписка на список блокировки приведёт к сокрытию от вас пользователей и серверов, которые в нём перечислены.",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш личный список блокировки содержит всех пользователей и серверы, сообщения которых вы не хотите видеть. После внесения туда первого пользователя/сервера в списке комнат появится новая комната 'Мой список блокировки' — не покидайте эту комнату, чтобы список блокировки работал.",
+    "Subscribing to a ban list will cause you to join it!": "При подписке на список блокировки вы присоединитесь к нему!",
+    "Room ID or alias of ban list": "ID комнаты или псевдоним списка блокировки",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Подтвердите удаление учётной записи с помощью единой точки входа.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
+    "Confirm account deactivation": "Подтвердите деактивацию учётной записи",
+    "Your account is not secure": "Ваша учётная запись не в безопасности"
 }

From b7a8ac57d2c7f131fa624f086d42148fc85f2760 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 10 Apr 2020 15:04:44 +0000
Subject: [PATCH 2079/3235] Translated using Weblate (Russian)

Currently translated at 88.8% (2028 of 2285 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 | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 51b3da7f44..ea31d8b1fe 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -116,7 +116,7 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
-    "%(targetName)s joined the room.": "К комнате присоединяется %(targetName)s.",
+    "%(targetName)s joined the room.": "В комнату входит %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
@@ -2032,7 +2032,7 @@
     "Please verify the room ID or alias and try again.": "Пожалуйста, проверьте ID комнаты или псевдоним и попробуйте снова.",
     "Error removing ignored user/server": "Ошибка при удалении игнорируемого пользователя/сервера",
     "Please try again or view your console for hints.": "Попробуйте снова или посмотрите сообщения в консоли.",
-    "Ban list rules - %(roomName)s": "Правила блокировки -",
+    "Ban list rules - %(roomName)s": "Правила блокировки - %(roomName)s",
     "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Игнорирование людей реализовано через списки правил блокировки. Подписка на список блокировки приведёт к сокрытию от вас пользователей и серверов, которые в нём перечислены.",
     "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Ваш личный список блокировки содержит всех пользователей и серверы, сообщения которых вы не хотите видеть. После внесения туда первого пользователя/сервера в списке комнат появится новая комната 'Мой список блокировки' — не покидайте эту комнату, чтобы список блокировки работал.",
     "Subscribing to a ban list will cause you to join it!": "При подписке на список блокировки вы присоединитесь к нему!",
@@ -2040,5 +2040,34 @@
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Подтвердите удаление учётной записи с помощью единой точки входа.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
     "Confirm account deactivation": "Подтвердите деактивацию учётной записи",
-    "Your account is not secure": "Ваша учётная запись не в безопасности"
+    "Your account is not secure": "Ваша учётная запись не в безопасности",
+    "Backup has a <validity>valid</validity> signature from this user": "У резервной копии <validity>верная</validity> подпись этого пользователя",
+    "Backup has a <validity>invalid</validity> signature from this user": "У резервной копии <validity>неверная</validity> подпись этого пользователя",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "У резервной копии подпись <verify>неизвестного</verify> пользователя с ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "У резервной копии подпись <verify>неизвестной</verify> сессии с ID %(deviceId)s",
+    "If this isn't what you want, please use a different tool to ignore users.": "Если вас это не устраивает, попробуйте другой инструмент для игнорирования пользователей.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Перезапросить ключи шифрования</requestLink> у других ваших сессий.",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Совет: поставьте <code>//</code> в начале сообщения, чтобы начать его с косой черты.",
+    "Almost there! Is your other session showing the same shield?": "Почти готово! Отображается ли такой же щит в другой вашей сессии?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Почти готово! Отображает ли %(displayName)s такой же щит?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Вы успешно подтвердили %(deviceName)s (%(deviceId)s)!",
+    "%(displayName)s cancelled verification.": "%(displayName)s отменил(а) подтверждение.",
+    "Encryption not enabled": "Шифрование не включено",
+    "The encryption used by this room isn't supported.": "Шифрование этой комнаты не поддерживается.",
+    "You verified %(name)s": "Вы подтвердили",
+    "You cancelled verifying %(name)s": "Вы отменили подтверждение",
+    "You accepted": "Вы приняли",
+    "%(name)s accepted": "%(name)s принял(а)",
+    "You declined": "Вы отказали",
+    "You cancelled": "Вы отменили",
+    "%(name)s declined": "%(name)s отказал(а)",
+    "%(name)s cancelled": "%(name)s отменил(а)",
+    "Accepting …": "Принимаем …",
+    "Declining …": "Отказываем …",
+    "%(name)s wants to verify": "%(name)s желает подтвердить",
+    "You sent a verification request": "Вы отправили запрос подтверждения",
+    "Reactions": "Реакции",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> отреагировал(а)",
+    "Your display name": "Отображаемое имя",
+    "Your avatar URL": "Ссылка на ваш аватар"
 }

From 995578d729b0b03b319da7ad18e69789e7064bd1 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 10 Apr 2020 15:14:43 +0000
Subject: [PATCH 2080/3235] Translated using Weblate (Russian)

Currently translated at 90.2% (2060 of 2285 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 | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ea31d8b1fe..dce962c3a0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -2069,5 +2069,37 @@
     "Reactions": "Реакции",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> отреагировал(а)",
     "Your display name": "Отображаемое имя",
-    "Your avatar URL": "Ссылка на ваш аватар"
+    "Your avatar URL": "Ссылка на ваш аватар",
+    "One of the following may be compromised:": "Что-то из этого может быть скомпрометировано:",
+    "Yours, or the other users’ internet connection": "Ваше интернет-соединение или соединение других пользователей",
+    "Yours, or the other users’ session": "Ваши сессии или сессии других пользователей",
+    "%(name)s cancelled verifying": "%(name)s отменил(а) подтверждение",
+    "Any of the following data may be shared:": "Следующие сведения могут быть переданы:",
+    "Your user ID": "ID пользователя",
+    "Your theme": "Ваша тема",
+    "Riot URL": "Ссылка на Riot",
+    "Room ID": "ID комнаты",
+    "Widget ID": "ID виджета",
+    "Widget added by": "Виджет добавлен",
+    "This widget may use cookies.": "Этот виджет может использовать куки",
+    "More options": "Дополнительные параметры",
+    "Language Dropdown": "Список языков",
+    "Enter a server name": "Введите имя сервера",
+    "Looks good": "В порядке",
+    "All rooms": "Все комнаты",
+    "Your server": "Ваш сервер",
+    "Remove server": "Удалить сервер",
+    "Matrix": "Матрикс",
+    "Add a new server": "Добавить сервер",
+    "Server name": "Имя сервера",
+    "Add a new server...": "Добавить сервер…",
+    "Matrix rooms": "Комнаты Matrix",
+    "Destroy cross-signing keys?": "Уничтожить ключи кросс-подписи?",
+    "Clear cross-signing keys": "Очистить ключи кросс-подписи",
+    "Clear all data in this session?": "Очистить все данные в этой сессии?",
+    "Enable end-to-end encryption": "Включить сквозное шифрование",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Вы не сможете его отключить в дальнейшем. Мосты и большинство ботов пока что не будут работать.",
+    "Verify session": "Подтвердить сессию",
+    "Session name": "Название сессии",
+    "Session key": "Ключ сессии"
 }

From 8cf6a8c3112fb49c18a440bcadf8a775b72837ec Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Sat, 11 Apr 2020 02:59:26 +0100
Subject: [PATCH 2081/3235] refactor RoomScrollStateStore to accomodate
 scrollmaps for file/notif panel

---
 src/components/structures/RoomView.js |  4 ++--
 src/stores/RoomScrollStateStore.js    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4a3666fc38..291297a815 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -269,7 +269,7 @@ export default createReactClass({
             // If an event ID wasn't specified, default to the one saved for this room
             // in the scroll state store. Assume initialEventPixelOffset should be set.
             if (!newState.initialEventId) {
-                const roomScrollState = RoomScrollStateStore.getScrollState(newState.roomId);
+                const roomScrollState = RoomScrollStateStore.getRoomViewScrollState(newState.roomId);
                 if (roomScrollState) {
                     newState.initialEventId = roomScrollState.focussedEvent;
                     newState.initialEventPixelOffset = roomScrollState.pixelOffset;
@@ -470,7 +470,7 @@ export default createReactClass({
 
         // update the scroll map before we get unmounted
         if (this.state.roomId) {
-            RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
+            RoomScrollStateStore.setRoomViewScrollState(this.state.roomId, this._getScrollState());
         }
 
         if (this.state.shouldPeek) {
diff --git a/src/stores/RoomScrollStateStore.js b/src/stores/RoomScrollStateStore.js
index 07848283d1..37440c3e81 100644
--- a/src/stores/RoomScrollStateStore.js
+++ b/src/stores/RoomScrollStateStore.js
@@ -32,15 +32,15 @@ class RoomScrollStateStore {
         //
         //    pixelOffset: the number of pixels the window is scrolled down
         //        from the focussedEvent.
-        this._scrollStateMap = {};
+        this._RoomViewScrollStateMap = {};
     }
 
-    getScrollState(roomId) {
-        return this._scrollStateMap[roomId];
+    getRoomViewScrollState(roomId) {
+        return this._RoomViewScrollStateMap[roomId];
     }
 
-    setScrollState(roomId, scrollState) {
-        this._scrollStateMap[roomId] = scrollState;
+    setRoomViewScrollState(roomId, scrollState) {
+        this._RoomViewScrollStateMap[roomId] = scrollState;
     }
 }
 

From 719165c67fd6771a8fbf428556dc2b04cf566248 Mon Sep 17 00:00:00 2001
From: thobyv-kismat <vivee18@gmail.com>
Date: Sat, 11 Apr 2020 04:03:32 +0100
Subject: [PATCH 2082/3235] fix file panel scroll position lost on room change

---
 src/components/structures/FilePanel.js | 44 +++++++++++++++++++++++++-
 src/stores/RoomScrollStateStore.js     |  9 ++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f8c03be864..926355dd88 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -25,6 +25,8 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
+import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
+
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
@@ -41,6 +43,8 @@ const FilePanel = createReactClass({
     getInitialState: function() {
         return {
             timelineSet: null,
+            initialEventId: null,
+            initialEventPixelOffset: null,
         };
     },
 
@@ -84,6 +88,16 @@ const FilePanel = createReactClass({
 
         await this.updateTimelineSet(this.props.roomId);
 
+        if (this.props.roomId) {
+            const filePanelScrollState = RoomScrollStateStore.getFilePanelScrollState(this.props.roomId);
+            if (filePanelScrollState) {
+                this.setState({
+                    initialEventId: filePanelScrollState.focussedEvent,
+                    initialEventPixelOffset: filePanelScrollState.pixelOffset,
+                });
+            }
+        }
+
         if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
 
         // The timelineSets filter makes sure that encrypted events that contain
@@ -101,6 +115,10 @@ const FilePanel = createReactClass({
     },
 
     componentWillUnmount() {
+        if (this.props.roomId) {
+            RoomScrollStateStore.setFilePanelScrollState(this.props.roomId, this._getScrollState());
+        }
+
         const client = MatrixClientPeg.get();
         if (client === null) return;
 
@@ -190,6 +208,26 @@ const FilePanel = createReactClass({
         }
     },
 
+    _getScrollState: function() {
+        const messagePanel = this._messagePanel;
+        const scrollState = messagePanel.getScrollState();
+
+        if (!messagePanel) return null;
+
+        if (!scrollState || scrollState.stuckAtBottom) {
+            return null;
+        }
+
+        return {
+            focussedEvent: scrollState.trackedScrollToken,
+            pixelOffset: scrollState.pixelOffset,
+        };
+    },
+
+    _getTimelinePanelRef: function(ref) {
+        this._messagePanel = ref;
+    },
+
     render: function() {
         if (MatrixClientPeg.get().isGuest()) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
@@ -215,11 +253,15 @@ const FilePanel = createReactClass({
             //             "(" + this.state.timelineSet._timelines.join(", ") + ")" + " with key " + this.props.roomId);
             return (
                 <div className="mx_FilePanel" role="tabpanel">
-                    <TimelinePanel key={"filepanel_" + this.props.roomId}
+                    <TimelinePanel
+                        ref={this._getTimelinePanelRef}
+                        key={"filepanel_" + this.props.roomId}
                         manageReadReceipts={false}
                         manageReadMarkers={false}
                         timelineSet={this.state.timelineSet}
                         showUrlPreview = {false}
+                        eventId={this.state.initialEventId}
+                        eventPixelOffset={this.state.initialEventPixelOffset}
                         onPaginationRequest={this.onPaginationRequest}
                         tileShape="file_grid"
                         resizeNotifier={this.props.resizeNotifier}
diff --git a/src/stores/RoomScrollStateStore.js b/src/stores/RoomScrollStateStore.js
index 37440c3e81..9d48a7cc85 100644
--- a/src/stores/RoomScrollStateStore.js
+++ b/src/stores/RoomScrollStateStore.js
@@ -33,6 +33,7 @@ class RoomScrollStateStore {
         //    pixelOffset: the number of pixels the window is scrolled down
         //        from the focussedEvent.
         this._RoomViewScrollStateMap = {};
+        this._FilePanelScrollStateMap = {};
     }
 
     getRoomViewScrollState(roomId) {
@@ -42,6 +43,14 @@ class RoomScrollStateStore {
     setRoomViewScrollState(roomId, scrollState) {
         this._RoomViewScrollStateMap[roomId] = scrollState;
     }
+
+    getFilePanelScrollState(roomId, scrollState) {
+        return this._FilePanelScrollStateMap[roomId];
+    }
+
+    setFilePanelScrollState(roomId, scrollState) {
+        this._FilePanelScrollStateMap[roomId] = scrollState;
+    }
 }
 
 if (global.mx_RoomScrollStateStore === undefined) {

From 6d33138950d68843af1d9a756a3fd1df98cb71f6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 16:41:07 +0100
Subject: [PATCH 2083/3235] op/deop return error if trying to affect an unknown
 user

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx       | 8 +++++---
 src/i18n/strings/en_EN.json | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index aac42b6740..71815dde8c 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -350,7 +350,7 @@ export const Commands = [
                 return success(cli.setRoomTopic(roomId, args));
             }
             const room = cli.getRoom(roomId);
-            if (!room) return reject('Bad room ID: ' + roomId);
+            if (!room) return reject(_t("Failed to set topic"));
 
             const topicEvents = room.currentState.getStateEvents('m.room.topic', '');
             const topic = topicEvents && topicEvents.getContent().topic;
@@ -721,9 +721,10 @@ export const Commands = [
                     if (!isNaN(powerLevel)) {
                         const cli = MatrixClientPeg.get();
                         const room = cli.getRoom(roomId);
-                        if (!room) return reject('Bad room ID: ' + roomId);
+                        if (!room) return reject(_t("Command failed"));
 
                         const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                        if (!powerLevelEvent.getContent().users[args]) return reject(_t("Could not find user in room"));
                         return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
                     }
                 }
@@ -742,9 +743,10 @@ export const Commands = [
                 if (matches) {
                     const cli = MatrixClientPeg.get();
                     const room = cli.getRoom(roomId);
-                    if (!room) return reject('Bad room ID: ' + roomId);
+                    if (!room) return reject(_t("Command failed"));
 
                     const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+                    if (!powerLevelEvent.getContent().users[args]) return reject(_t("Could not find user in room"));
                     return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));
                 }
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae8ed90402..51a2a59672 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -177,6 +177,7 @@
     "Changes your avatar in this current room only": "Changes your avatar in this current room only",
     "Changes your avatar in all rooms": "Changes your avatar in all rooms",
     "Gets or sets the room topic": "Gets or sets the room topic",
+    "Failed to set topic": "Failed to set topic",
     "This room has no topic.": "This room has no topic.",
     "Sets the room name": "Sets the room name",
     "Invites user with given id to current room": "Invites user with given id to current room",
@@ -196,6 +197,8 @@
     "Unignored user": "Unignored user",
     "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
     "Define the power level of a user": "Define the power level of a user",
+    "Command failed": "Command failed",
+    "Could not find user in room": "Could not find user in room",
     "Deops user with given id": "Deops user with given id",
     "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Adds a custom widget by URL to the room": "Adds a custom widget by URL to the room",

From 7a936798b948d8207735c958b1cbffde19601bf1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 16:42:14 +0100
Subject: [PATCH 2084/3235] Fix invalid commands when figuring out whether to
 send typing notification

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index a9389400ef..2e4a966404 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -170,7 +170,7 @@ export default class BasicMessageEditor extends React.Component {
         // If the user is entering a command, only consider them typing if it is one which sends a message into the room
         if (isTyping && this.props.model.parts[0].type === "command") {
             const {cmd} = parseCommandString(this.props.model.parts[0].text);
-            if (CommandMap.get(cmd).category !== CommandCategories.messages) {
+            if (!CommandMap.has(cmd) || CommandMap.get(cmd).category !== CommandCategories.messages) {
                 isTyping = false;
             }
         }

From 3a0e1aeeaf75ce74f3b837ae720d21aa1ef8714c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 18:09:28 +0100
Subject: [PATCH 2085/3235] Sort emoji by shortcodes for autocomplete so that
 :-1 and :+1 first results are correct

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/EmojiProvider.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 9373ed662e..76058b42b0 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -100,6 +100,10 @@ export default class EmojiProvider extends AutocompleteProvider {
 
             // then sort by score (Infinity if matchedString not in shortname)
             sorters.push((c) => score(matchedString, c.shortname));
+            // then sort by max score of all shortcodes, trim off the `:`
+            sorters.push((c) => {
+                return Math.min.apply(null, c.emoji.shortcodes.map(s => score(matchedString.substring(1), s)));
+            });
             // If the matchedString is not empty, sort by length of shortname. Example:
             //  matchedString = ":bookmark"
             //  completions = [":bookmark:", ":bookmark_tabs:", ...]

From 7e996cb91c9d6af8bfffd1782b51c6bff75075da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 18:57:59 +0100
Subject: [PATCH 2086/3235] Add riot-desktop shortcuts for forward/back
 matching browsers&slack

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js                       | 4 ++++
 src/Keyboard.ts                           | 2 ++
 src/components/structures/LoggedInView.js | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 5d809eb28f..7214031586 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -188,4 +188,8 @@ export default class BasePlatform {
         const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
         window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
     }
+
+    onKeyDown(ev: KeyboardEvent): boolean {
+        return false; // no shortcuts implemented
+    }
 }
diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index 23e2bbf0d6..7040898872 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -43,6 +43,8 @@ export const Key = {
     BACKTICK: "`",
     SPACE: " ",
     SLASH: "/",
+    SQUARE_BRACKET_LEFT: "[",
+    SQUARE_BRACKET_RIGHT: "]",
     A: "a",
     B: "b",
     C: "c",
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index d9980aeca6..fe59a6a8f1 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -40,6 +40,7 @@ import {Resizer, CollapseDistributor} from '../../resizer';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
+import PlatformPeg from "../../PlatformPeg";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -407,6 +408,11 @@ const LoggedInView = createReactClass({
                     });
                     handled = true;
                 }
+                break;
+
+            default:
+                // if we do not have a handler for it, pass it to the platform which might
+                handled = PlatformPeg.get().onKeyDown(ev);
         }
 
         if (handled) {

From 237084da7866432321ac52fcc7de74e8ec6c1075 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 23:46:58 +0100
Subject: [PATCH 2087/3235] wrap node-qrcode in a React FC and use it for
 ShareDialog instead of qrcode-react

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                |   2 +-
 res/css/views/dialogs/_ShareDialog.scss     |   9 +-
 src/components/views/dialogs/ShareDialog.js |   4 +-
 src/components/views/elements/QRCode.tsx    |  50 +++++
 yarn.lock                                   | 214 ++------------------
 5 files changed, 77 insertions(+), 202 deletions(-)
 create mode 100644 src/components/views/elements/QRCode.tsx

diff --git a/package.json b/package.json
index 616f3f541e..02ec206ee3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,6 @@
     "project-name-generator": "^2.1.7",
     "prop-types": "^15.5.8",
     "qrcode": "^1.4.4",
-    "qrcode-react": "^0.1.16",
     "qs": "^6.6.0",
     "react": "^16.9.0",
     "react-addons-css-transition-group": "15.6.2",
@@ -118,6 +117,7 @@
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
     "@types/classnames": "^2.2.10",
+    "@types/qrcode": "^1.3.4",
     "@types/react": "16.9",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index 9a2f67dea3..3c984bbd1b 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -64,12 +64,15 @@ limitations under the License.
 
 .mx_ShareDialog_qrcode_container {
     float: left;
-    background-color: #ffffff;
-    padding: 5px; // makes qr code more readable in dark theme
-    border-radius: 5px;
     height: 256px;
     width: 256px;
     margin-right: 64px;
+
+    img {
+        width: 100%;
+        height: 100%;
+        border-radius: 8px;
+    }
 }
 
 .mx_ShareDialog_social_container {
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 1bc9decd39..a2554c3dcf 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import QRCode from 'qrcode-react';
+import QRCode from "../elements/QRCode";
 import {RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import * as ContextMenu from "../../structures/ContextMenu";
 import {toRightOf} from "../../structures/ContextMenu";
@@ -213,7 +213,7 @@ export default class ShareDialog extends React.Component {
 
                 <div className="mx_ShareDialog_split">
                     <div className="mx_ShareDialog_qrcode_container">
-                        <QRCode value={matrixToUrl} size={256} logoWidth={48} logo={require("../../../../res/img/matrix-m.svg")} />
+                        <QRCode data={matrixToUrl} />
                     </div>
                     <div className="mx_ShareDialog_social_container">
                         {
diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx
new file mode 100644
index 0000000000..5e5db8cf93
--- /dev/null
+++ b/src/components/views/elements/QRCode.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as React from "react";
+import {toDataURL, QRCodeSegment, QRCodeToDataURLOptions} from "qrcode";
+
+import {_t} from "../../../languageHandler";
+import Spinner from "./Spinner";
+
+interface IProps extends QRCodeToDataURLOptions {
+    data: string | QRCodeSegment[];
+}
+
+const defaultOptions: QRCodeToDataURLOptions = {
+    errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
+};
+
+const QRCode: React.FC<IProps> = ({data, ...options}) => {
+    const [dataUri, setUri] = React.useState<string>(null);
+    React.useEffect(() => {
+        let cancelled = false;
+        toDataURL(data, {...defaultOptions, ...options}).then(uri => {
+            if (cancelled) return;
+            setUri(uri);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [data, options]);
+
+
+    return <div className="mx_QRCode">
+        { dataUri ? <img src={dataUri} className="mx_VerificationQRCode" alt={_t("QR Code")} />: <Spinner /> }
+    </div>;
+};
+
+export default QRCode;
diff --git a/yarn.lock b/yarn.lock
index 538a049bff..05716ae985 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1267,6 +1267,13 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
+"@types/qrcode@^1.3.4":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b"
+  integrity sha512-aILE5yvKaqQXlY0YPMEYwK/KwdD43fwQTyagj0ffBBTQj8h//085Zp8LUrOnZ9FT69x64f5UgDo0EueY4BPAdg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/react@16.9":
   version "16.9.32"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
@@ -1496,11 +1503,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1634,19 +1636,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2553,11 +2547,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2803,7 +2792,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2879,11 +2868,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2897,11 +2881,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3916,13 +3895,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3985,20 +3957,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -4196,11 +4154,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4388,7 +4341,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4405,13 +4358,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5975,21 +5921,6 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6014,7 +5945,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
+mkdirp@^0.5.1, mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -6091,15 +6022,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6177,35 +6099,11 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.53:
   version "1.1.53"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
   integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6238,27 +6136,6 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6266,16 +6143,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6425,11 +6292,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6439,19 +6301,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -7006,18 +6860,6 @@ pvutils@latest:
   resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
   integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
 
-qr.js@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
-  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
-
-qrcode-react@^0.1.16:
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/qrcode-react/-/qrcode-react-0.1.16.tgz#d064999d510ffc3e55a9ca3ffcf6c203c69f1517"
-  integrity sha512-FK+QCfFqCQMSxUE1byzglERJQkwKqXYvYMCS+/Ad2zACJOfoHkHHtRqsQQPji7lfb1y1qCXLvL+3eP1hAfg8Ng==
-  dependencies:
-    qr.js "0.0.0"
-
 qrcode@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"
@@ -7096,7 +6938,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7254,7 +7096,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7614,7 +7456,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7776,7 +7618,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8112,7 +7954,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8393,19 +8235,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -9128,13 +8957,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9219,7 +9041,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 610fab7857d32ab9af557eae8fac1a1211d02713 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 11 Apr 2020 23:53:24 +0100
Subject: [PATCH 2088/3235] i18n and delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/QRCode.tsx | 2 +-
 src/i18n/strings/en_EN.json              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx
index 5e5db8cf93..9c867058c0 100644
--- a/src/components/views/elements/QRCode.tsx
+++ b/src/components/views/elements/QRCode.tsx
@@ -43,7 +43,7 @@ const QRCode: React.FC<IProps> = ({data, ...options}) => {
 
 
     return <div className="mx_QRCode">
-        { dataUri ? <img src={dataUri} className="mx_VerificationQRCode" alt={_t("QR Code")} />: <Spinner /> }
+        { dataUri ? <img src={dataUri} className="mx_VerificationQRCode" alt={_t("QR Code")} /> : <Spinner /> }
     </div>;
 };
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae8ed90402..832b53e67c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1482,6 +1482,7 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
     "Power level": "Power level",
     "Custom level": "Custom level",
+    "QR Code": "QR Code",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
     "Room alias": "Room alias",

From 71b4aab5dcb9edfd5bc5834a3ade66efd4d58fa2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 12 Apr 2020 00:12:58 +0100
Subject: [PATCH 2089/3235] Fix emoji tooltip flickering because
 onMouseOut&onMouseOver fired when moving between children

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/messages/_ReactionsRowButton.scss   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/res/css/views/messages/_ReactionsRowButton.scss b/res/css/views/messages/_ReactionsRowButton.scss
index 941153ca5b..fe5b081042 100644
--- a/res/css/views/messages/_ReactionsRowButton.scss
+++ b/res/css/views/messages/_ReactionsRowButton.scss
@@ -34,12 +34,17 @@ limitations under the License.
         background-color: $reaction-row-button-selected-bg-color;
         border-color: $reaction-row-button-selected-border-color;
     }
-}
 
-.mx_ReactionsRowButton_content {
-    max-width: 100px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    padding-right: 4px;
+    // ignore mouse events for all children, treat it as one entire hoverable entity
+    * {
+        pointer-events: none;
+    }
+
+    .mx_ReactionsRowButton_content {
+        max-width: 100px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        padding-right: 4px;
+    }
 }

From 3e057070fd50391a1ec8453afd8af88ce14db49a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 12 Apr 2020 00:56:21 +0100
Subject: [PATCH 2090/3235] Fix width of MVideoBody in FilePanel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                |  1 +
 res/css/views/messages/_MVideoBody.scss | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 res/css/views/messages/_MVideoBody.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 8706772ad9..0ba2b609e8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -133,6 +133,7 @@
 @import "./views/messages/_MNoticeBody.scss";
 @import "./views/messages/_MStickerBody.scss";
 @import "./views/messages/_MTextBody.scss";
+@import "./views/messages/_MVideoBody.scss";
 @import "./views/messages/_MessageActionBar.scss";
 @import "./views/messages/_MessageTimestamp.scss";
 @import "./views/messages/_MjolnirBody.scss";
diff --git a/res/css/views/messages/_MVideoBody.scss b/res/css/views/messages/_MVideoBody.scss
new file mode 100644
index 0000000000..db044aba03
--- /dev/null
+++ b/res/css/views/messages/_MVideoBody.scss
@@ -0,0 +1,22 @@
+/*
+Copyright 2020 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.
+*/
+
+span.mx_MVideoBody {
+    video.mx_MVideoBody {
+        max-width: 100%;
+        height: auto;
+    }
+}

From 4fc88d69a325c7de018804cff2ba3d980fa8beeb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 12 Apr 2020 01:04:54 +0100
Subject: [PATCH 2091/3235] Remove unused react-addons-css-transition-group

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json |   1 -
 yarn.lock    | 234 +++------------------------------------------------
 2 files changed, 12 insertions(+), 223 deletions(-)

diff --git a/package.json b/package.json
index 616f3f541e..7ba69c4272 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
     "qrcode-react": "^0.1.16",
     "qs": "^6.6.0",
     "react": "^16.9.0",
-    "react-addons-css-transition-group": "15.6.2",
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
     "react-focus-lock": "^2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 538a049bff..c42828e461 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1496,11 +1496,6 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1634,19 +1629,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2283,11 +2270,6 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
   integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
 
-chain-function@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
-  integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
-
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2553,11 +2535,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2803,7 +2780,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.6:
+debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2879,11 +2856,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -2897,11 +2869,6 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -2975,13 +2942,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-helpers@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
 dom-serializer@0, dom-serializer@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -3916,13 +3876,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -3985,20 +3938,6 @@ fuse.js@^2.2.0:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
   integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -4196,11 +4135,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4388,7 +4322,7 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4405,13 +4339,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -5975,21 +5902,6 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, "minimist@~ 1.2.0":
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6014,7 +5926,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
+mkdirp@^0.5.1, mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -6091,15 +6003,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
@@ -6177,35 +6080,11 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.53:
   version "1.1.53"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
   integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6238,27 +6117,6 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6266,16 +6124,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6425,11 +6273,6 @@ os-browserify@^0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -6439,19 +6282,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6923,7 +6758,7 @@ prop-types-exact@^1.2.0:
     object.assign "^4.1.0"
     reflect.ownkeys "^0.2.0"
 
-prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7096,7 +6931,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
+rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -7106,13 +6941,6 @@ rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-addons-css-transition-group@15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.2.tgz#9e4376bcf40b5217d14ec68553081cee4b08a6d6"
-  integrity sha1-nkN2vPQLUhfRTsaFUwgc7ksIptY=
-  dependencies:
-    react-transition-group "^1.2.0"
-
 react-beautiful-dnd@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz#3b0a49bf6be75af351176c904f012611dd292b81"
@@ -7200,17 +7028,6 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react-transition-group@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
-  integrity sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==
-  dependencies:
-    chain-function "^1.0.0"
-    dom-helpers "^3.2.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.5.6"
-    warning "^3.0.0"
-
 react@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
@@ -7254,7 +7071,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7614,7 +7431,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7776,7 +7593,7 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8112,7 +7929,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8393,19 +8210,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -8964,13 +8768,6 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
-  dependencies:
-    loose-envify "^1.0.0"
-
 watchpack@^1.6.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
@@ -9128,13 +8925,6 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9219,7 +9009,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 379aeb667ce4a80941808091634186d7d1bac67c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Apr 2020 14:13:27 +0100
Subject: [PATCH 2092/3235] Convert LoggedInView to a PureComponent class

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.js | 120 +++++++++++-----------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index d9980aeca6..36beec3f6c 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2017, 2018 New Vector Ltd
+Copyright 2017, 2018, 2020 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.
@@ -17,8 +17,7 @@ limitations under the License.
 */
 
 import { MatrixClient } from 'matrix-js-sdk';
-import React, {createRef} from 'react';
-import createReactClass from 'create-react-class';
+import React, {createRef, PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import { DragDropContext } from 'react-beautiful-dnd';
 
@@ -61,10 +60,10 @@ function canElementReceiveInput(el) {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-const LoggedInView = createReactClass({
-    displayName: 'LoggedInView',
+class LoggedInView extends PureComponent {
+    static displayName = 'LoggedInView';
 
-    propTypes: {
+    static propTypes = {
         matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
         page_type: PropTypes.string.isRequired,
         onRoomCreated: PropTypes.func,
@@ -77,25 +76,18 @@ const LoggedInView = createReactClass({
         viaServers: PropTypes.arrayOf(PropTypes.string),
 
         // and lots and lots of other stuff.
-    },
+    };
 
-    getInitialState: function() {
-        return {
+    constructor(props, context) {
+        super(props, context);
+
+        this.state = {
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
             // any currently active server notice events
             serverNoticeEvents: [],
         };
-    },
 
-    componentDidMount: function() {
-        this.resizer = this._createResizer();
-        this.resizer.attach();
-        this._loadResizerPreferences();
-    },
-
-    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount: function() {
         // stash the MatrixClient in case we log out before we are unmounted
         this._matrixClient = this.props.matrixClient;
 
@@ -118,7 +110,13 @@ const LoggedInView = createReactClass({
         fixupColorFonts();
 
         this._roomView = createRef();
-    },
+    }
+
+    componentDidMount() {
+        this.resizer = this._createResizer();
+        this.resizer.attach();
+        this._loadResizerPreferences();
+    }
 
     componentDidUpdate(prevProps) {
         // attempt to guess when a banner was opened or closed
@@ -130,9 +128,9 @@ const LoggedInView = createReactClass({
         ) {
             this.props.resizeNotifier.notifyBannersChanged();
         }
-    },
+    }
 
-    componentWillUnmount: function() {
+    componentWillUnmount() {
         document.removeEventListener('keydown', this._onNativeKeyDown, false);
         this._matrixClient.removeListener("accountData", this.onAccountData);
         this._matrixClient.removeListener("sync", this.onSync);
@@ -141,7 +139,7 @@ const LoggedInView = createReactClass({
             this._sessionStoreToken.remove();
         }
         this.resizer.detach();
-    },
+    }
 
     // Child components assume that the client peg will not be null, so give them some
     // sort of assurance here by only allowing a re-render if the client is truthy.
@@ -149,22 +147,22 @@ const LoggedInView = createReactClass({
     // This is required because `LoggedInView` maintains its own state and if this state
     // updates after the client peg has been made null (during logout), then it will
     // attempt to re-render and the children will throw errors.
-    shouldComponentUpdate: function() {
+    shouldComponentUpdate() {
         return Boolean(MatrixClientPeg.get());
-    },
+    }
 
-    canResetTimelineInRoom: function(roomId) {
+    canResetTimelineInRoom = (roomId) => {
         if (!this._roomView.current) {
             return true;
         }
         return this._roomView.current.canResetTimeline();
-    },
+    };
 
-    _setStateFromSessionStore() {
+    _setStateFromSessionStore = () => {
         this.setState({
             userHasGeneratedPassword: Boolean(this._sessionStore.getCachedPassword()),
         });
-    },
+    };
 
     _createResizer() {
         const classNames = {
@@ -193,7 +191,7 @@ const LoggedInView = createReactClass({
             collapseConfig);
         resizer.setClassNames(classNames);
         return resizer;
-    },
+    }
 
     _loadResizerPreferences() {
         let lhsSize = window.localStorage.getItem("mx_lhs_size");
@@ -203,9 +201,9 @@ const LoggedInView = createReactClass({
             lhsSize = 350;
         }
         this.resizer.forHandleAt(0).resize(lhsSize);
-    },
+    }
 
-    onAccountData: function(event) {
+    onAccountData = (event) => {
         if (event.getType() === "im.vector.web.settings") {
             this.setState({
                 useCompactLayout: event.getContent().useCompactLayout,
@@ -214,9 +212,9 @@ const LoggedInView = createReactClass({
         if (event.getType() === "m.ignored_user_list") {
             dis.dispatch({action: "ignore_state_changed"});
         }
-    },
+    };
 
-    onSync: function(syncState, oldSyncState, data) {
+    onSync = (syncState, oldSyncState, data) => {
         const oldErrCode = (
             this.state.syncErrorData &&
             this.state.syncErrorData.error &&
@@ -238,16 +236,16 @@ const LoggedInView = createReactClass({
         if (oldSyncState === 'PREPARED' && syncState === 'SYNCING') {
             this._updateServerNoticeEvents();
         }
-    },
+    };
 
-    onRoomStateEvents: function(ev, state) {
+    onRoomStateEvents = (ev, state) => {
         const roomLists = RoomListStore.getRoomLists();
         if (roomLists['m.server_notice'] && roomLists['m.server_notice'].some(r => r.roomId === ev.getRoomId())) {
             this._updateServerNoticeEvents();
         }
-    },
+    };
 
-    _updateServerNoticeEvents: async function() {
+    _updateServerNoticeEvents = async () => {
         const roomLists = RoomListStore.getRoomLists();
         if (!roomLists['m.server_notice']) return [];
 
@@ -267,9 +265,9 @@ const LoggedInView = createReactClass({
         this.setState({
             serverNoticeEvents: pinnedEvents,
         });
-    },
+    };
 
-    _onPaste: function(ev) {
+    _onPaste = (ev) => {
         let canReceiveInput = false;
         let element = ev.target;
         // test for all parents because the target can be a child of a contenteditable element
@@ -283,7 +281,7 @@ const LoggedInView = createReactClass({
             // so dispatch synchronously before paste happens
             dis.dispatch({action: 'focus_composer'}, true);
         }
-    },
+    };
 
     /*
     SOME HACKERY BELOW:
@@ -307,22 +305,22 @@ const LoggedInView = createReactClass({
     We also listen with a native listener on the document to get keydown events when no element is focused.
     Bubbling is irrelevant here as the target is the body element.
     */
-    _onReactKeyDown: function(ev) {
+    _onReactKeyDown = (ev) => {
         // events caught while bubbling up on the root element
         // of this component, so something must be focused.
         this._onKeyDown(ev);
-    },
+    };
 
-    _onNativeKeyDown: function(ev) {
+    _onNativeKeyDown = (ev) => {
         // only pass this if there is no focused element.
         // if there is, _onKeyDown will be called by the
         // react keydown handler that respects the react bubbling order.
         if (ev.target === document.body) {
             this._onKeyDown(ev);
         }
-    },
+    };
 
-    _onKeyDown: function(ev) {
+    _onKeyDown = (ev) => {
             /*
             // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
             // Will need to find a better meta key if anyone actually cares about using this.
@@ -432,19 +430,19 @@ const LoggedInView = createReactClass({
                 // that would prevent typing in the now-focussed composer
             }
         }
-    },
+    };
 
     /**
      * dispatch a page-up/page-down/etc to the appropriate component
      * @param {Object} ev The key event
      */
-    _onScrollKeyPressed: function(ev) {
+    _onScrollKeyPressed = (ev) => {
         if (this._roomView.current) {
             this._roomView.current.handleScrollKey(ev);
         }
-    },
+    };
 
-    _onDragEnd: function(result) {
+    _onDragEnd = (result) => {
         // Dragged to an invalid destination, not onto a droppable
         if (!result.destination) {
             return;
@@ -467,9 +465,9 @@ const LoggedInView = createReactClass({
         } else if (dest.startsWith('room-sub-list-droppable_')) {
             this._onRoomTileEndDrag(result);
         }
-    },
+    };
 
-    _onRoomTileEndDrag: function(result) {
+    _onRoomTileEndDrag = (result) => {
         let newTag = result.destination.droppableId.split('_')[1];
         let prevTag = result.source.droppableId.split('_')[1];
         if (newTag === 'undefined') newTag = undefined;
@@ -486,9 +484,9 @@ const LoggedInView = createReactClass({
             prevTag, newTag,
             oldIndex, newIndex,
         ), true);
-    },
+    };
 
-    _onMouseDown: function(ev) {
+    _onMouseDown = (ev) => {
         // When the panels are disabled, clicking on them results in a mouse event
         // which bubbles to certain elements in the tree. When this happens, close
         // any settings page that is currently open (user/room/group).
@@ -507,9 +505,9 @@ const LoggedInView = createReactClass({
                 });
             }
         }
-    },
+    };
 
-    _onMouseUp: function(ev) {
+    _onMouseUp = (ev) => {
         if (!this.state.mouseDown) return;
 
         const deltaX = ev.pageX - this.state.mouseDown.x;
@@ -528,13 +526,13 @@ const LoggedInView = createReactClass({
         // Always clear the mouseDown state to ensure we don't accidentally
         // use stale values due to the mouseDown checks.
         this.setState({mouseDown: null});
-    },
+    };
 
-    _setResizeContainerRef(div) {
+    _setResizeContainerRef = (div) => {
         this.resizeContainer = div;
-    },
+    };
 
-    render: function() {
+    render() {
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RoomView = sdk.getComponent('structures.RoomView');
         const UserView = sdk.getComponent('structures.UserView');
@@ -660,7 +658,7 @@ const LoggedInView = createReactClass({
                 </div>
             </MatrixClientContext.Provider>
         );
-    },
-});
+    }
+}
 
 export default LoggedInView;

From 368e3f9e85bf8d950ac8541ea0693859c57300b1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Apr 2020 14:29:00 +0100
Subject: [PATCH 2093/3235] Convert LoggedInView to TypeScript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../{LoggedInView.js => LoggedInView.tsx}     | 89 +++++++++++++++----
 1 file changed, 71 insertions(+), 18 deletions(-)
 rename src/components/structures/{LoggedInView.js => LoggedInView.tsx} (91%)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.tsx
similarity index 91%
rename from src/components/structures/LoggedInView.js
rename to src/components/structures/LoggedInView.tsx
index 36beec3f6c..e09a5c9ac6 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.tsx
@@ -16,9 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient } from 'matrix-js-sdk';
-import React, {createRef, PureComponent} from 'react';
-import PropTypes from 'prop-types';
+import * as React from 'react';
+import * as PropTypes from 'prop-types';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { DragDropContext } from 'react-beautiful-dnd';
 
 import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
@@ -28,7 +29,7 @@ import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "../../stores/RoomListStore";
 
@@ -39,6 +40,7 @@ import {Resizer, CollapseDistributor} from '../../resizer';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
+import ResizeNotifier from "../../utils/ResizeNotifier";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -51,6 +53,52 @@ function canElementReceiveInput(el) {
         !!el.getAttribute("contenteditable");
 }
 
+interface IProps {
+    matrixClient: MatrixClient;
+    onRegistered: (credentials: MatrixClientCreds) => Promise<MatrixClient>;
+    viaServers?: string[];
+    hideToSRUsers: boolean;
+    resizeNotifier: ResizeNotifier;
+    middleDisabled: boolean;
+    initialEventPixelOffset: number;
+    leftDisabled: boolean;
+    rightDisabled: boolean;
+    showCookieBar: boolean;
+    hasNewVersion: boolean;
+    userHasGeneratedPassword: boolean;
+    showNotifierToolbar: boolean;
+    page_type: string;
+    autoJoin: boolean;
+    thirdPartyInvite?: object;
+    roomOobData?: object;
+    currentRoomId: string;
+    ConferenceHandler?: object;
+    collapseLhs: boolean;
+    checkingForUpdate: boolean;
+    config: {
+        piwik: {
+            policyUrl: string;
+        },
+        [key: string]: any,
+    };
+    currentUserId?: string;
+    currentGroupId?: string;
+    currentGroupIsNew?: boolean;
+    version?: string;
+    newVersion?: string;
+    newVersionReleaseNotes?: string;
+}
+interface IState {
+    mouseDown?: {
+        x: number;
+        y: number;
+    };
+    syncErrorData: any;
+    useCompactLayout: boolean;
+    serverNoticeEvents: MatrixEvent[];
+    userHasGeneratedPassword: boolean;
+}
+
 /**
  * This is what our MatrixChat shows when we are logged in. The precise view is
  * determined by the page_type property.
@@ -60,7 +108,7 @@ function canElementReceiveInput(el) {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-class LoggedInView extends PureComponent {
+class LoggedInView extends React.PureComponent<IProps, IState> {
     static displayName = 'LoggedInView';
 
     static propTypes = {
@@ -78,10 +126,20 @@ class LoggedInView extends PureComponent {
         // and lots and lots of other stuff.
     };
 
+    private readonly _matrixClient: MatrixClient;
+    private readonly _roomView: React.RefObject<any>;
+    private readonly _resizeContainer: React.RefObject<ResizeHandle>;
+    private readonly _sessionStore: sessionStore;
+    private readonly _sessionStoreToken: { remove: () => void };
+    private resizer: Resizer;
+
     constructor(props, context) {
         super(props, context);
 
         this.state = {
+            mouseDown: undefined,
+            syncErrorData: undefined,
+            userHasGeneratedPassword: false,
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
             // any currently active server notice events
@@ -109,7 +167,8 @@ class LoggedInView extends PureComponent {
 
         fixupColorFonts();
 
-        this._roomView = createRef();
+        this._roomView = React.createRef();
+        this._resizeContainer = React.createRef();
     }
 
     componentDidMount() {
@@ -118,12 +177,12 @@ class LoggedInView extends PureComponent {
         this._loadResizerPreferences();
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps, prevState) {
         // attempt to guess when a banner was opened or closed
         if (
             (prevProps.showCookieBar !== this.props.showCookieBar) ||
             (prevProps.hasNewVersion !== this.props.hasNewVersion) ||
-            (prevProps.userHasGeneratedPassword !== this.props.userHasGeneratedPassword) ||
+            (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword) ||
             (prevProps.showNotifierToolbar !== this.props.showNotifierToolbar)
         ) {
             this.props.resizeNotifier.notifyBannersChanged();
@@ -186,7 +245,7 @@ class LoggedInView extends PureComponent {
             },
         };
         const resizer = new Resizer(
-            this.resizeContainer,
+            this._resizeContainer.current,
             CollapseDistributor,
             collapseConfig);
         resizer.setClassNames(classNames);
@@ -194,10 +253,8 @@ class LoggedInView extends PureComponent {
     }
 
     _loadResizerPreferences() {
-        let lhsSize = window.localStorage.getItem("mx_lhs_size");
-        if (lhsSize !== null) {
-            lhsSize = parseInt(lhsSize, 10);
-        } else {
+        let lhsSize = parseInt(window.localStorage.getItem("mx_lhs_size"), 10);
+        if (isNaN(lhsSize)) {
             lhsSize = 350;
         }
         this.resizer.forHandleAt(0).resize(lhsSize);
@@ -528,10 +585,6 @@ class LoggedInView extends PureComponent {
         this.setState({mouseDown: null});
     };
 
-    _setResizeContainerRef = (div) => {
-        this.resizeContainer = div;
-    };
-
     render() {
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RoomView = sdk.getComponent('structures.RoomView');
@@ -645,7 +698,7 @@ class LoggedInView extends PureComponent {
                     { topBar }
                     <ToastContainer />
                     <DragDropContext onDragEnd={this._onDragEnd}>
-                        <div ref={this._setResizeContainerRef} className={bodyClasses}>
+                        <div ref={this._resizeContainer} className={bodyClasses}>
                             <LeftPanel
                                 resizeNotifier={this.props.resizeNotifier}
                                 collapsed={this.props.collapseLhs || false}

From 96c067a6c473742881227971cb8f581b747086f2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Apr 2020 14:30:52 +0100
Subject: [PATCH 2094/3235] prefer protected over private so that the class can
 be extended

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index e09a5c9ac6..8497b9bc80 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -126,12 +126,12 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         // and lots and lots of other stuff.
     };
 
-    private readonly _matrixClient: MatrixClient;
-    private readonly _roomView: React.RefObject<any>;
-    private readonly _resizeContainer: React.RefObject<ResizeHandle>;
-    private readonly _sessionStore: sessionStore;
-    private readonly _sessionStoreToken: { remove: () => void };
-    private resizer: Resizer;
+    protected readonly _matrixClient: MatrixClient;
+    protected readonly _roomView: React.RefObject<any>;
+    protected readonly _resizeContainer: React.RefObject<ResizeHandle>;
+    protected readonly _sessionStore: sessionStore;
+    protected readonly _sessionStoreToken: { remove: () => void };
+    protected resizer: Resizer;
 
     constructor(props, context) {
         super(props, context);

From 46f7fadf3f23e3f4eaaf3a97124ec2fe8cc4ccd3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Apr 2020 14:33:45 +0100
Subject: [PATCH 2095/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 8497b9bc80..0e2a74faae 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -315,8 +315,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             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);
-                const ev = timeline.getEvents().find(ev => ev.getId() === eventId);
-                if (ev) pinnedEvents.push(ev);
+                const event = timeline.getEvents().find(ev => ev.getId() === eventId);
+                if (event) pinnedEvents.push(event);
             }
         }
         this.setState({

From 384336e8f149612b22f77ae6a5967407864e736b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 10:06:57 +0100
Subject: [PATCH 2096/3235] s/alias/address/ in copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/GroupAddressPicker.js                     |  2 +-
 src/SlashCommands.tsx                         |  8 ++--
 src/components/structures/GroupView.js        |  2 +-
 src/components/structures/RoomDirectory.js    |  4 +-
 src/components/views/create_room/RoomAlias.js |  2 +-
 .../views/dialogs/CreateRoomDialog.js         |  2 +-
 .../views/elements/RoomAliasField.js          |  8 ++--
 .../views/room_settings/AliasSettings.js      | 14 +++----
 .../tabs/room/SecurityRoomSettingsTab.js      |  2 +-
 .../tabs/user/MjolnirUserSettingsTab.js       |  4 +-
 src/i18n/strings/en_EN.json                   | 38 +++++++++----------
 11 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 9131a89e5d..2928137f9d 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -73,7 +73,7 @@ export function showGroupAddRoomDialog(groupId) {
             title: _t("Add rooms to the community"),
             description: description,
             extraNode: checkboxContainer,
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to community"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index aac42b6740..b205af477d 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -441,8 +441,8 @@ export const Commands = [
     new Command({
         command: 'join',
         aliases: ['j', 'goto'],
-        args: '<room-alias>',
-        description: _td('Joins room with given alias'),
+        args: '<room-address>',
+        description: _td('Joins room with given address'),
         runFn: function(_, args) {
             if (args) {
                 // Note: we support 2 versions of this command. The first is
@@ -553,7 +553,7 @@ export const Commands = [
     }),
     new Command({
         command: 'part',
-        args: '[<room-alias>]',
+        args: '[<room-address>]',
         description: _td('Leave room'),
         runFn: function(roomId, args) {
             const cli = MatrixClientPeg.get();
@@ -585,7 +585,7 @@ export const Commands = [
                         }
                         if (targetRoomId) break;
                     }
-                    if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+                    if (!targetRoomId) return reject(_t('Unrecognised room address:') + ' ' + roomAlias);
                 }
             }
 
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 3b32e5c907..cae9e096a6 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -92,7 +92,7 @@ const CategoryRoomList = createReactClass({
         Modal.createTrackedDialog('Add Rooms to Group Summary', '', AddressPickerDialog, {
             title: _t('Add rooms to the community summary'),
             description: _t("Which rooms would you like to add to this summary?"),
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to summary"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 0b07c10c8a..03cf06ec3f 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -199,7 +199,7 @@ export default createReactClass({
 
         let desc;
         if (alias) {
-            desc = _t('Delete the room alias %(alias)s and remove %(name)s from the directory?', {alias: alias, name: name});
+            desc = _t('Delete the room address %(alias)s and remove %(name)s from the directory?', {alias, name});
         } else {
             desc = _t('Remove %(name)s from the directory?', {name: name});
         }
@@ -216,7 +216,7 @@ export default createReactClass({
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
-                    step = _t('delete the alias.');
+                    step = _t('delete the address.');
                     return MatrixClientPeg.get().deleteAlias(alias);
                 }).then(() => {
                     modal.close();
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index bc5dec1468..5bdfdde08d 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -98,7 +98,7 @@ export default createReactClass({
 
     render: function() {
         return (
-            <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
+            <input type="text" className="mx_RoomAlias" placeholder={_t("Address (optional)")}
                 onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
                 value={this.props.alias} />
         );
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 88e90627e8..ec53f99b78 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -180,7 +180,7 @@ export default createReactClass({
         let publicPrivateLabel;
         let aliasField;
         if (this.state.isPublic) {
-            publicPrivateLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
+            publicPrivateLabel = (<p>{_t("Set a room address to easily share your room with other people.")}</p>);
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index d3de6a5d34..ee18913971 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -45,7 +45,7 @@ export default class RoomAliasField extends React.PureComponent {
         const maxlength = 255 - this.props.domain.length - 2;   // 2 for # and :
         return (
                 <Field
-                    label={_t("Room alias")}
+                    label={_t("Room address")}
                     className="mx_RoomAliasField"
                     prefix={poundSign}
                     postfix={domain}
@@ -87,7 +87,7 @@ export default class RoomAliasField extends React.PureComponent {
             }, {
                 key: "required",
                 test: async ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Please provide a room alias"),
+                invalid: () => _t("Please provide a room address"),
             }, {
                 key: "taken",
                 final: true,
@@ -107,8 +107,8 @@ export default class RoomAliasField extends React.PureComponent {
                         return !!err.errcode;
                     }
                 },
-                valid: () => _t("This alias is available to use"),
-                invalid: () => _t("This alias is already in use"),
+                valid: () => _t("This address is available to use"),
+                invalid: () => _t("This address is already in use"),
             },
         ],
     });
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 3994d78390..37d1e66e98 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -220,10 +220,10 @@ export default class AliasSettings extends React.Component {
             }
         }).catch((err) => {
             console.error(err);
-            Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, {
-                title: _t("Error creating alias"),
+            Modal.createTrackedDialog('Error creating address', '', ErrorDialog, {
+                title: _t("Error creating address"),
                 description: _t(
-                    "There was an error creating that alias. It may not be allowed by the server " +
+                    "There was an error creating that address. It may not be allowed by the server " +
                     "or a temporary failure occurred.",
                 ),
             });
@@ -245,15 +245,15 @@ export default class AliasSettings extends React.Component {
             console.error(err);
             let description;
             if (err.errcode === "M_FORBIDDEN") {
-                description = _t("You don't have permission to delete the alias.");
+                description = _t("You don't have permission to delete the address.");
             } else {
                 description = _t(
-                    "There was an error removing that alias. It may no longer exist or a temporary " +
+                    "There was an error removing that address. It may no longer exist or a temporary " +
                     "error occurred.",
                 );
             }
-            Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
-                title: _t("Error removing alias"),
+            Modal.createTrackedDialog('Error removing address', '', ErrorDialog, {
+                title: _t("Error removing address"),
                 description,
             });
         });
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index eb2b885a22..c67596a3a5 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -247,7 +247,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                 <div className='mx_SecurityRoomSettingsTab_warning'>
                     <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
                     <span>
-                        {_t("To link to this room, please add an alias.")}
+                        {_t("To link to this room, please add an address.")}
                     </span>
                 </div>
             );
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index d22b7ec183..f1fe5f2556 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -84,7 +84,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to subscribe to Mjolnir list', '', ErrorDialog, {
                 title: _t('Error subscribing to list'),
-                description: _t('Please verify the room ID or alias and try again.'),
+                description: _t('Please verify the room ID or address and try again.'),
             });
         } finally {
             this.setState({busy: false});
@@ -305,7 +305,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
                         <form onSubmit={this._onSubscribeList} autoComplete="off">
                             <Field
                                 type="text"
-                                label={_t("Room ID or alias of ban list")}
+                                label={_t("Room ID or address of ban list")}
                                 value={this.state.newList}
                                 onChange={this._onNewListChanged}
                             />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae8ed90402..3bbad1d585 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -114,7 +114,7 @@
     "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",
+    "Room name or address": "Room name or address",
     "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",
@@ -183,9 +183,9 @@
     "Use an identity server": "Use an identity server",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.",
     "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
-    "Joins room with given alias": "Joins room with given alias",
+    "Joins room with given address": "Joins room with given address",
     "Leave room": "Leave room",
-    "Unrecognised room alias:": "Unrecognised room alias:",
+    "Unrecognised room address:": "Unrecognised room address:",
     "Kicks user with given id": "Kicks user with given id",
     "Bans user with given id": "Bans user with given id",
     "Unbans user with given ID": "Unbans user with given ID",
@@ -788,7 +788,7 @@
     "Error adding ignored user/server": "Error adding ignored user/server",
     "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",
     "Error subscribing to list": "Error subscribing to list",
-    "Please verify the room ID or alias and try again.": "Please verify the room ID or alias and try again.",
+    "Please verify the room ID or address and try again.": "Please verify the room ID or address and try again.",
     "Error removing ignored user/server": "Error removing ignored user/server",
     "Error unsubscribing from list": "Error unsubscribing from list",
     "Please try again or view your console for hints.": "Please try again or view your console for hints.",
@@ -815,7 +815,7 @@
     "Subscribed lists": "Subscribed lists",
     "Subscribing to a ban list will cause you to join it!": "Subscribing to a ban list will cause you to join it!",
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
-    "Room ID or alias of ban list": "Room ID or alias of ban list",
+    "Room ID or address of ban list": "Room ID or address of ban list",
     "Subscribe": "Subscribe",
     "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
@@ -916,7 +916,7 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
-    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
+    "To link to this room, please add an address.": "To link to this room, please add an address.",
     "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",
     "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
@@ -1187,11 +1187,11 @@
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
-    "Error creating alias": "Error creating alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "You don't have permission to delete the alias.": "You don't have permission to delete the alias.",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
-    "Error removing alias": "Error removing alias",
+    "Error creating address": "Error creating address",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.",
+    "You don't have permission to delete the address.": "You don't have permission to delete the address.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "There was an error removing that address. It may no longer exist or a temporary error occurred.",
+    "Error removing address": "Error removing address",
     "Main address": "Main address",
     "not specified": "not specified",
     "This room has no local addresses": "This room has no local addresses",
@@ -1484,12 +1484,12 @@
     "Custom level": "Custom level",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
-    "Room alias": "Room alias",
+    "Room address": "Room address",
     "e.g. my-room": "e.g. my-room",
     "Some characters not allowed": "Some characters not allowed",
-    "Please provide a room alias": "Please provide a room alias",
-    "This alias is available to use": "This alias is available to use",
-    "This alias is already in use": "This alias is already in use",
+    "Please provide a room address": "Please provide a room address",
+    "This address is available to use": "This address is available to use",
+    "This address is already in use": "This address is already in use",
     "Room directory": "Room directory",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
@@ -1556,7 +1556,7 @@
     "example": "example",
     "Create": "Create",
     "Please enter a name for the room": "Please enter a name for the room",
-    "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
+    "Set a room address to easily share your room with other people.": "Set a room address to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
     "Enable end-to-end encryption": "Enable end-to-end encryption",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
@@ -1807,7 +1807,7 @@
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",
-    "Alias (optional)": "Alias (optional)",
+    "Address (optional)": "Address (optional)",
     "Reject invitation": "Reject invitation",
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Unable to reject invite": "Unable to reject invite",
@@ -2001,11 +2001,11 @@
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
     "Riot failed to get the public room list.": "Riot failed to get the public room list.",
     "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Delete the room address %(alias)s and remove %(name)s from the directory?",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
     "Remove from Directory": "Remove from Directory",
     "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-    "delete the alias.": "delete the alias.",
+    "delete the address.": "delete the address.",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
     "Unable to join network": "Unable to join network",
     "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",

From 882aefb94c2d027e848836219d26ca0222bceac5 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 11 Apr 2020 08:51:07 +0000
Subject: [PATCH 2097/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2285 of 2285 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 | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1edea6c518..1a1abbd9a5 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -667,8 +667,8 @@
     "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 bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
-    "Light theme": "Itxura argia",
-    "Dark theme": "Itxura iluna",
+    "Light theme": "Azal argia",
+    "Dark theme": "Azal iluna",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen.",
     "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.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
@@ -1174,7 +1174,7 @@
     "Email addresses": "E-mail helbideak",
     "Phone numbers": "Telefono zenbakiak",
     "Language and region": "Hizkuntza eta eskualdea",
-    "Theme": "Itxura",
+    "Theme": "Azala",
     "Account management": "Kontuen kudeaketa",
     "Deactivating your account is a permanent action - be careful!": "Kontua desgaitzea behin betiko ekintza bat da, kontuz ibili!",
     "For help with using Riot, click <a>here</a>.": "Riot erabiltzeko laguntza behar baduzu, egin klik <a>hemen</a>.",
@@ -1725,7 +1725,7 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du. (Nabigatzaile honek ez du onartzen)",
     "Try out new ways to ignore people (experimental)": "Probatu jendea ez entzuteko modu berriak (esperimentala)",
     "Enable local event indexing and E2EE search (requires restart)": "Gaitu gertaera lokalen indexazioa eta E2EE bilaketa (berrabiarazi behar da)",
-    "Match system theme": "Bat egin sistemako gaiarekin",
+    "Match system theme": "Bat egin sistemako azalarekin",
     "My Ban List": "Nire debeku-zerrenda",
     "This is your list of users/servers you have blocked - don't leave the room!": "Hau blokeatu dituzun erabiltzaile edo zerbitzarien zerrenda da, ez atera gelatik!",
     "Decline (%(counter)s)": "Ukatu (%(counter)s)",
@@ -1781,7 +1781,7 @@
     "Your display name": "Zure pantaila-izena",
     "Your avatar URL": "Zure abatarraren URL-a",
     "Your user ID": "Zure erabiltzaile ID-a",
-    "Your theme": "Zure gaia",
+    "Your theme": "Zure azala",
     "Riot URL": "Riot URL-a",
     "Room ID": "Gelaren ID-a",
     "Widget ID": "Trepetaren ID-a",
@@ -2185,12 +2185,12 @@
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen ordezko helbideak aldatu ditu.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbide nagusia eta ordezko helbideak aldatu ditu.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s erabiltzaileak gela honen helbideak aldatu ditu.",
-    "Support adding custom themes": "Gai pertsonalizatua gehitzea onartzen du",
-    "Invalid theme schema.": "Baliogabeko gai eskema.",
-    "Error downloading theme information.": "Errorea gaiaren informazioa deskargatzean.",
-    "Theme added!": "Gaia gehituta!",
-    "Custom theme URL": "Gai pertsonalizatuaren URLa",
-    "Add theme": "Gehitu gaia",
+    "Support adding custom themes": "Azal pertsonalizatuak gehitzea onartzen du",
+    "Invalid theme schema.": "Baliogabeko azal eskema.",
+    "Error downloading theme information.": "Errorea azalaren informazioa deskargatzean.",
+    "Theme added!": "Azala gehituta!",
+    "Custom theme URL": "Azal pertsonalizatuaren URLa",
+    "Add theme": "Gehitu azala",
     "Scroll to most recent messages": "Korritu azken mezuetara",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da gelaren ordezko helbideak eguneratzean. Agian zerbitzariak ez du onartzen edo une bateko akatsa izan da.",
     "You don't have permission to delete the alias.": "Ez duzu ezizena ezabatzeko baimenik.",
@@ -2341,5 +2341,7 @@
     "Send a Direct Message": "Bidali mezu zuzena",
     "Explore Public Rooms": "Arakatu gela publikoak",
     "Create a Group Chat": "Sortu talde-txata",
-    "Self-verification request": "Auto-egiaztaketa eskaria"
+    "Self-verification request": "Auto-egiaztaketa eskaria",
+    "Delete sessions|other": "Ezabatu saioak",
+    "Delete sessions|one": "Ezabatu saioa"
 }

From 30b473bf6b86edc0b1ec20fa238b960477dc1ae7 Mon Sep 17 00:00:00 2001
From: Maik Wagner <maiktapwagner@aol.com>
Date: Sat, 11 Apr 2020 16:33:50 +0000
Subject: [PATCH 2098/3235] Translated using Weblate (German)

Currently translated at 76.0% (1737 of 2285 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 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c0c1b5508d..fd83df82b0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1074,7 +1074,7 @@
     "Render simple counters in room header": "Einfache Zähler in Raum-Kopfzeile anzeigen",
     "Enable Emoji suggestions while typing": "Emoji-Vorschläge während der Eingabe aktivieren",
     "Show a placeholder for removed messages": "Zeigt einen Platzhalter für gelöschte Nachrichten an",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Zeige Betreten-/Verlassen-Nachrichten (betrifft nicht Einladungen/Kicks/Bans)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Zeige Betreten-/Verlassen-Nachrichten (Einladungen/Kicks/Bans sind dadurch nicht betroffen)",
     "Show avatar changes": "Avatar-Änderungen anzeigen",
     "Show display name changes": "Anzeigenamen-Änderungen anzeigen",
     "Send typing notifications": "Tipp-Benachrichtigungen senden",
@@ -1222,7 +1222,7 @@
     "Use two-way text verification": "Bidirektionale Textverifizierung verwenden",
     "Waiting for partner to confirm...": "Warte auf Bestätigung des Gesprächspartners...",
     "Incoming Verification Request": "Eingehende Verifikationsanfrage",
-    "Allow Peer-to-Peer for 1:1 calls": "Erlaube Peer-to-Peer-Verbindungen für 1:1-Anrufe",
+    "Allow Peer-to-Peer for 1:1 calls": "Erlaube Peer-to-Peer für 1:1-Anrufe",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Bist du sicher? Du wirst deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gesichert sind.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Verschlüsselte Nachrichten sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger haben die Schlüssel um diese Nachrichten zu lesen.",
     "Restore from Backup": "Von Sicherung wiederherstellen",
@@ -1444,7 +1444,7 @@
     "Add Phone Number": "Telefonnummer hinzufügen",
     "Changes the avatar of the current room": "Ändert den Avatar für diesen Raum",
     "Deactivate account": "Benutzerkonto schließen",
-    "Show previews/thumbnails for images": "Zeige eine Vorschau für Bilder",
+    "Show previews/thumbnails for images": "Zeige Vorschauen/Thumbnails für Bilder",
     "View": "Vorschau",
     "Find a room…": "Suche einen Raum…",
     "Find a room… (e.g. %(exampleRoom)s)": "Suche einen Raum… (z.B. %(exampleRoom)s)",
@@ -1458,7 +1458,7 @@
     "Use an identity server to invite by email. Manage in Settings.": "Nutze einen Identitätsserver, um über E-Mail Einladungen zu verschicken. Verwalte es in den Einstellungen.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Versuche neue Möglichkeiten, um Menschen zu ignorieren (experimentell)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Schicke Lesebestätigungen für Nachrichten (erfordert einen kompatiblen Heimserver zum Deaktivieren)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Schicke Lesebestätigungen für Nachrichten (erfordert kompatiblen Heimserver zum Deaktivieren)",
     "My Ban List": "Meine Bannliste",
     "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer*innen/Servern, die du blockiert hast - verlasse den Raum nicht!",
     "Accept <policyLink /> to continue:": "Akzeptiere <policyLink />, um fortzufahren:",
@@ -1786,6 +1786,8 @@
     "Your recovery key": "Dein Wiederherstellungsschlüssel",
     "Copy": "In Zwischenablage kopieren",
     "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel",
-    "Unverified login. Was this you?": "Nicht verifzierte Anmeldung. Bist du es gewesen?",
-    "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren"
+    "Unverified login. Was this you?": "Nicht verifizierte Anmeldung. Bist du es gewesen?",
+    "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren",
+    "Show rooms with unread notifications first": "Räume mit nicht gelesenen Benachrichtungen zuerst zeigen",
+    "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen"
 }

From a049a602f20134dcbcf7a079f3185390cc065426 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sun, 12 Apr 2020 14:12:20 +0000
Subject: [PATCH 2099/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2285 of 2285 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 | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fdd79fe074..5fb1de4ea2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2333,5 +2333,27 @@
     "You cancelled verification on your other session.": "Hai annullato la verifica nell'altra sessione.",
     "%(displayName)s cancelled verification.": "%(displayName)s ha annullato la verifica.",
     "You cancelled verification.": "Hai annullato la verifica.",
-    "Self-verification request": "Richiesta di auto-verifica"
+    "Self-verification request": "Richiesta di auto-verifica",
+    "%(name)s is requesting verification": "%(name)s sta richiedendo la verifica",
+    "well formed": "formattato bene",
+    "unexpected type": "tipo inatteso",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Conferma l'eliminazione di queste sessioni usando Single Sign On per dare prova della tua identità.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Conferma l'eliminazione di questa sessione usando Single Sign On per dare prova della tua identità.",
+    "Click the button below to confirm deleting these sessions.|other": "Clicca il pulsante sottostante per confermare l'eliminazione di queste sessioni.",
+    "Click the button below to confirm deleting these sessions.|one": "Clicca il pulsante sottostante per confermare l'eliminazione di questa sessione.",
+    "Delete sessions|other": "Elimina sessioni",
+    "Delete sessions|one": "Elimina sessione",
+    "Enable end-to-end encryption": "Attiva cifratura end-to-end",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Non potrai più disattivarla. I bridge e molti bot non funzioneranno.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Conferma la disattivazione del tuo account usando Single Sign On per dare prova della tua identità.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Sei sicuro di volere disattivare il tuo account? È irreversibile.",
+    "Confirm account deactivation": "Conferma disattivazione account",
+    "Server did not require any authentication": "Il server non ha richiesto alcuna autenticazione",
+    "Server did not return valid authentication information.": "Il server non ha restituito informazioni di autenticazione valide.",
+    "There was a problem communicating with the server. Please try again.": "C'è stato un problema nella comunicazione con il server. Riprova.",
+    "Welcome to %(appName)s": "Benvenuti su %(appName)s",
+    "Liberate your communication": "Libera le tue comunicazioni",
+    "Send a Direct Message": "Invia un messaggio diretto",
+    "Explore Public Rooms": "Esplora le stanze pubbliche",
+    "Create a Group Chat": "Crea una chat di gruppo"
 }

From 24e81687b35ef52bbcee6f75629832e316fb14b3 Mon Sep 17 00:00:00 2001
From: "Nils J. Haugen" <nils@gaupne.net>
Date: Sun, 12 Apr 2020 17:29:33 +0000
Subject: [PATCH 2100/3235] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 58.9% (1346 of 2285 strings)

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

diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 197212fb09..a3418a174d 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1381,5 +1381,6 @@
     "Enter your passphrase a second time to confirm it.": "Stadfest passfrasen ved å skrive den inn ein gong til.",
     "Unable to set up secret storage": "Oppsett av hemmeleg lager feila",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne økta har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar vart fjerna.",
-    "Toggle microphone mute": "Slå av/på demping av mikrofon"
+    "Toggle microphone mute": "Slå av/på demping av mikrofon",
+    "Confirm": "Stadfest"
 }

From 36587d98eadaf7cf31b8e0b2798798a482f084e6 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 10 Apr 2020 21:00:24 +0000
Subject: [PATCH 2101/3235] Translated using Weblate (Russian)

Currently translated at 90.2% (2062 of 2285 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 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index dce962c3a0..bd20572d40 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -116,9 +116,9 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
-    "%(targetName)s joined the room.": "В комнату входит %(targetName)s.",
+    "%(targetName)s joined the room.": "%(targetName)s входит в комнату.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
-    "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
+    "%(targetName)s left the room.": "%(targetName)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 сделал(а) историю разговора видимой для всех собеседников.",
@@ -830,7 +830,7 @@
     "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений",
     "Set Password": "Задать пароль",
     "Off": "Выключить",
-    "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
+    "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате в этой сети",
     "Mentions only": "Только при упоминаниях",
     "Wednesday": "Среда",
     "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учётной записи после выхода и войти на других устройствах.",
@@ -1042,7 +1042,7 @@
     "Failed to load group members": "Не удалось загрузить участников группы",
     "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>.": "Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут залогиниться</b>.",
-    "Join": "Присоединиться",
+    "Join": "Войти",
     "That doesn't look like a valid email address": "Это не похоже на адрес электронной почты",
     "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>, чтобы продолжить использование службы.",
@@ -1270,7 +1270,7 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s включено для %(newGroups)s и отключено для %(oldGroups)s в этой комнате.",
     "Once enabled, encryption cannot be disabled.": "После включения, шифрование не может быть отключено.",
     "This room has been replaced and is no longer active.": "Эта комната была замещена и больше не активна.",
-    "Joining room …": "Вступление в комнату …",
+    "Joining room …": "Вход в комнату …",
     "Loading …": "Загрузка…",
     "Rejecting invite …": "Отказ от приглашения …",
     "Join the conversation with an account": "Присоединиться к разговору с учётной записью",
@@ -1671,7 +1671,7 @@
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного домашнего сервера <a> Что это значит? </a>",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного сервера идентификации <a>Что это значит?</a>",
     "%(creator)s created and configured the room.": "%(creator)s создал и настроил комнату.",
-    "Preview": "Предпросмотр",
+    "Preview": "Заглянуть",
     "View": "Просмотр",
     "Find a room…": "Найди комнату…",
     "Find a room… (e.g. %(exampleRoom)s)": "Найди комнату... (напр. %(exampleRoom)s)",
@@ -2101,5 +2101,7 @@
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Вы не сможете его отключить в дальнейшем. Мосты и большинство ботов пока что не будут работать.",
     "Verify session": "Подтвердить сессию",
     "Session name": "Название сессии",
-    "Session key": "Ключ сессии"
+    "Session key": "Ключ сессии",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервная копия ключа сохранена в хранилище секретов",
+    "Backup key stored: ": "Резервная копия ключа сохранена: "
 }

From 09d56e7bbc13461aeee7229de15e582c1eb4ee9d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 13:05:23 +0100
Subject: [PATCH 2102/3235] Fix create room dialog e2ee private room setting

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/CreateRoomDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 88e90627e8..f18e28b85e 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -66,7 +66,7 @@ export default createReactClass({
         }
 
         if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
-            createOpts.encryption = this.state.isEncrypted;
+            opts.encryption = this.state.isEncrypted;
         }
 
         return opts;

From bf8478fd36c1b28809c71a7202b1c3b0d6ab8fdb Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 14 Apr 2020 12:05:21 +0000
Subject: [PATCH 2103/3235] Translated using Weblate (Albanian)

Currently translated at 99.3% (2273 of 2288 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index c467873553..fef96e8193 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2336,5 +2336,10 @@
     "Liberate your communication": "Çlironi komunikimin tuaj",
     "Send a Direct Message": "Dërgoni Mesazh të Drejtpërdrejtë",
     "Explore Public Rooms": "Eksploroni Dhoma Publike",
-    "Create a Group Chat": "Krijoni një Fjalosje Grupi"
+    "Create a Group Chat": "Krijoni një Fjalosje Grupi",
+    "Failed to set topic": "S’u arrit të caktohej temë",
+    "Command failed": "Urdhri dështoi",
+    "Could not find user in room": "S’u gjet përdorues në dhomë",
+    "well formed": "e mirëformuar",
+    "Delete sessions|other": "Fshiji sesionet"
 }

From 408dad0f8bf474bf29a043b605b6c93df3888c04 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 14 Apr 2020 12:06:15 +0000
Subject: [PATCH 2104/3235] Translated using Weblate (Albanian)

Currently translated at 99.3% (2273 of 2288 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index fef96e8193..81b361c69c 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2341,5 +2341,6 @@
     "Command failed": "Urdhri dështoi",
     "Could not find user in room": "S’u gjet përdorues në dhomë",
     "well formed": "e mirëformuar",
-    "Delete sessions|other": "Fshiji sesionet"
+    "Delete sessions|other": "Fshiji sesionet",
+    "Delete sessions|one": "Fshije sesionin"
 }

From e114effcfad25efe3a2e16faf3a26a0c21ef82ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 13:07:44 +0100
Subject: [PATCH 2105/3235] make code more readable as per pr suggestion

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/EmojiProvider.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index 76058b42b0..670776644e 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -101,9 +101,7 @@ export default class EmojiProvider extends AutocompleteProvider {
             // then sort by score (Infinity if matchedString not in shortname)
             sorters.push((c) => score(matchedString, c.shortname));
             // then sort by max score of all shortcodes, trim off the `:`
-            sorters.push((c) => {
-                return Math.min.apply(null, c.emoji.shortcodes.map(s => score(matchedString.substring(1), s)));
-            });
+            sorters.push((c) => Math.min(...c.emoji.shortcodes.map(s => score(matchedString.substring(1), s))));
             // If the matchedString is not empty, sort by length of shortname. Example:
             //  matchedString = ":bookmark"
             //  completions = [":bookmark:", ":bookmark_tabs:", ...]

From 8a1b8b9998fd89a849c0c7dc336bf15d77f71134 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 14 Apr 2020 12:06:41 +0000
Subject: [PATCH 2106/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2281 of 2288 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 81b361c69c..426f964a29 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2342,5 +2342,13 @@
     "Could not find user in room": "S’u gjet përdorues në dhomë",
     "well formed": "e mirëformuar",
     "Delete sessions|other": "Fshiji sesionet",
-    "Delete sessions|one": "Fshije sesionin"
+    "Delete sessions|one": "Fshije sesionin",
+    "Enable end-to-end encryption": "Aktivizo fshehtëzim skaj-më-skaj",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Këtë s’mund ta çaktivizoni më vonë. Urat & shumica e robotëve ende s’do të funksionojnë.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Ripohoni çaktivizimin e llogarisë tuaj duke përdorur Hyrje Njëshe që të dëshmoni identitetin tuaj.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Jeni i sigurt se doni të çaktivizohet llogaria juaj? Kjo është e pakthyeshme.",
+    "Confirm account deactivation": "Ripohoni çaktivizim llogarie",
+    "Server did not require any authentication": "Shërbyesi s’kërkoi ndonjë mirëfilltësim",
+    "Server did not return valid authentication information.": "Shërbyesi s’ktheu ndonjë të dhënë të vlefshme mirëfilltësimi.",
+    "There was a problem communicating with the server. Please try again.": "Pati një problem në komunikimin me shërbyesin. Ju lutemi, riprovoni."
 }

From a7d95d396eb5e504bce352e36a40e45dd638b28a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 14:46:04 +0100
Subject: [PATCH 2107/3235] fix copyright

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/messages/_MVideoBody.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/messages/_MVideoBody.scss b/res/css/views/messages/_MVideoBody.scss
index db044aba03..3b05c53f34 100644
--- a/res/css/views/messages/_MVideoBody.scss
+++ b/res/css/views/messages/_MVideoBody.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 50d6551c86d1a8f49830801d2988c964fa094d1f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 14:50:09 +0100
Subject: [PATCH 2108/3235] @replaceableComponent

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 0e2a74faae..ecf6a92c89 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -41,6 +41,7 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
 import ResizeNotifier from "../../utils/ResizeNotifier";
+import { replaceableComponent } from '../../utils/replaceableComponent';
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -108,6 +109,7 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
+@replaceableComponent("structures.LoggedInView")
 class LoggedInView extends React.PureComponent<IProps, IState> {
     static displayName = 'LoggedInView';
 

From 26569dea065ddb42877d8bece5db7162f7f45cf8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 14:59:20 +0100
Subject: [PATCH 2109/3235] Revert "@replaceableComponent"

This reverts commit 50d6551c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index ecf6a92c89..0e2a74faae 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -41,7 +41,6 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
 import ResizeNotifier from "../../utils/ResizeNotifier";
-import { replaceableComponent } from '../../utils/replaceableComponent';
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -109,7 +108,6 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-@replaceableComponent("structures.LoggedInView")
 class LoggedInView extends React.PureComponent<IProps, IState> {
     static displayName = 'LoggedInView';
 

From 69382ff8e59bc01f9ce10daaedf240a02e20fc8b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 15:24:41 +0100
Subject: [PATCH 2110/3235] Fix handler to use react bubbling rather than a
 native global onKeyDown

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 32 +++++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9405a26ab2..6454136164 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -422,7 +422,7 @@ export default createReactClass({
         }
         this.onResize();
 
-        document.addEventListener("keydown", this.onKeyDown);
+        document.addEventListener("keydown", this.onNativeKeyDown);
     },
 
     shouldComponentUpdate: function(nextProps, nextState) {
@@ -500,7 +500,7 @@ export default createReactClass({
             this.props.resizeNotifier.removeListener("middlePanelResized", this.onResize);
         }
 
-        document.removeEventListener("keydown", this.onKeyDown);
+        document.removeEventListener("keydown", this.onNativeKeyDown);
 
         // Remove RoomStore listener
         if (this._roomStoreToken) {
@@ -542,7 +542,8 @@ export default createReactClass({
         }
     },
 
-    onKeyDown: function(ev) {
+    // we register global shortcuts here, they *must not conflict* with local shortcuts elsewhere or both will fire
+    onNativeKeyDown: function(ev) {
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
 
@@ -560,11 +561,24 @@ export default createReactClass({
                     handled = true;
                 }
                 break;
+        }
 
+        if (handled) {
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    },
+
+    onReactKeyDown: function(ev) {
+        let handled = false;
+
+        switch (ev.key) {
             case Key.ESCAPE:
-                this._messagePanel.forgetReadMarker();
-                this.jumpToLiveTimeline();
-                handled = true;
+                if (!ev.altKey && !ev.ctrlKey && !ev.shiftKey && !ev.metaKey) {
+                    this._messagePanel.forgetReadMarker();
+                    this.jumpToLiveTimeline();
+                    handled = true;
+                }
                 break;
         }
 
@@ -2030,9 +2044,13 @@ export default createReactClass({
             mx_RoomView_timeline_rr_enabled: this.state.showReadReceipts,
         });
 
+        const mainClasses = classNames("mx_RoomView", {
+            mx_RoomView_inCall: inCall,
+        });
+
         return (
             <RoomContext.Provider value={this.state}>
-                <main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref={this._roomView}>
+                <main className={mainClasses} ref={this._roomView} onKeyDown={this.onReactKeyDown}>
                     <ErrorBoundary>
                         <RoomHeader
                             room={this.state.room}

From 7b3c34bd129a77eaade524fa1ae458903b46dfc4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 Apr 2020 16:46:02 +0200
Subject: [PATCH 2111/3235] use js-sdk qr code generation

---
 .../VerificationQREmojiOptions.js             | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/views/verification/VerificationQREmojiOptions.js b/src/components/views/verification/VerificationQREmojiOptions.js
index d72c6951fe..89b3a596d7 100644
--- a/src/components/views/verification/VerificationQREmojiOptions.js
+++ b/src/components/views/verification/VerificationQREmojiOptions.js
@@ -20,8 +20,8 @@ import { _t } from '../../../languageHandler';
 import AccessibleButton from "../elements/AccessibleButton";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
-import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
+import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
 @replaceableComponent("views.verification.VerificationQREmojiOptions")
 export default class VerificationQREmojiOptions extends React.Component {
@@ -31,31 +31,17 @@ export default class VerificationQREmojiOptions extends React.Component {
         onStartEmoji: PropTypes.func.isRequired,
     };
 
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            qrProps: null,
-        };
-
-        this._prepareQrCode(props.request);
-    }
-
-    async _prepareQrCode(request: VerificationRequest) {
-        try {
-            const props = await VerificationQRCode.getPropsForRequest(request);
-            this.setState({qrProps: props});
-        } catch (e) {
-            console.error(e);
-            // We just won't show a QR code
-        }
-    }
-
     render() {
-        let qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
-        if (this.state.qrProps) {
-            qrCode = <VerificationQRCode {...this.state.qrProps} />;
+        const {request} = this.props;
+        const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
+
+        let qrCode;
+        if (showQR) {
+            qrCode = <VerificationQRCode qrCodeData={request.qrCodeData} />;
+        } else {
+            qrCode = <div className='mx_VerificationQREmojiOptions_noQR'><Spinner /></div>;
         }
+
         return (
             <div>
                 {_t("Verify this session by completing one of the following:")}

From db09cadb667c158479c87b421cb95edc2042023e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 Apr 2020 17:19:15 +0200
Subject: [PATCH 2112/3235] remove spinner, change copy, add button placeholder

---
 res/css/_components.scss                      |  1 +
 .../structures/auth/_CompleteSecurity.scss    |  1 +
 .../views/elements/_ButtonPlaceholder.scss    | 24 +++++++++++++++++++
 .../structures/auth/SetupEncryptionBody.js    |  6 ++---
 .../views/elements/ButtonPlaceholder.js       | 19 +++++++++++++++
 src/i18n/strings/en_EN.json                   |  4 ++--
 6 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 res/css/views/elements/_ButtonPlaceholder.scss
 create mode 100644 src/components/views/elements/ButtonPlaceholder.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 8706772ad9..21df53d0b9 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -94,6 +94,7 @@
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
 @import "./views/elements/_AddressTile.scss";
+@import "./views/elements/_ButtonPlaceholder.scss";
 @import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 3050840fe8..80e7aaada0 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -44,6 +44,7 @@ limitations under the License.
 .mx_CompleteSecurity_actionRow {
     display: flex;
     justify-content: flex-end;
+    margin-top: $font-28px;
 
     .mx_AccessibleButton {
         margin-inline-start: 18px;
diff --git a/res/css/views/elements/_ButtonPlaceholder.scss b/res/css/views/elements/_ButtonPlaceholder.scss
new file mode 100644
index 0000000000..c9a8c1f794
--- /dev/null
+++ b/res/css/views/elements/_ButtonPlaceholder.scss
@@ -0,0 +1,24 @@
+/*
+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.
+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_ButtonPlaceholder {
+    font-size: $font-14px;
+    font-weight: 600;
+    padding: 7px 18px;
+    display: inline-block;
+    text-align: center;
+    color: $authpage-secondary-color;
+}
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index c7c73cd616..a982957ed0 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -108,14 +108,13 @@ export default class SetupEncryptionBody extends React.Component {
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
-            const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+            const ButtonPlaceholder = sdk.getComponent("elements.ButtonPlaceholder");
             return (
                 <div>
                     <p>{_t(
-                        "Open an existing session & use it to verify this one, " +
+                        "Use an existing session to verify this one, " +
                         "granting it access to encrypted messages.",
                     )}</p>
-                    <p className="mx_CompleteSecurity_waiting"><InlineSpinner />{_t("Waiting…")}</p>
                     <p>{_t(
                         "If you can’t access one, <button>use your recovery key or passphrase.</button>",
                     {}, {
@@ -133,6 +132,7 @@ export default class SetupEncryptionBody extends React.Component {
                         >
                             {_t("Skip")}
                         </AccessibleButton>
+                        <ButtonPlaceholder>{_t("Use your other device to continue…")}</ButtonPlaceholder>
                     </div>
                 </div>
             );
diff --git a/src/components/views/elements/ButtonPlaceholder.js b/src/components/views/elements/ButtonPlaceholder.js
new file mode 100644
index 0000000000..9c40df9db6
--- /dev/null
+++ b/src/components/views/elements/ButtonPlaceholder.js
@@ -0,0 +1,19 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+export default function ButtonPlaceholder(props) {
+    return <div class="mx_ButtonPlaceholder">{props.children}</div>;
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae8ed90402..a46c357a3e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2112,9 +2112,9 @@
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Open an existing session & use it to verify this one, granting it access to encrypted messages.",
-    "Waiting…": "Waiting…",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "Use an existing session to verify this one, granting it access to encrypted messages.",
     "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+    "Use your other device to continue…": "Use your other device to continue…",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",

From 368737cfd95f700f376453f1921b13cbc92005f2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 Apr 2020 17:41:06 +0200
Subject: [PATCH 2113/3235] fix copyright

---
 res/css/views/elements/_ButtonPlaceholder.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_ButtonPlaceholder.scss b/res/css/views/elements/_ButtonPlaceholder.scss
index c9a8c1f794..858fcdecf6 100644
--- a/res/css/views/elements/_ButtonPlaceholder.scss
+++ b/res/css/views/elements/_ButtonPlaceholder.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 24fe125cb63090ef5e14aae1a1551d38d1a7a899 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 Apr 2020 17:53:33 +0200
Subject: [PATCH 2114/3235] dont try to enable 4S if cross-signing is disabled

---
 src/verification.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/verification.js b/src/verification.js
index 3170eb8825..e00e5e05fa 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -61,15 +61,18 @@ function UntrustedDeviceDialog(props) {
 }
 
 export async function verifyDevice(user, device) {
-    if (!await enable4SIfNeeded()) {
-        return;
+    const cli = MatrixClientPeg.get();
+    // if cross-signing is not explicitly disabled, check if it should be enabled first.
+    if (cli.getCryptoTrustCrossSignedDevices()) {
+        if (!await enable4SIfNeeded()) {
+            return;
+        }
     }
     Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
         user,
         device,
         onFinished: async (action) => {
             if (action === "sas") {
-                const cli = MatrixClientPeg.get();
                 const verificationRequestPromise = cli.legacyDeviceVerification(
                     user.userId,
                     device.deviceId,
@@ -95,10 +98,13 @@ export async function verifyDevice(user, device) {
 }
 
 export async function legacyVerifyUser(user) {
-    if (!await enable4SIfNeeded()) {
-        return;
-    }
     const cli = MatrixClientPeg.get();
+    // if cross-signing is not explicitly disabled, check if it should be enabled first.
+    if (cli.getCryptoTrustCrossSignedDevices()) {
+        if (!await enable4SIfNeeded()) {
+            return;
+        }
+    }
     const verificationRequestPromise = cli.requestVerification(user.userId);
     dis.dispatch({
         action: "set_right_panel_phase",

From 769cf1c9870b3ebcb75e5a96e30fbc141efb1792 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Apr 2020 17:34:39 +0100
Subject: [PATCH 2115/3235] Allow network dropdown to be scrollable and fix
 context menu window padding calc

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 2 ++
 src/components/structures/ContextMenu.js      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index 269b507e3c..dd1892c448 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -35,6 +35,8 @@ limitations under the License.
     border-radius: 4px;
     border: 1px solid $dialog-close-fg-color;
     background-color: $primary-bg-color;
+    max-height: calc(100vh - 20px); // allow 10px padding on both top and bottom
+    overflow-y: auto;
 }
 
 .mx_NetworkDropdown_menu_network {
diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.js
index b4647a6c30..98b0867ccc 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.js
@@ -245,7 +245,6 @@ export class ContextMenu extends React.Component {
         }
 
         const contextMenuRect = this.state.contextMenuElem ? this.state.contextMenuElem.getBoundingClientRect() : null;
-        const padding = 10;
 
         const chevronOffset = {};
         if (props.chevronFace) {
@@ -264,7 +263,8 @@ export class ContextMenu extends React.Component {
             // If we know the dimensions of the context menu, adjust its position
             // such that it does not leave the (padded) window.
             if (contextMenuRect) {
-                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
+                const padding = 10;
+                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height + padding);
             }
 
             position.top = adjusted;

From 89bc3bdd5bb1fb0668f76981b05f8712de33b89d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:16:11 +0100
Subject: [PATCH 2116/3235] consolidate and extract copyPlaintext, copyNode and
 selectText

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../keybackup/CreateKeyBackupDialog.js        | 14 +---
 .../CreateSecretStorageDialog.js              | 14 +---
 src/components/views/dialogs/ShareDialog.js   | 76 ++++++++-----------
 src/components/views/messages/TextualBody.js  | 26 ++-----
 src/utils/strings.ts                          | 75 ++++++++++++++++++
 5 files changed, 117 insertions(+), 88 deletions(-)
 create mode 100644 src/utils/strings.ts

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3a480a2579..7e5e0afb79 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -25,6 +25,7 @@ import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
 import SettingsStore from '../../../../settings/SettingsStore';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
+import {copyNode} from "../../../../utils/strings";
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -37,16 +38,6 @@ const PHASE_OPTOUT_CONFIRM = 6;
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
 
-// 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 e2e key backup
  * on the server.
@@ -101,8 +92,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     }
 
     _onCopyClick = () => {
-        selectText(this._recoveryKeyNode);
-        const successful = document.execCommand('copy');
+        const successful = copyNode(this._recoveryKeyNode);
         if (successful) {
             this.setState({
                 copied: true,
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index d63db617d5..cfad49c38d 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -24,6 +24,7 @@ import FileSaver from 'file-saver';
 import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
+import {copyNode} from "../../../../utils/strings";
 
 const PHASE_LOADING = 0;
 const PHASE_MIGRATE = 1;
@@ -38,16 +39,6 @@ const PHASE_CONFIRM_SKIP = 8;
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
 
-// 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 a passphrase to guard Secure
  * Secret Storage in account data.
@@ -169,8 +160,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _onCopyClick = () => {
-        selectText(this._recoveryKeyNode);
-        const successful = document.execCommand('copy');
+        const successful = copyNode(this._recoveryKeyNode);
         if (successful) {
             this.setState({
                 copied: true,
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index 1bc9decd39..ebd1f8d1eb 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -23,6 +23,7 @@ import QRCode from 'qrcode-react';
 import {RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import * as ContextMenu from "../../structures/ContextMenu";
 import {toRightOf} from "../../structures/ContextMenu";
+import {copyPlaintext, selectText} from "../../../utils/strings";
 
 const socials = [
     {
@@ -81,45 +82,26 @@ export default class ShareDialog extends React.Component {
             linkSpecificEvent: this.props.target instanceof MatrixEvent,
             permalinkCreator,
         };
-
-        this._link = createRef();
-    }
-
-    static _selectText(target) {
-        const range = document.createRange();
-        range.selectNodeContents(target);
-
-        const selection = window.getSelection();
-        selection.removeAllRanges();
-        selection.addRange(range);
     }
 
     static onLinkClick(e) {
         e.preventDefault();
-        const {target} = e;
-        ShareDialog._selectText(target);
+        selectText(e.target);
     }
 
-    onCopyClick(e) {
+    async onCopyClick(e) {
         e.preventDefault();
+        const target = e.target; // copy target before we go async and React throws it away
 
-        ShareDialog._selectText(this._link.current);
-
-        let successful;
-        try {
-            successful = document.execCommand('copy');
-        } catch (err) {
-            console.error('Failed to copy: ', err);
-        }
-
-        const buttonRect = e.target.getBoundingClientRect();
+        const successful = await copyPlaintext(this.getUrl());
+        const buttonRect = target.getBoundingClientRect();
         const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
         const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
             ...toRightOf(buttonRect, 2),
             message: successful ? _t('Copied!') : _t('Failed to copy'),
         });
         // Drop a reference to this close handler for componentWillUnmount
-        this.closeCopiedTooltip = e.target.onmouseleave = close;
+        this.closeCopiedTooltip = target.onmouseleave = close;
     }
 
     onLinkSpecificEventCheckboxClick() {
@@ -134,10 +116,32 @@ export default class ShareDialog extends React.Component {
         if (this.closeCopiedTooltip) this.closeCopiedTooltip();
     }
 
-    render() {
-        let title;
+    getUrl() {
         let matrixToUrl;
 
+        if (this.props.target instanceof Room) {
+            if (this.state.linkSpecificEvent) {
+                const events = this.props.target.getLiveTimeline().getEvents();
+                matrixToUrl = this.state.permalinkCreator.forEvent(events[events.length - 1].getId());
+            } else {
+                matrixToUrl = this.state.permalinkCreator.forRoom();
+            }
+        } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
+            matrixToUrl = makeUserPermalink(this.props.target.userId);
+        } else if (this.props.target instanceof Group) {
+            matrixToUrl = makeGroupPermalink(this.props.target.groupId);
+        } else if (this.props.target instanceof MatrixEvent) {
+            if (this.state.linkSpecificEvent) {
+                matrixToUrl = this.props.permalinkCreator.forEvent(this.props.target.getId());
+            } else {
+                matrixToUrl = this.props.permalinkCreator.forRoom();
+            }
+        }
+        return matrixToUrl;
+    }
+
+    render() {
+        let title;
         let checkbox;
 
         if (this.props.target instanceof Room) {
@@ -155,18 +159,10 @@ export default class ShareDialog extends React.Component {
                     </label>
                 </div>;
             }
-
-            if (this.state.linkSpecificEvent) {
-                matrixToUrl = this.state.permalinkCreator.forEvent(events[events.length - 1].getId());
-            } else {
-                matrixToUrl = this.state.permalinkCreator.forRoom();
-            }
         } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
             title = _t('Share User');
-            matrixToUrl = makeUserPermalink(this.props.target.userId);
         } else if (this.props.target instanceof Group) {
             title = _t('Share Community');
-            matrixToUrl = makeGroupPermalink(this.props.target.groupId);
         } else if (this.props.target instanceof MatrixEvent) {
             title = _t('Share Room Message');
             checkbox = <div>
@@ -178,14 +174,9 @@ export default class ShareDialog extends React.Component {
                     { _t('Link to selected message') }
                 </label>
             </div>;
-
-            if (this.state.linkSpecificEvent) {
-                matrixToUrl = this.props.permalinkCreator.forEvent(this.props.target.getId());
-            } else {
-                matrixToUrl = this.props.permalinkCreator.forRoom();
-            }
         }
 
+        const matrixToUrl = this.getUrl();
         const encodedUrl = encodeURIComponent(matrixToUrl);
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
@@ -196,8 +187,7 @@ export default class ShareDialog extends React.Component {
         >
             <div className="mx_ShareDialog_content">
                 <div className="mx_ShareDialog_matrixto">
-                    <a ref={this._link}
-                       href={matrixToUrl}
+                    <a href={matrixToUrl}
                        onClick={ShareDialog.onLinkClick}
                        className="mx_ShareDialog_matrixto_link"
                     >
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 27514d0e23..882e331675 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -34,6 +34,7 @@ import {pillifyLinks, unmountPills} from '../../../utils/pillify';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
 import {toRightOf} from "../../structures/ContextMenu";
+import {copyPlaintext} from "../../../utils/strings";
 
 export default createReactClass({
     displayName: 'TextualBody',
@@ -69,23 +70,6 @@ export default createReactClass({
         };
     },
 
-    copyToClipboard: function(text) {
-        const textArea = document.createElement("textarea");
-        textArea.value = text;
-        document.body.appendChild(textArea);
-        textArea.select();
-
-        let successful = false;
-        try {
-            successful = document.execCommand('copy');
-        } catch (err) {
-            console.log('Unable to copy');
-        }
-
-        document.body.removeChild(textArea);
-        return successful;
-    },
-
     // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount: function() {
         this._content = createRef();
@@ -277,17 +261,17 @@ export default createReactClass({
         Array.from(ReactDOM.findDOMNode(this).querySelectorAll('.mx_EventTile_body pre')).forEach((p) => {
             const button = document.createElement("span");
             button.className = "mx_EventTile_copyButton";
-            button.onclick = (e) => {
+            button.onclick = async () => {
                 const copyCode = button.parentNode.getElementsByTagName("pre")[0];
-                const successful = this.copyToClipboard(copyCode.textContent);
+                const successful = await copyPlaintext(copyCode.textContent);
 
-                const buttonRect = e.target.getBoundingClientRect();
+                const buttonRect = button.getBoundingClientRect();
                 const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
                 const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
                     ...toRightOf(buttonRect, 2),
                     message: successful ? _t('Copied!') : _t('Failed to copy'),
                 });
-                e.target.onmouseleave = close;
+                button.onmouseleave = close;
             };
 
             // Wrap a div around <pre> so that the copy button can be correctly positioned
diff --git a/src/utils/strings.ts b/src/utils/strings.ts
new file mode 100644
index 0000000000..7d1fa0049d
--- /dev/null
+++ b/src/utils/strings.ts
@@ -0,0 +1,75 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+/**
+ * Copy plaintext to user's clipboard
+ * It will overwrite user's selection range
+ * In certain browsers it may only work if triggered by a user action or may ask user for permissions
+ * Tries to use new async clipboard API if available
+ * @param text the plaintext to put in the user's clipboard
+ */
+export async function copyPlaintext(text: string): Promise<boolean> {
+    try {
+        if (navigator && navigator.clipboard && navigator.clipboard.writeText) {
+            await navigator.clipboard.writeText(text);
+            return true;
+        } else {
+            const textArea = document.createElement("textarea");
+            textArea.value = text;
+
+            // Avoid scrolling to bottom
+            textArea.style.top = "0";
+            textArea.style.left = "0";
+            textArea.style.position = "fixed";
+
+            document.body.appendChild(textArea);
+            const selection = document.getSelection();
+            const range = document.createRange();
+            // range.selectNodeContents(textArea);
+            range.selectNode(textArea);
+            selection.removeAllRanges();
+            selection.addRange(range);
+
+            const successful = document.execCommand("copy");
+            selection.removeAllRanges();
+            document.body.removeChild(textArea);
+            return successful;
+        }
+    } catch (e) {
+        console.error(e);
+    }
+    return false;
+}
+
+export function selectText(target: Element) {
+    const range = document.createRange();
+    range.selectNodeContents(target);
+
+    const selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+}
+
+/**
+ * Copy rich text to user's clipboard
+ * It will overwrite user's selection range
+ * In certain browsers it may only work if triggered by a user action or may ask user for permissions
+ * @param ref pointer to the node to copy
+ */
+export function copyNode(ref: Element): boolean {
+    selectText(ref);
+    return document.execCommand('copy');
+}

From 276b5b874c1a8e7c4fa826c7fba0507fcc9babbe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:22:19 +0100
Subject: [PATCH 2117/3235] Convert ShareDialog to Typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../{ShareDialog.js => ShareDialog.tsx}       | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)
 rename src/components/views/dialogs/{ShareDialog.js => ShareDialog.tsx} (86%)

diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.tsx
similarity index 86%
rename from src/components/views/dialogs/ShareDialog.js
rename to src/components/views/dialogs/ShareDialog.tsx
index ebd1f8d1eb..375cb65b5f 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,9 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk';
+import * as React from 'react';
+import * as PropTypes from 'prop-types';
+import {Room} from "matrix-js-sdk/src/models/room";
+import {User} from "matrix-js-sdk/src/models/user";
+import {Group} from "matrix-js-sdk/src/models/group";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import QRCode from 'qrcode-react';
@@ -53,7 +58,18 @@ const socials = [
     },
 ];
 
-export default class ShareDialog extends React.Component {
+interface IProps {
+    onFinished: () => void;
+    target: Room | User | Group | RoomMember | MatrixEvent;
+    permalinkCreator: RoomPermalinkCreator;
+}
+
+interface IState {
+    linkSpecificEvent: boolean;
+    permalinkCreator: RoomPermalinkCreator;
+}
+
+export default class ShareDialog extends React.PureComponent<IProps, IState> {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
         target: PropTypes.oneOfType([
@@ -65,6 +81,8 @@ export default class ShareDialog extends React.Component {
         ]).isRequired,
     };
 
+    protected closeCopiedTooltip: () => void;
+
     constructor(props) {
         super(props);
 
@@ -206,17 +224,18 @@ export default class ShareDialog extends React.Component {
                         <QRCode value={matrixToUrl} size={256} logoWidth={48} logo={require("../../../../res/img/matrix-m.svg")} />
                     </div>
                     <div className="mx_ShareDialog_social_container">
-                        {
-                            socials.map((social) => <a rel="noreferrer noopener"
-                                                       target="_blank"
-                                                       key={social.name}
-                                                       name={social.name}
-                                                       href={social.url(encodedUrl)}
-                                                       className="mx_ShareDialog_social_icon"
+                        { socials.map((social) => (
+                            <a
+                                rel="noreferrer noopener"
+                                target="_blank"
+                                key={social.name}
+                                title={social.name}
+                                href={social.url(encodedUrl)}
+                                className="mx_ShareDialog_social_icon"
                             >
                                 <img src={social.img} alt={social.name} height={64} width={64} />
-                            </a>)
-                        }
+                            </a>
+                        )) }
                     </div>
                 </div>
             </div>

From 95eaf94cd89c12c56eb2e909fb4d9a5c8092f27f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:40:38 +0100
Subject: [PATCH 2118/3235] Fix pills being broken by unescaped characters

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/deserialize.js       |  2 +-
 src/editor/serialize.js         |  2 +-
 test/editor/deserialize-test.js | 16 ++++++++++++++++
 test/editor/serialize-test.js   | 12 ++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js
index 190963f357..d80a62b981 100644
--- a/src/editor/deserialize.js
+++ b/src/editor/deserialize.js
@@ -50,7 +50,7 @@ function parseLink(a, partCreator) {
             if (href === a.textContent) {
                 return partCreator.plain(a.textContent);
             } else {
-                return partCreator.plain(`[${a.textContent}](${href})`);
+                return partCreator.plain(`[${a.textContent.replace(/[\\\]]/, c => "\\" + c)}](${href})`);
             }
         }
     }
diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index ba380f2809..341d92d3c8 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -30,7 +30,7 @@ export function mdSerialize(model) {
                 return html + part.text;
             case "room-pill":
             case "user-pill":
-                return html + `[${part.text}](${makeGenericPermalink(part.resourceId)})`;
+                return html + `[${part.text.replace(/[\\\]]/, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
         }
     }, "");
 }
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 1c58a6c40b..be8fe8aeab 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -148,6 +148,22 @@ describe('editor/deserialize', function() {
             expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice", resourceId: "@alice:hs.tld"});
             expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
         });
+        it('user pill with displayname containing backslash', function() {
+            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice\</a>!";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts.length).toBe(3);
+            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
+            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice\\", resourceId: "@alice:hs.tld"});
+            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+        });
+        it('user pill with displayname containing closing square bracket', function() {
+            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice]</a>!";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts.length).toBe(3);
+            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
+            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice]", resourceId: "@alice:hs.tld"});
+            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+        });
         it('room pill', function() {
             const html = "Try <a href=\"https://matrix.to/#/#room:hs.tld\">#room:hs.tld</a>?";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index 7517e46437..d5fb800600 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -43,4 +43,16 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<em>hello</em> world");
     });
+    it('displaynames ending in a backslash work', function () {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.userPill("Displayname\\", "@user:server")]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\</a>");
+    });
+    it('displaynames containing a closing square bracket work', function () {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.userPill("Displayname]", "@user:server")]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname]</a>");
+    });
 });

From c72139fc3f5de58371d3b4e998e1b0b1d8223c3a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:49:08 +0100
Subject: [PATCH 2119/3235] Convert serialize and deserialize to TypeScript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/{deserialize.js => deserialize.ts} | 36 +++++++++++--------
 src/editor/{serialize.js => serialize.ts}     | 19 +++++-----
 2 files changed, 32 insertions(+), 23 deletions(-)
 rename src/editor/{deserialize.js => deserialize.ts} (87%)
 rename src/editor/{serialize.js => serialize.ts} (82%)

diff --git a/src/editor/deserialize.js b/src/editor/deserialize.ts
similarity index 87%
rename from src/editor/deserialize.js
rename to src/editor/deserialize.ts
index d80a62b981..8878a8877c 100644
--- a/src/editor/deserialize.js
+++ b/src/editor/deserialize.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,11 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import { walkDOMDepthFirst } from "./dom";
 import { checkBlockNode } from "../HtmlUtils";
-import {getPrimaryPermalinkEntity} from "../utils/permalinks/Permalinks";
+import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks";
+import { PartCreator } from "./parts";
 
-function parseAtRoomMentions(text, partCreator) {
+function parseAtRoomMentions(text: string, partCreator: PartCreator) {
     const ATROOM = "@room";
     const parts = [];
     text.split(ATROOM).forEach((textPart, i, arr) => {
@@ -37,7 +40,7 @@ function parseAtRoomMentions(text, partCreator) {
     return parts;
 }
 
-function parseLink(a, partCreator) {
+function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
     const {href} = a;
     const resourceId = getPrimaryPermalinkEntity(href); // The room/user ID
     const prefix = resourceId ? resourceId[0] : undefined; // First character of ID
@@ -56,11 +59,11 @@ function parseLink(a, partCreator) {
     }
 }
 
-function parseCodeBlock(n, partCreator) {
+function parseCodeBlock(n: HTMLElement, partCreator: PartCreator) {
     const parts = [];
     let language = "";
     if (n.firstChild && n.firstChild.nodeName === "CODE") {
-        for (const className of n.firstChild.classList) {
+        for (const className of (<HTMLElement>n.firstChild).classList) {
             if (className.startsWith("language-")) {
                 language = className.substr("language-".length);
                 break;
@@ -77,12 +80,17 @@ function parseCodeBlock(n, partCreator) {
     return parts;
 }
 
-function parseHeader(el, partCreator) {
+function parseHeader(el: HTMLElement, partCreator: PartCreator) {
     const depth = parseInt(el.nodeName.substr(1), 10);
     return partCreator.plain("#".repeat(depth) + " ");
 }
 
-function parseElement(n, partCreator, lastNode, state) {
+interface IState {
+    listIndex: number[];
+    listDepth?: number;
+}
+
+function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLElement | undefined, state: IState) {
     switch (n.nodeName) {
         case "H1":
         case "H2":
@@ -92,7 +100,7 @@ function parseElement(n, partCreator, lastNode, state) {
         case "H6":
             return parseHeader(n, partCreator);
         case "A":
-            return parseLink(n, partCreator);
+            return parseLink(<HTMLAnchorElement>n, partCreator);
         case "BR":
             return partCreator.newline();
         case "EM":
@@ -123,7 +131,7 @@ function parseElement(n, partCreator, lastNode, state) {
             break;
         }
         case "OL":
-            state.listIndex.push(n.start || 1);
+            state.listIndex.push((<HTMLOListElement>n).start || 1);
             // fallthrough
         case "UL":
             state.listDepth = (state.listDepth || 0) + 1;
@@ -174,7 +182,7 @@ function prefixQuoteLines(isFirstNode, parts, partCreator) {
     }
 }
 
-function parseHtmlMessage(html, partCreator, isQuotedMessage) {
+function parseHtmlMessage(html: string, partCreator: PartCreator, isQuotedMessage: boolean) {
     // no nodes from parsing here should be inserted in the document,
     // as scripts in event handlers, etc would be executed then.
     // we're only taking text, so that is fine
@@ -182,7 +190,7 @@ function parseHtmlMessage(html, partCreator, isQuotedMessage) {
     const parts = [];
     let lastNode;
     let inQuote = isQuotedMessage;
-    const state = {
+    const state: IState = {
         listIndex: [],
     };
 
@@ -249,7 +257,7 @@ function parseHtmlMessage(html, partCreator, isQuotedMessage) {
     return parts;
 }
 
-export function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
+export function parsePlainTextMessage(body: string, partCreator: PartCreator, isQuotedMessage: boolean) {
     const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
     const parts = lines.reduce((parts, line, i) => {
         if (isQuotedMessage) {
@@ -265,7 +273,7 @@ export function parsePlainTextMessage(body, partCreator, isQuotedMessage) {
     return parts;
 }
 
-export function parseEvent(event, partCreator, {isQuotedMessage = false} = {}) {
+export function parseEvent(event: MatrixEvent, partCreator: PartCreator, {isQuotedMessage = false} = {}) {
     const content = event.getContent();
     let parts;
     if (content.format === "org.matrix.custom.html") {
diff --git a/src/editor/serialize.js b/src/editor/serialize.ts
similarity index 82%
rename from src/editor/serialize.js
rename to src/editor/serialize.ts
index 341d92d3c8..9ff1cfbd80 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@ limitations under the License.
 
 import Markdown from '../Markdown';
 import {makeGenericPermalink} from "../utils/permalinks/Permalinks";
+import EditorModel from "./model";
 
-export function mdSerialize(model) {
+export function mdSerialize(model: EditorModel) {
     return model.parts.reduce((html, part) => {
         switch (part.type) {
             case "newline":
@@ -35,7 +36,7 @@ export function mdSerialize(model) {
     }, "");
 }
 
-export function htmlSerializeIfNeeded(model, {forceHTML = false} = {}) {
+export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} = {}) {
     const md = mdSerialize(model);
     const parser = new Markdown(md);
     if (!parser.isPlainText() || forceHTML) {
@@ -43,7 +44,7 @@ export function htmlSerializeIfNeeded(model, {forceHTML = false} = {}) {
     }
 }
 
-export function textSerialize(model) {
+export function textSerialize(model: EditorModel) {
     return model.parts.reduce((text, part) => {
         switch (part.type) {
             case "newline":
@@ -60,11 +61,11 @@ export function textSerialize(model) {
     }, "");
 }
 
-export function containsEmote(model) {
+export function containsEmote(model: EditorModel) {
     return startsWith(model, "/me ");
 }
 
-export function startsWith(model, prefix) {
+export function startsWith(model: EditorModel, prefix: string) {
     const firstPart = model.parts[0];
     // part type will be "plain" while editing,
     // and "command" while composing a message.
@@ -73,18 +74,18 @@ export function startsWith(model, prefix) {
         firstPart.text.startsWith(prefix);
 }
 
-export function stripEmoteCommand(model) {
+export function stripEmoteCommand(model: EditorModel) {
     // trim "/me "
     return stripPrefix(model, "/me ");
 }
 
-export function stripPrefix(model, prefix) {
+export function stripPrefix(model: EditorModel, prefix: string) {
     model = model.clone();
     model.removeText({index: 0, offset: 0}, prefix.length);
     return model;
 }
 
-export function unescapeMessage(model) {
+export function unescapeMessage(model: EditorModel) {
     const {parts} = model;
     if (parts.length) {
         const firstPart = parts[0];

From f1def8b0de4eadaa6672cb87d3fa3ffc80d6c43b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:50:28 +0100
Subject: [PATCH 2120/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/editor/deserialize-test.js | 2 +-
 test/editor/serialize-test.js   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index be8fe8aeab..4184552559 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -149,7 +149,7 @@ describe('editor/deserialize', function() {
             expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
         });
         it('user pill with displayname containing backslash', function() {
-            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice\</a>!";
+            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice\\</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
             expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index d5fb800600..a69e3598e3 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -43,13 +43,13 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<em>hello</em> world");
     });
-    it('displaynames ending in a backslash work', function () {
+    it('displaynames ending in a backslash work', function() {
         const pc = createPartCreator();
         const model = new EditorModel([pc.userPill("Displayname\\", "@user:server")]);
         const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\</a>");
+        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\\</a>");
     });
-    it('displaynames containing a closing square bracket work', function () {
+    it('displaynames containing a closing square bracket work', function() {
         const pc = createPartCreator();
         const model = new EditorModel([pc.userPill("Displayname]", "@user:server")]);
         const html = htmlSerializeIfNeeded(model, {});

From cb10640eafed873a9dce27c9f357b33c22430b2e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 00:53:35 +0100
Subject: [PATCH 2121/3235] detslint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/deserialize.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 8878a8877c..6680029130 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -132,10 +132,10 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
         }
         case "OL":
             state.listIndex.push((<HTMLOListElement>n).start || 1);
-            // fallthrough
+            /* falls through */
         case "UL":
             state.listDepth = (state.listDepth || 0) + 1;
-            // fallthrough
+            /* falls through */
         default:
             // don't textify block nodes we'll descend into
             if (!checkDescendInto(n)) {
@@ -244,7 +244,7 @@ function parseHtmlMessage(html: string, partCreator: PartCreator, isQuotedMessag
                 break;
             case "OL":
                 state.listIndex.pop();
-                // fallthrough
+                /* falls through */
             case "UL":
                 state.listDepth -= 1;
                 break;
@@ -259,7 +259,7 @@ function parseHtmlMessage(html: string, partCreator: PartCreator, isQuotedMessag
 
 export function parsePlainTextMessage(body: string, partCreator: PartCreator, isQuotedMessage: boolean) {
     const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
-    const parts = lines.reduce((parts, line, i) => {
+    return lines.reduce((parts, line, i) => {
         if (isQuotedMessage) {
             parts.push(partCreator.plain(QUOTE_LINE_PREFIX));
         }
@@ -270,7 +270,6 @@ export function parsePlainTextMessage(body: string, partCreator: PartCreator, is
         }
         return parts;
     }, []);
-    return parts;
 }
 
 export function parseEvent(event: MatrixEvent, partCreator: PartCreator, {isQuotedMessage = false} = {}) {

From 4454db30d67e9ff82848da0a6d242f1452e9f93a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 01:02:08 +0100
Subject: [PATCH 2122/3235] Escape opening square bracket too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/deserialize.ts       | 2 +-
 src/editor/serialize.ts         | 2 +-
 test/editor/deserialize-test.js | 8 ++++++++
 test/editor/serialize-test.js   | 6 ++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 6680029130..5322f09f11 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -53,7 +53,7 @@ function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
             if (href === a.textContent) {
                 return partCreator.plain(a.textContent);
             } else {
-                return partCreator.plain(`[${a.textContent.replace(/[\\\]]/, c => "\\" + c)}](${href})`);
+                return partCreator.plain(`[${a.textContent.replace(/[[\\\]]/, c => "\\" + c)}](${href})`);
             }
         }
     }
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 9ff1cfbd80..d501bdd47e 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -31,7 +31,7 @@ export function mdSerialize(model: EditorModel) {
                 return html + part.text;
             case "room-pill":
             case "user-pill":
-                return html + `[${part.text.replace(/[\\\]]/, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
+                return html + `[${part.text.replace(/[[\\\]]/, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
         }
     }, "");
 }
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 4184552559..fb97d75752 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -156,6 +156,14 @@ describe('editor/deserialize', function() {
             expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice\\", resourceId: "@alice:hs.tld"});
             expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
         });
+        it('user pill with displayname containing opening square bracket', function() {
+            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice[</a>!";
+            const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
+            expect(parts.length).toBe(3);
+            expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
+            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice[", resourceId: "@alice:hs.tld"});
+            expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
+        });
         it('user pill with displayname containing closing square bracket', function() {
             const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice]</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index a69e3598e3..a114f89de2 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -49,6 +49,12 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname\\</a>");
     });
+    it('displaynames containing an opening square bracket work', function() {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.userPill("Displayname[", "@user:server")]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname[</a>");
+    });
     it('displaynames containing a closing square bracket work', function() {
         const pc = createPartCreator();
         const model = new EditorModel([pc.userPill("Displayname]", "@user:server")]);

From 9c1939b75679980f14f3ee550af00e65346c1fd0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 02:31:30 +0100
Subject: [PATCH 2123/3235] match all, not just first instance of tokens to
 escape

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/editor/deserialize.ts       | 2 +-
 src/editor/serialize.ts         | 2 +-
 test/editor/deserialize-test.js | 4 ++--
 test/editor/serialize-test.js   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 5322f09f11..48d1d98ae4 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -53,7 +53,7 @@ function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
             if (href === a.textContent) {
                 return partCreator.plain(a.textContent);
             } else {
-                return partCreator.plain(`[${a.textContent.replace(/[[\\\]]/, c => "\\" + c)}](${href})`);
+                return partCreator.plain(`[${a.textContent.replace(/[[\\\]]/g, c => "\\" + c)}](${href})`);
             }
         }
     }
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index d501bdd47e..4d0b8cd03a 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -31,7 +31,7 @@ export function mdSerialize(model: EditorModel) {
                 return html + part.text;
             case "room-pill":
             case "user-pill":
-                return html + `[${part.text.replace(/[[\\\]]/, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
+                return html + `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
         }
     }, "");
 }
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index fb97d75752..2bd5d7e4c6 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -157,11 +157,11 @@ describe('editor/deserialize', function() {
             expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
         });
         it('user pill with displayname containing opening square bracket', function() {
-            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice[</a>!";
+            const html = "Hi <a href=\"https://matrix.to/#/@alice:hs.tld\">Alice[[</a>!";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
             expect(parts.length).toBe(3);
             expect(parts[0]).toStrictEqual({type: "plain", text: "Hi "});
-            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice[", resourceId: "@alice:hs.tld"});
+            expect(parts[1]).toStrictEqual({type: "user-pill", text: "Alice[[", resourceId: "@alice:hs.tld"});
             expect(parts[2]).toStrictEqual({type: "plain", text: "!"});
         });
         it('user pill with displayname containing closing square bracket', function() {
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index a114f89de2..bd26ae91bb 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -51,9 +51,9 @@ describe('editor/serialize', function() {
     });
     it('displaynames containing an opening square bracket work', function() {
         const pc = createPartCreator();
-        const model = new EditorModel([pc.userPill("Displayname[", "@user:server")]);
+        const model = new EditorModel([pc.userPill("Displayname[[", "@user:server")]);
         const html = htmlSerializeIfNeeded(model, {});
-        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname[</a>");
+        expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname[[</a>");
     });
     it('displaynames containing a closing square bracket work', function() {
         const pc = createPartCreator();

From e9c755e73fe87015719dc2f872d5526e22ec1f9a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 15 Apr 2020 10:25:05 +0100
Subject: [PATCH 2124/3235] Remove end-to-end message info option when
 cross-signing is used

This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
---
 src/components/views/messages/MessageActionBar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index fbc864caf2..5516ff2146 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -26,6 +26,7 @@ import Modal from '../../../Modal';
 import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 import RoomContext from "../../../contexts/RoomContext";
+import SettingsStore from '../../../settings/SettingsStore';
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -48,7 +49,7 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
         };
 
         let e2eInfoCallback = null;
-        if (mxEvent.isEncrypted()) {
+        if (mxEvent.isEncrypted() && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
             e2eInfoCallback = onCryptoClick;
         }
 

From 346b2e8588752f68f70a8df47fa8000a6cb55e44 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 12:21:49 +0100
Subject: [PATCH 2125/3235] Login block on initialSync with spinners

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/auth/_AuthBody.scss          | 18 ++++++++++++
 src/components/structures/MatrixChat.js    | 23 +++++----------
 src/components/structures/auth/Login.js    | 33 +++++++++++++++++++---
 src/components/views/auth/PasswordLogin.js |  5 ++--
 4 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 468a4b3d62..4b2d6b1bf1 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -119,6 +119,24 @@ limitations under the License.
     margin-right: 0;
 }
 
+.mx_AuthBody_paddedFooter {
+    height: 80px; // height of the submit button + register link
+    padding-top: 28px;
+    text-align: center;
+
+    .mx_AuthBody_paddedFooter_title {
+        margin-top: 16px;
+        font-size: $font-15px;
+        line-height: $font-24px;
+    }
+
+    .mx_AuthBody_paddedFooter_subtitle {
+        margin-top: 8px;
+        font-size: $font-10px;
+        line-height: $font-14px;
+    }
+}
+
 .mx_AuthBody_changeFlow {
     display: block;
     text-align: center;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index da416142f8..61b72f650b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1906,23 +1906,12 @@ export default createReactClass({
             this._onLoggedIn();
         }
 
-        // Test for the master cross-signing key in SSSS as a quick proxy for
-        // whether cross-signing has been set up on the account. We can't
-        // really continue until we know whether it's there or not so retry
-        // if this fails.
-        let masterKeyInStorage;
-        while (masterKeyInStorage === undefined) {
-            try {
-                masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
-            } catch (e) {
-                if (e.errcode === "M_NOT_FOUND") {
-                    masterKeyInStorage = false;
-                } else {
-                    console.warn("Secret storage account data check failed: retrying...", e);
-                }
-            }
-        }
+        this.setState({ pendingInitialSync: true });
+        await this.firstSyncPromise.promise;
 
+        // Test for the master cross-signing key in SSSS as a quick proxy for
+        // whether cross-signing has been set up on the account.
+        const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");
         if (masterKeyInStorage) {
             // Auto-enable cross-signing for the new session when key found in
             // secret storage.
@@ -1939,6 +1928,7 @@ export default createReactClass({
         } else {
             this._onLoggedIn();
         }
+        this.setState({ pendingInitialSync: false });
 
         return setLoggedInPromise;
     },
@@ -2060,6 +2050,7 @@ export default createReactClass({
             const Login = sdk.getComponent('structures.auth.Login');
             view = (
                 <Login
+                    isSyncing={this.state.pendingInitialSync}
                     onLoggedIn={this.onUserCompletedLoginFlow}
                     onRegisterClick={this.onRegisterClick}
                     fallbackHsUrl={this.getFallbackHsUrl()}
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 836e5bd93d..93c93fd5ab 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -84,11 +84,13 @@ export default createReactClass({
         onServerConfigChange: PropTypes.func.isRequired,
 
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
+        isSyncing: PropTypes.bool,
     },
 
     getInitialState: function() {
         return {
             busy: false,
+            busyLoggingIn: null,
             errorText: null,
             loginIncorrect: false,
             canTryLogin: true, // can we attempt to log in or are there validation errors?
@@ -169,6 +171,7 @@ export default createReactClass({
                 const componentState = AutoDiscoveryUtils.authComponentStateForError(e);
                 this.setState({
                     busy: false,
+                    busyLoggingIn: false,
                     ...componentState,
                 });
                 aliveAgain = !componentState.serverErrorIsFatal;
@@ -182,6 +185,7 @@ export default createReactClass({
 
         this.setState({
             busy: true,
+            busyLoggingIn: true,
             errorText: null,
             loginIncorrect: false,
         });
@@ -250,6 +254,7 @@ export default createReactClass({
 
             this.setState({
                 busy: false,
+                busyLoggingIn: false,
                 errorText: errorText,
                 // 401 would be the sensible status code for 'incorrect password'
                 // but the login API gives a 403 https://matrix.org/jira/browse/SYN-744
@@ -594,6 +599,7 @@ export default createReactClass({
                loginIncorrect={this.state.loginIncorrect}
                serverConfig={this.props.serverConfig}
                disableSubmit={this.isBusy()}
+               hideSubmit={this.props.isSyncing || this.state.busyLoggingIn}
             />
         );
     },
@@ -629,9 +635,11 @@ export default createReactClass({
 
     render: function() {
         const Loader = sdk.getComponent("elements.Spinner");
+        const InlineSpinner = sdk.getComponent("elements.InlineSpinner");
         const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
-        const loader = this.isBusy() ? <div className="mx_Login_loader"><Loader /></div> : null;
+        const loader = this.isBusy() && !this.state.busyLoggingIn ?
+            <div className="mx_Login_loader"><Loader /></div> : null;
 
         const errorText = this.state.errorText;
 
@@ -658,6 +666,25 @@ export default createReactClass({
             );
         }
 
+        let footer;
+        if (this.props.isSyncing || this.state.busyLoggingIn) {
+            footer = <div className="mx_AuthBody_paddedFooter">
+                <div className="mx_AuthBody_paddedFooter_title">
+                    <InlineSpinner w={20} h={20} />
+                    { this.props.isSyncing ? _t("Syncing...") : _t("Signing In...") }
+                </div>
+                { this.props.isSyncing && <div className="mx_AuthBody_paddedFooter_subtitle">
+                    {_t("If you've joined lots of rooms, this might take a while")}
+                </div> }
+            </div>;
+        } else {
+            footer = (
+                <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
+                    { _t('Create account') }
+                </a>
+            );
+        }
+
         return (
             <AuthPage>
                 <AuthHeader />
@@ -670,9 +697,7 @@ export default createReactClass({
                     { serverDeadSection }
                     { this.renderServerComponent() }
                     { this.renderLoginComponentForStep() }
-                    <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
-                        { _t('Create account') }
-                    </a>
+                    { footer }
                 </AuthBody>
             </AuthPage>
         );
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index e64b8360c3..d27e4a8259 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -43,6 +43,7 @@ export default class PasswordLogin extends React.Component {
         onPasswordChanged: PropTypes.func,
         loginIncorrect: PropTypes.bool,
         disableSubmit: PropTypes.bool,
+        hideSubmit: PropTypes.bool,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
     };
 
@@ -332,11 +333,11 @@ export default class PasswordLogin extends React.Component {
                         disabled={this.props.disableSubmit}
                     />
                     {forgotPasswordJsx}
-                    <input className="mx_Login_submit"
+                    { !this.props.hideSubmit && <input className="mx_Login_submit"
                         type="submit"
                         value={_t('Sign in')}
                         disabled={this.props.disableSubmit}
-                    />
+                    /> }
                 </form>
             </div>
         );

From 76ce4081cbc0769b0eb702dab26ea539905bbf48 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 12:31:27 +0100
Subject: [PATCH 2126/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3c5be84f20..84c172ea4d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2102,6 +2102,9 @@
     "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.",
+    "Syncing...": "Syncing...",
+    "Signing In...": "Signing In...",
+    "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
     "Create account": "Create account",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",

From 8b25223026d6406929f4d6ab7d6b6ab091b1007a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 13:45:12 +0100
Subject: [PATCH 2127/3235] fix onLoggedIn getting called twice

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 61b72f650b..519b39d436 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1902,13 +1902,19 @@ export default createReactClass({
         const cli = MatrixClientPeg.get();
         // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
         // because the client hasn't been started yet.
-        if (!isCryptoAvailable()) {
+        const cryptoAvailable = isCryptoAvailable();
+        if (!cryptoAvailable) {
             this._onLoggedIn();
         }
 
         this.setState({ pendingInitialSync: true });
         await this.firstSyncPromise.promise;
 
+        if (!cryptoAvailable) {
+            this.setState({ pendingInitialSync: false });
+            return setLoggedInPromise;
+        }
+
         // Test for the master cross-signing key in SSSS as a quick proxy for
         // whether cross-signing has been set up on the account.
         const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");

From 08d56e55d413d77eb6158a521c0ae56340eae79b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 15 Apr 2020 02:57:24 +0000
Subject: [PATCH 2128/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2288 of 2288 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a731e62af2..61fe4b8026 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2357,5 +2357,10 @@
     "Delete sessions|other": "刪除工作階段",
     "Delete sessions|one": "刪除工作階段",
     "Enable end-to-end encryption": "啟用端到端加密",
-    "You can’t disable this later. Bridges & most bots won’t work yet.": "您無法在稍後停用此功能。橋接與大多數機器人也尚無法運作。"
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "您無法在稍後停用此功能。橋接與大多數機器人也尚無法運作。",
+    "Failed to set topic": "設定主題失敗",
+    "Command failed": "指令失敗",
+    "Could not find user in room": "在聊天室中找不到使用者",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "使用既有的工作階段來驗證這個，授予其對加密訊息的存取權限。",
+    "Use your other device to continue…": "使用您其他的裝置繼續……"
 }

From ebef7a21672d41fcf9770e3135d57c89cd793725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 15 Apr 2020 06:28:06 +0000
Subject: [PATCH 2129/3235] Translated using Weblate (French)

Currently translated at 100.0% (2288 of 2288 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 677c48a2dc..9e87e869b4 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2358,5 +2358,10 @@
     "Delete sessions|other": "Supprimer les sessions",
     "Delete sessions|one": "Supprimer la session",
     "Enable end-to-end encryption": "Activer le chiffrement de bout en bout",
-    "You can’t disable this later. Bridges & most bots won’t work yet.": "Vous ne pourrez pas le désactiver plus tard. Les passerelles et la plupart des bots ne fonctionneront pas pour le moment."
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Vous ne pourrez pas le désactiver plus tard. Les passerelles et la plupart des bots ne fonctionneront pas pour le moment.",
+    "Failed to set topic": "Échec du changement de sujet",
+    "Command failed": "La commande a échoué",
+    "Could not find user in room": "Impossible de trouver l’utilisateur dans le salon",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
+    "Use your other device to continue…": "Utilisez votre autre appareil pour continuer…"
 }

From 357dc504f54a86d6a3bc3c4ec95ceafe3c9af73e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 15 Apr 2020 09:40:20 +0000
Subject: [PATCH 2130/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2288 of 2288 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 5fb1de4ea2..fb8c21387a 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2355,5 +2355,10 @@
     "Liberate your communication": "Libera le tue comunicazioni",
     "Send a Direct Message": "Invia un messaggio diretto",
     "Explore Public Rooms": "Esplora le stanze pubbliche",
-    "Create a Group Chat": "Crea una chat di gruppo"
+    "Create a Group Chat": "Crea una chat di gruppo",
+    "Failed to set topic": "Impostazione argomento fallita",
+    "Command failed": "Comando fallito",
+    "Could not find user in room": "Utente non trovato nella stanza",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "Usa una sessione esistente per verificare questa, dandole l'accesso ai messaggi cifrati.",
+    "Use your other device to continue…": "Usa il tuo altro dispositivo per continuare…"
 }

From ac26719b691493e339f2da7c1cf3367a14d464c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 14:07:37 +0100
Subject: [PATCH 2131/3235] disable password reset button when spinning

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/auth/_Login.scss        | 10 ++++++++++
 src/components/structures/auth/Login.js    |  2 +-
 src/components/views/auth/PasswordLogin.js | 21 +++++++++++++--------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 4ce90cc6bd..02436833a2 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -89,3 +89,13 @@ limitations under the License.
 .mx_Login_underlinedServerName {
     border-bottom: 1px dashed $accent-color;
 }
+
+div.mx_AccessibleButton_kind_link.mx_Login_forgot {
+    // style it as a link
+    font-size: inherit;
+    padding: 0;
+
+    &.mx_AccessibleButton_disabled {
+        cursor: not-allowed;
+    }
+}
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 93c93fd5ab..851ea30ba0 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -599,7 +599,7 @@ export default createReactClass({
                loginIncorrect={this.state.loginIncorrect}
                serverConfig={this.props.serverConfig}
                disableSubmit={this.isBusy()}
-               hideSubmit={this.props.isSyncing || this.state.busyLoggingIn}
+               busy={this.props.isSyncing || this.state.busyLoggingIn}
             />
         );
     },
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index d27e4a8259..aeaa91845b 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -23,6 +23,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AccessibleButton from "../elements/AccessibleButton";
 
 /**
  * A pure UI component which displays a username/password form.
@@ -43,8 +44,8 @@ export default class PasswordLogin extends React.Component {
         onPasswordChanged: PropTypes.func,
         loginIncorrect: PropTypes.bool,
         disableSubmit: PropTypes.bool,
-        hideSubmit: PropTypes.bool,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
+        busy: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -266,12 +267,16 @@ export default class PasswordLogin extends React.Component {
         if (this.props.onForgotPasswordClick) {
             forgotPasswordJsx = <span>
                 {_t('Not sure of your password? <a>Set a new one</a>', {}, {
-                    a: sub => <a className="mx_Login_forgot"
-                        onClick={this.onForgotPasswordClick}
-                        href="#"
-                    >
-                        {sub}
-                    </a>,
+                    a: sub => (
+                        <AccessibleButton
+                            className="mx_Login_forgot"
+                            disabled={this.props.busy}
+                            kind="link"
+                            onClick={this.onForgotPasswordClick}
+                        >
+                            {sub}
+                        </AccessibleButton>
+                    ),
                 })}
             </span>;
         }
@@ -333,7 +338,7 @@ export default class PasswordLogin extends React.Component {
                         disabled={this.props.disableSubmit}
                     />
                     {forgotPasswordJsx}
-                    { !this.props.hideSubmit && <input className="mx_Login_submit"
+                    { !this.props.busy && <input className="mx_Login_submit"
                         type="submit"
                         value={_t('Sign in')}
                         disabled={this.props.disableSubmit}

From 81f501e8440f00e9a8147be88a8a2467975894cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 14:19:47 +0100
Subject: [PATCH 2132/3235] disable language dropdown too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_Dropdown.scss             | 4 ++++
 src/components/structures/auth/Login.js           | 2 +-
 src/components/views/auth/AuthHeader.js           | 7 ++++++-
 src/components/views/auth/LanguageSelector.js     | 6 ++++--
 src/components/views/elements/LanguageDropdown.js | 1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 0dd9656c9c..32a68d5252 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -33,6 +33,10 @@ limitations under the License.
     user-select: none;
 }
 
+.mx_Dropdown_input.mx_AccessibleButton_disabled {
+    cursor: not-allowed;
+}
+
 .mx_Dropdown_input:focus {
     border-color: $input-focused-border-color;
 }
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 851ea30ba0..5d3cb69417 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -687,7 +687,7 @@ export default createReactClass({
 
         return (
             <AuthPage>
-                <AuthHeader />
+                <AuthHeader disableLanguageSelector={this.props.isSyncing || this.state.busyLoggingIn} />
                 <AuthBody>
                     <h2>
                         {_t('Sign in')}
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
index 133fd41359..6e787ba77c 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -16,12 +16,17 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 
 export default createReactClass({
     displayName: 'AuthHeader',
 
+    propTypes: {
+        disableLanguageSelector: PropTypes.bool,
+    },
+
     render: function() {
         const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo');
         const LanguageSelector = sdk.getComponent('views.auth.LanguageSelector');
@@ -29,7 +34,7 @@ export default createReactClass({
         return (
             <div className="mx_AuthHeader">
                 <AuthHeaderLogo />
-                <LanguageSelector />
+                <LanguageSelector disabled={this.props.disableLanguageSelector} />
             </div>
         );
     },
diff --git a/src/components/views/auth/LanguageSelector.js b/src/components/views/auth/LanguageSelector.js
index 99578d4504..83db5d225b 100644
--- a/src/components/views/auth/LanguageSelector.js
+++ b/src/components/views/auth/LanguageSelector.js
@@ -28,12 +28,14 @@ function onChange(newLang) {
     }
 }
 
-export default function LanguageSelector() {
+export default function LanguageSelector({disabled}) {
     if (SdkConfig.get()['disable_login_language_selector']) return <div />;
 
     const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
-    return <LanguageDropdown className="mx_AuthBody_language"
+    return <LanguageDropdown
+        className="mx_AuthBody_language"
         onOptionChange={onChange}
         value={getCurrentLanguage()}
+        disabled={disabled}
     />;
 }
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 18a7e95e85..e37109caff 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -114,6 +114,7 @@ export default class LanguageDropdown extends React.Component {
             searchEnabled={true}
             value={value}
             label={_t("Language Dropdown")}
+            disabled={this.props.disabled}
         >
             { options }
         </Dropdown>;

From 6d6078412208b11c6c981e1a385a19427bf02a6b Mon Sep 17 00:00:00 2001
From: Valex <xvalex@mail.ru>
Date: Wed, 15 Apr 2020 13:32:14 +0000
Subject: [PATCH 2133/3235] Translated using Weblate (Russian)

Currently translated at 90.3% (2065 of 2288 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bd20572d40..124ab7d9d5 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -2103,5 +2103,8 @@
     "Session name": "Название сессии",
     "Session key": "Ключ сессии",
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервная копия ключа сохранена в хранилище секретов",
-    "Backup key stored: ": "Резервная копия ключа сохранена: "
+    "Backup key stored: ": "Резервная копия ключа сохранена: ",
+    "Command failed": "Не удалось выполнить команду",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)"
 }

From 8c2c777e2bec06fa01e4b06088f687870fa4b362 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 Apr 2020 17:37:32 +0200
Subject: [PATCH 2134/3235] disable reemitting on the client for events mapped
 from the indexer

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 1226b84b5b..e4e8f26031 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -383,7 +383,7 @@ export default class EventIndex extends EventEmitter {
 
             // We have a checkpoint, let us fetch some messages, again, very
             // conservatively to not bother our homeserver too much.
-            const eventMapper = client.getEventMapper();
+            const eventMapper = client.getEventMapper({preventReEmit: true});
             // TODO we need to ensure to use member lazy loading with this
             // request so we get the correct profiles.
             let res;

From 49e1e6e59fa057f11aeaef08b1300d2b91a30e0b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 17:31:45 +0100
Subject: [PATCH 2135/3235] null-guard MatrixClientPeg in RoomViewStore

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/RoomViewStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index b32e088a76..841734dfb7 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -159,7 +159,7 @@ class RoomViewStore extends Store {
             }
             case 'sync_state':
                 this._setState({
-                    matrixClientIsReady: MatrixClientPeg.get().isInitialSyncComplete(),
+                    matrixClientIsReady: MatrixClientPeg.get() && MatrixClientPeg.get().isInitialSyncComplete(),
                 });
                 break;
         }

From 5022eaf483f5dee1d56c1ac921fc13fd5629cbf3 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 15 Apr 2020 19:13:00 +0100
Subject: [PATCH 2136/3235] Upgrade matrix-js-sdk to 5.3.1-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9acd9b4b4f..808941625e 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.3.0-rc.1",
+    "matrix-js-sdk": "5.3.1-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index c42828e461..2b55aa2ae2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,9 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/84637c6ebd442346623bce562b441e1093d40270"
+matrix-js-sdk@5.3.1-rc.1:
+  version "5.3.1-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.1.tgz#12f9434b2fc09e014371bc9a75dc2bc9bc35fe33"
+  integrity sha512-HP47NvGFrK4gG8ToZRurb6/pRHhJAOhixwoNT6P/FTZNZLJX4DDPY84uNR0jtmiiZXI+/wHRST0K9P6A2bgBXA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From e2fb96776b32cbf431f2420869e2ee89c4ebf198 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 15 Apr 2020 19:18:45 +0100
Subject: [PATCH 2137/3235] Prepare changelog for v2.5.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f7c0eddc..7586bb49eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,77 @@
+Changes in [2.5.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.1) (2020-04-15)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.4.0-rc.1...v2.5.0-rc.1)
+
+ * Upgrade to JS SDK 5.3.1-rc.1
+ * null-guard MatrixClientPeg in RoomViewStore
+   [\#4415](https://github.com/matrix-org/matrix-react-sdk/pull/4415)
+ * Fix: prevent spurious notifications from indexer
+   [\#4414](https://github.com/matrix-org/matrix-react-sdk/pull/4414)
+ * Login block on initialSync with spinners
+   [\#4413](https://github.com/matrix-org/matrix-react-sdk/pull/4413)
+ * Allow network dropdown to be scrollable and fix context menu padding calc
+   [\#4408](https://github.com/matrix-org/matrix-react-sdk/pull/4408)
+ * Remove end-to-end message info option when cross-signing is used
+   [\#4412](https://github.com/matrix-org/matrix-react-sdk/pull/4412)
+ * Minimize widgets by default
+   [\#4378](https://github.com/matrix-org/matrix-react-sdk/pull/4378)
+ * Add comments to highlight where we'll need m.widget support
+   [\#4380](https://github.com/matrix-org/matrix-react-sdk/pull/4380)
+ * Fix: dont try to enable 4S if cross-signing is disabled
+   [\#4407](https://github.com/matrix-org/matrix-react-sdk/pull/4407)
+ * Fix: don't confuse user with spinner during complete security step
+   [\#4406](https://github.com/matrix-org/matrix-react-sdk/pull/4406)
+ *  Fix: avoid potential crash during certain verification paths
+   [\#4405](https://github.com/matrix-org/matrix-react-sdk/pull/4405)
+ * Add riot-desktop shortcuts for forward/back matching browsers&slack
+   [\#4392](https://github.com/matrix-org/matrix-react-sdk/pull/4392)
+ * Convert LoggedInView to an ES6 PureComponent Class & TypeScript
+   [\#4398](https://github.com/matrix-org/matrix-react-sdk/pull/4398)
+ * Fix width of MVideoBody in FilePanel
+   [\#4396](https://github.com/matrix-org/matrix-react-sdk/pull/4396)
+ * Remove unused react-addons-css-transition-group
+   [\#4397](https://github.com/matrix-org/matrix-react-sdk/pull/4397)
+ * Fix emoji tooltip flickering
+   [\#4395](https://github.com/matrix-org/matrix-react-sdk/pull/4395)
+ * Pass along key backup for bootstrap
+   [\#4374](https://github.com/matrix-org/matrix-react-sdk/pull/4374)
+ * Fix create room dialog e2ee private room setting
+   [\#4403](https://github.com/matrix-org/matrix-react-sdk/pull/4403)
+ * Sort emoji by shortcodes for autocomplete primarily for :-1 and :+1
+   [\#4391](https://github.com/matrix-org/matrix-react-sdk/pull/4391)
+ * Fix invalid commands when figuring out whether to set isTyping
+   [\#4390](https://github.com/matrix-org/matrix-react-sdk/pull/4390)
+ * op/deop return error if trying to affect an unknown user
+   [\#4389](https://github.com/matrix-org/matrix-react-sdk/pull/4389)
+ * Composer pills respect showPillAvatar setting
+   [\#4384](https://github.com/matrix-org/matrix-react-sdk/pull/4384)
+ * Only send typing notification when composing commands which send messages
+   [\#4385](https://github.com/matrix-org/matrix-react-sdk/pull/4385)
+ * Reverse order of they match/they don't match buttons
+   [\#4386](https://github.com/matrix-org/matrix-react-sdk/pull/4386)
+ * Use singular text on 'delete sessions' button for SSO
+   [\#4383](https://github.com/matrix-org/matrix-react-sdk/pull/4383)
+ * Pass widget data through from sticker picker
+   [\#4377](https://github.com/matrix-org/matrix-react-sdk/pull/4377)
+ * Obliterate widgets when they are minimized
+   [\#4376](https://github.com/matrix-org/matrix-react-sdk/pull/4376)
+ * Fix image thumbnail width when read receipts are hidden
+   [\#4370](https://github.com/matrix-org/matrix-react-sdk/pull/4370)
+ * Add toggle for e2ee when creating private room
+   [\#4362](https://github.com/matrix-org/matrix-react-sdk/pull/4362)
+ * Fix logging for failed searches
+   [\#4372](https://github.com/matrix-org/matrix-react-sdk/pull/4372)
+ * Ensure UI is updated when cross-signing gets disabled
+   [\#4369](https://github.com/matrix-org/matrix-react-sdk/pull/4369)
+ * Retry the request for the master key from SSSS on login
+   [\#4371](https://github.com/matrix-org/matrix-react-sdk/pull/4371)
+ * Upgrade deps
+   [\#4365](https://github.com/matrix-org/matrix-react-sdk/pull/4365)
+ * App load tweaks, i18n and localStorage
+   [\#4367](https://github.com/matrix-org/matrix-react-sdk/pull/4367)
+ * Fix encoding of widget arguments
+   [\#4366](https://github.com/matrix-org/matrix-react-sdk/pull/4366)
+
 Changes in [2.4.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.4.0-rc.1) (2020-04-08)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.1...v2.4.0-rc.1)

From 6ee09cd688661be0b56310ddd43a4b5e4c9df1a3 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 15 Apr 2020 19:18:45 +0100
Subject: [PATCH 2138/3235] v2.5.0-rc.1

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

diff --git a/package.json b/package.json
index 808941625e..8e1e687f4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.4.0-rc.1",
+  "version": "2.5.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From a37ecbbb34ef83ef6f38bae2895a95c325401cfe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 15 Apr 2020 19:24:33 +0100
Subject: [PATCH 2139/3235] update console.error

---
 src/utils/strings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/strings.ts b/src/utils/strings.ts
index 7d1fa0049d..5856682445 100644
--- a/src/utils/strings.ts
+++ b/src/utils/strings.ts
@@ -49,7 +49,7 @@ export async function copyPlaintext(text: string): Promise<boolean> {
             return successful;
         }
     } catch (e) {
-        console.error(e);
+        console.error("copyPlaintext failed", e);
     }
     return false;
 }

From b4e2daaf46edfac87f1587b95dc63285a88e14fc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Apr 2020 13:18:42 -0600
Subject: [PATCH 2140/3235] Convert cross-signing feature flag to setting

This is intended as a temporary measure until we're comfortable with removing the flag entirely.
---
 src/DeviceListener.js                                  |  2 +-
 src/KeyRequestHandler.js                               |  4 ++--
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js   |  2 +-
 src/components/structures/MatrixChat.js                |  8 ++++----
 src/components/structures/RightPanel.js                |  4 ++--
 src/components/structures/RoomView.js                  |  2 +-
 src/components/views/dialogs/CreateRoomDialog.js       |  4 ++--
 src/components/views/dialogs/DeviceVerifyDialog.js     |  2 +-
 src/components/views/dialogs/InviteDialog.js           |  2 +-
 src/components/views/messages/MessageActionBar.js      |  2 +-
 src/components/views/right_panel/UserInfo.js           | 10 +++++-----
 src/components/views/rooms/E2EIcon.js                  |  4 ++--
 src/components/views/rooms/EventTile.js                |  2 +-
 src/components/views/rooms/MemberTile.js               |  2 +-
 src/components/views/rooms/MessageComposer.js          |  2 +-
 src/components/views/rooms/RoomBreadcrumbs.js          |  2 +-
 src/components/views/rooms/RoomHeader.js               |  2 +-
 src/components/views/rooms/RoomTile.js                 |  6 +++---
 src/components/views/settings/KeyBackupPanel.js        |  2 +-
 .../views/settings/tabs/user/LabsUserSettingsTab.js    |  1 +
 .../settings/tabs/user/SecurityUserSettingsTab.js      |  2 +-
 src/createRoom.js                                      |  2 +-
 src/settings/Settings.js                               |  4 ++--
 src/verification.js                                    |  2 +-
 24 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 21c844e11c..3201e4af45 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -124,7 +124,7 @@ export default class DeviceListener {
         const cli = MatrixClientPeg.get();
 
         if (
-            !SettingsStore.isFeatureEnabled("feature_cross_signing") ||
+            !SettingsStore.getValue("feature_cross_signing") ||
             !await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         ) return;
 
diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index 30f3b7d50e..ceaff0c54d 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -35,7 +35,7 @@ export default class KeyRequestHandler {
 
     handleKeyRequest(keyRequest) {
         // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
@@ -70,7 +70,7 @@ export default class KeyRequestHandler {
 
     handleKeyRequestCancellation(cancellation) {
         // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3a480a2579..55419cecff 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -77,7 +77,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     async componentDidMount() {
         const cli = MatrixClientPeg.get();
         const secureSecretStorage = (
-            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            SettingsStore.getValue("feature_cross_signing") &&
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         );
         this.setState({ secureSecretStorage });
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 519b39d436..1293ccc7e9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1506,7 +1506,7 @@ export default createReactClass({
         });
 
         cli.on("crypto.verification.request", request => {
-            const isFlagOn = SettingsStore.isFeatureEnabled("feature_cross_signing");
+            const isFlagOn = SettingsStore.getValue("feature_cross_signing");
 
             if (!isFlagOn && !request.channel.deviceId) {
                 request.cancel({code: "m.invalid_message", reason: "This client has cross-signing disabled"});
@@ -1556,7 +1556,7 @@ export default createReactClass({
             // changing colour. More advanced behaviour will come once
             // we implement more settings.
             cli.setGlobalErrorOnUnknownDevices(
-                !SettingsStore.isFeatureEnabled("feature_cross_signing"),
+                !SettingsStore.getValue("feature_cross_signing"),
             );
         }
     },
@@ -1921,10 +1921,10 @@ export default createReactClass({
         if (masterKeyInStorage) {
             // Auto-enable cross-signing for the new session when key found in
             // secret storage.
-            SettingsStore.setFeatureEnabled("feature_cross_signing", true);
+            SettingsStore.setValue("feature_cross_signing", null, SettingLevel.DEVICE, true);
             this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
         } else if (
-            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            SettingsStore.getValue("feature_cross_signing") &&
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         ) {
             // This will only work if the feature is set to 'enable' in the config,
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 3c97d2f4ae..f5bdfdf40d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -219,7 +219,7 @@ export default class RightPanel extends React.Component {
                 break;
             case RIGHT_PANEL_PHASES.RoomMemberInfo:
             case RIGHT_PANEL_PHASES.EncryptionPanel:
-                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
                         dis.dispatch({
                             action: "view_user",
@@ -246,7 +246,7 @@ export default class RightPanel extends React.Component {
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
                 break;
             case RIGHT_PANEL_PHASES.GroupMemberInfo:
-                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
                         dis.dispatch({
                             action: "view_user",
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 78bd34bf7f..179e0aa2e9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -822,7 +822,7 @@ export default createReactClass({
             });
             return;
         }
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
                 this.setState({
                     e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f18e28b85e..fa8c7dd30e 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -65,7 +65,7 @@ export default createReactClass({
             createOpts.creation_content = {'m.federate': false};
         }
 
-        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
             opts.encryption = this.state.isEncrypted;
         }
 
@@ -192,7 +192,7 @@ export default createReactClass({
         }
 
         let e2eeSection;
-        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
                 <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 39e391269c..a3f9430476 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -131,7 +131,7 @@ export default class DeviceVerifyDialog extends React.Component {
                 } else {
                     this._verifier = request.verifier;
                 }
-            } else if (verifyingOwnDevice && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            } else if (verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
                 this._request = await client.requestVerification(this.props.userId, [
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index f0d5443cac..a46fa0df07 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -574,7 +574,7 @@ export default class InviteDialog extends React.PureComponent {
 
         const createRoomOptions = {inlineErrors: true};
 
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const client = MatrixClientPeg.get();
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 5516ff2146..0cde90e417 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -49,7 +49,7 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
         };
 
         let e2eInfoCallback = null;
-        if (mxEvent.isEncrypted() && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (mxEvent.isEncrypted() && !SettingsStore.getValue("feature_cross_signing")) {
             e2eInfoCallback = onCryptoClick;
         }
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index abe54b355e..862e4f7897 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -63,7 +63,7 @@ const _disambiguateDevices = (devices) => {
 };
 
 export const getE2EStatus = (cli, userId, devices) => {
-    if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (!SettingsStore.getValue("feature_cross_signing")) {
         const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
         return hasUnverifiedDevice ? "warning" : "verified";
     }
@@ -111,7 +111,7 @@ async function openDMForUser(matrixClient, userId) {
         dmUserId: userId,
     };
 
-    if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (SettingsStore.getValue("feature_cross_signing")) {
         // Check whether all users have uploaded device keys before.
         // If so, enable encryption in the new room.
         const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
@@ -166,7 +166,7 @@ function DeviceItem({userId, device}) {
     // cross-signing so that other users can then safely trust you.
     // For other people's devices, the more general verified check that
     // includes locally verified devices can be used.
-    const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
+    const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
         deviceTrust.isCrossSigningVerified() :
         deviceTrust.isVerified();
 
@@ -237,7 +237,7 @@ function DevicesSection({devices, userId, loading}) {
             // cross-signing so that other users can then safely trust you.
             // For other people's devices, the more general verified check that
             // includes locally verified devices can be used.
-            const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
+            const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
                 deviceTrust.isCrossSigningVerified() :
                 deviceTrust.isVerified();
 
@@ -1298,7 +1298,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const userTrust = cli.checkUserTrust(member.userId);
     const userVerified = userTrust.isCrossSigningVerified();
     const isMe = member.userId === cli.getUserId();
-    const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+    const canVerify = SettingsStore.getValue("feature_cross_signing") &&
                         homeserverSupportsCrossSigning && !userVerified && !isMe;
 
     const setUpdating = (updating) => {
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index a2c99fad99..9189cfdf26 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import {useFeatureEnabled} from "../../../hooks/useSettings";
+import {useFeatureEnabled, useSettingValue} from "../../../hooks/useSettings";
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
 
@@ -62,7 +62,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
     }, className);
 
     let e2eTitle;
-    const crossSigning = useFeatureEnabled("feature_cross_signing");
+    const crossSigning = useSettingValue("feature_cross_signing");
     if (crossSigning && isUser) {
         e2eTitle = crossSigningUserTitles[status];
     } else if (crossSigning && !isUser) {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 75fbe5caa3..f67877373e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -323,7 +323,7 @@ export default createReactClass({
 
         // If cross-signing is off, the old behaviour is to scream at the user
         // as if they've done something wrong, which they haven't
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             this.setState({
                 verified: E2E_STATE.WARNING,
             }, this.props.onHeightChanged);
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index bf2a1bee23..d830624f8a 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -56,7 +56,7 @@ export default createReactClass({
             }
         }
 
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             const { roomId } = this.props.member;
             if (roomId) {
                 const isRoomEncrypted = cli.isRoomEncrypted(roomId);
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index c86bcb2ff0..4749742a7d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -270,7 +270,7 @@ export default class MessageComposer extends React.Component {
     }
 
     renderPlaceholderText() {
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             if (this.state.isQuoting) {
                 if (this.props.e2eStatus) {
                     return _t('Send an encrypted reply…');
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 1d433c9a40..09228c454b 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -364,7 +364,7 @@ export default class RoomBreadcrumbs extends React.Component {
             }
 
             let dmIndicator;
-            if (this._isDmRoom(r.room) && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (this._isDmRoom(r.room) && !SettingsStore.getValue("feature_cross_signing")) {
                 dmIndicator = <img
                     src={require("../../../../res/img/icon_person.svg")}
                     className="mx_RoomBreadcrumbs_dmIndicator"
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 71f774248f..17495e6299 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -168,7 +168,7 @@ export default createReactClass({
         const joinRule = joinRules && joinRules.getContent().join_rule;
         let privateIcon;
         // Don't show an invite-only icon for DMs. Users know they're invite-only.
-        if (!dmUserId && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!dmUserId && SettingsStore.getValue("feature_cross_signing")) {
             if (joinRule == "invite") {
                 privateIcon = <InviteOnlyIcon />;
             }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index d264b087a0..a34ade365b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -155,7 +155,7 @@ export default createReactClass({
         if (!cli.isRoomEncrypted(this.props.room.roomId)) {
             return;
         }
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
@@ -488,7 +488,7 @@ export default createReactClass({
         let dmOnline;
         /* Post-cross-signing we don't show DM indicators at all, instead relying on user
            context to let them know when that is. */
-        if (dmUserId && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (dmUserId && !SettingsStore.getValue("feature_cross_signing")) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"
@@ -532,7 +532,7 @@ export default createReactClass({
         }
 
         let privateIcon = null;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             if (this.state.joinRule == "invite" && !dmUserId) {
                 privateIcon = <InviteOnlyIcon collapsedPanel={this.props.collapsed} />;
             }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 9d60ed1188..5548768221 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -326,7 +326,7 @@ export default class KeyBackupPanel extends React.PureComponent {
                     </AccessibleButton>
                 </div>
             );
-            if (this.state.backupKeyStored && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (this.state.backupKeyStored && !SettingsStore.getValue("feature_cross_signing")) {
                 buttonRow = <p>⚠️ {_t(
                     "Backup key stored in secret storage, but this feature is not " +
                     "enabled on this session. Please enable cross-signing in Labs to " +
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..fe160032ff 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -62,6 +62,7 @@ export default class LabsUserSettingsTab extends React.Component {
                 </div>
                 <div className="mx_SettingsTab_section">
                     {flags}
+                    <SettingsFlag name={"feature_cross_signing"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 3dca6e2490..1cde5d6f87 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -270,7 +270,7 @@ export default class SecurityUserSettingsTab extends React.Component {
         // can remove this.
         const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
         let crossSigning;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             crossSigning = (
                 <div className='mx_SettingsTab_section'>
                     <span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>
diff --git a/src/createRoom.js b/src/createRoom.js
index 66d4d1908e..a39d2c2216 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -227,7 +227,7 @@ export async function ensureDMExists(client, userId) {
         roomId = existingDMRoom.roomId;
     } else {
         let encryption;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             encryption = canEncryptToAllUsers(client, [userId]);
         }
         roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0d72017878..b539591efd 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,10 +152,10 @@ export const SETTINGS = {
         default: null,
     },
     "feature_cross_signing": {
-        isFeature: true,
+        //isFeature: true,
         displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
         supportedLevels: LEVELS_FEATURE,
-        default: false,
+        default: true,
     },
     "feature_event_indexing": {
         isFeature: true,
diff --git a/src/verification.js b/src/verification.js
index e00e5e05fa..ca839940e5 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -27,7 +27,7 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
-    if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (!cli.isCryptoEnabled() || !SettingsStore.getValue("feature_cross_signing")) {
         return false;
     }
     const usk = cli.getCrossSigningId("user_signing");

From bedffdb8e2718fa6748fbe87a188b82bac232b2e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 01:46:32 +0100
Subject: [PATCH 2141/3235] Fix Message Context Menu options not displaying:
 block

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

diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
index d15d566bdb..2ecb93e734 100644
--- a/res/css/views/context_menus/_MessageContextMenu.scss
+++ b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -19,6 +19,7 @@ limitations under the License.
 }
 
 .mx_MessageContextMenu_field {
+    display: block;
     padding: 3px 6px 3px 6px;
     cursor: pointer;
     white-space: nowrap;

From 15075e4c10a08e19d17bdec6420b93c10a108a5a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 16 Apr 2020 10:36:19 +0200
Subject: [PATCH 2142/3235] load twemoji in matrixclient rather than
 loggedinview

---
 src/components/structures/LoggedInView.tsx | 3 ---
 src/components/structures/MatrixChat.js    | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 9de2aac8e9..f90ae18f00 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -25,7 +25,6 @@ import { DragDropContext } from 'react-beautiful-dnd';
 import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
-import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
@@ -166,8 +165,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         this._matrixClient.on("sync", this.onSync);
         this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
 
-        fixupColorFonts();
-
         this._roomView = React.createRef();
         this._resizeContainer = React.createRef();
     }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 519b39d436..4b269ceae4 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -66,6 +66,7 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
+import { fixupColorFonts } from '../../utils/FontManager';
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {
@@ -244,6 +245,8 @@ export default createReactClass({
 
         this._pageChanging = false;
 
+        // load emoji font
+        fixupColorFonts();
         // check we have the right tint applied for this theme.
         // N.B. we don't call the whole of setTheme() here as we may be
         // racing with the theme CSS download finishing from index.js

From 5956e9ec6b05102856d7c3b7502b91c22d56b020 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 16 Apr 2020 02:09:23 +0000
Subject: [PATCH 2143/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2291 of 2291 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 61fe4b8026..3e4b1ab097 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2362,5 +2362,8 @@
     "Command failed": "指令失敗",
     "Could not find user in room": "在聊天室中找不到使用者",
     "Use an existing session to verify this one, granting it access to encrypted messages.": "使用既有的工作階段來驗證這個，授予其對加密訊息的存取權限。",
-    "Use your other device to continue…": "使用您其他的裝置繼續……"
+    "Use your other device to continue…": "使用您其他的裝置繼續……",
+    "Syncing...": "正在同步……",
+    "Signing In...": "正在登入……",
+    "If you've joined lots of rooms, this might take a while": "如果您已加入很多聊天室，這可能需要一點時間"
 }

From bc48d012b8571414bf1744d2bbfb84bdd8813043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 16 Apr 2020 06:23:09 +0000
Subject: [PATCH 2144/3235] Translated using Weblate (French)

Currently translated at 100.0% (2291 of 2291 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9e87e869b4..b4e7557dbf 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2363,5 +2363,8 @@
     "Command failed": "La commande a échoué",
     "Could not find user in room": "Impossible de trouver l’utilisateur dans le salon",
     "Use an existing session to verify this one, granting it access to encrypted messages.": "Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
-    "Use your other device to continue…": "Utilisez votre autre appareil pour continuer…"
+    "Use your other device to continue…": "Utilisez votre autre appareil pour continuer…",
+    "Syncing...": "Synchronisation…",
+    "Signing In...": "Authentification…",
+    "If you've joined lots of rooms, this might take a while": "Si vous avez rejoint beaucoup de salons, cela peut prendre du temps"
 }

From 33391a31105d601ad76eb0da98ab8afaf810a06b Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Thu, 16 Apr 2020 09:25:18 +0000
Subject: [PATCH 2145/3235] Revert "Fix: load Twemoji before login so complete
 security gets the right emojis during SAS"

---
 src/components/structures/LoggedInView.tsx | 3 +++
 src/components/structures/MatrixChat.js    | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index f90ae18f00..9de2aac8e9 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -25,6 +25,7 @@ import { DragDropContext } from 'react-beautiful-dnd';
 import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
+import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
@@ -165,6 +166,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         this._matrixClient.on("sync", this.onSync);
         this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
 
+        fixupColorFonts();
+
         this._roomView = React.createRef();
         this._resizeContainer = React.createRef();
     }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4b269ceae4..519b39d436 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -66,7 +66,6 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
-import { fixupColorFonts } from '../../utils/FontManager';
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {
@@ -245,8 +244,6 @@ export default createReactClass({
 
         this._pageChanging = false;
 
-        // load emoji font
-        fixupColorFonts();
         // check we have the right tint applied for this theme.
         // N.B. we don't call the whole of setTheme() here as we may be
         // racing with the theme CSS download finishing from index.js

From 3933c4c31cb19cc1d300a52228ff2a3d84171cb1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 16 Apr 2020 11:35:54 +0200
Subject: [PATCH 2146/3235] ensure twemoji font is loaded when showing SAS
 emojis

---
 src/components/views/verification/VerificationShowSas.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 0a8947f2c2..edf860c4c2 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -20,6 +20,7 @@ import { _t, _td } from '../../../languageHandler';
 import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
 import DialogButtons from "../elements/DialogButtons";
+import { fixupColorFonts } from '../../../utils/FontManager';
 
 function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
@@ -44,6 +45,13 @@ export default class VerificationShowSas extends React.Component {
         };
     }
 
+    componentWillMount() {
+        // As this component is also used before login (during complete security),
+        // also make sure we have a working emoji font to display the SAS emojis here.
+        // This is also done from LoggedInView.
+        fixupColorFonts();
+    }
+
     onMatchClick = () => {
         this.setState({ pending: true });
         this.props.onDone();

From 6723cca48e908de4c86f5df8ef02509970bcad41 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 16 Apr 2020 11:35:54 +0200
Subject: [PATCH 2147/3235] ensure twemoji font is loaded when showing SAS
 emojis

---
 src/components/views/verification/VerificationShowSas.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 0a8947f2c2..edf860c4c2 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -20,6 +20,7 @@ import { _t, _td } from '../../../languageHandler';
 import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
 import DialogButtons from "../elements/DialogButtons";
+import { fixupColorFonts } from '../../../utils/FontManager';
 
 function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
@@ -44,6 +45,13 @@ export default class VerificationShowSas extends React.Component {
         };
     }
 
+    componentWillMount() {
+        // As this component is also used before login (during complete security),
+        // also make sure we have a working emoji font to display the SAS emojis here.
+        // This is also done from LoggedInView.
+        fixupColorFonts();
+    }
+
     onMatchClick = () => {
         this.setState({ pending: true });
         this.props.onDone();

From a9a2999ccc433bc19df083e6f8a551feca9b8fc3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 12:26:12 +0100
Subject: [PATCH 2148/3235] Use `recovery passphrase` and `recovery key`
 everywhere

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../keybackup/CreateKeyBackupDialog.js        | 14 +++---
 .../keybackup/NewRecoveryMethodDialog.js      |  3 +-
 .../keybackup/RecoveryMethodRemovedDialog.js  |  2 +-
 .../CreateSecretStorageDialog.js              | 16 +++----
 .../structures/auth/SetupEncryptionBody.js    |  2 +-
 .../keybackup/RestoreKeyBackupDialog.js       |  4 +-
 .../AccessSecretStorageDialog.js              | 14 +++---
 src/i18n/strings/en_EN.json                   | 47 +++++++++----------
 8 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 7e5e0afb79..29e68243ee 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -262,7 +262,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         let helpText;
         if (this.state.zxcvbnResult) {
             if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This passphrase looks strong enough.");
+                helpText = _t("Great! This recovery passphrase looks strong enough.");
             } else {
                 const suggestions = [];
                 for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
@@ -287,7 +287,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "We'll store an encrypted copy of your keys on our server. " +
-                "Protect your backup with a passphrase to keep it secure.",
+                "Protect your backup with a recovery passphrase to keep it secure.",
             )}</p>
             <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
@@ -297,7 +297,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                         onChange={this._onPassPhraseChange}
                         value={this.state.passPhrase}
                         className="mx_CreateKeyBackupDialog_passPhraseInput"
-                        placeholder={_t("Enter a passphrase...")}
+                        placeholder={_t("Enter a recovery passphrase...")}
                         autoFocus={true}
                     />
                     <div className="mx_CreateKeyBackupDialog_passPhraseHelp">
@@ -354,7 +354,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
-                "Please enter your passphrase a second time to confirm.",
+                "Please enter your recovery passphrase a second time to confirm.",
             )}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
@@ -363,7 +363,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                             onChange={this._onPassPhraseConfirmChange}
                             value={this.state.passPhraseConfirm}
                             className="mx_CreateKeyBackupDialog_passPhraseInput"
-                            placeholder={_t("Repeat your passphrase...")}
+                            placeholder={_t("Repeat your recovery passphrase...")}
                             autoFocus={true}
                         />
                     </div>
@@ -383,7 +383,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
-                "access to your encrypted messages if you forget your passphrase.",
+                "access to your encrypted messages if you forget your recovery passphrase.",
             )}</p>
             <p>{_t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
@@ -479,7 +479,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             case PHASE_PASSPHRASE:
                 return _t('Secure your backup with a passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm your passphrase');
+                return _t('Confirm your recovery passphrase');
             case PHASE_OPTOUT_CONFIRM:
                 return _t('Warning!');
             case PHASE_SHOWKEY:
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 6588ff5191..d41c8c53ef 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -57,8 +57,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         </span>;
 
         const newMethodDetected = <p>{_t(
-            "A new recovery passphrase and key for Secure " +
-            "Messages have been detected.",
+            "A new recovery passphrase and recovery key for Secure Messages have been detected.",
         )}</p>;
 
         const hackWarning = <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index c5222dafd5..95fcb96967 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -55,7 +55,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This session has detected that your recovery passphrase and key " +
+                        "This session has detected that your recovery passphrase and recovery key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index cfad49c38d..b876ed57b5 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -462,7 +462,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let helpText;
         if (this.state.zxcvbnResult) {
             if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This passphrase looks strong enough.");
+                helpText = _t("Great! This recovery passphrase looks strong enough.");
             } else {
                 // We take the warning from zxcvbn or failing that, the first
                 // suggestion. In practice The first is generally the most relevant
@@ -491,7 +491,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "granting them access to encrypted messages and marking them as trusted for other users.",
             )}</p>
             <p>{_t(
-                "Secure your encryption keys with a passphrase. For maximum security " +
+                "Secure your encryption keys with a recovery passphrase. For maximum security " +
                 "this should be different to your account password:",
             )}</p>
 
@@ -501,7 +501,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
                     value={this.state.passPhrase}
-                    label={_t("Enter a passphrase")}
+                    label={_t("Enter a recovery passphrase")}
                     autoFocus={true}
                     autoComplete="new-password"
                 />
@@ -512,7 +512,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up my encryption keys, securing them with the same passphrase")}
+                label={ _t("Back up my encryption keys, securing them with the same recovery passphrase")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 
@@ -569,7 +569,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
-                "Enter your passphrase a second time to confirm it.",
+                "Enter your recovery passphrase a second time to confirm it.",
             )}</p>
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <Field
@@ -577,7 +577,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     onChange={this._onPassPhraseConfirmChange}
                     value={this.state.passPhraseConfirm}
                     className="mx_CreateSecretStorageDialog_passPhraseField"
-                    label={_t("Confirm your passphrase")}
+                    label={_t("Confirm your recovery passphrase")}
                     autoFocus={true}
                     autoComplete="new-password"
                 />
@@ -604,7 +604,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
-                "access to your encrypted messages if you forget your passphrase.",
+                "access to your encrypted messages if you forget your recovery passphrase.",
             )}</p>
             <p>{_t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
@@ -703,7 +703,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_PASSPHRASE:
                 return _t('Set up encryption');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm passphrase');
+                return _t('Confirm recovery passphrase');
             case PHASE_CONFIRM_SKIP:
                 return _t('Are you sure?');
             case PHASE_SHOWKEY:
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index a982957ed0..e6302a4685 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -116,7 +116,7 @@ export default class SetupEncryptionBody extends React.Component {
                         "granting it access to encrypted messages.",
                     )}</p>
                     <p>{_t(
-                        "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+                        "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
                     {}, {
                         button: sub => <AccessibleButton element="span"
                             className="mx_linkButton"
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index aecfa9bfd1..dc82a71713 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -283,7 +283,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     title = _t("Recovery key mismatch");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this key: " +
+                            "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
                     </div>;
@@ -291,7 +291,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     title = _t("Incorrect recovery passphrase");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this passphrase: " +
+                            "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
                     </div>;
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index e3a7d7f532..4c0c608ad6 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -119,14 +119,13 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         if (hasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            title = _t("Enter secret storage passphrase");
+            title = _t("Enter recovery passphrase");
 
             let keyStatus;
             if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access secret storage. Please verify that you " +
-                        "entered the correct passphrase.",
+                        "Unable to access. Please verify that you entered the correct recovery passphrase.",
                     )}
                 </div>;
             } else {
@@ -141,7 +140,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and your cross-signing " +
-                    "identity for verifying other sessions by entering your passphrase.",
+                    "identity for verifying other sessions by entering your recovery passphrase.",
                 )}</p>
 
                 <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onPassPhraseNext}>
@@ -164,7 +163,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     />
                 </form>
                 {_t(
-                    "If you've forgotten your passphrase you can "+
+                    "If you've forgotten your recovery passphrase you can "+
                     "<button1>use your recovery key</button1> or " +
                     "<button2>set up new recovery options</button2>."
                 , {}, {
@@ -183,7 +182,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 })}
             </div>;
         } else {
-            title = _t("Enter secret storage recovery key");
+            title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
@@ -193,8 +192,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             } else if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access secret storage. Please verify that you " +
-                        "entered the correct recovery key.",
+                        "Unable to access. Please verify that you entered the correct recovery key.",
                     )}
                 </div>;
             } else if (this.state.recoveryKeyValid) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 84c172ea4d..dcd24b91de 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1778,32 +1778,30 @@
     "Remember my selection for this widget": "Remember my selection for this widget",
     "Allow": "Allow",
     "Deny": "Deny",
-    "Enter secret storage passphrase": "Enter secret storage passphrase",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Unable to access secret storage. Please verify that you entered the correct passphrase.",
+    "Enter recovery passphrase": "Enter recovery passphrase",
+    "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
-    "Enter secret storage recovery key": "Enter secret storage recovery key",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct recovery key.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
+    "Unable to access. Please verify that you entered the correct recovery key.": "Unable to access. Please verify that you entered the correct 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",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
     "Incorrect recovery passphrase": "Incorrect recovery passphrase",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
     "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",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "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",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
     "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 key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
@@ -2119,7 +2117,7 @@
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
     "Use an existing session to verify this one, granting it access to encrypted messages.": "Use an existing session to verify this one, granting it access to encrypted messages.",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
     "Use your other device to continue…": "Use your other device to continue…",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
@@ -2182,18 +2180,18 @@
     "Restore": "Restore",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
+    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:",
-    "Enter a passphrase": "Enter a passphrase",
-    "Back up my encryption keys, securing them with the same passphrase": "Back up my encryption keys, securing them with the same passphrase",
+    "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:",
+    "Enter a recovery passphrase": "Enter a recovery passphrase",
+    "Back up my encryption keys, securing them with the same recovery passphrase": "Back up my encryption keys, securing them with the same recovery passphrase",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
-    "Enter your passphrase a second time to confirm it.": "Enter your passphrase a second time to confirm it.",
-    "Confirm your passphrase": "Confirm your passphrase",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
+    "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
+    "Confirm your recovery passphrase": "Confirm your recovery passphrase",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
     "Your recovery key": "Your recovery key",
     "Copy": "Copy",
@@ -2205,15 +2203,16 @@
     "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
     "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
+    "Confirm recovery passphrase": "Confirm recovery passphrase",
     "Make a copy of your recovery key": "Make a copy of your recovery key",
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a passphrase...": "Enter a passphrase...",
-    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
-    "Repeat your passphrase...": "Repeat your passphrase...",
+    "Enter a recovery passphrase...": "Enter a recovery passphrase...",
+    "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
+    "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
@@ -2227,13 +2226,13 @@
     "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
+    "A new recovery passphrase and recovery key for Secure Messages have been detected.": "A new recovery passphrase and recovery key for Secure Messages have been detected.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",

From f65c31383d0c2c1cd3c70446cab545a40e8e84bb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 12:52:35 +0100
Subject: [PATCH 2149/3235] Copy tweaks with Nad

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CrossSigningManager.js                           |  2 +-
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js |  2 +-
 .../dialogs/keybackup/NewRecoveryMethodDialog.js     |  2 +-
 .../dialogs/keybackup/RecoveryMethodRemovedDialog.js |  2 +-
 .../secretstorage/AccessSecretStorageDialog.js       |  6 ++----
 src/i18n/strings/en_EN.json                          | 12 ++++++------
 src/settings/Settings.js                             |  2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 07ec776bd1..c37d0f8bf5 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -51,7 +51,7 @@ async function confirmToDismiss(name) {
     } else if (name === "m.cross_signing.self_signing") {
         description = _t("If you cancel now, you won't complete verifying your other session.");
     } else {
-        description = _t("If you cancel now, you won't complete your secret storage operation.");
+        description = _t("If you cancel now, you won't complete your operation.");
     }
 
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 29e68243ee..b010987036 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -287,7 +287,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "We'll store an encrypted copy of your keys on our server. " +
-                "Protect your backup with a recovery passphrase to keep it secure.",
+                "Secure your backup with a recovery passphrase.",
             )}</p>
             <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index d41c8c53ef..9e2264a960 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -57,7 +57,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         </span>;
 
         const newMethodDetected = <p>{_t(
-            "A new recovery passphrase and recovery key for Secure Messages have been detected.",
+            "A new recovery passphrase and key for Secure Messages have been detected.",
         )}</p>;
 
         const hackWarning = <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 95fcb96967..c5222dafd5 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -55,7 +55,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This session has detected that your recovery passphrase and recovery key " +
+                        "This session has detected that your recovery passphrase and key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 4c0c608ad6..f2e7b7e704 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -134,8 +134,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             content = <div>
                 <p>{_t(
-                    "<b>Warning</b>: You should only access secret storage " +
-                    "from a trusted computer.", {},
+                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
                     { b: sub => <b>{sub}</b> },
                 )}</p>
                 <p>{_t(
@@ -207,8 +206,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             content = <div>
                 <p>{_t(
-                    "<b>Warning</b>: You should only access secret storage " +
-                    "from a trusted computer.", {},
+                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
                     { b: sub => <b>{sub}</b> },
                 )}</p>
                 <p>{_t(
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dcd24b91de..4ee910a1b6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -70,7 +70,7 @@
     "Failure to create room": "Failure to create room",
     "If you cancel now, you won't complete verifying the other user.": "If you cancel now, you won't complete verifying the other user.",
     "If you cancel now, you won't complete verifying your other session.": "If you cancel now, you won't complete verifying your other session.",
-    "If you cancel now, you won't complete your secret storage operation.": "If you cancel now, you won't complete your secret storage operation.",
+    "If you cancel now, you won't complete your operation.": "If you cancel now, you won't complete your operation.",
     "Cancel entering passphrase?": "Cancel entering passphrase?",
     "Enter passphrase": "Enter passphrase",
     "Cancel": "Cancel",
@@ -444,7 +444,7 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
-    "Keep secret storage passphrase in memory for this session": "Keep secret storage passphrase in memory for this session",
+    "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
     "How fast should messages be downloaded.": "How fast should messages be downloaded.",
     "Manually verify all remote sessions": "Manually verify all remote sessions",
     "Collecting app version information": "Collecting app version information",
@@ -1780,7 +1780,7 @@
     "Deny": "Deny",
     "Enter recovery passphrase": "Enter recovery passphrase",
     "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Warning</b>: You should only do this on a trusted computer.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
@@ -2208,7 +2208,7 @@
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
     "Enter a recovery passphrase...": "Enter a recovery passphrase...",
     "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
@@ -2226,13 +2226,13 @@
     "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and recovery key for Secure Messages have been detected.": "A new recovery passphrase and recovery key for Secure Messages have been detected.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0d72017878..317508ca86 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -516,7 +516,7 @@ export const SETTINGS = {
     },
     "keepSecretStoragePassphraseForSession": {
          supportedLevels: ['device', 'config'],
-         displayName: _td("Keep secret storage passphrase in memory for this session"),
+         displayName: _td("Keep recovery passphrase in memory for this session"),
          default: false,
     },
     "crawlerSleepTime": {

From 1fb0f39c84e3a6340ad841acefe982db00ebfc1a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:23:01 +0100
Subject: [PATCH 2150/3235] Replace `Verify this session` and `Complete
 security`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/CompleteSecurity.js   | 12 ++++++------
 .../views/dialogs/VerificationRequestDialog.js       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 06cece0af2..3ef3140298 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -59,17 +59,17 @@ export default class CompleteSecurity extends React.Component {
         let title;
 
         if (phase === PHASE_INTRO) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
-            title = _t("Complete security");
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            title = _t("Verify session");
         } else if (phase === PHASE_DONE) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified"></span>;
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
         } else if (phase === PHASE_CONFIRM_SKIP) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
-            title = _t("Complete security");
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            title = _t("Verify session");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 7ff2cb8f50..dcb9168bda 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -48,7 +48,7 @@ export default class VerificationRequestDialog extends React.Component {
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify this session") : _t("Verification Request");
+            _t("Verify session") : _t("Verification Request");
 
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"

From ce78e3b8d86f014467280ef86162de04f0187dc9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:28:12 +0100
Subject: [PATCH 2151/3235] further tweaks by Matthew

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/CompleteSecurity.js        | 4 ++--
 src/components/views/dialogs/VerificationRequestDialog.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 3ef3140298..95128c0be9 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -60,7 +60,7 @@ export default class CompleteSecurity extends React.Component {
 
         if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify session");
+            title = _t("Verify this session");
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
@@ -69,7 +69,7 @@ export default class CompleteSecurity extends React.Component {
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify session");
+            title = _t("Verify this session");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index dcb9168bda..3a6e9a2d10 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -48,7 +48,7 @@ export default class VerificationRequestDialog extends React.Component {
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify session") : _t("Verification Request");
+            _t("Verify other session") : _t("Verification Request");
 
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"

From 9ec8fda1ce1ee5b7a34578e29094ba493d5e7eea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:34:18 +0100
Subject: [PATCH 2152/3235] update Create SSSS Dialog copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index b876ed57b5..b16812a3c0 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -487,12 +487,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
-                "Set up encryption on this session to allow it to verify other sessions, " +
-                "granting them access to encrypted messages and marking them as trusted for other users.",
-            )}</p>
-            <p>{_t(
-                "Secure your encryption keys with a recovery passphrase. For maximum security " +
-                "this should be different to your account password:",
+                "Set a recovery passphrase to secure encrypted information and recover it if you log out. " +
+                "This should be different to your account password:",
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
@@ -512,7 +508,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up my encryption keys, securing them with the same recovery passphrase")}
+                label={ _t("Back up encryption keys")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 

From 8c8509a6035d48e98299e20494043db6f52a20fe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:48:52 +0100
Subject: [PATCH 2153/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4ee910a1b6..ed1fbf6831 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1772,6 +1772,7 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
+    "Verify other session": "Verify other session",
     "Verification Request": "Verification Request",
     "A widget would like to verify your identity": "A widget would like to verify your identity",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
@@ -2062,7 +2063,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
-    "Complete security": "Complete security",
     "Session verified": "Session verified",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -2181,10 +2181,9 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
     "Enter a recovery passphrase": "Enter a recovery passphrase",
-    "Back up my encryption keys, securing them with the same recovery passphrase": "Back up my encryption keys, securing them with the same recovery passphrase",
+    "Back up encryption keys": "Back up encryption keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",

From af59c1b5b316024cea882cc8edb972a3abf45a76 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:02:32 +0100
Subject: [PATCH 2154/3235] iterate copy some more

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js    | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index b16812a3c0..0cc145fd96 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -508,7 +508,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up encryption keys")}
+                label={ _t("Back up encrypted message keys")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ed1fbf6831..cf02e51608 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2183,7 +2183,7 @@
     "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
     "Enter a recovery passphrase": "Enter a recovery passphrase",
-    "Back up encryption keys": "Back up encryption keys",
+    "Back up encrypted message keys": "Back up encrypted message keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",

From e942a3552550cc5031cc4822b0bfcf99cf65a286 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:09:41 +0100
Subject: [PATCH 2155/3235] Fixxy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/secretstorage/AccessSecretStorageDialog.js      | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 4 ++--
 .../views/dialogs/AccessSecretStorageDialog-test.js         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index f2e7b7e704..7d7edffcbf 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -125,7 +125,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access. Please verify that you entered the correct recovery passphrase.",
+                        "Unable to access secret storage. " +
+                        "Please verify that you entered the correct recovery passphrase.",
                     )}
                 </div>;
             } else {
@@ -191,7 +192,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             } else if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access. Please verify that you entered the correct recovery key.",
+                        "Unable to access secret storage. " +
+                        "Please verify that you entered the correct recovery key.",
                     )}
                 </div>;
             } else if (this.state.recoveryKeyValid) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf02e51608..54da81e1ff 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1780,12 +1780,12 @@
     "Allow": "Allow",
     "Deny": "Deny",
     "Enter recovery passphrase": "Enter recovery passphrase",
-    "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.",
     "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Warning</b>: You should only do this on a trusted computer.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
-    "Unable to access. Please verify that you entered the correct recovery key.": "Unable to access. Please verify that you entered the correct recovery key.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct 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",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index 30512ca4dd..c754a4b607 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -100,7 +100,7 @@ describe("AccessSecretStorageDialog", function() {
         });
         expect(notification.props.children).toEqual(
             ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
-                     "entered the correct passphrase."]);
+                     "entered the correct recovery passphrase."]);
         done();
     });
 });

From aea7ede7d049b6f7893d8f6103be64b5439543f7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:55:43 +0100
Subject: [PATCH 2156/3235] update PHASE_PASSPHRASE copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js            | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index b010987036..a20f5566e9 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -477,7 +477,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _titleForPhase(phase) {
         switch (phase) {
             case PHASE_PASSPHRASE:
-                return _t('Secure your backup with a passphrase');
+                return _t('Secure your backup with a recovery passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
                 return _t('Confirm your recovery passphrase');
             case PHASE_OPTOUT_CONFIRM:
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 54da81e1ff..a291065145 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2215,7 +2215,7 @@
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
-    "Secure your backup with a passphrase": "Secure your backup with a passphrase",
+    "Secure your backup with a recovery passphrase": "Secure your backup with a recovery passphrase",
     "Starting backup...": "Starting backup...",
     "Success!": "Success!",
     "Create key backup": "Create key backup",

From 9de8adc7af42ee4c5d3456b87699791b3d4da1ce Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 16 Apr 2020 13:44:02 +0000
Subject: [PATCH 2157/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2291 of 2291 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index fb8c21387a..a2796c103c 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2360,5 +2360,8 @@
     "Command failed": "Comando fallito",
     "Could not find user in room": "Utente non trovato nella stanza",
     "Use an existing session to verify this one, granting it access to encrypted messages.": "Usa una sessione esistente per verificare questa, dandole l'accesso ai messaggi cifrati.",
-    "Use your other device to continue…": "Usa il tuo altro dispositivo per continuare…"
+    "Use your other device to continue…": "Usa il tuo altro dispositivo per continuare…",
+    "Syncing...": "Sincronizzazione...",
+    "Signing In...": "Accesso...",
+    "If you've joined lots of rooms, this might take a while": "Se sei dentro a molte stanze, potrebbe impiegarci un po'"
 }

From 765205869aa5bac4c4f1f8772dca94a324405fd6 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Thu, 16 Apr 2020 14:13:16 +0000
Subject: [PATCH 2158/3235] Translated using Weblate (Russian)

Currently translated at 90.1% (2065 of 2291 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 124ab7d9d5..05ae816c88 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -760,7 +760,7 @@
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек email-уведомлений.",
     "Explore Room State": "Просмотр статуса комнаты",
-    "Source URL": "Исходный URL-адрес",
+    "Source URL": "Исходная ссылка",
     "Messages sent by bot": "Сообщения от ботов",
     "Filter results": "Фильтрация результатов",
     "Members": "Участники",
@@ -881,7 +881,7 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
     "No Audio Outputs detected": "Аудиовыход не обнаружен",
     "Audio Output": "Аудиовыход",
-    "Share Link to User": "Поделиться ссылкой с пользователем",
+    "Share Link to User": "Поделиться ссылкой на пользователя",
     "Share room": "Поделиться комнатой",
     "Share Room": "Поделиться комнатой",
     "Link to most recent message": "Ссылка на последнее сообщение",

From d17e54c1cf212edbf23c17c7ab1415161bb2fe03 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 12:26:12 +0100
Subject: [PATCH 2159/3235] Use `recovery passphrase` and `recovery key`
 everywhere

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../keybackup/CreateKeyBackupDialog.js        | 14 +++---
 .../keybackup/NewRecoveryMethodDialog.js      |  3 +-
 .../keybackup/RecoveryMethodRemovedDialog.js  |  2 +-
 .../CreateSecretStorageDialog.js              | 16 +++----
 .../structures/auth/SetupEncryptionBody.js    |  2 +-
 .../keybackup/RestoreKeyBackupDialog.js       |  4 +-
 .../AccessSecretStorageDialog.js              | 14 +++---
 src/i18n/strings/en_EN.json                   | 47 +++++++++----------
 8 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 3a480a2579..a07ca80918 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -272,7 +272,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         let helpText;
         if (this.state.zxcvbnResult) {
             if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This passphrase looks strong enough.");
+                helpText = _t("Great! This recovery passphrase looks strong enough.");
             } else {
                 const suggestions = [];
                 for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
@@ -297,7 +297,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "We'll store an encrypted copy of your keys on our server. " +
-                "Protect your backup with a passphrase to keep it secure.",
+                "Protect your backup with a recovery passphrase to keep it secure.",
             )}</p>
             <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
@@ -307,7 +307,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                         onChange={this._onPassPhraseChange}
                         value={this.state.passPhrase}
                         className="mx_CreateKeyBackupDialog_passPhraseInput"
-                        placeholder={_t("Enter a passphrase...")}
+                        placeholder={_t("Enter a recovery passphrase...")}
                         autoFocus={true}
                     />
                     <div className="mx_CreateKeyBackupDialog_passPhraseHelp">
@@ -364,7 +364,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
-                "Please enter your passphrase a second time to confirm.",
+                "Please enter your recovery passphrase a second time to confirm.",
             )}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
@@ -373,7 +373,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                             onChange={this._onPassPhraseConfirmChange}
                             value={this.state.passPhraseConfirm}
                             className="mx_CreateKeyBackupDialog_passPhraseInput"
-                            placeholder={_t("Repeat your passphrase...")}
+                            placeholder={_t("Repeat your recovery passphrase...")}
                             autoFocus={true}
                         />
                     </div>
@@ -393,7 +393,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
-                "access to your encrypted messages if you forget your passphrase.",
+                "access to your encrypted messages if you forget your recovery passphrase.",
             )}</p>
             <p>{_t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
@@ -489,7 +489,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             case PHASE_PASSPHRASE:
                 return _t('Secure your backup with a passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm your passphrase');
+                return _t('Confirm your recovery passphrase');
             case PHASE_OPTOUT_CONFIRM:
                 return _t('Warning!');
             case PHASE_SHOWKEY:
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 6588ff5191..d41c8c53ef 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -57,8 +57,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         </span>;
 
         const newMethodDetected = <p>{_t(
-            "A new recovery passphrase and key for Secure " +
-            "Messages have been detected.",
+            "A new recovery passphrase and recovery key for Secure Messages have been detected.",
         )}</p>;
 
         const hackWarning = <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index c5222dafd5..95fcb96967 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -55,7 +55,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This session has detected that your recovery passphrase and key " +
+                        "This session has detected that your recovery passphrase and recovery key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index d63db617d5..b83fbb0a1e 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -472,7 +472,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         let helpText;
         if (this.state.zxcvbnResult) {
             if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This passphrase looks strong enough.");
+                helpText = _t("Great! This recovery passphrase looks strong enough.");
             } else {
                 // We take the warning from zxcvbn or failing that, the first
                 // suggestion. In practice The first is generally the most relevant
@@ -501,7 +501,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "granting them access to encrypted messages and marking them as trusted for other users.",
             )}</p>
             <p>{_t(
-                "Secure your encryption keys with a passphrase. For maximum security " +
+                "Secure your encryption keys with a recovery passphrase. For maximum security " +
                 "this should be different to your account password:",
             )}</p>
 
@@ -511,7 +511,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
                     value={this.state.passPhrase}
-                    label={_t("Enter a passphrase")}
+                    label={_t("Enter a recovery passphrase")}
                     autoFocus={true}
                     autoComplete="new-password"
                 />
@@ -522,7 +522,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up my encryption keys, securing them with the same passphrase")}
+                label={ _t("Back up my encryption keys, securing them with the same recovery passphrase")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 
@@ -579,7 +579,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
-                "Enter your passphrase a second time to confirm it.",
+                "Enter your recovery passphrase a second time to confirm it.",
             )}</p>
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
                 <Field
@@ -587,7 +587,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     onChange={this._onPassPhraseConfirmChange}
                     value={this.state.passPhraseConfirm}
                     className="mx_CreateSecretStorageDialog_passPhraseField"
-                    label={_t("Confirm your passphrase")}
+                    label={_t("Confirm your recovery passphrase")}
                     autoFocus={true}
                     autoComplete="new-password"
                 />
@@ -614,7 +614,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         return <div>
             <p>{_t(
                 "Your recovery key is a safety net - you can use it to restore " +
-                "access to your encrypted messages if you forget your passphrase.",
+                "access to your encrypted messages if you forget your recovery passphrase.",
             )}</p>
             <p>{_t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
@@ -713,7 +713,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             case PHASE_PASSPHRASE:
                 return _t('Set up encryption');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm passphrase');
+                return _t('Confirm recovery passphrase');
             case PHASE_CONFIRM_SKIP:
                 return _t('Are you sure?');
             case PHASE_SHOWKEY:
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index a982957ed0..e6302a4685 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -116,7 +116,7 @@ export default class SetupEncryptionBody extends React.Component {
                         "granting it access to encrypted messages.",
                     )}</p>
                     <p>{_t(
-                        "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+                        "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
                     {}, {
                         button: sub => <AccessibleButton element="span"
                             className="mx_linkButton"
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index aecfa9bfd1..dc82a71713 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -283,7 +283,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     title = _t("Recovery key mismatch");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this key: " +
+                            "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
                     </div>;
@@ -291,7 +291,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     title = _t("Incorrect recovery passphrase");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this passphrase: " +
+                            "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
                     </div>;
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index e3a7d7f532..4c0c608ad6 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -119,14 +119,13 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         if (hasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            title = _t("Enter secret storage passphrase");
+            title = _t("Enter recovery passphrase");
 
             let keyStatus;
             if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access secret storage. Please verify that you " +
-                        "entered the correct passphrase.",
+                        "Unable to access. Please verify that you entered the correct recovery passphrase.",
                     )}
                 </div>;
             } else {
@@ -141,7 +140,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and your cross-signing " +
-                    "identity for verifying other sessions by entering your passphrase.",
+                    "identity for verifying other sessions by entering your recovery passphrase.",
                 )}</p>
 
                 <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onPassPhraseNext}>
@@ -164,7 +163,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     />
                 </form>
                 {_t(
-                    "If you've forgotten your passphrase you can "+
+                    "If you've forgotten your recovery passphrase you can "+
                     "<button1>use your recovery key</button1> or " +
                     "<button2>set up new recovery options</button2>."
                 , {}, {
@@ -183,7 +182,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 })}
             </div>;
         } else {
-            title = _t("Enter secret storage recovery key");
+            title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
@@ -193,8 +192,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             } else if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access secret storage. Please verify that you " +
-                        "entered the correct recovery key.",
+                        "Unable to access. Please verify that you entered the correct recovery key.",
                     )}
                 </div>;
             } else if (this.state.recoveryKeyValid) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 84c172ea4d..dcd24b91de 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1778,32 +1778,30 @@
     "Remember my selection for this widget": "Remember my selection for this widget",
     "Allow": "Allow",
     "Deny": "Deny",
-    "Enter secret storage passphrase": "Enter secret storage passphrase",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Unable to access secret storage. Please verify that you entered the correct passphrase.",
+    "Enter recovery passphrase": "Enter recovery passphrase",
+    "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
     "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.",
-    "Enter secret storage recovery key": "Enter secret storage recovery key",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct recovery key.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
+    "Unable to access. Please verify that you entered the correct recovery key.": "Unable to access. Please verify that you entered the correct 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",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
     "Incorrect recovery passphrase": "Incorrect recovery passphrase",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
     "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",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "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",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
     "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 key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
@@ -2119,7 +2117,7 @@
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
     "Use an existing session to verify this one, granting it access to encrypted messages.": "Use an existing session to verify this one, granting it access to encrypted messages.",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "If you can’t access one, <button>use your recovery key or passphrase.</button>",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
     "Use your other device to continue…": "Use your other device to continue…",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
@@ -2182,18 +2180,18 @@
     "Restore": "Restore",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
+    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:",
-    "Enter a passphrase": "Enter a passphrase",
-    "Back up my encryption keys, securing them with the same passphrase": "Back up my encryption keys, securing them with the same passphrase",
+    "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:",
+    "Enter a recovery passphrase": "Enter a recovery passphrase",
+    "Back up my encryption keys, securing them with the same recovery passphrase": "Back up my encryption keys, securing them with the same recovery passphrase",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
-    "Enter your passphrase a second time to confirm it.": "Enter your passphrase a second time to confirm it.",
-    "Confirm your passphrase": "Confirm your passphrase",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.",
+    "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
+    "Confirm your recovery passphrase": "Confirm your recovery passphrase",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
     "Your recovery key": "Your recovery key",
     "Copy": "Copy",
@@ -2205,15 +2203,16 @@
     "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
     "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
+    "Confirm recovery passphrase": "Confirm recovery passphrase",
     "Make a copy of your recovery key": "Make a copy of your recovery key",
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.",
+    "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a passphrase...": "Enter a passphrase...",
-    "Please enter your passphrase a second time to confirm.": "Please enter your passphrase a second time to confirm.",
-    "Repeat your passphrase...": "Repeat your passphrase...",
+    "Enter a recovery passphrase...": "Enter a recovery passphrase...",
+    "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
+    "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
@@ -2227,13 +2226,13 @@
     "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
+    "A new recovery passphrase and recovery key for Secure Messages have been detected.": "A new recovery passphrase and recovery key for Secure Messages have been detected.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",

From 498ac2e0fcad12a4f3343f3bfd4fcec065c018a6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 12:52:35 +0100
Subject: [PATCH 2160/3235] Copy tweaks with Nad

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/CrossSigningManager.js                           |  2 +-
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js |  2 +-
 .../dialogs/keybackup/NewRecoveryMethodDialog.js     |  2 +-
 .../dialogs/keybackup/RecoveryMethodRemovedDialog.js |  2 +-
 .../secretstorage/AccessSecretStorageDialog.js       |  6 ++----
 src/i18n/strings/en_EN.json                          | 12 ++++++------
 src/settings/Settings.js                             |  2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index 07ec776bd1..c37d0f8bf5 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -51,7 +51,7 @@ async function confirmToDismiss(name) {
     } else if (name === "m.cross_signing.self_signing") {
         description = _t("If you cancel now, you won't complete verifying your other session.");
     } else {
-        description = _t("If you cancel now, you won't complete your secret storage operation.");
+        description = _t("If you cancel now, you won't complete your operation.");
     }
 
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index a07ca80918..e7a2c8c859 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -297,7 +297,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "We'll store an encrypted copy of your keys on our server. " +
-                "Protect your backup with a recovery passphrase to keep it secure.",
+                "Secure your backup with a recovery passphrase.",
             )}</p>
             <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index d41c8c53ef..9e2264a960 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -57,7 +57,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         </span>;
 
         const newMethodDetected = <p>{_t(
-            "A new recovery passphrase and recovery key for Secure Messages have been detected.",
+            "A new recovery passphrase and key for Secure Messages have been detected.",
         )}</p>;
 
         const hackWarning = <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 95fcb96967..c5222dafd5 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -55,7 +55,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This session has detected that your recovery passphrase and recovery key " +
+                        "This session has detected that your recovery passphrase and key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 4c0c608ad6..f2e7b7e704 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -134,8 +134,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             content = <div>
                 <p>{_t(
-                    "<b>Warning</b>: You should only access secret storage " +
-                    "from a trusted computer.", {},
+                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
                     { b: sub => <b>{sub}</b> },
                 )}</p>
                 <p>{_t(
@@ -207,8 +206,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             content = <div>
                 <p>{_t(
-                    "<b>Warning</b>: You should only access secret storage " +
-                    "from a trusted computer.", {},
+                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
                     { b: sub => <b>{sub}</b> },
                 )}</p>
                 <p>{_t(
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dcd24b91de..4ee910a1b6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -70,7 +70,7 @@
     "Failure to create room": "Failure to create room",
     "If you cancel now, you won't complete verifying the other user.": "If you cancel now, you won't complete verifying the other user.",
     "If you cancel now, you won't complete verifying your other session.": "If you cancel now, you won't complete verifying your other session.",
-    "If you cancel now, you won't complete your secret storage operation.": "If you cancel now, you won't complete your secret storage operation.",
+    "If you cancel now, you won't complete your operation.": "If you cancel now, you won't complete your operation.",
     "Cancel entering passphrase?": "Cancel entering passphrase?",
     "Enter passphrase": "Enter passphrase",
     "Cancel": "Cancel",
@@ -444,7 +444,7 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
-    "Keep secret storage passphrase in memory for this session": "Keep secret storage passphrase in memory for this session",
+    "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
     "How fast should messages be downloaded.": "How fast should messages be downloaded.",
     "Manually verify all remote sessions": "Manually verify all remote sessions",
     "Collecting app version information": "Collecting app version information",
@@ -1780,7 +1780,7 @@
     "Deny": "Deny",
     "Enter recovery passphrase": "Enter recovery passphrase",
     "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Warning</b>: You should only access secret storage from a trusted computer.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Warning</b>: You should only do this on a trusted computer.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
@@ -2208,7 +2208,7 @@
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
     "Retry": "Retry",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.": "We'll store an encrypted copy of your keys on our server. Protect your backup with a recovery passphrase to keep it secure.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
     "Enter a recovery passphrase...": "Enter a recovery passphrase...",
     "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
@@ -2226,13 +2226,13 @@
     "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and recovery key for Secure Messages have been detected.": "A new recovery passphrase and recovery key for Secure Messages have been detected.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and recovery key for Secure Messages have been removed.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 0d72017878..317508ca86 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -516,7 +516,7 @@ export const SETTINGS = {
     },
     "keepSecretStoragePassphraseForSession": {
          supportedLevels: ['device', 'config'],
-         displayName: _td("Keep secret storage passphrase in memory for this session"),
+         displayName: _td("Keep recovery passphrase in memory for this session"),
          default: false,
     },
     "crawlerSleepTime": {

From 7236397e5fa9804a195519d45dad872b1316fd1a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:23:01 +0100
Subject: [PATCH 2161/3235] Replace `Verify this session` and `Complete
 security`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/CompleteSecurity.js   | 12 ++++++------
 .../views/dialogs/VerificationRequestDialog.js       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 06cece0af2..3ef3140298 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -59,17 +59,17 @@ export default class CompleteSecurity extends React.Component {
         let title;
 
         if (phase === PHASE_INTRO) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
-            title = _t("Complete security");
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            title = _t("Verify session");
         } else if (phase === PHASE_DONE) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified"></span>;
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
         } else if (phase === PHASE_CONFIRM_SKIP) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;
-            title = _t("Complete security");
+            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
+            title = _t("Verify session");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 7ff2cb8f50..dcb9168bda 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -48,7 +48,7 @@ export default class VerificationRequestDialog extends React.Component {
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify this session") : _t("Verification Request");
+            _t("Verify session") : _t("Verification Request");
 
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"

From da5c8b5657e0a27dade6fdb8670340e9c3bc935e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:28:12 +0100
Subject: [PATCH 2162/3235] further tweaks by Matthew

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/CompleteSecurity.js        | 4 ++--
 src/components/views/dialogs/VerificationRequestDialog.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 3ef3140298..95128c0be9 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -60,7 +60,7 @@ export default class CompleteSecurity extends React.Component {
 
         if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify session");
+            title = _t("Verify this session");
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
@@ -69,7 +69,7 @@ export default class CompleteSecurity extends React.Component {
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify session");
+            title = _t("Verify this session");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index dcb9168bda..3a6e9a2d10 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -48,7 +48,7 @@ export default class VerificationRequestDialog extends React.Component {
         const member = this.props.member ||
             otherUserId && MatrixClientPeg.get().getUser(otherUserId);
         const title = request && request.isSelfVerification ?
-            _t("Verify session") : _t("Verification Request");
+            _t("Verify other session") : _t("Verification Request");
 
         return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
                 contentId="mx_Dialog_content"

From 0e72aef1e3bc15167d0d272ffd83f8c5216422de Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:34:18 +0100
Subject: [PATCH 2163/3235] update Create SSSS Dialog copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index b83fbb0a1e..c8551149dc 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -497,12 +497,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
-                "Set up encryption on this session to allow it to verify other sessions, " +
-                "granting them access to encrypted messages and marking them as trusted for other users.",
-            )}</p>
-            <p>{_t(
-                "Secure your encryption keys with a recovery passphrase. For maximum security " +
-                "this should be different to your account password:",
+                "Set a recovery passphrase to secure encrypted information and recover it if you log out. " +
+                "This should be different to your account password:",
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
@@ -522,7 +518,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up my encryption keys, securing them with the same recovery passphrase")}
+                label={ _t("Back up encryption keys")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 

From 84e8e226162fe948602f566d2c72452b0668f59f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 13:48:52 +0100
Subject: [PATCH 2164/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4ee910a1b6..ed1fbf6831 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1772,6 +1772,7 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
+    "Verify other session": "Verify other session",
     "Verification Request": "Verification Request",
     "A widget would like to verify your identity": "A widget would like to verify your identity",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
@@ -2062,7 +2063,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
-    "Complete security": "Complete security",
     "Session verified": "Session verified",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -2181,10 +2181,9 @@
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:": "Secure your encryption keys with a recovery passphrase. For maximum security this should be different to your account password:",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
     "Enter a recovery passphrase": "Enter a recovery passphrase",
-    "Back up my encryption keys, securing them with the same recovery passphrase": "Back up my encryption keys, securing them with the same recovery passphrase",
+    "Back up encryption keys": "Back up encryption keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",

From 14910c6e8077b4cfb3d5b2110e38943182532713 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:02:32 +0100
Subject: [PATCH 2165/3235] iterate copy some more

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js    | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index c8551149dc..65784c49ec 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -518,7 +518,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             </div>
 
             <LabelledToggleSwitch
-                label={ _t("Back up encryption keys")}
+                label={ _t("Back up encrypted message keys")}
                 onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
             />
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ed1fbf6831..cf02e51608 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2183,7 +2183,7 @@
     "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
     "Enter a recovery passphrase": "Enter a recovery passphrase",
-    "Back up encryption keys": "Back up encryption keys",
+    "Back up encrypted message keys": "Back up encrypted message keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
     "That doesn't match.": "That doesn't match.",

From d4b15da70af793224785d5bce8e8af3fc3789b34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:09:41 +0100
Subject: [PATCH 2166/3235] Fixxy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../dialogs/secretstorage/AccessSecretStorageDialog.js      | 6 ++++--
 src/i18n/strings/en_EN.json                                 | 4 ++--
 .../views/dialogs/AccessSecretStorageDialog-test.js         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index f2e7b7e704..7d7edffcbf 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -125,7 +125,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access. Please verify that you entered the correct recovery passphrase.",
+                        "Unable to access secret storage. " +
+                        "Please verify that you entered the correct recovery passphrase.",
                     )}
                 </div>;
             } else {
@@ -191,7 +192,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             } else if (this.state.keyMatches === false) {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
-                        "Unable to access. Please verify that you entered the correct recovery key.",
+                        "Unable to access secret storage. " +
+                        "Please verify that you entered the correct recovery key.",
                     )}
                 </div>;
             } else if (this.state.recoveryKeyValid) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cf02e51608..54da81e1ff 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1780,12 +1780,12 @@
     "Allow": "Allow",
     "Deny": "Deny",
     "Enter recovery passphrase": "Enter recovery passphrase",
-    "Unable to access. Please verify that you entered the correct recovery passphrase.": "Unable to access. Please verify that you entered the correct recovery passphrase.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.",
     "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Warning</b>: You should only do this on a trusted computer.",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
-    "Unable to access. Please verify that you entered the correct recovery key.": "Unable to access. Please verify that you entered the correct recovery key.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct 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",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index 30512ca4dd..c754a4b607 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -100,7 +100,7 @@ describe("AccessSecretStorageDialog", function() {
         });
         expect(notification.props.children).toEqual(
             ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
-                     "entered the correct passphrase."]);
+                     "entered the correct recovery passphrase."]);
         done();
     });
 });

From 7593c8273bc1e5ebf751d45071f00d7175acdc94 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 14:55:43 +0100
Subject: [PATCH 2167/3235] update PHASE_PASSPHRASE copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js            | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index e7a2c8c859..cec84e98d1 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -487,7 +487,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _titleForPhase(phase) {
         switch (phase) {
             case PHASE_PASSPHRASE:
-                return _t('Secure your backup with a passphrase');
+                return _t('Secure your backup with a recovery passphrase');
             case PHASE_PASSPHRASE_CONFIRM:
                 return _t('Confirm your recovery passphrase');
             case PHASE_OPTOUT_CONFIRM:
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 54da81e1ff..a291065145 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2215,7 +2215,7 @@
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
-    "Secure your backup with a passphrase": "Secure your backup with a passphrase",
+    "Secure your backup with a recovery passphrase": "Secure your backup with a recovery passphrase",
     "Starting backup...": "Starting backup...",
     "Success!": "Success!",
     "Create key backup": "Create key backup",

From e1e65a0fe19c536ba8f726ab5465ff9e24c5f1c8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Apr 2020 17:13:33 +0100
Subject: [PATCH 2168/3235] Make RoomPublishSetting import-skinnable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/room_settings/RoomPublishSetting.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/room_settings/RoomPublishSetting.js b/src/components/views/room_settings/RoomPublishSetting.js
index bac2dfc656..6cc3ce26ba 100644
--- a/src/components/views/room_settings/RoomPublishSetting.js
+++ b/src/components/views/room_settings/RoomPublishSetting.js
@@ -18,7 +18,9 @@ import React from 'react';
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import {_t} from "../../../languageHandler";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.room_settings.RoomPublishSetting")
 export default class RoomPublishSetting extends React.PureComponent {
     constructor(props) {
         super(props);

From 65f1f7cfad3de1fe1cb8424620ebf2eb4d0dd7ce Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Thu, 16 Apr 2020 14:59:32 +0000
Subject: [PATCH 2169/3235] Translated using Weblate (Albanian)

Currently translated at 99.7% (2282 of 2289 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 | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 426f964a29..49f28b9129 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2350,5 +2350,33 @@
     "Confirm account deactivation": "Ripohoni çaktivizim llogarie",
     "Server did not require any authentication": "Shërbyesi s’kërkoi ndonjë mirëfilltësim",
     "Server did not return valid authentication information.": "Shërbyesi s’ktheu ndonjë të dhënë të vlefshme mirëfilltësimi.",
-    "There was a problem communicating with the server. Please try again.": "Pati një problem në komunikimin me shërbyesin. Ju lutemi, riprovoni."
+    "There was a problem communicating with the server. Please try again.": "Pati një problem në komunikimin me shërbyesin. Ju lutemi, riprovoni.",
+    "If you cancel now, you won't complete your operation.": "Nëse e anuloni tani, s’do ta plotësoni veprimin tuaj.",
+    "Keep recovery passphrase in memory for this session": "Për këtë sesion, mbaje në kujtesë frazëkalimin e rimarrjeve",
+    "Verify other session": "Verifikoni tjetër sesion",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se dhatë frazëkalimin e duhur për rimarrje.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Kujdes</b>: Këtë duhet ta bëni vetëm në një kompjuter të besuar.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em> për verifikim sesionesh të tjerë, duke dhënë frazëkalimin tuaj për rimarrje.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Nëse e keni harruar frazëkalimin tuaj të rimarrjeve, mund të <button1>përdorni kyçin tuaj të rimarrjeve</button1> ose <button2>të ujdisni mundësi të reja rimarrjesh</button2>.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Kopjeruajtja s’u shfshehtëzua dot me këtë kyç rimarrjesh: ju lutemi, verifikoni se keni dhënë kyçin e saktë të rimarrjeve.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Kopjeruajtja s’u shfshehtëzua dot me këtë frazëkalim rimarrjesh: ju lutemi, verifikoni se keni dhënë frazëkalimin e saktë të rimarrjeve.",
+    "Syncing...": "Po njëkohësohet…",
+    "Signing In...": "Po hyhet…",
+    "If you've joined lots of rooms, this might take a while": "Nëse jeni pjesë e shumë dhomave, kjo mund të zgjasë ca",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "Që të verifikoni këtë, përdorni një sesion ekzistues, duke i akorduar hyrje te mesazhe të fshehtëzuar.",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Nëse s’hyni dot në një, <button>përdorni kyçin tuaj të rimarrjeve ose frazëkalim rimarrjesh.</button>",
+    "Use your other device to continue…": "Që të vazhdohet, përdorni pajisjen tuaj tjetër…",
+    "Great! This recovery passphrase looks strong enough.": "Bukur! Ky frazëkalim rimarrjesh duket mjaftueshëm i fuqishëm.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Caktoni një frazëkalim rimarrjesh që të siguroni informacione të fshehtëzuar dhe për ta rimarrë, nëse dilni nga llogaria. Ky duhet të jetë i ndryshëm nga fjalëkalimi juaj për llogarinë:",
+    "Enter a recovery passphrase": "Jepni një frazëkalim rimarrjesh",
+    "Back up encrypted message keys": "Kopjeruani kyçe mesazhesh të fshehtëzuar",
+    "Enter your recovery passphrase a second time to confirm it.": "Për ta ripohuar, jepeni edhe një herë frazëkalimin tuaj të rimarrjeve.",
+    "Confirm your recovery passphrase": "Ripohoni frazëkalimin tuaj të rimarrjeve",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Kyçi juaj i rimarrjeve është një rrjet sigurie - mund ta përdorni të të rifituar hyrje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj të rimarrjeve.",
+    "Confirm recovery passphrase": "Ripohoni frazëkalim rimarrjesh",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Do të ruajmë një kopje të fshehtëzuar të kyçeve tuaj në shërbyesin tonë. Siguroni kopjeruajtjen tuaj me një frazëkalim rimarrjesh.",
+    "Enter a recovery passphrase...": "Jepni një frazëkalim rimarrjesh…",
+    "Please enter your recovery passphrase a second time to confirm.": "Ju lutemi, jepeni frazëkalimin tuaj të rimarrjeve edhe një herë, për ta ripohuar.",
+    "Repeat your recovery passphrase...": "Përsëritni frazëkalimin tuaj të rimarrjeve…",
+    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh"
 }

From b5130ca5dcd9111128fd659792febba35cf987b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:12:47 -0600
Subject: [PATCH 2170/3235] Clean up setting definition to follow surrounding
 practices

It's not perfect, but we're at least okay with it.
---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a291065145..be8f1a7a4a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -399,7 +399,7 @@
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Support adding custom themes": "Support adding custom themes",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
+    "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 232c5d9f66..32ff0a5f94 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,9 +152,10 @@ export const SETTINGS = {
         default: null,
     },
     "feature_cross_signing": {
-        //isFeature: true,
-        displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
-        supportedLevels: LEVELS_FEATURE,
+        // XXX: We shouldn't be using the feature prefix for non-feature settings. There is an exception
+        // for this case though as we're converting a feature to a setting for a temporary safety net.
+        displayName: _td("Enable cross-signing to verify per-user instead of per-session"),
+        supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
         default: true,
     },
     "feature_event_indexing": {

From 54f8ba4d802ddd02286761efb07254793170bad4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:15:12 -0600
Subject: [PATCH 2171/3235] Remove UI to change the cross-signing setting

---
 src/components/views/settings/tabs/user/LabsUserSettingsTab.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index fe160032ff..3e69107159 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -62,7 +62,6 @@ export default class LabsUserSettingsTab extends React.Component {
                 </div>
                 <div className="mx_SettingsTab_section">
                     {flags}
-                    <SettingsFlag name={"feature_cross_signing"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />

From 0fcaaab1d01830ac73d15b6ffb9b3c316e1b9184 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:18:54 -0600
Subject: [PATCH 2172/3235] Appease the linter

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

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 9189cfdf26..5e74656920 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import {useFeatureEnabled, useSettingValue} from "../../../hooks/useSettings";
+import {useSettingValue} from "../../../hooks/useSettings";
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
 

From 2d395d8dd1c8b98912a7b0f0582d8e23fc01aa85 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 15 Apr 2020 13:18:42 -0600
Subject: [PATCH 2173/3235] Convert cross-signing feature flag to setting

This is intended as a temporary measure until we're comfortable with removing the flag entirely.
---
 src/DeviceListener.js                                  |  2 +-
 src/KeyRequestHandler.js                               |  4 ++--
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js   |  2 +-
 src/components/structures/MatrixChat.js                |  8 ++++----
 src/components/structures/RightPanel.js                |  4 ++--
 src/components/structures/RoomView.js                  |  2 +-
 src/components/views/dialogs/CreateRoomDialog.js       |  4 ++--
 src/components/views/dialogs/DeviceVerifyDialog.js     |  2 +-
 src/components/views/dialogs/InviteDialog.js           |  2 +-
 src/components/views/messages/MessageActionBar.js      |  2 +-
 src/components/views/right_panel/UserInfo.js           | 10 +++++-----
 src/components/views/rooms/E2EIcon.js                  |  4 ++--
 src/components/views/rooms/EventTile.js                |  2 +-
 src/components/views/rooms/MemberTile.js               |  2 +-
 src/components/views/rooms/MessageComposer.js          |  2 +-
 src/components/views/rooms/RoomBreadcrumbs.js          |  2 +-
 src/components/views/rooms/RoomHeader.js               |  2 +-
 src/components/views/rooms/RoomTile.js                 |  6 +++---
 src/components/views/settings/KeyBackupPanel.js        |  2 +-
 .../views/settings/tabs/user/LabsUserSettingsTab.js    |  1 +
 .../settings/tabs/user/SecurityUserSettingsTab.js      |  2 +-
 src/createRoom.js                                      |  2 +-
 src/settings/Settings.js                               |  4 ++--
 src/verification.js                                    |  2 +-
 24 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 21c844e11c..3201e4af45 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -124,7 +124,7 @@ export default class DeviceListener {
         const cli = MatrixClientPeg.get();
 
         if (
-            !SettingsStore.isFeatureEnabled("feature_cross_signing") ||
+            !SettingsStore.getValue("feature_cross_signing") ||
             !await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         ) return;
 
diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
index 30f3b7d50e..ceaff0c54d 100644
--- a/src/KeyRequestHandler.js
+++ b/src/KeyRequestHandler.js
@@ -35,7 +35,7 @@ export default class KeyRequestHandler {
 
     handleKeyRequest(keyRequest) {
         // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
@@ -70,7 +70,7 @@ export default class KeyRequestHandler {
 
     handleKeyRequestCancellation(cancellation) {
         // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index cec84e98d1..ed31176186 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -77,7 +77,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     async componentDidMount() {
         const cli = MatrixClientPeg.get();
         const secureSecretStorage = (
-            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            SettingsStore.getValue("feature_cross_signing") &&
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         );
         this.setState({ secureSecretStorage });
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 519b39d436..1293ccc7e9 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1506,7 +1506,7 @@ export default createReactClass({
         });
 
         cli.on("crypto.verification.request", request => {
-            const isFlagOn = SettingsStore.isFeatureEnabled("feature_cross_signing");
+            const isFlagOn = SettingsStore.getValue("feature_cross_signing");
 
             if (!isFlagOn && !request.channel.deviceId) {
                 request.cancel({code: "m.invalid_message", reason: "This client has cross-signing disabled"});
@@ -1556,7 +1556,7 @@ export default createReactClass({
             // changing colour. More advanced behaviour will come once
             // we implement more settings.
             cli.setGlobalErrorOnUnknownDevices(
-                !SettingsStore.isFeatureEnabled("feature_cross_signing"),
+                !SettingsStore.getValue("feature_cross_signing"),
             );
         }
     },
@@ -1921,10 +1921,10 @@ export default createReactClass({
         if (masterKeyInStorage) {
             // Auto-enable cross-signing for the new session when key found in
             // secret storage.
-            SettingsStore.setFeatureEnabled("feature_cross_signing", true);
+            SettingsStore.setValue("feature_cross_signing", null, SettingLevel.DEVICE, true);
             this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
         } else if (
-            SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+            SettingsStore.getValue("feature_cross_signing") &&
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
         ) {
             // This will only work if the feature is set to 'enable' in the config,
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 3c97d2f4ae..f5bdfdf40d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -219,7 +219,7 @@ export default class RightPanel extends React.Component {
                 break;
             case RIGHT_PANEL_PHASES.RoomMemberInfo:
             case RIGHT_PANEL_PHASES.EncryptionPanel:
-                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
                         dis.dispatch({
                             action: "view_user",
@@ -246,7 +246,7 @@ export default class RightPanel extends React.Component {
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
                 break;
             case RIGHT_PANEL_PHASES.GroupMemberInfo:
-                if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+                if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
                         dis.dispatch({
                             action: "view_user",
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 78bd34bf7f..179e0aa2e9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -822,7 +822,7 @@ export default createReactClass({
             });
             return;
         }
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
                 this.setState({
                     e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f18e28b85e..fa8c7dd30e 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -65,7 +65,7 @@ export default createReactClass({
             createOpts.creation_content = {'m.federate': false};
         }
 
-        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
             opts.encryption = this.state.isEncrypted;
         }
 
@@ -192,7 +192,7 @@ export default createReactClass({
         }
 
         let e2eeSection;
-        if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
                 <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 39e391269c..a3f9430476 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -131,7 +131,7 @@ export default class DeviceVerifyDialog extends React.Component {
                 } else {
                     this._verifier = request.verifier;
                 }
-            } else if (verifyingOwnDevice && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            } else if (verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
                 this._request = await client.requestVerification(this.props.userId, [
                     verificationMethods.SAS,
                     SHOW_QR_CODE_METHOD,
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index f0d5443cac..a46fa0df07 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -574,7 +574,7 @@ export default class InviteDialog extends React.PureComponent {
 
         const createRoomOptions = {inlineErrors: true};
 
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const client = MatrixClientPeg.get();
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 5516ff2146..0cde90e417 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -49,7 +49,7 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
         };
 
         let e2eInfoCallback = null;
-        if (mxEvent.isEncrypted() && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (mxEvent.isEncrypted() && !SettingsStore.getValue("feature_cross_signing")) {
             e2eInfoCallback = onCryptoClick;
         }
 
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index abe54b355e..862e4f7897 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -63,7 +63,7 @@ const _disambiguateDevices = (devices) => {
 };
 
 export const getE2EStatus = (cli, userId, devices) => {
-    if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (!SettingsStore.getValue("feature_cross_signing")) {
         const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
         return hasUnverifiedDevice ? "warning" : "verified";
     }
@@ -111,7 +111,7 @@ async function openDMForUser(matrixClient, userId) {
         dmUserId: userId,
     };
 
-    if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (SettingsStore.getValue("feature_cross_signing")) {
         // Check whether all users have uploaded device keys before.
         // If so, enable encryption in the new room.
         const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
@@ -166,7 +166,7 @@ function DeviceItem({userId, device}) {
     // cross-signing so that other users can then safely trust you.
     // For other people's devices, the more general verified check that
     // includes locally verified devices can be used.
-    const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
+    const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
         deviceTrust.isCrossSigningVerified() :
         deviceTrust.isVerified();
 
@@ -237,7 +237,7 @@ function DevicesSection({devices, userId, loading}) {
             // cross-signing so that other users can then safely trust you.
             // For other people's devices, the more general verified check that
             // includes locally verified devices can be used.
-            const isVerified = (isMe && SettingsStore.isFeatureEnabled("feature_cross_signing")) ?
+            const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
                 deviceTrust.isCrossSigningVerified() :
                 deviceTrust.isVerified();
 
@@ -1298,7 +1298,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const userTrust = cli.checkUserTrust(member.userId);
     const userVerified = userTrust.isCrossSigningVerified();
     const isMe = member.userId === cli.getUserId();
-    const canVerify = SettingsStore.isFeatureEnabled("feature_cross_signing") &&
+    const canVerify = SettingsStore.getValue("feature_cross_signing") &&
                         homeserverSupportsCrossSigning && !userVerified && !isMe;
 
     const setUpdating = (updating) => {
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index a2c99fad99..9189cfdf26 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import {useFeatureEnabled} from "../../../hooks/useSettings";
+import {useFeatureEnabled, useSettingValue} from "../../../hooks/useSettings";
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
 
@@ -62,7 +62,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
     }, className);
 
     let e2eTitle;
-    const crossSigning = useFeatureEnabled("feature_cross_signing");
+    const crossSigning = useSettingValue("feature_cross_signing");
     if (crossSigning && isUser) {
         e2eTitle = crossSigningUserTitles[status];
     } else if (crossSigning && !isUser) {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 75fbe5caa3..f67877373e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -323,7 +323,7 @@ export default createReactClass({
 
         // If cross-signing is off, the old behaviour is to scream at the user
         // as if they've done something wrong, which they haven't
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             this.setState({
                 verified: E2E_STATE.WARNING,
             }, this.props.onHeightChanged);
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index bf2a1bee23..d830624f8a 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -56,7 +56,7 @@ export default createReactClass({
             }
         }
 
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             const { roomId } = this.props.member;
             if (roomId) {
                 const isRoomEncrypted = cli.isRoomEncrypted(roomId);
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index c86bcb2ff0..4749742a7d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -270,7 +270,7 @@ export default class MessageComposer extends React.Component {
     }
 
     renderPlaceholderText() {
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             if (this.state.isQuoting) {
                 if (this.props.e2eStatus) {
                     return _t('Send an encrypted reply…');
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 1d433c9a40..09228c454b 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -364,7 +364,7 @@ export default class RoomBreadcrumbs extends React.Component {
             }
 
             let dmIndicator;
-            if (this._isDmRoom(r.room) && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (this._isDmRoom(r.room) && !SettingsStore.getValue("feature_cross_signing")) {
                 dmIndicator = <img
                     src={require("../../../../res/img/icon_person.svg")}
                     className="mx_RoomBreadcrumbs_dmIndicator"
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 71f774248f..17495e6299 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -168,7 +168,7 @@ export default createReactClass({
         const joinRule = joinRules && joinRules.getContent().join_rule;
         let privateIcon;
         // Don't show an invite-only icon for DMs. Users know they're invite-only.
-        if (!dmUserId && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!dmUserId && SettingsStore.getValue("feature_cross_signing")) {
             if (joinRule == "invite") {
                 privateIcon = <InviteOnlyIcon />;
             }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index d264b087a0..a34ade365b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -155,7 +155,7 @@ export default createReactClass({
         if (!cli.isRoomEncrypted(this.props.room.roomId)) {
             return;
         }
-        if (!SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (!SettingsStore.getValue("feature_cross_signing")) {
             return;
         }
 
@@ -488,7 +488,7 @@ export default createReactClass({
         let dmOnline;
         /* Post-cross-signing we don't show DM indicators at all, instead relying on user
            context to let them know when that is. */
-        if (dmUserId && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (dmUserId && !SettingsStore.getValue("feature_cross_signing")) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"
@@ -532,7 +532,7 @@ export default createReactClass({
         }
 
         let privateIcon = null;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             if (this.state.joinRule == "invite" && !dmUserId) {
                 privateIcon = <InviteOnlyIcon collapsedPanel={this.props.collapsed} />;
             }
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 9d60ed1188..5548768221 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -326,7 +326,7 @@ export default class KeyBackupPanel extends React.PureComponent {
                     </AccessibleButton>
                 </div>
             );
-            if (this.state.backupKeyStored && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+            if (this.state.backupKeyStored && !SettingsStore.getValue("feature_cross_signing")) {
                 buttonRow = <p>⚠️ {_t(
                     "Backup key stored in secret storage, but this feature is not " +
                     "enabled on this session. Please enable cross-signing in Labs to " +
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..fe160032ff 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -62,6 +62,7 @@ export default class LabsUserSettingsTab extends React.Component {
                 </div>
                 <div className="mx_SettingsTab_section">
                     {flags}
+                    <SettingsFlag name={"feature_cross_signing"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 3dca6e2490..1cde5d6f87 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -270,7 +270,7 @@ export default class SecurityUserSettingsTab extends React.Component {
         // can remove this.
         const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
         let crossSigning;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             crossSigning = (
                 <div className='mx_SettingsTab_section'>
                     <span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>
diff --git a/src/createRoom.js b/src/createRoom.js
index 66d4d1908e..a39d2c2216 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -227,7 +227,7 @@ export async function ensureDMExists(client, userId) {
         roomId = existingDMRoom.roomId;
     } else {
         let encryption;
-        if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+        if (SettingsStore.getValue("feature_cross_signing")) {
             encryption = canEncryptToAllUsers(client, [userId]);
         }
         roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 317508ca86..232c5d9f66 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,10 +152,10 @@ export const SETTINGS = {
         default: null,
     },
     "feature_cross_signing": {
-        isFeature: true,
+        //isFeature: true,
         displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
         supportedLevels: LEVELS_FEATURE,
-        default: false,
+        default: true,
     },
     "feature_event_indexing": {
         isFeature: true,
diff --git a/src/verification.js b/src/verification.js
index e00e5e05fa..ca839940e5 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -27,7 +27,7 @@ import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
-    if (!cli.isCryptoEnabled() || !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
+    if (!cli.isCryptoEnabled() || !SettingsStore.getValue("feature_cross_signing")) {
         return false;
     }
     const usk = cli.getCrossSigningId("user_signing");

From b5b4bdbf3d2d62316d2936964bf2516f53166196 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:12:47 -0600
Subject: [PATCH 2174/3235] Clean up setting definition to follow surrounding
 practices

It's not perfect, but we're at least okay with it.
---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a291065145..be8f1a7a4a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -399,7 +399,7 @@
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Support adding custom themes": "Support adding custom themes",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)",
+    "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 232c5d9f66..32ff0a5f94 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,9 +152,10 @@ export const SETTINGS = {
         default: null,
     },
     "feature_cross_signing": {
-        //isFeature: true,
-        displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"),
-        supportedLevels: LEVELS_FEATURE,
+        // XXX: We shouldn't be using the feature prefix for non-feature settings. There is an exception
+        // for this case though as we're converting a feature to a setting for a temporary safety net.
+        displayName: _td("Enable cross-signing to verify per-user instead of per-session"),
+        supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
         default: true,
     },
     "feature_event_indexing": {

From 2ffb5be5cdfc98b281614ac7cb4baa50bd2bcd63 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:15:12 -0600
Subject: [PATCH 2175/3235] Remove UI to change the cross-signing setting

---
 src/components/views/settings/tabs/user/LabsUserSettingsTab.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index fe160032ff..3e69107159 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -62,7 +62,6 @@ export default class LabsUserSettingsTab extends React.Component {
                 </div>
                 <div className="mx_SettingsTab_section">
                     {flags}
-                    <SettingsFlag name={"feature_cross_signing"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />

From 45b6b95d446f63a8b9159961e5f5b3810ce2f8fd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:18:54 -0600
Subject: [PATCH 2176/3235] Appease the linter

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

diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 9189cfdf26..5e74656920 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,7 @@ import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import {useFeatureEnabled, useSettingValue} from "../../../hooks/useSettings";
+import {useSettingValue} from "../../../hooks/useSettings";
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
 

From 25fa675f88c783a995992fe6ff6b6638f2822ffe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:46:29 -0600
Subject: [PATCH 2177/3235] Blind attempt at fixing the end to end tests

---
 .../CreateSecretStorageDialog.js              |  6 ++++-
 test/end-to-end-tests/src/usecases/signup.js  | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 0cc145fd96..a2aa4f27e8 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -614,7 +614,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                         <code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
-                        <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onCopyClick}>
+                        <AccessibleButton
+                            kind='primary'
+                            className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
+                            onClick={this._onCopyClick}
+                        >
                             {_t("Copy")}
                         </AccessibleButton>
                         <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..ffde22f929 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -79,6 +79,33 @@ module.exports = async function signup(session, username, password, homeserver)
     const acceptButton = await session.query('.mx_InteractiveAuthEntryComponents_termsSubmit');
     await acceptButton.click();
 
+    //plow through cross-signing setup by entering arbitrary details
+    //TODO: It's probably important for the tests to know the passphrase
+    const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
+    let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+    await session.replaceInputText(passphraseField, xsigningPassphrase);
+    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    await xsignContButton.click();
+
+    //repeat passphrase entry
+    passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+    await session.replaceInputText(passphraseField, xsigningPassphrase);
+    xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    await xsignContButton.click();
+
+    //ignore the recovery key
+    //TODO: It's probably important for the tests to know the recovery key
+    const copyButton = await session.query('.mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn');
+    await copyButton.click();
+
+    //acknowledge that we copied the recovery key to a safe place
+    const copyContinueButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+    await copyContinueButton.click();
+
+    //acknowledge that we're done cross-signing setup and our keys are safe
+    const doneOkButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+    await doneOkButton.click();
+
     //wait for registration to finish so the hash gets set
     //onhashchange better?
 

From 2432f77b7204ed9861373df70b51a27d3a95e17a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 11:46:29 -0600
Subject: [PATCH 2178/3235] Blind attempt at fixing the end to end tests

---
 .../CreateSecretStorageDialog.js              |  6 ++++-
 test/end-to-end-tests/src/usecases/signup.js  | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 65784c49ec..80d0683bf9 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -624,7 +624,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                         <code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
-                        <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onCopyClick}>
+                        <AccessibleButton
+                            kind='primary'
+                            className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
+                            onClick={this._onCopyClick}
+                        >
                             {_t("Copy")}
                         </AccessibleButton>
                         <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..ffde22f929 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -79,6 +79,33 @@ module.exports = async function signup(session, username, password, homeserver)
     const acceptButton = await session.query('.mx_InteractiveAuthEntryComponents_termsSubmit');
     await acceptButton.click();
 
+    //plow through cross-signing setup by entering arbitrary details
+    //TODO: It's probably important for the tests to know the passphrase
+    const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
+    let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+    await session.replaceInputText(passphraseField, xsigningPassphrase);
+    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    await xsignContButton.click();
+
+    //repeat passphrase entry
+    passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
+    await session.replaceInputText(passphraseField, xsigningPassphrase);
+    xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    await xsignContButton.click();
+
+    //ignore the recovery key
+    //TODO: It's probably important for the tests to know the recovery key
+    const copyButton = await session.query('.mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn');
+    await copyButton.click();
+
+    //acknowledge that we copied the recovery key to a safe place
+    const copyContinueButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+    await copyContinueButton.click();
+
+    //acknowledge that we're done cross-signing setup and our keys are safe
+    const doneOkButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+    await doneOkButton.click();
+
     //wait for registration to finish so the hash gets set
     //onhashchange better?
 

From 597f97e1d8ef130870b2149b1cfae269cd135589 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:04:01 -0600
Subject: [PATCH 2179/3235] Select the right continue button

There's no buttons in the field.
---
 test/end-to-end-tests/src/usecases/signup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ffde22f929..e686ebdb7d 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -84,13 +84,13 @@ module.exports = async function signup(session, username, password, homeserver)
     const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
     let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
-    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //repeat passphrase entry
     passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
-    xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //ignore the recovery key

From 5769b07a92e478f820fe0a9a955a4509c28c9554 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:04:01 -0600
Subject: [PATCH 2180/3235] Select the right continue button

There's no buttons in the field.
---
 test/end-to-end-tests/src/usecases/signup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ffde22f929..e686ebdb7d 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -84,13 +84,13 @@ module.exports = async function signup(session, username, password, homeserver)
     const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
     let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
-    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //repeat passphrase entry
     passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
-    xsignContButton = await session.query('.mx_CreateSecretStorageDialog_passPhraseContainer .mx_Dialog_primary');
+    xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //ignore the recovery key

From f4a5361b14c62dc7aba9ae7d0073210ff06b1bfc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:13:05 -0600
Subject: [PATCH 2181/3235] Wait a bit before continuing with the passphrase

The continue button is probably no-oping due to being disabled.
---
 test/end-to-end-tests/src/usecases/signup.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index e686ebdb7d..aa9f6b7efa 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -84,12 +84,14 @@ module.exports = async function signup(session, username, password, homeserver)
     const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
     let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
+    await session.delay(1000); // give it a second to analyze our passphrase for security
     let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //repeat passphrase entry
     passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
+    await session.delay(1000); // give it a second to analyze our passphrase for security
     xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 

From 2451e0b873f01db7cf3619ab26d616b9e09e4504 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:13:05 -0600
Subject: [PATCH 2182/3235] Wait a bit before continuing with the passphrase

The continue button is probably no-oping due to being disabled.
---
 test/end-to-end-tests/src/usecases/signup.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index e686ebdb7d..aa9f6b7efa 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -84,12 +84,14 @@ module.exports = async function signup(session, username, password, homeserver)
     const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
     let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
+    await session.delay(1000); // give it a second to analyze our passphrase for security
     let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //repeat passphrase entry
     passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
     await session.replaceInputText(passphraseField, xsigningPassphrase);
+    await session.delay(1000); // give it a second to analyze our passphrase for security
     xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 

From 8b5a8f163fa5df5dc096662115e52577a0e90e8e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:23:22 -0600
Subject: [PATCH 2183/3235] Disable e2e tests for now

---
 .../src/scenarios/e2e-encryption.js           | 66 ++++++++++---------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 2f08acf417..a764b85db6 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -15,35 +15,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const sendMessage = require('../usecases/send-message');
-const acceptInvite = require('../usecases/accept-invite');
-const invite = require('../usecases/invite');
-const {receiveMessage} = require('../usecases/timeline');
-const {createRoom} = require('../usecases/create-room');
-const changeRoomSettings = require('../usecases/room-settings');
-const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
-const assert = require('assert');
+// TODO: Update test for cross signing
 
-module.exports = async function e2eEncryptionScenarios(alice, bob) {
-    console.log(" creating an e2e encrypted room and join through invite:");
-    const room = "secrets";
-    await createRoom(bob, room);
-    await changeRoomSettings(bob, {encryption: true});
-    // await cancelKeyBackup(bob);
-    await invite(bob, "@alice:localhost");
-    await acceptInvite(alice, room);
-    // do sas verifcation
-    bob.log.step(`starts SAS verification with ${alice.username}`);
-    const bobSasPromise = startSasVerifcation(bob, alice.username);
-    const aliceSasPromise = acceptSasVerification(alice, bob.username);
-    // wait in parallel, so they don't deadlock on each other
-    const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
-    assert.deepEqual(bobSas, aliceSas);
-    bob.log.done(`done (match for ${bobSas.join(", ")})`);
-    const aliceMessage = "Guess what I just heard?!";
-    await sendMessage(alice, aliceMessage);
-    await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
-    const bobMessage = "You've got to tell me!";
-    await sendMessage(bob, bobMessage);
-    await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+module.exports = async function() {
+    console.log(" this is supposed to be an e2e test, but it's broken");
 };
+
+// const sendMessage = require('../usecases/send-message');
+// const acceptInvite = require('../usecases/accept-invite');
+// const invite = require('../usecases/invite');
+// const {receiveMessage} = require('../usecases/timeline');
+// const {createRoom} = require('../usecases/create-room');
+// const changeRoomSettings = require('../usecases/room-settings');
+// const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+// const assert = require('assert');
+//
+// module.exports = async function e2eEncryptionScenarios(alice, bob) {
+//     console.log(" creating an e2e encrypted room and join through invite:");
+//     const room = "secrets";
+//     await createRoom(bob, room);
+//     await changeRoomSettings(bob, {encryption: true});
+//     // await cancelKeyBackup(bob);
+//     await invite(bob, "@alice:localhost");
+//     await acceptInvite(alice, room);
+//     // do sas verifcation
+//     bob.log.step(`starts SAS verification with ${alice.username}`);
+//     const bobSasPromise = startSasVerifcation(bob, alice.username);
+//     const aliceSasPromise = acceptSasVerification(alice, bob.username);
+//     // wait in parallel, so they don't deadlock on each other
+//     const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
+//     assert.deepEqual(bobSas, aliceSas);
+//     bob.log.done(`done (match for ${bobSas.join(", ")})`);
+//     const aliceMessage = "Guess what I just heard?!";
+//     await sendMessage(alice, aliceMessage);
+//     await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
+//     const bobMessage = "You've got to tell me!";
+//     await sendMessage(bob, bobMessage);
+//     await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+// };

From d04af1f3a8e6c4e11723915298494a6449432f86 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:23:22 -0600
Subject: [PATCH 2184/3235] Disable e2e tests for now

---
 .../src/scenarios/e2e-encryption.js           | 66 ++++++++++---------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 2f08acf417..a764b85db6 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -15,35 +15,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const sendMessage = require('../usecases/send-message');
-const acceptInvite = require('../usecases/accept-invite');
-const invite = require('../usecases/invite');
-const {receiveMessage} = require('../usecases/timeline');
-const {createRoom} = require('../usecases/create-room');
-const changeRoomSettings = require('../usecases/room-settings');
-const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
-const assert = require('assert');
+// TODO: Update test for cross signing
 
-module.exports = async function e2eEncryptionScenarios(alice, bob) {
-    console.log(" creating an e2e encrypted room and join through invite:");
-    const room = "secrets";
-    await createRoom(bob, room);
-    await changeRoomSettings(bob, {encryption: true});
-    // await cancelKeyBackup(bob);
-    await invite(bob, "@alice:localhost");
-    await acceptInvite(alice, room);
-    // do sas verifcation
-    bob.log.step(`starts SAS verification with ${alice.username}`);
-    const bobSasPromise = startSasVerifcation(bob, alice.username);
-    const aliceSasPromise = acceptSasVerification(alice, bob.username);
-    // wait in parallel, so they don't deadlock on each other
-    const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
-    assert.deepEqual(bobSas, aliceSas);
-    bob.log.done(`done (match for ${bobSas.join(", ")})`);
-    const aliceMessage = "Guess what I just heard?!";
-    await sendMessage(alice, aliceMessage);
-    await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
-    const bobMessage = "You've got to tell me!";
-    await sendMessage(bob, bobMessage);
-    await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+module.exports = async function() {
+    console.log(" this is supposed to be an e2e test, but it's broken");
 };
+
+// const sendMessage = require('../usecases/send-message');
+// const acceptInvite = require('../usecases/accept-invite');
+// const invite = require('../usecases/invite');
+// const {receiveMessage} = require('../usecases/timeline');
+// const {createRoom} = require('../usecases/create-room');
+// const changeRoomSettings = require('../usecases/room-settings');
+// const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+// const assert = require('assert');
+//
+// module.exports = async function e2eEncryptionScenarios(alice, bob) {
+//     console.log(" creating an e2e encrypted room and join through invite:");
+//     const room = "secrets";
+//     await createRoom(bob, room);
+//     await changeRoomSettings(bob, {encryption: true});
+//     // await cancelKeyBackup(bob);
+//     await invite(bob, "@alice:localhost");
+//     await acceptInvite(alice, room);
+//     // do sas verifcation
+//     bob.log.step(`starts SAS verification with ${alice.username}`);
+//     const bobSasPromise = startSasVerifcation(bob, alice.username);
+//     const aliceSasPromise = acceptSasVerification(alice, bob.username);
+//     // wait in parallel, so they don't deadlock on each other
+//     const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
+//     assert.deepEqual(bobSas, aliceSas);
+//     bob.log.done(`done (match for ${bobSas.join(", ")})`);
+//     const aliceMessage = "Guess what I just heard?!";
+//     await sendMessage(alice, aliceMessage);
+//     await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
+//     const bobMessage = "You've got to tell me!";
+//     await sendMessage(bob, bobMessage);
+//     await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+// };

From 4af33d91ebd4d84e5e8796985ab951a5d1dd294d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:26:08 -0600
Subject: [PATCH 2185/3235] Track the issue number too

---
 test/end-to-end-tests/src/scenarios/e2e-encryption.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index a764b85db6..f30b814644 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 // TODO: Update test for cross signing
+// https://github.com/vector-im/riot-web/issues/13226
 
 module.exports = async function() {
     console.log(" this is supposed to be an e2e test, but it's broken");

From 1deece3fb55e69e12653e8d98b28189b9654d8e4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:41:48 -0600
Subject: [PATCH 2186/3235] Short-circuit all end to end tests

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

diff --git a/package.json b/package.json
index 7ba69c4272..4204b87b5a 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,8 @@
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
-    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:e2e": "echo 'The tests are broken with cross-signing. Fix them: https://github.com/vector-im/riot-web/issues/13226'",
+    "test:e2e_real": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
     "@babel/runtime": "^7.8.3",

From 741368350c0c8712e0850fa866ede621617bdbc3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:26:08 -0600
Subject: [PATCH 2187/3235] Track the issue number too

---
 test/end-to-end-tests/src/scenarios/e2e-encryption.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index a764b85db6..f30b814644 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 // TODO: Update test for cross signing
+// https://github.com/vector-im/riot-web/issues/13226
 
 module.exports = async function() {
     console.log(" this is supposed to be an e2e test, but it's broken");

From c3f90ed289ba314e825555381d3ee4717b7609af Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:41:48 -0600
Subject: [PATCH 2188/3235] Short-circuit all end to end tests

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

diff --git a/package.json b/package.json
index 8e1e687f4e..fb60652f0e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,8 @@
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
-    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:e2e": "echo 'The tests are broken with cross-signing. Fix them: https://github.com/vector-im/riot-web/issues/13226'",
+    "test:e2e_real": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
     "@babel/runtime": "^7.8.3",

From 22533d3e6a3fb17c1a124e10a6324157782fbdb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:46:34 -0600
Subject: [PATCH 2189/3235] Disable scripts in CI too

---
 scripts/ci/end-to-end-tests.sh | 46 ++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 2f907dffa2..fa1f2b983f 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -13,25 +13,29 @@ handle_error() {
 
 trap 'handle_error' ERR
 
+echo "Tests are disabled, see https://github.com/vector-im/riot-web/issues/13226"
+exit 0
 
-echo "--- Building Riot"
-scripts/ci/layered-riot-web.sh
-cd ../riot-web
-riot_web_dir=`pwd`
-CI_PACKAGE=true yarn build
-cd ../matrix-react-sdk
-# run end to end tests
-pushd test/end-to-end-tests
-ln -s $riot_web_dir riot/riot-web
-# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-# CHROME_PATH=$(which google-chrome-stable) ./run.sh
-echo "--- Install synapse & other dependencies"
-./install.sh
-# install static webserver to server symlinked local copy of riot
-./riot/install-webserver.sh
-rm -r logs || true
-mkdir logs
-echo "+++ Running end-to-end tests"
-TESTS_STARTED=1
-./run.sh --no-sandbox --log-directory logs/
-popd
+#TODO: Uncomment all of this in https://github.com/vector-im/riot-web/issues/13226
+
+#echo "--- Building Riot"
+#scripts/ci/layered-riot-web.sh
+#cd ../riot-web
+#riot_web_dir=`pwd`
+#CI_PACKAGE=true yarn build
+#cd ../matrix-react-sdk
+## run end to end tests
+#pushd test/end-to-end-tests
+#ln -s $riot_web_dir riot/riot-web
+## PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+## CHROME_PATH=$(which google-chrome-stable) ./run.sh
+#echo "--- Install synapse & other dependencies"
+#./install.sh
+## install static webserver to server symlinked local copy of riot
+#./riot/install-webserver.sh
+#rm -r logs || true
+#mkdir logs
+#echo "+++ Running end-to-end tests"
+#TESTS_STARTED=1
+#./run.sh --no-sandbox --log-directory logs/
+#popd

From 3614170906b3289774b7e8d023e3e129a94b2d61 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 12:46:34 -0600
Subject: [PATCH 2190/3235] Disable scripts in CI too

---
 scripts/ci/end-to-end-tests.sh | 46 ++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 2f907dffa2..fa1f2b983f 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -13,25 +13,29 @@ handle_error() {
 
 trap 'handle_error' ERR
 
+echo "Tests are disabled, see https://github.com/vector-im/riot-web/issues/13226"
+exit 0
 
-echo "--- Building Riot"
-scripts/ci/layered-riot-web.sh
-cd ../riot-web
-riot_web_dir=`pwd`
-CI_PACKAGE=true yarn build
-cd ../matrix-react-sdk
-# run end to end tests
-pushd test/end-to-end-tests
-ln -s $riot_web_dir riot/riot-web
-# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-# CHROME_PATH=$(which google-chrome-stable) ./run.sh
-echo "--- Install synapse & other dependencies"
-./install.sh
-# install static webserver to server symlinked local copy of riot
-./riot/install-webserver.sh
-rm -r logs || true
-mkdir logs
-echo "+++ Running end-to-end tests"
-TESTS_STARTED=1
-./run.sh --no-sandbox --log-directory logs/
-popd
+#TODO: Uncomment all of this in https://github.com/vector-im/riot-web/issues/13226
+
+#echo "--- Building Riot"
+#scripts/ci/layered-riot-web.sh
+#cd ../riot-web
+#riot_web_dir=`pwd`
+#CI_PACKAGE=true yarn build
+#cd ../matrix-react-sdk
+## run end to end tests
+#pushd test/end-to-end-tests
+#ln -s $riot_web_dir riot/riot-web
+## PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+## CHROME_PATH=$(which google-chrome-stable) ./run.sh
+#echo "--- Install synapse & other dependencies"
+#./install.sh
+## install static webserver to server symlinked local copy of riot
+#./riot/install-webserver.sh
+#rm -r logs || true
+#mkdir logs
+#echo "+++ Running end-to-end tests"
+#TESTS_STARTED=1
+#./run.sh --no-sandbox --log-directory logs/
+#popd

From d05ceec9d6558cad1a52c54eaea65ce5de9ed1f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2020 18:53:03 +0000
Subject: [PATCH 2191/3235] Bump https-proxy-agent from 2.2.1 to 2.2.4 in
 /test/end-to-end-tests

Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/end-to-end-tests/yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/end-to-end-tests/yarn.lock b/test/end-to-end-tests/yarn.lock
index 4379b24946..c26dde0f97 100644
--- a/test/end-to-end-tests/yarn.lock
+++ b/test/end-to-end-tests/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.1.tgz#d90123f6c61fdf2f7cddd286ddae891586dd3488"
   integrity sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -233,9 +233,9 @@ entities@^1.1.1, entities@~1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 es6-promise@^4.0.3:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
-  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -359,11 +359,11 @@ http-signature@~1.2.0:
     sshpk "^1.7.0"
 
 https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 inflight@^1.0.4:
@@ -471,9 +471,9 @@ ms@2.0.0:
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 nth-check@~1.0.1:
   version "1.0.2"

From c6746e68b22710156cd04ad584b588246bed2925 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 16 Apr 2020 19:56:11 +0100
Subject: [PATCH 2192/3235] Upgrade matrix-js-sdk to 5.3.1-rc.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fb60652f0e..8d9f8f779c 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.3.1-rc.1",
+    "matrix-js-sdk": "5.3.1-rc.2",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2b55aa2ae2..e78b6ed280 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.3.1-rc.1:
-  version "5.3.1-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.1.tgz#12f9434b2fc09e014371bc9a75dc2bc9bc35fe33"
-  integrity sha512-HP47NvGFrK4gG8ToZRurb6/pRHhJAOhixwoNT6P/FTZNZLJX4DDPY84uNR0jtmiiZXI+/wHRST0K9P6A2bgBXA==
+matrix-js-sdk@5.3.1-rc.2:
+  version "5.3.1-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.2.tgz#437cb6aafa1be5d8750aa0e31baed76ef4fcb7da"
+  integrity sha512-VWwqjmSXaabXqwc4Lm+jHQEu3sBpHs9ni/zCW8kTf+jUDnJllCUDCRnGWY4F3QVNWT9nz9e5Nzojzq7ySiP7XA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From c7e908ddc0a5a0a8470a5790048a105870cd0f6c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 16 Apr 2020 20:01:46 +0100
Subject: [PATCH 2193/3235] Prepare changelog for v2.5.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7586bb49eb..21dfca116a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Changes in [2.5.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.2) (2020-04-16)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.1...v2.5.0-rc.2)
+
+ * Upgrade to JS SDK 5.3.1-rc.2
+ * [Release] Convert cross-signing flag to a setting
+   [\#4429](https://github.com/matrix-org/matrix-react-sdk/pull/4429)
+ * Iterate cross-signing copy
+   [\#4426](https://github.com/matrix-org/matrix-react-sdk/pull/4426)
+ * Fix: ensure twemoji font is loaded when showing SAS emojis
+   [\#4423](https://github.com/matrix-org/matrix-react-sdk/pull/4423)
+
 Changes in [2.5.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.1) (2020-04-15)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.4.0-rc.1...v2.5.0-rc.1)

From 23f167d6813f111b59f28880215bac9fc88a8125 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 16 Apr 2020 20:01:46 +0100
Subject: [PATCH 2194/3235] v2.5.0-rc.2

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

diff --git a/package.json b/package.json
index 8d9f8f779c..989f0dbc96 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.1",
+  "version": "2.5.0-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 9e18dbc0dc20fddad451b6e4eee48a03a6b3c422 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 16 Apr 2020 21:08:14 +0100
Subject: [PATCH 2195/3235] Fix key backup debug panel

The type changed so it thought it was not stored when it was
---
 src/components/views/settings/KeyBackupPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 5548768221..fa3fa03c74 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -75,7 +75,7 @@ export default class KeyBackupPanel extends React.PureComponent {
     async _checkKeyBackupStatus() {
         try {
             const {backupInfo, trustInfo} = await MatrixClientPeg.get().checkKeyBackup();
-            const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored();
+            const backupKeyStored = Boolean(await MatrixClientPeg.get().isKeyBackupKeyStored());
             this.setState({
                 backupInfo,
                 backupSigStatus: trustInfo,

From cb5b5fddbe0f9060ed2aa57006232384c4cde1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98jvind=20Fritjof=20Arnfred?= <fritjofarnfred@posteo.dk>
Date: Thu, 16 Apr 2020 19:23:37 +0000
Subject: [PATCH 2196/3235] Translated using Weblate (Danish)

Currently translated at 22.6% (517 of 2289 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index e0ed9a9bfa..23fce8067e 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -350,9 +350,9 @@
     "Call Failed": "Opkald mislykkedes",
     "Review Devices": "Gennemse enheder",
     "Call Anyway": "Ring op alligevel",
-    "Answer Anyway": "Tag imod alligevel",
+    "Answer Anyway": "Svar alligevel",
     "Call": "Ring",
-    "Answer": "Tag imod",
+    "Answer": "Svar",
     "Call failed due to misconfigured server": "Opkaldet mislykkedes pga. fejlkonfigureret server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bed administratoren af din homeserver (<code>%(homeserverDomain)s</code>) om at konfigurere en TURN server for at opkald virker pålideligt.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativt kan du prøve at bruge den offentlige server <code>turn.matrix.org</code>, men det er ikke lige så pålideligt, og din IP-adresse deles med den server. Du kan også administrere dette under Indstillinger.",
@@ -519,5 +519,17 @@
     "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder",
     "The version of Riot": "Riot versionen",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Hvorvidt du benytter Riot på en enhed, hvor touch er den primære input-grænseflade",
-    "Your user agent": "Din user agent"
+    "Your user agent": "Din user agent",
+    "Use Single Sign On to continue": "Brug Single Sign On til at fortsætte",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bekræft tilføjelsen af denne email adresse ved at bruge Single Sign On til at bevise din identitet.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Bekræft tilføjelse af email",
+    "Click the button below to confirm adding this email address.": "Klik på knappen herunder for at bekræfte tilføjelsen af denne email adresse.",
+    "Confirm": "Bekræft",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bekræft tilføjelsen af dette telefonnummer ved at bruge Single Sign On til at bevise din identitet.",
+    "Confirm adding phone number": "Bekræft tilføjelse af telefonnummer",
+    "Click the button below to confirm adding this phone number.": "Klik på knappen herunder for at bekræfte tilføjelsen af dette telefonnummer.",
+    "Whether you're using Riot as an installed Progressive Web App": "Om du anvender Riot som en installeret Progressiv Web App",
+    "The information being sent to us to help make Riot better includes:": "Informationen der sendes til os for at hjælpe os med at gøre Riot bedre inkluderer:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Der er ukendte sessions i dette rum: Hvis du fortsætter uden at verificere dem, vil det være muligt for andre at smuglytte til dit opkald."
 }

From a81f3f6d193ccb1feaa8476716f7ac114f5d09b2 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 16 Apr 2020 19:52:05 +0000
Subject: [PATCH 2197/3235] Translated using Weblate (Hungarian)

Currently translated at 98.3% (2251 of 2289 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f74e9d48fd..8c64fe49ba 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2340,5 +2340,9 @@
     "Explore Public Rooms": "Nyilvános szobák felderítése",
     "Create a Group Chat": "Készíts Csoportos Beszélgetést",
     "Self-verification request": "Ön ellenőrzés kérése",
-    "Cancel replying to a message": "Üzenet válasz megszakítása"
+    "Cancel replying to a message": "Üzenet válasz megszakítása",
+    "Confirm adding email": "E-mail hozzáadásának megerősítése",
+    "Click the button below to confirm adding this email address.": "Az e-mail cím hozzáadásának megerősítéséhez kattints a gombra lent.",
+    "Confirm adding phone number": "Telefonszám hozzáadásának megerősítése",
+    "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattints a gombra lent."
 }

From 0489dcc8da2f825bdee276239decc98f38545766 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 15:55:33 -0600
Subject: [PATCH 2198/3235] Minor updates to e2e test instructions on Windows

---
 test/end-to-end-tests/Windows.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
index dee4fabb3f..39b06a9a62 100644
--- a/test/end-to-end-tests/Windows.md
+++ b/test/end-to-end-tests/Windows.md
@@ -8,7 +8,7 @@ and start following these steps to get going:
 3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/riot/*.sh`
 4. Install NodeJS for ubuntu: 
    ```bash
-   curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+   curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
    sudo apt-get update
    sudo apt-get install nodejs
    ```
@@ -24,6 +24,7 @@ and start following these steps to get going:
    ```bash
    cd ./test/end-to-end-tests
    ./synapse/install.sh
+   ./install.sh
    ./run.sh --riot-url http://localhost:8080 --no-sandbox
    ```
 

From 6d46ef548e27bda21006e4bd024ef697549e5965 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 16:26:29 -0600
Subject: [PATCH 2199/3235] Enable tests again to catch failures

---
 package.json                   |  3 +--
 scripts/ci/end-to-end-tests.sh | 47 +++++++++++++++-------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 4204b87b5a..7ba69c4272 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,7 @@
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
-    "test:e2e": "echo 'The tests are broken with cross-signing. Fix them: https://github.com/vector-im/riot-web/issues/13226'",
-    "test:e2e_real": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
     "@babel/runtime": "^7.8.3",
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index fa1f2b983f..1233677db4 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -13,29 +13,24 @@ handle_error() {
 
 trap 'handle_error' ERR
 
-echo "Tests are disabled, see https://github.com/vector-im/riot-web/issues/13226"
-exit 0
-
-#TODO: Uncomment all of this in https://github.com/vector-im/riot-web/issues/13226
-
-#echo "--- Building Riot"
-#scripts/ci/layered-riot-web.sh
-#cd ../riot-web
-#riot_web_dir=`pwd`
-#CI_PACKAGE=true yarn build
-#cd ../matrix-react-sdk
-## run end to end tests
-#pushd test/end-to-end-tests
-#ln -s $riot_web_dir riot/riot-web
-## PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-## CHROME_PATH=$(which google-chrome-stable) ./run.sh
-#echo "--- Install synapse & other dependencies"
-#./install.sh
-## install static webserver to server symlinked local copy of riot
-#./riot/install-webserver.sh
-#rm -r logs || true
-#mkdir logs
-#echo "+++ Running end-to-end tests"
-#TESTS_STARTED=1
-#./run.sh --no-sandbox --log-directory logs/
-#popd
+echo "--- Building Riot"
+scripts/ci/layered-riot-web.sh
+cd ../riot-web
+riot_web_dir=`pwd`
+CI_PACKAGE=true yarn build
+cd ../matrix-react-sdk
+# run end to end tests
+pushd test/end-to-end-tests
+ln -s $riot_web_dir riot/riot-web
+# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+# CHROME_PATH=$(which google-chrome-stable) ./run.sh
+echo "--- Install synapse & other dependencies"
+./install.sh
+# install static webserver to server symlinked local copy of riot
+./riot/install-webserver.sh
+rm -r logs || true
+mkdir logs
+echo "+++ Running end-to-end tests"
+TESTS_STARTED=1
+./run.sh --no-sandbox --log-directory logs/
+popd

From a5f5f759cb83cbd03e53e3a2a826134c34cd52d4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 16:27:43 -0600
Subject: [PATCH 2200/3235] Create unencrypted rooms by default in e2e-tests

Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible.

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
---
 src/components/views/dialogs/CreateRoomDialog.js      | 7 ++++++-
 src/components/views/elements/LabelledToggleSwitch.js | 6 +++++-
 test/end-to-end-tests/src/usecases/create-room.js     | 8 ++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index fa8c7dd30e..74e006354b 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -194,7 +194,12 @@ export default createReactClass({
         let e2eeSection;
         if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
             e2eeSection = <React.Fragment>
-                <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
+                <LabelledToggleSwitch
+                    label={ _t("Enable end-to-end encryption")}
+                    onChange={this.onEncryptedChange}
+                    value={this.state.isEncrypted}
+                    className='mx_CreateRoomDialog_e2eSwitch' // for end-to-end tests
+                />
                 <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
             </React.Fragment>;
         }
diff --git a/src/components/views/elements/LabelledToggleSwitch.js b/src/components/views/elements/LabelledToggleSwitch.js
index ecd4d39bf8..78beb2aa91 100644
--- a/src/components/views/elements/LabelledToggleSwitch.js
+++ b/src/components/views/elements/LabelledToggleSwitch.js
@@ -35,6 +35,9 @@ export default class LabelledToggleSwitch extends React.Component {
         // True to put the toggle in front of the label
         // Default false.
         toggleInFront: PropTypes.bool,
+
+        // Additional class names to append to the switch. Optional.
+        className: PropTypes.string,
     };
 
     render() {
@@ -50,8 +53,9 @@ export default class LabelledToggleSwitch extends React.Component {
             secondPart = temp;
         }
 
+        const classes = `mx_SettingsFlag ${this.props.className || ""}`;
         return (
-            <div className="mx_SettingsFlag">
+            <div className={classes}>
                 {firstPart}
                 {secondPart}
             </div>
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index 140748bca7..ab2d9b69b9 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -20,7 +20,7 @@ async function openRoomDirectory(session) {
     await roomDirectoryButton.click();
 }
 
-async function createRoom(session, roomName) {
+async function createRoom(session, roomName, encrypted=false) {
     session.log.step(`creates room "${roomName}"`);
 
     const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
@@ -33,10 +33,14 @@ async function createRoom(session, roomName) {
     const addRoomButton = await roomsHeader.$(".mx_RoomSubList_addRoom");
     await addRoomButton.click();
 
-
     const roomNameInput = await session.query('.mx_CreateRoomDialog_name input');
     await session.replaceInputText(roomNameInput, roomName);
 
+    if (!encrypted) {
+        const encryptionToggle = await session.query('.mx_CreateRoomDialog_e2eSwitch .mx_ToggleSwitch');
+        await encryptionToggle.click();
+    }
+
     const createButton = await session.query('.mx_Dialog_primary');
     await createButton.click();
 

From bf63fd2b507c12d356e6f652f18cc0468185f98d Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:22:47 +0000
Subject: [PATCH 2201/3235] Translated using Weblate (German)

Currently translated at 75.4% (1726 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index fd83df82b0..c2875fecfa 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1789,5 +1789,6 @@
     "Unverified login. Was this you?": "Nicht verifizierte Anmeldung. Bist du es gewesen?",
     "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren",
     "Show rooms with unread notifications first": "Räume mit nicht gelesenen Benachrichtungen zuerst zeigen",
-    "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen"
+    "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen",
+    "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren"
 }

From 686dc2d7ac695f677f596aceef1f57277d0003ab Mon Sep 17 00:00:00 2001
From: alexsal86 <mail@alexander-salomon.de>
Date: Fri, 17 Apr 2020 00:23:13 +0000
Subject: [PATCH 2202/3235] Translated using Weblate (German)

Currently translated at 75.4% (1726 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c2875fecfa..58512f07f5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1790,5 +1790,6 @@
     "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren",
     "Show rooms with unread notifications first": "Räume mit nicht gelesenen Benachrichtungen zuerst zeigen",
     "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen",
-    "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren"
+    "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit Single Sign On, um deine Identität nachzuweisen."
 }

From 0489f10cf59c3d9428ce38211ed0d5f79dbd6097 Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:24:24 +0000
Subject: [PATCH 2203/3235] Translated using Weblate (German)

Currently translated at 75.9% (1738 of 2289 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 58512f07f5..11c3305fcf 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1791,5 +1791,14 @@
     "Show rooms with unread notifications first": "Räume mit nicht gelesenen Benachrichtungen zuerst zeigen",
     "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen",
     "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit Single Sign On, um deine Identität nachzuweisen."
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit „Single Sign-On“, um deine Identität nachzuweisen.",
+    "Single Sign On": "Single Sign-On",
+    "Confirm adding email": "Bestätige das Hinzfugen der Email-Addresse",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnumer, indem du deine Identität mittels Single Sign-On nachweist.",
+    "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzfügen dieser Telefonnummer zu bestätigen.",
+    "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
+    "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
+    "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
+    "Command failed": "Befehl fehlgeschlagen",
+    "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden"
 }

From efbac83bc3f975264839ba394ddb9a5ed40e628a Mon Sep 17 00:00:00 2001
From: alexsal86 <mail@alexander-salomon.de>
Date: Fri, 17 Apr 2020 00:25:32 +0000
Subject: [PATCH 2204/3235] Translated using Weblate (German)

Currently translated at 75.9% (1738 of 2289 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 11c3305fcf..99339d9362 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1800,5 +1800,7 @@
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
     "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
     "Command failed": "Befehl fehlgeschlagen",
-    "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden"
+    "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
+    "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
+    "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer."
 }

From d8808117809a74c283e646a165e8c041f4a73a62 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:33:19 +0000
Subject: [PATCH 2205/3235] Translated using Weblate (German)

Currently translated at 75.9% (1738 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 99339d9362..ee5c5dcfcd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1802,5 +1802,6 @@
     "Command failed": "Befehl fehlgeschlagen",
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
-    "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer."
+    "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel, für Server von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
 }

From 792abac5231139536a63bd4c12f9db021eae8aa5 Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:34:06 +0000
Subject: [PATCH 2206/3235] Translated using Weblate (German)

Currently translated at 76.0% (1739 of 2289 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ee5c5dcfcd..584c526b5b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1803,5 +1803,5 @@
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
     "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel, für Server von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s"
 }

From 0900cf1ebefd91a211fba8d4b3fbdf8a539e9f6d Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:34:27 +0000
Subject: [PATCH 2207/3235] Translated using Weblate (German)

Currently translated at 76.0% (1739 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 584c526b5b..1ce1215cea 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1803,5 +1803,6 @@
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
     "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s"
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
 }

From d68853ae7a6ac5449ba401c125663662179f93a4 Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:34:35 +0000
Subject: [PATCH 2208/3235] Translated using Weblate (German)

Currently translated at 76.4% (1748 of 2289 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1ce1215cea..2a7e1f2135 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1804,5 +1804,10 @@
     "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
     "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s"
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
+    "Not Trusted": "Nicht vertrauenswürdig",
+    "Manually Verify by Text": "Verifiziere manuell mit einem Text",
+    "Interactively verify by Emoji": "Verifiziere interaktiv mit Emojis",
+    "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
+    "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren"
 }

From 23b8dbe862a559893a4ab09d27980a5200840708 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:36:53 +0000
Subject: [PATCH 2209/3235] Translated using Weblate (German)

Currently translated at 76.4% (1748 of 2289 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 2a7e1f2135..cd65386edd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1809,5 +1809,7 @@
     "Manually Verify by Text": "Verifiziere manuell mit einem Text",
     "Interactively verify by Emoji": "Verifiziere interaktiv mit Emojis",
     "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
-    "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren"
+    "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren",
+    "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
+    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE suche (erfordert Neustart)"
 }

From 6fd504778440fd6f4e472e1de4eadf8cef8b0ccf Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Fri, 17 Apr 2020 00:38:26 +0000
Subject: [PATCH 2210/3235] Translated using Weblate (German)

Currently translated at 76.4% (1748 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index cd65386edd..28ae6b01ac 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1811,5 +1811,6 @@
     "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
     "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren",
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
-    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE suche (erfordert Neustart)"
+    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE suche (erfordert Neustart)",
+    "a few seconds from now": "in ein paar Sekunden"
 }

From b56a80caf5e654f8ce81997ef8b0d978c186e60f Mon Sep 17 00:00:00 2001
From: Joshua Dietz <jospam@dietz-ulm.de>
Date: Fri, 17 Apr 2020 00:38:47 +0000
Subject: [PATCH 2211/3235] Translated using Weblate (German)

Currently translated at 76.4% (1748 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 28ae6b01ac..d908f88349 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1812,5 +1812,6 @@
     "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren",
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
     "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE suche (erfordert Neustart)",
-    "a few seconds from now": "in ein paar Sekunden"
+    "a few seconds from now": "in ein paar Sekunden",
+    "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen"
 }

From e97138fdac9fa30c8f3ac292df4cd0bf7b3b120a Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:41:04 +0000
Subject: [PATCH 2212/3235] Translated using Weblate (German)

Currently translated at 76.4% (1749 of 2289 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d908f88349..35aa7ce851 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1811,7 +1811,7 @@
     "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
     "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren",
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
-    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE suche (erfordert Neustart)",
+    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE-Suche (erfordert Neustart)",
     "a few seconds from now": "in ein paar Sekunden",
     "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen"
 }

From 49d92b873f760393874d5404053dcba9740e51e2 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:43:37 +0000
Subject: [PATCH 2213/3235] Translated using Weblate (German)

Currently translated at 76.4% (1749 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 35aa7ce851..b46c682fe0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1813,5 +1813,6 @@
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
     "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE-Suche (erfordert Neustart)",
     "a few seconds from now": "in ein paar Sekunden",
-    "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen"
+    "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen",
+    "Show padlocks on invite only rooms": "Vorhängeschlösser an Nur-Einladen-Räumen anzeigen"
 }

From 11f5554af58da79c336a53d41cbce67afc53df47 Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:43:42 +0000
Subject: [PATCH 2214/3235] Translated using Weblate (German)

Currently translated at 76.8% (1757 of 2289 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b46c682fe0..9307e5d459 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1814,5 +1814,10 @@
     "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE-Suche (erfordert Neustart)",
     "a few seconds from now": "in ein paar Sekunden",
     "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen",
-    "Show padlocks on invite only rooms": "Vorhängeschlösser an Nur-Einladen-Räumen anzeigen"
+    "Show padlocks on invite only rooms": "Zeige Schlösser an Räumen, welchen nur mit Einladung beigetreten werden kann",
+    "Keep recovery passphrase in memory for this session": "Behalte die Wiederherstellungspassphrase für diese Sitzung im Speicher",
+    "Manually verify all remote sessions": "Verifiziere alle Remotesitzungen",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:",
+    "Verify this session by confirming the following number appears on its screen.": "Verfiziere diese Sitzung, indem du bestätigst, dass die folgende Nummer auf ihrem Bildschirm erscheint.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…"
 }

From 83ae60dd32fc0b53651db0d19e4eb59a3758166e Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:45:30 +0000
Subject: [PATCH 2215/3235] Translated using Weblate (German)

Currently translated at 76.8% (1757 of 2289 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9307e5d459..2c07b81dff 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1819,5 +1819,8 @@
     "Manually verify all remote sessions": "Verifiziere alle Remotesitzungen",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:",
     "Verify this session by confirming the following number appears on its screen.": "Verfiziere diese Sitzung, indem du bestätigst, dass die folgende Nummer auf ihrem Bildschirm erscheint.",
-    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…"
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…",
+    "How fast should messages be downloaded.": "Wie schnell sollten Nachrichten heruntergeladen werden?",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emoji, sofern du an keinem Gerät eine Kamera hast",
+    "Waiting for %(displayName)s to verify…": "Warte, dass %(displayName)s bestätigt…"
 }

From b43947650d0268a95e42416e15aa4b0873512144 Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:53:53 +0000
Subject: [PATCH 2216/3235] Translated using Weblate (German)

Currently translated at 76.9% (1761 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 2c07b81dff..9319a8aa9c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1822,5 +1822,6 @@
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…",
     "How fast should messages be downloaded.": "Wie schnell sollten Nachrichten heruntergeladen werden?",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emoji, sofern du an keinem Gerät eine Kamera hast",
-    "Waiting for %(displayName)s to verify…": "Warte, dass %(displayName)s bestätigt…"
+    "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
+    "Cancelling…": "Abbrechen…"
 }

From 1f69a86286f0be59a4c5d7de644d9be9beb20885 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Fri, 17 Apr 2020 00:54:27 +0000
Subject: [PATCH 2217/3235] Translated using Weblate (German)

Currently translated at 76.9% (1761 of 2289 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 9319a8aa9c..f64a0a86cb 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1823,5 +1823,7 @@
     "How fast should messages be downloaded.": "Wie schnell sollten Nachrichten heruntergeladen werden?",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emoji, sofern du an keinem Gerät eine Kamera hast",
     "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
-    "Cancelling…": "Abbrechen…"
+    "Cancelling…": "Abbrechen…",
+    "They match": "Sie passen zueinander",
+    "They don't match": "Sie passen nicht zueinander"
 }

From 5bcf383767b45f5fdbd4c4d21b821a50de1be129 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 00:54:55 +0000
Subject: [PATCH 2218/3235] Translated using Weblate (German)

Currently translated at 76.9% (1761 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f64a0a86cb..82c75eca27 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1825,5 +1825,6 @@
     "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
     "Cancelling…": "Abbrechen…",
     "They match": "Sie passen zueinander",
-    "They don't match": "Sie passen nicht zueinander"
+    "They don't match": "Sie passen nicht zueinander",
+    "To be secure, do this in person or use a trusted way to communicate.": "Um sicher zu gehen, tu dies persönlich oder verwende eine vertrauenswürdige Art der Kommunikation."
 }

From 7a4442c52b3619107b46ab6cc95eb7dba354ef7b Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 17 Apr 2020 02:11:33 +0000
Subject: [PATCH 2219/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2289 of 2289 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 | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 3e4b1ab097..5c0018c41b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2365,5 +2365,29 @@
     "Use your other device to continue…": "使用您其他的裝置繼續……",
     "Syncing...": "正在同步……",
     "Signing In...": "正在登入……",
-    "If you've joined lots of rooms, this might take a while": "如果您已加入很多聊天室，這可能需要一點時間"
+    "If you've joined lots of rooms, this might take a while": "如果您已加入很多聊天室，這可能需要一點時間",
+    "If you cancel now, you won't complete your operation.": "如果您現在取消，您將無法完成您的操作。",
+    "Enable cross-signing to verify per-user instead of per-session": "啟用交叉簽章可以使用者為單位進行驗證，而非驗證每個工作階段",
+    "Keep recovery passphrase in memory for this session": "在此工作階段中將復原通關密語保留在記憶體中",
+    "Verify other session": "驗證其他工作階段",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入正確的復原通關密語。",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>警告</b>：您應該只在信任的電腦上做這件事。",
+    "Access your secure message history and your cross-signing identity for verifying other sessions 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>.": "如果您忘記您的復原通關密語，您可以<button1>使用您的復原金鑰</button1>或<button2>設定新的復原選項</button2>。",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "備份無法使用此復原金鑰解密：請驗證您是否輸入正確的復原金鑰。",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "備份無法使用此復原通關密語解密：請驗證您是否輸入正確的復原通關密語。",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "如果您無法存取，<button>請使用您的復原金鑰或復原通關密語。</button>",
+    "Great! This recovery passphrase looks strong enough.": "很好！這個復原通關密語看起來夠強。",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "設定復原通關密語以保護您的加密資訊並在您登出時復原它。且應該要與您的帳號密碼不同：",
+    "Enter a recovery passphrase": "輸入復原通關密語",
+    "Back up encrypted message keys": "備份加密訊息金鑰",
+    "Enter your recovery passphrase a second time to confirm it.": "再次輸入您的復原通關密語以確認。",
+    "Confirm your recovery passphrase": "確認您的復原通關密語",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "您的復原金鑰是安全網 - 如果您忘記您的復原通關密語的話，您可以用它來恢復您對加密訊息的存取權。",
+    "Confirm recovery passphrase": "確認復原通關密語",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "我們將會在我們的伺服器上儲存一份您金鑰的加密副本。使用復原通關密語以保護您的備份。",
+    "Enter a recovery passphrase...": "輸入復原通關密語……",
+    "Please enter your recovery passphrase a second time to confirm.": "請再次輸入您的復原通關密語以確認。",
+    "Repeat your recovery passphrase...": "再次輸入您的復原通關密語……",
+    "Secure your backup with a recovery passphrase": "使用復原通關密語保護您的備份"
 }

From df3eef1f70068c197d518bc095666f5bf2e7030d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98jvind=20Fritjof=20Arnfred?= <fritjofarnfred@posteo.dk>
Date: Thu, 16 Apr 2020 20:33:04 +0000
Subject: [PATCH 2220/3235] Translated using Weblate (Danish)

Currently translated at 23.9% (547 of 2289 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 23fce8067e..8ae6c52b0d 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -31,10 +31,10 @@
     "Bans user with given id": "Forbyder bruger med givet id",
     "Deops user with given id": "Fjerner OP af bruger med givet id",
     "Invites user with given id to current room": "Inviterer bruger med givet id til nuværende rum",
-    "Joins room with given alias": "Kommer ind i rum med givet alias",
-    "Kicks user with given id": "Smid bruger med givet id ud",
-    "Changes your display nickname": "Ændrer dit visningsnavn",
-    "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
+    "Joins room with given alias": "Deltager i rum med givet alias",
+    "Kicks user with given id": "Smider bruger med givet id ud",
+    "Changes your display nickname": "Ændrer dit viste navn",
+    "Searches DuckDuckGo for results": "Søger på DuckDuckGo efter resultater",
     "Commands": "kommandoer",
     "Emoji": "Emoji",
     "Sign in": "Log ind",
@@ -125,7 +125,7 @@
     "%(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?": "Hvem vil du tilføje til dette fællesskab?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advarsel: alle personer du tilføjer til et fællesskab vil være synlige for alle der kender Fællesskabs ID'et",
-    "Invite new community members": "Inviter nye fællesskabsmedlemmer",
+    "Invite new community members": "Inviter nye medlemmer til fællesskabet",
     "Invite to Community": "Inviter til Fællesskab",
     "Which rooms would you like to add to this community?": "Hvilke rum vil du tilføje til dette fællesskab?",
     "Show these rooms to non-members on the community page and room list?": "Vis disse rum til ikke-medlemmer på fællesskabssiden og rumlisten?",
@@ -136,11 +136,11 @@
     "Failed to invite users to community": "Kunne ikke invitere brugere til fællesskab",
     "Failed to invite users to %(groupId)s": "Kunne ikke invitere brugere til %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Kunne ikke tilføje de følgende rum til %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browser indstillinger",
-    "Riot was not given permission to send notifications - please try again": "Riot fik ikke tilladelse til at sende notifikationer - prøv igen",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browserindstillinger",
+    "Riot was not given permission to send notifications - please try again": "Riot fik ikke tilladelse til at sende notifikationer - Vær sød at prøve igen",
     "Unable to enable Notifications": "Kunne ikke slå Notifikationer til",
     "This email address was not found": "Denne emailadresse blev ikke fundet",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din emailadresse lader ikke til at være tilknyttet en Matrix ID på denne Homeserver.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din emailadresse lader ikke til at være tilknyttet et Matrix ID på denne Homeserver.",
     "Restricted": "Begrænset",
     "Moderator": "Moderator",
     "Start a chat": "Start en chat",
@@ -160,12 +160,12 @@
     "Missing user_id in request": "Manglende user_id i forespørgsel",
     "Usage": "Brug",
     "/ddg is not a command": "/ddg er ikke en kommando",
-    "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på at autocomplete resultaterne indlæses og bruge Tab for at bladre igennem dem.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på at autocomplete resultaterne indlæses, og så bruge Tab for at bladre igennem dem.",
     "Unrecognised room alias:": "Ugenkendt rum alias:",
     "Ignored user": "Ignoreret bruger",
-    "You are now ignoring %(userId)s": "Du ignorere nu %(userId)s",
+    "You are now ignoring %(userId)s": "Du ignorerer nu %(userId)s",
     "Unignored user": "Holdt op med at ignorere bruger",
-    "You are no longer ignoring %(userId)s": "Du ignorer ikke længere %(userId)s",
+    "You are no longer ignoring %(userId)s": "Du ignorerer ikke længere %(userId)s",
     "Verified key": "Verificeret nøgle",
     "Reason": "Årsag",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
@@ -361,8 +361,8 @@
     "Call in Progress": "Igangværende opkald",
     "A call is currently being placed!": "Et opkald er allerede ved at blive oprettet!",
     "A call is already in progress!": "Et opkald er allerede i gang!",
-    "Permission Required": "Rettighed påkrævet",
-    "You do not have permission to start a conference call in this room": "Du har ikke rettigheden til at starte et gruppekald i dette rum",
+    "Permission Required": "Tilladelse påkrævet",
+    "You do not have permission to start a conference call in this room": "Du har ikke rettighed til at starte et gruppekald i dette rum",
     "Replying With Files": "Svare med filer",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "I øjeblikket er det ikke muligt at svare med en fil. Vil du uploade filen uden at svare?",
     "The file '%(fileName)s' failed to upload.": "Filen '%(fileName)s' kunne ikke uploades.",
@@ -383,13 +383,13 @@
     "Actions": "Handlinger",
     "Other": "Andre",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Tilføjer ¯\\_(ツ)_/¯ i starten af beskeder i ren tekst",
-    "Sends a message as plain text, without interpreting it as markdown": "Sender en besked som ren tekst, uden at fortolke den som Markdown",
+    "Sends a message as plain text, without interpreting it as markdown": "Sender en besked som ren tekst, uden at fortolke den som markdown",
     "Upgrades a room to a new version": "Opgraderer et rum til en ny version",
     "You do not have the required permissions to use this command.": "Du har ikke de nødvendige rettigheder for at udføre denne kommando.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Advarsel:</b> Opgradering af et rum <i>flytter ikke automatisk rummets medlemmer til den nye version af rummet.</i> Vi sender et link til den nye version i den gamle version af rummet - rummets medlemmer må klikke på dette link for at tilgå det nye rum.",
-    "Changes your display nickname in the current room only": "Ændrer dit viste navn kun for det nuværende rum",
-    "Changes the avatar of the current room": "Ændrer avataren af det nuværende rum",
-    "Changes your avatar in this current room only": "Ændrer din avatar kun for det nuværende rum",
+    "Changes your display nickname in the current room only": "Ændrer kun dit viste navn for det nuværende rum",
+    "Changes the avatar of the current room": "Ændrer avataren i det nuværende rum",
+    "Changes your avatar in this current room only": "Ændrer kun din avatar for det nuværende rum",
     "Changes your avatar in all rooms": "Ændrer din avatar i alle rum",
     "Gets or sets the room topic": "Henter eller sætter rummets emne",
     "This room has no topic.": "Dette rum har intet emne.",
@@ -401,10 +401,10 @@
     "Unbans user with given ID": "Fjerner ban fra brugeren med det oplyste ID",
     "Ignores a user, hiding their messages from you": "Ignorerer en bruger og skjuler dennes beskeder fra dig",
     "Stops ignoring a user, showing their messages going forward": "Stopper med at ignorere en bruger og viser deres beskeder igen fra nu af",
-    "Define the power level of a user": "Indstiller rettighedsniveau for en bruger",
-    "Opens the Developer Tools dialog": "Åbner dialogen med udviklingsværktøjer",
-    "Adds a custom widget by URL to the room": "Tilføjer en widget til rummet vha. URL",
-    "Please supply a https:// or http:// widget URL": "Oplys en https:// eller http:// widget URL",
+    "Define the power level of a user": "Indstil rettighedsniveau for en bruger",
+    "Opens the Developer Tools dialog": "Åbner dialogen med udviklerværktøjer",
+    "Adds a custom widget by URL to the room": "Tilføjer en widget til rummet ved hjælp af URL",
+    "Please supply a https:// or http:// widget URL": "Oplys venligst en https:// eller http:// widget URL",
     "You cannot modify widgets in this room.": "Du kan ikke ændre widgets i dette rum.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvinger den nuværende udgående gruppe-session i et krypteret rum til at blive kasseret",
     "Sends the given message coloured as a rainbow": "Sender beskeden med regnbuefarver",
@@ -531,5 +531,35 @@
     "Click the button below to confirm adding this phone number.": "Klik på knappen herunder for at bekræfte tilføjelsen af dette telefonnummer.",
     "Whether you're using Riot as an installed Progressive Web App": "Om du anvender Riot som en installeret Progressiv Web App",
     "The information being sent to us to help make Riot better includes:": "Informationen der sendes til os for at hjælpe os med at gøre Riot bedre inkluderer:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Der er ukendte sessions i dette rum: Hvis du fortsætter uden at verificere dem, vil det være muligt for andre at smuglytte til dit opkald."
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Der er ukendte sessions i dette rum: Hvis du fortsætter uden at verificere dem, vil det være muligt for andre at smuglytte til dit opkald.",
+    "Review Sessions": "Overse sessions",
+    "If you cancel now, you won't complete verifying the other user.": "Hvis du annullerer du, vil du ikke have færdiggjort verifikationen af den anden bruger.",
+    "If you cancel now, you won't complete verifying your other session.": "Hvis du annullerer nu, vil du ikke have færdiggjort verifikationen af din anden session.",
+    "If you cancel now, you won't complete your operation.": "Hvis du annullerer nu, vil du ikke færdiggøre din operation.",
+    "Cancel entering passphrase?": "Annuller indtastning af kodeord?",
+    "Enter passphrase": "Indtast kodeord",
+    "Setting up keys": "Sætter nøgler op",
+    "Verify this session": "Verificér denne session",
+    "Encryption upgrade available": "Opgradering af kryptering tilgængelig",
+    "Set up encryption": "Opsæt kryptering",
+    "Unverified login. Was this you?": "Ikke-verificeret login. Var det dig?",
+    "Identity server has no terms of service": "Identity serveren har ingen terms of service",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handling kræver adgang til default identitets serveren <server /> for at validere en email adresse eller et telefonnummer, men serveren har ingen terms of service.",
+    "Only continue if you trust the owner of the server.": "Fortsæt kun hvis du stoler på ejeren af denne server.",
+    "Trust": "Tillid",
+    "%(name)s is requesting verification": "%(name)s beder om verifikation",
+    "Sign In or Create Account": "Log ind eller Opret bruger",
+    "Use your account or create a new one to continue.": "Brug din konto eller opret en ny for at fortsætte.",
+    "Create Account": "Opret brugerkonto",
+    "Sign In": "Log ind",
+    "Custom (%(level)s)": "Kustomiseret %(level)s",
+    "Sends a message as html, without interpreting it as markdown": "Sender besked som html, uden at tolke den som markdown",
+    "Error upgrading room": "Fejl under opgradering af rum",
+    "Double check that your server supports the room version chosen and try again.": "Dobbelt-tjek at din server understøtter den valgte rum-version og forsøg igen.",
+    "Failed to set topic": "Fejlede i at sætte emne",
+    "Command failed": "Kommando fejlede",
+    "Could not find user in room": "Kunne ikke finde bruger i rum",
+    "Verifies a user, session, and pubkey tuple": "Verificerer en bruger, session og pubkey tuple",
+    "Unknown (user, session) pair:": "Ukendt (bruger, session) par:",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLEVERIFIKATIONEN FEJLEDE! Underskriftsnøglen for %(userId)s og session %(deviceId)s er %(fprint)s som ikke matcher den supplerede nøgle \"%(fingerprint)s\". Dette kunne betyde at jeres kommunikation er infiltreret!"
 }

From 15149cf4e12034639f1f0a4dc72be1413ce16547 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 16 Apr 2020 21:33:25 +0000
Subject: [PATCH 2221/3235] Translated using Weblate (Danish)

Currently translated at 23.9% (547 of 2289 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 8ae6c52b0d..8fda1ddee9 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -561,5 +561,7 @@
     "Could not find user in room": "Kunne ikke finde bruger i rum",
     "Verifies a user, session, and pubkey tuple": "Verificerer en bruger, session og pubkey tuple",
     "Unknown (user, session) pair:": "Ukendt (bruger, session) par:",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLEVERIFIKATIONEN FEJLEDE! Underskriftsnøglen for %(userId)s og session %(deviceId)s er %(fprint)s som ikke matcher den supplerede nøgle \"%(fingerprint)s\". Dette kunne betyde at jeres kommunikation er infiltreret!"
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLEVERIFIKATIONEN FEJLEDE! Underskriftsnøglen for %(userId)s og session %(deviceId)s er %(fprint)s som ikke matcher den supplerede nøgle \"%(fingerprint)s\". Dette kunne betyde at jeres kommunikation er infiltreret!",
+    "Session already verified!": "Sessionen er allerede verificeret!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ADVARSEL: Sessionen er allerede verificeret, men nøglerne MATCHER IKKE."
 }

From e176aa15ad2d8ac783430813218c771f807a5caf Mon Sep 17 00:00:00 2001
From: aWeinzierl <andreas@weinzierl.it>
Date: Fri, 17 Apr 2020 00:56:10 +0000
Subject: [PATCH 2222/3235] Translated using Weblate (German)

Currently translated at 77.2% (1767 of 2289 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 82c75eca27..d8ccd28fde 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1826,5 +1826,6 @@
     "Cancelling…": "Abbrechen…",
     "They match": "Sie passen zueinander",
     "They don't match": "Sie passen nicht zueinander",
-    "To be secure, do this in person or use a trusted way to communicate.": "Um sicher zu gehen, tu dies persönlich oder verwende eine vertrauenswürdige Art der Kommunikation."
+    "To be secure, do this in person or use a trusted way to communicate.": "Um sicher zu gehen, mache dies persönlich oder verwende eine vertrauenswürdige Art der Kommunikation.",
+    "Verify yourself & others to keep your chats safe": "Verifiziere dich & andere, um eure Chats zu schützen"
 }

From f2f2f96531cda8f2f0be6d0ad6a755edd34cd104 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 17 Apr 2020 01:01:31 +0000
Subject: [PATCH 2223/3235] Translated using Weblate (German)

Currently translated at 77.2% (1767 of 2289 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d8ccd28fde..87d56f915d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1827,5 +1827,10 @@
     "They match": "Sie passen zueinander",
     "They don't match": "Sie passen nicht zueinander",
     "To be secure, do this in person or use a trusted way to communicate.": "Um sicher zu gehen, mache dies persönlich oder verwende eine vertrauenswürdige Art der Kommunikation.",
-    "Verify yourself & others to keep your chats safe": "Verifiziere dich & andere, um eure Chats zu schützen"
+    "Verify yourself & others to keep your chats safe": "Verifiziere dich & andere, um eure Chats zu schützen",
+    "This bridge was provisioned by <user />.": "Diese Brücke wurde von <user /> bereitgestellt.",
+    "This bridge is managed by <user />.": "Diese Brücke wird von <user /> verwaltet.",
+    "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s",
+    "Channel: %(channelName)s": "Kanal: %(channelName)s",
+    "Show less": "Weniger zeigen"
 }

From c3ff75d18f55831488706a022aa68de93ef63e72 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Apr 2020 11:04:52 +0100
Subject: [PATCH 2224/3235] Don't break spills over multiple lines, ellipsis
 them at max-1-line

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

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index e3f88cc779..42e14525bf 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -14,8 +14,10 @@
 }
 
 a.mx_Pill {
-    word-break: break-all;
-    display: inline;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 100%;
 }
 
 /* More specific to override `.markdown-body a` text-decoration */

From 81c7660bf572167b63f9f85570b1f4ffa8b82acc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Apr 2020 12:25:16 +0100
Subject: [PATCH 2225/3235] Iterate copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/BugReportDialog.js | 2 +-
 src/i18n/strings/en_EN.json                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 2f7ad4163d..9bb716fe3f 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -140,7 +140,7 @@ export default class BugReportDialog extends React.Component {
         let warning;
         if (window.Modernizr && Object.values(window.Modernizr).some(support => support === false)) {
             warning = <p><b>
-                { _t("Your browser is unsupported, you accepted that things may not work.") }
+                { _t("Reminder: Your browser is unsupported, so your experience may be unpredictable.") }
             </b></p>;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 067d5d8eee..aa104e3686 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1526,6 +1526,7 @@
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",
     "Failed to send logs: ": "Failed to send logs: ",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
     "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.": "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.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
     "GitHub issue": "GitHub issue",

From 4d91dc5bba5388897fcf317a7ef193380983ae86 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Apr 2020 12:30:09 +0100
Subject: [PATCH 2226/3235] iterate pills in rich text styling

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_RichText.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 42e14525bf..e01b1f8938 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -17,7 +17,8 @@ a.mx_Pill {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    max-width: 100%;
+    vertical-align: text-bottom;
+    max-width: calc(100% - 1ch);
 }
 
 /* More specific to override `.markdown-body a` text-decoration */

From 304eb18fd641cd59b50335d9af4136aba43cb327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 17 Apr 2020 07:14:05 +0000
Subject: [PATCH 2227/3235] Translated using Weblate (French)

Currently translated at 100.0% (2289 of 2289 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, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b4e7557dbf..882fd7b663 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2366,5 +2366,29 @@
     "Use your other device to continue…": "Utilisez votre autre appareil pour continuer…",
     "Syncing...": "Synchronisation…",
     "Signing In...": "Authentification…",
-    "If you've joined lots of rooms, this might take a while": "Si vous avez rejoint beaucoup de salons, cela peut prendre du temps"
+    "If you've joined lots of rooms, this might take a while": "Si vous avez rejoint beaucoup de salons, cela peut prendre du temps",
+    "If you cancel now, you won't complete your operation.": "Si vous annulez maintenant, vous ne pourrez par terminer votre opération.",
+    "Enable cross-signing to verify per-user instead of per-session": "Activez la signature croisée pour vérifier par utilisateur plutôt que par session",
+    "Keep recovery passphrase in memory for this session": "Conserver la phrase secrète de récupération en mémoire pour cette session",
+    "Verify other session": "Vérifier une autre session",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Attention</b> : Vous devriez faire cela depuis un ordinateur fiable.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Accédez à l’historique des messages sécurisés et à votre identité de signature croisée en vérifiant d’autres sessions en renseignant votre phrase secrète de récupération.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre phrase secrète de récupération, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : vérifiez que vous avez renseigné la bonne clé de récupération.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète de récupération : vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Si vous ne pouvez pas, <button>utilisez votre clé de récupération ou votre phrase secrète de récupération.</button>",
+    "Great! This recovery passphrase looks strong enough.": "Super ! Cette phrase secrète de récupération a l’air suffisamment robuste.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Définissez une phrase secrète de récupération pour sécuriser les informations chiffrées et les récupérer si vous vous déconnectez. Elle devrait être différente du mot de passe de votre compte :",
+    "Enter a recovery passphrase": "Saisir une phrase secrète de récupération",
+    "Back up encrypted message keys": "Sauvegarder les clés des messages chiffrés",
+    "Enter your recovery passphrase a second time to confirm it.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
+    "Confirm your recovery passphrase": "Confirmer votre phrase secrète de récupération",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Votre clé de récupération est un filet de sécurité : vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés si vous oubliez votre phrase secrète de récupération.",
+    "Confirm recovery passphrase": "Confirmer la phrase secrète de récupération",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec une phrase secrète de récupération.",
+    "Enter a recovery passphrase...": "Saisir une phrase secrète de récupération…",
+    "Please enter your recovery passphrase a second time to confirm.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
+    "Repeat your recovery passphrase...": "Répéter votre phrase secrète de récupération…",
+    "Secure your backup with a recovery passphrase": "Protégez votre sauvegarde avec une phrase secrète de récupération"
 }

From 249daf3f9a640ab08028e3716607afab280503ab Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 17 Apr 2020 07:23:33 +0000
Subject: [PATCH 2228/3235] Translated using Weblate (Russian)

Currently translated at 89.7% (2053 of 2289 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 | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 05ae816c88..6bc1a0b53e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -737,7 +737,7 @@
     "Changelog": "История изменений",
     "Waiting for response from server": "Ожидание ответа от сервера",
     "Uploaded on %(date)s by %(user)s": "Загружено %(user)s в %(date)s",
-    "Send Custom Event": "Отправить индивидуальное мероприятие",
+    "Send Custom Event": "Отправить произвольное событие",
     "Advanced notification settings": "Дополнительные параметры уведомлений",
     "Failed to send logs: ": "Не удалось отправить журналы: ",
     "delete the alias.": "удалить псевдоним.",
@@ -759,7 +759,7 @@
     "Please set a password!": "Пожалуйста, установите пароль!",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек email-уведомлений.",
-    "Explore Room State": "Просмотр статуса комнаты",
+    "Explore Room State": "Просмотр состояния комнаты",
     "Source URL": "Исходная ссылка",
     "Messages sent by bot": "Сообщения от ботов",
     "Filter results": "Фильтрация результатов",
@@ -802,7 +802,7 @@
     "Call invitation": "Звонки",
     "Downloading update...": "Загрузка обновления…",
     "State Key": "Ключ состояния",
-    "Failed to send custom event.": "Не удалось отправить индивидуальное мероприятие.",
+    "Failed to send custom event.": "Не удалось отправить произвольное событие.",
     "What's new?": "Что нового?",
     "Notify me for anything else": "Уведомлять во всех остальных случаях",
     "When I'm invited to a room": "Приглашения в комнаты",
@@ -840,7 +840,7 @@
     "Pin Message": "Закрепить сообщение",
     "Failed to change settings": "Не удалось изменить настройки",
     "View Community": "Просмотр сообщества",
-    "Event sent!": "Мероприятие отправлено!",
+    "Event sent!": "Событие отправлено!",
     "Event Content": "Содержание мероприятия",
     "Thank you!": "Спасибо!",
     "Quote": "Цитата",
@@ -862,7 +862,7 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена, и зашифрованная история чата станет нечитаемой.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджетов для поддерживаемых виджетов",
-    "Collapse Reply Thread": "Ответить с цитированием",
+    "Collapse Reply Thread": "Свернуть ответы",
     "Send analytics data": "Отправить данные аналитики",
     "Muted Users": "Приглушённые пользователи",
     "Terms and Conditions": "Условия и положения",
@@ -924,7 +924,7 @@
     "Failed to invite users to the room:": "Не удалось пригласить пользователей в комнату:",
     "Upgrades a room to a new version": "Модернизирует комнату до новой версии",
     "Sets the room name": "Устанавливает название комнаты",
-    "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": "Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату",
     "%(senderDisplayName)s upgraded this room.": "%(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 к списку адресов комнаты.",
@@ -1111,7 +1111,7 @@
     "<b>Copy it</b> to your personal cloud storage": "<b>Скопируйте</b> в персональное облачное хранилище",
     "<b>Save it</b> on a USB key or backup drive": "<b>Сохраните</b> на USB-диске или на резервном диске",
     "This room has no topic.": "У этой комнаты нет темы.",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Группировать и фильтровать комнаты по пользовательским тэгам (обновите, чтобы применить изменения)",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Группировать и фильтровать комнаты по пользовательским тэгам (обновите для применения изменений)",
     "Dog": "Собака",
     "Cat": "Кошка",
     "Lion": "Лев",
@@ -1409,7 +1409,7 @@
     "Create your Matrix account on <underlinedServerName />": "Создайте учётную запись Matrix на <underlinedServerName />",
     "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам  на крупнейшем общедоступном сервере",
     "Premium hosting for organisations <a>Learn more</a>": "Премиум-хостинг для организаций <a>Подробнее</a>",
-    "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать пользовательский сервер",
+    "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать другой сервер",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Пожалуйста, установите <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> для наилучшего результата.",
     "Couldn't load page": "Невозможно загрузить страницу",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вы являетесь администратором этого сообщества. Вы не сможете вернуться без приглашения от другого администратора.",
@@ -1668,8 +1668,8 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Отсутствует Капча открытого ключа в конфигурации домашнего сервера. Пожалуйста, сообщите об этом администратору вашего домашнего сервера.",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты или номер телефона.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Задайте адрес электронной почты для восстановления учетной записи. Чтобы знакомые могли вас найти, задайте адрес почты.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного домашнего сервера <a> Что это значит? </a>",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Введите URL-адрес вашего собственного сервера идентификации <a>Что это значит?</a>",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Введите ссылку на другой домашний сервер <a>Что это значит?</a>",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Введите ссылку на другой сервер идентификации <a>Что это значит?</a>",
     "%(creator)s created and configured the room.": "%(creator)s создал и настроил комнату.",
     "Preview": "Заглянуть",
     "View": "Просмотр",
@@ -2106,5 +2106,6 @@
     "Backup key stored: ": "Резервная копия ключа сохранена: ",
     "Command failed": "Не удалось выполнить команду",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)"
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Начните диалог с кем-нибудь по его имени, имени пользователя (например, <userId/>) или адресу почты."
 }

From 22094f4a78d91383363ce8145847dd11733020af Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 17 Apr 2020 12:03:18 +0000
Subject: [PATCH 2229/3235] Translated using Weblate (Polish)

Currently translated at 65.9% (1508 of 2289 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 | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 183bce6007..2db9cd3ae2 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1507,5 +1507,32 @@
     "Direct message": "Wiadomość bezpośrednia",
     "Security": "Bezpieczeństwo",
     "Integrations are disabled": "Integracje są wyłączone",
-    "Enable 'Manage Integrations' in Settings to do this.": "Włącz „Zarządzaj integracjami” w ustawieniach, aby to zrobić."
+    "Enable 'Manage Integrations' in Settings to do this.": "Włącz „Zarządzaj integracjami” w ustawieniach, aby to zrobić.",
+    "Encryption upgrade available": "Dostępna aktualizacja szyfrowania",
+    "Upgrade": "Uaktualnij",
+    "Delete sessions|other": "Usuń sesje",
+    "Delete %(count)s sessions|one": "Usuń %(count)s sesję",
+    "Manage": "Zarządzaj",
+    "Enable": "Włącz",
+    "Session ID:": "Identyfikator sesji",
+    "Session key:": "Klucz sesji:",
+    "Accept all %(invitedRooms)s invites": "Zaakceptuj wszystkie zaproszenia do %(invitedRooms)s",
+    "Invite only": "Tylko dla zaproszonych",
+    "Close preview": "Zamknij podgląd",
+    "Send a reply…": "Wyślij odpowiedź…",
+    "Send a message…": "Wyślij wiadomość",
+    "Verified": "Zweryfikowano",
+    "Cancel search": "Anuluj wyszukiwanie",
+    "Your theme": "Twój motyw",
+    "More options": "Więcej opcji",
+    "Invite anyway": "Zaproś mimo to",
+    "Notes": "Notatki",
+    "Session name": "Nazwa sesji",
+    "Session key": "Klucz sesji",
+    "Go": "Przejdź",
+    "Your account is not secure": "Twoje konto nie jest bezpieczne",
+    "New session": "Nowa sesja",
+    "Deny": "Zabroń",
+    "Email (optional)": "Adres e-mail (opcjonalnie)",
+    "Guest": "Gość"
 }

From c1b7d81f009e9ab70221f06ccd8e02d5085699d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98jvind=20Fritjof=20Arnfred?= <fritjofarnfred@posteo.dk>
Date: Fri, 17 Apr 2020 12:14:47 +0000
Subject: [PATCH 2230/3235] Translated using Weblate (Danish)

Currently translated at 24.1% (552 of 2289 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 8fda1ddee9..ebd63abc63 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -563,5 +563,10 @@
     "Unknown (user, session) pair:": "Ukendt (bruger, session) par:",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLEVERIFIKATIONEN FEJLEDE! Underskriftsnøglen for %(userId)s og session %(deviceId)s er %(fprint)s som ikke matcher den supplerede nøgle \"%(fingerprint)s\". Dette kunne betyde at jeres kommunikation er infiltreret!",
     "Session already verified!": "Sessionen er allerede verificeret!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "ADVARSEL: Sessionen er allerede verificeret, men nøglerne MATCHER IKKE."
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ADVARSEL: Sessionen er allerede verificeret, men nøglerne MATCHER IKKE.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "",
+    "Displays information about a user": "Viser information om en bruger",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ændrede rumnavnet fra %(oldRoomName)s til %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til dette rum.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum."
 }

From a55c4dab6a780ae23cce50a54998bd66bed8a203 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 17 Apr 2020 12:33:59 +0000
Subject: [PATCH 2231/3235] Translated using Weblate (Russian)

Currently translated at 89.6% (2052 of 2289 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6bc1a0b53e..4a0d819287 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -6,7 +6,7 @@
     "A new password must be entered.": "Введите новый пароль.",
     "Anyone who knows the room's link, apart from guests": "Все, у кого есть ссылка на эту комнату, кроме гостей",
     "Anyone who knows the room's link, including guests": "Все, у кого есть ссылка на эту комнату, включая гостей",
-    "Are you sure you want to reject the invitation?": "Вы уверены что вы хотите отклонить приглашение?",
+    "Are you sure you want to reject the invitation?": "Вы уверены что хотите отклонить приглашение?",
     "Banned users": "Заблокированные пользователи",
     "Bans user with given id": "Блокирует пользователя с заданным ID",
     "Blacklisted": "В черном списке",
@@ -1288,7 +1288,7 @@
     "Try to join anyway": "Постарайся присоединиться в любом случае",
     "Do you want to chat with %(user)s?": "Хотите пообщаться с %(user)s?",
     "Do you want to join %(roomName)s?": "Хотите присоединиться к %(roomName)s?",
-    "<userName/> invited you": "<userName/> пригласил тебя",
+    "<userName/> invited you": "<userName/> приглашает вас",
     "You're previewing %(roomName)s. Want to join it?": "Вы просматриваете %(roomName)s. Хотите присоединиться?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не может быть предварительно просмотрена. Вы хотите присоединиться к ней?",
     "This room doesn't exist. Are you sure you're at the right place?": "Эта комната не существует. Вы уверены, что находитесь в правильном месте?",
@@ -1992,7 +1992,7 @@
     "Send a message…": "Отправить сообщение…",
     "<userName/> wants to chat": "<userName/> хочет поговорить",
     "Start chatting": "Начать беседу",
-    "Reject & Ignore user": "Отклонить и заигнорить пользователя",
+    "Reject & Ignore user": "Отклонить и заигнорировать пользователя",
     "Unknown Command": "Неизвестная команда",
     "Unrecognised command: %(commandText)s": "Нераспознанная команда: %(commandText)s",
     "Send as message": "Отправить как сообщение",

From 518639e8b1621cc4a0b6ad9c46845a37b821a866 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Apr 2020 16:04:38 +0100
Subject: [PATCH 2232/3235] Fix typo

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/KeySignatureUploadFailedDialog.js | 2 +-
 src/i18n/strings/en_EN.json                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
index a04c4a389f..e59f77fce9 100644
--- a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
+++ b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
@@ -85,7 +85,7 @@ export default function KeySignatureUploadFailedDialog({
               <span>{_t("Upload completed")}</span> :
               cancelled ?
                 <span>{_t("Cancelled signature upload")}</span> :
-                <span>{_t("Unabled to upload")}</span>}
+                <span>{_t("Unable to upload")}</span>}
             <DialogButtons
                 primaryButton={_t("OK")}
                 hasCancel={false}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index be8f1a7a4a..c8d03eed91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1656,7 +1656,7 @@
     "Riot encountered an error during upload of:": "Riot encountered an error during upload of:",
     "Upload completed": "Upload completed",
     "Cancelled signature upload": "Cancelled signature upload",
-    "Unabled to upload": "Unabled to upload",
+    "Unable to upload": "Unable to upload",
     "Signature upload success": "Signature upload success",
     "Signature upload failed": "Signature upload failed",
     "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.",

From 662e697b9d31a0adf8b93e2579529c5c79695a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98jvind=20Fritjof=20Arnfred?= <fritjofarnfred@posteo.dk>
Date: Fri, 17 Apr 2020 15:22:37 +0000
Subject: [PATCH 2233/3235] Translated using Weblate (Danish)

Currently translated at 24.2% (554 of 2291 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index ebd63abc63..6db20766d3 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -568,5 +568,7 @@
     "Displays information about a user": "Viser information om en bruger",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ændrede rumnavnet fra %(oldRoomName)s til %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til dette rum.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum."
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s fjernede de alternative adresser %(addresses)s til dette rum.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjernede alternative adresser %(addresses)s til dette rum."
 }

From 383915d5ccf3d875888b27650ef8ae22d2672999 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 17 Apr 2020 17:46:55 +0100
Subject: [PATCH 2234/3235] Upgrade matrix-js-sdk to 5.3.1-rc.3

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 989f0dbc96..adc2b61cbc 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.3.1-rc.2",
+    "matrix-js-sdk": "5.3.1-rc.3",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index e78b6ed280..65f8a0e669 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.3.1-rc.2:
-  version "5.3.1-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.2.tgz#437cb6aafa1be5d8750aa0e31baed76ef4fcb7da"
-  integrity sha512-VWwqjmSXaabXqwc4Lm+jHQEu3sBpHs9ni/zCW8kTf+jUDnJllCUDCRnGWY4F3QVNWT9nz9e5Nzojzq7ySiP7XA==
+matrix-js-sdk@5.3.1-rc.3:
+  version "5.3.1-rc.3"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.3.tgz#fada68aaf9fadd2f423a297bba8193b5bd697316"
+  integrity sha512-YMfOdhlAFk4kHQ85S3kosVBWSr8iCJ8OaVpJr+lDFoXkvIrPgSn5zWesg+ny/bvQjWNRny7Ch7wcmozojKQqqg==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 12f2076e348cee91e8bec41deca4403df68cac5a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 17 Apr 2020 17:51:49 +0100
Subject: [PATCH 2235/3235] Prepare changelog for v2.5.0-rc.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21dfca116a..c3676b5be0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [2.5.0-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.3) (2020-04-17)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.2...v2.5.0-rc.3)
+
+ * Upgrade to JS SDK 5.3.1-rc.3
+
 Changes in [2.5.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.2) (2020-04-16)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.1...v2.5.0-rc.2)

From 1ee2d6f3a2d93377e410b380936a4e5112a75aac Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 17 Apr 2020 17:51:49 +0100
Subject: [PATCH 2236/3235] v2.5.0-rc.3

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

diff --git a/package.json b/package.json
index adc2b61cbc..4e20ad6acf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.2",
+  "version": "2.5.0-rc.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From e72008d7f103b7d78ffffdf14dc6e502df0dccab Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 14:31:33 -0600
Subject: [PATCH 2237/3235] Fix end-to-end tests for end-to-end encryption
 verification

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

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
---
 src/components/views/right_panel/UserInfo.js  |  3 +-
 .../views/right_panel/VerificationPanel.js    |  9 +-
 .../src/scenarios/directory.js                |  2 +-
 .../src/scenarios/e2e-encryption.js           | 67 ++++++-------
 .../src/scenarios/lazy-loading.js             |  2 +-
 test/end-to-end-tests/src/session.js          |  4 +
 .../src/usecases/create-room.js               | 39 +++++++-
 .../src/usecases/room-settings.js             | 92 +++++++++++++++++-
 test/end-to-end-tests/src/usecases/verify.js  | 97 ++++++++++++++-----
 9 files changed, 244 insertions(+), 71 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 862e4f7897..979bac23e6 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1308,8 +1308,9 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
     if (canVerify) {
+        // Note: mx_UserInfo_verifyButton is for the end-to-end tests
         verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field" onClick={() => {
+            <AccessibleButton className="mx_UserInfo_field mx_UserInfo_verifyButton" onClick={() => {
                 if (hasCrossSigningKeys) {
                     verifyUser(member);
                 } else {
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index b60cc234eb..67efd29d27 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -123,10 +123,17 @@ export default class VerificationPanel extends React.PureComponent {
             const sasLabel = showQR ?
                 _t("If you can't scan the code above, verify by comparing unique emoji.") :
                 _t("Verify by comparing unique emoji.");
+
+            // Note: mx_VerificationPanel_verifyByEmojiButton is for the end-to-end tests
             sasBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by emoji")}</h3>
                 <p>{sasLabel}</p>
-                <AccessibleButton disabled={disabled} kind="primary" className="mx_UserInfo_wideButton" onClick={this._startSAS}>
+                <AccessibleButton
+                    disabled={disabled}
+                    kind="primary"
+                    className="mx_UserInfo_wideButton mx_VerificationPanel_verifyByEmojiButton"
+                    onClick={this._startSAS}
+                >
                     {_t("Verify by emoji")}
                 </AccessibleButton>
             </div>;
diff --git a/test/end-to-end-tests/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
index ca2f99f192..b5be9ed4f4 100644
--- a/test/end-to-end-tests/src/scenarios/directory.js
+++ b/test/end-to-end-tests/src/scenarios/directory.js
@@ -20,7 +20,7 @@ const join = require('../usecases/join');
 const sendMessage = require('../usecases/send-message');
 const {receiveMessage} = require('../usecases/timeline');
 const {createRoom} = require('../usecases/create-room');
-const changeRoomSettings = require('../usecases/room-settings');
+const {changeRoomSettings} = require('../usecases/room-settings');
 
 module.exports = async function roomDirectoryScenarios(alice, bob) {
     console.log(" creating a public room and join through directory:");
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index f30b814644..586b3a0404 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,42 +15,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: Update test for cross signing
-// https://github.com/vector-im/riot-web/issues/13226
+const sendMessage = require('../usecases/send-message');
+const acceptInvite = require('../usecases/accept-invite');
+const invite = require('../usecases/invite');
+const {receiveMessage} = require('../usecases/timeline');
+const {createDm} = require('../usecases/create-room');
+const {checkRoomSettings} = require('../usecases/room-settings');
+const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+const assert = require('assert');
 
-module.exports = async function() {
-    console.log(" this is supposed to be an e2e test, but it's broken");
+module.exports = async function e2eEncryptionScenarios(alice, bob) {
+    console.log(" creating an e2e encrypted DM and join through invite:");
+    await createDm(bob, ['@alice:localhost']);
+    await checkRoomSettings(bob, {encryption: true}); // for sanity, should be e2e-by-default
+    await acceptInvite(alice, 'bob');
+    // do sas verifcation
+    bob.log.step(`starts SAS verification with ${alice.username}`);
+    const bobSasPromise = startSasVerifcation(bob, alice.username);
+    const aliceSasPromise = acceptSasVerification(alice, bob.username);
+    // wait in parallel, so they don't deadlock on each other
+    // the logs get a bit messy here, but that's fine enough for debugging (hopefully)
+    const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
+    assert.deepEqual(bobSas, aliceSas);
+    bob.log.done(`done (match for ${bobSas.join(", ")})`);
+    const aliceMessage = "Guess what I just heard?!";
+    await sendMessage(alice, aliceMessage);
+    await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
+    const bobMessage = "You've got to tell me!";
+    await sendMessage(bob, bobMessage);
+    await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
 };
-
-// const sendMessage = require('../usecases/send-message');
-// const acceptInvite = require('../usecases/accept-invite');
-// const invite = require('../usecases/invite');
-// const {receiveMessage} = require('../usecases/timeline');
-// const {createRoom} = require('../usecases/create-room');
-// const changeRoomSettings = require('../usecases/room-settings');
-// const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
-// const assert = require('assert');
-//
-// module.exports = async function e2eEncryptionScenarios(alice, bob) {
-//     console.log(" creating an e2e encrypted room and join through invite:");
-//     const room = "secrets";
-//     await createRoom(bob, room);
-//     await changeRoomSettings(bob, {encryption: true});
-//     // await cancelKeyBackup(bob);
-//     await invite(bob, "@alice:localhost");
-//     await acceptInvite(alice, room);
-//     // do sas verifcation
-//     bob.log.step(`starts SAS verification with ${alice.username}`);
-//     const bobSasPromise = startSasVerifcation(bob, alice.username);
-//     const aliceSasPromise = acceptSasVerification(alice, bob.username);
-//     // wait in parallel, so they don't deadlock on each other
-//     const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
-//     assert.deepEqual(bobSas, aliceSas);
-//     bob.log.done(`done (match for ${bobSas.join(", ")})`);
-//     const aliceMessage = "Guess what I just heard?!";
-//     await sendMessage(alice, aliceMessage);
-//     await receiveMessage(bob, {sender: "alice", body: aliceMessage, encrypted: true});
-//     const bobMessage = "You've got to tell me!";
-//     await sendMessage(bob, bobMessage);
-//     await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
-// };
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index 0c45b0d083..6d321dc737 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -25,7 +25,7 @@ const {
 } = require('../usecases/timeline');
 const {createRoom} = require('../usecases/create-room');
 const {getMembersInMemberlist} = require('../usecases/memberlist');
-const changeRoomSettings = require('../usecases/room-settings');
+const {changeRoomSettings} = require('../usecases/room-settings');
 const assert = require('assert');
 
 module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index f25c5056ad..55c2ed440c 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -75,6 +75,10 @@ module.exports = class RiotSession {
         return this.getElementProperty(field, 'outerHTML');
     }
 
+    isChecked(field) {
+        return this.getElementProperty(field, 'checked');
+    }
+
     consoleLogs() {
         return this.consoleLog.buffer;
     }
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index ab2d9b69b9..c40cbba096 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -27,7 +27,7 @@ async function createRoom(session, roomName, encrypted=false) {
     const roomListHeaderLabels = await Promise.all(roomListHeaders.map(h => session.innerText(h)));
     const roomsIndex = roomListHeaderLabels.findIndex(l => l.toLowerCase().includes("rooms"));
     if (roomsIndex === -1) {
-        throw new Error("could not find room list section that contains rooms in header");
+        throw new Error("could not find room list section that contains 'rooms' in header");
     }
     const roomsHeader = roomListHeaders[roomsIndex];
     const addRoomButton = await roomsHeader.$(".mx_RoomSubList_addRoom");
@@ -48,4 +48,39 @@ async function createRoom(session, roomName, encrypted=false) {
     session.log.done();
 }
 
-module.exports = {openRoomDirectory, createRoom};
+async function createDm(session, invitees) {
+    session.log.step(`creates DM with ${JSON.stringify(invitees)}`);
+
+    const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
+    const roomListHeaderLabels = await Promise.all(roomListHeaders.map(h => session.innerText(h)));
+    const dmsIndex = roomListHeaderLabels.findIndex(l => l.toLowerCase().includes('direct messages'));
+    if (dmsIndex === -1) {
+        throw new Error("could not find room list section that contains 'direct messages' in header");
+    }
+    const dmsHeader = roomListHeaders[dmsIndex];
+    const addRoomButton = await dmsHeader.$(".mx_RoomSubList_addRoom");
+    await addRoomButton.click();
+
+    const inviteesEditor = await session.query('.mx_InviteDialog_editor textarea');
+    for (const target of invitees) {
+        await session.replaceInputText(inviteesEditor, target);
+        await session.delay(1000); // give it a moment to figure out a suggestion
+        // find the suggestion and accept it
+        const suggestions = await session.queryAll('.mx_InviteDialog_roomTile_userId');
+        const suggestionTexts = await Promise.all(suggestions.map(s => session.innerText(s)));
+        const suggestionIndex = suggestionTexts.indexOf(target);
+        if (suggestionIndex === -1) {
+            throw new Error(`failed to find a suggestion in the DM dialog to invite ${target} with`);
+        }
+        await suggestions[suggestionIndex].click();
+    }
+
+    // press the go button and hope for the best
+    const goButton = await session.query('.mx_InviteDialog_goButton');
+    await goButton.click();
+
+    await session.query('.mx_MessageComposer');
+    session.log.done();
+}
+
+module.exports = {openRoomDirectory, createRoom, createDm};
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index ab6d66ea6d..b705463965 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -30,18 +30,102 @@ async function setSettingsToggle(session, toggle, enabled) {
     }
 }
 
-module.exports = async function changeRoomSettings(session, settings) {
-    session.log.startGroup(`changes the room settings`);
+async function checkSettingsToggle(session, toggle, shouldBeEnabled) {
+    const className = await session.getElementProperty(toggle, "className");
+    const checked = className.includes("mx_ToggleSwitch_on");
+    if (checked === shouldBeEnabled) {
+        session.log.done('set as expected');
+    } else {
+        // other logs in the area should give more context as to what this means.
+        throw new Error("settings toggle value didn't match expectation");
+    }
+}
+
+async function findTabs(session) {
     /// XXX delay is needed here, possibly because the header is being rerendered
     /// click doesn't do anything otherwise
     await session.delay(1000);
     const settingsButton = await session.query(".mx_RoomHeader .mx_AccessibleButton[title=Settings]");
     await settingsButton.click();
+
     //find tabs
     const tabButtons = await session.queryAll(".mx_RoomSettingsDialog .mx_TabbedView_tabLabel");
     const tabLabels = await Promise.all(tabButtons.map(t => session.innerText(t)));
     const securityTabButton = tabButtons[tabLabels.findIndex(l => l.toLowerCase().includes("security"))];
 
+    return {securityTabButton};
+}
+
+async function checkRoomSettings(session, expectedSettings) {
+    session.log.startGroup(`checks the room settings`);
+
+    const {securityTabButton} = await findTabs(session);
+    const generalSwitches = await session.queryAll(".mx_RoomSettingsDialog .mx_ToggleSwitch");
+    const isDirectory = generalSwitches[0];
+
+    if (typeof expectedSettings.directory === 'boolean') {
+        session.log.step(`checks directory listing is ${expectedSettings.directory}`);
+        await checkSettingsToggle(session, isDirectory, expectedSettings.directory);
+    }
+
+    if (expectedSettings.alias) {
+        session.log.step(`checks for local alias of ${expectedSettings.alias}`);
+        const summary = await session.query(".mx_RoomSettingsDialog .mx_AliasSettings summary");
+        await summary.click();
+        const localAliases = await session.query('.mx_RoomSettingsDialog .mx_AliasSettings .mx_EditableItem_item');
+        const localAliasTexts = await Promise.all(localAliases.map(a => session.innerText(a)));
+        if (localAliasTexts.find(a => a.includes(expectedSettings.alias))) {
+            session.log.done("present");
+        } else {
+            throw new Error(`could not find local alias ${expectedSettings.alias}`);
+        }
+    }
+
+    securityTabButton.click();
+    await session.delay(500);
+    const securitySwitches = await session.queryAll(".mx_RoomSettingsDialog .mx_ToggleSwitch");
+    const e2eEncryptionToggle = securitySwitches[0];
+
+    if (typeof expectedSettings.encryption === "boolean") {
+        session.log.step(`checks room e2e encryption is ${expectedSettings.encryption}`);
+        await checkSettingsToggle(session, e2eEncryptionToggle, expectedSettings.encryption);
+    }
+
+    if (expectedSettings.visibility) {
+        session.log.step(`checks visibility is ${expectedSettings.visibility}`);
+        const radios = await session.queryAll(".mx_RoomSettingsDialog input[type=radio]");
+        assert.equal(radios.length, 7);
+        const inviteOnly = radios[0];
+        const publicNoGuests = radios[1];
+        const publicWithGuests = radios[2];
+
+        let expectedRadio = null;
+        if (expectedSettings.visibility === "invite_only") {
+            expectedRadio = inviteOnly;
+        } else if (expectedSettings.visibility === "public_no_guests") {
+            expectedRadio = publicNoGuests;
+        } else if (expectedSettings.visibility === "public_with_guests") {
+            expectedRadio = publicWithGuests;
+        } else {
+            throw new Error(`unrecognized room visibility setting: ${expectedSettings.visibility}`);
+        }
+        if (await session.isChecked(expectedRadio)) {
+            session.log.done();
+        } else {
+            throw new Error("room visibility is not as expected");
+        }
+    }
+
+    const closeButton = await session.query(".mx_RoomSettingsDialog .mx_Dialog_cancelButton");
+    await closeButton.click();
+
+    session.log.endGroup();
+}
+
+async function changeRoomSettings(session, settings) {
+    session.log.startGroup(`changes the room settings`);
+
+    const {securityTabButton} = await findTabs(session);
     const generalSwitches = await session.queryAll(".mx_RoomSettingsDialog .mx_ToggleSwitch");
     const isDirectory = generalSwitches[0];
 
@@ -100,4 +184,6 @@ module.exports = async function changeRoomSettings(session, settings) {
     await closeButton.click();
 
     session.log.endGroup();
-};
+}
+
+module.exports = {checkRoomSettings, changeRoomSettings};
diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index 5f507f96e6..7ff3f3d8bb 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -25,10 +25,19 @@ async function assertVerified(session) {
 }
 
 async function startVerification(session, name) {
+    session.log.step("opens their opponent's profile and starts verification");
     await openMemberInfo(session, name);
     // click verify in member info
-    const firstVerifyButton = await session.query(".mx_MemberDeviceInfo_verify");
+    const firstVerifyButton = await session.query(".mx_UserInfo_verifyButton");
     await firstVerifyButton.click();
+
+    // wait for the animation to finish
+    await session.delay(1000);
+
+    // click 'start verification'
+    const startVerifyButton = await session.query('.mx_UserInfo_container .mx_AccessibleButton_kind_primary');
+    await startVerifyButton.click();
+    session.log.done();
 }
 
 async function getSasCodes(session) {
@@ -38,33 +47,73 @@ async function getSasCodes(session) {
     return sasLabels;
 }
 
-module.exports.startSasVerifcation = async function(session, name) {
-    await startVerification(session, name);
-    // expect "Verify device" dialog and click "Begin Verification"
-    await assertDialog(session, "Verify device");
-    // click "Begin Verification"
-    await acceptDialog(session);
+async function doSasVerification(session) {
+    session.log.step("hunts for the emoji to yell at their opponent");
     const sasCodes = await getSasCodes(session);
-    // click "Verify"
-    await acceptDialog(session);
-    await assertVerified(session);
-    // click "Got it" when verification is done
-    await acceptDialog(session);
+    session.log.done(sasCodes);
+
+    // Assume they match
+    session.log.step("assumes the emoji match");
+    const matchButton = await session.query(".mx_VerificationShowSas .mx_AccessibleButton_kind_primary");
+    await matchButton.click();
+    session.log.done();
+
+    // Wait for a big green shield (universal sign that it worked)
+    session.log.step("waits for a green shield");
+    await session.query(".mx_VerificationPanel_verified_section .mx_E2EIcon_verified");
+    session.log.done();
+
+    // Click 'Got It'
+    session.log.step("confirms the green shield");
+    const doneButton = await session.query(".mx_VerificationPanel_verified_section .mx_AccessibleButton_kind_primary");
+    await doneButton.click();
+    session.log.done();
+
+    // Wait a bit for the animation
+    session.log.step("confirms their opponent has a green shield");
+    await session.delay(1000);
+
+    // Verify that we now have a green shield in their name (proving it still works)
+    await session.query('.mx_UserInfo_profile .mx_E2EIcon_verified');
+    session.log.done();
+
+    return sasCodes;
+}
+
+module.exports.startSasVerifcation = async function(session, name) {
+    session.log.startGroup("starts verification");
+    await startVerification(session, name);
+
+    // expect to be waiting (the presence of a spinner is a good thing)
+    await session.query('.mx_UserInfo_container .mx_EncryptionInfo_spinner');
+
+    const sasCodes = await doSasVerification(session);
+    session.log.endGroup();
     return sasCodes;
 };
 
 module.exports.acceptSasVerification = async function(session, name) {
-    await assertDialog(session, "Incoming Verification Request");
-    const opponentLabelElement = await session.query(".mx_IncomingSasDialog_opponentProfile h2");
-    const opponentLabel = await session.innerText(opponentLabelElement);
-    assert(opponentLabel, name);
-    // click "Continue" button
-    await acceptDialog(session);
-    const sasCodes = await getSasCodes(session);
-    // click "Verify"
-    await acceptDialog(session);
-    await assertVerified(session);
-    // click "Got it" when verification is done
-    await acceptDialog(session);
+    session.log.startGroup("accepts verification");
+    const requestToast = await session.query('.mx_Toast_icon_verification');
+
+    // verify the toast is for verification
+    const toastHeader = await requestToast.$("h2");
+    const toastHeaderText = await session.innerText(toastHeader);
+    assert.equal(toastHeaderText, 'Verification Request');
+    const toastDescription = await requestToast.$(".mx_Toast_description");
+    const toastDescText = await session.innerText(toastDescription);
+    assert.equal(toastDescText.startsWith(name), true,
+        `verification opponent mismatch: expected to start with '${name}', got '${toastDescText}'`);
+
+    // accept the verification
+    const acceptButton = await requestToast.$(".mx_AccessibleButton_kind_primary");
+    await acceptButton.click();
+
+    // find the emoji button
+    const startEmojiButton = await session.query(".mx_VerificationPanel_verifyByEmojiButton");
+    await startEmojiButton.click();
+
+    const sasCodes = await doSasVerification(session);
+    session.log.endGroup();
     return sasCodes;
 };

From 5a9898591d0fb0edbebfefd06f9e5b0f34c19135 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 14:35:02 -0600
Subject: [PATCH 2238/3235] Appease the linter

---
 test/end-to-end-tests/src/scenarios/e2e-encryption.js | 1 -
 test/end-to-end-tests/src/usecases/verify.js          | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index 586b3a0404..d31d2c0d57 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 const sendMessage = require('../usecases/send-message');
 const acceptInvite = require('../usecases/accept-invite');
-const invite = require('../usecases/invite');
 const {receiveMessage} = require('../usecases/timeline');
 const {createDm} = require('../usecases/create-room');
 const {checkRoomSettings} = require('../usecases/room-settings');
diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index 7ff3f3d8bb..719333c0d8 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ limitations under the License.
 
 const assert = require('assert');
 const {openMemberInfo} = require("./memberlist");
-const {assertDialog, acceptDialog} = require("./dialog");
 
 async function assertVerified(session) {
     const dialogSubTitle = await session.innerText(await session.query(".mx_Dialog h2"));

From 77df61065322d3991c087fc5021b44502870afdc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 14:38:05 -0600
Subject: [PATCH 2239/3235] Appease the linter a bit more

---
 test/end-to-end-tests/src/usecases/verify.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/verify.js b/test/end-to-end-tests/src/usecases/verify.js
index 719333c0d8..98e73ad6b7 100644
--- a/test/end-to-end-tests/src/usecases/verify.js
+++ b/test/end-to-end-tests/src/usecases/verify.js
@@ -18,11 +18,6 @@ limitations under the License.
 const assert = require('assert');
 const {openMemberInfo} = require("./memberlist");
 
-async function assertVerified(session) {
-    const dialogSubTitle = await session.innerText(await session.query(".mx_Dialog h2"));
-    assert(dialogSubTitle, "Verified!");
-}
-
 async function startVerification(session, name) {
     session.log.step("opens their opponent's profile and starts verification");
     await openMemberInfo(session, name);

From 88b5c3ca840799fce2ec92fc6cdbc7e400a85516 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 14:39:45 -0600
Subject: [PATCH 2240/3235] Don't explode if the e2e test directory exists when
 crashing

This is largely expected in local test environments where the developer probably won't remember to clear out the directory themselves.
---
 test/end-to-end-tests/start.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/end-to-end-tests/start.js b/test/end-to-end-tests/start.js
index 83bc186356..6c80608903 100644
--- a/test/end-to-end-tests/start.js
+++ b/test/end-to-end-tests/start.js
@@ -93,7 +93,13 @@ async function writeLogs(sessions, dir) {
     for (let i = 0; i < sessions.length; ++i) {
         const session = sessions[i];
         const userLogDir = `${dir}/${session.username}`;
-        fs.mkdirSync(userLogDir);
+        try {
+            fs.mkdirSync(userLogDir);
+        } catch (e) {
+            // typically this will be EEXIST. If it's something worse, the next few
+            // lines will fail too.
+            console.warn(`non-fatal error creating ${userLogDir} :`, e.message);
+        }
         const consoleLogName = `${userLogDir}/console.log`;
         const networkLogName = `${userLogDir}/network.log`;
         const appHtmlName = `${userLogDir}/app.html`;

From 432dbab8cb978ececb3071c185208e24efc54960 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 15:06:59 -0600
Subject: [PATCH 2241/3235] Fix start chat button variable name

---
 test/end-to-end-tests/src/usecases/create-room.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index c40cbba096..7e219fd159 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -58,8 +58,8 @@ async function createDm(session, invitees) {
         throw new Error("could not find room list section that contains 'direct messages' in header");
     }
     const dmsHeader = roomListHeaders[dmsIndex];
-    const addRoomButton = await dmsHeader.$(".mx_RoomSubList_addRoom");
-    await addRoomButton.click();
+    const startChatButton = await dmsHeader.$(".mx_RoomSubList_addRoom");
+    await startChatButton.click();
 
     const inviteesEditor = await session.query('.mx_InviteDialog_editor textarea');
     for (const target of invitees) {

From e0d6fa3f514a9e048993041df6dd72fdb3a154ea Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Apr 2020 15:15:51 -0600
Subject: [PATCH 2242/3235] Rename ref to timelinePanel

---
 src/components/structures/FilePanel.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 926355dd88..f073785df3 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -209,10 +209,10 @@ const FilePanel = createReactClass({
     },
 
     _getScrollState: function() {
-        const messagePanel = this._messagePanel;
-        const scrollState = messagePanel.getScrollState();
+        const timelinePanel = this._timelinePanel;
+        const scrollState = timelinePanel.getScrollState();
 
-        if (!messagePanel) return null;
+        if (!timelinePanel) return null;
 
         if (!scrollState || scrollState.stuckAtBottom) {
             return null;
@@ -225,7 +225,7 @@ const FilePanel = createReactClass({
     },
 
     _getTimelinePanelRef: function(ref) {
-        this._messagePanel = ref;
+        this._timelinePanel = ref;
     },
 
     render: function() {

From a0f704f41999b04b1440be21a963cb5c3d8d4e07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Apr 2020 15:08:15 +0100
Subject: [PATCH 2243/3235] Network Dropdown fix things not scrolling properly

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/directory/_NetworkDropdown.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index dd1892c448..bd5c67c7ed 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -53,15 +53,16 @@ limitations under the License.
         font-weight: 600;
         line-height: $font-20px;
         margin-bottom: 4px;
+        position: relative;
 
         // remove server button
         .mx_AccessibleButton {
             position: absolute;
             display: inline;
-            right: 12px;
+            right: 10px;
             height: 16px;
             width: 16px;
-            margin-top: 4px;
+            margin-top: 2px;
 
             &::after {
                 content: "";

From b86b42c89f3905a7c1cd3eefb49ed5370d2a84f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Apr 2020 16:18:01 +0100
Subject: [PATCH 2244/3235] Password Login make sure tab takes user to password
 field

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/auth/PasswordLogin.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index aeaa91845b..790c837497 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -185,7 +185,7 @@ export default class PasswordLogin extends React.Component {
         this.props.onPasswordChanged(ev.target.value);
     }
 
-    renderLoginField(loginType) {
+    renderLoginField(loginType, autoFocus) {
         const Field = sdk.getComponent('elements.Field');
 
         const classes = {};
@@ -204,7 +204,7 @@ export default class PasswordLogin extends React.Component {
                     onChange={this.onUsernameChanged}
                     onBlur={this.onUsernameBlur}
                     disabled={this.props.disableSubmit}
-                    autoFocus
+                    autoFocus={autoFocus}
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
                 classes.error = this.props.loginIncorrect && !this.state.username;
@@ -218,7 +218,7 @@ export default class PasswordLogin extends React.Component {
                     onChange={this.onUsernameChanged}
                     onBlur={this.onUsernameBlur}
                     disabled={this.props.disableSubmit}
-                    autoFocus
+                    autoFocus={autoFocus}
                 />;
             case PasswordLogin.LOGIN_FIELD_PHONE: {
                 const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
@@ -242,7 +242,7 @@ export default class PasswordLogin extends React.Component {
                     onChange={this.onPhoneNumberChanged}
                     onBlur={this.onPhoneNumberBlur}
                     disabled={this.props.disableSubmit}
-                    autoFocus
+                    autoFocus={autoFocus}
                 />;
             }
         }
@@ -285,7 +285,10 @@ export default class PasswordLogin extends React.Component {
             error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
         });
 
-        const loginField = this.renderLoginField(this.state.loginType);
+        // If login is empty, autoFocus login, otherwise autoFocus password.
+        // this is for when auto server discovery remounts us when the user tries to tab from username to password
+        const autoFocusPassword = !this.isLoginEmpty();
+        const loginField = this.renderLoginField(this.state.loginType, !autoFocusPassword);
 
         let loginType;
         if (!SdkConfig.get().disable_3pid_login) {
@@ -336,6 +339,7 @@ export default class PasswordLogin extends React.Component {
                         value={this.state.password}
                         onChange={this.onPasswordChanged}
                         disabled={this.props.disableSubmit}
+                        autoFocus={autoFocusPassword}
                     />
                     {forgotPasswordJsx}
                     { !this.props.busy && <input className="mx_Login_submit"

From 7fe8894c513735db5d79756a9d3141fbda9c9a07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 18 Apr 2020 23:16:40 +0100
Subject: [PATCH 2245/3235] Update seshat copy to remove trailing full stop

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/eventindex/ManageEventIndexDialog.js          | 2 +-
 src/i18n/strings/en_EN.json                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index 5f24fb10fa..bb2cf7f0b8 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -140,7 +140,7 @@ export default class ManageEventIndexDialog extends React.Component {
             crawlerState = _t("Not currently indexing messages for any room.");
         } else {
             crawlerState = (
-                    _t("Currently indexing: %(currentRoom)s.", { currentRoom: this.state.currentRoom })
+                    _t("Currently indexing: %(currentRoom)s", { currentRoom: this.state.currentRoom })
             );
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0e39d848d2..0cf2944116 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2239,7 +2239,7 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
     "Disable": "Disable",
     "Not currently indexing messages for any room.": "Not currently indexing messages for any room.",
-    "Currently indexing: %(currentRoom)s.": "Currently indexing: %(currentRoom)s.",
+    "Currently indexing: %(currentRoom)s": "Currently indexing: %(currentRoom)s",
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",

From 6579f25ef1a8b050cb789607db2aa6f24eee8fff Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 18 Apr 2020 03:28:48 +0000
Subject: [PATCH 2246/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2291 of 2291 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5c0018c41b..bdf410f9e7 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2389,5 +2389,9 @@
     "Enter a recovery passphrase...": "輸入復原通關密語……",
     "Please enter your recovery passphrase a second time to confirm.": "請再次輸入您的復原通關密語以確認。",
     "Repeat your recovery passphrase...": "再次輸入您的復原通關密語……",
-    "Secure your backup with a recovery passphrase": "使用復原通關密語保護您的備份"
+    "Secure your backup with a recovery passphrase": "使用復原通關密語保護您的備份",
+    "Can't load this message": "無法載入此訊息",
+    "Submit logs": "遞交紀錄檔",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "注意：您的瀏覽器不受支援，所以您的使用體驗可能無法預測。",
+    "Unable to upload": "無法上傳"
 }

From 7a8dee721319fb9b605d537d8b0ecea3772e6cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98jvind=20Fritjof=20Arnfred?= <fritjofarnfred@posteo.dk>
Date: Sat, 18 Apr 2020 18:56:54 +0000
Subject: [PATCH 2247/3235] Translated using Weblate (Danish)

Currently translated at 25.1% (575 of 2291 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 6db20766d3..2fc17fe709 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -77,7 +77,7 @@
     "Close": "Luk",
     "Cancel": "Afbryd",
     "Edit": "Rediger",
-    "Unpin Message": "Fasthold ikke længere Besked",
+    "Unpin Message": "Frigør Besked",
     "Failed to forget room %(errCode)s": "Kunne ikke glemme rummet %(errCode)s",
     "Mute": "Sæt på lydløs",
     "Leave": "Forlad",
@@ -418,7 +418,7 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s ændrede adgangsreglen til %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s har givet gæster adgang til rummet.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har forhindret gæster i at tilgå rummet.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ændrede gæsteadgang til",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ændrede gæsteadgang til %(rule)s",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktiverede etiket for %(groups)s i dette rum.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktiverede etiket for %(groups)s i dette rum.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktiverede etiket for %(newGroups)s og deaktiverede etiket for %(oldGroups)s i dette rum.",
@@ -464,7 +464,7 @@
     "%(items)s and %(count)s others|other": "%(items)s og %(count)s andre",
     "%(items)s and %(count)s others|one": "%(items)s og en anden",
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
-    "Your browser does not support the required cryptography extensions": "Din browser understøtter ikke de påkrævede kryptografiske udvidelser.",
+    "Your browser does not support the required cryptography extensions": "Din browser understøtter ikke de påkrævede kryptografiske udvidelser",
     "Not a valid Riot keyfile": "Ikke en gyldig Riot nøglefil",
     "Authentication check failed: incorrect password?": "Godkendelse mislykkedes: forkert kodeord?",
     "Unrecognised address": "Ukendt adresse",
@@ -563,12 +563,29 @@
     "Unknown (user, session) pair:": "Ukendt (bruger, session) par:",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLEVERIFIKATIONEN FEJLEDE! Underskriftsnøglen for %(userId)s og session %(deviceId)s er %(fprint)s som ikke matcher den supplerede nøgle \"%(fingerprint)s\". Dette kunne betyde at jeres kommunikation er infiltreret!",
     "Session already verified!": "Sessionen er allerede verificeret!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "ADVARSEL: Sessionen er allerede verificeret, men nøglerne MATCHER IKKE.",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ADVARSEL: Sessionen er allerede verificeret, men nøglerne MATCHER IKKE!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Underskriftsnøglen du supplerede matcher den underskriftsnøgle du modtog fra %(userId)s's session %(deviceId)s. Sessionen er markeret som verificeret.",
     "Displays information about a user": "Viser information om en bruger",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ændrede rumnavnet fra %(oldRoomName)s til %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tilføjede de alternative adresser %(addresses)s til dette rum.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tilføjede alternative adresser %(addresses)s til dette rum.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s fjernede de alternative adresser %(addresses)s til dette rum.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjernede alternative adresser %(addresses)s til dette rum."
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s fjernede alternative adresser %(addresses)s til dette rum.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ændrede de alternative adresser til dette rum.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ændrede hoved- og alternative adresser til dette rum.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s ændrede adresserne til dette rum.",
+    "%(senderName)s placed a voice call.": "%(senderName)s foretog et stemmeopkald.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s foretog et stemmeopkald. (ikke understøttet af denne browser)",
+    "%(senderName)s placed a video call.": "%(senderName)s foretog et videoopkald.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s foretog et videoopkald. (ikke understøttet af denne browser)",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s fjernede den regel der bannede brugere der matcher %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s fjernede den regel der bannede brugere der matcher %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s fjernede den regel der bannede servere som matcher %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s fjernede en ban-regel der matcher %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s opdaterede en ugyldig ban-regel",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s opdaterede den regel der banner brugere som matcher %(glob)s på grund af %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s opdaterede den regel der banner rum som matcher %(glob)s på grund af %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s opdaterede den regel der banner servere der matcher %(glob)s på grund af %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s opdaterede en ban-regel der matcher %(glob)s på grund af %(reason)s",
+    "Explore rooms": "Udforsk rum"
 }

From 62e9c7e0926c55fd0396932429d3bdec9dfba556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 18 Apr 2020 06:42:16 +0000
Subject: [PATCH 2248/3235] Translated using Weblate (French)

Currently translated at 100.0% (2291 of 2291 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 882fd7b663..cc59683030 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2390,5 +2390,9 @@
     "Enter a recovery passphrase...": "Saisir une phrase secrète de récupération…",
     "Please enter your recovery passphrase a second time to confirm.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
     "Repeat your recovery passphrase...": "Répéter votre phrase secrète de récupération…",
-    "Secure your backup with a recovery passphrase": "Protégez votre sauvegarde avec une phrase secrète de récupération"
+    "Secure your backup with a recovery passphrase": "Protégez votre sauvegarde avec une phrase secrète de récupération",
+    "Can't load this message": "Impossible de charger ce message",
+    "Submit logs": "Envoyer les journaux",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Rappel : Votre navigateur n’est pas pris en charge donc votre expérience pourrait être imprévisible.",
+    "Unable to upload": "Envoi impossible"
 }

From 60a3943587f30911bb3d7b31c54683d74b4dbf71 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 18 Apr 2020 12:57:53 +0000
Subject: [PATCH 2249/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2291 of 2291 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 | 44 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8c64fe49ba..c88d28d9c7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2344,5 +2344,47 @@
     "Confirm adding email": "E-mail hozzáadásának megerősítése",
     "Click the button below to confirm adding this email address.": "Az e-mail cím hozzáadásának megerősítéséhez kattints a gombra lent.",
     "Confirm adding phone number": "Telefonszám hozzáadásának megerősítése",
-    "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattints a gombra lent."
+    "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattints a gombra lent.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt e-mail címet hozzáadod.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt telefonszámot hozzáadod.",
+    "If you cancel now, you won't complete your operation.": "A műveletet nem fejezed be, ha ezt most megszakítod.",
+    "Failed to set topic": "A téma beállítása nem sikerült",
+    "Command failed": "A parancs nem sikerült",
+    "Could not find user in room": "A felhasználó nem található a szobában",
+    "Enable cross-signing to verify per-user instead of per-session": "A felhasználó alapú ellenőrzéshez a munkamenet alapú helyett engedélyezd az eszközök közötti hitelesítést",
+    "Keep recovery passphrase in memory for this session": "A visszaállítási jelmondat memóriában tartása ebben a munkamenetben",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Erősítsd meg az egyszeri bejelentkezéssel, hogy ezeket a munkameneteteket törlöd.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Erősítsd meg egyszeri bejelentkezéssel, hogy ezt a munkamenetet törlöd.",
+    "Can't load this message": "Ezt az üzenetet nem sikerült betölteni",
+    "Submit logs": "Napló elküldése",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Emlékeztető: A böngésződ nem támogatott, így az élmény kiszámíthatatlan lehet.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Erősítsd meg egyszeri bejelentkezéssel, hogy felfüggeszted ezt a fiókot.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Biztos, hogy felfüggeszted a fiókodat? Ezt nem lehet visszavonni.",
+    "Unable to upload": "Nem lehet feltölteni",
+    "Verify other session": "Más munkamenetek ellenőrzése",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó visszaállítási jelmondatot adtál-e meg.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Figyelmeztetés</b>: Ezt csak megbízható számítógépen tedd meg.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "A visszaállítási jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és az eszközök közötti aláírásnál használt személyazonosságodhoz hogy más munkameneteket ellenőrizhess.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ha elfelejtetted a visszaállítási jelmondatodat, akkor <button1>használhatod a visszaállítási kulcsot</button1> vagy <button2>új visszaállítási lehetőséget állíthatsz be</button2>.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezzel a visszaállítási kulccsal a mentést nem lehet visszafejteni: kérlek ellenőrizd, hogy a visszaállítási kulcsot jól adtad-e meg.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "A mentést nem lehet visszafejteni ezzel a visszaállítási jelmondattal: kérlek ellenőrizd, hogy a megfelelő visszaállítási jelmondatot adtad-e meg.",
+    "Syncing...": "Szinkronizálás…",
+    "Signing In...": "Bejelentkezés…",
+    "If you've joined lots of rooms, this might take a while": "Ha sok szobában vagy benn ez eltarthat egy darabig",
+    "Use an existing session to verify this one, granting it access to encrypted messages.": "A titkosított üzenetekhez való hozzáféréshez nyiss meg egy létező munkamenetet és használd ennek a hitelesítésére.",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Ha nem érsz el egyet sem, <button>használd a visszaállítási kulcsot vagy visszaállítási jelmondatot.</button>",
+    "Use your other device to continue…": "A folytatáshoz használd a más eszközödet…",
+    "Great! This recovery passphrase looks strong enough.": "Nagyszerű! Ez a visszaállítási jelmondat elég erősnek tűnik.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Helyezd biztonságba a titkosított információkat, hogy kijelentkezés után is vissza tudd állítani, a visszaállítási jelmondat beállításával. Ez legyen a fiók jelszótól különböző:",
+    "Enter a recovery passphrase": "Visszaállítási jelmondat megadása",
+    "Back up encrypted message keys": "Titkosított üzenetek kulcsainak mentése",
+    "Enter your recovery passphrase a second time to confirm it.": "A megerősítéshez add meg a visszaállítási jelmondatot még egyszer.",
+    "Confirm your recovery passphrase": "Visszaállítási jelmondat megerősítése",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "A visszaállítási kulcs egy biztonsági háló - arra az esetre ha elfelejted a visszaállítási jelmondatot a titkosított üzenetekhez való hozzáférést vissza tudd állítani.",
+    "Confirm recovery passphrase": "Visszaállítási jelmondat megerősítése",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "A kulcsaidat titkosított formában tároljuk a szerverünkön. Helyezd biztonságba a mentéseded a visszaállítási jelmondattal.",
+    "Enter a recovery passphrase...": "Visszaállítási jelmondat megadása…",
+    "Please enter your recovery passphrase a second time to confirm.": "A megerősítéshez kérlek add meg a visszaállítási jelmondatot még egyszer.",
+    "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
+    "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal"
 }

From 0f846bc1b68dc582d26fdc19e592cc706b7e01fa Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Sat, 18 Apr 2020 21:48:20 +0000
Subject: [PATCH 2250/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 49.3% (1130 of 2291 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index e18dafdc5d..c6772b9467 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1069,5 +1069,74 @@
     "End": "Slutt",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Hvis du støter på noen programfeil eller har tilbakemeldinger som du vil dele, vennligst fortell oss om det på GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "For å unngå å lage duplikatrapporter, vennligst <existingIssuesLink>sjekk gjennom de eksisterende sakene</existingIssuesLink> først (og gi en tommel opp), eller <newIssueLink>opprett en ny saksrapport</newIssueLink> dersom du ikke finner noen tilsvarende saker.",
-    "Report bugs & give feedback": "Meld ifra om feil og gi tilbakemeldinger"
+    "Report bugs & give feedback": "Meld ifra om feil og gi tilbakemeldinger",
+    "Enter passphrase": "Skriv inn passordfrase",
+    "(no answer)": "(intet svar)",
+    "Avoid sequences": "Unngå sekvenser",
+    "Avoid recent years": "Unngå nylige år",
+    "Failed to join room": "Mislyktes i å bli med i rommet",
+    "unknown caller": "ukjent oppringer",
+    "Cancelling…": "Avbryter …",
+    "They match": "De samsvarer",
+    "They don't match": "De samsvarer ikke",
+    "in memory": "i minnet",
+    "outdated": "utdatert",
+    "Disable Notifications": "Skru av varsler",
+    "Enable Notifications": "Skru på varsler",
+    "Delete Backup": "Slett sikkerhetskopien",
+    "Restore from Backup": "Gjenopprett fra sikkerhetskopi",
+    "Remove %(email)s?": "Vil du fjerne %(email)s?",
+    "Invalid Email Address": "Ugyldig E-postadresse",
+    "%(senderName)s uploaded a file": "%(senderName)s lastet opp en fil",
+    "Kick this user?": "Vil du sparke ut denne brukeren?",
+    "No pinned messages.": "Ingen klistrede meldinger.",
+    "Pinned Messages": "Klistrede meldinger",
+    "Unpin Message": "Avklistre meldingen",
+    "Try to join anyway": "Forsøk å bli med likevel",
+    "%(count)s unread messages including mentions.|one": "1 ulest nevnelse.",
+    "%(count)s unread messages.|other": "%(count)s uleste meldinger.",
+    "Add a topic": "Legg til et emne",
+    "Command error": "Kommandofeil",
+    "Room avatar": "Rommets avatar",
+    "Start Verification": "Begynn verifisering",
+    "Verify User": "Verifiser bruker",
+    "%(count)s verified sessions|one": "1 verifisert økt",
+    "%(count)s sessions|other": "%(count)s økter",
+    "%(count)s sessions|one": "%(count)s økt",
+    "Verify by scanning": "Verifiser med skanning",
+    "Verify by emoji": "Verifiser med emoji",
+    "Message Actions": "Meldingshandlinger",
+    "%(name)s accepted": "%(name)s aksepterte",
+    "%(name)s declined": "%(name)s avslo",
+    "%(name)s cancelled": "%(name)s avbrøt",
+    "%(name)s wants to verify": "%(name) ønsker å verifisere",
+    "Failed to copy": "Mislyktes i å kopiere",
+    "Submit logs": "Send inn loggføringer",
+    "Failed to remove widget": "Mislyktes i å fjerne modulen",
+    "Minimize apps": "Minimer apper",
+    "Maximize apps": "Maksimer apper",
+    "were invited %(count)s times|other": "ble invitert %(count)s ganger",
+    "was invited %(count)s times|other": "ble invitert %(count)s ganger",
+    "were banned %(count)s times|other": "ble bannlyst %(count)s ganger",
+    "was banned %(count)s times|other": "ble bannlyst %(count)s ganger",
+    "were unbanned %(count)s times|other": "fikk bannlysningene sine opphevet %(count)s ganger",
+    "were unbanned %(count)s times|one": "fikk bannlysningene sine opphevet",
+    "was unbanned %(count)s times|other": "fikk bannlysningen sin opphevet %(count)s ganger",
+    "was unbanned %(count)s times|one": "fikk bannlysningen sin opphevet",
+    "Clear all data": "Tøm alle data",
+    "Verify session": "Verifiser økten",
+    "Start verification": "Begynn verifisering",
+    "Upload completed": "Opplasting fullført",
+    "Unable to upload": "Mislyktes i å laste opp",
+    "Username not available": "Brukernavnet er utilgjengelig",
+    "Username available": "Brukernavnet er tilgjengelig",
+    "Unknown sessions": "Ukjente økter",
+    "Alias (optional)": "Alias (valgfritt)",
+    "Remove for everyone": "Fjern for alle",
+    "Remove for me": "Fjern for meg",
+    "Syncing...": "Synkroniserer ...",
+    "Signing In...": "Logger inn …",
+    "NOT verified": "IKKE verifisert",
+    "Calls": "Samtaler",
+    "Room List": "Romliste"
 }

From 86053ba6640c6ea798973b624f25ac6608617b3e Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Fri, 17 Apr 2020 21:42:58 +0000
Subject: [PATCH 2251/3235] Translated using Weblate (Polish)

Currently translated at 68.2% (1562 of 2291 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 | 64 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 2db9cd3ae2..7cf8a256c8 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1179,7 +1179,7 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
     "Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
-    "Your Riot is misconfigured": " Twój Riot jest źle skonfigurowany",
+    "Your Riot is misconfigured": "Twój Riot jest źle skonfigurowany",
     "Unexpected error resolving homeserver configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera domowego",
     "Unexpected error resolving identity server configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera tożsamości",
     "User %(userId)s is already in the room": "Użytkownik %(userId)s jest już w pokoju",
@@ -1448,7 +1448,7 @@
     "Create a public room": "Utwórz publiczny pokój",
     "Create a private room": "Utwórz prywatny pokój",
     "Topic (optional)": "Temat (opcjonalnie)",
-    "Make this room public": "Upublicznij ten pokój.",
+    "Make this room public": "Upublicznij ten pokój",
     "Hide advanced": "Ukryj zaawansowane",
     "Show advanced": "Pokaż zaawansowane",
     "Recent Conversations": "Najnowsze rozmowy",
@@ -1514,13 +1514,13 @@
     "Delete %(count)s sessions|one": "Usuń %(count)s sesję",
     "Manage": "Zarządzaj",
     "Enable": "Włącz",
-    "Session ID:": "Identyfikator sesji",
+    "Session ID:": "Identyfikator sesji:",
     "Session key:": "Klucz sesji:",
     "Accept all %(invitedRooms)s invites": "Zaakceptuj wszystkie zaproszenia do %(invitedRooms)s",
     "Invite only": "Tylko dla zaproszonych",
     "Close preview": "Zamknij podgląd",
     "Send a reply…": "Wyślij odpowiedź…",
-    "Send a message…": "Wyślij wiadomość",
+    "Send a message…": "Wyślij wiadomość…",
     "Verified": "Zweryfikowano",
     "Cancel search": "Anuluj wyszukiwanie",
     "Your theme": "Twój motyw",
@@ -1534,5 +1534,59 @@
     "New session": "Nowa sesja",
     "Deny": "Zabroń",
     "Email (optional)": "Adres e-mail (opcjonalnie)",
-    "Guest": "Gość"
+    "Guest": "Gość",
+    "Setting up keys": "Konfigurowanie kluczy",
+    "Verify this session": "Zweryfikuj tę sesję",
+    "Set up encryption": "Skonfiguruj szyfrowanie",
+    "%(name)s is requesting verification": "%(name)s prosi o weryfikację",
+    "Failed to set topic": "Nie udało się ustawić tematu",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmienił(a) nazwę pokoju z %(oldRoomName)s na %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s dodał(a) alternatywne adresy %(addresses)s dla tego pokoju.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s dodał(a) alternatywny adres %(addresses)s dla tego pokoju.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmienił(a) alternatywne adresy dla tego pokoju.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmienił(a) główne i alternatywne adresy dla tego pokoju.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s zmienił(a) adresy dla tego pokoju.",
+    "%(senderName)s placed a voice call.": "%(senderName)s wykonał(a) połączenie głosowe.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s wykonał(a) połączenie głosowe. (nie obsługiwane przez tę przeglądarkę)",
+    "%(senderName)s placed a video call.": "%(senderName)s wykonał(a) połączenie wideo.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s wykonał(a) połączenie wideo. (nie obsługiwane przez tę przeglądarkę)",
+    "Done": "Gotowe",
+    "The message you are trying to send is too large.": "Wiadomość, którą próbujesz wysłać jest za duża.",
+    "about a minute ago": "około minuty temu",
+    "about an hour ago": "około godziny temu",
+    "about a day ago": "około dzień temu",
+    "Support adding custom themes": "Obsługa dodawania niestandardowych motywów",
+    "Order rooms by name": "Sortuj pokoje według nazwy",
+    "Delete sessions|one": "Usuń sesję",
+    "Delete %(count)s sessions|other": "Usuń %(count)s sesji",
+    "Share": "Udostępnij",
+    "Bold": "Pogrubienie",
+    "Italics": "Kursywa",
+    "Strikethrough": "Przekreślenie",
+    "Recent rooms": "Ostatnie pokoje",
+    "Reason: %(reason)s": "Powód: %(reason)s",
+    "Reject & Ignore user": "Odrzuć i zignoruj użytkownika",
+    "Show image": "Pokaż obraz",
+    "Verify session": "Zweryfikuj sesję",
+    "Loading session info...": "Ładowanie informacji o sesji…",
+    "Upload completed": "Przesyłanie zakończone",
+    "Message edits": "Edycje wiadomości",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jeśli napotkasz jakieś błędy lub masz opinię, którą chcesz się podzielić, daj nam znać na GitHubie.",
+    "Terms of Service": "Warunki użytkowania",
+    "Upload %(count)s other files|other": "Prześlij %(count)s innych plików",
+    "Upload %(count)s other files|one": "Prześlij %(count)s inny plik",
+    "Send a Direct Message": "Wyślij wiadomość bezpośrednią",
+    "Explore Public Rooms": "Przeglądaj publiczne pokoje",
+    "Create a Group Chat": "Utwórz czat grupowy",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "<a>Log in</a> to your new account.": "<a>Zaloguj się</a> do nowego konta.",
+    "Registration Successful": "Pomyślnie zarejestrowano",
+    "DuckDuckGo Results": "Wyniki z DuckDuckGo",
+    "Enter your account password to confirm the upgrade:": "Wprowadź hasło do konta, aby potwierdzić aktualizację:",
+    "You're done!": "Jesteś gotów!",
+    "Autocomplete": "Autouzupełnienie",
+    "Toggle Bold": "Przełącz pogrubienie",
+    "Toggle Italics": "Przełącz kursywę",
+    "Toggle Quote": "Przełącz cytowanie",
+    "Cancel autocomplete": "Anuluj autouzupełnienie"
 }

From 3bc5a0a0b2430589193ebe172750360797528ec3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Apr 2020 12:06:56 +0100
Subject: [PATCH 2252/3235] Convert submit-rageshake to typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |  1 +
 src/@types/global.d.ts                        | 40 +++++++++++++++++++
 ...ubmit-rageshake.js => submit-rageshake.ts} | 27 ++++++++-----
 yarn.lock                                     |  5 +++
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 src/@types/global.d.ts
 rename src/rageshake/{submit-rageshake.js => submit-rageshake.ts} (85%)

diff --git a/package.json b/package.json
index 7ba69c4272..0e1909f3e3 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,7 @@
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
     "@types/classnames": "^2.2.10",
+    "@types/modernizr": "^3.5.3",
     "@types/react": "16.9",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
new file mode 100644
index 0000000000..1931c0b1d0
--- /dev/null
+++ b/src/@types/global.d.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as ModernizrStatic from "modernizr";
+
+declare global {
+    interface Window {
+        Modernizr: ModernizrStatic;
+        Olm: {
+            init: () => Promise<void>;
+        };
+    }
+
+    // workaround for https://github.com/microsoft/TypeScript/issues/30933
+    interface ObjectConstructor {
+        fromEntries?(xs: [string|number|symbol, any][]): object
+    }
+
+    interface Document {
+        // https://developer.mozilla.org/en-US/docs/Web/API/Document/hasStorageAccess
+        hasStorageAccess?: () => Promise<boolean>;
+    }
+
+    interface StorageEstimate {
+        usageDetails?: {[key: string]: number};
+    }
+}
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.ts
similarity index 85%
rename from src/rageshake/submit-rageshake.js
rename to src/rageshake/submit-rageshake.ts
index 55c89427c5..921f3fbf40 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.ts
@@ -33,6 +33,13 @@ if (!TextEncoder) {
     TextEncoder = TextEncodingUtf8.TextEncoder;
 }
 
+interface IOpts {
+    label?: string;
+    userText?: string;
+    sendLogs?: boolean;
+    progressCallback?: (string) => void;
+}
+
 /**
  * Send a bug report.
  *
@@ -48,7 +55,7 @@ if (!TextEncoder) {
  *
  * @return {Promise} Resolved when the bug report is sent.
  */
-export default async function sendBugReport(bugReportEndpoint, opts) {
+export default async function sendBugReport(bugReportEndpoint: string, opts: IOpts) {
     if (!bugReportEndpoint) {
         throw new Error("No bug report endpoint has been set.");
     }
@@ -70,13 +77,13 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     let installedPWA = "UNKNOWN";
     try {
         // Known to work at least for desktop Chrome
-        installedPWA = window.matchMedia('(display-mode: standalone)').matches;
-    } catch (e) { }
+        installedPWA = String(window.matchMedia('(display-mode: standalone)').matches);
+    } catch (e) {}
 
     let touchInput = "UNKNOWN";
     try {
         // MDN claims broad support across browsers
-        touchInput = window.matchMedia('(pointer: coarse)').matches;
+        touchInput = String(window.matchMedia('(pointer: coarse)').matches);
     } catch (e) { }
 
     const client = MatrixClientPeg.get();
@@ -118,21 +125,21 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     // add storage persistence/quota information
     if (navigator.storage && navigator.storage.persisted) {
         try {
-            body.append("storageManager_persisted", await navigator.storage.persisted());
+            body.append("storageManager_persisted", String(await navigator.storage.persisted()));
         } catch (e) {}
     } else if (document.hasStorageAccess) { // Safari
         try {
-            body.append("storageManager_persisted", await document.hasStorageAccess());
+            body.append("storageManager_persisted", String(await document.hasStorageAccess()));
         } catch (e) {}
     }
     if (navigator.storage && navigator.storage.estimate) {
         try {
             const estimate = await navigator.storage.estimate();
-            body.append("storageManager_quota", estimate.quota);
-            body.append("storageManager_usage", estimate.usage);
+            body.append("storageManager_quota", String(estimate.quota));
+            body.append("storageManager_usage", String(estimate.usage));
             if (estimate.usageDetails) {
                 Object.keys(estimate.usageDetails).forEach(k => {
-                    body.append(`storageManager_usage_${k}`, estimate.usageDetails[k]);
+                    body.append(`storageManager_usage_${k}`, String(estimate.usageDetails[k]));
                 });
             }
         } catch (e) {}
@@ -163,7 +170,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
     await _submitReport(bugReportEndpoint, body, progressCallback);
 }
 
-function _submitReport(endpoint, body, progressCallback) {
+function _submitReport(endpoint: string, body: FormData, progressCallback: (string) => void) {
     return new Promise((resolve, reject) => {
         const req = new XMLHttpRequest();
         req.open("POST", endpoint);
diff --git a/yarn.lock b/yarn.lock
index c42828e461..c601e37340 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1257,6 +1257,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/modernizr@^3.5.3":
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/@types/modernizr/-/modernizr-3.5.3.tgz#8ef99e6252191c1d88647809109dc29884ba6d7a"
+  integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
+
 "@types/node@*":
   version "13.11.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"

From 170d10a1a6d1d66116a4a020a6f6b2c6e53f7cbe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Apr 2020 12:09:07 +0100
Subject: [PATCH 2253/3235] Add rageshake slash command

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 71815dde8c..68bbfa97f3 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -35,6 +35,8 @@ import { abbreviateUrl } from './utils/UrlUtils';
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/IdentityServerUtils';
 import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
 import {inviteUsersToRoom} from "./RoomInvite";
+import sendBugReport from "./rageshake/submit-rageshake";
+import SdkConfig from "./SdkConfig";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -912,6 +914,19 @@ export const Commands = [
         },
         category: CommandCategories.advanced,
     }),
+    new Command({
+        command: "rageshake",
+        aliases: ["bugreport"],
+        description: _td("Send a bug report with logs"),
+        args: "<description>",
+        runFn: function(roomId, args) {
+            return success(sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
+                userText: args,
+                sendLogs: true,
+            }));
+        },
+        category: CommandCategories.advanced,
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes

From d0410ade5e222b6832e9d949ac9c8f8512a533a0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Apr 2020 12:11:40 +0100
Subject: [PATCH 2254/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0cf2944116..a9076a77a2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -216,6 +216,7 @@
     "Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
     "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
     "Displays information about a user": "Displays information about a user",
+    "Send a bug report with logs": "Send a bug report with logs",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",

From 881848b98b54e8ea921af0a7746c40ca85dd2185 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Apr 2020 12:19:31 +0100
Subject: [PATCH 2255/3235] Add modal to confirm that rageshake from cmd was
 sent

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx       | 16 ++++++++++++----
 src/i18n/strings/en_EN.json |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 68bbfa97f3..76472e4d66 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -920,10 +920,18 @@ export const Commands = [
         description: _td("Send a bug report with logs"),
         args: "<description>",
         runFn: function(roomId, args) {
-            return success(sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
-                userText: args,
-                sendLogs: true,
-            }));
+            return success(
+                sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
+                    userText: args,
+                    sendLogs: true,
+                }).then(() => {
+                    const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
+                    Modal.createTrackedDialog('Slash Commands', 'Rageshake sent', InfoDialog, {
+                        title: _t('Logs sent'),
+                        description: _t('Thank you!'),
+                    });
+                }),
+            );
         },
         category: CommandCategories.advanced,
     }),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a9076a77a2..6ed89e927d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -217,6 +217,8 @@
     "Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
     "Displays information about a user": "Displays information about a user",
     "Send a bug report with logs": "Send a bug report with logs",
+    "Logs sent": "Logs sent",
+    "Thank you!": "Thank you!",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -1528,8 +1530,6 @@
     "Close dialog": "Close dialog",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
     "Preparing to send logs": "Preparing to send logs",
-    "Logs sent": "Logs sent",
-    "Thank you!": "Thank you!",
     "Failed to send logs: ": "Failed to send logs: ",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
     "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.": "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.",

From 972baa881b08c6286609beedbb724eb1e2db0e51 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 19 Apr 2020 19:14:08 -0600
Subject: [PATCH 2256/3235] Revert "Fix Filepanel scroll position state lost
 when room is changed"

---
 src/components/structures/FilePanel.js | 44 +-------------------------
 src/components/structures/RoomView.js  |  4 +--
 src/stores/RoomScrollStateStore.js     | 19 +++--------
 3 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f073785df3..f8c03be864 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -25,8 +25,6 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
-import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
-
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
@@ -43,8 +41,6 @@ const FilePanel = createReactClass({
     getInitialState: function() {
         return {
             timelineSet: null,
-            initialEventId: null,
-            initialEventPixelOffset: null,
         };
     },
 
@@ -88,16 +84,6 @@ const FilePanel = createReactClass({
 
         await this.updateTimelineSet(this.props.roomId);
 
-        if (this.props.roomId) {
-            const filePanelScrollState = RoomScrollStateStore.getFilePanelScrollState(this.props.roomId);
-            if (filePanelScrollState) {
-                this.setState({
-                    initialEventId: filePanelScrollState.focussedEvent,
-                    initialEventPixelOffset: filePanelScrollState.pixelOffset,
-                });
-            }
-        }
-
         if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
 
         // The timelineSets filter makes sure that encrypted events that contain
@@ -115,10 +101,6 @@ const FilePanel = createReactClass({
     },
 
     componentWillUnmount() {
-        if (this.props.roomId) {
-            RoomScrollStateStore.setFilePanelScrollState(this.props.roomId, this._getScrollState());
-        }
-
         const client = MatrixClientPeg.get();
         if (client === null) return;
 
@@ -208,26 +190,6 @@ const FilePanel = createReactClass({
         }
     },
 
-    _getScrollState: function() {
-        const timelinePanel = this._timelinePanel;
-        const scrollState = timelinePanel.getScrollState();
-
-        if (!timelinePanel) return null;
-
-        if (!scrollState || scrollState.stuckAtBottom) {
-            return null;
-        }
-
-        return {
-            focussedEvent: scrollState.trackedScrollToken,
-            pixelOffset: scrollState.pixelOffset,
-        };
-    },
-
-    _getTimelinePanelRef: function(ref) {
-        this._timelinePanel = ref;
-    },
-
     render: function() {
         if (MatrixClientPeg.get().isGuest()) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
@@ -253,15 +215,11 @@ const FilePanel = createReactClass({
             //             "(" + this.state.timelineSet._timelines.join(", ") + ")" + " with key " + this.props.roomId);
             return (
                 <div className="mx_FilePanel" role="tabpanel">
-                    <TimelinePanel
-                        ref={this._getTimelinePanelRef}
-                        key={"filepanel_" + this.props.roomId}
+                    <TimelinePanel key={"filepanel_" + this.props.roomId}
                         manageReadReceipts={false}
                         manageReadMarkers={false}
                         timelineSet={this.state.timelineSet}
                         showUrlPreview = {false}
-                        eventId={this.state.initialEventId}
-                        eventPixelOffset={this.state.initialEventPixelOffset}
                         onPaginationRequest={this.onPaginationRequest}
                         tileShape="file_grid"
                         resizeNotifier={this.props.resizeNotifier}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e68d4b96dd..179e0aa2e9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -269,7 +269,7 @@ export default createReactClass({
             // If an event ID wasn't specified, default to the one saved for this room
             // in the scroll state store. Assume initialEventPixelOffset should be set.
             if (!newState.initialEventId) {
-                const roomScrollState = RoomScrollStateStore.getRoomViewScrollState(newState.roomId);
+                const roomScrollState = RoomScrollStateStore.getScrollState(newState.roomId);
                 if (roomScrollState) {
                     newState.initialEventId = roomScrollState.focussedEvent;
                     newState.initialEventPixelOffset = roomScrollState.pixelOffset;
@@ -466,7 +466,7 @@ export default createReactClass({
 
         // update the scroll map before we get unmounted
         if (this.state.roomId) {
-            RoomScrollStateStore.setRoomViewScrollState(this.state.roomId, this._getScrollState());
+            RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
         }
 
         if (this.state.shouldPeek) {
diff --git a/src/stores/RoomScrollStateStore.js b/src/stores/RoomScrollStateStore.js
index 9d48a7cc85..07848283d1 100644
--- a/src/stores/RoomScrollStateStore.js
+++ b/src/stores/RoomScrollStateStore.js
@@ -32,24 +32,15 @@ class RoomScrollStateStore {
         //
         //    pixelOffset: the number of pixels the window is scrolled down
         //        from the focussedEvent.
-        this._RoomViewScrollStateMap = {};
-        this._FilePanelScrollStateMap = {};
+        this._scrollStateMap = {};
     }
 
-    getRoomViewScrollState(roomId) {
-        return this._RoomViewScrollStateMap[roomId];
+    getScrollState(roomId) {
+        return this._scrollStateMap[roomId];
     }
 
-    setRoomViewScrollState(roomId, scrollState) {
-        this._RoomViewScrollStateMap[roomId] = scrollState;
-    }
-
-    getFilePanelScrollState(roomId, scrollState) {
-        return this._FilePanelScrollStateMap[roomId];
-    }
-
-    setFilePanelScrollState(roomId, scrollState) {
-        this._FilePanelScrollStateMap[roomId] = scrollState;
+    setScrollState(roomId, scrollState) {
+        this._scrollStateMap[roomId] = scrollState;
     }
 }
 

From ea68de4e731140122b9eb47edb86bba9b823cfd4 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 20 Apr 2020 00:17:55 +0000
Subject: [PATCH 2257/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2291 of 2291 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 bdf410f9e7..1f137b2e76 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2393,5 +2393,6 @@
     "Can't load this message": "無法載入此訊息",
     "Submit logs": "遞交紀錄檔",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "注意：您的瀏覽器不受支援，所以您的使用體驗可能無法預測。",
-    "Unable to upload": "無法上傳"
+    "Unable to upload": "無法上傳",
+    "Currently indexing: %(currentRoom)s": "目前正在建立索引：%(currentRoom)s"
 }

From 3dfab8ad8c7499986a3b2c17d8b2563e49ea94a7 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 19 Apr 2020 15:53:51 +0000
Subject: [PATCH 2258/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2291 of 2291 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 c88d28d9c7..94430f843d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2386,5 +2386,6 @@
     "Enter a recovery passphrase...": "Visszaállítási jelmondat megadása…",
     "Please enter your recovery passphrase a second time to confirm.": "A megerősítéshez kérlek add meg a visszaállítási jelmondatot még egyszer.",
     "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
-    "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal"
+    "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal",
+    "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s"
 }

From 343319db50f8f6cfe04f487af6ea7c2a617186d8 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Sun, 19 Apr 2020 11:26:27 +0000
Subject: [PATCH 2259/3235] Translated using Weblate (Russian)

Currently translated at 89.6% (2052 of 2291 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 4a0d819287..d44dc351a0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1720,7 +1720,7 @@
     "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии",
     "The version of Riot": "Версия Riot",
     "Show typing notifications": "Показывать уведомления о наборе",
-    "Delete %(count)s sessions|other": "Удалить %(count)s сессию",
+    "Delete %(count)s sessions|other": "Удалить %(count)s сессий",
     "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
     "Enable audible notifications for this session": "Включить звуковые уведомления для этой сессии",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и стикерами.",
@@ -1892,7 +1892,7 @@
     "Connecting to integration manager...": "Подключение к менеджеру интеграций...",
     "Cannot connect to integration manager": "Не удалось подключиться к менеджеру интеграций",
     "The integration manager is offline or it cannot reach your homeserver.": "Менеджер интеграций не работает или не может подключиться к вашему домашнему серверу.",
-    "This session is backing up your keys. ": "Эта сессия сохраняет ваши ключи. ",
+    "This session is backing up your keys. ": "Эта сессия сохраняет резервную копию ваших ключей. ",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Эта сессия <b>не сохраняет ваши ключи</b>, но у вас есть резервная копия, из которой вы можете их восстановить.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Подключите эту сессию к резервированию ключей до выхода, чтобы избежать утраты ключей, которые могут быть доступны только в этой сессии.",
     "Connect this session to Key Backup": "Подключить эту сессию к резервированию ключей",

From 6084c08f345fcdebf4302091f24d7b49ccaa143e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Apr 2020 10:02:40 +0200
Subject: [PATCH 2260/3235] EventIndex: Filter out events that don't have a
 propper content value.

---
 src/indexing/EventIndex.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index e4e8f26031..c09fc73a58 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -275,6 +275,7 @@ export default class EventIndex extends EventEmitter {
         const validEventType = isUsefulType && !ev.isRedacted() && !ev.isDecryptionFailure();
 
         let validMsgType = true;
+        let hasContentValue = true;
 
         if (ev.getType() === "m.room.message" && !ev.isRedacted()) {
             // Expand this if there are more invalid msgtypes.
@@ -282,9 +283,15 @@ export default class EventIndex extends EventEmitter {
 
             if (!msgtype) validMsgType = false;
             else validMsgType = !msgtype.startsWith("m.key.verification");
+
+            if (!ev.getContent().body) hasContentValue = false
+        } else if (ev.getType() === "m.room.topic" && !ev.isRedacted()) {
+            if (!ev.getContent().topic) hasContentValue = false;
+        } else if (ev.getType() === "m.room.name" && !ev.isRedacted()) {
+            if (!ev.getContent().name) hasContentValue = false;
         }
 
-        return validEventType && validMsgType;
+        return validEventType && validMsgType && hasContentValue;
     }
 
     /**

From 3781bdc9758ddb54f9eacc6f56784b0d64d8ca01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Apr 2020 10:10:16 +0200
Subject: [PATCH 2261/3235] EventIndex: Add a missing semicolon.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c09fc73a58..a6bbbb5f96 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -284,7 +284,7 @@ export default class EventIndex extends EventEmitter {
             if (!msgtype) validMsgType = false;
             else validMsgType = !msgtype.startsWith("m.key.verification");
 
-            if (!ev.getContent().body) hasContentValue = false
+            if (!ev.getContent().body) hasContentValue = false;
         } else if (ev.getType() === "m.room.topic" && !ev.isRedacted()) {
             if (!ev.getContent().topic) hasContentValue = false;
         } else if (ev.getType() === "m.room.name" && !ev.isRedacted()) {

From 894968ac71d19c7a0baf2378eac644bcdd303fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Mon, 20 Apr 2020 06:31:12 +0000
Subject: [PATCH 2262/3235] Translated using Weblate (French)

Currently translated at 100.0% (2291 of 2291 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 cc59683030..6b5105226c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2394,5 +2394,6 @@
     "Can't load this message": "Impossible de charger ce message",
     "Submit logs": "Envoyer les journaux",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Rappel : Votre navigateur n’est pas pris en charge donc votre expérience pourrait être imprévisible.",
-    "Unable to upload": "Envoi impossible"
+    "Unable to upload": "Envoi impossible",
+    "Currently indexing: %(currentRoom)s": "En train d’indexer : %(currentRoom)s"
 }

From 161203d4458bb8a8aa779614571863f1c478155e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Apr 2020 10:02:40 +0200
Subject: [PATCH 2263/3235] EventIndex: Filter out events that don't have a
 propper content value.

(cherry picked from commit 6084c08f345fcdebf4302091f24d7b49ccaa143e)
---
 src/indexing/EventIndex.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index e4e8f26031..c09fc73a58 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -275,6 +275,7 @@ export default class EventIndex extends EventEmitter {
         const validEventType = isUsefulType && !ev.isRedacted() && !ev.isDecryptionFailure();
 
         let validMsgType = true;
+        let hasContentValue = true;
 
         if (ev.getType() === "m.room.message" && !ev.isRedacted()) {
             // Expand this if there are more invalid msgtypes.
@@ -282,9 +283,15 @@ export default class EventIndex extends EventEmitter {
 
             if (!msgtype) validMsgType = false;
             else validMsgType = !msgtype.startsWith("m.key.verification");
+
+            if (!ev.getContent().body) hasContentValue = false
+        } else if (ev.getType() === "m.room.topic" && !ev.isRedacted()) {
+            if (!ev.getContent().topic) hasContentValue = false;
+        } else if (ev.getType() === "m.room.name" && !ev.isRedacted()) {
+            if (!ev.getContent().name) hasContentValue = false;
         }
 
-        return validEventType && validMsgType;
+        return validEventType && validMsgType && hasContentValue;
     }
 
     /**

From 212c3ca46cb784998b18d3a12ed864e23565de63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 20 Apr 2020 10:10:16 +0200
Subject: [PATCH 2264/3235] EventIndex: Add a missing semicolon.

(cherry picked from commit 3781bdc9758ddb54f9eacc6f56784b0d64d8ca01)
---
 src/indexing/EventIndex.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index c09fc73a58..a6bbbb5f96 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -284,7 +284,7 @@ export default class EventIndex extends EventEmitter {
             if (!msgtype) validMsgType = false;
             else validMsgType = !msgtype.startsWith("m.key.verification");
 
-            if (!ev.getContent().body) hasContentValue = false
+            if (!ev.getContent().body) hasContentValue = false;
         } else if (ev.getType() === "m.room.topic" && !ev.isRedacted()) {
             if (!ev.getContent().topic) hasContentValue = false;
         } else if (ev.getType() === "m.room.name" && !ev.isRedacted()) {

From 4494c6cf2bfc96a17c319ce8d8d2ffef7d88abb2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 11:21:51 +0100
Subject: [PATCH 2265/3235] ImageView make clicking off it easier

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_ImageView.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 0a4ed2a194..983ef074f2 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -37,7 +37,7 @@ limitations under the License.
     order: 2;
     /* min-width hack needed for FF */
     min-width: 0px;
-    height: 90%;
+    max-height: 90%;
     flex: 15 15 0;
     display: flex;
     align-items: center;

From 50cc44f0c4e632490f290873b676785a7d8e4648 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Apr 2020 14:16:34 +0100
Subject: [PATCH 2266/3235] Fix CSS class in ButtonPlaceholder

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

diff --git a/src/components/views/elements/ButtonPlaceholder.js b/src/components/views/elements/ButtonPlaceholder.js
index 9c40df9db6..6501429e65 100644
--- a/src/components/views/elements/ButtonPlaceholder.js
+++ b/src/components/views/elements/ButtonPlaceholder.js
@@ -15,5 +15,5 @@ limitations under the License.
 */
 
 export default function ButtonPlaceholder(props) {
-    return <div class="mx_ButtonPlaceholder">{props.children}</div>;
+    return <div className="mx_ButtonPlaceholder">{props.children}</div>;
 }

From 2546e23a3e63b312c721bee9a82f3d68d548a938 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Apr 2020 14:36:15 +0100
Subject: [PATCH 2267/3235] Don't recheck DeviceListener until after initial
 sync is finished

Each recheck caused a GET to account data to see if the master key
exists if done before the initial sync, which is unnecessary here.
This just makes it wait until the initial sync is done to recheck.

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 3201e4af45..4ec2ec0fa0 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -52,6 +52,7 @@ export default class DeviceListener {
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
         MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
         MatrixClientPeg.get().on('accountData', this._onAccountData);
+        MatrixClientPeg.get().on('sync', this._onSync);
         this._recheck();
     }
 
@@ -62,6 +63,7 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
             MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
             MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
+            MatrixClientPeg.get().removeListener('sync', this._onSync);
         }
         this._dismissed.clear();
     }
@@ -109,6 +111,10 @@ export default class DeviceListener {
         }
     }
 
+    _onSync = (state, prevState) => {
+        if (state === 'PREPARED' && prevState === null) this._recheck();
+    }
+
     // The server doesn't tell us when key backup is set up, so we poll
     // & cache the result
     async _getKeyBackupInfo() {
@@ -129,6 +135,10 @@ export default class DeviceListener {
         ) return;
 
         if (!cli.isCryptoEnabled()) return;
+        // don't recheck until the initial sync is complete: lots of account data events will fire
+        // while the initial sync is processing and we don't need to recheck on each one of them
+        // (we add a listener on sync to do once check after the initial sync is done)
+        if (!cli.isInitialSyncComplete()) return;
 
         const crossSigningReady = await cli.isCrossSigningReady();
 

From 0070723df64b69ad5c7043fb516264c33c696628 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 20 Apr 2020 13:33:57 +0000
Subject: [PATCH 2268/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2292 of 2292 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 94430f843d..3cff0a013e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2387,5 +2387,6 @@
     "Please enter your recovery passphrase a second time to confirm.": "A megerősítéshez kérlek add meg a visszaállítási jelmondatot még egyszer.",
     "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
     "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal",
-    "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s",
+    "Send a bug report with logs": "Hibajelentés beküldése naplóval"
 }

From 9d9b80e9c144b5939998d1bfd5e546192f8f13a3 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Mon, 20 Apr 2020 13:57:48 +0000
Subject: [PATCH 2269/3235] Translated using Weblate (Russian)

Currently translated at 89.6% (2053 of 2292 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 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d44dc351a0..0ad385b607 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -956,7 +956,7 @@
     "All-uppercase is almost as easy to guess as all-lowercase": "Всё прописными буквами так же легко угадывается как и всё строчными",
     "Reversed words aren't much harder to guess": "Угадать перевёрнутые слова не сильно труднее",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Предсказуемые замены типа «@» вместо «a» не особо помогают",
-    "Add another word or two. Uncommon words are better.": "Добавить другое слово или два. Необычные слова лучше.",
+    "Add another word or two. Uncommon words are better.": "Добавьте ещё одно-два слова. Лучше использовать редкие слова.",
     "Repeats like \"aaa\" are easy to guess": "Повторы типа \"ааа\" легко угадываемы",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Повторы типа «abcabcabc», лишь немного сложнее угадать, чем «abc»",
     "Sequences like abc or 6543 are easy to guess": "Последовательности типа abc или 6543 легко угадываемы",
@@ -1450,15 +1450,15 @@
     "For maximum security, this should be different from your account password.": "Для максимальной безопасности он должен отличаться от пароля вашей учётной записи.",
     "Enter a passphrase...": "Введите пароль....",
     "Set up with a Recovery Key": "Настройка с ключом восстановления",
-    "That matches!": "Это совпадает!",
-    "That doesn't match.": "Это не совпадает.",
+    "That matches!": "Они совпадают!",
+    "That doesn't match.": "Они не совпадают.",
     "Uploaded sound": "Загруженный звук",
     "Sounds": "Звук",
     "Notification sound": "Звук уведомления",
     "Reset": "Сброс",
     "Set a new custom sound": "Установка нового пользовательского звука",
     "Browse": "Просматривать",
-    "Go back to set it again.": "Вернитесь, чтобы установить его снова.",
+    "Go back to set it again.": "Задать другой пароль.",
     "Please enter your passphrase a second time to confirm.": "Пожалуйста, введите ваш пароль еще раз для подтверждения.",
     "Repeat your passphrase...": "Повторите ваш пароль...",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений, если вы забыли свой пароль восстановления.",
@@ -2107,5 +2107,6 @@
     "Command failed": "Не удалось выполнить команду",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Начните диалог с кем-нибудь по его имени, имени пользователя (например, <userId/>) или адресу почты."
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Начните диалог с кем-нибудь по его имени, имени пользователя (например, <userId/>) или адресу почты.",
+    "Great! This recovery passphrase looks strong enough.": "Отлично! Этот пароль восстановления достаточно надёжен."
 }

From 13cb49bb0d48ee0c090a708be262c64ccd4626d5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Apr 2020 14:36:15 +0100
Subject: [PATCH 2270/3235] Don't recheck DeviceListener until after initial
 sync is finished

Each recheck caused a GET to account data to see if the master key
exists if done before the initial sync, which is unnecessary here.
This just makes it wait until the initial sync is done to recheck.

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 3201e4af45..4ec2ec0fa0 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -52,6 +52,7 @@ export default class DeviceListener {
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
         MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
         MatrixClientPeg.get().on('accountData', this._onAccountData);
+        MatrixClientPeg.get().on('sync', this._onSync);
         this._recheck();
     }
 
@@ -62,6 +63,7 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
             MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
             MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
+            MatrixClientPeg.get().removeListener('sync', this._onSync);
         }
         this._dismissed.clear();
     }
@@ -109,6 +111,10 @@ export default class DeviceListener {
         }
     }
 
+    _onSync = (state, prevState) => {
+        if (state === 'PREPARED' && prevState === null) this._recheck();
+    }
+
     // The server doesn't tell us when key backup is set up, so we poll
     // & cache the result
     async _getKeyBackupInfo() {
@@ -129,6 +135,10 @@ export default class DeviceListener {
         ) return;
 
         if (!cli.isCryptoEnabled()) return;
+        // don't recheck until the initial sync is complete: lots of account data events will fire
+        // while the initial sync is processing and we don't need to recheck on each one of them
+        // (we add a listener on sync to do once check after the initial sync is done)
+        if (!cli.isInitialSyncComplete()) return;
 
         const crossSigningReady = await cli.isCrossSigningReady();
 

From 36f154f2b20e528fb2e14ba00373af0bdd743028 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 20 Apr 2020 09:35:35 -0600
Subject: [PATCH 2271/3235] Name Jitsi correctly in args

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/SlashCommands.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index f91f5d23d9..d061dbed60 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -771,7 +771,7 @@ export const Commands = [
     }),
     new Command({
         command: 'addwidget',
-        args: '<url | embed code | jitsi url>',
+        args: '<url | embed code | Jitsi url>',
         description: _td('Adds a custom widget by URL to the room'),
         runFn: function(roomId, widgetUrl) {
             if (!widgetUrl) {

From 58c8f2188a51c7cd227c287c6c209b066c87e13e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Apr 2020 18:10:23 +0100
Subject: [PATCH 2272/3235] Handle load error in create secret storage dialog

---
 .../CreateSecretStorageDialog.js              | 78 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  3 +-
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index a2aa4f27e8..c5c734a813 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -27,14 +27,15 @@ import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 import {copyNode} from "../../../../utils/strings";
 
 const PHASE_LOADING = 0;
-const PHASE_MIGRATE = 1;
-const PHASE_PASSPHRASE = 2;
-const PHASE_PASSPHRASE_CONFIRM = 3;
-const PHASE_SHOWKEY = 4;
-const PHASE_KEEPITSAFE = 5;
-const PHASE_STORING = 6;
-const PHASE_DONE = 7;
-const PHASE_CONFIRM_SKIP = 8;
+const PHASE_LOADERROR = 1;
+const PHASE_MIGRATE = 2;
+const PHASE_PASSPHRASE = 3;
+const PHASE_PASSPHRASE_CONFIRM = 4;
+const PHASE_SHOWKEY = 5;
+const PHASE_KEEPITSAFE = 6;
+const PHASE_STORING = 7;
+const PHASE_DONE = 8;
+const PHASE_CONFIRM_SKIP = 9;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -95,25 +96,29 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     async _fetchBackupInfo() {
-        const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-        const backupSigStatus = (
-            // we may not have started crypto yet, in which case we definitely don't trust the backup
-            MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
-        );
+        try {
+            const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            const backupSigStatus = (
+                // we may not have started crypto yet, in which case we definitely don't trust the backup
+                MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
+            );
 
-        const { force } = this.props;
-        const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
+            const { force } = this.props;
+            const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
 
-        this.setState({
-            phase,
-            backupInfo,
-            backupSigStatus,
-        });
+            this.setState({
+                phase,
+                backupInfo,
+                backupSigStatus,
+            });
 
-        return {
-            backupInfo,
-            backupSigStatus,
-        };
+            return {
+                backupInfo,
+                backupSigStatus,
+            };
+        } catch (e) {
+            this.setState({phase: PHASE_LOADERROR});
+        }
     }
 
     async _queryKeyUploadAuth() {
@@ -124,8 +129,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // no keys which would be a no-op.
             console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
         } catch (error) {
-            if (!error.data.flows) {
+            if (!error.data || !error.data.flows) {
                 console.log("uploadDeviceSigningKeys advertised no flows!");
+                return;
             }
             const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
                 return f.stages.length === 1 && f.stages[0] === 'm.login.password';
@@ -296,6 +302,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     }
 
+    _onLoadRetryClick = () => {
+        this.setState({phase: PHASE_LOADING});
+        this._fetchBackupInfo();
+    }
+
     _onSkipSetupClick = () => {
         this.setState({phase: PHASE_CONFIRM_SKIP});
     }
@@ -666,6 +677,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         </div>;
     }
 
+    _renderPhaseLoadError() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>{_t("Unable to query secret storage status")}</p>
+            <div className="mx_Dialog_buttons">
+                <DialogButtons primaryButton={_t('Retry')}
+                    onPrimaryButtonClick={this._onLoadRetryClick}
+                    hasCancel={true}
+                    onCancel={this._onCancel}
+                />
+            </div>
+        </div>;
+    }
+
     _renderPhaseDone() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
@@ -739,6 +764,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_LOADING:
                     content = this._renderBusyPhase();
                     break;
+                case PHASE_LOADERROR:
+                    content = this._renderPhaseLoadError();
+                    break;
                 case PHASE_MIGRATE:
                     content = this._renderPhaseMigrate();
                     break;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6ed89e927d..dceaf563ec 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2203,13 +2203,14 @@
     "<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",
+    "Unable to query secret storage status": "Unable to query secret storage status",
+    "Retry": "Retry",
     "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
     "Confirm recovery passphrase": "Confirm recovery passphrase",
     "Make a copy of your recovery key": "Make a copy of your recovery key",
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
-    "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
     "Enter a recovery passphrase...": "Enter a recovery passphrase...",

From fced4ea51e02d979463201500bacb596cec3a6be Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 19:00:54 +0100
Subject: [PATCH 2273/3235] Convert autocomplete stuff to TypeScript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx                         |   2 +-
 ...teProvider.js => AutocompleteProvider.tsx} |  23 +++-
 .../{Autocompleter.js => Autocompleter.ts}    |  46 +++++---
 ...CommandProvider.js => CommandProvider.tsx} |  12 +-
 ...unityProvider.js => CommunityProvider.tsx} |  11 +-
 .../{Components.js => Components.tsx}         |  51 ++++++---
 ...ckGoProvider.js => DuckDuckGoProvider.tsx} |  10 +-
 .../{EmojiProvider.js => EmojiProvider.tsx}   |  46 +++++---
 .../{NotifProvider.js => NotifProvider.tsx}   |  11 +-
 .../{QueryMatcher.js => QueryMatcher.ts}      |  21 +++-
 .../{RoomProvider.js => RoomProvider.tsx}     |  11 +-
 .../{UserProvider.js => UserProvider.tsx}     |  45 ++++----
 .../{Autocomplete.js => Autocomplete.tsx}     | 103 +++++++++++-------
 tsconfig.json                                 |   1 +
 14 files changed, 251 insertions(+), 142 deletions(-)
 rename src/autocomplete/{AutocompleteProvider.js => AutocompleteProvider.tsx} (82%)
 rename src/autocomplete/{Autocompleter.js => Autocompleter.ts} (70%)
 rename src/autocomplete/{CommandProvider.js => CommandProvider.tsx} (89%)
 rename src/autocomplete/{CommunityProvider.js => CommunityProvider.tsx} (91%)
 rename src/autocomplete/{Components.js => Components.tsx} (70%)
 rename src/autocomplete/{DuckDuckGoProvider.js => DuckDuckGoProvider.tsx} (90%)
 rename src/autocomplete/{EmojiProvider.js => EmojiProvider.tsx} (83%)
 rename src/autocomplete/{NotifProvider.js => NotifProvider.tsx} (86%)
 rename src/autocomplete/{QueryMatcher.js => QueryMatcher.ts} (89%)
 rename src/autocomplete/{RoomProvider.js => RoomProvider.tsx} (92%)
 rename src/autocomplete/{UserProvider.js => UserProvider.tsx} (84%)
 rename src/components/views/rooms/{Autocomplete.js => Autocomplete.tsx} (80%)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 5e8c1087f7..6db683d339 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -84,7 +84,7 @@ interface ICommandOpts {
     hideCompletionAfterSpace?: boolean;
 }
 
-class Command {
+export class Command {
     command: string;
     aliases: string[];
     args: undefined | string;
diff --git a/src/autocomplete/AutocompleteProvider.js b/src/autocomplete/AutocompleteProvider.tsx
similarity index 82%
rename from src/autocomplete/AutocompleteProvider.js
rename to src/autocomplete/AutocompleteProvider.tsx
index 98ae83c526..7efe823250 100644
--- a/src/autocomplete/AutocompleteProvider.js
+++ b/src/autocomplete/AutocompleteProvider.tsx
@@ -16,10 +16,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import type {Completion, SelectionRange} from './Autocompleter';
+import * as React from 'react';
+import type {ICompletion, ISelectionRange} from './Autocompleter';
+
+export interface ICommand {
+    command: string | null;
+    range: {
+        start: number;
+        end: number;
+    };
+}
 
 export default class AutocompleteProvider {
+    commandRegex: RegExp;
+    forcedCommandRegex: RegExp;
+
     constructor(commandRegex?: RegExp, forcedCommandRegex?: RegExp) {
         if (commandRegex) {
             if (!commandRegex.global) {
@@ -42,11 +53,11 @@ export default class AutocompleteProvider {
     /**
      * Of the matched commands in the query, returns the first that contains or is contained by the selection, or null.
      * @param {string} query The query string
-     * @param {SelectionRange} selection Selection to search
+     * @param {ISelectionRange} selection Selection to search
      * @param {boolean} force True if the user is forcing completion
      * @return {object} { command, range } where both objects fields are null if no match
      */
-    getCurrentCommand(query: string, selection: SelectionRange, force: boolean = false) {
+    getCurrentCommand(query: string, selection: ISelectionRange, force = false) {
         let commandRegex = this.commandRegex;
 
         if (force && this.shouldForceComplete()) {
@@ -82,7 +93,7 @@ export default class AutocompleteProvider {
         };
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
         return [];
     }
 
@@ -90,7 +101,7 @@ export default class AutocompleteProvider {
         return 'Default Provider';
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode | null {
         console.error('stub; should be implemented in subclasses');
         return null;
     }
diff --git a/src/autocomplete/Autocompleter.js b/src/autocomplete/Autocompleter.ts
similarity index 70%
rename from src/autocomplete/Autocompleter.js
rename to src/autocomplete/Autocompleter.ts
index a26eb6033b..8384eb9d4f 100644
--- a/src/autocomplete/Autocompleter.js
+++ b/src/autocomplete/Autocompleter.ts
@@ -15,10 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// @flow
-
-import type {Component} from 'react';
-import {Room} from 'matrix-js-sdk';
+import {ReactElement} from 'react';
+import Room from 'matrix-js-sdk/src/models/room';
 import CommandProvider from './CommandProvider';
 import CommunityProvider from './CommunityProvider';
 import DuckDuckGoProvider from './DuckDuckGoProvider';
@@ -27,22 +25,26 @@ import UserProvider from './UserProvider';
 import EmojiProvider from './EmojiProvider';
 import NotifProvider from './NotifProvider';
 import {timeout} from "../utils/promise";
+import AutocompleteProvider, {ICommand} from "./AutocompleteProvider";
 
-export type SelectionRange = {
-    beginning: boolean, // whether the selection is in the first block of the editor or not
-    start: number, // byte offset relative to the start anchor of the current editor selection.
-    end: number, // byte offset relative to the end anchor of the current editor selection.
-};
+export interface ISelectionRange {
+    beginning?: boolean; // whether the selection is in the first block of the editor or not
+    start: number; // byte offset relative to the start anchor of the current editor selection.
+    end: number; // byte offset relative to the end anchor of the current editor selection.
+}
 
-export type Completion = {
+export interface ICompletion {
+    type: "at-room" | "command" | "community" | "room" | "user";
     completion: string,
-    component: ?Component,
-    range: SelectionRange,
-    command: ?string,
+    completionId?: string;
+    component?: ReactElement,
+    range: ISelectionRange,
+    command?: string,
+    suffix?: string;
     // If provided, apply a LINK entity to the completion with the
     // data = { url: href }.
-    href: ?string,
-};
+    href?: string,
+}
 
 const PROVIDERS = [
     UserProvider,
@@ -57,7 +59,16 @@ const PROVIDERS = [
 // Providers will get rejected if they take longer than this.
 const PROVIDER_COMPLETION_TIMEOUT = 3000;
 
+export interface IProviderCompletions {
+    completions: ICompletion[];
+    provider: AutocompleteProvider;
+    command: ICommand;
+}
+
 export default class Autocompleter {
+    room: Room;
+    providers: AutocompleteProvider[];
+
     constructor(room: Room) {
         this.room = room;
         this.providers = PROVIDERS.map((Prov) => {
@@ -71,13 +82,14 @@ export default class Autocompleter {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<IProviderCompletions[]> {
         /* Note: This intentionally waits for all providers to return,
          otherwise, we run into a condition where new completions are displayed
          while the user is interacting with the list, which makes it difficult
          to predict whether an action will actually do what is intended
         */
-        const completionsList = await Promise.all(this.providers.map(provider => {
+        // list of results from each provider, each being a list of completions or null if it times out
+        const completionsList: ICompletion[][] = await Promise.all(this.providers.map(provider => {
             return timeout(provider.getCompletions(query, selection, force), null, PROVIDER_COMPLETION_TIMEOUT);
         }));
 
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.tsx
similarity index 89%
rename from src/autocomplete/CommandProvider.js
rename to src/autocomplete/CommandProvider.tsx
index 0b8af4d6f9..b9e8975491 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.tsx
@@ -17,17 +17,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
 import {_t} from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
 import {TextualCompletion} from './Components';
-import type {Completion, SelectionRange} from "./Autocompleter";
-import {Commands, CommandMap} from '../SlashCommands';
+import {ICompletion, ISelectionRange} from "./Autocompleter";
+import {Command, Commands, CommandMap} from '../SlashCommands';
 
 const COMMAND_RE = /(^\/\w*)(?: .*)?/g;
 
 export default class CommandProvider extends AutocompleteProvider {
+    matcher: QueryMatcher<Command>;
+
     constructor() {
         super(COMMAND_RE);
         this.matcher = new QueryMatcher(Commands, {
@@ -36,7 +38,7 @@ export default class CommandProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force?: boolean): Promise<ICompletion[]> {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!command) return [];
 
@@ -85,7 +87,7 @@ export default class CommandProvider extends AutocompleteProvider {
         return '*️⃣ ' + _t('Commands');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div className="mx_Autocomplete_Completion_container_block" role="listbox" aria-label={_t("Command Autocomplete")}>
                 { completions }
diff --git a/src/autocomplete/CommunityProvider.js b/src/autocomplete/CommunityProvider.tsx
similarity index 91%
rename from src/autocomplete/CommunityProvider.js
rename to src/autocomplete/CommunityProvider.tsx
index b863603aae..f1a5c0f2ca 100644
--- a/src/autocomplete/CommunityProvider.js
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -15,7 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
+import Group from "matrix-js-sdk/src/models/group";
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {MatrixClientPeg} from '../MatrixClientPeg';
@@ -24,7 +25,7 @@ import {PillCompletion} from './Components';
 import * as sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeGroupPermalink} from "../utils/permalinks/Permalinks";
-import type {Completion, SelectionRange} from "./Autocompleter";
+import {ICompletion, ISelectionRange} from "./Autocompleter";
 import FlairStore from "../stores/FlairStore";
 
 const COMMUNITY_REGEX = /\B\+\S*/g;
@@ -39,6 +40,8 @@ function score(query, space) {
 }
 
 export default class CommunityProvider extends AutocompleteProvider {
+    matcher: QueryMatcher<Group>;
+
     constructor() {
         super(COMMUNITY_REGEX);
         this.matcher = new QueryMatcher([], {
@@ -46,7 +49,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force: boolean = false): Promise<ICompletion[]> {
         const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
 
         // Disable autocompletions when composing commands because of various issues
@@ -104,7 +107,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         return '💬 ' + _t('Communities');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
diff --git a/src/autocomplete/Components.js b/src/autocomplete/Components.tsx
similarity index 70%
rename from src/autocomplete/Components.js
rename to src/autocomplete/Components.tsx
index 32bbeb46a0..75e42bc8a6 100644
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.tsx
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import * as React from 'react';
+import * as PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
@@ -24,7 +24,21 @@ something that is not entirely possible with stateless functional components. On
 presumably wrap them in a <div> before rendering but I think this is the better way to do it.
  */
 
-export class TextualCompletion extends React.Component {
+interface ITextualCompletionProps {
+    title?: string;
+    subtitle?: string;
+    description?: string;
+    className?: string;
+}
+
+export class TextualCompletion extends React.PureComponent<ITextualCompletionProps> {
+    static propTypes = {
+        title: PropTypes.string,
+        subtitle: PropTypes.string,
+        description: PropTypes.string,
+        className: PropTypes.string,
+    };
+
     render() {
         const {
             title,
@@ -42,14 +56,24 @@ export class TextualCompletion extends React.Component {
         );
     }
 }
-TextualCompletion.propTypes = {
-    title: PropTypes.string,
-    subtitle: PropTypes.string,
-    description: PropTypes.string,
-    className: PropTypes.string,
-};
 
-export class PillCompletion extends React.Component {
+interface IPillCompletionProps {
+    title?: string;
+    subtitle?: string;
+    description?: string;
+    initialComponent?: React.ReactNode,
+    className?: string;
+}
+
+export class PillCompletion extends React.PureComponent<IPillCompletionProps> {
+    static propTypes = {
+        title: PropTypes.string,
+        subtitle: PropTypes.string,
+        description: PropTypes.string,
+        initialComponent: PropTypes.element,
+        className: PropTypes.string,
+    };
+
     render() {
         const {
             title,
@@ -69,10 +93,3 @@ export class PillCompletion extends React.Component {
         );
     }
 }
-PillCompletion.propTypes = {
-    title: PropTypes.string,
-    subtitle: PropTypes.string,
-    description: PropTypes.string,
-    initialComponent: PropTypes.element,
-    className: PropTypes.string,
-};
diff --git a/src/autocomplete/DuckDuckGoProvider.js b/src/autocomplete/DuckDuckGoProvider.tsx
similarity index 90%
rename from src/autocomplete/DuckDuckGoProvider.js
rename to src/autocomplete/DuckDuckGoProvider.tsx
index 8cff83554a..5a024d956c 100644
--- a/src/autocomplete/DuckDuckGoProvider.js
+++ b/src/autocomplete/DuckDuckGoProvider.tsx
@@ -16,12 +16,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 
 import {TextualCompletion} from './Components';
-import type {SelectionRange} from "./Autocompleter";
+import {ICompletion, ISelectionRange} from "./Autocompleter";
 
 const DDG_REGEX = /\/ddg\s+(.+)$/g;
 const REFERRER = 'vector';
@@ -31,12 +31,12 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
         super(DDG_REGEX);
     }
 
-    static getQueryUri(query: String) {
+    static getQueryUri(query: string) {
         return `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}`
          + `&format=json&no_redirect=1&no_html=1&t=${encodeURIComponent(REFERRER)}`;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false) {
+    async getCompletions(query: string, selection: ISelectionRange, force= false): Promise<ICompletion[]> {
         const {command, range} = this.getCurrentCommand(query, selection);
         if (!query || !command) {
             return [];
@@ -95,7 +95,7 @@ export default class DuckDuckGoProvider extends AutocompleteProvider {
         return '🔍 ' + _t('Results from DuckDuckGo');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_block"
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.tsx
similarity index 83%
rename from src/autocomplete/EmojiProvider.js
rename to src/autocomplete/EmojiProvider.tsx
index 670776644e..be6b590248 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -17,41 +17,56 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
-import type {Completion, SelectionRange} from './Autocompleter';
+import {ICompletion, ISelectionRange} from './Autocompleter';
 import _uniq from 'lodash/uniq';
 import _sortBy from 'lodash/sortBy';
 import SettingsStore from "../settings/SettingsStore";
 import { shortcodeToUnicode } from '../HtmlUtils';
 
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-import EMOJIBASE from 'emojibase-data/en/compact.json';
+import * as EMOJIBASE from 'emojibase-data/en/compact.json';
 
 const LIMIT = 20;
 
 // Match for ascii-style ";-)" emoticons or ":wink:" shortcodes provided by emojibase
 const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|:[+-\\w]*:?)$', 'g');
 
+interface IEmoji {
+    annotation: string;
+    group: number;
+    hexcode: string;
+    order: number;
+    shortcodes: string[];
+    tags: string[];
+    unicode: string;
+    emoticon: string;
+}
+
+interface IEmojiShort {
+    emoji: IEmoji;
+    shortname: string;
+    _orderBy: number;
+}
+
 // XXX: it's very unclear why we bother with this generated emojidata file.
 // all it means is that we end up bloating the bundle with precomputed stuff
 // which would be trivial to calculate and cache on demand.
-const EMOJI_SHORTNAMES = EMOJIBASE.sort((a, b) => {
+const EMOJI_SHORTNAMES: IEmojiShort[] = (EMOJIBASE as IEmoji[]).sort((a, b) => {
     if (a.group === b.group) {
         return a.order - b.order;
     }
     return a.group - b.group;
-}).map((emoji, index) => {
-    return {
-        emoji,
-        shortname: `:${emoji.shortcodes[0]}:`,
-        // Include the index so that we can preserve the original order
-        _orderBy: index,
-    };
-});
+}).map((emoji, index) => ({
+    emoji,
+    shortname: `:${emoji.shortcodes[0]}:`,
+    // Include the index so that we can preserve the original order
+    _orderBy: index,
+}));
 
 function score(query, space) {
     const index = space.indexOf(query);
@@ -63,6 +78,9 @@ function score(query, space) {
 }
 
 export default class EmojiProvider extends AutocompleteProvider {
+    matcher: QueryMatcher<IEmojiShort>;
+    nameMatcher: QueryMatcher<IEmojiShort>;
+
     constructor() {
         super(EMOJI_REGEX);
         this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
@@ -80,7 +98,7 @@ export default class EmojiProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force?: boolean): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force?: boolean): Promise<ICompletion[]> {
         if (!SettingsStore.getValue("MessageComposerInput.suggestEmoji")) {
             return []; // don't give any suggestions if the user doesn't want them
         }
@@ -132,7 +150,7 @@ export default class EmojiProvider extends AutocompleteProvider {
         return '😃 ' + _t('Emoji');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div className="mx_Autocomplete_Completion_container_pill" role="listbox" aria-label={_t("Emoji Autocomplete")}>
                 { completions }
diff --git a/src/autocomplete/NotifProvider.js b/src/autocomplete/NotifProvider.tsx
similarity index 86%
rename from src/autocomplete/NotifProvider.js
rename to src/autocomplete/NotifProvider.tsx
index e7c8f6f70d..b01f52fd23 100644
--- a/src/autocomplete/NotifProvider.js
+++ b/src/autocomplete/NotifProvider.tsx
@@ -14,23 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
+import Room from "matrix-js-sdk/src/models/room";
 import AutocompleteProvider from './AutocompleteProvider';
 import { _t } from '../languageHandler';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import {PillCompletion} from './Components';
 import * as sdk from '../index';
-import type {Completion, SelectionRange} from "./Autocompleter";
+import {ICompletion, ISelectionRange} from "./Autocompleter";
 
 const AT_ROOM_REGEX = /@\S*/g;
 
 export default class NotifProvider extends AutocompleteProvider {
+    room: Room;
+
     constructor(room) {
         super(AT_ROOM_REGEX);
         this.room = room;
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force:boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force= false): Promise<ICompletion[]> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
@@ -57,7 +60,7 @@ export default class NotifProvider extends AutocompleteProvider {
         return '❗️ ' + _t('Room Notification');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
diff --git a/src/autocomplete/QueryMatcher.js b/src/autocomplete/QueryMatcher.ts
similarity index 89%
rename from src/autocomplete/QueryMatcher.js
rename to src/autocomplete/QueryMatcher.ts
index ef1605e7a6..95bcfb25ef 100644
--- a/src/autocomplete/QueryMatcher.js
+++ b/src/autocomplete/QueryMatcher.ts
@@ -1,4 +1,3 @@
-//@flow
 /*
 Copyright 2017 Aviral Dasgupta
 Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
@@ -26,6 +25,13 @@ function stripDiacritics(str: string): string {
     return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
 }
 
+interface IOptions<T extends {}> {
+    keys: Array<string | keyof T>;
+    funcs?: Array<(T) => string>;
+    shouldMatchWordsOnly?: boolean;
+    shouldMatchPrefix?: boolean;
+}
+
 /**
  * Simple search matcher that matches any results with the query string anywhere
  * in the search string. Returns matches in the order the query string appears
@@ -39,8 +45,13 @@ function stripDiacritics(str: string): string {
  * @param {function[]} options.funcs List of functions that when called with the
  *     object as an arg will return a string to use as an index
  */
-export default class QueryMatcher {
-    constructor(objects: Array<Object>, options: {[Object]: Object} = {}) {
+export default class QueryMatcher<T> {
+    private _options: IOptions<T>;
+    private _keys: IOptions<T>["keys"];
+    private _funcs: Required<IOptions<T>["funcs"]>;
+    private _items: Map<string, T[]>;
+
+    constructor(objects: T[], options: IOptions<T> = { keys: [] }) {
         this._options = options;
         this._keys = options.keys;
         this._funcs = options.funcs || [];
@@ -60,7 +71,7 @@ export default class QueryMatcher {
         }
     }
 
-    setObjects(objects: Array<Object>) {
+    setObjects(objects: T[]) {
         this._items = new Map();
 
         for (const object of objects) {
@@ -81,7 +92,7 @@ export default class QueryMatcher {
         }
     }
 
-    match(query: String): Array<Object> {
+    match(query: string): T[] {
         query = stripDiacritics(query).toLowerCase();
         if (this._options.shouldMatchWordsOnly) {
             query = query.replace(/[^\w]/g, '');
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.tsx
similarity index 92%
rename from src/autocomplete/RoomProvider.js
rename to src/autocomplete/RoomProvider.tsx
index a0f670e769..6d98b37318 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.tsx
@@ -17,7 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
+import Room from "matrix-js-sdk/src/models/room";
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {MatrixClientPeg} from '../MatrixClientPeg';
@@ -26,7 +27,7 @@ import {PillCompletion} from './Components';
 import * as sdk from '../index';
 import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../utils/permalinks/Permalinks";
-import type {Completion, SelectionRange} from "./Autocompleter";
+import {ICompletion, ISelectionRange} from "./Autocompleter";
 
 const ROOM_REGEX = /\B#\S*/g;
 
@@ -48,6 +49,8 @@ function matcherObject(room, displayedAlias, matchName = "") {
 }
 
 export default class RoomProvider extends AutocompleteProvider {
+    matcher: QueryMatcher<Room>;
+
     constructor() {
         super(ROOM_REGEX);
         this.matcher = new QueryMatcher([], {
@@ -55,7 +58,7 @@ export default class RoomProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
         const RoomAvatar = sdk.getComponent('views.avatars.RoomAvatar');
 
         const client = MatrixClientPeg.get();
@@ -115,7 +118,7 @@ export default class RoomProvider extends AutocompleteProvider {
         return '💬 ' + _t('Rooms');
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div
                 className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate"
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.tsx
similarity index 84%
rename from src/autocomplete/UserProvider.js
rename to src/autocomplete/UserProvider.tsx
index 7fd600b136..35ea53f6c0 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.tsx
@@ -1,4 +1,3 @@
-//@flow
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2017 Vector Creations Ltd
@@ -18,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import * as React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {PillCompletion} from './Components';
@@ -27,9 +26,13 @@ import QueryMatcher from './QueryMatcher';
 import _sortBy from 'lodash/sortBy';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 
-import type {MatrixEvent, Room, RoomMember, RoomState} from 'matrix-js-sdk';
+import MatrixEvent from "matrix-js-sdk/src/models/event";
+import Room from "matrix-js-sdk/src/models/room";
+import RoomMember from "matrix-js-sdk/src/models/room-member";
+import RoomState from "matrix-js-sdk/src/models/room-state";
+import EventTimeline from "matrix-js-sdk/src/models/event-timeline";
 import {makeUserPermalink} from "../utils/permalinks/Permalinks";
-import type {Completion, SelectionRange} from "./Autocompleter";
+import {ICompletion, ISelectionRange} from "./Autocompleter";
 
 const USER_REGEX = /\B@\S*/g;
 
@@ -37,9 +40,15 @@ const USER_REGEX = /\B@\S*/g;
 // to allow you to tab-complete /mat into /(matthew)
 const FORCED_USER_REGEX = /[^/,:; \t\n]\S*/g;
 
+interface IRoomTimelineData {
+    timeline: EventTimeline;
+    liveEvent?: boolean;
+}
+
 export default class UserProvider extends AutocompleteProvider {
-    users: Array<RoomMember> = null;
-    room: Room = null;
+    matcher: QueryMatcher<RoomMember>;
+    users: RoomMember[];
+    room: Room;
 
     constructor(room: Room) {
         super(USER_REGEX, FORCED_USER_REGEX);
@@ -51,21 +60,19 @@ export default class UserProvider extends AutocompleteProvider {
             shouldMatchWordsOnly: false,
         });
 
-        this._onRoomTimelineBound = this._onRoomTimeline.bind(this);
-        this._onRoomStateMemberBound = this._onRoomStateMember.bind(this);
-
-        MatrixClientPeg.get().on("Room.timeline", this._onRoomTimelineBound);
-        MatrixClientPeg.get().on("RoomState.members", this._onRoomStateMemberBound);
+        MatrixClientPeg.get().on("Room.timeline", this._onRoomTimeline);
+        MatrixClientPeg.get().on("RoomState.members", this._onRoomStateMember);
     }
 
     destroy() {
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room.timeline", this._onRoomTimelineBound);
-            MatrixClientPeg.get().removeListener("RoomState.members", this._onRoomStateMemberBound);
+            MatrixClientPeg.get().removeListener("Room.timeline", this._onRoomTimeline);
+            MatrixClientPeg.get().removeListener("RoomState.members", this._onRoomStateMember);
         }
     }
 
-    _onRoomTimeline(ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean, data: Object) {
+    _onRoomTimeline = (ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean,
+                       data: IRoomTimelineData) => {
         if (!room) return;
         if (removed) return;
         if (room.roomId !== this.room.roomId) return;
@@ -79,9 +86,9 @@ export default class UserProvider extends AutocompleteProvider {
 
         // TODO: lazyload if we have no ev.sender room member?
         this.onUserSpoke(ev.sender);
-    }
+    };
 
-    _onRoomStateMember(ev: MatrixEvent, state: RoomState, member: RoomMember) {
+    _onRoomStateMember = (ev: MatrixEvent, state: RoomState, member: RoomMember) => {
         // ignore members in other rooms
         if (member.roomId !== this.room.roomId) {
             return;
@@ -89,9 +96,9 @@ export default class UserProvider extends AutocompleteProvider {
 
         // blow away the users cache
         this.users = null;
-    }
+    };
 
-    async getCompletions(query: string, selection: SelectionRange, force: boolean = false): Array<Completion> {
+    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // lazy-load user list into matcher
@@ -163,7 +170,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.matcher.setObjects(this.users);
     }
 
-    renderCompletions(completions: [React.Component]): ?React.Component {
+    renderCompletions(completions: React.ReactNode[]): React.ReactNode {
         return (
             <div className="mx_Autocomplete_Completion_container_pill" role="listbox" aria-label={_t("User Autocomplete")}>
                 { completions }
diff --git a/src/components/views/rooms/Autocomplete.js b/src/components/views/rooms/Autocomplete.tsx
similarity index 80%
rename from src/components/views/rooms/Autocomplete.js
rename to src/components/views/rooms/Autocomplete.tsx
index 76a3a19e00..d4fcc5852b 100644
--- a/src/components/views/rooms/Autocomplete.js
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,30 +15,62 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as PropTypes from 'prop-types';
 import classNames from 'classnames';
 import flatMap from 'lodash/flatMap';
-import type {Completion} from '../../../autocomplete/Autocompleter';
-import { Room } from 'matrix-js-sdk';
+import {ICompletion, ISelectionRange, IProviderCompletions} from '../../../autocomplete/Autocompleter';
+import {Room} from 'matrix-js-sdk/src/models/room';
 
 import SettingsStore from "../../../settings/SettingsStore";
 import Autocompleter from '../../../autocomplete/Autocompleter';
-import {sleep} from "../../../utils/promise";
 
 const COMPOSER_SELECTED = 0;
 
 export const generateCompletionDomId = (number) => `mx_Autocomplete_Completion_${number}`;
 
-export default class Autocomplete extends React.Component {
+interface IProps {
+    query: string;
+    onConfirm: (ICompletion) => void;
+    onSelectionChange?: (ICompletion, number) => void;
+    selection: ISelectionRange;
+    room: Room;
+}
+
+interface IState {
+    completions: IProviderCompletions[];
+    completionList: ICompletion[];
+    selectionOffset: number;
+    shouldShowCompletions: boolean;
+    hide: boolean;
+    forceComplete: boolean;
+}
+
+export default class Autocomplete extends React.PureComponent<IProps, IState> {
+    static propTypes = {
+        // the query string for which to show autocomplete suggestions
+        query: PropTypes.string.isRequired,
+
+        // method invoked with range and text content when completion is confirmed
+        onConfirm: PropTypes.func.isRequired,
+
+        // method invoked when selected (if any) completion changes
+        onSelectionChange: PropTypes.func,
+
+        // The room in which we're autocompleting
+        room: PropTypes.instanceOf(Room),
+    };
+
+    autocompleter: Autocompleter;
+    queryRequested: string;
+    debounceCompletionsRequest: NodeJS.Timeout;
+    container: React.RefObject<HTMLDivElement>;
+
     constructor(props) {
         super(props);
 
         this.autocompleter = new Autocompleter(props.room);
-        this.completionPromise = null;
-        this.hide = this.hide.bind(this);
-        this.onCompletionClicked = this.onCompletionClicked.bind(this);
 
         this.state = {
             // list of completionResults, each containing completions
@@ -57,13 +89,15 @@ export default class Autocomplete extends React.Component {
 
             forceComplete: false,
         };
+
+        this.container = React.createRef();
     }
 
     componentDidMount() {
         this._applyNewProps();
     }
 
-    _applyNewProps(oldQuery, oldRoom) {
+    _applyNewProps(oldQuery?: string, oldRoom?: Room) {
         if (oldRoom && this.props.room.roomId !== oldRoom.roomId) {
             this.autocompleter.destroy();
             this.autocompleter = new Autocompleter(this.props.room);
@@ -159,7 +193,7 @@ export default class Autocomplete extends React.Component {
         });
     }
 
-    hasSelection(): bool {
+    hasSelection(): boolean {
         return this.countCompletions() > 0 && this.state.selectionOffset !== 0;
     }
 
@@ -168,7 +202,7 @@ export default class Autocomplete extends React.Component {
     }
 
     // called from MessageComposerInput
-    moveSelection(delta): ?Completion {
+    moveSelection(delta): ICompletion | undefined {
         const completionCount = this.countCompletions();
         if (completionCount === 0) return; // there are no items to move the selection through
 
@@ -190,9 +224,14 @@ export default class Autocomplete extends React.Component {
         this.hide();
     }
 
-    hide() {
-        this.setState({hide: true, selectionOffset: 0, completions: [], completionList: []});
-    }
+    hide = () => {
+        this.setState({
+            hide: true,
+            selectionOffset: 0,
+            completions: [],
+            completionList: [],
+        });
+    };
 
     forceComplete() {
         return new Promise((resolve) => {
@@ -207,7 +246,7 @@ export default class Autocomplete extends React.Component {
         });
     }
 
-    onCompletionClicked(selectionOffset: number): boolean {
+    onCompletionClicked = (selectionOffset: number): boolean => {
         if (this.countCompletions() === 0 || selectionOffset === COMPOSER_SELECTED) {
             return false;
         }
@@ -216,7 +255,7 @@ export default class Autocomplete extends React.Component {
         this.hide();
 
         return true;
-    }
+    };
 
     setSelection(selectionOffset: number) {
         this.setState({selectionOffset, hide: false});
@@ -229,20 +268,16 @@ export default class Autocomplete extends React.Component {
         this._applyNewProps(prevProps.query, prevProps.room);
         // this is the selected completion, so scroll it into view if needed
         const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
-        if (selectedCompletion && this.container) {
+        if (selectedCompletion && this.container.current) {
             const domNode = ReactDOM.findDOMNode(selectedCompletion);
             const offsetTop = domNode && domNode.offsetTop;
-            if (offsetTop > this.container.scrollTop + this.container.offsetHeight ||
-                offsetTop < this.container.scrollTop) {
-                this.container.scrollTop = offsetTop - this.container.offsetTop;
+            if (offsetTop > this.container.current.scrollTop + this.container.current.offsetHeight ||
+                offsetTop < this.container.current.scrollTop) {
+                this.container.current.scrollTop = offsetTop - this.container.current.offsetTop;
             }
         }
     }
 
-    setState(state, func) {
-        super.setState(state, func);
-    }
-
     render() {
         let position = 1;
         const renderedCompletions = this.state.completions.map((completionResult, i) => {
@@ -276,23 +311,9 @@ export default class Autocomplete extends React.Component {
         }).filter((completion) => !!completion);
 
         return !this.state.hide && renderedCompletions.length > 0 ? (
-            <div className="mx_Autocomplete" ref={(e) => this.container = e}>
+            <div className="mx_Autocomplete" ref={this.container}>
                 { renderedCompletions }
             </div>
         ) : null;
     }
 }
-
-Autocomplete.propTypes = {
-    // the query string for which to show autocomplete suggestions
-    query: PropTypes.string.isRequired,
-
-    // method invoked with range and text content when completion is confirmed
-    onConfirm: PropTypes.func.isRequired,
-
-    // method invoked when selected (if any) completion changes
-    onSelectionChange: PropTypes.func,
-
-    // The room in which we're autocompleting
-    room: PropTypes.instanceOf(Room),
-};
diff --git a/tsconfig.json b/tsconfig.json
index d70e0a85f0..dc61d72419 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "resolveJsonModule": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2016",

From 6328a60301d8439735a57121f27d31edd4de3f74 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 19:02:27 +0100
Subject: [PATCH 2274/3235] improve member name

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/Autocomplete.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index d4fcc5852b..68d82f0bc3 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -65,7 +65,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     autocompleter: Autocompleter;
     queryRequested: string;
     debounceCompletionsRequest: NodeJS.Timeout;
-    container: React.RefObject<HTMLDivElement>;
+    containerRef: React.RefObject<HTMLDivElement>;
 
     constructor(props) {
         super(props);
@@ -90,7 +90,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
             forceComplete: false,
         };
 
-        this.container = React.createRef();
+        this.containerRef = React.createRef();
     }
 
     componentDidMount() {
@@ -268,12 +268,12 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this._applyNewProps(prevProps.query, prevProps.room);
         // this is the selected completion, so scroll it into view if needed
         const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
-        if (selectedCompletion && this.container.current) {
+        if (selectedCompletion && this.containerRef.current) {
             const domNode = ReactDOM.findDOMNode(selectedCompletion);
             const offsetTop = domNode && domNode.offsetTop;
-            if (offsetTop > this.container.current.scrollTop + this.container.current.offsetHeight ||
-                offsetTop < this.container.current.scrollTop) {
-                this.container.current.scrollTop = offsetTop - this.container.current.offsetTop;
+            if (offsetTop > this.containerRef.current.scrollTop + this.containerRef.current.offsetHeight ||
+                offsetTop < this.containerRef.current.scrollTop) {
+                this.containerRef.current.scrollTop = offsetTop - this.containerRef.current.offsetTop;
             }
         }
     }
@@ -311,7 +311,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         }).filter((completion) => !!completion);
 
         return !this.state.hide && renderedCompletions.length > 0 ? (
-            <div className="mx_Autocomplete" ref={this.container}>
+            <div className="mx_Autocomplete" ref={this.containerRef}>
                 { renderedCompletions }
             </div>
         ) : null;

From 5c57b9ab9b3fdc35148549498e89f6dcb6cd3522 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 19:04:55 +0100
Subject: [PATCH 2275/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/AutocompleteProvider.tsx   | 4 ++--
 src/autocomplete/CommunityProvider.tsx      | 2 +-
 src/autocomplete/UserProvider.tsx           | 4 ++--
 src/components/views/rooms/Autocomplete.tsx | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.tsx b/src/autocomplete/AutocompleteProvider.tsx
index 7efe823250..3749d9bb2c 100644
--- a/src/autocomplete/AutocompleteProvider.tsx
+++ b/src/autocomplete/AutocompleteProvider.tsx
@@ -64,14 +64,14 @@ export default class AutocompleteProvider {
             commandRegex = this.forcedCommandRegex || /\S+/g;
         }
 
-        if (commandRegex == null) {
+        if (commandRegex === null) {
             return null;
         }
 
         commandRegex.lastIndex = 0;
 
         let match;
-        while ((match = commandRegex.exec(query)) != null) {
+        while ((match = commandRegex.exec(query)) !== null) {
             const start = match.index;
             const end = start + match[0].length;
             if (selection.start <= end && selection.end >= start) {
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
index f1a5c0f2ca..18ec125cb1 100644
--- a/src/autocomplete/CommunityProvider.tsx
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -49,7 +49,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         });
     }
 
-    async getCompletions(query: string, selection: ISelectionRange, force: boolean = false): Promise<ICompletion[]> {
+    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
         const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
 
         // Disable autocompletions when composing commands because of various issues
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 35ea53f6c0..0500329ec7 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -98,14 +98,14 @@ export default class UserProvider extends AutocompleteProvider {
         this.users = null;
     };
 
-    async getCompletions(query: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
+    async getCompletions(rawQuery: string, selection: ISelectionRange, force = false): Promise<ICompletion[]> {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // lazy-load user list into matcher
         if (this.users === null) this._makeUsers();
 
         let completions = [];
-        const {command, range} = this.getCurrentCommand(query, selection, force);
+        const {command, range} = this.getCurrentCommand(rawQuery, selection, force);
 
         if (!command) return completions;
 
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 68d82f0bc3..3a2d5272f8 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -281,7 +281,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     render() {
         let position = 1;
         const renderedCompletions = this.state.completions.map((completionResult, i) => {
-            const completions = completionResult.completions.map((completion, i) => {
+            const completions = completionResult.completions.map((completion, j) => {
                 const selected = position === this.state.selectionOffset;
                 const className = classNames('mx_Autocomplete_Completion', {selected});
                 const componentPosition = position;
@@ -292,7 +292,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
                 };
 
                 return React.cloneElement(completion.component, {
-                    "key": i,
+                    "key": j,
                     "ref": `completion${componentPosition}`,
                     "id": generateCompletionDomId(componentPosition - 1), // 0 index the completion IDs
                     className,

From 66d2a67142f7172b2e71db6d9e357a8a401d7e50 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 19:17:58 +0100
Subject: [PATCH 2276/3235] deduplicate emojibase loading

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/EmojiProvider.tsx | 18 ++----------------
 src/{emoji.js => emoji.ts}         | 26 ++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 20 deletions(-)
 rename src/{emoji.js => emoji.ts} (79%)

diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index be6b590248..27e24af205 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -27,36 +27,22 @@ import _uniq from 'lodash/uniq';
 import _sortBy from 'lodash/sortBy';
 import SettingsStore from "../settings/SettingsStore";
 import { shortcodeToUnicode } from '../HtmlUtils';
+import { EMOJI, IEmoji } from '../emoji';
 
 import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-import * as EMOJIBASE from 'emojibase-data/en/compact.json';
 
 const LIMIT = 20;
 
 // Match for ascii-style ";-)" emoticons or ":wink:" shortcodes provided by emojibase
 const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|:[+-\\w]*:?)$', 'g');
 
-interface IEmoji {
-    annotation: string;
-    group: number;
-    hexcode: string;
-    order: number;
-    shortcodes: string[];
-    tags: string[];
-    unicode: string;
-    emoticon: string;
-}
-
 interface IEmojiShort {
     emoji: IEmoji;
     shortname: string;
     _orderBy: number;
 }
 
-// XXX: it's very unclear why we bother with this generated emojidata file.
-// all it means is that we end up bloating the bundle with precomputed stuff
-// which would be trivial to calculate and cache on demand.
-const EMOJI_SHORTNAMES: IEmojiShort[] = (EMOJIBASE as IEmoji[]).sort((a, b) => {
+const EMOJI_SHORTNAMES: IEmojiShort[] = EMOJI.sort((a, b) => {
     if (a.group === b.group) {
         return a.order - b.order;
     }
diff --git a/src/emoji.js b/src/emoji.ts
similarity index 79%
rename from src/emoji.js
rename to src/emoji.ts
index 20b05531ca..c0a755145a 100644
--- a/src/emoji.js
+++ b/src/emoji.ts
@@ -14,12 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// @ts-ignore - import * as EMOJIBASE actually breaks this
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
+export interface IEmoji {
+    annotation: string;
+    group: number;
+    hexcode: string;
+    order: number;
+    shortcodes: string[];
+    tags: string[];
+    unicode: string;
+    emoticon?: string;
+}
+
+interface IEmojiWithFilterString extends IEmoji {
+    filterString?: string;
+}
+
 // The unicode is stored without the variant selector
-const UNICODE_TO_EMOJI = new Map(); // not exported as gets for it are handled by getEmojiFromUnicode
-export const EMOTICON_TO_EMOJI = new Map();
-export const SHORTCODE_TO_EMOJI = new Map();
+const UNICODE_TO_EMOJI = new Map<string, IEmojiWithFilterString>(); // not exported as gets for it are handled by getEmojiFromUnicode
+export const EMOTICON_TO_EMOJI = new Map<string, IEmojiWithFilterString>();
+export const SHORTCODE_TO_EMOJI = new Map<string, IEmojiWithFilterString>();
 
 export const getEmojiFromUnicode = unicode => UNICODE_TO_EMOJI.get(stripVariation(unicode));
 
@@ -48,7 +64,7 @@ export const DATA_BY_CATEGORY = {
 };
 
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
-EMOJIBASE.forEach(emoji => {
+EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
     const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
     if (DATA_BY_CATEGORY.hasOwnProperty(categoryId)) {
         DATA_BY_CATEGORY[categoryId].push(emoji);
@@ -89,3 +105,5 @@ EMOJIBASE.forEach(emoji => {
 function stripVariation(str) {
     return str.replace(/[\uFE00-\uFE0F]$/, "");
 }
+
+export const EMOJI: IEmoji[] = EMOJIBASE;

From 8398e83d33d1f303b34bb36b8b6161613275f4d7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 20:35:57 +0100
Subject: [PATCH 2277/3235] add more type annotations

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/Autocomplete.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 3a2d5272f8..e27aeb5a58 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -115,7 +115,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this.autocompleter.destroy();
     }
 
-    complete(query, selection) {
+    complete(query: string, selection: ISelectionRange) {
         this.queryRequested = query;
         if (this.debounceCompletionsRequest) {
             clearTimeout(this.debounceCompletionsRequest);
@@ -146,7 +146,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    processQuery(query, selection) {
+    processQuery(query: string, selection: ISelectionRange) {
         return this.autocompleter.getCompletions(
             query, selection, this.state.forceComplete,
         ).then((completions) => {
@@ -158,7 +158,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         });
     }
 
-    processCompletions(completions) {
+    processCompletions(completions: IProviderCompletions[]) {
         const completionList = flatMap(completions, (provider) => provider.completions);
 
         // Reset selection when completion list becomes empty.
@@ -202,7 +202,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     }
 
     // called from MessageComposerInput
-    moveSelection(delta): ICompletion | undefined {
+    moveSelection(delta: number) {
         const completionCount = this.countCompletions();
         if (completionCount === 0) return; // there are no items to move the selection through
 
@@ -211,7 +211,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         this.setSelection(index);
     }
 
-    onEscape(e): boolean {
+    onEscape(e: KeyboardEvent): boolean {
         const completionCount = this.countCompletions();
         if (completionCount === 0) {
             // autocomplete is already empty, so don't preventDefault
@@ -264,7 +264,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         }
     }
 
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps: IProps) {
         this._applyNewProps(prevProps.query, prevProps.room);
         // this is the selected completion, so scroll it into view if needed
         const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];

From 3b245ee678d781080c1ad815d5bb7667332c3212 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 21:05:00 +0100
Subject: [PATCH 2278/3235] add more type annotations

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/RoomProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx
index 6d98b37318..9e72363432 100644
--- a/src/autocomplete/RoomProvider.tsx
+++ b/src/autocomplete/RoomProvider.tsx
@@ -31,7 +31,7 @@ import {ICompletion, ISelectionRange} from "./Autocompleter";
 
 const ROOM_REGEX = /\B#\S*/g;
 
-function score(query, space) {
+function score(query: string, space: string) {
     const index = space.indexOf(query);
     if (index === -1) {
         return Infinity;
@@ -40,7 +40,7 @@ function score(query, space) {
     }
 }
 
-function matcherObject(room, displayedAlias, matchName = "") {
+function matcherObject(room: Room, displayedAlias: string, matchName = "") {
     return {
         room,
         matchName,

From 500f96ef96174b04dc28543d596c898884df4a13 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 21 Apr 2020 02:39:58 +0000
Subject: [PATCH 2279/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2292 of 2292 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 1f137b2e76..a987b2e6c0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2394,5 +2394,6 @@
     "Submit logs": "遞交紀錄檔",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "注意：您的瀏覽器不受支援，所以您的使用體驗可能無法預測。",
     "Unable to upload": "無法上傳",
-    "Currently indexing: %(currentRoom)s": "目前正在建立索引：%(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "目前正在建立索引：%(currentRoom)s",
+    "Send a bug report with logs": "傳送有紀錄檔的臭蟲回報"
 }

From 2d6e4fbe72f3c5db8eead11e4940954ba6a18c95 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Mon, 20 Apr 2020 15:45:42 +0000
Subject: [PATCH 2280/3235] Translated using Weblate (Finnish)

Currently translated at 91.0% (2086 of 2292 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 11d4a33545..c17a2e8c35 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1997,7 +1997,7 @@
     "Session already verified!": "Istunto on jo vahvistettu!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROITUS: Istunto on jo vahvistettu, mutta avaimet EIVÄT VASTAA!",
     "Not Trusted": "Ei luotettu",
-    "Ask this user to verify their session, or manually verify it below.": "Pyydä tätä käyttäjää vahvistamaan heidän istuntonsa, tai manuaalisesti vahvista se alla.",
+    "Ask this user to verify their session, or manually verify it below.": "Pyydä tätä käyttäjää vahvistamaan istuntonsa, tai vahvista se manuaalisesti alla.",
     "Manually Verify": "Manuaalisesti vahvista",
     "a few seconds from now": "muutama sekunti sitten",
     "about a minute from now": "noin minuutti sitten",
@@ -2140,5 +2140,22 @@
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Suojaa salausavaimesi salalauseella. Parhaan turvallisuuden takaamiseksi sen tulisi olla eri kuin käyttäjätilisi salasana:",
     "Super": "Super",
     "Cancel replying to a message": "Peruuta viestiin vastaaminen",
-    "Jump to room search": "Siirry huonehakuun"
+    "Jump to room search": "Siirry huonehakuun",
+    "Failed to set topic": "Aiheen asettaminen epäonnistui",
+    "Command failed": "Komento epäonnistui",
+    "Could not find user in room": "Käyttäjää ei löytynyt huoneesta",
+    "Send a bug report with logs": "Lähetä virheilmoitus lokien kera",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Varmista että alla olevat emojit näkyvät molemmissa istunnoissa samassa järjestyksessä:",
+    "Delete sessions|other": "Poista istunnot",
+    "Delete sessions|one": "Poista istunto",
+    "Compare emoji": "Vertaile emojeita",
+    "Can't load this message": "Tätä viestiä ei voi ladata",
+    "Submit logs": "Lähetä lokit",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Muistutus: Selaintasi ei tueta, joten voit kohdata yllätyksiä.",
+    "There was a problem communicating with the server. Please try again.": "Palvelinyhteydessä oli ongelma. Yritä uudelleen.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Varoitus</b>: Tee tämä ainoastaan luotetulla tietokoneella.",
+    "Syncing...": "Synkronoidaan...",
+    "Signing In...": "Kirjaudutaan sisään...",
+    "If you've joined lots of rooms, this might take a while": "Jos olet liittynyt moniin huoneisiin, tässä voi kestää hetken",
+    "Use your other device to continue…": "Jatka toisella laitteellasi…"
 }

From 5dd9dd40d8c9a6e3412825a31850e06c459b3b84 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Mon, 20 Apr 2020 15:35:46 +0000
Subject: [PATCH 2281/3235] Translated using Weblate (Russian)

Currently translated at 89.8% (2058 of 2292 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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 0ad385b607..f0e8b44678 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1803,13 +1803,13 @@
     "They don't match": "Они не совпадают",
     "To be secure, do this in person or use a trusted way to communicate.": "Чтобы быть в безопасности, делайте это лично или используйте надежный способ связи.",
     "Lock": "Заблокировать",
-    "Verify yourself & others to keep your chats safe": "Проверить себя и других, чтобы сохранить ваши чаты безопасными",
+    "Verify yourself & others to keep your chats safe": "Подтвердите себя и других для безопасности ваших бесед",
     "Other users may not trust it": "Другие пользователи могут не доверять этому",
     "Upgrade": "Обновление",
     "Verify": "Проверить",
     "Later": "Позже",
     "Review": "Обзор",
-    "Decline (%(counter)s)": "Сокращение (%(counter)s)",
+    "Decline (%(counter)s)": "Отклонить (%(counter)s)",
     "This bridge was provisioned by <user />.": "Этот мост был подготовлен пользователем <user />.",
     "This bridge is managed by <user />.": "Этот мост управляется <user />.",
     "Workspace: %(networkName)s": "Рабочая область: %(networkName)s",
@@ -1881,7 +1881,7 @@
     "Session backup key:": "Резервная копия сессионного ключа:",
     "Secret storage public key:": "Публичный ключ хранилища секретов:",
     "in account data": "в данных учётной записи",
-    "Homeserver feature support:": "Возможности домашнего сервера:",
+    "Homeserver feature support:": "Поддержка со стороны домашнего сервера:",
     "exists": "существует",
     "Secret Storage key format:": "Формат ключа хранилища секретов:",
     "outdated": "устарел",
@@ -2108,5 +2108,10 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Установить адрес этой комнаты, чтобы пользователи могли найти ее на вашем сервере (%(localDomain)s)",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Начните диалог с кем-нибудь по его имени, имени пользователя (например, <userId/>) или адресу почты.",
-    "Great! This recovery passphrase looks strong enough.": "Отлично! Этот пароль восстановления достаточно надёжен."
+    "Great! This recovery passphrase looks strong enough.": "Отлично! Этот пароль восстановления достаточно надёжен.",
+    "Enter recovery passphrase": "Введите пароль восстановления",
+    "Enter a recovery passphrase": "Введите пароль восстановления",
+    "Enter your recovery passphrase a second time to confirm it.": "Введите пароль восстановления ещё раз для подтверждения.",
+    "Enter a recovery passphrase...": "Введите пароль восстановления...",
+    "Please enter your recovery passphrase a second time to confirm.": "Введите пароль восстановления повторно для подтверждения."
 }

From bf891c85e849a7b47ef656cd85dd5f66c3e40ffc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Apr 2020 10:01:05 +0100
Subject: [PATCH 2282/3235] Enable esModuleInterop and iterate PR

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/AutocompleteProvider.tsx   |  2 +-
 src/autocomplete/CommandProvider.tsx        |  2 +-
 src/autocomplete/CommunityProvider.tsx      |  2 +-
 src/autocomplete/Components.tsx             |  4 ++--
 src/autocomplete/DuckDuckGoProvider.tsx     |  2 +-
 src/autocomplete/EmojiProvider.tsx          |  2 +-
 src/autocomplete/NotifProvider.tsx          |  2 +-
 src/autocomplete/RoomProvider.tsx           |  2 +-
 src/autocomplete/UserProvider.tsx           | 14 +++++++-------
 src/components/views/rooms/Autocomplete.tsx |  6 +++---
 tsconfig.json                               |  1 +
 11 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.tsx b/src/autocomplete/AutocompleteProvider.tsx
index 3749d9bb2c..2cda2593a4 100644
--- a/src/autocomplete/AutocompleteProvider.tsx
+++ b/src/autocomplete/AutocompleteProvider.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import type {ICompletion, ISelectionRange} from './Autocompleter';
 
 export interface ICommand {
diff --git a/src/autocomplete/CommandProvider.tsx b/src/autocomplete/CommandProvider.tsx
index b9e8975491..e7a6f44536 100644
--- a/src/autocomplete/CommandProvider.tsx
+++ b/src/autocomplete/CommandProvider.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import {_t} from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
index 18ec125cb1..3edb1ff81d 100644
--- a/src/autocomplete/CommunityProvider.tsx
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import Group from "matrix-js-sdk/src/models/group";
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index 75e42bc8a6..044a090078 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.tsx
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
-import * as PropTypes from 'prop-types';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
diff --git a/src/autocomplete/DuckDuckGoProvider.tsx b/src/autocomplete/DuckDuckGoProvider.tsx
index 5a024d956c..e63f7255dc 100644
--- a/src/autocomplete/DuckDuckGoProvider.tsx
+++ b/src/autocomplete/DuckDuckGoProvider.tsx
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index 27e24af205..b67e26117b 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import QueryMatcher from './QueryMatcher';
diff --git a/src/autocomplete/NotifProvider.tsx b/src/autocomplete/NotifProvider.tsx
index b01f52fd23..b217612b0e 100644
--- a/src/autocomplete/NotifProvider.tsx
+++ b/src/autocomplete/NotifProvider.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import Room from "matrix-js-sdk/src/models/room";
 import AutocompleteProvider from './AutocompleteProvider';
 import { _t } from '../languageHandler';
diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx
index 9e72363432..01e770407c 100644
--- a/src/autocomplete/RoomProvider.tsx
+++ b/src/autocomplete/RoomProvider.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import Room from "matrix-js-sdk/src/models/room";
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 0500329ec7..357c8750f7 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
+import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {PillCompletion} from './Components';
@@ -60,18 +60,18 @@ export default class UserProvider extends AutocompleteProvider {
             shouldMatchWordsOnly: false,
         });
 
-        MatrixClientPeg.get().on("Room.timeline", this._onRoomTimeline);
-        MatrixClientPeg.get().on("RoomState.members", this._onRoomStateMember);
+        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
+        MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
     }
 
     destroy() {
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room.timeline", this._onRoomTimeline);
-            MatrixClientPeg.get().removeListener("RoomState.members", this._onRoomStateMember);
+            MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
+            MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
         }
     }
 
-    _onRoomTimeline = (ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean,
+    private onRoomTimeline = (ev: MatrixEvent, room: Room, toStartOfTimeline: boolean, removed: boolean,
                        data: IRoomTimelineData) => {
         if (!room) return;
         if (removed) return;
@@ -88,7 +88,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.onUserSpoke(ev.sender);
     };
 
-    _onRoomStateMember = (ev: MatrixEvent, state: RoomState, member: RoomMember) => {
+    private onRoomStateMember = (ev: MatrixEvent, state: RoomState, member: RoomMember) => {
         // ignore members in other rooms
         if (member.roomId !== this.room.roomId) {
             return;
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index e27aeb5a58..455b04e1ab 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -94,10 +94,10 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     }
 
     componentDidMount() {
-        this._applyNewProps();
+        this.applyNewProps();
     }
 
-    _applyNewProps(oldQuery?: string, oldRoom?: Room) {
+    private applyNewProps(oldQuery?: string, oldRoom?: Room) {
         if (oldRoom && this.props.room.roomId !== oldRoom.roomId) {
             this.autocompleter.destroy();
             this.autocompleter = new Autocompleter(this.props.room);
@@ -265,7 +265,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     }
 
     componentDidUpdate(prevProps: IProps) {
-        this._applyNewProps(prevProps.query, prevProps.room);
+        this.applyNewProps(prevProps.query, prevProps.room);
         // this is the selected completion, so scroll it into view if needed
         const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
         if (selectedCompletion && this.containerRef.current) {
diff --git a/tsconfig.json b/tsconfig.json
index dc61d72419..b87f640734 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,6 +3,7 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "resolveJsonModule": true,
+    "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2016",

From 39b36755836251b334004df4123871bf8f77a4ca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 20 Apr 2020 18:10:23 +0100
Subject: [PATCH 2283/3235] Handle load error in create secret storage dialog

---
 .../CreateSecretStorageDialog.js              | 78 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  3 +-
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 80d0683bf9..cf7f4d4126 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -26,14 +26,15 @@ import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 
 const PHASE_LOADING = 0;
-const PHASE_MIGRATE = 1;
-const PHASE_PASSPHRASE = 2;
-const PHASE_PASSPHRASE_CONFIRM = 3;
-const PHASE_SHOWKEY = 4;
-const PHASE_KEEPITSAFE = 5;
-const PHASE_STORING = 6;
-const PHASE_DONE = 7;
-const PHASE_CONFIRM_SKIP = 8;
+const PHASE_LOADERROR = 1;
+const PHASE_MIGRATE = 2;
+const PHASE_PASSPHRASE = 3;
+const PHASE_PASSPHRASE_CONFIRM = 4;
+const PHASE_SHOWKEY = 5;
+const PHASE_KEEPITSAFE = 6;
+const PHASE_STORING = 7;
+const PHASE_DONE = 8;
+const PHASE_CONFIRM_SKIP = 9;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
 const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
@@ -104,25 +105,29 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     async _fetchBackupInfo() {
-        const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-        const backupSigStatus = (
-            // we may not have started crypto yet, in which case we definitely don't trust the backup
-            MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
-        );
+        try {
+            const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            const backupSigStatus = (
+                // we may not have started crypto yet, in which case we definitely don't trust the backup
+                MatrixClientPeg.get().isCryptoEnabled() && await MatrixClientPeg.get().isKeyBackupTrusted(backupInfo)
+            );
 
-        const { force } = this.props;
-        const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
+            const { force } = this.props;
+            const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
 
-        this.setState({
-            phase,
-            backupInfo,
-            backupSigStatus,
-        });
+            this.setState({
+                phase,
+                backupInfo,
+                backupSigStatus,
+            });
 
-        return {
-            backupInfo,
-            backupSigStatus,
-        };
+            return {
+                backupInfo,
+                backupSigStatus,
+            };
+        } catch (e) {
+            this.setState({phase: PHASE_LOADERROR});
+        }
     }
 
     async _queryKeyUploadAuth() {
@@ -133,8 +138,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // no keys which would be a no-op.
             console.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
         } catch (error) {
-            if (!error.data.flows) {
+            if (!error.data || !error.data.flows) {
                 console.log("uploadDeviceSigningKeys advertised no flows!");
+                return;
             }
             const canUploadKeysWithPasswordOnly = error.data.flows.some(f => {
                 return f.stages.length === 1 && f.stages[0] === 'm.login.password';
@@ -306,6 +312,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         }
     }
 
+    _onLoadRetryClick = () => {
+        this.setState({phase: PHASE_LOADING});
+        this._fetchBackupInfo();
+    }
+
     _onSkipSetupClick = () => {
         this.setState({phase: PHASE_CONFIRM_SKIP});
     }
@@ -676,6 +687,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         </div>;
     }
 
+    _renderPhaseLoadError() {
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        return <div>
+            <p>{_t("Unable to query secret storage status")}</p>
+            <div className="mx_Dialog_buttons">
+                <DialogButtons primaryButton={_t('Retry')}
+                    onPrimaryButtonClick={this._onLoadRetryClick}
+                    hasCancel={true}
+                    onCancel={this._onCancel}
+                />
+            </div>
+        </div>;
+    }
+
     _renderPhaseDone() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
@@ -749,6 +774,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_LOADING:
                     content = this._renderBusyPhase();
                     break;
+                case PHASE_LOADERROR:
+                    content = this._renderPhaseLoadError();
+                    break;
                 case PHASE_MIGRATE:
                     content = this._renderPhaseMigrate();
                     break;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index be8f1a7a4a..8ba838d313 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2200,13 +2200,14 @@
     "<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",
+    "Unable to query secret storage status": "Unable to query secret storage status",
+    "Retry": "Retry",
     "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
     "Upgrade your encryption": "Upgrade your encryption",
     "Confirm recovery passphrase": "Confirm recovery passphrase",
     "Make a copy of your recovery key": "Make a copy of your recovery key",
     "You're done!": "You're done!",
     "Unable to set up secret storage": "Unable to set up secret storage",
-    "Retry": "Retry",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
     "Enter a recovery passphrase...": "Enter a recovery passphrase...",

From 89058f057dd93fdd448e7a1e348f57397598d9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 21 Apr 2020 06:32:14 +0000
Subject: [PATCH 2284/3235] Translated using Weblate (French)

Currently translated at 100.0% (2293 of 2293 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 6b5105226c..a06785fcc2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2395,5 +2395,7 @@
     "Submit logs": "Envoyer les journaux",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Rappel : Votre navigateur n’est pas pris en charge donc votre expérience pourrait être imprévisible.",
     "Unable to upload": "Envoi impossible",
-    "Currently indexing: %(currentRoom)s": "En train d’indexer : %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "En train d’indexer : %(currentRoom)s",
+    "Please supply a widget URL or embed code": "Veuillez fournir l’URL ou le code d’intégration du widget",
+    "Send a bug report with logs": "Envoyer un rapport d’anomalie avec les journaux"
 }

From 61c6c8de451ca78474e981087820c75c4673fc98 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 21 Apr 2020 16:27:31 +0100
Subject: [PATCH 2285/3235] Add a back button to the devtools verifications
 panel

---
 src/components/views/dialogs/DevtoolsDialog.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index de0923306f..08817cdfee 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -696,6 +696,9 @@ class VerificationExplorer extends React.Component {
                     <VerificationRequest txnId={txnId} request={request} key={txnId} />,
                 )}
             </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this.props.onBack}>{_t("Back")}</button>
+            </div>
         </div>);
     }
 }

From b8dd68dda23787350806703e814b8faaa5641c14 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 21 Apr 2020 18:36:15 +0200
Subject: [PATCH 2286/3235] wait until cross-signing keys are fetched to show
 verify button

---
 src/components/views/right_panel/UserInfo.js | 39 ++++++++++++--------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 979bac23e6..b87617c9d4 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -142,7 +142,7 @@ function useIsEncrypted(cli, room) {
 function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
     return useAsyncMemo(async () => {
         if (!canVerify) {
-            return false;
+            return undefined;
         }
         setUpdating(true);
         try {
@@ -153,7 +153,7 @@ function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
         } finally {
             setUpdating(false);
         }
-    }, [cli, member, canVerify], false);
+    }, [cli, member, canVerify], undefined);
 }
 
 function DeviceItem({userId, device}) {
@@ -1307,19 +1307,28 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const hasCrossSigningKeys =
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
+    const showDeviceListSpinner = devices === undefined;
     if (canVerify) {
-        // Note: mx_UserInfo_verifyButton is for the end-to-end tests
-        verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field mx_UserInfo_verifyButton" onClick={() => {
-                if (hasCrossSigningKeys) {
-                    verifyUser(member);
-                } else {
-                    legacyVerifyUser(member);
-                }
-            }}>
-                {_t("Verify")}
-            </AccessibleButton>
-        );
+        if (hasCrossSigningKeys !== undefined) {
+            // Note: mx_UserInfo_verifyButton is for the end-to-end tests
+            verifyButton = (
+                <AccessibleButton className="mx_UserInfo_field mx_UserInfo_verifyButton" onClick={() => {
+                    if (hasCrossSigningKeys) {
+                        verifyUser(member);
+                    } else {
+                        legacyVerifyUser(member);
+                    }
+                }}>
+                    {_t("Verify")}
+                </AccessibleButton>
+            );
+        } else if (!showDeviceListSpinner) {
+            // HACK: only show a spinner if the device section spinner is not shown,
+            // to avoid showing a double spinner
+            // We should ask for a design that includes all the different loading states here
+            const Spinner = sdk.getComponent('elements.Spinner');
+            verifyButton = <Spinner />;
+        }
     }
 
     const securitySection = (
@@ -1328,7 +1337,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
             <p>{ text }</p>
             { verifyButton }
             <DevicesSection
-                loading={devices === undefined}
+                loading={showDeviceListSpinner}
                 devices={devices}
                 userId={member.userId} />
         </div>

From d842944f61bdef92f44262a13e21f4690405c5f1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 21 Apr 2020 18:36:15 +0200
Subject: [PATCH 2287/3235] wait until cross-signing keys are fetched to show
 verify button

---
 src/components/views/right_panel/UserInfo.js | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index abe54b355e..65519270b5 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -142,7 +142,7 @@ function useIsEncrypted(cli, room) {
 function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
     return useAsyncMemo(async () => {
         if (!canVerify) {
-            return false;
+            return undefined;
         }
         setUpdating(true);
         try {
@@ -153,7 +153,7 @@ function useHasCrossSigningKeys(cli, member, canVerify, setUpdating) {
         } finally {
             setUpdating(false);
         }
-    }, [cli, member, canVerify], false);
+    }, [cli, member, canVerify], undefined);
 }
 
 function DeviceItem({userId, device}) {
@@ -1307,18 +1307,28 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     const hasCrossSigningKeys =
         useHasCrossSigningKeys(cli, member, canVerify, setUpdating );
 
+    const showDeviceListSpinner = devices === undefined;
     if (canVerify) {
-        verifyButton = (
-            <AccessibleButton className="mx_UserInfo_field" onClick={() => {
-                if (hasCrossSigningKeys) {
-                    verifyUser(member);
-                } else {
-                    legacyVerifyUser(member);
-                }
-            }}>
-                {_t("Verify")}
-            </AccessibleButton>
-        );
+        if (hasCrossSigningKeys !== undefined) {
+            // Note: mx_UserInfo_verifyButton is for the end-to-end tests
+            verifyButton = (
+                <AccessibleButton className="mx_UserInfo_field mx_UserInfo_verifyButton" onClick={() => {
+                    if (hasCrossSigningKeys) {
+                        verifyUser(member);
+                    } else {
+                        legacyVerifyUser(member);
+                    }
+                }}>
+                    {_t("Verify")}
+                </AccessibleButton>
+            );
+        } else if (!showDeviceListSpinner) {
+            // HACK: only show a spinner if the device section spinner is not shown,
+            // to avoid showing a double spinner
+            // We should ask for a design that includes all the different loading states here
+            const Spinner = sdk.getComponent('elements.Spinner');
+            verifyButton = <Spinner />;
+        }
     }
 
     const securitySection = (
@@ -1327,7 +1337,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
             <p>{ text }</p>
             { verifyButton }
             <DevicesSection
-                loading={devices === undefined}
+                loading={showDeviceListSpinner}
                 devices={devices}
                 userId={member.userId} />
         </div>

From 598cf216840c31f3913f581e66db57a61a1e606f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Apr 2020 18:01:23 +0100
Subject: [PATCH 2288/3235] discard propTypes.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/Components.tsx                  | 16 ----------------
 .../views/settings/account/PhoneNumbers.js       |  3 ++-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index 044a090078..19a7a969d6 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.tsx
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
@@ -32,13 +31,6 @@ interface ITextualCompletionProps {
 }
 
 export class TextualCompletion extends React.PureComponent<ITextualCompletionProps> {
-    static propTypes = {
-        title: PropTypes.string,
-        subtitle: PropTypes.string,
-        description: PropTypes.string,
-        className: PropTypes.string,
-    };
-
     render() {
         const {
             title,
@@ -66,14 +58,6 @@ interface IPillCompletionProps {
 }
 
 export class PillCompletion extends React.PureComponent<IPillCompletionProps> {
-    static propTypes = {
-        title: PropTypes.string,
-        subtitle: PropTypes.string,
-        description: PropTypes.string,
-        initialComponent: PropTypes.element,
-        className: PropTypes.string,
-    };
-
     render() {
         const {
             title,
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index ad2dabd8ae..bc0df4bba4 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -153,7 +153,8 @@ export default class PhoneNumbers extends React.Component {
 
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const phoneNumber = this.state.newPhoneNumber;
-        const phoneCountry = this.state.phoneCountry;
+        // const phoneCountry = this.state.phoneCountry;
+        const phoneCountry = "XK";
 
         const task = new AddThreepid();
         this.setState({verifying: true, continueDisabled: true, addTask: task});

From 65b3adfbe3df4c3eaa86bf555c867658a3323390 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Apr 2020 18:08:01 +0100
Subject: [PATCH 2289/3235] discard propTypes some more

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/Autocomplete.tsx | 23 ++++++---------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 455b04e1ab..6843df4121 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,9 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import * as PropTypes from 'prop-types';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import flatMap from 'lodash/flatMap';
 import {ICompletion, ISelectionRange, IProviderCompletions} from '../../../autocomplete/Autocompleter';
@@ -31,10 +30,14 @@ const COMPOSER_SELECTED = 0;
 export const generateCompletionDomId = (number) => `mx_Autocomplete_Completion_${number}`;
 
 interface IProps {
+    // the query string for which to show autocomplete suggestions
     query: string;
+    // method invoked with range and text content when completion is confirmed
     onConfirm: (ICompletion) => void;
+    // method invoked when selected (if any) completion changes
     onSelectionChange?: (ICompletion, number) => void;
     selection: ISelectionRange;
+    // The room in which we're autocompleting
     room: Room;
 }
 
@@ -48,20 +51,6 @@ interface IState {
 }
 
 export default class Autocomplete extends React.PureComponent<IProps, IState> {
-    static propTypes = {
-        // the query string for which to show autocomplete suggestions
-        query: PropTypes.string.isRequired,
-
-        // method invoked with range and text content when completion is confirmed
-        onConfirm: PropTypes.func.isRequired,
-
-        // method invoked when selected (if any) completion changes
-        onSelectionChange: PropTypes.func,
-
-        // The room in which we're autocompleting
-        room: PropTypes.instanceOf(Room),
-    };
-
     autocompleter: Autocompleter;
     queryRequested: string;
     debounceCompletionsRequest: NodeJS.Timeout;

From fd10ab840e28b90d6bea9ce0d29235ff2baaeba9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Apr 2020 18:10:47 +0100
Subject: [PATCH 2290/3235] undo unrelated change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/settings/account/PhoneNumbers.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index bc0df4bba4..ad2dabd8ae 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -153,8 +153,7 @@ export default class PhoneNumbers extends React.Component {
 
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const phoneNumber = this.state.newPhoneNumber;
-        // const phoneCountry = this.state.phoneCountry;
-        const phoneCountry = "XK";
+        const phoneCountry = this.state.phoneCountry;
 
         const task = new AddThreepid();
         this.setState({verifying: true, continueDisabled: true, addTask: task});

From f54e99c708c534cdec2352b7f822b884f2e51d25 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 21 Apr 2020 16:01:10 -0600
Subject: [PATCH 2291/3235] Use WidgetType more often to avoid breaking new
 sticker pickers

Turns out that setUserWidget() wasn't updated to take a real WidgetType, but the code in ScalarMessaging thought it did. This leads to integration managers trying to add sticker widgets with an object `type` rather than a string `type`, which doesn't work.

This updates other code paths which call into the various widget classes to use WidgetType more often. The actual code path for fixing widgets is resolved in WidgetUtils for the setUserWidget function body.
---
 src/ScalarAuthClient.js                     | 11 ++++++-----
 src/components/views/rooms/Stickerpicker.js |  9 ++++-----
 src/utils/WidgetUtils.js                    |  6 +++---
 src/widgets/WidgetType.ts                   |  2 ++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 819fe3c998..4994ebfdec 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -23,6 +23,7 @@ import request from "browser-request";
 
 import * as Matrix from 'matrix-js-sdk';
 import SdkConfig from "./SdkConfig";
+import {WidgetType} from "./widgets/WidgetType";
 
 // The version of the integration manager API we're intending to work with
 const imApiVersion = "1.1";
@@ -233,20 +234,20 @@ export default class ScalarAuthClient {
      * Mark all assets associated with the specified widget as "disabled" in the
      * integration manager database.
      * This can be useful to temporarily prevent purchased assets from being displayed.
-     * @param  {string} widgetType [description]
-     * @param  {string} widgetId   [description]
+     * @param  {WidgetType} widgetType The Widget Type to disable assets for
+     * @param  {string} widgetId   The widget ID to disable assets for
      * @return {Promise}           Resolves on completion
      */
-    disableWidgetAssets(widgetType, widgetId) {
+    disableWidgetAssets(widgetType: WidgetType, widgetId) {
         let url = this.apiUrl + '/widgets/set_assets_state';
         url = this.getStarterLink(url);
         return new Promise((resolve, reject) => {
             request({
-                method: 'GET',
+                method: 'GET', // XXX: Actions shouldn't be GET requests
                 uri: url,
                 json: true,
                 qs: {
-                    'widget_type': widgetType,
+                    'widget_type': widgetType.preferred,
                     'widget_id': widgetId,
                     'state': 'disable',
                 },
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 67537c4cee..9d91ab04b3 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -26,8 +26,7 @@ import PersistedElement from "../elements/PersistedElement";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
 import {ContextMenu} from "../../structures/ContextMenu";
-
-const widgetType = 'm.stickerpicker';
+import {WidgetType} from "../../../widgets/WidgetType";
 
 // This should be below the dialog level (4000), but above the rest of the UI (1000-2000).
 // We sit in a context menu, so this should be given to the context menu.
@@ -87,7 +86,7 @@ export default class Stickerpicker extends React.Component {
         console.log('Removing Stickerpicker widgets');
         if (this.state.widgetId) {
             if (scalarClient) {
-                scalarClient.disableWidgetAssets(widgetType, this.state.widgetId).then(() => {
+                scalarClient.disableWidgetAssets(WidgetType.STICKERPICKER, this.state.widgetId).then(() => {
                     console.log('Assets disabled');
                 }).catch((err) => {
                     console.error('Failed to disable assets');
@@ -364,13 +363,13 @@ export default class Stickerpicker extends React.Component {
         if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll(
                 this.props.room,
-                `type_${widgetType}`,
+                `type_${WidgetType.STICKERPICKER.preferred}`,
                 this.state.widgetId,
             );
         } else {
             IntegrationManagers.sharedInstance().getPrimaryManager().open(
                 this.props.room,
-                `type_${widgetType}`,
+                `type_${WidgetType.STICKERPICKER.preferred}`,
                 this.state.widgetId,
             );
         }
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 6a0556c2b3..676bd11415 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -210,9 +210,9 @@ export default class WidgetUtils {
         });
     }
 
-    static setUserWidget(widgetId, widgetType, widgetUrl, widgetName, widgetData) {
+    static setUserWidget(widgetId, widgetType: WidgetType, widgetUrl, widgetName, widgetData) {
         const content = {
-            type: widgetType,
+            type: widgetType.preferred,
             url: widgetUrl,
             name: widgetName,
             data: widgetData,
@@ -369,7 +369,7 @@ export default class WidgetUtils {
     static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string) {
         return WidgetUtils.setUserWidget(
             "integration_manager_" + (new Date().getTime()),
-            "m.integration_manager",
+            WidgetType.INTEGRATION_MANAGER,
             uiUrl,
             "Integration Manager: " + name,
             {"api_url": apiUrl},
diff --git a/src/widgets/WidgetType.ts b/src/widgets/WidgetType.ts
index 09c30430dd..e4b37e639c 100644
--- a/src/widgets/WidgetType.ts
+++ b/src/widgets/WidgetType.ts
@@ -16,6 +16,8 @@ limitations under the License.
 
 export class WidgetType {
     public static readonly JITSI = new WidgetType("m.jitsi", "jitsi");
+    public static readonly STICKERPICKER = new WidgetType("m.stickerpicker", "m.stickerpicker");
+    public static readonly INTEGRATION_MANAGER = new WidgetType("m.integration_manager", "m.integration_manager");
     public static readonly CUSTOM = new WidgetType("m.custom", "m.custom");
 
     constructor(public readonly preferred: string, public readonly legacy: string) {

From d851f2e45fd4e7584fd3cb2fda9d99b6facab6f0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 00:27:20 -0600
Subject: [PATCH 2292/3235] Fix OpenID requests from widgets

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

Widgets can request an OpenID token to authenticate the user when the widget is missing authentication information. A common case for this is the Dimension sticker picker: sometimes the Riot is running in doesn't have the configuration to match the Dimension instance, so Riot rightly refuses to send an auth token to the widget. When this happens, it requests a token through postMessage().

There's a toggle on the permission dialog to remember the setting, which is the widget's security key. As an added measure, the security key generation ensures the widget URL matches as the 'remember this choice' toggle will silently work in the background, and it could be dangerous if the widget's URL changed and Riot secretly allows the widget to identify the user. This check was failing because the WidgetMessaging class was being set up with the rendered URL, which will not match the widget's URL at all. To fix this, we simply use the widget's URL to set up the messaging, which by proxy uses the right URL in calculating the security key.
---
 src/components/views/elements/AppTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 58bfda8d22..abf6f306ab 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -423,8 +423,13 @@ export default class AppTile extends React.Component {
     _setupWidgetMessaging() {
         // FIXME: There's probably no reason to do this here: it should probably be done entirely
         // in ActiveWidgetStore.
+
+        // We use the app's URL over the rendered URL so that anything the widget does which could
+        // lead to requesting a "security key" will pass accordingly. The only other thing this URL
+        // is used for is to determine the origin we're talking to, and therefore we don't need the
+        // fully templated URL.
         const widgetMessaging = new WidgetMessaging(
-            this.props.app.id, this._getRenderedUrl(), this.props.userWidget, this._appFrame.current.contentWindow);
+            this.props.app.id, this.props.app.url, this.props.userWidget, this._appFrame.current.contentWindow);
         ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
             console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);

From 3a360b91b968224aa1e20ae09e3fd5794220b202 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 00:34:08 -0600
Subject: [PATCH 2293/3235] Update logging for unmanaged widgets, and add TODO
 comments for other areas

Just a minor thing that is bothersome. Renaming classes and functions is a bit more of an impact than is worth right now, so have settled for littering TODO comments all over the place.
---
 src/ScalarAuthClient.js                  | 2 ++
 src/ScalarMessaging.js                   | 2 ++
 src/components/views/elements/AppTile.js | 5 +++--
 src/utils/WidgetUtils.js                 | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 819fe3c998..1253023c53 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -27,6 +27,8 @@ import SdkConfig from "./SdkConfig";
 // The version of the integration manager API we're intending to work with
 const imApiVersion = "1.1";
 
+// TODO: Generify the name of this class and all components within - it's not just for Scalar.
+
 export default class ScalarAuthClient {
     constructor(apiUrl, uiUrl) {
         this.apiUrl = apiUrl;
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 607f702c73..9731e42825 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Generify the name of this and all components within - it's not just for scalar.
+
 /*
 Listens for incoming postMessage requests from the integrations UI URL. The following API is exposed:
 {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 58bfda8d22..86da0fbb58 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -188,13 +188,14 @@ export default class AppTile extends React.Component {
         }
     }
 
+    // TODO: Generify the name of this function. It's not just scalar tokens.
     /**
      * Adds a scalar token to the widget URL, if required
      * Component initialisation is only complete when this function has resolved
      */
     setScalarToken() {
         if (!WidgetUtils.isScalarUrl(this.props.app.url)) {
-            console.warn('Non-scalar widget, not setting scalar token!', url);
+            console.warn('Widget does not match integration manager, refusing to set auth token', url);
             this.setState({
                 error: null,
                 widgetUrl: this._addWurlParams(this.props.app.url),
@@ -218,7 +219,7 @@ export default class AppTile extends React.Component {
 
         const defaultManager = managers.getPrimaryManager();
         if (!WidgetUtils.isScalarUrl(defaultManager.apiUrl)) {
-            console.warn('Non-scalar manager, not setting scalar token!', url);
+            console.warn('Unknown integration manager, refusing to set auth token', url);
             this.setState({
                 error: null,
                 widgetUrl: this._addWurlParams(this.props.app.url),
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 6a0556c2b3..62113b652b 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -72,6 +72,7 @@ export default class WidgetUtils {
         return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
     }
 
+    // TODO: Generify the name of this function. It's not just scalar.
     /**
      * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
      * @param  {[type]}  testUrlString URL to check

From 927142a1bbb229bc219a0ee99c9f69cb4dfb6869 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 22 Apr 2020 02:23:55 +0000
Subject: [PATCH 2294/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2294 of 2294 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index a987b2e6c0..2a34e8140f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2395,5 +2395,7 @@
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "注意：您的瀏覽器不受支援，所以您的使用體驗可能無法預測。",
     "Unable to upload": "無法上傳",
     "Currently indexing: %(currentRoom)s": "目前正在建立索引：%(currentRoom)s",
-    "Send a bug report with logs": "傳送有紀錄檔的臭蟲回報"
+    "Send a bug report with logs": "傳送有紀錄檔的臭蟲回報",
+    "Please supply a widget URL or embed code": "請提供小工具 URL 或嵌入程式碼",
+    "Unable to query secret storage status": "無法查詢秘密儲存空間狀態"
 }

From 1958e556774b1fdb0b966fc37b256f1e295db3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 22 Apr 2020 07:03:35 +0000
Subject: [PATCH 2295/3235] Translated using Weblate (French)

Currently translated at 100.0% (2294 of 2294 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 a06785fcc2..6ea4755dee 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2397,5 +2397,6 @@
     "Unable to upload": "Envoi impossible",
     "Currently indexing: %(currentRoom)s": "En train d’indexer : %(currentRoom)s",
     "Please supply a widget URL or embed code": "Veuillez fournir l’URL ou le code d’intégration du widget",
-    "Send a bug report with logs": "Envoyer un rapport d’anomalie avec les journaux"
+    "Send a bug report with logs": "Envoyer un rapport d’anomalie avec les journaux",
+    "Unable to query secret storage status": "Impossible de demander le statut du coffre secret"
 }

From bc989abff6f97cedce5ff4b2c0767285a67f000f Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 21 Apr 2020 12:21:39 +0000
Subject: [PATCH 2296/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2294 of 2294 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 | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a2796c103c..3b7ae2e00f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2363,5 +2363,37 @@
     "Use your other device to continue…": "Usa il tuo altro dispositivo per continuare…",
     "Syncing...": "Sincronizzazione...",
     "Signing In...": "Accesso...",
-    "If you've joined lots of rooms, this might take a while": "Se sei dentro a molte stanze, potrebbe impiegarci un po'"
+    "If you've joined lots of rooms, this might take a while": "Se sei dentro a molte stanze, potrebbe impiegarci un po'",
+    "If you cancel now, you won't complete your operation.": "Se annulli adesso, non completerai l'operazione.",
+    "Please supply a widget URL or embed code": "Inserisci un URL del widget o un codice di incorporamento",
+    "Send a bug report with logs": "Invia una segnalazione di errore con i registri",
+    "Enable cross-signing to verify per-user instead of per-session": "Attiva la firma incrociata per verificare per-utente invece di per-sessione",
+    "Keep recovery passphrase in memory for this session": "Tieni la password di ripristino in memoria per questa sessione",
+    "Can't load this message": "Impossibile caricare questo messaggio",
+    "Submit logs": "Invia registri",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Promemoria: il tuo browser non è supportato, perciò la tua esperienza può essere imprevedibile.",
+    "Unable to upload": "Impossibile inviare",
+    "Verify other session": "Verifica l'altra sessione",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di ripristino giusta.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Attenzione</b>: dovresti farlo solo con un computer fidato.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Accedi alla cronologia dei messaggi sicuri e all'identità di firma incrociata per verificare altre sessioni inserendo la password di ripristino.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se hai dimenticato la password di ripristino puoi <button1>usare la chiave di ripristino</button1> o <button2>configurare nuove opzioni di recupero</button2>.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Impossibile decifrare il backup con questa chiave di ripristino: verifica di avere inserito la chiave di ripristino giusta.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Impossibile decifrare il backup con questa password di ripristino: verifica di avere inserito la password di ripristino giusta.",
+    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Se non riesci ad accedere, <button>usa la chiave o password di ripristino.</button>",
+    "Great! This recovery passphrase looks strong enough.": "Ottimo! Questa password di ripristino sembra abbastanza robusta.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Imposta una password di ripristino per proteggere le informazioni cifrate e recuperarle se ti disconnetti. Dovrebbe essere diversa dalla password dell'account:",
+    "Enter a recovery passphrase": "Inserisci una password di ripristino",
+    "Back up encrypted message keys": "Fai un backup delle chiavi dei messaggi cifrati",
+    "Enter your recovery passphrase a second time to confirm it.": "Inserisci di nuovo la password di ripristino per confermarla.",
+    "Confirm your recovery passphrase": "Conferma la password di ripristino",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "La chiave di ripristino è come una rete di sicurezza - puoi usarla per recuperare l'accesso ai messaggi cifrati se dimentichi la password di ripristino.",
+    "Unable to query secret storage status": "Impossibile rilevare lo stato dell'archivio segreto",
+    "Confirm recovery passphrase": "Conferma la password di ripristino",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password di ripristino.",
+    "Enter a recovery passphrase...": "Inserisci una password di ripristino...",
+    "Please enter your recovery passphrase a second time to confirm.": "Inserisci di nuovo la password di ripristino per confermarla.",
+    "Repeat your recovery passphrase...": "Ripeti la password di ripristino...",
+    "Secure your backup with a recovery passphrase": "Proteggi il backup con una password di ripristino",
+    "Currently indexing: %(currentRoom)s": "Attualmente si indicizzano: %(currentRoom)s"
 }

From 7d89c385facdaa7859a9a665266dea36e7d943b2 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Tue, 21 Apr 2020 13:02:32 +0000
Subject: [PATCH 2297/3235] Translated using Weblate (Russian)

Currently translated at 91.0% (2087 of 2294 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 | 55 +++++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f0e8b44678..24fd434155 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -993,7 +993,7 @@
     "Verified!": "Верифицировано!",
     "You've successfully verified this user.": "Вы успешно верифицировали этого пользователя.",
     "Got It": "Понятно",
-    "Verify this user by confirming the following number appears on their screen.": "Верифицируйте пользователя, убедившись, что на его экране отображается следующее число.",
+    "Verify this user by confirming the following number appears on their screen.": "Подтвердите пользователя, убедившись, что на его экране отображается следующее число.",
     "Yes": "Да",
     "No": "Нет",
     "Email Address": "Адрес электронной почты",
@@ -1058,7 +1058,7 @@
     "Legal": "Законный",
     "Room avatar": "Аватар комнаты",
     "The following users may not exist": "Следующих пользователей может не существовать",
-    "Invite anyway and never warn me again": "Тем не менее пригласить и больше не предупреждать",
+    "Invite anyway and never warn me again": "Пригласить и больше не предупреждать",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Перед отправкой логов необходимо <a>создать GitHub issue</a>, для описания проблемы.",
     "Incompatible Database": "Несовместимая база данных",
     "Continue With Encryption Disabled": "Продолжить с отключенным шифрованием",
@@ -1278,7 +1278,7 @@
     "Sign In": "Войти",
     "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны %(memberName)s из %(roomName)s",
     "Reason: %(reason)s": "Причина: %(reason)s",
-    "Forget this room": "Забудь эту комнату",
+    "Forget this room": "Забыть эту комнату",
     "Re-join": "Пере-присоединение",
     "You were banned from %(roomName)s by %(memberName)s": "Вы были забанены %(memberName)s с %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "Что-то пошло не так с вашим приглашением в %(roomName)s",
@@ -1350,9 +1350,9 @@
     "Missing session data": "Отсутствуют данные сессии",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Отсутствуют некоторые данные сессии, в том числе ключи шифрования сообщений. Выйдите и войдите, чтобы восстановить ключи из резервной копии.",
     "Your browser likely removed this data when running low on disk space.": "Вероятно, ваш браузер удалил эти данные, когда на дисковом пространстве оставалось мало места.",
-    "Upload files (%(current)s of %(total)s)": "Загрузка файлов %(current)s от %(total)s",
+    "Upload files (%(current)s of %(total)s)": "Загрузка файлов (%(current)s из %(total)s)",
     "Upload files": "Загрузка файлов",
-    "Upload": "Загрузка",
+    "Upload": "Загрузить",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Этот файл <b>слишком большой</b> для загрузки. Лимит размера файла составляет %(limit)s но этот файл %(sizeOfThisFile)s.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Эти файлы <b>слишком большие</b> для загрузки. Лимит размера файла составляет %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Некоторые файлы имеют <b>слишком большой размер</b>, чтобы их можно было загрузить. Лимит размера файла составляет %(limit)s.",
@@ -1730,7 +1730,7 @@
     "Sessions": "Сессии",
     "Direct Messages": "Диалоги",
     "%(count)s sessions|other": "%(count)s сессий",
-    "Hide sessions": "Скрытые сессии",
+    "Hide sessions": "Скрыть сессии",
     "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
     "Unknown sessions": "Неизвестные сессии",
     "Help": "Помощь",
@@ -2054,8 +2054,8 @@
     "%(displayName)s cancelled verification.": "%(displayName)s отменил(а) подтверждение.",
     "Encryption not enabled": "Шифрование не включено",
     "The encryption used by this room isn't supported.": "Шифрование этой комнаты не поддерживается.",
-    "You verified %(name)s": "Вы подтвердили",
-    "You cancelled verifying %(name)s": "Вы отменили подтверждение",
+    "You verified %(name)s": "Вы подтвердили %(name)s",
+    "You cancelled verifying %(name)s": "Вы отменили подтверждение %(name)s",
     "You accepted": "Вы приняли",
     "%(name)s accepted": "%(name)s принял(а)",
     "You declined": "Вы отказали",
@@ -2067,7 +2067,7 @@
     "%(name)s wants to verify": "%(name)s желает подтвердить",
     "You sent a verification request": "Вы отправили запрос подтверждения",
     "Reactions": "Реакции",
-    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> отреагировал(а)",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> отреагировал(а) с %(content)s</reactedWith>",
     "Your display name": "Отображаемое имя",
     "Your avatar URL": "Ссылка на ваш аватар",
     "One of the following may be compromised:": "Что-то из этого может быть скомпрометировано:",
@@ -2081,7 +2081,7 @@
     "Room ID": "ID комнаты",
     "Widget ID": "ID виджета",
     "Widget added by": "Виджет добавлен",
-    "This widget may use cookies.": "Этот виджет может использовать куки",
+    "This widget may use cookies.": "Этот виджет может использовать куки.",
     "More options": "Дополнительные параметры",
     "Language Dropdown": "Список языков",
     "Enter a server name": "Введите имя сервера",
@@ -2102,7 +2102,7 @@
     "Verify session": "Подтвердить сессию",
     "Session name": "Название сессии",
     "Session key": "Ключ сессии",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервная копия ключа сохранена в хранилище секретов",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервная копия ключа сохранена в хранилище секретов, но эта возможность не включена в этой сессии. Разрешите кросс-подпись в Лаборатории, чтобы изменить состояние резервной копии.",
     "Backup key stored: ": "Резервная копия ключа сохранена: ",
     "Command failed": "Не удалось выполнить команду",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
@@ -2113,5 +2113,36 @@
     "Enter a recovery passphrase": "Введите пароль восстановления",
     "Enter your recovery passphrase a second time to confirm it.": "Введите пароль восстановления ещё раз для подтверждения.",
     "Enter a recovery passphrase...": "Введите пароль восстановления...",
-    "Please enter your recovery passphrase a second time to confirm.": "Введите пароль восстановления повторно для подтверждения."
+    "Please enter your recovery passphrase a second time to confirm.": "Введите пароль восстановления повторно для подтверждения.",
+    "If you cancel now, you won't complete your operation.": "Если вы отмените операцию сейчас, она не завершится.",
+    "Failed to set topic": "Не удалось установить тему",
+    "Could not find user in room": "Не удалось найти пользователя в комнате",
+    "Please supply a widget URL or embed code": "Укажите URL или код вставки виджета",
+    "Send a bug report with logs": "Отправить отчёт об ошибке с логами",
+    "Enable cross-signing to verify per-user instead of per-session": "Разрешить кросс-подпись для подтверждения пользователей вместо отдельных сессий",
+    "Keep recovery passphrase in memory for this session": "Сохранить пароль восстановления в памяти для этой сессии",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Отдельно подтверждать каждую сессию пользователя как доверенную, не доверяя кросс-подписанным устройствам.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска с помощью ",
+    " to store messages from ": " чтобы сохранить сообщения от ",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Отсутствуют некоторые необходимые компоненты для Riot, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно Riot Desktop с <nativeLink>добавлением поисковых компонентов</nativeLink>.",
+    "not stored": "не сохранено",
+    "Backup has a <validity>valid</validity> signature from this session": "У резервной копии <validity>верная</validity> подпись этой сессии",
+    "Backup has an <validity>invalid</validity> signature from this session": "У резервной копии <validity>неверная</validity> подпись этой сессии",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "У резервной копии <validity>верная</validity>подпись <verify>проверенной</verify> сессии <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "У резервной копии <validity>верная</validity>подпись <verify>непроверенной</verify> сессии <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "У резервной копии <validity>неверная</validity>подпись <verify>проверенной</verify> сессии <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "У резервной копии <validity>неверная</validity> подпись <verify>непроверенной</verify> сессии <device></device>",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ваш пароль был успешно изменён. Вы не будете получать уведомления в других сессия, пока вы не войдёте в них",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Добавьте пользователей и серверы, которых вы хотите игнорировать. Используйте звёздочки для совпадения с любыми символами. Например, <code>@bot:*</code> приведёт к игнорированию всех пользователей на любом сервере, у которых есть 'bot' в имени.",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Эта комната пересылает сообщения с помощью моста на следующие платформы. <a>Подробнее</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Эта комната не пересылает никуда сообщения с помощью моста. <a>Подробнее</a>",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Запрос ключа был отправлен - проверьте другие ваши сессии на предмет таких запросов.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Вы не сможете расшифровать это сообщение в других сессиях, если у них нет ключа для него.",
+    "No sessions with registered encryption keys": "Нет сессий с зарегистрированными ключами шифрования",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Для дополнительной безопасности подтвердите этого пользователя, сравнив одноразовый код на ваших устройствах.",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong>в %(roomName)s",
+    "Start verification again from their profile.": "Начните подтверждение заново в профиле пользователя.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователя в его профиле.",
+    "Send a Direct Message": "Отправить сообщение"
 }

From 4bbd507e7abc7bf7bae1f15d25387bdc5ba55e31 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 11:33:45 +0100
Subject: [PATCH 2298/3235] If user cannot set email during registration don't
 tell them to

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/auth/RegistrationForm.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index a89f8c6298..f1624bc9e5 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -102,11 +102,15 @@ export default createReactClass({
                     "No identity server is configured so you cannot add an email address in order to " +
                     "reset your password in the future.",
                 );
-            } else {
+            } else if (this._showEmail()) {
                 desc = _t(
                     "If you don't specify an email address, you won't be able to reset your password. " +
                     "Are you sure?",
                 );
+            } else {
+                // user can't set an e-mail so don't prompt them to
+                self._doSubmit(ev);
+                return;
             }
 
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");

From 89345c9e8bfdb47d49fce92aef881f7357abe0ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 11:55:03 +0100
Subject: [PATCH 2299/3235] Convert MatrixChat to an ES6 Class Component

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 367 ++++++++++++------------
 1 file changed, 179 insertions(+), 188 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1293ccc7e9..e93b81109a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -112,15 +112,11 @@ const ONBOARDING_FLOW_STARTERS = [
     'view_create_group',
 ];
 
-export default createReactClass({
-    // we export this so that the integration tests can use it :-S
-    statics: {
-        VIEWS: VIEWS,
-    },
+export default class MatrixChat extends React.PureComponent {
+    static VIEWS = VIEWS; // we export this so that the integration tests can use it :-S
+    static displayName = "MatrixChat";
 
-    displayName: 'MatrixChat',
-
-    propTypes: {
+    static propTypes = {
         config: PropTypes.object,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig),
         ConferenceHandler: PropTypes.any,
@@ -150,10 +146,19 @@ export default createReactClass({
 
         // A function that makes a registration URL
         makeRegistrationUrl: PropTypes.func.isRequired,
-    },
+    };
 
-    getInitialState: function() {
-        const s = {
+    static defaultProps = {
+        realQueryParams: {},
+        startingFragmentQueryParams: {},
+        config: {},
+        onTokenLoginCompleted: () => {},
+    };
+
+    constructor(props, context) {
+        super(props, context);
+
+        this.state = {
             // the master view we are showing.
             view: VIEWS.LOADING,
 
@@ -194,35 +199,7 @@ export default createReactClass({
             resizeNotifier: new ResizeNotifier(),
             showNotifierToolbar: false,
         };
-        return s;
-    },
 
-    getDefaultProps: function() {
-        return {
-            realQueryParams: {},
-            startingFragmentQueryParams: {},
-            config: {},
-            onTokenLoginCompleted: () => {},
-        };
-    },
-
-    getFallbackHsUrl: function() {
-        if (this.props.serverConfig && this.props.serverConfig.isDefault) {
-            return this.props.config.fallback_hs_url;
-        } else {
-            return null;
-        }
-    },
-
-    getServerProperties() {
-        let props = this.state.serverConfig;
-        if (!props) props = this.props.serverConfig; // for unit tests
-        if (!props) props = SdkConfig.get()["validated_server_config"];
-        return {serverConfig: props};
-    },
-
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount: function() {
         SdkConfig.put(this.props.config);
 
         // Used by _viewRoom before getting state from sync
@@ -325,9 +302,53 @@ export default createReactClass({
         if (SettingsStore.getValue("analyticsOptIn")) {
             Analytics.enable();
         }
-    },
+    }
 
-    _loadSession: function() {
+    // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
+    UNSAFE_componentWillUpdate(props, state) {
+        if (this.shouldTrackPageChange(this.state, state)) {
+            this.startPageChangeTimer();
+        }
+    }
+
+    componentDidUpdate(prevProps, prevState) {
+        if (this.shouldTrackPageChange(prevState, this.state)) {
+            const durationMs = this.stopPageChangeTimer();
+            Analytics.trackPageChange(durationMs);
+        }
+        if (this.focusComposer) {
+            dis.dispatch({action: 'focus_composer'});
+            this.focusComposer = false;
+        }
+    }
+
+    componentWillUnmount() {
+        Lifecycle.stopMatrixClient();
+        dis.unregister(this.dispatcherRef);
+        this._themeWatcher.stop();
+        window.removeEventListener("focus", this.onFocus);
+        window.removeEventListener('resize', this.handleResize);
+        this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
+
+        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
+    }
+
+    getFallbackHsUrl() {
+        if (this.props.serverConfig && this.props.serverConfig.isDefault) {
+            return this.props.config.fallback_hs_url;
+        } else {
+            return null;
+        }
+    }
+
+    getServerProperties() {
+        let props = this.state.serverConfig;
+        if (!props) props = this.props.serverConfig; // for unit tests
+        if (!props) props = SdkConfig.get()["validated_server_config"];
+        return {serverConfig: props};
+    }
+
+    _loadSession() {
         // the extra Promise.resolve() ensures that synchronous exceptions hit the same codepath as
         // asynchronous ones.
         return Promise.resolve().then(() => {
@@ -347,36 +368,7 @@ export default createReactClass({
         // Note we don't catch errors from this: we catch everything within
         // loadSession as there's logic there to ask the user if they want
         // to try logging out.
-    },
-
-    componentWillUnmount: function() {
-        Lifecycle.stopMatrixClient();
-        dis.unregister(this.dispatcherRef);
-        this._themeWatcher.stop();
-        window.removeEventListener("focus", this.onFocus);
-        window.removeEventListener('resize', this.handleResize);
-        this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
-
-        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
-    },
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
-    UNSAFE_componentWillUpdate: function(props, state) {
-        if (this.shouldTrackPageChange(this.state, state)) {
-            this.startPageChangeTimer();
-        }
-    },
-
-    componentDidUpdate: function(prevProps, prevState) {
-        if (this.shouldTrackPageChange(prevState, this.state)) {
-            const durationMs = this.stopPageChangeTimer();
-            Analytics.trackPageChange(durationMs);
-        }
-        if (this.focusComposer) {
-            dis.dispatch({action: 'focus_composer'});
-            this.focusComposer = false;
-        }
-    },
+    }
 
     startPageChangeTimer() {
         // Tor doesn't support performance
@@ -390,7 +382,7 @@ export default createReactClass({
         }
         this._pageChanging = true;
         performance.mark('riot_MatrixChat_page_change_start');
-    },
+    }
 
     stopPageChangeTimer() {
         // Tor doesn't support performance
@@ -415,15 +407,15 @@ export default createReactClass({
         if (!measurement) return null;
 
         return measurement.duration;
-    },
+    }
 
     shouldTrackPageChange(prevState, state) {
         return prevState.currentRoomId !== state.currentRoomId ||
             prevState.view !== state.view ||
             prevState.page_type !== state.page_type;
-    },
+    }
 
-    setStateForNewView: function(state) {
+    setStateForNewView(state) {
         if (state.view === undefined) {
             throw new Error("setStateForNewView with no view!");
         }
@@ -432,9 +424,9 @@ export default createReactClass({
         };
         Object.assign(newState, state);
         this.setState(newState);
-    },
+    }
 
-    onAction: function(payload) {
+    onAction = (payload) => {
         // console.log(`MatrixClientPeg.onAction: ${payload.action}`);
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
@@ -596,8 +588,8 @@ export default createReactClass({
             case 'view_create_group': {
                 const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
                 Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
+                break;
             }
-            break;
             case 'view_room_directory': {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
@@ -605,8 +597,8 @@ export default createReactClass({
 
                 // View the welcome or home page if we need something to look at
                 this._viewSomethingBehindModal();
+                break;
             }
-            break;
             case 'view_my_groups':
                 this._setPage(PageTypes.MyGroups);
                 this.notifyNewScreen('groups');
@@ -648,9 +640,8 @@ export default createReactClass({
                     dis.dispatch({action: 'view_my_groups'});
                 }
                 break;
-            case 'notifier_enabled': {
-                    this.setState({showNotifierToolbar: Notifier.shouldShowToolbar()});
-                }
+            case 'notifier_enabled':
+                this.setState({showNotifierToolbar: Notifier.shouldShowToolbar()});
                 break;
             case 'hide_left_panel':
                 this.setState({
@@ -739,15 +730,15 @@ export default createReactClass({
                 });
                 break;
         }
-    },
+    };
 
-    _setPage: function(pageType) {
+    _setPage(pageType) {
         this.setState({
             page_type: pageType,
         });
-    },
+    }
 
-    _startRegistration: async function(params) {
+    async _startRegistration(params) {
         const newState = {
             view: VIEWS.REGISTER,
         };
@@ -773,10 +764,10 @@ export default createReactClass({
         ThemeController.isLogin = true;
         this._themeWatcher.recheck();
         this.notifyNewScreen('register');
-    },
+    }
 
     // TODO: Move to RoomViewStore
-    _viewNextRoom: function(roomIndexDelta) {
+    _viewNextRoom(roomIndexDelta) {
         const allRooms = RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms(),
         );
@@ -802,10 +793,10 @@ export default createReactClass({
             action: 'view_room',
             room_id: allRooms[roomIndex].roomId,
         });
-    },
+    }
 
     // TODO: Move to RoomViewStore
-    _viewIndexedRoom: function(roomIndex) {
+    _viewIndexedRoom(roomIndex) {
         const allRooms = RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms(),
         );
@@ -815,7 +806,7 @@ export default createReactClass({
                 room_id: allRooms[roomIndex].roomId,
             });
         }
-    },
+    }
 
     // switch view to the given room
     //
@@ -834,7 +825,7 @@ export default createReactClass({
     // @param {Object=} roomInfo.oob_data Object of additional data about the room
     //                               that has been passed out-of-band (eg.
     //                               room name and avatar from an invite email)
-    _viewRoom: function(roomInfo) {
+    _viewRoom(roomInfo) {
         this.focusComposer = true;
 
         const newState = {
@@ -895,9 +886,9 @@ export default createReactClass({
                 this.notifyNewScreen('room/' + presentedId);
             });
         });
-    },
+    }
 
-    _viewGroup: function(payload) {
+    _viewGroup(payload) {
         const groupId = payload.group_id;
         this.setState({
             currentGroupId: groupId,
@@ -905,7 +896,7 @@ export default createReactClass({
         });
         this._setPage(PageTypes.GroupView);
         this.notifyNewScreen('group/' + groupId);
-    },
+    }
 
     _viewSomethingBehindModal() {
         if (this.state.view !== VIEWS.LOGGED_IN) {
@@ -915,7 +906,7 @@ export default createReactClass({
         if (!this.state.currentGroupId && !this.state.currentRoomId) {
             this._viewHome();
         }
-    },
+    }
 
     _viewWelcome() {
         this.setStateForNewView({
@@ -924,9 +915,9 @@ export default createReactClass({
         this.notifyNewScreen('welcome');
         ThemeController.isLogin = true;
         this._themeWatcher.recheck();
-    },
+    }
 
-    _viewHome: function() {
+    _viewHome() {
         // The home page requires the "logged in" view, so we'll set that.
         this.setStateForNewView({
             view: VIEWS.LOGGED_IN,
@@ -935,9 +926,9 @@ export default createReactClass({
         this.notifyNewScreen('home');
         ThemeController.isLogin = false;
         this._themeWatcher.recheck();
-    },
+    }
 
-    _viewUser: function(userId, subAction) {
+    _viewUser(userId, subAction) {
         // Wait for the first sync so that `getRoom` gives us a room object if it's
         // in the sync response
         const waitForSync = this.firstSyncPromise ?
@@ -951,9 +942,9 @@ export default createReactClass({
             this.setState({currentUserId: userId});
             this._setPage(PageTypes.UserView);
         });
-    },
+    }
 
-    _setMxId: function(payload) {
+    _setMxId(payload) {
         const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
         const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, {
             homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
@@ -981,9 +972,9 @@ export default createReactClass({
                 close();
             },
         }).close;
-    },
+    }
 
-    _createRoom: async function() {
+    async _createRoom() {
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
 
@@ -991,9 +982,9 @@ export default createReactClass({
         if (shouldCreate) {
             createRoom(opts);
         }
-    },
+    }
 
-    _chatCreateOrReuse: function(userId) {
+    _chatCreateOrReuse(userId) {
         // Use a deferred action to reshow the dialog once the user has registered
         if (MatrixClientPeg.get().isGuest()) {
             // No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
@@ -1039,9 +1030,9 @@ export default createReactClass({
                 user_id: userId,
             });
         }
-    },
+    }
 
-    _leaveRoomWarnings: function(roomId) {
+    _leaveRoomWarnings(roomId) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         // Show a warning if there are additional complications.
         const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
@@ -1058,9 +1049,9 @@ export default createReactClass({
             }
         }
         return warnings;
-    },
+    }
 
-    _leaveRoom: function(roomId) {
+    _leaveRoom(roomId) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
@@ -1071,7 +1062,7 @@ export default createReactClass({
             description: (
                 <span>
                 { _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
-                { warnings }
+                    { warnings }
                 </span>
             ),
             button: _t("Leave"),
@@ -1124,7 +1115,7 @@ export default createReactClass({
                 }
             },
         });
-    },
+    }
 
     /**
      * Starts a chat with the welcome user, if the user doesn't already have one
@@ -1179,12 +1170,12 @@ export default createReactClass({
             return roomId;
         }
         return null;
-    },
+    }
 
     /**
      * Called when a new logged in session has started
      */
-    _onLoggedIn: async function() {
+    async _onLoggedIn() {
         ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
@@ -1215,9 +1206,9 @@ export default createReactClass({
         }
 
         StorageManager.tryPersistStorage();
-    },
+    }
 
-    _showScreenAfterLogin: function() {
+    _showScreenAfterLogin() {
         // If screenAfterLogin is set, use that, then null it so that a second login will
         // result in view_home_page, _user_settings or _room_directory
         if (this._screenAfterLogin && this._screenAfterLogin.screen) {
@@ -1240,19 +1231,19 @@ export default createReactClass({
                 });
             }
         }
-    },
+    }
 
-    _viewLastRoom: function() {
+    _viewLastRoom() {
         dis.dispatch({
             action: 'view_room',
             room_id: localStorage.getItem('mx_last_room_id'),
         });
-    },
+    }
 
     /**
      * Called when the session is logged out
      */
-    _onLoggedOut: function() {
+    _onLoggedOut() {
         this.notifyNewScreen('login');
         this.setStateForNewView({
             view: VIEWS.LOGIN,
@@ -1264,12 +1255,12 @@ export default createReactClass({
         this._setPageSubtitle();
         ThemeController.isLogin = true;
         this._themeWatcher.recheck();
-    },
+    }
 
     /**
      * Called when the session is softly logged out
      */
-    _onSoftLogout: function() {
+    _onSoftLogout() {
         this.notifyNewScreen('soft_logout');
         this.setStateForNewView({
             view: VIEWS.SOFT_LOGOUT,
@@ -1279,7 +1270,7 @@ export default createReactClass({
         });
         this.subTitleStatus = '';
         this._setPageSubtitle();
-    },
+    }
 
     /**
      * Called just before the matrix client is started
@@ -1383,10 +1374,10 @@ export default createReactClass({
                 title: _t('Terms and Conditions'),
                 description: <div>
                     <p> { _t(
-                            'To continue using the %(homeserverDomain)s homeserver ' +
-                            'you must review and agree to our terms and conditions.',
-                            { homeserverDomain: cli.getDomain() },
-                        ) }
+                        'To continue using the %(homeserverDomain)s homeserver ' +
+                        'you must review and agree to our terms and conditions.',
+                        { homeserverDomain: cli.getDomain() },
+                    ) }
                     </p>
                 </div>,
                 button: _t('Review terms and conditions'),
@@ -1533,14 +1524,14 @@ export default createReactClass({
         // A later sync can/will correct the tint to be the right value for the user
         const colorScheme = SettingsStore.getValue("roomColor");
         Tinter.tint(colorScheme.primary_color, colorScheme.secondary_color);
-    },
+    }
 
     /**
      * Called shortly after the matrix client has started. Useful for
      * setting up anything that requires the client to be started.
      * @private
      */
-    _onClientStarted: function() {
+    _onClientStarted() {
         const cli = MatrixClientPeg.get();
 
         if (cli.isCryptoEnabled()) {
@@ -1559,9 +1550,9 @@ export default createReactClass({
                 !SettingsStore.getValue("feature_cross_signing"),
             );
         }
-    },
+    }
 
-    showScreen: function(screen, params) {
+    showScreen(screen, params) {
         if (screen == 'register') {
             dis.dispatch({
                 action: 'start_registration',
@@ -1706,21 +1697,21 @@ export default createReactClass({
         } else {
             console.info("Ignoring showScreen for '%s'", screen);
         }
-    },
+    }
 
-    notifyNewScreen: function(screen) {
+    notifyNewScreen(screen) {
         if (this.props.onNewScreen) {
             this.props.onNewScreen(screen);
         }
         this._setPageSubtitle();
-    },
+    }
 
-    onAliasClick: function(event, alias) {
+    onAliasClick(event, alias) {
         event.preventDefault();
         dis.dispatch({action: 'view_room', room_alias: alias});
-    },
+    }
 
-    onUserClick: function(event, userId) {
+    onUserClick(event, userId) {
         event.preventDefault();
 
         const member = new Matrix.RoomMember(null, userId);
@@ -1729,22 +1720,22 @@ export default createReactClass({
             action: 'view_user',
             member: member,
         });
-    },
+    }
 
-    onGroupClick: function(event, groupId) {
+    onGroupClick(event, groupId) {
         event.preventDefault();
         dis.dispatch({action: 'view_group', group_id: groupId});
-    },
+    }
 
-    onLogoutClick: function(event) {
+    onLogoutClick(event) {
         dis.dispatch({
             action: 'logout',
         });
         event.stopPropagation();
         event.preventDefault();
-    },
+    }
 
-    handleResize: function(e) {
+    handleResize = (e) => {
         const hideLhsThreshold = 1000;
         const showLhsThreshold = 1000;
 
@@ -1757,49 +1748,49 @@ export default createReactClass({
 
         this.state.resizeNotifier.notifyWindowResized();
         this._windowWidth = window.innerWidth;
-    },
+    };
 
     _dispatchTimelineResize() {
         dis.dispatch({ action: 'timeline_resize' });
-    },
+    }
 
-    onRoomCreated: function(roomId) {
+    onRoomCreated(roomId) {
         dis.dispatch({
             action: "view_room",
             room_id: roomId,
         });
-    },
+    }
 
-    onRegisterClick: function() {
+    onRegisterClick = () => {
         this.showScreen("register");
-    },
+    };
 
-    onLoginClick: function() {
+    onLoginClick = () => {
         this.showScreen("login");
-    },
+    };
 
-    onForgotPasswordClick: function() {
+    onForgotPasswordClick = () => {
         this.showScreen("forgot_password");
-    },
+    };
 
-    onRegisterFlowComplete: function(credentials, password) {
+    onRegisterFlowComplete = (credentials, password) => {
         return this.onUserCompletedLoginFlow(credentials, password);
-    },
+    };
 
     // returns a promise which resolves to the new MatrixClient
-    onRegistered: function(credentials) {
+    onRegistered(credentials) {
         return Lifecycle.setLoggedIn(credentials);
-    },
+    }
 
-    onFinishPostRegistration: function() {
+    onFinishPostRegistration = () => {
         // Don't confuse this with "PageType" which is the middle window to show
         this.setState({
             view: VIEWS.LOGGED_IN,
         });
         this.showScreen("settings");
-    },
+    };
 
-    onVersion: function(current, latest, releaseNotes) {
+    onVersion(current, latest, releaseNotes) {
         this.setState({
             version: current,
             newVersion: latest,
@@ -1807,9 +1798,9 @@ export default createReactClass({
             newVersionReleaseNotes: releaseNotes,
             checkingForUpdate: null,
         });
-    },
+    }
 
-    onSendEvent: function(roomId, event) {
+    onSendEvent(roomId, event) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
             dis.dispatch({action: 'message_send_failed'});
@@ -1821,9 +1812,9 @@ export default createReactClass({
         }, (err) => {
             dis.dispatch({action: 'message_send_failed'});
         });
-    },
+    }
 
-    _setPageSubtitle: function(subtitle='') {
+    _setPageSubtitle(subtitle='') {
         if (this.state.currentRoomId) {
             const client = MatrixClientPeg.get();
             const room = client && client.getRoom(this.state.currentRoomId);
@@ -1834,9 +1825,9 @@ export default createReactClass({
             subtitle = `${this.subTitleStatus} ${subtitle}`;
         }
         document.title = `${SdkConfig.get().brand || 'Riot'} ${subtitle}`;
-    },
+    }
 
-    updateStatusIndicator: function(state, prevState) {
+    updateStatusIndicator(state, prevState) {
         const notifCount = countRoomsWithNotif(MatrixClientPeg.get().getRooms()).count;
 
         if (PlatformPeg.get()) {
@@ -1853,28 +1844,28 @@ export default createReactClass({
         }
 
         this._setPageSubtitle();
-    },
+    }
 
     onCloseAllSettings() {
         dis.dispatch({ action: 'close_settings' });
-    },
+    }
 
-    onServerConfigChange(config) {
+    onServerConfigChange = (config) => {
         this.setState({serverConfig: config});
-    },
+    };
 
-    _makeRegistrationUrl: function(params) {
+    _makeRegistrationUrl = (params) => {
         if (this.props.startingFragmentQueryParams.referrer) {
             params.referrer = this.props.startingFragmentQueryParams.referrer;
         }
         return this.props.makeRegistrationUrl(params);
-    },
+    };
 
-    _collectLoggedInView: function(ref) {
+    _collectLoggedInView = (ref) => {
         this._loggedInView = ref;
-    },
+    };
 
-    async onUserCompletedLoginFlow(credentials, password) {
+    onUserCompletedLoginFlow = async (credentials, password) => {
         this._accountPassword = password;
         // self-destruct the password after 5mins
         if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
@@ -1937,14 +1928,14 @@ export default createReactClass({
         this.setState({ pendingInitialSync: false });
 
         return setLoggedInPromise;
-    },
+    };
 
     // complete security / e2e setup has finished
-    onCompleteSecurityE2eSetupFinished() {
+    onCompleteSecurityE2eSetupFinished = () => {
         this._onLoggedIn();
-    },
+    };
 
-    render: function() {
+    render() {
         // console.log(`Rendering MatrixChat with view ${this.state.view}`);
 
         let view;
@@ -1994,13 +1985,13 @@ export default createReactClass({
                 const LoggedInView = sdk.getComponent('structures.LoggedInView');
                 view = (
                     <LoggedInView ref={this._collectLoggedInView} matrixClient={MatrixClientPeg.get()}
-                        onRoomCreated={this.onRoomCreated}
-                        onCloseAllSettings={this.onCloseAllSettings}
-                        onRegistered={this.onRegistered}
-                        currentRoomId={this.state.currentRoomId}
-                        showCookieBar={this.state.showCookieBar}
-                        {...this.props}
-                        {...this.state}
+                                  onRoomCreated={this.onRoomCreated}
+                                  onCloseAllSettings={this.onCloseAllSettings}
+                                  onRegistered={this.onRegistered}
+                                  currentRoomId={this.state.currentRoomId}
+                                  showCookieBar={this.state.showCookieBar}
+                                  {...this.props}
+                                  {...this.state}
                     />
                 );
             } else {
@@ -2082,5 +2073,5 @@ export default createReactClass({
         return <ErrorBoundary>
             {view}
         </ErrorBoundary>;
-    },
-});
+    }
+}

From d915e613dc6e9ebb59d1d6480d44e8b2d0fb40eb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 12:27:39 +0100
Subject: [PATCH 2300/3235] Convert promise utility module to tyepscript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/utils/{promise.js => promise.ts} | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
 rename src/utils/{promise.js => promise.ts} (65%)

diff --git a/src/utils/promise.js b/src/utils/promise.ts
similarity index 65%
rename from src/utils/promise.js
rename to src/utils/promise.ts
index d7e8d2eae1..553e1e1959 100644
--- a/src/utils/promise.js
+++ b/src/utils/promise.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// @flow
-
 // Returns a promise which resolves with a given value after the given number of ms
-export const sleep = (ms: number, value: any): Promise => new Promise((resolve => { setTimeout(resolve, ms, value); }));
+export function sleep<T>(ms: number, value: T): Promise<T> {
+    return new Promise((resolve => { setTimeout(resolve, ms, value); }));
+}
 
 // Returns a promise which resolves when the input promise resolves with its value
 // or when the timeout of ms is reached with the value of given timeoutValue
-export async function timeout(promise: Promise, timeoutValue: any, ms: number): Promise {
-    const timeoutPromise = new Promise((resolve) => {
+export async function timeout<T>(promise: Promise<T>, timeoutValue: T, ms: number): Promise<T> {
+    const timeoutPromise = new Promise<T>((resolve) => {
         const timeoutId = setTimeout(resolve, ms, timeoutValue);
         promise.then(() => {
             clearTimeout(timeoutId);
@@ -32,12 +32,18 @@ export async function timeout(promise: Promise, timeoutValue: any, ms: number):
     return Promise.race([promise, timeoutPromise]);
 }
 
+export interface IDeferred<T> {
+    resolve: (T) => void;
+    reject: (any) => void;
+    promise: Promise<T>;
+}
+
 // Returns a Deferred
-export function defer(): {resolve: () => {}, reject: () => {}, promise: Promise} {
+export function defer<T>(): IDeferred<T> {
     let resolve;
     let reject;
 
-    const promise = new Promise((_resolve, _reject) => {
+    const promise = new Promise<T>((_resolve, _reject) => {
         resolve = _resolve;
         reject = _reject;
     });
@@ -46,11 +52,12 @@ export function defer(): {resolve: () => {}, reject: () => {}, promise: Promise}
 }
 
 // Promise.allSettled polyfill until browser support is stable in Firefox
-export function allSettled(promises: Promise[]): {status: string, value?: any, reason?: any}[] {
+export function allSettled<T>(promises: Promise<T>[]): Promise<Array<ISettledFulfilled<T> | ISettledRejected>> {
     if (Promise.allSettled) {
-        return Promise.allSettled(promises);
+        return Promise.allSettled<T>(promises);
     }
 
+    // @ts-ignore - typescript isn't smart enough to see the disjoint here
     return Promise.all(promises.map((promise) => {
         return promise.then(value => ({
             status: "fulfilled",

From 01abb61e9afa513533919ed21c96d73907739192 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 13:08:33 +0100
Subject: [PATCH 2301/3235] C

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/@types/global.d.ts                        |  13 +
 .../{MatrixChat.js => MatrixChat.tsx}         | 518 ++++++++++--------
 src/utils/promise.ts                          |   2 +-
 3 files changed, 291 insertions(+), 242 deletions(-)
 rename src/components/structures/{MatrixChat.js => MatrixChat.tsx} (86%)

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 1931c0b1d0..e6e339d067 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -37,4 +37,17 @@ declare global {
     interface StorageEstimate {
         usageDetails?: {[key: string]: number};
     }
+
+    export interface ISettledFulfilled<T> {
+        status: "fulfilled";
+        value: T;
+    }
+    export interface ISettledRejected {
+        status: "rejected";
+        reason: any;
+    }
+
+    interface PromiseConstructor {
+        allSettled<T>(promises: Promise<T>[]): Promise<Array<ISettledFulfilled<T> | ISettledRejected>>;
+    }
 }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.tsx
similarity index 86%
rename from src/components/structures/MatrixChat.js
rename to src/components/structures/MatrixChat.tsx
index e93b81109a..576f92408a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.tsx
@@ -17,10 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as Matrix from "matrix-js-sdk";
+import React, {createRef} from 'react';
+import {InvalidStoreError} from "matrix-js-sdk/src/errors";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import { isCryptoAvailable } from 'matrix-js-sdk/src/crypto';
 
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
@@ -63,44 +63,45 @@ import DMRoomMap from '../../utils/DMRoomMap';
 import { countRoomsWithNotif } from '../../RoomNotifs';
 import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
-import { defer } from "../../utils/promise";
+import {defer, IDeferred} from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
+import type LoggedInView from "./LoggedInView";
 
 /** constants for MatrixChat.state.view */
-export const VIEWS = {
+export enum VIEWS {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
-    LOADING: 0,
+    LOADING = 0,
 
     // we are showing the welcome view
-    WELCOME: 1,
+    WELCOME = 1,
 
     // we are showing the login view
-    LOGIN: 2,
+    LOGIN = 2,
 
     // we are showing the registration view
-    REGISTER: 3,
+    REGISTER = 3,
 
     // completing the registration flow
-    POST_REGISTRATION: 4,
+    POST_REGISTRATION = 4,
 
     // showing the 'forgot password' view
-    FORGOT_PASSWORD: 5,
+    FORGOT_PASSWORD = 5,
 
     // showing flow to trust this new device with cross-signing
-    COMPLETE_SECURITY: 6,
+    COMPLETE_SECURITY = 6,
 
     // flow to setup SSSS / cross-signing on this account
-    E2E_SETUP: 7,
+    E2E_SETUP = 7,
 
     // we are logged in with an active matrix client.
-    LOGGED_IN: 8,
+    LOGGED_IN = 8,
 
     // We are logged out (invalid token) but have our local state again. The user
     // should log back in to rehydrate the client.
-    SOFT_LOGOUT: 9,
-};
+    SOFT_LOGOUT = 9,
+}
 
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
@@ -112,42 +113,89 @@ const ONBOARDING_FLOW_STARTERS = [
     'view_create_group',
 ];
 
-export default class MatrixChat extends React.PureComponent {
+interface IScreen {
+    screen: string;
+    params?: object;
+}
+
+interface IRoomInfo {
+    room_id?: string;
+    room_alias?: string;
+    event_id?: string;
+
+    auto_join?: boolean;
+    highlighted?: boolean;
+    third_party_invite?: object;
+    oob_data?: object;
+    via_servers?: string[];
+}
+
+interface IProps { // TODO type things better
+    config: Record<string, any>;
+    serverConfig?: ValidatedServerConfig;
+    ConferenceHandler?: any;
+    onNewScreen: (string) => void;
+    enableGuest?: boolean;
+    // the queryParams extracted from the [real] query-string of the URI
+    realQueryParams?: Record<string, string>;
+    // the initial queryParams extracted from the hash-fragment of the URI
+    startingFragmentQueryParams?: Record<string, string>;
+    // called when we have completed a token login
+    onTokenLoginCompleted?: () => void;
+    // Represents the screen to display as a result of parsing the initial window.location
+    initialScreenAfterLogin?: IScreen;
+    // displayname, if any, to set on the device when logging in/registering.
+    defaultDeviceDisplayName?: string,
+    // A function that makes a registration URL
+    makeRegistrationUrl: (object) => string,
+}
+
+interface IState {
+    // the master view we are showing.
+    view: VIEWS;
+    // What the LoggedInView would be showing if visible
+    page_type?: PageTypes;
+    // The ID of the room we're viewing. This is either populated directly
+    // in the case where we view a room by ID or by RoomView when it resolves
+    // what ID an alias points at.
+    currentRoomId?: string;
+    currentGroupId?: string;
+    currentGroupIsNew?: boolean;
+    // If we're trying to just view a user ID (i.e. /user URL), this is it
+    currentUserId?: string;
+    // this is persisted as mx_lhs_size, loaded in LoggedInView
+    collapseLhs: boolean;
+    leftDisabled: boolean;
+    middleDisabled: boolean;
+    // the right panel's disabled state is tracked in its store.
+    version?: string;
+    newVersion?: string;
+    hasNewVersion: boolean;
+    newVersionReleaseNotes?: string;
+    checkingForUpdate?: string; // updateCheckStatusEnum
+    showCookieBar: boolean;
+    // Parameters used in the registration dance with the IS
+    register_client_secret?: string;
+    register_session_id?: string;
+    register_id_sid?: string;
+    // When showing Modal dialogs we need to set aria-hidden on the root app element
+    // and disable it when there are no dialogs
+    hideToSRUsers: boolean;
+    syncError?: Error;
+    resizeNotifier: ResizeNotifier;
+    showNotifierToolbar: boolean;
+    serverConfig?: ValidatedServerConfig;
+    ready: boolean;
+    thirdPartyInvite?: object;
+    roomOobData?: object;
+    viaServers?: string[];
+    pendingInitialSync?: boolean;
+}
+
+export default class MatrixChat extends React.PureComponent<IProps, IState> {
     static VIEWS = VIEWS; // we export this so that the integration tests can use it :-S
     static displayName = "MatrixChat";
 
-    static propTypes = {
-        config: PropTypes.object,
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig),
-        ConferenceHandler: PropTypes.any,
-        onNewScreen: PropTypes.func,
-        registrationUrl: PropTypes.string,
-        enableGuest: PropTypes.bool,
-
-        // the queryParams extracted from the [real] query-string of the URI
-        realQueryParams: PropTypes.object,
-
-        // the initial queryParams extracted from the hash-fragment of the URI
-        startingFragmentQueryParams: PropTypes.object,
-
-        // called when we have completed a token login
-        onTokenLoginCompleted: PropTypes.func,
-
-        // Represents the screen to display as a result of parsing the initial
-        // window.location
-        initialScreenAfterLogin: PropTypes.shape({
-            screen: PropTypes.string.isRequired,
-            params: PropTypes.object,
-        }),
-
-        // displayname, if any, to set on the device when logging
-        // in/registering.
-        defaultDeviceDisplayName: PropTypes.string,
-
-        // A function that makes a registration URL
-        makeRegistrationUrl: PropTypes.func.isRequired,
-    };
-
     static defaultProps = {
         realQueryParams: {},
         startingFragmentQueryParams: {},
@@ -155,51 +203,46 @@ export default class MatrixChat extends React.PureComponent {
         onTokenLoginCompleted: () => {},
     };
 
+    firstSyncComplete: boolean;
+    firstSyncPromise: IDeferred<void>;
+
+    private screenAfterLogin?: IScreen;
+    private windowWidth: number;
+    private pageChanging: boolean;
+    private accountPassword?: string;
+    private accountPasswordTimer?: NodeJS.Timeout;
+    private focusComposer: boolean;
+    private subTitleStatus: string;
+
+    private readonly loggedInView: React.RefObject<LoggedInView>;
+    private readonly dispatcherRef: any;
+    private readonly themeWatcher: ThemeWatcher;
+
     constructor(props, context) {
         super(props, context);
 
         this.state = {
-            // the master view we are showing.
             view: VIEWS.LOADING,
-
-            // What the LoggedInView would be showing if visible
-            page_type: null,
-
-            // The ID of the room we're viewing. This is either populated directly
-            // in the case where we view a room by ID or by RoomView when it resolves
-            // what ID an alias points at.
-            currentRoomId: null,
-
-            // If we're trying to just view a user ID (i.e. /user URL), this is it
-            viewUserId: null,
-            // this is persisted as mx_lhs_size, loaded in LoggedInView
             collapseLhs: false,
             leftDisabled: false,
             middleDisabled: false,
-            // the right panel's disabled state is tracked in its store.
 
-            version: null,
-            newVersion: null,
             hasNewVersion: false,
             newVersionReleaseNotes: null,
             checkingForUpdate: null,
 
             showCookieBar: false,
 
-            // Parameters used in the registration dance with the IS
-            register_client_secret: null,
-            register_session_id: null,
-            register_id_sid: null,
-
-            // When showing Modal dialogs we need to set aria-hidden on the root app element
-            // and disable it when there are no dialogs
             hideToSRUsers: false,
 
             syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
             resizeNotifier: new ResizeNotifier(),
             showNotifierToolbar: false,
+            ready: false,
         };
 
+        this.loggedInView = createRef();
+
         SdkConfig.put(this.props.config);
 
         // Used by _viewRoom before getting state from sync
@@ -213,13 +256,13 @@ export default class MatrixChat extends React.PureComponent {
         // a thing to call showScreen with once login completes.  this is kept
         // outside this.state because updating it should never trigger a
         // rerender.
-        this._screenAfterLogin = this.props.initialScreenAfterLogin;
+        this.screenAfterLogin = this.props.initialScreenAfterLogin;
 
-        this._windowWidth = 10000;
+        this.windowWidth = 10000;
         this.handleResize();
         window.addEventListener('resize', this.handleResize);
 
-        this._pageChanging = false;
+        this.pageChanging = false;
 
         // check we have the right tint applied for this theme.
         // N.B. we don't call the whole of setTheme() here as we may be
@@ -227,7 +270,7 @@ export default class MatrixChat extends React.PureComponent {
         Tinter.tint();
 
         // For PersistentElement
-        this.state.resizeNotifier.on("middlePanelResized", this._dispatchTimelineResize);
+        this.state.resizeNotifier.on("middlePanelResized", this.dispatchTimelineResize);
 
         // Force users to go through the soft logout page if they're soft logged out
         if (Lifecycle.isSoftLogout()) {
@@ -237,12 +280,12 @@ export default class MatrixChat extends React.PureComponent {
             Lifecycle.loadSession({});
         }
 
-        this._accountPassword = null;
-        this._accountPasswordTimer = null;
+        this.accountPassword = null;
+        this.accountPasswordTimer = null;
 
         this.dispatcherRef = dis.register(this.onAction);
-        this._themeWatcher = new ThemeWatcher();
-        this._themeWatcher.start();
+        this.themeWatcher = new ThemeWatcher();
+        this.themeWatcher.start();
 
         this.focusComposer = false;
 
@@ -279,17 +322,16 @@ export default class MatrixChat extends React.PureComponent {
 
                 // if the user has followed a login or register link, don't reanimate
                 // the old creds, but rather go straight to the relevant page
-                const firstScreen = this._screenAfterLogin ?
-                    this._screenAfterLogin.screen : null;
+                const firstScreen = this.screenAfterLogin ? this.screenAfterLogin.screen : null;
 
                 if (firstScreen === 'login' ||
                     firstScreen === 'register' ||
                     firstScreen === 'forgot_password') {
-                    this._showScreenAfterLogin();
+                    this.showScreenAfterLogin();
                     return;
                 }
 
-                return this._loadSession();
+                return this.loadSession();
             });
         }
 
@@ -325,12 +367,11 @@ export default class MatrixChat extends React.PureComponent {
     componentWillUnmount() {
         Lifecycle.stopMatrixClient();
         dis.unregister(this.dispatcherRef);
-        this._themeWatcher.stop();
-        window.removeEventListener("focus", this.onFocus);
+        this.themeWatcher.stop();
         window.removeEventListener('resize', this.handleResize);
-        this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
+        this.state.resizeNotifier.removeListener("middlePanelResized", this.dispatchTimelineResize);
 
-        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
+        if (this.accountPasswordTimer !== null) clearTimeout(this.accountPasswordTimer);
     }
 
     getFallbackHsUrl() {
@@ -348,7 +389,7 @@ export default class MatrixChat extends React.PureComponent {
         return {serverConfig: props};
     }
 
-    _loadSession() {
+    private loadSession() {
         // the extra Promise.resolve() ensures that synchronous exceptions hit the same codepath as
         // asynchronous ones.
         return Promise.resolve().then(() => {
@@ -376,11 +417,11 @@ export default class MatrixChat extends React.PureComponent {
 
         // This shouldn't happen because UNSAFE_componentWillUpdate and componentDidUpdate
         // are used.
-        if (this._pageChanging) {
+        if (this.pageChanging) {
             console.warn('MatrixChat.startPageChangeTimer: timer already started');
             return;
         }
-        this._pageChanging = true;
+        this.pageChanging = true;
         performance.mark('riot_MatrixChat_page_change_start');
     }
 
@@ -388,11 +429,11 @@ export default class MatrixChat extends React.PureComponent {
         // Tor doesn't support performance
         if (!performance || !performance.mark) return null;
 
-        if (!this._pageChanging) {
+        if (!this.pageChanging) {
             console.warn('MatrixChat.stopPageChangeTimer: timer not started');
             return;
         }
-        this._pageChanging = false;
+        this.pageChanging = false;
         performance.mark('riot_MatrixChat_page_change_stop');
         performance.measure(
             'riot_MatrixChat_page_change_delta',
@@ -409,18 +450,18 @@ export default class MatrixChat extends React.PureComponent {
         return measurement.duration;
     }
 
-    shouldTrackPageChange(prevState, state) {
+    shouldTrackPageChange(prevState: IState, state: IState) {
         return prevState.currentRoomId !== state.currentRoomId ||
             prevState.view !== state.view ||
             prevState.page_type !== state.page_type;
     }
 
-    setStateForNewView(state) {
+    setStateForNewView(state: Partial<IState>) {
         if (state.view === undefined) {
             throw new Error("setStateForNewView with no view!");
         }
         const newState = {
-            viewUserId: null,
+            currentUserId: null,
         };
         Object.assign(newState, state);
         this.setState(newState);
@@ -479,29 +520,29 @@ export default class MatrixChat extends React.PureComponent {
                 break;
             case 'start_registration':
                 if (Lifecycle.isSoftLogout()) {
-                    this._onSoftLogout();
+                    this.onSoftLogout();
                     break;
                 }
                 // This starts the full registration flow
                 if (payload.screenAfterLogin) {
-                    this._screenAfterLogin = payload.screenAfterLogin;
+                    this.screenAfterLogin = payload.screenAfterLogin;
                 }
-                this._startRegistration(payload.params || {});
+                this.startRegistration(payload.params || {});
                 break;
             case 'start_login':
                 if (Lifecycle.isSoftLogout()) {
-                    this._onSoftLogout();
+                    this.onSoftLogout();
                     break;
                 }
                 if (payload.screenAfterLogin) {
-                    this._screenAfterLogin = payload.screenAfterLogin;
+                    this.screenAfterLogin = payload.screenAfterLogin;
                 }
                 this.setStateForNewView({
                     view: VIEWS.LOGIN,
                 });
                 this.notifyNewScreen('login');
                 ThemeController.isLogin = true;
-                this._themeWatcher.recheck();
+                this.themeWatcher.recheck();
                 break;
             case 'start_post_registration':
                 this.setState({
@@ -520,7 +561,7 @@ export default class MatrixChat extends React.PureComponent {
                 });
                 break;
             case 'leave_room':
-                this._leaveRoom(payload.room_id);
+                this.leaveRoom(payload.room_id);
                 break;
             case 'reject_invite':
                 Modal.createTrackedDialog('Reject invitation', '', QuestionDialog, {
@@ -549,14 +590,14 @@ export default class MatrixChat extends React.PureComponent {
                 });
                 break;
             case 'view_user_info':
-                this._viewUser(payload.userId, payload.subAction);
+                this.viewUser(payload.userId, payload.subAction);
                 break;
             case 'view_room': {
                 // Takes either a room ID or room alias: if switching to a room the client is already
                 // known to be in (eg. user clicks on a room in the recents panel), supply the ID
                 // If the user is clicking on a room in the context of the alias being presented
                 // to them, supply the room alias. If both are supplied, the room ID will be ignored.
-                const promise = this._viewRoom(payload);
+                const promise = this.viewRoom(payload);
                 if (payload.deferred_action) {
                     promise.then(() => {
                         dis.dispatch(payload.deferred_action);
@@ -565,13 +606,13 @@ export default class MatrixChat extends React.PureComponent {
                 break;
             }
             case 'view_prev_room':
-                this._viewNextRoom(-1);
+                this.viewNextRoom(-1);
                 break;
             case 'view_next_room':
-                this._viewNextRoom(1);
+                this.viewNextRoom(1);
                 break;
             case 'view_indexed_room':
-                this._viewIndexedRoom(payload.roomIndex);
+                this.viewIndexedRoom(payload.roomIndex);
                 break;
             case 'view_user_settings': {
                 const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
@@ -579,11 +620,11 @@ export default class MatrixChat extends React.PureComponent {
                     /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
 
                 // View the welcome or home page if we need something to look at
-                this._viewSomethingBehindModal();
+                this.viewSomethingBehindModal();
                 break;
             }
             case 'view_create_room':
-                this._createRoom();
+                this.createRoom();
                 break;
             case 'view_create_group': {
                 const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
@@ -596,27 +637,27 @@ export default class MatrixChat extends React.PureComponent {
                     'mx_RoomDirectory_dialogWrapper', false, true);
 
                 // View the welcome or home page if we need something to look at
-                this._viewSomethingBehindModal();
+                this.viewSomethingBehindModal();
                 break;
             }
             case 'view_my_groups':
-                this._setPage(PageTypes.MyGroups);
+                this.setPage(PageTypes.MyGroups);
                 this.notifyNewScreen('groups');
                 break;
             case 'view_group':
-                this._viewGroup(payload);
+                this.viewGroup(payload);
                 break;
             case 'view_welcome_page':
-                this._viewWelcome();
+                this.viewWelcome();
                 break;
             case 'view_home_page':
-                this._viewHome();
+                this.viewHome();
                 break;
             case 'view_set_mxid':
-                this._setMxId(payload);
+                this.setMxId(payload);
                 break;
             case 'view_start_chat_or_reuse':
-                this._chatCreateOrReuse(payload.user_id);
+                this.chatCreateOrReuse(payload.user_id);
                 break;
             case 'view_create_chat':
                 showStartChatInviteDialog();
@@ -629,7 +670,7 @@ export default class MatrixChat extends React.PureComponent {
                 // the last room we were looking at or some reasonable default/guess. We don't
                 // have to worry about email invites or similar being re-triggered because the
                 // function will have cleared that state and not execute that path.
-                this._showScreenAfterLogin();
+                this.showScreenAfterLogin();
                 break;
             case 'toggle_my_groups':
                 // We just dispatch the page change rather than have to worry about
@@ -670,25 +711,25 @@ export default class MatrixChat extends React.PureComponent {
                     this.state.view !== VIEWS.COMPLETE_SECURITY &&
                     this.state.view !== VIEWS.E2E_SETUP
                 ) {
-                    this._onLoggedIn();
+                    this.onLoggedIn();
                 }
                 break;
             case 'on_client_not_viable':
-                this._onSoftLogout();
+                this.onSoftLogout();
                 break;
             case 'on_logged_out':
-                this._onLoggedOut();
+                this.onLoggedOut();
                 break;
             case 'will_start_client':
                 this.setState({ready: false}, () => {
                     // if the client is about to start, we are, by definition, not ready.
                     // Set ready to false now, then it'll be set to true when the sync
                     // listener we set below fires.
-                    this._onWillStartClient();
+                    this.onWillStartClient();
                 });
                 break;
             case 'client_started':
-                this._onClientStarted();
+                this.onClientStarted();
                 break;
             case 'new_version':
                 this.onVersion(
@@ -732,14 +773,14 @@ export default class MatrixChat extends React.PureComponent {
         }
     };
 
-    _setPage(pageType) {
+    private setPage(pageType: string) {
         this.setState({
             page_type: pageType,
         });
     }
 
-    async _startRegistration(params) {
-        const newState = {
+    private async startRegistration(params: {[key: string]: string}) {
+        const newState: Partial<IState> = {
             view: VIEWS.REGISTER,
         };
 
@@ -762,12 +803,12 @@ export default class MatrixChat extends React.PureComponent {
 
         this.setStateForNewView(newState);
         ThemeController.isLogin = true;
-        this._themeWatcher.recheck();
+        this.themeWatcher.recheck();
         this.notifyNewScreen('register');
     }
 
     // TODO: Move to RoomViewStore
-    _viewNextRoom(roomIndexDelta) {
+    private viewNextRoom(roomIndexDelta: number) {
         const allRooms = RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms(),
         );
@@ -796,7 +837,7 @@ export default class MatrixChat extends React.PureComponent {
     }
 
     // TODO: Move to RoomViewStore
-    _viewIndexedRoom(roomIndex) {
+    private viewIndexedRoom(roomIndex: number) {
         const allRooms = RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms(),
         );
@@ -825,18 +866,9 @@ export default class MatrixChat extends React.PureComponent {
     // @param {Object=} roomInfo.oob_data Object of additional data about the room
     //                               that has been passed out-of-band (eg.
     //                               room name and avatar from an invite email)
-    _viewRoom(roomInfo) {
+    private viewRoom(roomInfo: IRoomInfo) {
         this.focusComposer = true;
 
-        const newState = {
-            view: VIEWS.LOGGED_IN,
-            currentRoomId: roomInfo.room_id || null,
-            page_type: PageTypes.RoomView,
-            thirdPartyInvite: roomInfo.third_party_invite,
-            roomOobData: roomInfo.oob_data,
-            viaServers: roomInfo.via_servers,
-        };
-
         if (roomInfo.room_alias) {
             console.log(
                 `Switching to room alias ${roomInfo.room_alias} at event ` +
@@ -881,70 +913,77 @@ export default class MatrixChat extends React.PureComponent {
             if (roomInfo.event_id && roomInfo.highlighted) {
                 presentedId += "/" + roomInfo.event_id;
             }
-            newState.ready = true;
-            this.setState(newState, () => {
+            this.setState({
+                view: VIEWS.LOGGED_IN,
+                currentRoomId: roomInfo.room_id || null,
+                page_type: PageTypes.RoomView,
+                thirdPartyInvite: roomInfo.third_party_invite,
+                roomOobData: roomInfo.oob_data,
+                viaServers: roomInfo.via_servers,
+                ready: true,
+            }, () => {
                 this.notifyNewScreen('room/' + presentedId);
             });
         });
     }
 
-    _viewGroup(payload) {
+    private viewGroup(payload) {
         const groupId = payload.group_id;
         this.setState({
             currentGroupId: groupId,
             currentGroupIsNew: payload.group_is_new,
         });
-        this._setPage(PageTypes.GroupView);
+        this.setPage(PageTypes.GroupView);
         this.notifyNewScreen('group/' + groupId);
     }
 
-    _viewSomethingBehindModal() {
+    private viewSomethingBehindModal() {
         if (this.state.view !== VIEWS.LOGGED_IN) {
-            this._viewWelcome();
+            this.viewWelcome();
             return;
         }
         if (!this.state.currentGroupId && !this.state.currentRoomId) {
-            this._viewHome();
+            this.viewHome();
         }
     }
 
-    _viewWelcome() {
+    private viewWelcome() {
         this.setStateForNewView({
             view: VIEWS.WELCOME,
         });
         this.notifyNewScreen('welcome');
         ThemeController.isLogin = true;
-        this._themeWatcher.recheck();
+        this.themeWatcher.recheck();
     }
 
-    _viewHome() {
+    private viewHome() {
         // The home page requires the "logged in" view, so we'll set that.
         this.setStateForNewView({
             view: VIEWS.LOGGED_IN,
         });
-        this._setPage(PageTypes.HomePage);
+        this.setPage(PageTypes.HomePage);
         this.notifyNewScreen('home');
         ThemeController.isLogin = false;
-        this._themeWatcher.recheck();
+        this.themeWatcher.recheck();
     }
 
-    _viewUser(userId, subAction) {
+    private viewUser(userId: string, subAction: string) {
         // Wait for the first sync so that `getRoom` gives us a room object if it's
         // in the sync response
         const waitForSync = this.firstSyncPromise ?
             this.firstSyncPromise.promise : Promise.resolve();
         waitForSync.then(() => {
             if (subAction === 'chat') {
-                this._chatCreateOrReuse(userId);
+                this.chatCreateOrReuse(userId);
                 return;
             }
             this.notifyNewScreen('user/' + userId);
             this.setState({currentUserId: userId});
-            this._setPage(PageTypes.UserView);
+            this.setPage(PageTypes.UserView);
         });
     }
 
-    _setMxId(payload) {
+    private setMxId(payload) {
         const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
         const close = Modal.createTrackedDialog('Set MXID', '', SetMxIdDialog, {
             homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
@@ -974,7 +1013,7 @@ export default class MatrixChat extends React.PureComponent {
         }).close;
     }
 
-    async _createRoom() {
+    private async createRoom() {
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
 
@@ -984,7 +1023,7 @@ export default class MatrixChat extends React.PureComponent {
         }
     }
 
-    _chatCreateOrReuse(userId) {
+    private chatCreateOrReuse(userId: string) {
         // Use a deferred action to reshow the dialog once the user has registered
         if (MatrixClientPeg.get().isGuest()) {
             // No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
@@ -1032,7 +1071,7 @@ export default class MatrixChat extends React.PureComponent {
         }
     }
 
-    _leaveRoomWarnings(roomId) {
+    private leaveRoomWarnings(roomId: string) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         // Show a warning if there are additional complications.
         const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
@@ -1051,11 +1090,11 @@ export default class MatrixChat extends React.PureComponent {
         return warnings;
     }
 
-    _leaveRoom(roomId) {
+    private leaveRoom(roomId: string) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
-        const warnings = this._leaveRoomWarnings(roomId);
+        const warnings = this.leaveRoomWarnings(roomId);
 
         Modal.createTrackedDialog('Leave room', '', QuestionDialog, {
             title: _t("Leave room"),
@@ -1121,7 +1160,7 @@ export default class MatrixChat extends React.PureComponent {
      * Starts a chat with the welcome user, if the user doesn't already have one
      * @returns {string} The room ID of the new room, or null if no room was created
      */
-    async _startWelcomeUserChat() {
+    private async startWelcomeUserChat() {
         // We can end up with multiple tabs post-registration where the user
         // might then end up with a session and we don't want them all making
         // a chat with the welcome user: try to de-dupe.
@@ -1175,22 +1214,22 @@ export default class MatrixChat extends React.PureComponent {
     /**
      * Called when a new logged in session has started
      */
-    async _onLoggedIn() {
+    private async onLoggedIn() {
         ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
         // all else, as it probably means the user clicked on something already.
-        if (this._screenAfterLogin && this._screenAfterLogin.screen) {
+        if (this.screenAfterLogin && this.screenAfterLogin.screen) {
             this.showScreen(
-                this._screenAfterLogin.screen,
-                this._screenAfterLogin.params,
+                this.screenAfterLogin.screen,
+                this.screenAfterLogin.params,
             );
-            this._screenAfterLogin = null;
+            this.screenAfterLogin = null;
         } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);
 
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
-                const welcomeUserRoom = await this._startWelcomeUserChat();
+                const welcomeUserRoom = await this.startWelcomeUserChat();
                 if (welcomeUserRoom === null) {
                     // We didn't redirect to the welcome user room, so show
                     // the homepage.
@@ -1202,24 +1241,24 @@ export default class MatrixChat extends React.PureComponent {
                 dis.dispatch({action: 'view_home_page'});
             }
         } else {
-            this._showScreenAfterLogin();
+            this.showScreenAfterLogin();
         }
 
         StorageManager.tryPersistStorage();
     }
 
-    _showScreenAfterLogin() {
+    private showScreenAfterLogin() {
         // If screenAfterLogin is set, use that, then null it so that a second login will
         // result in view_home_page, _user_settings or _room_directory
-        if (this._screenAfterLogin && this._screenAfterLogin.screen) {
+        if (this.screenAfterLogin && this.screenAfterLogin.screen) {
             this.showScreen(
-                this._screenAfterLogin.screen,
-                this._screenAfterLogin.params,
+                this.screenAfterLogin.screen,
+                this.screenAfterLogin.params,
             );
-            this._screenAfterLogin = null;
+            this.screenAfterLogin = null;
         } else if (localStorage && localStorage.getItem('mx_last_room_id')) {
             // Before defaulting to directory, show the last viewed room
-            this._viewLastRoom();
+            this.viewLastRoom();
         } else {
             if (MatrixClientPeg.get().isGuest()) {
                 dis.dispatch({action: 'view_welcome_page'});
@@ -1233,7 +1272,7 @@ export default class MatrixChat extends React.PureComponent {
         }
     }
 
-    _viewLastRoom() {
+    private viewLastRoom() {
         dis.dispatch({
             action: 'view_room',
             room_id: localStorage.getItem('mx_last_room_id'),
@@ -1243,7 +1282,7 @@ export default class MatrixChat extends React.PureComponent {
     /**
      * Called when the session is logged out
      */
-    _onLoggedOut() {
+    private onLoggedOut() {
         this.notifyNewScreen('login');
         this.setStateForNewView({
             view: VIEWS.LOGIN,
@@ -1252,15 +1291,15 @@ export default class MatrixChat extends React.PureComponent {
             currentRoomId: null,
         });
         this.subTitleStatus = '';
-        this._setPageSubtitle();
+        this.setPageSubtitle();
         ThemeController.isLogin = true;
-        this._themeWatcher.recheck();
+        this.themeWatcher.recheck();
     }
 
     /**
      * Called when the session is softly logged out
      */
-    _onSoftLogout() {
+    private onSoftLogout() {
         this.notifyNewScreen('soft_logout');
         this.setStateForNewView({
             view: VIEWS.SOFT_LOGOUT,
@@ -1269,16 +1308,14 @@ export default class MatrixChat extends React.PureComponent {
             currentRoomId: null,
         });
         this.subTitleStatus = '';
-        this._setPageSubtitle();
+        this.setPageSubtitle();
     }
 
     /**
      * Called just before the matrix client is started
      * (useful for setting listeners)
      */
-    _onWillStartClient() {
-        const self = this;
-
+    private onWillStartClient() {
         // reset the 'have completed first sync' flag,
         // since we're about to start the client and therefore about
         // to do the first sync
@@ -1292,9 +1329,9 @@ export default class MatrixChat extends React.PureComponent {
         // particularly noticeable when there are lots of 'limited' /sync responses
         // such as when laptops unsleep.
         // https://github.com/vector-im/riot-web/issues/3307#issuecomment-282895568
-        cli.setCanResetTimelineCallback(function(roomId) {
-            console.log("Request to reset timeline in room ", roomId, " viewing:", self.state.currentRoomId);
-            if (roomId !== self.state.currentRoomId) {
+        cli.setCanResetTimelineCallback((roomId) => {
+            console.log("Request to reset timeline in room ", roomId, " viewing:", this.state.currentRoomId);
+            if (roomId !== this.state.currentRoomId) {
                 // It is safe to remove events from rooms we are not viewing.
                 return true;
             }
@@ -1302,13 +1339,13 @@ export default class MatrixChat extends React.PureComponent {
             // this if we are not scrolled up in the view. To find out, delegate to
             // the timeline panel. If the timeline panel doesn't exist, then we assume
             // it is safe to reset the timeline.
-            if (!self._loggedInView || !self._loggedInView.child) {
+            if (!this.loggedInView.current || !this.loggedInView.current) {
                 return true;
             }
-            return self._loggedInView.child.canResetTimelineInRoom(roomId);
+            return this.loggedInView.current.canResetTimelineInRoom(roomId);
         });
 
-        cli.on('sync', function(state, prevState, data) {
+        cli.on('sync', (state, prevState, data) => {
             // LifecycleStore and others cannot directly subscribe to matrix client for
             // events because flux only allows store state changes during flux dispatches.
             // So dispatch directly from here. Ideally we'd use a SyncStateStore that
@@ -1317,26 +1354,26 @@ export default class MatrixChat extends React.PureComponent {
             dis.dispatch({action: 'sync_state', prevState, state});
 
             if (state === "ERROR" || state === "RECONNECTING") {
-                if (data.error instanceof Matrix.InvalidStoreError) {
+                if (data.error instanceof InvalidStoreError) {
                     Lifecycle.handleInvalidStoreError(data.error);
                 }
-                self.setState({syncError: data.error || true});
-            } else if (self.state.syncError) {
-                self.setState({syncError: null});
+                this.setState({syncError: data.error || true});
+            } else if (this.state.syncError) {
+                this.setState({syncError: null});
             }
 
-            self.updateStatusIndicator(state, prevState);
+            this.updateStatusIndicator(state, prevState);
             if (state === "SYNCING" && prevState === "SYNCING") {
                 return;
             }
             console.info("MatrixClient sync state => %s", state);
             if (state !== "PREPARED") { return; }
 
-            self.firstSyncComplete = true;
-            self.firstSyncPromise.resolve();
+            this.firstSyncComplete = true;
+            this.firstSyncPromise.resolve();
 
             dis.dispatch({action: 'focus_composer'});
-            self.setState({
+            this.setState({
                 ready: true,
                 showNotifierToolbar: Notifier.shouldShowToolbar(),
             });
@@ -1531,7 +1568,7 @@ export default class MatrixChat extends React.PureComponent {
      * setting up anything that requires the client to be started.
      * @private
      */
-    _onClientStarted() {
+    private onClientStarted() {
         const cli = MatrixClientPeg.get();
 
         if (cli.isCryptoEnabled()) {
@@ -1552,7 +1589,7 @@ export default class MatrixChat extends React.PureComponent {
         }
     }
 
-    showScreen(screen, params) {
+    showScreen(screen: string, params?: {[key: string]: any}) {
         if (screen == 'register') {
             dis.dispatch({
                 action: 'start_registration',
@@ -1571,7 +1608,7 @@ export default class MatrixChat extends React.PureComponent {
         } else if (screen === 'soft_logout') {
             if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
                 // Logged in - visit a room
-                this._viewLastRoom();
+                this.viewLastRoom();
             } else {
                 // Ultimately triggers soft_logout if needed
                 dis.dispatch({
@@ -1670,6 +1707,8 @@ export default class MatrixChat extends React.PureComponent {
                 highlighted: Boolean(eventId),
                 third_party_invite: thirdPartyInvite,
                 oob_data: oobData,
+                room_alias: undefined,
+                room_id: undefined,
             };
             if (roomString[0] == '#') {
                 payload.room_alias = roomString;
@@ -1699,22 +1738,22 @@ export default class MatrixChat extends React.PureComponent {
         }
     }
 
-    notifyNewScreen(screen) {
+    notifyNewScreen(screen: string) {
         if (this.props.onNewScreen) {
             this.props.onNewScreen(screen);
         }
-        this._setPageSubtitle();
+        this.setPageSubtitle();
     }
 
-    onAliasClick(event, alias) {
+    onAliasClick(event: MouseEvent, alias: string) {
         event.preventDefault();
         dis.dispatch({action: 'view_room', room_alias: alias});
     }
 
-    onUserClick(event, userId) {
+    onUserClick(event: MouseEvent, userId: string) {
         event.preventDefault();
 
-        const member = new Matrix.RoomMember(null, userId);
+        const member = new RoomMember(null, userId);
         if (!member) { return; }
         dis.dispatch({
             action: 'view_user',
@@ -1722,12 +1761,12 @@ export default class MatrixChat extends React.PureComponent {
         });
     }
 
-    onGroupClick(event, groupId) {
+    onGroupClick(event: MouseEvent, groupId: string) {
         event.preventDefault();
         dis.dispatch({action: 'view_group', group_id: groupId});
     }
 
-    onLogoutClick(event) {
+    onLogoutClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
         dis.dispatch({
             action: 'logout',
         });
@@ -1735,26 +1774,26 @@ export default class MatrixChat extends React.PureComponent {
         event.preventDefault();
     }
 
-    handleResize = (e) => {
+    handleResize = () => {
         const hideLhsThreshold = 1000;
         const showLhsThreshold = 1000;
 
-        if (this._windowWidth > hideLhsThreshold && window.innerWidth <= hideLhsThreshold) {
+        if (this.windowWidth > hideLhsThreshold && window.innerWidth <= hideLhsThreshold) {
             dis.dispatch({ action: 'hide_left_panel' });
         }
-        if (this._windowWidth <= showLhsThreshold && window.innerWidth > showLhsThreshold) {
+        if (this.windowWidth <= showLhsThreshold && window.innerWidth > showLhsThreshold) {
             dis.dispatch({ action: 'show_left_panel' });
         }
 
         this.state.resizeNotifier.notifyWindowResized();
-        this._windowWidth = window.innerWidth;
+        this.windowWidth = window.innerWidth;
     };
 
-    _dispatchTimelineResize() {
+    private dispatchTimelineResize() {
         dis.dispatch({ action: 'timeline_resize' });
     }
 
-    onRoomCreated(roomId) {
+    onRoomCreated(roomId: string) {
         dis.dispatch({
             action: "view_room",
             room_id: roomId,
@@ -1773,12 +1812,12 @@ export default class MatrixChat extends React.PureComponent {
         this.showScreen("forgot_password");
     };
 
-    onRegisterFlowComplete = (credentials, password) => {
+    onRegisterFlowComplete = (credentials: object, password: string) => {
         return this.onUserCompletedLoginFlow(credentials, password);
     };
 
     // returns a promise which resolves to the new MatrixClient
-    onRegistered(credentials) {
+    onRegistered(credentials: object) {
         return Lifecycle.setLoggedIn(credentials);
     }
 
@@ -1790,7 +1829,7 @@ export default class MatrixChat extends React.PureComponent {
         this.showScreen("settings");
     };
 
-    onVersion(current, latest, releaseNotes) {
+    onVersion(current: string, latest: string, releaseNotes?: string) {
         this.setState({
             version: current,
             newVersion: latest,
@@ -1800,7 +1839,7 @@ export default class MatrixChat extends React.PureComponent {
         });
     }
 
-    onSendEvent(roomId, event) {
+    onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
             dis.dispatch({action: 'message_send_failed'});
@@ -1814,7 +1853,7 @@ export default class MatrixChat extends React.PureComponent {
         });
     }
 
-    _setPageSubtitle(subtitle='') {
+    private setPageSubtitle(subtitle='') {
         if (this.state.currentRoomId) {
             const client = MatrixClientPeg.get();
             const room = client && client.getRoom(this.state.currentRoomId);
@@ -1827,7 +1866,7 @@ export default class MatrixChat extends React.PureComponent {
         document.title = `${SdkConfig.get().brand || 'Riot'} ${subtitle}`;
     }
 
-    updateStatusIndicator(state, prevState) {
+    updateStatusIndicator(state: string, prevState: string) {
         const notifCount = countRoomsWithNotif(MatrixClientPeg.get().getRooms()).count;
 
         if (PlatformPeg.get()) {
@@ -1843,35 +1882,31 @@ export default class MatrixChat extends React.PureComponent {
             this.subTitleStatus += `[${notifCount}]`;
         }
 
-        this._setPageSubtitle();
+        this.setPageSubtitle();
     }
 
     onCloseAllSettings() {
         dis.dispatch({ action: 'close_settings' });
     }
 
-    onServerConfigChange = (config) => {
-        this.setState({serverConfig: config});
+    onServerConfigChange = (serverConfig: ValidatedServerConfig) => {
+        this.setState({serverConfig});
     };
 
-    _makeRegistrationUrl = (params) => {
+    private makeRegistrationUrl = (params: {[key: string]: string}) => {
         if (this.props.startingFragmentQueryParams.referrer) {
             params.referrer = this.props.startingFragmentQueryParams.referrer;
         }
         return this.props.makeRegistrationUrl(params);
     };
 
-    _collectLoggedInView = (ref) => {
-        this._loggedInView = ref;
-    };
-
-    onUserCompletedLoginFlow = async (credentials, password) => {
-        this._accountPassword = password;
+    onUserCompletedLoginFlow = async (credentials: object, password: string) => {
+        this.accountPassword = password;
         // self-destruct the password after 5mins
-        if (this._accountPasswordTimer !== null) clearTimeout(this._accountPasswordTimer);
-        this._accountPasswordTimer = setTimeout(() => {
-            this._accountPassword = null;
-            this._accountPasswordTimer = null;
+        if (this.accountPasswordTimer !== null) clearTimeout(this.accountPasswordTimer);
+        this.accountPasswordTimer = setTimeout(() => {
+            this.accountPassword = null;
+            this.accountPasswordTimer = null;
         }, 60 * 5 * 1000);
 
         // Wait for the client to be logged in (but not started)
@@ -1895,7 +1930,7 @@ export default class MatrixChat extends React.PureComponent {
         // because the client hasn't been started yet.
         const cryptoAvailable = isCryptoAvailable();
         if (!cryptoAvailable) {
-            this._onLoggedIn();
+            this.onLoggedIn();
         }
 
         this.setState({ pendingInitialSync: true });
@@ -1923,7 +1958,7 @@ export default class MatrixChat extends React.PureComponent {
             // labs flag on.
             this.setStateForNewView({ view: VIEWS.E2E_SETUP });
         } else {
-            this._onLoggedIn();
+            this.onLoggedIn();
         }
         this.setState({ pendingInitialSync: false });
 
@@ -1932,7 +1967,7 @@ export default class MatrixChat extends React.PureComponent {
 
     // complete security / e2e setup has finished
     onCompleteSecurityE2eSetupFinished = () => {
-        this._onLoggedIn();
+        this.onLoggedIn();
     };
 
     render() {
@@ -1959,7 +1994,7 @@ export default class MatrixChat extends React.PureComponent {
             view = (
                 <E2eSetup
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
-                    accountPassword={this._accountPassword}
+                    accountPassword={this.accountPassword}
                 />
             );
         } else if (this.state.view === VIEWS.POST_REGISTRATION) {
@@ -1972,7 +2007,7 @@ export default class MatrixChat extends React.PureComponent {
         } else if (this.state.view === VIEWS.LOGGED_IN) {
             // store errors stop the client syncing and require user intervention, so we'll
             // be showing a dialog. Don't show anything else.
-            const isStoreError = this.state.syncError && this.state.syncError instanceof Matrix.InvalidStoreError;
+            const isStoreError = this.state.syncError && this.state.syncError instanceof InvalidStoreError;
 
             // `ready` and `view==LOGGED_IN` may be set before `page_type` (because the
             // latter is set via the dispatcher). If we don't yet have a `page_type`,
@@ -1984,7 +2019,8 @@ export default class MatrixChat extends React.PureComponent {
                  */
                 const LoggedInView = sdk.getComponent('structures.LoggedInView');
                 view = (
-                    <LoggedInView ref={this._collectLoggedInView} matrixClient={MatrixClientPeg.get()}
+                    <LoggedInView ref={this.loggedInView}
+                                  matrixClient={MatrixClientPeg.get()}
                                   onRoomCreated={this.onRoomCreated}
                                   onCloseAllSettings={this.onCloseAllSettings}
                                   onRegistered={this.onRegistered}
@@ -2025,7 +2061,7 @@ export default class MatrixChat extends React.PureComponent {
                     idSid={this.state.register_id_sid}
                     email={this.props.startingFragmentQueryParams.email}
                     brand={this.props.config.brand}
-                    makeRegistrationUrl={this._makeRegistrationUrl}
+                    makeRegistrationUrl={this.makeRegistrationUrl}
                     onLoggedIn={this.onRegisterFlowComplete}
                     onLoginClick={this.onLoginClick}
                     onServerConfigChange={this.onServerConfigChange}
diff --git a/src/utils/promise.ts b/src/utils/promise.ts
index 553e1e1959..c5c1cb9a56 100644
--- a/src/utils/promise.ts
+++ b/src/utils/promise.ts
@@ -33,7 +33,7 @@ export async function timeout<T>(promise: Promise<T>, timeoutValue: T, ms: numbe
 }
 
 export interface IDeferred<T> {
-    resolve: (T) => void;
+    resolve: (value: T) => void;
     reject: (any) => void;
     promise: Promise<T>;
 }

From fc828378fa1bbb26d1483e7ce3cea82318adcedc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 13:18:54 +0100
Subject: [PATCH 2302/3235] Fix post-ts autocomplete, it is not null

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/AutocompleteProvider.tsx | 2 +-
 src/autocomplete/UserProvider.tsx         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/autocomplete/AutocompleteProvider.tsx b/src/autocomplete/AutocompleteProvider.tsx
index 2cda2593a4..a40ce7144d 100644
--- a/src/autocomplete/AutocompleteProvider.tsx
+++ b/src/autocomplete/AutocompleteProvider.tsx
@@ -64,7 +64,7 @@ export default class AutocompleteProvider {
             commandRegex = this.forcedCommandRegex || /\S+/g;
         }
 
-        if (commandRegex === null) {
+        if (!commandRegex) {
             return null;
         }
 
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 357c8750f7..1680eb5d54 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -102,7 +102,7 @@ export default class UserProvider extends AutocompleteProvider {
         const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
 
         // lazy-load user list into matcher
-        if (this.users === null) this._makeUsers();
+        if (!this.users) this._makeUsers();
 
         let completions = [];
         const {command, range} = this.getCurrentCommand(rawQuery, selection, force);
@@ -158,7 +158,7 @@ export default class UserProvider extends AutocompleteProvider {
     }
 
     onUserSpoke(user: RoomMember) {
-        if (this.users === null) return;
+        if (!this.users) return;
         if (!user) return;
         if (user.userId === MatrixClientPeg.get().credentials.userId) return;
 

From 54e976f5a8fae3447ede6d14879a2828e5850876 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 13:22:33 +0100
Subject: [PATCH 2303/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 52 ++++++++++++------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 576f92408a..be2021b2ba 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -66,7 +66,7 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import {defer, IDeferred} from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
-import type LoggedInView from "./LoggedInView";
+import type LoggedInViewType from "./LoggedInView";
 
 /** constants for MatrixChat.state.view */
 export enum VIEWS {
@@ -214,7 +214,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private focusComposer: boolean;
     private subTitleStatus: string;
 
-    private readonly loggedInView: React.RefObject<LoggedInView>;
+    private readonly loggedInView: React.RefObject<LoggedInViewType>;
     private readonly dispatcherRef: any;
     private readonly themeWatcher: ThemeWatcher;
 
@@ -823,7 +823,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
         let roomIndex = -1;
         for (let i = 0; i < allRooms.length; ++i) {
-            if (allRooms[i].roomId == this.state.currentRoomId) {
+            if (allRooms[i].roomId === this.state.currentRoomId) {
                 roomIndex = i;
                 break;
             }
@@ -1194,7 +1194,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // the saved sync to be loaded).
             const saveWelcomeUser = (ev) => {
                 if (
-                    ev.getType() == 'm.direct' &&
+                    ev.getType() === 'm.direct' &&
                     ev.getContent() &&
                     ev.getContent()[this.props.config.welcomeUserId]
                 ) {
@@ -1482,12 +1482,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
                         title: _t('Old cryptography data detected'),
                         description: _t(
-                            "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 "+
+                            "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.",
                         ),
                     });
@@ -1590,17 +1590,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     showScreen(screen: string, params?: {[key: string]: any}) {
-        if (screen == 'register') {
+        if (screen === 'register') {
             dis.dispatch({
                 action: 'start_registration',
                 params: params,
             });
-        } else if (screen == 'login') {
+        } else if (screen === 'login') {
             dis.dispatch({
                 action: 'start_login',
                 params: params,
             });
-        } else if (screen == 'forgot_password') {
+        } else if (screen === 'forgot_password') {
             dis.dispatch({
                 action: 'start_password_recovery',
                 params: params,
@@ -1616,32 +1616,32 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     params: params,
                 });
             }
-        } else if (screen == 'new') {
+        } else if (screen === 'new') {
             dis.dispatch({
                 action: 'view_create_room',
             });
-        } else if (screen == 'settings') {
+        } else if (screen === 'settings') {
             dis.dispatch({
                 action: 'view_user_settings',
             });
-        } else if (screen == 'welcome') {
+        } else if (screen === 'welcome') {
             dis.dispatch({
                 action: 'view_welcome_page',
             });
-        } else if (screen == 'home') {
+        } else if (screen === 'home') {
             dis.dispatch({
                 action: 'view_home_page',
             });
-        } else if (screen == 'start') {
+        } else if (screen === 'start') {
             this.showScreen('home');
             dis.dispatch({
                 action: 'require_registration',
             });
-        } else if (screen == 'directory') {
+        } else if (screen === 'directory') {
             dis.dispatch({
                 action: 'view_room_directory',
             });
-        } else if (screen == 'groups') {
+        } else if (screen === 'groups') {
             dis.dispatch({
                 action: 'view_my_groups',
             });
@@ -1649,11 +1649,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             dis.dispatch({
                 action: 'start_complete_security',
             });
-        } else if (screen == 'post_registration') {
+        } else if (screen === 'post_registration') {
             dis.dispatch({
                 action: 'start_post_registration',
             });
-        } else if (screen.indexOf('room/') == 0) {
+        } else if (screen.indexOf('room/') === 0) {
             // Rooms can have the following formats:
             // #room_alias:domain or !opaque_id:domain
             const room = screen.substring(5);
@@ -1710,21 +1710,21 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 room_alias: undefined,
                 room_id: undefined,
             };
-            if (roomString[0] == '#') {
+            if (roomString[0] === '#') {
                 payload.room_alias = roomString;
             } else {
                 payload.room_id = roomString;
             }
 
             dis.dispatch(payload);
-        } else if (screen.indexOf('user/') == 0) {
+        } else if (screen.indexOf('user/') === 0) {
             const userId = screen.substring(5);
             dis.dispatch({
                 action: 'view_user_info',
                 userId: userId,
                 subAction: params.action,
             });
-        } else if (screen.indexOf('group/') == 0) {
+        } else if (screen.indexOf('group/') === 0) {
             const groupId = screen.substring(6);
 
             // TODO: Check valid group ID
@@ -1853,7 +1853,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private setPageSubtitle(subtitle='') {
+    private setPageSubtitle(subtitle = '') {
         if (this.state.currentRoomId) {
             const client = MatrixClientPeg.get();
             const room = client && client.getRoom(this.state.currentRoomId);

From 162531f1c59109955bbaaa196d8f5198f502ff99 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 13:36:14 +0100
Subject: [PATCH 2304/3235] try to enable e2e test synapse registration 3pid
 support

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../synapse/config-templates/consent/homeserver.yaml           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index e07cf585d8..f9e62c94a6 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -642,7 +642,8 @@ enable_registration: true
 # Explicitly disable asking for MSISDNs from the registration
 # flow (overrides registrations_require_3pid if MSISDNs are set as required)
 #
-#disable_msisdn_registration: true
+disable_msisdn_registration: false
+threepid_behaviour_email: "local"
 
 # Mandate that users are only allowed to associate certain formats of
 # 3PIDs with accounts on this server.

From 59cc7f0867fa9ff1d7c4603c8199e7c827070faf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 13:50:40 +0100
Subject: [PATCH 2305/3235] here's hoping Synapse doesn't actually try to send
 an email :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../config-templates/consent/homeserver.yaml  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index f9e62c94a6..536c017b9e 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -643,7 +643,6 @@ enable_registration: true
 # flow (overrides registrations_require_3pid if MSISDNs are set as required)
 #
 disable_msisdn_registration: false
-threepid_behaviour_email: "local"
 
 # Mandate that users are only allowed to associate certain formats of
 # 3PIDs with accounts on this server.
@@ -883,22 +882,22 @@ password_config:
 # If your SMTP server requires authentication, the optional smtp_user &
 # smtp_pass variables should be used
 #
-#email:
-#   enable_notifs: false
-#   smtp_host: "localhost"
-#   smtp_port: 25
-#   smtp_user: "exampleusername"
-#   smtp_pass: "examplepassword"
-#   require_transport_security: False
-#   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
-#   app_name: Matrix
-#   # if template_dir is unset, uses the example templates that are part of
-#   # the Synapse distribution.
-#   #template_dir: res/templates
-#   notif_template_html: notif_mail.html
-#   notif_template_text: notif_mail.txt
-#   notif_for_new_users: True
-#   riot_base_url: "http://localhost/riot"
+email:
+   enable_notifs: false
+   smtp_host: "localhost"
+   smtp_port: 25
+   smtp_user: "exampleusername"
+   smtp_pass: "examplepassword"
+   require_transport_security: False
+   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
+   app_name: Matrix
+   # if template_dir is unset, uses the example templates that are part of
+   # the Synapse distribution.
+   #template_dir: res/templates
+   notif_template_html: notif_mail.html
+   notif_template_text: notif_mail.txt
+   notif_for_new_users: True
+   riot_base_url: "http://localhost/riot"
 
 
 #password_providers:

From 8536e087ab8624d58885510c8038966e86031439 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 22 Apr 2020 14:45:50 +0100
Subject: [PATCH 2306/3235] Skip auth flow test for signing upload when
 password present

If we already have an account password to use during secret storage setup, then
it's highly likely that the homeserver accepts passwords for device signing key
upload as well. This change then assumes password auth will work without
checking to avoid a request when the server is under high load.

Fixes https://github.com/vector-im/riot-web/issues/13286
---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index c5c734a813..2c05f231e7 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -83,7 +83,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         };
 
         this._fetchBackupInfo();
-        this._queryKeyUploadAuth();
+        if (this.state.accountPassword) {
+            // If we have an account password in memory, let's simplify and
+            // assume it means password auth is also supported for device
+            // signing key upload as well. This avoids hitting the server to
+            // test auth flows, which may be slow under high load.
+            this.state.canUploadKeysWithPasswordOnly = true;
+        } else {
+            this._queryKeyUploadAuth();
+        }
 
         MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
     }

From 8b397f807f06b20d37cea0c6f7aa1a8c55c80795 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 22 Apr 2020 14:45:50 +0100
Subject: [PATCH 2307/3235] Skip auth flow test for signing upload when
 password present

If we already have an account password to use during secret storage setup, then
it's highly likely that the homeserver accepts passwords for device signing key
upload as well. This change then assumes password auth will work without
checking to avoid a request when the server is under high load.

Fixes https://github.com/vector-im/riot-web/issues/13286
---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index cf7f4d4126..d64a2247a2 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -92,7 +92,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         };
 
         this._fetchBackupInfo();
-        this._queryKeyUploadAuth();
+        if (this.state.accountPassword) {
+            // If we have an account password in memory, let's simplify and
+            // assume it means password auth is also supported for device
+            // signing key upload as well. This avoids hitting the server to
+            // test auth flows, which may be slow under high load.
+            this.state.canUploadKeysWithPasswordOnly = true;
+        } else {
+            this._queryKeyUploadAuth();
+        }
 
         MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
     }

From 7a42caa326a775ab37e9360aa956525281a93c57 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Tue, 21 Apr 2020 22:25:37 +0200
Subject: [PATCH 2308/3235] Fixed Unignore state variable naming missmatch

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 .../settings/tabs/user/SecurityUserSettingsTab.js      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 1cde5d6f87..72ec30cdb1 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -89,13 +89,13 @@ export default class SecurityUserSettingsTab extends React.Component {
         // Don't use this.state to get the ignored user list as it might be
         // ever so slightly outdated. Instead, prefer to get a fresh list and
         // update that.
-        const ignoredUsers = MatrixClientPeg.get().getIgnoredUsers();
-        const index = ignoredUsers.indexOf(userId);
+        const ignoredUserIds = MatrixClientPeg.get().getIgnoredUsers();
+        const index = ignoredUserIds.indexOf(userId);
         if (index !== -1) {
-            ignoredUsers.splice(index, 1);
-            MatrixClientPeg.get().setIgnoredUsers(ignoredUsers);
+            ignoredUserIds.splice(index, 1);
+            MatrixClientPeg.get().setIgnoredUsers(ignoredUserIds);
         }
-        this.setState({ignoredUsers});
+        this.setState({ignoredUserIds});
     };
 
     _getInvitedRooms = () => {

From 47708ca1275f019a3842011fbee300cf825f4eb4 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 01:31:35 +0200
Subject: [PATCH 2309/3235] Sync settings ignoredUsers with global state

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 .../tabs/user/SecurityUserSettingsTab.js      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 72ec30cdb1..c9f3c73905 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -25,6 +25,7 @@ import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
+import dis from "../../../../../dispatcher"
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
@@ -61,6 +62,23 @@ export default class SecurityUserSettingsTab extends React.Component {
             managingInvites: false,
             invitedRoomAmt: invitedRooms.length,
         };
+
+        this._onAction = this._onAction.bind(this);
+    }
+
+    _onAction({action}) {
+        if (action === "ignore_state_changed"){
+            const ignoredUserIds =  MatrixClientPeg.get().getIgnoredUsers();
+            this.setState({ignoredUserIds})
+        }
+    }
+
+    componentDidMount() {
+        this.dispatcherRef = dis.register(this._onAction)
+    }
+
+    componentWillUnmount() {
+        dis.unregister(this.dispatcherRef);
     }
 
     _updateBlacklistDevicesFlag = (checked) => {
@@ -89,13 +107,13 @@ export default class SecurityUserSettingsTab extends React.Component {
         // Don't use this.state to get the ignored user list as it might be
         // ever so slightly outdated. Instead, prefer to get a fresh list and
         // update that.
-        const ignoredUserIds = MatrixClientPeg.get().getIgnoredUsers();
+        const ignoredUserIds = this.state.ignoredUserIds;
         const index = ignoredUserIds.indexOf(userId);
         if (index !== -1) {
             ignoredUserIds.splice(index, 1);
             MatrixClientPeg.get().setIgnoredUsers(ignoredUserIds);
         }
-        this.setState({ignoredUserIds});
+        
     };
 
     _getInvitedRooms = () => {

From 08bac716d5f1690e11b9f5585bac3df4f15c2652 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 16:00:27 +0200
Subject: [PATCH 2310/3235] Disabled unignore button when unignoring in process

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 .../tabs/user/SecurityUserSettingsTab.js      | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index c9f3c73905..a5ef16cc04 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -31,6 +31,7 @@ export class IgnoredUser extends React.Component {
     static propTypes = {
         userId: PropTypes.string.isRequired,
         onUnignored: PropTypes.func.isRequired,
+        inProgress: PropTypes.bool.isRequired
     };
 
     _onUnignoreClicked = (e) => {
@@ -41,7 +42,7 @@ export class IgnoredUser extends React.Component {
         const id = `mx_SecurityUserSettingsTab_ignoredUser_${this.props.userId}`;
         return (
             <div className='mx_SecurityUserSettingsTab_ignoredUser'>
-                <AccessibleButton onClick={this._onUnignoreClicked} kind='primary_sm' aria-describedby={id}>
+                <AccessibleButton onClick={this._onUnignoreClicked} kind='primary_sm' aria-describedby={id} disabled={this.props.inProgress}>
                     { _t('Unignore') }
                 </AccessibleButton>
                 <span id={id}>{ this.props.userId }</span>
@@ -59,6 +60,7 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         this.state = {
             ignoredUserIds: MatrixClientPeg.get().getIgnoredUsers(),
+            waitingUnignored: [],
             managingInvites: false,
             invitedRoomAmt: invitedRooms.length,
         };
@@ -69,7 +71,13 @@ export default class SecurityUserSettingsTab extends React.Component {
     _onAction({action}) {
         if (action === "ignore_state_changed"){
             const ignoredUserIds =  MatrixClientPeg.get().getIgnoredUsers();
-            this.setState({ignoredUserIds})
+            const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e))
+            console.log("-------------")
+            console.log("Got new ignored users", ignoredUserIds)
+            console.log("We were waiting for", this.state.waitingUnignored)
+            console.log("Now we wait for", newWaitingUnignored)
+            console.log("-------------")
+            this.setState({ignoredUserIds, waitingUnignored: newWaitingUnignored})
         }
     }
 
@@ -104,14 +112,20 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onUserUnignored = async (userId) => {
-        // Don't use this.state to get the ignored user list as it might be
-        // ever so slightly outdated. Instead, prefer to get a fresh list and
-        // update that.
-        const ignoredUserIds = this.state.ignoredUserIds;
-        const index = ignoredUserIds.indexOf(userId);
+        
+        const {ignoredUserIds, waitingUnignored} = this.state
+        console.log("--------GO IGNORE---")
+        console.log("ignored:", ignoredUserIds)
+        console.log("waiting for:", waitingUnignored)
+        const currentlyIgnoredUserIds = ignoredUserIds.filter(e=> !waitingUnignored.includes(e));
+        console.log("currentlyIgnored:", currentlyIgnoredUserIds)
+
+        const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {
-            ignoredUserIds.splice(index, 1);
-            MatrixClientPeg.get().setIgnoredUsers(ignoredUserIds);
+            currentlyIgnoredUserIds.splice(index, 1);
+            this.setState(({waitingUnignored})=>({waitingUnignored:[...waitingUnignored, userId]}))
+            console.log("Sending to server", currentlyIgnoredUserIds)
+            MatrixClientPeg.get().setIgnoredUsers(currentlyIgnoredUserIds);
         }
         
     };
@@ -219,10 +233,16 @@ export default class SecurityUserSettingsTab extends React.Component {
     }
 
     _renderIgnoredUsers() {
-        if (!this.state.ignoredUserIds || this.state.ignoredUserIds.length === 0) return null;
+        const {waitingUnignored, ignoredUserIds} = this.state;
 
-        const userIds = this.state.ignoredUserIds
-            .map((u) => <IgnoredUser userId={u} onUnignored={this._onUserUnignored} key={u} />);
+        if (!ignoredUserIds || ignoredUserIds.length === 0) return null;
+
+
+        console.log("Rendering, waiting", waitingUnignored)
+        console.log("Rendering, ignored", ignoredUserIds)
+
+        const userIds = ignoredUserIds
+            .map((u) => <IgnoredUser userId={u} onUnignored={this._onUserUnignored} key={u} inProgress={waitingUnignored.includes(u)} />);
 
         return (
             <div className='mx_SettingsTab_section'>

From cd87124e0f2ddd30213f071814f36b55cc183c64 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 16:16:49 +0200
Subject: [PATCH 2311/3235] removed console logs

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 .../tabs/user/SecurityUserSettingsTab.js         | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a5ef16cc04..187ad0fb93 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -68,15 +68,12 @@ export default class SecurityUserSettingsTab extends React.Component {
         this._onAction = this._onAction.bind(this);
     }
 
+
+
     _onAction({action}) {
         if (action === "ignore_state_changed"){
             const ignoredUserIds =  MatrixClientPeg.get().getIgnoredUsers();
             const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e))
-            console.log("-------------")
-            console.log("Got new ignored users", ignoredUserIds)
-            console.log("We were waiting for", this.state.waitingUnignored)
-            console.log("Now we wait for", newWaitingUnignored)
-            console.log("-------------")
             this.setState({ignoredUserIds, waitingUnignored: newWaitingUnignored})
         }
     }
@@ -114,17 +111,12 @@ export default class SecurityUserSettingsTab extends React.Component {
     _onUserUnignored = async (userId) => {
         
         const {ignoredUserIds, waitingUnignored} = this.state
-        console.log("--------GO IGNORE---")
-        console.log("ignored:", ignoredUserIds)
-        console.log("waiting for:", waitingUnignored)
         const currentlyIgnoredUserIds = ignoredUserIds.filter(e=> !waitingUnignored.includes(e));
-        console.log("currentlyIgnored:", currentlyIgnoredUserIds)
 
         const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {
             currentlyIgnoredUserIds.splice(index, 1);
             this.setState(({waitingUnignored})=>({waitingUnignored:[...waitingUnignored, userId]}))
-            console.log("Sending to server", currentlyIgnoredUserIds)
             MatrixClientPeg.get().setIgnoredUsers(currentlyIgnoredUserIds);
         }
         
@@ -237,10 +229,6 @@ export default class SecurityUserSettingsTab extends React.Component {
 
         if (!ignoredUserIds || ignoredUserIds.length === 0) return null;
 
-
-        console.log("Rendering, waiting", waitingUnignored)
-        console.log("Rendering, ignored", ignoredUserIds)
-
         const userIds = ignoredUserIds
             .map((u) => <IgnoredUser userId={u} onUnignored={this._onUserUnignored} key={u} inProgress={waitingUnignored.includes(u)} />);
 

From ff3272061cc994412892181fd55cbb0e44737c79 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 16:44:47 +0200
Subject: [PATCH 2312/3235] Fixed linter errors

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 .../tabs/user/SecurityUserSettingsTab.js      | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 187ad0fb93..686873d6b0 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -25,13 +25,13 @@ import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
-import dis from "../../../../../dispatcher"
+import dis from "../../../../../dispatcher";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
         userId: PropTypes.string.isRequired,
         onUnignored: PropTypes.func.isRequired,
-        inProgress: PropTypes.bool.isRequired
+        inProgress: PropTypes.bool.isRequired,
     };
 
     _onUnignoreClicked = (e) => {
@@ -69,17 +69,16 @@ export default class SecurityUserSettingsTab extends React.Component {
     }
 
 
-
     _onAction({action}) {
-        if (action === "ignore_state_changed"){
-            const ignoredUserIds =  MatrixClientPeg.get().getIgnoredUsers();
-            const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e))
-            this.setState({ignoredUserIds, waitingUnignored: newWaitingUnignored})
+        if (action === "ignore_state_changed") {
+            const ignoredUserIds = MatrixClientPeg.get().getIgnoredUsers();
+            const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e));
+            this.setState({ignoredUserIds, waitingUnignored: newWaitingUnignored});
         }
     }
 
     componentDidMount() {
-        this.dispatcherRef = dis.register(this._onAction)
+        this.dispatcherRef = dis.register(this._onAction);
     }
 
     componentWillUnmount() {
@@ -109,17 +108,15 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onUserUnignored = async (userId) => {
-        
-        const {ignoredUserIds, waitingUnignored} = this.state
+        const {ignoredUserIds, waitingUnignored} = this.state;
         const currentlyIgnoredUserIds = ignoredUserIds.filter(e=> !waitingUnignored.includes(e));
 
         const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {
             currentlyIgnoredUserIds.splice(index, 1);
-            this.setState(({waitingUnignored})=>({waitingUnignored:[...waitingUnignored, userId]}))
+            this.setState(({waitingUnignored})=>({waitingUnignored: [...waitingUnignored, userId]}));
             MatrixClientPeg.get().setIgnoredUsers(currentlyIgnoredUserIds);
         }
-        
     };
 
     _getInvitedRooms = () => {
@@ -230,7 +227,12 @@ export default class SecurityUserSettingsTab extends React.Component {
         if (!ignoredUserIds || ignoredUserIds.length === 0) return null;
 
         const userIds = ignoredUserIds
-            .map((u) => <IgnoredUser userId={u} onUnignored={this._onUserUnignored} key={u} inProgress={waitingUnignored.includes(u)} />);
+            .map((u) => <IgnoredUser
+             userId={u}
+             onUnignored={this._onUserUnignored}
+             key={u}
+             inProgress={waitingUnignored.includes(u)}
+             />);
 
         return (
             <div className='mx_SettingsTab_section'>

From fdcdd2529e2df08db06d87f315b45790ec4afd0a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 10:58:11 -0600
Subject: [PATCH 2313/3235] Take encrypted message search out of labs

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

This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155

In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
---
 .../settings/tabs/user/SecurityUserSettingsTab.js | 15 ++++++---------
 src/indexing/EventIndexPeg.js                     |  4 ----
 src/settings/Settings.js                          |  6 ------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 1cde5d6f87..907e29baa7 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -254,15 +254,12 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
-        let eventIndex;
-        if (SettingsStore.isFeatureEnabled("feature_event_indexing")) {
-            eventIndex = (
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
-                    <EventIndexPanel />
-                </div>
-            );
-        }
+        let eventIndex = (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
+                <EventIndexPanel />
+            </div>
+        );
 
         // XXX: There's no such panel in the current cross-signing designs, but
         // it's useful to have for testing the feature. If there's no interest
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 9aa7e78eda..ae4c14dafd 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -37,10 +37,6 @@ class EventIndexPeg {
      * EventIndex was successfully initialized, false otherwise.
      */
     async init() {
-        if (!SettingsStore.isFeatureEnabled("feature_event_indexing")) {
-            return false;
-        }
-
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         if (!indexManager) {
             console.log("EventIndex: Platform doesn't support event indexing, not initializing.");
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 5e57c27c9d..928b1985fa 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -152,12 +152,6 @@ export const SETTINGS = {
         supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
         default: true,
     },
-    "feature_event_indexing": {
-        isFeature: true,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
-        default: false,
-    },
     "feature_bridge_state": {
         isFeature: true,
         supportedLevels: LEVELS_FEATURE,

From 5c77df2afdff6afff3c7533a4931625a072ca104 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:01:07 -0600
Subject: [PATCH 2314/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7af45003a8..2745728b63 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -403,7 +403,6 @@
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
-    "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",

From 3662c9e1c13e26266adb86734f9a3150c0f95faf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:05:43 -0600
Subject: [PATCH 2315/3235] Appease the linter

---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 907e29baa7..a88f35da68 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -254,7 +254,7 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
-        let eventIndex = (
+        const eventIndex = (
             <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
                 <EventIndexPanel />

From 27138b33c036bc7d23be45fac85e4a287640606a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:08:46 -0600
Subject: [PATCH 2316/3235] Match settings paragraph style in all cases

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index c9c6a5ec4f..6b084c2579 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -163,7 +163,7 @@ export default class EventIndexPanel extends React.Component {
             );
 
             eventIndexingSettings = (
-                <div>
+                <div className='mx_SettingsTab_subsectionText'>
                     {
                         _t( "Riot is missing some components required for securely " +
                             "caching encrypted messages locally. If you'd like to " +
@@ -180,7 +180,7 @@ export default class EventIndexPanel extends React.Component {
             );
         } else {
             eventIndexingSettings = (
-                <div>
+                <div className='mx_SettingsTab_subsectionText'>
                     {
                         _t( "Riot can't securely cache encrypted messages locally " +
                             "while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +

From 475cea8b8acf7ccb1924c96a8541dc0e80f2e0b9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 10:58:11 -0600
Subject: [PATCH 2317/3235] Take encrypted message search out of labs

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

This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155

In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
---
 .../settings/tabs/user/SecurityUserSettingsTab.js | 15 ++++++---------
 src/indexing/EventIndexPeg.js                     |  4 ----
 src/settings/Settings.js                          |  6 ------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 1cde5d6f87..907e29baa7 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -254,15 +254,12 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
-        let eventIndex;
-        if (SettingsStore.isFeatureEnabled("feature_event_indexing")) {
-            eventIndex = (
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
-                    <EventIndexPanel />
-                </div>
-            );
-        }
+        let eventIndex = (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
+                <EventIndexPanel />
+            </div>
+        );
 
         // XXX: There's no such panel in the current cross-signing designs, but
         // it's useful to have for testing the feature. If there's no interest
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 9aa7e78eda..ae4c14dafd 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -37,10 +37,6 @@ class EventIndexPeg {
      * EventIndex was successfully initialized, false otherwise.
      */
     async init() {
-        if (!SettingsStore.isFeatureEnabled("feature_event_indexing")) {
-            return false;
-        }
-
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         if (!indexManager) {
             console.log("EventIndex: Platform doesn't support event indexing, not initializing.");
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 32ff0a5f94..d7374718d3 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -158,12 +158,6 @@ export const SETTINGS = {
         supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
         default: true,
     },
-    "feature_event_indexing": {
-        isFeature: true,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
-        default: false,
-    },
     "feature_bridge_state": {
         isFeature: true,
         supportedLevels: LEVELS_FEATURE,

From 3c722d16eac9baee185bb1e86f3166c09a1dad5a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:01:07 -0600
Subject: [PATCH 2318/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ba838d313..b444f4488e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -400,7 +400,6 @@
     "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
-    "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",

From 50059373d29ec99442cf0af9cbfdc00d3f144956 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:05:43 -0600
Subject: [PATCH 2319/3235] Appease the linter

---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 907e29baa7..a88f35da68 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -254,7 +254,7 @@ export default class SecurityUserSettingsTab extends React.Component {
             </div>
         );
 
-        let eventIndex = (
+        const eventIndex = (
             <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
                 <EventIndexPanel />

From ab7d7becd7cd8ef32097bd5d32e56bbfa394b774 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Apr 2020 11:08:46 -0600
Subject: [PATCH 2320/3235] Match settings paragraph style in all cases

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

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index c9c6a5ec4f..6b084c2579 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -163,7 +163,7 @@ export default class EventIndexPanel extends React.Component {
             );
 
             eventIndexingSettings = (
-                <div>
+                <div className='mx_SettingsTab_subsectionText'>
                     {
                         _t( "Riot is missing some components required for securely " +
                             "caching encrypted messages locally. If you'd like to " +
@@ -180,7 +180,7 @@ export default class EventIndexPanel extends React.Component {
             );
         } else {
             eventIndexingSettings = (
-                <div>
+                <div className='mx_SettingsTab_subsectionText'>
                     {
                         _t( "Riot can't securely cache encrypted messages locally " +
                             "while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +

From 5163232081b3a5da35175ea659072175cc3c898c Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 20:03:13 +0200
Subject: [PATCH 2321/3235] Update
 src/components/views/settings/tabs/user/SecurityUserSettingsTab.js

Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 686873d6b0..5260fed1b5 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -114,7 +114,7 @@ export default class SecurityUserSettingsTab extends React.Component {
         const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {
             currentlyIgnoredUserIds.splice(index, 1);
-            this.setState(({waitingUnignored})=>({waitingUnignored: [...waitingUnignored, userId]}));
+            this.setState(({waitingUnignored}) => ({waitingUnignored: [...waitingUnignored, userId]}));
             MatrixClientPeg.get().setIgnoredUsers(currentlyIgnoredUserIds);
         }
     };

From 2471b3c1004509be2ffe3653287476ce5722bba6 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Wed, 22 Apr 2020 20:03:22 +0200
Subject: [PATCH 2322/3235] Update
 src/components/views/settings/tabs/user/SecurityUserSettingsTab.js

Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 5260fed1b5..6c9309f38a 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -109,7 +109,7 @@ export default class SecurityUserSettingsTab extends React.Component {
 
     _onUserUnignored = async (userId) => {
         const {ignoredUserIds, waitingUnignored} = this.state;
-        const currentlyIgnoredUserIds = ignoredUserIds.filter(e=> !waitingUnignored.includes(e));
+        const currentlyIgnoredUserIds = ignoredUserIds.filter(e => !waitingUnignored.includes(e));
 
         const index = currentlyIgnoredUserIds.indexOf(userId);
         if (index !== -1) {

From 7364a7bf525f01544dee65316064aa421d2f1b9f Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 22 Apr 2020 14:33:55 +0000
Subject: [PATCH 2323/3235] Translated using Weblate (Albanian)

Currently translated at 99.3% (2278 of 2294 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 49f28b9129..7e94977f63 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -976,7 +976,7 @@
     "Set up Secure Message Recovery": "Rregulloni Rimarrje të Sigurt Mesazhesh",
     "Keep it safe": "Mbajeni të parrezikuar",
     "Create Key Backup": "Krijo Kopjeruajtje Kyçesh",
-    "Unable to create key backup": "S’arrihet të krijojhet kopjeruajtje kyçesh",
+    "Unable to create key backup": "S’arrihet të krijohet kopjeruajtje kyçesh",
     "Retry": "Riprovo",
     "Unable to load backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje",
     "Unable to restore backup": "S’arrihet të rikthehet kopjeruajtje",

From ae3dcff230031b0ab7bd111165233c94d0960e6a Mon Sep 17 00:00:00 2001
From: Sergey Shpikin <rkfg@rkfg.me>
Date: Wed, 22 Apr 2020 21:42:43 +0300
Subject: [PATCH 2324/3235] Assert type of domNode as HTMLElement to fix build

Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
---
 src/components/views/rooms/Autocomplete.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 6843df4121..975c8e84a5 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -259,7 +259,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
         const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
         if (selectedCompletion && this.containerRef.current) {
             const domNode = ReactDOM.findDOMNode(selectedCompletion);
-            const offsetTop = domNode && domNode.offsetTop;
+            const offsetTop = domNode && (domNode as HTMLElement).offsetTop;
             if (offsetTop > this.containerRef.current.scrollTop + this.containerRef.current.offsetHeight ||
                 offsetTop < this.containerRef.current.scrollTop) {
                 this.containerRef.current.scrollTop = offsetTop - this.containerRef.current.offsetTop;

From b10a38667522b31decb878e869b9b41bedee4457 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 21:37:52 +0100
Subject: [PATCH 2325/3235] Fix i18n of SSO UIA copy in Deactivate Account
 Dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DeactivateAccountDialog.js  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 3889f0989a..b269ec2fdb 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -26,30 +26,6 @@ import { _t } from '../../../languageHandler';
 import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 
-const dialogAesthetics = {
-    [SSOAuthEntry.PHASE_PREAUTH]: {
-        body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
-        continueText: _t("Single Sign On"),
-        continueKind: "danger",
-    },
-    [SSOAuthEntry.PHASE_POSTAUTH]: {
-        body: _t("Are you sure you want to deactivate your account? This is irreversible."),
-        continueText: _t("Confirm account deactivation"),
-        continueKind: "danger",
-    },
-};
-
-// This is the same as aestheticsForStagePhases in InteractiveAuthDialog minus the `title`
-const DEACTIVATE_AESTHETICS = {
-    [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
-    [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
-    [PasswordAuthEntry.LOGIN_TYPE]: {
-        [DEFAULT_PHASE]: {
-            body: _t("To continue, please enter your password:"),
-        },
-    },
-};
-
 export default class DeactivateAccountDialog extends React.Component {
     constructor(props) {
         super(props);
@@ -84,6 +60,30 @@ export default class DeactivateAccountDialog extends React.Component {
     }
 
     _onStagePhaseChange = (stage, phase) => {
+        const dialogAesthetics = {
+            [SSOAuthEntry.PHASE_PREAUTH]: {
+                body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
+                continueText: _t("Single Sign On"),
+                continueKind: "danger",
+            },
+            [SSOAuthEntry.PHASE_POSTAUTH]: {
+                body: _t("Are you sure you want to deactivate your account? This is irreversible."),
+                continueText: _t("Confirm account deactivation"),
+                continueKind: "danger",
+            },
+        };
+
+        // This is the same as aestheticsForStagePhases in InteractiveAuthDialog minus the `title`
+        const DEACTIVATE_AESTHETICS = {
+            [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+            [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+            [PasswordAuthEntry.LOGIN_TYPE]: {
+                [DEFAULT_PHASE]: {
+                    body: _t("To continue, please enter your password:"),
+                },
+            },
+        };
+
         const aesthetics = DEACTIVATE_AESTHETICS[stage];
         let bodyText = null;
         let continueText = null;

From bc690c8f17f7eff0854757f78b2928cccdc18e2b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 21:41:30 +0100
Subject: [PATCH 2326/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7af45003a8..5634dc8b5b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1580,12 +1580,12 @@
     "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",
+    "Server did not require any authentication": "Server did not require any authentication",
+    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
     "To continue, please enter your password:": "To continue, please enter your password:",
-    "Server did not require any authentication": "Server did not require any authentication",
-    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
     "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>": "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>",
     "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.": "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.",

From 80b8120bc36bd878575cdbf463092833df16b451 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 22:32:02 +0100
Subject: [PATCH 2327/3235] Update login security copy and design to match
 Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 -
 .../structures/auth/_CompleteSecurity.scss    | 44 +++++++++++++++++++
 .../views/elements/_ButtonPlaceholder.scss    | 24 ----------
 .../structures/auth/CompleteSecurity.js       |  4 +-
 .../structures/auth/SetupEncryptionBody.js    | 38 +++++++++-------
 .../views/elements/ButtonPlaceholder.js       | 19 --------
 src/i18n/strings/en_EN.json                   |  8 ++--
 7 files changed, 72 insertions(+), 66 deletions(-)
 delete mode 100644 res/css/views/elements/_ButtonPlaceholder.scss
 delete mode 100644 src/components/views/elements/ButtonPlaceholder.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index a5dc87a952..0ba2b609e8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -94,7 +94,6 @@
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
 @import "./views/elements/_AddressTile.scss";
-@import "./views/elements/_ButtonPlaceholder.scss";
 @import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 80e7aaada0..f742be70e4 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -26,6 +26,50 @@ limitations under the License.
     position: relative;
 }
 
+.mx_CompleteSecurity_clients {
+    width: max-content;
+    margin: 36px auto 0;
+
+    .mx_CompleteSecurity_clients_desktop, .mx_CompleteSecurity_clients_mobile {
+        position: relative;
+        width: 160px;
+        text-align: center;
+        padding-top: 64px;
+        display: inline-block;
+
+        &::before {
+            content: '';
+            position: absolute;
+            height: 48px;
+            width: 48px;
+            left: 56px;
+            top: 0;
+            background-color: $muted-fg-color;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+        }
+    }
+
+    .mx_CompleteSecurity_clients_desktop {
+        margin-right: 56px;
+    }
+
+    .mx_CompleteSecurity_clients_desktop::before {
+        mask-image: url('$(res)/img/feather-customised/monitor.svg');
+    }
+
+    .mx_CompleteSecurity_clients_mobile::before {
+        mask-image: url('$(res)/img/feather-customised/smartphone.svg');
+    }
+
+    p {
+        margin-top: 16px;
+        font-size: $font-12px;
+        color: $muted-fg-color;
+        text-align: center;
+    }
+}
+
 .mx_CompleteSecurity_heroIcon {
     width: 128px;
     height: 128px;
diff --git a/res/css/views/elements/_ButtonPlaceholder.scss b/res/css/views/elements/_ButtonPlaceholder.scss
deleted file mode 100644
index 858fcdecf6..0000000000
--- a/res/css/views/elements/_ButtonPlaceholder.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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_ButtonPlaceholder {
-    font-size: $font-14px;
-    font-weight: 600;
-    padding: 7px 18px;
-    display: inline-block;
-    text-align: center;
-    color: $authpage-secondary-color;
-}
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 95128c0be9..c73691611d 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -60,7 +60,7 @@ export default class CompleteSecurity extends React.Component {
 
         if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify this session");
+            title = _t("Verify this login");
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
@@ -69,7 +69,7 @@ export default class CompleteSecurity extends React.Component {
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify this session");
+            title = _t("Verify this login");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index e6302a4685..13fa270a9c 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -108,31 +108,35 @@ export default class SetupEncryptionBody extends React.Component {
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
-            const ButtonPlaceholder = sdk.getComponent("elements.ButtonPlaceholder");
             return (
                 <div>
                     <p>{_t(
-                        "Use an existing session to verify this one, " +
+                        "Confirm your identity by verifying this login from one of your other sessions, " +
                         "granting it access to encrypted messages.",
                     )}</p>
                     <p>{_t(
-                        "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
-                    {}, {
-                        button: sub => <AccessibleButton element="span"
-                            className="mx_linkButton"
-                            onClick={this._onUsePassphraseClick}
-                        >
-                            {sub}
-                        </AccessibleButton>,
-                    })}</p>
+                        "This requires the latest Riot on your other devices:",
+                    )}</p>
+
+                    <div className="mx_CompleteSecurity_clients">
+                        <div className="mx_CompleteSecurity_clients_desktop">
+                            <div>Riot Web</div>
+                            <div>Riot Desktop</div>
+                        </div>
+                        <div className="mx_CompleteSecurity_clients_mobile">
+                            <div>Riot iOS</div>
+                            <div>Riot X for Android</div>
+                        </div>
+                        <p>{_t("or another cross-signing capable Matrix client")}</p>
+                    </div>
+
                     <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton
-                            kind="danger"
-                            onClick={this.onSkipClick}
-                        >
+                        <AccessibleButton kind="link" onClick={this.onSkipClick}>
+                            {_t("Use Recovery Passphrase or Key")}
+                        </AccessibleButton>
+                        <AccessibleButton kind="danger" onClick={this.onSkipClick}>
                             {_t("Skip")}
                         </AccessibleButton>
-                        <ButtonPlaceholder>{_t("Use your other device to continue…")}</ButtonPlaceholder>
                     </div>
                 </div>
             );
@@ -150,7 +154,7 @@ export default class SetupEncryptionBody extends React.Component {
             }
             return (
                 <div>
-                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
+                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified" />
                     {message}
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
diff --git a/src/components/views/elements/ButtonPlaceholder.js b/src/components/views/elements/ButtonPlaceholder.js
deleted file mode 100644
index 6501429e65..0000000000
--- a/src/components/views/elements/ButtonPlaceholder.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-export default function ButtonPlaceholder(props) {
-    return <div className="mx_ButtonPlaceholder">{props.children}</div>;
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7af45003a8..a1eb5928de 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2067,6 +2067,7 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
+    "Verify this login": "Verify this login",
     "Session verified": "Session verified",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -2120,9 +2121,10 @@
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "Use an existing session to verify this one, granting it access to encrypted messages.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
-    "Use your other device to continue…": "Use your other device to continue…",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",
+    "This requires the latest Riot on your other devices:": "This requires the latest Riot on your other devices:",
+    "or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
+    "Use Recovery Passphrase or Key": "Use Recovery Passphrase or Key",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",

From 63de2783c31095e08c0a7153df831848816c199d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 21:37:52 +0100
Subject: [PATCH 2328/3235] Fix i18n of SSO UIA copy in Deactivate Account
 Dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DeactivateAccountDialog.js  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 3889f0989a..b269ec2fdb 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -26,30 +26,6 @@ import { _t } from '../../../languageHandler';
 import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 
-const dialogAesthetics = {
-    [SSOAuthEntry.PHASE_PREAUTH]: {
-        body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
-        continueText: _t("Single Sign On"),
-        continueKind: "danger",
-    },
-    [SSOAuthEntry.PHASE_POSTAUTH]: {
-        body: _t("Are you sure you want to deactivate your account? This is irreversible."),
-        continueText: _t("Confirm account deactivation"),
-        continueKind: "danger",
-    },
-};
-
-// This is the same as aestheticsForStagePhases in InteractiveAuthDialog minus the `title`
-const DEACTIVATE_AESTHETICS = {
-    [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
-    [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
-    [PasswordAuthEntry.LOGIN_TYPE]: {
-        [DEFAULT_PHASE]: {
-            body: _t("To continue, please enter your password:"),
-        },
-    },
-};
-
 export default class DeactivateAccountDialog extends React.Component {
     constructor(props) {
         super(props);
@@ -84,6 +60,30 @@ export default class DeactivateAccountDialog extends React.Component {
     }
 
     _onStagePhaseChange = (stage, phase) => {
+        const dialogAesthetics = {
+            [SSOAuthEntry.PHASE_PREAUTH]: {
+                body: _t("Confirm your account deactivation by using Single Sign On to prove your identity."),
+                continueText: _t("Single Sign On"),
+                continueKind: "danger",
+            },
+            [SSOAuthEntry.PHASE_POSTAUTH]: {
+                body: _t("Are you sure you want to deactivate your account? This is irreversible."),
+                continueText: _t("Confirm account deactivation"),
+                continueKind: "danger",
+            },
+        };
+
+        // This is the same as aestheticsForStagePhases in InteractiveAuthDialog minus the `title`
+        const DEACTIVATE_AESTHETICS = {
+            [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+            [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+            [PasswordAuthEntry.LOGIN_TYPE]: {
+                [DEFAULT_PHASE]: {
+                    body: _t("To continue, please enter your password:"),
+                },
+            },
+        };
+
         const aesthetics = DEACTIVATE_AESTHETICS[stage];
         let bodyText = null;
         let continueText = null;

From f952e9ebfea4be291f7a52098c999a174f1a212b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 21:41:30 +0100
Subject: [PATCH 2329/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ba838d313..d53c58639d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1577,12 +1577,12 @@
     "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",
+    "Server did not require any authentication": "Server did not require any authentication",
+    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
     "To continue, please enter your password:": "To continue, please enter your password:",
-    "Server did not require any authentication": "Server did not require any authentication",
-    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
     "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>": "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>",
     "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.": "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.",

From a06401a83ed3648bf37bb310aabd151f82a08613 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 22:57:00 +0100
Subject: [PATCH 2330/3235] stage new artifacts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/feather-customised/monitor.svg    | 5 +++++
 res/img/feather-customised/smartphone.svg | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 res/img/feather-customised/monitor.svg
 create mode 100644 res/img/feather-customised/smartphone.svg

diff --git a/res/img/feather-customised/monitor.svg b/res/img/feather-customised/monitor.svg
new file mode 100644
index 0000000000..231811d5a6
--- /dev/null
+++ b/res/img/feather-customised/monitor.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 3.89543 2.89543 3 4 3H20C21.1046 3 22 3.89543 22 5V15C22 16.1046 21.1046 17 20 17H4C2.89543 17 2 16.1046 2 15V5Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 21H16" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 17V21" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/smartphone.svg b/res/img/feather-customised/smartphone.svg
new file mode 100644
index 0000000000..fde78c82e2
--- /dev/null
+++ b/res/img/feather-customised/smartphone.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 4C5 2.89543 5.89543 2 7 2H17C18.1046 2 19 2.89543 19 4V20C19 21.1046 18.1046 22 17 22H7C5.89543 22 5 21.1046 5 20V4Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="12" cy="18" r="1" fill="#2E2F32"/>
+</svg>

From 89860100aeb012cb6b8fe92a700d2062f6117062 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 22:32:02 +0100
Subject: [PATCH 2331/3235] Update login security copy and design to match
 Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 -
 .../structures/auth/_CompleteSecurity.scss    | 44 +++++++++++++++++++
 .../views/elements/_ButtonPlaceholder.scss    | 24 ----------
 .../structures/auth/CompleteSecurity.js       |  4 +-
 .../structures/auth/SetupEncryptionBody.js    | 38 +++++++++-------
 .../views/elements/ButtonPlaceholder.js       | 19 --------
 src/i18n/strings/en_EN.json                   |  8 ++--
 7 files changed, 72 insertions(+), 66 deletions(-)
 delete mode 100644 res/css/views/elements/_ButtonPlaceholder.scss
 delete mode 100644 src/components/views/elements/ButtonPlaceholder.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index a5dc87a952..0ba2b609e8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -94,7 +94,6 @@
 @import "./views/elements/_AccessibleButton.scss";
 @import "./views/elements/_AddressSelector.scss";
 @import "./views/elements/_AddressTile.scss";
-@import "./views/elements/_ButtonPlaceholder.scss";
 @import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 80e7aaada0..f742be70e4 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -26,6 +26,50 @@ limitations under the License.
     position: relative;
 }
 
+.mx_CompleteSecurity_clients {
+    width: max-content;
+    margin: 36px auto 0;
+
+    .mx_CompleteSecurity_clients_desktop, .mx_CompleteSecurity_clients_mobile {
+        position: relative;
+        width: 160px;
+        text-align: center;
+        padding-top: 64px;
+        display: inline-block;
+
+        &::before {
+            content: '';
+            position: absolute;
+            height: 48px;
+            width: 48px;
+            left: 56px;
+            top: 0;
+            background-color: $muted-fg-color;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+        }
+    }
+
+    .mx_CompleteSecurity_clients_desktop {
+        margin-right: 56px;
+    }
+
+    .mx_CompleteSecurity_clients_desktop::before {
+        mask-image: url('$(res)/img/feather-customised/monitor.svg');
+    }
+
+    .mx_CompleteSecurity_clients_mobile::before {
+        mask-image: url('$(res)/img/feather-customised/smartphone.svg');
+    }
+
+    p {
+        margin-top: 16px;
+        font-size: $font-12px;
+        color: $muted-fg-color;
+        text-align: center;
+    }
+}
+
 .mx_CompleteSecurity_heroIcon {
     width: 128px;
     height: 128px;
diff --git a/res/css/views/elements/_ButtonPlaceholder.scss b/res/css/views/elements/_ButtonPlaceholder.scss
deleted file mode 100644
index 858fcdecf6..0000000000
--- a/res/css/views/elements/_ButtonPlaceholder.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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_ButtonPlaceholder {
-    font-size: $font-14px;
-    font-weight: 600;
-    padding: 7px 18px;
-    display: inline-block;
-    text-align: center;
-    color: $authpage-secondary-color;
-}
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 95128c0be9..c73691611d 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -60,7 +60,7 @@ export default class CompleteSecurity extends React.Component {
 
         if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify this session");
+            title = _t("Verify this login");
         } else if (phase === PHASE_DONE) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_verified" />;
             title = _t("Session verified");
@@ -69,7 +69,7 @@ export default class CompleteSecurity extends React.Component {
             title = _t("Are you sure?");
         } else if (phase === PHASE_BUSY) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("Verify this session");
+            title = _t("Verify this login");
         } else {
             throw new Error(`Unknown phase ${phase}`);
         }
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index e6302a4685..13fa270a9c 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -108,31 +108,35 @@ export default class SetupEncryptionBody extends React.Component {
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
-            const ButtonPlaceholder = sdk.getComponent("elements.ButtonPlaceholder");
             return (
                 <div>
                     <p>{_t(
-                        "Use an existing session to verify this one, " +
+                        "Confirm your identity by verifying this login from one of your other sessions, " +
                         "granting it access to encrypted messages.",
                     )}</p>
                     <p>{_t(
-                        "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
-                    {}, {
-                        button: sub => <AccessibleButton element="span"
-                            className="mx_linkButton"
-                            onClick={this._onUsePassphraseClick}
-                        >
-                            {sub}
-                        </AccessibleButton>,
-                    })}</p>
+                        "This requires the latest Riot on your other devices:",
+                    )}</p>
+
+                    <div className="mx_CompleteSecurity_clients">
+                        <div className="mx_CompleteSecurity_clients_desktop">
+                            <div>Riot Web</div>
+                            <div>Riot Desktop</div>
+                        </div>
+                        <div className="mx_CompleteSecurity_clients_mobile">
+                            <div>Riot iOS</div>
+                            <div>Riot X for Android</div>
+                        </div>
+                        <p>{_t("or another cross-signing capable Matrix client")}</p>
+                    </div>
+
                     <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton
-                            kind="danger"
-                            onClick={this.onSkipClick}
-                        >
+                        <AccessibleButton kind="link" onClick={this.onSkipClick}>
+                            {_t("Use Recovery Passphrase or Key")}
+                        </AccessibleButton>
+                        <AccessibleButton kind="danger" onClick={this.onSkipClick}>
                             {_t("Skip")}
                         </AccessibleButton>
-                        <ButtonPlaceholder>{_t("Use your other device to continue…")}</ButtonPlaceholder>
                     </div>
                 </div>
             );
@@ -150,7 +154,7 @@ export default class SetupEncryptionBody extends React.Component {
             }
             return (
                 <div>
-                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified"></div>
+                    <div className="mx_CompleteSecurity_heroIcon mx_E2EIcon_verified" />
                     {message}
                     <div className="mx_CompleteSecurity_actionRow">
                         <AccessibleButton
diff --git a/src/components/views/elements/ButtonPlaceholder.js b/src/components/views/elements/ButtonPlaceholder.js
deleted file mode 100644
index 9c40df9db6..0000000000
--- a/src/components/views/elements/ButtonPlaceholder.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-export default function ButtonPlaceholder(props) {
-    return <div class="mx_ButtonPlaceholder">{props.children}</div>;
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d53c58639d..796257262f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2063,6 +2063,7 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Could not load user profile": "Could not load user profile",
+    "Verify this login": "Verify this login",
     "Session verified": "Session verified",
     "Failed to send email": "Failed to send email",
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
@@ -2116,9 +2117,10 @@
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
     "Create your account": "Create your account",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "Use an existing session to verify this one, granting it access to encrypted messages.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>",
-    "Use your other device to continue…": "Use your other device to continue…",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",
+    "This requires the latest Riot on your other devices:": "This requires the latest Riot on your other devices:",
+    "or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
+    "Use Recovery Passphrase or Key": "Use Recovery Passphrase or Key",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",

From 635472ccb16bb5cab2299c428cb1a34b55500769 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 22:57:00 +0100
Subject: [PATCH 2332/3235] stage new artifacts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/img/feather-customised/monitor.svg    | 5 +++++
 res/img/feather-customised/smartphone.svg | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 res/img/feather-customised/monitor.svg
 create mode 100644 res/img/feather-customised/smartphone.svg

diff --git a/res/img/feather-customised/monitor.svg b/res/img/feather-customised/monitor.svg
new file mode 100644
index 0000000000..231811d5a6
--- /dev/null
+++ b/res/img/feather-customised/monitor.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 3.89543 2.89543 3 4 3H20C21.1046 3 22 3.89543 22 5V15C22 16.1046 21.1046 17 20 17H4C2.89543 17 2 16.1046 2 15V5Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 21H16" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 17V21" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/smartphone.svg b/res/img/feather-customised/smartphone.svg
new file mode 100644
index 0000000000..fde78c82e2
--- /dev/null
+++ b/res/img/feather-customised/smartphone.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 4C5 2.89543 5.89543 2 7 2H17C18.1046 2 19 2.89543 19 4V20C19 21.1046 18.1046 22 17 22H7C5.89543 22 5 21.1046 5 20V4Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="12" cy="18" r="1" fill="#2E2F32"/>
+</svg>

From a332e0c0f4d6179756b6b09b38409fb3df767d5b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 22 Apr 2020 23:27:33 +0100
Subject: [PATCH 2333/3235] Fix BigEmoji for replies

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/HtmlUtils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index a58ea25c8a..34e9e55d25 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -446,7 +446,8 @@ export function bodyToHtml(content, highlights, opts={}) {
                     // their username. Permalinks (links in pills) can be any URL
                     // now, so we just check for an HTTP-looking thing.
                     (
-                        content.formatted_body == undefined ||
+                        strippedBody === safeBody || // replies have the html fallbacks, account for that here
+                        content.formatted_body === undefined ||
                         (!content.formatted_body.includes("http:") &&
                         !content.formatted_body.includes("https:"))
                     );

From a97a3cea5196d811535ca76fe797c97808f24e14 Mon Sep 17 00:00:00 2001
From: Sergey Shpikin <rkfg@rkfg.me>
Date: Thu, 23 Apr 2020 10:47:08 +0300
Subject: [PATCH 2334/3235] Make avatars in pills occupy the entire space using
 cropping

Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
---
 src/editor/parts.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/editor/parts.js b/src/editor/parts.js
index 747b491a9e..acd27ac219 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -252,7 +252,11 @@ class RoomPillPart extends PillPart {
 
     setAvatar(node) {
         let initialLetter = "";
-        let avatarUrl = Avatar.avatarUrlForRoom(this._room, 16 * window.devicePixelRatio, 16 * window.devicePixelRatio);
+        let avatarUrl = Avatar.avatarUrlForRoom(
+            this._room,
+            16 * window.devicePixelRatio,
+            16 * window.devicePixelRatio,
+            "crop");
         if (!avatarUrl) {
             initialLetter = Avatar.getInitialLetter(this._room ? this._room.name : this.resourceId);
             avatarUrl = `../../${Avatar.defaultAvatarUrlForString(this._room ? this._room.roomId : this.resourceId)}`;
@@ -290,7 +294,8 @@ class UserPillPart extends PillPart {
         let avatarUrl = Avatar.avatarUrlForMember(
             this._member,
             16 * window.devicePixelRatio,
-            16 * window.devicePixelRatio);
+            16 * window.devicePixelRatio,
+            "crop");
         let initialLetter = "";
         if (avatarUrl === defaultAvatarUrl) {
             // the url from defaultAvatarUrlForString is meant to go in an img element,

From 486ce3ae9103ec9c28e94cdca5ab6cb6f6e3dfc2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 23 Apr 2020 03:08:50 +0000
Subject: [PATCH 2335/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2296 of 2296 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 2a34e8140f..b2e6c35e71 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2397,5 +2397,10 @@
     "Currently indexing: %(currentRoom)s": "目前正在建立索引：%(currentRoom)s",
     "Send a bug report with logs": "傳送有紀錄檔的臭蟲回報",
     "Please supply a widget URL or embed code": "請提供小工具 URL 或嵌入程式碼",
-    "Unable to query secret storage status": "無法查詢秘密儲存空間狀態"
+    "Unable to query secret storage status": "無法查詢秘密儲存空間狀態",
+    "Verify this login": "驗證此登入",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "透過驗證這個從您的其他工作階段而來的登入來確認您的身份，並授予其對加密訊息的存取權限。",
+    "This requires the latest Riot on your other devices:": "這需要在您的其他裝置上使用最新的 Riot：",
+    "or another cross-signing capable Matrix client": "或另一個有交叉簽章功能的 Matrix 客戶端",
+    "Use Recovery Passphrase or Key": "使用復原通關密語或金鑰"
 }

From 9b66ae614a57fa6da9babb4deefcefd25cbc3248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 23 Apr 2020 06:28:42 +0000
Subject: [PATCH 2336/3235] Translated using Weblate (French)

Currently translated at 100.0% (2296 of 2296 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 6ea4755dee..a7b09ea8ac 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2398,5 +2398,10 @@
     "Currently indexing: %(currentRoom)s": "En train d’indexer : %(currentRoom)s",
     "Please supply a widget URL or embed code": "Veuillez fournir l’URL ou le code d’intégration du widget",
     "Send a bug report with logs": "Envoyer un rapport d’anomalie avec les journaux",
-    "Unable to query secret storage status": "Impossible de demander le statut du coffre secret"
+    "Unable to query secret storage status": "Impossible de demander le statut du coffre secret",
+    "Verify this login": "Vérifier cette connexion",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirmez votre identité en vérifiant cette connexion depuis une de vos autres sessions, cela lui permettra d’avoir accès aux messages chiffrés.",
+    "This requires the latest Riot on your other devices:": "Ceci nécessite la dernière version de Riot sur vos autres appareils :",
+    "or another cross-signing capable Matrix client": "ou un autre client Matrix compatible avec la signature croisée",
+    "Use Recovery Passphrase or Key": "Utiliser la phrase secrète ou la clé de récupération"
 }

From 970d3403187f51a71d42ad0b312e3499ad72de08 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 23 Apr 2020 08:21:21 +0000
Subject: [PATCH 2337/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2296 of 2296 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 3b7ae2e00f..78020c7bb8 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2395,5 +2395,10 @@
     "Please enter your recovery passphrase a second time to confirm.": "Inserisci di nuovo la password di ripristino per confermarla.",
     "Repeat your recovery passphrase...": "Ripeti la password di ripristino...",
     "Secure your backup with a recovery passphrase": "Proteggi il backup con una password di ripristino",
-    "Currently indexing: %(currentRoom)s": "Attualmente si indicizzano: %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "Attualmente si indicizzano: %(currentRoom)s",
+    "Verify this login": "Verifica questo accesso",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Conferma la tua identità verificando questo accesso da una delle tue altre sessioni, dandogli l'accesso ai messaggi cifrati.",
+    "This requires the latest Riot on your other devices:": "È richiesta l'ultima versione di Riot sui tuoi altri dispositivi:",
+    "or another cross-signing capable Matrix client": "o un altro client Matrix che supporti la firma incrociata",
+    "Use Recovery Passphrase or Key": "Usa la password di ripristino o la chiave"
 }

From 4cf234197b810eff25b9f052fdb171854fd05d75 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Apr 2020 10:12:50 +0100
Subject: [PATCH 2338/3235] iterate PR

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 82 ++++++++++++------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index be2021b2ba..e117d8f76b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -69,7 +69,7 @@ import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
 
 /** constants for MatrixChat.state.view */
-export enum VIEWS {
+export enum Views {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
     LOADING = 0,
@@ -152,7 +152,7 @@ interface IProps { // TODO type things better
 
 interface IState {
     // the master view we are showing.
-    view: VIEWS;
+    view: Views;
     // What the LoggedInView would be showing if visible
     page_type?: PageTypes;
     // The ID of the room we're viewing. This is either populated directly
@@ -193,7 +193,6 @@ interface IState {
 }
 
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
-    static VIEWS = VIEWS; // we export this so that the integration tests can use it :-S
     static displayName = "MatrixChat";
 
     static defaultProps = {
@@ -222,7 +221,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         super(props, context);
 
         this.state = {
-            view: VIEWS.LOADING,
+            view: Views.LOADING,
             collapseLhs: false,
             leftDisabled: false,
             middleDisabled: false,
@@ -538,7 +537,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     this.screenAfterLogin = payload.screenAfterLogin;
                 }
                 this.setStateForNewView({
-                    view: VIEWS.LOGIN,
+                    view: Views.LOGIN,
                 });
                 this.notifyNewScreen('login');
                 ThemeController.isLogin = true;
@@ -546,12 +545,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             case 'start_post_registration':
                 this.setState({
-                    view: VIEWS.POST_REGISTRATION,
+                    view: Views.POST_REGISTRATION,
                 });
                 break;
             case 'start_password_recovery':
                 this.setStateForNewView({
-                    view: VIEWS.FORGOT_PASSWORD,
+                    view: Views.FORGOT_PASSWORD,
                 });
                 this.notifyNewScreen('forgot_password');
                 break;
@@ -706,10 +705,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'on_logged_in':
                 if (
                     !Lifecycle.isSoftLogout() &&
-                    this.state.view !== VIEWS.LOGIN &&
-                    this.state.view !== VIEWS.REGISTER &&
-                    this.state.view !== VIEWS.COMPLETE_SECURITY &&
-                    this.state.view !== VIEWS.E2E_SETUP
+                    this.state.view !== Views.LOGIN &&
+                    this.state.view !== Views.REGISTER &&
+                    this.state.view !== Views.COMPLETE_SECURITY &&
+                    this.state.view !== Views.E2E_SETUP
                 ) {
                     this.onLoggedIn();
                 }
@@ -781,7 +780,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private async startRegistration(params: {[key: string]: string}) {
         const newState: Partial<IState> = {
-            view: VIEWS.REGISTER,
+            view: Views.REGISTER,
         };
 
         // Only honour params if they are all present, otherwise we reset
@@ -914,7 +913,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 presentedId += "/" + roomInfo.event_id;
             }
             this.setState({
-                view: VIEWS.LOGGED_IN,
+                view: Views.LOGGED_IN,
                 currentRoomId: roomInfo.room_id || null,
                 page_type: PageTypes.RoomView,
                 thirdPartyInvite: roomInfo.third_party_invite,
@@ -938,7 +937,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     private viewSomethingBehindModal() {
-        if (this.state.view !== VIEWS.LOGGED_IN) {
+        if (this.state.view !== Views.LOGGED_IN) {
             this.viewWelcome();
             return;
         }
@@ -949,7 +948,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private viewWelcome() {
         this.setStateForNewView({
-            view: VIEWS.WELCOME,
+            view: Views.WELCOME,
         });
         this.notifyNewScreen('welcome');
         ThemeController.isLogin = true;
@@ -959,7 +958,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private viewHome() {
         // The home page requires the "logged in" view, so we'll set that.
         this.setStateForNewView({
-            view: VIEWS.LOGGED_IN,
+            view: Views.LOGGED_IN,
         });
         this.setPage(PageTypes.HomePage);
         this.notifyNewScreen('home');
@@ -1216,7 +1215,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      */
     private async onLoggedIn() {
         ThemeController.isLogin = false;
-        this.setStateForNewView({ view: VIEWS.LOGGED_IN });
+        this.setStateForNewView({ view: Views.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
         // all else, as it probably means the user clicked on something already.
         if (this.screenAfterLogin && this.screenAfterLogin.screen) {
@@ -1285,7 +1284,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private onLoggedOut() {
         this.notifyNewScreen('login');
         this.setStateForNewView({
-            view: VIEWS.LOGIN,
+            view: Views.LOGIN,
             ready: false,
             collapseLhs: false,
             currentRoomId: null,
@@ -1302,7 +1301,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private onSoftLogout() {
         this.notifyNewScreen('soft_logout');
         this.setStateForNewView({
-            view: VIEWS.SOFT_LOGOUT,
+            view: Views.SOFT_LOGOUT,
             ready: false,
             collapseLhs: false,
             currentRoomId: null,
@@ -1824,7 +1823,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     onFinishPostRegistration = () => {
         // Don't confuse this with "PageType" which is the middle window to show
         this.setState({
-            view: VIEWS.LOGGED_IN,
+            view: Views.LOGGED_IN,
         });
         this.showScreen("settings");
     };
@@ -1948,7 +1947,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // Auto-enable cross-signing for the new session when key found in
             // secret storage.
             SettingsStore.setValue("feature_cross_signing", null, SettingLevel.DEVICE, true);
-            this.setStateForNewView({ view: VIEWS.COMPLETE_SECURITY });
+            this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
         } else if (
             SettingsStore.getValue("feature_cross_signing") &&
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
@@ -1956,7 +1955,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // This will only work if the feature is set to 'enable' in the config,
             // since it's too early in the lifecycle for users to have turned the
             // labs flag on.
-            this.setStateForNewView({ view: VIEWS.E2E_SETUP });
+            this.setStateForNewView({ view: Views.E2E_SETUP });
         } else {
             this.onLoggedIn();
         }
@@ -1975,21 +1974,21 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         let view;
 
-        if (this.state.view === VIEWS.LOADING) {
+        if (this.state.view === Views.LOADING) {
             const Spinner = sdk.getComponent('elements.Spinner');
             view = (
                 <div className="mx_MatrixChat_splash">
                     <Spinner />
                 </div>
             );
-        } else if (this.state.view === VIEWS.COMPLETE_SECURITY) {
+        } else if (this.state.view === Views.COMPLETE_SECURITY) {
             const CompleteSecurity = sdk.getComponent('structures.auth.CompleteSecurity');
             view = (
                 <CompleteSecurity
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
                 />
             );
-        } else if (this.state.view === VIEWS.E2E_SETUP) {
+        } else if (this.state.view === Views.E2E_SETUP) {
             const E2eSetup = sdk.getComponent('structures.auth.E2eSetup');
             view = (
                 <E2eSetup
@@ -1997,14 +1996,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     accountPassword={this.accountPassword}
                 />
             );
-        } else if (this.state.view === VIEWS.POST_REGISTRATION) {
+        } else if (this.state.view === Views.POST_REGISTRATION) {
             // needs to be before normal PageTypes as you are logged in technically
             const PostRegistration = sdk.getComponent('structures.auth.PostRegistration');
             view = (
                 <PostRegistration
                     onComplete={this.onFinishPostRegistration} />
             );
-        } else if (this.state.view === VIEWS.LOGGED_IN) {
+        } else if (this.state.view === Views.LOGGED_IN) {
             // store errors stop the client syncing and require user intervention, so we'll
             // be showing a dialog. Don't show anything else.
             const isStoreError = this.state.syncError && this.state.syncError instanceof InvalidStoreError;
@@ -2019,15 +2018,16 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                  */
                 const LoggedInView = sdk.getComponent('structures.LoggedInView');
                 view = (
-                    <LoggedInView ref={this.loggedInView}
-                                  matrixClient={MatrixClientPeg.get()}
-                                  onRoomCreated={this.onRoomCreated}
-                                  onCloseAllSettings={this.onCloseAllSettings}
-                                  onRegistered={this.onRegistered}
-                                  currentRoomId={this.state.currentRoomId}
-                                  showCookieBar={this.state.showCookieBar}
-                                  {...this.props}
-                                  {...this.state}
+                    <LoggedInView
+                        {...this.props}
+                        {...this.state}
+                        ref={this.loggedInView}
+                        matrixClient={MatrixClientPeg.get()}
+                        onRoomCreated={this.onRoomCreated}
+                        onCloseAllSettings={this.onCloseAllSettings}
+                        onRegistered={this.onRegistered}
+                        currentRoomId={this.state.currentRoomId}
+                        showCookieBar={this.state.showCookieBar}
                     />
                 );
             } else {
@@ -2049,10 +2049,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     </div>
                 );
             }
-        } else if (this.state.view === VIEWS.WELCOME) {
+        } else if (this.state.view === Views.WELCOME) {
             const Welcome = sdk.getComponent('auth.Welcome');
             view = <Welcome {...this.getServerProperties()} />;
-        } else if (this.state.view === VIEWS.REGISTER) {
+        } else if (this.state.view === Views.REGISTER) {
             const Registration = sdk.getComponent('structures.auth.Registration');
             view = (
                 <Registration
@@ -2069,7 +2069,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     {...this.getServerProperties()}
                 />
             );
-        } else if (this.state.view === VIEWS.FORGOT_PASSWORD) {
+        } else if (this.state.view === Views.FORGOT_PASSWORD) {
             const ForgotPassword = sdk.getComponent('structures.auth.ForgotPassword');
             view = (
                 <ForgotPassword
@@ -2079,7 +2079,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     {...this.getServerProperties()}
                 />
             );
-        } else if (this.state.view === VIEWS.LOGIN) {
+        } else if (this.state.view === Views.LOGIN) {
             const Login = sdk.getComponent('structures.auth.Login');
             view = (
                 <Login
@@ -2093,7 +2093,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     {...this.getServerProperties()}
                 />
             );
-        } else if (this.state.view === VIEWS.SOFT_LOGOUT) {
+        } else if (this.state.view === Views.SOFT_LOGOUT) {
             const SoftLogout = sdk.getComponent('structures.auth.SoftLogout');
             view = (
                 <SoftLogout

From f64929187a1a037ac96955e82356722a331ebb8a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Apr 2020 10:44:35 +0100
Subject: [PATCH 2339/3235] Make Screens an enum

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 326 +++++++++++++----------
 1 file changed, 179 insertions(+), 147 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e117d8f76b..02a79f9684 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -103,6 +103,22 @@ export enum Views {
     SOFT_LOGOUT = 9,
 }
 
+export enum Screens {
+    REGISTER = "register",
+    LOGIN = "login",
+    FORGOT_PASSWORD = "forgot_password",
+    SOFT_LOGOUT = "soft_logout",
+    NEW = "new", // new room
+    SETTINGS = "settings",
+    WELCOME = "welcome",
+    HOME = "home",
+    START = "start",
+    DIRECTORY = "directory",
+    GROUPS = "groups",
+    COMPLETE_SECURITY = "complete_security",
+    POST_REGISTRATION = "post_registration",
+}
+
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
@@ -114,7 +130,7 @@ const ONBOARDING_FLOW_STARTERS = [
 ];
 
 interface IScreen {
-    screen: string;
+    screen: Screens | string;
     params?: object;
 }
 
@@ -323,9 +339,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 // the old creds, but rather go straight to the relevant page
                 const firstScreen = this.screenAfterLogin ? this.screenAfterLogin.screen : null;
 
-                if (firstScreen === 'login' ||
-                    firstScreen === 'register' ||
-                    firstScreen === 'forgot_password') {
+                if (firstScreen === Screens.LOGIN ||
+                    firstScreen === Screens.REGISTER ||
+                    firstScreen === Screens.FORGOT_PASSWORD) {
                     this.showScreenAfterLogin();
                     return;
                 }
@@ -539,7 +555,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.setStateForNewView({
                     view: Views.LOGIN,
                 });
-                this.notifyNewScreen('login');
+                this.notifyNewScreen(Screens.LOGIN);
                 ThemeController.isLogin = true;
                 this.themeWatcher.recheck();
                 break;
@@ -552,7 +568,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.setStateForNewView({
                     view: Views.FORGOT_PASSWORD,
                 });
-                this.notifyNewScreen('forgot_password');
+                this.notifyNewScreen(Screens.FORGOT_PASSWORD);
                 break;
             case 'start_chat':
                 createRoom({
@@ -803,7 +819,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setStateForNewView(newState);
         ThemeController.isLogin = true;
         this.themeWatcher.recheck();
-        this.notifyNewScreen('register');
+        this.notifyNewScreen(Screens.REGISTER);
     }
 
     // TODO: Move to RoomViewStore
@@ -1282,7 +1298,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * Called when the session is logged out
      */
     private onLoggedOut() {
-        this.notifyNewScreen('login');
+        this.notifyNewScreen(Screens.LOGIN);
         this.setStateForNewView({
             view: Views.LOGIN,
             ready: false,
@@ -1299,7 +1315,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * Called when the session is softly logged out
      */
     private onSoftLogout() {
-        this.notifyNewScreen('soft_logout');
+        this.notifyNewScreen(Screens.SOFT_LOGOUT);
         this.setStateForNewView({
             view: Views.SOFT_LOGOUT,
             ready: false,
@@ -1588,152 +1604,168 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
     }
 
-    showScreen(screen: string, params?: {[key: string]: any}) {
-        if (screen === 'register') {
-            dis.dispatch({
-                action: 'start_registration',
-                params: params,
-            });
-        } else if (screen === 'login') {
-            dis.dispatch({
-                action: 'start_login',
-                params: params,
-            });
-        } else if (screen === 'forgot_password') {
-            dis.dispatch({
-                action: 'start_password_recovery',
-                params: params,
-            });
-        } else if (screen === 'soft_logout') {
-            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
-                // Logged in - visit a room
-                this.viewLastRoom();
-            } else {
-                // Ultimately triggers soft_logout if needed
+    showScreen(screen: Screens | string, params?: {[key: string]: any}) {
+        switch (screen) {
+            case Screens.REGISTER:
+                dis.dispatch({
+                    action: 'start_registration',
+                    params: params,
+                });
+                break;
+            case Screens.LOGIN:
                 dis.dispatch({
                     action: 'start_login',
                     params: params,
                 });
-            }
-        } else if (screen === 'new') {
-            dis.dispatch({
-                action: 'view_create_room',
-            });
-        } else if (screen === 'settings') {
-            dis.dispatch({
-                action: 'view_user_settings',
-            });
-        } else if (screen === 'welcome') {
-            dis.dispatch({
-                action: 'view_welcome_page',
-            });
-        } else if (screen === 'home') {
-            dis.dispatch({
-                action: 'view_home_page',
-            });
-        } else if (screen === 'start') {
-            this.showScreen('home');
-            dis.dispatch({
-                action: 'require_registration',
-            });
-        } else if (screen === 'directory') {
-            dis.dispatch({
-                action: 'view_room_directory',
-            });
-        } else if (screen === 'groups') {
-            dis.dispatch({
-                action: 'view_my_groups',
-            });
-        } else if (screen === 'complete_security') {
-            dis.dispatch({
-                action: 'start_complete_security',
-            });
-        } else if (screen === 'post_registration') {
-            dis.dispatch({
-                action: 'start_post_registration',
-            });
-        } else if (screen.indexOf('room/') === 0) {
-            // Rooms can have the following formats:
-            // #room_alias:domain or !opaque_id:domain
-            const room = screen.substring(5);
-            const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a :
-            let eventOffset = room.length;
-            // room aliases can contain slashes only look for slash after domain
-            if (room.substring(domainOffset).indexOf('/') > -1) {
-                eventOffset = domainOffset + room.substring(domainOffset).indexOf('/');
-            }
-            const roomString = room.substring(0, eventOffset);
-            let eventId = room.substring(eventOffset + 1); // empty string if no event id given
+                break;
+            case Screens.FORGOT_PASSWORD:
+                dis.dispatch({
+                    action: 'start_password_recovery',
+                    params: params,
+                });
+                break;
+            case Screens.SOFT_LOGOUT:
+                if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+                    // Logged in - visit a room
+                    this.viewLastRoom();
+                } else {
+                    // Ultimately triggers soft_logout if needed
+                    dis.dispatch({
+                        action: 'start_login',
+                        params: params,
+                    });
+                }
+                break;
+            case Screens.NEW:
+                dis.dispatch({
+                    action: 'view_create_room',
+                });
+                break;
+            case Screens.SETTINGS:
+                dis.dispatch({
+                    action: 'view_user_settings',
+                });
+                break;
+            case Screens.WELCOME:
+                dis.dispatch({
+                    action: 'view_welcome_page',
+                });
+                break;
+            case Screens.HOME:
+                dis.dispatch({
+                    action: 'view_home_page',
+                });
+                break;
+            case Screens.START:
+                this.showScreen(Screens.HOME);
+                dis.dispatch({
+                    action: 'require_registration',
+                });
+                break;
+            case Screens.DIRECTORY:
+                dis.dispatch({
+                    action: 'view_room_directory',
+                });
+                break;
+            case Screens.GROUPS:
+                dis.dispatch({
+                    action: 'view_my_groups',
+                });
+                break;
+            case Screens.COMPLETE_SECURITY:
+                dis.dispatch({
+                    action: 'start_complete_security',
+                });
+                break;
+            case Screens.POST_REGISTRATION:
+                dis.dispatch({
+                    action: 'start_post_registration',
+                });
+                break;
+            default:
+                if (screen.startsWith('room/')) {
+                    // Rooms can have the following formats:
+                    // #room_alias:domain or !opaque_id:domain
+                    const room = screen.substring(5);
+                    const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a :
+                    let eventOffset = room.length;
+                    // room aliases can contain slashes only look for slash after domain
+                    if (room.substring(domainOffset).indexOf('/') > -1) {
+                        eventOffset = domainOffset + room.substring(domainOffset).indexOf('/');
+                    }
+                    const roomString = room.substring(0, eventOffset);
+                    let eventId = room.substring(eventOffset + 1); // empty string if no event id given
 
-            // Previously we pulled the eventID from the segments in such a way
-            // where if there was no eventId then we'd get undefined. However, we
-            // now do a splice and join to handle v3 event IDs which results in
-            // an empty string. To maintain our potential contract with the rest
-            // of the app, we coerce the eventId to be undefined where applicable.
-            if (!eventId) eventId = undefined;
+                    // Previously we pulled the eventID from the segments in such a way
+                    // where if there was no eventId then we'd get undefined. However, we
+                    // now do a splice and join to handle v3 event IDs which results in
+                    // an empty string. To maintain our potential contract with the rest
+                    // of the app, we coerce the eventId to be undefined where applicable.
+                    if (!eventId) eventId = undefined;
 
-            // TODO: Handle encoded room/event IDs: https://github.com/vector-im/riot-web/issues/9149
+                    // TODO: Handle encoded room/event IDs: https://github.com/vector-im/riot-web/issues/9149
 
-            // FIXME: sort_out caseConsistency
-            const thirdPartyInvite = {
-                inviteSignUrl: params.signurl,
-                invitedEmail: params.email,
-            };
-            const oobData = {
-                name: params.room_name,
-                avatarUrl: params.room_avatar_url,
-                inviterName: params.inviter_name,
-            };
+                    // FIXME: sort_out caseConsistency
+                    const thirdPartyInvite = {
+                        inviteSignUrl: params.signurl,
+                        invitedEmail: params.email,
+                    };
+                    const oobData = {
+                        name: params.room_name,
+                        avatarUrl: params.room_avatar_url,
+                        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;
-            }
+                    // 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.
-                highlighted: Boolean(eventId),
-                third_party_invite: thirdPartyInvite,
-                oob_data: oobData,
-                room_alias: undefined,
-                room_id: undefined,
-            };
-            if (roomString[0] === '#') {
-                payload.room_alias = roomString;
-            } else {
-                payload.room_id = roomString;
-            }
+                    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.
+                        highlighted: Boolean(eventId),
+                        third_party_invite: thirdPartyInvite,
+                        oob_data: oobData,
+                        room_alias: undefined,
+                        room_id: undefined,
+                    };
+                    if (roomString[0] === '#') {
+                        payload.room_alias = roomString;
+                    } else {
+                        payload.room_id = roomString;
+                    }
 
-            dis.dispatch(payload);
-        } else if (screen.indexOf('user/') === 0) {
-            const userId = screen.substring(5);
-            dis.dispatch({
-                action: 'view_user_info',
-                userId: userId,
-                subAction: params.action,
-            });
-        } else if (screen.indexOf('group/') === 0) {
-            const groupId = screen.substring(6);
+                    dis.dispatch(payload);
+                } else if (screen.startsWith('user/')) {
+                    const userId = screen.substring(5);
+                    dis.dispatch({
+                        action: 'view_user_info',
+                        userId: userId,
+                        subAction: params.action,
+                    });
+                } else if (screen.startsWith('group/')) {
+                    const groupId = screen.substring(6);
 
-            // TODO: Check valid group ID
+                    // TODO: Check valid group ID
 
-            dis.dispatch({
-                action: 'view_group',
-                group_id: groupId,
-            });
-        } else {
-            console.info("Ignoring showScreen for '%s'", screen);
+                    dis.dispatch({
+                        action: 'view_group',
+                        group_id: groupId,
+                    });
+                } else {
+                    console.info("Ignoring showScreen for '%s'", screen);
+                }
         }
     }
 
@@ -1800,15 +1832,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     onRegisterClick = () => {
-        this.showScreen("register");
+        this.showScreen(Screens.REGISTER);
     };
 
     onLoginClick = () => {
-        this.showScreen("login");
+        this.showScreen(Screens.LOGIN);
     };
 
     onForgotPasswordClick = () => {
-        this.showScreen("forgot_password");
+        this.showScreen(Screens.FORGOT_PASSWORD);
     };
 
     onRegisterFlowComplete = (credentials: object, password: string) => {
@@ -1825,7 +1857,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setState({
             view: Views.LOGGED_IN,
         });
-        this.showScreen("settings");
+        this.showScreen(Screens.SETTINGS);
     };
 
     onVersion(current: string, latest: string, releaseNotes?: string) {

From f10d9e47e7c9e4d4ee20175256af3a2616940877 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 31 Mar 2020 16:02:23 +0100
Subject: [PATCH 2340/3235] Fix event tiles to smoothly resize with font.

---
 res/css/views/rooms/_EventTile.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0dc60226b8..a6cff9cfb0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -114,10 +114,9 @@ limitations under the License.
     clear: both;
     position: relative;
     padding-left: 65px; /* left gutter */
-    padding-top: 4px;
-    padding-bottom: 2px;
+    padding-top: 3px;
+    padding-bottom: 3px;
     border-radius: 4px;
-    min-height: 24px;
     line-height: $font-22px;
 }
 

From 1ff0f3445a52806888d82a2f25d95a120b9114cb Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Fri, 3 Apr 2020 17:53:49 +0100
Subject: [PATCH 2341/3235] Fix pills.

This was a hard pill to swallow
---
 res/css/views/elements/_RichText.scss         | 35 +++++++++----------
 res/css/views/rooms/_Autocomplete.scss        |  9 ++---
 .../views/rooms/_BasicMessageComposer.scss    | 13 +++----
 src/components/views/avatars/BaseAvatar.js    | 22 ++++++++----
 4 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index e01b1f8938..cb0c2eacc1 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -6,11 +6,14 @@
 .mx_RoomPill,
 .mx_GroupPill,
 .mx_AtRoomPill {
-    border-radius: 16px;
-    display: inline-block;
-    height: 20px;
+    display: inline-flex;
+    align-items: center;
+    vertical-align: middle;
+    border-radius: $font-16px;
+    height: $font-16px;
     line-height: $font-20px;
-    padding-left: 5px;
+    padding-left: 0;
+    padding-right: 0.5em;
 }
 
 a.mx_Pill {
@@ -19,6 +22,11 @@ a.mx_Pill {
     overflow: hidden;
     vertical-align: text-bottom;
     max-width: calc(100% - 1ch);
+    height: $font-24px;
+}
+
+.mx_Pill {
+    padding: 0.3rem;
 }
 
 /* More specific to override `.markdown-body a` text-decoration */
@@ -31,8 +39,7 @@ a.mx_Pill {
 .mx_UserPill {
     color: $primary-fg-color;
     background-color: $other-user-pill-bg-color;
-    padding-right: 5px;
-}
+ }
 
 .mx_UserPill_selected {
     background-color: $accent-color !important;
@@ -45,7 +52,6 @@ a.mx_Pill {
 .mx_MessageComposer_input .mx_AtRoomPill {
     color: $accent-fg-color;
     background-color: $mention-user-pill-bg-color;
-    padding-right: 5px;
 }
 
 /* More specific to override `.markdown-body a` color */
@@ -55,15 +61,6 @@ a.mx_Pill {
 .mx_GroupPill {
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
-    padding-right: 5px;
-}
-
-/* More specific to override `.markdown-body a` color */
-.mx_EventTile_content .markdown-body a.mx_GroupPill,
-.mx_GroupPill {
-    color: $accent-fg-color;
-    background-color: $rte-group-pill-color;
-    padding-right: 5px;
 }
 
 .mx_EventTile_body .mx_UserPill,
@@ -77,8 +74,10 @@ a.mx_Pill {
 .mx_GroupPill .mx_BaseAvatar,
 .mx_AtRoomPill .mx_BaseAvatar {
     position: relative;
-    left: -3px;
-    top: 2px;
+    display: inline-flex;
+    align-items: center;
+    border-radius: 10rem;
+    margin-right: 0.24rem;
 }
 
 .mx_Markdown_BOLD {
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index e5316f5a46..a4aebdb708 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -31,9 +31,10 @@
 }
 
 .mx_Autocomplete_Completion_pill {
-    border-radius: 17px;
-    height: 34px;
-    padding: 0px 5px;
+    box-sizing: border-box;
+    border-radius: 2rem;
+    height: $font-34px;
+    padding: 0.4rem;
     display: flex;
     user-select: none;
     cursor: pointer;
@@ -42,7 +43,7 @@
 }
 
 .mx_Autocomplete_Completion_pill > * {
-    margin: 0 3px;
+    margin-right: 0.3rem;
 }
 
 /* styling for common completion elements */
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index e9013eb7b7..e126e523a6 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -46,22 +46,19 @@ limitations under the License.
 
         &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
             span.mx_UserPill, span.mx_RoomPill {
-                padding-left: 21px;
                 position: relative;
 
                 // avatar psuedo element
                 &::before {
-                    position: absolute;
-                    left: 2px;
-                    top: 2px;
                     content: var(--avatar-letter);
-                    width: 16px;
-                    height: 16px;
+                    width: $font-16px;
+                    height: $font-16px;
+                    margin-right: 0.24rem;
                     background: var(--avatar-background), $avatar-bg-color;
                     color: $avatar-initial-color;
                     background-repeat: no-repeat;
-                    background-size: 16px;
-                    border-radius: 8px;
+                    background-size: $font-16px;
+                    border-radius: $font-16px;
                     text-align: center;
                     font-weight: normal;
                     line-height: $font-16px;
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 3e3a2e6bd9..d9336a81e7 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -164,9 +164,9 @@ export default createReactClass({
             const initialLetter = AvatarLogic.getInitialLetter(name);
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: (width * 0.65) + "px",
-                    width: width + "px",
-                    lineHeight: height + "px" }}
+                    style={{ fontSize: (width * 0.65) / 15 + "rem",
+                    width: width / 15 + "rem",
+                    lineHeight: height / 15 + "rem" }}
                 >
                     { initialLetter }
                 </span>
@@ -174,7 +174,11 @@ export default createReactClass({
             const imgNode = (
                 <img className="mx_BaseAvatar_image" src={imageUrl}
                     alt="" title={title} onError={this.onError}
-                    width={width} height={height} aria-hidden="true" />
+                    aria-hidden="true"
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }} />
             );
             if (onClick != null) {
                 return (
@@ -202,7 +206,10 @@ export default createReactClass({
                     src={imageUrl}
                     onClick={onClick}
                     onError={this.onError}
-                    width={width} height={height}
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }}
                     title={title} alt=""
                     inputRef={inputRef}
                     {...otherProps} />
@@ -213,7 +220,10 @@ export default createReactClass({
                     className="mx_BaseAvatar mx_BaseAvatar_image"
                     src={imageUrl}
                     onError={this.onError}
-                    width={width} height={height}
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }}
                     title={title} alt=""
                     ref={inputRef}
                     {...otherProps} />

From 27b1ce841f4397a0bf6c362c7bc718efdd4571dc Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:23:16 +0100
Subject: [PATCH 2342/3235] Scale room tile heights.

---
 res/css/views/rooms/_RoomTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index de018bf178..5bc7d5624d 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    height: 34px;
+    height: $font-34px;
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;

From f54ca219cf01a8c88f74abfb76b0f0cad7fae10c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:23:52 +0100
Subject: [PATCH 2343/3235] Scale read receipt images

---
 res/css/views/rooms/_EventTile.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index a6cff9cfb0..77bfa85862 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -310,6 +310,8 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 .mx_EventTile_readAvatars .mx_BaseAvatar {
     position: absolute;
     display: inline-block;
+    height: $font-14px;
+    width: $font-14px;
 }
 
 .mx_EventTile_readAvatarRemainder {

From d12ed333c1040d0bcd6fb4b00b7a40baeac433f4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:48:35 +0100
Subject: [PATCH 2344/3235] Fix avatar alignment for room state events

---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 77bfa85862..1c781eec20 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -45,7 +45,7 @@ limitations under the License.
 }
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
-    top: 8px;
+    top: $font-8px;
     left: 65px;
 }
 

From 05d11fea6900b18c7d4063668188bfdf1c648772 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:49:44 +0100
Subject: [PATCH 2345/3235] Use a function to convert to rem.

---
 src/components/views/avatars/BaseAvatar.js | 19 ++++++++++---------
 src/utils/rem.js                           | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 src/utils/rem.js

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index d9336a81e7..a17124b9ad 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -24,6 +24,7 @@ import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import toRem from "../../../utils/rem";
 
 export default createReactClass({
     displayName: 'BaseAvatar',
@@ -164,9 +165,9 @@ export default createReactClass({
             const initialLetter = AvatarLogic.getInitialLetter(name);
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: (width * 0.65) / 15 + "rem",
-                    width: width / 15 + "rem",
-                    lineHeight: height / 15 + "rem" }}
+                    style={{ fontSize: toRem(width * 0.65),
+                    width: toRem(width),
+                    lineHeight: toRem(height) }}
                 >
                     { initialLetter }
                 </span>
@@ -176,8 +177,8 @@ export default createReactClass({
                     alt="" title={title} onError={this.onError}
                     aria-hidden="true"
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }} />
             );
             if (onClick != null) {
@@ -207,8 +208,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }}
                     title={title} alt=""
                     inputRef={inputRef}
@@ -221,8 +222,8 @@ export default createReactClass({
                     src={imageUrl}
                     onError={this.onError}
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }}
                     title={title} alt=""
                     ref={inputRef}
diff --git a/src/utils/rem.js b/src/utils/rem.js
new file mode 100644
index 0000000000..0ba430950c
--- /dev/null
+++ b/src/utils/rem.js
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+// converts a pixel value to rem.
+export default function(pixel_val) {
+  return pixel_val / 15 + "rem"
+}

From c6bc0c79147b51c737709a202a90ebb3033e5eed Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:51:07 +0100
Subject: [PATCH 2346/3235] Fix read receipt horizontal spacing at scale

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

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index be0ca1f8d6..85d443d55a 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
+import toRem from "../../../utils/rem";
 
 let bounce = false;
 try {
@@ -148,7 +149,7 @@ export default createReactClass({
             // start at the old height and in the old h pos
 
             startStyles.push({ top: startTopOffset+"px",
-                               left: oldInfo.left+"px" });
+                               left: toRem(oldInfo.left) });
 
             const reorderTransitionOpts = {
                 duration: 100,
@@ -181,7 +182,7 @@ export default createReactClass({
         }
 
         const style = {
-            left: this.props.leftOffset+'px',
+            left: toRem(this.props.leftOffset),
             top: '0px',
             visibility: this.props.hidden ? 'hidden' : 'visible',
         };

From f29717ee62aceb982afd573fc0f473efad8c4488 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 17:47:12 +0100
Subject: [PATCH 2347/3235] Fix room header vertical alignment

---
 res/css/views/rooms/_RoomHeader.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 969106c9ea..80f6c40f39 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -173,8 +173,6 @@ limitations under the License.
 
 .mx_RoomHeader_avatar {
     flex: 0;
-    width: 28px;
-    height: 28px;
     margin: 0 7px;
     position: relative;
 }

From 38919518da7bef490df539b08c2d72e4f23c5c22 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 20:52:36 +0100
Subject: [PATCH 2348/3235] Resize room list scroll section.

This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
---
 src/components/structures/RoomSubList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2ae2d71100..1e3e15b4ec 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -32,6 +32,7 @@ import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
 import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
+import toRem from "../../utils/rem";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
@@ -383,7 +384,7 @@ export default class RoomSubList extends React.PureComponent {
 
     setHeight = (height) => {
         if (this._subList.current) {
-            this._subList.current.style.height = `${height}px`;
+            this._subList.current.style.height = toRem(height);
         }
         this._updateLazyRenderHeight(height);
     };

From cc601e1595e5bd4e571e74066e3b5cc1d3a8013f Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 14:21:21 +0100
Subject: [PATCH 2349/3235] Resize toggle switches with font

---
 res/css/views/elements/_ToggleSwitch.scss | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 1f4445b88c..9a07e01978 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -16,12 +16,19 @@ limitations under the License.
 
 .mx_ToggleSwitch {
     transition: background-color 0.20s ease-out 0.1s;
-    width: 48px;
-    height: 24px;
-    border-radius: 14px;
+
+    width: $font-48px;
+    height: $font-20px;
+    border-radius: 1.5rem;
+    padding: 2px;
+    
     background-color: $togglesw-off-color;
-    position: relative;
     opacity: 0.5;
+
+    display: flex;
+    flex-direction: row;
+    flex: 0 0 auto;
+    align-items: center;
 }
 
 .mx_ToggleSwitch_enabled {
@@ -35,19 +42,12 @@ limitations under the License.
 
 .mx_ToggleSwitch_ball {
     transition: left 0.15s ease-out 0.1s;
-    margin: 2px;
-    width: 20px;
-    height: 20px;
-    border-radius: 20px;
+    width: $font-20px;
+    height: $font-20px;
+    border-radius: $font-20px;
     background-color: $togglesw-ball-color;
-    position: absolute;
-    top: 0;
 }
 
-.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
-    left: 23px; // 48px switch - 20px ball - 5px padding = 23px
-}
-
-.mx_ToggleSwitch:not(.mx_ToggleSwitch_on) > .mx_ToggleSwitch_ball {
-    left: 2px;
-}
+.mx_ToggleSwitch_on {
+    flex-direction: row-reverse;
+}
\ No newline at end of file

From 0182128189e433cd775f78a44f90ed0d523a961a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:07:34 +0100
Subject: [PATCH 2350/3235] Fix settings when scaling up

---
 res/css/views/elements/_ToggleSwitch.scss     | 2 +-
 res/css/views/settings/tabs/_SettingsTab.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 9a07e01978..073bf5c00b 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_ToggleSwitch {
     transition: background-color 0.20s ease-out 0.1s;
 
-    width: $font-48px;
+    width: $font-44px;
     height: $font-20px;
     border-radius: 1.5rem;
     padding: 2px;
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 1fbfb35927..e3a61e6825 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -63,7 +63,7 @@ limitations under the License.
     display: inline-block;
     font-size: $font-14px;
     color: $primary-fg-color;
-    max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
+    max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
     box-sizing: border-box;
     padding-right: 10px;
 }

From 5caec2a289a2f2b1bfc75cfeae1b05a9d3479b34 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:23:19 +0100
Subject: [PATCH 2351/3235] lint

---
 res/css/views/elements/_RichText.scss     | 2 +-
 res/css/views/elements/_ToggleSwitch.scss | 4 ++--
 src/utils/rem.js                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index cb0c2eacc1..21d01fdd51 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -39,7 +39,7 @@ a.mx_Pill {
 .mx_UserPill {
     color: $primary-fg-color;
     background-color: $other-user-pill-bg-color;
- }
+}
 
 .mx_UserPill_selected {
     background-color: $accent-color !important;
diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 073bf5c00b..7c65fbc90d 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -21,7 +21,7 @@ limitations under the License.
     height: $font-20px;
     border-radius: 1.5rem;
     padding: 2px;
-    
+
     background-color: $togglesw-off-color;
     opacity: 0.5;
 
@@ -50,4 +50,4 @@ limitations under the License.
 
 .mx_ToggleSwitch_on {
     flex-direction: row-reverse;
-}
\ No newline at end of file
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index 0ba430950c..1f18c9de05 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // converts a pixel value to rem.
-export default function(pixel_val) {
-  return pixel_val / 15 + "rem"
+export default function(pixelVal) {
+  return pixelVal / 15 + "rem";
 }

From a58721047e6345ccd1b722c648314da7fbacac07 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:41:41 +0100
Subject: [PATCH 2352/3235] Room memebers avatars scale

---
 res/css/views/rooms/_EntityTile.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 966d2c4e70..8db71f297c 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -69,8 +69,6 @@ limitations under the License.
     padding-right: 12px;
     padding-top: 4px;
     padding-bottom: 4px;
-    width: 36px;
-    height: 36px;
     position: relative;
 }
 

From e49c041df79cb8169b39c76de21c087c5e21caec Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 16:08:59 +0100
Subject: [PATCH 2353/3235] Commuity seleciton bar vertical alignment scale fix

---
 res/css/structures/_TagPanel.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 0065ffa502..f5c4c4c698 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -110,13 +110,13 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
     content: '';
-    height: 56px;
+    height: calc(100% + 16px);
     background-color: $accent-color;
     width: 5px;
     position: absolute;
     left: -15px;
     border-radius: 0 3px 3px 0;
-    top: -8px; // (56 - 40)/2
+    top: -8px; // (16px / 2)
 }
 
 .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {

From 121b53f99a5f1d17decdd296ff4b960ffc026c3a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 16:27:26 +0100
Subject: [PATCH 2354/3235] FIx lanugage selection alignment at scale.

---
 res/css/views/elements/_Dropdown.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 32a68d5252..dd8511cc42 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -67,6 +67,8 @@ limitations under the License.
     text-overflow: ellipsis;
     white-space: nowrap;
     flex: 1;
+    display: inline-flex;
+    align-items: center;
 }
 
 .mx_Dropdown_option div {

From 3966e45b8fccf884850e68469a9443795b0e830e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:13:09 +0100
Subject: [PATCH 2355/3235] Fix test

---
 test/components/views/messages/TextualBody-test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 4ad46586ae..7801995254 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,8 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'width="16" height="16" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
+                'style=\"width: 1.0666666666666667rem; height: 1.0666666666666667rem;\" ' +
+                'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });

From 2d2b39892a2ad349514754f42725e86f33b58a54 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:23:07 +0100
Subject: [PATCH 2356/3235] lint test

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

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 7801995254..59671327ce 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,7 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'style=\"width: 1.0666666666666667rem; height: 1.0666666666666667rem;\" ' +
+                'style="width: 1.0666666666666667rem; height: 1.0666666666666667rem;" ' +
                 'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });

From c2a29087460969fd7368d84ff5112fb5b3b25d06 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:41:18 +0100
Subject: [PATCH 2357/3235] Fix community line height

---
 res/css/structures/_TagPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index f5c4c4c698..4a78c8df92 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -69,7 +69,7 @@ limitations under the License.
     height: 100%;
 }
 .mx_TagPanel .mx_TagPanel_tagTileContainer > div {
-    height: 40px;
+    height: $font-40px;
     padding: 10px 0 9px 0;
 }
 

From c921859067b25b4c86d33ec93f3d06d6a0889ef0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:35:38 +0100
Subject: [PATCH 2358/3235] Use rem instead of em.

---
 res/css/views/elements/_RichText.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 21d01fdd51..d46d07e82b 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -13,7 +13,7 @@
     height: $font-16px;
     line-height: $font-20px;
     padding-left: 0;
-    padding-right: 0.5em;
+    padding-right: 0.5rem;
 }
 
 a.mx_Pill {

From 07853f48bb882a55ec2fdab9255bf2a8366d4efd Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:45:21 +0100
Subject: [PATCH 2359/3235] Use font-variable instead of rem

---
 res/css/_font-sizes.scss              | 7 +++++++
 res/css/views/elements/_RichText.scss | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index ad9e2e7103..b37b2eb3c2 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$font-1px: 0.067rem;
+$font-2px: 0.133rem;
+$font-3px: 0.200rem;
+$font-4px: 0.267rem;
+$font-5px: 0.333rem;
+$font-6px: 0.400rem;
+$font-7px: 0.467rem;
 $font-8px: 0.533rem;
 $font-9px: 0.600rem;
 $font-10px: 0.667rem;
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index d46d07e82b..5b5759b794 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -26,7 +26,7 @@ a.mx_Pill {
 }
 
 .mx_Pill {
-    padding: 0.3rem;
+    padding: $font-5px;
 }
 
 /* More specific to override `.markdown-body a` text-decoration */

From 18efbcccebece7ebd4cf17d5e6e9073261b3cb2a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 17:07:59 +0100
Subject: [PATCH 2360/3235] Undo superfluous delete

---
 res/css/views/elements/_RichText.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 5b5759b794..b933b1b828 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -29,6 +29,13 @@ a.mx_Pill {
     padding: $font-5px;
 }
 
+/* More specific to override `.markdown-body a` color */
+.mx_EventTile_content .markdown-body a.mx_GroupPill,
+.mx_GroupPill {
+    color: $accent-fg-color;
+    background-color: $rte-group-pill-color;
+}
+
 /* More specific to override `.markdown-body a` text-decoration */
 .mx_EventTile_content .markdown-body a.mx_Pill {
     text-decoration: none;

From fc04266b4239fe7f1135e81bf8d4a38b771d095d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 17:32:24 +0100
Subject: [PATCH 2361/3235] Skinnier pills are easier to swallow

---
 res/css/views/elements/_RichText.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index b933b1b828..1fa04595f9 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -10,10 +10,9 @@
     align-items: center;
     vertical-align: middle;
     border-radius: $font-16px;
-    height: $font-16px;
-    line-height: $font-20px;
+    line-height: $font-15px;
     padding-left: 0;
-    padding-right: 0.5rem;
+    padding-right: $font-5px;
 }
 
 a.mx_Pill {
@@ -22,11 +21,10 @@ a.mx_Pill {
     overflow: hidden;
     vertical-align: text-bottom;
     max-width: calc(100% - 1ch);
-    height: $font-24px;
 }
 
 .mx_Pill {
-    padding: $font-5px;
+    padding: $font-1px;
 }
 
 /* More specific to override `.markdown-body a` color */

From 7a0caafb77fadeabba717a78ae5ddd09e8fdaf33 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 19:15:34 +0100
Subject: [PATCH 2362/3235] FIx unread count

---
 res/css/structures/_RoomSubList.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 2e0c94263e..2c53258b08 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -74,7 +74,7 @@ limitations under the License.
 
 .mx_RoomSubList_badge > div {
     flex: 0 0 auto;
-    border-radius: 8px;
+    border-radius: $font-16px;
     font-weight: 600;
     font-size: $font-12px;
     padding: 0 5px;

From 83609f0ab2bb1b75d0e0282eba5baee014e6f569 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:12:53 +0100
Subject: [PATCH 2363/3235] Scale user photo upload with font size

---
 res/css/_font-sizes.scss                   | 1 +
 res/css/views/settings/_AvatarSetting.scss | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index b37b2eb3c2..5cd19ce620 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -67,4 +67,5 @@ $font-49px: 3.267rem;
 $font-50px: 3.333rem;
 $font-51px: 3.400rem;
 $font-52px: 3.467rem;
+$font-88px: 5.887rem;
 $font-400px: 26.667rem;
diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss
index 35dba90f85..9fa10907b4 100644
--- a/res/css/views/settings/_AvatarSetting.scss
+++ b/res/css/views/settings/_AvatarSetting.scss
@@ -15,13 +15,13 @@ limitations under the License.
 */
 
 .mx_AvatarSetting_avatar {
-    width: 88px;
-    height: 88px;
+    width: $font-88px;
+    height: $font-88px;
     margin-left: 13px;
     position: relative;
 
     & > * {
-        width: 88px;
+        width: $font-88px;
         box-sizing: border-box;
     }
 
@@ -63,7 +63,7 @@ limitations under the License.
     & > img,
     .mx_AvatarSetting_avatarPlaceholder {
         display: block;
-        height: 88px;
+        height: $font-88px;
         border-radius: 4px;
     }
 

From 42ec21f5bb306c51ae21e4e2b3995bc757139db8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:13:13 +0100
Subject: [PATCH 2364/3235] Tweak read receipt remainder text

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f67877373e..af14f6922c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,6 +34,7 @@ import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
+import torem from "../../../utils/rem";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -473,7 +474,7 @@ export default createReactClass({
             if (remainder > 0) {
                 remText = <span className="mx_EventTile_readAvatarRemainder"
                     onClick={this.toggleAllReadAvatars}
-                    style={{ right: -(left - receiptOffset) }}>{ remainder }+
+                    style={{ right: "calc(" + torem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
                 </span>;
             }
         }

From e10a511997ca6667bfb96b74938735c8c81447d5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 15:49:19 +0100
Subject: [PATCH 2365/3235] Extra right padding in user pills

---
 res/css/views/elements/_RichText.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 1fa04595f9..b45b567db7 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -25,6 +25,7 @@ a.mx_Pill {
 
 .mx_Pill {
     padding: $font-1px;
+    padding-right: $font-6px;
 }
 
 /* More specific to override `.markdown-body a` color */

From 61f2e19d95b8f7ef7589de0461d1877b9e607a11 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:18:57 +0100
Subject: [PATCH 2366/3235] Basic font settings.

Include a default value getter in the store in order to make the
default value easy to work with.
---
 src/settings/Settings.js                      |  7 ++++
 src/settings/SettingsStore.js                 | 14 ++++++++
 .../controllers/FontSizeController.js         | 33 +++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 src/settings/controllers/FontSizeController.js

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 928b1985fa..3b316e39d0 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -29,6 +29,7 @@ import ThemeController from './controllers/ThemeController';
 import PushToMatrixClientController from './controllers/PushToMatrixClientController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
+import FontSizeController from './controllers/FontSizeController';
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -94,6 +95,12 @@ export const SETTINGS = {
     //     // not use this for new settings.
     //     invertedSettingName: "my-negative-setting",
     // },
+    "font_size": {
+        displayName: _td("Font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: 16,
+        controller: new FontSizeController(),
+    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 0122916bc3..70ea5ac57c 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -370,6 +370,20 @@ export default class SettingsStore {
         return SettingsStore._getFinalValue(setting, level, roomId, null, null);
     }
 
+    /**
+     * Gets the default value of a setting.
+     * @param {string} settingName The name of the setting to read the value of.
+     * @return {*} The value, or null if not found
+     */
+    static getDefaultValue(settingName, roomId = null, excludeDefault = false) {
+        // Verify that the setting is actually a setting
+        if (!SETTINGS[settingName]) {
+            throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
+        }
+
+        return SETTINGS[settingName].default;
+    }
+
     static _getFinalValue(setting, level, roomId, calculatedValue, calculatedAtLevel) {
         let resultingValue = calculatedValue;
 
diff --git a/src/settings/controllers/FontSizeController.js b/src/settings/controllers/FontSizeController.js
new file mode 100644
index 0000000000..4ab2f331f1
--- /dev/null
+++ b/src/settings/controllers/FontSizeController.js
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 SettingController from "./SettingController";
+import dis from "../../dispatcher";
+
+export default class FontSizeController extends SettingController {
+
+    constructor() {
+        super()
+    }
+
+    onChange(level, roomId, newValue) {
+        // Dispatch font size change so that everything open responds to the change.
+        dis.dispatch({
+            action: "update-font-size",
+            size: newValue,
+        });
+    }
+}

From 269621ad2436f2181d44a10829cad1447249d8fd Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:19:50 +0100
Subject: [PATCH 2367/3235] Move theme settings to a new tab

---
 .../tabs/user/GeneralUserSettingsTab.js       | 172 -------------
 .../tabs/user/StyleUserSettingsTab.js         | 233 ++++++++++++++++++
 src/theme.js                                  |   2 +-
 3 files changed, 234 insertions(+), 173 deletions(-)
 create mode 100644 src/components/views/settings/tabs/user/StyleUserSettingsTab.js

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 801062bff4..4e57203ca2 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -19,7 +19,6 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import ProfileSettings from "../../ProfileSettings";
-import Field from "../../../elements/Field";
 import * as languageHandler from "../../../../../languageHandler";
 import {SettingLevel} from "../../../../../settings/SettingsStore";
 import SettingsStore from "../../../../../settings/SettingsStore";
@@ -27,7 +26,6 @@ import LanguageDropdown from "../../../elements/LanguageDropdown";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
-import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import PlatformPeg from "../../../../../PlatformPeg";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
@@ -60,9 +58,6 @@ export default class GeneralUserSettingsTab extends React.Component {
             },
             emails: [],
             msisdns: [],
-            ...this._calculateThemeState(),
-            customThemeUrl: "",
-            customThemeMessage: {isError: false, text: ""},
         };
 
         this.dispatcherRef = dis.register(this._onAction);
@@ -91,39 +86,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         dis.unregister(this.dispatcherRef);
     }
 
-    _calculateThemeState() {
-        // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
-        // show the right values for things.
-
-        const themeChoice = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme");
-        const systemThemeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "use_system_theme", null, false, true);
-        const themeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "theme", null, false, true);
-
-        // If the user has enabled system theme matching, use that.
-        if (systemThemeExplicit) {
-            return {
-                theme: themeChoice,
-                useSystemTheme: true,
-            };
-        }
-
-        // If the user has set a theme explicitly, use that (no system theme matching)
-        if (themeExplicit) {
-            return {
-                theme: themeChoice,
-                useSystemTheme: false,
-            };
-        }
-
-        // Otherwise assume the defaults for the settings
-        return {
-            theme: themeChoice,
-            useSystemTheme: SettingsStore.getValueAt(SettingLevel.DEVICE, "use_system_theme"),
-        };
-    }
-
     _onAction = (payload) => {
         if (payload.action === 'id_server_changed') {
             this.setState({haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl())});
@@ -214,33 +176,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         PlatformPeg.get().reload();
     };
 
-    _onThemeChange = (e) => {
-        const newTheme = e.target.value;
-        if (this.state.theme === newTheme) return;
-
-        // doing getValue in the .catch will still return the value we failed to set,
-        // so remember what the value was before we tried to set it so we can revert
-        const oldTheme = SettingsStore.getValue('theme');
-        SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme).catch(() => {
-            dis.dispatch({action: 'recheck_theme'});
-            this.setState({theme: oldTheme});
-        });
-        this.setState({theme: newTheme});
-        // The settings watcher doesn't fire until the echo comes back from the
-        // server, so to make the theme change immediately we need to manually
-        // do the dispatch now
-        // XXX: The local echoed value appears to be unreliable, in particular
-        // when settings custom themes(!) so adding forceTheme to override
-        // the value from settings.
-        dis.dispatch({action: 'recheck_theme', forceTheme: newTheme});
-    };
-
-    _onUseSystemThemeChanged = (checked) => {
-        this.setState({useSystemTheme: checked});
-        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
-        dis.dispatch({action: 'recheck_theme'});
-    };
-
     _onPasswordChangeError = (err) => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         let errMsg = err.error || "";
@@ -277,41 +212,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
-    _onAddCustomTheme = async () => {
-        let currentThemes = SettingsStore.getValue("custom_themes");
-        if (!currentThemes) currentThemes = [];
-        currentThemes = currentThemes.map(c => c); // cheap clone
-
-        if (this._themeTimer) {
-            clearTimeout(this._themeTimer);
-        }
-
-        try {
-            const r = await fetch(this.state.customThemeUrl);
-            const themeInfo = await r.json();
-            if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
-                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
-                return;
-            }
-            currentThemes.push(themeInfo);
-        } catch (e) {
-            console.error(e);
-            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
-            return; // Don't continue on error
-        }
-
-        await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
-        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
-
-        this._themeTimer = setTimeout(() => {
-            this.setState({customThemeMessage: {text: "", isError: false}});
-        }, 3000);
-    };
-
-    _onCustomThemeChange = (e) => {
-        this.setState({customThemeUrl: e.target.value});
-    };
-
     _renderProfileSection() {
         return (
             <div className="mx_SettingsTab_section">
@@ -391,77 +291,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
-    _renderThemeSection() {
-        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
-        const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
-
-        const themeWatcher = new ThemeWatcher();
-        let systemThemeSection;
-        if (themeWatcher.isSystemThemeSupported()) {
-            systemThemeSection = <div>
-                <LabelledToggleSwitch
-                    value={this.state.useSystemTheme}
-                    label={SettingsStore.getDisplayName("use_system_theme")}
-                    onChange={this._onUseSystemThemeChanged}
-                />
-            </div>;
-        }
-
-        let customThemeForm;
-        if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
-            let messageElement = null;
-            if (this.state.customThemeMessage.text) {
-                if (this.state.customThemeMessage.isError) {
-                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
-                } else {
-                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
-                }
-            }
-            customThemeForm = (
-                <div className='mx_SettingsTab_section'>
-                    <form onSubmit={this._onAddCustomTheme}>
-                        <Field
-                            label={_t("Custom theme URL")}
-                            type='text'
-                            autoComplete="off"
-                            onChange={this._onCustomThemeChange}
-                            value={this.state.customThemeUrl}
-                        />
-                        <AccessibleButton
-                            onClick={this._onAddCustomTheme}
-                            type="submit" kind="primary_sm"
-                            disabled={!this.state.customThemeUrl.trim()}
-                        >{_t("Add theme")}</AccessibleButton>
-                        {messageElement}
-                    </form>
-                </div>
-            );
-        }
-
-        const themes = Object.entries(enumerateThemes())
-            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
-        const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
-        const customThemes = themes.filter(p => !builtInThemes.includes(p))
-            .sort((a, b) => a.name.localeCompare(b.name));
-        const orderedThemes = [...builtInThemes, ...customThemes];
-        return (
-            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
-                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
-                {systemThemeSection}
-                <Field label={_t("Theme")} element="select"
-                       value={this.state.theme} onChange={this._onThemeChange}
-                       disabled={this.state.useSystemTheme}
-                >
-                    {orderedThemes.map(theme => {
-                        return <option key={theme.id} value={theme.id}>{theme.name}</option>;
-                    })}
-                </Field>
-                {customThemeForm}
-                <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
-            </div>
-        );
-    }
-
     _renderDiscoverySection() {
         const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
 
@@ -547,7 +376,6 @@ export default class GeneralUserSettingsTab extends React.Component {
                 {this._renderProfileSection()}
                 {this._renderAccountSection()}
                 {this._renderLanguageSection()}
-                {this._renderThemeSection()}
                 <div className="mx_SettingsTab_heading">{discoWarning} {_t("Discovery")}</div>
                 {this._renderDiscoverySection()}
                 {this._renderIntegrationManagerSection() /* Has its own title */}
diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
new file mode 100644
index 0000000000..5c68f214d4
--- /dev/null
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -0,0 +1,233 @@
+/*
+Copyright 2019 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 {_t} from "../../../../../languageHandler";
+import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import * as sdk from "../../../../../index";
+import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
+import Field from "../../../elements/Field";
+
+export default class StyleUserSettingsTab extends React.Component {
+    constructor() {
+        super();
+
+        this.state = {
+            fontSize: SettingsStore.getValue("font_size", null),
+            ...this._calculateThemeState(),
+            customThemeUrl: "",
+            customThemeMessage: {isError: false, text: ""},
+        }
+    }
+
+    _calculateThemeState() {
+        // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
+        // show the right values for things.
+
+        const themeChoice = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme");
+        const systemThemeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "use_system_theme", null, false, true);
+        const themeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "theme", null, false, true);
+
+        // If the user has enabled system theme matching, use that.
+        if (systemThemeExplicit) {
+            return {
+                theme: themeChoice,
+                useSystemTheme: true,
+            };
+        }
+
+        // If the user has set a theme explicitly, use that (no system theme matching)
+        if (themeExplicit) {
+            return {
+                theme: themeChoice,
+                useSystemTheme: false,
+            };
+        }
+
+        // Otherwise assume the defaults for the settings
+        return {
+            theme: themeChoice,
+            useSystemTheme: SettingsStore.getValueAt(SettingLevel.DEVICE, "use_system_theme"),
+        };
+    }
+
+    _onThemeChange = (e) => {
+        const newTheme = e.target.value;
+        if (this.state.theme === newTheme) return;
+
+        // doing getValue in the .catch will still return the value we failed to set,
+        // so remember what the value was before we tried to set it so we can revert
+        const oldTheme = SettingsStore.getValue('theme');
+        SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme).catch(() => {
+            dis.dispatch({action: 'recheck_theme'});
+            this.setState({theme: oldTheme});
+        });
+        this.setState({theme: newTheme});
+        // The settings watcher doesn't fire until the echo comes back from the
+        // server, so to make the theme change immediately we need to manually
+        // do the dispatch now
+        // XXX: The local echoed value appears to be unreliable, in particular
+        // when settings custom themes(!) so adding forceTheme to override
+        // the value from settings.
+        dis.dispatch({action: 'recheck_theme', forceTheme: newTheme});
+    };
+
+    _onUseSystemThemeChanged = (checked) => {
+        this.setState({useSystemTheme: checked});
+        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
+        dis.dispatch({action: 'recheck_theme'});
+    };
+
+    _onFontSizeChanged = (size) => {
+        let parsed_size = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
+        this.setState({fontSize: parsed_size})
+        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsed_size)
+    };
+
+    _onAddCustomTheme = async () => {
+        let currentThemes = SettingsStore.getValue("custom_themes");
+        if (!currentThemes) currentThemes = [];
+        currentThemes = currentThemes.map(c => c); // cheap clone
+
+        if (this._themeTimer) {
+            clearTimeout(this._themeTimer);
+        }
+
+        try {
+            const r = await fetch(this.state.customThemeUrl);
+            const themeInfo = await r.json();
+            if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
+                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
+                return;
+            }
+            currentThemes.push(themeInfo);
+        } catch (e) {
+            console.error(e);
+            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
+            return; // Don't continue on error
+        }
+
+        await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
+        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
+
+        this._themeTimer = setTimeout(() => {
+            this.setState({customThemeMessage: {text: "", isError: false}});
+        }, 3000);
+    };
+
+    _onCustomThemeChange = (e) => {
+        this.setState({customThemeUrl: e.target.value});
+    };
+
+    render() {
+        return (
+            <div className="mx_SettingsTab">
+                <div className="mx_SettingsTab_heading">{_t("Style")}</div>
+                {this._renderThemeSection()}
+                {this._renderFontSection()}
+            </div>
+        );
+    }
+
+    _renderThemeSection() {
+        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
+        const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
+
+        const themeWatcher = new ThemeWatcher();
+        let systemThemeSection;
+        if (themeWatcher.isSystemThemeSupported()) {
+            systemThemeSection = <div>
+                <LabelledToggleSwitch
+                    value={this.state.useSystemTheme}
+                    label={SettingsStore.getDisplayName("use_system_theme")}
+                    onChange={this._onUseSystemThemeChanged}
+                />
+            </div>;
+        }
+
+        let customThemeForm;
+        if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
+            let messageElement = null;
+            if (this.state.customThemeMessage.text) {
+                if (this.state.customThemeMessage.isError) {
+                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
+                } else {
+                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
+                }
+            }
+            customThemeForm = (
+                <div className='mx_SettingsTab_section'>
+                    <form onSubmit={this._onAddCustomTheme}>
+                        <Field
+                            label={_t("Custom theme URL")}
+                            type='text'
+                            id='mx_GeneralUserSettingsTab_customThemeInput'
+                            autoComplete="off"
+                            onChange={this._onCustomThemeChange}
+                            value={this.state.customThemeUrl}
+                        />
+                        <AccessibleButton
+                            onClick={this._onAddCustomTheme}
+                            type="submit" kind="primary_sm"
+                            disabled={!this.state.customThemeUrl.trim()}
+                        >{_t("Add theme")}</AccessibleButton>
+                        {messageElement}
+                    </form>
+                </div>
+            );
+        }
+
+        const themes = Object.entries(enumerateThemes())
+            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
+        const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
+        const customThemes = themes.filter(p => !builtInThemes.includes(p))
+            .sort((a, b) => a.name.localeCompare(b.name));
+        const orderedThemes = [...builtInThemes, ...customThemes];
+        return (
+            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
+                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
+                {systemThemeSection}
+                <Field id="theme" label={_t("Theme")} element="select"
+                       value={this.state.theme} onChange={this._onThemeChange}
+                       disabled={this.state.useSystemTheme}
+                >
+                    {orderedThemes.map(theme => {
+                        return <option key={theme.id} value={theme.id}>{theme.name}</option>;
+                    })}
+                </Field>
+                {customThemeForm}
+                <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
+           </div>
+        );
+    }
+
+    _renderFontSection() {
+        return <div className="mx_SettingsTab_section">
+            <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
+            <Field
+                type="text"
+                label={_t("Font size")}
+                autoComplete="off"
+                placeholder={SettingsStore.getValue("font_size", null).toString()}
+                id="font_size_field"
+                onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
+            />
+        </div>
+    }
+
+}
diff --git a/src/theme.js b/src/theme.js
index 442a89e25f..3309acdd01 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -81,7 +81,7 @@ export class ThemeWatcher {
     }
 
     getEffectiveTheme() {
-        // Dev note: Much of this logic is replicated in the GeneralUserSettingsTab
+        // Dev note: Much of this logic is replicated in the StyleUserSettingsTab
 
         // XXX: checking the isLight flag here makes checking it in the ThemeController
         // itself completely redundant since we just override the result here and we're

From bce1fa0c1a5277e87b46470055017f7f8a49d32e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:20:08 +0100
Subject: [PATCH 2368/3235] Simple translations

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3eac055054..f10da54729 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2293,5 +2293,7 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "Font size": "Font size",
+    "Style": "Style"
 }

From c1827925dad16eaac32c784dbbb13d7530dc7dd2 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:20:41 +0100
Subject: [PATCH 2369/3235] Use new style tab

---
 src/components/views/dialogs/UserSettingsDialog.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index b135d5f5f6..ee6f7e13ec 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -22,6 +22,7 @@ import {_t, _td} from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
 import SettingsStore from "../../../settings/SettingsStore";
 import LabsUserSettingsTab from "../settings/tabs/user/LabsUserSettingsTab";
+import StyleUserSettingsTab from "../settings/tabs/user/StyleUserSettingsTab";
 import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
 import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab";
 import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
@@ -66,6 +67,11 @@ export default class UserSettingsDialog extends React.Component {
             "mx_UserSettingsDialog_settingsIcon",
             <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
+        tabs.push(new Tab(
+            _td("Style"),
+            "mx_userSettingsDialog_styleIcon",
+            <StyleUserSettingsTab />,
+        ));
         tabs.push(new Tab(
             _td("Flair"),
             "mx_UserSettingsDialog_flairIcon",

From af4dd2770c4cc3da7ef20617c2bb4fdb3e174a52 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:21:04 +0100
Subject: [PATCH 2370/3235] Respond to font size changes

---
 src/components/structures/MatrixChat.js |  4 ++
 src/fontSize.js                         | 50 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/fontSize.js

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1293ccc7e9..1845e0011d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -66,6 +66,7 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
+import { FontWatcher } from '../../fontSize';
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {
@@ -265,7 +266,9 @@ export default createReactClass({
 
         this.dispatcherRef = dis.register(this.onAction);
         this._themeWatcher = new ThemeWatcher();
+        this._fontWatcher = new FontWatcher(10, 20);
         this._themeWatcher.start();
+        this._fontWatcher.start();
 
         this.focusComposer = false;
 
@@ -353,6 +356,7 @@ export default createReactClass({
         Lifecycle.stopMatrixClient();
         dis.unregister(this.dispatcherRef);
         this._themeWatcher.stop();
+        this._fontWatcher.stop();
         window.removeEventListener("focus", this.onFocus);
         window.removeEventListener('resize', this.handleResize);
         this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
diff --git a/src/fontSize.js b/src/fontSize.js
new file mode 100644
index 0000000000..c242fcc743
--- /dev/null
+++ b/src/fontSize.js
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 dis from './dispatcher';
+import SettingsStore from './settings/SettingsStore';
+
+export class FontWatcher {
+    constructor(min_size, max_size) {
+        this._min_size = min_size;
+        this._max_size = max_size;
+        this._dispatcherRef = null;
+    }
+
+    start() {
+        this._setRootFontSize(SettingsStore.getValue("font_size"));
+        this._dispatcherRef = dis.register(this._onAction);
+    }
+
+    stop() {
+        dis.unregister(this._dispatcherRef);
+    }
+
+    _onAction = (payload) => {
+        if (payload.action === 'update-font-size') {
+            this._setRootFontSize(payload.size);
+        }
+    };
+
+    _setRootFontSize = size => {
+        let fontSize = this._min_size < size?size:this._min_size;
+        fontSize = fontSize < this._max_size?fontSize:this._max_size;
+        if (fontSize != size) {
+            SettingsStore.setValue("font_size", null, fontSize)
+        }
+        document.querySelector(":root").style.fontSize = fontSize + "px";
+    }
+}
\ No newline at end of file

From 14551b1885bc0d309e284d0293b7ad0f042e9927 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:28:07 +0100
Subject: [PATCH 2371/3235] Hide font scaling behind labs

---
 .../views/settings/tabs/user/StyleUserSettingsTab.js        | 2 +-
 src/i18n/strings/en_EN.json                                 | 1 +
 src/settings/Settings.js                                    | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
index 5c68f214d4..ab9107eac0 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -139,7 +139,7 @@ export default class StyleUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Style")}</div>
                 {this._renderThemeSection()}
-                {this._renderFontSection()}
+                {SettingsStore.getValue("feature_font_scaling") ? this._renderFontSection() : null}
             </div>
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f10da54729..bf2eaa4652 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2295,5 +2295,6 @@
     "Space": "Space",
     "End": "End",
     "Font size": "Font size",
+    "Font scaling": "Font scaling",
     "Style": "Style"
 }
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 3b316e39d0..23b73f740b 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -95,6 +95,12 @@ export const SETTINGS = {
     //     // not use this for new settings.
     //     invertedSettingName: "my-negative-setting",
     // },
+    "feature_font_scaling": {
+        isFeature: true,
+        displayName: _td("Font scaling"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false
+    },
     "font_size": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,

From 0faf7b865f47a4fc28a0339d999f6592c501e045 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:31:40 +0100
Subject: [PATCH 2372/3235] Set font option width

---
 .../tabs/user/_GeneralUserSettingsTab.scss    |  3 ++-
 .../tabs/user/_StyleUserSettingsTab.scss      | 20 +++++++++++++++++++
 .../tabs/user/StyleUserSettingsTab.js         |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss

diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 62d230e752..45aecd032f 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 .mx_GeneralUserSettingsTab_changePassword .mx_Field,
-.mx_GeneralUserSettingsTab_themeSection .mx_Field {
+.mx_StyleUserSettingsTab_themeSection .mx_Field,
+.mx_StyleUserSettingsTab_fontScaling .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
 
diff --git a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
new file mode 100644
index 0000000000..dd9646bd5a
--- /dev/null
+++ b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_StyleUserSettingsTab_themeSection .mx_Field,
+.mx_StyleUserSettingsTab_fontScaling .mx_Field {
+    @mixin mx_Settings_fullWidthField;
+}
\ No newline at end of file
diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
index ab9107eac0..e7b7385f5a 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -199,7 +199,7 @@ export default class StyleUserSettingsTab extends React.Component {
             .sort((a, b) => a.name.localeCompare(b.name));
         const orderedThemes = [...builtInThemes, ...customThemes];
         return (
-            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
+            <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 {systemThemeSection}
                 <Field id="theme" label={_t("Theme")} element="select"
@@ -217,7 +217,7 @@ export default class StyleUserSettingsTab extends React.Component {
     }
 
     _renderFontSection() {
-        return <div className="mx_SettingsTab_section">
+        return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
             <Field
                 type="text"

From df73f12320b50cc97f0e7a9535a422354dbce5c5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:33:23 +0100
Subject: [PATCH 2373/3235] Make a font slider

---
 res/css/_components.scss                |  1 +
 res/css/structures/_FontSlider.scss     | 88 +++++++++++++++++++++++++
 res/themes/light/css/_light.scss        |  4 ++
 src/components/structures/FontSlider.js | 62 +++++++++++++++++
 4 files changed, 155 insertions(+)
 create mode 100644 res/css/structures/_FontSlider.scss
 create mode 100644 src/components/structures/FontSlider.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0ba2b609e8..9d6629e703 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -7,6 +7,7 @@
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
+@import "./structures/_FontSlider.scss";
 @import "./structures/_GenericErrorPage.scss";
 @import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
diff --git a/res/css/structures/_FontSlider.scss b/res/css/structures/_FontSlider.scss
new file mode 100644
index 0000000000..94902f6fd9
--- /dev/null
+++ b/res/css/structures/_FontSlider.scss
@@ -0,0 +1,88 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_fontSlider {
+    position: relative;
+    margin: 0px;
+    @mixin mx_Settings_fullWidthField;
+}
+
+.mx_fontSlider_dotContainer {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.mx_fontSlider_bar {
+    display: flex;
+    box-sizing: border-box;
+    position: absolute;
+    height: 1rem;
+    width: 100%;
+    padding: 0 1.1rem;
+    align-items: center;
+}
+
+.mx_fontSlider_bar > hr {
+    width: 100%;
+    border: 0.2rem solid $fontSlider-background-color;
+}
+
+.mx_fontSlider_selection {
+    display: flex;
+    align-items: center;
+    width: calc(100% - 2.2rem);
+    height: 1rem;
+    position: absolute;
+}
+
+.mx_fontSlider_selectionDot {
+    transition: left 0.25s;
+    position: absolute;
+    width: 1.1rem;
+    height: 1.1rem;
+    background-color: $fontSlider-selection-color;
+    border-radius: 50%;
+    box-shadow: 0 0 6px lightgrey;
+    z-index: 10;
+}
+
+.mx_fontSlider_selection > hr {
+    transition: width 0.25s;
+    margin: 0;
+    border: 0.2rem solid $fontSlider-selection-color;
+}
+
+.mx_fontSlider_dot {
+    transition: background-color 0.2s ease-in;
+    height: 1rem;
+    width: 1rem;
+    border-radius: 50%;
+    background-color: $fontSlider-background-color;
+    margin-bottom: 5px;
+    z-index: 0;
+}
+
+.mx_fontSlider_dotActive {
+    background-color: $fontSlider-selection-color;
+}
+
+.mx_fontSlider_dotValue {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: $fontSlider-background-color;
+}
\ No newline at end of file
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index f5f3013354..b457a8bccb 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -262,6 +262,10 @@ $togglesw-off-color: #c1c9d6;
 $togglesw-on-color: $accent-color;
 $togglesw-ball-color: #fff;
 
+// FontSlider
+$fontSlider-selection-color: $accent-color;
+$fontSlider-background-color: #c1c9d6;
+
 $progressbar-color: #000;
 
 $room-warning-bg-color: $yellow-background;
diff --git a/src/components/structures/FontSlider.js b/src/components/structures/FontSlider.js
new file mode 100644
index 0000000000..e2e36c2c9f
--- /dev/null
+++ b/src/components/structures/FontSlider.js
@@ -0,0 +1,62 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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';
+
+export default class Slider extends React.Component {
+    render() {
+        let dots = this.props.values.map(v => 
+            <Dot active={v<=this.props.value} 
+                 value={this.props.displayFunc(v)} 
+                 onClick={() => this.props.updateFontSize(v)}
+                 key={v}
+            />);
+
+        let offset = this.offset(this.props.values, this.props.value);
+
+        return <div className="mx_fontSlider">
+            <div>
+                <div className="mx_fontSlider_bar">
+                    <hr />
+                    <div className="mx_fontSlider_selection">
+                        <div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%"}} />
+                        <hr style={{width: offset + "%"}}/>
+                    </div>
+                </div>
+                <div className="mx_fontSlider_dotContainer">
+                    {dots}
+                </div>
+            </div>
+        </div>
+    }
+        
+    offset(values, value) {
+        return  (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
+    }
+}
+
+class Dot extends React.Component {
+    render () {
+        let className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
+
+        return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
+            <div className={className} />
+            <div>
+                {this.props.value}
+            </div>
+        </span>
+    }
+}
\ No newline at end of file

From 8b72756b8d987bb7218867dcf690ead46c0dea14 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:33:44 +0100
Subject: [PATCH 2374/3235] Use the font slider

---
 .../views/settings/tabs/user/StyleUserSettingsTab.js      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
index e7b7385f5a..d77822ceb7 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -20,6 +20,7 @@ import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore
 import * as sdk from "../../../../../index";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
+import FontSlider from "../../../../structures/FontSlider";
 
 export default class StyleUserSettingsTab extends React.Component {
     constructor() {
@@ -219,11 +220,18 @@ export default class StyleUserSettingsTab extends React.Component {
     _renderFontSection() {
         return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
+            <FontSlider
+                values={[12,14,16,18,20]}
+                value={this.state.fontSize}
+                updateFontSize={this._onFontSizeChanged}
+                displayFunc={value => value + 'px'}
+            />
             <Field
                 type="text"
                 label={_t("Font size")}
                 autoComplete="off"
                 placeholder={SettingsStore.getValue("font_size", null).toString()}
+                value={this.state.fontSize}
                 id="font_size_field"
                 onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
             />

From 647d99a17a6ff66816caee01f0258138a7a15493 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:33:59 +0100
Subject: [PATCH 2375/3235] Smooth font-size change transition

---
 res/css/_common.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 03442ca510..687a238c8e 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -19,6 +19,7 @@ limitations under the License.
 @import "./_font-sizes.scss";
 
 :root {
+    transition: font-size 0.25s;
     font-size: 15px;
 }
 

From 66fd0f707fc290db64ba3a729c96ceedd402258d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 10:53:23 +0100
Subject: [PATCH 2376/3235] Type enforcement and comments

---
 src/components/structures/FontSlider.js | 35 ++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/FontSlider.js b/src/components/structures/FontSlider.js
index e2e36c2c9f..0ae0092443 100644
--- a/src/components/structures/FontSlider.js
+++ b/src/components/structures/FontSlider.js
@@ -15,12 +15,29 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 export default class Slider extends React.Component {
+
+    static propTypes = {
+        // A callback for the new value onclick
+        updateFontSize: PropTypes.func,
+
+        // The current value of the slider
+        value: PropTypes.number,
+
+        // The range and values of the slider
+        // Currently only supports an ascending, constant interval range
+        values: PropTypes.arrayOf(PropTypes.number),
+
+        // A function for formatting the the values
+        displayFunc: PropTypes.func,
+    };
+
     render() {
         let dots = this.props.values.map(v => 
             <Dot active={v<=this.props.value} 
-                 value={this.props.displayFunc(v)} 
+                 label={this.props.displayFunc(v)} 
                  onClick={() => this.props.updateFontSize(v)}
                  key={v}
             />);
@@ -42,20 +59,32 @@ export default class Slider extends React.Component {
             </div>
         </div>
     }
-        
+
     offset(values, value) {
         return  (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
     }
 }
 
 class Dot extends React.Component {
+
+    static propTypes = {
+        // Callback for behaviour onclick
+        onClick: PropTypes.func,
+
+        // Whether the dot should appear active
+        active: PropTypes.bool,
+
+        // The label on the dot
+        label: PropTypes.string,
+    }
+
     render () {
         let className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
 
         return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
             <div className={className} />
             <div>
-                {this.props.value}
+                {this.props.label}
             </div>
         </span>
     }

From f1130ecba11be12bbc1e1efbf2823106501727e6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 11:56:43 +0100
Subject: [PATCH 2377/3235] Linting. Finally set up my linter properly

---
 src/components/structures/FontSlider.js       | 28 +++++++++----------
 .../tabs/user/StyleUserSettingsTab.js         | 16 ++++++-----
 src/fontSize.js                               | 10 +++----
 .../controllers/FontSizeController.js         |  3 +-
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/components/structures/FontSlider.js b/src/components/structures/FontSlider.js
index 0ae0092443..68173345ff 100644
--- a/src/components/structures/FontSlider.js
+++ b/src/components/structures/FontSlider.js
@@ -18,8 +18,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 export default class Slider extends React.Component {
-
     static propTypes = {
+
         // A callback for the new value onclick
         updateFontSize: PropTypes.func,
 
@@ -32,41 +32,41 @@ export default class Slider extends React.Component {
 
         // A function for formatting the the values
         displayFunc: PropTypes.func,
+
     };
 
     render() {
-        let dots = this.props.values.map(v => 
-            <Dot active={v<=this.props.value} 
-                 label={this.props.displayFunc(v)} 
+        const dots = this.props.values.map(v =>
+            <Dot active={v<=this.props.value}
+                 label={this.props.displayFunc(v)}
                  onClick={() => this.props.updateFontSize(v)}
                  key={v}
             />);
 
-        let offset = this.offset(this.props.values, this.props.value);
+        const offset = this.offset(this.props.values, this.props.value);
 
         return <div className="mx_fontSlider">
             <div>
                 <div className="mx_fontSlider_bar">
                     <hr />
                     <div className="mx_fontSlider_selection">
-                        <div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%"}} />
-                        <hr style={{width: offset + "%"}}/>
+                        <div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
+                        <hr style={{width: offset + "%"}} />
                     </div>
                 </div>
                 <div className="mx_fontSlider_dotContainer">
                     {dots}
                 </div>
             </div>
-        </div>
+        </div>;
     }
 
     offset(values, value) {
-        return  (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
+        return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
     }
 }
 
 class Dot extends React.Component {
-
     static propTypes = {
         // Callback for behaviour onclick
         onClick: PropTypes.func,
@@ -78,14 +78,14 @@ class Dot extends React.Component {
         label: PropTypes.string,
     }
 
-    render () {
-        let className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
+    render() {
+        const className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
 
         return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
             <div className={className} />
             <div>
                 {this.props.label}
             </div>
-        </span>
+        </span>;
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
index d77822ceb7..9cca0a2ce9 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
@@ -21,6 +21,8 @@ import * as sdk from "../../../../../index";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
 import FontSlider from "../../../../structures/FontSlider";
+import AccessibleButton from "../../../elements/AccessibleButton";
+import dis from "../../../../../dispatcher";
 
 export default class StyleUserSettingsTab extends React.Component {
     constructor() {
@@ -31,7 +33,8 @@ export default class StyleUserSettingsTab extends React.Component {
             ...this._calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
-        }
+
+        };
     }
 
     _calculateThemeState() {
@@ -95,9 +98,9 @@ export default class StyleUserSettingsTab extends React.Component {
     };
 
     _onFontSizeChanged = (size) => {
-        let parsed_size = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
-        this.setState({fontSize: parsed_size})
-        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsed_size)
+        const parsedSize = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
+        this.setState({fontSize: parsedSize});
+        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsedSize);
     };
 
     _onAddCustomTheme = async () => {
@@ -221,7 +224,7 @@ export default class StyleUserSettingsTab extends React.Component {
         return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
             <FontSlider
-                values={[12,14,16,18,20]}
+                values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
                 updateFontSize={this._onFontSizeChanged}
                 displayFunc={value => value + 'px'}
@@ -235,7 +238,6 @@ export default class StyleUserSettingsTab extends React.Component {
                 id="font_size_field"
                 onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
             />
-        </div>
+        </div>;
     }
-
 }
diff --git a/src/fontSize.js b/src/fontSize.js
index c242fcc743..8dbdb29102 100644
--- a/src/fontSize.js
+++ b/src/fontSize.js
@@ -18,9 +18,9 @@ import dis from './dispatcher';
 import SettingsStore from './settings/SettingsStore';
 
 export class FontWatcher {
-    constructor(min_size, max_size) {
-        this._min_size = min_size;
-        this._max_size = max_size;
+    constructor(minSize, maxSize) {
+        this._min_size = minSize;
+        this._max_size = maxSize;
         this._dispatcherRef = null;
     }
 
@@ -43,8 +43,8 @@ export class FontWatcher {
         let fontSize = this._min_size < size?size:this._min_size;
         fontSize = fontSize < this._max_size?fontSize:this._max_size;
         if (fontSize != size) {
-            SettingsStore.setValue("font_size", null, fontSize)
+            SettingsStore.setValue("font_size", null, fontSize);
         }
         document.querySelector(":root").style.fontSize = fontSize + "px";
     }
-}
\ No newline at end of file
+}
diff --git a/src/settings/controllers/FontSizeController.js b/src/settings/controllers/FontSizeController.js
index 4ab2f331f1..8e855e31ec 100644
--- a/src/settings/controllers/FontSizeController.js
+++ b/src/settings/controllers/FontSizeController.js
@@ -18,9 +18,8 @@ import SettingController from "./SettingController";
 import dis from "../../dispatcher";
 
 export default class FontSizeController extends SettingController {
-
     constructor() {
-        super()
+        super();
     }
 
     onChange(level, roomId, newValue) {

From af3858fa98ccc5ff93e2e63b372b095626126390 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 12:09:36 +0100
Subject: [PATCH 2378/3235] Style linting

---
 res/css/structures/_FontSlider.scss                         | 3 ++-
 res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_FontSlider.scss b/res/css/structures/_FontSlider.scss
index 94902f6fd9..fc83bd91bc 100644
--- a/res/css/structures/_FontSlider.scss
+++ b/res/css/structures/_FontSlider.scss
@@ -17,6 +17,7 @@ limitations under the License.
 .mx_fontSlider {
     position: relative;
     margin: 0px;
+
     @mixin mx_Settings_fullWidthField;
 }
 
@@ -85,4 +86,4 @@ limitations under the License.
     flex-direction: column;
     align-items: center;
     color: $fontSlider-background-color;
-}
\ No newline at end of file
+}
diff --git a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
index dd9646bd5a..f2a98ac426 100644
--- a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
@@ -17,4 +17,4 @@ limitations under the License.
 .mx_StyleUserSettingsTab_themeSection .mx_Field,
 .mx_StyleUserSettingsTab_fontScaling .mx_Field {
     @mixin mx_Settings_fullWidthField;
-}
\ No newline at end of file
+}

From 7c9df04d427d419c8df747eaef69e11e988e27a6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:26:04 +0100
Subject: [PATCH 2379/3235] Use "Appearance" instead of "Style"

---
 src/components/views/dialogs/UserSettingsDialog.js          | 6 +++---
 ...StyleUserSettingsTab.js => AppearanceUserSettingsTab.js} | 2 +-
 src/i18n/strings/en_EN.json                                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/components/views/settings/tabs/user/{StyleUserSettingsTab.js => AppearanceUserSettingsTab.js} (99%)

diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index ee6f7e13ec..91ab203753 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -22,7 +22,7 @@ import {_t, _td} from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
 import SettingsStore from "../../../settings/SettingsStore";
 import LabsUserSettingsTab from "../settings/tabs/user/LabsUserSettingsTab";
-import StyleUserSettingsTab from "../settings/tabs/user/StyleUserSettingsTab";
+import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
 import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
 import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab";
 import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
@@ -68,9 +68,9 @@ export default class UserSettingsDialog extends React.Component {
             <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         tabs.push(new Tab(
-            _td("Style"),
+            _td("Appearance"),
             "mx_userSettingsDialog_styleIcon",
-            <StyleUserSettingsTab />,
+            <AppearanceUserSettingsTab />,
         ));
         tabs.push(new Tab(
             _td("Flair"),
diff --git a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
similarity index 99%
rename from src/components/views/settings/tabs/user/StyleUserSettingsTab.js
rename to src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 9cca0a2ce9..d09f4b3e6a 100644
--- a/src/components/views/settings/tabs/user/StyleUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -141,7 +141,7 @@ export default class StyleUserSettingsTab extends React.Component {
     render() {
         return (
             <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Style")}</div>
+                <div className="mx_SettingsTab_heading">{_t("Appearance")}</div>
                 {this._renderThemeSection()}
                 {SettingsStore.getValue("feature_font_scaling") ? this._renderFontSection() : null}
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bf2eaa4652..56798ff932 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2296,5 +2296,5 @@
     "End": "End",
     "Font size": "Font size",
     "Font scaling": "Font scaling",
-    "Style": "Style"
+    "Appearance": "Appearance"
 }

From b1452b5aa3bdd971aa2fa24c3bbd672ecd5d5255 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:47:29 +0100
Subject: [PATCH 2380/3235] Lint lint lint

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 23b73f740b..dd0103aa78 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -99,7 +99,7 @@ export const SETTINGS = {
         isFeature: true,
         displayName: _td("Font scaling"),
         supportedLevels: LEVELS_FEATURE,
-        default: false
+        default: false,
     },
     "font_size": {
         displayName: _td("Font size"),

From e455473d8fe1fba82c7c00603d746f8930b013e2 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:54:11 +0100
Subject: [PATCH 2381/3235] i18n happy

---
 src/i18n/strings/en_EN.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 56798ff932..cff2b8cda4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -395,6 +395,8 @@
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
     "Failed to join room": "Failed to join room",
+    "Font scaling": "Font scaling",
+    "Font size": "Font size",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
@@ -742,22 +744,23 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
     "Manage integrations": "Manage integrations",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+    "Invalid theme schema.": "Invalid theme schema.",
+    "Error downloading theme information.": "Error downloading theme information.",
+    "Theme added!": "Theme added!",
+    "Appearance": "Appearance",
+    "Custom theme URL": "Custom theme URL",
+    "Add theme": "Add theme",
+    "Theme": "Theme",
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
-    "Invalid theme schema.": "Invalid theme schema.",
-    "Error downloading theme information.": "Error downloading theme information.",
-    "Theme added!": "Theme added!",
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
-    "Custom theme URL": "Custom theme URL",
-    "Add theme": "Add theme",
-    "Theme": "Theme",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",
     "Account management": "Account management",
     "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
@@ -2293,8 +2296,5 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End",
-    "Font size": "Font size",
-    "Font scaling": "Font scaling",
-    "Appearance": "Appearance"
+    "End": "End"
 }

From 787e408016e53a3293d1df336e0e2a5fc1ac50c5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 10:08:40 +0100
Subject: [PATCH 2382/3235] Explain origin of magic number

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 res/css/structures/_TagPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 4a78c8df92..536c88be63 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -116,7 +116,7 @@ limitations under the License.
     position: absolute;
     left: -15px;
     border-radius: 0 3px 3px 0;
-    top: -8px; // (16px / 2)
+    top: -8px; // (16px from height / 2)
 }
 
 .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {

From 4d0cac1260af9dd9f4cdd930de47a202f0bee65b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 10:15:37 +0100
Subject: [PATCH 2383/3235] Render should be last method declared

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

diff --git a/src/components/structures/FontSlider.js b/src/components/structures/FontSlider.js
index 68173345ff..aa4bfe42f5 100644
--- a/src/components/structures/FontSlider.js
+++ b/src/components/structures/FontSlider.js
@@ -35,6 +35,10 @@ export default class Slider extends React.Component {
 
     };
 
+    _offset(values, value) {
+        return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
+    }
+
     render() {
         const dots = this.props.values.map(v =>
             <Dot active={v<=this.props.value}
@@ -43,7 +47,7 @@ export default class Slider extends React.Component {
                  key={v}
             />);
 
-        const offset = this.offset(this.props.values, this.props.value);
+        const offset = this._offset(this.props.values, this.props.value);
 
         return <div className="mx_fontSlider">
             <div>
@@ -60,10 +64,6 @@ export default class Slider extends React.Component {
             </div>
         </div>;
     }
-
-    offset(values, value) {
-        return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
-    }
 }
 
 class Dot extends React.Component {

From db1141b162e441ddf324c4e708f7c7c3c55297d9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 10:46:33 +0100
Subject: [PATCH 2384/3235] Move to typescript

---
 .../{FontSlider.js => FontSlider.tsx}         | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)
 rename src/components/structures/{FontSlider.js => FontSlider.tsx} (73%)

diff --git a/src/components/structures/FontSlider.js b/src/components/structures/FontSlider.tsx
similarity index 73%
rename from src/components/structures/FontSlider.js
rename to src/components/structures/FontSlider.tsx
index aa4bfe42f5..9048e7b37b 100644
--- a/src/components/structures/FontSlider.js
+++ b/src/components/structures/FontSlider.tsx
@@ -14,10 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import * as React from 'react';
+import * as PropTypes from 'prop-types';
 
-export default class Slider extends React.Component {
+type SliderProps = {
+        // A callback for the new value onclick
+        updateFontSize: (size: number) => null;
+
+        // The current value of the slider
+        value: number;
+
+        // The range and values of the slider
+        // Currently only supports an ascending, constant interval range
+        values: number[];
+
+        // A function for formatting the the values
+        displayFunc: (value: number) => string;
+
+}
+
+export default class Slider extends React.Component<SliderProps> {
     static propTypes = {
 
         // A callback for the new value onclick
@@ -35,11 +51,11 @@ export default class Slider extends React.Component {
 
     };
 
-    _offset(values, value) {
+    _offset(values: number[], value: number): number {
         return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
     }
 
-    render() {
+    render(): React.ReactNode {
         const dots = this.props.values.map(v =>
             <Dot active={v<=this.props.value}
                  label={this.props.displayFunc(v)}
@@ -66,7 +82,18 @@ export default class Slider extends React.Component {
     }
 }
 
-class Dot extends React.Component {
+type DotProps = {
+    // Callback for behaviour onclick
+    onClick: () => null,
+
+    // Whether the dot should appear active
+    active: boolean,
+
+    // The label on the dot
+    label: string,
+}
+
+class Dot extends React.Component<DotProps> {
     static propTypes = {
         // Callback for behaviour onclick
         onClick: PropTypes.func,
@@ -78,7 +105,7 @@ class Dot extends React.Component {
         label: PropTypes.string,
     }
 
-    render() {
+    render(): React.ReactNode {
         const className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
 
         return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">

From dd841fcde92f097a0cc056fa8f856d65c938620e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:01:52 +0100
Subject: [PATCH 2385/3235] Remove references to font

---
 res/css/structures/_FontSlider.scss      | 20 ++++++++++----------
 src/components/structures/FontSlider.tsx | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/res/css/structures/_FontSlider.scss b/res/css/structures/_FontSlider.scss
index fc83bd91bc..2112ac9a88 100644
--- a/res/css/structures/_FontSlider.scss
+++ b/res/css/structures/_FontSlider.scss
@@ -14,20 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_fontSlider {
+.mx_Slider {
     position: relative;
     margin: 0px;
 
     @mixin mx_Settings_fullWidthField;
 }
 
-.mx_fontSlider_dotContainer {
+.mx_Slider_dotContainer {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
 }
 
-.mx_fontSlider_bar {
+.mx_Slider_bar {
     display: flex;
     box-sizing: border-box;
     position: absolute;
@@ -37,12 +37,12 @@ limitations under the License.
     align-items: center;
 }
 
-.mx_fontSlider_bar > hr {
+.mx_Slider_bar > hr {
     width: 100%;
     border: 0.2rem solid $fontSlider-background-color;
 }
 
-.mx_fontSlider_selection {
+.mx_Slider_selection {
     display: flex;
     align-items: center;
     width: calc(100% - 2.2rem);
@@ -50,7 +50,7 @@ limitations under the License.
     position: absolute;
 }
 
-.mx_fontSlider_selectionDot {
+.mx_Slider_selectionDot {
     transition: left 0.25s;
     position: absolute;
     width: 1.1rem;
@@ -61,13 +61,13 @@ limitations under the License.
     z-index: 10;
 }
 
-.mx_fontSlider_selection > hr {
+.mx_Slider_selection > hr {
     transition: width 0.25s;
     margin: 0;
     border: 0.2rem solid $fontSlider-selection-color;
 }
 
-.mx_fontSlider_dot {
+.mx_Slider_dot {
     transition: background-color 0.2s ease-in;
     height: 1rem;
     width: 1rem;
@@ -77,11 +77,11 @@ limitations under the License.
     z-index: 0;
 }
 
-.mx_fontSlider_dotActive {
+.mx_Slider_dotActive {
     background-color: $fontSlider-selection-color;
 }
 
-.mx_fontSlider_dotValue {
+.mx_Slider_dotValue {
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/src/components/structures/FontSlider.tsx b/src/components/structures/FontSlider.tsx
index 9048e7b37b..7985fa206a 100644
--- a/src/components/structures/FontSlider.tsx
+++ b/src/components/structures/FontSlider.tsx
@@ -18,8 +18,8 @@ import * as React from 'react';
 import * as PropTypes from 'prop-types';
 
 type SliderProps = {
-        // A callback for the new value onclick
-        updateFontSize: (size: number) => null;
+        // A callback for the selected value
+        onSelectionChange: (value: number) => null;
 
         // The current value of the slider
         value: number;
@@ -37,7 +37,7 @@ export default class Slider extends React.Component<SliderProps> {
     static propTypes = {
 
         // A callback for the new value onclick
-        updateFontSize: PropTypes.func,
+        onSelectionChange: PropTypes.func,
 
         // The current value of the slider
         value: PropTypes.number,
@@ -59,22 +59,22 @@ export default class Slider extends React.Component<SliderProps> {
         const dots = this.props.values.map(v =>
             <Dot active={v<=this.props.value}
                  label={this.props.displayFunc(v)}
-                 onClick={() => this.props.updateFontSize(v)}
+                 onClick={() => this.props.onSelectionChange(v)}
                  key={v}
             />);
 
         const offset = this._offset(this.props.values, this.props.value);
 
-        return <div className="mx_fontSlider">
+        return <div className="mx_Slider">
             <div>
-                <div className="mx_fontSlider_bar">
+                <div className="mx_Slider_bar">
                     <hr />
-                    <div className="mx_fontSlider_selection">
-                        <div className="mx_fontSlider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
+                    <div className="mx_Slider_selection">
+                        <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
                         <hr style={{width: offset + "%"}} />
                     </div>
                 </div>
-                <div className="mx_fontSlider_dotContainer">
+                <div className="mx_Slider_dotContainer">
                     {dots}
                 </div>
             </div>
@@ -106,9 +106,9 @@ class Dot extends React.Component<DotProps> {
     }
 
     render(): React.ReactNode {
-        const className = "mx_fontSlider_dot" + (this.props.active? " mx_fontSlider_dotActive": "");
+        const className = "mx_Slider_dot" + (this.props.active? " mx_Slider_dotActive": "");
 
-        return <span onClick={this.props.onClick} className="mx_fontSlider_dotValue">
+        return <span onClick={this.props.onClick} className="mx_Slider_dotValue">
             <div className={className} />
             <div>
                 {this.props.label}

From abd94a65bd4f5a8e60478fc52d3475318b63b562 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:29:37 +0100
Subject: [PATCH 2386/3235] Move compoenets/FontSlider to views/Slider

---
 res/css/_components.scss                             |  2 +-
 .../structures/{_FontSlider.scss => _Slider.scss}    | 12 ++++++------
 res/themes/light/css/_light.scss                     |  6 +++---
 .../FontSlider.tsx => views/elements/Slider.tsx}     |  2 ++
 .../settings/tabs/user/AppearanceUserSettingsTab.js  |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)
 rename res/css/structures/{_FontSlider.scss => _Slider.scss} (84%)
 rename src/components/{structures/FontSlider.tsx => views/elements/Slider.tsx} (96%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 9d6629e703..ab602be49e 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -7,7 +7,7 @@
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
-@import "./structures/_FontSlider.scss";
+@import "./structures/_Slider.scss";
 @import "./structures/_GenericErrorPage.scss";
 @import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
diff --git a/res/css/structures/_FontSlider.scss b/res/css/structures/_Slider.scss
similarity index 84%
rename from res/css/structures/_FontSlider.scss
rename to res/css/structures/_Slider.scss
index 2112ac9a88..51f1688f6b 100644
--- a/res/css/structures/_FontSlider.scss
+++ b/res/css/structures/_Slider.scss
@@ -39,7 +39,7 @@ limitations under the License.
 
 .mx_Slider_bar > hr {
     width: 100%;
-    border: 0.2rem solid $fontSlider-background-color;
+    border: 0.2rem solid $Slider-background-color;
 }
 
 .mx_Slider_selection {
@@ -55,7 +55,7 @@ limitations under the License.
     position: absolute;
     width: 1.1rem;
     height: 1.1rem;
-    background-color: $fontSlider-selection-color;
+    background-color: $Slider-selection-color;
     border-radius: 50%;
     box-shadow: 0 0 6px lightgrey;
     z-index: 10;
@@ -64,7 +64,7 @@ limitations under the License.
 .mx_Slider_selection > hr {
     transition: width 0.25s;
     margin: 0;
-    border: 0.2rem solid $fontSlider-selection-color;
+    border: 0.2rem solid $Slider-selection-color;
 }
 
 .mx_Slider_dot {
@@ -72,18 +72,18 @@ limitations under the License.
     height: 1rem;
     width: 1rem;
     border-radius: 50%;
-    background-color: $fontSlider-background-color;
+    background-color: $Slider-background-color;
     margin-bottom: 5px;
     z-index: 0;
 }
 
 .mx_Slider_dotActive {
-    background-color: $fontSlider-selection-color;
+    background-color: $Slider-selection-color;
 }
 
 .mx_Slider_dotValue {
     display: flex;
     flex-direction: column;
     align-items: center;
-    color: $fontSlider-background-color;
+    color: $Slider-background-color;
 }
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index b457a8bccb..e06ba33594 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -262,9 +262,9 @@ $togglesw-off-color: #c1c9d6;
 $togglesw-on-color: $accent-color;
 $togglesw-ball-color: #fff;
 
-// FontSlider
-$fontSlider-selection-color: $accent-color;
-$fontSlider-background-color: #c1c9d6;
+// Slider
+$Slider-selection-color: $accent-color;
+$Slider-background-color: #c1c9d6;
 
 $progressbar-color: #000;
 
diff --git a/src/components/structures/FontSlider.tsx b/src/components/views/elements/Slider.tsx
similarity index 96%
rename from src/components/structures/FontSlider.tsx
rename to src/components/views/elements/Slider.tsx
index 7985fa206a..2070f3f167 100644
--- a/src/components/structures/FontSlider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
 
 type SliderProps = {
         // A callback for the selected value
@@ -93,6 +94,7 @@ type DotProps = {
     label: string,
 }
 
+@replaceableComponent("views.elements.Dot")
 class Dot extends React.Component<DotProps> {
     static propTypes = {
         // Callback for behaviour onclick
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index d09f4b3e6a..9e9f134613 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -20,7 +20,7 @@ import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore
 import * as sdk from "../../../../../index";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
-import FontSlider from "../../../../structures/FontSlider";
+import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 
@@ -223,7 +223,7 @@ export default class StyleUserSettingsTab extends React.Component {
     _renderFontSection() {
         return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
-            <FontSlider
+            <Slider
                 values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
                 updateFontSize={this._onFontSizeChanged}

From e254675287300f1ccc1fc5e7faadc4264e81bc68 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:34:15 +0100
Subject: [PATCH 2387/3235] Retain copyright

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 9e9f134613..7843ccbe10 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 82974bd98c01fc673a8fb928f7890c7acd16641b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:37:22 +0100
Subject: [PATCH 2388/3235] Space out ternaries

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 7843ccbe10..8d1fd348d3 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -99,7 +99,7 @@ export default class StyleUserSettingsTab extends React.Component {
     };
 
     _onFontSizeChanged = (size) => {
-        const parsedSize = isNaN(parseInt(size))?SettingsStore.getDefaultValue("font_size"):parseFloat(size);
+        const parsedSize = isNaN(parseInt(size)) ? SettingsStore.getDefaultValue("font_size") : parseFloat(size);
         this.setState({fontSize: parsedSize});
         SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsedSize);
     };

From 4525f71b1ce7925379fd9a67fab7b59f52d055b5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:40:18 +0100
Subject: [PATCH 2389/3235] Missed an import

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 8d1fd348d3..42c8e6d854 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -21,7 +21,7 @@ import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore
 import * as sdk from "../../../../../index";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
-import Slider from "../../../elements/Slider";
+import FontSlider from "../../../../structures/FontSlider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 
@@ -224,7 +224,7 @@ export default class StyleUserSettingsTab extends React.Component {
     _renderFontSection() {
         return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
-            <Slider
+            <FontSlider
                 values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
                 updateFontSize={this._onFontSizeChanged}

From 02e0ff9e5b526a9d1f6dd9dc4c51c6f17db96ad5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:41:41 +0100
Subject: [PATCH 2390/3235] Move setting away from 'feature' settings for
 clarity

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index dd0103aa78..a044027baf 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -101,12 +101,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "font_size": {
-        displayName: _td("Font size"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 16,
-        controller: new FontSizeController(),
-    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),
@@ -177,6 +171,12 @@ export const SETTINGS = {
         displayName: _td("Show padlocks on invite only rooms"),
         default: true,
     },
+    "font_size": {
+        displayName: _td("Font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: 16,
+        controller: new FontSizeController(),
+    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From 4397658bb32654b3a0427d4c1b761c43109e5825 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 11:56:12 +0100
Subject: [PATCH 2391/3235] Update file name in comments

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme.js b/src/theme.js
index 3309acdd01..aee55b5abb 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -81,7 +81,7 @@ export class ThemeWatcher {
     }
 
     getEffectiveTheme() {
-        // Dev note: Much of this logic is replicated in the StyleUserSettingsTab
+        // Dev note: Much of this logic is replicated in the AppearanceUserSettingsTab
 
         // XXX: checking the isLight flag here makes checking it in the ThemeController
         // itself completely redundant since we just override the result here and we're

From 315a272cb4aa1026f42723e7b1877f12e4ecffbc Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 12:03:32 +0100
Subject: [PATCH 2392/3235] File rename

---
 ...rSettingsTab.scss => _AppearanceUserSettingsTab.scss} | 4 ++--
 .../settings/tabs/user/AppearanceUserSettingsTab.js      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename res/css/views/settings/tabs/user/{_StyleUserSettingsTab.scss => _AppearanceUserSettingsTab.scss} (85%)

diff --git a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
similarity index 85%
rename from res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
rename to res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index f2a98ac426..8c80a35e40 100644
--- a/res/css/views/settings/tabs/user/_StyleUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_StyleUserSettingsTab_themeSection .mx_Field,
-.mx_StyleUserSettingsTab_fontScaling .mx_Field {
+.mx_AppearanceUserSettingsTab_themeSection .mx_Field,
+.mx_AppearanceUserSettingsTab_fontScaling .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 42c8e6d854..738a5f9178 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -2,6 +2,7 @@
 Copyright 2019 New Vector Ltd
 Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
+
 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
@@ -21,7 +22,7 @@ import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore
 import * as sdk from "../../../../../index";
 import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
-import FontSlider from "../../../../structures/FontSlider";
+import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 
@@ -204,7 +205,7 @@ export default class StyleUserSettingsTab extends React.Component {
             .sort((a, b) => a.name.localeCompare(b.name));
         const orderedThemes = [...builtInThemes, ...customThemes];
         return (
-            <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_themeSection">
+            <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 {systemThemeSection}
                 <Field id="theme" label={_t("Theme")} element="select"
@@ -222,9 +223,9 @@ export default class StyleUserSettingsTab extends React.Component {
     }
 
     _renderFontSection() {
-        return <div className="mx_SettingsTab_section mx_StyleUserSettingsTab_fontScaling">
+        return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
-            <FontSlider
+            <Slider
                 values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
                 updateFontSize={this._onFontSizeChanged}

From 9a585fee0a1611cffb5a4b93d3f0dd7fa81c5bd9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 12:06:10 +0100
Subject: [PATCH 2393/3235] Move slider themes

---
 res/css/_components.scss                            | 3 ++-
 res/css/{structures => views/elements}/_Slider.scss | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename res/css/{structures => views/elements}/_Slider.scss (100%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index ab602be49e..77a9b9f8cf 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -7,7 +7,6 @@
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
-@import "./structures/_Slider.scss";
 @import "./structures/_GenericErrorPage.scss";
 @import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
@@ -114,6 +113,7 @@
 @import "./views/elements/_RichText.scss";
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_RoomAliasField.scss";
+@import "./views/elements/_Slider.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
 @import "./views/elements/_TextWithTooltip.scss";
@@ -202,6 +202,7 @@
 @import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
 @import "./views/settings/tabs/room/_RolesRoomSettingsTab.scss";
 @import "./views/settings/tabs/room/_SecurityRoomSettingsTab.scss";
+@import "./views/settings/tabs/user/_AppearanceUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_GeneralUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_HelpUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_MjolnirUserSettingsTab.scss";
diff --git a/res/css/structures/_Slider.scss b/res/css/views/elements/_Slider.scss
similarity index 100%
rename from res/css/structures/_Slider.scss
rename to res/css/views/elements/_Slider.scss

From dcea1f32b38c1856f05790a2eddcb014a498a486 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 16:18:25 +0100
Subject: [PATCH 2394/3235] tslint

---
 src/components/views/elements/Slider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 2070f3f167..f6ab121056 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -58,7 +58,7 @@ export default class Slider extends React.Component<SliderProps> {
 
     render(): React.ReactNode {
         const dots = this.props.values.map(v =>
-            <Dot active={v<=this.props.value}
+            <Dot active={v <= this.props.value}
                  label={this.props.displayFunc(v)}
                  onClick={() => this.props.onSelectionChange(v)}
                  key={v}
@@ -108,7 +108,7 @@ class Dot extends React.Component<DotProps> {
     }
 
     render(): React.ReactNode {
-        const className = "mx_Slider_dot" + (this.props.active? " mx_Slider_dotActive": "");
+        const className = "mx_Slider_dot" + (this.props.active ? " mx_Slider_dotActive" : "");
 
         return <span onClick={this.props.onClick} className="mx_Slider_dotValue">
             <div className={className} />

From 715bcb3c96e343b6c2a83d0ba21c16d2257e5be8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 16:28:41 +0100
Subject: [PATCH 2395/3235] i18n match file moves

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cff2b8cda4..a3051cbb91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -396,7 +396,6 @@
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
     "Failed to join room": "Failed to join room",
     "Font scaling": "Font scaling",
-    "Font size": "Font size",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
@@ -407,6 +406,7 @@
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
+    "Font size": "Font size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",

From 0d0da6cfdc8d822cdcd8e6c14615aabc41724abf Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:19:17 +0100
Subject: [PATCH 2396/3235] Fix types, abandon propTypes

---
 src/components/views/elements/Slider.tsx | 45 ++++--------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index f6ab121056..13f06a4759 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -15,12 +15,10 @@ limitations under the License.
 */
 
 import * as React from 'react';
-import * as PropTypes from 'prop-types';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
 
-type SliderProps = {
+type IProps = {
         // A callback for the selected value
-        onSelectionChange: (value: number) => null;
+        onSelectionChange: (value: number) => void;
 
         // The current value of the slider
         value: number;
@@ -34,24 +32,7 @@ type SliderProps = {
 
 }
 
-export default class Slider extends React.Component<SliderProps> {
-    static propTypes = {
-
-        // A callback for the new value onclick
-        onSelectionChange: PropTypes.func,
-
-        // The current value of the slider
-        value: PropTypes.number,
-
-        // The range and values of the slider
-        // Currently only supports an ascending, constant interval range
-        values: PropTypes.arrayOf(PropTypes.number),
-
-        // A function for formatting the the values
-        displayFunc: PropTypes.func,
-
-    };
-
+export default class Slider extends React.Component<IProps> {
     _offset(values: number[], value: number): number {
         return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
     }
@@ -83,9 +64,9 @@ export default class Slider extends React.Component<SliderProps> {
     }
 }
 
-type DotProps = {
-    // Callback for behaviour onclick
-    onClick: () => null,
+type DotIProps = {
+    // Callback for behavior onclick
+    onClick: () => void,
 
     // Whether the dot should appear active
     active: boolean,
@@ -94,19 +75,7 @@ type DotProps = {
     label: string,
 }
 
-@replaceableComponent("views.elements.Dot")
-class Dot extends React.Component<DotProps> {
-    static propTypes = {
-        // Callback for behaviour onclick
-        onClick: PropTypes.func,
-
-        // Whether the dot should appear active
-        active: PropTypes.bool,
-
-        // The label on the dot
-        label: PropTypes.string,
-    }
-
+class Dot extends React.Component<DotIProps> {
     render(): React.ReactNode {
         const className = "mx_Slider_dot" + (this.props.active ? " mx_Slider_dotActive" : "");
 

From ba362b727c5bdf7b6a76e8fdb3b5cdf1c3afdbc0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:19:37 +0100
Subject: [PATCH 2397/3235] Use onSelectionChange prop

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 738a5f9178..5bb6dcc0e0 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -228,7 +228,7 @@ export default class StyleUserSettingsTab extends React.Component {
             <Slider
                 values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
-                updateFontSize={this._onFontSizeChanged}
+                onSelectionChange={this._onFontSizeChanged}
                 displayFunc={value => value + 'px'}
             />
             <Field

From c99e1de803d5813b8d1d4e6c7d4a90e493fa43e6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:24:29 +0100
Subject: [PATCH 2398/3235] Clamp indicated value within value range

---
 src/components/views/elements/Slider.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 13f06a4759..9f9e1fdef8 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -34,6 +34,17 @@ type IProps = {
 
 export default class Slider extends React.Component<IProps> {
     _offset(values: number[], value: number): number {
+        const lowest = values[0];
+        const highest = values[values.length - 1];
+
+        if (value < lowest) {
+            return 0;
+        }
+
+        if (value > highest) {
+            return 100;
+        }
+
         return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
     }
 

From 54a65441a54da04f6c4834fe089ac932778d0952 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:29:48 +0100
Subject: [PATCH 2399/3235] Lint ternary statement

---
 src/fontSize.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fontSize.js b/src/fontSize.js
index 8dbdb29102..d6b5b020f7 100644
--- a/src/fontSize.js
+++ b/src/fontSize.js
@@ -40,8 +40,8 @@ export class FontWatcher {
     };
 
     _setRootFontSize = size => {
-        let fontSize = this._min_size < size?size:this._min_size;
-        fontSize = fontSize < this._max_size?fontSize:this._max_size;
+        let fontSize = this._min_size < size ? size : this._min_size;
+        fontSize = fontSize < this._max_size ? fontSize : this._max_size;
         if (fontSize != size) {
             SettingsStore.setValue("font_size", null, fontSize);
         }

From 8d5965c33c5af0350da208ac8cfe8706dae049ce Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:32:00 +0100
Subject: [PATCH 2400/3235] Fix incorrect call to setValue

---
 src/fontSize.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fontSize.js b/src/fontSize.js
index d6b5b020f7..30c69b7428 100644
--- a/src/fontSize.js
+++ b/src/fontSize.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import dis from './dispatcher';
-import SettingsStore from './settings/SettingsStore';
+import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
     constructor(minSize, maxSize) {
@@ -43,7 +43,7 @@ export class FontWatcher {
         let fontSize = this._min_size < size ? size : this._min_size;
         fontSize = fontSize < this._max_size ? fontSize : this._max_size;
         if (fontSize != size) {
-            SettingsStore.setValue("font_size", null, fontSize);
+            SettingsStore.setValue("font_size", null, SettingLevel.Device, fontSize);
         }
         document.querySelector(":root").style.fontSize = fontSize + "px";
     }

From 26ccd6f07dcb598a04643e82412f6f801e8c65e9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 10:42:31 +0100
Subject: [PATCH 2401/3235] Cleaner clamping of value range

---
 src/components/views/elements/Slider.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 9f9e1fdef8..7862373c1c 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -34,18 +34,13 @@ type IProps = {
 
 export default class Slider extends React.Component<IProps> {
     _offset(values: number[], value: number): number {
-        const lowest = values[0];
-        const highest = values[values.length - 1];
+        const min = values[0];
+        const max = values[values.length - 1];
 
-        if (value < lowest) {
-            return 0;
-        }
+        // Clamp value between min and max
+        value = Math.min(Math.max(value, min), max);
 
-        if (value > highest) {
-            return 100;
-        }
-
-        return (value - values[0]) / (values[values.length - 1] - values[0]) * 100;
+        return (value - min) / (max - min) * 100;
     }
 
     render(): React.ReactNode {

From 5f50facfba28291514b258de1d26b4e691d5692a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 11:36:23 +0100
Subject: [PATCH 2402/3235] Make slider independant of label size

---
 res/css/views/elements/_Slider.scss      | 16 ++++++++++++++--
 src/components/views/elements/Slider.tsx |  4 +++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 51f1688f6b..7e9acefa06 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -33,7 +33,7 @@ limitations under the License.
     position: absolute;
     height: 1rem;
     width: 100%;
-    padding: 0 1.1rem;
+    padding: 0 0.5rem; // half the width of a dot.
     align-items: center;
 }
 
@@ -45,7 +45,7 @@ limitations under the License.
 .mx_Slider_selection {
     display: flex;
     align-items: center;
-    width: calc(100% - 2.2rem);
+    width: calc(100% - 1rem); // 2 * half the width of a dot
     height: 1rem;
     position: absolute;
 }
@@ -87,3 +87,15 @@ limitations under the License.
     align-items: center;
     color: $Slider-background-color;
 }
+
+// The following is a hack to center the labels without adding
+// any width to the slider's dots.
+.mx_Slider_labelContainer {
+    width: 1rem;
+}
+
+.mx_Slider_label {
+    position: relative;
+    width: fit-content;
+    left: -50%;
+}
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 7862373c1c..e341eea317 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -87,9 +87,11 @@ class Dot extends React.Component<DotIProps> {
 
         return <span onClick={this.props.onClick} className="mx_Slider_dotValue">
             <div className={className} />
-            <div>
+            <div className="mx_Slider_labelContainer">
+                <div className="mx_Slider_label">
                 {this.props.label}
             </div>
+            </div>
         </span>;
     }
 }

From ee33fc1c20e93ee35120cd70d4c0caf156154cd0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 11:37:02 +0100
Subject: [PATCH 2403/3235] Remove labels

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 5bb6dcc0e0..046184da69 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -229,7 +229,7 @@ export default class StyleUserSettingsTab extends React.Component {
                 values={[12, 14, 16, 18, 20]}
                 value={this.state.fontSize}
                 onSelectionChange={this._onFontSizeChanged}
-                displayFunc={value => value + 'px'}
+                displayFunc={value => {}}
             />
             <Field
                 type="text"

From 014be5ce5fd1a4805e09350ff5b0e4d98e426bb0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 11:53:29 +0100
Subject: [PATCH 2404/3235] Add support to disable slider

---
 src/components/views/elements/Slider.tsx | 28 +++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index e341eea317..ad859bfe82 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -30,6 +30,8 @@ type IProps = {
         // A function for formatting the the values
         displayFunc: (value: number) => string;
 
+        // Whether the slider is disabled
+        disabled: boolean;
 }
 
 export default class Slider extends React.Component<IProps> {
@@ -47,8 +49,9 @@ export default class Slider extends React.Component<IProps> {
         const dots = this.props.values.map(v =>
             <Dot active={v <= this.props.value}
                  label={this.props.displayFunc(v)}
-                 onClick={() => this.props.onSelectionChange(v)}
+                 onClick={this.props.disabled ? () => {} : () => this.props.onSelectionChange(v)}
                  key={v}
+                 disabled={this.props.disabled}
             />);
 
         const offset = this._offset(this.props.values, this.props.value);
@@ -57,10 +60,13 @@ export default class Slider extends React.Component<IProps> {
             <div>
                 <div className="mx_Slider_bar">
                     <hr />
-                    <div className="mx_Slider_selection">
-                        <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
-                        <hr style={{width: offset + "%"}} />
-                    </div>
+                    { this.props.disabled ?
+                        null :
+                        <div className="mx_Slider_selection">
+                            <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
+                            <hr style={{width: offset + "%"}} />
+                        </div>
+                    }
                 </div>
                 <div className="mx_Slider_dotContainer">
                     {dots}
@@ -79,18 +85,24 @@ type DotIProps = {
 
     // The label on the dot
     label: string,
+
+    // Whether the slider is disabled
+    disabled: boolean;
 }
 
 class Dot extends React.Component<DotIProps> {
     render(): React.ReactNode {
-        const className = "mx_Slider_dot" + (this.props.active ? " mx_Slider_dotActive" : "");
+        let className = "mx_Slider_dot"
+        if (!this.props.disabled && this.props.active) {
+            className += " mx_Slider_dotActive";
+        }
 
         return <span onClick={this.props.onClick} className="mx_Slider_dotValue">
             <div className={className} />
             <div className="mx_Slider_labelContainer">
                 <div className="mx_Slider_label">
-                {this.props.label}
-            </div>
+                    {this.props.label}
+                </div>
             </div>
         </span>;
     }

From 1486beeaf42903fe75168a16ee3c45e7f516eb39 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 12:02:23 +0100
Subject: [PATCH 2405/3235] Make slider indpendent of settings styling

---
 res/css/views/elements/_Slider.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 7e9acefa06..2132381591 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -17,8 +17,6 @@ limitations under the License.
 .mx_Slider {
     position: relative;
     margin: 0px;
-
-    @mixin mx_Settings_fullWidthField;
 }
 
 .mx_Slider_dotContainer {

From 98799611cf31b5e2036a61ecac60d9b46d4f29b1 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 15:37:46 +0100
Subject: [PATCH 2406/3235] Remove padding for alignment reasons

---
 res/css/views/elements/_Slider.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 2132381591..83f100ff92 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -17,6 +17,7 @@ limitations under the License.
 .mx_Slider {
     position: relative;
     margin: 0px;
+    flex-grow: 1;
 }
 
 .mx_Slider_dotContainer {
@@ -71,7 +72,6 @@ limitations under the License.
     width: 1rem;
     border-radius: 50%;
     background-color: $Slider-background-color;
-    margin-bottom: 5px;
     z-index: 0;
 }
 

From f5d65907512971f4592f9be67d7c6ab2917ff0ef Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 16:11:01 +0100
Subject: [PATCH 2407/3235] Have max and min font configured in settings

---
 src/components/structures/MatrixChat.js |  2 +-
 src/fontSize.js                         | 11 ++++++-----
 src/settings/Settings.js                | 10 ++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1845e0011d..602d85f048 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -266,7 +266,7 @@ export default createReactClass({
 
         this.dispatcherRef = dis.register(this.onAction);
         this._themeWatcher = new ThemeWatcher();
-        this._fontWatcher = new FontWatcher(10, 20);
+        this._fontWatcher = new FontWatcher();
         this._themeWatcher.start();
         this._fontWatcher.start();
 
diff --git a/src/fontSize.js b/src/fontSize.js
index 30c69b7428..2e37921ee6 100644
--- a/src/fontSize.js
+++ b/src/fontSize.js
@@ -18,9 +18,7 @@ import dis from './dispatcher';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
-    constructor(minSize, maxSize) {
-        this._min_size = minSize;
-        this._max_size = maxSize;
+    constructor() {
         this._dispatcherRef = null;
     }
 
@@ -40,8 +38,11 @@ export class FontWatcher {
     };
 
     _setRootFontSize = size => {
-        let fontSize = this._min_size < size ? size : this._min_size;
-        fontSize = fontSize < this._max_size ? fontSize : this._max_size;
+        const min = SettingsStore.getValue("font_size_min");
+        const max = SettingsStore.getValue("font_size_max");
+
+        const fontSize = Math.max(Math.min(max, size), min);
+
         if (fontSize != size) {
             SettingsStore.setValue("font_size", null, SettingLevel.Device, fontSize);
         }
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index a044027baf..b144b07e84 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -177,6 +177,16 @@ export const SETTINGS = {
         default: 16,
         controller: new FontSizeController(),
     },
+    "font_size_min": {
+        displayName: _td("Min font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: 14,
+    },
+    "font_size_max": {
+        displayName: _td("Max font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: 24,
+    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From fe175bb9a89d87307805582040e1f3295a2d0475 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 22 Apr 2020 17:31:49 +0100
Subject: [PATCH 2408/3235] Styling for the font slider

---
 .../tabs/user/_AppearanceUserSettingsTab.scss | 20 +++++++++++++++++++
 .../tabs/user/AppearanceUserSettingsTab.js    | 18 +++++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 8c80a35e40..e4285e248c 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -14,7 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_AppearanceUserSettingsTab_fontSlider,
 .mx_AppearanceUserSettingsTab_themeSection .mx_Field,
 .mx_AppearanceUserSettingsTab_fontScaling .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
+
+.mx_AppearanceUserSettingsTab_fontSlider {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 10px;
+    background: #FFFFFF;
+    border-radius: 10px;
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider_smallText {
+    font-size: 15px;
+    padding-right: 10px;
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider_largeText {
+    font-size: 18px;
+    padding-left: 10px;
+}
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 046184da69..e1bbaab2cc 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -25,6 +25,7 @@ import Field from "../../../elements/Field";
 import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
+import _range from "lodash/range";
 
 export default class StyleUserSettingsTab extends React.Component {
     constructor() {
@@ -225,12 +226,17 @@ export default class StyleUserSettingsTab extends React.Component {
     _renderFontSection() {
         return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
-            <Slider
-                values={[12, 14, 16, 18, 20]}
-                value={this.state.fontSize}
-                onSelectionChange={this._onFontSizeChanged}
-                displayFunc={value => {}}
-            />
+            <div className="mx_AppearanceUserSettingsTab_fontSlider">
+                <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
+                <Slider
+                    values={_range(SettingsStore.getValue("font_size_min"), SettingsStore.getValue("font_size_max"), 2)}
+                    value={this.state.fontSize}
+                    onSelectionChange={this._onFontSizeChanged}
+                    displayFunc={value => {}}
+                    disabled={false}
+                />
+                <div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
+            </div>
             <Field
                 type="text"
                 label={_t("Font size")}

From 8f0d81e7708a1d210b37f1b70824d7cfd19c3806 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 10:27:41 +0100
Subject: [PATCH 2409/3235] Linearly interpolate between value intervals.

---
 src/components/views/elements/Slider.tsx      | 36 ++++++++++++++++---
 .../tabs/user/AppearanceUserSettingsTab.js    |  2 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index ad859bfe82..a9fc41c8cc 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -35,14 +35,40 @@ type IProps = {
 }
 
 export default class Slider extends React.Component<IProps> {
+    // offset is a terrible inverse approximation.
+    // if the values represents some function f(x) = y where x is the 
+    // index of the array and y = values[x] then offset(f, y) = x
+    // s.t f(x) = y.
+    // it assumes a monotonic function and interpolates linearly between
+    // y values.
+    // Offset is used for finding the location of a value on a
+    // non linear slider.
     _offset(values: number[], value: number): number {
-        const min = values[0];
-        const max = values[values.length - 1];
+        // the index of the first number greater than value.
+        let closest = values.reduce((prev, curr) => {
+            return (value > curr ? prev + 1 : prev);
+          }, 0);
 
-        // Clamp value between min and max
-        value = Math.min(Math.max(value, min), max);
+        // Off the left
+        if (closest == 0) {
+            return 0;
+        }
+
+        // Off the right
+        if (closest == values.length) {
+            return 100;
+        }
+
+        // Now 
+        const closestLessValue = values[closest - 1];
+        const closestGreaterValue = values[closest];
+
+        const intervalWidth = 1 / (values.length - 1);
+
+        const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue)
+
+        return 100 * (closest - 1 + linearInterpolation) * intervalWidth
 
-        return (value - min) / (max - min) * 100;
     }
 
     render(): React.ReactNode {
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index e1bbaab2cc..949b3bed31 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -229,7 +229,7 @@ export default class StyleUserSettingsTab extends React.Component {
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
-                    values={_range(SettingsStore.getValue("font_size_min"), SettingsStore.getValue("font_size_max"), 2)}
+                    values={_range(SettingsStore.getValue("font_size_min"), SettingsStore.getValue("font_size_max") + 2, 2.5)}
                     value={this.state.fontSize}
                     onSelectionChange={this._onFontSizeChanged}
                     displayFunc={value => {}}

From a16fe09d4275b64939d34f56b1720cb00ef1e93e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 10:58:00 +0100
Subject: [PATCH 2410/3235] Use em to detach slider from root font-size

---
 res/css/views/elements/_Slider.scss           | 22 +++++++++----------
 .../tabs/user/_AppearanceUserSettingsTab.scss |  1 +
 src/components/views/elements/Slider.tsx      |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 83f100ff92..f6982865db 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -30,30 +30,30 @@ limitations under the License.
     display: flex;
     box-sizing: border-box;
     position: absolute;
-    height: 1rem;
+    height: 1em;
     width: 100%;
-    padding: 0 0.5rem; // half the width of a dot.
+    padding: 0 0.5em; // half the width of a dot.
     align-items: center;
 }
 
 .mx_Slider_bar > hr {
     width: 100%;
-    border: 0.2rem solid $Slider-background-color;
+    border: 0.2em solid $Slider-background-color;
 }
 
 .mx_Slider_selection {
     display: flex;
     align-items: center;
-    width: calc(100% - 1rem); // 2 * half the width of a dot
-    height: 1rem;
+    width: calc(100% - 1em); // 2 * half the width of a dot
+    height: 1em;
     position: absolute;
 }
 
 .mx_Slider_selectionDot {
     transition: left 0.25s;
     position: absolute;
-    width: 1.1rem;
-    height: 1.1rem;
+    width: 1.1em;
+    height: 1.1em;
     background-color: $Slider-selection-color;
     border-radius: 50%;
     box-shadow: 0 0 6px lightgrey;
@@ -63,13 +63,13 @@ limitations under the License.
 .mx_Slider_selection > hr {
     transition: width 0.25s;
     margin: 0;
-    border: 0.2rem solid $Slider-selection-color;
+    border: 0.2em solid $Slider-selection-color;
 }
 
 .mx_Slider_dot {
     transition: background-color 0.2s ease-in;
-    height: 1rem;
-    width: 1rem;
+    height: 1em;
+    width: 1em;
     border-radius: 50%;
     background-color: $Slider-background-color;
     z-index: 0;
@@ -89,7 +89,7 @@ limitations under the License.
 // The following is a hack to center the labels without adding
 // any width to the slider's dots.
 .mx_Slider_labelContainer {
-    width: 1rem;
+    width: 1em;
 }
 
 .mx_Slider_label {
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index e4285e248c..28a2510508 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -27,6 +27,7 @@ limitations under the License.
     padding: 10px;
     background: #FFFFFF;
     border-radius: 10px;
+    font-size: 10px;
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider_smallText {
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index a9fc41c8cc..6ec044da41 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -89,7 +89,7 @@ export default class Slider extends React.Component<IProps> {
                     { this.props.disabled ?
                         null :
                         <div className="mx_Slider_selection">
-                            <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55rem + " + offset + "%)"}} />
+                            <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
                             <hr style={{width: offset + "%"}} />
                         </div>
                     }

From 6375e2526324de37ee170637c494bf08a29c4e59 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 11:22:51 +0100
Subject: [PATCH 2411/3235] Match padding from figma

---
 .../settings/tabs/user/_AppearanceUserSettingsTab.scss    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 28a2510508..16a14edf85 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -24,7 +24,7 @@ limitations under the License.
     display: flex;
     flex-direction: row;
     align-items: center;
-    padding: 10px;
+    padding: 15px;
     background: #FFFFFF;
     border-radius: 10px;
     font-size: 10px;
@@ -32,10 +32,12 @@ limitations under the License.
 
 .mx_AppearanceUserSettingsTab_fontSlider_smallText {
     font-size: 15px;
-    padding-right: 10px;
+    padding-right: 20px;
+    padding-left: 5px;
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider_largeText {
     font-size: 18px;
-    padding-left: 10px;
+    padding-left: 20px;
+    padding-right: 5px;
 }

From 28dca9e52529b3b8f49ee0e92cf448a4875fa403 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 11:33:28 +0100
Subject: [PATCH 2412/3235] Match figma color scheme

---
 .../views/settings/tabs/user/_AppearanceUserSettingsTab.scss   | 2 +-
 res/themes/dark/css/_dark.scss                                 | 3 +++
 res/themes/light/css/_light.scss                               | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 16a14edf85..4141fb2fb1 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -25,7 +25,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     padding: 15px;
-    background: #FFFFFF;
+    background: $font-slider-bg-color;
     border-radius: 10px;
     font-size: 10px;
 }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 5d6ba033c8..cb6e7ccdaa 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -177,6 +177,9 @@ $breadcrumb-placeholder-bg-color: #272c35;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+// FontSlider colors
+$font-slider-bg-color: $room-highlight-color;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e06ba33594..b576b57778 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -306,6 +306,9 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+// FontSlider colors
+$font-slider-bg-color: $input-darker-bg-color;
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {

From a83993f1ff18f8c7be1d0949a8c983bbecf2ee9d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 11:49:54 +0100
Subject: [PATCH 2413/3235] Match margins in settings

---
 .../views/settings/tabs/user/_AppearanceUserSettingsTab.scss    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 4141fb2fb1..e82ae3c575 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -28,6 +28,8 @@ limitations under the License.
     background: $font-slider-bg-color;
     border-radius: 10px;
     font-size: 10px;
+    margin-top: 24px;
+    margin-bottom: 24px;
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider_smallText {

From c86638c667d023abccb1250825e5c17e1070991c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 12:09:08 +0100
Subject: [PATCH 2414/3235] add toggle between font slider and custom setting

---
 .../settings/tabs/user/AppearanceUserSettingsTab.js   | 11 +++++++++--
 src/i18n/strings/en_EN.json                           |  3 +++
 src/settings/Settings.js                              |  5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 949b3bed31..ceb3241b8b 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -36,7 +36,7 @@ export default class StyleUserSettingsTab extends React.Component {
             ...this._calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
-
+            useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
         };
     }
 
@@ -224,6 +224,7 @@ export default class StyleUserSettingsTab extends React.Component {
     }
 
     _renderFontSection() {
+        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
@@ -233,10 +234,15 @@ export default class StyleUserSettingsTab extends React.Component {
                     value={this.state.fontSize}
                     onSelectionChange={this._onFontSizeChanged}
                     displayFunc={value => {}}
-                    disabled={false}
+                    disabled={this.state.useCustomFontSize}
                 />
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
             </div>
+            <SettingsFlag
+                name="useCustomFontSize"
+                level={SettingLevel.ACCOUNT}
+                onChange={(checked)=> this.setState({useCustomFontSize: checked})}
+            />
             <Field
                 type="text"
                 label={_t("Font size")}
@@ -245,6 +251,7 @@ export default class StyleUserSettingsTab extends React.Component {
                 value={this.state.fontSize}
                 id="font_size_field"
                 onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
+                disabled={!this.state.useCustomFontSize}
             />
         </div>;
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a3051cbb91..2c3239900d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -407,6 +407,9 @@
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Font size": "Font size",
+    "Min font size": "Min font size",
+    "Max font size": "Max font size",
+    "Custom font size": "Custom font size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index b144b07e84..e0e34179f3 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -187,6 +187,11 @@ export const SETTINGS = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: 24,
     },
+    "useCustomFontSize": {
+        displayName: _td("Custom font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: false,
+    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From 600a812227acafd8a15732cdabed3b6899415735 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 12:20:10 +0100
Subject: [PATCH 2415/3235] Add brush icon for appearance setting tab

---
 res/css/views/dialogs/_UserSettingsDialog.scss     | 4 ++++
 res/img/feather-customised/brush.svg               | 5 +++++
 src/components/views/dialogs/UserSettingsDialog.js | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 res/img/feather-customised/brush.svg

diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss
index 4d831d7858..7adcc58c4e 100644
--- a/res/css/views/dialogs/_UserSettingsDialog.scss
+++ b/res/css/views/dialogs/_UserSettingsDialog.scss
@@ -21,6 +21,10 @@ limitations under the License.
     mask-image: url('$(res)/img/feather-customised/settings.svg');
 }
 
+.mx_UserSettingsDialog_appearanceIcon::before {
+    mask-image: url('$(res)/img/feather-customised/brush.svg');
+}
+
 .mx_UserSettingsDialog_voiceIcon::before {
     mask-image: url('$(res)/img/feather-customised/phone.svg');
 }
diff --git a/res/img/feather-customised/brush.svg b/res/img/feather-customised/brush.svg
new file mode 100644
index 0000000000..d7f2738629
--- /dev/null
+++ b/res/img/feather-customised/brush.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 16.5C12 18.9853 9.98528 21 7.5 21C6.21514 21 3 21 3 21C3 21 3 17.7004 3 16.5C3 14.0147 5.01472 12 7.5 12C9.98528 12 12 14.0147 12 16.5Z" stroke="#2E2F32" stroke-linejoin="round"/>
+<path d="M8.25 12L17.1955 3.69345C18.0632 2.88776 19.4127 2.91274 20.25 3.75V3.75C21.0873 4.58726 21.1122 5.93682 20.3065 6.80449L12 15.75" stroke="#2E2F32"/>
+<path d="M11.25 9C11.25 9 12.3929 9.45 13.5 10.5C14.6071 11.55 15 12.75 15 12.75" stroke="#2E2F32"/>
+</svg>
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 91ab203753..bf06b8749f 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -69,7 +69,7 @@ export default class UserSettingsDialog extends React.Component {
         ));
         tabs.push(new Tab(
             _td("Appearance"),
-            "mx_userSettingsDialog_styleIcon",
+            "mx_UserSettingsDialog_appearanceIcon",
             <AppearanceUserSettingsTab />,
         ));
         tabs.push(new Tab(

From 61b45afcd3731844482a0520d9761d841206b74a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 12:28:00 +0100
Subject: [PATCH 2416/3235] Slightly darker toggle off bg color

---
 res/themes/dark/css/_dark.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 5d6ba033c8..6224c0820f 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -147,6 +147,9 @@ $button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
 $button-link-fg-color: $accent-color;
 $button-link-bg-color: transparent;
 
+// Toggle switch
+$togglesw-off-color: $room-highlight-color;
+
 $visual-bell-bg-color: #800;
 
 $room-warning-bg-color: $header-panel-bg-color;

From e5cb14929602cdc71887b3e95c54f546d9ccdda0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 13:52:08 +0100
Subject: [PATCH 2417/3235] Handle fontslider input errors correctly

---
 .../tabs/user/AppearanceUserSettingsTab.js    | 33 ++++++++++++++++---
 src/i18n/strings/en_EN.json                   |  3 ++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index ceb3241b8b..4144605999 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -101,11 +101,33 @@ export default class StyleUserSettingsTab extends React.Component {
     };
 
     _onFontSizeChanged = (size) => {
-        const parsedSize = isNaN(parseInt(size)) ? SettingsStore.getDefaultValue("font_size") : parseFloat(size);
-        this.setState({fontSize: parsedSize});
-        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, parsedSize);
+        this.setState({fontSize: size});
+        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, size);
     };
 
+    _onValidateFontSize = ({value}) => {
+        console.log({value});
+        this.setState({fontSize: value});
+
+        const parsedSize = parseFloat(value);
+        const min = SettingsStore.getValue("font_size_min");
+        const max = SettingsStore.getValue("font_size_max");
+
+        if (isNaN(parsedSize)) {
+            return {valid: false, feedback: _t("Size must be a number")};
+        }
+
+        console.log({min});
+        console.log({max});
+        console.log({parsedSize});
+        if (!(min <= parsedSize && parsedSize <= max)) {
+            return {valid: false, feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', {min, max})};
+        }
+
+        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, value);
+        return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
+    }
+
     _onAddCustomTheme = async () => {
         let currentThemes = SettingsStore.getValue("custom_themes");
         if (!currentThemes) currentThemes = [];
@@ -247,10 +269,11 @@ export default class StyleUserSettingsTab extends React.Component {
                 type="text"
                 label={_t("Font size")}
                 autoComplete="off"
-                placeholder={SettingsStore.getValue("font_size", null).toString()}
+                placeholder={this.state.fontSize}
                 value={this.state.fontSize}
                 id="font_size_field"
-                onChange={(ev) => this._onFontSizeChanged(ev.target.value)}
+                onValidate={this._onValidateFontSize}
+                onChange={({value}) => this.setState({fontSize: value})}
                 disabled={!this.state.useCustomFontSize}
             />
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2c3239900d..fa3d5e3f41 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -747,6 +747,9 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
     "Manage integrations": "Manage integrations",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+    "Size must be a number": "Size must be a number",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",
     "Invalid theme schema.": "Invalid theme schema.",
     "Error downloading theme information.": "Error downloading theme information.",
     "Theme added!": "Theme added!",

From a087f5ea400fd7a8fc7e6f207fdb15def6e4e2f3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 13:55:10 +0100
Subject: [PATCH 2418/3235] Lint

---
 .../tabs/user/AppearanceUserSettingsTab.js         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 4144605999..5c285d12e6 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -117,11 +117,11 @@ export default class StyleUserSettingsTab extends React.Component {
             return {valid: false, feedback: _t("Size must be a number")};
         }
 
-        console.log({min});
-        console.log({max});
-        console.log({parsedSize});
         if (!(min <= parsedSize && parsedSize <= max)) {
-            return {valid: false, feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', {min, max})};
+            return {
+                valid: false,
+                feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', {min, max}),
+            };
         }
 
         SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, value);
@@ -252,7 +252,11 @@ export default class StyleUserSettingsTab extends React.Component {
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
-                    values={_range(SettingsStore.getValue("font_size_min"), SettingsStore.getValue("font_size_max") + 2, 2.5)}
+                    values={_range(
+                        SettingsStore.getValue("font_size_min"),
+                        SettingsStore.getValue("font_size_max")+ 2,
+                        2.5,
+                    )}
                     value={this.state.fontSize}
                     onSelectionChange={this._onFontSizeChanged}
                     displayFunc={value => {}}

From 06f4eca05d51aaff8986406296ccb0844a66dfe4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 14:15:33 +0100
Subject: [PATCH 2419/3235] Background opacity

---
 res/themes/light/css/_light.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index b576b57778..ed7eae48f7 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -307,7 +307,7 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
 // FontSlider colors
-$font-slider-bg-color: $input-darker-bg-color;
+$font-slider-bg-color: rgba($input-darker-bg-color, 0.2);
 
 // ***** Mixins! *****
 

From 4b4599c1d81b4200f41158cb8febe2fcb9121c3a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 23 Apr 2020 14:39:11 +0100
Subject: [PATCH 2420/3235] tslint

---
 src/components/views/elements/Slider.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 6ec044da41..559bdd9ce2 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -36,7 +36,7 @@ type IProps = {
 
 export default class Slider extends React.Component<IProps> {
     // offset is a terrible inverse approximation.
-    // if the values represents some function f(x) = y where x is the 
+    // if the values represents some function f(x) = y where x is the
     // index of the array and y = values[x] then offset(f, y) = x
     // s.t f(x) = y.
     // it assumes a monotonic function and interpolates linearly between
@@ -50,16 +50,16 @@ export default class Slider extends React.Component<IProps> {
           }, 0);
 
         // Off the left
-        if (closest == 0) {
+        if (closest === 0) {
             return 0;
         }
 
         // Off the right
-        if (closest == values.length) {
+        if (closest === values.length) {
             return 100;
         }
 
-        // Now 
+        // Now
         const closestLessValue = values[closest - 1];
         const closestGreaterValue = values[closest];
 

From 18176cdc5b4b39fca738b9597391a1766d52659e Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 23 Apr 2020 13:10:20 +0000
Subject: [PATCH 2421/3235] Translated using Weblate (Esperanto)

Currently translated at 96.3% (2209 of 2295 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 582b635ee1..42a6ed52ca 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2289,5 +2289,10 @@
     "In encrypted rooms, verify all users to ensure it’s secure.": "En ĉifritaj ĉambroj, kontroli ĉiujn uzantojn por certigi, ke ili sekuras.",
     "Verified": "Kontrolita",
     "Verification cancelled": "Kontrolo nuliĝis",
-    "Compare emoji": "Kompari bildsignojn"
+    "Compare emoji": "Kompari bildsignojn",
+    "Use Single Sign On to continue": "Daŭrigi per ununura saluto",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Konfirmi aldonon de ĉi tiu retpoŝtadreso, uzante ununuran saluton por pruvi vian identecon.",
+    "Single Sign On": "Ununura saluto",
+    "Confirm adding email": "Konfirmi aldonon de retpoŝtadreso",
+    "Click the button below to confirm adding this email address.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu retpoŝtadreso."
 }

From 90dcfe0b017fbfff7af4c6aab0d1b3bc30fa518c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 23 Apr 2020 14:13:58 +0000
Subject: [PATCH 2422/3235] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2290 of 2295 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 3cff0a013e..e215afd6a3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2388,5 +2388,7 @@
     "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
     "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal",
     "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s",
-    "Send a bug report with logs": "Hibajelentés beküldése naplóval"
+    "Send a bug report with logs": "Hibajelentés beküldése naplóval",
+    "Please supply a widget URL or embed code": "Add meg a kisalkalmazás URL-jét vagy a beágyazott kódot",
+    "Verify this login": "Belépés ellenőrzése"
 }

From 86200812a5c6ab95645a8189682d49c7e6e632f7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 23 Apr 2020 15:49:21 +0100
Subject: [PATCH 2423/3235] Upgrade matrix-js-sdk to 5.3.1-rc.4

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4e20ad6acf..e8e834ec38 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.3.1-rc.3",
+    "matrix-js-sdk": "5.3.1-rc.4",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 65f8a0e669..150d9b126b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.3.1-rc.3:
-  version "5.3.1-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.3.tgz#fada68aaf9fadd2f423a297bba8193b5bd697316"
-  integrity sha512-YMfOdhlAFk4kHQ85S3kosVBWSr8iCJ8OaVpJr+lDFoXkvIrPgSn5zWesg+ny/bvQjWNRny7Ch7wcmozojKQqqg==
+matrix-js-sdk@5.3.1-rc.4:
+  version "5.3.1-rc.4"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.4.tgz#f0e6d512540aa04dfdc311c854fd9efb53287071"
+  integrity sha512-IIuUzP4ee5rw7gtuA2mT7i/jXehl0OrdBMUSAruqixl5DUvBSWjPyFbS4zclVN+DNf75j+7RWMH8Q8BLfdvLeA==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From b3753f34076ce8764dace672490a64c38e8c74e7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 23 Apr 2020 15:55:37 +0100
Subject: [PATCH 2424/3235] Prepare changelog for v2.5.0-rc.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3676b5be0..541992d4c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+Changes in [2.5.0-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.4) (2020-04-23)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.3...v2.5.0-rc.4)
+
+ * Upgrade to JS SDK 5.3.1-rc.4
+ * Take encrypted message search out of labs for release
+   [\#4468](https://github.com/matrix-org/matrix-react-sdk/pull/4468)
+ * Update login security copy and design to match Figma [to release]
+   [\#4474](https://github.com/matrix-org/matrix-react-sdk/pull/4474)
+ * Fix i18n of SSO UIA copy in Deactivate Account Dialog on release
+   [\#4473](https://github.com/matrix-org/matrix-react-sdk/pull/4473)
+ * Skip auth flow test for signing upload when password present
+   [\#4465](https://github.com/matrix-org/matrix-react-sdk/pull/4465)
+ * Fix: wait until cross-signing keys are fetched to show verify button
+   [\#4457](https://github.com/matrix-org/matrix-react-sdk/pull/4457)
+ * Handle load error in create secret storage dialog
+   [\#4454](https://github.com/matrix-org/matrix-react-sdk/pull/4454)
+ * Don't recheck DeviceListener until after initial sync is finished
+   [\#4450](https://github.com/matrix-org/matrix-react-sdk/pull/4450)
+ * EventIndex: Filter out events that don't have a propper content value.
+   [\#4447](https://github.com/matrix-org/matrix-react-sdk/pull/4447)
+
 Changes in [2.5.0-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.3) (2020-04-17)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.2...v2.5.0-rc.3)

From 941709d19ada20e6454cfa070fe16e09084bf808 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 23 Apr 2020 15:55:37 +0100
Subject: [PATCH 2425/3235] v2.5.0-rc.4

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

diff --git a/package.json b/package.json
index e8e834ec38..84bc83c2ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.3",
+  "version": "2.5.0-rc.4",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From f768b23b384ea3412f8b339fdaf296d5c19e46ec Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 23 Apr 2020 14:19:23 +0000
Subject: [PATCH 2426/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2295 of 2295 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e215afd6a3..b1db06fa4b 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2390,5 +2390,10 @@
     "Currently indexing: %(currentRoom)s": "Indexelés alatt: %(currentRoom)s",
     "Send a bug report with logs": "Hibajelentés beküldése naplóval",
     "Please supply a widget URL or embed code": "Add meg a kisalkalmazás URL-jét vagy a beágyazott kódot",
-    "Verify this login": "Belépés ellenőrzése"
+    "Verify this login": "Belépés ellenőrzése",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.",
+    "This requires the latest Riot on your other devices:": "A Riot legújabb kliensére van ehhez szükséged a többi eszközödön:",
+    "or another cross-signing capable Matrix client": "vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre",
+    "Use Recovery Passphrase or Key": "Használd a Visszaállítási Jelmondatot vagy Kulcsot",
+    "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni"
 }

From e3ba9c9b38779c75e57cd0e7caf93a26cdaefb4f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Apr 2020 16:11:29 +0100
Subject: [PATCH 2427/3235] Discard unused CompatibilityPage.js in react-sdk

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 -
 res/css/structures/_CompatibilityPage.scss    | 19 -----
 .../structures/CompatibilityPage.js           | 78 -------------------
 3 files changed, 98 deletions(-)
 delete mode 100644 res/css/structures/_CompatibilityPage.scss
 delete mode 100644 src/components/structures/CompatibilityPage.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0ba2b609e8..7bf1f88ec9 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -2,7 +2,6 @@
 @import "./_common.scss";
 @import "./_font-sizes.scss";
 @import "./structures/_AutoHideScrollbar.scss";
-@import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
diff --git a/res/css/structures/_CompatibilityPage.scss b/res/css/structures/_CompatibilityPage.scss
deleted file mode 100644
index 26354ed124..0000000000
--- a/res/css/structures/_CompatibilityPage.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.mx_CompatibilityPage {
-    width: 100%;
-    height: 100%;
-    background-color: #e55;
-}
-
-.mx_CompatibilityPage_box {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 500px;
-    height: 300px;
-    border: 1px solid;
-    padding: 10px;
-    background-color: #fcc;
-}
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
deleted file mode 100644
index 9a3fdb5f39..0000000000
--- a/src/components/structures/CompatibilityPage.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-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 createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { _t } from '../../languageHandler';
-
-export default createReactClass({
-    displayName: 'CompatibilityPage',
-    propTypes: {
-        onAccept: PropTypes.func,
-    },
-
-    getDefaultProps: function() {
-        return {
-            onAccept: function() {}, // NOP
-        };
-    },
-
-    onAccept: function() {
-        this.props.onAccept();
-    },
-
-    render: function() {
-        return (
-        <div className="mx_CompatibilityPage">
-            <div className="mx_CompatibilityPage_box">
-                <p>{ _t("Sorry, your browser is <b>not</b> able to run Riot.", {}, { 'b': (sub) => <b>{sub}</b> }) } </p>
-                <p>
-                { _t(
-                    "Riot uses many advanced browser features, some of which are not available " +
-                    "or experimental in your current browser.",
-                ) }
-                </p>
-                <p>
-                { _t(
-                    'Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ' +
-                    'or <safariLink>Safari</safariLink> for the best experience.',
-                    {},
-                    {
-                        'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
-                        'firefoxLink': (sub) => <a href="https://firefox.com">{sub}</a>,
-                        'safariLink': (sub) => <a href="https://apple.com/safari">{sub}</a>,
-                    },
-                )}
-                </p>
-                <p>
-                { _t(
-                    "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!",
-                ) }
-                </p>
-                <button onClick={this.onAccept}>
-                    { _t("I understand the risks and wish to continue") }
-                </button>
-            </div>
-        </div>
-        );
-    },
-});

From 531de19fa4464ea04cce372b327340339a73bb0a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 23 Apr 2020 16:11:58 +0100
Subject: [PATCH 2428/3235] Revert "Discard unused CompatibilityPage.js in
 react-sdk"

This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 +
 res/css/structures/_CompatibilityPage.scss    | 19 +++++
 .../structures/CompatibilityPage.js           | 78 +++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 res/css/structures/_CompatibilityPage.scss
 create mode 100644 src/components/structures/CompatibilityPage.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 7bf1f88ec9..0ba2b609e8 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -2,6 +2,7 @@
 @import "./_common.scss";
 @import "./_font-sizes.scss";
 @import "./structures/_AutoHideScrollbar.scss";
+@import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
 @import "./structures/_CreateRoom.scss";
 @import "./structures/_CustomRoomTagPanel.scss";
diff --git a/res/css/structures/_CompatibilityPage.scss b/res/css/structures/_CompatibilityPage.scss
new file mode 100644
index 0000000000..26354ed124
--- /dev/null
+++ b/res/css/structures/_CompatibilityPage.scss
@@ -0,0 +1,19 @@
+.mx_CompatibilityPage {
+    width: 100%;
+    height: 100%;
+    background-color: #e55;
+}
+
+.mx_CompatibilityPage_box {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 500px;
+    height: 300px;
+    border: 1px solid;
+    padding: 10px;
+    background-color: #fcc;
+}
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
new file mode 100644
index 0000000000..9a3fdb5f39
--- /dev/null
+++ b/src/components/structures/CompatibilityPage.js
@@ -0,0 +1,78 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+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 createReactClass from 'create-react-class';
+import PropTypes from 'prop-types';
+import { _t } from '../../languageHandler';
+
+export default createReactClass({
+    displayName: 'CompatibilityPage',
+    propTypes: {
+        onAccept: PropTypes.func,
+    },
+
+    getDefaultProps: function() {
+        return {
+            onAccept: function() {}, // NOP
+        };
+    },
+
+    onAccept: function() {
+        this.props.onAccept();
+    },
+
+    render: function() {
+        return (
+        <div className="mx_CompatibilityPage">
+            <div className="mx_CompatibilityPage_box">
+                <p>{ _t("Sorry, your browser is <b>not</b> able to run Riot.", {}, { 'b': (sub) => <b>{sub}</b> }) } </p>
+                <p>
+                { _t(
+                    "Riot uses many advanced browser features, some of which are not available " +
+                    "or experimental in your current browser.",
+                ) }
+                </p>
+                <p>
+                { _t(
+                    'Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ' +
+                    'or <safariLink>Safari</safariLink> for the best experience.',
+                    {},
+                    {
+                        'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
+                        'firefoxLink': (sub) => <a href="https://firefox.com">{sub}</a>,
+                        'safariLink': (sub) => <a href="https://apple.com/safari">{sub}</a>,
+                    },
+                )}
+                </p>
+                <p>
+                { _t(
+                    "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!",
+                ) }
+                </p>
+                <button onClick={this.onAccept}>
+                    { _t("I understand the risks and wish to continue") }
+                </button>
+            </div>
+        </div>
+        );
+    },
+});

From 5af3d83cc7781bb5be0d61ffc4fa20579611bd23 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 23 Apr 2020 18:14:30 +0100
Subject: [PATCH 2429/3235] Fix recovery link on login verification flow

This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
---
 src/components/structures/auth/SetupEncryptionBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 13fa270a9c..26534c6e02 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -131,7 +131,7 @@ export default class SetupEncryptionBody extends React.Component {
                     </div>
 
                     <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton kind="link" onClick={this.onSkipClick}>
+                        <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
                             {_t("Use Recovery Passphrase or Key")}
                         </AccessibleButton>
                         <AccessibleButton kind="danger" onClick={this.onSkipClick}>

From 949b9160916bbdfb210cdc9d1f4ba1bfaf01ee66 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 23 Apr 2020 18:14:30 +0100
Subject: [PATCH 2430/3235] Fix recovery link on login verification flow

This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
---
 src/components/structures/auth/SetupEncryptionBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 13fa270a9c..26534c6e02 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -131,7 +131,7 @@ export default class SetupEncryptionBody extends React.Component {
                     </div>
 
                     <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton kind="link" onClick={this.onSkipClick}>
+                        <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
                             {_t("Use Recovery Passphrase or Key")}
                         </AccessibleButton>
                         <AccessibleButton kind="danger" onClick={this.onSkipClick}>

From 3962c98c9beaeee3f1685e63fe3604ed8a1a68eb Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Thu, 23 Apr 2020 22:53:02 +0300
Subject: [PATCH 2431/3235] Ensure PersistedElements are refreshed when
 AuxPanel scrolls

If the screen is not tall enough, AuxPanel starts scrolling its content.
If it contains PersistedElements, they need to be notified about
scrolling as they only listen on resize events to move their element.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 src/components/views/rooms/AuxPanel.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index e102b0dba4..00bdb1c45a 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -141,6 +141,15 @@ export default createReactClass({
         return counters;
     },
 
+    _onScroll: function(rect) {
+        if (this.props.onResize) {
+            this.props.onResize();
+        }
+
+        /* Force refresh of PersistedElements which may be partially hidden */
+        window.dispatchEvent(new Event('resize'));
+    },
+
     render: function() {
         const CallView = sdk.getComponent("voip.CallView");
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
@@ -265,7 +274,7 @@ export default createReactClass({
         }
 
         return (
-            <AutoHideScrollbar className={classes} style={style} >
+            <AutoHideScrollbar className={classes} style={style} onScroll={this._onScroll}>
                 { stateViews }
                 { appsDrawer }
                 { fileDropTarget }

From efaf4fbbda17198a14e0c0d9c86f53142e1d89ca Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Apr 2020 15:22:54 -0600
Subject: [PATCH 2432/3235] Decode dollar signs in safe widget URLs before
 rendering/templating

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 60382b5606..bf9054771c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -636,7 +636,10 @@ export default class AppTile extends React.Component {
         if (ALLOWED_APP_URL_SCHEMES.includes(parsedWidgetUrl.protocol)) {
             safeWidgetUrl = url.format(parsedWidgetUrl);
         }
-        return safeWidgetUrl;
+
+        // Replace all the dollar signs back to dollar signs as they don't affect HTTP at all.
+        // We also need the dollar signs in-tact for variable substitution.
+        return safeWidgetUrl.replace(/%24/g, '$');
     }
 
     _getTileTitle() {

From 28865e27bc30ba73b7fc1b4f4c0483a41b6b2a7e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Apr 2020 15:24:20 -0600
Subject: [PATCH 2433/3235] Don't overwrite the 'domain' data key for all
 widgets

Some widgets, which aren't Jitsi widgets, might need this to be something else.
---
 src/components/views/elements/AppTile.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index bf9054771c..366669a276 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -569,12 +569,14 @@ export default class AppTile extends React.Component {
      *
      * @returns {string} url with temlate variables replaced
      */
-    _templatedUrl(u) {
+    _templatedUrl(u, widgetType: string) {
+        const targetData = {};
+        if (WidgetType.JITSI.matches(widgetType)) {
+            targetData['domain'] = 'jitsi.riot.im'; // v1 jitsi widgets have this hardcoded
+        }
         const myUserId = MatrixClientPeg.get().credentials.userId;
         const myUser = MatrixClientPeg.get().getUser(myUserId);
-        const vars = Object.assign({
-            domain: "jitsi.riot.im", // v1 widgets have this hardcoded
-        }, this.props.app.data, {
+        const vars = Object.assign(targetData, this.props.app.data, {
             'matrix_user_id': myUserId,
             'matrix_room_id': this.props.room.roomId,
             'matrix_display_name': myUser ? myUser.displayName : myUserId,
@@ -611,18 +613,19 @@ export default class AppTile extends React.Component {
         } else {
             url = this._getSafeUrl(this.state.widgetUrl);
         }
-        return this._templatedUrl(url);
+        return this._templatedUrl(url, this.props.app.type);
     }
 
     _getPopoutUrl() {
         if (WidgetType.JITSI.matches(this.props.app.type)) {
             return this._templatedUrl(
                 WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
+                this.props.app.type
             );
         } else {
             // use app.url, not state.widgetUrl, because we want the one without
             // the wURL params for the popped-out version.
-            return this._templatedUrl(this._getSafeUrl(this.props.app.url));
+            return this._templatedUrl(this._getSafeUrl(this.props.app.url), this.props.app.type);
         }
     }
 

From 50783c2432968817aead3ae6228c6a07b7436fb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 23 Apr 2020 23:25:53 -0600
Subject: [PATCH 2434/3235] Appease the linter

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 366669a276..6a5dfc97e0 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -566,6 +566,7 @@ export default class AppTile extends React.Component {
      * Replace the widget template variables in a url with their values
      *
      * @param {string} u The URL with template variables
+     * @param {string} widgetType The widget's type
      *
      * @returns {string} url with temlate variables replaced
      */
@@ -620,7 +621,7 @@ export default class AppTile extends React.Component {
         if (WidgetType.JITSI.matches(this.props.app.type)) {
             return this._templatedUrl(
                 WidgetUtils.getLocalJitsiWrapperUrl({forLocalRender: false}),
-                this.props.app.type
+                this.props.app.type,
             );
         } else {
             // use app.url, not state.widgetUrl, because we want the one without

From a15db97b778d458864bafca2e2dca97819262b56 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Fri, 24 Apr 2020 02:03:01 +0000
Subject: [PATCH 2435/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 49.2% (1130 of 2295 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index c6772b9467..da3b56ccc5 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1109,7 +1109,7 @@
     "%(name)s accepted": "%(name)s aksepterte",
     "%(name)s declined": "%(name)s avslo",
     "%(name)s cancelled": "%(name)s avbrøt",
-    "%(name)s wants to verify": "%(name) ønsker å verifisere",
+    "%(name)s wants to verify": "%(name)s ønsker å verifisere",
     "Failed to copy": "Mislyktes i å kopiere",
     "Submit logs": "Send inn loggføringer",
     "Failed to remove widget": "Mislyktes i å fjerne modulen",

From 972f9d354d2a5a671f47b4173c3600dfc950fd96 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Fri, 24 Apr 2020 12:25:19 +0100
Subject: [PATCH 2436/3235] Revert "Update emojibase for fixed emoji codepoints
 and Emoji 13 support"

---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 7be54d235a..67907c0d98 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "create-react-class": "^15.6.0",
     "diff-dom": "^4.1.3",
     "diff-match-patch": "^1.0.4",
-    "emojibase-data": "^5.0.1",
-    "emojibase-regex": "^4.0.1",
+    "emojibase-data": "^4.0.2",
+    "emojibase-regex": "^3.0.0",
     "escape-html": "^1.0.3",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
diff --git a/yarn.lock b/yarn.lock
index d92da5a76f..a47752b1f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3077,15 +3077,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
-  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
+emojibase-data@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
+  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
 
-emojibase-regex@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
-  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
+emojibase-regex@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
+  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
 
 emojis-list@^2.0.0:
   version "2.1.0"

From 8c414014e622a49bdeee264df0524b925b1fbb26 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Fri, 24 Apr 2020 08:10:02 +0000
Subject: [PATCH 2437/3235] Translated using Weblate (German)

Currently translated at 77.2% (1771 of 2295 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 87d56f915d..ee38d2f324 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1832,5 +1832,11 @@
     "This bridge is managed by <user />.": "Diese Brücke wird von <user /> verwaltet.",
     "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s",
     "Channel: %(channelName)s": "Kanal: %(channelName)s",
-    "Show less": "Weniger zeigen"
+    "Show less": "Weniger zeigen",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Achtung</b>: Du solltest das nur auf einem vertrauenswürdigen Gerät tun.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Achtung</b>: Du solltest die Schlüsselsicherung nur auf einem vertrauenswürdigen Gerät einrichten.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Melde dich an um die ausschließlich in dieser Sitzung gespeicherten Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten in jeder Sitzung zu lesen.",
+    "Forgotten your password?": "Passwort vergessen?",
+    "You're signed out": "Du wurdest abgemeldet",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Achtung: Deine persönlichen Daten (inclusive der Verschlüsselungsschlüssel) sind noch in dieser Sitzung gespeichert. Lösche diese Daten wenn du die Sitzung nicht mehr benötigst oder dich mit einem anderen Konto anmelden möchtest."
 }

From 42a857cb5e9a2aee7cb380d54c64e26a0f544de1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Fri, 24 Apr 2020 12:25:19 +0100
Subject: [PATCH 2438/3235] Revert "Update emojibase for fixed emoji codepoints
 and Emoji 13 support"

(cherry picked from commit 972f9d354d2a5a671f47b4173c3600dfc950fd96)
---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 84bc83c2ba..6c56dd080b 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "create-react-class": "^15.6.0",
     "diff-dom": "^4.1.3",
     "diff-match-patch": "^1.0.4",
-    "emojibase-data": "^5.0.1",
-    "emojibase-regex": "^4.0.1",
+    "emojibase-data": "^4.0.2",
+    "emojibase-regex": "^3.0.0",
     "escape-html": "^1.0.3",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
diff --git a/yarn.lock b/yarn.lock
index 150d9b126b..c4a792136c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3072,15 +3072,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
-  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
+emojibase-data@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
+  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
 
-emojibase-regex@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
-  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
+emojibase-regex@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
+  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
 
 emojis-list@^2.0.0:
   version "2.1.0"

From e16f5115276466256c223502a04eb2ee451ca868 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Apr 2020 15:07:39 +0100
Subject: [PATCH 2439/3235] Redesign redactions

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  2 +-
 .../{_UnknownBody.scss => _RedactedBody.scss} | 23 +++++++++-
 res/css/views/rooms/_EventTile.scss           | 28 ------------
 res/img/feather-customised/trash (custom).svg |  7 +++
 .../views/messages/EditHistoryMessage.js      |  4 +-
 src/components/views/messages/MessageEvent.js |  5 +--
 .../views/messages/RedactedBody.tsx           | 45 +++++++++++++++++++
 src/components/views/messages/UnknownBody.js  | 40 -----------------
 src/i18n/strings/en_EN.json                   |  5 +--
 9 files changed, 80 insertions(+), 79 deletions(-)
 rename res/css/views/messages/{_UnknownBody.scss => _RedactedBody.scss} (52%)
 create mode 100644 res/img/feather-customised/trash (custom).svg
 create mode 100644 src/components/views/messages/RedactedBody.tsx
 delete mode 100644 src/components/views/messages/UnknownBody.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0ba2b609e8..0344074369 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -140,10 +140,10 @@
 @import "./views/messages/_ReactionsRow.scss";
 @import "./views/messages/_ReactionsRowButton.scss";
 @import "./views/messages/_ReactionsRowButtonTooltip.scss";
+@import "./views/messages/_RedactedBody.scss";
 @import "./views/messages/_RoomAvatarEvent.scss";
 @import "./views/messages/_SenderProfile.scss";
 @import "./views/messages/_TextualEvent.scss";
-@import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";
 @import "./views/messages/_common_CryptoEvent.scss";
 @import "./views/right_panel/_EncryptionInfo.scss";
diff --git a/res/css/views/messages/_UnknownBody.scss b/res/css/views/messages/_RedactedBody.scss
similarity index 52%
rename from res/css/views/messages/_UnknownBody.scss
rename to res/css/views/messages/_RedactedBody.scss
index 9036e12bf0..c0001db5d3 100644
--- a/res/css/views/messages/_UnknownBody.scss
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -1,5 +1,6 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
 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
@@ -11,6 +12,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_UnknownBody {
+.mx_RedactedBody {
     white-space: pre-wrap;
+    color: $muted-fg-color;
+
+    padding-left: 16px;
+    position: relative;
+
+    &::before {
+        height: 14px;
+        width: 14px;
+        background-color: $muted-fg-color;
+        mask-image: url('$(res)/img/feather-customised/trash (custom).svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        content: '';
+        position: absolute;
+        top: 2px;
+        left: 0;
+    }
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0dc60226b8..3f5f039005 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -242,34 +242,6 @@ limitations under the License.
     color: $event-notsent-color;
 }
 
-.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody,
-.mx_EventTile_redacted .mx_EventTile_reply .mx_UnknownBody {
-    --lozenge-color: $event-redacted-fg-color;
-    --lozenge-border-color: $event-redacted-border-color;
-    display: block;
-    height: 22px;
-    width: 250px;
-    border-radius: 11px;
-    background:
-        repeating-linear-gradient(
-            -45deg,
-            var(--lozenge-color),
-            var(--lozenge-color) 3px,
-            transparent 3px,
-            transparent 6px
-        );
-    box-shadow: 0px 0px 3px var(--lozenge-border-color) inset;
-}
-
-.mx_EventTile_sending.mx_EventTile_redacted .mx_UnknownBody {
-    opacity: 0.4;
-}
-
-div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
-    --lozenge-color: $event-notsent-color;
-    --lozenge-border-color: $event-notsent-color;
-}
-
 .mx_EventTile_contextual {
     opacity: 0.4;
 }
diff --git a/res/img/feather-customised/trash (custom).svg b/res/img/feather-customised/trash (custom).svg
new file mode 100644
index 0000000000..dc1985ddb2
--- /dev/null
+++ b/res/img/feather-customised/trash (custom).svg	
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.25 5.5H5.16667H21.75" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.5 5.5L15 1H9L7.5 5.5" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.25 9.25V20.75C5.25 21.8546 6.14543 22.75 7.25 22.75H16.75C17.8546 22.75 18.75 21.8546 18.75 20.75V9.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.75 9.25V18.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.25 9.25V18.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 679a8f7471..e0ca23d244 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -26,6 +26,7 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
+import RedactedBody from "./RedactedBody";
 
 function getReplacedContent(event) {
     const originalContent = event.getOriginalContent();
@@ -132,8 +133,7 @@ export default class EditHistoryMessage extends React.PureComponent {
         const content = getReplacedContent(mxEvent);
         let contentContainer;
         if (mxEvent.isRedacted()) {
-            const UnknownBody = sdk.getComponent('messages.UnknownBody');
-            contentContainer = <UnknownBody mxEvent={this.props.mxEvent} />;
+            contentContainer = <RedactedBody mxEvent={this.props.mxEvent} />;
         } else {
             let contentElements;
             if (this.props.previousEdit) {
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index beba986104..f8bd23cbe3 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -20,6 +20,7 @@ import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
+import RedactedBody from "./RedactedBody";
 
 export default createReactClass({
     displayName: 'MessageEvent',
@@ -61,8 +62,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const UnknownBody = sdk.getComponent('messages.UnknownBody');
-
         const bodyTypes = {
             'm.text': sdk.getComponent('messages.TextualBody'),
             'm.notice': sdk.getComponent('messages.TextualBody'),
@@ -79,7 +78,7 @@ export default createReactClass({
         const content = this.props.mxEvent.getContent();
         const type = this.props.mxEvent.getType();
         const msgtype = content.msgtype;
-        let BodyType = UnknownBody;
+        let BodyType = RedactedBody;
         if (!this.props.mxEvent.isRedacted()) {
             // only resolve BodyType if event is not redacted
             if (type && evTypes[type]) {
diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
new file mode 100644
index 0000000000..f219e3bd91
--- /dev/null
+++ b/src/components/views/messages/RedactedBody.tsx
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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, {useContext} from "react";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { _t } from "../../../languageHandler";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
+
+const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
+    const cli: MatrixClient = useContext(MatrixClientContext);
+
+    let text = _t("Message deleted");
+    const redactedBecauseUserId = mxEvent.getUnsigned().redacted_because.sender;
+    if (redactedBecauseUserId !== cli.getUserId()) {
+        const room = cli.getRoom(mxEvent.getRoomId());
+        const sender = room && room.getMember(redactedBecauseUserId);
+        text = _t("Message deleted by %(user)s", { user: sender.name || redactedBecauseUserId });
+    }
+
+    return (
+        <span className="mx_RedactedBody" ref={ref}>
+            { text }
+        </span>
+    );
+});
+
+export default RedactedBody;
diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.js
deleted file mode 100644
index 2a19f324e8..0000000000
--- a/src/components/views/messages/UnknownBody.js
+++ /dev/null
@@ -1,40 +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.
-*/
-
-import React from 'react';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    displayName: 'UnknownBody',
-
-    render: function() {
-        let tooltip = _t("Removed or unknown message type");
-        if (this.props.mxEvent.isRedacted()) {
-            const redactedBecauseUserId = this.props.mxEvent.getUnsigned().redacted_because.sender;
-            tooltip = redactedBecauseUserId ?
-                _t("Message removed by %(userId)s", { userId: redactedBecauseUserId }) :
-                _t("Message removed");
-        }
-
-        const text = this.props.mxEvent.getContent().body;
-        return (
-            <span className="mx_UnknownBody" title={tooltip}>
-                { text }
-            </span>
-        );
-    },
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3eac055054..356e80afcf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1328,6 +1328,8 @@
     "Reactions": "Reactions",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
+    "Message deleted": "Message deleted",
+    "Message deleted by %(user)s": "Message deleted by %(user)s",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
@@ -1341,9 +1343,6 @@
     "edited": "edited",
     "Can't load this message": "Can't load this message",
     "Submit logs": "Submit logs",
-    "Removed or unknown message type": "Removed or unknown message type",
-    "Message removed by %(userId)s": "Message removed by %(userId)s",
-    "Message removed": "Message removed",
     "Failed to load group members": "Failed to load group members",
     "Filter community members": "Filter community members",
     "Invite to this community": "Invite to this community",

From d3b0e008c1b80acecd537c728c20cb9894d9f550 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 24 Apr 2020 15:39:23 +0100
Subject: [PATCH 2440/3235] first draft of Redaction ELS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/messages/_RedactedBody.scss     |   1 +
 src/components/structures/MessagePanel.js     | 100 +++++++++++++++++-
 .../elements/RedactionEventListSummary.tsx    |  81 ++++++++++++++
 .../views/messages/RedactedBody.tsx           |   2 +-
 src/i18n/strings/en_EN.json                   |   4 +-
 5 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 src/components/views/elements/RedactionEventListSummary.tsx

diff --git a/res/css/views/messages/_RedactedBody.scss b/res/css/views/messages/_RedactedBody.scss
index c0001db5d3..c0e5be2c89 100644
--- a/res/css/views/messages/_RedactedBody.scss
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -15,6 +15,7 @@ limitations under the License.
 .mx_RedactedBody {
     white-space: pre-wrap;
     color: $muted-fg-color;
+    vertical-align: middle;
 
     padding-left: 16px;
     position: relative;
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6fbfdb504b..30c139d440 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -29,6 +29,7 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
+import RedactionEventListSummary from "../views/elements/RedactionEventListSummary";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -1062,5 +1063,102 @@ class MemberGrouper {
     }
 }
 
+// Wrap consecutive redactions by the same user in a ListSummary, ignore if redacted
+class RedactionGrouper {
+    static canStartGroup = function(panel, ev) {
+        return panel._shouldShowEvent(ev) && ev.isRedacted();
+    }
+
+    constructor(panel, ev, prevEvent, lastShownEvent) {
+        this.panel = panel;
+        this.readMarker = panel._readMarkerForEvent(
+            ev.getId(),
+            ev === lastShownEvent,
+        );
+        this.events = [ev];
+        this.prevEvent = prevEvent;
+        this.lastShownEvent = lastShownEvent;
+    }
+
+    shouldGroup(ev) {
+        if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) return false;
+        if (ev.getType() === "m.room.redaction") return true; // for show-hidden-events users
+        return ev.isRedacted() && ev.sender === this.events[0].sender &&
+            ev.getUnsigned().redacted_because.sender === this.events[0].getUnsigned().redacted_because.sender;
+    }
+
+    add(ev) {
+        if (ev.getType() === "m.room.redaction") return; // for show-hidden-events users
+        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+            ev.getId(),
+            ev === this.lastShownEvent,
+        );
+        this.events.push(ev);
+    }
+
+    getTiles() {
+        // If we don't have any events to group, don't even try to group them. The logic
+        // below assumes that we have a group of events to deal with, but we might not if
+        // the events we were supposed to group were redacted.
+        if (!this.events || !this.events.length) return [];
+
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+
+        const panel = this.panel;
+        const lastShownEvent = this.lastShownEvent;
+        const ret = [];
+
+        if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
+            const ts = this.events[0].getTs();
+            ret.push(
+                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>,
+            );
+        }
+
+        // Ensure that the key of the MemberEventListSummary does not change with new
+        // member events. This will prevent it from being re-created unnecessarily, and
+        // instead will allow new props to be provided. In turn, the shouldComponentUpdate
+        // method on ELS can be used to prevent unnecessary renderings.
+        const key = "redactioneventlistsummary-" + (this.prevEvent ? this.events[0].getId() : "initial");
+
+        let highlightInMels = false;
+        let eventTiles = this.events.map((e) => {
+            if (e.getId() === panel.props.highlightedEventId) {
+                highlightInMels = true;
+            }
+            // In order to prevent DateSeparators from appearing in the expanded form
+            // of MemberEventListSummary, render each member event as if the previous
+            // one was itself. This way, the timestamp of the previous event === the
+            // timestamp of the current event, and no DateSeparator is inserted.
+            return panel._getTilesForEvent(e, e, e === lastShownEvent);
+        }).reduce((a, b) => a.concat(b), []);
+
+        if (eventTiles.length === 0) {
+            eventTiles = null;
+        }
+
+        ret.push(
+            <RedactionEventListSummary
+                key={key}
+                events={this.events}
+                onToggle={panel._onHeightChanged} // Update scroll state
+                startExpanded={highlightInMels}
+            >
+                 { eventTiles }
+            </RedactionEventListSummary>,
+        );
+
+        if (this.readMarker) {
+            ret.push(this.readMarker);
+        }
+
+        return ret;
+    }
+
+    getNewPrevEvent() {
+        return this.events[0];
+    }
+}
+
 // all the grouper classes that we use
-const groupers = [CreationGrouper, MemberGrouper];
+const groupers = [CreationGrouper, MemberGrouper, RedactionGrouper];
diff --git a/src/components/views/elements/RedactionEventListSummary.tsx b/src/components/views/elements/RedactionEventListSummary.tsx
new file mode 100644
index 0000000000..55538ca236
--- /dev/null
+++ b/src/components/views/elements/RedactionEventListSummary.tsx
@@ -0,0 +1,81 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {MatrixClient} from "matrix-js-sdk/src/client";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+
+import { _t } from "../../../languageHandler";
+import * as sdk from "../../../index";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+
+interface IProps {
+    // An array of member events to summarise
+    events: MatrixEvent[];
+    // An array of EventTiles to render when expanded
+    children: React.ReactChildren;
+    // The minimum number of events needed to trigger summarisation
+    threshold?: number;
+    // Called when the ELS expansion is toggled
+    onToggle: () => void;
+    // Whether or not to begin with state.expanded=true
+    startExpanded?: boolean;
+}
+
+export default class RedactionEventListSummary extends React.Component<IProps> {
+    static displayName = "RedactionEventListSummary";
+
+    static defaultProps = {
+        threshold: 2,
+    };
+
+    static contextType = MatrixClientContext;
+
+    shouldComponentUpdate(nextProps) {
+        // Update if
+        //  - The number of summarised events has changed
+        //  - or if the summary is about to toggle to become collapsed
+        //  - or if there are fewEvents, meaning the child eventTiles are shown as-is
+        return (
+            nextProps.events.length !== this.props.events.length ||
+            nextProps.events.length < this.props.threshold
+        );
+    }
+
+    render() {
+        const count = this.props.events.length;
+        const redactionSender = this.props.events[0].getUnsigned().redacted_because.sender;
+
+        let avatarMember = this.props.events[0].sender;
+        let summaryText = _t("%(count)s messages deleted", { count });
+        if (redactionSender !== this.context.getUserId()) {
+            const room = (this.context as MatrixClient).getRoom(redactionSender || this.props.events[0].getSender());
+            avatarMember = room && room.getMember(redactionSender);
+            const name = avatarMember ? avatarMember.name : redactionSender;
+            summaryText = _t("%(count)s messages deleted by %(name)s", { count, name });
+        }
+
+        const EventListSummary = sdk.getComponent("views.elements.EventListSummary");
+        return <EventListSummary
+            events={this.props.events}
+            threshold={this.props.threshold}
+            onToggle={this.props.onToggle}
+            startExpanded={this.props.startExpanded}
+            children={this.props.children}
+            summaryMembers={[avatarMember]}
+            summaryText={summaryText} />;
+    }
+}
diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
index f219e3bd91..654f1622b1 100644
--- a/src/components/views/messages/RedactedBody.tsx
+++ b/src/components/views/messages/RedactedBody.tsx
@@ -32,7 +32,7 @@ const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
     if (redactedBecauseUserId !== cli.getUserId()) {
         const room = cli.getRoom(mxEvent.getRoomId());
         const sender = room && room.getMember(redactedBecauseUserId);
-        text = _t("Message deleted by %(user)s", { user: sender.name || redactedBecauseUserId });
+        text = _t("Message deleted by %(name)s", { name: sender ? sender.name : redactedBecauseUserId });
     }
 
     return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 356e80afcf..53818d4747 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1329,7 +1329,7 @@
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
     "Message deleted": "Message deleted",
-    "Message deleted by %(user)s": "Message deleted by %(user)s",
+    "Message deleted by %(name)s": "Message deleted by %(name)s",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
@@ -1487,6 +1487,8 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
     "Power level": "Power level",
     "Custom level": "Custom level",
+    "%(count)s messages deleted|other": "%(count)s messages deleted",
+    "%(count)s messages deleted by %(name)s|other": "%(count)s messages deleted by %(name)s",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
     "Room alias": "Room alias",

From bbce37b92f8c1684e0427d6afa096e58e9e9061d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 15:39:54 +0100
Subject: [PATCH 2441/3235] Make icon change in SetupEncryptionDialog

Fixes https://github.com/vector-im/riot-web/issues/13368
---
 .../views/dialogs/SetupEncryptionDialog.js    | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
index f32a289a29..71b7574551 100644
--- a/src/components/views/dialogs/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -14,16 +14,49 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
+import PropTypes from 'prop-types';
 import SetupEncryptionBody from '../../structures/auth/SetupEncryptionBody';
 import BaseDialog from './BaseDialog';
 import { _t } from '../../../languageHandler';
+import { SetupEncryptionStore, PHASE_DONE } from '../../../stores/SetupEncryptionStore';
 
-export default function SetupEncryptionDialog({onFinished}) {
-    return <BaseDialog
-        headerImage={require("../../../../res/img/e2e/warning.svg")}
-        onFinished={onFinished}
-        title={_t("Verify this session")}
-    >
-        <SetupEncryptionBody onFinished={onFinished} />
-    </BaseDialog>;
+function iconFromPhase(phase) {
+    if (phase === PHASE_DONE) {
+        return require("../../../../res/img/e2e/verified.svg");
+    } else {
+        return require("../../../../res/img/e2e/warning.svg");
+    }
+}
+
+export default class SetupEncryptionDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+
+        this.store = SetupEncryptionStore.sharedInstance();
+        this.store.on("update", this._onStoreUpdate);
+        this.state = {icon: iconFromPhase(this.store.phase)};
+    }
+
+    componentWillUnmount() {
+        this.store.removeListener("update", this._onStoreUpdate);
+    }
+
+    _onStoreUpdate = () => {
+        this.setState({icon: iconFromPhase(this.store.phase)});
+    };
+
+    render() {
+        return <BaseDialog
+            headerImage={this.state.icon}
+            onFinished={this.props.onFinished}
+            title={_t("Verify this session")}
+        >
+            <SetupEncryptionBody onFinished={this.props.onFinished} />
+        </BaseDialog>;
+    }
 }

From a1e174d8b89b79c35e1d5f705194476841bdb907 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 15:58:28 +0100
Subject: [PATCH 2442/3235] Fix incorrect toast if security setup skipped

DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4ec2ec0fa0..41f249b335 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -66,6 +66,9 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('sync', this._onSync);
         }
         this._dismissed.clear();
+        this._dismissedThisDeviceToast = false;
+        this._keyBackupInfo = null;
+        this._keyBackupFetchedAt = null;
     }
 
     dismissVerification(deviceId) {
@@ -146,6 +149,8 @@ export default class DeviceListener {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
             if (!crossSigningReady) {
+                // make sure our keys are finished downlaoding
+                await cli.downloadKeys([cli.getUserId()]);
                 // cross signing isn't enabled - nag to enable it
                 // There are 3 different toasts for:
                 if (cli.getStoredCrossSigningForUser(cli.getUserId())) {

From 117322b3b5e60a1f74298d71bdb9561e7a6a76e1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Apr 2020 10:01:00 -0600
Subject: [PATCH 2443/3235] Remove invite only padlocks feature flag

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

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
---
 src/components/views/rooms/InviteOnlyIcon.js | 5 -----
 src/i18n/strings/en_EN.json                  | 1 -
 src/settings/Settings.js                     | 6 ------
 3 files changed, 12 deletions(-)

diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
index acaa12303b..b02f9843d9 100644
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import SettingsStore from '../../../settings/SettingsStore';
 
 export default class InviteOnlyIcon extends React.Component {
     constructor() {
@@ -39,10 +38,6 @@ export default class InviteOnlyIcon extends React.Component {
     render() {
         const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
 
-        if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
-            return null;
-        }
-
         const Tooltip = sdk.getComponent("elements.Tooltip");
         let tooltip;
         if (this.state.hover) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3eac055054..bd4c8f58c8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -404,7 +404,6 @@
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 928b1985fa..5c6d843349 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -158,12 +158,6 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "feature_invite_only_padlocks": {
-        isFeature: true,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Show padlocks on invite only rooms"),
-        default: true,
-    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From 353810ce633cf5c00c996112f8942cf356af2793 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Apr 2020 10:01:00 -0600
Subject: [PATCH 2444/3235] Remove invite only padlocks feature flag

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

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
---
 src/components/views/rooms/InviteOnlyIcon.js | 5 -----
 src/i18n/strings/en_EN.json                  | 1 -
 src/settings/Settings.js                     | 6 ------
 3 files changed, 12 deletions(-)

diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
index acaa12303b..b02f9843d9 100644
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ b/src/components/views/rooms/InviteOnlyIcon.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import SettingsStore from '../../../settings/SettingsStore';
 
 export default class InviteOnlyIcon extends React.Component {
     constructor() {
@@ -39,10 +38,6 @@ export default class InviteOnlyIcon extends React.Component {
     render() {
         const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
 
-        if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
-            return null;
-        }
-
         const Tooltip = sdk.getComponent("elements.Tooltip");
         let tooltip;
         if (this.state.hover) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c141931dd7..ce39731808 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -401,7 +401,6 @@
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index d7374718d3..b85461de55 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -164,12 +164,6 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "feature_invite_only_padlocks": {
-        isFeature: true,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Show padlocks on invite only rooms"),
-        default: true,
-    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),

From d550f6c564fa0a201d2f344b3a8fbc78fd788e75 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 15:58:28 +0100
Subject: [PATCH 2445/3235] Fix incorrect toast if security setup skipped

DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 4ec2ec0fa0..41f249b335 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -66,6 +66,9 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('sync', this._onSync);
         }
         this._dismissed.clear();
+        this._dismissedThisDeviceToast = false;
+        this._keyBackupInfo = null;
+        this._keyBackupFetchedAt = null;
     }
 
     dismissVerification(deviceId) {
@@ -146,6 +149,8 @@ export default class DeviceListener {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
             if (!crossSigningReady) {
+                // make sure our keys are finished downlaoding
+                await cli.downloadKeys([cli.getUserId()]);
                 // cross signing isn't enabled - nag to enable it
                 // There are 3 different toasts for:
                 if (cli.getStoredCrossSigningForUser(cli.getUserId())) {

From 6460f6303cb63644a262e16384e06888a4dd3e06 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 17:36:02 +0100
Subject: [PATCH 2446/3235] Move store subscribe to didmount

---
 src/components/views/dialogs/SetupEncryptionDialog.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
index 71b7574551..d7723de588 100644
--- a/src/components/views/dialogs/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -38,10 +38,13 @@ export default class SetupEncryptionDialog extends React.Component {
         super();
 
         this.store = SetupEncryptionStore.sharedInstance();
-        this.store.on("update", this._onStoreUpdate);
         this.state = {icon: iconFromPhase(this.store.phase)};
     }
 
+    componentDidMount() {
+        this.store.on("update", this._onStoreUpdate);
+    }
+
     componentWillUnmount() {
         this.store.removeListener("update", this._onStoreUpdate);
     }

From c684898ba038f96afe313e7bf3accf0c813784d1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 15:39:54 +0100
Subject: [PATCH 2447/3235] Make icon change in SetupEncryptionDialog

Fixes https://github.com/vector-im/riot-web/issues/13368
---
 .../views/dialogs/SetupEncryptionDialog.js    | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
index f32a289a29..71b7574551 100644
--- a/src/components/views/dialogs/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -14,16 +14,49 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
+import PropTypes from 'prop-types';
 import SetupEncryptionBody from '../../structures/auth/SetupEncryptionBody';
 import BaseDialog from './BaseDialog';
 import { _t } from '../../../languageHandler';
+import { SetupEncryptionStore, PHASE_DONE } from '../../../stores/SetupEncryptionStore';
 
-export default function SetupEncryptionDialog({onFinished}) {
-    return <BaseDialog
-        headerImage={require("../../../../res/img/e2e/warning.svg")}
-        onFinished={onFinished}
-        title={_t("Verify this session")}
-    >
-        <SetupEncryptionBody onFinished={onFinished} />
-    </BaseDialog>;
+function iconFromPhase(phase) {
+    if (phase === PHASE_DONE) {
+        return require("../../../../res/img/e2e/verified.svg");
+    } else {
+        return require("../../../../res/img/e2e/warning.svg");
+    }
+}
+
+export default class SetupEncryptionDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    constructor() {
+        super();
+
+        this.store = SetupEncryptionStore.sharedInstance();
+        this.store.on("update", this._onStoreUpdate);
+        this.state = {icon: iconFromPhase(this.store.phase)};
+    }
+
+    componentWillUnmount() {
+        this.store.removeListener("update", this._onStoreUpdate);
+    }
+
+    _onStoreUpdate = () => {
+        this.setState({icon: iconFromPhase(this.store.phase)});
+    };
+
+    render() {
+        return <BaseDialog
+            headerImage={this.state.icon}
+            onFinished={this.props.onFinished}
+            title={_t("Verify this session")}
+        >
+            <SetupEncryptionBody onFinished={this.props.onFinished} />
+        </BaseDialog>;
+    }
 }

From b3fac7c2cb9aa9273d3896b38c973928fccae0ec Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Apr 2020 17:36:02 +0100
Subject: [PATCH 2448/3235] Move store subscribe to didmount

---
 src/components/views/dialogs/SetupEncryptionDialog.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
index 71b7574551..d7723de588 100644
--- a/src/components/views/dialogs/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -38,10 +38,13 @@ export default class SetupEncryptionDialog extends React.Component {
         super();
 
         this.store = SetupEncryptionStore.sharedInstance();
-        this.store.on("update", this._onStoreUpdate);
         this.state = {icon: iconFromPhase(this.store.phase)};
     }
 
+    componentDidMount() {
+        this.store.on("update", this._onStoreUpdate);
+    }
+
     componentWillUnmount() {
         this.store.removeListener("update", this._onStoreUpdate);
     }

From 5f3e3b3ec20603fa94828b64f47eb49681490c1c Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 25 Apr 2020 01:09:07 +0200
Subject: [PATCH 2449/3235] Extracted context menu from TagTile to DNDTagTile

---
 src/components/views/elements/DNDTagTile.js | 91 ++++++++++++++++-----
 src/components/views/elements/TagTile.js    | 60 ++++++--------
 2 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 7aa642986b..3ef805992e 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -17,29 +17,76 @@ limitations under the License.
 
 import TagTile from './TagTile';
 
-import React from 'react';
+import React, {createRef} from 'react';
 import { Draggable } from 'react-beautiful-dnd';
+import {ContextMenu, toRightOf} from "../../structures/ContextMenu";
+import * as sdk from '../../../index';
 
-export default function DNDTagTile(props) {
-    return <div>
-        <Draggable
-            key={props.tag}
-            draggableId={props.tag}
-            index={props.index}
-            type="draggable-TagTile"
-        >
-            { (provided, snapshot) => (
-                <div>
-                    <div
-                        ref={provided.innerRef}
-                        {...provided.draggableProps}
-                        {...provided.dragHandleProps}
-                    >
-                        <TagTile {...props} />
+export default class DNDTagTile extends React.Component {
+    constructor() {
+        super();
+        this.state = {
+            menuDisplayed: false,
+        };
+
+        this.openMenu = this.openMenu.bind(this);
+        this.closeMenu = this.closeMenu.bind(this);
+    }
+
+    componentDidMount() {
+        this._contextMenuButton = createRef();
+    }
+
+    openMenu() {
+        this.setState({
+            menuDisplayed: true,
+        });
+    }
+
+    closeMenu() {
+        console.log("Closig menu");
+        this.setState({
+            menuDisplayed: false,
+        });
+    }
+
+    getContextMenu() {
+        const elementRect = this._contextMenuButton.current.getBoundingClientRect();
+        const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
+        return (
+            <ContextMenu {...toRightOf(elementRect)} onFinished={this.closeMenu}>
+                <TagTileContextMenu tag={this.props.tag} onFinished={this.closeMenu} />
+            </ContextMenu>
+        );
+    }
+
+    render(props) {
+        return <div>
+            <Draggable
+                key={this.props.tag}
+                draggableId={this.props.tag}
+                index={this.props.index}
+                type="draggable-TagTile"
+            >
+                { (provided, snapshot) => (
+                    <div>
+                        <div
+                            ref={provided.innerRef}
+                            {...provided.draggableProps}
+                            {...provided.dragHandleProps}
+                        >
+                           <TagTile
+                            {...this.props}
+                               contextMenuButtonRef= {this._contextMenuButton}
+                               menuDisplayed={this.state.menuDisplayed}
+                               openMenu={this.openMenu}
+                            />
+                        </div>
+                        { provided.placeholder }
                     </div>
-                    { provided.placeholder }
-                </div>
-            ) }
-        </Draggable>
-    </div>;
+                ) }
+            </Draggable>
+                    {this.state.menuDisplayed && this.getContextMenu()}
+        </div>;
+    }
 }
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 2f182c261e..023d9cca93 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
@@ -28,7 +28,6 @@ import * as FormattingUtils from '../../../utils/FormattingUtils';
 import FlairStore from '../../../stores/FlairStore';
 import GroupStore from '../../../stores/GroupStore';
 import TagOrderStore from '../../../stores/TagOrderStore';
-import {ContextMenu, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents
@@ -43,6 +42,9 @@ export default createReactClass({
         // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
         // For now, only group IDs are handled.
         tag: PropTypes.string,
+        contextMenuButtonRef: PropTypes.object,
+        openMenu: PropTypes.func,
+        menuDisplayed: PropTypes.bool,
     },
 
     statics: {
@@ -55,14 +57,10 @@ export default createReactClass({
             hover: false,
             // The profile data of the group if this.props.tag is a group ID
             profile: null,
-            // Whether or not the context menu is open
-            menuDisplayed: false,
         };
     },
 
     componentDidMount() {
-        this._contextMenuButton = createRef();
-
         this.unmounted = false;
         if (this.props.tag[0] === '+') {
             FlairStore.addListener('updateGroupProfile', this._onFlairStoreUpdated);
@@ -124,17 +122,8 @@ export default createReactClass({
         // Prevent the TagTile onClick event firing as well
         e.stopPropagation();
         e.preventDefault();
-
-        this.setState({
-            menuDisplayed: true,
-            hover: false,
-        });
-    },
-
-    closeMenu: function() {
-        this.setState({
-            menuDisplayed: false,
-        });
+        this.setState({hover: false});
+        this.props.openMenu();
     },
 
     render: function() {
@@ -163,26 +152,25 @@ export default createReactClass({
         }
 
         // FIXME: this ought to use AccessibleButton for a11y but that causes onMouseOut/onMouseOver to fire too much
-        const contextButton = this.state.hover || this.state.menuDisplayed ?
-            <div className="mx_TagTile_context_button" onClick={this.openMenu} ref={this._contextMenuButton}>
+        const contextButton = this.state.hover || this.props.menuDisplayed ?
+            <div className="mx_TagTile_context_button" onClick={this.openMenu} ref={this.props.contextMenuButtonRef}>
                 { "\u00B7\u00B7\u00B7" }
-            </div> : <div ref={this._contextMenuButton} />;
-
-        let contextMenu;
-        if (this.state.menuDisplayed) {
-            const elementRect = this._contextMenuButton.current.getBoundingClientRect();
-            const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
-            contextMenu = (
-                <ContextMenu {...toRightOf(elementRect)} onFinished={this.closeMenu}>
-                    <TagTileContextMenu tag={this.props.tag} onFinished={this.closeMenu} />
-                </ContextMenu>
-            );
-        }
+            </div> : <div ref={this.props.contextMenuButtonRef} />;
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
-        return <React.Fragment>
-            <AccessibleTooltipButton className={className} onClick={this.onClick} onContextMenu={this.openMenu} title={name}>
-                <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
+
+        return <div>
+            <AccessibleTooltipButton
+                className={className}
+                onClick={this.onClick}
+                onContextMenu={this.openMenu}
+                title={name}
+            >
+                <div
+                    className="mx_TagTile_avatar"
+                    onMouseOver={this.onMouseOver}
+                    onMouseOut={this.onMouseOut}
+                >
                     <BaseAvatar
                         name={name}
                         idName={this.props.tag}
@@ -194,8 +182,6 @@ export default createReactClass({
                     { badgeElement }
                 </div>
             </AccessibleTooltipButton>
-
-            { contextMenu }
-        </React.Fragment>;
+        </div>;
     },
 });

From d690d4bed2cb1562fface956ed0c4e34e4e35c54 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Tue, 21 Apr 2020 01:19:39 +0300
Subject: [PATCH 2450/3235] Prevent PersistedElements overflowing scrolled
 areas

As the DOM element is not in reality contained inside "the parent",
it may overflow the area if the parent gets partially hidden by
scrolling etc.

To make the effect visually less annoying, emulate this by clipping to
the element wrapper. This is not a full general-purpose fix, but
improves the current situation.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---
 res/css/views/rooms/_AppsDrawer.scss          |  4 ++
 .../views/elements/PersistedElement.js        | 58 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 1b1bab67bc..e4743f189e 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -96,6 +96,10 @@ $AppsDrawerBodyHeight: 273px;
     height: $AppsDrawerBodyHeight;
 }
 
+.mx_AppTile_persistedWrapper > div {
+    height: 100%;
+}
+
 .mx_AppTile_mini .mx_AppTile_persistedWrapper {
     height: 114px;
 }
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 53f2501f19..18fa2aafef 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -156,16 +156,70 @@ export default class PersistedElement extends React.Component {
         child.style.display = visible ? 'block' : 'none';
     }
 
+    /*
+     * Clip element bounding rectangle to that of the parent elements.
+     * This is not a full visibility check, but prevents the persisted
+     * element from overflowing parent containers when inside a scrolled
+     * area.
+     */
+    _getClippedBoundingClientRect(element) {
+        let parentElement = element.parentElement;
+        let rect = element.getBoundingClientRect();
+
+        rect = new DOMRect(rect.left, rect.top, rect.width, rect.height);
+
+        while (parentElement) {
+            const parentRect = parentElement.getBoundingClientRect();
+
+            if (parentRect.left > rect.left) {
+                rect.width = rect.width - (parentRect.left - rect.left);
+                rect.x = parentRect.x;
+            }
+
+            if (parentRect.top > rect.top) {
+                rect.height = rect.height - (parentRect.top - rect.top);
+                rect.y = parentRect.y;
+            }
+
+            if (parentRect.right < rect.right) {
+                rect.width = rect.width - (rect.right - parentRect.right);
+            }
+
+            if (parentRect.bottom < rect.bottom) {
+                rect.height = rect.height - (rect.bottom - parentRect.bottom);
+            }
+
+            parentElement = parentElement.parentElement;
+        }
+
+        if (rect.width < 0) rect.width = 0;
+        if (rect.height < 0) rect.height = 0;
+
+        return rect;
+    }
+
     updateChildPosition(child, parent) {
         if (!child || !parent) return;
 
         const parentRect = parent.getBoundingClientRect();
+        const clipRect = this._getClippedBoundingClientRect(parent);
+
+        Object.assign(child.parentElement.style, {
+            position: 'absolute',
+            top: clipRect.top + 'px',
+            left: clipRect.left + 'px',
+            width: clipRect.width + 'px',
+            height: clipRect.height + 'px',
+            overflow: "hidden",
+        });
+
         Object.assign(child.style, {
             position: 'absolute',
-            top: parentRect.top + 'px',
-            left: parentRect.left + 'px',
+            top: (parentRect.top - clipRect.top) + 'px',
+            left: (parentRect.left - clipRect.left) + 'px',
             width: parentRect.width + 'px',
             height: parentRect.height + 'px',
+            overflow: "hidden",
         });
     }
 

From 4fc8fc9d6ce885f95050d333483e2bd45f284c73 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 26 Apr 2020 12:52:17 +0100
Subject: [PATCH 2451/3235] cap width of editable item list item to leave space
 for its X remove button

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

diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index ef60f006cc..f089fa3dc2 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -53,6 +53,9 @@ limitations under the License.
 .mx_EditableItem_item {
     flex: auto 1 0;
     order: 1;
+    width: calc(100% - 14px); // leave space for the remove button
+    overflow-x: hidden;
+    text-overflow: ellipsis;
 }
 
 .mx_EditableItemList_label {

From 98a949bed1aca4916f82bbbe615f90891d330b49 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 25 Apr 2020 01:09:07 +0200
Subject: [PATCH 2452/3235] Refactored DNDTagTile to use useContextMenu

Signed-off-by: Agusti Bau <agustibau@gmail.com>
---
 src/components/views/elements/DNDTagTile.js | 63 ++++++---------------
 1 file changed, 18 insertions(+), 45 deletions(-)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 3ef805992e..5a96f01d9f 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -17,55 +17,29 @@ limitations under the License.
 
 import TagTile from './TagTile';
 
-import React, {createRef} from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
-import {ContextMenu, toRightOf} from "../../structures/ContextMenu";
+import {ContextMenu, toRightOf, useContextMenu} from "../../structures/ContextMenu";
 import * as sdk from '../../../index';
 
-export default class DNDTagTile extends React.Component {
-    constructor() {
-        super();
-        this.state = {
-            menuDisplayed: false,
-        };
+export default function DNDTagTile(props) {
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
 
-        this.openMenu = this.openMenu.bind(this);
-        this.closeMenu = this.closeMenu.bind(this);
-    }
-
-    componentDidMount() {
-        this._contextMenuButton = createRef();
-    }
-
-    openMenu() {
-        this.setState({
-            menuDisplayed: true,
-        });
-    }
-
-    closeMenu() {
-        console.log("Closig menu");
-        this.setState({
-            menuDisplayed: false,
-        });
-    }
-
-    getContextMenu() {
-        const elementRect = this._contextMenuButton.current.getBoundingClientRect();
+    let contextMenu = null;
+    if (menuDisplayed && handle.current) {
+        const elementRect = handle.current.getBoundingClientRect();
         const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
-        return (
-            <ContextMenu {...toRightOf(elementRect)} onFinished={this.closeMenu}>
-                <TagTileContextMenu tag={this.props.tag} onFinished={this.closeMenu} />
+        contextMenu = (
+            <ContextMenu {...toRightOf(elementRect)} onFinished={closeMenu}>
+                <TagTileContextMenu tag={props.tag} onFinished={closeMenu} />
             </ContextMenu>
         );
     }
-
-    render(props) {
         return <div>
             <Draggable
-                key={this.props.tag}
-                draggableId={this.props.tag}
-                index={this.props.index}
+                key={props.tag}
+                draggableId={props.tag}
+                index={props.index}
                 type="draggable-TagTile"
             >
                 { (provided, snapshot) => (
@@ -76,17 +50,16 @@ export default class DNDTagTile extends React.Component {
                             {...provided.dragHandleProps}
                         >
                            <TagTile
-                            {...this.props}
-                               contextMenuButtonRef= {this._contextMenuButton}
-                               menuDisplayed={this.state.menuDisplayed}
-                               openMenu={this.openMenu}
+                            {...props}
+                               contextMenuButtonRef= {handle}
+                               menuDisplayed={menuDisplayed}
+                               openMenu={openMenu}
                             />
                         </div>
                         { provided.placeholder }
                     </div>
                 ) }
             </Draggable>
-                    {this.state.menuDisplayed && this.getContextMenu()}
+                    {contextMenu}
         </div>;
-    }
 }

From ba7b39dcc7cc891ddb0cd545adf997e995ba0d90 Mon Sep 17 00:00:00 2001
From: Txopi <txopi@ikusimakusi.eus>
Date: Sun, 26 Apr 2020 16:16:29 +0000
Subject: [PATCH 2453/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2294 of 2294 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 1a1abbd9a5..184f6293cc 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1353,7 +1353,7 @@
     "Want more than a community? <a>Get your own server</a>": "Komunitate bat baino gehiago nahi duzu? <a>Eskuratu zure zerbitzari propioa</a>",
     "Could not load user profile": "Ezin izan da erabiltzaile-profila kargatu",
     "You cannot modify widgets in this room.": "Ezin dituzu gela honetako trepetak aldatu.",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak %(targetDisplayName)s geñara elkartzeko gonbidapena errefusatu du.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak %(targetDisplayName)s gelara elkartzeko gonbidapena errefusatu du.",
     "Upgrade this room to the recommended room version": "Bertsio-berritu gela hau aholkatutako bertsiora",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Gela hau bertsio-berritzeak gelaren oraingo instantzia itzaliko du eta izen bereko beste gela berri bat sortuko du.",
     "Failed to revoke invite": "Gonbidapena indargabetzeak huts egin du",

From e02d06154546f4d9fee3dcc34dd9e321dd4b36e3 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 26 Apr 2020 16:54:22 +0000
Subject: [PATCH 2454/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2294 of 2294 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 | 48 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 184f6293cc..6548ea33d1 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1948,7 +1948,7 @@
     "Encryption upgraded": "Zifratzea eguneratuta",
     "Encryption setup complete": "Zifratzearen ezarpena egina",
     "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Saio ezezagunak daude gela honetan: egiaztatu gabe aurrera jarraitzen baduzu, baten batek zure deian kuxkuxeatu lezake.",
-    "Setting up keys": "Gakoak ezartzea",
+    "Setting up keys": "Gakoak ezartzen",
     "Verify this session": "Egiaztatu saio hau",
     "Encryption upgrade available": "Zifratze eguneratzea eskuragarri",
     "Unverified session": "Egiaztatu gabeko saioa",
@@ -1978,7 +1978,7 @@
     "Channel: %(channelName)s": "Kanala: %(channelName)s",
     "Show less": "Erakutsi gutxiago",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pasahitza aldatzean oraingo muturretik muturrerako zifratze gako guztiak ezeztatuko ditu saio guztietan, zifratutako txaten historiala ezin izango da irakurri ez badituzu aurretik zure geletako gakoak esportatzen eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Zure kontua zeharkako sinatze identitate bat du biltegi sekretuan, baina saio honek ez du oraindik fidagarritzat.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Zure kontuak zeharkako sinatze identitate bat du biltegi sekretuan, baina saio honek ez du oraindik fidagarritzat.",
     "in memory": "memorian",
     "Your homeserver does not support session management.": "Zure hasiera-zerbitzariak ez du saio kudeaketa onartzen.",
     "Unable to load session list": "Ezin izan da saioen zerrenda kargatu",
@@ -2343,5 +2343,47 @@
     "Create a Group Chat": "Sortu talde-txata",
     "Self-verification request": "Auto-egiaztaketa eskaria",
     "Delete sessions|other": "Ezabatu saioak",
-    "Delete sessions|one": "Ezabatu saioa"
+    "Delete sessions|one": "Ezabatu saioa",
+    "If you cancel now, you won't complete your operation.": "Orain ezeztatzen baduzu, ez duzu eragiketa burutuko.",
+    "Failed to set topic": "Ezin izan da mintzagaia ezarri",
+    "Command failed": "Aginduak huts egin du",
+    "Could not find user in room": "Ezin izan da erabiltzailea gelan aurkitu",
+    "Please supply a widget URL or embed code": "Eman trepetaren URLa edo txertatu kodea",
+    "Send a bug report with logs": "Bidali akats txostena egunkariekin",
+    "Enable cross-signing to verify per-user instead of per-session": "Gaitu zeharkako sinadura erabiltzaileko edo saioko egiaztatzeko",
+    "Keep recovery passphrase in memory for this session": "Mantendu berreskuratze pasa-esaldia memorian saio honentzat",
+    "Can't load this message": "Ezin izan da mezu hau kargatu",
+    "Submit logs": "Bidali egunkariak",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Oroigarria: Ez dugu zure nabigatzailearentzako euskarririk, ezin da zure esperientzia nolakoa izango den aurreikusi.",
+    "Unable to upload": "Ezin izan da igo",
+    "Verify other session": "Egiaztatu beste saioa",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze pasa-esaldi zuzena sartu duzula.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Abisua:</b>: Hau fidagarritzat jotzen duzun ordenagailu batetik egin beharko zenuke beti.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure berreskuratze pasa-esaldia sartuz.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Zure berreskuratze pasa-esaldia ahaztu baduzu <button1>berreskuratze-gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezin izan da babes-kopia deszifratu berreskuratze-gako honekin: egiaztatu berreskuratze-gako egokia sartu duzula.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Ezin izan da babes-kopia deszifratu berreskuratze pasa-esaldi honekin: egiaztatu berreskuratze berreskuratze pasa-esaldia ondo idatzi duzula.",
+    "Verify this login": "Egiaztatu saio hau",
+    "Syncing...": "Sinkronizatzen…",
+    "Signing In...": "Saioa hasten...",
+    "If you've joined lots of rooms, this might take a while": "Gela askotara elkartu bazara, honek denbora behar lezake",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Baieztatu zure identitatea saio hau zure beste saio batetik egiaztatuz, mezu zifratuetara sarbidea emanez.",
+    "This requires the latest Riot on your other devices:": "Honek zure beste gailuetan azken Riot bertsioa eskatzen du:",
+    "or another cross-signing capable Matrix client": "edo zeharkako sinadurarako gai den beste Matrix bezero bat",
+    "Use Recovery Passphrase or Key": "Erabili berreskuratze pasa-esaldia edo gakoa",
+    "Great! This recovery passphrase looks strong enough.": "Bikain! Berreskuratze pasa-esaldi hau sendoa dirudi.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Ezarri berreskuratze pasa-esaldia zifratutako informazioa babesteko eta, saioa amaitzekotan, berreskuratzeko. Hau ez luke zure kontuaren pasahitzaren berdina izan behar:",
+    "Enter a recovery passphrase": "Sartu berreskuratze pasa-esaldia",
+    "Back up encrypted message keys": "Egin zifratutako mezuen gakoen babes-kopia",
+    "Enter your recovery passphrase a second time to confirm it.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
+    "Confirm your recovery passphrase": "Berretsi berreskuratze pasa-esaldia",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Zure berreskuratze-gakoa badaezpadakoa da, pasa-esaldia ahazten baduzu zure zifratutako mezuak berreskuratzeko erabili dezakezu.",
+    "Unable to query secret storage status": "Ezin izan da biltegi sekretuaren egoera kontsultatu",
+    "Confirm recovery passphrase": "Berretsi berreskuratze pasa-esaldia",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Zure gakoen kopia zifratu bat gordeko dugu gure zerbitzarian. Babestu zure babes-kopia berreskuratze pasa-esaldi batekin.",
+    "Enter a recovery passphrase...": "Sartu berreskuratze pasa-esaldia...",
+    "Please enter your recovery passphrase a second time to confirm.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
+    "Repeat your recovery passphrase...": "Errepikatu zure berreskuratze pasa-esaldia...",
+    "Secure your backup with a recovery passphrase": "Babestu zure babeskopia berreskuratze pasa-esaldi batekin",
+    "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s"
 }

From 6de03f425d8806bbf264b018ff855db396abb995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Sat, 25 Apr 2020 11:08:28 +0000
Subject: [PATCH 2455/3235] Translated using Weblate (Czech)

Currently translated at 93.8% (2152 of 2294 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index a3314dd920..52c90cc3d7 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1406,7 +1406,7 @@
     "Error updating flair": "Nepovedlo se změnit příslušnost ke skupině",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pro tuto místnost se nepovedlo změnit příslušnost ke skupině. Možná to server neumožňuje, nebo došlo k dočasné chybě.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "Uživatel <reactors/><reactedWith>reagoval s %(shortName)s</reactedWith>",
-    "edited": "pozměněno",
+    "edited": "upraveno",
     "Maximize apps": "Maximalizovat aplikace",
     "Rotate Left": "Otočit doleva",
     "Rotate counter-clockwise": "Otočit proti směru hodinových ručiček",
@@ -1550,7 +1550,7 @@
     "Show advanced": "Zobrazit pokročilé možnosti",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Zamezit uživatelům jiných domovských serverů, aby do místnosti vstoupili (nelze později změnit!)",
     "Your homeserver doesn't seem to support this feature.": "Váš domovský server asi tuto funkci nepodporuje.",
-    "Message edits": "Editování zpráv",
+    "Message edits": "Úpravy zpráv",
     "Please fill why you're reporting.": "Vyplňte prosím co chcete nahlásit.",
     "Report Content to Your Homeserver Administrator": "Nahlásit obsah správci vašeho domovského serveru",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Nahlášení této zprávy pošle její jedinečné 'event ID' správci vašeho domovského serveru. Pokud jsou zprávy šifrované, správce nebude mít možnost přečíst text zprávy ani se podívat na soubory nebo obrázky.",
@@ -1645,7 +1645,7 @@
     "%(name)s wants to verify": "%(name)s chce ověřit",
     "You sent a verification request": "Poslali jste požadavek na ověření",
     "Show all": "Zobrazit vše",
-    "Edited at %(date)s. Click to view edits.": "Pozměněno v %(date)s. Klinutím zobrazíte změny.",
+    "Edited at %(date)s. Click to view edits.": "Upraveno v %(date)s. Klinutím zobrazíte změny.",
     "Frequently Used": "Často používané",
     "Smileys & People": "Obličeje & Lidé",
     "Animals & Nature": "Zvířata & Příroda",

From 2babe9cde2a6227cb8c89473b3f7fbb0a2e95c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sat, 25 Apr 2020 22:28:10 +0000
Subject: [PATCH 2456/3235] Translated using Weblate (Estonian)

Currently translated at 6.4% (146 of 2294 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 0967ef424b..5d60c1c5d9 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1 +1,148 @@
-{}
+{
+    "This email address is already in use": "See e-posti aadress on juba kasutusel",
+    "This phone number is already in use": "See telefoninumber on juba kasutusel",
+    "Confirm": "Kinnita",
+    "Add Email Address": "Lisa e-posti aadress",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-posti aadressi kontrollimine ei õnnestunud: palun vaata, et sa kindlasti klõpsisid saabunud kirjas olnud viidet",
+    "The platform you're on": "Sinu kasutatav arvutisüsteem",
+    "The version of Riot": "Riot'i versioon",
+    "Whether or not you're logged in (we don't record your username)": "Kas sa oled sisseloginud või  mitte (me ei salvesta sinu kasutajanime)",
+    "Your language of choice": "Sinu keelevalik",
+    "Your homeserver's URL": "Sinu koduserveri aadress",
+    "e.g. <CurrentPageURL>": "näiteks <CurrentPageURL>",
+    "Your user agent": "Sinu kasutajaagent",
+    "Your device resolution": "Sinu seadme resolutsioon",
+    "Analytics": "Analüütika",
+    "The information being sent to us to help make Riot better includes:": "Riot'i arendamiseks meile saadetava info hulgas on:",
+    "Error": "Viga",
+    "Unable to load! Check your network connectivity and try again.": "Laadimine ei õnnestunud! Kontrolli oma võrguühendust ja proovi uuesti.",
+    "Dismiss": "Loobu",
+    "Call Failed": "Kõne ebaõnnestus",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Selles jututoas on teadmata sessioone: kui sa jätkad ilma nende verifitseerimiseta, siis kolmas osapool võib kuulata seda kõnet pealt.",
+    "Review Sessions": "Vaata sessioonid üle",
+    "Call Anyway": "Helista ikkagi",
+    "Answer Anyway": "Vasta ikkagi",
+    "Call": "Helista",
+    "Answer": "Vasta",
+    "Call Timeout": "Kõne aegumine",
+    "The remote side failed to pick up": "Teine osapool ei võtnud kõnet vastu",
+    "Call failed due to misconfigured server": "Kõne ebaõnnestus valesti seadistatud serveri tõttu",
+    "Cancel": "Loobu",
+    "Send anyway": "Saada siiski",
+    "Send": "Saada",
+    "Jan": "jaan",
+    "Feb": "veeb",
+    "Mar": "mär",
+    "Apr": "apr",
+    "May": "mai",
+    "Jun": "jun",
+    "Jul": "jul",
+    "Aug": "aug",
+    "Sep": "sep",
+    "Oct": "okt",
+    "Nov": "nov",
+    "Dec": "dets",
+    "PM": "PL",
+    "AM": "EL",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Verify this session": "Verifitseeri see sessioon",
+    "Which rooms would you like to add to this community?": "Milliseid jututubasid sooviksid lisada siia kogukonda?",
+    "Show these rooms to non-members on the community page and room list?": "Kas näitan neid jututubasid kogukonna lehel ja tubade loendis mitte-liikmetele?",
+    "Add rooms to the community": "Lisa siia kogukonda jututubasid",
+    "Failed to add the following rooms to %(groupId)s:": "Järgnevate jututubade lisamine %(groupId)s kogukonda ebaõnnestus:",
+    "Changes your avatar in all rooms": "Muuda oma tunnuspilti kõikides jututubades",
+    "Ask this user to verify their session, or manually verify it below.": "Palu nimetatud kasutajal verifitseerida see sessioon või tee seda alljärgnevas käsitsi.",
+    "Manually Verify by Text": "Verifitseeri  käsitsi etteantud teksti abil",
+    "Interactively verify by Emoji": "Verifitseeri interaktiivselt Emoji abil",
+    "Enable big emoji in chat": "Kasuta vestlustes suuri emoji'sid",
+    "Order rooms by name": "Järjesta jututoad nime alusel",
+    "Show rooms with unread notifications first": "Järjesta lugemata teadetega jututoad esimesena",
+    "Show shortcuts to recently viewed rooms above the room list": "Näita viimati külastatud jututubade viiteid jututubade loendi kohal",
+    "Enable message search in encrypted rooms": "Võta kasutusele sõnumite otsing krüptitud jututubades",
+    "When rooms are upgraded": "Kui jututubasid uuendatakse",
+    "Verify this session by completing one of the following:": "Verifitseeri see sessioon täites ühe alljärgnevatest:",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifitseeri see kasutaja tehes kindlaks et järgnev emoji kuvatakse tema ekraanil.",
+    "Verify this session by confirming the following number appears on its screen.": "Verifitseeri see sessioon tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Riot'i kasutamisega seotud abiteabe otsimiseks klõpsi <a>seda viidet</a> või vajutades järgnevat nuppu alusta vestlust meie robotiga.",
+    "Chat with Riot Bot": "Vestle Riot'i robotiga",
+    "Start a chat": "Alusta vestlust",
+    "Invite to this room": "Kutsu siia jututuppa",
+    "Voice call": "Häälkõne",
+    "Video call": "Videokõne",
+    "Hangup": "Katkesta kõne",
+    "Upload file": "Lae fail üles",
+    "Send an encrypted reply…": "Saada krüptitud vastus…",
+    "Send a reply…": "Saada vastus…",
+    "Send an encrypted message…": "Saada krüptitud sõnum…",
+    "Send a message…": "Saada sõnum…",
+    "Send a reply (unencrypted)…": "Saada krüptimata vastus…",
+    "Send a message (unencrypted)…": "Saada krüpteerimata sõnum…",
+    "The conversation continues here.": "Vestlus jätkub siin.",
+    "Recent rooms": "Hiljutised jututoad",
+    "No rooms to show": "Ei saa kuvada ühtegi jututuba",
+    "Direct Messages": "Isiklikud sõnumid",
+    "Start chat": "Alusta vestlust",
+    "Rooms": "Jututoad",
+    "Do you want to chat with %(user)s?": "Kas sa soovid vestelda %(user)s'ga?",
+    "<userName/> wants to chat": "<userName/> soovib vestelda",
+    "All Rooms": "Kõik jututoad",
+    "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.": "Krüptitud jututubades, nagu see praegune, URL'ide eelvaated ei ole vaikimisi kasutusel. See tagab, et sinu koduserver (kus eelvaated luuakse) ei saaks koguda teavet viidete kohta, mida sa siin jututoas näed.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Krüptitud jututubades sinu sõnumid on turvatud ning vaid sinul ja sõnumi saajal on unikaalsed võtmed nende kuvamiseks.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Krüptitud jututubades turvalisuse tagamiseks verifitseeri kõik kasutajad.",
+    "Verification timed out.": "Verifitseerimine aegus.",
+    "You cancelled verification on your other session.": "Sina tühistasid verifitseerimise oma teises sessioonis.",
+    "%(displayName)s cancelled verification.": "%(displayName)s tühistas verifitseerimise.",
+    "You cancelled verification.": "Sina tühistasid verifitseerimise.",
+    "Verification cancelled": "Verifitseerimine tühistatud",
+    "Compare emoji": "Võrdle emoji'sid",
+    "Sunday": "Pühapäev",
+    "Monday": "Esmaspäev",
+    "Tuesday": "Teisipäev",
+    "Wednesday": "Kolmapäev",
+    "Thursday": "Neljapäev",
+    "Friday": "Reede",
+    "Saturday": "Laupäev",
+    "Today": "Täna",
+    "Yesterday": "Eile",
+    "View Source": "Vaata lähtekoodi",
+    "Encryption enabled": "Krüptimine on kasutusel",
+    "Add rooms to this community": "Lisa siia kogukonda jututubasid",
+    "Create new room": "Loo uus jututuba",
+    "Unblacklist": "Eemalda mustast nimekirjast",
+    "Blacklist": "Kanna musta nimekirja",
+    "Unverify": "Eemalda õigeks tunnistamine",
+    "Verify...": "Tunnista õigeks...",
+    "Join": "Liitu",
+    "No results": "Tulemusi pole",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Selle vea uurimiseks palun <newIssueLink>loo uus veateade</newIssueLink> meie GitHub'is.",
+    "collapse": "ahenda",
+    "expand": "laienda",
+    "Communities": "Kogukonnad",
+    "You cannot delete this image. (%(code)s)": "Sa ei saa seda pilti eemaldada, (%(code)s)",
+    "Uploaded on %(date)s by %(user)s": "Üles laetud %(date)s %(user)s poolt",
+    "Rotate Left": "Pööra vasakule",
+    "Rotate counter-clockwise": "Pööra vastupäeva",
+    "Rotate Right": "Pööra paremale",
+    "Rotate clockwise": "Pööra päripäeva",
+    "All rooms": "Kõik jututoad",
+    "Enter the name of a new server you want to explore.": "Sisesta uue serveri nimi mida tahad uurida.",
+    "Matrix rooms": "Matrix'i jututoad",
+    "Explore Room State": "Uuri jututoa olekut",
+    "Explore Account Data": "Uuri konto andmeid",
+    "Private Chat": "Privaatne vestlus",
+    "Public Chat": "Avalik vestlus",
+    "Other users can invite you to rooms using your contact details": "Teades sinu kontaktinfot võivad teised kutsuda sind osalema jututubades",
+    "Add rooms to the community summary": "Lisa jututoad kogukonna ülevaatesse",
+    "Which rooms would you like to add to this summary?": "Milliseid jututubasid sooviksid lisada sellesse ülevaatesse?",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Järgmiste jututubade lisamine %(groupId)s kogukonna ülevaatesse ebaõnnestus:",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Neid jututubasid kuvatakse kogukonna liikmetele kogukonna lehel. Liikmed saavad nimetatud jututubadega liituda neil klõpsides.",
+    "Featured Rooms:": "Esiletõstetud jututoad:",
+    "Explore Public Rooms": "Sirvi avalikke jututubasid",
+    "Explore": "Uuri",
+    "Filter rooms…": "Filtreeri jututubasid…",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Liites kokku kasutajaid ja jututubasid loo oma kogukond! Loo kogukonna koduleht, et märkida oma koht Matrix'i universumis.",
+    "Explore rooms": "Uuri jututubasid",
+    "If you've joined lots of rooms, this might take a while": "Kui oled liitunud paljude jututubadega, siis see võib natuke aega võtta",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Kui see seadistus pole kasutusel, siis krüptitud jututubade sõnumeid otsing ei vaata.",
+    "Indexed rooms:": "Indekseeritud jututoad:"
+}

From b0fa823c12fd28e596694ed3347b6f8b8d834d13 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Mon, 27 Apr 2020 08:04:35 +0000
Subject: [PATCH 2457/3235] Translated using Weblate (German)

Currently translated at 77.9% (1787 of 2294 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 | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ee38d2f324..e928282fa8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1795,7 +1795,7 @@
     "Single Sign On": "Single Sign-On",
     "Confirm adding email": "Bestätige das Hinzfugen der Email-Addresse",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnumer, indem du deine Identität mittels Single Sign-On nachweist.",
-    "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzfügen dieser Telefonnummer zu bestätigen.",
+    "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzufügen dieser Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
     "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
@@ -1838,5 +1838,22 @@
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Melde dich an um die ausschließlich in dieser Sitzung gespeicherten Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten in jeder Sitzung zu lesen.",
     "Forgotten your password?": "Passwort vergessen?",
     "You're signed out": "Du wurdest abgemeldet",
-    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Achtung: Deine persönlichen Daten (inclusive der Verschlüsselungsschlüssel) sind noch in dieser Sitzung gespeichert. Lösche diese Daten wenn du die Sitzung nicht mehr benötigst oder dich mit einem anderen Konto anmelden möchtest."
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Achtung: Deine persönlichen Daten (inclusive der Verschlüsselungsschlüssel) sind noch in dieser Sitzung gespeichert. Lösche diese Daten wenn du die Sitzung nicht mehr benötigst oder dich mit einem anderen Konto anmelden möchtest.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Bestätige das Löschen dieser Sitzung indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Bestätige das Löschen dieser Sitzung indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
+    "Confirm deleting these sessions": "Bestätige das Löschen dieser Sitzungen",
+    "Click the button below to confirm deleting these sessions.|other": "Klicke den Button um das Löschen dieser Sitzungen zu bestätigen.",
+    "Click the button below to confirm deleting these sessions.|one": "Klicke den Button um das Löschen dieser Sitzung zu bestätigen.",
+    "Clear all data in this session?": "Alle Daten dieser Sitzung löschen?",
+    "Clear all data": "Daten löschen",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bestätige das Löschen deines Kontos indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
+    "Confirm account deactivation": "Konto löschen bestätigen",
+    "Confirm your identity by entering your account password below.": "Bestätige deine Identität indem du dein Passwort unten eingibst.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bestätige deine Identität indem du diesen Login von einer deiner anderen Sitzungen verifizierst um Zugriff auf deine verschlüsselten Nachrichten zu erhalten.",
+    "Enter your account password to confirm the upgrade:": "Gib dein Passwort ein um die Aktualisierung zu bestätigen:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Du musst dich am Server authentifizieren um die Aktualisierung zu bestätigen.",
+    "Enter your recovery passphrase a second time to confirm it.": "Gib deine Wiederherstellungspassphrase zur Bestätigung erneut ein.",
+    "Confirm your recovery passphrase": "Bestätige deine Wiederherstellungspassphrase",
+    "Confirm recovery passphrase": "Bestätige die Wiederherstellungspassphrase",
+    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen."
 }

From 92005b15d83306d2057bc2718106b7875656a296 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 31 Mar 2020 16:02:23 +0100
Subject: [PATCH 2458/3235] Fix event tiles to smoothly resize with font.

---
 res/css/views/rooms/_EventTile.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0dc60226b8..a6cff9cfb0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -114,10 +114,9 @@ limitations under the License.
     clear: both;
     position: relative;
     padding-left: 65px; /* left gutter */
-    padding-top: 4px;
-    padding-bottom: 2px;
+    padding-top: 3px;
+    padding-bottom: 3px;
     border-radius: 4px;
-    min-height: 24px;
     line-height: $font-22px;
 }
 

From e2aef3a62b3e5671dff014424656090f2d269321 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Fri, 3 Apr 2020 17:53:49 +0100
Subject: [PATCH 2459/3235] Fix pills.

This was a hard pill to swallow
---
 res/css/views/elements/_RichText.scss         | 35 +++++++++----------
 res/css/views/rooms/_Autocomplete.scss        |  9 ++---
 .../views/rooms/_BasicMessageComposer.scss    | 13 +++----
 src/components/views/avatars/BaseAvatar.js    | 22 ++++++++----
 4 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index e01b1f8938..cb0c2eacc1 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -6,11 +6,14 @@
 .mx_RoomPill,
 .mx_GroupPill,
 .mx_AtRoomPill {
-    border-radius: 16px;
-    display: inline-block;
-    height: 20px;
+    display: inline-flex;
+    align-items: center;
+    vertical-align: middle;
+    border-radius: $font-16px;
+    height: $font-16px;
     line-height: $font-20px;
-    padding-left: 5px;
+    padding-left: 0;
+    padding-right: 0.5em;
 }
 
 a.mx_Pill {
@@ -19,6 +22,11 @@ a.mx_Pill {
     overflow: hidden;
     vertical-align: text-bottom;
     max-width: calc(100% - 1ch);
+    height: $font-24px;
+}
+
+.mx_Pill {
+    padding: 0.3rem;
 }
 
 /* More specific to override `.markdown-body a` text-decoration */
@@ -31,8 +39,7 @@ a.mx_Pill {
 .mx_UserPill {
     color: $primary-fg-color;
     background-color: $other-user-pill-bg-color;
-    padding-right: 5px;
-}
+ }
 
 .mx_UserPill_selected {
     background-color: $accent-color !important;
@@ -45,7 +52,6 @@ a.mx_Pill {
 .mx_MessageComposer_input .mx_AtRoomPill {
     color: $accent-fg-color;
     background-color: $mention-user-pill-bg-color;
-    padding-right: 5px;
 }
 
 /* More specific to override `.markdown-body a` color */
@@ -55,15 +61,6 @@ a.mx_Pill {
 .mx_GroupPill {
     color: $accent-fg-color;
     background-color: $rte-room-pill-color;
-    padding-right: 5px;
-}
-
-/* More specific to override `.markdown-body a` color */
-.mx_EventTile_content .markdown-body a.mx_GroupPill,
-.mx_GroupPill {
-    color: $accent-fg-color;
-    background-color: $rte-group-pill-color;
-    padding-right: 5px;
 }
 
 .mx_EventTile_body .mx_UserPill,
@@ -77,8 +74,10 @@ a.mx_Pill {
 .mx_GroupPill .mx_BaseAvatar,
 .mx_AtRoomPill .mx_BaseAvatar {
     position: relative;
-    left: -3px;
-    top: 2px;
+    display: inline-flex;
+    align-items: center;
+    border-radius: 10rem;
+    margin-right: 0.24rem;
 }
 
 .mx_Markdown_BOLD {
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index e5316f5a46..a4aebdb708 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -31,9 +31,10 @@
 }
 
 .mx_Autocomplete_Completion_pill {
-    border-radius: 17px;
-    height: 34px;
-    padding: 0px 5px;
+    box-sizing: border-box;
+    border-radius: 2rem;
+    height: $font-34px;
+    padding: 0.4rem;
     display: flex;
     user-select: none;
     cursor: pointer;
@@ -42,7 +43,7 @@
 }
 
 .mx_Autocomplete_Completion_pill > * {
-    margin: 0 3px;
+    margin-right: 0.3rem;
 }
 
 /* styling for common completion elements */
diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index e9013eb7b7..e126e523a6 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -46,22 +46,19 @@ limitations under the License.
 
         &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
             span.mx_UserPill, span.mx_RoomPill {
-                padding-left: 21px;
                 position: relative;
 
                 // avatar psuedo element
                 &::before {
-                    position: absolute;
-                    left: 2px;
-                    top: 2px;
                     content: var(--avatar-letter);
-                    width: 16px;
-                    height: 16px;
+                    width: $font-16px;
+                    height: $font-16px;
+                    margin-right: 0.24rem;
                     background: var(--avatar-background), $avatar-bg-color;
                     color: $avatar-initial-color;
                     background-repeat: no-repeat;
-                    background-size: 16px;
-                    border-radius: 8px;
+                    background-size: $font-16px;
+                    border-radius: $font-16px;
                     text-align: center;
                     font-weight: normal;
                     line-height: $font-16px;
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 3e3a2e6bd9..d9336a81e7 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -164,9 +164,9 @@ export default createReactClass({
             const initialLetter = AvatarLogic.getInitialLetter(name);
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: (width * 0.65) + "px",
-                    width: width + "px",
-                    lineHeight: height + "px" }}
+                    style={{ fontSize: (width * 0.65) / 15 + "rem",
+                    width: width / 15 + "rem",
+                    lineHeight: height / 15 + "rem" }}
                 >
                     { initialLetter }
                 </span>
@@ -174,7 +174,11 @@ export default createReactClass({
             const imgNode = (
                 <img className="mx_BaseAvatar_image" src={imageUrl}
                     alt="" title={title} onError={this.onError}
-                    width={width} height={height} aria-hidden="true" />
+                    aria-hidden="true"
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }} />
             );
             if (onClick != null) {
                 return (
@@ -202,7 +206,10 @@ export default createReactClass({
                     src={imageUrl}
                     onClick={onClick}
                     onError={this.onError}
-                    width={width} height={height}
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }}
                     title={title} alt=""
                     inputRef={inputRef}
                     {...otherProps} />
@@ -213,7 +220,10 @@ export default createReactClass({
                     className="mx_BaseAvatar mx_BaseAvatar_image"
                     src={imageUrl}
                     onError={this.onError}
-                    width={width} height={height}
+                    style={{
+                        width: width/15 + "rem",
+                        height: height/15 + "rem"
+                    }}
                     title={title} alt=""
                     ref={inputRef}
                     {...otherProps} />

From 334f529c2660907827b2b336aad27c743b78b5cb Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:23:16 +0100
Subject: [PATCH 2460/3235] Scale room tile heights.

---
 res/css/views/rooms/_RoomTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index de018bf178..5bc7d5624d 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    height: 34px;
+    height: $font-34px;
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;

From e03442048ce7dd42662f49ccccdbed160e18efac Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:23:52 +0100
Subject: [PATCH 2461/3235] Scale read receipt images

---
 res/css/views/rooms/_EventTile.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index a6cff9cfb0..77bfa85862 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -310,6 +310,8 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 .mx_EventTile_readAvatars .mx_BaseAvatar {
     position: absolute;
     display: inline-block;
+    height: $font-14px;
+    width: $font-14px;
 }
 
 .mx_EventTile_readAvatarRemainder {

From 5113723154c4e69efdc564cc80a52e63e1d0b256 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:48:35 +0100
Subject: [PATCH 2462/3235] Fix avatar alignment for room state events

---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 77bfa85862..1c781eec20 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -45,7 +45,7 @@ limitations under the License.
 }
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
-    top: 8px;
+    top: $font-8px;
     left: 65px;
 }
 

From 3f56ed393d84122013078e5ffa609b5450397acf Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:49:44 +0100
Subject: [PATCH 2463/3235] Use a function to convert to rem.

---
 src/components/views/avatars/BaseAvatar.js | 19 ++++++++++---------
 src/utils/rem.js                           | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 src/utils/rem.js

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index d9336a81e7..a17124b9ad 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -24,6 +24,7 @@ import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import toRem from "../../../utils/rem";
 
 export default createReactClass({
     displayName: 'BaseAvatar',
@@ -164,9 +165,9 @@ export default createReactClass({
             const initialLetter = AvatarLogic.getInitialLetter(name);
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: (width * 0.65) / 15 + "rem",
-                    width: width / 15 + "rem",
-                    lineHeight: height / 15 + "rem" }}
+                    style={{ fontSize: toRem(width * 0.65),
+                    width: toRem(width),
+                    lineHeight: toRem(height) }}
                 >
                     { initialLetter }
                 </span>
@@ -176,8 +177,8 @@ export default createReactClass({
                     alt="" title={title} onError={this.onError}
                     aria-hidden="true"
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }} />
             );
             if (onClick != null) {
@@ -207,8 +208,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }}
                     title={title} alt=""
                     inputRef={inputRef}
@@ -221,8 +222,8 @@ export default createReactClass({
                     src={imageUrl}
                     onError={this.onError}
                     style={{
-                        width: width/15 + "rem",
-                        height: height/15 + "rem"
+                        width: toRem(width),
+                        height: toRem(height)
                     }}
                     title={title} alt=""
                     ref={inputRef}
diff --git a/src/utils/rem.js b/src/utils/rem.js
new file mode 100644
index 0000000000..0ba430950c
--- /dev/null
+++ b/src/utils/rem.js
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+// converts a pixel value to rem.
+export default function(pixel_val) {
+  return pixel_val / 15 + "rem"
+}

From ff1544b783af17e10219dc960eec3d84abf1594f Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 16:51:07 +0100
Subject: [PATCH 2464/3235] Fix read receipt horizontal spacing at scale

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

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index be0ca1f8d6..85d443d55a 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
+import toRem from "../../../utils/rem";
 
 let bounce = false;
 try {
@@ -148,7 +149,7 @@ export default createReactClass({
             // start at the old height and in the old h pos
 
             startStyles.push({ top: startTopOffset+"px",
-                               left: oldInfo.left+"px" });
+                               left: toRem(oldInfo.left) });
 
             const reorderTransitionOpts = {
                 duration: 100,
@@ -181,7 +182,7 @@ export default createReactClass({
         }
 
         const style = {
-            left: this.props.leftOffset+'px',
+            left: toRem(this.props.leftOffset),
             top: '0px',
             visibility: this.props.hidden ? 'hidden' : 'visible',
         };

From b921159da80650b05326c4784548f4f25ce7dc89 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 17:47:12 +0100
Subject: [PATCH 2465/3235] Fix room header vertical alignment

---
 res/css/views/rooms/_RoomHeader.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 969106c9ea..80f6c40f39 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -173,8 +173,6 @@ limitations under the License.
 
 .mx_RoomHeader_avatar {
     flex: 0;
-    width: 28px;
-    height: 28px;
     margin: 0 7px;
     position: relative;
 }

From cef6868f0225b5340b2e82e5cddc6d811752bfb4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 6 Apr 2020 20:52:36 +0100
Subject: [PATCH 2466/3235] Resize room list scroll section.

This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
---
 src/components/structures/RoomSubList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2ae2d71100..1e3e15b4ec 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -32,6 +32,7 @@ import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
 import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
+import toRem from "../../utils/rem";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
@@ -383,7 +384,7 @@ export default class RoomSubList extends React.PureComponent {
 
     setHeight = (height) => {
         if (this._subList.current) {
-            this._subList.current.style.height = `${height}px`;
+            this._subList.current.style.height = toRem(height);
         }
         this._updateLazyRenderHeight(height);
     };

From f59bd538b4446a3f309f6951e942f4f3954a254a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 14:21:21 +0100
Subject: [PATCH 2467/3235] Resize toggle switches with font

---
 res/css/views/elements/_ToggleSwitch.scss | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 1f4445b88c..9a07e01978 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -16,12 +16,19 @@ limitations under the License.
 
 .mx_ToggleSwitch {
     transition: background-color 0.20s ease-out 0.1s;
-    width: 48px;
-    height: 24px;
-    border-radius: 14px;
+
+    width: $font-48px;
+    height: $font-20px;
+    border-radius: 1.5rem;
+    padding: 2px;
+    
     background-color: $togglesw-off-color;
-    position: relative;
     opacity: 0.5;
+
+    display: flex;
+    flex-direction: row;
+    flex: 0 0 auto;
+    align-items: center;
 }
 
 .mx_ToggleSwitch_enabled {
@@ -35,19 +42,12 @@ limitations under the License.
 
 .mx_ToggleSwitch_ball {
     transition: left 0.15s ease-out 0.1s;
-    margin: 2px;
-    width: 20px;
-    height: 20px;
-    border-radius: 20px;
+    width: $font-20px;
+    height: $font-20px;
+    border-radius: $font-20px;
     background-color: $togglesw-ball-color;
-    position: absolute;
-    top: 0;
 }
 
-.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
-    left: 23px; // 48px switch - 20px ball - 5px padding = 23px
-}
-
-.mx_ToggleSwitch:not(.mx_ToggleSwitch_on) > .mx_ToggleSwitch_ball {
-    left: 2px;
-}
+.mx_ToggleSwitch_on {
+    flex-direction: row-reverse;
+}
\ No newline at end of file

From 633c6f6b5ebdac7b8c2d4c2f23983f5444b6216e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:07:34 +0100
Subject: [PATCH 2468/3235] Fix settings when scaling up

---
 res/css/views/elements/_ToggleSwitch.scss     | 2 +-
 res/css/views/settings/tabs/_SettingsTab.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 9a07e01978..073bf5c00b 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_ToggleSwitch {
     transition: background-color 0.20s ease-out 0.1s;
 
-    width: $font-48px;
+    width: $font-44px;
     height: $font-20px;
     border-radius: 1.5rem;
     padding: 2px;
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 1fbfb35927..e3a61e6825 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -63,7 +63,7 @@ limitations under the License.
     display: inline-block;
     font-size: $font-14px;
     color: $primary-fg-color;
-    max-width: calc(100% - 48px); // Force word wrap instead of colliding with the switch
+    max-width: calc(100% - $font-48px); // Force word wrap instead of colliding with the switch
     box-sizing: border-box;
     padding-right: 10px;
 }

From 0fe0d728f1a329a6584025f5b5c2c23161a70ba1 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:23:19 +0100
Subject: [PATCH 2469/3235] lint

---
 res/css/views/elements/_RichText.scss     | 2 +-
 res/css/views/elements/_ToggleSwitch.scss | 4 ++--
 src/utils/rem.js                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index cb0c2eacc1..21d01fdd51 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -39,7 +39,7 @@ a.mx_Pill {
 .mx_UserPill {
     color: $primary-fg-color;
     background-color: $other-user-pill-bg-color;
- }
+}
 
 .mx_UserPill_selected {
     background-color: $accent-color !important;
diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 073bf5c00b..7c65fbc90d 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -21,7 +21,7 @@ limitations under the License.
     height: $font-20px;
     border-radius: 1.5rem;
     padding: 2px;
-    
+
     background-color: $togglesw-off-color;
     opacity: 0.5;
 
@@ -50,4 +50,4 @@ limitations under the License.
 
 .mx_ToggleSwitch_on {
     flex-direction: row-reverse;
-}
\ No newline at end of file
+}
diff --git a/src/utils/rem.js b/src/utils/rem.js
index 0ba430950c..1f18c9de05 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // converts a pixel value to rem.
-export default function(pixel_val) {
-  return pixel_val / 15 + "rem"
+export default function(pixelVal) {
+  return pixelVal / 15 + "rem";
 }

From aac90e4eb15363e49ab86c79e9d85d7063d26368 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 15:41:41 +0100
Subject: [PATCH 2470/3235] Room memebers avatars scale

---
 res/css/views/rooms/_EntityTile.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 966d2c4e70..8db71f297c 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -69,8 +69,6 @@ limitations under the License.
     padding-right: 12px;
     padding-top: 4px;
     padding-bottom: 4px;
-    width: 36px;
-    height: 36px;
     position: relative;
 }
 

From 969f0e9e0d762a6da8a96cbfcd710654ec66168b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 16:08:59 +0100
Subject: [PATCH 2471/3235] Commuity seleciton bar vertical alignment scale fix

---
 res/css/structures/_TagPanel.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 0065ffa502..f5c4c4c698 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -110,13 +110,13 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
     content: '';
-    height: 56px;
+    height: calc(100% + 16px);
     background-color: $accent-color;
     width: 5px;
     position: absolute;
     left: -15px;
     border-radius: 0 3px 3px 0;
-    top: -8px; // (56 - 40)/2
+    top: -8px; // (16px / 2)
 }
 
 .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {

From 997fe62e5c7402c91999b599722cbbe157cf3c33 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 16:27:26 +0100
Subject: [PATCH 2472/3235] FIx lanugage selection alignment at scale.

---
 res/css/views/elements/_Dropdown.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 32a68d5252..dd8511cc42 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -67,6 +67,8 @@ limitations under the License.
     text-overflow: ellipsis;
     white-space: nowrap;
     flex: 1;
+    display: inline-flex;
+    align-items: center;
 }
 
 .mx_Dropdown_option div {

From 18db25f601606e34fbf26d2728aa16b02c84d1e8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:13:09 +0100
Subject: [PATCH 2473/3235] Fix test

---
 test/components/views/messages/TextualBody-test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 4ad46586ae..7801995254 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,8 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'width="16" height="16" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
+                'style=\"width: 1.0666666666666667rem; height: 1.0666666666666667rem;\" ' +
+                'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });

From fd25170c57977168142dd5b436aa300ffd4083b9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:23:07 +0100
Subject: [PATCH 2474/3235] lint test

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

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 7801995254..59671327ce 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,7 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'style=\"width: 1.0666666666666667rem; height: 1.0666666666666667rem;\" ' +
+                'style="width: 1.0666666666666667rem; height: 1.0666666666666667rem;" ' +
                 'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });

From 352ae555f8ad91fe07302a5303154832fbf35bb7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 7 Apr 2020 17:41:18 +0100
Subject: [PATCH 2475/3235] Fix community line height

---
 res/css/structures/_TagPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index f5c4c4c698..4a78c8df92 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -69,7 +69,7 @@ limitations under the License.
     height: 100%;
 }
 .mx_TagPanel .mx_TagPanel_tagTileContainer > div {
-    height: 40px;
+    height: $font-40px;
     padding: 10px 0 9px 0;
 }
 

From 6338325d5cdb7e59044db957475be37f281f9af3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:35:38 +0100
Subject: [PATCH 2476/3235] Use rem instead of em.

---
 res/css/views/elements/_RichText.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 21d01fdd51..d46d07e82b 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -13,7 +13,7 @@
     height: $font-16px;
     line-height: $font-20px;
     padding-left: 0;
-    padding-right: 0.5em;
+    padding-right: 0.5rem;
 }
 
 a.mx_Pill {

From c7c94933eee593ebd8124681a1f41291e0c1e71c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 16:45:21 +0100
Subject: [PATCH 2477/3235] Use font-variable instead of rem

---
 res/css/_font-sizes.scss              | 7 +++++++
 res/css/views/elements/_RichText.scss | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index ad9e2e7103..b37b2eb3c2 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$font-1px: 0.067rem;
+$font-2px: 0.133rem;
+$font-3px: 0.200rem;
+$font-4px: 0.267rem;
+$font-5px: 0.333rem;
+$font-6px: 0.400rem;
+$font-7px: 0.467rem;
 $font-8px: 0.533rem;
 $font-9px: 0.600rem;
 $font-10px: 0.667rem;
diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index d46d07e82b..5b5759b794 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -26,7 +26,7 @@ a.mx_Pill {
 }
 
 .mx_Pill {
-    padding: 0.3rem;
+    padding: $font-5px;
 }
 
 /* More specific to override `.markdown-body a` text-decoration */

From 5dc7703740cb7256ec0ec0dcd4046bab5a482b23 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 17:07:59 +0100
Subject: [PATCH 2478/3235] Undo superfluous delete

---
 res/css/views/elements/_RichText.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 5b5759b794..b933b1b828 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -29,6 +29,13 @@ a.mx_Pill {
     padding: $font-5px;
 }
 
+/* More specific to override `.markdown-body a` color */
+.mx_EventTile_content .markdown-body a.mx_GroupPill,
+.mx_GroupPill {
+    color: $accent-fg-color;
+    background-color: $rte-group-pill-color;
+}
+
 /* More specific to override `.markdown-body a` text-decoration */
 .mx_EventTile_content .markdown-body a.mx_Pill {
     text-decoration: none;

From a0b610c576f7902d384519ce7f1160da38eaee42 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 14 Apr 2020 17:32:24 +0100
Subject: [PATCH 2479/3235] Skinnier pills are easier to swallow

---
 res/css/views/elements/_RichText.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index b933b1b828..1fa04595f9 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -10,10 +10,9 @@
     align-items: center;
     vertical-align: middle;
     border-radius: $font-16px;
-    height: $font-16px;
-    line-height: $font-20px;
+    line-height: $font-15px;
     padding-left: 0;
-    padding-right: 0.5rem;
+    padding-right: $font-5px;
 }
 
 a.mx_Pill {
@@ -22,11 +21,10 @@ a.mx_Pill {
     overflow: hidden;
     vertical-align: text-bottom;
     max-width: calc(100% - 1ch);
-    height: $font-24px;
 }
 
 .mx_Pill {
-    padding: $font-5px;
+    padding: $font-1px;
 }
 
 /* More specific to override `.markdown-body a` color */

From 41fd9ee015b049473ff48811c6b231d3cb434010 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 19:15:34 +0100
Subject: [PATCH 2480/3235] FIx unread count

---
 res/css/structures/_RoomSubList.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 2e0c94263e..2c53258b08 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -74,7 +74,7 @@ limitations under the License.
 
 .mx_RoomSubList_badge > div {
     flex: 0 0 auto;
-    border-radius: 8px;
+    border-radius: $font-16px;
     font-weight: 600;
     font-size: $font-12px;
     padding: 0 5px;

From 7502c2d9d178f234ad1505419583744050be46e8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:12:53 +0100
Subject: [PATCH 2481/3235] Scale user photo upload with font size

---
 res/css/_font-sizes.scss                   | 1 +
 res/css/views/settings/_AvatarSetting.scss | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index b37b2eb3c2..5cd19ce620 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -67,4 +67,5 @@ $font-49px: 3.267rem;
 $font-50px: 3.333rem;
 $font-51px: 3.400rem;
 $font-52px: 3.467rem;
+$font-88px: 5.887rem;
 $font-400px: 26.667rem;
diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss
index 35dba90f85..9fa10907b4 100644
--- a/res/css/views/settings/_AvatarSetting.scss
+++ b/res/css/views/settings/_AvatarSetting.scss
@@ -15,13 +15,13 @@ limitations under the License.
 */
 
 .mx_AvatarSetting_avatar {
-    width: 88px;
-    height: 88px;
+    width: $font-88px;
+    height: $font-88px;
     margin-left: 13px;
     position: relative;
 
     & > * {
-        width: 88px;
+        width: $font-88px;
         box-sizing: border-box;
     }
 
@@ -63,7 +63,7 @@ limitations under the License.
     & > img,
     .mx_AvatarSetting_avatarPlaceholder {
         display: block;
-        height: 88px;
+        height: $font-88px;
         border-radius: 4px;
     }
 

From c3ba7a8c91e90edebf0d1e908186ff96ce4f3543 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 16 Apr 2020 20:13:13 +0100
Subject: [PATCH 2482/3235] Tweak read receipt remainder text

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index f67877373e..af14f6922c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,6 +34,7 @@ import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
+import torem from "../../../utils/rem";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -473,7 +474,7 @@ export default createReactClass({
             if (remainder > 0) {
                 remText = <span className="mx_EventTile_readAvatarRemainder"
                     onClick={this.toggleAllReadAvatars}
-                    style={{ right: -(left - receiptOffset) }}>{ remainder }+
+                    style={{ right: "calc(" + torem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
                 </span>;
             }
         }

From 669562b90cbce4df756324a52bdeca0e81e42236 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 21 Apr 2020 15:49:19 +0100
Subject: [PATCH 2483/3235] Extra right padding in user pills

---
 res/css/views/elements/_RichText.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 1fa04595f9..b45b567db7 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -25,6 +25,7 @@ a.mx_Pill {
 
 .mx_Pill {
     padding: $font-1px;
+    padding-right: $font-6px;
 }
 
 /* More specific to override `.markdown-body a` color */

From a772d959a71161fda8903de0c0ce477a0bca77a5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 11:09:03 +0100
Subject: [PATCH 2484/3235] Remove redundent padding property and use em

---
 res/css/views/elements/_RichText.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index b45b567db7..453cf4c7f9 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -12,7 +12,6 @@
     border-radius: $font-16px;
     line-height: $font-15px;
     padding-left: 0;
-    padding-right: $font-5px;
 }
 
 a.mx_Pill {
@@ -25,7 +24,7 @@ a.mx_Pill {
 
 .mx_Pill {
     padding: $font-1px;
-    padding-right: $font-6px;
+    padding-right: 0.4em;
 }
 
 /* More specific to override `.markdown-body a` color */

From b4dcd50d5656593bfa6d94347b7047b472b02ca0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 11:13:19 +0100
Subject: [PATCH 2485/3235] Use camel case on import

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index af14f6922c..a64fd82eb5 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,7 +34,7 @@ import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
-import torem from "../../../utils/rem";
+import toRem from "../../../utils/rem";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -474,7 +474,7 @@ export default createReactClass({
             if (remainder > 0) {
                 remText = <span className="mx_EventTile_readAvatarRemainder"
                     onClick={this.toggleAllReadAvatars}
-                    style={{ right: "calc(" + torem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
+                    style={{ right: "calc(" + toRem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
                 </span>;
             }
         }

From 606940bd7763a0e23c6cf4977dc9f0d07995a81b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 14:07:39 +0100
Subject: [PATCH 2486/3235] Update Invite Dialog copy to include email
 addresses

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a46fa0df07..c30a34cb98 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -1067,9 +1067,8 @@ export default class InviteDialog extends React.PureComponent {
         let buttonText;
         let goButtonFn;
 
+        const userId = MatrixClientPeg.get().getUserId();
         if (this.props.kind === KIND_DM) {
-            const userId = MatrixClientPeg.get().getUserId();
-
             title = _t("Direct Messages");
             helpText = _t(
                 "Start a conversation with someone using their name, username (like <userId/>) or email address.",
@@ -1083,12 +1082,11 @@ export default class InviteDialog extends React.PureComponent {
         } else { // KIND_INVITE
             title = _t("Invite to this room");
             helpText = _t(
-                "If you can't find someone, ask them for their username (e.g. @user:server.com) or " +
-                "<a>share this room</a>.", {},
-                {
-                    a: (sub) =>
-                        <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
-                },
+                "Invite someone using their name, username (like <userId/>) or email address.",
+                {},
+                {userId: () => {
+                    return <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>;
+                }},
             );
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;

From 37374036d5cf098b7c48b30cfe98eff221947720 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 14:09:41 +0100
Subject: [PATCH 2487/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bd4c8f58c8..3b6e077aac 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1642,7 +1642,7 @@
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
     "Go": "Go",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
+    "Invite someone using their name, username (like <userId/>) or email address.": "Invite someone using their name, username (like <userId/>) or email address.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
     "Start verification": "Start verification",

From ca0cede1aa51219fa952fc2e93fa4dc4739ddb79 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:25:47 +0100
Subject: [PATCH 2488/3235] Add a link from settings / devices to your user
 profile

Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
---
 src/components/views/dialogs/UserSettingsDialog.js   |  2 +-
 .../settings/tabs/user/SecurityUserSettingsTab.js    | 12 ++++++++++++
 src/i18n/strings/en_EN.json                          |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index b135d5f5f6..210773c524 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -89,7 +89,7 @@ export default class UserSettingsDialog extends React.Component {
         tabs.push(new Tab(
             _td("Security & Privacy"),
             "mx_UserSettingsDialog_securityIcon",
-            <SecurityUserSettingsTab />,
+            <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         if (SdkConfig.get()['showLabsSettings'] || SettingsStore.getLabsFeatures().length > 0) {
             tabs.push(new Tab(
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 2a2bbbdb52..8c158b7799 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -52,6 +52,10 @@ export class IgnoredUser extends React.Component {
 }
 
 export default class SecurityUserSettingsTab extends React.Component {
+    static propTypes = {
+        closeSettingsFn: PropTypes.func.isRequired,
+    };
+
     constructor() {
         super();
 
@@ -107,6 +111,11 @@ export default class SecurityUserSettingsTab extends React.Component {
         );
     };
 
+    _onGoToUserProfileClick = () => {
+        // close the settings dialog & let the default action run (ie. navigate to the link)
+        this.props.closeSettingsFn();
+    }
+
     _onUserUnignored = async (userId) => {
         const {ignoredUserIds, waitingUnignored} = this.state;
         const currentlyIgnoredUserIds = ignoredUserIds.filter(e => !waitingUnignored.includes(e));
@@ -311,6 +320,9 @@ export default class SecurityUserSettingsTab extends React.Component {
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
+                <a href={"#/user/" + MatrixClientPeg.get().getUserId()} onClick={this._onGoToUserProfileClick}>
+                    {_t("Verify your devices in your User Profile")}
+                </a>
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bd4c8f58c8..bee1b1a732 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -845,6 +845,7 @@
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
+    "Verify your devices in your User Profile": "Verify your devices in your User Profile",
     "Sessions": "Sessions",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",

From a58fd6c4756c15106ad4536f4bf5bb322a9b479d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 14:27:41 +0100
Subject: [PATCH 2489/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index c30a34cb98..7bc9364b52 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/src/matrix";
 import SdkConfig from "../../../SdkConfig";

From 03d89361cd45a87a6c7ed22612e33e7b50d42b09 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:35:32 +0100
Subject: [PATCH 2490/3235] Update to (almost) match design

---
 .../tabs/user/SecurityUserSettingsTab.js         | 16 ++++++++++++----
 src/i18n/strings/en_EN.json                      |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 8c158b7799..4c7378de53 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -320,11 +320,19 @@ export default class SecurityUserSettingsTab extends React.Component {
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
-                <a href={"#/user/" + MatrixClientPeg.get().getUserId()} onClick={this._onGoToUserProfileClick}>
-                    {_t("Verify your devices in your User Profile")}
-                </a>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
+                    <span className="mx_SettingsTab_subheading">{_t("Where you’re logged in")}</span>
+                    <span>
+                        {_t(
+                            "Manage the names of and sign out of your sessions below or " +
+                            "<a>verify them in your User Profile</a>.", {},
+                            {
+                                a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
+                                    onClick={this._onGoToUserProfileClick}
+                                >{sub}</a>
+                            }
+                        )}
+                    </span>
                     <div className='mx_SettingsTab_subsectionText'>
                         {_t("A session's public name is visible to people you communicate with")}
                         <DevicesPanel />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bee1b1a732..30a796429c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -845,8 +845,9 @@
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
+    "Where you’re logged in": "Where you’re logged in",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
     "Verify your devices in your User Profile": "Verify your devices in your User Profile",
-    "Sessions": "Sessions",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
@@ -1031,6 +1032,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
     "Are you sure?": "Are you sure?",
     "No sessions with registered encryption keys": "No sessions with registered encryption keys",
+    "Sessions": "Sessions",
     "Jump to read receipt": "Jump to read receipt",
     "Mention": "Mention",
     "Invite": "Invite",

From 4e38b63b82f87a73eb91749a6d219cd0cc94b7c2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:38:22 +0100
Subject: [PATCH 2491/3235] Update i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 30a796429c..4655ea1f14 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -847,7 +847,6 @@
     "Security & Privacy": "Security & Privacy",
     "Where you’re logged in": "Where you’re logged in",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
-    "Verify your devices in your User Profile": "Verify your devices in your User Profile",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",

From 5d4aa03c8e9421fae9232e2aa7dd5e6ab5f6bd58 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:43:17 +0100
Subject: [PATCH 2492/3235] Lint

---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 4c7378de53..1a74bbdf93 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -329,8 +329,8 @@ export default class SecurityUserSettingsTab extends React.Component {
                             {
                                 a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
                                     onClick={this._onGoToUserProfileClick}
-                                >{sub}</a>
-                            }
+                                >{sub}</a>,
+                            },
                         )}
                     </span>
                     <div className='mx_SettingsTab_subsectionText'>

From ab369e70238e7504bcb52b4997342b1383352b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 27 Apr 2020 14:01:10 +0000
Subject: [PATCH 2493/3235] Translated using Weblate (Estonian)

Currently translated at 6.7% (154 of 2294 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 5d60c1c5d9..49bfed674d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -144,5 +144,13 @@
     "Explore rooms": "Uuri jututubasid",
     "If you've joined lots of rooms, this might take a while": "Kui oled liitunud paljude jututubadega, siis see võib natuke aega võtta",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Kui see seadistus pole kasutusel, siis krüptitud jututubade sõnumeid otsing ei vaata.",
-    "Indexed rooms:": "Indekseeritud jututoad:"
+    "Indexed rooms:": "Indekseeritud jututoad:",
+    "Remove": "Eemalda",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Sa peaksid enne ühenduse katkestamisst <b>eemaldama isiklikud andmed</b> id-serverist <idserver />. Kahjuks id-server <idserver /> ei ole hetkel võrgus või pole kättesaadav.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid id-serverist.",
+    "Remove messages": "Kustuta sõnumid",
+    "Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
+    "Remove %(email)s?": "Eemalda %(email)s?",
+    "Remove %(phone)s?": "Eemalda %(phone)s?",
+    "Remove recent messages by %(user)s": "Eemalda %(user)s hiljutised sõnumid"
 }

From 0a89813de1a1fa3a83d5ae27ef14d00c7e5fcb6c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:25:47 +0100
Subject: [PATCH 2494/3235] Add a link from settings / devices to your user
 profile

Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
---
 src/components/views/dialogs/UserSettingsDialog.js   |  2 +-
 .../settings/tabs/user/SecurityUserSettingsTab.js    | 12 ++++++++++++
 src/i18n/strings/en_EN.json                          |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index b135d5f5f6..210773c524 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -89,7 +89,7 @@ export default class UserSettingsDialog extends React.Component {
         tabs.push(new Tab(
             _td("Security & Privacy"),
             "mx_UserSettingsDialog_securityIcon",
-            <SecurityUserSettingsTab />,
+            <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         if (SdkConfig.get()['showLabsSettings'] || SettingsStore.getLabsFeatures().length > 0) {
             tabs.push(new Tab(
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a88f35da68..a8435857ad 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -50,6 +50,10 @@ export class IgnoredUser extends React.Component {
 }
 
 export default class SecurityUserSettingsTab extends React.Component {
+    static propTypes = {
+        closeSettingsFn: PropTypes.func.isRequired,
+    };
+
     constructor() {
         super();
 
@@ -85,6 +89,11 @@ export default class SecurityUserSettingsTab extends React.Component {
         );
     };
 
+    _onGoToUserProfileClick = () => {
+        // close the settings dialog & let the default action run (ie. navigate to the link)
+        this.props.closeSettingsFn();
+    }
+
     _onUserUnignored = async (userId) => {
         // Don't use this.state to get the ignored user list as it might be
         // ever so slightly outdated. Instead, prefer to get a fresh list and
@@ -283,6 +292,9 @@ export default class SecurityUserSettingsTab extends React.Component {
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
+                <a href={"#/user/" + MatrixClientPeg.get().getUserId()} onClick={this._onGoToUserProfileClick}>
+                    {_t("Verify your devices in your User Profile")}
+                </a>
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c141931dd7..94d02b30dd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -843,6 +843,7 @@
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
+    "Verify your devices in your User Profile": "Verify your devices in your User Profile",
     "Sessions": "Sessions",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",

From ef1e40c83995a6495678d86a4c67d59982b0e0da Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:35:32 +0100
Subject: [PATCH 2495/3235] Update to (almost) match design

---
 .../tabs/user/SecurityUserSettingsTab.js         | 16 ++++++++++++----
 src/i18n/strings/en_EN.json                      |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a8435857ad..688668d0cb 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -292,11 +292,19 @@ export default class SecurityUserSettingsTab extends React.Component {
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
-                <a href={"#/user/" + MatrixClientPeg.get().getUserId()} onClick={this._onGoToUserProfileClick}>
-                    {_t("Verify your devices in your User Profile")}
-                </a>
                 <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
+                    <span className="mx_SettingsTab_subheading">{_t("Where you’re logged in")}</span>
+                    <span>
+                        {_t(
+                            "Manage the names of and sign out of your sessions below or " +
+                            "<a>verify them in your User Profile</a>.", {},
+                            {
+                                a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
+                                    onClick={this._onGoToUserProfileClick}
+                                >{sub}</a>
+                            }
+                        )}
+                    </span>
                     <div className='mx_SettingsTab_subsectionText'>
                         {_t("A session's public name is visible to people you communicate with")}
                         <DevicesPanel />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 94d02b30dd..775e04b55f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -843,8 +843,9 @@
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
     "Security & Privacy": "Security & Privacy",
+    "Where you’re logged in": "Where you’re logged in",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
     "Verify your devices in your User Profile": "Verify your devices in your User Profile",
-    "Sessions": "Sessions",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
@@ -1029,6 +1030,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
     "Are you sure?": "Are you sure?",
     "No sessions with registered encryption keys": "No sessions with registered encryption keys",
+    "Sessions": "Sessions",
     "Jump to read receipt": "Jump to read receipt",
     "Mention": "Mention",
     "Invite": "Invite",

From d6f96f2f27b5329b0e0b59a08bebf11195380fd3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:38:22 +0100
Subject: [PATCH 2496/3235] Update i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 775e04b55f..2d36f756e6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -845,7 +845,6 @@
     "Security & Privacy": "Security & Privacy",
     "Where you’re logged in": "Where you’re logged in",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
-    "Verify your devices in your User Profile": "Verify your devices in your User Profile",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",

From 63d2d128c5f12ba1549dc4955f6d6c59e806288c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 14:43:17 +0100
Subject: [PATCH 2497/3235] Lint

---
 .../views/settings/tabs/user/SecurityUserSettingsTab.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 688668d0cb..0eec59806a 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -301,8 +301,8 @@ export default class SecurityUserSettingsTab extends React.Component {
                             {
                                 a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
                                     onClick={this._onGoToUserProfileClick}
-                                >{sub}</a>
-                            }
+                                >{sub}</a>,
+                            },
                         )}
                     </span>
                     <div className='mx_SettingsTab_subsectionText'>

From 2f68f608c5dc58c187c4c7f16a28f4c96b4864ff Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 27 Apr 2020 17:30:28 +0200
Subject: [PATCH 2498/3235] add 15pct value of accent color for FormButton
 backgrounds

so the button in the toasts has the correct background color
---
 res/themes/light-custom/css/_custom.scss | 1 +
 src/theme.js                             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index e4a08277f9..505fc3733b 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -17,6 +17,7 @@ limitations under the License.
 //
 // --accent-color
 $accent-color: var(--accent-color);
+$accent-bg-color: var(--accent-color-15pct);
 $button-bg-color: var(--accent-color);
 $button-link-fg-color: var(--accent-color);
 $button-primary-bg-color: var(--accent-color);
diff --git a/src/theme.js b/src/theme.js
index 442a89e25f..6bd81cc021 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -148,6 +148,7 @@ function setCustomThemeVars(customTheme) {
             style.setProperty(`--${name}`, hexColor);
             // uses #rrggbbaa to define the color with alpha values at 0% and 50%
             style.setProperty(`--${name}-0pct`, hexColor + "00");
+            style.setProperty(`--${name}-15pct`, hexColor + "26");
             style.setProperty(`--${name}-50pct`, hexColor + "7F");
         }
     }

From b1870660d8d9282cbd1a47e6b0a2c4e05d5dc230 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 27 Apr 2020 17:31:22 +0200
Subject: [PATCH 2499/3235] support theming username colors

---
 res/themes/light-custom/css/_custom.scss |  9 +++++++++
 src/theme.js                             | 20 +++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 505fc3733b..64c4cac7e3 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -125,3 +125,12 @@ $notice-primary-color: var(--warning-color);
 $pinned-unread-color: var(--warning-color);
 $warning-color: var(--warning-color);
 $button-danger-disabled-bg-color: var(--warning-color-50pct); // still needs alpha at 0.5
+
+$username-variant1-color: var(--username-colors_1, $username-variant1-color);
+$username-variant2-color: var(--username-colors_2, $username-variant2-color);
+$username-variant3-color: var(--username-colors_3, $username-variant3-color);
+$username-variant4-color: var(--username-colors_4, $username-variant4-color);
+$username-variant5-color: var(--username-colors_5, $username-variant5-color);
+$username-variant6-color: var(--username-colors_6, $username-variant6-color);
+$username-variant7-color: var(--username-colors_7, $username-variant7-color);
+$username-variant8-color: var(--username-colors_8, $username-variant8-color);
diff --git a/src/theme.js b/src/theme.js
index 6bd81cc021..b7fbe40df4 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -141,17 +141,31 @@ export function enumerateThemes() {
     return Object.assign({}, customThemeNames, BUILTIN_THEMES);
 }
 
+
 function setCustomThemeVars(customTheme) {
     const {style} = document.body;
-    if (customTheme.colors) {
-        for (const [name, hexColor] of Object.entries(customTheme.colors)) {
-            style.setProperty(`--${name}`, hexColor);
+
+    function setCSSVariable(name, hexColor, doPct = true) {
+        style.setProperty(`--${name}`, hexColor);
+        if (doPct) {
             // uses #rrggbbaa to define the color with alpha values at 0% and 50%
             style.setProperty(`--${name}-0pct`, hexColor + "00");
             style.setProperty(`--${name}-15pct`, hexColor + "26");
             style.setProperty(`--${name}-50pct`, hexColor + "7F");
         }
     }
+
+    if (customTheme.colors) {
+        for (const [name, value] of Object.entries(customTheme.colors)) {
+            if (Array.isArray(value)) {
+                for (let i = 0; i < value.length; i += 1) {
+                    setCSSVariable(`${name}_${i}`, value[i], false);
+                }
+            } else {
+                setCSSVariable(name, value);
+            }
+        }
+    }
 }
 
 function getCustomTheme(themeName) {

From bfba5e6cfe8e2be24a135af072a6c0b2a41dbfbb Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 16:57:38 +0100
Subject: [PATCH 2500/3235] Fix member info avatar size

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

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index a17124b9ad..cbe083f3a2 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -208,8 +208,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: toRem(width),
-                        height: toRem(height)
+                        width: {width},
+                        height: {height},
                     }}
                     title={title} alt=""
                     inputRef={inputRef}

From b567b95fadf828e2c8e5038268a8664877e24d8f Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 17:10:38 +0100
Subject: [PATCH 2501/3235] Lint

---
 src/components/views/avatars/BaseAvatar.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index a17124b9ad..329d0b29a4 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -165,9 +165,11 @@ export default createReactClass({
             const initialLetter = AvatarLogic.getInitialLetter(name);
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{ fontSize: toRem(width * 0.65),
-                    width: toRem(width),
-                    lineHeight: toRem(height) }}
+                    style={{
+                        fontSize: toRem(width * 0.65),
+                        width: toRem(width),
+                        lineHeight: toRem(height),
+                    }}
                 >
                     { initialLetter }
                 </span>
@@ -223,7 +225,7 @@ export default createReactClass({
                     onError={this.onError}
                     style={{
                         width: toRem(width),
-                        height: toRem(height)
+                        height: toRem(height),
                     }}
                     title={title} alt=""
                     ref={inputRef}

From c995e2e021ec20b9418e8b51ffc9d5c835e268cc Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 17:29:03 +0100
Subject: [PATCH 2502/3235] Fix info avatar

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

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 329d0b29a4..79296cf0cd 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -210,8 +210,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: toRem(width),
-                        height: toRem(height)
+                        width: {width},
+                        height: {height},
                     }}
                     title={title} alt=""
                     inputRef={inputRef}

From 00c0212c0308b56f08e06068a88f1600ebdb87a2 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 17:35:52 +0100
Subject: [PATCH 2503/3235] Revert previous fix

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

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 79296cf0cd..81fbc08c0f 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -210,8 +210,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: {width},
-                        height: {height},
+                        width: toRem(width),
+                        height: toRem(height),
                     }}
                     title={title} alt=""
                     inputRef={inputRef}

From 55084e918cb93dcccd2200ea578f70ef29ead6d7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 17:40:37 +0100
Subject: [PATCH 2504/3235] Really fix info avatar

---
 res/css/views/right_panel/_UserInfo.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index a4d88f9882..b125476ed0 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -98,8 +98,8 @@ limitations under the License.
         position: absolute;
         top: 0;
         left: 0;
-        width: 100%;
-        height: 100%;
+        width: 100% !important;
+        height: 100% !important;
     }
 
     .mx_UserInfo_avatar .mx_BaseAvatar_initial {

From da7a2f2f6231a338216dee99401ec5d3f6a4578f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 17:50:50 +0100
Subject: [PATCH 2505/3235] only clear on continuations where the clear isn't
 done by SenderProfile

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

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 0dc60226b8..8e4571047d 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -110,8 +110,11 @@ limitations under the License.
     user-select: none;
 }
 
-.mx_EventTile_line, .mx_EventTile_reply {
+.mx_EventTile_continuation .mx_EventTile_line {
     clear: both;
+}
+
+.mx_EventTile_line, .mx_EventTile_reply {
     position: relative;
     padding-left: 65px; /* left gutter */
     padding-top: 4px;

From a5ee99b858b73a6b1bd12bb6f3a8cd467a50f403 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 18:33:54 +0100
Subject: [PATCH 2506/3235] Aggregate device verification toasts into one toast

'Review' now opens the only place we can verify our own devices:
our user info.
---
 src/DeviceListener.js                         | 43 ++++++++-----------
 .../views/toasts/UnverifiedSessionToast.js    | 29 +++----------
 src/i18n/strings/en_EN.json                   |  3 +-
 3 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 41f249b335..a7b259e179 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -20,12 +20,9 @@ import * as sdk from './index';
 import { _t } from './languageHandler';
 import ToastStore from './stores/ToastStore';
 
-function toastKey(deviceId) {
-    return 'unverified_session_' + deviceId;
-}
-
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 const THIS_DEVICE_TOAST_KEY = 'setupencryption';
+const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
 
 export default class DeviceListener {
     static sharedInstance() {
@@ -34,8 +31,6 @@ export default class DeviceListener {
     }
 
     constructor() {
-        // set of device IDs we're currently showing toasts for
-        this._activeNagToasts = new Set();
         // device IDs for which the user has dismissed the verify toast ('Later')
         this._dismissed = new Set();
         // has the user dismissed any of the various nag toasts to setup encryption on this device?
@@ -71,8 +66,11 @@ export default class DeviceListener {
         this._keyBackupFetchedAt = null;
     }
 
-    dismissVerification(deviceId) {
-        this._dismissed.add(deviceId);
+    async dismissVerifications() {
+        const cli = MatrixClientPeg.get();
+        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+        this._dismissed = new Set(devices.filter(d => d.deviceId !== cli.deviceId).map(d => d.deviceId));
+
         this._recheck();
     }
 
@@ -202,33 +200,28 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const newActiveToasts = new Set();
+            const unverifiedDeviceIds = new Set();
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
                 if (device.deviceId == cli.deviceId) continue;
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-                if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
-                    ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
-                } else {
-                    this._activeNagToasts.add(device.deviceId);
-                    ToastStore.sharedInstance().addOrReplaceToast({
-                        key: toastKey(device.deviceId),
-                        title: _t("Unverified login. Was this you?"),
-                        icon: "verification_warning",
-                        props: { device },
-                        component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                    });
-                    newActiveToasts.add(device.deviceId);
+                if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
+                    unverifiedDeviceIds.add(device.deviceId);
                 }
             }
 
-            // clear any other outstanding toasts (eg. logged out devices)
-            for (const deviceId of this._activeNagToasts) {
-                if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
+            if (unverifiedDeviceIds.size > 0) {
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: OTHER_DEVICES_TOAST_KEY,
+                    title: _t("Review where you’re logged in"),
+                    icon: "verification_warning",
+                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
+                });
+            } else {
+                ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
             }
-            this._activeNagToasts = newActiveToasts;
         }
     }
 }
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index cb0cadcdc8..587a54164d 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
+import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
 import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
@@ -26,29 +27,17 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 
 @replaceableComponent("views.toasts.UnverifiedSessionToast")
 export default class UnverifiedSessionToast extends React.PureComponent {
-    static propTypes = {
-        toastKey: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-    };
-
     _onLaterClick = () => {
-        const { device } = this.props;
-        DeviceListener.sharedInstance().dismissVerification(device.deviceId);
+        DeviceListener.sharedInstance().dismissVerifications();
     };
 
     _onReviewClick = async () => {
-        const { device } = this.props;
+        DeviceListener.sharedInstance().dismissVerifications();
 
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+        dis.dispatch({
+            action: 'view_user_info',
             userId: MatrixClientPeg.get().getUserId(),
-            device,
-            onFinished: (r) => {
-                if (!r) {
-                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
-                    this._onLaterClick();
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
+        });
     };
 
     render() {
@@ -56,11 +45,7 @@ export default class UnverifiedSessionToast extends React.PureComponent {
 
         return (<div>
             <div className="mx_Toast_description">
-                <span className="mx_Toast_deviceName">
-                    {device.getDisplayName()}
-                </span> <span className="mx_Toast_deviceID">
-                    ({device.deviceId})
-                </span>
+                {_t("Verify your other sessions")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bd4c8f58c8..b662fcc4d3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -105,7 +105,7 @@
     "Verify this session": "Verify this session",
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
-    "Unverified login. Was this you?": "Unverified login. Was this you?",
+    "Review where you’re logged in": "Review where you’re logged in",
     "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",
@@ -564,6 +564,7 @@
     "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Later": "Later",
+    "Verify your other sessions": "Verify your other sessions",
     "Review": "Review",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",

From 3bdd24ce83efa1267e4e76a40e9bcf42f4359f05 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 18:34:48 +0100
Subject: [PATCH 2507/3235] Make close button work from user info view

Adds more hacks so that the close button does something vagauely
plausible in all situations.
---
 src/components/structures/RightPanel.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index f5bdfdf40d..d5369b8492 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -26,6 +26,7 @@ import dis from '../../dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
+import RoomViewStore from '../../stores/RoomViewStore';
 import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
@@ -221,10 +222,26 @@ export default class RightPanel extends React.Component {
             case RIGHT_PANEL_PHASES.EncryptionPanel:
                 if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
-                        dis.dispatch({
-                            action: "view_user",
-                            member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
-                        });
+                        // XXX: There are three different ways of 'closing' this panel depending on what state
+                        // things are in... this knows far more than it should do about the state of the rest
+                        // of the app and is generally a bit silly.
+                        if (this.props.user) {
+                            // If we have a user prop then we're displaying a user from the 'user' page type
+                            // in LoggedInView, so need to change the page type to close the panel (we switch
+                            // to the home page which is not obviosuly the correct thing to do, but I'm not sure
+                            // anything else is - we could hide the close button altogether?)
+                            dis.dispatch({
+                                action: "view_home_page",
+                            });
+                        } else {
+                            // Otherwise we have got our user from RoomViewStore which means we're being shown
+                            // within a room, so go back to the member panel if we were in the encryption panel,
+                            // or the member list if we were in the member panel... phew.
+                            dis.dispatch({
+                                action: "view_user",
+                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                            });
+                        }
                     };
                     panel = <UserInfo
                         user={this.state.member}

From e8e99c2646851bd0fc2d380e41b25bd1c9ac3e53 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 27 Apr 2020 19:35:38 +0200
Subject: [PATCH 2508/3235] Use color values for default avatar backgrounds

We still need to convert them to URLs for the notification icon,
so use a canvas (with a cache in front of it) to do that.
---
 res/img/03b381.png | Bin 169 -> 0 bytes
 res/img/368bd6.png | Bin 171 -> 0 bytes
 res/img/ac3ba8.png | Bin 170 -> 0 bytes
 src/Avatar.js      |  28 ++++++++++++++++++++++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)
 delete mode 100644 res/img/03b381.png
 delete mode 100644 res/img/368bd6.png
 delete mode 100644 res/img/ac3ba8.png

diff --git a/res/img/03b381.png b/res/img/03b381.png
deleted file mode 100644
index cf28fc7e5972c64194cf0d3523f88ccc4029b0b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEa{HEjtmSN`?>!lvI6-Do-U3d
z5u9%?ZR9<mAi(0tGj+F`c!o;UjFyCx;Z?lf*S!CG{Ahk$&27uI%wOAud;(av<TrD!
zYWS9G;3#@wAFtX9rd!(&vV=PPHk+}4E8{+!a0uhu+X+ot3u>i7itjH<WokQPE+z-G
Oi^0>?&t;ucLK6VpHaVC8

diff --git a/res/img/368bd6.png b/res/img/368bd6.png
deleted file mode 100644
index a2700bd0aefa3f3240ba4bae80953d9968bd78e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEa{HEjtmSN`?>!lvI6-@o-U3d
z5u9%?ZR9<mAi(126KL}C-<`gR8Hqwos_`#P?`*#JUS52E<;UFTTllWXdl@*2Uf9R0
zwu0%__Jb^;4!_N2Ea1wx&n6tg`1W=}lh%S-X`cYrE&0uys~W!Lf)v*=3raFQ+r9Z>
Q8PGNcPgg&ebxsLQ0Ia4vrT_o{

diff --git a/res/img/ac3ba8.png b/res/img/ac3ba8.png
deleted file mode 100644
index 031471d85a1d9cf5ab90194d788c26a1b90f8de7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEa{HEjtmSN`?>!lvI6;uo-U3d
z5u9%?ZR9<mAi(126K(S5fUQ)gn3`h5r>Sv=ZSPn8FZ?)L{C=6=YlpuJS%gCv-`-AW
z(ppd}?GwPdCBK<-Rl~Pj14q#d`*_t>Fx}dIkR{aNx7myZTp9P-K#I*h>X_~YE;#!f
PXc>d2tDnm{r-UW|94|Wi

diff --git a/src/Avatar.js b/src/Avatar.js
index 217b196348..52bdbc1a50 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -53,13 +53,37 @@ export function avatarUrlForUser(user, width, height, resizeMethod) {
     return url;
 }
 
+function urlForColor(color) {
+    const size = 40;
+    const canvas = document.createElement("canvas");
+    canvas.width = size;
+    canvas.height = size;
+    const ctx = canvas.getContext("2d");
+    ctx.fillStyle = color;
+    ctx.fillRect(0, 0, size, size);
+    return canvas.toDataURL();
+}
+
+// XXX: Ideally we'd clear this cache when the theme changes
+// but since this function is at global scope, it's a bit
+// hard to install a listener here, even if there were a clear event to listen to
+const colorToDataURLCache = new Map();
+
 export function defaultAvatarUrlForString(s) {
-    const images = ['03b381', '368bd6', 'ac3ba8'];
+    const defaultColors = ['#03b381', '#368bd6', '#ac3ba8'];
     let total = 0;
     for (let i = 0; i < s.length; ++i) {
         total += s.charCodeAt(i);
     }
-    return require('../res/img/' + images[total % images.length] + '.png');
+    const colorIndex = total % defaultColors.length;
+    // overwritten color value in custom themes
+    const color = defaultColors[colorIndex];
+    let dataUrl = colorToDataURLCache.get(color);
+    if (!dataUrl) {
+        dataUrl = urlForColor(color);
+        colorToDataURLCache.set(color, dataUrl);
+    }
+    return dataUrl;
 }
 
 /**

From b396096cd217130841802ee65652b088c2821b6a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 27 Apr 2020 18:35:51 +0100
Subject: [PATCH 2509/3235] Fix set up encryption toast to have use "set up" as
 action

This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
---
 src/components/views/toasts/SetupEncryptionToast.js | 1 +
 src/i18n/strings/en_EN.json                         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 3c1f42b526..75fd55378c 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -90,6 +90,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
     getSetupCaption() {
         switch (this.props.kind) {
             case 'set_up_encryption':
+                return _t('Set up');
             case 'upgrade_encryption':
             case 'upgrade_ssss':
                 return _t('Upgrade');
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bd4c8f58c8..9c0468733e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -561,6 +561,7 @@
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
     "Update your secure storage": "Update your secure storage",
+    "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Later": "Later",
@@ -2227,7 +2228,6 @@
     "Unable to create key backup": "Unable to create key backup",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
     "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
-    "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
     "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",

From 66067719f47f94774374ee7233f856ae3c4887a7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 27 Apr 2020 18:36:05 +0100
Subject: [PATCH 2510/3235] Small fixes

---
 res/css/views/avatars/_MemberStatusMessageAvatar.scss | 2 +-
 res/css/views/context_menus/_TopLeftMenu.scss         | 6 +++---
 res/css/views/right_panel/_UserInfo.scss              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/css/views/avatars/_MemberStatusMessageAvatar.scss b/res/css/views/avatars/_MemberStatusMessageAvatar.scss
index c101a5d8a8..975b4e5ce9 100644
--- a/res/css/views/avatars/_MemberStatusMessageAvatar.scss
+++ b/res/css/views/avatars/_MemberStatusMessageAvatar.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_MessageComposer_avatar .mx_BaseAvatar {
     padding: 2px;
     border: 1px solid transparent;
-    border-radius: 15px;
+    border-radius: 100%;
 }
 
 .mx_MessageComposer_avatar .mx_BaseAvatar_initial {
diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss
index 973c306695..e0f5dd47bd 100644
--- a/res/css/views/context_menus/_TopLeftMenu.scss
+++ b/res/css/views/context_menus/_TopLeftMenu.scss
@@ -72,10 +72,10 @@ limitations under the License.
         .mx_AccessibleButton::after {
             mask-repeat: no-repeat;
             mask-position: 0 center;
-            mask-size: 16px;
+            mask-size: $font-16px;
             position: absolute;
-            width: 16px;
-            height: 16px;
+            width: $font-16px;
+            height: $font-16px;
             content: "";
             top: 5px;
             left: 14px;
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index b125476ed0..26b81e94f3 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -109,7 +109,7 @@ limitations under the License.
         justify-content: center;
 
         // override the calculated sizes so that the letter isn't HUGE
-        font-size: 56px !important;
+        font-size: 6rem !important;
         width: 100% !important;
         transition: font-size 0.5s;
     }

From 196931000343e9fe1281ac0a480e8d35e24dbdf1 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 27 Apr 2020 19:38:27 +0200
Subject: [PATCH 2511/3235] support overriding avatar background color from
 custom theme

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

diff --git a/src/Avatar.js b/src/Avatar.js
index 52bdbc1a50..8084f30f33 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -77,7 +77,9 @@ export function defaultAvatarUrlForString(s) {
     }
     const colorIndex = total % defaultColors.length;
     // overwritten color value in custom themes
-    const color = defaultColors[colorIndex];
+    const cssVariable = `--avatar-background-colors_${colorIndex}`;
+    const cssValue = document.body.style.getPropertyValue(cssVariable);
+    const color = cssValue || defaultColors[colorIndex];
     let dataUrl = colorToDataURLCache.get(color);
     if (!dataUrl) {
         dataUrl = urlForColor(color);

From 76e04fbdfae00b8f29a29442ac1f1511a7cb6f7f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 27 Apr 2020 19:39:07 +0200
Subject: [PATCH 2512/3235] update comment

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

diff --git a/src/theme.js b/src/theme.js
index b7fbe40df4..ab5974f207 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -148,7 +148,7 @@ function setCustomThemeVars(customTheme) {
     function setCSSVariable(name, hexColor, doPct = true) {
         style.setProperty(`--${name}`, hexColor);
         if (doPct) {
-            // uses #rrggbbaa to define the color with alpha values at 0% and 50%
+            // uses #rrggbbaa to define the color with alpha values at 0%, 15% and 50%
             style.setProperty(`--${name}-0pct`, hexColor + "00");
             style.setProperty(`--${name}-15pct`, hexColor + "26");
             style.setProperty(`--${name}-50pct`, hexColor + "7F");

From 1a99917556235784a7e98eb1975b9b511cc8c5aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 17:50:50 +0100
Subject: [PATCH 2513/3235] only clear on continuations where the clear isn't
 done by SenderProfile

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

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index e015f30e48..89564cd130 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -110,8 +110,11 @@ limitations under the License.
     user-select: none;
 }
 
-.mx_EventTile_line, .mx_EventTile_reply {
+.mx_EventTile_continuation .mx_EventTile_line {
     clear: both;
+}
+
+.mx_EventTile_line, .mx_EventTile_reply {
     position: relative;
     padding-left: 65px; /* left gutter */
     padding-top: 4px;

From de3226177cb6f4e6877b4fca775c73fe28742f69 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 26 Apr 2020 12:52:17 +0100
Subject: [PATCH 2514/3235] cap width of editable item list item to leave space
 for its X remove button

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

diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index ef60f006cc..f089fa3dc2 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -53,6 +53,9 @@ limitations under the License.
 .mx_EditableItem_item {
     flex: auto 1 0;
     order: 1;
+    width: calc(100% - 14px); // leave space for the remove button
+    overflow-x: hidden;
+    text-overflow: ellipsis;
 }
 
 .mx_EditableItemList_label {

From ff1fd15e72cce44c095cad470ad54bbbd375a97f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 20:31:14 +0100
Subject: [PATCH 2515/3235] Use the New Session review dialog for verifying our
 own devices

---
 src/components/views/right_panel/UserInfo.js | 34 +++++++----
 src/verification.js                          | 63 +++++++++++---------
 2 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b87617c9d4..d3e8e81ebe 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -191,17 +191,29 @@ function DeviceItem({userId, device}) {
             device.getDisplayName();
     let trustedLabel = null;
     if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
-    return (
-        <AccessibleButton
-            className={classes}
-            title={device.deviceId}
-            onClick={onDeviceClick}
-        >
-            <div className={iconClasses} />
-            <div className="mx_UserInfo_device_name">{deviceName}</div>
-            <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
-        </AccessibleButton>
-    );
+
+
+    if (isVerified) {
+        return (
+            <div className={classes} title={device.deviceId} >
+                <div className={iconClasses} />
+                <div className="mx_UserInfo_device_name">{deviceName}</div>
+                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+            </div>
+        );
+    } else {
+        return (
+            <AccessibleButton
+                className={classes}
+                title={device.deviceId}
+                onClick={onDeviceClick}
+            >
+                <div className={iconClasses} />
+                <div className="mx_UserInfo_device_name">{deviceName}</div>
+                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+            </AccessibleButton>
+        );
+    }
 }
 
 function DevicesSection({devices, userId, loading}) {
diff --git a/src/verification.js b/src/verification.js
index ca839940e5..ed56b0e7ef 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -23,6 +23,7 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
+import NewSessionReviewDialog from './components/views/dialogs/NewSessionReviewDialog';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
@@ -68,33 +69,41 @@ export async function verifyDevice(user, device) {
             return;
         }
     }
-    Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
-        user,
-        device,
-        onFinished: async (action) => {
-            if (action === "sas") {
-                const verificationRequestPromise = cli.legacyDeviceVerification(
-                    user.userId,
-                    device.deviceId,
-                    verificationMethods.SAS,
-                );
-                dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    refireParams: {member: user, verificationRequestPromise},
-                });
-            } else if (action === "legacy") {
-                const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
-                Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
-                    ManualDeviceKeyVerificationDialog,
-                    {
-                        userId: user.userId,
-                        device,
-                    },
-                );
-            }
-        },
-    });
+
+    if (user.userId === cli.getUserId()) {
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: user.userId,
+            device,
+        });
+    } else {
+        Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
+            user,
+            device,
+            onFinished: async (action) => {
+                if (action === "sas") {
+                    const verificationRequestPromise = cli.legacyDeviceVerification(
+                        user.userId,
+                        device.deviceId,
+                        verificationMethods.SAS,
+                    );
+                    dis.dispatch({
+                        action: "set_right_panel_phase",
+                        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                        refireParams: {member: user, verificationRequestPromise},
+                    });
+                } else if (action === "legacy") {
+                    const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                    Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
+                        ManualDeviceKeyVerificationDialog,
+                        {
+                            userId: user.userId,
+                            device,
+                        },
+                    );
+                }
+            },
+        });
+    }
 }
 
 export async function legacyVerifyUser(user) {

From 7e956514a239b3a15cb3f9235533db506bf6d69c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 20:35:39 +0100
Subject: [PATCH 2516/3235] Lint

---
 src/components/structures/RightPanel.js               | 4 ++--
 src/components/views/toasts/UnverifiedSessionToast.js | 5 -----
 src/verification.js                                   | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index d5369b8492..3fec5aa25f 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -26,7 +26,6 @@ import dis from '../../dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import RoomViewStore from '../../stores/RoomViewStore';
 import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
@@ -239,7 +238,8 @@ export default class RightPanel extends React.Component {
                             // or the member list if we were in the member panel... phew.
                             dis.dispatch({
                                 action: "view_user",
-                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ?
+                                    this.state.member : null,
                             });
                         }
                     };
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 587a54164d..886e3c4c20 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -15,13 +15,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import Modal from "../../../Modal";
 import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
-import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
 import FormButton from '../elements/FormButton';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
 
@@ -41,8 +38,6 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
-        const { device } = this.props;
-
         return (<div>
             <div className="mx_Toast_description">
                 {_t("Verify your other sessions")}
diff --git a/src/verification.js b/src/verification.js
index ed56b0e7ef..630da01091 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -92,7 +92,8 @@ export async function verifyDevice(user, device) {
                         refireParams: {member: user, verificationRequestPromise},
                     });
                 } else if (action === "legacy") {
-                    const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                    const ManualDeviceKeyVerificationDialog =
+                        sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
                     Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
                         ManualDeviceKeyVerificationDialog,
                         {

From a399b1018ae1aa18e815dcbccdf35222ec1571ed Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:16:08 +0100
Subject: [PATCH 2517/3235] fix flashing `by ""`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/RedactedBody.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
index 654f1622b1..e347e879a3 100644
--- a/src/components/views/messages/RedactedBody.tsx
+++ b/src/components/views/messages/RedactedBody.tsx
@@ -29,7 +29,7 @@ const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
 
     let text = _t("Message deleted");
     const redactedBecauseUserId = mxEvent.getUnsigned().redacted_because.sender;
-    if (redactedBecauseUserId !== cli.getUserId()) {
+    if (redactedBecauseUserId && redactedBecauseUserId !== cli.getUserId()) {
         const room = cli.getRoom(mxEvent.getRoomId());
         const sender = room && room.getMember(redactedBecauseUserId);
         text = _t("Message deleted by %(name)s", { name: sender ? sender.name : redactedBecauseUserId });

From 83a4558d49021b58f30a47637ce69beb5d6b1fd3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:27:46 +0100
Subject: [PATCH 2518/3235] remove RedactedGrouper for now

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js     | 99 +------------------
 .../views/elements/EventListSummary.js        | 18 ++--
 .../elements/RedactionEventListSummary.tsx    | 81 ---------------
 3 files changed, 13 insertions(+), 185 deletions(-)
 delete mode 100644 src/components/views/elements/RedactionEventListSummary.tsx

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 30c139d440..a83529e055 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1063,102 +1063,5 @@ class MemberGrouper {
     }
 }
 
-// Wrap consecutive redactions by the same user in a ListSummary, ignore if redacted
-class RedactionGrouper {
-    static canStartGroup = function(panel, ev) {
-        return panel._shouldShowEvent(ev) && ev.isRedacted();
-    }
-
-    constructor(panel, ev, prevEvent, lastShownEvent) {
-        this.panel = panel;
-        this.readMarker = panel._readMarkerForEvent(
-            ev.getId(),
-            ev === lastShownEvent,
-        );
-        this.events = [ev];
-        this.prevEvent = prevEvent;
-        this.lastShownEvent = lastShownEvent;
-    }
-
-    shouldGroup(ev) {
-        if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) return false;
-        if (ev.getType() === "m.room.redaction") return true; // for show-hidden-events users
-        return ev.isRedacted() && ev.sender === this.events[0].sender &&
-            ev.getUnsigned().redacted_because.sender === this.events[0].getUnsigned().redacted_because.sender;
-    }
-
-    add(ev) {
-        if (ev.getType() === "m.room.redaction") return; // for show-hidden-events users
-        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
-            ev.getId(),
-            ev === this.lastShownEvent,
-        );
-        this.events.push(ev);
-    }
-
-    getTiles() {
-        // If we don't have any events to group, don't even try to group them. The logic
-        // below assumes that we have a group of events to deal with, but we might not if
-        // the events we were supposed to group were redacted.
-        if (!this.events || !this.events.length) return [];
-
-        const DateSeparator = sdk.getComponent('messages.DateSeparator');
-
-        const panel = this.panel;
-        const lastShownEvent = this.lastShownEvent;
-        const ret = [];
-
-        if (panel._wantsDateSeparator(this.prevEvent, this.events[0].getDate())) {
-            const ts = this.events[0].getTs();
-            ret.push(
-                <li key={ts+'~'}><DateSeparator key={ts+'~'} ts={ts} /></li>,
-            );
-        }
-
-        // Ensure that the key of the MemberEventListSummary does not change with new
-        // member events. This will prevent it from being re-created unnecessarily, and
-        // instead will allow new props to be provided. In turn, the shouldComponentUpdate
-        // method on ELS can be used to prevent unnecessary renderings.
-        const key = "redactioneventlistsummary-" + (this.prevEvent ? this.events[0].getId() : "initial");
-
-        let highlightInMels = false;
-        let eventTiles = this.events.map((e) => {
-            if (e.getId() === panel.props.highlightedEventId) {
-                highlightInMels = true;
-            }
-            // In order to prevent DateSeparators from appearing in the expanded form
-            // of MemberEventListSummary, render each member event as if the previous
-            // one was itself. This way, the timestamp of the previous event === the
-            // timestamp of the current event, and no DateSeparator is inserted.
-            return panel._getTilesForEvent(e, e, e === lastShownEvent);
-        }).reduce((a, b) => a.concat(b), []);
-
-        if (eventTiles.length === 0) {
-            eventTiles = null;
-        }
-
-        ret.push(
-            <RedactionEventListSummary
-                key={key}
-                events={this.events}
-                onToggle={panel._onHeightChanged} // Update scroll state
-                startExpanded={highlightInMels}
-            >
-                 { eventTiles }
-            </RedactionEventListSummary>,
-        );
-
-        if (this.readMarker) {
-            ret.push(this.readMarker);
-        }
-
-        return ret;
-    }
-
-    getNewPrevEvent() {
-        return this.events[0];
-    }
-}
-
 // all the grouper classes that we use
-const groupers = [CreationGrouper, MemberGrouper, RedactionGrouper];
+const groupers = [CreationGrouper, MemberGrouper];
diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index 79c84293c2..707b9e79b0 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -22,7 +22,8 @@ import {MatrixEvent, RoomMember} from "matrix-js-sdk";
 import {useStateToggle} from "../../../hooks/useStateToggle";
 import AccessibleButton from "./AccessibleButton";
 
-const EventListSummary = ({events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText}) => {
+const EventListSummary = (props) => {
+    const {events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText, summary} = props;
     const [expanded, toggleExpanded] = useStateToggle(startExpanded);
 
     // Whenever expanded changes call onToggle
@@ -49,6 +50,8 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande
             <div className="mx_EventListSummary_line">&nbsp;</div>
             { children }
         </React.Fragment>;
+    } else if (summary) {
+        body = summary;
     } else {
         const avatars = summaryMembers.map((m) => <MemberAvatar key={m.userId} member={m} width={14} height={14} />);
         body = (
@@ -66,12 +69,12 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande
     }
 
     return (
-        <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
+        <li className="mx_EventListSummary" data-scroll-tokens={eventIds}>
             <AccessibleButton className="mx_EventListSummary_toggle" onClick={toggleExpanded} aria-expanded={expanded}>
                 { expanded ? _t('collapse') : _t('expand') }
             </AccessibleButton>
             { body }
-        </div>
+        </li>
     );
 };
 
@@ -87,10 +90,13 @@ EventListSummary.propTypes = {
     // Whether or not to begin with state.expanded=true
     startExpanded: PropTypes.bool,
 
-    // The list of room members for which to show avatars next to the summary
+    // The node to render as a summary when the summary is not collapsed,
+    // alternately summaryMembers and summaryText can be provided.
+    summary: PropTypes.node,
+    // The list of room members for which to show avatars next to the summary, ignored if summary is provided
     summaryMembers: PropTypes.arrayOf(PropTypes.instanceOf(RoomMember)),
-    // The text to show as the summary of this event list
-    summaryText: PropTypes.string.isRequired,
+    // The text to show as the summary of this event list, ignored if summary is provided
+    summaryText: PropTypes.string,
 };
 
 export default EventListSummary;
diff --git a/src/components/views/elements/RedactionEventListSummary.tsx b/src/components/views/elements/RedactionEventListSummary.tsx
deleted file mode 100644
index 55538ca236..0000000000
--- a/src/components/views/elements/RedactionEventListSummary.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 {MatrixClient} from "matrix-js-sdk/src/client";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-
-import { _t } from "../../../languageHandler";
-import * as sdk from "../../../index";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-
-interface IProps {
-    // An array of member events to summarise
-    events: MatrixEvent[];
-    // An array of EventTiles to render when expanded
-    children: React.ReactChildren;
-    // The minimum number of events needed to trigger summarisation
-    threshold?: number;
-    // Called when the ELS expansion is toggled
-    onToggle: () => void;
-    // Whether or not to begin with state.expanded=true
-    startExpanded?: boolean;
-}
-
-export default class RedactionEventListSummary extends React.Component<IProps> {
-    static displayName = "RedactionEventListSummary";
-
-    static defaultProps = {
-        threshold: 2,
-    };
-
-    static contextType = MatrixClientContext;
-
-    shouldComponentUpdate(nextProps) {
-        // Update if
-        //  - The number of summarised events has changed
-        //  - or if the summary is about to toggle to become collapsed
-        //  - or if there are fewEvents, meaning the child eventTiles are shown as-is
-        return (
-            nextProps.events.length !== this.props.events.length ||
-            nextProps.events.length < this.props.threshold
-        );
-    }
-
-    render() {
-        const count = this.props.events.length;
-        const redactionSender = this.props.events[0].getUnsigned().redacted_because.sender;
-
-        let avatarMember = this.props.events[0].sender;
-        let summaryText = _t("%(count)s messages deleted", { count });
-        if (redactionSender !== this.context.getUserId()) {
-            const room = (this.context as MatrixClient).getRoom(redactionSender || this.props.events[0].getSender());
-            avatarMember = room && room.getMember(redactionSender);
-            const name = avatarMember ? avatarMember.name : redactionSender;
-            summaryText = _t("%(count)s messages deleted by %(name)s", { count, name });
-        }
-
-        const EventListSummary = sdk.getComponent("views.elements.EventListSummary");
-        return <EventListSummary
-            events={this.props.events}
-            threshold={this.props.threshold}
-            onToggle={this.props.onToggle}
-            startExpanded={this.props.startExpanded}
-            children={this.props.children}
-            summaryMembers={[avatarMember]}
-            summaryText={summaryText} />;
-    }
-}

From c7870090f8466bff4f40ea074c36c56b68469f28 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:29:38 +0100
Subject: [PATCH 2519/3235] clean ups

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js         | 1 -
 src/components/views/elements/EventListSummary.js | 8 +-------
 src/i18n/strings/en_EN.json                       | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a83529e055..6fbfdb504b 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -29,7 +29,6 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
-import RedactionEventListSummary from "../views/elements/RedactionEventListSummary";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index 707b9e79b0..bf0f8ea133 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -22,8 +22,7 @@ import {MatrixEvent, RoomMember} from "matrix-js-sdk";
 import {useStateToggle} from "../../../hooks/useStateToggle";
 import AccessibleButton from "./AccessibleButton";
 
-const EventListSummary = (props) => {
-    const {events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText, summary} = props;
+const EventListSummary = ({events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText}) => {
     const [expanded, toggleExpanded] = useStateToggle(startExpanded);
 
     // Whenever expanded changes call onToggle
@@ -50,8 +49,6 @@ const EventListSummary = (props) => {
             <div className="mx_EventListSummary_line">&nbsp;</div>
             { children }
         </React.Fragment>;
-    } else if (summary) {
-        body = summary;
     } else {
         const avatars = summaryMembers.map((m) => <MemberAvatar key={m.userId} member={m} width={14} height={14} />);
         body = (
@@ -90,9 +87,6 @@ EventListSummary.propTypes = {
     // Whether or not to begin with state.expanded=true
     startExpanded: PropTypes.bool,
 
-    // The node to render as a summary when the summary is not collapsed,
-    // alternately summaryMembers and summaryText can be provided.
-    summary: PropTypes.node,
     // The list of room members for which to show avatars next to the summary, ignored if summary is provided
     summaryMembers: PropTypes.arrayOf(PropTypes.instanceOf(RoomMember)),
     // The text to show as the summary of this event list, ignored if summary is provided
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index de3f88c244..8785b5e244 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1488,8 +1488,6 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
     "Power level": "Power level",
     "Custom level": "Custom level",
-    "%(count)s messages deleted|other": "%(count)s messages deleted",
-    "%(count)s messages deleted by %(name)s|other": "%(count)s messages deleted by %(name)s",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "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>In reply to</a> <pill>",
     "Room alias": "Room alias",

From a5830c229ec62448cb014d3552955552be0f3ec6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:30:40 +0100
Subject: [PATCH 2520/3235] more tidying

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/EventListSummary.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index bf0f8ea133..5a4a6e4f5a 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -87,9 +87,9 @@ EventListSummary.propTypes = {
     // Whether or not to begin with state.expanded=true
     startExpanded: PropTypes.bool,
 
-    // The list of room members for which to show avatars next to the summary, ignored if summary is provided
+    // The list of room members for which to show avatars next to the summary
     summaryMembers: PropTypes.arrayOf(PropTypes.instanceOf(RoomMember)),
-    // The text to show as the summary of this event list, ignored if summary is provided
+    // The text to show as the summary of this event list
     summaryText: PropTypes.string,
 };
 

From 3e35cffae7ffb4ab6447f75464b84df82176a84d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:53:32 +0100
Subject: [PATCH 2521/3235] null-guards

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/RedactedBody.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
index e347e879a3..5dada64b52 100644
--- a/src/components/views/messages/RedactedBody.tsx
+++ b/src/components/views/messages/RedactedBody.tsx
@@ -28,8 +28,9 @@ const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
     const cli: MatrixClient = useContext(MatrixClientContext);
 
     let text = _t("Message deleted");
-    const redactedBecauseUserId = mxEvent.getUnsigned().redacted_because.sender;
-    if (redactedBecauseUserId && redactedBecauseUserId !== cli.getUserId()) {
+    const unsigned = mxEvent.getUnsigned();
+    const redactedBecauseUserId = unsigned && unsigned.redacted_because && unsigned.redacted_because.sender;
+    if (redactedBecauseUserId && redactedBecauseUserId !== mxEvent.getSender()) {
         const room = cli.getRoom(mxEvent.getRoomId());
         const sender = room && room.getMember(redactedBecauseUserId);
         text = _t("Message deleted by %(name)s", { name: sender ? sender.name : redactedBecauseUserId });

From 2792988ad1a0a37ba413273128d50557e495c446 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:59:07 +0100
Subject: [PATCH 2522/3235] Revert "Make Screens an enum"

This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 326 ++++++++++-------------
 1 file changed, 147 insertions(+), 179 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 02a79f9684..e117d8f76b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -103,22 +103,6 @@ export enum Views {
     SOFT_LOGOUT = 9,
 }
 
-export enum Screens {
-    REGISTER = "register",
-    LOGIN = "login",
-    FORGOT_PASSWORD = "forgot_password",
-    SOFT_LOGOUT = "soft_logout",
-    NEW = "new", // new room
-    SETTINGS = "settings",
-    WELCOME = "welcome",
-    HOME = "home",
-    START = "start",
-    DIRECTORY = "directory",
-    GROUPS = "groups",
-    COMPLETE_SECURITY = "complete_security",
-    POST_REGISTRATION = "post_registration",
-}
-
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
@@ -130,7 +114,7 @@ const ONBOARDING_FLOW_STARTERS = [
 ];
 
 interface IScreen {
-    screen: Screens | string;
+    screen: string;
     params?: object;
 }
 
@@ -339,9 +323,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 // the old creds, but rather go straight to the relevant page
                 const firstScreen = this.screenAfterLogin ? this.screenAfterLogin.screen : null;
 
-                if (firstScreen === Screens.LOGIN ||
-                    firstScreen === Screens.REGISTER ||
-                    firstScreen === Screens.FORGOT_PASSWORD) {
+                if (firstScreen === 'login' ||
+                    firstScreen === 'register' ||
+                    firstScreen === 'forgot_password') {
                     this.showScreenAfterLogin();
                     return;
                 }
@@ -555,7 +539,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.setStateForNewView({
                     view: Views.LOGIN,
                 });
-                this.notifyNewScreen(Screens.LOGIN);
+                this.notifyNewScreen('login');
                 ThemeController.isLogin = true;
                 this.themeWatcher.recheck();
                 break;
@@ -568,7 +552,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.setStateForNewView({
                     view: Views.FORGOT_PASSWORD,
                 });
-                this.notifyNewScreen(Screens.FORGOT_PASSWORD);
+                this.notifyNewScreen('forgot_password');
                 break;
             case 'start_chat':
                 createRoom({
@@ -819,7 +803,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setStateForNewView(newState);
         ThemeController.isLogin = true;
         this.themeWatcher.recheck();
-        this.notifyNewScreen(Screens.REGISTER);
+        this.notifyNewScreen('register');
     }
 
     // TODO: Move to RoomViewStore
@@ -1298,7 +1282,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * Called when the session is logged out
      */
     private onLoggedOut() {
-        this.notifyNewScreen(Screens.LOGIN);
+        this.notifyNewScreen('login');
         this.setStateForNewView({
             view: Views.LOGIN,
             ready: false,
@@ -1315,7 +1299,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * Called when the session is softly logged out
      */
     private onSoftLogout() {
-        this.notifyNewScreen(Screens.SOFT_LOGOUT);
+        this.notifyNewScreen('soft_logout');
         this.setStateForNewView({
             view: Views.SOFT_LOGOUT,
             ready: false,
@@ -1604,168 +1588,152 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
     }
 
-    showScreen(screen: Screens | string, params?: {[key: string]: any}) {
-        switch (screen) {
-            case Screens.REGISTER:
-                dis.dispatch({
-                    action: 'start_registration',
-                    params: params,
-                });
-                break;
-            case Screens.LOGIN:
+    showScreen(screen: string, params?: {[key: string]: any}) {
+        if (screen === 'register') {
+            dis.dispatch({
+                action: 'start_registration',
+                params: params,
+            });
+        } else if (screen === 'login') {
+            dis.dispatch({
+                action: 'start_login',
+                params: params,
+            });
+        } else if (screen === 'forgot_password') {
+            dis.dispatch({
+                action: 'start_password_recovery',
+                params: params,
+            });
+        } else if (screen === 'soft_logout') {
+            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+                // Logged in - visit a room
+                this.viewLastRoom();
+            } else {
+                // Ultimately triggers soft_logout if needed
                 dis.dispatch({
                     action: 'start_login',
                     params: params,
                 });
-                break;
-            case Screens.FORGOT_PASSWORD:
-                dis.dispatch({
-                    action: 'start_password_recovery',
-                    params: params,
-                });
-                break;
-            case Screens.SOFT_LOGOUT:
-                if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
-                    // Logged in - visit a room
-                    this.viewLastRoom();
-                } else {
-                    // Ultimately triggers soft_logout if needed
-                    dis.dispatch({
-                        action: 'start_login',
-                        params: params,
-                    });
-                }
-                break;
-            case Screens.NEW:
-                dis.dispatch({
-                    action: 'view_create_room',
-                });
-                break;
-            case Screens.SETTINGS:
-                dis.dispatch({
-                    action: 'view_user_settings',
-                });
-                break;
-            case Screens.WELCOME:
-                dis.dispatch({
-                    action: 'view_welcome_page',
-                });
-                break;
-            case Screens.HOME:
-                dis.dispatch({
-                    action: 'view_home_page',
-                });
-                break;
-            case Screens.START:
-                this.showScreen(Screens.HOME);
-                dis.dispatch({
-                    action: 'require_registration',
-                });
-                break;
-            case Screens.DIRECTORY:
-                dis.dispatch({
-                    action: 'view_room_directory',
-                });
-                break;
-            case Screens.GROUPS:
-                dis.dispatch({
-                    action: 'view_my_groups',
-                });
-                break;
-            case Screens.COMPLETE_SECURITY:
-                dis.dispatch({
-                    action: 'start_complete_security',
-                });
-                break;
-            case Screens.POST_REGISTRATION:
-                dis.dispatch({
-                    action: 'start_post_registration',
-                });
-                break;
-            default:
-                if (screen.startsWith('room/')) {
-                    // Rooms can have the following formats:
-                    // #room_alias:domain or !opaque_id:domain
-                    const room = screen.substring(5);
-                    const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a :
-                    let eventOffset = room.length;
-                    // room aliases can contain slashes only look for slash after domain
-                    if (room.substring(domainOffset).indexOf('/') > -1) {
-                        eventOffset = domainOffset + room.substring(domainOffset).indexOf('/');
-                    }
-                    const roomString = room.substring(0, eventOffset);
-                    let eventId = room.substring(eventOffset + 1); // empty string if no event id given
+            }
+        } else if (screen === 'new') {
+            dis.dispatch({
+                action: 'view_create_room',
+            });
+        } else if (screen === 'settings') {
+            dis.dispatch({
+                action: 'view_user_settings',
+            });
+        } else if (screen === 'welcome') {
+            dis.dispatch({
+                action: 'view_welcome_page',
+            });
+        } else if (screen === 'home') {
+            dis.dispatch({
+                action: 'view_home_page',
+            });
+        } else if (screen === 'start') {
+            this.showScreen('home');
+            dis.dispatch({
+                action: 'require_registration',
+            });
+        } else if (screen === 'directory') {
+            dis.dispatch({
+                action: 'view_room_directory',
+            });
+        } else if (screen === 'groups') {
+            dis.dispatch({
+                action: 'view_my_groups',
+            });
+        } else if (screen === 'complete_security') {
+            dis.dispatch({
+                action: 'start_complete_security',
+            });
+        } else if (screen === 'post_registration') {
+            dis.dispatch({
+                action: 'start_post_registration',
+            });
+        } else if (screen.indexOf('room/') === 0) {
+            // Rooms can have the following formats:
+            // #room_alias:domain or !opaque_id:domain
+            const room = screen.substring(5);
+            const domainOffset = room.indexOf(':') + 1; // 0 in case room does not contain a :
+            let eventOffset = room.length;
+            // room aliases can contain slashes only look for slash after domain
+            if (room.substring(domainOffset).indexOf('/') > -1) {
+                eventOffset = domainOffset + room.substring(domainOffset).indexOf('/');
+            }
+            const roomString = room.substring(0, eventOffset);
+            let eventId = room.substring(eventOffset + 1); // empty string if no event id given
 
-                    // Previously we pulled the eventID from the segments in such a way
-                    // where if there was no eventId then we'd get undefined. However, we
-                    // now do a splice and join to handle v3 event IDs which results in
-                    // an empty string. To maintain our potential contract with the rest
-                    // of the app, we coerce the eventId to be undefined where applicable.
-                    if (!eventId) eventId = undefined;
+            // Previously we pulled the eventID from the segments in such a way
+            // where if there was no eventId then we'd get undefined. However, we
+            // now do a splice and join to handle v3 event IDs which results in
+            // an empty string. To maintain our potential contract with the rest
+            // of the app, we coerce the eventId to be undefined where applicable.
+            if (!eventId) eventId = undefined;
 
-                    // TODO: Handle encoded room/event IDs: https://github.com/vector-im/riot-web/issues/9149
+            // TODO: Handle encoded room/event IDs: https://github.com/vector-im/riot-web/issues/9149
 
-                    // FIXME: sort_out caseConsistency
-                    const thirdPartyInvite = {
-                        inviteSignUrl: params.signurl,
-                        invitedEmail: params.email,
-                    };
-                    const oobData = {
-                        name: params.room_name,
-                        avatarUrl: params.room_avatar_url,
-                        inviterName: params.inviter_name,
-                    };
+            // FIXME: sort_out caseConsistency
+            const thirdPartyInvite = {
+                inviteSignUrl: params.signurl,
+                invitedEmail: params.email,
+            };
+            const oobData = {
+                name: params.room_name,
+                avatarUrl: params.room_avatar_url,
+                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;
-                    }
+            // 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.
-                        highlighted: Boolean(eventId),
-                        third_party_invite: thirdPartyInvite,
-                        oob_data: oobData,
-                        room_alias: undefined,
-                        room_id: undefined,
-                    };
-                    if (roomString[0] === '#') {
-                        payload.room_alias = roomString;
-                    } else {
-                        payload.room_id = roomString;
-                    }
+            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.
+                highlighted: Boolean(eventId),
+                third_party_invite: thirdPartyInvite,
+                oob_data: oobData,
+                room_alias: undefined,
+                room_id: undefined,
+            };
+            if (roomString[0] === '#') {
+                payload.room_alias = roomString;
+            } else {
+                payload.room_id = roomString;
+            }
 
-                    dis.dispatch(payload);
-                } else if (screen.startsWith('user/')) {
-                    const userId = screen.substring(5);
-                    dis.dispatch({
-                        action: 'view_user_info',
-                        userId: userId,
-                        subAction: params.action,
-                    });
-                } else if (screen.startsWith('group/')) {
-                    const groupId = screen.substring(6);
+            dis.dispatch(payload);
+        } else if (screen.indexOf('user/') === 0) {
+            const userId = screen.substring(5);
+            dis.dispatch({
+                action: 'view_user_info',
+                userId: userId,
+                subAction: params.action,
+            });
+        } else if (screen.indexOf('group/') === 0) {
+            const groupId = screen.substring(6);
 
-                    // TODO: Check valid group ID
+            // TODO: Check valid group ID
 
-                    dis.dispatch({
-                        action: 'view_group',
-                        group_id: groupId,
-                    });
-                } else {
-                    console.info("Ignoring showScreen for '%s'", screen);
-                }
+            dis.dispatch({
+                action: 'view_group',
+                group_id: groupId,
+            });
+        } else {
+            console.info("Ignoring showScreen for '%s'", screen);
         }
     }
 
@@ -1832,15 +1800,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     onRegisterClick = () => {
-        this.showScreen(Screens.REGISTER);
+        this.showScreen("register");
     };
 
     onLoginClick = () => {
-        this.showScreen(Screens.LOGIN);
+        this.showScreen("login");
     };
 
     onForgotPasswordClick = () => {
-        this.showScreen(Screens.FORGOT_PASSWORD);
+        this.showScreen("forgot_password");
     };
 
     onRegisterFlowComplete = (credentials: object, password: string) => {
@@ -1857,7 +1825,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.setState({
             view: Views.LOGGED_IN,
         });
-        this.showScreen(Screens.SETTINGS);
+        this.showScreen("settings");
     };
 
     onVersion(current: string, latest: string, releaseNotes?: string) {

From d61b72c0e51cd468d7102beceed267df474d29db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 27 Apr 2020 18:36:59 +0000
Subject: [PATCH 2523/3235] Translated using Weblate (Estonian)

Currently translated at 11.1% (256 of 2296 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 49bfed674d..71fd4db711 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -47,7 +47,7 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Verify this session": "Verifitseeri see sessioon",
     "Which rooms would you like to add to this community?": "Milliseid jututubasid sooviksid lisada siia kogukonda?",
-    "Show these rooms to non-members on the community page and room list?": "Kas näitan neid jututubasid kogukonna lehel ja tubade loendis mitte-liikmetele?",
+    "Show these rooms to non-members on the community page and room list?": "Kas näitan neid jututubasid kogukonna lehel ja tubade loendis kogukonna mitte-liikmetele?",
     "Add rooms to the community": "Lisa siia kogukonda jututubasid",
     "Failed to add the following rooms to %(groupId)s:": "Järgnevate jututubade lisamine %(groupId)s kogukonda ebaõnnestus:",
     "Changes your avatar in all rooms": "Muuda oma tunnuspilti kõikides jututubades",
@@ -152,5 +152,112 @@
     "Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
     "Remove %(email)s?": "Eemalda %(email)s?",
     "Remove %(phone)s?": "Eemalda %(phone)s?",
-    "Remove recent messages by %(user)s": "Eemalda %(user)s hiljutised sõnumid"
+    "Remove recent messages by %(user)s": "Eemalda %(user)s hiljutised sõnumid",
+    "Replying With Files": "Vasta faili(de)ga",
+    "Invite new community members": "Kutsu uusi liikmeid kogukonda",
+    "rooms.": "jututoad.",
+    "Notify for all other messages/rooms": "Teavita kõikidest teistest sõnumitest/jututubadest",
+    "Members only (since the point in time of selecting this option)": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
+    "Members only (since they were invited)": "Ainult liikmetele (alates nende kutsumise ajast)",
+    "Members only (since they joined)": "Ainult liikmetele (alates liitumisest)",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Oled kustutamas %(user)s %(count)s sõnumit. Seda tegevust ei saa hiljem tagasi pöörata. Kas sa kindlasti soovid jätkata?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Oled kustutamas ühte %(user)s sõnumit. Seda tegevust ei saa hiljem tagasi pöörata. Kas sa kindlasti soovid jätkata?",
+    "Remove %(count)s messages|other": "Eemalda %(count)s sõnumit",
+    "Remove %(count)s messages|one": "Eemalda 1 sõnum",
+    "Remove recent messages": "Eemalda hiljutised sõnumid",
+    "Filter room members": "Filtreeri jututoa liikmeid",
+    "Members": "Liikmed",
+    "Files": "Failid",
+    "Remove from community": "Eemalda kogukonnast",
+    "Remove this user from community?": "Kas eemaldan selle kasutaja kogukonnast?",
+    "Failed to remove user from community": "Kasutaja eemaldamine kogukonnast ebaõnnestus",
+    "Failed to load group members": "Grupi liikmete laadimine ebaõnnestus",
+    "Filter community members": "Filtreeri kogukonna liikmeid",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Kas sa soovid eemaldada %(roomName)s jututoa %(groupId)s kogukonnast?",
+    "Removing a room from the community will also remove it from the community page.": "Eemaldades jututoa kogukonnast eemaldad selle ka kogukonna lehelt.",
+    "Failed to remove room from community": "Jututoa eemaldamine kogukonnast ebaõnnestus",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Jututoa %(roomName)s eemaldamine %(groupId)s kogukonnast ebaõnnestus",
+    "Only visible to community members": "Nähtav ainult kogukonna liikmetele",
+    "Filter community rooms": "Filtreeri kogukonna jututubasid",
+    "Failed to remove widget": "Vidina eemaldamine ebaõnnestus",
+    "An error ocurred whilst trying to remove the widget from the room": "Vidina eemaldamisel jututoast tekkis viga",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Kas sa oled kindel et soovid eemadlada <b>%(serverName)s</b>",
+    "Remove server": "Eemalda server",
+    "%(networkName)s rooms": "%(networkName)s jututoad",
+    "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.": "Kas sa oled kindel et soovid eemaldada (kustutada) seda sündmust? Pane tähele, et see muutus võib tagasi pöörduda, kui muudad hiljem jututoa nime või teemanime.",
+    "Sign out and remove encryption keys?": "Logi välja ja eemalda krüptimisvõtmed?",
+    "Upload files (%(current)s of %(total)s)": "Lae failid üles (%(current)s / %(total)s)",
+    "Upload files": "Lae failid üles",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Need failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Mõned failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
+    "Upload %(count)s other files|other": "Lae üles %(count)s muud faili",
+    "Unable to reject invite": "Ei õnnestu kutset tagasi lükata",
+    "Resend": "Saada uuesti",
+    "Resend edit": "Saada muudetud sõnum uuesti",
+    "Resend %(unsentCount)s reaction(s)": "Saada uuesti %(unsentCount)s reaktsioon(i)",
+    "Resend removal": "Saada eemaldamine uuesti",
+    "Cancel Sending": "Tühista saatmine",
+    "Forward Message": "Edasta sõnum",
+    "Pin Message": "Klammerda sõnum",
+    "View Decrypted Source": "Vaata dekrüptitud lähtekoodi",
+    "Unhide Preview": "Näita eelvaadet",
+    "Share Permalink": "Jaga püsiviidet",
+    "Share Message": "Jaga sõnumit",
+    "Source URL": "Lähteaadress",
+    "Collapse Reply Thread": "Ahenda vastuste jutulõnga",
+    "End-to-end encryption information": "Läbiva krüptimise teave",
+    "Notification settings": "Teavituste seadistused",
+    "All messages (noisy)": "Kõik sõnumid (lärmakas)",
+    "All messages": "Kõik sõnumid",
+    "Mentions only": "Ainult mainimised",
+    "Leave": "Lahku",
+    "Forget": "Unusta",
+    "Favourite": "Lemmik",
+    "Low Priority": "Madal prioriteet",
+    "Direct Chat": "Otsevestlus",
+    "Clear status": "Eemalda olek",
+    "Update status": "Uuenda olek",
+    "Set status": "Määra olek",
+    "Set a new status...": "Määra uus olek...",
+    "View Community": "Näita kogukonda",
+    "Hide": "Peida",
+    "Home": "Avaleht",
+    "Sign in": "Logi sisse",
+    "Help": "Abiteave",
+    "Reload": "Lae uuesti",
+    "Take picture": "Tee foto",
+    "Remove for everyone": "Eemalda kõigilt",
+    "Remove for me": "Eemalda minult",
+    "User Status": "Kasutaja olek",
+    "You must join the room to see its files": "Failide nägemiseks pead jututoaga liituma",
+    "There are no visible files in this room": "Jututoas pole nähtavaid faile",
+    "Failed to remove the room from the summary of %(groupId)s": "Jututoa eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
+    "Failed to remove a user from the summary of %(groupId)s": "Kasutaja eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
+    "Create a Group Chat": "Loo rühmavestlus",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Kas kustutame jututoa aliase %(alias)s ja eemaldame %(name)s kataloogist?",
+    "Remove %(name)s from the directory?": "Eemalda %(name)s kataloogist?",
+    "Remove from Directory": "Eemalda kataloogist",
+    "remove %(name)s from the directory.": "eemalda %(name)s kataloogist.",
+    "You seem to be uploading files, are you sure you want to quit?": "Tundub, et sa parasjagu laed faile üles, kas sa kindlasti soovid väljuda?",
+    "Failed to set direct chat tag": "Otsevestluse sildi lisamine ei õnnestunud",
+    "Failed to remove tag %(tagName)s from room": "Sildi %(tagName)s eemaldamine jututoast ebaõnnestus",
+    "Calls": "Kõned",
+    "Room List": "Jututubade loend",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Lülita paks kiri sisse/välja",
+    "Toggle Italics": "Lülita kaldkiri sisse/välja",
+    "Toggle Quote": "Lülita tsiteerimine sisse/välja",
+    "New line": "Reavahetus",
+    "Cancel replying to a message": "Tühista sõnumile vastamine",
+    "Toggle microphone mute": "Lülita mikrofoni summutamine sisse/välja",
+    "Toggle video on/off": "Lülita video kasutamine sisse/välja",
+    "Jump to room search": "Suundu jututoa otsingusse",
+    "Navigate up/down in the room list": "Suundu jututubade loendis üles/alla",
+    "Select room from the room list": "Vali tubade loendist jututuba",
+    "Collapse room list section": "Ahenda jututubade loendi valikut",
+    "Expand room list section": "Laienda jututubade loendi valikut"
 }

From 19fc6a93ec7004f6554bfffef82908512db88f1b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 10:41:35 +0200
Subject: [PATCH 2524/3235] fix tests

---
 src/Avatar.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Avatar.js b/src/Avatar.js
index 8084f30f33..2e176e569e 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -59,6 +59,10 @@ function urlForColor(color) {
     canvas.width = size;
     canvas.height = size;
     const ctx = canvas.getContext("2d");
+    // bail out when using jsdom in unit tests
+    if (!ctx) {
+        return "";
+    }
     ctx.fillStyle = color;
     ctx.fillRect(0, 0, size, size);
     return canvas.toDataURL();

From 90326955ba364a3957357f1d6f386abfc1746019 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:42:39 +0100
Subject: [PATCH 2525/3235] No need for a set here - bool is fine

---
 src/DeviceListener.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index a7b259e179..ad2553ca3c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -200,7 +200,7 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const unverifiedDeviceIds = new Set();
+            const haveUnverifiedDevices = false;
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
@@ -208,11 +208,12 @@ export default class DeviceListener {
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
                 if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    unverifiedDeviceIds.add(device.deviceId);
+                    haveUnverifiedDevices = true;
+                    break;
                 }
             }
 
-            if (unverifiedDeviceIds.size > 0) {
+            if (haveUnverifiedDevices) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: OTHER_DEVICES_TOAST_KEY,
                     title: _t("Review where you’re logged in"),

From 4dca66d140d0111a0ecd41d84465105b56018a63 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:43:24 +0100
Subject: [PATCH 2526/3235] No need for this if statement now

---
 src/components/views/right_panel/UserInfo.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index d3e8e81ebe..cafbf05a23 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -181,9 +181,7 @@ function DeviceItem({userId, device}) {
     });
 
     const onDeviceClick = () => {
-        if (!isVerified) {
-            verifyDevice(cli.getUser(userId), device);
-        }
+        verifyDevice(cli.getUser(userId), device);
     };
 
     const deviceName = device.ambiguous ?

From cad2f4d27da49b88f4524fbedad6d21d3a270894 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:49:03 +0100
Subject: [PATCH 2527/3235] Consts are constant

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index ad2553ca3c..1b451310b9 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -200,7 +200,7 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const haveUnverifiedDevices = false;
+            let haveUnverifiedDevices = false;
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {

From 4978f8a2a9be4dc5e71fccda432f41d254dd27bf Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 10:59:10 +0200
Subject: [PATCH 2528/3235] validate hex color

---
 src/Avatar.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 2e176e569e..8393ce02b2 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -53,6 +53,13 @@ export function avatarUrlForUser(user, width, height, resizeMethod) {
     return url;
 }
 
+function isValidHexColor(color) {
+    return typeof color === "string" &&
+        (color.length === 7 || color.lengh === 9) &&
+        color.charAt(0) === "#" &&
+        !color.substr(1).split("").some(c => isNaN(parseInt(c, 16)));
+}
+
 function urlForColor(color) {
     const size = 40;
     const canvas = document.createElement("canvas");
@@ -86,8 +93,14 @@ export function defaultAvatarUrlForString(s) {
     const color = cssValue || defaultColors[colorIndex];
     let dataUrl = colorToDataURLCache.get(color);
     if (!dataUrl) {
-        dataUrl = urlForColor(color);
-        colorToDataURLCache.set(color, dataUrl);
+        // validate color as this can come from account_data
+        // with custom theming
+        if (isValidHexColor(color)) {
+            dataUrl = urlForColor(color);
+            colorToDataURLCache.set(color, dataUrl);
+        } else {
+            dataUrl = "";
+        }
     }
     return dataUrl;
 }

From 8aeeff4204467e56211d027e36d160ec16f1477f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 06:56:41 +0000
Subject: [PATCH 2529/3235] Translated using Weblate (Estonian)

Currently translated at 13.8% (317 of 2296 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 71fd4db711..8b0206ded9 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -110,8 +110,8 @@
     "Create new room": "Loo uus jututuba",
     "Unblacklist": "Eemalda mustast nimekirjast",
     "Blacklist": "Kanna musta nimekirja",
-    "Unverify": "Eemalda õigeks tunnistamine",
-    "Verify...": "Tunnista õigeks...",
+    "Unverify": "Tühista verifitseerimine",
+    "Verify...": "Verifitseeri...",
     "Join": "Liitu",
     "No results": "Tulemusi pole",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Selle vea uurimiseks palun <newIssueLink>loo uus veateade</newIssueLink> meie GitHub'is.",
@@ -259,5 +259,66 @@
     "Navigate up/down in the room list": "Suundu jututubade loendis üles/alla",
     "Select room from the room list": "Vali tubade loendist jututuba",
     "Collapse room list section": "Ahenda jututubade loendi valikut",
-    "Expand room list section": "Laienda jututubade loendi valikut"
+    "Expand room list section": "Laienda jututubade loendi valikut",
+    "Create Account": "Loo konto",
+    "Sign In": "Logi sisse",
+    "Send a bug report with logs": "Saada veakirjeldus koos logidega",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Rühmita ja filtreeri jututubasid kohandatud siltide alusel (muudatuste rakendamiseks värskenda vaade)",
+    "Try out new ways to ignore people (experimental)": "Proovi uusi kasutajate eiramise viise (katseline)",
+    "Uploading report": "Laen üles veakirjeldust",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Kui soovid teatada Matrix'iga seotud turvaveast, siis palun tutvu enne Matrix.org <a>Turvalisuse avalikustamise juhendiga</a>.",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Lisa siia kasutajad ja serverid keda soovid eirata. Kasuta tärne kõikide märkide tähistamiseks. Näiteks <code>@bot:*</code> eiraks kõiki kasutajaid kõikidest serveritest, kus nimi on \"bot\".",
+    "Server or user ID to ignore": "Serverid või kasutajate tunnused, mida soovid eirata",
+    "Ignore": "Eira",
+    "If this isn't what you want, please use a different tool to ignore users.": "Kui tulemus pole see mida soovisid, siis pruugi muud vahendit kasutajate eiramiseks.",
+    "Sessions": "Sessioonid",
+    "Mention": "Maini",
+    "Share Link to User": "Jaga viidet kasutaja kohta",
+    "User Options": "Kasutaja valikud",
+    "Direct chats": "Isiklikud sõnumid",
+    "Admin Tools": "Haldustoimingud",
+    "Online": "Võrgus",
+    "Reject & Ignore user": "Hülga ja eira kasutaja",
+    "%(count)s unread messages including mentions.|one": "1 lugemata mainimine.",
+    "Filter results": "Filtreeri tulemusi",
+    "Ignore request": "Eira taotlust",
+    "Report bugs & give feedback": "Teata vigadest ja anna tagasisidet",
+    "Report Content to Your Homeserver Administrator": "Teata sisust Sinu koduserveri haldurile",
+    "Send report": "Saada veateade",
+    "(HTTP status %(httpStatus)s)": "(HTTP staatuse kood %(httpStatus)s)",
+    "Please set a password!": "Palun määra salasõna!",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "See võimaldab sul tagasi tulla oma kasutajakonto juurde ka peale väljalogimist ning logida sisse muudesse sessioonidesse.",
+    "Share Room": "Jaga jututuba",
+    "Link to most recent message": "Viide kõige viimasele sõnumile",
+    "Share User": "Jaga viidet kasutaja kohta",
+    "Share Community": "Jaga viidet kogukonna kohta",
+    "Share Room Message": "Jaga jututoa sõnumit",
+    "Link to selected message": "Viide valitud sõnumile",
+    "COPY": "KOPEERI",
+    "Command Help": "Abiteave käskude kohta",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Tagamaks et sama ei juhtuks tulevikus, palun <a>saada meile salvestatud logid</a>.",
+    "Missing session data": "Sessiooni andmed on puudu",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Osa sessiooniandmetest, sealhulgas sõnumi krüptovõtmed, on puudu. Vea parandamiseks logi välja ja sisse, vajadusel taasta võtmed varundusest.",
+    "Your browser likely removed this data when running low on disk space.": "On võimalik et sinu brauser kustutas need andmed, sest kõvakettaruumist jäi puudu.",
+    "Integration Manager": "Lõiminguhaldur",
+    "Find others by phone or email": "Leia teisi kasutajaid telefoninumbri või e-posti aadressi alsusel",
+    "Be found by phone or email": "Ole leitav telefoninumbri või e-posti aadressi alsusel",
+    "Terms of Service": "Kasutustingimused",
+    "To continue you need to accept the terms of this service.": "Jätkamaks pead nõustuma kasutustingimustega.",
+    "Service": "Teenus",
+    "Summary": "Kokkuvõte",
+    "Document": "Dokument",
+    "Next": "Järgmine",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Sa parasjagu oled kõik verifitseerimata sessioonid kandnud musta nimekirja. Sinna sõnumite saatmiseks sa pead nad enne verifitseerima.",
+    "Room contains unknown sessions": "Jututoas on tundmatuid sessioone",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" sisaldab sessioone, mida sa ei ole varem näinud.",
+    "Unknown sessions": "Tundmatud sessioonid",
+    "Report Content": "Teata sisust haldurile",
+    "powered by Matrix": "põhineb Matrix'il",
+    "Custom Server Options": "Serveri kohaldatud seadistused",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Robotilõksu avalik võti on puudu koduserveri seadistustes. Palun teata sellest oma koduserveri haldurile.",
+    "Filter": "Filtreeri",
+    "Clear filter": "Eemalda filter",
+    "Copy": "Kopeeri",
+    "Clear room list filter field": "Tühjenda jututubade filtriväli"
 }

From dfb2c66b6c12a5ddbd88213aaf691ae22bd1cb42 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 28 Apr 2020 02:41:30 +0000
Subject: [PATCH 2530/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2296 of 2296 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index b2e6c35e71..164e5500b3 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2402,5 +2402,7 @@
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "透過驗證這個從您的其他工作階段而來的登入來確認您的身份，並授予其對加密訊息的存取權限。",
     "This requires the latest Riot on your other devices:": "這需要在您的其他裝置上使用最新的 Riot：",
     "or another cross-signing capable Matrix client": "或另一個有交叉簽章功能的 Matrix 客戶端",
-    "Use Recovery Passphrase or Key": "使用復原通關密語或金鑰"
+    "Use Recovery Passphrase or Key": "使用復原通關密語或金鑰",
+    "Where you’re logged in": "您登入的地方",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。"
 }

From 41ef40a0e3d9b3ef2af5289a3b82cb7f6015513c Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <20200217translateriot@remi.im>
Date: Mon, 27 Apr 2020 23:00:41 +0000
Subject: [PATCH 2531/3235] Translated using Weblate (Dutch)

Currently translated at 91.1% (2092 of 2296 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 95a49bce8c..19f626bc0a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -2165,5 +2165,8 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Bekijk eerst het <a>beveiligingsopenbaarmakingsbeleid</a> van Matrix.org als u een probleem met de beveiliging van Matrix wilt melden.",
     "Not currently indexing messages for any room.": "Er worden momenteel voor geen enkel gesprek berichten geïndexeerd.",
     "Currently indexing: %(currentRoom)s.": "Wordt geïndexeerd: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s",
+    "Unverified login. Was this you?": "Ongeverifieerde aanmelding. Was u dit?",
+    "Where you’re logged in": "Waar u aangemeld bent",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies en meld ze af. <a>Of verifieer ze in uw gebruikersprofiel</a>."
 }

From 0b9423f6efb214abf66162ad1409a3259c4549a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Tue, 28 Apr 2020 06:35:00 +0000
Subject: [PATCH 2532/3235] Translated using Weblate (French)

Currently translated at 100.0% (2296 of 2296 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 a7b09ea8ac..dcec0da857 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2403,5 +2403,7 @@
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirmez votre identité en vérifiant cette connexion depuis une de vos autres sessions, cela lui permettra d’avoir accès aux messages chiffrés.",
     "This requires the latest Riot on your other devices:": "Ceci nécessite la dernière version de Riot sur vos autres appareils :",
     "or another cross-signing capable Matrix client": "ou un autre client Matrix compatible avec la signature croisée",
-    "Use Recovery Passphrase or Key": "Utiliser la phrase secrète ou la clé de récupération"
+    "Use Recovery Passphrase or Key": "Utiliser la phrase secrète ou la clé de récupération",
+    "Where you’re logged in": "Où vous vous êtes connecté",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gérez les noms et déconnectez-vous de vos sessions ci-dessous ou <a>vérifiez-les dans votre profil utilisateur</a>."
 }

From df28baf4f4eeb2ebf57cc37ba47488db78f0629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 09:28:54 +0000
Subject: [PATCH 2533/3235] Translated using Weblate (Estonian)

Currently translated at 14.0% (321 of 2296 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 8b0206ded9..77b860dc2b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -320,5 +320,9 @@
     "Filter": "Filtreeri",
     "Clear filter": "Eemalda filter",
     "Copy": "Kopeeri",
-    "Clear room list filter field": "Tühjenda jututubade filtriväli"
+    "Clear room list filter field": "Tühjenda jututubade filtriväli",
+    "Mute": "Summuta",
+    "Settings": "Seadistused",
+    "You're not currently a member of any communities.": "Sa ei ole hetkel ainsamagi kogukonna liige.",
+    "Create a new community": "Loo uus kogukond"
 }

From 9d1c73348c4b9038f8b82b3a1842cf85afcb58b0 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:58:24 +0100
Subject: [PATCH 2534/3235] Show progress when loading keys

---
 .../keybackup/RestoreKeyBackupDialog.js       | 25 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  3 +++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index dc82a71713..92d23f9e65 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -59,6 +59,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             forceRecoveryKey: false,
             passPhrase: '',
             restoreType: null,
+            progress: { stage: "prefetch" },
         };
     }
 
@@ -80,6 +81,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         });
     }
 
+    _progressCallback = (data) => {
+        this.setState({
+            progress: data,
+        });
+    }
+
     _onResetRecoveryClick = () => {
         this.props.onFinished(false);
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
@@ -110,6 +117,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             // is the right one and restoring it is currently the only way we can do this.
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
                 this.state.passPhrase, undefined, undefined, this.state.backupInfo,
+                { progressCallback: this._progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = await MatrixClientPeg.get().keyBackupKeyFromPassword(
@@ -146,6 +154,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         try {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo,
+                { progressCallback: this._progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = MatrixClientPeg.get().keyBackupKeyFromRecoveryKey(this.state.recoveryKey);
@@ -185,6 +194,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await accessSecretStorage(async () => {
                 return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
                     this.state.backupInfo,
+                    { progressCallback: this._progressCallback },
                 );
             });
             this.setState({
@@ -207,6 +217,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 undefined, /* targetRoomId */
                 undefined, /* targetSessionId */
                 backupInfo,
+                { progressCallback: this._progressCallback },
             );
             this.setState({
                 recoverInfo,
@@ -273,7 +284,19 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         let title;
         if (this.state.loading) {
             title = _t("Loading...");
-            content = <Spinner />;
+            let details;
+            if (this.state.progress.stage === "fetch") {
+                details = _t("Downloading from server...");
+            } else if (this.state.progress.stage === "load_keys") {
+                const { total, successes, failures } = this.state.progress;
+                details = _t("Loaded %(completed)s of %(total)s", { total, completed: successes + failures });
+            } else if (this.state.progress.stage === "prefetch") {
+                details = _t("Requesting from server...");
+            }
+            content = <div>
+                <div>{details}</div>
+                <Spinner />
+            </div>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bd4c8f58c8..ff9e5957d5 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1791,6 +1791,9 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
+    "Downloading from server": "Downloading from server",
+    "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
+    "Requesting from server...": "Requesting from server...",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",

From 689d6735fc62da4278a3d5aed88b5a822be394f6 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 28 Apr 2020 11:36:28 +0100
Subject: [PATCH 2535/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ff9e5957d5..e33a389e27 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1791,7 +1791,7 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Downloading from server": "Downloading from server",
+    "Downloading from server...": "Downloading from server...",
     "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
     "Requesting from server...": "Requesting from server...",
     "Unable to load backup status": "Unable to load backup status",

From a8407c9508a38b93465ab030e4d99ab8c86212ce Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:00:15 +0100
Subject: [PATCH 2536/3235] Use purecomponent

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/components/views/elements/Slider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 559bdd9ce2..3dfd0c686e 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -116,7 +116,7 @@ type DotIProps = {
     disabled: boolean;
 }
 
-class Dot extends React.Component<DotIProps> {
+class Dot extends React.PureComponent<DotIProps> {
     render(): React.ReactNode {
         let className = "mx_Slider_dot"
         if (!this.props.disabled && this.props.active) {

From c268b98ded295f9679ddf7eddef436a67ab86bb3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:17:50 +0100
Subject: [PATCH 2537/3235] Use faster lookup method

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 5c285d12e6..ed7d9ef495 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -168,7 +168,7 @@ export default class StyleUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Appearance")}</div>
                 {this._renderThemeSection()}
-                {SettingsStore.getValue("feature_font_scaling") ? this._renderFontSection() : null}
+                {SettingsStore.isFeatureEnabled("feature_font_scaling") ? this._renderFontSection() : null}
             </div>
         );
     }

From f91613f112d2b33839f32eb5500fd3a95f796b95 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 13:53:16 +0100
Subject: [PATCH 2538/3235] Remove redundent selectors.

Check _AppearanceUserSettingsTab
---
 res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 45aecd032f..5cc220bd33 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -15,8 +15,6 @@ limitations under the License.
 */
 
 .mx_GeneralUserSettingsTab_changePassword .mx_Field,
-.mx_StyleUserSettingsTab_themeSection .mx_Field,
-.mx_StyleUserSettingsTab_fontScaling .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
 

From 137b94703aad9344b5f4ab38d4b6e7e441396ab9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 13:59:00 +0100
Subject: [PATCH 2539/3235] Lint types

---
 src/components/views/elements/Slider.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 3dfd0c686e..722401801c 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -16,22 +16,22 @@ limitations under the License.
 
 import * as React from 'react';
 
-type IProps = {
-        // A callback for the selected value
-        onSelectionChange: (value: number) => void;
+interface IProps {
+    // A callback for the selected value
+    onSelectionChange: (value: number) => void;
 
-        // The current value of the slider
-        value: number;
+    // The current value of the slider
+    value: number;
 
-        // The range and values of the slider
-        // Currently only supports an ascending, constant interval range
-        values: number[];
+    // The range and values of the slider
+    // Currently only supports an ascending, constant interval range
+    values: number[];
 
-        // A function for formatting the the values
-        displayFunc: (value: number) => string;
+    // A function for formatting the the values
+    displayFunc: (value: number) => string;
 
-        // Whether the slider is disabled
-        disabled: boolean;
+    // Whether the slider is disabled
+    disabled: boolean;
 }
 
 export default class Slider extends React.Component<IProps> {

From 175b5e70b60f23dc446aba22da4f00d56aa2d624 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:09:54 +0100
Subject: [PATCH 2540/3235] Lint Slider

---
 src/components/views/elements/Slider.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 722401801c..6712ddd7fd 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -43,7 +43,7 @@ export default class Slider extends React.Component<IProps> {
     // y values.
     // Offset is used for finding the location of a value on a
     // non linear slider.
-    _offset(values: number[], value: number): number {
+    private offset(values: number[], value: number): number {
         // the index of the first number greater than value.
         let closest = values.reduce((prev, curr) => {
             return (value > curr ? prev + 1 : prev);
@@ -80,19 +80,21 @@ export default class Slider extends React.Component<IProps> {
                  disabled={this.props.disabled}
             />);
 
-        const offset = this._offset(this.props.values, this.props.value);
+        let selection = null;
+
+        if (this.props.disabled) {
+            const offset = this.offset(this.props.values, this.props.value);
+            selection = <div className="mx_Slider_selection">
+                <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
+                <hr style={{width: offset + "%"}} />
+            </div>
+        }
 
         return <div className="mx_Slider">
             <div>
                 <div className="mx_Slider_bar">
                     <hr />
-                    { this.props.disabled ?
-                        null :
-                        <div className="mx_Slider_selection">
-                            <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
-                            <hr style={{width: offset + "%"}} />
-                        </div>
-                    }
+                    { selection }
                 </div>
                 <div className="mx_Slider_dotContainer">
                     {dots}
@@ -102,7 +104,7 @@ export default class Slider extends React.Component<IProps> {
     }
 }
 
-type DotIProps = {
+interface IDotProps {
     // Callback for behavior onclick
     onClick: () => void,
 
@@ -116,7 +118,7 @@ type DotIProps = {
     disabled: boolean;
 }
 
-class Dot extends React.PureComponent<DotIProps> {
+class Dot extends React.PureComponent<IDotProps> {
     render(): React.ReactNode {
         let className = "mx_Slider_dot"
         if (!this.props.disabled && this.props.active) {

From 57d880ca5e2bde20a030f13d3f2257fe23e654b4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:24:44 +0100
Subject: [PATCH 2541/3235] Use correct name and indentation

---
 .../settings/tabs/user/AppearanceUserSettingsTab.js      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index ed7d9ef495..6c94a82c95 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -27,7 +27,7 @@ import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 import _range from "lodash/range";
 
-export default class StyleUserSettingsTab extends React.Component {
+export default class AppearanceUserSettingsTab extends React.Component {
     constructor() {
         super();
 
@@ -231,9 +231,10 @@ export default class StyleUserSettingsTab extends React.Component {
             <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_themeSection">
                 <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
                 {systemThemeSection}
-                <Field id="theme" label={_t("Theme")} element="select"
-                       value={this.state.theme} onChange={this._onThemeChange}
-                       disabled={this.state.useSystemTheme}
+                <Field
+                    id="theme" label={_t("Theme")} element="select"
+                    value={this.state.theme} onChange={this._onThemeChange}
+                    disabled={this.state.useSystemTheme}
                 >
                     {orderedThemes.map(theme => {
                         return <option key={theme.id} value={theme.id}>{theme.name}</option>;

From 93f24f12dcf839f35231e8ca9083f670c3f626d7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:26:08 +0100
Subject: [PATCH 2542/3235] Match filename to class

---
 src/{fontSize.js => FontWatcher.js}     | 0
 src/components/structures/MatrixChat.js | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{fontSize.js => FontWatcher.js} (100%)

diff --git a/src/fontSize.js b/src/FontWatcher.js
similarity index 100%
rename from src/fontSize.js
rename to src/FontWatcher.js
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 602d85f048..fec37472be 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -66,7 +66,7 @@ import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
-import { FontWatcher } from '../../fontSize';
+import { FontWatcher } from '../../FontWatcher';
 
 /** constants for MatrixChat.state.view */
 export const VIEWS = {

From 9ca843fdcbc9f6d5d12dddac23a11af686cc702e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:27:18 +0100
Subject: [PATCH 2543/3235] Correct return type in docs

Co-Authored-By: Travis Ralston <travpc@gmail.com>
---
 src/settings/SettingsStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 70ea5ac57c..b6856a5a6a 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -373,7 +373,7 @@ export default class SettingsStore {
     /**
      * Gets the default value of a setting.
      * @param {string} settingName The name of the setting to read the value of.
-     * @return {*} The value, or null if not found
+     * @return {*} The default value
      */
     static getDefaultValue(settingName, roomId = null, excludeDefault = false) {
         // Verify that the setting is actually a setting

From fe326b9f08534d70c36b0484e727304e8396ba8c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:30:56 +0100
Subject: [PATCH 2544/3235] Enfore function name capitalisation

---
 src/components/structures/RoomSubList.js        | 2 +-
 src/components/views/avatars/BaseAvatar.js      | 2 +-
 src/components/views/rooms/EventTile.js         | 4 ++--
 src/components/views/rooms/ReadReceiptMarker.js | 2 +-
 src/utils/rem.js                                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 1e3e15b4ec..b1e0bb9f9b 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -32,7 +32,7 @@ import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
 import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
-import toRem from "../../utils/rem";
+import {toRem} from "../../utils/rem";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index cbe083f3a2..e94a83f70b 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -24,7 +24,7 @@ import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import toRem from "../../../utils/rem";
+import {toRem} from "../../../utils/rem";
 
 export default createReactClass({
     displayName: 'BaseAvatar',
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index af14f6922c..0881fb3b67 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,7 +34,7 @@ import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
-import torem from "../../../utils/rem";
+import {toRem} from "../../../utils/rem";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -474,7 +474,7 @@ export default createReactClass({
             if (remainder > 0) {
                 remText = <span className="mx_EventTile_readAvatarRemainder"
                     onClick={this.toggleAllReadAvatars}
-                    style={{ right: "calc(" + torem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
+                    style={{ right: "calc(" + toRem(-left) + " + " + receiptOffset + "px)" }}>{ remainder }+
                 </span>;
             }
         }
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 85d443d55a..20d39a7f84 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
-import toRem from "../../../utils/rem";
+import {toRem} from "../../../utils/rem";
 
 let bounce = false;
 try {
diff --git a/src/utils/rem.js b/src/utils/rem.js
index 1f18c9de05..6278a91aa2 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // converts a pixel value to rem.
-export default function(pixelVal) {
+export function toRem(pixelVal) {
   return pixelVal / 15 + "rem";
 }

From 1289367a6b63f8e04e53da6ae5a2ae7e5a8e5455 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 14:31:24 +0100
Subject: [PATCH 2545/3235] Fix indentation

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

diff --git a/src/utils/rem.js b/src/utils/rem.js
index 6278a91aa2..3729b4d596 100644
--- a/src/utils/rem.js
+++ b/src/utils/rem.js
@@ -16,5 +16,5 @@ limitations under the License.
 
 // converts a pixel value to rem.
 export function toRem(pixelVal) {
-  return pixelVal / 15 + "rem";
+    return pixelVal / 15 + "rem";
 }

From eb72245493c1dbe163f85afbf97a26b68078e525 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 15:19:12 +0100
Subject: [PATCH 2546/3235] fix syntax error

---
 res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 5cc220bd33..0af7e30d97 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GeneralUserSettingsTab_changePassword .mx_Field,
+.mx_GeneralUserSettingsTab_changePassword .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
 

From 198edb06b93a3c750c5621e6bb7e12d4dfd73a3d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 16:35:20 +0200
Subject: [PATCH 2547/3235] use normal accessible button, which is themed

---
 res/css/views/rooms/_RoomRecoveryReminder.scss     | 5 -----
 src/components/views/rooms/RoomRecoveryReminder.js | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/res/css/views/rooms/_RoomRecoveryReminder.scss b/res/css/views/rooms/_RoomRecoveryReminder.scss
index 85d42ca4b4..09b28ae235 100644
--- a/res/css/views/rooms/_RoomRecoveryReminder.scss
+++ b/res/css/views/rooms/_RoomRecoveryReminder.scss
@@ -33,11 +33,6 @@ limitations under the License.
     margin-bottom: 1em;
 }
 
-.mx_RoomRecoveryReminder_button {
-    @mixin mx_DialogButton;
-    margin: 0 10px;
-}
-
 .mx_RoomRecoveryReminder_secondary {
     font-size: 90%;
     margin-top: 1em;
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index b1a5aa5f5e..a29467b07f 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -150,7 +150,7 @@ export default class RoomRecoveryReminder extends React.PureComponent {
                     )}</p>
                 </div>
                 <div className="mx_RoomRecoveryReminder_buttons">
-                    <AccessibleButton className="mx_RoomRecoveryReminder_button"
+                    <AccessibleButton kind="primary"
                         onClick={this.onSetupClick}>
                         {setupCaption}
                     </AccessibleButton>

From af8430b98aa5e47116e76ce3547da955ad18b1dd Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 15:48:54 +0100
Subject: [PATCH 2548/3235] Inverted boolean

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

diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index 6712ddd7fd..adb2a6063b 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -82,7 +82,7 @@ export default class Slider extends React.Component<IProps> {
 
         let selection = null;
 
-        if (this.props.disabled) {
+        if (!this.props.disabled) {
             const offset = this.offset(this.props.values, this.props.value);
             selection = <div className="mx_Slider_selection">
                 <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />

From 8b8b5256be5a8c2ab291288d3c9b55eebe1c4be7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 16:49:25 +0200
Subject: [PATCH 2549/3235] actually use timeline highlight color

---
 res/themes/light-custom/css/_custom.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 64c4cac7e3..6206496150 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -53,7 +53,6 @@ $tooltip-timeline-bg-color: var(--sidebar-color);
 $dialog-backdrop-color: var(--sidebar-color-50pct);
 //
 // --roomlist-background-color
-$event-selected-color: var(--roomlist-background-color);
 $header-panel-bg-color: var(--roomlist-background-color);
 $reaction-row-button-bg-color: var(--roomlist-background-color);
 $panel-gradient: var(--roomlist-background-color-0pct), var(--roomlist-background-color);
@@ -134,3 +133,6 @@ $username-variant5-color: var(--username-colors_5, $username-variant5-color);
 $username-variant6-color: var(--username-colors_6, $username-variant6-color);
 $username-variant7-color: var(--username-colors_7, $username-variant7-color);
 $username-variant8-color: var(--username-colors_8, $username-variant8-color);
+
+$event-selected-color: var(--timeline-highlights-color);
+$event-highlight-bg-color: var(--timeline-highlights-color);

From 4e6748416c3d68757588e563d24f516dc17880c6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 15:53:12 +0100
Subject: [PATCH 2550/3235] Fix i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bff1b8f415..58226595f7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -405,7 +405,6 @@
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",
     "Font size": "Font size",
     "Min font size": "Min font size",
     "Max font size": "Max font size",

From 132a753deb787bb626b2431b7f0434debc3c1b74 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 28 Apr 2020 15:55:26 +0100
Subject: [PATCH 2551/3235] Lint getDefaultValue

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

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index b6856a5a6a..688925de40 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -373,9 +373,10 @@ export default class SettingsStore {
     /**
      * Gets the default value of a setting.
      * @param {string} settingName The name of the setting to read the value of.
+     * @param {String} roomId The room ID to read the setting value in, may be null.
      * @return {*} The default value
      */
-    static getDefaultValue(settingName, roomId = null, excludeDefault = false) {
+    static getDefaultValue(settingName) {
         // Verify that the setting is actually a setting
         if (!SETTINGS[settingName]) {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");

From 6b28dfa50caa88addf7836f67afbc4545b6d91f7 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 28 Apr 2020 13:34:01 +0000
Subject: [PATCH 2552/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2297 of 2297 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 78020c7bb8..bb2bf3c95b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2400,5 +2400,9 @@
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Conferma la tua identità verificando questo accesso da una delle tue altre sessioni, dandogli l'accesso ai messaggi cifrati.",
     "This requires the latest Riot on your other devices:": "È richiesta l'ultima versione di Riot sui tuoi altri dispositivi:",
     "or another cross-signing capable Matrix client": "o un altro client Matrix che supporti la firma incrociata",
-    "Use Recovery Passphrase or Key": "Usa la password di ripristino o la chiave"
+    "Use Recovery Passphrase or Key": "Usa la password di ripristino o la chiave",
+    "Review where you’re logged in": "Controlla dove hai fatto l'accesso",
+    "Verify your other sessions": "Verifica le tue altre sessioni",
+    "Where you’re logged in": "Dove hai fatto l'accesso",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestisci i nomi e disconnettiti dalle tue sessioni sotto o <a>verificale nel tuo profilo utente</a>."
 }

From 32c512dbfee7a8bd115539119011aa7a106d1b5a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Apr 2020 17:49:10 +0100
Subject: [PATCH 2553/3235] Fix internal link styling in Security Settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../settings/tabs/user/_SecurityUserSettingsTab.scss      | 8 ++++++++
 .../views/settings/tabs/user/SecurityUserSettingsTab.js   | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index b5a6693006..849979f444 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -55,3 +55,11 @@ limitations under the License.
 .mx_SecurityUserSettingsTab_ignoredUser .mx_AccessibleButton {
     margin-right: 10px;
 }
+
+.mx_SecurityUserSettingsTab {
+    .mx_SettingsTab_section {
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+}
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 1a74bbdf93..a4336a81f3 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -112,7 +112,7 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onGoToUserProfileClick = () => {
-        // close the settings dialog & let the default action run (ie. navigate to the link)
+        window.location.href = "#/user/" + MatrixClientPeg.get().getUserId();
         this.props.closeSettingsFn();
     }
 
@@ -327,9 +327,9 @@ export default class SecurityUserSettingsTab extends React.Component {
                             "Manage the names of and sign out of your sessions below or " +
                             "<a>verify them in your User Profile</a>.", {},
                             {
-                                a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
-                                    onClick={this._onGoToUserProfileClick}
-                                >{sub}</a>,
+                                a: sub => <AccessibleButton kind="link" onClick={this._onGoToUserProfileClick}>
+                                    {sub}
+                                </AccessibleButton>,
                             },
                         )}
                     </span>

From a63dd664a1b18f55829fbb878b0b45eb19f9b838 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Apr 2020 17:57:32 +0100
Subject: [PATCH 2554/3235] fix font-size

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index 849979f444..8700f8747d 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -60,6 +60,7 @@ limitations under the License.
     .mx_SettingsTab_section {
         .mx_AccessibleButton_kind_link {
             padding: 0;
+            font-size: inherit;
         }
     }
 }

From 719faed2ff50e3bb0dca2a827fa6c73e174b2d84 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 18:35:16 +0100
Subject: [PATCH 2555/3235] Separate toasts for existing & new device
 verification

Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
---
 src/DeviceListener.js                         | 104 +++++++++++++++---
 src/SlashCommands.tsx                         |   2 +-
 .../views/right_panel/EncryptionPanel.js      |   6 +-
 src/components/views/right_panel/UserInfo.js  |   4 +-
 src/components/views/rooms/MemberInfo.js      |  11 +-
 ...oast.js => BulkUnverifiedSessionsToast.js} |  13 ++-
 src/i18n/strings/en_EN.json                   |   7 +-
 src/utils/ShieldUtils.ts                      |   4 +-
 src/verification.js                           |  64 +++++------
 test/utils/ShieldUtils-test.js                |   2 +-
 10 files changed, 138 insertions(+), 79 deletions(-)
 rename src/components/views/toasts/{UnverifiedSessionToast.js => BulkUnverifiedSessionsToast.js} (78%)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 1b451310b9..e3b833a340 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -24,6 +24,10 @@ const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 const THIS_DEVICE_TOAST_KEY = 'setupencryption';
 const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
 
+function toastKey(deviceId) {
+    return "unverified_session_" + deviceId;
+}
+
 export default class DeviceListener {
     static sharedInstance() {
         if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
@@ -39,9 +43,18 @@ export default class DeviceListener {
         // cache of the key backup info
         this._keyBackupInfo = null;
         this._keyBackupFetchedAt = null;
+
+        // We keep a list of our own device IDs so we can batch ones that were already
+        // there the last time the app launched into a single toast, but display new
+        // ones in their own toasts.
+        this._ourDeviceIdsAtStart = null;
+
+        // The set of device IDs we're currently displaying toasts for
+        this._displayingToastsForDeviceIds = new Set();
     }
 
     start() {
+        MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
         MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
         MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
@@ -53,6 +66,7 @@ export default class DeviceListener {
 
     stop() {
         if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
             MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
             MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
@@ -66,10 +80,15 @@ export default class DeviceListener {
         this._keyBackupFetchedAt = null;
     }
 
-    async dismissVerifications() {
-        const cli = MatrixClientPeg.get();
-        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
-        this._dismissed = new Set(devices.filter(d => d.deviceId !== cli.deviceId).map(d => d.deviceId));
+    /**
+     * Dismiss notifications about our own unverified devices
+     *
+     * @param {String[]} deviceIds List of device IDs to dismiss notifications for
+     */
+    async dismissUnverifiedSessions(deviceIds) {
+        for (const d of deviceIds) {
+            this._dismissed.add(d);
+        }
 
         this._recheck();
     }
@@ -79,6 +98,20 @@ export default class DeviceListener {
         this._recheck();
     }
 
+    _ensureDeviceIdsAtStartPopulated() {
+        if (this._ourDeviceIdsAtStart === null) {
+            const cli = MatrixClientPeg.get();
+            this._ourDeviceIdsAtStart = new Set(
+                cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
+            );
+        }
+    }
+
+    _onWillUpdateDevices = async (users) => {
+        const myUserId = MatrixClientPeg.get().getUserId();
+        if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+    }
+
     _onDevicesUpdated = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
         this._recheck();
@@ -143,6 +176,8 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
+        this._ensureDeviceIdsAtStartPopulated();
+
         if (this._dismissedThisDeviceToast) {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
@@ -197,32 +232,65 @@ export default class DeviceListener {
             }
         }
 
+        // Unverified devices that were there last time the app ran
+        // (technically could just be a boolean: we don't actually
+        // need to remember the device IDs, but for the sake of
+        // symmetry...).
+        const oldUnverifiedDeviceIds = new Set();
+        // Unverified devices that have appeared since then
+        const newUnverifiedDeviceIds = new Set();
+
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            let haveUnverifiedDevices = false;
-
-            const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+            const devices = cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
                 if (device.deviceId == cli.deviceId) continue;
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
                 if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    haveUnverifiedDevices = true;
-                    break;
+                    if (this._ourDeviceIdsAtStart.has(device.deviceId)) {
+                        oldUnverifiedDeviceIds.add(device.deviceId);
+                    } else {
+                        newUnverifiedDeviceIds.add(device.deviceId);
+                    }
                 }
             }
+        }
 
-            if (haveUnverifiedDevices) {
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: OTHER_DEVICES_TOAST_KEY,
-                    title: _t("Review where you’re logged in"),
-                    icon: "verification_warning",
-                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                });
-            } else {
-                ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
+        // Display or hide the batch toast for old unverified sessions
+        if (oldUnverifiedDeviceIds.size > 0) {
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: OTHER_DEVICES_TOAST_KEY,
+                title: _t("Review where you’re logged in"),
+                icon: "verification_warning",
+                props: {
+                    deviceIds: oldUnverifiedDeviceIds,
+                },
+                component: sdk.getComponent("toasts.BulkUnverifiedSessionsToast"),
+            });
+        } else {
+            ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
+        }
+
+        // Show toasts for new unverified devices if they aren't already there
+        for (const deviceId of newUnverifiedDeviceIds) {
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: toastKey(deviceId),
+                title: _t("Unverified login. Was this you?"),
+                icon: "verification_warning",
+                props: { deviceId },
+                component: sdk.getComponent("toasts.UnverifiedSessionToast"),
+            });
+        }
+
+        // ...and hide any we don't need any more
+        for (const deviceId of this._displayingToastsForDeviceIds) {
+            if (!newUnverifiedDeviceIds.has(deviceId)) {
+                ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
             }
         }
+
+        this._displayingToastsForDeviceIds = newUnverifiedDeviceIds;
     }
 }
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 7b9bbeface..bd7e60e2f4 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -836,7 +836,7 @@ export const Commands = [
                     const fingerprint = matches[3];
 
                     return success((async () => {
-                        const device = await cli.getStoredDevice(userId, deviceId);
+                        const device = cli.getStoredDevice(userId, deviceId);
                         if (!device) {
                             throw new Error(_t('Unknown (user, session) pair:') + ` (${userId}, ${deviceId})`);
                         }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 476b6cace9..bc580c767b 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -22,7 +22,6 @@ import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import {useAsyncMemo} from "../../../hooks/useAsyncMemo";
 import Modal from "../../../Modal";
 import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
@@ -47,10 +46,7 @@ const EncryptionPanel = (props) => {
     }, [verificationRequest]);
 
     const deviceId = request && request.channel.deviceId;
-    const device = useAsyncMemo(() => {
-        const cli = MatrixClientPeg.get();
-        return cli.getStoredDevice(cli.getUserId(), deviceId);
-    }, [deviceId]);
+    const device = MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
 
     useEffect(() => {
         async function awaitPromise() {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index cafbf05a23..61f5a8161a 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1110,7 +1110,7 @@ export const useDevices = (userId) => {
         async function _downloadDeviceList() {
             try {
                 await cli.downloadKeys([userId], true);
-                const devices = await cli.getStoredDevicesForUser(userId);
+                const devices = cli.getStoredDevicesForUser(userId);
 
                 if (cancelled) {
                     // we got cancelled - presumably a different user now
@@ -1135,7 +1135,7 @@ export const useDevices = (userId) => {
     useEffect(() => {
         let cancel = false;
         const updateDevices = async () => {
-            const newDevices = await cli.getStoredDevicesForUser(userId);
+            const newDevices = cli.getStoredDevicesForUser(userId);
             if (cancel) return;
             setDevices(newDevices);
         };
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 9fdd2abedf..be3e8cf971 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -160,13 +160,10 @@ export default createReactClass({
             // no need to re-download the whole thing; just update our copy of
             // the list.
 
-            // Promise.resolve to handle transition from static result to promise; can be removed
-            // in future
-            Promise.resolve(this.context.getStoredDevicesForUser(userId)).then((devices) => {
-                this.setState({
-                    devices: devices,
-                    e2eStatus: this._getE2EStatus(devices),
-                });
+            const devices = this.context.getStoredDevicesForUser(userId);
+            this.setState({
+                devices: devices,
+                e2eStatus: this._getE2EStatus(devices),
             });
         }
     },
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
similarity index 78%
rename from src/components/views/toasts/UnverifiedSessionToast.js
rename to src/components/views/toasts/BulkUnverifiedSessionsToast.js
index 886e3c4c20..b16dc87f21 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -22,14 +23,18 @@ import DeviceListener from '../../../DeviceListener';
 import FormButton from '../elements/FormButton';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
 
-@replaceableComponent("views.toasts.UnverifiedSessionToast")
-export default class UnverifiedSessionToast extends React.PureComponent {
+@replaceableComponent("views.toasts.BulkUnverifiedSessionsToast")
+export default class BulkUnverifiedSessionsToast extends React.PureComponent {
+    static propTypes = {
+        deviceIds: PropTypes.array,
+    }
+
     _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissVerifications();
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
     };
 
     _onReviewClick = async () => {
-        DeviceListener.sharedInstance().dismissVerifications();
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
 
         dis.dispatch({
             action: 'view_user_info',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a308f91748..8ffc35fda6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -106,6 +106,7 @@
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
     "Review where you’re logged in": "Review where you’re logged in",
+    "Unverified login. Was this you?": "Unverified login. Was this you?",
     "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",
@@ -558,14 +559,14 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
+    "Verify your other sessions": "Verify your other sessions",
+    "Later": "Later",
+    "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
     "Update your secure storage": "Update your secure storage",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Later": "Later",
-    "Verify your other sessions": "Verify your other sessions",
-    "Review": "Review",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 9bf6fe2327..adaa961a00 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -7,7 +7,7 @@ interface Client {
         isCrossSigningVerified: () => boolean
         wasCrossSigningVerified: () => boolean
     };
-    getStoredDevicesForUser: (userId: string) => Promise<[{ deviceId: string }]>;
+    getStoredDevicesForUser: (userId: string) => [{ deviceId: string }];
     checkDeviceTrust: (userId: string, deviceId: string) => {
         isVerified: () => boolean
     }
@@ -45,7 +45,7 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<s
                         (members.length === 1);     // Do alarm for self if we're alone in a room
     const targets = includeUser ? [...verified, client.getUserId()] : verified;
     for (const userId of targets) {
-        const devices = await client.getStoredDevicesForUser(userId);
+        const devices = client.getStoredDevicesForUser(userId);
         const anyDeviceNotVerified = devices.some(({deviceId}) => {
             return !client.checkDeviceTrust(userId, deviceId).isVerified();
         });
diff --git a/src/verification.js b/src/verification.js
index 630da01091..d7287552dd 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -23,7 +23,6 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
-import NewSessionReviewDialog from './components/views/dialogs/NewSessionReviewDialog';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
@@ -70,41 +69,34 @@ export async function verifyDevice(user, device) {
         }
     }
 
-    if (user.userId === cli.getUserId()) {
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
-            userId: user.userId,
-            device,
-        });
-    } else {
-        Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
-            user,
-            device,
-            onFinished: async (action) => {
-                if (action === "sas") {
-                    const verificationRequestPromise = cli.legacyDeviceVerification(
-                        user.userId,
-                        device.deviceId,
-                        verificationMethods.SAS,
-                    );
-                    dis.dispatch({
-                        action: "set_right_panel_phase",
-                        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                        refireParams: {member: user, verificationRequestPromise},
-                    });
-                } else if (action === "legacy") {
-                    const ManualDeviceKeyVerificationDialog =
-                        sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
-                    Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
-                        ManualDeviceKeyVerificationDialog,
-                        {
-                            userId: user.userId,
-                            device,
-                        },
-                    );
-                }
-            },
-        });
-    }
+    Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
+        user,
+        device,
+        onFinished: async (action) => {
+            if (action === "sas") {
+                const verificationRequestPromise = cli.legacyDeviceVerification(
+                    user.userId,
+                    device.deviceId,
+                    verificationMethods.SAS,
+                );
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {member: user, verificationRequestPromise},
+                });
+            } else if (action === "legacy") {
+                const ManualDeviceKeyVerificationDialog =
+                    sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
+                    ManualDeviceKeyVerificationDialog,
+                    {
+                        userId: user.userId,
+                        device,
+                    },
+                );
+            }
+        },
+    });
 }
 
 export async function legacyVerifyUser(user) {
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 5f676579fa..e4c0c671e3 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -11,7 +11,7 @@ function mkClient(selfTrust) {
         checkDeviceTrust: (userId, deviceId) => ({
             isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T",
         }),
-        getStoredDevicesForUser: async (userId) => ["DEVICE"],
+        getStoredDevicesForUser: (userId) => ["DEVICE"],
     };
 }
 

From 3703db237648e2840757b31cb63f3fab825b2dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 19:45:41 +0000
Subject: [PATCH 2556/3235] Translated using Weblate (Estonian)

Currently translated at 14.1% (323 of 2297 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 77b860dc2b..7264a6080c 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -324,5 +324,7 @@
     "Mute": "Summuta",
     "Settings": "Seadistused",
     "You're not currently a member of any communities.": "Sa ei ole hetkel ainsamagi kogukonna liige.",
-    "Create a new community": "Loo uus kogukond"
+    "Create a new community": "Loo uus kogukond",
+    "Never send encrypted messages to unverified sessions from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas"
 }

From aa0bb917334c2b625ac9ae70bababff03c0f55b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 20:39:03 +0000
Subject: [PATCH 2557/3235] Translated using Weblate (Estonian)

Currently translated at 18.0% (413 of 2297 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7264a6080c..b98abc5bd3 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -326,5 +326,95 @@
     "You're not currently a member of any communities.": "Sa ei ole hetkel ainsamagi kogukonna liige.",
     "Create a new community": "Loo uus kogukond",
     "Never send encrypted messages to unverified sessions from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas"
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas",
+    "Sign In or Create Account": "Logi sisse või loo uus konto",
+    "Use your account or create a new one to continue.": "Jätkamaks kasuta oma kontot või loo uus konto.",
+    "Anyone": "Kõik kasutajad",
+    "Encryption": "Krüptimine",
+    "Once enabled, encryption cannot be disabled.": "Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada.",
+    "Encrypted": "Krüptitud",
+    "Who can access this room?": "Kes pääsevad ligi siia jututuppa?",
+    "Who can read history?": "Kes võib lugeda ajalugu?",
+    "Encrypted by an unverified session": "Krüptitud verifitseerimata sessiooni poolt",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri see kasutaja tema kasutajaprofiilis.",
+    "Encryption not enabled": "Krüptimine ei ole kasutusel",
+    "The encryption used by this room isn't supported.": "Selles jututoas kasutatud krüptimine ei ole toetatud.",
+    "Error decrypting audio": "Viga helivoo dekrüptimisel",
+    "React": "Reageeri",
+    "Reply": "Vasta",
+    "Edit": "Muuda",
+    "Message Actions": "Tegevused sõnumitega",
+    "Attachment": "Manus",
+    "Error decrypting attachment": "Viga manuse dekrüptimisel",
+    "Decrypt %(text)s": "Dekrüpti %(text)s",
+    "Download %(text)s": "Lae alla %(text)s",
+    "Invalid file%(extra)s": "Vigane fail %(extra)s",
+    "Error decrypting image": "Viga pildi dekrüptimisel",
+    "Show image": "Näita pilti",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Sa oled seda kasutajat eiranud ja seega tema sõnum on peidetud. <a>Näita seda ikkagi.</a>",
+    "You verified %(name)s": "Sa verifitseerisid %(name)s",
+    "You cancelled verifying %(name)s": "Sa tühistasid %(name)s verifitseerimise",
+    "%(name)s cancelled verifying": "%(name)s tühistas verifitseerimise",
+    "You accepted": "Sa nõustusid",
+    "%(name)s accepted": "%(name)s nõustus",
+    "You declined": "Sa keeldusid",
+    "You cancelled": "Sa tühistasid",
+    "%(name)s declined": "%(name)s keeldus",
+    "%(name)s cancelled": "%(name)s tühistas",
+    "Accepting …": "Nõustun …",
+    "Declining …": "Keeldun …",
+    "%(name)s wants to verify": "%(name)s soovib verifitseerida",
+    "You sent a verification request": "Sa saatsid verifitseerimispalve",
+    "Error decrypting video": "Viga videovoo dekrüptimisel",
+    "Show all": "Näita kõiki",
+    "Reactions": "Reageerimised",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reageeris: %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reageeris(id) %(shortName)s</reactedWith>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutis %(roomName)s jututoa avatari",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eemaldas jututoa avatari.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vahetas jututoa avatariks <img/>",
+    "This room is a continuation of another conversation.": "See jututuba on järg varasemale vestlusele.",
+    "Click here to see older messages.": "Vanemate sõnumite nägemiseks klõpsi siia.",
+    "Copied!": "Kopeeritud!",
+    "Failed to copy": "Kopeerimine ebaõnnestus",
+    "Edited at %(date)s. Click to view edits.": "Muudetud %(date)s. Klõpsi et näha varasemaid versioone.",
+    "edited": "muudetud",
+    "Can't load this message": "Selle sõnumi laadimine ei õnnestu",
+    "Submit logs": "Saada rakenduse logid",
+    "Removed or unknown message type": "Kustutatud või tundmatu sõnumi tüüp",
+    "Message removed by %(userId)s": "Kasutaja %(userId)s poolt kustutatud sõnum",
+    "Message removed": "Sõnum on kustutatud",
+    "Invite to this community": "Kutsu selle kogukonna liikmeks",
+    "Something went wrong!": "Midagi läks nüüd valesti!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Jututoa %(roomName)s nähtavust %(groupId)s kogukonnas ei õnnestunud värskendada.",
+    "Visibility in Room List": "Nähtavus jututubade loendis",
+    "Visible to everyone": "Nähtav kõigile",
+    "Something went wrong when trying to get your communities.": "Sinu kogukondade laadimisel läks midagi nüüd viltu.",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Palun aita Riot'it paremaks teha saates arendajatele <UsageDataLink>anonüümset kasutusteavet</UsageDataLink>. See eeldab küpsise kasutamist (palun vaata meie <PolicyLink>küpsiste kasutuse reegleid</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Palun aita Riot'it paremaks teha saates <UsageDataLink>anonüümset kasutusteavet</UsageDataLink>. See eeldab küpsise kasutamist.",
+    "Yes, I want to help!": "Jah, ma soovin aidata!",
+    "You are not receiving desktop notifications": "Sa hetkel ei saa oma arvuti töölauakeskkonna teavitusi",
+    "Enable them now": "Võta need nüüd kasutusele",
+    "What's New": "Meie uudised",
+    "Update": "Uuenda",
+    "What's new?": "Mida on meil uut?",
+    "A new version of Riot is available.": "Uus Riot'i versioon on saadaval.",
+    "Your server": "Sinu server",
+    "Matrix": "Matrix",
+    "Add a new server": "Lisa uus server",
+    "Server name": "Serveri nimi",
+    "Add a new server...": "Lisa uus server...",
+    "Matrix ID": "Matrix'i kasutajatunnus",
+    "Matrix Room ID": "Matrix'i jututoa tunnus",
+    "email address": "e-posti aadress",
+    "That doesn't look like a valid email address": "See ei tundu olema e-posti aadressi moodi",
+    "You have entered an invalid address.": "Sa oled sisestanud vigase e-posti aadressi.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Proovi mõnda nendest sobilikest aadressitüüpidest: %(validTypesList)s.",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Blokeeri teiste matrixi koduserverite kasutajate liitumine selle jututoaga (seda ei saa hiljem enam muuta!)",
+    "Create Room": "Loo jututuba",
+    "Sign out": "Logi välja",
+    "Incompatible Database": "Mitteühilduv andmebaas",
+    "Continue With Encryption Disabled": "Jätka ilma krüptimiseta",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Sinu verifitseerimata sessioon '%(displayName)s' soovib saada krüptimisvõtmeid.",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>."
 }

From aaf676705a9c56d86200b9bf66079f5efe22d510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 21:44:38 +0000
Subject: [PATCH 2558/3235] Translated using Weblate (Estonian)

Currently translated at 19.7% (453 of 2297 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b98abc5bd3..6771510b98 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -416,5 +416,40 @@
     "Incompatible Database": "Mitteühilduv andmebaas",
     "Continue With Encryption Disabled": "Jätka ilma krüptimiseta",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Sinu verifitseerimata sessioon '%(displayName)s' soovib saada krüptimisvõtmeid.",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>."
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>.",
+    "device id: ": "seadme tunnus: ",
+    "%(duration)ss": "%(duration)s sekund(it)",
+    "%(duration)sm": "%(duration)s minut(it)",
+    "%(duration)sh": "%(duration)s tund(i)",
+    "%(duration)sd": "%(duration)s päev(a)",
+    "Online for %(duration)s": "Võrgus %(duration)s",
+    "Idle for %(duration)s": "Jõude %(duration)s",
+    "Offline for %(duration)s": "Võrgust väljas %(duration)s",
+    "Unknown for %(duration)s": "Teadmata olek viimased %(duration)s",
+    "Idle": "Jõude",
+    "Offline": "Võrgust väljas",
+    "Unknown": "Teadmata olek",
+    "Seen by %(userName)s at %(dateTime)s": "Nähtud %(userName)s poolt %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Nähtud %(displayName)s (%(userName)s) poolt %(dateTime)s",
+    "Replying": "Vastan",
+    "Room %(name)s": "Jututuba %(name)s",
+    "Unnamed room": "Nimeta jututuba",
+    "World readable": "Kogu maailmale avali",
+    "Guests can join": "Külalised võivad liituda",
+    "(~%(count)s results)|other": "(~%(count)s tulemust)",
+    "(~%(count)s results)|one": "(~%(count)s tulemus)",
+    "Join Room": "Liitu jututoaga",
+    "Forget room": "Unusta jututuba",
+    "Search": "Otsing",
+    "Share room": "Jaga jututuba",
+    "Community Invites": "Kutsed kogukonda",
+    "Invites": "Kutsed",
+    "Favourites": "Lemmikud",
+    "Low priority": "Vähetähtis",
+    "Historical": "Ammune",
+    "System Alerts": "Süsteemi teated",
+    "This room": "See jututuba",
+    "Joining room …": "Liitun jututoaga …",
+    "Loading …": "Laen …",
+    "Device ID": "Seadme tunnus"
 }

From 921d178df0659eac93e2bdc1200aeb348026d812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 22:01:35 +0000
Subject: [PATCH 2559/3235] Translated using Weblate (Estonian)

Currently translated at 20.2% (465 of 2297 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 6771510b98..9e7e9a326f 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -451,5 +451,17 @@
     "This room": "See jututuba",
     "Joining room …": "Liitun jututoaga …",
     "Loading …": "Laen …",
-    "Device ID": "Seadme tunnus"
+    "Device ID": "Seadme tunnus",
+    "e.g. %(exampleValue)s": "näiteks %(exampleValue)s",
+    "Could not find user in room": "Jututoast ei leidnud kasutajat",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näita ajatempleid 12-tunnises vomingus (näiteks 2:30pl)",
+    "New published address (e.g. #alias:server)": "Uus avaldatud aadess (näiteks #alias:server)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Uus kogukonna tunnus (näiteks +midagi:%(localDomain)s)",
+    "e.g. my-room": "näiteks minu-jututuba",
+    "Can't find this server or its room list": "Ei leia seda serverit ega tema jututubade loendit",
+    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Kui sa ei leia kedagi, siis küsi tema kasutajanime (näiteks @kasutaja:server.ee) või <a>jaga seda jututuba</a>.",
+    "Couldn't find a matching Matrix room": "Ei leidnud vastavat Matrix'i jututuba",
+    "Find a room…": "Leia jututuba…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Otsi jututuba… (näiteks %(exampleRoom)s)",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida."
 }

From 733919253545e2daa3e79554c6b6c19b77197d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 28 Apr 2020 22:11:52 +0000
Subject: [PATCH 2560/3235] Translated using Weblate (Estonian)

Currently translated at 20.3% (466 of 2297 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 9e7e9a326f..9cb5dbfb4b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -463,5 +463,6 @@
     "Couldn't find a matching Matrix room": "Ei leidnud vastavat Matrix'i jututuba",
     "Find a room…": "Leia jututuba…",
     "Find a room… (e.g. %(exampleRoom)s)": "Otsi jututuba… (näiteks %(exampleRoom)s)",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida."
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.",
+    "Options": "Valikud"
 }

From 2acb1663eb67473738511c3b6aa22899c9344cb3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 01:01:56 +0100
Subject: [PATCH 2561/3235] Appease the prop types

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 6c94a82c95..d089b4f6e0 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -274,8 +274,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 type="text"
                 label={_t("Font size")}
                 autoComplete="off"
-                placeholder={this.state.fontSize}
-                value={this.state.fontSize}
+                placeholder={toString(this.state.fontSize)}
+                value={toString(this.state.fontSize)}
                 id="font_size_field"
                 onValidate={this._onValidateFontSize}
                 onChange={({value}) => this.setState({fontSize: value})}

From 4e98b5b4b60e150f4ed594b280a3fd733803ee40 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 17:41:10 +0200
Subject: [PATCH 2562/3235] dont enable e2ee when inviting a 3pid

---
 src/components/views/dialogs/InviteDialog.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a46fa0df07..a2a0eddd8e 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -577,10 +577,13 @@ export default class InviteDialog extends React.PureComponent {
         if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
-            const client = MatrixClientPeg.get();
-            const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
-            if (allHaveDeviceKeys) {
-                createRoomOptions.encryption = true;
+            const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
+            if (!containsNonMatrixUsers) {
+                const client = MatrixClientPeg.get();
+                const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
+                if (allHaveDeviceKeys) {
+                    createRoomOptions.encryption = true;
+                }
             }
         }
 

From f06a69d8ccaac280c834baf02166154777588e18 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 18:38:54 +0200
Subject: [PATCH 2563/3235] targets can also contain RoomMember, so take the
 positive case rather

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a2a0eddd8e..759228babd 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -577,8 +577,8 @@ export default class InviteDialog extends React.PureComponent {
         if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
-            const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
-            if (!containsNonMatrixUsers) {
+            const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
+            if (has3PidMembers) {
                 const client = MatrixClientPeg.get();
                 const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
                 if (allHaveDeviceKeys) {

From 35487c9e0233dceb150445ba509b5005fd088f6f Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 29 Apr 2020 03:14:37 +0000
Subject: [PATCH 2564/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2297 of 2297 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 164e5500b3..06b0bed44c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2404,5 +2404,7 @@
     "or another cross-signing capable Matrix client": "或另一個有交叉簽章功能的 Matrix 客戶端",
     "Use Recovery Passphrase or Key": "使用復原通關密語或金鑰",
     "Where you’re logged in": "您登入的地方",
-    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。"
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。",
+    "Review where you’re logged in": "審閱您的登入位置",
+    "Verify your other sessions": "驗證您其他的工作階段"
 }

From b11c8c3da02089ed1cbcebaa95e9377104eef413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 29 Apr 2020 07:22:56 +0000
Subject: [PATCH 2565/3235] Translated using Weblate (French)

Currently translated at 100.0% (2297 of 2297 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 dcec0da857..9b373cc364 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2405,5 +2405,7 @@
     "or another cross-signing capable Matrix client": "ou un autre client Matrix compatible avec la signature croisée",
     "Use Recovery Passphrase or Key": "Utiliser la phrase secrète ou la clé de récupération",
     "Where you’re logged in": "Où vous vous êtes connecté",
-    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gérez les noms et déconnectez-vous de vos sessions ci-dessous ou <a>vérifiez-les dans votre profil utilisateur</a>."
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gérez les noms et déconnectez-vous de vos sessions ci-dessous ou <a>vérifiez-les dans votre profil utilisateur</a>.",
+    "Review where you’re logged in": "Vérifier où vous vous êtes connecté",
+    "Verify your other sessions": "Vérifier vos autres sessions"
 }

From 246c70c6a19927dc092c09ec8653162c3ad8ed43 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Apr 2020 17:49:10 +0100
Subject: [PATCH 2566/3235] Fix internal link styling in Security Settings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../settings/tabs/user/_SecurityUserSettingsTab.scss      | 8 ++++++++
 .../views/settings/tabs/user/SecurityUserSettingsTab.js   | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index b5a6693006..849979f444 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -55,3 +55,11 @@ limitations under the License.
 .mx_SecurityUserSettingsTab_ignoredUser .mx_AccessibleButton {
     margin-right: 10px;
 }
+
+.mx_SecurityUserSettingsTab {
+    .mx_SettingsTab_section {
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+}
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 0eec59806a..42fa4a5c6f 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -90,7 +90,7 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onGoToUserProfileClick = () => {
-        // close the settings dialog & let the default action run (ie. navigate to the link)
+        window.location.href = "#/user/" + MatrixClientPeg.get().getUserId();
         this.props.closeSettingsFn();
     }
 
@@ -299,9 +299,9 @@ export default class SecurityUserSettingsTab extends React.Component {
                             "Manage the names of and sign out of your sessions below or " +
                             "<a>verify them in your User Profile</a>.", {},
                             {
-                                a: sub => <a href={"#/user/" + MatrixClientPeg.get().getUserId()}
-                                    onClick={this._onGoToUserProfileClick}
-                                >{sub}</a>,
+                                a: sub => <AccessibleButton kind="link" onClick={this._onGoToUserProfileClick}>
+                                    {sub}
+                                </AccessibleButton>,
                             },
                         )}
                     </span>

From dc7b588e02e9fb4a8fcc482522d0bc738c58e839 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 28 Apr 2020 17:57:32 +0100
Subject: [PATCH 2567/3235] fix font-size

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index 849979f444..8700f8747d 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -60,6 +60,7 @@ limitations under the License.
     .mx_SettingsTab_section {
         .mx_AccessibleButton_kind_link {
             padding: 0;
+            font-size: inherit;
         }
     }
 }

From f7b3662e0b306d66feefe7ac03211165518565f7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 10:32:05 +0100
Subject: [PATCH 2568/3235] Fully appease prop types

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index d089b4f6e0..6fd44b691d 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -107,7 +107,6 @@ export default class AppearanceUserSettingsTab extends React.Component {
 
     _onValidateFontSize = ({value}) => {
         console.log({value});
-        this.setState({fontSize: value});
 
         const parsedSize = parseFloat(value);
         const min = SettingsStore.getValue("font_size_min");
@@ -274,11 +273,11 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 type="text"
                 label={_t("Font size")}
                 autoComplete="off"
-                placeholder={toString(this.state.fontSize)}
-                value={toString(this.state.fontSize)}
+                placeholder={this.state.fontSize.toString()}
+                value={this.state.fontSize.toString()}
                 id="font_size_field"
                 onValidate={this._onValidateFontSize}
-                onChange={({value}) => this.setState({fontSize: value})}
+                onChange={(value) => this.setState({fontSize: value.target.value})}
                 disabled={!this.state.useCustomFontSize}
             />
         </div>;

From 41dece38a4d99bfc989ca09efe40b47f76e87400 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 29 Apr 2020 10:35:35 +0100
Subject: [PATCH 2569/3235] iterate copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/InviteDialog.js | 13 ++++++++-----
 src/i18n/strings/en_EN.json                  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 7bc9364b52..516ac3183f 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/src/matrix";
 import SdkConfig from "../../../SdkConfig";
@@ -1082,11 +1082,14 @@ export default class InviteDialog extends React.PureComponent {
         } else { // KIND_INVITE
             title = _t("Invite to this room");
             helpText = _t(
-                "Invite someone using their name, username (like <userId/>) or email address.",
+                "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
                 {},
-                {userId: () => {
-                    return <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>;
-                }},
+                {
+                    userId: () =>
+                        <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
+                    a: (sub) =>
+                        <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
+                },
             );
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3b6e077aac..2a8a614d96 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1642,7 +1642,7 @@
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
     "Go": "Go",
-    "Invite someone using their name, username (like <userId/>) or email address.": "Invite someone using their name, username (like <userId/>) or email address.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
     "Start verification": "Start verification",

From bb6d13781c47585c0ca3159fc95f8c1487a2d845 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Apr 2020 11:40:04 +0200
Subject: [PATCH 2570/3235] enable encryption when NOT inviting 3pids

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 759228babd..e48c6866bf 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -578,7 +578,7 @@ export default class InviteDialog extends React.PureComponent {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
-            if (has3PidMembers) {
+            if (!has3PidMembers) {
                 const client = MatrixClientPeg.get();
                 const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
                 if (allHaveDeviceKeys) {

From 6f25f2eaec7c7891df4d96f65d26dfae1a048285 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:44:51 +0100
Subject: [PATCH 2571/3235] Add the other toast component

---
 .../views/toasts/UnverifiedSessionToast.js    | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/components/views/toasts/UnverifiedSessionToast.js

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
new file mode 100644
index 0000000000..3f2f29a493
--- /dev/null
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -0,0 +1,69 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
+import DeviceListener from '../../../DeviceListener';
+import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
+import FormButton from '../elements/FormButton';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
+
+@replaceableComponent("views.toasts.UnverifiedSessionToast")
+export default class UnverifiedSessionToast extends React.PureComponent {
+    static propTypes = {
+        deviceId: PropTypes.object,
+    }
+
+    _onLaterClick = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
+    };
+
+    _onReviewClick = async () => {
+        const cli = MatrixClientPeg.get();
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: cli.getUserId(),
+            device: cli.getStoredDevice(cli.getUserId(), this.props.deviceId),
+            onFinished: (r) => {
+                if (!r) {
+                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
+                    DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
+                }
+            },
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    render() {
+        const cli = MatrixClientPeg.get();
+        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+
+        return (<div>
+            <div className="mx_Toast_description">
+                <span className="mx_Toast_deviceName">
+                    {device.getDisplayName()}
+                </span> <span className="mx_Toast_deviceID">
+                    ({device.deviceId})
+                </span>
+            </div>
+            <div className="mx_Toast_buttons" aria-live="off">
+                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
+                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
+            </div>
+        </div>);
+    }
+}

From be13e86b0977dc474cba9488a9bb011be7eba4df Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 17:41:10 +0200
Subject: [PATCH 2572/3235] dont enable e2ee when inviting a 3pid

---
 src/components/views/dialogs/InviteDialog.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a46fa0df07..a2a0eddd8e 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -577,10 +577,13 @@ export default class InviteDialog extends React.PureComponent {
         if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
-            const client = MatrixClientPeg.get();
-            const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
-            if (allHaveDeviceKeys) {
-                createRoomOptions.encryption = true;
+            const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
+            if (!containsNonMatrixUsers) {
+                const client = MatrixClientPeg.get();
+                const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
+                if (allHaveDeviceKeys) {
+                    createRoomOptions.encryption = true;
+                }
             }
         }
 

From a8205d21f1428bc58a7915270012110c9d90c28b Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 28 Apr 2020 18:38:54 +0200
Subject: [PATCH 2573/3235] targets can also contain RoomMember, so take the
 positive case rather

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index a2a0eddd8e..759228babd 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -577,8 +577,8 @@ export default class InviteDialog extends React.PureComponent {
         if (SettingsStore.getValue("feature_cross_signing")) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
-            const containsNonMatrixUsers = targets.some(t => !(t instanceof DirectoryMember));
-            if (!containsNonMatrixUsers) {
+            const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
+            if (has3PidMembers) {
                 const client = MatrixClientPeg.get();
                 const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
                 if (allHaveDeviceKeys) {

From c10969f520fbb8b2bbbbac9c3c8c8713e125c11f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Apr 2020 11:40:04 +0200
Subject: [PATCH 2574/3235] enable encryption when NOT inviting 3pids

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

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 759228babd..e48c6866bf 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -578,7 +578,7 @@ export default class InviteDialog extends React.PureComponent {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
-            if (has3PidMembers) {
+            if (!has3PidMembers) {
                 const client = MatrixClientPeg.get();
                 const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
                 if (allHaveDeviceKeys) {

From 75c680715fef507b2294691038cecfd6e7558b61 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:53:36 +0100
Subject: [PATCH 2575/3235] s/unverified/new/

---
 src/DeviceListener.js       | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index e3b833a340..6f278904eb 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -277,7 +277,7 @@ export default class DeviceListener {
         for (const deviceId of newUnverifiedDeviceIds) {
             ToastStore.sharedInstance().addOrReplaceToast({
                 key: toastKey(deviceId),
-                title: _t("Unverified login. Was this you?"),
+                title: _t("New login. Was this you?"),
                 icon: "verification_warning",
                 props: { deviceId },
                 component: sdk.getComponent("toasts.UnverifiedSessionToast"),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ffc35fda6..a94292b220 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -106,7 +106,7 @@
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
     "Review where you’re logged in": "Review where you’re logged in",
-    "Unverified login. Was this you?": "Unverified login. Was this you?",
+    "New login. Was this you?": "New login. Was this you?",
     "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",

From 89a910c7180fb0baa682b5d4932acf237e5e2a8e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:55:44 +0100
Subject: [PATCH 2576/3235] Clarify that we don't need tyo recheck

---
 src/DeviceListener.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 6f278904eb..516293b324 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -110,6 +110,9 @@ export default class DeviceListener {
     _onWillUpdateDevices = async (users) => {
         const myUserId = MatrixClientPeg.get().getUserId();
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+
+        // No need to do a recheck here: we just need to get a snapshot of our devices
+        // before we download asny new ones.
     }
 
     _onDevicesUpdated = (users) => {

From 2e7ccf6e7a44f9854cd914c9306389828820c5e4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 10:57:35 +0100
Subject: [PATCH 2577/3235] Fix pill vertical align

---
 res/css/views/elements/_RichText.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
index 453cf4c7f9..d60282695c 100644
--- a/res/css/views/elements/_RichText.scss
+++ b/res/css/views/elements/_RichText.scss
@@ -18,13 +18,14 @@ a.mx_Pill {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    vertical-align: text-bottom;
     max-width: calc(100% - 1ch);
 }
 
 .mx_Pill {
     padding: $font-1px;
     padding-right: 0.4em;
+    vertical-align: text-top;
+    line-height: $font-17px;
 }
 
 /* More specific to override `.markdown-body a` color */

From 736857ffdf060b70d18795fcf9042c59088883db Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 27 Apr 2020 18:35:51 +0100
Subject: [PATCH 2578/3235] Fix set up encryption toast to use "set up" as
 action

This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
---
 src/components/views/toasts/SetupEncryptionToast.js | 1 +
 src/i18n/strings/en_EN.json                         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 3c1f42b526..75fd55378c 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -90,6 +90,7 @@ export default class SetupEncryptionToast extends React.PureComponent {
     getSetupCaption() {
         switch (this.props.kind) {
             case 'set_up_encryption':
+                return _t('Set up');
             case 'upgrade_encryption':
             case 'upgrade_ssss':
                 return _t('Upgrade');
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ab4ab2189c..505c56d23a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -558,6 +558,7 @@
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
     "Update your secure storage": "Update your secure storage",
+    "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Later": "Later",
@@ -2225,7 +2226,6 @@
     "Unable to create key backup": "Unable to create key backup",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
     "If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
-    "Set up": "Set up",
     "Don't ask again": "Don't ask again",
     "New Recovery Method": "New Recovery Method",
     "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",

From 126d81912bda87d63f6da8b46951167a8c701913 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 11:02:22 +0100
Subject: [PATCH 2579/3235] Remove await for some more getStoredDevice() calls

---
 src/components/views/rooms/MemberTile.js                | 2 +-
 src/components/views/toasts/VerificationRequestToast.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index d830624f8a..1c609afcaa 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -129,7 +129,7 @@ export default createReactClass({
             return;
         }
 
-        const devices = await cli.getStoredDevicesForUser(userId);
+        const devices = cli.getStoredDevicesForUser(userId);
         const anyDeviceUnverified = devices.some(device => {
             const { deviceId } = device;
             // For your own devices, we use the stricter check of cross-signing
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 6ca582fbc7..6447e87627 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -51,7 +51,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
         if (request.isSelfVerification) {
             const cli = MatrixClientPeg.get();
-            this.setState({device: await cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
+            this.setState({device: cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
         }
     }
 

From 0026e4a0183d4f6e7e44dbebaa0ccfb2de011f3a Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Apr 2020 11:25:18 +0100
Subject: [PATCH 2580/3235] Comment typo

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 516293b324..c4beb6c01e 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -112,7 +112,7 @@ export default class DeviceListener {
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
 
         // No need to do a recheck here: we just need to get a snapshot of our devices
-        // before we download asny new ones.
+        // before we download any new ones.
     }
 
     _onDevicesUpdated = (users) => {

From e5d06b1acbe58c476748f76474547b13001e5f07 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 18:33:54 +0100
Subject: [PATCH 2581/3235] Aggregate device verification toasts into one toast

'Review' now opens the only place we can verify our own devices:
our user info.
---
 src/DeviceListener.js                         | 43 ++++++++-----------
 .../views/toasts/UnverifiedSessionToast.js    | 29 +++----------
 src/i18n/strings/en_EN.json                   |  3 +-
 3 files changed, 27 insertions(+), 48 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 41f249b335..a7b259e179 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -20,12 +20,9 @@ import * as sdk from './index';
 import { _t } from './languageHandler';
 import ToastStore from './stores/ToastStore';
 
-function toastKey(deviceId) {
-    return 'unverified_session_' + deviceId;
-}
-
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 const THIS_DEVICE_TOAST_KEY = 'setupencryption';
+const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
 
 export default class DeviceListener {
     static sharedInstance() {
@@ -34,8 +31,6 @@ export default class DeviceListener {
     }
 
     constructor() {
-        // set of device IDs we're currently showing toasts for
-        this._activeNagToasts = new Set();
         // device IDs for which the user has dismissed the verify toast ('Later')
         this._dismissed = new Set();
         // has the user dismissed any of the various nag toasts to setup encryption on this device?
@@ -71,8 +66,11 @@ export default class DeviceListener {
         this._keyBackupFetchedAt = null;
     }
 
-    dismissVerification(deviceId) {
-        this._dismissed.add(deviceId);
+    async dismissVerifications() {
+        const cli = MatrixClientPeg.get();
+        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+        this._dismissed = new Set(devices.filter(d => d.deviceId !== cli.deviceId).map(d => d.deviceId));
+
         this._recheck();
     }
 
@@ -202,33 +200,28 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const newActiveToasts = new Set();
+            const unverifiedDeviceIds = new Set();
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
                 if (device.deviceId == cli.deviceId) continue;
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-                if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
-                    ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
-                } else {
-                    this._activeNagToasts.add(device.deviceId);
-                    ToastStore.sharedInstance().addOrReplaceToast({
-                        key: toastKey(device.deviceId),
-                        title: _t("Unverified login. Was this you?"),
-                        icon: "verification_warning",
-                        props: { device },
-                        component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                    });
-                    newActiveToasts.add(device.deviceId);
+                if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
+                    unverifiedDeviceIds.add(device.deviceId);
                 }
             }
 
-            // clear any other outstanding toasts (eg. logged out devices)
-            for (const deviceId of this._activeNagToasts) {
-                if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
+            if (unverifiedDeviceIds.size > 0) {
+                ToastStore.sharedInstance().addOrReplaceToast({
+                    key: OTHER_DEVICES_TOAST_KEY,
+                    title: _t("Review where you’re logged in"),
+                    icon: "verification_warning",
+                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
+                });
+            } else {
+                ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
             }
-            this._activeNagToasts = newActiveToasts;
         }
     }
 }
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index cb0cadcdc8..587a54164d 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import Modal from "../../../Modal";
+import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
 import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
@@ -26,29 +27,17 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 
 @replaceableComponent("views.toasts.UnverifiedSessionToast")
 export default class UnverifiedSessionToast extends React.PureComponent {
-    static propTypes = {
-        toastKey: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-    };
-
     _onLaterClick = () => {
-        const { device } = this.props;
-        DeviceListener.sharedInstance().dismissVerification(device.deviceId);
+        DeviceListener.sharedInstance().dismissVerifications();
     };
 
     _onReviewClick = async () => {
-        const { device } = this.props;
+        DeviceListener.sharedInstance().dismissVerifications();
 
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+        dis.dispatch({
+            action: 'view_user_info',
             userId: MatrixClientPeg.get().getUserId(),
-            device,
-            onFinished: (r) => {
-                if (!r) {
-                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
-                    this._onLaterClick();
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
+        });
     };
 
     render() {
@@ -56,11 +45,7 @@ export default class UnverifiedSessionToast extends React.PureComponent {
 
         return (<div>
             <div className="mx_Toast_description">
-                <span className="mx_Toast_deviceName">
-                    {device.getDisplayName()}
-                </span> <span className="mx_Toast_deviceID">
-                    ({device.deviceId})
-                </span>
+                {_t("Verify your other sessions")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 505c56d23a..576a70f9a6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -105,7 +105,7 @@
     "Verify this session": "Verify this session",
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
-    "Unverified login. Was this you?": "Unverified login. Was this you?",
+    "Review where you’re logged in": "Review where you’re logged in",
     "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",
@@ -562,6 +562,7 @@
     "Upgrade": "Upgrade",
     "Verify": "Verify",
     "Later": "Later",
+    "Verify your other sessions": "Verify your other sessions",
     "Review": "Review",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",

From 0edb80e5416e92d99af129b90ec7872dee37e8dc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 18:34:48 +0100
Subject: [PATCH 2582/3235] Make close button work from user info view

Adds more hacks so that the close button does something vagauely
plausible in all situations.
---
 src/components/structures/RightPanel.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index f5bdfdf40d..d5369b8492 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -26,6 +26,7 @@ import dis from '../../dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
+import RoomViewStore from '../../stores/RoomViewStore';
 import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
@@ -221,10 +222,26 @@ export default class RightPanel extends React.Component {
             case RIGHT_PANEL_PHASES.EncryptionPanel:
                 if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
-                        dis.dispatch({
-                            action: "view_user",
-                            member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
-                        });
+                        // XXX: There are three different ways of 'closing' this panel depending on what state
+                        // things are in... this knows far more than it should do about the state of the rest
+                        // of the app and is generally a bit silly.
+                        if (this.props.user) {
+                            // If we have a user prop then we're displaying a user from the 'user' page type
+                            // in LoggedInView, so need to change the page type to close the panel (we switch
+                            // to the home page which is not obviosuly the correct thing to do, but I'm not sure
+                            // anything else is - we could hide the close button altogether?)
+                            dis.dispatch({
+                                action: "view_home_page",
+                            });
+                        } else {
+                            // Otherwise we have got our user from RoomViewStore which means we're being shown
+                            // within a room, so go back to the member panel if we were in the encryption panel,
+                            // or the member list if we were in the member panel... phew.
+                            dis.dispatch({
+                                action: "view_user",
+                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                            });
+                        }
                     };
                     panel = <UserInfo
                         user={this.state.member}

From 996f8af365a1d43d16df2daf93297ad27097539b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 20:31:14 +0100
Subject: [PATCH 2583/3235] Use the New Session review dialog for verifying our
 own devices

---
 src/components/views/right_panel/UserInfo.js | 34 +++++++----
 src/verification.js                          | 63 +++++++++++---------
 2 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index b87617c9d4..d3e8e81ebe 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -191,17 +191,29 @@ function DeviceItem({userId, device}) {
             device.getDisplayName();
     let trustedLabel = null;
     if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
-    return (
-        <AccessibleButton
-            className={classes}
-            title={device.deviceId}
-            onClick={onDeviceClick}
-        >
-            <div className={iconClasses} />
-            <div className="mx_UserInfo_device_name">{deviceName}</div>
-            <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
-        </AccessibleButton>
-    );
+
+
+    if (isVerified) {
+        return (
+            <div className={classes} title={device.deviceId} >
+                <div className={iconClasses} />
+                <div className="mx_UserInfo_device_name">{deviceName}</div>
+                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+            </div>
+        );
+    } else {
+        return (
+            <AccessibleButton
+                className={classes}
+                title={device.deviceId}
+                onClick={onDeviceClick}
+            >
+                <div className={iconClasses} />
+                <div className="mx_UserInfo_device_name">{deviceName}</div>
+                <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
+            </AccessibleButton>
+        );
+    }
 }
 
 function DevicesSection({devices, userId, loading}) {
diff --git a/src/verification.js b/src/verification.js
index ca839940e5..ed56b0e7ef 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -23,6 +23,7 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
+import NewSessionReviewDialog from './components/views/dialogs/NewSessionReviewDialog';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
@@ -68,33 +69,41 @@ export async function verifyDevice(user, device) {
             return;
         }
     }
-    Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
-        user,
-        device,
-        onFinished: async (action) => {
-            if (action === "sas") {
-                const verificationRequestPromise = cli.legacyDeviceVerification(
-                    user.userId,
-                    device.deviceId,
-                    verificationMethods.SAS,
-                );
-                dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                    refireParams: {member: user, verificationRequestPromise},
-                });
-            } else if (action === "legacy") {
-                const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
-                Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
-                    ManualDeviceKeyVerificationDialog,
-                    {
-                        userId: user.userId,
-                        device,
-                    },
-                );
-            }
-        },
-    });
+
+    if (user.userId === cli.getUserId()) {
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: user.userId,
+            device,
+        });
+    } else {
+        Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
+            user,
+            device,
+            onFinished: async (action) => {
+                if (action === "sas") {
+                    const verificationRequestPromise = cli.legacyDeviceVerification(
+                        user.userId,
+                        device.deviceId,
+                        verificationMethods.SAS,
+                    );
+                    dis.dispatch({
+                        action: "set_right_panel_phase",
+                        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                        refireParams: {member: user, verificationRequestPromise},
+                    });
+                } else if (action === "legacy") {
+                    const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                    Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
+                        ManualDeviceKeyVerificationDialog,
+                        {
+                            userId: user.userId,
+                            device,
+                        },
+                    );
+                }
+            },
+        });
+    }
 }
 
 export async function legacyVerifyUser(user) {

From 3e6a623270c1c7ccd7d0513bb97f50569fd995a3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 27 Apr 2020 20:35:39 +0100
Subject: [PATCH 2584/3235] Lint

---
 src/components/structures/RightPanel.js               | 4 ++--
 src/components/views/toasts/UnverifiedSessionToast.js | 5 -----
 src/verification.js                                   | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index d5369b8492..3fec5aa25f 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -26,7 +26,6 @@ import dis from '../../dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import RoomViewStore from '../../stores/RoomViewStore';
 import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
@@ -239,7 +238,8 @@ export default class RightPanel extends React.Component {
                             // or the member list if we were in the member panel... phew.
                             dis.dispatch({
                                 action: "view_user",
-                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ?
+                                    this.state.member : null,
                             });
                         }
                     };
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 587a54164d..886e3c4c20 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -15,13 +15,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import Modal from "../../../Modal";
 import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
-import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
 import FormButton from '../elements/FormButton';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
 
@@ -41,8 +38,6 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
-        const { device } = this.props;
-
         return (<div>
             <div className="mx_Toast_description">
                 {_t("Verify your other sessions")}
diff --git a/src/verification.js b/src/verification.js
index ed56b0e7ef..630da01091 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -92,7 +92,8 @@ export async function verifyDevice(user, device) {
                         refireParams: {member: user, verificationRequestPromise},
                     });
                 } else if (action === "legacy") {
-                    const ManualDeviceKeyVerificationDialog = sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                    const ManualDeviceKeyVerificationDialog =
+                        sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
                     Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
                         ManualDeviceKeyVerificationDialog,
                         {

From 7da2850a2e5e01744926df8026548a60d291dd7a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:42:39 +0100
Subject: [PATCH 2585/3235] No need for a set here - bool is fine

---
 src/DeviceListener.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index a7b259e179..ad2553ca3c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -200,7 +200,7 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const unverifiedDeviceIds = new Set();
+            const haveUnverifiedDevices = false;
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
@@ -208,11 +208,12 @@ export default class DeviceListener {
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
                 if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    unverifiedDeviceIds.add(device.deviceId);
+                    haveUnverifiedDevices = true;
+                    break;
                 }
             }
 
-            if (unverifiedDeviceIds.size > 0) {
+            if (haveUnverifiedDevices) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: OTHER_DEVICES_TOAST_KEY,
                     title: _t("Review where you’re logged in"),

From f7c881a462e5fe3ff35a18b403f7dfe0f9039b65 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:43:24 +0100
Subject: [PATCH 2586/3235] No need for this if statement now

---
 src/components/views/right_panel/UserInfo.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index d3e8e81ebe..cafbf05a23 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -181,9 +181,7 @@ function DeviceItem({userId, device}) {
     });
 
     const onDeviceClick = () => {
-        if (!isVerified) {
-            verifyDevice(cli.getUser(userId), device);
-        }
+        verifyDevice(cli.getUser(userId), device);
     };
 
     const deviceName = device.ambiguous ?

From 81d91721d85e93f1152442d7609aa02d3bbe25f2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 09:49:03 +0100
Subject: [PATCH 2587/3235] Consts are constant

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

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index ad2553ca3c..1b451310b9 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -200,7 +200,7 @@ export default class DeviceListener {
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            const haveUnverifiedDevices = false;
+            let haveUnverifiedDevices = false;
 
             const devices = await cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {

From 0f9d3f555e59bf6bc90efbfc26f9c02e7d6bdee3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Apr 2020 18:35:16 +0100
Subject: [PATCH 2588/3235] Separate toasts for existing & new device
 verification

Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
---
 src/DeviceListener.js                         | 104 +++++++++++++++---
 src/SlashCommands.tsx                         |   2 +-
 .../views/right_panel/EncryptionPanel.js      |   6 +-
 src/components/views/right_panel/UserInfo.js  |   4 +-
 src/components/views/rooms/MemberInfo.js      |  11 +-
 ...oast.js => BulkUnverifiedSessionsToast.js} |  13 ++-
 src/i18n/strings/en_EN.json                   |   7 +-
 src/utils/ShieldUtils.ts                      |   4 +-
 src/verification.js                           |  64 +++++------
 test/utils/ShieldUtils-test.js                |   2 +-
 10 files changed, 138 insertions(+), 79 deletions(-)
 rename src/components/views/toasts/{UnverifiedSessionToast.js => BulkUnverifiedSessionsToast.js} (78%)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 1b451310b9..e3b833a340 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -24,6 +24,10 @@ const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 const THIS_DEVICE_TOAST_KEY = 'setupencryption';
 const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
 
+function toastKey(deviceId) {
+    return "unverified_session_" + deviceId;
+}
+
 export default class DeviceListener {
     static sharedInstance() {
         if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
@@ -39,9 +43,18 @@ export default class DeviceListener {
         // cache of the key backup info
         this._keyBackupInfo = null;
         this._keyBackupFetchedAt = null;
+
+        // We keep a list of our own device IDs so we can batch ones that were already
+        // there the last time the app launched into a single toast, but display new
+        // ones in their own toasts.
+        this._ourDeviceIdsAtStart = null;
+
+        // The set of device IDs we're currently displaying toasts for
+        this._displayingToastsForDeviceIds = new Set();
     }
 
     start() {
+        MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
         MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
         MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
         MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
@@ -53,6 +66,7 @@ export default class DeviceListener {
 
     stop() {
         if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
             MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
             MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
             MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
@@ -66,10 +80,15 @@ export default class DeviceListener {
         this._keyBackupFetchedAt = null;
     }
 
-    async dismissVerifications() {
-        const cli = MatrixClientPeg.get();
-        const devices = await cli.getStoredDevicesForUser(cli.getUserId());
-        this._dismissed = new Set(devices.filter(d => d.deviceId !== cli.deviceId).map(d => d.deviceId));
+    /**
+     * Dismiss notifications about our own unverified devices
+     *
+     * @param {String[]} deviceIds List of device IDs to dismiss notifications for
+     */
+    async dismissUnverifiedSessions(deviceIds) {
+        for (const d of deviceIds) {
+            this._dismissed.add(d);
+        }
 
         this._recheck();
     }
@@ -79,6 +98,20 @@ export default class DeviceListener {
         this._recheck();
     }
 
+    _ensureDeviceIdsAtStartPopulated() {
+        if (this._ourDeviceIdsAtStart === null) {
+            const cli = MatrixClientPeg.get();
+            this._ourDeviceIdsAtStart = new Set(
+                cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
+            );
+        }
+    }
+
+    _onWillUpdateDevices = async (users) => {
+        const myUserId = MatrixClientPeg.get().getUserId();
+        if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+    }
+
     _onDevicesUpdated = (users) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
         this._recheck();
@@ -143,6 +176,8 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
+        this._ensureDeviceIdsAtStartPopulated();
+
         if (this._dismissedThisDeviceToast) {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
@@ -197,32 +232,65 @@ export default class DeviceListener {
             }
         }
 
+        // Unverified devices that were there last time the app ran
+        // (technically could just be a boolean: we don't actually
+        // need to remember the device IDs, but for the sake of
+        // symmetry...).
+        const oldUnverifiedDeviceIds = new Set();
+        // Unverified devices that have appeared since then
+        const newUnverifiedDeviceIds = new Set();
+
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
-            let haveUnverifiedDevices = false;
-
-            const devices = await cli.getStoredDevicesForUser(cli.getUserId());
+            const devices = cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
                 if (device.deviceId == cli.deviceId) continue;
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
                 if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    haveUnverifiedDevices = true;
-                    break;
+                    if (this._ourDeviceIdsAtStart.has(device.deviceId)) {
+                        oldUnverifiedDeviceIds.add(device.deviceId);
+                    } else {
+                        newUnverifiedDeviceIds.add(device.deviceId);
+                    }
                 }
             }
+        }
 
-            if (haveUnverifiedDevices) {
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: OTHER_DEVICES_TOAST_KEY,
-                    title: _t("Review where you’re logged in"),
-                    icon: "verification_warning",
-                    component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                });
-            } else {
-                ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
+        // Display or hide the batch toast for old unverified sessions
+        if (oldUnverifiedDeviceIds.size > 0) {
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: OTHER_DEVICES_TOAST_KEY,
+                title: _t("Review where you’re logged in"),
+                icon: "verification_warning",
+                props: {
+                    deviceIds: oldUnverifiedDeviceIds,
+                },
+                component: sdk.getComponent("toasts.BulkUnverifiedSessionsToast"),
+            });
+        } else {
+            ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
+        }
+
+        // Show toasts for new unverified devices if they aren't already there
+        for (const deviceId of newUnverifiedDeviceIds) {
+            ToastStore.sharedInstance().addOrReplaceToast({
+                key: toastKey(deviceId),
+                title: _t("Unverified login. Was this you?"),
+                icon: "verification_warning",
+                props: { deviceId },
+                component: sdk.getComponent("toasts.UnverifiedSessionToast"),
+            });
+        }
+
+        // ...and hide any we don't need any more
+        for (const deviceId of this._displayingToastsForDeviceIds) {
+            if (!newUnverifiedDeviceIds.has(deviceId)) {
+                ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
             }
         }
+
+        this._displayingToastsForDeviceIds = newUnverifiedDeviceIds;
     }
 }
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 71815dde8c..1a299db4c7 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -799,7 +799,7 @@ export const Commands = [
                     const fingerprint = matches[3];
 
                     return success((async () => {
-                        const device = await cli.getStoredDevice(userId, deviceId);
+                        const device = cli.getStoredDevice(userId, deviceId);
                         if (!device) {
                             throw new Error(_t('Unknown (user, session) pair:') + ` (${userId}, ${deviceId})`);
                         }
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 476b6cace9..bc580c767b 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -22,7 +22,6 @@ import VerificationPanel from "./VerificationPanel";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ensureDMExists} from "../../../createRoom";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import {useAsyncMemo} from "../../../hooks/useAsyncMemo";
 import Modal from "../../../Modal";
 import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
@@ -47,10 +46,7 @@ const EncryptionPanel = (props) => {
     }, [verificationRequest]);
 
     const deviceId = request && request.channel.deviceId;
-    const device = useAsyncMemo(() => {
-        const cli = MatrixClientPeg.get();
-        return cli.getStoredDevice(cli.getUserId(), deviceId);
-    }, [deviceId]);
+    const device = MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
 
     useEffect(() => {
         async function awaitPromise() {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index cafbf05a23..61f5a8161a 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1110,7 +1110,7 @@ export const useDevices = (userId) => {
         async function _downloadDeviceList() {
             try {
                 await cli.downloadKeys([userId], true);
-                const devices = await cli.getStoredDevicesForUser(userId);
+                const devices = cli.getStoredDevicesForUser(userId);
 
                 if (cancelled) {
                     // we got cancelled - presumably a different user now
@@ -1135,7 +1135,7 @@ export const useDevices = (userId) => {
     useEffect(() => {
         let cancel = false;
         const updateDevices = async () => {
-            const newDevices = await cli.getStoredDevicesForUser(userId);
+            const newDevices = cli.getStoredDevicesForUser(userId);
             if (cancel) return;
             setDevices(newDevices);
         };
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 9fdd2abedf..be3e8cf971 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -160,13 +160,10 @@ export default createReactClass({
             // no need to re-download the whole thing; just update our copy of
             // the list.
 
-            // Promise.resolve to handle transition from static result to promise; can be removed
-            // in future
-            Promise.resolve(this.context.getStoredDevicesForUser(userId)).then((devices) => {
-                this.setState({
-                    devices: devices,
-                    e2eStatus: this._getE2EStatus(devices),
-                });
+            const devices = this.context.getStoredDevicesForUser(userId);
+            this.setState({
+                devices: devices,
+                e2eStatus: this._getE2EStatus(devices),
             });
         }
     },
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
similarity index 78%
rename from src/components/views/toasts/UnverifiedSessionToast.js
rename to src/components/views/toasts/BulkUnverifiedSessionsToast.js
index 886e3c4c20..b16dc87f21 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import dis from "../../../dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -22,14 +23,18 @@ import DeviceListener from '../../../DeviceListener';
 import FormButton from '../elements/FormButton';
 import { replaceableComponent } from '../../../utils/replaceableComponent';
 
-@replaceableComponent("views.toasts.UnverifiedSessionToast")
-export default class UnverifiedSessionToast extends React.PureComponent {
+@replaceableComponent("views.toasts.BulkUnverifiedSessionsToast")
+export default class BulkUnverifiedSessionsToast extends React.PureComponent {
+    static propTypes = {
+        deviceIds: PropTypes.array,
+    }
+
     _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissVerifications();
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
     };
 
     _onReviewClick = async () => {
-        DeviceListener.sharedInstance().dismissVerifications();
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
 
         dis.dispatch({
             action: 'view_user_info',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 576a70f9a6..cde8e47569 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -106,6 +106,7 @@
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
     "Review where you’re logged in": "Review where you’re logged in",
+    "Unverified login. Was this you?": "Unverified login. Was this you?",
     "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",
@@ -555,15 +556,15 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
+    "Verify your other sessions": "Verify your other sessions",
+    "Later": "Later",
+    "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
     "Update your secure storage": "Update your secure storage",
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Later": "Later",
-    "Verify your other sessions": "Verify your other sessions",
-    "Review": "Review",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index 9bf6fe2327..adaa961a00 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -7,7 +7,7 @@ interface Client {
         isCrossSigningVerified: () => boolean
         wasCrossSigningVerified: () => boolean
     };
-    getStoredDevicesForUser: (userId: string) => Promise<[{ deviceId: string }]>;
+    getStoredDevicesForUser: (userId: string) => [{ deviceId: string }];
     checkDeviceTrust: (userId: string, deviceId: string) => {
         isVerified: () => boolean
     }
@@ -45,7 +45,7 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<s
                         (members.length === 1);     // Do alarm for self if we're alone in a room
     const targets = includeUser ? [...verified, client.getUserId()] : verified;
     for (const userId of targets) {
-        const devices = await client.getStoredDevicesForUser(userId);
+        const devices = client.getStoredDevicesForUser(userId);
         const anyDeviceNotVerified = devices.some(({deviceId}) => {
             return !client.checkDeviceTrust(userId, deviceId).isVerified();
         });
diff --git a/src/verification.js b/src/verification.js
index 630da01091..d7287552dd 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -23,7 +23,6 @@ import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import SettingsStore from './settings/SettingsStore';
-import NewSessionReviewDialog from './components/views/dialogs/NewSessionReviewDialog';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 
 async function enable4SIfNeeded() {
@@ -70,41 +69,34 @@ export async function verifyDevice(user, device) {
         }
     }
 
-    if (user.userId === cli.getUserId()) {
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
-            userId: user.userId,
-            device,
-        });
-    } else {
-        Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
-            user,
-            device,
-            onFinished: async (action) => {
-                if (action === "sas") {
-                    const verificationRequestPromise = cli.legacyDeviceVerification(
-                        user.userId,
-                        device.deviceId,
-                        verificationMethods.SAS,
-                    );
-                    dis.dispatch({
-                        action: "set_right_panel_phase",
-                        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
-                        refireParams: {member: user, verificationRequestPromise},
-                    });
-                } else if (action === "legacy") {
-                    const ManualDeviceKeyVerificationDialog =
-                        sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
-                    Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
-                        ManualDeviceKeyVerificationDialog,
-                        {
-                            userId: user.userId,
-                            device,
-                        },
-                    );
-                }
-            },
-        });
-    }
+    Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
+        user,
+        device,
+        onFinished: async (action) => {
+            if (action === "sas") {
+                const verificationRequestPromise = cli.legacyDeviceVerification(
+                    user.userId,
+                    device.deviceId,
+                    verificationMethods.SAS,
+                );
+                dis.dispatch({
+                    action: "set_right_panel_phase",
+                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    refireParams: {member: user, verificationRequestPromise},
+                });
+            } else if (action === "legacy") {
+                const ManualDeviceKeyVerificationDialog =
+                    sdk.getComponent("dialogs.ManualDeviceKeyVerificationDialog");
+                Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
+                    ManualDeviceKeyVerificationDialog,
+                    {
+                        userId: user.userId,
+                        device,
+                    },
+                );
+            }
+        },
+    });
 }
 
 export async function legacyVerifyUser(user) {
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index 5f676579fa..e4c0c671e3 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -11,7 +11,7 @@ function mkClient(selfTrust) {
         checkDeviceTrust: (userId, deviceId) => ({
             isVerified: () => userId === "@self:localhost" ? selfTrust : userId[2] == "T",
         }),
-        getStoredDevicesForUser: async (userId) => ["DEVICE"],
+        getStoredDevicesForUser: (userId) => ["DEVICE"],
     };
 }
 

From 9cbc40730583d6c78caabe97afc18b9a2a36eef5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:44:51 +0100
Subject: [PATCH 2589/3235] Add the other toast component

---
 .../views/toasts/UnverifiedSessionToast.js    | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/components/views/toasts/UnverifiedSessionToast.js

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
new file mode 100644
index 0000000000..3f2f29a493
--- /dev/null
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -0,0 +1,69 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
+import DeviceListener from '../../../DeviceListener';
+import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
+import FormButton from '../elements/FormButton';
+import { replaceableComponent } from '../../../utils/replaceableComponent';
+
+@replaceableComponent("views.toasts.UnverifiedSessionToast")
+export default class UnverifiedSessionToast extends React.PureComponent {
+    static propTypes = {
+        deviceId: PropTypes.object,
+    }
+
+    _onLaterClick = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
+    };
+
+    _onReviewClick = async () => {
+        const cli = MatrixClientPeg.get();
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: cli.getUserId(),
+            device: cli.getStoredDevice(cli.getUserId(), this.props.deviceId),
+            onFinished: (r) => {
+                if (!r) {
+                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
+                    DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
+                }
+            },
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    render() {
+        const cli = MatrixClientPeg.get();
+        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+
+        return (<div>
+            <div className="mx_Toast_description">
+                <span className="mx_Toast_deviceName">
+                    {device.getDisplayName()}
+                </span> <span className="mx_Toast_deviceID">
+                    ({device.deviceId})
+                </span>
+            </div>
+            <div className="mx_Toast_buttons" aria-live="off">
+                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
+                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
+            </div>
+        </div>);
+    }
+}

From e67faa15ca241a6db8fbf9a58dab216797477e54 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:53:36 +0100
Subject: [PATCH 2590/3235] s/unverified/new/

---
 src/DeviceListener.js       | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index e3b833a340..6f278904eb 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -277,7 +277,7 @@ export default class DeviceListener {
         for (const deviceId of newUnverifiedDeviceIds) {
             ToastStore.sharedInstance().addOrReplaceToast({
                 key: toastKey(deviceId),
-                title: _t("Unverified login. Was this you?"),
+                title: _t("New login. Was this you?"),
                 icon: "verification_warning",
                 props: { deviceId },
                 component: sdk.getComponent("toasts.UnverifiedSessionToast"),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cde8e47569..5129839cbd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -106,7 +106,7 @@
     "Encryption upgrade available": "Encryption upgrade available",
     "Set up encryption": "Set up encryption",
     "Review where you’re logged in": "Review where you’re logged in",
-    "Unverified login. Was this you?": "Unverified login. Was this you?",
+    "New login. Was this you?": "New login. Was this you?",
     "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",

From 8aa5d762db3db55147e3cb005fce138e109ba789 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 10:55:44 +0100
Subject: [PATCH 2591/3235] Clarify that we don't need tyo recheck

---
 src/DeviceListener.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 6f278904eb..516293b324 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -110,6 +110,9 @@ export default class DeviceListener {
     _onWillUpdateDevices = async (users) => {
         const myUserId = MatrixClientPeg.get().getUserId();
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+
+        // No need to do a recheck here: we just need to get a snapshot of our devices
+        // before we download asny new ones.
     }
 
     _onDevicesUpdated = (users) => {

From 690e934b27adc4a245a7611bacfce3af91652631 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 11:02:22 +0100
Subject: [PATCH 2592/3235] Remove await for some more getStoredDevice() calls

---
 src/components/views/rooms/MemberTile.js                | 2 +-
 src/components/views/toasts/VerificationRequestToast.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index d830624f8a..1c609afcaa 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -129,7 +129,7 @@ export default createReactClass({
             return;
         }
 
-        const devices = await cli.getStoredDevicesForUser(userId);
+        const devices = cli.getStoredDevicesForUser(userId);
         const anyDeviceUnverified = devices.some(device => {
             const { deviceId } = device;
             // For your own devices, we use the stricter check of cross-signing
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 6ca582fbc7..6447e87627 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -51,7 +51,7 @@ export default class VerificationRequestToast extends React.PureComponent {
 
         if (request.isSelfVerification) {
             const cli = MatrixClientPeg.get();
-            this.setState({device: await cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
+            this.setState({device: cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
         }
     }
 

From 5eb86c0d6a92b901c87b485c4cb0f15d7d76b274 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Apr 2020 11:25:18 +0100
Subject: [PATCH 2593/3235] Comment typo

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 516293b324..c4beb6c01e 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -112,7 +112,7 @@ export default class DeviceListener {
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
 
         // No need to do a recheck here: we just need to get a snapshot of our devices
-        // before we download asny new ones.
+        // before we download any new ones.
     }
 
     _onDevicesUpdated = (users) => {

From 62c73146dc35337cd739cff7bd14b24526a5eec2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:14:39 +0100
Subject: [PATCH 2594/3235] copy changes

---
 .../dialogs/keybackup/RestoreKeyBackupDialog.js      | 12 ++++++------
 src/i18n/strings/en_EN.json                          | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 92d23f9e65..da67fb9777 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -283,15 +283,15 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         let content;
         let title;
         if (this.state.loading) {
-            title = _t("Loading...");
+            title = _t("Restoring keys from backup");
             let details;
             if (this.state.progress.stage === "fetch") {
-                details = _t("Downloading from server...");
+                details = _t("Fetching keys from server...");
             } else if (this.state.progress.stage === "load_keys") {
                 const { total, successes, failures } = this.state.progress;
-                details = _t("Loaded %(completed)s of %(total)s", { total, completed: successes + failures });
+                details = _t("%(completed)s of %(total)s keys restored", { total, completed: successes + failures });
             } else if (this.state.progress.stage === "prefetch") {
-                details = _t("Requesting from server...");
+                details = _t("Fetching keys from server...");
             }
             content = <div>
                 <div>{details}</div>
@@ -328,7 +328,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            title = _t("Backup restored");
+            title = _t("Keys restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
                 failedToDecrypt = <p>{_t(
@@ -337,7 +337,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 )}</p>;
             }
             content = <div>
-                <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
+                <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
                     onPrimaryButtonClick={this._onDone}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e33a389e27..5593df1f0a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1791,9 +1791,9 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Downloading from server...": "Downloading from server...",
-    "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
-    "Requesting from server...": "Requesting from server...",
+    "Restoring keys from backup": "Restoring keys from backup",
+    "Fetching keys from server...": "Fetching keys from server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
@@ -1801,9 +1801,9 @@
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
-    "Backup restored": "Backup restored",
+    "Keys restored": "Keys restored",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
-    "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "Successfully restored %(sessionCount)s keys": "Successfully restored %(sessionCount)s keys",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "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>",

From 326d5674688494cf5de59a7f0264b16d4d56bd68 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:29:36 +0100
Subject: [PATCH 2595/3235] Fixed the dialog height

---
 .../keybackup/_RestoreKeyBackupDialog.scss    |  6 +++++
 .../keybackup/RestoreKeyBackupDialog.js       | 26 +++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
index 9cba8e0da9..d74224c94d 100644
--- a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
@@ -32,3 +32,9 @@ limitations under the License.
     padding: 10px;
 }
 
+.mx_RestoreKeyBackupDialog_content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-height: 110px; /* Empirically measured */
+}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index da67fb9777..9829f7af8e 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -293,10 +293,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             } else if (this.state.progress.stage === "prefetch") {
                 details = _t("Fetching keys from server...");
             }
-            content = <div>
+            content = <>
                 <div>{details}</div>
                 <Spinner />
-            </div>;
+            </>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
@@ -304,20 +304,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
                     title = _t("Recovery key mismatch");
-                    content = <div>
+                    content = <>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
-                    </div>;
+                    </>;
                 } else {
                     title = _t("Incorrect recovery passphrase");
-                    content = <div>
+                    content = <>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
-                    </div>;
+                    </>;
                 }
             } else {
                 title = _t("Error");
@@ -336,7 +336,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
                 )}</p>;
             }
-            content = <div>
+            content = <>
                 <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
@@ -344,12 +344,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     hasCancel={false}
                     focus={true}
                 />
-            </div>;
+            </>;
         } 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>
+            content = <>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
                     "from a trusted computer.", {},
@@ -394,7 +394,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </div>;
+            </>;
         } else {
             title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -413,7 +413,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 </div>;
             }
 
-            content = <div>
+            content = <>
                 <p>{_t(
                     "<b>Warning</b>: You should only set up key backup " +
                     "from a trusted computer.", {},
@@ -450,7 +450,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </div>;
+            </>;
         }
 
         return (
@@ -458,7 +458,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 onFinished={this.props.onFinished}
                 title={title}
             >
-            <div>
+            <div className='mx_RestoreKeyBackupDialog_content'>
                 {content}
             </div>
             </BaseDialog>

From 1291a63b98013f04c137bf53861a3d104a35a1da Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 14:49:30 +0100
Subject: [PATCH 2596/3235] Make new device toasts appear above review toasts

...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
---
 src/DeviceListener.js    |  1 +
 src/stores/ToastStore.js | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index c4beb6c01e..84c6b1d230 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -267,6 +267,7 @@ export default class DeviceListener {
                 key: OTHER_DEVICES_TOAST_KEY,
                 title: _t("Review where you’re logged in"),
                 icon: "verification_warning",
+                priority: ToastStore.PRIORITY_LOW,
                 props: {
                     deviceIds: oldUnverifiedDeviceIds,
                 },
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index f17d13bf9e..ad185e42db 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -20,8 +20,9 @@ import EventEmitter from 'events';
  * Holds the active toasts
  */
 export default class ToastStore extends EventEmitter {
-    static PRIORITY_REALTIME = 1;
-    static PRIORITY_DEFAULT = 0;
+    static PRIORITY_REALTIME = 0;
+    static PRIORITY_DEFAULT = 1;
+    static PRIORITY_LOW = 2;
 
     static sharedInstance() {
         if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
@@ -43,12 +44,9 @@ export default class ToastStore extends EventEmitter {
 
         const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
-            // we only have two priorities so just push realtime ones onto the front
-            if (newToast.priority) {
-                this._toasts.unshift(newToast);
-            } else {
-                this._toasts.push(newToast);
-            }
+            let newIndex = this._toasts.length;
+            while (newIndex > 0 && this._toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+            this._toasts.splice(newIndex, 0, newToast);
         } else {
             this._toasts[oldIndex] = newToast;
         }

From 325e1f9c4e75cce5ce39f5db71a19bcc5f921939 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:10:23 +0100
Subject: [PATCH 2597/3235] Add jsdoc explaining ordering behaviour

---
 src/stores/ToastStore.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index ad185e42db..8901736739 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -39,6 +39,15 @@ export default class ToastStore extends EventEmitter {
         this._toasts = [];
     }
 
+    /**
+     * Add or replace a toast
+     * If a toast with the same toastKey already exists, the given toast will replace it
+     * Toasts are always added underneath any toasts of the same priority, so existing
+     * toasts stay at the top unless a higher priority one arrives (better to not change the
+     * toast unless necessary).
+     *
+     * @param {boject} newToast The new toast
+     */
     addOrReplaceToast(newToast) {
         if (newToast.priority === undefined) newToast.priority = ToastStore.PRIORITY_DEFAULT;
 

From 465442c31ea0478550dfcb5d9e5877baa83616ea Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:10:23 +0100
Subject: [PATCH 2598/3235] fragments and i18n don't play nice together

---
 .../keybackup/_RestoreKeyBackupDialog.scss    |  2 +-
 .../keybackup/RestoreKeyBackupDialog.js       | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
index d74224c94d..5689d84bc5 100644
--- a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
@@ -32,7 +32,7 @@ limitations under the License.
     padding: 10px;
 }
 
-.mx_RestoreKeyBackupDialog_content {
+.mx_RestoreKeyBackupDialog_content > div {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 9829f7af8e..f1008dfcb0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -293,10 +293,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             } else if (this.state.progress.stage === "prefetch") {
                 details = _t("Fetching keys from server...");
             }
-            content = <>
+            content = <div>
                 <div>{details}</div>
                 <Spinner />
-            </>;
+            </div>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
@@ -304,20 +304,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
                     title = _t("Recovery key mismatch");
-                    content = <>
+                    content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
-                    </>;
+                    </div>;
                 } else {
                     title = _t("Incorrect recovery passphrase");
-                    content = <>
+                    content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
-                    </>;
+                    </div>;
                 }
             } else {
                 title = _t("Error");
@@ -336,7 +336,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
                 )}</p>;
             }
-            content = <>
+            content = <div>
                 <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
@@ -344,12 +344,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     hasCancel={false}
                     focus={true}
                 />
-            </>;
+            </div>;
         } 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 = <>
+            content = <div>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
                     "from a trusted computer.", {},
@@ -394,7 +394,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </>;
+            </div>;
         } else {
             title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -413,7 +413,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 </div>;
             }
 
-            content = <>
+            content = <div>
                 <p>{_t(
                     "<b>Warning</b>: You should only set up key backup " +
                     "from a trusted computer.", {},
@@ -450,7 +450,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </>;
+            </div>;
         }
 
         return (

From e9214f7d1364224dc1030b48fb1b3bcaaf29c175 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 14:49:30 +0100
Subject: [PATCH 2599/3235] Make new device toasts appear above review toasts

...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
---
 src/DeviceListener.js    |  1 +
 src/stores/ToastStore.js | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index c4beb6c01e..84c6b1d230 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -267,6 +267,7 @@ export default class DeviceListener {
                 key: OTHER_DEVICES_TOAST_KEY,
                 title: _t("Review where you’re logged in"),
                 icon: "verification_warning",
+                priority: ToastStore.PRIORITY_LOW,
                 props: {
                     deviceIds: oldUnverifiedDeviceIds,
                 },
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index f17d13bf9e..ad185e42db 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -20,8 +20,9 @@ import EventEmitter from 'events';
  * Holds the active toasts
  */
 export default class ToastStore extends EventEmitter {
-    static PRIORITY_REALTIME = 1;
-    static PRIORITY_DEFAULT = 0;
+    static PRIORITY_REALTIME = 0;
+    static PRIORITY_DEFAULT = 1;
+    static PRIORITY_LOW = 2;
 
     static sharedInstance() {
         if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
@@ -43,12 +44,9 @@ export default class ToastStore extends EventEmitter {
 
         const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
-            // we only have two priorities so just push realtime ones onto the front
-            if (newToast.priority) {
-                this._toasts.unshift(newToast);
-            } else {
-                this._toasts.push(newToast);
-            }
+            let newIndex = this._toasts.length;
+            while (newIndex > 0 && this._toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+            this._toasts.splice(newIndex, 0, newToast);
         } else {
             this._toasts[oldIndex] = newToast;
         }

From 58c0cfe315752c512835703142cd6e705b1e8f45 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:10:23 +0100
Subject: [PATCH 2600/3235] Add jsdoc explaining ordering behaviour

---
 src/stores/ToastStore.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
index ad185e42db..8901736739 100644
--- a/src/stores/ToastStore.js
+++ b/src/stores/ToastStore.js
@@ -39,6 +39,15 @@ export default class ToastStore extends EventEmitter {
         this._toasts = [];
     }
 
+    /**
+     * Add or replace a toast
+     * If a toast with the same toastKey already exists, the given toast will replace it
+     * Toasts are always added underneath any toasts of the same priority, so existing
+     * toasts stay at the top unless a higher priority one arrives (better to not change the
+     * toast unless necessary).
+     *
+     * @param {boject} newToast The new toast
+     */
     addOrReplaceToast(newToast) {
         if (newToast.priority === undefined) newToast.priority = ToastStore.PRIORITY_DEFAULT;
 

From 65bdaa20b02487a494aee7a85e0681550a5bc84d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Apr 2020 15:19:09 +0100
Subject: [PATCH 2601/3235] Allow resetting storage from the access dialog

This adds a path to reset secret storage from the access dialog instead of
throwing an error.

Fixes https://github.com/vector-im/riot-web/issues/13436
---
 .../views/dialogs/secretstorage/AccessSecretStorageDialog.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 7d7edffcbf..e2ceadfbb9 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
+import { accessSecretStorage } from '../../../../CrossSigningManager';
 
 /*
  * Access Secure Secret Storage by requesting the user's passphrase.
@@ -55,8 +56,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
     }
 
     _onResetRecoveryClick = () => {
+        // Re-enter the access flow, but resetting storage this time around.
         this.props.onFinished(false);
-        throw new Error("Resetting secret storage unimplemented");
+        accessSecretStorage(() => {}, /* forceReset = */ true);
     }
 
     _onRecoveryKeyChange = (e) => {

From 5b2ff19f5929da9b93813764553e5f980b4241ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 13:59:03 +0000
Subject: [PATCH 2602/3235] Translated using Weblate (Estonian)

Currently translated at 20.5% (471 of 2298 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 9cb5dbfb4b..4c061b6b43 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -464,5 +464,10 @@
     "Find a room…": "Leia jututuba…",
     "Find a room… (e.g. %(exampleRoom)s)": "Otsi jututuba… (näiteks %(exampleRoom)s)",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.",
-    "Options": "Valikud"
+    "Options": "Valikud",
+    "Searches DuckDuckGo for results": "Otsi DuckDuckGo abil",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Turvaliselt puhverda krüptitud sõnumeid kohalikus arvutis selleks, et nad oleks otsitavad kasutades ",
+    "this room": "see jututuba",
+    "Quote": "Tsiteeri",
+    "This Room": "See jututuba"
 }

From 9ac4fa92fd18c802906a401afb0862f6abf20d56 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:31:41 +0100
Subject: [PATCH 2603/3235] Update (bulk) unverified device toast copy

Fixes https://github.com/vector-im/riot-web/issues/13444
---
 .../views/toasts/BulkUnverifiedSessionsToast.js           | 2 +-
 src/components/views/toasts/UnverifiedSessionToast.js     | 8 ++------
 src/i18n/strings/en_EN.json                               | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index b16dc87f21..e0be846a2b 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify your other sessions")}
+                {_t("Unverified sessions currently have access to your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 3f2f29a493..a4454ca6d5 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -54,15 +54,11 @@ export default class UnverifiedSessionToast extends React.PureComponent {
 
         return (<div>
             <div className="mx_Toast_description">
-                <span className="mx_Toast_deviceName">
-                    {device.getDisplayName()}
-                </span> <span className="mx_Toast_deviceID">
-                    ({device.deviceId})
-                </span>
+                {_t("Verify the identity of the new login accessing your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
+                <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
             </div>
         </div>);
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7484f7f635..6ab0c886d4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -559,7 +559,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify your other sessions": "Verify your other sessions",
+    "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
     "Later": "Later",
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@@ -568,6 +568,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
+    "Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From 691066af947ea3a0643503acc03225b529753163 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:31:41 +0100
Subject: [PATCH 2604/3235] Update (bulk) unverified device toast copy

Fixes https://github.com/vector-im/riot-web/issues/13444
---
 .../views/toasts/BulkUnverifiedSessionsToast.js           | 2 +-
 src/components/views/toasts/UnverifiedSessionToast.js     | 8 ++------
 src/i18n/strings/en_EN.json                               | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index b16dc87f21..e0be846a2b 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify your other sessions")}
+                {_t("Unverified sessions currently have access to your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 3f2f29a493..a4454ca6d5 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -54,15 +54,11 @@ export default class UnverifiedSessionToast extends React.PureComponent {
 
         return (<div>
             <div className="mx_Toast_description">
-                <span className="mx_Toast_deviceName">
-                    {device.getDisplayName()}
-                </span> <span className="mx_Toast_deviceID">
-                    ({device.deviceId})
-                </span>
+                {_t("Verify the identity of the new login accessing your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
+                <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
             </div>
         </div>);
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5129839cbd..dc83ca8964 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -556,7 +556,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify your other sessions": "Verify your other sessions",
+    "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
     "Later": "Later",
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@@ -565,6 +565,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
+    "Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From 283a15c0b30e40f965452ce5f4c60349d2391187 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:54:32 +0100
Subject: [PATCH 2605/3235] Lint

---
 src/components/views/toasts/UnverifiedSessionToast.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index a4454ca6d5..032d457c3a 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -49,9 +49,6 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
-        const cli = MatrixClientPeg.get();
-        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
-
         return (<div>
             <div className="mx_Toast_description">
                 {_t("Verify the identity of the new login accessing your account & messages")}

From d691386ef06f6e73d9a42f51bc461cf343c1ae3f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 15:54:32 +0100
Subject: [PATCH 2606/3235] Lint

---
 src/components/views/toasts/UnverifiedSessionToast.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index a4454ca6d5..032d457c3a 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -49,9 +49,6 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
-        const cli = MatrixClientPeg.get();
-        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
-
         return (<div>
             <div className="mx_Toast_description">
                 {_t("Verify the identity of the new login accessing your account & messages")}

From a70efea69e9c1bda8419e24770f70aa8cc057a8f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:16:04 +0100
Subject: [PATCH 2607/3235] Treat sessions that are there when we log in as old

Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.

Also cheeky unrelated proptypes fix.

Fixes https://github.com/vector-im/riot-web/issues/13443
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360
---
 src/DeviceListener.js                               | 13 ++++++++++---
 .../views/toasts/UnverifiedSessionToast.js          |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 84c6b1d230..c37d702fd6 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -107,7 +107,12 @@ export default class DeviceListener {
         }
     }
 
-    _onWillUpdateDevices = async (users) => {
+    _onWillUpdateDevices = async (users, initialFetch) => {
+        // We we didn't know about *any* devices before (ie. it's fresh login),
+        // then they are all pre-existing devices, so ignore this and set the
+        // devicesAtStart list to the devices that we see after the fetch.
+        if (initialFetch) return;
+
         const myUserId = MatrixClientPeg.get().getUserId();
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
 
@@ -179,8 +184,6 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
-        this._ensureDeviceIdsAtStartPopulated();
-
         if (this._dismissedThisDeviceToast) {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
@@ -235,6 +238,10 @@ export default class DeviceListener {
             }
         }
 
+        // This needs to be done after awaiting on downloadKeys() above, so
+        // we make sure we get the devices after the fetch is done.
+        this._ensureDeviceIdsAtStartPopulated();
+
         // Unverified devices that were there last time the app ran
         // (technically could just be a boolean: we don't actually
         // need to remember the device IDs, but for the sake of
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 032d457c3a..f3e35e247c 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -27,7 +27,7 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 @replaceableComponent("views.toasts.UnverifiedSessionToast")
 export default class UnverifiedSessionToast extends React.PureComponent {
     static propTypes = {
-        deviceId: PropTypes.object,
+        deviceId: PropTypes.string,
     }
 
     _onLaterClick = () => {

From 13d0e26ec4f6d00d23c965ba17374b6f7233517c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:28:45 +0100
Subject: [PATCH 2608/3235] Reduce maximum width of toasts & allow multiple
 lines

---
 res/css/structures/_ToastContainer.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index af595aaeee..64496b2cc0 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -91,10 +91,7 @@ limitations under the License.
         }
 
         .mx_Toast_description {
-            max-width: 400px;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
+            max-width: 272px;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
         }

From c41af152ac70c3ee97fb9e7c6911de2e1e86be9e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Apr 2020 17:33:18 +0100
Subject: [PATCH 2609/3235] Comment typo

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index c37d702fd6..28f8e8b115 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -108,7 +108,7 @@ export default class DeviceListener {
     }
 
     _onWillUpdateDevices = async (users, initialFetch) => {
-        // We we didn't know about *any* devices before (ie. it's fresh login),
+        // If we didn't know about *any* devices before (ie. it's fresh login),
         // then they are all pre-existing devices, so ignore this and set the
         // devicesAtStart list to the devices that we see after the fetch.
         if (initialFetch) return;

From 34d6eb591fbe2eeca527a46a23d067a13ec696f7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:38:32 +0100
Subject: [PATCH 2610/3235] Put overflows back

---
 res/css/structures/_ToastContainer.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 64496b2cc0..6ec4a0d152 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -92,6 +92,8 @@ limitations under the License.
 
         .mx_Toast_description {
             max-width: 272px;
+            overflow: hidden;
+            text-overflow: ellipsis;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
         }

From eebcf748e18f5dc4e08cc1343a5a50f384edfdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 15:50:21 +0000
Subject: [PATCH 2611/3235] Translated using Weblate (Estonian)

Currently translated at 22.2% (510 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 4c061b6b43..603354166a 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -469,5 +469,44 @@
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Turvaliselt puhverda krüptitud sõnumeid kohalikus arvutis selleks, et nad oleks otsitavad kasutades ",
     "this room": "see jututuba",
     "Quote": "Tsiteeri",
-    "This Room": "See jututuba"
+    "This Room": "See jututuba",
+    "Sun": "Pühapäev",
+    "Mon": "Esmaspäev",
+    "Tue": "Teisipäev",
+    "Wed": "Kolmapäev",
+    "Thu": "Neljapäev",
+    "Fri": "Reede",
+    "Sat": "Laupäev",
+    "%(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, %(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",
+    "Encryption upgrade available": "Krüptimise uuendus on saadaval",
+    "Set up encryption": "Seadista krüptimine",
+    "Review where you’re logged in": "Vaata üle, kust sa oled Matrix'i võrku loginud",
+    "New login. Was this you?": "Uus sisselogimine. Kas see olid sina?",
+    "Who would you like to add to this community?": "Kas sa sooviksid seda lisada kogukonda?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Hoiatus: kõik kogukonda lisatud kasutajad on nähtavad kõigile, kes teavad kogukonna tunnust",
+    "Name or Matrix ID": "Nimi või Matrix'i tunnus",
+    "Invite to Community": "Kutsu kogukonda",
+    "Room name or alias": "Jututoa nimi või alias",
+    "Add to community": "Lisa kogukonda",
+    "Failed to invite the following users to %(groupId)s:": "Järgnevate kasutajate kutsumine %(groupId)s liikmeks ebaõnnestus:",
+    "Failed to invite users to community": "Kasutajate kutsumine kogukonda ebaõnnestus",
+    "Failed to invite users to %(groupId)s": "Kasutajate kutsumine %(groupId)s kogukonna liikmeks ebaõnnestus",
+    "Unnamed Room": "Ilma nimeta jututuba",
+    "Identity server has no terms of service": "Isikutuvastusserveril puuduvad kasutustingimused",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "E-posti aadressi või telefoninumbri kontrolliks see tegevus eeldab päringut vaikimisi isikutuvastusserverisse <server />, aga sellel serveril puuduvad kasutustingimused.",
+    "Only continue if you trust the owner of the server.": "Jätka vaid siis, kui sa usaldad serveri omanikku.",
+    "Trust": "Usalda",
+    "%(name)s is requesting verification": "%(name)s soovib verifitseerimist",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Turvaliselt puhverda krüptitud sõnumid kohalikku arvutisse ja võimalda kasutada neid otsingus.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot'is on puudu need komponendid, mis võimaldavad otsida kohalikest turvaliselt puhverdatud krüptitud sõnumitest. Kui sa tahaksid sellist funktsionaalsust katsetada, siis pead kompileerima Riot'i variandi, kus <nativeLink>need komponendid on lisatud</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ei saa veebibrauserist käivitades otsida turvaliselt kohalikult puhverdatud krüptitud sõnumite hulgast. Selliste sõnumite hulgast otsimiseks kasuta <riotLink>Riot'i töölauaversiooni</riotLink>.",
+    "Message search": "Otsing sõnumite seast",
+    "Search…": "Otsi…",
+    "Cancel search": "Tühista otsing",
+    "Search failed": "Otsing ebaõnnestus",
+    "Server may be unavailable, overloaded, or search timed out :(": "Server kas pole leitav, on üle koormatud või otsing aegus :(",
+    "No more results": "Rohkem otsingutulemusi pole",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Otsingus kasutamiseks Riot puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:"
 }

From 1f79f5ded687033a27ac79c99f6eb1264ef90394 Mon Sep 17 00:00:00 2001
From: Louis <louis@chmn.me>
Date: Wed, 29 Apr 2020 15:24:20 +0000
Subject: [PATCH 2612/3235] Translated using Weblate (French)

Currently translated at 99.9% (2298 of 2299 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 9b373cc364..ac41f6ec2e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2407,5 +2407,7 @@
     "Where you’re logged in": "Où vous vous êtes connecté",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gérez les noms et déconnectez-vous de vos sessions ci-dessous ou <a>vérifiez-les dans votre profil utilisateur</a>.",
     "Review where you’re logged in": "Vérifier où vous vous êtes connecté",
-    "Verify your other sessions": "Vérifier vos autres sessions"
+    "Verify your other sessions": "Vérifier vos autres sessions",
+    "Unverified sessions currently have access to your account & messages": "Des sessions non vérifiées ont accès à votre compte et messages",
+    "Verify the identity of the new login accessing your account & messages": "Vérifiez l'identité de la nouvelle connexion accédant à votre compte et messages"
 }

From e3da750de07ed66f02cb4e9a51da9fc82df4d539 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 29 Apr 2020 15:19:09 +0100
Subject: [PATCH 2613/3235] Allow resetting storage from the access dialog

This adds a path to reset secret storage from the access dialog instead of
throwing an error.

Fixes https://github.com/vector-im/riot-web/issues/13436
---
 .../views/dialogs/secretstorage/AccessSecretStorageDialog.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index 7d7edffcbf..e2ceadfbb9 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 
 import { _t } from '../../../../languageHandler';
+import { accessSecretStorage } from '../../../../CrossSigningManager';
 
 /*
  * Access Secure Secret Storage by requesting the user's passphrase.
@@ -55,8 +56,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
     }
 
     _onResetRecoveryClick = () => {
+        // Re-enter the access flow, but resetting storage this time around.
         this.props.onFinished(false);
-        throw new Error("Resetting secret storage unimplemented");
+        accessSecretStorage(() => {}, /* forceReset = */ true);
     }
 
     _onRecoveryKeyChange = (e) => {

From 19170945b127f2df72cd10db79f62810d9781dda Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:16:04 +0100
Subject: [PATCH 2614/3235] Treat sessions that are there when we log in as old

Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.

Also cheeky unrelated proptypes fix.

Fixes https://github.com/vector-im/riot-web/issues/13443
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360
---
 src/DeviceListener.js                               | 13 ++++++++++---
 .../views/toasts/UnverifiedSessionToast.js          |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 84c6b1d230..c37d702fd6 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -107,7 +107,12 @@ export default class DeviceListener {
         }
     }
 
-    _onWillUpdateDevices = async (users) => {
+    _onWillUpdateDevices = async (users, initialFetch) => {
+        // We we didn't know about *any* devices before (ie. it's fresh login),
+        // then they are all pre-existing devices, so ignore this and set the
+        // devicesAtStart list to the devices that we see after the fetch.
+        if (initialFetch) return;
+
         const myUserId = MatrixClientPeg.get().getUserId();
         if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
 
@@ -179,8 +184,6 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
-        this._ensureDeviceIdsAtStartPopulated();
-
         if (this._dismissedThisDeviceToast) {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
@@ -235,6 +238,10 @@ export default class DeviceListener {
             }
         }
 
+        // This needs to be done after awaiting on downloadKeys() above, so
+        // we make sure we get the devices after the fetch is done.
+        this._ensureDeviceIdsAtStartPopulated();
+
         // Unverified devices that were there last time the app ran
         // (technically could just be a boolean: we don't actually
         // need to remember the device IDs, but for the sake of
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index 032d457c3a..f3e35e247c 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -27,7 +27,7 @@ import { replaceableComponent } from '../../../utils/replaceableComponent';
 @replaceableComponent("views.toasts.UnverifiedSessionToast")
 export default class UnverifiedSessionToast extends React.PureComponent {
     static propTypes = {
-        deviceId: PropTypes.object,
+        deviceId: PropTypes.string,
     }
 
     _onLaterClick = () => {

From 38124ba9d07f978a0645157cd871f5ad20f37d33 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 29 Apr 2020 17:33:18 +0100
Subject: [PATCH 2615/3235] Comment typo

Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
---
 src/DeviceListener.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index c37d702fd6..28f8e8b115 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -108,7 +108,7 @@ export default class DeviceListener {
     }
 
     _onWillUpdateDevices = async (users, initialFetch) => {
-        // We we didn't know about *any* devices before (ie. it's fresh login),
+        // If we didn't know about *any* devices before (ie. it's fresh login),
         // then they are all pre-existing devices, so ignore this and set the
         // devicesAtStart list to the devices that we see after the fetch.
         if (initialFetch) return;

From 886b30a265191525c56463fb38dcb2509fe6c94d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 29 Apr 2020 15:07:00 +0200
Subject: [PATCH 2616/3235] also recheck

---
 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 1293ccc7e9..a17db57d53 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1186,6 +1186,7 @@ export default createReactClass({
      */
     _onLoggedIn: async function() {
         ThemeController.isLogin = false;
+        this._themeWatcher.recheck();
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
         // If a specific screen is set to be shown after login, show that above
         // all else, as it probably means the user clicked on something already.

From 1cac7b778d630e502c3d53876f80578d7efd65cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 16:56:46 +0000
Subject: [PATCH 2617/3235] Translated using Weblate (Estonian)

Currently translated at 22.3% (513 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 603354166a..f254493f3d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -508,5 +508,8 @@
     "Search failed": "Otsing ebaõnnestus",
     "Server may be unavailable, overloaded, or search timed out :(": "Server kas pole leitav, on üle koormatud või otsing aegus :(",
     "No more results": "Rohkem otsingutulemusi pole",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Otsingus kasutamiseks Riot puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:"
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Otsingus kasutamiseks Riot puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot'il puudub luba sulle teavituste kuvamiseks - palun kontrolli oma brauseri seadistusi",
+    "Riot was not given permission to send notifications - please try again": "Riot ei saanud luba teavituste kuvamiseks - palun proovi uuesti",
+    "Room Notification": "Jututoa teavitus"
 }

From ba233dc37218b1aa790ff6e34e2f72e0610fc641 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:28:45 +0100
Subject: [PATCH 2618/3235] Reduce maximum width of toasts & allow multiple
 lines

---
 res/css/structures/_ToastContainer.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index af595aaeee..64496b2cc0 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -91,10 +91,7 @@ limitations under the License.
         }
 
         .mx_Toast_description {
-            max-width: 400px;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
+            max-width: 272px;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
         }

From 189a78d184a00bf81213e60b4e0c1d41037c209c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 17:38:32 +0100
Subject: [PATCH 2619/3235] Put overflows back

---
 res/css/structures/_ToastContainer.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 64496b2cc0..6ec4a0d152 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -92,6 +92,8 @@ limitations under the License.
 
         .mx_Toast_description {
             max-width: 272px;
+            overflow: hidden;
+            text-overflow: ellipsis;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
         }

From cea8f59fb3acc77986fb305264d87a8c6996ab7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 17:09:48 +0000
Subject: [PATCH 2620/3235] Translated using Weblate (Estonian)

Currently translated at 23.7% (545 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index f254493f3d..528f770948 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -511,5 +511,37 @@
     "Riot is securely caching encrypted messages locally for them to appear in search results:": "Otsingus kasutamiseks Riot puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot'il puudub luba sulle teavituste kuvamiseks - palun kontrolli oma brauseri seadistusi",
     "Riot was not given permission to send notifications - please try again": "Riot ei saanud luba teavituste kuvamiseks - palun proovi uuesti",
-    "Room Notification": "Jututoa teavitus"
+    "Room Notification": "Jututoa teavitus",
+    "Displays information about a user": "Näitab teavet kasutaja kohta",
+    "This homeserver has hit its Monthly Active User limit.": "See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.",
+    "about a minute ago": "umbes minut tagasi",
+    "about an hour ago": "umbes tund tagasi",
+    "%(num)s hours ago": "%(num)s tundi tagasi",
+    "about a day ago": "umbes päev tagasi",
+    "%(num)s days ago": "%(num)s päeva tagasi",
+    "about a minute from now": "umbes minuti pärast",
+    "about an hour from now": "umbes tunni pärast",
+    "%(num)s hours from now": "%(num)s tunni pärast",
+    "about a day from now": "umbes päeva pärast",
+    "%(num)s days from now": "%(num)s päeva pärast",
+    "Are you sure?": "Kas sa oled kindel?",
+    "No sessions with registered encryption keys": "Puuduvad registreeritud krüptimisvõtmetega sessioonid",
+    "Jump to read receipt": "Hüppa lugemisteatise juurde",
+    "Invite": "Kutsu",
+    "Unmute": "Eemalda summutamine",
+    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "See koduserver on saavutanud igakuise aktiivsete kasutajate piiri ja seega <b>osad kasutajad ei saa sisse logida</b>.",
+    "Create a public room": "Loo avalik jututuba",
+    "Create a private room": "Loo omavaheline jututuba",
+    "Name": "Nimi",
+    "Topic (optional)": "Teema (valikuline)",
+    "Make this room public": "Tee see jututuba avalikuks",
+    "Hide advanced": "Peida lisaseadistused",
+    "Show advanced": "Näita lisaseadistused",
+    "Server did not require any authentication": "Server ei nõudnud mitte mingisugust autentimist",
+    "Recent Conversations": "Hiljutised vestlused",
+    "Suggestions": "Soovitused",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Alusta vestlust kasutades teise osapoole nime, kasutajanime (näiteks <userId/>) või e-posti aadressi.",
+    "Go": "Mine",
+    "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
+    "Add room": "LIsa jututuba"
 }

From 683d6804cae5f882895473d29cb075401d43c77b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 19:07:10 +0100
Subject: [PATCH 2621/3235] Update toast copy again

Fixes https://github.com/vector-im/riot-web/issues/13447
---
 src/components/views/toasts/BulkUnverifiedSessionsToast.js | 2 +-
 src/components/views/toasts/UnverifiedSessionToast.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index e0be846a2b..0c40e56858 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Unverified sessions currently have access to your account & messages")}
+                {_t("Verify all your sessions to ensure your account & messages are safe")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index f3e35e247c..afabf69178 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -51,7 +51,7 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify the identity of the new login accessing your account & messages")}
+                {_t("Verify the new login accessing your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />

From c97eab24c7e0c2d6c2a5b45b2d988baa29f56ede Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 29 Apr 2020 19:07:10 +0100
Subject: [PATCH 2622/3235] Update toast copy again

Fixes https://github.com/vector-im/riot-web/issues/13447
---
 src/components/views/toasts/BulkUnverifiedSessionsToast.js | 2 +-
 src/components/views/toasts/UnverifiedSessionToast.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index e0be846a2b..0c40e56858 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -45,7 +45,7 @@ export default class BulkUnverifiedSessionsToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Unverified sessions currently have access to your account & messages")}
+                {_t("Verify all your sessions to ensure your account & messages are safe")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index f3e35e247c..afabf69178 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -51,7 +51,7 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     render() {
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify the identity of the new login accessing your account & messages")}
+                {_t("Verify the new login accessing your account & messages")}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />

From 9d699c66d0514a87a2884e1a18d7399a08a1afb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 19:19:22 +0000
Subject: [PATCH 2623/3235] Translated using Weblate (Estonian)

Currently translated at 24.1% (553 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 528f770948..7f9dcb3113 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -543,5 +543,13 @@
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Alusta vestlust kasutades teise osapoole nime, kasutajanime (näiteks <userId/>) või e-posti aadressi.",
     "Go": "Mine",
     "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
-    "Add room": "LIsa jututuba"
+    "Add room": "LIsa jututuba",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsus vestlema kasutajat %(targetName)s.",
+    "%(targetName)s joined the room.": "%(targetName)s liitus jututoaga.",
+    "%(senderName)s answered the call.": "%(senderName)s vastas kõnele.",
+    "%(senderName)s ended the call.": "%(senderName)s lõpetas kõne.",
+    "%(senderName)s placed a voice call.": "%(senderName)s alustas häälkõnet.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s alustas häälkõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
+    "%(senderName)s placed a video call.": "%(senderName)s alustas videokõnet.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s alustas videokõnet. (sellel brauseril puudub niisuguste kõnede tugi)"
 }

From dab4ca64fce6ab176058e60c6b022c513776a50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 19:43:59 +0000
Subject: [PATCH 2624/3235] Translated using Weblate (Estonian)

Currently translated at 26.8% (617 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7f9dcb3113..74885e0aad 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -551,5 +551,69 @@
     "%(senderName)s placed a voice call.": "%(senderName)s alustas häälkõnet.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s alustas häälkõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
     "%(senderName)s placed a video call.": "%(senderName)s alustas videokõnet.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s alustas videokõnet. (sellel brauseril puudub niisuguste kõnede tugi)"
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s alustas videokõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s määras et jututuppa pääseb vaid kutsega.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s muutis liitumisreeglid järgnevaks - %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s on lubanud külalistel jututoaga liituda.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s on määranud et külalised ei saa jututoaga liituda.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s muutis külaliste ligipääsureeglid alljärgnevaks - %(rule)s",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s saatis pildi.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s muutis selle jututoa põhiaadressiks %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s eemaldas põhiaadressi sellest jututoast.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eemaldas täiendavad aadressid %(addresses)s sellelt jututoalt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eemaldas täiendava aadressi %(addresses)s sellelt jututoalt.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutis selle jututoa täiendavat aadressi.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutis selle jututoa põhiaadressi ja täiendavat aadressi.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s muutis selle jututoa aadressid.",
+    "Someone": "Keegi",
+    "(not supported by this browser)": "(ei ole toetatud selles brauseris)",
+    "(could not connect media)": "(ühendus teise osapoolega ei õnnestunud)",
+    "(no answer)": "(ei ole vastust)",
+    "(unknown failure: %(reason)s)": "(teadmata viga: %(reason)s)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s võttis %(targetDisplayName)s'lt tagasi jututoaga liitumise kutse.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s saatis %(targetDisplayName)s'le kutse jututoaga liitumiseks.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s seadistas, et jututoa tulevane ajalugu on kõigile nähtav.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s seadistas, et jututoa tulevase ajaloo nähtavuse olek on (%(visibility)s).",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s muutis vidinat %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisas vidina %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s eemaldas vidina %(widgetName)s",
+    "Muted Users": "Summutatud kasutajad",
+    "This room is end-to-end encrypted": "See jututuba on läbivalt krüptitud",
+    "Everyone in this room is verified": "Kõik kasutajad siin nututoas on verifitseeritud",
+    "Some sessions for this user are not trusted": "Mõned selle kasutaja sessioonid ei ole usaldusväärsed",
+    "All sessions for this user are trusted": "Kõik selle kasutaja sessioonid on usaldusväärsed",
+    "Some sessions in this encrypted room are not trusted": "Mõned sessioonid selles krüptitud jututoas ei ole usaldusväärsed",
+    "All sessions in this encrypted room are trusted": "Kõik sessioonid selles krüptitud jututoas on usaldusväärsed",
+    "Edit message": "Muuda sõnumit",
+    "%(senderName)s sent an image": "%(senderName)s saatis pildi",
+    "%(senderName)s sent a video": "%(senderName)s saatis video",
+    "%(senderName)s uploaded a file": "%(senderName)s laadis üles faili",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Sinu krüptovõtme jagamise päring on saadetud - palun oma teisi sessioone krüptovõtme jagamise päringu osas.",
+    "This message cannot be decrypted": "Seda sõnumit ei sa dekrüptida",
+    "Unencrypted": "Krüptimata",
+    "Encrypted by a deleted session": "Krüptitud kustutatud sessiooni poolt",
+    "Please select the destination room for this message": "Palun vali jututuba, kuhu soovid seda sõnumit saata",
+    "Invite only": "Ainult kutse",
+    "Scroll to most recent messages": "Mine viimaste sõnumite juurde",
+    "Close preview": "Sulge eelvaade",
+    "Disinvite": "Eemalda kutse",
+    "Kick": "Müksa välja",
+    "Disinvite this user?": "Kas võtad selle kasutaja kutse tagasi?",
+    "Kick this user?": "Kas müksad selle kasutaja jututoast välja?",
+    "Failed to kick": "Jututoast väljamüksamine ei õnnestunud",
+    "No recent messages by %(user)s found": "Kasutajalt %(user)s ei leitud hiljutisi sõnumeid",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Vaata kas ajajoonel ülespool leidub varasemaid sõnumeid.",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Kui sõnumeid on väga palju, siis võib nüüd aega kuluda. Oodates palun ära tee ühtegi päringut ega andmevärskendust.",
+    "Failed to mute user": "Kasutaja summutamine ebaõnnestus",
+    "%(creator)s created and configured the room.": "%(creator)s lõi ja seadistas jututoa.",
+    "Click to unmute video": "Klõpsi video heli taastamiseks",
+    "Click to mute video": "Klõpsi video heli summutamiseks",
+    "Click to unmute audio": "Klõpsi heli taastamiseks",
+    "Click to mute audio": "Klõpsi heli summutamiseks",
+    "Your profile": "Sinu profiil"
 }

From 49ac4963c523b58efa341aa9b09e2fd29bf1bc08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 20:55:43 +0000
Subject: [PATCH 2625/3235] Translated using Weblate (Estonian)

Currently translated at 28.1% (647 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 74885e0aad..42e1030a89 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -615,5 +615,35 @@
     "Click to mute video": "Klõpsi video heli summutamiseks",
     "Click to unmute audio": "Klõpsi heli taastamiseks",
     "Click to mute audio": "Klõpsi heli summutamiseks",
-    "Your profile": "Sinu profiil"
+    "Your profile": "Sinu profiil",
+    "How fast should messages be downloaded.": "Kui kiiresti peaksime sõnumeid alla laadima.",
+    "Error downloading theme information.": "Viga teema teabefaili allalaadimisel.",
+    "Close": "Sulge",
+    "Add a widget": "Lisa vidin",
+    "Drop File Here": "Lohista fail siia",
+    "Drop file here to upload": "Faili üleslaadimiseks lohista ta siia",
+    " (unsupported)": " (ei ole toetatud)",
+    "This user has not verified all of their sessions.": "See kasutaja ei ole verifitseerinud kõiki nende sessioone.",
+    "You have not verified this user.": "Sa ei ole seda kasutajat verifitseerinud.",
+    "You have verified this user. This user has verified all of their sessions.": "Sa oled selle kasutaja verifitseerinud. See kasutaja on verifitseerinud kõik nende sessioonid.",
+    "Someone is using an unknown session": "Keegi kasutab tundmatut sessiooni",
+    "This event could not be displayed": "Seda sündmust ei õnnestunud kuvada",
+    "Downloading update...": "Laen alla uuendust...",
+    "Download this file": "Lae see fail alla",
+    "You can now close this window or <a>log in</a> to your new account.": "Sa võid nüüd sulgeda selle akna või <a>logida sisse</a> oma uuele kontole.",
+    "Download": "Lae alla",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Sinu taastevõti on sinu <b>Allalaadimised</b> kasutas.",
+    "Disable": "Lülita välja",
+    "Not currently indexing messages for any room.": "Mitte ainsamagi jututoa sõnumeid hetkel ei indekseerita.",
+    "Currently indexing: %(currentRoom)s": "Parasjagu indekseerin: %(currentRoom)s",
+    "Space used:": "Kasutatud andmeruum:",
+    "Indexed messages:": "Indekseeritud sõnumid:",
+    "Failed to add tag %(tagName)s to room": "Sildi %(tagName)s lisamine jututoale ebaõnnestus",
+    "Close dialog or context menu": "Sulge dialoogiaken või kontekstimenüü",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Tühikuklahv",
+    "End": "End"
 }

From 8be07abf6cf330ef18c96804e1d29d17bb7603a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 29 Apr 2020 21:27:33 +0000
Subject: [PATCH 2626/3235] Translated using Weblate (Estonian)

Currently translated at 28.6% (657 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 42e1030a89..7fa5208f4b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -645,5 +645,15 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Tühikuklahv",
-    "End": "End"
+    "End": "End",
+    "Unable to add email address": "E-posti aadressi lisamine ebaõnnestus",
+    "Add": "Lisa",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Sinu aadressi kontrollimiseks saatsime sulle e-kirja. Palun järgi kirjas näidatud juhendit ja siis klõpsi alljärgnevat nuppu.",
+    "Email Address": "E-posti aadress",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Saatsime tekstisõnumi numbrile +%(msisdn)s. Palun sisesta seal kuvatud kontrollkood.",
+    "Phone Number": "Telefoni number",
+    "Cannot add any more widgets": "Rohkem vidinaid ei õnnestu lisada",
+    "The maximum permitted number of widgets have already been added to this room.": "Suurim lubatud vidinate arv on siia jututuppa juba lisatud.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitu kas <voiceText>häälkõnega</voiceText> või <videoText>videokõnega</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Toimuv rühmavestlus %(supportedText)s."
 }

From 4d66e251ae2a9012caf47bcf989792e90f08358f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 30 Apr 2020 06:17:03 +0000
Subject: [PATCH 2627/3235] Translated using Weblate (Bulgarian)

Currently translated at 86.3% (1984 of 2299 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 | 84 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index b31498ef0b..7a5edcc381 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1961,5 +1961,87 @@
     "Enable message search in encrypted rooms": "Включи търсенето на съобщения в шифровани стаи",
     "Keep secret storage passphrase in memory for this session": "Съхрани паролата за секретното складиране в паметта за тази сесия",
     "How fast should messages be downloaded.": "Колко бързо да се изтеглят съобщенията.",
-    "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии"
+    "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии",
+    "If you cancel now, you won't complete your operation.": "Ако се откажете сега, няма да завършите операцията.",
+    "Review where you’re logged in": "Прегледайте откъде сте влезли в профила си",
+    "New login. Was this you?": "Нов вход. Вие ли бяхте това?",
+    "%(name)s is requesting verification": "%(name)s изпрати запитване за верификация",
+    "Failed to set topic": "Неуспешно задаване на тема",
+    "Command failed": "Командата не се изпълни",
+    "Could not find user in room": "Неуспешно намиране на потребител в стаята",
+    "Please supply a widget URL or embed code": "Укажете URL адрес на приспособление или код за вграждане",
+    "Send a bug report with logs": "Изпратете доклад за грешка с логове",
+    "Enable cross-signing to verify per-user instead of per-session": "Включи кръстосано-подписване за верифициране на ниво потребител, вместо на ниво сесия",
+    "Keep recovery passphrase in memory for this session": "Запази паролата за възстановяване в паметта за тази сесия",
+    "Verify this session by completing one of the following:": "Верифицирайте тази сесия чрез едно от следните действия:",
+    "Scan this unique code": "Сканирайте този уникален код",
+    "or": "или",
+    "Compare unique emoji": "Сравнете уникални емоджи",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Сравнете уникални емоджи, ако нямате камера на някое от устройствата",
+    "Start": "Започни",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Потвърдете, че емоджитата по-долу са показани и на двете сесии в един и същи ред:",
+    "Verify this session by confirming the following number appears on its screen.": "Потвърдете тази сесия, като потвърдите, че следното число се появява на екрана й.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Изчакване на другата сесия, %(deviceName)s (%(deviceId)s) да потвърди…",
+    "Waiting for %(displayName)s to verify…": "Изчакване на %(displayName)s да потвърди…",
+    "Cancelling…": "Отказване…",
+    "They match": "Съвпадат",
+    "They don't match": "Не съвпадат",
+    "To be secure, do this in person or use a trusted way to communicate.": "За да е по-сигурно, направете го на живо или използвайте доверен начин за комуникация.",
+    "Lock": "Заключи",
+    "Unverified sessions currently have access to your account & messages": "Непотвърдени сесии в момента имат достъп до профила и съобщенията ви",
+    "Later": "По-късно",
+    "Review": "Прегледай",
+    "Verify yourself & others to keep your chats safe": "Потвърдете себе си и останалите за да запазите чатовете си сигурни",
+    "Other users may not trust it": "Други потребители може да не се доверят",
+    "Update your secure storage": "Обновете защитеното складиране",
+    "Verify the identity of the new login accessing your account & messages": "Потвърдете самоличността на новия вход достъпващ профила и съобщенията ви",
+    "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
+    "This bridge was provisioned by <user />.": "Мостът е настроен от <user />.",
+    "Workspace: %(networkName)s": "Работна област: %(networkName)s",
+    "Channel: %(channelName)s": "Канал: %(channelName)s",
+    "Show less": "Покажи по-малко",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Промяната на паролата в момента би нулирало всички ключове за шифроване-от-край-до-край, правейки историята на чата нечетима, освен ако първо не експортирате ключовете, а след промяната на паролата ги импортирате. В бъдеще, това ще бъде подобрено.",
+    "Your homeserver does not support cross-signing.": "Сървърът ви не поддържа кръстосано-подписване.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Профилът ви има самоличност за кръстосано подписване в секретно складиране, но все още не е доверено от тази сесия.",
+    "Reset cross-signing and secret storage": "Нулирай кръстосаното-подписване и секретното складиране",
+    "well formed": "коректен",
+    "unexpected type": "непознат тип",
+    "in memory": "в паметта",
+    "Self signing private key:": "Частен ключ за самоподписване:",
+    "cached locally": "кеширан локално",
+    "not found locally": "ненамерен локално",
+    "User signing private key:": "Частен ключ за подписване на потребители:",
+    "Session backup key:": "Ключ за резервно копие на сесията:",
+    "Homeserver feature support:": "Поддържани функции от сървъра:",
+    "exists": "съществува",
+    "Secret Storage key format:": "Формат на ключа за секретно складиране:",
+    "outdated": "остарял",
+    "up to date": "обновен",
+    "Your homeserver does not support session management.": "Сървърът ви не поддържа управление на сесии.",
+    "Unable to load session list": "Неуспешно зареждане на списъка със сесии",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Потвърдете изтриването на тези сесии използвайки Single Sign On, за да докажете самоличността си.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Потвърдете изтриването на тази сесия използвайки Single Sign On, за да докажете самоличността си.",
+    "Confirm deleting these sessions": "Потвърдете изтриването на тези сесии",
+    "Click the button below to confirm deleting these sessions.|other": "Кликнете бутона по-долу за да потвърдите изтриването на тези сесии.",
+    "Click the button below to confirm deleting these sessions.|one": "Кликнете бутона по-долу за да потвърдите изтриването на тази сесия.",
+    "Delete sessions|other": "Изтрий сесиите",
+    "Delete sessions|one": "Изтрий сесията",
+    "Delete %(count)s sessions|other": "Изтрий %(count)s сесии",
+    "Delete %(count)s sessions|one": "Изтрий %(count)s сесия",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Потвърждавай индивидуално всяка сесия на потребителите, маркирайки я като доверена и недоверявайки се на кръстосано-подписваните устройства.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Кеширай шифровани съобщения по сигурен начин, за да могат да се появяват в резултати от търсения, използвайки ",
+    " to store messages from ": " за складиране на съобщения от ",
+    "rooms.": "стаи.",
+    "Manage": "Управление",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Кеширай шифровани съобщения локално по сигурен начин за да се появяват в резултати от търсения.",
+    "Enable": "Включи",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Липсват задължителни компоненти в Riot, за да могат да бъдат складирани локално и по сигурен начин шифровани съобщения. Ако искате да експериментирате с тази функция, \"компилирайте\" версия на Riot Desktop с <nativeLink>добавени компоненти за търсене</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot работещ в браузър не може да складира шифровани съобщения локално по сигурен начин. Използвайте <riotLink>Riot Desktop</riotLink> за да може шифровани съобщения да се появяват в резултати от търсения.",
+    "This session is backing up your keys. ": "Тази сесия прави резервни копия на ключовете ви. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Тази сесия <b>не прави резервни копия на ключовете</b>, но имате съществуващо резервно копие, което да възстановите и към което да добавяте от тук нататък.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Свържете тази сесия с резервно копие на ключове преди да се отпишете от нея, за да не загубите ключове, които може би съществуват единствено в тази сесия.",
+    "Connect this session to Key Backup": "Свържи тази сесия с резервно копие на ключовете",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Резервното копие има подпис от <verify>непозната</verify> сесия с идентификатор %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Резервното копие има <validity>валиден</validity> подпис от тази сесия",
+    "Backup has an <validity>invalid</validity> signature from this session": "Резервното копие има <validity>невалиден</validity> подпис от тази сесия"
 }

From feee969edc011bf497960cdca38b477ba39914e8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 30 Apr 2020 02:41:06 +0000
Subject: [PATCH 2628/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2299 of 2299 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 06b0bed44c..9b0f4ccc5f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2406,5 +2406,8 @@
     "Where you’re logged in": "您登入的地方",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。",
     "Review where you’re logged in": "審閱您的登入位置",
-    "Verify your other sessions": "驗證您其他的工作階段"
+    "Verify your other sessions": "驗證您其他的工作階段",
+    "New login. Was this you?": "新登入。這是您嗎？",
+    "Unverified sessions currently have access to your account & messages": "未驗證的工作階段目前正在存取您的帳號與訊息",
+    "Verify the identity of the new login accessing your account & messages": "驗證存取您帳號與訊息的新登入身份"
 }

From 87cd39109f91065c100158935aa7522df306cb1f Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Wed, 29 Apr 2020 18:20:53 +0000
Subject: [PATCH 2629/3235] Translated using Weblate (Czech)

Currently translated at 93.6% (2151 of 2299 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 52c90cc3d7..4de5084106 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2107,7 +2107,7 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Zda používáte Riot na dotykovém zařízení",
     "Whether you're using Riot as an installed Progressive Web App": "Zda používáte Riot jako nainstalovanou Progresivní Webovou Aplikaci",
     "Your user agent": "Identifikace vašeho prohlížeče",
-    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat, posíláme si následující informace:",
+    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat, posíláte nám následující informace:",
     "Verify this session by completing one of the following:": "Ověřte tuto relaci dokončením jednoho z následujících:",
     "Scan this unique code": "Naskenujte tento jedinečný kód",
     "or": "nebo",

From 2a4c6f3da9b9bedcad0d3ecf78fd7465639b358b Mon Sep 17 00:00:00 2001
From: axel simon <github@axelsimon.net>
Date: Wed, 29 Apr 2020 17:33:30 +0000
Subject: [PATCH 2630/3235] Translated using Weblate (French)

Currently translated at 99.9% (2298 of 2299 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 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ac41f6ec2e..ab3acb07b8 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -88,7 +88,7 @@
     "An error has occurred.": "Une erreur est survenue.",
     "Email": "E-mail",
     "Failed to unban": "Échec de la révocation du bannissement",
-    "Failed to verify email address: make sure you clicked the link in the email": "Échec de la vérification de l’adresse e-mail : vérifiez que vous avez bien cliqué sur le lien dans l’e-mail",
+    "Failed to verify email address: make sure you clicked the link in the email": "La vérification de l’adresse e-mail a échoué : vérifiez que vous avez bien cliqué sur le lien dans l’e-mail",
     "Failure to create room": "Échec de la création du salon",
     "Favourites": "Favoris",
     "Fill screen": "Plein écran",
@@ -234,7 +234,7 @@
     "Voice call": "Appel vocal",
     "VoIP conference finished.": "Téléconférence VoIP terminée.",
     "VoIP conference started.": "Téléconférence VoIP démarrée.",
-    "VoIP is unsupported": "VoIP (Appels par Internet) n'est pas supportée",
+    "VoIP is unsupported": "Voix sur IP non gérée",
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
@@ -661,10 +661,10 @@
     "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.",
     "expand": "développer",
     "collapse": "réduire",
-    "Call Failed": "Échec de l'appel",
+    "Call Failed": "L'appel a échoué",
     "Review Devices": "Passer en revue les appareils",
-    "Call Anyway": "Appeler quand même",
-    "Answer Anyway": "Répondre quand même",
+    "Call Anyway": "Appeler malgré tout",
+    "Answer Anyway": "Répondre malgré tout",
     "Call": "Appel",
     "Answer": "Répondre",
     "Send": "Envoyer",
@@ -688,8 +688,8 @@
     "The platform you're on": "La plateforme que vous utilisez",
     "The version of Riot.im": "La version de Riot.im",
     "Your language of choice": "La langue que vous avez choisie",
-    "Which officially provided instance you are using, if any": "Quelle instance officielle vous utilisez, si c'est le cas",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode de texte enrichi de l'éditeur de texte enrichi",
+    "Which officially provided instance you are using, if any": "L'instance officielle que vous utilisez, si vous en utilisez une",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode « texte enrichi » de l'éditeur de texte enrichi",
     "Your homeserver's URL": "L'URL de votre serveur d'accueil",
     "Your identity server's URL": "L'URL de votre serveur d'identité",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
@@ -1553,9 +1553,9 @@
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvert par les contacts existants que vous connaissez, ajoutez-en un ci-dessous.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "La déconnexion de votre serveur d’identité signifie que vous ne serez plus découvrable par d’autres utilisateurs et que vous ne pourrez plus faire d’invitation par e-mail ou téléphone.",
     "Integration Manager": "Gestionnaire d’intégration",
-    "Call failed due to misconfigured server": "Échec de l’appel à cause d’un serveur mal configuré",
+    "Call failed due to misconfigured server": "L’appel a échoué à cause d’un serveur mal configuré",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Demandez à l’administrateur de votre serveur d’accueil (<code>%(homeserverDomain)s</code>) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.",
-    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Sinon, vous pouvez essayer d’utiliser le serveur public à <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et ça partagera votre adresse IP avec ce serveur. Vous pouvez aussi gérer cela dans les paramètres.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Vous pouvez sinon essayer d’utiliser le serveur public <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et votre adresse IP sera partagée avec ce serveur. Vous pouvez aussi gérer ce réglage dans les paramètres.",
     "Try using turn.matrix.org": "Essayer d’utiliser turn.matrix.org",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Autoriser le repli sur le serveur d’assistance d’appel turn.matrix.org quand votre serveur n’en fournit pas (votre adresse IP serait partagée lors d’un appel)",
     "Only continue if you trust the owner of the server.": "Continuez seulement si vous faites confiance au propriétaire du serveur.",

From e33a4a24523577689869c1b8666a0d778516c244 Mon Sep 17 00:00:00 2001
From: Louis <louis@chmn.me>
Date: Wed, 29 Apr 2020 17:36:00 +0000
Subject: [PATCH 2631/3235] Translated using Weblate (French)

Currently translated at 99.9% (2298 of 2299 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ab3acb07b8..2e9e0d971a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -39,7 +39,7 @@
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
     "Blacklisted": "Sur liste noire",
-    "Call Timeout": "Délai d’appel expiré",
+    "Call Timeout": "L’appel a dépassé le délai d'attente maximal",
     "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>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Change Password": "Changer le mot de passe",
     "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",

From fec4429d7d04e626f97e1569fb156cfeafd2c46e Mon Sep 17 00:00:00 2001
From: grrgui <baz.14@zaclys.net>
Date: Wed, 29 Apr 2020 17:37:20 +0000
Subject: [PATCH 2632/3235] Translated using Weblate (French)

Currently translated at 99.9% (2298 of 2299 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 2e9e0d971a..1fc3ab8d88 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -215,7 +215,7 @@
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
     "Unban": "Révoquer le bannissement",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
-    "Unable to capture screen": "Impossible de capturer l'écran",
+    "Unable to capture screen": "Impossible de faire une capture d'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
     "unencrypted": "non chiffré",
     "unknown device": "appareil inconnu",

From 9a2a57fe99d3809893332c6d8b2cf257318d0de4 Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Wed, 29 Apr 2020 18:06:39 +0000
Subject: [PATCH 2633/3235] Translated using Weblate (Slovak)

Currently translated at 62.5% (1438 of 2299 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index f6f0cd3a74..fbecaa4845 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1506,5 +1506,18 @@
     "Something went wrong. Please try again or view your console for hints.": "Niečo sa nepodarilo. Prosím, skúste znovu neskôr alebo si prečítajte ďalšie usmernenia zobrazením konzoly.",
     "Error subscribing to list": "Chyba pri prihlasovaní sa do zoznamu",
     "Please verify the room ID or alias and try again.": "Prosím, overte platnosť ID miestnosti alebo alias a skúste znovu.\nPlease verify the room ID or alias and try again.",
-    "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera"
+    "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera",
+    "Use Single Sign On to continue": "Pokračovať pomocou Jednotného prihlásenia",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Potvrďte pridanie tejto adresy pomocou Jednotného prihlásenia.",
+    "Single Sign On": "Jednotné prihlásenie",
+    "Confirm adding email": "Potvrdiť pridanie emailu",
+    "Click the button below to confirm adding this email address.": "Kliknutím na tlačítko potvrdíte pridanie emailovej adresy.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potvrďte pridanie telefónneho čísla pomocou Jednotného prihlásenia.",
+    "Confirm adding phone number": "Potvrdiť pridanie telefónneho čísla",
+    "Click the button below to confirm adding this phone number.": "Kliknutím na tlačítko potvrdíte pridanie telefónneho čísla.",
+    "The version of Riot": "Verzia Riotu",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Či používate Riot na zariadení, ktorého hlavným vstupným mechanizmom je dotyk (mobil, tablet,...)",
+    "Whether you're using Riot as an installed Progressive Web App": "Či používate Riot ako nainštalovanú Progresívnu Webovú Aplikáciu",
+    "Your user agent": "Identifikátor vášho prehliadača",
+    "The information being sent to us to help make Riot better includes:": "Informácie, ktoré nám posielate, aby sme zlepšili Riot, zahŕňajú:"
 }

From 5ecd874e820fba16f36b61ceaf9c823088a99408 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 09:44:15 +0100
Subject: [PATCH 2634/3235] yarn i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6ab0c886d4..b1ec616d67 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -559,7 +559,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
+    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
     "Later": "Later",
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@@ -568,7 +568,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
+    "Verify the new login accessing your account & messages": "Verify the new login accessing your account & messages",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From aa9da54bed1f92baca01b4fa32f9c513ed4ca627 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 09:44:15 +0100
Subject: [PATCH 2635/3235] yarn i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dc83ca8964..861dc24707 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -556,7 +556,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Unverified sessions currently have access to your account & messages": "Unverified sessions currently have access to your account & messages",
+    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
     "Later": "Later",
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
@@ -565,7 +565,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Verify the identity of the new login accessing your account & messages": "Verify the identity of the new login accessing your account & messages",
+    "Verify the new login accessing your account & messages": "Verify the new login accessing your account & messages",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From e845409167098097fcde34872ad121877b825dba Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 11:00:35 +0100
Subject: [PATCH 2636/3235] Fix device verification toasts not disappearing

recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
---
 src/DeviceListener.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 28f8e8b115..d948911d7c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -223,7 +223,6 @@ export default class DeviceListener {
                         });
                     }
                 }
-                return;
             } else if (await cli.secretStorageKeyNeedsUpgrade()) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: THIS_DEVICE_TOAST_KEY,

From 4f95c89ffcef2a6329cb00675b4e6953567a1769 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 11:00:35 +0100
Subject: [PATCH 2637/3235] Fix device verification toasts not disappearing

recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
---
 src/DeviceListener.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index 28f8e8b115..d948911d7c 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -223,7 +223,6 @@ export default class DeviceListener {
                         });
                     }
                 }
-                return;
             } else if (await cli.secretStorageKeyNeedsUpgrade()) {
                 ToastStore.sharedInstance().addOrReplaceToast({
                     key: THIS_DEVICE_TOAST_KEY,

From 6f844977f527483910c97975c062b000a1d4332b Mon Sep 17 00:00:00 2001
From: Louis <louis@chmn.me>
Date: Thu, 30 Apr 2020 09:36:39 +0000
Subject: [PATCH 2638/3235] Translated using Weblate (French)

Currently translated at 99.9% (2298 of 2299 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 1fc3ab8d88..aa873c386d 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2409,5 +2409,7 @@
     "Review where you’re logged in": "Vérifier où vous vous êtes connecté",
     "Verify your other sessions": "Vérifier vos autres sessions",
     "Unverified sessions currently have access to your account & messages": "Des sessions non vérifiées ont accès à votre compte et messages",
-    "Verify the identity of the new login accessing your account & messages": "Vérifiez l'identité de la nouvelle connexion accédant à votre compte et messages"
+    "Verify the identity of the new login accessing your account & messages": "Vérifiez l'identité de la nouvelle connexion accédant à votre compte et messages",
+    "New login. Was this you?": "Nouvelle connexion. Était-ce vous ?",
+    "Verify all your sessions to ensure your account & messages are safe": "Vérifiez toutes vos sessions pour vous assurer que votre compte et messages sont sécurisés"
 }

From 5a29bf569dedb998227074c45483c80e7dfca176 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 30 Apr 2020 11:21:33 +0100
Subject: [PATCH 2639/3235] Upgrade matrix-js-sdk to 6.0.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6c56dd080b..bb23fb6e80 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "5.3.1-rc.4",
+    "matrix-js-sdk": "6.0.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index c4a792136c..60ab9c225b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.3.1-rc.4:
-  version "5.3.1-rc.4"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.4.tgz#f0e6d512540aa04dfdc311c854fd9efb53287071"
-  integrity sha512-IIuUzP4ee5rw7gtuA2mT7i/jXehl0OrdBMUSAruqixl5DUvBSWjPyFbS4zclVN+DNf75j+7RWMH8Q8BLfdvLeA==
+matrix-js-sdk@6.0.0-rc.1:
+  version "6.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0-rc.1.tgz#afdee9d49fe0a1040d56fc1b5014e628cc15b5a4"
+  integrity sha512-m3xkRFmf6VLXxDVeHPrIWFp9tvc8lGIZSlJ/ObY+mdn4gIGFjV77A+3gcuMynj0yb6DJtkexPlqP2G9wmMyQuQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From b7f2c7b813c3b41dd0f7ea03f0ec2433998a9404 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 30 Apr 2020 11:30:13 +0100
Subject: [PATCH 2640/3235] Prepare changelog for v2.5.0-rc.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541992d4c4..b06db93b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,49 @@
+Changes in [2.5.0-rc.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.5) (2020-04-30)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.4...v2.5.0-rc.5)
+
+ * Upgrade to JS SDK 6.0.0-rc.1
+ * Fix device verification toasts not disappearing
+   [\#4533](https://github.com/matrix-org/matrix-react-sdk/pull/4533)
+ * Allow resetting storage from the access dialog
+   [\#4526](https://github.com/matrix-org/matrix-react-sdk/pull/4526)
+ * Update toast copy again
+   [\#4530](https://github.com/matrix-org/matrix-react-sdk/pull/4530)
+ * Reduce maximum width of toasts & allow multiple lines
+   [\#4528](https://github.com/matrix-org/matrix-react-sdk/pull/4528)
+ * Treat sessions that are there when we log in as old
+   [\#4527](https://github.com/matrix-org/matrix-react-sdk/pull/4527)
+ * Update (bulk) unverified device toast copy
+   [\#4523](https://github.com/matrix-org/matrix-react-sdk/pull/4523)
+ * Make new device toasts appear above review toasts
+   [\#4520](https://github.com/matrix-org/matrix-react-sdk/pull/4520)
+ * Separate toasts for existing & new device verification
+   [\#4517](https://github.com/matrix-org/matrix-react-sdk/pull/4517)
+ * Aggregate device verify toasts
+   [\#4516](https://github.com/matrix-org/matrix-react-sdk/pull/4516)
+ * Fix set up encryption toast to use "set up" as action
+   [\#4515](https://github.com/matrix-org/matrix-react-sdk/pull/4515)
+ * Fix internal link styling in Security Settings
+   [\#4512](https://github.com/matrix-org/matrix-react-sdk/pull/4512)
+ *  Don't enable e2ee when inviting a 3pid
+   [\#4513](https://github.com/matrix-org/matrix-react-sdk/pull/4513)
+ * only clear on continuations where the clear isn't done by SenderProfile
+   [\#4505](https://github.com/matrix-org/matrix-react-sdk/pull/4505)
+ * cap width of editable item list item to leave space for its X button
+   [\#4504](https://github.com/matrix-org/matrix-react-sdk/pull/4504)
+ * Add a link from settings / devices to your user profile
+   [\#4499](https://github.com/matrix-org/matrix-react-sdk/pull/4499)
+ * Make icon change in SetupEncryptionDialog
+   [\#4490](https://github.com/matrix-org/matrix-react-sdk/pull/4490)
+ * Remove invite only padlocks feature flag for release
+   [\#4488](https://github.com/matrix-org/matrix-react-sdk/pull/4488)
+ * Fix incorrect toast if security setup skipped
+   [\#4489](https://github.com/matrix-org/matrix-react-sdk/pull/4489)
+ * Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
+   [\#4483](https://github.com/matrix-org/matrix-react-sdk/pull/4483)
+ * Fix recovery link on login verification flow
+   [\#4480](https://github.com/matrix-org/matrix-react-sdk/pull/4480)
+
 Changes in [2.5.0-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.4) (2020-04-23)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.3...v2.5.0-rc.4)

From 619fbd6adc484d6b3487a0765706be884920696d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 30 Apr 2020 11:30:14 +0100
Subject: [PATCH 2641/3235] v2.5.0-rc.5

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

diff --git a/package.json b/package.json
index bb23fb6e80..d0ab225fa2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.4",
+  "version": "2.5.0-rc.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 126b71dd30668158ab4a6274584ec06322f0cc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 30 Apr 2020 10:51:56 +0000
Subject: [PATCH 2642/3235] Translated using Weblate (Estonian)

Currently translated at 30.1% (692 of 2299 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7fa5208f4b..bfa03e0dec 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -536,7 +536,7 @@
     "Topic (optional)": "Teema (valikuline)",
     "Make this room public": "Tee see jututuba avalikuks",
     "Hide advanced": "Peida lisaseadistused",
-    "Show advanced": "Näita lisaseadistused",
+    "Show advanced": "Näita lisaseadistusi",
     "Server did not require any authentication": "Server ei nõudnud mitte mingisugust autentimist",
     "Recent Conversations": "Hiljutised vestlused",
     "Suggestions": "Soovitused",
@@ -655,5 +655,40 @@
     "Cannot add any more widgets": "Rohkem vidinaid ei õnnestu lisada",
     "The maximum permitted number of widgets have already been added to this room.": "Suurim lubatud vidinate arv on siia jututuppa juba lisatud.",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitu kas <voiceText>häälkõnega</voiceText> või <videoText>videokõnega</videoText>.",
-    "Ongoing conference call%(supportedText)s.": "Toimuv rühmavestlus %(supportedText)s."
+    "Ongoing conference call%(supportedText)s.": "Toimuv rühmavestlus %(supportedText)s.",
+    "Advanced": "Teave arendajatele",
+    "Gets or sets the room topic": "Otsib või määrab jututoa teema",
+    "Sets the room name": "Määrab jututoa nime",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eemaldas jututoa nime.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s muutis jututoa vana nime %(oldRoomName)s uueks nimeks %(newRoomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muutis jututoa nimeks %(roomName)s.",
+    "Show info about bridges in room settings": "Näita jututoa seadistustes teavet võrgusildade kohta",
+    "Upload": "Lae üles",
+    "Save": "Salvesta",
+    "General": "Üldist",
+    "Notifications": "Teavitused",
+    "Security & Privacy": "Turvalisus ja privaatsus",
+    "No Audio Outputs detected": "Ei leidnud ühtegi heliväljundit",
+    "No Microphones detected": "Ei leidnud ühtegi mikrofoni",
+    "No Webcams detected": "Ei leidnud ühtegi veebikaamerat",
+    "Default Device": "Vaikimisi seade",
+    "Audio Output": "Heliväljund",
+    "Microphone": "Mikrofon",
+    "Camera": "Kaamera",
+    "Voice & Video": "Heli ja video",
+    "This room is not accessible by remote Matrix servers": "See jututuba ei ole leitav teiste Matrix'i serverite jaoks",
+    "Upgrade this room to the recommended room version": "Uuenda see jututoa versioon soovitatud versioonini",
+    "View older messages in %(roomName)s.": "Näita vanemat tüüpi sõnumeid jututoas %(roomName)s.",
+    "Room information": "Info jututoa kohta",
+    "Internal room ID:": "Jututoa sisemine tunnus:",
+    "Room version": "Jututoa versioon",
+    "Room version:": "Jututoa versioon:",
+    "Developer options": "Valikud arendajale",
+    "Open Devtools": "Ava arendusvahendid",
+    "Change room name": "Muuda jututoa nimi",
+    "Roles & Permissions": "Rollid ja õigused",
+    "Room Name": "Jututoa nimi",
+    "Room Topic": "Jututoa teema",
+    "Room Settings - %(roomName)s": "Jututoa seadistused - %(roomName)s",
+    "General failure": "Üldine viga"
 }

From d3ce4072d481cf935025fbc4f58ba53edbdcaf44 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Apr 2020 15:41:49 +0100
Subject: [PATCH 2643/3235] Only show key backup reminder when confirmed by
 server to be missing

The key backup reminder was being shown too eagerly in cases when we hadn't
actually checked with the homeserver on key backup status. This changes to only
show the reminder when we're sure a backup doesn't exist.

Fixes https://github.com/vector-im/riot-web/issues/13404
---
 src/components/structures/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 179e0aa2e9..4f9c0a7c91 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1768,7 +1768,7 @@ export default createReactClass({
         const showRoomRecoveryReminder = (
             SettingsStore.getValue("showRoomRecoveryReminder") &&
             this.context.isRoomEncrypted(this.state.room.roomId) &&
-            !this.context.getKeyBackupEnabled()
+            this.context.getKeyBackupEnabled() === false
         );
 
         const hiddenHighlightCount = this._getHiddenHighlightCount();

From 3240b3bd60513e8c6faa517f981f11b07b622a84 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 16:09:38 +0100
Subject: [PATCH 2644/3235] Add device name to unverified session toast

---
 src/components/views/toasts/UnverifiedSessionToast.js | 6 +++++-
 src/i18n/strings/en_EN.json                           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index afabf69178..38cd9f20df 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -49,9 +49,13 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
+        const cli = MatrixClientPeg.get();
+        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify the new login accessing your account & messages")}
+                {_t(
+                    "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()})}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4be143c523..3b432c410d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -568,7 +568,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Verify the new login accessing your account & messages": "Verify the new login accessing your account & messages",
+    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From 6ef5b788065ebe6a8b4b09ffb69275a3eafb50d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 16:09:38 +0100
Subject: [PATCH 2645/3235] Add device name to unverified session toast

---
 src/components/views/toasts/UnverifiedSessionToast.js | 6 +++++-
 src/i18n/strings/en_EN.json                           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
index afabf69178..38cd9f20df 100644
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ b/src/components/views/toasts/UnverifiedSessionToast.js
@@ -49,9 +49,13 @@ export default class UnverifiedSessionToast extends React.PureComponent {
     };
 
     render() {
+        const cli = MatrixClientPeg.get();
+        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
+
         return (<div>
             <div className="mx_Toast_description">
-                {_t("Verify the new login accessing your account & messages")}
+                {_t(
+                    "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()})}
             </div>
             <div className="mx_Toast_buttons" aria-live="off">
                 <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 861dc24707..5544e3a8b1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -565,7 +565,7 @@
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
-    "Verify the new login accessing your account & messages": "Verify the new login accessing your account & messages",
+    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From fb2b37f0fe06044bc88ad9df1ef7914d859ac877 Mon Sep 17 00:00:00 2001
From: SophieKrueger <sophie.krueger@hpi.de>
Date: Thu, 30 Apr 2020 14:59:47 +0000
Subject: [PATCH 2646/3235] Translated using Weblate (German)

Currently translated at 77.8% (1791 of 2302 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e928282fa8..f89958376b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1855,5 +1855,8 @@
     "Enter your recovery passphrase a second time to confirm it.": "Gib deine Wiederherstellungspassphrase zur Bestätigung erneut ein.",
     "Confirm your recovery passphrase": "Bestätige deine Wiederherstellungspassphrase",
     "Confirm recovery passphrase": "Bestätige die Wiederherstellungspassphrase",
-    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen."
+    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen.",
+    "Review where you’re logged in": "Überprüfe, wo du eingeloggt bist",
+    "New login. Was this you?": "Neue Anmeldung. Warst du das?",
+    "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an"
 }

From fced07682ea0d5c632bcfc6126116d3c32b76590 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Thu, 30 Apr 2020 15:04:31 +0000
Subject: [PATCH 2647/3235] Translated using Weblate (German)

Currently translated at 77.8% (1791 of 2302 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f89958376b..25f498b4e9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1858,5 +1858,8 @@
     "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen.",
     "Review where you’re logged in": "Überprüfe, wo du eingeloggt bist",
     "New login. Was this you?": "Neue Anmeldung. Warst du das?",
-    "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an"
+    "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Gibt den per SMS an +%(msisdn)s gesendeten Bestätigungscode ein.",
+    "Someone is using an unknown session": "Jemand verwendet eine unbekannte Sitzung",
+    "This room is end-to-end encrypted": "Dieser Raum ist Ende-zu-Ende verschlüsselt"
 }

From 834be6f796e4052289b3950f9d8c3a2c4793b92c Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Thu, 30 Apr 2020 16:02:42 +0000
Subject: [PATCH 2648/3235] Translated using Weblate (German)

Currently translated at 77.8% (1792 of 2302 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 25f498b4e9..083ca396fc 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1861,5 +1861,6 @@
     "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Gibt den per SMS an +%(msisdn)s gesendeten Bestätigungscode ein.",
     "Someone is using an unknown session": "Jemand verwendet eine unbekannte Sitzung",
-    "This room is end-to-end encrypted": "Dieser Raum ist Ende-zu-Ende verschlüsselt"
+    "This room is end-to-end encrypted": "Dieser Raum ist Ende-zu-Ende verschlüsselt",
+    "You are not subscribed to any lists": "Du hast keine Listen abonniert"
 }

From 124740a63c509a61351be0bb216de69111b653ad Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 22:08:00 +0100
Subject: [PATCH 2649/3235] Wait for user to be verified in e2e setup

Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
---
 src/stores/SetupEncryptionStore.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index cbbbefb129..031c28ddb1 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -17,6 +17,7 @@ limitations under the License.
 import EventEmitter from 'events';
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager';
+import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 export const PHASE_INTRO = 0;
 export const PHASE_BUSY = 1;
@@ -39,6 +40,7 @@ export class SetupEncryptionStore extends EventEmitter {
         this.verificationRequest = null;
         this.backupInfo = null;
         MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
     }
 
     stop() {
@@ -51,6 +53,7 @@ export class SetupEncryptionStore extends EventEmitter {
         }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
         }
     }
 
@@ -102,6 +105,15 @@ export class SetupEncryptionStore extends EventEmitter {
         }
     }
 
+    _onUserTrustStatusChanged = async (userId) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+        if (crossSigningReady) {
+            this.phase = PHASE_DONE;
+            this.emit("update");
+        }
+    }
+
     onVerificationRequest = async (request) => {
         if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
 
@@ -119,6 +131,14 @@ export class SetupEncryptionStore extends EventEmitter {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
             this.emit("update");
+        } else if (this.verificationRequest.phase === VERIF_PHASE_DONE) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+            this.verificationRequest = null;
+            // At this point, the verification has finished, we just need to wait for
+            // cross signing to be ready to use, so wait for the user trust status to
+            // change.
+            this.phase = PHASE_BUSY;
+            this.emit("update");
         }
     }
 

From d241ceea56737c1acac70ddada986eff7fb8bc98 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 22:21:48 +0100
Subject: [PATCH 2650/3235] Clear more state in DeviceListener

Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
---
 src/DeviceListener.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index d948911d7c..d2ba8219db 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -78,6 +78,8 @@ export default class DeviceListener {
         this._dismissedThisDeviceToast = false;
         this._keyBackupInfo = null;
         this._keyBackupFetchedAt = null;
+        this._ourDeviceIdsAtStart = null;
+        this._displayingToastsForDeviceIds = new Set();
     }
 
     /**

From 6ca9630a3a51486340e9cb5504d8da06b2eb88d3 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 1 May 2020 02:10:28 +0000
Subject: [PATCH 2651/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2302 of 2302 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 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9b0f4ccc5f..5ea7e7a413 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -722,7 +722,7 @@
     "Everyone": "每個人",
     "Fetching third party location failed": "抓取第三方位置失敗",
     "A new version of Riot is available.": "Riot 釋出了新版本。",
-    "I understand the risks and wish to continue": "我了解這些風險並願意繼續",
+    "I understand the risks and wish to continue": "我了解風險並希望繼續",
     "Send Account Data": "傳送帳號資料",
     "Advanced notification settings": "進階通知設定",
     "Uploading report": "上傳報告",
@@ -1351,7 +1351,7 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "一旦啟用，聊天室的加密就不能停用了。在已加密的聊天室裡傳送的訊息無法被伺服器看見，僅能被聊天室的參與者看到。啟用加密可能會讓許多機器人與橋接運作不正常。<a>取得更多關於加密的資訊。</a>",
     "Power level": "權力等級",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社群？<a>架設您自己的伺服器</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以獲得最佳體驗。",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以取得最佳體驗。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升級聊天室<i>不會自動將聊天室成員遷移到新版的聊天室<i>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
     "Adds a custom widget by URL to the room": "透過 URL 新增自訂小工具到聊天室",
     "Please supply a https:// or http:// widget URL": "請提供 https:// 或 http:// 小工具 URL",
@@ -2409,5 +2409,12 @@
     "Verify your other sessions": "驗證您其他的工作階段",
     "New login. Was this you?": "新登入。這是您嗎？",
     "Unverified sessions currently have access to your account & messages": "未驗證的工作階段目前正在存取您的帳號與訊息",
-    "Verify the identity of the new login accessing your account & messages": "驗證存取您帳號與訊息的新登入身份"
+    "Verify the identity of the new login accessing your account & messages": "驗證存取您帳號與訊息的新登入身份",
+    "Verify all your sessions to ensure your account & messages are safe": "驗證您所有的工作階段以確保您的帳號與訊息是安全的",
+    "Verify the new login accessing your account: %(name)s": "驗證正在存取您帳號的新登入：%(name)s",
+    "Restoring keys from backup": "從備份還原金鑰",
+    "Fetching keys from server...": "正在從伺服器擷取金鑰……",
+    "%(completed)s of %(total)s keys restored": "%(total)s 中的 %(completed)s 金鑰已復原",
+    "Keys restored": "金鑰已復原",
+    "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰"
 }

From 36cf07c975950ee4a59a7d08f1bf61cb50907ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 1 May 2020 06:45:20 +0000
Subject: [PATCH 2652/3235] Translated using Weblate (French)

Currently translated at 100.0% (2302 of 2302 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index aa873c386d..d3c671a898 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2411,5 +2411,11 @@
     "Unverified sessions currently have access to your account & messages": "Des sessions non vérifiées ont accès à votre compte et messages",
     "Verify the identity of the new login accessing your account & messages": "Vérifiez l'identité de la nouvelle connexion accédant à votre compte et messages",
     "New login. Was this you?": "Nouvelle connexion. Était-ce vous ?",
-    "Verify all your sessions to ensure your account & messages are safe": "Vérifiez toutes vos sessions pour vous assurer que votre compte et messages sont sécurisés"
+    "Verify all your sessions to ensure your account & messages are safe": "Vérifiez toutes vos sessions pour vous assurer que votre compte et messages sont sécurisés",
+    "Verify the new login accessing your account: %(name)s": "Vérifiez la nouvelle connexion accédant à votre compte : %(name)s",
+    "Restoring keys from backup": "Restauration des clés depuis la sauvegarde",
+    "Fetching keys from server...": "Récupération des clés depuis le serveur…",
+    "%(completed)s of %(total)s keys restored": "%(completed)s clés sur %(total)s restaurées",
+    "Keys restored": "Clés restaurées",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès"
 }

From a291f6c2c5b293a164cd2bb2785cee760a0a8903 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 22:08:00 +0100
Subject: [PATCH 2653/3235] Wait for user to be verified in e2e setup

Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
---
 src/stores/SetupEncryptionStore.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index cbbbefb129..031c28ddb1 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -17,6 +17,7 @@ limitations under the License.
 import EventEmitter from 'events';
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager';
+import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 export const PHASE_INTRO = 0;
 export const PHASE_BUSY = 1;
@@ -39,6 +40,7 @@ export class SetupEncryptionStore extends EventEmitter {
         this.verificationRequest = null;
         this.backupInfo = null;
         MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
     }
 
     stop() {
@@ -51,6 +53,7 @@ export class SetupEncryptionStore extends EventEmitter {
         }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
         }
     }
 
@@ -102,6 +105,15 @@ export class SetupEncryptionStore extends EventEmitter {
         }
     }
 
+    _onUserTrustStatusChanged = async (userId) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+        if (crossSigningReady) {
+            this.phase = PHASE_DONE;
+            this.emit("update");
+        }
+    }
+
     onVerificationRequest = async (request) => {
         if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
 
@@ -119,6 +131,14 @@ export class SetupEncryptionStore extends EventEmitter {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
             this.emit("update");
+        } else if (this.verificationRequest.phase === VERIF_PHASE_DONE) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+            this.verificationRequest = null;
+            // At this point, the verification has finished, we just need to wait for
+            // cross signing to be ready to use, so wait for the user trust status to
+            // change.
+            this.phase = PHASE_BUSY;
+            this.emit("update");
         }
     }
 

From 4377e4161f5aa8ed98b9f2ebfbe9192d77797767 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Apr 2020 22:21:48 +0100
Subject: [PATCH 2654/3235] Clear more state in DeviceListener

Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
---
 src/DeviceListener.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index d948911d7c..d2ba8219db 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -78,6 +78,8 @@ export default class DeviceListener {
         this._dismissedThisDeviceToast = false;
         this._keyBackupInfo = null;
         this._keyBackupFetchedAt = null;
+        this._ourDeviceIdsAtStart = null;
+        this._displayingToastsForDeviceIds = new Set();
     }
 
     /**

From bc6aeef8241a5d7e2ace44a7ddaa82230b1b83db Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 1 May 2020 10:58:00 +0100
Subject: [PATCH 2655/3235] Guard against race when waiting for cross-signing
 to be ready

Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
---
 src/stores/SetupEncryptionStore.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 031c28ddb1..ae1f998b02 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -126,7 +126,7 @@ export class SetupEncryptionStore extends EventEmitter {
         this.emit("update");
     }
 
-    onVerificationRequestChange = () => {
+    onVerificationRequestChange = async () => {
         if (this.verificationRequest.cancelled) {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
@@ -136,8 +136,9 @@ export class SetupEncryptionStore extends EventEmitter {
             this.verificationRequest = null;
             // At this point, the verification has finished, we just need to wait for
             // cross signing to be ready to use, so wait for the user trust status to
-            // change.
-            this.phase = PHASE_BUSY;
+            // change (or change to DONE if it's already ready).
+            const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+            this.phase = crossSigningReady ? PHASE_DONE : PHASE_BUSY;
             this.emit("update");
         }
     }

From 8a02e064bd98569cdadfd52b9cca15fbf39e62cb Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 1 May 2020 11:03:48 +0100
Subject: [PATCH 2656/3235] Don't erase password confirm on registration error

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

Problem here was that the form gets re-mounted but there wasn't a facility
to preserve the password confirmation field.  Since the form validates
that the passwords are equal, if we mount with a password supplied we
just copy it over.
---
 src/components/views/auth/RegistrationForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index f1624bc9e5..2a79bb8588 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -76,7 +76,7 @@ export default createReactClass({
             email: this.props.defaultEmail || "",
             phoneNumber: this.props.defaultPhoneNumber || "",
             password: this.props.defaultPassword || "",
-            passwordConfirm: "",
+            passwordConfirm: this.props.defaultPassword || "",
             passwordComplexity: null,
             passwordSafe: false,
         };

From a04564d1e37c2f1b265154ff6c678ef0e25781fc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 1 May 2020 10:58:00 +0100
Subject: [PATCH 2657/3235] Guard against race when waiting for cross-signing
 to be ready

Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
---
 src/stores/SetupEncryptionStore.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 031c28ddb1..ae1f998b02 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -126,7 +126,7 @@ export class SetupEncryptionStore extends EventEmitter {
         this.emit("update");
     }
 
-    onVerificationRequestChange = () => {
+    onVerificationRequestChange = async () => {
         if (this.verificationRequest.cancelled) {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
@@ -136,8 +136,9 @@ export class SetupEncryptionStore extends EventEmitter {
             this.verificationRequest = null;
             // At this point, the verification has finished, we just need to wait for
             // cross signing to be ready to use, so wait for the user trust status to
-            // change.
-            this.phase = PHASE_BUSY;
+            // change (or change to DONE if it's already ready).
+            const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+            this.phase = crossSigningReady ? PHASE_DONE : PHASE_BUSY;
             this.emit("update");
         }
     }

From d4005b6238f85cfa11d570338dcd63018b7673b5 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 1 May 2020 10:34:30 +0000
Subject: [PATCH 2658/3235] Translated using Weblate (Bulgarian)

Currently translated at 86.3% (1987 of 2302 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 7a5edcc381..46a4d811e5 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2043,5 +2043,11 @@
     "Connect this session to Key Backup": "Свържи тази сесия с резервно копие на ключовете",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Резервното копие има подпис от <verify>непозната</verify> сесия с идентификатор %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "Резервното копие има <validity>валиден</validity> подпис от тази сесия",
-    "Backup has an <validity>invalid</validity> signature from this session": "Резервното копие има <validity>невалиден</validity> подпис от тази сесия"
+    "Backup has an <validity>invalid</validity> signature from this session": "Резервното копие има <validity>невалиден</validity> подпис от тази сесия",
+    "Verify all your sessions to ensure your account & messages are safe": "Верифицирайте всички свой сесии за да подсигурите, че профила и съобщенията ви са защитени",
+    "Verify the new login accessing your account: %(name)s": "Верифицирайте новия вход достъпващ профила ви: %(name)s",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>"
 }

From a89d3f986d57fe9327b97858210ab828a9cd8a04 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 1 May 2020 09:45:15 +0000
Subject: [PATCH 2659/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2302 of 2302 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 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index bb2bf3c95b..78abb0e53e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -780,7 +780,7 @@
     "Explore Account Data": "Esplora dati account",
     "All messages (noisy)": "Tutti i messaggi (rumoroso)",
     "Saturday": "Sabato",
-    "I understand the risks and wish to continue": "Sono consapevole dei rischi e vorrei continuare",
+    "I understand the risks and wish to continue": "Capisco i rischi e desidero continuare",
     "Direct Chat": "Chat Diretta",
     "The server may be unavailable or overloaded": "Il server potrebbe essere non disponibile o sovraccarico",
     "Reject": "Rifiuta",
@@ -1321,7 +1321,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Hosting premium per organizzazioni <a>Maggior informazioni</a>",
     "Other": "Altro",
     "Find other public servers or use a custom server": "Trova altri server pubblici o usane uno personale",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ti suggeriamo di installare <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> o <safariLink>Safari</safariLink> per la migliore esperienza.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
     "Couldn't load page": "Caricamento pagina fallito",
     "Want more than a community? <a>Get your own server</a>": "Vuoi più di una comunità? <a>Ottieni il tuo server personale</a>",
     "This homeserver does not support communities": "Questo homeserver non supporta le comunità",
@@ -2404,5 +2404,13 @@
     "Review where you’re logged in": "Controlla dove hai fatto l'accesso",
     "Verify your other sessions": "Verifica le tue altre sessioni",
     "Where you’re logged in": "Dove hai fatto l'accesso",
-    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestisci i nomi e disconnettiti dalle tue sessioni sotto o <a>verificale nel tuo profilo utente</a>."
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestisci i nomi e disconnettiti dalle tue sessioni sotto o <a>verificale nel tuo profilo utente</a>.",
+    "New login. Was this you?": "Nuovo accesso. Eri tu?",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifica tutte le tue sessioni per assicurarti che il tuo account e i messaggi siano protetti",
+    "Verify the new login accessing your account: %(name)s": "Verifica il nuovo accesso entrando nel tuo account: %(name)s",
+    "Restoring keys from backup": "Ripristino delle chiavi dal backup",
+    "Fetching keys from server...": "Ricezione delle chiavi dal server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s di %(total)s chiavi ripristinate",
+    "Keys restored": "Chiavi ripristinate",
+    "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente"
 }

From b5cb912cfd98f9d3ba6bf261acf2f87007425b6d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 1 May 2020 16:24:59 +0100
Subject: [PATCH 2660/3235] Upgrade matrix-js-sdk to 6.0.0-rc.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d0ab225fa2..4ed79c0c86 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "6.0.0-rc.1",
+    "matrix-js-sdk": "6.0.0-rc.2",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 60ab9c225b..ae0a218e0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@6.0.0-rc.1:
-  version "6.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0-rc.1.tgz#afdee9d49fe0a1040d56fc1b5014e628cc15b5a4"
-  integrity sha512-m3xkRFmf6VLXxDVeHPrIWFp9tvc8lGIZSlJ/ObY+mdn4gIGFjV77A+3gcuMynj0yb6DJtkexPlqP2G9wmMyQuQ==
+matrix-js-sdk@6.0.0-rc.2:
+  version "6.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0-rc.2.tgz#56eb438458cb59cf18bbd6126d72029dc728659f"
+  integrity sha512-osW5GIOAcCpY/wCxct9RMxRZhodkVBdEDVZuQm2nstKDLGafl5oxAit2LAz9g0ymv+16LBp8XbThM2GWa2lj2Q==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 340dd4415d2c67ad71d9c37e8488730c170fb0a8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 1 May 2020 16:30:10 +0100
Subject: [PATCH 2661/3235] Prepare changelog for v2.5.0-rc.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06db93b43..df4a934a07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Changes in [2.5.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.6) (2020-05-01)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.5...v2.5.0-rc.6)
+
+ * Upgrade to JS SDK 6.0.0-rc.2
+ * Wait for user to be verified in e2e setup
+   [\#4538](https://github.com/matrix-org/matrix-react-sdk/pull/4538)
+ * Add device name to unverified session toast
+   [\#4536](https://github.com/matrix-org/matrix-react-sdk/pull/4536)
+
 Changes in [2.5.0-rc.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.5) (2020-04-30)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.4...v2.5.0-rc.5)

From ccb6d91988afe4bb4cf28a3b607e473fe043e734 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 1 May 2020 16:30:10 +0100
Subject: [PATCH 2662/3235] v2.5.0-rc.6

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

diff --git a/package.json b/package.json
index 4ed79c0c86..19fa03b3d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.5",
+  "version": "2.5.0-rc.6",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 0b4a3d36cd1d20d8cb86eaadc28879ff438c6160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 1 May 2020 21:04:13 +0000
Subject: [PATCH 2663/3235] Translated using Weblate (Estonian)

Currently translated at 30.6% (704 of 2302 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index bfa03e0dec..764854fb53 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -690,5 +690,17 @@
     "Room Name": "Jututoa nimi",
     "Room Topic": "Jututoa teema",
     "Room Settings - %(roomName)s": "Jututoa seadistused - %(roomName)s",
-    "General failure": "Üldine viga"
+    "General failure": "Üldine viga",
+    "Where you’re logged in": "Kus sa oled võrku loginud",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Halda alljärgnevas oma sessioonide nimesid, logi neist välja või <a>verifitseeri neid oma kasutajaprofiilis</a>.",
+    "A session's public name is visible to people you communicate with": "Sessiooni avalik nimi on nähtav neile, kellega sa suhtled",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Võimaldamaks meil rakendust parandada kogub Riot anonüümset analüütikat.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privaatsus on meile oluline ning seega me ei kogu ei isiklikke ega isikustatavaid andmeid.",
+    "Learn more about how we use analytics.": "Loe lisaks kuidas me kasutama analüütikat.",
+    "No media permissions": "Meediaõigused puuduvad",
+    "You may need to manually permit Riot to access your microphone/webcam": "Sa võib-olla pead andma Riot'ile loa mikrofoni ja veebikaamera kasutamiseks",
+    "Missing media permissions, click the button below to request.": "Meediaga seotud õigused puuduvad. Nende nõutamiseks klõpsi järgnevat nuppu.",
+    "Request media permissions": "Nõuta meediaõigusi",
+    "Frequently Used": "Enamkasutatud",
+    "Smileys & People": "Vigurnäod ja inimesed"
 }

From f6185c29f1addbf2de0029c9ea2abe31c18ef38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 1 May 2020 21:47:30 +0000
Subject: [PATCH 2664/3235] Translated using Weblate (Estonian)

Currently translated at 31.3% (721 of 2302 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 764854fb53..334a20f104 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -702,5 +702,22 @@
     "Missing media permissions, click the button below to request.": "Meediaga seotud õigused puuduvad. Nende nõutamiseks klõpsi järgnevat nuppu.",
     "Request media permissions": "Nõuta meediaõigusi",
     "Frequently Used": "Enamkasutatud",
-    "Smileys & People": "Vigurnäod ja inimesed"
+    "Smileys & People": "Vigurnäod ja inimesed",
+    "Animals & Nature": "Loomad ja loodus",
+    "Food & Drink": "Toit ja jook",
+    "Activities": "Tegevused",
+    "Travel & Places": "Reisimine ja kohad",
+    "Objects": "Esemed",
+    "Symbols": "Sümbolid",
+    "Flags": "Lipud",
+    "Quick Reactions": "Reageeri lennult",
+    "Unknown Address": "Teadmata aadress",
+    "Any of the following data may be shared:": "Järgnevaid andmeid võib jagada:",
+    "Your display name": "Sinu kuvatav nimi",
+    "Your avatar URL": "Sinu avatari aadress",
+    "Your user ID": "Sinu kasutajatunnus",
+    "Your theme": "Sinu teema",
+    "Riot URL": "Riot'i aadress",
+    "Room ID": "Jututoa tunnus",
+    "Widget ID": "Vidina tunnus"
 }

From 01131a403657e0025b8506d3a3e14b819d01bd51 Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 2 May 2020 12:55:56 +0200
Subject: [PATCH 2665/3235] removed unnecessary divs

---
 src/components/views/elements/DNDTagTile.js | 4 +---
 src/components/views/elements/TagTile.js    | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 5a96f01d9f..2a6664d271 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -43,7 +43,6 @@ export default function DNDTagTile(props) {
                 type="draggable-TagTile"
             >
                 { (provided, snapshot) => (
-                    <div>
                         <div
                             ref={provided.innerRef}
                             {...provided.draggableProps}
@@ -55,9 +54,8 @@ export default function DNDTagTile(props) {
                                menuDisplayed={menuDisplayed}
                                openMenu={openMenu}
                             />
-                        </div>
                         { provided.placeholder }
-                    </div>
+                        </div>
                 ) }
             </Draggable>
                     {contextMenu}
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 023d9cca93..848dc797a2 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -159,8 +159,7 @@ export default createReactClass({
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
 
-        return <div>
-            <AccessibleTooltipButton
+        return <AccessibleTooltipButton
                 className={className}
                 onClick={this.onClick}
                 onContextMenu={this.openMenu}
@@ -181,7 +180,6 @@ export default createReactClass({
                     { contextButton }
                     { badgeElement }
                 </div>
-            </AccessibleTooltipButton>
-        </div>;
+            </AccessibleTooltipButton>;
     },
 });

From fc5a5c411f41c004fae10241f3dc4d4c013e307a Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 2 May 2020 13:09:04 +0200
Subject: [PATCH 2666/3235] provided.placeholder has no effect

---
 src/components/views/elements/DNDTagTile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 2a6664d271..b017704e70 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -54,7 +54,6 @@ export default function DNDTagTile(props) {
                                menuDisplayed={menuDisplayed}
                                openMenu={openMenu}
                             />
-                        { provided.placeholder }
                         </div>
                 ) }
             </Draggable>

From a84a3c4780bece5778d9e4fabcb5856ec284928b Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 2 May 2020 13:12:31 +0200
Subject: [PATCH 2667/3235] hide badge when context menu is open

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 848dc797a2..0f98971198 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -143,7 +143,7 @@ export default createReactClass({
 
         const badge = TagOrderStore.getGroupBadge(this.props.tag);
         let badgeElement;
-        if (badge && !this.state.hover) {
+        if (badge && !this.state.hover && !this.props.menuDisplayed) {
             const badgeClasses = classNames({
                 "mx_TagTile_badge": true,
                 "mx_TagTile_badgeHighlight": badge.highlight,

From baa9cd8078ef277f84714beda7a4afd4336a1a3c Mon Sep 17 00:00:00 2001
From: Agusti Bau <agustibau@gmail.com>
Date: Sat, 2 May 2020 13:25:18 +0200
Subject: [PATCH 2668/3235] formatted files

---
 src/components/views/elements/DNDTagTile.js | 50 ++++++++++-----------
 src/components/views/elements/TagTile.js    | 50 ++++++++++-----------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index b017704e70..67572d4508 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -19,7 +19,7 @@ import TagTile from './TagTile';
 
 import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
-import {ContextMenu, toRightOf, useContextMenu} from "../../structures/ContextMenu";
+import { ContextMenu, toRightOf, useContextMenu } from "../../structures/ContextMenu";
 import * as sdk from '../../../index';
 
 export default function DNDTagTile(props) {
@@ -35,28 +35,28 @@ export default function DNDTagTile(props) {
             </ContextMenu>
         );
     }
-        return <div>
-            <Draggable
-                key={props.tag}
-                draggableId={props.tag}
-                index={props.index}
-                type="draggable-TagTile"
-            >
-                { (provided, snapshot) => (
-                        <div
-                            ref={provided.innerRef}
-                            {...provided.draggableProps}
-                            {...provided.dragHandleProps}
-                        >
-                           <TagTile
-                            {...props}
-                               contextMenuButtonRef= {handle}
-                               menuDisplayed={menuDisplayed}
-                               openMenu={openMenu}
-                            />
-                        </div>
-                ) }
-            </Draggable>
-                    {contextMenu}
-        </div>;
+    return <div>
+        <Draggable
+            key={props.tag}
+            draggableId={props.tag}
+            index={props.index}
+            type="draggable-TagTile"
+        >
+            {(provided, snapshot) => (
+                <div
+                    ref={provided.innerRef}
+                    {...provided.draggableProps}
+                    {...provided.dragHandleProps}
+                >
+                    <TagTile
+                        {...props}
+                        contextMenuButtonRef={handle}
+                        menuDisplayed={menuDisplayed}
+                        openMenu={openMenu}
+                    />
+                </div>
+            )}
+        </Draggable>
+        {contextMenu}
+    </div>;
 }
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 0f98971198..d8983ac2ea 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -84,7 +84,7 @@ export default createReactClass({
             this.props.tag,
         ).then((profile) => {
             if (this.unmounted) return;
-            this.setState({profile});
+            this.setState({ profile });
         }).catch((err) => {
             console.warn('Could not fetch group profile for ' + this.props.tag, err);
         });
@@ -111,18 +111,18 @@ export default createReactClass({
     },
 
     onMouseOver: function() {
-        this.setState({hover: true});
+        this.setState({ hover: true });
     },
 
     onMouseOut: function() {
-        this.setState({hover: false});
+        this.setState({ hover: false });
     },
 
     openMenu: function(e) {
         // Prevent the TagTile onClick event firing as well
         e.stopPropagation();
         e.preventDefault();
-        this.setState({hover: false});
+        this.setState({ hover: false });
         this.props.openMenu();
     },
 
@@ -154,32 +154,32 @@ export default createReactClass({
         // FIXME: this ought to use AccessibleButton for a11y but that causes onMouseOut/onMouseOver to fire too much
         const contextButton = this.state.hover || this.props.menuDisplayed ?
             <div className="mx_TagTile_context_button" onClick={this.openMenu} ref={this.props.contextMenuButtonRef}>
-                { "\u00B7\u00B7\u00B7" }
+                {"\u00B7\u00B7\u00B7"}
             </div> : <div ref={this.props.contextMenuButtonRef} />;
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
 
         return <AccessibleTooltipButton
-                className={className}
-                onClick={this.onClick}
-                onContextMenu={this.openMenu}
-                title={name}
+            className={className}
+            onClick={this.onClick}
+            onContextMenu={this.openMenu}
+            title={name}
+        >
+            <div
+                className="mx_TagTile_avatar"
+                onMouseOver={this.onMouseOver}
+                onMouseOut={this.onMouseOut}
             >
-                <div
-                    className="mx_TagTile_avatar"
-                    onMouseOver={this.onMouseOver}
-                    onMouseOut={this.onMouseOut}
-                >
-                    <BaseAvatar
-                        name={name}
-                        idName={this.props.tag}
-                        url={httpUrl}
-                        width={avatarHeight}
-                        height={avatarHeight}
-                    />
-                    { contextButton }
-                    { badgeElement }
-                </div>
-            </AccessibleTooltipButton>;
+                <BaseAvatar
+                    name={name}
+                    idName={this.props.tag}
+                    url={httpUrl}
+                    width={avatarHeight}
+                    height={avatarHeight}
+                />
+                {contextButton}
+                {badgeElement}
+            </div>
+        </AccessibleTooltipButton>;
     },
 });

From 0b99e2522234604bbf1a7b3efecde23bde758f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sat, 2 May 2020 05:07:00 +0000
Subject: [PATCH 2669/3235] Translated using Weblate (Estonian)

Currently translated at 33.9% (781 of 2302 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 334a20f104..b6fb63b73d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -719,5 +719,65 @@
     "Your theme": "Sinu teema",
     "Riot URL": "Riot'i aadress",
     "Room ID": "Jututoa tunnus",
-    "Widget ID": "Vidina tunnus"
+    "Widget ID": "Vidina tunnus",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s muutis oma kuvatava nime %(displayName)s-ks.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s määras oma kuvatava nime %(displayName)s-ks.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eemaldas oma kuvatava nime (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s eemaldas om profiilipildi.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s muutis oma profiilipilti.",
+    "%(senderName)s set a profile picture.": "%(senderName)s määras oma profiilipildi.",
+    "Light theme": "Hele teema",
+    "Dark theme": "Tume teema",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Your browser does not support the required cryptography extensions": "Sinu brauser ei toeta vajalikke krüptoteeke",
+    "Not a valid Riot keyfile": "See ei ole sobilik võtmefail Riot'i jaoks",
+    "Authentication check failed: incorrect password?": "Autentimine ebaõnnestus: kas salasõna pole õige?",
+    "Unrecognised address": "Tundmatu aadress",
+    "You do not have permission to invite people to this room.": "Sul pole õigusi siia jututuppa osalejate kutsumiseks.",
+    "User %(userId)s is already in the room": "Kasutaja %(userId)s on juba jututoas",
+    "User %(user_id)s does not exist": "Kasutajat %(user_id)s pole olemas",
+    "User %(user_id)s may or may not exist": "Kasutaja %(user_id)s võib olla olemas, aga võib ka mitte olla olemas",
+    "The user's homeserver does not support the version of the room.": "Kasutaja koduserver ei toeta selle jututoa versiooni.",
+    "Unknown server error": "Tundmatu serveriviga",
+    "This is a top-10 common password": "See on kümne levinuima salasõna seas",
+    "This is a top-100 common password": "See on saja levinuima salasõna seas",
+    "This is a very common password": "See on väga levinud salasõna",
+    "This is similar to a commonly used password": "See on sarnane tavaliselt kasutatavatele salasõnadele",
+    "Support adding custom themes": "Toeta kohandatud teemade lisamist",
+    "Show display name changes": "Näita kuvatava nime muutusi",
+    "Match system theme": "Kasuta süsteemset teemat",
+    "Messages containing my display name": "Sõnumid, mis sisaldavad minu kuvatavat nime",
+    "Failed to upload profile picture!": "Profiilipildi üleslaadimine ebaõnnestus!",
+    "No display name": "Kuvatav nimi puudub",
+    "New passwords don't match": "Uued salasõnad ei klapi",
+    "Passwords can't be empty": "Salasõna ei saa olla tühi",
+    "Current password": "Praegune salasõna",
+    "Password": "Salasõna",
+    "New Password": "Uus salasõna",
+    "Confirm password": "Korda uut salasõna",
+    "Change Password": "Muuda salasõna",
+    "Failed to set display name": "Kuvatava nime määramine ebaõnnestus",
+    "Display Name": "Kuvatav nimi",
+    "Profile picture": "Profiilipilt",
+    "Failed to change password. Is your password correct?": "Salasõna muutmine ebaõnnestus. Kas sinu salasõna on ikka õige?",
+    "Invalid theme schema.": "Vigane teemafail.",
+    "Theme added!": "Teema sai lisatud!",
+    "Profile": "Profiil",
+    "Email addresses": "E-posti aadressid",
+    "Phone numbers": "Telefoninumbrid",
+    "Set a new account password...": "Määra kontole uus salasõna...",
+    "Account": "Kasutajakonto",
+    "Language and region": "Keel ja piirkond",
+    "Custom theme URL": "Kohandatud teema URL",
+    "Add theme": "Lisa teema",
+    "Theme": "Teema",
+    "Start verification again from their profile.": "Alusta verifitseerimist uuesti nende profiilist.",
+    "To return to your account in future you need to <u>set a password</u>": "Selleks et hiljemgi oma kontot kasutada, sa pead <u>määrama salasõna</u>",
+    "Set Password": "Määra salasõna",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Allpool loetletud Matrix'i kasutajatunnustele ei leidunud profiile. Kas sa ikkagi tahaksid neile kutse saata?",
+    "To continue, please enter your password:": "Jätkamiseks palun sisesta oma salasõna:",
+    "Your password": "Sinu salasõna",
+    "We recommend you change your password and recovery key in Settings immediately": "Me soovitame et vaheta koheselt Seadistuste lehelt oma salasõna ja taastevõti",
+    "Could not load user profile": "Kasutajaprofiili laadimine ei õnnestunud",
+    "Set a display name:": "Määra kuvatav nimi:"
 }

From c00b0702698d46a251cc1870ad2c6fce88aa5302 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 3 May 2020 13:28:16 +0100
Subject: [PATCH 2670/3235] Fix reply RR spacing getting doubled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 99377ee5be..752cf982f6 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -126,7 +126,7 @@ limitations under the License.
 .mx_RoomView_timeline_rr_enabled,
 // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
 .mx_EventListSummary {
-    .mx_EventTile_line, .mx_EventTile_reply {
+    .mx_EventTile_line {
         /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
         margin-right: 110px;
     }

From 677475ed060763568fe7c15ec6f4555a38ef3a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sun, 3 May 2020 21:47:23 +0000
Subject: [PATCH 2671/3235] Translated using Weblate (Estonian)

Currently translated at 34.8% (800 of 2302 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b6fb63b73d..cacefc44ee 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -779,5 +779,24 @@
     "Your password": "Sinu salasõna",
     "We recommend you change your password and recovery key in Settings immediately": "Me soovitame et vaheta koheselt Seadistuste lehelt oma salasõna ja taastevõti",
     "Could not load user profile": "Kasutajaprofiili laadimine ei õnnestunud",
-    "Set a display name:": "Määra kuvatav nimi:"
+    "Set a display name:": "Määra kuvatav nimi:",
+    "Send typing notifications": "Anna märku teisele osapoolele, kui mina sõnumit kirjutan",
+    "Show typing notifications": "Anna märku, kui teine osapool sõnumit kirjutab",
+    "Automatically replace plain text Emoji": "Automaatelt asenda vormindamata tekst emotikoniga",
+    "Mirror local video feed": "Peegelda kohalikku videovoogu",
+    "Enable Community Filter Panel": "Kasuta kogukondade filtreerimispaneeli",
+    "Allow Peer-to-Peer for 1:1 calls": "Luba võrdõigusvõrgu loogikat kasutavad omavahelised kõned",
+    "Send analytics data": "Saada arendajatele analüütikat",
+    "Enable inline URL previews by default": "Luba URL'ide vaikimisi eelvaated",
+    "Enable URL previews for this room (only affects you)": "Luba URL'ide eelvaated selle jututoa jaoks (mõjutab vaid sind)",
+    "Enable URL previews by default for participants in this room": "Luba URL'ide vaikimisi eelvaated selles jututoas osalejate jaoks",
+    "Room Colour": "Jututoa värv",
+    "Enable widget screenshots on supported widgets": "Kui vidin seda toetab, siis luba tal teha ekraanitõmmiseid",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Hoiata enne kutse saatmist võimalikule vigasele Matrix'i kasutajatunnusele",
+    "Show developer tools": "Näita arendaja tööriistu",
+    "Show hidden events in timeline": "Näita ajajoonel peidetud sündmusi",
+    "Low bandwidth mode": "Vähese ribalaiusega režiim",
+    "Composer": "Sõnumite kirjutamine",
+    "Jump to start/end of the composer": "Hüppa sõnumite kirjutamise algusesse või lõppu",
+    "Navigate composer history": "Vaata sõnumite kirjutamise ajalugu"
 }

From dd6a938d5376e88b9e91a52d8a909313a490f912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sun, 3 May 2020 22:49:51 +0000
Subject: [PATCH 2672/3235] Translated using Weblate (Estonian)

Currently translated at 35.3% (812 of 2302 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index cacefc44ee..d640121c0b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -794,9 +794,21 @@
     "Enable widget screenshots on supported widgets": "Kui vidin seda toetab, siis luba tal teha ekraanitõmmiseid",
     "Prompt before sending invites to potentially invalid matrix IDs": "Hoiata enne kutse saatmist võimalikule vigasele Matrix'i kasutajatunnusele",
     "Show developer tools": "Näita arendaja tööriistu",
-    "Show hidden events in timeline": "Näita ajajoonel peidetud sündmusi",
+    "Show hidden events in timeline": "Näita peidetud sündmusi ajajoonel",
     "Low bandwidth mode": "Vähese ribalaiusega režiim",
     "Composer": "Sõnumite kirjutamine",
     "Jump to start/end of the composer": "Hüppa sõnumite kirjutamise algusesse või lõppu",
-    "Navigate composer history": "Vaata sõnumite kirjutamise ajalugu"
+    "Navigate composer history": "Vaata sõnumite kirjutamise ajalugu",
+    "Show previews/thumbnails for images": "Näita piltide eelvaateid või väikepilte",
+    "Collecting logs": "Kogun logisid",
+    "Waiting for response from server": "Ootan serverilt vastust",
+    "Messages containing my username": "Sõnumid, mis sisaldavad minu kasutajatunnust",
+    "Messages containing @room": "Sõnumid, mis sisaldavad sõna @room",
+    "Messages in one-to-one chats": "Kahepoolsete vestluste sõnumid",
+    "Encrypted messages in one-to-one chats": "Kahepoolsete vestluste krüptitud sõnumid",
+    "Messages in group chats": "Rühmavestluste sõnumid",
+    "Encrypted messages in group chats": "Rühmavestluste krüptitud sõnumid",
+    "When I'm invited to a room": "Kui mind kutsutakse jututuppa",
+    "Call invitation": "Kõnekutse",
+    "Messages sent by bot": "Robotite saadetud sõnumid"
 }

From b9ce10af19d1335fd97ecf1e7032ecaa43c200f2 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 1 May 2020 10:38:14 +0000
Subject: [PATCH 2673/3235] Translated using Weblate (Bulgarian)

Currently translated at 91.9% (2115 of 2302 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 | 130 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 46a4d811e5..87e5d928ac 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2049,5 +2049,133 @@
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>валиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>потвърдена</verify> сесия <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>"
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Резервното копие има <validity>невалиден</validity> подпис от <verify>непотвърдена</verify> сесия <device></device>",
+    "Backup is not signed by any of your sessions": "Резервното копие не е подписано от нито една ваша сесия",
+    "This backup is trusted because it has been restored on this session": "Това резервно копие е доверено, защото е било възстановено в текущата сесия",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервно копие на ключа е съхранено в секретно складиране, но тази функция не е включена в сегашната сесия. Включете кръстосано-подписване в Labs за да модифицирате състоянието на резервното копие на ключа.",
+    "Your keys are <b>not being backed up from this session</b>.": "На ключовете ви <b>не се прави резервно копие от тази сесия</b>.",
+    "Enable desktop notifications for this session": "Включи уведомления на работния плот за тази сесия",
+    "Enable audible notifications for this session": "Включи звукови уведомления за тази сесия",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Паролата ви беше променена. Няма да получавате push уведомления на другите ви сесии докато не влезете отново в тях",
+    "Invalid theme schema.": "Невалиден формат на темата.",
+    "Error downloading theme information.": "Неуспешно изтегляне на информацията за темата.",
+    "Theme added!": "Темата беше добавена!",
+    "Custom theme URL": "Собствен URL адрес на тема",
+    "Add theme": "Добави тема",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "За да съобщените за проблем със сигурността свързан с Matrix, прочетете <a>Политиката за споделяне на проблеми със сигурността</a> на Matrix.org.",
+    "Keyboard Shortcuts": "Клавишни комбинации",
+    "Session ID:": "Сесиен идентификатор:",
+    "Session key:": "Сесиен ключ:",
+    "Message search": "Търсене на съобщения",
+    "Where you’re logged in": "Когато сте вписани",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Управлявайте имената или входа в сесиите си по-долу или <a>ги верифицирайте от профила си</a>.",
+    "A session's public name is visible to people you communicate with": "Публичното име на сесията е видимо за хората, с които комуникирате",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Тази стая препредава съобщения със следните платформи. <a>Научи повече.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Тази стая не препредава съобщения с други платформи. <a>Научи повече.</a>",
+    "Bridges": "Мостове",
+    "This user has not verified all of their sessions.": "Този потребител не е верифицирал всичките си сесии.",
+    "You have not verified this user.": "Не сте верифицирали този потребител.",
+    "You have verified this user. This user has verified all of their sessions.": "Верифицирали сте този потребител. Този потребител е верифицирал всичките си сесии.",
+    "Someone is using an unknown session": "Някой използва непозната сесия",
+    "This room is end-to-end encrypted": "Тази стая е шифрована от-край-до-край",
+    "Everyone in this room is verified": "Всички в тази стая са верифицирани",
+    "Some sessions for this user are not trusted": "Някои сесии на този потребител не са доверени",
+    "All sessions for this user are trusted": "Всички сесии на този потребител са доверени",
+    "Some sessions in this encrypted room are not trusted": "Някои сесии в тази шифрована стая не са доверени",
+    "All sessions in this encrypted room are trusted": "Всички сесии в тази шифрована стая са доверени",
+    "Mod": "Модератор",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Заявката ви за споделяне на ключ е изпратена - проверете останалите си сесии за заявки за споделяне на ключове.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Заявките за споделяне на ключове се изпращат до другите ви сесии автоматично. Ако сте отказали заявката от другите ви сесии, кликнете тук за да изпратите заявка за тази сесия отново.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Ако другите ви сесии нямат ключа за това съобщения, няма да можете да ги дешифровате.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Поискай отново ключове за шифроване</requestLink> от другите сесии.",
+    "Encrypted by an unverified session": "Шифровано от неверифицирана сесия",
+    "Encrypted by a deleted session": "Шифровано от изтрита сесия",
+    "Invite only": "Само с покани",
+    "Scroll to most recent messages": "Отиди до най-скорошните съобщения",
+    "No sessions with registered encryption keys": "Няма сесии с регистрирани ключове за шифроване",
+    "Sessions": "Сесии",
+    "Send a reply…": "Изпрати отговор…",
+    "Send a message…": "Изпрати съобщение…",
+    "Reject & Ignore user": "Откажи и игнорирай потребителя",
+    "Unknown Command": "Непозната команда",
+    "Unrecognised command: %(commandText)s": "Неразпозната команда: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Може да използвате <code>/help</code> за да видите наличните команди. Или пък искахте да изпратите това като съобщение?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Съвет: Започнете съобщението си с <code>//</code> за да изпратите съобщение започващо с наклонена черта.",
+    "Send as message": "Изпрати като съобщение",
+    "Mark all as read": "Маркирай всичко като прочетено",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Възникна грешка при обновяване на алтернативните адреси на стаята. Или не е позволено от сървъра или се е случила временна грешка.",
+    "You don't have permission to delete the alias.": "Нямате привилегия да изтриете този алтернативен адрес.",
+    "Local address": "Локален адрес",
+    "Published Addresses": "Публикувани адреси",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Публикуваните адреси могат да бъдат използвани от всеки човек, на кой да е сървър, за присъединяване към стаята. За да публикувате адрес, първо трябва да е настроен като локален адрес.",
+    "Other published addresses:": "Други публикувани адреси:",
+    "No other published addresses yet, add one below": "Все още няма други публикувани адреси, добавете такъв по-долу",
+    "New published address (e.g. #alias:server)": "Нов публикуван адрес (напр. #alias:server)",
+    "Local Addresses": "Локални адреси",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Настройте адреси за тази стая, така че потребителите да могат да намерят стаята през вашия сървър (%(localDomain)s)",
+    "Waiting for you to accept on your other session…": "Изчаква се да приемете от другата ви сесия…",
+    "Waiting for %(displayName)s to accept…": "Изчаква се %(displayName)s да приеме…",
+    "Accepting…": "Приемане…",
+    "Start Verification": "Започни верификация",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "В шифровани стаи,  съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
+    "Verify User": "Потвърди потребителя",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "За допълнителна сигурност, потвърдете този потребител като проверите еднократен код на устройствата ви.",
+    "Your messages are not secure": "Съобщенията ви не са защитени",
+    "One of the following may be compromised:": "Едно от следните неща може да е било компрометирано:",
+    "Your homeserver": "Сървърът ви",
+    "The homeserver the user you’re verifying is connected to": "Сървърът на потребителя, който верифицирате",
+    "Yours, or the other users’ internet connection": "Интернет връзката ви или тази на другите потребители",
+    "Yours, or the other users’ session": "Сесията ви или тази на другите потребители",
+    "%(count)s sessions|other": "%(count)s сесии",
+    "%(count)s sessions|one": "%(count)s сесия",
+    "Hide sessions": "Скрий сесиите",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Сесията, която се опитвате да верифицирате не поддържа сканиране на QR код или емоджи верификация (нещата които Riot поддържа). Пробвайте с друг клиент.",
+    "Verify by scanning": "Верифицирай чрез сканиране",
+    "Ask %(displayName)s to scan your code:": "Попитайте %(displayName)s да сканира вашия код:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ако не можете да сканирате кода по-горе, верифицирайте сравнявайки уникални емоджита.",
+    "Verify by comparing unique emoji.": "Верифицирай чрез сравняване на уникални емоджита.",
+    "Verify by emoji": "Верифицирай чрез емоджи",
+    "Almost there! Is your other session showing the same shield?": "Почти е готово! Другата ви сесия показва ли същия щит?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Почти е готово! Сесията %(displayName)s показва ли същия щит?",
+    "Verify all users in a room to ensure it's secure.": "Верифицирай всички потребители в стаята за да подсигурите безопасността.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "В шифровани стаи, верифицирайте всички потребители за да подсигурите безопасността.",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Успешно верифицирахте %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Успешно верифицирахте %(displayName)s!",
+    "Verified": "Потвърдено",
+    "Got it": "Разбрах",
+    "Start verification again from the notification.": "Започнете верифициране отново от уведомлението.",
+    "Start verification again from their profile.": "Започнете верифициране отново от профила им.",
+    "Verification timed out.": "Изтече времето за верификация.",
+    "You cancelled verification on your other session.": "Отказахте верификацията от другата сесия.",
+    "%(displayName)s cancelled verification.": "%(displayName)s отказа верификацията.",
+    "You cancelled verification.": "Отказахте верификацията.",
+    "Verification cancelled": "Верификацията беше отказана",
+    "Compare emoji": "Сравни емоджи",
+    "Encryption enabled": "Шифроването е включено",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Съобщенията в тази стая са ширфовани от-край-до-край. Научете повече и верифицирайте този потребител от профила им.",
+    "Encryption not enabled": "Шифроването не е включено",
+    "The encryption used by this room isn't supported.": "Шифроването използвано от тази стая не се поддържа.",
+    "You declined": "Отказахте",
+    "%(name)s declined": "%(name)s отказа",
+    "Accepting …": "Приемане…",
+    "Declining …": "Отказване…",
+    "Can't load this message": "Съобщението не може да се зареди",
+    "Submit logs": "Изпрати логове",
+    "Enter a server name": "Въведете име на сървър",
+    "Looks good": "Изглежда добре",
+    "Can't find this server or its room list": "Сървърът или списъка със стаи не може да бъде намерен",
+    "All rooms": "Всички стаи",
+    "Your server": "Вашият сървър",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Сигурни ли сте, че искате да премахнете <b>%(serverName)s</b>",
+    "Remove server": "Премахни сървъра",
+    "Matrix": "Matrix",
+    "Add a new server": "Добави нов сървър",
+    "Enter the name of a new server you want to explore.": "Въведете името на новия сървър, който искате да прегледате.",
+    "Server name": "Име на сървър",
+    "Add a new server...": "Добави нов сървър...",
+    "%(networkName)s rooms": "%(networkName)s стаи",
+    "Matrix rooms": "Matrix стаи",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Напомняне: браузърът ви не се поддържа, така че не всичко може да работи правилно.",
+    "Destroy cross-signing keys?": "Унищожаване на ключовете за кръстосано-подписване?"
 }

From 8a794fafc6520a6b3ce00ca489e06514b0b47f45 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 3 May 2020 15:16:05 +0000
Subject: [PATCH 2674/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2302 of 2302 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 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b1db06fa4b..8bf5e28f7f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1351,7 +1351,7 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Ha egyszer engedélyezve lett, a szoba titkosítását nem lehet kikapcsolni. A titkosított szobákban küldött üzenetek a szerver számára nem, csak a szoba tagjai számára láthatók. A titkosítás bekapcsolása megakadályoz sok botot és hidat a megfelelő működésben. <a>Tudj meg többet a titkosításról.</a>",
     "Power level": "Hozzáférési szint",
     "Want more than a community? <a>Get your own server</a>": "Többet szeretnél, mint egy közösség? <a>Szerezz saját szervert</a>",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Kérlek telepíts <chromeLink>Chrome</chromeLink>ot, <firefoxLink>Firefox</firefoxLink>ot vagy <safariLink>Safari</safariLink>t a jegjobb élményhez.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Figyelmeztetés</b>: A szoba frissítése <i>nem fogja automatikusan átvinni a szoba résztvevőit az új verziójú szobába.</i> A régi szobába bekerül egy link az új szobához - a tagoknak rá kell kattintani a linkre az új szobába való belépéshez.",
     "Adds a custom widget by URL to the room": "Egyedi kisalkalmazás hozzáadása a szobához URL-lel",
     "Please supply a https:// or http:// widget URL": "Kérlek add meg a https:// vagy http:// kisalkalmazás URL-t",
@@ -2395,5 +2395,16 @@
     "This requires the latest Riot on your other devices:": "A Riot legújabb kliensére van ehhez szükséged a többi eszközödön:",
     "or another cross-signing capable Matrix client": "vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre",
     "Use Recovery Passphrase or Key": "Használd a Visszaállítási Jelmondatot vagy Kulcsot",
-    "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni"
+    "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni",
+    "Review where you’re logged in": "Tekintsd át hol vagy bejelentkezve",
+    "New login. Was this you?": "Új bejelentkezés. Te voltál?",
+    "Verify all your sessions to ensure your account & messages are safe": "Ellenőrizd minden munkamenetedet, hogy a fiókod és az üzeneteid biztonságban legyenek",
+    "Verify the new login accessing your account: %(name)s": "Ellenőrizd ezt az új bejelentkezést ami hozzáfér a fiókodhoz: %(name)s",
+    "Where you’re logged in": "Ahol be vagy jelentkezve",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Állítsd be a munkameneteid neveit, jelentkezz ki vagy <a>ellenőrizd őket a Felhasználói Beállításokban</a>.",
+    "Restoring keys from backup": "Kulcsok visszaállítása mentésből",
+    "Fetching keys from server...": "Kulcsok lekérdezése a szerverről…",
+    "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s kulcs visszaállítva",
+    "Keys restored": "Kulcsok visszaállítva",
+    "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva"
 }

From d9639c5412f869b8a1e4c362d6d844297fe5dc2c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 4 May 2020 13:40:52 +0200
Subject: [PATCH 2675/3235] increare rage shake size limit to 5mb

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

diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index a9d17e77c9..59ed5fa8b7 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -41,7 +41,7 @@ limitations under the License.
 const FLUSH_RATE_MS = 30 * 1000;
 
 // the length of log data we keep in indexeddb (and include in the reports)
-const MAX_LOG_SIZE = 1024 * 1024 * 1; // 1 MB
+const MAX_LOG_SIZE = 1024 * 1024 * 5; // 5 MB
 
 // A class which monkey-patches the global console and stores log lines.
 class ConsoleLogger {

From aa87e84652e9f2377a24eeaea7b9f5c75a35b98a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 4 May 2020 13:40:52 +0200
Subject: [PATCH 2676/3235] increare rage shake size limit to 5mb

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

diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index a9d17e77c9..59ed5fa8b7 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -41,7 +41,7 @@ limitations under the License.
 const FLUSH_RATE_MS = 30 * 1000;
 
 // the length of log data we keep in indexeddb (and include in the reports)
-const MAX_LOG_SIZE = 1024 * 1024 * 1; // 1 MB
+const MAX_LOG_SIZE = 1024 * 1024 * 5; // 5 MB
 
 // A class which monkey-patches the global console and stores log lines.
 class ConsoleLogger {

From eaf8cf9170fb67cc00b86f3965cd6c5e490c23ec Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 4 May 2020 12:57:37 +0000
Subject: [PATCH 2677/3235] Translated using Weblate (German)

Currently translated at 78.2% (1801 of 2302 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 083ca396fc..e69aadcb39 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1862,5 +1862,14 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Gibt den per SMS an +%(msisdn)s gesendeten Bestätigungscode ein.",
     "Someone is using an unknown session": "Jemand verwendet eine unbekannte Sitzung",
     "This room is end-to-end encrypted": "Dieser Raum ist Ende-zu-Ende verschlüsselt",
-    "You are not subscribed to any lists": "Du hast keine Listen abonniert"
+    "You are not subscribed to any lists": "Du hast keine Listen abonniert",
+    "Error adding ignored user/server": "Fehler beim Hinzufügen eines ignorierten Nutzers/Servers",
+    "None": "Keine",
+    "Ban list rules - %(roomName)s": "Verbotslistenregeln - %(roomName)s",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer!nnen und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit Riot mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot: *</code> alle Benutzer!nnen ignorieren, die auf einem Server den Namen 'bot' haben.",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer!nnen/Server ausgeblendet.",
+    "Personal ban list": "Persönliche Sperrliste",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Deine persönliche Sperrliste enthält alle Benutzer!nnen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
+    "Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID",
+    "eg: @bot:* or example.org": "z.B.  @bot:* oder example.org"
 }

From 7dfc01eed114f2084b6e15e8297dd19633fa2b39 Mon Sep 17 00:00:00 2001
From: Max Klenk <max@klenk.biz>
Date: Mon, 4 May 2020 13:01:56 +0000
Subject: [PATCH 2678/3235] Translated using Weblate (German)

Currently translated at 78.4% (1805 of 2302 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e69aadcb39..b1e91c2cec 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1871,5 +1871,5 @@
     "Personal ban list": "Persönliche Sperrliste",
     "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Deine persönliche Sperrliste enthält alle Benutzer!nnen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
     "Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID",
-    "eg: @bot:* or example.org": "z.B.  @bot:* oder example.org"
+    "eg: @bot:* or example.org": "z.B. @bot:* oder example.org"
 }

From 3327b9e298dd4d1e94048e49a2a0fe7f56367efb Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 4 May 2020 13:02:03 +0000
Subject: [PATCH 2679/3235] Translated using Weblate (German)

Currently translated at 78.4% (1805 of 2302 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b1e91c2cec..3ff8feaccb 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1871,5 +1871,9 @@
     "Personal ban list": "Persönliche Sperrliste",
     "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Deine persönliche Sperrliste enthält alle Benutzer!nnen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
     "Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID",
-    "eg: @bot:* or example.org": "z.B. @bot:* oder example.org"
+    "eg: @bot:* or example.org": "z.B. @bot:* oder example.org",
+    "Subscribed lists": "Abonnierte Listen",
+    "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer!nnen zu ignorieren.",
+    "Room ID or alias of ban list": "Raum-ID oder Alias ​​der Sperrliste"
 }

From ae1fe0d625089241e2f24924de23ae0bc23ed6a6 Mon Sep 17 00:00:00 2001
From: Max Klenk <max@klenk.biz>
Date: Mon, 4 May 2020 13:03:24 +0000
Subject: [PATCH 2680/3235] Translated using Weblate (German)

Currently translated at 78.5% (1808 of 2302 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3ff8feaccb..97e2bbfae7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1875,5 +1875,5 @@
     "Subscribed lists": "Abonnierte Listen",
     "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
     "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer!nnen zu ignorieren.",
-    "Room ID or alias of ban list": "Raum-ID oder Alias ​​der Sperrliste"
+    "Room ID or alias of ban list": "Raum-ID oder -Alias der Sperrliste"
 }

From bcf0a5268e4fb50f235108b208ef4fbd0aa1408a Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 4 May 2020 13:03:29 +0000
Subject: [PATCH 2681/3235] Translated using Weblate (German)

Currently translated at 78.5% (1808 of 2302 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 97e2bbfae7..237c56fba7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1875,5 +1875,8 @@
     "Subscribed lists": "Abonnierte Listen",
     "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
     "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer!nnen zu ignorieren.",
-    "Room ID or alias of ban list": "Raum-ID oder -Alias der Sperrliste"
+    "Room ID or alias of ban list": "Raum-ID oder -Alias der Sperrliste",
+    "Subscribe": "Abonnieren",
+    "Always show the window menu bar": "Fenstermenüleiste immer anzeigen",
+    "Show tray icon and minimize window to it on close": "Tray-Symbol anzeigen und Fenster beim Schließen minimieren"
 }

From a11812a4029472127c4380a03b526eb7d8d689e2 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 4 May 2020 15:07:41 +0100
Subject: [PATCH 2682/3235] Fix slider toggle regression.

---
 res/css/views/elements/_ToggleSwitch.scss | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 7c65fbc90d..62669889ee 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -24,11 +24,6 @@ limitations under the License.
 
     background-color: $togglesw-off-color;
     opacity: 0.5;
-
-    display: flex;
-    flex-direction: row;
-    flex: 0 0 auto;
-    align-items: center;
 }
 
 .mx_ToggleSwitch_enabled {
@@ -38,16 +33,18 @@ limitations under the License.
 
 .mx_ToggleSwitch.mx_ToggleSwitch_on {
     background-color: $togglesw-on-color;
+
+    > .mx_ToggleSwitch_ball {
+        left: calc(100% - $font-20px);
+    }
 }
 
 .mx_ToggleSwitch_ball {
-    transition: left 0.15s ease-out 0.1s;
+    position: relative;
     width: $font-20px;
     height: $font-20px;
     border-radius: $font-20px;
     background-color: $togglesw-ball-color;
-}
-
-.mx_ToggleSwitch_on {
-    flex-direction: row-reverse;
+    transition: left 0.15s ease-out 0.1s;
+    left: 0;
 }

From 7ef3b446f4fcb587ef071f6de8ad8aba14ad3d05 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:58:24 +0100
Subject: [PATCH 2683/3235] Show progress when loading keys

---
 .../keybackup/RestoreKeyBackupDialog.js       | 25 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  3 +++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index dc82a71713..92d23f9e65 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -59,6 +59,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             forceRecoveryKey: false,
             passPhrase: '',
             restoreType: null,
+            progress: { stage: "prefetch" },
         };
     }
 
@@ -80,6 +81,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         });
     }
 
+    _progressCallback = (data) => {
+        this.setState({
+            progress: data,
+        });
+    }
+
     _onResetRecoveryClick = () => {
         this.props.onFinished(false);
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
@@ -110,6 +117,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             // is the right one and restoring it is currently the only way we can do this.
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithPassword(
                 this.state.passPhrase, undefined, undefined, this.state.backupInfo,
+                { progressCallback: this._progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = await MatrixClientPeg.get().keyBackupKeyFromPassword(
@@ -146,6 +154,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         try {
             const recoverInfo = await MatrixClientPeg.get().restoreKeyBackupWithRecoveryKey(
                 this.state.recoveryKey, undefined, undefined, this.state.backupInfo,
+                { progressCallback: this._progressCallback },
             );
             if (this.props.keyCallback) {
                 const key = MatrixClientPeg.get().keyBackupKeyFromRecoveryKey(this.state.recoveryKey);
@@ -185,6 +194,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             const recoverInfo = await accessSecretStorage(async () => {
                 return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
                     this.state.backupInfo,
+                    { progressCallback: this._progressCallback },
                 );
             });
             this.setState({
@@ -207,6 +217,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 undefined, /* targetRoomId */
                 undefined, /* targetSessionId */
                 backupInfo,
+                { progressCallback: this._progressCallback },
             );
             this.setState({
                 recoverInfo,
@@ -273,7 +284,19 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         let title;
         if (this.state.loading) {
             title = _t("Loading...");
-            content = <Spinner />;
+            let details;
+            if (this.state.progress.stage === "fetch") {
+                details = _t("Downloading from server...");
+            } else if (this.state.progress.stage === "load_keys") {
+                const { total, successes, failures } = this.state.progress;
+                details = _t("Loaded %(completed)s of %(total)s", { total, completed: successes + failures });
+            } else if (this.state.progress.stage === "prefetch") {
+                details = _t("Requesting from server...");
+            }
+            content = <div>
+                <div>{details}</div>
+                <Spinner />
+            </div>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5544e3a8b1..992ace1e92 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1794,6 +1794,9 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
+    "Downloading from server": "Downloading from server",
+    "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
+    "Requesting from server...": "Requesting from server...",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",

From b7bcf25cfab8539c172f36b6ee331eaa06488426 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 28 Apr 2020 11:36:28 +0100
Subject: [PATCH 2684/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 992ace1e92..3fd9951cfe 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1794,7 +1794,7 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Downloading from server": "Downloading from server",
+    "Downloading from server...": "Downloading from server...",
     "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
     "Requesting from server...": "Requesting from server...",
     "Unable to load backup status": "Unable to load backup status",

From 3dbcc9fe9957289eb7f0d78ff75545885078f9a2 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:14:39 +0100
Subject: [PATCH 2685/3235] copy changes

---
 .../dialogs/keybackup/RestoreKeyBackupDialog.js      | 12 ++++++------
 src/i18n/strings/en_EN.json                          | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 92d23f9e65..da67fb9777 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -283,15 +283,15 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         let content;
         let title;
         if (this.state.loading) {
-            title = _t("Loading...");
+            title = _t("Restoring keys from backup");
             let details;
             if (this.state.progress.stage === "fetch") {
-                details = _t("Downloading from server...");
+                details = _t("Fetching keys from server...");
             } else if (this.state.progress.stage === "load_keys") {
                 const { total, successes, failures } = this.state.progress;
-                details = _t("Loaded %(completed)s of %(total)s", { total, completed: successes + failures });
+                details = _t("%(completed)s of %(total)s keys restored", { total, completed: successes + failures });
             } else if (this.state.progress.stage === "prefetch") {
-                details = _t("Requesting from server...");
+                details = _t("Fetching keys from server...");
             }
             content = <div>
                 <div>{details}</div>
@@ -328,7 +328,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             content = _t("No backup found!");
         } else if (this.state.recoverInfo) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            title = _t("Backup restored");
+            title = _t("Keys restored");
             let failedToDecrypt;
             if (this.state.recoverInfo.total > this.state.recoverInfo.imported) {
                 failedToDecrypt = <p>{_t(
@@ -337,7 +337,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 )}</p>;
             }
             content = <div>
-                <p>{_t("Restored %(sessionCount)s session keys", {sessionCount: this.state.recoverInfo.imported})}</p>
+                <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
                     onPrimaryButtonClick={this._onDone}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3fd9951cfe..6a501221f8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1794,9 +1794,9 @@
     "Not a valid recovery key": "Not a valid recovery key",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "If you've forgotten your recovery key you can <button>set up new recovery options</button>.",
-    "Downloading from server...": "Downloading from server...",
-    "Loaded %(completed)s of %(total)s": "Loaded %(completed)s of %(total)s",
-    "Requesting from server...": "Requesting from server...",
+    "Restoring keys from backup": "Restoring keys from backup",
+    "Fetching keys from server...": "Fetching keys from server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
     "Unable to load backup status": "Unable to load backup status",
     "Recovery key mismatch": "Recovery key mismatch",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
@@ -1804,9 +1804,9 @@
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
-    "Backup restored": "Backup restored",
+    "Keys restored": "Keys restored",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
-    "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
+    "Successfully restored %(sessionCount)s keys": "Successfully restored %(sessionCount)s keys",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "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>",

From 1afb09d2574dfced61baa3aeafe7881329b712ea Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:29:36 +0100
Subject: [PATCH 2686/3235] Fixed the dialog height

---
 .../keybackup/_RestoreKeyBackupDialog.scss    |  6 +++++
 .../keybackup/RestoreKeyBackupDialog.js       | 26 +++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
index 9cba8e0da9..d74224c94d 100644
--- a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
@@ -32,3 +32,9 @@ limitations under the License.
     padding: 10px;
 }
 
+.mx_RestoreKeyBackupDialog_content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-height: 110px; /* Empirically measured */
+}
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index da67fb9777..9829f7af8e 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -293,10 +293,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             } else if (this.state.progress.stage === "prefetch") {
                 details = _t("Fetching keys from server...");
             }
-            content = <div>
+            content = <>
                 <div>{details}</div>
                 <Spinner />
-            </div>;
+            </>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
@@ -304,20 +304,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
                     title = _t("Recovery key mismatch");
-                    content = <div>
+                    content = <>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
-                    </div>;
+                    </>;
                 } else {
                     title = _t("Incorrect recovery passphrase");
-                    content = <div>
+                    content = <>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
-                    </div>;
+                    </>;
                 }
             } else {
                 title = _t("Error");
@@ -336,7 +336,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
                 )}</p>;
             }
-            content = <div>
+            content = <>
                 <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
@@ -344,12 +344,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     hasCancel={false}
                     focus={true}
                 />
-            </div>;
+            </>;
         } 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>
+            content = <>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
                     "from a trusted computer.", {},
@@ -394,7 +394,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </div>;
+            </>;
         } else {
             title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -413,7 +413,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 </div>;
             }
 
-            content = <div>
+            content = <>
                 <p>{_t(
                     "<b>Warning</b>: You should only set up key backup " +
                     "from a trusted computer.", {},
@@ -450,7 +450,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </div>;
+            </>;
         }
 
         return (
@@ -458,7 +458,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 onFinished={this.props.onFinished}
                 title={title}
             >
-            <div>
+            <div className='mx_RestoreKeyBackupDialog_content'>
                 {content}
             </div>
             </BaseDialog>

From 64c70b2de09ca3cb3c7124f44a1c94f812243418 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:10:23 +0100
Subject: [PATCH 2687/3235] fragments and i18n don't play nice together

---
 .../keybackup/_RestoreKeyBackupDialog.scss    |  2 +-
 .../keybackup/RestoreKeyBackupDialog.js       | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
index d74224c94d..5689d84bc5 100644
--- a/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
@@ -32,7 +32,7 @@ limitations under the License.
     padding: 10px;
 }
 
-.mx_RestoreKeyBackupDialog_content {
+.mx_RestoreKeyBackupDialog_content > div {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 9829f7af8e..f1008dfcb0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -293,10 +293,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             } else if (this.state.progress.stage === "prefetch") {
                 details = _t("Fetching keys from server...");
             }
-            content = <>
+            content = <div>
                 <div>{details}</div>
                 <Spinner />
-            </>;
+            </div>;
         } else if (this.state.loadError) {
             title = _t("Error");
             content = _t("Unable to load backup status");
@@ -304,20 +304,20 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
                     title = _t("Recovery key mismatch");
-                    content = <>
+                    content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery key: " +
                             "please verify that you entered the correct recovery key.",
                         )}</p>
-                    </>;
+                    </div>;
                 } else {
                     title = _t("Incorrect recovery passphrase");
-                    content = <>
+                    content = <div>
                         <p>{_t(
                             "Backup could not be decrypted with this recovery passphrase: " +
                             "please verify that you entered the correct recovery passphrase.",
                         )}</p>
-                    </>;
+                    </div>;
                 }
             } else {
                 title = _t("Error");
@@ -336,7 +336,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     {failedCount: this.state.recoverInfo.total - this.state.recoverInfo.imported},
                 )}</p>;
             }
-            content = <>
+            content = <div>
                 <p>{_t("Successfully restored %(sessionCount)s keys", {sessionCount: this.state.recoverInfo.imported})}</p>
                 {failedToDecrypt}
                 <DialogButtons primaryButton={_t('OK')}
@@ -344,12 +344,12 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     hasCancel={false}
                     focus={true}
                 />
-            </>;
+            </div>;
         } 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 = <>
+            content = <div>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
                     "from a trusted computer.", {},
@@ -394,7 +394,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </>;
+            </div>;
         } else {
             title = _t("Enter recovery key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
@@ -413,7 +413,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 </div>;
             }
 
-            content = <>
+            content = <div>
                 <p>{_t(
                     "<b>Warning</b>: You should only set up key backup " +
                     "from a trusted computer.", {},
@@ -450,7 +450,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                         {s}
                     </AccessibleButton>,
                 })}
-            </>;
+            </div>;
         }
 
         return (

From 83bd96a091a3d6d3a6f90160bc03f0655f6d3685 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 4 May 2020 17:15:09 +0100
Subject: [PATCH 2688/3235] Css rounds weirdly sometimes. Heigher precision
 fixes it.

---
 res/css/_font-sizes.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index 5cd19ce620..76a9b16425 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -34,7 +34,7 @@ $font-16px: 1.067rem;
 $font-17px: 1.133rem;
 $font-18px: 1.200rem;
 $font-19px: 1.267rem;
-$font-20px: 1.333rem;
+$font-20px: 1.3333333rem;
 $font-21px: 1.400rem;
 $font-22px: 1.467rem;
 $font-23px: 1.533rem;

From 9a14417a037933204a6676fa858524bf9f93cb22 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 4 May 2020 15:41:26 -0600
Subject: [PATCH 2689/3235] Don't try to reload profile information when
 closing the user panel

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

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
---
 src/components/structures/RightPanel.js                      | 2 +-
 src/components/structures/UserView.js                        | 5 ++++-
 .../views/settings/tabs/user/SecurityUserSettingsTab.js      | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 3fec5aa25f..34652098b3 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -227,7 +227,7 @@ export default class RightPanel extends React.Component {
                         if (this.props.user) {
                             // If we have a user prop then we're displaying a user from the 'user' page type
                             // in LoggedInView, so need to change the page type to close the panel (we switch
-                            // to the home page which is not obviosuly the correct thing to do, but I'm not sure
+                            // to the home page which is not obviously the correct thing to do, but I'm not sure
                             // anything else is - we could hide the close button altogether?)
                             dis.dispatch({
                                 action: "view_home_page",
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index c4fba137cc..493cc136d1 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -42,7 +42,10 @@ export default class UserView extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
-        if (prevProps.userId !== this.props.userId) {
+        // XXX: We shouldn't need to null check the userId here, but we declare
+        // it as optional and MatrixChat sometimes fires in a way which results
+        // in an NPE when we try to update the profile info.
+        if (prevProps.userId !== this.props.userId && this.props.userId) {
             this._loadProfileInfo();
         }
     }
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a4336a81f3..5dd6475e6e 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -112,7 +112,10 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onGoToUserProfileClick = () => {
-        window.location.href = "#/user/" + MatrixClientPeg.get().getUserId();
+        dis.dispatch({
+            action: 'view_user_info',
+            userId: MatrixClientPeg.get().getUserId(),
+        });
         this.props.closeSettingsFn();
     }
 

From f2df698e3bfa856acecddc1fade398763795dc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 5 May 2020 10:10:21 +0200
Subject: [PATCH 2690/3235] EventIndex: Reduce the logging the event index is
 producing.

---
 src/indexing/EventIndex.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a6bbbb5f96..eed9837a7a 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -102,9 +102,6 @@ export default class EventIndex extends EventEmitter {
             const timeline = room.getLiveTimeline();
             const token = timeline.getPaginationToken("b");
 
-            console.log("EventIndex: Got token for indexer",
-                        room.roomId, token);
-
             const backCheckpoint = {
                 roomId: room.roomId,
                 token: token,
@@ -161,7 +158,6 @@ export default class EventIndex extends EventEmitter {
         if (prevState === "SYNCING" && state === "SYNCING") {
             // A sync was done, presumably we queued up some live events,
             // commit them now.
-            console.log("EventIndex: Committing events");
             await indexManager.commitLiveEvents();
             return;
         }
@@ -336,8 +332,6 @@ export default class EventIndex extends EventEmitter {
     async crawlerFunc() {
         let cancelled = false;
 
-        console.log("EventIndex: Started crawler function");
-
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
@@ -366,8 +360,6 @@ export default class EventIndex extends EventEmitter {
 
             await sleep(sleepTime);
 
-            console.log("EventIndex: Running the crawler loop.");
-
             if (cancelled) {
                 break;
             }
@@ -386,8 +378,6 @@ export default class EventIndex extends EventEmitter {
 
             idle = false;
 
-            console.log("EventIndex: crawling using checkpoint", checkpoint);
-
             // We have a checkpoint, let us fetch some messages, again, very
             // conservatively to not bother our homeserver too much.
             const eventMapper = client.getEventMapper({preventReEmit: true});
@@ -511,15 +501,6 @@ export default class EventIndex extends EventEmitter {
                 direction: checkpoint.direction,
             };
 
-            console.log(
-                "EventIndex: Crawled room",
-                client.getRoom(checkpoint.roomId).name,
-                "and fetched total", matrixEvents.length, "events of which",
-                events.length, "are being added,", redactionEvents.length,
-                "are redacted,", matrixEvents.length - events.length,
-                "are being skipped, undecryptable", undecryptableEvents.length,
-            );
-
             try {
                 for (let i = 0; i < redactionEvents.length; i++) {
                     const ev = redactionEvents[i];
@@ -552,8 +533,6 @@ export default class EventIndex extends EventEmitter {
         }
 
         this._crawler = null;
-
-        console.log("EventIndex: Stopping crawler function");
     }
 
     /**

From c9ac726629c44d20c2ce02b4846f57d3be563c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 5 May 2020 10:21:18 +0200
Subject: [PATCH 2691/3235] EventIndex: Remove an unused variable.

---
 src/indexing/EventIndex.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index eed9837a7a..02151f8474 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -467,9 +467,6 @@ export default class EventIndex extends EventEmitter {
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
             const filteredEvents = matrixEvents.filter(this.isValidEvent);
-            const undecryptableEvents = matrixEvents.filter((ev) => {
-                return ev.isDecryptionFailure();
-            });
 
             // Collect the redaction events so we can delete the redacted events
             // from the index.

From b04bb423f8dc3b1fb84ac2a7d058c3eed4656d3a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 5 May 2020 10:23:39 +0200
Subject: [PATCH 2692/3235] differentiate copy for own untrusted device dialog

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3b432c410d..b5b87054dc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -310,9 +310,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "Light theme": "Light theme",
     "Dark theme": "Dark theme",
-    "Not Trusted": "Not Trusted",
+    "You signed in to a new session without verifying it:": "You signed in to a new session without verifying it:",
+    "Verify your other session using one of the options below.": "Verify your other session using one of the options below.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Not Trusted": "Not Trusted",
     "Manually Verify by Text": "Manually Verify by Text",
     "Interactively verify by Emoji": "Interactively verify by Emoji",
     "Done": "Done",
diff --git a/src/verification.js b/src/verification.js
index d7287552dd..f488b2ebeb 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -43,14 +43,26 @@ function UntrustedDeviceDialog(props) {
     const {device, user, onFinished} = props;
     const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
     const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    let askToVerifyText;
+    let newSessionText;
+
+    if (MatrixClientPeg.get().getUserId() === user.userId) {
+        newSessionText = _t("You signed in to a new session without verifying it:");
+        askToVerifyText = _t("Verify your other session using one of the options below.");
+    } else {
+        newSessionText = _t("%(name)s (%(userId)s) signed in to a new session without verifying it:",
+            {name: user.displayName, userId: user.userId});
+        askToVerifyText = _t("Ask this user to verify their session, or manually verify it below.");
+    }
+
     return <BaseDialog
         onFinished={onFinished}
         headerImage={require("../res/img/e2e/warning.svg")}
         title={_t("Not Trusted")}>
         <div className="mx_Dialog_content" id='mx_Dialog_content'>
-            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+            <p>{newSessionText}</p>
             <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+            <p>{askToVerifyText}</p>
         </div>
         <div className='mx_Dialog_buttons'>
             <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>

From 9b291e51a782687976fb97318691ba44f63fb2c1 Mon Sep 17 00:00:00 2001
From: Max Klenk <max@klenk.biz>
Date: Mon, 4 May 2020 13:05:58 +0000
Subject: [PATCH 2693/3235] Translated using Weblate (German)

Currently translated at 79.1% (1820 of 2302 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 237c56fba7..74247bbf6b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -783,7 +783,7 @@
     "Explore Account Data": "Konto-Daten erkunden",
     "All messages (noisy)": "Alle Nachrichten (laut)",
     "Saturday": "Samstag",
-    "I understand the risks and wish to continue": "Ich verstehe das Risiko und möchte fortfahren",
+    "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
     "Direct Chat": "Direkt-Chat",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
     "Reject": "Ablehnen",
@@ -1348,7 +1348,7 @@
     "Share Permalink": "Teile permanenten Link",
     "Sign in to your Matrix account on %(serverName)s": "Melde dich mit deinem Matrixkonto auf %(serverName)s an",
     "Create your Matrix account on %(serverName)s": "Erstelle ein Matrixkonto auf %(serverName)s",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für die beste Erfahrung.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": " Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
     "Want more than a community? <a>Get your own server</a>": "Du möchtest mehr als eine Community? <a>Hol dir deinen eigenen Server</a>",
     "Could not load user profile": "Konnte Nutzerprofil nicht laden",
     "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
@@ -1878,5 +1878,5 @@
     "Room ID or alias of ban list": "Raum-ID oder -Alias der Sperrliste",
     "Subscribe": "Abonnieren",
     "Always show the window menu bar": "Fenstermenüleiste immer anzeigen",
-    "Show tray icon and minimize window to it on close": "Tray-Symbol anzeigen und Fenster beim Schließen minimieren"
+    "Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren"
 }

From 74fdbcd02f31bb1ba1feec6160475cee82df4957 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 4 May 2020 13:07:02 +0000
Subject: [PATCH 2694/3235] Translated using Weblate (German)

Currently translated at 79.1% (1820 of 2302 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 74247bbf6b..bea4ab51c8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1751,7 +1751,7 @@
     "Read Marker lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung (ms)",
     "Read Marker off-screen lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung außerhalb des Bildschirms (ms)",
     "Session key:": "Sitzungsschlüssel:",
-    "A session's public name is visible to people you communicate with": "Der Sitzungsname ist sichtbar für die Personen mit denen du kommunizierst",
+    "A session's public name is visible to people you communicate with": "Der öffentliche Sitzungsname ist sichtbar für Personen, mit denen du kommunizierst",
     "Sounds": "Töne",
     "Upgrade the room": "Raum hochstufen",
     "Enable room encryption": "Verschlüsselung aktivieren",
@@ -1878,5 +1878,12 @@
     "Room ID or alias of ban list": "Raum-ID oder -Alias der Sperrliste",
     "Subscribe": "Abonnieren",
     "Always show the window menu bar": "Fenstermenüleiste immer anzeigen",
-    "Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren"
+    "Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren",
+    "Session ID:": "Sitzungs-ID:",
+    "Message search": "Nachrichtensuche",
+    "Cross-signing": "Cross-Signing",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dieser Raum verbindet Nachrichten mit den folgenden Plattformen. <a>Mehr erfahren.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dieser Raum verbindet keine Nachrichten mit Plattformen. <a>Mehr erfahren.</a>",
+    "Bridges": "Bridges",
+    "Uploaded sound": "Hochgeladener Ton"
 }

From 07a4503e350789b1ee8c6d18aa49a0766718bbf1 Mon Sep 17 00:00:00 2001
From: Luca Corbatto <luca-git@corbatto.de>
Date: Mon, 4 May 2020 13:08:15 +0000
Subject: [PATCH 2695/3235] Translated using Weblate (German)

Currently translated at 79.1% (1820 of 2302 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index bea4ab51c8..c63cce305a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1235,7 +1235,7 @@
     "Confirm your passphrase": "Bestätige deine Passphrase",
     "Secure your backup with a passphrase": "Sichere dein Backup mit einer Passphrase",
     "Your keys are being backed up (the first backup could take a few minutes).": "Deine Schlüssel werden gesichert (Das erste Backup könnte ein paar Minuten in Anspruch nehmen).",
-    "Voice & Video": "Sprache & Video",
+    "Voice & Video": "Sprach- & Videoanruf",
     "Never lose encrypted messages": "Verliere niemals verschlüsselte Nachrichten",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Nachrichten in diesem Raum sind mit einer Ende-zu-Ende-Verschlüsselung gesichert. Nur du und dein(e) Gesprächspartner haben die Schlüssel, um die Nachrichten zu lesen.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Speichere deine Schlüssel an einem sicheren Ort, um diese nicht zu verlieren. <a>Lerne wie.</a>",

From b298d27c21c37b0734b2a9983cb1d511962bed9f Mon Sep 17 00:00:00 2001
From: BenjaminVettori <benjamin.vettori@gmail.com>
Date: Mon, 4 May 2020 13:08:26 +0000
Subject: [PATCH 2696/3235] Translated using Weblate (German)

Currently translated at 79.1% (1820 of 2302 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c63cce305a..3668b08bca 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1885,5 +1885,8 @@
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dieser Raum verbindet Nachrichten mit den folgenden Plattformen. <a>Mehr erfahren.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dieser Raum verbindet keine Nachrichten mit Plattformen. <a>Mehr erfahren.</a>",
     "Bridges": "Bridges",
-    "Uploaded sound": "Hochgeladener Ton"
+    "Uploaded sound": "Hochgeladener Ton",
+    "Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion",
+    "this room": "Dieser Raum",
+    "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s."
 }

From 0b089858ede64c2cb2df2086a72c1444e5210dd0 Mon Sep 17 00:00:00 2001
From: code-surfer <1703github@rainbow.in-berlin.de>
Date: Mon, 4 May 2020 13:20:38 +0000
Subject: [PATCH 2697/3235] Translated using Weblate (German)

Currently translated at 79.1% (1820 of 2302 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 3668b08bca..4500a678e6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1888,5 +1888,7 @@
     "Uploaded sound": "Hochgeladener Ton",
     "Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion",
     "this room": "Dieser Raum",
-    "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s."
+    "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
+    "Send a bug report with logs": "Sende Fehlermeldung mit Protokoll",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen"
 }

From ab82bf80484e69abff75ff2fcebd8f795f062852 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 5 May 2020 10:23:39 +0200
Subject: [PATCH 2698/3235] differentiate copy for own untrusted device dialog

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5544e3a8b1..8d2aa14419 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -306,9 +306,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "Light theme": "Light theme",
     "Dark theme": "Dark theme",
-    "Not Trusted": "Not Trusted",
+    "You signed in to a new session without verifying it:": "You signed in to a new session without verifying it:",
+    "Verify your other session using one of the options below.": "Verify your other session using one of the options below.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Not Trusted": "Not Trusted",
     "Manually Verify by Text": "Manually Verify by Text",
     "Interactively verify by Emoji": "Interactively verify by Emoji",
     "Done": "Done",
diff --git a/src/verification.js b/src/verification.js
index d7287552dd..f488b2ebeb 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -43,14 +43,26 @@ function UntrustedDeviceDialog(props) {
     const {device, user, onFinished} = props;
     const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
     const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    let askToVerifyText;
+    let newSessionText;
+
+    if (MatrixClientPeg.get().getUserId() === user.userId) {
+        newSessionText = _t("You signed in to a new session without verifying it:");
+        askToVerifyText = _t("Verify your other session using one of the options below.");
+    } else {
+        newSessionText = _t("%(name)s (%(userId)s) signed in to a new session without verifying it:",
+            {name: user.displayName, userId: user.userId});
+        askToVerifyText = _t("Ask this user to verify their session, or manually verify it below.");
+    }
+
     return <BaseDialog
         onFinished={onFinished}
         headerImage={require("../res/img/e2e/warning.svg")}
         title={_t("Not Trusted")}>
         <div className="mx_Dialog_content" id='mx_Dialog_content'>
-            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+            <p>{newSessionText}</p>
             <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+            <p>{askToVerifyText}</p>
         </div>
         <div className='mx_Dialog_buttons'>
             <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>

From 5aa645caf9401b4e53d006604dd7a223d4a368e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 5 May 2020 10:10:21 +0200
Subject: [PATCH 2699/3235] EventIndex: Reduce the logging the event index is
 producing.

---
 src/indexing/EventIndex.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a6bbbb5f96..eed9837a7a 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -102,9 +102,6 @@ export default class EventIndex extends EventEmitter {
             const timeline = room.getLiveTimeline();
             const token = timeline.getPaginationToken("b");
 
-            console.log("EventIndex: Got token for indexer",
-                        room.roomId, token);
-
             const backCheckpoint = {
                 roomId: room.roomId,
                 token: token,
@@ -161,7 +158,6 @@ export default class EventIndex extends EventEmitter {
         if (prevState === "SYNCING" && state === "SYNCING") {
             // A sync was done, presumably we queued up some live events,
             // commit them now.
-            console.log("EventIndex: Committing events");
             await indexManager.commitLiveEvents();
             return;
         }
@@ -336,8 +332,6 @@ export default class EventIndex extends EventEmitter {
     async crawlerFunc() {
         let cancelled = false;
 
-        console.log("EventIndex: Started crawler function");
-
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
@@ -366,8 +360,6 @@ export default class EventIndex extends EventEmitter {
 
             await sleep(sleepTime);
 
-            console.log("EventIndex: Running the crawler loop.");
-
             if (cancelled) {
                 break;
             }
@@ -386,8 +378,6 @@ export default class EventIndex extends EventEmitter {
 
             idle = false;
 
-            console.log("EventIndex: crawling using checkpoint", checkpoint);
-
             // We have a checkpoint, let us fetch some messages, again, very
             // conservatively to not bother our homeserver too much.
             const eventMapper = client.getEventMapper({preventReEmit: true});
@@ -511,15 +501,6 @@ export default class EventIndex extends EventEmitter {
                 direction: checkpoint.direction,
             };
 
-            console.log(
-                "EventIndex: Crawled room",
-                client.getRoom(checkpoint.roomId).name,
-                "and fetched total", matrixEvents.length, "events of which",
-                events.length, "are being added,", redactionEvents.length,
-                "are redacted,", matrixEvents.length - events.length,
-                "are being skipped, undecryptable", undecryptableEvents.length,
-            );
-
             try {
                 for (let i = 0; i < redactionEvents.length; i++) {
                     const ev = redactionEvents[i];
@@ -552,8 +533,6 @@ export default class EventIndex extends EventEmitter {
         }
 
         this._crawler = null;
-
-        console.log("EventIndex: Stopping crawler function");
     }
 
     /**

From 51a79a43e3186838d02349ee3106d748ac8e71fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 5 May 2020 10:21:18 +0200
Subject: [PATCH 2700/3235] EventIndex: Remove an unused variable.

---
 src/indexing/EventIndex.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index eed9837a7a..02151f8474 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -467,9 +467,6 @@ export default class EventIndex extends EventEmitter {
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
             const filteredEvents = matrixEvents.filter(this.isValidEvent);
-            const undecryptableEvents = matrixEvents.filter((ev) => {
-                return ev.isDecryptionFailure();
-            });
 
             // Collect the redaction events so we can delete the redacted events
             // from the index.

From 1423c2e4bcd9be4d6d37b320b5962478d932921d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 5 May 2020 11:04:24 +0100
Subject: [PATCH 2701/3235] Upgrade matrix-js-sdk to 6.0.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 19fa03b3d8..42db16f37f 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "6.0.0-rc.2",
+    "matrix-js-sdk": "6.0.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "png-chunks-extract": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index ae0a218e0e..1066e95e36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5715,10 +5715,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@6.0.0-rc.2:
-  version "6.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0-rc.2.tgz#56eb438458cb59cf18bbd6126d72029dc728659f"
-  integrity sha512-osW5GIOAcCpY/wCxct9RMxRZhodkVBdEDVZuQm2nstKDLGafl5oxAit2LAz9g0ymv+16LBp8XbThM2GWa2lj2Q==
+matrix-js-sdk@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575"
+  integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From e6c485c7e83d351e554ecbfcceaa7540b202fa14 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 5 May 2020 11:10:36 +0100
Subject: [PATCH 2702/3235] Prepare changelog for v2.5.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df4a934a07..0706e20085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+Changes in [2.5.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0) (2020-05-05)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.6...v2.5.0)
+
+ * Upgrade to JS SDK 6.0.0
+ * EventIndex: Reduce the logging the event index is producing.
+   [\#4551](https://github.com/matrix-org/matrix-react-sdk/pull/4551)
+ *  Differentiate copy for own untrusted device dialog
+   [\#4550](https://github.com/matrix-org/matrix-react-sdk/pull/4550)
+ * More detailed progress for key backup progress
+   [\#4545](https://github.com/matrix-org/matrix-react-sdk/pull/4545)
+ *  Increase rageshake size limit to 5mb
+   [\#4544](https://github.com/matrix-org/matrix-react-sdk/pull/4544)
+
 Changes in [2.5.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.6) (2020-05-01)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.5...v2.5.0-rc.6)

From 854855a5aa568eb2ecbc08a806934fd42f394c45 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 5 May 2020 11:10:36 +0100
Subject: [PATCH 2703/3235] v2.5.0

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

diff --git a/package.json b/package.json
index 42db16f37f..15d1267d0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0-rc.6",
+  "version": "2.5.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From aa0c6f1f71a6122579c74f3cba3a7925f35131ac Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 5 May 2020 11:40:37 +0100
Subject: [PATCH 2704/3235] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0e538be35f..92d228a812 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "6.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index 8ca39b0d96..520e976b17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5720,10 +5720,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@6.0.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575"
-  integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f120533fadb309ac5dc8b2bcb6882e784ba93f18"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 781cbea74450e7acb982c41bfa54dbf43957f15f Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Tue, 5 May 2020 15:39:37 +0100
Subject: [PATCH 2705/3235] Fix a crash where a name could unexpectedly be an
 empty list

---
 src/components/structures/RoomSubList.js | 40 ++++++++++++++++++++++--
 src/components/views/rooms/RoomTile.js   |  3 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 1e3e15b4ec..4e8e51c3cc 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -37,6 +37,42 @@ import toRem from "../../utils/rem";
 // turn this on for drop & drag console debugging galore
 const debug = false;
 
+class RoomTileErrorBoundary extends React.PureComponent {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            error: null,
+        };
+    }
+
+    static getDerivedStateFromError(error) {
+        // Side effects are not permitted here, so we only update the state so
+        // that the next render shows an error message.
+        return { error };
+    }
+
+    componentDidCatch(error, { componentStack }) {
+        // Browser consoles are better at formatting output when native errors are passed
+        // in their own `console.error` invocation.
+        console.error(error);
+        console.error(
+            "The above error occured while React was rendering the following components:",
+            componentStack,
+        );
+    }
+
+    render() {
+        if (this.state.error) {
+            return (<div className="mx_RoomTile mx_RoomTileError">
+                {this.props.roomId}
+            </div>);
+        } else {
+            return this.props.children;
+        }
+    }
+}
+
 export default class RoomSubList extends React.PureComponent {
     static displayName = 'RoomSubList';
     static debug = debug;
@@ -208,7 +244,7 @@ export default class RoomSubList extends React.PureComponent {
     };
 
     makeRoomTile = (room) => {
-        return <RoomTile
+        return <RoomTileErrorBoundary roomId={room.roomId}><RoomTile
             room={room}
             roomSubList={this}
             tagName={this.props.tagName}
@@ -221,7 +257,7 @@ export default class RoomSubList extends React.PureComponent {
             refreshSubList={this._updateSubListCount}
             incomingCall={null}
             onClick={this.onRoomTileClick}
-        />;
+        /></RoomTileErrorBoundary>;
     };
 
     _onNotifBadgeClick = (e) => {
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index f157ee0df7..6a23fe309b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -432,10 +432,9 @@ export default createReactClass({
         });
 
         let name = this.state.roomName;
-        if (name == undefined || name == null) name = '';
+        if (typeof name !== 'string') name = '';
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
-
         let badge;
         if (badges) {
             const limitedCount = FormattingUtils.formatCount(notificationCount);

From 26a42ce62e085795e025ac5d4d8656774089e3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Tue, 5 May 2020 14:46:01 +0000
Subject: [PATCH 2706/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2304 of 2304 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 | 188 ++++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 93 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8bf5e28f7f..5eebbe8478 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,7 +2,7 @@
     "Cancel": "Mégse",
     "Search": "Keresés",
     "OK": "Rendben",
-    "Custom Server Options": "Egyedi szerverbeállítások",
+    "Custom Server Options": "Egyéni kiszolgálóbeállítások",
     "Dismiss": "Eltüntetés",
     "Error": "Hiba",
     "Failed to forget room %(errCode)s": "Nem sikerült elfelejteni a szobát: %(errCode)s",
@@ -10,7 +10,7 @@
     "Mute": "Elnémít",
     "Notifications": "Értesítések",
     "Operation failed": "Sikertelen művelet",
-    "powered by Matrix": "Matrix hajtja",
+    "powered by Matrix": "a gépházban: Matrix",
     "Remove": "Kitakarás",
     "Settings": "Beállítások",
     "unknown error code": "ismeretlen hibakód",
@@ -70,7 +70,7 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
-    "Changes your display nickname": "Becenév megváltoztatása",
+    "Changes your display nickname": "Megváltoztatja a becenevedet",
     "Claimed Ed25519 fingerprint key": "Igényelt Ed25519 ujjlenyomat kulcs",
     "Click here to fix": "A javításhoz kattints ide",
     "Click to mute audio": "Hang némításhoz kattints ide",
@@ -88,7 +88,7 @@
     "Curve25519 identity key": "Curve25519 azonosítási kulcs",
     "Custom": "Egyedi",
     "Custom level": "Egyedi szint",
-    "/ddg is not a command": "/ddg nem egy parancs",
+    "/ddg is not a command": "A /ddg nem egy parancs",
     "Deactivate Account": "Fiók bezárása",
     "Decline": "Elutasít",
     "Decrypt %(text)s": "%(text)s visszafejtése",
@@ -159,7 +159,7 @@
     "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
-    "Invites user with given id to current room": "Felhasználó meghívása ebbe a szobába megadott azonosítóval",
+    "Invites user with given id to current room": "A megadott azonosítójú felhasználó meghívása a jelenlegi szobába",
     "Sign in with": "Belépés ezzel:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hang</voiceText>gal vagy <videoText>videó</videoText>val.",
     "Join Room": "Belépés a szobába",
@@ -182,8 +182,8 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik bárki.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
     "Manage Integrations": "Integrációk kezelése",
-    "Missing room_id in request": "Hiányzó room_id a kérésben",
-    "Missing user_id in request": "Hiányzó user_id a kérésben",
+    "Missing room_id in request": "A kérésből hiányzik a room_id",
+    "Missing user_id in request": "A kérésből hiányzik a user_id",
     "Moderator": "Moderátor",
     "Name": "Név",
     "New address (e.g. #foo:%(localDomain)s)": "Új cím (e.g. #foo:%(localDomain)s)",
@@ -240,7 +240,7 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
     "Server error": "Szerver hiba",
     "Server may be unavailable, overloaded, or search timed out :(": "A szerver elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
-    "Server may be unavailable, overloaded, or you hit a bug.": "A szerver elérhetetlen, túlterhelt vagy hibára futott.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "A kiszolgáló elérhetetlen, túlterhelt vagy hibára futott.",
     "Server unavailable, overloaded, or something else went wrong.": "A szerver elérhetetlen, túlterhelt vagy valami más probléma van.",
     "Session ID": "Kapcsolat azonosító",
     "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
@@ -266,7 +266,7 @@
     "This phone number is already in use": "Ez a telefonszám már használatban van",
     "This room": "Ebben a szobában",
     "This room is not accessible by remote Matrix servers": "Ez a szoba távoli Matrix szerverről nem érhető el",
-    "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítéshez a találatok betöltését és TAB-bal választhatsz közülük.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítési találatok betöltését, majd Tabbal választhatsz közülük.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nincs jogod a kérdéses üzenetek megjelenítéséhez.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
@@ -304,7 +304,7 @@
     "Voice call": "Hang hívás",
     "VoIP conference finished.": "VoIP konferencia befejeződött.",
     "VoIP conference started.": "VoIP konferencia elkezdődött.",
-    "VoIP is unsupported": "VoIP nem támogatott",
+    "VoIP is unsupported": "A VoIP nem támogatott",
     "(could not connect media)": "(média kapcsolat nem hozható létre)",
     "(no answer)": "(nincs válasz)",
     "(unknown failure: %(reason)s)": "(ismeretlen hiba: %(reason)s)",
@@ -320,33 +320,33 @@
     "You have <a>enabled</a> URL previews by default.": "Az URL előnézet alapból <a>engedélyezve</a> van.",
     "You have no visible notifications": "Nincsenek látható értesítéseid",
     "You must <a>register</a> to use this functionality": "<a>Regisztrálnod kell</a> hogy ezt használhasd",
-    "You need to be able to invite users to do that.": "Hogy ezt csinálhasd meg kell tudnod hívni felhasználókat.",
+    "You need to be able to invite users to do that.": "Hogy ezt tehesd, meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix szerveren.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix-kiszolgálón.",
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
-    "Sun": "vas",
-    "Mon": "hé",
+    "Sun": "v",
+    "Mon": "h",
     "Tue": "k",
     "Wed": "sze",
-    "Thu": "csü",
-    "Fri": "pé",
+    "Thu": "cs",
+    "Fri": "p",
     "Sat": "szo",
-    "Jan": "jan",
-    "Feb": "feb",
-    "Mar": "már",
-    "Apr": "ápr",
-    "May": "máj",
-    "Jun": "jún",
-    "Jul": "júl",
-    "Aug": "aug",
-    "Sep": "szept",
-    "Oct": "okt",
-    "Nov": "nov",
-    "Dec": "dec",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Jan": "jan.",
+    "Feb": "feb.",
+    "Mar": "már.",
+    "Apr": "ápr.",
+    "May": "máj.",
+    "Jun": "jún.",
+    "Jul": "júl.",
+    "Aug": "aug.",
+    "Sep": "szept.",
+    "Oct": "okt.",
+    "Nov": "nov.",
+    "Dec": "dec.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s, %(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Set a display name:": "Megjelenítési név beállítása:",
     "Upload an avatar:": "Avatar kép feltöltése:",
@@ -438,8 +438,8 @@
     "Define the power level of a user": "A felhasználó szintjének meghatározása",
     "Edit": "Szerkeszt",
     "Enable automatic language detection for syntax highlighting": "Nyelv automatikus felismerése szintaxis kiemeléshez",
-    "AM": "de",
-    "PM": "du",
+    "AM": "de.",
+    "PM": "du.",
     "To get started, please pick a username!": "Az induláshoz válassz egy felhasználói nevet!",
     "Unable to create widget.": "Nem lehet kisalkalmazást létrehozni.",
     "You are not in this room.": "Nem vagy ebben a szobában.",
@@ -465,15 +465,15 @@
     "You are no longer ignoring %(userId)s": "Ismét figyelembe veszed: %(userId)s",
     "Unignored user": "Figyelembe vett felhasználó",
     "Ignored user": "Figyelmen kívül hagyott felhasználó",
-    "Stops ignoring a user, showing their messages going forward": "Felhasználót újra figyelembe vesszük és megmutatjuk az új üzeneteit",
-    "Ignores a user, hiding their messages from you": "Felhasználó figyelmen kívül hagyásával elrejtheted az üzeneteit magad elől",
+    "Stops ignoring a user, showing their messages going forward": "A felhasználó újbóli figyelembe vétele, és az üzenetei megjelenítése a jövőben",
+    "Ignores a user, hiding their messages from you": "Figyelmen kívül hagy egy felhasználót, elrejtve előled az üzeneteit",
     "Banned by %(displayName)s": "Kitiltotta: %(displayName)s",
     "Message removed by %(userId)s": "Üzenetet törölte: %(userId)s",
     "Description": "Leírás",
     "Unable to accept invite": "A meghívót nem lehet elfogadni",
     "Leave": "Elhagy",
-    "Failed to invite the following users to %(groupId)s:": "Az alábbi felhasználókat nem sikerült meghívni a(z) %(groupId)s:",
-    "Failed to invite users to %(groupId)s": "Nem sikerült meghívni a felhasználókat ebbe a csoportba: %(groupId)s",
+    "Failed to invite the following users to %(groupId)s:": "A következő felhasználókat nem sikerült meghívni a(z) %(groupId)s csoportba:",
+    "Failed to invite users to %(groupId)s": "A felhasználók meghívása a(z) %(groupId)s csoportba sikertelen",
     "Unable to reject invite": "Nem sikerül elutasítani a meghívót",
     "Leave %(groupName)s?": "Elhagyod a csoportot: %(groupName)s?",
     "Add a Room": "Szoba hozzáadása",
@@ -491,7 +491,7 @@
     "Light theme": "Világos téma",
     "Dark theme": "Sötét téma",
     "Unknown": "Ismeretlen",
-    "Failed to add the following rooms to %(groupId)s:": "Az alábbi szobákat nem sikerült hozzáadni a(z) %(groupId)s csoporthoz:",
+    "Failed to add the following rooms to %(groupId)s:": "A következő szobák hozzáadása a(z) %(groupId)s csoporthoz sikertelen:",
     "Matrix ID": "Matrix azonosító",
     "Matrix Room ID": "Szoba Matrix azonosító",
     "email address": "E-mail cím",
@@ -504,13 +504,13 @@
     "Pinned Messages": "Kitűzött üzenetek",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött szövegeit.",
     "Who would you like to add to this community?": "Kit szeretnél hozzáadni ehhez a közösséghez?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz aki ismeri a közösség azonosítóját",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz, aki ismeri a közösség azonosítóját",
     "Invite new community members": "Új tagok meghívása a közösségbe",
     "Invite to Community": "Meghívás a közösségbe",
     "Which rooms would you like to add to this community?": "Melyik szobákat szeretnéd hozzáadni a közösséghez?",
     "Add rooms to the community": "Szobák hozzáadása a közösséghez",
     "Add to community": "Hozzáadás a közösséghez",
-    "Failed to invite users to community": "Nem sikerült tagokat meghívni a közösségbe",
+    "Failed to invite users to community": "A felhasználók meghívása a közösségbe sikertelen",
     "Communities": "Közösségek",
     "Unpin Message": "Üzenet levétele",
     "Jump to message": "Üzenetre ugrás",
@@ -636,7 +636,7 @@
     "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!": "A közösségednek nincs bő leírása, HTML oldala ami megjelenik a közösség tagjainak.<br />A létrehozáshoz kattints ide!",
     "Notify the whole room": "Az egész szoba értesítése",
     "Room Notification": "Szoba értesítések",
-    "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?",
+    "Show these rooms to non-members on the community page and room list?": "Megjelenjenek ezek a szobák kívülállóknak a közösségi oldalon és a szobalistában?",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
     "Restricted": "Korlátozott",
     "Enable inline URL previews by default": "Beágyazott URL előnézetek alapértelmezett engedélyezése",
@@ -667,7 +667,7 @@
     "Answer Anyway": "Felvétel mindenképpen",
     "Call": "Hívás",
     "Answer": "Felvétel",
-    "Send": "Elküld",
+    "Send": "Elküldés",
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
     "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.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
     "Warning": "Figyelmeztetés",
@@ -684,13 +684,13 @@
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A személyes adatok védelme fontos számunkra, így mi nem gyűjtünk személyes és személyhez köthető adatokat az analitikánkhoz.",
     "Learn more about how we use analytics.": "Tudj meg többet arról hogyan használjuk az analitikai adatokat.",
     "The information being sent to us to help make Riot.im better includes:": "Az adatok amiket a Riot.im javításához felhasználunk az alábbiak:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adatot mint a szoba, felhasználó vagy csoport azonosítót mielőtt az adatokat elküldenénk eltávolításra kerülnek.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adat, mint a szoba-, felhasználó- vagy csoportazonosítók, eltávolításra kerülnek, mielőtt elküldenénk a kiszolgálónak.",
     "The platform you're on": "A platform amit használsz",
     "The version of Riot.im": "Riot.im verziója",
     "Your language of choice": "A használt nyelv",
-    "Which officially provided instance you are using, if any": "Milyen hivatalosan nyújtott verziót használsz",
+    "Which officially provided instance you are using, if any": "Melyik hivatalosan nyújtott példányt használod",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
-    "Your homeserver's URL": "A Matrix szerver URL-t",
+    "Your homeserver's URL": "A Matrix kiszolgálód URL-je",
     "Your identity server's URL": "Az azonosítási szerver URL-t",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
@@ -848,7 +848,7 @@
     "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!": "Ebben a böngészőben az alkalmazás felülete tele lehet hibával, és az is lehet, hogy egyáltalán nem működik. Ha így is ki szeretnéd próbálni, megteheted, de ha valami gondod van, nem tudunk segíteni!",
     "Checking for an update...": "Frissítés keresése...",
     "There are advanced notifications which are not shown here": "Vannak itt nem látható, haladó értesítések",
-    "Missing roomId.": "Hiányzó szoba azonosító.",
+    "Missing roomId.": "Hiányzó szobaazonosító.",
     "Popout widget": "Kiugró kisalkalmazás",
     "Every page you use in the app": "Minden oldal, amit az alkalmazásban használsz",
     "e.g. <CurrentPageURL>": "pl.: <CurrentPageURL>",
@@ -902,7 +902,7 @@
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
     "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
-    "Permission Required": "Engedély szükséges",
+    "Permission Required": "Jogosultság szükséges",
     "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
     "A call is currently being placed!": "A hívás indítás alatt!",
     "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
@@ -1028,7 +1028,7 @@
     "Great! This passphrase looks strong enough.": "Szuper! Ez a jelmondat elég erősnek látszik.",
     "As a safety net, you can use it to restore your encrypted message history.": "Használhatod egy biztonsági hálóként a titkosított üzenetek visszaállításához.",
     "Failed to load group members": "A közösség tagságokat nem sikerült betölteni",
-    "Failed to invite users to the room:": "Felhasználókat nem sikerült meghívni a szobába:",
+    "Failed to invite users to the room:": "A felhasználók meghívása a szobába sikertelen:",
     "You do not have permission to invite people to this room.": "Nincs jogosultságod embereket meghívni ebbe a szobába.",
     "User %(user_id)s does not exist": "%(user_id)s felhasználó nem létezik",
     "Unknown server error": "Ismeretlen szerver hiba",
@@ -1063,7 +1063,7 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Az alábbi Matrix ID-koz nem sikerül megtalálni a profilokat - így is meghívod őket?",
     "Invite anyway and never warn me again": "Mindenképpen meghív és ne figyelmeztess többet",
     "Invite anyway": "Mindenképpen meghív",
-    "Whether or not you're logged in (we don't record your username)": "Se akkor ha bejelentkezel se akkor ha nem; mi nem tároljuk a felhasználói nevedet",
+    "Whether or not you're logged in (we don't record your username)": "Akár be vagy jelentkezve, akár nem; nem tároljuk a felhasználónevedet",
     "Upgrades a room to a new version": "Szoba fejlesztése új verzióra",
     "Sets the room name": "Szobanév beállítása",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s fejlesztette a szobát.",
@@ -1167,7 +1167,7 @@
     "Create your account": "Felhasználói fiók létrehozása",
     "Email (optional)": "E-mail (nem kötelező)",
     "Phone (optional)": "Telefonszám (nem kötelező)",
-    "Confirm": "Megerősít",
+    "Confirm": "Megerősítés",
     "Other servers": "Más szerverek",
     "Homeserver URL": "Matrixszerver URL",
     "Identity Server URL": "Azonosítási Szerver URL",
@@ -1187,7 +1187,7 @@
     "Recovery Method Removed": "Visszaállítási eljárás törölve",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem te törölted a visszaállítási eljárást, akkor egy támadó hozzá akar férni a fiókodhoz. Azonnal változtasd meg a jelszavadat és állíts be egy visszaállítási eljárást a Beállításokban.",
     "Chat with Riot Bot": "Csevegés a Riot Robottal",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' mérete nagyobb mint amekkorát a Matrix szerver megenged feltölteni",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "A(z) „%(fileName)s” mérete nagyobb mint amekkorát a Matrix-kiszolgáló enged feltölteni",
     "Gets or sets the room topic": "Lekérdezi vagy beállítja a szoba témáját",
     "This room has no topic.": "A szobának nincs témája.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s hozzáférhetővé tette a szobát bárkinek, aki ismeri a linket.",
@@ -1303,7 +1303,7 @@
     "Allow Peer-to-Peer for 1:1 calls": "Ponttól-pontig kapcsolat engedélyezése az 1:1 hívásokban",
     "Credits": "Közreműködők",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ha bármilyen hibába botlasz vagy szeretnél visszajelzést küldeni nekünk, kérjük oszd meg velünk a GitHub-on.",
-    "Changes your display nickname in the current room only": "Csak ebben a szobában változtatod meg a becenevedet",
+    "Changes your display nickname in the current room only": "Csak ebben a szobában változtatja meg a becenevedet",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s letiltotta a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(newGroups)s és letiltotta ehhez a közösséghez: %(oldGroups)s.",
@@ -1325,7 +1325,7 @@
     "Create your Matrix account on %(serverName)s": "Készíts egy Matrix fiókot itt: %(serverName)s",
     "Could not load user profile": "A felhasználói profil nem tölthető be",
     "Your Matrix account on %(serverName)s": "A Matrix fiókod itt: %(serverName)s",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Hozzáteszi a sima szöveges üzenethez ezt: ¯\\_(ツ)_/¯",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "A sima szöveges üzenet elé teszi ezt: ¯\\_(ツ)_/¯",
     "User %(userId)s is already in the room": "%(userId)s felhasználó már a szobában van",
     "The user must be unbanned before they can be invited.": "A felhasználó kitiltását először vissza kell vonni mielőtt újra meghívható lesz.",
     "<a>Upgrade</a> to your own domain": "<a>Frissíts</a> a saját domain-re",
@@ -1353,9 +1353,9 @@
     "Want more than a community? <a>Get your own server</a>": "Többet szeretnél, mint egy közösség? <a>Szerezz saját szervert</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Figyelmeztetés</b>: A szoba frissítése <i>nem fogja automatikusan átvinni a szoba résztvevőit az új verziójú szobába.</i> A régi szobába bekerül egy link az új szobához - a tagoknak rá kell kattintani a linkre az új szobába való belépéshez.",
-    "Adds a custom widget by URL to the room": "Egyedi kisalkalmazás hozzáadása a szobához URL-lel",
-    "Please supply a https:// or http:// widget URL": "Kérlek add meg a https:// vagy http:// kisalkalmazás URL-t",
-    "You cannot modify widgets in this room.": "A kisalkalmazásokat nem módosíthatod a szobában.",
+    "Adds a custom widget by URL to the room": "Egyéni kisalkalmazás hozzáadása a szobához URL alapján",
+    "Please supply a https:// or http:// widget URL": "Add meg a kisalkalmazás https:// vagy http:// URL-jét",
+    "You cannot modify widgets in this room.": "Nem módosíthatod a kisalkalmazásokat a szobában.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s visszavonta %(targetDisplayName)s a szobába való belépéséhez szükséges meghívóját.",
     "Upgrade this room to the recommended room version": "A szoba fejlesztése a javasolt verzióra",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A szoba verziója:  <roomVersion />, amit a Matrix szerver <i>instabilnak</i> tekint.",
@@ -1376,8 +1376,8 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Használsz-e „morzsákat” (profilképek a szobalista felett)",
     "Replying With Files": "Válasz fájlokkal",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyenlőre nem lehet fájlal válaszolni. Szeretnéd feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
-    "The file '%(fileName)s' failed to upload.": "A %(fileName)s fájlt nem sikerült feltölteni.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyelőre nem lehet fájllal válaszolni. Szeretnéd feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
+    "The file '%(fileName)s' failed to upload.": "A(z) „%(fileName)s” fájl feltöltése sikertelen.",
     "Rotate counter-clockwise": "Óramutató járásával ellentétesen fordít",
     "Rotate clockwise": "Óramutató járásával megegyező irányba fordít",
     "GitHub issue": "GitHub hibajegy",
@@ -1398,8 +1398,8 @@
     "Upload %(count)s other files|one": "Feltölt %(count)s másik fájlt",
     "Cancel All": "Mindent megszakít",
     "Upload Error": "Feltöltési hiba",
-    "The server does not support the room version specified.": "A szerver nem támogatja a megadott szoba verziót.",
-    "Changes your avatar in this current room only": "A profilképedet csak ebben a szobában változtatja meg",
+    "The server does not support the room version specified.": "A kiszolgáló nem támogatja a megadott szobaverziót.",
+    "Changes your avatar in this current room only": "Csak ebben a szobában változtatja meg a profilképedet",
     "Sends the given message coloured as a rainbow": "A megadott üzenetet szivárvány színben küldi el",
     "Sends the given emote coloured as a rainbow": "A megadott hangulatjelet szivárvány színben küldi el",
     "The user's homeserver does not support the version of the room.": "A felhasználó matrix szervere nem támogatja a megadott szoba verziót.",
@@ -1452,7 +1452,7 @@
     "Invalid base_url for m.identity_server": "Érvénytelen base_url az m.identity_server -hez",
     "Identity server URL does not appear to be a valid identity server": "Az Azonosító szerver URL nem tűnik érvényesnek",
     "A conference call could not be started because the integrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
-    "Name or Matrix ID": "Név vagy Matrix azon.",
+    "Name or Matrix ID": "Név vagy Matrix azonosító",
     "Unbans user with given ID": "Visszaengedi a megadott azonosítójú felhasználót",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>ezzel reagált: %(shortName)s</reactedWith>",
     "edited": "szerkesztve",
@@ -1500,7 +1500,7 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s nem változtattak semmit",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s alkalommal nem változtatott semmit",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snem változtatott semmit",
-    "Changes your avatar in all rooms": "A profilképed megváltozik minden szobában",
+    "Changes your avatar in all rooms": "Megváltoztatja a profilképed az összes szobában",
     "Removing…": "Eltávolítás…",
     "Clear all data": "Minden adat törlése",
     "Your homeserver doesn't seem to support this feature.": "A matrix szervered úgy tűnik nem támogatja ezt a szolgáltatást.",
@@ -1523,10 +1523,10 @@
     "Terms of Service": "Felhasználási feltételek",
     "Service": "Szolgáltatás",
     "Summary": "Összefoglaló",
-    "Call failed due to misconfigured server": "A hívás meghiúsult a helytelenül beállított szerver miatt",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Kérd meg a matrix szerver (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN szervert.",
-    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Másik lehetőségként használhatod a nyilvános szervert: <code>turn.matrix.org</code>, de ez nem lesz annyira megbízható és megosztja az IP címedet a szerverrel. A Beállításokban állíthatod be.",
-    "Try using turn.matrix.org": "Próbáld meg használni a turn.matrix.org-ot",
+    "Call failed due to misconfigured server": "A hívás a helytelenül beállított kiszolgáló miatt sikertelen",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Kérd meg a Matrix-kiszolgálód (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN-kiszolgálót.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Másik lehetőségként használhatod a <code>turn.matrix.org</code> nyilvános kiszolgálót, de ez nem lesz annyira megbízható, és megosztja az IP-címedet a kiszolgálóval. A Beállításokban állíthatod be.",
+    "Try using turn.matrix.org": "A turn.matrix.org használatának kipróbálása",
     "Messages": "Üzenetek",
     "Actions": "Műveletek",
     "Displays list of commands with usages and descriptions": "Parancsok megjelenítése példával és leírással",
@@ -1539,9 +1539,9 @@
     "Could not connect to Identity Server": "Az Azonosítási Szerverhez nem lehet csatlakozni",
     "Checking server": "Szerver ellenőrzése",
     "Terms of service not accepted or the identity server is invalid.": "A felhasználási feltételek nincsenek elfogadva vagy az azonosítási szerver nem érvényes.",
-    "Identity server has no terms of service": "Az azonosítási szerverhez nincsenek felhasználási feltételek",
+    "Identity server has no terms of service": "Az azonosítási kiszolgálónak nincsenek felhasználási feltételei",
     "The identity server you have chosen does not have any terms of service.": "Az általad választott azonosítási szerverhez nincsenek felhasználási feltételek.",
-    "Only continue if you trust the owner of the server.": "Csak akkor lépj tovább ha megbízol a szerver tulajdonosában.",
+    "Only continue if you trust the owner of the server.": "Csak akkor lépj tovább, ha megbízol a kiszolgáló tulajdonosában.",
     "Disconnect from the identity server <idserver />?": "Bontod a kapcsolatot ezzel az azonosítási szerverrel: <idserver />?",
     "Disconnect": "Kapcsolat bontása",
     "Identity Server (%(server)s)": "Azonosítás Szerver (%(server)s)",
@@ -1582,13 +1582,13 @@
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Használj azonosítási szervert e-mail címmel való meghíváshoz. <default> Használd az alapértelmezett szervert (%(defaultIdentityServerName)s)</default> vagy adj meg mást a <settings>Beállításokban</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Használj azonosítási szervert e-mail címmel való meghíváshoz. Megadása a <settings>Beállításokban</settings>.",
     "Enable room encryption": "Szoba titkosításának bekapcsolása",
-    "Use an identity server": "Azonosítási szerver használata",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Azonosítási szerver használata e-maillel való meghíváshoz. Kattints a folytatáshoz az alapértelmezett (%(defaultIdentityServerName)s) azonosítási szerverrel vagy változtasd meg a Beállításokban.",
-    "Use an identity server to invite by email. Manage in Settings.": "Az e-maillel való meghíváshoz használj azonosítási szervert. Módosítsd a Beállításokban.",
+    "Use an identity server": "Azonosítási kiszolgáló használata",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Egy azonosítási kiszolgáló használata az e-maillel történő meghíváshoz. Kattints a folytatáshoz az alapértelmezett azonosítási kiszolgáló (%(defaultIdentityServerName)s) használatához, vagy állítsd be a Beállításokban.",
+    "Use an identity server to invite by email. Manage in Settings.": "Egy azonosítási kiszolgáló használata az e-maillel történő meghíváshoz. Módosítás a Beállításokban.",
     "Deactivate user?": "Felhasználó felfüggesztése?",
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "A felhasználó felfüggesztése a felhasználót kijelentkezteti és megakadályozza, hogy vissza tudjon lépni. Továbbá kilép minden szobából aminek tagja volt. Ezt nem lehet visszavonni. Biztos, hogy felfüggeszted ezt a felhasználót?",
     "Deactivate user": "Felhasználó felfüggesztése",
-    "Sends a message as plain text, without interpreting it as markdown": "Az üzenet elküldése sima szövegként anélkül, hogy „markdown” formázás lenne",
+    "Sends a message as plain text, without interpreting it as markdown": "Az üzenet elküldése sima szövegként anélkül, hogy „markdown” formázásként értelmezné",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "A meghívód ellenőrzésekor az alábbi hibát kaptuk: %(errcode)s. Ezt az információt megpróbálhatod eljuttatni a szoba gazdájának.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "A meghívó ehhez a szobához: %(roomName)s erre az e-mail címre lett elküldve: %(email)s ami nincs társítva a fiókodhoz",
     "Link this email with your account in Settings to receive invites directly in Riot.": "Kösd össze a Beállításokban ezt az e-mail címet a fiókoddal, hogy közvetlenül a Riotba kaphassa meghívókat.",
@@ -1604,7 +1604,7 @@
     "Change identity server": "Azonosítási szerver kicserélése",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "<current /> azonosítási szerverről lecsatlakozás és csatlakozás ehhez: <new />?",
     "Disconnect identity server": "Az azonosítási szerverről lecsatlakozás",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Az azonosítási szerverrel (<idserver />) továbbra is <b>megosztasz személyes adatokat</b>.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Továbbra is <b>megosztasz személyes adatokat</b> a(z) <idserver /> azonosítási kiszolgálón.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Javasoljuk, hogy mielőtt az azonosítási szerverről lecsatlakozol töröld az e-mail címedet és telefonszámodat.",
     "Disconnect anyway": "Mindenképpen lecsatlakozás",
     "No recent messages by %(user)s found": "Nincs friss üzenet ettől a felhasználótól: %(user)s",
@@ -1635,7 +1635,7 @@
     "Report Content": "Tartalom jelentése",
     "Read Marker lifetime (ms)": "Olvasás visszajelzés érvényesség (ms)",
     "Read Marker off-screen lifetime (ms)": "Olvasás visszajelzés érvényessége képernyőn kívül (ms)",
-    "Changes the avatar of the current room": "Profilkép megváltoztatása az adott szobában",
+    "Changes the avatar of the current room": "Megváltoztatja a profilképed a jelenlegi szobában",
     "Room alias": "Szoba álnév",
     "e.g. my-room": "pl.: szobam",
     "Please provide a room alias": "Kérlek adj meg egy álnevet a szobához",
@@ -1705,7 +1705,7 @@
     "%(count)s unread messages.|one": "1 olvasatlan üzenet.",
     "Unread messages.": "Olvasatlan üzenetek.",
     "Show tray icon and minimize window to it on close": "Tálcaikon mutatása és az ablak összecsukása bezáráskor",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Ez a művelet az e-mail cím vagy telefonszám ellenőrzése miatt hozzáférést igényel az alapértelmezett azonosítási szerverhez (<server />), de a szervernek nincsen semmilyen felhasználási feltétele.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Ez a művelet az e-mail cím vagy telefonszám ellenőrzése miatt hozzáférést igényel a(z) <server /> alapértelmezett azonosítási kiszolgálóhoz, de a kiszolgálónak nincsenek felhasználási feltételei.",
     "Trust": "Megbízom benne",
     "Message Actions": "Üzenet Műveletek",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
@@ -1752,7 +1752,7 @@
     "Room ID or alias of ban list": "Tiltó lista szoba azonosítója vagy alternatív neve",
     "Subscribe": "Feliratkozás",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ezt a felhasználót figyelmen kívül hagyod, így az üzenetei el lesznek rejtve. <a>Mindenképpen megmutat.</a>",
-    "Custom (%(level)s)": "Egyedi (%(level)s)",
+    "Custom (%(level)s)": "Egyéni (%(level)s)",
     "Trusted": "Megbízható",
     "Not trusted": "Megbízhatatlan",
     "Direct message": "Közvetlen beszélgetés",
@@ -1767,7 +1767,7 @@
     "Your theme": "Témád",
     "Riot URL": "Riot URL",
     "Room ID": "Szoba azonosító",
-    "Widget ID": "Kisalkalmazás azon.",
+    "Widget ID": "Kisalkalmazás azonosító",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel és az Integrációs Menedzserrel.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel.",
     "Widget added by": "A kisalkalmazást hozzáadta",
@@ -1801,8 +1801,8 @@
     "Match system theme": "A rendszer témájához megfelelő",
     "Clear notifications": "Értesítések törlése",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Kísérleti labor tulajdonságokkal egyénre szabhatod az élményt. <a>Tudj meg többet</a>.",
-    "Error upgrading room": "A szoba verziófrissítésénél hiba történt",
-    "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a szervered támogatja-e a szoba verzióját és próbáld újra.",
+    "Error upgrading room": "Hiba a szoba verziófrissítésekor",
+    "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a kiszolgálód támogatja-e kiválasztott szobaverziót, és próbáld újra.",
     "This message cannot be decrypted": "Ezt az üzenetet nem lehet visszafejteni",
     "Unencrypted": "Titkosítatlan",
     "Automatically invite users": "Felhasználók automatikus meghívása",
@@ -1845,7 +1845,7 @@
     "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szobák voltak kitiltva: %(glob)s",
-    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szerverek voltak kitiltva: %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s törölte azt a szabályt, amivel az ennek megfelelő kiszolgálók ki voltak tiltva: %(glob)s",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s törölte ezt a kitiltó szabályt: %(glob)s",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s frissített egy érvénytelen kitiltó szabályt",
     "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s frissítette azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s ezért: %(reason)s",
@@ -1945,7 +1945,7 @@
     "Encryption upgraded": "Titkosítás fejlesztve",
     "Encryption setup complete": "Titkosítás beállítása kész",
     "Verify this session": "Munkamenet ellenőrzése",
-    "Encryption upgrade available": "A titkosítás fejlesztése elérhető",
+    "Encryption upgrade available": "A titkosítási fejlesztés elérhető",
     "%(senderName)s turned on end-to-end encryption.": "%(senderName)s bekapcsolta a végpontok közötti titkosítást.",
     "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s).",
     "Enable message search in encrypted rooms": "Üzenetek keresésének engedélyezése titkosított szobákban",
@@ -1985,7 +1985,7 @@
     "Unverified session": "Ellenőrizetlen munkamenet",
     "Verifies a user, session, and pubkey tuple": "Felhasználó, munkamenet és nyilvános kulcs hármas ellenőrzése",
     "Unknown (user, session) pair:": "Ismeretlen (felhasználó, munkamenet) páros:",
-    "Session already verified!": "Munkamenet  már ellenőrizve!",
+    "Session already verified!": "A munkamenet már ellenőrizve volt!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "FIGYELEM: A munkamenet már ellenőrizve van de a kulcsok NEM EGYEZNEK!",
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Kereszt-aláírás engedélyezése a felhasználó alapú azonosításhoz a munkamenet alapú helyett (fejlesztés alatt)",
     "Show padlocks on invite only rooms": "Lakat mutatása azoknál a szobáknál amikbe csak meghívóval lehet belépni",
@@ -2007,8 +2007,8 @@
     "Delete %(count)s sessions|other": "%(count)s munkamenet törlése",
     "Delete %(count)s sessions|one": "%(count)s munkamenet törlése",
     "This session is backing up your keys. ": "Ez a munkamenet elmenti a kulcsaidat. ",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "FIGYELEM: KULCS ELLENŐRZÉS HIBÁS! %(userId)s aláírási kulcsa és a munkamenet: %(deviceId)s ujjlenyomata \"%(fprint)s\" ami nem egyezik meg a megadott ujjlenyomattal ami \"%(fingerprint)s\". Ez jelentheti azt, hogy a kommunikációt lehallgatják!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A megadott aláírási kulcs megegyezik %(userId)s felhasználótól kapott aláírási kulccsal ebben a munkamenetben: %(deviceId)s. A munkamenet hitelesnek lett jelölve.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "FIGYELEM: KULCSELLENŐRZÉS SIKERTELEN! %(userId)s aláírási kulcsa és a %(deviceId)s munkamenet ujjlenyomata „%(fprint)s”, ami nem egyezik meg a megadott ujjlenyomattal: „%(fingerprint)s”. Ez azt is jelentheti, hogy a kommunikációt lehallgatják!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A megadott aláírási kulcs megegyezik %(userId)s felhasználótól kapott aláírási kulccsal ebben a munkamenetben: %(deviceId)s. A munkamenet ellenőrzöttnek lett jelölve.",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Jelenleg a jelszó változtatás minden munkamenet végpontok közötti titkosító kulcsait alaphelyzetbe állítja, ezáltal a titkosított üzenetek olvashatatlanok lesznek, hacsak először nem mented ki a szobák kulcsait és töltöd vissza jelszóváltoztatás után. A jövőben ezt egyszerűsítjük majd.",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Ez az munkamenet <b>nem menti el a kulcsaidat</b>, de van létező mentésed ahonnan vissza  tudsz állni és továbbléphetsz.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Állítsd be ezen az munkameneten a Kulcs Mentést kijelentkezés előtt, hogy ne veszíts el olyan kulcsot ami csak ezen az eszközön van meg.",
@@ -2052,7 +2052,7 @@
     "Your messages are not secure": "Az üzeneteid nincsenek biztonságban",
     "One of the following may be compromised:": "Valamelyik az alábbiak közül kompromittált:",
     "Your homeserver": "Matrix szervered",
-    "The homeserver the user you’re verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix szerverhez kapcsolódik:",
+    "The homeserver the user you’re verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix kiszolgálóhoz kapcsolódik:",
     "Yours, or the other users’ internet connection": "A te vagy a másik felhasználó Internet kapcsolata",
     "Yours, or the other users’ session": "A te vagy a másik felhasználó munkamenete",
     "%(count)s sessions|other": "%(count)s munkamenet",
@@ -2147,9 +2147,9 @@
     "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló visszaállítása",
     "The version of Riot": "Riot verziója",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Olyan eszközön használod-e a Riotot, ahol az érintés az elsődleges beviteli mód",
-    "Whether you're using Riot as an installed Progressive Web App": "A Riotot progresszív webalkalmazásként használod-e",
+    "Whether you're using Riot as an installed Progressive Web App": "Progresszív webalkalmazásként használod-e a Riotot",
     "Your user agent": "Felhasználói ügynök",
-    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:",
+    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre, amivel jobbá tehetjük a Riotot:",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Az ellenőrizni kívánt munkamenet nem támogatja se a QR kód beolvasást se az emodzsi ellenőrzést, amit a Riot támogat. Próbáld meg egy másik klienssel.",
     "You declined": "Elutasítottad",
     "%(name)s declined": "%(name)s elutasította",
@@ -2171,8 +2171,8 @@
     "Order rooms by name": "Szobák rendezése név szerint",
     "Show rooms with unread notifications first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
     "Show shortcuts to recently viewed rooms above the room list": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
-    "Sign In or Create Account": "Belépés vagy Fiók Készítés",
-    "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat vagy készíts egy újat.",
+    "Sign In or Create Account": "Bejelentkezés vagy fiók létrehozása",
+    "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat, vagy hozz létre egy újat.",
     "Create Account": "Fiók létrehozása",
     "Displays information about a user": "A felhasználóról információ megjelenítése",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-szal kapcsolatos biztonsági hibák jelentésével kapcsolatban kérlek olvasd el a Matrix.org <a>Biztonsági hiba közzétételi szabályzatot</a>.",
@@ -2304,8 +2304,8 @@
     "Session backup key:": "Munkamenet másolat kulcs:",
     "Use Single Sign On to continue": "A folytatáshoz használd az egyszeri bejelentkezést (SSO)",
     "Single Sign On": "Egyszeri bejelentkezés",
-    "%(name)s is requesting verification": "%(name)s ellenőrzést kér",
-    "Sends a message as html, without interpreting it as markdown": "Az üzenet elküldése html szövegként anélkül, hogy „markdown” formázás lenne",
+    "%(name)s is requesting verification": "A(z) %(name)s ellenőrzést kér",
+    "Sends a message as html, without interpreting it as markdown": "Az üzenet elküldése html szövegként anélkül, hogy „markdown” formázásként értelmezné",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Erősítsd meg, hogy az alábbi emodzsik mindkét munkamenetben azonos sorrendben jelentek meg:",
     "Verify this session by confirming the following number appears on its screen.": "Ellenőrizd ezt a munkamenetet azzal, hogy megerősíted, hogy az alábbi szám jelent meg a kijelzőjén.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Az ellenőrzéshez a másik munkamenetedre várakozunk, %(deviceName)s (%(deviceId)s)…",
@@ -2348,8 +2348,8 @@
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt e-mail címet hozzáadod.",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt telefonszámot hozzáadod.",
     "If you cancel now, you won't complete your operation.": "A műveletet nem fejezed be, ha ezt most megszakítod.",
-    "Failed to set topic": "A téma beállítása nem sikerült",
-    "Command failed": "A parancs nem sikerült",
+    "Failed to set topic": "A téma beállítása sikertelen",
+    "Command failed": "A parancs sikertelen",
     "Could not find user in room": "A felhasználó nem található a szobában",
     "Enable cross-signing to verify per-user instead of per-session": "A felhasználó alapú ellenőrzéshez a munkamenet alapú helyett engedélyezd az eszközök közötti hitelesítést",
     "Keep recovery passphrase in memory for this session": "A visszaállítási jelmondat memóriában tartása ebben a munkamenetben",
@@ -2406,5 +2406,7 @@
     "Fetching keys from server...": "Kulcsok lekérdezése a szerverről…",
     "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s kulcs visszaállítva",
     "Keys restored": "Kulcsok visszaállítva",
-    "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva"
+    "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva",
+    "You signed in to a new session without verifying it:": "Ellenőrzés nélkül jelentkeztél be egy új munkamenetbe:",
+    "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével."
 }

From 0c5c2501e6df4e2805a6c37ec0383fc26fd62bd7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 6 May 2020 12:23:03 +0200
Subject: [PATCH 2707/3235] remove prefixes as we're using data urls now

---
 src/editor/parts.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/editor/parts.js b/src/editor/parts.js
index acd27ac219..0adc5573ea 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -259,7 +259,7 @@ class RoomPillPart extends PillPart {
             "crop");
         if (!avatarUrl) {
             initialLetter = Avatar.getInitialLetter(this._room ? this._room.name : this.resourceId);
-            avatarUrl = `../../${Avatar.defaultAvatarUrlForString(this._room ? this._room.roomId : this.resourceId)}`;
+            avatarUrl = Avatar.defaultAvatarUrlForString(this._room ? this._room.roomId : this.resourceId);
         }
         this._setAvatarVars(node, avatarUrl, initialLetter);
     }
@@ -291,18 +291,13 @@ class UserPillPart extends PillPart {
         }
         const name = this._member.name || this._member.userId;
         const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this._member.userId);
-        let avatarUrl = Avatar.avatarUrlForMember(
+        const avatarUrl = Avatar.avatarUrlForMember(
             this._member,
             16 * window.devicePixelRatio,
             16 * window.devicePixelRatio,
             "crop");
         let initialLetter = "";
         if (avatarUrl === defaultAvatarUrl) {
-            // the url from defaultAvatarUrlForString is meant to go in an img element,
-            // which has the base of the document. we're using it in css,
-            // which has the base of the theme css file, two levels deeper than the document,
-            // so go up to the level of the document.
-            avatarUrl = `../../${avatarUrl}`;
             initialLetter = Avatar.getInitialLetter(name);
         }
         this._setAvatarVars(node, avatarUrl, initialLetter);

From 626a3009163a6c6baf4b1a56a14cb0ff1d3b7bcc Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 6 May 2020 08:11:31 +0000
Subject: [PATCH 2708/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2304 of 2304 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5ea7e7a413..f7122b400c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2416,5 +2416,7 @@
     "Fetching keys from server...": "正在從伺服器擷取金鑰……",
     "%(completed)s of %(total)s keys restored": "%(total)s 中的 %(completed)s 金鑰已復原",
     "Keys restored": "金鑰已復原",
-    "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰"
+    "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰",
+    "You signed in to a new session without verifying it:": "您已登入新的工作階段但未驗證：",
+    "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。"
 }

From b57bb6b29144e700a3fe8d394d782ff9f86216a3 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 6 May 2020 09:35:11 +0000
Subject: [PATCH 2709/3235] Translated using Weblate (Esperanto)

Currently translated at 99.4% (2291 of 2304 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 | 92 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 89 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 42a6ed52ca..031aac3fb3 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -688,7 +688,7 @@
     "Submit debug logs": "Sendi sencimigan protokolon",
     "Fetching third party location failed": "Malsukcesis trovi lokon de ekstera liveranto",
     "A new version of Riot is available.": "Nova versio de Riot haveblas.",
-    "I understand the risks and wish to continue": "Mi komprenas la riskojn kaj volas daŭrigi",
+    "I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
     "Send Account Data": "Sendi kontajn informojn",
     "Advanced notification settings": "Specialaj agordoj de sciigoj",
     "Uploading report": "Alŝutante raporton",
@@ -1160,7 +1160,7 @@
     "View older messages in %(roomName)s.": "Montri pli malnovajn mesaĝojn en %(roomName)s.",
     "Account management": "Administrado de kontoj",
     "This event could not be displayed": "Ĉi tiu okazo ne povis montriĝi",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali <chromeLink>Ĥromon</chromeLink>, <firefoxLink>Fajrfokson</firefoxLink>, aŭ <safariLink>Safarion</safariLink> por la plej bonaj spertoj.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali foliumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vi estas administranto de tiu ĉi komunumo. Sen invito de alia administranto vi ne povos realiĝi.",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ŝanĝoj al viaj komunumaj <bold1>nomo</bold1> kaj <bold2>profilbildo</bold2> eble ne montriĝos al aliaj uzantoj ĝis 30 minutoj.",
     "Who can join this community?": "Kiu povas aliĝi al tiu ĉi komunumo?",
@@ -2294,5 +2294,91 @@
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Konfirmi aldonon de ĉi tiu retpoŝtadreso, uzante ununuran saluton por pruvi vian identecon.",
     "Single Sign On": "Ununura saluto",
     "Confirm adding email": "Konfirmi aldonon de retpoŝtadreso",
-    "Click the button below to confirm adding this email address.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu retpoŝtadreso."
+    "Click the button below to confirm adding this email address.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu retpoŝtadreso.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Konfirmu aldonon de ĉi tiu telefonnumero per identiĝo per ununura saluto.",
+    "Confirm adding phone number": "Konfirmu aldonon de telefonnumero",
+    "Click the button below to confirm adding this phone number.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu telefonnumero.",
+    "If you cancel now, you won't complete your operation.": "Se vi nuligos nun, vi ne finos vian agon.",
+    "Review where you’re logged in": "Kontrolu, kie vi salutis",
+    "New login. Was this you?": "Nova saluto. Ĉu tio estis vi?",
+    "%(name)s is requesting verification": "%(name)s petas kontrolon",
+    "Sends a message as html, without interpreting it as markdown": "Sendas mesaĝon kiel HTML, ne interpretante ĝin kiel MarkDown",
+    "Failed to set topic": "Malsukcesis agordi temon",
+    "Command failed": "Komando malsukcesis",
+    "Could not find user in room": "Ne povis trovi uzanton en ĉambro",
+    "Please supply a widget URL or embed code": "Bonvolu provizi URL-on al fenestraĵo aŭ enkorpigi kodon",
+    "Send a bug report with logs": "Sendi erarraporton kun protokolo",
+    "You signed in to a new session without verifying it:": "Vi salutis novan salutaĵon sen kontrolo:",
+    "Verify your other session using one of the options below.": "Kontrolu vian alian salutaĵon per unu el la ĉi-subaj elektebloj.",
+    "Enable cross-signing to verify per-user instead of per-session": "Permesi transirajn subskribojn por kontroli unuopajn uzantojn anstataŭ salutaĵojn",
+    "Keep recovery passphrase in memory for this session": "Teni rehavan pasfrazon en memoro dum ĉi tiu salutaĵo",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj aperas samorde en ambaŭ salutaĵoj:",
+    "Verify this session by confirming the following number appears on its screen.": "Kontrolu ĉi tiun salutaĵon per konfirmo, ke la jena nombro aperas sur ĝia ekrano.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Atendante konfirmon de via alia salutaĵo, %(deviceName)s (%(deviceId)s)…",
+    "Verify all your sessions to ensure your account & messages are safe": "Kontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj sekuras",
+    "Verify the new login accessing your account: %(name)s": "Kontrolu la novan saluton alirantan vian konton: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
+    "well formed": "bone formita",
+    "unexpected type": "neatendita tipo",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Konfirmu forigon de ĉi tiuj salutaĵoj per identiĝo per ununura saluto.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Konfirmu forigon de ĉi tiu salutaĵo per identiĝo per ununura saluto.",
+    "Confirm deleting these sessions": "Konfirmi forigon de ĉi tiuj salutaĵoj",
+    "Click the button below to confirm deleting these sessions.|other": "Klaku la ĉi-suban butonon por konfirmi forigon de ĉi tiuj salutaĵoj.",
+    "Click the button below to confirm deleting these sessions.|one": "Klaku la ĉi-suban butonon por konfirmi forigon de ĉi tiu salutaĵo.",
+    "Delete sessions|other": "Forigi salutaĵojn",
+    "Delete sessions|one": "Forigi salutaĵon",
+    "Where you’re logged in": "Kie vi salutis",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Sube administru la nomojn de viaj salutaĵoj kaj ilin adiaŭu, aŭ <a>kontrolu ilin en via profilo de uzanto</a>.",
+    "Waiting for you to accept on your other session…": "Atendante vian akcepton en via alia salutaĵo…",
+    "Almost there! Is your other session showing the same shield?": "Preskaŭ finite! Ĉu via alia salutaĵo montras la saman ŝildon?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Preskaŭ finite! Ĉu %(displayName)s montras la saman ŝildon?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Vi sukcese kontrolis %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "Rekomencu kontroladon el la sciigo.",
+    "Start verification again from their profile.": "Rekomencu kontroladon el ĝia profilo.",
+    "Verification timed out.": "Kontrolo atingis tempolimon.",
+    "You cancelled verification on your other session.": "Vi nuligis kontrolon en via alia salutaĵo.",
+    "%(displayName)s cancelled verification.": "%(displayName)s nuligis kontrolon.",
+    "You cancelled verification.": "Vi nuligis kontrolon.",
+    "Can't load this message": "Ne povas enlegi ĉi tiun mesaĝon",
+    "Submit logs": "Alŝuti protokolon",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Rememorigo: via foliumilo ne estas subtenata, kaj via sperto do povas esti stranga.",
+    "Enable end-to-end encryption": "Ŝalti tutvojan ĉifradon",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Vi ne povas ĉi tion malŝalti poste. Pontoj kaj plej multaj robotoj ankoraŭ ne funkcios.",
+    "Server did not require any authentication": "Servilo bezonis nenian kontrolon de aŭtentiko",
+    "Server did not return valid authentication information.": "Servilo ne redonis validajn informojn pri kontrolo de aŭtentiko.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Knfirmu malaktivigon de via konto per identiĝo per ununura saluto.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ĉu vi certe volas malaktivigi vian konton? Tio ne malfareblas.",
+    "Confirm account deactivation": "Konfirmi malaktivigon de konto",
+    "There was a problem communicating with the server. Please try again.": "Eraris komunikado kun la servilo. Bonvolu reprovi.",
+    "Unable to upload": "Ne povas alŝuti",
+    "Verify other session": "Kontroli alian salutaĵon",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ne povas aliri sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Averto</b>: vi faru ĉi tion nur per fidata komputilo.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se vi forgesis vian rehavan pasfrazon, vi povas <button1>uzi vian rehavan ŝlosilon</button1> aŭ <button2>agordi novajn rehavajn elekteblojn</button2>.",
+    "Restoring keys from backup": "Rehavo de ŝlosiloj el savkopio",
+    "Fetching keys from server...": "Akirante ŝlosilojn el servilo…",
+    "%(completed)s of %(total)s keys restored": "%(completed)s el %(total)s ŝlosiloj rehaviĝis",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava pasfrazo: bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
+    "Keys restored": "Ŝlosiloj rehaviĝis",
+    "Successfully restored %(sessionCount)s keys": "Sukcese rehavis %(sessionCount)s ŝlosilojn",
+    "Sign in with SSO": "Saluti per ununura saluto",
+    "Welcome to %(appName)s": "Bonvenu al %(appName)s",
+    "Liberate your communication": "Liberigu vian komunikadon",
+    "Send a Direct Message": "Sendi rektan mesaĝon",
+    "Explore Public Rooms": "Esplori publikajn ĉambrojn",
+    "Create a Group Chat": "Krei grupan babilon",
+    "Self-verification request": "Memkontrola peto",
+    "Verify this login": "Kontroli ĉi tiun saluton",
+    "Syncing...": "Spegulante…",
+    "Signing In...": "Salutante…",
+    "If you've joined lots of rooms, this might take a while": "Se vi aliĝis al multaj ĉambroj, tio povas daŭri longe",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Konfirmu vian identecon per kontrolo de ĉi tiu saluto el unu el viaj aliaj salutaĵoj, permesante al ĝi legadon de ĉifritaj mesaĝoj.",
+    "This requires the latest Riot on your other devices:": "Ĉi tio bezonas la plej freŝan version de Rion sur viaj aliaj aparatoj:",
+    "or another cross-signing capable Matrix client": "aŭ alian Matrix-klienton kapablan je transiraj subskriboj",
+    "Use Recovery Passphrase or Key": "Uzi rehavajn pasfrazon aŭ ŝlosilon",
+    "Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Agordu rehavan pasfrazon por sekurigi ĉifritajn informojn kaj rehavi ilin post adiaŭo. Ĝi malsamu al la pasvorto de via konto:",
+    "Enter a recovery passphrase": "Enigu rehavan pasfrazon",
+    "Back up encrypted message keys": "Savkopii ŝlosilojn al ĉifritaj mesaĝoj"
 }

From 85524a053eb2a8f134cbe5d53eea3f8742507160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 6 May 2020 06:44:07 +0000
Subject: [PATCH 2710/3235] Translated using Weblate (French)

Currently translated at 100.0% (2304 of 2304 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 d3c671a898..74c3e6e959 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2417,5 +2417,7 @@
     "Fetching keys from server...": "Récupération des clés depuis le serveur…",
     "%(completed)s of %(total)s keys restored": "%(completed)s clés sur %(total)s restaurées",
     "Keys restored": "Clés restaurées",
-    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès"
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès",
+    "You signed in to a new session without verifying it:": "Vous vous êtes connecté·e à une nouvelle session sans la vérifier :",
+    "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous."
 }

From 3fd089d084d8776af9c2108ce6c9952f567c82b3 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 6 May 2020 05:11:52 +0000
Subject: [PATCH 2711/3235] Translated using Weblate (Japanese)

Currently translated at 54.9% (1264 of 2304 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 | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 7e7c1443a4..024f6cd2c4 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -305,7 +305,7 @@
     "Define the power level of a user": "ユーザーの権限レベルを定義",
     "Deops user with given id": "指定されたIDのユーザーを非表示",
     "Opens the Developer Tools dialog": "開発者ツールダイアログを開きます",
-    "Verified key": "確認済みのキー",
+    "Verified key": "検証済みの鍵",
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
     "Reason": "理由",
@@ -953,8 +953,8 @@
     "Open Devtools": "開発ツールを開く",
     "Flair": "バッジ",
     "Fill screen": "フィルスクリーン",
-    "Light theme": "明るいテーマ",
-    "Dark theme": "暗いテーマ",
+    "Light theme": "ライトテーマ",
+    "Dark theme": "ダークテーマ",
     "Unignore": "無視しない",
     "Unable to load! Check your network connectivity and try again.": "ロードできません！ ネットワーク通信を確認の上もう一度お試しください。",
     "Failed to invite users to the room:": "部屋にユーザーを招待できませんでした:",
@@ -1272,5 +1272,32 @@
     "Enter your custom homeserver URL <a>What does this mean?</a>": "独自のホームサーバー URL を入力 <a>詳細情報</a>",
     "Homeserver URL": "ホームサーバー URL",
     "Sign in instead": "サインインする",
-    "Create your account": "アカウントの作成"
+    "Create your account": "アカウントの作成",
+    "Verify this session": "このセッションの検証",
+    "Encryption upgrade available": "暗号化のアップグレードが利用できます",
+    "Not Trusted": "まだ信頼されていません",
+    "Manually Verify by Text": "テキストを使って手動で検証",
+    "Interactively verify by Emoji": "絵文字を使って検証",
+    "Done": "戻る",
+    "Later": "後で",
+    "Review": "検証",
+    "Verify yourself & others to keep your chats safe": "あなたと他の人々とのチャットの安全性を検証",
+    "Upgrade": "アップグレード",
+    "Verify": "検証",
+    "Invite only": "招待者のみ参加可能",
+    "Trusted": "信頼済み",
+    "Not trusted": "未信頼",
+    "%(count)s verified sessions|other": "%(count)s 件の検証済みのセッション",
+    "%(count)s verified sessions|one": "1 件の検証済みのセッション",
+    "Hide verified sessions": "検証済みのセッションを隠す",
+    "%(count)s sessions|other": "%(count)s 件のセッション",
+    "%(count)s sessions|one": "%(count)s 件のセッション",
+    "Hide sessions": "セッションを隠す",
+    "Security": "セキュリティ",
+    "Welcome to %(appName)s": "%(appName)s へようこそ",
+    "Liberate your communication": "あなたのコミュニケーションを解放する",
+    "Send a Direct Message": "ダイレクトメッセージを送信",
+    "Explore Public Rooms": "公開された部屋を探す",
+    "Create a Group Chat": "グループチャットを作成",
+    "Go Back": "戻る"
 }

From c74537383a9246ad688a16aecf0564f7bb5ce894 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Wed, 6 May 2020 00:17:44 +0000
Subject: [PATCH 2712/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 50.1% (1155 of 2304 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index da3b56ccc5..fe6ca61a49 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1138,5 +1138,31 @@
     "Signing In...": "Logger inn …",
     "NOT verified": "IKKE verifisert",
     "Calls": "Samtaler",
-    "Room List": "Romliste"
+    "Room List": "Romliste",
+    "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldinger til uverifiserte økter fra denne økten",
+    "Verify yourself & others to keep your chats safe": "Verifiser deg selv og andre for å holde samtalene dine trygge",
+    "Cross-signing and secret storage are enabled.": "Kryssignering og hemmelig lagring er skrudd på.",
+    "Cross-signing and secret storage are not yet set up.": "Kryssignering og hemmelig lagring er ikke satt enda.",
+    "Reset cross-signing and secret storage": "Tilbakestill kryssignering og hemmelig lagring",
+    "Bootstrap cross-signing and secret storage": "Iverksett kryssignering og hemmelig lagring",
+    "Cross-signing public keys:": "Offentlige nøkler for kryssignering:",
+    "Cross-signing private keys:": "Private nøkler for kryssignering:",
+    "Self signing private key:": "Selvsignert privat nøkkel:",
+    "User signing private key:": "Brukersignert privat nøkkel:",
+    "Session backup key:": "Øktsikkerhetskopieringsnøkkel:",
+    "Secret storage public key:": "Offentlig nøkkel for hemmelig lagring:",
+    "Homeserver feature support:": "Hjemmetjener-funksjonsstøtte:",
+    "Secret Storage key format:": "Nøkkelformatet for hemmelig lagring:",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot kan ikke lagre krypterte meldinger sikkert når den kjøres i en nettleser. Bruk <riotLink>Riot Desktop</riotLink> for at krypterte meldinger skal dukke opp i søkeresultater.",
+    "Read Marker lifetime (ms)": "Lesemarkørens visningstid (ms)",
+    "Read Marker off-screen lifetime (ms)": "Lesemarkørens visningstid utenfor skjermen (ms)",
+    "Cross-signing": "Kryssignering",
+    "Where you’re logged in": "Der du er pålogget",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Behandle navnene til samt logge av dine økter nedenfor eller <a>verifiser dem i brukerprofilen din</a>.",
+    "Learn more about how we use analytics.": "Lær mer om hvordan vi bruker statistikker.",
+    "To link to this room, please add an alias.": "For å lenke til dette rommet, vennligst legg til et alias.",
+    "Showing flair for these communities:": "Viser merkeskilt for disse samfunnene:",
+    "URL previews are enabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd på som standard for deltakerene i dette rommet.",
+    "URL previews are disabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd av som standard for deltakerene i dette rommet.",
+    "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.": "I krypterte rom som denne, er URL-forhåndsvisninger skrudd av som standard for å sikre at hjemmetjeneren din (der forhåndsvisningene blir generert) ikke kan samle inn informasjon om lenkene som du ser i dette rommet."
 }

From d3a276c627995514a5ad45a10c6086541cbfe0d7 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 6 May 2020 12:45:54 +0000
Subject: [PATCH 2713/3235] Translated using Weblate (Japanese)

Currently translated at 54.9% (1266 of 2304 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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 024f6cd2c4..c39500d816 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1183,7 +1183,7 @@
     "Display Name": "表示名",
     "Profile picture": "プロフィール画像",
     "Encryption enabled": "暗号化が有効です",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "この部屋内のメッセージはエンドツーエンドで暗号化されます。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
     "Encryption not enabled": "暗号化が無効です",
     "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。",
     "Cross-signing public keys:": "クロス署名公開鍵:",
@@ -1299,5 +1299,7 @@
     "Send a Direct Message": "ダイレクトメッセージを送信",
     "Explore Public Rooms": "公開された部屋を探す",
     "Create a Group Chat": "グループチャットを作成",
-    "Go Back": "戻る"
+    "Go Back": "戻る",
+    "Messages in this room are end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。",
+    "Messages in this room are not end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されていません。"
 }

From 1767a611a6cb456cb504c97a3e1be04c710bc844 Mon Sep 17 00:00:00 2001
From: Dan Jenkins <dan@nimblea.pe>
Date: Wed, 6 May 2020 16:23:06 +0100
Subject: [PATCH 2714/3235] set the meta tag for theme-color to the same theme
 css background

---
 src/theme.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/theme.js b/src/theme.js
index ab5974f207..2ccce81a8d 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -242,6 +242,10 @@ export async function setTheme(theme) {
                 if (a == styleElements[stylesheetName]) return;
                 a.disabled = true;
             });
+            const bodyStyles = global.getComputedStyle(document.getElementsByTagName("body")[0]);
+            if (bodyStyles.backgroundColor) {
+                document.querySelector('meta[name="theme-color"]').content = bodyStyles.backgroundColor;
+            }
             Tinter.setTheme(theme);
             resolve();
         };

From c750c28af9195334c265af10652d1fe1efa39848 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 6 May 2020 13:12:27 +0000
Subject: [PATCH 2715/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2304 of 2304 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 031aac3fb3..0c7312fcf9 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2380,5 +2380,18 @@
     "Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Agordu rehavan pasfrazon por sekurigi ĉifritajn informojn kaj rehavi ilin post adiaŭo. Ĝi malsamu al la pasvorto de via konto:",
     "Enter a recovery passphrase": "Enigu rehavan pasfrazon",
-    "Back up encrypted message keys": "Savkopii ŝlosilojn al ĉifritaj mesaĝoj"
+    "Back up encrypted message keys": "Savkopii ŝlosilojn al ĉifritaj mesaĝoj",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Atingu vian sekuran historion de mesaĝoj kaj vian transire subskriban identecon per enigo de via rehava pasfrazo.",
+    "Enter your recovery passphrase a second time to confirm it.": "Enigu vian rehavan pasfrazon duafoje por konfirmi ĝin.",
+    "Confirm your recovery passphrase": "Konfirmi vian rehavan pasfrazon",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Via rehava ŝlosilo asekuras vin – vi povas ĝin uzi por rehavi aliron al viaj ĉifritaj mesaĝoj se vi forgesas vian rehavan pasfrazon.",
+    "Unable to query secret storage status": "Ne povis peti staton de sekreta deponejo",
+    "Confirm recovery passphrase": "Konfirmi rehavan pasfrazon",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ni deponos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Sekurigu vian savkopion per rehava pasfrazo.",
+    "Enter a recovery passphrase...": "Enigu rehavan pasfrazon…",
+    "Please enter your recovery passphrase a second time to confirm.": "Bonvolu enigi vian rehavan pasfrazon duafoje por konfirmi.",
+    "Repeat your recovery passphrase...": "Ripetu vian rehavan pasfrazon…",
+    "Secure your backup with a recovery passphrase": "Sekurigu vian savkopion per rehava pasfrazo",
+    "Currently indexing: %(currentRoom)s": "Nun indeksante: %(currentRoom)s",
+    "Cancel replying to a message": "Nuligi respondon al mesaĝo"
 }

From c42755c69343c576a90ca036a35a8888793c301a Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 6 May 2020 15:44:47 +0000
Subject: [PATCH 2716/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2304 of 2304 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 78abb0e53e..e8012733c3 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2412,5 +2412,7 @@
     "Fetching keys from server...": "Ricezione delle chiavi dal server...",
     "%(completed)s of %(total)s keys restored": "%(completed)s di %(total)s chiavi ripristinate",
     "Keys restored": "Chiavi ripristinate",
-    "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente"
+    "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente",
+    "You signed in to a new session without verifying it:": "Hai fatto l'accesso ad una nuova sessione senza verificarla:",
+    "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto."
 }

From fe00c23be88b7ba8f1a4f330d2279b7ac6c3b1b8 Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 6 May 2020 12:53:40 +0000
Subject: [PATCH 2717/3235] Translated using Weblate (Japanese)

Currently translated at 55.2% (1272 of 2304 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, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index c39500d816..4188464408 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1301,5 +1301,11 @@
     "Create a Group Chat": "グループチャットを作成",
     "Go Back": "戻る",
     "Messages in this room are end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。",
-    "Messages in this room are not end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されていません。"
+    "Messages in this room are not end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されていません。",
+    "You signed in to a new session without verifying it:": "あなたのこのセッションはまだ検証されていません：",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) のこのセッションはまだ検証されていません：",
+    "Recent Conversations": "最近会話したユーザー",
+    "Suggestions": "提案",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "相手の名前、( <userId/> のような)ユーザー名、メールアドレスを使って会話を開始できます。",
+    "Go": "続行"
 }

From bab7d5f461a6c51d142fe9ff7d5be6cd4cfd9bbb Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 6 May 2020 17:25:54 +0100
Subject: [PATCH 2718/3235] Some lints

---
 res/css/views/elements/_Slider.scss                | 12 ++++++------
 res/themes/light/css/_light.scss                   |  4 ++--
 src/FontWatcher.js                                 | 12 ++++++------
 src/components/views/elements/Slider.tsx           |  2 +-
 .../tabs/user/AppearanceUserSettingsTab.js         | 14 +++++++-------
 src/settings/Settings.js                           |  6 +++---
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index f6982865db..09afb58b12 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -38,7 +38,7 @@ limitations under the License.
 
 .mx_Slider_bar > hr {
     width: 100%;
-    border: 0.2em solid $Slider-background-color;
+    border: 0.2em solid $slider-background-color;
 }
 
 .mx_Slider_selection {
@@ -54,7 +54,7 @@ limitations under the License.
     position: absolute;
     width: 1.1em;
     height: 1.1em;
-    background-color: $Slider-selection-color;
+    background-color: $slider-selection-color;
     border-radius: 50%;
     box-shadow: 0 0 6px lightgrey;
     z-index: 10;
@@ -63,7 +63,7 @@ limitations under the License.
 .mx_Slider_selection > hr {
     transition: width 0.25s;
     margin: 0;
-    border: 0.2em solid $Slider-selection-color;
+    border: 0.2em solid $slider-selection-color;
 }
 
 .mx_Slider_dot {
@@ -71,19 +71,19 @@ limitations under the License.
     height: 1em;
     width: 1em;
     border-radius: 50%;
-    background-color: $Slider-background-color;
+    background-color: $slider-background-color;
     z-index: 0;
 }
 
 .mx_Slider_dotActive {
-    background-color: $Slider-selection-color;
+    background-color: $slider-selection-color;
 }
 
 .mx_Slider_dotValue {
     display: flex;
     flex-direction: column;
     align-items: center;
-    color: $Slider-background-color;
+    color: $slider-background-color;
 }
 
 // The following is a hack to center the labels without adding
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index ed7eae48f7..78fe2a74c5 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -263,8 +263,8 @@ $togglesw-on-color: $accent-color;
 $togglesw-ball-color: #fff;
 
 // Slider
-$Slider-selection-color: $accent-color;
-$Slider-background-color: #c1c9d6;
+$slider-selection-color: $accent-color;
+$slider-background-color: #c1c9d6;
 
 $progressbar-color: #000;
 
diff --git a/src/FontWatcher.js b/src/FontWatcher.js
index 2e37921ee6..561edc4662 100644
--- a/src/FontWatcher.js
+++ b/src/FontWatcher.js
@@ -23,7 +23,7 @@ export class FontWatcher {
     }
 
     start() {
-        this._setRootFontSize(SettingsStore.getValue("font_size"));
+        this._setRootFontSize(SettingsStore.getValue("fontSize"));
         this._dispatcherRef = dis.register(this._onAction);
     }
 
@@ -37,15 +37,15 @@ export class FontWatcher {
         }
     };
 
-    _setRootFontSize = size => {
-        const min = SettingsStore.getValue("font_size_min");
-        const max = SettingsStore.getValue("font_size_max");
+    _setRootFontSize = (size) => {
+        const min = SettingsStore.getValue("fontSizeMin");
+        const max = SettingsStore.getValue("fontSizeMax");
 
         const fontSize = Math.max(Math.min(max, size), min);
 
         if (fontSize != size) {
-            SettingsStore.setValue("font_size", null, SettingLevel.Device, fontSize);
+            SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
         }
         document.querySelector(":root").style.fontSize = fontSize + "px";
-    }
+    };
 }
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index adb2a6063b..e181f0d9e3 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -47,7 +47,7 @@ export default class Slider extends React.Component<IProps> {
         // the index of the first number greater than value.
         let closest = values.reduce((prev, curr) => {
             return (value > curr ? prev + 1 : prev);
-          }, 0);
+        }, 0);
 
         // Off the left
         if (closest === 0) {
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 6fd44b691d..ac98664be0 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -32,7 +32,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
         super();
 
         this.state = {
-            fontSize: SettingsStore.getValue("font_size", null),
+            fontSize: SettingsStore.getValue("fontSize", null),
             ...this._calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
@@ -102,15 +102,15 @@ export default class AppearanceUserSettingsTab extends React.Component {
 
     _onFontSizeChanged = (size) => {
         this.setState({fontSize: size});
-        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, size);
+        SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, size);
     };
 
     _onValidateFontSize = ({value}) => {
         console.log({value});
 
         const parsedSize = parseFloat(value);
-        const min = SettingsStore.getValue("font_size_min");
-        const max = SettingsStore.getValue("font_size_max");
+        const min = SettingsStore.getValue("fontSizeMin");
+        const max = SettingsStore.getValue("fontSizeMax");
 
         if (isNaN(parsedSize)) {
             return {valid: false, feedback: _t("Size must be a number")};
@@ -123,7 +123,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
             };
         }
 
-        SettingsStore.setValue("font_size", null, SettingLevel.DEVICE, value);
+        SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, value);
         return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
     }
 
@@ -253,8 +253,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
                     values={_range(
-                        SettingsStore.getValue("font_size_min"),
-                        SettingsStore.getValue("font_size_max")+ 2,
+                        SettingsStore.getValue("fontSizeMin"),
+                        SettingsStore.getValue("fontSizeMax")+ 2,
                         2.5,
                     )}
                     value={this.state.fontSize}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index f14dc252ea..34610c0caf 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -165,18 +165,18 @@ export const SETTINGS = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "font_size": {
+    "fontSize": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: 16,
         controller: new FontSizeController(),
     },
-    "font_size_min": {
+    "fontSizeMin": {
         displayName: _td("Min font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: 14,
     },
-    "font_size_max": {
+    "fontSizeMax": {
         displayName: _td("Max font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: 24,

From 7eea8277c54848b5a876e0e57292a2abd92e6588 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 6 May 2020 16:18:12 +0000
Subject: [PATCH 2719/3235] Translated using Weblate (Albanian)

Currently translated at 99.9% (2301 of 2304 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 | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7e94977f63..2232da27e0 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -213,7 +213,7 @@
     "Invite to this room": "Ftojeni te kjo dhomë",
     "You cannot delete this message. (%(code)s)": "S’mund ta fshini këtë mesazh. (%(code)s)",
     "Thursday": "E enjte",
-    "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dua të vazhdoj",
+    "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dëshiroj të vazhdoj",
     "Logs sent": "Regjistrat u dërguan",
     "Back": "Mbrapsht",
     "Reply": "Përgjigje",
@@ -1347,7 +1347,7 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Pasi të aktivizohet, fshehtëzimi për një dhomë nuk mund të çaktivizohet. Mesazhet e dërguar në një dhomë të fshehtëzuar s’mund të shihen nga shërbyesi, vetëm nga pjesëmarrësit në dhomë. Aktivizimi i fshehtëzimit mund të pengojë funksionimin si duhet të mjaft robotëve dhe urave. <a>Mësoni më tepër rreth fshehtëzimit.</a>",
     "Want more than a community? <a>Get your own server</a>": "Doni më shumë se një bashkësi? <a>Merrni një shërbyes tuajin</a>",
     "Power level": "Shkallë pushteti",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Për funksionimin më të mirë, ju lutemi, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ju lutemi, për funksionimin më të mirë, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
     "A conference call could not be started because the integrations server is not available": "S’u nis dot një thirrje konferencë, ngaqë shërbyesi i integrimit s’është i kapshëm",
     "Replying With Files": "Përgjigje Me Kartela",
     "The file '%(fileName)s' failed to upload.": "Dështoi ngarkimi i kartelës '%(fileName)s'.",
@@ -2378,5 +2378,35 @@
     "Enter a recovery passphrase...": "Jepni një frazëkalim rimarrjesh…",
     "Please enter your recovery passphrase a second time to confirm.": "Ju lutemi, jepeni frazëkalimin tuaj të rimarrjeve edhe një herë, për ta ripohuar.",
     "Repeat your recovery passphrase...": "Përsëritni frazëkalimin tuaj të rimarrjeve…",
-    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh"
+    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh",
+    "Review where you’re logged in": "Shqyrtojini kur të jeni i futur",
+    "New login. Was this you?": "Hyrje e re. Ju qetë?",
+    "Please supply a widget URL or embed code": "Ju lutemi, furnizoni një URL widget-i ose kod trupëzimi",
+    "Send a bug report with logs": "Dërgoni një njoftim të metash me regjistra",
+    "You signed in to a new session without verifying it:": "Bëtë hyrjen në një sesion të ri pa e verifikuar:",
+    "Verify your other session using one of the options below.": "Verifikoni sesionit tuaj tjetër duke përdorur një nga mundësitë më poshtë.",
+    "Enable cross-signing to verify per-user instead of per-session": "Aktivizoni <em>cross-signing</em> për të verifikuar me bazë përdorues në vend se me bazë sesioni",
+    "Lock": "Kyçje",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifikoni krejt sesionet tuaj që të siguroheni se llogaria & mesazhet tuaja janë të sigurt",
+    "Verify the new login accessing your account: %(name)s": "Verifikoni kredencialet e reja për hyrje te llogaria juaj: %(name)s",
+    "Cross-signing": "<em>Cross-signing</em>",
+    "Where you’re logged in": "Kur të jeni i futur",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Administroni emrat dhe bëni daljen pre sesioneve tuaj më poshtë ose <a>verifikojini te Profili juaj i Përdoruesit</a>.",
+    "Reset": "Rikthe te parazgjedhjet",
+    "Can't load this message": "S’ngarkohet dot ky mesazh",
+    "Submit logs": "Parashtro regjistra",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Kujtesë: Shfletuesi juaj është i pambuluar, ndaj punimi juaj mund të jetë i paparashikueshëm.",
+    "Unable to upload": "S’arrihet të ngarkohet",
+    "Restoring keys from backup": "Po rikthehen kyçesh nga kopjeruajtje",
+    "Fetching keys from server...": "Po sillen kyçet prej shërbyesi…",
+    "%(completed)s of %(total)s keys restored": "U rikthyen %(completed)s nga %(total)s kyçe",
+    "Keys restored": "Kyçet u rikthyen",
+    "Successfully restored %(sessionCount)s keys": "U rikthyen me sukses %(sessionCount)s kyçe",
+    "Verify this login": "Verifikoni këto kredenciale hyrjeje",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjesh prej një nga sesionet tuaj të tjerë, duke i akorduar hyrje te mesazhet e fshehtëzuar.",
+    "This requires the latest Riot on your other devices:": "Kjo lyp Riot-in më të ri te pajisjet tuaja të tjera:",
+    "or another cross-signing capable Matrix client": "ose një tjetër klient Matrix i aftë për <em>cross-signing</em",
+    "Use Recovery Passphrase or Key": "Përdorni Frazëkalim Rikthimesh ose Kyç",
+    "Unable to query secret storage status": "S’u arrit të merret gjendje depozite të fshehtë",
+    "Currently indexing: %(currentRoom)s": "Indeksim aktual: %(currentRoom)s"
 }

From 76a5c3133850febfa252a2ce878bf44bc3672a20 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 6 May 2020 17:38:00 +0000
Subject: [PATCH 2720/3235] Translated using Weblate (Albanian)

Currently translated at 99.8% (2300 of 2304 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 2232da27e0..ee2781f445 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1100,7 +1100,7 @@
     "Developer options": "Mundësi zhvilluesi",
     "General": "Të përgjithshme",
     "Room Addresses": "Adresa Dhomash",
-    "Set a new account password...": "Caktoni një fjalëkalim të rri llogarie…",
+    "Set a new account password...": "Caktoni një fjalëkalim të ri llogarie…",
     "Email addresses": "Adresa email",
     "Phone numbers": "Numra telefonash",
     "Language and region": "Gjuhë dhe rajon",

From cff7ce3934ef03659d75881f59b8f6559bcca678 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 6 May 2020 18:48:53 +0000
Subject: [PATCH 2721/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2304 of 2304 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 5eebbe8478..afad390192 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2408,5 +2408,6 @@
     "Keys restored": "Kulcsok visszaállítva",
     "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva",
     "You signed in to a new session without verifying it:": "Ellenőrzés nélkül jelentkeztél be egy új munkamenetbe:",
-    "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével."
+    "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>."
 }

From d31a0199bc60d0e007f98f0af692fd58e9f6209c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 May 2020 14:24:16 -0600
Subject: [PATCH 2722/3235] Add default dialog aesthetics to avoid empty SSO
 dialogs in future

---
 .../views/dialogs/InteractiveAuthDialog.js    | 32 +++++++++++++++++--
 src/i18n/strings/en_EN.json                   |  3 ++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index af5dc5108c..d9cc13e11c 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -25,6 +25,7 @@ import { _t } from '../../../languageHandler';
 
 import AccessibleButton from '../elements/AccessibleButton';
 import {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
+import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 
 export default createReactClass({
     displayName: 'InteractiveAuthDialog',
@@ -66,6 +67,8 @@ export default createReactClass({
         //         }
         //     }
         // }
+        //
+        // Default is defined in _getDefaultDialogAesthetics()
         aestheticsForStagePhases: PropTypes.object,
     },
 
@@ -79,6 +82,28 @@ export default createReactClass({
         };
     },
 
+    _getDefaultDialogAesthetics: function() {
+        const ssoAesthetics = {
+            [SSOAuthEntry.PHASE_PREAUTH]: {
+                title: _t("Use Single Sign On to continue"),
+                body: _t("To continue, use Single Sign On to prove your identity."),
+                continueText: _t("Single Sign On"),
+                continueKind: "primary",
+            },
+            [SSOAuthEntry.PHASE_POSTAUTH]: {
+                title: _t("Confirm to continue"),
+                body: _t("Click the button below to confirm your identity."),
+                continueText: _t("Confirm"),
+                continueKind: "primary",
+            },
+        };
+
+        return {
+            [SSOAuthEntry.LOGIN_TYPE]: ssoAesthetics,
+            [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: ssoAesthetics,
+        }
+    },
+
     _onAuthFinished: function(success, result) {
         if (success) {
             this.props.onFinished(true, result);
@@ -113,9 +138,10 @@ export default createReactClass({
         let body = this.state.authError ? null : this.props.body;
         let continueText = null;
         let continueKind = null;
-        if (!this.state.authError && this.props.aestheticsForStagePhases) {
-            if (this.props.aestheticsForStagePhases[this.state.uiaStage]) {
-                const aesthetics = this.props.aestheticsForStagePhases[this.state.uiaStage][this.state.uiaStagePhase];
+        const dialogAesthetics = this.props.aestheticsForStagePhases || this._getDefaultDialogAesthetics();
+        if (!this.state.authError && dialogAesthetics) {
+            if (dialogAesthetics[this.state.uiaStage]) {
+                const aesthetics = dialogAesthetics[this.state.uiaStage][this.state.uiaStagePhase];
                 if (aesthetics && aesthetics.title) title = aesthetics.title;
                 if (aesthetics && aesthetics.body) body = aesthetics.body;
                 if (aesthetics && aesthetics.continueText) continueText = aesthetics.continueText;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a24b2bde73..dc92ef310d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1639,6 +1639,9 @@
     "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
     "Integrations not allowed": "Integrations not allowed",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "To continue, use Single Sign On to prove your identity.": "To continue, use Single Sign On to prove your identity.",
+    "Confirm to continue": "Confirm to continue",
+    "Click the button below to confirm your identity.": "Click the button below to confirm your identity.",
     "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
     "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",

From 17be9805e15c094fc1942deb30eb7f57bccdcf9e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 May 2020 14:24:37 -0600
Subject: [PATCH 2723/3235] Set SSO dialog aesthetics for cross-signing setup

Fixes https://github.com/vector-im/riot-web/issues/13042
---
 .../CreateSecretStorageDialog.js              | 21 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 2c05f231e7..c8ddd361fc 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -25,6 +25,7 @@ import { _t } from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 import {copyNode} from "../../../../utils/strings";
+import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
 
 const PHASE_LOADING = 0;
 const PHASE_LOADERROR = 1;
@@ -209,12 +210,32 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             });
         } else {
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
+
+            const dialogAesthetics = {
+                [SSOAuthEntry.PHASE_PREAUTH]: {
+                    title: _t("Use Single Sign On to continue"),
+                    body: _t("To continue, use Single Sign On to prove your identity."),
+                    continueText: _t("Single Sign On"),
+                    continueKind: "primary",
+                },
+                [SSOAuthEntry.PHASE_POSTAUTH]: {
+                    title: _t("Confirm encryption setup"),
+                    body: _t("Click the button below to confirm setting up encryption."),
+                    continueText: _t("Confirm"),
+                    continueKind: "primary",
+                },
+            };
+
             const { finished } = Modal.createTrackedDialog(
                 'Cross-signing keys dialog', '', InteractiveAuthDialog,
                 {
                     title: _t("Setting up keys"),
                     matrixClient: MatrixClientPeg.get(),
                     makeRequest,
+                    aestheticsForStagePhases: {
+                        [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+                        [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+                    },
                 },
             );
             const [confirmed] = await finished;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dc92ef310d..7d2e016394 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2193,6 +2193,8 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
+    "Confirm encryption setup": "Confirm encryption setup",
+    "Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
     "Restore": "Restore",

From b8fd50c5e328058a0928ff007c22e959b843de6d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 May 2020 14:27:32 -0600
Subject: [PATCH 2724/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index d9cc13e11c..b06ce63ecd 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -101,7 +101,7 @@ export default createReactClass({
         return {
             [SSOAuthEntry.LOGIN_TYPE]: ssoAesthetics,
             [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: ssoAesthetics,
-        }
+        };
     },
 
     _onAuthFinished: function(success, result) {

From e5da81b6ba3ed6ba9274504f66ca6aed06b7fcb4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 May 2020 14:42:03 -0600
Subject: [PATCH 2725/3235] Ensure key backup gets dealt with correctly during
 secret storage reset

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

We only initialize a new key backup if the user requested one. If they've requested new keys but have not asked for keys to be backed up, we simply delete the now-invalid backup.

This also adds some logging to identify in rageshakes when someone resets their cross-signing, and when their key backup is being deleted.
---
 .../dialogs/secretstorage/CreateSecretStorageDialog.js | 10 +++++++++-
 src/components/views/settings/CrossSigningPanel.js     |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 2c05f231e7..9d07628093 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -236,12 +236,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         try {
             if (force) {
+                console.log("Forcing secret storage reset"); // log something so we can debug this later
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                     createSecretStorageKey: async () => this._recoveryKey,
-                    setupNewKeyBackup: true,
+                    setupNewKeyBackup: this.state.useKeyBackup,
                     setupNewSecretStorage: true,
                 });
+                if (!this.state.useKeyBackup && this.state.backupInfo) {
+                    // If the user is resetting their cross-signing keys and doesn't want
+                    // key backup (but had it enabled before), delete the key backup as it's
+                    // no longer valid.
+                    console.log("Deleting invalid key backup (secrets have been reset; key backup not requested)");
+                    await cli.deleteKeyBackupVersion(this.state.backupInfo.version);
+                }
             } else {
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cb04d2a018..c07f1c25dd 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -131,8 +131,8 @@ export default class CrossSigningPanel extends React.PureComponent {
     }
 
     _destroySecureSecretStorage = () => {
-        const ConfirmDestoryCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
-        Modal.createDialog(ConfirmDestoryCrossSigningDialog, {
+        const ConfirmDestroyCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
+        Modal.createDialog(ConfirmDestroyCrossSigningDialog, {
             onFinished: this.onDestroyStorage,
         });
     }

From 9ae812c346333f4c4b294add6438464c2591904f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 May 2020 15:17:55 -0600
Subject: [PATCH 2726/3235] Add a loading state for email addresses/phone
 numbers in settings

Fixes https://github.com/vector-im/riot-web/issues/13432
---
 .../tabs/user/_GeneralUserSettingsTab.scss    |  6 +++
 .../tabs/user/GeneralUserSettingsTab.js       | 39 ++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 62d230e752..95a46b51ee 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -23,6 +23,12 @@ limitations under the License.
     margin-top: 0;
 }
 
+.mx_GeneralUserSettingsTab_accountSection .mx_Spinner,
+.mx_GeneralUserSettingsTab_discovery .mx_Spinner {
+    // Move the spinner to the left side of the container (default center)
+    justify-content: left;
+}
+
 .mx_GeneralUserSettingsTab_accountSection .mx_EmailAddresses,
 .mx_GeneralUserSettingsTab_accountSection .mx_PhoneNumbers,
 .mx_GeneralUserSettingsTab_discovery .mx_ExistingEmailAddress,
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 801062bff4..867982ad2b 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -38,6 +38,7 @@ import {SERVICE_TYPES} from "matrix-js-sdk";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
 import {abbreviateUrl} from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
+import Spinner from "../../../elements/Spinner";
 
 export default class GeneralUserSettingsTab extends React.Component {
     static propTypes = {
@@ -60,6 +61,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             },
             emails: [],
             msisdns: [],
+            loading3pids: true, // whether or not the emails and msisdns have been loaded
             ...this._calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
@@ -158,8 +160,11 @@ export default class GeneralUserSettingsTab extends React.Component {
             );
             console.warn(e);
         }
-        this.setState({ emails: threepids.filter((a) => a.medium === 'email') });
-        this.setState({ msisdns: threepids.filter((a) => a.medium === 'msisdn') });
+        this.setState({
+            emails: threepids.filter((a) => a.medium === 'email'),
+            msisdns: threepids.filter((a) => a.medium === 'msisdn'),
+            loading3pids: false,
+        });
     }
 
     async _checkTerms() {
@@ -325,7 +330,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
         const EmailAddresses = sdk.getComponent("views.settings.account.EmailAddresses");
         const PhoneNumbers = sdk.getComponent("views.settings.account.PhoneNumbers");
-        const Spinner = sdk.getComponent("views.elements.Spinner");
 
         let passwordChangeForm = (
             <ChangePassword
@@ -344,18 +348,24 @@ export default class GeneralUserSettingsTab extends React.Component {
         // For newer homeservers with separate 3PID add and bind methods (MSC2290),
         // there is no such concern, so we can always show the HS account 3PIDs.
         if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
-            threepidSection = <div>
-                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-                <EmailAddresses
+            const emails = this.state.loading3pids || true
+                ? <Spinner />
+                : <EmailAddresses
                     emails={this.state.emails}
                     onEmailsChange={this._onEmailsChange}
-                />
-
-                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-                <PhoneNumbers
+                />;
+            const msisdns = this.state.loading3pids
+                ? <Spinner />
+                : <PhoneNumbers
                     msisdns={this.state.msisdns}
                     onMsisdnsChange={this._onMsisdnsChange}
-                />
+                />;
+            threepidSection = <div>
+                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
+                {emails}
+
+                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
+                {msisdns}
             </div>;
         } else if (this.state.serverSupportsSeparateAddAndBind === null) {
             threepidSection = <Spinner />;
@@ -491,12 +501,15 @@ export default class GeneralUserSettingsTab extends React.Component {
         const EmailAddresses = sdk.getComponent("views.settings.discovery.EmailAddresses");
         const PhoneNumbers = sdk.getComponent("views.settings.discovery.PhoneNumbers");
 
+        const emails = this.state.loading3pids ? <Spinner /> : <EmailAddresses emails={this.state.emails} />;
+        const msisdns = this.state.loading3pids ? <Spinner /> : <PhoneNumbers msisdns={this.state.msisdns} />;
+
         const threepidSection = this.state.haveIdServer ? <div className='mx_GeneralUserSettingsTab_discovery'>
             <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-            <EmailAddresses emails={this.state.emails} />
+            {emails}
 
             <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-            <PhoneNumbers msisdns={this.state.msisdns} />
+            {msisdns}
         </div> : null;
 
         return (

From fa5aa2847290f0bd0a6a1261545cae8798f6415f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 6 May 2020 23:06:20 +0000
Subject: [PATCH 2727/3235] Translated using Weblate (Estonian)

Currently translated at 35.3% (813 of 2304 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index d640121c0b..01096fd62c 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -810,5 +810,7 @@
     "Encrypted messages in group chats": "Rühmavestluste krüptitud sõnumid",
     "When I'm invited to a room": "Kui mind kutsutakse jututuppa",
     "Call invitation": "Kõnekutse",
-    "Messages sent by bot": "Robotite saadetud sõnumid"
+    "Messages sent by bot": "Robotite saadetud sõnumid",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
+    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata"
 }

From c6b8f5048428f92c7af5693eb922d3b3b6ded414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 6 May 2020 23:10:46 +0000
Subject: [PATCH 2728/3235] Translated using Weblate (Estonian)

Currently translated at 35.5% (818 of 2304 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 01096fd62c..096d97b5ac 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -812,5 +812,10 @@
     "Call invitation": "Kõnekutse",
     "Messages sent by bot": "Robotite saadetud sõnumid",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
-    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata"
+    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata",
+    "URL Previews": "URL'ide eelvaated",
+    "You have <a>enabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>võtnud kasutusele</a>.",
+    "You have <a>disabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>lülitanud välja</a>.",
+    "URL previews are enabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi kasutusel selles jututoas osalejate jaoks.",
+    "URL previews are disabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi lülitatud välja selles jututoas osalejate jaoks."
 }

From 0b5691c0032d5145c57925dc40fa6d090eb02da6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 7 May 2020 09:43:14 +0100
Subject: [PATCH 2729/3235] Fix right panel hiding when viewing room member

If you clicked on the header button whilst the right panel was
showing a room member, it would NPE because there was no
refireParams.member. It fires the same phase with no refireParams to
toggle the panel visibility (apparently), so detect that case.

Fixes https://github.com/vector-im/riot-web/issues/13571
---
 src/stores/RightPanelStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 8869d0be42..3a5605ba3f 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -139,7 +139,7 @@ export default class RightPanelStore extends Store {
                 let targetPhase = payload.phase;
                 let refireParams = payload.refireParams;
                 // redirect to EncryptionPanel if there is an ongoing verification request
-                if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+                if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo && payload.refireParams) {
                     const {member} = payload.refireParams;
                     const pendingRequest = pendingVerificationRequestForUser(member);
                     if (pendingRequest) {

From 7c1ac7aaffe17a7a3941cb8bda4fb822876bf1ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 May 2020 10:02:40 +0100
Subject: [PATCH 2730/3235] fix unrelated tautology

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 05354fa5f2..3929711406 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1339,7 +1339,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // this if we are not scrolled up in the view. To find out, delegate to
             // the timeline panel. If the timeline panel doesn't exist, then we assume
             // it is safe to reset the timeline.
-            if (!this.loggedInView.current || !this.loggedInView.current) {
+            if (!this.loggedInView.current) {
                 return true;
             }
             return this.loggedInView.current.canResetTimelineInRoom(roomId);

From e78c9ebbc5201139be83efdf4902f43df7eccc1d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 7 May 2020 07:21:43 +0000
Subject: [PATCH 2731/3235] Translated using Weblate (Bulgarian)

Currently translated at 93.3% (2149 of 2304 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 | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 87e5d928ac..347823f95c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2177,5 +2177,39 @@
     "%(networkName)s rooms": "%(networkName)s стаи",
     "Matrix rooms": "Matrix стаи",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Напомняне: браузърът ви не се поддържа, така че не всичко може да работи правилно.",
-    "Destroy cross-signing keys?": "Унищожаване на ключовете за кръстосано-подписване?"
+    "Destroy cross-signing keys?": "Унищожаване на ключовете за кръстосано-подписване?",
+    "You signed in to a new session without verifying it:": "Влязохте в нова сесия без да я верифицирате:",
+    "Verify your other session using one of the options below.": "Верифицирайте другите си сесии използвайки една от опциите по-долу.",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Изтриването на ключовете за кръстосано-подписване е необратимо. Всички, с които сте се верифицирали ще видят предупреждения за сигурността. Почти със сигурност не искате да направите това, освен ако не сте загубили всички устройства, от които можете да подписвате кръстосано.",
+    "Clear cross-signing keys": "Изчисти ключовете за кръстосано-подписване",
+    "Clear all data in this session?": "Изчисти всички данни в тази сесия?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Изчистването на всички данни от сесията е необратимо. Шифрованите съобщения ще бъдат загубени, освен ако няма резервно копие на ключовете им.",
+    "Enable end-to-end encryption": "Включи шифроване от-край-до-край",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Не може да изключите това по-късно. Мостовете и повечето ботове все още не работят с това.",
+    "Server did not require any authentication": "Сървърът не изисква никаква автентикация",
+    "Server did not return valid authentication information.": "Сървърът не върна валидна информация относно автентикация.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Потвърдете деактивацията на профила си използвайки Single Sign On за потвърждаване на самоличността.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Сигурни ли сте, че искате да деактивирате профила си? Това е необратимо.",
+    "Confirm account deactivation": "Потвърдете деактивирането на профила",
+    "There was a problem communicating with the server. Please try again.": "Имаше проблем при комуникацията със сървъра. Опитайте пак.",
+    "Verify session": "Потвърди сесията",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "За да потвърдите, че сесията е доверена, проверете, че ключа, който виждате в потребителските настройки на устройството съвпада с ключа по-долу:",
+    "To verify that this session 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 session matches the key below:": "За да потвърдите, че сесията е доверена, свържете се със собственика й по друг начин (например на живо или по телефона) и ги попитайте дали ключът, който виждат в потребителските си настройки съвпада с ключа по-долу:",
+    "Session name": "Име на сесията",
+    "Session key": "Ключ за сесията",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Ако съвпада, натиснете бутона за потвърждение по-долу. Ако пък не, тогава някой прихваща сесията и вероятно искате да използвате бутона за блокиране вместо това.",
+    "Verification Requests": "Заявки за верификация",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Верифицирането на този потребител ще маркира сесията им като доверена при вас, както и вашата като доверена при тях.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Верифицирайте това устройство за да го маркирате като доверено. Доверявайки се на това устройство дава на вас и на другите потребители допълнително спокойствие при използването на от-край-до-край-шифровани съобщения.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Верифицирането на това устройство ще го маркира като доверено, а потребителите, които са потвърдили вас също ще се доверяват на него.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Неуспешно поканване на следните потребители в чата: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Не можахме да създадем директен чат. Проверете потребителите, които искате да поканите и опитайте пак.",
+    "Something went wrong trying to invite the users.": "Нещо се обърка при опита да бъдат поканени потребителите.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Не можахме да поканим тези потребители. Проверете потребителите, които искате да поканите и опитайте пак.",
+    "Recently Direct Messaged": "Скорошни директни чатове",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Започнете чат с някой посредством име, потребителско име (като <userId/>) или имейл адрес.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Поканете някой посредством име, потребителско име (като <userId/>), имейл адрес или като <a>споделите тази стая</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Добавихте нова сесия '%(displayName)s', която изисква ключове за шифроване.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Непотвърдената ви сесия '%(displayName)s' изисква ключове за шифроване.",
+    "Loading session info...": "Зареждане на информация за сесията..."
 }

From 0955e13d36defa500bab2ea50b653613be7e878e Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 7 May 2020 02:58:23 +0000
Subject: [PATCH 2732/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2304 of 2304 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 f7122b400c..85bbaaabc1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2418,5 +2418,6 @@
     "Keys restored": "金鑰已復原",
     "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰",
     "You signed in to a new session without verifying it:": "您已登入新的工作階段但未驗證：",
-    "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。"
+    "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。"
 }

From a2cd6ea1a1cd84a056180bf55bb8c402289f471f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 7 May 2020 08:43:54 +0000
Subject: [PATCH 2733/3235] Translated using Weblate (Estonian)

Currently translated at 38.6% (889 of 2304 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 096d97b5ac..9d06be8c88 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -817,5 +817,76 @@
     "You have <a>enabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>võtnud kasutusele</a>.",
     "You have <a>disabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>lülitanud välja</a>.",
     "URL previews are enabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi kasutusel selles jututoas osalejate jaoks.",
-    "URL previews are disabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi lülitatud välja selles jututoas osalejate jaoks."
+    "URL previews are disabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi lülitatud välja selles jututoas osalejate jaoks.",
+    "Enable Emoji suggestions while typing": "Näita kirjutamise ajal emoji-soovitusi",
+    "Use compact timeline layout": "Kasuta tihedat ajajoone paigutust",
+    "Show a placeholder for removed messages": "Näita kustutatud sõnumite asemel kohatäidet",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Näita jututubade liitumise ja lahkumise teateid (ei käi kutsete, müksamiste ja keelamiste kohta)",
+    "Show avatar changes": "Näita avataride muutusi",
+    "Show read receipts sent by other users": "Näita teiste kasutajate lugemisteatiseid",
+    "Always show message timestamps": "Alati näita sõnumite ajatempleid",
+    "Autoplay GIFs and videos": "Esita GIF-animatsioonid ja videod automaatselt",
+    "Always show encryption icons": "Alati näita krüptimise oleku ikoone",
+    "Show avatars in user and room mentions": "Näita avatare kasutajate ja jututubade mainimistes",
+    "Manually verify all remote sessions": "Verifitseeri käsitsi kõik välised sessioonid",
+    "Collecting app version information": "Kogun teavet rakenduse versiooni kohta",
+    "unknown caller": "tundmatu helistaja",
+    "Incoming voice call from %(name)s": "Saabuv häälkõne kasutajalt %(name)s",
+    "Incoming video call from %(name)s": "Saabuv videokõne kasutajalt %(name)s",
+    "Incoming call from %(name)s": "Saabuv kõne kasutajalt %(name)s",
+    "Decline": "Keeldu",
+    "Accept": "Võta vastu",
+    "The other party cancelled the verification.": "Teine osapool tühistas verifitseerimise.",
+    "Verified!": "Verifitseeritud!",
+    "You've successfully verified this user.": "Sa oled edukalt verifitseerinud selle kasutaja.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Turvalised sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.",
+    "Got It": "Saan aru",
+    "Scan this unique code": "Skaneeri seda unikaalset koodi",
+    "or": "või",
+    "Compare unique emoji": "Võrdle unikaalseid emoji'sid",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Kui sul mõlemas seadmes pole kaamerat, siis võrdle unikaalset emoji'de komplekti",
+    "Start": "Alusta",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Kontrolli, et allpool näidatud emoji'd on kuvatud mõlemas sessioonis samas järjekorras:",
+    "Verify this user by confirming the following number appears on their screen.": "Verifitseeri see kasutaja tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
+    "Unable to find a supported verification method.": "Ei suuda leida toetatud verifitseerimismeetodit.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ootan, et sinu teine sessioon %(deviceName)s (%(deviceId)s) verifitseeriks…",
+    "Waiting for %(displayName)s to verify…": "Ootan kasutaja %(displayName)s verifitseerimist…",
+    "Cancelling…": "Tühistan…",
+    "They match": "Nad klapivad",
+    "They don't match": "Nad ei klapi",
+    "To be secure, do this in person or use a trusted way to communicate.": "Turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate.",
+    "Dog": "Koer",
+    "Cat": "Kass",
+    "Lion": "Lõvi",
+    "Horse": "Hobune",
+    "Unicorn": "Ükssarvik",
+    "Pig": "Siga",
+    "Elephant": "Elevant",
+    "Rabbit": "Jänes",
+    "Panda": "Panda",
+    "Rooster": "Kukk",
+    "Penguin": "Pingviin",
+    "Turtle": "Kilpkonn",
+    "Fish": "Kala",
+    "Octopus": "Kaheksajalg",
+    "Butterfly": "Liblikas",
+    "Flower": "Lill",
+    "Tree": "Puu",
+    "Cactus": "Kaktus",
+    "Mushroom": "Seen",
+    "Globe": "Maakera",
+    "Moon": "Kuu",
+    "Cloud": "Pilv",
+    "Fire": "Tuli",
+    "Banana": "Banaan",
+    "Apple": "Õun",
+    "Strawberry": "Maasikas",
+    "Corn": "Mais",
+    "Pizza": "Pitsa",
+    "Cake": "Kook",
+    "Heart": "Süda",
+    "Smiley": "Smaili",
+    "Robot": "Robot",
+    "Hat": "Müts",
+    "Glasses": "Prillid"
 }

From 97a794c31816c9be4e19a7c7740f6bb20767e075 Mon Sep 17 00:00:00 2001
From: Lasse Liehu <lasse.liehu@iki.fi>
Date: Thu, 7 May 2020 06:17:15 +0000
Subject: [PATCH 2734/3235] Translated using Weblate (Finnish)

Currently translated at 90.3% (2081 of 2304 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c17a2e8c35..8135462d60 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -771,7 +771,7 @@
     "Set Password": "Aseta salasana",
     "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
     "remove %(name)s from the directory.": "poista %(name)s luettelosta.",
-    "Off": "Pois päältä",
+    "Off": "Ei päällä",
     "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittyä huoneeseen tässä verkossa",
     "Mentions only": "Vain maininnat",
     "Failed to remove tag %(tagName)s from room": "Tagin %(tagName)s poistaminen huoneesta epäonnistui",
@@ -903,8 +903,8 @@
     "Pin": "Nuppineula",
     "Call in Progress": "Puhelu meneillään",
     "General": "Yleiset",
-    "Security & Privacy": "Turvallisuus ja yksityisyys",
-    "Roles & Permissions": "Roolit ja käyttöoikeudet",
+    "Security & Privacy": "Tietoturva ja -suoja",
+    "Roles & Permissions": "Roolit ja oikeudet",
     "Room Name": "Huoneen nimi",
     "Room Topic": "Huoneen aihe",
     "Developer options": "Kehittäjävalinnat",
@@ -1489,7 +1489,7 @@
     "Message edits": "Viestin muokkaukset",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Tämän huoneen päivittäminen edellyttää huoneen nykyisen instanssin sulkemista ja uuden huoneen luomista sen tilalle. Jotta tämä kävisi huoneen jäsenten kannalta mahdollisimman sujuvasti, teemme seuraavaa:",
     "Upload all": "Lataa kaikki palvelimelle",
-    "Upload": "Lataa palvelimelle",
+    "Upload": "Lähetä",
     "Changes your avatar in all rooms": "Vaihtaa kuvasi kaikissa huoneissa",
     "%(senderName)s made no change.": "%(senderName)s ei tehnyt muutoksia.",
     "Show all": "Näytä kaikki",

From cd25361837609c11b74cf51f6a07c8502b074f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 7 May 2020 06:30:13 +0000
Subject: [PATCH 2735/3235] Translated using Weblate (French)

Currently translated at 100.0% (2304 of 2304 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 74c3e6e959..b7344b592f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2419,5 +2419,6 @@
     "Keys restored": "Clés restaurées",
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès",
     "You signed in to a new session without verifying it:": "Vous vous êtes connecté·e à une nouvelle session sans la vérifier :",
-    "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous."
+    "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitez quelqu’un en utilisant leur nom, leur nom d’utilisateur (comme <userId/>), leur adresse e-mail ou <a>partagez ce salon</a>."
 }

From 93287503282f94b6838155e071840af8e235f2e1 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Thu, 7 May 2020 01:44:26 +0000
Subject: [PATCH 2736/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 57.8% (1332 of 2304 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index fe6ca61a49..147584ed00 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -419,7 +419,7 @@
     "Security": "Sikkerhet",
     "Got it": "Jeg forstår",
     "Reply": "Svar",
-    "Edit": "Rediger ",
+    "Edit": "Rediger",
     "Attachment": "Vedlegg",
     "Download %(text)s": "Last ned %(text)s",
     "Show all": "Vis alt",
@@ -996,7 +996,7 @@
     "Create Community": "Opprett et samfunn",
     "Please enter a name for the room": "Vennligst skriv inn et navn for rommet",
     "Set a room alias to easily share your room with other people.": "Velg et rom-alias for å dele rommet ditt enkelt med andre.",
-    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon",
+    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon.",
     "Create a public room": "Opprett et offentlig rom",
     "Create a private room": "Opprett et privat rom",
     "Topic (optional)": "Tema (valgfritt)",
@@ -1164,5 +1164,182 @@
     "Showing flair for these communities:": "Viser merkeskilt for disse samfunnene:",
     "URL previews are enabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd på som standard for deltakerene i dette rommet.",
     "URL previews are disabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd av som standard for deltakerene i dette rommet.",
-    "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.": "I krypterte rom som denne, er URL-forhåndsvisninger skrudd av som standard for å sikre at hjemmetjeneren din (der forhåndsvisningene blir generert) ikke kan samle inn informasjon om lenkene som du ser i dette rommet."
+    "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.": "I krypterte rom som denne, er URL-forhåndsvisninger skrudd av som standard for å sikre at hjemmetjeneren din (der forhåndsvisningene blir generert) ikke kan samle inn informasjon om lenkene som du ser i dette rommet.",
+    "Confirm adding email": "Bekreft tillegging av E-postadresse",
+    "Confirm adding phone number": "Bekreft tillegging av telefonnummer",
+    "Setting up keys": "Setter opp nøkler",
+    "Review where you’re logged in": "Gå gjennom der du er pålogget",
+    "New login. Was this you?": "En ny pålogging. Var det deg?",
+    "Sign In or Create Account": "Logg inn eller lag en konto",
+    "Use an identity server": "Bruk en identitetstjener",
+    "Command failed": "Kommandoen mislyktes",
+    "Could not find user in room": "Klarte ikke å finne brukeren i rommet",
+    "Session already verified!": "Økten er allerede verifisert!",
+    "Displays information about a user": "Viser informasjon om en bruker",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannlyste %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endret visningsnavnet sitt til %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte visningsnavnet sitt til %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernet visningsnavnet sitt (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s fjernet profilbildet sitt.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s endret profilbildet sitt.",
+    "%(senderName)s made no change.": "%(senderName)s gjorde ingen endringer.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s avslo invitasjonen.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trakk tilbake invitasjonen til %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s sparket ut %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s endret temaet til «%(topic)s».",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernet rommets navn.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s gjorde rommet offentlig for alle som kjenner til denne lenken.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s har tillatt gjester å bli med i rommet.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har hindret gjester fra å bli med i rommet.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s fjernet hovedadressen til dette rommet.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s endret adressene til dette rommet.",
+    "%(senderName)s answered the call.": "%(senderName)s svarte på oppringingen.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s gikk fra %(fromPowerLevel)s til %(toPowerLevel)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-modulen ble endret på av %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-modulen ble lagt til av %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-modulen ble fjernet av %(senderName)s",
+    "Your Riot is misconfigured": "Ditt Riot-oppsett er feiloppsatt",
+    "a few seconds from now": "om noen sekunder fra nå",
+    "about a minute from now": "rundt et minutt fra nå",
+    "%(num)s minutes from now": "%(num)s minutter fra nå",
+    "about an hour from now": "rundt en time fra nå",
+    "%(num)s hours from now": "%(num)s timer fra nå",
+    "about a day from now": "rundt en dag fra nå",
+    "%(num)s days from now": "%(num)s dager fra nå",
+    "Not a valid Riot keyfile": "Ikke en gyldig Riot-nøkkelfil",
+    "Unrecognised address": "Adressen ble ikke gjenkjent",
+    "Unknown server error": "Ukjent tjenerfeil",
+    "Recent years are easy to guess": "Nylige år er lette å gjette",
+    "Dates are often easy to guess": "Datoer er ofte lette å gjette",
+    "This is a top-10 common password": "Dette er et topp-10 vanlig passord",
+    "This is a top-100 common password": "Dette er et topp-100 vanlig passord",
+    "Message Pinning": "Meldingsklistring",
+    "Aeroplane": "Fly",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifiser alle øktene dine for å sikre at kontoen og meldingene dine er trygge",
+    "From %(deviceName)s (%(deviceId)s)": "Fra %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Avslå (%(counter)s)",
+    "Upload new:": "Last opp ny:",
+    "No display name": "Ingen visningsnavn",
+    "New passwords don't match": "De nye passordene samsvarer ikke",
+    "Passwords can't be empty": "Passord kan ikke være tomme",
+    "Do you want to set an email address?": "Vil du velge en E-postadresse?",
+    "unexpected type": "uventet type",
+    "Delete sessions|other": "Slett økter",
+    "Delete sessions|one": "Slett økten",
+    "Clear notifications": "Tøm varsler",
+    "Disconnect anyway": "Koble fra likevel",
+    "You have not ignored anyone.": "Du har ikke ignorert noen.",
+    "You are not subscribed to any lists": "Du er ikke abonnert på noen lister",
+    "Uploaded sound": "Lastet opp lyd",
+    "Notify everyone": "Varsle alle",
+    "Muted Users": "Dempede brukere",
+    "Incorrect verification code": "Ugyldig verifiseringskode",
+    "Unable to add email address": "Klarte ikke å legge til E-postadressen",
+    "Invite only": "Kun ved invitasjon",
+    "Close preview": "Lukk forhåndsvisning",
+    "Failed to kick": "Mislyktes i å sparke ut",
+    "Unban this user?": "Vil du oppheve bannlysingen av denne brukeren?",
+    "Ban this user?": "Vil du bannlyse denne brukeren?",
+    "Demote yourself?": "Vil du degradere deg selv?",
+    "Demote": "Degrader",
+    "Revoke Moderator": "Trekk tilbake moderatorstatus",
+    "Make Moderator": "Gjør til moderator",
+    "and %(count)s others...|other": "og %(count)s andre …",
+    "and %(count)s others...|one": "og én annen …",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (styrkenivå %(powerLevelNumber)s)",
+    "Hangup": "Legg på røret",
+    "The conversation continues here.": "Samtalen fortsetter her.",
+    "Jump to message": "Hopp til meldingen",
+    "System Alerts": "Systemvarsler",
+    "Rejecting invite …": "Avslår invitasjonen …",
+    "You were kicked from %(roomName)s by %(memberName)s": "Du ble sparket ut fra %(roomName)s av %(memberName)s",
+    "Reason: %(reason)s": "Årsak: %(reason)s",
+    "You were banned from %(roomName)s by %(memberName)s": "Du ble bannlyst fra %(roomName)s av %(memberName)s",
+    "Do you want to chat with %(user)s?": "Vil du prate med %(user)s?",
+    "Do you want to join %(roomName)s?": "Vil du bli med i %(roomName)s?",
+    "Reject & Ignore user": "Avslå og ignorer brukeren",
+    "This room has already been upgraded.": "Dette rommet har allerede blitt oppgradert.",
+    "Unknown Command": "Ukjent kommando",
+    "Revoke invite": "Trekk tilbake invitasjonen",
+    "Invited by %(sender)s": "Invitert av %(sender)s",
+    "Mark all as read": "Merk alle som lest",
+    "Other published addresses:": "Andre publiserte adresser:",
+    "Invalid community ID": "Ugyldig samfunns-ID",
+    "Waiting for %(displayName)s to accept…": "Venter på at %(displayName)s skal akseptere …",
+    "Your homeserver": "Hjemmetjeneren din",
+    "%(count)s verified sessions|other": "%(count)s verifiserte økter",
+    "Hide verified sessions": "Skjul verifiserte økter",
+    "Remove from community": "Fjern fra samfunnet",
+    "Error decrypting audio": "Feil under dekryptering av lyd",
+    "Decrypt %(text)s": "Dekrypter %(text)s",
+    "You verified %(name)s": "Du verifiserte %(name)s",
+    "A new version of Riot is available.": "En ny versjon av Riot er tilgjengelig.",
+    "were kicked %(count)s times|other": "ble sparket ut %(count)s ganger",
+    "was kicked %(count)s times|other": "ble sparket ut %(count)s ganger",
+    "Some characters not allowed": "Noen tegn er ikke tillatt",
+    "This alias is available to use": "Dette aliaset er tilgjengelig for bruk",
+    "This alias is already in use": "Dette aliaset er allerede i bruk",
+    "You have entered an invalid address.": "Du har skrevet inn en ugyldig adresse.",
+    "Invite anyway": "Inviter likevel",
+    "Enable end-to-end encryption": "Aktiver start-til-mål-kryptering",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan ikke skru dette av senere. Broer og mange botter vil ikke fungere enda.",
+    "Begin Verifying": "Begynn verifiseringen",
+    "View Servers in Room": "Vis tjenerne i rommet",
+    "Ignore request": "Ignorer forespørselen",
+    "Loading session info...": "Laster inn økt-infoen …",
+    "a key signature": "en nøkkelsignatur",
+    "Send Logs": "Send loggbøker",
+    "Command Help": "Kommandohjelp",
+    "Share Permalink": "Del en permalenke",
+    "Who can join this community?": "Hvem kan bli med i dette samfunnet?",
+    "Long Description (HTML)": "Lang beskrivelse (HTML)",
+    "Welcome to %(appName)s": "Velkommen til %(appName)s",
+    "Send a Direct Message": "Send en direktemelding",
+    "Failed to leave room": "Mislyktes i å forlate rommet",
+    "Connectivity to the server has been lost.": "Tilkoblingen til tjeneren er nede.",
+    "Click to unmute video": "Klikk for å høre videoen",
+    "Click to mute video": "Klikk for å dempe videoen",
+    "Click to unmute audio": "Klikk for å høre lyden",
+    "Click to mute audio": "Klikk for å dempe lyden",
+    "Uploading %(filename)s and %(count)s others|zero": "Laster opp %(filename)s",
+    "Could not load user profile": "Klarte ikke å laste inn brukerprofilen",
+    "Verify this login": "Verifiser denne påloggingen",
+    "A new password must be entered.": "Et nytt passord må bli skrevet inn.",
+    "New passwords must match each other.": "De nye passordene må samsvare med hverandre.",
+    "This account has been deactivated.": "Denne kontoen har blitt deaktivert.",
+    "Incorrect username and/or password.": "Feil brukernavn og/eller passord.",
+    "Set a display name:": "Velg et visningsnavn:",
+    "Continue with previous account": "Fortsett med tidligere konto",
+    "Clear personal data": "Tøm personlige data",
+    "Ed25519 fingerprint": "Ed25519-fingeravtrykk",
+    "Curve25519 identity key": "Curve25519-identitetsnøkkel",
+    "Decryption error": "Dekrypteringsfeil",
+    "Passphrases must match": "Passfrasene må samsvare",
+    "Passphrase must not be empty": "Passfrasen kan ikke være tom",
+    "Confirm passphrase": "Bekreft passfrasen",
+    "Great! This recovery passphrase looks strong enough.": "Strålende! Denne gjenopprettingspassfrasen ser solid nok ut.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Velg en gjenopprettingspassfrase til å sikre kryptert informasjon og å gjenopprette det hvis du logger av. Dette burde noe annet enn kontopassordet ditt:",
+    "Enter a recovery passphrase": "Skriv inn en gjenopprettingspassfrase",
+    "Back up encrypted message keys": "Sikkerhetskopier krypterte meldingsnøkler",
+    "Set up with a recovery key": "Sett det opp med en gjenopprettingsnøkkel",
+    "That matches!": "Det samsvarer!",
+    "That doesn't match.": "Det samsvarer ikke.",
+    "Go back to set it again.": "Gå tilbake for å velge på nytt.",
+    "Enter your recovery passphrase a second time to confirm it.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte den.",
+    "Confirm your recovery passphrase": "Bekreft gjenopprettingspassfrasen din",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Gjenopprettingsnøkkelen din er et sikkerhetsnett - du kan bruke den til å gjenopprette tilgangen til dine krypterte meldinger dersom du glemmer gjenopprettingspassfrasen din.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Ha en kopi av den på et trygt sted, f.eks. en passordbehandler eller til og med i en safe.",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Gjenopprettingsnøkkelen din har blitt <b>kopiert til utklippstavlen din</b>, lim den inn i:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Gjenopprettingsnøkkelen din er i <b>Nedlastinger</b>-mappen din.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Skriv den ut</b> og lagre den på et sikkert sted",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Lagre den</b> på en USB-pinne eller backup-harddisk",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Kopier den</b> til din personlige skylagring",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Du kan nå verifisere de andre enhetene dine, samt andre brukere for å holde samtalene dine trygge.",
+    "Confirm recovery passphrase": "Bekreft gjenopprettingspassfrasen",
+    "Make a copy of your recovery key": "Lag en kopi av gjenopprettingsnøkkelen din",
+    "You're done!": "Du har gjort alt klart!",
+    "Enter a recovery passphrase...": "Skriv inn en gjenopprettingspassfrase …",
+    "Please enter your recovery passphrase a second time to confirm.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte.",
+    "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …"
 }

From 345695f11099f011c3b99ad7882b48a7b164d6c1 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Thu, 7 May 2020 01:01:04 +0000
Subject: [PATCH 2737/3235] Translated using Weblate (Ukrainian)

Currently translated at 23.8% (548 of 2304 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 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index e1db73e8b1..50c15dad2d 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -549,5 +549,17 @@
     "Send cross-signing keys to homeserver": "Надсилання ключей підпису на домашній сервер",
     "Custom (%(level)s)": "Власний (%(level)s)",
     "Error upgrading room": "Помилка оновлення кімнати",
-    "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще."
+    "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще.",
+    "Liberate your communication": "Вивільни своє спілкування",
+    "Send a Direct Message": "Надіслати особисте повідомлення",
+    "Explore Public Rooms": "Дослідити прилюдні кімнати",
+    "Create a Group Chat": "Створити групову балачку",
+    "Explore": "Дослідити",
+    "Filter": "Фільтрувати",
+    "Filter rooms…": "Фільтрувати кімнати…",
+    "Failed to reject invitation": "Не вдалось відхилити запрошення",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ця кімната не є прилюдною. Ви не зможете перепід'єднатись без запрошення.",
+    "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.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете її залишити."
 }

From b9e99ca9da4f71480939f02994f56505e14bfb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 7 May 2020 09:42:47 +0000
Subject: [PATCH 2738/3235] Translated using Weblate (Estonian)

Currently translated at 40.6% (936 of 2304 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 9d06be8c88..9f410d8cf4 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -888,5 +888,52 @@
     "Smiley": "Smaili",
     "Robot": "Robot",
     "Hat": "Müts",
-    "Glasses": "Prillid"
+    "Glasses": "Prillid",
+    "Spanner": "Mutrivõti",
+    "Santa": "Jõuluvana",
+    "Thumbs up": "Pöidlad püsti",
+    "Umbrella": "Vihmavari",
+    "Hourglass": "Liivakell",
+    "Clock": "Kell",
+    "Gift": "Kingitus",
+    "Light bulb": "Lambipirn",
+    "Book": "Raamat",
+    "Pencil": "Pliiats",
+    "Paperclip": "Kirjaklamber",
+    "Scissors": "Käärid",
+    "Lock": "Lukk",
+    "Key": "Võti",
+    "Hammer": "Haamer",
+    "Telephone": "Telefon",
+    "Flag": "Lipp",
+    "Train": "Rong",
+    "Bicycle": "Jalgratas",
+    "Aeroplane": "Lennuk",
+    "Rocket": "Rakett",
+    "Trophy": "Auhind",
+    "Ball": "Pall",
+    "Guitar": "Kitarr",
+    "Trumpet": "Trompet",
+    "Bell": "Kelluke",
+    "Anchor": "Ankur",
+    "Headphones": "Kõrvaklapid",
+    "Folder": "Kaust",
+    "Pin": "Knopka",
+    "Verify all your sessions to ensure your account & messages are safe": "Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid",
+    "Later": "Hiljem",
+    "Review": "Vaata üle",
+    "Verify yourself & others to keep your chats safe": "Selleks et sinu vestlused oleks turvatud, verifitseeri end ja teisi",
+    "Other users may not trust it": "Teised kasutajad ei pruugi seda usaldada",
+    "Update your secure storage": "Uuenda rakenduse sisemist turvalist salvestust",
+    "Set up": "Võta kasutusele",
+    "Upgrade": "Uuenda",
+    "Verify": "Verifitseeri",
+    "Verify the new login accessing your account: %(name)s": "Verifitseeri uus kasutajasessioon, kes pruugib sinu kontot: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "Seadmest %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Lükka tagasi (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Jätkamiseks nõustu <policyLink />'ga:",
+    "Show less": "Näita vähem",
+    "Show more": "Näita rohkem",
+    "Warning!": "Hoiatus!",
+    "Do you want to set an email address?": "Kas sa soovid seadistada e-posti aadressi?"
 }

From 4d6cd3c0504e7f4bc07e4cce95177affdc84bb66 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 7 May 2020 12:50:04 +0100
Subject: [PATCH 2739/3235] Update padding-left to 20px as per Nad's iteration

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/messages/_RedactedBody.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/messages/_RedactedBody.scss b/res/css/views/messages/_RedactedBody.scss
index c0e5be2c89..9ba35d7297 100644
--- a/res/css/views/messages/_RedactedBody.scss
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -17,7 +17,7 @@ limitations under the License.
     color: $muted-fg-color;
     vertical-align: middle;
 
-    padding-left: 16px;
+    padding-left: 20px;
     position: relative;
 
     &::before {

From a38d5eb2244711d89e9c51df2e3f5abf20ed6409 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 14:57:45 +0100
Subject: [PATCH 2740/3235] add useIRCLayout setting

---
 src/i18n/strings/en_EN.json |  1 +
 src/settings/Settings.js    | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a24b2bde73..3dcba0f546 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -408,6 +408,7 @@
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
+    "Use IRC layout": "Use IRC layout",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 5c6d843349..c51bf44ee5 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -94,6 +94,12 @@ export const SETTINGS = {
     //     // not use this for new settings.
     //     invertedSettingName: "my-negative-setting",
     // },
+    "feature_alternate_message_layouts": {
+        isFeature: true,
+        displayName: _td("Alternate message layouts"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),
@@ -164,6 +170,11 @@ export const SETTINGS = {
         default: true,
         invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
     },
+    "useIRCLayout": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Use IRC layout'),
+        default: false,
+    },
     "useCompactLayout": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Use compact timeline layout'),

From e0c89f6180331350485ca7331ff9e190a83a3d5f Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 15:06:38 +0100
Subject: [PATCH 2741/3235] Add switch between layout classes

---
 src/components/structures/MessagePanel.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6fbfdb504b..0123d43920 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -117,6 +117,7 @@ export default class MessagePanel extends React.Component {
             // display 'ghost' read markers that are animating away
             ghostReadMarkers: [],
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
+            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
         };
 
         // opaque readreceipt info for each userId; used by ReadReceiptMarker
@@ -169,6 +170,8 @@ export default class MessagePanel extends React.Component {
 
         this._showTypingNotificationsWatcherRef =
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
+
+        this._layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
     }
 
     componentDidMount() {
@@ -178,6 +181,7 @@ export default class MessagePanel extends React.Component {
     componentWillUnmount() {
         this._isMounted = false;
         SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
+        SettingsStore.unwatchSetting(this._layoutWatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -196,6 +200,12 @@ export default class MessagePanel extends React.Component {
         });
     };
 
+    onLayoutChange = () => {
+        this.setState({
+            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+        });
+    }
+
     /* get the DOM node representing the given event */
     getNodeForEventId(eventId) {
         if (!this.eventNodes) {
@@ -779,6 +789,8 @@ export default class MessagePanel extends React.Component {
             this.props.className,
             {
                 "mx_MessagePanel_alwaysShowTimestamps": this.props.alwaysShowTimestamps,
+                "mx_IRCLayout": this.state.useIRCLayout,
+                "mx_GroupLayout": !this.state.useIRCLayout,
             },
         );
 

From c1e740a59603ae178364cac18c8ecdd5443c9df6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 15:07:17 +0100
Subject: [PATCH 2742/3235] Break out group layout settings

---
 res/css/views/rooms/_EventTile.scss   | 12 -------
 res/css/views/rooms/_GroupLayout.scss | 52 +++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 res/css/views/rooms/_GroupLayout.scss

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 752cf982f6..b9a41c4310 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -68,11 +68,9 @@ limitations under the License.
     display: inline-block; /* anti-zalgo, with overflow hidden */
     overflow: hidden;
     cursor: pointer;
-    padding-left: 65px; /* left gutter */
     padding-bottom: 0px;
     padding-top: 0px;
     margin: 0px;
-    line-height: $font-17px;
     /* the next three lines, along with overflow hidden, truncate long display names */
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -101,12 +99,9 @@ limitations under the License.
 
 .mx_EventTile .mx_MessageTimestamp {
     display: block;
-    visibility: hidden;
     white-space: nowrap;
     left: 0px;
-    width: 46px; /* 8 + 30 (avatar) + 8 */
     text-align: center;
-    position: absolute;
     user-select: none;
 }
 
@@ -117,10 +112,7 @@ limitations under the License.
 .mx_EventTile_line, .mx_EventTile_reply {
     position: relative;
     padding-left: 65px; /* left gutter */
-    padding-top: 3px;
-    padding-bottom: 3px;
     border-radius: 4px;
-    line-height: $font-22px;
 }
 
 .mx_RoomView_timeline_rr_enabled,
@@ -151,10 +143,6 @@ limitations under the License.
     margin-right: 10px;
 }
 
-.mx_EventTile_info .mx_EventTile_line {
-    padding-left: 83px;
-}
-
 /* HACK to override line-height which is already marked important elsewhere */
 .mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
     font-size: 48px !important;
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
new file mode 100644
index 0000000000..6528d6c6cd
--- /dev/null
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -0,0 +1,52 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+$left-gutter: 65px;
+
+.mx_GroupLayout {
+
+    .mx_EventTile {
+        > .mx_SenderProfile {
+            line-height: $font-17px;
+            padding-left: $left-gutter;
+        }
+
+        > .mx_EventTile_line {
+            padding-left: $left-gutter;
+        }
+
+        > .mx_EventTile_avatar {
+            position: absolute;
+        }
+
+        .mx_MessageTimestamp {
+            visibility: hidden;
+            position: absolute;
+            width: 46px; /* 8 + 30 (avatar) + 8 */
+        }
+
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 3px;
+            padding-bottom: 3px;
+            line-height: $font-22px;
+        }
+    }
+
+    .mx_EventTile_info .mx_EventTile_line {
+        padding-left: 83px;
+    }
+}

From 10c8d253c86334e11c3a8582db6d63e073bcb79e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 15:07:41 +0100
Subject: [PATCH 2743/3235] Create irc layout

---
 res/css/views/rooms/_IRCLayout.scss       | 124 ++++++++++++++++++++++
 src/components/structures/MessagePanel.js |   1 +
 src/components/views/rooms/EventTile.js   |  30 ++++--
 3 files changed, 148 insertions(+), 7 deletions(-)
 create mode 100644 res/css/views/rooms/_IRCLayout.scss

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
new file mode 100644
index 0000000000..6152749573
--- /dev/null
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -0,0 +1,124 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+$name-width: 50px;
+$icon-width: 14px;
+$timestamp-width: 45px;
+$right-padding: 5px;
+
+.mx_IRCLayout {
+
+    line-height: $font-22px !important;
+
+    .mx_EventTile {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+
+        > * {
+            margin-right: $right-padding;
+        }
+
+        > .mx_EventTile_msgOption {
+            order: 4;
+            flex-shrink: 0;
+        }
+
+        > .mx_SenderProfile {
+            order: 2;
+            flex-shrink: 0;
+            width: $name-width;
+            text-overflow: ellipsis;
+            text-align: right;
+            display: flex;
+            align-items: center;
+        }
+
+        > .mx_EventTile_line {
+            order: 3;
+            flex-grow: 1;
+        }
+
+        > .mx_EventTile_avatar {
+            order: 1;
+            position: relative;
+            top: 0;
+            left: 0;
+            flex-shrink: 0;
+            height: 22px;
+            display: flex;
+            align-items: center;
+
+            > .mx_BaseAvatar {
+                height: 1rem;
+                width: 1rem;
+            }
+        }
+
+        .mx_MessageTimestamp {
+            font-size: $font-10px;
+            width: $timestamp-width;
+            text-align: right;
+        }
+
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding: 0;
+        }
+
+        .mx_EventTile_e2eIcon {
+            position: relative;
+            right: unset;
+            left: unset;
+            top: -2px;
+            padding: 0;
+        }
+
+        .mx_EventTile_line > * {
+            display: inline-block;
+        }
+    }
+
+    .mx_EventListSummary {
+        > .mx_EventTile_line {
+            padding-left: calc($name-width + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
+        }
+    }
+
+    .mx_EventTile.mx_EventTile_info {
+        .mx_EventTile_avatar {
+            left: calc($name-width + 10px + $icon-width);
+            top: 0;
+        }
+
+        .mx_EventTile_line {
+            left: calc($name-width + 10px + $icon-width);
+        }
+
+        .mx_TextualEvent {
+            line-height: $font-22px;
+        }
+    }
+
+    .mx_EventTile_continuation:not(.mx_EventTile_info) {
+        .mx_EventTile_avatar {
+            visibility: hidden;
+        }
+
+        .mx_SenderProfile {
+            visibility: hidden;
+        }
+    }
+}
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 0123d43920..80e5d17bf3 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -607,6 +607,7 @@ export default class MessagePanel extends React.Component {
                         isSelectedEvent={highlight}
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
+                        useIRCLayout={this.state.useIRCLayout}
                     />
                 </TileErrorBoundary>
             </li>,
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a64fd82eb5..2da9677a17 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -206,6 +206,9 @@ export default createReactClass({
 
         // whether to show reactions for this event
         showReactions: PropTypes.bool,
+
+        // whether to use the irc layout
+        useIRCLayout: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -653,6 +656,8 @@ export default createReactClass({
         const classes = classNames({
             mx_EventTile_bubbleContainer: isBubbleMessage,
             mx_EventTile: true,
+            mx_EventTile_irc: this.props.useIRCLayout,
+            mx_EventTile_group: !this.props.useIRCLayout,
             mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,
@@ -696,6 +701,9 @@ export default createReactClass({
             // joins/parts/etc
             avatarSize = 14;
             needsSenderProfile = false;
+        } else if (this.props.useIRCLayout) {
+            avatarSize = 14;
+            needsSenderProfile = true;
         } else if (this.props.continuation && this.props.tileShape !== "file_grid") {
             // no avatar or sender profile for continuation messages
             avatarSize = 0;
@@ -879,21 +887,29 @@ export default createReactClass({
                     this.props.permalinkCreator,
                     this._replyThread,
                 );
+
+                const linkedTimestamp = <a
+                        href={permalink}
+                        onClick={this.onPermalinkClicked}
+                        aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
+                    >
+                        { timestamp }
+                    </a>;
+
+                const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
+                const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
+
+
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
                     <div className={classes} tabIndex={-1}>
+                        { ircTimestamp }
                         <div className="mx_EventTile_msgOption">
                             { readAvatars }
                         </div>
                         { sender }
                         <div className="mx_EventTile_line">
-                            <a
-                                href={permalink}
-                                onClick={this.onPermalinkClicked}
-                                aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
-                            >
-                                { timestamp }
-                            </a>
+                            { groupTimestamp }
                             { !isBubbleMessage && this._renderE2EPadlock() }
                             { thread }
                             <EventTileType ref={this._tile}

From 37e8dc04776a5c38f832d5887b8d974aa9de67e2 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 15:07:47 +0100
Subject: [PATCH 2744/3235] Include new css files

---
 res/css/_components.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0ba2b609e8..a66d15af18 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -159,6 +159,8 @@
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
 @import "./views/rooms/_EventTile.scss";
+@import "./views/rooms/_EventTile_group.scss";
+@import "./views/rooms/_EventTile_irc.scss";
 @import "./views/rooms/_InviteOnlyIcon.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
 @import "./views/rooms/_LinkPreviewWidget.scss";

From 6c3e3161de314b109810db0987f04877e5f42a10 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 29 Apr 2020 15:29:25 +0100
Subject: [PATCH 2745/3235] Reduce padding

---
 res/css/views/rooms/_IRCLayout.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 6152749573..94ff681029 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -27,6 +27,7 @@ $right-padding: 5px;
         display: flex;
         flex-direction: row;
         align-items: flex-start;
+        padding-top: 0;
 
         > * {
             margin-right: $right-padding;

From 54d211a847c8f198c2547c0cc9fc6c9715d142e5 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 4 May 2020 21:40:52 +0100
Subject: [PATCH 2746/3235] Index file name changes

---
 res/css/_components.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index a66d15af18..5466b785c0 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -159,8 +159,8 @@
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
 @import "./views/rooms/_EventTile.scss";
-@import "./views/rooms/_EventTile_group.scss";
-@import "./views/rooms/_EventTile_irc.scss";
+@import "./views/rooms/_GroupLayout.scss";
+@import "./views/rooms/_IRCLayout.scss";
 @import "./views/rooms/_InviteOnlyIcon.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
 @import "./views/rooms/_LinkPreviewWidget.scss";

From 67249e1e9c17c9886812e1e2e07a71e298d2bb9e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 4 May 2020 21:53:48 +0100
Subject: [PATCH 2747/3235] Fix hover

---
 res/css/views/rooms/_IRCLayout.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 94ff681029..10d8c701c3 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -122,4 +122,12 @@ $right-padding: 5px;
             visibility: hidden;
         }
     }
+
+    // Suppress highlight thing from the normal Layout.
+    .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
+    .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
+    .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
+        padding-left: 0;
+        border-left: 0;
+    }
 }

From 027826c2e1ca45cda9588a8d5cee257581048987 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 5 May 2020 10:54:44 +0100
Subject: [PATCH 2748/3235] Replies have the same layout as messages

---
 res/css/views/rooms/_IRCLayout.scss          | 13 +++++++--
 src/components/views/elements/ReplyThread.js |  9 ++++--
 src/components/views/rooms/EventTile.js      | 29 ++++++++++----------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 10d8c701c3..c7cf2c31c2 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -63,9 +63,12 @@ $right-padding: 5px;
             display: flex;
             align-items: center;
 
-            > .mx_BaseAvatar {
-                height: 1rem;
-                width: 1rem;
+            // Need to use important to override the js provided height and width values.
+            > .mx_BaseAvatar, .mx_BaseAvatar > * {
+                height: $font-14px !important;
+                width: $font-14px !important;
+                font-size: $font-10px !important;
+                line-height: $font-14px !important;
             }
         }
 
@@ -90,6 +93,10 @@ $right-padding: 5px;
         .mx_EventTile_line > * {
             display: inline-block;
         }
+
+        .mx_EventTile_reply {
+            order: 3;
+        }
     }
 
     .mx_EventListSummary {
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index eae2d13f8a..a8f9599f35 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -37,6 +37,8 @@ export default class ReplyThread extends React.Component {
         // called when the ReplyThread contents has changed, including EventTiles thereof
         onHeightChanged: PropTypes.func.isRequired,
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
+        // Specifies which layout to use.
+        useIRCLayout: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -176,12 +178,12 @@ export default class ReplyThread extends React.Component {
         };
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref) {
+    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
         if (!ReplyThread.getParentEventId(parentEv)) {
             return <div />;
         }
         return <ReplyThread parentEv={parentEv} onHeightChanged={onHeightChanged}
-            ref={ref} permalinkCreator={permalinkCreator} />;
+            ref={ref} permalinkCreator={permalinkCreator} useIRCLayout={useIRCLayout} />;
     }
 
     componentDidMount() {
@@ -331,7 +333,8 @@ export default class ReplyThread extends React.Component {
                     onHeightChanged={this.props.onHeightChanged}
                     permalinkCreator={this.props.permalinkCreator}
                     isRedacted={ev.isRedacted()}
-                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
+                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
+                    useIRCLayout={this.props.useIRCLayout} />
             </blockquote>;
         });
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 2da9677a17..837c8929b9 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -795,6 +795,17 @@ export default createReactClass({
             />;
         }
 
+        const linkedTimestamp = <a
+                href={permalink}
+                onClick={this.onPermalinkClicked}
+                aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
+            >
+                { timestamp }
+            </a>;
+
+        const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
+        const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
+
         switch (this.props.tileShape) {
             case 'notif': {
                 const room = this.context.getRoom(this.props.mxEvent.getRoomId());
@@ -862,12 +873,11 @@ export default createReactClass({
                 }
                 return (
                     <div className={classes}>
+                        { ircTimestamp }
                         { avatar }
                         { sender }
                         <div className="mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                { timestamp }
-                            </a>
+                            { groupTimestamp }
                             { !isBubbleMessage && this._renderE2EPadlock() }
                             { thread }
                             <EventTileType ref={this._tile}
@@ -886,20 +896,9 @@ export default createReactClass({
                     this.props.onHeightChanged,
                     this.props.permalinkCreator,
                     this._replyThread,
+                    this.props.useIRCLayout,
                 );
 
-                const linkedTimestamp = <a
-                        href={permalink}
-                        onClick={this.onPermalinkClicked}
-                        aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
-                    >
-                        { timestamp }
-                    </a>;
-
-                const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
-                const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
-
-
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
                     <div className={classes} tabIndex={-1}>

From 0af265bf93e703c42492c51b41a23f485f4099fe Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 5 May 2020 16:24:50 +0100
Subject: [PATCH 2749/3235] Fix replies

---
 res/css/views/rooms/_IRCLayout.scss          | 9 ++++++++-
 src/components/views/elements/ReplyThread.js | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index c7cf2c31c2..b45d34013c 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -90,10 +90,17 @@ $right-padding: 5px;
             padding: 0;
         }
 
-        .mx_EventTile_line > * {
+        .mx_EventTile_line .mx_EventTile_content,
+        .mx_EventTile_line .mx_EventTile_e2eIcon,
+        .mx_eventTile_line > div {
             display: inline-block;
         }
 
+        .mx_EvenTile_line .mx_MessageActionBar,
+        .mx_EvenTile_line .mx_ReplyThread_wrapper {
+            display: block;
+        }
+
         .mx_EventTile_reply {
             order: 3;
         }
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index a8f9599f35..52a94110ba 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -338,7 +338,7 @@ export default class ReplyThread extends React.Component {
             </blockquote>;
         });
 
-        return <div>
+        return <div className="mx_ReplyThread_wrapper">
             <div>{ header }</div>
             <div>{ evTiles }</div>
         </div>;

From 07c2d0cb0256ff7ab359416222d6411e0100594a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 6 May 2020 09:24:33 +0100
Subject: [PATCH 2750/3235] Composer reply previews have group layout

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4749742a7d..663db5e942 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -370,7 +370,7 @@ export default class MessageComposer extends React.Component {
         }
 
         return (
-            <div className="mx_MessageComposer">
+            <div className="mx_MessageComposer mx_GroupLayout">
                 <div className="mx_MessageComposer_wrapper">
                     <div className="mx_MessageComposer_row">
                         { controls }

From 5568e6488d18c2ef8da79514f852ac562cdcf049 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 6 May 2020 09:51:01 +0100
Subject: [PATCH 2751/3235] Fix encryption badge layout

---
 res/css/views/rooms/_IRCLayout.scss          | 2 +-
 src/components/views/elements/ReplyThread.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index b45d34013c..968d8ebdea 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -92,7 +92,7 @@ $right-padding: 5px;
 
         .mx_EventTile_line .mx_EventTile_content,
         .mx_EventTile_line .mx_EventTile_e2eIcon,
-        .mx_eventTile_line > div {
+        .mx_EventTile_line .mx_ReplyThread_wrapper_empty {
             display: inline-block;
         }
 
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 52a94110ba..de242f5632 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -180,7 +180,7 @@ export default class ReplyThread extends React.Component {
 
     static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
         if (!ReplyThread.getParentEventId(parentEv)) {
-            return <div />;
+            return <div className="mx_ReplyThread_wrapper_empty" />;
         }
         return <ReplyThread parentEv={parentEv} onHeightChanged={onHeightChanged}
             ref={ref} permalinkCreator={permalinkCreator} useIRCLayout={useIRCLayout} />;

From 771ae5e18f23b7b7954950b43fa7e5e52b70b0e8 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 7 May 2020 13:55:23 +0100
Subject: [PATCH 2752/3235] Fix encryption badge layouts and replies. Begin
 removing dependence on slider. Move settings to labs. Username
 disambiguation.

---
 res/css/views/rooms/_IRCLayout.scss           | 34 +++++++++++++++----
 src/components/structures/MessagePanel.js     | 16 +++++++--
 src/components/views/elements/ReplyThread.js  | 10 ++++--
 .../views/messages/SenderProfile.js           |  3 ++
 src/components/views/rooms/EventTile.js       |  6 +++-
 src/i18n/strings/en_EN.json                   |  1 +
 src/settings/Settings.js                      | 17 +++++++---
 7 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 968d8ebdea..e4536aec20 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$name-width: 50px;
+$name-width: 70px;
 $icon-width: 14px;
 $timestamp-width: 45px;
 $right-padding: 5px;
 
 .mx_IRCLayout {
 
-    line-height: $font-22px !important;
+    line-height: $font-20px !important;
 
     .mx_EventTile {
         display: flex;
@@ -46,11 +46,13 @@ $right-padding: 5px;
             text-align: right;
             display: flex;
             align-items: center;
+            overflow: visible;
         }
 
         > .mx_EventTile_line {
             order: 3;
             flex-grow: 1;
+            margin-bottom: -6px;
         }
 
         > .mx_EventTile_avatar {
@@ -90,10 +92,13 @@ $right-padding: 5px;
             padding: 0;
         }
 
-        .mx_EventTile_line .mx_EventTile_content,
-        .mx_EventTile_line .mx_EventTile_e2eIcon,
-        .mx_EventTile_line .mx_ReplyThread_wrapper_empty {
-            display: inline-block;
+        .mx_EventTile_line {
+            .mx_EventTile_e2eIcon,
+            .mx_TextualEvent,
+            .mx_MTextBody,
+            .mx_ReplyThread_wrapper_empty {
+                display: inline-block;
+            }
         }
 
         .mx_EvenTile_line .mx_MessageActionBar,
@@ -104,6 +109,10 @@ $right-padding: 5px;
         .mx_EventTile_reply {
             order: 3;
         }
+
+        .mx_EditMessageComposer_buttons {
+            position: relative;
+        }
     }
 
     .mx_EventListSummary {
@@ -144,4 +153,17 @@ $right-padding: 5px;
         padding-left: 0;
         border-left: 0;
     }
+
+    .mx_SenderProfile_hover {
+        background-color: $primary-bg-color;
+        overflow: hidden;
+        width: $name-width;
+        transition: width 2s;
+    }
+
+    .mx_SenderProfile_hover:hover {
+        overflow: visible;
+        width: auto;
+        z-index: 10;
+    }
 }
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 80e5d17bf3..66ed5ee81f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -117,7 +117,8 @@ export default class MessagePanel extends React.Component {
             // display 'ghost' read markers that are animating away
             ghostReadMarkers: [],
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
-            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+            useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+            displayAvatars: SettingsStore.getValue("feature_no_timeline_avatars"),
         };
 
         // opaque readreceipt info for each userId; used by ReadReceiptMarker
@@ -171,7 +172,8 @@ export default class MessagePanel extends React.Component {
         this._showTypingNotificationsWatcherRef =
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
 
-        this._layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
+        this._layoutWatcherRef = SettingsStore.watchSetting("feature_irc_ui", null, this.onLayoutChange);
+        this._displayAvatarsWatcherRef = SettingsStore.watchSetting("feature_no_timeline_avatars", null, this.onDisplayAvatarsChange);
     }
 
     componentDidMount() {
@@ -182,6 +184,7 @@ export default class MessagePanel extends React.Component {
         this._isMounted = false;
         SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
         SettingsStore.unwatchSetting(this._layoutWatcherRef);
+        SettingsStore.unwatchSetting(this._displayAvatarsWatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -202,7 +205,13 @@ export default class MessagePanel extends React.Component {
 
     onLayoutChange = () => {
         this.setState({
-            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+            useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+        });
+    }
+
+    onDisplayAvatarsChange = () => {
+        this.setState({
+            displayAvatars: SettingsStore.getValue("feature_no_timeline_avatars"),
         });
     }
 
@@ -608,6 +617,7 @@ export default class MessagePanel extends React.Component {
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
                         useIRCLayout={this.state.useIRCLayout}
+                        displayAvatars={this.state.displayAvatars}
                     />
                 </TileErrorBoundary>
             </li>,
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index de242f5632..d1d46e709a 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -39,6 +39,8 @@ export default class ReplyThread extends React.Component {
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
         // Specifies which layout to use.
         useIRCLayout: PropTypes.bool,
+        // Specifies whether to display avatars.
+        displayAvatars: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -178,12 +180,12 @@ export default class ReplyThread extends React.Component {
         };
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
+    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout, displayAvatars) {
         if (!ReplyThread.getParentEventId(parentEv)) {
             return <div className="mx_ReplyThread_wrapper_empty" />;
         }
         return <ReplyThread parentEv={parentEv} onHeightChanged={onHeightChanged}
-            ref={ref} permalinkCreator={permalinkCreator} useIRCLayout={useIRCLayout} />;
+            ref={ref} permalinkCreator={permalinkCreator} useIRCLayout={useIRCLayout} displayAvatars={displayAvatars} />;
     }
 
     componentDidMount() {
@@ -334,7 +336,9 @@ export default class ReplyThread extends React.Component {
                     permalinkCreator={this.props.permalinkCreator}
                     isRedacted={ev.isRedacted()}
                     isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
-                    useIRCLayout={this.props.useIRCLayout} />
+                    useIRCLayout={this.props.useIRCLayout}
+                    displayAvatars={this.props.displayAvatars}
+                />
             </blockquote>;
         });
 
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index bed93b68c3..d95c9d685a 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -131,7 +131,10 @@ export default createReactClass({
 
         return (
             <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
+                <div className="mx_SenderProfile_hover">
+                    { content }
                 { content }
+                </div>
             </div>
         );
     },
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 837c8929b9..b2daa5667f 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -209,6 +209,9 @@ export default createReactClass({
 
         // whether to use the irc layout
         useIRCLayout: PropTypes.bool,
+
+        // whether to display avatars
+        displayAvatars: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -713,7 +716,7 @@ export default createReactClass({
             needsSenderProfile = true;
         }
 
-        if (this.props.mxEvent.sender && avatarSize) {
+        if (this.props.mxEvent.sender && avatarSize && this.props.displayAvatars) {
             avatar = (
                     <div className="mx_EventTile_avatar">
                         <MemberAvatar member={this.props.mxEvent.sender}
@@ -897,6 +900,7 @@ export default createReactClass({
                     this.props.permalinkCreator,
                     this._replyThread,
                     this.props.useIRCLayout,
+                    this.props.displayAvatars,
                 );
 
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3dcba0f546..a3cd88f9ae 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -409,6 +409,7 @@
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use IRC layout": "Use IRC layout",
+    "Display user avatars on messages": "Display user avatars on messages",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index c51bf44ee5..7942aa67fc 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -143,6 +143,18 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_irc_ui": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Use IRC layout'),
+        default: false,
+        isFeature: true,
+    },
+    "feature_no_timeline_avatars": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Display user avatars on messages'),
+        default: true,
+        isFeature: true,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],
@@ -170,11 +182,6 @@ export const SETTINGS = {
         default: true,
         invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
     },
-    "useIRCLayout": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Use IRC layout'),
-        default: false,
-    },
     "useCompactLayout": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Use compact timeline layout'),

From 5a0fdb36c0ec70ddb87f1f918b953c4389392509 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 7 May 2020 14:06:40 +0100
Subject: [PATCH 2753/3235] Remove unused setting

---
 src/settings/Settings.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 7942aa67fc..032b0ee906 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -94,12 +94,6 @@ export const SETTINGS = {
     //     // not use this for new settings.
     //     invertedSettingName: "my-negative-setting",
     // },
-    "feature_alternate_message_layouts": {
-        isFeature: true,
-        displayName: _td("Alternate message layouts"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),

From bc5fc57dd667d89fd774949cb2b940d198518a90 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 7 May 2020 14:22:15 +0100
Subject: [PATCH 2754/3235] Lint

This is why we shouldn't rely on regex
---
 src/components/structures/MessagePanel.js    | 6 +++++-
 src/components/views/elements/ReplyThread.js | 9 +++++++--
 src/i18n/strings/en_EN.json                  | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 66ed5ee81f..f46df0175a 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -173,7 +173,11 @@ export default class MessagePanel extends React.Component {
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
 
         this._layoutWatcherRef = SettingsStore.watchSetting("feature_irc_ui", null, this.onLayoutChange);
-        this._displayAvatarsWatcherRef = SettingsStore.watchSetting("feature_no_timeline_avatars", null, this.onDisplayAvatarsChange);
+        this._displayAvatarsWatcherRef = SettingsStore.watchSetting(
+            "feature_no_timeline_avatars",
+            null,
+            this.onDisplayAvatarsChange,
+        );
     }
 
     componentDidMount() {
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index d1d46e709a..6bfda5dd94 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -184,8 +184,13 @@ export default class ReplyThread extends React.Component {
         if (!ReplyThread.getParentEventId(parentEv)) {
             return <div className="mx_ReplyThread_wrapper_empty" />;
         }
-        return <ReplyThread parentEv={parentEv} onHeightChanged={onHeightChanged}
-            ref={ref} permalinkCreator={permalinkCreator} useIRCLayout={useIRCLayout} displayAvatars={displayAvatars} />;
+        return <ReplyThread
+            parentEv={parentEv}
+            onHeightChanged={onHeightChanged}
+            ref={ref}
+            permalinkCreator={permalinkCreator}
+            useIRCLayout={useIRCLayout}
+            displayAvatars={displayAvatars} />;
     }
 
     componentDidMount() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a3cd88f9ae..ca62eb44fa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -405,11 +405,11 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
+    "Use IRC layout": "Use IRC layout",
+    "Display user avatars on messages": "Display user avatars on messages",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
-    "Use IRC layout": "Use IRC layout",
-    "Display user avatars on messages": "Display user avatars on messages",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",

From ac95172ed4e6981bc5615fb982176d4a8c17a866 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 7 May 2020 14:56:45 +0100
Subject: [PATCH 2755/3235] tighter layout

---
 res/css/views/rooms/_IRCLayout.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index e4536aec20..fcdeef6590 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -21,7 +21,7 @@ $right-padding: 5px;
 
 .mx_IRCLayout {
 
-    line-height: $font-20px !important;
+    line-height: $font-18px !important;
 
     .mx_EventTile {
         display: flex;
@@ -52,7 +52,6 @@ $right-padding: 5px;
         > .mx_EventTile_line {
             order: 3;
             flex-grow: 1;
-            margin-bottom: -6px;
         }
 
         > .mx_EventTile_avatar {

From 4068c64b9230c627fc16ed9d5fc1798381370b6b Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Thu, 7 May 2020 14:31:46 +0000
Subject: [PATCH 2756/3235] Translated using Weblate (German)

Currently translated at 78.9% (1819 of 2304 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, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4500a678e6..c320bfff3f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1470,8 +1470,8 @@
     "Double check that your server supports the room version chosen and try again.": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.",
     "%(senderName)s placed a voice call.": "%(senderName)s hat einen Sprachanruf getätigt.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
-    "%(senderName)s placed a video call.": "%(senderName)s hat einen Sprachanruf getätigt.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
+    "%(senderName)s placed a video call.": "%(senderName)s hat einen Videoanruf getätigt.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Videoanruf getätigt. (Nicht von diesem Browser unterstützt)",
     "Verify this session": "Sitzung verifizieren",
     "Set up encryption": "Verschlüsselung einrichten",
     "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s hat %(addedAddresses)s und %(count)s Adressen zu diesem Raum hinzugefügt",

From 2f7f76acd1958afa3c5c1f4cb41cb4631e1e8317 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 7 May 2020 14:22:23 +0000
Subject: [PATCH 2757/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2304 of 2304 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index e8012733c3..53f4ea1aa3 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2414,5 +2414,6 @@
     "Keys restored": "Chiavi ripristinate",
     "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente",
     "You signed in to a new session without verifying it:": "Hai fatto l'accesso ad una nuova sessione senza verificarla:",
-    "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto."
+    "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>."
 }

From f70a06083a34f8577a9d226089703938dc0ec83a Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Thu, 7 May 2020 12:25:51 +0000
Subject: [PATCH 2758/3235] Translated using Weblate (Japanese)

Currently translated at 57.2% (1318 of 2304 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 | 72 ++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 4188464408..20f8097c0c 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -376,9 +376,9 @@
     "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
     "Mirror local video feed": "ローカルビデオ映像送信",
     "Send analytics data": "分析データを送信する",
-    "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プレビューを有効にする",
+    "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": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
     "Active call (%(roomName)s)": "アクティブな通話 (%(roomName)s)",
@@ -540,12 +540,12 @@
     "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プレビュー",
+    "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 プレビュー",
     "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": "オーディオの復号化エラー",
@@ -931,7 +931,7 @@
     "Algorithm": "アルゴリズム",
     "unencrypted": "暗号化されていない",
     "Decryption error": "復号化エラー",
-    "Session ID": "セッションID",
+    "Session ID": "セッション ID",
     "End-to-end encryption information": "エンドツーエンド暗号化情報",
     "Event information": "イベント情報",
     "Passphrases must match": "パスフレーズは一致する必要があります",
@@ -1050,7 +1050,7 @@
     "Show display name changes": "表示名の変更を表示する",
     "Show read receipts sent by other users": "他の人の既読情報を表示する",
     "Enable big emoji in chat": "チャットで大きな絵文字を有効にする",
-    "Send typing notifications": "入力中であることを通知する",
+    "Send typing notifications": "入力中通知を送信する",
     "Enable Community Filter Panel": "コミュニティーフィルターパネルを有効にする",
     "Show recently visited rooms above the room list": "最近訪問した部屋をリストの上位に表示する",
     "Low bandwidth mode": "低帯域通信モード",
@@ -1192,7 +1192,7 @@
     "Delete %(count)s sessions|one": "%(count)s 件のセッションを削除",
     "ID": "ID",
     "Clear cache and reload": "キャッシュを削除して再読み込み",
-    "Session ID:": "セッションID:",
+    "Session ID:": "セッション ID:",
     "Session key:": "セッション鍵:",
     "Cross-signing": "クロス署名",
     "Sessions": "セッション",
@@ -1307,5 +1307,51 @@
     "Recent Conversations": "最近会話したユーザー",
     "Suggestions": "提案",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "相手の名前、( <userId/> のような)ユーザー名、メールアドレスを使って会話を開始できます。",
-    "Go": "続行"
+    "Go": "続行",
+    "Session already verified!": "このセッションは検証済みです。",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告: このセッションは検証済みです、しかし鍵が一致していません！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告: 鍵の検証に失敗しました！提供された鍵「%(fingerprint)s」は、%(userId)s およびセッション %(deviceId)s の署名鍵「%(fprint)s」と一致しません。これはつまり、あなたの会話が傍受・盗聴されようとしている恐れがあるということです！",
+    "Show typing notifications": "入力中通知を表示する",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "あなたのホームサーバーが対応していない場合は (通話中に自己の IP アドレスが相手に共有されるのを防ぐために) 代替通話支援サーバー turn.matrix.org の使用を許可する",
+    "Your homeserver does not support cross-signing.": "あなたのホームサーバーはクロス署名に対応していません。",
+    "Cross-signing and secret storage are enabled.": "クロス署名および機密ストレージは有効です。",
+    "Reset cross-signing and secret storage": "クロス署名および機密ストレージをリセット",
+    "in memory": "メモリー内",
+    "not found": "存在しない",
+    "in secret storage": "機密ストレージ内",
+    "Self signing private key:": "自己署名秘密鍵:",
+    "cached locally": "ローカルキャッシュ",
+    "not found locally": "ローカルに存在しない",
+    "User signing private key:": "ユーザー署名秘密鍵:",
+    "Session backup key:": "セッションバックアップ鍵:",
+    "Secret storage public key:": "機密ストレージ公開鍵:",
+    "in account data": "アカウントデータ内",
+    "Homeserver feature support:": "ホームサーバーの対応状況:",
+    "exists": "対応している",
+    "Secret Storage key format:": "機密ストレージ鍵の形式:",
+    "outdated": "最新版でない",
+    "up to date": "最新版",
+    "Your homeserver does not support session management.": "あなたのホームサーバーはセッション管理に対応していません。",
+    "Unable to load session list": "セッション一覧を読み込めません",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています。 キャッシュの保存に ",
+    " to store messages from ": " を使用中であり ",
+    "rooms.": "件の部屋のメッセージが含まれています。",
+    "Manage": "管理",
+    "Add an email address to configure email notifications": "メールアドレスを追加すると電子メール通知の設定も行えます。",
+    "Custom theme URL": "カスタムテーマ URL",
+    "Add theme": "テーマの追加",
+    "Account management": "アカウントの管理",
+    "Deactivating your account is a permanent action - be careful!": "アカウントの無効化は取り消せません。ご注意ください。",
+    "Deactivate account": "アカウントの無効化",
+    "Room list": "部屋一覧",
+    "Timeline": "タイムライン",
+    "Message search": "メッセージの検索",
+    "Published Addresses": "公開アドレス",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "公開アドレスを使うと、どのサーバーのどのユーザーでもあなたの部屋に参加することができます。アドレスを公開するには、まずローカルアドレスとして設定する必要があります。",
+    "Local Addresses": "ローカルアドレス",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot は検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています:",
+    "Space used:": "使用中のストレージ容量:",
+    "Indexed messages:": "インデックス済みのメッセージ数:",
+    "Indexed rooms:": "インデックス済みの部屋数:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 件の部屋の内 %(doneRooms)s 件"
 }

From fa0f704b567701ff9089934ad118722c98afeb85 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 8 May 2020 00:05:16 +0100
Subject: [PATCH 2759/3235] clear tag panel selection if the community selected
 is left

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/GroupStore.js    |  6 ++++++
 src/stores/TagOrderStore.js | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 6aad6aeaec..78a144f755 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -18,6 +18,7 @@ import EventEmitter from 'events';
 import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
 import {MatrixClientPeg} from '../MatrixClientPeg';
+import dis from '../dispatcher';
 
 function parseMembersResponse(response) {
     return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
@@ -295,6 +296,11 @@ class GroupStore extends EventEmitter {
     }
 
     leaveGroup(groupId) {
+        // ensure the tag panel filter is cleared if the group was selected
+        dis.dispatch({
+            action: "deselect_tags",
+            tag: groupId,
+        });
         return MatrixClientPeg.get().leaveGroup(groupId)
             // The user should now not be able to access group settings
             .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 6d03a2b289..c05728e497 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -168,9 +168,16 @@ class TagOrderStore extends Store {
             }
             break;
             case 'deselect_tags':
-                this._setState({
-                    selectedTags: [],
-                });
+                if (payload.tag) {
+                    // if a tag is passed, only deselect that tag
+                    this._setState({
+                        selectedTags: this._state.selectedTags.filter(tag => tag !== payload.tag),
+                    });
+                } else {
+                    this._setState({
+                        selectedTags: [],
+                    });
+                }
                 Analytics.trackEvent('FilterStore', 'deselect_tags');
             break;
             case 'on_client_not_viable':

From 5402839f309ac377b6bdb898d1def370235641c6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 8 May 2020 00:15:48 +0100
Subject: [PATCH 2760/3235] Close ImageView when

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/ImageView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index e675e6b73f..edadc841a3 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -73,6 +73,7 @@ export default class ImageView extends React.Component {
         Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
             onFinished: (proceed) => {
                 if (!proceed) return;
+                this.props.onFinished();
                 MatrixClientPeg.get().redactEvent(
                     this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(),
                 ).catch(function(e) {

From baa7a86e3ea5d9e79481b9d037a29f7df4af1928 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 8 May 2020 16:33:50 +0100
Subject: [PATCH 2761/3235] Assume room should be unencrypted if homeserver
 does not implement keys/query

Dendrite (and others) do not support key fetching (or indeed, E2E at all). Rather than failing to create a room at all, leave it unencrypted. Fixes #13598
---
 src/createRoom.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index a39d2c2216..4d59b11656 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -212,7 +212,17 @@ export async function _waitForMember(client, roomId, userId, opts = { timeout: 1
  * can encrypt to.
  */
 export async function canEncryptToAllUsers(client, userIds) {
-    const usersDeviceMap = await client.downloadKeys(userIds);
+    let usersDeviceMap;
+    try {
+        usersDeviceMap = await client.downloadKeys(userIds);
+    } catch (ex) {
+       if (ex.httpStatus === 404) {
+            // The endpoint to fetch keys doesn't exist: force unencrypted.
+            // See: https://github.com/vector-im/riot-web/issues/13598
+            return false;
+       }
+       throw ex;
+    }
     // { "@user:host": { "DEVICE": {...}, ... }, ... }
     return Object.values(usersDeviceMap).every((userDevices) =>
         // { "DEVICE": {...}, ... }

From 055fcd1e984a6ccd982571cf77b82f072d985c4a Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 8 May 2020 14:25:01 +0000
Subject: [PATCH 2762/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2304 of 2304 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 0c7312fcf9..5d6ac9ed48 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2393,5 +2393,6 @@
     "Repeat your recovery passphrase...": "Ripetu vian rehavan pasfrazon…",
     "Secure your backup with a recovery passphrase": "Sekurigu vian savkopion per rehava pasfrazo",
     "Currently indexing: %(currentRoom)s": "Nun indeksante: %(currentRoom)s",
-    "Cancel replying to a message": "Nuligi respondon al mesaĝo"
+    "Cancel replying to a message": "Nuligi respondon al mesaĝo",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>."
 }

From f1c625aac9fd53a170483641dfa1929cbfcddaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 7 May 2020 20:23:09 +0000
Subject: [PATCH 2763/3235] Translated using Weblate (Estonian)

Currently translated at 40.8% (939 of 2304 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 9f410d8cf4..47afbd1fcd 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -935,5 +935,8 @@
     "Show less": "Näita vähem",
     "Show more": "Näita rohkem",
     "Warning!": "Hoiatus!",
-    "Do you want to set an email address?": "Kas sa soovid seadistada e-posti aadressi?"
+    "Do you want to set an email address?": "Kas sa soovid seadistada e-posti aadressi?",
+    "Close dialog": "Sulge dialoog",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Meeldetuletus: sinu brauser ei ole toetatud ja seega rakenduse kasutuskogemus võib olla ennustamatu.",
+    "Toggle this dialog": "Lülita see dialoog sisse/välja"
 }

From 823699c2c228e628050071f2d54d5adb3554bd1f Mon Sep 17 00:00:00 2001
From: David Mehren <dmehren1@gmail.com>
Date: Fri, 8 May 2020 13:13:57 +0000
Subject: [PATCH 2764/3235] Translated using Weblate (German)

Currently translated at 79.0% (1820 of 2304 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c320bfff3f..99f58d865a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1890,5 +1890,6 @@
     "this room": "Dieser Raum",
     "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
     "Send a bug report with logs": "Sende Fehlermeldung mit Protokoll",
-    "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen"
+    "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen",
+    "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen."
 }

From 1d9f2eb017180e0b16cb4d8ec32e0da3e71100f8 Mon Sep 17 00:00:00 2001
From: Frisk <furrtrex43@protonmail.ch>
Date: Fri, 8 May 2020 15:26:15 +0000
Subject: [PATCH 2765/3235] Translated using Weblate (Polish)

Currently translated at 67.8% (1563 of 2304 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 7cf8a256c8..b54c950263 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1588,5 +1588,6 @@
     "Toggle Bold": "Przełącz pogrubienie",
     "Toggle Italics": "Przełącz kursywę",
     "Toggle Quote": "Przełącz cytowanie",
-    "Cancel autocomplete": "Anuluj autouzupełnienie"
+    "Cancel autocomplete": "Anuluj autouzupełnienie",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania."
 }

From 5601e80ea2a8f44261b683220ec48870527ad45f Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 8 May 2020 08:15:23 +0000
Subject: [PATCH 2766/3235] Translated using Weblate (Russian)

Currently translated at 90.4% (2083 of 2304 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 24fd434155..3591d96120 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1284,7 +1284,7 @@
     "Something went wrong with your invite to %(roomName)s": "Что-то пошло не так с вашим приглашением в %(roomName)s",
     "You can only join it with a working invite.": "Вы можете присоединиться к ней только с рабочим приглашением.",
     "You can still join it because this is a public room.": "Вы всё ещё можете присоединиться к ней, потому что это публичная комната.",
-    "Join the discussion": "Присоединяйтесь к обсуждению",
+    "Join the discussion": "Присоединиться к обсуждению",
     "Try to join anyway": "Постарайся присоединиться в любом случае",
     "Do you want to chat with %(user)s?": "Хотите пообщаться с %(user)s?",
     "Do you want to join %(roomName)s?": "Хотите присоединиться к %(roomName)s?",
@@ -1407,7 +1407,7 @@
     "Some characters not allowed": "Некоторые символы не разрешены",
     "Create your Matrix account on %(serverName)s": "Создайте свою учётную запись Matrix на %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Создайте учётную запись Matrix на <underlinedServerName />",
-    "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам  на крупнейшем общедоступном сервере",
+    "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам на крупнейшем общедоступном сервере",
     "Premium hosting for organisations <a>Learn more</a>": "Премиум-хостинг для организаций <a>Подробнее</a>",
     "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать другой сервер",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Пожалуйста, установите <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> для наилучшего результата.",
@@ -1685,7 +1685,7 @@
     "Room Autocomplete": "Автозаполнение комнаты",
     "User Autocomplete": "Автозаполнение пользователя",
     "Quick Reactions": "Быстрая реакция",
-    "Frequently Used": "Часто используемый",
+    "Frequently Used": "Часто используемые",
     "Smileys & People": "Смайлики & Люди",
     "Animals & Nature": "Животные & Природа",
     "Food & Drink": "Еда & Напитки",

From 737f83c94131650b9899ee808169f1aa40715475 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Thu, 7 May 2020 20:57:28 +0000
Subject: [PATCH 2767/3235] Translated using Weblate (Ukrainian)

Currently translated at 25.9% (596 of 2304 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 | 68 ++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 50c15dad2d..f00ae5b399 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -21,7 +21,7 @@
     "Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
     "Continue": "Продовжити",
     "Accept": "Прийняти",
-    "Account": "Обліковка",
+    "Account": "Обліківка",
     "%(targetName)s accepted an invitation.": "%(targetName)s приймає запрошення.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s приймає запрошення від %(displayName)s.",
     "Access Token:": "Токен доступу:",
@@ -75,14 +75,14 @@
     "%(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": "Адреса е-пошти",
     "Failed to send email": "Помилка відправки  е-почти",
     "Edit": "Редактувати",
     "Unpin Message": "Відкріпити повідомлення",
     "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": "Повідомлення у чатах \"сам на сам\"",
@@ -154,7 +154,7 @@
     "Explore Account Data": "Продивитись данні аккаунта",
     "All messages (noisy)": "Усі повідомлення (гучно)",
     "Saturday": "Субота",
-    "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
+    "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити",
     "Direct Chat": "Прямий чат",
     "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
     "Room not found": "Кімнату не знайдено",
@@ -188,7 +188,7 @@
     "Invite to this room": "Запросити до цієї кімнати",
     "Thursday": "Четвер",
     "Search…": "Пошук…",
-    "Logs sent": "Журнали відправленні",
+    "Logs sent": "Журнали надіслані",
     "Back": "Назад",
     "Reply": "Відповісти",
     "Show message in desktop notification": "Показати повідомлення в сповіщення на робочому столі",
@@ -216,7 +216,7 @@
     "Event sent!": "Захід відправлено!",
     "Unhide Preview": "Відкрити попередній перегляд",
     "Event Content": "Зміст заходу",
-    "Thank you!": "Дякую!",
+    "Thank you!": "Дякуємо!",
     "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...": "Перевірка оновлень…",
     "There are advanced notifications which are not shown here": "Є додаткові сповіщення, що не показуються тут",
@@ -467,7 +467,7 @@
     "Failed to mute user": "Не вдалося заглушити користувача",
     "Failed to toggle moderator status": "Не вдалося перемкнути статус модератора",
     "Failed to change power level": "Не вдалося змінити рівень повноважень",
-    "Chat with Riot Bot": "Чат із Riot-ботом",
+    "Chat with Riot Bot": "Балачка з Riot-ботом",
     "Whether or not you're logged in (we don't record your username)": "Незалежно від того, увійшли ви чи ні (ми не записуємо ваше ім'я користувача)",
     "A conference call could not be started because the integrations server is not available": "Конференц-дзвінок не можна розпочати оскільки інтеграційний сервер недоступний",
     "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не вийшло відвантажити.",
@@ -484,7 +484,7 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете відвантажити цей файл без відповіді?",
     "Name or Matrix ID": "Імʼя або Matrix ID",
     "Identity server has no terms of service": "Сервер ідентифікації не має умов надання послуг",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Щоб підтвердити адресу е-пошту або телефон ця дія потребує доступу до типового серверу ідентифікації <server />, але сервер не має жодних умов надання послуг.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Щоб підтвердити адресу е-пошти або телефон ця дія потребує доступу до типового серверу ідентифікації <server />, але сервер не має жодних умов надання послуг.",
     "Only continue if you trust the owner of the server.": "Продовжуйте тільки якщо довіряєте власнику сервера.",
     "Trust": "Довіра",
     "Unable to load! Check your network connectivity and try again.": "Завантаження неможливе! Перевірте інтернет-зʼєднання та спробуйте ще.",
@@ -505,7 +505,7 @@
     "This room has no topic.": "Ця кімната не має теми.",
     "Sets the room name": "Встановлює назву кімнати",
     "Use an identity server": "Використовувати сервер ідентифікації",
-    "Use an identity server to invite by email. Manage in Settings.": "Використовувати ідентифікаційний сервер для запрошення через е-пошту. Керування у настройках.",
+    "Use an identity server to invite by email. Manage in Settings.": "Використовувати сервер ідентифікації для запрошень через е-пошту. Керується у налаштуваннях.",
     "Unbans user with given ID": "Розблоковує користувача з вказаним ідентифікатором",
     "Adds a custom widget by URL to the room": "Додає власний віджет до кімнати за посиланням",
     "Please supply a https:// or http:// widget URL": "Вкажіть посилання на віджет — https:// або http://",
@@ -561,5 +561,53 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Ця кімната не є прилюдною. Ви не зможете перепід'єднатись без запрошення.",
     "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.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете її залишити."
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете її залишити.",
+    "Use Single Sign On to continue": "Використати Single Sign On для продовження",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Підтвердьте додавання цієї адреси е-пошти через використання Single Sign On аби довести вашу ідентичність.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Підтвердити додавання е-пошти",
+    "Click the button below to confirm adding this email address.": "Клацніть на кнопці нижче щоб підтвердити додавання цієї адреси е-пошти.",
+    "Confirm": "Підтвердити",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Підтвердьте додавання цього телефонного номера через використання Single Sign On аби довести вашу ідентичність.",
+    "Confirm adding phone number": "Підтвердити додавання телефонного номера",
+    "Click the button below to confirm adding this phone number.": "Клацніть на кнопці нижче щоб підтвердити додавання цього телефонного номера.",
+    "The version of Riot": "Версія Riot",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Чи використовуєте ви Riot на пристрої, де основним засобом вводження є дотик",
+    "Whether you're using Riot as an installed Progressive Web App": "Чи використовуєте ви Riot як встановлений Progressive Web App",
+    "Your user agent": "Ваш user agent",
+    "The information being sent to us to help make Riot better includes:": "Відсилана до нас інформація, що допомагає покращити Riot, містить:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "У цій кімнаті є невідомі сесії: якщо ви продовжите не звіряючи їх, то ваші розмови можуть бути прослухані.",
+    "Review Sessions": "Переглянути сесії",
+    "If you cancel now, you won't complete verifying the other user.": "Якщо ви скасуєте зараз, то не завершите звіряння іншого користувача.",
+    "If you cancel now, you won't complete verifying your other session.": "Якщо ви скасуєте зараз, то не завершите звіряння вашої іншої сесії.",
+    "If you cancel now, you won't complete your operation.": "Якщо ви скасуєте зараз, то не завершите вашу дію.",
+    "Cancel entering passphrase?": "Скасувати введення парольної фрази?",
+    "Enter passphrase": "Введіть парольну фразу",
+    "Setting up keys": "Налаштовування ключів",
+    "Verify this session": "Звірити цю сесію",
+    "Sign In or Create Account": "Увійти або створити обліківку",
+    "Use your account or create a new one to continue.": "Скористайтесь вашою обліківкою або створіть нову щоб продовжити.",
+    "Create Account": "Створити обліківку",
+    "Sign In": "Увійти",
+    "Verify all your sessions to ensure your account & messages are safe": "Звірте усі ваші сесії аби переконатись, що ваші обліківка та повідомлення у безпеці",
+    "Later": "Пізніше",
+    "Review": "Переглянути",
+    "Verify yourself & others to keep your chats safe": "Звірте себе й інших щоб зберегти ваше спілкування у безпеці",
+    "Verify": "Звірити",
+    "Verify the new login accessing your account: %(name)s": "Звірити новий вхід, що доступається до вашої обліковки: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "Від %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Відхилити (%(counter)s)",
+    "Language and region": "Мова та регіон",
+    "Account management": "Керування обліківкою",
+    "Deactivating your account is a permanent action - be careful!": "Деактивація вашої обліківки є безповоротною дією — будьте обережні!",
+    "Deactivate Account": "Деактивувати обліківку",
+    "Deactivate account": "Деактивувати обліківку",
+    "Legal": "Правова інформація",
+    "Credits": "Подяки",
+    "For help with using Riot, click <a>here</a>.": "Якщо необхідна допомога у користуванні Riot'ом, клацніть <a>тут</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Якщо необхідна допомога у користуванні Riot'ом, клацніть <a>тут</a> або розпочніть балачку з нашим ботом, клацнувши на кнопці нижче.",
+    "Join the conversation with an account": "Приєднатись до бесіди з обліківкою",
+    "Unable to restore session": "Неможливо відновити сесію",
+    "We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити вашу попередню сесію.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, або <safariLink>Safari</safariLink>."
 }

From 93f2a8377432dd5310417534ee240f0271d6dc18 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 8 May 2020 16:36:13 +0100
Subject: [PATCH 2768/3235] Revert "Assume room should be unencrypted if
 homeserver does not implement keys/query"

This reverts commit baa7a86e3ea5d9e79481b9d037a29f7df4af1928.
---
 src/createRoom.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index 4d59b11656..a39d2c2216 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -212,17 +212,7 @@ export async function _waitForMember(client, roomId, userId, opts = { timeout: 1
  * can encrypt to.
  */
 export async function canEncryptToAllUsers(client, userIds) {
-    let usersDeviceMap;
-    try {
-        usersDeviceMap = await client.downloadKeys(userIds);
-    } catch (ex) {
-       if (ex.httpStatus === 404) {
-            // The endpoint to fetch keys doesn't exist: force unencrypted.
-            // See: https://github.com/vector-im/riot-web/issues/13598
-            return false;
-       }
-       throw ex;
-    }
+    const usersDeviceMap = await client.downloadKeys(userIds);
     // { "@user:host": { "DEVICE": {...}, ... }, ... }
     return Object.values(usersDeviceMap).every((userDevices) =>
         // { "DEVICE": {...}, ... }

From 6ff093f5a36034af61f53258b2dc525a621b5755 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 8 May 2020 19:15:59 +0100
Subject: [PATCH 2769/3235] Bring back UnknownBody for UISIs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 +
 res/css/views/messages/_UnknownBody.scss      | 16 +++++++++++
 .../views/messages/EditHistoryMessage.js      |  1 -
 src/components/views/messages/MessageEvent.js |  4 +++
 src/components/views/messages/UnknownBody.js  | 27 +++++++++++++++++++
 src/components/views/rooms/EventTile.js       |  1 -
 6 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 res/css/views/messages/_UnknownBody.scss
 create mode 100644 src/components/views/messages/UnknownBody.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0344074369..428a28ac3a 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -144,6 +144,7 @@
 @import "./views/messages/_RoomAvatarEvent.scss";
 @import "./views/messages/_SenderProfile.scss";
 @import "./views/messages/_TextualEvent.scss";
+@import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";
 @import "./views/messages/_common_CryptoEvent.scss";
 @import "./views/right_panel/_EncryptionInfo.scss";
diff --git a/res/css/views/messages/_UnknownBody.scss b/res/css/views/messages/_UnknownBody.scss
new file mode 100644
index 0000000000..9036e12bf0
--- /dev/null
+++ b/res/css/views/messages/_UnknownBody.scss
@@ -0,0 +1,16 @@
+/*
+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.
+*/
+
+.mx_UnknownBody {
+    white-space: pre-wrap;
+}
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index e0ca23d244..df27773a40 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -158,7 +158,6 @@ export default class EditHistoryMessage extends React.PureComponent {
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1);
         const classes = classNames({
             "mx_EventTile": true,
-            "mx_EventTile_redacted": mxEvent.isRedacted(),
             "mx_EventTile_sending": isSending,
             "mx_EventTile_notSent": this.state.sendStatus === 'not_sent',
         });
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index f8bd23cbe3..eb74270762 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
 import RedactedBody from "./RedactedBody";
+import UnknownBody from "./UnknownBody";
 
 export default createReactClass({
     displayName: 'MessageEvent',
@@ -88,6 +89,9 @@ export default createReactClass({
             } else if (content.url) {
                 // Fallback to MFileBody if there's a content URL
                 BodyType = bodyTypes['m.file'];
+            } else {
+                // Fallback to UnknownBody otherwise if not redacted
+                BodyType = UnknownBody;
             }
         }
 
diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.js
new file mode 100644
index 0000000000..6c00921b45
--- /dev/null
+++ b/src/components/views/messages/UnknownBody.js
@@ -0,0 +1,27 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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";
+
+export default ({mxEvent}) => {
+    const text = mxEvent.getContent().body;
+    return (
+        <span className="mx_UnknownBody">
+            { text }
+        </span>
+    );
+};
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a64fd82eb5..33ee8a0f63 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -670,7 +670,6 @@ export default createReactClass({
             mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2E_STATE.UNKNOWN,
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
-            mx_EventTile_redacted: isRedacted,
         });
 
         let permalink = "#";

From 9b7c63a7116c369d3e3e59c3a643067b6666ebca Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Fri, 8 May 2020 20:53:32 +0100
Subject: [PATCH 2770/3235] Duplicated names

---
 src/components/views/messages/SenderProfile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index d95c9d685a..d512b186e9 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -133,7 +133,6 @@ export default createReactClass({
             <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
                 <div className="mx_SenderProfile_hover">
                     { content }
-                { content }
                 </div>
             </div>
         );

From 82396661cf86d7c41285cded2d22523e84f3bc23 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Fri, 8 May 2020 22:21:26 +0100
Subject: [PATCH 2771/3235] Implement nitpicks

- usernames are elipsed
- icon alignment fixed
- replies are more dense
- reply messages respond to name widths
- fixed between message padding problem (flex ftw)
---
 res/css/views/rooms/_IRCLayout.scss | 62 +++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index fcdeef6590..f5d8664884 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -18,12 +18,19 @@ $name-width: 70px;
 $icon-width: 14px;
 $timestamp-width: 45px;
 $right-padding: 5px;
+$irc-line-height: $font-18px;
 
 .mx_IRCLayout {
 
-    line-height: $font-18px !important;
+    line-height: $irc-line-height !important;
 
     .mx_EventTile {
+
+        // timestamps are links which shouldn't be underlined
+        > a {
+            text-decoration: none;
+        }
+
         display: flex;
         flex-direction: row;
         align-items: flex-start;
@@ -49,7 +56,10 @@ $right-padding: 5px;
             overflow: visible;
         }
 
-        > .mx_EventTile_line {
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding: 0;
+            display: flex;
+            flex-direction: column;
             order: 3;
             flex-grow: 1;
         }
@@ -60,7 +70,7 @@ $right-padding: 5px;
             top: 0;
             left: 0;
             flex-shrink: 0;
-            height: 22px;
+            height: $irc-line-height;
             display: flex;
             align-items: center;
 
@@ -79,10 +89,6 @@ $right-padding: 5px;
             text-align: right;
         }
 
-        .mx_EventTile_line, .mx_EventTile_reply {
-            padding: 0;
-        }
-
         .mx_EventTile_e2eIcon {
             position: relative;
             right: unset;
@@ -98,6 +104,8 @@ $right-padding: 5px;
             .mx_ReplyThread_wrapper_empty {
                 display: inline-block;
             }
+
+            
         }
 
         .mx_EvenTile_line .mx_MessageActionBar,
@@ -114,10 +122,25 @@ $right-padding: 5px;
         }
     }
 
+    .mx_EventTile_emote {
+        > .mx_EventTile_avatar {
+            margin-left: calc($name-width + $icon-width + $right-padding);
+        }
+    }
+
+    blockquote {
+        margin: 0;
+    }
+
     .mx_EventListSummary {
         > .mx_EventTile_line {
             padding-left: calc($name-width + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
         }
+
+        .mx_EventListSummary_avatars {
+            padding: 0;
+            margin: 0;
+        }
     }
 
     .mx_EventTile.mx_EventTile_info {
@@ -131,16 +154,16 @@ $right-padding: 5px;
         }
 
         .mx_TextualEvent {
-            line-height: $font-22px;
+            line-height: $irc-line-height;
         }
     }
 
     .mx_EventTile_continuation:not(.mx_EventTile_info) {
-        .mx_EventTile_avatar {
+        > .mx_EventTile_avatar {
             visibility: hidden;
         }
 
-        .mx_SenderProfile {
+        > .mx_SenderProfile {
             visibility: hidden;
         }
     }
@@ -156,8 +179,15 @@ $right-padding: 5px;
     .mx_SenderProfile_hover {
         background-color: $primary-bg-color;
         overflow: hidden;
-        width: $name-width;
-        transition: width 2s;
+
+        > span {
+            display: flex;
+
+            > .mx_SenderProfile_name {
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
     }
 
     .mx_SenderProfile_hover:hover {
@@ -165,4 +195,12 @@ $right-padding: 5px;
         width: auto;
         z-index: 10;
     }
+
+    .mx_ReplyThread {
+        margin: 0;
+        .mx_SenderProfile {
+            width: unset;
+            max-width: $name-width;
+        }
+    }
 }

From fef4d882c44dcf93b677bac50cc09097df7f7839 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Fri, 8 May 2020 22:35:40 +0100
Subject: [PATCH 2772/3235] lint

---
 res/css/views/rooms/_IRCLayout.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index f5d8664884..301f712ffb 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -104,8 +104,6 @@ $irc-line-height: $font-18px;
             .mx_ReplyThread_wrapper_empty {
                 display: inline-block;
             }
-
-            
         }
 
         .mx_EvenTile_line .mx_MessageActionBar,

From 3e3196ca4c51a010d629a26a3960c088c379e174 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Fri, 8 May 2020 19:58:06 +0000
Subject: [PATCH 2773/3235] Translated using Weblate (German)

Currently translated at 90.7% (2088 of 2303 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 | 275 +++++++++++++++++++++++++++++++++++-
 1 file changed, 270 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 99f58d865a..5afc04771b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -467,8 +467,8 @@
     "Leave %(groupName)s?": "%(groupName)s verlassen?",
     "Add a Room": "Raum hinzufügen",
     "Add a User": "Benutzer hinzufügen",
-    "Light theme": "Helles Thema",
-    "Dark theme": "Dunkles Thema",
+    "Light theme": "Helles Design",
+    "Dark theme": "Dunkles Design",
     "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.",
     "Matrix ID": "Matrix-ID",
     "Unignore": "Ignorieren aufheben",
@@ -964,7 +964,7 @@
     "Incompatible Database": "Inkompatible Datenbanken",
     "Continue With Encryption Disabled": "Mit deaktivierter Verschlüsselung fortfahren",
     "Enter a passphrase...": "Passphrase eingeben...",
-    "Next": "Nächstes",
+    "Next": "Weiter",
     "That matches!": "Das passt!",
     "That doesn't match.": "Das passt nicht.",
     "Go back to set it again.": "Gehe zurück und setze es erneut.",
@@ -1502,7 +1502,7 @@
     "Verify": "Verifizieren",
     "Decline (%(counter)s)": "Zurückweisen (%(counter)s)",
     "not found": "nicht gefunden",
-    "rooms.": "Räume.",
+    "rooms.": "Räumen zu speichern.",
     "Manage": "Verwalten",
     "Securely cache encrypted messages locally for them to appear in search results.": "Speichere verschlüsselte Nachrichten sicher lokal zwischen, sodass sie in Suchergebnissen erscheinen können.",
     "Enable": "Aktivieren",
@@ -1891,5 +1891,270 @@
     "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
     "Send a bug report with logs": "Sende Fehlermeldung mit Protokoll",
     "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen",
-    "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen."
+    "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen.",
+    "You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:",
+    "Other users may not trust it": "Andere Benutzer vertrauen ihr vielleicht nicht",
+    "Update your secure storage": "Aktualisiere deinen sicheren Speicher",
+    "Upgrade": "Hochstufen",
+    "Verify the new login accessing your account: %(name)s": "Verifiziere die neue Anmeldung an deinem Konto: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "Von %(deviceName)s (%(deviceId)s)",
+    "Your homeserver does not support cross-signing.": "Dein Heimserver unterstützt cross-signing nicht.",
+    "Cross-signing and secret storage are enabled.": "Cross-signing und der sichere Speicher wurden eingerichtet.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Dein Konto hat eine cross-signing Identität im sicheren Speicher aber diese Sitzung wird noch nicht vertraut.",
+    "Cross-signing and secret storage are not yet set up.": "Cross-signing und der sichere Speicher wurden noch nicht eingerichtet.",
+    "Reset cross-signing and secret storage": "Setze cross-signing und den sicheren Speicher zurück",
+    "Bootstrap cross-signing and secret storage": "Richte cross-signing und den sicheren Speicher ein",
+    "unexpected type": "unbekannter Typ",
+    "Cross-signing public keys:": "Öffentliche Cross-signing Schlüssel:",
+    "in memory": "im Speicher",
+    "Cross-signing private keys:": "Private Cross-signing Schlüssel:",
+    "in secret storage": "im sicheren Speicher",
+    "Self signing private key:": "Selbst signierter privater Schlüssel:",
+    "cached locally": "lokal zwischengespeichert",
+    "not found locally": "lokal nicht gefunden",
+    "User signing private key:": "Privater Benutzer-Schlüssel:",
+    "Session backup key:": "Sitzungswiederherstellungsschlüssel:",
+    "Secret storage public key:": "Öffentlicher Schlüssel des sicheren Speichers:",
+    "in account data": "in den Kontodaten",
+    "Homeserver feature support:": "Heimserverunterstützung:",
+    "exists": "existiert",
+    "Secret Storage key format:": "Sicherer Speicher Schlüssel Format:",
+    "outdated": "abgelaufen",
+    "up to date": "aktuell",
+    "Delete sessions|other": "Lösche Sitzungen",
+    "Delete sessions|one": "Lösche Sitzung",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Sitzungen eines Benutzers einzeln verifizieren. Geräten, die ein Benutzer als vertrauenswürdig markiert hat, wird nicht automatisch vertraut (cross-signing).",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Der Zwischenspeicher für die lokale Suche in verschlüsselten Nachrichten benötigt ",
+    " to store messages from ": " um Nachrichten aus ",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot benötigt weitere Komponenten um verschlüsselte Nachrichten lokal zu durchsuchen. Wenn du diese Funktion testen möchtest kannst du dir deine eigene Version von Riot Desktop mit der <nativeLink>integrierten Suchfunktion bauen</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot kann verschlüsselte Nachrichten nicht lokal durchsuchen während es im Browser läuft. Verwende <riotLink>Riot Desktop</riotLink> damit verschlüsselte Nachrichten mit der Suchfunktion gefunden werden.",
+    "Backup has a <validity>valid</validity> signature from this user": "Die Sicherung hat eine <validity>gültige</validity> Signatur dieses Benutzers",
+    "Backup has a <validity>invalid</validity> signature from this user": "Die Sicherung hat eine <validity>ungültige</validity> Signatur dieses Benutzers",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Die Sicherung hat eine <validity>gültige</validity> Signatur von einer <verify>verifizierten</verify> Sitzung <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>gültige</validity> Signatur von einer <verify>nicht verifizierten</verify> Sitzung <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von einer <verify>verifizierten</verify> Sitzung <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von einer <verify>nicht verifizierten</verify> Sitzung <device></device>",
+    "Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden <b>nicht von dieser Sitzung gesichert</b>.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Du verwendest aktuell <server></server> um andere Benutzer zu finden und gefunden zu werden. Du kannst deinen Identitätsserver unten ändern.",
+    "Invalid theme schema.": "Ungültiges Design Schema.",
+    "Error downloading theme information.": "Fehler beim herunterladen des Themas.",
+    "Theme added!": "Design hinzugefügt!",
+    "Custom theme URL": "URL des benutzerdefinierten Designs",
+    "Add theme": "Design hinzufügen",
+    "Keyboard Shortcuts": "Tastaturkürzel",
+    "Where you’re logged in": "Wo du dich angemeldet hast",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Benenne deine Sitzungen, melde dich aus den Sitzungen ab oder <a>verifiziere sie in deinen Benutzereinstellungen</a>.",
+    "Error changing power level requirement": "Fehler beim Ändern der Anforderungen für Benutzerrechte",
+    "Error changing power level": "Fehler beim Ändern der Benutzerrechte",
+    "Your email address hasn't been verified yet": "Deine E-Mail Adresse wurde noch nicht verifiziert",
+    "Verify the link in your inbox": "Verifiziere den Link in deinem Nachrichteneingang",
+    "Complete": "Fertig",
+    "Revoke": "Zurückziehen",
+    "Share": "Teilen",
+    "You have not verified this user.": "Du hast diesen Benutzer nicht verifiziert.",
+    "Everyone in this room is verified": "Jeder in diesem Raum ist verifiziert",
+    "Mod": "Mod",
+    "Invite only": "Nur auf Einladung",
+    "Scroll to most recent messages": "Springe zur neusten Nachricht",
+    "No recent messages by %(user)s found": "Keine neuen Nachrichten von %(user)s gefunden",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Versuche nach oben zu scrollen um zu sehen ob sich dort frühere Nachrichten befinden.",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Dies kann bei vielen Nachrichten einige Zeit dauern. Bitte lade die Anwendung in dieser Zeit nicht neu.",
+    "Deactivate user?": "Benutzer deaktivieren?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Beim Deaktivieren wird der Benutzer abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher dass du diesen Benutzer deaktivieren willst?",
+    "Deactivate user": "Benutzer deaktivieren",
+    "Failed to deactivate user": "Deaktivieren des Benutzers fehlgeschlagen",
+    "Send a reply…": "Sende eine Antwort…",
+    "Send a message…": "Sende eine Nachricht…",
+    "Bold": "Fett",
+    "Italics": "Kursiv",
+    "Strikethrough": "Durchgestrichen",
+    "Code block": "Quelltext",
+    "Recent rooms": "Letzte Räume",
+    "Loading …": "Lade …",
+    "Join the conversation with an account": "Tritt der Unterhaltung mit einem Konto bei",
+    "You were kicked from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s entfernt",
+    "Re-join": "Wieder beitreten",
+    "You were banned from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s verbannt",
+    "Something went wrong with your invite to %(roomName)s": "Bei deiner Einladung zu %(roomName)s ist ein Fehler aufgetreten",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem Raum-Administrator weitergeben.",
+    "You can only join it with a working invite.": "Du kannst nur mit einer gültigen Einladung beitreten.",
+    "Try to join anyway": "Versuche trotzdem beizutreten",
+    "You can still join it because this is a public room.": "Du kannst trotzdem beitreten da dies ein öffentlicher Raum ist.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Diese Einladung zu %(roomName)s wurde an die Adresse %(email)s gesendet, die nicht zu deinem Konto gehört",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto um die Einladungen direkt in Riot zu erhalten.",
+    "This invite to %(roomName)s was sent to %(email)s": "Diese Einladung zu %(roomName)s wurde an %(email)s gesendet",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Verknüpfe einen Identitätsserver in den Einstellungen um die Einladungen direkt in Riot zu erhalten.",
+    "Share this email in Settings to receive invites directly in Riot.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in Riot zu erhalten.",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kann keine Vorschau erzeugt werden. Möchtest du den Raum betreten?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher dass du hier richtig bist?",
+    "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum-Administrator deine Zutrittsrechte zu überprüfen.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Beim Betreten des Raums ist ein Fehler aufgetreten %(errcode)s. Wenn du denkst dass diese Meldung nicht korrekt ist <issueLink>sende bitte einen Fehlerbericht</issueLink>.",
+    "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten, inklusive Erwähnungen.",
+    "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
+    "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.",
+    "%(count)s unread messages.|one": "1 ungelesene Nachricht.",
+    "Unread mentions.": "Ungelesene Erwähnungen.",
+    "Unread messages.": "Ungelesene Nachrichten.",
+    "This room has already been upgraded.": "Dieser Raum wurde bereits hochgestuft.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dieser Raum läuft mit der Raumversion <roomVersion />, welcher dieser Heimserver als <i>instabil</i> markiert hat.",
+    "Unknown Command": "Unbekannter Befehl",
+    "Unrecognised command: %(commandText)s": "Unbekannter Befehl: %(commandText)s",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hinweis: Beginne deine Nachricht mit <code>//</code> um sie mit einem Querstrich zu beginnen.",
+    "Send as message": "Als Nachricht senden",
+    "Failed to connect to integration manager": "Fehler beim Verbinden mit dem Integrationsserver",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Konnte die Einladung nicht zurückziehen. Der Server hat ein vorübergehendes Problem oder du besitzt nicht die nötigen Rechte um die Einladung zurückzuziehen.",
+    "Mark all as read": "Alle als gelesen markieren",
+    "You don't have permission to delete the alias.": "Du hast nicht die nötigen Rechte um den Alias zu löschen.",
+    "Local address": "Lokale Adresse",
+    "Published Addresses": "Öffentliche Adresse",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Öffentliche Adressen können von jedem verwendet werden um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.",
+    "Other published addresses:": "Andere öffentliche Adressen:",
+    "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden, füge unten eine hinzu",
+    "New published address (e.g. #alias:server)": "Neue öffentliche Adresse (z.B. #alias:server)",
+    "Local Addresses": "Lokale Adressen",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Benutzer den Raum auf deinem Heimserver (%(localDomain)s) finden können",
+    "Waiting for you to accept on your other session…": "Warte auf die Bestätigung in deiner anderen Sitzung…",
+    "Waiting for %(displayName)s to accept…": "Warte auf die Annahme von %(displayName)s …",
+    "Accepting…": "Annehmen…",
+    "Start Verification": "Starte Verifikation",
+    "Messages in this room are end-to-end encrypted.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In verschlüsselten Räumen sind deine Nachrichten verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.",
+    "Verify User": "Benutzer verifizieren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Verifiziere den Benutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten, um die Sicherheit zu erhöhen.",
+    "Your messages are not secure": "Deine Nachrichten sind nicht sicher",
+    "One of the following may be compromised:": "Eines der folgenden könnte kompromittiert sein:",
+    "Your homeserver": "Dein Heimserver",
+    "The homeserver the user you’re verifying is connected to": "Der Heimserver an dem der zu verifizierende Benutzer angemeldet ist",
+    "Yours, or the other users’ internet connection": "Deine Internetverbindung oder die des anderen Benutzers",
+    "Yours, or the other users’ session": "Deine Sitzung oder die des anderen Benutzers",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
+    "This client does not support end-to-end encryption.": "Diese Anwendung unterstützt keine Ende-zu-Ende-Verschlüsselung.",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das Scannen eines QR Codes noch die Emoji Verifikation. Bitte versuche es mit einer anderen Anwendung.",
+    "Verify by scanning": "Mit Scannen eines QR Codes verifizieren",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obenstehenden Code nicht scannen kannst versuche es mit der Emoji Verifikation.",
+    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum um die vollständige Sicherheit zu gewährleisten.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du hast %(deviceName)s (%(deviceId)s) erfolgreich verifiziert!",
+    "Verified": "Verifiziert",
+    "Start verification again from the notification.": "Starte die Verifikation aus der Benachrichtigung erneut.",
+    "Start verification again from their profile.": "Starte die Verifikation aus dem Benutzerprofil erneut.",
+    "Verification timed out.": "Verifikationsanfrage abgelaufen.",
+    "You cancelled verification on your other session.": "Du hast die Verifikationsanfrage in der anderen Sitzung abgelehnt.",
+    "%(displayName)s cancelled verification.": "%(displayName)s hat die Verifikationsanfrage abgelehnt.",
+    "You cancelled verification.": "Du hast die Verifikation abgebrochen.",
+    "Verification cancelled": "Verifikation abgebrochen",
+    "Compare emoji": "Vergleiche Emojis",
+    "Message Actions": "Nachrichten Aktionen",
+    "Show image": "Zeige Bild",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Du ignorierst diesen Benutzer, deshalb werden seine Nachrichten nicht angezeigt. <a>Trotzdem anzeigen.</a>",
+    "You accepted": "Du hast angenommen",
+    "You declined": "Du hast abgelehnt",
+    "You cancelled": "Du hast abgebrochen",
+    "Accepting …": "Annehmen …",
+    "Declining …": "Ablehnen …",
+    "You sent a verification request": "Du hast eine Verifikationsanfrage gesendet",
+    "Show all": "Alle zeigen",
+    "Reactions": "Reaktionen",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> hat mit %(content)s reagiert</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>hat mit %(shortName)s reagiert</reactedWith>",
+    "Message deleted": "Nachricht gelöscht",
+    "Message deleted by %(name)s": "Nachricht von %(name)s gelöscht",
+    "Edited at %(date)s. Click to view edits.": "Am %(date)s geändert. Klicke um Änderungen anzuzeigen.",
+    "Can't load this message": "Kann diese Nachricht nicht laden",
+    "Submit logs": "Logs übermitteln",
+    "Frequently Used": "Häufig verwendet",
+    "Smileys & People": "Smileys & Leute",
+    "Animals & Nature": "Tiere & Natur",
+    "Food & Drink": "Essen & Trinken",
+    "Activities": "Aktivitäten",
+    "Travel & Places": "Reisen & Orte",
+    "Objects": "Objekte",
+    "Symbols": "Symbole",
+    "Flags": "Flaggen",
+    "Quick Reactions": "Praktische Reaktionen",
+    "Cancel search": "Suche abbrechen",
+    "Any of the following data may be shared:": "Die folgenden Daten können geteilt werden:",
+    "Your avatar URL": "Deine Avatar URL",
+    "Your user ID": "Deine Benutzer ID",
+    "Your theme": "Dein Design",
+    "Riot URL": "Riot URL",
+    "Room ID": "Raum ID",
+    "Widget ID": "Widget ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Wenn du dieses Widget verwendest können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsserver übertragen werden.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Wenn du dieses Widget verwendest können Daten <helpIcon /> zu %(widgetDomain)s übertragen werden.",
+    "Widgets do not use message encryption.": "Widgets verschlüsseln deine Nachrichten nicht.",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Bitte <newIssueLink>erstelle ein neues Issue</newIssueLink> auf GitHub damit wir diesen Fehler untersuchen können.",
+    "Rotate Left": "Nach links drehen",
+    "Rotate counter-clockwise": "Gegen den Uhrzeigersinn drehen",
+    "Rotate Right": "Nach rechts drehen",
+    "Rotate clockwise": "Im Uhrzeigersinn drehen",
+    "Language Dropdown": "Sprachauswahl",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)shaben keine Änderung vorgenommen",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)shat keine Änderung vorgenommen",
+    "Room alias": "Raum Alias",
+    "Some characters not allowed": "Manche Zeichen sind nicht erlaubt",
+    "Please provide a room alias": "Bitte lege einen Raum Alias an",
+    "This alias is available to use": "Dieser Alias kann verwendet werden",
+    "This alias is already in use": "Dieser Alias wird bereits verwendet",
+    "Enter a server name": "Gibt einen Servernamen ein",
+    "Looks good": "Das sieht gut aus",
+    "Can't find this server or its room list": "Kann diesen Server oder seine Raumliste nicht finden",
+    "All rooms": "Alle Räume",
+    "Your server": "Dein Server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Bist du sicher dass du <b>%(serverName)s</b> entfernen möchtest",
+    "Remove server": "Server entfernen",
+    "Matrix": "Matrix",
+    "Add a new server": "Einen Server hinzufügen",
+    "Enter the name of a new server you want to explore.": "Gib den Namen des Servers an den du erforschen möchtest.",
+    "Server name": "Servername",
+    "Add a new server...": "Füge einen Server hinzu...",
+    "%(networkName)s rooms": "%(networkName)s Räume",
+    "Matrix rooms": "Matrix Räume",
+    "Close dialog": "Dialog schließen",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Bitte teile uns mit was schiefgelaufen ist oder erstelle ein Github Issue und beschreibe das Problem.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Warnung: Dein Browser wird nicht unterstützt. Die Anwendung kann instabil sein.",
+    "Notes": "Notizen",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Wenn du mehr Informationen hast die uns bei Untersuchung des Problems helfen (z.B. was du gerade getan hast, Raum IDs, Benutzer IDs, etc.) gib sie bitte hier an.",
+    "Removing…": "Löschen…",
+    "Destroy cross-signing keys?": "Cross-signing Schlüssel löschen?",
+    "Clear cross-signing keys": "Entferne Cross-signing Schlüssel",
+    "Enable end-to-end encryption": "Ende-zu-Ende Verschlüsselung aktivieren",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kannst dies später nicht mehr ändern. Bridges und die meisten Bots werden nicht funktionieren.",
+    "Server did not require any authentication": "Der Server benötigt keine Authentifizierung",
+    "Server did not return valid authentication information.": "Der Server lieferte keine gültigen Authentifizierungsinformationen.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Bist du sicher dass du dein Konto deaktivieren möchtest? Dies kann nicht rückgängig gemacht werden.",
+    "There was a problem communicating with the server. Please try again.": "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten. Bitte versuche es erneut.",
+    "View Servers in Room": "Zeige Server im Raum",
+    "Verification Requests": "Verifikationsanfragen",
+    "Integrations are disabled": "Integrationen sind deaktiviert",
+    "Integrations not allowed": "Integrationen sind nicht erlaubt",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Fehler beim Einladen der folgenden Benutzer: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Beim Einladen der Benutzer ist ein Fehler aufgetreten.",
+    "Failed to find the following users": "Kann die folgenden Benutzer nicht finden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Die folgenden Benutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Du hast eine neue Sitzung '%(displayName)s' hinzugefügt, die deine Verschlüsselungsschlüssel anfordert.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Deine nicht verifizierte Sitzung '%(displayName)s' fordert deine Verschlüsselungsschlüssel an.",
+    "Loading session info...": "Lade Sitzungsinformationen...",
+    "a new master key signature": "Eine neue Hauptschlüssel Signatur",
+    "a new cross-signing key signature": "Eine neue cross-signing Schlüssel Signatur",
+    "a device cross-signing signature": "Eine Geräte Schlüssel Signatur",
+    "a key signature": "Eine Schlüssel Signatur",
+    "Your password": "Dein Passwort",
+    "This session, or the other session": "Diese oder die andere Sitzung",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Umschalt",
+    "Super": "Windows/Apple",
+    "Ctrl": "Strg",
+    "Toggle Bold": "Fett",
+    "Toggle Italics": "Kursiv",
+    "Toggle Quote": "Zitat",
+    "New line": "Neue Zeile",
+    "Page Up": "Bild hoch",
+    "Page Down": "Bild runter",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Leertaste",
+    "End": "Ende"
 }

From ea11016c4657535863c563f23d05691e22b62204 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 19:41:39 +0000
Subject: [PATCH 2774/3235] Translated using Weblate (German)

Currently translated at 90.7% (2088 of 2303 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5afc04771b..d11a1d4768 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2156,5 +2156,10 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Leertaste",
-    "End": "Ende"
+    "End": "Ende",
+    "Enable 'Manage Integrations' in Settings to do this.": "Aktiviere hierzu in den Einstellungen \"Integrationen verwalten\".",
+    "The internet connection either session is using": "Die Internetverbindung, die eine der beiden Sitzung verwendet",
+    "We recommend you change your password and recovery key in Settings immediately": "Wir empfehlen, dein Passwort und deine Wiederherstellungsschlüssel sofort in den Einstellungen zu ändern",
+    "New session": "Neue Sitzung",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:"
 }

From 7b1a3e72105d9415746afd93d3d8d67f4c574376 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 19:54:54 +0000
Subject: [PATCH 2775/3235] Translated using Weblate (German)

Currently translated at 90.8% (2091 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d11a1d4768..c74294e324 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2161,5 +2161,5 @@
     "The internet connection either session is using": "Die Internetverbindung, die eine der beiden Sitzung verwendet",
     "We recommend you change your password and recovery key in Settings immediately": "Wir empfehlen, dein Passwort und deine Wiederherstellungsschlüssel sofort in den Einstellungen zu ändern",
     "New session": "Neue Sitzung",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:"
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:"
 }

From c12105ca7f0c6f0338dcfd839e8b3f696812d029 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 19:55:08 +0000
Subject: [PATCH 2776/3235] Translated using Weblate (German)

Currently translated at 90.8% (2091 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c74294e324..e18601e83c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2161,5 +2161,8 @@
     "The internet connection either session is using": "Die Internetverbindung, die eine der beiden Sitzung verwendet",
     "We recommend you change your password and recovery key in Settings immediately": "Wir empfehlen, dein Passwort und deine Wiederherstellungsschlüssel sofort in den Einstellungen zu ändern",
     "New session": "Neue Sitzung",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:"
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet.",
+    "This wasn't me": "Das war ich nicht",
+    "Please fill why you're reporting.": "Bitte gib an, weshalb du Bericht erstattest."
 }

From 59aeb6e9460d76da8cae92bf3e4cd608c980a733 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 19:56:30 +0000
Subject: [PATCH 2777/3235] Translated using Weblate (German)

Currently translated at 91.0% (2095 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e18601e83c..dca994c2ac 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2164,5 +2164,8 @@
     "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:",
     "If you didn’t sign in to this session, your account may be compromised.": "Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet.",
     "This wasn't me": "Das war ich nicht",
-    "Please fill why you're reporting.": "Bitte gib an, weshalb du Bericht erstattest."
+    "Please fill why you're reporting.": "Bitte gib an, weshalb du einen Fehler meldest.",
+    "Automatically invite users": "Benutzer automatisch einladen",
+    "Upgrade private room": "Privaten Raum hochstufen",
+    "Upgrade public room": "Öffentlichen Raum hochstufen"
 }

From 7b1d23ea3e5724342ef51fe987fa525fc8f00b93 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 19:58:32 +0000
Subject: [PATCH 2778/3235] Translated using Weblate (German)

Currently translated at 91.0% (2095 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index dca994c2ac..0ef49fc08d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2167,5 +2167,6 @@
     "Please fill why you're reporting.": "Bitte gib an, weshalb du einen Fehler meldest.",
     "Automatically invite users": "Benutzer automatisch einladen",
     "Upgrade private room": "Privaten Raum hochstufen",
-    "Upgrade public room": "Öffentlichen Raum hochstufen"
+    "Upgrade public room": "Öffentlichen Raum hochstufen",
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem Riot hast, bitte <a>melde einen Bug</a>."
 }

From c3a5ad89445f294c109d04fccdd404c76fc1733d Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 19:58:45 +0000
Subject: [PATCH 2779/3235] Translated using Weblate (German)

Currently translated at 91.2% (2100 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0ef49fc08d..9d17baab3a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2168,5 +2168,5 @@
     "Automatically invite users": "Benutzer automatisch einladen",
     "Upgrade private room": "Privaten Raum hochstufen",
     "Upgrade public room": "Öffentlichen Raum hochstufen",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem Riot hast, bitte <a>melde einen Bug</a>."
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem Riot hast, <a>melde bitte einen Bug</a>."
 }

From b809be11c02c1a74a2718dbfabca77181d7b0117 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 19:59:02 +0000
Subject: [PATCH 2780/3235] Translated using Weblate (German)

Currently translated at 91.2% (2100 of 2303 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9d17baab3a..f0f943bb92 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2168,5 +2168,10 @@
     "Automatically invite users": "Benutzer automatisch einladen",
     "Upgrade private room": "Privaten Raum hochstufen",
     "Upgrade public room": "Öffentlichen Raum hochstufen",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem Riot hast, <a>melde bitte einen Bug</a>."
+    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem Riot hast, <a>melde bitte einen Bug</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du wirst diesen Raum von <oldVersion /> zu <newVersion /> aktualisieren.",
+    "Missing session data": "Fehlende Sitzungsdaten",
+    "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
+    "Integration Manager": " Integrationsverwaltung",
+    "Find others by phone or email": "Finde andere per Telefon oder E-Mail"
 }

From f7b68667a0e56237eea9d37e8df1226ee6aae965 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:00:18 +0000
Subject: [PATCH 2781/3235] Translated using Weblate (German)

Currently translated at 91.3% (2103 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f0f943bb92..a49be9e13f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2173,5 +2173,5 @@
     "Missing session data": "Fehlende Sitzungsdaten",
     "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
     "Integration Manager": " Integrationsverwaltung",
-    "Find others by phone or email": "Finde andere per Telefon oder E-Mail"
+    "Find others by phone or email": "Finde Andere per Telefon oder E-Mail"
 }

From d17e30f448ab4f095f7ee2afae053e2675669455 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:00:28 +0000
Subject: [PATCH 2782/3235] Translated using Weblate (German)

Currently translated at 91.3% (2103 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a49be9e13f..7ac3a9495e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2173,5 +2173,8 @@
     "Missing session data": "Fehlende Sitzungsdaten",
     "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
     "Integration Manager": " Integrationsverwaltung",
-    "Find others by phone or email": "Finde Andere per Telefon oder E-Mail"
+    "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
+    "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
+    "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": " Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenmaximum ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s."
 }

From a262540dbf1a526e9cf1821815a8e698d18c10b1 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:01:55 +0000
Subject: [PATCH 2783/3235] Translated using Weblate (German)

Currently translated at 91.4% (2104 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7ac3a9495e..0549bf36a5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2176,5 +2176,5 @@
     "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": " Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenmaximum ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s."
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß."
 }

From ec5273646ae8bf2f2e65d5421b022fff79dc8ca9 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:02:05 +0000
Subject: [PATCH 2784/3235] Translated using Weblate (German)

Currently translated at 91.4% (2104 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0549bf36a5..aa7122c124 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2176,5 +2176,6 @@
     "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß."
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenlimit ist %(limit)s."
 }

From 5bc3cc557b6c7f632d67c34a29c6dde58d777278 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:02:26 +0000
Subject: [PATCH 2785/3235] Translated using Weblate (German)

Currently translated at 91.4% (2105 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index aa7122c124..6bbe4b2ad1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2177,5 +2177,5 @@
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
-    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenlimit ist %(limit)s."
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s."
 }

From dfbc8e80c14c8515d87479a1c0cac7e309bc2d4d Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:02:32 +0000
Subject: [PATCH 2786/3235] Translated using Weblate (German)

Currently translated at 91.4% (2105 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6bbe4b2ad1..4124f627e7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2177,5 +2177,6 @@
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
-    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s."
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenlimit ist %(limit)s."
 }

From b8f90ba186971ce6c7513e0f994a4fae95406134 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:02:51 +0000
Subject: [PATCH 2787/3235] Translated using Weblate (German)

Currently translated at 91.7% (2111 of 2303 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 4124f627e7..3920c99273 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2178,5 +2178,7 @@
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
-    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Das Dateigrößenlimit ist %(limit)s."
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
+    "Verify other session": "Andere Sitzung verifizieren",
+    "Verification Request": "Verifikationsanfrage"
 }

From f75d0dbcf13cbf71d14f2df8da1a11cbbbaefdc3 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:02:59 +0000
Subject: [PATCH 2788/3235] Translated using Weblate (German)

Currently translated at 91.7% (2111 of 2303 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3920c99273..23a7843913 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2180,5 +2180,9 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Verify other session": "Andere Sitzung verifizieren",
-    "Verification Request": "Verifikationsanfrage"
+    "Verification Request": "Verifikationsanfrage",
+    "Upload %(count)s other files|other": "%(count)s andere Dateien hochladen",
+    "Upload %(count)s other files|one": "%(count)s andere Datei hochladen",
+    "A widget would like to verify your identity": "Ein Widget möchte deine Identität verifizieren",
+    "Remember my selection for this widget": "Erinnere meine Auswahl für dieses Widget"
 }

From 36934b4e410b333a4004e3dfbf8e7f7f249a78ee Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:04:18 +0000
Subject: [PATCH 2789/3235] Translated using Weblate (German)

Currently translated at 92.4% (2128 of 2303 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 23a7843913..94a8a5c751 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2184,5 +2184,14 @@
     "Upload %(count)s other files|other": "%(count)s andere Dateien hochladen",
     "Upload %(count)s other files|one": "%(count)s andere Datei hochladen",
     "A widget would like to verify your identity": "Ein Widget möchte deine Identität verifizieren",
-    "Remember my selection for this widget": "Erinnere meine Auswahl für dieses Widget"
+    "Remember my selection for this widget": "Speichere meine Auswahl für dieses Widget",
+    "Restoring keys from backup": "Schlüssel aus der Sicherung wiederherstellen",
+    "Fetching keys from server...": "Lade Schlüssel vom Server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s von %(total)s Schlüsseln wiederhergestellt",
+    "Keys restored": "Schlüssel wiederhergestellt",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s Schlüssel erfolgreich wiederhergestellt",
+    "Reload": "Neu laden",
+    "Take picture": "Foto machen",
+    "User Status": "Benutzerstatus",
+    "Country Dropdown": "Landauswahl"
 }

From d8a343d675c183afdefb24e851f7c9eb3b3c02fe Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:04:56 +0000
Subject: [PATCH 2790/3235] Translated using Weblate (German)

Currently translated at 92.4% (2128 of 2303 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 94a8a5c751..2edc28f9be 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2193,5 +2193,13 @@
     "Reload": "Neu laden",
     "Take picture": "Foto machen",
     "User Status": "Benutzerstatus",
-    "Country Dropdown": "Landauswahl"
+    "Country Dropdown": "Landauswahl",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Wenn du deinen Wiederherstellungsschlüssel vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>.",
+    "Recovery key mismatch": "Nicht übereinstimmende Wiederherstellungsschlüssel",
+    "Incorrect recovery passphrase": "Falsche Wiederherstellungspassphrase",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Wenn du deine Wiederherstellungsschlüssel vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>",
+    "Resend edit": "Bearbeitung erneut senden",
+    "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s Reaktion(en) erneut senden",
+    "Resend removal": "Entfernen erneut senden",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deiner Heimserver-Administration."
 }

From 6dff315489106f52a6130681177b5318ffff161b Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:10:27 +0000
Subject: [PATCH 2791/3235] Translated using Weblate (German)

Currently translated at 92.6% (2132 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 2edc28f9be..f21f1f3cac 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2201,5 +2201,5 @@
     "Resend edit": "Bearbeitung erneut senden",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s Reaktion(en) erneut senden",
     "Resend removal": "Entfernen erneut senden",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deiner Heimserver-Administration."
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deinem Heimserver-Administrator."
 }

From cf3a22e33ef23b340f6050a99e40312c9cfd08b7 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:10:53 +0000
Subject: [PATCH 2792/3235] Translated using Weblate (German)

Currently translated at 92.6% (2132 of 2303 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f21f1f3cac..919c95224f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2201,5 +2201,9 @@
     "Resend edit": "Bearbeitung erneut senden",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s Reaktion(en) erneut senden",
     "Resend removal": "Entfernen erneut senden",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deinem Heimserver-Administrator."
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deinem Heimserver-Administrator.",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Da kein Identitätsserver konfiguriert ist, kannst du keine E-Mail-Adresse hinzufügen, um dein Kennwort in Zukunft zurückzusetzen.",
+    "Use an email address to recover your account": "Verwende eine E-Mail-Adresse, um dein Konto wiederherzustellen",
+    "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
+    "Doesn't look like a valid email address": "Sieht nicht nach einer gültigen E-Mail-Adresse aus"
 }

From db7702c808b612681b5b0ad2c8390472ec584519 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:11:41 +0000
Subject: [PATCH 2793/3235] Translated using Weblate (German)

Currently translated at 92.7% (2134 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 919c95224f..164aff2469 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2205,5 +2205,5 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Da kein Identitätsserver konfiguriert ist, kannst du keine E-Mail-Adresse hinzufügen, um dein Kennwort in Zukunft zurückzusetzen.",
     "Use an email address to recover your account": "Verwende eine E-Mail-Adresse, um dein Konto wiederherzustellen",
     "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
-    "Doesn't look like a valid email address": "Sieht nicht nach einer gültigen E-Mail-Adresse aus"
+    "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus"
 }

From 8a07e80ead24a0f4497cc70935c5de24c5d08303 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:12:01 +0000
Subject: [PATCH 2794/3235] Translated using Weblate (German)

Currently translated at 92.7% (2134 of 2303 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 164aff2469..577d49f2c8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2205,5 +2205,7 @@
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Da kein Identitätsserver konfiguriert ist, kannst du keine E-Mail-Adresse hinzufügen, um dein Kennwort in Zukunft zurückzusetzen.",
     "Use an email address to recover your account": "Verwende eine E-Mail-Adresse, um dein Konto wiederherzustellen",
     "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
-    "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus"
+    "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus",
+    "Enter phone number (required on this homeserver)": "Telefonnummer eingeben (auf diesem Heimserver erforderlich)",
+    "Doesn't look like a valid phone number": "Sieht nicht nach einer gültigen Telefonnummer aus"
 }

From 37471e451d88ffb349af5a7f98bc2dcfdcdad144 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:12:16 +0000
Subject: [PATCH 2795/3235] Translated using Weblate (German)

Currently translated at 93.0% (2141 of 2303 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 577d49f2c8..ff26afa4f3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2207,5 +2207,9 @@
     "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
     "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus",
     "Enter phone number (required on this homeserver)": "Telefonnummer eingeben (auf diesem Heimserver erforderlich)",
-    "Doesn't look like a valid phone number": "Sieht nicht nach einer gültigen Telefonnummer aus"
+    "Doesn't look like a valid phone number": "Das sieht nicht nach einer gültigen Telefonnummer aus",
+    "Sign in with SSO": "Mit Single-Sign-On anmelden",
+    "Welcome to %(appName)s": "Willkommen bei %(appName)s",
+    "Send a Direct Message": "Sende eine Direktnachricht",
+    "Create a Group Chat": "Erstelle einen Gruppenchat"
 }

From 4dd26105fd9b56c84ef7d88e0234a553fce5558a Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:12:24 +0000
Subject: [PATCH 2796/3235] Translated using Weblate (German)

Currently translated at 93.0% (2141 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ff26afa4f3..b9c4b15d7a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2211,5 +2211,8 @@
     "Sign in with SSO": "Mit Single-Sign-On anmelden",
     "Welcome to %(appName)s": "Willkommen bei %(appName)s",
     "Send a Direct Message": "Sende eine Direktnachricht",
-    "Create a Group Chat": "Erstelle einen Gruppenchat"
+    "Create a Group Chat": "Erstelle einen Gruppenchat",
+    "Use lowercase letters, numbers, dashes and underscores only": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "URL deines benutzerdefinierten Identitätsservers eingeben <a>Was bedeutet das?</a>",
+    "Riot failed to get the public room list.": "Riot konnte die Liste der öffentlichen Räume nicht erhalten."
 }

From adeafc4d739560ad5df17be61e70128ed3a93161 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:14:56 +0000
Subject: [PATCH 2797/3235] Translated using Weblate (German)

Currently translated at 93.7% (2158 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b9c4b15d7a..ead2d5403c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2214,5 +2214,8 @@
     "Create a Group Chat": "Erstelle einen Gruppenchat",
     "Use lowercase letters, numbers, dashes and underscores only": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
     "Enter your custom identity server URL <a>What does this mean?</a>": "URL deines benutzerdefinierten Identitätsservers eingeben <a>Was bedeutet das?</a>",
-    "Riot failed to get the public room list.": "Riot konnte die Liste der öffentlichen Räume nicht erhalten."
+    "Riot failed to get the public room list.": "Riot konnte die Liste der öffentlichen Räume nicht laden.",
+    "Verify this login": "Diese Anmeldung verifizieren",
+    "Syncing...": "Synchronisiere...",
+    "Signing In...": "Melde an..."
 }

From cfc1e345f1ba9437fc735a7bbe2fe8301fefe89e Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:15:04 +0000
Subject: [PATCH 2798/3235] Translated using Weblate (German)

Currently translated at 93.7% (2158 of 2303 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 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ead2d5403c..c3d65f0b29 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2217,5 +2217,19 @@
     "Riot failed to get the public room list.": "Riot konnte die Liste der öffentlichen Räume nicht laden.",
     "Verify this login": "Diese Anmeldung verifizieren",
     "Syncing...": "Synchronisiere...",
-    "Signing In...": "Melde an..."
+    "Signing In...": "Melde an...",
+    "The homeserver may be unavailable or overloaded.": "Der Heimserver ist möglicherweise nicht verfügbar oder überlastet.",
+    "Jump to first unread room.": "Zum ersten ungelesenen Raum springen.",
+    "Jump to first invite.": "Zur ersten Einladung springen.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raums.",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Session verified": "Sitzung verifiziert",
+    "Failed to get autodiscovery configuration from server": "Abrufen der Autodiscovery-Konfiguration vom Server fehlgeschlagen",
+    "Invalid base_url for m.homeserver": "Ungültige base_url für m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Die Heimserver-URL scheint kein gültiger Matrix-Heimserver zu sein",
+    "Invalid base_url for m.identity_server": "Ungültige base_url für m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "Die Identitätsserver-URL scheint kein gültiger Identitätsserver zu sein",
+    "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
+    "Continue with previous account": "Mit vorherigen Konto fortfahren",
+    "<a>Log in</a> to your new account.": "Bei deinem neuen Konto <a>anmelden</a>."
 }

From 1985935d55a3226d45a381c074d59dd9ab947809 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:18:52 +0000
Subject: [PATCH 2799/3235] Translated using Weblate (German)

Currently translated at 93.7% (2159 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c3d65f0b29..c71db08aa4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2231,5 +2231,5 @@
     "Identity server URL does not appear to be a valid identity server": "Die Identitätsserver-URL scheint kein gültiger Identitätsserver zu sein",
     "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
-    "<a>Log in</a> to your new account.": "Bei deinem neuen Konto <a>anmelden</a>."
+    "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>."
 }

From 19b0e60f7d95d31c93a5b9f52cf0cbf76ed9f237 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:19:07 +0000
Subject: [PATCH 2800/3235] Translated using Weblate (German)

Currently translated at 93.7% (2159 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c71db08aa4..85d3464728 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2231,5 +2231,6 @@
     "Identity server URL does not appear to be a valid identity server": "Die Identitätsserver-URL scheint kein gültiger Identitätsserver zu sein",
     "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
-    "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>."
+    "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
+    "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich bei deinem neuen Konto <a>anmelden</a>."
 }

From 4282a396b0f095176b9edb586ae5905e4eb6e2da Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:19:20 +0000
Subject: [PATCH 2801/3235] Translated using Weblate (German)

Currently translated at 93.8% (2160 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 85d3464728..ee30d62e30 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2232,5 +2232,5 @@
     "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
-    "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich bei deinem neuen Konto <a>anmelden</a>."
+    "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>."
 }

From 93ece4b76a3c3fa5c7dcfb054d4205d73a88d26d Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:19:47 +0000
Subject: [PATCH 2802/3235] Translated using Weblate (German)

Currently translated at 93.8% (2160 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ee30d62e30..19fe9d8b57 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2232,5 +2232,6 @@
     "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
-    "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>."
+    "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Nutzer!nnen sehen sie als vertrauenswürdig an."
 }

From 0ebc87d391c76c4d124aac01015bff4e7e7808f2 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:20:01 +0000
Subject: [PATCH 2803/3235] Translated using Weblate (German)

Currently translated at 93.8% (2161 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 19fe9d8b57..98bb643ad6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2233,5 +2233,5 @@
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>.",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Nutzer!nnen sehen sie als vertrauenswürdig an."
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an."
 }

From 4f5a335f6230db92f54ee14dab2d3263a0e74acf Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 20:20:08 +0000
Subject: [PATCH 2804/3235] Translated using Weblate (German)

Currently translated at 93.8% (2161 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 98bb643ad6..3a7a63e043 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2233,5 +2233,6 @@
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>.",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an."
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.",
+    "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Nutzer!nnen sehen sie als vertrauenswürdig an."
 }

From 2f6275e0b6f9ba0aebea353b7d34d26b2807a46c Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 20:20:19 +0000
Subject: [PATCH 2805/3235] Translated using Weblate (German)

Currently translated at 94.6% (2178 of 2303 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3a7a63e043..109f2b58d2 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2234,5 +2234,14 @@
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.",
-    "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Nutzer!nnen sehen sie als vertrauenswürdig an."
+    "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer sehen sie als vertrauenswürdig an.",
+    "well formed": "wohlgeformt",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Wenn du <server /> nicht verwenden willst um andere Benutzer zu finden und gefunden zu werden, trage unten einen anderen Identitätsserver ein.",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Wenn du einen sicherheitsrelevaten Fehler melden möchtest, lies bitte die Matrix.org  <a>Security Disclosure Policy</a>.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Beim Ändern der Anforderungen für Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Beim Ändern der Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
+    "Unable to share email address": "E-Mail Adresse konnte nicht geteilt werden",
+    "Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
+    "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung die gleichen Zeichen?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Werden bei %(displayName)s die gleichen Zeichen angezeigt?"
 }

From 7f3d8194fdcba005ec7427ec57a898cb7c0befba Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:19:53 +0000
Subject: [PATCH 2806/3235] Translated using Weblate (German)

Currently translated at 94.6% (2178 of 2303 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, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 109f2b58d2..e64d6183bd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -648,7 +648,7 @@
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
-    "%(duration)sd": "%(duration)sd",
+    "%(duration)sd": "%(duration)sT",
     "Online for %(duration)s": "Online seit %(duration)s",
     "Idle for %(duration)s": "Untätig seit %(duration)s",
     "Offline for %(duration)s": "Offline seit %(duration)s",
@@ -2243,5 +2243,10 @@
     "Unable to share email address": "E-Mail Adresse konnte nicht geteilt werden",
     "Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
     "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung die gleichen Zeichen?",
-    "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Werden bei %(displayName)s die gleichen Zeichen angezeigt?"
+    "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Werden bei %(displayName)s die gleichen Zeichen angezeigt?",
+    "Click the link in the email you received to verify and then click continue again.": "Klicke auf den Link in der Bestätigungs-E-Mail, und dann auf Weiter.",
+    "Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
+    "Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jede/r, mit dem du dich verifiziert hast, sieht Sicherheitswarnungen. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst."
 }

From 4881b9c7718efa641ef3d8e0b1674da016b22420 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:26:00 +0000
Subject: [PATCH 2807/3235] Translated using Weblate (German)

Currently translated at 94.7% (2180 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e64d6183bd..b7cd330764 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2248,5 +2248,5 @@
     "Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
     "Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jede/r, mit dem du dich verifiziert hast, sieht Sicherheitswarnungen. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst."
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst."
 }

From 4cf19f23b0d6bbc51af7c4d32f7df6866358d7e5 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:26:19 +0000
Subject: [PATCH 2808/3235] Translated using Weblate (German)

Currently translated at 94.7% (2180 of 2303 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 b7cd330764..36e9d3ff32 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2248,5 +2248,7 @@
     "Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
     "Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst."
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst.",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Zum Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:"
 }

From c601224966db5e0f3b0b6c66706a1fdd47957551 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:26:52 +0000
Subject: [PATCH 2809/3235] Translated using Weblate (German)

Currently translated at 94.7% (2182 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 36e9d3ff32..d85d9b2e2e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2250,5 +2250,6 @@
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Zum Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:"
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert."
 }

From 2f01ea095caf15d7994ba9faea3391350476df2c Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:28:32 +0000
Subject: [PATCH 2810/3235] Translated using Weblate (German)

Currently translated at 94.7% (2182 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d85d9b2e2e..712f2ed69d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2251,5 +2251,6 @@
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert."
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifizieren dieses Geräts, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet."
 }

From 857d73193bd197c8bed5029492b158bd0c9fc123 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:28:53 +0000
Subject: [PATCH 2811/3235] Translated using Weblate (German)

Currently translated at 94.8% (2183 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 712f2ed69d..884a1117a0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2252,5 +2252,5 @@
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifizieren dieses Geräts, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet."
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet."
 }

From 7f11db782574f0639929980c89df797432018c36 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:29:12 +0000
Subject: [PATCH 2812/3235] Translated using Weblate (German)

Currently translated at 94.8% (2183 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 884a1117a0..6ab28091f3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2252,5 +2252,6 @@
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet."
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifizieren dieses Geräts, wird es als vertrauenswürdig markieren, und Nutzer!nnen, die sich bei dir verifiziert haben, vertrauen diesem Gerät."
 }

From e6ac668042e927ed4ee6bdb24a8a00a66712dd99 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:30:22 +0000
Subject: [PATCH 2813/3235] Translated using Weblate (German)

Currently translated at 94.8% (2184 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6ab28091f3..350e479e4a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2253,5 +2253,5 @@
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifizieren dieses Geräts, wird es als vertrauenswürdig markieren, und Nutzer!nnen, die sich bei dir verifiziert haben, vertrauen diesem Gerät."
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen."
 }

From 0b74e6bd4edacf9be6bf2151da27d56ac94555e7 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:30:31 +0000
Subject: [PATCH 2814/3235] Translated using Weblate (German)

Currently translated at 94.8% (2184 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 350e479e4a..e5aa015fe9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2253,5 +2253,6 @@
     "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Um zu Überprüfen, ob dieser Sitzung vertraut werden kann, vergewissere dich, ob der in den Benutzereinstellungen auf diesem Gerät angezeigte Schlüssel mit dem folgenden übereinstimmt:",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen."
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, einen Integration Manager zu verwenden, um dies zu tun. Bitte kontaktiere die Administration."
 }

From 418386606498cad13bd9aea6b2f93732f885862a Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:31:31 +0000
Subject: [PATCH 2815/3235] Translated using Weblate (German)

Currently translated at 94.9% (2185 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e5aa015fe9..b9c9e19708 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2254,5 +2254,5 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, einen Integration Manager zu verwenden, um dies zu tun. Bitte kontaktiere die Administration."
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator."
 }

From 44d59312ab964ec017a25a587afc273e4bd1c6b5 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:31:54 +0000
Subject: [PATCH 2816/3235] Translated using Weblate (German)

Currently translated at 94.9% (2185 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b9c9e19708..fbfd38a73d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2254,5 +2254,6 @@
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator."
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine DM nicht erstellen. Bitte überprüfe die/den Nutzer!n, die du einladen möchtest, und versuche es erneut."
 }

From b415f8b6c4274508b7df64c70b2343b28a09c560 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:32:31 +0000
Subject: [PATCH 2817/3235] Translated using Weblate (German)

Currently translated at 94.9% (2186 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index fbfd38a73d..839631de7a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2255,5 +2255,5 @@
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine DM nicht erstellen. Bitte überprüfe die/den Nutzer!n, die du einladen möchtest, und versuche es erneut."
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut."
 }

From c89e8666f624860923f550baf5d14c6ac9ab4c49 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:32:40 +0000
Subject: [PATCH 2818/3235] Translated using Weblate (German)

Currently translated at 94.9% (2186 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 839631de7a..3615aa28a7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2255,5 +2255,6 @@
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut."
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Nutzer!nnen nicht einladen. Bitte überprüfe diese und versuche es erneut."
 }

From 98e89f0468e206d5632511f7c2fa24c29f68e765 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:32:58 +0000
Subject: [PATCH 2819/3235] Translated using Weblate (German)

Currently translated at 95.7% (2203 of 2303 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3615aa28a7..90ca70983f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2256,5 +2256,16 @@
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein Riot erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut.",
-    "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Nutzer!nnen nicht einladen. Bitte überprüfe diese und versuche es erneut."
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Benutzer nicht einladen. Bitte überprüfe sie und versuche es erneut.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Starte eine Unterhaltung mit jemandem indem du seinen Namen, Benutzernamen (z.B. <userId/>) oder E-Mail-Adresse eingibst.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Lade jemanden mit seinem Namen, Benutzernamen (z.B. <userId/>) oder E-Mail-Adresse ein oder <a>teile diesen Raum</a>.",
+    "Riot encountered an error during upload of:": "Es trat ein Fehler auf beim Hochladen von:",
+    "Upload completed": "Hochladen abgeschlossen",
+    "Cancelled signature upload": "Hochladen der Signatur abgebrochen",
+    "Unable to upload": "Hochladen nicht möglich",
+    "Signature upload success": "Signatur erfolgreich hochgeladen",
+    "Signature upload failed": "Hochladen der Signatur fehlgeschlagen",
+    "Confirm by comparing the following with the User Settings in your other session:": "Bestätige indem du das folgende mit deinen Benutzereinstellungen in deiner anderen Sitzung vergleichst:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Bestätige die Sitzung dieses Benutzers indem du das folgende mit seinen Benutzereinstellungen vergleichst:",
+    "If they don't match, the security of your communication may be compromised.": "Wenn sie nicht übereinstimmen kann die Sicherheit eurer Kommunikation kompromittiert sein."
 }

From be48f4d02d8ecd81a41f22704a21480ef2ce93a7 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:40:28 +0000
Subject: [PATCH 2820/3235] Translated using Weblate (German)

Currently translated at 95.7% (2203 of 2303 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 90ca70983f..ead1fa9ca6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2267,5 +2267,10 @@
     "Signature upload failed": "Hochladen der Signatur fehlgeschlagen",
     "Confirm by comparing the following with the User Settings in your other session:": "Bestätige indem du das folgende mit deinen Benutzereinstellungen in deiner anderen Sitzung vergleichst:",
     "Confirm this user's session by comparing the following with their User Settings:": "Bestätige die Sitzung dieses Benutzers indem du das folgende mit seinen Benutzereinstellungen vergleichst:",
-    "If they don't match, the security of your communication may be compromised.": "Wenn sie nicht übereinstimmen kann die Sicherheit eurer Kommunikation kompromittiert sein."
+    "If they don't match, the security of your communication may be compromised.": "Wenn sie nicht übereinstimmen kann die Sicherheit eurer Kommunikation kompromittiert sein.",
+    "Your homeserver doesn't seem to support this feature.": "Dein Heimserver scheint diese Funktion nicht zu unterstützen.",
+    "Message edits": "Nachrichtenänderungen",
+    "Your account is not secure": "Dein Konto ist nicht sicher",
+    "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualizieren ist eine fortgeschrittene Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist."
 }

From 8165e8a4729a689969cf8efd563d0929bcbd1b80 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:41:32 +0000
Subject: [PATCH 2821/3235] Translated using Weblate (German)

Currently translated at 95.7% (2204 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ead1fa9ca6..f838e9a370 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2272,5 +2272,5 @@
     "Message edits": "Nachrichtenänderungen",
     "Your account is not secure": "Dein Konto ist nicht sicher",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
-    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualizieren ist eine fortgeschrittene Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist."
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist."
 }

From 2f0bbc25ff3de8b803f87cb2938a509f4f772074 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:41:40 +0000
Subject: [PATCH 2822/3235] Translated using Weblate (German)

Currently translated at 95.7% (2204 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f838e9a370..04b78e85f9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2272,5 +2272,6 @@
     "Message edits": "Nachrichtenänderungen",
     "Your account is not secure": "Dein Konto ist nicht sicher",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
-    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist."
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich Nachrichtenschlüssel, fehlen. Melde dich ab und wieder an, um dies zu beheben, und stelle die Schlüssel aus der Sicherung wieder her."
 }

From 67ec31a7a2e86948b87d8fdd51dcf9a53193348f Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:42:59 +0000
Subject: [PATCH 2823/3235] Translated using Weblate (German)

Currently translated at 95.7% (2205 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 04b78e85f9..75a0df5cd6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2273,5 +2273,5 @@
     "Your account is not secure": "Dein Konto ist nicht sicher",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich Nachrichtenschlüssel, fehlen. Melde dich ab und wieder an, um dies zu beheben, und stelle die Schlüssel aus der Sicherung wieder her."
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben."
 }

From 6813b6f71df3104425ee95f5c35f8c20957e4618 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:43:08 +0000
Subject: [PATCH 2824/3235] Translated using Weblate (German)

Currently translated at 95.7% (2205 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 75a0df5cd6..783e84d902 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2273,5 +2273,6 @@
     "Your account is not secure": "Dein Konto ist nicht sicher",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben."
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s findbar möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen wie du ausführen."
 }

From a9ef4762cd48a83a83bff2409d3e92be6c21607c Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:43:30 +0000
Subject: [PATCH 2825/3235] Translated using Weblate (German)

Currently translated at 95.8% (2207 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 783e84d902..593e905b33 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2274,5 +2274,6 @@
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
-    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s findbar möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen wie du ausführen."
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast."
 }

From a810708f7012ab3deb94ffb742dd0cefbf521e73 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:44:43 +0000
Subject: [PATCH 2826/3235] Translated using Weblate (German)

Currently translated at 95.8% (2207 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 593e905b33..30b523b33e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2275,5 +2275,6 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast."
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Zugriff auf geheimen Speicher nicht möglich. Bitte überprüfe, ob du den richtigen Wiederherstellungsschlüssel eingegeben hast."
 }

From a0b765d56845f532c6fff9e10cb336646a35414f Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:45:03 +0000
Subject: [PATCH 2827/3235] Translated using Weblate (German)

Currently translated at 96.0% (2211 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 30b523b33e..5ef652761d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2276,5 +2276,8 @@
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast.",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Zugriff auf geheimen Speicher nicht möglich. Bitte überprüfe, ob du den richtigen Wiederherstellungsschlüssel eingegeben hast."
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Zugriff auf sicheren Speicher nicht möglich. Bitte überprüfe, ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungspassphrase eingegeben hast.",
+    "Nice, strong password!": "Super, ein starkes Passwort!"
 }

From c9d47eb2a80cc327cea13a211a78bee1fe622aef Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:48:24 +0000
Subject: [PATCH 2828/3235] Translated using Weblate (German)

Currently translated at 96.0% (2211 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5ef652761d..986200e41c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2279,5 +2279,6 @@
     "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Zugriff auf sicheren Speicher nicht möglich. Bitte überprüfe, ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungspassphrase eingegeben hast.",
-    "Nice, strong password!": "Super, ein starkes Passwort!"
+    "Nice, strong password!": "Super, ein starkes Passwort!",
+    "Other users can invite you to rooms using your contact details": "Andere Nutzer!nnen können dich mit deinen Kontaktdaten in Räume einladen"
 }

From f90a72f64aacd11f03a44119a56b819717864973 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:48:33 +0000
Subject: [PATCH 2829/3235] Translated using Weblate (German)

Currently translated at 96.0% (2212 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 986200e41c..1a7f3b1270 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2280,5 +2280,5 @@
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungspassphrase eingegeben hast.",
     "Nice, strong password!": "Super, ein starkes Passwort!",
-    "Other users can invite you to rooms using your contact details": "Andere Nutzer!nnen können dich mit deinen Kontaktdaten in Räume einladen"
+    "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen"
 }

From aea17818e93abefcbeec382c1f197cd63f239b07 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:48:55 +0000
Subject: [PATCH 2830/3235] Translated using Weblate (German)

Currently translated at 96.0% (2212 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1a7f3b1270..0a4de52586 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2280,5 +2280,6 @@
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungspassphrase eingegeben hast.",
     "Nice, strong password!": "Super, ein starkes Passwort!",
-    "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen"
+    "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende E-Mail oder Telefon, um optional von vorhandenen Kontakten gefunden zu werden."
 }

From 902424a4d4b86b74e36b5ee96eebbb2c5f741103 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:49:30 +0000
Subject: [PATCH 2831/3235] Translated using Weblate (German)

Currently translated at 96.3% (2217 of 2303 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 0a4de52586..8620b31a8f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2281,5 +2281,7 @@
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungspassphrase eingegeben hast.",
     "Nice, strong password!": "Super, ein starkes Passwort!",
     "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende E-Mail oder Telefon, um optional von vorhandenen Kontakten gefunden zu werden."
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende optional E-Mail oder Telefon, um von Anderen gefunden zu werden.",
+    "Explore Public Rooms": "Erkunde öffentliche Räume",
+    "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern"
 }

From 5265d873198c228d64e455bfcfa69dd11a78f08e Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:50:07 +0000
Subject: [PATCH 2832/3235] Translated using Weblate (German)

Currently translated at 96.3% (2217 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8620b31a8f..c9c2d14548 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2283,5 +2283,8 @@
     "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende optional E-Mail oder Telefon, um von Anderen gefunden zu werden.",
     "Explore Public Rooms": "Erkunde öffentliche Räume",
-    "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern"
+    "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot konnte die Protokollliste nicht vom Heimserver abrufen. Der Heimserver ist möglicherweise zu alt, um Netzwerke von Drittanbietern zu unterstützen.",
+    "No identity server is configured: add one in server settings to reset your password.": "Kein Identitätsserver konfiguriert: Füge einen in den Servereinstellungen hinzu, um dein Kennwort zurückzusetzen.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du bist bereits in ein anderes Konto (%(loggedInUserId)s) angemeldet."
 }

From 6472ddfe8d698d166eafc6b76d62e8dc37e672fc Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:51:25 +0000
Subject: [PATCH 2833/3235] Translated using Weblate (German)

Currently translated at 96.4% (2220 of 2303 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 c9c2d14548..81e2d63527 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2286,5 +2286,7 @@
     "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern",
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot konnte die Protokollliste nicht vom Heimserver abrufen. Der Heimserver ist möglicherweise zu alt, um Netzwerke von Drittanbietern zu unterstützen.",
     "No identity server is configured: add one in server settings to reset your password.": "Kein Identitätsserver konfiguriert: Füge einen in den Servereinstellungen hinzu, um dein Kennwort zurückzusetzen.",
-    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du bist bereits in ein anderes Konto (%(loggedInUserId)s) angemeldet."
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
+    "This requires the latest Riot on your other devices:": "Dies benötigt die neuste Version von Riot auf deinen anderen Geräten:",
+    "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel"
 }

From ea50116c9f17dfadd247489c9de260bdd6d5d5fe Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:52:42 +0000
Subject: [PATCH 2834/3235] Translated using Weblate (German)

Currently translated at 96.4% (2220 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 81e2d63527..9afcd8debf 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2288,5 +2288,6 @@
     "No identity server is configured: add one in server settings to reset your password.": "Kein Identitätsserver konfiguriert: Füge einen in den Servereinstellungen hinzu, um dein Kennwort zurückzusetzen.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
     "This requires the latest Riot on your other devices:": "Dies benötigt die neuste Version von Riot auf deinen anderen Geräten:",
-    "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel"
+    "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel",
+    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Heimserver-Problems fehlgeschlagen"
 }

From f96f1bb3ebccde0d03e559464f8d00245e9ec54d Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:52:57 +0000
Subject: [PATCH 2835/3235] Translated using Weblate (German)

Currently translated at 96.5% (2222 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9afcd8debf..925b39e362 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2289,5 +2289,5 @@
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
     "This requires the latest Riot on your other devices:": "Dies benötigt die neuste Version von Riot auf deinen anderen Geräten:",
     "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel",
-    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Heimserver-Problems fehlgeschlagen"
+    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen"
 }

From 14a68b63e8b68bcb4e99dedbb054fe453c6db117 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:53:01 +0000
Subject: [PATCH 2836/3235] Translated using Weblate (German)

Currently translated at 96.5% (2222 of 2303 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 925b39e362..8e9a3b3d8e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2289,5 +2289,7 @@
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
     "This requires the latest Riot on your other devices:": "Dies benötigt die neuste Version von Riot auf deinen anderen Geräten:",
     "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel",
-    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen"
+    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
+    "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
+    "Command Autocomplete": "Auto-Vervollständigung anordnen"
 }

From a637854fee748f89f6cf21f735d65ab2ccd7e3a8 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:53:20 +0000
Subject: [PATCH 2837/3235] Translated using Weblate (German)

Currently translated at 96.6% (2224 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8e9a3b3d8e..36cc523161 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2291,5 +2291,5 @@
     "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel",
     "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
     "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
-    "Command Autocomplete": "Auto-Vervollständigung anordnen"
+    "Command Autocomplete": "Auto-Vervollständigung aktivieren"
 }

From 8e94839a2c82fcd9b4a00265cb871d28e28bc353 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:53:27 +0000
Subject: [PATCH 2838/3235] Translated using Weblate (German)

Currently translated at 96.6% (2224 of 2303 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 36cc523161..9419f1d61a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2291,5 +2291,7 @@
     "Use Recovery Passphrase or Key": "Benutze deine Wiederherstellungspassphrase oder den Wiederherstellungsschlüssel",
     "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
     "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
-    "Command Autocomplete": "Auto-Vervollständigung aktivieren"
+    "Command Autocomplete": "Auto-Vervollständigung aktivieren",
+    "Community Autocomplete": "Community-Auto-Vervollständigung",
+    "DuckDuckGo Results": "DuckDuckGo Resultate"
 }

From 15d1b7ac2265aae848f5f771557bb4745ee0cab2 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:53:39 +0000
Subject: [PATCH 2839/3235] Translated using Weblate (German)

Currently translated at 97.0% (2235 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9419f1d61a..4a77feba38 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2293,5 +2293,8 @@
     "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
     "Command Autocomplete": "Auto-Vervollständigung aktivieren",
     "Community Autocomplete": "Community-Auto-Vervollständigung",
-    "DuckDuckGo Results": "DuckDuckGo Resultate"
+    "DuckDuckGo Results": "DuckDuckGo Ergebnisse",
+    "Great! This recovery passphrase looks strong enough.": "Super! Diese Wiederherstellungspassphrase sieht stark genug aus.",
+    "Enter a recovery passphrase": "Gib eine Wiederherstellungspassphrase ein",
+    "Back up encrypted message keys": "Sichere die Verschlüsselungsschlüssel"
 }

From bd36b0892c33806ac4d5ce2b76f620c17a5d3ed5 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:53:44 +0000
Subject: [PATCH 2840/3235] Translated using Weblate (German)

Currently translated at 97.0% (2235 of 2303 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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4a77feba38..7952115d74 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2296,5 +2296,13 @@
     "DuckDuckGo Results": "DuckDuckGo Ergebnisse",
     "Great! This recovery passphrase looks strong enough.": "Super! Diese Wiederherstellungspassphrase sieht stark genug aus.",
     "Enter a recovery passphrase": "Gib eine Wiederherstellungspassphrase ein",
-    "Back up encrypted message keys": "Sichere die Verschlüsselungsschlüssel"
+    "Back up encrypted message keys": "Sichere die Verschlüsselungsschlüssel",
+    "Emoji Autocomplete": "Emoji-Auto-Vervollständigung",
+    "Room Autocomplete": "Raum-Auto-Vervollständigung",
+    "User Autocomplete": "Nutzer-Auto-Vervollständigung",
+    "Restore your key backup to upgrade your encryption": "Schlüsselsicherung wiederherstellen, um deine Verschlüsselung zu aktualisieren",
+    "Restore": "Wiederherstellen",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in die Zwischenablage kopiert</b>. Füge ihn ein in:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Download-Ordner</b>.",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Nutzer!nnen verifizieren, um deine Chats zu schützen."
 }

From bdfcd848cd35c95f0540965d12f1cef8d1e70897 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:59:16 +0000
Subject: [PATCH 2841/3235] Translated using Weblate (German)

Currently translated at 97.2% (2238 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7952115d74..b84f2613c1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2304,5 +2304,5 @@
     "Restore": "Wiederherstellen",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in die Zwischenablage kopiert</b>. Füge ihn ein in:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Download-Ordner</b>.",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Nutzer!nnen verifizieren, um deine Chats zu schützen."
+    "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Benutzer verifizieren, um deine Chats zu schützen."
 }

From 239778cb4c52c61421fa2d5164c8843d7cfe71aa Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 21:59:25 +0000
Subject: [PATCH 2842/3235] Translated using Weblate (German)

Currently translated at 97.2% (2238 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b84f2613c1..b2309c2d0a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2304,5 +2304,8 @@
     "Restore": "Wiederherstellen",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in die Zwischenablage kopiert</b>. Füge ihn ein in:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Download-Ordner</b>.",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Benutzer verifizieren, um deine Chats zu schützen."
+    "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Benutzer verifizieren, um deine Chats zu schützen.",
+    "Upgrade your encryption": "Deine Verschlüsselung aktualisieren",
+    "You're done!": "Du bist fertig!",
+    "Unable to set up secret storage": "Geheimer Speicher kann nicht eingerichtet werden"
 }

From fd916c407f414bed9411a43bf2f14b311a1d8b4a Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 21:59:49 +0000
Subject: [PATCH 2843/3235] Translated using Weblate (German)

Currently translated at 97.4% (2244 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index b2309c2d0a..7f8972dc48 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2307,5 +2307,8 @@
     "You can now verify your other devices, and other users to keep your chats safe.": "Du kannst jetzt deine anderen Geräte und andere Benutzer verifizieren, um deine Chats zu schützen.",
     "Upgrade your encryption": "Deine Verschlüsselung aktualisieren",
     "You're done!": "Du bist fertig!",
-    "Unable to set up secret storage": "Geheimer Speicher kann nicht eingerichtet werden"
+    "Unable to set up secret storage": "Sicherer Speicher kann nicht eingerichtet werden",
+    "Enter a recovery passphrase...": "Gib eine Wiederherstellungspassphrase ein...",
+    "Repeat your recovery passphrase...": "Gib die Wiederherstellungspassphrase erneut ein...",
+    "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase"
 }

From b2a22b13258edd8e07620e21774ef2a993c63779 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 22:01:51 +0000
Subject: [PATCH 2844/3235] Translated using Weblate (German)

Currently translated at 97.4% (2244 of 2303 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7f8972dc48..8c70d7e40c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2310,5 +2310,8 @@
     "Unable to set up secret storage": "Sicherer Speicher kann nicht eingerichtet werden",
     "Enter a recovery passphrase...": "Gib eine Wiederherstellungspassphrase ein...",
     "Repeat your recovery passphrase...": "Gib die Wiederherstellungspassphrase erneut ein...",
-    "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase"
+    "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase",
+    "Create key backup": "Schlüsselsicherung erstellen",
+    "This session is encrypting history using the new recovery method.": "Diese Sitzung verschlüsselt den Verlauf mit der neuen Wiederherstellungsmethode.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Diese Sitzung hat festgestellt, dass deine Wiederherstellungspassphrase und dein Schlüssel für gesicherte Nachrichten entfernt wurden."
 }

From 65cc5bfea44829b5c28025dca8a62a51f3cae348 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 22:02:27 +0000
Subject: [PATCH 2845/3235] Translated using Weblate (German)

Currently translated at 98.3% (2264 of 2303 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 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8c70d7e40c..3660379302 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2313,5 +2313,16 @@
     "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase",
     "Create key backup": "Schlüsselsicherung erstellen",
     "This session is encrypting history using the new recovery method.": "Diese Sitzung verschlüsselt den Verlauf mit der neuen Wiederherstellungsmethode.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Diese Sitzung hat festgestellt, dass deine Wiederherstellungspassphrase und dein Schlüssel für gesicherte Nachrichten entfernt wurden."
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Diese Sitzung hat festgestellt, dass deine Wiederherstellungspassphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
+    "Currently indexing: %(currentRoom)s": "Indiziere: %(currentRoom)s",
+    "Navigation": "Navigation",
+    "Calls": "Anrufe",
+    "Room List": "Raumliste",
+    "Autocomplete": "Auto-Vervollständigung",
+    "Alt": "Alt",
+    "Toggle microphone mute": "Schalte Mikrophon stumm",
+    "Toggle video on/off": "Schalte Video an/aus",
+    "Jump to room search": "Springe zur Raumsuche",
+    "Close dialog or context menu": "Schließe Dialog oder Kontextmenü",
+    "Cancel autocomplete": "Deaktiviere Auto-Vervollständigung"
 }

From 138b5a08a4c88ad5b9681d1885a60ef3b1fbbb09 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 22:02:41 +0000
Subject: [PATCH 2846/3235] Translated using Weblate (German)

Currently translated at 98.3% (2264 of 2303 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3660379302..43734a5f8f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2324,5 +2324,14 @@
     "Toggle video on/off": "Schalte Video an/aus",
     "Jump to room search": "Springe zur Raumsuche",
     "Close dialog or context menu": "Schließe Dialog oder Kontextmenü",
-    "Cancel autocomplete": "Deaktiviere Auto-Vervollständigung"
+    "Cancel autocomplete": "Deaktiviere Auto-Vervollständigung",
+    "Unable to revoke sharing for email address": "Das Teilen der E-Mail-Adresse kann nicht widerrufen werden",
+    "Unable to validate homeserver/identity server": "Heimserver/Identitätsserver nicht validierbar",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Ohne Abschluss der Sicherungseinrichtung in dieser Sitzung hat sie keinen Zugriff auf verschlüsselte Nachrichten.",
+    "Disable": "Deaktivieren",
+    "Not currently indexing messages for any room.": "Derzeit werden keine Nachrichten für Räume indiziert.",
+    "Space used:": "Speicherplatzbedarf:",
+    "Indexed messages:": "Indizierte Nachrichten:",
+    "Indexed rooms:": "Indizierte Räume:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s von %(totalRooms)s"
 }

From e37e5a2a94b194937092136b44932f30c26bafc4 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 22:13:00 +0000
Subject: [PATCH 2847/3235] Translated using Weblate (German)

Currently translated at 98.5% (2269 of 2303 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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 43734a5f8f..99e5420e88 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2327,11 +2327,15 @@
     "Cancel autocomplete": "Deaktiviere Auto-Vervollständigung",
     "Unable to revoke sharing for email address": "Das Teilen der E-Mail-Adresse kann nicht widerrufen werden",
     "Unable to validate homeserver/identity server": "Heimserver/Identitätsserver nicht validierbar",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Ohne Abschluss der Sicherungseinrichtung in dieser Sitzung hat sie keinen Zugriff auf verschlüsselte Nachrichten.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Ohne Abschluss der Sicherungseinrichtung in dieser Sitzung wird sie keinen Zugriff auf verschlüsselte Nachrichten erhalten.",
     "Disable": "Deaktivieren",
     "Not currently indexing messages for any room.": "Derzeit werden keine Nachrichten für Räume indiziert.",
     "Space used:": "Speicherplatzbedarf:",
     "Indexed messages:": "Indizierte Nachrichten:",
     "Indexed rooms:": "Indizierte Räume:",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s von %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s von %(totalRooms)s",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Setze eine Wiederherstellungspassphrase um deine verschlüsselten Nachrichten nach dem Abmelden wiederherstellen zu können. Diese sollte sich von deinem Kontopasswort unterscheiden:",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
+    "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase."
 }

From 5cafad5f464154f393e5b81d150a6df1427975ff Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 9 May 2020 22:17:31 +0000
Subject: [PATCH 2848/3235] Translated using Weblate (German)

Currently translated at 98.5% (2269 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 99e5420e88..a7bd338bb4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2337,5 +2337,6 @@
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Setze eine Wiederherstellungspassphrase um deine verschlüsselten Nachrichten nach dem Abmelden wiederherstellen zu können. Diese sollte sich von deinem Kontopasswort unterscheiden:",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
     "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase."
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne die Einrichtung von gesicherter Nachrichtenwiederherstellung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden, wenn du dich abmeldest oder eine andere Sitzung verwendest."
 }

From ad2f704e76d31c25933f257cf62829a67e9739c0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 10 May 2020 11:17:21 +0100
Subject: [PATCH 2849/3235] don't NPE on invites from Dendrite

---
 src/components/structures/RoomView.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 69a2e54a2c..f53929df4a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1717,8 +1717,11 @@ export default createReactClass({
             } else {
                 const myUserId = this.context.credentials.userId;
                 const myMember = this.state.room.getMember(myUserId);
-                const inviteEvent = myMember.events.member;
-                var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                const inviteEvent = myMember ? myMember.events.member : null;
+                let inviterName = _t("Unknown");
+                if (inviteEvent) {
+                    inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                }
 
                 // We deliberately don't try to peek into invites, even if we have permission to peek
                 // as they could be a spam vector.

From 85a8aaffcf5c8a27f51017df05c659caff8b71f9 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sat, 9 May 2020 22:18:06 +0000
Subject: [PATCH 2850/3235] Translated using Weblate (German)

Currently translated at 98.6% (2270 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a7bd338bb4..0a9d4d3a7a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2338,5 +2338,5 @@
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
     "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
-    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne die Einrichtung von gesicherter Nachrichtenwiederherstellung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden, wenn du dich abmeldest oder eine andere Sitzung verwendest."
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest."
 }

From 587eb8f8f1ca386823181e9ab36cc520acd0f7dc Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sun, 10 May 2020 11:37:07 +0000
Subject: [PATCH 2851/3235] Translated using Weblate (German)

Currently translated at 98.6% (2270 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0a9d4d3a7a..20d58acfe5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2338,5 +2338,6 @@
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
     "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
-    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest."
+    "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest.",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Sicherungsschlüssel im geheimen Speicher gespeichert, aber diese Funktion ist in dieser Sitzung nicht aktiviert. Aktiviere Cross-Signing in Labs, um Status der Schlüsselsicherung zu ändern."
 }

From 191247165fbcaee4ea4e05a7c14a2dcbd8d7b1b9 Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sun, 10 May 2020 11:37:42 +0000
Subject: [PATCH 2852/3235] Translated using Weblate (German)

Currently translated at 98.8% (2275 of 2303 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 20d58acfe5..98ad1ee3b0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2339,5 +2339,9 @@
     "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest.",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Sicherungsschlüssel im geheimen Speicher gespeichert, aber diese Funktion ist in dieser Sitzung nicht aktiviert. Aktiviere Cross-Signing in Labs, um Status der Schlüsselsicherung zu ändern."
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Der Sicherungsschlüssel ist im sicheren Speicher gespeichert, aber diese Funktion ist in dieser Sitzung nicht aktiviert. Aktiviere Cross-Signing in Labs, um den Status der Schlüsselsicherung zu ändern.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Ändern des Raum-Aliases. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Wenn du deine Wiederherstellungspassphrase vergessen hast kannst du <button1>deinen Wiederherstellungsschlüssel verwenden</button1> oder <button2>neue Wiederherstellungsoptionen anlegen</button2>.",
+    "Self-verification request": "Selbstverifikationsanfrage",
+    "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist"
 }

From 75a3d95aa8405f9c8ecfe51fe4f57e31ed47fa80 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sun, 10 May 2020 11:43:59 +0000
Subject: [PATCH 2853/3235] Translated using Weblate (German)

Currently translated at 98.8% (2275 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 98ad1ee3b0..00dcec412e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2343,5 +2343,6 @@
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Ändern des Raum-Aliases. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Wenn du deine Wiederherstellungspassphrase vergessen hast kannst du <button1>deinen Wiederherstellungsschlüssel verwenden</button1> oder <button2>neue Wiederherstellungsoptionen anlegen</button2>.",
     "Self-verification request": "Selbstverifikationsanfrage",
-    "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist"
+    "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist",
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot speichert verschlüsselte Nachrichten sicher lokal zwischen, damit sie in den Suchergebnissen angezeigt werden:"
 }

From e7f8d211f99e381578daf9f837b216ba79915e3d Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sun, 10 May 2020 11:45:05 +0000
Subject: [PATCH 2854/3235] Translated using Weblate (German)

Currently translated at 99.0% (2281 of 2303 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 00dcec412e..a8fd1034c4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2344,5 +2344,11 @@
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Wenn du deine Wiederherstellungspassphrase vergessen hast kannst du <button1>deinen Wiederherstellungsschlüssel verwenden</button1> oder <button2>neue Wiederherstellungsoptionen anlegen</button2>.",
     "Self-verification request": "Selbstverifikationsanfrage",
     "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot speichert verschlüsselte Nachrichten sicher lokal zwischen, damit sie in den Suchergebnissen angezeigt werden:"
+    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot verwendet einen sicheren Zwischenspeicher für verschlüsselte Nachrichten, damit sie in den Suchergebnissen angezeigt werden:",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Erhalte Zugriff auf deine verschlüsselten Nachrichten und deine Cross-Signing Identität um andere Sitzungen zu verifizieren indem du deine Wiederherstellungspassphrase eingibst.",
+    "Liberate your communication": "Liberate your communication",
+    "Message downloading sleep time(ms)": "Wartezeit zwischen dem Herunterladen von Nachrichten (ms)",
+    "Navigate recent messages to edit": "Letzte Nachrichten zur Bearbeitung ansehen",
+    "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
+    "Navigate composer history": "Verlauf der Nachrichteneingabe durchsuchen"
 }

From a17820ed3a351521d241fe7aef49461e19233347 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sun, 10 May 2020 19:57:20 +0000
Subject: [PATCH 2855/3235] Translated using Weblate (German)

Currently translated at 99.0% (2281 of 2303 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a8fd1034c4..cac52fb477 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2350,5 +2350,6 @@
     "Message downloading sleep time(ms)": "Wartezeit zwischen dem Herunterladen von Nachrichten (ms)",
     "Navigate recent messages to edit": "Letzte Nachrichten zur Bearbeitung ansehen",
     "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
-    "Navigate composer history": "Verlauf der Nachrichteneingabe durchsuchen"
+    "Navigate composer history": "Verlauf der Nachrichteneingabe durchsuchen",
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Wenn du dies versehentlich getan hast, kannst du in dieser Sitzung \"gesicherte Nachrichten\" einrichten, die den Nachrichtenverlauf dieser Sitzung mit einer neuen Wiederherstellungsmethode erneut verschlüsseln."
 }

From 8ca72a883056a7a7fdd89afcd0a1569275f4d424 Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 15:37:19 +0000
Subject: [PATCH 2856/3235] Translated using Weblate (Spanish)

Currently translated at 77.4% (1782 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 872bd7ab4c..99ad342b69 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -977,7 +977,7 @@
     "User %(user_id)s does not exist": "El usuario %(user_id)s no existe",
     "User %(user_id)s may or may not exist": "El usuario %(user_id)s podría o no existir",
     "Unknown server error": "Error desconocido del servidor",
-    "Use a few words, avoid common phrases": "Usa varias palabras, evita frases comunes",
+    "Use a few words, avoid common phrases": "Usa unas pocas palabras, evita frases comunes",
     "No need for symbols, digits, or uppercase letters": "No hacen falta símbolos, números o letrás en mayúscula",
     "Avoid repeated words and characters": "Evita repetir palabras y letras",
     "Avoid sequences": "Evita frases",
@@ -1001,7 +1001,7 @@
     "A word by itself is easy to guess": "Una palabra es fácil de adivinar",
     "Names and surnames by themselves are easy to guess": "Nombres y apellidos son fáciles de adivinar",
     "Common names and surnames are easy to guess": "Nombres y apellidos comunes son fáciles de adivinar",
-    "Straight rows of keys are easy to guess": "Palabras formadas por repeticiones de teclas son fáciles de adivinar",
+    "Straight rows of keys are easy to guess": "Palabras formadas por secuencias de teclas alineadas son fáciles de adivinar",
     "Short keyboard patterns are easy to guess": "Patrones de tecleo cortos son fáciles de adivinar",
     "There was an error joining the room": "Hubo un error al unirse a la sala",
     "Custom user status messages": "Mensajes de estado de usuario personalizados",
@@ -1208,7 +1208,7 @@
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Te puedes registrar, pero algunas funcionalidades no estarán disponibles hasta que se pueda conectar con el servidor de identidad. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puedes cambiar tu contraseña, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puedes iniciar sesión, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este mensaje, comprueba tu configuración o contacta con el administrador del servidor.",
-    "No homeserver URL provided": "No se ha indicado la URL del servidor",
+    "No homeserver URL provided": "No se ha indicado la URL del servidor local",
     "Unexpected error resolving homeserver configuration": "Error inesperado en la configuración del servidor",
     "Unexpected error resolving identity server configuration": "Error inesperado en la configuración del servidor de identidad",
     "User %(userId)s is already in the room": "El usuario %(userId)s ya está en la sala",
@@ -1257,7 +1257,7 @@
     "Enable local event indexing and E2EE search (requires restart)": "Active el indexado de eventos locales y la búsqueda E2EE (necesita reiniciar)",
     "Match system theme": "Usar el tema del sistema",
     "Show previews/thumbnails for images": "Mostrar vistas previas para las imágenes",
-    "When rooms are upgraded": "Cuando se mejoran las salas",
+    "When rooms are upgraded": "Cuando las salas son actualizadas",
     "My Ban List": "Mi lista de baneos",
     "This is your list of users/servers you have blocked - don't leave the room!": "Esta es la lista de usuarios y servidores que ha bloqueado - ¡No deje la sala!",
     "Decline (%(counter)s)": "Declinar (%(counter)s)",
@@ -1442,11 +1442,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s actualizó una regla de bloqueo que correspondía a %(oldGlob)s a %(newGlob)s por %(reason)s",
     "The message you are trying to send is too large.": "El mensaje que estás intentando enviar es demasiado largo.",
     "a few seconds ago": "hace unos segundos",
-    "about a minute ago": "hace un minuto",
+    "about a minute ago": "hace aproximadamente un minuto",
     "%(num)s minutes ago": "hace %(num)s minutos",
-    "about an hour ago": "hace una hora",
+    "about an hour ago": "hace aprox. una hora",
     "%(num)s hours ago": "hace %(num)s horas",
-    "about a day ago": "hace un día",
+    "about a day ago": "hace aprox. un día",
     "%(num)s days ago": "hace %(num)s días",
     "a few seconds from now": "dentro de unos segundos",
     "about a minute from now": "dentro de un minuto",
@@ -1466,7 +1466,7 @@
     "or": "o",
     "Compare unique emoji": "Comparar emoji único",
     "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de emojis si no tienes cámara en ninguno de los dispositivos",
-    "Start": "Comenzar",
+    "Start": "Inicio",
     "Confirm the emoji below are displayed on both devices, in the same order:": "Confirma que los emojis a continuación son mostrados en ambos dispositivos, en el mismo orden:",
     "Verify this device by confirming the following number appears on its screen.": "Verifica este dispositivo confirmando que el siguiente número aparece en su pantalla.",
     "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s …",
@@ -1493,7 +1493,7 @@
     "Browse": "Navegar",
     "Change room avatar": "Cambiar avatar de sala",
     "Change room name": "Cambiar nombre de sala",
-    "Change main address for the room": "Cambiar dirección principal para la sala",
+    "Change main address for the room": "Cambiar la dirección principal para la sala",
     "Change history visibility": "Cambiar visibilidad del historial",
     "Change permissions": "Cambiar permisos",
     "Change topic": "Cambiar tema",
@@ -1508,7 +1508,7 @@
     "Send messages": "Enviar mensajes",
     "Invite users": "Invitar usuarios",
     "Change settings": "Cambiar la configuración",
-    "Kick users": "Echar a usuarios",
+    "Kick users": "Expulsar usuarios",
     "Ban users": "Bloquear a usuarios",
     "Remove messages": "Eliminar mensajes",
     "Notify everyone": "Notificar a todos",
@@ -1536,5 +1536,282 @@
     "Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
     "Disconnect": "Desconectarse",
     "You should:": "Deberías:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s de %(totalRooms)s"
+    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s de %(totalRooms)s",
+    "Use Single Sign On to continue": "Procede con Registro Único para continuar",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma la adición de esta dirección de correo electrónico usando el Registro Único para probar tu identidad.",
+    "Single Sign On": "Registro Único",
+    "Confirm adding email": "Confirmar la adición del correo electrónico",
+    "Click the button below to confirm adding this email address.": "Haz clic en el botón de abajo para confirmar la adición de esta dirección de correo electrónico.",
+    "Confirm": "Confirmar",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirme la adición de este número de teléfono usando el Registro Único para probar su identidad...",
+    "Confirm adding phone number": "Confirmar la adición del número de teléfono",
+    "Click the button below to confirm adding this phone number.": "Haga clic en el botón de abajo para confirmar la adición de este número de teléfono.",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Si estés usando Riot en un dispositivo donde una pantalla táctil es el principal mecanismo de entrada",
+    "Whether you're using Riot as an installed Progressive Web App": "Si estás usando Riot como una Aplicación Web Progresiva instalada",
+    "Review Sessions": "Sesiones de revisión",
+    "If you cancel now, you won't complete your operation.": "Si cancela ahora, no completará la operación.",
+    "Review where you’re logged in": "Revise dónde hizo su registro",
+    "New login. Was this you?": "Nuevo registro. ¿Fuiste tú?",
+    "%(name)s is requesting verification": "%(name)s  solicita verificación",
+    "Sign In or Create Account": "Iniciar sesión o Crear una cuenta",
+    "Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
+    "Create Account": "Crear cuenta",
+    "Sign In": "Registrarse",
+    "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo como un markdown",
+    "Failed to set topic": "No se ha podido establecer el tema",
+    "Command failed": "El comando falló",
+    "Could not find user in room": "No pude encontrar el usuario en la sala",
+    "Please supply a widget URL or embed code": "Por favor, proporcione una URL del widget o un código de incrustación",
+    "Displays information about a user": "Muestra información sobre un usuario",
+    "Send a bug report with logs": "Envíe un informe de errores con los registros",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambió el nombre de la sala %(oldRoomName)s a %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s añadió las direcciones alternativas %(addresses)s para esta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s añadió la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s cambió las direcciones alternativas de esta sala.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s cambió la dirección principal y las alternativas de esta sala.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s cambió las direcciones de esta sala.",
+    "You signed in to a new session without verifying it:": "Iniciaste una nueva sesión sin verificarla:",
+    "Verify your other session using one of the options below.": "Verifique su otra sesión utilizando una de las siguientes opciones.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) inició una nueva sesión sin verificarla:",
+    "Ask this user to verify their session, or manually verify it below.": "Pídale a este usuario que verifique su sesión, o verifíquela manualmente a continuación.",
+    "Not Trusted": "No es de confianza",
+    "Manually Verify by Text": "Verificar manualmente mediante texto",
+    "Interactively verify by Emoji": "Verifica interactivamente con unEmoji",
+    "Done": "Listo",
+    "Support adding custom themes": "Soporta la adición de temas personalizados",
+    "Enable cross-signing to verify per-user instead of per-session": "Habilitar la firma cruzada para verificar por usuario en lugar de por sesión",
+    "Show info about bridges in room settings": "Mostrar información sobre puentes en la configuración de salas",
+    "Order rooms by name": "Ordenar las salas por nombre",
+    "Show rooms with unread notifications first": "Mostrar primero las salas con notificaciones no leídas",
+    "Show shortcuts to recently viewed rooms above the room list": "Mostrar atajos a las salas recientemente vistas por encima de la lista de salas",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir el servidor de respaldo de asistencia de llamadas turn.matrix.org cuando su servidor doméstico no lo ofrece (su dirección IP se compartiría durante una llamada)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar recibos de lectura de mensajes (requiere un servidor local compatible para desactivarlo)",
+    "Keep recovery passphrase in memory for this session": "Guarde la contraseña de recuperación en la memoria para esta sesión",
+    "Manually verify all remote sessions": "Verifica manualmente todas las sesiones remotas",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que los emoji de abajo se muestran en el mismo orden en ambas sesiones:",
+    "Verify this session by confirming the following number appears on its screen.": "Verifique esta sesión confirmando que el siguiente número aparece en su pantalla.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Esperando a que su otra sesión, %(deviceName)s (%(deviceId)s), verifica…",
+    "Cancelling…": "Anulando …",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifica todas tus sesiones abiertas para asegurarte de que tu cuenta y tus mensajes estén seguros",
+    "Update your secure storage": "Actualice su almacenamiento seguro",
+    "Set up": "Configurar",
+    "Verify the new login accessing your account: %(name)s": "Verifique el nuevo ingreso que está accediendo a su cuenta: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
+    "This bridge was provisioned by <user />.": "Este puente fue aportado por <user />.",
+    "This bridge is managed by <user />.": "Este puente es administrado por <user />.",
+    "Your homeserver does not support cross-signing.": "Tu servidor doméstico no soporta las firmas cruzadas.",
+    "Cross-signing and secret storage are enabled.": "La firma cruzada y el almacenamiento secreto están activados.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Su cuenta tiene una identidad de firma cruzada en un almacenamiento secreto, pero aún no es confiada en esta sesión.",
+    "Cross-signing and secret storage are not yet set up.": "Las firmas cruzadas y el almacenamiento secreto aún no han sido configurados.",
+    "Reset cross-signing and secret storage": "Resetear las señales cruzadas y el almacenamiento secreto",
+    "Bootstrap cross-signing and secret storage": "Reconfiguración de firma cruzada y almacenamiento secreto",
+    "well formed": "bien formado",
+    "unexpected type": "tipo inesperado",
+    "Cross-signing public keys:": "Firmando las llaves públicas de manera cruzada:",
+    "Cross-signing private keys:": "Firmando las llaves privadas de manera cruzada:",
+    "Self signing private key:": "Clave privada autofirmada:",
+    "cached locally": "almacenado localmente",
+    "not found locally": "no encontrado localmente",
+    "User signing private key:": "Usuario firmando llave privada:",
+    "Session backup key:": "Llave / Código de respaldo de la sesión:",
+    "Homeserver feature support:": "Características apoyadas por servidor local:",
+    "exists": "existe",
+    "Secret Storage key format:": "Formato del código de almacenamiento secreto:",
+    "outdated": "no actual",
+    "up to date": "actualizado",
+    "Your homeserver does not support session management.": "Su servidor local no soporta la gestión de sesiones.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirme eliminar estas sesiones, probando su identidad con el Registro Único.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirme eliminar esta sesión, probando su identidad con el Registro Único.",
+    "Confirm deleting these sessions": "Confirmar la eliminación de estas sesiones",
+    "Click the button below to confirm deleting these sessions.|other": "Haga clic en el botón de abajo para confirmar la eliminación de estas sesiones.",
+    "Click the button below to confirm deleting these sessions.|one": "Haga clic en el botón de abajo para confirmar la eliminación de esta sesión.",
+    "Delete sessions|other": "Eliminar sesiones",
+    "Delete sessions|one": "Eliminar sesión",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada por un usuario para marcarla como de confianza, no confiando en dispositivos de firma cruzada.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Almacenar localmente, de manera segura,  los mensajes cifrados localmente para que aparezcan en los resultados de la búsqueda, utilizando ",
+    " to store messages from ": " para almacenar mensajes de ",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Almacenar localmente, de manera segura, a los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio Riot personalizado con componentes de búsqueda<nativeLink> añadidos.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot no puede guardar de forma segura en la memoria caché a mensajes encriptados localmente, mientras se ejecuta en un navegador web. Use <riotLink>Riot Desktop</riotLink> para que los mensajes encriptados aparezcan en los resultados de la búsqueda.",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Esta sesión no<b> ha creado una copia de seguridad de tus llaves, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecte esta sesión a la copia de seguridad de las claves antes de firmar y así evitar perder las claves que sólo existen en esta sesión.",
+    "Connect this session to Key Backup": "Conecte esta sesión a la copia de respaldo de tu clave",
+    "Backup has a <validity>valid</validity> signature from this user": "La copia de seguridad tiene una  firma de <validity>valido</validity> de este usuario",
+    "Backup has a <validity>invalid</validity> signature from this user": "La copia de seguridad tiene una firma de <validity>no_valida</validity> de este usuario",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "La copia de seguridad tiene una firma de <verify>desconocido</verify> del usuario con ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "La copia de seguridad tiene una firma de <verify>desconocido</verify> de la sesión con ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "La copia de seguridad tiene una firma <validity>válida</validity> de esta sesión",
+    "Backup has an <validity>invalid</validity> signature from this session": "La copia de seguridad tiene una firma <validity>no_válida</validity> de esta sesión",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma  <validity>válida</validity> de <verify>verificada</verify> sesión <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>válida</validity> de sesión  <verify>no verificada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión  <verify>verificada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión  <verify>no verificada</verify> <device></device>",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "La clave de respaldo se guardó en un almacenamiento secreto, pero esta función no está habilitada en esta sesión. Por favor, habilite la firma cruzada en Labs para modificar el estado de respaldo de la clave.",
+    "<a>Upgrade</a> to your own domain": "<a>Actualizar</a> a su propio dominio",
+    "Identity Server URL must be HTTPS": "La URL del servidor de identidad debe ser tipo HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "No es un servidor de identidad válido (código de estado %(code)s)",
+    "Could not connect to Identity Server": "No se pudo conectar al Servidor de Identidad",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Usted debe <b> eliminar sus datos personales </b> del servidor de identidad <idserver /> antes de desconectarse. Desafortunadamente, el servidor de identidad <idserver /> está actualmente desconectado o es imposible comunicarse con él por otra razón.",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "comprueba los complementos (plugins) de tu navegador para ver si hay algo que pueda bloquear el servidor de identidad (como p.ej. Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "contactar con los administradores del servidor de identidad <idserver />",
+    "wait and try again later": "espera y vuelve a intentarlo más tarde",
+    "Disconnect anyway": "Desconectar de todas formas",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Usted todavía está <b> compartiendo sus datos personales</b> en el servidor de identidad <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Le recomendamos que elimine sus direcciones de correo electrónico y números de teléfono del servidor de identidad antes de desconectarse.",
+    "Go back": "Atrás",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usar un Administrador de Integración <b>(%(serverName)s)</b>  para manejar los bots, los widgets y los paquetes de pegatinas.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utiliza un Administrador de Integración para gestionar los bots, los widgets y los paquetes de pegatinas.",
+    "Invalid theme schema.": "Esquema de tema inválido.",
+    "Error downloading theme information.": "Error al descargar la información del tema.",
+    "Theme added!": "¡Se añadió el tema!",
+    "Custom theme URL": "URL de tema personalizado",
+    "Add theme": "Añadir tema",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para informar de un problema de seguridad relacionado con Matrix, por favor lea  <a>Security Disclosure Policy</a> de Matrix.or.",
+    "Keyboard Shortcuts": "Atajos de teclado",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza tu experiencia con las funciones de los laboratorios experimentales. <a>Learn more</a>.",
+    "Something went wrong. Please try again or view your console for hints.": "Algo salió mal. Por favor, inténtalo de nuevo o mira tu consola para encontrar pistas.",
+    "Please try again or view your console for hints.": "Por favor, inténtalo de nuevo o mira tu consola para encontrar pistas.",
+    "Ban list rules - %(roomName)s": "Reglas de la lista negra - %(roomName)s",
+    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Añade los usuarios y servidores que quieras ignorar aquí. Usa asteriscos para que Riot coincida cualquier conjunto de caracteres. Por ejemplo, <code>@bot:*</code> ignoraría a todos los usuarios,en cualquier servidor, que tengan el nombre 'bot' .",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Ignorar usuarios se hace mediante listas negras que contienen reglas sobre a quién bloquear. Suscribirse a una lista negra significa que los usuarios/servidores bloqueados serán invisibles para tí.",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Tu lista negra personal contiene todos los usuarios/servidores de los que no quieres ver mensajes. Después de ignorar su primer usuario/servidor, una nueva sala aparecerá en su lista de salas llamada \"Mi lista negra (de bloqueo)\" - permanezca en esta sala para mantener la lista de prohibición en efecto.",
+    "Subscribed lists": "Listados a que subscribiste",
+    "Subscribing to a ban list will cause you to join it!": "¡Suscribirse a una lista negra hará unirte a ella!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Si esto no es lo que quieres, por favor usa una herramienta diferente para ignorar usuarios.",
+    "Room ID or alias of ban list": "Identificación (ID) de la habitación o alias de la lista negra",
+    "Subscribe": "Suscribir",
+    "Always show the window menu bar": "Siempre mostrar la barra de menú de la ventana",
+    "Show tray icon and minimize window to it on close": "Mostrar el icono en el Área de Notificación y minimizar la ventana al cerrarla",
+    "Composer": "Compositor",
+    "Timeline": "Línea de tiempo",
+    "Read Marker lifetime (ms)": "Permanencia del marcador de lectura (en ms)",
+    "Read Marker off-screen lifetime (ms)": "Permanencia  del marcador de lectura fuera de la pantalla (en ms)",
+    "Session ID:": "Identidad (ID) de sesión:",
+    "Session key:": "Código de sesión:",
+    "Accept all %(invitedRooms)s invites": "Aceptar todas las invitaciones de %(invitedRooms)s",
+    "Cross-signing": "Firmar cruzada",
+    "Where you’re logged in": "En el lugar de ingreso (registro)",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Administre los nombres de sus sesiones y salga de las sesiones abajo o <a>verifíquelos en su Perfil de Usuario</a>.",
+    "A session's public name is visible to people you communicate with": "El nombre público de una sesión es visible para las personas con las que te comunicas",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está haciendo puente con las siguientes plataformas. <a>Aprende más.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Esta sala no está haciendo puente con ninguna plataforma. <a>Aprende más</a>",
+    "Bridges": "Puentes",
+    "Uploaded sound": "Sonido subido",
+    "Reset": "Resetear",
+    "Unable to revoke sharing for email address": "No se logró revocar el compartir para la dirección de correo electrónico",
+    "Unable to share email address": "No se logró compartir la dirección de correo electrónico",
+    "Click the link in the email you received to verify and then click continue again.": "Haga clic en el enlace del correo electrónico que recibió para verificar y luego nuevamente haga clic en continuar.",
+    "Revoke": "Revocar",
+    "Discovery options will appear once you have added an email above.": "Las opciones de descubrimiento aparecerán una vez que haya añadido un correo electrónico arriba.",
+    "Unable to revoke sharing for phone number": "No se logró revocar el intercambio de un número de teléfono",
+    "Unable to share phone number": "No se logró compartir el número de teléfono",
+    "Please enter verification code sent via text.": "Por favor, introduzca el código de verificación enviado  por mensaje de texto.",
+    "Discovery options will appear once you have added a phone number above.": "Las opciones de descubrimiento aparecerán una vez que haya añadido un número de teléfono arriba.",
+    "Remove %(phone)s?": "¿Eliminar %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Se ha enviado un mensaje de texto a +%(msisdn)s. Por favor, introduzca el código de verificación que contiene.",
+    "This user has not verified all of their sessions.": "Este usuario no ha verificado todas sus sesiones.",
+    "You have not verified this user.": "No has verificado a este usuario.",
+    "You have verified this user. This user has verified all of their sessions.": "Usted ha verificado este usuario. Este usuario ha verificado todas sus sesiones.",
+    "Someone is using an unknown session": "Alguien está usando una sesión desconocida",
+    "This room is end-to-end encrypted": "Esta sala usa encriptación de extremo a extremo",
+    "Everyone in this room is verified": "Todos los participantes en esta sala están verificados",
+    "Some sessions for this user are not trusted": "Algunas sesiones para este usuario no son de confianza",
+    "All sessions for this user are trusted": "Todas las sesiones para este usuario son de confianza",
+    "Some sessions in this encrypted room are not trusted": "Algunas sesiones en esta sala encriptada no son de confianza",
+    "All sessions in this encrypted room are trusted": "Todas las sesiones en esta sala encriptada son de confianza",
+    "Edit message": "Editar mensaje",
+    "Mod": "Mod",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Su solicitud de intercambio de claves ha sido enviada. Por favor, compruebe en sus otras sesiones si hay solicitudes de intercambio de claves.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Solicitudes para compartir claves son enviadas a sus otras sesiones de forma automática. Si ha rechazado o descartado la solicitud de compartir claves en sus otras sesiones, haga clic aquí para solicitar de nuevo las claves de esta sesión.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si sus otras sesiones no tienen la clave para este mensaje no podrás desencriptarlas.",
+    "Rotate counter-clockwise": "Girar en sentido contrario a las agujas del reloj",
+    "Rotate Right": "Girar a la derecha",
+    "Rotate clockwise": "Girar en el sentido de las agujas del reloj",
+    "Language Dropdown": "Lista selección de idiomas",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s veces no efectuarion cambios",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s  no efectuaron cambios",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s veces no efectuó cambios",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s no efectuó cambios",
+    "Power level": "Nivel de poder",
+    "Room alias": "Alias (apodo) de la sala",
+    "e.g. my-room": "p.ej. mi-sala",
+    "Some characters not allowed": "Algunos caracteres no están permitidos",
+    "Please provide a room alias": "Por favor, proporcione un alias (apodo) para la sala",
+    "This alias is available to use": "Este alias (apodo) está disponible",
+    "This alias is already in use": "Este alias (apodo) ya está en uso",
+    "Sign in with single sign-on": "Ingresar con un Registro Único",
+    "Enter a server name": "Introduzca un nombre de servidor",
+    "Looks good": "Se ve bien",
+    "Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas",
+    "All rooms": "Todas las salas",
+    "Your server": "Tu",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Estás seguro de querer quitar <b>%(serverName)s</b> ?",
+    "Remove server": "Quitar servidor",
+    "Matrix": "Matrix",
+    "Add a new server": "Añadir un nuevo servidor",
+    "Enter the name of a new server you want to explore.": "Introduce el nombre de un nuevo servidor que quieras explorar.",
+    "Server name": "Nombre del servidor",
+    "Add a new server...": "Añade un nuevo servidor ...",
+    "%(networkName)s rooms": "%(networkName)s sala",
+    "Matrix rooms": "Salas de Matrix",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usar un Servidor de Identidad para invitar vía correo electrónico. <default>. Use (%(defaultIdentityServerName)s)</default>o seleccione en <settings>Ajustes</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Utilice un servidor de identidad para invitar por correo electrónico. Gestionar en <settings>Ajustes</settings>.",
+    "Close dialog": "Cerrar diálogo",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, díganos qué salió mal o, mejor aún, cree un reporte de GitHub que describa el problema.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Recordatorio: Su navegador no es compatible, por lo que su experiencia puede ser impredecible.",
+    "GitHub issue": "reporte GitHub",
+    "Notes": "Notas",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Si hay algún contexto adicional que ayude a analizar el tema, como por ejemplo lo que estaba haciendo en ese momento, nombre (ID) de sala, nombre (ID)de usuario, etc., por favor incluya esas cosas aquí.",
+    "Removing…": "Quitando…",
+    "Destroy cross-signing keys?": "¿Destruir las claves de firma cruzada?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La eliminación de claves de firma cruzada es definitiva.  Cualquiera con el que lo hayas verificado verá alertas de seguridad. Es casi seguro que no quieres hacer esto, a menos que hayas perdido todos los dispositivos puedas usar hacer una firma cruzada.",
+    "Clear cross-signing keys": "Borrar claves de firma cruzada",
+    "Clear all data in this session?": "¿Borrar todos los datos en esta sesión?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La eliminación de todos los datos de esta sesión es definitiva. Los mensajes encriptados se perderán a menos que se haya hecho una copia de seguridad de sus claves.",
+    "Clear all data": "Borrar todos los datos",
+    "Please enter a name for the room": "Por favor, introduzca un nombre para la sala",
+    "Set a room alias to easily share your room with other people.": "Fijar un alias (apodo) para su sala para compartirla con mayor facilidadn con otras personas.",
+    "This room is private, and can only be joined by invitation.": "Esta sala es privada, y sólo se puede acceder a ella por invitación.",
+    "Enable end-to-end encryption": "Habilitar la encriptación de extremo a extremo",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes deshabilitar esto después. Los puentes y la mayoría de los bots no funcionarán todavía.",
+    "Create a public room": "Crear una sala pública",
+    "Create a private room": "Crear una sala pública",
+    "Topic (optional)": "Tema (opcional)",
+    "Make this room public": "Convierte esta sala en pública",
+    "Hide advanced": "Ocultar avanzado",
+    "Show advanced": "Mostrar avanzado",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarios de otros servidores Matrix se unan a esta sala (¡Este ajuste no puede ser cambiada más tarde!)",
+    "Server did not require any authentication": "El servidor no requirió ninguna autenticación",
+    "Server did not return valid authentication information.": "El servidor no devolvió información de autenticación válida.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirme la desactivación de su cuenta, usando Registro Único para probar su identidad.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "¿Está seguro de que quiere desactivar su cuenta? Es irreversible.",
+    "Confirm account deactivation": "Confirmar la desactivación de la cuenta",
+    "There was a problem communicating with the server. Please try again.": "Hubo un problema de comunicación con el servidor. Por favor, inténtelo de nuevo.",
+    "Verify session": "Verificar sesión",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Para verificar que se puede confiar en esta sesión, comprueba que la clave que ves en la Configuración del Usuario de ese dispositivo coincide con la clave que aparece a continuación:",
+    "To verify that this session 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 session matches the key below:": "Para verificar que se puede confiar en esta sesión, póngase en contacto con su dueño por algún otro medio (por ejemplo, en persona o por teléfono) y pregúntele si el código que ve en su Configuración de usuario para esta sesión coincide con el código abajo:",
+    "Session name": "Nombre de sesión",
+    "Session key": "Código de sesión",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Si coincide, presione el botón de verificación de abajo. Si no, entonces otra persona está interceptando esta sesión y probablemente quieras presionar el botón de la lista negra en su lugar.",
+    "View Servers in Room": "Ver servidores en la sala",
+    "Verification Requests": "Solicitudes de verificación",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verificar que este usuario marcará su sesión como de confianza, y también que marcará su sesión como de confianza para él.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifique este dispositivo para marcarlo como confiable. Confiar en este dispositivo le da a usted y a otros usuarios tranquilidad adicional cuando utilizan mensajes cifrados de extremo a extremo.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verificación de este dispositivo lo marcará como de confianza.  Los usuarios que dejaron verificarse por usted confiarán en este dispositivo.",
+    "Integrations are disabled": "Las integraciones están deshabilitadas",
+    "Enable 'Manage Integrations' in Settings to do this.": "Habilita 'Gestionar Integraciones' en Ajustes para hacer esto.",
+    "Integrations not allowed": "Integraciones no están permitidas",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Su Riot no le permite utilizar un \"Administrador de Integración\" para hacer esto. Por favor, contacte con un administrador.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Error invitando a los siguientes usuarios al chat: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "No pudimos crear tu DM. Por favor, marca los usuarios que quieres invitar e inténtalo de nuevo.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Iniciar una conversación con alguien usando su nombre, nombre de usuario (como <userId/>) o dirección de correo electrónico.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitar a alguien usando su nombre, nombre de usuario (como <userId/>), dirección de correo electrónico o <a> compartir esta sala</a>.",
+    "a new master key signature": "una nueva firma de llave maestra",
+    "a new cross-signing key signature": "una nueva firma de código de firma cruzada",
+    "a device cross-signing signature": "una firma para la  firma cruzada de dispositivos",
+    "a key signature": "un firma de clave",
+    "Riot encountered an error during upload of:": "Riot encontró un error durante la carga de:",
+    "End": "Fin"
 }

From a8db033dd45b026c6655bffe695ed900cc1fa22c Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:18:00 +0000
Subject: [PATCH 2857/3235] Translated using Weblate (Spanish)

Currently translated at 77.4% (1782 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 99ad342b69..6d1701b580 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1813,5 +1813,12 @@
     "a device cross-signing signature": "una firma para la  firma cruzada de dispositivos",
     "a key signature": "un firma de clave",
     "Riot encountered an error during upload of:": "Riot encontró un error durante la carga de:",
-    "End": "Fin"
+    "End": "Fin",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Una vez habilitado, el cifrado de una sala no puede deshabilitarse. Los mensajes enviados a una sala cifrada no pueden ser vistos por el servidor, sólo lo verán los participantes de la sala. Habilitar el cifrado puede hacer que muchos bots y bridges no funcionen correctamente. <a>Aprende más de cifrado</a>",
+    "Joining room …": "Uniéndose a sala ...",
+    "Loading …": "Cargando ...",
+    "Rejecting invite …": "Rechazando invitación ...",
+    "Join the conversation with an account": "Unirse a la conversación con una cuenta",
+    "Sign Up": "Registrarse",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de %(roomName)s"
 }

From f0ffd8c2087f1886524f3db68c3f763c962fdfa2 Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:19:29 +0000
Subject: [PATCH 2858/3235] Translated using Weblate (Spanish)

Currently translated at 77.6% (1787 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 6d1701b580..732c56b1d0 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1820,5 +1820,5 @@
     "Rejecting invite …": "Rechazando invitación ...",
     "Join the conversation with an account": "Unirse a la conversación con una cuenta",
     "Sign Up": "Registrarse",
-    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de %(roomName)s"
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de la sala %(roomName)s"
 }

From ecb3816e61886a6e29782ba5eb8b3b5535cf994f Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:19:39 +0000
Subject: [PATCH 2859/3235] Translated using Weblate (Spanish)

Currently translated at 77.6% (1787 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 732c56b1d0..005c6363cc 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1820,5 +1820,10 @@
     "Rejecting invite …": "Rechazando invitación ...",
     "Join the conversation with an account": "Unirse a la conversación con una cuenta",
     "Sign Up": "Registrarse",
-    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de la sala %(roomName)s"
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de la sala %(roomName)s",
+    "Reason: %(reason)s": "Razón: %(reason)s",
+    "Forget this room": "Olvidar esta sala",
+    "Re-join": "Re-entrar",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
+    "Something went wrong with your invite to %(roomName)s": "Algo ha ido mal con tu invitación a  %(roomName)s"
 }

From e30d4dab35ecbc963678e1b50a3ec0809713beb0 Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:20:56 +0000
Subject: [PATCH 2860/3235] Translated using Weblate (Spanish)

Currently translated at 77.6% (1788 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 005c6363cc..fec9b8688b 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1825,5 +1825,5 @@
     "Forget this room": "Olvidar esta sala",
     "Re-join": "Re-entrar",
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
-    "Something went wrong with your invite to %(roomName)s": "Algo ha ido mal con tu invitación a  %(roomName)s"
+    "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s"
 }

From 79fbc1452ebdd1cc48bf80ecd423776cc5115054 Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:21:19 +0000
Subject: [PATCH 2861/3235] Translated using Weblate (Spanish)

Currently translated at 77.6% (1788 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index fec9b8688b..375a13a3f6 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1825,5 +1825,6 @@
     "Forget this room": "Olvidar esta sala",
     "Re-join": "Re-entrar",
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
-    "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s"
+    "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
+    "You can only join it with a working invite.": "Sólo puedes unirte con una invitación activa."
 }

From 94c1ef85531123092d3be05533e2c49d5d7b3dba Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:21:44 +0000
Subject: [PATCH 2862/3235] Translated using Weblate (Spanish)

Currently translated at 77.7% (1789 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 375a13a3f6..ebe8399318 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1826,5 +1826,5 @@
     "Re-join": "Re-entrar",
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
-    "You can only join it with a working invite.": "Sólo puedes unirte con una invitación activa."
+    "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona."
 }

From 6f2430daeae606ed3514efa135c8915e9d1f94ff Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:21:55 +0000
Subject: [PATCH 2863/3235] Translated using Weblate (Spanish)

Currently translated at 77.7% (1789 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index ebe8399318..5efd6094d2 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1826,5 +1826,6 @@
     "Re-join": "Re-entrar",
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
-    "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona."
+    "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
+    "Try to join anyway": "Unirse de todas formas"
 }

From 584e56b4bb5366f1e2767fe93538156f973d3e9a Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:22:12 +0000
Subject: [PATCH 2864/3235] Translated using Weblate (Spanish)

Currently translated at 77.7% (1790 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 5efd6094d2..fec02550ca 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1827,5 +1827,5 @@
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
     "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
-    "Try to join anyway": "Unirse de todas formas"
+    "Try to join anyway": "Intentar unirse de todas formas"
 }

From c74b71013b45be98cdb9b1eff5cfb2b7a279cd4b Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:22:38 +0000
Subject: [PATCH 2865/3235] Translated using Weblate (Spanish)

Currently translated at 77.7% (1790 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index fec02550ca..0cc68582ae 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1827,5 +1827,6 @@
     "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
     "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
-    "Try to join anyway": "Intentar unirse de todas formas"
+    "Try to join anyway": "Intentar unirse de todas formas",
+    "You can still join it because this is a public room.": "Puedes unirte porque es una sala pública."
 }

From e61a5e04f2da11ca3236ebb56352a5dc9adad22a Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:23:28 +0000
Subject: [PATCH 2866/3235] Translated using Weblate (Spanish)

Currently translated at 77.9% (1793 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 0cc68582ae..3edebaff1a 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1828,5 +1828,5 @@
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
     "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
     "Try to join anyway": "Intentar unirse de todas formas",
-    "You can still join it because this is a public room.": "Puedes unirte porque es una sala pública."
+    "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública."
 }

From 71aa3d9487f2a1c3e288d1fe228cf8fd469ff368 Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:23:36 +0000
Subject: [PATCH 2867/3235] Translated using Weblate (Spanish)

Currently translated at 77.9% (1793 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 3edebaff1a..76d07172fa 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1828,5 +1828,8 @@
     "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
     "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
     "Try to join anyway": "Intentar unirse de todas formas",
-    "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública."
+    "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.",
+    "Join the discussion": "Unirse a la discusión",
+    "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
+    "Do you want to join %(roomName)s?": "¿Quieres unirte a %(roomName)s?"
 }

From b8910580a486696fe18dba93a45dc79bc7efa57c Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:24:03 +0000
Subject: [PATCH 2868/3235] Translated using Weblate (Spanish)

Currently translated at 78.0% (1796 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 76d07172fa..dd6f930b0c 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1831,5 +1831,5 @@
     "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.",
     "Join the discussion": "Unirse a la discusión",
     "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
-    "Do you want to join %(roomName)s?": "¿Quieres unirte a %(roomName)s?"
+    "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?"
 }

From 8881758186f5aa5f7c300bfdfead3c0ed79bfb5a Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:24:19 +0000
Subject: [PATCH 2869/3235] Translated using Weblate (Spanish)

Currently translated at 78.0% (1796 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index dd6f930b0c..272dfb121b 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1831,5 +1831,8 @@
     "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.",
     "Join the discussion": "Unirse a la discusión",
     "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
-    "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?"
+    "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?",
+    "<userName/> invited you": "<userName/> te ha invitado",
+    "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s no se puede previsualizar. ¿Quieres unirte?"
 }

From d2d267421e9435e95fc2f00feb3a13a429ec834a Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:25:48 +0000
Subject: [PATCH 2870/3235] Translated using Weblate (Spanish)

Currently translated at 78.0% (1797 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 272dfb121b..a4f12f4778 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1834,5 +1834,5 @@
     "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?",
     "<userName/> invited you": "<userName/> te ha invitado",
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s no se puede previsualizar. ¿Quieres unirte?"
+    "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?"
 }

From d331b2d232533db8f690543bdab5336ec42526ee Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:26:05 +0000
Subject: [PATCH 2871/3235] Translated using Weblate (Spanish)

Currently translated at 78.0% (1797 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index a4f12f4778..5f3f197cfc 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1834,5 +1834,6 @@
     "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?",
     "<userName/> invited you": "<userName/> te ha invitado",
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
-    "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?"
+    "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de que la sala es correcta?"
 }

From 49a531287fbcc88bd000deb30a561887fa7c39ed Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:26:41 +0000
Subject: [PATCH 2872/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1798 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 5f3f197cfc..4356129ed2 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1835,5 +1835,5 @@
     "<userName/> invited you": "<userName/> te ha invitado",
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
-    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de que la sala es correcta?"
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?"
 }

From ddaac161dba5558d484716d5caca559f766967ba Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:26:56 +0000
Subject: [PATCH 2873/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1798 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 4356129ed2..010d714cf7 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1835,5 +1835,6 @@
     "<userName/> invited you": "<userName/> te ha invitado",
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
-    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?"
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
+    "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide a algún administrador de la sala que compruebe si tienes acceso."
 }

From cfe5fc15fb23b8cfdff082a3d465d8b8ee4579c7 Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:27:42 +0000
Subject: [PATCH 2874/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1799 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 010d714cf7..8ce59bca92 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1836,5 +1836,5 @@
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
-    "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide a algún administrador de la sala que compruebe si tienes acceso."
+    "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso."
 }

From 93266aedede97a4661e159d58c682bfecb82d98a Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sun, 10 May 2020 21:28:13 +0000
Subject: [PATCH 2875/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1799 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 8ce59bca92..45baa42f58 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1836,5 +1836,6 @@
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
-    "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso."
+    "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje de error, por favor <issueLink>comunícanos el bug</issueLink>."
 }

From 76d054bbf3025956aec248240ca0c01e5712c9f2 Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:29:15 +0000
Subject: [PATCH 2876/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1799 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 45baa42f58..3cb39a4b45 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1837,5 +1837,5 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
     "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso.",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje de error, por favor <issueLink>comunícanos el bug</issueLink>."
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje, por favor <issueLink>somete un reporte de error</issueLink>."
 }

From 662077fe67fdb363562c48d13c13318b54a4a00c Mon Sep 17 00:00:00 2001
From: Sejo <sejo@eccs.world>
Date: Sun, 10 May 2020 21:31:12 +0000
Subject: [PATCH 2877/3235] Translated using Weblate (Spanish)

Currently translated at 78.1% (1799 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 3cb39a4b45..17ddee917f 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -537,7 +537,7 @@
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
-    "Pin Message": "Marcar Mensaje",
+    "Pin Message": "Fija Mensaje",
     "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",

From 19e8f16da6ececcf8c4d4ae208ec457f5fd542b8 Mon Sep 17 00:00:00 2001
From: "Pepper.Cabbit.Snoopy" <miranda_zhang@live.cn>
Date: Sun, 10 May 2020 09:41:39 +0000
Subject: [PATCH 2878/3235] Translated using Weblate (Chinese (Simplified))

Currently translated at 60.7% (1399 of 2303 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 | 70 +++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 58e4130d99..4eff773d1c 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -724,7 +724,7 @@
     "Noisy": "响铃",
     "Error saving email notification preferences": "保存电子邮件通知选项时出错",
     "Messages containing my display name": "消息中含有我的显示名称",
-    "Messages in one-to-one chats": "一对一聊天种的消息",
+    "Messages in one-to-one chats": "一对一聊天中的消息",
     "Unavailable": "无法获得",
     "View Decrypted Source": "查看解密的来源",
     "Failed to update keywords": "无法更新关键词",
@@ -1354,8 +1354,8 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "请安装 <chromeLink>Chrome</chromeLink>，<firefoxLink>Firefox</firefoxLink>，或 <safariLink>Safari</safariLink> 以获得最佳体验。",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>警告</b>：升级聊天室 <i>不会自动将聊天室成员转移到新版聊天室中。</i> 我们将会在旧版聊天室中发布一个新版聊天室的链接 - 聊天室成员必须点击该链接以加入新聊天室。",
     "Adds a custom widget by URL to the room": "用链接方式为聊天室添加自定义小部件",
-    "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的小部件链接",
-    "You cannot modify widgets in this room.": "您无法修改此聊天室的小部件。",
+    "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的插件",
+    "You cannot modify widgets in this room.": "您无法修改此聊天室的插件。",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s 撤销了对 %(targetDisplayName)s 加入聊天室的邀请。",
     "Upgrade this room to the recommended room version": "升级此聊天室至推荐版本",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "此聊天室运行的聊天室版本是 <roomVersion /> ，该版本已被主服务器标记为 <i>不稳定</i> 。",
@@ -1381,5 +1381,67 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "请联系您主服务器（<code>%(homeserverDomain)s</code>）的管理员设置 TURN 服务器来确保通话运作稳定。",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "您也可以尝试使用<code>turn.matrix.org</code>公共服务器，但通话质量稍差，并且其将会得知您的 IP。您可以在设置中更改此选项。",
     "Try using turn.matrix.org": "尝试使用 turn.matrix.org",
-    "Your Riot is misconfigured": "您的 Riot 配置有错误"
+    "Your Riot is misconfigured": "您的 Riot 配置有错误",
+    "Use Single Sign On to continue": "使用单点登陆继续",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "确认添加此邮件地址，通过使用单点登陆来证明您的身份。",
+    "Single Sign On": "单点登陆",
+    "Confirm adding email": "确认使用邮件",
+    "Click the button below to confirm adding this email address.": "点击下面的按钮，添加此邮箱地址。",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "通过单点确认添加此电话号码以确认您的身份。",
+    "Confirm adding phone number": "确认添加电话号码",
+    "Click the button below to confirm adding this phone number.": "点击下面的按钮，确认添加此电话号码。",
+    "The version of Riot": "Riot版本",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "是否在触屏设备上使用Riot",
+    "Whether you're using Riot as an installed Progressive Web App": "您是否已经安装Riot作为一种渐进式的Web应用",
+    "Your user agent": "您的代理用户",
+    "The information being sent to us to help make Riot better includes:": "发送信息给我们以帮助Riot：",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "聊天室有未知会话：如果您选择继续而不是验证他们，则您的电话可能会被窃听。",
+    "Review Sessions": "审查会议",
+    "Replying With Files": "回复文件",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "无法回复此文件。您要上传此文件但无需回复吗？",
+    "The file '%(fileName)s' failed to upload.": "上传文件 ‘%(fileName)s’失败。",
+    "The server does not support the room version specified.": "服务器不支持指定的聊天室版本。",
+    "If you cancel now, you won't complete verifying the other user.": "如果现在取消，您将无法完成验证其他用户。",
+    "If you cancel now, you won't complete verifying your other session.": "如果现在取消，您将无法完成验证您的其他会话。",
+    "If you cancel now, you won't complete your operation.": "如果现在取消，您将无法完成您的操作。",
+    "Cancel entering passphrase?": "取消输入密码？",
+    "Setting up keys": "设置按键",
+    "Verify this session": "验证此会话",
+    "Encryption upgrade available": "提供加密升级",
+    "Set up encryption": "设置加密",
+    "Review where you’re logged in": "查看您的登陆位置",
+    "New login. Was this you?": "现在登陆。请问是您本人吗？",
+    "Name or Matrix ID": "姓名或Matrix账号",
+    "Identity server has no terms of service": "身份服务器无服务条款",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "此操作需要访问默认的身份服务器<server/>以验证电子邮件地址或电话号码，但是此服务器无任何服务条款。",
+    "Only continue if you trust the owner of the server.": "只有您信任服务器所有者才能继续。",
+    "Trust": "信任",
+    "%(name)s is requesting verification": "%(name)s请求验证",
+    "Sign In or Create Account": "登录或创建账户",
+    "Use your account or create a new one to continue.": "使用已有账户或创建一个新账户。",
+    "Create Account": "创建账户",
+    "Sign In": "登录",
+    "Custom (%(level)s)": "访客(%(level)s)",
+    "Messages": "信息",
+    "Actions": "动作",
+    "Sends a message as plain text, without interpreting it as markdown": "以纯文本形式发送消息，而不是markdown",
+    "Sends a message as html, without interpreting it as markdown": "以html格式发送消息，而不是markdown",
+    "You do not have the required permissions to use this command.": "您没有权限使用此命令。",
+    "Error upgrading room": "升级聊天室出错",
+    "Double check that your server supports the room version chosen and try again.": "再次检查您的服务器是否支持所选聊天室版本，然后重试。",
+    "Changes the avatar of the current room": "更改当前聊天室头像",
+    "Changes your avatar in this current room only": "仅改变您在当前聊天室的头像",
+    "Changes your avatar in all rooms": "改变您在所有聊天室的头像",
+    "Failed to set topic": "设置话题失败",
+    "Use an identity server": "使用身份服务器",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "使用身份服务器通过电子邮件邀请。单击继续以使用默认身份服务器(%(defaultIdentityServerName)s)或在设置中进行管理。",
+    "Use an identity server to invite by email. Manage in Settings.": "使用身份服务器以电子邮件邀请。在设置中进行管理。",
+    "Unbans user with given ID": "禁止给定ID的用户",
+    "Command failed": "命令失败",
+    "Could not find user in room": "聊天室中无用户",
+    "Please supply a widget URL or embed code": "请提供一个插件或嵌入代码",
+    "Verifies a user, session, and pubkey tuple": "验证用户、会话和公钥元组",
+    "Unknown (user, session) pair:": "未知（用户、会话）对：",
+    "Session already verified!": "会话已验证！",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：会话已验证，但密钥不匹配！"
 }

From 8cd04a5f3201f32a52382582cee56575d181aff5 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 9 May 2020 02:15:35 +0000
Subject: [PATCH 2879/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2303 of 2303 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 85bbaaabc1..ba8ffa0fcb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2419,5 +2419,7 @@
     "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰",
     "You signed in to a new session without verifying it:": "您已登入新的工作階段但未驗證：",
     "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。"
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。",
+    "Message deleted": "訊息已刪除",
+    "Message deleted by %(name)s": "訊息已被 %(name)s 刪除"
 }

From b5e10b4464be71535daeb8494b3ee8cc12a77f47 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Sat, 9 May 2020 13:49:33 +0000
Subject: [PATCH 2880/3235] Translated using Weblate (Dutch)

Currently translated at 91.9% (2117 of 2303 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 19f626bc0a..5dfb779ff1 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -247,8 +247,8 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-vergadering aangevraagd.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
     "Return to login screen": "Terug naar het aanmeldscherm",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen toestemming om u meldingen te versturen - controleer uw browserinstellingen",
-    "Riot was not given permission to send notifications - please try again": "Riot kreeg geen toestemming om u meldingen te sturen - probeer het opnieuw",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen toestemming u meldingen te sturen - controleer uw browserinstellingen",
+    "Riot was not given permission to send notifications - please try again": "Riot kreeg geen toestemming u meldingen te sturen - probeer het opnieuw",
     "riot-web version:": "riot-web-versie:",
     "Room %(roomId)s not visible": "Gesprek %(roomId)s is niet zichtbaar",
     "Room Colour": "Gesprekskleur",
@@ -526,7 +526,7 @@
     "Unknown for %(duration)s": "Onbekend voor %(duration)s",
     "Unknown": "Onbekend",
     "Replying": "Aan het beantwoorden",
-    "No rooms to show": "Geen gesprekken om weer te geven",
+    "No rooms to show": "Geen weer te geven gesprekken",
     "Unnamed room": "Naamloos gesprek",
     "World readable": "Leesbaar voor iedereen",
     "Guests can join": "Gasten kunnen toetreden",
@@ -1376,7 +1376,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of u de icoontjes voor recente gesprekken (boven de gesprekkenlijst) al dan niet gebruikt",
     "Replying With Files": "Beantwoorden met bestanden",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momenteel is het niet mogelijk om met een bestand te antwoorden. Wilt u dit bestand uploaden zonder te antwoorden?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Het is momenteel niet mogelijk met een bestand te antwoorden. Wilt u dit bestand uploaden zonder te antwoorden?",
     "The file '%(fileName)s' failed to upload.": "Het bestand ‘%(fileName)s’ kon niet geüpload worden.",
     "Rotate counter-clockwise": "Tegen de klok in draaien",
     "Rotate clockwise": "Met de klok mee draaien",
@@ -1554,7 +1554,7 @@
     "Command Help": "Hulp bij opdrachten",
     "No identity server is configured: add one in server settings to reset your password.": "Er is geen identiteitsserver geconfigureerd: voeg er één toe in de serverinstellingen om uw wachtwoord opnieuw in te stellen.",
     "Call failed due to misconfigured server": "Oproep mislukt door verkeerd geconfigureerde server",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vraag de beheerder van uw thuisserver (<code>%(homeserverDomain)s</code>) om een TURN-server te configureren teneinde oproepen betrouwbaar te doen werken.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vraag uw thuisserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren teneinde oproepen betrouwbaar te doen werken.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "U kunt ook de publieke server op <code>turn.matrix.org</code> gebruiken, maar dit zal minder betrouwbaar zijn, en zal uw IP-adres met die server delen. U kunt dit ook beheren in de Instellingen.",
     "Try using turn.matrix.org": "Probeer turn.matrix.org te gebruiken",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Sta de terugvalserver voor oproepbijstand turn.matrix.org toe wanneer uw thuisserver er geen aanbiedt (uw IP-adres wordt gedeeld gedurende een oproep)",
@@ -1682,7 +1682,7 @@
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
     "Unverified session": "Ongeverifieerde sessie",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Dit vergt toegang tot de standaardidentiteitsserver <server /> om een e-mailadres of telefoonnummer te valideren, maar die server heeft geen gebruiksvoorwaarden.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Dit vergt validatie van een e-mailadres of telefoonnummer middels de standaardidentiteitsserver <server />, maar die server heeft geen gebruiksvoorwaarden.",
     "Trust": "Vertrouwen",
     "Custom (%(level)s)": "Aangepast (%(level)s)",
     "Error upgrading room": "Bijwerken van gesprek mislukt",
@@ -2168,5 +2168,37 @@
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s",
     "Unverified login. Was this you?": "Ongeverifieerde aanmelding. Was u dit?",
     "Where you’re logged in": "Waar u aangemeld bent",
-    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies en meld ze af. <a>Of verifieer ze in uw gebruikersprofiel</a>."
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies en meld ze af. <a>Of verifieer ze in uw gebruikersprofiel</a>.",
+    "Use Single Sign On to continue": "Ga verder met Eenmalige Aanmelding",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bevestig uw identiteit met Eenmalige Aanmelding om dit emailadres toe te voegen.",
+    "Single Sign On": "Eenmalige Aanmelding",
+    "Confirm adding email": "Bevestig toevoegen van het e-mailadres",
+    "Click the button below to confirm adding this email address.": "Klik op de knop hieronder om dit e-mailadres toe te voegen.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bevestig uw identiteit met Eenmalige Aanmelding om dit telefoonnummer toe te voegen.",
+    "Confirm adding phone number": "Bevestig toevoegen van het telefoonnummer",
+    "Click the button below to confirm adding this phone number.": "Klik op de knop hieronder om het toevoegen van dit telefoonnummer te bevestigen.",
+    "Review Sessions": "Sessieverificatie",
+    "If you cancel now, you won't complete your operation.": "Als u de operatie afbreekt kunt u haar niet voltooien.",
+    "Review where you’re logged in": "Kijk na waar u aangemeld bent",
+    "New login. Was this you?": "Nieuwe aanmelding - was u dat?",
+    "%(name)s is requesting verification": "%(name)s verzoekt om verificatie",
+    "Sends a message as html, without interpreting it as markdown": "Stuurt een bericht als HTML, zonder markdown toe te passen",
+    "Failed to set topic": "Kon onderwerp niet instellen",
+    "Command failed": "Opdracht mislukt",
+    "Could not find user in room": "Kon die deelnemer aan het gesprek niet vinden",
+    "Please supply a widget URL or embed code": "Gelieve een widgetURL of in te bedden code te geven",
+    "Send a bug report with logs": "Rapporteer een fout, met foutopsporingslogboek bijgesloten",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s heeft het gesprek %(oldRoomName)s hernoemd tot %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft dit gesprek de nevenadressen %(addresses)s toegekend.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft dit gesprek het nevenadres %(addresses)s toegekend.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft de nevenadressen %(addresses)s voor dit gesprek geschrapt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft het nevenadres %(addresses)s voor dit gesprek geschrapt.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s heeft de nevenadressen voor dit gesprek gewijzigd.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s heeft hoofd- en nevenadressen voor dit gesprek gewijzigd.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s heeft de adressen voor dit gesprek gewijzigd.",
+    "You signed in to a new session without verifying it:": "U heeft zich bij een nog niet geverifieerde sessie aangemeld:",
+    "Verify your other session using one of the options below.": "Verifieer uw andere sessie op een van onderstaande wijzen.",
+    "Manually Verify by Text": "Handmatig middels een tekst",
+    "Interactively verify by Emoji": "Interactief middels emojis",
+    "Support adding custom themes": "Sta maatwerkthema's toe"
 }

From 943eb57b15fcc8166a660d8baffc3eb838e800c2 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 9 May 2020 10:01:46 +0000
Subject: [PATCH 2881/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2303 of 2303 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 | 50 +++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 5d6ac9ed48..5e63974d12 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -97,7 +97,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
     "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
     "VoIP conference started.": "Rettelefona voko komenciĝis.",
-    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambro.",
+    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
     "VoIP conference finished.": "Rettelefona voko finiĝis.",
     "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
     "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
@@ -246,7 +246,7 @@
     "Unpin Message": "Malfiksi mesaĝon",
     "Jump to message": "Salti al mesaĝo",
     "No pinned messages.": "Neniuj fiksitaj mesaĝoj.",
-    "Loading...": "Enleganta…",
+    "Loading...": "Enlegante…",
     "Pinned Messages": "Fiksitaj mesaĝoj",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
@@ -481,7 +481,7 @@
     "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.": "Se vi antaŭe uzis pli novan version de Riot, via salutaĵo eble ne akordos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
     "Invalid Email Address": "Malvalida retpoŝtadreso",
     "This doesn't appear to be a valid email address": "Tio ĉi ne ŝajnas esti valida retpoŝtadreso",
-    "Verification Pending": "Atendanta kontrolon",
+    "Verification Pending": "Atendante kontrolon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bonvolu kontroli vian retpoŝton, kaj alklaki la ligilon enhavatan en la sendita mesaĝo. Farinte tion, klaku je 'daŭrigi'.",
     "Unable to add email address": "Ne povas aldoni retpoŝtadreson",
     "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
@@ -567,9 +567,9 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Provis enlegi certan parton de ĉi tiu historio, sed vi ne havas permeson vidi ĝin.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
     "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
-    "Uploading %(filename)s and %(count)s others|other": "Alŝutanta dosieron %(filename)s kaj %(count)s aliajn",
-    "Uploading %(filename)s and %(count)s others|zero": "Alŝutanta dosieron %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Alŝutanta dosieron %(filename)s kaj %(count)s alian",
+    "Uploading %(filename)s and %(count)s others|other": "Alŝutante dosieron %(filename)s kaj %(count)s aliajn",
+    "Uploading %(filename)s and %(count)s others|zero": "Alŝutante dosieron %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Alŝutante dosieron %(filename)s kaj %(count)s alian",
     "Light theme": "Hela haŭto",
     "Dark theme": "Malhela haŭto",
     "Sign out": "Adiaŭi",
@@ -731,7 +731,7 @@
     "Members": "Anoj",
     "No update available.": "Neniuj ĝisdatigoj haveblas.",
     "Resend": "Resendi",
-    "Collecting app version information": "Kolektanta informon pri versio de la aplikaĵo",
+    "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la ĉambran kromnomon %(alias)s kaj forigi %(name)s de la ujo?",
     "Enable notifications for this account": "Ŝalti sciigojn por tiu ĉi konto",
     "Invite to this community": "Inviti al tiu ĉi komunumo",
@@ -766,7 +766,7 @@
     "Send logs": "Sendi protokolojn",
     "All messages": "Ĉiuj mesaĝoj",
     "Call invitation": "Invito al voko",
-    "Downloading update...": "Elŝutanta ĝisdatigon…",
+    "Downloading update...": "Elŝutante ĝisdatigon…",
     "State Key": "Stata ŝlosilo",
     "Failed to send custom event.": "Malsukcesis sendi propran okazon.",
     "What's new?": "Kio novas?",
@@ -810,12 +810,12 @@
     "View Source": "Vidi fonton",
     "Event Content": "Enhavo de okazo",
     "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!": "Kun via nuna foliumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne tute funkcios. Se vi tamen volas provi, vi povas daŭrigi, sed vi ricevos nenian subtenon se vi renkontos problemojn!",
-    "Checking for an update...": "Serĉanta ĝisdatigojn…",
+    "Checking for an update...": "Serĉante ĝisdatigojn…",
     "There are advanced notifications which are not shown here": "Ekzistas specialaj sciigoj, kiuj ne montriĝas ĉi tie",
     "Logs sent": "Protokolo sendiĝis",
     "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.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian uzantonomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
-    "Preparing to send logs": "Pretiganta sendon de protokolo",
+    "Preparing to send logs": "Pretigante sendon de protokolo",
     "e.g. %(exampleValue)s": "ekz. %(exampleValue)s",
     "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
     "e.g. <CurrentPageURL>": "ekz. <CurrentPageURL>",
@@ -844,7 +844,7 @@
     "Opens the Developer Tools dialog": "Maflermas evoluigistan interagujon",
     "This homeserver has hit its Monthly Active User limit.": "Tiu ĉi hejmservilo atingis sian monatan limon de aktivaj uzantoj.",
     "This homeserver has exceeded one of its resource limits.": "Tiu ĉi hejmservilo superis je unu el siaj risurcaj limoj.",
-    "Unable to connect to Homeserver. Retrying...": "Ne povas konektiĝi al hejmservilo. Reprovanta…",
+    "Unable to connect to Homeserver. Retrying...": "Ne povas konektiĝi al hejmservilo. Reprovante…",
     "You do not have permission to invite people to this room.": "Vi ne havas permeson inviti homojn al la ĉambro.",
     "User %(user_id)s does not exist": "Uzanto %(user_id)s ne ekzistas",
     "Unknown server error": "Nekonata servila eraro",
@@ -883,7 +883,7 @@
     "Language and region": "Lingvo kaj regiono",
     "Theme": "Haŭto",
     "General": "Ĝenerala",
-    "<a>In reply to</a> <pill>": "<a>Respondanta al</a> <pill>",
+    "<a>In reply to</a> <pill>": "<a>Respondante al</a> <pill>",
     "Share Message": "Diskonigi",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
     "You do not have permission to start a conference call in this room": "Vi ne havas permeson komenci grupvokon en ĉi tiu ĉambro",
@@ -980,7 +980,7 @@
     "Internal room ID:": "Ena ĉambra identigilo:",
     "Room version": "Ĉambra versio",
     "Room version:": "Ĉambra versio:",
-    "Developer options": "Verkantaj opcioj",
+    "Developer options": "Programistaj elektebloj",
     "Room Addresses": "Ĉambra adresoj",
     "Change room avatar": "Ŝanĝi profilbildon de ĉambro",
     "Change room name": "Ŝanĝi nomon de ĉambro",
@@ -1142,7 +1142,7 @@
     "Custom user status messages": "Propraj uzantoaj statmesaĝoj",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupigi kaj filtri ĉambrojn per propraj etikedoj (aktualigu por ŝanĝojn apliki)",
     "Restore from Backup": "Rehavi el savkopio",
-    "Backing up %(sessionsRemaining)s keys...": "Savkopianta %(sessionsRemaining)s ŝlosilojn…",
+    "Backing up %(sessionsRemaining)s keys...": "Savkopiante %(sessionsRemaining)s ŝlosilojn…",
     "All keys backed up": "Ĉiuj ŝlosiloj estas savkopiitaj",
     "Backup version: ": "Versio de savkopio: ",
     "Algorithm: ": "Algoritmo: ",
@@ -1198,9 +1198,9 @@
     "This room has already been upgraded.": "Ĉi tiu ĉambro jam gradaltiĝis.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>.",
     "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
-    "Joining room …": "Aliĝanta al ĉambro …",
-    "Loading …": "Enleganta …",
-    "Rejecting invite …": "Rifuzanta inviton …",
+    "Joining room …": "Aliĝante al ĉambro …",
+    "Loading …": "Enlegante …",
+    "Rejecting invite …": "Rifuzante inviton …",
     "Join the conversation with an account": "Aliĝu al la interparolo per konto",
     "Sign Up": "Registriĝi",
     "Sign In": "Saluti",
@@ -1241,9 +1241,9 @@
     "Use Legacy Verification (for older clients)": "Uzi malnovecan kontrolon (por malnovaj klientoj)",
     "Verify by comparing a short text string.": "Kontrolu per komparo de mallonga teksto.",
     "Begin Verifying": "Komenci kontrolon",
-    "Waiting for partner to accept...": "Atendanta akcepton de kunulo…",
+    "Waiting for partner to accept...": "Atendante akcepton de kunulo…",
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ĉu neniu aperas? Ankoraŭ ne ĉiuj klientoj subtenas interagan kontrolon. <button>Uzi malnovecan kontrolon</button>.",
-    "Waiting for %(userId)s to confirm...": "Atendanta konfirmon de %(userId)s…",
+    "Waiting for %(userId)s to confirm...": "Atendante konfirmon de %(userId)s…",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Kontrolu ĉi tiun uzanton por marki ĝin fidata. Fidado devas vin trankviligi dum uzado de tutvoja ĉifrado.",
     "Waiting for partner to confirm...": "Atendas konfirmon de kunulo…",
     "Incoming Verification Request": "Venas kontrolpeto",
@@ -1507,7 +1507,7 @@
     "Confirm your passphrase": "Konfirmu vian pasfrazon",
     "Recovery key": "Rehava ŝlosilo",
     "Keep it safe": "Sekurigu ĝin",
-    "Starting backup...": "Komencanta savkopion…",
+    "Starting backup...": "Komencante savkopion…",
     "Create Key Backup": "Krei savkopion de ŝlosiloj",
     "Unable to create key backup": "Ne povas krei savkopion de ŝlosiloj",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sen agordo de Sekura rehavo de mesaĝoj, vi perdos vian sekuran historion de mesaĝoj per adiaŭo.",
@@ -1695,7 +1695,7 @@
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Bloki aliĝojn al ĉi tiu ĉambro de uzantoj el aliaj Matrix-serviloj (Ĉi tiun agordon ne eblas poste ŝanĝi!)",
     "Please fill why you're reporting.": "Bonvolu skribi, kial vi raportas.",
     "Report Content to Your Homeserver Administrator": "Raporti enhavon al la administrantode via hejmservilo",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Per raporto de ĝi tiu mesaĝo vi sendos ĝian unikan « eventan identigilon » al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Per raporto de ĉi tiu mesaĝo vi sendos ĝian unikan « eventan identigilon » al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
     "Send report": "Sendi raporton",
     "Command Help": "Helpo pri komando",
     "To continue you need to accept the terms of this service.": "Por pluigi, vi devas akcepti la uzokondiĉojn de ĉi tiu servo.",
@@ -1834,7 +1834,7 @@
     "Double check that your server supports the room version chosen and try again.": "Bone kontrolu, ĉu via servilo subtenas la elektitan version de ĉambro, kaj reprovu.",
     "Verifies a user, session, and pubkey tuple": "Kontrolas opon de uzanto, salutaĵo, kaj publika ŝlosilo",
     "Unknown (user, session) pair:": "Nekonata duopo (uzanto, salutaĵo):",
-    "Session already verified!": "Kunsido jam estas kontrolita!",
+    "Session already verified!": "Salutaĵo jam estas kontrolita!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "AVERTO: Salutaĵo jam estas kontrolita, sed la ŝlosiloj NE AKORDAS!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: MALSUKCESIS KONTROLO DE ŜLOSILOJ! La subskriba ŝlosilo de %(userId)s kaj session %(deviceId)s estas «%(fprint)s», kiu ne akordas la donitan ŝlosilon «%(fingerprint)s». Tio povus signifi, ke via komunikado estas spionata!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la salutaĵo %(deviceId)s de la uzanto %(userId)s. Salutaĵo estis markita kontrolita.",
@@ -1856,7 +1856,7 @@
     "Confirm the emoji below are displayed on both devices, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj estas montrataj sur ambaŭ aparatoj, samorde:",
     "Verify this device by confirming the following number appears on its screen.": "Kontrolu ĉi tiun aparaton per kontrolo, ke la jena nombro aperas sur ĝia ekrano.",
     "Waiting for %(displayName)s to verify…": "Atendas kontrolon de %(displayName)s…",
-    "Cancelling…": "Nuliganta…",
+    "Cancelling…": "Nuligante…",
     "They match": "Ili akordas",
     "They don't match": "Ili ne akordas",
     "To be secure, do this in person or use a trusted way to communicate.": "Por plia sekureco, faru tion persone, aŭ uzu alian fidatan komunikilon.",
@@ -2394,5 +2394,7 @@
     "Secure your backup with a recovery passphrase": "Sekurigu vian savkopion per rehava pasfrazo",
     "Currently indexing: %(currentRoom)s": "Nun indeksante: %(currentRoom)s",
     "Cancel replying to a message": "Nuligi respondon al mesaĝo",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>."
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>.",
+    "Message deleted": "Mesaĝo foriĝis",
+    "Message deleted by %(name)s": "Mesaĝon forigis %(name)s"
 }

From 64459f18c6a18cfa80b705c00c6f23c1536f033c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sun, 10 May 2020 16:31:22 +0000
Subject: [PATCH 2882/3235] Translated using Weblate (Estonian)

Currently translated at 41.6% (959 of 2303 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 47afbd1fcd..e2d4e93e43 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -938,5 +938,28 @@
     "Do you want to set an email address?": "Kas sa soovid seadistada e-posti aadressi?",
     "Close dialog": "Sulge dialoog",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Meeldetuletus: sinu brauser ei ole toetatud ja seega rakenduse kasutuskogemus võib olla ennustamatu.",
-    "Toggle this dialog": "Lülita see dialoog sisse/välja"
+    "Toggle this dialog": "Lülita see dialoog sisse/välja",
+    "Enter your password to sign in and regain access to your account.": "Sisselogimiseks ja oma kontole ligipääsu saamiseks sisesta oma salasõna.",
+    "Forgotten your password?": "Kas sa unustasid oma salasõna?",
+    "Sign in and regain access to your account.": "Logi sisse ja pääse tagasi oma kasutajakonto juurde.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Sa ei saa oma kasutajakontole sisse logida. Lisateabe saamiseks palun võta ühendust oma koduserveri halduriga.",
+    "Your recovery key": "Sinu taastevõti",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Sinu taastevõti on <b>kopeeritud lõikelauale</b>, aseta ta:",
+    "<b>Print it</b> and store it somewhere safe": "<b>Trüki ta välja</b> ja hoia turvalises kohas",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Salvesta ta</b> mälupulgale või varunduskettale",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Kopeeri ta</b> isiklikku andmehoidlasse mis asub pilves",
+    "Retry": "Proovi uuesti",
+    "Upgrade your encryption": "Uuenda oma krüptimist",
+    "Make a copy of your recovery key": "Tee oma taastevõtmest koopia",
+    "You're done!": "Valmis!",
+    "Go to Settings": "Ava seadistused",
+    "Set up Secure Messages": "Võta kasutusele krüptitud sõnumid",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Paus millisekundites sõnumite allalaadimisel",
+    "Scroll up/down in the timeline": "Liigu ajajoonel üles/alla",
+    "Previous/next unread room or DM": "Eelmine/järgmine lugemata otsevestlus või sõnum jututoas",
+    "Previous/next room or DM": "Eelmine/järgmine otsevestlus või jututuba",
+    "Toggle the top left menu": "Lülita ülemine vasak menüü sisse/välja",
+    "Activate selected button": "Aktiveeri valitud nupp",
+    "Toggle right panel": "Lülita parem paan sisse/välja"
 }

From 4b7aa45445a06401a113f706d25bb3434602f97a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Sat, 9 May 2020 06:25:29 +0000
Subject: [PATCH 2883/3235] Translated using Weblate (French)

Currently translated at 100.0% (2303 of 2303 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 b7344b592f..1756ff57ad 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2420,5 +2420,7 @@
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès",
     "You signed in to a new session without verifying it:": "Vous vous êtes connecté·e à une nouvelle session sans la vérifier :",
     "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitez quelqu’un en utilisant leur nom, leur nom d’utilisateur (comme <userId/>), leur adresse e-mail ou <a>partagez ce salon</a>."
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitez quelqu’un en utilisant leur nom, leur nom d’utilisateur (comme <userId/>), leur adresse e-mail ou <a>partagez ce salon</a>.",
+    "Message deleted": "Message supprimé",
+    "Message deleted by %(name)s": "Message supprimé par %(name)s"
 }

From bd79086702cbf98ee0fd9a7980c5eb09b0a02cca Mon Sep 17 00:00:00 2001
From: Michael Albert <michael.albert@awesome-technologies.de>
Date: Sun, 10 May 2020 19:57:44 +0000
Subject: [PATCH 2884/3235] Translated using Weblate (German)

Currently translated at 99.9% (2301 of 2303 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 | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index cac52fb477..ad80bfbc4f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1348,7 +1348,7 @@
     "Share Permalink": "Teile permanenten Link",
     "Sign in to your Matrix account on %(serverName)s": "Melde dich mit deinem Matrixkonto auf %(serverName)s an",
     "Create your Matrix account on %(serverName)s": "Erstelle ein Matrixkonto auf %(serverName)s",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": " Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
     "Want more than a community? <a>Get your own server</a>": "Du möchtest mehr als eine Community? <a>Hol dir deinen eigenen Server</a>",
     "Could not load user profile": "Konnte Nutzerprofil nicht laden",
     "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
@@ -1802,7 +1802,7 @@
     "Command failed": "Befehl fehlgeschlagen",
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
-    "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
+    "Confirm adding phone number": "Bestätige das Hinzufügen der Telefonnummer",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "Not Trusted": "Nicht vertrauenswürdig",
@@ -1820,7 +1820,7 @@
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:",
     "Verify this session by confirming the following number appears on its screen.": "Verfiziere diese Sitzung, indem du bestätigst, dass die folgende Nummer auf ihrem Bildschirm erscheint.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…",
-    "How fast should messages be downloaded.": "Wie schnell sollten Nachrichten heruntergeladen werden?",
+    "How fast should messages be downloaded.": "Wie schnell Nachrichten heruntergeladen werden sollen.",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emoji, sofern du an keinem Gerät eine Kamera hast",
     "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
     "Cancelling…": "Abbrechen…",
@@ -2172,7 +2172,7 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du wirst diesen Raum von <oldVersion /> zu <newVersion /> aktualisieren.",
     "Missing session data": "Fehlende Sitzungsdaten",
     "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
-    "Integration Manager": " Integrationsverwaltung",
+    "Integration Manager": "Integrationsverwaltung",
     "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
     "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
     "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
@@ -2351,5 +2351,19 @@
     "Navigate recent messages to edit": "Letzte Nachrichten zur Bearbeitung ansehen",
     "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
     "Navigate composer history": "Verlauf der Nachrichteneingabe durchsuchen",
-    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Wenn du dies versehentlich getan hast, kannst du in dieser Sitzung \"gesicherte Nachrichten\" einrichten, die den Nachrichtenverlauf dieser Sitzung mit einer neuen Wiederherstellungsmethode erneut verschlüsseln."
+    "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Wenn du dies versehentlich getan hast, kannst du in dieser Sitzung \"sichere Nachrichten\" einrichten, die den Nachrichtenverlauf dieser Sitzung mit einer neuen Wiederherstellungsmethode erneut verschlüsseln.",
+    "Cancel replying to a message": "Nachricht beantworten abbrechen",
+    "Navigate up/down in the room list": "In der Raumliste nach oben/unten navigieren",
+    "Select room from the room list": "Wähle eine Raum aus der Raumliste",
+    "Collapse room list section": "Raumliste einklappen",
+    "Expand room list section": "Raumliste ausklappen",
+    "Clear room list filter field": "Raumlistenfilter zurücksetzen",
+    "Scroll up/down in the timeline": "In den Nachrichten vor/zurück blättern",
+    "Previous/next unread room or DM": "Vorheriger/Nächster ungelesener Raum oder Direktnachricht",
+    "Previous/next room or DM": "Vorheriger/Nächster Raum oder Direktnachricht",
+    "Toggle the top left menu": "Menü oben links ein-/ausblenden",
+    "Activate selected button": "Ausgewählten Button aktivieren",
+    "Toggle right panel": "Rechtes Panel ein-/ausblenden",
+    "Toggle this dialog": "Diesen Dialog ein-/ausblenden",
+    "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben"
 }

From c9a208ce359595150e581f24fbf26c5924148931 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sun, 10 May 2020 20:06:50 +0000
Subject: [PATCH 2885/3235] Translated using Weblate (German)

Currently translated at 99.9% (2301 of 2303 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ad80bfbc4f..7fdaf20e40 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -698,7 +698,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
-    "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
+    "Failed to remove tag %(tagName)s from room": "Entfernen der Raum-Kennzeichnung %(tagName)s fehlgeschlagen",
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
     "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.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",

From 38ed619e2cb8f0b2675e9590e140bd67f4d98fed Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 11 May 2020 08:16:36 +0000
Subject: [PATCH 2886/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2303 of 2303 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 53f4ea1aa3..d891a06687 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2415,5 +2415,7 @@
     "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente",
     "You signed in to a new session without verifying it:": "Hai fatto l'accesso ad una nuova sessione senza verificarla:",
     "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>."
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>.",
+    "Message deleted": "Messaggio eliminato",
+    "Message deleted by %(name)s": "Messaggio eliminato da %(name)s"
 }

From b72ae00222e95db314a60bd3cc95286fb3dc307e Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Sat, 9 May 2020 16:59:39 +0000
Subject: [PATCH 2887/3235] Translated using Weblate (Japanese)

Currently translated at 57.8% (1332 of 2303 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 | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 20f8097c0c..95cd093111 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -28,7 +28,7 @@
     "Filter room members": "部屋メンバーを検索",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
     "Upload avatar": "アイコン画像を変更",
-    "Upload file": "添付ファイル送信",
+    "Upload file": "ファイルのアップロード",
     "Use compact timeline layout": "会話表示の行間を狭くする",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riotはアプリケーションを改善するために匿名の分析情報を収集しています。",
     "Add": "追加",
@@ -455,7 +455,7 @@
     "Admin Tools": "管理者ツール",
     "and %(count)s others...|other": "そして、他 %(count)s ...",
     "and %(count)s others...|one": "そして、もう1つ...",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (パワー %(powerLevelNumber)s）",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (権限レベル: %(powerLevelNumber)s )",
     "Attachment": "付属品",
     "Hangup": "電話を切る",
     "Voice call": "音声通話",
@@ -485,9 +485,9 @@
     "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": "返信中",
+    "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": "以下に返信",
     "Save": "保存",
     "(~%(count)s results)|other": "(~%(count)s 結果)",
     "(~%(count)s results)|one": "(~%(count)s 結果)",
@@ -1025,7 +1025,7 @@
     "Use an identity server to invite by email. Manage in Settings.": "メールによる招待のためにIDサーバーを用いる。設定画面で管理する。",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s が参加ルールを「%(rule)s」に変更しました。",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s がこの部屋へのゲストによる参加を拒否しました。",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s はゲストによるアクセスを %(rule)s に変更しました。",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s がゲストによるアクセスを %(rule)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 ともう一人が入力中 …",
@@ -1353,5 +1353,23 @@
     "Space used:": "使用中のストレージ容量:",
     "Indexed messages:": "インデックス済みのメッセージ数:",
     "Indexed rooms:": "インデックス済みの部屋数:",
-    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 件の部屋の内 %(doneRooms)s 件"
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 件の部屋の内 %(doneRooms)s 件",
+    "Error changing power level": "権限レベルの変更中にエラーが発生しました",
+    "Frequently Used": "使用頻度の高いリアクション",
+    "Smileys & People": "表情と人々",
+    "Animals & Nature": "動物と植物",
+    "Food & Drink": "食べ物と飲み物",
+    "Activities": "アクティビティ",
+    "Travel & Places": "旅行と場所",
+    "Objects": "物体",
+    "Symbols": "シンボル",
+    "Flags": "旗",
+    "Cancel search": "検索をキャンセル",
+    "Your avatar URL": "あなたのアバター URL",
+    "Your user ID": "あなたのユーザー ID",
+    "Your theme": "あなたのテーマ",
+    "Riot URL": "Riot URL",
+    "Room ID": "部屋 ID",
+    "Maximize apps": "アプリを最大化する",
+    "More options": "更なるオプション"
 }

From c3cd7e17c08ece9c2b77c7d69e460e180ae6c21b Mon Sep 17 00:00:00 2001
From: Frisk <furrtrex43@protonmail.ch>
Date: Fri, 8 May 2020 22:19:53 +0000
Subject: [PATCH 2888/3235] Translated using Weblate (Polish)

Currently translated at 68.4% (1576 of 2303 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index b54c950263..30dd5b828d 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1589,5 +1589,21 @@
     "Toggle Italics": "Przełącz kursywę",
     "Toggle Quote": "Przełącz cytowanie",
     "Cancel autocomplete": "Anuluj autouzupełnienie",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania."
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania.",
+    "Confirm adding email": "Potwierdź dodanie e-maila",
+    "Click the button below to confirm adding this email address.": "Naciśnij przycisk poniżej aby zatwierdzić dodawanie adresu e-mail.",
+    "Confirm adding phone number": "Potwierdź dodanie numeru telefonu",
+    "Click the button below to confirm adding this phone number.": "Naciśnij przycisk poniżej aby potwierdzić dodanie tego numeru telefonu.",
+    "The version of Riot": "Wersja Riota",
+    "Your user agent": "Twój user agent",
+    "The information being sent to us to help make Riot better includes:": "Informacje przesyłane do nas w celu poprawy jakości Riota zawierają:",
+    "Sends a message as html, without interpreting it as markdown": "Wysyła wiadomość w formacie html, bez interpretowania jej jako markdown",
+    "Error upgrading room": "Błąd podczas aktualizacji pokoju",
+    "Double check that your server supports the room version chosen and try again.": "Sprawdź ponownie czy Twój serwer wspiera wybraną wersję pokoju i spróbuj ponownie.",
+    "Could not find user in room": "Nie znaleziono użytkownika w pokoju",
+    "Session already verified!": "Sesja już zweryfikowana!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "OSTRZEŻENIE: Sesja już zweryfikowana, ale klucze do siebie NIE PASUJĄ!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "OSTRZEŻENIE: WERYFIKACJA KLUCZY NIE POWIODŁA SIĘ! Klucz podpisujący dla %(userId)s oraz sesji %(deviceId)s to \"%(fprint)s\", nie pasuje on do podanego klucza \"%(fingerprint)s\". To może oznaczać że Twoja komunikacja jest przechwytywana!",
+    "Displays information about a user": "Pokazuje informacje na temat użytkownika",
+    "Send a bug report with logs": "Wyślij raport błędu z logami"
 }

From 97cadfa9573fc8b3811312ad17f3e2b3ae4357ae Mon Sep 17 00:00:00 2001
From: Jan van der Weijst <jan.van.der.weijst@gmx.de>
Date: Sun, 10 May 2020 21:31:25 +0000
Subject: [PATCH 2889/3235] Translated using Weblate (Spanish)

Currently translated at 93.5% (2154 of 2303 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 17ddee917f..6b6058d837 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -537,7 +537,7 @@
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
-    "Pin Message": "Fija Mensaje",
+    "Pin Message": "Fijar Mensaje",
     "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",
@@ -1355,7 +1355,7 @@
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si encuentras algún error o quieres compartir una opinión, por favor, contacta con nosotros en GitHub.",
     "Report bugs & give feedback": "Reportar errores y compartir mi opinión",
     "Please fill why you're reporting.": "Por favor, explica por qué estás reportando.",
-    "Report Content to Your Homeserver Administrator": "Reportar contenido a tu administrador del homeserver",
+    "Report Content to Your Homeserver Administrator": "Reportar contenido a tu administrador del Servidor Doméstico",
     "Send report": "Enviar reporte",
     "Room Settings - %(roomName)s": "Configuración de la sala - %(roomName)s",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Actualizar esta sala requiere cerrar la instancia actual de esta sala y crear una nueva sala en su lugar. Para dar a los miembros de la sala la mejor experiencia, haremos lo siguiente:",
@@ -1470,7 +1470,7 @@
     "Confirm the emoji below are displayed on both devices, in the same order:": "Confirma que los emojis a continuación son mostrados en ambos dispositivos, en el mismo orden:",
     "Verify this device by confirming the following number appears on its screen.": "Verifica este dispositivo confirmando que el siguiente número aparece en su pantalla.",
     "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s …",
-    "Review": "Revisar",
+    "Review": "Revise",
     "in secret storage": "en almacén secreto",
     "Secret storage public key:": "Clave pública del almacén secreto:",
     "in account data": "en datos de cuenta",
@@ -1633,9 +1633,9 @@
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Almacenar localmente, de manera segura,  los mensajes cifrados localmente para que aparezcan en los resultados de la búsqueda, utilizando ",
     " to store messages from ": " para almacenar mensajes de ",
     "Securely cache encrypted messages locally for them to appear in search results.": "Almacenar localmente, de manera segura, a los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda.",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio Riot personalizado con componentes de búsqueda<nativeLink> añadidos.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio Riot personalizado con <nativeLink> componentes de búsqueda añadidos</nativeLink>.",
     "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot no puede guardar de forma segura en la memoria caché a mensajes encriptados localmente, mientras se ejecuta en un navegador web. Use <riotLink>Riot Desktop</riotLink> para que los mensajes encriptados aparezcan en los resultados de la búsqueda.",
-    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Esta sesión no<b> ha creado una copia de seguridad de tus llaves, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Esta sesión no <b> ha creado una copia de seguridad de tus llaves</b>, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecte esta sesión a la copia de seguridad de las claves antes de firmar y así evitar perder las claves que sólo existen en esta sesión.",
     "Connect this session to Key Backup": "Conecte esta sesión a la copia de respaldo de tu clave",
     "Backup has a <validity>valid</validity> signature from this user": "La copia de seguridad tiene una  firma de <validity>valido</validity> de este usuario",
@@ -1747,7 +1747,7 @@
     "Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas",
     "All rooms": "Todas las salas",
     "Your server": "Tu",
-    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Estás seguro de querer quitar <b>%(serverName)s</b> ?",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Está seguro de querer eliminar <b>%(serverName)s</b>?",
     "Remove server": "Quitar servidor",
     "Matrix": "Matrix",
     "Add a new server": "Añadir un nuevo servidor",
@@ -1805,7 +1805,7 @@
     "Integrations not allowed": "Integraciones no están permitidas",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Su Riot no le permite utilizar un \"Administrador de Integración\" para hacer esto. Por favor, contacte con un administrador.",
     "Failed to invite the following users to chat: %(csvUsers)s": "Error invitando a los siguientes usuarios al chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "No pudimos crear tu DM. Por favor, marca los usuarios que quieres invitar e inténtalo de nuevo.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "No pudimos crear tu Mensaje Directo  Por favor, marcar los usuarios que quieres invitar e inténtalo de nuevo.",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Iniciar una conversación con alguien usando su nombre, nombre de usuario (como <userId/>) o dirección de correo electrónico.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitar a alguien usando su nombre, nombre de usuario (como <userId/>), dirección de correo electrónico o <a> compartir esta sala</a>.",
     "a new master key signature": "una nueva firma de llave maestra",
@@ -1815,9 +1815,9 @@
     "Riot encountered an error during upload of:": "Riot encontró un error durante la carga de:",
     "End": "Fin",
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Una vez habilitado, el cifrado de una sala no puede deshabilitarse. Los mensajes enviados a una sala cifrada no pueden ser vistos por el servidor, sólo lo verán los participantes de la sala. Habilitar el cifrado puede hacer que muchos bots y bridges no funcionen correctamente. <a>Aprende más de cifrado</a>",
-    "Joining room …": "Uniéndose a sala ...",
-    "Loading …": "Cargando ...",
-    "Rejecting invite …": "Rechazando invitación ...",
+    "Joining room …": "Uniéndose a sala …",
+    "Loading …": "Cargando …",
+    "Rejecting invite …": "Rechazando invitación …",
     "Join the conversation with an account": "Unirse a la conversación con una cuenta",
     "Sign Up": "Registrarse",
     "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de la sala %(roomName)s",
@@ -1837,5 +1837,357 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
     "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
     "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso.",
-    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje, por favor <issueLink>somete un reporte de error</issueLink>."
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje, por favor <issueLink>somete un reporte de error</issueLink>.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Re-requestLink>Solicite nuevamente claves de encriptación </requestLink> de sus otras sesiones.",
+    "This message cannot be decrypted": "Este mensaje no puede ser desencriptado",
+    "Encrypted by an unverified session": "Encriptado por una sesión no verificada",
+    "Unencrypted": "Sin encriptación",
+    "Encrypted by a deleted session": "Encriptado por una sesión eliminada",
+    "Invite only": "Sólamente por invitación",
+    "Scroll to most recent messages": "Desplácese a los mensajes más recientes",
+    "Close preview": "Cerrar vista previa",
+    "No recent messages by %(user)s found": "No se han encontrado mensajes recientes de %(user)s",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Intente desplazarse hacia arriba en la línea de tiempo para ver si hay alguna anterior.",
+    "Remove recent messages by %(user)s": "Eliminar mensajes recientes de %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Estás a punto de eliminar %(count)s mensajes de %(user)s. Esto no se puede deshacer. ¿Desea continuar?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Estás a punto de eliminar 1 mensaje de %(user)s. Esto no se puede deshacer. ¿Desea continuar?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Para una gran cantidad de mensajes, esto podría llevar algún tiempo. Por favor, no refresque a su cliente mientras tanto.",
+    "Remove %(count)s messages|other": "Eliminar %(count)s  mensajes",
+    "Remove %(count)s messages|one": "Eliminar 1 mensaje",
+    "Deactivate user?": "¿Desactivar usuario?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Desactivando a este usuario, este será desconectado y no podrá volver a ingresar. Además, saldrá de todas las salas a que se había unido. Esta acción no puede ser revertida. ¿Está seguro de desactivar este usuario?",
+    "Deactivate user": "Desactivar usuario",
+    "Failed to deactivate user": "Error en desactivar usuario",
+    "No sessions with registered encryption keys": "No hay sesiones con claves de cifrado registradas",
+    "Remove recent messages": "Eliminar mensajes recientes",
+    "Send a reply…": "Enviar una respuesta …",
+    "Send a message…": "Enviar un mensaje…",
+    "Bold": "Negrita",
+    "Italics": "Cursivo",
+    "Strikethrough": "Tachado",
+    "Code block": "Bloque de código",
+    "Room %(name)s": "Sala %(name)s",
+    "Recent rooms": "Salas recientes",
+    "Direct Messages": "Mensaje Directo",
+    "Loading room preview": "Cargando vista previa de la sala",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Un código de error (%(errcode)s) fue devuelto al tratar de validar su invitación. Podrías intentar pasar esta información a un administrador de la sala.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Esta invitación a la sala %(roomName)s fue enviada a %(email)s que no está asociada a su cuenta",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Para recibir invitaciones directamente en Riot, en Configuración, debes vincular este correo electrónico con tu cuenta.",
+    "This invite to %(roomName)s was sent to %(email)s": "Esta invitación a %(roomName)s fue enviada a %(email)s",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Utilice un servidor de identidad en Configuración para recibir invitaciones directamente en Riot.",
+    "Share this email in Settings to receive invites directly in Riot.": "Comparte este correo electrónico en Configuración para recibir invitaciones directamente en Riot.",
+    "<userName/> wants to chat": "<userName/> quiere chatear",
+    "Start chatting": "Empieza a chatear",
+    "Reject & Ignore user": "Rechazar e ignorar usuario",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Actualizar esta sala cerrará la instancia actual de la sala y creará una sala actualizada con el mismo nombre.",
+    "This room has already been upgraded.": "Esta sala ya ha sido actualizada.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Esta sala está ejecutando la versión de sala <roomVersion />, la cual ha sido marcado por este servidor doméstico como <i>unstable</i>.",
+    "Unknown Command": "Comando desconocido",
+    "Unrecognised command: %(commandText)s": "Comando no reconocido: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Puedes usar <code>/ayuda</code> para listar los comandos disponibles. ¿Querías enviarlo como un mensaje?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Sugerencia: Comienza tu mensaje con <code>//</code> para que inicie con una barra inclinada.",
+    "Send as message": "Enviar como mensaje",
+    "Failed to connect to integration manager": "Error al conectarse con el administrador de integración",
+    "Failed to revoke invite": "Error al revocar la invitación",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "No se logró revocar la invitación. El servidor puede sufrir un problema temporal o usted no tiene los permisos suficientes para revocar la invitación.",
+    "Revoke invite": "Revocar invitación",
+    "Invited by %(sender)s": "Invitado por %(sender)s",
+    "Mark all as read": "Marcar todo como leído",
+    "Error updating main address": "Error al actualizar la dirección principal",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al actualizar la dirección principal de la sala. Posiblemente el servidor no lo permita o se produjo un error temporal.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al actualizar la dirección alternativa de la sala. Posiblemente el servidor no lo permita o se produjo un error temporal.",
+    "Error creating alias": "Error al crear el alias (apodo)",
+    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al crear ese alias (apodo). Posiblemente no lo permita el servidor o puede que se haya producido un error temporal.",
+    "You don't have permission to delete the alias.": "No tienes permiso para borrar el alias (apodo).",
+    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Se produjo un error al eliminar ese alias (apodo). Tal vez ya no exista o puede haberse producido un error temporal.",
+    "Error removing alias": "Error al eliminar el alias (apodo)",
+    "Local address": "Dirección local",
+    "Published Addresses": "Direcciones publicadas",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse a tu salas. Para publicar una dirección, primero hay que establecerla como una dirección local.",
+    "Other published addresses:": "Otras direcciones publicadas:",
+    "No other published addresses yet, add one below": "No tiene direcciones publicadas todavía, agregue una más abajo",
+    "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
+    "Local Addresses": "Direcciones locales",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establezca las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor doméstico (%(localDomain)s)",
+    "Error updating flair": "Error al actualizar el botón",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Error al actualizar el botón para esta sala. Posiblemente el servidor no lo permita o que se produjo un error temporal.",
+    "Waiting for you to accept on your other session…": "Esperando que aceptes en tu otra sesión…",
+    "Waiting for %(displayName)s to accept…": "Esperando a que %(displayName)s acepte…",
+    "Accepting…": "Aceptando…",
+    "Start Verification": "Iniciar verificación",
+    "Messages in this room are end-to-end encrypted.": "Los mensajes en esta sala están encriptados de extremo a extremo.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Sus mensajes son seguros y sólo usted y el destinatario tienen las claves únicas para desbloquearlos.",
+    "Messages in this room are not end-to-end encrypted.": "Los mensajes en esta habitación NO están encriptados de extremo a extremo.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "En las salas encriptadas, sus mensajes están seguros y sólo usted y el destinatario tienen las claves únicas para desbloquearlos.",
+    "Verify User": "Verificar usuario",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Para mayor seguridad, verifique este usuario comprobando un código temporal vez en ambos dispositivos.",
+    "Your messages are not secure": "Sus mensajes no son seguros",
+    "One of the following may be compromised:": "Uno de los siguientes puede estar comprometido:",
+    "Your homeserver": "Su servidor doméstico",
+    "The homeserver the user you’re verifying is connected to": "El servidor doméstico del usuario a que está verificando  está conectado a",
+    "Yours, or the other users’ internet connection": "La conexión a Internet suya, o la de los otros usuarios",
+    "Yours, or the other users’ session": "La sesión suya, o la de los otros usuarios",
+    "Trusted": "De confianza",
+    "Not trusted": "No de confianza",
+    "%(count)s verified sessions|other": "%(count)s sesiones verificadas",
+    "%(count)s verified sessions|one": "1 sesión verificada",
+    "Hide verified sessions": "Ocultar sesiones verificadas",
+    "%(count)s sessions|other": "%(count)s sesiones",
+    "%(count)s sessions|one": "%(count)s sesión",
+    "Hide sessions": "Ocultar sesiones",
+    "Direct message": "Mensaje directo",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
+    "This client does not support end-to-end encryption.": "Este cliente no es compatible con el cifrado de extremo a extremo.",
+    "Security": "Seguridad",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La sesión que está tratando de verificar no soporta el escaneo de un código QR o la verificación mediante emoji, que es lo que soporta Riot. Inténtalo con un cliente diferente.",
+    "Verify by scanning": "Verificar mediante escaneo",
+    "Ask %(displayName)s to scan your code:": "Pídele a %(displayName)s que escanee tu código:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Si no puedes escanear el código de arriba, verifica comparando emoji únicos.",
+    "Verify by comparing unique emoji.": "Verifica comparando emoji únicos.",
+    "Verify by emoji": "Verificar con emoji",
+    "Almost there! Is your other session showing the same shield?": "¡Ya casi está! ¿Su otra sesión muestra el mismo escudo?",
+    "Almost there! Is %(displayName)s showing the same shield?": "¡Ya casi está! ¿Está %(displayName)s mostrando el mismo escudo?",
+    "Verify all users in a room to ensure it's secure.": "Verifica a todos los usuarios de una sala para asegurar que es segura.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "En las salas encriptadas, verifique a todos los usuarios para asegurarse de son seguros.",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "¡Has verificado con éxito los %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "¡Has verificado con éxito los %(displayName)s!",
+    "Verified": "Verificado",
+    "Got it": "Lo he entendido",
+    "Start verification again from the notification.": "Inicie la verificación nuevamente a partir de la notificación.",
+    "Start verification again from their profile.": "Empieza la verificación de nuevo desde su perfil.",
+    "Verification timed out.": "El tiempo máximo para la verificación se ha agotado.",
+    "You cancelled verification on your other session.": "Canceló la verificación de su otra sesión.",
+    "%(displayName)s cancelled verification.": "%(displayName)s canceló la verificación.",
+    "You cancelled verification.": "Usted canceló la verificación.",
+    "Verification cancelled": "Verificación cancelada",
+    "Compare emoji": "Comparar emoji",
+    "Encryption enabled": "Encriptación habilitada",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Los mensajes en esta sala están encriptados de extremo a extremo. Aprende más & verifica este usuario en su perfil de usuario.",
+    "Encryption not enabled": "Encriptación no habilitada",
+    "The encryption used by this room isn't supported.": "La encriptación usada por esta sala no es compatible.",
+    "React": "Reaccione",
+    "Message Actions": "Acciones de mensaje",
+    "Show image": "Mostrar imagen",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ha ignorado a este usuario, así que su mensaje se ha ocultado. <a>Mostrar de todos modos.</a>",
+    "You verified %(name)s": "Usted verificó %(name)s",
+    "You cancelled verifying %(name)s": "Usted canceló la verificación de %(name)s",
+    "%(name)s cancelled verifying": "%(name)s canceló la verificación",
+    "You accepted": "Usted aceptó",
+    "%(name)s accepted": "%(name)s aceptó",
+    "You declined": "Usted declinó",
+    "You cancelled": "Usted canceló",
+    "%(name)s declined": "%(name)s declinó",
+    "%(name)s cancelled": "%(name)s canceló",
+    "Accepting …": "Aceptando…",
+    "Declining …": "Declinando…",
+    "%(name)s wants to verify": "%(name)s quiere verificar",
+    "You sent a verification request": "Usted envió una solicitud de verificación",
+    "Show all": "Mostrar todo",
+    "Reactions": "Reacciones",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaccionó con %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reaccionó con %(shortName)s</reactedWith>",
+    "Message deleted": "Mensaje eliminado",
+    "Message deleted by %(name)s": "Mensaje eliminado por %(name)s",
+    "Edited at %(date)s. Click to view edits.": "Editado el día %(date)s. Haga clic para ver las ediciones.",
+    "edited": "editado",
+    "Can't load this message": "No puedo cargar este mensaje",
+    "Submit logs": "Enviar registros",
+    "Frequently Used": "Usado con frecuencia",
+    "Smileys & People": "Caritas y personas",
+    "Animals & Nature": "Animales y naturaleza",
+    "Food & Drink": "Comidas y bebidas",
+    "Activities": "Actividades",
+    "Travel & Places": "Viajes y lugares",
+    "Objects": "Objetos",
+    "Symbols": "Símbolos",
+    "Flags": "Banderas",
+    "Quick Reactions": "Reacciones rápidas",
+    "Cancel search": "Cancelar búsqueda",
+    "Any of the following data may be shared:": "Cualquiera de los siguientes datos puede ser compartido:",
+    "Your display name": "Su nombre mostrado",
+    "Your avatar URL": "La URL de su avatar",
+    "Your user ID": "Su identificación (ID) de usuario",
+    "Your theme": "Su tema",
+    "Riot URL": "URL de Riot",
+    "Room ID": "Identidad (ID) de la sala",
+    "Widget ID": "Identificación (ID) de widget",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usar este widget puede resultar en compartir datos <helpIcon /> con %(widgetDomain)s y su Administrador de Integración.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usar este widget puede resultar en compartir datos <helpIcon /> con %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Los widgets no utilizan la encriptación de mensajes.",
+    "Widget added by": "Widget añadido por",
+    "This widget may use cookies.": "Este widget posiblemente utilice cookies.",
+    "Maximize apps": "Maximizar apps",
+    "More options": "Mas opciones",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor, <newIssueLink>crea un nuevo nodo </newIssueLink> en GitHub para que podamos investigar este error.",
+    "Rotate Left": "Girar a la izquierda",
+    "Upload completed": "Subida completada",
+    "Cancelled signature upload": "Subida de firma cancelada",
+    "Unable to upload": "No se puede subir",
+    "Signature upload success": "Subida de firma exitosa",
+    "Signature upload failed": "Subida de firma falló",
+    "Confirm by comparing the following with the User Settings in your other session:": "Confirme comparando lo siguiente con los ajustes de usuario de su otra sesión:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirme la sesión de este usuario comparando lo siguiente con la configuración de usuario de él/ella:",
+    "If they don't match, the security of your communication may be compromised.": "Si no coinciden, la seguridad de su comunicación puede estar comprometida.",
+    "Your homeserver doesn't seem to support this feature.": "Tu servidor doméstico no parece soportar esta característica.",
+    "Your account is not secure": "Su cuenta no es segura",
+    "Your password": "Su contraseña",
+    "This session, or the other session": "Esta sesión, o la otra sesión",
+    "The internet connection either session is using": "La conexión a Internet usado por cualquiera de las dos sesiones",
+    "We recommend you change your password and recovery key in Settings immediately": "Le recomendamos que cambie inmediatamente su contraseña y su clave de recuperación en Configuración",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para ayudar a evitar la duplicación de entradas, por favor <existingIssuesLink> ver primero los entradas existentes</existingIssuesLink> (y añadir un +1) o, <newIssueLink> si no lo encuentra, crear una nueva entrada </newIssueLink>.",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único 'event ID' al administrador de su servidor doméstico. Si los mensajes en esta sala están encriptados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.",
+    "Command Help": "Ayuda del comando",
+    "Integration Manager": "Administrador de integración",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Actualmente está incluyendo sesiones no verificadas en la lista negra; para enviar mensajes a estas sesiones debe verificarlas primero.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Le recomendamos que pase por el proceso de verificación de cada sesión para confirmar que pertenecen a su legítimo propietario, pero puede reenviar el mensaje sin verificarlo si lo prefiere.",
+    "Verify other session": "Verifique otra sesión",
+    "Verification Request": "Solicitud de verificación",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Un widget localizado en %(widgetUrl)s desea verificar su identidad. Permitiendo esto, el widget podrá verificar su identidad de usuario, pero no realizar acciones como usted.",
+    "Enter recovery passphrase": "Introduzca la contraseña de recuperación",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "No se puede acceder al almacenamiento secreto. Por favor, compruebe que ha introducido la frase de recuperación correcta.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Advertencia</b>: Sólo debes hacer esto en un ordenador de su confianza.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y a su identidad de firma cruzada para verificar otras sesiones, introduciendo su frase de recuperación.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si has olvidado tu contraseña de recuperación puedes <button1> usar tu clave de recuperación </button1> o <button2> configurar nuevas opciones de recuperación </button2>.",
+    "Enter recovery key": "Introduzca la clave de recuperación",
+    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "No se puede acceder al almacenamiento secreto. Por favor, compruebe que haya introducido la clave de recuperación correcta.",
+    "This looks like a valid recovery key!": "¡Esto tiene pinta de una llave de recuperación válida!",
+    "Not a valid recovery key": "Clave de recuperación no válida",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Acceda a su historial de mensajes seguros y a su identidad de firma cruzada para verificar otras sesiones, introduciendo su clave de recuperación.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Si has olvidado tu clave de recuperación puedes <button> configurar nuevas opciones de recuperación</button>.",
+    "Restoring keys from backup": "Restaurando las claves desde copia de seguridad",
+    "Fetching keys from server...": "Obteniendo las claves desde el servidor...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s llaves restauradas",
+    "Unable to load backup status": "No se puede cargar el estado de la copia de seguridad",
+    "Recovery key mismatch": "No coincide la clave de recuperación",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La copia de seguridad no pudo ser descifrada con esta clave de recuperación: por favor, comprueba que hayas introducido la clave de recuperación correcta.",
+    "Incorrect recovery passphrase": "Contraseña de recuperación incorrecta",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La copia de seguridad no pudo ser descifrada con esta contraseña de recuperación: por favor, comprueba que hayas introducido la contraseña de recuperación correcta.",
+    "Unable to restore backup": "No se pudo restaurar la copia de seguridad",
+    "No backup found!": "¡No se encontró una copia de seguridad!",
+    "Keys restored": "Se restauraron las claves",
+    "Failed to decrypt %(failedCount)s sessions!": "¡Error en desencriptar %(failedCount) sesiones!",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s claves restauradas con éxito",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Advertencia</b>: sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y configure la mensajería segura introduciendo su contraseña de recuperación.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Si has olvidado tu contraseña de recuperación puedes <button1> usar tu clave de recuperación </button1> o <button2> configurar nuevas opciones de recuperación </button2>",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Advertencia</b>: Sólo debes configurar la copia de seguridad de claves desde un ordenador de su confianza.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Accede a tu historial de mensajes seguros y configura la mensajería segura introduciendo tu clave de recuperación.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si has olvidado tu clave de recuperación puedes <button> configurar nuevas opciones de recuperación</button>",
+    "Resend edit": "Reenviar la edición",
+    "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s  reacción(es)",
+    "Resend removal": "Reenviar la eliminación",
+    "Share Permalink": "Compartir Permalink",
+    "Report Content": "Reportar contenido",
+    "Notification settings": "Configuración de notificaciones",
+    "Clear status": "Borrar estado",
+    "Update status": "Actualizar estado",
+    "Set status": "Establecer estado",
+    "Set a new status...": "Establecer un estado nuevo...",
+    "Hide": "Ocultar",
+    "Help": "Ayuda",
+    "Reload": "Recargar",
+    "Take picture": "Tomar una foto",
+    "Remove for everyone": "Eliminar para todos",
+    "Remove for me": "Eliminar para mi",
+    "User Status": "Estado de usuario",
+    "This homeserver would like to make sure you are not a robot.": "A este servidor le gustaría asegurarse de que no eres un robot.",
+    "Country Dropdown": "Seleccione país",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Puede utilizar las opciones del servidor personalizado para iniciar sesión en otros servidores de Matrix, especificando una URL de servidor doméstico diferente. Esto le permite usar esta aplicación con una cuenta existente de Matrix en un servidor doméstico diferente.",
+    "Confirm your identity by entering your account password below.": "Confirme su identidad introduciendo la contraseña de su cuenta.",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta la clave pública del captcha en la configuración del servidor doméstico. Por favor, informe de esto al administrador del servidor doméstico.",
+    "Please review and accept all of the homeserver's policies": "Por favor, revise y acepte todas las políticas del servidor doméstico",
+    "Please review and accept the policies of this homeserver:": "Por favor revise y acepte las políticas de este servidor doméstico:",
+    "Unable to validate homeserver/identity server": "No se pudo validar el servidor doméstico/servidor de identidad",
+    "Your Modular server": "Su servidor modular",
+    "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Introduzca la ubicación de su Servidor Modular Doméstico. Este puede usar su propio nombre de dominio o ser un subdominio de <a>modular.im</a>.",
+    "Server Name": "Nombre del servidor",
+    "The username field must not be blank.": "El campo del nombre de usuario no puede estar en blanco.",
+    "Username": "Nombre de usuario",
+    "Not sure of your password? <a>Set a new one</a>": "¿No estás seguro de tu contraseña? <a>Escoge una nueva</a>",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No se ha configurado ningún servidor de identidad, por lo que no se puede añadir una dirección de correo electrónico para restablecer la contraseña en el futuro.",
+    "Use an email address to recover your account": "Utilice una dirección de correo electrónico para recuperar su cuenta",
+    "Enter email address (required on this homeserver)": "Introduzca una dirección de correo electrónico (requerida en este servidor)",
+    "Doesn't look like a valid email address": "No parece una dirección de correo electrónico válida",
+    "Enter password": "Introduzca su contraseña",
+    "Password is allowed, but unsafe": "Contraseña permitida, pero no es segura",
+    "Nice, strong password!": "¡Fantástico, una contraseña fuerte!",
+    "Keep going...": "Continúa...",
+    "Passwords don't match": "Las contraseñas no coinciden",
+    "Other users can invite you to rooms using your contact details": "Otros usuarios pueden invitarte las salas utilizando tus datos de contacto",
+    "Enter phone number (required on this homeserver)": "Ingrese un número de teléfono (requerido en este servidor doméstico)",
+    "Doesn't look like a valid phone number": "No parece ser un número de teléfono válido",
+    "Use lowercase letters, numbers, dashes and underscores only": "Use sólo letras minúsculas, números, guiones y guiones bajos",
+    "Enter username": "Introduce nombre de usuario",
+    "Email (optional)": "Correo electrónico (opcional)",
+    "Phone (optional)": "Teléfono (opcional)",
+    "Create your Matrix account on %(serverName)s": "Crea tu cuenta de Matrix en %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Crea tu cuenta de Matrix en <underlinedServerName />",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice correo electrónico o teléfono para que los contactos existentes puedan descubrirlo.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice el correo electrónico para poder ser descubierto por contactos existentes.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Ingrese la URL de su servidor doméstico <a>¿Qué significa esto?</a>",
+    "Homeserver URL": "URL del servidor doméstico",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Introduzca la URL de su servidor de identidad personalizada <a> ¿Qué significa esto?</a>",
+    "Identity Server URL": "URL del servidor de identidad",
+    "Other servers": "Otros servidores",
+    "Free": "Gratis",
+    "Join millions for free on the largest public server": "Únete de forma gratuita a millones de personas  en el servidor público más grande",
+    "Premium": "Premium",
+    "Premium hosting for organisations <a>Learn more</a>": "Alojamiento Premium para organizaciones <a>Aprende más</a>",
+    "Find other public servers or use a custom server": "Descubra otros servidores públicos o utilice un servidor personalizado",
+    "Sign in to your Matrix account on %(serverName)s": "Inicie sesión en su cuenta de Matrix en %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Inicie sesión en su cuenta de Matrix en <underlinedServerName />",
+    "Sign in with SSO": "Ingrese con SSO",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
+    "Couldn't load page": "No pude cargar la página",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Usted es un administrador de esta comunidad. No podrás volver a unirte sin una invitación de otro administrador.",
+    "Want more than a community? <a>Get your own server</a>": "¿Quieres más que una comunidad? <a>Obtenga su propio servidor</a>",
+    "This homeserver does not support communities": "Este servidor doméstico no permite las comunidades",
+    "Welcome to %(appName)s": "Bienvenido a %(appName)s",
+    "Liberate your communication": "Libere su comunicación",
+    "Send a Direct Message": "Envía un mensaje directo",
+    "Explore Public Rooms": "Explorar salas públicas",
+    "Create a Group Chat": "Crear un chat grupal",
+    "Explore": "Explorar",
+    "Filter": "Filtrar",
+    "Filter rooms…": "Filtrar salas…",
+    "Self-verification request": "Solicitud de auto-verificación",
+    "%(creator)s created and configured the room.": "Sala creada y configurada por %(creator)s.",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot no logró obtener la lista de protocolo del servidor doméstico. El servidor doméstico puede ser demasiado viejo para admitir redes de terceros.",
+    "Riot failed to get the public room list.": "Riot no logró obtener la lista de salas públicas.",
+    "The homeserver may be unavailable or overloaded.": "Posiblemente el servidor de doméstico no esté disponible o esté sobrecargado.",
+    "Preview": "Vista previa",
+    "View": "Vista",
+    "Find a room…": "Encuentre una sala…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Encuentre una sala...  (p.ej. %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Si no puedes encontrar la habitación que buscas, solicite una invitación o <a>Crea una nueva sala</a>.",
+    "Explore rooms": "Explorar salas",
+    "Message not sent due to unknown sessions being present": "Mensaje no enviado debido a la presencia de sesiones desconocidas",
+    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Mostrar sessiones</showSessionsText>, <sendAnywayText>enviar de todas formas</sendAnywayText> o<cancelText>cancelar</cancelText>.",
+    "Jump to first invite.": "Salte a la primera invitación.",
+    "Add room": "Añadir sala",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Guest": "Invitado",
+    "Your profile": "Su perfil",
+    "Could not load user profile": "No se pudo cargar el perfil de usuario",
+    "Verify this login": "Verifique este inicio de sesión",
+    "Session verified": "Sesión verificada",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Cambiar la contraseña restablecerá cualquier clave de cifrado de extremo a extremo en todas sus sesiones, haciendo ilegible el historial de chat cifrado. Configura la copia de seguridad de las claves o exporta las claves de la sala de otra sesión antes de restablecer la contraseña.",
+    "Your Matrix account on %(serverName)s": "Su cuenta de Matrix en %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Su cuenta de Matrix en <underlinedServerName />",
+    "No identity server is configured: add one in server settings to reset your password.": "No hay ningún servidor de identidad configurado: añada uno en la configuración del servidor para poder restablecer su contraseña.",
+    "Sign in instead": "Regístrese",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Se enviará un correo electrónico de verificación a su bandeja de entrada para confirmar la configuración de su nueva contraseña.",
+    "Your password has been reset.": "Su contraseña ha sido restablecida.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Ha cerrado todas las sesiones y ya no recibirá más notificaciones push. Para volver a activar las notificaciones, inicie sesión de nuevo en cada dispositivo.",
+    "Set a new password": "Establezca una nueva contraseña",
+    "Invalid homeserver discovery response": "Respuesta inválida de descubrimiento de servidor doméstico",
+    "Failed to get autodiscovery configuration from server": "No se pudo obtener la configuración de autodescubrimiento del servidor",
+    "Invalid base_url for m.homeserver": "URL-base inválida para m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "La URL del servidor doméstico no parece ser un servidor doméstico válido de Matrix",
+    "Invalid identity server discovery response": "Respuesta inválida de descubrimiento de servidor de identidad",
+    "Invalid base_url for m.identity_server": "URL_base no válida para m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "La URL del servidor de identidad no parece ser un servidor de identidad válido",
+    "General failure": "Error no especificado",
+    "This homeserver does not support login using email address.": "Este servidor doméstico no admite iniciar sesión con una dirección de correo electrónico.",
+    "This account has been deactivated.": "Esta cuenta ha sido desactivada."
 }

From 643ed5887499e82b65eda46be2579753ab7bf652 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Fri, 8 May 2020 17:50:14 +0000
Subject: [PATCH 2890/3235] Translated using Weblate (Ukrainian)

Currently translated at 28.1% (647 of 2303 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 | 63 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index f00ae5b399..bdef596b88 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -68,7 +68,7 @@
     "Call Timeout": "Час очікування виклика",
     "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> є довіреним і що розширення браузера не блокує запити.",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
-    "Change Password": "Поміняти пароль",
+    "Change Password": "Змінити пароль",
     "%(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.",
@@ -108,7 +108,7 @@
     "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
     "Failed to send logs: ": "Не вдалося відправити журнали: ",
     "delete the alias.": "видалити псевдонім.",
-    "To return to your account in future you need to <u>set a password</u>": "Щоб мати змогу використовувати вашу обліковку у майбутньому, <u>зазначте пароль</u>",
+    "To return to your account in future you need to <u>set a password</u>": "Щоб мати змогу використовувати вашу обліківку у майбутньому, <u>зазначте пароль</u>",
     "Forget": "Забути",
     "World readable": "Відкрито для світу",
     "You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
@@ -138,7 +138,7 @@
     "Collecting app version information": "Збір інформації про версію застосунка",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
     "Keywords": "Ключові слова",
-    "Enable notifications for this account": "Увімкнути сповіщення для цієї обліковки",
+    "Enable notifications for this account": "Увімкнути сповіщення для цієї обліківки",
     "Invite to this community": "Запросити в це суспільство",
     "Messages containing <span>keywords</span>": "Повідомлення, що містять <span>ключові слова</span>",
     "When I'm invited to a room": "Коли мене запрошено до кімнати",
@@ -201,7 +201,7 @@
     "Error encountered (%(errorDetail)s).": "Трапилась помилка (%(errorDetail)s).",
     "Low Priority": "Неважливі",
     "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
-    "Set Password": "Задати пароль",
+    "Set Password": "Встановити пароль",
     "Off": "Вимкнено",
     "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
     "Mentions only": "Тільки згадки",
@@ -594,7 +594,7 @@
     "Review": "Переглянути",
     "Verify yourself & others to keep your chats safe": "Звірте себе й інших щоб зберегти ваше спілкування у безпеці",
     "Verify": "Звірити",
-    "Verify the new login accessing your account: %(name)s": "Звірити новий вхід, що доступається до вашої обліковки: %(name)s",
+    "Verify the new login accessing your account: %(name)s": "Звірити новий вхід, що доступається до вашої обліківки: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "Від %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Відхилити (%(counter)s)",
     "Language and region": "Мова та регіон",
@@ -609,5 +609,56 @@
     "Join the conversation with an account": "Приєднатись до бесіди з обліківкою",
     "Unable to restore session": "Неможливо відновити сесію",
     "We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити вашу попередню сесію.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, або <safariLink>Safari</safariLink>."
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, або <safariLink>Safari</safariLink>.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ваша обліківка має перехресно-підписувану ідентичність у таємному сховищі, але вона ще не є довіреною у цій сесії.",
+    "in account data": "у даних обліківки",
+    "Clear notifications": "Очистити сповіщення",
+    "Add an email address to configure email notifications": "Додати адресу е-пошти для налаштування поштових сповіщень",
+    "Theme added!": "Тему додано!",
+    "Email addresses": "Адреси е-пошти",
+    "Phone numbers": "Номери телефонів",
+    "Set a new account password...": "Встановити новий пароль обліківки…",
+    "Forget this room": "Забути цю кімнату",
+    "Re-join": "Перепід'єднатись",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Це запрошення до %(roomName)s було надіслане на %(email)s, яка не пов'язана з вашою обліківкою",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Зв'яжіть цю е-пошту з вашою обліківкою у Налаштуваннях щоб отримувати сповіщення прямо у Riot.",
+    "This invite to %(roomName)s was sent to %(email)s": "Це запрошення до %(roomName)s було надіслане на %(email)s",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Використовувати сервер ідентифікації у Налаштуваннях щоб отримувати запрошення прямо у Riot.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ви впевнені у тому, що бажаєте деактивувати вашу обліківку? Це є безповоротним.",
+    "Confirm account deactivation": "Підтвердьте деактивацію обліківки",
+    "To continue, please enter your password:": "Щоб продовжити, введіть, будь ласка, ваш пароль:",
+    "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. Це призведе до виходу вашої обліківки з усіх кімнат та до видалення деталей вашої обліківки з вашого серверу ідентифікації. <b>Ця дія є безповоротною.</b>",
+    "Verify session": "Звірити сесію",
+    "Use Legacy Verification (for older clients)": "Використати успадковане звірення (для старих клієнтів)",
+    "Verify by comparing a short text string.": "Звірити порівнянням короткого текстового рядка.",
+    "Begin Verifying": "Почати звіряння",
+    "Waiting for partner to accept...": "Очікується підтвердження партнером…",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Нічого не з'являється? Поки що не всі клієнти підтримують взаємодійне звірення. <button>Використати успадковане звірення</button>.",
+    "Waiting for %(userId)s to confirm...": "Очікується підтвердження від %(userId)s…",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Щоб впевнитись, що цій сесії можна довіряти, переконайтесь, будь ласка, що показуваний у Налаштуваннях на тому пристрої ключ збігається з ключем внизу:",
+    "To verify that this session 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 session matches the key below:": "Щоб впевнитись, що цій сесії можна довіряти, зв'яжіться, будь ласка, з її власником якимось іншим шляхом (напр. через телефон або зустріч) і переконайтесь, що показуваний у Налаштуваннях на їхньому пристрої ключ збігається з ключем внизу:",
+    "Use two-way text verification": "Використати двонапрямне текстове звірення",
+    "Session name": "Назва сесії",
+    "Session ID": "ID сесії",
+    "Session key": "Ключ сесії",
+    "%(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>?",
+    "Jump to first unread room.": "Перейти до першої непрочитаної кімнати.",
+    "Jump to first invite.": "Перейти до першого запрошення.",
+    "Add room": "Додати кімнату",
+    "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?": "Схоже, ви намагаєтесь вийти посеред розмови. Ви впевнені, що хочете вийти?",
+    "Search failed": "Пошук не вдався",
+    "Server may be unavailable, overloaded, or search timed out :(": "Сервер може бути недосяжним, перевантаженим або запит на пошук застарів :(",
+    "No more results": "Інших результатів нема",
+    "Unknown room %(roomId)s": "Невідома кімната %(roomId)s",
+    "Room": "Кімната",
+    "Failed to reject invite": "Не вдалось відхилити запрошення",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Ви маєте %(count)s непрочитаних сповіщень у попередній версії цієї кімнати.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "У вас одне непрочитане сповіщення у попередній версії цієї кімнати."
 }

From 6ea9aebda3e85afb2724a0455740a3f1c4c972d0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 10:54:28 +0100
Subject: [PATCH 2891/3235] Add slash commands /query and /msg to match IRC

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx       | 46 +++++++++++++++++++++++++++++++++++++
 src/i18n/strings/en_EN.json |  2 ++
 2 files changed, 48 insertions(+)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index bd7e60e2f4..ea561d9f12 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -40,6 +40,7 @@ import { Jitsi } from "./widgets/Jitsi";
 import { parseFragment as parseHtml } from "parse5";
 import sendBugReport from "./rageshake/submit-rageshake";
 import SdkConfig from "./SdkConfig";
+import { ensureDMExists } from "./createRoom";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -970,6 +971,51 @@ export const Commands = [
         },
         category: CommandCategories.advanced,
     }),
+    new Command({
+        command: "query",
+        description: _td("Opens chat with the given user"),
+        args: "<user-id>",
+        runFn: function(roomId, userId) {
+            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
+                return reject(this.getUsage());
+            }
+
+            return success((async () => {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: await ensureDMExists(MatrixClientPeg.get(), userId),
+                });
+            })());
+        },
+        category: CommandCategories.actions,
+    }),
+    new Command({
+        command: "msg",
+        description: _td("Sends a message to the given user"),
+        args: "<user-id> <message>",
+        runFn: function(roomId, args) {
+            if (args) {
+                const matches = args.match(/^(\S+?)(?: +(.*))?$/s);
+                if (matches) {
+                    const [userId, msg] = matches.slice(1);
+                    if (msg && userId && userId.startsWith("@") && userId.includes(":")) {
+                        return success((async () => {
+                            const cli = MatrixClientPeg.get();
+                            const roomId = await ensureDMExists(cli, userId);
+                            dis.dispatch({
+                                action: 'view_room',
+                                room_id: roomId,
+                            });
+                            cli.sendTextMessage(roomId, msg);
+                        })());
+                    }
+                }
+            }
+
+            return reject(this.getUsage());
+        },
+        category: CommandCategories.actions,
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 27b4252f77..ec5400179d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -221,6 +221,8 @@
     "Send a bug report with logs": "Send a bug report with logs",
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",
+    "Opens chat with the given user": "Opens chat with the given user",
+    "Sends a message to the given user": "Sends a message to the given user",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",

From 293bd15ee90a6cafd610aedd48f2bada3710b4af Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 11:05:03 +0100
Subject: [PATCH 2892/3235] fix variable name shadowing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index ea561d9f12..3fa6c0d7ee 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -993,7 +993,7 @@ export const Commands = [
         command: "msg",
         description: _td("Sends a message to the given user"),
         args: "<user-id> <message>",
-        runFn: function(roomId, args) {
+        runFn: function(_, args) {
             if (args) {
                 const matches = args.match(/^(\S+?)(?: +(.*))?$/s);
                 if (matches) {

From 6486c749095e577ce08af4c900f9d570d06c5859 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 11 May 2020 14:21:59 +0100
Subject: [PATCH 2893/3235] Fix passphrase reset in key backup restore dialog

We prompt to restore the key backup when bootstrapping if it's not
trusted, but the 'set up new recovery options' in this dialog just
sets up a new key backup which just goes back to trying to access
SSSS if cross-signing is enabled. This makes it reset the SSSS
passphase instead.

Fixes https://github.com/vector-im/riot-web/issues/13578
---
 .../keybackup/RestoreKeyBackupDialog.js       | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index f1008dfcb0..7e51e76f6c 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -23,6 +23,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 import Modal from '../../../../Modal';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
+import SettingsStore from "../../../../settings/SettingsStore";
 
 const RESTORE_TYPE_PASSPHRASE = 0;
 const RESTORE_TYPE_RECOVERYKEY = 1;
@@ -89,14 +90,21 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
 
     _onResetRecoveryClick = () => {
         this.props.onFinished(false);
-        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
-            import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
-            {
-                onFinished: () => {
-                    this._loadBackupStatus();
-                },
-            }, null, /* priority = */ false, /* static = */ true,
-        );
+
+        if (SettingsStore.getValue("feature_cross_signing")) {
+            // If cross-signing is enabled, we reset the SSSS recovery passphrase (and cross-signing keys)
+            this.props.onFinished(false);
+            accessSecretStorage(() => {}, /* forceReset = */ true);
+        } else {
+            Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+                import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+                {
+                    onFinished: () => {
+                        this._loadBackupStatus();
+                    },
+                }, null, /* priority = */ false, /* static = */ true,
+            );
+        }
     }
 
     _onRecoveryKeyChange = (e) => {

From 3e934c80816aaab1fb7c67ccb53cad7b757f7aa6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 15:17:25 +0100
Subject: [PATCH 2894/3235] Send cross-signing debug booleans over rageshake

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/rageshake/submit-rageshake.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 921f3fbf40..d01fa66655 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -109,7 +109,29 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
             keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
         }
         body.append('device_keys', keys.join(', '));
-        body.append('cross_signing_key', client.getCrossSigningId());
+
+        // add cross-signing status information
+        const crossSigning = client._crypto._crossSigningInfo;
+        const secretStorage = client._crypto._secretStorage;
+
+        body.append("cross_signing_key", crossSigning.getId());
+        body.append("cross_signing_pk_in_ssss",
+            String(!!(await crossSigning.isStoredInSecretStorage(secretStorage))));
+        body.append("ssss_key_in_account", String(!!(await secretStorage.hasKey())));
+
+        const pkCache = client.getCrossSigningCacheCallbacks();
+        body.append("self_signing_pk_cached",
+            String(!!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"))));
+        body.append("user_signing_pk_cached",
+            String(!!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"))));
+
+        const sessionBackupKeyFromCache = await client._crypto.getSessionBackupPrivateKey();
+        body.append("session_backup_key_cached", String(!!sessionBackupKeyFromCache));
+        body.append("session_backup_key_well_formed", String(sessionBackupKeyFromCache instanceof Uint8Array));
+        body.append("cross_signing_supported_by_hs",
+            String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")));
+        body.append("cross_signing_ready", String(await client.isCrossSigningReady()));
+        body.append("ssss_key_needs_upgrade", String(await client.secretStorageKeyNeedsUpgrade()));
     }
 
     if (opts.label) {

From 0e8bd59d2f2937ce7e43e98c0f4038cb7df35811 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 15:43:34 +0100
Subject: [PATCH 2895/3235] View Source should target the replacing event
 rather than the root one

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/context_menus/MessageContextMenu.js      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 452489aa65..70ab80e6cc 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -130,22 +130,24 @@ export default createReactClass({
     },
 
     onViewSourceClick: function() {
+        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Event Source', '', ViewSource, {
-            roomId: this.props.mxEvent.getRoomId(),
-            eventId: this.props.mxEvent.getId(),
-            content: this.props.mxEvent.event,
+            roomId: ev.getRoomId(),
+            eventId: ev.getId(),
+            content: ev.event,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     },
 
     onViewClearSourceClick: function() {
+        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Clear Event Source', '', ViewSource, {
-            roomId: this.props.mxEvent.getRoomId(),
-            eventId: this.props.mxEvent.getId(),
+            roomId: ev.getRoomId(),
+            eventId: ev.getId(),
             // FIXME: _clearEvent is private
-            content: this.props.mxEvent._clearEvent,
+            content: ev._clearEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     },

From f487c2b38cb04202abc5c220ba6f7b652d4a39f2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 11 May 2020 16:21:08 +0100
Subject: [PATCH 2896/3235] Fix rageshake with no matrix client

We checked for the presence of a matrix client but then went and
called a method on it assuming it existed on the line below, so,
don't do that.

https://github.com/vector-im/riot-web/issues/13624 pointed this out
---
 src/rageshake/submit-rageshake.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 921f3fbf40..1ef68637cf 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -101,15 +101,15 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     if (client) {
         body.append('user_id', client.credentials.userId);
         body.append('device_id', client.deviceId);
-    }
 
-    if (client.isCryptoEnabled()) {
-        const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
-        if (client.getDeviceCurve25519Key) {
-            keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+        if (client.isCryptoEnabled()) {
+            const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+            if (client.getDeviceCurve25519Key) {
+                keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+            }
+            body.append('device_keys', keys.join(', '));
+            body.append('cross_signing_key', client.getCrossSigningId());
         }
-        body.append('device_keys', keys.join(', '));
-        body.append('cross_signing_key', client.getCrossSigningId());
     }
 
     if (opts.label) {

From c0061e2f2a879655d62abc2983af96b175c943f5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 16:39:14 +0100
Subject: [PATCH 2897/3235] Don't try and redact redactions for "Remove recent
 messages"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/right_panel/UserInfo.js | 2 +-
 src/components/views/rooms/MemberInfo.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 61f5a8161a..478dc90418 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -557,7 +557,7 @@ const RedactMessagesButton = ({member}) => {
         let eventsToRedact = [];
         while (timeline) {
             eventsToRedact = timeline.getEvents().reduce((events, event) => {
-                if (event.getSender() === userId && !event.isRedacted()) {
+                if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction()) {
                     return events.concat(event);
                 } else {
                     return events;
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index be3e8cf971..6b03000961 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -364,7 +364,7 @@ export default createReactClass({
         let eventsToRedact = [];
         for (const timeline of timelineSet.getTimelines()) {
             eventsToRedact = timeline.getEvents().reduce((events, event) => {
-                if (event.getSender() === userId && !event.isRedacted()) {
+                if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction()) {
                     return events.concat(event);
                 } else {
                     return events;

From c2dcb60f0b9257c2a9e8263c1637a9b80eb1ba78 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 20:10:45 +0100
Subject: [PATCH 2898/3235] Prompt user to specify an alternate server if their
 chosen one has registration disabled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/Registration.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index c74f6ed6e3..7818496e71 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -267,6 +267,7 @@ export default createReactClass({
                         dis.dispatch({action: 'start_login'});
                     } else {
                         this.setState({
+                            serverErrorIsFatal: true, // fatal because user cannot continue on this server
                             errorText: _t("Registration has been disabled on this homeserver."),
                             // add empty flows array to get rid of spinner
                             flows: [],

From 3bb800bb81bf761c011db4a2fe08d61c325e86a4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 22:04:18 +0100
Subject: [PATCH 2899/3235] Replace png flags with use of Twemoji

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/elements/_Dropdown.scss        |   8 +++++++-
 res/img/flags/AD.png                         | Bin 2584 -> 0 bytes
 res/img/flags/AE.png                         | Bin 1015 -> 0 bytes
 res/img/flags/AF.png                         | Bin 2578 -> 0 bytes
 res/img/flags/AG.png                         | Bin 4234 -> 0 bytes
 res/img/flags/AI.png                         | Bin 4765 -> 0 bytes
 res/img/flags/AL.png                         | Bin 3094 -> 0 bytes
 res/img/flags/AM.png                         | Bin 654 -> 0 bytes
 res/img/flags/AO.png                         | Bin 2449 -> 0 bytes
 res/img/flags/AQ.png                         | Bin 3910 -> 0 bytes
 res/img/flags/AR.png                         | Bin 1666 -> 0 bytes
 res/img/flags/AS.png                         | Bin 3977 -> 0 bytes
 res/img/flags/AT.png                         | Bin 655 -> 0 bytes
 res/img/flags/AU.png                         | Bin 5229 -> 0 bytes
 res/img/flags/AW.png                         | Bin 1650 -> 0 bytes
 res/img/flags/AX.png                         | Bin 1844 -> 0 bytes
 res/img/flags/AZ.png                         | Bin 1744 -> 0 bytes
 res/img/flags/BA.png                         | Bin 3048 -> 0 bytes
 res/img/flags/BB.png                         | Bin 2078 -> 0 bytes
 res/img/flags/BD.png                         | Bin 2819 -> 0 bytes
 res/img/flags/BE.png                         | Bin 558 -> 0 bytes
 res/img/flags/BF.png                         | Bin 1596 -> 0 bytes
 res/img/flags/BG.png                         | Bin 659 -> 0 bytes
 res/img/flags/BH.png                         | Bin 1374 -> 0 bytes
 res/img/flags/BI.png                         | Bin 5652 -> 0 bytes
 res/img/flags/BJ.png                         | Bin 811 -> 0 bytes
 res/img/flags/BL.png                         | Bin 566 -> 0 bytes
 res/img/flags/BM.png                         | Bin 5295 -> 0 bytes
 res/img/flags/BN.png                         | Bin 5290 -> 0 bytes
 res/img/flags/BO.png                         | Bin 668 -> 0 bytes
 res/img/flags/BQ.png                         | Bin 672 -> 0 bytes
 res/img/flags/BR.png                         | Bin 4852 -> 0 bytes
 res/img/flags/BS.png                         | Bin 2291 -> 0 bytes
 res/img/flags/BT.png                         | Bin 4879 -> 0 bytes
 res/img/flags/BV.png                         | Bin 1695 -> 0 bytes
 res/img/flags/BW.png                         | Bin 669 -> 0 bytes
 res/img/flags/BY.png                         | Bin 2023 -> 0 bytes
 res/img/flags/BZ.png                         | Bin 5281 -> 0 bytes
 res/img/flags/CA.png                         | Bin 2246 -> 0 bytes
 res/img/flags/CC.png                         | Bin 3728 -> 0 bytes
 res/img/flags/CD.png                         | Bin 3704 -> 0 bytes
 res/img/flags/CF.png                         | Bin 2655 -> 0 bytes
 res/img/flags/CG.png                         | Bin 1381 -> 0 bytes
 res/img/flags/CH.png                         | Bin 1500 -> 0 bytes
 res/img/flags/CI.png                         | Bin 568 -> 0 bytes
 res/img/flags/CK.png                         | Bin 6029 -> 0 bytes
 res/img/flags/CL.png                         | Bin 1632 -> 0 bytes
 res/img/flags/CM.png                         | Bin 1409 -> 0 bytes
 res/img/flags/CN.png                         | Bin 2215 -> 0 bytes
 res/img/flags/CO.png                         | Bin 668 -> 0 bytes
 res/img/flags/CR.png                         | Bin 785 -> 0 bytes
 res/img/flags/CU.png                         | Bin 3023 -> 0 bytes
 res/img/flags/CV.png                         | Bin 2695 -> 0 bytes
 res/img/flags/CW.png                         | Bin 1756 -> 0 bytes
 res/img/flags/CX.png                         | Bin 5152 -> 0 bytes
 res/img/flags/CY.png                         | Bin 3540 -> 0 bytes
 res/img/flags/CZ.png                         | Bin 1711 -> 0 bytes
 res/img/flags/DE.png                         | Bin 568 -> 0 bytes
 res/img/flags/DJ.png                         | Bin 3562 -> 0 bytes
 res/img/flags/DK.png                         | Bin 1233 -> 0 bytes
 res/img/flags/DM.png                         | Bin 2636 -> 0 bytes
 res/img/flags/DO.png                         | Bin 1682 -> 0 bytes
 res/img/flags/DZ.png                         | Bin 2506 -> 0 bytes
 res/img/flags/EC.png                         | Bin 2818 -> 0 bytes
 res/img/flags/EE.png                         | Bin 641 -> 0 bytes
 res/img/flags/EG.png                         | Bin 1611 -> 0 bytes
 res/img/flags/EH.png                         | Bin 2687 -> 0 bytes
 res/img/flags/ER.png                         | Bin 4082 -> 0 bytes
 res/img/flags/ES.png                         | Bin 2144 -> 0 bytes
 res/img/flags/ET.png                         | Bin 3460 -> 0 bytes
 res/img/flags/FI.png                         | Bin 1558 -> 0 bytes
 res/img/flags/FJ.png                         | Bin 5060 -> 0 bytes
 res/img/flags/FK.png                         | Bin 5273 -> 0 bytes
 res/img/flags/FM.png                         | Bin 2410 -> 0 bytes
 res/img/flags/FO.png                         | Bin 1715 -> 0 bytes
 res/img/flags/FR.png                         | Bin 566 -> 0 bytes
 res/img/flags/GA.png                         | Bin 661 -> 0 bytes
 res/img/flags/GB.png                         | Bin 6309 -> 0 bytes
 res/img/flags/GD.png                         | Bin 5753 -> 0 bytes
 res/img/flags/GE.png                         | Bin 2583 -> 0 bytes
 res/img/flags/GF.png                         | Bin 2342 -> 0 bytes
 res/img/flags/GG.png                         | Bin 2777 -> 0 bytes
 res/img/flags/GH.png                         | Bin 1864 -> 0 bytes
 res/img/flags/GI.png                         | Bin 2750 -> 0 bytes
 res/img/flags/GL.png                         | Bin 3101 -> 0 bytes
 res/img/flags/GM.png                         | Bin 709 -> 0 bytes
 res/img/flags/GN.png                         | Bin 560 -> 0 bytes
 res/img/flags/GP.png                         | Bin 5619 -> 0 bytes
 res/img/flags/GQ.png                         | Bin 3090 -> 0 bytes
 res/img/flags/GR.png                         | Bin 2035 -> 0 bytes
 res/img/flags/GS.png                         | Bin 5684 -> 0 bytes
 res/img/flags/GT.png                         | Bin 1830 -> 0 bytes
 res/img/flags/GU.png                         | Bin 2591 -> 0 bytes
 res/img/flags/GW.png                         | Bin 1608 -> 0 bytes
 res/img/flags/GY.png                         | Bin 5108 -> 0 bytes
 res/img/flags/HK.png                         | Bin 3001 -> 0 bytes
 res/img/flags/HM.png                         | Bin 5229 -> 0 bytes
 res/img/flags/HN.png                         | Bin 1644 -> 0 bytes
 res/img/flags/HR.png                         | Bin 2420 -> 0 bytes
 res/img/flags/HT.png                         | Bin 1944 -> 0 bytes
 res/img/flags/HU.png                         | Bin 677 -> 0 bytes
 res/img/flags/ID.png                         | Bin 579 -> 0 bytes
 res/img/flags/IE.png                         | Bin 553 -> 0 bytes
 res/img/flags/IL.png                         | Bin 1856 -> 0 bytes
 res/img/flags/IM.png                         | Bin 2533 -> 0 bytes
 res/img/flags/IN.png                         | Bin 1687 -> 0 bytes
 res/img/flags/IO.png                         | Bin 8096 -> 0 bytes
 res/img/flags/IQ.png                         | Bin 2119 -> 0 bytes
 res/img/flags/IR.png                         | Bin 4018 -> 0 bytes
 res/img/flags/IS.png                         | Bin 1483 -> 0 bytes
 res/img/flags/IT.png                         | Bin 572 -> 0 bytes
 res/img/flags/JE.png                         | Bin 3023 -> 0 bytes
 res/img/flags/JM.png                         | Bin 3663 -> 0 bytes
 res/img/flags/JO.png                         | Bin 2572 -> 0 bytes
 res/img/flags/JP.png                         | Bin 2402 -> 0 bytes
 res/img/flags/KE.png                         | Bin 2738 -> 0 bytes
 res/img/flags/KG.png                         | Bin 3258 -> 0 bytes
 res/img/flags/KH.png                         | Bin 2888 -> 0 bytes
 res/img/flags/KI.png                         | Bin 3661 -> 0 bytes
 res/img/flags/KM.png                         | Bin 4023 -> 0 bytes
 res/img/flags/KN.png                         | Bin 4213 -> 0 bytes
 res/img/flags/KP.png                         | Bin 2293 -> 0 bytes
 res/img/flags/KR.png                         | Bin 4837 -> 0 bytes
 res/img/flags/KW.png                         | Bin 1667 -> 0 bytes
 res/img/flags/KY.png                         | Bin 5285 -> 0 bytes
 res/img/flags/KZ.png                         | Bin 3466 -> 0 bytes
 res/img/flags/LA.png                         | Bin 2119 -> 0 bytes
 res/img/flags/LB.png                         | Bin 2537 -> 0 bytes
 res/img/flags/LC.png                         | Bin 2445 -> 0 bytes
 res/img/flags/LI.png                         | Bin 1759 -> 0 bytes
 res/img/flags/LK.png                         | Bin 5077 -> 0 bytes
 res/img/flags/LR.png                         | Bin 1903 -> 0 bytes
 res/img/flags/LS.png                         | Bin 1848 -> 0 bytes
 res/img/flags/LT.png                         | Bin 640 -> 0 bytes
 res/img/flags/LU.png                         | Bin 677 -> 0 bytes
 res/img/flags/LV.png                         | Bin 641 -> 0 bytes
 res/img/flags/LY.png                         | Bin 1273 -> 0 bytes
 res/img/flags/MA.png                         | Bin 1449 -> 0 bytes
 res/img/flags/MC.png                         | Bin 574 -> 0 bytes
 res/img/flags/MD.png                         | Bin 2238 -> 0 bytes
 res/img/flags/ME.png                         | Bin 2965 -> 0 bytes
 res/img/flags/MF.png                         | Bin 566 -> 0 bytes
 res/img/flags/MG.png                         | Bin 823 -> 0 bytes
 res/img/flags/MH.png                         | Bin 5594 -> 0 bytes
 res/img/flags/MK.png                         | Bin 5066 -> 0 bytes
 res/img/flags/ML.png                         | Bin 552 -> 0 bytes
 res/img/flags/MM.png                         | Bin 3123 -> 0 bytes
 res/img/flags/MN.png                         | Bin 2328 -> 0 bytes
 res/img/flags/MO.png                         | Bin 2994 -> 0 bytes
 res/img/flags/MP.png                         | Bin 4619 -> 0 bytes
 res/img/flags/MQ.png                         | Bin 5810 -> 0 bytes
 res/img/flags/MR.png                         | Bin 2897 -> 0 bytes
 res/img/flags/MS.png                         | Bin 4967 -> 0 bytes
 res/img/flags/MT.png                         | Bin 1324 -> 0 bytes
 res/img/flags/MU.png                         | Bin 723 -> 0 bytes
 res/img/flags/MV.png                         | Bin 2047 -> 0 bytes
 res/img/flags/MW.png                         | Bin 2141 -> 0 bytes
 res/img/flags/MX.png                         | Bin 2140 -> 0 bytes
 res/img/flags/MY.png                         | Bin 3081 -> 0 bytes
 res/img/flags/MZ.png                         | Bin 3367 -> 0 bytes
 res/img/flags/NA.png                         | Bin 3679 -> 0 bytes
 res/img/flags/NC.png                         | Bin 3254 -> 0 bytes
 res/img/flags/NE.png                         | Bin 1660 -> 0 bytes
 res/img/flags/NF.png                         | Bin 2520 -> 0 bytes
 res/img/flags/NG.png                         | Bin 563 -> 0 bytes
 res/img/flags/NI.png                         | Bin 1701 -> 0 bytes
 res/img/flags/NL.png                         | Bin 672 -> 0 bytes
 res/img/flags/NO.png                         | Bin 1695 -> 0 bytes
 res/img/flags/NP.png                         | Bin 4044 -> 0 bytes
 res/img/flags/NR.png                         | Bin 1620 -> 0 bytes
 res/img/flags/NU.png                         | Bin 3319 -> 0 bytes
 res/img/flags/NZ.png                         | Bin 4697 -> 0 bytes
 res/img/flags/OM.png                         | Bin 1886 -> 0 bytes
 res/img/flags/PA.png                         | Bin 2285 -> 0 bytes
 res/img/flags/PE.png                         | Bin 556 -> 0 bytes
 res/img/flags/PF.png                         | Bin 2379 -> 0 bytes
 res/img/flags/PG.png                         | Bin 4393 -> 0 bytes
 res/img/flags/PH.png                         | Bin 3160 -> 0 bytes
 res/img/flags/PK.png                         | Bin 3165 -> 0 bytes
 res/img/flags/PL.png                         | Bin 567 -> 0 bytes
 res/img/flags/PM.png                         | Bin 8583 -> 0 bytes
 res/img/flags/PN.png                         | Bin 5945 -> 0 bytes
 res/img/flags/PR.png                         | Bin 3673 -> 0 bytes
 res/img/flags/PS.png                         | Bin 2147 -> 0 bytes
 res/img/flags/PT.png                         | Bin 2617 -> 0 bytes
 res/img/flags/PW.png                         | Bin 2714 -> 0 bytes
 res/img/flags/PY.png                         | Bin 1519 -> 0 bytes
 res/img/flags/QA.png                         | Bin 1564 -> 0 bytes
 res/img/flags/RE.png                         | Bin 566 -> 0 bytes
 res/img/flags/RO.png                         | Bin 555 -> 0 bytes
 res/img/flags/RS.png                         | Bin 3349 -> 0 bytes
 res/img/flags/RU.png                         | Bin 662 -> 0 bytes
 res/img/flags/RW.png                         | Bin 1695 -> 0 bytes
 res/img/flags/SA.png                         | Bin 3750 -> 0 bytes
 res/img/flags/SB.png                         | Bin 3424 -> 0 bytes
 res/img/flags/SC.png                         | Bin 3704 -> 0 bytes
 res/img/flags/SD.png                         | Bin 2103 -> 0 bytes
 res/img/flags/SE.png                         | Bin 1278 -> 0 bytes
 res/img/flags/SG.png                         | Bin 2210 -> 0 bytes
 res/img/flags/SH.png                         | Bin 4615 -> 0 bytes
 res/img/flags/SI.png                         | Bin 1613 -> 0 bytes
 res/img/flags/SJ.png                         | Bin 1695 -> 0 bytes
 res/img/flags/SK.png                         | Bin 2932 -> 0 bytes
 res/img/flags/SL.png                         | Bin 676 -> 0 bytes
 res/img/flags/SM.png                         | Bin 3009 -> 0 bytes
 res/img/flags/SN.png                         | Bin 1530 -> 0 bytes
 res/img/flags/SO.png                         | Bin 1958 -> 0 bytes
 res/img/flags/SR.png                         | Bin 1942 -> 0 bytes
 res/img/flags/SS.png                         | Bin 3072 -> 0 bytes
 res/img/flags/ST.png                         | Bin 2945 -> 0 bytes
 res/img/flags/SV.png                         | Bin 1666 -> 0 bytes
 res/img/flags/SX.png                         | Bin 3485 -> 0 bytes
 res/img/flags/SY.png                         | Bin 1195 -> 0 bytes
 res/img/flags/SZ.png                         | Bin 4133 -> 0 bytes
 res/img/flags/TC.png                         | Bin 4631 -> 0 bytes
 res/img/flags/TD.png                         | Bin 567 -> 0 bytes
 res/img/flags/TF.png                         | Bin 566 -> 0 bytes
 res/img/flags/TG.png                         | Bin 2523 -> 0 bytes
 res/img/flags/TH.png                         | Bin 764 -> 0 bytes
 res/img/flags/TJ.png                         | Bin 1647 -> 0 bytes
 res/img/flags/TK.png                         | Bin 4829 -> 0 bytes
 res/img/flags/TL.png                         | Bin 3046 -> 0 bytes
 res/img/flags/TM.png                         | Bin 3925 -> 0 bytes
 res/img/flags/TN.png                         | Bin 2635 -> 0 bytes
 res/img/flags/TO.png                         | Bin 1618 -> 0 bytes
 res/img/flags/TR.png                         | Bin 2875 -> 0 bytes
 res/img/flags/TT.png                         | Bin 5253 -> 0 bytes
 res/img/flags/TV.png                         | Bin 5915 -> 0 bytes
 res/img/flags/TW.png                         | Bin 2108 -> 0 bytes
 res/img/flags/TZ.png                         | Bin 2289 -> 0 bytes
 res/img/flags/UA.png                         | Bin 568 -> 0 bytes
 res/img/flags/UG.png                         | Bin 1973 -> 0 bytes
 res/img/flags/US.png                         | Bin 2845 -> 0 bytes
 res/img/flags/UY.png                         | Bin 2542 -> 0 bytes
 res/img/flags/UZ.png                         | Bin 1745 -> 0 bytes
 res/img/flags/VA.png                         | Bin 2211 -> 0 bytes
 res/img/flags/VC.png                         | Bin 2105 -> 0 bytes
 res/img/flags/VE.png                         | Bin 2157 -> 0 bytes
 res/img/flags/VG.png                         | Bin 5427 -> 0 bytes
 res/img/flags/VI.png                         | Bin 5938 -> 0 bytes
 res/img/flags/VN.png                         | Bin 2304 -> 0 bytes
 res/img/flags/VU.png                         | Bin 4080 -> 0 bytes
 res/img/flags/WF.png                         | Bin 2509 -> 0 bytes
 res/img/flags/WS.png                         | Bin 1896 -> 0 bytes
 res/img/flags/YE.png                         | Bin 652 -> 0 bytes
 res/img/flags/YT.png                         | Bin 5735 -> 0 bytes
 res/img/flags/ZA.png                         | Bin 3595 -> 0 bytes
 res/img/flags/ZM.png                         | Bin 1787 -> 0 bytes
 res/img/flags/ZW.png                         | Bin 2802 -> 0 bytes
 src/components/views/auth/CountryDropdown.js |   4 ++--
 src/{phonenumber.js => phonenumber.ts}       |  12 +++++++++++-
 251 files changed, 20 insertions(+), 4 deletions(-)
 delete mode 100644 res/img/flags/AD.png
 delete mode 100644 res/img/flags/AE.png
 delete mode 100644 res/img/flags/AF.png
 delete mode 100644 res/img/flags/AG.png
 delete mode 100644 res/img/flags/AI.png
 delete mode 100644 res/img/flags/AL.png
 delete mode 100644 res/img/flags/AM.png
 delete mode 100644 res/img/flags/AO.png
 delete mode 100644 res/img/flags/AQ.png
 delete mode 100644 res/img/flags/AR.png
 delete mode 100644 res/img/flags/AS.png
 delete mode 100644 res/img/flags/AT.png
 delete mode 100644 res/img/flags/AU.png
 delete mode 100644 res/img/flags/AW.png
 delete mode 100644 res/img/flags/AX.png
 delete mode 100644 res/img/flags/AZ.png
 delete mode 100644 res/img/flags/BA.png
 delete mode 100644 res/img/flags/BB.png
 delete mode 100644 res/img/flags/BD.png
 delete mode 100644 res/img/flags/BE.png
 delete mode 100644 res/img/flags/BF.png
 delete mode 100644 res/img/flags/BG.png
 delete mode 100644 res/img/flags/BH.png
 delete mode 100644 res/img/flags/BI.png
 delete mode 100644 res/img/flags/BJ.png
 delete mode 100644 res/img/flags/BL.png
 delete mode 100644 res/img/flags/BM.png
 delete mode 100644 res/img/flags/BN.png
 delete mode 100644 res/img/flags/BO.png
 delete mode 100644 res/img/flags/BQ.png
 delete mode 100644 res/img/flags/BR.png
 delete mode 100644 res/img/flags/BS.png
 delete mode 100644 res/img/flags/BT.png
 delete mode 100644 res/img/flags/BV.png
 delete mode 100644 res/img/flags/BW.png
 delete mode 100644 res/img/flags/BY.png
 delete mode 100644 res/img/flags/BZ.png
 delete mode 100644 res/img/flags/CA.png
 delete mode 100644 res/img/flags/CC.png
 delete mode 100644 res/img/flags/CD.png
 delete mode 100644 res/img/flags/CF.png
 delete mode 100644 res/img/flags/CG.png
 delete mode 100644 res/img/flags/CH.png
 delete mode 100644 res/img/flags/CI.png
 delete mode 100644 res/img/flags/CK.png
 delete mode 100644 res/img/flags/CL.png
 delete mode 100644 res/img/flags/CM.png
 delete mode 100644 res/img/flags/CN.png
 delete mode 100644 res/img/flags/CO.png
 delete mode 100644 res/img/flags/CR.png
 delete mode 100644 res/img/flags/CU.png
 delete mode 100644 res/img/flags/CV.png
 delete mode 100644 res/img/flags/CW.png
 delete mode 100644 res/img/flags/CX.png
 delete mode 100644 res/img/flags/CY.png
 delete mode 100644 res/img/flags/CZ.png
 delete mode 100644 res/img/flags/DE.png
 delete mode 100644 res/img/flags/DJ.png
 delete mode 100644 res/img/flags/DK.png
 delete mode 100644 res/img/flags/DM.png
 delete mode 100644 res/img/flags/DO.png
 delete mode 100644 res/img/flags/DZ.png
 delete mode 100644 res/img/flags/EC.png
 delete mode 100644 res/img/flags/EE.png
 delete mode 100644 res/img/flags/EG.png
 delete mode 100644 res/img/flags/EH.png
 delete mode 100644 res/img/flags/ER.png
 delete mode 100644 res/img/flags/ES.png
 delete mode 100644 res/img/flags/ET.png
 delete mode 100644 res/img/flags/FI.png
 delete mode 100644 res/img/flags/FJ.png
 delete mode 100644 res/img/flags/FK.png
 delete mode 100644 res/img/flags/FM.png
 delete mode 100644 res/img/flags/FO.png
 delete mode 100644 res/img/flags/FR.png
 delete mode 100644 res/img/flags/GA.png
 delete mode 100644 res/img/flags/GB.png
 delete mode 100644 res/img/flags/GD.png
 delete mode 100644 res/img/flags/GE.png
 delete mode 100644 res/img/flags/GF.png
 delete mode 100644 res/img/flags/GG.png
 delete mode 100644 res/img/flags/GH.png
 delete mode 100644 res/img/flags/GI.png
 delete mode 100644 res/img/flags/GL.png
 delete mode 100644 res/img/flags/GM.png
 delete mode 100644 res/img/flags/GN.png
 delete mode 100644 res/img/flags/GP.png
 delete mode 100644 res/img/flags/GQ.png
 delete mode 100644 res/img/flags/GR.png
 delete mode 100644 res/img/flags/GS.png
 delete mode 100644 res/img/flags/GT.png
 delete mode 100644 res/img/flags/GU.png
 delete mode 100644 res/img/flags/GW.png
 delete mode 100644 res/img/flags/GY.png
 delete mode 100644 res/img/flags/HK.png
 delete mode 100644 res/img/flags/HM.png
 delete mode 100644 res/img/flags/HN.png
 delete mode 100644 res/img/flags/HR.png
 delete mode 100644 res/img/flags/HT.png
 delete mode 100644 res/img/flags/HU.png
 delete mode 100644 res/img/flags/ID.png
 delete mode 100644 res/img/flags/IE.png
 delete mode 100644 res/img/flags/IL.png
 delete mode 100644 res/img/flags/IM.png
 delete mode 100644 res/img/flags/IN.png
 delete mode 100644 res/img/flags/IO.png
 delete mode 100644 res/img/flags/IQ.png
 delete mode 100644 res/img/flags/IR.png
 delete mode 100644 res/img/flags/IS.png
 delete mode 100644 res/img/flags/IT.png
 delete mode 100644 res/img/flags/JE.png
 delete mode 100644 res/img/flags/JM.png
 delete mode 100644 res/img/flags/JO.png
 delete mode 100644 res/img/flags/JP.png
 delete mode 100644 res/img/flags/KE.png
 delete mode 100644 res/img/flags/KG.png
 delete mode 100644 res/img/flags/KH.png
 delete mode 100644 res/img/flags/KI.png
 delete mode 100644 res/img/flags/KM.png
 delete mode 100644 res/img/flags/KN.png
 delete mode 100644 res/img/flags/KP.png
 delete mode 100644 res/img/flags/KR.png
 delete mode 100644 res/img/flags/KW.png
 delete mode 100644 res/img/flags/KY.png
 delete mode 100644 res/img/flags/KZ.png
 delete mode 100644 res/img/flags/LA.png
 delete mode 100644 res/img/flags/LB.png
 delete mode 100644 res/img/flags/LC.png
 delete mode 100644 res/img/flags/LI.png
 delete mode 100644 res/img/flags/LK.png
 delete mode 100644 res/img/flags/LR.png
 delete mode 100644 res/img/flags/LS.png
 delete mode 100644 res/img/flags/LT.png
 delete mode 100644 res/img/flags/LU.png
 delete mode 100644 res/img/flags/LV.png
 delete mode 100644 res/img/flags/LY.png
 delete mode 100644 res/img/flags/MA.png
 delete mode 100644 res/img/flags/MC.png
 delete mode 100644 res/img/flags/MD.png
 delete mode 100644 res/img/flags/ME.png
 delete mode 100644 res/img/flags/MF.png
 delete mode 100644 res/img/flags/MG.png
 delete mode 100644 res/img/flags/MH.png
 delete mode 100644 res/img/flags/MK.png
 delete mode 100644 res/img/flags/ML.png
 delete mode 100644 res/img/flags/MM.png
 delete mode 100644 res/img/flags/MN.png
 delete mode 100644 res/img/flags/MO.png
 delete mode 100644 res/img/flags/MP.png
 delete mode 100644 res/img/flags/MQ.png
 delete mode 100644 res/img/flags/MR.png
 delete mode 100644 res/img/flags/MS.png
 delete mode 100644 res/img/flags/MT.png
 delete mode 100644 res/img/flags/MU.png
 delete mode 100644 res/img/flags/MV.png
 delete mode 100644 res/img/flags/MW.png
 delete mode 100644 res/img/flags/MX.png
 delete mode 100644 res/img/flags/MY.png
 delete mode 100644 res/img/flags/MZ.png
 delete mode 100644 res/img/flags/NA.png
 delete mode 100644 res/img/flags/NC.png
 delete mode 100644 res/img/flags/NE.png
 delete mode 100644 res/img/flags/NF.png
 delete mode 100644 res/img/flags/NG.png
 delete mode 100644 res/img/flags/NI.png
 delete mode 100644 res/img/flags/NL.png
 delete mode 100644 res/img/flags/NO.png
 delete mode 100644 res/img/flags/NP.png
 delete mode 100644 res/img/flags/NR.png
 delete mode 100644 res/img/flags/NU.png
 delete mode 100644 res/img/flags/NZ.png
 delete mode 100644 res/img/flags/OM.png
 delete mode 100644 res/img/flags/PA.png
 delete mode 100644 res/img/flags/PE.png
 delete mode 100644 res/img/flags/PF.png
 delete mode 100644 res/img/flags/PG.png
 delete mode 100644 res/img/flags/PH.png
 delete mode 100644 res/img/flags/PK.png
 delete mode 100644 res/img/flags/PL.png
 delete mode 100644 res/img/flags/PM.png
 delete mode 100644 res/img/flags/PN.png
 delete mode 100644 res/img/flags/PR.png
 delete mode 100644 res/img/flags/PS.png
 delete mode 100644 res/img/flags/PT.png
 delete mode 100644 res/img/flags/PW.png
 delete mode 100644 res/img/flags/PY.png
 delete mode 100644 res/img/flags/QA.png
 delete mode 100644 res/img/flags/RE.png
 delete mode 100644 res/img/flags/RO.png
 delete mode 100644 res/img/flags/RS.png
 delete mode 100644 res/img/flags/RU.png
 delete mode 100644 res/img/flags/RW.png
 delete mode 100644 res/img/flags/SA.png
 delete mode 100644 res/img/flags/SB.png
 delete mode 100644 res/img/flags/SC.png
 delete mode 100644 res/img/flags/SD.png
 delete mode 100644 res/img/flags/SE.png
 delete mode 100644 res/img/flags/SG.png
 delete mode 100644 res/img/flags/SH.png
 delete mode 100644 res/img/flags/SI.png
 delete mode 100644 res/img/flags/SJ.png
 delete mode 100644 res/img/flags/SK.png
 delete mode 100644 res/img/flags/SL.png
 delete mode 100644 res/img/flags/SM.png
 delete mode 100644 res/img/flags/SN.png
 delete mode 100644 res/img/flags/SO.png
 delete mode 100644 res/img/flags/SR.png
 delete mode 100644 res/img/flags/SS.png
 delete mode 100644 res/img/flags/ST.png
 delete mode 100644 res/img/flags/SV.png
 delete mode 100644 res/img/flags/SX.png
 delete mode 100644 res/img/flags/SY.png
 delete mode 100644 res/img/flags/SZ.png
 delete mode 100644 res/img/flags/TC.png
 delete mode 100644 res/img/flags/TD.png
 delete mode 100644 res/img/flags/TF.png
 delete mode 100644 res/img/flags/TG.png
 delete mode 100644 res/img/flags/TH.png
 delete mode 100644 res/img/flags/TJ.png
 delete mode 100644 res/img/flags/TK.png
 delete mode 100644 res/img/flags/TL.png
 delete mode 100644 res/img/flags/TM.png
 delete mode 100644 res/img/flags/TN.png
 delete mode 100644 res/img/flags/TO.png
 delete mode 100644 res/img/flags/TR.png
 delete mode 100644 res/img/flags/TT.png
 delete mode 100644 res/img/flags/TV.png
 delete mode 100644 res/img/flags/TW.png
 delete mode 100644 res/img/flags/TZ.png
 delete mode 100644 res/img/flags/UA.png
 delete mode 100644 res/img/flags/UG.png
 delete mode 100644 res/img/flags/US.png
 delete mode 100644 res/img/flags/UY.png
 delete mode 100644 res/img/flags/UZ.png
 delete mode 100644 res/img/flags/VA.png
 delete mode 100644 res/img/flags/VC.png
 delete mode 100644 res/img/flags/VE.png
 delete mode 100644 res/img/flags/VG.png
 delete mode 100644 res/img/flags/VI.png
 delete mode 100644 res/img/flags/VN.png
 delete mode 100644 res/img/flags/VU.png
 delete mode 100644 res/img/flags/WF.png
 delete mode 100644 res/img/flags/WS.png
 delete mode 100644 res/img/flags/YE.png
 delete mode 100644 res/img/flags/YT.png
 delete mode 100644 res/img/flags/ZA.png
 delete mode 100644 res/img/flags/ZM.png
 delete mode 100644 res/img/flags/ZW.png
 rename src/{phonenumber.js => phonenumber.ts} (98%)

diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index dd8511cc42..2a2508c17c 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -77,12 +77,18 @@ limitations under the License.
     white-space: nowrap;
 }
 
-.mx_Dropdown_option img {
+.mx_Dropdown_option img,
+.mx_Dropdown_option .mx_Dropdown_option_emoji {
     margin: 5px;
     width: 16px;
     vertical-align: middle;
 }
 
+.mx_Dropdown_option_emoji {
+    font-size: $font-16px;
+    line-height: $font-16px;
+}
+
 input.mx_Dropdown_option,
 input.mx_Dropdown_option:focus {
     font-weight: normal;
diff --git a/res/img/flags/AD.png b/res/img/flags/AD.png
deleted file mode 100644
index d5d59645fe695b60380c02374a5d2f1cda4dba54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2584
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
H*ggK=-FTJP

diff --git a/res/img/flags/AE.png b/res/img/flags/AE.png
deleted file mode 100644
index 05c7418aa4dae20fe103f484d831ae66a6c1c397..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1015
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?_@Ux;TbZ+<JS<*Fz*x=J?0=
z#+$e8nkCoO#8tA6ZB|F3c=G~hmTQT&RWI&5vdm!h{&3;6s!a)x(hG%+T`D&mH;7M(
zxahjd`wZ8^#KY4?&rUD>_Hu(Bb6U&OcV{mAFRpxMzxfQ$fB84Yhiw#E1e`b&;Y9w*
zM{T*cx8-KP{mR?f962pDa$3;BzwA;{I;S`Fy>r?<S?jP!i`5s+TMy^$GO7Ee`K55_
z#~c<XS^Ky*``Yh%DlcBPC$IbejWV5S9y_)^1e$Sp;sGW%CT<B%odl=<bzRP@4ydp^
z;SgqA#Tm?crJ$$d`r8ltFR_QYtD5GmYzuKKWj62e{VX}-de4$N)?YmvkL>{}SgBgR
z`AehfjC7_9y(zQL7sqek&1e=Co_pin%|FkcF!b>ERNs}9?_yq?7y0SH8DY0Wd-xwb
zV7R+JT712I^Jin*>G}3;r!FpCtsQuwIqj0o%hK|ith;x0DigGpO}nalVe<jzj5`+M
znKhifSM;|XZ=Ck)5P$XFcU|^NFTX6=HK%c6YM=Q6JrS?FQ>wRY<@m|N&)D&<=FUH!
z6m7k*Efsg=<X;_s)*U_V@xsMjkMmXraVhhu9f)N}zWj%8!Iq6rftG3b&e{@vsygC;
zM*?GTpJmR}&;{!PUM;H$-pBcA=HADF>d%fetjP*H8@K&%`>&VF@9Um6Y%jgYS~X2X
zGhpQjuawk$K4yhET+8>o>*{|y`>>bX47oGq&#WDfzE~=57pgve@@a$5c{vF=3|j7+
zg>P~KJ$Y)%gSv}mcY(0>K;t9v=ZDOnFP1K@JsNd&b=BJUF5IOLR~h}wyt7|u!I%0@
z^OZ}*9Q0qXu6Px8I7>ppXp@`RA%BTPma^w7w9gek`hM!;g^kB%MZa3{?oup+-wn=Y
z<2JYE&(~gu{Ro+3QMg^_|MRIb)^8Zz^h#I%zW)DL&wtTMesF}VY-j+*e%L=Ym%^v(
zuYX4*GazdbOC8gZzK9Kli|eNVGl6P}YeY#(Vo9o1a#1RfVlXl=G}kpS)itsRF*3F?
tHMBA@&^9o%GBBt(^wbtbLvDUbW?Cg~4V?318-W@aJYD@<);T3K0RX+YvyK1&

diff --git a/res/img/flags/AF.png b/res/img/flags/AF.png
deleted file mode 100644
index bc7cef091662f98bb1dfc7abed0152b39f84b3ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2578
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
X>yiIoz(&1FVG00(p}9e&9x?tO>&TqW

diff --git a/res/img/flags/AG.png b/res/img/flags/AG.png
deleted file mode 100644
index d48facad47fc07e12478edeaa44ec8fe3d0028e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4234
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

diff --git a/res/img/flags/AI.png b/res/img/flags/AI.png
deleted file mode 100644
index 8fd27cd39e292c266469d1e12ec389c46f703034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4765
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

diff --git a/res/img/flags/AL.png b/res/img/flags/AL.png
deleted file mode 100644
index 883835ffb338e1c31e6de929a958839afc2f6e54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3094
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
AY5)KL

diff --git a/res/img/flags/AM.png b/res/img/flags/AM.png
deleted file mode 100644
index b1bb36b987a6a12193051ba5820ad583233aef26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#M3kT^vIyZoR!}@9h*QbL``N
z)5{Cl*g2z?Nb~YKHg}k?`mPmptPXIz5b{HeYnD`vuv4}mucOH?zAj~vh{gw#R!%Xy
zTR%^#=x6DJ-!so0X03c6`EI8M6VNg+D5*SnP$IcUl5Z>b!}NXcfA4!=`SK$B-+k}J
zyKj9JIFZt`^7`UAm-JfpCmI|#n2{`T#_-xwXRAq*)|BbC7@f@E{kB!Z^u6P5RVRI=
zPhzgw8)Bl(te@Y~6@1YtakFoe=?%Y3yS>|&#R@mRiZzOEj<tKvA1-yvbfST<?An8B
zY4)4n=e}+G(Odg6qw2b5Ug!Ulc{U$ppGmM4_x$Cv{*=|M{Wi)YqPOpx^_w@3Gj}bz
zE3lAR^T=Y;8^=z5di-{EnfDP9ubmnZ&9NcdK3y$++s9!drF2~F)U|}Sv)|Qa`R!J7
z;x3Z!|F$&wq_wQc)@Y?GzHYzYPt}|`WnP(giyPZx>obNtAlrDFEsyOg*%I}1li}k(
zBCxQLIBm`*<Gh~l@pNF6GN_igMwFx^mZVxG7o`Fz1|tJQb6o>dT_cMSBV#L5Ln{*l
nZ39Cq1A~e~Pi;{&<mRVjrd8tBz&Ss*5oD>StDnm{r-UW|vF!3@

diff --git a/res/img/flags/AO.png b/res/img/flags/AO.png
deleted file mode 100644
index ae68b12c44d52f81b16f811ed1f8220918844081..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2449
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

diff --git a/res/img/flags/AQ.png b/res/img/flags/AQ.png
deleted file mode 100644
index 146e9c0a04488387ac4048410ffec24c43bfa4a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3910
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

diff --git a/res/img/flags/AR.png b/res/img/flags/AR.png
deleted file mode 100644
index 8142adfc8361ed9fda4b9a276f5770f2f24fa088..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1666
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
W6aQ~OlpIdh82}%OpLew<E9Gw`#oFNj

diff --git a/res/img/flags/AS.png b/res/img/flags/AS.png
deleted file mode 100644
index cc5bf30daf41b7c5e9b6b21489377b956aff1034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3977
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

diff --git a/res/img/flags/AT.png b/res/img/flags/AT.png
deleted file mode 100644
index e32414bd6acaf0f4a6ec7f9ace8d4e3907b9f144..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#Qn3T^vIyZoR#|(d%%4$gz);
zlXgc2zEJS1<a58cuz7MYyQ2s@yZXjz_rjuJk%J2@EG$DV9Q3SVU#K$MIdiSx^spX&
z1<(GZo%8Pf&;RRm@?rCnI}WZut3W`#DNx)cP{cKG)~<bl_gfMr+7dskov-<pf6D2r
zS!<tF^_-lpvNmk<%(>z*_Z8~e4)rWFNY*$b!DS3&2Co0=s4Bs7eqH``=C^+$Vk4@I
zV&vxSp2zm;5LbKg?9H!Mf6Vs&xp7z1%*(eIug<=H*=OIrFH(2szKQwI7p)WTBfmrL
zICG)?yJI&u{!_d@anhOH^Nw-*f0`ltihK15hZ{o2-^V6(ZcaXzcr0Lsp-38!_woOS
zFD0JpSnB*g^Oa&`{q1twUUso1iuHvBb$6p~#zvO{`FVOzE!4xrzwNwkUH!AbwpaXB
z<-&iLuatdUx8q@z82^@~df$Q8$zJpH){K7iL-nWObA*Q=e)}3_|0-S-5<CoQx5TIW
z`j;Mlsx}=cqFUk_QIe8al4_M)lnSI6j0_CTbq!2)jVwZpjIB%!txOEG4GgUe3@Q#i
ewMEg8o1c=IR*72!=ls}4ke!~celF{r5}E*u_4=^@

diff --git a/res/img/flags/AU.png b/res/img/flags/AU.png
deleted file mode 100644
index 8d1e143791ff36a8e5bcd8b6c36d875b747d2292..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5229
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

diff --git a/res/img/flags/AW.png b/res/img/flags/AW.png
deleted file mode 100644
index 6ec178847e27da9ec8ab37750d3eac64a9a89099..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1650
zcmZ{ke>~H99LK*WENVX@Ik6Java-#{IMp`WZEABd`EiFf+x(bBY%}>abSFO!N1YVX
z%87oN9Ch<!m!EN^#8rl-()l@3<hNV>b9aB->+ybno}bVA^LRcUpT9n7M_egj-L1L+
z0DxVnBzHCUeQKDtdhPG6DON)>h(IR*fHZr<GD}N+Hf2-Y=>Txb5&*=f0bo%*5|03Y
z01W_ROaO2^4*-S{g}=EusV}qx4pT^Ks<YrMOH@NAg6b2cCi8PohZ4Kg8xY@xP6iEW
znHXXb#vbug0HDQkArU-8eUpmNBL-ZPws%ueb0*fWHo@NK+6UKNcF@m@=GrnC=H%2b
z!VutceyjA&_r2aIn}R_1<8_=q1n(N#>X#6!EDmw-0?n<}*eokca;C)8B%(|8G=p=Y
zTy9rwAUY7f_EpzJV&c-o0a*|fkuLdH?QL$_hxnYFZWTO?cmH#m56+zY7H+zO^*-?F
z4R%VbXj&s>l)j#t_@bc26q3#l5Cg?KVCZ)NfaTcEdBgH@sT4w)6r|2x=D~-$?v&WG
z?h;(h3i6bNWpF)8(z(o5P<z>C{b>pNdA#@5TZ^E#Eg3qmHk|w>GkHvR1$j?DpnLHG
zq4aTNgjiLmxyWMM4#|nXz<ALL@Utr*PwW-iMjFhknTG*_!%15ko$;lz`j?x&EI9vH
zei5|D3&*zdO2WABIZ1tdfX~+>;IY2YuXCw*r{#nSr$bD;kJntQTemlRZbDcB7OmN>
zbcAYZ_bwgc!SI#5Ded(YhZGm*OirW9ts4xW+=afS1Q6k++lsUS+<Y99ufe=B@9|-s
zHG^uQBr=}#K03ur5f#I7us)9*rVAU_Bnx`DEw;$nDXo>NCY0vG)boMdVn%)mUoLIB
z2N}Um_TP0bKsN-{ZgVYZ$;=_B9F(Jze&&M!y9`4aT=(Zp+Q<gqQq2KX)69pex<hAo
zR2g^5N4w2h{LgQ;=Y&*3%!R(o)=TvDb8+?7VY|;l_SYaju0MNw78(f!d37CyH~N9^
zJX~3tdy~>&7AWG|x4Xm&DE$H6&t@`rFq9Ykm+42tBYurMagrn^S#~@XZZ9s&9yYSH
zX|}W!U%tqG!+Rc$i;j!2+jDF<>`9o-Rj)SMMZw07Hj8H3L#<0^(nn%%;>R8MU2<l7
zN3q-LlQ{2~3g?$Y`7CFyD)!XA{y`7n+^X4Q-#(2^kgDv$U8ufz?_&R-gT8ziOg4p4
zw&<lNATws(5?D2&7q>TXs-L`)tpcyp{f*#*&|D%mK01it+3~zddPjN3M|I3RPaZvW
z^8q=bgdUhNq<v{mn^RvBRsSAM(>1bKuf(Atn*~;kctdZzP5S5)hmi{ip%jOCEnH29
z>GV4f%Gm{?N`7CaVwD`rc1d5|7TF#DTG0SBu*1m)T)dL@YztPSj&b!cC*`;~mTQ$m
z(JB=iA2jK?0YBF$O@KVBD|j3s`C@zJPuH2Y_6&}7Feom!$Q9v=n)MtIo3sjl429&o
zo5T>D@m~>sFwz;U@7|py{*Z?qj!{Ck(eO?p<`F{ggT;;4=@uU`1YsLY|91htKj&!W
zt)&9L8N0hh$D{+k&;w~%@M`TBo~pc1u?(8*zRhK2O3w~!?*1spr$oT7L(=Z<yN#={
z(*1z?@%0Su48$xoSP3y0>+MPOS~K#D(itblYKTX#wlkEv!V^N0cmkE*k%5Q&)w{o9
zb!@vg7`{%Y+5)zV`bIHh8<C3?&4>1uC07{!8gYW@!31XxAC}-c$E$7*$P_z8yDRF0
z9nj%vnUVGEXcYavFe+h^+?jOG-1h-@X;M`h61<AjP<Z0rwx3Z5YrE(DQvE68*S>>H
zjPzeDaPCQ7P8%l$2lxp(ljx`=2iA(OOcAmy#GW%2^y~%INLng;<~iz--q+S~*XJa|
za_yb9F$;#XH(T_h<2?pGX~%1Wl&i2$+Rqs2qu++*9p8*ZeV17&E3#z8`ZYTGK>jc?
z6OJO)k8zpi)$&l^uJI~B#w~PNY=~Y!jO68?$Tegqc7nB5abz>u?Vl=jTUw`||Kfey
zRY9Zr|Fz(gz4;s#pX<nu<f;MKpfUD)(RO=na2_^TM>~w8EgFf&IHJ*_`@{SHBZP%>
YLIPv{U(mVam!uW|7qTnq7Ll3!H&WB%l>h($

diff --git a/res/img/flags/AX.png b/res/img/flags/AX.png
deleted file mode 100644
index ba269c0453b78330db34c223fd4bf8b4142d12fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1844
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

diff --git a/res/img/flags/AZ.png b/res/img/flags/AZ.png
deleted file mode 100644
index 2bf3c746e7a2ac58895a7fcc34128a4fc800e334..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1744
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
E3qi>X8~^|S

diff --git a/res/img/flags/BA.png b/res/img/flags/BA.png
deleted file mode 100644
index 3e3ec3fc76744fb24ecdb688d2fbb9c87ee6dd31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3048
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
J%4a1E{$B)Bq1ONa

diff --git a/res/img/flags/BB.png b/res/img/flags/BB.png
deleted file mode 100644
index 694050ca469822610317aab6d07cd04d5f9906b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2078
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

diff --git a/res/img/flags/BD.png b/res/img/flags/BD.png
deleted file mode 100644
index 6de2cde85bc59636c25cf4505d994a8274117440..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2819
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

diff --git a/res/img/flags/BE.png b/res/img/flags/BE.png
deleted file mode 100644
index 742ba9231fee59e91e4779ee9ae379c06f809522..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 558
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#L+eT^vIyZoR#2sORFyaO`9L
znJ|{Qb&r@P>3-#kGQW`_x=2`W!DWkvC!$+smvZdxOp89ud4zl8#<Ka^9f|YxfBxtD
zkec@Is|V0@AaKw=l+XKgPVqV4%imi6?Vb|krTOQ_UF-Vd1)t_t2=1<$nAW~|;<crJ
z-`%@-Y+H%(o~pZDmzGr7&Cc^GG{5%H@lw|`(fx*ZGL$@}&g*|wY2AJ`IM)09bM=1t
z<Cng?+xEXwq4nG?zZc$T|L$2HQ#XH?9M7s%HR&sBn7UmIj9HAGDJ2e<FJ{&Lo5uq2
z%$6tIx93|s3U_l90tHk{Tq8<S5=&C8l8aJ-6oZk0p}DSssjiVlh>@|CsiBpLfwqC6
km4QLUp{KSe8glbfGSez?Yv7z8+X%AK)78&qol`;+0FR=%UjP6A

diff --git a/res/img/flags/BF.png b/res/img/flags/BF.png
deleted file mode 100644
index 17f9f67d2661b3efaa1f5307b3fa49b3184b08c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1596
zcmZ{kc|6k%9LIl?&5=f)usLcJ31f4FMQt-zM#Z8$uDS22xf7e^EU)O$<a{~0NRC3I
zY#~Rv9*UVOw#dry*z?l$(zBj_dY(U?@9XpZzQ4!o^Y1t3q>KG7Syfp80CqV#5M0GP
z{4*6G;yV4NrA!RT5S%j(02;6E{7wdoXGDO5t1|#3>i_`l5&(P^uV~8v5QhSQ6+ZyL
zFaba%ri69MN_>F$JJ}P&6vr2v_B1hMVjRv=#q|3p*CX)5;zlag(b-n&9avq(L|2V;
zaSZ^#`i=w~DRJr(FD!CTkb3XNnn`n1D~}-&ML*8bwmq=h^0<DEE=1Atz)5`eOWmo8
zoQELU-MZm~->|M)0#ddeG9R0cZA0qfE9P;RX|8xZ<U{+gp6CyTHSMKIDWgb%1KF8)
z$E|F*c#war=wjJYE7fW^7<+1u?JpT<uD04F{fwtK+|5O}#rXD_=+-v<efIaHvM(1~
zocrTIZTsk#B&!QstFtqy-pwrfKw6bVGhB%|c#j=v2M#vTLluAMpv$nxo-^4$d_$z`
z;?8rg0FsSN!~#L)bQI5AsA-@a8(6B@;Epl=EYqh!_dgoVdtMVAQL2fOQbgVF2DSCo
zK-EuFr%gSE#5B?{>}tKX`T*fP-sg7HNuhR~fLJhI!Eo3e!cV~F#-~>yTFrfxYjMKS
zpiKBqmnEkzHM<vo-D%1r_i{Q&orEzQF-}y_Of#k)sKOTZ;}+o9d{{@UDrZfY-<YY+
z?0DfiUHG^$2pBA^$lk4X4_q`d>H9nQ&lu|7rwG>9p>Q5nABJ~>EI(lkeL1!RIjW(|
zl(Fk%gm@j{hzOR0=Mb5gYkfOX3U&m^jUbvG0n-J>T<G9c%Y|7%zM9g}*^+}M$YrdB
z+Xl!ZNG=-TUEbv>El=dme*<+F@TcEf&X<23?n+j^^a<8fb4ZroB>dnnM=&UfA1IcX
z;%{5hBc+dxM>V5Ws(s9O=k|W*N|nV~OO}|rpwyNP4XHBgn@XpYMO&zhExj!DGoMmC
zYPK`M8VYqb65bX%KY)QeH!WoX2TTdnAsFq`a7%-+C`nc`-_T6-M3abvFfucEn^JKL
znt1S}G&wJ<igJVfCMaagYhxaXA?>qN<7YO=K2t~>Ez%sLC6_6}Y26g=CV%VGEj%=G
zc@&;u-FtQ<5#G_v+;bg#MXCS0oYv~gops<x&Eqo(^88(6y{DnHl1!g{B%>^~%oc}D
zh8v~KFSBdFc4<P}IqQqHle}mH7u(I;|1vN?XXvN_D88?7G2)}Y6{0Q)apYn-8fu9e
zcK4_W?t#D6QI&}dP#I-EzjwAtVG=%BEe~3(gc0<xpC4eMpL@-R;tU{5oIWLb0w?h%
zm4vPE^`fV$t~}p$VP;w?(%d6=7zE2uq0J#n?_YE%zi`tAN)(}%$UW8{hvH$?{r;!~
z)u&o}D?Nl`w;yQMYHd_aQT(X$j~1W3WtSM$vJOt*wyFJHwW*itUUzp)9a`U3Npm44
zD|QsolaeVT3mKXLxRuw6_uaRkwCn1jouOHGyLs8~{0(oi=icw1vW0oQQ=Cmn6bc`F
zpUqhB-(IQqfdiE!=%rhSE@;;PxwFEvUZqgRt+v!~B15bGbnkPB=#3%lYPvz8J_i3|
zwHLbCz+-j}+|-g%xE&TA<N8&ZAi#}oM{pZE>67&nrdyB#gk6JtAVZ`eCA9Z)TsbHC
z_ycP!R6>2qm8!{Hs!>3i7>+?-Ngobf&`?E>&~;6Ts7=A9zkX=3NU{nN2+Hs`V4iqo
z-h;^(a*cFoEsiHl!`aiicP~pIB<LN2#KYuv6FH>C$m~4!?zQ7+rimb6L4|Fj;SIuB
zr25J4U0_@3%qct3$%GNf8}s{R6*!A=eQ|m1T%(4TPNFA-#T2$h^A?8y&lYPA%_(}7
zQd{B4UAy*~=0@jUk$oLZ@;m&mfATDP9QS04RZyv$`%7o|z6ti7epgk8Tg0DKJJ$A0
zY#=!{2orEVNDROjg*Hc`%#g+wBx4hd85(1X(np~&C{*GLf%Sh3QIx>2;H3XI$dr52
P#RkC9)`d`y_e=j9skOTC

diff --git a/res/img/flags/BG.png b/res/img/flags/BG.png
deleted file mode 100644
index b01d3ff57b3fc447bb34c257d41842f88d28f05f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 659
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#N#8T^vIyZoR#s=*{9NaqMIH
z`CyyFifjkBb)U`I5Fyg+Ybc?!=%9w0<3<j)jU5SMEX{9U{p57n!Oix%uPO4wfy==W
zm(Q*-kM?=b_ox1)+%}sJ8_vAx1lk1xT8sYmoA_QfIcxORNn@Id=OmTD5ZM}m<ApNE
zZ+*Rx-eY)dN6baNmj8(x4j4ovNaz^wh)J+<_mr<aKktdlwXN9)r6%)QmR^+BnKjXQ
z=hZyU(;b437n$F<{quTqdC+dvHKHp|H+SDlxP0Dx?qk=t(_UnscB)mM&V6q~-umKY
zvBKBZb^O^8QP9S_HZ*-}w9<0j?|LG4gf>s^iB8J=C=0TRr<wJb_2DJz?nNtOxv#C(
zIX$oYUxM<~=2I)mydz%Tf598J|KE*2b1vm|&iP*Rfo=Eh9aWiUGRs>`_gn3o542hM
zcI>?kMVU{U&2M}cN{^Vy!=Lhhy=GqL)1b-Aa(135M|cWoQ`<qN$FZ-ox2A2rdTAXf
zhJj!~N*&`<8Fwo`gEQ<vu4;*EL`h0wNvc(HQ7VvPFfuSS*EKNJHL?gXGPW``v@$W!
nHZZg@FsL~6)D}fUZhlH;S|x4`obzKFK{k52`njxgN@xNA21xh6

diff --git a/res/img/flags/BH.png b/res/img/flags/BH.png
deleted file mode 100644
index d0f82e82855de9683ac476b0d09536bea3528ff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1374
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_&;mil_SIEGZ*dV9Ox=Sr!}@sH1+
z?{Kb@5v+R9Uw2~VizF+<Ee;dDdT-vJm1%kEY-V2S*Z$n4(KDld9KS06w>|svp`gu;
zmr@qD^d68{Vl?5%v}Tp2x)c4*j~XoA?VJD4LO|K<+N&M4{ofzYe_y-5{QmEn_n&v3
z{~foz)?T4Sz==Z<Ot^Tg*vP&X45He9H63{}$8Y)Nmm#ODK6X9<gZ~?sikW?6+R$=Y
zhV}8nf9Gv{AKZ)m5$ehJB}dbu;uP<^&Ek_@RXgt9v+<ry$BORiqx)p9xCfry{Eqn(
z?-#BM?|=0F*w6gtmE%-C2_9pf1~s1jd7PYIzdk?L`#!qq-lG=|AGO&l<aMSN?)>)j
zK}FH=jWOmr)?r_tiT_T#dGAwpYqa9WwbQTVL~{vhe)PZdux;YHb(_xpeQ^Im{L7bY
zMptv5va*#jhclez*cVX#`pd?D-?z_bI@T>7aey(7-Rg$7T)_zqqdF$O=qMfc1N&6l
zc@FrUJIZsQqyD}3`STx+I~;9#<@6$E{{GL8r6dZj?0Qw@@b#wMhNBJp);xb@*}!jZ
z?tFLdLGeG5%RWBbpSyqd;yEl?U-G3MSe^g;N#%L$6=y5C9n0h|&u*++wSrM3Yz+%n
zg2c1~D_QE>B0ChNGM>nVF=m#0w7nqVcqCW<v&r={yQXly`|>!wOY6b2zp6J=x!T0b
za<c4sr*YlBx<YG1$!+oD_c(W5s|e(0Qr2qCJH~EwhV{SlwS_a-*SLMQ{xR?6ojZR`
zN=)l2uB&HW*u8JZqAkMz{(Nk2nig_lwfi3B{S8Ouf~Dp%Y}?uQPenXn!R0N&UmpL<
z|HJIC#w%Q#fmu3E!N>Wy%R&9l$((;?O3Y45jyA2T+4DI40K=c?gYy#?8)vUkiQ=Ao
zOP1GQe(j!PKdxO460X&hzVq^UcemJ~vs)(3G1BL`|Dq%NKJzs9T;IU!2Pb9DmwnBe
z<sO_g#Vb+Jc$o@YeVZhY5zCq-bJ-pkbuMAj{=4ztTo$L}dK>g3t+y<bdiVD9{TE#=
zPrrt*KA-K8seSL?%gqAcPaIyKHkFxg{^{pzQ*$HNBr!;PS~%V9y{vAcTBv0DGLV^>
z;eW=dIfDBGgC|bOFq$Of>lU==q=%P@q-Up^vgXAU71dciOI#)slsqVJ(E2t1<)MRo
zMU7jt_Ax~q;pFo#y2pHKSyjW*RUva39!0pbHU5^VW#L*eYtz>a#<I*}o+{h(u0G3)
zdGq+1?Eac{^DpN&r(gZKE8pDd_VwMD?w@F1wl5?(R@&tD{9PMO#ebdFjx~*R*k0OS
z%J(8`vFZe&mrK;I+_k7}ivRk5r^KTr&$)J#i%*-D;&^^rQ@Q`wrsr>3E5Ft*_`K)q
zJ!gT7GT~|G8KaXPwJm9OSlDRCY<2tnH+P{39>Zxuhbs(^xNN#}Lgm;r>DFIXh+KT6
z=c~AQ6kA=2y3~JQS)*Fw8c~vxSdwa$T$Bo=7>o=I&2<e-b&V`SjEt>J4XsQJv<(cc
k3=Ap`J+(#Akei>9nO2Eg1LyqMMxX`;Pgg&ebxsLQ05EQE6#xJL

diff --git a/res/img/flags/BI.png b/res/img/flags/BI.png
deleted file mode 100644
index 21865ac7202606154f011d3298289d0f094d854d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5652
zcmZ{o^;Z*a`1i*)7%3niDGU_`(ujbRo3taPd$fYIL+JrZiIfN;Al(g4I;Et$rE_#M
zaPatfetMpBzTek5*ZsQg`#SGG;J(7OG?b~xS;zqZ0F|nW!i#?v|F39B{+)B<KfnJI
z*dC#d001hYDgIg#|GPu2RbHqA0N&gH0OmaaaQW{Evk3s8g#iE@3ILG$3IH&=rqpT6
z{2P#1A(a*W`5$=s`hb5Tb5$|&_-EArtpmqrgZ~=H8&!2h$PzId<0BqcUB7(*fB~ec
zfY5z6vzzQ?sy9B<)$F)W1)%}Ef%#jW(Qc@@b>E}%$R9h&w6xO*uQH6{l~n#JA1m+W
zq0$&<7h#>7Tks@Ap6gbAIw=!Rgc?NBr|g_MUEX-Y$6{Z(ejk5bHTcAF|1sh0I(4J?
zl&#$IR|plW`0J_vr&-B>_Lx85`VUonxwOs7`Qhn*Fg&ZTU#yUx*JIx&!)dr_ZIQnD
zB49*%L1rMzDeYi#xyPfT>f_^-Ekv)75^(hlHbl;+?q)%0m1C?e3#=^3X>MW=4u>5O
zfmt3xheg=W4mhAd;+(mfzN34Ih@Ig(g+ds%VuMNf*33WTy*R2USx1iJ-jFV~jl$78
z7{@uJCb1?+u;-ZrFuB8=Bye6^&T%J*zKf69z`!I~XV2Nfi6`YtRtuG{8_|j^Ey@?z
zqH{t#NtP;W{uO|}x@+5Yym+`$1G?`5q~fp3VceW`;hX*iXB%D~KZHJO-?#_t{t~)M
zjR^wfhRXI*V=CQNd+r}WXk^>-toXxLW}cv>Hho+qewza;E7xRug%&H`>{QTx(0aQ$
z3~OT7)!=!l&ct-AAYd(WK=++K$k;%V7ZR|4&6Cr2TT{k1(N&P#y#EL{W*L5}&{(K8
zTpe_jU6F`~-YRm*_bFZ@HhQ{|g2XsVa2F@x8EgV-34}l9>F=bmZ+Acu$)6iXKSPrZ
z3r&=Wc-<*uF{)#2tTFW3C*^uI)Igt|z-LMAdg-}g%Vsn%EUPgk(+9ji@fj**fb|;(
zu=G^g>D45_!Ml+|#Fk(3XK6s^({bZe%8|tFR#b}a_xqG%ueFi8&H^_*DY<*E!J1}5
zb-J(thwyV5O9CTd$j;Pk)BH_#Pt0`8fm;;sp=f^6vdAe{kye6&^-tS}-E6&bW+3JB
zOTlZRMFStlDco<ZqVpL?B(TLl${?c)hDu7oA5sB=rB^XwqtEmhTlfb(Dr_jbM|=#H
zw9|_@xEe)!t4skE+S`Q=n7dyJC=<H-6eZ?buBkN3aG~k?gaGD`7R1dlPJbrf8-Iu+
zPLTH|E`Pv0%1;YDD<F)S>1PZyeI6w&Ki`aXw`mzF9lBYjc7Hv#kH!hkxy<C%JB9dZ
zGv`Gs$RC6df-QtXy8GTwA9JlX=0H}{ApM$2+3Lid4$M7*Lv$xg3F0lh(@GkkxBK5a
z%s`ybo%gnHW!~ASeU)|x(4a(2yfICLpMGaNG+kH<93_oxhm;6i_vg@6w>_*zpz)=d
zwt~o_iaZcbNxx+!5hm*pIdiL>cQ@)%wRXk%v62&oReFu!89+lU)4bNZ2ZtR{QLXnn
zDwnx+PobE8KS(kor{EZ|@V4IQ>?uP3M`T4xAWL$mCd)7tP$|WA!H;TA-rQqzf>QGS
z4JTu;zbeP;SD^O};XUL-zF$<Fq*nR77lI@#9W2|%iJ1?cRS^ao*+D)q+eqmjz`5!f
z!m9YLdFx(9yS*bf+ctsnWi;96N{W+$$_zK4^BMznPbs<Px0Jz)z7MJ;gk;J`i0Dr9
zS!w5=`uVfHM&1E5igodc2t;!6ZdC%~4q<vFh0oL@X~@nF*?sMKmGdVUQLr^OQy|U5
zkQ%`z3m3=A*fCRNcUP!^D9MF`!?dFx4#P!3%%INNhRwfjs0JO$oO1DUMe}%zc-AGp
z%%7yhTr*<RC--@-89JquKuyKBIfB_TBqTb4<QkH|#~u9KL1B|4KfF-%8xn%9pp}ik
z;doFBR;i19_jY>j6I|YJ`&KubU~4qBN%H5jgsp@Pgpe*;8zjb=Ti{r-#yXH!dR@oc
z$L=P$w^9bJKszhB%jk~m-l^pdt}`~(uM6VR{`P4D74RHh^%$~8#}!ehyQ(_m(&M|r
zu*m%(GNdqBt!r)@aVh9w-l@g3cp`sM6Lp}N7r$lF^uEB7sN`3ud}C(B{-qg&r=YG+
zYMez0DMH7VR+hHsLiF@!B};eV<p)A;R?GxfCgMaHb%#;k{2K(9``ps`6?FN>d?BBf
z0*l?yww+7kBj81-A?zDwG(icCW03#wHE&Y9hoqjeOe>mzi6RC?4Cd{r?vr?N9)dK^
zKm1M9<od1()=+^lli&<WQy(^g@@uStPhL=u?Y4*tcx-)gSah9mF)MLt@xcGE=rj}X
z3!3MJ#Z0>!z9o@0!z+aZ>t`!E`1C4KlX0v|a+_lcD(s^K49OO<uaDXT#avCxN?k9=
z3!}un>Z(D#MIovFpc8td*A1j?9E{%qo&^0gA8;0FuvH5PQb@#C+eX48_mY1ChItiw
z6iayR`lGsRWr(q<F?GrRC6LYdjR*QKEz{J<`AZ?PmHCn??*roegMx31VhlE4D>dXG
zmnwcWYerfh<2lAX7w2p2wI@|vDSWn0&(h$RKaxf_&fiBSP&f)j6A`vj?2mP0kd!`I
zT)L4?lZQ!VEgn;=_P>H#pPWu_CI|xB2~r_*3z0AN@e;M4&Mag{C`L&7Q=Yi6&uvxP
z6IyejN<~dQceU8xc0cxlfBLwh{E3ugu;cTeUuA)}mv^)>+Hv09is{l!dzZ#q^TWnP
zy@*+r?2FKGTqec9;Kc)$1aDY>xF20#_@(->p{oVzre>B|xRma-q`X^7g^CMRCY7of
zNCvsls22LPs(s@-Qf2ec)jXXx4G$);9gw8J&YS)vB+a{~*pUrmg70vVCEXS?kg2-(
z>srGiD&^7hJby^eRsJ*hfIP{|d)azz@4(DGj}lDFZ%(hwxnag*N<j~>b4`Ne`a_#z
zO;&ZFGanN>$hJ=l7Bs#ykFy<da}+S{lSh{rq53w#QB9}ySD{Y<MO9M*?&?5vm5TNy
zW-Y$&@wdQ(PBJ05V!H9hsdLknAQaWlQp9zQZr$r-Czf6$$7cg|$WUT0ljGMN9J?2C
zHj>KVO`q4cgQA9-kf*<##1pFq3?BaEtI+UwOvOghT0J7w^U&7(>vk;Ka};9BA4WE_
zF~e3fw!8kJT}@>Z%Ol85+zm@rBb|~w!P53Gh4+6+#_Iv`O>64C?`T%A3^P~f%xPA<
z6SJ7LI8hUlFC-L?iaVOE(Y26-z!h(7#xF@%mJ%<ic*8#;1YzOuv?S1lR^YdQzhFWV
z>c$^HP@bsmH!Q9u8ojml>Z(Y~>!V-lbFPVLd<@4Ai#Mq4ZRH-t)U4AGyg`X}-q-Z$
zf+bAiVdUXGS1KPM=F~mLmqYRcj4IG@&F%0fR{B*c9WFJ6(plhMrvNpm`WEeRqGsTa
z1pC6&9gEThM+PBUb7M^qs?isz1bU^*Nt6FdOk#$p5o?M~*30*`_k*|6IO;O)GzMs-
zNmy!Hb@uP4k(^JTjsF3*zA>ZvDP)iS``M-mAmf&OX~Bq#9=awV_uC>hIK$R!MwzlX
z@7wYl#z_|DVYU^dVTsSvn>m%4AgJrY_G-C$fC>4i&@MCOKKqe{lxgsuM*|631-#A!
z`634g$G#!qj)=;XUF?3*2~zIpdam_q_9}fjsmtQXiz04CzDw@rj#fL`IWT(f&matl
zaUqiAmWemV+<o;IeDU%A@`D5R$5Rkfom{@zl3$lN1&4VJ*w;1hJ!3Vt2TE&as&a-7
z=s&IFy@DM%j}5(h=`LT=%&T#O-bbX1pyK;_gO^)x6dHR!D&95CC-#ox7n>n6qIY90
z?EDs0YY@E6kyLM^5hQ08^_ZoRT}eWQFmqxzv2DxQEeF4ccKb0Qq-Iq!1raqq6OMY8
zg`a0lmiS;dYS1a<Lfp??s%AP*&Qfx4{S%LbX4$@7;UT?>+m6X0G-$mj<5!6FE7^^b
z^Yz|4Nj<n+wcg4)g8C&-3m&uPUt+i7uRg;S#ZnNOF<wf1G+4LJ#JGI;LFj^N^mo+T
zW7x!&F0um=^b2^Z9IC=|BHF~)BM6%U+I5>@Af*=|vv-K+F~8j#PQW4>z6Ic*9n_p?
zU7)?5lfoL)f$s}e3$MrBx0Diw8QLW)5M<z_2VF?&bc)?<%Mt_scFNk>nbK(_hxsPi
zElynZt<=_nP~5uK{!@E&z!!*pc)*wX;?WCZ!FYp~I8KQ1oxlb94VtvVHLxRhS&t=L
zZ}^jK%bl~ZYbZ?&2~=A9Zu?}9=Ne<WDB_6Umg0FBzinD&!JJo<Rs99=)R7~d8J^Nc
z$4l{6U}a0~nMNX_=?qnH|5%{6CG2xr4--uw8$r|XkHy-sA(k)0Cf8X99(5}JgfhUW
zlBXf|I>uOFLAH^Wjat*;ke~&qNVR~6Fd-uyTGY?N>)`sowa@qo4JQpN+Ny|!!S}k8
zzB+XrfMh0sJ1N=*-?72ZKbLVbz_Z==>w9J>=U31}?wGFbWqO{w?ZQh`GeVhJ;%v9?
zyHCQdOf)CW>1vHBBwgx6@TS(1KRHk8<(6X5T<?@_NT<+mHl}Q`h+>_#cuG`i>^(=K
z3Z;k>;zPyX8}$SGDOLQWl~Le9+*8V^UCKYh_TZG>Mv>JNiI*AoG#xFS&Yx)wz*LRW
zxx!ISP@b}|*f#3b;W+=qPb<xu<&_JLTVH<zE|=BcmTwnRYE#3nZSOupvFAvLX@W+b
zxTcye8^<@%5%M3K0QGx^D}pkhJslyeW&k^RbAzW0)^|$Iu#?qoEh>lJxxtec`?N;0
z;Y7`wqI~-<hkwRhCiF)Ofy<rwGdA+EoLr!A+34)I>Sxy^gr84{cItTK$M*vRFNWw;
zvM?4spN?H%hSL!$yhk!mOi9KKzQ)U9q|a&)c4ckrM$B5)+4832=cw_{^}IW8LWvn!
z{b&y#m49*Kubfz^t;A6@l?ByT;PRf3#eA={(Y#Q2St*(AcVie+;u=fTA~3FALS~c5
zW=m6ADJO;(Zg0N1tukolE-b?`_sD=C17nw&)ZN{c&Nsc0C{MzdL-U8fhLx6kdwWDv
zr?zBO$-9l8#Y|_EyG<xA-n!$CprT=jmxl_)Aa8U1<lRpVg>(c{Nc9x&K_w(_^{^kt
zex<^3Pw<68>)qYfQ%x4jRX>SfLk{%(ognXi)fk~gNdh1Y#s$GC?2t|?I|kQ2Lt9he
zWw^&Omuv6Xi0J^lh!t@Hj=+J5P-#e$d4T6)s}GzVp<C&RjI<6UB`(ttBs6d%#xH}D
zNTwDLH>cSW7~GN0G(|pNbHaF_`g2xW!G^k?qLGjIA<lZGe)~}P$@}BjG_~Ly={WH&
ze?aX=fzxA$z-^ZL8HQvG?XPVmdtu`qOLxjJaor5&W)hPd1NM%bf~6d!4#N%V6^^``
zD58415urciuHZuBWtDQ99KK|>ge8-X88`ynzoSsvp;$^(?wD5!SX6y@qrn%wIWo3j
zd3fF#KbX<x(H|;?hrK&Z(zCVd-ajczl~a96Ik)c71n#ktlDMP=?r7g1hhrA}N3)%i
z=gwrIE|;;fu$f=h6%_oBq=K?s2<*|z%lm2dJ7(Ic?<~~l8sW1Kfa4P}X0<g+0|Mo*
z<3tiBXy&`hb}=YPSE>Awy6EC(zlA4$H|9u>4hDHgrbblj@mQ<QZ{rD^<JQZ4Ms!QX
z9?0{7UQU>Y#T2Ks3U$Q8up|n`T(AW-S@0aom4zf5^_&gJ1S5-kjpd>#GuPPw9y%0C
zF-~O-=z;=$2aX@DPRuuNs_4}mAg)L_x1o)#K4~3d!6{wmq3i<~53Gs6&JNjRsTz~)
z@m*o=)xF;zA==rBFMSZm#mEto6Xc~yf;hCk;zeob9=gGNpN1OZ33*Zy{a%FbuRfJ8
z3BUT9xgW?T?~e4UFZB$|Vf+kOA@VElC1F2nz$dMI@x4dm!fLCD*%nEz>+p92fr+DH
zzGi1sh!RJ$Bd7`zra7*5N|FAR(ivmU>k|-lcM;ZP!z)?x@=fJ@;^L2;t?5sIE6Fm$
zXng?JxubTMW9yb%%#Ft1)=?+U=E*IbeGukRB@rUsuHN&F2+_mR8Vp-O^$-kmeN@6*
zop@shI$pDo5bhO9{nHqT-#6KCBap6@jFJgmI2&MYzA>Cvv@1(0LeqdW90j5AJc|#r
z-Z4fZy^zQD!6J38DwYgTjqjgt9==6-(w-`CXsv(CR8vjA&||{U6J3<Y*Fu#y13M+*
z89)u0BVOP+>4fL(bfyFe{H%YO{K?^Bxq;upH4mlfhDnyeZoOyRwqeNtQ^Ee^eYn62
zjUpkyrw$_8SJ=7}=0|DY_9>X3P<&2AL$dT+(Z~8)keW|uJq**z&qK*>+mPyEGFMte
zCIbqUOXFCnHthrZp2-=eRiWMoGS?C39fmU;a?AGOyQpeY451U7&T4>KCC|7exZG1$
z7A@EI_m63R@RPxm{bAIBn|UdEO~AG<uz1s<r_GJxv!HglE}l@3mVn3Rh5x`}t*iU&
zfnd7Alj@=&ddJ&Q!Aqq#6!CAz^l>UQtXo(0(xb_7;vJsAV|{|+v9oK5y?wzHQPZwo
zb=yY8Ic@P_?C2MZ@L<m}{d1>O$RoLu#7DV|V9K|=Cq<|A`jdrYxS+jCsrna1+jj}_
z1>^lhXk<=>GXcT>LMT5C<J(dBVi2g-78;jo!+;$dVRsI3HTq@}9`oTy^fy%eRimzb
zjP=QYx7g-gmrr$#0JZ^qNfGu+Zo=r>dai|m=kMy0X&u}6oLY5ebf?q2(o||{#otAg
z<l5Z9(R$rEZC`@QB}C?4c=kEz`pSQRA~$3_TD!ALmMD5e3;DQ^vM@uk%ilX*Z$+Vm
ziJf(hb$Pq!4rzTJ6qsID92PY5t0Zt+4wYdkj>DKbU$FiGFdnA73?HAlE;TIiXqKVO
zEOUQhL=pKy=8M|UinG0KXwcM}WSga|?iKX4--6|$w$BJ%))i)EyuZ=v_h59K?rz2d
z)>H&9D%73HP($8M-u*w0{Mx(;%1Mr3pq|P-NPM^`g84N=;m#n9eIjJUO(<I;()n21
zb`hpNZiU!gwW|>XPq&Te25_uO;X_hxNq*E{-ns#1^zg8TR=wo>PJ++zMGg>6_brzx
zV=fzJRVRgMB(UMeXcZ2zJg-Qy0YUPHF-u;Xx6|HM1`hxWRp5A$qe@ZmOE?Sn(BQxC
zbdpapmhflO<=HgdS^3rfw0^u1xB>N_+<kS#Xg~XJL(26=(eRCp<r`ZmYj@j!0*DHW
zNC*f&77&%x6@4W2SVT%pm`_+lN?7<^+nVhE7jSa1d1dGIzX!<D%mV)f0IG@_3Z>6b
GLH`GzuDJ66

diff --git a/res/img/flags/BJ.png b/res/img/flags/BJ.png
deleted file mode 100644
index a7c609143421ba2f6fad3835058166208078c160..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 811
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?`9yT^vIyZoR#|F<UrM;`qn+
z)zh;Ca|Bp5W#5PfZa=5AMaxgLYs&+LEe`@54<78h6xtR1kBxmJ-=f_L79|`R2M<Ou
zR~_Z@GCjz%@Zgkc*+~~1i^7=h+5Y&g!)fDQ@!+)T^k!y3D46K8!(LY4c%jVkd+B>$
z{8#H*q|tRJzn1Iw|Awhkj~=bxzr*@y=)C6jKP=68-SuQ<<cBUS`u=C;_4f~NEN%Y0
zR_o0^?`L<u-1``oo6E~P_4MB7j@P(P-48TK7C9rqYV3Bf2c0>i_P+O-fbYkOtFO0M
zF>ZK!T$1gBG7nSyUkzo4iQiVoZrzgjui28#>isH~0}8=!8g_?f{78Kem3Xb5tz6ym
zxM;!hyDI6M<96|XubgFeu71N3;jS_byPv+t6e3sHbDA-*sWmC71n+w?>w({<Bj?vl
ze|LQ0mCS$5wdqZd86K{wXE{0hnDcfn`!q2=`MtcYudVsZ!WV9pJF{c^gKIn7ZC@|_
zUGVYg<1K~%npO8zx7og)lc;)3VP~K|yYz%BQcD$Dp19nwJKS~ehvYQ9{|8@ulrA%_
zc{u%`DR=0!2L6X;>l+r$PqBSH_4fwP-qU-Ji#3(57jjN`uk}&-F;8>;4=x7z+9To%
zPOf;l-X+3Y`c?f5L$0)*CdtJK$271okM|a>y8hTr2?iv8vO3mG6pDH;4@{E`swJ)w
zB`Jv|saDBFsX&Us$iUEC*T7WQ$RfnZ*viz<%EUn1z|hLTpyJR|TNDks`6-!cmAEx<
T&W~*bYGCkm^>bP0l+XkKP%T3&

diff --git a/res/img/flags/BL.png b/res/img/flags/BL.png
deleted file mode 100644
index 6d50a0f544ad14e2da315e53fdeb187d3c8781c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LMOT^vIyZoR#|-pj>NqU~e(
zkyycIoumjJqZ@lTPbZm3x(Xc8kUp~I;_VH3aR)V<eDxD&``p>EXouPVTDHYHQZ_R2
zHFc$JGZW|i@dVlc1P;oV%B8(Dmrm(eCjaaHlR3rbUV6{}IbZ(5>(J0zexKQzOB+QN
zPw(B%z4CIrr2ab3?XSbltILCy@87d!gX&QYr}X*1O@Fj@t7om&&I~;-<y~ldx87>1
z9RK$I^719$C;$H39<C|7RWF)7$Y+u4-CzF_t=6u3Sn%yvOl|mLJ{DtV17nJb9_hb<
zn~(KE{L|1@!=M~z<LK(;eF!L`TH+c}l9E`GYL#4+3Zxi}3=GY64NP^7EJBQotxOHA
pOboOQ46O_dDh@rhMbVI(pOTqYiCY8b{Mbg2ou00KF6*2UngGqWv!4I}

diff --git a/res/img/flags/BM.png b/res/img/flags/BM.png
deleted file mode 100644
index 310a25ea238562f00519979342ca907b8db0045b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5295
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
G7WF^05A}cm

diff --git a/res/img/flags/BN.png b/res/img/flags/BN.png
deleted file mode 100644
index bc4da8d9a61313d5370d777f1e3e758971581513..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5290
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
X?Eh~de`g(g*#OW~(^IW{U>ElvV(1W5

diff --git a/res/img/flags/BO.png b/res/img/flags/BO.png
deleted file mode 100644
index 144b8d32db943675fc1cc9dc41dbaa74d0dd5c44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#O=fT^vIyZoR#2=*1i;()!R^
zSkxy~wX1{gpwmIU2#!g-DU2`Q<lJf4ro>?;Cbms1ENdn&OEs%wldFWHkW-h7j?lpg
zg{+_6i9Gx@?|-=bA!`|?`~)`^pk+W{Ah?q$bJnuVS*h39|LRXt@tmact8}{LTYld5
zt658vV%1}gChfhKv7>n7SI3F`&6RBjZ4M{QOEfrdFeClS^{Sg)vm#Ib+QC>YJh8mo
z$3EicZuz@W+qrJ+<w?0N8_XXT5mzx!1}JcAmCa7)R|l_^tvhcm{Mzr~tFD-=qM!c~
z=U?0E^lhovO7_#I9`Bp7##`~YZs4p#x`kC%M%Rv1@O|b1+qigt$(AP}-`4a?Z>Y4q
zbmU6&*||qdD>vkcZZMAZv5k12bww{G0%)syVytj5|F)e)o44%ExT_V@um5}1oT?26
z3$Dzw-L_723vb|_mc?>9T1U5@TwS_+!Ph0P`JV1lb-N?9{H4RYJBsrTBm5?D#+c`s
zq@DS%<e2%=jF7N$t7BMk%h!6*RK8b00o4-Mh?11Vl2ohYqEsNoU}Ruuu4`bbYh)2(
vWNc+>Xk}ucZD43+U{G=BsV$0z-29Zxv`X9>IOoSUf~@p(^>bP0l+XkK^1b;A

diff --git a/res/img/flags/BQ.png b/res/img/flags/BQ.png
deleted file mode 100644
index 0897943760ff90d0323d3207b9bde50e08f26c41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#RCKT^vIyZoR#|(3?3?;`qns
zciPtZTuCs9jgB>tGv;Le&*Uh^IytoYpn;<RTesSOrsl+^!Wrz^d_3i@8*-90ge|}5
zm{mUCt<eAe-g|bvzsEk>{5f>b+CmU$9S}IUez?v5$fEDD#px~VUwtLo5+&H|f1SL2
zZ^7-}MNz)hy+6ZOmRP;rW*L7$PGIvwgW~}+k~Pj4iae9xD(?BZ(QXC%QH85=*O~Xe
z+*q18e|F}qu&vu0OB1^%Z@qjq`E6lh?2WRL{{`hMY~TH<o)l=3Gqd>hA+G1AdoT5V
zvy$_0J858e{95bD&~Iw2Z*y$|L?^lz=fp?YYH%$-vVVF_Jey6sW!oVc=fu8^|M*Ya
zEzxnm^|<O`*tfF_|E^v+=gU){YH@v)%Y3reT6?S4?|!d+Yj?#072cP#l3yR%=J#st
zY38@N&+eCgew3Q-l^1&>!QkEuoy_%*TmNmj@bBuC;yT;wSMD7Zu6~x$7Mv7z&O&w7
zV@s&lcv_+MJ}h2bf9lIlXlN~X!rk5#Fze>SWBkCdQ!R0gC`m~yNwrEYN(E93Mh1rF
zx(24YMiwDP##W|=Rwf4828LD!1{H^%+M;O4%}>cptHiB=bAD_iD0)0y{an^LB{Ts5
Dxuyo8

diff --git a/res/img/flags/BR.png b/res/img/flags/BR.png
deleted file mode 100644
index 02784925925e88d859654c73a595e088f5a122df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4852
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

diff --git a/res/img/flags/BS.png b/res/img/flags/BS.png
deleted file mode 100644
index 2b05a8fc7c496eebc2f26da214c77caec10e054a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2291
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

diff --git a/res/img/flags/BT.png b/res/img/flags/BT.png
deleted file mode 100644
index 1f031df071cb791f8baec48dbbcc583b2b2ba036..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4879
zcmZ{obx_pNyT-rUG)qW`z=9}9HwXf|bceJcAc%B#?-Bw^3M$PKN(hKFN-T<iG)hUX
zl+p;&b@|=D?!7bjnR(CWJ?EY0&ogt*6R)qUMoD&^3;+O14Rz)FSCsruA>mi+%veL-
z6`&3n9Si_`NG3mf1iRX!?9}h;06_3<0Ki5Az{%AS_74E~2?M~I4FJew005(B&PRiL
zR|B}MmYVVvuXL>RDdGyGp6cd4SG4)>+Hp}Fx@r)<8agV7U$7gDVmvHHVcP&ebD^P(
zF$$d8%ytT;Hy)48w-_7C)eT^vC5gvnz`&}QTlktNG#aXmG(tjEK{W8kP$@}_Bn*RO
zHA3s755iIhVg|7Iir!b904b8T##d%`?4jR0H7Wa(xy<}ekw1oFw?frtt9&jFb7T(Z
z43Q`_765^vB>$r!<VPNTi0JA6kJ5LC+D0xVX#ZQCmp{694H0q40iP@y&T0pm%7*Xc
zuLKl=dXyf6)MNW$B$*Yy(59KuBN7|G76<TSd&-K;i?s-LqvP7jk9TOU<;&yg*^RMw
zOT%C+>K?Y!fQ@Q}r<t7KopS*s(bJHnRIRcCPrA|%5J&!nL#K-h=j|LBPzr5v)N9c!
zaLBh}G2smMPIDWMm_iBQ?Y)OyiJJ;Zw}o+>Go1jHvnRK{+J=ZB&edF56xDy^U6A8(
zXCJVfUXsKH8O|aA`5qr3fT!Fc30fVZ+>xBUn`XG66GtFVx79~@qLzhGs&$X0kxFW>
zz=^9{0*9X=>41lUL?EkY_KXu1d|}w$1J5g%2Yen`rbTHN#|PlzYhG(ZFQ-qUQPgJM
zQ8(s51ei<RchWeW_iq#^;v~-H@&WpL_VOTN_46#ChH(gz0n54cD!P!Nxecmc*w!Mz
zY-ovi(O(2DXxS-lYd8H3DE-=>k|?!~v4c6Efl%V6V|e~3HIuXMz!3bq^cFM4=t?yW
zmFvngbp#t-WgQ7{x1i!qx__#c;ZtlxrJb(wHNZ5_L%upRJU-+WYGu=J8(!>^-ONf5
zF)RjWj7dXLZcBjYsUB&5yJ|Ek8r6dcN7o?ZZ1ZoxQF9_S9TrO=BECYFPE{U`GO)9N
z(#&}4$YA+E-$YfSJFm55EyqIP8=kP+W-jZS2O8Bk=qt5&ao^L<B2CbG%uAKj-jIjo
zol!xOj&`%(kTd^wMv}WAeXn9aQiH#cTYURM&~RYicS5PG?DAlnvs{1~1FHn$J09Ks
zeA_i^j4%!%9h=RF;~E)0qs<VqHoYFj*I5`4ej~xT*Q<|{B%5udw17p^WHsLSJ}RR+
z#Kjf*mp^y^4v_^f=&k@dOYGV02QGilJ&!ThxBX`RX)C-`zALNUhBi<Qmg^EE%OtXP
zp6nO%+4<P7&awKd^n{xRD8$b0FZFB8hQt)pEUs^cuK{EnPb9XJ?AJCO!+d@f!Bdp|
zx`3NYOv^qy{^`#DoOU`-Um@nHZ6kK#gZnz-3c|m;lE@j~l31lUdV9QuqEs%t{<aOI
zi7*KPt@8^A^1uh>!sTb$!R~io-PoJK49nhOr~Vfu|83E00zQ~KeU^);sNKu&Z-Z|n
zXeT&AFEVd+3q1r=Mm%0+BGxn+iX+Os3lyuZI|qa&X#__|9r@p8{K8A^H2PElMf%D=
zYY87s%(DWd0taOV-_`@oxg18Z_gz-qhivp4_$<aah2Q^4K03iQnCdXhqQ&dE_!<>=
zY1a7|xg)*$97ttvV)Ca#HMi+g)(S?4l9U4bkL+g;aQEj=(!aw?-!nMXgIxDEDskGW
zg$cmgZhQ^`9hY&?H_#dcOS?w;M#M`SUe!aRDO=spILbFoZo+-Yo<~;YQWJc{kwRKi
z+d>z)(eSPqW1jRI`$i=2DShQ-17kG3(bWB8a+^B0?n;*qI)|!MFO=!4*)o10=+ShX
zu|r47BW~ISg4Oo-#!M@ok0s{_y#cU*g~FN@IO%5W_KEm)WwpDy?yzzjC6M-K6>+@H
z+4WkFJYECuuwV^A5NtA#YLfr{%L@WrFx~^;c4;CD&XKR&1$I=Uw*n8S^rxJ{6!T%$
z+^tU!gYYl=Um2pEiu)%TFy>BOMK0yoS&2ilp-0HO4m}}<l(1>jOgg<VNO;)4v*lLw
z=+qCVfeHNS%fC~<@vO-?CiRkLY&{QiQsMTWzQ}f_gPAtZOmTAe1`yX2k0V-H+&4)0
z@^zQVjUl<5M7tXcvUuvTrD=3X?WhDhy6lM_+$QfA%)U@&M4rB)PfN*EJL<bq8%EPZ
zKO{Od;{l7ST7};~p6XD?b#GG#;T6k@w05{<QccG5{es;x!_7ut&}o-_*AfO_vc_R0
zRJy1b5Z#Ske4H%!r97%}$*k|6boKV!(SbrPUiAnO*a%{&yJ)b*7xhajf#S|a5~s5*
zt9RFiqF97ds1~jdt7&@+A@XN0jm-p)*v3|796+ZJ>^y_1hx0`OVpXE1Or2bol+=aJ
zE028$yPo>4@zI4C=Y`fpbfSpfdOSYprTNM|;jXbn9iOPS65S{7v^<0MS{J9CZRF0B
zW*7G{Ez4#M4cC?3*AGJ`(U+x7c3wI=@}}pl>5lji>-i;eWP_dVI_4&pVVrT387nCD
zEfag~(BoG+i$V2nyxCJmZkrOeb(~CK5Hyrwv8-IF;Lmo_zuzX28!QL@6F7bE;*AYv
z>YjJI77_?o8qwn=X-{QFx!tuen~j->+fvk#*WV_b4w9=*9G$)p!z4*LpU@9SE<0|M
z;iunt{mcjZ+&{0J!2ArU91mD0=f68kbd=LiYfGB*zm~3{BN^}va4_*|@4JZ!JLUWR
z@c?*LFdl{eKq1x+*zO<?r|<smqT7(&Rfo9K#di7&2cLEy%SNuB<70y*U_(18v3WX(
zEyH}WAe!`>T}%^2s0Qckh4n}o_5Nkbos#FN@q2jBvi<Q>ICi9W+_u{XUva4LJ^*Ym
z8#t9g-7EEvP6>S=aWmmJA@gtWJ8teMhbgRyhb!#e<=J!zLTNG~rq+5DqM5mEvF$m$
zZT0u-<~RIc%fX{9XMNdp@jDrC<UL+4wo*>L>=>+KVbjIN38nW!BA40mRshr_3Gh@E
zhxnzc-|2-drpR#niwf(WmU_Dp?OVkaXj<&oNPnvgTLoNQl#WR*(Mo#)uh^J1bw%c9
zhI87|&FRfBQPL&2T=yPxkL6HOjjBzH8w>jqaJd(AN+yE|OfI~59S-;ne>SwciKY<j
z?Vl#?b^nmJ2qZ;B$6#OPAaq;FY?^JtpwgR6$Y4JGFA2hV(26=*N?_-VL2))PGDx@-
zZgh?E7#uj!vZ4hFdnWnb{F?AnSv_BAYVUlZx+RXCWMc<LD_qZep?;<iGX9s65&l(d
zfpnG4^?>#2?CY$D;KCR3&05&IJX~Vld_DTd(w{JLy_!Ese4kgoEn;@;JE*YS2TBh=
z+NZJ`c^B%oL)9<O=llTM$XyE5KvI_-;mJDZDGR#BQpf@FZN*TP6L_iO8l%#VF%DcL
z^M^8efDc8Lt6=AHiz9e5PuWeasRM*vee<1Sz9R=GiTW%eQ=`QxirsbI^?JQ6oaq-V
z?27`dWLtCSVJ$8>V3qtWHfZFhur1pkAKnP-O?#dXQWYb|L7qc_JClSg8y)%Y+j|hC
zxs%sa(+DA8jaK41+QZ5p8oFO(yVw}D;doloDsRT#d%iTIPQ>_C*|QKGfJC5_tJm~t
zyL0Zo-5JfgFpP58D-FWmee*k(a;BUf%zPAdjR)h+Jq&Aiqc>|en10yGqMYSw=1U%T
z!>XPFyw6-2n*bz*)(eJ6H%<E`=E)+T2|Vnga0UfG&zfD6MC1*(eNc^B*h%1VBG=Tt
zIJ~=#4yN1in*$X=gq~*-o#;nz`6{FbTj+&(a~@q7gl)ThBi>CBt<j)r%GQ->I%e1R
zmzFQtG9U`>H7P*QEj$bm87kg$kW~foFhLjxZAnjoO)A^H0%n&bw$*{GlX(#G>%jz8
zIj4oXPVzy1GI%0;Z7bGU$?4H>4~P|G@(NSss=t}%RnBs60<N3Cdly>LRXkrq9;i`l
zu~6XZA64$Ahr6}#mDR}{Pk&?)q!x8jGs&ZgI;(HKykP?6kSKc4br|#Fk(=7TY?$eZ
z|LmzEEzkMcz&~W1JMH}K5$Xm5?~*#S#uyvN`+vCazZmI;oQZ*AK1aV&2_X&LtX4J|
zp})D^8ZR}&+e!GoJZG(rKRsp&{Mj!mA6rAWYf~vikkzR4+GZA(&3gKVDS@=c!i>c;
zdDz*XFD6n`^Vhs;)ZC8)yc~5p)vfInA;8*hV)%t5fv*Y|Be}C;9eNo105$c%M}ji_
zU1Q5jBWPFoPPjoB=*-IccB#Q!$wTrEnRkEGtvsqdF5Ua{n2}?yU3K9<IKqi3Dgjkd
zJ@4M7m4Lc5D=P&c(W`mJEo_R7w`Z)x*gD^YWYxpa>`Q*YtV)>3tKHm;`Rb-4k25x!
z+tpwOia`Kj-_S%-{OonQ7~WUR!)FuTTJTe<OeEckN;jm1A@Gf4gS!Wh>sA(vH)wQ<
zri^BmgV(M$Y}^OGKgHhuNN7nruweZ=BkF9SA?W#Bbjr#nwxeo>rmRMu^`8`xCy%qa
zpJAT2&ItR^VI>54VA9;D-)<9}BtF*wJs)yDB*8SJIoKff(T#6IZc4|pt$*YrCzH%E
z3lzQ)$zJj4JdbmSy2{fmPG;`@MZZk12tk9AHX@=RT(85o2DcYoL*|HLI7-8+oo$A?
zps5YJ#%T5Z`$bR!w3;Okk{doET(_BEC-WT6)|UCh0?3>iuTD$y$@w$luh;VsQ`PLN
z_dBdlsd?UEG^&t}GB0dLBF=1gIr7aAx@X*YaekH(d6FOi;i=6JXoF4`56n<-c^Qd=
zUNEWiW5spogzXD*NLoD3zqe6zTBvAMts$?=tnL=M5G(|~j!08QYO=n(A%uNU!|kgB
z#opu+XW|hTsR9aiv<4e5C^~u#8<oERqWV417yV{MG=IJ<H`2rt2Lmj(n82D*<%nPv
zCH0-LzYQ9A*9Xi}KM|p&Rdr{SIh2;ByY1lV@k;8UY^oNkpENJ222(@!Oe&$x{}ji6
zG81_-%iV;4!}@P54I7BN#K(L8*pM~Be>4Bup_h*5hkdYp3)N;6M)oc$y&v0#gm`t!
zi<JF{PR#E7U@8k)=m6YJakV3I1^?l+%AS@m<M9A=BR{$gz7*%&`v8>`umk|S&q<{k
zY$o)y`;tG-?jl0bw6e<VMC~1v4}ZGKYEWYU&<7Owmw~48Bzo7@@b#8+L2IWrm!oOF
z=188Hy5$N`r>C`z%;^(PhjmhwaH(w`t@6SrF^SKeAx|&ArjaAioi__~6xo2G%Bn}H
z2!eFl4}l_vqlM2>s{0VW*W-@^alY$x7&@HpZo}my72nP;7?)EawZ2}s2OH?1?05ai
z)jwoj^Ck8b!JhDBTvQ%XE~1tMaEWlHuJ>KAXjZSQq*U6zebCoF@Oznx7=6$b2j3d8
zO-v>J46?D9?6zrLd{<Iyhx!vZzD^yCN#NgKvIibU-Jk+#d(lTzf?&<V(%_8`TeX|;
z&;9XTKLAaieZQ1eExv0*@MWKEi!Cvf)qVdx%8cAZ^~+hL_t2mNLp@x}uXa*_1wHMg
z1>Q<4+od2RyS9<Fq=S%rFL0`&CSdUwr-`<}f!LyTRUG~M3opfU+78~2!Ar-x{`}0w
za~*3rWuwroZ$gr8=!+~VIR_3$V#oMbJ5c9HMLUSK!o!&k$noLx10`iCB^03}o4a;E
zf+yc0j+{RIi$H%NNmB*CQAyOBm_B1Bs)Krqm56G_P#>4=Oo*9XyK5aMO&#>G=Ccvd
zE%2xtr!6*QNyerBSp_hvh$wc6U=LR{_h9Jp1u6@Z2UE+qfa3NN1yGL^{9`Y+2T~t8
zhTZFU^NiKZDPYn8{QGOL1bip6`6*p#pXVBcWAXz?WXYQrFz_-hFoJKae7U#)bUm6N
zb$+s0f@|=GRk_y_8B|Gc`aH5_C{T{C_fVdruFiP~TAthFDP|-mwX<i_f5kXAf*qVO
zDkW=E_w;xP6NX_PfZ}=|1JKPc0xNYFw2{=$J$k0rJ^0KhSg!tA1RwZ<l@3C3%cK(o
zYr(SjjBeG`!(SGrndX7@t%s99rpGDo&=1=d?6A*RNpNRQl#itl3O7Gj9fn(P!`kOq
z*epl*-0yOnKr)IZVc1$*-_7~x6Z-&WTqL_^pR*{P^y6=}gD|q6-Bx%}>l&t%Xr#H<
zto2TAHep>=isy3Eujv0~F8@hkF1RkJ`TyK4L>jDqxeAAF`Kp-tK7QnDFJtFze+58P
zSVT%dSVBNl+DKGPMnXhJT$oQ-L`GOR@bj|V|1!9FJa&2#^#2=3^B>}_41k7;u5y*4
HP2_(8NFwzW

diff --git a/res/img/flags/BV.png b/res/img/flags/BV.png
deleted file mode 100644
index aafb0f17761442e115d157c6b3ee29b7c6758645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1695
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
GNdE&49p{Ar

diff --git a/res/img/flags/BW.png b/res/img/flags/BW.png
deleted file mode 100644
index 30840167189c5672e728052651d67393eba7d511..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#MpzT^vIyZoR#2>wP#t<k&}P
z&Q_&Z*(C~+cXc_Ax|*At#~%n4ac9>Kx#0CxIOGr0I=x5F9$Z-Yu5aZQiyc#yoH&m~
zs=O48=KFr{fBwk=ryczKjdzxqg1iL;0fIf&ihYkQ`Ywl5FWlF;NTX}fgK+zWUzpa0
zEuXA%%kWNlLBPru%e7}R^abjj6Q?aSI2|w}RpX42NSY+q=AH`qv}ZmiMYc?T-MRkF
z#2p(J$lPIleamxCfbsX6&V`Bc=jW?0URWl^uQPkg3}Z3zYd7xK#nfE&d%Uml<=V2{
zH;W4s&A+bR{&`=S%=cWg@-y%1^*(&gwLP9Gf4o*!@P1;V>6*6Cmp5mKeM_7M<a%0X
zs^`9a>J)S1={48KYnJbg@qbdIAtt`<y2U(u-E8&3`v<<9aglrd`ug^4eePR@cgjn4
zOcI;F>G`8WY16yTI(b_6iDy*;-IZy7*F%2G=87aC{ra=JC1*`66Y~GCTC*I<Ydo!y
zZHIJ}@3r^-4hO|G2rRE<eyhFqOyaKCr$C-+iEBhjN@7W>RdP`(kYX@0Ff`XSFx54(
x2r)9YGBva^G0-+Jv@$TLIP}yOMMG|WN@iLmZVjCCV;eyhdb;|#taD0e0s!$+{m=ja

diff --git a/res/img/flags/BY.png b/res/img/flags/BY.png
deleted file mode 100644
index ce9de9c9c7c03c3291c7a433963ff87df3b22558..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2023
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
W{C|M}%`=H70BkJm%qvWNDE|dm)vgBs

diff --git a/res/img/flags/BZ.png b/res/img/flags/BZ.png
deleted file mode 100644
index 33620c3f3147e9dda64cadfc8a6e43f6a26cfbaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5281
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
Klq(g{*#7`I5(Iew

diff --git a/res/img/flags/CA.png b/res/img/flags/CA.png
deleted file mode 100644
index 4bbf8b11699889977bf699cfc413f8fb6106538a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2246
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
Xk^kSoQ{j}zG62SgrUngqE=hj@W|}Dz

diff --git a/res/img/flags/CC.png b/res/img/flags/CC.png
deleted file mode 100644
index fd40fc8a783c2223eb26f17ba01cc40851c82a53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3728
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
IP_+&F7oFT69RL6T

diff --git a/res/img/flags/CD.png b/res/img/flags/CD.png
deleted file mode 100644
index 230aacd454fd3c7edd75b5a117b437ba967bab8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3704
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

diff --git a/res/img/flags/CF.png b/res/img/flags/CF.png
deleted file mode 100644
index c58ed4f7b2d3948a1e0753d40773de5dc5cd2228..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2655
zcmZ{mc{J2*8^?cRW{jD!Cnlmn_F|AMStr9-lPp8_Eo;P3$TCc}M1{(my(dX!%~%T!
zlCdUBvPH5yjES;5WAx7R{_~#qJm>wM^SwXUeP8$Yulro*-03#fraTBy1ONa$W_V*;
zHqZWTeopo}Jw_>F19HX4$_M~zvylg$Q1%|}jkmP|fEZZ-NF)QmU+kmA6#$6D0Kl3D
z0O&jd0FkhQmW#UV2B(*WsWF>u?VoQ=U;`e8cZy)s<3DBuVTafSjA&+sgMEb_7g3iN
zvy0ngU$ZtdHnO`hwedKXC^RPi-e7m|YTakDXc0)t<0d&Z@h%{Rr;6F}*WzxXxuhH_
zJ|a-YBdFU#I7lVo-Xb_7gJ25}Lxez7O%1<5xct)=!tKy}_d8^RcQhiHrcsg^W)4rq
zwF-x{BL-*pXXg4@8`n2O<97$0YW^V%bc6tVNLvbT&Q*&o`5k&v=5M7({H(>rlWM&u
zUhZc-O94Ty9YLO2(mzCaiPe7!w8<gJT!nry(Vp^$b&m9y?DM3JO+P!EDEeXBONzl?
zy`|LAqoTzF8M(JS>+V-EVXux+^HGZB_!&KM=~5flxZeqb!x0d}hqmMlN}HJMJTq_3
zVFz;edIqmh;P#QxG8N-notdv137O(vK@?Aa&kQK!Rin!D<R;#el)a7ECWklI)zRO!
z#<yl3*v?7!!WT#eYUy`6Hh-3?@qBt<NQy(>?QUOzM8r%p0_k}4V-}IKK_+ZiAGm?P
zkaK=*FSYv02wGsMMx89T8cg>=VkS^0{jl3)i@zKiljq;3+>Q5l9D9B63AhnHJdk&e
zPFgQ`V|DH=Xl~kFQe~B!LOlI>1-2A1^QTuVM}$v9%uz!B+$tZzY!9~oLEZ9<$Y$kd
zzy#KeT4)a++?wTkJTY*JNmJc>O+Dh?wuSMJZAec!q94LE{;E{(N!xBuAX@31DO~G+
z)r{!ymvl_@SD3xT_m~ywvUhN!6We}M!?F1m(zrP;K8*W#7K>t*biyRq?PJ73vdsgB
zUzWkTlT(c`L-Hwg4=X9%4>}mI;>HWkobI#Cjg0Z@NfoaR#Ev7@1R~9wYWy6ejSB=r
zk{h(uN(bR`7a@j1X^Vl}keUe$Qh8>ye^mh*QX1u=d`o0A?t0+wYL9hkg$RRUzVr_R
z<u_!F1ZK@@>pLhHEOJwg?$}Cq!xCWzaP|}L__bt!4Yq{y5zcZOLA59XUL}vCi{A>0
z=AU~WN8Lb`)q-Jrws}csO=C^JfhMPDJ05?A99YpgyfG2vnP8{EWRFh1zEIsl7C6PK
z?pYs*p`2;XIack<{8-4K?H1E9fuQ4qGutkWISefJ#N5$qB?H4QPmw@hOIH9tYUL5#
zfYW3B$XiZM1_)kxF45n+^{Ao}$8W|VsLQPOQX7wAHdZ#d7x%v69Ak>o_vEe@Ka1>o
zirk0T)tChg2Wr+Hb|mDO^GHC@_UoGVIXT=0d`Z5T#_itG<s!${F;8V^zOuQUDdP@T
z4^M(X(vv#_Ww5U7H;cKUY6S(Z^=-dXJz~wO>|G^wHYQw?XdQ$<^hM;1ejarkw$T>H
zl%ql<88Mcg{a5{4SLfTn)Xo#FQZ+9CpY|0NC9gwt4BHK|!D<Yr2zQaz<#Gw|LqdYc
z8y?-J)tx_MuP1veRTs@gYEH^c5Gw<alS`0hnq6o7><ksTjLc3rx09#Tu<OkH{^Fs$
zJ*L#je6z%s$@hMDGqTl|x%>Y8?ph>8oRZ2+WvQGI{Zg?fpl~r^P(Gj}xs38H8+#tc
zQ3?&)YvYQeqzX^R6JP5ri!BD|brYcBai93Vc-zc$$K_q;Nh|kyb_3G;<nEV5^h|=h
zjG%RT=hPwHf&QXRa6upJm!vvae8dIlpV<2LsrZ-J?`W67rj&kzH!FMY_4dS*68@c%
zz^fb=MUmt_&s&PnDk`ZsC4(1s)}|GUd(Yo&7X|yw@d#d*9nz8s<D{K0?};W$AAde~
zFnV3*l%?cWVV1nGpzo~Vm~I1}wZCq1TeS0XAcRXUs=!cF$SrU*Xhulvs+fFcJ<HzY
zl>r82*j<5B<RpK%X4@q$G!~lWf-%Tm&{W|iy&PZT)xC7}lbX>|gvNeHXw67|{Sd7_
zt0DD>n6=HmP!1o(F4~3$kw8Y$?w)T@Fyw5+bhl}VS)>afzZb2&AU@v5xP@?I^dZl^
zc)RX!46)uGv&W$+5zm_>w7SlmEQ!#L5jPMAi)$Hcry2%dNt)!PGjGm0EMbRvJAE+Z
z#?W7~9%Tpk@_f|tV(AkJsrVCT4_9{d7PJ2)l6p$5XC6G{xg6GFI3x}o#gn3+(j3GR
zcZ>WBPx33Qq2kf^ynw8aqJ~T96l2mNPjL#eC_p2k46+4_x@;z)Rm})qRL9(3Vj4dd
zS#Ievny9kS<=dnx&b|zA{81iF>h-Hs(VPDnbG9;WKK|X@fIbhZuXuqDNch58i9t3*
zF71HCEG!J6@Qi<Qkb0Awp77U|rn!_Y%L_*HA&ji;oueZj>w-#?L2d>8Nbz6%wH`ai
zH)Lb8qOaixnjThnR0WNW;cI*|f-lPs7t9bB`qe9Iub{qOA@t6%ThYSnV&80PLENsh
zWLle6zUg7KfF<tvt-gLmRdcIuc%}J<y}pgN(^C_`T4&*#<xzr)XKa%>w|%~%g|GaH
z3JW{Ff|7$Z^Gh$fOlrnGMUDv!VK#g(miOSMm<Q6}GICal46=F+;hfQHOHHKr{~;KL
z9tut#lbPoIa=SuO^mU|^g&x$o=ut_Tk&>W{3+FrKzQA2uWlJgHmp7d{JYxsiNPYSy
zN`j?2G>VBH@XP@kI)X6r$uXB=XarpYsBat9k8w8`P?N#N8qbAp9b~^t$B|rgNR6)Z
z&Og*p#dw&k1GNp{c?FghUjH#o8_(O5+F-e(M<>liA+$oJJL1C&-H3r>U{I>_Y!6&2
zMbboK`2L2MN3SWz>2xeifQrt8f!e2JA5zH;@NLBloxO9it3~1-LG)&$a*)M0GdE3D
z>%r0Qo0)aIn*~~)e#d*5y0Bp%U0_1oYG(${q&qODbPR8Mg7!<C?_2OQfT$9gsHBFZ
z`+T7G7)!f%u0fYY99u{$wA<G0P@BkefNywa{zVDxk2QK;oj+k5yyK5W(qj7X{4Wf@
zEDYISE?pyrJ)wZQ<R(!ZXP#R{ugqDbf8ALw%_ZOz-4kQ&!*U;ht-M&8;1x~I@!JCE
zqFi3z?^)J5o$S%CT<Pd4OD0}?=>`@~7o{ZaSkxNnLD!JP9biIIwW56`t*YTgo6U&o
zALH)pLR38La*MpfBB*{*7dx6VPI7QcxaSFv`mb3tD;!VXPACcgL$W_kq`3`rq~J)0
z?9Y}A5l0~UcoKbeyu*Fj0Msz5nx`=ur`5FV)YNq}RCUf^lrX9~7|e}#OM3qk2nqEG
Y@QeQc0eG=1i5&pUaMs3ESdXNC18?QJdH?_b

diff --git a/res/img/flags/CG.png b/res/img/flags/CG.png
deleted file mode 100644
index 6c2441e3e03061a3eefa9c550deaaccd348843d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1381
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_&;mWFt`IEGZ*dV4!ICpcB&z{mfV
z&+ls8WREr2J&{9|*|}7_TV>aSDH~myh4y|@Hq?_+Z|f9SQDN!m?mpFeB4P4ookX{t
z25|=pDhz!+e14cr%22tS!gcAa<t@&#*#=JMw|%bKIB!Ppm9psT>mL7%-JW0l>;3OJ
zaeG)5TLhdqAjGCa9^V=QG(@;sx19SXz4tZ?Q=@}I!kvrmOZPd1hsVZl(@*9L`E%Ox
zoQ9OdBg>kEJ_%hN*7DRfk^9-I-+mI#Qhu{4K6c@)13#-CvF>9i=AFM$B;w$tC-I*(
z)h;wVs;fC5daY2f<Av@oqZw|AE59=HY~B9VCGSvgc~*8mn~;85+VA2y<=3_ZOux~>
zf2Q~tyGZlyOEWLzADs8@fukwc?pN2>1jQfPQU6Fq{lJ^Y%3TLE7AH(w`0g<Km%zjN
z2fpVm|Hrjv+0yl^m<_&oM*BZu<B`pN-T6g5zT_j@=dvp<HX-`wA21sy$t;n$bM~C+
zUQwxAP5(7`-`jtAFd>RJS-*dK5_9O3gocgnMj{#P=10T7Iq4o}|FUV~{Kn1e*7i4j
z-B`bUlj5uGvk!?1#3q`zhBwZPkI0Jk*!SZRw^{9%)<+AgdjE<vM?a0Z{`JBHc^++X
zsrx+h!oN3czL&X_ujjIjlbnS3N+tO(4BIa*DcJ5W@M_QPb=C*6KE4kzb7?L!_+#Uu
z{Wjr==LW04OILA!X}EXj{Ym}&k1XCItMuivnm?D@gv_7Sa4e!ALbPe~J;{f;2LBV}
zT@ws`+Wd{Kk)3K1x+tK%ls)3?KiO9TE~np~`rs{4duClv4%6zh`>$_uoL}63fwSe&
z_ian2&wPDJ_SGeu_Dz4S*Q8xYzf;!7T>J5PrM=gr6L)2&tqX8F<}BOSzG~U*|8-L;
zUaL*4K3J6d<*wwZ+kvOkg-%VjK3G)#WvS|v^oQ)H|6ZIvEnr@&^cy|-+D@H42}ZyE
zT|dOBwpd^FCcoO^e78;FK5qBdq}a{q*=Kn&#z3+*)A0YnlrKxK{$ZVb(OmzMJWzU%
zS3FQc((pS_w^7zNpmgfdGtH4kzcy)pP3ZJfJo)1EiYv{&_SdiHn*iB+t~6Jwr`DT(
zJKEnJdo?=sOKQ}q<;!~Hd$npF<dx;UyuMJ;K4Mu+Mh|QLN~Hq1(zcsy&*p!eyy;m_
z`IRTfGYj=A4}{)(U}Ugjdok;pe6OsltQ~fRFH$P3UF0|H@14?|`nx>p+mv9BtKEiE
z)St>O%RaX1Yx~ClE~(^$?N^No<`pf<VJ@EVck>>1U!xO;8Qgx%$#&?;b34c*dS%92
z0o$uZHZ@#}UcYHN@i<}YukvW!1?P8|$@;uoaWdGW+X!UhwFl9+7ynxL@!KuOQsHB(
z=19D6`YHTAkmH!qym>;WybPzL_b|#lSd({MHo;7{@*>xvf}_i?|IccDp}qF#L*)cn
zjmofGhQD)fpEOkCPw=z7zFot)^2vKQ?vO?Mr8yDVd7|onCX2mW{_?alfJ!md64!{5
zl*E!$tK_0oAjM#0U}&yuV5)0m5n^O)Wol?;VxVncXk}nfap<WniiX_$l+3hB+!{FN
S$2I~rFnGH9xvX<aXaWGf>TBfy

diff --git a/res/img/flags/CH.png b/res/img/flags/CH.png
deleted file mode 100644
index 9fd87167df80850fdb00f8f10a0631b545282cd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
zcmZ{kc{CJy6vuzIEM+OOgm`5w%OJ|kC^XF2vqV(JUK+BDZAQk>;)x+4YhxQjy=To>
z8q0`MGV$y~QPyWm5tArydVjog`s3Ym?)}{5e9!&s-o$gZNMWHvLI40^3lzeELxZ0#
zwuckn4%L%6;JspEV*)@;>fRksK2ELZjdHL70Ivc7@fHBzI4$De0E9yTSo8n@nhk(d
zaQ;(!IA^fO%L<9$kYihC>9HIL2BTcD9D4lgpD?DqoP<Bj!p4mM1D~9fo|>#v%qnN;
zYYT*lQ`Fc>UK>WjM!M@vI&9TRLeQ(xve{f<f!Fbx=YD}=Ny%#g@jv*fYYfxm%pZbY
zC0Awd5#w(^a2ZX!`ot?7p@c%%G&7r@Gb67@PQunZ=;M(w^8*?%`1Udu2Gi?Ze`qAY
z%N=K|DE1#h+xNW=kubBDaLr?j_9Wq3+^a^IjDjHCXq*DfxoTvoqxE%cLaIWE+TA<z
zu^Oui(xWm(9YW@5(4NMF4f*7kR^p|C#I^P{6JkHTpFZ<f0}PhBll`G$=4Kg6-fw{d
z2^<4GdZJ=goyWlnZS#;ZT*gi%we=lq0lJDL>}~H$PvHv9C;|CX5<nCu5WG3TiUzce
zF({+TrOjPgdmM}J^(Q*h&htgpe+u9t{&9)#y?zzf*Uqx$Sg#bdidCge9z*w;V%l(S
zt-9*?q|2nsiov~ymFtB3$@Wge<xnchaSFNwHj}>J4{(pE{-%g){d{8@w>H}QW;=wC
zWRgbh)M4W@)s*wBWJ^hdc5YhQWtDlJ)U1bWJ!i^@L9d8o1l0_U89Xsy%w~@87<Cx}
z>_onu`-}Z4lpW{tFU{x|Z?>Dfswm3_EZ#!PgG3dZLi!8e>BH){i0p}AUyN1`#E$8R
zvUYuAE1KN}-&1HVOoaL?m!fmYG%TSfKZmE<DngK$EzOWKNZ?vljus>$;fpeC)GMs+
zOUgW6u|5#Cl5mQb!6gDlvo@896)d-YQjAvtWv8+>7rI%KuCO%}6NXkufF8RjGGm%@
z)cSV74#c)}o-NCk?Xx+sGghL`BuRub2J;@Bv}p4d_ZDyYs7m)MVF5@M(-$0pj!j-U
z&C{9L$PFO`?i^x}p35fnY4YEA`*_LRGDY5xkgf0vJ7nJ#dw91=lRvUC9oqI>6G*x)
z54FbPc6AvRw$$&|Izt1ya#%p4)97tU(RDMUp7s8)q%EcNdumZZq2f>dn|i-xSYIWD
zI+7La7t4kFS?>d{^Yj&RRX5eLWMrn3Be_Ff-K19<jg$Gxdz}0nLN*ek>m<~QgpFGr
zr|NQS$yTNZ@Ezxofr(TEsXTx#8+S4DGV3v;Ya?E&W$Lgd&Ngv-`7{{5aI<ol?YWxJ
zQoT+&i^-s#PF*TreKL84Yl0jV&0Sv*RwsG!k-m;B8~seAt`j%6i|D`@<dP_U(&*GG
z)l}06dQ0!-)J`4^v4S)ly1dw=o@cx5(#rjb6a?my4S77=sF`8Y$h+rsi@X(JTWRQb
zNcKhuYRDyj7Cv7J&lD+Bi+XF2(Bh#D-to^$%3GiuRN%S&8Dw^PvXAPev5%$dky`%U
zT}3Ndgpkw>I80;PqjV^+MtfFSNnQN<%4eSed|J&qVbI=6W98V#GzTS`dvU;=u*-c#
zC#0Znj4SNt<(Q-`LdwWi83()PZgq2^CBJYKly0f`BP2)zGwpnD>4t^r;&vjjf1OX#
zfl!MX+)e-O#t{awJMN6eQ9`U-gd3W&Uq#q{+g^+L0Iy{~jEQ;Lqb`0diUxZ>fUWSo
z{T2ThCI8@i5A$<XU<#o)z&Yn-I2zL+p}rs>2K_U5UyP;PW}D%!?}R&!f%?jiNdCP>
z=t<!n&ZkojGrJJx;~C})^$zvr0O&$=PHIB*HFZxp>FPoCb)Y98$00gU2qfy+tkExm
bz#t!gKivNd1Pd<5aRk7^%ob5;>Jk4BT0o>6

diff --git a/res/img/flags/CI.png b/res/img/flags/CI.png
deleted file mode 100644
index 9741b9b11f0cd0b2b086a59b7864d3d7d1c8582c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#P((T^vIyZoR#2=*8?P(e^Ok
zWWhnL*bUN`a;6@VUUG_+Db8_=!0astZz+ZT+H$C=Rp5kX(2|>O&p0NEu(cS-DX_3c
zUgN*Nd~V{u#CugLKs$h7f#Ad4yqZg=1fBDZ|FXZ+@R-D5$NAU%`CpVh|19x(cS1&c
zq{fmx_r4dawodQ<e$K<{_PzLhvEEfy^>2Gr-j+<)_RKx&^zrx3otHwKHASi}1l^i4
z-&{UC=>5)^-tU)|-O=5)JxIf^dab)=c;&42uX~-nnh&NF)%;zu@8SyPgJ%TJ@K8+L
z@BOzT`F=0NKMid)jP5+vj-~rAYzK;{mbgZgq$HN4S|t~y0x1R~14DCN15;fiix4AY
tD^o)&69a7nLn{M=ibGFrQ8eV{r(~v8;?}@9KeiEMr>Co*%Q~loCIC~k&}#qy

diff --git a/res/img/flags/CK.png b/res/img/flags/CK.png
deleted file mode 100644
index 6cca35967c1c69a3023e9f26ee4a7bb2427795be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6029
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
R3cfY~YLB#)OBB%|{{<a#G?D-S

diff --git a/res/img/flags/CL.png b/res/img/flags/CL.png
deleted file mode 100644
index 13b993d15dea2e4350b518665b259d1a6f604521..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1632
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

diff --git a/res/img/flags/CM.png b/res/img/flags/CM.png
deleted file mode 100644
index bca5730fb54a22bd959381006b3e87c0e7106df1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1409
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_&;mKJ!rIEGZ*dV4!MM<i6{_{aA%
zXTHnZe%EQW?*i8XXBOXPk-#Y$rY#B~Nj-Z6g_<f9y$l^6Fv_=ZI5uAtXk=#<&T`Qd
za=o=gDBpF;GDpo!lNhd?ja*{4-==zRe|zrS$A!^eNe)7}+t~llpMLhu%s=1fd_H~V
zoaM;|0VfW{76_5K@ZZZ84;7(Kmo0wf?*H=-JuI-039CPSeCJOl>+*H+_C2<55{&ON
zEnd6)it+^EuE{g_*jInsa%H+>oU2T^mC7}qEvpZH{;z7<tai&`_d7wc=DRa@hfP0x
zx4ve})@&P#xjVD>7G21D)DgvVCct+K?|l;!^XE^lT#em-S8CsUvBQo`#yu=)5}aoY
zgk~hF7##LUXxmxJd|E+X|L)u$@9%Oo^1flqh+&X%TkL4NLhq7UNzK;3YGvhao1zsr
zFmhRceYxOZwwKMx&CbWeZ}XO4jt<UTzTu+7Bnhq)4-<tJoLZy&i)X@V8KDF3tJoP&
zL`E82j^)^xyVZTJ+k$|pg6vj5+ITM9-V>Q6^kCVmiL2}n%`9$J%{a<bG}GTcU}=94
z!^wa*3q%>VD@koNYq}~>F?;#K1*?6IGOkwKFm>sJcim-?>m7|GR&OwB^!jVs>M&1h
zsr;7N5Mx9?C>1_n{>zoP;oFaWmzPd3u6%aSg;&KpY3ZrP2X_|P-(5Rl=bL#_--VuR
zwcEHipXW=>ztbVlWjDCD>b*=~@O$$7TXWnG-oCp(JeSclY^?&{oTUbLo%aeBGj$is
zNnc@mZL<78^rh`Svdrn3_m<z&+hP32E%FcJ2KiHSmY;8mzLga{IpI$9YVJq96Kurg
zm+ou1ueZNa=d(t|>|ftjhAxQPw!Da|B>$6*G2@J>?-t(cuxu>-AZmAE`j_1)O{NE<
z986>8Z92{u;_Uw^<wm8<JFDHrMLN=R-t6hE;@)xg?a?etlX+F|oL(5duq&x)59XGX
zfA;M~l)?cQrUlkJ#N{u{eb;zz24neKk@moh2VA@s4l_$5%$u%0+3&2+bpNH{`Reck
zGX+jv)4lM|>1*}Aj}Lx0|1Poqk#+1zWkcyfdp~`qu&B~sJO!@v4=|=Kf7M^`jAdEy
z=?6S{hnedx)J^5T<8J$QLTN?U^Jxw#|9AaaBa~sY*Qq^9@zcLu!jZ*_tFydz?q=9A
zf3i#C`_i^k>~lhF&qSon7QP|CyCA&!sz`IK&F-Mz3y*HU%@rYVH!ku;Jm0?7?dQF(
zIe+Osb^ed{0@WSWF$Y+GAAiI3mVNIrYnP7!w!t&RZ#=MC;}Lq1v&wH%=vg-X8^1T-
z;x98OIq;e(_RYJX&j-J?pV})?kzCDv<@kc<D%MwW7I?@mF%CVyAkyIZ!sHVN`dsy&
zZ)ohyvc7xZ^($2=hxiX>D>55`*crZPt&jI*J{G<H5_3$7^h^i+z??R*Cv66X8ya7R
zuH2{o(ur~Zrp^bZ_xb;+^U9fTp83EubjrkJ^OtD~4ot><X!&R20UqV`(!BxKtM7Wi
z^SM)p$xrU1(seC0>-OaWizC$%*NBpo#FA92<f2p{#b9J$Xs&Bus%vBsVq|P(YG`F*
pplx7iWnfTo=&3D=hTQy=%(P0}8aU_2HUc#;c)I$ztaD0e0svy&XW9S&

diff --git a/res/img/flags/CN.png b/res/img/flags/CN.png
deleted file mode 100644
index e086855c73199dabddc5994e5858b6151bf5fac0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2215
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
B_ALMa

diff --git a/res/img/flags/CO.png b/res/img/flags/CO.png
deleted file mode 100644
index 65c0aba44747c0db23f89819ba9d09fdcf38a8c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#O=fT^vIyZoR#+(VHnz;`qno
z=UiDGGtN8^TX<GYF)Mq;!IftNIn<{&wKa*gA6xWn+k*WE+Z+}ie7ZnaXxD+09ZI>}
zd;c|5tiP^!|6cX}`CrRVeE#tG+;=|~plv{4p!D@NYobJ3qJ--*_R`+>zxTagUiW44
zwZDx?g(j;)eAZ8_X?C=`|9a(T*2~OEW+G{lT$_1XBijz?I44e9XmC1UMykdcBd~DK
zx9vw>1g<K|tBPSySt2Z+Ej}&o<EzP~mv37<h;-R^Wn)?5`n!ep<=Iuz>^jd~%s>K5
z4=<kkY~9P;N%}i>iBtwWzty_;e(&$dcN;1rdbzi9dr#f-Ys&u(l|QDam!8o4_<v^~
zcP0Pko^P_xOc&qUl2a9vA#S$QWBaD>%Z`^Gm=}`jDVr^REraL0)$L{53lFFHEQ`Hy
z@Z{;t^3z|m_<l?<-5GcsXu;d+wLJYt?6+6wC^?tf9bV|16?pTDl^@5FwS1P>qTxQv
zkhkJ$Rmj+0x*n7SfM9~b{nS;iB{peRpwyvS;u=wsl30>zm0Xkxq!^4049#^7Om&Sc
wLX3>9Obx9}473dltqcq*4n4I+(U6;;l9^VCTLb6(*hY|rp00i_>zopr0QDCKp8x;=

diff --git a/res/img/flags/CR.png b/res/img/flags/CR.png
deleted file mode 100644
index b351c67a5300b25bd6f8f1591539a81d2aa28e61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?>D5T^vIyZoR#2pCOzmas1<R
z-yW_@i&}S`Qsme+JHl1Gy}?4HM0l4(iSSaVbiu-tN*YbGFX=_jX>sZbIOr+z^4cxe
zcUN3>EH8I0kUMF4_jg>SzTk58_WS2c?DKveJbe0Z<$I{Z7(~^qISw1}95%VC*OKHY
zz~Y#2M(+QSH*X#-Dzi;FR8YC|V!_Tuu^j)8MJJ}+`eW3;H9K*7oAnpAY3tO*t1sW;
zHS93o;JjVUPyRw)YvZ2AT8mAa4DVlG*Lr5#5##uxoe8bI_iz69+O1}EJ5a{+$)<YV
z>P!FU-Mg}mbG4olx8ASv&g)vq&nA|6M@%efTel%@_3xzTJAl0Or!%(1eqq~I`2NV{
zU%Se@Q;yxzpMBnL=Nn#~%H5^*^DYAoQ0_DVDhZo;Cwl$f%XysH!C{{+?)R>lTj#s_
zmaZX(e!X{F<5V7IZOQ)!fA(1BRNdN|ko&Ih-hp4y`@<(szNMR3s&djjKVfU|WNu;I
zx6?M<x-=z`|6K6)>+9BSYP2-6^A3NMxPIBHV)pa>`>(I#)PChw_(bWp_Ts*`Qz!kr
z{q59tcI)!`c|e<APl}nSD!#W-_HRYvE5-iH%E`V_MV8aK!y^7XYcKP*_-r(}pH+U+
zwRzz;56GyRe_Hs!`BF)IRqSqMwuf1vMt|}`gl@ifyJZVZ3_$SV{x9an<*kRdXng4f
za#c%QBT7;dOH!?pi&B9UgOP!uxvqh!u8~EEk+GGjp_Pe&wt=CQfkDNgrywH`8glbf
YGSez?Yv7z8+X%AJ)78&qol`;+0Q$^8LjV8(

diff --git a/res/img/flags/CU.png b/res/img/flags/CU.png
deleted file mode 100644
index e7a25c60b38211def9e3b5cc81a8cf6072a73069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3023
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

diff --git a/res/img/flags/CV.png b/res/img/flags/CV.png
deleted file mode 100644
index f249bbaa4609992ad7c713a006c7762376099cb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2695
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
X`Go&}gD9KA5Ey_Bkz`R}<`MT_XL`?l

diff --git a/res/img/flags/CW.png b/res/img/flags/CW.png
deleted file mode 100644
index e02cacd3dd9d242efe2c96433d9caea5da6ecb93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1756
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

diff --git a/res/img/flags/CX.png b/res/img/flags/CX.png
deleted file mode 100644
index 3ea21422f0fb6762dd3e92e1331a617c9543f07c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5152
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
X`~MeEWSA2!1;9OZJ+(3wY~X(Z<<w^(

diff --git a/res/img/flags/CY.png b/res/img/flags/CY.png
deleted file mode 100644
index 3182f48bd25c872547a33d9b02b8c1721c9d4f60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3540
zcmZ{ncQo7W`^P^aAx4aPTJ@;)5VNgK#V%T#qDHM~joPF3NTWQpONkkzw6%j4HA<zZ
zy&k(pP-06|DJ|mX`Tg@dzw<rc_c_=7x~}^^@B3W;z7tH1@4^`WWCQ>Jrl+fIc0q-I
zi;eE$oS*zqcmc4RrjaH9yh~*|b%I>X{Eu|ai~t~97y!_*0Py?b3cUdUK~ey)g#-XZ
z4ghfa<+t2Zxp<&^XmD5if*1Ow_3`Ni82of?o?H<5zqRLid*q^_57aZ#p<jkv<CGQU
zwuqtt0CT6Fwx&hs>@GGUe`u1}v*<}_{xjzLW4lL~tyQ7y;&@SGalL&Dt<5DR-LZmn
z0~6kR<!idlOhvrTS5sCk?_9mT+O*i+B)j(TdGqd>Ep9!PYsBk|K~EoZ59++m4S#ro
znhwE_R4r1eQ@-AND?O=v>ZsG>@Bi17YD;l?=<5HgbbSQDGc!-#bE?W_{PYeEoy2uV
z=U-(89$QIue1kAoCylIq`P%;UoO*U5IZvez{O<e0Zx5hTjMflVm!&<ne9;DBbJ$0}
zD0#Qds}b4@VvdfbeqTO@d}Py+DAgzfdsJ|mMrSbt#Y5Uw^0@5~*|hfrBWBVBiD}^e
z*pC1Rf0ap}KwKb_zNVM9zD}CRuJI&&@aoctq1+^Y2&o8t_}Q;wdUiEoSL~99L>tCz
zLu4hD_2(9cVQAmm4a>ky6r+zlWKpd)Yb}q4d3wc|&QC(nNR(|o9RAAp<=1ycb?V!^
zjD2evBIG=1wOSD+`>el*!njbThEC$wzr50#KXl39nnY?qRKLg{HHt!QPL&aN_4P-G
ze#-07%Q@iTq|Ml1YJW_ob7qZ~o?E@`fKW;!NB%Tibt`g}3svYt8N@yfM`KW({Xbv#
z8z{Gj)*0z?yN?VCC|9aUhLKHbvgZeTke`eiU8sl44gtZaFVNtux@UIDV!?&7nr0&F
zwj=67L4n^?u|jPdp=~@u-qW5_)Tu$Gm&&R?IK*~|u^xQ#8NqN^zD;#e{cdkkk_H0t
zXl=*G8!jK{v3kDo=(sv+9vfUO5hfXxW0j5k#F1P1`ghzLUwlJDQpJzr)Rfr=Ci(@(
zT6-sWIE6g!W`;`NaUJQKXK!z>th#JlGJIl*X!V>mHxbs4h-l~LKK#3$^p*TtbN1fm
z<Yj&mv#wgb!Z#Hb;klZEd+S}~Ui0JZGkXEMbR;|%&Irm<kpXcEU?5kPr+5g`QFt<e
z`9`B6Eo<&e5IRgu3SNKdjq?rNZ5&vn^U6`=x+c{6PhLBJ39w?-t;(OBY^P?K?Gv<i
zCeQ0dZ7;X-$k6dxGblBZ7t=y{R>N6#7xn~a8k$o;gHP!d0O(oC^U^!C@sW)MN0cK?
z-Nvo^+)>bZ*MZOyz_Dc(G7kxq9=DS;P5ZfSo@PX6Pt}u9`y3nR#aL*f4^j?`0SHE-
z>;&Vsa?@8S{)3u;c`fXR)j09c?j@EW&(0<P^R~v1_cd0VphBhcM=XbbpZbLTqn9Zl
z`E8?02)%)8cK{w=tppjmm_rCVPfU>XO<Qr-St^)Z?~i8xYS$<aQ>2#nS(bfj4H>SO
zRr60Z<>aRE@^_(Iqk3qIs}&_W*8WxW`ytx)YBZ&z=01N~>0#fykJF#u5uXUFa<YQB
zJL4=1=}21&VF%5detGzpKWv|^6ElcfQJ)WWd$V3y5+YjqJ~7KNL=H^yUG0jyLtvW+
z(}uj$G>^tj*qKM`TNHC|G#!QeK#mlPe)Nxk=x7_F-F9wMt|0R(pK8pX8w8T$nZFo+
zXUNhOjAE8s6A|n^hm)T3T(P?w^R2^HixA_oZDCK-<2h`E5`f7lp64H)vH1nTY?#vS
z1??7c9iiQQD?m9Znv^DqXRQk3AK9dujM&f*lpw4Uiy+8mkUKwC$VTeXknXfTvecsw
zMkYJiYvG;`#;1(0&};22QC_fm(Oxc5Ki(Oo(@@tzJVCP#GK6e@<1AYR&%JKE%piC3
zxW{6=RmY9WLSNj?=cCGDhl^{q6lUEI=fO4a8bD9wiY-iamZWmK09(vkS`CHok*qQS
zbNIj0!GEAyqU##PMQ3J*U2&Jt2t(-xjUpn1s6DDZB*2bYO8HJh{`{80Y6EfK<{<u-
zg6c0stRxLRjWv_-=|3KrBlLuSo&p@?aV_aJkk7?N=2lF|9A1AGO+U+qV`YcGm+<$G
z<U`qH#H+*<ec8dr;zv<_oTGlqU$G3gRx4=P`a??Cmq>CwAl6(2<5fH1TGKL`my93M
zRh&22a{j4~N82D5_hL!YF{5+Ud^1Qni`k#fU2p7q?L+sngSZL1u!!xJA-1vC;kkE?
zqSXd){w0o1I|&*F8Ln&D`KDhat@&Nb>E6`loQqds!7gNc#A$*+8j1MF#WJ;n2LT0i
z=8IjqS+C?h%AEPr5Ek@yU=EhmfV58JR<4ckr429MU{%=8Xi`7jgWT&@9HzGG#v|-|
z!p@O^X+?LGAjOg9Gi^n31t-%5Oeyoa%0MlaMTkay+;{*@ckwY?WWpv<7T<V_;8)kP
zKx=&mt_oQ$KTHkEV{nR?zJY7KCgbR+9`4QrJ^nE7KfQv?`q<7g&(!M8suU!8NiBs`
zBDP_?K0*{k)(qhKpi&?0q5#YiGab~<T&?ZYL39zXQ`f!#CS{OQP$V6G9LEm0uy(x7
zU!&fA$Ai&AHZ|`kx~(aJhIcK8%jOo1Bt+3p5hB*p9yI3vQ&~86YaX)tvNN~1Tl^4l
z^XxB(T|1_5o+8$Z3O`|D`bLnI!Fz{aZ|a6v0sP6jz>`tcUKJ)XrdC8^;@RFr3;sbM
zcqIN{B;(`lnS5-e$|y@e#Rs+MX+W5i4h)T@4ZObN$JB;l>}u`?AJC5Jt>4-(o^0qu
z+ZZY&Apc^zuhi?r0!*7{awj^LB?Wv9MkEG<8KDj5D_w=_2&*a9yH*BwSJvqceq{uf
z?7t9T%GTpzt;t28u=O`eMjSQ!3j#u?OS;v9d3Pti{W#tx<?l^p*PFq-lTFSHho(f*
z&xWa9ai>#*eYNMy$=}O+N5$T5zV|128<8X&!_x8YSS8QIigxRR_5n36fuU4~+NdoS
zu_*s3)?By9opdJk?5`vF#$ySw$H}M&A>}@E<<b&L{9$gM{+6$2n24^v1&8vQihpYb
zXzO5ZYd0!*@@u{IpYGkpTq;Jh;~|U7-h7uE=H4j`2Y<=}OLTFOA}JGM;*wRZaseM+
zQtRBa=P3PIYd$ad)Eg==O44-?JkE=^TR*mCsHhIF?8UEb!S&o9;NPWJz0VXD({V?L
zi8&-4WID&};D;5{6+AL5e?c=FJxP)aZ#65Q-$0RV%6oVuaVTvwpSbxbB~s*X_nKi3
z>wssOGbd6j3Z;X)I;01*KD`yH&^(s5k1pHf+Nz<%*k9vL)((TipF9a+9bD`7Oymb-
zAJ9tT&cWM<7FXm<BQQ|y(VRj;MDioivS!4b;VT#`8%%h_>xnAO#Os?z$U}4Ww)#MZ
zR@u{-_3+d<LOtP&X2Ph)<0O|<{Igeyn&UBoku(%NPU7`)n-iYWlAA{Y*XFv^D5ucs
z$?AW|uC>1Q0dEU3okqt(6c4Ky8?5Hj?@3;HPrr^)tK$?`c#&^)7`zc~Tl!9t8@gx~
zZqU51L(MlWEohWzdNS`1%6K}r*nj4^kYv)?p=FTU#(rBELW(8FO%!axOuV9dxg`dx
z-$RLcKevYXd}+pd`7g(lxYg*XcietctBdR}xv?(W?U$DibaTD$6ThU76Sw3M=npze
z#`b?M15rW><ss>o*F@`1T&}jE%qB)l1&*wV75O)%`jpQ`?-uZ@stdy9!Mye-rtPKc
z9Xv`wE976rWmxHDTw_ECe|~<!)PC1hs1Xa-{R(!WNs|`~_aWp2Z@H#Px(y#3&vXb3
zlOXmZ=+`fes86ruMlr%F;N)+ruCy#HEKA+?O?75fn0%xY=C9VW$KiP&T*Y&CT^qkL
zlf1jqd*@!MuxodBU`riQr=6RA9)$7)_em$CB-jm<H4HoLt4cLjhr(Fxxv#+7P=hxM
z?!&x%MY<WDcX4eCN1m(1rrd0}87Wr3edxC(J3^rKC5D8Y7{-Uc4sXVCyc)D!4#{Q$
zE%|()RV^Fzd&OzLN#O`#U<kUGxC<!}l;|nVFI6Gw1{W<L7hmqMW8F9ld#b9&$G8P~
zHiN6k(cNSF8<`TELV7ViJX0-hRdTxrRXu78B0Lf6+J{;hZ!q*G!zwLD9ZoZ2AFAuL
z&62wxr<uguB|hQRx+!brl@+RaO=%sPBbmAnkHC6w3+Wjr-iR2+5}#gD?ijB1hP$O?
zkPor~8+lE2a7_D{kYTR$hih9LJGW;X@m;xjl?>^453JHQe0LhOo8?tetA3ml<<<Uv
z7alR{Iv1)(?2zSjv-)s0?XY?Nk6qtgFjdKL*}uL{MN_#YI&4g3EdUfT)1x4DGV_=Q
z9p&{9o?~TLpYRsRYKocRUE=#PDL7N}s{!566g|t?OclSfb=_)FbIdb8sk%1lEU)7~
zqQk#oVj6r-pViE2qTf3ad6977fjZWK&Q5_Yh(`e~7XW0Wq!n*S$={H<Wg#Prke5ct
qNl8daBc!B4J4mYk&*1Ir?Cu)&-wg~n`{)Y;pr>Q3U40w*?0*0a<FqaS

diff --git a/res/img/flags/CZ.png b/res/img/flags/CZ.png
deleted file mode 100644
index 54623346383cc137ed03adcd596ec39e85ca9789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1711
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

diff --git a/res/img/flags/DE.png b/res/img/flags/DE.png
deleted file mode 100644
index 93e269166b550a4a32d7c455171bcbcb0cf33419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#P((T^vIyZoR!_n8g$*(D1Nw
zmQrYmut)kwt-Y=7A2haE`W7)4H^e9}nW?&U!QKZ^9dC-=#gdGzAO6>3Pn7&o_+7IL
zXfO!qU3%KOYE{<d3jLPbMdvJ^Pm#;p|8TFI-Z}XtWpb7JE&CNC3|P3^5)KOJNHnn~
z_kHbbX-;c0b$>tg!f}?_XZD0U$qT=EeYjfni{Zhz9jbg@=Ixwi52jgYJU(|u(@^3Q
zi}QvA4zZrvHr<r>dqueHH)*^7_C6l8?4I?asV-aQ_-^?4?d8>K&n>&^HyIvG%b#8T
zUiIRyw`bIDWPJVea<2;4)-$IsvP^z|_*S*Mh}?R2>70q*fLa5*L;Gs@;m(5CVR`L(
zY3Ry(#hMVGG5o*5sc}$KwW6dW3@D;n;u=wsl30>zm0Xkxq!^4049#^7Om&ScLX3>9
sObx9}473dltqcq*4n4I+(U6;;l9^VCTLb6(*hY|@p00i_>zopr0NTySeE<Le

diff --git a/res/img/flags/DJ.png b/res/img/flags/DJ.png
deleted file mode 100644
index 243bb7390d2f8307ce429ebd259c8f0863563605..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3562
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

diff --git a/res/img/flags/DK.png b/res/img/flags/DK.png
deleted file mode 100644
index fc74cc396ccf091d6e3bd1d66e518426b64ef617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1233
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?=-ux;TbZ+<JREJ|j9+;`qn+
zztwyv>zQs&zH9$%7T>e|)0`6LE-iCy7g<`&{lYBu%tmY0=r*y`O+gyMj`?p~Qy#Rw
zOY4i9a(3ku%VS(yOIh8+U1iT)Ir(A(Z}E+FnX^9ci;IZWJNt3VP091m)hs{Q&3SIS
zf6s?!D(o!+P8^C5LW3(b!%=Ih*V3SCV!J>7cD0e~KmPcY{d0km>P06{-n!*-X!o(u
z*;Q_9*)E&jpIs~N^z^m6wsF9HySjHd{4Zu^Y|3G{@xtaI5A%LjH>TbX#Towj$0dCB
z-nstKRiLT==)CS+rrU3LW<6WF=gR-{yGkEF{`<G}`pYD9Juc<OpFJ$kjD=>L_eiiq
z;XMB3*KV~+`|5`FxiX=vOITODbJ!}!-1_dSvV*2{#AI_n;bkW8E7rfea=S5kfjx8R
z(&Q?pjEz&To&LAyn_<D`4@TD;E%ndU7;Qg&nDfmg&aLuqJn|HG%gwoFeR8M8jl16#
z-JNcpH?44;-oEwhn=OOw?z1dw`!aX^K}!Q`87t;(isgq^e%r8rX~CWkLf0Ez_pi;b
z`ZKBhY<p?j<%GjGjdvanC|dbxZ5J@fu-kE&FwB)nlv<G-F*j<>P4<V&&SuN+V!Zf5
z+5TFY<A=95%%27)ti7CK_x;nWsx?zzpDvnL|L&T;b@Jvi#rG8l{ccCQzBsI$SO2wO
z@1YrwRMMwEF-|mSP;+8gk)ZC+*fr^Bo~{_jrmm?6a@izVpUr&0wtypWlKH!PS3P_m
zx^D9RBKciA$5j8~ww}3BVkZjAmp=9Q%r1~@9nJW!_G^2j+6;|7XG#;2+qcaUm-|w{
zr2C6e?O@!Ad1qwXCY`uHyU%^~@9*mTjqh}<h32u9S%mvCS;*g5^jop?UGJ>#uO3{x
zF<o3wF8)r5%0an;vU{gz_eF%u%g5;LIaiuse0!htuZ0H>OKy3!A&dQY=)0deOisGl
z+1F#(cHgeNdh&j6-^GmYOcU5n@Wk$}tYtn^^CS3ag*;0<XXsiPw%Zd{7wma+KH2cb
zi)BE=8uz_8cp{TO-C()UE~YmQ-!4Be<KUUHSIo1qDp)nte8MwXKL+g;si*H6)$0C9
ze<|?d{lYh;93g8ndTe;Vg+E`g`S9U?d#;`OnfmupPW74h+b-_@7dqQ(w)(*`>-{sV
zHatzcV#BkgxOLv1#x|bMmB*K#`JE=faUroOp?~J>G~pX*`M;xuKF#m@Js*2=1f@-z
zypWVuyF3*{&T*OehgG;TMYg7uLlKz0RZCnWN>UO_QmvAUQh^kMk%6JPu7Rnpkwu7+
vv6ZQzm5G72fuWUwLB*k`wkR5M^HVa@DsgMzoFCf=)WG2B>gTe~DWM4f=#V3h

diff --git a/res/img/flags/DM.png b/res/img/flags/DM.png
deleted file mode 100644
index c3a0e9d102afcb8cfe930bf17f68c7350097040d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2636
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
MX=-ayYvh^qKj3-NhyVZp

diff --git a/res/img/flags/DO.png b/res/img/flags/DO.png
deleted file mode 100644
index 5c4a004fefe1b0e54c1f5a48159f3c9b3cae1d89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1682
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

diff --git a/res/img/flags/DZ.png b/res/img/flags/DZ.png
deleted file mode 100644
index 1589d0cc40c5cff4163d2e8b5dd8eac9d320f904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2506
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

diff --git a/res/img/flags/EC.png b/res/img/flags/EC.png
deleted file mode 100644
index 4c53dead1c596e1f2e427d3bc4db6dc4385a2d45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2818
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
AmH+?%

diff --git a/res/img/flags/EE.png b/res/img/flags/EE.png
deleted file mode 100644
index 3668de791988752671a2c7bca16951df8e0b626f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 641
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#IsYT^vIyZoR#+(Tmwpr1jx$
zso*8tSu>NogSqV*ZY<++scD{4$?E+!=M#_9sy&T2qB0V9rLsjk-q2uaG78%`bLzok
zvrqqtubkG(+@6{q&H}Ur2m%8ClpVBuK8M?Jcfz|<n{-ZZ`f+pR)Ln@-^Uhz-etYZZ
zOh5MKGV62YTe=_SOPrBlGj2QBlW34Eac0Jojdo`aX}rn0e&)jJHM1T)NwB_r?c=@X
zvfn(sPviU^Sy<lq_3`hkw@$lj+uD@aLuJ(2ckkY5V_kbKZ~nrkKaU4H&yjgkTwl7w
z=2G5#MRmUzpn}N@@0^-m_S<Lgk-(}AGkaQsAN}8*S9j<KAJo=K?>8)p|I)p$%r|FA
zy|3;eC7mtVNy?TH<(KA`sNXW(I8kQJtI)lxmd6^~Z@m&^{=_CRdeyhB>ucwH=DQsx
z`_e<b&r&r{TR*Nw=Cf=XPqXCVgkuIX40%Az$u`%j-|zi?%ajokE*iht79I_3d$%j$
z8BjpA#5JNMC9x#cD!C{XNHG{07@F%EnCco?gcuoHnHpM|7-$<9S{WEr9C~Vtq9Hdw
ZB{QuOw+7Dnv5g=rJzf1=);T3K0RRam_f`M^

diff --git a/res/img/flags/EG.png b/res/img/flags/EG.png
deleted file mode 100644
index 66ec709df74e3dde4eea8ea38a069cd20a56c075..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1611
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

diff --git a/res/img/flags/EH.png b/res/img/flags/EH.png
deleted file mode 100644
index 148be93c083da57f183e96c9c3b8c4cd45e0036f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2687
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
K#&t&SiT?(F(%^>x

diff --git a/res/img/flags/ER.png b/res/img/flags/ER.png
deleted file mode 100644
index 7cb8441514c3969a8a05c6a861d82f873e9e8881..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4082
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

diff --git a/res/img/flags/ES.png b/res/img/flags/ES.png
deleted file mode 100644
index aae73b6fcb4c5769721d662de473394c070ed761..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2144
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
Dr7z{v

diff --git a/res/img/flags/ET.png b/res/img/flags/ET.png
deleted file mode 100644
index 7b420f02f4d484ee0d02a55cce74514986675130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3460
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
GhW`gZd~C}A

diff --git a/res/img/flags/FI.png b/res/img/flags/FI.png
deleted file mode 100644
index 42f64bf3601805e13ea4a08de797a20789f0853e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1558
zcmZ{kdsqv47{`BGTeYR-B!#J_>x#0i`zR}|t*c>`VM<Dpv2>f9SeGTv#=0oc4N+)Q
zB9|N`GF_~T(a33(F0-i6DULXEp68tNIL~w5=Y8MLdwITpzVBgL5JeZc2nhht^`&~R
zQ`7l-%+*xq7f<R-)qq8N26_TedrarcR=B#yY@@CV1R%u<0B$A#pVcGoC;*8#0N#WH
zKs*6}5xe--+Lh{sW`sY*TTQinTHSC^4FsFYh*vZGub7DS>Qon63BG}3tyl2HMh;js
zJ#`!aINaCUlg@emwl8)UoovuF`R!(dzv<PXZriK#m2H<u0zD|z8&{v64bibdoblva
znN=amp?G0cEs5muleP~OLau`Cn@J~e;Msz^;TCol?*#evJ1_7;{7sV|=rQFirE~Bt
z*6tET;r5i|XlY4aQE}1L@C8|0|8=I<#;;~`wP8?*sDX$(>(;0kpZ<e<JI6zq^WC~9
zHC7xBB1zIKpAQzICtCTllOw}T?fVs5YGds<V;+(eF*I5jA9xO+P_`daRn{u}zWK6Q
zC&kmiEXq<zDvkpye)A#j-R(}&n%;(oFowOk8<cPP%SUnPyKmBZR$u+S{>Dohgs;YV
zxI#Q4e&G)&${xYFZ`|{;^r$IK&}*53;b6i5Q#}6IA5hP^&?xRfXk*8&1uF}uEFp3d
zM4>UBt5a^$jh+I+?m5=Rk&X;~-t?#=JYa}kwGh8`9aaacoS97JoU&7ywDhw|6_AHR
zP+X?<sE&4vC`l+~T0lodpDi}bt6toSa{ql<-O<)pHJwIYj{RpJ%jNRZ+wW(>-}o)3
zi&Qg{B~v@EoP@T9S(h9ugGAYc*2NOi{9<n>0*-GZ#jw1nr6Yv6K~h-^sS$6=D^Kbc
zxGW0sVg$7)PukGXn?j%0AR~`(qO>M3tCfo54hN!P1NTOj3@`_TWzp09Ta0+xwl^Or
zFqa?J5s<}ZPQgt0P;!B)mwSgGIK=f6ukUM{o~QJkLwgispH|_UJEqy`yCy^4<d&MV
z7o%xvLK5~Vdfe>=FBnr^0W03=qswBbY<r41OqroYDtr%rSvZx8tnfE6g@)enn@?gl
zZ@P%GBJd7JrrQUvn6lWh`1Op80ra!sq;6wzjRqa>D&wEPA*%;-4S8TO>U7$c2nQgi
z5cYEezqG|P&D-o5l!>@LF#xfh5vWM#J4O)U*OukqB^m3wz8nsI(p)~_^Ez{=mY*J^
zyX>fmcaSU)Y5cQEh7q>;JoJQA-(y_HSwZ3c)}ib4$gLylxm>^1dO6a(f3xSWRE(xv
zf;f^EIJRS?Ku-6@?(PDS1pe2iorbxqlV9kcirMB*pO+Zpm}Q_4of%vMo-OT!DEIEE
z8O5^dMrn=%z~-Yl0^5UjLk9GElt2<1&z!Abk`GOnUw+_#K|<&eTJ4`JEgKk&urBEp
zkHfCz>4OGo6^x?2RTrwSJ3oHg_PM~!YAixp+S99-^o4sJCEb=QmFV#v<u!i%hSMv!
z@<wtQ#f{$BQ*cA)<*v{=S-|eTMWRn3H~G+O!<SuDg?FoDht_L}GiOir3QA^I${su|
zxsk~3Kcdo;=0A~y@{EhktvXEeoX<=TU|}`+?RU#)unVoN6#Y9Iw41hia<ipa&7@2b
ze?r8<$1l*TUR!rO{l>9~_@AE%iAyYn?5iys^b+2`_DK`4LZ6*Zsto(;eBRaaqV>$3
z$>B{cv{lt{;&>N!)^rir9D&}`onLW4l)&b#s?ro14cXAFWv)zAz>bu$*Ow$yd6@Bs
zY*Yr{sjxBmzF$7~ewN^I*nymDAivfy`!uCSUd6hW(e*aY(y0k*h_|Z#R!0c4&oF4C
ziUBV&v9diZ9`&CS{`;UmjQiNfeOLp#MMT}h&H2X%52{QJ#%jBoN5~u1KhiRRydfcS
zYeE!p+ukTO00D=0vBNpp5nSm62ci?6=!jd2!xM2hPV<oa4+7Sn$e8W>{$GG7W2UJE
Nz?U54E%pje{}YU1q4EF#

diff --git a/res/img/flags/FJ.png b/res/img/flags/FJ.png
deleted file mode 100644
index cecc683c9cc928b682c3b48a6534fe2d6c595384..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5060
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
bxjQ~`_W%C_&}>`$WdNX~WvE$p8yo&VabZPD

diff --git a/res/img/flags/FK.png b/res/img/flags/FK.png
deleted file mode 100644
index 6074fea09c8d84381552b99f71aded7cca8cbbc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5273
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

diff --git a/res/img/flags/FM.png b/res/img/flags/FM.png
deleted file mode 100644
index 45fdb664260eb2fc718d5d8975a25b2a3c542e05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2410
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

diff --git a/res/img/flags/FO.png b/res/img/flags/FO.png
deleted file mode 100644
index d8fd75c63895c5925d6fd6140cc492b8bdfd4b5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1715
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

diff --git a/res/img/flags/FR.png b/res/img/flags/FR.png
deleted file mode 100644
index 6d50a0f544ad14e2da315e53fdeb187d3c8781c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LMOT^vIyZoR#|-pj>NqU~e(
zkyycIoumjJqZ@lTPbZm3x(Xc8kUp~I;_VH3aR)V<eDxD&``p>EXouPVTDHYHQZ_R2
zHFc$JGZW|i@dVlc1P;oV%B8(Dmrm(eCjaaHlR3rbUV6{}IbZ(5>(J0zexKQzOB+QN
zPw(B%z4CIrr2ab3?XSbltILCy@87d!gX&QYr}X*1O@Fj@t7om&&I~;-<y~ldx87>1
z9RK$I^719$C;$H39<C|7RWF)7$Y+u4-CzF_t=6u3Sn%yvOl|mLJ{DtV17nJb9_hb<
zn~(KE{L|1@!=M~z<LK(;eF!L`TH+c}l9E`GYL#4+3Zxi}3=GY64NP^7EJBQotxOHA
pOboOQ46O_dDh@rhMbVI(pOTqYiCY8b{Mbg2ou00KF6*2UngGqWv!4I}

diff --git a/res/img/flags/GA.png b/res/img/flags/GA.png
deleted file mode 100644
index 3808a61f1de6df211da34b29eff84ce0c5f31f9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 661
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LeTT^vIyZoR#|*NfRvr0wD6
zY^R`(`Wul)RF636zFiaa!jvO(?GZnLHBNd;8Hvf+ig67B-65K5bX*R4Ubqs)(kT>~
zf6$VV-~Hb5|2Hgabc_#gQUclp1Pz@kW&%zeicfZaJ@mg@=kz8W@4CCrj{g_<Ex)=+
z?)rLxS6|bN?WRZR%M@yyk>o0FJ2YpZK{}B6b)((NliOmV^zU09-53`e@ox(MB<|Op
zv8ywkUL6t(@9tf%{d#8X>yu$M9<etbpM7>N_j*;@ez#L|c5Qf?weaIf>1AfGUKhPO
zq{jbKA(j8K_UT<RM~_>mMpX)46gg%KwJPv^V$j5GU)D^29}({7^6_q5?2R+oQNQkO
zn0IUAzK%P`k6&rsd%t&e@%d}P*4s?9KMBeQi*GBh+gld3ZQiZ*n;-w(ulwe0LCoCe
zytB_a)wsk)6q@V$-Z=ba*QC=1cFX?n37S}TNV8CieUp&<Be`cht(MM-=K^LJi-4Gi
z-@6@4syAnXgj3HShU#nHq5ss@$N>dZOI#yLQW8s2t&)pUffR$0fuXssfvK*MMTn8H
tm8qeXiGj9(p_PF_#i6IRC>nC}Q!>*kackh5AKM7B($m$?Wt~$(69D_309*h7

diff --git a/res/img/flags/GB.png b/res/img/flags/GB.png
deleted file mode 100644
index 589be70063cdc5e26fcb78a79e4d038a2232c438..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6309
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
bovrL`y#Id#VU|hItpQM0P?P^AYmWIJ0VKIQ

diff --git a/res/img/flags/GD.png b/res/img/flags/GD.png
deleted file mode 100644
index babe1e4cc652b87d626e0f87d97168db415f8092..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5753
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
HFu4B$i?Dbi

diff --git a/res/img/flags/GE.png b/res/img/flags/GE.png
deleted file mode 100644
index d34cddeca9bd426d66b487a49107209834aed3bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2583
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
Z@Y>D)FW8swb%!ee))w~WRc4rke*t&vtPlVI

diff --git a/res/img/flags/GF.png b/res/img/flags/GF.png
deleted file mode 100644
index 98828a5906186b635ef6cbf154eb1fc0b6d380e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2342
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

diff --git a/res/img/flags/GG.png b/res/img/flags/GG.png
deleted file mode 100644
index aec8969b28a0153043202d5fb2f85cdac0871725..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2777
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

diff --git a/res/img/flags/GH.png b/res/img/flags/GH.png
deleted file mode 100644
index 70b1a623de2e43e6e7c846d8d4dd0ba76c4100db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1864
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
O0N7eOS~Qqp(*F&Sc2V^J

diff --git a/res/img/flags/GI.png b/res/img/flags/GI.png
deleted file mode 100644
index 9aa58327e359b86469c294a44fbb2db4be5b47fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2750
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
E0Kp*!tpET3

diff --git a/res/img/flags/GL.png b/res/img/flags/GL.png
deleted file mode 100644
index cf1645c2b5d42ddce6f72ccf173e4f989c8f00bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3101
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
CSHuMX

diff --git a/res/img/flags/GM.png b/res/img/flags/GM.png
deleted file mode 100644
index ec374fb3c3347398bc3ed3713ded2b8f18095d56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#O#Bx;TbZ+<JT4(ED(JNZZ5N
z$CS7hy$w64*v+B0blqDe57&T=&3r*CSjFodj*G2re(>bMlUECxf_9e{3ae}H(t6gl
zVnM<MN0-dU{1amOn`QFfeP5$KrMP0cL#F`HMhMVZGhePC_IhdT{pWF4O!^*M^d;B6
zzU=sy@x1raO_A@659y0#n@RURsBEcr{2|M7nWrg}?Vw3>!YoIFvlHT9A6+nY!>%3I
zO%F`2^5Nh1rSQYg6ScjJ)2=2LZ79>+Cl>!?-!Tr+s}p2$QX;PPuiu%^X|I{D^}Wl|
zGD7!$#D3kv`NDN4UrpE`T3obY=G&XQ=cd0aK6HL<T*uFO4}fa&t@hotJzCo*`00^N
zg$LiYU0FwOt-iCJ;qTUaLenye*K<EfDBE8vdGkTsb%DzVm5Vk^57z%|cCeOnLi5$)
z-7hUq?$w*n?E9{NJ<pRJ*Lm$Vm(~QFIeG9{*VCwH6MoP6a9c}!a`obaK)bIW`rUN>
zIMAYVA<jh`G7i4$nOAT>sX_Vc44E_jKUnWCv*WF2{cn*C_qxK2GyxyuA9r5N=lXSr
z0~VMKC&i`WBI>l7ym^5_swJ)wB`Jv|saDBFsX&Us$iUEC*T7WQ$RfnZ*viz<%EUn1
mz|hLTpyJR|TNDks`6-!cmAEx<&W~*bS?cNP=d#Wzp$P!a#2OX=

diff --git a/res/img/flags/GN.png b/res/img/flags/GN.png
deleted file mode 100644
index 46874b4d985d0b62ccae3dadde4eb47aec14a8a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#QU}T^vIyZoR#2=*8?P(e^OE
zq%*YZi&?P7O6HeA5geMAmQHZ!+OpI2-6W?yP3#`R{R&2M2i`Qjoz=6nm8EsV8u@+x
z*7nBsd%k)A%?APp?L+>|noFkyoy*n#b^nM&a?iu)`H!}Xhg?lCkTc(&Afc71{`Bv0
zx8j$3-spagdNut!|NH4df#0UJZ=Le}tJ)b=Ugt~izLbC7ELW;7`q#i(XUX>IRn>-5
z*X7UOWv;xkYVG#9D@E2F($U}dZ1$u}DVw5X?d`MQWtuc5q;aIRQB1sdtG}}Gy&Kdo
z-gb;vU)np?H9vd~6j3d4jVMV;EJ?LWE=mPb3`Pcq=DG%^x<(cuM#fgAhE^s9+6IPJ
j1_l*}p4y^l$jwj5OsmALfpdOrBgjrqS3j3^P6<r_Y?#2W

diff --git a/res/img/flags/GP.png b/res/img/flags/GP.png
deleted file mode 100644
index 81b7abdf0e9dd624dab17a10882d8adf9a96275f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5619
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
Z(LUh+4-n;9p#KE`Ep>ghY87Po{{YiCnsopG

diff --git a/res/img/flags/GQ.png b/res/img/flags/GQ.png
deleted file mode 100644
index 7fd1015e8beb63cad1471ead7f66ad5fb9083587..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3090
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
E1I);q$p8QV

diff --git a/res/img/flags/GR.png b/res/img/flags/GR.png
deleted file mode 100644
index 101de51eab15c4ccd2e5ee3d0a50bc31aabf6858..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2035
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

diff --git a/res/img/flags/GS.png b/res/img/flags/GS.png
deleted file mode 100644
index 772c2cbe6d36fc20a183db04db875da431395807..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5684
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
Z>h$FQ4^U@X<NpQ#T`fb+(mR;Q{{bX2naThF

diff --git a/res/img/flags/GT.png b/res/img/flags/GT.png
deleted file mode 100644
index d5bd8c1e46a9176733ee1fa2c649309f2ab060af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1830
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
a_ymxn{=Y%0l$a<o061G`Y`u+V(tiQ%>sCJi

diff --git a/res/img/flags/GU.png b/res/img/flags/GU.png
deleted file mode 100644
index 8923085d5a0db8a2be8b54506ef3f20c70d55380..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2591
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
RTM{Dxm>F5)UKrq${{@I~p-}(;

diff --git a/res/img/flags/GW.png b/res/img/flags/GW.png
deleted file mode 100644
index 20c268ce0697234b88e1223c3254d0a5b635c356..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1608
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
W`2P#^uk1ge6##!f8oAb&!TTH9JHzw<

diff --git a/res/img/flags/GY.png b/res/img/flags/GY.png
deleted file mode 100644
index 86f56635ef1e9560c5adc6bce96143d772f63ead..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5108
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

diff --git a/res/img/flags/HK.png b/res/img/flags/HK.png
deleted file mode 100644
index 907dc596240a017725b9a8da9f698d8e3892f1c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3001
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
T){LvvBLiThZ?0FQOQih^Yq)J7

diff --git a/res/img/flags/HM.png b/res/img/flags/HM.png
deleted file mode 100644
index 8d1e143791ff36a8e5bcd8b6c36d875b747d2292..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5229
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

diff --git a/res/img/flags/HN.png b/res/img/flags/HN.png
deleted file mode 100644
index 4cf8c3112c5992d0e50b3c41c82adea4ab294d10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1644
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
ajEp^*{_g_C%46qc0)Rv~gn#Tt$^IL{@9K&G

diff --git a/res/img/flags/HR.png b/res/img/flags/HR.png
deleted file mode 100644
index 413ceb1586820b1b4aa269c906a88d3aa5ef5887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2420
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
E29JSs1poj5

diff --git a/res/img/flags/HT.png b/res/img/flags/HT.png
deleted file mode 100644
index 097abeb434461bc2b49bcf88fad320cb147bded1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1944
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

diff --git a/res/img/flags/HU.png b/res/img/flags/HU.png
deleted file mode 100644
index 23499bf63cc9e96bd7e8f87f2d55aea489537046..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 677
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#OE`x;TbZ+<JS<*86aP$gz)?
zH5Q3_ztqx_{KN4`<&jE|xMP84Nuhv!gHp$A4p)KF7YclLwfOuNt?uY<wy-GiE-4W7
zdi#Jo<JF}-FSa%}%jo^77dWAKnwekadz=yz&`vNYS$atN{AZi<*;}_TKP+GOde^$y
zUZwwQ0@gqOd~{KnO-s?v%a^@W=gGcx_#w@;nWr_f?T}8gj@6NgTfSr-cT#stT)C?F
zZ4Qu`;`wg!;=min{}eB*Ts~KbbGDHnzgyzs*5>xNtZ#cbOwYMKF`U<XXw%l0r&r3o
zoxx#RbN{>W=AAEQ{H)<r+nTHtBsTGgXM5z0$naY`FZgwK+~0TWMmyNHJwnYp7f7zj
z0NUa1GVSq2jWd>oMt+{ws!IE=OulchctiK%+h145y`93*+mkNNp8YXLWSdp=x%@X-
z$6Z$Z+M?Fpc~e8D`0{@9377jiPfVz>zG*5hyEMVV;+kLQiG3YCM;GrbteaY1dD*Yi
z4`QWr;<SYZr$0PjuX@P7ek&-lz~J9O@!;=)iKaU@PY3c<OI#yLQW8s2t&)pUffR$0
zfuXssfvK*MMTn8Hm8qeXiGj9(p_PF_#i6IRC>nC}Q!>*kackh5AKM7B(bLt>Wt~$(
F69ABn1xo+`

diff --git a/res/img/flags/ID.png b/res/img/flags/ID.png
deleted file mode 100644
index 80200657c63a59c61de32747f4e75322f9e3eb9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#NK_T^vIyZoR#+(Tmwppy6TU
z;<XYgjHh*TbecITn;hg6{gaZ@AFlqvBIGguU6x=9`x}wTS30Zg8s6*_GxGWN|CVK+
z?7wGuu0Yd4K=|Qy_8>3KrQ5dJW#lIH7#{nu_<Z6^?rX0vW*BXZOaA}$x3BU1=g--%
zu^+iFa7MDp(%B%L;~CGvIf^rkS&G{d&VdDkYo<#aOO&u%+aKL{{9R$;hV|RuCY5LI
z^<};Hba8f!%$pZk1+`WAK)&3Quy>yxKS~fcKbupSxA*M7>WRH;tezb`Shacb%a4=4
zT8UohU1wsi$ESAsTWHm_+aV8pT;_d#{3+qFfyh3g|MR=Lo*n<wj@=btr}=!0U9@V|
zs;`BN5D!ZHWIM6Q=(fnqHJm^J)e_f;l9a@fRIB8oR3OD*WMF8nYhbEtWD#OyY-MU_
qWn!RhU}$AvP;uy~EsBQR{FKbJO57Sa=f^gJtn_sCb6Mw<&;$T8M$}XQ

diff --git a/res/img/flags/IE.png b/res/img/flags/IE.png
deleted file mode 100644
index 63f22201180b591337519b9b7b1e80ea02c3867e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#JlyT^vIyZoR#=*NfRvqV=Ki
zZZ0R6-Am@3)84?lWV3*D{i={dPF#wmdWWMtCp!IknZrD-$=on=E035`j#;Qj;;9{{
z8^5nin~`MqEZ3b0Xa^Xa<y!6PrMWaD)R({IY*LTmF@dswaz4wO9c!DPOn#%bd-AD&
z=Rf}O-Sxx9%EEH$yjy#(UtAb+FI>MnT5~^FdZc1z{O((~UvcdJHEqeNXgjZ<iu3DL
zUnbW4RP~g9eqPoyi}!P<imp}a{(awPp6yav`qggr`>Y)1gJ%TJ@Q_1%_<a4ytLOQb
zK>-E^{|*W*FEcfNds}Z2kgr<e8c~vxSdwa$T$Bo=7>o=I&2<e-b&V`SjEt>J4XsQJ
nv<(cc3=Ap`J+(#Akei>9nO2Eg1LyqMMv#r3u6{1-oD!M<!|BGq

diff --git a/res/img/flags/IL.png b/res/img/flags/IL.png
deleted file mode 100644
index 0268826321fe702ea764711db92827825ab531f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
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

diff --git a/res/img/flags/IM.png b/res/img/flags/IM.png
deleted file mode 100644
index c777acc490b3bf406825f9ff14762c9c0d20e113..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2533
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
L*_oCbyT|<pbpCy+

diff --git a/res/img/flags/IN.png b/res/img/flags/IN.png
deleted file mode 100644
index 85fa9bfe7296728a6995572f63eb316c1711a4b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1687
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
AHUIzs

diff --git a/res/img/flags/IO.png b/res/img/flags/IO.png
deleted file mode 100644
index 1675d8e7dbe93d314073ed5a52598454712b2c39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8096
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
Bq{{#R

diff --git a/res/img/flags/IQ.png b/res/img/flags/IQ.png
deleted file mode 100644
index f2c21f7260a8c9b4b132981371f647e949bf9a1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2119
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
W`TrXvD}7P~1^{h)(x$~4oB9t(2<dVF

diff --git a/res/img/flags/IR.png b/res/img/flags/IR.png
deleted file mode 100644
index 0b8e67506c291fc36174ff24c88a03f93c3857ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4018
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
Zdbx-H{|4$phZwQ}(9<&3tWn3r{ukaKYK{N^

diff --git a/res/img/flags/IS.png b/res/img/flags/IS.png
deleted file mode 100644
index 5ee3e63c5c2b060713eab402c4f7204d1932c6e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1483
zcmZ{kcUaSB5XXOvK#3v{R3Icm<zZL?CIkpZNJH32Qb0r?AWOiCgcbHM6aiUk9E=BK
zC?JSz!wMRPfK_D37LZL;_7DiOY5!^aJnj43-RIuB=lk4Wck$*VBVjNU3;=+ziLt&V
zmzsaNr~o&P_E%?d!SA6<)CGWwyGQn%LEOKrtFa{!074Z2fOZQ2cDN<l7XS!A0>C#X
z0KldJfP_zGy@fWnA>eYsNS{mY<LEJOav|hnZ0paZ(_g;gN$BDxf>aZtf#4(vCV^Ix
zwu)Hh4y`xQ*R=}%v^a9ptS<o8zRG5YvEi};b^>X?lY9?sW=T-#+KJJ=x9+E<9-Q3k
z*+ZpD>JNk4htwT967o4={U3!D>#rluJ4kmDGf5?_-J;VwMW@q6r{IGTtn354VqNvp
z{Fv_eX2@R9$nNX$EnM01*85%DI8VY8rN2!Lp<f$=%kE;Yo17aJK6I?JS518{f1n}4
z<nT#IguS9;3ONj3I><158QlbVn~@sf(jZ_YvK;Jdam3!1nHxCWyTaV!>q^0j7C&C>
zyg0FaZ7!<=k=93T96?GwKSuclS0|&1h-7W(gNOXv@)Y`X3vIpCvtW1fG41T)vaT*n
z1*K)I+~p3q!^O(!<Wt@%$rEX<g^dV9kUQ!pWFl(6Ww^RM@CsR)6Yn*`piaihR&%Cw
z%Hcf<3H7=l5^M<Y9i*5+;<c8-`y$1>6Q+S`N{RRl@{MP2p!Z5L2TvYtzyFy}{O3%f
zU_mOiY}GNT!3ge^tSOUIQ^4X4wcHKl7hKv>1v>rds(8h)m8}_`*HfFE-pRRx#@TKQ
z+I;>&YVOSf6|ynSoFNv2bL|wQ#yL{3<?IyITJ3z5H5`NXLjvTBzaWG#B3tFW_O>T_
zc~r$O-3(;fYDO0tTJ;ls`2psFFh`khZg-y9U0SB?ZFsbk4yEqv#FOEm9A<Kv+wmP3
z<P1t{Zt=r-uHW}wB8zhUL8V5JeOs-GWmeeWtZzu(9;$5n@zh{!>0KK%vxu^DY`4gR
z!O|XCs5#K(^-TguA59f+qr(yFjgdc67*(*nM6$gK8h`%Op+UIZ#DKeJRW7Sx+Q&%T
zzTP^da7_=X8F#9O*%)jV*@AVVE6Iv)>uri9H9e9JC^Nqz6Uq2GsEi5o-<n%WbYb0(
zDpsaTX@kSh_Rd7hu4N{78j9}RZWfEdV}#X#`R}tken@Nn6i^E9Dk4vGrME>G@08OX
znf_GXxvxUvj*8IX_XOy?O527U%9o()Hp#ZoS|7Xnrhs`Welw-UPLtq62_uCaD>p43
zc;2KL)G>)7`i$#Uz4JIhKBQl>fA&BgrBx2ay2#Dx8TC|R-Zd!7v4EGfU~*;*E+}Vd
zz=q|&VOMyrVl6K7bhkgB!+seb(;%)EoLBzHOVmyh#$o56YG3zf3}}LJCWn;^&BgZ?
zOw0lvjzQ-~TzzH@ZN2&v-W4gdh4w~iEKtlmGa$*<8gbS<3yZIY%UWjp6n7L}L_@6!
zV&$d_kju0Sm9|+t1pArel5P#u`Lo`b#;>zp7fOlz-s?@zI(3e&-~*e38q>`gD4haN
z_zA`(<+M-m$bFp~MESus5B<-Di<m|7WUNz6iD@7H<0HC1EFc<OKyR|i*<X&P+jPLx
zXk7w0#pA8{!#eo&FR|Nl6WSRMWiY~olF*VQLbl#S2r14nT!egaN8L4I#=(?DO+@4n
zYTiS-*-~&nS*QrG&)-vr-W(rjNp5Png}OqyR|RZX%7Hd6g{Hg!y|P_SGR#J?(U(ix
zLK7{bY?J<L`@W4QAILRF$Q1nJUOZ81nK|q5S&0u0QugK^HhHRn4fU!s)eY<F=f(w~
zhD2dhkQyp#T2^XktOg3Jj#NgXut;QZ^Q_Ll1YX`(e{~P}e}Pc8Lljp4m>7`sO9@WD
F{Q>ydrD*^F

diff --git a/res/img/flags/IT.png b/res/img/flags/IT.png
deleted file mode 100644
index 53b967be99fa1f77a52054fd8a297ab86c5b0f06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#OuZT^vIyZoR#2=*8?P(e^OE
z>7YWBPSUTJDqDNaH*EUA&=j#`(_OC)v3UoN9dqJ{@GN5PR`}*EH8V^^WQ(9l5Br1#
zt*3uI{Jq8ajQyGDeiooDKwzR&vt4oNl%P{PUv~d9H#{bh{Nqyk!{_WhZhz})#d-D`
za0F|HZ@%1Ly;5WPw=lV-yRY6|{JD0ehWP2H-kRZ7*LI0iNoD-vZdQM_LOU}!ziL97
zxPJTk+d-w9wr(s|+k4+8*8aZN+O6M0e><F-eCOodU-uSj9DDq*;9u41eHT|SA3P&)
zhKFL}e(%2(mG^rgK5A&IVcL~#?YL!q)=Z#?YKdz^NlIc#s#S7PDv)9@GB7mPH89mR
yvIsFUwlX!eGBMCLFtjo-s5tc07DYpDeoAIqC2kFz^J5!9c6z${xvX<aXaWG@rqrJR

diff --git a/res/img/flags/JE.png b/res/img/flags/JE.png
deleted file mode 100644
index a1437aba781a0a5b82a08d70cabbcef0a6c601f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3023
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

diff --git a/res/img/flags/JM.png b/res/img/flags/JM.png
deleted file mode 100644
index 0d462fa3aea6ec7762e44f353a685738f32eea2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3663
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

diff --git a/res/img/flags/JO.png b/res/img/flags/JO.png
deleted file mode 100644
index 8934db7ecafe170f9a832b2b291c3542eb66d666..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2572
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

diff --git a/res/img/flags/JP.png b/res/img/flags/JP.png
deleted file mode 100644
index 6f92d5236561007f7d1049be4c1e45b1dceab05c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2402
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

diff --git a/res/img/flags/KE.png b/res/img/flags/KE.png
deleted file mode 100644
index 866b3f15dca94751d3d609ff117f28bb0e32fe61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2738
zcmZ{mXH?V48pi(+kWMH<D3P)v(g|Io1Sv{e1nE&qs2X~25lN6LQmzuE1d%l=(ghaj
z1`8scAiWbIQq%-Q0ztTOzumLvKF@jQH}lRs-{#DjOuNhG0=!bZ000PBTA10hsQ<f!
zj<Lqsv8G2Xa9lUGF$RE_xqJs+oUFB+kA=Mr03;{^05$~x_E|0L7XXNc0l+#60N@1x
z00|?sUOCU&IOc6_ZpI=@d!}tkEbxR`AR}2s{Zq6+lOfiGE6UR5BG(cp6r!Uf?U?wT
zb*#+N%-At*`fG8bos*vwDTzAE=Z4@DVCz81v0u5joU&klbv0n7waB58b3CI(_fFua
zj7H3_s=|7=YdSWs>XB%xDgWRI9|FQ|TrY+W;?%Tr109ziWi*H3FhgxggxgA~-e-61
zF}HMR{g_A8^FvJ9>@KbSdm$hEUy?CyeSjPAZ<q=)iA(tFDAerYZ&@x>=F<0}aqw(U
z#5(($yCx<f89rftq+Y-y`s`bou9eiOY<BTFEa$^1Nf@eG@U`Jry(F>)ny6d9%lMUg
zcn!uS2qlHYG)TX@67C4){3BCAq(`whh?L3)0YpTE?%w6!R3Om$y509Rm^I9F?ff#i
zoJ^l(*VuMzdQynnR8;eo)&H1#?4B{nwEH7pw(dUn9~Rt~%6-<X{b8oudCSBz@<gj(
z!sOe|^wNxq-=3$mSs#8@9CF~)AxhZuE6-6JT`E+^PMHlB5VX$vwAM<eOLt_?o6wwd
znbH_WqC-RO*yi6GXIG(-ImnDp`@cO;*?pM2(_)=3LgY|h`tab_zOcTR=)-91_`=_|
z!!$QNZUT6%_%=CXl-i$!p_VQzhR-jZi0k=qJn&9xRqeAhTY+=|tx^K>GjucljaRg5
zSEkND;W1I8;u|G5Qmc57ruAvqvor0z?dweXT*<C&w@>an58_HpAG8lDKd4qaSTVTX
ziHI*#u?`e*QLH(>JoCnIO9q)i*2(M>eaNS^x2F1wfV3|`mMEwAHTre>byBz2?->N8
z&K;mo_9*fW<iMPgDtt1}TBGIhrh}jgm)G`#Y@9S`sdM7n_x9JK{xt<rzGUGz;tq=3
zrI6=9F?bgWti)M_S-^TuE{}hxPXEEU=VIl7BSqg=QFOw79hh#NhELv{>F&<X7Rsj@
zy-(up0rx0J@WOKA`$6#V<tU%|iN`~nm6m9g5S188f9p?1;dEVr7eC0QlT6gb{ZjQ3
zI@Tj29U!P@8rd9h`cT-LR}1G-7v2_rE@NB1Tj=Dhw)t3XU8-V=;)NfE9|b-N*x|!Q
z!bX5JbVMGM!~3;(EW0O-b8%JY(KZ2*xF7X>9|76)9@)olxU|M@0gQ5{yq4{sqNAiQ
zp#(I6XJ9Qy+g!5IbvtV-3%l}8gpZu1u_S`UNd;VpXjXX0ao2Hfs&cDuyRQuWaeDCY
z5;?&_??1H`3DjBYEEoBTvS%+>C(Z7f5$5o(y{rV6-4@hoMa1r#NX<Aow&15N_g<oK
zY!093o=4UaUP1^rxO@q=@cGzAPV@fkzMGIJfo%{7JFeG0L(||$e7bG~A16<fdB2w;
z4TE-IamyY%`>8GxeXg)Lbhu$uLJ>(orC^Ak;!E)b`wmy}t{6tY-RKZVI#{w0(hm}9
zGDX`-EgBSau-B=I)jGHH3Rbu{)&fi$u^E*n+=RrKZFt%zIXzO#)3l|urMfuPD`q$}
zBxY02sH!A|BSCHgF-%R)RH3p_*}(lY0jHiACw+Bizw9P$_|KQA>cf&%IWw!y1*-kD
zf$@%wpEb9ePKjxWX_1_Hl~dNK`Rcvm<w?#j997EJ^i^JPv{>{xT+1Y4<Xo@?m6goz
zBl&5QH8ze+&@@+IM2bqW5q{${{Kgo3lJuT#OgGM}i={q4XOxO<WISMq-zX`cn&`W}
z(tz4^{!o3Z=!jo^Ui#4>WBms+c?V9Z(I8{@)i&Y7(IX~&!(9_M1(X`e3GWjtI%eN4
z41Lb_e63kPtX8{t4SjfB4_VPm!r;4lQMAz}=s>8eSS7n3_$f=qeG64(<94)j<x}aZ
zrup)VwO^|buIe4t2GYexYS)+}j*aO>IZ&r4y%PooFKo=;9a`I%r`==okj9@s1)dbf
z$p2(dQ7~j|-PSZ6_3W+htMBTo%(s_|s3yo?$L`v<m}%f17Y2;d-M2KW)^03N%bq={
ztS)`pn{(Q!Fv<$Q6l)!84eENK$9G77Dfv<o6>(|$<k!Uoi8h%2iL0;G<~&<vFO`ZZ
zdjp^FXH`q^!}PrAs52hU-wlojgd6T;++18=M?iwimWsgRei$Vlo_DbEtm~vNs^(JK
zOH-H`(22^$jea9Y=z&ntonrK{V~zYpB5-M<KBc&u+7&hPctNli8!77Oa^IX23T8m~
zZIDfiV14d8KhWApx#eX0uhSf4;|Suz#%39%qK!*pYG?Lx8zLUXCb2VaXy+mUaxCdG
zZ4aNYXR`U?gRM>SrEQrQkaraw^j3&ueAZvcqx-y%1b1~Xc&j66^oN#^cH+R`*sJ8V
zymi|H_beSAS8yZidW0;FIGT0cdzE~tEqvA8eK9=XjNq0t`ei#`Q3DibQ)^mbaZ|-m
z(n@UmpdOTmrUV1zjcKWhvh6(kuWsD4P6myKYPtvz<4sX<e`K#r>Wq%TbEC76d8B=P
zJoB}D9r=?)qfq`rR(0<aQi)mE=@3sp^Xo>5ww50MybWy~!Ak??v*+T));NICbFviS
z3|ZKhQaYvUFubo+1Hqquf5!h|C&#mslnyqJNJ7v{8P2`84Y_(|w_P#y?d`{#-rtR6
zgXRRZRW?FHepRh>q%cvg0d=8n!mfeq&#xwNE#kRJ=>Ob3y)_pVy%XI|(nTzdL*hYe
zD7m`Qx0_sEB1giC5(^UI@Nd8-!Y-QmXqU~60w8RqBzaIR@1?G+fsi$BuV2}ArA4lG
z;X#Yr<qTv6C5H~kihX*P7?j#_V#Jgxj>CsSuCcus%TxNBeN^&8)Z+PhLafhx*q4Cb
zPFWj#re~J6!Q~kUq!XLzS8!n-HK`Vgb<f2YM-G`{$|Z&oU<IRi_yTs4+V8Eq*>X;!
zOIScwVbW-iJM4t)c`@t|Auxjj{fux~OSg8tJXjFtuD(*zcJ;!%m&Jov?DA=G)mvE2
z1{&uyY<RW1z1H|>?#wGMqCkfIuBDZ@HD2uo_+khcblECPiEX48lLA<CKanD8mf-sV
zmyCsQWf`JXbich*(#J#M4~0|1GS~(~Am8u&Q#H_EnTq@Mj9+&TuhrEg?drqp*l;Pr
z+^)@FzA&zM1$OPj9ukiT@Xnpwc9Vb8k=N{GhHr4yn&wpOT&S1SgT4co5#upGI#V+7
zmO=u-U!e#$=H{z6yyNB2SX#3H(JBMbe?I=k3$_Adb`C?5CJr7MCp|W*g_X!&(3~8)
zi!c%iZra?eOsq69|Cgwcfg@l>u~t6FP4$5Fe>)X*(KX7~E6NY<6XC}KpbgV9P>1QM
zYoBq{)`9D3!F6G(FfBL?7WZbw@P7iqp}uJU`2Qc^DRsxO0)XYk%VsqusO0|wHuMP2

diff --git a/res/img/flags/KG.png b/res/img/flags/KG.png
deleted file mode 100644
index 56b433c7566a47bd1b7bd635525bf8ba04808896..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3258
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
S1#Z+M17L1qZCq}Ii~B!iKkrBY

diff --git a/res/img/flags/KH.png b/res/img/flags/KH.png
deleted file mode 100644
index e1ddd5f84c1fc14c1be1b3f012bedb3b4e861c82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2888
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

diff --git a/res/img/flags/KI.png b/res/img/flags/KI.png
deleted file mode 100644
index 8b7c54bc0fd5cb6776c02147df745705114a3a59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3661
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

diff --git a/res/img/flags/KM.png b/res/img/flags/KM.png
deleted file mode 100644
index 227a3b33967efeb70a133b34e766b2f85b8e10cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
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
F|1T6US`7dI

diff --git a/res/img/flags/KN.png b/res/img/flags/KN.png
deleted file mode 100644
index bc6189bed120b39722e2b809bafd3916a6116fb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4213
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
U0ZpOZBT@kX(>Bzq&~U{32SV%QEC2ui

diff --git a/res/img/flags/KP.png b/res/img/flags/KP.png
deleted file mode 100644
index c92248b9101fa5a4474c6fef5e011bc16652e5bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2293
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

diff --git a/res/img/flags/KR.png b/res/img/flags/KR.png
deleted file mode 100644
index ab1cb94943f8ab9abdf63a26c8b9d96abfeaa545..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4837
zcmZ|TXHXMg)G+W30V2JFR8c^h5Slcl2}lz$^xmXOlYsO{P<pS@As`?iO+b2ypdv_9
zs&thiCG><A;0gaP@4U~<bAEI8+`W6x%+7w;**!5&9&1pMvylS;K&7RrrccPySA&+6
zaGaZHDj+0cXBAx)0QitZfwv<eoO3_b)Yk=opxXd|3<rQy!V>Zy0K5<bfDKy!kk0}D
zmgjkGu=|7yr1m-*YJ^OP6V>)mLLz&vY34)7w*QS?w+ADH3B*@RR~_=3go8y=fZY(W
z0|0d6T52kW0W+A~Kubf7roPbTTxOWxU!3KwFxt5~SNr&5x`NYDx<2vZta5LAdJVPL
zG1s0Er-#SuNHN5d(miFQceX?$EX9R{h*{!kX$N1mx1gx%{T3~{k2H9jd7S?6mS-QG
zp6P`?o;M$^FfeNNoNz_QG6@@3nSQYU^8Y3oeXkC6ShfF)Z++GOE@kHaixQhdJ@5u6
zE;mKcpecFEn{z6K;}ac+U5aOMOxZ)1+7B%zg|v}k;mbiaYp0=hi?z#{x1(26s8~fB
zM~P&^Rb`1$94i8l<VdL!&>efaxNU<(Zmt#lMK;cK(4HAQjij0emZUxZHbp34aS9Gx
zUA>jCgl813*S`pmiqSEM)6r^tfq63~ckn{{DXun316rC7=m9c%UVxlYfCe^ldb&BQ
z^H3rc<hknPNm}B31@P9jWS9cNZ!s1Du}_G<hxyfZCgs?4^5(df{d$n+P~cEdGSFXf
zrKBi=K)v^meL)ugY6_*JfT{@B_=m(72`$U>7K^-(|M2R6jy0v56>GPPBp}V^$l=Iw
zFUpjg%5xk3D204gyqEboYOStafJr+-zi7ZwXW&h`NQFssUaq{%3r``|Mm`svQD%v~
z{LlXMi>-R<`M<LB*?+)}enwbLm)gPY9SQhY8=)>Xql)lteCxs5unD$%ZU^4|{rnET
z(ew^;oR)Dz&P2ja-B%m>&CGBi!y@t}Z>}|O>>fon)S)Yx>^SfWP`zdT>tj9GPklRf
zj)`n~yKdgD9lRTdBOo2<dy^z`g91exAwX>U1#WEG=ua)VtB6#JE3&_bWR6X%XGXrY
ztPZ(`iuh9=LTa0L{Cb)aMGP}7XLi23vrCO6VnhJ~Hl|&5Avc#Y*9aifL9+zl_NV@R
z+leIRg|3J)EGsG#0X?(EDGy?^HpQnVPM6L0?*uXf_ohElC%udbSz`4Y5$)&jq?U<#
zzyI!T;be&U+r&XDSbMRbdc{6JNg-p1zB1b_s+34g36zKOEV7B2M@HA3!9we{WJ(M#
zb{`UZ;FSdnI`N97=ywoxrWcfs7O`(Ql|`v5$03<ZiUyxJ3GigHK%v&wRU5%QYvChg
zH{chL1Es7>Q1+WF0+%10Bi{)wLoV?%tdjxM?Q!}gjDqTw?v!^U*;I{GmF{2uKA{;&
zLx9gnaa6po{U8|X8Qret)6R*VYU6{6;i`OVc30Srkz?h)N$QV*2P@{ie!|uY<^}E1
z9W%n>4kG<=&`az-T*Vr(|F`nvW`As#M&Ig8ilOOQn#Za8iq#5zMY@oe(82g}+wcp$
zsldw9kQvOFXQ3ZY6d$F|^*73=NBcV~i*c5wZFRnO6*;vXdVz)eip)WUuwembu8vEt
z{9eW1{P=K2w=d=&jCHqveAJlYvg+?*MM$1HCF|&9z7ZASD}63#NzU&diJ_cjEn~~u
z&f8AkE_ovpl?&H(<n5R2s4QEYE4-Lra9XZtMig-PrQhGDq3U!>%Qi#Kl1lh+F0JZ0
zae?L(d6KHe^A6b_7UWdcvf|_d4~}mib%I~otAJ{g;TasaEGX0OH+MV^%>Q;=P9Oju
z30GjiJ$iyYm)-q~P6BIPf-fL=n&bukPQ9Q)!|!n~?DI`E;Cv?V6)%6&zn#6?o^hq(
zKd-w|q8~X)FkHh?5)gmYV^wm*Gjez62ITHaquHuHu>q16Bkl?fcg1-9G`EsXxsUzo
z#HX(bn4eI{LF(3R|DrZ2f!zn}OLIeJBO))^1?HrB5PzPdo+(=w+KZs(U6i_h87uqu
zR(!?YQ(jxD^5G===P5VQYE9Z0j4_dECpV<}UTC^S#(1G{+#aKdZoSuFZP~#AjFNbO
zs;m9labmWLE{QUs*L*L#g0+t5x!Z&Nj<&YZjgn)-kM4m>s2_1=$<t=ldku66o*_*l
zyCe=Xij?a#2q0*wGI6S8>vV$8y_a`Rnw?D*1RvRvYbjvI-}lQ^Tv^@<Y*-sA(1>J;
zAgJK^7^H@ceip|-v!YjKu)0?n;yQLFY%-Y~MGD5OrT#J-h90k`{3=QerfT?B1;tow
z1gDsp;Sz(u*%=-?B}aS>^%zd9qJwc0g5uoA0VjO5v45*~SQXKIizWiVEOJ9T@m(VW
zp{9+6UY<{_s|O}tS3-<vZg~@HJP)U|;B1n2zbhBKwe_K)FI6t=3iG)wDvUJMttHZp
ztK*DoJ~d#(-$bD-#Gp&C+b-yHR<t<X({BmAGSrK*bHzEh7c9EWvkq_FyfLi@4y#|C
z^pkK7IOa31(|7$<LQyvr!yG0*t!A9!2>008u#h=;+Oq)L(Q&eBo?4&pe_J?9^Rt$l
zhJSkJ@I*4OB;lN+ka_v{4o7^X*nW8eqCQE@sngwLNg=Ds`+i*Nh{&PY(|VZ%*h<1p
zc2()f<gpsvc4>^_j=n*G;7Iz>()qzLhaYt1j&rLJdFLpFLPev#xnMP$6AN{Zifr<h
zFw`ihe0|o+$wss47L6jseMi-oCuIlri*63a<_F({OyXEG>~_jS-wgVBS-<n=P1>p}
ztbp<-dAKN|@5SBu=QdUGT|~mGd4A1mB$Wh{lheMO_U>YNd}xhof5{e&kv6LrfUorw
zF~<(2KV@RkmnGx>J^sY2^z~1bb!Bp|-y$8M3m1@;y?j3T9=b$;n3$M5KlQQJJ75TQ
zMcJ1=UyUEBcvwWkU7hBq69GtkWXjP|#<D9JHu$S-*ZagMk705I+eDH20;10;kV@KI
z&q<zu$jp_=SE%wxmXAs?`k|;_DnATkhzA}?JG*-Up*n7eiti2R+&=mEtw4_G;LGlT
z;5)?RWzwyfQPSt~$oZKJG{%HRPtmTi?r9D#DF=*nNSD^J0S-%{2+;4_bK&f${!s@P
z31Gd^*Id4O=IrfxLi~`bkEsHi3o0zAd;>%i0OVNe*4$=MDwv18qOk|aWTSGGbswxO
zw8^2Brp8xgVu&L1+=Hskh(_UEskfTJLL;umt|P#Vz}LU5%B~gSnj^q4^*-qsA4;~W
zBH^vbZl*|nW#JBSdb4M$?F~{Oo}m=rF4ZYQKfJ%UWe`fbkoy^I;{<$)6u$JqI-=c!
zoi!%}mHj7w7Y-o+2h~?B+?ce1k~`RMbT!W--bWy?IK{?od?)w$q35u4vihwXEo~N4
z?Z2KZb(S<?+K-4@9<vF2A<`R6$=|F2Cq`)N`G|}PjdGX-Gqvo))21*@z?hJ{WuP%6
zU2iJEvx#jK!QE|OLGF^8zBc#*IaGaP0Q@gXV5zgyW4<$($Yk=Ld(I0YU*|8RAIQ-D
zShl?%3v75wn$XAzC>@q(hdt!A7eFUKq|VLVswtXE!9A3DaT5b9U8stmfvF8J(qKJ*
z{{;s(qQsDSe09@USmvpc(OM(R^&H<b48;dD1Lv~(iwv~?yoc}>3$V^4>M!2}9zeLa
z%~*jNJs9oYfDU}ugLOlJ#Apq1?%SV?<RR0(_W2Ub<>y@Q8da1p0-8Yu2qb7Nze#F@
z<TGtN380&DNOD0vnhB#M4v1?GpcviyK>%7J(+gPWTe!R)WrQMPI`$T+4K>*#uiYg_
zwU%9RddI-Iel7aa>E1CgQ=KFE^CtJwT!Y-Ux-wT+&hu@LrP*ly;yeiGM)5j)Z4(gM
z^M4E$)6NmjAVTg}hj5Ly#HPU+QR&*VrEx&cZ_;6+@^EUx_c*^dIWh`YFU^T=%^5Qy
zQ<fY-c8-XU0C<=r$C8bjTN~K-&BhZ_&4>L0tP^}NUq()KjkqwAOVReei?79dUy+oo
z^${T^FrTniw59Eb^_I=@^_yd=Wl?~u>d(j$Do_c$;z1>luBrabXZ+diP_9=CaRB-y
z%8CQ!YNzN~0G=MCJJ9U~hBUMj<VZ$O`^O%A2l^9UDFEI&vB_|d)EBA{FxqztMkE6x
z(=5`raOLNA{`NupHaCgfpr;TxY}Uq)^Ei8^>)VslZ<mIg8Pc~r)Ml=6|9SX1A(|bz
z`s&Jtz`@jN?U2o4AM6M>^3*?z%H0;s%~YXDvIM?y47Al;L4WwzH_2r|p*9jzz@Pvr
z*Qz8SdN6PWnWHpLS;I;xwf<gsk_s4fTNdME++|yBs+(|D#$)@}Ac|zs^|?3w@gU8a
zb!idM;S|?sI7qvu(RhPsw__ZV2AWoW$OJGn)_tOJBLfYI>*@&-jr#ozsjeVJ=IU;%
z0efHj&mpZKPu+RExfjtg{|eOrn{u;Gv(_5PIPn$WZBxRG^fUG+xkdyeYDv*tbP7bW
z(*LGWPhSI8GFO1E-3Ta>v4s0eap+4Q85w4OFPBZP)b+>yZQ#Ave<6J|q%$_|p&!oG
zZLL3byb2^y-uO5EqvCB?ZyMpXbf5K_92fllvTPmrUL6=Y&iq!6(^e6`3!)uEJisAc
zP=kxttvn#S9S!zJUG~7vG;3}PkR#jPq}u};V(T{<AR6V69tFz7DM8Uc2JN8A_e~5u
z;H1RQh#s9GWuUs^RPGdN&AG{vC@Q3409gf~F{UxcIcyH_^d)e}z&VyyHVDX%UGY*c
z*=*;^ymP;L5Y1V%HT!yzZMAi6p4M!l^Rnc`ee40(7AZ?MYFiRxTaxkIji@hPig?Vg
zx6Vlg4vSe`;)ti;9DjYU&vbmRp&yLL9b@(yWbqTFGFo26Z)7+n@@4#a%?`&_Co{Lr
z&L%QT)|`7;pyql+R&G4QDd@2i186dOjG}CtH|!lnnKf^iryre+)(BtknyB{8sY_SA
zwc6r4LimfQ8-aBkw=Mn^PKnl9SqDqJw7@qVdpLak7N5e(V}xK(peNA0B)Oo#vm`G>
zTw#U~C4?N$22j7h+=m*+X4o4^KfX&~L=_^lJCF7U_w#+!d6qez8l1GF&~+p$cTk!Q
z9SVt2;}e2uO+KzosQUQtiQ_B!>MH&WvL0gxQ>lQ6f-OC#$b!7HPRZ=uuQUI88Twlx
zX^GoDd<=<I^FFd+gOB90_YuyiQ~%WC41!j4fAdQ0Om?g2)*e)DT284?-21K86BEv`
z9L5T9;>c1F#ae7Mk0-^GB@#5XSg+eGba!;CpLfr0X4tf#EfGQ3^@(>zz57RNJ0pvF
zGcVoFsxi&W<bMfxT+5{l*@XImcLe-#DQ#ASUk%OM`#hpND^uxjdVYVpR~**%H-kT1
zq2JN6$FXEus3}@^;{fO*(D->|v}l5`;mhp*zU(L=sIHx&&uexXw7ywdo3<x-#UUsl
zD4;E(^HQ88tID3~y{2(}YDP(i%>s1C<i^?2!Oq%Z(xKH#`+z^w$&ZSp#|Yopba)Ae
zV3g&Aw^5%FXa9nC=ii{dl&`QW%!!h*a63Al9+~SS2_=7uN@AKd56tAOPEw_u2i|AA
zE;(TjOiNW2D$s7rdMJU9!YfUh+}w`VHj)+<Bj65Z!HI5JY1aI_lA1%W8&ei;+2*od
zTpFi&PJd<p?%GtIO+(9x^sg-UN76^@Ns#3umT(3bGmN=txKXy204m|)Hadx_cCdH1
zcmIPZ&fv139nSxJFUJ2HDqrQ^Yrj-)(JRa<vfG*S(DwHyH~eUadwr&%5v?AN7P2~0
zq*~Z4scNX=lyG9r*Xeld*_>nsB?xY%Eo#3MJ`tffyQmFsy=zKu{G7z3yg0SmLHHN5
zUs;S)%0swZrcbMS>qGL03$yL&%bEhE?fngGXVKgfPt#=`d-}8s!o$9uv}kt(Plg26
z6%`e0GREAJj(5Dw;K7>scm?}o>An=3nr^)e9q(Q!c=+dt!NTUo7%dVY2A+peSOW2%
zHRBCci`cp6gA*^4PqJ~mdi@6b#A4)c#ReW+1_g7$1|zXM54#OsViyzsR}<yGwo0HZ
z9x73WN!S)`5FxaD_<Yq(eI4w49p#_G9SI4L5EGXX5xXlQA!{fhDSua7UP??@Ok7?}
kETCsa;r}b}@N#f<3jDtd$O^5(2nB$a`eU`42ez;N2U^$?e*gdg

diff --git a/res/img/flags/KW.png b/res/img/flags/KW.png
deleted file mode 100644
index 0b41c7a5327261b287056ead1f2f8a3cc1231b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1667
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

diff --git a/res/img/flags/KY.png b/res/img/flags/KY.png
deleted file mode 100644
index 7af5290d31760f685fb77ab6ee66f44a48d32b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5285
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

diff --git a/res/img/flags/KZ.png b/res/img/flags/KZ.png
deleted file mode 100644
index e10a1255a08b1d59c662f3a0f21bfad58f7e0eac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3466
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

diff --git a/res/img/flags/LA.png b/res/img/flags/LA.png
deleted file mode 100644
index 6ad67d425584503b532e66ba2cac366a34b38e63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2119
zcmZ{ldpy&98^?d!vRTd~hmtvSOU9fU)|^7(E@y?tMoz;TGGbe0Qi>w&rWh)EBI{O^
z!yNKR7(%!mQ!DGvIWni*>wccs^Lm~?p6m6xuJ`x4uGi;!egFGpoN#lL*sZ)9000SR
zCwq4x&3>jdR9MH~)f5V`>#U8d4FEjN659$A5%vhYle;SbBxwTx?J@vt2uCzN0K_8!
z;7=R?pqT)m5PP@oq?K?14R&#~7g8AOcJ)*t;IU4AWFc{X=VGL7ukZnjb9QxrO^fVT
zK<V!DOj!_4%$)6QJQGLf3X)?z->JMlvNq0*%;8=_y!E}@rmOcrTFvBv`U$puSo&{H
zvsYLS$P*OrV81{&J&+o<zXa)aUwygnk!EfJT7Fmh-eNW8eS|my;y0?^p`pg6+?=(p
zr4l|K^|;j+JP+-eDY|DlRXtNk<|OxQ-}_cCwmZ$X_=N7B|3E8@C?EUM|InQ-lgeoR
z#8LmBad)Uy^>niSi=^k&ok7pX^`sd&d9PD-k;B~hpm>OUEyK7Xr&#<eLH89}X-*QI
zX?narxH5V^p!vhlr-Xe&A@>eeNmbXGbNd=j%R(UVQ<~Ewbb|^WrEhPT2L;^i!?j8P
z%Q3sgaNg(cDPtWS0qq~pLtc*8jYq%o4n-eGe$mo;L$t~POo!$!#XO;LeC~(uqgRi*
z5#c6#k~Wm}TSh_}Gy+(vZ*$trL@go<N~Xlxn5EtCaN;>*+#=9YT$w)NCX@DTsFm{V
z)bJS5H?R=Tc3{94a%#ZlK%-zUE%4wxsC*+}uB;hS_zV63_SpbQv@P;Gjb)!*9T8X;
z1S!`gl>sB2E3)q|Ek4VB0<>epVee5rAnEH67U^?>Ni7$dQX}G00v#k>g5pHq+^1P+
zdxuZ3f+!Bb+^^ZUEW<oM_$5*nHRqP_Nd9YQ@`pPYHFQ`0`M&Xejn~;>FPq}c#Xz6E
z6_^^e3u{<iW#1Q@1o$osjdQaooA0;D+)aAQ9<s8i_7xz;5}nXKF`S<$W|Kbj)W#73
z;$yA72I-2Lj4*vx(E4h}=pJTunD-*nw}bNL@VTh)>V<$0y6c>-MLn4TTY6k@2DCrN
zF-M&6r1yrQBK)ON<h7l<Qo(q^O15n_Wf@P_mUdEX!CFfws*Eh0S+t4#eTT8S>d#Z=
z7py40h4I=tADCJPZM`97*bUja<)MgCdfDyAmzz<88X>YwrO)*i%?CAd<B+KCN{ePx
zH@;I7XX4=pJ8Wp-(Vi;$v8z4hY{$`TIsNL0BpS!B$!BG0VrnXEP5f(Ygg{|mGkaKd
zX*NCkAJJp#?ufHR-<&q$SPDnV6nRsGikA{m@@8t1kX5TRm?%#vsu^7gk{SUM^V#&w
zTh?5e$&nB=uVJCvMO9=hYZjAaaUf#TtLfw&anG-fZ6=6ZM<#I<Cs;iFYQ-TblL>>)
zZ;Uo(*AWQuJ1FTKmCD0U=rZ9^cgC<)gEQBxX)r11b(ipOfu;e;@g%SAVGLMfR8V@5
z#$4vBzZP-Yo-9r0q{t+&@gprpEW^y);;f5wnMj*ilE+qp^WarI9EP@3aX~bx*Hysd
zq+h7>>j?74URqPazhX=tOLMKOZJ^NHdj!16$Fe=`+91Uvw@Iwq?#<xGj>TH3k&0YA
zN}{~gb<StSj7+Jump2_ufvir3ZVe&Hz?XxtzA5>#X~D&TjG3&BIHI(38wfNR_ItQ<
zgVN8-W=xQ#fcMex?hOo88r!R|v+J8oA<yeyr<qR&1-6G^>;<vTv;Y^$3hO1i7lNbf
zqUWvnx0CV{cM~rAhf2P#<-HrAmH9ci4hIG>%=3n;`1rP*SW*I|!BRYdXq`<}S84t+
z%-WC4Q&RY}``@1~Ucnjj3&3T694j`P?yra}LsYvY6m8uNRS{&A4{Fn9jItcRi;(lz
zF*k9AON>>+{3ab)D?2O3EKJ?Yf2e((Q}l<1r54p-@WzYWl*;`pu5_guJFKGhZ&9m=
zXKgX1_TUUPaOO;=A<sy<Kto|PfW7)<&G!3hI@9!R&*BVXW}(LmKXF~o={OkIP|IlV
ztu={pB)T^BOo0iQg6*W1OYHcr<h5Bb=u^FOoW}0tCMC}1c|rS2iRkID&T(Af!uui9
zBl-QApoencK+=|WBA6H2n73GF8jBm((RWL0>9W%i!K8|FcH-Q<x9ml!sJOsb3;$oM
z0zJ=zBvVrbQXy&V4IZPz`UtJWAnl~igftteK8jJgkIZw{;d|&!gS`*9K0mBk*}pR6
z=|9fj@Q=*9Ql<I>)4dHOJt~Kkj|N!6o5?+V$-YnZH?|R}#9t-<lvwsLbuh<>lv~Un
zfa1PBtOr_;rZ+%vnqATW<|7%XOO&EMkWX(qG<*g;(-6OJGCv>vu5rf`o9se`h?<lD
zE%1n?2R<0t-mnas%T%dB8lz-+wOtFj5up6b9BXaB{F;;+j%8rC1CutS5;)-Y#ZHya
z@`yt6nTI|lf`}xCovHi{s&Rwq(+LKbOQJ?S3OeIxrvXL!a>qmA-Q3)4_-HKgsyW@S
z6@pzelw&>?XkCYQD>g@QQochD)kgc)-)Ymowpo?(f$}(+JTnka`jUAsW{RP8vdHx{
zOy#@|>Xh8}dDVx4s-HH}$#(ncDsSgmrIl2#|1zk*?dqy!{tnQ_%}Vd38y^#zs#ctX
zZyX^gE(DD~7a{~;j5IPgK$;pDTX-6y(56Oc6Qn-U2#rK0wtlky9|19j5FSeT{{nbX
R09_~moE_ZkpV;Cq{sq~a$M^sM

diff --git a/res/img/flags/LB.png b/res/img/flags/LB.png
deleted file mode 100644
index 865df57a42f5044f43d3fe10a850666d612f255f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2537
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
N+%&Q<tkXxt{S61g#()3-

diff --git a/res/img/flags/LC.png b/res/img/flags/LC.png
deleted file mode 100644
index e83a2d08bc6d2178485531c2e2b27130b97f4e2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2445
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
UB<_1B3If0xTPK?eE8nF50Ee7!1poj5

diff --git a/res/img/flags/LI.png b/res/img/flags/LI.png
deleted file mode 100644
index 57034d367c4b0548a44aa72be81269870b30b53c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1759
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
LUQSI8<jj8pFFqK%

diff --git a/res/img/flags/LK.png b/res/img/flags/LK.png
deleted file mode 100644
index 6e7ad58254e8a24fc66bd7d35f6f3a1855cb93c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5077
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

diff --git a/res/img/flags/LR.png b/res/img/flags/LR.png
deleted file mode 100644
index 46c3b84a92509f9adf6d103e7c273e71044280bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1903
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
P5de;MZnm}7m<N9W7Vc*O

diff --git a/res/img/flags/LS.png b/res/img/flags/LS.png
deleted file mode 100644
index 79b505d4904a8122ea48930c0c72e335f831dd83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1848
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
Yf1kMjZ{RC&NrnsnV`PDTY3O$QPau|BA^-pY

diff --git a/res/img/flags/LT.png b/res/img/flags/LT.png
deleted file mode 100644
index 7740cdc0a09abc9a6a36f2bef086a4d1e5e3a376..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#Q<CT^vIyZoR#|*NfRvqV-{Z
zl8BDWp2ibOZdaTpY)E))TETqJp=z~4({up=ZR>-#wsLAL+01oqR+@=|m{ypW+li>R
z^M$!r&*Z<i{FLI^M&}tfTRVU@fk51hH_cnGMa^Eek2`UfM%N+@qh<eoce^E9<ZP|E
z?wn?lWyapDbiGFW(0_v&Mm)=Snl%q6oB}e>ZMCbNP<-=aEcebzOFj4W4Ku$++1Gx(
zE41@?Rta16{y$x>H@=^CA~$rg@r_qEzg|4H5XiezYVK;+{f6gTp=n?G&(_w(+TSnf
zFEXAHX*?&9@$oc?ea%G=EPW)|g4+&GDLiLTImu;S?RBTTAlt)t4o>r3{>z9Z?k3Rm
z=o@nH{hrlqKN3IZpx(Fq_<LeNRVTeHEt+-be&FUl75CNcA<wtk;MWr8HWVzmH0`p|
zuJy}ysJ1Otd|UJcW`3eUsszZYv{U=TtM;k@Jpu_3hlDzYr<0sNeL1`5Hc&*h#5JNM
zC9x#cD!C{XNHG{07@F%EnCco?gcuoHnHpM|7-$<9S{WEr9C~Vtq9HdwB{QuOw+7Dn
Rv5g=*Jzf1=);T3K0RR*)@u>g+

diff --git a/res/img/flags/LU.png b/res/img/flags/LU.png
deleted file mode 100644
index 8f383e674e84347f49327ff69841dadc6401d918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 677
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#OE`x;TbZ+<JT6*86aP$gz*b
z*?|IUG^{M#*cZkhaD1Vp*V<KlJ&*4f>l~S*j<3|39$fGgkg?Ku@j}h7sp$>}D|_bD
zCJtSx<$JD3vvU_!Km9+uh@*vFZqgiWCZL5t5V7zO_u8%3tT=MmovhA(wmBcH_4}`z
zUbxP*)7u^^Udg-udTW$TdJg-c_W?7KHO?4{Jd@xm=4rJ&7V-M(mRBp(Z*LT+d?DL=
zsOj&!qVE^Vy#5@~(AjJpIrGG~&l-O^m)^U$BJIzEHB~iP)~ZhHFWt&ocXabl{^&EZ
zy}7shIy>%vnq6lzOMZX4<TT0KniC83!#^g7nd!<VddtY<KkAn6pL1BoIk9h{!SNaF
z&!bnKn)^1Qqvupt&ymGDuRTwVeU`i2<;eS3tDZw~W!Ba6#kU13ZPHSm+3UV|!_MQA
z&$=Bg^J-a_x=>~M$2p(c_L|#&+Lo-eNs)J|MDV{v=ipa&%DhzWsI*VfHC(}#)5)y*
zv#pR1<hQm%P)mVc?%5jm+R1Tcog666f#8AsZzh4)J~LiTmj}hDYKdz^NlIc#s#S7P
zDv)9@GB7mPH89mRvIsFUwlX!eGBMCLFtjo-s5tc07DYpDeoAIqC2kFz^J5!9HhQ}H
KxvX<aXaWH7`v9*1

diff --git a/res/img/flags/LV.png b/res/img/flags/LV.png
deleted file mode 100644
index a0f36d89c49268e929044d15d7ad08262fac894b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 641
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#IsYT^vIyZoR#w>+PH<(f;vw
zpt^>|1+`5DO-D7<Zre3HJmDZA@kYDptVVXz(WF2Z368_8_6H8FIx*>J0UwWP?je^J
zUdv^l=bSw*&QtXHz*q0xkv|W!RwpX~tpfvx>7Mc~fg-MflQQ@ZU2jt0XgV-s<#~UT
z*@+Q)+2@^CMdX-dZGAKEf?Ugf#Tn@w&m@~F+Y;shnREKTrd|JXcJeo!h_@dvbAGF{
zU&C{LOZcHGS^K#O#?jp7pD*9iPMqsyQDt?|%lrE8ui9^?df0mT@0$9itjRb2N%%9q
zt?7rlste7}`KiwkndG!-)n1`6?<k{BUC-HG&*<BEHI7qzTEwF_B~85BewXW415J}X
zvF6Vgxv=^hE2f!k4OiN#_x$SQiMKhwmEDZ4mdiNb^7Z!j4JV)8Da>=PR$a5L<<c2H
z^@yS=PbRy*o%(~%{$CZu<uFe?oWFmb$N!(J_cBAn;sd`O!`ya1H~EIXw?HA)64!{5
zl*E!$tK_0oAjM#0U}&yuV5)0m5n^O)Wol?;VxVncXk}nfap<WniiX_$l+3hB+!{FN
R$2Nj2^>p=fS?83{1OU^M^G5&x

diff --git a/res/img/flags/LY.png b/res/img/flags/LY.png
deleted file mode 100644
index 2884c4c0a9cad4e68c4f07e93d5191e1720e8fbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1273
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?@vpx;TbZ+<JS<KSMcGhW*3)
zYW+igNs~@Cb^KVL%-6}ba0=`7t+`c(8%(z>31|N6tpBnq#-=jojH-yf?H0=|7p88T
z{^;yHp)DTz+)>R79$9?}VG51lxOqbD^XCg&jNj&5kKJ;{rB0qhfB%{Jf8_S>nR#+H
zqeOC#;W0SzOt<jYF%#d*CY^iyI&5bqO0*?%2=3VN;Fjs(9fgNqf4Q-;?6%4K``eRW
zmO8!pS#a=I&+7>t_Zdp|`gPB(d|UHEYlbNM3-R@vQ_}x2UD)ItelYG2m%!Te`|`V^
z>hIaf@8&X_$1dl#*Y9)ugb4wCH=3@VZ~swU&rp$Zd|gwmIHT2dpwvpeIE~1?{q<s{
z3<C0<It&r!YiBbw$bYb9xZwZe>z!{U3%{yw{{E^^)TfU7!L;j<aZU^`4mhzN=x5+#
z5S_{&B2r<KeRTKxd26n%KENzv_3Nv|`^S0;?>qdD$R6;ze0&O<L67-I#s+5@tLxwQ
zem0i1%MlfsB71s8&#4u%>CcQm&#YWjv@=F;dgrH`HD>cwjg~0#zPuN|KxhSvmj4eq
zUMUm#FWaxjSusET-SjoebamR*HL~L0xT;%i7ySzSyQ0oz${Y_r74?oSlfo`}xjc-q
z5I-l_>gJ@pP;ilpYM`eDmul7`wJet#N7T$@@2e{)?0KL6U+j&<af@w_6BHvj#5$y`
zd*>eG3(V5qI`vl3n)^=Ny4Kf>tK7~Dga%&?F?9`z(O)Niz4O?&<3K2@9PX(qDyX8e
z<on-ux0_DR=s7t<mj4-BakHh8agy5^j)`|BNEbDGTn+KPD$^QuMf|JlqNhKKYApTq
z1htb~b&hw;779)}_50tq+JiC5IaU_3bJVhO%(qG3c3By<YFd#9m#@ji5)r-C>0fmM
zOIKKh$SP^A6TRM*ZF6YdKN+*dX;*q4%WR8^&|M>R_4e1Yy}na)RJ~6MP29FbH`CkY
z;mHpv6_Yefq@;Lzg;c|Yv^zzQcdY7Kwc?ZIn^)_FN>_T{Eu3mGPx5?^@YM3tyPw7`
z`V&*9XYX!uK_-LG<nHg+*H^n-=k;0qC+t84%l}skn)w=-WgajD7>WiPF8E!le)p_h
z>Tdm~ubtSRG(`w-H%#4jDNO3X28m+^4bGpQ{x|si?!9dA=KO?P+<)v2{aaaEa;b~I
zcGCI!D{(T3>t^!3UAn#S@7#2az4decyt?<ox4=U~gF*lMw5S)~o(cKa&;3%f`@1+W
z3IF}GdE$4cxaCLn9`BPcTdiw7ziO`7?w-{NkG7rY(BA`0`ajtY*jks^D}7*!W0V)F
z?Uq0E(l};=-C_TK-#D+!rz7$gko8}_o;i2%{JOpiDNljLfNF_rL`h0wNvc(HQ7VvP
zFfuSS*EKNJHL?gXGPW``v@$W!HZZg@FsL~6)D}fUZhlH;S|x4`obzKFff^V*UHx3v
IIVCg!0G}Wv!vFvP

diff --git a/res/img/flags/MA.png b/res/img/flags/MA.png
deleted file mode 100644
index 1f76cfc9bd4a9919ab39f87f0a8d029aefcc2dc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1449
zcmZ{kX*8Q@6vy8Rv4uutYClyBVQRz{Y8gVJQOi+l4AQ9BWs+)?s(nqZsoK|8jp~Nh
zD5@!nMysQYs<xKUHuhZ|Md-Yp`7kpd<~jF1zvq9S^S}4oz3k+8QbJ5#3;+NLTLR7*
zB<5Sfq2N6}@~{$wU?A233jp_X#reKMpjP%HI6DA9v^oGJqyWG!SW1`!fCw}IERX@f
zq!<8X=;e=2n}HwDvvwzOAi=X^-5w7@luqzG50d;>u7z5?0w2N*TL--Gw2-2VK1#tg
zb`>02Y>UIXM!jDiI}?V)1Dy5MrIm@HNx9HNz3yK1)M`O#Z0T(&c(d$*$cDy4!S}c<
zH8D((%2_<$I$KN@af2x}#N<o=oCKFnQr>kEna1iOm<j1AgT;tT)P_j*;$+U@mQg74
z(9xI6oiU^pb$z3D(~c!dKpw<l*x;Y&7d_Vuy+Tk!Tqcw(DzJxAx~J*J$LsqzkKRZQ
zRFoM6?|$~Sc(&D0Ls^}iX#dKd?AwwE`I;?huWN$to$Ey2fVgCVVw6U%_!1r~{#AGj
z(*Mi6_O_Qt08P`h1V3rn)<IfV1;BFn_$xtmftUzKbB^$f{jCfa3pB@^q+o*(y?YZW
zEqNk!uSW;MJBXfL;G84P>~}tJA##81GERD>3AB4<`57|}H;gfiLa#eSfl&E=?NA9u
zq30b>6Q?TbDgomJjL$$zmbo8YYPTVqZPrArqNx3J93O5{QmJEPHT~tac(^XiPOXfm
zN?+I-6gdqYQs>4McHQ#7ehGI1mZ?$36GSPNg|IS@F@EyV=@6*(-(6hg&Mx=W@2nXG
zmTEo~T!-9K>yqmg6j+OxRPuYdNe`gXFQXFkBGzd<FZx=+b@41Sl<cs_b7x|FE2F3l
z;YjOikfL?BHSY}LH1ezFgY#v`Zz`y1(tsaETg@`Z@Ax6II<@Bf{+h?efdZzagOJ>m
zJS&nEQN*vbnCeQ)ao<6g@2EssA-e}2RJYBXgoiK5KS_zys35%M9LuL!^xC}Lu^*yr
z`WgEuEg|r0otsMOyr{-!FIJfeO$DifiJB#g7Ynu_{r#{i)U{MnBkf25EPd_f`o1Hq
z^xlok-G`QLb{yAPQRb6Rd$y0EEw0-_6jet3=JIz9RwH#e&_J!<#v>Udt~<(9f%~DS
zb3n!|KM8fMWHRwv-<v&4w^sti;ADgQ8M2>Y7_M~0l-G36r*PRk`-;FH-%>y5YLTDO
z+?o#x(ERx*@4{}@m0R4B!_OUTN`D{Ryt|WF2RT#Z?Fjo6lz~pbPD;MqqY(>DS$e%N
zD3+YFsd{gav{<E$>B3};Wyhj7MprO_3QKa)HHL;qZJu!1{qMxaVtV7{g|Ed{ci4ob
zS+dWw+*!}<<4K3L>?%6FA7q6HOs!s6Dc~qOOO>lyH8y@+3Y<3|q*P^%otAyiiuQbC
zHC%ZWYbusmi*v7uw5Hh5OIt<x%L73dVHA9=g<DkosmEDFjw!?XL-o8&ZZ}hOVwk5~
zXNHI<UmoN&RU(^}IqUGaIdih2icqr-DaveL;<H)E0Md~4Wi0H7DfV^S9vY9@PV;R`
zw@<b`))jSiq(>Pu#K*l(Mp1;>WTbwsB)p}mg2Z$ST*$`95MZq%5-*$=2T!p(|5#B`
zW61@*>k~PS-X&Th>r^rz-aWa1mOd|x9h2OC9~#HyR;lEdA@<ToFLV^-wNg&?Ls`@!
zAOD&5%nU>eJJ!<_U$>n$F~uNf3?*vX2-nIg6`%cE%#?2XdhB_m)&`gUD@L2+0TS-Y
z+^Ux5KDf5NXW)qpiZ8?8#4p?*1fYl3HPS{KYU>%h>gk&p>Y5m!e?Wt)03G#|XZ{}p
bl|~5;xcL7D(JG%r&;Z!t9dY$m<fK0Vwi1kE

diff --git a/res/img/flags/MC.png b/res/img/flags/MC.png
deleted file mode 100644
index 06fc2ad16634b6b89af9c3bbe435d51611481b68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#MXuT^vIyZoR!>=*1i;(EhQ~
zE!vZXdD{A`dL0wEXIMv6v1V8MKN5B7x>9yKOZeV`xk;05EqE<@M*7Le_V?HMPoKH|
zW}PI^Xdt-YvPxEG>6D;f`@S-*DmrKRe9QO0{EPYT<)}@*x#sIHE4Rh#qIF(9=a15F
z_$%PUbMOc@qUFEpvP`Mv@2_QZRCe~ZH~+1v(Ji08cD=%r%ViTk7Hn9&`tt6{$FGG8
z7;R^-UMtVfZoU6~-gNP`>lZveyKURN>*w2>dGp$?A3wkLyuy*~`@a49SYS~7>VEEp
zUtCV-&g6vJ%ki7}CO_8w`2NnFJ#};58yK<(J7Xsv)_1;p_ipWVi0>FaoUdc-l`ww4
zlwo-{P)N1JHKHUXu_V<hxhNG#F&G&bn(G>v>Ka*u7#Ulc8d{kcXd4(>85mR?dTNWJ
cAvZrIGp!Q02G04hjUY=sUHx3vIVCg!0FJTJMgRZ+

diff --git a/res/img/flags/MD.png b/res/img/flags/MD.png
deleted file mode 100644
index 8e54c2b815f714e64a395c206b3e8a814b4107f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2238
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
Y`Go#|17D6yB*y@l8DB6eHE^f@7g|01IsgCw

diff --git a/res/img/flags/ME.png b/res/img/flags/ME.png
deleted file mode 100644
index 97424d4ec263f1187bc395bcec3ce8ac6ac5dc80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2965
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
XG5_DdQR+rMG5{BiF5wys@JasxgAPW$

diff --git a/res/img/flags/MF.png b/res/img/flags/MF.png
deleted file mode 100644
index 6d50a0f544ad14e2da315e53fdeb187d3c8781c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LMOT^vIyZoR#|-pj>NqU~e(
zkyycIoumjJqZ@lTPbZm3x(Xc8kUp~I;_VH3aR)V<eDxD&``p>EXouPVTDHYHQZ_R2
zHFc$JGZW|i@dVlc1P;oV%B8(Dmrm(eCjaaHlR3rbUV6{}IbZ(5>(J0zexKQzOB+QN
zPw(B%z4CIrr2ab3?XSbltILCy@87d!gX&QYr}X*1O@Fj@t7om&&I~;-<y~ldx87>1
z9RK$I^719$C;$H39<C|7RWF)7$Y+u4-CzF_t=6u3Sn%yvOl|mLJ{DtV17nJb9_hb<
zn~(KE{L|1@!=M~z<LK(;eF!L`TH+c}l9E`GYL#4+3Zxi}3=GY64NP^7EJBQotxOHA
pOboOQ46O_dDh@rhMbVI(pOTqYiCY8b{Mbg2ou00KF6*2UngGqWv!4I}

diff --git a/res/img/flags/MG.png b/res/img/flags/MG.png
deleted file mode 100644
index 28bfccc9e8909e086aae5293133854b39df082d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 823
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?{*NT^vIyZoR#|F<UrM;`qn+
zv!BdbCZg&sIB~)sPA6Fx8J2|_+mt#wUL?panfyTMol;rJOBIf#*`3|9ExI%~q&P2$
zt&36&z1$|Hp83AeBOqYXm4|z(U%%fhqo2>=|4FuJ=VJ#KC{Pj1yTE<OfamZ9otKXP
z&8K=T4O+Rw{@0VT-)v8dcE;!(w|K~>+T}2fe@nykx9aiR6?fHrym>P@!9V)B`T9m}
zw&l&$3Ae*GJ=*_Y>G8I0X7>Ac+^Dvn{H5VjxyTt~u4j_0pL?1r-45C;PM8;Ha9(3Z
zI#_sSY`k|*>=oOz-N)4!8*&XC8Q-j(oy3we)3}Ghdy0mNZ3z!s&9W~n+`CThE5E)x
zV*~Te@86oN986AUH@uj$m+^r>^@m6Lt7BelpF1z%^%F*m3z4^+&EL8$ELE>Kklf+N
z7kZcXL0aBbSysE7b8Nk;UPw&&mA_nVMykcZ59_5%qL=2(y=_qU^F+!&F_ZW8v(LV7
ze&D@rZZ!MvGosQJ=I8C#i>>&2+uzqf>Pg{&i1f_zyC#b-+>!6u%<y*YLak&6)9B*q
z3^{$xp8T?t5AWT6Nm%Fq=PipLXFWI9;dpCVx<IOS3FA!7?M}RJWQ}uxp3&+1e%r@?
z!;9^ulNs2zon$%8kT*$igXnf2#+;LB-=0K1V)!MGE2y9$*e|^_Wc~48ShTqaePZ6I
z+`3NVmzqB?5vi8AMwFx^mZVxG7o`Fz1|tJQb6o>dT_cMSBV#L5Ln{*lZ39Cq1A~e~
gPi;{&<mRVjrd8tBz&Ss*5vYN|)78&qol`;+054@mZ2$lO

diff --git a/res/img/flags/MH.png b/res/img/flags/MH.png
deleted file mode 100644
index e482a659245166f91b3bd5f4a6a17dc746da6f57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5594
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

diff --git a/res/img/flags/MK.png b/res/img/flags/MK.png
deleted file mode 100644
index 84e2e65e766ba023f5a48903812a5988dba7ce26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5066
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

diff --git a/res/img/flags/ML.png b/res/img/flags/ML.png
deleted file mode 100644
index 38fec3479641a47454a85a49bc9d36c97020240e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#PJpT^vIyZoR#2=*8?P(e^OE
zELr+QUb1z&$5iWx?nVX0_EW4y9VKN=+?g$^cNK26*)~KTyX4f=r1QG{{pE88#%H4c
z3jvJ=0)ws(ciW}}d1*f1DF5sJ5sBoUhu-r~`t#2?f4gj_%)7?KRV%`(>aRxihS-bG
z{-<JlH~#(}8;`5WJ74-=+Ijl*g_?K&x2m~c4boUIR;fOBbzbzECCR1b*0qy=t-9Sd
zRpiu3Cu>dfu2t>7+i$)pxba?pz4+nSUPXa3JO|HEOc>;SagUWUXM*^|?GxjvITns5
z)JjeQ1yoC1BT7;dOH!?pi&B9UgOP!uxvqh!u8~EEk+GGjp_Pe&wt=CQfkDNgr?w~>
ba`RI%(<*Um;G7@Z2(r@C)z4*}Q$iB}jbq3l

diff --git a/res/img/flags/MM.png b/res/img/flags/MM.png
deleted file mode 100644
index 70a03c6b14d65efcaf70611ccaa5ec7415cbcfbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3123
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

diff --git a/res/img/flags/MN.png b/res/img/flags/MN.png
deleted file mode 100644
index 1e1bbe60894f98d7f2d30200d68def81d5edb2e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2328
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
W{=a~&*fEAF01S0ab!xN-vHt~gp%(-I

diff --git a/res/img/flags/MO.png b/res/img/flags/MO.png
deleted file mode 100644
index 3833d683e7cdccf977da589ef5e83ebf1be96f8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2994
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
N80wi`sMR6H{~K27X+{75

diff --git a/res/img/flags/MP.png b/res/img/flags/MP.png
deleted file mode 100644
index 63119096b0c9a645b87e09a733b9260f31cd10bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4619
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
GBL4+pK87;@

diff --git a/res/img/flags/MQ.png b/res/img/flags/MQ.png
deleted file mode 100644
index 9cab441aec6c5e6a3c49d3d74bd8791b47126b31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5810
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
V17Y5)um=M`MNw0sQqD5`e*ueB;w%6F

diff --git a/res/img/flags/MR.png b/res/img/flags/MR.png
deleted file mode 100644
index c144de17f7b64a8731fa0d8ebe507fb788251047..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2897
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
F{spdsOC$gQ

diff --git a/res/img/flags/MS.png b/res/img/flags/MS.png
deleted file mode 100644
index 12217070421ffa3e914ce25d1fe09a97428405bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4967
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

diff --git a/res/img/flags/MT.png b/res/img/flags/MT.png
deleted file mode 100644
index 7963aa618a42abdd533d93b310cb167fc18e1360..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1324
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_&;mP&iNIEGZ*dV4$8XL7jA@sIB-
zPkBc>RBm*V)L+|^dBs;oC$Bi4b7p6CpplTTS!!DJH?f_Con5;mPfp=pS0Y(>`kr{1
zVuDzcxO1ww+l@yZXEqurT~I7cn9yVt#+7+qZ^6OT;%&#4+T8qKeECV`Im^ud`{xw@
zn)8HFu|>d%141lvy1T0J_~VZiHc{@syZ_zaaW`-K?X~}=`TOi(-VviW{WPnC058kS
zbOwWh$;<|s-}4z~SQ+n?RakiVAJ>D;dvZ#c%<2~MH>B$P<gZH%RIm+T{FAUVX=T&G
zg|Av>N$vP^>D_z&qfTdv`<`Y>E^vPPY~_<D#m{HW%B#EIk+5dw0-Ky?ybruIH2&XO
znZDrry=QlI+ZQB1e7Pszv}fAf{QUv!H`1!t^Y8j%b>MiV)&Im8!D%0uxzB1ym&&ll
zao^n#v%!WxIRBQ{8u<f9ZqK~hXSX0I*0k&SuGd_LS5+~b%?e{Gm{{kKe5Wc=Oz|PR
zSky10Kj&78Iz0Z8@PMIbN_pI$O2r;NKarUC49T;iz6yTfuTZOMbG+UsyKf)cmE?VO
z^_B_zs~*HX(E9m=sjH4{aV*<sj%xnqlT82ZUc}zqvv(=qGP$i&kKSiZp6@5p&+qKN
zaC`C#!3&&+`D5R)9j`lnS@LSaNvqpeZ}F|t+~K?3`B}B(*K=kbv0oTi8Kl3+)v{!S
zY+a>w>*<XDN;eKKtDkd^_3^$1<{Mb|eAmB`^PaU<?eX$2hbPRK`oQl~<Mx^tC-UPP
z3J;WBn8vd2_~p-Hwe0tvUVC<<;zPgByHBC_4BnVmyyz;EJfqwsnYMoW`sO>2)*QWQ
zx4?O?mmbfYxAO0_nWHCvmCIJt`T1s_KUaCfLN_fpKgVw?e_R(Yan30ZD)v%S`S;4l
zcRiCGn;%1bVbI(@kZFGo{M#@^DtE%CM8VZ*>q;0^!k_JZugAD`V`+M{){jeK^1jl|
zZ*JTV_kG9me5-oWwQWovuDtOup0BR?)OA6Kse#;EqZ#f$ycf;QvpMkV!In6#U8&DD
zRUO}@Unjj{&Vh{&b{j+*|N0tXcf>B+ck|nsuh$hbzdOKv!0@dqU&SOgJ9efYGkQSo
znDl(Z(jASD-IiPNW%<4+n$xwHZDziuxs|`eKcm;zTK-PRD8069`T5eYt8TlO%H3EJ
z^x?k2Dpu)h8PgBi0E0K}X2e-8hN>MbJkoK=>`Sb=(*Aw5OuKE%VPd@fOKuQvJ*U^5
zX&z}2C(fK~d6rkiz&>4q#q7n}Dt&?F^4C-yn&&A9M*e!Y;Y7N`W_97><-(R0jc#9;
zTK&-9oAPqEa$b5{r^ciMK5k6LlALE!R179hB$9Kz_u0zXd-GHfdD3OdAI|@et&d;i
znj!@(IaEtrBT7;dOH!?pi&B9UgOP!uxvqh!u8~EEk+GGjp_Pe&wt=CQfkDNgr?w~>
ca`RI%(<*Um;G7@Z2-Lvf>FVdQ&MBb@0G+lzivR!s

diff --git a/res/img/flags/MU.png b/res/img/flags/MU.png
deleted file mode 100644
index d5d4d4008dfb8b9e00c2bb9021bdaff6969f6888..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#I(Ex;TbZ+<JT4(Az0cg6+Zk
zDO)U5ws2oxxz<(c_FR^QijF+(3x2ViPVtUN@lM`iA))8n=*WBV5<kbSR~9L}Y}X1F
ze>nD*{fOl}?q|<;KCitN{-kElox|nr-Yh^1!Qg-s&+o=5L0*z=ci2mNpI6R%-f90=
z#pl1m%rj5BT;CZ!I{*Fl+qB@h{)O@aiyRZDL6BjbRUO|8Pn#n7>x{F1-Po~VXZ9``
zksZrB_rF`gwOX`kYe|3goFCePu`fSywDJbrkeJf;L~xx;qjsUpr!8x`H<tL!+GBSt
zDqr%kx{u0ByEQ;_IP<?O<m=^@-otLP_nd9Fa@MO8H7_mvui8uBnQXDpNB`A@9UFE(
z4&J}<tgZK-uirbjndqNC)_QhZ(AW3Q?+PESzrT=I$~AGJyujOn{>M#{xl)<lDmk71
z*Sou{ekJifahhS>p{D3lU83(ETPgVR?*h8{NYEmId4>Lu8~6m@u1tP>Xw{>gM)x1h
zQ~P(yXz|%z?%PZAQXjT}yb=7YP3&sr677$#o2q5p_pDmX;q5+S?x9PDa_+A<viGJ2
z%z&Z~J1@2b)#f1r_lfwS_Qa+y*}?~afvsBN8c~vxSdwa$T$Bo=7>o=I&2<e-b&V`S
wjEt>J4XsQJv<(cc3=Ap`J+(#Akei>9nO2Eg1LyqMMo@Hmy85}Sb4q9e0CDmjWB>pF

diff --git a/res/img/flags/MV.png b/res/img/flags/MV.png
deleted file mode 100644
index 0f2ecb43896a924d5f46e5b972a58bfd29d37005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2047
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
A2LJ#7

diff --git a/res/img/flags/MW.png b/res/img/flags/MW.png
deleted file mode 100644
index d0a5d24f5597daa61383e0b9884593a6c75c55f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2141
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
DckS{l

diff --git a/res/img/flags/MX.png b/res/img/flags/MX.png
deleted file mode 100644
index 096cb1111fa1b35a18c0e60d286a5c37fb5a3ca3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2140
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

diff --git a/res/img/flags/MY.png b/res/img/flags/MY.png
deleted file mode 100644
index 17f18ac51924e8a76856b89a194b741bdbcb9245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3081
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

diff --git a/res/img/flags/MZ.png b/res/img/flags/MZ.png
deleted file mode 100644
index 66be6563c63c40bc14a90eae8ec739981d47fe3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3367
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

diff --git a/res/img/flags/NA.png b/res/img/flags/NA.png
deleted file mode 100644
index 7ecfd317c71654c146f2a3e1fcc702f96bc6a96e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3679
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
RNH{Y9C<Al-GF@!=zW_dA(J%l2

diff --git a/res/img/flags/NC.png b/res/img/flags/NC.png
deleted file mode 100644
index 11126ade7707e26159d90fef08138fa1c35d8471..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3254
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

diff --git a/res/img/flags/NE.png b/res/img/flags/NE.png
deleted file mode 100644
index d584fa8429e64def9e3d6517b4b215ce237da7ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1660
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

diff --git a/res/img/flags/NF.png b/res/img/flags/NF.png
deleted file mode 100644
index c0540425917a40d39a034213f4f8c62f4416bed1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2520
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
Hy^{X{CJl@_

diff --git a/res/img/flags/NG.png b/res/img/flags/NG.png
deleted file mode 100644
index 73aee15b3f35f4d032a1998db4d334eb32219315..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 563
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#Nj2T^vIyZoR!_=*8?P(e^OE
z+%?2U@gq|)v%X@J!Yzqyp2_K|F4o!Byb(8VE{RN9%+XZAnQtH-prfR9=v@>mckr=T
zyNdZ)ZJN*0@0F<lEdhfI>r!@g7#@>&z3XkGK{SVA%LEnfdj75?gN(chIaBPGEDyT*
zUqkKqrGKZ7-Fmjy<lQ^n`6Wv}?Xp|*ZpoVIG0UPSg>7B2)ROPRy8K$tr#tLc$t``O
zu+yu2>Alx)pZ|2(6<J?beQV;Ti(dD3PB>M!HFmD)cRRypKMQ{B_Mg35>a&A^F^jP?
zImDkoriOoi-u@;7^+!Yf2WBogTl32n+Ao1ZswJ)wB`Jv|saDBFsX&Us$iUEC*T7WQ
y$RfnZ*viz<%EUn1z|hLTpyJR|TNDks`6-!cmAEx<&W~*bS?cNP=d#Wzp$Pz|O}T*p

diff --git a/res/img/flags/NI.png b/res/img/flags/NI.png
deleted file mode 100644
index fd044933e4896c68aff43327a8175533e1f716c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1701
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
bd_;8QjsGuz)do{U0^sg)-ns32Le@V3egf=%

diff --git a/res/img/flags/NL.png b/res/img/flags/NL.png
deleted file mode 100644
index 0897943760ff90d0323d3207b9bde50e08f26c41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#RCKT^vIyZoR#|(3?3?;`qns
zciPtZTuCs9jgB>tGv;Le&*Uh^IytoYpn;<RTesSOrsl+^!Wrz^d_3i@8*-90ge|}5
zm{mUCt<eAe-g|bvzsEk>{5f>b+CmU$9S}IUez?v5$fEDD#px~VUwtLo5+&H|f1SL2
zZ^7-}MNz)hy+6ZOmRP;rW*L7$PGIvwgW~}+k~Pj4iae9xD(?BZ(QXC%QH85=*O~Xe
z+*q18e|F}qu&vu0OB1^%Z@qjq`E6lh?2WRL{{`hMY~TH<o)l=3Gqd>hA+G1AdoT5V
zvy$_0J858e{95bD&~Iw2Z*y$|L?^lz=fp?YYH%$-vVVF_Jey6sW!oVc=fu8^|M*Ya
zEzxnm^|<O`*tfF_|E^v+=gU){YH@v)%Y3reT6?S4?|!d+Yj?#072cP#l3yR%=J#st
zY38@N&+eCgew3Q-l^1&>!QkEuoy_%*TmNmj@bBuC;yT;wSMD7Zu6~x$7Mv7z&O&w7
zV@s&lcv_+MJ}h2bf9lIlXlN~X!rk5#Fze>SWBkCdQ!R0gC`m~yNwrEYN(E93Mh1rF
zx(24YMiwDP##W|=Rwf4828LD!1{H^%+M;O4%}>cptHiB=bAD_iD0)0y{an^LB{Ts5
Dxuyo8

diff --git a/res/img/flags/NO.png b/res/img/flags/NO.png
deleted file mode 100644
index aafb0f17761442e115d157c6b3ee29b7c6758645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1695
zcmZ{kc`zGz8^?bVK|<;#Xe;%uEo((+9E~f7khrR<E3R#*qNQ~tTUSzvwc22@yQ*Ha
z<yD4P-B(@JHriUYr72c~qN}A!;;2Qdy4juCdFP#Z-)H7|KF=}Vzn+;d-^bexiO@#?
z0FX4Qi?56}f2Nv(tWJ%!-;hB*lITSQpeavzHxwqD(Wj}tUI3(g4gfa;fcLT$cM*VZ
zumCJE0KgXkpc_}(b=*OAPzdvIbCFRNJLK*(8Q^i$0H%zLzj8I2G%RZrSu`(-;v8(h
z?hz9MKaLatST4<l=$ACPQW72GM?q!YJUTtC6Uh4tLorxvFRSDMc;Y0X(~N3jq;nsY
zPlD@wVO+*X(B*TA28<zl)tS_OS98kz7xF?znL9$?d}IhC%qYxmZJriNBzkGf?LN@>
zZn3yHd9Sqe=fsE?zjQ}FWzUG9i0??{J|<d!gVK#IPUSreYodSY+upJI$snRd6l0V9
z>78KqEtu|lQe?@jGDLju8KI#@!pCwQBt^3mkh%NG*O-sfIqYESRJ2+u{!o~gMRifq
z#@G^$+vSv-L^aueLOoGo{W5#=S@E%Q$<-dAlziXGf|HzrkBa?nM%fv*etSrgAUAvO
z*&|F6@#I)JSy45`u%WGkLD}%hgrNo-0a;InVIqL2oS}2eRg|&prvjx1IikED4C>S3
zat<k|$!qR5Ogygq$xAFyg5tvXu=MIj5c%WT_NukgE6H@`nh2|2_Yu8s+p?LDpYtxQ
zNY<Z+$Gh7r_+@pL%Ci!tprPzr?nG?W<)?!Fg>dM{R*y*{I?!x1flyR=LLczS;~i_u
zDFWEVxF;XtZX%!eHED}ecMgqyR%HcKDlff@-ugA|O(R4cJhZuTuY{nWX3;Qc1;$(8
z_f9iRofC9Wzqo><qdRRIw)vv=xpv$L)9acig>biJ;v|B)f4ic?+H}=vG*ZwtFZmQR
zqvz~`@P#Yly0T32NgZ#<ydX=y<p+ZNuczX*A+IJW=k)=G1(v52f2cVy-pmt8B%Ymo
zHw|;ffFr%&8X~N>slRc5bz%2>6ky>Qu+|jqp<+#GODIw7#<mM1DA!yR+N~iMyH|Rb
z5M2AP+5v#(nSu-<eEw*>uNGug1In9rH0qYhk)!ekBp~3kw*0Q~hv(V?>t0;`5JR8p
zsrh{?V#oMok_}Q{fAw&mFJvP9;<>YB#|qO1U~#pt8+cn*pj9vMa{~3MDICLIO<igW
z!J?y6b~8!&7E1>2x(Nk04(UQeb3(Pi#pOC{@g9@4aZrczlG8Js86rAmwc`3s_Bq>U
znn~&I&2rQ#rF*Ee6YzH$Z|TS!9kPqcsH8E?zfS=pz2k7(L6y6v0>P}?JOk7Vt<`tO
zLyx4EXx6Vc0>Og)vZ&yaTWaEF^m3I)SW_g;VI@GLc3!;`44$i3?YR!>?G_XqHSN%~
z;TkM=se`yx`F(`r=Fm^s#N60mjTz)EWA!_tfA`w<#9xU2vE;^NbF}1zv&EV4<1ZWA
zDk?Mf^gPCCa8A3$?pK2uSvyCAww$gcUTsgWvMK9~UFF;r1e+nob+mTode9GA>hd&>
zqbsJxDNwSnA~dkLT!>OF7#g!Wz-^I4>RXSdql^y^mUACIKQ&pGCHA=g&!AvGwp_o?
z>B7h$=jMOJz6}^-1`K=u`GSd=pG`ep=WUP|zwJ-fULYQ<k-jW~sypVsGW;5z5VCt`
zTV?k4!J2L}tpx`@Gm=EOblbVXV!c(Dz)9F+?nE^9^@VQ>acU(-mvZUwdHcS&-f!*W
zCHa*#CrYET`vXce$NQL-hIlW}^@6H@-BEZC|IO14m#>BM50cC2|HvHB9lnABzDWmw
zqBpvbmctpjZi4HHLCG5(S@xN@F!CdLbA&y6*gwtxF~;j^8||!n;O3izLPOH`o`o%3
zwXe~7c9_G9{&E!#w0)9~(FlpXV8=vmbgfa&rZb;H;9m-vQKD}~^&)Oj8paH=`t}yj
zn@fPWM|G<=Q2Ic)y}Jr~!tAYGqr2)c%5q<T4BR6piRgLjbS84dv{EZBe)xIA^?kby
zHLs7A7?u5R6B%7_Js=<JZ0q|U1N_SlC;4fBTdR%yeNbvEGizfOh0Y2OWu3vFPB<e2
zu)<o}nq#fat?c})j^M2=@i?p*))J4!COvrN_+NtavEgSUlK;N|elvt8695{;+ohhw
GNdE&49p{Ar

diff --git a/res/img/flags/NP.png b/res/img/flags/NP.png
deleted file mode 100644
index 744458e17e9f8db26d942dd0f7db3b186150d21f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4044
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
ZOQ)d!-$0&kjkqxYTIzagl`7E4{{T|%s-6G<

diff --git a/res/img/flags/NR.png b/res/img/flags/NR.png
deleted file mode 100644
index 58c2afb228aeac0c04d19788d9ffc67a6b0dd8e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1620
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

diff --git a/res/img/flags/NU.png b/res/img/flags/NU.png
deleted file mode 100644
index 007c99eca5f4853d82d570145c53c205a36e1288..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3319
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
DEs7}3

diff --git a/res/img/flags/NZ.png b/res/img/flags/NZ.png
deleted file mode 100644
index 839368dd7bc198f74a45377d558737e7c0eba433..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4697
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
ale<gk{~sWIYZHAP0CY4A)hpGIG5-N?B+gR+

diff --git a/res/img/flags/OM.png b/res/img/flags/OM.png
deleted file mode 100644
index 63a893367fa01abf147926547ed5f7790d82c6f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1886
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

diff --git a/res/img/flags/PA.png b/res/img/flags/PA.png
deleted file mode 100644
index 3515d95d371fc49f62d94d11c8a0f4f41b8941e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2285
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

diff --git a/res/img/flags/PE.png b/res/img/flags/PE.png
deleted file mode 100644
index 58f70b8d180148dbae6630aa058b977ef20f850d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 556
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#O8JT^vIyZoR#2=*8?P(e^NZ
zQC_lxql*svYKK|5xh)%d%|Ec+JK$Wwod19~N9>^5TeGIAKAK8RjY}dgZoKHm$+c;X
z{62qc`~N(9zIp(y00Ia7L*>kxOQ!^#tF`~KztixT#Np|7tL<YiY)g#{y=!aGbJ&j~
zNN%h6`RYqvTWfcfsvoT^F0h=+mOk5E`t_uBpKH%ey7#>P?d5&fA20uW)5+`br>sr-
zd#~`T_wNqcp~-hWZ|NVy`x6&s%-R)KXZPY=R!L(*8b?|i#l(BJ`YW5>yFoqSe~*Ff
zr=4Sy%;wub5!Djch?11Vl2ohYqEsNoU}Ruuu4`bbYh)2(WNc+>Xk}ucZD43+U{G=B
fsV$0z-29Zxv`X9>IOoSUg6#Bk^>bP0l+XkKgh0L{

diff --git a/res/img/flags/PF.png b/res/img/flags/PF.png
deleted file mode 100644
index 2f33f2574f00952986b822b406ff60549712cd74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2379
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

diff --git a/res/img/flags/PG.png b/res/img/flags/PG.png
deleted file mode 100644
index c796f587c634102586fa2f81fede56571b727b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4393
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

diff --git a/res/img/flags/PH.png b/res/img/flags/PH.png
deleted file mode 100644
index 0d98de03861b0f1ca599d8b86e67420506f34dd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3160
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
QKL`M4EFB3I7UYEg15A>^?*IS*

diff --git a/res/img/flags/PK.png b/res/img/flags/PK.png
deleted file mode 100644
index 87f4e2f49246e9d96d5bd056ff6c8960cbd9247d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3165
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
V{{h-;yNI&@ps#ZcTcU*{{|i5{ym<fs

diff --git a/res/img/flags/PL.png b/res/img/flags/PL.png
deleted file mode 100644
index 273869dfc68e9053d53149120c87fd24e04dc7c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 567
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#P(&T^vIyZoR#s=*{9NaqMGx
ztmvAw!#-QMnj8&cxBon=bBy~JCyQakkxlXs9`Pha+qiBvXFK@d9?Ruw{?Gr9PUq$S
zbNbyZMxfz9ptoy(`;;KBl_KvGe+VY`7?$myyDgi)O~8rcUh(az#pf*j-$&m&{K1|@
z*xA4k8*#P1bDM^@^@n-aH`p3i&zbl7Am8rV>W^`EH{{4qTmC$2!_}+5e^fr+yDQPy
z*m~x?)d%OT??0~>w>R88r>wqu=d&2zZ(F6>w+Fw!`u5e?W2N7-HoVLHp7H!nb=l>2
zZxXB4uxWR1(%GY$C$sPH5dj~bgII}>|Ek~q8k~84?=!?#3^^V7xw{P=%B51@0!36y
zTq8<S5=&C8l8aJ-6oZk0p}DSssjiVlh>@|CsiBpLfwqC6m4QLUp{KSe8glbfGSez?
UYv7z8+X%AL)78&qol`;+0HOTMdjJ3c

diff --git a/res/img/flags/PM.png b/res/img/flags/PM.png
deleted file mode 100644
index b74c396d924b2a6ed92ccda1af761bfc26cfccd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8583
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
D84nhx

diff --git a/res/img/flags/PN.png b/res/img/flags/PN.png
deleted file mode 100644
index e34c62d598f45963cb6e8fa94d45148be7fa9510..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5945
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
Z2V1}YKR}Xe9{Mi;s6WtFDObXT{SVY7<RAb5

diff --git a/res/img/flags/PR.png b/res/img/flags/PR.png
deleted file mode 100644
index 8efdb91252f66282e519df81eb733aec48cdf8a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3673
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
G!~O$9Te$fE

diff --git a/res/img/flags/PS.png b/res/img/flags/PS.png
deleted file mode 100644
index 7a0cceec00db13aa85c8e7acb9ab795f3478aedc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2147
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

diff --git a/res/img/flags/PT.png b/res/img/flags/PT.png
deleted file mode 100644
index 49e290827c89fb6aaab4b06b34b894009fcd7bc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2617
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

diff --git a/res/img/flags/PW.png b/res/img/flags/PW.png
deleted file mode 100644
index 6cb2e1e70d22d4f8e969a12e820f2b459c4acf25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2714
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

diff --git a/res/img/flags/PY.png b/res/img/flags/PY.png
deleted file mode 100644
index a61c42c423ffeec7be58f3cb8be6d2f4f2457c6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1519
zcmZ{kSyYk<6vsc2Mare7rWCAfv#iko!vw9wFf~O@2vSN>Q&Y20!Em=U95u{SjZ5QJ
znNo}+EoS196iK;3kdd~iS%i>drqpEF49)3b=3(wR_x|qoKlknC2l#oK%|pxs0Km-K
zix_C2(>GrLHN<BFH>(T)M-xZ{0JwT;{+BR_p|*+e3M2tQsx1Iy=K{d2p_Q!x05%E$
zv<v{imjS?1W`$_Ct6=~Q_wgheXs}N^TC)s*GrfY63}pP{@8aBLh6Kj)CV9X{A=XPB
z*CQzzlZK-&yom$~XJ}$D?GQQAQaUyHw8TtgW;6)xB@}{#7DHgGpjPfBj574XvkSOg
zYt2oJ!pIH<Mz*_r8J3RW`y>aTxkOKjZ7h&5|6K3<8uUu8Pfuh?kAtwNh*vc|D=o0U
z;aiqpPpa}))XHL#-lt7hC_5(8+)P&HE^z-IzE+C9c8yJOT$eXAn6C*>YJGmVnQkZT
zTLA_^ASo$S=^_=b5{qqW8Xbya+ayHShQW6tN*Ld9Au9igCP%5=`;vMAQRg(6d9#_m
zOaMEp4JIRoI)8RPOiO;7?I*{ob)3~be6CeT&vdYwUU?0PShR@wQUbSDqw)xiit6z_
zHQfUTnyiFjJC2215$G`i$Vbk4CsfJRlMoQt1eiy!_zT@;6-2}y(x|&1JWZxoqM?qD
z_$=sYbBfS|mfanwqAcgL^f?n~IgFKG<)vC)1Y#5CuGAgxSK6!n<ae8B7O*AP-0Z;)
ziu)cSgmoS-4qCQoEJsHt=WDOYo*b@F&dyAdvYbleGHkD3zSKh1Jx=I~nO-SS>Yw$|
zxew12g<rhOZ=MwuhznsB0p~YRAeuLQm(@QVbk@+{(SZI&7xJVIJghGCNjLZUu&#Lx
zFE?{c>7WlaEk6-tVSzUqR9?R=OU@C6lCJZNshS^CaU*wlPql=ucZgyuhl@yRjQ>r4
zAwJU7as4Gz%Lg>;+{fkd({t-;MqiVq$bG{48UAh+GBGq`O_n0|eh@BPqQUSpnKJD%
z!RWEEcw}Rn@mvxt^K^(=4DPZISqAc68~{)Pckl*sPKuGKCnTedAM6*CeG_iAi8jg=
zRi@G<)e~7ScieK#a7zoE=bN%R?K~bR?^C~ufX*N$w{4a{c=2DSN%i94W_D0qj3i~g
zU9DUze!fkbwf){-k`eB>=<2<Fu~o)z&W6~v`-6^>FD)hLX3ZT@mgh>3)-{oGxoaCp
zZ+6+V;$xz_g600Y75XtZs)m>>s+)taO87(Aa40hF7E61UY$tPjd@(2eW1EGeQ%hmu
znGqefgIyWNP?d0Hb1q@sH^h;+r{evkbK-ZY8s*50OEj^fxnRSU-<Cg{C=AK#!+MV6
z1rhg{@J%u!f_Bfs+8G~QxswUE*8Fog-(qK<ZkntuEpC0`B<Db8g0~W7P)||I@C%bt
z?a*y~oQ7UTWzyDJ=JmGsf`XsaS3}g80*>`Zdiq^C(@HNHe4W^`&p|+b(INn=H)olu
zH6s~an>x?961F`#>VlZS6{kPKC3Tt@HgJt9oj$cS<>i-g;hd^pGIl5E;zKuXw~aBY
z#i8DslBcCCV+<d;9XkvYi$;9Jm>T1p?VabXC-G4^Q<V={$@qhL$p>NlANIJznS{_0
zP))#S&z8)SjqOW!=IQt@y%U+SYOxtr`nJSdg;7`y)qdrz21Jxn5WhY4$SW1QqaPN4
z9IyqtP*9s2SP#__YTJ8GGR;4Dpl?}J_3%-eVwE7`gWJK41vZ-k7AHJgcn%U<z>#T-
zw<g}LW6#t^{QBv_wkY<_sZ+nC6A#}y8IrgEd}Ymm-Mxl2{diwMA<SKE=7UlQ!QZg^
zI`LGrv<N=+r>pP3--;yuGqQMUMFguk@Y{b~%ktREIuOQ+#787X8USEW=q>grtUbn=
wf^o!S(fG}%jVLr8h2q?Kz4bqW_#+2mqEh}}0I%ME%pd@~J^YBjyEBge4U4C%qyPW_

diff --git a/res/img/flags/QA.png b/res/img/flags/QA.png
deleted file mode 100644
index bb091cc88c2ee7548fc207a5bdb851a5d0149343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1564
zcmZ{kc~sH~5XXO+fVbHpl|`<WYpn+!h#{F6q(+{Z_ko~jYEMm4Ofr<r`zS4x%45r;
z?AW}*BTZDuJhMziN((7(w6v&PUE2S4_wBry`ONXY|IM2;CkGp4g`Elj04UqpVqK&(
z`x%?S(kvLNFOotw7-NqCfJZrss{tTsuSv3Xu?K*2Isibw2ms%uBl;8ooP`6x3;_U8
z1pokzywT{4mM*|VybV@LseL=rbU_OFNL$ZnDG7haVwiQmw180T>~WBHpj}WCT@Bas
zVgLXs+F>!SRQ^2w)Nxn$?cAmHhUik3mZthuT;Ksj8QV1dsLufVnp4>z7}4p)I;zbY
zVGk4d9?VAPIxNH4^w?DocR97FG@MVmE5=EW2$sF`UPddayXQuNt}XFLnbF%Z(W+%{
zmp$2`2r2F=L_)XXod4~jR(vh(kI`_m>-NWLkhfP6RYRe5UdaRgv`yQ8nndA3gSy5^
z`merAputov*vtdIikp7obA#Y^gKJiC!mjwZj1r=C-`c7c^@?}vOaLmCpzjqg6KIqX
zMCM6ma5f)5ER4Kpe62K|2!c|qN=i4l2cdWv@u*pS)?xOc>D6ZzDuTPHoAD$$kNSp7
zv!4^Qsv(!@hyR>D9h3RNsD)4#c&7U7epPeQ?!y>dpu^xdQZ6*#6omjAjE|l;BhfU?
zYHt06L2k;^OR2RbKyFE1&5iVsXl>SoTx`h|6Cc^Au1}0ks5PHUNtH{feCh3O7@M*v
zpP||jn-tS!c^=gVuBdoYrM<C3;oUC@CKhI&rwrG(T{xkFAC<e9XN5NJA8|kUy{(gz
ze>0xfmYm=XUY*+bRk8ca$sSO*)i8}2P?9wmJFToKyz$mp$x8NJKn#s*($daS>^z&D
ztH`%H-y%XU-?Xd?;SeR^z5B;~Ww_6KzeM=7MF+V%wt7woh<gYRL6^&MX$E8-878!t
zGp!nxQ6j>M88uwL$%2hcbulfba;w6naR1s1FhTc$Z6fW&HKlUH5Ylo}qjF$gW}YfA
zMXwlL+R-mjQ6!l~S-sga9N&vqt=41s<&eU7$(UD+tz+pqnlvYlU>eyrZ&3`0_fITW
zLk_AiByQ}C&>E6S&eCo-j%9V?CSod3I1xhOGUi9pK*6m^{&vF-Y|i}{P|H5ifa!;X
zkT<Rauf1rs#9VKYrhH@`+MsZE@lvLtht0V~w^^6Tur4ii{=-?aGFyIw9fR>B8`R+4
z(!V!^@2hcg9LTYG)iBgAt9IZ@2X^f-$Yjmd)h~SsR8?9Kb|1fE=7!FR(k~ga^%@D0
zxAc&+OeOZA=EyiZWAyB>`K{>#sX}7ucJO50an|UgLY_q1s6cf`?`M39gg@wsmkkpw
zUJXc_5Wyy)Y?bGNn$_s?r^&hZhvJd#?e;?}h)%-vLba{q#s+NTv)G>OekvC_r<WEk
z>>vJac4z)2zVs=n>Fl~6o9W&7yFj%vyybQOu-I#}l|lZBF@&x{P6-AJb2>g)A6gd*
zoW-X+6~#Kdm9##3S4B0m!iSOiwZ-xHGa#p#zGB%nfhHD{9w&_$a5~o`IWOK9BU!95
zG^^32+#L<-mKjDdS4wcRAD6+obq*1p@|sC<a0^ReA(9meTWc|Av1n`0%JX-oPCW^D
z{vI(ARo?A2zA%9fEuN)r=`cH8IRn?O6MSM-e5qy%Nj3<dZ*k+7=8Sb=`SqqXu!Y;c
zF#i~hqCP66)JUyX<_YHvFv<Lscn?w}lSSqQqlFgtEG{dB`KB*<-3`*E^ePpPM(kZS
zyk5Aw31Zz$O47EZ*YldysXmZ~F*Q+-tmQl1vEJ-nG#A>_W->?bNZUg7&Lqi>WUyTJ
zxMSMG9{aV{DDPa2P-Vv}?22-Xo~xo$osa7{;b6%>Z+c~OUn{m7Z%!5;`OgQ!Is283
zZ@3mVe%-V6$bRXk+(*HAPyz!eK`7FhASnQ2xDiqxj?gzYcQrOaA&gL_@ZaD@C^($T
g5gq!6;B-XbDRSKZ3*?J^6Qu&c4(EV<U`<H+3o$gqsQ>@~

diff --git a/res/img/flags/RE.png b/res/img/flags/RE.png
deleted file mode 100644
index 6d50a0f544ad14e2da315e53fdeb187d3c8781c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LMOT^vIyZoR#|-pj>NqU~e(
zkyycIoumjJqZ@lTPbZm3x(Xc8kUp~I;_VH3aR)V<eDxD&``p>EXouPVTDHYHQZ_R2
zHFc$JGZW|i@dVlc1P;oV%B8(Dmrm(eCjaaHlR3rbUV6{}IbZ(5>(J0zexKQzOB+QN
zPw(B%z4CIrr2ab3?XSbltILCy@87d!gX&QYr}X*1O@Fj@t7om&&I~;-<y~ldx87>1
z9RK$I^719$C;$H39<C|7RWF)7$Y+u4-CzF_t=6u3Sn%yvOl|mLJ{DtV17nJb9_hb<
zn~(KE{L|1@!=M~z<LK(;eF!L`TH+c}l9E`GYL#4+3Zxi}3=GY64NP^7EJBQotxOHA
pOboOQ46O_dDh@rhMbVI(pOTqYiCY8b{Mbg2ou00KF6*2UngGqWv!4I}

diff --git a/res/img/flags/RO.png b/res/img/flags/RO.png
deleted file mode 100644
index 4495d29eb024926848514f69b7f1a41e30cce4ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 555
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#O8IT^vIyZoR#|FptTQ;n>IZ
z(`UEF%$Ttxt%|egA+N!VPRY2&<ueYxVN^5tF5scVWZjh6<gA#kFjpbCCFf+(&f1&*
zpU*POy}W-N3(x`}*rHUkU18~zpi?{FcK<UsJSLI6<3;eln&yiccKPp`9>#g^^{A|_
z(mEFO^+M&J30rEbbzki*v9{>%fB*dF`mg)9ovQu1B;X!Tv99dy_DI8tX65HEpYyXS
z<=<>D(J7KI)Vp%&zN)i(okQ1N?>_qV=c1j9FS0bvRGcA6F|kkjZ{YQP(u@#q=>BB!
z%QtmAeavSKP(ZcBHKHUXu_V<hxhNG#F&G&bn(G>v>Ka*u7#Ulc8d{kcXd4(>85mR?
gdTNWJAvZrIGp!Q02G04hjUX#MUHx3vIVCg!0GwUKT>t<8

diff --git a/res/img/flags/RS.png b/res/img/flags/RS.png
deleted file mode 100644
index ebb0f28a7bdf6b76c944ac6808319a7e4cb98945..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3349
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

diff --git a/res/img/flags/RU.png b/res/img/flags/RU.png
deleted file mode 100644
index 64532ffa58af755f27404820c7be89cbc260bbbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LeUT^vIyZoR!>?|s-o=GaH|
zuktAcFRtk>oW1(}0Z*1(cJ=LkUEQ<w53OAMZXfgO2P!jN1jHR>TIO^&dAF8r&^jir
z&^i5}-1Xme*VJ2ne=NA8Dg?9$2p+h6xz1cU?|EgM$U1SUSth=hO?vCT8t4CRQt_Om
zQfPbZjqx#w<Wry9Ub8Ne<ND0gTG@8U#yN4`LWA=W@vpn9x0bxA+R4~ay7cR(8@o1S
zxa!|3w)JJ`>G7$|iM_GG-s(?9DUiSG*7~ls+}ZZI`E&2?oR{|P?kktoZ$Irh#wT6p
zTNcwV+`#O4{b^yZan8c)73H?R0(z?tNo_x}D73)4r0>1K`G6Ve8fT2JrO!~S3O@g}
zi1~xg%Y`=E^m9DtT7G-{|McqQ*N3M4K6-Y?>#A7_Z^BxywZ_irm+zmoE}hfCJ!*9a
z(B{0l&4-sIhloarf7>Zo*yek1QAyO)+y7@hnr0!pamgB+wDT2ke?e`#{>ws+XVaN)
znUH{DFn-2fH_iP>b3(-fponUTYeY#(Vo9o1a#1RfVlXl=G}kpS)itsRF*3F?HMBA@
p&^9o%GBBt(^wbtbLvDUbW?Cg~4V?318-W@aJYD@<);T3K0RVE30(<}f

diff --git a/res/img/flags/RW.png b/res/img/flags/RW.png
deleted file mode 100644
index 64b3cfff04b69bfd82c843aae87f239df697b74a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1695
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
XCjNf|yyPrXY5;D;6HbpDgVO&5*X#CH

diff --git a/res/img/flags/SA.png b/res/img/flags/SA.png
deleted file mode 100644
index 250de6f6f53cd9a8aa8219524ff5b52b4593ff01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3750
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

diff --git a/res/img/flags/SB.png b/res/img/flags/SB.png
deleted file mode 100644
index 5833c130eb67f788b8c1a3cca7aa5677ded687ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3424
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
Zdbx-Ge*<%Y1OCha7~V3`BkQ0D{|57wS|tDg

diff --git a/res/img/flags/SC.png b/res/img/flags/SC.png
deleted file mode 100644
index ce5248f434c14871a4d3e0ed4f21b5ad882a8ef6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3704
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

diff --git a/res/img/flags/SD.png b/res/img/flags/SD.png
deleted file mode 100644
index d8711a83d695b5f01815e1733b510fb86e701f61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2103
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
DldQAM

diff --git a/res/img/flags/SE.png b/res/img/flags/SE.png
deleted file mode 100644
index 81880931f392086201cb9faf68efda479bcf8df5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1278
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?|IBx;TbZ+<H6PHzOug<aqt}
zr-xO9oKpgJy=I=fjV<QOX^w3>ULJC~qNF5JIB}b_r%codrzLui4!LHkrW7n*_P|L%
zGgLWGbh2wsc3AJlB_GnnryRV(=a;nn^SbWuerhM5aB^18jIrH+w$-?}{qW!Y#rG|r
z-(z$Q6hWX&j<mgs98C%wYjU?Fd$qj(z3=^O(YdoG@2_}y=}Jgd-wfuM4aX0hYcoC@
z@BIDdw>x|NAD+7yetKv6gNwzvJNLUO{IQ&qxXA2$^{LknCH{Q8`02!9%Zf+G#ATK3
z4?Q~Wt=zwd@ma(5&ktNTY>qJ$j{d&>BFn)G0r~lR?`CgFKJ_f%po}wXF^}jO!w`ex
z2#yeUx@OMhLvM`5E%?f={YhHic=E$CT_(v-A`BdjFD6FaF7JFJc}wHyXFsMHiobPc
z)TY@VXM7|2+xhUd(&`mgW(%=S=5vYa2ng7F(}r>CNrU?(ayxRL@8FxGbY9|vxuS0N
zvTe);Y0oR<w8{^k_Fewy{!Xrk(`6n?HOw{C{I#Fi<}CNuV=f1mgia9?3RDVt_I2CO
zOX>-HvjTrxFqAXgaJKHwUUrUoM)}zlxs7K^O!!X}vqjDOd@jtMAzCGU-`$&{_tN&=
zo|16svN!L|UynM37VerAoj<j9fxZl@LGqc8w^miwCW<Y{-ch>Y&0&A`c&k5V3HvuT
zKeH;hlA_7rI?eO)|0z4!@7y~u@5b8uyURZs-}k?|+(7R3<3hQHeIINYtdGgeP55@f
zai!Twy?|xHKK7Ab2X>Sj{(Et<BBslIx$r8dg}+M#au!AJ-{-yWt%s4~`xO<hCj*`F
zrgqh8dF{(mx5bql-@boXYsW6O!`1wQfSl-};|FsNuD|Q#{%MmY-$aSTqIXl2JfoAu
zvIJEGRoC1XI=kcgDbELnRgc#HQQzjm<q(kXC*s4$5v;s!v5M{VHU5)0*Ut~E%09%Y
z6k>5kA^5}dvriApGTunEPSA4LfAW)U;H8T@RnM2Pt6S`yXc=f=dD53#vtnuAq%Sd>
z_PzVKtvfYr@8Xm=nLwp03tz5JyZ4{Bt9-hC`Mkzy()S#;GHg51uDAT_W%YZvF3i)I
zA+vM2`<0m!nx^mQi}E~w{3P?%6sL~ucAXl6t4wy9TqqTtkz@5~0sn!%8E5=-^SSnH
z-uN><D){2vjx7_!CY7iyc@VpD@dKHF)4#G@U;(pd`rf}+!w>w+s{T>Gb=jqTN0j#N
zThY4Z(##d2djc;7%%A7}?T2jW?O%(4ff%#Dg_&pJ^nyF?SQ0KU6<^pd{kG_ue1cZj
zA`Lk5YW~5#pn1~OUw6&xfMtPdiEBhjN@7W>RdP`(kYX@0Ff`XSFx54(2r)9YGBva^
qG0-+Jv@$TLIP}yOMMG|WN@iLmZVjCCV;g}Q7(8A5T-G@yGywqTS~f@k

diff --git a/res/img/flags/SG.png b/res/img/flags/SG.png
deleted file mode 100644
index 6f00e57923a5c9f0c58fa482d3ba6a27eaf514b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2210
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

diff --git a/res/img/flags/SH.png b/res/img/flags/SH.png
deleted file mode 100644
index 055dde68bc14c17434eb2759857b8818fbaeae42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4615
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

diff --git a/res/img/flags/SI.png b/res/img/flags/SI.png
deleted file mode 100644
index 96359834069bdbbf4ddfacbc677565d5baf73c2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1613
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
b!Xtw@A;<pTAXgBODm4IZ&K`s+M@HJeZ8yca

diff --git a/res/img/flags/SJ.png b/res/img/flags/SJ.png
deleted file mode 100644
index aafb0f17761442e115d157c6b3ee29b7c6758645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1695
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
GNdE&49p{Ar

diff --git a/res/img/flags/SK.png b/res/img/flags/SK.png
deleted file mode 100644
index 84c7021f0a94a119a35d3041b0d69ddcfe82f02d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2932
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

diff --git a/res/img/flags/SL.png b/res/img/flags/SL.png
deleted file mode 100644
index c5ed19914119cbc0ed6a8235c9c3b2b02595c573..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 676
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#Jsex;TbZ+<JRsuh-!Okz*ex
zUs|Q0q@=X8`=YCrIJ@AgzNT*H>0&ZgUdQh>zIb4|<L1IwrX8*_F;+jfsx}{8SrSmd
zA*Jsibf2fH;`hJ$*TJVOZCd7qumCLsf`EsAzcngwG%0i>zjcg#{CnT~-}n0KJ}rw6
zSZil@?e(qfp8av_W8Rfa`aI`b!-=*-I?jpH78;xmn31Y+#^_l3-tZ4u_Z+HY)bA{B
zJ=W@aIsSKGc(u5MxY>TYjppAM*sfC+o2>l!P+pn2x!#ZFSLb_EK3Msj?B$+)SJUU5
z$=2(V^@{^iB-EZCYdtz~j<;vEtooXhxkWP`dQF*Cp!%;p;Lwu^-(j{rb3eY><cU{x
z47<<Cg*xiTf&5i-PHy{V#>a8FpYQP@x9Rfi^Sy7~wpgH)yVI|)mpl5U+}v;dTenNr
z|Ml9ucfzFfibMDADaTjKvd=l;9X02nxla74+|2yPE!LG@e8w@Ih04#oLXKC1y(W?-
z$+elMH4^CK<eF>jj;lj;vii9pVdiks{6?Uc{NMTC+JOS9C9V-ADTyViR>?)FK#IZ0
zz|dURz*N`BBE-np%GA)x#6a7?(8|D|;?PrD6b-rgDVb@NxHWLjk8K25>FMg{vd$@?
F2>^841hN1C

diff --git a/res/img/flags/SM.png b/res/img/flags/SM.png
deleted file mode 100644
index 1af1ca284fdcff936c14d6f4a59e427d026789c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3009
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

diff --git a/res/img/flags/SN.png b/res/img/flags/SN.png
deleted file mode 100644
index d0b18435618b2c68d0f067dd732c37d82db84d2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1530
zcmZ{kdo<K(7{}ikgJCeUwL;{QT-N27A;lC%JL6KuN+XoZAPTv}5JF~}?Z%WY826fr
zkxS(o(_xaKn6j0%l5!`rO^k$^u)lWy=<M0E&v~Es^FHr;zVCa^d(QJc=i%<GthiAT
z0HEyZLiB{V?OS5xpn2%`#u5mK!;WM}0PbBxeGQU@YTXbQPci^0h5%$R0r&!KWxN9*
z0SkbL3ILuBfLd%(%if*Pfn4w&XCg!>KL5-+2|*#&#Wx-z_3xaE+|>&$<Y}&ClKiNw
zmYS8ZCM9hadUVE>=txN#6u*u-`XfoJOEUXDV7BH~R7P(3F1~()IvsHy9gcB};7|#=
z!3QzHj+=G$7zAXaM^Yr8ilnroRO!DJc<3{)HA?7ZFM{ct>D0;`XYnadM#ECQRqFsb
z)7Xdg^o=O>EjcVEadnB8|DJr}T6jU(_kq(}6)~p1McA!iyXR|#1YHag(V;UhSxC>2
zkyk`XqZz?j#+@=EPC~XOmKrt|8+TnIkQGlwyA*~tRioy0w-d6i-(RY0JJVxw$q=(+
zoe3BCuEbXhPvthe)PAt7JNjU9VjCAs`VD(?o{L1?-Ml5uwBwQ07Vr3ePV!Thcx>Kt
zdUKYFFm#ni_rGD)zwaID16ufbx5Wc@^C%jOyYc+F#d@C9KOHf$%GWXx5r1%mvp<K)
zhTDlhr02z-qz0J*oVyYcytHL7(bFdnR)6KwR6^+LvkN=^;CX$OFKh8Wji4f)AhSP<
z6dliAeKJl1Il}ggM!SdBsVb2x)*nOd>%|H+<EWAKJO@w1${Aqm?Y|kRq_zT(JH{)Q
z1I|fw*yxwGoJQ}*Y3~K_UTN#`e9+o{)4hzYUhoC8XOxm0S$RN(6%*)NW!PR(+rOcq
zs(jd+P0I`)v7ImtfoE4N>e25#TecVa<fU3jbOxLv#J#PLyAUW}!JWGe+!|tZ2I=h$
zjd}c4tvkYO8EVL}H%FW0_)?ZSN;6Y5_1OFR&Bi#U7RZ#-*<^m_QGZnnycxz}-DbFB
zrUj`=9;Cj`j~k`ipYf#q2Mh;I-HP=PZ%c)GO7whvxCUoa_k3Z%<-*b8iiBUdNJ5)<
zOapt-!2TJ9tF!Rv*c8Ez%$mozeZj@o8K3^-UDw0fHka~Ls-ZYv6``v%wr@JUFxY>&
zG;>Wg*NstUkUK^{a^dKRVODcNV!+WeS7yyq2ZvCV-Q~#f5Rl`p-jTO6GA7!j7*o|<
z7$>li3sm;K-!~+WcH8YeM!p+28IC8I)pZ%=GynMu_OG-?Zlp1mc|Svq5yM2;C{rC$
z&%!Om5iPCzy+(Shr8wlZN=Glc@$^qdd}I)^RlDTLOo?P!sNE)wK4!Ao)KSuQ{sfrN
z-j9K;`SjwQ9#&s!nyS@FoGdc+y4e0;=1PFo1^(htm(xb)poBG1O7i+dvi(w#C3Vl5
z^M+WsCq7k;4f_2|bM{f+(*!3*8LEl$37%24ZLay18ghqgU-SA*@0y3ko!+Y=e?DwN
zW1JehHCdte(W<6ZZI;<UW9a-9C)pz3!4l4XINMZ1?smyK&b^x3OMa4ymSS8${fKNh
z2|>=jVzqV4vxiqd-AJres(R%}Qs(Y&&_WS+FJSVh0_Rtmf^}!NF)z%)9>;d@(VaF2
z=3quPT7M3vc%7^=nrpf>Mgqk|Agt(wU)IH2P`Z6F7I$UP?BUEal2b|fO>=~L{)g>W
zEZZ$Gz3C2pgH|2O4-+k_P6O#?nDAv7g=Hduhm^Yr(3_!KR7cgoCH@hFx|oA<;Li3%
zn_*-m`UHQPyNzFa8r}8;LouOLL8WD-^b=)a2{zQf2+NKN9A5d-lN93r!ofH&9<_<x
z^Pdi0=w*%dy-AP0`Q2e4x53S8maEm7SU0a&Kt5<dBl*w{1<^wBA#tG)fF%~U-5hIe
yZfQfYw8C5C@LRE_SR5XUO=_RC`<Eap=1_Q8^8X7IO8x1O0JxIei8Z^ZjK2Ur)2gWe

diff --git a/res/img/flags/SO.png b/res/img/flags/SO.png
deleted file mode 100644
index 64e2970b9d41083607b9e8b50ca2266222cfd759..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1958
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
U0Da;~;R*mtQ#`KnEaBRJ0G45cFaQ7m

diff --git a/res/img/flags/SR.png b/res/img/flags/SR.png
deleted file mode 100644
index b072dda835cee73f1c890ba76614664c78aa8c24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1942
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
Kw$;`FDSraX?R!xG

diff --git a/res/img/flags/SS.png b/res/img/flags/SS.png
deleted file mode 100644
index 83933d4521de9250778610222e6b4ace17b17d14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3072
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

diff --git a/res/img/flags/ST.png b/res/img/flags/ST.png
deleted file mode 100644
index c102721a863cb86c17d6cf3196fd46ddc58f8463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2945
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
Biv<7x

diff --git a/res/img/flags/SV.png b/res/img/flags/SV.png
deleted file mode 100644
index 80de92e55692a8bba32f0daa8d018b2222e23dfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1666
zcmZ{kYdF+-8^?bRV;sjACd!DcQ_Ey%CU!PGGa52Pgto%wOfu__VP{f|aSqc)WgN<8
z>Ph7=YL}vME-}R9Pz-X6#e^<lTWM$adS2|lc<$?a-=F(%ec#?$?rulaly@lu0Mw{X
zl;ct!_$!eL(mFa=ds7PeFtRHdfSSuHTLCcXY!Kvh+!cWHCIGNf0r(_cvE~7Y!vV11
z4*-!1fHqW8?{QFiPzZE6LXlD$zaMT$l0pe`Iu$FW|KGWC&c0XL!0A+12lylmqrKlu
z*X!ak0I+B(h3v%`k%$u_J-so_tIJP9`e+rA2K;2F4jmkFn5d!S#x#?4gDGWZnc*}|
z50z=~G|&WDN7bK@NDphIVdg<}R(l$3fYl1+XYgetpaXL`S5O}(vD+4LdeA!UTyb$p
zufCmKUESQaThd1DTuCvz%<R%X<h)3k*1X&Q8=ZIuPc)bvnVSA9(!%>cq|MA!RBT<~
zwR!HEovS{1rDW9Wbq>Pm3E}Gi6CNtm`hOtvD26rP2R%R;vX2K*2ST&f9W&xQjkZtm
z6xYg<QNZ~WAZe)sWTzcS)zD_#wQ;{x{H?p0lJlF{u>0fdZ*mcf#NY|hnRE@6`K1DH
zR<0_|grEP-^*bbZ;}9<ye`yv@LcbOIu^g4rfbj&d6j$}rb9>CmN@8MC;`qw9xt!Ia
zt*loyeLFL+hXtcvU=1xJ75S8XD@zKM_W!wHtox?oVuVDcUfrib*}v*d-vPaLox=GV
z@LlR*A;9mlRm1z;yA@)@;NZPe>`UCQzF#~+qhGBv;!PRxxjA`CV4U-@6VOIIR=4#c
z%C<t*G@JL#qhv^S9XSX=+`a<gYz$#A1@+G7{;>knT*M=oivONtL$WT<s5B5RCn&?~
zjz)Pm#z$zU9?L4UWf*A<XZOD>O-BsZ-mO%*)h`gyh#zH_F&k-tdLtnYm~35zPl~jl
z?n4tE4}*0KbTYrBh@y4JCPQ~m3f`Sk-c5gcyK;vhm-FFFM5kO=7V=&*tZ)oc;+|tx
z-8Y}nnyKEaum0?P-p351qk6^GtIO)-rnlH%I{CJ738vye=<y$>jGJuH_&^#OWpO}q
zI|%U;Pmg~9xVOZEGG_PuKAY)QwCxoT+ugQ(712k#pxW$f#S4XRHExwlUOR6(E-iSj
z8Br=ko?Veh&q;~*EQ`wwtc`<H-r)p^Uss5K_j|k5a0^;4OrGmvIb(UJS(qct30u?P
zB9R~M#!l1@tcmPpVd`_WE0T$rjiSnNEHpLz=-M1X@eJBq(1}RMcF|j|X6p@x)mi34
ztAqS8_yx$Ki*P$w*Q=`hK~QGXjTJS6yAz7|#U}P)Uo%ej>4&fM+rvGE9=B-2vh<(j
zE-a+A+i0FhN<eZjjod?BGO!!Z)-$YG*B*|ZORn#(e=U4YYU*yRnfqSmkKUR`nlUmA
z(=FA^&Zo%mp_iw54I{)@RibsW!upGzpTk~w3{jzu#ve*YZz87G)qhq0tQKRr<LOq%
zceu>Q%(e~IL5H*-<+ZxYePf<}b+lVhJzXvXi3hm76|`F|lS0u4a`9e^4`kADBp32g
zyt7@WLzf?mt`$q-8^-3%qIzmRLQt!S3jc4j<$Lz}c>*J;FM|-tjuxh);}f+%HF5c7
z_llFgB*Jqzo9_sS#p;9(rq9%|>v`_JMR_OZ6)9b)LM6J!0}Hpl{53DJad>HP$Wj~h
zy5jcI3q&(i@2(z}Z5dhVC*QI0Wl$_u_~o=!B_3nDr*uOgGmyP|%7rv>XQ@ek^NZ7V
zO~>9M*OHVf{^saePy03btDAtTV+YjJj)L=fCce##&#}Xrr1z_pat01`I5NHmJ`=IA
z3WG}eX8?`rZ){LiMOL<O{LzXVJ2R4-a<;yejk->}cp@NKIFE}ekH&g@g#k7hGAq$a
zD}5Y#b4I~=1KF0dq_P0HpRr?d5{4``eZ>$OUzok9FdVgVZQlG<fy*Nc*FpKN$2&rp
z*`EV_2834m#y#dOZJ%~6RE;OP+jDlByma3G?~k<5i!>40s_!Qv96YrCq3%ij=WgPh
zCr$+f=|486JDj8k2hc-^K`|jx0Bf9;4HiehTHAVA?<W$hh<Kbi&Web`F<NKs{$-#=
Z1)mLN{(pl~sb8|x0H_Xblq!3F_MacI<u?ET

diff --git a/res/img/flags/SX.png b/res/img/flags/SX.png
deleted file mode 100644
index dd52215c5df2ad08a9a129641b545fd021a66928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3485
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

diff --git a/res/img/flags/SY.png b/res/img/flags/SY.png
deleted file mode 100644
index 78f45b7c0be067dda7934ce3eb266ea9c6f8b000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1195
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7?@{yx;TbZ+<JQ}J|{R;=Ge#g
z*5T~D8pawvJW-~4d@VN`SQawsoe<*L<=|4{DcU5VcgE+!0ajB%6~U<&;#L(fsw@!L
zVR%~Q(A5(=3^dPlYvwKfck<Ajn|x_+-b?<ie0a<%;kIIKdD*$T`Lo}Bv3>sbvW@lG
z-Q}!Hrv!OvLWr2eW7djOy_N=P3T|)qGhG;<A;L9t_b<&7tH#vU!%v^)?dSckt>>q9
zey()wo&#?iUj55Rlv~_d*(3JMFlxqeAm?#KWd5|-$Is|)f9%J&zt8r~jtyVz|BAm+
z&D%d)bAfF2n#AL+tZ`K(&z04SWb!ipAL03@qrkrN#P)=;O_R<xCqI*W{`_#tiQvQO
ze=L7(czozo(#f^rVowYrq#PS0ZBCRtNRP^7Q<8a5`at*94Mv?Lz4Hv_FPF1x9C)&H
zgXg5@`gs=uCm&^TuI{Ydoc<(nSL&OOdx|a3S5$BBdvBoUDb1g9@z3NlNqir;j;Dwh
z+{`f!J+SX~y2^{TX5;MtwwVXpUF51hCnm_t8z?8w6Mwovr6Ft4GlmcB=09$;SGG-I
zI2#!=f3x+QWJ`VbHvYB!Rg30YyF|@@_h-{z@rl3Iy)Fx0f8tE={F>mpkR|u_&CA>5
z8WsP-XUlSzH5upI&YhL~eDsOC<(tJeeD61KYU|XxZu2<#p)lG#yz#2`r&mpnSC@r%
zvq&ZVzCK4#bI#u9udn8Ju)IpHzCK4NGQN0ELV3uNw{Ol)Db-BgcluM`nUDVSJi~9i
zHQ(myby@s<-M%f~E^InAgJaKj3zP6AU%H+9!}InW|C)cg_+`}pXOinTbl!gX;@C3&
zikUxkWa@TRIv?LQ&22{A(hsW_Wp(@)So^z1l%<??%_7wcdsZe_pWfP2sbq6>QP0mm
zla4DM@8-*#z?OO9AM4VIt1q##HAixleO#N(Tw739_;i=QvOt%}_9;gmZjC&@KBkbZ
zDxCkzSNn;Tdt;{FZ@8bS@?yUY3ul_C|Gnv7%j=Gu5uUhM_<Pl4UH@~_zJ}fDivB3`
zhpjaEGWVLNk<*%L)L$QEdvv8x>P*ATv~Nu!p7Zx`?>S#&)^syvpE=_L8{a=HESv^s
z+bgwJEJ*s2cs%|Pr~0AJ0wwmwcP2YnO_EMOuRB&dO+9kz8n3Y4f2wl|d-u40HN4+%
z`P;)Jb=jFImbTGPPq(ZW3N8C$e-1V2g3|Hh)W84hFYJ^Jhh_*+)_6MUKLcw~!Oscq
zd-{PHSGB}7q9i4;B-JXpC>2OC7#SFv>l&Eq8d-!G8C#heTA3JV8yH#{7*rg3YKx*F
bH$NpatrE8e&iS#8Kn)C@u6{1-oD!M<6V4Q%

diff --git a/res/img/flags/SZ.png b/res/img/flags/SZ.png
deleted file mode 100644
index 2182f4ff9330ebefcb10ab7f31a4ad77b114ab6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4133
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

diff --git a/res/img/flags/TC.png b/res/img/flags/TC.png
deleted file mode 100644
index 3e3e19d4b3cd6794aa2d0f88df3e5d12b263aec9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4631
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
PlK`NvYpheIg(dzElE<D5

diff --git a/res/img/flags/TD.png b/res/img/flags/TD.png
deleted file mode 100644
index 753bec22b08ff6e2bfdfa4abd979b982a44d3b7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 567
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#P(&T^vIyZoR#&?|;Zq=J?0+
zAD3@>nYN(P_wEf3KBl8g{fy=(&ARy;T?~R&s>m^IzRAPFoA+H{!_JijY>Shn{=9vj
zzAyf3UitRw=j&O3Rsg{irJC)EOQ!^#+WDsapSj^NiR2%bmVf)q{Oj+>9Xr_Dl<z+4
zoFZ?2_|?iS<rg#d#(4Rso3npz++v@#CC-1z+rw!qUZ4Lv>(8O1r)92AbXtG!>fA5)
z;`~=Lzx?;Aro?9Qy<4v{{|2o3l6Cj(<|)&=76#w3H<`WqYSPB)y+L=bYA_u<BXEX?
zV&bt|{griv$`B7NP?1lUHh28-EGQNzpjzS@QIe8al4_M)lnSI6j0_CTbq!2)jVwZp
ujIB%!txOEG4GgUe3@Q#iwMEg8o1c=IR*72!=ls}4kd>aUelF{r5}E*~jM*vx

diff --git a/res/img/flags/TF.png b/res/img/flags/TF.png
deleted file mode 100644
index 6d50a0f544ad14e2da315e53fdeb187d3c8781c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LMOT^vIyZoR#|-pj>NqU~e(
zkyycIoumjJqZ@lTPbZm3x(Xc8kUp~I;_VH3aR)V<eDxD&``p>EXouPVTDHYHQZ_R2
zHFc$JGZW|i@dVlc1P;oV%B8(Dmrm(eCjaaHlR3rbUV6{}IbZ(5>(J0zexKQzOB+QN
zPw(B%z4CIrr2ab3?XSbltILCy@87d!gX&QYr}X*1O@Fj@t7om&&I~;-<y~ldx87>1
z9RK$I^719$C;$H39<C|7RWF)7$Y+u4-CzF_t=6u3Sn%yvOl|mLJ{DtV17nJb9_hb<
zn~(KE{L|1@!=M~z<LK(;eF!L`TH+c}l9E`GYL#4+3Zxi}3=GY64NP^7EJBQotxOHA
pOboOQ46O_dDh@rhMbVI(pOTqYiCY8b{Mbg2ou00KF6*2UngGqWv!4I}

diff --git a/res/img/flags/TG.png b/res/img/flags/TG.png
deleted file mode 100644
index 8501ada6556c95d2fef19cebfb0da6379a4e7ea8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2523
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
Kn>CsEr2Pl{GJ_NV

diff --git a/res/img/flags/TH.png b/res/img/flags/TH.png
deleted file mode 100644
index 0c884c329e1e463255364f44f2c4ba4703e567d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#LrBx;TbZ+<JR^uQyYo4Eu-Y
zE=!fBOki8NaQ3RBOE1RsTwC_9iGwq0u9TEgRw1v_qWuS!HL)FJE6yog*|I~Li8Fqk
zb(Qns*ZdvTe>^X(-~Ie|<bI{|{rbP|tQG)T2mv}<9OVso4jb@Xe;T(Ut0eY%Y3%Qd
z{xg2DZj4adyz7*$+XqX(r9oPi&lTUX9x6Do-yk<?_64?ojfd9To=PrCeCN6T_Uz~L
z*iN*za&_)?>8;+$6*2MnlS7Y|U)^2QTs`YSwP4sX<&!U~BdqEKUKjN*X1Hu*y{z2l
z{^41*r(++@a}#`i@1lTv=R(c5)2fA7_i#qfxM#T2Ks`%5&VI-8K!?~hr;~~jZ$2q1
z$p)FG-Nn7J{>9wM+}X=-xo<mZ+b47_MRDhb6SYTp?F-K{eOc`Cu<nt@M0ve`zj(Ml
zONu-*{vw>du=nASnesa~+;j5(J?m+l-UM#%D?+zFTE2VAv~xqz<7L$~$M)WN@S4MW
z%e=kCznm@ZR@4>Esh;!T^^9pZCq3D*_mlj?Z(aR8ufBCfZ!Mpr@!f=LhM;BO_r8;@
zH)p>*nlq_diZv#-YmthY__g!f%WrGG%bZf6%MJ9ho=~q%!TCiE6Ky?imE8a6bws}4
zi6O{oe--C2=7++ffWcuwEpx4Z4O8kDk3~R1)e_f;l9a@fRIB8oR3OD*WMF8nYhbEt
yWD#OyY-MU_Wn!RhU}$AvP;uy~EsBQR{FKbJO57Sa=f^gJto3yDb6Mw<&;$S#pf&se

diff --git a/res/img/flags/TJ.png b/res/img/flags/TJ.png
deleted file mode 100644
index 3c9026fa0f0c4f00dfdbf89162b8c5725949070e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1647
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
Roa4g*;Nj}yQt8Y}`5!=o(?0+J

diff --git a/res/img/flags/TK.png b/res/img/flags/TK.png
deleted file mode 100644
index fd605749ea4d64fa780d884cf3659f6c522090b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4829
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

diff --git a/res/img/flags/TL.png b/res/img/flags/TL.png
deleted file mode 100644
index b4c834b1d62b55182dc8182e4b8896ac3207dadb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3046
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

diff --git a/res/img/flags/TM.png b/res/img/flags/TM.png
deleted file mode 100644
index d18cb939a9b39a9dd03efab5d97d8fca0e73dc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3925
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%0AaWpm7*#@osy30QgpYCl^%t;aT2j
zN^Ha5khD^U{lbGUn$l0}dK4^4m2?!F{yR?W+AhLp51VpyWoUQZo7k_JwpDuFhQ&HQ
zvP@T?>YJdORaAinMBr7tAX&}4xq)DmS9lt3*Q2=Q4W_N&_R~0M!Zq+=cXSP`z48l<
zchu?Q0?Zg%*?V#Me>HaZ0y=5=9eraO({#0B^80IA_&<8+@1)@9>vRP`T2kt^xFkYc
zTFyjTMgbwEa7$8DQc6KmGWgq)^8Yb-p&z+9hy4Er@;sa9D+8ddsi#q)W*_q}U)oDU

diff --git a/res/img/flags/TN.png b/res/img/flags/TN.png
deleted file mode 100644
index 21c4b98be71f6876be9b7aa3506430f7670e2ca7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2635
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
IJwn{S0f(l+jQ{`u

diff --git a/res/img/flags/TO.png b/res/img/flags/TO.png
deleted file mode 100644
index c828206e35c89ba78ab8ff0ccc1ccaa8639221bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1618
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
YiVREoe*vs8fCdTx2U{0hwGICK-+}+j&j0`b

diff --git a/res/img/flags/TR.png b/res/img/flags/TR.png
deleted file mode 100644
index f2a5bd22c8a0fe03295dcea0cf818141ab709d38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2875
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
AI{*Lx

diff --git a/res/img/flags/TT.png b/res/img/flags/TT.png
deleted file mode 100644
index 66d698334bdbd74bc80d180e73d585fdd0ae41ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5253
zcmZ{ocQ72#x5ro6-KbfKUKbIfm*|AmNeGE<v0C&lqO-eNM2#N7MhVeH@6i$^dJV$r
zy?0?fzxUUBZ|2>Zb3f<aJKvf6$C-0xzVEfQRLO|xi2(ornYx<Nt2>JQCm^7^eQu&Q
z>kfprFijW$P#H&ZZ2`PHL#@<aX#xO#j{$&?PypcS?kZ#h0C+110Bj)u0I4(pfX3}}
zqmIno1IY5Zs?r_r)}>-o@EwTU)Qmjui1_a~a8ww&OTb?0n#$lsAR~<k7lUr#J^=90
zOI-=3>oc>P@y<uDyD?(H$iFm{a#ZaRm+2!S4&6<?1dOWGXaf1GB(;S34;Tt|O(}eQ
zwoItPhR_M&Bl-t|l;4P0!{QYTZT48yNzdK(TGkuR-E;<nZfE|fXBmkc&x#xewz*PI
zS6cmwWs>&Z`5(zK90Fu1Gi~zToe_PK{VrnX+Nv*^$Dj-@$vWP4i{AavJvG^=@GUG`
zJbQ~Q{n&HK<7emW?85cx01?FZ+B!AS1v4>H<bcE&3>R<dg~T{nvtx2{@IfGuVAzuv
zc;p`O=pRH{Zult+a529>+_Z)s!|UiP*d&jTBY!M9G}HOKRSqxuz{H&M3b|`quCcce
z@*=3&_#D`*96Ul0f4PfZ0pikq{j#L%f`b>|t?u8l+V@=7r3{Ai`1_~ONfE$RrGOHF
z#1u4IUe9zWXR@8Dax}#@Y){NjXe&5o%4UPWIvPn2^0Od)6sn9!y59&;MTG3mlYl|Y
zE3_i$JVJ7@>Va)4Vd^Y0kY^xF<1|k6?*tR0NYT}$BSNg%oL`hK^lS1&Ek1R+H9qy9
zm6bTy;zD>qcoFkK<CYQGXsk<p<*s9W+TX5xX9~!D78RQs)b6P_+4L%5E-2cNk~A%1
z;NhBkJbD!%2}qjJaLyNtf6m_!BE45nVCJ(3WRoY11Yo%jyE?lty&RAKh6kw!&Rv~=
z2DoIelV!DS%*IOzSkV0jr9t*)<k7jkdWjLJ3!_pyX<(8CktY)F8@3%HuXwW##u=<W
zX}8v7AF~5HIA(vCN3#~}zdzRDfUYU*a=SW*eGW`De(V$)PxYm<HL2oYF7?ls8>IRR
z8*W1#{Uj=2ZENj(?fee{<^znjARXtjH6tXEGi~NYY4IdlwAJyhM8JGnVnYGBz>N`0
zIScH<ZNyFtS-Xf8;@0e6dwu4$r-nL&Dd}(DI&|iVr&2IfkvWMXM1g`a`@9+_M;xBv
z^ZY46dg-r?(jSupj+J19SHmH0cg^ja>hjPGGqO4f9ml5Men8)@#jdX~eUX{z?Lv^>
zIL+444!0^3okB@zF_p%GUa50XacSs8;qTh1N(*Yy(L`s%ioagk<J=0{M{-ojVOYd1
z5chU*FH&i!>4Dje<z=71mHeUWo2!@`yx(cnlJ^OFw6{O5lCpKxj)~E$rSz}*$+rX7
z*JWF7Sx`nR@dOu9BbN7i*!=iz7_=MfQ#{>4JRHAnbm-wEP9lppz<3|0(@RbIX6b_6
zlv*Y%ykMhtJskZmWD0FLkN7RB5DgjTwx_C|3W<<eVMTO?lL-n5!P+q9qsuU!Z<lrg
zuz-_Q_SAI+o2ih=<gW@R->MpP^f2Se>WA!T%*u@Ds^S!C?#!pm1z95@&h}0)vdSUn
zio?xd@S}OFPsh#FuNr0QKk`IEuxP-aX*(BQJdPgss7_hPf|R$%J+w&;_>8du;^LLI
zc5Ni4n_;L}97JR}+a2+<2Hm%amqFly4AOZy986GJq7Od?M!o*L6cQUtUcVU5uu*qn
zeZyRsIT7ois+N)1`YiDA_?~G&&vs>n=XCAS>{o@u+I?y7GW^xlTWmcmeo{LB2h*QO
z(QS*(-ziYi-LGOGwU5WEud?R2l`Vvir<Q|b%ZYP@Tt^JN2qb$yBf^mzm{9Ic*zTI-
z<TCZ#aYoid526RLXC{n0_XP$H)0e97Ew4;>0uHI}%}g#0n`B|krxH(;v|l^dO-Rc>
z9Z@2nvyN|PvCTYesT`OF)%w*+)i(ZEZQiRkAKf%Apo7dvTEFPgJUDRDFKeeexD^}~
z=OwO|S{>_S1Rfucn~(hraT_ysSP$W);}AHomO4m{=D)q<@4qfAFSO&P51F$qO^AT;
zSGkxx!|0#-4i&KG-8R3ucuW)7PvkJ2PsSzwHY14O?5)IsiVrub)Kr_pZ8t(jI1DfH
zk^A#GeD_zMA)H(?+fh2vmWV9jp|k>+yZ&cNPAHE+<fTu4TD(xcMOU>2MQ5=>LJ`$m
z-y4MqcH7LeA#eeEjOq4U;Ii@e^T2nI^BO*5kspcP&14%#{OTd{-Dk}<KGY~G;?#4J
zw-6gH;G7Nh7bwpL0~x3G_EnzmdBlz|cv~p|)J9#*G<n3~!x%Jndgg7YZ)Nkl@5{mF
zRXW&K5AQP8iDwp7BEZlC!sI>qrokPrK>Xyoa;e0L=T{$|j;;^!%L=}lu$fjAa4hwy
z=`~NarmuM8TV+71*kGBqy5x6{Cg7ey<No$Aadh@abfPLc%~twb0C7&jE0_d9`cbtE
z_#UI1&%B2WNjq_61t1|<Od|4QGpX?NxN!!QvsGod*%<42!G$!D36#GOhico5cVAnn
zDLfS{Th9~c#NlUHw(VZ*#=U&HW$$ZbhPf(wR&+m%hhHu`F{L^WxTfOS)Ic^47c~t8
zG_?d5wycX6rW*!2pEAVPUbYW|Pq8)X4D;7BB+Z=BnztK_v@Ne5jJAS&O+o#=(4W)v
ze?B918`NFEl%L)G=D*7@v=jGKg+Ge(CB2Ab&AG3pI5ZAM?#7!W=KMkIY22>C$kcpj
zpSC?$R@=J>+%%Q_;+W5D;$Mw=SQF$&YeWKnS>M%Q9g<-8h@ls=R+R4WIP4Nm5v5HS
z2}Ru#WF))a$yBW}vu(^IVZNl0O=5#NvS?Gr*+Xao4}W(zX-|5V{mc7y(1+=+TK|c9
z%l^-4P%B<CE^hM_wxc7bbAwd6OotP4)#K=L`-5*PO=wNEsM%pxbZzuC@|UeWb8HFF
zSgsTgDi>N=V{&KGI{iT0$WocMTv38!C)b6j^qJp|JC|JJ&iwcH2nqVKa2`9&YAIt=
zEJd8pN!Kyly_@Pp?WQCMG|sejzC~T%B-5MXLsyhs`0V=?*bO`0dU7*>QQC<=3~WVu
z$kxS}GXcFO-xMpiYYh6aH!(+2I)5>ytLL%pFTWTot+%D&q`GGSC#AW8kqe4eQAO@M
zl{$f@gS;IL#_1kZJu{N%1eP&hAKV<qVSZ=W7$@5U+t$pY>UCM@mBk8&5ri8QS9CW|
z3qMRiPDv1;v2=3lHUAG;K1)O@{<&3$%+q4CVl!e$TvQNzfsAjvZTHU>ZOKlH*Ti==
zZ1O=}5#PrzmJ#e@buU4p&0V>v`bb~C-KJ;{Xq3Zg%{{25OQPJ$klwtL>{K=O54ctz
z7j*#Hk4k|~nY^`OiKodgCnY?sd<U<biTCpvxzbz5jy8J#3FHnL!;g5$RMzp5Ebi7@
zhO#lkl=@vS$SO@}h8CzHn;-t_p_1Il%M*f8HTIZ}jqe}+{M`ZdN!XMK*H%aqOp(zY
z!1!N8)B4-ORoxEn^O}BR)s2;twKiv?OsGlGy&)ql|M&KF6k6VMoEnc_V390M21)?A
ze1A*AX^1B*2lIZAd`PfV_-hu5{$0D~r)_f8b+Ho`aq11;%OI#^-)d-<W%!+V4$f}{
zGbHVY2dxu6^pDAu5(Ac`=ra_H_Dp!xz{&b3Z9WR8cWeloOE{K^4t)aWq;7EdAwA%d
zC5%W(O*wy?dG8I1xrzL3w+dgsfBvHAzC^8oe<R?ic{}OCWU}ak75d(N)Wt~c$RtIf
z66K<NY&1uf%$Sis1(1hwu#3>Cei=lY7Y}+M`<#VzOLm{-gDFZ?K$Y|6JF(?LVN;!+
zY|jjX$cCkAT8+zIb%R+2o0a`Qelc-I%^Sn2l61tZ%dErfRjAvgNj_X)s{a(RTNi7r
zDsTFQUz?`mXStZIs~KrbhM3_36zE|Vw3F#ic#ZN7xYCq6*m`!o7UGPcY%pi%z*ADD
z5MYBfmn(fBlW!zVTwIZSqHLzro|VL3evp>R>=UJxBii%gCTX6~i9<G{Arq9l{TJ*1
z3wzYN29{<->8?ghf>Sy|a?rWpb2LHbndSlw0r^Dr<_w#lbXw+bEll{g*$E~}mt_8W
zYzND!q!s2c;gHo%v!>BlHZoe`5~uE3=rL3tdked08QI5cGYCJ@qfYrO!V*v%u=mtP
zIE_r0UyhgHdv3$v3t(m6W2cCaM-AF#E9w5J!OWgtf8g`5K8{4h&tIu63v)5^FG%eY
zo^6e&u-AK6FaO1vcbKMf#7#Yt|G)=(jVkI06Q)_>hoc`<wz6CV0aYAx(Ic&bbDSS|
zzi0WF1^HoE#$Ik0$PehV6w<j(G~<>}CAIV4tnMYNcD&C_P-JV1_&A_yd!L6qzu&pA
zenm9ixny!uyJALe>!uJtvfn}Tlm=V&`N_JR^de5?KQo8M^eRfolD22^XX=_B<P$o(
zk%3Zf{fpM?#j|+}qh*8k(=>OM-w&{DJc!rw_u!<_EY$ntqF@67qn4?Mi$N)V=9+k)
z#y+o6eg!l8VDZAM7G3I*#xG8_WucxHlSw6b!xe$c`7upD-o>=txOehkMan&=YN;>^
z@)wo+{pixvU##cE2(f|bYe9n0q6SAEq;-RC8OIQ;S9%%8F|wNdvO;0;s87Z$C&TXk
z5y^3NKAI~%b>Uk^ONQ?t>fiP{pGgHl(7!^}8der$#G+Yui@1`2Z1C~5l%4eEUzhzo
zP-pjnSQN6fv^1aZUMSiPLM|`0nfKaGs(^M=MT$#ZBj=;xbf!x}%lxJ<cundzw}|7j
zdf!PC{cU=}t}J*<9Y~_~zTwG?x}bEy&WjsJ=!Z%9e?-HpOdkQ4s<?|_;mq4+6qPm>
zQy<xw1L|3xe0xc|VpmmkN>Qj8Kz+#@3MLbupT|+do2PhNZiJ!Fiq+3}rzJ(4tPCA#
zb%G4rEJhHZjO77$Xn8+jIv}cP>1+LA(xwwtT>zgs<X4xFJE>Bh1aIsQpTMJ--duzm
z8pi|T!fMx!ccr?*l0&OXI}(4ax_>y+6mFMD-gz5L7uj#jDaz!N{w*5B+`m2dXvhm^
z4!6HJCei2mj3lzlA?!wab=(6Ry>Km#KpX#Dk2>e;*`$};^D?@~@82$i9b-o(Ll37?
z6gQHUi>W6<1zaQSSaU;CpJ>`wFdNe8gQh>-4P5%WPx5B;ef|DKO|wzWR$F$0t>_`I
zT!Y^*H&H2fv)*~>(2wX5{UX(NInUsx0lpv0nL!+lG5E_<D@?sQP!N}LaxrvXAM_rI
z{UXEt62Nx*ee|w9vI4()ni+K|k5h=szu8#y)2xU&;a-$vK3OOq{1?dC<?6aJ-w4iA
zWpWM-;3RC5**YwQOdr}gPK(_~Xq)A}38k}FLCq-c=6L73b+6Lse|v7a^=#2JWlF<N
zpcBUf9%5u9nfR&ipli=NcdX&vl!`}nt^b#3mrTG$%T)Xgn09u|yFeV=@Mp_H6DTxG
zZMhAYOD$ei!P%4Slye#4`Pw79**%a;mU$O|yrR^Jb@Y+?h}x7WA~1m}F%Vofcx|$u
z#l!l<>+kTsw7m4M*nMv`^hRh^;@}=&=sEL0nWgq=gp*h+L8(`eO*5vVXqB_)ykRJC
zxP0r~sWj%&aka*P)!TgTuzm>hs{Ym%uK<ghy(C%}hi!(9`NgDzI361K4a5N@ABkTc
z!Yj^J$OB0u)lTc_N#~M1k6QX~#Tu`9NY1jKJk8{cii1rGY0zbd2=`Q?mc1adOdZu%
zZjK5IXYHKWuVS93*Hd5CzRZX?)}ak~_5$XJ4;FOYZM&6*U03ve*2tIUtbrv~ruvEZ
zOsV1akyGVc2J%d$pyKxUBfqWqacH4?%_Q1b2$E8Le86vh!1wo^Vx7D8Gj?8^n;}fn
zI~Tn?al?f-D%Lk3HiIV2Dfr_G&5@&g`z8y=l0YmXtivXe>>?7D!`UOW=D&sy=}fll
z)2x^{gm2^MA8CFX4c@b_A9cpA>eze<ZQGYvfLz!t<+mTIVw5x1tTM9kWmVcr%<*fA
zjA4N>9VC^(!TGFR_e2%iCp#wxCYkc$;B4y(3=3zjwa-z?HH!YBS@?1OuCWdQ6xXpz
zPJd)U;{-N+$tC1#jpMPKz0l9q^3E*rtoM7faZH3fl>Dy6UJv<{tm2zW>^+!z`1C~_
z1q*EgwtNa;#y>RLPS>Hh<9F0=_wlx<9PzU|kfssq%w;4uZ_ek(rRxr)m^ls?IUq<j
zZNej6<is4pMOYm5N|Q(zAKA@|U=5(XIs6&7-C0=0{u|4RJt;CjHb{h4z{gJy@UYG0
z?e}Z`p(=SKvA9%dj-Kk<{;^KKEt|;d>QAC*RMxqZ+{2@zY*c9#0{{ECU5$8J>1)($
zN3_-Y4`ebNvs7=oJf%+<Vep(Yi5Hk%n=b2qMxF){vmeYOe_3s;ZOB)@2zOJKy<Mx~
zVhsor;HpXD*3c6?PXiAS47VCH{1OYa*v>JH^DYJD>zH{O44%V<o-&Lwij&O>5jAI)
z!=GL1EcQbL_K5vIHE(=}(pN32=)^Z%QMIs7$NFX;k3!FDruR}+6yXYqA9l|a-@J)-
z-Lax=^IzI|ziZKrTD3`SyHP40uu~C1(2u3*bLqA}XFV!=k@OzXnAZJ5V3^)PwE9!U
za>w4>Uq?(Y8Wco^Vy!Y74E;QM;1J^q=64TYvdEpMw|pjh@87mcFa@#x^zmNA|8czT
zJh04Q6CA<9bD6n#!k3YEmK=wdvZ0r?g_n(#m50q80K$So;(UUle8LjC!Xi?lLQ+o!
pc?5-|1O<IMR%QQ}z}eN>{*CYdFCfY`McxSj>dIP5WeNz?e*wco6+r+1

diff --git a/res/img/flags/TV.png b/res/img/flags/TV.png
deleted file mode 100644
index 7a127f51ae3b4a7b80a468b6b5c4ad95a79d1cbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5915
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
AmH+?%

diff --git a/res/img/flags/TW.png b/res/img/flags/TW.png
deleted file mode 100644
index 2353ba1b0a516768b688834e8be9d2c1b75c0f47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2108
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

diff --git a/res/img/flags/TZ.png b/res/img/flags/TZ.png
deleted file mode 100644
index 7949f65d8aed43e1db20399e2f20311258cdedad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2289
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
U6NHL968@9`El*k0obXQkH%Q(d<NyEw

diff --git a/res/img/flags/UA.png b/res/img/flags/UA.png
deleted file mode 100644
index 687e305294da84b6ec871b232ef54e3d880f3678..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#P((T^vIyZoR!>=y%vb!0n-7
z(=pja3(j_RFh!j^C|JbsYRW=y-?M@iT(&~2o+j%uG@MjiB#RlgB*red_`WvYI&8~g
z_0xT4frbM?gTUE%@g2K&f3N-Gm_0ejOVf1!FPZ884<v1jb6;;*_wMx5l3DZRUF8K1
z3;6IHJc5l7srSxV_h#Y#9=klzeYx}H#n@lRf8VYyesOom!;@h@6AL$7uB_hwx8vSY
zzRBnRtg*Q9?9aQ(ZJlwcf6CIX>!<(xxxo6(YqhGmA8(g_%bPc!zpCwK^cO49jJF>z
zR9uK&^l{pc|5lrw%O(CF#%ev-NkBKe*|n`yf3Fn8TL(`3VVE$_;6bbRyD*@LYKdz^
zNlIc#s#S7PDv)9@GB7mPH89mRvIsFUwlX!eGBMCLFtjo-s5tc07DYpDeoAIqC2kFz
S^J5!9c6z${xvX<aXaWEnr_fjc

diff --git a/res/img/flags/UG.png b/res/img/flags/UG.png
deleted file mode 100644
index 0a21ad15c38090c3759f5e5d5cccc01af46f159e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1973
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

diff --git a/res/img/flags/US.png b/res/img/flags/US.png
deleted file mode 100644
index c3a245b767982dac3198f5005ab285b82946b212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2845
zcmZ{mc{J2*8^?bbBa_J}(GUjljJ2^ZV;O^xy+kD%*-1vmGMH?o$x=cjyX>UMlYLj&
zhRHf)t&DwnFeFQl=lSb>&wJkQIp6DZ-`91%f877v=XzpcW&nloK>z@N8X4+cIi~VI
zhJlak#PEmAV}M+BOmzUD;@Qaq2iD^|!qM=GDF6hC13=hA0Qhy>3R?gGKNJ8g;Q&DW
zB>?c^)9WlXjtAg7#s+%FJl39WedsaR@rE~ikBR%&8=lzy;{zMP$W)(gmi0WZ0+Qc~
zv<?6e4kJAstHANq@!;!LeuAI>+D(PmQnJZ+!ov}-5L3D!#rK4KLyVq&VsFpVy}I%j
z(JyAobBSHoFQz7oMAMyhh2OG69-R=uO<{DH&Yb1avAE>m(wBayJ2_zyl1b{7K)(%j
z=~L+6B0lKfMY}f5AJD^0#1p%m<Wv6xnQCo^Dq{aC!D)%LOR(?bKhlR;H6I{W(k#E`
z4&ws8^x?MHC$?)A@xekvc11m-lT7?^aqkNt@7f@~MNRgk57sO^GBWACAh+=Xch1sU
z{N#R}BV`$*sm?*&yxt>4*=eUNtMpIW|NN=Z(=X$ZwgUFUDnwpl8;>Z}l)Bf_F;Oby
zJPj_r=@YGWs-vPUr40q+x%@H2b*WN|Xg5;$Lag^_uSTam*8LN=`#BIVtNF_Jlfjd_
z9+e~5osGN85sHDYJG6UynBTn?qaa57CwZr@Vf(drCkAv*MqXj*4v}<7-5Ln>$~t9b
zbZrQ0_>nqH3T|DKtLI1!eY7$**2G#ZlrZ|uekwLon{b`UJBed+XOW$M%6{+Q=^@TP
zmzY8EL)p5;DqfFRK!k|*f@f8euY4%(*)K&FR6dU?_P7@04Am>V6x<=iI{NmO!s@*4
z&oX?9#UEseXFgLZ=TxOK^10hI+XEg6MzCaX)(Gu$&|Ui7`RAeSucLT(&xG?nnh#{6
zC-;uQTsiHG>&pW&ptH|sBXw1<CO2ZYnzGq8gC2(RzXErW5^d)*!^J-HdX41*h3Kco
zH^(r|bpEQZ_rfXWl&U2Lj;wN?mx4i_g*;R$C|^yq=~n7~tT=%Bj&ThAuC)=nVM6pd
zV|DRu>KiYnR5k_QEzYoI(^1vOUof7sUzp`TnyiO#A=@|tHV#L2OAOSwWh8g%HYM?o
zzFLK^-<g(w7DAOBkS$3AQvFitduKT*TNITDycr6zH?ugpl_e0=GK_XsDCuKa+|E{*
zkqkUh-r{q=h}p``BCW2WxhV>I^_-ZyR$$YN+6P_sJX)SKIvENVhI`NH>n=odmDmU{
zDfHHWzlwXkF}7p1`%H-QVLX}|44U`9$#Gjh<VD3i2xr!q_xMT085Pb~U?b54X<re9
zsIsGzJ;y^?p`3%PhJbat-}~jd!C|h3Peh@=$dQ5dw5%PV*o)1I!xSWC>;C%a0{LDq
zF9buQK$8k&=M(4q%GG>0&r9(Us0NJafwRdS4?LQ@#L4v^^%hOZmE>_vf5{6^jf%{x
zqdM%_wF_)?l7v0BXiqS~<AZ!60-`Qu#$hu<!mIm5!ZmjdsXc43F^T(Yb%z+J(nJ)p
zr%2OrI@B;z%VUtnj+0hNh8MPedlXYrZO<~Ne=W6=JI^U0-w`9L#{H@;-TZcB&o4_k
zZxZ~FkHZA+_Ip50Rlt9o(RRA1vxH_j$*<12pi#f7oZUzjWK(4@y1G6-z>T)cw$NdL
z+pF6-z6PBeTDLOi*#?M<4FuMp+be^A4svx4W@r&~n9lY{wUv4aWsFMZ53}>z;G1W)
ziYOkP<H?NgaMrt&@jyQpC0cB?#9$dydl0E)R{n$-HvC=R&|Jvo<>}@fZ0&S^3Ip1Q
zf*`ZG-C{~-fLnP<kQvnDE|w|S!6G}&(cBovi&kT<YT@yOX)K!A#-Gm9TSQryu-oV?
zeD)-;ZFbFz#D6ig7pH<<XVqGs^0<XL9&{43GlK{ifdFdizwd_^q!%1mRB$VUJN!(7
zxa#h$TYtI7*Wj7HUEKmlT|{&f2i3FFB})(@s=4Ybn&e$_$^gXS#jlt>^zzJlTd=)w
zJCkQ-p_+8H-K#1Rx?zP@of{+2z%O5{x}o%v7dBVrzRE(>;kxE<bvDiTci;Yl^BvG}
zD-xA+-26WIUGc-Dai)Fj07g^4Tj7Ac<9X-?+(p$>RU)~4I}Dzps|}vR&l%1FdLAO5
zI?5lnzK<~8=WdzFoB2SJMpT;qh@}a%$UXHrMHfunZLN6_|I-Xhs^dF7zGis&VpMHC
zJx*|x72m;*CRfD<qLt~wMA_#;pTxtk`6!#-@C_q{7ouf4+lmA(bmYwE<p^HtN$&|$
zyS~D=tsE!QG(D^dYBdb}e$1d)(W$bXVki^kzG=EM$I!)L8EP<dO09|5OM_I>_z!8f
z$g0Dop={-%VIF~;BkMyYlKM;-i%jb+@2NZ^6)KO1@6t|0ouQqB0~_N@-QKSh!Ok?#
z4>etIYSSA=sV9Ulcp1~<kN5K(TP=anuACWF)PUU;AHOwN#?o$2%GB9s%XH|*I#=XE
zfB5$|S}s6MT;zLNU31nYo^c?%wVN5;L}ZC-=*DHWpVAD?`R6CGWK@z3;yu#W`H0zV
zmsH<9B9&toQr|X`g>lhwAsn5D6`Z(wjzjBYh`DmI0V;Bj?MKuP8c#X%oWFi97PM5P
z%XX^}Tfzi-nAPmx-voB0;lHC+zg<PSGcKfLBWVf_&z3s>z*lW9(BG?}w7d^czYSY%
zxV8Jj9IO3@r`%^4`8LmOg+Z6Y&yd31o-JIPj%AjeY;@bpUWp_-pdDPRGsfWM_@R9_
z%8j|khB4??5OiyxHa{}d3-{97muy!df_wln5xBB`i^e--n<v>W02@|3D;xGM-Bu&g
z_Uf8v0ObikwUh20<7CUZe1yjxg_9=&sp!R5OKIW3MPCtx&hhh^^H%bwI}4(3;+t3K
z^eSL`dbxz*9#3%ny|xmE(;m|5vxaWBoVGROd#|lo4_!#~%l|dnN_zP<&5Y?;-ymhc
ziy8{*DmFUwRm7p|h&c=dtf7a|CXcI-;}P4aeV1?qOvwBBWJQ6YF}E{n#Fjt{X?!DO
zp6mnb#ey1kNZhyhHUW;ED8LewgtUxYs$6n({sR>SFO5sVXh^!8i^=XH43BmPwUD2y
zQ_YoQx%<NgZ1$paFCxph-Q(!+Se4i{1U*{q6UeR7=1-H_6TPMRYj*-*pA!2yTY|s|
z%z+5uf4(t$iBY6?nS=Gw0FN%u34SZdS+@8BW1Vk?xO_RYZ6;yMiUcHZ0g&iC=M)RN
zv~@}nwo@t#Da351DDzi_1#8!16S|F5p;rtfEUW-2!9?Cq=<5-9eMVwDWPo>oN!J^-
zlamq8oZgXO9i}9rjyZ7btpqDbH=}T?3)5}WFL!OkMY4gR0DjTlyx8_I@b|_`lZ|S`
zOKA)mTwJ;!DYC%cMYL?Kk&jrw&p<-?l&PYgZAY$no&)>C`%w}{>ladu6jj?3HiO>$
z6%5|}@!+jseF}2lE76taJ>j_Cj<Sdu8R|*Wyc`)NhThrP&B84?cdhw~=BR$C_&h<F
zzBW~y>9OS8edGyp*4RK49~AAZcN}J%y82f4e^xN3=7`_G+K-S*<GU&$$E%_kLH|0z
z$${Xk?s(t%7=S!VPDKW#BqOhCC9j~aB&V*3l0wO;qfmiubDIAZ@bY$YcOm}&0DG2Q
Q_;CO*(l^s9$KoRX1~c4A8UO$Q

diff --git a/res/img/flags/UY.png b/res/img/flags/UY.png
deleted file mode 100644
index 21a347c6fc6969a6e5ef045f10bafcafda399d17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2542
zcmZ{mcQo4#7sr2gBZ8_`t7f7tO6;JeF`~B8m=%hqwGv_#MQDvKsiKHkqiXN@wpLY#
zqLkXLJ_uqKu|0X-Ki+emKi+%Jy`MYI_niCZH^I`}2*NJJ4gdhe7^QDbr`kWs%}TG6
z-y5>&V7{$qrUwAk&%lSSEc99Y7RuTT0PaBnASxCB_UWrA3IGHu0>Bam01z($KmbQ>
zvC^g=SlvvF^y#F>9<nu(4iFAyA3!JOzq#&pwV&Rw5sb|Y*nY8y2q?=6+eEAZz^N%?
zeLb6y@s)`%I~xzN_Kmf4u$1~7lt|Rfg*HeQ3?Sn(N?vE)csPF7GvQg<<hLo`@$r@w
zPi#KdojIA$CZ*1n?2lANt_~^IcE>ikYa~xH>ovQ0&Xa>rk_a><%uYf?&wBWA`t7f4
zU&yqG$c2c0GOdm2Ldvy5>k^y)0f`b_!NAi^p~>7&6)1f@SQVishKntS6zUQ2{?Y#S
z^5~iX<Bc*q2Az9b?f$8M<OY(nw;1_rqCzkdf8v?4e_9;!>6gFe_Yi+V>M<E&I4i8C
z`)F0b!~<!_Aauu&Rl1<G*iitH^~H9cJ-~PZ-+Cq}MOVCO1j8?<!gMRaLkJh!zgHDF
z(=&nwS3L^eMK6anZ~u1q>HOT7iE;gdXuM=1HuvmBpn`w|=RankGS5NY%RXe30=<F_
z=qjrjsRzJ>J`IUJ3tQO@MYVl(B}sg%oN>~sR4Z9!kSGKDJbJ+0neU@HNS4tLqESJb
z)uTHHi^YH58aPOFLzS*KyVUiG8z#ErhbR;t_eic}5-IwTQvr|Qdu&g%N1ee;K1*?z
z`HdJ385c6GHv+gIrV!A#1|l69K2A?%es96oBbLb4CnVD{%hHr&?f;7$^%llhxXX*p
z7*;9U;1y&QW)+-_K5v~I1jc3*N=bL(uYZ01M!?l}`)QFAq^UnJ)Ixw|)7XP32vHd#
zQYot&%m4Y(RxrKNy<+i_U*17HI&D{Yon80`bBpu7G3(jOZB@a`sUm{>A{+a?2fCO2
z_nell^=cl>WgNnBX0Q?!rVHqth;6K&pbE_Ui&RNc{Zi)G*|d($tnEt~&bSXStLsKG
z(c4Wcp`qf~fjkz|?}a2toW#n`3;dN;*7aT$X{LLcmQ>c<>Ok%zv#>FhXVaJJL`Q!d
znUxeg|MXp7wORdm0K;PDa-I*<J!w_Db^_Eu?;pRfHOdY1Z7ftRw7mKJT&6q29ATSm
zk=PN`QZ$Q_<n=!BoG&uL;i(p&1LgJ*Xh?s1b&_zpGR2)2l~%|yzITE@)ZXk3AOs+?
zr*urW_>Mal$NipU1lIRFbWTdG>aX!sWL{f2V>7{=ecAVwkh<Pc-lN$n<tCp1$G@6+
z!uzthCd|9`S{3AOi8X~e?z@Y`h)vuR*;<cFzMSJ5qAf~<ahz+0a}rwX835B3|L|Lu
zYv-JcJJ&4CoCi<La5>A?!w6~qg!hDW3DULPrj@EGQ1ZS>OaUr4sWMb3oO74D<p7YT
zrJ&~L7!5*ameo1g-rs1{RAyMR&N!nptNYFpjcMiM_)XrdlNs2(7f^f16wi7ZizV()
z&Tc*ah+9s!n)cK0l&9@n;%a8|UK{&X4#^F3Tqq5G@OtcB*l3tkxT&NPVDEiY$=Gsq
zslFMXezDIpKns5m*S%=!A;)bh?Il5ro9t<mS)Y=c@zqM=awGA`r9~C$>bFLMJ6<vI
zpJ$VBM-ISRK3ld`ghy#J8*V|~<wi1SzYS`2S>^hAUqM-WI&KyQ=5p`u$V-jc4ik$p
zaZO{t8wAvXm@qn@(`PC31nq<Vk4z$xVEu~SYtmOKw7iM90zKJ04hDE}xHkUg<s>P&
z5o_6*o3<a>*X0eQc64n$0%a}q%uKTKLy&tpmvjm;Ic_>sMnn3ecFvaTr9oWrt`dW`
zKf{KD^ZMNY&O~L*l+O^JV@W}+qP{3f<)(Fkj4pJ{=IZj)FTWXN+1)h<pUBSqcuB^B
z-{0_y(!<o!qc?YyMVwOMhlQSkA(B|sy6Hf8S;2=k#=b^0wCF=uvy4IgLzsl+hHwd$
zSgW~!HgQ-Nn#&$_V)|NpSaU81bh$I~`fG@Pel7T21oOQwn+{@4d`>}HFpa*rIySgK
z+9V4;E_Lnj8<#d)pv%IRP%mOH&<Z>}G|cClYf+uD9yGfHqsmXaEz~zEEVn%H>Oqq4
z><mVRbfmYHrNq%X=h|yD3v;4rb|>f)MNUGct&e6B`*!d+ds|jV)r=+X4(ApQyg&a8
z&TFo&j@HmSu|3@d^^3wY#H1n4b~s>!#a+&aGXCk9z3p72Pb6E_cJYAI$lYw+F`FfD
zm%~%Kx6mlTjkaD&L)Q*WE|!~>>9c*$P;NiL!N(5V01qvx0hSuo34Rx16Z-o!S~fUD
zbPflzKk(!^R<>^~wCUQTM=iIQcb_cPVz4~CSMF}={9+w!F!rnPjjk2j<I4VV>a>1O
zcNyDa&9KR}=Ae)XvCvEufDP$Hu)MGctnp-v^1q?ULLePfJ^hhWm9xNo#;$MNE3>{-
z6<Nq7KA&RM3cV3k{><m44|q5nnv=L5+cDel0_64cv)0>zVtdSAqQ6XTPk|OnKV^~U
zuLfH*+V1CZ=Ou(gJ$2$kl+1QxeB(x(lNr35{mG;~*Whg`%ZYa5-l~#tJFfBgg&IVk
zgyJu5hHFl$R=AmMRyD)~!A!GXO+ugIR}9OdS(gBpLk;$PyHNCQ%*y#Oqfiky<eL2k
z<^E5Ac466dchqW-HWKq177H|Kd4+e>xpBvJV+(n`B{sD_L6ZzoN*RWjBw60?;-2wi
za>OXNnZ_(IhQE4}5yyGujp$TER=>Ae<4NmVDIfFWH^-L{KAY<H`(<s|neB-OL?ZB!
zMS!g5o{Z$gMZ-S<QhLk`$uDK0M4R)r#<t=+iSEy%ah)Kxk9=q+y<S;a@uLhQj(4u7
zi!j*RsJerM+CdGEo@#z0bn&us`p!G`&H<1Gxx*vse!{ELfaD*OLA|T7p%s+l;9@pW
z=QAl&po=Qhu;XllrwYEKXyo@d&%eIR*mU~!)^X-9$`T<$b^e0#e8caZ{*hAOQ$e(<
z#qEo$pQ-Etf$B}>jzc8sv6bKTwpXP?+kw*=oZlfGt72;9zWyZ}W<~-u=zzT!Vmdf%
zqf4u`JtINb*~kk)%_+CA<p(FzpE*Oplr&6%hMo?Vr7(&(XJ+d1@ez7*BoO=P2mf{y
z*9w=u9YbDI<bBG?q<>tN48g#T;O<KBK-}{8paXy_DyhpWs>;JPY~acWRV9Rq;zdOz
lgrZ_d=bX;J1U`Q5cRWM?zW|iu98DJh#s=p46<0CDzX7!WtK$Fw

diff --git a/res/img/flags/UZ.png b/res/img/flags/UZ.png
deleted file mode 100644
index 643b6ae0cf6112a4145592ea3ca7fdfbf498d057..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1745
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
K?0AnzW&anj(EgSH

diff --git a/res/img/flags/VA.png b/res/img/flags/VA.png
deleted file mode 100644
index 63a13c0e81272ede252bd979f5f5df7b091dd44c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2211
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
E-^z~wh5!Hn

diff --git a/res/img/flags/VC.png b/res/img/flags/VC.png
deleted file mode 100644
index da991a9344c8279c8c4393f2b8a3f9c2246811e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2105
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
T!4h{0PXJis?66NP2}yqg8uHSq

diff --git a/res/img/flags/VE.png b/res/img/flags/VE.png
deleted file mode 100644
index e75e17c9f0406ce7b4656d693174a523a6af2f79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2157
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

diff --git a/res/img/flags/VG.png b/res/img/flags/VG.png
deleted file mode 100644
index 46f93cad1ec1b088f474e004c924e00157c9969c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5427
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

diff --git a/res/img/flags/VI.png b/res/img/flags/VI.png
deleted file mode 100644
index 8c849a733e369c9b9d61964899fd7cad8659090c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5938
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

diff --git a/res/img/flags/VN.png b/res/img/flags/VN.png
deleted file mode 100644
index 6ea2122f9d1dd9e5aefef30ba4c28c5b943ca5e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2304
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

diff --git a/res/img/flags/VU.png b/res/img/flags/VU.png
deleted file mode 100644
index bad3ba4d46e6b5983023a6897f243374d13fd598..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4080
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

diff --git a/res/img/flags/WF.png b/res/img/flags/WF.png
deleted file mode 100644
index d94359dcc403087d1c34a19bc5960553d4215e3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2509
zcmZ{mS5(tm7RLXOkkAPrHz*yI5=BE$N<c^m^&*JUl@dac-lR!QKqUbMr3wU$paKHY
z1f@iZL8_DsA`_*kp!D9PPVTIEnVB`;THpEYbN2ck_R~HTb2CFe?i1Vq0Pq<b>0M({
z^>4!<tn=%qx_lPEH?gKz0H{jg*>~n(-KAZOu9*Trgd6}6?*PCq>xno603k>Kn8O1A
z`Y`~&1E>vGwO9=Z!NgFHMV5Z!8e>`D3NW&}#UlP+Uh&rLXBE(3V^e+THx6;Qih`JB
z^fCZ&HW}+-EyJ0Mxsk!gK1p=wgt<%ogF_W^2V6B7CnGN-4H1jCjUx{eOax6&K783!
z(5@<LHCb#9W+tw2n&+>fMR4Kai2>nv4M``jC_w@WIfb5aQ)HFJs&ie#er~1orb-LO
z-}}kv{nf15+}NzS9rH_VJ8U_RL-@ay7J-d&y1W0kq7>)%48+9z-h5dMO)A}}8Xm_!
z(au$KigsXd$v8r?;WIQh9AoB>UlP8PL!pgZMGi#r;5XBSF6s4Wt_X5wTb~x~v<MYi
z-@g~$Wvd`LsP<#<kfswG=y?^U*AUVeqA-x2eVOC<{QD#S%7GB~sM@XgspQ`<n3P7~
zS18IUIct3`@@=fT<MPjsc6JlKHgkIr(^mo(m5_UiwxIXN%1F-KBP~b{Z~QR2{D@1o
z#NL5f$!0AyL%2_gxJ&n{MLf9Xra^{))!UQ-MDg3U7@Ws_!52^2xXUTv?y0DHUWN25
zS5b1VK4phj?~eM}x_C0Io)A`B?ObG@`6qNTYkm4JuS4BKe^_lY^0aZUu)jTPcFr!s
zz?vSsN<5vj%3_rCMZKjQ*pNBSS(*5TgsT7Z9bc9d1K88xeQl-HO`y?7D}sTq1o{qW
z!1A)lEGF{wwQ!($M$Q^=>hxU`rQx570IlAkm`Mg3_yIYfDp3vdweUm9a}0?pE5&v@
ztAA+%x?$O0{EHYg(j5k9HVcD@^y@bk9buHdYlgA|*BNBgL&MF_n>Iw*7&ECBf?gRT
zp;;0<B(Pft{_c$wKV~Kbu;*^j%^L>l|3dLk#l*B);*dmCsxic8RA1o78=;jRjv$TB
zQ%+5>Y@Hqx$`csr5oRx1!b47WmDp4s{OHK|p|V>_hFiR?hrj<5h*4a+Xq<ydHBqZq
z5ayd9Q=rzFO?pQXk=FF~Qxc)NI5y2|z(>bp@i!{^v9XhF(Qp&2mdoZ1GZGaZu42pH
z-JbhKRfkWcu<pvlI$}rlz<0kF*FxANqTvit@0Ydmoi)2Rg5Y?;RmMm>e${)aHz{Ij
zZoW-k`<OAzh!3*K=@DqMqqEqB*YI^H3kCV9%so$1b!9gs^?Ef+xhYk?<Ihyh%VK<p
z)2`bAEt|oxCZuUlOTUq|CD-#8jI)$J_UP8^jhfTM<SZe~Q@Wt%MOmi8n11BL{tO+v
zDxTrLW(t>tX;*f<);^cF=%8vo71ZM;23^+1`s1I6>GqtfA*Q_4SS4DA7xa|auAJ|_
z?67klrXqV7nI@1<&5XSMjFcHzeI-T*=DT35s@B=|vSj55F-oek{$k+72g!TY%l^WS
zYKx7rI+S&aThR8{Z`f;%q*BCzobL?o*R&uZ0Xo7Gjbc-<8Mn9>_tt5#I23qxKedbK
zD%SB*7I7+lL{sO$NAe*d>>t&b(DW~^s^*6h5@d^Wic-Y;+xmNnt<{a|nPzmEg(bn1
zq72=to#`6IZOkeup#TyMewAl;HwjKUJ-^fm=8JnT&>=O;GhW%sF<VFy@=et~(bjxj
z&G|P(L9>3N>P-w!tD~XLDwSREmjd4{HV==nd2A)Ow_n4}iHivEeW)To2b<pH_hSPY
zbp{WXBL)ys*e;(K_w*jVt0EZDTb47Q;E4)21vDZd!>6TR)*9ee@^HkR!OlLC0(E(1
zHV96gTCQlKV;n}52fl>_TxvY$`MZ45ArIw0`rbTMb3f_>Z$LvwG<DTxMdQU{whBkU
z{QNY}<n9k9wx=2sjr<U?rzCB7yO2&NQRYw~Af#!;6qk!$ei^j&@!YUD&il2cTooEE
z6o7AM{~kD)CE8*v`Ugg3!Ah|rj@_tR0n|OM>BC0rB@4B8I^$F<rp4WwcF!4FW|%+9
zN=wQ4iIQ0uC88t=AS7n2q_0F3Rx-vvzN&HO{FfDGcg<wpA>-{$$Gaw^)o*F*m`9JA
z{c45Vez{ddx~Lc9ek62+mi>$+<`f<tSGdW4oCtegOfA(M&a?k~(pKtsYHu;!CHs8E
zwn2xz&Ei051)?BsB2E6@+aRk=->3yVl-9-04Pb4kn1{OBpeUc4jaRoR{$V-SsmMe1
z6aDDR-9ZRI6ZD&}(s91@V=)S9)3n@wiL3qF0knwD)ntFwUYR||EP9hpIRYGcc+0}!
ziMiWS8Fhkj>k|`?8)-R5o6LCT*%tR5fm)l63;B8cNi(MiL^{*wBTqrr{IfH{ugm4x
zi~2}me%%uZeC(;i9Nk79f7G7!GLy5-JSBOhlWp^ga&vR^iSY9HOS2l2c~64eZ3Q?}
zm|k{6V7>F7xjvu6S8P$XQU~*UJR14al0OJL-;NMIFoQ{<b#9IGx6b?s%)dM7tKm9g
z0mokOMwb}N-I-`C3E3(`Jk_=RDd#SCKYk@Ymr#=x?=iFxoF=<cCt1C#s0kkH@LRhK
zd<)FK^?^-ttR$>_&+o#C)+zWdHd}y@9G$S}IMAk3n`g%rWH6ZTPn{Iih}awwh#y_t
zK`+E`E}>Biw(<jnl%nayQbf|nWGiQEfYzo@-w+Plcm8{B46RmuY^m1_R<n4+ha%lS
zn=qB#uxwba(-v62yD6si_Fck(;pRqnc?svZ3zV#x-j~Qt&60N&?6h?fK60iNMOZuV
zq}Ld{g0>lnfQXlv<;+6qHEMgZUyD*f5*d8kvj0;LNmgjKM_@dMJ9=ofP^Zmv#Zqaw
z&{M$vJI5hA$}qRU6uRH*ev)iv)*dLNt|#dT_-JvqG+F|Pzy;{+V90?<3l?&cWI`wi
zugW<>kK=d;!@;Gx`W(T17M$t~1!eI7D}y^t(n{4503|DH|Dt3CnYIFA%XbFToU|RU
zKKPL>rt5O-tlrF51P0&?ARi4=n#KMsG)BiD9>-loUT!@h`U20#`|n*_IO2J*eNfuQ
z_#aKle>?)t7+T?&TjB3mUz^jx`nJKY&cSYImmoJ502ESLO$m8X38ij{QbAu-Mqfal
nK`Nt>$ndu5OaBq@^>_7jzy1FMTu&TGtN>uFZ>IN37a#XeEC_yv

diff --git a/res/img/flags/WS.png b/res/img/flags/WS.png
deleted file mode 100644
index f8b80e5ba9b9fe5406e44779270b460cf1103c26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1896
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

diff --git a/res/img/flags/YE.png b/res/img/flags/YE.png
deleted file mode 100644
index 8b9bbd894287185442024a68bb649179c4d5e309..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmeAS@N?(olHy`uVBq!ia0vp^W*{uU1|;uX-8K(Mv7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpaffzx4R3F27;f?yX%1z
zXMsm#F_2CG;}6+R=Yb6N5>H=O_J^!8;>H@%A+_%r7#OQPT^vIyZoR#=(Tmwp;Mm8=
z#lBpIO^m0N@7`n;{KT}(H}|D>#O>&3nl-Hxl(ycTy1e(!+_J8nSJ-U1wI}+9sqjqx
z`+t_Unv8MH(X(x$j6h3(AY@0Wy++p}jjm-E^GwV<C#iTos(ZRw`d8Dgci-Ec-x_X<
zUp_hY^2+`D7T;C)*LI*s(IA=Qj0BT0kjWYM`tE_!yX|GW1uG(A`S{*^{#v`u=IT5(
zru<DYp?rKf@87(5^&zZ!7KhIhw|Re_J~(jc^_!xyMYd<ZRZnX@qyDd|AYpBH^XI?S
zZwr+I^iEa2)MsZ`D?i)4Wy|u;0~<SRew}{U$Qu)WL&$vnlpwGAnZ+{<S<-kKC58X+
zW`9!4FM3<1d|}$QEq|YW*uN}j`mPY5O=}{p4z1_td0l9G4d@PK$&)AI`S{j^e_a)~
z6lm>fmC0}H^?y`mcRgP=|8?HVkG#fhx)&wRB_0!i8tt3_Vjj%?`@PX`cPu1`7`*l|
z{Hocy%J*sGH=u}WiEBhjN@7W>RdP`(kYX@0Ff`XSFx54(2r)9YGBva^G0-+Jv@$TL
hIP}yOMMG|WN@iLmZVjCCV;ezsdb;|#taD0e0syWm{80b^

diff --git a/res/img/flags/YT.png b/res/img/flags/YT.png
deleted file mode 100644
index 328879361e55f4d681b310181a772c9c8a1f37fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5735
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
Z>k#<=HxT4lMgR>UHKkXIRr0SR{{xsjNj3lg

diff --git a/res/img/flags/ZA.png b/res/img/flags/ZA.png
deleted file mode 100644
index 7f0a52d3b2408b0facabc7bd6462be3002926b28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3595
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

diff --git a/res/img/flags/ZM.png b/res/img/flags/ZM.png
deleted file mode 100644
index 87adc3afaa254cff5938f9ef55d49cb7d8c83e2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1787
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
YqEr62L8lzg)))Xk-{U?HyrVAu6KSqV3;+NC

diff --git a/res/img/flags/ZW.png b/res/img/flags/ZW.png
deleted file mode 100644
index 742c9f7e718b73e866ba7be5c1231c3342120a30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2802
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
b{XD&HhyQ;AbFoVt%>bAgSsB*qqvQV#KZ+Yf

diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index 14a974668b..37b1967c48 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 
 import * as sdk from '../../../index';
 
-import { COUNTRIES } from '../../../phonenumber';
+import {COUNTRIES, getEmojiFlag} from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
 
@@ -80,7 +80,7 @@ export default class CountryDropdown extends React.Component {
     }
 
     _flagImgForIso2(iso2) {
-        return <img src={require(`../../../../res/img/flags/${iso2}.png`)} />;
+        return <div className="mx_Dropdown_option_emoji">{ getEmojiFlag(iso2) }</div>;
     }
 
     _getShortOption(iso2) {
diff --git a/src/phonenumber.js b/src/phonenumber.ts
similarity index 98%
rename from src/phonenumber.js
rename to src/phonenumber.ts
index 3b7e4ba4f1..5806bfae00 100644
--- a/src/phonenumber.js
+++ b/src/phonenumber.ts
@@ -25,10 +25,20 @@ const PHONE_NUMBER_REGEXP = /^[0-9 -.]+$/;
  *     a national-format number.
  * @return True if the number could be a valid phone number, otherwise false.
  */
-export function looksValid(phoneNumber) {
+export function looksValid(phoneNumber: string) {
     return PHONE_NUMBER_REGEXP.test(phoneNumber);
 }
 
+// Regional Indicator Symbol Letter A
+const UNICODE_BASE = 127462 - 'A'.charCodeAt(0);
+// Country code should be exactly 2 uppercase characters
+const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
+
+export const getEmojiFlag = (countryCode: string) => {
+    if (!COUNTRY_CODE_REGEX.test(countryCode)) return '';
+    return String.fromCodePoint(...countryCode.split('').map(l => UNICODE_BASE + l.charCodeAt(0)));
+};
+
 export const COUNTRIES = [
     {
         "iso2": "GB",

From 1a713119d869da930ff8c352b07f4160d96d6e3b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 May 2020 22:04:37 +0100
Subject: [PATCH 2900/3235] Add Kosovo as it is understood by google's
 libphonenumber

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/phonenumber.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/phonenumber.ts b/src/phonenumber.ts
index 5806bfae00..fd189f8d39 100644
--- a/src/phonenumber.ts
+++ b/src/phonenumber.ts
@@ -635,6 +635,11 @@ export const COUNTRIES = [
         "name": "Kiribati",
         "prefix": "686",
     },
+    {
+        "iso2": "XK",
+        "name": "Kosovo",
+        "prefix": "383",
+    },
     {
         "iso2": "KW",
         "name": "Kuwait",

From 3fa13d7de3eb2b22fd665a87a10f78e91f40c73e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 May 2020 10:23:53 +0100
Subject: [PATCH 2901/3235] Add comment for the regex

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 3fa6c0d7ee..133a2708dc 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -995,6 +995,7 @@ export const Commands = [
         args: "<user-id> <message>",
         runFn: function(_, args) {
             if (args) {
+                // matches the first whitespace delimited group and then the rest of the string
                 const matches = args.match(/^(\S+?)(?: +(.*))?$/s);
                 if (matches) {
                     const [userId, msg] = matches.slice(1);

From 99aeb8388db698ecdd3db80e1ace3fb4e0e41af8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 May 2020 10:29:06 +0100
Subject: [PATCH 2902/3235] Update src/phonenumber.ts

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/phonenumber.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/phonenumber.ts b/src/phonenumber.ts
index fd189f8d39..6dd44a3c12 100644
--- a/src/phonenumber.ts
+++ b/src/phonenumber.ts
@@ -36,6 +36,7 @@ const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
 
 export const getEmojiFlag = (countryCode: string) => {
     if (!COUNTRY_CODE_REGEX.test(countryCode)) return '';
+    // Rip the country code out of the emoji and use that
     return String.fromCodePoint(...countryCode.split('').map(l => UNICODE_BASE + l.charCodeAt(0)));
 };
 

From 7c9a9b223acfb225e800b6fb878e5d917077a561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Mon, 11 May 2020 17:01:36 +0000
Subject: [PATCH 2903/3235] Translated using Weblate (Czech)

Currently translated at 93.5% (2154 of 2303 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 4de5084106..d08ac6c0f5 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2237,5 +2237,14 @@
     "Waiting for you to accept on your other session…": "Čekáme na vaše přijetí v druhé relaci…",
     "Almost there! Is your other session showing the same shield?": "Téměř hotovo! Je vaše druhá relace také ověřená?",
     "Almost there! Is %(displayName)s showing the same shield?": "Téměř hotovo! Je relace %(displayName)s také ověřená?",
-    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!"
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!",
+    "If you cancel now, you won't complete your operation.": "Pokud teď akci stornujete, nebudete jí moci dokončit.",
+    "Review where you’re logged in": "Zobrazit kde jste přihlášení",
+    "New login. Was this you?": "Nové přihlášní. Jste to vy?",
+    "%(name)s is requesting verification": "%(name)s žádá o ověření",
+    "Failed to set topic": "Nepovedlo se nastavit téma",
+    "Command failed": "Příkaz selhal",
+    "Could not find user in room": "Nepovedlo se najít uživatele v místnosti",
+    "Please supply a widget URL or embed code": "Zadejte prosím URL widgetu nebo jeho kód",
+    "Send a bug report with logs": "Zaslat hlášení o chybě"
 }

From 49375436480f04c6df0395b2199a4afe7226b282 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 11 May 2020 16:11:46 +0000
Subject: [PATCH 2904/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2303 of 2303 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 5e63974d12..4d270260fc 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -489,7 +489,7 @@
     "Skip": "Preterpasi",
     "An error occurred: %(error_string)s": "Okazis eraro: %(error_string)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>.",
-    "Blacklist": "Malpermesi legadon de ĉifritaj mesaĝoj",
+    "Blacklist": "Malpermesi malĉifradon",
     "Unverify": "Malkontroli",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se vi jam havas Matrix-konton, vi povas <a>saluti</a> anstataŭe.",
     "Private Chat": "Privata babilo",
@@ -664,7 +664,7 @@
     "File to import": "Enportota dosiero",
     "Import": "Enporti",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Forigo de fenestraĵo efektiviĝos por ĉiuj uzantoj en ĉi tiu ĉambro. Ĉu vi certe volas ĝin forigi?",
-    "Unblacklist": "Repermesi legadon de ĉifritaj mesaĝoj",
+    "Unblacklist": "Repermesi malĉifradon",
     "none": "neniu",
     "The version of Riot.im": "Tiu ĉi versio de Riot.im",
     "Your language of choice": "Via preferata lingvo",
@@ -883,7 +883,7 @@
     "Language and region": "Lingvo kaj regiono",
     "Theme": "Haŭto",
     "General": "Ĝenerala",
-    "<a>In reply to</a> <pill>": "<a>Respondante al</a> <pill>",
+    "<a>In reply to</a> <pill>": "<a>Responde al</a> <pill>",
     "Share Message": "Diskonigi",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
     "You do not have permission to start a conference call in this room": "Vi ne havas permeson komenci grupvokon en ĉi tiu ĉambro",

From dba98e17da693b4c4a4277059fed1cb6b905542e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 11 May 2020 19:30:04 +0000
Subject: [PATCH 2905/3235] Translated using Weblate (Estonian)

Currently translated at 44.5% (1024 of 2303 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index e2d4e93e43..95096a080d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -238,7 +238,7 @@
     "Remove %(name)s from the directory?": "Eemalda %(name)s kataloogist?",
     "Remove from Directory": "Eemalda kataloogist",
     "remove %(name)s from the directory.": "eemalda %(name)s kataloogist.",
-    "You seem to be uploading files, are you sure you want to quit?": "Tundub, et sa parasjagu laed faile üles, kas sa kindlasti soovid väljuda?",
+    "You seem to be uploading files, are you sure you want to quit?": "Tundub, et sa parasjagu laed faile üles. Kas sa kindlasti soovid väljuda?",
     "Failed to set direct chat tag": "Otsevestluse sildi lisamine ei õnnestunud",
     "Failed to remove tag %(tagName)s from room": "Sildi %(tagName)s eemaldamine jututoast ebaõnnestus",
     "Calls": "Kõned",
@@ -543,7 +543,7 @@
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Alusta vestlust kasutades teise osapoole nime, kasutajanime (näiteks <userId/>) või e-posti aadressi.",
     "Go": "Mine",
     "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
-    "Add room": "LIsa jututuba",
+    "Add room": "Lisa jututuba",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsus vestlema kasutajat %(targetName)s.",
     "%(targetName)s joined the room.": "%(targetName)s liitus jututoaga.",
     "%(senderName)s answered the call.": "%(senderName)s vastas kõnele.",
@@ -961,5 +961,70 @@
     "Previous/next room or DM": "Eelmine/järgmine otsevestlus või jututuba",
     "Toggle the top left menu": "Lülita ülemine vasak menüü sisse/välja",
     "Activate selected button": "Aktiveeri valitud nupp",
-    "Toggle right panel": "Lülita parem paan sisse/välja"
+    "Toggle right panel": "Lülita parem paan sisse/välja",
+    "%(count)s of your messages have not been sent.|other": "Mõned sinu sõnumid on saatmata.",
+    "%(count)s of your messages have not been sent.|one": "Sinu sõnum on saatmata.",
+    "You seem to be in a call, are you sure you want to quit?": "Tundub, et sul parasjagu on kõne pooleli. Kas sa kindlasti soovid väljuda?",
+    "Unknown room %(roomId)s": "Tundmatu jututuba %(roomId)s",
+    "Room": "Jututuba",
+    "Failed to reject invite": "Kutse tagasilükkamine ei õnnestunud",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid sul ei ole õigusi selle sõnumi nägemiseks.",
+    "Failed to load timeline position": "Asukoha laadimine ajajoonel ei õnnestunud",
+    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
+    "Guest": "Külaline",
+    "Uploading %(filename)s and %(count)s others|other": "Laen üles %(filename)s ning %(count)s muud faili",
+    "Uploading %(filename)s and %(count)s others|zero": "Laen üles %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Laen üles %(filename)s ning veel %(count)s faili",
+    "Verify this login": "Verifitseeri see sisselogimissessioon",
+    "Session verified": "Sessioon on verifitseeritud",
+    "Failed to send email": "E-kirja saatmine ebaõnnestus",
+    "The email address linked to your account must be entered.": "Sa pead sisestama oma kontoga seotud e-posti aadressi.",
+    "A new password must be entered.": "Palun sisesta uus salasõna.",
+    "New passwords must match each other.": "Uued salasõnad peavad omavahel klappima.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu vestluste ajalugu loetamatuks. Palun kindlasti kas sea üles võtmete varundamine või ekspordi mõnest muust sessioonist jututubade võtmed enne senise salasõna tühistamist.",
+    "Your Matrix account on %(serverName)s": "Sinu Matrix'i konto serveris %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Sinu Matrix'i kasutajakonto serveris <underlinedServerName />",
+    "This homeserver does not support login using email address.": "See koduserver ei võimalda e-posti aadressi kasutamist sisselogimisel.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Jätkamaks selle teenuse kasutamist palun <a>võta ühendust oma teenuse haldajaga</a>.",
+    "This account has been deactivated.": "See kasutajakonto on deaktiveeritud.",
+    "Incorrect username and/or password.": "Vigane kasutajanimi ja/või salasõna.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Sa kasutad sisselogimiseks serverit %(hs)s, mitte aga matrix.org'i.",
+    "Failed to perform homeserver discovery": "Koduserveri leidmine ebaõnnestus",
+    "The phone number entered looks invalid": "Sisestatud telefoninumber tundub vigane",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "See koduserver ei paku ühtegi sisselogimislahendust, mida see klient toetab.",
+    "Error: Problem communicating with the given homeserver.": "Viga: Suhtlusel koduserveriga tekkis probleem.",
+    "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>.": "Kui aadressiribal on HTTPS-aadress, siis HTTP-protokolli kasutades ei saa ühendust koduserveriga. Palun pruugi HTTPS-protokolli või <a>luba brauseris ebaturvaliste skriptide kasutamine</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.": "Ei sa ühendust koduserveriga. Palun  kontrolli, et sinu <a>koduserveri SSL sertifikaat</a> oleks usaldusväärne ning mõni brauseri lisamoodul ei blokeeri päringuid.",
+    "Syncing...": "Sünkroniseerin...",
+    "Signing In...": "Login sisse...",
+    "Create account": "Loo kasutajakonto",
+    "Failed to fetch avatar URL": "Ei õnnestunud laadida profiilipildi ehk avatari aadressi",
+    "Upload an avatar:": "Lae üles profiilipilt ehk avatar:",
+    "Unable to query for supported registration methods.": "Ei õnnestunud pärida toetatud registreerimismeetodite loendit.",
+    "Registration has been disabled on this homeserver.": "Väline registreerimine ei ole selles koduserveris kasutusel.",
+    "This server does not support authentication with a phone number.": "See server ei toeta autentimist telefoninumbri alusel.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Sinu uus kasutajakonto (%(newAccountId)s) on registreeritud, kuid sa jube oled sisse loginud teise kasutajakontoga (%(loggedInUserId)s).",
+    "Continue with previous account": "Jätka senise konto kasutamist",
+    "<a>Log in</a> to your new account.": "<a>Logi sisse</a> oma uuele kasutajakontole.",
+    "Registration Successful": "Registreerimine õnnestus",
+    "Create your account": "Loo endale konto",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni mõnest oma muust sessioonist. Sellega tagad ka ligipääsu krüptitud sõnumitele.",
+    "This requires the latest Riot on your other devices:": "Selleks on sul vaja muudes seadmetes kõige uuemat Riot'i versiooni:",
+    "You're signed out": "Sa oled loginud välja",
+    "Clear personal data": "Kustuta privaatsed andmed",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Hoiatus: Sinu privaatsed andmed (sealhulgas krüptimisvõtmed) on jätkuvalt salvestatud selles sessioonis. Eemalda nad, kui oled lõpetanud selle sessiooni kasutamise või soovid sisse logida muu kasutajakontoga.",
+    "Commands": "Käsud",
+    "Results from DuckDuckGo": "Otsingutulemused DuckDuckGo saidist",
+    "DuckDuckGo Results": "DuckDuckGo otsingutulemused",
+    "Emoji": "Emoji",
+    "Notify the whole room": "Teavita kogu jututuba",
+    "Users": "Kasutajad",
+    "unknown device": "tundmatu seade",
+    "NOT verified": "EI OLE verifitseeritud",
+    "verified": "verifitseeritud",
+    "Verification": "Verifitseerimine",
+    "Ed25519 fingerprint": "Ed25519 sõrmejälg",
+    "User ID": "Kasutajatunnus",
+    "Algorithm": "Algoritm",
+    "unencrypted": "krüptimata"
 }

From 1f603090bee9e19b8bd6c7d853e4f6c61280713a Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Tue, 12 May 2020 04:38:12 +0000
Subject: [PATCH 2906/3235] Translated using Weblate (Finnish)

Currently translated at 90.7% (2088 of 2303 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 8135462d60..e8eef891be 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2157,5 +2157,15 @@
     "Syncing...": "Synkronoidaan...",
     "Signing In...": "Kirjaudutaan sisään...",
     "If you've joined lots of rooms, this might take a while": "Jos olet liittynyt moniin huoneisiin, tässä voi kestää hetken",
-    "Use your other device to continue…": "Jatka toisella laitteellasi…"
+    "Use your other device to continue…": "Jatka toisella laitteellasi…",
+    "Click the button below to confirm adding this email address.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän sähköpostiosoitteen.",
+    "Click the button below to confirm adding this phone number.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän puhelinnumeron.",
+    "If you cancel now, you won't complete your operation.": "Jos peruutat, toimintoa ei suoriteta loppuun.",
+    "Review where you’re logged in": "Tarkasta missä olet sisäänkirjautuneena",
+    "New login. Was this you?": "Uusi sisäänkirjautuminen. Olitko se sinä?",
+    "%(name)s is requesting verification": "%(name)s pyytää varmennusta",
+    "Sends a message as html, without interpreting it as markdown": "Lähettää viestin HTML-muodossa, tulkitsematta sitä Markdowniksi",
+    "Please supply a widget URL or embed code": "Anna sovelman osoite tai upotettava koodinpätkä",
+    "You signed in to a new session without verifying it:": "Olet kirjautunut uuteen istuntoon varmentamatta sitä:",
+    "Verify your other session using one of the options below.": "Varmenna toinen istuntosi käyttämällä yhtä seuraavista tavoista."
 }

From ca30cf7ac9a38452ed79972fa536d968959fadbf Mon Sep 17 00:00:00 2001
From: Iria_kuro <kemes132@gmail.com>
Date: Mon, 11 May 2020 11:10:34 +0000
Subject: [PATCH 2907/3235] Translated using Weblate (Korean)

Currently translated at 76.1% (1752 of 2303 strings)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4271864216..cb8fb17da3 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -523,7 +523,7 @@
     "Invite to this room": "이 방에 초대",
     "You cannot delete this message. (%(code)s)": "이 메시지를 삭제할 수 없습니다. (%(code)s)",
     "Thursday": "목요일",
-    "I understand the risks and wish to continue": "위험을 인지하고 계속하고 싶습니다",
+    "I understand the risks and wish to continue": "위험하다는 것을 이해했으며 계속하고 싶습니다",
     "Back": "돌아가기",
     "Failed to change settings": "설정 변경 실패",
     "Show message in desktop notification": "컴퓨터 알림에서 내용 보이기",
@@ -1799,5 +1799,7 @@
     "Session already verified!": "이미 검증된 세션입니다!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "경고: 이미 검증된 세션이지만 키가 일치하지 않습니다!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "경고: 키 검증 실패! 제공된 키인 \"%(fingerprint)s\"가 사용자 %(userId)s와 %(deviceId)s 세션의 서명 키인 \"%(fprint)s\"와 일치하지 않습니다. 이는 통신이 탈취되고 있는 중일 수도 있다는 뜻입니다!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다."
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다.",
+    "Show more": "더 보기",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 변경한다면 방의 암호화 키를 내보낸 후 다시 가져오지 않는 이상 모든 종단간 암호화 키는 초기화 될 것이고, 암호화된 대화 내역은 읽을 수 없게 될 것입니다. 이 문제는 추후에 개선될 것입니다."
 }

From 3e3d537fecb3a989a120ca9372795dc594278970 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 May 2020 10:51:27 +0100
Subject: [PATCH 2908/3235] Fix topic dialog not supporting escape as it didn't
 have a "Close"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index bd7e60e2f4..0ea068d389 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -365,6 +365,7 @@ export const Commands = [
             Modal.createTrackedDialog('Slash Commands', 'Topic', InfoDialog, {
                 title: room.name,
                 description: <div dangerouslySetInnerHTML={{ __html: topicHtml }} />,
+                hasCloseButton: true,
             });
             return success();
         },

From 7fe40a04701bdd0163359bd02f5cd786b4ed6cfc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 May 2020 10:55:46 +0100
Subject: [PATCH 2909/3235] Default to public room when creating room from room
 directory

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx         | 6 +++---
 src/components/structures/RoomDirectory.js       | 5 ++++-
 src/components/views/dialogs/CreateRoomDialog.js | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 3929711406..e553057acb 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -623,7 +623,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_create_room':
-                this.createRoom();
+                this.createRoom(payload.public);
                 break;
             case 'view_create_group': {
                 const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
@@ -1012,9 +1012,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }).close;
     }
 
-    private async createRoom() {
+    private async createRoom(defaultPublic = false) {
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
-        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
+        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, { defaultPublic });
 
         const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 0b07c10c8a..86353cd532 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -367,7 +367,10 @@ export default createReactClass({
 
     onCreateRoomClick: function(room) {
         this.props.onFinished();
-        dis.dispatch({action: 'view_create_room'});
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
     },
 
     showRoomAlias: function(alias, autoJoin=false) {
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 74e006354b..fb08afa5f7 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -30,12 +30,13 @@ export default createReactClass({
     displayName: 'CreateRoomDialog',
     propTypes: {
         onFinished: PropTypes.func.isRequired,
+        defaultPublic: PropTypes.bool,
     },
 
     getInitialState() {
         const config = SdkConfig.get();
         return {
-            isPublic: false,
+            isPublic: this.props.defaultPublic || false,
             isEncrypted: true,
             name: "",
             topic: "",

From 5c0920da425a13e5b7d72461baab383266d61a0a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 May 2020 11:05:30 +0100
Subject: [PATCH 2910/3235] Avoid soft crash if unknown device in verification

Rageshakes from the wild indicate that device was null here which
implies that we somehow did not know about the device when verifiying
it? Log and null-check to avoid a soft crash.
---
 .../views/right_panel/EncryptionPanel.js      |  5 +--
 .../views/right_panel/VerificationPanel.js    | 32 ++++++++++++++-----
 .../views/verification/VerificationShowSas.js |  7 ++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index bc580c767b..e9f94729fa 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -45,9 +45,6 @@ const EncryptionPanel = (props) => {
         }
     }, [verificationRequest]);
 
-    const deviceId = request && request.channel.deviceId;
-    const device = MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
-
     useEffect(() => {
         async function awaitPromise() {
             setRequesting(true);
@@ -143,7 +140,7 @@ const EncryptionPanel = (props) => {
                 key={request.channel.transactionId}
                 inDialog={layout === "dialog"}
                 phase={phase}
-                device={device} />
+            />
         </React.Fragment>);
     }
 };
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 67efd29d27..ff3700e143 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
@@ -161,6 +162,11 @@ export default class VerificationPanel extends React.PureComponent {
         this.state.reciprocateQREvent.cancel();
     };
 
+    _getDevice() {
+        const deviceId = this.props.request && this.props.request.channel.deviceId;
+        return MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
+    }
+
     renderQRReciprocatePhase() {
         const {member, request} = this.props;
         let Button;
@@ -217,16 +223,26 @@ export default class VerificationPanel extends React.PureComponent {
             }
         }
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const description = request.isSelfVerification ?
-            _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
-                deviceName: this.props.device.getDisplayName(),
-                deviceId: this.props.device.deviceId,
-            }):
-            _t("You've successfully verified %(displayName)s!", {
+        let description;
+        if (request.isSelfVerification) {
+            const device = this._getDevice();
+            if (!device) {
+                // This shouldn't happen, although rageshake would indicate that it is: log a warn
+                // and leave the message slightly broken (avoid adding a translatable string for a
+                // case that shouldn't be happening).
+                console.warn("Verified device we don't know about: " + this.props.request.channel.deviceId);
+            }
+            description = _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
+                deviceName: device ? device.getDisplayName() : '',
+                deviceId: this.props.request.channel.deviceId,
+            });
+        } else {
+            description = _t("You've successfully verified %(displayName)s!", {
                 displayName: member.displayName || member.name || member.userId,
             });
+        }
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
                 <h3>{_t("Verified")}</h3>
@@ -297,12 +313,12 @@ export default class VerificationPanel extends React.PureComponent {
                         const emojis = this.state.sasEvent ?
                             <VerificationShowSas
                                 displayName={displayName}
+                                device={this._getDevice()}
                                 sas={this.state.sasEvent.sas}
                                 onCancel={this._onSasMismatchesClick}
                                 onDone={this._onSasMatchesClick}
                                 inDialog={this.props.inDialog}
                                 isSelf={request.isSelfVerification}
-                                device={this.props.device}
                             /> : <Spinner />;
                         return <div className="mx_UserInfo_container">
                             <h3>{_t("Compare emoji")}</h3>
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index edf860c4c2..251c8ca04f 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -30,6 +30,7 @@ export default class VerificationShowSas extends React.Component {
     static propTypes = {
         pending: PropTypes.bool,
         displayName: PropTypes.string, // required if pending is true
+        device: PropTypes.object,
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
@@ -116,9 +117,11 @@ export default class VerificationShowSas extends React.Component {
             let text;
             if (this.state.pending) {
                 if (this.props.isSelf) {
+                    // device shouldn't be null in this situation but it seems like it can be, so show
+                    // slightly broken text rather than soft-crashing (we've already logged in VerificationPanel).
                     text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
-                        deviceName: this.props.device.getDisplayName(),
-                        deviceId: this.props.device.deviceId,
+                        deviceName: this.props.device ? this.props.device.getDisplayName() : '',
+                        deviceId: this.props.device ? this.props.device.deviceId : '',
                     });
                 } else {
                     const {displayName} = this.props;

From 3c5c7f56f3f4fffa08a17ee53402abc49250b1d6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 May 2020 11:14:05 +0100
Subject: [PATCH 2911/3235] Adjust comment

---
 src/components/views/right_panel/VerificationPanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index ff3700e143..76507d8d4f 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -227,9 +227,9 @@ export default class VerificationPanel extends React.PureComponent {
         if (request.isSelfVerification) {
             const device = this._getDevice();
             if (!device) {
-                // This shouldn't happen, although rageshake would indicate that it is: log a warn
-                // and leave the message slightly broken (avoid adding a translatable string for a
-                // case that shouldn't be happening).
+                // This can happen if the device is logged out while we're still showing verification
+                // UI for it.
+                // Leave the message slightly broken for this edge case (avoid adding a translatable string)
                 console.warn("Verified device we don't know about: " + this.props.request.channel.deviceId);
             }
             description = _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {

From ae2645b69ba5ec7b7a5dea0561021e5ee9da5741 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 May 2020 12:42:16 +0100
Subject: [PATCH 2912/3235] Provide separate translatable for case where we
 have no device

---
 .../views/right_panel/VerificationPanel.js       | 11 ++++++-----
 .../views/verification/VerificationShowSas.js    | 16 ++++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 76507d8d4f..6bb2d3646b 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -229,13 +229,14 @@ export default class VerificationPanel extends React.PureComponent {
             if (!device) {
                 // This can happen if the device is logged out while we're still showing verification
                 // UI for it.
-                // Leave the message slightly broken for this edge case (avoid adding a translatable string)
                 console.warn("Verified device we don't know about: " + this.props.request.channel.deviceId);
+                description = _t("You've successfully verified your device!");
+            } else {
+                description = _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
+                    deviceName: device ? device.getDisplayName() : '',
+                    deviceId: this.props.request.channel.deviceId,
+                });
             }
-            description = _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
-                deviceName: device ? device.getDisplayName() : '',
-                deviceId: this.props.request.channel.deviceId,
-            });
         } else {
             description = _t("You've successfully verified %(displayName)s!", {
                 displayName: member.displayName || member.name || member.userId,
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 251c8ca04f..09374b91af 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -117,12 +117,16 @@ export default class VerificationShowSas extends React.Component {
             let text;
             if (this.state.pending) {
                 if (this.props.isSelf) {
-                    // device shouldn't be null in this situation but it seems like it can be, so show
-                    // slightly broken text rather than soft-crashing (we've already logged in VerificationPanel).
-                    text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
-                        deviceName: this.props.device ? this.props.device.getDisplayName() : '',
-                        deviceId: this.props.device ? this.props.device.deviceId : '',
-                    });
+                    // device shouldn't be null in this situation but it can be, eg. if the device is
+                    // logged out during verification
+                    if (this.props.device) {
+                        text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
+                            deviceName: this.props.device ? this.props.device.getDisplayName() : '',
+                            deviceId: this.props.device ? this.props.device.deviceId : '',
+                        });
+                    } else {
+                        text = _t("Waiting for your other session to verify…");
+                    }
                 } else {
                     const {displayName} = this.props;
                     text = _t("Waiting for %(displayName)s to verify…", {displayName});

From 8a1b38163583d4bfe0d36510e83cecfc23fc7533 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 12 May 2020 14:29:11 +0200
Subject: [PATCH 2913/3235] remove UI for upgrading 4S to sym enc

---
 src/DeviceListener.js                         |  8 -------
 .../views/settings/CrossSigningPanel.js       |  8 -------
 .../views/toasts/SetupEncryptionToast.js      | 24 -------------------
 3 files changed, 40 deletions(-)

diff --git a/src/DeviceListener.js b/src/DeviceListener.js
index d2ba8219db..27caba971e 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.js
@@ -225,14 +225,6 @@ export default class DeviceListener {
                         });
                     }
                 }
-            } else if (await cli.secretStorageKeyNeedsUpgrade()) {
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: THIS_DEVICE_TOAST_KEY,
-                    title: _t("Encryption upgrade available"),
-                    icon: "verification_warning",
-                    props: {kind: 'upgrade_ssss'},
-                    component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                });
             } else {
                 // cross-signing is ready, and we don't need to upgrade encryption
                 ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cb04d2a018..c2c16615be 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -36,7 +36,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             userSigningPrivateKeyCached: false,
             sessionBackupKeyCached: false,
             secretStorageKeyInAccount: false,
-            secretStorageKeyNeedsUpgrade: null,
         };
     }
 
@@ -88,7 +87,6 @@ export default class CrossSigningPanel extends React.PureComponent {
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
         const crossSigningReady = await cli.isCrossSigningReady();
-        const secretStorageKeyNeedsUpgrade = await cli.secretStorageKeyNeedsUpgrade();
 
         this.setState({
             crossSigningPublicKeysOnDevice,
@@ -100,7 +98,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
-            secretStorageKeyNeedsUpgrade,
         });
     }
 
@@ -150,7 +147,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
-            secretStorageKeyNeedsUpgrade,
         } = this.state;
 
         let errorSection;
@@ -259,10 +255,6 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Homeserver feature support:")}</td>
                             <td>{homeserverSupportsCrossSigning ? _t("exists") : _t("not found")}</td>
                         </tr>
-                        <tr>
-                            <td>{_t("Secret Storage key format:")}</td>
-                            <td>{secretStorageKeyNeedsUpgrade ? _t("outdated") : _t("up to date")}</td>
-                        </tr>
                    </tbody></table>
                 </details>
                 {errorSection}
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
index 75fd55378c..b5510e85b6 100644
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ b/src/components/views/toasts/SetupEncryptionToast.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import Modal from '../../../Modal';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import DeviceListener from '../../../DeviceListener';
@@ -31,7 +30,6 @@ export default class SetupEncryptionToast extends React.PureComponent {
             'set_up_encryption',
             'verify_this_session',
             'upgrade_encryption',
-            'upgrade_ssss',
         ]).isRequired,
     };
 
@@ -39,24 +37,6 @@ export default class SetupEncryptionToast extends React.PureComponent {
         DeviceListener.sharedInstance().dismissEncryptionSetup();
     };
 
-    async _waitForCompletion() {
-        if (this.props.kind === 'upgrade_ssss') {
-            return new Promise(resolve => {
-                const recheck = async () => {
-                    const needsUpgrade = await MatrixClientPeg.get().secretStorageKeyNeedsUpgrade();
-                    if (!needsUpgrade) {
-                        MatrixClientPeg.get().removeListener('accountData', recheck);
-                        resolve();
-                    }
-                };
-                MatrixClientPeg.get().on('accountData', recheck);
-                recheck();
-            });
-        } else {
-            return;
-        }
-    }
-
     _onSetupClick = async () => {
         if (this.props.kind === "verify_this_session") {
             Modal.createTrackedDialog('Verify session', 'Verify session', SetupEncryptionDialog,
@@ -68,7 +48,6 @@ export default class SetupEncryptionToast extends React.PureComponent {
             );
             try {
                 await accessSecretStorage();
-                await this._waitForCompletion();
             } finally {
                 modal.close();
             }
@@ -82,8 +61,6 @@ export default class SetupEncryptionToast extends React.PureComponent {
                 return _t('Verify yourself & others to keep your chats safe');
             case 'verify_this_session':
                 return _t('Other users may not trust it');
-            case 'upgrade_ssss':
-                return _t('Update your secure storage');
         }
     }
 
@@ -92,7 +69,6 @@ export default class SetupEncryptionToast extends React.PureComponent {
             case 'set_up_encryption':
                 return _t('Set up');
             case 'upgrade_encryption':
-            case 'upgrade_ssss':
                 return _t('Upgrade');
             case 'verify_this_session':
                 return _t('Verify');

From b3c641184ba5b66706b808fa34088e91cd1b4d90 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 12 May 2020 14:54:49 +0200
Subject: [PATCH 2914/3235] remove obsolete strings

---
 src/i18n/strings/en_EN.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a24b2bde73..1d86947177 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -566,7 +566,6 @@
     "Review": "Review",
     "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
     "Other users may not trust it": "Other users may not trust it",
-    "Update your secure storage": "Update your secure storage",
     "Set up": "Set up",
     "Upgrade": "Upgrade",
     "Verify": "Verify",
@@ -618,9 +617,6 @@
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",
     "exists": "exists",
-    "Secret Storage key format:": "Secret Storage key format:",
-    "outdated": "outdated",
-    "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirm deleting these sessions by using Single Sign On to prove your identity.",

From a000be2b018d8f250f32530e5447962d52ed055c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 May 2020 14:03:40 +0100
Subject: [PATCH 2915/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 27b4252f77..72cb0e20d8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -492,6 +492,7 @@
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…",
+    "Waiting for your other session to verify…": "Waiting for your other session to verify…",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "Cancelling…": "Cancelling…",
     "They match": "They match",
@@ -1278,6 +1279,7 @@
     "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
+    "You've successfully verified your device!": "You've successfully verified your device!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "You've successfully verified %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Verified": "Verified",

From 03b10e7226e819ba869b622a08601e7243f4981d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 May 2020 15:21:44 +0100
Subject: [PATCH 2916/3235] Fix sign in / up links on previewed rooms

They errored because the out-of-band data was assumed to be non-null,
but that's only present for 3rd party invites.
---
 src/components/views/rooms/RoomPreviewBar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 85c41f30ec..fe7c57d811 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -266,9 +266,9 @@ export default createReactClass({
             params: {
                 email: this.props.invitedEmail,
                 signurl: this.props.signUrl,
-                room_name: this.props.oobData.room_name,
-                room_avatar_url: this.props.oobData.avatarUrl,
-                inviter_name: this.props.oobData.inviterName,
+                room_name: this.props.oobData ? this.props.oobData.room_name : null,
+                room_avatar_url: this.props.oobData ? this.props.oobData.avatarUrl : null,
+                inviter_name: this.props.oobData ? this.props.oobData.inviterName : null,
             }
         };
     },

From 004f75f289e1a9343400f57e44a1d42198fc1f45 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 May 2020 16:16:47 +0100
Subject: [PATCH 2917/3235] Rename `trash (custom).svg` as electron doesn't
 like serving files with spaces

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/messages/_RedactedBody.scss                       | 2 +-
 .../feather-customised/{trash (custom).svg => trash.custom.svg} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename res/img/feather-customised/{trash (custom).svg => trash.custom.svg} (100%)

diff --git a/res/css/views/messages/_RedactedBody.scss b/res/css/views/messages/_RedactedBody.scss
index 9ba35d7297..e4ab0c0835 100644
--- a/res/css/views/messages/_RedactedBody.scss
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -24,7 +24,7 @@ limitations under the License.
         height: 14px;
         width: 14px;
         background-color: $muted-fg-color;
-        mask-image: url('$(res)/img/feather-customised/trash (custom).svg');
+        mask-image: url('$(res)/img/feather-customised/trash.custom.svg');
         mask-repeat: no-repeat;
         mask-position: center;
         mask-size: contain;
diff --git a/res/img/feather-customised/trash (custom).svg b/res/img/feather-customised/trash.custom.svg
similarity index 100%
rename from res/img/feather-customised/trash (custom).svg
rename to res/img/feather-customised/trash.custom.svg

From c0632d01956bfc39fa2aac3b7618550b47272ccb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 12 May 2020 17:17:17 -0600
Subject: [PATCH 2918/3235] Acquire a new session before enacting deactivation

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

Every time the checkbox value changes we acquire a new session now. This avoids us asking the server to change its direction partway through the request.

This causes a bit of UI jerk as the dialog goes from auth -> loading -> auth, however it's better than the alternative of reworking the entire UIA structure to support the `authData` dict changing. Originally this commit consisted of a `disabled` flag on the `InteractiveAuth` component which carried through to the stage's component, however it turns out that stack doesn't respect changes to the `authData` prop, which means the session ID we eventually send down is wrong (`erase: false` instead of the one with `erase: true`). Therefore, we do some logic to ensure we remount `InteractiveAuth` completely.

Further work in this area is described in https://github.com/vector-im/riot-web/issues/13646
---
 .../views/dialogs/DeactivateAccountDialog.js  | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index b269ec2fdb..d84042011d 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -34,6 +34,7 @@ export default class DeactivateAccountDialog extends React.Component {
             shouldErase: false,
             errStr: null,
             authData: null, // for UIA
+            authEnabled: true, // see usages for information
 
             // A few strings that are passed to InteractiveAuth for design or are displayed
             // next to the InteractiveAuth component.
@@ -42,21 +43,7 @@ export default class DeactivateAccountDialog extends React.Component {
             continueKind: null,
         };
 
-        MatrixClientPeg.get().deactivateAccount(null, false).then(r => {
-            // If we got here, oops. The server didn't require any auth.
-            // Our application lifecycle will catch the error and do the logout bits.
-            // We'll try to log something in an vain attempt to record what happened (storage
-            // is also obliterated on logout).
-            console.warn("User's account got deactivated without confirmation: Server had no auth");
-            this.setState({errStr: _t("Server did not require any authentication")});
-        }).catch(e => {
-            if (e && e.httpStatus === 401 && e.data) {
-                // Valid UIA response
-                this.setState({authData: e.data});
-            } else {
-                this.setState({errStr: _t("Server did not return valid authentication information.")});
-            }
-        });
+        this._initAuth(/* shouldErase= */false);
     }
 
     _onStagePhaseChange = (stage, phase) => {
@@ -124,13 +111,40 @@ export default class DeactivateAccountDialog extends React.Component {
     _onEraseFieldChange = (ev) => {
         this.setState({
             shouldErase: ev.target.checked,
+
+            // Disable the auth form because we're going to have to reinitialize the auth
+            // information. We do this because we can't modify the parameters in the UIA
+            // session, and the user will have selected something which changes the request.
+            // Therefore, we throw away the last auth session and try a new one.
+            authEnabled: false,
         });
+
+        // As mentioned above, set up for auth again to get updated UIA session info
+        this._initAuth(/* shouldErase= */ev.target.checked);
     };
 
     _onCancel() {
         this.props.onFinished(false);
     }
 
+    _initAuth(shouldErase) {
+        MatrixClientPeg.get().deactivateAccount(null, shouldErase).then(r => {
+            // If we got here, oops. The server didn't require any auth.
+            // Our application lifecycle will catch the error and do the logout bits.
+            // We'll try to log something in an vain attempt to record what happened (storage
+            // is also obliterated on logout).
+            console.warn("User's account got deactivated without confirmation: Server had no auth");
+            this.setState({errStr: _t("Server did not require any authentication")});
+        }).catch(e => {
+            if (e && e.httpStatus === 401 && e.data) {
+                // Valid UIA response
+                this.setState({authData: e.data, authEnabled: true});
+            } else {
+                this.setState({errStr: _t("Server did not return valid authentication information.")});
+            }
+        });
+    };
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
@@ -142,7 +156,7 @@ export default class DeactivateAccountDialog extends React.Component {
         }
 
         let auth = <div>{_t("Loading...")}</div>;
-        if (this.state.authData) {
+        if (this.state.authData && this.state.authEnabled) {
             auth = (
                 <div>
                     {this.state.bodyText}

From 5e86dc2d60cf0a3b9bbfef6baabc23aafb2cccb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 12 May 2020 17:20:11 -0600
Subject: [PATCH 2919/3235] Update i18n strings

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b2fe409aa5..30e033bb43 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1589,13 +1589,13 @@
     "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",
-    "Server did not require any authentication": "Server did not require any authentication",
-    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
     "To continue, please enter your password:": "To continue, please enter your password:",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
+    "Server did not require any authentication": "Server did not require any authentication",
+    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "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>": "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>",
     "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.": "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.",
     "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.": "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.",

From 6d90a9d1a31170e497609eee9519ffd12ceff0af Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 12 May 2020 17:20:26 -0600
Subject: [PATCH 2920/3235] Appease the linter

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

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index d84042011d..ffef2a30c7 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -143,7 +143,7 @@ export default class DeactivateAccountDialog extends React.Component {
                 this.setState({errStr: _t("Server did not return valid authentication information.")});
             }
         });
-    };
+    }
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');

From 5029c3f1434b33fe8b4aae825f5f3e03d4425dc0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 02:16:43 +0100
Subject: [PATCH 2921/3235] Implement IRC draggable display name width

---
 res/css/views/rooms/_IRCLayout.scss           | 23 +++--
 src/components/structures/MessagePanel.js     |  7 ++
 src/components/structures/ScrollPanel.js      |  6 ++
 src/components/views/elements/Draggable.tsx   | 84 ++++++++++++++++++
 .../views/elements/ErrorBoundary.js           |  2 +-
 .../elements/IRCTimelineProfileResizer.tsx    | 86 +++++++++++++++++++
 src/settings/Settings.js                      |  7 ++
 7 files changed, 207 insertions(+), 8 deletions(-)
 create mode 100644 src/components/views/elements/Draggable.tsx
 create mode 100644 src/components/views/elements/IRCTimelineProfileResizer.tsx

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 301f712ffb..159cfc0aad 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$name-width: 70px;
 $icon-width: 14px;
 $timestamp-width: 45px;
 $right-padding: 5px;
 $irc-line-height: $font-18px;
 
 .mx_IRCLayout {
+    --name-width: 70px;
 
     line-height: $irc-line-height !important;
 
@@ -48,7 +48,7 @@ $irc-line-height: $font-18px;
         > .mx_SenderProfile {
             order: 2;
             flex-shrink: 0;
-            width: $name-width;
+            width: var(--name-width);
             text-overflow: ellipsis;
             text-align: right;
             display: flex;
@@ -122,7 +122,7 @@ $irc-line-height: $font-18px;
 
     .mx_EventTile_emote {
         > .mx_EventTile_avatar {
-            margin-left: calc($name-width + $icon-width + $right-padding);
+            margin-left: calc(var(--name-width) + $icon-width + $right-padding);
         }
     }
 
@@ -132,7 +132,7 @@ $irc-line-height: $font-18px;
 
     .mx_EventListSummary {
         > .mx_EventTile_line {
-            padding-left: calc($name-width + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
+            padding-left: calc(var(--name-width) + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
         }
 
         .mx_EventListSummary_avatars {
@@ -143,12 +143,12 @@ $irc-line-height: $font-18px;
 
     .mx_EventTile.mx_EventTile_info {
         .mx_EventTile_avatar {
-            left: calc($name-width + 10px + $icon-width);
+            left: calc(var(--name-width) + 10px + $icon-width);
             top: 0;
         }
 
         .mx_EventTile_line {
-            left: calc($name-width + 10px + $icon-width);
+            left: calc(var(--name-width) + 10px + $icon-width);
         }
 
         .mx_TextualEvent {
@@ -198,7 +198,16 @@ $irc-line-height: $font-18px;
         margin: 0;
         .mx_SenderProfile {
             width: unset;
-            max-width: $name-width;
+            max-width: var(--name-width);
         }
     }
+
+    .mx_ProfileResizer {
+        position: absolute;
+        height: 100%;
+        width: 15px;
+        left: calc(80px + var(--name-width));
+        cursor: col-resize;
+        z-index: 100;
+    }
 }
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index f46df0175a..1c10efb346 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -29,6 +29,7 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
+import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -819,6 +820,11 @@ export default class MessagePanel extends React.Component {
             );
         }
 
+        let ircResizer = null;
+        if (this.state.useIRCLayout) {
+            ircResizer = <IRCTimelineProfileResizer minWidth={20} maxWidth={600} roomId={this.props.room.roomId} />;
+        }
+
         return (
             <ErrorBoundary>
                 <ScrollPanel
@@ -831,6 +837,7 @@ export default class MessagePanel extends React.Component {
                     style={style}
                     stickyBottom={this.props.stickyBottom}
                     resizeNotifier={this.props.resizeNotifier}
+                    fixedChildren={ircResizer}
                 >
                     { topSpinner }
                     { this._getEventTiles() }
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 4f44c1a169..cb0114b243 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -144,6 +144,11 @@ export default createReactClass({
         /* resizeNotifier: ResizeNotifier to know when middle column has changed size
          */
         resizeNotifier: PropTypes.object,
+
+        /* fixedChildren: allows for children to be passed which are rendered outside
+         * of the wrapper
+         */
+        fixedChildren: PropTypes.node,
     },
 
     getDefaultProps: function() {
@@ -881,6 +886,7 @@ export default createReactClass({
         return (<AutoHideScrollbar wrappedRef={this._collectScroll}
                 onScroll={this.onScroll}
                 className={`mx_ScrollPanel ${this.props.className}`} style={this.props.style}>
+                    { this.props.fixedChildren }
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
                             { this.props.children }
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
new file mode 100644
index 0000000000..98f86fd524
--- /dev/null
+++ b/src/components/views/elements/Draggable.tsx
@@ -0,0 +1,84 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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';
+
+interface IProps {
+    className: string,
+    dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState,
+    onMouseUp: (event: MouseEvent) => void,
+}
+
+interface IState {
+    onMouseMove: (event: MouseEvent) => void,
+    onMouseUp: (event: MouseEvent) => void,
+    location: ILocationState,
+}
+
+export interface ILocationState {
+    currentX: number,
+    currentY: number,
+}
+
+export default class Draggable extends React.Component<IProps, IState> {
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            onMouseMove: this.onMouseMove.bind(this),
+            onMouseUp: this.onMouseUp.bind(this),
+            location: {
+                currentX: 0,
+                currentY: 0,
+            },
+        };
+    }
+
+    private onMouseDown = (event: MouseEvent): void => {
+        this.setState({
+            location: {
+                currentX: event.clientX,
+                currentY: event.clientY,
+            },
+        });
+
+        document.addEventListener("mousemove", this.state.onMouseMove);
+        document.addEventListener("mouseup", this.state.onMouseUp);
+        console.log("Mouse down")
+    }
+
+    private onMouseUp = (event: MouseEvent): void => {
+        document.removeEventListener("mousemove", this.state.onMouseMove);
+        document.removeEventListener("mouseup", this.state.onMouseUp);
+        this.props.onMouseUp(event);
+        console.log("Mouse up")
+    }
+
+    private onMouseMove(event: MouseEvent): void {
+        console.log("Mouse Move")
+        const newLocation = this.props.dragFunc(this.state.location, event);
+
+        this.setState({
+            location: newLocation,
+        });
+    }
+
+    render() {
+        return <div className={this.props.className} onMouseDown={this.onMouseDown.bind(this)} />
+    }
+
+}
\ No newline at end of file
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index a043b350ab..1abd11f838 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -73,7 +73,7 @@ export default class ErrorBoundary extends React.PureComponent {
         if (this.state.error) {
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
             const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
-            return <div className="mx_ErrorBoundary">
+            return <div className="mx_ErrorBoundary mx_IRCLayout">
                 <div className="mx_ErrorBoundary_body">
                     <h1>{_t("Something went wrong!")}</h1>
                     <p>{_t(
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
new file mode 100644
index 0000000000..80a86b2005
--- /dev/null
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -0,0 +1,86 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import Draggable, {ILocationState} from './Draggable';
+
+interface IProps {
+    // Current room
+    roomId: string,
+    minWidth: number,
+    maxWidth: number,
+};
+
+interface IState {
+    width: number,
+    IRCLayoutRoot: HTMLElement,
+};
+
+export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            width: SettingsStore.getValue("ircDisplayNameWidth", this.props.roomId),
+            IRCLayoutRoot: null,
+        }
+    };
+
+    componentDidMount() {
+        this.setState({
+            IRCLayoutRoot: document.querySelector(".mx_IRCLayout") as HTMLElement,
+        }, () => this.updateCSSWidth(this.state.width))
+    }
+
+    private dragFunc = (location: ILocationState, event: React.MouseEvent<Element, MouseEvent>): ILocationState => {
+        const offset = event.clientX - location.currentX;
+        const newWidth = this.state.width + offset;
+
+        console.log({offset})
+        // If we're trying to go smaller than min width, don't.
+        if (this.state.width <= this.props.minWidth && offset <= 0) {
+            return location;
+        }
+
+        if (this.state.width >= this.props.maxWidth && offset >= 0) {
+            return location;
+        }
+
+        this.setState({
+            width: newWidth,
+        });
+
+        this.updateCSSWidth.bind(this)(newWidth);
+
+        return {
+            currentX: event.clientX,
+            currentY: location.currentY,
+        }
+    }
+
+    private updateCSSWidth(newWidth: number) {
+        this.state.IRCLayoutRoot.style.setProperty("--name-width", newWidth + "px");
+    }
+
+    private onMoueUp(event: MouseEvent) {
+        SettingsStore.setValue("ircDisplayNameWidth", this.props.roomId, SettingLevel.ROOM_DEVICE, this.state.width);
+    }
+
+    render() {
+        return <Draggable className="mx_ProfileResizer" dragFunc={this.dragFunc.bind(this)} onMouseUp={this.onMoueUp.bind(this)}/>
+    }
+};
\ No newline at end of file
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 032b0ee906..6d741ba3a5 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -531,4 +531,11 @@ export const SETTINGS = {
             MatrixClient.prototype.setCryptoTrustCrossSignedDevices, true,
         ),
     },
+    "ircDisplayNameWidth": {
+        // We specifically want to have room-device > device so that users may set a device default
+        // with a per-room override.
+        supportedLevels: ['room-device', 'device'],
+        displayName: _td("IRC display name width"),
+        default: 80,
+    },
 };

From d8b6b7b976607d697125b4bdfa5c30b2912edf1c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 May 2020 06:24:04 +0100
Subject: [PATCH 2922/3235] Pass screenAfterLogin through SSO in the callback
 url

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.js                          | 14 ++++++--------
 src/components/structures/MatrixChat.tsx     |  9 ++++++++-
 src/components/structures/auth/Login.js      |  7 +++++--
 src/components/structures/auth/SoftLogout.js |  4 +++-
 src/components/views/auth/Welcome.js         |  3 ++-
 src/components/views/elements/SSOButton.js   |  5 +++--
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 7214031586..8a950dc2e3 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -167,13 +167,9 @@ export default class BasePlatform {
 
     setLanguage(preferredLangs: string[]) {}
 
-    getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
+    getSSOCallbackUrl(hsUrl: string, isUrl: string, fragmentAfterLogin: string): URL {
         const url = new URL(window.location.href);
-        // 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 an SSO login.
-        url.hash = "";
+        url.hash = fragmentAfterLogin || "";
         url.searchParams.set("homeserver", hsUrl);
         url.searchParams.set("identityServer", isUrl);
         return url;
@@ -183,9 +179,11 @@ export default class BasePlatform {
      * Begin Single Sign On flows.
      * @param {MatrixClient} mxClient the matrix client using which we should start the flow
      * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
+     * @param {string} fragmentAfterLogin the hash to pass to the app during sso callback.
      */
-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
-        const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
+        const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl(),
+            fragmentAfterLogin);
         window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
     }
 
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 3929711406..8ff8abb190 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1973,6 +1973,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     render() {
         // console.log(`Rendering MatrixChat with view ${this.state.view}`);
 
+        let fragmentAfterLogin = "";
+        if (this.props.initialScreenAfterLogin) {
+            fragmentAfterLogin = `/${this.props.initialScreenAfterLogin.screen}`;
+        }
+
         let view;
 
         if (this.state.view === Views.LOADING) {
@@ -2052,7 +2057,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
         } else if (this.state.view === Views.WELCOME) {
             const Welcome = sdk.getComponent('auth.Welcome');
-            view = <Welcome {...this.getServerProperties()} />;
+            view = <Welcome {...this.getServerProperties()} fragmentAfterLogin={fragmentAfterLogin} />;
         } else if (this.state.view === Views.REGISTER) {
             const Registration = sdk.getComponent('structures.auth.Registration');
             view = (
@@ -2091,6 +2096,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     onServerConfigChange={this.onServerConfigChange}
+                    fragmentAfterLogin={fragmentAfterLogin}
                     {...this.getServerProperties()}
                 />
             );
@@ -2100,6 +2106,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 <SoftLogout
                     realQueryParams={this.props.realQueryParams}
                     onTokenLoginCompleted={this.props.onTokenLoginCompleted}
+                    fragmentAfterLogin={fragmentAfterLogin}
                 />
             );
         } else {
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 5d3cb69417..e65a223bd6 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -355,7 +355,8 @@ export default createReactClass({
             ev.preventDefault();
             ev.stopPropagation();
             const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
-            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
+            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind,
+                this.props.fragmentAfterLogin);
         } else {
             // Don't intercept - just go through to the register page
             this.onRegisterClick(ev);
@@ -628,7 +629,9 @@ export default createReactClass({
                 <SSOButton
                     className="mx_Login_sso_link mx_Login_submit"
                     matrixClient={this._loginLogic.createTemporaryClient()}
-                    loginType={loginType} />
+                    loginType={loginType}
+                    fragmentAfterLogin={this.props.fragmentAfterLogin}
+                />
             </div>
         );
     },
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 08ab7e8a61..ede1041f8a 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -244,7 +244,9 @@ export default class SoftLogout extends React.Component {
                     <p>{introText}</p>
                     <SSOButton
                         matrixClient={MatrixClientPeg.get()}
-                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"} />
+                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"}
+                        fragmentAfterLogin={this.props.fragmentAfterLogin}
+                    />
                 </div>
             );
         }
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 7cbcf65d3c..91ba368f70 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -45,7 +45,8 @@ export default class Welcome extends React.PureComponent {
             idBaseUrl: isUrl,
         });
         const plaf = PlatformPeg.get();
-        const callbackUrl = plaf.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl());
+        const callbackUrl = plaf.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl(),
+            this.props.fragmentAfterLogin);
 
         return (
             <AuthPage>
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
index 3e0757924b..1126ae3cd7 100644
--- a/src/components/views/elements/SSOButton.js
+++ b/src/components/views/elements/SSOButton.js
@@ -21,9 +21,9 @@ import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";
 import {_t} from "../../../languageHandler";
 
-const SSOButton = ({matrixClient, loginType, ...props}) => {
+const SSOButton = ({matrixClient, loginType, fragmentAfterLogin, ...props}) => {
     const onClick = () => {
-        PlatformPeg.get().startSingleSignOn(matrixClient, loginType);
+        PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin);
     };
 
     return (
@@ -36,6 +36,7 @@ const SSOButton = ({matrixClient, loginType, ...props}) => {
 SSOButton.propTypes = {
     matrixClient: PropTypes.object.isRequired, // does not use context as may use a temporary client
     loginType: PropTypes.oneOf(["sso", "cas"]), // defaults to "sso" in base-apis
+    fragmentAfterLogin: PropTypes.string,
 };
 
 export default SSOButton;

From 52e3c97f8c9a2032fe92b2b4bb5fc68c0f6957b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Wed, 13 May 2020 06:36:14 +0100
Subject: [PATCH 2923/3235] Revert "ImageView make clicking off it easier"

---
 res/css/views/elements/_ImageView.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 983ef074f2..0a4ed2a194 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -37,7 +37,7 @@ limitations under the License.
     order: 2;
     /* min-width hack needed for FF */
     min-width: 0px;
-    max-height: 90%;
+    height: 90%;
     flex: 15 15 0;
     display: flex;
     align-items: center;

From 73a6fed1e32594bd7fad4c98684bbc76cbd44978 Mon Sep 17 00:00:00 2001
From: tleydxdy <tleydxdy@gmail.com>
Date: Tue, 12 May 2020 23:11:03 +0000
Subject: [PATCH 2924/3235] Translated using Weblate (Chinese (Simplified))

Currently translated at 61.7% (1424 of 2307 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 | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 4eff773d1c..dc3cc6d176 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1443,5 +1443,30 @@
     "Verifies a user, session, and pubkey tuple": "验证用户、会话和公钥元组",
     "Unknown (user, session) pair:": "未知（用户、会话）对：",
     "Session already verified!": "会话已验证！",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：会话已验证，但密钥不匹配！"
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：会话已验证，但密钥不匹配！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(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 不符。这可能表示您的通讯已被截获！",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "您提供的签名密钥与您从 %(userId)s 的会话 %(deviceId)s 获取的一致。该会话被标为已验证。",
+    "Sends the given message coloured as a rainbow": "以彩虹色发送给定消息",
+    "Sends the given emote coloured as a rainbow": "以彩虹色发送给定表情符号",
+    "Displays list of commands with usages and descriptions": "显示指令清单与其描述和用法",
+    "Displays information about a user": "显示关于用户的信息",
+    "Send a bug report with logs": "发送带日志的错误报告",
+    "Opens chat with the given user": "与指定用户发起聊天",
+    "Sends a message to the given user": "向指定用户发消息",
+    "%(senderName)s made no change.": "%(senderName)s 未做出变更。",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 将聊天室名称从 %(oldRoomName)s 改为 %(newRoomName)s。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 为此聊天室添加备用地址 %(addresses)s。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 为此聊天室添加了备用地址 %(addresses)s。",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s 为此聊天室移除了备用地址 %(addresses)s。",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s 为此聊天室移除了备用地址 %(addresses)s。",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s 更改了此聊天室的备用地址。",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s 更改了此聊天室的主地址与备用地址。",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s 更改了此聊天室的地址。",
+    "%(senderName)s placed a voice call.": "%(senderName)s 发起了语音通话。",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s 发起了语音通话。（此浏览器不支持）",
+    "%(senderName)s placed a video call.": "%(senderName)s 发起了视频通话。",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s 发起了视频通话。（此浏览器不支持）",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的用户的规则",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的服务器的规则",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的规则"
 }

From 52dec0cc8d871f271f7433036007d015e59f1eb8 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 13 May 2020 03:42:53 +0000
Subject: [PATCH 2925/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2307 of 2307 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index ba8ffa0fcb..257b245e1c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2421,5 +2421,9 @@
     "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。",
     "Message deleted": "訊息已刪除",
-    "Message deleted by %(name)s": "訊息已被 %(name)s 刪除"
+    "Message deleted by %(name)s": "訊息已被 %(name)s 刪除",
+    "Opens chat with the given user": "開啟與指定使用者的聊天",
+    "Sends a message to the given user": "傳送訊息給指定的使用者",
+    "Waiting for your other session to verify…": "正在等待您的其他工作階段進行驗證……",
+    "You've successfully verified your device!": "您已成功驗證您的裝置！"
 }

From 42eb36d6287d0bc0c3ffd3e51f3292b83c9cd397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Tue, 12 May 2020 17:30:23 +0000
Subject: [PATCH 2926/3235] Translated using Weblate (Czech)

Currently translated at 95.2% (2197 of 2307 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index d08ac6c0f5..3b018204c0 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2246,5 +2246,48 @@
     "Command failed": "Příkaz selhal",
     "Could not find user in room": "Nepovedlo se najít uživatele v místnosti",
     "Please supply a widget URL or embed code": "Zadejte prosím URL widgetu nebo jeho kód",
-    "Send a bug report with logs": "Zaslat hlášení o chybě"
+    "Send a bug report with logs": "Zaslat hlášení o chybě",
+    "You signed in to a new session without verifying it:": "Přihlásili jste se do nové relace, ale neoveřili jste ji:",
+    "Verify your other session using one of the options below.": "Ověřte ostatní relací jedním z následujících způsobů.",
+    "Enable cross-signing to verify per-user instead of per-session": "Povolit cross-signing - ověřování uživatelů místo oveřování jednotlivých relací",
+    "Keep recovery passphrase in memory for this session": "V této relaci si heslo pro obnovení zálohy zapamatovat",
+    "Click the button below to confirm deleting these sessions.|other": "Zmáčknutím tlačítka potvrdíte smazání těchto relací.",
+    "Click the button below to confirm deleting these sessions.|one": "Zmáčknutím tlačítka potvrdíte smazání této relace.",
+    "Delete sessions|other": "Smazat relace",
+    "Delete sessions|one": "Smazat relaci",
+    "Where you’re logged in": "Kde jste přihlášení",
+    "You've successfully verified your device!": "Úspěšně jste ověřili vaše zařízení!",
+    "Start verification again from the notification.": "Začít proces ověření znovu pomocí notifikace.",
+    "Start verification again from their profile.": "Začít proces ověření znovu z jejich profilu.",
+    "Verification timed out.": "Ověření vypršelo.",
+    "You cancelled verification on your other session.": "Na druhé relace jste proces ověření zrušili.",
+    "%(displayName)s cancelled verification.": "%(displayName)s zrušil/a proces ověření.",
+    "You cancelled verification.": "Zrušili jste proces ověření.",
+    "Message deleted": "Zpráva smazána",
+    "Message deleted by %(name)s": "Zpráva smazána uživatelem %(name)s",
+    "Can't load this message": "Tuto zprávu nelze načíst",
+    "Submit logs": "Odeslat záznamy o chybě",
+    "Looks good": "To vypadá dobře",
+    "Can't find this server or its room list": "Server nebo jeho seznam místností se nepovedlo nalézt",
+    "All rooms": "Všechny místnosti",
+    "Your server": "Váš server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Opravdu chcete odstranit <b>%(serverName)s</b>",
+    "Remove server": "Odstranit server",
+    "Matrix": "Matrix",
+    "Add a new server": "Přidat nový server",
+    "Enter the name of a new server you want to explore.": "Zadejte jméno serveru, který si chcete prohlédnout.",
+    "Server name": "Jméno serveru",
+    "Add a new server...": "Přidat nový server...",
+    "%(networkName)s rooms": "místnosti v %(networkName)s",
+    "Matrix rooms": "místnosti na Matrixu",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Připomínka: Váš prohlížeč není oficiálně podporován, tak se může Riot chovat nepředvídatelně.",
+    "Enable end-to-end encryption": "Povolit E2E šifrování",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Už to v budoucnu nepůjde vypnout. Většina botů a propojení zatím nefunguje.",
+    "Server did not require any authentication": "Server nevyžadoval žádné ověření",
+    "Server did not return valid authentication information.": "Server neposkytl platné informace o ověření.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Potvrďte deaktivaci účtu použtím Jednotného přihlášení.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Opravdu chcete deaktivovat účet? Je to nevratné.",
+    "Confirm account deactivation": "Potvrďte deaktivaci účtu",
+    "There was a problem communicating with the server. Please try again.": "Došlo k potížím při komunikaci se serverem. Zkuste to prosím znovu.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Začněte s někým konverzovat za pomocí jména, přihlašovacího jména (jako <userId/>) nebo emailu."
 }

From 1cfdf7e56fc3b2f3a4efc8867c8906d3731541b4 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 12 May 2020 17:22:31 +0000
Subject: [PATCH 2927/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2307 of 2307 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 | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4d270260fc..9e8641a6e9 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -70,7 +70,7 @@
     "Unable to create widget.": "Ne povas krei fenestraĵon.",
     "Failed to send request.": "Malsukcesis sendi peton.",
     "This room is not recognised.": "Ĉi tiu ĉambro ne estas rekonita.",
-    "Power level must be positive integer.": "Nivelo de potenco devas esti entjero pozitiva.",
+    "Power level must be positive integer.": "Povnivelo devas esti entjero pozitiva.",
     "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.",
     "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉambro.",
     "Missing room_id in request": "En peto mankas room_id",
@@ -122,7 +122,7 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonata (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la povnivelon de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
     "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
@@ -212,8 +212,8 @@
     "Failed to ban user": "Malsukcesis forbari uzanton",
     "Failed to mute user": "Malsukcesis silentigi uzanton",
     "Failed to toggle moderator status": "Malsukcesis baskuligi estrecon",
-    "Failed to change power level": "Malsukcesis ŝanĝi nivelon de potenco",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos fareblos, ĉar vi donas al la uzanto la saman nivelon de potenco, kiun havas vi mem.",
+    "Failed to change power level": "Malsukcesis ŝanĝi povnivelon",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos malfari, ĉar vi donas al la uzanto la saman povnivelon, kiun havas vi mem.",
     "Are you sure?": "Ĉu vi certas?",
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
@@ -233,7 +233,7 @@
     "and %(count)s others...|one": "kaj unu alia…",
     "Invited": "Invititaj",
     "Filter room members": "Filtri ĉambranojn",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (potenco je %(powerLevelNumber)s)",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (povnivelo je %(powerLevelNumber)s)",
     "Attachment": "Aldonaĵo",
     "Hangup": "Fini vokon",
     "Voice call": "Voĉvoko",
@@ -275,7 +275,7 @@
     "Search": "Serĉi",
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
-    "Favourites": "Ŝatataj",
+    "Favourites": "Elstarigitaj",
     "Rooms": "Ĉambroj",
     "Low priority": "Malpli gravaj",
     "Historical": "Estintaj",
@@ -291,7 +291,7 @@
     "Banned users": "Forbaritaj uzantoj",
     "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
     "Leave room": "Eliri ĉambron",
-    "Favourite": "Ŝatata",
+    "Favourite": "Elstarigi",
     "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 aliri ĉi tiun ĉambron?",
@@ -509,7 +509,7 @@
     "Failed to remove the room from the summary of %(groupId)s": "Malsukcesis forigi la ĉambron de la superrigardo de %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Ĉambro ;%(roomName)s' ne forigeblas de la superrigardo.",
     "Add users to the community summary": "Aldoni uzantojn al la komunuma superrigardo",
-    "Who would you like to add to this summary?": "Kiun vi ŝatus aldoni al tiu ĉi superrigardo?",
+    "Who would you like to add to this summary?": "Kiun vi volas aldoni al tiu ĉi superrigardo?",
     "Failed to add the following users to the summary of %(groupId)s:": "Malsukcesis aldoni la jenajn uzantojn al la superrigardo de %(groupId)s:",
     "Add a User": "Aldoni uzanton",
     "Failed to remove a user from the summary of %(groupId)s": "Malsukcesis forigi uzanton de la superrigardo de %(groupId)s",
@@ -550,7 +550,7 @@
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
     "Active call": "Aktiva voko",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi ŝatus <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi volas <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Ŝajne vi alŝutas dosierojn nun; ĉu vi tamen volas foriri?",
     "You seem to be in a call, are you sure you want to quit?": "Ŝajne vi vokas nun; ĉu vi tamen volas foriri?",
     "Search failed": "Serĉo malsukcesis",
@@ -621,7 +621,7 @@
     "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentikigon per telefona numero.",
     "Displays action": "Montras agon",
     "Bans user with given id": "Forbaras uzanton kun la donita identigilo",
-    "Define the power level of a user": "Difini la potencan nivelon de uzanto",
+    "Define the power level of a user": "Difini la povnivelon de uzanto",
     "Deops user with given id": "Senestrigas uzanton kun donita identigilo",
     "Invites user with given id to current room": "Invitas uzanton per identigilo al la nuna ĉambro",
     "Joins room with given alias": "Aliĝas al ĉambro per kromnomo",
@@ -1477,7 +1477,7 @@
     "Demote yourself?": "Ĉu malrangaltigi vin mem?",
     "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.": "Vi ne povos malfari tiun ŝanĝon, ĉar vi malrangaltigas vin mem; se vi estas la lasta povohava uzanto en la ĉambro, estos neeble vian povon rehavi.",
     "Demote": "Malrangaltigi",
-    "Power level": "Povonivelo",
+    "Power level": "Povnivelo",
     "Use two-way text verification": "Uzi duflankan tekstan kontrolon",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Gradaltigo de ĉi tiu ĉambro bezonas fermi ĝin, kaj krei novan por anstataŭi ĝin. Por plejbonigi sperton de la ĉambranoj, ni:",
     "Invalid homeserver discovery response": "Nevalida eltrova respondo de hejmservilo",
@@ -1571,10 +1571,10 @@
     "Always show the window menu bar": "Ĉiam montri la fenestran menubreton",
     "Upgrade the room": "Gradaltigi la ĉambron",
     "Enable room encryption": "Ŝalti ĉifradon de la ĉambro",
-    "Error changing power level requirement": "Eraris ŝanĝo de postulo de potenconivelo",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de la postuloj de la ĉambro pri potenconivelo. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
-    "Error changing power level": "Eraris ŝanĝo de potenconivelo",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de potenconivelo de la uzanto. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
+    "Error changing power level requirement": "Eraris ŝanĝo de postulo de povnivelo",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de la postuloj de la ĉambro pri povnivelo. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
+    "Error changing power level": "Eraris ŝanĝo de povnivelo",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de povnivelo de la uzanto. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
     "Remove %(email)s?": "Ĉu forigi %(email)s?",
     "Remove %(phone)s?": "Ĉu forigi %(phone)s?",
     "No recent messages by %(user)s found": "Neniuj freŝaj mesaĝoj de %(user)s troviĝis",
@@ -1965,7 +1965,7 @@
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Uzu kunigilon <b>(%(serverName)s)</b> por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
     "Manage integrations": "Administri kunigojn",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi nivelojn de potenco.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi povnivelojn.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevados pasivajn sciigojn en aliaj salutaĵoj, ĝis vi ilin resalutos",
     "Error downloading theme information.": "Eraris elŝuto de informoj pri haŭto.",
     "Theme added!": "Haŭto aldoniĝis!",
@@ -2396,5 +2396,9 @@
     "Cancel replying to a message": "Nuligi respondon al mesaĝo",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>.",
     "Message deleted": "Mesaĝo foriĝis",
-    "Message deleted by %(name)s": "Mesaĝon forigis %(name)s"
+    "Message deleted by %(name)s": "Mesaĝon forigis %(name)s",
+    "Opens chat with the given user": "Malfermas babilon kun la uzanto",
+    "Sends a message to the given user": "Sendas mesaĝon al la uzanto",
+    "Waiting for your other session to verify…": "Atendante kontrolon de via alia salutaĵo…",
+    "You've successfully verified your device!": "Vi sukcese kontrolis vian aparaton!"
 }

From cad0f38d4d147e88ecfb5d2dc26d33c98e22740f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 12 May 2020 21:37:12 +0000
Subject: [PATCH 2928/3235] Translated using Weblate (Estonian)

Currently translated at 45.0% (1037 of 2307 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 95096a080d..cda3a5e76d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1026,5 +1026,18 @@
     "Ed25519 fingerprint": "Ed25519 sõrmejälg",
     "User ID": "Kasutajatunnus",
     "Algorithm": "Algoritm",
-    "unencrypted": "krüptimata"
+    "unencrypted": "krüptimata",
+    "Terms and Conditions": "Kasutustingimused",
+    "Logout": "Logi välja",
+    "Your Communities": "Sinu kogukonnad",
+    "Error whilst fetching joined communities": "Viga nende kogukondade laadimisel, millega sa oled liitunud",
+    "You have no visible notifications": "Sul ei ole nähtavaid teavitusi",
+    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot'il ei õnnestunud koduserverist laadida toetatud protokollide loendit. Toetamaks kolmandate osapoolte võrke võib koduserver olla liiga vana.",
+    "Riot failed to get the public room list.": "Riot'il ei õnnestunud laadida avalike jututubade loendit.",
+    "The homeserver may be unavailable or overloaded.": "Koduserver pole kas saadaval või on üle koormatud.",
+    "Room not found": "Jututuba ei leidunud",
+    "Preview": "Eelvaade",
+    "View": "Näita",
+    "Message not sent due to unknown sessions being present": "Sõnum on saatmata, sest jutuoas on tundmatud sessioonid",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>."
 }

From be61968dcaa3b1f0b30581a98e8dbfd55738fcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 13 May 2020 07:19:39 +0000
Subject: [PATCH 2929/3235] Translated using Weblate (French)

Currently translated at 100.0% (2307 of 2307 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 1756ff57ad..7546385bf6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2422,5 +2422,9 @@
     "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitez quelqu’un en utilisant leur nom, leur nom d’utilisateur (comme <userId/>), leur adresse e-mail ou <a>partagez ce salon</a>.",
     "Message deleted": "Message supprimé",
-    "Message deleted by %(name)s": "Message supprimé par %(name)s"
+    "Message deleted by %(name)s": "Message supprimé par %(name)s",
+    "Opens chat with the given user": "Ouvre une discussion avec l’utilisateur fourni",
+    "Sends a message to the given user": "Envoie un message à l’utilisateur fourni",
+    "Waiting for your other session to verify…": "En attente de la vérification depuis votre autre session…",
+    "You've successfully verified your device!": "Vous avez bien vérifié votre appareil !"
 }

From d11923e2e3d3f4189d8848349f0ec1073ea8f91e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 May 2020 10:38:32 +0100
Subject: [PATCH 2930/3235] Add new keyboard shortcuts for jump to unread and
 upload file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/KeyboardShortcuts.tsx       | 41 +++++++++++++++----
 src/components/structures/RoomView.js         | 14 ++++++-
 src/components/views/rooms/MessageComposer.js | 13 +++++-
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index bcbf3d6810..f527ab4a14 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -34,6 +34,7 @@ export enum Categories {
     CALLS = "Calls",
     COMPOSER = "Composer",
     ROOM_LIST = "Room List",
+    ROOM = "Room",
     AUTOCOMPLETE = "Autocomplete",
 }
 
@@ -142,6 +143,34 @@ const shortcuts: Record<Categories, IShortcut[]> = {
         },
     ],
 
+    [Categories.ROOM]: [
+        {
+            keybinds: [{
+                key: Key.PAGE_UP,
+            }, {
+                key: Key.PAGE_DOWN,
+            }],
+            description: _td("Scroll up/down in the timeline"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Dismiss read marker and jump to bottom"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.SHIFT],
+                key: Key.PAGE_UP,
+            }],
+                description: _td("Jump to oldest unread message"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL, Modifiers.SHIFT],
+                key: Key.U,
+            }],
+            description: _td("Upload a file"),
+        }
+    ],
+
     [Categories.ROOM_LIST]: [
         {
             keybinds: [{
@@ -181,13 +210,6 @@ const shortcuts: Record<Categories, IShortcut[]> = {
 
     [Categories.NAVIGATION]: [
         {
-            keybinds: [{
-                key: Key.PAGE_UP,
-            }, {
-                key: Key.PAGE_DOWN,
-            }],
-            description: _td("Scroll up/down in the timeline"),
-        }, {
             keybinds: [{
                 modifiers: [Modifiers.ALT, Modifiers.SHIFT],
                 key: Key.ARROW_UP,
@@ -257,10 +279,11 @@ const shortcuts: Record<Categories, IShortcut[]> = {
 
 const categoryOrder = [
     Categories.COMPOSER,
-    Categories.CALLS,
-    Categories.ROOM_LIST,
     Categories.AUTOCOMPLETE,
+    Categories.ROOM,
+    Categories.ROOM_LIST,
     Categories.NAVIGATION,
+    Categories.CALLS,
 ];
 
 interface IModal {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f53929df4a..e413c33efa 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -41,7 +41,7 @@ import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
 import eventSearch from '../../Searching';
 
-import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
+import {isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
 
 import MainSplit from './MainSplit';
 import RightPanel from './RightPanel';
@@ -588,6 +588,18 @@ export default createReactClass({
                     handled = true;
                 }
                 break;
+            case Key.PAGE_UP:
+                if (!ev.altKey && !ev.ctrlKey && ev.shiftKey && !ev.metaKey) {
+                    this.jumpToReadMarker();
+                    handled = true;
+                }
+                break;
+            case Key.U.toUpperCase():
+                if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) {
+                    dis.dispatch({ action: "upload_file" })
+                    handled = true;
+                }
+                break;
         }
 
         if (handled) {
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4749742a7d..1142e91057 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -114,8 +114,19 @@ class UploadButton extends React.Component {
         this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
 
         this._uploadInput = createRef();
+        this._dispatcherRef = dis.register(this.onAction);
     }
 
+    componentWillUnmount() {
+        dis.unregister(this._dispatcherRef);
+    }
+
+    onAction = payload => {
+        if (payload.action === "upload_file") {
+            this.onUploadClick();
+        }
+    };
+
     onUploadClick(ev) {
         if (MatrixClientPeg.get().isGuest()) {
             dis.dispatch({action: 'require_registration'});
@@ -128,7 +139,7 @@ class UploadButton extends React.Component {
         if (ev.target.files.length === 0) return;
 
         // take a copy so we can safely reset the value of the form control
-        // (Note it is a FileList: we can't use slice or sesnible iteration).
+        // (Note it is a FileList: we can't use slice or sensible iteration).
         const tfiles = [];
         for (let i = 0; i < ev.target.files.length; ++i) {
             tfiles.push(ev.target.files[i]);

From 0e05e6db86467c730b853c8f8d7009f2a28d8e85 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 May 2020 10:40:23 +0100
Subject: [PATCH 2931/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b2fe409aa5..d469103897 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2284,13 +2284,16 @@
     "Cancel replying to a message": "Cancel replying to a message",
     "Toggle microphone mute": "Toggle microphone mute",
     "Toggle video on/off": "Toggle video on/off",
+    "Scroll up/down in the timeline": "Scroll up/down in the timeline",
+    "Dismiss read marker and jump to bottom": "Dismiss read marker and jump to bottom",
+    "Jump to oldest unread message": "Jump to oldest unread message",
+    "Upload a file": "Upload a file",
     "Jump to room search": "Jump to room search",
     "Navigate up/down in the room list": "Navigate up/down in the room list",
     "Select room from the room list": "Select room from the room list",
     "Collapse room list section": "Collapse room list section",
     "Expand room list section": "Expand room list section",
     "Clear room list filter field": "Clear room list filter field",
-    "Scroll up/down in the timeline": "Scroll up/down in the timeline",
     "Previous/next unread room or DM": "Previous/next unread room or DM",
     "Previous/next room or DM": "Previous/next room or DM",
     "Toggle the top left menu": "Toggle the top left menu",

From d68b50feb6adbd751cb92bbb8705e76ab5e70b59 Mon Sep 17 00:00:00 2001
From: chagai95 <31655082+chagai95@users.noreply.github.com>
Date: Wed, 13 May 2020 11:49:26 +0200
Subject: [PATCH 2932/3235] Updated link and added:Yarn two is not yet used.

the link was broken and there was no mention of the version of yarn being used.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 69aafeb724..ad886a9cb0 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ Development
 Ensure you have the latest LTS version of Node.js installed.
 
 Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
-guide](https://yarnpkg.com/docs/install/) if you do not have it already.
+guide](https://classic.yarnpkg.com/en/docs/install) to "Yarn 1" if you do not have it already. This project has not yet been migrated to Yarn 2, so please ensure yarn --version shows a version from the 1.x series.
 
 `matrix-react-sdk` depends on `matrix-js-sdk`. To make use of changes in the
 latter and to ensure tests run against the develop branch of `matrix-js-sdk`,

From cda691e3596cbab3967967a06ab36877106791e0 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 13 May 2020 11:29:11 +0100
Subject: [PATCH 2933/3235] Tweak Yarn docs link post-review

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ad886a9cb0..5f5da9a40d 100644
--- a/README.md
+++ b/README.md
@@ -133,8 +133,10 @@ Development
 
 Ensure you have the latest LTS version of Node.js installed.
 
-Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
-guide](https://classic.yarnpkg.com/en/docs/install) to "Yarn 1" if you do not have it already. This project has not yet been migrated to Yarn 2, so please ensure yarn --version shows a version from the 1.x series.
+Using `yarn` instead of `npm` is recommended. Please see the Yarn 1 [install
+guide](https://classic.yarnpkg.com/docs/install) if you do not have it
+already. This project has not yet been migrated to Yarn 2, so please ensure
+`yarn --version` shows a version from the 1.x series.
 
 `matrix-react-sdk` depends on `matrix-js-sdk`. To make use of changes in the
 latter and to ensure tests run against the develop branch of `matrix-js-sdk`,

From 51f59c6c327873bd796eab6bdd91f20c854a66a1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 13 May 2020 11:40:56 +0100
Subject: [PATCH 2934/3235] UserView, show Welcome page in the mid panel
 instead of empty space

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserView.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index 493cc136d1..694592af88 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -22,6 +22,7 @@ import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
+import HomePage from "./HomePage";
 
 export default class UserView extends React.Component {
     static get propTypes() {
@@ -79,7 +80,7 @@ export default class UserView extends React.Component {
             const RightPanel = sdk.getComponent('structures.RightPanel');
             const MainSplit = sdk.getComponent('structures.MainSplit');
             const panel = <RightPanel user={this.state.member} />;
-            return (<MainSplit panel={panel}><div style={{flex: "1"}} /></MainSplit>);
+            return (<MainSplit panel={panel}><HomePage /></MainSplit>);
         } else {
             return (<div />);
         }

From 92824411e82015d1d2e81ccba3af70002cc48522 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 May 2020 12:33:10 +0100
Subject: [PATCH 2935/3235] Fix persistent widgets on desktop / http

WidgetMessaging needs the URL of the widget that gets rendered into
the iframe because that's where the postmessages will be coming from.

Fixes https://github.com/vector-im/riot-web/issues/13369
---
 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 6a5dfc97e0..ae5fe9a35c 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -430,7 +430,7 @@ export default class AppTile extends React.Component {
         // is used for is to determine the origin we're talking to, and therefore we don't need the
         // fully templated URL.
         const widgetMessaging = new WidgetMessaging(
-            this.props.app.id, this.props.app.url, this.props.userWidget, this._appFrame.current.contentWindow);
+            this.props.app.id, this._getRenderedUrl(), this.props.userWidget, this._appFrame.current.contentWindow);
         ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
             console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);

From 3f04f5163a963b9193199abb340719061ae0e921 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 14:04:46 +0100
Subject: [PATCH 2936/3235] Implement more nitpicks

- fix avatar inital aligment
- right align names
- set flair height to avatar's
- fix conditions for resizing to be more stable
---
 res/css/views/rooms/_IRCLayout.scss                 | 13 ++++++++++++-
 .../views/elements/IRCTimelineProfileResizer.tsx    |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 159cfc0aad..8d48c72f8a 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -54,6 +54,7 @@ $irc-line-height: $font-18px;
             display: flex;
             align-items: center;
             overflow: visible;
+            justify-content: flex-end;
         }
 
         .mx_EventTile_line, .mx_EventTile_reply {
@@ -79,7 +80,7 @@ $irc-line-height: $font-18px;
                 height: $font-14px !important;
                 width: $font-14px !important;
                 font-size: $font-10px !important;
-                line-height: $font-14px !important;
+                line-height: $font-15px !important;
             }
         }
 
@@ -188,6 +189,10 @@ $irc-line-height: $font-18px;
         }
     }
 
+    .mx_SenderProfile:hover {
+        justify-content: flex-start;
+    }
+
     .mx_SenderProfile_hover:hover {
         overflow: visible;
         width: auto;
@@ -210,4 +215,10 @@ $irc-line-height: $font-18px;
         cursor: col-resize;
         z-index: 100;
     }
+
+    // Need to use important to override the js provided height and width values.
+    .mx_Flair > img {
+        height: $font-14px !important;
+        width: $font-14px !important;
+    }
 }
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
index 80a86b2005..44ceeb9b7b 100644
--- a/src/components/views/elements/IRCTimelineProfileResizer.tsx
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -52,11 +52,11 @@ export default class IRCTimelineProfileResizer extends React.Component<IProps, I
 
         console.log({offset})
         // If we're trying to go smaller than min width, don't.
-        if (this.state.width <= this.props.minWidth && offset <= 0) {
+        if (newWidth < this.props.minWidth) {
             return location;
         }
 
-        if (this.state.width >= this.props.maxWidth && offset >= 0) {
+        if (newWidth > this.props.maxWidth) {
             return location;
         }
 

From 312b616d7701e9b9f8460d210bc22a07c1253be9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 14:11:16 +0100
Subject: [PATCH 2937/3235] fix i18n

---
 src/i18n/strings/en_EN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ca62eb44fa..37b9c1dfc8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -453,6 +453,7 @@
     "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
     "How fast should messages be downloaded.": "How fast should messages be downloaded.",
     "Manually verify all remote sessions": "Manually verify all remote sessions",
+    "IRC display name width": "IRC display name width",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading report": "Uploading report",

From 328bb7bcaf05621443c7a75ab791a9c8eb0ac884 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 15:24:08 +0100
Subject: [PATCH 2938/3235] Remove all animations

---
 res/css/_common.scss                | 1 -
 res/css/views/elements/_Slider.scss | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 687a238c8e..03442ca510 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -19,7 +19,6 @@ limitations under the License.
 @import "./_font-sizes.scss";
 
 :root {
-    transition: font-size 0.25s;
     font-size: 15px;
 }
 
diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 09afb58b12..06c3c4c98b 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -50,7 +50,6 @@ limitations under the License.
 }
 
 .mx_Slider_selectionDot {
-    transition: left 0.25s;
     position: absolute;
     width: 1.1em;
     height: 1.1em;
@@ -61,13 +60,11 @@ limitations under the License.
 }
 
 .mx_Slider_selection > hr {
-    transition: width 0.25s;
     margin: 0;
     border: 0.2em solid $slider-selection-color;
 }
 
 .mx_Slider_dot {
-    transition: background-color 0.2s ease-in;
     height: 1em;
     width: 1em;
     border-radius: 50%;

From fea219915f4a666d73259406323b185a9d5067f6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 15:26:11 +0100
Subject: [PATCH 2939/3235] fix code regeression

---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 0cee29233f..21e406aa23 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -60,9 +60,6 @@ export default class GeneralUserSettingsTab extends React.Component {
             emails: [],
             msisdns: [],
             loading3pids: true, // whether or not the emails and msisdns have been loaded
-            ...this._calculateThemeState(),
-            customThemeUrl: "",
-            customThemeMessage: {isError: false, text: ""},
         };
 
         this.dispatcherRef = dis.register(this._onAction);

From 20ec900405721dce6faf130a20223ff4faa01ff6 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 15:36:53 +0100
Subject: [PATCH 2940/3235] Set font range

---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js   | 6 +-----
 src/settings/Settings.js                                    | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index ac98664be0..1ccc744dc7 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -252,11 +252,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
-                    values={_range(
-                        SettingsStore.getValue("fontSizeMin"),
-                        SettingsStore.getValue("fontSizeMax")+ 2,
-                        2.5,
-                    )}
+                    values={[13, 14, 15, 18, 20]}
                     value={this.state.fontSize}
                     onSelectionChange={this._onFontSizeChanged}
                     displayFunc={value => {}}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 34610c0caf..afe8d2cecc 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -174,12 +174,12 @@ export const SETTINGS = {
     "fontSizeMin": {
         displayName: _td("Min font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 14,
+        default: 13,
     },
     "fontSizeMax": {
         displayName: _td("Max font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 24,
+        default: 20,
     },
     "useCustomFontSize": {
         displayName: _td("Custom font size"),

From 50107ebe47784372b04a995a44064833d5531133 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 May 2020 16:10:40 +0100
Subject: [PATCH 2941/3235] Re-fix OpenID requests from widgets

https://github.com/matrix-org/matrix-react-sdk/pull/4591 reverted
https://github.com/matrix-org/matrix-react-sdk/pull/4459. We need
to pass both URLs as we need both the wURL (for the widget's 'identity'
ie. OpenID) and the URL that's actually in the iframe (for the
messaging).
---
 src/WidgetMessaging.js                   | 21 +++++++++++++++------
 src/components/views/elements/AppTile.js | 12 ++++++------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 5f877bd48a..3b3926b724 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -41,9 +41,18 @@ if (!global.mxToWidgetMessaging) {
 const OUTBOUND_API_NAME = 'toWidget';
 
 export default class WidgetMessaging {
-    constructor(widgetId, widgetUrl, isUserWidget, target) {
+    /**
+     * @param {string} widgetId The widget's ID
+     * @param {string} wurl The raw URL of the widget as in the event (the 'wURL')
+     * @param {string} renderedUrl The url used in the widget's iframe (either similar to the wURL
+     *     or a different URL of the clients choosing if it is using its own impl).
+     * @param {bool} isUserWidget If true, the widget is a user widget, otherwise it's a room widget
+     * @param {object} target Where widget messages should be sent (eg. the iframe object)
+     */
+    constructor(widgetId, wurl, renderedUrl, isUserWidget, target) {
         this.widgetId = widgetId;
-        this.widgetUrl = widgetUrl;
+        this.wurl = wurl;
+        this.renderedUrl = renderedUrl;
         this.isUserWidget = isUserWidget;
         this.target = target;
         this.fromWidget = global.mxFromWidgetMessaging;
@@ -128,19 +137,19 @@ export default class WidgetMessaging {
     }
 
     start() {
-        this.fromWidget.addEndpoint(this.widgetId, this.widgetUrl);
+        this.fromWidget.addEndpoint(this.widgetId, this.renderedUrl);
         this.fromWidget.addListener("get_openid", this._onOpenIdRequest);
     }
 
     stop() {
-        this.fromWidget.removeEndpoint(this.widgetId, this.widgetUrl);
+        this.fromWidget.removeEndpoint(this.widgetId, this.renderedUrl);
         this.fromWidget.removeListener("get_openid", this._onOpenIdRequest);
     }
 
     async _onOpenIdRequest(ev, rawEv) {
         if (ev.widgetId !== this.widgetId) return; // not interesting
 
-        const widgetSecurityKey = WidgetUtils.getWidgetSecurityKey(this.widgetId, this.widgetUrl, this.isUserWidget);
+        const widgetSecurityKey = WidgetUtils.getWidgetSecurityKey(this.widgetId, this.wurl, this.isUserWidget);
 
         const settings = SettingsStore.getValue("widgetOpenIDPermissions");
         if (settings.deny && settings.deny.includes(widgetSecurityKey)) {
@@ -161,7 +170,7 @@ export default class WidgetMessaging {
         // Actually ask for permission to send the user's data
         Modal.createTrackedDialog("OpenID widget permissions", '',
             WidgetOpenIDPermissionsDialog, {
-                widgetUrl: this.widgetUrl,
+                widgetUrl: this.wurl,
                 widgetId: this.widgetId,
                 isUserWidget: this.isUserWidget,
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ae5fe9a35c..80db1718f6 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -424,13 +424,13 @@ export default class AppTile extends React.Component {
     _setupWidgetMessaging() {
         // FIXME: There's probably no reason to do this here: it should probably be done entirely
         // in ActiveWidgetStore.
-
-        // We use the app's URL over the rendered URL so that anything the widget does which could
-        // lead to requesting a "security key" will pass accordingly. The only other thing this URL
-        // is used for is to determine the origin we're talking to, and therefore we don't need the
-        // fully templated URL.
         const widgetMessaging = new WidgetMessaging(
-            this.props.app.id, this._getRenderedUrl(), this.props.userWidget, this._appFrame.current.contentWindow);
+            this.props.app.id,
+            this.props.app.url,
+            this._getRenderedUrl(),
+            this.props.userWidget,
+            this._appFrame.current.contentWindow,
+        );
         ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
             console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);

From 5c2abcf1a4b7bd9cbc35dd6c297073db56eb8a52 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 17:05:37 +0100
Subject: [PATCH 2942/3235] Show username on continuations

---
 res/css/views/rooms/_IRCLayout.scss | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 8d48c72f8a..f2a616f9c9 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -157,16 +157,6 @@ $irc-line-height: $font-18px;
         }
     }
 
-    .mx_EventTile_continuation:not(.mx_EventTile_info) {
-        > .mx_EventTile_avatar {
-            visibility: hidden;
-        }
-
-        > .mx_SenderProfile {
-            visibility: hidden;
-        }
-    }
-
     // Suppress highlight thing from the normal Layout.
     .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
     .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,

From fc6e5227aced6f801bc1f1ffa3c7cfc86d84ef6d Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 22:08:29 +0100
Subject: [PATCH 2943/3235] FIx roomsublist heights.

- also fiddles the font size numbers
---
 res/css/structures/_TagPanel.scss             |  2 +-
 res/css/views/rooms/_RoomTile.scss            |  3 ++-
 src/components/structures/RoomSubList.js      |  4 ++--
 src/components/views/avatars/BaseAvatar.js    | 20 +++++++++----------
 src/components/views/rooms/EventTile.js       |  2 +-
 .../views/rooms/ReadReceiptMarker.js          |  2 +-
 .../tabs/user/AppearanceUserSettingsTab.js    |  2 +-
 src/utils/{rem.js => units.ts}                |  9 ++++++++-
 8 files changed, 26 insertions(+), 18 deletions(-)
 rename src/utils/{rem.js => units.ts} (77%)

diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 536c88be63..1f8443e395 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -69,7 +69,7 @@ limitations under the License.
     height: 100%;
 }
 .mx_TagPanel .mx_TagPanel_tagTileContainer > div {
-    height: $font-40px;
+    height: 40px;
     padding: 10px 0 9px 0;
 }
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 5bc7d5624d..759dce5afa 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    height: $font-34px;
+    height: 32px;
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;
@@ -81,6 +81,7 @@ limitations under the License.
 
 .mx_RoomTile_avatar_container {
     position: relative;
+    display: flex;
 }
 
 .mx_RoomTile_avatar {
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index c8f9ba1713..245b5f9bea 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -32,7 +32,7 @@ import RoomTile from "../views/rooms/RoomTile";
 import LazyRenderList from "../views/elements/LazyRenderList";
 import {_t} from "../../languageHandler";
 import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
-import {toRem} from "../../utils/rem";
+import {toPx} from "../../utils/units";
 
 // turn this on for drop & drag console debugging galore
 const debug = false;
@@ -420,7 +420,7 @@ export default class RoomSubList extends React.PureComponent {
 
     setHeight = (height) => {
         if (this._subList.current) {
-            this._subList.current.style.height = toRem(height);
+            this._subList.current.style.height = toPx(height);
         }
         this._updateLazyRenderHeight(height);
     };
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index a9bee9cda0..704e6438c8 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -24,7 +24,7 @@ import * as AvatarLogic from '../../../Avatar';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {toRem} from "../../../utils/rem";
+import {toPx} from "../../../utils/units";
 
 export default createReactClass({
     displayName: 'BaseAvatar',
@@ -166,9 +166,9 @@ export default createReactClass({
             const textNode = (
                 <span className="mx_BaseAvatar_initial" aria-hidden="true"
                     style={{
-                        fontSize: toRem(width * 0.65),
-                        width: toRem(width),
-                        lineHeight: toRem(height),
+                        fontSize: toPx(width * 0.65),
+                        width: toPx(width),
+                        lineHeight: toPx(height),
                     }}
                 >
                     { initialLetter }
@@ -179,8 +179,8 @@ export default createReactClass({
                     alt="" title={title} onError={this.onError}
                     aria-hidden="true"
                     style={{
-                        width: toRem(width),
-                        height: toRem(height)
+                        width: toPx(width),
+                        height: toPx(height)
                     }} />
             );
             if (onClick != null) {
@@ -210,8 +210,8 @@ export default createReactClass({
                     onClick={onClick}
                     onError={this.onError}
                     style={{
-                        width: toRem(width),
-                        height: toRem(height),
+                        width: toPx(width),
+                        height: toPx(height),
                     }}
                     title={title} alt=""
                     inputRef={inputRef}
@@ -224,8 +224,8 @@ export default createReactClass({
                     src={imageUrl}
                     onError={this.onError}
                     style={{
-                        width: toRem(width),
-                        height: toRem(height),
+                        width: toPx(width),
+                        height: toPx(height),
                     }}
                     title={title} alt=""
                     ref={inputRef}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 0881fb3b67..993639321a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -34,7 +34,7 @@ import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
 import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
-import {toRem} from "../../../utils/rem";
+import {toRem} from "../../../utils/units";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 20d39a7f84..2fe577377d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
-import {toRem} from "../../../utils/rem";
+import {toRem} from "../../../utils/units";
 
 let bounce = false;
 try {
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 1ccc744dc7..63857ed9c2 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -252,7 +252,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
-                    values={[13, 14, 15, 18, 20]}
+                    values={[13, 15, 16, 18, 20]}
                     value={this.state.fontSize}
                     onSelectionChange={this._onFontSizeChanged}
                     displayFunc={value => {}}
diff --git a/src/utils/rem.js b/src/utils/units.ts
similarity index 77%
rename from src/utils/rem.js
rename to src/utils/units.ts
index 8784502961..54dd6b0523 100644
--- a/src/utils/rem.js
+++ b/src/utils/units.ts
@@ -14,7 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+/* Simple utils for formatting style values
+ */
+
 // converts a pixel value to rem.
-export function toRem(pixelValue) {
+export function toRem(pixelValue: number): string {
     return pixelValue / 15 + "rem";
 }
+
+export function toPx(pixelValue: number): string {
+    return pixelValue + "px";
+}

From 226e4b297a7c79923b0466b2a82ff2c91d87d5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Wed, 13 May 2020 18:22:38 +0000
Subject: [PATCH 2944/3235] Translated using Weblate (Czech)

Currently translated at 95.4% (2201 of 2307 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 3b018204c0..181a692b73 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2289,5 +2289,9 @@
     "Are you sure you want to deactivate your account? This is irreversible.": "Opravdu chcete deaktivovat účet? Je to nevratné.",
     "Confirm account deactivation": "Potvrďte deaktivaci účtu",
     "There was a problem communicating with the server. Please try again.": "Došlo k potížím při komunikaci se serverem. Zkuste to prosím znovu.",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Začněte s někým konverzovat za pomocí jména, přihlašovacího jména (jako <userId/>) nebo emailu."
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Začněte s někým konverzovat za pomocí jména, přihlašovacího jména (jako <userId/>) nebo emailu.",
+    "Opens chat with the given user": "Otevře konverzaci s tímto uživatelem",
+    "Sends a message to the given user": "Pošle zprávu danému uživateli",
+    "Waiting for your other session to verify…": "Čekáme na ověření od vaší druhé relace…",
+    "Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné"
 }

From 03e090f4e6f65f71698d7ef118b491bd7ed580d0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 13 May 2020 22:55:14 +0100
Subject: [PATCH 2945/3235] fix chevron

---
 res/css/structures/_TopLeftMenuButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_TopLeftMenuButton.scss b/res/css/structures/_TopLeftMenuButton.scss
index 53d44e7c24..8d2e36bcd6 100644
--- a/res/css/structures/_TopLeftMenuButton.scss
+++ b/res/css/structures/_TopLeftMenuButton.scss
@@ -43,7 +43,7 @@ limitations under the License.
     margin: 0 7px;
     mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
     mask-repeat: no-repeat;
-    width: 10px;
+    width: $font-22px;
     height: 6px;
     background-color: $roomsublist-label-fg-color;
 }

From fa83df4bde7b317737a27a8cb24d2b44aa633750 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 21:07:29 -0600
Subject: [PATCH 2946/3235] Convert dispatcher to TypeScript and replace async
 usage with new class

Due to TypeScript and flux's types being annoying and highly typesafe, we need an AsyncActionPayload which intentionally doesn't use the 'action' property. This looks a bit awkward, though for the rare cases we do actually fire async actions it should be fine enough.

The call signature changes slightly for async events, therefore this commit also updates its usages for async events.

The `fire()` function is to be used in a future commit.
Remove biased comment
---
 package.json                                  |   1 +
 src/actions/RoomListActions.js                | 145 -----------------
 src/actions/RoomListActions.ts                | 151 ++++++++++++++++++
 src/actions/TagOrderActions.js                | 109 -------------
 src/actions/TagOrderActions.ts                | 112 +++++++++++++
 .../{actionCreators.js => actionCreators.ts}  |  14 +-
 src/dispatcher.js                             |  58 -------
 src/dispatcher.ts                             | 121 ++++++++++++++
 tsconfig.json                                 |   3 +-
 yarn.lock                                     |  21 +++
 10 files changed, 417 insertions(+), 318 deletions(-)
 delete mode 100644 src/actions/RoomListActions.js
 create mode 100644 src/actions/RoomListActions.ts
 delete mode 100644 src/actions/TagOrderActions.js
 create mode 100644 src/actions/TagOrderActions.ts
 rename src/actions/{actionCreators.js => actionCreators.ts} (80%)
 delete mode 100644 src/dispatcher.js
 create mode 100644 src/dispatcher.ts

diff --git a/package.json b/package.json
index 92d228a812..2258d5e3b6 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
     "@types/classnames": "^2.2.10",
+    "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
     "@types/react": "16.9",
     "babel-eslint": "^10.0.3",
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
deleted file mode 100644
index 10a3848dda..0000000000
--- a/src/actions/RoomListActions.js
+++ /dev/null
@@ -1,145 +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 { asyncAction } from './actionCreators';
-import RoomListStore, {TAG_DM} from '../stores/RoomListStore';
-import Modal from '../Modal';
-import * as Rooms from '../Rooms';
-import { _t } from '../languageHandler';
-import * as sdk from '../index';
-
-const RoomListActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * tag room.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {Room} room the room to tag.
- * @param {string} oldTag the tag to remove (unless oldTag ==== newTag)
- * @param {string} newTag the tag with which to tag the room.
- * @param {?number} oldIndex the previous position of the room in the
- *                           list of rooms.
- * @param {?number} newIndex the new position of the room in the list
- *                           of rooms.
- * @returns {function} an action thunk.
- * @see asyncAction
- */
-RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex, newIndex) {
-    let metaData = null;
-
-    // Is the tag ordered manually?
-    if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-        const lists = RoomListStore.getRoomLists();
-        const newList = [...lists[newTag]];
-
-        newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
-
-        // If the room was moved "down" (increasing index) in the same list we
-        // need to use the orders of the tiles with indices shifted by +1
-        const offset = (
-            newTag === oldTag && oldIndex < newIndex
-        ) ? 1 : 0;
-
-        const indexBefore = offset + newIndex - 1;
-        const indexAfter = offset + newIndex;
-
-        const prevOrder = indexBefore <= 0 ?
-            0 : newList[indexBefore].tags[newTag].order;
-        const nextOrder = indexAfter >= newList.length ?
-            1 : newList[indexAfter].tags[newTag].order;
-
-        metaData = {
-            order: (prevOrder + nextOrder) / 2.0,
-        };
-    }
-
-    return asyncAction('RoomListActions.tagRoom', () => {
-        const promises = [];
-        const roomId = room.roomId;
-
-        // Evil hack to get DMs behaving
-        if ((oldTag === undefined && newTag === TAG_DM) ||
-            (oldTag === TAG_DM && newTag === undefined)
-        ) {
-            return Rooms.guessAndSetDMRoom(
-                room, newTag === TAG_DM,
-            ).catch((err) => {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to set direct chat tag " + err);
-                Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
-                    title: _t('Failed to set direct chat tag'),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-        }
-
-        const hasChangedSubLists = oldTag !== newTag;
-
-        // More evilness: We will still be dealing with moving to favourites/low prio,
-        // but we avoid ever doing a request with TAG_DM.
-        //
-        // if we moved lists, remove the old tag
-        if (oldTag && oldTag !== TAG_DM &&
-            hasChangedSubLists
-        ) {
-            const promiseToDelete = matrixClient.deleteRoomTag(
-                roomId, oldTag,
-            ).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to remove tag " + oldTag + " from room: " + err);
-                Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
-                    title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-
-            promises.push(promiseToDelete);
-        }
-
-        // if we moved lists or the ordering changed, add the new tag
-        if (newTag && newTag !== TAG_DM &&
-            (hasChangedSubLists || metaData)
-        ) {
-            // metaData is the body of the PUT to set the tag, so it must
-            // at least be an empty object.
-            metaData = metaData || {};
-
-            const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to add tag " + newTag + " to room: " + err);
-                Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
-                    title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-
-                throw err;
-            });
-
-            promises.push(promiseToAdd);
-        }
-
-        return Promise.all(promises);
-    }, () => {
-        // For an optimistic update
-        return {
-            room, oldTag, newTag, metaData,
-        };
-    });
-};
-
-export default RoomListActions;
diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
new file mode 100644
index 0000000000..8ad3ad0781
--- /dev/null
+++ b/src/actions/RoomListActions.ts
@@ -0,0 +1,151 @@
+/*
+Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { asyncAction } from './actionCreators';
+import RoomListStore, { TAG_DM } from '../stores/RoomListStore';
+import Modal from '../Modal';
+import * as Rooms from '../Rooms';
+import { _t } from '../languageHandler';
+import * as sdk from '../index';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { AsyncActionPayload } from "../dispatcher";
+
+export default class RoomListActions {
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * tag room.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     *                                    account data on.
+     * @param {Room} room the room to tag.
+     * @param {string} oldTag the tag to remove (unless oldTag ==== newTag)
+     * @param {string} newTag the tag with which to tag the room.
+     * @param {?number} oldIndex the previous position of the room in the
+     *                           list of rooms.
+     * @param {?number} newIndex the new position of the room in the list
+     *                           of rooms.
+     * @returns {AsyncActionPayload} an async action payload
+     * @see asyncAction
+     */
+    public static tagRoom(
+        matrixClient: MatrixClient, room: Room,
+        oldTag: string, newTag: string,
+        oldIndex: number | null, newIndex: number | null,
+    ): AsyncActionPayload {
+        let metaData = null;
+
+        // Is the tag ordered manually?
+        if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+            const lists = RoomListStore.getRoomLists();
+            const newList = [...lists[newTag]];
+
+            newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
+
+            // If the room was moved "down" (increasing index) in the same list we
+            // need to use the orders of the tiles with indices shifted by +1
+            const offset = (
+                newTag === oldTag && oldIndex < newIndex
+            ) ? 1 : 0;
+
+            const indexBefore = offset + newIndex - 1;
+            const indexAfter = offset + newIndex;
+
+            const prevOrder = indexBefore <= 0 ?
+                0 : newList[indexBefore].tags[newTag].order;
+            const nextOrder = indexAfter >= newList.length ?
+                1 : newList[indexAfter].tags[newTag].order;
+
+            metaData = {
+                order: (prevOrder + nextOrder) / 2.0,
+            };
+        }
+
+        return asyncAction('RoomListActions.tagRoom', () => {
+            const promises = [];
+            const roomId = room.roomId;
+
+            // Evil hack to get DMs behaving
+            if ((oldTag === undefined && newTag === TAG_DM) ||
+                (oldTag === TAG_DM && newTag === undefined)
+            ) {
+                return Rooms.guessAndSetDMRoom(
+                    room, newTag === TAG_DM,
+                ).catch((err) => {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to set direct chat tag " + err);
+                    Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
+                        title: _t('Failed to set direct chat tag'),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+                });
+            }
+
+            const hasChangedSubLists = oldTag !== newTag;
+
+            // More evilness: We will still be dealing with moving to favourites/low prio,
+            // but we avoid ever doing a request with TAG_DM.
+            //
+            // if we moved lists, remove the old tag
+            if (oldTag && oldTag !== TAG_DM &&
+                hasChangedSubLists
+            ) {
+                const promiseToDelete = matrixClient.deleteRoomTag(
+                    roomId, oldTag,
+                ).catch(function (err) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to remove tag " + oldTag + " from room: " + err);
+                    Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
+                        title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+                });
+
+                promises.push(promiseToDelete);
+            }
+
+            // if we moved lists or the ordering changed, add the new tag
+            if (newTag && newTag !== TAG_DM &&
+                (hasChangedSubLists || metaData)
+            ) {
+                // metaData is the body of the PUT to set the tag, so it must
+                // at least be an empty object.
+                metaData = metaData || {};
+
+                const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function (err) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to add tag " + newTag + " to room: " + err);
+                    Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
+                        title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+
+                    throw err;
+                });
+
+                promises.push(promiseToAdd);
+            }
+
+            return Promise.all(promises);
+        }, () => {
+            // For an optimistic update
+            return {
+                room, oldTag, newTag, metaData,
+            };
+        });
+    }
+}
diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
deleted file mode 100644
index a257ff16d8..0000000000
--- a/src/actions/TagOrderActions.js
+++ /dev/null
@@ -1,109 +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.
-*/
-
-import Analytics from '../Analytics';
-import { asyncAction } from './actionCreators';
-import TagOrderStore from '../stores/TagOrderStore';
-
-const TagOrderActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * move a tag in TagOrderStore to destinationIx.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {string} tag the tag to move.
- * @param {number} destinationIx the new position of the tag.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
-    // Only commit tags if the state is ready, i.e. not null
-    let tags = TagOrderStore.getOrderedTags();
-    let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
-    if (!tags) {
-        return;
-    }
-
-    tags = tags.filter((t) => t !== tag);
-    tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
-
-    removedTags = removedTags.filter((t) => t !== tag);
-
-    const storeId = TagOrderStore.getStoreId();
-
-    return asyncAction('TagOrderActions.moveTag', () => {
-        Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
-        return matrixClient.setAccountData(
-            'im.vector.web.tag_ordering',
-            {tags, removedTags, _storeId: storeId},
-        );
-    }, () => {
-        // For an optimistic update
-        return {tags, removedTags};
-    });
-};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * label a tag as removed in im.vector.web.tag_ordering account data.
- *
- * The reason this is implemented with new state `removedTags` is that
- * we incrementally and initially populate `tags` with groups that
- * have been joined. If we remove a group from `tags`, it will just
- * get added (as it looks like a group we've recently joined).
- *
- * NB: If we ever support adding of tags (which is planned), we should
- * take special care to remove the tag from `removedTags` when we add
- * it.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {string} tag the tag to remove.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-TagOrderActions.removeTag = function(matrixClient, tag) {
-    // Don't change tags, just removedTags
-    const tags = TagOrderStore.getOrderedTags();
-    const removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
-
-    if (removedTags.includes(tag)) {
-        // Return a thunk that doesn't do anything, we don't even need
-        // an asynchronous action here, the tag is already removed.
-        return () => {};
-    }
-
-    removedTags.push(tag);
-
-    const storeId = TagOrderStore.getStoreId();
-
-    return asyncAction('TagOrderActions.removeTag', () => {
-        Analytics.trackEvent('TagOrderActions', 'removeTag');
-        return matrixClient.setAccountData(
-            'im.vector.web.tag_ordering',
-            {tags, removedTags, _storeId: storeId},
-        );
-    }, () => {
-        // For an optimistic update
-        return {removedTags};
-    });
-};
-
-export default TagOrderActions;
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
new file mode 100644
index 0000000000..57dd0b8793
--- /dev/null
+++ b/src/actions/TagOrderActions.ts
@@ -0,0 +1,112 @@
+/*
+Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 Analytics from '../Analytics';
+import { asyncAction } from './actionCreators';
+import TagOrderStore from '../stores/TagOrderStore';
+import { AsyncActionPayload } from "../dispatcher";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+export default class TagOrderActions {
+
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * move a tag in TagOrderStore to destinationIx.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     * account data on.
+     * @param {string} tag the tag to move.
+     * @param {number} destinationIx the new position of the tag.
+     * @returns {AsyncActionPayload} an async action payload that will
+     * dispatch actions indicating the status of the request.
+     * @see asyncAction
+     */
+    public static moveTag(matrixClient: MatrixClient, tag: string, destinationIx: number): AsyncActionPayload {
+        // Only commit tags if the state is ready, i.e. not null
+        let tags = TagOrderStore.getOrderedTags();
+        let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
+        if (!tags) {
+            return;
+        }
+
+        tags = tags.filter((t) => t !== tag);
+        tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
+
+        removedTags = removedTags.filter((t) => t !== tag);
+
+        const storeId = TagOrderStore.getStoreId();
+
+        return asyncAction('TagOrderActions.moveTag', () => {
+            Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
+            return matrixClient.setAccountData(
+                'im.vector.web.tag_ordering',
+                {tags, removedTags, _storeId: storeId},
+            );
+        }, () => {
+            // For an optimistic update
+            return {tags, removedTags};
+        });
+    };
+
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * label a tag as removed in im.vector.web.tag_ordering account data.
+     *
+     * The reason this is implemented with new state `removedTags` is that
+     * we incrementally and initially populate `tags` with groups that
+     * have been joined. If we remove a group from `tags`, it will just
+     * get added (as it looks like a group we've recently joined).
+     *
+     * NB: If we ever support adding of tags (which is planned), we should
+     * take special care to remove the tag from `removedTags` when we add
+     * it.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     * account data on.
+     * @param {string} tag the tag to remove.
+     * @returns {function} an async action payload that will dispatch
+     * actions indicating the status of the request.
+     * @see asyncAction
+     */
+    public static removeTag(matrixClient: MatrixClient, tag: string): AsyncActionPayload {
+        // Don't change tags, just removedTags
+        const tags = TagOrderStore.getOrderedTags();
+        const removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
+
+        if (removedTags.includes(tag)) {
+            // Return a thunk that doesn't do anything, we don't even need
+            // an asynchronous action here, the tag is already removed.
+            return () => {
+            };
+        }
+
+        removedTags.push(tag);
+
+        const storeId = TagOrderStore.getStoreId();
+
+        return asyncAction('TagOrderActions.removeTag', () => {
+            Analytics.trackEvent('TagOrderActions', 'removeTag');
+            return matrixClient.setAccountData(
+                'im.vector.web.tag_ordering',
+                {tags, removedTags, _storeId: storeId},
+            );
+        }, () => {
+            // For an optimistic update
+            return {removedTags};
+        });
+    }
+}
diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.ts
similarity index 80%
rename from src/actions/actionCreators.js
rename to src/actions/actionCreators.ts
index 967ce609e7..3a0132a969 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { AsyncActionPayload } from "../dispatcher";
+
 /**
  * Create an action thunk that will dispatch actions indicating the current
  * status of the Promise returned by fn.
@@ -25,9 +28,9 @@ limitations under the License.
  * @param {function?} pendingFn a function that returns an object to assign
  *                              to the `request` key of the ${id}.pending
  *                              payload.
- * @returns {function} an action thunk - a function that uses its single
- *                     argument as a dispatch function to dispatch the
- *                     following actions:
+ * @returns {AsyncActionPayload} an async action payload. Includes a function
+ *                     that uses its single argument as a dispatch function
+ *                     to dispatch the following actions:
  *                         `${id}.pending` and either
  *                         `${id}.success` or
  *                         `${id}.failure`.
@@ -41,8 +44,8 @@ limitations under the License.
  *                     result is the result of the promise returned by
  *                     `fn`.
  */
-export function asyncAction(id, fn, pendingFn) {
-    return (dispatch) => {
+export function asyncAction(id: string, fn: () => Promise<any>, pendingFn: () => any): AsyncActionPayload {
+    const helper = (dispatch) => {
         dispatch({
             action: id + '.pending',
             request:
@@ -54,4 +57,5 @@ export function asyncAction(id, fn, pendingFn) {
             dispatch({action: id + '.failure', err});
         });
     };
+    return new AsyncActionPayload(helper);
 }
diff --git a/src/dispatcher.js b/src/dispatcher.js
deleted file mode 100644
index 5dfaa11345..0000000000
--- a/src/dispatcher.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-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.
-*/
-
-'use strict';
-
-import flux from "flux";
-
-class MatrixDispatcher extends flux.Dispatcher {
-    /**
-     * @param {Object|function} payload Required. The payload to dispatch.
-     *        If an Object, must contain at least an 'action' key.
-     *        If a function, must have the signature (dispatch) => {...}.
-     * @param {boolean=} sync Optional. Pass true to dispatch
-     *        synchronously. This is useful for anything triggering
-     *        an operation that the browser requires user interaction
-     *        for.
-     */
-    dispatch(payload, sync) {
-        // Allow for asynchronous dispatching by accepting payloads that have the
-        // type `function (dispatch) {...}`
-        if (typeof payload === 'function') {
-            payload((action) => {
-                this.dispatch(action, sync);
-            });
-            return;
-        }
-
-        if (sync) {
-            super.dispatch(payload);
-        } else {
-            // Unless the caller explicitly asked for us to dispatch synchronously,
-            // we always set a timeout to do this: The flux dispatcher complains
-            // if you dispatch from within a dispatch, so rather than action
-            // handlers having to worry about not calling anything that might
-            // then dispatch, we just do dispatches asynchronously.
-            setTimeout(super.dispatch.bind(this, payload), 0);
-        }
-    }
-}
-
-if (global.mxDispatcher === undefined) {
-    global.mxDispatcher = new MatrixDispatcher();
-}
-export default global.mxDispatcher;
diff --git a/src/dispatcher.ts b/src/dispatcher.ts
new file mode 100644
index 0000000000..fce99df055
--- /dev/null
+++ b/src/dispatcher.ts
@@ -0,0 +1,121 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Dispatcher } from "flux";
+
+export enum Action {
+    // TODO: Populate with actual actions
+}
+
+// Dispatcher actions also extend into any arbitrary string, so support that.
+export type DispatcherAction = Action | string;
+
+/**
+ * The base dispatch type exposed by our dispatcher.
+ */
+export interface ActionPayload {
+    [property: string]: any; // effectively makes this 'extends Object'
+    action: DispatcherAction;
+}
+
+/**
+ * The function the dispatcher calls when ready for an AsyncActionPayload. The
+ * single argument is used to start a dispatch. First the dispatcher calls the
+ * outer function, then when the called function is ready it calls the cb
+ * function to issue the dispatch. It may call the callback repeatedly if needed.
+ */
+export type AsyncActionFn = (cb: (action: ActionPayload) => void) => void;
+
+/**
+ * An async version of ActionPayload
+ */
+export class AsyncActionPayload implements ActionPayload {
+    /**
+     * The function the dispatcher should call.
+     */
+    public readonly fn: AsyncActionFn;
+
+    /**
+     * @deprecated Not used on AsyncActionPayload.
+     */
+    public get action(): DispatcherAction {
+        return "NOT_USED";
+    }
+
+    /**
+     * Create a new AsyncActionPayload with the given ready function.
+     * @param {AsyncActionFn} readyFn The function to be called when the
+     * dispatcher is ready.
+     */
+    public constructor(readyFn: AsyncActionFn) {
+        this.fn = readyFn;
+    }
+}
+
+/**
+ * A dispatcher for ActionPayloads (the default within the SDK).
+ */
+export class MatrixDispatcher extends Dispatcher<ActionPayload> {
+    /**
+     * Dispatches an event on the dispatcher's event bus.
+     * @param {ActionPayload} payload Required. The payload to dispatch.
+     * @param {boolean=false} sync Optional. Pass true to dispatch
+     *        synchronously. This is useful for anything triggering
+     *        an operation that the browser requires user interaction
+     *        for. Default false (async).
+     */
+    dispatch(payload: ActionPayload, sync = false) {
+        if (payload instanceof AsyncActionPayload) {
+            payload.fn((action: ActionPayload) => {
+                this.dispatch(action, sync);
+            });
+            return;
+        }
+
+        if (sync) {
+            super.dispatch(payload);
+        } else {
+            // Unless the caller explicitly asked for us to dispatch synchronously,
+            // we always set a timeout to do this: The flux dispatcher complains
+            // if you dispatch from within a dispatch, so rather than action
+            // handlers having to worry about not calling anything that might
+            // then dispatch, we just do dispatches asynchronously.
+            setTimeout(super.dispatch.bind(this, payload), 0);
+        }
+    }
+
+    /**
+     * Shorthand for dispatch({action: Action.WHATEVER}, sync). No additional
+     * properties can be included with this version.
+     * @param {Action} action The action to dispatch.
+     * @param {boolean=false} sync Whether the dispatch should be sync or not.
+     * @see dispatch(action: ActionPayload, sync: boolean)
+     */
+    fire(action: Action, sync = false) {
+        this.dispatch({action}, sync);
+    }
+}
+
+export const defaultDispatcher = new MatrixDispatcher();
+
+const anyGlobal = <any>global;
+if (!anyGlobal.mxDispatcher) {
+    anyGlobal.mxDispatcher = defaultDispatcher;
+}
+
+export default defaultDispatcher;
diff --git a/tsconfig.json b/tsconfig.json
index b87f640734..8a01ca335e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "jsx": "react",
     "types": [
       "node",
-      "react"
+      "react",
+      "flux"
     ]
   },
   "include": [
diff --git a/yarn.lock b/yarn.lock
index 520e976b17..99a9d07c7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1218,6 +1218,19 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/fbemitter@*":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
+  integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
+
+"@types/flux@^3.1.9":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.9.tgz#ddfc9641ee2e2e6cb6cd730c6a48ef82e2076711"
+  integrity sha512-bSbDf4tTuN9wn3LTGPnH9wnSSLtR5rV7UPWFpM00NJ1pSTBwCzeZG07XsZ9lBkxwngrqjDtM97PLt5IuIdCQUA==
+  dependencies:
+    "@types/fbemitter" "*"
+    "@types/react" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -1272,6 +1285,14 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
+"@types/react@*":
+  version "16.9.35"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
+  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@types/react@16.9":
   version "16.9.32"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"

From 90a898d03ff5e6da0a436136de167ee1547297c5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 20:41:41 -0600
Subject: [PATCH 2947/3235] Move dispatcher into a subdirectory

We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
---
 src/BasePlatform.js                                             | 2 +-
 src/CallHandler.js                                              | 2 +-
 src/ContentMessages.js                                          | 2 +-
 src/FromWidgetPostMessageApi.js                                 | 2 +-
 src/Lifecycle.js                                                | 2 +-
 src/Modal.js                                                    | 2 +-
 src/Notifier.js                                                 | 2 +-
 src/Presence.js                                                 | 2 +-
 src/Registration.js                                             | 2 +-
 src/Resend.js                                                   | 2 +-
 src/ScalarMessaging.js                                          | 2 +-
 src/SlashCommands.tsx                                           | 2 +-
 src/UserActivity.js                                             | 2 +-
 src/actions/MatrixActionCreators.js                             | 2 +-
 src/actions/RoomListActions.ts                                  | 2 +-
 src/actions/TagOrderActions.ts                                  | 2 +-
 src/actions/actionCreators.ts                                   | 2 +-
 .../views/dialogs/eventindex/DisableEventIndexDialog.js         | 2 +-
 .../views/dialogs/keybackup/NewRecoveryMethodDialog.js          | 2 +-
 .../views/dialogs/keybackup/RecoveryMethodRemovedDialog.js      | 2 +-
 src/components/structures/CustomRoomTagPanel.js                 | 2 +-
 src/components/structures/EmbeddedPage.js                       | 2 +-
 src/components/structures/GroupView.js                          | 2 +-
 src/components/structures/HomePage.tsx                          | 2 +-
 src/components/structures/LeftPanel.js                          | 2 +-
 src/components/structures/LoggedInView.tsx                      | 2 +-
 src/components/structures/MatrixChat.tsx                        | 2 +-
 src/components/structures/MyGroups.js                           | 2 +-
 src/components/structures/RightPanel.js                         | 2 +-
 src/components/structures/RoomDirectory.js                      | 2 +-
 src/components/structures/RoomStatusBar.js                      | 2 +-
 src/components/structures/RoomSubList.js                        | 2 +-
 src/components/structures/RoomView.js                           | 2 +-
 src/components/structures/SearchBox.js                          | 2 +-
 src/components/structures/TagPanel.js                           | 2 +-
 src/components/structures/TagPanelButtons.js                    | 2 +-
 src/components/structures/TimelinePanel.js                      | 2 +-
 src/components/structures/TopLeftMenuButton.js                  | 2 +-
 src/components/structures/UploadBar.js                          | 2 +-
 src/components/structures/auth/Registration.js                  | 2 +-
 src/components/structures/auth/SoftLogout.js                    | 2 +-
 src/components/views/avatars/MemberAvatar.js                    | 2 +-
 src/components/views/context_menus/MessageContextMenu.js        | 2 +-
 src/components/views/context_menus/RoomTileContextMenu.js       | 2 +-
 src/components/views/context_menus/TagTileContextMenu.js        | 2 +-
 src/components/views/context_menus/TopLeftMenu.js               | 2 +-
 src/components/views/dialogs/AddressPickerDialog.js             | 2 +-
 src/components/views/dialogs/CreateGroupDialog.js               | 2 +-
 src/components/views/dialogs/CryptoStoreTooNewDialog.js         | 2 +-
 src/components/views/dialogs/DeviceVerifyDialog.js              | 2 +-
 src/components/views/dialogs/IntegrationsDisabledDialog.js      | 2 +-
 src/components/views/dialogs/InviteDialog.js                    | 2 +-
 src/components/views/dialogs/LogoutDialog.js                    | 2 +-
 src/components/views/dialogs/RoomSettingsDialog.js              | 2 +-
 src/components/views/elements/ActionButton.js                   | 2 +-
 src/components/views/elements/AppTile.js                        | 2 +-
 src/components/views/elements/Flair.js                          | 2 +-
 src/components/views/elements/PersistedElement.js               | 2 +-
 src/components/views/elements/Pill.js                           | 2 +-
 src/components/views/elements/ReplyThread.js                    | 2 +-
 src/components/views/elements/TagTile.js                        | 2 +-
 src/components/views/elements/Tooltip.js                        | 2 +-
 src/components/views/globals/CookieBar.js                       | 2 +-
 src/components/views/groups/GroupInviteTile.js                  | 2 +-
 src/components/views/groups/GroupMemberInfo.js                  | 2 +-
 src/components/views/groups/GroupMemberList.js                  | 2 +-
 src/components/views/groups/GroupMemberTile.js                  | 2 +-
 src/components/views/groups/GroupRoomInfo.js                    | 2 +-
 src/components/views/groups/GroupRoomTile.js                    | 2 +-
 src/components/views/groups/GroupTile.js                        | 2 +-
 src/components/views/messages/MKeyVerificationRequest.js        | 2 +-
 src/components/views/messages/MessageActionBar.js               | 2 +-
 src/components/views/messages/RoomCreate.js                     | 2 +-
 src/components/views/messages/TextualBody.js                    | 2 +-
 src/components/views/right_panel/HeaderButtons.js               | 2 +-
 src/components/views/right_panel/UserInfo.js                    | 2 +-
 src/components/views/room_settings/ColorSettings.js             | 2 +-
 src/components/views/room_settings/UrlPreviewSettings.js        | 2 +-
 src/components/views/rooms/AppsDrawer.js                        | 2 +-
 src/components/views/rooms/AuxPanel.js                          | 2 +-
 src/components/views/rooms/EditMessageComposer.js               | 2 +-
 src/components/views/rooms/EventTile.js                         | 2 +-
 src/components/views/rooms/ForwardMessage.js                    | 2 +-
 src/components/views/rooms/MemberInfo.js                        | 2 +-
 src/components/views/rooms/MemberList.js                        | 2 +-
 src/components/views/rooms/MemberTile.js                        | 2 +-
 src/components/views/rooms/MessageComposer.js                   | 2 +-
 src/components/views/rooms/PinnedEventTile.js                   | 2 +-
 src/components/views/rooms/ReplyPreview.js                      | 2 +-
 src/components/views/rooms/RoomBreadcrumbs.js                   | 2 +-
 src/components/views/rooms/RoomDetailList.js                    | 2 +-
 src/components/views/rooms/RoomList.js                          | 2 +-
 src/components/views/rooms/RoomPreviewBar.js                    | 2 +-
 src/components/views/rooms/RoomTile.js                          | 2 +-
 src/components/views/rooms/SendMessageComposer.js               | 2 +-
 src/components/views/rooms/Stickerpicker.js                     | 2 +-
 src/components/views/rooms/ThirdPartyMemberInfo.js              | 2 +-
 src/components/views/settings/ChangePassword.js                 | 2 +-
 src/components/views/settings/EnableNotificationsButton.js      | 2 +-
 src/components/views/settings/IntegrationManager.js             | 2 +-
 src/components/views/settings/SetIdServer.js                    | 2 +-
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js         | 2 +-
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js          | 2 +-
 .../views/settings/tabs/user/GeneralUserSettingsTab.js          | 2 +-
 .../views/settings/tabs/user/SecurityUserSettingsTab.js         | 2 +-
 src/components/views/toasts/BulkUnverifiedSessionsToast.js      | 2 +-
 src/components/views/toasts/VerificationRequestToast.js         | 2 +-
 src/components/views/voip/CallPreview.js                        | 2 +-
 src/components/views/voip/CallView.js                           | 2 +-
 src/components/views/voip/IncomingCallBox.js                    | 2 +-
 src/components/views/voip/VideoView.js                          | 2 +-
 src/createRoom.js                                               | 2 +-
 src/cryptodevices.js                                            | 2 +-
 src/{ => dispatcher}/dispatcher.ts                              | 0
 src/mjolnir/Mjolnir.js                                          | 2 +-
 src/settings/SettingsStore.js                                   | 2 +-
 src/settings/controllers/CustomStatusController.js              | 2 +-
 src/stores/CustomRoomTagStore.js                                | 2 +-
 src/stores/GroupStore.js                                        | 2 +-
 src/stores/LifecycleStore.js                                    | 2 +-
 src/stores/RightPanelStore.js                                   | 2 +-
 src/stores/RoomListStore.js                                     | 2 +-
 src/stores/RoomViewStore.js                                     | 2 +-
 src/stores/SessionStore.js                                      | 2 +-
 src/stores/TagOrderStore.js                                     | 2 +-
 src/theme.js                                                    | 2 +-
 src/utils/WidgetUtils.js                                        | 2 +-
 src/verification.js                                             | 2 +-
 test/components/views/rooms/RoomList-test.js                    | 2 +-
 test/test-utils.js                                              | 2 +-
 130 files changed, 129 insertions(+), 129 deletions(-)
 rename src/{ => dispatcher}/dispatcher.ts (100%)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 7214031586..46bd9150df 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -20,7 +20,7 @@ limitations under the License.
 */
 
 import {MatrixClient} from "matrix-js-sdk";
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
 
 /**
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 2bfe10850a..c95ed16eb3 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -59,7 +59,7 @@ import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import { showUnknownDeviceDialogForCalls } from './cryptodevices';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 34379c029b..4f5a1a1220 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 import extend from './extend';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import * as sdk from './index';
 import { _t } from './languageHandler';
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index c9793d40f7..102afa6bf1 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import URL from 'url';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
 import {MatrixClientPeg} from "./MatrixClientPeg";
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 1baa6c8e0c..22c5d48317 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -26,7 +26,7 @@ import Analytics from './Analytics';
 import Notifier from './Notifier';
 import UserActivity from './UserActivity';
 import Presence from './Presence';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import Modal from './Modal';
 import * as sdk from './index';
diff --git a/src/Modal.js b/src/Modal.js
index de441740f1..9b9f190d58 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Analytics from './Analytics';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import {defer} from './utils/promise';
 import AsyncWrapper from './AsyncWrapper';
 
diff --git a/src/Notifier.js b/src/Notifier.js
index ec92840998..2ffa92452b 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -21,7 +21,7 @@ import PlatformPeg from './PlatformPeg';
 import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
 import * as Avatar from './Avatar';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
diff --git a/src/Presence.js b/src/Presence.js
index 2fc13a090b..42bca35f96 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from "./MatrixClientPeg";
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import Timer from './utils/Timer';
 
  // Time in ms after that a user is considered as unavailable/away
diff --git a/src/Registration.js b/src/Registration.js
index ca162bac03..32c3d9cc35 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -20,7 +20,7 @@ limitations under the License.
  * registration code.
  */
 
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
diff --git a/src/Resend.js b/src/Resend.js
index 6d6c18cf27..f5f24bffa5 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import { EventStatus } from 'matrix-js-sdk';
 
 export default class Resend {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9731e42825..315c2d86f4 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -238,7 +238,7 @@ Example:
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index fbb9e2eb0e..fd157b2b4c 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -21,7 +21,7 @@ limitations under the License.
 import * as React from 'react';
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import {_t, _td} from './languageHandler';
 import Modal from './Modal';
diff --git a/src/UserActivity.js b/src/UserActivity.js
index 0d1b4d0cc0..0174aebaf5 100644
--- a/src/UserActivity.js
+++ b/src/UserActivity.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import Timer from './utils/Timer';
 
 // important these are larger than the timeouts of timers
diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index c89ec44435..93a4fcf07c 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 
 // TODO: migrate from sync_state to MatrixActions.sync so that more js-sdk events
 //       become dispatches in the same place.
diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
index 8ad3ad0781..0cdd3a86d8 100644
--- a/src/actions/RoomListActions.ts
+++ b/src/actions/RoomListActions.ts
@@ -23,7 +23,7 @@ import { _t } from '../languageHandler';
 import * as sdk from '../index';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { AsyncActionPayload } from "../dispatcher";
+import { AsyncActionPayload } from "../dispatcher/dispatcher";
 
 export default class RoomListActions {
     /**
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
index 57dd0b8793..fa86e3a6b1 100644
--- a/src/actions/TagOrderActions.ts
+++ b/src/actions/TagOrderActions.ts
@@ -18,7 +18,7 @@ limitations under the License.
 import Analytics from '../Analytics';
 import { asyncAction } from './actionCreators';
 import TagOrderStore from '../stores/TagOrderStore';
-import { AsyncActionPayload } from "../dispatcher";
+import { AsyncActionPayload } from "../dispatcher/dispatcher";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 
 export default class TagOrderActions {
diff --git a/src/actions/actionCreators.ts b/src/actions/actionCreators.ts
index 3a0132a969..78525a9509 100644
--- a/src/actions/actionCreators.ts
+++ b/src/actions/actionCreators.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { AsyncActionPayload } from "../dispatcher";
+import { AsyncActionPayload } from "../dispatcher/dispatcher";
 
 /**
  * Create an action thunk that will dispatch actions indicating the current
diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 120b086ef6..8af0bf278e 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 9e2264a960..f00f2d9c3c 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -19,7 +19,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
 
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index c5222dafd5..722334cd70 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
 
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index 6e392ea505..2753d5c4da 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -18,7 +18,7 @@ import React from 'react';
 import CustomRoomTagStore from '../../stores/CustomRoomTagStore';
 import AutoHideScrollbar from './AutoHideScrollbar';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index 0aababf030..49ba3d1227 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';
 import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 3b32e5c907..1311d6e4f6 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { getHostingLink } from '../../utils/HostingLink';
 import { sanitizedHtmlNode } from '../../HtmlUtils';
 import { _t, _td } from '../../languageHandler';
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index ddf9cd6d00..ff8d35a114 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -21,7 +21,7 @@ import { getHomePageUrl } from "../../utils/pages";
 import { _t } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 
 const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
 const onClickExplore = () => dis.dispatch({action: 'view_room_directory'});
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a9cd12199b..adba858fa3 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Key } from '../../Keyboard';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import * as VectorConferenceHandler from '../../VectorConferenceHandler';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 9de2aac8e9..e2aa523b8c 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -27,7 +27,7 @@ import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import sessionStore from '../../stores/SessionStore';
 import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e553057acb..973d301420 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -34,7 +34,7 @@ import {MatrixClientPeg} from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
 import * as RoomListSorter from "../../RoomListSorter";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import Notifier from '../../Notifier';
 
 import Modal from "../../Modal";
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index f179cab6ad..e2a3d6e71f 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../index';
 import { _t } from '../../languageHandler';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 34652098b3..c6c330a202 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -22,7 +22,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 86353cd532..eb784a1083 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import Modal from "../../Modal";
 import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import PropTypes from 'prop-types';
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 639f38a119..ae628fd06a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -25,7 +25,7 @@ import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import * as cryptodevices from '../../cryptodevices';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
 
 const STATUS_BAR_HIDDEN = 0;
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 4e8e51c3cc..d1abacd2d8 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -20,7 +20,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import classNames from 'classnames';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import * as Unread from '../../Unread';
 import * as RoomNotifs from '../../RoomNotifs';
 import * as FormattingUtils from '../../utils/FormattingUtils';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f53929df4a..fc98758bda 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -34,7 +34,7 @@ import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
 import * as sdk from '../../index';
 import CallHandler from '../../CallHandler';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import Tinter from '../../Tinter';
 import rate_limited_func from '../../ratelimitedfunc';
 import * as ObjectUtils from '../../ObjectUtils';
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 0f3f8a6be9..7e9d290bce 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { Key } from '../../Keyboard';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { throttle } from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import classNames from 'classnames';
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6642cce098..713ed004b0 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -22,7 +22,7 @@ import TagOrderStore from '../../stores/TagOrderStore';
 import GroupActions from '../../actions/GroupActions';
 
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { _t } from '../../languageHandler';
 
 import { Droppable } from 'react-beautiful-dnd';
diff --git a/src/components/structures/TagPanelButtons.js b/src/components/structures/TagPanelButtons.js
index 93a596baa3..4b00da3cbf 100644
--- a/src/components/structures/TagPanelButtons.js
+++ b/src/components/structures/TagPanelButtons.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 6a08cd78eb..da1369c45f 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -29,7 +29,7 @@ import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as ObjectUtils from "../../ObjectUtils";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import * as sdk from "../../index";
 import { Key } from '../../Keyboard';
 import Timer from '../../utils/Timer';
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index ebd7aaae89..234dc661f9 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -22,7 +22,7 @@ import BaseAvatar from '../views/avatars/BaseAvatar';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as Avatar from '../../Avatar';
 import { _t } from '../../languageHandler';
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import {ContextMenu, ContextMenuButton} from "./ContextMenu";
 
 const AVATAR_SIZE = 28;
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index 1aec63f04e..421d1d79a7 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import ContentMessages from '../../ContentMessages';
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import filesize from "filesize";
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 7818496e71..a30a13aceb 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -32,7 +32,7 @@ import * as Lifecycle from '../../../Lifecycle';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
 import Login from "../../../Login";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 
 // Phases
 // Show controls to configure server details
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 08ab7e8a61..7c25767291 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as Lifecycle from '../../../Lifecycle';
 import Modal from '../../../Modal';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 826aa5fddf..89314cfef7 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as Avatar from '../../../Avatar';
 import * as sdk from "../../../index";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 
 export default createReactClass({
     displayName: 'MemberAvatar',
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 70ab80e6cc..2c835e6967 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 import {EventStatus} from 'matrix-js-sdk';
 
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index d281656bbe..b08cf3be60 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -24,7 +24,7 @@ import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import * as Rooms from '../../../Rooms';
 import * as RoomNotifs from '../../../RoomNotifs';
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 7313a278cc..ff1a7f1b14 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
 import * as sdk from '../../../index';
 import {MenuItem} from "../../structures/ContextMenu";
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 4448ecd041..3ec857be2f 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import LogoutDialog from "../dialogs/LogoutDialog";
 import Modal from "../../../Modal";
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 451ec9cfde..41a819c005 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -24,7 +24,7 @@ import createReactClass from 'create-react-class';
 import { _t, _td } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
 import GroupStore from '../../../stores/GroupStore';
 import * as Email from '../../../email';
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index d465ef26a2..10285ccee0 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
index 11e202b0cc..081e84696c 100644
--- a/src/components/views/dialogs/CryptoStoreTooNewDialog.js
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index a3f9430476..51f905d542 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -25,7 +25,7 @@ import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {ensureDMExists} from "../../../createRoom";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from '../../../settings/SettingsStore';
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
index 1ca638f0ab..2677963281 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 
 export default class IntegrationsDisabledDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 7cbbf8ba64..e62c417a70 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -27,7 +27,7 @@ import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import * as Email from "../../../email";
 import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
 import {abbreviateUrl} from "../../../utils/UrlUtils";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 23a6692b39..930acaa0b8 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index c5f807b23c..c2b98cd9f3 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -27,7 +27,7 @@ import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsT
 import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 
 export default class RoomSettingsDialog extends React.Component {
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index d2277bd69a..7536d66653 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import AccessibleButton from './AccessibleButton';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 80db1718f6..527436b0e4 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -31,7 +31,7 @@ import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index bc657e9e91..0f06904b68 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -19,7 +19,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import FlairStore from '../../../stores/FlairStore';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 53f2501f19..7f9bfdebf4 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import ResizeObserver from 'resize-observer-polyfill';
 
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 1df12738c5..3e4ddb99e8 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index eae2d13f8a..8d3a7307b9 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -19,7 +19,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {wantsDateSeparator} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
 import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index d8983ac2ea..1af681dadc 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 
diff --git a/src/components/views/elements/Tooltip.js b/src/components/views/elements/Tooltip.js
index fd845d9db3..4807ade3db 100644
--- a/src/components/views/elements/Tooltip.js
+++ b/src/components/views/elements/Tooltip.js
@@ -22,7 +22,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 
 const MIN_TOOLTIP_HEIGHT = 25;
diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
index 8774e4f1fa..bf264686d0 100644
--- a/src/components/views/globals/CookieBar.js
+++ b/src/components/views/globals/CookieBar.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 91c930525d..bc5334f2de 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 9f5660386b..0d08771676 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index ca374d1309..b42e325a89 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
 import { showGroupInviteDialog } from '../../../GroupAddressPicker';
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index f99d5c768c..05e3f6ac2a 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 3a20de7eca..8c9b39675e 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 94d143b263..fd6969a49a 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index b845a83c2a..44ce69ee39 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index f49ae1b6b1..a5b1ae26bb 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 
 export default class MKeyVerificationRequest extends React.Component {
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 0cde90e417..48b9c58cb8 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index b5749ced97..95bc460636 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 882e331675..c762b95f83 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -25,7 +25,7 @@ import * as HtmlUtils from '../../../HtmlUtils';
 import {formatDate} from '../../../DateUtils';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import * as ContextMenu from '../../structures/ContextMenu';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index 03b03218ee..1c66fe5828 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -19,7 +19,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import RightPanelStore from "../../../stores/RightPanelStore";
 
 export const HEADER_KIND_ROOM = "room";
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 478dc90418..daf1a9490d 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -21,7 +21,7 @@ import React, {useCallback, useMemo, useState, useEffect, useContext} from 'reac
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index 1e06da0cd8..1d26e956ab 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
 import Tinter from '../../../Tinter';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 
 const ROOM_COLORS = [
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 5de355ebd7..16dffd857b 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index b64eb33435..06dfffad30 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import AppTile from '../elements/AppTile';
 import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import * as ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index e102b0dba4..d6a3b156d5 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 8353940c90..88ed76f118 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -18,7 +18,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
 import {getCaretOffsetAndText} from '../../../editor/dom';
 import {htmlSerializeIfNeeded, textSerialize, containsEmote, stripEmoteCommand} from '../../../editor/serialize';
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 33ee8a0f63..91fcacf0e5 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -25,7 +25,7 @@ import classNames from "classnames";
 import { _t, _td } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
 import * as sdk from "../../../index";
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index a3c00598a7..03ca32c5e6 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {Key} from '../../../Keyboard';
 
 
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 6b03000961..5d8e03a050 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -31,7 +31,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 3779d461bb..e2d7e3f8e0 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {isValid3pidInvite} from "../../../RoomInvite";
 import rate_limited_func from "../../../ratelimitedfunc";
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 1c609afcaa..6842e27ed3 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4749742a7d..c05fe3d3a2 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -20,7 +20,7 @@ import { _t } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import Stickerpicker from './Stickerpicker';
 import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 28fc8fc338..924385d226 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -18,7 +18,7 @@ import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import AccessibleButton from "../elements/AccessibleButton";
 import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index b28494c65a..e7cd2b4c0d 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 86c0d7ca96..fe443d720f 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, {createRef} from "react";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index db7b86da4f..5b45cfc29a 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import PropTypes from 'prop-types';
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 289a89a206..1c59a5d8d0 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -35,7 +35,7 @@ import GroupStore from '../../../stores/GroupStore';
 import RoomSubList from '../../structures/RoomSubList';
 import ResizeHandle from '../elements/ResizeHandle';
 import CallHandler from "../../../CallHandler";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
 import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index fe7c57d811..30e6ae9c58 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import IdentityAuthClient from '../../../IdentityAuthClient';
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 6a23fe309b..44e5ae7643 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -21,7 +21,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import * as sdk from '../../../index';
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 233bb110be..5ea979a8ef 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
 import {
     htmlSerializeIfNeeded,
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 9d91ab04b3..fc6e80fc61 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -18,7 +18,7 @@ import {_t, _td} from '../../../languageHandler';
 import AppTile from '../elements/AppTile';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 3e6ed16aa4..3a7042ebd2 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {MatrixEvent} from "matrix-js-sdk";
 import {_t} from "../../../languageHandler";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 7c88573e9c..c7eccf2145 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 import * as sdk from "../../../index";
diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
index 9ca591f30e..e4b348dfbd 100644
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 import Notifier from "../../../Notifier";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 
 export default createReactClass({
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index a5150e3777..fd6a62d73a 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {Key} from "../../../Keyboard";
 
 export default class IntegrationManager extends React.Component {
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index cb37271452..23e72e2352 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -21,7 +21,7 @@ import {_t} from "../../../languageHandler";
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { getThreepidsWithBindStatus } from '../../../boundThreepids';
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import {abbreviateUrl, unabbreviateUrl} from "../../../utils/UrlUtils";
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 9ee9c8d130..f57d5d3798 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -21,7 +21,7 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 
 export default class AdvancedRoomSettingsTab extends React.Component {
     static propTypes = {
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 99882ae400..1f12396413 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -20,7 +20,7 @@ import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 export default class GeneralRoomSettingsTab extends React.Component {
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 867982ad2b..216bffc3ed 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -32,7 +32,7 @@ import PlatformPeg from "../../../../../PlatformPeg";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import Modal from "../../../../../Modal";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 import {Service, startTermsFlow} from "../../../../../Terms";
 import {SERVICE_TYPES} from "matrix-js-sdk";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 5dd6475e6e..bed057f03d 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -25,7 +25,7 @@ import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
index 0c40e56858..99ff529c35 100644
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import DeviceListener from '../../../DeviceListener';
 import FormButton from '../elements/FormButton';
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.js
index 6447e87627..421dd7bea1 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.js
@@ -21,7 +21,7 @@ import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
 
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 049dd8a3c6..c465170950 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import CallHandler from '../../../CallHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 
 export default createReactClass({
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 4a5f3923e2..a0a566dfac 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import CallHandler from '../../../CallHandler';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 53e829b784..bf28fa0157 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 51be6db81d..a51ab70da9 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -22,7 +22,7 @@ import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 
 import SettingsStore from "../../../settings/SettingsStore";
 
diff --git a/src/createRoom.js b/src/createRoom.js
index a39d2c2216..18fc787e1c 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -19,7 +19,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
 import {getAddressType} from "./UserAddress";
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index f56a80e1e4..86b97364f9 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import Resend from './Resend';
 import * as sdk from './index';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 
diff --git a/src/dispatcher.ts b/src/dispatcher/dispatcher.ts
similarity index 100%
rename from src/dispatcher.ts
rename to src/dispatcher/dispatcher.ts
diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 5836ffd57a..9876cb1f7f 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -18,7 +18,7 @@ import {MatrixClientPeg} from "../MatrixClientPeg";
 import {ALL_RULE_TYPES, BanList} from "./BanList";
 import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
 import {_t} from "../languageHandler";
-import dis from "../dispatcher";
+import dis from "../dispatcher/dispatcher";
 
 // TODO: Move this and related files to the js-sdk or something once finalized.
 
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 0122916bc3..36111dd46f 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -24,7 +24,7 @@ import RoomSettingsHandler from "./handlers/RoomSettingsHandler";
 import ConfigSettingsHandler from "./handlers/ConfigSettingsHandler";
 import {_t} from '../languageHandler';
 import SdkConfig from "../SdkConfig";
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {SETTINGS} from "./Settings";
 import LocalEchoWrapper from "./handlers/LocalEchoWrapper";
 import {WatchManager} from "./WatchManager";
diff --git a/src/settings/controllers/CustomStatusController.js b/src/settings/controllers/CustomStatusController.js
index 0fc6619d92..031387bb6a 100644
--- a/src/settings/controllers/CustomStatusController.js
+++ b/src/settings/controllers/CustomStatusController.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 
 export default class CustomStatusController extends SettingController {
     onChange(level, roomId, newValue) {
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
index 909282c085..c67868e2c6 100644
--- a/src/stores/CustomRoomTagStore.js
+++ b/src/stores/CustomRoomTagStore.js
@@ -13,7 +13,7 @@ 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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import * as RoomNotifs from '../RoomNotifs';
 import RoomListStore from './RoomListStore';
 import EventEmitter from 'events';
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 78a144f755..d4097184a1 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -18,7 +18,7 @@ import EventEmitter from 'events';
 import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
 import {MatrixClientPeg} from '../MatrixClientPeg';
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 
 function parseMembersResponse(response) {
     return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 904f29f7b3..a12bac7dd6 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -15,7 +15,7 @@ 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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {Store} from 'flux/utils';
 
 const INITIAL_STATE = {
diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.js
index 3a5605ba3f..a73f3befbb 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {pendingVerificationRequestForUser} from '../verification';
 import {Store} from 'flux/utils';
 import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 89edc9a8ef..d7b6759195 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import {Store} from 'flux/utils';
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import DMRoomMap from '../utils/DMRoomMap';
 import * as Unread from '../Unread';
 import SettingsStore from "../settings/SettingsStore";
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 841734dfb7..3d82d086d7 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -15,7 +15,7 @@ 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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {Store} from 'flux/utils';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import * as sdk from '../index';
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index f38bc046d0..096811940c 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -14,7 +14,7 @@ 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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {Store} from 'flux/utils';
 
 const INITIAL_STATE = {
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index c05728e497..2acf531d86 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import {Store} from 'flux/utils';
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import GroupStore from './GroupStore';
 import Analytics from '../Analytics';
 import * as RoomNotifs from "../RoomNotifs";
diff --git a/src/theme.js b/src/theme.js
index 2ccce81a8d..1da39d50fa 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -19,7 +19,7 @@ import {_t} from "./languageHandler";
 
 export const DEFAULT_THEME = "light";
 import Tinter from "./Tinter";
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 import ThemeController from "./settings/controllers/ThemeController";
 
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index ad4c02887e..35e23f0429 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 
diff --git a/src/verification.js b/src/verification.js
index f488b2ebeb..289ac9544b 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 8dc4647920..235ed61016 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -9,7 +9,7 @@ import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 import sdk from '../../../skinned-sdk';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import dis from '../../../../src/dispatcher';
+import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
 import GroupStore from '../../../../src/stores/GroupStore.js';
 
diff --git a/test/test-utils.js b/test/test-utils.js
index d7aa9d5de9..2d7c1bd62c 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
-import dis from '../src/dispatcher';
+import dis from '../src/dispatcher/dispatcher';
 import {makeType} from "../src/utils/TypeUtils";
 import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';

From 8c72c27da9afe371e15f2f010d61fe4608c788c1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 20:46:00 -0600
Subject: [PATCH 2948/3235] Break out actions and payloads to their own files

The definitions take up a lot of space which makes it hard to see the dispatcher class, so break them out.
---
 src/actions/RoomListActions.ts |  2 +-
 src/actions/TagOrderActions.ts |  2 +-
 src/actions/actionCreators.ts  |  2 +-
 src/dispatcher/actions.ts      | 23 +++++++++++++
 src/dispatcher/dispatcher.ts   | 51 ++---------------------------
 src/dispatcher/payloads.ts     | 59 ++++++++++++++++++++++++++++++++++
 6 files changed, 87 insertions(+), 52 deletions(-)
 create mode 100644 src/dispatcher/actions.ts
 create mode 100644 src/dispatcher/payloads.ts

diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
index 0cdd3a86d8..eb9831ec47 100644
--- a/src/actions/RoomListActions.ts
+++ b/src/actions/RoomListActions.ts
@@ -23,7 +23,7 @@ import { _t } from '../languageHandler';
 import * as sdk from '../index';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { AsyncActionPayload } from "../dispatcher/dispatcher";
+import { AsyncActionPayload } from "../dispatcher/payloads";
 
 export default class RoomListActions {
     /**
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
index fa86e3a6b1..fa95ea1037 100644
--- a/src/actions/TagOrderActions.ts
+++ b/src/actions/TagOrderActions.ts
@@ -18,7 +18,7 @@ limitations under the License.
 import Analytics from '../Analytics';
 import { asyncAction } from './actionCreators';
 import TagOrderStore from '../stores/TagOrderStore';
-import { AsyncActionPayload } from "../dispatcher/dispatcher";
+import { AsyncActionPayload } from "../dispatcher/payloads";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 
 export default class TagOrderActions {
diff --git a/src/actions/actionCreators.ts b/src/actions/actionCreators.ts
index 78525a9509..d84868a141 100644
--- a/src/actions/actionCreators.ts
+++ b/src/actions/actionCreators.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { AsyncActionPayload } from "../dispatcher/dispatcher";
+import { AsyncActionPayload } from "../dispatcher/payloads";
 
 /**
  * Create an action thunk that will dispatch actions indicating the current
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
new file mode 100644
index 0000000000..ff1650e4e5
--- /dev/null
+++ b/src/dispatcher/actions.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+// Dispatcher actions also extend into any arbitrary string, so support that.
+export type DispatcherAction = Action | string;
+
+export enum Action {
+    // TODO: Populate with actual actions
+}
+
diff --git a/src/dispatcher/dispatcher.ts b/src/dispatcher/dispatcher.ts
index fce99df055..6ef165c485 100644
--- a/src/dispatcher/dispatcher.ts
+++ b/src/dispatcher/dispatcher.ts
@@ -17,55 +17,8 @@ limitations under the License.
 */
 
 import { Dispatcher } from "flux";
-
-export enum Action {
-    // TODO: Populate with actual actions
-}
-
-// Dispatcher actions also extend into any arbitrary string, so support that.
-export type DispatcherAction = Action | string;
-
-/**
- * The base dispatch type exposed by our dispatcher.
- */
-export interface ActionPayload {
-    [property: string]: any; // effectively makes this 'extends Object'
-    action: DispatcherAction;
-}
-
-/**
- * The function the dispatcher calls when ready for an AsyncActionPayload. The
- * single argument is used to start a dispatch. First the dispatcher calls the
- * outer function, then when the called function is ready it calls the cb
- * function to issue the dispatch. It may call the callback repeatedly if needed.
- */
-export type AsyncActionFn = (cb: (action: ActionPayload) => void) => void;
-
-/**
- * An async version of ActionPayload
- */
-export class AsyncActionPayload implements ActionPayload {
-    /**
-     * The function the dispatcher should call.
-     */
-    public readonly fn: AsyncActionFn;
-
-    /**
-     * @deprecated Not used on AsyncActionPayload.
-     */
-    public get action(): DispatcherAction {
-        return "NOT_USED";
-    }
-
-    /**
-     * Create a new AsyncActionPayload with the given ready function.
-     * @param {AsyncActionFn} readyFn The function to be called when the
-     * dispatcher is ready.
-     */
-    public constructor(readyFn: AsyncActionFn) {
-        this.fn = readyFn;
-    }
-}
+import { Action } from "./actions";
+import { ActionPayload, AsyncActionPayload } from "./payloads";
 
 /**
  * A dispatcher for ActionPayloads (the default within the SDK).
diff --git a/src/dispatcher/payloads.ts b/src/dispatcher/payloads.ts
new file mode 100644
index 0000000000..fa45b30623
--- /dev/null
+++ b/src/dispatcher/payloads.ts
@@ -0,0 +1,59 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { DispatcherAction } from "./actions";
+
+/**
+ * The base dispatch type exposed by our dispatcher.
+ */
+export interface ActionPayload {
+    [property: string]: any; // effectively makes this 'extends Object'
+    action: DispatcherAction;
+}
+
+/**
+ * The function the dispatcher calls when ready for an AsyncActionPayload. The
+ * single argument is used to start a dispatch. First the dispatcher calls the
+ * outer function, then when the called function is ready it calls the cb
+ * function to issue the dispatch. It may call the callback repeatedly if needed.
+ */
+export type AsyncActionFn = (cb: (action: ActionPayload) => void) => void;
+
+/**
+ * An async version of ActionPayload
+ */
+export class AsyncActionPayload implements ActionPayload {
+    /**
+     * The function the dispatcher should call.
+     */
+    public readonly fn: AsyncActionFn;
+
+    /**
+     * @deprecated Not used on AsyncActionPayload.
+     */
+    public get action(): DispatcherAction {
+        return "NOT_USED";
+    }
+
+    /**
+     * Create a new AsyncActionPayload with the given ready function.
+     * @param {AsyncActionFn} readyFn The function to be called when the
+     * dispatcher is ready.
+     */
+    public constructor(readyFn: AsyncActionFn) {
+        this.fn = readyFn;
+    }
+}

From a3b4c2dfa02d1ae5ee959eaaa59e6544a0cea6d1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 20:48:49 -0600
Subject: [PATCH 2949/3235] Convert more async actions to AsyncActionPayload

---
 src/actions/GroupActions.js    | 34 ----------------------------------
 src/actions/GroupActions.ts    | 34 ++++++++++++++++++++++++++++++++++
 src/actions/TagOrderActions.ts |  3 +--
 src/actions/actionCreators.ts  |  5 ++---
 4 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 src/actions/GroupActions.js
 create mode 100644 src/actions/GroupActions.ts

diff --git a/src/actions/GroupActions.js b/src/actions/GroupActions.js
deleted file mode 100644
index 006c2da5b8..0000000000
--- a/src/actions/GroupActions.js
+++ /dev/null
@@ -1,34 +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.
-*/
-
-import { asyncAction } from './actionCreators';
-
-const GroupActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to fetch
- * the groups to which a user is joined.
- *
- * @param {MatrixClient} matrixClient the matrix client to query.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-GroupActions.fetchJoinedGroups = function(matrixClient) {
-    return asyncAction('GroupActions.fetchJoinedGroups', () => matrixClient.getJoinedGroups());
-};
-
-export default GroupActions;
diff --git a/src/actions/GroupActions.ts b/src/actions/GroupActions.ts
new file mode 100644
index 0000000000..81470d1221
--- /dev/null
+++ b/src/actions/GroupActions.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { asyncAction } from './actionCreators';
+import { AsyncActionPayload } from "../dispatcher/payloads";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+export default class GroupActions {
+    /**
+     * Creates an action thunk that will do an asynchronous request to fetch
+     * the groups to which a user is joined.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to query.
+     * @returns {AsyncActionPayload} An async action payload.
+     * @see asyncAction
+     */
+    public static fetchJoinedGroups(matrixClient: MatrixClient): AsyncActionPayload {
+        return asyncAction('GroupActions.fetchJoinedGroups', () => matrixClient.getJoinedGroups(), null);
+    }
+}
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
index fa95ea1037..bf1820d5d1 100644
--- a/src/actions/TagOrderActions.ts
+++ b/src/actions/TagOrderActions.ts
@@ -90,8 +90,7 @@ export default class TagOrderActions {
         if (removedTags.includes(tag)) {
             // Return a thunk that doesn't do anything, we don't even need
             // an asynchronous action here, the tag is already removed.
-            return () => {
-            };
+            return new AsyncActionPayload(() => {});
         }
 
         removedTags.push(tag);
diff --git a/src/actions/actionCreators.ts b/src/actions/actionCreators.ts
index d84868a141..c789e3cd07 100644
--- a/src/actions/actionCreators.ts
+++ b/src/actions/actionCreators.ts
@@ -44,12 +44,11 @@ import { AsyncActionPayload } from "../dispatcher/payloads";
  *                     result is the result of the promise returned by
  *                     `fn`.
  */
-export function asyncAction(id: string, fn: () => Promise<any>, pendingFn: () => any): AsyncActionPayload {
+export function asyncAction(id: string, fn: () => Promise<any>, pendingFn: () => any | null): AsyncActionPayload {
     const helper = (dispatch) => {
         dispatch({
             action: id + '.pending',
-            request:
-                typeof pendingFn === 'function' ? pendingFn() : undefined,
+            request: typeof pendingFn === 'function' ? pendingFn() : undefined,
         });
         fn().then((result) => {
             dispatch({action: id + '.success', result});

From a5f3318f3bec7d66c20a862669c3c1b938b362a6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 21:03:12 -0600
Subject: [PATCH 2950/3235] Convert view_user dispatch to prove the conversion
 works

This is a relatively obvious dispatch action that doesn't require a lot of complicated type definitions, so should be a good candidate to prove the thing works. If for some reason the thing stops working, we've done something wrong.

This also adds a bit of generic types to the dispatch call so we don't confuse the tsx parser by using `dis.dispatch(<ViewUserPayload>{...})` as it thinks that's supposed to be a component. We still get type safety, and the thing remains happy with the generics approach.
---
 src/SlashCommands.tsx                         |  8 +++--
 src/components/structures/MatrixChat.tsx      | 26 ++++++++---------
 src/components/structures/RightPanel.js       |  5 ++--
 src/components/views/avatars/MemberAvatar.js  |  5 ++--
 src/components/views/elements/Pill.js         |  3 +-
 .../views/groups/GroupMemberInfo.js           |  5 ++--
 .../views/right_panel/GroupHeaderButtons.js   |  6 ++--
 .../views/right_panel/RoomHeaderButtons.js    |  6 ++--
 src/components/views/right_panel/UserInfo.js  |  3 +-
 src/components/views/rooms/MemberInfo.js      |  3 +-
 src/components/views/rooms/MemberTile.js      |  3 +-
 src/dispatcher/actions.ts                     | 14 +++++++++
 src/dispatcher/dispatcher.ts                  |  2 +-
 src/dispatcher/payloads/ViewUserPayload.ts    | 29 +++++++++++++++++++
 14 files changed, 88 insertions(+), 30 deletions(-)
 create mode 100644 src/dispatcher/payloads/ViewUserPayload.ts

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index fd157b2b4c..d81da80e8d 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -41,6 +41,8 @@ import { parseFragment as parseHtml } from "parse5";
 import sendBugReport from "./rageshake/submit-rageshake";
 import SdkConfig from "./SdkConfig";
 import { ensureDMExists } from "./createRoom";
+import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload";
+import { Action } from "./dispatcher/actions";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -943,8 +945,10 @@ export const Commands = [
             }
 
             const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
-            dis.dispatch({
-                action: 'view_user',
+            dis.dispatch<ViewUserPayload>({
+                action: Action.ViewUser,
+                // XXX: We should be using a real member object and not assuming what the
+                // receiver wants.
                 member: member || {userId},
             });
             return success();
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 973d301420..d368b2c23a 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -17,12 +17,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import {InvalidStoreError} from "matrix-js-sdk/src/errors";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import React, { createRef } from 'react';
+import { InvalidStoreError } from "matrix-js-sdk/src/errors";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { isCryptoAvailable } from 'matrix-js-sdk/src/crypto';
-
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
 // what-input helps improve keyboard accessibility
@@ -30,7 +29,7 @@ import 'what-input';
 
 import Analytics from "../../Analytics";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
-import {MatrixClientPeg} from "../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
 import * as RoomListSorter from "../../RoomListSorter";
@@ -40,7 +39,7 @@ import Notifier from '../../Notifier';
 import Modal from "../../Modal";
 import Tinter from "../../Tinter";
 import * as sdk from '../../index';
-import { showStartChatInviteDialog, showRoomInviteDialog } from '../../RoomInvite';
+import { showRoomInviteDialog, showStartChatInviteDialog } from '../../RoomInvite';
 import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
 import * as Lifecycle from '../../Lifecycle';
@@ -52,21 +51,22 @@ import { getHomePageUrl } from '../../utils/pages';
 import createRoom from "../../createRoom";
 import KeyRequestHandler from '../../KeyRequestHandler';
 import { _t, getCurrentLanguage } from '../../languageHandler';
-import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import SettingsStore, { SettingLevel } from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 import ResizeNotifier from "../../utils/ResizeNotifier";
-import { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
-import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
 import DMRoomMap from '../../utils/DMRoomMap';
 import { countRoomsWithNotif } from '../../RoomNotifs';
 import { ThemeWatcher } from "../../theme";
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
-import {defer, IDeferred} from "../../utils/promise";
+import { defer, IDeferred } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
+import { ViewUserPayload } from "../../dispatcher/payloads/ViewUserPayload";
+import { Action } from "../../dispatcher/actions";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -1755,8 +1755,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         const member = new RoomMember(null, userId);
         if (!member) { return; }
-        dis.dispatch({
-            action: 'view_user',
+        dis.dispatch<ViewUserPayload>({
+            action: Action.ViewUser,
             member: member,
         });
     }
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index c6c330a202..56cc92a8f8 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -30,6 +30,7 @@ import SettingsStore from "../../settings/SettingsStore";
 import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import {Action} from "../../dispatcher/actions";
 
 export default class RightPanel extends React.Component {
     static get propTypes() {
@@ -237,7 +238,7 @@ export default class RightPanel extends React.Component {
                             // within a room, so go back to the member panel if we were in the encryption panel,
                             // or the member list if we were in the member panel... phew.
                             dis.dispatch({
-                                action: "view_user",
+                                action: Action.ViewUser,
                                 member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ?
                                     this.state.member : null,
                             });
@@ -266,7 +267,7 @@ export default class RightPanel extends React.Component {
                 if (SettingsStore.getValue("feature_cross_signing")) {
                     const onClose = () => {
                         dis.dispatch({
-                            action: "view_user",
+                            action: Action.ViewUser,
                             member: null,
                         });
                     };
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 89314cfef7..d28d80e62a 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -21,6 +21,7 @@ import createReactClass from 'create-react-class';
 import * as Avatar from '../../../Avatar';
 import * as sdk from "../../../index";
 import dis from "../../../dispatcher/dispatcher";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'MemberAvatar',
@@ -33,7 +34,7 @@ export default createReactClass({
         resizeMethod: PropTypes.string,
         // The onClick to give the avatar
         onClick: PropTypes.func,
-        // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
+        // Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
         viewUserOnClick: PropTypes.bool,
         title: PropTypes.string,
     },
@@ -85,7 +86,7 @@ export default createReactClass({
         if (viewUserOnClick) {
             onClick = () => {
                 dis.dispatch({
-                    action: 'view_user',
+                    action: Action.ViewUser,
                     member: this.props.member,
                 });
             };
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 3e4ddb99e8..03a1aeed85 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -26,6 +26,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
@@ -191,7 +192,7 @@ const Pill = createReactClass({
 
     onUserPillClicked: function() {
         dis.dispatch({
-            action: 'view_user',
+            action: Action.ViewUser,
             member: this.state.member,
         });
     },
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 0d08771676..2582cab573 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -28,6 +28,7 @@ import GroupStore from '../../../stores/GroupStore';
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'GroupMemberInfo',
@@ -103,7 +104,7 @@ export default createReactClass({
                 ).then(() => {
                     // return to the user list
                     dis.dispatch({
-                        action: "view_user",
+                        action: Action.ViewUser,
                         member: null,
                     });
                 }).catch((e) => {
@@ -124,7 +125,7 @@ export default createReactClass({
     _onCancel: function(e) {
         // Go back to the user list
         dis.dispatch({
-            action: "view_user",
+            action: Action.ViewUser,
             member: null,
         });
     },
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index f164b6c578..33d9325433 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -23,6 +23,8 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
+import {ActionPayload} from "../../../dispatcher/payloads";
 
 const GROUP_PHASES = [
     RIGHT_PANEL_PHASES.GroupMemberInfo,
@@ -40,10 +42,10 @@ export default class GroupHeaderButtons extends HeaderButtons {
         this._onRoomsClicked = this._onRoomsClicked.bind(this);
     }
 
-    onAction(payload) {
+    onAction(payload: ActionPayload) {
         super.onAction(payload);
 
-        if (payload.action === "view_user") {
+        if (payload.action === Action.ViewUser) {
             if (payload.member) {
                 this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
             } else {
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index bad89e2dbe..838727981d 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -23,6 +23,8 @@ import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
 import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
 import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
+import {ActionPayload} from "../../../dispatcher/payloads";
 
 const MEMBER_PHASES = [
     RIGHT_PANEL_PHASES.RoomMemberList,
@@ -39,9 +41,9 @@ export default class RoomHeaderButtons extends HeaderButtons {
         this._onNotificationsClicked = this._onNotificationsClicked.bind(this);
     }
 
-    onAction(payload) {
+    onAction(payload: ActionPayload) {
         super.onAction(payload);
-        if (payload.action === "view_user") {
+        if (payload.action === Action.ViewUser) {
             if (payload.member) {
                 this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
             } else {
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index daf1a9490d..0392746c94 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -44,6 +44,7 @@ import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
 import { verifyUser, legacyVerifyUser, verifyDevice } from '../../../verification';
+import {Action} from "../../../dispatcher/actions";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -841,7 +842,7 @@ const GroupAdminToolsSection = ({children, groupId, groupMember, startUpdating,
             cli.removeUserFromGroup(groupId, groupMember.userId).then(() => {
                 // return to the user list
                 dis.dispatch({
-                    action: "view_user",
+                    action: Action.ViewUser,
                     member: null,
                 });
             }).catch((e) => {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 5d8e03a050..ed6c4ad748 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -48,6 +48,7 @@ import E2EIcon from "./E2EIcon";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'MemberInfo',
@@ -724,7 +725,7 @@ export default createReactClass({
 
     onCancel: function(e) {
         dis.dispatch({
-            action: "view_user",
+            action: Action.ViewUser,
             member: null,
         });
     },
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 6842e27ed3..2d290564c3 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -23,6 +23,7 @@ import * as sdk from "../../../index";
 import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'MemberTile',
@@ -185,7 +186,7 @@ export default createReactClass({
 
     onClick: function(e) {
         dis.dispatch({
-            action: 'view_user',
+            action: Action.ViewUser,
             member: this.props.member,
         });
     },
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index ff1650e4e5..880e7e62cd 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -19,5 +19,19 @@ export type DispatcherAction = Action | string;
 
 export enum Action {
     // TODO: Populate with actual actions
+    // This is lazily generated as it also includes fixing a bunch of references. Work
+    // that we don't really want to take on in a giant chunk. We should always define
+    // new actions here, and ideally when we touch existing ones we take some time to
+    // define them correctly.
+
+    // When defining a new action, please use lower_scored_case with an optional class
+    // name prefix. For example, `RoomListStore.view_room` or `view_user_settings`.
+    // New definitions should also receive an accompanying interface in the payloads
+    // directory.
+
+    /**
+     * View a user's profile. Should be used with a ViewUserPayload.
+     */
+    ViewUser = "view_user",
 }
 
diff --git a/src/dispatcher/dispatcher.ts b/src/dispatcher/dispatcher.ts
index 6ef165c485..8330e5cd19 100644
--- a/src/dispatcher/dispatcher.ts
+++ b/src/dispatcher/dispatcher.ts
@@ -32,7 +32,7 @@ export class MatrixDispatcher extends Dispatcher<ActionPayload> {
      *        an operation that the browser requires user interaction
      *        for. Default false (async).
      */
-    dispatch(payload: ActionPayload, sync = false) {
+    dispatch<T extends ActionPayload>(payload: T, sync = false) {
         if (payload instanceof AsyncActionPayload) {
             payload.fn((action: ActionPayload) => {
                 this.dispatch(action, sync);
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
new file mode 100644
index 0000000000..ed602d4e24
--- /dev/null
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface ViewUserPayload extends ActionPayload {
+    action: Action.ViewUser,
+
+    /**
+     * The member to view. May be null or falsy to indicate that no member
+     * should be shown (hide whichever relevant components).
+     */
+    member?: RoomMember;
+}

From e4835c4b03f7f3bb1451f75a613a90a5d3b53ce9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 13 May 2020 21:07:19 -0600
Subject: [PATCH 2951/3235] Demonstrate dis.fire() with view_user_settings

Like a5f3318f3bec7d66c20a862669c3c1b938b362a6, this proves that the new dispatcher conversion works for fire-and-forget style dispatches too. This is another obvious-if-broken and generally safe conversion to make.

Other actions which can be dispatched this way have been excluded for reasons mentioned in the Action enum's comments.
---
 .../views/dialogs/eventindex/DisableEventIndexDialog.js   | 3 ++-
 .../views/dialogs/keybackup/NewRecoveryMethodDialog.js    | 3 ++-
 .../dialogs/keybackup/RecoveryMethodRemovedDialog.js      | 3 ++-
 src/components/structures/MatrixChat.tsx                  | 8 +++-----
 src/components/views/context_menus/TopLeftMenu.js         | 3 ++-
 src/components/views/dialogs/AddressPickerDialog.js       | 3 ++-
 .../views/dialogs/IntegrationsDisabledDialog.js           | 3 ++-
 src/components/views/dialogs/InviteDialog.js              | 3 ++-
 src/components/views/room_settings/UrlPreviewSettings.js  | 3 ++-
 src/dispatcher/actions.ts                                 | 5 +++++
 10 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 8af0bf278e..ec4b88f759 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -22,6 +22,7 @@ import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
+import {Action} from "../../../../dispatcher/actions";
 
 /*
  * Allows the user to disable the Event Index.
@@ -47,7 +48,7 @@ export default class DisableEventIndexDialog extends React.Component {
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     render() {
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index f00f2d9c3c..74552a5c08 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -22,6 +22,7 @@ import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
+import {Action} from "../../../../dispatcher/actions";
 
 export default class NewRecoveryMethodDialog extends React.PureComponent {
     static propTypes = {
@@ -36,7 +37,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
 
     onGoToSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     onSetupClick = async () => {
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index 722334cd70..cda353e717 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -21,6 +21,7 @@ import * as sdk from "../../../../index";
 import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
+import {Action} from "../../../../dispatcher/actions";
 
 export default class RecoveryMethodRemovedDialog extends React.PureComponent {
     static propTypes = {
@@ -29,7 +30,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
 
     onGoToSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     onSetupClick = () => {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index d368b2c23a..cf0388c490 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -107,7 +107,7 @@ export enum Views {
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
 const ONBOARDING_FLOW_STARTERS = [
-    'view_user_settings',
+    Action.ViewUserSettings,
     'view_create_chat',
     'view_create_room',
     'view_create_group',
@@ -613,7 +613,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'view_indexed_room':
                 this.viewIndexedRoom(payload.roomIndex);
                 break;
-            case 'view_user_settings': {
+            case Action.ViewUserSettings: {
                 const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
                 Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {},
                     /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
@@ -1621,9 +1621,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'view_create_room',
             });
         } else if (screen === 'settings') {
-            dis.dispatch({
-                action: 'view_user_settings',
-            });
+            dis.fire(Action.ViewUserSettings);
         } else if (screen === 'welcome') {
             dis.dispatch({
                 action: 'view_welcome_page',
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 3ec857be2f..ec99c63724 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -27,6 +27,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
 import * as sdk from "../../../index";
 import {getHomePageUrl} from "../../../utils/pages";
+import {Action} from "../../../dispatcher/actions";
 
 export default class TopLeftMenu extends React.Component {
     static propTypes = {
@@ -134,7 +135,7 @@ export default class TopLeftMenu extends React.Component {
     }
 
     openSettings() {
-        dis.dispatch({action: 'view_user_settings'});
+        dis.fire(Action.ViewUserSettings);
         this.closeMenu();
     }
 
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 41a819c005..8ddd89dc65 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -33,6 +33,7 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from '../../../
 import { abbreviateUrl } from '../../../utils/UrlUtils';
 import {sleep} from "../../../utils/promise";
 import {Key} from "../../../Keyboard";
+import {Action} from "../../../dispatcher/actions";
 
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@@ -615,7 +616,7 @@ export default createReactClass({
 
     onManageSettingsClick(e) {
         e.preventDefault();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
         this.onCancel();
     },
 
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
index 2677963281..7c996fbeab 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
+import {Action} from "../../../dispatcher/actions";
 
 export default class IntegrationsDisabledDialog extends React.Component {
     static propTypes = {
@@ -31,7 +32,7 @@ export default class IntegrationsDisabledDialog extends React.Component {
 
     _onOpenSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({action: "view_user_settings"});
+        dis.fire(Action.ViewUserSettings);
     };
 
     render() {
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e62c417a70..1e624f7545 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -36,6 +36,7 @@ import {inviteMultipleToRoom} from "../../../RoomInvite";
 import SettingsStore from '../../../settings/SettingsStore';
 import RoomListStore, {TAG_DM} from "../../../stores/RoomListStore";
 import {Key} from "../../../Keyboard";
+import {Action} from "../../../dispatcher/actions";
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
@@ -902,7 +903,7 @@ export default class InviteDialog extends React.PureComponent {
 
     _onManageSettingsClick = (e) => {
         e.preventDefault();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
         this.props.onFinished();
     };
 
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 16dffd857b..cd00e5048c 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -25,6 +25,7 @@ import { _t, _td } from '../../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {Action} from "../../../dispatcher/actions";
 
 
 export default createReactClass({
@@ -37,7 +38,7 @@ export default createReactClass({
     _onClickUserSettings: (e) => {
         e.preventDefault();
         e.stopPropagation();
-        dis.dispatch({action: 'view_user_settings'});
+        dis.fire(Action.ViewUserSettings);
     },
 
     render: function() {
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 880e7e62cd..a2f9c3efe3 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -33,5 +33,10 @@ export enum Action {
      * View a user's profile. Should be used with a ViewUserPayload.
      */
     ViewUser = "view_user",
+
+    /**
+     * Open the user settings. No additional payload information required.
+     */
+    ViewUserSettings = "view_user_settings",
 }
 

From 62fee732429fde3e2656dd7e3943c3ada6736507 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 14 May 2020 03:15:43 +0000
Subject: [PATCH 2952/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2312 of 2312 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 257b245e1c..0ca6cfc586 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2425,5 +2425,10 @@
     "Opens chat with the given user": "開啟與指定使用者的聊天",
     "Sends a message to the given user": "傳送訊息給指定的使用者",
     "Waiting for your other session to verify…": "正在等待您的其他工作階段進行驗證……",
-    "You've successfully verified your device!": "您已成功驗證您的裝置！"
+    "You've successfully verified your device!": "您已成功驗證您的裝置！",
+    "To continue, use Single Sign On to prove your identity.": "要繼續，使用單一登入系統來證明您的身份。",
+    "Confirm to continue": "確認以繼續",
+    "Click the button below to confirm your identity.": "點擊下方按鈕以確認您的身份。",
+    "Confirm encryption setup": "確認加密設定",
+    "Click the button below to confirm setting up encryption.": "點擊下方按鈕以確認設定加密。"
 }

From 5672ff577bb635574d086a4572599dbc8839ac02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 07:00:39 +0000
Subject: [PATCH 2953/3235] Translated using Weblate (Estonian)

Currently translated at 46.7% (1080 of 2312 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index cda3a5e76d..88301258a5 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1039,5 +1039,48 @@
     "Preview": "Eelvaade",
     "View": "Näita",
     "Message not sent due to unknown sessions being present": "Sõnum on saatmata, sest jutuoas on tundmatud sessioonid",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>."
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>.",
+    "Couldn't load page": "Lehe laadimine ei õnnestunud",
+    "You must <a>register</a> to use this functionality": "Selle funktsionaalsuse kasutamiseks pead sa <a>registreeruma</a>",
+    "<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>Sinu kogukonna lehe HTML'i näidis - see on pealkiri</h1>\n<p>\n     Tutvustamaks uutele liikmetele kogukonda, kasuta seda pikka kirjeldust\n     või jaga olulist teavet <a href=\"foo\">viidetena</a>\n</p>\n<p>\n     Pildite lisaminseks võid sa isegi kasutada img-märgendit\n</p>\n",
+    "Add to summary": "Lisa kokkuvõtte lehele",
+    "Add a Room": "Lisa jututuba",
+    "The room '%(roomName)s' could not be removed from the summary.": "Valitud %(roomName)s jututoa eemaldamine koondinfost ei õnnestunud.",
+    "Add users to the community summary": "Lisa kasutajad kogukonna kokkuvõtte lehele",
+    "Who would you like to add to this summary?": "Keda sa sooviksid lisada siia kokkuvõtte lehele?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Järgnevate kasutajate lisamine %(groupId)s kogukonna koondinfo lehele ei õnnestunud:",
+    "Add a User": "Lisa kasutaja",
+    "The user '%(displayName)s' could not be removed from the summary.": "Kasutaja %(displayName)s eemaldamine koondinfo lehelt ei õnnestunud.",
+    "Failed to upload image": "Pildi üleslaadimine ei õnnestunud",
+    "Failed to update community": "Kogukonna uuendamine ei õnnestunud",
+    "Unable to accept invite": "Ei saanud kutset vastu võtta",
+    "Unable to join community": "Ei õnnetunud liituda kogukonnaga",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Sa oled selle kogukonna haldur. Sa ei saa uuesti liituda ilma kutseta mõnelt teiselt administraatori õigustes liikmelt.",
+    "Leave Community": "Lahku kogukonnast",
+    "Leave %(groupName)s?": "Lahku %(groupName)s kogukonnast?",
+    "Unable to leave community": "Kogukonnast lahkumine ei õnnestunud",
+    "Community Settings": "Kogukonna seadistused",
+    "Want more than a community? <a>Get your own server</a>": "Soovid enamat  kui  kogukond? <a>Pane üles oma server</a>",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Oma kogukonnas tehtud <bold1>nime</bold1> ja <bold2>avatari</bold2> muudatused ei pruugi teistele näha olla kuni 30 minuti jooksul.",
+    "Featured Users:": "Esiletõstetud kasutajad:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s on kutsunud sind kogukonna liikmeks",
+    "Join this community": "Liitu selle kogukonnaga",
+    "Leave this community": "Lahku sellest kogukonnast",
+    "You are an administrator of this community": "Sa oled selle kogukonna haldur",
+    "You are a member of this community": "Sa oled kogukonna liige",
+    "Who can join this community?": "Kes võib liituda selle kogukonnaga?",
+    "Everyone": "Kes iganes soovib",
+    "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!": "Sinu kogukonnal on puudu pikk kirjeldus, mis pole muud kui lihtne HTML-leht, mida kuvatakse liikmetele.<br />Klõpsi siia ja loo selline leht!",
+    "Long Description (HTML)": "Pikk kirjeldus (HTML)",
+    "Upload avatar": "Lae üles profiilipilt ehk avatar",
+    "Description": "Kirjeldus",
+    "Community %(groupId)s not found": "%(groupId)s kogukonda ei leidunud",
+    "This homeserver does not support communities": "See koduserver ei toeta kogukondade funktsionaalsust",
+    "Failed to load %(groupId)s": "%(groupId)s kogukonna laadimine ei õnnestunud",
+    "Welcome to %(appName)s": "Tere tulemast %(appName)s kasutajaks",
+    "Liberate your communication": "Vabasta oma suhtlus",
+    "Send a Direct Message": "Saada otsesõnum",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Kas oled kindel, et soovid lahkuda jututoast '%(roomName)s'?",
+    "Unknown error": "Teadmata viga",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Selleka et jätkata koduserveri %(homeserverDomain)s kasutamist sa pead üle vaatama ja nõustuma meie kasutamistingimustega."
 }

From 1af2bdbc0ec7cddaa45edc131da66f24269d5724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 14 May 2020 06:10:18 +0000
Subject: [PATCH 2954/3235] Translated using Weblate (French)

Currently translated at 100.0% (2312 of 2312 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7546385bf6..3fac2168a2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2426,5 +2426,10 @@
     "Opens chat with the given user": "Ouvre une discussion avec l’utilisateur fourni",
     "Sends a message to the given user": "Envoie un message à l’utilisateur fourni",
     "Waiting for your other session to verify…": "En attente de la vérification depuis votre autre session…",
-    "You've successfully verified your device!": "Vous avez bien vérifié votre appareil !"
+    "You've successfully verified your device!": "Vous avez bien vérifié votre appareil !",
+    "To continue, use Single Sign On to prove your identity.": "Pour continuer, utilisez l’authentification unique pour prouver votre identité.",
+    "Confirm to continue": "Confirmer pour continuer",
+    "Click the button below to confirm your identity.": "Cliquez sur le bouton ci-dessous pour confirmer votre identité.",
+    "Confirm encryption setup": "Confirmer la configuration du chiffrement",
+    "Click the button below to confirm setting up encryption.": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement."
 }

From 9869ae4672c55679c8bee62f6505db5aeeec05ca Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Thu, 14 May 2020 07:32:33 +0000
Subject: [PATCH 2955/3235] =?UTF-8?q?Translated=20using=20Weblate=20(Norwe?=
 =?UTF-8?q?gian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 57.6% (1332 of 2312 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 147584ed00..59182a0249 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1341,5 +1341,6 @@
     "You're done!": "Du har gjort alt klart!",
     "Enter a recovery passphrase...": "Skriv inn en gjenopprettingspassfrase …",
     "Please enter your recovery passphrase a second time to confirm.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte.",
-    "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …"
+    "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …",
+    "Other users may not trust it": "Andre brukere kan kanskje mistro den"
 }

From d1c6f3099c0fbcbb8e2d94f19660a99d8a378c2b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 11:20:06 +0100
Subject: [PATCH 2956/3235] move styling to QRCode scss

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                |  1 +
 res/css/views/dialogs/_ShareDialog.scss |  6 ------
 res/css/views/elements/_QRCode.scss     | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 res/css/views/elements/_QRCode.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 428a28ac3a..c05e2cabc6 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -108,6 +108,7 @@
 @import "./views/elements/_ManageIntegsButton.scss";
 @import "./views/elements/_PowerSelector.scss";
 @import "./views/elements/_ProgressBar.scss";
+@import "./views/elements/_QRCode.scss";
 @import "./views/elements/_ReplyThread.scss";
 @import "./views/elements/_ResizeHandle.scss";
 @import "./views/elements/_RichText.scss";
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index 3c984bbd1b..e08469ec6d 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -67,12 +67,6 @@ limitations under the License.
     height: 256px;
     width: 256px;
     margin-right: 64px;
-
-    img {
-        width: 100%;
-        height: 100%;
-        border-radius: 8px;
-    }
 }
 
 .mx_ShareDialog_social_container {
diff --git a/res/css/views/elements/_QRCode.scss b/res/css/views/elements/_QRCode.scss
new file mode 100644
index 0000000000..96d9114b54
--- /dev/null
+++ b/res/css/views/elements/_QRCode.scss
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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_QRCode {
+    img {
+        border-radius: 8px;
+    }
+}

From 4c7d7032755f7a3e144efe696e5e60279b876fdf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 11:20:27 +0100
Subject: [PATCH 2957/3235] Reuse QRCode for VerificationQRCode and specify
 widths

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/ShareDialog.tsx  |  2 +-
 src/components/views/elements/QRCode.tsx      |  9 ++---
 .../elements/crypto/VerificationQRCode.js     | 36 ++++---------------
 3 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 3924fd42ec..271f754fd2 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -221,7 +221,7 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
 
                 <div className="mx_ShareDialog_split">
                     <div className="mx_ShareDialog_qrcode_container">
-                        <QRCode data={matrixToUrl} />
+                        <QRCode data={matrixToUrl} width={256} />
                     </div>
                     <div className="mx_ShareDialog_social_container">
                         { socials.map((social) => (
diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx
index 9c867058c0..f70ab48fa3 100644
--- a/src/components/views/elements/QRCode.tsx
+++ b/src/components/views/elements/QRCode.tsx
@@ -16,19 +16,21 @@ limitations under the License.
 
 import * as React from "react";
 import {toDataURL, QRCodeSegment, QRCodeToDataURLOptions} from "qrcode";
+import classNames from "classnames";
 
 import {_t} from "../../../languageHandler";
 import Spinner from "./Spinner";
 
 interface IProps extends QRCodeToDataURLOptions {
     data: string | QRCodeSegment[];
+    className?: string;
 }
 
 const defaultOptions: QRCodeToDataURLOptions = {
     errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
 };
 
-const QRCode: React.FC<IProps> = ({data, ...options}) => {
+const QRCode: React.FC<IProps> = ({data, className, ...options}) => {
     const [dataUri, setUri] = React.useState<string>(null);
     React.useEffect(() => {
         let cancelled = false;
@@ -39,10 +41,9 @@ const QRCode: React.FC<IProps> = ({data, ...options}) => {
         return () => {
             cancelled = true;
         };
-    }, [data, options]);
+    }, [JSON.stringify(data), options]);
 
-
-    return <div className="mx_QRCode">
+    return <div className={classNames("mx_QRCode", className)}>
         { dataUri ? <img src={dataUri} className="mx_VerificationQRCode" alt={_t("QR Code")} /> : <Spinner /> }
     </div>;
 };
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 08cd0c772e..3bbfb004c6 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -17,8 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {replaceableComponent} from "../../../../utils/replaceableComponent";
-import Spinner from "../Spinner";
-import * as QRCode from "qrcode";
+import QRCode from "../QRCode";
 
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
@@ -26,33 +25,12 @@ export default class VerificationQRCode extends React.PureComponent {
         qrCodeData: PropTypes.object.isRequired,
     };
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            dataUri: null,
-        };
-        this.generateQrCode();
-    }
-
-    componentDidUpdate(prevProps): void {
-        if (JSON.stringify(this.props) === JSON.stringify(prevProps)) return; // No prop change
-
-        this.generateQRCode();
-    }
-
-    async generateQrCode() {
-        // Now actually assemble the QR code's data URI
-        const uri = await QRCode.toDataURL([{data: this.props.qrCodeData.buffer, mode: 'byte'}], {
-            errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
-        });
-        this.setState({dataUri: uri});
-    }
-
     render() {
-        if (!this.state.dataUri) {
-            return <div className='mx_VerificationQRCode'><Spinner /></div>;
-        }
-
-        return <img src={this.state.dataUri} className='mx_VerificationQRCode' />;
+        return (
+            <QRCode
+                data={[{data: this.props.qrCodeData.buffer, mode: 'byte'}]}
+                className="mx_VerificationQRCode"
+                width={196} />
+        );
     }
 }

From edba204408483ad41db5abaeb04768e945a233a5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 13:04:30 +0100
Subject: [PATCH 2958/3235] accept and linkify local domains like those from
 mDNS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/linkify-matrix.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index ee9f703136..77c62ce84d 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -44,7 +44,7 @@ function matrixLinkify(linkify) {
     const S_HASH = S_START.jump(TT.POUND);
     const S_HASH_NAME = new linkify.parser.State();
     const S_HASH_NAME_COLON = new linkify.parser.State();
-    const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(ROOMALIAS);
     const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
     const S_ROOMALIAS_COLON = new linkify.parser.State();
@@ -92,7 +92,7 @@ function matrixLinkify(linkify) {
     const S_AT = S_START.jump(TT.AT);
     const S_AT_NAME = new linkify.parser.State();
     const S_AT_NAME_COLON = new linkify.parser.State();
-    const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(USERID);
     const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_USERID = new linkify.parser.State(USERID);
     const S_USERID_COLON = new linkify.parser.State();
@@ -138,7 +138,7 @@ function matrixLinkify(linkify) {
     const S_PLUS = S_START.jump(TT.PLUS);
     const S_PLUS_NAME = new linkify.parser.State();
     const S_PLUS_NAME_COLON = new linkify.parser.State();
-    const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State(GROUPID);
     const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_GROUPID = new linkify.parser.State(GROUPID);
     const S_GROUPID_COLON = new linkify.parser.State();

From 822b4b4fff2260a3be35c8afc0f54065f8d15298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Luke=C5=A1?= <exyi@outlook.cz>
Date: Thu, 14 May 2020 10:50:35 +0000
Subject: [PATCH 2959/3235] Translated using Weblate (Czech)

Currently translated at 95.2% (2198 of 2308 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 181a692b73..ddd5e5521b 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2293,5 +2293,6 @@
     "Opens chat with the given user": "Otevře konverzaci s tímto uživatelem",
     "Sends a message to the given user": "Pošle zprávu danému uživateli",
     "Waiting for your other session to verify…": "Čekáme na ověření od vaší druhé relace…",
-    "Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné"
+    "Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné",
+    "Verify the new login accessing your account: %(name)s": "Ověřte nové přihlášení na váš účet: %(name)s"
 }

From 72e5e2e4b9f61be669532b38f56b169ccfbd8866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 08:22:14 +0000
Subject: [PATCH 2960/3235] Translated using Weblate (Estonian)

Currently translated at 46.8% (1079 of 2308 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 88301258a5..948055c35a 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -6,7 +6,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "E-posti aadressi kontrollimine ei õnnestunud: palun vaata, et sa kindlasti klõpsisid saabunud kirjas olnud viidet",
     "The platform you're on": "Sinu kasutatav arvutisüsteem",
     "The version of Riot": "Riot'i versioon",
-    "Whether or not you're logged in (we don't record your username)": "Kas sa oled sisseloginud või  mitte (me ei salvesta sinu kasutajanime)",
+    "Whether or not you're logged in (we don't record your username)": "Kas sa oled sisseloginud või mitte (me ei salvesta sinu kasutajanime)",
     "Your language of choice": "Sinu keelevalik",
     "Your homeserver's URL": "Sinu koduserveri aadress",
     "e.g. <CurrentPageURL>": "näiteks <CurrentPageURL>",

From 91134601f6317fee286bfd94b560614de5b6e4d1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 14 May 2020 10:23:04 +0000
Subject: [PATCH 2961/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2308 of 2308 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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d891a06687..e79db1b061 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2417,5 +2417,14 @@
     "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>.",
     "Message deleted": "Messaggio eliminato",
-    "Message deleted by %(name)s": "Messaggio eliminato da %(name)s"
+    "Message deleted by %(name)s": "Messaggio eliminato da %(name)s",
+    "Opens chat with the given user": "Apre una chat con l'utente specificato",
+    "Sends a message to the given user": "Invia un messaggio all'utente specificato",
+    "Waiting for your other session to verify…": "In attesa che la tua altra sessione verifichi…",
+    "You've successfully verified your device!": "Hai verificato correttamente il tuo dispositivo!",
+    "To continue, use Single Sign On to prove your identity.": "Per continuare, usa Single Sign On per provare la tua identità.",
+    "Confirm to continue": "Conferma per continuare",
+    "Click the button below to confirm your identity.": "Clicca il pulsante sotto per confermare la tua identità.",
+    "Confirm encryption setup": "Conferma impostazione cifratura",
+    "Click the button below to confirm setting up encryption.": "Clicca il pulsante sotto per confermare l'impostazione della cifratura."
 }

From e241da3af0d153d6b20b8de2d85c66f306419ffa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 15:35:38 +0100
Subject: [PATCH 2962/3235] Fix diff wrong route offsets because of skipping a
 node insert

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/utils/MessageDiffUtils.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/utils/MessageDiffUtils.js b/src/utils/MessageDiffUtils.js
index de0d8fdc89..7398173fdd 100644
--- a/src/utils/MessageDiffUtils.js
+++ b/src/utils/MessageDiffUtils.js
@@ -77,8 +77,6 @@ function findRefNodes(root, route, isAddition) {
     const end = isAddition ? route.length - 1 : route.length;
     for (let i = 0; i < end; ++i) {
         refParentNode = refNode;
-        // Lists don't have appropriate child nodes we can use.
-        if (!refNode.childNodes[route[i]]) continue;
         refNode = refNode.childNodes[route[i]];
     }
     return {refNode, refParentNode};
@@ -190,10 +188,11 @@ function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
             break;
         }
         case "addTextElement": {
-            if (diff.value !== "\n") {
-                const insNode = wrapInsertion(stringAsTextNode(diff.value));
-                insertBefore(refParentNode, refNode, insNode);
-            }
+            // XXX: sometimes diffDOM says insert a newline when there shouldn't be one
+            // but we must insert the node anyway so that we don't break the route child IDs.
+            // See https://github.com/fiduswriter/diffDOM/issues/100
+            const insNode = wrapInsertion(stringAsTextNode(diff.value !== "\n" ? diff.value : ""));
+            insertBefore(refParentNode, refNode, insNode);
             break;
         }
         // e.g. when changing a the href of a link,

From d8003df24c660d0ed895f99c21eda24abaf4d13e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 14 May 2020 16:22:30 +0100
Subject: [PATCH 2963/3235] Upgrade matrix-js-sdk to 6.1.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 92d228a812..e77b7b26b8 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "6.1.0-rc.1",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index 520e976b17..d05c444470 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5720,9 +5720,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "6.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f120533fadb309ac5dc8b2bcb6882e784ba93f18"
+matrix-js-sdk@6.1.0-rc.1:
+  version "6.1.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3"
+  integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 4a7487aa20d0abffb7b242a399e1bd4f39a33a28 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 14 May 2020 16:30:17 +0100
Subject: [PATCH 2964/3235] Prepare changelog for v2.6.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0706e20085..c34bfba87b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,265 @@
+Changes in [2.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0-rc.1) (2020-05-14)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0...v2.6.0-rc.1)
+
+ * Upgrade to JS SDK 6.1.0-rc.1
+ * Update from Weblate
+   [\#4596](https://github.com/matrix-org/matrix-react-sdk/pull/4596)
+ * Fix message edits dialog being wrong and sometimes crashing
+   [\#4595](https://github.com/matrix-org/matrix-react-sdk/pull/4595)
+ * Acquire a new session before enacting deactivation
+   [\#4584](https://github.com/matrix-org/matrix-react-sdk/pull/4584)
+ * Remove UI for upgrading 4S to symmetric encryption
+   [\#4581](https://github.com/matrix-org/matrix-react-sdk/pull/4581)
+ * Add copy to SSO prompts during cross-signing setup
+   [\#4555](https://github.com/matrix-org/matrix-react-sdk/pull/4555)
+ * Re-fix OpenID requests from widgets
+   [\#4592](https://github.com/matrix-org/matrix-react-sdk/pull/4592)
+ * Fix persistent widgets on desktop / http
+   [\#4591](https://github.com/matrix-org/matrix-react-sdk/pull/4591)
+ * Updated link and added:Yarn two is not yet used.
+   [\#4589](https://github.com/matrix-org/matrix-react-sdk/pull/4589)
+ * Fix topic dialog not supporting escape as it didn't have a "Close"
+   [\#4578](https://github.com/matrix-org/matrix-react-sdk/pull/4578)
+ * Default to public room when creating room from room directory
+   [\#4579](https://github.com/matrix-org/matrix-react-sdk/pull/4579)
+ * Replace png flags and add Kosovo to country code dropdown
+   [\#4576](https://github.com/matrix-org/matrix-react-sdk/pull/4576)
+ * Rename `trash (custom).svg` as electron doesn't like paths with spaces
+   [\#4583](https://github.com/matrix-org/matrix-react-sdk/pull/4583)
+ * Fix sign in / up links on previewed rooms
+   [\#4582](https://github.com/matrix-org/matrix-react-sdk/pull/4582)
+ * Avoid soft crash if unknown device in verification
+   [\#4580](https://github.com/matrix-org/matrix-react-sdk/pull/4580)
+ * Add slash commands /query and /msg to match IRC
+   [\#4568](https://github.com/matrix-org/matrix-react-sdk/pull/4568)
+ * Send cross-signing debug booleans over rageshake
+   [\#4570](https://github.com/matrix-org/matrix-react-sdk/pull/4570)
+ * Prompt user to specify an alternate server if theirs has registration off
+   [\#4575](https://github.com/matrix-org/matrix-react-sdk/pull/4575)
+ * Don't try and redact redactions for "Remove recent messages"
+   [\#4573](https://github.com/matrix-org/matrix-react-sdk/pull/4573)
+ * View Source should target the replacing event rather than the root one
+   [\#4571](https://github.com/matrix-org/matrix-react-sdk/pull/4571)
+ * Fix passphrase reset in key backup restore dialog
+   [\#4569](https://github.com/matrix-org/matrix-react-sdk/pull/4569)
+ * Ensure key backup gets dealt with correctly during secret storage reset
+   [\#4556](https://github.com/matrix-org/matrix-react-sdk/pull/4556)
+ * Fix crash for broken invites
+   [\#4565](https://github.com/matrix-org/matrix-react-sdk/pull/4565)
+ * Fix rageshake with no matrix client
+   [\#4572](https://github.com/matrix-org/matrix-react-sdk/pull/4572)
+ * Update from Weblate
+   [\#4567](https://github.com/matrix-org/matrix-react-sdk/pull/4567)
+ * Bring back UnknownBody for UISIs
+   [\#4564](https://github.com/matrix-org/matrix-react-sdk/pull/4564)
+ * clear tag panel selection if the community selected is left
+   [\#4559](https://github.com/matrix-org/matrix-react-sdk/pull/4559)
+ * Close ImageView when redacting
+   [\#4560](https://github.com/matrix-org/matrix-react-sdk/pull/4560)
+ * Redesign redactions
+   [\#4484](https://github.com/matrix-org/matrix-react-sdk/pull/4484)
+ * Don't try to reload profile information when closing the user panel
+   [\#4547](https://github.com/matrix-org/matrix-react-sdk/pull/4547)
+ * Fix right panel hiding when viewing room member
+   [\#4558](https://github.com/matrix-org/matrix-react-sdk/pull/4558)
+ * Don't erase password confirm on registration error
+   [\#4540](https://github.com/matrix-org/matrix-react-sdk/pull/4540)
+ * Add a loading state for email addresses/phone numbers in settings
+   [\#4557](https://github.com/matrix-org/matrix-react-sdk/pull/4557)
+ * set the meta tag for theme-color to the same theme css background
+   [\#4554](https://github.com/matrix-org/matrix-react-sdk/pull/4554)
+ * Update Invite Dialog copy to include email addresses
+   [\#4497](https://github.com/matrix-org/matrix-react-sdk/pull/4497)
+ * Fix slider toggle regression.
+   [\#4546](https://github.com/matrix-org/matrix-react-sdk/pull/4546)
+ * Fix a crash where a name could unexpectedly be an empty list
+   [\#4552](https://github.com/matrix-org/matrix-react-sdk/pull/4552)
+ * Solves communities can be dragged from context menu
+   [\#4492](https://github.com/matrix-org/matrix-react-sdk/pull/4492)
+ * Remove prefixes for composer avatar urls
+   [\#4553](https://github.com/matrix-org/matrix-react-sdk/pull/4553)
+ * Fix reply RR spacing getting doubled
+   [\#4541](https://github.com/matrix-org/matrix-react-sdk/pull/4541)
+ * Differentiate copy for own untrusted device dialog
+   [\#4549](https://github.com/matrix-org/matrix-react-sdk/pull/4549)
+ * EventIndex: Reduce the logging the event index is producing.
+   [\#4548](https://github.com/matrix-org/matrix-react-sdk/pull/4548)
+ * Increase rageshake size limit to 5mb
+   [\#4543](https://github.com/matrix-org/matrix-react-sdk/pull/4543)
+ * Update from Weblate
+   [\#4542](https://github.com/matrix-org/matrix-react-sdk/pull/4542)
+ * Guard against race when waiting for cross-signing to be ready
+   [\#4539](https://github.com/matrix-org/matrix-react-sdk/pull/4539)
+ * Wait for user to be verified in e2e setup
+   [\#4537](https://github.com/matrix-org/matrix-react-sdk/pull/4537)
+ * Convert MatrixChat to a TypeScript class
+   [\#4462](https://github.com/matrix-org/matrix-react-sdk/pull/4462)
+ * Mark room as read when escape is pressed
+   [\#4271](https://github.com/matrix-org/matrix-react-sdk/pull/4271)
+ * Only show key backup reminder when confirmed by server to be missing
+   [\#4534](https://github.com/matrix-org/matrix-react-sdk/pull/4534)
+ * Add device name to unverified session toast
+   [\#4535](https://github.com/matrix-org/matrix-react-sdk/pull/4535)
+ * Show progress when loading keys
+   [\#4507](https://github.com/matrix-org/matrix-react-sdk/pull/4507)
+ * Fix device verification toasts not disappearing
+   [\#4532](https://github.com/matrix-org/matrix-react-sdk/pull/4532)
+ * Update toast copy again
+   [\#4529](https://github.com/matrix-org/matrix-react-sdk/pull/4529)
+ * Re-apply theme after login
+   [\#4518](https://github.com/matrix-org/matrix-react-sdk/pull/4518)
+ * Reduce maximum width of toasts & allow multiple lines
+   [\#4525](https://github.com/matrix-org/matrix-react-sdk/pull/4525)
+ * Treat sessions that are there when we log in as old
+   [\#4524](https://github.com/matrix-org/matrix-react-sdk/pull/4524)
+ * Allow resetting storage from the access dialog
+   [\#4521](https://github.com/matrix-org/matrix-react-sdk/pull/4521)
+ * Update (bulk) unverified device toast copy
+   [\#4522](https://github.com/matrix-org/matrix-react-sdk/pull/4522)
+ * Make new device toasts appear above review toasts
+   [\#4519](https://github.com/matrix-org/matrix-react-sdk/pull/4519)
+ * Separate toasts for existing & new device verification
+   [\#4511](https://github.com/matrix-org/matrix-react-sdk/pull/4511)
+ * Slightly darker toggle off bg color
+   [\#4477](https://github.com/matrix-org/matrix-react-sdk/pull/4477)
+ * Fix pill vertical align
+   [\#4514](https://github.com/matrix-org/matrix-react-sdk/pull/4514)
+ * Fix set up encryption toast to use "set up" as action
+   [\#4502](https://github.com/matrix-org/matrix-react-sdk/pull/4502)
+ * Don't enable e2ee when inviting a 3pid
+   [\#4509](https://github.com/matrix-org/matrix-react-sdk/pull/4509)
+ * Fix internal link styling in Security Settings
+   [\#4510](https://github.com/matrix-org/matrix-react-sdk/pull/4510)
+ * Small custom theming fixes
+   [\#4508](https://github.com/matrix-org/matrix-react-sdk/pull/4508)
+ * Fix scaling issues
+   [\#4355](https://github.com/matrix-org/matrix-react-sdk/pull/4355)
+ * Aggregate device verify toasts
+   [\#4506](https://github.com/matrix-org/matrix-react-sdk/pull/4506)
+ * Support setting username and avatar colors in custom themes
+   [\#4503](https://github.com/matrix-org/matrix-react-sdk/pull/4503)
+ * only clear on continuations where the clear isn't done by SenderProfile
+   [\#4501](https://github.com/matrix-org/matrix-react-sdk/pull/4501)
+ * cap width of editable item list item to leave space for its X button
+   [\#4495](https://github.com/matrix-org/matrix-react-sdk/pull/4495)
+ * Add a link from settings / devices to your user profile
+   [\#4498](https://github.com/matrix-org/matrix-react-sdk/pull/4498)
+ * Update from Weblate
+   [\#4496](https://github.com/matrix-org/matrix-react-sdk/pull/4496)
+ * Make icon change in SetupEncryptionDialog
+   [\#4485](https://github.com/matrix-org/matrix-react-sdk/pull/4485)
+ * Remove invite only padlocks feature flag
+   [\#4487](https://github.com/matrix-org/matrix-react-sdk/pull/4487)
+ * Fix incorrect toast if security setup skipped
+   [\#4486](https://github.com/matrix-org/matrix-react-sdk/pull/4486)
+ * Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
+   [\#4482](https://github.com/matrix-org/matrix-react-sdk/pull/4482)
+ * Fix widget URL templating (again)
+   [\#4481](https://github.com/matrix-org/matrix-react-sdk/pull/4481)
+ * Fix recovery link on login verification flow
+   [\#4479](https://github.com/matrix-org/matrix-react-sdk/pull/4479)
+ * Make avatars in pills occupy the entire space using cropping
+   [\#4476](https://github.com/matrix-org/matrix-react-sdk/pull/4476)
+ * Use WidgetType more often to avoid breaking new sticker pickers
+   [\#4458](https://github.com/matrix-org/matrix-react-sdk/pull/4458)
+ * Update logging for unmanaged widgets, and add TODO comments for other areas
+   [\#4460](https://github.com/matrix-org/matrix-react-sdk/pull/4460)
+ * Fix OpenID requests from widgets
+   [\#4459](https://github.com/matrix-org/matrix-react-sdk/pull/4459)
+ * Take encrypted message search out of labs
+   [\#4467](https://github.com/matrix-org/matrix-react-sdk/pull/4467)
+ * Fix BigEmoji for replies
+   [\#4475](https://github.com/matrix-org/matrix-react-sdk/pull/4475)
+ * Update login security copy and design to match Figma
+   [\#4472](https://github.com/matrix-org/matrix-react-sdk/pull/4472)
+ * Fix i18n of SSO UIA copy in Deactivate Account Dialog
+   [\#4471](https://github.com/matrix-org/matrix-react-sdk/pull/4471)
+ * Assert type of domNode as HTMLElement to fix build
+   [\#4470](https://github.com/matrix-org/matrix-react-sdk/pull/4470)
+ * Unignored in settings
+   [\#4466](https://github.com/matrix-org/matrix-react-sdk/pull/4466)
+ * Skip auth flow test for signing upload when password present
+   [\#4464](https://github.com/matrix-org/matrix-react-sdk/pull/4464)
+ * If user cannot set email during registration don't tell them to
+   [\#4461](https://github.com/matrix-org/matrix-react-sdk/pull/4461)
+ * Fix post-ts autocomplete, it is not null
+   [\#4463](https://github.com/matrix-org/matrix-react-sdk/pull/4463)
+ * Convert autocomplete stuff to TypeScript
+   [\#4452](https://github.com/matrix-org/matrix-react-sdk/pull/4452)
+ * Add a back button to the devtools verifications panel
+   [\#4455](https://github.com/matrix-org/matrix-react-sdk/pull/4455)
+ * Fix: wait until cross-signing keys are fetched to show verify button
+   [\#4456](https://github.com/matrix-org/matrix-react-sdk/pull/4456)
+ * Handle load error in create secret storage dialog
+   [\#4451](https://github.com/matrix-org/matrix-react-sdk/pull/4451)
+ * Allow iframes and Jitsi URLs in /addwidget
+   [\#4382](https://github.com/matrix-org/matrix-react-sdk/pull/4382)
+ * Support m.jitsi-typed widgets as Jitsi widgets
+   [\#4379](https://github.com/matrix-org/matrix-react-sdk/pull/4379)
+ * Don't recheck DeviceListener until after initial sync is finished
+   [\#4450](https://github.com/matrix-org/matrix-react-sdk/pull/4450)
+ * Fix CSS class in ButtonPlaceholder
+   [\#4449](https://github.com/matrix-org/matrix-react-sdk/pull/4449)
+ * Password Login make sure tab takes user to password field
+   [\#4441](https://github.com/matrix-org/matrix-react-sdk/pull/4441)
+ * Network Dropdown fix things not scrolling properly
+   [\#4439](https://github.com/matrix-org/matrix-react-sdk/pull/4439)
+ * ImageView make clicking off it easier
+   [\#4448](https://github.com/matrix-org/matrix-react-sdk/pull/4448)
+ * Add slash command to send a rageshake
+   [\#4443](https://github.com/matrix-org/matrix-react-sdk/pull/4443)
+ * EventIndex: Filter out events that don't have a propper content value.
+   [\#4446](https://github.com/matrix-org/matrix-react-sdk/pull/4446)
+ * Revert "Fix Filepanel scroll position state lost when room is changed"
+   [\#4445](https://github.com/matrix-org/matrix-react-sdk/pull/4445)
+ * Update seshat copy to remove trailing full stop
+   [\#4442](https://github.com/matrix-org/matrix-react-sdk/pull/4442)
+ * Fix Filepanel scroll position state lost when room is changed
+   [\#4388](https://github.com/matrix-org/matrix-react-sdk/pull/4388)
+ * Fix end-to-end tests for end-to-end encryption verification
+   [\#4436](https://github.com/matrix-org/matrix-react-sdk/pull/4436)
+ * Don't explode if the e2e test directory exists when crashing
+   [\#4437](https://github.com/matrix-org/matrix-react-sdk/pull/4437)
+ * Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
+   [\#4430](https://github.com/matrix-org/matrix-react-sdk/pull/4430)
+ * Minor updates to e2e test instructions on Windows
+   [\#4432](https://github.com/matrix-org/matrix-react-sdk/pull/4432)
+ * Fix typo
+   [\#4435](https://github.com/matrix-org/matrix-react-sdk/pull/4435)
+ * Catch errors sooner so users can recover more easily
+   [\#4122](https://github.com/matrix-org/matrix-react-sdk/pull/4122)
+ * Rageshake: remind user of unsupported browser and send modernizr report
+   [\#4381](https://github.com/matrix-org/matrix-react-sdk/pull/4381)
+ * Design tweaks for DM Room Tiles
+   [\#4338](https://github.com/matrix-org/matrix-react-sdk/pull/4338)
+ * Don't break spills over multiple lines, ellipsis them at max-1-line
+   [\#4434](https://github.com/matrix-org/matrix-react-sdk/pull/4434)
+ * Turn the end-to-end tests back on and fix the lazy-loading tests
+   [\#4433](https://github.com/matrix-org/matrix-react-sdk/pull/4433)
+ * Fix key backup debug panel
+   [\#4431](https://github.com/matrix-org/matrix-react-sdk/pull/4431)
+ * Convert cross-signing feature flag to setting
+   [\#4416](https://github.com/matrix-org/matrix-react-sdk/pull/4416)
+ * Make RoomPublishSetting import-skinnable
+   [\#4428](https://github.com/matrix-org/matrix-react-sdk/pull/4428)
+ * Iterate cross-signing copy
+   [\#4425](https://github.com/matrix-org/matrix-react-sdk/pull/4425)
+ * Fix: ensure twemoji font is loaded when showing SAS emojis
+   [\#4422](https://github.com/matrix-org/matrix-react-sdk/pull/4422)
+ * Revert "Fix: load Twemoji before login so complete security gets the right
+   emojis during SAS"
+   [\#4421](https://github.com/matrix-org/matrix-react-sdk/pull/4421)
+ * Fix: load Twemoji before login so complete security gets the right emojis
+   during SAS
+   [\#4419](https://github.com/matrix-org/matrix-react-sdk/pull/4419)
+ * consolidate and fix copy to clipboard
+   [\#4410](https://github.com/matrix-org/matrix-react-sdk/pull/4410)
+ * Fix Message Context Menu options not displaying: block
+   [\#4418](https://github.com/matrix-org/matrix-react-sdk/pull/4418)
+ * Fix pills being broken by unescaped characters
+   [\#4411](https://github.com/matrix-org/matrix-react-sdk/pull/4411)
+
 Changes in [2.5.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0) (2020-05-05)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.6...v2.5.0)

From 81174b5f55a04971d02c6dbf09457ec59aeee61d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 14 May 2020 16:30:17 +0100
Subject: [PATCH 2965/3235] v2.6.0-rc.1

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

diff --git a/package.json b/package.json
index e77b7b26b8..8338a91bf7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.5.0",
+  "version": "2.6.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From cae28b48d6ed5de74e676e2a216637f5e73619d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 09:43:34 -0600
Subject: [PATCH 2966/3235] Remove debugging that causes email addresses to
 load forever

This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 867982ad2b..0f82ce3a32 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -348,7 +348,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         // For newer homeservers with separate 3PID add and bind methods (MSC2290),
         // there is no such concern, so we can always show the HS account 3PIDs.
         if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
-            const emails = this.state.loading3pids || true
+            const emails = this.state.loading3pids
                 ? <Spinner />
                 : <EmailAddresses
                     emails={this.state.emails}

From 67822f9e6928112dc0e40fd0ad81675acb7a5eb3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 09:43:34 -0600
Subject: [PATCH 2967/3235] Remove debugging that causes email addresses to
 load forever

This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 867982ad2b..0f82ce3a32 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -348,7 +348,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         // For newer homeservers with separate 3PID add and bind methods (MSC2290),
         // there is no such concern, so we can always show the HS account 3PIDs.
         if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
-            const emails = this.state.loading3pids || true
+            const emails = this.state.loading3pids
                 ? <Spinner />
                 : <EmailAddresses
                     emails={this.state.emails}

From 777040208aa676cfe43eb69a9d9cbf92e0ce4edd Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 14 May 2020 15:57:39 +0000
Subject: [PATCH 2968/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2308 of 2308 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 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 9e8641a6e9..11239303f8 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -172,7 +172,7 @@
     "New passwords don't match": "Novaj pasvortoj ne akordas",
     "Passwords can't be empty": "Pasvortoj ne povas esti malplenaj",
     "Continue": "Daŭrigi",
-    "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la ĉambro",
+    "Export E2E room keys": "Elporti tutvoje ĉifrajn ŝlosilojn de la ĉambro",
     "Do you want to set an email address?": "Ĉu vi volas agordi retpoŝtadreson?",
     "Current password": "Nuna pasvorto",
     "Password": "Pasvorto",
@@ -538,8 +538,8 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron '%(roomName)s'?",
     "Failed to leave room": "Malsukcesis forlasi la ĉambron",
     "Signed Out": "Adiaŭinta",
-    "Old cryptography data detected": "Malnovaj kriptografiaj datumoj troviĝis",
-    "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.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos ĝiscelan ĉifradon en la malnova versio. Ĝiscele ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
+    "Old cryptography data detected": "Malnovaj datumoj de ĉifroteĥnikaro troviĝis",
+    "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.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos tutvojan ĉifradon en la malnova versio. Tutvoje ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
     "Logout": "Adiaŭi",
     "Your Communities": "Viaj komunumoj",
     "Error whilst fetching joined communities": "Akirado de viaj komunumoj eraris",
@@ -576,8 +576,8 @@
     "Success": "Sukceso",
     "Unable to remove contact information": "Ne povas forigi kontaktajn informojn",
     "<not supported>": "<nesubtenata>",
-    "Import E2E room keys": "Enporti ĝiscele ĉifrajn ĉambrajn ŝlosilojn",
-    "Cryptography": "Kriptografio",
+    "Import E2E room keys": "Enporti tutvoje ĉifrajn ĉambrajn ŝlosilojn",
+    "Cryptography": "Ĉifroteĥnikaro",
     "Analytics": "Analizo",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot kolektas sennomaj analizajn datumojn por helpi plibonigadon de la programo.",
     "Labs": "Eksperimentaj funkcioj",
@@ -981,7 +981,7 @@
     "Room version": "Ĉambra versio",
     "Room version:": "Ĉambra versio:",
     "Developer options": "Programistaj elektebloj",
-    "Room Addresses": "Ĉambra adresoj",
+    "Room Addresses": "Adresoj de ĉambro",
     "Change room avatar": "Ŝanĝi profilbildon de ĉambro",
     "Change room name": "Ŝanĝi nomon de ĉambro",
     "Change main address for the room": "Ŝanĝi ĉefan adreson de la ĉambro",
@@ -2400,5 +2400,10 @@
     "Opens chat with the given user": "Malfermas babilon kun la uzanto",
     "Sends a message to the given user": "Sendas mesaĝon al la uzanto",
     "Waiting for your other session to verify…": "Atendante kontrolon de via alia salutaĵo…",
-    "You've successfully verified your device!": "Vi sukcese kontrolis vian aparaton!"
+    "You've successfully verified your device!": "Vi sukcese kontrolis vian aparaton!",
+    "To continue, use Single Sign On to prove your identity.": "Por daŭrigi, pruvu vian identecon per ununura saluto.",
+    "Confirm to continue": "Konfirmu por daŭrigi",
+    "Click the button below to confirm your identity.": "Klaku sube la butonon por konfirmi vian identecon.",
+    "Confirm encryption setup": "Konfirmi agordon de ĉifrado",
+    "Click the button below to confirm setting up encryption.": "Klaku sube la butonon por konfirmi agordon de ĉifrado."
 }

From e96fa6db33f1817bc368f3c9a75e70a666ec9f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 16:30:32 +0000
Subject: [PATCH 2969/3235] Translated using Weblate (Estonian)

Currently translated at 46.9% (1082 of 2308 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 948055c35a..b6e4830bf7 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1082,5 +1082,8 @@
     "Send a Direct Message": "Saada otsesõnum",
     "Are you sure you want to leave the room '%(roomName)s'?": "Kas oled kindel, et soovid lahkuda jututoast '%(roomName)s'?",
     "Unknown error": "Teadmata viga",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Selleka et jätkata koduserveri %(homeserverDomain)s kasutamist sa pead üle vaatama ja nõustuma meie kasutamistingimustega."
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Selleka et jätkata koduserveri %(homeserverDomain)s kasutamist sa pead üle vaatama ja nõustuma meie kasutamistingimustega.",
+    "Permissions": "Õigused",
+    "Select the roles required to change various parts of the room": "Vali rollid, mis on vajalikud jututoa eri osade muutmiseks",
+    "Enable encryption?": "Kas võtame krüptimise kasutusele?"
 }

From 9c04188ceb6ee66d492e79b5323f84f3f2ab4b93 Mon Sep 17 00:00:00 2001
From: Christian Paul <info@jaller.de>
Date: Thu, 14 May 2020 16:21:20 +0000
Subject: [PATCH 2970/3235] Translated using Weblate (German)

Currently translated at 99.7% (2300 of 2308 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7fdaf20e40..a7b7da4146 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2365,5 +2365,8 @@
     "Activate selected button": "Ausgewählten Button aktivieren",
     "Toggle right panel": "Rechtes Panel ein-/ausblenden",
     "Toggle this dialog": "Diesen Dialog ein-/ausblenden",
-    "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben"
+    "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben",
+    "Opens chat with the given user": "Öffnet einen Chat mit diesem Benutzer",
+    "Sends a message to the given user": "Sendet diesem Benutzer eine Nachricht",
+    "Waiting for your other session to verify…": "Warte auf die Verifikation deiner anderen Sitzungen…"
 }

From f35a8bffc93f91ce11a513070b7cd9feb28a4f04 Mon Sep 17 00:00:00 2001
From: Christian Paul <info@jaller.de>
Date: Thu, 14 May 2020 16:32:26 +0000
Subject: [PATCH 2971/3235] Translated using Weblate (German)

Currently translated at 100.0% (2309 of 2309 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a7b7da4146..1166e7710a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1794,7 +1794,7 @@
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit „Single Sign-On“, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
     "Confirm adding email": "Bestätige das Hinzfugen der Email-Addresse",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnumer, indem du deine Identität mittels Single Sign-On nachweist.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnummer, indem du deine Identität mittels „Single Sign-On“ nachweist.",
     "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzufügen dieser Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
@@ -2368,5 +2368,12 @@
     "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben",
     "Opens chat with the given user": "Öffnet einen Chat mit diesem Benutzer",
     "Sends a message to the given user": "Sendet diesem Benutzer eine Nachricht",
-    "Waiting for your other session to verify…": "Warte auf die Verifikation deiner anderen Sitzungen…"
+    "Waiting for your other session to verify…": "Warte auf die Verifikation deiner anderen Sitzungen…",
+    "You've successfully verified your device!": "Du hast dein Gerät erfolgreich verifiziert!",
+    "QR Code": "QR-Code",
+    "To continue, use Single Sign On to prove your identity.": "Zum Fortfahren, nutze Single Sign On um deine Identität zu bestätigen.",
+    "Confirm to continue": "Bestätige um fortzufahren",
+    "Click the button below to confirm your identity.": "Klicke den Button unten um deine Identität zu bestätigen.",
+    "Confirm encryption setup": "Bestätige die Einrichtung der Verschlüsselung",
+    "Click the button below to confirm setting up encryption.": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen."
 }

From 77df85b0ac2774d42b842c323c2f16822762cca3 Mon Sep 17 00:00:00 2001
From: Tentarial <webmaster@rene-mail.de>
Date: Thu, 14 May 2020 16:36:58 +0000
Subject: [PATCH 2972/3235] Translated using Weblate (German)

Currently translated at 100.0% (2309 of 2309 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1166e7710a..3600cb5148 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1029,7 +1029,7 @@
     "Please review and accept all of the homeserver's policies": "Bitte prüfen und akzeptieren Sie alle Richtlinien des Heimservers",
     "Failed to load group members": "Konnte Gruppenmitglieder nicht laden",
     "That doesn't look like a valid email address": "Sieht nicht nach einer validen E-Mail-Adresse aus",
-    "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)s",
+    "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)",
     "Checking...": "Überprüfe...",
     "Unable to load backup status": "Konnte Backupstatus nicht laden",
     "Failed to decrypt %(failedCount)s sessions!": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",

From 09a4af49f35f750ecb66021e35c0540ec227d018 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 18:49:55 +0100
Subject: [PATCH 2973/3235] Consolidate zxcvbn progress bars into a component
 and add dynamic colour

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |  1 +
 res/css/views/auth/_AuthBody.scss             | 18 -------
 .../views/elements/_ZxcvbnProgressBar.scss    | 52 +++++++++++++++++++
 .../keybackup/CreateKeyBackupDialog.js        |  3 +-
 .../CreateSecretStorageDialog.js              |  3 +-
 src/components/views/auth/RegistrationForm.js |  7 +--
 .../views/elements/ZxcvbnProgressBar.tsx      | 30 +++++++++++
 7 files changed, 89 insertions(+), 25 deletions(-)
 create mode 100644 res/css/views/elements/_ZxcvbnProgressBar.scss
 create mode 100644 src/components/views/elements/ZxcvbnProgressBar.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 428a28ac3a..671e156585 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -120,6 +120,7 @@
 @import "./views/elements/_Tooltip.scss";
 @import "./views/elements/_TooltipButton.scss";
 @import "./views/elements/_Validation.scss";
+@import "./views/elements/_ZxcvbnProgressBar.scss";
 @import "./views/emojipicker/_EmojiPicker.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 4b2d6b1bf1..f4967ce202 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -148,25 +148,7 @@ limitations under the License.
 }
 
 .mx_AuthBody_passwordScore {
-    width: 100%;
-    appearance: none;
     height: 4px;
-    border: 0;
-    border-radius: 2px;
     position: absolute;
     top: -12px;
-
-    &::-moz-progress-bar {
-        border-radius: 2px;
-        background-color: $accent-color;
-    }
-
-    &::-webkit-progress-bar,
-    &::-webkit-progress-value {
-        border-radius: 2px;
-    }
-
-    &::-webkit-progress-value {
-        background-color: $accent-color;
-    }
 }
diff --git a/res/css/views/elements/_ZxcvbnProgressBar.scss b/res/css/views/elements/_ZxcvbnProgressBar.scss
new file mode 100644
index 0000000000..f7786348db
--- /dev/null
+++ b/res/css/views/elements/_ZxcvbnProgressBar.scss
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+$PassphraseStrengthHigh: $accent-color;
+$PassphraseStrengthMedium: $username-variant5-color;
+$PassphraseStrengthLow: $notice-primary-color;
+
+@define-mixin ProgressBarColour $colour {
+    color: $colour;
+    &::-moz-progress-bar {
+        background-color: $colour;
+    }
+    &::-webkit-progress-value {
+        background-color: $colour;
+    }
+}
+
+progress.mx_ZxcvbnProgressBar {
+    appearance: none;
+    width: 100%;
+    border: 0;
+
+    border-radius: 2px;
+    &::-moz-progress-bar {
+        border-radius: 2px;
+    }
+    &::-webkit-progress-bar,
+    &::-webkit-progress-value {
+        border-radius: 2px;
+    }
+
+    @mixin ProgressBarColour $PassphraseStrengthLow;
+    &[value="2"], &[value="3"] {
+        @mixin ProgressBarColour $PassphraseStrengthMedium;
+    }
+    &[value="4"] {
+        @mixin ProgressBarColour $PassphraseStrengthHigh;
+    }
+}
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index e4e39400f6..df2a81263d 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -26,6 +26,7 @@ import { accessSecretStorage } from '../../../../CrossSigningManager';
 import SettingsStore from '../../../../settings/SettingsStore';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 import {copyNode} from "../../../../utils/strings";
+import ZxcvbnProgressBar from "../../../../components/views/elements/ZxcvbnProgressBar";
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -276,7 +277,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 </div>;
             }
             strengthMeter = <div>
-                <progress max={PASSWORD_MIN_SCORE} value={this.state.zxcvbnResult.score} />
+                <ZxcvbnProgressBar value={this.state.zxcvbnResult.score} />
             </div>;
         }
 
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index c24623e30e..4c1faa3e6a 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -26,6 +26,7 @@ import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 import {copyNode} from "../../../../utils/strings";
 import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
+import ZxcvbnProgressBar from "../../../../components/views/elements/ZxcvbnProgressBar";
 
 const PHASE_LOADING = 0;
 const PHASE_LOADERROR = 1;
@@ -529,7 +530,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 </div>;
             }
             strengthMeter = <div>
-                <progress max={PASSWORD_MIN_SCORE} value={this.state.zxcvbnResult.score} />
+                <ZxcvbnProgressBar value={this.state.zxcvbnResult.score} />
             </div>;
         }
 
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 2a79bb8588..663e30d44d 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -29,6 +29,7 @@ import SdkConfig from '../../../SdkConfig';
 import { SAFE_LOCALPART_REGEX } from '../../../Registration';
 import withValidation from '../elements/Validation';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import ZxcvbnProgressBar from "../elements/ZxcvbnProgressBar";
 
 const FIELD_EMAIL = 'field_email';
 const FIELD_PHONE_NUMBER = 'field_phone_number';
@@ -274,11 +275,7 @@ export default createReactClass({
         description: function() {
             const complexity = this.state.passwordComplexity;
             const score = complexity ? complexity.score : 0;
-            return <progress
-                className="mx_AuthBody_passwordScore"
-                max={PASSWORD_MIN_SCORE}
-                value={score}
-            />;
+            return <ZxcvbnProgressBar value={score} className="mx_AuthBody_passwordScore" />;
         },
         rules: [
             {
diff --git a/src/components/views/elements/ZxcvbnProgressBar.tsx b/src/components/views/elements/ZxcvbnProgressBar.tsx
new file mode 100644
index 0000000000..339149b400
--- /dev/null
+++ b/src/components/views/elements/ZxcvbnProgressBar.tsx
@@ -0,0 +1,30 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 classNames from "classnames";
+
+interface IProps {
+    value: 0 | 1 | 2 | 3 | 4;
+    className?: string;
+}
+
+const ZxcvbnProgressBar: React.FC<IProps> = ({value, className}) => {
+    const classes = classNames("mx_ZxcvbnProgressBar", className);
+    return <progress className={classes} max={4} value={value} />;
+};
+
+export default ZxcvbnProgressBar;

From 7ef456230479abd914f6aafbd54716007ad0a14f Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 14 May 2020 16:39:20 +0000
Subject: [PATCH 2974/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2309 of 2309 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 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 11239303f8..6b3881339b 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -177,7 +177,7 @@
     "Current password": "Nuna pasvorto",
     "Password": "Pasvorto",
     "New Password": "Nova pasvorto",
-    "Confirm password": "Konfirmi pasvorton",
+    "Confirm password": "Konfirmu pasvorton",
     "Change Password": "Ŝanĝi pasvorton",
     "Authentication": "Aŭtentikigo",
     "Device ID": "Aparata identigilo",
@@ -298,7 +298,7 @@
     "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",
-    "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron al la publika ĉambrujo de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron al la publika listo de ĉambroj de %(domain)s?",
     "Who can read history?": "Kiu povas legi la historion?",
     "Anyone": "Iu ajn",
     "Members only (since the point in time of selecting this option)": "Nur ĉambranoj (ekde ĉi tiu elekto)",
@@ -441,7 +441,7 @@
     "collapse": "maletendi",
     "expand": "etendi",
     "Custom level": "Propra nivelo",
-    "Room directory": "Ĉambra dosierujo",
+    "Room directory": "Listo de ĉambroj",
     "Username not available": "Uzantonomo ne disponeblas",
     "Username invalid: %(errMessage)s": "Uzantonomo ne validas: %(errMessage)s",
     "Username available": "Uzantonomo disponeblas",
@@ -732,7 +732,7 @@
     "No update available.": "Neniuj ĝisdatigoj haveblas.",
     "Resend": "Resendi",
     "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la ĉambran kromnomon %(alias)s kaj forigi %(name)s de la ujo?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la ĉambran kromnomon %(alias)s kaj forigi %(name)s de la listo de ĉambroj?",
     "Enable notifications for this account": "Ŝalti sciigojn por tiu ĉi konto",
     "Invite to this community": "Inviti al tiu ĉi komunumo",
     "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortojn</span>",
@@ -1485,7 +1485,7 @@
     "Homeserver URL does not appear to be a valid Matrix homeserver": "URL por hejmservilo ŝajne ne ligas al valida hejmservilo de Matrix",
     "Invalid identity server discovery response": "Nevalida eltrova respondo de identiga servilo",
     "Identity server URL does not appear to be a valid identity server": "URL por identiga servilo ŝajne ne ligas al valida identiga servilo",
-    "Sign in with single sign-on": "Salutu per ununura saluto",
+    "Sign in with single sign-on": "Saluti per ununura saluto",
     "Failed to re-authenticate due to a homeserver problem": "Malsukcesis reaŭtentikigi pro hejmservila problemo",
     "Failed to re-authenticate": "Malsukcesis reaŭtentikigi",
     "Enter your password to sign in and regain access to your account.": "Enigu vian pasvorton por saluti kaj rehavi aliron al via konto.",
@@ -2405,5 +2405,6 @@
     "Confirm to continue": "Konfirmu por daŭrigi",
     "Click the button below to confirm your identity.": "Klaku sube la butonon por konfirmi vian identecon.",
     "Confirm encryption setup": "Konfirmi agordon de ĉifrado",
-    "Click the button below to confirm setting up encryption.": "Klaku sube la butonon por konfirmi agordon de ĉifrado."
+    "Click the button below to confirm setting up encryption.": "Klaku sube la butonon por konfirmi agordon de ĉifrado.",
+    "QR Code": "Rapidresponda kodo"
 }

From 2565f751839c65ac506c8d2e524030c2bfba1d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 16:34:16 +0000
Subject: [PATCH 2975/3235] Translated using Weblate (Estonian)

Currently translated at 48.2% (1113 of 2309 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b6e4830bf7..2ab308b469 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1085,5 +1085,36 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Selleka et jätkata koduserveri %(homeserverDomain)s kasutamist sa pead üle vaatama ja nõustuma meie kasutamistingimustega.",
     "Permissions": "Õigused",
     "Select the roles required to change various parts of the room": "Vali rollid, mis on vajalikud jututoa eri osade muutmiseks",
-    "Enable encryption?": "Kas võtame krüptimise kasutusele?"
+    "Enable encryption?": "Kas võtame krüptimise kasutusele?",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine takistada nii robotite kui sõnumisildade tööd. <a>Lisateave krüptimise kohta.</a>",
+    "Guests cannot join this room even if explicitly invited.": "Külalised ei saa selle jututoaga liituda ka siis, kui neid on otseselt kutsutud.",
+    "Click here to fix": "Parandamiseks klõpsi siia",
+    "Server error": "Serveri viga",
+    "Command error": "Käsu viga",
+    "Server unavailable, overloaded, or something else went wrong.": "Kas server pole saadaval, on üle koormatud või midagi muud läks viltu.",
+    "Unknown Command": "Tundmatu käsk",
+    "Unrecognised command: %(commandText)s": "Tundmatu käsk: %(commandText)s",
+    "Send as message": "Saada sõnumina",
+    "Failed to connect to integration manager": "Ühendus integratsioonihalduriga ei õnnestunud",
+    "You don't currently have any stickerpacks enabled": "Sul pole ühtegi kleepsupakki kasutusel",
+    "Add some now": "Lisa nüüd mõned",
+    "Stickerpack": "Kleepsupakk",
+    "Hide Stickers": "Peida kleepsud",
+    "Show Stickers": "Näita kleepse",
+    "Failed to revoke invite": "Kutse tühistamine ei õnnestunud",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kutse tühistamine ei õnnestunud. Serveri töös võib olla ajutine tõrge või sul pole piisavalt õigusi kutse tühistamiseks.",
+    "Revoke invite": "Tühista kutse",
+    "Invited by %(sender)s": "Kutsutud %(sender)s poolt",
+    "Jump to first unread message.": "Mine esimese lugemata sõnumi juurde.",
+    "Mark all as read": "Märgi kõik loetuks",
+    "Error updating main address": "Viga põhiaadressi uuendamisel",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Jututoa põhiaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Jututoa lisaaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
+    "Error creating alias": "Viga aliase loomisel",
+    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Aliase loomisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
+    "You don't have permission to delete the alias.": "Sul pole õigusi aliase kustutamiseks.",
+    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Selle aliase eemaldamisel tekkis viga. Teda kas pole enam olemas või tekkis mingi ajutine viga.",
+    "Error removing alias": "Viga aliase eemaldamisel",
+    "Main address": "Põhiaadress",
+    "not specified": "määratlemata"
 }

From 13922a71d3fd15f44a0d10e4fcd6a232081c8f14 Mon Sep 17 00:00:00 2001
From: Christian Paul <info@jaller.de>
Date: Thu, 14 May 2020 16:48:38 +0000
Subject: [PATCH 2976/3235] Translated using Weblate (German)

Currently translated at 100.0% (2309 of 2309 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3600cb5148..1166e7710a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1029,7 +1029,7 @@
     "Please review and accept all of the homeserver's policies": "Bitte prüfen und akzeptieren Sie alle Richtlinien des Heimservers",
     "Failed to load group members": "Konnte Gruppenmitglieder nicht laden",
     "That doesn't look like a valid email address": "Sieht nicht nach einer validen E-Mail-Adresse aus",
-    "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)",
+    "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)s",
     "Checking...": "Überprüfe...",
     "Unable to load backup status": "Konnte Backupstatus nicht laden",
     "Failed to decrypt %(failedCount)s sessions!": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",

From 93a608a6446c6717a8b88d9f47ac71a096da0c20 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 19:31:40 +0100
Subject: [PATCH 2977/3235] flatten out passwordSafe as it was a derived state
 value

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/auth/RegistrationForm.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 663e30d44d..4e2860c0cf 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -79,7 +79,6 @@ export default createReactClass({
             password: this.props.defaultPassword || "",
             passwordConfirm: this.props.defaultPassword || "",
             passwordComplexity: null,
-            passwordSafe: false,
         };
     },
 
@@ -291,22 +290,21 @@ export default createReactClass({
                     }
                     const { scorePassword } = await import('../../../utils/PasswordScorer');
                     const complexity = scorePassword(value);
-                    const safe = complexity.score >= PASSWORD_MIN_SCORE;
-                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
                     this.setState({
                         passwordComplexity: complexity,
-                        passwordSafe: safe,
                     });
+                    const safe = complexity.score >= PASSWORD_MIN_SCORE;
+                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
                     return allowUnsafe || safe;
                 },
                 valid: function() {
                     // Unsafe passwords that are valid are only possible through a
                     // configuration flag. We'll print some helper text to signal
                     // to the user that their password is allowed, but unsafe.
-                    if (!this.state.passwordSafe) {
-                        return _t("Password is allowed, but unsafe");
+                    if (this.state.passwordComplexity.score >= PASSWORD_MIN_SCORE) {
+                        return _t("Nice, strong password!");
                     }
-                    return _t("Nice, strong password!");
+                    return _t("Password is allowed, but unsafe");
                 },
                 invalid: function() {
                     const complexity = this.state.passwordComplexity;

From 8dd561d28a8a1fc39663a0bc138ac7e317e5f03b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 19:33:17 +0100
Subject: [PATCH 2978/3235] Convert Validation to TypeScript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../{Validation.js => Validation.tsx}         | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)
 rename src/components/views/elements/{Validation.js => Validation.tsx} (87%)

diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.tsx
similarity index 87%
rename from src/components/views/elements/Validation.js
rename to src/components/views/elements/Validation.tsx
index 2be526a3c3..09d6ec12f7 100644
--- a/src/components/views/elements/Validation.js
+++ b/src/components/views/elements/Validation.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,11 +16,34 @@ limitations under the License.
 */
 
 /* eslint-disable babel/no-invalid-this */
+import React from "react";
+import classNames from "classnames";
 
-import classNames from 'classnames';
+type Data = Pick<IValidateArgs, "value" | "allowEmpty">;
+
+interface IRule<T> {
+    key: string;
+    final?: boolean;
+    skip?(this: T, data: Data): boolean;
+    test(this: T, data: Data): boolean | Promise<boolean>;
+    valid?(this: T): string;
+    invalid?(this: T): string;
+}
+
+interface IArgs<T> {
+    rules: IRule<T>[];
+    description(): React.ReactChild;
+}
+
+interface IValidateArgs {
+    value: string;
+    focused: boolean;
+    allowEmpty: boolean;
+}
 
 /**
  * Creates a validation function from a set of rules describing what to validate.
+ * Generic T is the "this" type passed to the rule methods
  *
  * @param {Function} description
  *     Function that returns a string summary of the kind of value that will
@@ -37,8 +61,8 @@ import classNames from 'classnames';
  *     A validation function that takes in the current input value and returns
  *     the overall validity and a feedback UI that can be rendered for more detail.
  */
-export default function withValidation({ description, rules }) {
-    return async function onValidate({ value, focused, allowEmpty = true }) {
+export default function withValidation<T = undefined>({ description, rules }: IArgs<T>) {
+    return async function onValidate({ value, focused, allowEmpty = true }: IValidateArgs) {
         if (!value && allowEmpty) {
             return {
                 valid: null,

From 82b55ffd7717b4256690f43eb6891b173fe3cec9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Mar 2020 13:34:56 -0600
Subject: [PATCH 2979/3235] Add temporary timing functions to old RoomListStore

This is to identify how bad of a state we're in to start with.
---
 src/stores/RoomListStore.js | 60 ++++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 89edc9a8ef..e217f7ea38 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -58,7 +58,27 @@ export const ALGO_RECENT = "recent";
 
 const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
 
-const getListAlgorithm = (listKey, settingAlgorithm) => {
+function debugLog(...msg) {
+    console.log(`[RoomListStore:Debug] `, ...msg);
+}
+
+const timers = {};
+let timerCounter = 0;
+function startTimer(fnName) {
+    const id = `${fnName}_${(new Date()).getTime()}_${timerCounter++}`;
+    debugLog(`Started timer for ${fnName} with ID ${id}`);
+    timers[id] = {start: (new Date()).getTime(), fnName};
+    return id;
+}
+
+function endTimer(id) {
+    const timer = timers[id];
+    delete timers[id];
+    const diff = (new Date()).getTime() - timer.start;
+    debugLog(`${timer.fnName} took ${diff}ms (ID: ${id})`);
+}
+
+function getListAlgorithm(listKey, settingAlgorithm) {
     // apply manual sorting only to m.favourite, otherwise respect the global setting
     // all the known tags are listed explicitly here to simplify future changes
     switch (listKey) {
@@ -73,7 +93,7 @@ const getListAlgorithm = (listKey, settingAlgorithm) => {
         default: // custom-tags
             return ALGO_MANUAL;
     }
-};
+}
 
 const knownLists = new Set([
     "m.favourite",
@@ -340,6 +360,7 @@ class RoomListStore extends Store {
     }
 
     _getRecommendedTagsForRoom(room) {
+        const timerId = startTimer(`_getRecommendedTagsForRoom(room:"${room.roomId}")`);
         const tags = [];
 
         const myMembership = room.getMyMembership();
@@ -365,11 +386,12 @@ class RoomListStore extends Store {
             tags.push("im.vector.fake.archived");
         }
 
-
+        endTimer(timerId);
         return tags;
     }
 
     _slotRoomIntoList(room, category, tag, existingEntries, newList, lastTimestampFn) {
+        const timerId = startTimer(`_slotRoomIntoList(room:"${room.roomId}", "${category}", "${tag}", existingEntries: "${existingEntries.length}", "${newList}", lastTimestampFn:"${lastTimestampFn !== null}")`);
         const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
 
         let categoryComparator = (a, b) => lastTimestampFn(a.room) >= lastTimestampFn(b.room);
@@ -481,11 +503,16 @@ class RoomListStore extends Store {
             pushedEntry = true;
         }
 
+        endTimer(timerId);
         return pushedEntry;
     }
 
     _setRoomCategory(room, category) {
-        if (!room) return; // This should only happen in tests
+        const timerId = startTimer(`_setRoomCategory(room:"${room.roomId}", "${category}")`);
+        if (!room) {
+            endTimer(timerId);
+            return; // This should only happen in tests
+        }
 
         const listsClone = {};
 
@@ -582,9 +609,11 @@ class RoomListStore extends Store {
         }
 
         this._setState({lists: listsClone});
+        endTimer(timerId);
     }
 
     _generateInitialRoomLists() {
+        const timerId = startTimer(`_generateInitialRoomLists()`);
         // Log something to show that we're throwing away the old results. This is for the inevitable
         // question of "why is 100% of my CPU going towards Riot?" - a quick look at the logs would reveal
         // that something is wrong with the RoomListStore.
@@ -697,6 +726,7 @@ class RoomListStore extends Store {
             lists,
             ready: true, // Ready to receive updates to ordering
         });
+        endTimer(timerId);
     }
 
     _eventTriggersRecentReorder(ev) {
@@ -709,7 +739,9 @@ class RoomListStore extends Store {
     _tsOfNewestEvent(room) {
         // Apparently we can have rooms without timelines, at least under testing
         // environments. Just return MAX_INT when this happens.
-        if (!room || !room.timeline) return Number.MAX_SAFE_INTEGER;
+        if (!room || !room.timeline) {
+            return Number.MAX_SAFE_INTEGER;
+        }
 
         for (let i = room.timeline.length - 1; i >= 0; --i) {
             const ev = room.timeline[i];
@@ -729,23 +761,35 @@ class RoomListStore extends Store {
     }
 
     _calculateCategory(room) {
+        const timerId = startTimer(`_calculateCategory(room:"${room.roomId}")`);
         if (!this._state.orderImportantFirst) {
             // Effectively disable the categorization of rooms if we're supposed to
             // be sorting by more recent messages first. This triggers the timestamp
             // comparison bit of _setRoomCategory and _recentsComparator instead of
             // the category ordering.
+            endTimer(timerId);
             return CATEGORY_IDLE;
         }
 
         const mentions = room.getUnreadNotificationCount("highlight") > 0;
-        if (mentions) return CATEGORY_RED;
+        if (mentions) {
+            endTimer(timerId);
+            return CATEGORY_RED;
+        }
 
         let unread = room.getUnreadNotificationCount() > 0;
-        if (unread) return CATEGORY_GREY;
+        if (unread) {
+            endTimer(timerId);
+            return CATEGORY_GREY;
+        }
 
         unread = Unread.doesRoomHaveUnreadMessages(room);
-        if (unread) return CATEGORY_BOLD;
+        if (unread) {
+            endTimer(timerId);
+            return CATEGORY_BOLD;
+        }
 
+        endTimer(timerId);
         return CATEGORY_IDLE;
     }
 

From 08419d195e365eab57e0ffe0e315a7de9264d041 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 20 Mar 2020 14:38:20 -0600
Subject: [PATCH 2980/3235] Initial breakout for room list rewrite

This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
---
 package.json                                  |   1 +
 src/actions/RoomListActions.js                |  17 +-
 src/components/structures/LeftPanel.js        |  34 ++-
 src/components/structures/LoggedInView.tsx    |  13 +-
 src/components/views/dialogs/InviteDialog.js  |   9 +-
 src/components/views/rooms/RoomList.js        |  15 +-
 src/components/views/rooms/RoomList2.tsx      | 130 +++++++++++
 src/dispatcher-types.ts                       |  28 +++
 src/i18n/strings/en_EN.json                   |   2 +
 src/settings/Settings.js                      |   6 +
 src/stores/CustomRoomTagStore.js              |   8 +-
 src/stores/RoomListStore.js                   |  17 ++
 src/stores/room-list/RoomListStore2.ts        | 213 ++++++++++++++++++
 .../room-list/RoomListStoreTempProxy.ts       |  49 ++++
 .../room-list/algorithms/ChaoticAlgorithm.ts  | 100 ++++++++
 src/stores/room-list/algorithms/IAlgorithm.ts |  95 ++++++++
 src/stores/room-list/algorithms/index.ts      |  36 +++
 src/stores/room-list/models.ts                |  36 +++
 test/components/views/rooms/RoomList-test.js  |  16 +-
 tsconfig.json                                 |   3 +-
 yarn.lock                                     |  13 ++
 21 files changed, 794 insertions(+), 47 deletions(-)
 create mode 100644 src/components/views/rooms/RoomList2.tsx
 create mode 100644 src/dispatcher-types.ts
 create mode 100644 src/stores/room-list/RoomListStore2.ts
 create mode 100644 src/stores/room-list/RoomListStoreTempProxy.ts
 create mode 100644 src/stores/room-list/algorithms/ChaoticAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/IAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/index.ts
 create mode 100644 src/stores/room-list/models.ts

diff --git a/package.json b/package.json
index dda4a5a897..22ff071ba7 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,7 @@
     "@babel/register": "^7.7.4",
     "@peculiar/webcrypto": "^1.0.22",
     "@types/classnames": "^2.2.10",
+    "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
     "@types/qrcode": "^1.3.4",
     "@types/react": "16.9",
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index 10a3848dda..072b1d9a86 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -15,11 +15,12 @@ limitations under the License.
 */
 
 import { asyncAction } from './actionCreators';
-import RoomListStore, {TAG_DM} from '../stores/RoomListStore';
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
 import * as sdk from '../index';
+import {RoomListStoreTempProxy} from "../stores/room-list/RoomListStoreTempProxy";
+import {DefaultTagID} from "../stores/room-list/models";
 
 const RoomListActions = {};
 
@@ -44,7 +45,7 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
 
     // Is the tag ordered manually?
     if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-        const lists = RoomListStore.getRoomLists();
+        const lists = RoomListStoreTempProxy.getRoomLists();
         const newList = [...lists[newTag]];
 
         newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
@@ -73,11 +74,11 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         const roomId = room.roomId;
 
         // Evil hack to get DMs behaving
-        if ((oldTag === undefined && newTag === TAG_DM) ||
-            (oldTag === TAG_DM && newTag === undefined)
+        if ((oldTag === undefined && newTag === DefaultTagID.DM) ||
+            (oldTag === DefaultTagID.DM && newTag === undefined)
         ) {
             return Rooms.guessAndSetDMRoom(
-                room, newTag === TAG_DM,
+                room, newTag === DefaultTagID.DM,
             ).catch((err) => {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Failed to set direct chat tag " + err);
@@ -91,10 +92,10 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         const hasChangedSubLists = oldTag !== newTag;
 
         // More evilness: We will still be dealing with moving to favourites/low prio,
-        // but we avoid ever doing a request with TAG_DM.
+        // but we avoid ever doing a request with DefaultTagID.DM.
         //
         // if we moved lists, remove the old tag
-        if (oldTag && oldTag !== TAG_DM &&
+        if (oldTag && oldTag !== DefaultTagID.DM &&
             hasChangedSubLists
         ) {
             const promiseToDelete = matrixClient.deleteRoomTag(
@@ -112,7 +113,7 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         }
 
         // if we moved lists or the ordering changed, add the new tag
-        if (newTag && newTag !== TAG_DM &&
+        if (newTag && newTag !== DefaultTagID.DM &&
             (hasChangedSubLists || metaData)
         ) {
             // metaData is the body of the PUT to set the tag, so it must
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a9cd12199b..1993e2f419 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -26,6 +26,7 @@ import * as VectorConferenceHandler from '../../VectorConferenceHandler';
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";
+import RoomList2 from "../views/rooms/RoomList2";
 
 
 const LeftPanel = createReactClass({
@@ -273,6 +274,29 @@ const LeftPanel = createReactClass({
             breadcrumbs = (<RoomBreadcrumbs collapsed={this.props.collapsed} />);
         }
 
+        let roomList = null;
+        if (SettingsStore.isFeatureEnabled("feature_new_room_list")) {
+            roomList = <RoomList2
+                onKeyDown={this._onKeyDown}
+                resizeNotifier={this.props.resizeNotifier}
+                collapsed={this.props.collapsed}
+                searchFilter={this.state.searchFilter}
+                ref={this.collectRoomList}
+                onFocus={this._onFocus}
+                onBlur={this._onBlur}
+            />;
+        } else {
+            roomList = <RoomList
+                onKeyDown={this._onKeyDown}
+                onFocus={this._onFocus}
+                onBlur={this._onBlur}
+                ref={this.collectRoomList}
+                resizeNotifier={this.props.resizeNotifier}
+                collapsed={this.props.collapsed}
+                searchFilter={this.state.searchFilter}
+                ConferenceHandler={VectorConferenceHandler} />;
+        }
+
         return (
             <div className={containerClasses}>
                 { tagPanelContainer }
@@ -284,15 +308,7 @@ const LeftPanel = createReactClass({
                         { exploreButton }
                         { searchBox }
                     </div>
-                    <RoomList
-                        onKeyDown={this._onKeyDown}
-                        onFocus={this._onFocus}
-                        onBlur={this._onBlur}
-                        ref={this.collectRoomList}
-                        resizeNotifier={this.props.resizeNotifier}
-                        collapsed={this.props.collapsed}
-                        searchFilter={this.state.searchFilter}
-                        ConferenceHandler={VectorConferenceHandler} />
+                    {roomList}
                 </aside>
             </div>
         );
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 9de2aac8e9..0950e52bba 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -31,7 +31,6 @@ import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
 import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
-import RoomListStore from "../../stores/RoomListStore";
 
 import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
@@ -42,6 +41,8 @@ import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import PlatformPeg from "../../PlatformPeg";
+import { RoomListStoreTempProxy } from "../../stores/room-list/RoomListStoreTempProxy";
+import { DefaultTagID } from "../../stores/room-list/models";
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -297,18 +298,18 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     };
 
     onRoomStateEvents = (ev, state) => {
-        const roomLists = RoomListStore.getRoomLists();
-        if (roomLists['m.server_notice'] && roomLists['m.server_notice'].some(r => r.roomId === ev.getRoomId())) {
+        const roomLists = RoomListStoreTempProxy.getRoomLists();
+        if (roomLists[DefaultTagID.ServerNotice] && roomLists[DefaultTagID.ServerNotice].some(r => r.roomId === ev.getRoomId())) {
             this._updateServerNoticeEvents();
         }
     };
 
     _updateServerNoticeEvents = async () => {
-        const roomLists = RoomListStore.getRoomLists();
-        if (!roomLists['m.server_notice']) return [];
+        const roomLists = RoomListStoreTempProxy.getRoomLists();
+        if (!roomLists[DefaultTagID.ServerNotice]) return [];
 
         const pinnedEvents = [];
-        for (const room of roomLists['m.server_notice']) {
+        for (const room of roomLists[DefaultTagID.ServerNotice]) {
             const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
 
             if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 7cbbf8ba64..e719c45f49 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -34,8 +34,9 @@ import {humanizeTime} from "../../../utils/humanize";
 import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
 import SettingsStore from '../../../settings/SettingsStore';
-import RoomListStore, {TAG_DM} from "../../../stores/RoomListStore";
 import {Key} from "../../../Keyboard";
+import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTempProxy";
+import {DefaultTagID} from "../../../stores/room-list/models";
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
@@ -343,10 +344,10 @@ export default class InviteDialog extends React.PureComponent {
     _buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
 
-        // Also pull in all the rooms tagged as TAG_DM so we don't miss anything. Sometimes the
+        // Also pull in all the rooms tagged as DefaultTagID.DM so we don't miss anything. Sometimes the
         // room list doesn't tag the room for the DMRoomMap, but does for the room list.
-        const taggedRooms = RoomListStore.getRoomLists();
-        const dmTaggedRooms = taggedRooms[TAG_DM];
+        const taggedRooms = RoomListStoreTempProxy.getRoomLists();
+        const dmTaggedRooms = taggedRooms[DefaultTagID.DM];
         const myUserId = MatrixClientPeg.get().getUserId();
         for (const dmRoom of dmTaggedRooms) {
             const otherMembers = dmRoom.getJoinedMembers().filter(u => u.userId !== myUserId);
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 289a89a206..dc9c9238cd 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -29,7 +29,6 @@ import rate_limited_func from "../../../ratelimitedfunc";
 import * as Rooms from '../../../Rooms';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import TagOrderStore from '../../../stores/TagOrderStore';
-import RoomListStore, {TAG_DM} from '../../../stores/RoomListStore';
 import CustomRoomTagStore from '../../../stores/CustomRoomTagStore';
 import GroupStore from '../../../stores/GroupStore';
 import RoomSubList from '../../structures/RoomSubList';
@@ -41,6 +40,8 @@ import * as Receipt from "../../../utils/Receipt";
 import {Resizer} from '../../../resizer';
 import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
 import {RovingTabIndexProvider} from "../../../accessibility/RovingTabIndex";
+import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTempProxy";
+import {DefaultTagID} from "../../../stores/room-list/models";
 import * as Unread from "../../../Unread";
 import RoomViewStore from "../../../stores/RoomViewStore";
 
@@ -161,7 +162,7 @@ export default createReactClass({
             this.updateVisibleRooms();
         });
 
-        this._roomListStoreToken = RoomListStore.addListener(() => {
+        this._roomListStoreToken = RoomListStoreTempProxy.addListener(() => {
             this._delayedRefreshRoomList();
         });
 
@@ -521,7 +522,7 @@ export default createReactClass({
     },
 
     getTagNameForRoomId: function(roomId) {
-        const lists = RoomListStore.getRoomLists();
+        const lists = RoomListStoreTempProxy.getRoomLists();
         for (const tagName of Object.keys(lists)) {
             for (const room of lists[tagName]) {
                 // Should be impossible, but guard anyways.
@@ -541,7 +542,7 @@ export default createReactClass({
     },
 
     getRoomLists: function() {
-        const lists = RoomListStore.getRoomLists();
+        const lists = RoomListStoreTempProxy.getRoomLists();
 
         const filteredLists = {};
 
@@ -773,10 +774,10 @@ export default createReactClass({
                 incomingCall: incomingCallIfTaggedAs('m.favourite'),
             },
             {
-                list: this.state.lists[TAG_DM],
+                list: this.state.lists[DefaultTagID.DM],
                 label: _t('Direct Messages'),
-                tagName: TAG_DM,
-                incomingCall: incomingCallIfTaggedAs(TAG_DM),
+                tagName: DefaultTagID.DM,
+                incomingCall: incomingCallIfTaggedAs(DefaultTagID.DM),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_chat'});},
                 addRoomLabel: _t("Start chat"),
             },
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
new file mode 100644
index 0000000000..1790fa8cf6
--- /dev/null
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -0,0 +1,130 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as React from "react";
+import { _t } from "../../../languageHandler";
+import { Layout } from '../../../resizer/distributors/roomsublist2';
+import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
+import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+import RoomListStore from "../../../stores/room-list/RoomListStore2";
+
+interface IProps {
+    onKeyDown: (ev: React.KeyboardEvent) => void;
+    onFocus: (ev: React.FocusEvent) => void;
+    onBlur: (ev: React.FocusEvent) => void;
+    resizeNotifier: ResizeNotifier;
+    collapsed: boolean;
+    searchFilter: string;
+}
+
+interface IState {
+}
+
+// TODO: Actually write stub
+export class RoomSublist2 extends React.Component<any, any> {
+    public setHeight(size: number) {
+    }
+}
+
+export default class RoomList2 extends React.Component<IProps, IState> {
+    private sublistRefs: { [tagId: string]: React.RefObject<RoomSublist2> } = {};
+    private sublistSizes: { [tagId: string]: number } = {};
+    private sublistCollapseStates: { [tagId: string]: boolean } = {};
+    private unfilteredLayout: Layout;
+    private filteredLayout: Layout;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.loadSublistSizes();
+        this.prepareLayouts();
+    }
+
+    public componentDidMount(): void {
+        RoomListStore.instance.addListener(() => {
+            console.log(RoomListStore.instance.orderedLists);
+        });
+    }
+
+    private loadSublistSizes() {
+        const sizesJson = window.localStorage.getItem("mx_roomlist_sizes");
+        if (sizesJson) this.sublistSizes = JSON.parse(sizesJson);
+
+        const collapsedJson = window.localStorage.getItem("mx_roomlist_collapsed");
+        if (collapsedJson) this.sublistCollapseStates = JSON.parse(collapsedJson);
+    }
+
+    private saveSublistSizes() {
+        window.localStorage.setItem("mx_roomlist_sizes", JSON.stringify(this.sublistSizes));
+        window.localStorage.setItem("mx_roomlist_collapsed", JSON.stringify(this.sublistCollapseStates));
+    }
+
+    private prepareLayouts() {
+        this.unfilteredLayout = new Layout((tagId: string, height: number) => {
+            const sublist = this.sublistRefs[tagId];
+            if (sublist) sublist.current.setHeight(height);
+
+            // TODO: Check overflow
+
+            // Don't store a height for collapsed sublists
+            if (!this.sublistCollapseStates[tagId]) {
+                this.sublistSizes[tagId] = height;
+                this.saveSublistSizes();
+            }
+        }, this.sublistSizes, this.sublistCollapseStates, {
+            allowWhitespace: false,
+            handleHeight: 1,
+        });
+
+        this.filteredLayout = new Layout((tagId: string, height: number) => {
+            const sublist = this.sublistRefs[tagId];
+            if (sublist) sublist.current.setHeight(height);
+        }, null, null, {
+            allowWhitespace: false,
+            handleHeight: 0,
+        });
+    }
+
+    private collectSublistRef(tagId: string, ref: React.RefObject<RoomSublist2>) {
+        if (!ref) {
+            delete this.sublistRefs[tagId];
+        } else {
+            this.sublistRefs[tagId] = ref;
+        }
+    }
+
+    public render() {
+        return (
+            <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={this.props.onKeyDown}>
+                {({onKeyDownHandler}) => (
+                    <div
+                        onFocus={this.props.onFocus}
+                        onBlur={this.props.onBlur}
+                        onKeyDown={onKeyDownHandler}
+                        className="mx_RoomList"
+                        role="tree"
+                        aria-label={_t("Rooms")}
+                        // Firefox sometimes makes this element focusable due to
+                        // overflow:scroll;, so force it out of tab order.
+                        tabIndex={-1}
+                    >{_t("TODO")}</div>
+                )}
+            </RovingTabIndexProvider>
+        );
+    }
+}
diff --git a/src/dispatcher-types.ts b/src/dispatcher-types.ts
new file mode 100644
index 0000000000..16fac0c849
--- /dev/null
+++ b/src/dispatcher-types.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as flux from "flux";
+import dis from "./dispatcher";
+
+// TODO: Merge this with the dispatcher and centralize types
+
+export interface ActionPayload {
+    [property: string]: any; // effectively "extends Object"
+    action: string;
+}
+
+// For ease of reference in TypeScript classes
+export const defaultDispatcher: flux.Dispatcher<ActionPayload> = dis;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f16a0d7755..fd474f378c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -406,6 +406,7 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
+    "Use the improved room list component (refresh to apply changes)": "Use the improved room list component (refresh to apply changes)",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
@@ -1116,6 +1117,7 @@
     "Low priority": "Low priority",
     "Historical": "Historical",
     "System Alerts": "System Alerts",
+    "TODO": "TODO",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 5c6d843349..554cf6b968 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -131,6 +131,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_new_room_list": {
+        isFeature: true,
+        displayName: _td("Use the improved room list component (refresh to apply changes)"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_custom_themes": {
         isFeature: true,
         displayName: _td("Support adding custom themes"),
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
index 909282c085..bf8e970535 100644
--- a/src/stores/CustomRoomTagStore.js
+++ b/src/stores/CustomRoomTagStore.js
@@ -15,10 +15,10 @@ limitations under the License.
 */
 import dis from '../dispatcher';
 import * as RoomNotifs from '../RoomNotifs';
-import RoomListStore from './RoomListStore';
 import EventEmitter from 'events';
 import { throttle } from "lodash";
 import SettingsStore from "../settings/SettingsStore";
+import {RoomListStoreTempProxy} from "./room-list/RoomListStoreTempProxy";
 
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
 
@@ -60,7 +60,7 @@ class CustomRoomTagStore extends EventEmitter {
                 trailing: true,
             },
         );
-        this._roomListStoreToken = RoomListStore.addListener(() => {
+        this._roomListStoreToken = RoomListStoreTempProxy.addListener(() => {
             this._setState({tags: this._getUpdatedTags()});
         });
         dis.register(payload => this._onDispatch(payload));
@@ -85,7 +85,7 @@ class CustomRoomTagStore extends EventEmitter {
     }
 
     getSortedTags() {
-        const roomLists = RoomListStore.getRoomLists();
+        const roomLists = RoomListStoreTempProxy.getRoomLists();
 
         const tagNames = Object.keys(this._state.tags).sort();
         const prefixes = tagNames.map((name, i) => {
@@ -140,7 +140,7 @@ class CustomRoomTagStore extends EventEmitter {
             return;
         }
 
-        const newTagNames = Object.keys(RoomListStore.getRoomLists())
+        const newTagNames = Object.keys(RoomListStoreTempProxy.getRoomLists())
             .filter((tagName) => {
                 return !tagName.match(STANDARD_TAGS_REGEX);
             }).sort();
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index e217f7ea38..ccccbcc313 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -112,11 +112,19 @@ class RoomListStore extends Store {
     constructor() {
         super(dis);
 
+        this._checkDisabled();
         this._init();
         this._getManualComparator = this._getManualComparator.bind(this);
         this._recentsComparator = this._recentsComparator.bind(this);
     }
 
+    _checkDisabled() {
+        this.disabled = SettingsStore.isFeatureEnabled("feature_new_room_list");
+        if (this.disabled) {
+            console.warn("DISABLING LEGACY ROOM LIST STORE");
+        }
+    }
+
     /**
      * Changes the sorting algorithm used by the RoomListStore.
      * @param {string} algorithm The new algorithm to use. Should be one of the ALGO_* constants.
@@ -133,6 +141,8 @@ class RoomListStore extends Store {
     }
 
     _init() {
+        if (this.disabled) return;
+
         // Initialise state
         const defaultLists = {
             "m.server_notice": [/* { room: js-sdk room, category: string } */],
@@ -160,6 +170,8 @@ class RoomListStore extends Store {
     }
 
     _setState(newState) {
+        if (this.disabled) return;
+
         // If we're changing the lists, transparently change the presentation lists (which
         // is given to requesting components). This dramatically simplifies our code elsewhere
         // while also ensuring we don't need to update all the calling components to support
@@ -176,6 +188,8 @@ class RoomListStore extends Store {
     }
 
     __onDispatch(payload) {
+        if (this.disabled) return;
+
         const logicallyReady = this._matrixClient && this._state.ready;
         switch (payload.action) {
             case 'setting_updated': {
@@ -202,6 +216,9 @@ class RoomListStore extends Store {
                     break;
                 }
 
+                this._checkDisabled();
+                if (this.disabled) return;
+
                 // Always ensure that we set any state needed for settings here. It is possible that
                 // setting updates trigger on startup before we are ready to sync, so we want to make
                 // sure that the right state is in place before we actually react to those changes.
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
new file mode 100644
index 0000000000..70d6d4a598
--- /dev/null
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -0,0 +1,213 @@
+/*
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {Store} from 'flux/utils';
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
+import SettingsStore from "../../settings/SettingsStore";
+import { OrderedDefaultTagIDs, DefaultTagID, TagID } from "./models";
+import { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/IAlgorithm";
+import TagOrderStore from "../TagOrderStore";
+import { getAlgorithmInstance } from "./algorithms";
+
+interface IState {
+    tagsEnabled?: boolean;
+
+    preferredSort?: SortAlgorithm;
+    preferredAlgorithm?: ListAlgorithm;
+}
+
+class _RoomListStore extends Store<ActionPayload> {
+    private state: IState = {};
+    private matrixClient: MatrixClient;
+    private initialListsGenerated = false;
+    private enabled = false;
+    private algorithm: IAlgorithm;
+
+    private readonly watchedSettings = [
+        'RoomList.orderAlphabetically',
+        'RoomList.orderByImportance',
+        'feature_custom_tags',
+    ];
+
+    constructor() {
+        super(defaultDispatcher);
+
+        this.checkEnabled();
+        this.reset();
+        for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
+    }
+
+    public get orderedLists(): ITagMap {
+        if (!this.algorithm) return {}; // No tags yet.
+        return this.algorithm.getOrderedRooms();
+    }
+
+    // TODO: Remove enabled flag when the old RoomListStore goes away
+    private checkEnabled() {
+        this.enabled = SettingsStore.isFeatureEnabled("feature_new_room_list");
+        if (this.enabled) {
+            console.log("ENABLING NEW ROOM LIST STORE");
+        }
+    }
+
+    private reset(): void {
+        // We don't call setState() because it'll cause changes to emitted which could
+        // crash the app during logout/signin/etc.
+        this.state = {};
+    }
+
+    private readAndCacheSettingsFromStore() {
+        const tagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
+        const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
+        const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
+        this.setState({
+            tagsEnabled,
+            preferredSort: orderAlphabetically ? SortAlgorithm.Alphabetic : SortAlgorithm.Recent,
+            preferredAlgorithm: orderByImportance ? ListAlgorithm.Importance : ListAlgorithm.Natural,
+        });
+        this.setAlgorithmClass();
+    }
+
+    protected __onDispatch(payload: ActionPayload): void {
+        if (payload.action === 'MatrixActions.sync') {
+            // Filter out anything that isn't the first PREPARED sync.
+            if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
+                return;
+            }
+
+            this.checkEnabled();
+            if (!this.enabled) return;
+
+            this.matrixClient = payload.matrixClient;
+
+            // Update any settings here, as some may have happened before we were logically ready.
+            this.readAndCacheSettingsFromStore();
+
+            // noinspection JSIgnoredPromiseFromCall
+            this.regenerateAllLists();
+        }
+
+        // TODO: Remove this once the RoomListStore becomes default
+        if (!this.enabled) return;
+
+        if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
+            // Reset state without causing updates as the client will have been destroyed
+            // and downstream code will throw NPE errors.
+            this.reset();
+            this.matrixClient = null;
+            this.initialListsGenerated = false; // we'll want to regenerate them
+        }
+
+        // Everything below here requires a MatrixClient or some sort of logical readiness.
+        const logicallyReady = this.matrixClient && this.initialListsGenerated;
+        if (!logicallyReady) return;
+
+        if (payload.action === 'setting_updated') {
+            if (this.watchedSettings.includes(payload.settingName)) {
+                this.readAndCacheSettingsFromStore();
+
+                // noinspection JSIgnoredPromiseFromCall
+                this.regenerateAllLists(); // regenerate the lists now
+            }
+        } else if (payload.action === 'MatrixActions.Room.receipt') {
+            // First see if the receipt event is for our own user. If it was, trigger
+            // a room update (we probably read the room on a different device).
+            const myUserId = this.matrixClient.getUserId();
+            for (const eventId of Object.keys(payload.event.getContent())) {
+                const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
+                if (receiptUsers.includes(myUserId)) {
+                    // TODO: Update room now that it's been read
+                    return;
+                }
+            }
+        } else if (payload.action === 'MatrixActions.Room.tags') {
+            // TODO: Update room from tags
+        } else if (payload.action === 'MatrixActions.room.timeline') {
+            // TODO: Update room from new events
+        } else if (payload.action === 'MatrixActions.Event.decrypted') {
+            // TODO: Update room from decrypted event
+        } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
+            // TODO: Update DMs
+        } else if (payload.action === 'MatrixActions.Room.myMembership') {
+            // TODO: Update room from membership change
+        } else if (payload.action === 'MatrixActions.room') {
+            // TODO: Update room from creation/join
+        } else if (payload.action === 'view_room') {
+            // TODO: Update sticky room
+        }
+    }
+
+    private getSortAlgorithmFor(tagId: TagID): SortAlgorithm {
+        switch (tagId) {
+            case DefaultTagID.Invite:
+            case DefaultTagID.Untagged:
+            case DefaultTagID.Archived:
+            case DefaultTagID.LowPriority:
+            case DefaultTagID.DM:
+                return this.state.preferredSort;
+            case DefaultTagID.Favourite:
+            default:
+                return SortAlgorithm.Manual;
+        }
+    }
+
+    private setState(newState: IState) {
+        if (!this.enabled) return;
+
+        this.state = Object.assign(this.state, newState);
+        this.__emitChange();
+    }
+
+    private setAlgorithmClass() {
+        this.algorithm = getAlgorithmInstance(this.state.preferredAlgorithm);
+    }
+
+    private async regenerateAllLists() {
+        console.log("REGEN");
+        const tags: ITagSortingMap = {};
+        for (const tagId of OrderedDefaultTagIDs) {
+            tags[tagId] = this.getSortAlgorithmFor(tagId);
+        }
+
+        if (this.state.tagsEnabled) {
+            // TODO: Find a more reliable way to get tags
+            const roomTags = TagOrderStore.getOrderedTags() || [];
+            console.log("rtags", roomTags);
+        }
+
+        await this.algorithm.populateTags(tags);
+        await this.algorithm.setKnownRooms(this.matrixClient.getRooms());
+
+        this.initialListsGenerated = true;
+
+        // TODO: How do we asynchronously update the store's state? or do we just give in and make it all sync?
+    }
+}
+
+export default class RoomListStore {
+    private static internalInstance: _RoomListStore;
+
+    public static get instance(): _RoomListStore {
+        if (!RoomListStore.internalInstance) {
+            RoomListStore.internalInstance = new _RoomListStore();
+        }
+
+        return RoomListStore.internalInstance;
+    }
+}
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
new file mode 100644
index 0000000000..7b12602541
--- /dev/null
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { TagID } from "./models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import SettingsStore from "../../settings/SettingsStore";
+import RoomListStore from "./RoomListStore2";
+import OldRoomListStore from "../RoomListStore";
+
+/**
+ * Temporary RoomListStore proxy. Should be replaced with RoomListStore2 when
+ * it is available to everyone.
+ *
+ * TODO: Remove this when RoomListStore gets fully replaced.
+ */
+export class RoomListStoreTempProxy {
+    public static isUsingNewStore(): boolean {
+        return SettingsStore.isFeatureEnabled("feature_new_room_list");
+    }
+
+    public static addListener(handler: () => void) {
+        if (RoomListStoreTempProxy.isUsingNewStore()) {
+            return RoomListStore.instance.addListener(handler);
+        } else {
+            return OldRoomListStore.addListener(handler);
+        }
+    }
+
+    public static getRoomLists(): {[tagId in TagID]: Room[]} {
+        if (RoomListStoreTempProxy.isUsingNewStore()) {
+            return RoomListStore.instance.orderedLists;
+        } else {
+            return OldRoomListStore.getRoomLists();
+        }
+    }
+}
diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
new file mode 100644
index 0000000000..4fe5125a15
--- /dev/null
+++ b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
@@ -0,0 +1,100 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm } from "./IAlgorithm";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { DefaultTagID } from "../models";
+
+/**
+ * A demonstration/temporary algorithm to verify the API surface works.
+ * TODO: Remove this before shipping
+ */
+export class ChaoticAlgorithm implements IAlgorithm {
+
+    private cached: ITagMap = {};
+    private sortAlgorithms: ITagSortingMap;
+    private rooms: Room[] = [];
+
+    constructor(private representativeAlgorithm: ListAlgorithm) {
+    }
+
+    getOrderedRooms(): ITagMap {
+        return this.cached;
+    }
+
+    async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
+        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
+        this.sortAlgorithms = tagSortingMap;
+        this.setKnownRooms(this.rooms); // regenerate the room lists
+    }
+
+    handleRoomUpdate(room): Promise<boolean> {
+        return undefined;
+    }
+
+    setKnownRooms(rooms: Room[]): Promise<any> {
+        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
+        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
+
+        this.rooms = rooms;
+
+        const newTags = {};
+        for (const tagId in this.sortAlgorithms) {
+            // noinspection JSUnfilteredForInLoop
+            newTags[tagId] = [];
+        }
+
+        // If we can avoid doing work, do so.
+        if (!rooms.length) {
+            this.cached = newTags;
+            return;
+        }
+
+        // TODO: Remove logging
+        console.log('setting known rooms - regen in progress');
+        console.log({alg: this.representativeAlgorithm});
+
+        // Step through each room and determine which tags it should be in.
+        // We don't care about ordering or sorting here - we're simply organizing things.
+        for (const room of rooms) {
+            const tags = room.tags;
+            let inTag = false;
+            for (const tagId in tags) {
+                // noinspection JSUnfilteredForInLoop
+                if (isNullOrUndefined(newTags[tagId])) {
+                    // skip the tag if we don't know about it
+                    continue;
+                }
+
+                inTag = true;
+
+                // noinspection JSUnfilteredForInLoop
+                newTags[tagId].push(room);
+            }
+
+            // If the room wasn't pushed to a tag, push it to the untagged tag.
+            if (!inTag) {
+                newTags[DefaultTagID.Untagged].push(room);
+            }
+        }
+
+        // TODO: Do sorting
+
+        // Finally, assign the tags to our cache
+        this.cached = newTags;
+    }
+}
diff --git a/src/stores/room-list/algorithms/IAlgorithm.ts b/src/stores/room-list/algorithms/IAlgorithm.ts
new file mode 100644
index 0000000000..fbe2f7a27d
--- /dev/null
+++ b/src/stores/room-list/algorithms/IAlgorithm.ts
@@ -0,0 +1,95 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { TagID } from "../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+
+export enum SortAlgorithm {
+    Manual = "MANUAL",
+    Alphabetic = "ALPHABETIC",
+    Recent = "RECENT",
+}
+
+export enum ListAlgorithm {
+    // Orders Red > Grey > Bold > Idle
+    Importance = "IMPORTANCE",
+
+    // Orders however the SortAlgorithm decides
+    Natural = "NATURAL",
+}
+
+export enum Category {
+    Red = "RED",
+    Grey = "GREY",
+    Bold = "BOLD",
+    Idle = "IDLE",
+}
+
+export interface ITagSortingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: SortAlgorithm;
+}
+
+export interface ITagMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: Room[];
+}
+
+// TODO: Convert IAlgorithm to an abstract class?
+// TODO: Add locking support to avoid concurrent writes
+// TODO: EventEmitter support
+
+/**
+ * Represents an algorithm for the RoomListStore to use
+ */
+export interface IAlgorithm {
+    /**
+     * Asks the Algorithm to regenerate all lists, using the tags given
+     * as reference for which lists to generate and which way to generate
+     * them.
+     * @param {ITagSortingMap} tagSortingMap The tags to generate.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    populateTags(tagSortingMap: ITagSortingMap): Promise<any>;
+
+    /**
+     * Gets an ordered set of rooms for the all known tags.
+     * @returns {ITagMap} The cached list of rooms, ordered,
+     * for each tag. May be empty, but never null/undefined.
+     */
+    getOrderedRooms(): ITagMap;
+
+    /**
+     * Seeds the Algorithm with a set of rooms. The algorithm will discard all
+     * previously known information and instead use these rooms instead.
+     * @param {Room[]} rooms The rooms to force the algorithm to use.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    setKnownRooms(rooms: Room[]): Promise<any>;
+
+    /**
+     * Asks the Algorithm to update its knowledge of a room. For example, when
+     * a user tags a room, joins/creates a room, or leaves a room the Algorithm
+     * should be told that the room's info might have changed. The Algorithm
+     * may no-op this request if no changes are required.
+     * @param {Room} room The room which might have affected sorting.
+     * @returns {Promise<boolean>} A promise which resolve to true or false
+     * depending on whether or not getOrderedRooms() should be called after
+     * processing.
+     */
+    handleRoomUpdate(room: Room): Promise<boolean>;
+}
diff --git a/src/stores/room-list/algorithms/index.ts b/src/stores/room-list/algorithms/index.ts
new file mode 100644
index 0000000000..cb67d42187
--- /dev/null
+++ b/src/stores/room-list/algorithms/index.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { IAlgorithm, ListAlgorithm } from "./IAlgorithm";
+import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
+
+const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => IAlgorithm } = {
+    [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(ListAlgorithm.Natural),
+    [ListAlgorithm.Importance]: () => new ChaoticAlgorithm(ListAlgorithm.Importance),
+};
+
+/**
+ * Gets an instance of the defined algorithm
+ * @param {ListAlgorithm} algorithm The algorithm to get an instance of.
+ * @returns {IAlgorithm} The algorithm instance.
+ */
+export function getAlgorithmInstance(algorithm: ListAlgorithm): IAlgorithm {
+    if (!ALGORITHM_FACTORIES[algorithm]) {
+        throw new Error(`${algorithm} is not a known algorithm`);
+    }
+
+    return ALGORITHM_FACTORIES[algorithm]();
+}
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
new file mode 100644
index 0000000000..d1c915e035
--- /dev/null
+++ b/src/stores/room-list/models.ts
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+export enum DefaultTagID {
+    Invite = "im.vector.fake.invite",
+    Untagged = "im.vector.fake.recent", // legacy: used to just be 'recent rooms' but now it's all untagged rooms
+    Archived = "im.vector.fake.archived",
+    LowPriority = "m.lowpriority",
+    Favourite = "m.favourite",
+    DM = "im.vector.fake.direct",
+    ServerNotice = "m.server_notice",
+}
+export const OrderedDefaultTagIDs = [
+    DefaultTagID.Invite,
+    DefaultTagID.Favourite,
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+    DefaultTagID.LowPriority,
+    DefaultTagID.ServerNotice,
+    DefaultTagID.Archived,
+];
+
+export type TagID = string | DefaultTagID;
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 8dc4647920..7bcd2a8ae3 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -14,7 +14,7 @@ import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
 import GroupStore from '../../../../src/stores/GroupStore.js';
 
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
-import {TAG_DM} from "../../../../src/stores/RoomListStore";
+import {DefaultTagID} from "../../../../src/stores/room-list/models";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
@@ -153,7 +153,7 @@ describe('RoomList', () => {
         // Set up the room that will be moved such that it has the correct state for a room in
         // the section for oldTag
         if (['m.favourite', 'm.lowpriority'].includes(oldTag)) movingRoom.tags = {[oldTag]: {}};
-        if (oldTag === TAG_DM) {
+        if (oldTag === DefaultTagID.DM) {
             // Mock inverse m.direct
             DMRoomMap.shared().roomToUser = {
                 [movingRoom.roomId]: '@someotheruser:domain',
@@ -180,7 +180,7 @@ describe('RoomList', () => {
         // TODO: Re-enable dragging tests when we support dragging again.
         describe.skip('does correct optimistic update when dragging from', () => {
             it('rooms to people', () => {
-                expectCorrectMove(undefined, TAG_DM);
+                expectCorrectMove(undefined, DefaultTagID.DM);
             });
 
             it('rooms to favourites', () => {
@@ -195,15 +195,15 @@ describe('RoomList', () => {
             // Whe running the app live, it updates when some other event occurs (likely the
             // m.direct arriving) that these tests do not fire.
             xit('people to rooms', () => {
-                expectCorrectMove(TAG_DM, undefined);
+                expectCorrectMove(DefaultTagID.DM, undefined);
             });
 
             it('people to favourites', () => {
-                expectCorrectMove(TAG_DM, 'm.favourite');
+                expectCorrectMove(DefaultTagID.DM, 'm.favourite');
             });
 
             it('people to lowpriority', () => {
-                expectCorrectMove(TAG_DM, 'm.lowpriority');
+                expectCorrectMove(DefaultTagID.DM, 'm.lowpriority');
             });
 
             it('low priority to rooms', () => {
@@ -211,7 +211,7 @@ describe('RoomList', () => {
             });
 
             it('low priority to people', () => {
-                expectCorrectMove('m.lowpriority', TAG_DM);
+                expectCorrectMove('m.lowpriority', DefaultTagID.DM);
             });
 
             it('low priority to low priority', () => {
@@ -223,7 +223,7 @@ describe('RoomList', () => {
             });
 
             it('favourites to people', () => {
-                expectCorrectMove('m.favourite', TAG_DM);
+                expectCorrectMove('m.favourite', DefaultTagID.DM);
             });
 
             it('favourites to low priority', () => {
diff --git a/tsconfig.json b/tsconfig.json
index b87f640734..8a01ca335e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "jsx": "react",
     "types": [
       "node",
-      "react"
+      "react",
+      "flux"
     ]
   },
   "include": [
diff --git a/yarn.lock b/yarn.lock
index b0d3816dc4..6375c745fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1218,6 +1218,19 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/fbemitter@*":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
+  integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
+
+"@types/flux@^3.1.9":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.9.tgz#ddfc9641ee2e2e6cb6cd730c6a48ef82e2076711"
+  integrity sha512-bSbDf4tTuN9wn3LTGPnH9wnSSLtR5rV7UPWFpM00NJ1pSTBwCzeZG07XsZ9lBkxwngrqjDtM97PLt5IuIdCQUA==
+  dependencies:
+    "@types/fbemitter" "*"
+    "@types/react" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"

From 861268d39f4dd612f1ad2e02a7f1097d1f590be4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 27 Apr 2020 15:25:04 -0600
Subject: [PATCH 2981/3235] Invent an AsyncStore and use it for room lists

This is to get around the problem of a slow dispatch loop. Instead of slowing the whole app down to deal with room lists, we'll just raise events to say we're ready.

Based upon the EventEmitter class.
---
 package.json                                  |   1 +
 src/components/views/rooms/RoomList2.tsx      |   6 +-
 src/stores/AsyncStore.ts                      | 105 ++++++++++++++++++
 src/stores/room-list/RoomListStore2.ts        |  55 +++++----
 .../room-list/RoomListStoreTempProxy.ts       |   6 +-
 .../room-list/algorithms/ChaoticAlgorithm.ts  |   1 -
 yarn.lock                                     |   5 +
 7 files changed, 144 insertions(+), 35 deletions(-)
 create mode 100644 src/stores/AsyncStore.ts

diff --git a/package.json b/package.json
index 22ff071ba7..2dfb366972 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.8.3",
+    "await-lock": "^2.0.1",
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 1790fa8cf6..f97f599ae3 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -21,7 +21,7 @@ import { _t } from "../../../languageHandler";
 import { Layout } from '../../../resizer/distributors/roomsublist2';
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
 import { ResizeNotifier } from "../../../utils/ResizeNotifier";
-import RoomListStore from "../../../stores/room-list/RoomListStore2";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore2";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -56,8 +56,8 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        RoomListStore.instance.addListener(() => {
-            console.log(RoomListStore.instance.orderedLists);
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, (store) => {
+            console.log("new lists", store.orderedLists);
         });
     }
 
diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
new file mode 100644
index 0000000000..5e19e17248
--- /dev/null
+++ b/src/stores/AsyncStore.ts
@@ -0,0 +1,105 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { EventEmitter } from 'events';
+import AwaitLock from 'await-lock';
+import { ActionPayload } from "../dispatcher-types";
+import { Dispatcher } from "flux";
+
+/**
+ * The event/channel to listen for in an AsyncStore.
+ */
+export const UPDATE_EVENT = "update";
+
+/**
+ * Represents a minimal store which works similar to Flux stores. Instead
+ * of everything needing to happen in a dispatch cycle, everything can
+ * happen async to that cycle.
+ *
+ * The store's core principle is Object.assign(), therefore it is recommended
+ * to break out your state to be as safe as possible. The state mutations are
+ * also locked, preventing concurrent writes.
+ *
+ * All updates to the store happen on the UPDATE_EVENT event channel with the
+ * one argument being the instance of the store.
+ *
+ * To update the state, use updateState() and preferably await the result to
+ * help prevent lock conflicts.
+ */
+export abstract class AsyncStore<T extends Object> extends EventEmitter {
+    private storeState: T = <T>{};
+    private lock = new AwaitLock();
+    private readonly dispatcherRef: string;
+
+    /**
+     * Creates a new AsyncStore using the given dispatcher.
+     * @param {Dispatcher<ActionPayload>} dispatcher The dispatcher to rely upon.
+     */
+    protected constructor(private dispatcher: Dispatcher<ActionPayload>) {
+        super();
+
+        this.dispatcherRef = dispatcher.register(this.onDispatch.bind(this));
+    }
+
+    /**
+     * The current state of the store. Cannot be mutated.
+     */
+    protected get state(): T {
+        return Object.freeze(this.storeState);
+    }
+
+    /**
+     * Stops the store's listening functions, such as the listener to the dispatcher.
+     */
+    protected stop() {
+        if (this.dispatcherRef) this.dispatcher.unregister(this.dispatcherRef);
+    }
+
+    /**
+     * Updates the state of the store.
+     * @param {T|*} newState The state to update in the store using Object.assign()
+     */
+    protected async updateState(newState: T | Object) {
+        await this.lock.acquireAsync();
+        try {
+            this.storeState = Object.assign(<T>{}, this.storeState, newState);
+            this.emit(UPDATE_EVENT, this);
+        } finally {
+            await this.lock.release();
+        }
+    }
+
+    /**
+     * Resets the store's to the provided state or an empty object.
+     * @param {T|*} newState The new state of the store.
+     * @param {boolean} quiet If true, the function will not raise an UPDATE_EVENT.
+     */
+    protected async reset(newState: T | Object = null, quiet = false) {
+        await this.lock.acquireAsync();
+        try {
+            this.storeState = <T>(newState || {});
+            if (!quiet) this.emit(UPDATE_EVENT, this);
+        } finally {
+            await this.lock.release();
+        }
+    }
+
+    /**
+     * Called when the dispatcher broadcasts a dispatch event.
+     * @param {ActionPayload} payload The event being dispatched.
+     */
+    protected abstract onDispatch(payload: ActionPayload);
+}
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 70d6d4a598..7fab8c7ff9 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -15,15 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Store} from 'flux/utils';
-import {Room} from "matrix-js-sdk/src/models/room";
-import {MatrixClient} from "matrix-js-sdk/src/client";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
 import SettingsStore from "../../settings/SettingsStore";
-import { OrderedDefaultTagIDs, DefaultTagID, TagID } from "./models";
+import { DefaultTagID, OrderedDefaultTagIDs, TagID } from "./models";
 import { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/IAlgorithm";
 import TagOrderStore from "../TagOrderStore";
 import { getAlgorithmInstance } from "./algorithms";
+import { AsyncStore } from "../AsyncStore";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -32,8 +31,13 @@ interface IState {
     preferredAlgorithm?: ListAlgorithm;
 }
 
-class _RoomListStore extends Store<ActionPayload> {
-    private state: IState = {};
+/**
+ * The event/channel which is called when the room lists have been changed. Raised
+ * with one argument: the instance of the store.
+ */
+export const LISTS_UPDATE_EVENT = "lists_update";
+
+class _RoomListStore extends AsyncStore<ActionPayload> {
     private matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;
@@ -49,7 +53,6 @@ class _RoomListStore extends Store<ActionPayload> {
         super(defaultDispatcher);
 
         this.checkEnabled();
-        this.reset();
         for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
     }
 
@@ -66,17 +69,11 @@ class _RoomListStore extends Store<ActionPayload> {
         }
     }
 
-    private reset(): void {
-        // We don't call setState() because it'll cause changes to emitted which could
-        // crash the app during logout/signin/etc.
-        this.state = {};
-    }
-
-    private readAndCacheSettingsFromStore() {
+    private async readAndCacheSettingsFromStore() {
         const tagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
         const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
         const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
-        this.setState({
+        await this.updateState({
             tagsEnabled,
             preferredSort: orderAlphabetically ? SortAlgorithm.Alphabetic : SortAlgorithm.Recent,
             preferredAlgorithm: orderByImportance ? ListAlgorithm.Importance : ListAlgorithm.Natural,
@@ -84,23 +81,23 @@ class _RoomListStore extends Store<ActionPayload> {
         this.setAlgorithmClass();
     }
 
-    protected __onDispatch(payload: ActionPayload): void {
+    protected async onDispatch(payload: ActionPayload) {
         if (payload.action === 'MatrixActions.sync') {
             // Filter out anything that isn't the first PREPARED sync.
             if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
                 return;
             }
 
+            // TODO: Remove this once the RoomListStore becomes default
             this.checkEnabled();
             if (!this.enabled) return;
 
             this.matrixClient = payload.matrixClient;
 
             // Update any settings here, as some may have happened before we were logically ready.
-            this.readAndCacheSettingsFromStore();
-
-            // noinspection JSIgnoredPromiseFromCall
-            this.regenerateAllLists();
+            console.log("Regenerating room lists: Startup");
+            await this.readAndCacheSettingsFromStore();
+            await this.regenerateAllLists();
         }
 
         // TODO: Remove this once the RoomListStore becomes default
@@ -109,7 +106,7 @@ class _RoomListStore extends Store<ActionPayload> {
         if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
             // Reset state without causing updates as the client will have been destroyed
             // and downstream code will throw NPE errors.
-            this.reset();
+            this.reset(null, true);
             this.matrixClient = null;
             this.initialListsGenerated = false; // we'll want to regenerate them
         }
@@ -120,14 +117,15 @@ class _RoomListStore extends Store<ActionPayload> {
 
         if (payload.action === 'setting_updated') {
             if (this.watchedSettings.includes(payload.settingName)) {
-                this.readAndCacheSettingsFromStore();
+                console.log("Regenerating room lists: Settings changed");
+                await this.readAndCacheSettingsFromStore();
 
-                // noinspection JSIgnoredPromiseFromCall
-                this.regenerateAllLists(); // regenerate the lists now
+                await this.regenerateAllLists(); // regenerate the lists now
             }
         } else if (payload.action === 'MatrixActions.Room.receipt') {
             // First see if the receipt event is for our own user. If it was, trigger
             // a room update (we probably read the room on a different device).
+            // noinspection JSObjectNullOrUndefined - this.matrixClient can't be null by this point in the lifecycle
             const myUserId = this.matrixClient.getUserId();
             for (const eventId of Object.keys(payload.event.getContent())) {
                 const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
@@ -167,11 +165,10 @@ class _RoomListStore extends Store<ActionPayload> {
         }
     }
 
-    private setState(newState: IState) {
+    protected async updateState(newState: IState) {
         if (!this.enabled) return;
 
-        this.state = Object.assign(this.state, newState);
-        this.__emitChange();
+        await super.updateState(newState);
     }
 
     private setAlgorithmClass() {
@@ -179,7 +176,7 @@ class _RoomListStore extends Store<ActionPayload> {
     }
 
     private async regenerateAllLists() {
-        console.log("REGEN");
+        console.warn("Regenerating all room lists");
         const tags: ITagSortingMap = {};
         for (const tagId of OrderedDefaultTagIDs) {
             tags[tagId] = this.getSortAlgorithmFor(tagId);
@@ -196,7 +193,7 @@ class _RoomListStore extends Store<ActionPayload> {
 
         this.initialListsGenerated = true;
 
-        // TODO: How do we asynchronously update the store's state? or do we just give in and make it all sync?
+        this.emit(LISTS_UPDATE_EVENT, this);
     }
 }
 
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 7b12602541..88171c0809 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -19,6 +19,8 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "./RoomListStore2";
 import OldRoomListStore from "../RoomListStore";
+import { ITagMap } from "./algorithms/IAlgorithm";
+import { UPDATE_EVENT } from "../AsyncStore";
 
 /**
  * Temporary RoomListStore proxy. Should be replaced with RoomListStore2 when
@@ -33,13 +35,13 @@ export class RoomListStoreTempProxy {
 
     public static addListener(handler: () => void) {
         if (RoomListStoreTempProxy.isUsingNewStore()) {
-            return RoomListStore.instance.addListener(handler);
+            return RoomListStore.instance.on(UPDATE_EVENT, handler);
         } else {
             return OldRoomListStore.addListener(handler);
         }
     }
 
-    public static getRoomLists(): {[tagId in TagID]: Room[]} {
+    public static getRoomLists(): ITagMap {
         if (RoomListStoreTempProxy.isUsingNewStore()) {
             return RoomListStore.instance.orderedLists;
         } else {
diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
index 4fe5125a15..f72adb3aa8 100644
--- a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
@@ -65,7 +65,6 @@ export class ChaoticAlgorithm implements IAlgorithm {
         }
 
         // TODO: Remove logging
-        console.log('setting known rooms - regen in progress');
         console.log({alg: this.representativeAlgorithm});
 
         // Step through each room and determine which tags it should be in.
diff --git a/yarn.lock b/yarn.lock
index 6375c745fc..80c7e581a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1834,6 +1834,11 @@ autoprefixer@^9.0.0:
     postcss "^7.0.27"
     postcss-value-parser "^4.0.3"
 
+await-lock@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.0.1.tgz#b3f65fdf66e08f7538260f79b46c15bcfc18cadd"
+  integrity sha512-ntLi9fzlMT/vWjC1wwVI11/cSRJ3nTS35qVekNc9WnaoMOP2eWH0RvIqwLQkDjX4a4YynsKEv+Ere2VONp9wxg==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"

From becaddeb80c54014473604b73d3f99d452a57916 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Apr 2020 14:12:58 -0600
Subject: [PATCH 2982/3235] Categorize rooms by effective membership

---
 .../room-list/algorithms/ChaoticAlgorithm.ts  |  4 +-
 src/stores/room-list/membership.ts            | 73 +++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/stores/room-list/membership.ts

diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
index f72adb3aa8..9dfe6f6205 100644
--- a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
@@ -18,6 +18,7 @@ import { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm } from "./IAlgorithm
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { DefaultTagID } from "../models";
+import { splitRoomsByMembership } from "../membership";
 
 /**
  * A demonstration/temporary algorithm to verify the API surface works.
@@ -65,7 +66,8 @@ export class ChaoticAlgorithm implements IAlgorithm {
         }
 
         // TODO: Remove logging
-        console.log({alg: this.representativeAlgorithm});
+        const memberships = splitRoomsByMembership(rooms);
+        console.log({alg: this.representativeAlgorithm, memberships});
 
         // Step through each room and determine which tags it should be in.
         // We don't care about ordering or sorting here - we're simply organizing things.
diff --git a/src/stores/room-list/membership.ts b/src/stores/room-list/membership.ts
new file mode 100644
index 0000000000..884e2a4a04
--- /dev/null
+++ b/src/stores/room-list/membership.ts
@@ -0,0 +1,73 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {Room} from "matrix-js-sdk/src/models/room";
+import {Event} from "matrix-js-sdk/src/models/event";
+
+/**
+ * Approximation of a membership status for a given room.
+ */
+export enum EffectiveMembership {
+    /**
+     * The user is effectively joined to the room. For example, actually joined
+     * or knocking on the room (when that becomes possible).
+     */
+    Join = "JOIN",
+
+    /**
+     * The user is effectively invited to the room. Currently this is a direct map
+     * to the invite membership as no other membership states are effectively
+     * invites.
+     */
+    Invite = "INVITE",
+
+    /**
+     * The user is effectively no longer in the room. For example, kicked,
+     * banned, or voluntarily left.
+     */
+    Leave = "LEAVE",
+}
+
+export interface MembershipSplit {
+    // @ts-ignore - TS wants this to be a string key, but we know better.
+    [state: EffectiveMembership]: Room[];
+}
+
+export function splitRoomsByMembership(rooms: Room[]): MembershipSplit {
+    const split: MembershipSplit = {
+        [EffectiveMembership.Invite]: [],
+        [EffectiveMembership.Join]: [],
+        [EffectiveMembership.Leave]: [],
+    };
+
+    for (const room of rooms) {
+        split[getEffectiveMembership(room.getMyMembership())].push(room);
+    }
+
+    return split;
+}
+
+export function getEffectiveMembership(membership: string): EffectiveMembership {
+    if (membership === 'invite') {
+        return EffectiveMembership.Invite;
+    } else if (membership === 'join') {
+        // TODO: Do the same for knock? Update docs as needed in the enum.
+        return EffectiveMembership.Join;
+    } else {
+        // Probably a leave, kick, or ban
+        return EffectiveMembership.Leave;
+    }
+}

From 00d400b516ef35c2121132ecdee657355783d3a9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Apr 2020 20:36:42 -0600
Subject: [PATCH 2983/3235] Possible framework for a proof of concept

This is the fruits of about 3 attempts to write code that works. None of those attempts are here, but how edition 4 could work is at least documented now.
---
 src/stores/room-list/README.md                | 117 +++++++++++
 src/stores/room-list/TagManager.ts            |  32 +++
 .../room-list/algorithms/ChaoticAlgorithm.ts  |   1 +
 src/stores/room-list/algorithms/IAlgorithm.ts |   9 +-
 .../algorithms/ImportanceAlgorithm.ts         | 189 ++++++++++++++++++
 src/stores/room-list/algorithms/index.ts      |   3 +-
 6 files changed, 342 insertions(+), 9 deletions(-)
 create mode 100644 src/stores/room-list/README.md
 create mode 100644 src/stores/room-list/TagManager.ts
 create mode 100644 src/stores/room-list/algorithms/ImportanceAlgorithm.ts

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
new file mode 100644
index 0000000000..ed13210420
--- /dev/null
+++ b/src/stores/room-list/README.md
@@ -0,0 +1,117 @@
+# Room list sorting
+
+It's so complicated it needs its own README.
+
+## Algorithms involved
+
+There's two main kinds of algorithms involved in the room list store: list ordering and tag sorting.
+Throughout the code an intentional decision has been made to call them the List Algorithm and Sorting
+Algorithm respectively. The list algorithm determines the behaviour of the room list whereas the sorting
+algorithm determines how individual tags (lists of rooms, sometimes called sublists) are ordered.
+
+Behaviour of the room list takes the shape of default sorting on tags in most cases, though it can
+override what is happening at the tag level depending on the algorithm used (as is the case with the
+importance algorithm, described later).
+
+Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
+the power to decide when and how to apply the tag sorting, if at all.
+
+### Tag sorting algorithm: Alphabetical
+
+When used, rooms in a given tag will be sorted alphabetically, where the alphabet is determined by a
+simple string comparison operation (essentially giving the browser the problem of figuring out if A
+comes before Z).
+
+### Tag sorting algorithm: Manual
+
+Manual sorting makes use of the `order` property present on all tags for a room, per the 
+[Matrix specification](https://matrix.org/docs/spec/client_server/r0.6.0#room-tagging). Smaller values
+of `order` cause rooms to appear closer to the top of the list.
+
+### Tag sorting algorithm: Recent
+
+Rooms are ordered by the timestamp of the most recent useful message. Usefulness is yet another algorithm
+in the room list system which determines whether an event type is capable of bubbling up in the room list.
+Normally events like room messages, stickers, and room security changes will be considered useful enough
+to cause a shift in time.
+
+Note that this is reliant on the event timestamps of the most recent message. Because Matrix is eventually
+consistent this means that from time to time a room might plummet or skyrocket across the tag due to the
+timestamp contained within the event (generated server-side by the sender's server).
+
+### List ordering algorithm: Natural
+
+This is the easiest of the algorithms to understand because it does essentially nothing. It imposes no
+behavioural changes over the tag sorting algorithm and is by far the simplest way to order a room list.
+Historically, it's been the only option in Riot and extremely common in most chat applications due to
+its relative deterministic behaviour.
+
+### List ordering algorithm: Importance
+
+On the other end of the spectrum, this is the most complicated algorithm which exists. There's major
+behavioural changes and the tag sorting algorithm is selectively applied depending on circumstances.
+
+Each tag which is not manually ordered gets split into 4 sections or "categories". Manually ordered tags
+simply get the manual sorting algorithm applied to them with no further involvement from the importance
+algorithm. There are 4 categories: Red, Grey, Bold, and Idle. Each has their own definition based off
+relative (perceived) importance to the user:
+
+* **Red**: The room has unread mentions waiting for the user.
+* **Grey**: The room has unread notifications waiting for the user. Notifications are simply unread
+  messages which cause a push notification or badge count. Typically this is the default as rooms are
+  set to 'All Messages'.
+* **Bold**: The room has unread messages waiting for the user. Essentially this is a grey room without
+  a badge/notification count (or 'Mentions Only'/'Muted').
+* **Idle**: No relevant activity has occurred in the room since the user last read it.
+
+Conveniently, each tag is ordered by those categories as presented: red rooms appear above grey, grey
+above idle, etc.
+
+Once the algorithm has determined which rooms belong in which categories, the tag sorting algorithm
+is applied to each category in a sub-sub-list fashion. This should result in the red rooms (for example)
+being sorted alphabetically amongst each other and the grey rooms sorted amongst each other, but 
+collectively the tag will be sorted into categories with red being at the top.
+
+The algorithm also has a concept of a 'sticky' room which is the room the user is currently viewing.
+The sticky room will remain in position on the room list regardless of other factors going on as typically
+clicking on a room will cause it to change categories into 'idle'. This is done by preserving N rooms
+above the selected room at all times where N is the number of rooms above the selected rooms when it was
+selected.
+
+For example, if the user has 3 red rooms and selects the middle room, they will always see exactly one
+room above their selection at all times. If they receive another notification and the tag ordering is set
+to Recent, they'll see the new notification go to the top position and the one that was previously there
+fall behind the sticky room.
+
+The sticky room's category is technically 'idle' while being viewed and is explicitly pulled out of the
+tag sorting algorithm's input as it must maintain its position in the list. When the user moves to another
+room, the previous sticky room is recalculated to determine which category it needs to be in as the user
+could have been scrolled up while new messages were received.
+
+Further, the sticky room is not aware of category boundaries and thus the user can see a shift in what 
+kinds of rooms move around their selection. An example would be the user having 4 red rooms, the user 
+selecting the third room (leaving 2 above it), and then having the rooms above it read on another device. 
+This would result in 1 red room and 1 other kind of room above the sticky room as it will try to maintain 
+2 rooms above the sticky room.
+
+An exception for the sticky room placement is when there's suddenly not enough rooms to maintain the placement
+exactly. This typically happens if the user selects a room and leaves enough rooms where it cannot maintain
+the N required rooms above the sticky room. In this case, the sticky room will simply decrease N as needed.
+The N value will never increase while selection remains unchanged: adding a bunch of rooms after having 
+put the sticky room in a position where it's had to decrease N will not increase N.
+
+## Responsibilities of the store
+
+The store is responsible for the ordering, upkeep, and tracking of all rooms. The component simply gets 
+an object containing the tags it needs to worry about and the rooms within. The room list component will 
+decide which tags need rendering (as it commonly filters out empty tags in most cases), and will deal with 
+all kinds of filtering.
+
+## Class breakdowns
+
+The `RoomListStore` is the major coordinator of various `IAlgorithm` implementations, which take care 
+of the various `ListAlgorithm` and `SortingAlgorithm` options. A `TagManager` is responsible for figuring 
+out which tags get which rooms, as Matrix specifies them as a reverse map: tags are defined on rooms and 
+are not defined as a collection of rooms (unlike how they are presented to the user). Various list-specific 
+utilities are also included, though they are expected to move somewhere more general when needed. For 
+example, the `membership` utilities could easily be moved elsewhere as needed.
diff --git a/src/stores/room-list/TagManager.ts b/src/stores/room-list/TagManager.ts
new file mode 100644
index 0000000000..368c4e2c21
--- /dev/null
+++ b/src/stores/room-list/TagManager.ts
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 {EventEmitter} from "events";
+
+// TODO: Docs on what this is
+export class TagManager extends EventEmitter {
+    constructor() {
+        super();
+    }
+
+    // TODO: Implementation.
+    // This will need to track where rooms belong in tags, and which tags they
+    // should be tracked within. This is algorithm independent because all the
+    // algorithms need to know what each tag contains.
+    //
+    // This will likely make use of the effective membership to determine the
+    // invite+historical sections.
+}
diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
index 9dfe6f6205..1b640669c0 100644
--- a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
@@ -31,6 +31,7 @@ export class ChaoticAlgorithm implements IAlgorithm {
     private rooms: Room[] = [];
 
     constructor(private representativeAlgorithm: ListAlgorithm) {
+        console.log("Constructed a ChaoticAlgorithm");
     }
 
     getOrderedRooms(): ITagMap {
diff --git a/src/stores/room-list/algorithms/IAlgorithm.ts b/src/stores/room-list/algorithms/IAlgorithm.ts
index fbe2f7a27d..ab5c4742df 100644
--- a/src/stores/room-list/algorithms/IAlgorithm.ts
+++ b/src/stores/room-list/algorithms/IAlgorithm.ts
@@ -32,13 +32,6 @@ export enum ListAlgorithm {
     Natural = "NATURAL",
 }
 
-export enum Category {
-    Red = "RED",
-    Grey = "GREY",
-    Bold = "BOLD",
-    Idle = "IDLE",
-}
-
 export interface ITagSortingMap {
     // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
     [tagId: TagID]: SortAlgorithm;
@@ -50,7 +43,7 @@ export interface ITagMap {
 }
 
 // TODO: Convert IAlgorithm to an abstract class?
-// TODO: Add locking support to avoid concurrent writes
+// TODO: Add locking support to avoid concurrent writes?
 // TODO: EventEmitter support
 
 /**
diff --git a/src/stores/room-list/algorithms/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
new file mode 100644
index 0000000000..0a2184eb43
--- /dev/null
+++ b/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
@@ -0,0 +1,189 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { IAlgorithm, ITagMap, ITagSortingMap } from "./IAlgorithm";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { DefaultTagID, TagID } from "../models";
+import { splitRoomsByMembership } from "../membership";
+
+/**
+ * The determined category of a room.
+ */
+export enum Category {
+    /**
+     * The room has unread mentions within.
+     */
+    Red = "RED",
+    /**
+     * The room has unread notifications within. Note that these are not unread
+     * mentions - they are simply messages which the user has asked to cause a
+     * badge count update or push notification.
+     */
+    Grey = "GREY",
+    /**
+     * The room has unread messages within (grey without the badge).
+     */
+    Bold = "BOLD",
+    /**
+     * The room has no relevant unread messages within.
+     */
+    Idle = "IDLE",
+}
+
+/**
+ * An implementation of the "importance" algorithm for room list sorting. Where
+ * the tag sorting algorithm does not interfere, rooms will be ordered into
+ * categories of varying importance to the user. Alphabetical sorting does not
+ * interfere with this algorithm, however manual ordering does.
+ *
+ * The importance of a room is defined by the kind of notifications, if any, are
+ * present on the room. These are classified internally as Red, Grey, Bold, and
+ * Idle. Red rooms have mentions, grey have unread messages, bold is a less noisy
+ * version of grey, and idle means all activity has been seen by the user.
+ *
+ * The algorithm works by monitoring all room changes, including new messages in
+ * tracked rooms, to determine if it needs a new category or different placement
+ * within the same category. For more information, see the comments contained
+ * within the class.
+ */
+export class ImportanceAlgorithm implements IAlgorithm {
+
+    // HOW THIS WORKS
+    // --------------
+    //
+    // This block of comments assumes you've read the README one level higher.
+    // You should do that if you haven't already.
+    //
+    // Tags are fed into the algorithmic functions from the TagManager changes,
+    // which cause subsequent updates to the room list itself. Categories within
+    // those tags are tracked as index numbers within the array (zero = top), with
+    // each sticky room being tracked separately. Internally, the category index
+    // can be found from `this.indices[tag][category]` and the sticky room information
+    // from `this.stickyRooms[tag]`.
+    //
+    // Room categories are constantly re-evaluated and tracked in the `this.categorized`
+    // object. Note that this doesn't track rooms by category but instead by room ID.
+    // The theory is that by knowing the previous position, new desired position, and
+    // category indices we can avoid tracking multiple complicated maps in memory.
+    //
+    // The room list store is always provided with the `this.cached` results, which are
+    // updated as needed and not recalculated often. For example, when a room needs to
+    // move within a tag, the array in `this.cached` will be spliced instead of iterated.
+
+    private cached: ITagMap = {};
+    private sortAlgorithms: ITagSortingMap;
+    private rooms: Room[] = [];
+    private indices: {
+        // @ts-ignore - TS wants this to be a string but we know better than it
+        [tag: TagID]: {
+            // @ts-ignore - TS wants this to be a string but we know better than it
+            [category: Category]: number; // integer
+        };
+    } = {};
+    private stickyRooms: {
+        // @ts-ignore - TS wants this to be a string but we know better than it
+        [tag: TagID]: {
+            room?: Room;
+            nAbove: number; // integer
+        };
+    } = {};
+    private categorized: {
+        // @ts-ignore - TS wants this to be a string but we know better than it
+        [tag: TagID]: {
+            // TODO: Remove note
+            // Note: Should in theory be able to only track this by room ID as we'll know
+            // the indices of each category and can determine if a category needs changing
+            // in the cached list. Could potentially save a bunch of time if we can figure
+            // out where a room is supposed to be using offsets, some math, and leaving the
+            // array generally alone.
+            [roomId: string]: {
+                room: Room;
+                category: Category;
+            };
+        };
+    } = {};
+
+    constructor() {
+        console.log("Constructed an ImportanceAlgorithm");
+    }
+
+    getOrderedRooms(): ITagMap {
+        return this.cached;
+    }
+
+    async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
+        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
+        this.sortAlgorithms = tagSortingMap;
+        this.setKnownRooms(this.rooms); // regenerate the room lists
+    }
+
+    handleRoomUpdate(room): Promise<boolean> {
+        return undefined;
+    }
+
+    setKnownRooms(rooms: Room[]): Promise<any> {
+        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
+        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
+
+        this.rooms = rooms;
+
+        const newTags = {};
+        for (const tagId in this.sortAlgorithms) {
+            // noinspection JSUnfilteredForInLoop
+            newTags[tagId] = [];
+        }
+
+        // If we can avoid doing work, do so.
+        if (!rooms.length) {
+            this.cached = newTags;
+            return;
+        }
+
+        // TODO: Remove logging
+        const memberships = splitRoomsByMembership(rooms);
+        console.log({memberships});
+
+        // Step through each room and determine which tags it should be in.
+        // We don't care about ordering or sorting here - we're simply organizing things.
+        for (const room of rooms) {
+            const tags = room.tags;
+            let inTag = false;
+            for (const tagId in tags) {
+                // noinspection JSUnfilteredForInLoop
+                if (isNullOrUndefined(newTags[tagId])) {
+                    // skip the tag if we don't know about it
+                    continue;
+                }
+
+                inTag = true;
+
+                // noinspection JSUnfilteredForInLoop
+                newTags[tagId].push(room);
+            }
+
+            // If the room wasn't pushed to a tag, push it to the untagged tag.
+            if (!inTag) {
+                newTags[DefaultTagID.Untagged].push(room);
+            }
+        }
+
+        // TODO: Do sorting
+
+        // Finally, assign the tags to our cache
+        this.cached = newTags;
+    }
+}
diff --git a/src/stores/room-list/algorithms/index.ts b/src/stores/room-list/algorithms/index.ts
index cb67d42187..918b176f48 100644
--- a/src/stores/room-list/algorithms/index.ts
+++ b/src/stores/room-list/algorithms/index.ts
@@ -16,10 +16,11 @@ limitations under the License.
 
 import { IAlgorithm, ListAlgorithm } from "./IAlgorithm";
 import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
+import { ImportanceAlgorithm } from "./ImportanceAlgorithm";
 
 const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => IAlgorithm } = {
     [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(ListAlgorithm.Natural),
-    [ListAlgorithm.Importance]: () => new ChaoticAlgorithm(ListAlgorithm.Importance),
+    [ListAlgorithm.Importance]: () => new ImportanceAlgorithm(),
 };
 
 /**

From 9c0422691a551a6a92533bf6e34684a09b95568a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Apr 2020 20:44:18 -0600
Subject: [PATCH 2984/3235] Add another thought

Maybe we can speed up the algorithm if we know why we're doing the update.
---
 src/stores/room-list/algorithms/IAlgorithm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/room-list/algorithms/IAlgorithm.ts b/src/stores/room-list/algorithms/IAlgorithm.ts
index ab5c4742df..b49f0b10b2 100644
--- a/src/stores/room-list/algorithms/IAlgorithm.ts
+++ b/src/stores/room-list/algorithms/IAlgorithm.ts
@@ -84,5 +84,5 @@ export interface IAlgorithm {
      * depending on whether or not getOrderedRooms() should be called after
      * processing.
      */
-    handleRoomUpdate(room: Room): Promise<boolean>;
+    handleRoomUpdate(room: Room): Promise<boolean>; // TODO: Take a ReasonForChange to better predict the behaviour?
 }

From e7fffee17568fba9b89bbe98bc0b9382e111ba1b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Apr 2020 16:19:10 -0600
Subject: [PATCH 2985/3235] Remove the need for a tag manager

Instead putting the tag handling in the Algorithm class
---
 src/stores/room-list/README.md                |  13 +-
 src/stores/room-list/RoomListStore2.ts        |   4 +-
 .../room-list/RoomListStoreTempProxy.ts       |   2 +-
 src/stores/room-list/TagManager.ts            |  32 ----
 src/stores/room-list/algorithms/Algorithm.ts  | 178 ++++++++++++++++++
 .../room-list/algorithms/ChaoticAlgorithm.ts  |  80 +-------
 src/stores/room-list/algorithms/IAlgorithm.ts |  88 ---------
 .../algorithms/ImportanceAlgorithm.ts         |  76 +-------
 src/stores/room-list/algorithms/index.ts      |   8 +-
 9 files changed, 212 insertions(+), 269 deletions(-)
 delete mode 100644 src/stores/room-list/TagManager.ts
 create mode 100644 src/stores/room-list/algorithms/Algorithm.ts
 delete mode 100644 src/stores/room-list/algorithms/IAlgorithm.ts

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
index ed13210420..0dd6c104d8 100644
--- a/src/stores/room-list/README.md
+++ b/src/stores/room-list/README.md
@@ -109,9 +109,10 @@ all kinds of filtering.
 
 ## Class breakdowns
 
-The `RoomListStore` is the major coordinator of various `IAlgorithm` implementations, which take care 
-of the various `ListAlgorithm` and `SortingAlgorithm` options. A `TagManager` is responsible for figuring 
-out which tags get which rooms, as Matrix specifies them as a reverse map: tags are defined on rooms and 
-are not defined as a collection of rooms (unlike how they are presented to the user). Various list-specific 
-utilities are also included, though they are expected to move somewhere more general when needed. For 
-example, the `membership` utilities could easily be moved elsewhere as needed.
+The `RoomListStore` is the major coordinator of various `Algorithm` implementations, which take care 
+of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` superclass is also 
+responsible for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: 
+tags are defined on rooms and are not defined as a collection of rooms (unlike how they are presented 
+to the user). Various list-specific utilities are also included, though they are expected to move 
+somewhere more general when needed. For example, the `membership` utilities could easily be moved 
+elsewhere as needed.
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 7fab8c7ff9..dc1cb49cd6 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -19,7 +19,7 @@ import { MatrixClient } from "matrix-js-sdk/src/client";
 import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
 import SettingsStore from "../../settings/SettingsStore";
 import { DefaultTagID, OrderedDefaultTagIDs, TagID } from "./models";
-import { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/IAlgorithm";
+import { Algorithm, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/Algorithm";
 import TagOrderStore from "../TagOrderStore";
 import { getAlgorithmInstance } from "./algorithms";
 import { AsyncStore } from "../AsyncStore";
@@ -41,7 +41,7 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
     private matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;
-    private algorithm: IAlgorithm;
+    private algorithm: Algorithm;
 
     private readonly watchedSettings = [
         'RoomList.orderAlphabetically',
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 88171c0809..8ad3c5d35e 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -19,7 +19,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "./RoomListStore2";
 import OldRoomListStore from "../RoomListStore";
-import { ITagMap } from "./algorithms/IAlgorithm";
+import { ITagMap } from "./algorithms/Algorithm";
 import { UPDATE_EVENT } from "../AsyncStore";
 
 /**
diff --git a/src/stores/room-list/TagManager.ts b/src/stores/room-list/TagManager.ts
deleted file mode 100644
index 368c4e2c21..0000000000
--- a/src/stores/room-list/TagManager.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 {EventEmitter} from "events";
-
-// TODO: Docs on what this is
-export class TagManager extends EventEmitter {
-    constructor() {
-        super();
-    }
-
-    // TODO: Implementation.
-    // This will need to track where rooms belong in tags, and which tags they
-    // should be tracked within. This is algorithm independent because all the
-    // algorithms need to know what each tag contains.
-    //
-    // This will likely make use of the effective membership to determine the
-    // invite+historical sections.
-}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
new file mode 100644
index 0000000000..15fc208b21
--- /dev/null
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -0,0 +1,178 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { DefaultTagID, TagID } from "../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { EffectiveMembership, splitRoomsByMembership } from "../membership";
+
+export enum SortAlgorithm {
+    Manual = "MANUAL",
+    Alphabetic = "ALPHABETIC",
+    Recent = "RECENT",
+}
+
+export enum ListAlgorithm {
+    // Orders Red > Grey > Bold > Idle
+    Importance = "IMPORTANCE",
+
+    // Orders however the SortAlgorithm decides
+    Natural = "NATURAL",
+}
+
+export interface ITagSortingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: SortAlgorithm;
+}
+
+export interface ITagMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: Room[];
+}
+
+// TODO: Add locking support to avoid concurrent writes?
+// TODO: EventEmitter support? Might not be needed.
+
+export abstract class Algorithm {
+    protected cached: ITagMap = {};
+    protected sortAlgorithms: ITagSortingMap;
+    protected rooms: Room[] = [];
+    protected roomsByTag: {
+        // @ts-ignore - TS wants this to be a string but we know better
+        [tagId: TagID]: Room[];
+    } = {};
+
+    protected constructor() {
+    }
+
+    /**
+     * Asks the Algorithm to regenerate all lists, using the tags given
+     * as reference for which lists to generate and which way to generate
+     * them.
+     * @param {ITagSortingMap} tagSortingMap The tags to generate.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    public async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
+        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
+        this.sortAlgorithms = tagSortingMap;
+        return this.setKnownRooms(this.rooms);
+    }
+
+    /**
+     * Gets an ordered set of rooms for the all known tags.
+     * @returns {ITagMap} The cached list of rooms, ordered,
+     * for each tag. May be empty, but never null/undefined.
+     */
+    public getOrderedRooms(): ITagMap {
+        return this.cached;
+    }
+
+    /**
+     * Seeds the Algorithm with a set of rooms. The algorithm will discard all
+     * previously known information and instead use these rooms instead.
+     * @param {Room[]} rooms The rooms to force the algorithm to use.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    public async setKnownRooms(rooms: Room[]): Promise<any> {
+        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
+        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
+
+        this.rooms = rooms;
+
+        const newTags: ITagMap = {};
+        for (const tagId in this.sortAlgorithms) {
+            // noinspection JSUnfilteredForInLoop
+            newTags[tagId] = [];
+        }
+
+        // If we can avoid doing work, do so.
+        if (!rooms.length) {
+            await this.generateFreshTags(newTags); // just in case it wants to do something
+            this.cached = newTags;
+            return;
+        }
+
+        // Split out the easy rooms first (leave and invite)
+        const memberships = splitRoomsByMembership(rooms);
+        for (const room of memberships[EffectiveMembership.Invite]) {
+            console.log(`[DEBUG] "${room.name}" (${room.roomId}) is an Invite`);
+            newTags[DefaultTagID.Invite].push(room);
+        }
+        for (const room of memberships[EffectiveMembership.Leave]) {
+            console.log(`[DEBUG] "${room.name}" (${room.roomId}) is Historical`);
+            newTags[DefaultTagID.Archived].push(room);
+        }
+
+        // Now process all the joined rooms. This is a bit more complicated
+        for (const room of memberships[EffectiveMembership.Join]) {
+            const tags = Object.keys(room.tags || {});
+
+            let inTag = false;
+            if (tags.length > 0) {
+                for (const tag of tags) {
+                    if (!isNullOrUndefined(newTags[tag])) {
+                        console.log(`[DEBUG] "${room.name}" (${room.roomId}) is tagged as ${tag}`);
+                        newTags[tag].push(room);
+                        inTag = true;
+                    }
+                }
+            }
+
+            if (!inTag) {
+                // TODO: Determine if DM and push there instead
+                newTags[DefaultTagID.Untagged].push(room);
+                console.log(`[DEBUG] "${room.name}" (${room.roomId}) is Untagged`);
+            }
+        }
+
+        await this.generateFreshTags(newTags);
+
+        this.cached = newTags;
+    }
+
+    /**
+     * Called when the Algorithm believes a complete regeneration of the existing
+     * lists is needed.
+     * @param {ITagMap} updatedTagMap The tag map which needs populating. Each tag
+     * will already have the rooms which belong to it - they just need ordering. Must
+     * be mutated in place.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    protected abstract generateFreshTags(updatedTagMap: ITagMap): Promise<any>;
+
+    /**
+     * Called when the Algorithm wants a whole tag to be reordered. Typically this will
+     * be done whenever the tag's scope changes (added/removed rooms).
+     * @param {TagID} tagId The tag ID which changed.
+     * @param {Room[]} rooms The rooms within the tag, unordered.
+     * @returns {Promise<Room[]>} Resolves to the ordered rooms in the tag.
+     */
+    protected abstract regenerateTag(tagId: TagID, rooms: Room[]): Promise<Room[]>;
+
+    /**
+     * Asks the Algorithm to update its knowledge of a room. For example, when
+     * a user tags a room, joins/creates a room, or leaves a room the Algorithm
+     * should be told that the room's info might have changed. The Algorithm
+     * may no-op this request if no changes are required.
+     * @param {Room} room The room which might have affected sorting.
+     * @returns {Promise<boolean>} A promise which resolve to true or false
+     * depending on whether or not getOrderedRooms() should be called after
+     * processing.
+     */
+    // TODO: Take a ReasonForChange to better predict the behaviour?
+    // TODO: Intercept here and handle tag changes automatically
+    public abstract handleRoomUpdate(room: Room): Promise<boolean>;
+}
diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
index 1b640669c0..5d4177db8b 100644
--- a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
@@ -14,89 +14,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IAlgorithm, ITagMap, ITagSortingMap, ListAlgorithm } from "./IAlgorithm";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { Algorithm, ITagMap } from "./Algorithm";
 import { DefaultTagID } from "../models";
-import { splitRoomsByMembership } from "../membership";
 
 /**
  * A demonstration/temporary algorithm to verify the API surface works.
  * TODO: Remove this before shipping
  */
-export class ChaoticAlgorithm implements IAlgorithm {
+export class ChaoticAlgorithm extends Algorithm {
 
-    private cached: ITagMap = {};
-    private sortAlgorithms: ITagSortingMap;
-    private rooms: Room[] = [];
-
-    constructor(private representativeAlgorithm: ListAlgorithm) {
+    constructor() {
+        super();
         console.log("Constructed a ChaoticAlgorithm");
     }
 
-    getOrderedRooms(): ITagMap {
-        return this.cached;
+    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+        return Promise.resolve();
     }
 
-    async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
-        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
-        this.sortAlgorithms = tagSortingMap;
-        this.setKnownRooms(this.rooms); // regenerate the room lists
+    protected async regenerateTag(tagId: string | DefaultTagID, rooms: []): Promise<[]> {
+        return Promise.resolve(rooms);
     }
 
-    handleRoomUpdate(room): Promise<boolean> {
-        return undefined;
-    }
-
-    setKnownRooms(rooms: Room[]): Promise<any> {
-        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
-        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
-
-        this.rooms = rooms;
-
-        const newTags = {};
-        for (const tagId in this.sortAlgorithms) {
-            // noinspection JSUnfilteredForInLoop
-            newTags[tagId] = [];
-        }
-
-        // If we can avoid doing work, do so.
-        if (!rooms.length) {
-            this.cached = newTags;
-            return;
-        }
-
-        // TODO: Remove logging
-        const memberships = splitRoomsByMembership(rooms);
-        console.log({alg: this.representativeAlgorithm, memberships});
-
-        // Step through each room and determine which tags it should be in.
-        // We don't care about ordering or sorting here - we're simply organizing things.
-        for (const room of rooms) {
-            const tags = room.tags;
-            let inTag = false;
-            for (const tagId in tags) {
-                // noinspection JSUnfilteredForInLoop
-                if (isNullOrUndefined(newTags[tagId])) {
-                    // skip the tag if we don't know about it
-                    continue;
-                }
-
-                inTag = true;
-
-                // noinspection JSUnfilteredForInLoop
-                newTags[tagId].push(room);
-            }
-
-            // If the room wasn't pushed to a tag, push it to the untagged tag.
-            if (!inTag) {
-                newTags[DefaultTagID.Untagged].push(room);
-            }
-        }
-
-        // TODO: Do sorting
-
-        // Finally, assign the tags to our cache
-        this.cached = newTags;
+    public async handleRoomUpdate(room): Promise<boolean> {
+        return Promise.resolve(false);
     }
 }
diff --git a/src/stores/room-list/algorithms/IAlgorithm.ts b/src/stores/room-list/algorithms/IAlgorithm.ts
deleted file mode 100644
index b49f0b10b2..0000000000
--- a/src/stores/room-list/algorithms/IAlgorithm.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 { TagID } from "../models";
-import { Room } from "matrix-js-sdk/src/models/room";
-
-
-export enum SortAlgorithm {
-    Manual = "MANUAL",
-    Alphabetic = "ALPHABETIC",
-    Recent = "RECENT",
-}
-
-export enum ListAlgorithm {
-    // Orders Red > Grey > Bold > Idle
-    Importance = "IMPORTANCE",
-
-    // Orders however the SortAlgorithm decides
-    Natural = "NATURAL",
-}
-
-export interface ITagSortingMap {
-    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
-    [tagId: TagID]: SortAlgorithm;
-}
-
-export interface ITagMap {
-    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
-    [tagId: TagID]: Room[];
-}
-
-// TODO: Convert IAlgorithm to an abstract class?
-// TODO: Add locking support to avoid concurrent writes?
-// TODO: EventEmitter support
-
-/**
- * Represents an algorithm for the RoomListStore to use
- */
-export interface IAlgorithm {
-    /**
-     * Asks the Algorithm to regenerate all lists, using the tags given
-     * as reference for which lists to generate and which way to generate
-     * them.
-     * @param {ITagSortingMap} tagSortingMap The tags to generate.
-     * @returns {Promise<*>} A promise which resolves when complete.
-     */
-    populateTags(tagSortingMap: ITagSortingMap): Promise<any>;
-
-    /**
-     * Gets an ordered set of rooms for the all known tags.
-     * @returns {ITagMap} The cached list of rooms, ordered,
-     * for each tag. May be empty, but never null/undefined.
-     */
-    getOrderedRooms(): ITagMap;
-
-    /**
-     * Seeds the Algorithm with a set of rooms. The algorithm will discard all
-     * previously known information and instead use these rooms instead.
-     * @param {Room[]} rooms The rooms to force the algorithm to use.
-     * @returns {Promise<*>} A promise which resolves when complete.
-     */
-    setKnownRooms(rooms: Room[]): Promise<any>;
-
-    /**
-     * Asks the Algorithm to update its knowledge of a room. For example, when
-     * a user tags a room, joins/creates a room, or leaves a room the Algorithm
-     * should be told that the room's info might have changed. The Algorithm
-     * may no-op this request if no changes are required.
-     * @param {Room} room The room which might have affected sorting.
-     * @returns {Promise<boolean>} A promise which resolve to true or false
-     * depending on whether or not getOrderedRooms() should be called after
-     * processing.
-     */
-    handleRoomUpdate(room: Room): Promise<boolean>; // TODO: Take a ReasonForChange to better predict the behaviour?
-}
diff --git a/src/stores/room-list/algorithms/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
index 0a2184eb43..1a7a73a9d5 100644
--- a/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IAlgorithm, ITagMap, ITagSortingMap } from "./IAlgorithm";
+import { Algorithm, ITagMap, ITagSortingMap } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { DefaultTagID, TagID } from "../models";
@@ -60,7 +60,7 @@ export enum Category {
  * within the same category. For more information, see the comments contained
  * within the class.
  */
-export class ImportanceAlgorithm implements IAlgorithm {
+export class ImportanceAlgorithm extends Algorithm {
 
     // HOW THIS WORKS
     // --------------
@@ -68,7 +68,7 @@ export class ImportanceAlgorithm implements IAlgorithm {
     // This block of comments assumes you've read the README one level higher.
     // You should do that if you haven't already.
     //
-    // Tags are fed into the algorithmic functions from the TagManager changes,
+    // Tags are fed into the algorithmic functions from the Algorithm superclass,
     // which cause subsequent updates to the room list itself. Categories within
     // those tags are tracked as index numbers within the array (zero = top), with
     // each sticky room being tracked separately. Internally, the category index
@@ -84,9 +84,6 @@ export class ImportanceAlgorithm implements IAlgorithm {
     // updated as needed and not recalculated often. For example, when a room needs to
     // move within a tag, the array in `this.cached` will be spliced instead of iterated.
 
-    private cached: ITagMap = {};
-    private sortAlgorithms: ITagSortingMap;
-    private rooms: Room[] = [];
     private indices: {
         // @ts-ignore - TS wants this to be a string but we know better than it
         [tag: TagID]: {
@@ -118,72 +115,19 @@ export class ImportanceAlgorithm implements IAlgorithm {
     } = {};
 
     constructor() {
+        super();
         console.log("Constructed an ImportanceAlgorithm");
     }
 
-    getOrderedRooms(): ITagMap {
-        return this.cached;
+    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+        return Promise.resolve();
     }
 
-    async populateTags(tagSortingMap: ITagSortingMap): Promise<any> {
-        if (!tagSortingMap) throw new Error(`Map cannot be null or empty`);
-        this.sortAlgorithms = tagSortingMap;
-        this.setKnownRooms(this.rooms); // regenerate the room lists
+    protected async regenerateTag(tagId: string | DefaultTagID, rooms: []): Promise<[]> {
+        return Promise.resolve(rooms);
     }
 
-    handleRoomUpdate(room): Promise<boolean> {
-        return undefined;
-    }
-
-    setKnownRooms(rooms: Room[]): Promise<any> {
-        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
-        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
-
-        this.rooms = rooms;
-
-        const newTags = {};
-        for (const tagId in this.sortAlgorithms) {
-            // noinspection JSUnfilteredForInLoop
-            newTags[tagId] = [];
-        }
-
-        // If we can avoid doing work, do so.
-        if (!rooms.length) {
-            this.cached = newTags;
-            return;
-        }
-
-        // TODO: Remove logging
-        const memberships = splitRoomsByMembership(rooms);
-        console.log({memberships});
-
-        // Step through each room and determine which tags it should be in.
-        // We don't care about ordering or sorting here - we're simply organizing things.
-        for (const room of rooms) {
-            const tags = room.tags;
-            let inTag = false;
-            for (const tagId in tags) {
-                // noinspection JSUnfilteredForInLoop
-                if (isNullOrUndefined(newTags[tagId])) {
-                    // skip the tag if we don't know about it
-                    continue;
-                }
-
-                inTag = true;
-
-                // noinspection JSUnfilteredForInLoop
-                newTags[tagId].push(room);
-            }
-
-            // If the room wasn't pushed to a tag, push it to the untagged tag.
-            if (!inTag) {
-                newTags[DefaultTagID.Untagged].push(room);
-            }
-        }
-
-        // TODO: Do sorting
-
-        // Finally, assign the tags to our cache
-        this.cached = newTags;
+    public async handleRoomUpdate(room): Promise<boolean> {
+        return Promise.resolve(false);
     }
 }
diff --git a/src/stores/room-list/algorithms/index.ts b/src/stores/room-list/algorithms/index.ts
index 918b176f48..1277b66ac9 100644
--- a/src/stores/room-list/algorithms/index.ts
+++ b/src/stores/room-list/algorithms/index.ts
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IAlgorithm, ListAlgorithm } from "./IAlgorithm";
+import { Algorithm, ListAlgorithm } from "./Algorithm";
 import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
 import { ImportanceAlgorithm } from "./ImportanceAlgorithm";
 
-const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => IAlgorithm } = {
+const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => Algorithm } = {
     [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(ListAlgorithm.Natural),
     [ListAlgorithm.Importance]: () => new ImportanceAlgorithm(),
 };
@@ -26,9 +26,9 @@ const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => IAlgorithm } =
 /**
  * Gets an instance of the defined algorithm
  * @param {ListAlgorithm} algorithm The algorithm to get an instance of.
- * @returns {IAlgorithm} The algorithm instance.
+ * @returns {Algorithm} The algorithm instance.
  */
-export function getAlgorithmInstance(algorithm: ListAlgorithm): IAlgorithm {
+export function getAlgorithmInstance(algorithm: ListAlgorithm): Algorithm {
     if (!ALGORITHM_FACTORIES[algorithm]) {
         throw new Error(`${algorithm} is not a known algorithm`);
     }

From d244eeb5d585f3101b7450d220cbd91cba014b33 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 29 Apr 2020 16:57:06 -0600
Subject: [PATCH 2986/3235] Break up algorithms and use the new layering

Sorting and ordering has now been split apart. The ImportanceAlgorithm also finally makes use of the sorting.

So far metrics look okay at 3ms for a simple account, though this could potentially get worse due to the multiple loops involved (one for tags, one for categories, one for ordering). We might be able to feed a whole list of rooms into the thing and have it regenerate the lists on demand.
---
 src/stores/room-list/RoomListStore2.ts        |  7 +-
 .../room-list/RoomListStoreTempProxy.ts       |  2 +-
 .../{ => list_ordering}/Algorithm.ts          | 37 +++------
 .../{ => list_ordering}/ChaoticAlgorithm.ts   |  5 +-
 .../ImportanceAlgorithm.ts                    | 81 +++++++++++++++++--
 .../algorithms/{ => list_ordering}/index.ts   |  7 +-
 src/stores/room-list/algorithms/models.ts     | 42 ++++++++++
 .../tag_sorting/ChaoticAlgorithm.ts           | 29 +++++++
 .../algorithms/tag_sorting/IAlgorithm.ts      | 31 +++++++
 .../algorithms/tag_sorting/ManualAlgorithm.ts | 31 +++++++
 .../room-list/algorithms/tag_sorting/index.ts | 52 ++++++++++++
 11 files changed, 283 insertions(+), 41 deletions(-)
 rename src/stores/room-list/algorithms/{ => list_ordering}/Algorithm.ts (90%)
 rename src/stores/room-list/algorithms/{ => list_ordering}/ChaoticAlgorithm.ts (90%)
 rename src/stores/room-list/algorithms/{ => list_ordering}/ImportanceAlgorithm.ts (63%)
 rename src/stores/room-list/algorithms/{ => list_ordering}/index.ts (84%)
 create mode 100644 src/stores/room-list/algorithms/models.ts
 create mode 100644 src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/tag_sorting/index.ts

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index dc1cb49cd6..0b3f61e261 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -19,10 +19,11 @@ import { MatrixClient } from "matrix-js-sdk/src/client";
 import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
 import SettingsStore from "../../settings/SettingsStore";
 import { DefaultTagID, OrderedDefaultTagIDs, TagID } from "./models";
-import { Algorithm, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/Algorithm";
+import { Algorithm } from "./algorithms/list_ordering/Algorithm";
 import TagOrderStore from "../TagOrderStore";
-import { getAlgorithmInstance } from "./algorithms";
+import { getListAlgorithmInstance } from "./algorithms/list_ordering";
 import { AsyncStore } from "../AsyncStore";
+import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -172,7 +173,7 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
     }
 
     private setAlgorithmClass() {
-        this.algorithm = getAlgorithmInstance(this.state.preferredAlgorithm);
+        this.algorithm = getListAlgorithmInstance(this.state.preferredAlgorithm);
     }
 
     private async regenerateAllLists() {
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 8ad3c5d35e..4edca2b9cd 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -19,7 +19,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "./RoomListStore2";
 import OldRoomListStore from "../RoomListStore";
-import { ITagMap } from "./algorithms/Algorithm";
+import { ITagMap } from "./algorithms/models";
 import { UPDATE_EVENT } from "../AsyncStore";
 
 /**
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
similarity index 90%
rename from src/stores/room-list/algorithms/Algorithm.ts
rename to src/stores/room-list/algorithms/list_ordering/Algorithm.ts
index 15fc208b21..4c8c9e9c60 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
@@ -14,38 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DefaultTagID, TagID } from "../models";
+import { DefaultTagID, TagID } from "../../models";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import { EffectiveMembership, splitRoomsByMembership } from "../membership";
-
-export enum SortAlgorithm {
-    Manual = "MANUAL",
-    Alphabetic = "ALPHABETIC",
-    Recent = "RECENT",
-}
-
-export enum ListAlgorithm {
-    // Orders Red > Grey > Bold > Idle
-    Importance = "IMPORTANCE",
-
-    // Orders however the SortAlgorithm decides
-    Natural = "NATURAL",
-}
-
-export interface ITagSortingMap {
-    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
-    [tagId: TagID]: SortAlgorithm;
-}
-
-export interface ITagMap {
-    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
-    [tagId: TagID]: Room[];
-}
+import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
+import { ITagMap, ITagSortingMap } from "../models";
 
 // TODO: Add locking support to avoid concurrent writes?
 // TODO: EventEmitter support? Might not be needed.
 
+/**
+ * Represents a list ordering algorithm. This class will take care of tag
+ * management (which rooms go in which tags) and ask the implementation to
+ * deal with ordering mechanics.
+ */
 export abstract class Algorithm {
     protected cached: ITagMap = {};
     protected sortAlgorithms: ITagSortingMap;
@@ -160,6 +142,7 @@ export abstract class Algorithm {
      * @param {Room[]} rooms The rooms within the tag, unordered.
      * @returns {Promise<Room[]>} Resolves to the ordered rooms in the tag.
      */
+    // TODO: Do we need this?
     protected abstract regenerateTag(tagId: TagID, rooms: Room[]): Promise<Room[]>;
 
     /**
@@ -173,6 +156,6 @@ export abstract class Algorithm {
      * processing.
      */
     // TODO: Take a ReasonForChange to better predict the behaviour?
-    // TODO: Intercept here and handle tag changes automatically
+    // TODO: Intercept here and handle tag changes automatically? May be best to let the impl do that.
     public abstract handleRoomUpdate(room: Room): Promise<boolean>;
 }
diff --git a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
similarity index 90%
rename from src/stores/room-list/algorithms/ChaoticAlgorithm.ts
rename to src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
index 5d4177db8b..7c1a0b1acc 100644
--- a/src/stores/room-list/algorithms/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm, ITagMap } from "./Algorithm";
-import { DefaultTagID } from "../models";
+import { Algorithm } from "./Algorithm";
+import { DefaultTagID } from "../../models";
+import { ITagMap } from "../models";
 
 /**
  * A demonstration/temporary algorithm to verify the API surface works.
diff --git a/src/stores/room-list/algorithms/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
similarity index 63%
rename from src/stores/room-list/algorithms/ImportanceAlgorithm.ts
rename to src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
index 1a7a73a9d5..d73fdee930 100644
--- a/src/stores/room-list/algorithms/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
@@ -1,4 +1,5 @@
 /*
+Copyright 2018, 2019 New Vector Ltd
 Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,11 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm, ITagMap, ITagSortingMap } from "./Algorithm";
+import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
-import { DefaultTagID, TagID } from "../models";
-import { splitRoomsByMembership } from "../membership";
+import { DefaultTagID, TagID } from "../../models";
+import { ITagMap, SortAlgorithm } from "../models";
+import { getSortingAlgorithmInstance, sortRoomsWithAlgorithm } from "../tag_sorting";
+import * as Unread from '../../../../Unread';
 
 /**
  * The determined category of a room.
@@ -44,6 +46,11 @@ export enum Category {
     Idle = "IDLE",
 }
 
+interface ICategorizedRoomMap {
+    // @ts-ignore - TS wants this to be a string, but we know better
+    [category: Category]: Room[];
+}
+
 /**
  * An implementation of the "importance" algorithm for room list sorting. Where
  * the tag sorting algorithm does not interfere, rooms will be ordered into
@@ -119,8 +126,72 @@ export class ImportanceAlgorithm extends Algorithm {
         console.log("Constructed an ImportanceAlgorithm");
     }
 
+    // noinspection JSMethodCanBeStatic
+    private categorizeRooms(rooms: Room[]): ICategorizedRoomMap {
+        const map: ICategorizedRoomMap = {
+            [Category.Red]: [],
+            [Category.Grey]: [],
+            [Category.Bold]: [],
+            [Category.Idle]: [],
+        };
+        for (const room of rooms) {
+            const category = this.getRoomCategory(room);
+            console.log(`[DEBUG] "${room.name}" (${room.roomId}) is a ${category} room`);
+            map[category].push(room);
+        }
+        return map;
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getRoomCategory(room: Room): Category {
+        // Function implementation borrowed from old RoomListStore
+
+        const mentions = room.getUnreadNotificationCount('highlight') > 0;
+        if (mentions) {
+            return Category.Red;
+        }
+
+        let unread = room.getUnreadNotificationCount() > 0;
+        if (unread) {
+            return Category.Grey;
+        }
+
+        unread = Unread.doesRoomHaveUnreadMessages(room);
+        if (unread) {
+            return Category.Bold;
+        }
+
+        return Category.Idle;
+    }
+
     protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
-        return Promise.resolve();
+        for (const tagId of Object.keys(updatedTagMap)) {
+            const unorderedRooms = updatedTagMap[tagId];
+
+            const sortBy = this.sortAlgorithms[tagId];
+            if (!sortBy) throw new Error(`${tagId} does not have a sorting algorithm`);
+
+            if (sortBy === SortAlgorithm.Manual) {
+                // Manual tags essentially ignore the importance algorithm, so don't do anything
+                // special about them.
+                updatedTagMap[tagId] = await sortRoomsWithAlgorithm(unorderedRooms, tagId, sortBy);
+            } else {
+                // Every other sorting type affects the categories, not the whole tag.
+                const categorized = this.categorizeRooms(unorderedRooms);
+                for (const category of Object.keys(categorized)) {
+                    const roomsToOrder = categorized[category];
+                    categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, tagId, sortBy);
+                }
+
+                // TODO: Update positions of categories in cache
+                updatedTagMap[tagId] = [
+                    ...categorized[Category.Red],
+                    ...categorized[Category.Grey],
+                    ...categorized[Category.Bold],
+                    ...categorized[Category.Idle],
+                ];
+            }
+        }
     }
 
     protected async regenerateTag(tagId: string | DefaultTagID, rooms: []): Promise<[]> {
diff --git a/src/stores/room-list/algorithms/index.ts b/src/stores/room-list/algorithms/list_ordering/index.ts
similarity index 84%
rename from src/stores/room-list/algorithms/index.ts
rename to src/stores/room-list/algorithms/list_ordering/index.ts
index 1277b66ac9..35f4af14cf 100644
--- a/src/stores/room-list/algorithms/index.ts
+++ b/src/stores/room-list/algorithms/list_ordering/index.ts
@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Algorithm, ListAlgorithm } from "./Algorithm";
+import { Algorithm } from "./Algorithm";
 import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
 import { ImportanceAlgorithm } from "./ImportanceAlgorithm";
+import { ListAlgorithm } from "../models";
 
 const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => Algorithm } = {
-    [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(ListAlgorithm.Natural),
+    [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(),
     [ListAlgorithm.Importance]: () => new ImportanceAlgorithm(),
 };
 
@@ -28,7 +29,7 @@ const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => Algorithm } = {
  * @param {ListAlgorithm} algorithm The algorithm to get an instance of.
  * @returns {Algorithm} The algorithm instance.
  */
-export function getAlgorithmInstance(algorithm: ListAlgorithm): Algorithm {
+export function getListAlgorithmInstance(algorithm: ListAlgorithm): Algorithm {
     if (!ALGORITHM_FACTORIES[algorithm]) {
         throw new Error(`${algorithm} is not a known algorithm`);
     }
diff --git a/src/stores/room-list/algorithms/models.ts b/src/stores/room-list/algorithms/models.ts
new file mode 100644
index 0000000000..284600a776
--- /dev/null
+++ b/src/stores/room-list/algorithms/models.ts
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { TagID } from "../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+export enum SortAlgorithm {
+    Manual = "MANUAL",
+    Alphabetic = "ALPHABETIC",
+    Recent = "RECENT",
+}
+
+export enum ListAlgorithm {
+    // Orders Red > Grey > Bold > Idle
+    Importance = "IMPORTANCE",
+
+    // Orders however the SortAlgorithm decides
+    Natural = "NATURAL",
+}
+
+export interface ITagSortingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: SortAlgorithm;
+}
+
+export interface ITagMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: Room[];
+}
diff --git a/src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts
new file mode 100644
index 0000000000..31846d084a
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+
+/**
+ * A demonstration to test the API surface.
+ * TODO: Remove this before landing
+ */
+export class ChaoticAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        return rooms;
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts b/src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts
new file mode 100644
index 0000000000..6c22ee0c9c
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts
@@ -0,0 +1,31 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { TagID } from "../../models";
+
+/**
+ * Represents a tag sorting algorithm.
+ */
+export interface IAlgorithm {
+    /**
+     * Sorts the given rooms according to the sorting rules of the algorithm.
+     * @param {Room[]} rooms The rooms to sort.
+     * @param {TagID} tagId The tag ID in which the rooms are being sorted.
+     * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+     */
+    sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]>;
+}
diff --git a/src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts b/src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts
new file mode 100644
index 0000000000..b8c0357633
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts
@@ -0,0 +1,31 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+
+/**
+ * Sorts rooms according to the tag's `order` property on the room.
+ */
+export class ManualAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        const getOrderProp = (r: Room) => r.tags[tagId].order || 0;
+        return rooms.sort((a, b) => {
+            return getOrderProp(a) - getOrderProp(b);
+        });
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag_sorting/index.ts b/src/stores/room-list/algorithms/tag_sorting/index.ts
new file mode 100644
index 0000000000..07f8f484d8
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag_sorting/index.ts
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { ChaoticAlgorithm } from "./ChaoticAlgorithm";
+import { SortAlgorithm } from "../models";
+import { ManualAlgorithm } from "./ManualAlgorithm";
+import { IAlgorithm } from "./IAlgorithm";
+import { TagID } from "../../models";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+const ALGORITHM_INSTANCES: { [algorithm in SortAlgorithm]: IAlgorithm } = {
+    [SortAlgorithm.Recent]: new ChaoticAlgorithm(),
+    [SortAlgorithm.Alphabetic]: new ChaoticAlgorithm(),
+    [SortAlgorithm.Manual]: new ManualAlgorithm(),
+};
+
+/**
+ * Gets an instance of the defined algorithm
+ * @param {SortAlgorithm} algorithm The algorithm to get an instance of.
+ * @returns {IAlgorithm} The algorithm instance.
+ */
+export function getSortingAlgorithmInstance(algorithm: SortAlgorithm): IAlgorithm {
+    if (!ALGORITHM_INSTANCES[algorithm]) {
+        throw new Error(`${algorithm} is not a known algorithm`);
+    }
+
+    return ALGORITHM_INSTANCES[algorithm];
+}
+
+/**
+ * Sorts rooms in a given tag according to the algorithm given.
+ * @param {Room[]} rooms The rooms to sort.
+ * @param {TagID} tagId The tag in which the sorting is occurring.
+ * @param {SortAlgorithm} algorithm The algorithm to use for sorting.
+ * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+ */
+export function sortRoomsWithAlgorithm(rooms: Room[], tagId: TagID, algorithm: SortAlgorithm): Promise<Room[]> {
+    return getSortingAlgorithmInstance(algorithm).sortRooms(rooms, tagId);
+}

From ecf8090b750acf559f0550ba80a09745c0c18839 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 30 Apr 2020 12:29:32 -0600
Subject: [PATCH 2987/3235] Handle DMs

---
 .../room-list/algorithms/list_ordering/Algorithm.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/stores/room-list/algorithms/list_ordering/Algorithm.ts b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
index 4c8c9e9c60..fd98f34966 100644
--- a/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
@@ -19,6 +19,7 @@ import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
 import { ITagMap, ITagSortingMap } from "../models";
+import DMRoomMap from "../../../../utils/DMRoomMap";
 
 // TODO: Add locking support to avoid concurrent writes?
 // TODO: EventEmitter support? Might not be needed.
@@ -100,13 +101,21 @@ export abstract class Algorithm {
 
         // Now process all the joined rooms. This is a bit more complicated
         for (const room of memberships[EffectiveMembership.Join]) {
-            const tags = Object.keys(room.tags || {});
+            let tags = Object.keys(room.tags || {});
+
+            if (tags.length === 0) {
+                // Check to see if it's a DM if it isn't anything else
+                if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                    tags = [DefaultTagID.DM];
+                }
+            }
 
             let inTag = false;
             if (tags.length > 0) {
                 for (const tag of tags) {
+                    console.log(`[DEBUG] "${room.name}" (${room.roomId}) is tagged as ${tag}`);
                     if (!isNullOrUndefined(newTags[tag])) {
-                        console.log(`[DEBUG] "${room.name}" (${room.roomId}) is tagged as ${tag}`);
+                        console.log(`[DEBUG] "${room.name}" (${room.roomId}) is tagged with VALID tag ${tag}`);
                         newTags[tag].push(room);
                         inTag = true;
                     }

From 09b7f39df8118a0c6979b7fc4091c4d583ee2782 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 30 Apr 2020 13:21:50 -0600
Subject: [PATCH 2988/3235] Simple rendering of the room list for visual aid

This is largely meant to prove the algorithm works and nothing more.
---
 src/components/views/rooms/RoomList2.tsx    | 130 +++++++++++++++++++-
 src/components/views/rooms/RoomSublist2.tsx |  61 +++++++++
 2 files changed, 185 insertions(+), 6 deletions(-)
 create mode 100644 src/components/views/rooms/RoomSublist2.tsx

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index f97f599ae3..04cb8a4549 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -17,11 +17,18 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from "../../../languageHandler";
+import { _t, _td } from "../../../languageHandler";
 import { Layout } from '../../../resizer/distributors/roomsublist2';
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
 import { ResizeNotifier } from "../../../utils/ResizeNotifier";
 import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore2";
+import { ITagMap } from "../../../stores/room-list/algorithms/models";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import { Dispatcher } from "flux";
+import { ActionPayload } from "../../../dispatcher-types";
+import dis from "../../../dispatcher";
+import { RoomSublist2 } from "./RoomSublist2";
+import { isNullOrUndefined } from "matrix-js-sdk/lib/src/utils";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -33,14 +40,83 @@ interface IProps {
 }
 
 interface IState {
+    sublists: ITagMap;
 }
 
-// TODO: Actually write stub
-export class RoomSublist2 extends React.Component<any, any> {
-    public setHeight(size: number) {
-    }
+const TAG_ORDER: TagID[] = [
+    // -- Community Invites Placeholder --
+
+    DefaultTagID.Invite,
+    DefaultTagID.Favourite,
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+
+    // -- Custom Tags Placeholder --
+
+    DefaultTagID.LowPriority,
+    DefaultTagID.ServerNotice,
+    DefaultTagID.Archived,
+];
+const COMMUNITY_TAGS_BEFORE_TAG = DefaultTagID.Invite;
+const CUSTOM_TAGS_BEFORE_TAG = DefaultTagID.LowPriority;
+const ALWAYS_VISIBLE_TAGS: TagID[] = [
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+];
+
+interface ITagAesthetics {
+    sectionLabel: string;
+    addRoomLabel?: string;
+    onAddRoom?: (dispatcher: Dispatcher<ActionPayload>) => void;
+    isInvite: boolean;
+    defaultHidden: boolean;
 }
 
+const TAG_AESTHETICS: {
+    // @ts-ignore - TS wants this to be a string but we know better
+    [tagId: TagID]: ITagAesthetics;
+} = {
+    [DefaultTagID.Invite]: {
+        sectionLabel: _td("Invites"),
+        isInvite: true,
+        defaultHidden: false,
+    },
+    [DefaultTagID.Favourite]: {
+        sectionLabel: _td("Favourites"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+    [DefaultTagID.DM]: {
+        sectionLabel: _td("Direct Messages"),
+        isInvite: false,
+        defaultHidden: false,
+        addRoomLabel: _td("Start chat"),
+        onAddRoom: (dispatcher: Dispatcher<ActionPayload>) => dispatcher.dispatch({action: 'view_create_chat'}),
+    },
+    [DefaultTagID.Untagged]: {
+        sectionLabel: _td("Rooms"),
+        isInvite: false,
+        defaultHidden: false,
+        addRoomLabel: _td("Create room"),
+        onAddRoom: (dispatcher: Dispatcher<ActionPayload>) => dispatcher.dispatch({action: 'view_create_room'}),
+    },
+    [DefaultTagID.LowPriority]: {
+        sectionLabel: _td("Low priority"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+    [DefaultTagID.ServerNotice]: {
+        sectionLabel: _td("System Alerts"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+    [DefaultTagID.Archived]: {
+        sectionLabel: _td("Historical"),
+        isInvite: false,
+        defaultHidden: true,
+    },
+};
+
 export default class RoomList2 extends React.Component<IProps, IState> {
     private sublistRefs: { [tagId: string]: React.RefObject<RoomSublist2> } = {};
     private sublistSizes: { [tagId: string]: number } = {};
@@ -51,6 +127,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
+        this.state = {sublists: {}};
         this.loadSublistSizes();
         this.prepareLayouts();
     }
@@ -58,6 +135,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     public componentDidMount(): void {
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, (store) => {
             console.log("new lists", store.orderedLists);
+            this.setState({sublists: store.orderedLists});
         });
     }
 
@@ -108,7 +186,47 @@ export default class RoomList2 extends React.Component<IProps, IState> {
         }
     }
 
+    private renderSublists(): React.ReactElement[] {
+        const components: React.ReactElement[] = [];
+
+        for (const orderedTagId of TAG_ORDER) {
+            if (COMMUNITY_TAGS_BEFORE_TAG === orderedTagId) {
+                // Populate community invites if we have the chance
+                // TODO
+            }
+            if (CUSTOM_TAGS_BEFORE_TAG === orderedTagId) {
+                // Populate custom tags if needed
+                // TODO
+            }
+
+            const orderedRooms = this.state.sublists[orderedTagId] || [];
+            if (orderedRooms.length === 0 && !ALWAYS_VISIBLE_TAGS.includes(orderedTagId)) {
+                continue; // skip tag - not needed
+            }
+
+            const aesthetics: ITagAesthetics = TAG_AESTHETICS[orderedTagId];
+            if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
+
+            const onAddRoomFn = () => {
+                if (!aesthetics.onAddRoom) return;
+                aesthetics.onAddRoom(dis);
+            };
+            components.push(<RoomSublist2
+                forRooms={true}
+                rooms={orderedRooms}
+                startAsHidden={aesthetics.defaultHidden}
+                label={_t(aesthetics.sectionLabel)}
+                onAddRoom={onAddRoomFn}
+                addRoomLabel={aesthetics.addRoomLabel}
+                isInvite={aesthetics.isInvite}
+            />);
+        }
+
+        return components;
+    }
+
     public render() {
+        const sublists = this.renderSublists();
         return (
             <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={this.props.onKeyDown}>
                 {({onKeyDownHandler}) => (
@@ -122,7 +240,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                         // Firefox sometimes makes this element focusable due to
                         // overflow:scroll;, so force it out of tab order.
                         tabIndex={-1}
-                    >{_t("TODO")}</div>
+                    >{sublists}</div>
                 )}
             </RovingTabIndexProvider>
         );
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
new file mode 100644
index 0000000000..a3ca525b14
--- /dev/null
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -0,0 +1,61 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 Vector Creations Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as React from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+interface IProps {
+    forRooms: boolean;
+    rooms?: Room[];
+    startAsHidden: boolean;
+    label: string;
+    onAddRoom?: () => void;
+    addRoomLabel: string;
+    isInvite: boolean;
+
+    // TODO: Collapsed state
+    // TODO: Height
+    // TODO: Group invites
+    // TODO: Calls
+    // TODO: forceExpand?
+    // TODO: Header clicking
+    // TODO: Spinner support for historical
+}
+
+interface IState {
+}
+
+// TODO: Actually write stub
+export class RoomSublist2 extends React.Component<IProps, IState> {
+    public setHeight(size: number) {
+    }
+
+    public render() {
+        // TODO: Proper rendering
+
+        const rooms = this.props.rooms.map(r => (
+            <div key={r.roomId}>{r.name} ({r.roomId})</div>
+        ));
+        return (
+            <div>
+                <h4>{this.props.label}</h4>
+                {rooms}
+            </div>
+        );
+    }
+}

From 5dda7f02cffb88e0621b68429fcc725e4dab8bb6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 4 May 2020 09:06:34 -0600
Subject: [PATCH 2989/3235] Early handling of dispatched events

A possible approach to handling the various triggers for recategorizing rooms.
---
 src/components/views/rooms/RoomList2.tsx      |  1 -
 src/stores/room-list/RoomListStore2.ts        | 41 ++++++++++++++++---
 .../algorithms/list_ordering/Algorithm.ts     | 41 +++++++++++--------
 .../list_ordering/ChaoticAlgorithm.ts         |  7 +---
 .../list_ordering/ImportanceAlgorithm.ts      | 17 ++++----
 src/stores/room-list/models.ts                |  5 +++
 6 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 04cb8a4549..f7788f0003 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -28,7 +28,6 @@ import { Dispatcher } from "flux";
 import { ActionPayload } from "../../../dispatcher-types";
 import dis from "../../../dispatcher";
 import { RoomSublist2 } from "./RoomSublist2";
-import { isNullOrUndefined } from "matrix-js-sdk/lib/src/utils";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 0b3f61e261..06f97ae53e 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -18,12 +18,14 @@ limitations under the License.
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
 import SettingsStore from "../../settings/SettingsStore";
-import { DefaultTagID, OrderedDefaultTagIDs, TagID } from "./models";
+import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
 import { Algorithm } from "./algorithms/list_ordering/Algorithm";
 import TagOrderStore from "../TagOrderStore";
 import { getListAlgorithmInstance } from "./algorithms/list_ordering";
 import { AsyncStore } from "../AsyncStore";
 import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -123,7 +125,14 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
 
                 await this.regenerateAllLists(); // regenerate the lists now
             }
-        } else if (payload.action === 'MatrixActions.Room.receipt') {
+        }
+
+        if (!this.algorithm) {
+            // This shouldn't happen because `initialListsGenerated` implies we have an algorithm.
+            throw new Error("Room list store has no algorithm to process dispatcher update with");
+        }
+
+        if (payload.action === 'MatrixActions.Room.receipt') {
             // First see if the receipt event is for our own user. If it was, trigger
             // a room update (we probably read the room on a different device).
             // noinspection JSObjectNullOrUndefined - this.matrixClient can't be null by this point in the lifecycle
@@ -132,23 +141,45 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
                 const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
                 if (receiptUsers.includes(myUserId)) {
                     // TODO: Update room now that it's been read
+                    console.log(payload);
                     return;
                 }
             }
         } else if (payload.action === 'MatrixActions.Room.tags') {
             // TODO: Update room from tags
-        } else if (payload.action === 'MatrixActions.room.timeline') {
-            // TODO: Update room from new events
+            console.log(payload);
+        } else if (payload.action === 'MatrixActions.Room.timeline') {
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+
+            // Ignore non-live events (backfill)
+            if (!eventPayload.isLiveEvent || !payload.isLiveUnfilteredRoomTimelineEvent) return;
+
+            const roomId = eventPayload.event.getRoomId();
+            const room = this.matrixClient.getRoom(roomId);
+            await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
         } else if (payload.action === 'MatrixActions.Event.decrypted') {
             // TODO: Update room from decrypted event
+            console.log(payload);
         } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
             // TODO: Update DMs
+            console.log(payload);
         } else if (payload.action === 'MatrixActions.Room.myMembership') {
             // TODO: Update room from membership change
-        } else if (payload.action === 'MatrixActions.room') {
+            console.log(payload);
+        } else if (payload.action === 'MatrixActions.Room') {
             // TODO: Update room from creation/join
+            console.log(payload);
         } else if (payload.action === 'view_room') {
             // TODO: Update sticky room
+            console.log(payload);
+        }
+    }
+
+    private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<any> {
+        const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
+        if (shouldUpdate) {
+            console.log(`[DEBUG] Room "${room.name}" (${room.roomId}) triggered by ${cause} requires list update`);
+            this.emit(LISTS_UPDATE_EVENT, this);
         }
     }
 
diff --git a/src/stores/room-list/algorithms/list_ordering/Algorithm.ts b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
index fd98f34966..e154847847 100644
--- a/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/Algorithm.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DefaultTagID, TagID } from "../../models";
+import { DefaultTagID, RoomUpdateCause, TagID } from "../../models";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
@@ -33,9 +33,8 @@ export abstract class Algorithm {
     protected cached: ITagMap = {};
     protected sortAlgorithms: ITagSortingMap;
     protected rooms: Room[] = [];
-    protected roomsByTag: {
-        // @ts-ignore - TS wants this to be a string but we know better
-        [tagId: TagID]: Room[];
+    protected roomIdsToTags: {
+        [roomId: string]: TagID[];
     } = {};
 
     protected constructor() {
@@ -132,6 +131,25 @@ export abstract class Algorithm {
         await this.generateFreshTags(newTags);
 
         this.cached = newTags;
+        this.updateTagsFromCache();
+    }
+
+    /**
+     * Updates the roomsToTags map
+     */
+    protected updateTagsFromCache() {
+        const newMap = {};
+
+        const tags = Object.keys(this.cached);
+        for (const tagId of tags) {
+            const rooms = this.cached[tagId];
+            for (const room of rooms) {
+                if (!newMap[room.roomId]) newMap[room.roomId] = [];
+                newMap[room.roomId].push(tagId);
+            }
+        }
+
+        this.roomIdsToTags = newMap;
     }
 
     /**
@@ -144,27 +162,16 @@ export abstract class Algorithm {
      */
     protected abstract generateFreshTags(updatedTagMap: ITagMap): Promise<any>;
 
-    /**
-     * Called when the Algorithm wants a whole tag to be reordered. Typically this will
-     * be done whenever the tag's scope changes (added/removed rooms).
-     * @param {TagID} tagId The tag ID which changed.
-     * @param {Room[]} rooms The rooms within the tag, unordered.
-     * @returns {Promise<Room[]>} Resolves to the ordered rooms in the tag.
-     */
-    // TODO: Do we need this?
-    protected abstract regenerateTag(tagId: TagID, rooms: Room[]): Promise<Room[]>;
-
     /**
      * Asks the Algorithm to update its knowledge of a room. For example, when
      * a user tags a room, joins/creates a room, or leaves a room the Algorithm
      * should be told that the room's info might have changed. The Algorithm
      * may no-op this request if no changes are required.
      * @param {Room} room The room which might have affected sorting.
+     * @param {RoomUpdateCause} cause The reason for the update being triggered.
      * @returns {Promise<boolean>} A promise which resolve to true or false
      * depending on whether or not getOrderedRooms() should be called after
      * processing.
      */
-    // TODO: Take a ReasonForChange to better predict the behaviour?
-    // TODO: Intercept here and handle tag changes automatically? May be best to let the impl do that.
-    public abstract handleRoomUpdate(room: Room): Promise<boolean>;
+    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean>;
 }
diff --git a/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
index 7c1a0b1acc..185fb606fb 100644
--- a/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import { Algorithm } from "./Algorithm";
-import { DefaultTagID } from "../../models";
 import { ITagMap } from "../models";
 
 /**
@@ -33,11 +32,7 @@ export class ChaoticAlgorithm extends Algorithm {
         return Promise.resolve();
     }
 
-    protected async regenerateTag(tagId: string | DefaultTagID, rooms: []): Promise<[]> {
-        return Promise.resolve(rooms);
-    }
-
-    public async handleRoomUpdate(room): Promise<boolean> {
+    public async handleRoomUpdate(room, cause): Promise<boolean> {
         return Promise.resolve(false);
     }
 }
diff --git a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
index d73fdee930..d66f7cdc37 100644
--- a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
@@ -17,9 +17,9 @@ limitations under the License.
 
 import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { DefaultTagID, TagID } from "../../models";
+import { DefaultTagID, RoomUpdateCause, TagID } from "../../models";
 import { ITagMap, SortAlgorithm } from "../models";
-import { getSortingAlgorithmInstance, sortRoomsWithAlgorithm } from "../tag_sorting";
+import { sortRoomsWithAlgorithm } from "../tag_sorting";
 import * as Unread from '../../../../Unread';
 
 /**
@@ -194,11 +194,12 @@ export class ImportanceAlgorithm extends Algorithm {
         }
     }
 
-    protected async regenerateTag(tagId: string | DefaultTagID, rooms: []): Promise<[]> {
-        return Promise.resolve(rooms);
-    }
-
-    public async handleRoomUpdate(room): Promise<boolean> {
-        return Promise.resolve(false);
+    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        const tags = this.roomIdsToTags[room.roomId];
+        if (!tags) {
+            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
+            return false;
+        }
+        return false;
     }
 }
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index d1c915e035..5294680773 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -34,3 +34,8 @@ export const OrderedDefaultTagIDs = [
 ];
 
 export type TagID = string | DefaultTagID;
+
+export enum RoomUpdateCause {
+    Timeline = "TIMELINE",
+    RoomRead = "ROOM_READ",
+}

From ea34bb3022cda77e96a67e6ae1f06ef881db24d2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 4 May 2020 09:13:35 -0600
Subject: [PATCH 2990/3235] Make component index happy

---
 src/components/views/rooms/RoomList2.tsx    | 2 +-
 src/components/views/rooms/RoomSublist2.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index f7788f0003..7aefc21a49 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -27,7 +27,7 @@ import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import { Dispatcher } from "flux";
 import { ActionPayload } from "../../../dispatcher-types";
 import dis from "../../../dispatcher";
-import { RoomSublist2 } from "./RoomSublist2";
+import  RoomSublist2 from "./RoomSublist2";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index a3ca525b14..ed3740e8b3 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -41,7 +41,7 @@ interface IState {
 }
 
 // TODO: Actually write stub
-export class RoomSublist2 extends React.Component<IProps, IState> {
+export default class RoomSublist2 extends React.Component<IProps, IState> {
     public setHeight(size: number) {
     }
 

From e1fab9a5b663a8c15398dfd15d2015a0b242e193 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 7 May 2020 16:34:22 -0600
Subject: [PATCH 2991/3235] Work out the new category index for each room
 update

See comments within for details on what this means.
---
 .../list_ordering/ImportanceAlgorithm.ts      | 173 ++++++++++++++----
 1 file changed, 136 insertions(+), 37 deletions(-)

diff --git a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
index d66f7cdc37..76cdf4763f 100644
--- a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
@@ -17,7 +17,7 @@ limitations under the License.
 
 import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { DefaultTagID, RoomUpdateCause, TagID } from "../../models";
+import { RoomUpdateCause, TagID } from "../../models";
 import { ITagMap, SortAlgorithm } from "../models";
 import { sortRoomsWithAlgorithm } from "../tag_sorting";
 import * as Unread from '../../../../Unread';
@@ -51,6 +51,16 @@ interface ICategorizedRoomMap {
     [category: Category]: Room[];
 }
 
+interface ICategoryIndex {
+    // @ts-ignore - TS wants this to be a string, but we know better
+    [category: Category]: number; // integer
+}
+
+// Caution: changing this means you'll need to update a bunch of assumptions and
+// comments! Check the usage of Category carefully to figure out what needs changing
+// if you're going to change this array's order.
+const CATEGORY_ORDER = [Category.Red, Category.Grey, Category.Bold, Category.Idle];
+
 /**
  * An implementation of the "importance" algorithm for room list sorting. Where
  * the tag sorting algorithm does not interfere, rooms will be ordered into
@@ -69,6 +79,7 @@ interface ICategorizedRoomMap {
  */
 export class ImportanceAlgorithm extends Algorithm {
 
+    // TODO: Update documentation
     // HOW THIS WORKS
     // --------------
     //
@@ -80,7 +91,7 @@ export class ImportanceAlgorithm extends Algorithm {
     // those tags are tracked as index numbers within the array (zero = top), with
     // each sticky room being tracked separately. Internally, the category index
     // can be found from `this.indices[tag][category]` and the sticky room information
-    // from `this.stickyRooms[tag]`.
+    // from `this.stickyRoom`.
     //
     // Room categories are constantly re-evaluated and tracked in the `this.categorized`
     // object. Note that this doesn't track rooms by category but instead by room ID.
@@ -93,33 +104,17 @@ export class ImportanceAlgorithm extends Algorithm {
 
     private indices: {
         // @ts-ignore - TS wants this to be a string but we know better than it
-        [tag: TagID]: {
-            // @ts-ignore - TS wants this to be a string but we know better than it
-            [category: Category]: number; // integer
-        };
-    } = {};
-    private stickyRooms: {
-        // @ts-ignore - TS wants this to be a string but we know better than it
-        [tag: TagID]: {
-            room?: Room;
-            nAbove: number; // integer
-        };
-    } = {};
-    private categorized: {
-        // @ts-ignore - TS wants this to be a string but we know better than it
-        [tag: TagID]: {
-            // TODO: Remove note
-            // Note: Should in theory be able to only track this by room ID as we'll know
-            // the indices of each category and can determine if a category needs changing
-            // in the cached list. Could potentially save a bunch of time if we can figure
-            // out where a room is supposed to be using offsets, some math, and leaving the
-            // array generally alone.
-            [roomId: string]: {
-                room: Room;
-                category: Category;
-            };
-        };
+        [tag: TagID]: ICategoryIndex;
     } = {};
+    private stickyRoom: {
+        roomId: string;
+        tag: TagID;
+        fromTop: number;
+    } = {
+        roomId: null,
+        tag: null,
+        fromTop: 0,
+    };
 
     constructor() {
         super();
@@ -136,7 +131,6 @@ export class ImportanceAlgorithm extends Algorithm {
         };
         for (const room of rooms) {
             const category = this.getRoomCategory(room);
-            console.log(`[DEBUG] "${room.name}" (${room.roomId}) is a ${category} room`);
             map[category].push(room);
         }
         return map;
@@ -183,13 +177,16 @@ export class ImportanceAlgorithm extends Algorithm {
                     categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, tagId, sortBy);
                 }
 
-                // TODO: Update positions of categories in cache
-                updatedTagMap[tagId] = [
-                    ...categorized[Category.Red],
-                    ...categorized[Category.Grey],
-                    ...categorized[Category.Bold],
-                    ...categorized[Category.Idle],
-                ];
+                const newlyOrganized: Room[] = [];
+                const newIndicies: ICategoryIndex = {};
+
+                for (const category of CATEGORY_ORDER) {
+                    newIndicies[category] = newlyOrganized.length;
+                    newlyOrganized.push(...categorized[category]);
+                }
+
+                this.indices[tagId] = newIndicies;
+                updatedTagMap[tagId] = newlyOrganized;
             }
         }
     }
@@ -200,6 +197,108 @@ export class ImportanceAlgorithm extends Algorithm {
             console.warn(`No tags known for "${room.name}" (${room.roomId})`);
             return false;
         }
-        return false;
+        const category = this.getRoomCategory(room);
+        let changed = false;
+        for (const tag of tags) {
+            if (this.sortAlgorithms[tag] === SortAlgorithm.Manual) {
+                continue; // Nothing to do here.
+            }
+
+            const taggedRooms = this.cached[tag];
+            const indicies = this.indices[tag];
+            let roomIdx = taggedRooms.indexOf(room);
+            let inList = true;
+            if (roomIdx === -1) {
+                console.warn(`Degrading performance to find missing room in "${tag}": ${room.roomId}`);
+                roomIdx = taggedRooms.findIndex(r => r.roomId === room.roomId);
+            }
+            if (roomIdx === -1) {
+                console.warn(`Room ${room.roomId} has no index in ${tag} - assuming end of list`);
+                roomIdx = taggedRooms.length;
+                inList = false; // used so we don't splice the dead room out
+            }
+
+            // Try to avoid doing array operations if we don't have to: only move rooms within
+            // the categories if we're jumping categories
+            const oldCategory = this.getCategoryFromIndicies(roomIdx, indicies);
+            if (oldCategory !== category) {
+                // Move the room and update the indicies
+                this.moveRoomIndexes(1, oldCategory, category, indicies);
+                taggedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
+                taggedRooms.splice(indicies[category], 0, room); // splice in the new room (pre-adjusted)
+                // Note: if moveRoomIndexes() is called after the splice then the insert operation
+                // will happen in the wrong place. Because we would have already adjusted the index
+                // for the category, we don't need to determine how the room is moving in the list.
+                // If we instead tried to insert before updating the indicies, we'd have to determine
+                // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
+                // current position, as it'll affect the category's start index after we remove the
+                // room from the array.
+            }
+
+            // The room received an update, so take out the slice and sort it. This should be relatively
+            // quick because the room is inserted at the top of the category, and most popular sorting
+            // algorithms will deal with trying to keep the active room at the top/start of the category.
+            // For the few algorithms that will have to move the thing quite far (alphabetic with a Z room
+            // for example), the list should already be sorted well enough that it can rip through the
+            // array and slot the changed room in quickly.
+            const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
+                ? Number.MAX_SAFE_INTEGER
+                : indicies[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
+            const startIdx = indicies[category];
+            const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
+            const unsortedSlice = taggedRooms.splice(startIdx, numSort);
+            const sorted = await sortRoomsWithAlgorithm(unsortedSlice, tag, this.sortAlgorithms[tag]);
+            taggedRooms.splice(startIdx, 0, ...sorted);
+
+            // Finally, flag that we've done something
+            changed = true;
+        }
+        return changed;
+    }
+
+    private getCategoryFromIndicies(index: number, indicies: ICategoryIndex): Category {
+        for (let i = 0; i < CATEGORY_ORDER.length; i++) {
+            const category = CATEGORY_ORDER[i];
+            const isLast = i === (CATEGORY_ORDER.length - 1);
+            const startIdx = indicies[category];
+            const endIdx = isLast ? Number.MAX_SAFE_INTEGER : indicies[CATEGORY_ORDER[i + 1]];
+            if (index >= startIdx && index < endIdx) {
+                return category;
+            }
+        }
+
+        // "Should never happen" disclaimer goes here
+        throw new Error("Programming error: somehow you've ended up with an index that isn't in a category");
+    }
+
+    private moveRoomIndexes(nRooms: number, fromCategory: Category, toCategory: Category, indicies: ICategoryIndex) {
+        // We have to update the index of the category *after* the from/toCategory variables
+        // in order to update the indicies correctly. Because the room is moving from/to those
+        // categories, the next category's index will change - not the category we're modifying.
+        // We also need to update subsequent categories as they'll all shift by nRooms, so we
+        // loop over the order to achieve that.
+
+        for (let i = CATEGORY_ORDER.indexOf(fromCategory) + 1; i < CATEGORY_ORDER.length; i++) {
+            const nextCategory = CATEGORY_ORDER[i];
+            indicies[nextCategory] -= nRooms;
+        }
+
+        for (let i = CATEGORY_ORDER.indexOf(toCategory) + 1; i < CATEGORY_ORDER.length; i++) {
+            const nextCategory = CATEGORY_ORDER[i];
+            indicies[nextCategory] += nRooms;
+        }
+
+        // Do a quick check to see if we've completely broken the index
+        for (let i = 1; i <= CATEGORY_ORDER.length; i++) {
+            const lastCat = CATEGORY_ORDER[i - 1];
+            const thisCat = CATEGORY_ORDER[i];
+
+            if (indicies[lastCat] > indicies[thisCat]) {
+                // "should never happen" disclaimer goes here
+                console.warn(`!! Room list index corruption: ${lastCat} (i:${indicies[lastCat]}) is greater than ${thisCat} (i:${indicies[thisCat]}) - category indicies are likely desynced from reality`);
+
+                // TODO: Regenerate index when this happens
+            }
+        }
     }
 }

From 4a0d14e32269fa8e4049d06173e7d9c4035a6499 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 7 May 2020 16:38:14 -0600
Subject: [PATCH 2992/3235] Make missing rooms throw instead

For now at least. We shouldn't encounter this case until we get around to adding support for newly-joined rooms.
---
 .../algorithms/list_ordering/ImportanceAlgorithm.ts          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
index 76cdf4763f..0ebdad1ed1 100644
--- a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
@@ -207,15 +207,12 @@ export class ImportanceAlgorithm extends Algorithm {
             const taggedRooms = this.cached[tag];
             const indicies = this.indices[tag];
             let roomIdx = taggedRooms.indexOf(room);
-            let inList = true;
             if (roomIdx === -1) {
                 console.warn(`Degrading performance to find missing room in "${tag}": ${room.roomId}`);
                 roomIdx = taggedRooms.findIndex(r => r.roomId === room.roomId);
             }
             if (roomIdx === -1) {
-                console.warn(`Room ${room.roomId} has no index in ${tag} - assuming end of list`);
-                roomIdx = taggedRooms.length;
-                inList = false; // used so we don't splice the dead room out
+                throw new Error(`Room ${room.roomId} has no index in ${tag}`);
             }
 
             // Try to avoid doing array operations if we don't have to: only move rooms within

From e88788f4e9c7804c9b78bcd670035bcfe14fae18 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 8 May 2020 11:59:03 -0600
Subject: [PATCH 2993/3235] Handle event decryption too

---
 src/stores/room-list/RoomListStore2.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 06f97ae53e..3a6d911dde 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -156,10 +156,21 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
 
             const roomId = eventPayload.event.getRoomId();
             const room = this.matrixClient.getRoom(roomId);
+            console.log(`[RoomListDebug] Live timeline event ${eventPayload.event.getId()} in ${roomId}`);
             await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
         } else if (payload.action === 'MatrixActions.Event.decrypted') {
-            // TODO: Update room from decrypted event
-            console.log(payload);
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+            const roomId = eventPayload.event.getRoomId();
+            const room = this.matrixClient.getRoom(roomId);
+            if (!room) {
+                console.warn(`Event ${eventPayload.event.getId()} was decrypted in an unknown room ${roomId}`);
+                return;
+            }
+            console.log(`[RoomListDebug] Decrypted timeline event ${eventPayload.event.getId()} in ${roomId}`);
+            // TODO: Check that e2e rooms are calculated correctly on initial load.
+            // It seems like when viewing the room the timeline is decrypted, rather than at startup. This could
+            // cause inaccuracies with the list ordering. We may have to decrypt the last N messages of every room :(
+            await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
         } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
             // TODO: Update DMs
             console.log(payload);

From cb3d17ee28de8d0e96650b8f1dfb5a6fa698a388 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 8 May 2020 12:53:05 -0600
Subject: [PATCH 2994/3235] Bare minimum for rendering a room list

This is non-interactive and missing most features users will expect to have
---
 src/components/views/rooms/RoomList2.tsx    |   9 +-
 src/components/views/rooms/RoomSublist2.tsx | 174 +++++++++++++++++++-
 src/components/views/rooms/RoomTile2.tsx    | 118 +++++++++++++
 3 files changed, 287 insertions(+), 14 deletions(-)
 create mode 100644 src/components/views/rooms/RoomTile2.tsx

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 7aefc21a49..9b0d4579f0 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -156,7 +156,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
             const sublist = this.sublistRefs[tagId];
             if (sublist) sublist.current.setHeight(height);
 
-            // TODO: Check overflow
+            // TODO: Check overflow (see old impl)
 
             // Don't store a height for collapsed sublists
             if (!this.sublistCollapseStates[tagId]) {
@@ -178,6 +178,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     }
 
     private collectSublistRef(tagId: string, ref: React.RefObject<RoomSublist2>) {
+        // TODO: Is this needed?
         if (!ref) {
             delete this.sublistRefs[tagId];
         } else {
@@ -206,11 +207,9 @@ export default class RoomList2 extends React.Component<IProps, IState> {
             const aesthetics: ITagAesthetics = TAG_AESTHETICS[orderedTagId];
             if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
-            const onAddRoomFn = () => {
-                if (!aesthetics.onAddRoom) return;
-                aesthetics.onAddRoom(dis);
-            };
+            const onAddRoomFn = aesthetics.onAddRoom ? () => aesthetics.onAddRoom(dis) : null;
             components.push(<RoomSublist2
+                key={`sublist-${orderedTagId}`}
                 forRooms={true}
                 rooms={orderedRooms}
                 startAsHidden={aesthetics.defaultHidden}
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index ed3740e8b3..21e58abd12 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -17,7 +17,17 @@ limitations under the License.
 */
 
 import * as React from "react";
+import { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from 'classnames';
+import IndicatorScrollbar from "../../structures/IndicatorScrollbar";
+import * as RoomNotifs from '../../../RoomNotifs';
+import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../../views/elements/AccessibleButton";
+import AccessibleTooltipButton from "../../views/elements/AccessibleTooltipButton";
+import * as FormattingUtils from '../../../utils/FormattingUtils';
+import RoomTile2 from "./RoomTile2";
 
 interface IProps {
     forRooms: boolean;
@@ -40,21 +50,167 @@ interface IProps {
 interface IState {
 }
 
-// TODO: Actually write stub
+// TODO: Finish stub
 export default class RoomSublist2 extends React.Component<IProps, IState> {
+    private headerButton = createRef();
+
     public setHeight(size: number) {
+        // TODO: Do a thing
     }
 
-    public render() {
-        // TODO: Proper rendering
+    private hasTiles(): boolean {
+        return this.numTiles > 0;
+    }
+
+    private get numTiles(): number {
+        // TODO: Account for group invites
+        return (this.props.rooms || []).length;
+    }
+
+    private onAddRoom = (e) => {
+        e.stopPropagation();
+        if (this.props.onAddRoom) this.props.onAddRoom();
+    };
+
+    private renderTiles(): React.ReactElement[] {
+        const tiles: React.ReactElement[] = [];
+
+        if (this.props.rooms) {
+            for (const room of this.props.rooms) {
+                tiles.push(<RoomTile2 room={room} key={`room-${room.roomId}`}/>);
+            }
+        }
+
+        return tiles;
+    }
+
+    private renderHeader(): React.ReactElement {
+        const notifications = !this.props.isInvite
+            ? RoomNotifs.aggregateNotificationCount(this.props.rooms)
+            : {count: 0, highlight: true};
+        const notifCount = notifications.count;
+        const notifHighlight = notifications.highlight;
+
+        // TODO: Title on collapsed
+        // TODO: Incoming call box
+
+        let chevron = null;
+        if (this.hasTiles()) {
+            const chevronClasses = classNames({
+                'mx_RoomSubList_chevron': true,
+                'mx_RoomSubList_chevronRight': false, // isCollapsed
+                'mx_RoomSubList_chevronDown': true, // !isCollapsed
+            });
+            chevron = (<div className={chevronClasses}/>);
+        }
 
-        const rooms = this.props.rooms.map(r => (
-            <div key={r.roomId}>{r.name} ({r.roomId})</div>
-        ));
         return (
-            <div>
-                <h4>{this.props.label}</h4>
-                {rooms}
+            <RovingTabIndexWrapper inputRef={this.headerButton}>
+                {({onFocus, isActive, ref}) => {
+                    const tabIndex = isActive ? 0 : -1;
+
+                    let badge;
+                    if (true) { // !isCollapsed
+                        const badgeClasses = classNames({
+                            'mx_RoomSubList_badge': true,
+                            'mx_RoomSubList_badgeHighlight': notifHighlight,
+                        });
+                        // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
+                        if (notifCount > 0) {
+                            badge = (
+                                <AccessibleButton
+                                    tabIndex={tabIndex}
+                                    className={badgeClasses}
+                                    aria-label={_t("Jump to first unread room.")}
+                                >
+                                    <div>
+                                        {FormattingUtils.formatCount(notifCount)}
+                                    </div>
+                                </AccessibleButton>
+                            );
+                        } else if (this.props.isInvite && this.hasTiles()) {
+                            // Render the `!` badge for invites
+                            badge = (
+                                <AccessibleButton
+                                    tabIndex={tabIndex}
+                                    className={badgeClasses}
+                                    aria-label={_t("Jump to first invite.")}
+                                >
+                                    <div>
+                                        {FormattingUtils.formatCount(this.numTiles)}
+                                    </div>
+                                </AccessibleButton>
+                            );
+                        }
+                    }
+
+                    let addRoomButton = null;
+                    if (!!this.props.onAddRoom) {
+                        addRoomButton = (
+                            <AccessibleTooltipButton
+                                tabIndex={tabIndex}
+                                onClick={this.onAddRoom}
+                                className="mx_RoomSubList_addRoom"
+                                title={this.props.addRoomLabel || _t("Add room")}
+                            />
+                        );
+                    }
+
+                    // TODO: a11y
+                    return (
+                        <div className={"mx_RoomSubList_labelContainer"}>
+                            <AccessibleButton
+                                inputRef={ref}
+                                tabIndex={tabIndex}
+                                className={"mx_RoomSubList_label"}
+                                role="treeitem"
+                                aria-level="1"
+                            >
+                                {chevron}
+                                <span>{this.props.label}</span>
+                            </AccessibleButton>
+                            {badge}
+                            {addRoomButton}
+                        </div>
+                    );
+                }}
+            </RovingTabIndexWrapper>
+        );
+    }
+
+    public render(): React.ReactElement {
+        // TODO: Proper rendering
+        // TODO: Error boundary
+
+        const tiles = this.renderTiles();
+
+        const classes = classNames({
+            // TODO: Proper collapse support
+            'mx_RoomSubList': true,
+            'mx_RoomSubList_hidden': false, // len && isCollapsed
+            'mx_RoomSubList_nonEmpty': this.hasTiles(), // len && !isCollapsed
+        });
+
+        let content = null;
+        if (tiles.length > 0) {
+            // TODO: Lazy list rendering
+            // TODO: Whatever scrolling magic needs to happen here
+            content = (
+                <IndicatorScrollbar className='mx_RoomSubList_scroll'>
+                    {tiles}
+                </IndicatorScrollbar>
+            )
+        }
+
+        // TODO: onKeyDown support
+        return (
+            <div
+                className={classes}
+                role="group"
+                aria-label={this.props.label}
+            >
+                {this.renderHeader()}
+                {content}
             </div>
         );
     }
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
new file mode 100644
index 0000000000..cb9ce5cf1a
--- /dev/null
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -0,0 +1,118 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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, { createRef } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from "classnames";
+import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
+import AccessibleButton from "../../views/elements/AccessibleButton";
+import RoomAvatar from "../../views/avatars/RoomAvatar";
+
+interface IProps {
+    room: Room;
+
+    // TODO: Allow faslifying counts (for invites and stuff)
+    // TODO: Transparency?
+    // TODO: Incoming call?
+    // TODO: onClick
+}
+
+interface IState {
+}
+
+// TODO: Finish stub
+export default class RoomTile2 extends React.Component<IProps, IState> {
+    private roomTile = createRef();
+
+    // TODO: Custom status
+    // TODO: Lock icon
+    // TODO: DM indicator
+    // TODO: Presence indicator
+    // TODO: e2e shields
+    // TODO: Handle changes to room aesthetics (name, join rules, etc)
+    // TODO: scrollIntoView?
+    // TODO: hover, badge, etc
+    // TODO: isSelected for hover effects
+    // TODO: Context menu
+    // TODO: a11y
+
+    public render(): React.ReactElement {
+        // TODO: Collapsed state
+        // TODO: Invites
+        // TODO: a11y proper
+        // TODO: Render more than bare minimum
+
+        const classes = classNames({
+            'mx_RoomTile': true,
+            // 'mx_RoomTile_selected': this.state.selected,
+            // 'mx_RoomTile_unread': this.props.unread,
+            // 'mx_RoomTile_unreadNotify': notifBadges,
+            // 'mx_RoomTile_highlight': mentionBadges,
+            // 'mx_RoomTile_invited': isInvite,
+            // 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
+            'mx_RoomTile_noBadges': true, // !badges
+            // 'mx_RoomTile_transparent': this.props.transparent,
+            // 'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
+        });
+
+        const avatarClasses = classNames({
+            'mx_RoomTile_avatar': true,
+        });
+
+        // TODO: the original RoomTile uses state for the room name. Do we need to?
+        let name = this.props.room.name;
+        if (typeof name !== 'string') name = '';
+        name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
+
+        const nameClasses = classNames({
+            'mx_RoomTile_name': true,
+            'mx_RoomTile_invite': false,
+            'mx_RoomTile_badgeShown': false,
+        });
+
+        return (
+            <React.Fragment>
+                <RovingTabIndexWrapper inputRef={this.roomTile}>
+                    {({onFocus, isActive, ref}) =>
+                        <AccessibleButton
+                            onFocus={onFocus}
+                            tabIndex={isActive ? 0 : -1}
+                            inputRef={ref}
+                            className={classes}
+                            role="treeitem"
+                        >
+                            <div className={avatarClasses}>
+                                <div className="mx_RoomTile_avatar_container">
+                                    <RoomAvatar room={this.props.room} width={24} height={24}/>
+                                </div>
+                            </div>
+                            <div className="mx_RoomTile_nameContainer">
+                                <div className="mx_RoomTile_labelContainer">
+                                    <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
+                                        {name}
+                                    </div>
+                                </div>
+                            </div>
+                        </AccessibleButton>
+                    }
+                </RovingTabIndexWrapper>
+            </React.Fragment>
+        );
+    }
+}

From df3d5c415917324a3784535c23fc695f5e3ff1ff Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 May 2020 14:25:30 -0600
Subject: [PATCH 2995/3235] Update i18n for room list

---
 src/i18n/strings/en_EN.json | 10 +++++-----
 src/settings/Settings.js    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fd474f378c..d6ff5f70eb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -406,7 +406,7 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "Use the improved room list component (refresh to apply changes)": "Use the improved room list component (refresh to apply changes)",
+    "Use the improved room list component (refresh to apply changes, in development)": "Use the improved room list component (refresh to apply changes, in development)",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
@@ -1117,7 +1117,7 @@
     "Low priority": "Low priority",
     "Historical": "Historical",
     "System Alerts": "System Alerts",
-    "TODO": "TODO",
+    "Create room": "Create room",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
@@ -1161,6 +1161,9 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
+    "Jump to first unread room.": "Jump to first unread room.",
+    "Jump to first invite.": "Jump to first invite.",
+    "Add room": "Add room",
     "Options": "Options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",
@@ -2052,9 +2055,6 @@
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "Active call": "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>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
     "You seem to be uploading files, are you sure you want to quit?": "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?": "You seem to be in a call, are you sure you want to quit?",
     "Search failed": "Search failed",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 554cf6b968..110fd4238b 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -133,7 +133,7 @@ export const SETTINGS = {
     },
     "feature_new_room_list": {
         isFeature: true,
-        displayName: _td("Use the improved room list component (refresh to apply changes)"),
+        displayName: _td("Use the improved room list component (refresh to apply changes, in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },

From 9f0810240f6ae8d627708d8d51e4f058d0173f55 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 May 2020 16:12:45 -0600
Subject: [PATCH 2996/3235] Clean up imports and other minor lints

---
 src/components/views/rooms/RoomList2.tsx             | 2 +-
 src/stores/room-list/RoomListStore2.ts               | 5 ++---
 src/stores/room-list/RoomListStoreTempProxy.ts       | 4 +---
 src/stores/room-list/algorithms/tag_sorting/index.ts | 2 +-
 src/stores/room-list/membership.ts                   | 3 +--
 src/stores/room-list/models.ts                       | 1 +
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 9b0d4579f0..402a7af014 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -27,7 +27,7 @@ import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import { Dispatcher } from "flux";
 import { ActionPayload } from "../../../dispatcher-types";
 import dis from "../../../dispatcher";
-import  RoomSublist2 from "./RoomSublist2";
+import RoomSublist2 from "./RoomSublist2";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 3a6d911dde..8bbcfc3c8d 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -21,11 +21,10 @@ import SettingsStore from "../../settings/SettingsStore";
 import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
 import { Algorithm } from "./algorithms/list_ordering/Algorithm";
 import TagOrderStore from "../TagOrderStore";
-import { getListAlgorithmInstance } from "./algorithms/list_ordering";
 import { AsyncStore } from "../AsyncStore";
-import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
+import { getListAlgorithmInstance } from "./algorithms/list_ordering";
 
 interface IState {
     tagsEnabled?: boolean;
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 4edca2b9cd..0268cf0a46 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { TagID } from "./models";
-import { Room } from "matrix-js-sdk/src/models/room";
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "./RoomListStore2";
 import OldRoomListStore from "../RoomListStore";
-import { ITagMap } from "./algorithms/models";
 import { UPDATE_EVENT } from "../AsyncStore";
+import { ITagMap } from "./algorithms/models";
 
 /**
  * Temporary RoomListStore proxy. Should be replaced with RoomListStore2 when
diff --git a/src/stores/room-list/algorithms/tag_sorting/index.ts b/src/stores/room-list/algorithms/tag_sorting/index.ts
index 07f8f484d8..155c0f0118 100644
--- a/src/stores/room-list/algorithms/tag_sorting/index.ts
+++ b/src/stores/room-list/algorithms/tag_sorting/index.ts
@@ -19,7 +19,7 @@ import { SortAlgorithm } from "../models";
 import { ManualAlgorithm } from "./ManualAlgorithm";
 import { IAlgorithm } from "./IAlgorithm";
 import { TagID } from "../../models";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 const ALGORITHM_INSTANCES: { [algorithm in SortAlgorithm]: IAlgorithm } = {
     [SortAlgorithm.Recent]: new ChaoticAlgorithm(),
diff --git a/src/stores/room-list/membership.ts b/src/stores/room-list/membership.ts
index 884e2a4a04..3cb4bf146c 100644
--- a/src/stores/room-list/membership.ts
+++ b/src/stores/room-list/membership.ts
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Room} from "matrix-js-sdk/src/models/room";
-import {Event} from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 /**
  * Approximation of a membership status for a given room.
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 5294680773..428378a7aa 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -23,6 +23,7 @@ export enum DefaultTagID {
     DM = "im.vector.fake.direct",
     ServerNotice = "m.server_notice",
 }
+
 export const OrderedDefaultTagIDs = [
     DefaultTagID.Invite,
     DefaultTagID.Favourite,

From 715dd7e1b6126ec0f858d80af1873917d9ebe714 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 May 2020 16:20:26 -0600
Subject: [PATCH 2997/3235] Prepare tooltip for collapsed support

---
 src/components/views/rooms/RoomTile2.tsx | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index cb9ce5cf1a..21ba32ae75 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -23,6 +23,7 @@ import classNames from "classnames";
 import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
+import Tooltip from "../../views/elements/Tooltip";
 
 interface IProps {
     room: Room;
@@ -34,6 +35,7 @@ interface IProps {
 }
 
 interface IState {
+    hover: boolean;
 }
 
 // TODO: Finish stub
@@ -52,6 +54,22 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
     // TODO: Context menu
     // TODO: a11y
 
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            hover: false,
+        };
+    }
+
+    private onTileMouseEnter = () => {
+        this.setState({hover: true});
+    };
+
+    private onTileMouseLeave = () => {
+        this.setState({hover: false});
+    };
+
     public render(): React.ReactElement {
         // TODO: Collapsed state
         // TODO: Invites
@@ -86,6 +104,13 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             'mx_RoomTile_badgeShown': false,
         });
 
+        let tooltip = null;
+        if (false) { // isCollapsed
+            if (this.state.hover) {
+                tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto"/>
+            }
+        }
+
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper inputRef={this.roomTile}>
@@ -95,6 +120,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             tabIndex={isActive ? 0 : -1}
                             inputRef={ref}
                             className={classes}
+                            onMouseEnter={this.onTileMouseEnter}
+                            onMouseLeave={this.onTileMouseLeave}
                             role="treeitem"
                         >
                             <div className={avatarClasses}>
@@ -109,6 +136,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                                     </div>
                                 </div>
                             </div>
+                            {tooltip}
                         </AccessibleButton>
                     }
                 </RovingTabIndexWrapper>

From 6bdcbd0f3d2137caedc19f9659eecac0636632f9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 May 2020 16:29:32 -0600
Subject: [PATCH 2998/3235] Support switching rooms

---
 src/components/views/rooms/RoomTile2.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 21ba32ae75..f32bd7924f 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -24,6 +24,8 @@ import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
 import Tooltip from "../../views/elements/Tooltip";
+import dis from '../../../dispatcher';
+import { Key } from "../../../Keyboard";
 
 interface IProps {
     room: Room;
@@ -31,7 +33,6 @@ interface IProps {
     // TODO: Allow faslifying counts (for invites and stuff)
     // TODO: Transparency?
     // TODO: Incoming call?
-    // TODO: onClick
 }
 
 interface IState {
@@ -70,6 +71,16 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         this.setState({hover: false});
     };
 
+    private onTileClick = (ev: React.KeyboardEvent) => {
+        dis.dispatch({
+            action: 'view_room',
+            // TODO: Support show_room_tile in new room list
+            show_room_tile: true, // make sure the room is visible in the list
+            room_id: this.props.room.roomId,
+            clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)),
+        });
+    };
+
     public render(): React.ReactElement {
         // TODO: Collapsed state
         // TODO: Invites
@@ -122,6 +133,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                             className={classes}
                             onMouseEnter={this.onTileMouseEnter}
                             onMouseLeave={this.onTileMouseLeave}
+                            onClick={this.onTileClick}
                             role="treeitem"
                         >
                             <div className={avatarClasses}>

From e8c33161ec3871805403ef0e508cd79321570a8d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 May 2020 21:09:32 -0600
Subject: [PATCH 2999/3235] Initial work on badges

This doesn't work for bold rooms
---
 src/components/views/rooms/RoomTile2.tsx | 68 +++++++++++++++++++++---
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index f32bd7924f..c6c400ce52 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -26,6 +26,10 @@ import RoomAvatar from "../../views/avatars/RoomAvatar";
 import Tooltip from "../../views/elements/Tooltip";
 import dis from '../../../dispatcher';
 import { Key } from "../../../Keyboard";
+import * as RoomNotifs from '../../../RoomNotifs';
+import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
+import * as Unread from '../../../Unread';
+import * as FormattingUtils from "../../../utils/FormattingUtils";
 
 interface IProps {
     room: Room;
@@ -35,7 +39,14 @@ interface IProps {
     // TODO: Incoming call?
 }
 
-interface IState {
+interface IBadgeState {
+    showBadge: boolean; // if numUnread > 0 && !showBadge -> bold room
+    numUnread: number; // used only if showBadge or showBadgeHighlight is true
+    showBadgeHighlight: boolean; // make the badge red
+    isInvite: boolean; // show a `!` instead of a number
+}
+
+interface IState extends IBadgeState {
     hover: boolean;
 }
 
@@ -60,6 +71,35 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         this.state = {
             hover: false,
+
+            ...this.getBadgeState(),
+        };
+    }
+
+    public componentWillUnmount() {
+
+    }
+
+    private updateBadgeCount() {
+        this.setState({...this.getBadgeState()});
+    }
+
+    private getBadgeState(): IBadgeState {
+        // TODO: Make this code path faster
+        const highlightCount = RoomNotifs.getUnreadNotificationCount(this.props.room, 'highlight');
+        const numUnread = RoomNotifs.getUnreadNotificationCount(this.props.room);
+        const showBadge = Unread.doesRoomHaveUnreadMessages(this.props.room);
+        const myMembership = getEffectiveMembership(this.props.room.getMyMembership());
+        const isInvite = myMembership === EffectiveMembership.Invite;
+        const notifState = RoomNotifs.getRoomNotifsState(this.props.room.roomId);
+        const shouldShowNotifBadge = RoomNotifs.shouldShowNotifBadge(notifState);
+        const shouldShowHighlightBadge = RoomNotifs.shouldShowMentionBadge(notifState);
+
+        return {
+            showBadge: (showBadge && shouldShowNotifBadge) || isInvite,
+            numUnread,
+            showBadgeHighlight: (highlightCount > 0 && shouldShowHighlightBadge) || isInvite,
+            isInvite,
         };
     }
 
@@ -90,12 +130,12 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const classes = classNames({
             'mx_RoomTile': true,
             // 'mx_RoomTile_selected': this.state.selected,
-            // 'mx_RoomTile_unread': this.props.unread,
-            // 'mx_RoomTile_unreadNotify': notifBadges,
-            // 'mx_RoomTile_highlight': mentionBadges,
-            // 'mx_RoomTile_invited': isInvite,
+            'mx_RoomTile_unread': this.state.numUnread > 0,
+            'mx_RoomTile_unreadNotify': this.state.showBadge,
+            'mx_RoomTile_highlight': this.state.showBadgeHighlight,
+            'mx_RoomTile_invited': this.state.isInvite,
             // 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile_noBadges': true, // !badges
+            'mx_RoomTile_noBadges': !this.state.showBadge,
             // 'mx_RoomTile_transparent': this.props.transparent,
             // 'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
         });
@@ -104,6 +144,17 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             'mx_RoomTile_avatar': true,
         });
 
+
+        let badge;
+        if (this.state.showBadge) {
+            const badgeClasses = classNames({
+                'mx_RoomTile_badge': true,
+                'mx_RoomTile_badgeButton': false, // this.state.badgeHover || isMenuDisplayed
+            });
+            const formattedCount = this.state.isInvite ? `!` : FormattingUtils.formatCount(this.state.numUnread);
+            badge = <div className={badgeClasses}>{formattedCount}</div>;
+        }
+
         // TODO: the original RoomTile uses state for the room name. Do we need to?
         let name = this.props.room.name;
         if (typeof name !== 'string') name = '';
@@ -111,8 +162,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         const nameClasses = classNames({
             'mx_RoomTile_name': true,
-            'mx_RoomTile_invite': false,
-            'mx_RoomTile_badgeShown': false,
+            'mx_RoomTile_invite': this.state.isInvite,
+            'mx_RoomTile_badgeShown': this.state.showBadge,
         });
 
         let tooltip = null;
@@ -147,6 +198,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
                                         {name}
                                     </div>
                                 </div>
+                                {badge}
                             </div>
                             {tooltip}
                         </AccessibleButton>

From c37352679d72aec70468d541b2f7cd9483406d30 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 09:34:31 -0600
Subject: [PATCH 3000/3235] Fix bold rooms not bolding

---
 src/components/views/rooms/RoomTile2.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index c6c400ce52..c4025fdb53 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -42,6 +42,7 @@ interface IProps {
 interface IBadgeState {
     showBadge: boolean; // if numUnread > 0 && !showBadge -> bold room
     numUnread: number; // used only if showBadge or showBadgeHighlight is true
+    hasUnread: number; // used to make the room bold
     showBadgeHighlight: boolean; // make the badge red
     isInvite: boolean; // show a `!` instead of a number
 }
@@ -98,6 +99,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         return {
             showBadge: (showBadge && shouldShowNotifBadge) || isInvite,
             numUnread,
+            hasUnread: showBadge,
             showBadgeHighlight: (highlightCount > 0 && shouldShowHighlightBadge) || isInvite,
             isInvite,
         };
@@ -130,7 +132,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         const classes = classNames({
             'mx_RoomTile': true,
             // 'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile_unread': this.state.numUnread > 0,
+            'mx_RoomTile_unread': this.state.numUnread > 0 || this.state.hasUnread,
             'mx_RoomTile_unreadNotify': this.state.showBadge,
             'mx_RoomTile_highlight': this.state.showBadgeHighlight,
             'mx_RoomTile_invited': this.state.isInvite,

From f8cbadaba564cf29e06a81261705882f2783c30f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 12:53:00 -0600
Subject: [PATCH 3001/3235] Clean up comments in skeleton components

---
 src/components/views/rooms/RoomList2.tsx    | 19 ++++++++++---------
 src/components/views/rooms/RoomSublist2.tsx | 16 +++++++++++++---
 src/components/views/rooms/RoomTile2.tsx    | 20 ++++++++++++++------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 402a7af014..12a0117505 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -29,6 +29,15 @@ import { ActionPayload } from "../../../dispatcher-types";
 import dis from "../../../dispatcher";
 import RoomSublist2 from "./RoomSublist2";
 
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************
+ */
+
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
     onFocus: (ev: React.FocusEvent) => void;
@@ -152,6 +161,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
     }
 
     private prepareLayouts() {
+        // TODO: Change layout engine for FTUE support
         this.unfilteredLayout = new Layout((tagId: string, height: number) => {
             const sublist = this.sublistRefs[tagId];
             if (sublist) sublist.current.setHeight(height);
@@ -177,15 +187,6 @@ export default class RoomList2 extends React.Component<IProps, IState> {
         });
     }
 
-    private collectSublistRef(tagId: string, ref: React.RefObject<RoomSublist2>) {
-        // TODO: Is this needed?
-        if (!ref) {
-            delete this.sublistRefs[tagId];
-        } else {
-            this.sublistRefs[tagId] = ref;
-        }
-    }
-
     private renderSublists(): React.ReactElement[] {
         const components: React.ReactElement[] = [];
 
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 21e58abd12..4c3f65b323 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -29,6 +29,15 @@ import AccessibleTooltipButton from "../../views/elements/AccessibleTooltipButto
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import RoomTile2 from "./RoomTile2";
 
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************
+ */
+
 interface IProps {
     forRooms: boolean;
     rooms?: Room[];
@@ -50,12 +59,11 @@ interface IProps {
 interface IState {
 }
 
-// TODO: Finish stub
 export default class RoomSublist2 extends React.Component<IProps, IState> {
     private headerButton = createRef();
 
     public setHeight(size: number) {
-        // TODO: Do a thing
+        // TODO: Do a thing (maybe - height changes are different in FTUE)
     }
 
     private hasTiles(): boolean {
@@ -107,8 +115,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
         return (
             <RovingTabIndexWrapper inputRef={this.headerButton}>
                 {({onFocus, isActive, ref}) => {
+                    // TODO: Use onFocus
                     const tabIndex = isActive ? 0 : -1;
 
+                    // TODO: Collapsed state
                     let badge;
                     if (true) { // !isCollapsed
                         const badgeClasses = classNames({
@@ -156,7 +166,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                         );
                     }
 
-                    // TODO: a11y
+                    // TODO: a11y (see old component)
                     return (
                         <div className={"mx_RoomSubList_labelContainer"}>
                             <AccessibleButton
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index c4025fdb53..8f1b0a3f7a 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -31,12 +31,21 @@ import { EffectiveMembership, getEffectiveMembership } from "../../../stores/roo
 import * as Unread from '../../../Unread';
 import * as FormattingUtils from "../../../utils/FormattingUtils";
 
+/*******************************************************************
+ *   CAUTION                                                       *
+ *******************************************************************
+ * This is a work in progress implementation and isn't complete or *
+ * even useful as a component. Please avoid using it until this    *
+ * warning disappears.                                             *
+ *******************************************************************
+ */
+
 interface IProps {
     room: Room;
 
-    // TODO: Allow faslifying counts (for invites and stuff)
-    // TODO: Transparency?
-    // TODO: Incoming call?
+    // TODO: Allow falsifying counts (for invites and stuff)
+    // TODO: Transparency? Was this ever used?
+    // TODO: Incoming call boxes?
 }
 
 interface IBadgeState {
@@ -51,13 +60,11 @@ interface IState extends IBadgeState {
     hover: boolean;
 }
 
-// TODO: Finish stub
 export default class RoomTile2 extends React.Component<IProps, IState> {
     private roomTile = createRef();
 
     // TODO: Custom status
     // TODO: Lock icon
-    // TODO: DM indicator
     // TODO: Presence indicator
     // TODO: e2e shields
     // TODO: Handle changes to room aesthetics (name, join rules, etc)
@@ -78,7 +85,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
     }
 
     public componentWillUnmount() {
-
+        // TODO: Listen for changes to the badge count and update as needed
     }
 
     private updateBadgeCount() {
@@ -168,6 +175,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             'mx_RoomTile_badgeShown': this.state.showBadge,
         });
 
+        // TODO: Support collapsed state properly
         let tooltip = null;
         if (false) { // isCollapsed
             if (this.state.hover) {

From eb6796bd0eef258bbd278b247e3fd6d773efd6fe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 19:53:09 +0100
Subject: [PATCH 3002/3235] Migrate PasswordScorer to TypeScript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/utils/{PasswordScorer.js => PasswordScorer.ts} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/utils/{PasswordScorer.js => PasswordScorer.ts} (98%)

diff --git a/src/utils/PasswordScorer.js b/src/utils/PasswordScorer.ts
similarity index 98%
rename from src/utils/PasswordScorer.js
rename to src/utils/PasswordScorer.ts
index 9d89942bf5..d8f3b0fb96 100644
--- a/src/utils/PasswordScorer.js
+++ b/src/utils/PasswordScorer.ts
@@ -63,7 +63,7 @@ _td("Short keyboard patterns are easy to guess");
  * @param {string} password Password to score
  * @returns {object} Score result with `score` and `feedback` properties
  */
-export function scorePassword(password) {
+export function scorePassword(password: string) {
     if (password.length === 0) return null;
 
     const userInputs = ZXCVBN_USER_INPUTS.slice();

From aafbd7f2089446aa0c8a9ffc3e2e131ad7ef2e7d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 13:01:51 -0600
Subject: [PATCH 3003/3235] Update misc documentation and spell indices
 correctly

---
 src/stores/RoomListStore.js                   |  2 +-
 src/stores/room-list/RoomListStore2.ts        |  4 +-
 .../list_ordering/ImportanceAlgorithm.ts      | 49 +++++++++----------
 src/stores/room-list/models.ts                |  2 +-
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index ccccbcc313..d452d1589e 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -121,7 +121,7 @@ class RoomListStore extends Store {
     _checkDisabled() {
         this.disabled = SettingsStore.isFeatureEnabled("feature_new_room_list");
         if (this.disabled) {
-            console.warn("DISABLING LEGACY ROOM LIST STORE");
+            console.warn("👋 legacy room list store has been disabled");
         }
     }
 
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 8bbcfc3c8d..c461aeab66 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -67,7 +67,7 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
     private checkEnabled() {
         this.enabled = SettingsStore.isFeatureEnabled("feature_new_room_list");
         if (this.enabled) {
-            console.log("ENABLING NEW ROOM LIST STORE");
+            console.log("⚡ new room list store engaged");
         }
     }
 
@@ -225,7 +225,7 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
         }
 
         if (this.state.tagsEnabled) {
-            // TODO: Find a more reliable way to get tags
+            // TODO: Find a more reliable way to get tags (this doesn't work)
             const roomTags = TagOrderStore.getOrderedTags() || [];
             console.log("rtags", roomTags);
         }
diff --git a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
index 0ebdad1ed1..fd5d4c8163 100644
--- a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
@@ -79,7 +79,6 @@ const CATEGORY_ORDER = [Category.Red, Category.Grey, Category.Bold, Category.Idl
  */
 export class ImportanceAlgorithm extends Algorithm {
 
-    // TODO: Update documentation
     // HOW THIS WORKS
     // --------------
     //
@@ -93,19 +92,17 @@ export class ImportanceAlgorithm extends Algorithm {
     // can be found from `this.indices[tag][category]` and the sticky room information
     // from `this.stickyRoom`.
     //
-    // Room categories are constantly re-evaluated and tracked in the `this.categorized`
-    // object. Note that this doesn't track rooms by category but instead by room ID.
-    // The theory is that by knowing the previous position, new desired position, and
-    // category indices we can avoid tracking multiple complicated maps in memory.
-    //
     // The room list store is always provided with the `this.cached` results, which are
     // updated as needed and not recalculated often. For example, when a room needs to
     // move within a tag, the array in `this.cached` will be spliced instead of iterated.
+    // The `indices` help track the positions of each category to make splicing easier.
 
     private indices: {
         // @ts-ignore - TS wants this to be a string but we know better than it
         [tag: TagID]: ICategoryIndex;
     } = {};
+
+    // TODO: Use this (see docs above)
     private stickyRoom: {
         roomId: string;
         tag: TagID;
@@ -178,14 +175,14 @@ export class ImportanceAlgorithm extends Algorithm {
                 }
 
                 const newlyOrganized: Room[] = [];
-                const newIndicies: ICategoryIndex = {};
+                const newIndices: ICategoryIndex = {};
 
                 for (const category of CATEGORY_ORDER) {
-                    newIndicies[category] = newlyOrganized.length;
+                    newIndices[category] = newlyOrganized.length;
                     newlyOrganized.push(...categorized[category]);
                 }
 
-                this.indices[tagId] = newIndicies;
+                this.indices[tagId] = newIndices;
                 updatedTagMap[tagId] = newlyOrganized;
             }
         }
@@ -205,7 +202,7 @@ export class ImportanceAlgorithm extends Algorithm {
             }
 
             const taggedRooms = this.cached[tag];
-            const indicies = this.indices[tag];
+            const indices = this.indices[tag];
             let roomIdx = taggedRooms.indexOf(room);
             if (roomIdx === -1) {
                 console.warn(`Degrading performance to find missing room in "${tag}": ${room.roomId}`);
@@ -217,16 +214,16 @@ export class ImportanceAlgorithm extends Algorithm {
 
             // Try to avoid doing array operations if we don't have to: only move rooms within
             // the categories if we're jumping categories
-            const oldCategory = this.getCategoryFromIndicies(roomIdx, indicies);
+            const oldCategory = this.getCategoryFromIndices(roomIdx, indices);
             if (oldCategory !== category) {
-                // Move the room and update the indicies
-                this.moveRoomIndexes(1, oldCategory, category, indicies);
+                // Move the room and update the indices
+                this.moveRoomIndexes(1, oldCategory, category, indices);
                 taggedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
-                taggedRooms.splice(indicies[category], 0, room); // splice in the new room (pre-adjusted)
+                taggedRooms.splice(indices[category], 0, room); // splice in the new room (pre-adjusted)
                 // Note: if moveRoomIndexes() is called after the splice then the insert operation
                 // will happen in the wrong place. Because we would have already adjusted the index
                 // for the category, we don't need to determine how the room is moving in the list.
-                // If we instead tried to insert before updating the indicies, we'd have to determine
+                // If we instead tried to insert before updating the indices, we'd have to determine
                 // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
                 // current position, as it'll affect the category's start index after we remove the
                 // room from the array.
@@ -240,8 +237,8 @@ export class ImportanceAlgorithm extends Algorithm {
             // array and slot the changed room in quickly.
             const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
                 ? Number.MAX_SAFE_INTEGER
-                : indicies[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
-            const startIdx = indicies[category];
+                : indices[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
+            const startIdx = indices[category];
             const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
             const unsortedSlice = taggedRooms.splice(startIdx, numSort);
             const sorted = await sortRoomsWithAlgorithm(unsortedSlice, tag, this.sortAlgorithms[tag]);
@@ -253,12 +250,12 @@ export class ImportanceAlgorithm extends Algorithm {
         return changed;
     }
 
-    private getCategoryFromIndicies(index: number, indicies: ICategoryIndex): Category {
+    private getCategoryFromIndices(index: number, indices: ICategoryIndex): Category {
         for (let i = 0; i < CATEGORY_ORDER.length; i++) {
             const category = CATEGORY_ORDER[i];
             const isLast = i === (CATEGORY_ORDER.length - 1);
-            const startIdx = indicies[category];
-            const endIdx = isLast ? Number.MAX_SAFE_INTEGER : indicies[CATEGORY_ORDER[i + 1]];
+            const startIdx = indices[category];
+            const endIdx = isLast ? Number.MAX_SAFE_INTEGER : indices[CATEGORY_ORDER[i + 1]];
             if (index >= startIdx && index < endIdx) {
                 return category;
             }
@@ -268,21 +265,21 @@ export class ImportanceAlgorithm extends Algorithm {
         throw new Error("Programming error: somehow you've ended up with an index that isn't in a category");
     }
 
-    private moveRoomIndexes(nRooms: number, fromCategory: Category, toCategory: Category, indicies: ICategoryIndex) {
+    private moveRoomIndexes(nRooms: number, fromCategory: Category, toCategory: Category, indices: ICategoryIndex) {
         // We have to update the index of the category *after* the from/toCategory variables
-        // in order to update the indicies correctly. Because the room is moving from/to those
+        // in order to update the indices correctly. Because the room is moving from/to those
         // categories, the next category's index will change - not the category we're modifying.
         // We also need to update subsequent categories as they'll all shift by nRooms, so we
         // loop over the order to achieve that.
 
         for (let i = CATEGORY_ORDER.indexOf(fromCategory) + 1; i < CATEGORY_ORDER.length; i++) {
             const nextCategory = CATEGORY_ORDER[i];
-            indicies[nextCategory] -= nRooms;
+            indices[nextCategory] -= nRooms;
         }
 
         for (let i = CATEGORY_ORDER.indexOf(toCategory) + 1; i < CATEGORY_ORDER.length; i++) {
             const nextCategory = CATEGORY_ORDER[i];
-            indicies[nextCategory] += nRooms;
+            indices[nextCategory] += nRooms;
         }
 
         // Do a quick check to see if we've completely broken the index
@@ -290,9 +287,9 @@ export class ImportanceAlgorithm extends Algorithm {
             const lastCat = CATEGORY_ORDER[i - 1];
             const thisCat = CATEGORY_ORDER[i];
 
-            if (indicies[lastCat] > indicies[thisCat]) {
+            if (indices[lastCat] > indices[thisCat]) {
                 // "should never happen" disclaimer goes here
-                console.warn(`!! Room list index corruption: ${lastCat} (i:${indicies[lastCat]}) is greater than ${thisCat} (i:${indicies[thisCat]}) - category indicies are likely desynced from reality`);
+                console.warn(`!! Room list index corruption: ${lastCat} (i:${indices[lastCat]}) is greater than ${thisCat} (i:${indices[thisCat]}) - category indices are likely desynced from reality`);
 
                 // TODO: Regenerate index when this happens
             }
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 428378a7aa..a0c2621077 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -38,5 +38,5 @@ export type TagID = string | DefaultTagID;
 
 export enum RoomUpdateCause {
     Timeline = "TIMELINE",
-    RoomRead = "ROOM_READ",
+    RoomRead = "ROOM_READ", // TODO: Use this.
 }

From 9fbd489b3b1fb83e7f3710ee22fd56a2c8e533e2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 13:03:43 -0600
Subject: [PATCH 3004/3235] Update i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d6ff5f70eb..c4912eb4d0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -406,7 +406,7 @@
     "Render simple counters in room header": "Render simple counters in room header",
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
-    "Use the improved room list component (refresh to apply changes, in development)": "Use the improved room list component (refresh to apply changes, in development)",
+    "Use the improved room list (in development - refresh to apply changes)": "Use the improved room list (in development - refresh to apply changes)",
     "Support adding custom themes": "Support adding custom themes",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 110fd4238b..cd9ec430bf 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -133,7 +133,7 @@ export const SETTINGS = {
     },
     "feature_new_room_list": {
         isFeature: true,
-        displayName: _td("Use the improved room list component (refresh to apply changes, in development)"),
+        displayName: _td("Use the improved room list (in development - refresh to apply changes)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },

From cf3c4d9e5f53a387a60cad742b6304b7c39f5b14 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 20:19:15 +0100
Subject: [PATCH 3005/3235] Extract Password field from Registration into a
 reusable component

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |   1 +
 res/css/_components.scss                      |   1 +
 res/css/views/auth/_AuthBody.scss             |   6 -
 .../_PassphraseField.scss}                    |   7 +-
 src/components/views/auth/PassphraseField.tsx | 121 ++++++++++++++++++
 src/components/views/auth/RegistrationForm.js |  63 +--------
 src/components/views/elements/Validation.tsx  |  13 +-
 yarn.lock                                     |   5 +
 8 files changed, 148 insertions(+), 69 deletions(-)
 rename res/css/views/{elements/_ZxcvbnProgressBar.scss => auth/_PassphraseField.scss} (92%)
 create mode 100644 src/components/views/auth/PassphraseField.tsx

diff --git a/package.json b/package.json
index 92d228a812..797b57d306 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "@types/classnames": "^2.2.10",
     "@types/modernizr": "^3.5.3",
     "@types/react": "16.9",
+    "@types/zxcvbn": "^4.4.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "chokidar": "^3.3.1",
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 671e156585..b871045fa1 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -41,6 +41,7 @@
 @import "./views/auth/_CountryDropdown.scss";
 @import "./views/auth/_InteractiveAuthEntryComponents.scss";
 @import "./views/auth/_LanguageSelector.scss";
+@import "./views/auth/_PassphraseField.scss";
 @import "./views/auth/_ServerConfig.scss";
 @import "./views/auth/_ServerTypeSelector.scss";
 @import "./views/auth/_Welcome.scss";
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index f4967ce202..120da4c4f1 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -146,9 +146,3 @@ limitations under the License.
 .mx_AuthBody_spinner {
     margin: 1em 0;
 }
-
-.mx_AuthBody_passwordScore {
-    height: 4px;
-    position: absolute;
-    top: -12px;
-}
diff --git a/res/css/views/elements/_ZxcvbnProgressBar.scss b/res/css/views/auth/_PassphraseField.scss
similarity index 92%
rename from res/css/views/elements/_ZxcvbnProgressBar.scss
rename to res/css/views/auth/_PassphraseField.scss
index f7786348db..d810198213 100644
--- a/res/css/views/elements/_ZxcvbnProgressBar.scss
+++ b/res/css/views/auth/_PassphraseField.scss
@@ -18,6 +18,8 @@ $PassphraseStrengthHigh: $accent-color;
 $PassphraseStrengthMedium: $username-variant5-color;
 $PassphraseStrengthLow: $notice-primary-color;
 
+.mx_PassphraseField {}
+
 @define-mixin ProgressBarColour $colour {
     color: $colour;
     &::-moz-progress-bar {
@@ -28,10 +30,13 @@ $PassphraseStrengthLow: $notice-primary-color;
     }
 }
 
-progress.mx_ZxcvbnProgressBar {
+progress.mx_PassphraseField_progress {
     appearance: none;
     width: 100%;
     border: 0;
+    height: 4px;
+    position: absolute;
+    top: -12px;
 
     border-radius: 2px;
     &::-moz-progress-bar {
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
new file mode 100644
index 0000000000..425921cd7c
--- /dev/null
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -0,0 +1,121 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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, {PureComponent, RefCallback, RefObject} from "react";
+import classNames from "classnames";
+import zxcvbn from "zxcvbn";
+
+import SdkConfig from "../../../SdkConfig";
+import withValidation, {IFieldState, IValidationResult} from "../elements/Validation";
+import {_t, _td} from "../../../languageHandler";
+import Field from "../elements/Field";
+
+interface IProps {
+    id?: string;
+    className?: string;
+    minScore: 0 | 1 | 2 | 3 | 4;
+    value: string;
+    fieldRef: RefCallback<Field> | RefObject<Field>;
+
+    label?: string;
+    labelEnterPassword?: string;
+    labelStrongPassword?: string;
+    labelAllowedButUnsafe?: string;
+
+    onChange(ev: KeyboardEvent);
+    onValidate(result: IValidationResult);
+}
+
+interface IState {
+    complexity: zxcvbn.ZXCVBNResult;
+}
+
+class PassphraseField extends PureComponent<IProps, IState> {
+    static defaultProps = {
+        label: _td("Password"),
+        labelEnterPassword: _td("Enter password"),
+        labelStrongPassword: _td("Nice, strong password!"),
+        labelAllowedButUnsafe: _td("Password is allowed, but unsafe"),
+    };
+
+    public readonly validate = withValidation<this>({
+        description: function() {
+            const complexity = this.state.complexity;
+            const score = complexity ? complexity.score : 0;
+            return <progress className="mx_PassphraseField_progress" max={4} value={score} />;
+        },
+        rules: [
+            {
+                key: "required",
+                test: ({ value, allowEmpty }) => allowEmpty || !!value,
+                invalid: () => _t(this.props.labelEnterPassword),
+            },
+            {
+                key: "complexity",
+                test: async function({ value }) {
+                    if (!value) {
+                        return false;
+                    }
+                    const { scorePassword } = await import('../../../utils/PasswordScorer');
+                    const complexity = scorePassword(value);
+                    this.setState({ complexity });
+                    const safe = complexity.score >= this.props.minScore;
+                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
+                    return allowUnsafe || safe;
+                },
+                valid: function() {
+                    // Unsafe passwords that are valid are only possible through a
+                    // configuration flag. We'll print some helper text to signal
+                    // to the user that their password is allowed, but unsafe.
+                    if (this.state.complexity.score >= this.props.minScore) {
+                        return _t(this.props.labelStrongPassword);
+                    }
+                    return _t(this.props.labelAllowedButUnsafe);
+                },
+                invalid: function() {
+                    const complexity = this.state.complexity;
+                    if (!complexity) {
+                        return null;
+                    }
+                    const { feedback } = complexity;
+                    return feedback.warning || feedback.suggestions[0] || _t("Keep going...");
+                },
+            },
+        ],
+    });
+
+    onValidate = async (fieldState: IFieldState) => {
+        const result = await this.validate(fieldState);
+        this.props.onValidate(result);
+        return result;
+    };
+
+    render() {
+        return <Field
+            id={this.props.id}
+            className={classNames("mx_PassphraseField", this.props.className)}
+            ref={this.props.fieldRef}
+            type="password"
+            autoComplete="new-password"
+            label={_t(this.props.label)}
+            value={this.props.value}
+            onChange={this.props.onChange}
+            onValidate={this.onValidate}
+        />
+    }
+}
+
+export default PassphraseField;
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 4e2860c0cf..7bbd15d8d3 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -29,7 +29,7 @@ import SdkConfig from '../../../SdkConfig';
 import { SAFE_LOCALPART_REGEX } from '../../../Registration';
 import withValidation from '../elements/Validation';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import ZxcvbnProgressBar from "../elements/ZxcvbnProgressBar";
+import PassphraseField from "./PassphraseField";
 
 const FIELD_EMAIL = 'field_email';
 const FIELD_PHONE_NUMBER = 'field_phone_number';
@@ -264,60 +264,10 @@ export default createReactClass({
         });
     },
 
-    async onPasswordValidate(fieldState) {
-        const result = await this.validatePasswordRules(fieldState);
+    onPasswordValidate(result) {
         this.markFieldValid(FIELD_PASSWORD, result.valid);
-        return result;
     },
 
-    validatePasswordRules: withValidation({
-        description: function() {
-            const complexity = this.state.passwordComplexity;
-            const score = complexity ? complexity.score : 0;
-            return <ZxcvbnProgressBar value={score} className="mx_AuthBody_passwordScore" />;
-        },
-        rules: [
-            {
-                key: "required",
-                test: ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Enter password"),
-            },
-            {
-                key: "complexity",
-                test: async function({ value }) {
-                    if (!value) {
-                        return false;
-                    }
-                    const { scorePassword } = await import('../../../utils/PasswordScorer');
-                    const complexity = scorePassword(value);
-                    this.setState({
-                        passwordComplexity: complexity,
-                    });
-                    const safe = complexity.score >= PASSWORD_MIN_SCORE;
-                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
-                    return allowUnsafe || safe;
-                },
-                valid: function() {
-                    // Unsafe passwords that are valid are only possible through a
-                    // configuration flag. We'll print some helper text to signal
-                    // to the user that their password is allowed, but unsafe.
-                    if (this.state.passwordComplexity.score >= PASSWORD_MIN_SCORE) {
-                        return _t("Nice, strong password!");
-                    }
-                    return _t("Password is allowed, but unsafe");
-                },
-                invalid: function() {
-                    const complexity = this.state.passwordComplexity;
-                    if (!complexity) {
-                        return null;
-                    }
-                    const { feedback } = complexity;
-                    return feedback.warning || feedback.suggestions[0] || _t("Keep going...");
-                },
-            },
-        ],
-    }),
-
     onPasswordConfirmChange(ev) {
         this.setState({
             passwordConfirm: ev.target.value,
@@ -479,13 +429,10 @@ export default createReactClass({
     },
 
     renderPassword() {
-        const Field = sdk.getComponent('elements.Field');
-        return <Field
+        return <PassphraseField
             id="mx_RegistrationForm_password"
-            ref={field => this[FIELD_PASSWORD] = field}
-            type="password"
-            autoComplete="new-password"
-            label={_t("Password")}
+            fieldRef={field => this[FIELD_PASSWORD] = field}
+            minScore={PASSWORD_MIN_SCORE}
             value={this.state.password}
             onChange={this.onPasswordChange}
             onValidate={this.onPasswordValidate}
diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 09d6ec12f7..50544c9f51 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -19,7 +19,7 @@ limitations under the License.
 import React from "react";
 import classNames from "classnames";
 
-type Data = Pick<IValidateArgs, "value" | "allowEmpty">;
+type Data = Pick<IFieldState, "value" | "allowEmpty">;
 
 interface IRule<T> {
     key: string;
@@ -32,15 +32,20 @@ interface IRule<T> {
 
 interface IArgs<T> {
     rules: IRule<T>[];
-    description(): React.ReactChild;
+    description(this: T): React.ReactChild;
 }
 
-interface IValidateArgs {
+export interface IFieldState {
     value: string;
     focused: boolean;
     allowEmpty: boolean;
 }
 
+export interface IValidationResult {
+    valid?: boolean;
+    feedback?: React.ReactChild;
+}
+
 /**
  * Creates a validation function from a set of rules describing what to validate.
  * Generic T is the "this" type passed to the rule methods
@@ -62,7 +67,7 @@ interface IValidateArgs {
  *     the overall validity and a feedback UI that can be rendered for more detail.
  */
 export default function withValidation<T = undefined>({ description, rules }: IArgs<T>) {
-    return async function onValidate({ value, focused, allowEmpty = true }: IValidateArgs) {
+    return async function onValidate({ value, focused, allowEmpty = true }: IFieldState): Promise<IValidationResult> {
         if (!value && allowEmpty) {
             return {
                 valid: null,
diff --git a/yarn.lock b/yarn.lock
index 520e976b17..b2c703c0d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1318,6 +1318,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/zxcvbn@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
+  integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
+
 "@typescript-eslint/experimental-utils@^2.5.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"

From 8e047c3731a436e9cc660ad0b1078f3b971d8121 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 13:26:17 -0600
Subject: [PATCH 3006/3235] Update README for room list store

---
 src/stores/room-list/README.md | 49 +++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
index 0dd6c104d8..020108878b 100644
--- a/src/stores/room-list/README.md
+++ b/src/stores/room-list/README.md
@@ -7,20 +7,21 @@ It's so complicated it needs its own README.
 There's two main kinds of algorithms involved in the room list store: list ordering and tag sorting.
 Throughout the code an intentional decision has been made to call them the List Algorithm and Sorting
 Algorithm respectively. The list algorithm determines the behaviour of the room list whereas the sorting
-algorithm determines how individual tags (lists of rooms, sometimes called sublists) are ordered.
+algorithm determines how rooms get ordered within tags affected by the list algorithm.
 
-Behaviour of the room list takes the shape of default sorting on tags in most cases, though it can
-override what is happening at the tag level depending on the algorithm used (as is the case with the
-importance algorithm, described later).
+Behaviour of the room list takes the shape of determining what features the room list supports, as well
+as determining where and when to apply the sorting algorithm in a tag. The importance algorithm, which
+is described later in this doc, is an example of an algorithm which makes heavy behavioural changes
+to the room list.
 
 Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
 the power to decide when and how to apply the tag sorting, if at all.
 
 ### Tag sorting algorithm: Alphabetical
 
-When used, rooms in a given tag will be sorted alphabetically, where the alphabet is determined by a
-simple string comparison operation (essentially giving the browser the problem of figuring out if A
-comes before Z).
+When used, rooms in a given tag will be sorted alphabetically, where the alphabet's order is a problem
+for the browser. All we do is a simple string comparison and expect the browser to return something
+useful.
 
 ### Tag sorting algorithm: Manual
 
@@ -30,7 +31,7 @@ of `order` cause rooms to appear closer to the top of the list.
 
 ### Tag sorting algorithm: Recent
 
-Rooms are ordered by the timestamp of the most recent useful message. Usefulness is yet another algorithm
+Rooms get ordered by the timestamp of the most recent useful message. Usefulness is yet another algorithm
 in the room list system which determines whether an event type is capable of bubbling up in the room list.
 Normally events like room messages, stickers, and room security changes will be considered useful enough
 to cause a shift in time.
@@ -49,7 +50,7 @@ its relative deterministic behaviour.
 ### List ordering algorithm: Importance
 
 On the other end of the spectrum, this is the most complicated algorithm which exists. There's major
-behavioural changes and the tag sorting algorithm is selectively applied depending on circumstances.
+behavioural changes, and the tag sorting algorithm gets selectively applied depending on circumstances.
 
 Each tag which is not manually ordered gets split into 4 sections or "categories". Manually ordered tags
 simply get the manual sorting algorithm applied to them with no further involvement from the importance
@@ -58,34 +59,37 @@ relative (perceived) importance to the user:
 
 * **Red**: The room has unread mentions waiting for the user.
 * **Grey**: The room has unread notifications waiting for the user. Notifications are simply unread
-  messages which cause a push notification or badge count. Typically this is the default as rooms are
+  messages which cause a push notification or badge count. Typically, this is the default as rooms get
   set to 'All Messages'.
 * **Bold**: The room has unread messages waiting for the user. Essentially this is a grey room without
   a badge/notification count (or 'Mentions Only'/'Muted').
-* **Idle**: No relevant activity has occurred in the room since the user last read it.
+* **Idle**: No useful (see definition of useful above) activity has occurred in the room since the user 
+  last read it.
 
-Conveniently, each tag is ordered by those categories as presented: red rooms appear above grey, grey
-above idle, etc.
+Conveniently, each tag gets ordered by those categories as presented: red rooms appear above grey, grey
+above bold, etc.
 
 Once the algorithm has determined which rooms belong in which categories, the tag sorting algorithm
-is applied to each category in a sub-sub-list fashion. This should result in the red rooms (for example)
-being sorted alphabetically amongst each other and the grey rooms sorted amongst each other, but 
+gets applied to each category in a sub-sub-list fashion. This should result in the red rooms (for example)
+being sorted alphabetically amongst each other as well as the grey rooms sorted amongst each other, but 
 collectively the tag will be sorted into categories with red being at the top.
 
+<!-- TODO: Implement sticky rooms as described below -->
+
 The algorithm also has a concept of a 'sticky' room which is the room the user is currently viewing.
 The sticky room will remain in position on the room list regardless of other factors going on as typically
 clicking on a room will cause it to change categories into 'idle'. This is done by preserving N rooms
-above the selected room at all times where N is the number of rooms above the selected rooms when it was
+above the selected room at all times, where N is the number of rooms above the selected rooms when it was
 selected.
 
 For example, if the user has 3 red rooms and selects the middle room, they will always see exactly one
-room above their selection at all times. If they receive another notification and the tag ordering is set
-to Recent, they'll see the new notification go to the top position and the one that was previously there
-fall behind the sticky room.
+room above their selection at all times. If they receive another notification, and the tag ordering is 
+specified as Recent, they'll see the new notification go to the top position, and the one that was previously
+there fall behind the sticky room.
 
 The sticky room's category is technically 'idle' while being viewed and is explicitly pulled out of the
 tag sorting algorithm's input as it must maintain its position in the list. When the user moves to another
-room, the previous sticky room is recalculated to determine which category it needs to be in as the user
+room, the previous sticky room gets recalculated to determine which category it needs to be in as the user
 could have been scrolled up while new messages were received.
 
 Further, the sticky room is not aware of category boundaries and thus the user can see a shift in what 
@@ -112,7 +116,10 @@ all kinds of filtering.
 The `RoomListStore` is the major coordinator of various `Algorithm` implementations, which take care 
 of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` superclass is also 
 responsible for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: 
-tags are defined on rooms and are not defined as a collection of rooms (unlike how they are presented 
+tags get defined on rooms and are not defined as a collection of rooms (unlike how they are presented 
 to the user). Various list-specific utilities are also included, though they are expected to move 
 somewhere more general when needed. For example, the `membership` utilities could easily be moved 
 elsewhere as needed.
+
+The various bits throughout the room list store should also have jsdoc of some kind to help describe
+what they do and how they work.

From 6cb1efc1a48b476891b488ace83108358883f0b8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 13:45:17 -0600
Subject: [PATCH 3007/3235] Use the new TS dispatcher

---
 src/actions/RoomListActions.ts           |  5 +++--
 src/components/views/rooms/RoomList2.tsx |  4 ++--
 src/components/views/rooms/RoomTile2.tsx |  2 +-
 src/dispatcher-types.ts                  | 28 ------------------------
 src/stores/AsyncStore.ts                 |  2 +-
 src/stores/room-list/RoomListStore2.ts   |  3 ++-
 6 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 src/dispatcher-types.ts

diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
index eb9831ec47..e15e1b0c65 100644
--- a/src/actions/RoomListActions.ts
+++ b/src/actions/RoomListActions.ts
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import { asyncAction } from './actionCreators';
-import RoomListStore, { TAG_DM } from '../stores/RoomListStore';
+import { TAG_DM } from '../stores/RoomListStore';
 import Modal from '../Modal';
 import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
@@ -24,6 +24,7 @@ import * as sdk from '../index';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { AsyncActionPayload } from "../dispatcher/payloads";
+import { RoomListStoreTempProxy } from "../stores/room-list/RoomListStoreTempProxy";
 
 export default class RoomListActions {
     /**
@@ -51,7 +52,7 @@ export default class RoomListActions {
 
         // Is the tag ordered manually?
         if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-            const lists = RoomListStore.getRoomLists();
+            const lists = RoomListStoreTempProxy.getRoomLists();
             const newList = [...lists[newTag]];
 
             newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 12a0117505..a5d0175f01 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -25,9 +25,9 @@ import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/Roo
 import { ITagMap } from "../../../stores/room-list/algorithms/models";
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
 import { Dispatcher } from "flux";
-import { ActionPayload } from "../../../dispatcher-types";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import RoomSublist2 from "./RoomSublist2";
+import { ActionPayload } from "../../../dispatcher/payloads";
 
 /*******************************************************************
  *   CAUTION                                                       *
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 8f1b0a3f7a..53e56d7a1e 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -24,7 +24,7 @@ import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
 import AccessibleButton from "../../views/elements/AccessibleButton";
 import RoomAvatar from "../../views/avatars/RoomAvatar";
 import Tooltip from "../../views/elements/Tooltip";
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { Key } from "../../../Keyboard";
 import * as RoomNotifs from '../../../RoomNotifs';
 import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
diff --git a/src/dispatcher-types.ts b/src/dispatcher-types.ts
deleted file mode 100644
index 16fac0c849..0000000000
--- a/src/dispatcher-types.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 * as flux from "flux";
-import dis from "./dispatcher";
-
-// TODO: Merge this with the dispatcher and centralize types
-
-export interface ActionPayload {
-    [property: string]: any; // effectively "extends Object"
-    action: string;
-}
-
-// For ease of reference in TypeScript classes
-export const defaultDispatcher: flux.Dispatcher<ActionPayload> = dis;
diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
index 5e19e17248..d79fd220b2 100644
--- a/src/stores/AsyncStore.ts
+++ b/src/stores/AsyncStore.ts
@@ -16,8 +16,8 @@ limitations under the License.
 
 import { EventEmitter } from 'events';
 import AwaitLock from 'await-lock';
-import { ActionPayload } from "../dispatcher-types";
 import { Dispatcher } from "flux";
+import { ActionPayload } from "../dispatcher/payloads";
 
 /**
  * The event/channel to listen for in an AsyncStore.
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index c461aeab66..4f38a25d95 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { ActionPayload, defaultDispatcher } from "../../dispatcher-types";
 import SettingsStore from "../../settings/SettingsStore";
 import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
 import { Algorithm } from "./algorithms/list_ordering/Algorithm";
@@ -25,6 +24,8 @@ import { AsyncStore } from "../AsyncStore";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
 import { getListAlgorithmInstance } from "./algorithms/list_ordering";
+import { ActionPayload } from "../../dispatcher/payloads";
+import defaultDispatcher from "../../dispatcher/dispatcher";
 
 interface IState {
     tagsEnabled?: boolean;

From 865495dd695293fa5c8cc9ee17bb24dfdc66d097 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 20:33:50 +0100
Subject: [PATCH 3008/3235] replace zxcvbn field in CreateSecretStorageDialog
 with PassphraseField

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../_CreateSecretStorageDialog.scss           |  11 --
 .../CreateSecretStorageDialog.js              | 106 +++++-------------
 src/components/views/auth/PassphraseField.tsx |   6 +-
 3 files changed, 36 insertions(+), 87 deletions(-)

diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index a9ebd54b31..63e5a3de09 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -68,17 +68,6 @@ limitations under the License.
     margin-top: 0px;
 }
 
-.mx_CreateSecretStorageDialog_passPhraseHelp {
-    flex: 1;
-    height: 64px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateSecretStorageDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateSecretStorageDialog_passPhraseMatch {
     width: 200px;
     margin-left: 20px;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 4c1faa3e6a..b77c71d08c 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -15,18 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-import { scorePassword } from '../../../../utils/PasswordScorer';
 import FileSaver from 'file-saver';
-import { _t } from '../../../../languageHandler';
+import {_t, _td} from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 import {copyNode} from "../../../../utils/strings";
 import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
-import ZxcvbnProgressBar from "../../../../components/views/elements/ZxcvbnProgressBar";
+import PassphraseField from "../../../../components/views/auth/PassphraseField";
 
 const PHASE_LOADING = 0;
 const PHASE_LOADERROR = 1;
@@ -40,7 +39,6 @@ const PHASE_DONE = 8;
 const PHASE_CONFIRM_SKIP = 9;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
-const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
 
 /*
  * Walks the user through the process of creating a passphrase to guard Secure
@@ -69,10 +67,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.state = {
             phase: PHASE_LOADING,
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             copied: false,
             downloaded: false,
-            zxcvbnResult: null,
             backupInfo: null,
             backupSigStatus: null,
             // does the server offer a UI auth flow with just m.login.password
@@ -84,6 +82,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             useKeyBackup: true,
         };
 
+        this._passphraseField = createRef();
+
         this._fetchBackupInfo();
         if (this.state.accountPassword) {
             // If we have an account password in memory, let's simplify and
@@ -365,22 +365,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _onPassPhraseNextClick = async (e) => {
         e.preventDefault();
+        if (!this._passphraseField.current) return; // unmounting
 
-        // If we're waiting for the timeout before updating the result at this point,
-        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-        // even if the user entered a valid passphrase
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-            this._setZxcvbnResultTimeout = null;
-            await new Promise((resolve) => {
-                this.setState({
-                    zxcvbnResult: scorePassword(this.state.passPhrase),
-                }, resolve);
-            });
-        }
-        if (this._passPhraseIsValid()) {
-            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        await this._passphraseField.current.validate({ allowEmpty: false });
+        if (!this._passphraseField.current.state.valid) {
+            this._passphraseField.current.focus();
+            this._passphraseField.current.validate({ allowEmpty: false, focused: true });
+            return;
         }
+
+        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -400,9 +394,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _onSetAgainClick = () => {
         this.setState({
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             phase: PHASE_PASSPHRASE,
-            zxcvbnResult: null,
         });
     }
 
@@ -412,23 +406,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
+    _onPassPhraseValidate = (result) => {
+        this.setState({
+            passPhraseValid: result.valid,
+        });
+    };
+
     _onPassPhraseChange = (e) => {
         this.setState({
             passPhrase: e.target.value,
         });
-
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-        this._setZxcvbnResultTimeout = setTimeout(() => {
-            this._setZxcvbnResultTimeout = null;
-            this.setState({
-                // precompute this and keep it in state: zxcvbn is fast but
-                // we use it in a couple of different places so no point recomputing
-                // it unnecessarily.
-                zxcvbnResult: scorePassword(this.state.passPhrase),
-            });
-        }, PASSPHRASE_FEEDBACK_DELAY);
     }
 
     _onPassPhraseConfirmChange = (e) => {
@@ -437,10 +424,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _passPhraseIsValid() {
-        return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
-    }
-
     _onAccountPasswordChange = (e) => {
         this.setState({
             accountPassword: e.target.value,
@@ -503,37 +486,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Field = sdk.getComponent('views.elements.Field');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const LabelledToggleSwitch = sdk.getComponent('views.elements.LabelledToggleSwitch');
 
-        let strengthMeter;
-        let helpText;
-        if (this.state.zxcvbnResult) {
-            if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This recovery passphrase looks strong enough.");
-            } else {
-                // We take the warning from zxcvbn or failing that, the first
-                // suggestion. In practice The first is generally the most relevant
-                // and it's probably better to present the user with one thing to
-                // improve about their password than a whole collection - it can
-                // spit out a warning and multiple suggestions which starts getting
-                // very information-dense.
-                const suggestion = (
-                    this.state.zxcvbnResult.feedback.warning ||
-                    this.state.zxcvbnResult.feedback.suggestions[0]
-                );
-                const suggestionBlock = <div>{suggestion || _t("Keep going...")}</div>;
-
-                helpText = <div>
-                    {suggestionBlock}
-                </div>;
-            }
-            strengthMeter = <div>
-                <ZxcvbnProgressBar value={this.state.zxcvbnResult.score} />
-            </div>;
-        }
-
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
                 "Set a recovery passphrase to secure encrypted information and recover it if you log out. " +
@@ -541,19 +496,20 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                <Field
-                    type="password"
+                <PassphraseField
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
+                    minScore={PASSWORD_MIN_SCORE}
                     value={this.state.passPhrase}
-                    label={_t("Enter a recovery passphrase")}
+                    onValidate={this._onPassPhraseValidate}
+                    fieldRef={this._passphraseField}
                     autoFocus={true}
-                    autoComplete="new-password"
+
+                    label={_td("Enter a recovery passphrase")}
+                    labelEnterPassword={_td("Enter a recovery passphrase")}
+                    labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
+                    labelAllowedButUnsafe={_td("Great! This recovery passphrase looks strong enough.")}
                 />
-                <div className="mx_CreateSecretStorageDialog_passPhraseHelp">
-                    {strengthMeter}
-                    {helpText}
-                </div>
             </div>
 
             <LabelledToggleSwitch
@@ -565,7 +521,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                disabled={!this._passPhraseIsValid()}
+                disabled={!this.state.passPhraseValid}
             >
                 <button type="button"
                     onClick={this._onSkipSetupClick}
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index 425921cd7c..c1781406d9 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -24,11 +24,12 @@ import {_t, _td} from "../../../languageHandler";
 import Field from "../elements/Field";
 
 interface IProps {
+    autoFocus?: boolean;
     id?: string;
     className?: string;
     minScore: 0 | 1 | 2 | 3 | 4;
     value: string;
-    fieldRef: RefCallback<Field> | RefObject<Field>;
+    fieldRef?: RefCallback<Field> | RefObject<Field>;
 
     label?: string;
     labelEnterPassword?: string;
@@ -51,6 +52,8 @@ class PassphraseField extends PureComponent<IProps, IState> {
         labelAllowedButUnsafe: _td("Password is allowed, but unsafe"),
     };
 
+    state = { complexity: null };
+
     public readonly validate = withValidation<this>({
         description: function() {
             const complexity = this.state.complexity;
@@ -106,6 +109,7 @@ class PassphraseField extends PureComponent<IProps, IState> {
     render() {
         return <Field
             id={this.props.id}
+            autoFocus={this.props.autoFocus}
             className={classNames("mx_PassphraseField", this.props.className)}
             ref={this.props.fieldRef}
             type="password"

From f2979f3fd8f7233c121d4738c1ba037814eddfd7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 20:59:46 +0100
Subject: [PATCH 3009/3235] replace zxcvbn field in CreateKeyBackupDialog with
 PassphraseField

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/_components.scss                      |   1 -
 .../keybackup/_CreateKeyBackupDialog.scss     |  11 --
 .../keybackup/CreateKeyBackupDialog.js        | 108 ++++++------------
 .../CreateSecretStorageDialog.js              |   5 -
 src/i18n/strings/en_EN.json                   |  11 +-
 5 files changed, 37 insertions(+), 99 deletions(-)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index b871045fa1..0faf971786 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -121,7 +121,6 @@
 @import "./views/elements/_Tooltip.scss";
 @import "./views/elements/_TooltipButton.scss";
 @import "./views/elements/_Validation.scss";
-@import "./views/elements/_ZxcvbnProgressBar.scss";
 @import "./views/emojipicker/_EmojiPicker.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
diff --git a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
index b9babd05f5..9be98e25b2 100644
--- a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
@@ -35,17 +35,6 @@ limitations under the License.
     align-items: flex-start;
 }
 
-.mx_CreateKeyBackupDialog_passPhraseHelp {
-    flex: 1;
-    height: 85px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateKeyBackupDialog_passPhraseInput {
     flex: none;
     width: 250px;
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index df2a81263d..532b2f960f 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -15,18 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import FileSaver from 'file-saver';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import { scorePassword } from '../../../../utils/PasswordScorer';
-import { _t } from '../../../../languageHandler';
+import {_t, _td} from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
 import SettingsStore from '../../../../settings/SettingsStore';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 import {copyNode} from "../../../../utils/strings";
-import ZxcvbnProgressBar from "../../../../components/views/elements/ZxcvbnProgressBar";
+import PassphraseField from "../../../../components/views/auth/PassphraseField";
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -37,7 +36,6 @@ const PHASE_DONE = 5;
 const PHASE_OPTOUT_CONFIRM = 6;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
-const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
 
 /*
  * Walks the user through the process of creating an e2e key backup
@@ -53,17 +51,18 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
         this._recoveryKeyNode = null;
         this._keyBackupInfo = null;
-        this._setZxcvbnResultTimeout = null;
 
         this.state = {
             secureSecretStorage: null,
             phase: PHASE_PASSPHRASE,
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             copied: false,
             downloaded: false,
-            zxcvbnResult: null,
         };
+
+        this._passphraseField = createRef();
     }
 
     async componentDidMount() {
@@ -82,12 +81,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         }
     }
 
-    componentWillUnmount() {
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-    }
-
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
@@ -181,22 +174,16 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
     _onPassPhraseNextClick = async (e) => {
         e.preventDefault();
+        if (!this._passphraseField.current) return; // unmounting
 
-        // If we're waiting for the timeout before updating the result at this point,
-        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-        // even if the user entered a valid passphrase
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-            this._setZxcvbnResultTimeout = null;
-            await new Promise((resolve) => {
-                this.setState({
-                    zxcvbnResult: scorePassword(this.state.passPhrase),
-                }, resolve);
-            });
-        }
-        if (this._passPhraseIsValid()) {
-            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        await this._passphraseField.current.validate({ allowEmpty: false });
+        if (!this._passphraseField.current.state.valid) {
+            this._passphraseField.current.focus();
+            this._passphraseField.current.validate({ allowEmpty: false, focused: true });
+            return;
         }
+
+        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -215,9 +202,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _onSetAgainClick = () => {
         this.setState({
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             phase: PHASE_PASSPHRASE,
-            zxcvbnResult: null,
         });
     }
 
@@ -227,23 +214,16 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
+    _onPassPhraseValidate = (result) => {
+        this.setState({
+            passPhraseValid: result.valid,
+        });
+    };
+
     _onPassPhraseChange = (e) => {
         this.setState({
             passPhrase: e.target.value,
         });
-
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-        this._setZxcvbnResultTimeout = setTimeout(() => {
-            this._setZxcvbnResultTimeout = null;
-            this.setState({
-                // precompute this and keep it in state: zxcvbn is fast but
-                // we use it in a couple of different places so no point recomputing
-                // it unnecessarily.
-                zxcvbnResult: scorePassword(this.state.passPhrase),
-            });
-        }, PASSPHRASE_FEEDBACK_DELAY);
     }
 
     _onPassPhraseConfirmChange = (e) => {
@@ -252,35 +232,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _passPhraseIsValid() {
-        return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
-    }
-
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
-        let strengthMeter;
-        let helpText;
-        if (this.state.zxcvbnResult) {
-            if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This recovery passphrase looks strong enough.");
-            } else {
-                const suggestions = [];
-                for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
-                    suggestions.push(<div key={i}>{this.state.zxcvbnResult.feedback.suggestions[i]}</div>);
-                }
-                const suggestionBlock = <div>{suggestions.length > 0 ? suggestions : _t("Keep going...")}</div>;
-
-                helpText = <div>
-                    {this.state.zxcvbnResult.feedback.warning}
-                    {suggestionBlock}
-                </div>;
-            }
-            strengthMeter = <div>
-                <ZxcvbnProgressBar value={this.state.zxcvbnResult.score} />
-            </div>;
-        }
-
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
                 "<b>Warning</b>: You should only set up key backup from a trusted computer.", {},
@@ -294,17 +248,19 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
-                    <input type="password"
-                        onChange={this._onPassPhraseChange}
-                        value={this.state.passPhrase}
+                    <PassphraseField
                         className="mx_CreateKeyBackupDialog_passPhraseInput"
-                        placeholder={_t("Enter a recovery passphrase...")}
+                        onChange={this._onPassPhraseChange}
+                        minScore={PASSWORD_MIN_SCORE}
+                        value={this.state.passPhrase}
+                        onValidate={this._onPassPhraseValidate}
+                        fieldRef={this._passphraseField}
                         autoFocus={true}
+                        label={_td("Enter a recovery passphrase")}
+                        labelEnterPassword={_td("Enter a recovery passphrase")}
+                        labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
+                        labelAllowedButUnsafe={_td("Great! This recovery passphrase looks strong enough.")}
                     />
-                    <div className="mx_CreateKeyBackupDialog_passPhraseHelp">
-                        {strengthMeter}
-                        {helpText}
-                    </div>
                 </div>
             </div>
 
@@ -312,7 +268,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                disabled={!this._passPhraseIsValid()}
+                disabled={!this.state.passPhraseValid}
             />
 
             <details>
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index b77c71d08c..12b71206d0 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -61,7 +61,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         this._recoveryKey = null;
         this._recoveryKeyNode = null;
-        this._setZxcvbnResultTimeout = null;
         this._backupKey = null;
 
         this.state = {
@@ -100,9 +99,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     componentWillUnmount() {
         MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
     }
 
     async _fetchBackupInfo() {
@@ -504,7 +500,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     onValidate={this._onPassPhraseValidate}
                     fieldRef={this._passphraseField}
                     autoFocus={true}
-
                     label={_td("Enter a recovery passphrase")}
                     labelEnterPassword={_td("Enter a recovery passphrase")}
                     labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 82b2a752ea..ec018d5e84 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1888,6 +1888,10 @@
     "Your Modular server": "Your Modular server",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.",
     "Server Name": "Server Name",
+    "Enter password": "Enter password",
+    "Nice, strong password!": "Nice, strong password!",
+    "Password is allowed, but unsafe": "Password is allowed, but unsafe",
+    "Keep going...": "Keep going...",
     "The email field must not be blank.": "The email field must not be blank.",
     "The username field must not be blank.": "The username field must not be blank.",
     "The phone number field must not be blank.": "The phone number field must not be blank.",
@@ -1902,10 +1906,6 @@
     "Use an email address to recover your account": "Use an email address to recover your account",
     "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
     "Doesn't look like a valid email address": "Doesn't look like a valid email address",
-    "Enter password": "Enter password",
-    "Password is allowed, but unsafe": "Password is allowed, but unsafe",
-    "Nice, strong password!": "Nice, strong password!",
-    "Keep going...": "Keep going...",
     "Passwords don't match": "Passwords don't match",
     "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
     "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
@@ -2199,9 +2199,9 @@
     "Restore": "Restore",
     "You'll need to authenticate with the server to confirm the upgrade.": "You'll need to authenticate with the server to confirm the upgrade.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:",
     "Enter a recovery passphrase": "Enter a recovery passphrase",
+    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "Back up encrypted message keys": "Back up encrypted message keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
@@ -2229,7 +2229,6 @@
     "Unable to set up secret storage": "Unable to set up secret storage",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a recovery passphrase...": "Enter a recovery passphrase...",
     "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
     "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",

From 8bab8be3dd14afd1eca49079ccd3a41987138e36 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 21:01:49 +0100
Subject: [PATCH 3010/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/auth/_PassphraseField.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/res/css/views/auth/_PassphraseField.scss b/res/css/views/auth/_PassphraseField.scss
index d810198213..d1b8c47d00 100644
--- a/res/css/views/auth/_PassphraseField.scss
+++ b/res/css/views/auth/_PassphraseField.scss
@@ -18,8 +18,6 @@ $PassphraseStrengthHigh: $accent-color;
 $PassphraseStrengthMedium: $username-variant5-color;
 $PassphraseStrengthLow: $notice-primary-color;
 
-.mx_PassphraseField {}
-
 @define-mixin ProgressBarColour $colour {
     color: $colour;
     &::-moz-progress-bar {

From 89c16603fccfafd2a5503385c819d064d07d9c28 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 14 May 2020 21:06:18 +0100
Subject: [PATCH 3011/3235] Remove the now inlined ZxcvbnProgressBar.tsx

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/elements/ZxcvbnProgressBar.tsx      | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/components/views/elements/ZxcvbnProgressBar.tsx

diff --git a/src/components/views/elements/ZxcvbnProgressBar.tsx b/src/components/views/elements/ZxcvbnProgressBar.tsx
deleted file mode 100644
index 339149b400..0000000000
--- a/src/components/views/elements/ZxcvbnProgressBar.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 classNames from "classnames";
-
-interface IProps {
-    value: 0 | 1 | 2 | 3 | 4;
-    className?: string;
-}
-
-const ZxcvbnProgressBar: React.FC<IProps> = ({value, className}) => {
-    const classes = classNames("mx_ZxcvbnProgressBar", className);
-    return <progress className={classes} max={4} value={value} />;
-};
-
-export default ZxcvbnProgressBar;

From 91a997da1435134f1f42065b3a589a5d49b2ba07 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 14:06:48 -0600
Subject: [PATCH 3012/3235] Replace ChaoticAlgorithm for tag sorting with
 deterministic behaviour

aka: implement the algorithms.
---
 ...ticAlgorithm.ts => AlphabeticAlgorithm.ts} | 11 ++-
 .../algorithms/tag_sorting/RecentAlgorithm.ts | 81 +++++++++++++++++++
 .../room-list/algorithms/tag_sorting/index.ts |  7 +-
 3 files changed, 92 insertions(+), 7 deletions(-)
 rename src/stores/room-list/algorithms/tag_sorting/{ChaoticAlgorithm.ts => AlphabeticAlgorithm.ts} (70%)
 create mode 100644 src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts

diff --git a/src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/tag_sorting/AlphabeticAlgorithm.ts
similarity index 70%
rename from src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts
rename to src/stores/room-list/algorithms/tag_sorting/AlphabeticAlgorithm.ts
index 31846d084a..8d74ebd11e 100644
--- a/src/stores/room-list/algorithms/tag_sorting/ChaoticAlgorithm.ts
+++ b/src/stores/room-list/algorithms/tag_sorting/AlphabeticAlgorithm.ts
@@ -17,13 +17,16 @@ limitations under the License.
 import { Room } from "matrix-js-sdk/src/models/room";
 import { TagID } from "../../models";
 import { IAlgorithm } from "./IAlgorithm";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
+import * as Unread from "../../../../Unread";
 
 /**
- * A demonstration to test the API surface.
- * TODO: Remove this before landing
+ * Sorts rooms according to the browser's determination of alphabetic.
  */
-export class ChaoticAlgorithm implements IAlgorithm {
+export class AlphabeticAlgorithm implements IAlgorithm {
     public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
-        return rooms;
+        return rooms.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+        });
     }
 }
diff --git a/src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts
new file mode 100644
index 0000000000..df84c051f0
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts
@@ -0,0 +1,81 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
+import * as Unread from "../../../../Unread";
+
+/**
+ * Sorts rooms according to the last event's timestamp in each room that seems
+ * useful to the user.
+ */
+export class RecentAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        // We cache the timestamp lookup to avoid iterating forever on the timeline
+        // of events. This cache only survives a single sort though.
+        // We wouldn't need this if `.sort()` didn't constantly try and compare all
+        // of the rooms to each other.
+
+        // TODO: We could probably improve the sorting algorithm here by finding changes.
+        // For example, if we spent a little bit of time to determine which elements have
+        // actually changed (probably needs to be done higher up?) then we could do an
+        // insertion sort or similar on the limited set of changes.
+
+        const tsCache: { [roomId: string]: number } = {};
+        const getLastTs = (r: Room) => {
+            if (tsCache[r.roomId]) {
+                return tsCache[r.roomId];
+            }
+
+            const ts = (() => {
+                // Apparently we can have rooms without timelines, at least under testing
+                // environments. Just return MAX_INT when this happens.
+                if (!r || !r.timeline) {
+                    return Number.MAX_SAFE_INTEGER;
+                }
+
+                for (let i = r.timeline.length - 1; i >= 0; --i) {
+                    const ev = r.timeline[i];
+                    if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
+
+                    // TODO: Don't assume we're using the same client as the peg
+                    if (ev.getSender() === MatrixClientPeg.get().getUserId()
+                        || Unread.eventTriggersUnreadCount(ev)) {
+                        return ev.getTs();
+                    }
+                }
+
+                // we might only have events that don't trigger the unread indicator,
+                // in which case use the oldest event even if normally it wouldn't count.
+                // This is better than just assuming the last event was forever ago.
+                if (r.timeline.length && r.timeline[0].getTs()) {
+                    return r.timeline[0].getTs();
+                } else {
+                    return Number.MAX_SAFE_INTEGER;
+                }
+            })();
+
+            tsCache[r.roomId] = ts;
+            return ts;
+        };
+
+        return rooms.sort((a, b) => {
+            return getLastTs(a) - getLastTs(b);
+        });
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag_sorting/index.ts b/src/stores/room-list/algorithms/tag_sorting/index.ts
index 155c0f0118..c22865f5ba 100644
--- a/src/stores/room-list/algorithms/tag_sorting/index.ts
+++ b/src/stores/room-list/algorithms/tag_sorting/index.ts
@@ -14,16 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
 import { SortAlgorithm } from "../models";
 import { ManualAlgorithm } from "./ManualAlgorithm";
 import { IAlgorithm } from "./IAlgorithm";
 import { TagID } from "../../models";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { RecentAlgorithm } from "./RecentAlgorithm";
+import { AlphabeticAlgorithm } from "./AlphabeticAlgorithm";
 
 const ALGORITHM_INSTANCES: { [algorithm in SortAlgorithm]: IAlgorithm } = {
-    [SortAlgorithm.Recent]: new ChaoticAlgorithm(),
-    [SortAlgorithm.Alphabetic]: new ChaoticAlgorithm(),
+    [SortAlgorithm.Recent]: new RecentAlgorithm(),
+    [SortAlgorithm.Alphabetic]: new AlphabeticAlgorithm(),
     [SortAlgorithm.Manual]: new ManualAlgorithm(),
 };
 

From 51165dc6695fe53300cb4b41fdcea74ffb2dd5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 18:56:29 +0000
Subject: [PATCH 3013/3235] Translated using Weblate (Estonian)

Currently translated at 50.3% (1162 of 2312 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 2ab308b469..738b863122 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1116,5 +1116,54 @@
     "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Selle aliase eemaldamisel tekkis viga. Teda kas pole enam olemas või tekkis mingi ajutine viga.",
     "Error removing alias": "Viga aliase eemaldamisel",
     "Main address": "Põhiaadress",
-    "not specified": "määratlemata"
+    "not specified": "määratlemata",
+    "Rejecting invite …": "Hülgan kutset …",
+    "Join the conversation with an account": "Liitu vestlusega kasutades oma kontot",
+    "Sign Up": "Registreeru",
+    "Loading room preview": "Laen jututoa eelvaadet",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s müksas sind välja jututoast %(roomName)s",
+    "Reason: %(reason)s": "Põhjus: %(reason)s",
+    "Forget this room": "Unusta see jututuba",
+    "Re-join": "Liitu uuesti",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s keelas sulle ligipääsu jututuppa %(roomName)s",
+    "Something went wrong with your invite to %(roomName)s": "Midagi läks viltu sinu kutsega %(roomName)s jututuppa",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Sinu kutse kontrollimisel tekkis viga (%(errcode)s). Kui võimalik, siis proovi see info edastada jututoa haldurile.",
+    "unknown error code": "tundmatu veakood",
+    "You can only join it with a working invite.": "Sa võid liituda vaid toimiva kutse alusel.",
+    "Try to join anyway": "Proovi siiski liituda",
+    "You can still join it because this is a public room.": "Kuna tegemist on avaliku jututoaga, siis võid ikkagi liituda.",
+    "Join the discussion": "Liitu vestlusega",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "See kutse jututuppa %(roomName)s saadeti e-posti aadressile %(email)s, mis ei ole seotud sinu kontoga",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Selleks et saada kutseid otse Riot'isse, seosta see e-posti aadress seadete all oma kontoga.",
+    "This invite to %(roomName)s was sent to %(email)s": "Kutse %(roomName)s jututuppa saadeti %(email)s e-posti aadressile",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Selleks et saada kutseid otse Riot'isse peab seadistustes olema määratud isikutuvastusserver.",
+    "Share this email in Settings to receive invites directly in Riot.": "Selleks, et saada kutseid otse Riot'isse, jaga oma seadetes seda e-posti aadressi.",
+    "Start chatting": "Alusta vestlust",
+    "Do you want to join %(roomName)s?": "Kas sa soovid liitud jututoaga %(roomName)s?",
+    "<userName/> invited you": "<userName/> kutsus sind",
+    "Reject": "Hülga",
+    "You're previewing %(roomName)s. Want to join it?": "Sa vaatad jututoa %(roomName)s eelvaadet. Kas soovid sellega liituda?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Jututoal %(roomName)s puudub eelvaate võimalus. Kas sa soovid sellega liituda?",
+    "%(roomName)s does not exist.": "Jututuba %(roomName)s ei ole olemas.",
+    "This room doesn't exist. Are you sure you're at the right place?": "Seda jututuba ei ole olemas. Kas sa oled kindlasti õiges kohas?",
+    "%(roomName)s is not accessible at this time.": "Jututuba %(roomName)s ei ole parasjagu kättesaadav.",
+    "Try again later, or ask a room admin to check if you have access.": "Proovi hiljem uuesti või küsi jututoa haldurilt, kas sul on ligipääs olemas.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Astumisel jututuppa tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
+    "Never lose encrypted messages": "Ära kunagi kaota krüptitud sõnumeid",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Sõnumid siis jututoas kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Vältimaks nende kaotamist, varunda turvaliselt oma võtmed. <a>Loe lisateavet.</a>",
+    "Not now": "Mitte praegu",
+    "Don't ask me again": "Ära küsi minult uuesti",
+    "%(count)s unread messages including mentions.|other": "%(count)s lugemata sõnumit kaasa arvatud mainimised.",
+    "%(count)s unread messages.|other": "%(count)s lugemata teadet.",
+    "%(count)s unread messages.|one": "1 lugemata teade.",
+    "Unread mentions.": "Lugemata mainimised.",
+    "Unread messages.": "Lugemata sõnumid.",
+    "Add a topic": "Lisa teema",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Selle jututoa versiooni uuendamine sulgeb tema praeguse instantsi ja loob sama nimega uuendatud jututoa.",
+    "This room has already been upgraded.": "See jututuba on juba uuendatud.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Selle jututoa versioon on <roomVersion /> ning see koduserver on tema märkinud <i>ebastabiilseks</i>.",
+    "Only room administrators will see this warning": "Vaid administraatorid näevad seda hoiatust",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Kirjutades <code>/help</code> saad vaadata käskude loendit. Või soovisid seda saata sõnumina?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vihje: kui soovid alustada sõnumit kaldkriipsuga, siis kirjuta <code>//</code>."
 }

From b7ba9b3c413043ac759aacb15fe6650f2be2a73b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 14:16:26 -0600
Subject: [PATCH 3014/3235] Replace ChaoticAlgorithm with NaturalAlgorithm for
 list behaviour

---
 .../list_ordering/ChaoticAlgorithm.ts         | 38 -------------
 .../list_ordering/NaturalAlgorithm.ts         | 56 +++++++++++++++++++
 .../algorithms/list_ordering/index.ts         |  4 +-
 3 files changed, 58 insertions(+), 40 deletions(-)
 delete mode 100644 src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
 create mode 100644 src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts

diff --git a/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
deleted file mode 100644
index 185fb606fb..0000000000
--- a/src/stores/room-list/algorithms/list_ordering/ChaoticAlgorithm.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 { Algorithm } from "./Algorithm";
-import { ITagMap } from "../models";
-
-/**
- * A demonstration/temporary algorithm to verify the API surface works.
- * TODO: Remove this before shipping
- */
-export class ChaoticAlgorithm extends Algorithm {
-
-    constructor() {
-        super();
-        console.log("Constructed a ChaoticAlgorithm");
-    }
-
-    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
-        return Promise.resolve();
-    }
-
-    public async handleRoomUpdate(room, cause): Promise<boolean> {
-        return Promise.resolve(false);
-    }
-}
diff --git a/src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts
new file mode 100644
index 0000000000..1265564352
--- /dev/null
+++ b/src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { Algorithm } from "./Algorithm";
+import { ITagMap } from "../models";
+import { sortRoomsWithAlgorithm } from "../tag_sorting";
+
+/**
+ * Uses the natural tag sorting algorithm order to determine tag ordering. No
+ * additional behavioural changes are present.
+ */
+export class NaturalAlgorithm extends Algorithm {
+
+    constructor() {
+        super();
+        console.log("Constructed a NaturalAlgorithm");
+    }
+
+    protected async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+        for (const tagId of Object.keys(updatedTagMap)) {
+            const unorderedRooms = updatedTagMap[tagId];
+
+            const sortBy = this.sortAlgorithms[tagId];
+            if (!sortBy) throw new Error(`${tagId} does not have a sorting algorithm`);
+
+            updatedTagMap[tagId] = await sortRoomsWithAlgorithm(unorderedRooms, tagId, sortBy);
+        }
+    }
+
+    public async handleRoomUpdate(room, cause): Promise<boolean> {
+        const tags = this.roomIdsToTags[room.roomId];
+        if (!tags) {
+            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
+            return false;
+        }
+        for (const tag of tags) {
+            // TODO: Optimize this loop to avoid useless operations
+            // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
+            this.cached[tag] = await sortRoomsWithAlgorithm(this.cached[tag], tag, this.sortAlgorithms[tag]);
+        }
+        return true; // assume we changed something
+    }
+}
diff --git a/src/stores/room-list/algorithms/list_ordering/index.ts b/src/stores/room-list/algorithms/list_ordering/index.ts
index 35f4af14cf..bcccd150cd 100644
--- a/src/stores/room-list/algorithms/list_ordering/index.ts
+++ b/src/stores/room-list/algorithms/list_ordering/index.ts
@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import { Algorithm } from "./Algorithm";
-import { ChaoticAlgorithm } from "./ChaoticAlgorithm";
 import { ImportanceAlgorithm } from "./ImportanceAlgorithm";
 import { ListAlgorithm } from "../models";
+import { NaturalAlgorithm } from "./NaturalAlgorithm";
 
 const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: () => Algorithm } = {
-    [ListAlgorithm.Natural]: () => new ChaoticAlgorithm(),
+    [ListAlgorithm.Natural]: () => new NaturalAlgorithm(),
     [ListAlgorithm.Importance]: () => new ImportanceAlgorithm(),
 };
 

From 5cfe29de668161ab4ed82e05e4890deee94b5893 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 May 2020 14:20:01 -0600
Subject: [PATCH 3015/3235] Update AsyncStore's docs to be slightly more clear

---
 src/stores/AsyncStore.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
index d79fd220b2..3519050078 100644
--- a/src/stores/AsyncStore.ts
+++ b/src/stores/AsyncStore.ts
@@ -29,9 +29,11 @@ export const UPDATE_EVENT = "update";
  * of everything needing to happen in a dispatch cycle, everything can
  * happen async to that cycle.
  *
- * The store's core principle is Object.assign(), therefore it is recommended
- * to break out your state to be as safe as possible. The state mutations are
- * also locked, preventing concurrent writes.
+ * The store operates by using Object.assign() to mutate state - it sends the
+ * state objects (current and new) through the function onto a new empty
+ * object. Because of this, it is recommended to break out your state to be as
+ * safe as possible. The state mutations are also locked, preventing concurrent
+ * writes.
  *
  * All updates to the store happen on the UPDATE_EVENT event channel with the
  * one argument being the instance of the store.

From 21e471375ee2cb52d950c27c337530f389dbe0d7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Mar 2020 13:34:56 -0600
Subject: [PATCH 3016/3235] Revert "Add temporary timing functions to old
 RoomListStore"

This reverts commit 82b55ffd7717b4256690f43eb6891b173fe3cec9.
---
 src/stores/RoomListStore.js | 60 +++++--------------------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index b0690e7e69..c19b2f8bc2 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -58,27 +58,7 @@ export const ALGO_RECENT = "recent";
 
 const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
 
-function debugLog(...msg) {
-    console.log(`[RoomListStore:Debug] `, ...msg);
-}
-
-const timers = {};
-let timerCounter = 0;
-function startTimer(fnName) {
-    const id = `${fnName}_${(new Date()).getTime()}_${timerCounter++}`;
-    debugLog(`Started timer for ${fnName} with ID ${id}`);
-    timers[id] = {start: (new Date()).getTime(), fnName};
-    return id;
-}
-
-function endTimer(id) {
-    const timer = timers[id];
-    delete timers[id];
-    const diff = (new Date()).getTime() - timer.start;
-    debugLog(`${timer.fnName} took ${diff}ms (ID: ${id})`);
-}
-
-function getListAlgorithm(listKey, settingAlgorithm) {
+const getListAlgorithm = (listKey, settingAlgorithm) => {
     // apply manual sorting only to m.favourite, otherwise respect the global setting
     // all the known tags are listed explicitly here to simplify future changes
     switch (listKey) {
@@ -93,7 +73,7 @@ function getListAlgorithm(listKey, settingAlgorithm) {
         default: // custom-tags
             return ALGO_MANUAL;
     }
-}
+};
 
 const knownLists = new Set([
     "m.favourite",
@@ -377,7 +357,6 @@ class RoomListStore extends Store {
     }
 
     _getRecommendedTagsForRoom(room) {
-        const timerId = startTimer(`_getRecommendedTagsForRoom(room:"${room.roomId}")`);
         const tags = [];
 
         const myMembership = room.getMyMembership();
@@ -403,12 +382,11 @@ class RoomListStore extends Store {
             tags.push("im.vector.fake.archived");
         }
 
-        endTimer(timerId);
+
         return tags;
     }
 
     _slotRoomIntoList(room, category, tag, existingEntries, newList, lastTimestampFn) {
-        const timerId = startTimer(`_slotRoomIntoList(room:"${room.roomId}", "${category}", "${tag}", existingEntries: "${existingEntries.length}", "${newList}", lastTimestampFn:"${lastTimestampFn !== null}")`);
         const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
 
         let categoryComparator = (a, b) => lastTimestampFn(a.room) >= lastTimestampFn(b.room);
@@ -520,16 +498,11 @@ class RoomListStore extends Store {
             pushedEntry = true;
         }
 
-        endTimer(timerId);
         return pushedEntry;
     }
 
     _setRoomCategory(room, category) {
-        const timerId = startTimer(`_setRoomCategory(room:"${room.roomId}", "${category}")`);
-        if (!room) {
-            endTimer(timerId);
-            return; // This should only happen in tests
-        }
+        if (!room) return; // This should only happen in tests
 
         const listsClone = {};
 
@@ -626,11 +599,9 @@ class RoomListStore extends Store {
         }
 
         this._setState({lists: listsClone});
-        endTimer(timerId);
     }
 
     _generateInitialRoomLists() {
-        const timerId = startTimer(`_generateInitialRoomLists()`);
         // Log something to show that we're throwing away the old results. This is for the inevitable
         // question of "why is 100% of my CPU going towards Riot?" - a quick look at the logs would reveal
         // that something is wrong with the RoomListStore.
@@ -743,7 +714,6 @@ class RoomListStore extends Store {
             lists,
             ready: true, // Ready to receive updates to ordering
         });
-        endTimer(timerId);
     }
 
     _eventTriggersRecentReorder(ev) {
@@ -756,9 +726,7 @@ class RoomListStore extends Store {
     _tsOfNewestEvent(room) {
         // Apparently we can have rooms without timelines, at least under testing
         // environments. Just return MAX_INT when this happens.
-        if (!room || !room.timeline) {
-            return Number.MAX_SAFE_INTEGER;
-        }
+        if (!room || !room.timeline) return Number.MAX_SAFE_INTEGER;
 
         for (let i = room.timeline.length - 1; i >= 0; --i) {
             const ev = room.timeline[i];
@@ -778,35 +746,23 @@ class RoomListStore extends Store {
     }
 
     _calculateCategory(room) {
-        const timerId = startTimer(`_calculateCategory(room:"${room.roomId}")`);
         if (!this._state.orderImportantFirst) {
             // Effectively disable the categorization of rooms if we're supposed to
             // be sorting by more recent messages first. This triggers the timestamp
             // comparison bit of _setRoomCategory and _recentsComparator instead of
             // the category ordering.
-            endTimer(timerId);
             return CATEGORY_IDLE;
         }
 
         const mentions = room.getUnreadNotificationCount("highlight") > 0;
-        if (mentions) {
-            endTimer(timerId);
-            return CATEGORY_RED;
-        }
+        if (mentions) return CATEGORY_RED;
 
         let unread = room.getUnreadNotificationCount() > 0;
-        if (unread) {
-            endTimer(timerId);
-            return CATEGORY_GREY;
-        }
+        if (unread) return CATEGORY_GREY;
 
         unread = Unread.doesRoomHaveUnreadMessages(room);
-        if (unread) {
-            endTimer(timerId);
-            return CATEGORY_BOLD;
-        }
+        if (unread) return CATEGORY_BOLD;
 
-        endTimer(timerId);
         return CATEGORY_IDLE;
     }
 

From 59f1657b4382a88ad87396af8852a6f9d3a0682a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 May 2020 00:25:19 +0100
Subject: [PATCH 3017/3235] Add jest-canvas-mock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index dda4a5a897..708ae91b0b 100644
--- a/package.json
+++ b/package.json
@@ -138,6 +138,7 @@
     "flow-parser": "^0.57.3",
     "glob": "^5.0.14",
     "jest": "^24.9.0",
+    "jest-canvas-mock": "^2.2.0",
     "lolex": "^5.1.2",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
@@ -157,6 +158,7 @@
     "testMatch": [
       "<rootDir>/test/**/*-test.js"
     ],
+    "setupFiles": ["jest-canvas-mock"],
     "setupFilesAfterEnv": [
       "<rootDir>/test/setupTests.js"
     ],

From e79959a4eca99a7a4155851ec0860a01a55f371d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 May 2020 00:31:30 +0100
Subject: [PATCH 3018/3235] try fix tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/messages/TextualBody-test.js        |  4 +--
 yarn.lock                                     | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 59671327ce..364d239038 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -205,9 +205,9 @@ describe("<TextualBody />", () => {
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
-                '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
+                '<img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
                 'style="width: 1.0666666666666667rem; height: 1.0666666666666667rem;" ' +
-                'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
+                'title="@member:domain.bla" alt="" aria-hidden="true" src="mxc://avatar.url/image.png">Member</a>' +
                 '</span></span>');
         });
     });
diff --git a/yarn.lock b/yarn.lock
index b0d3816dc4..0e9fe51490 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2470,6 +2470,11 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@~0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
@@ -2723,6 +2728,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssfontparser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
+  integrity sha1-9AIvyPlwDGgCnVQghK+69CWj8+M=
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@@ -4947,6 +4957,14 @@ istanbul-reports@^2.2.6:
   dependencies:
     html-escaper "^2.0.0"
 
+jest-canvas-mock@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.2.0.tgz#45fbc58589c6ce9df50dc90bd8adce747cbdada7"
+  integrity sha512-DcJdchb7eWFZkt6pvyceWWnu3lsp5QWbUeXiKgEMhwB3sMm5qHM1GQhDajvJgBeiYpgKcojbzZ53d/nz6tXvJw==
+  dependencies:
+    cssfontparser "^1.2.1"
+    parse-color "^1.0.0"
+
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -6404,6 +6422,13 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
+parse-color@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619"
+  integrity sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=
+  dependencies:
+    color-convert "~0.5.0"
+
 parse-entities@^1.0.2, parse-entities@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"

From 523067e5f9ec90ec9283b9988822d5fd90d342cd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 May 2020 13:32:12 +0100
Subject: [PATCH 3019/3235] Make email auth component fail better if server
 claims email isn't validated

https://github.com/matrix-org/synapse/issues/7512 means that (at least)
sometimes after clicking on the email validation link and being redirected
to riot, the server will claim the email identity auth stage is still incomplete.

This meant that we displayed the email identity UIA component but with an empty
email address, because we don't know that in the new session. Work around this by
assuming that if the email UIA component is being displayed but we don't have an
email address input, the link has been clicked and we're just waiting for the poll.

Also don't fire off an initial register request if we're already mid-UI-auth, because
that's confusing and unnecessary.

Also also remove unused requestingToken state.

Fixes https://github.com/vector-im/riot-web/issues/13434
---
 src/components/structures/auth/Registration.js     | 13 +++++++++----
 .../views/auth/InteractiveAuthEntryComponents.js   | 14 +++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 7818496e71..a25b532447 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -243,10 +243,15 @@ export default createReactClass({
             });
         };
         try {
-            await this._makeRegisterRequest({});
-            // This should never succeed since we specified an empty
-            // auth object.
-            console.log("Expecting 401 from register request but got success!");
+            // We do the first registration request ourselves to discover whether we need to
+            // do SSO instead. If we've already started the UI Auth process though, we don't
+            // need to.
+            if (!this.state.doingUIAuth) {
+                await this._makeRegisterRequest({});
+                // This should never succeed since we specified an empty
+                // auth object.
+                console.log("Expecting 401 from register request but got success!");
+            }
         } catch (e) {
             if (e.httpStatus === 401) {
                 this.setState({
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 327451be17..655452fcee 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -412,14 +412,14 @@ export const EmailIdentityAuthEntry = createReactClass({
         this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
-    getInitialState: function() {
-        return {
-            requestingToken: false,
-        };
-    },
-
     render: function() {
-        if (this.state.requestingToken) {
+        // This component is now only displayed once the token has been requested,
+        // so we know the email has been sent. It can also get loaded after the user
+        // has clicked the validation link if the server takes a while to propagate
+        // the validation internally. If we're in the session spawned from clicking
+        // the validation link, we won't know the email address, so if we don't have it,
+        // assume that the link has been clicked and the server will realise when we poll.
+        if (this.props.inputs.emailAddress === undefined) {
             const Loader = sdk.getComponent("elements.Spinner");
             return <Loader />;
         } else {

From 4ef32598edc874af554bf3773e573a75c1aa0d6f Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 15 May 2020 07:36:23 +0000
Subject: [PATCH 3020/3235] Translated using Weblate (Albanian)

Currently translated at 99.9% (2309 of 2312 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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index ee2781f445..7058ad67b0 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2408,5 +2408,21 @@
     "or another cross-signing capable Matrix client": "ose një tjetër klient Matrix i aftë për <em>cross-signing</em",
     "Use Recovery Passphrase or Key": "Përdorni Frazëkalim Rikthimesh ose Kyç",
     "Unable to query secret storage status": "S’u arrit të merret gjendje depozite të fshehtë",
-    "Currently indexing: %(currentRoom)s": "Indeksim aktual: %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "Indeksim aktual: %(currentRoom)s",
+    "Opens chat with the given user": "Hap fjalosje me përdoruesin e dhënë",
+    "Sends a message to the given user": "I dërgon një mesazh përdoruesit të dhënë",
+    "Waiting for your other session to verify…": "Po pritet për verifikimin e sesionit tuaj tjetër…",
+    "You've successfully verified your device!": "E verifikuat me sukses pajisjen tuaj!",
+    "Message deleted": "Mesazhi u fshi",
+    "Message deleted by %(name)s": "Mesazh i fshirë nga %(name)s",
+    "QR Code": "Kod QR",
+    "To continue, use Single Sign On to prove your identity.": "Që të vazhdohet, përdorni Hyrje Njëshe, që të provoni identitetin tuaj.",
+    "Confirm to continue": "Ripohojeni që të vazhdohet",
+    "Click the button below to confirm your identity.": "Klikoni mbi butonin më poshtë që të ripohoni identitetin tuaj.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Ftoni dikë duke përdorur emrin e tij, emrin e përdoruesit (bie fjala, <userId/>), adresën email ose <a>duke ndarë me të këtë dhomë</a>.",
+    "Confirm encryption setup": "Ripohoni ujdisje fshehtëzimi",
+    "Click the button below to confirm setting up encryption.": "Klikoni mbi butonin më poshtë që të ripohoni ujdisjen e fshehtëzimit.",
+    "Dismiss read marker and jump to bottom": "Mos merr parasysh piketë leximi dhe hidhu te fundi",
+    "Jump to oldest unread message": "Hidhu te mesazhi më i vjetër i palexuar",
+    "Upload a file": "Ngarkoni një kartelë"
 }

From 7ae10d0ba8deaf54f2db30d1f3e3e1b76724ee54 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 15 May 2020 01:55:37 +0000
Subject: [PATCH 3021/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2312 of 2312 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 0ca6cfc586..4995eeccb0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2430,5 +2430,9 @@
     "Confirm to continue": "確認以繼續",
     "Click the button below to confirm your identity.": "點擊下方按鈕以確認您的身份。",
     "Confirm encryption setup": "確認加密設定",
-    "Click the button below to confirm setting up encryption.": "點擊下方按鈕以確認設定加密。"
+    "Click the button below to confirm setting up encryption.": "點擊下方按鈕以確認設定加密。",
+    "QR Code": "QR Code",
+    "Dismiss read marker and jump to bottom": "取消讀取標記並跳至底部",
+    "Jump to oldest unread message": "跳至最舊的未讀訊息",
+    "Upload a file": "上傳檔案"
 }

From acfacb9b95faa384f98887e54f0e6e67edef61ea Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 14 May 2020 21:10:34 +0000
Subject: [PATCH 3022/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2312 of 2312 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 6b3881339b..3f749ebe0f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2406,5 +2406,8 @@
     "Click the button below to confirm your identity.": "Klaku sube la butonon por konfirmi vian identecon.",
     "Confirm encryption setup": "Konfirmi agordon de ĉifrado",
     "Click the button below to confirm setting up encryption.": "Klaku sube la butonon por konfirmi agordon de ĉifrado.",
-    "QR Code": "Rapidresponda kodo"
+    "QR Code": "Rapidresponda kodo",
+    "Dismiss read marker and jump to bottom": "Forigi legomarkon kaj iri al fundo",
+    "Jump to oldest unread message": "Iri al plej malnova nelegita mesaĝo",
+    "Upload a file": "Alŝuti dosieron"
 }

From 9542851c25bf233cfa133ec62bc8b4ec969c10ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 14 May 2020 23:00:36 +0000
Subject: [PATCH 3023/3235] Translated using Weblate (Estonian)

Currently translated at 50.9% (1176 of 2312 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 738b863122..286bd9ec5c 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1165,5 +1165,19 @@
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Selle jututoa versioon on <roomVersion /> ning see koduserver on tema märkinud <i>ebastabiilseks</i>.",
     "Only room administrators will see this warning": "Vaid administraatorid näevad seda hoiatust",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Kirjutades <code>/help</code> saad vaadata käskude loendit. Või soovisid seda saata sõnumina?",
-    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vihje: kui soovid alustada sõnumit kaldkriipsuga, siis kirjuta <code>//</code>."
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vihje: kui soovid alustada sõnumit kaldkriipsuga, siis kirjuta <code>//</code>.",
+    "To link to this room, please add an alias.": "Viitamaks sellele jututoale, palun määra talle alias.",
+    "Only people who have been invited": "Vaid kutsutud kasutajad",
+    "Anyone who knows the room's link, apart from guests": "Kõik, kes teavad jututoa viidet, välja arvatud külalised",
+    "Anyone who knows the room's link, including guests": "Kõik, kes teavad jututoa viidet, kaasa arvatud külalised",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Kui muudad seda, kes saavad selle jututoa ajalugu lugeda, siis kehtib see vaid tulevaste sõnumite kohta. Senise ajaloo nähtavus sellega ei muutu.",
+    "Unable to revoke sharing for email address": "Ei õnnestu tagasi võtta otsust e-posti aadressi jagamise kohta",
+    "Unable to share email address": "Ei õnnestu jagada e-posti aadressi",
+    "Your email address hasn't been verified yet": "Sinu e-posti aadress pole veel verifitseeritud",
+    "Click the link in the email you received to verify and then click continue again.": "Klõpsi saabunud e-kirjas olevat verifitseerimisviidet ning seejärel klõpsi siin uuesti nuppu \"Jätka\".",
+    "Unable to verify email address.": "E-posti aadressi verifitseerimine ei õnnestunud.",
+    "Verify the link in your inbox": "Verifitseeri klõpsides viidet saabunud e-kirjas",
+    "Complete": "Valmis",
+    "Revoke": "Tühista",
+    "Share": "Jaga"
 }

From 7d15fea5f975d9b99062022ba7a7bc208630e3f9 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Fri, 15 May 2020 12:01:35 +0000
Subject: [PATCH 3024/3235] Translated using Weblate (Finnish)

Currently translated at 91.2% (2108 of 2312 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index e8eef891be..ae08572eb2 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1282,7 +1282,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Premium-ylläpitoa organisaatioille. <a>Lue lisää</a>",
     "Other": "Muut",
     "Find other public servers or use a custom server": "Etsi muita julkisia palvelimia tai käytä mukautettua palvelinta",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parhaan käyttökokemuksen saa <chromeLink>Chromella</chromeLink>, <firefoxLink>Firefoxilla</firefoxLink> tai <safariLink>Safarilla</safariLink>.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
     "<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-kuvaus yhteisösi etusivulle</h1>\n<p>\n    Käytä pitkää kuvausta esitelläksesi yhteisöäsi uusille jäsenille tai jakaaksesi tärkeitä\n    <a href=\"foo\">linkkejä</a>\n</p>\n<p>\n    Voit jopa käyttää 'img'-tageja\n</p>\n",
     "Unable to join community": "Yhteisöön liittyminen epäonnistui",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Olet tämän yhteisön ylläpitäjä. Et voi liittyä uudelleen ilman kutsua toiselta ylläpitäjältä.",
@@ -2167,5 +2167,27 @@
     "Sends a message as html, without interpreting it as markdown": "Lähettää viestin HTML-muodossa, tulkitsematta sitä Markdowniksi",
     "Please supply a widget URL or embed code": "Anna sovelman osoite tai upotettava koodinpätkä",
     "You signed in to a new session without verifying it:": "Olet kirjautunut uuteen istuntoon varmentamatta sitä:",
-    "Verify your other session using one of the options below.": "Varmenna toinen istuntosi käyttämällä yhtä seuraavista tavoista."
+    "Verify your other session using one of the options below.": "Varmenna toinen istuntosi käyttämällä yhtä seuraavista tavoista.",
+    "Click the button below to confirm deleting these sessions.|other": "Napsauta alla olevaa painiketta vahvistaaksesi näiden istuntojen poistamisen.",
+    "Click the button below to confirm deleting these sessions.|one": "Napsauta alla olevaa painiketta vahvistaaksesi tämän istunnon poistamisen.",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Varmuuskopiossa on allekirjoitus <verify>tuntemattomasta</verify> istunnosta tunnuksella %(deviceId)s",
+    "Error downloading theme information.": "Virhe ladattaessa teematietoa.",
+    "Waiting for you to accept on your other session…": "Odotetaan, että hyväksyt toisen istunnon…",
+    "Almost there! Is your other session showing the same shield?": "Melkein valmista! Näyttääkö toinen istuntosi saman kilven?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Melkein valmista! Näyttääkö %(displayName)s saman kilven?",
+    "Message deleted": "Viesti poistettu",
+    "Message deleted by %(name)s": "%(name)s poisti viestin",
+    "QR Code": "QR-koodi",
+    "To continue, use Single Sign On to prove your identity.": "Todista henkilöllisyytesi kertakirjautumisen avulla jatkaaksesi.",
+    "If they don't match, the security of your communication may be compromised.": "Jos ne eivät täsmää, viestinnän turvallisuus saattaa olla vaarantunut.",
+    "This session, or the other session": "Tämä tai toinen istunto",
+    "We recommend you change your password and recovery key in Settings immediately": "Suosittelemme, että vaihdat salasanasi ja palautusavaimesi asetuksissa välittömästi",
+    "Restoring keys from backup": "Palautetaan avaimia varmuuskopiosta",
+    "Fetching keys from server...": "Noudetaan avaimia palvelimelta...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s / %(total)s avainta palautettu",
+    "Keys restored": "Avaimet palautettu",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s avaimen palautus onnistui",
+    "This requires the latest Riot on your other devices:": "Tämä vaatii uusimman Riotin muilla laitteillasi:",
+    "Currently indexing: %(currentRoom)s": "Indeksoidaan huonetta: %(currentRoom)s",
+    "Jump to oldest unread message": "Siirry vanhimpaan lukemattomaan viestiin"
 }

From b27ac716808bb5039291477fe84aa3c45d1776d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 15 May 2020 06:26:53 +0000
Subject: [PATCH 3025/3235] Translated using Weblate (French)

Currently translated at 100.0% (2312 of 2312 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 3fac2168a2..c231769f27 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2431,5 +2431,9 @@
     "Confirm to continue": "Confirmer pour continuer",
     "Click the button below to confirm your identity.": "Cliquez sur le bouton ci-dessous pour confirmer votre identité.",
     "Confirm encryption setup": "Confirmer la configuration du chiffrement",
-    "Click the button below to confirm setting up encryption.": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement."
+    "Click the button below to confirm setting up encryption.": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement.",
+    "QR Code": "Code QR",
+    "Dismiss read marker and jump to bottom": "Ignorer le signet de lecture et aller en bas",
+    "Jump to oldest unread message": "Aller au plus vieux message non lu",
+    "Upload a file": "Envoyer un fichier"
 }

From ae9d700c936a7ed0f51748205d0254e661e264f6 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 15 May 2020 11:25:44 +0000
Subject: [PATCH 3026/3235] Translated using Weblate (Hungarian)

Currently translated at 99.4% (2299 of 2312 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 afad390192..b3bc468da6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2409,5 +2409,7 @@
     "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva",
     "You signed in to a new session without verifying it:": "Ellenőrzés nélkül jelentkeztél be egy új munkamenetbe:",
     "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével.",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>."
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>.",
+    "Opens chat with the given user": "Beszélgetés megnyitása a megadott felhasználóval",
+    "Sends a message to the given user": "Üzenet küldése a megadott felhasználónak"
 }

From 16bdbfd67dcc118b668369ce60508722a7d51eda Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 15 May 2020 08:07:07 +0000
Subject: [PATCH 3027/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2312 of 2312 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index e79db1b061..014d6015b3 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2426,5 +2426,9 @@
     "Confirm to continue": "Conferma per continuare",
     "Click the button below to confirm your identity.": "Clicca il pulsante sotto per confermare la tua identità.",
     "Confirm encryption setup": "Conferma impostazione cifratura",
-    "Click the button below to confirm setting up encryption.": "Clicca il pulsante sotto per confermare l'impostazione della cifratura."
+    "Click the button below to confirm setting up encryption.": "Clicca il pulsante sotto per confermare l'impostazione della cifratura.",
+    "QR Code": "Codice QR",
+    "Dismiss read marker and jump to bottom": "Scarta il segno di lettura e salta alla fine",
+    "Jump to oldest unread message": "Salta al messaggio non letto più vecchio",
+    "Upload a file": "Invia un file"
 }

From c09745e1833d100ca3dabe715c1420b89eb4c740 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 15 May 2020 15:44:38 +0000
Subject: [PATCH 3028/3235] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2312 of 2312 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b3bc468da6..17254a77db 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2411,5 +2411,18 @@
     "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>.",
     "Opens chat with the given user": "Beszélgetés megnyitása a megadott felhasználóval",
-    "Sends a message to the given user": "Üzenet küldése a megadott felhasználónak"
+    "Sends a message to the given user": "Üzenet küldése a megadott felhasználónak",
+    "Waiting for your other session to verify…": "A másik munkameneted ellenőrzésére várunk…",
+    "You've successfully verified your device!": "Sikeresen ellenőrizted az eszközödet!",
+    "Message deleted": "Üzenet törölve",
+    "Message deleted by %(name)s": "Üzenetet törölte: %(name)s",
+    "QR Code": "QR kód",
+    "To continue, use Single Sign On to prove your identity.": "A folytatáshoz a személyazonosságod megerősítéséhez használd az egyszeri bejelentkezést.",
+    "Confirm to continue": "Erősítsd meg a továbblépéshez",
+    "Click the button below to confirm your identity.": "A személyazonosságod megerősítéséhez kattints az alábbi gombra.",
+    "Confirm encryption setup": "Erősítsd meg a titkosítási beállításokat",
+    "Click the button below to confirm setting up encryption.": "Az alábbi gomb megnyomásával erősítsd meg, hogy megadod a titkosítási beállításokat.",
+    "Dismiss read marker and jump to bottom": "Az olvasottak jel eltűntetése és ugrás a végére",
+    "Jump to oldest unread message": "A legrégebbi olvasatlan üzenetre ugrás",
+    "Upload a file": "Fájl feltöltése"
 }

From 0feb55ff4f8fed692d7041e1d16d7fa1ded29297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sat, 16 May 2020 12:47:57 +0000
Subject: [PATCH 3029/3235] Translated using Weblate (Estonian)

Currently translated at 51.4% (1188 of 2312 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 286bd9ec5c..2ec4a14d3a 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -262,7 +262,7 @@
     "Expand room list section": "Laienda jututubade loendi valikut",
     "Create Account": "Loo konto",
     "Sign In": "Logi sisse",
-    "Send a bug report with logs": "Saada veakirjeldus koos logidega",
+    "Send a bug report with logs": "Saada veakirjeldus koos logikirjetega",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Rühmita ja filtreeri jututubasid kohandatud siltide alusel (muudatuste rakendamiseks värskenda vaade)",
     "Try out new ways to ignore people (experimental)": "Proovi uusi kasutajate eiramise viise (katseline)",
     "Uploading report": "Laen üles veakirjeldust",
@@ -1179,5 +1179,17 @@
     "Verify the link in your inbox": "Verifitseeri klõpsides viidet saabunud e-kirjas",
     "Complete": "Valmis",
     "Revoke": "Tühista",
-    "Share": "Jaga"
+    "Share": "Jaga",
+    "Session already verified!": "Sessioon on juba verifitseeritud!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "HOIATUS: Sessioon on juba verifitseeritud, aga võtmed ei klapi!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "HOIATUS: VÕTMETE VERIFITSEERIMINE EI ÕNNESTUNUD! Kasutaja %(userId)s ja sessiooni %(deviceId)s allkirjastamise võti on \"%(fprint)s\", aga see ei vasta antud sõrmejäljele \"%(fingerprint)s\". See võib tähendada, et sinu kasutatavad ühendused võivad olla kolmanda osapoole poolt vahelt lõigatud!",
+    "Verified key": "Verifitseeritud võti",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Sinu antud allkirjavõti vastab allkirjavõtmele, mille sa said kasutaja %(userId)s sessioonist %(deviceId)s. Sessioon on märgitud verifitseerituks.",
+    "Sends the given message coloured as a rainbow": "Saadab selle sõnumi vikerkaarevärvilisena",
+    "Sends the given emote coloured as a rainbow": "Saadab antud emote vikerkaarevärvides",
+    "Displays list of commands with usages and descriptions": "Näitab käskude loendit koos kirjeldustega",
+    "Logs sent": "Logikirjed saadetud",
+    "Thank you!": "Suur tänu!",
+    "Opens chat with the given user": "Avab vestluse näidatud kasutajaga",
+    "Sends a message to the given user": "Saadab sõnumi näidatud kasutajale"
 }

From 3ffa333f31eefb57f76ad5bca7d17598d9bc8c46 Mon Sep 17 00:00:00 2001
From: "Pepper.Cabbit.Snoopy" <miranda_zhang@live.cn>
Date: Sun, 17 May 2020 09:23:01 +0000
Subject: [PATCH 3030/3235] Translated using Weblate (Chinese (Simplified))

Currently translated at 62.7% (1450 of 2312 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 | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index dc3cc6d176..481167a645 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1468,5 +1468,31 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s 发起了视频通话。（此浏览器不支持）",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的用户的规则",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的服务器的规则",
-    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的规则"
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s 移除了禁止匹配 %(glob)s 的规则",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s 删除了禁止聊天室匹配%(glob)s的规则",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s 更新了一个无效的禁止规则",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s 而禁止用户匹配%(glob)s的规则",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止聊天室匹配%(glob)s的规则",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止服务器匹配%(glob)s的规则",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 创建了因为%(reason)s而禁止用户匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止聊天室匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止服务器匹配%(glob)s的规则",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止匹配%(glob)s的股则",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更改了一个由于%(reason)s而禁止用户%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s更改了一个由于%(reason)s而禁止聊天室%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止服务器%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "You signed in to a new session without verifying it:": "您登陆了未经过验证的新会话：",
+    "Verify your other session using one of the options below.": "使用以下选项之一验证您的其他会话。",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s(%(userId)s)登陆到未验证的新会话：",
+    "Ask this user to verify their session, or manually verify it below.": "要求该用户验证其会话，或在下面手动进行验证。",
+    "Not Trusted": "不可信任",
+    "Manually Verify by Text": "手动验证文字",
+    "Interactively verify by Emoji": "通过表情符号进行交互式验证",
+    "Done": "完成",
+    "Cannot reach homeserver": "不可连接到主服务器",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "确保您的网络连接稳定，或与服务器管理员联系",
+    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "跟您的Riot管理员确认<a>您的配置</a>不正确或重复的条目。",
+    "Cannot reach identity server": "不可连接到身份服务器"
 }

From 0662c231a52917a288713e1069cdeb07035a1658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Sat, 16 May 2020 18:13:05 +0000
Subject: [PATCH 3031/3235] Translated using Weblate (Estonian)

Currently translated at 53.3% (1233 of 2312 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 2ec4a14d3a..3fb069055c 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -148,7 +148,7 @@
     "Remove": "Eemalda",
     "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Sa peaksid enne ühenduse katkestamisst <b>eemaldama isiklikud andmed</b> id-serverist <idserver />. Kahjuks id-server <idserver /> ei ole hetkel võrgus või pole kättesaadav.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid id-serverist.",
-    "Remove messages": "Kustuta sõnumid",
+    "Remove messages": "Kustuta sõnumeid",
     "Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
     "Remove %(email)s?": "Eemalda %(email)s?",
     "Remove %(phone)s?": "Eemalda %(phone)s?",
@@ -334,7 +334,7 @@
     "Once enabled, encryption cannot be disabled.": "Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada.",
     "Encrypted": "Krüptitud",
     "Who can access this room?": "Kes pääsevad ligi siia jututuppa?",
-    "Who can read history?": "Kes võib lugeda ajalugu?",
+    "Who can read history?": "Kes võivad lugeda ajalugu?",
     "Encrypted by an unverified session": "Krüptitud verifitseerimata sessiooni poolt",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri see kasutaja tema kasutajaprofiilis.",
     "Encryption not enabled": "Krüptimine ei ole kasutusel",
@@ -685,7 +685,7 @@
     "Room version:": "Jututoa versioon:",
     "Developer options": "Valikud arendajale",
     "Open Devtools": "Ava arendusvahendid",
-    "Change room name": "Muuda jututoa nimi",
+    "Change room name": "Muuda jututoa nime",
     "Roles & Permissions": "Rollid ja õigused",
     "Room Name": "Jututoa nimi",
     "Room Topic": "Jututoa teema",
@@ -1191,5 +1191,50 @@
     "Logs sent": "Logikirjed saadetud",
     "Thank you!": "Suur tänu!",
     "Opens chat with the given user": "Avab vestluse näidatud kasutajaga",
-    "Sends a message to the given user": "Saadab sõnumi näidatud kasutajale"
+    "Sends a message to the given user": "Saadab sõnumi näidatud kasutajale",
+    "Short keyboard patterns are easy to guess": "Lühikesi klahvijärjestusi on lihtne ära arvata",
+    "Keyboard Shortcuts": "Kiirklahvid",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "See jututuba kasutab sõnumisildasid liidestamiseks järgmiste süsteemidega. <a>Lisateave.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "See jututuba ei kasuta sõnumisildasid liidestamiseks muude süsteemidega. <a>Lisateave.</a>",
+    "Bridges": "Sõnumisillad",
+    "Room Addresses": "Jututubade aadressid",
+    "Browse": "Sirvi",
+    "Change room avatar": "Muuda jututoa profiilipilti ehk avatari",
+    "Change main address for the room": "Muuda jututoa põhiaadressi",
+    "Change history visibility": "Muuda vestlusajaloo nähtavust",
+    "Change permissions": "Muuda õigusi",
+    "Change topic": "Muuda teemat",
+    "Upgrade the room": "Uuenda jututuba uue versioonini",
+    "Enable room encryption": "Võta jututoas kasutusele krüptimine",
+    "Modify widgets": "Muuda vidinaid",
+    "Default role": "Vaikimisi roll",
+    "Send messages": "Saada sõnumeid",
+    "Invite users": "Kutsu kasutajaid",
+    "Change settings": "Muuda seadistusi",
+    "Kick users": "Müksa kasutajaid välja",
+    "Ban users": "Määra kasutajatele suhtluskeeld",
+    "Notify everyone": "Teavita kõiki",
+    "No users have specific privileges in this room": "Mitte ühelgi kasutajal pole siin jututoas eelisõigusi",
+    "Privileged Users": "Eelisõigustega kasutajad",
+    "Banned users": "Suhtluskeelu saanud kasutajad",
+    "Send %(eventType)s events": "Saada %(eventType)s-sündmusi",
+    "Unable to revoke sharing for phone number": "Telefoninumbri jagamist ei õnnestunud tühistada",
+    "Unable to share phone number": "Telefoninumbri jagamine ei õnnestunud",
+    "Unable to verify phone number.": "Telefoninumbri verifitseerimine ei õnnestunud.",
+    "Incorrect verification code": "Vigane verifikatsioonikood",
+    "Please enter verification code sent via text.": "Palun sisesta verifikatsioonikood, mille said telefoni tekstisõnumina.",
+    "Verification code": "Verifikatsioonikood",
+    "Invalid Email Address": "Vigane e-posti aadress",
+    "This doesn't appear to be a valid email address": "See ei tundu olema e-posti aadressi moodi",
+    "Preparing to send logs": "Valmistun logikirjete saatmiseks",
+    "Failed to send logs: ": "Logikirjete saatmine ei õnnestunud: ",
+    "Verify session": "Verifitseeri sessioon",
+    "Use Legacy Verification (for older clients)": "Kasuta vanematüübilist verifitseerimist (vähem-moodsa klient-tarkvara jaoks)",
+    "Verify by comparing a short text string.": "Verifitseeri kasutades lühikeste sõnede võrdlemist.",
+    "Begin Verifying": "Alusta verifitseerimist",
+    "Waiting for partner to accept...": "Ootan, et teine osapool nõustuks…",
+    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Mitte midagi ei kuvata? Kõik Matrix'i kliendid ei toeta veel interaktiivset verifitseerimist. <button>Kasuta vana  kooli verifitseerimismeetodit</button>.",
+    "Waiting for %(userId)s to confirm...": "Ootan kinnitust kasutajalt %(userId)s…",
+    "Skip": "Jäta vahele",
+    "Token incorrect": "Vigane tunnusluba"
 }

From 7c5842c208fe08b9e48964214663a447216bc928 Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Sun, 17 May 2020 09:37:45 +0000
Subject: [PATCH 3032/3235] Translated using Weblate (Galician)

Currently translated at 40.0% (925 of 2312 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 346dda09f2..3328292be0 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -698,9 +698,9 @@
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
     "Key request sent.": "Petición de chave enviada.",
-    "Flair": "Aura",
-    "Showing flair for these communities:": "Mostrar a aura para estas comunidades:",
-    "Display your community flair in rooms configured to show it.": "Mostrar a aura da súa comunidade nas salas configuradas para que a mostren.",
+    "Flair": "Popularidade",
+    "Showing flair for these communities:": "Mostrar a popularidade destas comunidades:",
+    "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con 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.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
     "Deops user with given id": "Degradar o usuario con esa ID",
@@ -822,7 +822,7 @@
     "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.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuario, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuarios doutras usuarias. Non conteñen mensaxes.",
     "Unhide Preview": "Desagochar a vista previa",
     "Unable to join network": "Non se puido conectar a rede",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurases nun cliente diferente de Riot. Non podes establecelos desde Riot pero aínda así aplicaranse",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>non pode</b> executar Riot.",
     "Uploaded on %(date)s by %(user)s": "Subido a %(date)s por %(user)s",
     "Messages in group chats": "Mensaxes en grupos de chat",
@@ -919,5 +919,23 @@
     "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 súa mensaxe non foi enviada porque este servidor acadou o Límite Mensual de Usuaria Activa. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "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 súa mensaxe non foi enviada porque o servidor superou o límite de recursos. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "Legal": "Legal",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo."
+    "Please <a>contact your service administrator</a> to continue using this service.": "Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
+    "Use Single Sign On to continue": "Usar Single Sign On para continuar",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma que queres engadir este email usando Single Sign On como proba de identidade.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Confirma novo email",
+    "Click the button below to confirm adding this email address.": "Preme no botón inferior para confirmar que queres engadir o email.",
+    "Confirm": "Confirmar",
+    "Add Email Address": "Engadir email",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirma que queres engadir este teléfono usando Single Sign On como proba de identidade.",
+    "Confirm adding phone number": "Confirma a adición do teléfono",
+    "Click the button below to confirm adding this phone number.": "Preme no botón inferior para confirmar que engades este número.",
+    "Add Phone Number": "Engadir novo Número",
+    "The version of Riot": "A versión de Riot",
+    "Whether or not you're logged in (we don't record your username)": "Se estás conectada ou non (non rexistramos o teu nome de usuaria)",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Se estás conectada utilizando Riot nun dispositivo maiormente táctil",
+    "Whether you're using Riot as an installed Progressive Web App": "Se estás a usar Riot como unha Progressive Web App instalada",
+    "Your user agent": "User Agent do navegador",
+    "The information being sent to us to help make Riot better includes:": "Información que nos envías para mellorar Riot inclúe:",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia."
 }

From 5ea4cc1c5b209b5ea8b3401ea3cabf80a20da11a Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Mon, 18 May 2020 08:31:13 +0000
Subject: [PATCH 3033/3235] Translated using Weblate (Slovak)

Currently translated at 62.3% (1441 of 2312 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index fbecaa4845..e85732ed82 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -628,7 +628,7 @@
     "Export room keys": "Exportovať kľúče miestností",
     "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.": "Tento proces vás prevedie exportom kľúčov určených na dešifrovanie správ, ktoré ste dostali v šifrovaných miestnostiach do lokálneho súboru. Tieto kľúče zo súboru môžete  neskôr importovať do iného Matrix klienta, aby ste v ňom mohli dešifrovať vaše šifrované správy.",
     "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.": "Tento súbor umožní komukoľvek, k to má ku nemu prístup dešifrovať všetky vami viditeľné šifrované správy, mali by ste teda byť opatrní a tento súbor si bezpečne uchovať. Aby bolo toto pre vás jednoduchšie, nižšie zadajte heslo, ktorým budú údaje v súbore zašifrované. Importovať údaje zo súboru bude možné len po zadaní tohoto istého hesla.",
-    "Enter passphrase": "Zadajte heslo",
+    "Enter passphrase": "Zadajte (dlhé) heslo",
     "Confirm passphrase": "Potvrďte heslo",
     "Export": "Exportovať",
     "Import room keys": "Importovať kľúče miestností",
@@ -1519,5 +1519,17 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Či používate Riot na zariadení, ktorého hlavným vstupným mechanizmom je dotyk (mobil, tablet,...)",
     "Whether you're using Riot as an installed Progressive Web App": "Či používate Riot ako nainštalovanú Progresívnu Webovú Aplikáciu",
     "Your user agent": "Identifikátor vášho prehliadača",
-    "The information being sent to us to help make Riot better includes:": "Informácie, ktoré nám posielate, aby sme zlepšili Riot, zahŕňajú:"
+    "The information being sent to us to help make Riot better includes:": "Informácie, ktoré nám posielate, aby sme zlepšili Riot, zahŕňajú:",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V miestnosti je neznáma relácia: pokiaľ budete pokračovať bez jej overenia, bude schopná odpočúvať váš hovor.",
+    "Review Sessions": "Overiť reláciu",
+    "If you cancel now, you won't complete verifying the other user.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie druhého používateľa.",
+    "If you cancel now, you won't complete verifying your other session.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie vašej druhej relácie.",
+    "If you cancel now, you won't complete your operation.": "Pokiaľ teraz proces zrušíte, nedokončíte ho.",
+    "Cancel entering passphrase?": "Zrušiť zadávanie (dlhého) hesla.",
+    "Setting up keys": "Príprava kľúčov",
+    "Verify this session": "Overiť túto reláciu",
+    "Keep recovery passphrase in memory for this session": "Ponechať (dlhé) heslo pre obnovu zálohy v pamäti pre túto reláciu",
+    "Enter recovery passphrase": "Zadajte (dlhé) heslo pre obnovu zálohy",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nemožno sa dostať do tajného úložiska. Prosím, overte, že ste zadali správne (dlhé) heslo pre obnovu zálohy.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Získajte prístup k vašej zabezpečenej histórií správ a vašemu krížom-podpísanej identite na potvrdenie iných relácií zadaním vášho (dlhého) hesla na obnovu zálohy."
 }

From b6ac8cb28d92822ea1cf128fd46b687113e1a74d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Wed, 13 May 2020 06:36:14 +0100
Subject: [PATCH 3034/3235] Revert "ImageView make clicking off it easier"

(cherry picked from commit 52e3c97f8c9a2032fe92b2b4bb5fc68c0f6957b5)
---
 res/css/views/elements/_ImageView.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 983ef074f2..0a4ed2a194 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -37,7 +37,7 @@ limitations under the License.
     order: 2;
     /* min-width hack needed for FF */
     min-width: 0px;
-    max-height: 90%;
+    height: 90%;
     flex: 15 15 0;
     display: flex;
     align-items: center;

From a864643d98197ae6bc3bf34c8ee3da4c4a94a013 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 May 2020 10:37:02 +0100
Subject: [PATCH 3035/3235] Label the create room button something better than
 "Add room"

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 1 +
 src/i18n/strings/en_EN.json            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 289a89a206..c46b946b5c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -785,6 +785,7 @@ export default createReactClass({
                 label: _t('Rooms'),
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_room'});},
+                addRoomLabel: _t("Create room"),
             },
         ];
         const tagSubLists = Object.keys(this.state.lists)
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f16a0d7755..c9ac768b3e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1113,6 +1113,7 @@
     "Direct Messages": "Direct Messages",
     "Start chat": "Start chat",
     "Rooms": "Rooms",
+    "Create room": "Create room",
     "Low priority": "Low priority",
     "Historical": "Historical",
     "System Alerts": "System Alerts",

From a8e92589ad9c88db00a69a7debfd8d601378c3cf Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Mon, 18 May 2020 09:17:10 +0000
Subject: [PATCH 3036/3235] Translated using Weblate (Slovak)

Currently translated at 62.7% (1450 of 2312 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index e85732ed82..168f2b4f39 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1018,7 +1018,7 @@
     "Failed to decrypt %(failedCount)s sessions!": "Nepodarilo sa dešifrovať %(failedCount)s relácií!",
     "Restored %(sessionCount)s session keys": "Obnovených %(sessionCount)s kľúčov relácií",
     "Enter Recovery Passphrase": "Zadajte heslo bezpečného obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním hesla obnovenia.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním (dlhého) hesla obnovenia.",
     "Waiting for %(userId)s to confirm...": "Čakanie na potvrdenie od používateľa %(userId)s…",
     "Prompt before sending invites to potentially invalid matrix IDs": "Upozorniť pred odoslaním pozvaní na potenciálne neexistujúce Matrix ID",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie je možné nájsť používateľský profil pre Matrix ID zobrazené nižšie. Chcete ich napriek tomu pozvať?",
@@ -1531,5 +1531,26 @@
     "Keep recovery passphrase in memory for this session": "Ponechať (dlhé) heslo pre obnovu zálohy v pamäti pre túto reláciu",
     "Enter recovery passphrase": "Zadajte (dlhé) heslo pre obnovu zálohy",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nemožno sa dostať do tajného úložiska. Prosím, overte, že ste zadali správne (dlhé) heslo pre obnovu zálohy.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Získajte prístup k vašej zabezpečenej histórií správ a vašemu krížom-podpísanej identite na potvrdenie iných relácií zadaním vášho (dlhého) hesla na obnovu zálohy."
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Získajte prístup k vašej šifrovanej histórií správ a vašemu krížom-podpísanej identite na potvrdenie iných relácií zadaním vášho (dlhého) hesla na obnovu zálohy.",
+    "Encryption upgrade available": "Je dostupná aktualizácia šifrovania",
+    "Set up encryption": "Nastaviť šifrovanie",
+    "Review where you’re logged in": "Zobraziť, kde ste prihlásený",
+    "New login. Was this you?": "Nové pihlásenie. Ste to vy?",
+    "%(name)s is requesting verification": "%(name) žiada o overenie",
+    "Sign In or Create Account": "Prihlásiť sa alebo vytvoriť nový účet",
+    "Use your account or create a new one to continue.": "Použite váš existujúci účet alebo vytvorte si nový, aby ste mohli pokračovať.",
+    "Create Account": "Vytvoriť účet",
+    "Sign In": "Prihlásiť sa",
+    "Sends a message as html, without interpreting it as markdown": "Pošlite správu ako HTML, bez interpretácie v Markdowne",
+    "Failed to set topic": "Nastavenie témy zlyhalo",
+    "Command failed": "Príkaz zlyhal",
+    "Could not find user in room": "Nepodarilo sa nájsť používateľa v miestnosti",
+    "Please supply a widget URL or embed code": "Prosím, zadajte URL widgetu alebo vložte kód",
+    "Verifies a user, session, and pubkey tuple": "Overí používateľa, reláciu a verejné kľúče",
+    "Unknown (user, session) pair:": "Neznámy pár (používateľ, relácia):",
+    "Session already verified!": "Relácia je už overená!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVANIE: Relácia je už overená, ale kľúče sa NEZHODUJÚ!",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokiaľ ste zabudli na vaše (dlhé) heslo na obnovu zálohy, môžete <button1>použiť váš kľúč na obnovu zálohy</button1> alebo <button2>nastaviť nové spôsoby obnovy zálohy</button2>.",
+    "Incorrect recovery passphrase": "Nesprávne (dlhé) heslo pre obnovu zálohy",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Záloha nemohla byť rozšifrovaná pomocou tohto (dlhého) helsa na obnovu zálohy: prosím, overte, či ste zadali správne (dlhé) helso na obnovu zálohy."
 }

From 17f535e5f878337854b7599ca8da2b3e8528c81b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 18 May 2020 16:37:10 +0100
Subject: [PATCH 3037/3235] Fix review problems

- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
---
 res/css/views/rooms/_EventTile.scss           | 79 ------------------
 res/css/views/rooms/_GroupLayout.scss         | 82 ++++++++++++++++++-
 res/css/views/rooms/_IRCLayout.scss           |  4 +-
 src/components/structures/MessagePanel.js     |  2 +-
 .../views/elements/ErrorBoundary.js           |  2 +-
 .../elements/IRCTimelineProfileResizer.tsx    |  4 +-
 src/components/views/rooms/EventTile.js       |  2 -
 7 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index b9a41c4310..c278f813d0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -37,7 +37,6 @@ limitations under the License.
 }
 
 .mx_EventTile_avatar {
-    position: absolute;
     top: 14px;
     left: 8px;
     cursor: pointer;
@@ -576,84 +575,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 /* end of overrides */
 
-.mx_MatrixChat_useCompactLayout {
-    .mx_EventTile {
-        padding-top: 4px;
-    }
-
-    .mx_EventTile.mx_EventTile_info {
-        // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
-        padding-top: 0px;
-        font-size: $font-13px;
-        .mx_EventTile_line, .mx_EventTile_reply {
-            line-height: $font-20px;
-        }
-        .mx_EventTile_avatar {
-            top: 4px;
-        }
-    }
-
-    .mx_EventTile .mx_SenderProfile {
-        font-size: $font-13px;
-    }
-
-    .mx_EventTile.mx_EventTile_emote {
-        // add a bit more space for emotes so that avatars don't collide
-        padding-top: 8px;
-        .mx_EventTile_avatar {
-            top: 2px;
-        }
-        .mx_EventTile_line, .mx_EventTile_reply {
-            padding-top: 0px;
-            padding-bottom: 1px;
-        }
-    }
-
-    .mx_EventTile.mx_EventTile_emote.mx_EventTile_continuation {
-        padding-top: 0;
-        .mx_EventTile_line, .mx_EventTile_reply {
-            padding-top: 0px;
-            padding-bottom: 0px;
-        }
-    }
-
-    .mx_EventTile_line, .mx_EventTile_reply {
-        padding-top: 0px;
-        padding-bottom: 0px;
-    }
-
-    .mx_EventTile_avatar {
-        top: 2px;
-    }
-
-    .mx_EventTile_e2eIcon {
-        top: 3px;
-    }
-
-    .mx_EventTile_readAvatars {
-        top: 27px;
-    }
-
-    .mx_EventTile_continuation .mx_EventTile_readAvatars,
-    .mx_EventTile_emote .mx_EventTile_readAvatars {
-        top: 5px;
-    }
-
-    .mx_EventTile_info .mx_EventTile_readAvatars {
-        top: 4px;
-    }
-
-    .mx_RoomView_MessageList h2 {
-        margin-top: 6px;
-    }
-
-    .mx_EventTile_content .markdown-body {
-        p, ul, ol, dl, blockquote, pre, table {
-            margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
-        }
-    }
-}
-
 .mx_EventTile_tileError {
     color: red;
     text-align: center;
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 6528d6c6cd..bfe463ed49 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -47,6 +47,86 @@ $left-gutter: 65px;
     }
 
     .mx_EventTile_info .mx_EventTile_line {
-        padding-left: 83px;
+        padding-left: calc($left-gutter + 18px);
     }
 }
+
+/* Compact layout overrides */
+
+.mx_MatrixChat_useCompactLayout {
+    .mx_EventTile {
+        padding-top: 4px;
+    }
+
+    .mx_EventTile.mx_EventTile_info {
+        // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
+        padding-top: 0px;
+        font-size: $font-13px;
+        .mx_EventTile_line, .mx_EventTile_reply {
+            line-height: $font-20px;
+        }
+        .mx_EventTile_avatar {
+            top: 4px;
+        }
+    }
+
+    .mx_EventTile .mx_SenderProfile {
+        font-size: $font-13px;
+    }
+
+    .mx_EventTile.mx_EventTile_emote {
+        // add a bit more space for emotes so that avatars don't collide
+        padding-top: 8px;
+        .mx_EventTile_avatar {
+            top: 2px;
+        }
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 0px;
+            padding-bottom: 1px;
+        }
+    }
+
+    .mx_EventTile.mx_EventTile_emote.mx_EventTile_continuation {
+        padding-top: 0;
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 0px;
+            padding-bottom: 0px;
+        }
+    }
+
+    .mx_EventTile_line, .mx_EventTile_reply {
+        padding-top: 0px;
+        padding-bottom: 0px;
+    }
+
+    .mx_EventTile_avatar {
+        top: 2px;
+    }
+
+    .mx_EventTile_e2eIcon {
+        top: 3px;
+    }
+
+    .mx_EventTile_readAvatars {
+        top: 27px;
+    }
+
+    .mx_EventTile_continuation .mx_EventTile_readAvatars,
+    .mx_EventTile_emote .mx_EventTile_readAvatars {
+        top: 5px;
+    }
+
+    .mx_EventTile_info .mx_EventTile_readAvatars {
+        top: 4px;
+    }
+
+    .mx_RoomView_MessageList h2 {
+        margin-top: 6px;
+    }
+
+    .mx_EventTile_content .markdown-body {
+        p, ul, ol, dl, blockquote, pre, table {
+            margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
+        }
+    }
+}
\ No newline at end of file
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index f2a616f9c9..5f88473c5f 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -138,7 +138,7 @@ $irc-line-height: $font-18px;
 
         .mx_EventListSummary_avatars {
             padding: 0;
-            margin: 0;
+            margin: 0 9px 0 0;
         }
     }
 
@@ -185,7 +185,7 @@ $irc-line-height: $font-18px;
 
     .mx_SenderProfile_hover:hover {
         overflow: visible;
-        width: auto;
+        width: max(auto, 100%);
         z-index: 10;
     }
 
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 1c10efb346..f875467e4f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -822,7 +822,7 @@ export default class MessagePanel extends React.Component {
 
         let ircResizer = null;
         if (this.state.useIRCLayout) {
-            ircResizer = <IRCTimelineProfileResizer minWidth={20} maxWidth={600} roomId={this.props.room.roomId} />;
+            ircResizer = <IRCTimelineProfileResizer minWidth={20} maxWidth={600} roomId={this.props.room ? this.props.roomroomId : null} />;
         }
 
         return (
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index 1abd11f838..a043b350ab 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -73,7 +73,7 @@ export default class ErrorBoundary extends React.PureComponent {
         if (this.state.error) {
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
             const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
-            return <div className="mx_ErrorBoundary mx_IRCLayout">
+            return <div className="mx_ErrorBoundary">
                 <div className="mx_ErrorBoundary_body">
                     <h1>{_t("Something went wrong!")}</h1>
                     <p>{_t(
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
index 44ceeb9b7b..596d46bf36 100644
--- a/src/components/views/elements/IRCTimelineProfileResizer.tsx
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -77,7 +77,9 @@ export default class IRCTimelineProfileResizer extends React.Component<IProps, I
     }
 
     private onMoueUp(event: MouseEvent) {
-        SettingsStore.setValue("ircDisplayNameWidth", this.props.roomId, SettingLevel.ROOM_DEVICE, this.state.width);
+        if (this.props.roomId) {
+            SettingsStore.setValue("ircDisplayNameWidth", this.props.roomId, SettingLevel.ROOM_DEVICE, this.state.width);
+        }
     }
 
     render() {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index b2daa5667f..4ff3a5ccfc 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -659,8 +659,6 @@ export default createReactClass({
         const classes = classNames({
             mx_EventTile_bubbleContainer: isBubbleMessage,
             mx_EventTile: true,
-            mx_EventTile_irc: this.props.useIRCLayout,
-            mx_EventTile_group: !this.props.useIRCLayout,
             mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,

From 5380e76b7b95b952b9ec764dbf03baf227851bc0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 18 May 2020 16:43:47 +0100
Subject: [PATCH 3038/3235] lint

---
 res/css/views/rooms/_GroupLayout.scss     | 2 +-
 src/components/structures/MessagePanel.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index bfe463ed49..40440f7d49 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -129,4 +129,4 @@ $left-gutter: 65px;
             margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index f875467e4f..b3f9b40ada 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -822,7 +822,11 @@ export default class MessagePanel extends React.Component {
 
         let ircResizer = null;
         if (this.state.useIRCLayout) {
-            ircResizer = <IRCTimelineProfileResizer minWidth={20} maxWidth={600} roomId={this.props.room ? this.props.roomroomId : null} />;
+            ircResizer = <IRCTimelineProfileResizer
+                minWidth={20}
+                maxWidth={600}
+                roomId={this.props.room ? this.props.roomroomId : null}
+            />;
         }
 
         return (

From 4deeef5fca9afcaf35d3c76f20ea84c8ac4808aa Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 18 May 2020 16:57:00 +0100
Subject: [PATCH 3039/3235] Remove ability to remove avatars

---
 src/components/structures/MessagePanel.js    | 13 -------------
 src/components/views/elements/ReplyThread.js |  7 ++-----
 src/components/views/rooms/EventTile.js      |  6 +-----
 src/settings/Settings.js                     |  6 ------
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index b3f9b40ada..404e950d7f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -174,11 +174,6 @@ export default class MessagePanel extends React.Component {
             SettingsStore.watchSetting("showTypingNotifications", null, this.onShowTypingNotificationsChange);
 
         this._layoutWatcherRef = SettingsStore.watchSetting("feature_irc_ui", null, this.onLayoutChange);
-        this._displayAvatarsWatcherRef = SettingsStore.watchSetting(
-            "feature_no_timeline_avatars",
-            null,
-            this.onDisplayAvatarsChange,
-        );
     }
 
     componentDidMount() {
@@ -189,7 +184,6 @@ export default class MessagePanel extends React.Component {
         this._isMounted = false;
         SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
         SettingsStore.unwatchSetting(this._layoutWatcherRef);
-        SettingsStore.unwatchSetting(this._displayAvatarsWatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -214,12 +208,6 @@ export default class MessagePanel extends React.Component {
         });
     }
 
-    onDisplayAvatarsChange = () => {
-        this.setState({
-            displayAvatars: SettingsStore.getValue("feature_no_timeline_avatars"),
-        });
-    }
-
     /* get the DOM node representing the given event */
     getNodeForEventId(eventId) {
         if (!this.eventNodes) {
@@ -622,7 +610,6 @@ export default class MessagePanel extends React.Component {
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
                         useIRCLayout={this.state.useIRCLayout}
-                        displayAvatars={this.state.displayAvatars}
                     />
                 </TileErrorBoundary>
             </li>,
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 6bfda5dd94..04e31d6490 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -39,8 +39,6 @@ export default class ReplyThread extends React.Component {
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
         // Specifies which layout to use.
         useIRCLayout: PropTypes.bool,
-        // Specifies whether to display avatars.
-        displayAvatars: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -180,7 +178,7 @@ export default class ReplyThread extends React.Component {
         };
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout, displayAvatars) {
+    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
         if (!ReplyThread.getParentEventId(parentEv)) {
             return <div className="mx_ReplyThread_wrapper_empty" />;
         }
@@ -190,7 +188,7 @@ export default class ReplyThread extends React.Component {
             ref={ref}
             permalinkCreator={permalinkCreator}
             useIRCLayout={useIRCLayout}
-            displayAvatars={displayAvatars} />;
+        />;
     }
 
     componentDidMount() {
@@ -342,7 +340,6 @@ export default class ReplyThread extends React.Component {
                     isRedacted={ev.isRedacted()}
                     isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
                     useIRCLayout={this.props.useIRCLayout}
-                    displayAvatars={this.props.displayAvatars}
                 />
             </blockquote>;
         });
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 4ff3a5ccfc..1cb632b2e8 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -209,9 +209,6 @@ export default createReactClass({
 
         // whether to use the irc layout
         useIRCLayout: PropTypes.bool,
-
-        // whether to display avatars
-        displayAvatars: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -714,7 +711,7 @@ export default createReactClass({
             needsSenderProfile = true;
         }
 
-        if (this.props.mxEvent.sender && avatarSize && this.props.displayAvatars) {
+        if (this.props.mxEvent.sender && avatarSize) {
             avatar = (
                     <div className="mx_EventTile_avatar">
                         <MemberAvatar member={this.props.mxEvent.sender}
@@ -898,7 +895,6 @@ export default createReactClass({
                     this.props.permalinkCreator,
                     this._replyThread,
                     this.props.useIRCLayout,
-                    this.props.displayAvatars,
                 );
 
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 6d741ba3a5..f54b32a8b5 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -143,12 +143,6 @@ export const SETTINGS = {
         default: false,
         isFeature: true,
     },
-    "feature_no_timeline_avatars": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Display user avatars on messages'),
-        default: true,
-        isFeature: true,
-    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],

From bba6b2c4413b47d1d3ae95d350df99d2826668eb Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 18 May 2020 17:06:54 +0100
Subject: [PATCH 3040/3235] Appease i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 37b9c1dfc8..12838968f7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -406,7 +406,6 @@
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
     "Use IRC layout": "Use IRC layout",
-    "Display user avatars on messages": "Display user avatars on messages",
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",

From 7bb7f30b8f4ca9c8bd3d02e69ff2928317626fa9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 18 May 2020 22:02:22 +0100
Subject: [PATCH 3041/3235] missed one

---
 src/components/structures/MessagePanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 404e950d7f..cac04d84f1 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -119,7 +119,6 @@ export default class MessagePanel extends React.Component {
             ghostReadMarkers: [],
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
             useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
-            displayAvatars: SettingsStore.getValue("feature_no_timeline_avatars"),
         };
 
         // opaque readreceipt info for each userId; used by ReadReceiptMarker

From b9c31b27a2526c5670b43e3506008a0366e4a639 Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Mon, 18 May 2020 10:14:36 +0000
Subject: [PATCH 3042/3235] Translated using Weblate (Slovak)

Currently translated at 64.9% (1500 of 2311 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 168f2b4f39..d117843ccf 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -814,7 +814,7 @@
     "Invite to this room": "Pozvať do tejto miestnosti",
     "You cannot delete this message. (%(code)s)": "Nemôžete vymazať túto správu. (%(code)s)",
     "Thursday": "Štvrtok",
-    "I understand the risks and wish to continue": "Rozumiem rizikám a želám si pokračovať",
+    "I understand the risks and wish to continue": "Rozumiem riziku a chcem pokračovať",
     "Logs sent": "Záznamy boli odoslané",
     "Back": "Naspäť",
     "Reply": "Odpovedať",
@@ -1018,7 +1018,7 @@
     "Failed to decrypt %(failedCount)s sessions!": "Nepodarilo sa dešifrovať %(failedCount)s relácií!",
     "Restored %(sessionCount)s session keys": "Obnovených %(sessionCount)s kľúčov relácií",
     "Enter Recovery Passphrase": "Zadajte heslo bezpečného obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním (dlhého) hesla obnovenia.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho (dlhého) hesla obnovenia.",
     "Waiting for %(userId)s to confirm...": "Čakanie na potvrdenie od používateľa %(userId)s…",
     "Prompt before sending invites to potentially invalid matrix IDs": "Upozorniť pred odoslaním pozvaní na potenciálne neexistujúce Matrix ID",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie je možné nájsť používateľský profil pre Matrix ID zobrazené nižšie. Chcete ich napriek tomu pozvať?",
@@ -1029,7 +1029,7 @@
     "Enter Recovery Key": "Zadajte kľúč obnovenia",
     "This looks like a valid recovery key!": "Zdá sa, že toto je platný kľúč obnovenia!",
     "Not a valid recovery key": "Neplatný kľúč obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním kľúča obnovenia.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho kľúča obnovenia.",
     "Set a new status...": "Nastaviť nový stav…",
     "Clear status": "Zrušiť stav",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Ste správcom tejto komunity. Nebudete môcť znovu vstúpiť bez pozvania od iného správcu.",
@@ -1041,8 +1041,8 @@
     "Great! This passphrase looks strong enough.": "Výborne! Toto je dostatočne silné heslo.",
     "Enter a passphrase...": "Zadajte heslo…",
     "That matches!": "Zhoda!",
-    "That doesn't match.": "Nezhodujú sa.",
-    "Go back to set it again.": "Vráťte sa späť a nastavte znovu.",
+    "That doesn't match.": "To sa nezhoduje.",
+    "Go back to set it again.": "Vráťte sa späť a nastavte to znovu.",
     "Repeat your passphrase...": "Zopakujte heslo…",
     "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Ak zabudnete svoje heslo obnovenia, tento kľúč môžete použiť ako ďalší bezpečnostný prvok na obnovenie histórii šifrovaných konverzácií.",
     "As a safety net, you can use it to restore your encrypted message history.": "Tento kľúč môžete použiť ako ďalší bezpečnostný prvok na obnovenie histórii šifrovaných konverzácií.",
@@ -1059,8 +1059,8 @@
     "Retry": "Skúsiť znovu",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ak si nenastavíte Bezpečné obnovenie správ, po odhlásení stratíte prístup k histórii šifrovaných konverzácií.",
     "If you don't want to set this up now, you can later in Settings.": "Ak nechcete pokračovať v nastavení teraz, môžete sa k tomu vrátiť neskôr v časti nastavenia.",
-    "New Recovery Method": "Nový spôsob obnovi",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste si nenastavili nový spôsob obnovenia útočníci sa môžu pokúsiť dostať k vášmu účtu. Ihneď si v nastaveniach zmeňte heslo a znovu  si nastavte možnosti obnovenia.",
+    "New Recovery Method": "Nový spôsob obnovy",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste si nenastavili nový spôsob obnovenia, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach.",
     "Set up Secure Messages": "Nastaviť bezpečné obnovenie správ",
     "Go to Settings": "Otvoriť nastavenia",
     "Whether or not you're logged in (we don't record your username)": "Či ste alebo nie ste prihlásení (nezaznamenávame vaše meno používateľa)",
@@ -1321,7 +1321,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Platený hosting pre organizácie <a>Zistiť viac</a>",
     "Other": "Ďalšie",
     "Find other public servers or use a custom server": "Nájdite ďalšie verejné domovské servery alebo nastavte pripojenie k serveru ručne",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pre najlepší zážitok si prosím nainštalujte <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink>.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Prosím, nainštalujte si <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink> pre najlepší zážitok.",
     "Couldn't load page": "Nie je možné načítať stránku",
     "Want more than a community? <a>Get your own server</a>": "Chceli by ste viac než komunitu? <a>Získajte vlastný server</a>",
     "This homeserver does not support communities": "Tento domovský server nepodporuje komunity",
@@ -1339,7 +1339,7 @@
     "Create your account": "Vytvoriť váš účet",
     "Keep going...": "Pokračujte…",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Zašifrovanú kópiu vašich šifrovacích kľúčov uchováme na domovskom servery. Zabezpečte si zálohovanie zadaním hesla obnovenia, čo posilní ochranu vašich údajov.",
-    "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, heslo obnovenia by malo byť odlišné ako heslo, ktorým sa prihlasujete do Matrix účtu.",
+    "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, (dlhé) heslo by malo byť odlišné od hesla, ktorým sa prihlasujete do vášho účtu.",
     "Set up with a Recovery Key": "Nastaviť použitím kľúča obnovenia",
     "Please enter your passphrase a second time to confirm.": "Prosím zadajte heslo obnovenia ešte raz pre potvrdenie.",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kľúč obnovenia je bezpečnostný mechanizmus - môžete ho použiť na prístup k šifrovacím kľúčom v prípade, ak zabudnete vaše heslo obnovenia.",
@@ -1348,10 +1348,10 @@
     "Confirm your passphrase": "Potvrdiť heslo obnovenia",
     "Recovery key": "Kľúč obnovenia",
     "Starting backup...": "Začína sa zálohovanie…",
-    "Success!": "Hotovo!",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Boli zistené nový kľúč a nové heslo obnovenia zálohovania šifrovacích kľúčov.",
+    "Success!": "Úspech!",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Nové (dlhé) heslo na obnovu zálohy a kľúč pre bezpečné správy boli spozorované.",
     "Recovery Method Removed": "Odstránený spôsob obnovenia",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste spôsob obnovenia neodstránili vy, útočník sa pravdepodobne usiluje dostať k vašemu účtu. Zmente si prosím heslo na prihlásenie do Matrix účtu a znovu si ihneď nastavte možnosti obnovenia.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ak ste neodstránili spôsob obnovenia vy, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Či používate alebo nie funkcionalitu známu ako „omrvinky“ (obrázky nad zoznamom miestností)",
     "Call failed due to misconfigured server": "Hovor zlyhal kvôli nesprávne nakonfigurovanému serveru",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Prosím, požiadajte správcu vášho domovského servera (<code>%(homeserverDomain)s</code>) aby nakonfiguroval Turn server, čo zlepší spoľahlivosť audio / video hovorov.",
@@ -1410,7 +1410,7 @@
     "Send cross-signing keys to homeserver": "Poslať kľúče pre podpisovanie naprieč zariadeniami na domovský server",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Táto akcia si vyžaduje mať overenú emailovú adresu alebo telefónne číslo cez predvolený server totožností <server />, ale server nezverejnil podmienky používania.",
     "Trust": "Dôverovať",
-    "Custom (%(level)s)": "Vlastná (%(level)s)",
+    "Custom (%(level)s)": "Vlastný (%(level)s)",
     "Sends a message as plain text, without interpreting it as markdown": "Odošle správu vo formáte obyčajný text, bez prekladu markdown",
     "You do not have the required permissions to use this command.": "Na použitie tohoto príkazu nemáte dostatočné povolenia.",
     "Error upgrading room": "Chyba pri aktualizácii miestnosti",
@@ -1441,7 +1441,7 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť z domovských serverov pôvodne sa zhodujúcich s %(oldGlob)s na servery zhodujúce sa s %(newGlob)s, dôvod: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť pôvodne sa zhodujúce s %(oldGlob)s na %(newGlob)s, dôvod: %(reason)s",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Multiple integration managers": "Viacej integračných serverov",
+    "Multiple integration managers": "Viac integračných serverov",
     "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)",
     "Enable local event indexing and E2EE search (requires restart)": "Povoliť lokálne indexovanie udalostí a vyhľadávanie v šifrovaných miestnostiach",
     "Match system theme": "Prispôsobiť sa vzhľadu systému",
@@ -1452,12 +1452,12 @@
     "The message you are trying to send is too large.": "Správa, ktorú sa usilujete odoslať, je príliš veľká.",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!",
     "Upload": "Nahrať",
-    "Cross-signing and secret storage are enabled.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko sú aktívne.",
-    "Cross-signing and secret storage are not yet set up.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko zatiaľ nie sú nastavené.",
+    "Cross-signing and secret storage are enabled.": "Krížové podpisovanie a bezpečné úložisko sú zapnuté.",
+    "Cross-signing and secret storage are not yet set up.": "Krížové podpisovanie a bezpečné úložisko zatiaľ nie sú nastavené.",
     "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko",
-    "Cross-signing public keys:": "Verejné kľúče podpisovania naprieč zariadeniami:",
+    "Cross-signing public keys:": "Verejné kľúče krížového podpisovania:",
     "not found": "nenájdené",
-    "Cross-signing private keys:": "Súkromné kľúče podpisovania naprieč zariadeniami:",
+    "Cross-signing private keys:": "Súkromné kľúče krížového podpisovania:",
     "in secret storage": "na bezpečnom úložisku",
     "Secret storage public key:": "Verejný kľúč bezpečného úložiska:",
     "in account data": "v údajoch účtu",
@@ -1475,13 +1475,13 @@
     "Disconnect identity server": "Odpojiť server totožností",
     "Disconnect from the identity server <idserver />?": "Naozaj sa chcete odpojiť od servera totožností <idserver />?",
     "Disconnect": "Odpojiť",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Pred odpojením zo servera totožností <idserver /> by ste mali z neho <b>odstrániť vaše osobné údaje</b>. Žiaľ, server <idserver /> momentálne nie je dostupný a nie je možné sa k nemu pripojiť.",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Pred odpojením by ste mali <b>odstrániť vaše osobné údaje</b> zo servera totožností <idserver />. Žiaľ, server totožnosti <idserver /> momentálne nie je dostupný a nie je možné sa k nemu pripojiť.",
     "You should:": "Mali by ste:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Skontrolovať rozšírenia inštalované vo webovom prehliadači, ktoré by mohli blokovať prístup k serveru totožností (napr. rozšírenie Privacy Badger)",
     "contact the administrators of identity server <idserver />": "Kontaktovať správcu servera totožností <idserver />",
     "wait and try again later": "Počkať a skúsiť znovu neskôr",
     "Disconnect anyway": "Napriek tomu sa odpojiť",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "na servery <idserver /> <b>máte stále uložené vaše osobné údaje</b>.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Stále <b>zdielate vaše osobné údaje</b> so serverom totožnosti <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Odporúčame, aby ste ešte pred odpojením sa zo servera totožností odstránili vašu emailovú adresu a telefónne číslo.",
     "Identity Server (%(server)s)": "Server totožností (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
@@ -1496,7 +1496,7 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.",
     "Manage integrations": "Spravovať integrácie",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlas s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlaste s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
     "Discovery": "Objaviť",
     "Deactivate account": "Deaktivovať účet",
     "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
@@ -1531,7 +1531,7 @@
     "Keep recovery passphrase in memory for this session": "Ponechať (dlhé) heslo pre obnovu zálohy v pamäti pre túto reláciu",
     "Enter recovery passphrase": "Zadajte (dlhé) heslo pre obnovu zálohy",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nemožno sa dostať do tajného úložiska. Prosím, overte, že ste zadali správne (dlhé) heslo pre obnovu zálohy.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Získajte prístup k vašej šifrovanej histórií správ a vašemu krížom-podpísanej identite na potvrdenie iných relácií zadaním vášho (dlhého) hesla na obnovu zálohy.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Získajte prístup k vašej šifrovanej histórií správ a vašej krížom podpísanej identite na potvrdenie iných relácií zadaním vášho (dlhého) hesla na obnovu zálohy.",
     "Encryption upgrade available": "Je dostupná aktualizácia šifrovania",
     "Set up encryption": "Nastaviť šifrovanie",
     "Review where you’re logged in": "Zobraziť, kde ste prihlásený",
@@ -1550,7 +1550,52 @@
     "Unknown (user, session) pair:": "Neznámy pár (používateľ, relácia):",
     "Session already verified!": "Relácia je už overená!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVANIE: Relácia je už overená, ale kľúče sa NEZHODUJÚ!",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokiaľ ste zabudli na vaše (dlhé) heslo na obnovu zálohy, môžete <button1>použiť váš kľúč na obnovu zálohy</button1> alebo <button2>nastaviť nové spôsoby obnovy zálohy</button2>.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokiaľ ste zabudli vaše (dlhé) heslo na obnovu zálohy, môžete <button1>použiť váš kľúč na obnovu zálohy</button1> alebo <button2>nastaviť nové spôsoby obnovy zálohy</button2>.",
     "Incorrect recovery passphrase": "Nesprávne (dlhé) heslo pre obnovu zálohy",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Záloha nemohla byť rozšifrovaná pomocou tohto (dlhého) helsa na obnovu zálohy: prosím, overte, či ste zadali správne (dlhé) helso na obnovu zálohy."
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Záloha nemohla byť rozšifrovaná pomocou tohto (dlhého) helsa na obnovu zálohy: prosím, overte, či ste zadali správne (dlhé) helso na obnovu zálohy.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVANIE: OVERENIE KĽÚČOV ZLYHALO! Podpisovaný kľúč používateľa %(userId)s a relácia %(deviceId)s je \"%(fprint)s\" čo nezodpovedá zadanému kľúču \"%(fingerprint)s\". Môže to znamenať, že vaša komunikácia je infiltrovaná!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpísaný kľúč sa zhoduje s podpísaným kľúčom od relácie %(deviceId)s používateľa %(userId)s. Relácia je označená ako overená.",
+    "Displays information about a user": "Zobrazuje informácie o používateľovi",
+    "Send a bug report with logs": "Zaslať chybové hlásenie so záznamami",
+    "Opens chat with the given user": "Otvorí konverzáciu s daným používateľom",
+    "Sends a message to the given user": "Pošle správu danému používateľovi",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmenil/a meno miestnosti z %(oldRoomName)s na %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pridal/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pridal/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odstránil/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odstránil/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmenil/a alternatívne adresy pre túto miestnosť.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmenil hlavnú a alternatívne adresy pre túto miestnosť.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s zmenil/a adresy pre túto miestnosť.",
+    "You signed in to a new session without verifying it:": "Prihlásili ste sa do novej relácie bez jej overenia:",
+    "Verify your other session using one of the options below.": "Overte svoje ostatné relácie pomocou jednej z nižšie uvedených možností.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) sa prihlásil do novej relácie bez jej overenia:",
+    "Ask this user to verify their session, or manually verify it below.": "Poproste tohto používateľa, aby si overil svoju reláciu alebo ju nižšie manuálne overte.",
+    "Not Trusted": "Nedôveryhodné",
+    "Manually Verify by Text": "Manuálne overte pomocou textu",
+    "Interactively verify by Emoji": "Interaktívne overte pomocou emotikonov",
+    "Done": "Hotovo",
+    "a few seconds ago": "pred pár sekundami",
+    "about a minute ago": "približne pred minutou",
+    "about an hour ago": "približne pred hodinou",
+    "about a day ago": "približne deň dozadu",
+    "a few seconds from now": "o pár sekúnd",
+    "about a minute from now": "približne o minutu",
+    "about an hour from now": "približne o hodinu",
+    "about a day from now": "približne o deň",
+    "Support adding custom themes": "Umožniť pridávať vlastný vzhľad",
+    "Enable cross-signing to verify per-user instead of per-session": "Povoliť krížové podpisovanie na overovanie používateľa namiesto overovania jednotlivých relácií",
+    "Your homeserver does not support cross-signing.": "Váš domovský server nepodporuje krížové podpisovanie.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má krížovo podpísanú identitu v bezpečnom úložisku, ale zatiaľ nie je nedôveryhodná pre túto reláciu.",
+    "Reset cross-signing and secret storage": "Obnoviť krížové podpisovanie a bezpečné úložisko",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individuálne overte každú používateľskú reláciu a označte ju za dôveryhodnú, bez dôvery krížovo podpísaných zariadení.",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Zálohovací kľúč je uložený v bezpečnom úložisku, ale jeho načítanie nie je povolené v tejto relácií. Prosím, zapnite krížové podpisovanie v Experimentoch, aby ste mohli modifikovať stav zálohy.",
+    "Cross-signing": "Krížové podpisovanie",
+    "Destroy cross-signing keys?": "Zmazať kľúče pre krížové podpisovanie?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Zmazanie kľúčov pre krížové podpisovanie je nenávratné. Každý, s kým ste sa overili, bude vidieť bezpečnostné upozornenia. Toto určite nechcete robiť dokiaľ ste nestratili všetky zariadenia, s ktorými by ste mohli krížovo podpisovať.",
+    "Clear cross-signing keys": "Zmazať kľúče pre krížové podpisovanie",
+    "a new cross-signing key signature": "nový podpis kľúča pre krížové podpisovanie",
+    "a device cross-signing signature": "podpis krížovo podpísaného zariadenia",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Získajte prístup k vašej šifrovanej histórií správ a vašej krížom podpísanej identite pre overenie iných relácií zadaním vášho kľúču obnovy.",
+    "or another cross-signing capable Matrix client": "alebo iný Matrixový klient podporujúci krížové podpisovanie"
 }

From 406839e89a43a559e6529c32998e40f8d5a77f21 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:13:57 +0100
Subject: [PATCH 3043/3235] Upgrade matrix-js-sdk to 6.1.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8338a91bf7..99e0399d8e 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "6.1.0-rc.1",
+    "matrix-js-sdk": "6.1.0",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index d05c444470..0edea5433e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5720,10 +5720,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@6.1.0-rc.1:
-  version "6.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3"
-  integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw==
+matrix-js-sdk@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee"
+  integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From bc8a53a7d797a513bf0fb2c000fd63cc7e90f4a8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:21:59 +0100
Subject: [PATCH 3044/3235] Prepare changelog for v2.6.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34bfba87b..7901062b89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+Changes in [2.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0) (2020-05-19)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0-rc.1...v2.6.0)
+
+ * Upgrade to JS SDK 6.1.0
+ * Revert "ImageView make clicking off it easier"
+   [\#4602](https://github.com/matrix-org/matrix-react-sdk/pull/4602)
+ * Remove debugging that causes email addresses to load forever (to release)
+   [\#4598](https://github.com/matrix-org/matrix-react-sdk/pull/4598)
+
 Changes in [2.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0-rc.1) (2020-05-14)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0...v2.6.0-rc.1)

From 26e6447be5331614668b0d0e3ae516a0988ef9bc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:22:00 +0100
Subject: [PATCH 3045/3235] v2.6.0

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

diff --git a/package.json b/package.json
index 99e0399d8e..28f3d1633c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.6.0-rc.1",
+  "version": "2.6.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 82ca614fa78958172e8d855e8fd37ca220f34d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 19 May 2020 06:50:47 +0000
Subject: [PATCH 3046/3235] Translated using Weblate (Estonian)

Currently translated at 53.6% (1239 of 2311 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 3fb069055c..3d4b7ec888 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1236,5 +1236,11 @@
     "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Mitte midagi ei kuvata? Kõik Matrix'i kliendid ei toeta veel interaktiivset verifitseerimist. <button>Kasuta vana  kooli verifitseerimismeetodit</button>.",
     "Waiting for %(userId)s to confirm...": "Ootan kinnitust kasutajalt %(userId)s…",
     "Skip": "Jäta vahele",
-    "Token incorrect": "Vigane tunnusluba"
+    "Token incorrect": "Vigane tunnusluba",
+    "%(oneUser)schanged their name %(count)s times|one": "Kasutaja %(oneUser)s muutis oma nime",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Kas sa oled kindel, et soovid oma konto sulgeda? Seda tegevust ei saa hiljem tagasi pöörata.",
+    "Confirm account deactivation": "Kinnita konto sulgemine",
+    "There was a problem communicating with the server. Please try again.": "Serveriühenduses tekkis viga. Palun proovi uuesti.",
+    "Server did not return valid authentication information.": "Serveri saadetud vastuses ei olnud kehtivat autentimisteavet.",
+    "Please fill why you're reporting.": "Palun kirjelda veateate põhjust."
 }

From 833eccf5cd901d04ddfcc06a7f95e2e2ebe6f5d5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:25:07 +0100
Subject: [PATCH 3047/3235] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 3bdda8a583..7c008d5ccc 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.6",
     "lodash": "^4.17.14",
-    "matrix-js-sdk": "6.1.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "minimist": "^1.2.0",
     "pako": "^1.0.5",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index b7e5017fd7..93118dab22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1285,6 +1285,13 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
+"@types/qrcode@^1.3.4":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b"
+  integrity sha512-aILE5yvKaqQXlY0YPMEYwK/KwdD43fwQTyagj0ffBBTQj8h//085Zp8LUrOnZ9FT69x64f5UgDo0EueY4BPAdg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/react@*":
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
@@ -1293,13 +1300,6 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/qrcode@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b"
-  integrity sha512-aILE5yvKaqQXlY0YPMEYwK/KwdD43fwQTyagj0ffBBTQj8h//085Zp8LUrOnZ9FT69x64f5UgDo0EueY4BPAdg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/react@16.9":
   version "16.9.32"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
@@ -5753,10 +5753,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@6.1.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee"
-  integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From 3cd03812022ee7d9b7b7fbc9eca2b09ba22517e4 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Tue, 19 May 2020 10:34:45 +0000
Subject: [PATCH 3048/3235] Translated using Weblate (Russian)

Currently translated at 89.8% (2075 of 2311 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 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 3591d96120..be9c6bfdd4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -97,13 +97,13 @@
     "Who can read history?": "Кто может читать историю?",
     "You do not have permission to post to this room": "Вы не можете писать в эту комнату",
     "You have no visible notifications": "Нет видимых уведомлений",
-    "%(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.": "%(targetName)s принимает приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
     "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокировал(а) %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s забанил(а) %(targetName)s.",
     "Call Timeout": "Нет ответа",
-    "%(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 topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
@@ -223,8 +223,8 @@
     "Reason": "Причина",
     "%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
     "Reject invitation": "Отклонить приглашение",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил(а) свое отображаемое имя (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s удалил(а) свой аватар.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удаляет своё отображаемое имя (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s удаляет свой аватар.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)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 не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
@@ -302,8 +302,8 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
     "Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
     "Session ID": "ID сессии",
-    "%(senderName)s set a profile picture.": "%(senderName)s установил(а) себе аватар.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
+    "%(senderName)s set a profile picture.": "%(senderName)s устанавливает себе аватар.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s меняет отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
     "This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
@@ -696,7 +696,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s меняет отображаемое имя на %(displayName)s.",
     "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 в комнату",
@@ -977,7 +977,7 @@
     "Render simple counters in room header": "Отображать простые счетчики в заголовке комнаты",
     "Enable Emoji suggestions while typing": "Включить предложения смайликов при наборе",
     "Show a placeholder for removed messages": "Показывать плашки вместо удалённых сообщений",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о вступлении | выходе (не влияет на приглашения, исключения и запреты)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, кики и баны)",
     "Show avatar changes": "Показывать изменения аватара",
     "Show display name changes": "Показывать изменения отображаемого имени",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Напоминать включить Безопасное Восстановление Сообщений в зашифрованных комнатах",
@@ -1639,7 +1639,7 @@
     "This alias is already in use": "Этот псевдоним уже используется",
     "Close dialog": "Закрыть диалог",
     "Please enter a name for the room": "Пожалуйста, введите название комнаты",
-    "This room is private, and can only be joined by invitation.": "Эта комната приватная и может быть присоединена только по приглашению.",
+    "This room is private, and can only be joined by invitation.": "Эта комната приватная, в неё можно войти только по приглашению.",
     "Hide advanced": "Скрыть расширения",
     "Show advanced": "Показать расширения",
     "Please fill why you're reporting.": "Пожалуйста, заполните, почему вы сообщаете.",

From af2eed2228dbf7552c94fe10e970d8a4af88640d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 19 May 2020 13:17:34 +0100
Subject: [PATCH 3049/3235] Fix room alias lookup vs peeking race condition

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 24 ++++++++++++++++++++----
 src/stores/RoomViewStore.js           | 12 ++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 635597db74..8e343fe08f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -164,6 +164,8 @@ export default createReactClass({
 
             canReact: false,
             canReply: false,
+
+            matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
         };
     },
 
@@ -232,7 +234,8 @@ export default createReactClass({
             initialEventId: RoomViewStore.getInitialEventId(),
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
-            shouldPeek: RoomViewStore.shouldPeek(),
+            // we should only peek once we have a ready client
+            shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
             showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", roomId),
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
         };
@@ -681,6 +684,16 @@ export default createReactClass({
                     });
                 }
                 break;
+            case 'sync_state':
+                if (!this.state.matrixClientIsReady) {
+                    this.setState({
+                        matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
+                    }, () => {
+                        // send another "initial" RVS update to trigger peeking if needed
+                        this._onRoomViewStoreUpdate(true);
+                    });
+                }
+                break;
         }
     },
 
@@ -1663,14 +1676,16 @@ export default createReactClass({
         const ErrorBoundary = sdk.getComponent("elements.ErrorBoundary");
 
         if (!this.state.room) {
-            const loading = this.state.roomLoading || this.state.peekLoading;
+            const loading = this.state.matrixClientIsReady || this.state.roomLoading || this.state.peekLoading;
             if (loading) {
+                // Assume preview loading if we don't have a ready client or a room ID (still resolving the alias)
+                const previewLoading = !this.state.matrixClientIsReady || !this.state.roomId || this.state.peekLoading;
                 return (
                     <div className="mx_RoomView">
                         <ErrorBoundary>
                             <RoomPreviewBar
                                 canPreview={false}
-                                previewLoading={this.state.peekLoading}
+                                previewLoading={previewLoading && !this.state.roomLoadError}
                                 error={this.state.roomLoadError}
                                 loading={loading}
                                 joining={this.state.joining}
@@ -1695,7 +1710,8 @@ export default createReactClass({
                 return (
                     <div className="mx_RoomView">
                         <ErrorBoundary>
-                            <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
+                            <RoomPreviewBar
+                                onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectThreepidInviteButtonClicked}
                                 canPreview={false} error={this.state.roomLoadError}
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 3d82d086d7..1958b9539f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -46,7 +46,6 @@ const INITIAL_STATE = {
     forwardingEvent: null,
 
     quotingEvent: null,
-    matrixClientIsReady: false,
 };
 
 /**
@@ -60,9 +59,6 @@ class RoomViewStore extends Store {
 
         // Initialise state
         this._state = INITIAL_STATE;
-        if (MatrixClientPeg.get()) {
-            this._state.matrixClientIsReady = MatrixClientPeg.get().isInitialSyncComplete();
-        }
     }
 
     _setState(newState) {
@@ -157,11 +153,6 @@ class RoomViewStore extends Store {
                 }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
                 break;
             }
-            case 'sync_state':
-                this._setState({
-                    matrixClientIsReady: MatrixClientPeg.get() && MatrixClientPeg.get().isInitialSyncComplete(),
-                });
-                break;
         }
     }
 
@@ -224,6 +215,7 @@ class RoomViewStore extends Store {
                     storeRoomAliasInCache(payload.room_alias, result.room_id);
                     roomId = result.room_id;
                 } catch (err) {
+                    console.error(err);
                     dis.dispatch({
                         action: 'view_room_error',
                         room_id: null,
@@ -375,7 +367,7 @@ class RoomViewStore extends Store {
     }
 
     shouldPeek() {
-        return this._state.shouldPeek && this._state.matrixClientIsReady;
+        return this._state.shouldPeek;
     }
 }
 

From 4bf2e5fd8eaafe22533e5e3a02752a9d2251d129 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 May 2020 15:40:26 +0100
Subject: [PATCH 3050/3235] Remove SSSS key upgrade check from rageshake

This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
---
 src/rageshake/submit-rageshake.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index e5027e0d37..9f9d7898cb 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -133,7 +133,6 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
             body.append("cross_signing_supported_by_hs",
                 String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")));
             body.append("cross_signing_ready", String(await client.isCrossSigningReady()));
-            body.append("ssss_key_needs_upgrade", String(await client.secretStorageKeyNeedsUpgrade()));
         }
     }
 

From dda0d2102c16b24b651c058c5a28f2caccc3318c Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 19 May 2020 13:00:53 +0000
Subject: [PATCH 3051/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2312 of 2312 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 3f749ebe0f..2729248bb0 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2409,5 +2409,6 @@
     "QR Code": "Rapidresponda kodo",
     "Dismiss read marker and jump to bottom": "Forigi legomarkon kaj iri al fundo",
     "Jump to oldest unread message": "Iri al plej malnova nelegita mesaĝo",
-    "Upload a file": "Alŝuti dosieron"
+    "Upload a file": "Alŝuti dosieron",
+    "Create room": "Krei ĉambron"
 }

From 894412ca4c32299630f2633e557e9ef4496a00cd Mon Sep 17 00:00:00 2001
From: Kim Brose <kim.brose@rwth-aachen.de>
Date: Tue, 19 May 2020 14:51:57 +0000
Subject: [PATCH 3052/3235] Translated using Weblate (German)

Currently translated at 99.8% (2308 of 2312 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1166e7710a..eaefbdaa71 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1103,7 +1103,7 @@
     "Room information": "Rauminformationen",
     "Internal room ID:": "Interne Raum ID:",
     "Room version": "Raum Version",
-    "Room version:": "Raum Version:",
+    "Room version:": "Raum-Version:",
     "Developer options": "Entwickleroptionen",
     "General": "Allgemein",
     "Set a new account password...": "Neues Benutzerkonto-Passwort festlegen...",

From 286828b3bb8a3556726c625be4b6034c1e83d87b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 19 May 2020 16:15:13 +0100
Subject: [PATCH 3053/3235] Disable irc mode in notifiactions panel

---
 src/components/structures/MessagePanel.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index cac04d84f1..93e4668f66 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -110,15 +110,16 @@ export default class MessagePanel extends React.Component {
         showReactions: PropTypes.bool,
     };
 
-    constructor() {
-        super();
+    // Force props to be loaded for useIRCLayout
+    constructor(props) {
+        super(props);
 
         this.state = {
             // previous positions the read marker has been in, so we can
             // display 'ghost' read markers that are animating away
             ghostReadMarkers: [],
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
-            useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+            useIRCLayout: this.useIRCLayout(SettingsStore.getValue("feature_irc_ui")),
         };
 
         // opaque readreceipt info for each userId; used by ReadReceiptMarker
@@ -203,10 +204,15 @@ export default class MessagePanel extends React.Component {
 
     onLayoutChange = () => {
         this.setState({
-            useIRCLayout: SettingsStore.getValue("feature_irc_ui"),
+            useIRCLayout: this.useIRCLayout(SettingsStore.getValue("feature_irc_ui")),
         });
     }
 
+    useIRCLayout(ircLayoutSelected) {
+        // if room is null we are not in a normal room list
+        return ircLayoutSelected && this.props.room;
+    }
+
     /* get the DOM node representing the given event */
     getNodeForEventId(eventId) {
         if (!this.eventNodes) {

From 86ad6de41ee455285695270242a5d0983b014899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 20 May 2020 11:01:56 +0200
Subject: [PATCH 3054/3235] EventIndex: Handle null tokens in the crawler loop
 as well.

This is similar to 5eb510387c9aa08a061d5fd17bed3efc104b48eb. But now the
checkpoint arrived during a crawl.
---
 src/indexing/EventIndex.js | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 02151f8474..16b0183da1 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -489,14 +489,20 @@ export default class EventIndex extends EventEmitter {
                 return object;
             });
 
-            // Create a new checkpoint so we can continue crawling the room for
-            // messages.
-            const newCheckpoint = {
-                roomId: checkpoint.roomId,
-                token: res.end,
-                fullCrawl: checkpoint.fullCrawl,
-                direction: checkpoint.direction,
-            };
+            let newCheckpoint;
+
+            // The token can be null for some reason. Don't create a checkpoint
+            // in that case since adding it to the db will fail.
+            if (res.end) {
+                // Create a new checkpoint so we can continue crawling the room
+                // for messages.
+                newCheckpoint = {
+                    roomId: checkpoint.roomId,
+                    token: res.end,
+                    fullCrawl: checkpoint.fullCrawl,
+                    direction: checkpoint.direction,
+                };
+            }
 
             try {
                 for (let i = 0; i < redactionEvents.length; i++) {
@@ -506,6 +512,15 @@ export default class EventIndex extends EventEmitter {
 
                 const eventsAlreadyAdded = await indexManager.addHistoricEvents(
                     events, newCheckpoint, checkpoint);
+
+                // We didn't get a valid new checkpoint from the server, nothing
+                // to do here anymore.
+                if (!newCheckpoint) {
+                    console.log("EventIndex: The server didn't return a valid ",
+                                "new checkpoint, not continuing the crawl.", checkpoint);
+                    continue
+                }
+
                 // If all events were already indexed we assume that we catched
                 // up with our index and don't need to crawl the room further.
                 // Let us delete the checkpoint in that case, otherwise push

From db72c645bae492a5a3daba70695ef137ef07d485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 20 May 2020 11:14:37 +0200
Subject: [PATCH 3055/3235] EventIndex: Add a missing semicolon.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 16b0183da1..d372c38405 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -518,7 +518,7 @@ export default class EventIndex extends EventEmitter {
                 if (!newCheckpoint) {
                     console.log("EventIndex: The server didn't return a valid ",
                                 "new checkpoint, not continuing the crawl.", checkpoint);
-                    continue
+                    continue;
                 }
 
                 // If all events were already indexed we assume that we catched

From 3e30df17fbc9a3a5efeb4c7bbf24ea62c828b235 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 13:07:33 +0100
Subject: [PATCH 3056/3235] Slider is more responsive

---
 res/css/views/elements/_Slider.scss      |  5 ++++-
 src/components/views/elements/Slider.tsx | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
index 06c3c4c98b..58ba2813b4 100644
--- a/res/css/views/elements/_Slider.scss
+++ b/res/css/views/elements/_Slider.scss
@@ -38,7 +38,9 @@ limitations under the License.
 
 .mx_Slider_bar > hr {
     width: 100%;
-    border: 0.2em solid $slider-background-color;
+    height: 0.4em;
+    background-color: $slider-background-color;
+    border: 0;
 }
 
 .mx_Slider_selection {
@@ -47,6 +49,7 @@ limitations under the License.
     width: calc(100% - 1em); // 2 * half the width of a dot
     height: 1em;
     position: absolute;
+    pointer-events: none;
 }
 
 .mx_Slider_selectionDot {
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index e181f0d9e3..f76a4684d3 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -93,7 +93,7 @@ export default class Slider extends React.Component<IProps> {
         return <div className="mx_Slider">
             <div>
                 <div className="mx_Slider_bar">
-                    <hr />
+                    <hr onClick={this.props.disabled ? () => {} : this.onClick.bind(this)}/>
                     { selection }
                 </div>
                 <div className="mx_Slider_dotContainer">
@@ -102,6 +102,15 @@ export default class Slider extends React.Component<IProps> {
             </div>
         </div>;
     }
+
+    onClick(event: React.MouseEvent) {
+        const width = (event.target as HTMLElement).clientWidth;
+        // nativeEvent is safe to use because https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/offsetX
+        // is supported by all modern browsers
+        const relativeClick = (event.nativeEvent.offsetX / width);
+        const nearestValue = this.props.values[Math.round(relativeClick * (this.props.values.length - 1))];
+        this.props.onSelectionChange(nearestValue);
+    }
 }
 
 interface IDotProps {

From 55e72dd5bf826fd8fb9cfb3f7b769ad682247b67 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 13:45:54 +0100
Subject: [PATCH 3057/3235] Remove min and max font setting

---
 src/FontWatcher.js                                     |  9 +++++----
 .../settings/tabs/user/AppearanceUserSettingsTab.js    |  6 +++---
 src/settings/Settings.js                               | 10 ----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/FontWatcher.js b/src/FontWatcher.js
index 561edc4662..1128ac1bd5 100644
--- a/src/FontWatcher.js
+++ b/src/FontWatcher.js
@@ -18,6 +18,10 @@ import dis from './dispatcher';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
+
+    static minSize = 13;
+    static maxSize = 20;
+
     constructor() {
         this._dispatcherRef = null;
     }
@@ -38,10 +42,7 @@ export class FontWatcher {
     };
 
     _setRootFontSize = (size) => {
-        const min = SettingsStore.getValue("fontSizeMin");
-        const max = SettingsStore.getValue("fontSizeMax");
-
-        const fontSize = Math.max(Math.min(max, size), min);
+        const fontSize = Math.max(Math.min(this.maxSize, size), this.minSize);
 
         if (fontSize != size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 63857ed9c2..308b7098d1 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -25,7 +25,7 @@ import Field from "../../../elements/Field";
 import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
-import _range from "lodash/range";
+import { FontWatcher } from "../../../../../FontWatcher";
 
 export default class AppearanceUserSettingsTab extends React.Component {
     constructor() {
@@ -109,8 +109,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
         console.log({value});
 
         const parsedSize = parseFloat(value);
-        const min = SettingsStore.getValue("fontSizeMin");
-        const max = SettingsStore.getValue("fontSizeMax");
+        const min = FontWatcher.minSize;
+        const max = FontWatcher.maxSize;
 
         if (isNaN(parsedSize)) {
             return {valid: false, feedback: _t("Size must be a number")};
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index afe8d2cecc..5f093f6a70 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -171,16 +171,6 @@ export const SETTINGS = {
         default: 16,
         controller: new FontSizeController(),
     },
-    "fontSizeMin": {
-        displayName: _td("Min font size"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 13,
-    },
-    "fontSizeMax": {
-        displayName: _td("Max font size"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 20,
-    },
     "useCustomFontSize": {
         displayName: _td("Custom font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,

From 82b76192aee6fe64865c1bc4ff456d0c4614dad0 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 14:44:56 +0100
Subject: [PATCH 3058/3235] Fixes, lints and i18n

---
 src/FontWatcher.js                                            | 4 ++--
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js     | 2 +-
 src/i18n/strings/en_EN.json                                   | 2 --
 src/settings/controllers/FontSizeController.js                | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/FontWatcher.js b/src/FontWatcher.js
index 1128ac1bd5..b45d9065ce 100644
--- a/src/FontWatcher.js
+++ b/src/FontWatcher.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
@@ -42,7 +42,7 @@ export class FontWatcher {
     };
 
     _setRootFontSize = (size) => {
-        const fontSize = Math.max(Math.min(this.maxSize, size), this.minSize);
+        const fontSize = Math.max(Math.min(FontWatcher.maxSize, size), FontWatcher.minSize);
 
         if (fontSize != size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 308b7098d1..3d04e10df7 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -24,7 +24,7 @@ import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import Field from "../../../elements/Field";
 import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 import { FontWatcher } from "../../../../../FontWatcher";
 
 export default class AppearanceUserSettingsTab extends React.Component {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d6670e85b3..b7417762f1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -412,8 +412,6 @@
     "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
     "Font size": "Font size",
-    "Min font size": "Min font size",
-    "Max font size": "Max font size",
     "Custom font size": "Custom font size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
diff --git a/src/settings/controllers/FontSizeController.js b/src/settings/controllers/FontSizeController.js
index 8e855e31ec..3ef01ab99b 100644
--- a/src/settings/controllers/FontSizeController.js
+++ b/src/settings/controllers/FontSizeController.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 
 export default class FontSizeController extends SettingController {
     constructor() {

From 4e9a139e8b45a8597b3fa51c357fca5ea1691fa7 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 14:49:18 +0100
Subject: [PATCH 3059/3235] lint

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

diff --git a/src/FontWatcher.js b/src/FontWatcher.js
index b45d9065ce..c547ef8ce0 100644
--- a/src/FontWatcher.js
+++ b/src/FontWatcher.js
@@ -18,7 +18,6 @@ import dis from './dispatcher/dispatcher';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
-
     static minSize = 13;
     static maxSize = 20;
 

From adec5a4f921bb9e24d7f0d52240bbcc84959b871 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 15:09:10 +0100
Subject: [PATCH 3060/3235] fix test

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

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 59671327ce..4e93b3bb64 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,7 +206,7 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'style="width: 1.0666666666666667rem; height: 1.0666666666666667rem;" ' +
+                'style="width: 16px; height: 16px;" ' +
                 'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });

From 50a44405f012f9f987709025d1ea4c0e1e275eac Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Wed, 20 May 2020 15:17:47 +0100
Subject: [PATCH 3061/3235] CONSTANT_CASING

---
 src/FontWatcher.js                                          | 6 +++---
 .../views/settings/tabs/user/AppearanceUserSettingsTab.js   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/FontWatcher.js b/src/FontWatcher.js
index c547ef8ce0..006df202ad 100644
--- a/src/FontWatcher.js
+++ b/src/FontWatcher.js
@@ -18,8 +18,8 @@ import dis from './dispatcher/dispatcher';
 import SettingsStore, {SettingLevel} from './settings/SettingsStore';
 
 export class FontWatcher {
-    static minSize = 13;
-    static maxSize = 20;
+    static MIN_SIZE = 13;
+    static MAX_SIZE = 20;
 
     constructor() {
         this._dispatcherRef = null;
@@ -41,7 +41,7 @@ export class FontWatcher {
     };
 
     _setRootFontSize = (size) => {
-        const fontSize = Math.max(Math.min(FontWatcher.maxSize, size), FontWatcher.minSize);
+        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
 
         if (fontSize != size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
index 3d04e10df7..5b49dd0abd 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
@@ -109,8 +109,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
         console.log({value});
 
         const parsedSize = parseFloat(value);
-        const min = FontWatcher.minSize;
-        const max = FontWatcher.maxSize;
+        const min = FontWatcher.MIN_SIZE;
+        const max = FontWatcher.MAX_SIZE;
 
         if (isNaN(parsedSize)) {
             return {valid: false, feedback: _t("Size must be a number")};

From b0e0073970a904cdbf7b1cd8120c5b616b4f9029 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 20 May 2020 08:13:27 +0000
Subject: [PATCH 3062/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2314 of 2314 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 4995eeccb0..f222d7d09f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2434,5 +2434,8 @@
     "QR Code": "QR Code",
     "Dismiss read marker and jump to bottom": "取消讀取標記並跳至底部",
     "Jump to oldest unread message": "跳至最舊的未讀訊息",
-    "Upload a file": "上傳檔案"
+    "Upload a file": "上傳檔案",
+    "Use IRC layout": "使用 IRC 佈局",
+    "IRC display name width": "IRC 顯示名稱寬度",
+    "Create room": "建立聊天室"
 }

From 48a66a817fe6f6324bd5dc863baf8ae7bbaf5067 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 20 May 2020 10:20:52 +0000
Subject: [PATCH 3063/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2314 of 2314 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, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 2729248bb0..56b5d53008 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2410,5 +2410,7 @@
     "Dismiss read marker and jump to bottom": "Forigi legomarkon kaj iri al fundo",
     "Jump to oldest unread message": "Iri al plej malnova nelegita mesaĝo",
     "Upload a file": "Alŝuti dosieron",
-    "Create room": "Krei ĉambron"
+    "Create room": "Krei ĉambron",
+    "Use IRC layout": "Uzi aranĝon de IRC",
+    "IRC display name width": "Larĝo de vidiga nomo de IRC"
 }

From 402c1b0d65d097915bca5faf4b43715606c94b8c Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Wed, 20 May 2020 04:37:45 +0000
Subject: [PATCH 3064/3235] Translated using Weblate (Finnish)

Currently translated at 94.3% (2183 of 2314 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index ae08572eb2..bf2566990c 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2189,5 +2189,80 @@
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s avaimen palautus onnistui",
     "This requires the latest Riot on your other devices:": "Tämä vaatii uusimman Riotin muilla laitteillasi:",
     "Currently indexing: %(currentRoom)s": "Indeksoidaan huonetta: %(currentRoom)s",
-    "Jump to oldest unread message": "Siirry vanhimpaan lukemattomaan viestiin"
+    "Jump to oldest unread message": "Siirry vanhimpaan lukemattomaan viestiin",
+    "Opens chat with the given user": "Avaa keskustelun annetun käyttäjän kanssa",
+    "Sends a message to the given user": "Lähettää viestin annetulle käyttäjälle",
+    "Manually Verify by Text": "Varmenna käsin tekstillä",
+    "Interactively verify by Emoji": "Varmenna interaktiivisesti emojilla",
+    "Use IRC layout": "Käytä IRC-asettelua",
+    "Enable cross-signing to verify per-user instead of per-session": "Ota ristivarmennus käyttöön varmentaaksesi käyttäjät istuntojen sijaan",
+    "Keep recovery passphrase in memory for this session": "Pidä palautuksen salalause muistissa tämän istunnon ajan",
+    "Manually verify all remote sessions": "Varmenna kaikki etäistunnot käsin",
+    "IRC display name width": "IRC-näyttönimen leveys",
+    "Verify this session by confirming the following number appears on its screen.": "Varmenna tämä istunto varmistamalla, että seuraava numero ilmestyy sen näytölle.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Odotetaan toista istuntoasi, %(deviceName)s (%(deviceId)s), varmennukseen…",
+    "Waiting for your other session to verify…": "odotetaan toista istuntoasi varmennukseen…",
+    "Verify all your sessions to ensure your account & messages are safe": "Varmenna kaikki istuntosi varmistaaksesi, että tunnuksesi ja viestisi ovat turvassa",
+    "Verify the new login accessing your account: %(name)s": "Varmenna uusi tunnuksellesi sisäänkirjautunut taho: %(name)s",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Tällä hetkellä salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikissa istunnoissa, tehden salatusta keskusteluhistoriasta lukukelvotonta, ellet ensin vie kaikkia huoneavaimiasi ja tuo niitä salasanan vaihtamisen jäkeen takaisin. Tulevaisuudessa tämä tulee toimimaan paremmin.",
+    "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristivarmennusta.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tunnuksellasi on ristivarmennuksen identiteetti salavarastossa, mutta tämä istunto ei luota siihen.",
+    "Reset cross-signing and secret storage": "Nollaa ristivarmennus ja salavarasto",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen käyttäjän istunto erikseen, äläkä luota ristivarmennettuihin laitteisiin.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa.",
+    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotissa ei ole joitain komponentteja, joita tarvitaan viestien turvalliseen välimuistitallennukseen. Jos haluat kokeilla tätä ominaisuutta, käännä mukautettu Riot Desktop, jossa on mukana <nativeLink>hakukomponentit</nativeLink>.",
+    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ei voi tallentaa viestejä turvalliseen välimuistiin pyöriessään selaimessa. Käytä Electron-pohjaista <riotLink>Riot Desktop</riotLink>-sovellusta nähdäksesi salatut viestit hakutuloksissa.",
+    "This session is backing up your keys. ": "Tämä istunto varmuuskopioi avaimesi. ",
+    "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Tämä istunto <b>ei varmuuskopioi avaimiasi</b>, mutta sillä on olemassaoleva varmuuskopio, jonka voit palauttaa ja lisätä jatkaaksesi.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Yhdistä tämä istunto avainten varmuuskopiointiin ennen uloskirjautumista, jotta et menetä avaimia, jotka ovat vain tässä istunnossa.",
+    "Connect this session to Key Backup": "Yhdistä tämä istunto avainten varmuuskopiointiin",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus <verify>varmennetusta</verify> istunnosta <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus <verify>varmentamattomasta</verify> istunnosta <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmennetusta</verify> istunnosta <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmentamattomasta</verify> istunnosta <device></device>",
+    "This backup is trusted because it has been restored on this session": "Tähän varmuuskopioon luotetaan, koska se on palautettu tässä istunnossa",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Vara-avain on salavarastossa, mutta salavarasto ei ole käytössä tässä istunnossa. Ota ristivarmennus käyttöön Laboratoriosta muokkaaksesi avainten varmuuskopioinnin tilaa.",
+    "Your keys are <b>not being backed up from this session</b>.": "Avaimiasi <b>ei varmuuskopioida tästä istunnosta</b>.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Salasanasi on onnistuneesti vaihdettu. Et saa ilmoituksia muilla laitteillasi ennen kuin kirjaudut niillä takaisin sisään",
+    "Invalid theme schema.": "Epäkelpo teeman skeema.",
+    "Custom theme URL": "Mukautettu teeman osoite",
+    "Keyboard Shortcuts": "Pikanäppäimet",
+    "Session ID:": "Istunnon tunnus:",
+    "Session key:": "Istunnon avain:",
+    "Where you’re logged in": "Missä olet sisäänkirjautuneena",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Muokkaa istuntojesi nimiä ja kirjaudu niistä ulos alapuolella tai <a>varmenna ne käyttäjäprofiilissasi</a>.",
+    "This user has not verified all of their sessions.": "Tämä käyttäjä ei ole varmentanut kaikkia istuntojaan.",
+    "You have not verified this user.": "Et ole varmentanut tätä käyttäjää.",
+    "You have verified this user. This user has verified all of their sessions.": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki istuntonsa.",
+    "This room is end-to-end encrypted": "Tämä huone käyttää osapuolten välistä salausta",
+    "Everyone in this room is verified": "Kaikki tämän huoneen käyttäjät on varmennettu",
+    "Some sessions for this user are not trusted": "Osaan tämän käyttäjän istunnoista ei luoteta",
+    "All sessions for this user are trusted": "Kaikkiin tämän käyttäjän istunnoista luotetaan",
+    "Some sessions in this encrypted room are not trusted": "Osaan tämän salausta käyttävän huoneen istunnoista ei luoteta",
+    "All sessions in this encrypted room are trusted": "Kaikkiin tämän salausta käyttävän huoneen istuntoihin luotetaan",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Avainten jakopyyntösi on lähetetty. Tarkista muut istuntosi avainten jakopyyntöjen varalta.",
+    "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Avainten jakopyynnöt lähetetään muille istunnoillesi automaattisesti. Jos hylkäsit tai jätit huomiotta avainten jakopyynnön toisessa istunnossasi, klikkaa tästä pyytääksesi avaimia uudelleen.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Jos muissa laitteissasi ei ole avainta tämän viestin purkamiseen, niillä istunnoilla ei voi lukea tätä viestiä.",
+    "Encrypted by an unverified session": "Salattu varmentamattoman istunnon toimesta",
+    "Encrypted by a deleted session": "Salattu poistetun istunnon toimesta",
+    "No sessions with registered encryption keys": "Yhdelläkään istunnolla ei ole rekisteröityjä salausavaimia",
+    "Create room": "Luo huone",
+    "Reject & Ignore user": "Hylkää ja jätä käyttäjä huomiotta",
+    "Start Verification": "Aloita varmennus",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Viestisi ovat turvattu, ja vain sinulla ja vastaanottajalla on avaimet viestien lukemiseen.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Salausta käyttävissä huoneissa viestisi on turvattu, ja vain sinulla ja vastaanottajilla on yksityiset avaimet viestien lukemiseen.",
+    "Verify User": "Varmenna käyttäjä",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Lisäturvaksi, varmenna tämä käyttäjä tarkistamalla koodin kummankin laitteella.",
+    "The homeserver the user you’re verifying is connected to": "Käyttäjä, jota varmennat, on kotipalvelimella",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Istunto, jota yrität varmentaa, ei tue QR-koodin skannausta tai emoji-varmennusta, joita Riot tukee. Kokeile eri asiakasohjelmalla.",
+    "Verify by scanning": "Varmenna skannaamalla",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Jos et pysty skannaamaan yläpuolella olevaa koodia, varmenna vertaamalla emojia.",
+    "Verify by comparing unique emoji.": "Varmenna vertaamalla uniikkia emojia.",
+    "Verify by emoji": "Varmenna emojilla",
+    "Verify all users in a room to ensure it's secure.": "Varmenna kaikki huoneen käyttäjät varmistaaksesi, että se on turvallinen.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Varmenna kaikki käyttäjät salausta käyttävissä huoneissa, jotta huone on varmasti turvallinen.",
+    "You've successfully verified your device!": "Olet onnistuneesti varmentanut laitteesi!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Olet onnistuneesti varmentanut laitteen %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Olet varmentanut käyttäjän %(displayName)s!",
+    "Verified": "Varmennettu"
 }

From a462a374cb716c35489db12441279147803cfce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Wed, 20 May 2020 06:30:49 +0000
Subject: [PATCH 3065/3235] Translated using Weblate (French)

Currently translated at 100.0% (2314 of 2314 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c231769f27..7a89f71b73 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2435,5 +2435,8 @@
     "QR Code": "Code QR",
     "Dismiss read marker and jump to bottom": "Ignorer le signet de lecture et aller en bas",
     "Jump to oldest unread message": "Aller au plus vieux message non lu",
-    "Upload a file": "Envoyer un fichier"
+    "Upload a file": "Envoyer un fichier",
+    "Use IRC layout": "Utiliser la mise en page d’IRC",
+    "IRC display name width": "Largeur du nom affiché IRC",
+    "Create room": "Créer un salon"
 }

From 1f75caf6d276c0e6f8c626a14a75c60dfd890389 Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Wed, 20 May 2020 06:19:20 +0000
Subject: [PATCH 3066/3235] Translated using Weblate (Galician)

Currently translated at 41.1% (950 of 2314 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 3328292be0..f3b9e38273 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -545,7 +545,7 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Seguro que desexa saír da sala '%(roomName)s'?",
     "Failed to leave room": "Algo fallou ao saír da sala",
     "Signed Out": "Desconectada",
-    "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctese de novo.",
+    "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctate outra vez.",
     "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
     "Logout": "Desconectar",
     "Your Communities": "As súas Comunidades",
@@ -621,10 +621,10 @@
     "A new password must be entered.": "Debe introducir un novo contrasinal.",
     "New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.",
     "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.": "Detectáronse datos de una versión anterior de Riot. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
-    "I have verified my email address": "Validei o meu enderezo de correo electrónico",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez sigas a ligazón que contén, preme embaixo.",
+    "I have verified my email address": "Validei o meu enderezo de email",
     "Return to login screen": "Volver a pantalla de conexión",
-    "Send Reset Email": "Enviar correo electrónico de restablecemento",
+    "Send Reset Email": "Enviar email de restablecemento",
     "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
     "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
@@ -834,7 +834,7 @@
     "Off": "Off",
     "Riot does not know how to join a room on this network": "Riot non sabe como conectar cunha sala nesta rede",
     "Mentions only": "Só mencións",
-    "You can now return to your account after signing out, and sign in on other devices.": "Pode volver a súa contra tras desconectarse, e conectarse en outros dispositivos.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Podes voltar a túa conta tras desconectarte, e conectarte noutros dispositivos.",
     "Enable email notifications": "Activar notificacións de correo",
     "Event Type": "Tipo de evento",
     "Download this file": "Descargue este ficheiro",
@@ -860,7 +860,7 @@
     "Clear Storage and Sign Out": "Limpar o almacenamento e Desconectar",
     "Refresh": "Actualizar",
     "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarate e non poderás ler o historial cifrado da conversa.",
     "Collapse Reply Thread": "Comprimir o fío de respostas",
     "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s",
     "Send analytics data": "Enviar datos de análises",
@@ -937,5 +937,30 @@
     "Whether you're using Riot as an installed Progressive Web App": "Se estás a usar Riot como unha Progressive Web App instalada",
     "Your user agent": "User Agent do navegador",
     "The information being sent to us to help make Riot better includes:": "Información que nos envías para mellorar Riot inclúe:",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia."
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
+    "Sign In or Create Account": "Conéctate ou Crea unha Conta",
+    "Sign In": "Conectar",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirma o borrado destas sesións ao usar Single Sign On como proba da túa identidade.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirma o borrado desta sesión ao utilizar Single Sign On como proba da túa identidade.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Xestiona os nomes e pecha as sesións embaixo ou <a>verificaas no teu Perfil de Usuaria</a>.",
+    "Sign Up": "Rexistro",
+    "Sign in with single sign-on": "Conectar usando Single Sign On",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "O eliminación das chaves de sinatura cruzada é permanente. Calquera a quen verificases con elas verá alertas de seguridade. Seguramente non queres facer esto, a menos que perdeses todos os dispositivos nos que podías asinar.",
+    "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. ": "Usaches anteriormente unha versión máis recente de Riot en %(host)s. Para usar esta versión de novo con cifrado E2E, tes que desconectar e conectar outra vez. ",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirma a desactivación da túa conta usando Single Sign On para probar a túa identidade.",
+    "To continue, use Single Sign On to prove your identity.": "Para continuar, usa Single Sign On para probar a túa identidade.",
+    "Are you sure you want to sign out?": "Tes a certeza de querer desconectar?",
+    "If you didn’t sign in to this session, your account may be compromised.": "Se ti non iniciaches esta sesión a túa conta podería estar comprometida.",
+    "Sign out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto permitirache voltar a túa conta tras desconectar, e conectarte noutras sesións.",
+    "Sign in to your Matrix account on %(serverName)s": "Conecta a túa conta Matrix en %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Conecta a túa conta Matrix en <underlinedServerName />",
+    "Sign in with SSO": "Conecta utilizando SSO",
+    "Sign in instead": "Conectar",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Ímosche enviar un email para confirmar o teu novo contrasinal.",
+    "Your password has been reset.": "Restableceuse o contrasinal.",
+    "Enter your password to sign in and regain access to your account.": "Escribe o contrasinal para conectarte e retomar o acceso a túa conta.",
+    "Sign in and regain access to your account.": "Conéctate e recupera o acceso a túa conta.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Non podes conectar a conta. Contacta coa administración do teu servidor para máis información.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Aviso: os teus datos personais (incluíndo chaves de cifrado) aínda están gardadas nesta sesión. Pechaa se remataches de usar esta sesión, ou se quere conectar con outra conta."
 }

From 31ac5aaa77600f01492cf499cabce7a66c683bec Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 20 May 2020 09:27:36 +0000
Subject: [PATCH 3067/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2314 of 2314 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 014d6015b3..359938ff3b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2430,5 +2430,8 @@
     "QR Code": "Codice QR",
     "Dismiss read marker and jump to bottom": "Scarta il segno di lettura e salta alla fine",
     "Jump to oldest unread message": "Salta al messaggio non letto più vecchio",
-    "Upload a file": "Invia un file"
+    "Upload a file": "Invia un file",
+    "Use IRC layout": "Usa il layout IRC",
+    "IRC display name width": "Larghezza nome di IRC",
+    "Create room": "Crea stanza"
 }

From a40d795153a73095cc3ed81bd9f891ce28c48d59 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Wed, 20 May 2020 13:52:59 +0000
Subject: [PATCH 3068/3235] Translated using Weblate (Lithuanian)

Currently translated at 45.8% (1059 of 2314 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 | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 2652433075..c893034644 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -13,9 +13,9 @@
     "The information being sent to us to help make Riot.im better includes:": "Informacija, siunčiama mums, kad padėtų tobulinti Riot.im, apima:",
     "Fetching third party location failed": "Nepavyko gauti trečios šalies vietos",
     "A new version of Riot is available.": "Yra prieinama nauja Riot versija.",
-    "I understand the risks and wish to continue": "Aš suprantu riziką ir noriu tęsti",
+    "I understand the risks and wish to continue": "Suprantu šią riziką ir noriu tęsti",
     "Send Account Data": "Siųsti paskyros duomenis",
-    "Advanced notification settings": "Sudėtingesni pranešimų nustatymai",
+    "Advanced notification settings": "Išplėstiniai pranešimų nustatymai",
     "Uploading report": "Išsiunčiama ataskaita",
     "Sunday": "Sekmadienis",
     "Guests can join": "Svečiai gali prisijungti",
@@ -324,7 +324,7 @@
     "Anyone who knows the room's link, including guests": "Bet kas, žinantis kambario nuorodą, įskaitant svečius",
     "Anyone": "Bet kas",
     "Permissions": "Leidimai",
-    "Advanced": "Sudėtingesni nustatymai",
+    "Advanced": "Išplėstiniai",
     "Add a topic": "Pridėti temą",
     "Local addresses for this room:": "Vietiniai šio kambario adresai:",
     "This room has no local addresses": "Šis kambarys neturi jokių vietinių adresų",
@@ -1058,7 +1058,7 @@
     "You'll lose access to your encrypted messages": "Jūs prarasite prieigą prie savo užšifruotų žinučių",
     "New session": "Naujas seansas",
     "Enter secret storage passphrase": "Įveskite slaptos saugyklos slaptafrazę",
-    "Enter recovery passphrase": "Įveskite atstatymo slaptafrazę",
+    "Enter recovery passphrase": "Įveskite atgavimo slaptafrazę",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: Atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
     "Server Name": "Serverio Pavadinimas",
@@ -1073,5 +1073,25 @@
     "For maximum security, this should be different from your account password.": "Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio.",
     "Enter a passphrase...": "Įveskite slaptafrazę...",
     "Please enter your passphrase a second time to confirm.": "Įveskite slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "Secure your backup with a passphrase": "Apsaugokite savo atsarginę kopiją slaptafraze"
+    "Secure your backup with a passphrase": "Apsaugokite savo atsarginę kopiją slaptafraze",
+    "Set up encryption": "Nustatyti šifravimą",
+    "COPY": "Kopijuoti",
+    "Enter recovery key": "Įveskite atgavimo raktą",
+    "Keep going...": "Tęskite...",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Riot geriausiai veikia su <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink> naršyklėmis.",
+    "Syncing...": "Sinchronizuojama...",
+    "Signing In...": "Prijungiama...",
+    "If you've joined lots of rooms, this might take a while": "Jei esate prisijungę prie daug kambarių, tai gali užtrukti",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Neužbaigus saugumo šioje sesijoje, ji neturės priėjimo prie šifruotų žinučių.",
+    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Nustatykite atgavimo slaptafrazę, kad apsaugotumėte šifruotą informaciją ir atgautumėte ją jei atsijungsite. Ji turi skirtis nuo jūsų paskyros slaptažodžio:",
+    "Enter a recovery passphrase": "Įveskite atgavimo slaptafrazę",
+    "Back up encrypted message keys": "Padaryti atsargines šifruotų žinučių raktų kopijas",
+    "Set up with a recovery key": "Nustatyti su atgavimo raktu",
+    "Enter your recovery passphrase a second time to confirm it.": "Įveskite atgavimo slaptafrazę antrą kartą, kad ją patvirtintumėte.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti priėjimo prie jūsų šifruotų žinučių atgavimui, jei pamiršite savo atgavimo slaptafrazę.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
+    "Your recovery key": "Jūsų atgavimo raktas",
+    "Copy": "Kopijuoti",
+    "Make a copy of your recovery key": "Padaryti jūsų atgavimo rakto kopiją",
+    "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte."
 }

From 5618c382bd4b974ee68e8010c71af1a4733c0600 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 20 May 2020 16:01:34 +0100
Subject: [PATCH 3069/3235] Update code style to mention switch statements

---
 code_style.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code_style.md b/code_style.md
index 3ad0d38873..01c1f37146 100644
--- a/code_style.md
+++ b/code_style.md
@@ -151,6 +151,7 @@ General Style
   Don't set things to undefined. Reserve that value to mean "not yet set to anything."
   Boolean objects are verboten.
 - Use JSDoc
+- Use switch-case statements where there are 5 or more branches running against the same variable.
 
 ECMAScript
 ----------

From 2828cc1d258a70f48908969e044e735a9655645f Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 20 May 2020 15:13:31 +0000
Subject: [PATCH 3070/3235] Translated using Weblate (Albanian)

Currently translated at 99.9% (2318 of 2321 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 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7058ad67b0..6519c54065 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2424,5 +2424,15 @@
     "Click the button below to confirm setting up encryption.": "Klikoni mbi butonin më poshtë që të ripohoni ujdisjen e fshehtëzimit.",
     "Dismiss read marker and jump to bottom": "Mos merr parasysh piketë leximi dhe hidhu te fundi",
     "Jump to oldest unread message": "Hidhu te mesazhi më i vjetër i palexuar",
-    "Upload a file": "Ngarkoni një kartelë"
+    "Upload a file": "Ngarkoni një kartelë",
+    "Font scaling": "Përshkallëzim shkronjash",
+    "Use IRC layout": "Përdor skemë IRC-je",
+    "Font size": "Madhësi shkronjash",
+    "Custom font size": "Madhësi vetjake shkronjash",
+    "IRC display name width": "Gjerësi shfaqjeje emrash IRC",
+    "Size must be a number": "Madhësia duhet të jetë një numër",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Madhësia vetjake për shkronjat mund të jetë vetëm mes vlerave %(min)s pt dhe %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Përdor me %(min)s pt dhe %(max)s pt",
+    "Appearance": "Dukje",
+    "Create room": "Krijo dhomë"
 }

From b1c80df0b4b7cf9d2fd4332435f5b3809cc81b48 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 21 May 2020 05:05:17 +0000
Subject: [PATCH 3071/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2321 of 2321 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 f222d7d09f..7c55826005 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2437,5 +2437,12 @@
     "Upload a file": "上傳檔案",
     "Use IRC layout": "使用 IRC 佈局",
     "IRC display name width": "IRC 顯示名稱寬度",
-    "Create room": "建立聊天室"
+    "Create room": "建立聊天室",
+    "Font scaling": "字型縮放",
+    "Font size": "字型大小",
+    "Custom font size": "自訂字型大小",
+    "Size must be a number": "大小必須為數字",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "自訂字型大小僅能為 %(min)s 點至 %(max)s 點間",
+    "Use between %(min)s pt and %(max)s pt": "使用 %(min)s 點至 %(max)s 點間",
+    "Appearance": "外觀"
 }

From 19b9776e897d5de817aea1bb9d9374f846890af0 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 20 May 2020 15:09:40 +0000
Subject: [PATCH 3072/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2321 of 2321 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 56b5d53008..89c75532df 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2412,5 +2412,12 @@
     "Upload a file": "Alŝuti dosieron",
     "Create room": "Krei ĉambron",
     "Use IRC layout": "Uzi aranĝon de IRC",
-    "IRC display name width": "Larĝo de vidiga nomo de IRC"
+    "IRC display name width": "Larĝo de vidiga nomo de IRC",
+    "Font scaling": "Skalado de tiparoj",
+    "Font size": "Grando de tiparo",
+    "Custom font size": "Propra grando de tiparo",
+    "Size must be a number": "Grando devas esti nombro",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Propra grando de tiparo povas interi nur %(min)s punktojn kaj %(max)s punktojn",
+    "Use between %(min)s pt and %(max)s pt": "Uzi inter %(min)s punktoj kaj %(max)s punktoj",
+    "Appearance": "Aspekto"
 }

From 4c39b6a9889f0a88ba0de44ee0065ec22da6d464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Thu, 21 May 2020 06:23:40 +0000
Subject: [PATCH 3073/3235] Translated using Weblate (French)

Currently translated at 100.0% (2321 of 2321 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 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7a89f71b73..ee3c398e86 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2438,5 +2438,12 @@
     "Upload a file": "Envoyer un fichier",
     "Use IRC layout": "Utiliser la mise en page d’IRC",
     "IRC display name width": "Largeur du nom affiché IRC",
-    "Create room": "Créer un salon"
+    "Create room": "Créer un salon",
+    "Font scaling": "Mise à l’échelle de la police",
+    "Font size": "Taille de la police",
+    "Custom font size": "Taille personnalisée de la police",
+    "Size must be a number": "La taille doit être un nombre",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "La taille de police personnalisée doit être comprise entre %(min)s pt et %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Utiliser entre %(min)s pt et %(max)s pt",
+    "Appearance": "Apparence"
 }

From 23bfa6f11ea192b8253d7f45bc00ae82a7124926 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 21 May 2020 08:05:57 +0000
Subject: [PATCH 3074/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2321 of 2321 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 359938ff3b..1fd6d7dc0c 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2433,5 +2433,12 @@
     "Upload a file": "Invia un file",
     "Use IRC layout": "Usa il layout IRC",
     "IRC display name width": "Larghezza nome di IRC",
-    "Create room": "Crea stanza"
+    "Create room": "Crea stanza",
+    "Font scaling": "Ridimensionamento carattere",
+    "Font size": "Dimensione carattere",
+    "Custom font size": "Dimensione carattere personalizzata",
+    "Size must be a number": "La dimensione deve essere un numero",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "La dimensione del carattere personalizzata può solo essere tra %(min)s pt e %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Usa tra %(min)s pt e %(max)s pt",
+    "Appearance": "Aspetto"
 }

From 0409932b4dee8293761f8aabb2d7d80d5e028e59 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Wed, 20 May 2020 14:30:14 +0000
Subject: [PATCH 3075/3235] Translated using Weblate (Lithuanian)

Currently translated at 46.4% (1076 of 2321 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 | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index c893034644..fbdd41c16f 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -72,7 +72,7 @@
     "Keywords": "Raktažodžiai",
     "Unpin Message": "Atsegti žinutę",
     "Enable notifications for this account": "Įjungti pranešimus šiai paskyrai",
-    "Remove": "Šalinti",
+    "Remove": "Pašalinti",
     "Invite to this community": "Pakviesti į šią bendruomenę",
     "Messages containing <span>keywords</span>": "Žinutės, kuriose yra <span>raktažodžiai</span>",
     "When I'm invited to a room": "Kai aš esu pakviestas į pokalbių kambarį",
@@ -86,7 +86,7 @@
     "Unnamed room": "Kambarys be pavadinimo",
     "Dismiss": "Atmesti",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
-    "Remove from Directory": "Šalinti iš katalogo",
+    "Remove from Directory": "Pašalinti iš katalogo",
     "Download this file": "Atsisiųsti šį failą",
     "Saturday": "Šeštadienis",
     "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad jei persigalvosite, tai bet kada galite nustatyti el. pašto adresą vartotojo nustatymuose.",
@@ -146,7 +146,7 @@
     "Off": "Išjungta",
     "Edit": "Koreguoti",
     "Mentions only": "Tik paminėjimai",
-    "remove %(name)s from the directory.": "šalinti %(name)s iš katalogo.",
+    "remove %(name)s from the directory.": "pašalinti %(name)s iš katalogo.",
     "You can now return to your account after signing out, and sign in on other devices.": "Po atsijungimo galite grįžti prie savo paskyros ir prisijungti kituose įrenginiuose.",
     "Continue": "Tęsti",
     "Enable email notifications": "Įjungti pranešimus el. paštu",
@@ -353,8 +353,8 @@
     "The phone number field must not be blank.": "Telefono numerio laukas negali būti tuščias.",
     "The password field must not be blank.": "Slaptažodžio laukas negali būti tuščias.",
     "Email address": "El. pašto adresas",
-    "Remove from community": "Šalinti iš bendruomenės",
-    "Remove this user from community?": "Šalinti šį naudotoją iš bendruomenės?",
+    "Remove from community": "Pašalinti iš bendruomenės",
+    "Remove this user from community?": "Pašalinti šį vartotoją iš bendruomenės?",
     "Failed to remove user from community": "Nepavyko pašalinti naudotoją iš bendruomenės",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ar tikrai norite pašalinti \"%(roomName)s\" iš %(groupId)s?",
     "Failed to remove room from community": "Nepavyko pašalinti kambarį iš bendruomenės",
@@ -1018,8 +1018,8 @@
     "Order rooms by name": "Rūšiuoti kambarius pagal pavadinimą",
     "The other party cancelled the verification.": "Kita šalis atšaukė patvirtinimą.",
     "Public Name": "Viešas Vardas",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Užšifruotos žinutės yra apsaugotos su \"end-to-end\" šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
-    "Back up your keys before signing out to avoid losing them.": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad jų neprarastumėte.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Užšifruotos žinutės yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
+    "Back up your keys before signing out to avoid losing them.": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad išvengtumėte jų praradimo.",
     "Start using Key Backup": "Pradėti naudoti Atsarginę Raktų Kopiją",
     "Display Name": "Rodomas Vardas",
     "Please verify the room ID or alias and try again.": "Prašome patikrinti kambario ID arba slapyvardį ir bandyti dar kartą.",
@@ -1093,5 +1093,24 @@
     "Your recovery key": "Jūsų atgavimo raktas",
     "Copy": "Kopijuoti",
     "Make a copy of your recovery key": "Padaryti jūsų atgavimo rakto kopiją",
-    "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte."
+    "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte.",
+    "Later": "Vėliau",
+    "Verify yourself & others to keep your chats safe": "Patvirtinkite save ir kitus, kad jūsų pokalbiai būtų saugūs",
+    "Go back": "",
+    "This room is end-to-end encrypted": "Šis kambarys užšifruotas visapusiu šifravimu",
+    "Send a message…": "Siųsti žinutę…",
+    "Never lose encrypted messages": "Niekada nepraraskite šifruotų žinučių",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Žinutės šiame kambaryje yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turite raktus šioms žinutėms perskaityti.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Saugiai sukurkite jūsų raktų atsargines kopijas, kad išvengtumėte jų praradimo. <a>Sužinoti daugiau.</a>",
+    "Not now": "Ne dabar",
+    "Don't ask me again": "Daugiau neklausti",
+    "Send as message": "Siųsti kaip žinutę",
+    "Messages in this room are end-to-end encrypted.": "Žinutės šiame kambaryje yra užšifruotos visapusiu šifravimu.",
+    "Messages in this room are not end-to-end encrypted.": "Žinutės šiame kambaryje nėra užšifruotos visapusiu šifravimu.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra užšifruotos visapusiu šifravimu. Sužinokite daugiau ir patvirtinkite šį vartotoją jų profilyje.",
+    "Confirm Removal": "Patvirtinkite pašalinimą",
+    "Manually export keys": "Eksportuoti raktus rankiniu būdu",
+    "Send a Direct Message": "Siųsti tiesioginę žinutę",
+    "Go Back": "",
+    "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo."
 }

From 3b353f1e7ab3cd7467e34cb55c1abf7c9a0d0721 Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Thu, 21 May 2020 09:21:10 +0000
Subject: [PATCH 3076/3235] Translated using Weblate (Slovak)

Currently translated at 65.3% (1515 of 2321 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index d117843ccf..4cd954c891 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -627,7 +627,7 @@
     "Passphrase must not be empty": "Heslo nesmie byť prázdne",
     "Export room keys": "Exportovať kľúče miestností",
     "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.": "Tento proces vás prevedie exportom kľúčov určených na dešifrovanie správ, ktoré ste dostali v šifrovaných miestnostiach do lokálneho súboru. Tieto kľúče zo súboru môžete  neskôr importovať do iného Matrix klienta, aby ste v ňom mohli dešifrovať vaše šifrované správy.",
-    "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.": "Tento súbor umožní komukoľvek, k to má ku nemu prístup dešifrovať všetky vami viditeľné šifrované správy, mali by ste teda byť opatrní a tento súbor si bezpečne uchovať. Aby bolo toto pre vás jednoduchšie, nižšie zadajte heslo, ktorým budú údaje v súbore zašifrované. Importovať údaje zo súboru bude možné len po zadaní tohoto istého hesla.",
+    "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.": "Tento súbor umožní komukoľvek, kto má ku nemu prístup, dešifrovať všetky vami viditeľné šifrované správy, mali by ste teda byť opatrní a tento súbor si bezpečne uchovať. Aby bolo toto pre vás jednoduchšie, nižšie zadajte heslo, ktorým budú údaje v súbore zašifrované. Importovať údaje zo súboru bude možné len po zadaní tohoto istého hesla.",
     "Enter passphrase": "Zadajte (dlhé) heslo",
     "Confirm passphrase": "Potvrďte heslo",
     "Export": "Exportovať",
@@ -1336,7 +1336,7 @@
     "Create account": "Vytvoriť účet",
     "Registration has been disabled on this homeserver.": "Na tomto domovskom servery nie je povolená registrácia.",
     "Unable to query for supported registration methods.": "Nie je možné požiadať o podporované metódy registrácie.",
-    "Create your account": "Vytvoriť váš účet",
+    "Create your account": "Vytvorte si váš účet",
     "Keep going...": "Pokračujte…",
     "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Zašifrovanú kópiu vašich šifrovacích kľúčov uchováme na domovskom servery. Zabezpečte si zálohovanie zadaním hesla obnovenia, čo posilní ochranu vašich údajov.",
     "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, (dlhé) heslo by malo byť odlišné od hesla, ktorým sa prihlasujete do vášho účtu.",
@@ -1408,7 +1408,7 @@
     "Add Email Address": "Pridať emailovú adresu",
     "Add Phone Number": "Pridať telefónne číslo",
     "Send cross-signing keys to homeserver": "Poslať kľúče pre podpisovanie naprieč zariadeniami na domovský server",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Táto akcia si vyžaduje mať overenú emailovú adresu alebo telefónne číslo cez predvolený server totožností <server />, ale server nezverejnil podmienky používania.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Táto akcia vyžaduje prístup k predvolenému serveru totožností <server /> na overenie emailovej adresy alebo telefónneho čísla, ale server nemá žiadne podmienky používania.",
     "Trust": "Dôverovať",
     "Custom (%(level)s)": "Vlastný (%(level)s)",
     "Sends a message as plain text, without interpreting it as markdown": "Odošle správu vo formáte obyčajný text, bez prekladu markdown",
@@ -1538,7 +1538,7 @@
     "New login. Was this you?": "Nové pihlásenie. Ste to vy?",
     "%(name)s is requesting verification": "%(name) žiada o overenie",
     "Sign In or Create Account": "Prihlásiť sa alebo vytvoriť nový účet",
-    "Use your account or create a new one to continue.": "Použite váš existujúci účet alebo vytvorte si nový, aby ste mohli pokračovať.",
+    "Use your account or create a new one to continue.": "Použite váš existujúci účet alebo si vytvorte nový, aby ste mohli pokračovať.",
     "Create Account": "Vytvoriť účet",
     "Sign In": "Prihlásiť sa",
     "Sends a message as html, without interpreting it as markdown": "Pošlite správu ako HTML, bez interpretácie v Markdowne",
@@ -1592,10 +1592,26 @@
     "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Zálohovací kľúč je uložený v bezpečnom úložisku, ale jeho načítanie nie je povolené v tejto relácií. Prosím, zapnite krížové podpisovanie v Experimentoch, aby ste mohli modifikovať stav zálohy.",
     "Cross-signing": "Krížové podpisovanie",
     "Destroy cross-signing keys?": "Zmazať kľúče pre krížové podpisovanie?",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Zmazanie kľúčov pre krížové podpisovanie je nenávratné. Každý, s kým ste sa overili, bude vidieť bezpečnostné upozornenia. Toto určite nechcete robiť dokiaľ ste nestratili všetky zariadenia, s ktorými by ste mohli krížovo podpisovať.",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Zmazanie kľúčov pre krížové podpisovanie je nenávratné. Každý, s kým ste sa overili, bude vidieť bezpečnostné upozornenia. Toto určite nechcete robiť, dokiaľ ste nestratili všetky zariadenia, s ktorými by ste mohli krížovo podpisovať.",
     "Clear cross-signing keys": "Zmazať kľúče pre krížové podpisovanie",
     "a new cross-signing key signature": "nový podpis kľúča pre krížové podpisovanie",
     "a device cross-signing signature": "podpis krížovo podpísaného zariadenia",
     "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Získajte prístup k vašej šifrovanej histórií správ a vašej krížom podpísanej identite pre overenie iných relácií zadaním vášho kľúču obnovy.",
-    "or another cross-signing capable Matrix client": "alebo iný Matrixový klient podporujúci krížové podpisovanie"
+    "or another cross-signing capable Matrix client": "alebo iný Matrixový klient podporujúci krížové podpisovanie",
+    "Removing…": "Odstraňovanie…",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Váš nový účet (%(newAccountId)s) je registrovaný, ale už ste prihlásený pod iným účtom (%(loggedInUserId)s).",
+    "Continue with previous account": "Pokračovať s predošlým účtom",
+    "<a>Log in</a> to your new account.": "<a>Prihláste sa</a> do vášho nového účtu.",
+    "You can now close this window or <a>log in</a> to your new account.": "Teraz môžete toto okno zavrieť alebo sa <a>prihlásiť</a> do vášho nového účtu.",
+    "Registration Successful": "Úspešná registrácia",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svoju identitu overením tohto účtu z jednej z vašich iných relácií, čím mu povolíte prístup k šifrovaným správam.",
+    "This requires the latest Riot on your other devices:": "Toto vyžaduje najnovší Riot na vašich ostatných zariadeniach:",
+    "Use Recovery Passphrase or Key": "Použite (dlhé) heslo pre obnovu zálohy alebo kľúč",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaša nová relácia je teraz overená. Má prístup k vašim šifrovaným správam a ostatný používatelia ju uvidia ako dôveryhodnú.",
+    "Your new session is now verified. Other users will see it as trusted.": "Vaša nová relácia je teraz overená. Ostatný používatelia ju uvidia ako dôveryhodnú.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončenia overenia nebude mať táto relácia prístup k šifrovaným správam.",
+    "Go Back": "Späť",
+    "Failed to re-authenticate due to a homeserver problem": "Opätovná autentifikácia zlyhala kvôli problému domovského servera",
+    "Failed to re-authenticate": "Opätovná autentifikácia zlyhala",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Znovuzískajte prístup k vášmu účtu a obnovte šifrovacie kľúče uložené v tejto relácií. Bez nich nebudete môcť čítať všetky vaše šifrované správy vo všetkých reláciach."
 }

From 5d1c01fd6fd006443bbf4d6f1e0e731a99ad042e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 May 2020 12:26:27 +0100
Subject: [PATCH 3077/3235] Fix key backup restore with SSSS

The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
---
 .../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 7e51e76f6c..a16202ed93 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -201,7 +201,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             // `accessSecretStorage` may prompt for storage access as needed.
             const recoverInfo = await accessSecretStorage(async () => {
                 return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
-                    this.state.backupInfo,
+                    this.state.backupInfo, undefined, undefined,
                     { progressCallback: this._progressCallback },
                 );
             });

From 53d90234c35cf232cd527011abeee5f1ff8a9cd8 Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Thu, 21 May 2020 10:53:55 +0000
Subject: [PATCH 3078/3235] Translated using Weblate (Czech)

Currently translated at 94.7% (2198 of 2321 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index ddd5e5521b..e5568d7bfb 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2150,7 +2150,7 @@
     "Sign In or Create Account": "Přihlásit nebo vytvořit nový účet",
     "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.",
     "Create Account": "Vytvořit účet",
-    "Order rooms by name": "Seřadit místnosti podle názvz",
+    "Order rooms by name": "Seřadit místnosti podle názvu",
     "Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu",
     "Show shortcuts to recently viewed rooms above the room list": "Zobrazovat zkratky do nedávno zobrazených místností navrchu",
     "Cancelling…": "Rušení…",

From a3e790d72ca58f4220715821c73be35cf1b20bb5 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 21 May 2020 11:19:30 +0000
Subject: [PATCH 3079/3235] Translated using Weblate (Lithuanian)

Currently translated at 47.0% (1090 of 2321 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 | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index fbdd41c16f..54ebd93051 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -65,7 +65,7 @@
     "Cancel": "Atšaukti",
     "Filter results": "Išfiltruoti rezultatus",
     "Members": "Nariai",
-    "No update available.": "Nėra prieinamų atnaujinimų.",
+    "No update available.": "Nėra galimų atnaujinimų.",
     "Noisy": "Triukšmingas",
     "Collecting app version information": "Renkama programėlės versijos informacija",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ar ištrinti kambarį %(alias)s ir %(name)s kambario pavadinimą iš katalogo?",
@@ -705,7 +705,7 @@
     "That doesn't look like a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Preparing to send logs": "Ruošiamasi išsiųsti žurnalus",
     "Incompatible Database": "Nesuderinama duomenų bazė",
-    "Deactivate Account": "Pasyvinti paskyrą",
+    "Deactivate Account": "Deaktyvuoti paskyrą",
     "I verify that the keys match": "Aš patvirtinu, kad raktai sutampa",
     "Incompatible local cache": "Nesuderinamas vietinis podėlis",
     "Updating Riot": "Atnaujinama Riot",
@@ -1112,5 +1112,19 @@
     "Manually export keys": "Eksportuoti raktus rankiniu būdu",
     "Send a Direct Message": "Siųsti tiesioginę žinutę",
     "Go Back": "",
-    "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo."
+    "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo.",
+    "Click the button below to confirm adding this email address.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šio el. pašto pridėjimą.",
+    "Add an email address to configure email notifications": "Pridėkite el. pašto adresą, kad nustatytumėte el. pašto pranešimus",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Prieš atsijungiant rekomenduojame iš identiteto serverio pašalinti savo el. pašto adresus ir telefono numerius.",
+    "Email addresses": "El. pašto adresai",
+    "Account management": "Paskyros valdymas",
+    "Deactivating your account is a permanent action - be careful!": "Paskyros deaktyvavimas yra neatšaukiamas veiksmas - būkite atsargūs!",
+    "Your email address hasn't been verified yet": "Jūsų el. pašto adresas dar nebuvo patvirtintas",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Išsiuntėme jums el. laišką, kad patvirtintumėme jūsų adresą. Sekite ten esančiais nurodymais ir tada paspauskite žemiau esantį mygtuką.",
+    "Email Address": "El. pašto adresas",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Jūs galite naudoti pasirinktinius serverio nustatymus, kad prisijungtumėte prie kitų Matrix serverių, nurodydami kito serverio URL. Tai leidžia jums naudotis šia programa su kitame serveryje esančia Matrix paskyra.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Įveskite pasirinktinio serverio URL <a>Ką tai reiškia?</a>",
+    "Homeserver URL": "Serverio URL",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Serverio adresas neatrodo esantis tinkamas Matrix serveris",
+    "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą."
 }

From 6d92f54934e8b7a4947bf71a3e14a754bac91bf6 Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Thu, 21 May 2020 10:07:36 +0000
Subject: [PATCH 3080/3235] Translated using Weblate (Slovak)

Currently translated at 66.7% (1547 of 2321 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 4cd954c891..a9111a91a6 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -540,7 +540,7 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
     "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
-    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
+    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové emotikony modernými emoji",
     "Mirror local video feed": "Zrkadliť lokálne video",
     "Light theme": "Svetlý vzhľad",
     "Dark theme": "Tmavý vzhľad",
@@ -604,7 +604,7 @@
     "Stops ignoring a user, showing their messages going forward": "Prestane ignorovať používateľa a začne zobrazovať jeho správy",
     "Commands": "Príkazy",
     "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
-    "Emoji": "Emoji",
+    "Emoji": "Emotikon",
     "Notify the whole room": "Oznamovať celú miestnosť",
     "Room Notification": "Oznámenie miestnosti",
     "Users": "Používatelia",
@@ -1089,14 +1089,14 @@
     "The user must be unbanned before they can be invited.": "Tomuto používateľovi musíte pred odoslaním pozvania povoliť vstup.",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Zoskupiť a filtrovať miestnosti podľa vlastných značiek (zmeny sa prejavia po obnovení stránky)",
     "Render simple counters in room header": "Zobraziť jednoduchú štatistiku v záhlaví miestnosti",
-    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy Emoji počas písania",
+    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy emoji počas písania",
     "Show a placeholder for removed messages": "Zobrazovať náhrady za odstránené správy",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovať správy o vstupe a opustení miestnosti (Nemá vplyv na pozvania/vykázania/zákazy vstupu)",
     "Show avatar changes": "Zobrazovať zmeny obrázka v profile",
     "Show display name changes": "Zobrazovať zmeny zobrazovaného mena",
     "Show read receipts sent by other users": "Zobrazovať potvrdenia o prečítaní od ostatných používateľov",
     "Show avatars in user and room mentions": "Pri zmienkach používateľov a miestností zobrazovať aj obrázok",
-    "Enable big emoji in chat": "Povoliť veľké Emoji v konverzáciách",
+    "Enable big emoji in chat": "Povoliť veľké emoji v konverzáciách",
     "Send typing notifications": "Posielať oznámenia, keď píšete",
     "Enable Community Filter Panel": "Povoliť panel filter komunít",
     "Allow Peer-to-Peer for 1:1 calls": "Povoliť P2P počas priamych audio/video hovorov",
@@ -1107,7 +1107,7 @@
     "You've successfully verified this user.": "Úspešne ste overili tohoto používateľa.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Zabezpečené správi s týmto používateľom sú E2E šifrované, čo znamená, že čítanie tretími stranami nie je možné.",
     "Got It": "Rozumiem",
-    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúci emoji.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohto používateľa tak, že zistíte, či sa na jeho obrazovke objaví nasledujúci emoji.",
     "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
     "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.",
     "Dog": "Hlava psa",
@@ -1573,7 +1573,7 @@
     "Ask this user to verify their session, or manually verify it below.": "Poproste tohto používateľa, aby si overil svoju reláciu alebo ju nižšie manuálne overte.",
     "Not Trusted": "Nedôveryhodné",
     "Manually Verify by Text": "Manuálne overte pomocou textu",
-    "Interactively verify by Emoji": "Interaktívne overte pomocou emotikonov",
+    "Interactively verify by Emoji": "Interaktívne overte pomocou emoji",
     "Done": "Hotovo",
     "a few seconds ago": "pred pár sekundami",
     "about a minute ago": "približne pred minutou",
@@ -1613,5 +1613,42 @@
     "Go Back": "Späť",
     "Failed to re-authenticate due to a homeserver problem": "Opätovná autentifikácia zlyhala kvôli problému domovského servera",
     "Failed to re-authenticate": "Opätovná autentifikácia zlyhala",
-    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Znovuzískajte prístup k vášmu účtu a obnovte šifrovacie kľúče uložené v tejto relácií. Bez nich nebudete môcť čítať všetky vaše šifrované správy vo všetkých reláciach."
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Znovuzískajte prístup k vášmu účtu a obnovte šifrovacie kľúče uložené v tejto relácií. Bez nich nebudete môcť čítať všetky vaše šifrované správy vo všetkých reláciach.",
+    "Font scaling": "Škálovanie písma",
+    "Use IRC layout": "Použiť IRC rozloženie",
+    "Show info about bridges in room settings": "Zobraziť informácie o mostoch v Nastaveniach miestnosti",
+    "Font size": "Veľkosť písma",
+    "Custom font size": "Vlastná veľkosť písma",
+    "Show typing notifications": "Posielať oznámenia, keď píšete",
+    "Never send encrypted messages to unverified sessions from this session": "Nikdy neposielať šifrované správy neovereným reláciam z tejto relácie",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nikdy neposielať šifrované správy neovereným reláciam v tejto miestnosti z tejto relácie",
+    "Order rooms by name": "Zoradiť miestnosti podľa názvu",
+    "Show rooms with unread notifications first": "Zobraziť miestnosti s neprečítanými oznámeniami navrchu",
+    "Show shortcuts to recently viewed rooms above the room list": "Zobraziť skratky nedávno zobrazených miestnosti nad zoznamom miestností",
+    "Enable message search in encrypted rooms": "Povoliť vyhľadávanie správ v šifrovaných miestnostiach",
+    "How fast should messages be downloaded.": "Ako rýchlo sa majú správy sťahovať.",
+    "Manually verify all remote sessions": "Manuálne overiť všetky relácie",
+    "IRC display name width": "Šírka zobrazovaného mena IRC",
+    "Verify this session by completing one of the following:": "Overte túto reláciu dokončením jedného z nasledujúcich:",
+    "Scan this unique code": "Naskenujte tento jedinečný kód",
+    "or": "alebo",
+    "Compare unique emoji": "Porovnajte jedinečnú kombináciu emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Pokiaľ nemáte na svojich zariadeniach kameru, porovnajte jedinečnú kombináciu emoji",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Potvrďte, že nasledujúce emoji sú zobrazené na oboch reláciach v rovnakom poradí:",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Relácia, ktorú sa snažíte overiť, nepodporuje overovanie QR kódom a ani pomocou emoji, čo sú funkcie, ktoré Riot podporuje. Skúste použiť iného klienta.",
+    "QR Code": "QR kód",
+    "Enter your password to sign in and regain access to your account.": "Prihláste sa zadaním hesla a znovuzískajte prístup k vášmu účtu.",
+    "Forgotten your password?": "Zabudli ste heslo?",
+    "Sign in and regain access to your account.": "Prihláste sa a znovuzískajte prístup k vášmu účtu.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Nemôžete sa prihlásiť do vášho účtu. Kontaktujte prosím vášho správcu domovského servera pre viac informácií.",
+    "You're signed out": "Ste odhlásený",
+    "Clear personal data": "Zmazať osobné dáta",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Varovanie: Vaše osobné údaje (vrátane šifrovacích kľúčov) sú stále uložené v tejto relácií. Zmažte ich, ak chcete túto reláciu zahodiť alebo sa chcete prihlásiť cez iný účet.",
+    "Command Autocomplete": "Automatické dopĺňanie príkazov",
+    "Community Autocomplete": "Automatické dopĺňanie skupín",
+    "DuckDuckGo Results": "Výsledky hľadania DuckDuckGo",
+    "Emoji Autocomplete": "Automatické dopĺňanie emotikonov",
+    "Notification Autocomplete": "Automatické dopĺňanie oznámení",
+    "Room Autocomplete": "Automatické dopĺňanie miestností",
+    "User Autocomplete": "Automatické dopĺňanie používateľov"
 }

From 7e7c48e0460ae163b2d3a66a1b54f767f8777e71 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 16:32:19 +0100
Subject: [PATCH 3081/3235] Improve style of toasts to match Figma

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_ToastContainer.scss     | 46 ++++++++++++++++-----
 src/components/structures/ToastContainer.js |  5 ++-
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 6ec4a0d152..d39d6cdfe8 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -28,8 +28,8 @@ limitations under the License.
         margin: 0 4px;
         grid-row: 2 / 4;
         grid-column: 1;
-        background-color: white;
-        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        background-color: $dark-panel-bg-color;
+        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
     }
 
@@ -37,8 +37,8 @@ limitations under the License.
         grid-row: 1 / 3;
         grid-column: 1;
         color: $primary-fg-color;
-        background-color: $primary-bg-color;
-        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        background-color: $dark-panel-bg-color;
+        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
         overflow: hidden;
         display: grid;
@@ -73,12 +73,23 @@ limitations under the License.
             }
         }
 
-        h2 {
-            grid-column: 1 / 3;
-            grid-row: 1;
-            margin: 0;
-            font-size: $font-15px;
-            font-weight: 600;
+        .mx_Toast_title {
+            h2 {
+                grid-column: 1 / 3;
+                grid-row: 1;
+                margin: 0;
+                font-size: $font-15px;
+                font-weight: 600;
+                display: inline;
+                width: auto;
+            }
+
+            span {
+                float: right;
+                font-size: $font-12px;
+                line-height: $font-21px;
+                color: $muted-fg-color;
+            }
         }
 
         .mx_Toast_body {
@@ -87,7 +98,13 @@ limitations under the License.
         }
 
         .mx_Toast_buttons {
+            float: right;
             display: flex;
+
+            .mx_FormButton {
+                min-width: 96px;
+                box-sizing: border-box;
+            }
         }
 
         .mx_Toast_description {
@@ -96,6 +113,15 @@ limitations under the License.
             text-overflow: ellipsis;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
+
+            .mx_AccessibleButton_kind_link {
+                font-size: inherit;
+                padding: 0;
+            }
+
+            a {
+                text-decoration: none;
+            }
         }
 
         .mx_Toast_deviceID {
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 283fbdd96a..ddbef42421 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -57,7 +57,10 @@ export default class ToastContainer extends React.Component {
                 toastKey: key,
             });
             toast = (<div className={toastClasses}>
-                <h2>{title}{countIndicator}</h2>
+                <div className="mx_Toast_title">
+                    <h2>{title}</h2>
+                    <span>{countIndicator}</span>
+                </div>
                 <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
             </div>);
         }

From 5995a27ced87200c60b208a5549e6b4a6c608831 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 16:52:36 +0100
Subject: [PATCH 3082/3235] Iterate paddings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_ToastContainer.scss | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index d39d6cdfe8..464eaf488d 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -46,7 +46,6 @@ limitations under the License.
         column-gap: 10px;
         row-gap: 4px;
         padding: 8px;
-        padding-right: 16px;
 
         &.mx_Toast_hasIcon {
             &::after {
@@ -68,12 +67,27 @@ limitations under the License.
                 background-image: url("$(res)/img/e2e/warning.svg");
             }
 
-            h2, .mx_Toast_body {
+            .mx_Toast_title, .mx_Toast_body {
                 grid-column: 2;
             }
         }
+        &:not(.mx_Toast_hasIcon) {
+            padding-left: 12px;
+
+            .mx_Toast_title {
+                grid-column: 1 / -1;
+            }
+        }
+
+        .mx_Toast_title,
+        .mx_Toast_description {
+            padding-right: 8px;
+        }
 
         .mx_Toast_title {
+            width: 100%;
+            box-sizing: border-box;
+
             h2 {
                 grid-column: 1 / 3;
                 grid-row: 1;

From 6a0ffe905f14ec916ab32ed10601fcb63f912ecb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 17:12:16 +0100
Subject: [PATCH 3083/3235] Iterate text alignment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_ToastContainer.scss     | 3 ++-
 src/components/structures/ToastContainer.js | 6 +++++-
 src/i18n/strings/en_EN.json                 | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 464eaf488d..f64e688498 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -99,9 +99,10 @@ limitations under the License.
             }
 
             span {
+                padding-left: 8px;
                 float: right;
                 font-size: $font-12px;
-                line-height: $font-21px;
+                line-height: $font-22px;
                 color: $muted-fg-color;
             }
         }
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index ddbef42421..729171bd6a 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -50,7 +50,11 @@ export default class ToastContainer extends React.Component {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
             });
-            const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
+
+            let countIndicator;
+            if (isStacked) {
+                countIndicator = `1/${totalCount}`;
+            }
 
             const toastProps = Object.assign({}, props, {
                 key,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cd09170285..99b1d2ad6f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2073,7 +2073,6 @@
     "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 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.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Guest": "Guest",
     "Your profile": "Your profile",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",

From 1dfd62c1425c9f6462ccc424d475e70461e1b4f1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 17:47:35 +0100
Subject: [PATCH 3084/3235] iterate alignment

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/structures/_ToastContainer.scss     | 5 +++--
 src/components/structures/ToastContainer.js | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index f64e688498..2916c4ffdc 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -42,8 +42,8 @@ limitations under the License.
         border-radius: 8px;
         overflow: hidden;
         display: grid;
-        grid-template-columns: 20px 1fr;
-        column-gap: 10px;
+        grid-template-columns: 22px 1fr;
+        column-gap: 8px;
         row-gap: 4px;
         padding: 8px;
 
@@ -96,6 +96,7 @@ limitations under the License.
                 font-weight: 600;
                 display: inline;
                 width: auto;
+                vertical-align: middle;
             }
 
             span {
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 729171bd6a..8f20dcd61d 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from '../../languageHandler';
 import ToastStore from "../../stores/ToastStore";
 import classNames from "classnames";
 

From f539a960e1af71b1fec4e2bedd7fe3a2d240f951 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 17:50:32 +0100
Subject: [PATCH 3085/3235] re-add brackets

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ToastContainer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.js
index 8f20dcd61d..c7789d861f 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.js
@@ -52,7 +52,7 @@ export default class ToastContainer extends React.Component {
 
             let countIndicator;
             if (isStacked) {
-                countIndicator = `1/${totalCount}`;
+                countIndicator = `(1/${totalCount})`;
             }
 
             const toastProps = Object.assign({}, props, {

From b27f1fa6db112bb6da4bc3e562fb4782fb7a0f88 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 18:06:36 +0100
Subject: [PATCH 3086/3235] Convert BasePlatform and BaseEventIndexManager to
 Typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/{BasePlatform.js => BasePlatform.ts}      | 55 ++++++++-----------
 ...dexManager.js => BaseEventIndexManager.ts} | 12 ++--
 2 files changed, 28 insertions(+), 39 deletions(-)
 rename src/{BasePlatform.js => BasePlatform.ts} (79%)
 rename src/indexing/{BaseEventIndexManager.js => BaseEventIndexManager.ts} (97%)

diff --git a/src/BasePlatform.js b/src/BasePlatform.ts
similarity index 79%
rename from src/BasePlatform.js
rename to src/BasePlatform.ts
index e3cbc4dcf0..3f11f25d62 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.ts
@@ -1,5 +1,3 @@
-// @flow
-
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
@@ -19,9 +17,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk";
+import {MatrixClient} from "matrix-js-sdk/src/client";
 import dis from './dispatcher/dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
+import {ActionPayload} from "./dispatcher/payloads";
 
 /**
  * Base class for classes that provide platform-specific functionality
@@ -29,27 +28,25 @@ import BaseEventIndexManager from './indexing/BaseEventIndexManager';
  *
  * Instances of this class are provided by the application.
  */
-export default class BasePlatform {
-    constructor() {
-        this.notificationCount = 0;
-        this.errorDidOccur = false;
+export default abstract class BasePlatform {
+    protected notificationCount: number = 0;
+    protected errorDidOccur: boolean = false;
 
-        dis.register(this._onAction.bind(this));
+    constructor() {
+        dis.register(this.onAction);
     }
 
-    _onAction(payload: Object) {
+    protected onAction = (payload: ActionPayload) => {
         switch (payload.action) {
             case 'on_client_not_viable':
             case 'on_logged_out':
                 this.setNotificationCount(0);
                 break;
         }
-    }
+    };
 
     // Used primarily for Analytics
-    getHumanReadableName(): string {
-        return 'Base Platform';
-    }
+    abstract getHumanReadableName(): string;
 
     setNotificationCount(count: number) {
         this.notificationCount = count;
@@ -84,22 +81,16 @@ export default class BasePlatform {
      * that is 'granted' if the user allowed the request or
      * 'denied' otherwise.
      */
-    requestNotificationPermission(): Promise<string> {
-    }
+    abstract requestNotificationPermission(): Promise<string>;
 
-    displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
-    }
+    abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
 
-    loudNotification(ev: Event, room: Object) {
-    }
+    abstract loudNotification(ev: Event, room: Object);
 
     /**
-     * Returns a promise that resolves to a string representing
-     * the current version of the application.
+     * Returns a promise that resolves to a string representing the current version of the application.
      */
-    getAppVersion(): Promise<string> {
-        throw new Error("getAppVersion not implemented!");
-    }
+    abstract getAppVersion(): Promise<string>;
 
     /*
      * If it's not expected that capturing the screen will work
@@ -114,20 +105,18 @@ export default class BasePlatform {
      * Restarts the application, without neccessarily reloading
      * any application code
      */
-    reload() {
-        throw new Error("reload not implemented!");
-    }
+    abstract reload();
 
     supportsAutoLaunch(): boolean {
         return false;
     }
 
     // XXX: Surely this should be a setting like any other?
-    async getAutoLaunchEnabled(): boolean {
+    async getAutoLaunchEnabled(): Promise<boolean> {
         return false;
     }
 
-    async setAutoLaunchEnabled(enabled: boolean): void {
+    async setAutoLaunchEnabled(enabled: boolean): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -135,11 +124,11 @@ export default class BasePlatform {
         return false;
     }
 
-    async getAutoHideMenuBarEnabled(): boolean {
+    async getAutoHideMenuBarEnabled(): Promise<boolean> {
         return false;
     }
 
-    async setAutoHideMenuBarEnabled(enabled: boolean): void {
+    async setAutoHideMenuBarEnabled(enabled: boolean): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -147,11 +136,11 @@ export default class BasePlatform {
         return false;
     }
 
-    async getMinimizeToTrayEnabled(): boolean {
+    async getMinimizeToTrayEnabled(): Promise<boolean> {
         return false;
     }
 
-    async setMinimizeToTrayEnabled(enabled: boolean): void {
+    async setMinimizeToTrayEnabled(enabled: boolean): Promise<void> {
         throw new Error("Unimplemented");
     }
 
diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.ts
similarity index 97%
rename from src/indexing/BaseEventIndexManager.js
rename to src/indexing/BaseEventIndexManager.ts
index f780c8e9ce..c40d1300ea 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ export interface MatrixEvent {
     content: {};
     event_id: string;
     origin_server_ts: number;
-    unsigned: ?{};
+    unsigned?: {};
     room_id: string;
 }
 
@@ -59,7 +59,7 @@ export interface SearchArgs {
     before_limit: number;
     after_limit: number;
     order_by_recency: boolean;
-    room_id: ?string;
+    room_id?: string;
 }
 
 export interface EventAndProfile {
@@ -85,7 +85,7 @@ export interface IndexStats {
  *
  * Instances of this class are provided by the application.
  */
-export default class BaseEventIndexManager {
+export default abstract class BaseEventIndexManager {
     /**
      * Does our EventIndexManager support event indexing.
      *
@@ -119,7 +119,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve when the was queued up for
      * addition.
      */
-    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<> {
+    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -188,7 +188,7 @@ export default class BaseEventIndexManager {
         events: [EventAndProfile],
         checkpoint: CrawlerCheckpoint | null,
         oldCheckpoint: CrawlerCheckpoint | null,
-    ): Promise<bool> {
+    ): Promise<boolean> {
         throw new Error("Unimplemented");
     }
 

From 7b0e51a703ea8c4aa7420577dad0c1f9dbf11265 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 18:11:21 +0100
Subject: [PATCH 3087/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 3f11f25d62..f7e32584c3 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -29,8 +29,8 @@ import {ActionPayload} from "./dispatcher/payloads";
  * Instances of this class are provided by the application.
  */
 export default abstract class BasePlatform {
-    protected notificationCount: number = 0;
-    protected errorDidOccur: boolean = false;
+    protected notificationCount = 0;
+    protected errorDidOccur = false;
 
     constructor() {
         dis.register(this.onAction);

From 3ae38714c10de32f0064550e067401566bc3c728 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 May 2020 18:25:52 +0100
Subject: [PATCH 3088/3235] make ts happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/BasePlatform.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index f7e32584c3..d4a6c34daf 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -85,7 +85,8 @@ export default abstract class BasePlatform {
 
     abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
 
-    abstract loudNotification(ev: Event, room: Object);
+    loudNotification(ev: Event, room: Object) {
+    };
 
     /**
      * Returns a promise that resolves to a string representing the current version of the application.

From 559dd98d01c0192f9a3d5c7ee56d77b9324d0ac6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 May 2020 11:53:16 -0600
Subject: [PATCH 3089/3235] Fix comment style to be less bothersome

---
 src/components/views/rooms/RoomList2.tsx    | 3 +--
 src/components/views/rooms/RoomSublist2.tsx | 3 +--
 src/components/views/rooms/RoomTile2.tsx    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index a5d0175f01..d0c147c953 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -35,8 +35,7 @@ import { ActionPayload } from "../../../dispatcher/payloads";
  * This is a work in progress implementation and isn't complete or *
  * even useful as a component. Please avoid using it until this    *
  * warning disappears.                                             *
- *******************************************************************
- */
+ *******************************************************************/
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 4c3f65b323..e2f489b959 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -35,8 +35,7 @@ import RoomTile2 from "./RoomTile2";
  * This is a work in progress implementation and isn't complete or *
  * even useful as a component. Please avoid using it until this    *
  * warning disappears.                                             *
- *******************************************************************
- */
+ *******************************************************************/
 
 interface IProps {
     forRooms: boolean;
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 53e56d7a1e..42b65cba87 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -37,8 +37,7 @@ import * as FormattingUtils from "../../../utils/FormattingUtils";
  * This is a work in progress implementation and isn't complete or *
  * even useful as a component. Please avoid using it until this    *
  * warning disappears.                                             *
- *******************************************************************
- */
+ *******************************************************************/
 
 interface IProps {
     room: Room;

From a11985f239831290c4da4507c46535ea74f06838 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 May 2020 11:54:38 -0600
Subject: [PATCH 3090/3235] Which component? The room list!

---
 src/stores/room-list/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/room-list/README.md b/src/stores/room-list/README.md
index 020108878b..82a6e841db 100644
--- a/src/stores/room-list/README.md
+++ b/src/stores/room-list/README.md
@@ -106,7 +106,7 @@ put the sticky room in a position where it's had to decrease N will not increase
 
 ## Responsibilities of the store
 
-The store is responsible for the ordering, upkeep, and tracking of all rooms. The component simply gets 
+The store is responsible for the ordering, upkeep, and tracking of all rooms. The room list component simply gets 
 an object containing the tags it needs to worry about and the rooms within. The room list component will 
 decide which tags need rendering (as it commonly filters out empty tags in most cases), and will deal with 
 all kinds of filtering.

From 3741c296aa3147bb3d9ed4f1b348118d4b98b3b6 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 21 May 2020 14:40:28 +0000
Subject: [PATCH 3091/3235] Translated using Weblate (Galician)

Currently translated at 42.0% (974 of 2321 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f3b9e38273..d433d58146 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -962,5 +962,29 @@
     "Enter your password to sign in and regain access to your account.": "Escribe o contrasinal para conectarte e retomar o acceso a túa conta.",
     "Sign in and regain access to your account.": "Conéctate e recupera o acceso a túa conta.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Non podes conectar a conta. Contacta coa administración do teu servidor para máis información.",
-    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Aviso: os teus datos personais (incluíndo chaves de cifrado) aínda están gardadas nesta sesión. Pechaa se remataches de usar esta sesión, ou se quere conectar con outra conta."
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Aviso: os teus datos personais (incluíndo chaves de cifrado) aínda están gardadas nesta sesión. Pechaa se remataches de usar esta sesión, ou se quere conectar con outra conta.",
+    "Unable to load! Check your network connectivity and try again.": "Non cargou! Comproba a conexión a rede e volta a intentalo.",
+    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai sesións descoñecidas nesta sala: se continúas sen verificalas será posible para alguén fisgar na túa chamada.",
+    "Review Sessions": "Revisar Sesións",
+    "Call failed due to misconfigured server": "Fallou a chamada porque o servidor está mal configurado",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Contacta coa administración do teu servidor (<code>%(homeserverDomain)s</code>) para configurar un servidor TURN para que as chamadas funcionen de xeito fiable.",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "De xeito alternativo, podes intentar usar o servidor público <code>turn.matrix.org</code>, pero non é tan fiable, e compartirá o teu enderezo IP con ese servidor. Podes xestionar esto en Axustes.",
+    "Try using turn.matrix.org": "Inténtao usando turn.matrix.org",
+    "Replying With Files": "Respondendo con Ficheiros",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Neste intre non é posible responder cun ficheiro. Queres subir este ficheiro sen responder?",
+    "The file '%(fileName)s' failed to upload.": "Fallou a subida do ficheiro '%(fileName)s'.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "O ficheiro '%(fileName)s' supera o tamaño máximo permitido polo servidor",
+    "The server does not support the room version specified.": "O servidor non soporta a versión da sala indicada.",
+    "If you cancel now, you won't complete verifying the other user.": "Se cancelas agora non completarás a verificación da outra usuaria.",
+    "If you cancel now, you won't complete verifying your other session.": "Se cancelas agora non completarás o proceso de verificación da outra sesión.",
+    "If you cancel now, you won't complete your operation.": "Se cancelas agora, non completarás a operación.",
+    "Cancel entering passphrase?": "Cancelar a escrita da frase de paso?",
+    "Setting up keys": "Configurando as chaves",
+    "Verify this session": "Verificar esta sesión",
+    "Encryption upgrade available": "Mellora do cifrado dispoñible",
+    "Set up encryption": "Configurar cifrado",
+    "Review where you’re logged in": "Revisar onde estás conectada",
+    "New login. Was this you?": "Nova conexión. Foches ti?",
+    "Name or Matrix ID": "Nome ou ID Matrix",
+    "Identity server has no terms of service": "O servidor de identidade non ten termos dos servizo"
 }

From e849d288741765950e63fb532e1117e2aa9facd8 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 21 May 2020 13:42:07 +0000
Subject: [PATCH 3092/3235] Translated using Weblate (Lithuanian)

Currently translated at 48.2% (1119 of 2321 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 | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 54ebd93051..e96e0e9199 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1092,11 +1092,11 @@
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
     "Your recovery key": "Jūsų atgavimo raktas",
     "Copy": "Kopijuoti",
-    "Make a copy of your recovery key": "Padaryti jūsų atgavimo rakto kopiją",
+    "Make a copy of your recovery key": "Padaryti atgavimo rakto kopiją",
     "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte.",
     "Later": "Vėliau",
     "Verify yourself & others to keep your chats safe": "Patvirtinkite save ir kitus, kad jūsų pokalbiai būtų saugūs",
-    "Go back": "",
+    "Go back": "Grįžti",
     "This room is end-to-end encrypted": "Šis kambarys užšifruotas visapusiu šifravimu",
     "Send a message…": "Siųsti žinutę…",
     "Never lose encrypted messages": "Niekada nepraraskite šifruotų žinučių",
@@ -1111,7 +1111,7 @@
     "Confirm Removal": "Patvirtinkite pašalinimą",
     "Manually export keys": "Eksportuoti raktus rankiniu būdu",
     "Send a Direct Message": "Siųsti tiesioginę žinutę",
-    "Go Back": "",
+    "Go Back": "Grįžti",
     "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo.",
     "Click the button below to confirm adding this email address.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šio el. pašto pridėjimą.",
     "Add an email address to configure email notifications": "Pridėkite el. pašto adresą, kad nustatytumėte el. pašto pranešimus",
@@ -1126,5 +1126,32 @@
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Įveskite pasirinktinio serverio URL <a>Ką tai reiškia?</a>",
     "Homeserver URL": "Serverio URL",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Serverio adresas neatrodo esantis tinkamas Matrix serveris",
-    "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą."
+    "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą.",
+    "Review Sessions": "Peržiūrėti sesijas",
+    "Setting up keys": "Raktų nustatymas",
+    "Review where you’re logged in": "Peržiūrėkite kur esate prisijungę",
+    "Verify all your sessions to ensure your account & messages are safe": "Patvirtinkite visas savo sesijas, kad užtikrintumėte savo paskyros ir žinučių saugumą",
+    "Review": "Peržiūrėti",
+    "Message deleted": "Žinutė ištrinta",
+    "Message deleted by %(name)s": "Žinutė, ištrinta %(name)s",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Įspėjimas</b>: Tai atlikite tik saugiame kompiuteryje.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Prieikite prie savo saugių žinučių istorijos ir kryžminio parašo kitų sesijų patvirtinimui tapatybės įvesdami savo atgavimo slaptafrazę.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>",
+    "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
+    "Use an email address to recover your account": "Naudokite el. pašto adresą, kad prireikus galėtumėte atgauti paskyrą",
+    "Passwords don't match": "Slaptažodžiai nesutampa",
+    "Use lowercase letters, numbers, dashes and underscores only": "Naudokite tik mažąsias raides, brūkšnelius ir pabraukimus",
+    "Great! This recovery passphrase looks strong enough.": "Puiku! Ši slaptafrazė atrodo pakankamai stipri.",
+    "That matches!": "Tai sutampa!",
+    "That doesn't match.": "Tai nesutampa.",
+    "Confirm your recovery passphrase": "Patvirtinti atgavimo slaptafrazę",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Jūsų atgavimo raktas buvo <b>nukopijuotas į jūsų iškarpinę</b>, jūs galite:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Jūsų atgavimo raktas yra <b>Parsisiuntimų</b> kataloge.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Atsispausdinti jį</b> ir laikyti saugioje vietoje",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Išsaugoti jį</b> USB rakte arba atsarginių kopijų diske",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Nukopijuoti jį</b> į savo asmeninę debesų saugyklą",
+    "You can now verify your other devices, and other users to keep your chats safe.": "Jūs dabar galite patvirtinti kitus savo įrenginius ir kitus vartotojus, kad jūsų pokalbiai būtų saugūs.",
+    "Confirm recovery passphrase": "Patvirtinkite atgavimo slaptafrazę",
+    "You're done!": "Atlikta!"
 }

From 565562ab5c8701c2f63a888de46a58a53c75864a Mon Sep 17 00:00:00 2001
From: yuuki-san <yuuki-san@protonmail.com>
Date: Thu, 21 May 2020 11:57:59 +0000
Subject: [PATCH 3093/3235] Translated using Weblate (Slovak)

Currently translated at 67.1% (1558 of 2321 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index a9111a91a6..6473dad0cf 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -604,7 +604,7 @@
     "Stops ignoring a user, showing their messages going forward": "Prestane ignorovať používateľa a začne zobrazovať jeho správy",
     "Commands": "Príkazy",
     "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
-    "Emoji": "Emotikon",
+    "Emoji": "Emoji",
     "Notify the whole room": "Oznamovať celú miestnosť",
     "Room Notification": "Oznámenie miestnosti",
     "Users": "Používatelia",
@@ -1647,8 +1647,22 @@
     "Command Autocomplete": "Automatické dopĺňanie príkazov",
     "Community Autocomplete": "Automatické dopĺňanie skupín",
     "DuckDuckGo Results": "Výsledky hľadania DuckDuckGo",
-    "Emoji Autocomplete": "Automatické dopĺňanie emotikonov",
+    "Emoji Autocomplete": "Automatické dopĺňanie emoji",
     "Notification Autocomplete": "Automatické dopĺňanie oznámení",
     "Room Autocomplete": "Automatické dopĺňanie miestností",
-    "User Autocomplete": "Automatické dopĺňanie používateľov"
+    "User Autocomplete": "Automatické dopĺňanie používateľov",
+    "Start": "Začať",
+    "Verify this session by confirming the following number appears on its screen.": "Overte túto reláciu tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Čakám na overenie od relácie %(deviceName)s (%(deviceId)s)…",
+    "Waiting for your other session to verify…": "Čakám na overenie od vašej druhej relácie…",
+    "Waiting for %(displayName)s to verify…": "Čakám na %(displayName)s, kým nás overí…",
+    "Cancelling…": "Rušenie…",
+    "They match": "Zhodujú sa",
+    "They don't match": "Nezhodujú sa",
+    "To be secure, do this in person or use a trusted way to communicate.": "Aby ste si boli istý, urobte to osobne alebo použite dôveryhodný spôsob komunikácie.",
+    "Lock": "Zámok",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Pokiaľ nemôžete kód vyššie skenovať, overte sa porovnaním jedinečnej kombinácie emoji.",
+    "Verify by comparing unique emoji.": "Overenie porovnaním jedinečnej kombinácie emoji",
+    "Verify by emoji": "Overte pomocou emoji",
+    "Compare emoji": "Porovnajte emoji"
 }

From e3c0b4711686231c4704882dfbfbe72000911c05 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 May 2020 11:56:04 -0600
Subject: [PATCH 3094/3235] Hyphenize algorithm directories

---
 src/stores/room-list/RoomListStore2.ts                        | 4 ++--
 .../algorithms/{list_ordering => list-ordering}/Algorithm.ts  | 0
 .../{list_ordering => list-ordering}/ImportanceAlgorithm.ts   | 2 +-
 .../{list_ordering => list-ordering}/NaturalAlgorithm.ts      | 2 +-
 .../algorithms/{list_ordering => list-ordering}/index.ts      | 0
 .../{tag_sorting => tag-sorting}/AlphabeticAlgorithm.ts       | 0
 .../algorithms/{tag_sorting => tag-sorting}/IAlgorithm.ts     | 0
 .../{tag_sorting => tag-sorting}/ManualAlgorithm.ts           | 0
 .../{tag_sorting => tag-sorting}/RecentAlgorithm.ts           | 0
 .../algorithms/{tag_sorting => tag-sorting}/index.ts          | 0
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename src/stores/room-list/algorithms/{list_ordering => list-ordering}/Algorithm.ts (100%)
 rename src/stores/room-list/algorithms/{list_ordering => list-ordering}/ImportanceAlgorithm.ts (99%)
 rename src/stores/room-list/algorithms/{list_ordering => list-ordering}/NaturalAlgorithm.ts (97%)
 rename src/stores/room-list/algorithms/{list_ordering => list-ordering}/index.ts (100%)
 rename src/stores/room-list/algorithms/{tag_sorting => tag-sorting}/AlphabeticAlgorithm.ts (100%)
 rename src/stores/room-list/algorithms/{tag_sorting => tag-sorting}/IAlgorithm.ts (100%)
 rename src/stores/room-list/algorithms/{tag_sorting => tag-sorting}/ManualAlgorithm.ts (100%)
 rename src/stores/room-list/algorithms/{tag_sorting => tag-sorting}/RecentAlgorithm.ts (100%)
 rename src/stores/room-list/algorithms/{tag_sorting => tag-sorting}/index.ts (100%)

diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 4f38a25d95..881b8fd3cf 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -18,12 +18,12 @@ limitations under the License.
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import SettingsStore from "../../settings/SettingsStore";
 import { DefaultTagID, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
-import { Algorithm } from "./algorithms/list_ordering/Algorithm";
+import { Algorithm } from "./algorithms/list-ordering/Algorithm";
 import TagOrderStore from "../TagOrderStore";
 import { AsyncStore } from "../AsyncStore";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
-import { getListAlgorithmInstance } from "./algorithms/list_ordering";
+import { getListAlgorithmInstance } from "./algorithms/list-ordering";
 import { ActionPayload } from "../../dispatcher/payloads";
 import defaultDispatcher from "../../dispatcher/dispatcher";
 
diff --git a/src/stores/room-list/algorithms/list_ordering/Algorithm.ts b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
similarity index 100%
rename from src/stores/room-list/algorithms/list_ordering/Algorithm.ts
rename to src/stores/room-list/algorithms/list-ordering/Algorithm.ts
diff --git a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
similarity index 99%
rename from src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
rename to src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
index fd5d4c8163..c72cdc2e1c 100644
--- a/src/stores/room-list/algorithms/list_ordering/ImportanceAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -19,7 +19,7 @@ import { Algorithm } from "./Algorithm";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomUpdateCause, TagID } from "../../models";
 import { ITagMap, SortAlgorithm } from "../models";
-import { sortRoomsWithAlgorithm } from "../tag_sorting";
+import { sortRoomsWithAlgorithm } from "../tag-sorting";
 import * as Unread from '../../../../Unread';
 
 /**
diff --git a/src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
similarity index 97%
rename from src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts
rename to src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
index 1265564352..44a501e592 100644
--- a/src/stores/room-list/algorithms/list_ordering/NaturalAlgorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import { Algorithm } from "./Algorithm";
 import { ITagMap } from "../models";
-import { sortRoomsWithAlgorithm } from "../tag_sorting";
+import { sortRoomsWithAlgorithm } from "../tag-sorting";
 
 /**
  * Uses the natural tag sorting algorithm order to determine tag ordering. No
diff --git a/src/stores/room-list/algorithms/list_ordering/index.ts b/src/stores/room-list/algorithms/list-ordering/index.ts
similarity index 100%
rename from src/stores/room-list/algorithms/list_ordering/index.ts
rename to src/stores/room-list/algorithms/list-ordering/index.ts
diff --git a/src/stores/room-list/algorithms/tag_sorting/AlphabeticAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
similarity index 100%
rename from src/stores/room-list/algorithms/tag_sorting/AlphabeticAlgorithm.ts
rename to src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
diff --git a/src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
similarity index 100%
rename from src/stores/room-list/algorithms/tag_sorting/IAlgorithm.ts
rename to src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
diff --git a/src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
similarity index 100%
rename from src/stores/room-list/algorithms/tag_sorting/ManualAlgorithm.ts
rename to src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
diff --git a/src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
similarity index 100%
rename from src/stores/room-list/algorithms/tag_sorting/RecentAlgorithm.ts
rename to src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
diff --git a/src/stores/room-list/algorithms/tag_sorting/index.ts b/src/stores/room-list/algorithms/tag-sorting/index.ts
similarity index 100%
rename from src/stores/room-list/algorithms/tag_sorting/index.ts
rename to src/stores/room-list/algorithms/tag-sorting/index.ts

From 41a11bbdb2c0dfe1ac962a78525d8f98a264a9db Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 21 May 2020 18:29:58 +0000
Subject: [PATCH 3095/3235] Translated using Weblate (Lithuanian)

Currently translated at 48.4% (1124 of 2321 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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index e96e0e9199..b02cb5c485 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -418,7 +418,7 @@
     "A new password must be entered.": "Privalo būti įvestas naujas slaptažodis.",
     "New passwords must match each other.": "Nauji slaptažodžiai privalo sutapti.",
     "I have verified my email address": "Aš patvirtinau savo el. pašto adresą",
-    "Return to login screen": "Grįžti į prisijungimo ekraną",
+    "Return to login screen": "Grįžti į prisijungimą",
     "Send Reset Email": "Siųsti atstatymo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Turėkite omenyje, kad jūs prisijungiate prie %(hs)s serverio, o ne matrix.org.",
@@ -1153,5 +1153,10 @@
     "<b>Copy it</b> to your personal cloud storage": "<b>Nukopijuoti jį</b> į savo asmeninę debesų saugyklą",
     "You can now verify your other devices, and other users to keep your chats safe.": "Jūs dabar galite patvirtinti kitus savo įrenginius ir kitus vartotojus, kad jūsų pokalbiai būtų saugūs.",
     "Confirm recovery passphrase": "Patvirtinkite atgavimo slaptafrazę",
-    "You're done!": "Atlikta!"
+    "You're done!": "Atlikta!",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Slaptažodžio keitimas šiuo metu anuliuos visapusio šifravimo ranktus visose sesijose, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs nematysite pranešimų kitose sesijose kol iš naujo prie jų neprisijungsite",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
+    "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų sesijų ir nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, prisijunkite iš naujo kiekviename įrenginyje."
 }

From a425c5440b16c5d4d002a4e47115d93c15dcdc68 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 21 May 2020 16:34:23 -0600
Subject: [PATCH 3096/3235] Fix visibility of message timestamps

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

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
---
 res/css/views/rooms/_EventTile.scss   | 9 ++++++++-
 res/css/views/rooms/_GroupLayout.scss | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 4297bf809c..20652c6037 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -98,6 +98,7 @@ limitations under the License.
 
 .mx_EventTile .mx_MessageTimestamp {
     display: block;
+    visibility: hidden;
     white-space: nowrap;
     left: 0px;
     text-align: center;
@@ -158,10 +159,16 @@ limitations under the License.
 }
 
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
+// The first set is to handle the 'group layout' (default) and the second for the IRC layout
 .mx_EventTile_last > div > a > .mx_MessageTimestamp,
 .mx_EventTile:hover > div > a > .mx_MessageTimestamp,
 .mx_EventTile.mx_EventTile_actionBarFocused > div > a > .mx_MessageTimestamp,
-.mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp {
+.mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp,
+
+.mx_IRCLayout .mx_EventTile_last > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile:hover > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile.mx_EventTile_actionBarFocused > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile.focus-visible:focus-within > a > .mx_MessageTimestamp {
     visibility: visible;
 }
 
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 40440f7d49..928ea75a79 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -34,7 +34,6 @@ $left-gutter: 65px;
         }
 
         .mx_MessageTimestamp {
-            visibility: hidden;
             position: absolute;
             width: 46px; /* 8 + 30 (avatar) + 8 */
         }

From ef4d0a805194e627606d3306f3b64fb22e1d87d8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 May 2020 10:33:19 +0100
Subject: [PATCH 3097/3235] Make linter happy

---
 res/css/views/rooms/_EventTile.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 20652c6037..40a80f17bb 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -164,7 +164,6 @@ limitations under the License.
 .mx_EventTile:hover > div > a > .mx_MessageTimestamp,
 .mx_EventTile.mx_EventTile_actionBarFocused > div > a > .mx_MessageTimestamp,
 .mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp,
-
 .mx_IRCLayout .mx_EventTile_last > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile:hover > a > .mx_MessageTimestamp,
 .mx_IRCLayout .mx_EventTile.mx_EventTile_actionBarFocused > a > .mx_MessageTimestamp,

From 6bfa31cd47d626fe10c9148f16557c6a2a86bedd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 May 2020 10:34:00 +0100
Subject: [PATCH 3098/3235] run i18n which is unhappy about 'create room' for
 some reason

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f79d93b98f..96ccf1589d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1127,7 +1127,6 @@
     "Low priority": "Low priority",
     "Historical": "Historical",
     "System Alerts": "System Alerts",
-    "Create room": "Create room",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",

From cb270ba0d5a0c6478a38e0dd92577393e20e9082 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 21 May 2020 21:59:22 +0000
Subject: [PATCH 3099/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2322 of 2322 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 89c75532df..f201d5a117 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2419,5 +2419,6 @@
     "Size must be a number": "Grando devas esti nombro",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Propra grando de tiparo povas interi nur %(min)s punktojn kaj %(max)s punktojn",
     "Use between %(min)s pt and %(max)s pt": "Uzi inter %(min)s punktoj kaj %(max)s punktoj",
-    "Appearance": "Aspekto"
+    "Appearance": "Aspekto",
+    "Use the improved room list (in development - refresh to apply changes)": "Uzi la plibonigitan liston de ĉambroj (ankoraŭ evoluigate – aktualigu la paĝon por efektivigi ŝanĝojn)"
 }

From f0c8f20cf6a4ea06e421adc50152337f9453d8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 21 May 2020 20:03:09 +0000
Subject: [PATCH 3100/3235] Translated using Weblate (Estonian)

Currently translated at 54.8% (1273 of 2322 strings)

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

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 3d4b7ec888..d00525b420 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1242,5 +1242,39 @@
     "Confirm account deactivation": "Kinnita konto sulgemine",
     "There was a problem communicating with the server. Please try again.": "Serveriühenduses tekkis viga. Palun proovi uuesti.",
     "Server did not return valid authentication information.": "Serveri saadetud vastuses ei olnud kehtivat autentimisteavet.",
-    "Please fill why you're reporting.": "Palun kirjelda veateate põhjust."
+    "Please fill why you're reporting.": "Palun kirjelda veateate põhjust.",
+    "Something went wrong trying to invite the users.": "Kasutajatele kutse saatmisel läks midagi viltu.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Meil ei õnnestunud neile kasutajatele kutset saata. Palun kontrolli, keda soovid kutsuda ning proovi uuesti.",
+    "Failed to find the following users": "Järgnevaid kasutajaid ei õnnestunud leida",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Järgmisi kasutajanimesid pole olemas või on vigaselt kirjas ning seega ei saa neile kutset saata: %(csvNames)s",
+    "Recently Direct Messaged": "Viimased otsesõnumite saajad",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>), e-posti aadressi alusel või <a>jaga seda jututuba</a>.",
+    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Sa oled lisanud uue sessiooni '%(displayName)s', mis küsib krüptimisvõtmeid.",
+    "Start verification": "Alusta verifitseerimist",
+    "Share without verifying": "Jaga ilma verifitseerimata",
+    "Loading session info...": "Laen sessiooniteavet…",
+    "Encryption key request": "Krüptimisvõtmete päring",
+    "Upload completed": "Üleslaadimine valmis",
+    "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 kasutab varasemaga võrreldes 3-5 korda vähem mälu, sest  laeb teavet kasutajate kohta vaid siis, kui vaja. Palun oota hetke, kuni sünkroniseerime andmeid serveriga!",
+    "Updating Riot": "Uuenda Riot'it",
+    "I don't want my encrypted messages": "Ma ei soovi oma krüptitud sõnumeid",
+    "Manually export keys": "Ekspordi võtmed käsitsi",
+    "You'll lose access to your encrypted messages": "Sa kaotad ligipääsu oma krüptitud sõnumitele",
+    "Are you sure you want to sign out?": "Kas sa oled kindel, et soovid välja logida?",
+    "Upload %(count)s other files|one": "Lae üles %(count)s muu fail",
+    "Cancel All": "Tühista kõik",
+    "Upload Error": "Üleslaadimise viga",
+    "Verify other session": "Verifitseeri teine sessioon",
+    "Verification Request": "Verifitseerimispäring",
+    "A widget would like to verify your identity": "Vidin soovib verifitseerida sinu isikut",
+    "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Vidin %(widgetUrl)s saidist soovib verifitseerida sinu isikut. Kui sa seda lubad, siis vidin verifitseerib vaid sinu kasutajatunnuse, kuid ei saa teha toiminguid sinuna.",
+    "Remember my selection for this widget": "Jäta meelde minu valik selle vidina kohta",
+    "Allow": "Luba",
+    "Deny": "Keela",
+    "Unable to restore backup": "Varukoopiast taastamine ei õnenstu",
+    "No backup found!": "Varukoopiat ei leidunud!",
+    "Keys restored": "Krüptimise võtmed on taastatud",
+    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s sessiooni dekrüptimine ei õnnestunud!",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s sessiooni võtme taastamine õnnestus",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: sa peaksid võtmete varunduse seadistama vaid usaldusväärsest arvutist."
 }

From 19667964a7e1a826e086722ded126bf9d476e665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@pm.me>
Date: Fri, 22 May 2020 06:36:51 +0000
Subject: [PATCH 3101/3235] Translated using Weblate (French)

Currently translated at 100.0% (2322 of 2322 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 ee3c398e86..66bb97118f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -2445,5 +2445,6 @@
     "Size must be a number": "La taille doit être un nombre",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "La taille de police personnalisée doit être comprise entre %(min)s pt et %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Utiliser entre %(min)s pt et %(max)s pt",
-    "Appearance": "Apparence"
+    "Appearance": "Apparence",
+    "Use the improved room list (in development - refresh to apply changes)": "Utiliser la liste de salons améliorée (en développement − actualisez pour appliquer les changements)"
 }

From f00ce9aace4a780e6a393eaef7128c932f9377e4 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Fri, 22 May 2020 09:18:06 +0000
Subject: [PATCH 3102/3235] Translated using Weblate (Galician)

Currently translated at 43.7% (1014 of 2322 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index d433d58146..48eb1338b4 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -986,5 +986,45 @@
     "Review where you’re logged in": "Revisar onde estás conectada",
     "New login. Was this you?": "Nova conexión. Foches ti?",
     "Name or Matrix ID": "Nome ou ID Matrix",
-    "Identity server has no terms of service": "O servidor de identidade non ten termos dos servizo"
+    "Identity server has no terms of service": "O servidor de identidade non ten termos dos servizo",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Esta acción precisa acceder ao servidor de indentidade <server /> para validar o enderezo de email ou o número de teléfono, pero o servidor non publica os seus termos do servizo.",
+    "Only continue if you trust the owner of the server.": "Continúa se realmente confías no dono do servidor.",
+    "Trust": "Confiar",
+    "%(name)s is requesting verification": "%(name)s está pedindo a verificación",
+    "Use your account or create a new one to continue.": "Usa a túa conta ou crea unha nova para continuar.",
+    "Create Account": "Crear conta",
+    "Custom (%(level)s)": "Personalizado (%(level)s)",
+    "Failed to invite users to the room:": "Fallo a convidar a persoas a sala:",
+    "Messages": "Mensaxes",
+    "Actions": "Accións",
+    "Other": "Outro",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯  a mensaxe en texto plano",
+    "Sends a message as plain text, without interpreting it as markdown": "Envía unha mensaxe como texto plano, sen interpretalo como markdown",
+    "Sends a message as html, without interpreting it as markdown": "Envía unha mensaxe como html, sen interpretalo como markdown",
+    "Upgrades a room to a new version": "Subir a sala de versión",
+    "You do not have the required permissions to use this command.": "Non tes os permisos suficientes para usar este comando.",
+    "Error upgrading room": "Fallo ao actualizar a sala",
+    "Double check that your server supports the room version chosen and try again.": "Comproba ben que o servidor soporta a versión da sala escollida e inténtao outra vez.",
+    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta esta sala",
+    "Changes the avatar of the current room": "Cambia o avatar da sala actual",
+    "Changes your avatar in this current room only": "Cambia o teu avatar só nesta sala",
+    "Changes your avatar in all rooms": "Cambia o teu avatar en todas as salas",
+    "Gets or sets the room topic": "Obtén ou establece o asunto da sala",
+    "Failed to set topic": "Fallo ao establecer asunto",
+    "This room has no topic.": "Esta sala non ten asunto.",
+    "Sets the room name": "Establecer nome da sala",
+    "Use an identity server": "Usar un servidor de identidade",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidade para convidar por email. Preme continuar para usar o servidor de identidade por omisión (%(defaultIdentityServerName)s) ou cambiao en Axustes.",
+    "Use an identity server to invite by email. Manage in Settings.": "Usar un servidor de indentidade para convidar por email. Xestionao en Axustes.",
+    "Command failed": "O comando fallou",
+    "Could not find user in room": "Non se atopa a usuaria na sala",
+    "Adds a custom widget by URL to the room": "Engade un widget por URL personalizado a sala",
+    "Please supply a widget URL or embed code": "Proporciona o URL do widget ou incrusta o código",
+    "Please supply a https:// or http:// widget URL": "Escribe un https:// ou http:// como URL do widget",
+    "You cannot modify widgets in this room.": "Non podes modificar os widgets desta sala.",
+    "Unknown (user, session) pair:": "Par descoñecido (usuaria, sesión):",
+    "Session already verified!": "A sesión xa está verificada!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "AVISO: xa está verificada a sesión, pero as chaves NON CONCORDAN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DAS CHAVES! A chave de firma para %(userId)s na sesión %(deviceId)s é \"%(fprint)s\" que non concordan coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as túas comunicacións foron interceptadas!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A chave de firma proporcionada concorda coa chave de firma recibida desde a sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada."
 }

From ead1fc59fabb1a86a7e1763661ef48cb53493da2 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 22 May 2020 08:08:45 +0000
Subject: [PATCH 3103/3235] Translated using Weblate (Italian)

Currently translated at 100.0% (2322 of 2322 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 1fd6d7dc0c..7f6d3bf1e2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2440,5 +2440,6 @@
     "Size must be a number": "La dimensione deve essere un numero",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "La dimensione del carattere personalizzata può solo essere tra %(min)s pt e %(max)s pt",
     "Use between %(min)s pt and %(max)s pt": "Usa tra %(min)s pt e %(max)s pt",
-    "Appearance": "Aspetto"
+    "Appearance": "Aspetto",
+    "Use the improved room list (in development - refresh to apply changes)": "Usa l'elenco stanze migliorato (in sviluppo - ricarica per applicare le modifiche)"
 }

From fe357e530dc482b5338a59a9e74a36727797252c Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Thu, 21 May 2020 21:54:40 +0000
Subject: [PATCH 3104/3235] Translated using Weblate (Lithuanian)

Currently translated at 48.5% (1127 of 2322 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index b02cb5c485..c6f3abef0f 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1158,5 +1158,8 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs nematysite pranešimų kitose sesijose kol iš naujo prie jų neprisijungsite",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
     "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų sesijų ir nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, prisijunkite iš naujo kiekviename įrenginyje."
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų sesijų ir nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, prisijunkite iš naujo kiekviename įrenginyje.",
+    "Show more": "Rodyti daugiau",
+    "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> į savo naują paskyrą.",
+    "Registration Successful": "Registracija sėkminga"
 }

From 67ffe94df4c0774a97748e886b9c88b696cf843a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 11:18:14 +0100
Subject: [PATCH 3105/3235] Fix typo and improve error context

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 2 +-
 src/stores/RoomViewStore.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8e343fe08f..39cd497098 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1676,7 +1676,7 @@ export default createReactClass({
         const ErrorBoundary = sdk.getComponent("elements.ErrorBoundary");
 
         if (!this.state.room) {
-            const loading = this.state.matrixClientIsReady || this.state.roomLoading || this.state.peekLoading;
+            const loading = !this.state.matrixClientIsReady || this.state.roomLoading || this.state.peekLoading;
             if (loading) {
                 // Assume preview loading if we don't have a ready client or a room ID (still resolving the alias)
                 const previewLoading = !this.state.matrixClientIsReady || !this.state.roomId || this.state.peekLoading;
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 1958b9539f..a38445c89b 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -215,7 +215,7 @@ class RoomViewStore extends Store {
                     storeRoomAliasInCache(payload.room_alias, result.room_id);
                     roomId = result.room_id;
                 } catch (err) {
-                    console.error(err);
+                    console.error("RVS failed to get room id for alias: ", err);
                     dis.dispatch({
                         action: 'view_room_error',
                         room_id: null,

From badda5ae815d77165a90c6f5804192c8e1321a3d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 19 May 2020 15:40:26 +0100
Subject: [PATCH 3106/3235] Remove SSSS key upgrade check from rageshake

This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
---
 src/rageshake/submit-rageshake.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index e5027e0d37..9f9d7898cb 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -133,7 +133,6 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
             body.append("cross_signing_supported_by_hs",
                 String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")));
             body.append("cross_signing_ready", String(await client.isCrossSigningReady()));
-            body.append("ssss_key_needs_upgrade", String(await client.secretStorageKeyNeedsUpgrade()));
         }
     }
 

From 0201655538d44c05e0135e6db92caf060ee166e7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 21 May 2020 12:26:27 +0100
Subject: [PATCH 3107/3235] Fix key backup restore with SSSS

The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
---
 .../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 7e51e76f6c..a16202ed93 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -201,7 +201,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             // `accessSecretStorage` may prompt for storage access as needed.
             const recoverInfo = await accessSecretStorage(async () => {
                 return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
-                    this.state.backupInfo,
+                    this.state.backupInfo, undefined, undefined,
                     { progressCallback: this._progressCallback },
                 );
             });

From dc37469808d23000f3a7c9b6f184b07a31677379 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 12:47:40 +0100
Subject: [PATCH 3108/3235] Convert ToastContainer and ToastStore to Typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json                                  |  1 +
 src/@types/global.d.ts                        |  3 +
 src/components/structures/MatrixChat.tsx      |  2 +-
 .../{ToastContainer.js => ToastContainer.tsx} | 16 ++--
 src/stores/ToastStore.js                      | 73 ------------------
 src/stores/ToastStore.ts                      | 77 +++++++++++++++++++
 yarn.lock                                     |  5 ++
 7 files changed, 98 insertions(+), 79 deletions(-)
 rename src/components/structures/{ToastContainer.js => ToastContainer.tsx} (87%)
 delete mode 100644 src/stores/ToastStore.js
 create mode 100644 src/stores/ToastStore.ts

diff --git a/package.json b/package.json
index 193fb86218..440fe3beac 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "@types/classnames": "^2.2.10",
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
+    "@types/node": "^12.12.41",
     "@types/qrcode": "^1.3.4",
     "@types/react": "16.9",
     "@types/zxcvbn": "^4.4.0",
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index e6e339d067..6c62000143 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as ModernizrStatic from "modernizr";
+import ToastStore from "../stores/ToastStore";
 
 declare global {
     interface Window {
@@ -22,6 +23,8 @@ declare global {
         Olm: {
             init: () => Promise<void>;
         };
+
+        mx_ToastStore: ToastStore;
     }
 
     // workaround for https://github.com/microsoft/TypeScript/issues/30933
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 48dc72f4fa..89db30c7b4 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1559,7 +1559,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
-                    priority: ToastStore.PRIORITY_REALTIME,
+                    priority: 95,
                 });
             }
         });
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.tsx
similarity index 87%
rename from src/components/structures/ToastContainer.js
rename to src/components/structures/ToastContainer.tsx
index 283fbdd96a..9440aa3463 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.tsx
@@ -16,13 +16,19 @@ limitations under the License.
 
 import * as React from "react";
 import { _t } from '../../languageHandler';
-import ToastStore from "../../stores/ToastStore";
+import ToastStore, {IToast} from "../../stores/ToastStore";
 import classNames from "classnames";
 
-export default class ToastContainer extends React.Component {
-    constructor() {
-        super();
-        this.state = {toasts: ToastStore.sharedInstance().getToasts()};
+interface IState {
+    toasts: IToast<any>[];
+}
+
+export default class ToastContainer extends React.Component<{}, IState> {
+    constructor(props, context) {
+        super(props, context);
+        this.state = {
+            toasts: ToastStore.sharedInstance().getToasts(),
+        };
 
         // Start listening here rather than in componentDidMount because
         // toasts may dismiss themselves in their didMount if they find
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
deleted file mode 100644
index 8901736739..0000000000
--- a/src/stores/ToastStore.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 EventEmitter from 'events';
-
-/**
- * Holds the active toasts
- */
-export default class ToastStore extends EventEmitter {
-    static PRIORITY_REALTIME = 0;
-    static PRIORITY_DEFAULT = 1;
-    static PRIORITY_LOW = 2;
-
-    static sharedInstance() {
-        if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
-        return global.mx_ToastStore;
-    }
-
-    constructor() {
-        super();
-        this._dispatcherRef = null;
-        this._toasts = [];
-    }
-
-    reset() {
-        this._toasts = [];
-    }
-
-    /**
-     * Add or replace a toast
-     * If a toast with the same toastKey already exists, the given toast will replace it
-     * Toasts are always added underneath any toasts of the same priority, so existing
-     * toasts stay at the top unless a higher priority one arrives (better to not change the
-     * toast unless necessary).
-     *
-     * @param {boject} newToast The new toast
-     */
-    addOrReplaceToast(newToast) {
-        if (newToast.priority === undefined) newToast.priority = ToastStore.PRIORITY_DEFAULT;
-
-        const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
-        if (oldIndex === -1) {
-            let newIndex = this._toasts.length;
-            while (newIndex > 0 && this._toasts[newIndex - 1].priority > newToast.priority) --newIndex;
-            this._toasts.splice(newIndex, 0, newToast);
-        } else {
-            this._toasts[oldIndex] = newToast;
-        }
-        this.emit('update');
-    }
-
-    dismissToast(key) {
-        this._toasts = this._toasts.filter(t => t.key !== key);
-        this.emit('update');
-    }
-
-    getToasts() {
-        return this._toasts;
-    }
-}
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
new file mode 100644
index 0000000000..4f6d2963c5
--- /dev/null
+++ b/src/stores/ToastStore.ts
@@ -0,0 +1,77 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 EventEmitter from "events";
+import React, {JSXElementConstructor} from "react";
+
+export interface IToast<C extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>> {
+    key: string;
+    // higher priority number will be shown on top of lower priority
+    priority: number;
+    title: string;
+    icon?: string;
+    component: C;
+    props?: React.ComponentProps<C>;
+}
+
+/**
+ * Holds the active toasts
+ */
+export default class ToastStore extends EventEmitter {
+    private toasts: IToast<any>[] = [];
+
+    static sharedInstance() {
+        if (!window.mx_ToastStore) window.mx_ToastStore = new ToastStore();
+        return window.mx_ToastStore;
+    }
+
+    reset() {
+        this.toasts = [];
+    }
+
+    /**
+     * Add or replace a toast
+     * If a toast with the same toastKey already exists, the given toast will replace it
+     * Toasts are always added underneath any toasts of the same priority, so existing
+     * toasts stay at the top unless a higher priority one arrives (better to not change the
+     * toast unless necessary).
+     *
+     * @param {object} newToast The new toast
+     */
+    addOrReplaceToast<C extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>>(newToast: IToast<C>) {
+        const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
+        if (oldIndex === -1) {
+            let newIndex = this.toasts.length;
+            while (newIndex > 0 && this.toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+            this.toasts.splice(newIndex, 0, newToast);
+        } else {
+            this.toasts[oldIndex] = newToast;
+        }
+        this.emit('update');
+    }
+
+    dismissToast(key) {
+        const length = this.toasts.length;
+        this.toasts = this.toasts.filter(t => t.key !== key);
+        if (length !== this.toasts.length) {
+            this.emit('update');
+        }
+    }
+
+    getToasts() {
+        return this.toasts;
+    }
+}
diff --git a/yarn.lock b/yarn.lock
index 6cdc771c5b..340d0b4454 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1280,6 +1280,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
   integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
 
+"@types/node@^12.12.41":
+  version "12.12.42"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.42.tgz#d0d1149336bd07540dd1ea576692829d575dec34"
+  integrity sha512-R/9QdYFLL9dE9l5cWWzWIZByVGFd7lk7JVOJ7KD+E1SJ4gni7XJRLz9QTjyYQiHIqEAgku9VgxdLjMlhhUaAFg==
+
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"

From 3bf5e003a154ff54704f5873ff81d51688d60052 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 12:54:03 +0100
Subject: [PATCH 3109/3235] Convert DeviceListener to Typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/@types/global.d.ts                       |  2 +
 src/{DeviceListener.js => DeviceListener.ts} | 91 +++++++++-----------
 2 files changed, 45 insertions(+), 48 deletions(-)
 rename src/{DeviceListener.js => DeviceListener.ts} (81%)

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 6c62000143..bcf08b26bb 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 import * as ModernizrStatic from "modernizr";
 import ToastStore from "../stores/ToastStore";
+import DeviceListener from "../DeviceListener";
 
 declare global {
     interface Window {
@@ -25,6 +26,7 @@ declare global {
         };
 
         mx_ToastStore: ToastStore;
+        mx_DeviceListener: DeviceListener;
     }
 
     // workaround for https://github.com/microsoft/TypeScript/issues/30933
diff --git a/src/DeviceListener.js b/src/DeviceListener.ts
similarity index 81%
rename from src/DeviceListener.js
rename to src/DeviceListener.ts
index 27caba971e..ce1f781dad 100644
--- a/src/DeviceListener.js
+++ b/src/DeviceListener.ts
@@ -29,28 +29,23 @@ function toastKey(deviceId) {
 }
 
 export default class DeviceListener {
+    // device IDs for which the user has dismissed the verify toast ('Later')
+    private dismissed = new Set<string>();
+    // has the user dismissed any of the various nag toasts to setup encryption on this device?
+    private dismissedThisDeviceToast = false;
+    // cache of the key backup info
+    private keyBackupInfo: object = null;
+    private keyBackupFetchedAt: number = null;
+    // We keep a list of our own device IDs so we can batch ones that were already
+    // there the last time the app launched into a single toast, but display new
+    // ones in their own toasts.
+    private ourDeviceIdsAtStart: Set<string> = null;
+    // The set of device IDs we're currently displaying toasts for
+    private displayingToastsForDeviceIds = new Set<string>();
+
     static sharedInstance() {
-        if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
-        return global.mx_DeviceListener;
-    }
-
-    constructor() {
-        // device IDs for which the user has dismissed the verify toast ('Later')
-        this._dismissed = new Set();
-        // has the user dismissed any of the various nag toasts to setup encryption on this device?
-        this._dismissedThisDeviceToast = false;
-
-        // cache of the key backup info
-        this._keyBackupInfo = null;
-        this._keyBackupFetchedAt = null;
-
-        // We keep a list of our own device IDs so we can batch ones that were already
-        // there the last time the app launched into a single toast, but display new
-        // ones in their own toasts.
-        this._ourDeviceIdsAtStart = null;
-
-        // The set of device IDs we're currently displaying toasts for
-        this._displayingToastsForDeviceIds = new Set();
+        if (!window.mx_DeviceListener) window.mx_DeviceListener = new DeviceListener();
+        return window.mx_DeviceListener;
     }
 
     start() {
@@ -74,12 +69,12 @@ export default class DeviceListener {
             MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
             MatrixClientPeg.get().removeListener('sync', this._onSync);
         }
-        this._dismissed.clear();
-        this._dismissedThisDeviceToast = false;
-        this._keyBackupInfo = null;
-        this._keyBackupFetchedAt = null;
-        this._ourDeviceIdsAtStart = null;
-        this._displayingToastsForDeviceIds = new Set();
+        this.dismissed.clear();
+        this.dismissedThisDeviceToast = false;
+        this.keyBackupInfo = null;
+        this.keyBackupFetchedAt = null;
+        this.ourDeviceIdsAtStart = null;
+        this.displayingToastsForDeviceIds = new Set();
     }
 
     /**
@@ -87,29 +82,29 @@ export default class DeviceListener {
      *
      * @param {String[]} deviceIds List of device IDs to dismiss notifications for
      */
-    async dismissUnverifiedSessions(deviceIds) {
+    async dismissUnverifiedSessions(deviceIds: string[]) {
         for (const d of deviceIds) {
-            this._dismissed.add(d);
+            this.dismissed.add(d);
         }
 
         this._recheck();
     }
 
     dismissEncryptionSetup() {
-        this._dismissedThisDeviceToast = true;
+        this.dismissedThisDeviceToast = true;
         this._recheck();
     }
 
     _ensureDeviceIdsAtStartPopulated() {
-        if (this._ourDeviceIdsAtStart === null) {
+        if (this.ourDeviceIdsAtStart === null) {
             const cli = MatrixClientPeg.get();
-            this._ourDeviceIdsAtStart = new Set(
+            this.ourDeviceIdsAtStart = new Set(
                 cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
             );
         }
     }
 
-    _onWillUpdateDevices = async (users, initialFetch) => {
+    _onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
         // If we didn't know about *any* devices before (ie. it's fresh login),
         // then they are all pre-existing devices, so ignore this and set the
         // devicesAtStart list to the devices that we see after the fetch.
@@ -122,17 +117,17 @@ export default class DeviceListener {
         // before we download any new ones.
     }
 
-    _onDevicesUpdated = (users) => {
+    _onDevicesUpdated = (users: string[]) => {
         if (!users.includes(MatrixClientPeg.get().getUserId())) return;
         this._recheck();
     }
 
-    _onDeviceVerificationChanged = (userId) => {
+    _onDeviceVerificationChanged = (userId: string) => {
         if (userId !== MatrixClientPeg.get().getUserId()) return;
         this._recheck();
     }
 
-    _onUserTrustStatusChanged = (userId, trustLevel) => {
+    _onUserTrustStatusChanged = (userId: string) => {
         if (userId !== MatrixClientPeg.get().getUserId()) return;
         this._recheck();
     }
@@ -163,11 +158,11 @@ export default class DeviceListener {
     // & cache the result
     async _getKeyBackupInfo() {
         const now = (new Date()).getTime();
-        if (!this._keyBackupInfo || this._keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
-            this._keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-            this._keyBackupFetchedAt = now;
+        if (!this.keyBackupInfo || this.keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
+            this.keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            this.keyBackupFetchedAt = now;
         }
-        return this._keyBackupInfo;
+        return this.keyBackupInfo;
     }
 
     async _recheck() {
@@ -186,7 +181,7 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
-        if (this._dismissedThisDeviceToast) {
+        if (this.dismissedThisDeviceToast) {
             ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
         } else {
             if (!crossSigningReady) {
@@ -239,20 +234,20 @@ export default class DeviceListener {
         // (technically could just be a boolean: we don't actually
         // need to remember the device IDs, but for the sake of
         // symmetry...).
-        const oldUnverifiedDeviceIds = new Set();
+        const oldUnverifiedDeviceIds = new Set<string>();
         // Unverified devices that have appeared since then
-        const newUnverifiedDeviceIds = new Set();
+        const newUnverifiedDeviceIds = new Set<string>();
 
         // as long as cross-signing isn't ready,
         // you can't see or dismiss any device toasts
         if (crossSigningReady) {
             const devices = cli.getStoredDevicesForUser(cli.getUserId());
             for (const device of devices) {
-                if (device.deviceId == cli.deviceId) continue;
+                if (device.deviceId === cli.deviceId) continue;
 
                 const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-                if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    if (this._ourDeviceIdsAtStart.has(device.deviceId)) {
+                if (!deviceTrust.isCrossSigningVerified() && !this.dismissed.has(device.deviceId)) {
+                    if (this.ourDeviceIdsAtStart.has(device.deviceId)) {
                         oldUnverifiedDeviceIds.add(device.deviceId);
                     } else {
                         newUnverifiedDeviceIds.add(device.deviceId);
@@ -289,12 +284,12 @@ export default class DeviceListener {
         }
 
         // ...and hide any we don't need any more
-        for (const deviceId of this._displayingToastsForDeviceIds) {
+        for (const deviceId of this.displayingToastsForDeviceIds) {
             if (!newUnverifiedDeviceIds.has(deviceId)) {
                 ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
             }
         }
 
-        this._displayingToastsForDeviceIds = newUnverifiedDeviceIds;
+        this.displayingToastsForDeviceIds = newUnverifiedDeviceIds;
     }
 }

From b21e5ba10b313ebc492b2241d808f917814a5706 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 12:57:48 +0100
Subject: [PATCH 3110/3235] Set new granular priorities

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/DeviceListener.ts                    | 6 +++++-
 src/components/structures/MatrixChat.tsx | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index ce1f781dad..1ecaca9b40 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -197,6 +197,7 @@ export default class DeviceListener {
                         icon: "verification_warning",
                         props: {kind: 'verify_this_session'},
                         component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                        priority: 95,
                     });
                 } else {
                     const backupInfo = await this._getKeyBackupInfo();
@@ -208,6 +209,7 @@ export default class DeviceListener {
                             icon: "verification_warning",
                             props: {kind: 'upgrade_encryption'},
                             component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                            priority: 40,
                         });
                     } else {
                         // No cross-signing or key backup on account (set up encryption)
@@ -217,6 +219,7 @@ export default class DeviceListener {
                             icon: "verification_warning",
                             props: {kind: 'set_up_encryption'},
                             component: sdk.getComponent("toasts.SetupEncryptionToast"),
+                            priority: 40,
                         });
                     }
                 }
@@ -262,11 +265,11 @@ export default class DeviceListener {
                 key: OTHER_DEVICES_TOAST_KEY,
                 title: _t("Review where you’re logged in"),
                 icon: "verification_warning",
-                priority: ToastStore.PRIORITY_LOW,
                 props: {
                     deviceIds: oldUnverifiedDeviceIds,
                 },
                 component: sdk.getComponent("toasts.BulkUnverifiedSessionsToast"),
+                priority: 50,
             });
         } else {
             ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
@@ -280,6 +283,7 @@ export default class DeviceListener {
                 icon: "verification_warning",
                 props: { deviceId },
                 component: sdk.getComponent("toasts.UnverifiedSessionToast"),
+                priority: 80,
             });
         }
 
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 89db30c7b4..e6a56c683f 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1559,7 +1559,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
-                    priority: 95,
+                    priority: 90,
                 });
             }
         });

From 14cee413603ce4fc36bdf1ac2f2b0551fe6b4516 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 13:29:53 +0100
Subject: [PATCH 3111/3235] Convert things to Typescript and re-use a generic
 component

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/DeviceListener.ts                         | 111 ++++++------------
 .../toasts/BulkUnverifiedSessionsToast.js     |  56 ---------
 src/components/views/toasts/GenericToast.tsx  |  42 +++++++
 .../views/toasts/SetupEncryptionToast.js      |  88 --------------
 .../views/toasts/UnverifiedSessionToast.js    |  66 -----------
 ...tToast.js => VerificationRequestToast.tsx} |  48 +++++---
 src/toasts/BulkUnverifiedSessionsToast.ts     |  58 +++++++++
 src/toasts/SetupEncryptionToast.ts            | 106 +++++++++++++++++
 src/toasts/UnverifiedSessionToast.ts          |  70 +++++++++++
 9 files changed, 342 insertions(+), 303 deletions(-)
 delete mode 100644 src/components/views/toasts/BulkUnverifiedSessionsToast.js
 create mode 100644 src/components/views/toasts/GenericToast.tsx
 delete mode 100644 src/components/views/toasts/SetupEncryptionToast.js
 delete mode 100644 src/components/views/toasts/UnverifiedSessionToast.js
 rename src/components/views/toasts/{VerificationRequestToast.js => VerificationRequestToast.tsx} (86%)
 create mode 100644 src/toasts/BulkUnverifiedSessionsToast.ts
 create mode 100644 src/toasts/SetupEncryptionToast.ts
 create mode 100644 src/toasts/UnverifiedSessionToast.ts

diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 1ecaca9b40..ca51b5ac1c 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -14,19 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClientPeg } from './MatrixClientPeg';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import SettingsStore from './settings/SettingsStore';
-import * as sdk from './index';
-import { _t } from './languageHandler';
-import ToastStore from './stores/ToastStore';
+import {
+    hideToast as hideBulkUnverifiedSessionsToast,
+    showToast as showBulkUnverifiedSessionsToast
+} from "./toasts/BulkUnverifiedSessionsToast";
+import {
+    hideToast as hideSetupEncryptionToast,
+    Kind as SetupKind,
+    Kind,
+    showToast as showSetupEncryptionToast
+} from "./toasts/SetupEncryptionToast";
+import {
+    hideToast as hideUnverifiedSessionsToast,
+    showToast as showUnverifiedSessionsToast
+} from "./toasts/UnverifiedSessionToast";
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
-const THIS_DEVICE_TOAST_KEY = 'setupencryption';
-const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
-
-function toastKey(deviceId) {
-    return "unverified_session_" + deviceId;
-}
 
 export default class DeviceListener {
     // device IDs for which the user has dismissed the verify toast ('Later')
@@ -82,7 +87,7 @@ export default class DeviceListener {
      *
      * @param {String[]} deviceIds List of device IDs to dismiss notifications for
      */
-    async dismissUnverifiedSessions(deviceIds: string[]) {
+    async dismissUnverifiedSessions(deviceIds: Iterable<string>) {
         for (const d of deviceIds) {
             this.dismissed.add(d);
         }
@@ -181,51 +186,25 @@ export default class DeviceListener {
 
         const crossSigningReady = await cli.isCrossSigningReady();
 
-        if (this.dismissedThisDeviceToast) {
-            ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+        if (this.dismissedThisDeviceToast || crossSigningReady) {
+            hideSetupEncryptionToast();
         } else {
-            if (!crossSigningReady) {
-                // make sure our keys are finished downlaoding
-                await cli.downloadKeys([cli.getUserId()]);
-                // cross signing isn't enabled - nag to enable it
-                // There are 3 different toasts for:
-                if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
-                    // Cross-signing on account but this device doesn't trust the master key (verify this session)
-                    ToastStore.sharedInstance().addOrReplaceToast({
-                        key: THIS_DEVICE_TOAST_KEY,
-                        title: _t("Verify this session"),
-                        icon: "verification_warning",
-                        props: {kind: 'verify_this_session'},
-                        component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                        priority: 95,
-                    });
-                } else {
-                    const backupInfo = await this._getKeyBackupInfo();
-                    if (backupInfo) {
-                        // No cross-signing on account but key backup available (upgrade encryption)
-                        ToastStore.sharedInstance().addOrReplaceToast({
-                            key: THIS_DEVICE_TOAST_KEY,
-                            title: _t("Encryption upgrade available"),
-                            icon: "verification_warning",
-                            props: {kind: 'upgrade_encryption'},
-                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                            priority: 40,
-                        });
-                    } else {
-                        // No cross-signing or key backup on account (set up encryption)
-                        ToastStore.sharedInstance().addOrReplaceToast({
-                            key: THIS_DEVICE_TOAST_KEY,
-                            title: _t("Set up encryption"),
-                            icon: "verification_warning",
-                            props: {kind: 'set_up_encryption'},
-                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                            priority: 40,
-                        });
-                    }
-                }
+            // make sure our keys are finished downloading
+            await cli.downloadKeys([cli.getUserId()]);
+            // cross signing isn't enabled - nag to enable it
+            // There are 3 different toasts for:
+            if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
+                // Cross-signing on account but this device doesn't trust the master key (verify this session)
+                showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
             } else {
-                // cross-signing is ready, and we don't need to upgrade encryption
-                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
+                const backupInfo = await this._getKeyBackupInfo();
+                if (backupInfo) {
+                    // No cross-signing on account but key backup available (upgrade encryption)
+                    showSetupEncryptionToast(Kind.UPGRADE_ENCRYPTION);
+                } else {
+                    // No cross-signing or key backup on account (set up encryption)
+                    showSetupEncryptionToast(Kind.SET_UP_ENCRYPTION);
+                }
             }
         }
 
@@ -261,36 +240,20 @@ export default class DeviceListener {
 
         // Display or hide the batch toast for old unverified sessions
         if (oldUnverifiedDeviceIds.size > 0) {
-            ToastStore.sharedInstance().addOrReplaceToast({
-                key: OTHER_DEVICES_TOAST_KEY,
-                title: _t("Review where you’re logged in"),
-                icon: "verification_warning",
-                props: {
-                    deviceIds: oldUnverifiedDeviceIds,
-                },
-                component: sdk.getComponent("toasts.BulkUnverifiedSessionsToast"),
-                priority: 50,
-            });
+            showBulkUnverifiedSessionsToast(oldUnverifiedDeviceIds);
         } else {
-            ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
+            hideBulkUnverifiedSessionsToast();
         }
 
         // Show toasts for new unverified devices if they aren't already there
         for (const deviceId of newUnverifiedDeviceIds) {
-            ToastStore.sharedInstance().addOrReplaceToast({
-                key: toastKey(deviceId),
-                title: _t("New login. Was this you?"),
-                icon: "verification_warning",
-                props: { deviceId },
-                component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-                priority: 80,
-            });
+            showUnverifiedSessionsToast(deviceId);
         }
 
         // ...and hide any we don't need any more
         for (const deviceId of this.displayingToastsForDeviceIds) {
             if (!newUnverifiedDeviceIds.has(deviceId)) {
-                ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
+                hideUnverifiedSessionsToast(deviceId);
             }
         }
 
diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
deleted file mode 100644
index 99ff529c35..0000000000
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 { _t } from '../../../languageHandler';
-import dis from "../../../dispatcher/dispatcher";
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import DeviceListener from '../../../DeviceListener';
-import FormButton from '../elements/FormButton';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-
-@replaceableComponent("views.toasts.BulkUnverifiedSessionsToast")
-export default class BulkUnverifiedSessionsToast extends React.PureComponent {
-    static propTypes = {
-        deviceIds: PropTypes.array,
-    }
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
-    };
-
-    _onReviewClick = async () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
-
-        dis.dispatch({
-            action: 'view_user_info',
-            userId: MatrixClientPeg.get().getUserId(),
-        });
-    };
-
-    render() {
-        return (<div>
-            <div className="mx_Toast_description">
-                {_t("Verify all your sessions to ensure your account & messages are safe")}
-            </div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/GenericToast.tsx b/src/components/views/toasts/GenericToast.tsx
new file mode 100644
index 0000000000..9d69330857
--- /dev/null
+++ b/src/components/views/toasts/GenericToast.tsx
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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, {ReactChild} from "react";
+
+import FormButton from "../elements/FormButton";
+
+interface IProps {
+    description: ReactChild;
+    acceptLabel: string;
+    rejectLabel?: string;
+
+    onAccept();
+    onReject?();
+}
+
+const GenericToast: React.FC<IProps> = ({description, acceptLabel, rejectLabel, onAccept, onReject}) => {
+    return <div>
+        <div className="mx_Toast_description">
+            { description }
+        </div>
+        <div className="mx_Toast_buttons" aria-live="off">
+            {onReject && rejectLabel && <FormButton label={rejectLabel} kind="danger" onClick={onReject} /> }
+            <FormButton label={acceptLabel} onClick={onAccept} />
+        </div>
+    </div>;
+};
+
+export default GenericToast;
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
deleted file mode 100644
index b5510e85b6..0000000000
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 Modal from '../../../Modal';
-import * as sdk from "../../../index";
-import { _t } from '../../../languageHandler';
-import DeviceListener from '../../../DeviceListener';
-import SetupEncryptionDialog from "../dialogs/SetupEncryptionDialog";
-import { accessSecretStorage } from '../../../CrossSigningManager';
-
-export default class SetupEncryptionToast extends React.PureComponent {
-    static propTypes = {
-        toastKey: PropTypes.string.isRequired,
-        kind: PropTypes.oneOf([
-            'set_up_encryption',
-            'verify_this_session',
-            'upgrade_encryption',
-        ]).isRequired,
-    };
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissEncryptionSetup();
-    };
-
-    _onSetupClick = async () => {
-        if (this.props.kind === "verify_this_session") {
-            Modal.createTrackedDialog('Verify session', 'Verify session', SetupEncryptionDialog,
-                {}, null, /* priority = */ false, /* static = */ true);
-        } else {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            const modal = Modal.createDialog(
-                Spinner, null, 'mx_Dialog_spinner', /* priority */ false, /* static */ true,
-            );
-            try {
-                await accessSecretStorage();
-            } finally {
-                modal.close();
-            }
-        }
-    };
-
-    getDescription() {
-        switch (this.props.kind) {
-            case 'set_up_encryption':
-            case 'upgrade_encryption':
-                return _t('Verify yourself & others to keep your chats safe');
-            case 'verify_this_session':
-                return _t('Other users may not trust it');
-        }
-    }
-
-    getSetupCaption() {
-        switch (this.props.kind) {
-            case 'set_up_encryption':
-                return _t('Set up');
-            case 'upgrade_encryption':
-                return _t('Upgrade');
-            case 'verify_this_session':
-                return _t('Verify');
-        }
-    }
-
-    render() {
-        const FormButton = sdk.getComponent("elements.FormButton");
-        return (<div>
-            <div className="mx_Toast_description">{this.getDescription()}</div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={this.getSetupCaption()} onClick={this._onSetupClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
deleted file mode 100644
index 38cd9f20df..0000000000
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 { _t } from '../../../languageHandler';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import Modal from '../../../Modal';
-import DeviceListener from '../../../DeviceListener';
-import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
-import FormButton from '../elements/FormButton';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-
-@replaceableComponent("views.toasts.UnverifiedSessionToast")
-export default class UnverifiedSessionToast extends React.PureComponent {
-    static propTypes = {
-        deviceId: PropTypes.string,
-    }
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
-    };
-
-    _onReviewClick = async () => {
-        const cli = MatrixClientPeg.get();
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
-            userId: cli.getUserId(),
-            device: cli.getStoredDevice(cli.getUserId(), this.props.deviceId),
-            onFinished: (r) => {
-                if (!r) {
-                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
-                    DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
-    };
-
-    render() {
-        const cli = MatrixClientPeg.get();
-        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
-
-        return (<div>
-            <div className="mx_Toast_description">
-                {_t(
-                    "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()})}
-            </div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.tsx
similarity index 86%
rename from src/components/views/toasts/VerificationRequestToast.js
rename to src/components/views/toasts/VerificationRequestToast.tsx
index 421dd7bea1..38e7e31989 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import React from "react";
+
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
@@ -24,8 +24,23 @@ import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver
 import dis from "../../../dispatcher/dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
+import GenericToast from "./GenericToast";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {DeviceInfo} from "matrix-js-sdk/src/crypto/deviceinfo";
+
+interface IProps {
+    toastKey: string;
+    request: VerificationRequest;
+}
+
+interface IState {
+    counter: number;
+    device?: DeviceInfo;
+}
+
+export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
+    private intervalHandle: NodeJS.Timeout;
 
-export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
         super(props);
         this.state = {counter: Math.ceil(props.request.timeout / 1000)};
@@ -34,7 +49,7 @@ export default class VerificationRequestToast extends React.PureComponent {
     async componentDidMount() {
         const {request} = this.props;
         if (request.timeout && request.timeout > 0) {
-            this._intervalHandle = setInterval(() => {
+            this.intervalHandle = setInterval(() => {
                 let {counter} = this.state;
                 counter = Math.max(0, counter - 1);
                 this.setState({counter});
@@ -56,7 +71,7 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     componentWillUnmount() {
-        clearInterval(this._intervalHandle);
+        clearInterval(this.intervalHandle);
         const {request} = this.props;
         request.off("change", this._checkRequestIsPending);
     }
@@ -110,7 +125,6 @@ export default class VerificationRequestToast extends React.PureComponent {
     };
 
     render() {
-        const FormButton = sdk.getComponent("elements.FormButton");
         const {request} = this.props;
         let nameLabel;
         if (request.isSelfVerification) {
@@ -133,20 +147,16 @@ export default class VerificationRequestToast extends React.PureComponent {
                 }
             }
         }
-        const declineLabel = this.state.counter == 0 ?
+        const declineLabel = this.state.counter === 0 ?
             _t("Decline") :
             _t("Decline (%(counter)s)", {counter: this.state.counter});
-        return (<div>
-            <div className="mx_Toast_description">{nameLabel}</div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={declineLabel} kind="danger" onClick={this.cancel} />
-                <FormButton label={_t("Accept")} onClick={this.accept} />
-            </div>
-        </div>);
+
+        return <GenericToast
+            description={nameLabel}
+            acceptLabel={_t("Accept")}
+            onAccept={this.accept}
+            rejectLabel={declineLabel}
+            onReject={this.cancel}
+        />;
     }
 }
-
-VerificationRequestToast.propTypes = {
-    request: PropTypes.object.isRequired,
-    toastKey: PropTypes.string.isRequired,
-};
diff --git a/src/toasts/BulkUnverifiedSessionsToast.ts b/src/toasts/BulkUnverifiedSessionsToast.ts
new file mode 100644
index 0000000000..41717e0804
--- /dev/null
+++ b/src/toasts/BulkUnverifiedSessionsToast.ts
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../languageHandler';
+import dis from "../dispatcher/dispatcher";
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import DeviceListener from '../DeviceListener';
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const TOAST_KEY = "reviewsessions";
+
+export const showToast = (deviceIds: Set<string>) => {
+    const onAccept = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(deviceIds);
+
+        dis.dispatch({
+            action: 'view_user_info',
+            userId: MatrixClientPeg.get().getUserId(),
+        });
+    };
+
+    const onReject = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(deviceIds);
+    };
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Review where you’re logged in"),
+        icon: "verification_warning",
+        props: {
+            description: _t("Verify all your sessions to ensure your account & messages are safe"),
+            acceptLabel: _t("Review"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 50,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
new file mode 100644
index 0000000000..d35bbf1c88
--- /dev/null
+++ b/src/toasts/SetupEncryptionToast.ts
@@ -0,0 +1,106 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 * as sdk from "../index";
+import { _t } from "../languageHandler";
+import DeviceListener from "../DeviceListener";
+import SetupEncryptionDialog from "../components/views/dialogs/SetupEncryptionDialog";
+import { accessSecretStorage } from "../CrossSigningManager";
+import ToastStore from "../stores/ToastStore";
+import GenericToast from "../components/views/toasts/GenericToast";
+
+const TOAST_KEY = "setupencryption";
+
+const getTitle = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+            return _t("Set up encryption");
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Encryption upgrade available");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Verify this session");
+    }
+};
+
+const getSetupCaption = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+            return _t("Set up");
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Upgrade");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Verify");
+    }
+};
+
+const getDescription = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Verify yourself & others to keep your chats safe");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Other users may not trust it");
+    }
+};
+
+export enum Kind {
+    SET_UP_ENCRYPTION = "set_up_encryption",
+    UPGRADE_ENCRYPTION = "upgrade_encryption",
+    VERIFY_THIS_SESSION = "verify_this_session",
+}
+
+const onReject = () => {
+    DeviceListener.sharedInstance().dismissEncryptionSetup();
+};
+
+export const showToast = (kind: Kind) => {
+    const onAccept = async () => {
+        if (kind === Kind.VERIFY_THIS_SESSION) {
+            Modal.createTrackedDialog("Verify session", "Verify session", SetupEncryptionDialog,
+                {}, null, /* priority = */ false, /* static = */ true);
+        } else {
+            const Spinner = sdk.getComponent("elements.Spinner");
+            const modal = Modal.createDialog(
+                Spinner, null, "mx_Dialog_spinner", /* priority */ false, /* static */ true,
+            );
+            try {
+                await accessSecretStorage();
+            } finally {
+                modal.close();
+            }
+        }
+    };
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: getTitle(kind),
+        icon: "verification_warning",
+        props: {
+            description: getDescription(kind),
+            acceptLabel: getSetupCaption(kind),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: kind === Kind.VERIFY_THIS_SESSION ? 95 : 40,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
new file mode 100644
index 0000000000..635356b9db
--- /dev/null
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -0,0 +1,70 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from '../languageHandler';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import Modal from '../Modal';
+import DeviceListener from '../DeviceListener';
+import NewSessionReviewDialog from '../components/views/dialogs/NewSessionReviewDialog';
+import ToastStore from "../stores/ToastStore";
+import GenericToast from "../components/views/toasts/GenericToast";
+
+function toastKey(deviceId: string) {
+    return "unverified_session_" + deviceId;
+}
+
+export const showToast = (deviceId: string) => {
+    const cli = MatrixClientPeg.get();
+
+    const onAccept = () => {
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: cli.getUserId(),
+            device: cli.getStoredDevice(cli.getUserId(), deviceId),
+            onFinished: (r) => {
+                if (!r) {
+                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
+                    DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
+                }
+            },
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    const onReject = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
+    };
+
+    const device = cli.getStoredDevice(cli.getUserId(), deviceId);
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: toastKey(deviceId),
+        title: _t("New login. Was this you?"),
+        icon: "verification_warning",
+        props: {
+            description: _t(
+                "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()}),
+            acceptLabel: _t("Verify"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 80,
+    });
+};
+
+export const hideToast = (deviceId: string) => {
+    ToastStore.sharedInstance().dismissToast(deviceId);
+};

From a822ab49d5e9dbc2ead9d3a828b211bce3d4e053 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 13:40:30 +0100
Subject: [PATCH 3112/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 96ccf1589d..8ac05bf429 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -102,11 +102,6 @@
     "%(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",
-    "Verify this session": "Verify this session",
-    "Encryption upgrade available": "Encryption upgrade available",
-    "Set up encryption": "Set up encryption",
-    "Review where you’re logged in": "Review where you’re logged in",
-    "New login. Was this you?": "New login. Was this you?",
     "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",
@@ -396,6 +391,20 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "Review where you’re logged in": "Review where you’re logged in",
+    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
+    "Review": "Review",
+    "Later": "Later",
+    "Set up encryption": "Set up encryption",
+    "Encryption upgrade available": "Encryption upgrade available",
+    "Verify this session": "Verify this session",
+    "Set up": "Set up",
+    "Upgrade": "Upgrade",
+    "Verify": "Verify",
+    "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
+    "Other users may not trust it": "Other users may not trust it",
+    "New login. Was this you?": "New login. Was this you?",
+    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
     "There was an error joining the room": "There was an error joining the room",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -570,15 +579,6 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
-    "Later": "Later",
-    "Review": "Review",
-    "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
-    "Other users may not trust it": "Other users may not trust it",
-    "Set up": "Set up",
-    "Upgrade": "Upgrade",
-    "Verify": "Verify",
-    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",

From ac0d794877f4f2d2634087cfa57eecf1044ca83d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 13:49:56 +0100
Subject: [PATCH 3113/3235] Fix: Tag_DM is not defined

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 1e5002419d..e4290f87d9 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -44,6 +44,7 @@ import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTem
 import {DefaultTagID} from "../../../stores/room-list/models";
 import * as Unread from "../../../Unread";
 import RoomViewStore from "../../../stores/RoomViewStore";
+import {TAG_DM} from "../../../stores/RoomListStore";
 
 const HIDE_CONFERENCE_CHANS = true;
 const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;

From 762918d664e4b5ab6ac2e7e36eabb0b26b75e6a6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 22 May 2020 14:00:29 +0100
Subject: [PATCH 3114/3235] Prepare changelog for v2.6.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7901062b89..e5515f1015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [2.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.1) (2020-05-22)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0...v2.6.1)
+
+ * Fix key backup restore with SSSS
+   [\#4617](https://github.com/matrix-org/matrix-react-sdk/pull/4617)
+ * Remove SSSS key upgrade check from rageshake
+   [\#4616](https://github.com/matrix-org/matrix-react-sdk/pull/4616)
+
 Changes in [2.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0) (2020-05-19)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0-rc.1...v2.6.0)

From 5a4da13e863ed554323e00fc1783eaaa776c923e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 22 May 2020 14:00:29 +0100
Subject: [PATCH 3115/3235] v2.6.1

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

diff --git a/package.json b/package.json
index 28f3d1633c..6ceef02f24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From af59d3a09423153056864ebd16eb10626a7d2ab7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 22 May 2020 14:14:09 +0100
Subject: [PATCH 3116/3235] Reset matrix-js-sdk back to develop branch

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 6cdc771c5b..a97c093b87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5760,7 +5760,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "6.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"

From c464abaa498df44ea6d0366c64eec6be7afa4556 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 14:28:01 +0100
Subject: [PATCH 3117/3235] Iterate toast count indicator more logically

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ToastContainer.tsx | 14 +++++++++++---
 src/stores/ToastStore.ts                     | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 9440aa3463..c7b8e911d3 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from '../../languageHandler';
 import ToastStore, {IToast} from "../../stores/ToastStore";
 import classNames from "classnames";
 
 interface IState {
     toasts: IToast<any>[];
+    countSeen: number;
 }
 
 export default class ToastContainer extends React.Component<{}, IState> {
@@ -28,6 +28,7 @@ export default class ToastContainer extends React.Component<{}, IState> {
         super(props, context);
         this.state = {
             toasts: ToastStore.sharedInstance().getToasts(),
+            countSeen: 0,
         };
 
         // Start listening here rather than in componentDidMount because
@@ -42,7 +43,10 @@ export default class ToastContainer extends React.Component<{}, IState> {
     }
 
     _onToastStoreUpdate = () => {
-        this.setState({toasts: ToastStore.sharedInstance().getToasts()});
+        this.setState({
+            toasts: ToastStore.sharedInstance().getToasts(),
+            countSeen: ToastStore.sharedInstance().getCountSeen(),
+        });
     };
 
     render() {
@@ -56,7 +60,11 @@ export default class ToastContainer extends React.Component<{}, IState> {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
             });
-            const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
+
+            let countIndicator;
+            if (isStacked || this.state.countSeen > 0) {
+                countIndicator = ` (${this.state.countSeen + 1}/${this.state.countSeen + totalCount})`;
+            }
 
             const toastProps = Object.assign({}, props, {
                 key,
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 4f6d2963c5..b6b6f19872 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -32,6 +32,9 @@ export interface IToast<C extends keyof JSX.IntrinsicElements | JSXElementConstr
  */
 export default class ToastStore extends EventEmitter {
     private toasts: IToast<any>[] = [];
+    // The count of toasts which have been seen & dealt with in this stack
+    // where the count resets when the stack of toasts clears.
+    private countSeen: number = 0;
 
     static sharedInstance() {
         if (!window.mx_ToastStore) window.mx_ToastStore = new ToastStore();
@@ -40,6 +43,7 @@ export default class ToastStore extends EventEmitter {
 
     reset() {
         this.toasts = [];
+        this.countSeen = 0;
     }
 
     /**
@@ -67,6 +71,12 @@ export default class ToastStore extends EventEmitter {
         const length = this.toasts.length;
         this.toasts = this.toasts.filter(t => t.key !== key);
         if (length !== this.toasts.length) {
+            if (this.toasts.length === 0) {
+                this.countSeen = 0;
+            } else {
+                this.countSeen++;
+            }
+
             this.emit('update');
         }
     }
@@ -74,4 +84,8 @@ export default class ToastStore extends EventEmitter {
     getToasts() {
         return this.toasts;
     }
+
+    getCountSeen() {
+        return this.countSeen;
+    }
 }

From 4e67e46863877a50e040dced1447970daa967cc5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 14:29:30 +0100
Subject: [PATCH 3118/3235] fix countSeen

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/ToastContainer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index c7b8e911d3..c88c830d59 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -28,7 +28,7 @@ export default class ToastContainer extends React.Component<{}, IState> {
         super(props, context);
         this.state = {
             toasts: ToastStore.sharedInstance().getToasts(),
-            countSeen: 0,
+            countSeen: ToastStore.sharedInstance().getCountSeen(),
         };
 
         // Start listening here rather than in componentDidMount because

From 49c0748990b00be04520bfb85b2a79589b32cb34 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 14:32:41 +0100
Subject: [PATCH 3119/3235] delint and i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 1 -
 src/stores/ToastStore.ts    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ac05bf429..812ce826fc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2083,7 +2083,6 @@
     "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 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.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Guest": "Guest",
     "Your profile": "Your profile",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index b6b6f19872..89b4dc2dc1 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -34,7 +34,7 @@ export default class ToastStore extends EventEmitter {
     private toasts: IToast<any>[] = [];
     // The count of toasts which have been seen & dealt with in this stack
     // where the count resets when the stack of toasts clears.
-    private countSeen: number = 0;
+    private countSeen = 0;
 
     static sharedInstance() {
         if (!window.mx_ToastStore) window.mx_ToastStore = new ToastStore();

From 8a1ace43dac126f146b7fd468a746dca00135457 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Fri, 22 May 2020 13:52:01 +0000
Subject: [PATCH 3120/3235] Translated using Weblate (Galician)

Currently translated at 44.4% (1030 of 2322 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 48eb1338b4..b297f23fd6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1026,5 +1026,20 @@
     "Session already verified!": "A sesión xa está verificada!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "AVISO: xa está verificada a sesión, pero as chaves NON CONCORDAN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DAS CHAVES! A chave de firma para %(userId)s na sesión %(deviceId)s é \"%(fprint)s\" que non concordan coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as túas comunicacións foron interceptadas!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A chave de firma proporcionada concorda coa chave de firma recibida desde a sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada."
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A chave de firma proporcionada concorda coa chave de firma recibida desde a sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Se usas ou non a función 'breadcrumbs ' (avatares enriba da listaxe de salas)",
+    "Unbans user with given ID": "Desbloquea usuaria co ID dado",
+    "Verifies a user, session, and pubkey tuple": "Verifica unha usuaria, sesión e chave pública",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Forza que se descarte a sesión de saída actual nunha sala cifrada",
+    "Sends the given message coloured as a rainbow": "Envía a mensaxe dada colorida como o arco da vella",
+    "Sends the given emote coloured as a rainbow": "Envía o emoji colorido como un arco da vella",
+    "Displays list of commands with usages and descriptions": "Mostra unha listaxe de comandos con usos e descricións",
+    "Displays information about a user": "Mostra información acerca da usuaria",
+    "Send a bug report with logs": "Envía un informe de fallos con rexistros",
+    "Opens chat with the given user": "Abre unha conversa coa usuaria",
+    "Sends a message to the given user": "Envía unha mensaxe a usuaria",
+    "%(senderName)s made no change.": "%(senderName)s non fixo cambios.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambiou o nome da sala de %(oldRoomName)s a %(newRoomName)s.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizou esta sala.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón."
 }

From 24c379119644ece7dce72e1618cb4bdc45da7b31 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Fri, 22 May 2020 13:57:33 +0000
Subject: [PATCH 3121/3235] Translated using Weblate (Galician)

Currently translated at 44.4% (1030 of 2322 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index b297f23fd6..5b7dd05251 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1041,5 +1041,6 @@
     "%(senderName)s made no change.": "%(senderName)s non fixo cambios.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambiou o nome da sala de %(oldRoomName)s a %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizou esta sala.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón."
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s fixo que a sala sexa só por convite."
 }

From efb3dd2e25a390dfaba3825bb440b6daa18a85bd Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Fri, 22 May 2020 13:42:27 +0000
Subject: [PATCH 3122/3235] Translated using Weblate (Lithuanian)

Currently translated at 48.7% (1131 of 2322 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index c6f3abef0f..de8109913c 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1161,5 +1161,9 @@
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų sesijų ir nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, prisijunkite iš naujo kiekviename įrenginyje.",
     "Show more": "Rodyti daugiau",
     "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> į savo naują paskyrą.",
-    "Registration Successful": "Registracija sėkminga"
+    "Registration Successful": "Registracija sėkminga",
+    "Welcome to %(appName)s": "Sveiki prisijungę į %(appName)s",
+    "Liberate your communication": "Išlaisvinkite savo bendravimą",
+    "Explore Public Rooms": "Žvalgyti viešus kambarius",
+    "Create a Group Chat": "Sukurti grupės pokalbį"
 }

From 08fadb092c930cc25323bba29ec8f5979f4dd9e2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 21:43:15 +0100
Subject: [PATCH 3123/3235] Remove redundant component

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../settings/EnableNotificationsButton.js     | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 src/components/views/settings/EnableNotificationsButton.js

diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
deleted file mode 100644
index e4b348dfbd..0000000000
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ /dev/null
@@ -1,75 +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.
-*/
-
-import React from "react";
-import createReactClass from 'create-react-class';
-import Notifier from "../../../Notifier";
-import dis from "../../../dispatcher/dispatcher";
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    displayName: 'EnableNotificationsButton',
-
-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
-    },
-
-    componentWillUnmount: function() {
-        dis.unregister(this.dispatcherRef);
-    },
-
-    onAction: function(payload) {
-        if (payload.action !== "notifier_enabled") {
-            return;
-        }
-        this.forceUpdate();
-    },
-
-    enabled: function() {
-        return Notifier.isEnabled();
-    },
-
-    onClick: function() {
-        const self = this;
-        if (!Notifier.supportsDesktopNotifications()) {
-            return;
-        }
-        if (!Notifier.isEnabled()) {
-            Notifier.setEnabled(true, function() {
-                self.forceUpdate();
-            });
-        } else {
-            Notifier.setEnabled(false);
-        }
-        this.forceUpdate();
-    },
-
-    render: function() {
-        if (this.enabled()) {
-            return (
-                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    { _t("Disable Notifications") }
-                </button>
-            );
-        } else {
-            return (
-                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    { _t("Enable Notifications") }
-                </button>
-            );
-        }
-    },
-});

From a977b8c4ca12570919a1cf5deceaf71652648510 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 21:55:43 +0100
Subject: [PATCH 3124/3235] Fix lifecycle to reset things before it starts them

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Lifecycle.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 22c5d48317..5fb54ede7f 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -575,10 +575,12 @@ async function startMatrixClient(startSyncing=true) {
     // to work).
     dis.dispatch({action: 'will_start_client'}, true);
 
+    // reset things first just in case
+    TypingStore.sharedInstance().reset();
+    ToastStore.sharedInstance().reset();
+
     Notifier.start();
     UserActivity.sharedInstance().start();
-    TypingStore.sharedInstance().reset(); // just in case
-    ToastStore.sharedInstance().reset();
     DMRoomMap.makeShared().start();
     IntegrationManagers.sharedInstance().startWatching();
     ActiveWidgetStore.start();

From 3732d1f5a5d0ad2fe22c73db924d612651967c79 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 21:56:25 +0100
Subject: [PATCH 3125/3235] Migrate Desktop Notifications MatrixToolbar to a
 Toast

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.js                               | 15 +++---
 src/components/structures/LoggedInView.tsx    |  7 +--
 src/components/structures/MatrixChat.tsx      |  6 ---
 src/components/views/globals/MatrixToolbar.js | 45 -----------------
 src/toasts/DesktopNotificationsToast.ts       | 50 +++++++++++++++++++
 5 files changed, 60 insertions(+), 63 deletions(-)
 delete mode 100644 src/components/views/globals/MatrixToolbar.js
 create mode 100644 src/toasts/DesktopNotificationsToast.ts

diff --git a/src/Notifier.js b/src/Notifier.js
index 2ffa92452b..cc804904e2 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -26,6 +26,10 @@ import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import {
+    showToast as showNotificationsToast,
+    hideToast as hideNotificationsToast,
+} from "./toasts/DesktopNotificationsToast";
 
 /*
  * Dispatches:
@@ -184,6 +188,10 @@ const Notifier = {
         MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange);
         this.toolbarHidden = false;
         this.isSyncing = false;
+
+        if (this.shouldShowToolbar()) {
+            showNotificationsToast();
+        }
     },
 
     stop: function() {
@@ -278,12 +286,7 @@ const Notifier = {
 
         Analytics.trackEvent('Notifier', 'Set Toolbar Hidden', hidden);
 
-        // XXX: why are we dispatching this here?
-        // this is nothing to do with notifier_enabled
-        dis.dispatch({
-            action: "notifier_enabled",
-            value: this.isEnabled(),
-        });
+        hideNotificationsToast();
 
         // update the info to localStorage for persistent settings
         if (persistent && global.localStorage) {
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 148d10fe8d..0d3eda759e 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -68,7 +68,6 @@ interface IProps {
     showCookieBar: boolean;
     hasNewVersion: boolean;
     userHasGeneratedPassword: boolean;
-    showNotifierToolbar: boolean;
     page_type: string;
     autoJoin: boolean;
     thirdPartyInvite?: object;
@@ -184,8 +183,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         if (
             (prevProps.showCookieBar !== this.props.showCookieBar) ||
             (prevProps.hasNewVersion !== this.props.hasNewVersion) ||
-            (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword) ||
-            (prevProps.showNotifierToolbar !== this.props.showNotifierToolbar)
+            (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword)
         ) {
             this.props.resizeNotifier.notifyBannersChanged();
         }
@@ -599,7 +597,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
-        const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
         const CookieBar = sdk.getComponent('globals.CookieBar');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
@@ -680,8 +677,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             topBar = <UpdateCheckBar {...this.props.checkingForUpdate} />;
         } else if (this.state.userHasGeneratedPassword) {
             topBar = <PasswordNagBar />;
-        } else if (this.props.showNotifierToolbar) {
-            topBar = <MatrixToolbar />;
         }
 
         let bodyClasses = 'mx_MatrixChat';
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index e6a56c683f..120497e5ef 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -184,7 +184,6 @@ interface IState {
     hideToSRUsers: boolean;
     syncError?: Error;
     resizeNotifier: ResizeNotifier;
-    showNotifierToolbar: boolean;
     serverConfig?: ValidatedServerConfig;
     ready: boolean;
     thirdPartyInvite?: object;
@@ -238,7 +237,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
             syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
             resizeNotifier: new ResizeNotifier(),
-            showNotifierToolbar: false,
             ready: false,
         };
 
@@ -686,9 +684,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     dis.dispatch({action: 'view_my_groups'});
                 }
                 break;
-            case 'notifier_enabled':
-                this.setState({showNotifierToolbar: Notifier.shouldShowToolbar()});
-                break;
             case 'hide_left_panel':
                 this.setState({
                     collapseLhs: true,
@@ -1381,7 +1376,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             dis.dispatch({action: 'focus_composer'});
             this.setState({
                 ready: true,
-                showNotifierToolbar: Notifier.shouldShowToolbar(),
             });
         });
         cli.on('Call.incoming', function(call) {
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
deleted file mode 100644
index 758e4d62aa..0000000000
--- a/src/components/views/globals/MatrixToolbar.js
+++ /dev/null
@@ -1,45 +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.
-*/
-
-import React from 'react';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-import Notifier from '../../../Notifier';
-import AccessibleButton from '../../../components/views/elements/AccessibleButton';
-
-export default createReactClass({
-    displayName: 'MatrixToolbar',
-
-    hideToolbar: function() {
-        Notifier.setToolbarHidden(true);
-    },
-
-    onClick: function() {
-        Notifier.setEnabled(true);
-    },
-
-    render: function() {
-        return (
-            <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <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={require("../../../../res/img/cancel.svg")} width="18" height="18" alt={_t('Close')} /></AccessibleButton>
-            </div>
-        );
-    },
-});
diff --git a/src/toasts/DesktopNotificationsToast.ts b/src/toasts/DesktopNotificationsToast.ts
new file mode 100644
index 0000000000..02f0730759
--- /dev/null
+++ b/src/toasts/DesktopNotificationsToast.ts
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from "../languageHandler";
+import Notifier from "../Notifier";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    Notifier.setEnabled(true);
+};
+
+const onReject = () => {
+    Notifier.setToolbarHidden(true);
+};
+
+const TOAST_KEY = "desktopnotifications";
+
+export const showToast = () => {
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Notifications"),
+        props: {
+            description: _t("You are not receiving desktop notifications"),
+            acceptLabel: _t("Enable them now"),
+            onAccept,
+            rejectLabel: _t("Close"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 20,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};

From 89292ca47be3fc0a714024a708452452e9938ee6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:03:16 +0100
Subject: [PATCH 3126/3235] Fix toast priority sorting to put the highest
 priority into slot[0]

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/ToastStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 4f6d2963c5..23317a0ad3 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -55,7 +55,7 @@ export default class ToastStore extends EventEmitter {
         const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
             let newIndex = this.toasts.length;
-            while (newIndex > 0 && this.toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+            while (newIndex > 0 && this.toasts[newIndex - 1].priority < newToast.priority) --newIndex;
             this.toasts.splice(newIndex, 0, newToast);
         } else {
             this.toasts[oldIndex] = newToast;

From c91f8c2631799d92cc582dbe6eebcdec3e0a2cb4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:04:21 +0100
Subject: [PATCH 3127/3235] Migrate Analytics Banner to a Toast

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx |   9 --
 src/components/structures/MatrixChat.tsx   |  28 ++----
 src/components/views/globals/CookieBar.js  | 103 ---------------------
 src/i18n/strings/en_EN.json                |  14 +--
 src/toasts/AnalyticsToast.tsx              |  75 +++++++++++++++
 5 files changed, 92 insertions(+), 137 deletions(-)
 delete mode 100644 src/components/views/globals/CookieBar.js
 create mode 100644 src/toasts/AnalyticsToast.tsx

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 0d3eda759e..88b64f0cbc 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -65,7 +65,6 @@ interface IProps {
     initialEventPixelOffset: number;
     leftDisabled: boolean;
     rightDisabled: boolean;
-    showCookieBar: boolean;
     hasNewVersion: boolean;
     userHasGeneratedPassword: boolean;
     page_type: string;
@@ -181,7 +180,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     componentDidUpdate(prevProps, prevState) {
         // attempt to guess when a banner was opened or closed
         if (
-            (prevProps.showCookieBar !== this.props.showCookieBar) ||
             (prevProps.hasNewVersion !== this.props.hasNewVersion) ||
             (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword)
         ) {
@@ -597,7 +595,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
-        const CookieBar = sdk.getComponent('globals.CookieBar');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
         const PasswordNagBar = sdk.getComponent('globals.PasswordNagBar');
@@ -663,12 +660,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                 adminContact={usageLimitEvent.getContent().admin_contact}
                 limitType={usageLimitEvent.getContent().limit_type}
             />;
-        } else if (this.props.showCookieBar &&
-            this.props.config.piwik &&
-            navigator.doNotTrack !== "1"
-        ) {
-            const policyUrl = this.props.config.piwik.policyUrl || null;
-            topBar = <CookieBar policyUrl={policyUrl} />;
         } else if (this.props.hasNewVersion) {
             topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
                                     releaseNotes={this.props.newVersionReleaseNotes}
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 120497e5ef..c69911fe04 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -68,6 +68,10 @@ import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
 import { ViewUserPayload } from "../../dispatcher/payloads/ViewUserPayload";
 import { Action } from "../../dispatcher/actions";
+import {
+    showToast as showAnalyticsToast,
+    hideToast as hideAnalyticsToast
+} from "../../toasts/AnalyticsToast";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -174,7 +178,6 @@ interface IState {
     hasNewVersion: boolean;
     newVersionReleaseNotes?: string;
     checkingForUpdate?: string; // updateCheckStatusEnum
-    showCookieBar: boolean;
     // Parameters used in the registration dance with the IS
     register_client_secret?: string;
     register_session_id?: string;
@@ -231,8 +234,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             newVersionReleaseNotes: null,
             checkingForUpdate: null,
 
-            showCookieBar: false,
-
             hideToSRUsers: false,
 
             syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
@@ -337,12 +338,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         }
 
-        if (SettingsStore.getValue("showCookieBar")) {
-            this.setState({
-                showCookieBar: true,
-            });
-        }
-
         if (SettingsStore.getValue("analyticsOptIn")) {
             Analytics.enable();
         }
@@ -756,19 +751,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'accept_cookies':
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, true);
                 SettingsStore.setValue("showCookieBar", null, SettingLevel.DEVICE, false);
-
-                this.setState({
-                    showCookieBar: false,
-                });
+                hideAnalyticsToast();
                 Analytics.enable();
                 break;
             case 'reject_cookies':
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, false);
                 SettingsStore.setValue("showCookieBar", null, SettingLevel.DEVICE, false);
-
-                this.setState({
-                    showCookieBar: false,
-                });
+                hideAnalyticsToast();
                 break;
         }
     };
@@ -1246,6 +1235,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
 
         StorageManager.tryPersistStorage();
+
+        if (SettingsStore.getValue("showCookieBar") && this.props.config.piwik && navigator.doNotTrack !== "1") {
+            showAnalyticsToast(this.props.config.piwik && this.props.config.piwik.policyUrl);
+        }
     }
 
     private showScreenAfterLogin() {
@@ -2031,7 +2024,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         onCloseAllSettings={this.onCloseAllSettings}
                         onRegistered={this.onRegistered}
                         currentRoomId={this.state.currentRoomId}
-                        showCookieBar={this.state.showCookieBar}
                     />
                 );
             } else {
diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
deleted file mode 100644
index bf264686d0..0000000000
--- a/src/components/views/globals/CookieBar.js
+++ /dev/null
@@ -1,103 +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 dis from '../../../dispatcher/dispatcher';
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import Analytics from '../../../Analytics';
-
-export default class CookieBar extends React.Component {
-    static propTypes = {
-        policyUrl: PropTypes.string,
-    }
-
-    constructor() {
-        super();
-    }
-
-    onUsageDataClicked(e) {
-        e.stopPropagation();
-        e.preventDefault();
-        Analytics.showDetailsModal();
-    }
-
-    onAccept() {
-        dis.dispatch({
-            action: 'accept_cookies',
-        });
-    }
-
-    onReject() {
-        dis.dispatch({
-            action: 'reject_cookies',
-        });
-    }
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const toolbarClasses = "mx_MatrixToolbar";
-        return (
-            <div className={toolbarClasses}>
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <div className="mx_MatrixToolbar_content">
-                    { this.props.policyUrl ? _t(
-                        "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': (sub) => <a
-                                className="mx_MatrixToolbar_link"
-                                onClick={this.onUsageDataClicked}
-                            >
-                                { sub }
-                            </a>,
-                            // XXX: We need to link to the page that explains our cookies
-                            'PolicyLink': (sub) => <a
-                                    className="mx_MatrixToolbar_link"
-                                    target="_blank"
-                                    href={this.props.policyUrl}
-                                >
-                                    { sub }
-                                </a>
-                            ,
-                        },
-                    ) : _t(
-                        "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
-                        "This will use a cookie.",
-                        {},
-                        {
-                            'UsageDataLink': (sub) => <a
-                                className="mx_MatrixToolbar_link"
-                                onClick={this.onUsageDataClicked}
-                            >
-                                { sub }
-                            </a>,
-                        },
-                    ) }
-                </div>
-                <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
-                    { _t("Yes, I want to help!") }
-                </AccessibleButton>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
-                    <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" alt={_t('Close')} />
-                </AccessibleButton>
-            </div>
-        );
-    }
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ac05bf429..a79ee97109 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -391,10 +391,17 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "Notifications": "Notifications",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "I want to help",
+    "No": "No",
     "Review where you’re logged in": "Review where you’re logged in",
     "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
     "Review": "Review",
     "Later": "Later",
+    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+    "Enable them now": "Enable them now",
+    "Close": "Close",
     "Set up encryption": "Set up encryption",
     "Encryption upgrade available": "Encryption upgrade available",
     "Verify this session": "Verify this session",
@@ -643,8 +650,6 @@
     "Last seen": "Last seen",
     "Failed to set display name": "Failed to set display name",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Disable Notifications": "Disable Notifications",
-    "Enable Notifications": "Enable Notifications",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Securely cache encrypted messages locally for them to appear in search results, using ",
     " to store messages from ": " to store messages from ",
     "rooms.": "rooms.",
@@ -815,7 +820,6 @@
     "Ban list rules - %(roomName)s": "Ban list rules - %(roomName)s",
     "Server rules": "Server rules",
     "User rules": "User rules",
-    "Close": "Close",
     "You have not ignored anyone.": "You have not ignored anyone.",
     "You are currently ignoring:": "You are currently ignoring:",
     "You are not subscribed to any lists": "You are not subscribed to any lists",
@@ -836,7 +840,6 @@
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
     "Room ID or alias of ban list": "Room ID or alias of ban list",
     "Subscribe": "Subscribe",
-    "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
@@ -1287,7 +1290,6 @@
     "Verify by emoji": "Verify by emoji",
     "Almost there! Is your other session showing the same shield?": "Almost there! Is your other session showing the same shield?",
     "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
-    "No": "No",
     "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
@@ -1384,8 +1386,6 @@
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
     "Yes, I want to help!": "Yes, I want to help!",
-    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-    "Enable them now": "Enable them now",
     "What's New": "What's New",
     "Update": "Update",
     "What's new?": "What's new?",
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
new file mode 100644
index 0000000000..5b53a903fe
--- /dev/null
+++ b/src/toasts/AnalyticsToast.tsx
@@ -0,0 +1,75 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from "../languageHandler";
+import dis from "../dispatcher/dispatcher";
+import Analytics from "../Analytics";
+import AccessibleButton from "../components/views/elements/AccessibleButton";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    dis.dispatch({
+        action: 'accept_cookies',
+    });
+};
+
+const onReject = () => {
+    dis.dispatch({
+        action: "reject_cookies",
+    });
+};
+
+const onUsageDataClicked = () => {
+    Analytics.showDetailsModal();
+};
+
+const TOAST_KEY = "analytics";
+
+export const showToast = (policyUrl?: string) => {
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Notifications"),
+        props: {
+            description: _t(
+                "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. " +
+                "This will use a <PolicyLink>cookie</PolicyLink>.",
+                {},
+                {
+                    "UsageDataLink": (sub) => (
+                        <AccessibleButton kind="link" onClick={onUsageDataClicked}>{ sub }</AccessibleButton>
+                    ),
+                    // XXX: We need to link to the page that explains our cookies
+                    "PolicyLink": (sub) => policyUrl ? (
+                        <a target="_blank" href={policyUrl}>{ sub }</a>
+                    ) : sub,
+                },
+            ),
+            acceptLabel: _t("I want to help"),
+            onAccept,
+            rejectLabel: _t("No"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 10,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};

From 5d0040b8b36d1474db807748d1191844b424a569 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:15:22 +0100
Subject: [PATCH 3128/3235] Migrate Password Nag Bar Banner to a Toast

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx    | 22 ++++----
 .../views/globals/PasswordNagBar.js           | 53 -------------------
 src/toasts/SetPasswordToast.ts                | 47 ++++++++++++++++
 3 files changed, 58 insertions(+), 64 deletions(-)
 delete mode 100644 src/components/views/globals/PasswordNagBar.js
 create mode 100644 src/toasts/SetPasswordToast.ts

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 88b64f0cbc..131e6a3867 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -43,6 +43,11 @@ import ResizeNotifier from "../../utils/ResizeNotifier";
 import PlatformPeg from "../../PlatformPeg";
 import { RoomListStoreTempProxy } from "../../stores/room-list/RoomListStoreTempProxy";
 import { DefaultTagID } from "../../stores/room-list/models";
+import {
+    showToast as showSetPasswordToast,
+    hideToast as hideSetPasswordToast
+} from "../../toasts/SetPasswordToast";
+
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -66,7 +71,6 @@ interface IProps {
     leftDisabled: boolean;
     rightDisabled: boolean;
     hasNewVersion: boolean;
-    userHasGeneratedPassword: boolean;
     page_type: string;
     autoJoin: boolean;
     thirdPartyInvite?: object;
@@ -96,7 +100,6 @@ interface IState {
     syncErrorData: any;
     useCompactLayout: boolean;
     serverNoticeEvents: MatrixEvent[];
-    userHasGeneratedPassword: boolean;
 }
 
 /**
@@ -139,7 +142,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         this.state = {
             mouseDown: undefined,
             syncErrorData: undefined,
-            userHasGeneratedPassword: false,
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
             // any currently active server notice events
@@ -180,8 +182,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     componentDidUpdate(prevProps, prevState) {
         // attempt to guess when a banner was opened or closed
         if (
-            (prevProps.hasNewVersion !== this.props.hasNewVersion) ||
-            (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword)
+            (prevProps.hasNewVersion !== this.props.hasNewVersion)
         ) {
             this.props.resizeNotifier.notifyBannersChanged();
         }
@@ -216,9 +217,11 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     };
 
     _setStateFromSessionStore = () => {
-        this.setState({
-            userHasGeneratedPassword: Boolean(this._sessionStore.getCachedPassword()),
-        });
+        if (this._sessionStore.getCachedPassword()) {
+            showSetPasswordToast();
+        } else {
+            hideSetPasswordToast();
+        }
     };
 
     _createResizer() {
@@ -597,7 +600,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
-        const PasswordNagBar = sdk.getComponent('globals.PasswordNagBar');
         const ServerLimitBar = sdk.getComponent('globals.ServerLimitBar');
 
         let pageElement;
@@ -666,8 +668,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             />;
         } else if (this.props.checkingForUpdate) {
             topBar = <UpdateCheckBar {...this.props.checkingForUpdate} />;
-        } else if (this.state.userHasGeneratedPassword) {
-            topBar = <PasswordNagBar />;
         }
 
         let bodyClasses = 'mx_MatrixChat';
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
deleted file mode 100644
index 74735ca5ea..0000000000
--- a/src/components/views/globals/PasswordNagBar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-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.
-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 createReactClass from 'create-react-class';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    onUpdateClicked: function() {
-        const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
-        Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
-    },
-
-    render: function() {
-        const toolbarClasses = "mx_MatrixToolbar mx_MatrixToolbar_clickable";
-        return (
-            <div className={toolbarClasses} onClick={this.onUpdateClicked}>
-                <img className="mx_MatrixToolbar_warning"
-                    src={require("../../../../res/img/warning.svg")}
-                    width="24"
-                    height="23"
-                    alt=""
-                />
-                <div className="mx_MatrixToolbar_content">
-                    { _t(
-                        "To return to your account in future you need to <u>set a password</u>",
-                        {},
-                        { 'u': (sub) => <u>{ sub }</u> },
-                    ) }
-                </div>
-                <button className="mx_MatrixToolbar_action">
-                    { _t("Set Password") }
-                </button>
-            </div>
-        );
-    },
-});
diff --git a/src/toasts/SetPasswordToast.ts b/src/toasts/SetPasswordToast.ts
new file mode 100644
index 0000000000..88cc317978
--- /dev/null
+++ b/src/toasts/SetPasswordToast.ts
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from "../languageHandler";
+import Modal from "../Modal";
+import SetPasswordDialog from "../components/views/dialogs/SetPasswordDialog";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
+};
+
+const TOAST_KEY = "setpassword";
+
+export const showToast = () => {
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Set password"),
+        props: {
+            description: _t("To return to your account in future you need to set a password"),
+            acceptLabel: _t("Set Password"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject: hideToast, // it'll return on reload
+        },
+        component: GenericToast,
+        priority: 60,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};

From ccf9e6512341bb7395b1eba3841b0ce475379da5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:27:19 +0100
Subject: [PATCH 3129/3235] Migrate Server Limit Bar Banner to a Toast

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx    | 56 ++++++-----
 .../views/globals/ServerLimitBar.js           | 99 -------------------
 src/toasts/ServerLimitToast.tsx               | 50 ++++++++++
 3 files changed, 80 insertions(+), 125 deletions(-)
 delete mode 100644 src/components/views/globals/ServerLimitBar.js
 create mode 100644 src/toasts/ServerLimitToast.tsx

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 131e6a3867..edb2482aa3 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -47,6 +47,10 @@ import {
     showToast as showSetPasswordToast,
     hideToast as hideSetPasswordToast
 } from "../../toasts/SetPasswordToast";
+import {
+    showToast as showServerLimitToast,
+    hideToast as hideServerLimitToast
+} from "../../toasts/ServerLimitToast";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -99,7 +103,6 @@ interface IState {
     };
     syncErrorData: any;
     useCompactLayout: boolean;
-    serverNoticeEvents: MatrixEvent[];
 }
 
 /**
@@ -144,8 +147,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             syncErrorData: undefined,
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
-            // any currently active server notice events
-            serverNoticeEvents: [],
         };
 
         // stash the MatrixClient in case we log out before we are unmounted
@@ -293,6 +294,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
 
         if (oldSyncState === 'PREPARED' && syncState === 'SYNCING') {
             this._updateServerNoticeEvents();
+        } else {
+            this._calculateServerLimitToast(data);
         }
     };
 
@@ -303,11 +306,24 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         }
     };
 
+    _calculateServerLimitToast(syncErrorData, usageLimitEventContent?) {
+        const error = syncErrorData && syncErrorData.error && syncErrorData.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
+        if (error) {
+            usageLimitEventContent = syncErrorData.error.data;
+        }
+
+        if (usageLimitEventContent) {
+            showServerLimitToast(usageLimitEventContent.limit_type, usageLimitEventContent.admin_contact, error);
+        } else {
+            hideServerLimitToast();
+        }
+    }
+
     _updateServerNoticeEvents = async () => {
         const roomLists = RoomListStoreTempProxy.getRoomLists();
         if (!roomLists[DefaultTagID.ServerNotice]) return [];
 
-        const pinnedEvents = [];
+        const events = [];
         for (const room of roomLists[DefaultTagID.ServerNotice]) {
             const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
 
@@ -317,12 +333,18 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             for (const eventId of pinnedEventIds) {
                 const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId, 0);
                 const event = timeline.getEvents().find(ev => ev.getId() === eventId);
-                if (event) pinnedEvents.push(event);
+                if (event) events.push(event);
             }
         }
-        this.setState({
-            serverNoticeEvents: pinnedEvents,
+
+        const usageLimitEvent = events.find((e) => {
+            return (
+                e && e.getType() === 'm.room.message' &&
+                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
+            );
         });
+
+        this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEvent && usageLimitEvent.getContent());
     };
 
     _onPaste = (ev) => {
@@ -600,7 +622,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
-        const ServerLimitBar = sdk.getComponent('globals.ServerLimitBar');
 
         let pageElement;
 
@@ -644,25 +665,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                 break;
         }
 
-        const usageLimitEvent = this.state.serverNoticeEvents.find((e) => {
-            return (
-                e && e.getType() === 'm.room.message' &&
-                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
-            );
-        });
-
         let topBar;
-        if (this.state.syncErrorData && this.state.syncErrorData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
-            topBar = <ServerLimitBar kind='hard'
-                adminContact={this.state.syncErrorData.error.data.admin_contact}
-                limitType={this.state.syncErrorData.error.data.limit_type}
-            />;
-        } else if (usageLimitEvent) {
-            topBar = <ServerLimitBar kind='soft'
-                adminContact={usageLimitEvent.getContent().admin_contact}
-                limitType={usageLimitEvent.getContent().limit_type}
-            />;
-        } else if (this.props.hasNewVersion) {
+        if (this.props.hasNewVersion) {
             topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
                                     releaseNotes={this.props.newVersionReleaseNotes}
             />;
diff --git a/src/components/views/globals/ServerLimitBar.js b/src/components/views/globals/ServerLimitBar.js
deleted file mode 100644
index 7d414a2826..0000000000
--- a/src/components/views/globals/ServerLimitBar.js
+++ /dev/null
@@ -1,99 +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 createReactClass from 'create-react-class';
-import classNames from 'classnames';
-import { _td } from '../../../languageHandler';
-import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
-
-export default createReactClass({
-    propTypes: {
-        // 'hard' if the logged in user has been locked out, 'soft' if they haven't
-        kind: PropTypes.string,
-        adminContact: PropTypes.string,
-        // The type of limit that has been hit.
-        limitType: PropTypes.string.isRequired,
-    },
-
-    getDefaultProps: function() {
-        return {
-            kind: 'hard',
-        };
-    },
-
-    render: function() {
-        const toolbarClasses = {
-            'mx_MatrixToolbar': true,
-        };
-
-        let adminContact;
-        let limitError;
-        if (this.props.kind === 'hard') {
-            toolbarClasses['mx_MatrixToolbar_error'] = true;
-
-            adminContact = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    '': _td("Please <a>contact your service administrator</a> to continue using the service."),
-                },
-            );
-            limitError = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
-                    '': _td("This homeserver has exceeded one of its resource limits."),
-                },
-            );
-        } else {
-            toolbarClasses['mx_MatrixToolbar_info'] = true;
-            adminContact = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    '': _td("Please <a>contact your service administrator</a> to get this limit increased."),
-                },
-            );
-            limitError = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    'monthly_active_user': _td(
-                        "This homeserver has hit its Monthly Active User limit so " +
-                        "<b>some users will not be able to log in</b>.",
-                    ),
-                    '': _td(
-                        "This homeserver has exceeded one of its resource limits so " +
-                        "<b>some users will not be able to log in</b>.",
-                    ),
-                },
-                {'b': sub => <b>{sub}</b>},
-            );
-        }
-        return (
-            <div className={classNames(toolbarClasses)}>
-                <div className="mx_MatrixToolbar_content">
-                    {limitError}
-                    {' '}
-                    {adminContact}
-                </div>
-            </div>
-        );
-    },
-});
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
new file mode 100644
index 0000000000..f2de9e3499
--- /dev/null
+++ b/src/toasts/ServerLimitToast.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t, _td } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import {messageForResourceLimitError} from "../utils/ErrorUtils";
+
+const TOAST_KEY = "serverlimit";
+
+export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
+    const errorText = messageForResourceLimitError(limitType, adminContact, {
+        'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
+        '': _td("Your homeserver has exceeded one of its resource limits."),
+    });
+    const contactText = messageForResourceLimitError(limitType, adminContact, {
+        '': _td("Contact your <a>server admin</a>."),
+    });
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Notifications"),
+        props: {
+            description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
+            acceptLabel: _t("Ok"),
+            onAccept: hideToast,
+        },
+        component: GenericToast,
+        priority: 20,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};

From 29cfb47a83f5fc016f941a8387efb8f5a3e7463f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:29:09 +0100
Subject: [PATCH 3130/3235] fix copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/toasts/AnalyticsToast.tsx   | 2 +-
 src/toasts/ServerLimitToast.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index 5b53a903fe..b186a65d9d 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -44,7 +44,7 @@ const TOAST_KEY = "analytics";
 export const showToast = (policyUrl?: string) => {
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Notifications"),
+        title: _t("Help us improve Riot"),
         props: {
             description: _t(
                 "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. " +
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
index f2de9e3499..d35140be3d 100644
--- a/src/toasts/ServerLimitToast.tsx
+++ b/src/toasts/ServerLimitToast.tsx
@@ -34,14 +34,14 @@ export const showToast = (limitType: string, adminContact?: string, syncError?:
 
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Notifications"),
+        title: _t("Warning"),
         props: {
             description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
             acceptLabel: _t("Ok"),
             onAccept: hideToast,
         },
         component: GenericToast,
-        priority: 20,
+        priority: 70,
     });
 };
 

From 9f060d113259d3cf22d5e9ee4f6a98eb91c0d5d7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:34:32 +0100
Subject: [PATCH 3131/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a79ee97109..72c19587c8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -391,7 +391,7 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
-    "Notifications": "Notifications",
+    "Help us improve Riot": "Help us improve Riot",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve Riot. This will use a <PolicyLink>cookie</PolicyLink>.",
     "I want to help": "I want to help",
     "No": "No",
@@ -399,9 +399,18 @@
     "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
     "Review": "Review",
     "Later": "Later",
+    "Notifications": "Notifications",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",
     "Enable them now": "Enable them now",
     "Close": "Close",
+    "Your homeserver has exceeded its user limit.": "Your homeserver has exceeded its user limit.",
+    "Your homeserver has exceeded one of its resource limits.": "Your homeserver has exceeded one of its resource limits.",
+    "Contact your <a>server admin</a>.": "Contact your <a>server admin</a>.",
+    "Warning": "Warning",
+    "Ok": "Ok",
+    "Set password": "Set password",
+    "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
+    "Set Password": "Set Password",
     "Set up encryption": "Set up encryption",
     "Encryption upgrade available": "Encryption upgrade available",
     "Verify this session": "Verify this session",
@@ -781,7 +790,6 @@
     "Account management": "Account management",
     "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
     "Deactivate Account": "Deactivate Account",
-    "Warning": "Warning",
     "General": "General",
     "Discovery": "Discovery",
     "Deactivate account": "Deactivate account",
@@ -1383,18 +1391,10 @@
     "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
     "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
     "You're not currently a member of any communities.": "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>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
-    "Yes, I want to help!": "Yes, I want to help!",
     "What's New": "What's New",
     "Update": "Update",
     "What's new?": "What's new?",
     "A new version of Riot is available.": "A new version of Riot is available.",
-    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
-    "Set Password": "Set Password",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Please <a>contact your service administrator</a> to get this limit increased.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Checking for an update...": "Checking for an update...",
     "No update available.": "No update available.",

From 891ba1bbe3c34bf5651846d425c07d969fec7cb7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 23:08:45 +0100
Subject: [PATCH 3132/3235] Replace New Version Bar with a Toast

discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/globals/_MatrixToolbar.scss     |   4 -
 src/components/structures/LoggedInView.tsx    |  11 +-
 src/components/structures/MatrixChat.tsx      |  21 ----
 src/components/views/globals/NewVersionBar.js | 108 ------------------
 src/i18n/strings/en_EN.json                   |  10 +-
 src/toasts/UpdateToast.tsx                    |  90 +++++++++++++++
 6 files changed, 99 insertions(+), 145 deletions(-)
 delete mode 100644 src/components/views/globals/NewVersionBar.js
 create mode 100644 src/toasts/UpdateToast.tsx

diff --git a/res/css/views/globals/_MatrixToolbar.scss b/res/css/views/globals/_MatrixToolbar.scss
index 5fdf572f99..07b92a7235 100644
--- a/res/css/views/globals/_MatrixToolbar.scss
+++ b/res/css/views/globals/_MatrixToolbar.scss
@@ -67,7 +67,3 @@ limitations under the License.
 .mx_MatrixToolbar_action {
     margin-right: 16px;
 }
-
-.mx_MatrixToolbar_changelog {
-    white-space: pre;
-}
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index edb2482aa3..2a17233ec6 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -74,7 +74,6 @@ interface IProps {
     initialEventPixelOffset: number;
     leftDisabled: boolean;
     rightDisabled: boolean;
-    hasNewVersion: boolean;
     page_type: string;
     autoJoin: boolean;
     thirdPartyInvite?: object;
@@ -96,6 +95,7 @@ interface IProps {
     newVersion?: string;
     newVersionReleaseNotes?: string;
 }
+
 interface IState {
     mouseDown?: {
         x: number;
@@ -183,7 +183,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     componentDidUpdate(prevProps, prevState) {
         // attempt to guess when a banner was opened or closed
         if (
-            (prevProps.hasNewVersion !== this.props.hasNewVersion)
+            (prevProps.checkingForUpdate !== this.props.checkingForUpdate)
         ) {
             this.props.resizeNotifier.notifyBannersChanged();
         }
@@ -620,7 +620,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
-        const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
 
         let pageElement;
@@ -666,11 +665,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         }
 
         let topBar;
-        if (this.props.hasNewVersion) {
-            topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
-                                    releaseNotes={this.props.newVersionReleaseNotes}
-            />;
-        } else if (this.props.checkingForUpdate) {
+        if (this.props.checkingForUpdate) {
             topBar = <UpdateCheckBar {...this.props.checkingForUpdate} />;
         }
 
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index c69911fe04..f4d31708fe 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -173,10 +173,6 @@ interface IState {
     leftDisabled: boolean;
     middleDisabled: boolean;
     // the right panel's disabled state is tracked in its store.
-    version?: string;
-    newVersion?: string;
-    hasNewVersion: boolean;
-    newVersionReleaseNotes?: string;
     checkingForUpdate?: string; // updateCheckStatusEnum
     // Parameters used in the registration dance with the IS
     register_client_secret?: string;
@@ -230,7 +226,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             leftDisabled: false,
             middleDisabled: false,
 
-            hasNewVersion: false,
             newVersionReleaseNotes: null,
             checkingForUpdate: null,
 
@@ -726,12 +721,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'client_started':
                 this.onClientStarted();
                 break;
-            case 'new_version':
-                this.onVersion(
-                    payload.currentVersion, payload.newVersion,
-                    payload.releaseNotes,
-                );
-                break;
             case 'check_updates':
                 this.setState({ checkingForUpdate: payload.value });
                 break;
@@ -1820,16 +1809,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.showScreen("settings");
     };
 
-    onVersion(current: string, latest: string, releaseNotes?: string) {
-        this.setState({
-            version: current,
-            newVersion: latest,
-            hasNewVersion: current !== latest,
-            newVersionReleaseNotes: releaseNotes,
-            checkingForUpdate: null,
-        });
-    }
-
     onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
deleted file mode 100644
index dedccdc6b6..0000000000
--- a/src/components/views/globals/NewVersionBar.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-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 createReactClass from 'create-react-class';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import PlatformPeg from '../../../PlatformPeg';
-import { _t } from '../../../languageHandler';
-
-/**
- * Check a version string is compatible with the Changelog
- * dialog ([vectorversion]-react-[react-sdk-version]-js-[js-sdk-version])
- */
-function checkVersion(ver) {
-    const parts = ver.split('-');
-    return parts.length == 5 && parts[1] == 'react' && parts[3] == 'js';
-}
-
-export default createReactClass({
-    propTypes: {
-        version: PropTypes.string.isRequired,
-        newVersion: PropTypes.string.isRequired,
-        releaseNotes: PropTypes.string,
-    },
-
-    displayReleaseNotes: function(releaseNotes) {
-        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
-        Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
-            title: _t("What's New"),
-            description: <div className="mx_MatrixToolbar_changelog">{releaseNotes}</div>,
-            button: _t("Update"),
-            onFinished: (update) => {
-                if (update && PlatformPeg.get()) {
-                    PlatformPeg.get().installUpdate();
-                }
-            },
-        });
-    },
-
-    displayChangelog: function() {
-        const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
-        Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
-            version: this.props.version,
-            newVersion: this.props.newVersion,
-            onFinished: (update) => {
-                if (update && PlatformPeg.get()) {
-                    PlatformPeg.get().installUpdate();
-                }
-            },
-        });
-    },
-
-    onUpdateClicked: function() {
-        PlatformPeg.get().installUpdate();
-    },
-
-    render: function() {
-        let action_button;
-        // If we have release notes to display, we display them. Otherwise,
-        // we display the Changelog Dialog which takes two versions and
-        // automatically tells you what's changed (provided the versions
-        // are in the right format)
-        if (this.props.releaseNotes) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>
-                    { _t("What's new?") }
-                </button>
-            );
-        } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>
-                    { _t("What's new?") }
-                </button>
-            );
-        } else if (PlatformPeg.get()) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>
-                    { _t("Update") }
-                </button>
-            );
-        }
-        return (
-            <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <div className="mx_MatrixToolbar_content">
-                    {_t("A new version of Riot is available.")}
-                </div>
-                {action_button}
-            </div>
-        );
-    },
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 72c19587c8..0170aee17a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -421,6 +421,12 @@
     "Other users may not trust it": "Other users may not trust it",
     "New login. Was this you?": "New login. Was this you?",
     "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+    "What's New": "What's New",
+    "Update": "Update",
+    "What's new?": "What's new?",
+    "Restart": "Restart",
+    "Upgrade your Riot": "Upgrade your Riot",
+    "A new version of Riot is available!": "A new version of Riot is available!",
     "There was an error joining the room": "There was an error joining the room",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -1391,10 +1397,6 @@
     "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
     "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
     "You're not currently a member of any communities.": "You're not currently a member of any communities.",
-    "What's New": "What's New",
-    "Update": "Update",
-    "What's new?": "What's new?",
-    "A new version of Riot is available.": "A new version of Riot is available.",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Checking for an update...": "Checking for an update...",
     "No update available.": "No update available.",
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
new file mode 100644
index 0000000000..3d4b55a4ff
--- /dev/null
+++ b/src/toasts/UpdateToast.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { _t } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import QuestionDialog from "../components/views/dialogs/QuestionDialog";
+import ChangelogDialog from "../components/views/dialogs/ChangelogDialog";
+import PlatformPeg from "../PlatformPeg";
+import Modal from "../Modal";
+
+const TOAST_KEY = "update";
+
+/*
+ * Check a version string is compatible with the Changelog
+ * dialog ([riot-version]-react-[react-sdk-version]-js-[js-sdk-version])
+ */
+function checkVersion(ver) {
+    const parts = ver.split('-');
+    return parts.length === 5 && parts[1] === 'react' && parts[3] === 'js';
+}
+
+function installUpdate() {
+    PlatformPeg.get().installUpdate();
+}
+
+export const showToast = (version: string, newVersion: string, releaseNotes?: string) => {
+    let onAccept;
+    let acceptLabel = _t("What's new?");
+    if (releaseNotes) {
+        onAccept = () => {
+            Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
+                title: _t("What's New"),
+                description: <pre>{releaseNotes}</pre>,
+                button: _t("Update"),
+                onFinished: (update) => {
+                    if (update && PlatformPeg.get()) {
+                        PlatformPeg.get().installUpdate();
+                    }
+                },
+            });
+        };
+    } else if (checkVersion(version) && checkVersion(newVersion)) {
+        onAccept = () => {
+            Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
+                version,
+                newVersion,
+                onFinished: (update) => {
+                    if (update && PlatformPeg.get()) {
+                        PlatformPeg.get().installUpdate();
+                    }
+                },
+            });
+        };
+    } else {
+        onAccept = installUpdate;
+        acceptLabel = _t("Restart");
+    }
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Upgrade your Riot"),
+        props: {
+            description: _t("A new version of Riot is available!"),
+            acceptLabel,
+            onAccept,
+        },
+        component: GenericToast,
+        priority: 20,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};

From 41934268087fa0b9be828f1714eb4a5e3ab6f28a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 23:14:33 +0100
Subject: [PATCH 3133/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.tsx | 3 ---
 src/components/structures/MatrixChat.tsx   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 2a17233ec6..df21768da5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -91,9 +91,6 @@ interface IProps {
     currentUserId?: string;
     currentGroupId?: string;
     currentGroupIsNew?: boolean;
-    version?: string;
-    newVersion?: string;
-    newVersionReleaseNotes?: string;
 }
 
 interface IState {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f4d31708fe..e6db42af1d 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -226,7 +226,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             leftDisabled: false,
             middleDisabled: false,
 
-            newVersionReleaseNotes: null,
             checkingForUpdate: null,
 
             hideToSRUsers: false,

From 3d2b56aecd38ea399f2666b688c4007438384411 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 23:23:23 +0100
Subject: [PATCH 3134/3235] i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0170aee17a..97ada284b0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -421,9 +421,9 @@
     "Other users may not trust it": "Other users may not trust it",
     "New login. Was this you?": "New login. Was this you?",
     "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+    "What's new?": "What's new?",
     "What's New": "What's New",
     "Update": "Update",
-    "What's new?": "What's new?",
     "Restart": "Restart",
     "Upgrade your Riot": "Upgrade your Riot",
     "A new version of Riot is available!": "A new version of Riot is available!",

From a19e27d11c27c97d4a731720d8b636380865b72b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 May 2020 18:05:09 -0600
Subject: [PATCH 3135/3235] Calculate badges in the new room list more reliably

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

This uses a different way of calculating the badges by using about 6 less variables, and consolidating the remaining ones down.
---
 src/components/views/rooms/RoomTile2.tsx | 109 +++++++++++++++--------
 1 file changed, 72 insertions(+), 37 deletions(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 42b65cba87..e23b17a726 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -39,6 +39,14 @@ import * as FormattingUtils from "../../../utils/FormattingUtils";
  * warning disappears.                                             *
  *******************************************************************/
 
+enum NotificationColor {
+    // Inverted (None -> Red) because we do integer comparisons on this
+    None, // nothing special
+    Bold, // no badge, show as unread
+    Grey, // unread notified messages
+    Red,  // unread pings
+}
+
 interface IProps {
     room: Room;
 
@@ -47,16 +55,14 @@ interface IProps {
     // TODO: Incoming call boxes?
 }
 
-interface IBadgeState {
-    showBadge: boolean; // if numUnread > 0 && !showBadge -> bold room
-    numUnread: number; // used only if showBadge or showBadgeHighlight is true
-    hasUnread: number; // used to make the room bold
-    showBadgeHighlight: boolean; // make the badge red
-    isInvite: boolean; // show a `!` instead of a number
+interface INotificationState {
+    symbol: string;
+    color: NotificationColor;
 }
 
-interface IState extends IBadgeState {
+interface IState {
     hover: boolean;
+    notificationState: INotificationState;
 }
 
 export default class RoomTile2 extends React.Component<IProps, IState> {
@@ -78,8 +84,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         this.state = {
             hover: false,
-
-            ...this.getBadgeState(),
+            notificationState: this.getNotificationState(),
         };
     }
 
@@ -87,28 +92,57 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         // TODO: Listen for changes to the badge count and update as needed
     }
 
-    private updateBadgeCount() {
-        this.setState({...this.getBadgeState()});
+    // XXX: This is a bit of an awful-looking hack. We should probably be using state for
+    // this, but instead we're kinda forced to either duplicate the code or thread a variable
+    // through the code paths. This feels like the least evil
+    private get roomIsInvite(): boolean {
+        return getEffectiveMembership(this.props.room.getMyMembership()) === EffectiveMembership.Invite;
     }
 
-    private getBadgeState(): IBadgeState {
-        // TODO: Make this code path faster
-        const highlightCount = RoomNotifs.getUnreadNotificationCount(this.props.room, 'highlight');
-        const numUnread = RoomNotifs.getUnreadNotificationCount(this.props.room);
-        const showBadge = Unread.doesRoomHaveUnreadMessages(this.props.room);
-        const myMembership = getEffectiveMembership(this.props.room.getMyMembership());
-        const isInvite = myMembership === EffectiveMembership.Invite;
-        const notifState = RoomNotifs.getRoomNotifsState(this.props.room.roomId);
-        const shouldShowNotifBadge = RoomNotifs.shouldShowNotifBadge(notifState);
-        const shouldShowHighlightBadge = RoomNotifs.shouldShowMentionBadge(notifState);
+    private updateNotificationState() {
+        this.setState({notificationState: this.getNotificationState()});
+    }
 
-        return {
-            showBadge: (showBadge && shouldShowNotifBadge) || isInvite,
-            numUnread,
-            hasUnread: showBadge,
-            showBadgeHighlight: (highlightCount > 0 && shouldShowHighlightBadge) || isInvite,
-            isInvite,
+    private getNotificationState(): INotificationState {
+        const state: INotificationState = {
+            color: NotificationColor.None,
+            symbol: null,
         };
+
+        if (this.roomIsInvite) {
+            state.color = NotificationColor.Red;
+            state.symbol = "!";
+        } else {
+            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.props.room, 'highlight');
+            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.props.room, 'total');
+
+            // For a 'true count' we pick the grey notifications first because they include the
+            // red notifications. If we don't have a grey count for some reason we use the red
+            // count. If that count is broken for some reason, assume zero. This avoids us showing
+            // a badge for 'NaN' (which formats as 'NaNB' for NaN Billion).
+            const trueCount = greyNotifs ? greyNotifs : (redNotifs ? redNotifs : 0);
+
+            // Note: we only set the symbol if we have an actual count. We don't want to show
+            // zero on badges.
+
+            if (redNotifs > 0) {
+                state.color = NotificationColor.Red;
+                state.symbol = FormattingUtils.formatCount(trueCount);
+            } else if (greyNotifs > 0) {
+                state.color = NotificationColor.Grey;
+                state.symbol = FormattingUtils.formatCount(trueCount);
+            } else {
+                // We don't have any notified messages, but we might have unread messages. Let's
+                // find out.
+                const hasUnread = Unread.doesRoomHaveUnreadMessages(this.props.room);
+                if (hasUnread) {
+                    state.color = NotificationColor.Bold;
+                    // no symbol for this state
+                }
+            }
+        }
+
+        return state;
     }
 
     private onTileMouseEnter = () => {
@@ -135,15 +169,17 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         // TODO: a11y proper
         // TODO: Render more than bare minimum
 
+        const hasBadge = this.state.notificationState.color > NotificationColor.Bold;
+        const isUnread = this.state.notificationState.color > NotificationColor.None;
         const classes = classNames({
             'mx_RoomTile': true,
             // 'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile_unread': this.state.numUnread > 0 || this.state.hasUnread,
-            'mx_RoomTile_unreadNotify': this.state.showBadge,
-            'mx_RoomTile_highlight': this.state.showBadgeHighlight,
-            'mx_RoomTile_invited': this.state.isInvite,
+            'mx_RoomTile_unread': isUnread,
+            'mx_RoomTile_unreadNotify': this.state.notificationState.color >= NotificationColor.Grey,
+            'mx_RoomTile_highlight': this.state.notificationState.color >= NotificationColor.Red,
+            'mx_RoomTile_invited': this.roomIsInvite,
             // 'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile_noBadges': !this.state.showBadge,
+            'mx_RoomTile_noBadges': !hasBadge,
             // 'mx_RoomTile_transparent': this.props.transparent,
             // 'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
         });
@@ -154,13 +190,12 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
 
         let badge;
-        if (this.state.showBadge) {
+        if (hasBadge) {
             const badgeClasses = classNames({
                 'mx_RoomTile_badge': true,
                 'mx_RoomTile_badgeButton': false, // this.state.badgeHover || isMenuDisplayed
             });
-            const formattedCount = this.state.isInvite ? `!` : FormattingUtils.formatCount(this.state.numUnread);
-            badge = <div className={badgeClasses}>{formattedCount}</div>;
+            badge = <div className={badgeClasses}>{this.state.notificationState.symbol}</div>;
         }
 
         // TODO: the original RoomTile uses state for the room name. Do we need to?
@@ -170,8 +205,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         const nameClasses = classNames({
             'mx_RoomTile_name': true,
-            'mx_RoomTile_invite': this.state.isInvite,
-            'mx_RoomTile_badgeShown': this.state.showBadge,
+            'mx_RoomTile_invite': this.roomIsInvite,
+            'mx_RoomTile_badgeShown': hasBadge,
         });
 
         // TODO: Support collapsed state properly

From 3a3ddbf7c418d0af9dde13a2a7b1617df65ff945 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 May 2020 18:10:30 -0600
Subject: [PATCH 3136/3235] Add missing documentation

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

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index e23b17a726..8b1beee713 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -94,11 +94,12 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
     // XXX: This is a bit of an awful-looking hack. We should probably be using state for
     // this, but instead we're kinda forced to either duplicate the code or thread a variable
-    // through the code paths. This feels like the least evil
+    // through the code paths. This feels like the least evil option.
     private get roomIsInvite(): boolean {
         return getEffectiveMembership(this.props.room.getMyMembership()) === EffectiveMembership.Invite;
     }
 
+    // TODO: Make use of this function when the notification state needs updating.
     private updateNotificationState() {
         this.setState({notificationState: this.getNotificationState()});
     }

From fe03d02cf62b4656a47635dce28af58ef01f091d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 May 2020 08:43:15 +0100
Subject: [PATCH 3137/3235] Fix reacting to redactions

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/utils/EventUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index ac7ac8c9ec..6558a11ed4 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -31,7 +31,7 @@ export function isContentActionable(mxEvent) {
     // status is SENT before remote-echo, null after
     const isSent = !eventStatus || eventStatus === EventStatus.SENT;
 
-    if (isSent) {
+    if (isSent && !mxEvent.isRedacted()) {
         if (mxEvent.getType() === 'm.room.message') {
             const content = mxEvent.getContent();
             if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {

From d29ba5b597db302a457bea0574603d93474c842d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 23 May 2020 09:02:35 +0100
Subject: [PATCH 3138/3235] fix priority sorting to highest first

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/ToastStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 4f6d2963c5..23317a0ad3 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -55,7 +55,7 @@ export default class ToastStore extends EventEmitter {
         const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
             let newIndex = this.toasts.length;
-            while (newIndex > 0 && this.toasts[newIndex - 1].priority > newToast.priority) --newIndex;
+            while (newIndex > 0 && this.toasts[newIndex - 1].priority < newToast.priority) --newIndex;
             this.toasts.splice(newIndex, 0, newToast);
         } else {
             this.toasts[oldIndex] = newToast;

From 6a48b548897f2bca8925575e9e911209d06b1c8b Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 22 May 2020 14:08:58 +0000
Subject: [PATCH 3139/3235] Translated using Weblate (Basque)

Currently translated at 100.0% (2322 of 2322 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 | 44 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 6548ea33d1..6624fa99bb 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -783,7 +783,7 @@
     "Explore Account Data": "Miatu kontuaren datuak",
     "All messages (noisy)": "Mezu guztiak (ozen)",
     "Saturday": "Larunbata",
-    "I understand the risks and wish to continue": "Arriskua ulertzen dut eta jarraitu nahi dut",
+    "I understand the risks and wish to continue": "Arriskuak ulertzen ditut eta jarraitu nahi dut",
     "Direct Chat": "Txat zuzena",
     "The server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Reject": "Baztertu",
@@ -2385,5 +2385,45 @@
     "Please enter your recovery passphrase a second time to confirm.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
     "Repeat your recovery passphrase...": "Errepikatu zure berreskuratze pasa-esaldia...",
     "Secure your backup with a recovery passphrase": "Babestu zure babeskopia berreskuratze pasa-esaldi batekin",
-    "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s",
+    "Review where you’re logged in": "Berrikusi non hasi duzun saioa",
+    "New login. Was this you?": "Saio berria. Zu izan zara?",
+    "Opens chat with the given user": "Erabiltzailearekin txata irekitzen du",
+    "Sends a message to the given user": "Erabiltzaileari mezua bidaltzen dio",
+    "You signed in to a new session without verifying it:": "Saio berria hasi duzu hau egiaztatu gabe:",
+    "Verify your other session using one of the options below.": "Egiaztatu zure beste saioa beheko aukeretako batekin.",
+    "Font scaling": "Letren eskalatzea",
+    "Use the improved room list (in development - refresh to apply changes)": "Erabili gelen zerrenda hobetua (garapenean, freskatu aldaketak aplikatzedko)",
+    "Use IRC layout": "Erabili IRC diseinua",
+    "Font size": "Letra-tamaina",
+    "Custom font size": "Letra-tamaina pertsonalizatua",
+    "IRC display name width": "IRC-ko pantaila izenaren zabalera",
+    "Waiting for your other session to verify…": "Zure beste saioak egiaztatu bitartean zain…",
+    "Verify all your sessions to ensure your account & messages are safe": "Egiaztatu zure saio guztiak kontua eta mezuak seguru daudela bermatzeko",
+    "Verify the new login accessing your account: %(name)s": "Egiaztatu zure kontuan hasitako saio berria: %(name)s",
+    "Size must be a number": "Tamaina zenbaki bat izan behar da",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Letra tamaina pertsonalizatua %(min)s pt eta %(max)s pt bitartean egon behar du",
+    "Use between %(min)s pt and %(max)s pt": "Erabili %(min)s pt eta %(max)s pt bitarteko  balioa",
+    "Appearance": "Itxura",
+    "Where you’re logged in": "Non hasi duzun saioa",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Kudeatu azpiko saioen izenak eta hauek amaitu edo <a>egiaztatu zure erabiltzaile-profilean</a>.",
+    "Create room": "Sortu gela",
+    "You've successfully verified your device!": "Ongi egiaztatu duzu zure gailua!",
+    "Message deleted": "Mezu ezabatuta",
+    "Message deleted by %(name)s": "Mezua ezabatu du %(name)s erabiltzaileak",
+    "QR Code": "QR kodea",
+    "To continue, use Single Sign On to prove your identity.": "Jarraitzeko, erabili Single Sign On zure identitatea frogatzeko.",
+    "Confirm to continue": "Berretsi jarraitzeko",
+    "Click the button below to confirm your identity.": "Sakatu azpiko botoia zure identitatea frogatzeko.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Gonbidatu norbait bere izena, erabiltzaile izena (esaterako <userId/>), e-mail helbidea erabiliz, edo <a>partekatu gela hau</a>.",
+    "Restoring keys from backup": "Gakoak babes-kopiatik berrezartzen",
+    "Fetching keys from server...": "Gakoak zerbitzaritik eskuratzen...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s gako berreskuratuta",
+    "Keys restored": "Gakoak berreskuratuta",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s gako ongi berreskuratuta",
+    "Confirm encryption setup": "Berretsi zifratze ezarpena",
+    "Click the button below to confirm setting up encryption.": "Sakatu azpiko botoia zifratze-ezarpena berresteko.",
+    "Dismiss read marker and jump to bottom": "Baztertu irakurtze-marka eta jauzi beheraino",
+    "Jump to oldest unread message": "Jauzi irakurri gabeko mezu zaharrenera",
+    "Upload a file": "Igo fitxategia"
 }

From 020a1841c711f310c260b595f22485fe41f88843 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sat, 23 May 2020 05:16:28 +0000
Subject: [PATCH 3140/3235] Translated using Weblate (Bulgarian)

Currently translated at 94.6% (2196 of 2322 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 | 56 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 347823f95c..186fb7c6db 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2211,5 +2211,59 @@
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Поканете някой посредством име, потребителско име (като <userId/>), имейл адрес или като <a>споделите тази стая</a>.",
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "Добавихте нова сесия '%(displayName)s', която изисква ключове за шифроване.",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Непотвърдената ви сесия '%(displayName)s' изисква ключове за шифроване.",
-    "Loading session info...": "Зареждане на информация за сесията..."
+    "Loading session info...": "Зареждане на информация за сесията...",
+    "Opens chat with the given user": "Отваря чат с дадения потребител",
+    "Sends a message to the given user": "Изпраща съобщение до дадения потребител",
+    "Font scaling": "Мащабиране на шрифта",
+    "Use the improved room list (in development - refresh to apply changes)": "Използвай подобрения списък със стаи (в процес на разработка - презаредете за да приложите промените)",
+    "Use IRC layout": "Използвай IRC изглед",
+    "Font size": "Размер на шрифта",
+    "Custom font size": "Собствен размер на шрифта",
+    "IRC display name width": "Ширина на IRC името",
+    "Waiting for your other session to verify…": "Изчакване другата сесията да потвърди…",
+    "Size must be a number": "Размера трябва да е число",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Собствения размер на шрифта може да бъде единствено между %(min)s pt и %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Изберете между %(min)s pt и %(max)s pt",
+    "Appearance": "Изглед",
+    "Create room": "Създай стая",
+    "You've successfully verified your device!": "Успешно потвърдихте устройството си!",
+    "Message deleted": "Съобщението беше изтрито",
+    "Message deleted by %(name)s": "Съобщението беше изтрито от %(name)s",
+    "QR Code": "QR код",
+    "To continue, use Single Sign On to prove your identity.": "За да продължите, използвайте Single Sign On за да потвърдите самоличността си.",
+    "Confirm to continue": "Потвърдете за да продължите",
+    "Click the button below to confirm your identity.": "Кликнете бутона по-долу за да потвърдите самоличността си.",
+    "a new master key signature": "нов подпис на основния ключ",
+    "a new cross-signing key signature": "нов подпис на ключа за кръстосано-подписване",
+    "a device cross-signing signature": "подпис за кръстосано-подписване на устройства",
+    "a key signature": "подпис на ключ",
+    "Riot encountered an error during upload of:": "Riot срещна проблем при качването на:",
+    "Upload completed": "Качването завърши",
+    "Cancelled signature upload": "Отказано качване на подпис",
+    "Unable to upload": "Неуспешно качване",
+    "Signature upload success": "Успешно качване на подпис",
+    "Signature upload failed": "Неуспешно качване на подпис",
+    "Confirm by comparing the following with the User Settings in your other session:": "Потвърдете чрез сравняване на следното с Потребителски Настройки в другата ви сесия:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Потвърдете сесията на този потребител чрез сравняване на следното с техните Потребителски Настройки:",
+    "If they don't match, the security of your communication may be compromised.": "Ако няма съвпадение, сигурността на комуникацията ви може би е компрометирана.",
+    "Your account is not secure": "Профилът ви не е защитен",
+    "Your password": "Паролата ви",
+    "This session, or the other session": "Тази сесия или другата сесия",
+    "The internet connection either session is using": "Интернет връзката, която сесиите използват",
+    "We recommend you change your password and recovery key in Settings immediately": "Препоръчваме веднага да промените паролата и ключа за възстановяване от Настройки",
+    "New session": "Нова сесия",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Използвайте тази сесия за да потвърдите новата, давайки й достъп до шифрованите съобщения:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Ако не сте се вписвали в тази сесия, профила ви може би е бил компрометиран.",
+    "This wasn't me": "Не бях аз",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Това ще ви позволи да се върнете в профила си след излизането от него, както и да влизате от други сесии.",
+    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "В момента блокирате непотвърдени сесии; за да изпратите съобщения до тях ще трябва да ги потвърдите.",
+    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Препоръчваме да минете през процеса на потвърждение за всяка една сесия и да проверите дали принадлежи на собственика си, но ако желаете, може да изпратите съобщението и без потвърждение.",
+    "Room contains unknown sessions": "Стаята съдържа непознати сесии",
+    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" съдържа сесии, които не сте виждали досега.",
+    "Unknown sessions": "Непознати сесии",
+    "Verify other session": "Потвърди другата сесия",
+    "Enter recovery passphrase": "Въведете парола за възстановяване",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Неуспешен достъп до секретното складиране. Потвърдете, че сте въвели правилната парола за възстановяване.",
+    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Внимание</b>: трябва да правите това само от доверен компютър.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Въведете паролата си за възстановяване за да достъпите защитената история на съобщенията и самоличността си за кръстосано-подписване за потвърждаване на другите сесии."
 }

From e751b789aa533912db22ba4701c108d5d1880853 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 23 May 2020 00:42:05 +0000
Subject: [PATCH 3141/3235] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2322 of 2322 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 7c55826005..9495c01db7 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2444,5 +2444,6 @@
     "Size must be a number": "大小必須為數字",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "自訂字型大小僅能為 %(min)s 點至 %(max)s 點間",
     "Use between %(min)s pt and %(max)s pt": "使用 %(min)s 點至 %(max)s 點間",
-    "Appearance": "外觀"
+    "Appearance": "外觀",
+    "Use the improved room list (in development - refresh to apply changes)": "使用改進的聊天室清單（開發中 - 重新整理以套用變更）"
 }

From 77910d2d54e15d318c26c68297c81e9ff01edd43 Mon Sep 17 00:00:00 2001
From: Tuomas Hietala <tuomas.hietala@iki.fi>
Date: Fri, 22 May 2020 17:04:51 +0000
Subject: [PATCH 3142/3235] Translated using Weblate (Finnish)

Currently translated at 94.5% (2195 of 2322 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index bf2566990c..05bf538ff9 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -421,7 +421,7 @@
     "Invite new community members": "Kutsu uusia jäseniä yhteisöön",
     "Invite to Community": "Kutsu yhteisöön",
     "Which rooms would you like to add to this community?": "Mitkä huoneet haluaisit lisätä tähän yhteisöön?",
-    "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huonelistassa?",
+    "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huoneluettelossa?",
     "Add rooms to the community": "Lisää huoneita tähän yhteisöön",
     "Room name or alias": "Huoneen nimi tai alias",
     "Add to community": "Lisää yhteisöön",
@@ -1343,7 +1343,7 @@
     "Deny": "Kiellä",
     "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.": "Tunnistimme dataa, joka on lähtöisin vanhasta Riotin versiosta. Tämä aiheuttaa toimintahäiriöitä osapuolten välisessä salauksessa vanhassa versiossa. Viestejä, jotka on salattu osapuolten välisellä salauksella vanhalla versiolla, ei välttämättä voida purkaa tällä versiolla. Tämä voi myös aiheuttaa epäonnistumisia viestien välityksessä tämän version kanssa. Jos kohtaat ongelmia, kirjaudu ulos ja takaisin sisään. Säilyttääksesi viestihistoriasi, vie salausavaimesi ja tuo ne uudelleen.",
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot epäonnistui protokollalistan hakemisessa kotipalvelimelta. Kotipalvelin saattaa olla liian vanha tukeakseen kolmannen osapuolen verkkoja.",
-    "Riot failed to get the public room list.": "Riot epäonnistui julkisen huonelistan haussa.",
+    "Riot failed to get the public room list.": "Riot ei onnistunut hakemaan julkista huoneluetteloa.",
     "The homeserver may be unavailable or overloaded.": "Kotipalvelin saattaa olla saavuttamattomissa tai ylikuormitettuna.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Sinulla on %(count)s lukematonta ilmoitusta huoneen edellisessä versiossa.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sinulla on %(count)s lukematon ilmoitus huoneen edellisessä versiossa.",
@@ -1374,7 +1374,7 @@
     "Set up Secure Messages": "Ota käyttöön salatut viestit",
     "Recovery Method Removed": "Palautustapa poistettu",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jos et poistanut palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Käytätkö 'leivänmuruja' (kuvia huonelistan yläpuolella) vai et",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Käytätkö 'leivänmuruja' (kuvia huoneluettelon yläpuolella) vai et",
     "Replying With Files": "Tiedostoilla vastaaminen",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Tiedostolla vastaaminen ei onnistu tällä erää. Haluatko ladata tiedoston vastaamatta?",
     "The file '%(fileName)s' failed to upload.": "Tiedoston '%(fileName)s' lataaminen ei onnistunut.",
@@ -2033,7 +2033,7 @@
     "Support adding custom themes": "Tue mukaututettujen teemojen lisäämistä",
     "Enable cross-signing to verify per-user instead of per-session (in development)": "Ota ristivarmennus käyttöön varmentaaksesi käyttäjät istuntojen sijaan (kehitysversio)",
     "Show rooms with unread notifications first": "Näytä ensin huoneet, joissa on lukemattomia viestejä",
-    "Show shortcuts to recently viewed rooms above the room list": "Näytä oikotiet viimeiseksi katsottuihin huoneisiin huonelistan yläpuolella",
+    "Show shortcuts to recently viewed rooms above the room list": "Näytä oikotiet viimeiseksi katsottuihin huoneisiin huoneluettelon yläpuolella",
     "Enable message search in encrypted rooms": "Ota viestihaku salausta käyttävissä huoneissa käyttöön",
     "Keep secret storage passphrase in memory for this session": "Pidä salavaraston salalause muistissa tämän istunnon ajan",
     "How fast should messages be downloaded.": "Kuinka nopeasti viestit pitäisi ladata.",
@@ -2264,5 +2264,17 @@
     "You've successfully verified your device!": "Olet onnistuneesti varmentanut laitteesi!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Olet onnistuneesti varmentanut laitteen %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "Olet varmentanut käyttäjän %(displayName)s!",
-    "Verified": "Varmennettu"
+    "Verified": "Varmennettu",
+    "Font size": "Fonttikoko",
+    "Custom font size": "Mukautettu fonttikoko",
+    "Size must be a number": "Koon täytyy olla luku",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Mukautetun fonttikoon täytyy olla vähintään %(min)s pt ja enintään %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Käytä kokoa väliltä %(min)s pt ja %(max)s pt",
+    "Appearance": "Ulkoasu",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Et voi poistaa tätä käytöstä jatkossa. Sillat ja useimmat botit eivät vielä toimi.",
+    "Navigate up/down in the room list": "Siirry huoneluettelossa ylöspäin/alaspäin",
+    "Select room from the room list": "Valitse huone huoneluettelosta",
+    "Previous/next unread room or DM": "Edellinen/seuraava lukematon huone tai yksityisviesti",
+    "Previous/next room or DM": "Edellinen/seuraava huone tai yksityisviesti",
+    "Toggle this dialog": "Tämä valintaikkuna päälle/pois"
 }

From 9dcfe6db6a1bc8418bcdbb61d8d45f889c519eaa Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Fri, 22 May 2020 13:57:50 +0000
Subject: [PATCH 3143/3235] Translated using Weblate (Galician)

Currently translated at 46.2% (1073 of 2322 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 5b7dd05251..99d68ca943 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -264,8 +264,8 @@
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s",
     "No rooms to show": "Sen salas que mostrar",
     "Unnamed room": "Sala sen nome",
-    "World readable": "Visible por todos",
-    "Guests can join": "Convidados pódense unir",
+    "World readable": "Visible para todas",
+    "Guests can join": "Convidadas pódense unir",
     "Save": "Gardar",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
     "(~%(count)s results)|one": "(~%(count)s resultado)",
@@ -671,7 +671,7 @@
     "Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
     "Export room keys": "Exportar chaves da sala",
     "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.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibiu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
-    "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.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
+    "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.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que ti ves, así que deberías ter coidado e gardalo de xeito seguro. Para axudarche, deberías escribir unha frase de paso aquí abaixo que será usada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
     "Enter passphrase": "Introduza a frase de paso",
     "Confirm passphrase": "Confirme a frase de paso",
     "Export": "Exportar",
@@ -701,8 +701,8 @@
     "Flair": "Popularidade",
     "Showing flair for these communities:": "Mostrar a popularidade destas comunidades:",
     "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con 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.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Sabías que podes usar as comunidades para filtrar a túa experiencia en 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.": "Para establecer un filtro, arrastra un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Podes premer nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
     "Deops user with given id": "Degradar o usuario con esa ID",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
@@ -711,7 +711,7 @@
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade <bold1>name</bold1> e <bold2>avatar</bold2> poida que non os vexan outros usuarios ate dentro de 30 minutos.",
     "Join this community": "Únase a esta comunidade",
     "Leave this community": "Deixar esta comunidade",
-    "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.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
+    "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.": "Se enviaches un informe de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso da aplicación incluíndo o teu nome de usuaria, os IDs ou alcumes das salas e grupos que visitaches e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
     "Submit debug logs": "Enviar informes de depuración",
     "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento",
     "Stickerpack": "Iconas",
@@ -756,7 +756,7 @@
     "Please set a password!": "Por favor estableza un contrasinal!",
     "You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
     "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.",
-    "Explore Room State": "Explorar estado da sala",
+    "Explore Room State": "Ollar estado da sala",
     "Source URL": "URL fonte",
     "Messages sent by bot": "Mensaxes enviadas por bot",
     "Filter results": "Filtrar resultados",
@@ -779,7 +779,7 @@
     "Developer Tools": "Ferramentas para desenvolver",
     "Preparing to send logs": "Preparándose para enviar informe",
     "Remember, you can always set an email address in user settings if you change your mind.": "Lembre que sempre poderá poñer un enderezo de correo nos axustes de usuario se cambiase de idea.",
-    "Explore Account Data": "Explorar datos da conta",
+    "Explore Account Data": "Ollar datos da conta",
     "All messages (noisy)": "Todas as mensaxes (alto)",
     "Saturday": "Sábado",
     "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
@@ -868,9 +868,9 @@
     "Share Link to User": "Compartir a ligazón co usuario",
     "Share room": "Compartir sala",
     "Muted Users": "Usuarios silenciados",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Mellore Riot.im enviando <UsageDataLink>os datos anónimos de uso</UsageDataLink>. Iso suporá o emprego dunha cookie (véxase a nosa <PolicyLink>Política de Cookies</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Mellore Riot.im enviando <UsageDataLink>o uso de datos anónimo</UsageDataLink>. Iso usará unha cookie.",
-    "Yes, I want to help!": "Si, quero axuda",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Axuda a mellorar Riot.im enviando <UsageDataLink>os datos anónimos de uso</UsageDataLink>. Usaremos unha cookie (le aquí a nosa <PolicyLink>Política de Cookies</PolicyLink>).",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Axuda a mellorar Riot.im enviando <UsageDataLink>datos anónimos de uso</UsageDataLink>. Esto usará unha cookie.",
+    "Yes, I want to help!": "Si, quero axudar!",
     "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>": "Iso fará que a súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.<b>Isto non se poderá desfacer</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.": "Desactivando a súa conta <b>non supón que por defecto esquezamos as súas mensaxes enviadas.</b> Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
     "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
@@ -936,7 +936,7 @@
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Se estás conectada utilizando Riot nun dispositivo maiormente táctil",
     "Whether you're using Riot as an installed Progressive Web App": "Se estás a usar Riot como unha Progressive Web App instalada",
     "Your user agent": "User Agent do navegador",
-    "The information being sent to us to help make Riot better includes:": "Información que nos envías para mellorar Riot inclúe:",
+    "The information being sent to us to help make Riot better includes:": "A información que nos envías para mellorar Riot inclúe:",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
     "Sign In or Create Account": "Conéctate ou Crea unha Conta",
     "Sign In": "Conectar",
@@ -1042,5 +1042,48 @@
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambiou o nome da sala de %(oldRoomName)s a %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizou esta sala.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón.",
-    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s fixo que a sala sexa só por convite."
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s fixo que a sala sexa só por convite.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambiou a regra de participación a %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s permite que as convidadas se unan a sala.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s non permite que as convidadas se unan a sala.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambiou acceso de convidada a %(rule)s",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s activou a popularidade para %(groups)s nesta sala.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s desactivou a popularidade para %(groups)s nesta sala.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s activou a popularidade para %(newGroups)s e desactivou a popularidade para %(oldGroups)s nesta sala.",
+    "Capitalization doesn't help very much": "Escribir con maiúsculas non axuda moito",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Substitucións predecibles como '@' no lugar de 'a' non son de gran axuda",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupar e filtrar salas con etiquetas personalizadas (actuliza para aplicar cambios)",
+    "Enable Community Filter Panel": "Activar o panel de Filtro de comunidades",
+    "General": "Xeral",
+    "Discovery": "Descubrir",
+    "Deactivate account": "Desactivar conta",
+    "For help with using Riot, click <a>here</a>.": "Para ter axuda con Riot, preme <a>aquí</a>.",
+    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Se precisas axuda usando Riot, preme <a>aquí</a> ou inicia unha conversa co noso bot usando o botón inferior.",
+    "Help & About": "Axuda & Acerca de",
+    "Security & Privacy": "Seguridade & Privacidade",
+    "Where you’re logged in": "Onde estás conectada",
+    "Change room name": "Cambiar nome da sala",
+    "Roles & Permissions": "Roles & Permisos",
+    "Room %(name)s": "Sala %(name)s",
+    "Recent rooms": "Salas recentes",
+    "Direct Messages": "Mensaxes Directas",
+    "Create room": "Crear sala",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Podes usar <code>axuda</code> para ver os comandos dispoñibles. ¿Querías mellor enviar esto como unha mensaxe?",
+    "Error updating flair": "Fallo ao actualizar popularidade",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Algo fallou cando se actualizaba a popularidade da sala. Pode ser un fallo temporal ou que o servidor non o permita.",
+    "Enter the name of a new server you want to explore.": "Escribe o nome do novo servidor que queres explorar.",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Se hai contexto que cres que axudaría a analizar o problema, como o que estabas a facer, ID da sala, ID da usuaria, etc., por favor inclúeo aquí.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para evitar informes duplicados, mira <existingIssuesLink>os informes existentes</existingIssuesLink> primeiro (e engade un +1) ou <newIssueLink>crea un novo informe</newIssueLink> se non o atopas.",
+    "Command Help": "Comando Axuda",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a previr esto no futuro,  envíanos <a>o rexistro</a>.",
+    "Help": "Axuda",
+    "Explore Public Rooms": "Explorar Salas Públicas",
+    "Explore": "Explorar",
+    "Filter": "Filtrar",
+    "Filter rooms…": "Filtrar salas…",
+    "%(creator)s created and configured the room.": "%(creator)s creou e configurou a sala.",
+    "Explore rooms": "Explorar salas",
+    "General failure": "Fallo xeral",
+    "This homeserver does not support login using email address.": "Este servidor non soporta a conexión usando enderezos de email.",
+    "Clear room list filter field": "Baleirar o campo do filtro de salas"
 }

From dd8c65eba2c2b880b632c18c82324580d45b87b9 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Fri, 22 May 2020 14:12:09 +0000
Subject: [PATCH 3144/3235] Translated using Weblate (Lithuanian)

Currently translated at 52.8% (1227 of 2322 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 | 154 +++++++++++++++++++++++++++++++--------
 1 file changed, 125 insertions(+), 29 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index de8109913c..9c6a1c9a7a 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -133,7 +133,7 @@
     "Reject": "Atmesti",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Jūs turbūt juos sukonfigūravote kitoje programėlėje nei Riot. Negalite jų koreguoti Riot programėlėje, bet jie vistiek yra taikomi",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Atleiskite, jūsų naršyklė <b>negali</b> paleisti Riot.",
-    "Quote": "Citata",
+    "Quote": "Cituoti",
     "Messages in group chats": "Žinutės grupės pokalbiuose",
     "Yesterday": "Vakar",
     "Error encountered (%(errorDetail)s).": "Susidurta su klaida (%(errorDetail)s).",
@@ -287,14 +287,14 @@
     "%(senderName)s sent an image": "%(senderName)s išsiuntė paveikslą",
     "%(senderName)s sent a video": "%(senderName)s išsiuntė vaizdo įrašą",
     "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
-    "Options": "Parametrai",
+    "Options": "Parinktys",
     "Key request sent.": "Rakto užklausa išsiųsta.",
     "device id: ": "įrenginio id: ",
     "Failed to mute user": "Nepavyko nutildyti naudotoją",
     "Are you sure?": "Ar tikrai?",
     "Ignore": "Ignoruoti",
     "Invite": "Pakviesti",
-    "User Options": "Naudotojo parametrai",
+    "User Options": "Vartotojo parinktys",
     "Admin Tools": "Administratoriaus įrankiai",
     "Attachment": "Priedas",
     "Voice call": "Balso skambutis",
@@ -375,8 +375,8 @@
     "Sent messages will be stored until your connection has returned.": "Išsiųstos žinutės bus saugomos tol, kol atsiras ryšys.",
     "Active call": "Aktyvus skambutis",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Čia daugiau nieko nėra! Ar norėtumėte <inviteText>pakviesti kitus</inviteText> ar <nowarnText>išjungti įspėjimą apie tuščią kambarį</nowarnText>?",
-    "You seem to be uploading files, are you sure you want to quit?": "Atrodo, kad jūs įkelinėjate failus, ar tikrai norite išeiti?",
-    "You seem to be in a call, are you sure you want to quit?": "Atrodo, kad dalyvaujate skambutyje, ar tikrai norite išeiti?",
+    "You seem to be uploading files, are you sure you want to quit?": "Panašu, kad jūs įkelinėjate failus, ar tikrai norite išeiti?",
+    "You seem to be in a call, are you sure you want to quit?": "Panašu, kad jūs dalyvaujate skambutyje, ar tikrai norite išeiti?",
     "Search failed": "Paieška nepavyko",
     "Server may be unavailable, overloaded, or search timed out :(": "Gali būti, kad serveris neprieinamas, perkrautas arba pasibaigė paieškai skirtas laikas :(",
     "No more results": "Daugiau nėra jokių rezultatų",
@@ -399,7 +399,7 @@
     "<not supported>": "<nepalaikoma>",
     "Check for update": "Tikrinti, ar yra atnaujinimų",
     "Reject all %(invitedRooms)s invites": "Atmesti visus %(invitedRooms)s pakvietimus",
-    "You may need to manually permit Riot to access your microphone/webcam": "Jums gali tekti rankiniu būdu leisti Riot prieigą prie savo mikrofono/kameros",
+    "You may need to manually permit Riot to access your microphone/webcam": "Jums gali tekti rankiniu būdu duoti leidimą Riot prieigai prie mikrofono/kameros",
     "No Audio Outputs detected": "Neaptikta jokių garso išvesčių",
     "No Microphones detected": "Neaptikta jokių mikrofonų",
     "No Webcams detected": "Neaptikta jokių kamerų",
@@ -421,7 +421,7 @@
     "Return to login screen": "Grįžti į prisijungimą",
     "Send Reset Email": "Siųsti atstatymo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Turėkite omenyje, kad jūs prisijungiate prie %(hs)s serverio, o ne matrix.org.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Atkreipkite dėmesį, kad jūs jungiatės prie %(hs)s serverio, o ne matrix.org.",
     "Failed to fetch avatar URL": "Nepavyko gauti avataro URL",
     "Commands": "Komandos",
     "Results from DuckDuckGo": "Rezultatai iš DuckDuckGo",
@@ -529,7 +529,7 @@
     "Confirm password": "Patvirtinkite slaptažodį",
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
-    "Share Link to User": "Dalintis nuoroda į naudotoją",
+    "Share Link to User": "Dalintis nuoroda į vartotoją",
     "Direct chats": "Privatūs pokalbiai",
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
     "Jump to message": "Pereiti prie žinutės",
@@ -641,7 +641,7 @@
     "And %(count)s more...|other": "Ir dar %(count)s...",
     "Existing Call": "Esamas skambutis",
     "A call is already in progress!": "Skambutis jau vyksta!",
-    "Default": "Numatytasis",
+    "Default": "Paprastas vartotojas",
     "Restricted": "Apribotas",
     "Moderator": "Moderatorius",
     "Ignores a user, hiding their messages from you": "Ignoruoja vartotoją, slepiant nuo jūsų jo žinutes",
@@ -775,7 +775,7 @@
     "Invite new community members": "Pakviesti naujus bendruomenės narius",
     "Name or Matrix ID": "Vardas arba Matrix ID",
     "Identity server has no terms of service": "Tapatybės serveris neturi paslaugų teikimo sąlygų",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Šiam veiksmui reikalinga prieiti numatytąjį tapatybės serverį <server />, kad patvirtinti el. pašto adresą arba telefono numerį, bet serveris neturi jokių paslaugos teikimo sąlygų.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Šiam veiksmui reikalinga pasiekti numatytąjį tapatybės serverį <server />, kad patvirtinti el. pašto adresą arba telefono numerį, bet serveris neturi jokių paslaugos teikimo sąlygų.",
     "Only continue if you trust the owner of the server.": "Tęskite tik tada, jei pasitikite serverio savininku.",
     "Trust": "Pasitikėti",
     "Failed to invite users to the room:": "Nepavyko pakviesti vartotojų į kambarį:",
@@ -897,7 +897,7 @@
     "Filter": "Filtruoti",
     "Filter rooms…": "Filtruoti kambarius…",
     "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prie jo vėl prisijungti be pakvietimo.",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite palikti kambarį %(roomName)s?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite išeiti iš kambario %(roomName)s?",
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
     "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
     "General failure": "Bendras triktis",
@@ -939,12 +939,12 @@
     "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.": "Ar tikrai norite pašalinti (ištrinti) šį įvykį? Atkreipkite dėmesį į tai, kad jei jūs ištrinsite kambario pavadinimo arba temos keitimo įvykį, tai gali atšaukti patį pakeitimą.",
     "We recommend you change your password and recovery key in Settings immediately": "Mes rekomenduojame nedelsiant Nustatymuose pasikeisti jūsų slaptažodį ir atgavimo raktą",
     "Email (optional)": "El. paštas (neprivaloma)",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Jei jūs nepašalinote paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
     "Help & About": "Pagalba ir Apie",
     "Direct Messages": "Privačios žinutės",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nustatykite adresus šiam kambariui, kad vartotojai galėtų surasti šį kambarį per jūsų serverį (%(localDomain)s)",
-    "Direct message": "Privati žinutė",
+    "Direct message": "Siųsti tiesioginę žinutę",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s prisijungė",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
@@ -990,7 +990,7 @@
     "Custom level": "Pritaikytas lygis",
     "Can't find this server or its room list": "Negalime rasti šio serverio arba jo kambarių sąrašo",
     "Matrix rooms": "Matrix kambariai",
-    "Recently Direct Messaged": "Neseniai siųsta privati žinutė",
+    "Recently Direct Messaged": "Neseniai tiesiogiai susirašyta",
     "Command Help": "Komandų pagalba",
     "Help": "Pagalba",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sukurkite bendruomenę, kad kartu sugrupuotumėte vartotojus ir kambarius! Sukurkite pagrindinį puslapį, kad pažymėtumėte savo vietą Matrix visatoje.",
@@ -1064,7 +1064,7 @@
     "Server Name": "Serverio Pavadinimas",
     "Other servers": "Kiti serveriai",
     "Add room": "Sukurti kambarį",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas ištrins visų jūsų seansų šifravimo raktus, todėl nebebus galima perskaityti užšifruotos pokalbių istorijos. Nustatykite Raktų Atsarginę Kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš atstatydami slaptažodį.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Slaptažodžio keitimas ištrins visų jūsų seansų šifravimo raktus, todėl nebebus galima perskaityti užšifruotos pokalbių istorijos. Sukurkite atsarginę raktų kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš atstatydami slaptažodį.",
     "Set a display name:": "Nustatyti rodomą vardą:",
     "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Apsaugokite savo šifravimo raktus slaptafraze. Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio:",
     "Enter a passphrase": "Įveskite slaptafrazę",
@@ -1082,13 +1082,13 @@
     "Syncing...": "Sinchronizuojama...",
     "Signing In...": "Prijungiama...",
     "If you've joined lots of rooms, this might take a while": "Jei esate prisijungę prie daug kambarių, tai gali užtrukti",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Neužbaigus saugumo šioje sesijoje, ji neturės priėjimo prie šifruotų žinučių.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Neužbaigus saugumo šiame seanse, jis neturės prieigos prie šifruotų žinučių.",
     "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Nustatykite atgavimo slaptafrazę, kad apsaugotumėte šifruotą informaciją ir atgautumėte ją jei atsijungsite. Ji turi skirtis nuo jūsų paskyros slaptažodžio:",
     "Enter a recovery passphrase": "Įveskite atgavimo slaptafrazę",
     "Back up encrypted message keys": "Padaryti atsargines šifruotų žinučių raktų kopijas",
     "Set up with a recovery key": "Nustatyti su atgavimo raktu",
     "Enter your recovery passphrase a second time to confirm it.": "Įveskite atgavimo slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti priėjimo prie jūsų šifruotų žinučių atgavimui, jei pamiršite savo atgavimo slaptafrazę.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti prieigos prie jūsų šifruotų žinučių atgavimui, jei pamiršite savo atgavimo slaptafrazę.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
     "Your recovery key": "Jūsų atgavimo raktas",
     "Copy": "Kopijuoti",
@@ -1105,9 +1105,9 @@
     "Not now": "Ne dabar",
     "Don't ask me again": "Daugiau neklausti",
     "Send as message": "Siųsti kaip žinutę",
-    "Messages in this room are end-to-end encrypted.": "Žinutės šiame kambaryje yra užšifruotos visapusiu šifravimu.",
-    "Messages in this room are not end-to-end encrypted.": "Žinutės šiame kambaryje nėra užšifruotos visapusiu šifravimu.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra užšifruotos visapusiu šifravimu. Sužinokite daugiau ir patvirtinkite šį vartotoją jų profilyje.",
+    "Messages in this room are end-to-end encrypted.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos.",
+    "Messages in this room are not end-to-end encrypted.": "Žinutės šiame kambaryje nėra visapusiškai užšifruotos.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite vartotojus jų profilyje.",
     "Confirm Removal": "Patvirtinkite pašalinimą",
     "Manually export keys": "Eksportuoti raktus rankiniu būdu",
     "Send a Direct Message": "Siųsti tiesioginę žinutę",
@@ -1127,15 +1127,15 @@
     "Homeserver URL": "Serverio URL",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Serverio adresas neatrodo esantis tinkamas Matrix serveris",
     "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą.",
-    "Review Sessions": "Peržiūrėti sesijas",
+    "Review Sessions": "Peržiūrėti seansus",
     "Setting up keys": "Raktų nustatymas",
     "Review where you’re logged in": "Peržiūrėkite kur esate prisijungę",
-    "Verify all your sessions to ensure your account & messages are safe": "Patvirtinkite visas savo sesijas, kad užtikrintumėte savo paskyros ir žinučių saugumą",
+    "Verify all your sessions to ensure your account & messages are safe": "Patvirtinkite visus savo seansus, kad užtikrintumėte savo paskyros ir žinučių saugumą",
     "Review": "Peržiūrėti",
     "Message deleted": "Žinutė ištrinta",
     "Message deleted by %(name)s": "Žinutė, ištrinta %(name)s",
     "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Įspėjimas</b>: Tai atlikite tik saugiame kompiuteryje.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Prieikite prie savo saugių žinučių istorijos ir kryžminio parašo kitų sesijų patvirtinimui tapatybės įvesdami savo atgavimo slaptafrazę.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Pasiekite savo saugių žinučių istoriją ir kryžminio parašo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo slaptafrazę.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>",
     "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
@@ -1154,16 +1154,112 @@
     "You can now verify your other devices, and other users to keep your chats safe.": "Jūs dabar galite patvirtinti kitus savo įrenginius ir kitus vartotojus, kad jūsų pokalbiai būtų saugūs.",
     "Confirm recovery passphrase": "Patvirtinkite atgavimo slaptafrazę",
     "You're done!": "Atlikta!",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Slaptažodžio keitimas šiuo metu anuliuos visapusio šifravimo ranktus visose sesijose, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs nematysite pranešimų kitose sesijose kol iš naujo prie jų neprisijungsite",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pakeitus slaptažodį šiuo metu, visuose seansuose bus anuliuoti visapusio šifravimo raktai, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs kituose seansuose negausite pranešimų, kol iš naujo prie jų neprisijungsite",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
     "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų sesijų ir nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, prisijunkite iš naujo kiekviename įrenginyje.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų seansų ir toliau nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, iš naujo prisijunkite kiekviename įrenginyje.",
     "Show more": "Rodyti daugiau",
-    "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> į savo naują paskyrą.",
+    "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> prie naujos paskyros.",
     "Registration Successful": "Registracija sėkminga",
     "Welcome to %(appName)s": "Sveiki prisijungę į %(appName)s",
     "Liberate your communication": "Išlaisvinkite savo bendravimą",
     "Explore Public Rooms": "Žvalgyti viešus kambarius",
-    "Create a Group Chat": "Sukurti grupės pokalbį"
+    "Create a Group Chat": "Sukurti grupės pokalbį",
+    "New login. Was this you?": "Naujas prisijungimas. Ar tai jūs?",
+    "%(senderName)s placed a voice call.": "%(senderName)s pradėjo balso skambutį.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s pradėjo vaizdo skambutį. (nepalaikoma šios naršyklės)",
+    "%(senderName)s placed a video call.": "%(senderName)s pradėjo vaizdo skambutį.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s pradėjo vaizdo skambutį. (nepalaikoma šios naršyklės)",
+    "Verify your other session using one of the options below.": "Patvirtinkite savo kitą seansą naudodami vieną iš žemiau esančių parinkčių.",
+    "Messages containing @room": "Žinutės, kuriose yra @kambarys",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Laukiama, kol jūsų kitas seansas, %(deviceName)s (%(deviceId)s), patvirtins…",
+    "Waiting for your other session to verify…": "Laukiama, kol jūsų kitas seansas patvirtins…",
+    "To be secure, do this in person or use a trusted way to communicate.": "Norėdami būti saugūs, darykite tai asmeniškai arba naudodamiesi patikimu bendravimo būdu.",
+    "Verify": "Patvirtinti",
+    "Verify the new login accessing your account: %(name)s": "Patvirtinkite naują prisijungimą prie jūsų paskyros: %(name)s",
+    "Confirm deleting these sessions": "Patvirtinkite šių seansų ištrinimą",
+    "Delete sessions|other": "Ištrinti seansus",
+    "Delete sessions|one": "Ištrinti seansą",
+    "Delete %(count)s sessions|other": "Ištrinti %(count)s seansus(-ų)",
+    "Delete %(count)s sessions|one": "Ištrinti %(count)s seansą",
+    "ID": "ID",
+    "Restore from Backup": "Atkurti iš atsarginės kopijos",
+    "Flair": "Ženkliukai",
+    "Access Token:": "Prieigos talonas:",
+    "Preferences": "Parinktys",
+    "Cryptography": "Kriptografija",
+    "Security & Privacy": "Saugumas ir Privatumas",
+    "Voice & Video": "Garsas ir Vaizdas",
+    "Enable room encryption": "Įgalinti kambario šifravimą",
+    "Enable encryption?": "Įgalinti šifravimą?",
+    "Encryption": "Šifravimas",
+    "Once enabled, encryption cannot be disabled.": "Įjungus šifravimą jo nebus galima išjungti.",
+    "Who can access this room?": "Kas turi prieigą prie šio kambario?",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Prisijungti kaip <voiceText>balsas</voiceText> arba <videoText>vaizdas</videoText>.",
+    "Deactivate user?": "Deaktyvuoti vartotoją?",
+    "Deactivate user": "Deaktyvuoti vartotoją",
+    "Failed to deactivate user": "Nepavyko deaktyvuoti vartotojo",
+    "Sessions": "Seansai",
+    "Try again later, or ask a room admin to check if you have access.": "Pabandykite vėliau arba paprašykite kambario administratoriaus patikrinti, ar turite prieigą.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Bandant patekti į kambarį buvo gauta klaida: %(errcode)s. Jei manote, kad matote šį pranešimą per klaidą, prašome <issueLink>apie ją pranešti</issueLink>.",
+    "Error updating flair": "Klaida atnaujinant ženkliuką",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Įvyko klaida atnaujinant ženkliukus šiam kambariui. Serveris gali jų neleisti arba įvyko laikina klaida.",
+    "Showing flair for these communities:": "Ženkliukai rodomi šioms bendruomenėms:",
+    "This room is not showing flair for any communities": "Šis kambarys nerodo ženkliukų jokioms bendruomenėms",
+    "Waiting for you to accept on your other session…": "Laukiama kol jūs priimsite savo kitame seanse…",
+    "Start Verification": "Pradėti patvirtinimą",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifruotuose kambariuose jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
+    "Verify User": "Patvirtinti vartotoją",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Dėl papildomo saugumo patvirtinkite šį vartotoją patikrindami vienkartinį kodą abiejuose jūsų įrenginiuose.",
+    "%(count)s verified sessions|other": "%(count)s patvirtintų seansų",
+    "Hide verified sessions": "Slėpti patvirtintus seansus",
+    "%(count)s sessions|other": "%(count)s seansai(-ų)",
+    "Hide sessions": "Slėpti seansus",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> kambaryje %(roomName)s",
+    "Security": "Saugumas",
+    "Verify by scanning": "Patvirtinti skenuojant",
+    "Verify all users in a room to ensure it's secure.": "Patvirtinkite visus vartotojus kambaryje, kad užtikrintumėte jo saugumą.",
+    "You cancelled verification on your other session.": "Jūs atšaukėte patvirtinimą kitame savo seanse.",
+    "%(displayName)s cancelled verification.": "%(displayName)s atšaukė patvirtinimą.",
+    "You cancelled verification.": "Jūs atšaukėte patvirtinimą.",
+    "Verification cancelled": "Patvirtinimas atšauktas",
+    "Encryption enabled": "Šifravimas įgalintas",
+    "Encryption not enabled": "Šifravimas neįgalintas",
+    "Display your community flair in rooms configured to show it.": "Rodyti savo bendruomenės ženkliukus kambariuose, kuriuose nustatytas jų rodymas.",
+    "You're not currently a member of any communities.": "Jūs šiuo metu nesate jokios bendruomenės narys.",
+    "More options": "Daugiau parinkčių",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ar tikrai norite pašalinti <b>%(serverName)s</b>",
+    "Enable end-to-end encryption": "Įgalinti visapusį šifravimą",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Jūs negalėsite vėliau to išjungti. Tiltai ir dauguma bot'ų dar nėra palaikomi.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ar tikrai norite deaktyvuoti savo paskyrą? Tai yra negrįžtama.",
+    "Verify session": "Patvirtinti seansą",
+    "Verify by comparing a short text string.": "Patvirtinkite palygindami trumpą teksto eilutę.",
+    "To verify that this session 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 session matches the key below:": "Norėdami patvirtinti, kad šis seansas yra patikimas, susisiekite su jo savininku kokiu nors kitu būdu (pvz.: asmeniškai arba telefono skambučiu) ir paklauskite ar jų Vartotojo Nustatymuose matomas šio seanso raktas sutampa su raktu esančiu žemiau:",
+    "Start verification": "Pradėti patvirtinimą",
+    "Are you sure you want to sign out?": "Ar tikrai norite atsijungti?",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Panaudoti šį seansą naujo patvirtinimui, suteikant jam prieigą prie šifruotų žinučių:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Jei jūs nesijungėte prie šios sesijos, jūsų paskyra gali būti sukompromituota.",
+    "This wasn't me": "Tai buvau ne aš",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jei jūs susidūrėte su klaidomis arba norėtumėte palikti atsiliepimą, praneškite mums GitHub'e.",
+    "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Tam, kad būtų išvengta pasikartojančių problemų, pirmiausia <existingIssuesLink>peržiūrėkite esamas problemas</existingIssuesLink> (ir pridėkite +1) arba, jei nerandate, <newIssueLink>sukurkite naują svarstomą problemą</newIssueLink>.",
+    "Report bugs & give feedback": "Pranešti apie klaidas ir palikti atsiliepimą",
+    "Report Content to Your Homeserver Administrator": "Pranešti apie turinį serverio administratoriui",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Pranešant apie šią netinkamą žinutę, serverio administratoriui bus nusiųstas unikalus 'įvykio ID'. Jei žinutės šiame kambaryje yra šifruotos, serverio administratorius negalės perskaityti žinutės teksto ar peržiūrėti failų arba paveikslėlių.",
+    "Send report": "Siųsti pranešimą",
+    "Unknown sessions": "Nežinomi seansai",
+    "Verify other session": "Patvirtinti kitą seansą",
+    "Are you sure you want to reject the invitation?": "Ar tikrai norite atšaukti pakvietimą?",
+    "Share Permalink": "Dalintis nuoroda",
+    "Report Content": "Pranešti",
+    "Nice, strong password!": "Puiku, stiprus slaptažodis!",
+    "Old cryptography data detected": "Aptikti seni kriptografijos duomenys",
+    "Verify this login": "Patvirtinti šį prisijungimą",
+    "Registration has been disabled on this homeserver.": "Registracija šiame serveryje išjungta.",
+    "You can now close this window or <a>log in</a> to your new account.": "Jūs galite uždaryti šį langą arba <a>prisijungti</a> į savo naują paskyrą.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Patvirtinkite savo tapatybę verifikuodami šį prisijungimą viename iš kitų jūsų seansų, suteikdami jam prieigą prie šifruotų žinučių.",
+    "This requires the latest Riot on your other devices:": "Tam reikia naujausios Riot versijos kituose jūsų įrenginiuose:",
+    "or another cross-signing capable Matrix client": "arba kitas kryžminį parašą palaikantis Matrix klientas",
+    "Use Recovery Passphrase or Key": "Naudoti atgavimo slaptafrazę arba raktą",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams."
 }

From f6e45a040559dac5ebc35b7e84dd7303a171b757 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Sat, 23 May 2020 20:55:27 +0000
Subject: [PATCH 3145/3235] Translated using Weblate (Lithuanian)

Currently translated at 55.2% (1281 of 2322 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 | 75 ++++++++++++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 9c6a1c9a7a..661732dd81 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -103,7 +103,7 @@
     "Search": "Ieškoti",
     "You must specify an event type!": "Privalote nurodyti įvykio tipą!",
     "(HTTP status %(httpStatus)s)": "(HTTP būsena %(httpStatus)s)",
-    "Failed to forget room %(errCode)s": "Nepavyko pašalinti pokalbių kambario %(errCode)s",
+    "Failed to forget room %(errCode)s": "Nepavyko pamiršti kambario %(errCode)s",
     "What's New": "Kas naujo",
     "Wednesday": "Trečiadienis",
     "Send": "Siųsti",
@@ -355,9 +355,9 @@
     "Email address": "El. pašto adresas",
     "Remove from community": "Pašalinti iš bendruomenės",
     "Remove this user from community?": "Pašalinti šį vartotoją iš bendruomenės?",
-    "Failed to remove user from community": "Nepavyko pašalinti naudotoją iš bendruomenės",
+    "Failed to remove user from community": "Nepavyko pašalinti vartotojo iš bendruomenės",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ar tikrai norite pašalinti \"%(roomName)s\" iš %(groupId)s?",
-    "Failed to remove room from community": "Nepavyko pašalinti kambarį iš bendruomenės",
+    "Failed to remove room from community": "Nepavyko pašalinti kambario iš bendruomenės",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Nepavyko pašalinti \"%(roomName)s\" iš %(groupId)s",
     "Something went wrong!": "Kažkas nutiko!",
     "Visibility in Room List": "Matomumas kambarių sąraše",
@@ -367,7 +367,7 @@
     "Allow": "Leisti",
     "Delete Widget": "Ištrinti valdiklį",
     "Delete widget": "Ištrinti valdiklį",
-    "Failed to remove widget": "Nepavyko pašalinti valdiklį",
+    "Failed to remove widget": "Nepavyko pašalinti valdiklio",
     "Scroll to bottom of page": "Slinkti į puslapio apačią",
     "%(count)s of your messages have not been sent.|other": "Kai kurios iš jūsų žinučių nebuvo išsiųstos.",
     "%(count)s of your messages have not been sent.|one": "Jūsų žinutė nebuvo išsiųsta.",
@@ -395,7 +395,7 @@
     "Light theme": "Šviesi tema",
     "Dark theme": "Tamsi tema",
     "Success": "Pavyko",
-    "Unable to remove contact information": "Nepavyko pašalinti kontaktinę informaciją",
+    "Unable to remove contact information": "Nepavyko pašalinti kontaktinės informacijos",
     "<not supported>": "<nepalaikoma>",
     "Check for update": "Tikrinti, ar yra atnaujinimų",
     "Reject all %(invitedRooms)s invites": "Atmesti visus %(invitedRooms)s pakvietimus",
@@ -624,7 +624,7 @@
     "Please <a>contact your service administrator</a> to get this limit increased.": "Norėdami padidinti šį limitą, <a>susisiekite su savo paslaugų administratoriumi</a>.",
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Šis namų serveris viršijo vieno iš savo išteklių limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
-    "An error ocurred whilst trying to remove the widget from the room": "Įvyko klaida, bandant pašalinti valdiklį iš kambario",
+    "An error ocurred whilst trying to remove the widget from the room": "Bandant pašalinti valdiklį iš kambario įvyko klaida",
     "Blacklist": "Blokuoti",
     "Unblacklist": "Atblokuoti",
     "Verify...": "Patvirtinti...",
@@ -659,7 +659,7 @@
     "%(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?",
+    "Disinvite this user?": "Atšaukti pakvietimą šiam vartotojui?",
     "Unknown for %(duration)s": "Nežinoma jau %(duration)s",
     "Unable to load! Check your network connectivity and try again.": "Nepavyko įkelti! Patikrinkite savo tinklo ryšį ir bandykite dar kartą.",
     "%(targetName)s joined the room.": "%(targetName)s prisijungė prie kambario.",
@@ -700,7 +700,7 @@
     "Publish this room to the public in %(domain)s's room directory?": "Paskelbti šį kambarį į viešąjį %(domain)s kambarių katalogą?",
     "Start authentication": "Pradėti tapatybės nustatymą",
     "Failed to load group members": "Nepavyko įkelti grupės dalyvių",
-    "Manage Integrations": "Tvarkyti integracijas",
+    "Manage Integrations": "Valdyti integracijas",
     "Matrix Room ID": "Matrix kambario ID",
     "That doesn't look like a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Preparing to send logs": "Ruošiamasi išsiųsti žurnalus",
@@ -740,7 +740,7 @@
     "Your Communities": "Jūsų bendruomenės",
     "Create a new community": "Sukurti naują bendruomenę",
     "You have no visible notifications": "Jūs neturite matomų pranešimų",
-    "Failed to perform homeserver discovery": "Nepavyko atlikti namų serverio aptikimo",
+    "Failed to perform homeserver discovery": "Nepavyko atlikti serverio radimo",
     "Error: Problem communicating with the given homeserver.": "Klaida: Problemos susisiekiant su nurodytu namų serveriu.",
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
     "Great! This passphrase looks strong enough.": "Puiku! Ši slapta frazė atrodo pakankamai stipri.",
@@ -1115,7 +1115,7 @@
     "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo.",
     "Click the button below to confirm adding this email address.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šio el. pašto pridėjimą.",
     "Add an email address to configure email notifications": "Pridėkite el. pašto adresą, kad nustatytumėte el. pašto pranešimus",
-    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Prieš atsijungiant rekomenduojame iš identiteto serverio pašalinti savo el. pašto adresus ir telefono numerius.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Rekomenduojame, prieš atsijungiant, iš tapatybės serverio pašalinti savo el. pašto adresus ir telefono numerius.",
     "Email addresses": "El. pašto adresai",
     "Account management": "Paskyros valdymas",
     "Deactivating your account is a permanent action - be careful!": "Paskyros deaktyvavimas yra neatšaukiamas veiksmas - būkite atsargūs!",
@@ -1261,5 +1261,58 @@
     "This requires the latest Riot on your other devices:": "Tam reikia naujausios Riot versijos kituose jūsų įrenginiuose:",
     "or another cross-signing capable Matrix client": "arba kitas kryžminį parašą palaikantis Matrix klientas",
     "Use Recovery Passphrase or Key": "Naudoti atgavimo slaptafrazę arba raktą",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams."
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams.",
+    "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieno Prisijungimo sistemą",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Patvirtinkite šio el. pašto adreso pridėjimą naudodami Vieno Prisijungimo sistemą, patvirtinančią jūsų tapatybę.",
+    "Single Sign On": "Vieno Prisijungimo sistema",
+    "Confirm adding email": "Patvirtinkite el. pašto pridėjimą",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Patvirtinkite šio telefono numerio pridėjimą naudodami Vieno Prisijungimo sistemą, patvirtinančią jūsų tapatybę.",
+    "Confirm adding phone number": "Patvirtinkite telefono numerio pridėjimą",
+    "Click the button below to confirm adding this phone number.": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šio numerio pridėjimą.",
+    "The version of Riot": "Riot versija",
+    "Match system theme": "Suderinti su sistemos tema",
+    "Identity Server URL must be HTTPS": "Tapatybės serverio URL privalo būti HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Netinkamas tapatybės serveris (statuso kodas %(code)s)",
+    "Could not connect to Identity Server": "Nepavyko prisijungti prie tapatybės serverio",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Atsijungti nuo <current /> tapatybės serverio ir jo vietoje prisijungti prie <new />?",
+    "Terms of service not accepted or the identity server is invalid.": "Nesutikta su paslaugų teikimo sąlygomis arba tapatybės serveris yra klaidingas.",
+    "The identity server you have chosen does not have any terms of service.": "Jūsų pasirinktas tapatybės serveris neturi jokių paslaugų teikimo sąlygų.",
+    "Disconnect identity server": "Atjungti tapatybės serverį",
+    "Disconnect from the identity server <idserver />?": "Atsijungti nuo tapatybės serverio <idserver />?",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Prieš atsijungdami jūs turėtumėte <b>pašalinti savo asmeninius duomenis</b> iš tapatybės serverio <idserver />. Deja, tapatybės serveris <idserver /> šiuo metu yra išjungtas arba nepasiekiamas.",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "patikrinkite ar tarp jūsų naršyklės įskiepių nėra nieko kas galėtų blokuoti tapatybės serverį (pavyzdžiui \"Privacy Badger\")",
+    "contact the administrators of identity server <idserver />": "susisiekite su tapatybės serverio <idserver /> administratoriais",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Jūs vis dar <b>dalijatės savo asmeniniais duomenimis</b> tapatybės serveryje <idserver />.",
+    "Identity Server (%(server)s)": "Tapatybės serveris (%(server)s)",
+    "Enter a new identity server": "Pridėkite naują tapatybės serverį",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite integracijų valdiklį <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų valdymui.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite integracijų valdiklį botų, valdiklių ir lipdukų valdymui.",
+    "Manage integrations": "Valdyti integracijas",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų valdikliai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
+    "Invalid theme schema.": "Klaidinga temos schema.",
+    "Error downloading theme information.": "Klaida parsisiunčiant temos informaciją.",
+    "Theme added!": "Tema pridėta!",
+    "Custom theme URL": "Pasirinktinės temos URL",
+    "Add theme": "Pridėti temą",
+    "Theme": "Tema",
+    "Phone numbers": "Telefono numeriai",
+    "Language and region": "Kalba ir regionas",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Sutikite su tapatybės serverio (%(serverName)s) paslaugų teikimo sąlygomis, kad leistumėte kitiems rasti jus pagal el. pašto adresą ar telefono numerį.",
+    "Discovery": "Radimas",
+    "Discovery options will appear once you have added an email above.": "Radimo parinktys atsiras jums aukščiau pridėjus el. pašto adresą.",
+    "Unable to revoke sharing for phone number": "Neina atšaukti telefono numerio bendrinimo",
+    "Unable to share phone number": "Neina bendrinti telefono numerio",
+    "Unable to verify phone number.": "Neina patvirtinti telefono numerio.",
+    "Discovery options will appear once you have added a phone number above.": "Radimo parinktys atsiras jums aukščiau pridėjus telefono numerį.",
+    "Phone Number": "Telefono Numeris",
+    "Room Topic": "Kambario Tema",
+    "Your theme": "Jūsų tema",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Valdiklio ištrinimas pašalina jį visiems kambaryje esantiems vartotojams. Ar tikrai norite ištrinti šį valdiklį?",
+    "Enable 'Manage Integrations' in Settings to do this.": "Įgalinkite 'Valdyti integracijas' nustatymuose, kad tai atliktumėte.",
+    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų Riot neleidžia jums naudoti integracijų valdiklio tam atlikti. Susisiekite su administratoriumi.",
+    "Enter phone number (required on this homeserver)": "Įveskite telefono numerį (privaloma šiame serveryje)",
+    "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
+    "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
+    "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
+    "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas"
 }

From 490a1041088675e5778143c8906e8946173b63f5 Mon Sep 17 00:00:00 2001
From: Domant3lis <domant3lis@protonmail.com>
Date: Sat, 23 May 2020 23:31:57 +0000
Subject: [PATCH 3146/3235] Translated using Weblate (Lithuanian)

Currently translated at 55.2% (1281 of 2322 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 661732dd81..905ac59c0d 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1314,5 +1314,6 @@
     "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
     "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
     "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
-    "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas"
+    "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas",
+    "Double check that your server supports the room version chosen and try again.": "Patikrinkite ar jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo."
 }

From 5e00481639ddd2505f95db3722cd97e2c67ba385 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 13:08:29 +0100
Subject: [PATCH 3147/3235] Fix sentMessageAndIsAlone by dispatching
 `message_sent` more consistently

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/emojipicker/ReactionPicker.js  | 2 ++
 src/components/views/messages/ReactionsRowButton.js | 2 ++
 src/components/views/rooms/EditMessageComposer.js   | 1 +
 src/components/views/rooms/SendMessageComposer.js   | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/components/views/emojipicker/ReactionPicker.js b/src/components/views/emojipicker/ReactionPicker.js
index 96894e18d2..6f8cc46c40 100644
--- a/src/components/views/emojipicker/ReactionPicker.js
+++ b/src/components/views/emojipicker/ReactionPicker.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from "prop-types";
 import EmojiPicker from "./EmojiPicker";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import dis from "../../../dispatcher/dispatcher";
 
 class ReactionPicker extends React.Component {
     static propTypes = {
@@ -105,6 +106,7 @@ class ReactionPicker extends React.Component {
                     "key": reaction,
                 },
             });
+            dis.dispatch({action: "message_sent"});
             return true;
         }
     }
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
index a7ff7dce96..09824cd315 100644
--- a/src/components/views/messages/ReactionsRowButton.js
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -22,6 +22,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
+import dis from "../../../dispatcher/dispatcher";
 
 export default class ReactionsRowButton extends React.PureComponent {
     static propTypes = {
@@ -60,6 +61,7 @@ export default class ReactionsRowButton extends React.PureComponent {
                     "key": content,
                 },
             });
+            dis.dispatch({action: "message_sent"});
         }
     };
 
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 88ed76f118..b70ef6255c 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -190,6 +190,7 @@ export default class EditMessageComposer extends React.Component {
             const roomId = editedEvent.getRoomId();
             this._cancelPreviousPendingEdit();
             this.context.sendMessage(roomId, editContent);
+            dis.dispatch({action: "message_sent"});
         }
 
         // close the event editing and focus composer
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 5ea979a8ef..b81e004943 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -312,6 +312,7 @@ export default class SendMessageComposer extends React.Component {
                     event: null,
                 });
             }
+            dis.dispatch({action: "message_sent"});
         }
 
         this.sendHistoryManager.save(this.model);

From 02ddda587b7354f90c14e082be3170117606ef6c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 14:11:25 +0100
Subject: [PATCH 3148/3235] Fix useEventEmitter to support passing all callback
 arguments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/hooks/useEventEmitter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useEventEmitter.js b/src/hooks/useEventEmitter.js
index 7adc6ef2e3..6a758fb108 100644
--- a/src/hooks/useEventEmitter.js
+++ b/src/hooks/useEventEmitter.js
@@ -32,7 +32,7 @@ export const useEventEmitter = (emitter, eventName, handler) => {
             if (!emitter) return;
 
             // Create event listener that calls handler function stored in ref
-            const eventListener = event => savedHandler.current(event);
+            const eventListener = (...args) => savedHandler.current(...args);
 
             // Add event listener
             emitter.on(eventName, eventListener);

From cf7acded501e6fb34f165de0e6ae721f0a8edcfc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 14:12:16 +0100
Subject: [PATCH 3149/3235] Simply BaseAvatar hooks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/avatars/BaseAvatar.js | 38 ++++++++--------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 4fd614fbf7..d7a2aa14e5 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -30,54 +30,44 @@ const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
     const [imageUrls, setUrls] = useState([]);
     const [urlsIndex, setIndex] = useState();
 
-    const onError = () => {
-        const nextIndex = urlsIndex + 1;
-        if (nextIndex < imageUrls.length) {
-            // try the next one
-            setIndex(nextIndex);
-        }
-    };
-
-    const defaultImageUrl = useMemo(() => AvatarLogic.defaultAvatarUrlForString(idName || name), [idName, name]);
+    const onError = useCallback(() => {
+        setIndex(i => i + 1); // try the next one
+    }, []);
+    const memoizedUrls = useMemo(() => urls, [JSON.stringify(urls)]); // eslint-disable-line react-hooks/exhaustive-deps
 
     useEffect(() => {
         // work out the full set of urls to try to load. This is formed like so:
-        // imageUrls: [ props.url, ...props.urls, default image ]
+        // imageUrls: [ props.url, ...props.urls ]
 
         let _urls = [];
         if (!SettingsStore.getValue("lowBandwidth")) {
-            _urls = urls || [];
+            _urls = memoizedUrls || [];
 
             if (url) {
                 _urls.unshift(url); // put in urls[0]
             }
         }
 
-        if (defaultToInitialLetter) {
-            _urls.push(defaultImageUrl); // lowest priority
-        }
-
         // deduplicate URLs
         _urls = Array.from(new Set(_urls));
 
         setIndex(0);
         setUrls(_urls);
-    }, [url, ...(urls || [])]); // eslint-disable-line react-hooks/exhaustive-deps
+    }, [url, memoizedUrls]); // eslint-disable-line react-hooks/exhaustive-deps
 
     const cli = useContext(MatrixClientContext);
     const onClientSync = useCallback((syncState, prevState) => {
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
-        if (reconnected && urlsIndex > 0 ) { // Did we fall back?
-            // Start from the highest priority URL again
-            setIndex(0);
+        if (reconnected) {
+            setIndex(i => i > 0 ? 0 : i);
         }
-    }, [urlsIndex]);
+    }, []);
     useEventEmitter(cli, "sync", onClientSync);
 
     const imageUrl = imageUrls[urlsIndex];
-    return [imageUrl, imageUrl === defaultImageUrl, onError];
+    return [imageUrl, onError];
 };
 
 const BaseAvatar = (props) => {
@@ -96,9 +86,9 @@ const BaseAvatar = (props) => {
         ...otherProps
     } = props;
 
-    const [imageUrl, isDefault, onError] = useImageUrl({url, urls, idName, name, defaultToInitialLetter});
+    const [imageUrl, onError] = useImageUrl({url, urls, idName, name, defaultToInitialLetter});
 
-    if (isDefault) {
+    if (!imageUrl && defaultToInitialLetter) {
         const initialLetter = AvatarLogic.getInitialLetter(name);
         const textNode = (
             <span
@@ -116,7 +106,7 @@ const BaseAvatar = (props) => {
         const imgNode = (
             <img
                 className="mx_BaseAvatar_image"
-                src={imageUrl}
+                src={AvatarLogic.defaultAvatarUrlForString(idName || name)}
                 alt=""
                 title={title}
                 onError={onError}

From 73d966443c1b8c55fa89f840e79803bdf061293f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 14:25:31 +0100
Subject: [PATCH 3150/3235] fix tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/components/views/messages/TextualBody-test.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 212afac5c4..07cd51edbd 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -205,9 +205,8 @@ describe("<TextualBody />", () => {
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
-                '<img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
-                'style="width: 16px; height: 16px;" ' +
-                'title="@member:domain.bla" alt="" aria-hidden="true" src="mxc://avatar.url/image.png">Member</a>' +
+                '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
+                'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });

From 50b8445d4dc231fc6c815b4cebc58618bb305ded Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 15:13:53 +0100
Subject: [PATCH 3151/3235] fix Content Messages upload abort

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/ContentMessages.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 4f5a1a1220..931cc56a34 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -258,10 +258,10 @@ function readFileAsArrayBuffer(file) {
  *  If the file is encrypted then the object will have a "file" key.
  */
 function uploadFile(matrixClient, roomId, file, progressHandler) {
+    let canceled = false;
     if (matrixClient.isRoomEncrypted(roomId)) {
         // If the room is encrypted then encrypt the file before uploading it.
         // First read the file into memory.
-        let canceled = false;
         let uploadPromise;
         let encryptInfo;
         const prom = readFileAsArrayBuffer(file).then(function(data) {
@@ -278,9 +278,9 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
                 progressHandler: progressHandler,
                 includeFilename: false,
             });
-
             return uploadPromise;
         }).then(function(url) {
+            if (canceled) throw new UploadCanceledError();
             // If the attachment is encrypted then bundle the URL along
             // with the information needed to decrypt the attachment and
             // add it under a file key.
@@ -300,11 +300,14 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             progressHandler: progressHandler,
         });
         const promise1 = basePromise.then(function(url) {
+            if (canceled) throw new UploadCanceledError();
             // If the attachment isn't encrypted then include the URL directly.
             return {"url": url};
         });
-        // XXX: copy over the abort method to the new promise
-        promise1.abort = basePromise.abort;
+        promise1.abort = () => {
+            canceled = true;
+            MatrixClientPeg.get().cancelUpload(basePromise);
+        };
         return promise1;
     }
 }
@@ -489,11 +492,16 @@ export default class ContentMessages {
             }
         });
 
+        prom.abort = () => {
+            upload.cancelled = true;
+        };
+
         const upload = {
             fileName: file.name || 'Attachment',
             roomId: roomId,
             total: 0,
             loaded: 0,
+            promise: prom,
         };
         this.inprogress.push(upload);
         dis.dispatch({action: 'upload_started'});
@@ -510,6 +518,7 @@ export default class ContentMessages {
         }
 
         return prom.then(function() {
+            if (upload.canceled) throw new UploadCanceledError();
             // XXX: upload.promise must be the promise that
             // is returned by uploadFile as it has an abort()
             // method hacked onto it.
@@ -524,6 +533,7 @@ export default class ContentMessages {
             // Await previous message being sent into the room
             return promBefore;
         }).then(function() {
+            if (upload.canceled) throw new UploadCanceledError();
             return matrixClient.sendMessage(roomId, content);
         }, function(err) {
             error = err;

From 0705883c8fa958e011558b30111e54973b00bbe7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 15:47:52 +0100
Subject: [PATCH 3152/3235] Convert ContentMessages to Typescript

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/@types/global.d.ts                        |   3 +
 ...ContentMessages.js => ContentMessages.tsx} | 223 ++++++++++--------
 2 files changed, 127 insertions(+), 99 deletions(-)
 rename src/{ContentMessages.js => ContentMessages.tsx} (77%)

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index e6e339d067..b0e3159901 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as ModernizrStatic from "modernizr";
+import ContentMessages from "../ContentMessages";
 
 declare global {
     interface Window {
@@ -22,6 +23,8 @@ declare global {
         Olm: {
             init: () => Promise<void>;
         };
+
+        mx_ContentMessages: ContentMessages;
     }
 
     // workaround for https://github.com/microsoft/TypeScript/issues/30933
diff --git a/src/ContentMessages.js b/src/ContentMessages.tsx
similarity index 77%
rename from src/ContentMessages.js
rename to src/ContentMessages.tsx
index 931cc56a34..6de318f81d 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.tsx
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
+import React from "react";
 import extend from './extend';
 import dis from './dispatcher/dispatcher';
 import {MatrixClientPeg} from './MatrixClientPeg';
+import {MatrixClient} from "matrix-js-sdk/src/client";
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
@@ -39,6 +40,50 @@ const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
 
 export class UploadCanceledError extends Error {}
 
+type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
+
+interface IUpload {
+    fileName: string;
+    roomId: string;
+    total: number;
+    loaded: number;
+    promise: Promise<any>;
+    canceled?: boolean;
+}
+
+interface IMediaConfig {
+    "m.upload.size"?: number;
+}
+
+interface IContent {
+    body: string;
+    msgtype: string;
+    info: {
+        size: number;
+        mimetype?: string;
+    };
+    file?: string;
+    url?: string;
+}
+
+interface IThumbnail {
+    info: {
+        thumbnail_info: {
+            w: number;
+            h: number;
+            mimetype: string;
+            size: number;
+        };
+        w: number;
+        h: number;
+    };
+    thumbnail: Blob;
+}
+
+interface IAbortablePromise<T> extends Promise<T> {
+    abort(): void;
+}
+
 /**
  * Create a thumbnail for a image DOM element.
  * The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
@@ -51,13 +96,13 @@ export class UploadCanceledError extends Error {}
  * about the original image and the thumbnail.
  *
  * @param {HTMLElement} element The element to thumbnail.
- * @param {integer} inputWidth The width of the image in the input element.
- * @param {integer} inputHeight the width of the image in the input element.
+ * @param {number} inputWidth The width of the image in the input element.
+ * @param {number} inputHeight the width of the image in the input element.
  * @param {String} mimeType The mimeType to save the blob as.
  * @return {Promise} A promise that resolves with an object with an info key
  *  and a thumbnail key.
  */
-function createThumbnail(element, inputWidth, inputHeight, mimeType) {
+function createThumbnail(element: ThumbnailableElement, inputWidth: number, inputHeight: number, mimeType: string): Promise<IThumbnail> {
     return new Promise((resolve) => {
         let targetWidth = inputWidth;
         let targetHeight = inputHeight;
@@ -98,7 +143,7 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
  * @param {File} imageFile The file to load in an image element.
  * @return {Promise} A promise that resolves with the html image element.
  */
-async function loadImageElement(imageFile) {
+async function loadImageElement(imageFile: File) {
     // Load the file into an html element
     const img = document.createElement("img");
     const objectUrl = URL.createObjectURL(imageFile);
@@ -128,8 +173,7 @@ async function loadImageElement(imageFile) {
             for (const chunk of chunks) {
                 if (chunk.name === 'pHYs') {
                     if (chunk.data.byteLength !== PHYS_HIDPI.length) return;
-                    const hidpi = chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
-                    return hidpi;
+                    return chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
                 }
             }
             return false;
@@ -152,7 +196,7 @@ async function loadImageElement(imageFile) {
  */
 function infoForImageFile(matrixClient, roomId, imageFile) {
     let thumbnailType = "image/png";
-    if (imageFile.type == "image/jpeg") {
+    if (imageFile.type === "image/jpeg") {
         thumbnailType = "image/jpeg";
     }
 
@@ -175,15 +219,15 @@ function infoForImageFile(matrixClient, roomId, imageFile) {
  * @param {File} videoFile The file to load in an video element.
  * @return {Promise} A promise that resolves with the video image element.
  */
-function loadVideoElement(videoFile) {
+function loadVideoElement(videoFile): Promise<HTMLVideoElement> {
     return new Promise((resolve, reject) => {
         // Load the file into an html element
         const video = document.createElement("video");
 
         const reader = new FileReader();
 
-        reader.onload = function(e) {
-            video.src = e.target.result;
+        reader.onload = function(ev) {
+            video.src = ev.target.result as string;
 
             // Once ready, returns its size
             // Wait until we have enough data to thumbnail the first frame.
@@ -231,11 +275,11 @@ function infoForVideoFile(matrixClient, roomId, videoFile) {
  * @return {Promise} A promise that resolves with an ArrayBuffer when the file
  *   is read.
  */
-function readFileAsArrayBuffer(file) {
+function readFileAsArrayBuffer(file: File | Blob): Promise<ArrayBuffer> {
     return new Promise((resolve, reject) => {
         const reader = new FileReader();
         reader.onload = function(e) {
-            resolve(e.target.result);
+            resolve(e.target.result as ArrayBuffer);
         };
         reader.onerror = function(e) {
             reject(e);
@@ -257,7 +301,7 @@ function readFileAsArrayBuffer(file) {
  *  If the file is unencrypted then the object will have a "url" key.
  *  If the file is encrypted then the object will have a "file" key.
  */
-function uploadFile(matrixClient, roomId, file, progressHandler) {
+function uploadFile(matrixClient: MatrixClient, roomId: string, file: File | Blob, progressHandler?: any) {
     let canceled = false;
     if (matrixClient.isRoomEncrypted(roomId)) {
         // If the room is encrypted then encrypt the file before uploading it.
@@ -290,7 +334,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             }
             return {"file": encryptInfo};
         });
-        prom.abort = () => {
+        (prom as IAbortablePromise<any>).abort = () => {
             canceled = true;
             if (uploadPromise) MatrixClientPeg.get().cancelUpload(uploadPromise);
         };
@@ -313,30 +357,27 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
 }
 
 export default class ContentMessages {
-    constructor() {
-        this.inprogress = [];
-        this.nextId = 0;
-        this._mediaConfig = null;
-    }
+    private inprogress: IUpload[] = [];
+    private mediaConfig: IMediaConfig = null;
 
     static sharedInstance() {
-        if (global.mx_ContentMessages === undefined) {
-            global.mx_ContentMessages = new ContentMessages();
+        if (window.mx_ContentMessages === undefined) {
+            window.mx_ContentMessages = new ContentMessages();
         }
-        return global.mx_ContentMessages;
+        return window.mx_ContentMessages;
     }
 
-    _isFileSizeAcceptable(file) {
-        if (this._mediaConfig !== null &&
-            this._mediaConfig["m.upload.size"] !== undefined &&
-            file.size > this._mediaConfig["m.upload.size"]) {
+    _isFileSizeAcceptable(file: File) {
+        if (this.mediaConfig !== null &&
+            this.mediaConfig["m.upload.size"] !== undefined &&
+            file.size > this.mediaConfig["m.upload.size"]) {
             return false;
         }
         return true;
     }
 
     _ensureMediaConfigFetched() {
-        if (this._mediaConfig !== null) return;
+        if (this.mediaConfig !== null) return;
 
         console.log("[Media Config] Fetching");
         return MatrixClientPeg.get().getMediaConfig().then((config) => {
@@ -347,11 +388,11 @@ export default class ContentMessages {
             console.log("[Media Config] Could not fetch config, so not limiting uploads.");
             return {};
         }).then((config) => {
-            this._mediaConfig = config;
+            this.mediaConfig = config;
         });
     }
 
-    sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
+    sendStickerContentToRoom(url: string, roomId: string, info: string, text: string, matrixClient: MatrixClient) {
         return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
             throw e;
@@ -359,14 +400,14 @@ export default class ContentMessages {
     }
 
     getUploadLimit() {
-        if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) {
-            return this._mediaConfig["m.upload.size"];
+        if (this.mediaConfig !== null && this.mediaConfig["m.upload.size"] !== undefined) {
+            return this.mediaConfig["m.upload.size"];
         } else {
             return null;
         }
     }
 
-    async sendContentListToRoom(files, roomId, matrixClient) {
+    async sendContentListToRoom(files: File[], roomId: string, matrixClient: MatrixClient) {
         if (matrixClient.isGuest()) {
             dis.dispatch({action: 'require_registration'});
             return;
@@ -375,22 +416,18 @@ export default class ContentMessages {
         const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
         if (isQuoting) {
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const shouldUpload = await new Promise((resolve) => {
-                Modal.createTrackedDialog('Upload Reply Warning', '', QuestionDialog, {
-                    title: _t('Replying With Files'),
-                    description: (
-                        <div>{_t(
-                            'At this time it is not possible to reply with a file. ' +
-                            'Would you like to upload this file without replying?',
-                        )}</div>
-                    ),
-                    hasCancelButton: true,
-                    button: _t("Continue"),
-                    onFinished: (shouldUpload) => {
-                        resolve(shouldUpload);
-                    },
-                });
+            const {finished} = Modal.createTrackedDialog('Upload Reply Warning', '', QuestionDialog, {
+                title: _t('Replying With Files'),
+                description: (
+                    <div>{_t(
+                        'At this time it is not possible to reply with a file. ' +
+                        'Would you like to upload this file without replying?',
+                    )}</div>
+                ),
+                hasCancelButton: true,
+                button: _t("Continue"),
             });
+            const [shouldUpload]: [boolean] = await finished;
             if (!shouldUpload) return;
         }
 
@@ -409,17 +446,12 @@ export default class ContentMessages {
 
         if (tooBigFiles.length > 0) {
             const UploadFailureDialog = sdk.getComponent("dialogs.UploadFailureDialog");
-            const uploadFailureDialogPromise = new Promise((resolve) => {
-                Modal.createTrackedDialog('Upload Failure', '', UploadFailureDialog, {
-                    badFiles: tooBigFiles,
-                    totalFiles: files.length,
-                    contentMessages: this,
-                    onFinished: (shouldContinue) => {
-                        resolve(shouldContinue);
-                    },
-                });
+            const {finished} = Modal.createTrackedDialog('Upload Failure', '', UploadFailureDialog, {
+                badFiles: tooBigFiles,
+                totalFiles: files.length,
+                contentMessages: this,
             });
-            const shouldContinue = await uploadFailureDialogPromise;
+            const [shouldContinue]: [boolean] = await finished;
             if (!shouldContinue) return;
         }
 
@@ -431,31 +463,28 @@ export default class ContentMessages {
         for (let i = 0; i < okFiles.length; ++i) {
             const file = okFiles[i];
             if (!uploadAll) {
-                const shouldContinue = await new Promise((resolve) => {
-                    Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
-                        file,
-                        currentIndex: i,
-                        totalFiles: okFiles.length,
-                        onFinished: (shouldContinue, shouldUploadAll) => {
-                            if (shouldUploadAll) {
-                                uploadAll = true;
-                            }
-                            resolve(shouldContinue);
-                        },
-                    });
+                const {finished} = Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
+                    file,
+                    currentIndex: i,
+                    totalFiles: okFiles.length,
                 });
+                const [shouldContinue, shouldUploadAll]: [boolean, boolean] = await finished;
                 if (!shouldContinue) break;
+                if (shouldUploadAll) {
+                    uploadAll = true;
+                }
             }
             promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore);
         }
     }
 
-    _sendContentToRoom(file, roomId, matrixClient, promBefore) {
-        const content = {
+    _sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise<any>) {
+        const content: IContent = {
             body: file.name || 'Attachment',
             info: {
                 size: file.size,
             },
+            msgtype: "", // set later
         };
 
         // if we have a mime type for the file, add it to the message metadata
@@ -464,25 +493,25 @@ export default class ContentMessages {
         }
 
         const prom = new Promise((resolve) => {
-            if (file.type.indexOf('image/') == 0) {
+            if (file.type.indexOf('image/') === 0) {
                 content.msgtype = 'm.image';
-                infoForImageFile(matrixClient, roomId, file).then((imageInfo)=>{
+                infoForImageFile(matrixClient, roomId, file).then((imageInfo) => {
                     extend(content.info, imageInfo);
                     resolve();
-                }, (error)=>{
-                    console.error(error);
+                }, (e) => {
+                    console.error(e);
                     content.msgtype = 'm.file';
                     resolve();
                 });
-            } else if (file.type.indexOf('audio/') == 0) {
+            } else if (file.type.indexOf('audio/') === 0) {
                 content.msgtype = 'm.audio';
                 resolve();
-            } else if (file.type.indexOf('video/') == 0) {
+            } else if (file.type.indexOf('video/') === 0) {
                 content.msgtype = 'm.video';
-                infoForVideoFile(matrixClient, roomId, file).then((videoInfo)=>{
+                infoForVideoFile(matrixClient, roomId, file).then((videoInfo) => {
                     extend(content.info, videoInfo);
                     resolve();
-                }, (error)=>{
+                }, (e) => {
                     content.msgtype = 'm.file';
                     resolve();
                 });
@@ -492,14 +521,15 @@ export default class ContentMessages {
             }
         });
 
-        prom.abort = () => {
-            upload.cancelled = true;
+        // create temporary abort handler for before the actual upload gets passed off to js-sdk
+        (prom as IAbortablePromise<any>).abort = () => {
+            upload.canceled = true;
         };
 
-        const upload = {
+        const upload: IUpload = {
             fileName: file.name || 'Attachment',
             roomId: roomId,
-            total: 0,
+            total: file.size,
             loaded: 0,
             promise: prom,
         };
@@ -509,14 +539,13 @@ export default class ContentMessages {
         // Focus the composer view
         dis.dispatch({action: 'focus_composer'});
 
-        let error;
-
         function onProgress(ev) {
             upload.total = ev.total;
             upload.loaded = ev.loaded;
             dis.dispatch({action: 'upload_progress', upload: upload});
         }
 
+        let error;
         return prom.then(function() {
             if (upload.canceled) throw new UploadCanceledError();
             // XXX: upload.promise must be the promise that
@@ -529,7 +558,7 @@ export default class ContentMessages {
                 content.file = result.file;
                 content.url = result.url;
             });
-        }).then((url) => {
+        }).then(() => {
             // Await previous message being sent into the room
             return promBefore;
         }).then(function() {
@@ -539,7 +568,7 @@ export default class ContentMessages {
             error = err;
             if (!upload.canceled) {
                 let desc = _t("The file '%(fileName)s' failed to upload.", {fileName: upload.fileName});
-                if (err.http_status == 413) {
+                if (err.http_status === 413) {
                     desc = _t(
                         "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
                         {fileName: upload.fileName},
@@ -552,11 +581,9 @@ export default class ContentMessages {
                 });
             }
         }).finally(() => {
-            const inprogressKeys = Object.keys(this.inprogress);
             for (let i = 0; i < this.inprogress.length; ++i) {
-                const k = inprogressKeys[i];
-                if (this.inprogress[k].promise === upload.promise) {
-                    this.inprogress.splice(k, 1);
+                if (this.inprogress[i].promise === upload.promise) {
+                    this.inprogress.splice(i, 1);
                     break;
                 }
             }
@@ -565,7 +592,7 @@ export default class ContentMessages {
                 // clear the media size limit so we fetch it again next time
                 // we try to upload
                 if (error && error.http_status === 413) {
-                    this._mediaConfig = null;
+                    this.mediaConfig = null;
                 }
                 dis.dispatch({action: 'upload_failed', upload, error});
             } else {
@@ -579,13 +606,11 @@ export default class ContentMessages {
         return this.inprogress.filter(u => !u.canceled);
     }
 
-    cancelUpload(promise) {
-        const inprogressKeys = Object.keys(this.inprogress);
+    cancelUpload(promise: Promise<any>) {
         let upload;
         for (let i = 0; i < this.inprogress.length; ++i) {
-            const k = inprogressKeys[i];
-            if (this.inprogress[k].promise === promise) {
-                upload = this.inprogress[k];
+            if (this.inprogress[i].promise === promise) {
+                upload = this.inprogress[i];
                 break;
             }
         }

From 4a08c8cedaedd2809f0d5eae1a5719cf2e659a0f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 16:00:57 +0100
Subject: [PATCH 3153/3235] sort file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/ContentMessages.tsx | 100 ++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index 6de318f81d..bf9435914c 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -360,38 +360,6 @@ export default class ContentMessages {
     private inprogress: IUpload[] = [];
     private mediaConfig: IMediaConfig = null;
 
-    static sharedInstance() {
-        if (window.mx_ContentMessages === undefined) {
-            window.mx_ContentMessages = new ContentMessages();
-        }
-        return window.mx_ContentMessages;
-    }
-
-    _isFileSizeAcceptable(file: File) {
-        if (this.mediaConfig !== null &&
-            this.mediaConfig["m.upload.size"] !== undefined &&
-            file.size > this.mediaConfig["m.upload.size"]) {
-            return false;
-        }
-        return true;
-    }
-
-    _ensureMediaConfigFetched() {
-        if (this.mediaConfig !== null) return;
-
-        console.log("[Media Config] Fetching");
-        return MatrixClientPeg.get().getMediaConfig().then((config) => {
-            console.log("[Media Config] Fetched config:", config);
-            return config;
-        }).catch(() => {
-            // Media repo can't or won't report limits, so provide an empty object (no limits).
-            console.log("[Media Config] Could not fetch config, so not limiting uploads.");
-            return {};
-        }).then((config) => {
-            this.mediaConfig = config;
-        });
-    }
-
     sendStickerContentToRoom(url: string, roomId: string, info: string, text: string, matrixClient: MatrixClient) {
         return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
@@ -431,13 +399,13 @@ export default class ContentMessages {
             if (!shouldUpload) return;
         }
 
-        await this._ensureMediaConfigFetched();
+        await this.ensureMediaConfigFetched();
 
         const tooBigFiles = [];
         const okFiles = [];
 
         for (let i = 0; i < files.length; ++i) {
-            if (this._isFileSizeAcceptable(files[i])) {
+            if (this.isFileSizeAcceptable(files[i])) {
                 okFiles.push(files[i]);
             } else {
                 tooBigFiles.push(files[i]);
@@ -474,11 +442,30 @@ export default class ContentMessages {
                     uploadAll = true;
                 }
             }
-            promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore);
+            promBefore = this.sendContentToRoom(file, roomId, matrixClient, promBefore);
         }
     }
 
-    _sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise<any>) {
+    getCurrentUploads() {
+        return this.inprogress.filter(u => !u.canceled);
+    }
+
+    cancelUpload(promise: Promise<any>) {
+        let upload: IUpload;
+        for (let i = 0; i < this.inprogress.length; ++i) {
+            if (this.inprogress[i].promise === promise) {
+                upload = this.inprogress[i];
+                break;
+            }
+        }
+        if (upload) {
+            upload.canceled = true;
+            MatrixClientPeg.get().cancelUpload(upload.promise);
+            dis.dispatch({action: 'upload_canceled', upload});
+        }
+    }
+
+    private sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise<any>) {
         const content: IContent = {
             body: file.name || 'Attachment',
             info: {
@@ -602,22 +589,35 @@ export default class ContentMessages {
         });
     }
 
-    getCurrentUploads() {
-        return this.inprogress.filter(u => !u.canceled);
+    private isFileSizeAcceptable(file: File) {
+        if (this.mediaConfig !== null &&
+            this.mediaConfig["m.upload.size"] !== undefined &&
+            file.size > this.mediaConfig["m.upload.size"]) {
+            return false;
+        }
+        return true;
     }
 
-    cancelUpload(promise: Promise<any>) {
-        let upload;
-        for (let i = 0; i < this.inprogress.length; ++i) {
-            if (this.inprogress[i].promise === promise) {
-                upload = this.inprogress[i];
-                break;
-            }
-        }
-        if (upload) {
-            upload.canceled = true;
-            MatrixClientPeg.get().cancelUpload(upload.promise);
-            dis.dispatch({action: 'upload_canceled', upload});
+    private ensureMediaConfigFetched() {
+        if (this.mediaConfig !== null) return;
+
+        console.log("[Media Config] Fetching");
+        return MatrixClientPeg.get().getMediaConfig().then((config) => {
+            console.log("[Media Config] Fetched config:", config);
+            return config;
+        }).catch(() => {
+            // Media repo can't or won't report limits, so provide an empty object (no limits).
+            console.log("[Media Config] Could not fetch config, so not limiting uploads.");
+            return {};
+        }).then((config) => {
+            this.mediaConfig = config;
+        });
+    }
+
+    static sharedInstance() {
+        if (window.mx_ContentMessages === undefined) {
+            window.mx_ContentMessages = new ContentMessages();
         }
+        return window.mx_ContentMessages;
     }
 }

From db6853e022307bf367fe407f845e6f3d8dbdc01b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 24 May 2020 20:00:02 +0100
Subject: [PATCH 3154/3235] Fix Emoji Picker footer being too small if text
 overflows

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/css/views/emojipicker/_EmojiPicker.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 24561eeeb9..400e40e233 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -190,7 +190,7 @@ limitations under the License.
 
 .mx_EmojiPicker_footer {
     border-top: 1px solid $message-action-bar-border-color;
-    height: 72px;
+    min-height: 72px;
 
     display: flex;
     align-items: center;

From 1f52b5e2036ef0c6fb1192f9db9df41a63f562bd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 10:59:31 +0100
Subject: [PATCH 3155/3235] Update Crypto Store Too New copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/MatrixClientPeg.js                                  | 4 +---
 src/components/views/dialogs/CryptoStoreTooNewDialog.js | 6 ++----
 src/i18n/strings/en_EN.json                             | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 21f05b9759..704f1052fc 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -158,9 +158,7 @@ class _MatrixClientPeg {
                 // 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,
-                });
+                Modal.createDialog(CryptoStoreTooNewDialog);
             }
             // this can happen for a number of reasons, the most likely being
             // that the olm library was missing. It's not fatal.
diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
index 081e84696c..4694619601 100644
--- a/src/components/views/dialogs/CryptoStoreTooNewDialog.js
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -42,11 +42,9 @@ export default (props) => {
     };
 
     const description =
-        _t("You've previously used a newer version of Riot on %(host)s. " +
+        _t("You've previously used a newer version of Riot with this session. " +
             "To use this version again with end to end encryption, you will " +
-            "need to sign out and back in again. ",
-            {host: props.host},
-        );
+            "need to sign out and back in again.");
 
     const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
     const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 96ccf1589d..67ee31e71e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1597,7 +1597,7 @@
     "Create Room": "Create Room",
     "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. ",
+    "You've previously used a newer version of Riot with this session. 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 with this session. 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",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",

From c372e8edee78520346e778f69769bbd84b6660c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 11:29:06 +0100
Subject: [PATCH 3156/3235] fix viewGroup to actually show the group if
 possible

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 48dc72f4fa..b1076c6ec9 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -932,9 +932,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private viewGroup(payload) {
+    private async viewGroup(payload) {
         const groupId = payload.group_id;
+
+        // Wait for the first sync to complete
+        if (!this.firstSyncComplete) {
+            if (!this.firstSyncPromise) {
+                console.warn('Cannot view a group before first sync. group_id:', groupId);
+                return;
+            }
+            await this.firstSyncPromise.promise;
+        }
+
         this.setState({
+            view: Views.LOGGED_IN,
             currentGroupId: groupId,
             currentGroupIsNew: payload.group_is_new,
         });

From c73c3ae9271365ce94e48ae4a74436174b8697f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 11:35:21 +0100
Subject: [PATCH 3157/3235] Update confirm passphrase copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js         | 5 ++++-
 .../views/dialogs/secretstorage/CreateSecretStorageDialog.js | 5 ++++-
 src/i18n/strings/en_EN.json                                  | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 532b2f960f..7c5170fab6 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -284,8 +284,10 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let matchText;
+        let changeText;
         if (this.state.passPhraseConfirm === this.state.passPhrase) {
             matchText = _t("That matches!");
+            changeText = _t("Use a different passphrase?");
         } else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) {
             // only tell them they're wrong if they've actually gone wrong.
             // Security concious readers will note that if you left riot-web unattended
@@ -295,6 +297,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             // Note that not having typed anything at all will not hit this clause and
             // fall through so empty box === no hint.
             matchText = _t("That doesn't match.");
+            changeText = _t("Go back to set it again.");
         }
 
         let passPhraseMatch = null;
@@ -303,7 +306,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 <div>{matchText}</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {_t("Go back to set it again.")}
+                        {changeText}
                     </AccessibleButton>
                 </div>
             </div>;
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 12b71206d0..e6ab07c449 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -538,8 +538,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const Field = sdk.getComponent('views.elements.Field');
 
         let matchText;
+        let changeText;
         if (this.state.passPhraseConfirm === this.state.passPhrase) {
             matchText = _t("That matches!");
+            changeText = _t("Use a different passphrase?");
         } else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) {
             // only tell them they're wrong if they've actually gone wrong.
             // Security concious readers will note that if you left riot-web unattended
@@ -549,6 +551,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             // Note that not having typed anything at all will not hit this clause and
             // fall through so empty box === no hint.
             matchText = _t("That doesn't match.");
+            changeText = _t("Go back to set it again.");
         }
 
         let passPhraseMatch = null;
@@ -557,7 +560,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <div>{matchText}</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {_t("Go back to set it again.")}
+                        {changeText}
                     </AccessibleButton>
                 </div>
             </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 96ccf1589d..ded320250b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2217,6 +2217,7 @@
     "Back up encrypted message keys": "Back up encrypted message keys",
     "Set up with a recovery key": "Set up with a recovery key",
     "That matches!": "That matches!",
+    "Use a different passphrase?": "Use a different passphrase?",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
     "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",

From 63f78b0808f89dc0fbffd70cc3d176d45d1a57b3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 13:40:05 +0100
Subject: [PATCH 3158/3235] Move tooltip to ts

---
 package.json                                  |   2 +
 .../views/elements/{Field.js => Field.tsx}    | 159 ++++++++++--------
 .../elements/{Tooltip.js => Tooltip.tsx}      |  86 +++++-----
 .../views/settings/account/PhoneNumbers.js    |   2 +-
 src/dispatcher/actions.ts                     |   5 +
 src/dispatcher/payloads/ViewUserPayload.ts    |  17 ++
 yarn.lock                                     |  12 ++
 7 files changed, 170 insertions(+), 113 deletions(-)
 rename src/components/views/elements/{Field.js => Field.tsx} (67%)
 rename src/components/views/elements/{Tooltip.js => Tooltip.tsx} (71%)

diff --git a/package.json b/package.json
index 7c008d5ccc..620957dd04 100644
--- a/package.json
+++ b/package.json
@@ -118,9 +118,11 @@
     "@peculiar/webcrypto": "^1.0.22",
     "@types/classnames": "^2.2.10",
     "@types/flux": "^3.1.9",
+    "@types/lodash": "^4.14.152",
     "@types/modernizr": "^3.5.3",
     "@types/qrcode": "^1.3.4",
     "@types/react": "16.9",
+    "@types/react-dom": "^16.9.8",
     "@types/zxcvbn": "^4.4.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.tsx
similarity index 67%
rename from src/components/views/elements/Field.js
rename to src/components/views/elements/Field.tsx
index 2ebb90da26..100a6ebf56 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.tsx
@@ -15,10 +15,9 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
-import { debounce } from 'lodash';
+import { debounce, Cancelable } from 'lodash';
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -29,51 +28,88 @@ function getId() {
     return `${BASE_ID}_${count++}`;
 }
 
-export default class Field extends React.PureComponent {
-    static propTypes = {
-        // The field's ID, which binds the input and label together. Immutable.
-        id: PropTypes.string,
-        // The element to create. Defaults to "input".
-        // To define options for a select, use <Field><option ... /></Field>
-        element: PropTypes.oneOf(["input", "select", "textarea"]),
-        // The field's type (when used as an <input>). Defaults to "text".
-        type: PropTypes.string,
-        // id of a <datalist> element for suggestions
-        list: PropTypes.string,
-        // The field's label string.
-        label: PropTypes.string,
-        // The field's placeholder string. Defaults to the label.
-        placeholder: PropTypes.string,
-        // The field's value.
-        // This is a controlled component, so the value is required.
-        value: PropTypes.string.isRequired,
-        // Optional component to include inside the field before the input.
-        prefix: PropTypes.node,
-        // Optional component to include inside the field after the input.
-        postfix: PropTypes.node,
-        // The callback called whenever the contents of the field
-        // changes.  Returns an object with `valid` boolean field
-        // and a `feedback` react component field to provide feedback
-        // to the user.
-        onValidate: PropTypes.func,
-        // If specified, overrides the value returned by onValidate.
-        flagInvalid: PropTypes.bool,
-        // If specified, contents will appear as a tooltip on the element and
-        // validation feedback tooltips will be suppressed.
-        tooltipContent: PropTypes.node,
-        // If specified alongside tooltipContent, the class name to apply to the
-        // tooltip itself.
-        tooltipClassName: PropTypes.string,
-        // If specified, an additional class name to apply to the field container
-        className: PropTypes.string,
-        // All other props pass through to the <input>.
-    };
+interface IProps extends React.HTMLAttributes<HTMLElement> {
+    // The field's ID, which binds the input and label together. Immutable.
+    id?: string,
+    // The element to create. Defaults to "input".
+    // To define options for a select, use <Field><option ... /></Field>
+    element?: InputType,
+    // The field's type (when used as an <input>). Defaults to "text".
+    type?: string,
+    // id of a <datalist> element for suggestions
+    list?: string,
+    // The field's label string.
+    label?: string,
+    // The field's placeholder string. Defaults to the label.
+    placeholder?: string,
+    // The field's value.
+    // This is a controlled component, so the value is required.
+    value: string,
+    // Optional component to include inside the field before the input.
+    prefixComponent?: React.ReactNode,
+    // Optional component to include inside the field after the input.
+    postfixComponent?: React.ReactNode,
+    // The callback called whenever the contents of the field
+    // changes.  Returns an object with `valid` boolean field
+    // and a `feedback` react component field to provide feedback
+    // to the user.
+    onValidate?: (
+        args: {value: string, focused: boolean, allowEmpty: boolean}
+    ) => {valid: boolean, feedback: React.ReactNode},
+    // If specified, overrides the value returned by onValidate.
+    flagInvalid?: boolean,
+    // If specified, contents will appear as a tooltip on the element and
+    // validation feedback tooltips will be suppressed.
+    tooltipContent?: React.ReactNode,
+    // If specified alongside tooltipContent, the class name to apply to the
+    // tooltip itself.
+    tooltipClassName?: string,
+    // If specified, an additional class name to apply to the field container
+    className?: string,
+    // All other props pass through to the <input>.
+}
 
+enum InputType {
+    INPUT = "input",
+    SELECT = "select",
+    TEXTAREA = "textarea",
+}
+
+interface IState {
+    valid: boolean,
+    feedback: React.ReactNode,
+    feedbackVisible: boolean,
+    focused: boolean,
+}
+
+export default class Field extends React.PureComponent<IProps, IState> {
+    private id: string;
+    private input: HTMLInputElement;
+
+    /*
+     * This was changed from throttle to debounce: this is more traditional for
+     * form validation since it means that the validation doesn't happen at all
+     * until the user stops typing for a bit (debounce defaults to not running on
+     * the leading edge). If we're doing an HTTP hit on each validation, we have more
+     * incentive to prevent validating input that's very unlikely to be valid.
+     * We may find that we actually want different behaviour for registration
+     * fields, in which case we can add some options to control it.
+     */
+    validateOnChange = debounce(() => {
+        this.validate({
+            focused: true,
+        });
+    }, VALIDATION_THROTTLE_MS);
+
+    focus() {
+        this.input.focus();
+    }
     constructor(props) {
         super(props);
         this.state = {
             valid: undefined,
             feedback: undefined,
+            feedbackVisible: false,
             focused: false,
         };
 
@@ -114,11 +150,7 @@ export default class Field extends React.PureComponent {
         }
     };
 
-    focus() {
-        this.input.focus();
-    }
-
-    async validate({ focused, allowEmpty = true }) {
+    async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
         if (!this.props.onValidate) {
             return;
         }
@@ -149,48 +181,37 @@ export default class Field extends React.PureComponent {
         }
     }
 
-    /*
-     * This was changed from throttle to debounce: this is more traditional for
-     * form validation since it means that the validation doesn't happen at all
-     * until the user stops typing for a bit (debounce defaults to not running on
-     * the leading edge). If we're doing an HTTP hit on each validation, we have more
-     * incentive to prevent validating input that's very unlikely to be valid.
-     * We may find that we actually want different behaviour for registration
-     * fields, in which case we can add some options to control it.
-     */
-    validateOnChange = debounce(() => {
-        this.validate({
-            focused: true,
-        });
-    }, VALIDATION_THROTTLE_MS);
+
 
     render() {
         const {
-            element, prefix, postfix, className, onValidate, children,
+            element, prefixComponent, postfixComponent, className, onValidate, children,
             tooltipContent, flagInvalid, tooltipClassName, list, ...inputProps} = this.props;
 
         const inputElement = element || "input";
 
         // Set some defaults for the <input> element
         inputProps.type = inputProps.type || "text";
-        inputProps.ref = input => this.input = input;
+        const ref = input => this.input = input;
         inputProps.placeholder = inputProps.placeholder || inputProps.label;
         inputProps.id = this.id; // this overwrites the id from props
 
         inputProps.onFocus = this.onFocus;
         inputProps.onChange = this.onChange;
         inputProps.onBlur = this.onBlur;
-        inputProps.list = list;
 
-        const fieldInput = React.createElement(inputElement, inputProps, children);
+        // Appease typescript's inference
+        const inputProps_ = {...inputProps, ref, list};
+
+        const fieldInput = React.createElement(inputElement, inputProps_, children);
 
         let prefixContainer = null;
-        if (prefix) {
-            prefixContainer = <span className="mx_Field_prefix">{prefix}</span>;
+        if (prefixComponent) {
+            prefixContainer = <span className="mx_Field_prefix">{prefixComponent}</span>;
         }
         let postfixContainer = null;
-        if (postfix) {
-            postfixContainer = <span className="mx_Field_postfix">{postfix}</span>;
+        if (postfixComponent) {
+            postfixContainer = <span className="mx_Field_postfix">{postfixComponent}</span>;
         }
 
         const hasValidationFlag = flagInvalid !== null && flagInvalid !== undefined;
@@ -198,7 +219,7 @@ export default class Field extends React.PureComponent {
             // If we have a prefix element, leave the label always at the top left and
             // don't animate it, as it looks a bit clunky and would add complexity to do
             // properly.
-            mx_Field_labelAlwaysTopLeft: prefix,
+            mx_Field_labelAlwaysTopLeft: prefixComponent,
             mx_Field_valid: onValidate && this.state.valid === true,
             mx_Field_invalid: hasValidationFlag
                 ? flagInvalid
diff --git a/src/components/views/elements/Tooltip.js b/src/components/views/elements/Tooltip.tsx
similarity index 71%
rename from src/components/views/elements/Tooltip.js
rename to src/components/views/elements/Tooltip.tsx
index 4807ade3db..753052717c 100644
--- a/src/components/views/elements/Tooltip.js
+++ b/src/components/views/elements/Tooltip.tsx
@@ -18,67 +18,68 @@ limitations under the License.
 */
 
 
-import React from 'react';
+import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
 import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
+import { ViewTooltipPayload } from '../../../dispatcher/payloads/ViewUserPayload';
+import { Action } from '../../../dispatcher/actions';
 
 const MIN_TOOLTIP_HEIGHT = 25;
 
-export default createReactClass({
-    displayName: 'Tooltip',
-
-    propTypes: {
+interface IProps {
         // Class applied to the element used to position the tooltip
-        className: PropTypes.string,
+        className: string,
         // Class applied to the tooltip itself
-        tooltipClassName: PropTypes.string,
+        tooltipClassName: string,
         // Whether the tooltip is visible or hidden.
         // The hidden state allows animating the tooltip away via CSS.
         // Defaults to visible if unset.
-        visible: PropTypes.bool,
+        visible: boolean,
         // the react element to put into the tooltip
-        label: PropTypes.node,
-    },
+        label: React.ReactNode,
+}
 
-    getDefaultProps() {
-        return {
-            visible: true,
-        };
-    },
+class Tooltip extends React.Component<IProps> {
+    private tooltipContainer: HTMLElement;
+    private tooltip: void | Element | Component<Element, any, any>;
+    private parent: Element;
+
+
+    static defaultProps = {
+        visible: true,
+    };
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
-    componentDidMount: function() {
+    componentDidMount() {
         this.tooltipContainer = document.createElement("div");
         this.tooltipContainer.className = "mx_Tooltip_wrapper";
         document.body.appendChild(this.tooltipContainer);
-        window.addEventListener('scroll', this._renderTooltip, true);
+        window.addEventListener('scroll', this.renderTooltip, true);
 
-        this.parent = ReactDOM.findDOMNode(this).parentNode;
+        this.parent = ReactDOM.findDOMNode(this).parentNode as Element;
 
-        this._renderTooltip();
-    },
+        this.renderTooltip();
+    }
 
-    componentDidUpdate: function() {
-        this._renderTooltip();
-    },
+    componentDidUpdate() {
+        this.renderTooltip();
+    }
 
     // Remove the wrapper element, as the tooltip has finished using it
-    componentWillUnmount: function() {
-        dis.dispatch({
-            action: 'view_tooltip',
+    componentWillUnmount() {
+        dis.dispatch<ViewTooltipPayload>({
+            action: Action.ViewTooltip,
             tooltip: null,
             parent: null,
         });
 
         ReactDOM.unmountComponentAtNode(this.tooltipContainer);
         document.body.removeChild(this.tooltipContainer);
-        window.removeEventListener('scroll', this._renderTooltip, true);
-    },
+        window.removeEventListener('scroll', this.renderTooltip, true);
+    }
 
-    _updatePosition(style) {
+    private updatePosition(style: {[key: string]: any}) {
         const parentBox = this.parent.getBoundingClientRect();
         let offset = 0;
         if (parentBox.height > MIN_TOOLTIP_HEIGHT) {
@@ -91,16 +92,15 @@ export default createReactClass({
         style.top = (parentBox.top - 2) + window.pageYOffset + offset;
         style.left = 6 + parentBox.right + window.pageXOffset;
         return style;
-    },
+    }
 
-    _renderTooltip: function() {
+    private renderTooltip() {
         // Add the parent's position to the tooltips, so it's correctly
         // positioned, also taking into account any window zoom
         // NOTE: The additional 6 pixels for the left position, is to take account of the
         // tooltips chevron
-        const parent = ReactDOM.findDOMNode(this).parentNode;
-        let style = {};
-        style = this._updatePosition(style);
+        const parent = ReactDOM.findDOMNode(this).parentNode as Element;
+        const style = this.updatePosition({});
         // Hide the entire container when not visible. This prevents flashing of the tooltip
         // if it is not meant to be visible on first mount.
         style.display = this.props.visible ? "block" : "none";
@@ -118,21 +118,21 @@ export default createReactClass({
         );
 
         // Render the tooltip manually, as we wish it not to be rendered within the parent
-        this.tooltip = ReactDOM.render(tooltip, this.tooltipContainer);
+        this.tooltip = ReactDOM.render<Element>(tooltip, this.tooltipContainer);
 
         // Tell the roomlist about us so it can manipulate us if it wishes
-        dis.dispatch({
-            action: 'view_tooltip',
+        dis.dispatch<ViewTooltipPayload>({
+            action: Action.ViewTooltip,
             tooltip: this.tooltip,
             parent: parent,
         });
-    },
+    }
 
-    render: function() {
+    render() {
         // Render a placeholder
         return (
             <div className={this.props.className} >
             </div>
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index ad2dabd8ae..02e995ac45 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -267,7 +267,7 @@ export default class PhoneNumbers extends React.Component {
                             label={_t("Phone Number")}
                             autoComplete="off"
                             disabled={this.state.verifying}
-                            prefix={phoneCountry}
+                            prefixComponent={phoneCountry}
                             value={this.state.newPhoneNumber}
                             onChange={this._onChangeNewPhoneNumber}
                         />
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index a2f9c3efe3..9cd9f7c9ba 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -38,5 +38,10 @@ export enum Action {
      * Open the user settings. No additional payload information required.
      */
     ViewUserSettings = "view_user_settings",
+
+    /**
+     * Sets the current tooltip
+     */
+    ViewTooltip = "view_tooltip",
 }
 
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
index ed602d4e24..d1f6db8968 100644
--- a/src/dispatcher/payloads/ViewUserPayload.ts
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -17,6 +17,7 @@ limitations under the License.
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
+import { Component } from "react";
 
 export interface ViewUserPayload extends ActionPayload {
     action: Action.ViewUser,
@@ -27,3 +28,19 @@ export interface ViewUserPayload extends ActionPayload {
      */
     member?: RoomMember;
 }
+
+export interface ViewTooltipPayload extends ActionPayload {
+    action: Action.ViewTooltip,
+
+    /*
+     * The tooltip to render. If it's null the tooltip will not be rendered
+     * We need the void type because of typescript headaches.
+     */
+    tooltip: null | void | Element | Component<Element, any, any>;
+
+    /*
+     * The parent under which to render the tooltip. Can be null to remove
+     * the parent type.
+     */
+    parent: null | Element
+}
diff --git a/yarn.lock b/yarn.lock
index 93118dab22..9253442b7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1265,6 +1265,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
+"@types/lodash@^4.14.152":
+  version "4.14.152"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.152.tgz#7e7679250adce14e749304cdb570969f77ec997c"
+  integrity sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1292,6 +1297,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/react-dom@^16.9.8":
+  version "16.9.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
+  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*":
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"

From 10e433314c77ecfeca55ea91e15a2920a49d8670 Mon Sep 17 00:00:00 2001
From: "J. A. Durieux" <weblate@b.biep.org>
Date: Sat, 23 May 2020 21:31:51 +0000
Subject: [PATCH 3159/3235] Translated using Weblate (Dutch)

Currently translated at 91.6% (2126 of 2322 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 5dfb779ff1..b4bb5dc5bd 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -45,7 +45,7 @@
     "Continue": "Doorgaan",
     "Could not connect to the integration server": "Verbinding met de integratieserver is mislukt",
     "Cancel": "Annuleren",
-    "Accept": "Aanvaarden",
+    "Accept": "Aannemen",
     "Active call (%(roomName)s)": "Actieve oproep (%(roomName)s)",
     "Add": "Toevoegen",
     "Add a topic": "Voeg een onderwerp toe",
@@ -140,7 +140,7 @@
     "Create Room": "Gesprek aanmaken",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
     "/ddg is not a command": "/ddg is geen opdracht",
-    "Deactivate Account": "Account deactiveren",
+    "Deactivate Account": "Account sluiten",
     "Decline": "Weigeren",
     "Decrypt %(text)s": "%(text)s ontsleutelen",
     "Decryption error": "Ontsleutelingsfout",
@@ -283,7 +283,7 @@
     "The phone number entered looks invalid": "Het ingevoerde telefoonnummer ziet er ongeldig uit",
     "This email address is already in use": "Dit e-mailadres is al in gebruik",
     "This email address was not found": "Dit e-mailadres is niet gevonden",
-    "The email address linked to your account must be entered.": "Het e-mailadres dat met uw account verbonden is moet ingevoerd worden.",
+    "The email address linked to your account must be entered.": "Het aan uw account gekoppelde e-mailadres dient ingevoerd worden.",
     "The remote side failed to pick up": "De andere kant heeft niet opgenomen",
     "This room has no local addresses": "Dit gesprek heeft geen lokale adressen",
     "This room is not recognised.": "Dit gesprek wordt niet herkend.",
@@ -378,7 +378,7 @@
     "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.": "Hiermee kunt u  vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
     "You must join the room to see its files": "Slechts na toetreding tot het gesprek zult u de bestanden kunnen zien",
-    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigingen weigeren",
+    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen weigeren",
     "Failed to invite": "Uitnodigen is mislukt",
     "Failed to invite the following users to the %(roomName)s room:": "Kon de volgende gebruikers niet uitnodigen voor gesprek %(roomName)s:",
     "Confirm Removal": "Verwijdering bevestigen",
@@ -584,11 +584,11 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zijn weggegaan en weer toegetreden",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s is %(count)s keer weggegaan en weer toegetreden",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is weggegaan en weer toegetreden",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgewezen",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgewezen",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s maal afgeslagen",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgeslagen",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal geweigerd",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging geweigerd",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "De uitnodigingen van %(severalUsers)s zijn %(count)s keer ingetrokken",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s maal ingetrokken",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "De uitnodiging van %(oneUser)s is ingetrokken",
@@ -648,7 +648,7 @@
     "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van gebruiker uit het overzicht van %(groupId)s is mislukt",
     "The user '%(displayName)s' could not be removed from the summary.": "De gebruiker ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
     "Failed to update community": "Bijwerken van gemeenschap is mislukt",
-    "Unable to accept invite": "Kan de uitnodiging niet aanvaarden",
+    "Unable to accept invite": "Kan de uitnodiging niet aannemen",
     "Unable to reject invite": "Kan de uitnodiging niet weigeren",
     "Leave Community": "Gemeenschap verlaten",
     "Leave %(groupName)s?": "%(groupName)s verlaten?",
@@ -741,7 +741,7 @@
     "Send Custom Event": "Aangepaste gebeurtenis versturen",
     "Advanced notification settings": "Geavanceerde meldingsinstellingen",
     "delete the alias.": "verwijder de bijnaam.",
-    "To return to your account in future you need to <u>set a password</u>": "Tenzij u <u>een wachtwoord instelt</u> zult u uw account niet meer kunnen benaderen",
+    "To return to your account in future you need to <u>set a password</u>": "Om uw account te kunnen blijven gebruiken dient u <u>een wachtwoord in te stellen</u>",
     "Forget": "Vergeten",
     "You cannot delete this image. (%(code)s)": "U kunt deze afbeelding niet verwijderen. (%(code)s)",
     "Cancel Sending": "Versturen annuleren",
@@ -830,7 +830,7 @@
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen aan een gesprek op dit netwerk",
     "Mentions only": "Alleen vermeldingen",
     "Wednesday": "Woensdag",
-    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Na afmelding kunt u terugkeren tot uw account, en u op andere apparaten aanmelden.",
     "Enable email notifications": "E-mailmeldingen inschakelen",
     "Event Type": "Gebeurtenistype",
     "Download this file": "Dit bestand downloaden",
@@ -863,10 +863,10 @@
     "Yes, I want to help!": "Ja, ik wil helpen!",
     "Popout widget": "Widget in nieuw venster openen",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of heeft u geen toestemming die te bekijken.",
-    "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>": "Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan deze deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze actie is onomkeerbaar.</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.": "Het deactiveren van uw account <b>zal er standaard niet voor zorgen dat de berichten die u heeft verstuurd vergeten worden.</b> Als u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan.",
+    "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>": "Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan ze deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</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.": "Het sluiten van uw account <b>maakt op zich niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
     "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.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
-    "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)": "Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige gebruikers een onvolledig beeld krijgen van gesprekken)",
+    "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)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (<b>Let op:</b> hierdoor zullen gebruikers een onvolledig beeld krijgen van gesprekken)",
     "To continue, please enter your password:": "Voer uw wachtwoord in om verder te gaan:",
     "Clear Storage and Sign Out": "Opslag wissen en afmelden",
     "Send Logs": "Logboek versturen",
@@ -877,7 +877,7 @@
     "Can't leave Server Notices room": "Kan servermeldingsgesprek niet verlaten",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek is bedoeld voor belangrijke berichten van de thuisserver, dus u kunt het niet verlaten.",
     "Terms and Conditions": "Gebruiksvoorwaarden",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-thuisserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten lezen en aanvaarden.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-thuisserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten bestuderen en aanvaarden.",
     "Review terms and conditions": "Gebruiksvoorwaarden lezen",
     "Call in Progress": "Lopend gesprek",
     "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
@@ -989,7 +989,7 @@
     "Render simple counters in room header": "Eenvoudige tellers bovenaan het gesprek tonen",
     "Enable Emoji suggestions while typing": "Emoticons voorstellen tijdens het typen",
     "Show a placeholder for removed messages": "Vulling tonen voor verwijderde berichten",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Berichten over deelnamen en verlatingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Berichten over toe- en uittredingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
     "Show avatar changes": "Veranderingen van avatar tonen",
     "Show display name changes": "Veranderingen van weergavenamen tonen",
     "Show read receipts sent by other users": "Door andere gebruikers verstuurde leesbevestigingen tonen",
@@ -1107,7 +1107,7 @@
     "Language and region": "Taal en regio",
     "Theme": "Thema",
     "Account management": "Accountbeheer",
-    "Deactivating your account is a permanent action - be careful!": "Het deactiveren van uw account kan niet ongedaan gemaakt worden - wees voorzichtig!",
+    "Deactivating your account is a permanent action - be careful!": "Pas op!  Het sluiten van uw account kan niet ongedaan gemaakt worden!",
     "General": "Algemeen",
     "Legal": "Wettelijk",
     "Credits": "Met dank aan",
@@ -1122,7 +1122,7 @@
     "Timeline": "Tijdslijn",
     "Room list": "Gesprekslijst",
     "Autocomplete delay (ms)": "Vertraging voor automatisch aanvullen (ms)",
-    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigingen aanvaarden",
+    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen aannemen",
     "Key backup": "Sleutelback-up",
     "Security & Privacy": "Veiligheid & privacy",
     "Missing media permissions, click the button below to request.": "Mediatoestemmingen ontbreken, klik op de knop hieronder om deze aan te vragen.",
@@ -1210,7 +1210,7 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze gebruiker om hem/haar als vertrouwd te markeren. Gebruikers vertrouwen geeft u extra gemoedsrust bij het gebruik van eind-tot-eind-versleutelde berichten.",
     "Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
     "Incoming Verification Request": "Inkomend verificatieverzoek",
-    "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.": "U heeft voorheen Riot op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. Omdat de lokale cache niet compatibel is tussen deze twee instellingen, moet Riot uw account opnieuw synchroniseren.",
+    "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.": "U heeft voorheen Riot op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. De lokale cache is niet compatibel tussen deze twee instellingen, zodat Riot uw account moet hersynchroniseren.",
     "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.": "Indien de andere versie van Riot nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als Riot op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
     "Incompatible local cache": "Incompatibele lokale cache",
     "Clear cache and resync": "Cache wissen en hersynchroniseren",
@@ -1261,18 +1261,18 @@
     "Set a new status...": "Stel een nieuwe status in…",
     "Hide": "Verbergen",
     "This homeserver would like to make sure you are not a robot.": "Deze thuisserver wil graag weten of u geen robot bent.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "U kunt de aangepaste serveropties gebruiken om u aan te melden bij andere Matrix-servers, door een andere thuisserver-URL op te geven. Dit biedt u de mogelijkheid om deze toepassing te gebruiken met een bestaande Matrix-account op een andere thuisserver.",
-    "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de thuisserver te doornemen en aanvaarden",
-    "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze thuisserver te doornemen en aanvaarden:",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Middels de aangepaste serveropties kunt u zich aanmelden bij andere Matrix-servers, door een andere thuisserver-URL op te geven. Zo kunt u deze toepassing met een bestaande Matrix-account op een andere thuisserver gebruiken.",
+    "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de thuisserver door te nemen en te aanvaarden",
+    "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze thuisserver door te nemen en te aanvaarden:",
     "Your Modular server": "Uw Modular-server",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Voer de locatie van uw Modular-thuisserver in. Deze kan uw eigen domeinnaam gebruiken, of een subdomein van <a>modular.im</a> zijn.",
     "Server Name": "Servernaam",
     "The username field must not be blank.": "Het gebruikersnaamveld mag niet leeg zijn.",
     "Username": "Gebruikersnaam",
-    "Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel er een nieuw in</a>",
+    "Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel een nieuw in</a>",
     "Sign in to your Matrix account on %(serverName)s": "Aanmelden met uw Matrix-account op %(serverName)s",
     "Change": "Wijzigen",
-    "Create your Matrix account on %(serverName)s": "Maak uw Matrix-account aan op %(serverName)s",
+    "Create your Matrix account on %(serverName)s": "Maak uw Matrix-account op %(serverName)s aan",
     "Email (optional)": "E-mailadres (optioneel)",
     "Phone (optional)": "Telefoonnummer (optioneel)",
     "Confirm": "Bevestigen",
@@ -1444,7 +1444,7 @@
     "Edit message": "Bericht bewerken",
     "View Servers in Room": "Servers in gesprek bekijken",
     "Unable to validate homeserver/identity server": "Kan thuis-/identiteitsserver niet valideren",
-    "Sign in to your Matrix account on <underlinedServerName />": "Meld u aan met uw Matrix-account op <underlinedServerName />",
+    "Sign in to your Matrix account on <underlinedServerName />": "Meld u met uw Matrix-account op <underlinedServerName /> aan",
     "Use an email address to recover your account": "Gebruik een e-mailadres om uw account te herstellen",
     "Enter email address (required on this homeserver)": "Voer een e-mailadres in (vereist op deze thuisserver)",
     "Doesn't look like a valid email address": "Dit lijkt geen geldig e-mailadres",
@@ -1457,7 +1457,7 @@
     "Doesn't look like a valid phone number": "Dit lijkt geen geldig telefoonnummer",
     "Enter username": "Voer gebruikersnaam in",
     "Some characters not allowed": "Sommige tekens zijn niet toegestaan",
-    "Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account aan op <underlinedServerName />",
+    "Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account op <underlinedServerName /> aan",
     "Add room": "Gesprek toevoegen",
     "Your profile": "Uw profiel",
     "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
@@ -1485,7 +1485,7 @@
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "U kunt uw wachtwoord opnieuw instellen, maar sommige functies zullen pas beschikbaar komen wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een serverbeheerder.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "U kunt zich aanmelden, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een systeembeheerder.",
     "<a>Log in</a> to your new account.": "<a>Meld u aan</a> met uw nieuwe account.",
-    "You can now close this window or <a>log in</a> to your new account.": "U kunt dit venster nu sluiten, of <a>u aanmelden</a> met uw nieuwe account.",
+    "You can now close this window or <a>log in</a> to your new account.": "U kunt dit venster nu sluiten, of u met uw nieuwe account <a>aanmelden</a>.",
     "Registration Successful": "Registratie geslaagd",
     "Upload all": "Alles versturen",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Uw nieuwe account (%(newAccountId)s) is geregistreerd, maar u bent reeds aangemeld met een andere account (%(loggedInUserId)s).",
@@ -1509,7 +1509,7 @@
     "Resend removal": "Verwijdering opnieuw versturen",
     "Failed to re-authenticate due to a homeserver problem": "Opnieuw aanmelden is mislukt wegens een probleem met de thuisserver",
     "Failed to re-authenticate": "Opnieuw aanmelden is mislukt",
-    "Enter your password to sign in and regain access to your account.": "Voer uw wachtwoord in om u aan te melden en opnieuw toegang te verkrijgen tot uw account.",
+    "Enter your password to sign in and regain access to your account.": "Voer uw wachtwoord in om u aan te melden en toegang tot uw account te herkrijgen.",
     "Forgotten your password?": "Wachtwoord vergeten?",
     "You're signed out": "U bent afgemeld",
     "Clear personal data": "Persoonlijke gegevens wissen",
@@ -1521,9 +1521,9 @@
     "Terms of Service": "Gebruiksvoorwaarden",
     "Service": "Dienst",
     "Summary": "Samenvatting",
-    "Sign in and regain access to your account.": "Meld u aan en verkrijg opnieuw toegang tot uw account.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt zich niet aanmelden met uw account. Neem contact op met de beheerder van uw thuisserver voor meer informatie.",
-    "This account has been deactivated.": "Deze account is gedeactiveerd.",
+    "Sign in and regain access to your account.": "Meld u aan en herkrijg toegang tot uw account.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt zich niet aanmelden met uw account. Neem voor meer informatie contact op met de beheerder van uw thuisserver.",
+    "This account has been deactivated.": "Deze account is gesloten.",
     "Messages": "Berichten",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toont een lijst van beschikbare opdrachten, met hun gebruiken en beschrijvingen",
@@ -1539,7 +1539,7 @@
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere gebruikers gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.",
     "Integration Manager": "Integratiebeheerder",
     "Discovery": "Ontdekking",
-    "Deactivate account": "Account deactiveren",
+    "Deactivate account": "Account sluiten",
     "Always show the window menu bar": "De venstermenubalk altijd tonen",
     "Unable to revoke sharing for email address": "Kan delen voor dit e-mailadres niet intrekken",
     "Unable to share email address": "Kan e-mailadres niet delen",
@@ -1611,11 +1611,11 @@
     "Strikethrough": "Doorstreept",
     "Code block": "Codeblok",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Er is een fout opgetreden (%(errcode)s) bij het valideren van uw uitnodiging. U kunt deze informatie doorgeven aan een gespreksbeheerder.",
-    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s, wat niet aan uw account gekoppeld is",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Koppel dit e-mailadres aan uw account in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s, dat niet aan uw account gekoppeld is",
+    "Link this email with your account in Settings to receive invites directly in Riot.": "Koppel in de instellingen dit e-mailadres aan uw account om uitnodigingen direct in Riot te ontvangen.",
     "This invite to %(roomName)s was sent to %(email)s": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Gebruik een identiteitsserver in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Deel dit e-mailadres in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Gebruik in de instellingen een identiteitsserver om uitnodigingen direct in Riot te ontvangen.",
+    "Share this email in Settings to receive invites directly in Riot.": "Deel in de instellingen dit e-mailadres om uitnodigingen direct in Riot te ontvangen.",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om uit te nodigen op e-mailadres. <default>Gebruik de standaardserver (%(defaultIdentityServerName)s)</default> of beheer de server in de <settings>Instellingen</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om anderen uit te nodigen via e-mail. Beheer de server in de <settings>Instellingen</settings>.",
     "Please fill why you're reporting.": "Gelieve aan te geven waarom u deze melding indient.",
@@ -1623,8 +1623,8 @@
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Dit bericht melden zal zijn unieke ‘gebeurtenis-ID’ versturen naar de beheerder van uw thuisserver. Als de berichten in dit gesprek versleuteld zijn, zal de beheerder van uw thuisserver het bericht niet kunnen lezen, noch enige bestanden of afbeeldingen zien.",
     "Send report": "Rapport versturen",
     "Report Content": "Inhoud melden",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Stel een e-mailadres in voor accountherstel. Gebruik optioneel een e-mailadres of telefoonnummer om vindbaar te zijn voor bestaande contacten.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Stel een e-mailadres in voor accountherstel. Gebruik optioneel een e-mailadres om vindbaar te zijn voor bestaande contacten.",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in. Gebruik eventueel een e-mailadres of telefoonnummer om vindbaar te zijn voor bestaande contacten.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in.  Gebruik eventueel een e-mailadres om vindbaar te zijn voor bestaande contacten.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Voer uw aangepaste thuisserver-URL in <a>Wat betekent dit?</a>",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Voer uw aangepaste identiteitsserver-URL in <a>Wat betekent dit?</a>",
     "Explore": "Ontdekken",
@@ -1864,7 +1864,7 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde gesprekken.",
     "Indexed rooms:": "Geïndexeerde gesprekken:",
     "Cross-signing and secret storage are enabled.": "Kruiselings ondertekenen en sleutelopslag zijn ingeschakeld.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar deze is nog niet vertrouwd door de huidige sessie.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar die wordt nog niet vertrouwd door de huidige sessie.",
     "Cross-signing and secret storage are not yet set up.": "Kruiselings ondertekenen en sleutelopslag zijn nog niet ingesteld.",
     "Bootstrap cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag instellen",
     "Reset cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag opnieuw instellen",
@@ -1898,7 +1898,7 @@
     "Homeserver feature support:": "Functies ondersteund door thuisserver:",
     "exists": "bestaat",
     "Sign In or Create Account": "Meld u aan of maak een account aan",
-    "Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak er een nieuwe aan om verder te gaan.",
+    "Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak een nieuwe aan om verder te gaan.",
     "Create Account": "Account aanmaken",
     "Displays information about a user": "Geeft informatie weer over een gebruiker",
     "Order rooms by name": "Gesprekken sorteren op naam",
@@ -1938,7 +1938,7 @@
     "Send as message": "Versturen als bericht",
     "Failed to connect to integration manager": "Verbinding met integratiebeheerder is mislukt",
     "Waiting for %(displayName)s to accept…": "Wachten tot %(displayName)s aanvaardt…",
-    "Accepting…": "Aanvaarden…",
+    "Accepting…": "Toestaan…",
     "Start Verification": "Verificatie beginnen",
     "Messages in this room are end-to-end encrypted.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Uw berichten zijn beveiligd, en enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
@@ -1995,7 +1995,7 @@
     "You cancelled": "U heeft geannuleerd",
     "%(name)s declined": "%(name)s heeft geweigerd",
     "%(name)s cancelled": "%(name)s heeft geannuleerd",
-    "Accepting …": "Aanvaarden…",
+    "Accepting …": "Toestaan…",
     "Declining …": "Weigeren…",
     "%(name)s wants to verify": "%(name)s wil verifiëren",
     "You sent a verification request": "U heeft een verificatieverzoek verstuurd",
@@ -2061,14 +2061,14 @@
     "You added a new session '%(displayName)s', which is requesting encryption keys.": "U heeft een nieuwe sessie ‘%(displayName)s’ toegevoegd, die om versleutelingssleutels vraagt.",
     "Your unverified session '%(displayName)s' is requesting encryption keys.": "Uw ongeverifieerde sessie ‘%(displayName)s’ vraagt om versleutelingssleutels.",
     "Loading session info...": "Sessie-info wordt geladen…",
-    "Your account is not secure": "Uw account is niet veilig",
+    "Your account is not secure": "Uw account is onveilig",
     "Your password": "Uw wachtwoord",
     "This session, or the other session": "Deze sessie, of de andere sessie",
     "The internet connection either session is using": "De internetverbinding gebruikt door een van de sessies",
     "We recommend you change your password and recovery key in Settings immediately": "We raden u aan onmiddellijk uw wachtwoord en herstelsleutel te wijzigen in de instellingen",
     "New session": "Nieuwe sessie",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Gebruik deze sessie om uw nieuwe sessie te verifiëren, waardoor deze laatste toegang verkrijgt tot versleutelde berichten:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account mogelijk gecompromitteerd.",
+    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account wellicht geschonden.",
     "This wasn't me": "Dat was ik niet",
     "Automatically invite users": "Gebruikers automatisch uitnodigen",
     "Upgrade private room": "Privégesprek bijwerken",
@@ -2076,7 +2076,7 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door fouten, ontbrekende functies of problemen met de beveiliging.",
     "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw Riot ondervindt, <a>dien dan een foutmelding in</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U werkt dit gesprek bij van <oldVersion /> naar <newVersion />.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Dit biedt u de mogelijkheid om terug te keren naar uw account nadat u zich heeft afgemeld, en om u aan te melden bij andere sessies.",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Daardoor kunt u na afmelding terugkeren tot uw account, en u bij andere sessies aanmelden.",
     "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "U blokkeert momenteel niet-geverifieerde sessies; om berichten te sturen naar deze sessies moet u ze verifiëren.",
     "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We raden u aan om het verificatieproces voor elke sessie te doorlopen om te bevestigen dat ze aan hun rechtmatige eigenaar toebehoren, maar u kunt het bericht ook opnieuw versturen zonder verificatie indien u dit wenst.",
     "Room contains unknown sessions": "Gesprek bevat onbekende sessies",
@@ -2122,8 +2122,8 @@
     "Go Back": "Terugkeren",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel sleutelback-up in of schrijf uw gesprekssleutels van een andere sessie weg vooraleer u een nieuw wachtwoord instelt.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "U bent afgemeld bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.",
-    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Verkrijg opnieuw de toegang tot uw account en herstel de versleutelingssleutels die in deze sessie opgeslagen zijn. Hierzonder zult u niet al uw beveiligde berichten in al uw sessies kunnen lezen.",
-    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (versleutelingssleutels inbegrepen) worden nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Herwin toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder welke sommige van uw beveiligde berichten in al uw sessies onleesbaar zijn.",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (waaronder versleutelingssleutels) zijn nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.",
     "Command Autocomplete": "Opdrachten automatisch aanvullen",
     "DuckDuckGo Results": "DuckDuckGo-resultaten",
     "Sender session information": "Sessie-informatie van afzender",
@@ -2177,7 +2177,7 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bevestig uw identiteit met Eenmalige Aanmelding om dit telefoonnummer toe te voegen.",
     "Confirm adding phone number": "Bevestig toevoegen van het telefoonnummer",
     "Click the button below to confirm adding this phone number.": "Klik op de knop hieronder om het toevoegen van dit telefoonnummer te bevestigen.",
-    "Review Sessions": "Sessieverificatie",
+    "Review Sessions": "Sessies nazien",
     "If you cancel now, you won't complete your operation.": "Als u de operatie afbreekt kunt u haar niet voltooien.",
     "Review where you’re logged in": "Kijk na waar u aangemeld bent",
     "New login. Was this you?": "Nieuwe aanmelding - was u dat?",
@@ -2200,5 +2200,14 @@
     "Verify your other session using one of the options below.": "Verifieer uw andere sessie op een van onderstaande wijzen.",
     "Manually Verify by Text": "Handmatig middels een tekst",
     "Interactively verify by Emoji": "Interactief middels emojis",
-    "Support adding custom themes": "Sta maatwerkthema's toe"
+    "Support adding custom themes": "Sta maatwerkthema's toe",
+    "Opens chat with the given user": "Start een tweegesprek met die gebruiker",
+    "Sends a message to the given user": "Zendt die gebruiker een bericht",
+    "Font scaling": "Lettergrootte",
+    "Use the improved room list (in development - refresh to apply changes)": "Gebruik de verbeterde gesprekslijst (in ontwikkeling - ververs om veranderingen te zien)",
+    "Verify all your sessions to ensure your account & messages are safe": "Controleer al uw sessies om zeker te zijn dat uw account & berichten veilig zijn",
+    "Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe aanmelding op uw account: %(name)s",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bevestig uw intentie deze account te sluiten door met Single Sign On uw identiteit te bewijzen.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten?  Dit is onomkeerbaar.",
+    "Confirm account deactivation": "Bevestig accountsluiting"
 }

From 2a2967d88b386696f42942da0b25af861cb80ff9 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 23 May 2020 18:30:36 +0000
Subject: [PATCH 3160/3235] Translated using Weblate (Esperanto)

Currently translated at 100.0% (2322 of 2322 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 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index f201d5a117..983ba9e7db 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -385,7 +385,7 @@
     "Communities": "Komunumoj",
     "Home": "Hejmo",
     "Could not connect to the integration server": "Malsukcesis konektiĝi al la kuniga servilo",
-    "Manage Integrations": "Administri integrojn",
+    "Manage Integrations": "Administri kunigojn",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)saliĝis",
@@ -882,7 +882,7 @@
     "Delete Backup": "Forigi savkopion",
     "Language and region": "Lingvo kaj regiono",
     "Theme": "Haŭto",
-    "General": "Ĝenerala",
+    "General": "Ĝeneralaj",
     "<a>In reply to</a> <pill>": "<a>Responde al</a> <pill>",
     "Share Message": "Diskonigi",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
@@ -974,9 +974,9 @@
     "Room list": "Ĉambrolisto",
     "Ignored users": "Malatentaj uzantoj",
     "Key backup": "Sekurkopio de ŝlosilo",
-    "Security & Privacy": "Sekureco & Privateco",
+    "Security & Privacy": "Sekureco kaj Privateco",
     "Voice & Video": "Voĉo kaj vido",
-    "Room information": "Ĉambraj informoj",
+    "Room information": "Informoj pri ĉambro",
     "Internal room ID:": "Ena ĉambra identigilo:",
     "Room version": "Ĉambra versio",
     "Room version:": "Ĉambra versio:",
@@ -998,7 +998,7 @@
     "Remove messages": "Forigi mesaĝojn",
     "Notify everyone": "Sciigi ĉiujn",
     "Muted Users": "Silentigitaj uzantoj",
-    "Roles & Permissions": "Roloj & Permesoj",
+    "Roles & Permissions": "Roloj kaj Permesoj",
     "Enable encryption?": "Ĉu ŝalti ĉifradon?",
     "Share Link to User": "Kunhavigi ligilon al uzanto",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vidita de %(displayName)s (%(userName)s) je %(dateTime)s",
@@ -1017,7 +1017,7 @@
     "To continue, please enter your password:": "Por daŭrigi, bonvoluenigi vian pasvorton:",
     "Updating Riot": "Ĝisdatigante Riot",
     "Go back": "Reen iri",
-    "Room Settings - %(roomName)s": "Ĉambraj agordoj — %(roomName)s",
+    "Room Settings - %(roomName)s": "Agordoj de ĉambro – %(roomName)s",
     "Failed to upgrade room": "Malsukcesis gradaltigi ĉambron",
     "Refresh": "Aktualigi",
     "Checking...": "Kontrolante…",
@@ -1025,7 +1025,7 @@
     "Share User": "Kunhavigi uzanton",
     "Share Community": "Kunhavigi komunumon",
     "Share Room Message": "Kunhavigi ĉambran mesaĝon",
-    "COPY": "KOPIO",
+    "COPY": "KOPII",
     "Next": "Sekva",
     "Clear status": "Vakigi staton",
     "Update status": "Ĝisdatigi staton",
@@ -1386,7 +1386,7 @@
     "The conversation continues here.": "La interparolo pluas ĉi tie.",
     "This room has been replaced and is no longer active.": "Ĉi tiu ĉambro estas anstataŭita, kaj ne plu aktivas.",
     "Loading room preview": "Preparas antaŭrigardon al la ĉambro",
-    "Only room administrators will see this warning": "Nur ĉambraj administrantoj vidos ĉi tiun averton",
+    "Only room administrators will see this warning": "Nur administrantoj de ĉambro vidos ĉi tiun averton",
     "Error updating flair": "Eraris ĝisdatigo de etikedo",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Eraris ĝisdatigo de etikedo por ĉi tiu ĉambro. Aŭ la servilo ne permesas ĝin, aŭ dumtempa eraro okazis.",
     "Showing flair for these communities:": "Montras etikedojn de la jenaj komunumoj:",
@@ -2055,7 +2055,7 @@
     "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
     "You cancelled verification. Start verification again from their profile.": "Vi nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
     "Encryption enabled": "Ĉifrado estas ŝaltita",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝojn en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton el ĝia profilo.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton per ĝia profilo.",
     "Encryption not enabled": "Ĉifrado ne estas ŝaltita",
     "The encryption used by this room isn't supported.": "La ĉifro uzata de ĉi tiu ĉambro ne estas subtenata.",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vi malatentis ĉi tiun uzanton, ĝia mesaĝo estas do kaŝita. <a>Tamen montri.</a>",

From 4395c59eb1a9919582e5983b98b0b3a7d57e35be Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Mon, 25 May 2020 04:38:28 +0000
Subject: [PATCH 3161/3235] Translated using Weblate (Finnish)

Currently translated at 96.1% (2232 of 2322 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 05bf538ff9..66c07d3722 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -2276,5 +2276,42 @@
     "Select room from the room list": "Valitse huone huoneluettelosta",
     "Previous/next unread room or DM": "Edellinen/seuraava lukematon huone tai yksityisviesti",
     "Previous/next room or DM": "Edellinen/seuraava huone tai yksityisviesti",
-    "Toggle this dialog": "Tämä valintaikkuna päälle/pois"
+    "Toggle this dialog": "Tämä valintaikkuna päälle/pois",
+    "Use the improved room list (in development - refresh to apply changes)": "Käytä parannettua huoneluetteloa (kehitysversio — päivitä sivu ottaaksesi muutokset käyttöön)",
+    "Start verification again from the notification.": "Aloita varmennus uudelleen ilmoituksesta.",
+    "Start verification again from their profile.": "Aloita varmennus uudelleen hänen profiilista.",
+    "Verification timed out.": "Varmennuksessa kesti liikaa.",
+    "You cancelled verification on your other session.": "Peruutit varmennuksen toisessa istunnossasi.",
+    "%(displayName)s cancelled verification.": "%(displayName)s peruutti varmennuksen.",
+    "You cancelled verification.": "Peruutit varmennuksen.",
+    "Verification cancelled": "Varmennus peruutettu",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Tämän huoneen viestit ovat salattuja osapuolten välisellä salauksella. Lue lisää ja varmenna tämä käyttäjä hänen profiilistaan.",
+    "Enter the name of a new server you want to explore.": "Syötä sen uuden palvelimen nimi, jota hauat tutkia.",
+    "%(networkName)s rooms": "Verkon %(networkName)s huoneet",
+    "Destroy cross-signing keys?": "Tuhoa ristivarmennuksen avaimet?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Ristivarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyt ristivarmentamaan.",
+    "Clear cross-signing keys": "Tyhjennä ristivarmennuksen avaimet",
+    "Enable end-to-end encryption": "Ota osapuolten välinen salaus käyttöön",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Jotta tähän istuntoon voitaisiin luottaa, tarkista, että käyttäjän asetuksissa näkyvä avain täsmää alapuolella olevaan avaimeen:",
+    "To verify that this session 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 session matches the key below:": "Jotta tähän istuntoon voitaisiin luottaa, ota yhteyttä sen omistajaan jotain muuta kautta (esim. kasvotusten tai puhelimitse) ja kysy, että täsmääkö hänen käyttäjäasetuksissa näkemänsä istunnon avain alla olevaan:",
+    "Session key": "Istunnon tunnus",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Jos se täsmää, paina varmennuspainiketta alapuolella. Jos se ei täsmää, joku häiritsee tätä istuntoa ja haluat luultavasti painaa estä -painiketta sen sijaan.",
+    "Verification Requests": "Varmennuspyynnöt",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Tämän käyttäjän varmentaminen merkitsee hänen istuntonsa luotetuksi, ja myös merkkaa sinun istuntosi luotetuksi hänen laitteissaan.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Varmenna tämä laite merkataksesi se luotetuksi. Tähän laitteeseen luottaminen antaa sinulle ja muille käyttäjille ylimääräistä mielenrauhaa, kun käytätte osapuolten välistä salausta.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Tämän laitteen varmentaminen merkkaa sen luotetuksi, ja sinut varmentaneet käyttäjät luottavat automaattisesti tähän laitteeseen.",
+    "Confirm to continue": "Haluan jatkaa",
+    "Click the button below to confirm your identity.": "Paina alapuolella olevaa painiketta varmistaaksesi identiteettisi.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Emme onnistuneet luomaan yksityisviestiä. Tarkista, että kutsumasi henkilöt haluavat kutsusi ja yritä uudelleen.",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Seuraavat käyttäjät eivät välttämättä ole olemassa tai ne ovat epäkelpoja, joten niitä ei voida kutsua: %(csvNames)s",
+    "Recently Direct Messaged": "Viimeaikaiset yksityisviestit",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Aloita keskustelu jonkun kanssa käyttäen hänen nimeä, käyttäjätunnus (kuten <userId/>) tai sähköpostiosoitetta.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu tähän huoneeseen käyttäen nimeä, käyttäjätunnusta (kuten <userId/>), sähköpostiosoitetta tai <a>jaa tämä huone</a>.",
+    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Varmentamaton istuntosi '%(displayName)s' pyytää salausavaimia.",
+    "Riot encountered an error during upload of:": "Riot kohtasi virheen lähettäessään:",
+    "Upload completed": "Lähetys valmis",
+    "Cancelled signature upload": "Allekirjoituksen lähetys peruutettu",
+    "Unable to upload": "Lähettäminen ei ole mahdollista",
+    "Signature upload success": "Allekirjoituksen lähettäminen onnistui",
+    "Signature upload failed": "Allekirjoituksen lähettäminen epäonnistui"
 }

From 0ef0f81fc66865ddb9f1a40842032c189d20ffbe Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Sat, 23 May 2020 23:33:18 +0000
Subject: [PATCH 3162/3235] Translated using Weblate (Lithuanian)

Currently translated at 61.7% (1432 of 2322 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 | 201 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 176 insertions(+), 25 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 905ac59c0d..bb4f6cc7a4 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -149,7 +149,7 @@
     "remove %(name)s from the directory.": "pašalinti %(name)s iš katalogo.",
     "You can now return to your account after signing out, and sign in on other devices.": "Po atsijungimo galite grįžti prie savo paskyros ir prisijungti kituose įrenginiuose.",
     "Continue": "Tęsti",
-    "Enable email notifications": "Įjungti pranešimus el. paštu",
+    "Enable email notifications": "Įjungti el. pašto pranešimus",
     "Event Type": "Įvykio tipas",
     "No rooms to show": "Nėra kambarių rodymui",
     "Add rooms to this community": "Įtraukti kambarius į šią bendruomenę",
@@ -216,7 +216,7 @@
     "Failed to add the following rooms to %(groupId)s:": "Nepavyko pridėti šių kambarių į %(groupId)s:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot neturi leidimo siųsti jums pranešimus - patikrinkite savo naršyklės nustatymus",
     "Riot was not given permission to send notifications - please try again": "Riot nebuvo suteiktas leidimas siųsti pranešimus - bandykite dar kartą",
-    "Unable to enable Notifications": "Nepavyko įjungti Pranešimus",
+    "Unable to enable Notifications": "Nepavyko įjungti pranešimų",
     "This email address was not found": "Šis el. pašto adresas nebuvo rastas",
     "Admin": "Administratorius",
     "Start a chat": "Pradėti pokalbį",
@@ -523,9 +523,9 @@
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s pakeitė prisegtas kambario žinutes.",
     "Sorry, your homeserver is too old to participate in this room.": "Atleiskite, jūsų serverio versija yra per sena dalyvauti šiame kambaryje.",
     "Please contact your homeserver administrator.": "Prašome susisiekti su savo serverio administratoriumi.",
-    "Enable inline URL previews by default": "Įjungti tiesiogines URL nuorodų peržiūras pagal numatymą",
+    "Enable inline URL previews by default": "Įjungti URL nuorodų peržiūras kaip numatytasias",
     "Enable URL previews for this room (only affects you)": "Įjungti URL nuorodų peržiūras šiame kambaryje (įtakoja tik jus)",
-    "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras pagal numatymą dalyviams šiame kambaryje",
+    "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras kaip numatytasias šiame kambaryje esantiems dalyviams",
     "Confirm password": "Patvirtinkite slaptažodį",
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
@@ -539,10 +539,10 @@
     "Who can read history?": "Kas gali skaityti istoriją?",
     "Only room administrators will see this warning": "Šį įspėjimą matys tik kambario administratoriai",
     "Remote addresses for this room:": "Nuotoliniai šio kambario adresai:",
-    "You have <a>enabled</a> URL previews by default.": "Jūs esate <a>įjungę</a> URL nuorodų peržiūras pagal numatymą.",
-    "You have <a>disabled</a> URL previews by default.": "Jūs esate <a>išjungę</a> URL nuorodų peržiūras pagal numatymą.",
-    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros yra įjungtos pagal numatymą šio kambario dalyviams.",
-    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros yra išjungtos pagal numatymą šio kambario dalyviams.",
+    "You have <a>enabled</a> URL previews by default.": "Jūs esate <a>įjungę</a> URL nuorodų peržiūras kaip numatytasias.",
+    "You have <a>disabled</a> URL previews by default.": "Jūs esate <a>išjungę</a> URL nuorodų peržiūras kaip numatytasias.",
+    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros yra įjungtos kaip numatytasios šio kambario dalyviams.",
+    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros yra išjungtos kaip numatytosios šio kambario dalyviams.",
     "Invalid file%(extra)s": "Neteisingas failas %(extra)s",
     "This room is a continuation of another conversation.": "Šis kambarys yra kito pokalbio pratęsimas.",
     "Click here to see older messages.": "Spustelėkite čia, norėdami matyti senesnes žinutes.",
@@ -599,7 +599,7 @@
     "This homeserver has hit its Monthly Active User limit.": "Šis serveris pasiekė savo mėnesinį aktyvių naudotojų limitą.",
     "This homeserver has exceeded one of its resource limits.": "Šis serveris viršijo vieno iš savo išteklių limitą.",
     "Unable to connect to Homeserver. Retrying...": "Nepavyksta prisijungti prie serverio. Bandoma iš naujo...",
-    "Enable widget screenshots on supported widgets": "Palaikomuose valdikliuose įjungti valdiklių ekrano kopijas",
+    "Enable widget screenshots on supported widgets": "Įjungti valdiklių ekrano kopijas palaikomuose valdikliuose",
     "Export E2E room keys": "Eksportuoti E2E kambario raktus",
     "Last seen": "Paskutinį kartą matytas",
     "Unignore": "Nebeignoruoti",
@@ -611,7 +611,7 @@
     "System Alerts": "Sistemos įspėjimai",
     "Failed to unban": "Nepavyko atblokuoti",
     "not specified": "nenurodyta",
-    "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.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūra pagal numatymą yra išjungta, kad būtų užtikrinta, jog jūsų namų serveris (kuriame yra generuojamos peržiūros) negalės rinkti informacijos apie šiame kambaryje matomas nuorodas.",
+    "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.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūros pagal numatymą yra išjungtos, kad būtų užtikrinta, jog jūsų serveris (kur yra generuojamos peržiūros) negali rinkti informacijos apie jūsų šiame kambaryje peržiūrėtas nuorodas.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė %(roomName)s avatarą",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario avatarą.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario avatarą į <img/>",
@@ -641,7 +641,7 @@
     "And %(count)s more...|other": "Ir dar %(count)s...",
     "Existing Call": "Esamas skambutis",
     "A call is already in progress!": "Skambutis jau vyksta!",
-    "Default": "Paprastas vartotojas",
+    "Default": "Numatytas",
     "Restricted": "Apribotas",
     "Moderator": "Moderatorius",
     "Ignores a user, hiding their messages from you": "Ignoruoja vartotoją, slepiant nuo jūsų jo žinutes",
@@ -797,7 +797,7 @@
     "This room has no topic.": "Šis kambarys neturi temos.",
     "Sets the room name": "Nustato kambario pavadinimą",
     "Use an identity server": "Naudoti tapatybės serverį",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tam, kad būtų naudojamas numatytasis tapatybės serveris %(defaultIdentityServerName)s, spauskite tęsti, arba tvarkykite nustatymuose.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tam, kad toliau būtų naudojamas numatytasis tapatybės serveris %(defaultIdentityServerName)s, spauskite tęsti, arba tvarkykite nustatymuose.",
     "Use an identity server to invite by email. Manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tvarkykite nustatymuose.",
     "Joins room with given alias": "Prisijungia prie kambario su nurodytu slapyvardžiu",
     "Unbans user with given ID": "Atblokuoja vartotoją su nurodytu id",
@@ -831,8 +831,8 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s išsiuntė pakvietimą %(targetDisplayName)s prisijungti prie kambario.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo pat jų prisijungimo.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarė būsimą kambario istoriją matomą nežinomam (%(visibility)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s iš %(fromPowerLevel)s į %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s galios lygį.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s galios lygį iš %(fromPowerLevel)s į %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s.",
     "%(displayName)s is typing …": "%(displayName)s rašo …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s ir %(count)s kiti rašo …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s ir dar vienas rašo …",
@@ -1135,7 +1135,7 @@
     "Message deleted": "Žinutė ištrinta",
     "Message deleted by %(name)s": "Žinutė, ištrinta %(name)s",
     "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Įspėjimas</b>: Tai atlikite tik saugiame kompiuteryje.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Pasiekite savo saugių žinučių istoriją ir kryžminio parašo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo slaptafrazę.",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Pasiekite savo saugių žinučių istoriją ir kryžminio pasirašymo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo slaptafrazę.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujus atgavimo nustatymus</button2>",
     "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
@@ -1158,7 +1158,7 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs kituose seansuose negausite pranešimų, kol iš naujo prie jų neprisijungsite",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
     "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
-    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų seansų ir toliau nebegausite pranešimų. Tam, kad vėl aktyvuotumėte pranešimus, iš naujo prisijunkite kiekviename įrenginyje.",
+    "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Jūs buvote atjungtas iš visų seansų ir toliau nebegausite pranešimų. Tam, kad vėl įjungtumėte pranešimus, iš naujo prisijunkite kiekviename įrenginyje.",
     "Show more": "Rodyti daugiau",
     "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> prie naujos paskyros.",
     "Registration Successful": "Registracija sėkminga",
@@ -1191,8 +1191,8 @@
     "Cryptography": "Kriptografija",
     "Security & Privacy": "Saugumas ir Privatumas",
     "Voice & Video": "Garsas ir Vaizdas",
-    "Enable room encryption": "Įgalinti kambario šifravimą",
-    "Enable encryption?": "Įgalinti šifravimą?",
+    "Enable room encryption": "Įjungti kambario šifravimą",
+    "Enable encryption?": "Įjungti šifravimą?",
     "Encryption": "Šifravimas",
     "Once enabled, encryption cannot be disabled.": "Įjungus šifravimą jo nebus galima išjungti.",
     "Who can access this room?": "Kas turi prieigą prie šio kambario?",
@@ -1207,7 +1207,7 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Įvyko klaida atnaujinant ženkliukus šiam kambariui. Serveris gali jų neleisti arba įvyko laikina klaida.",
     "Showing flair for these communities:": "Ženkliukai rodomi šioms bendruomenėms:",
     "This room is not showing flair for any communities": "Šis kambarys nerodo ženkliukų jokioms bendruomenėms",
-    "Waiting for you to accept on your other session…": "Laukiama kol jūs priimsite savo kitame seanse…",
+    "Waiting for you to accept on your other session…": "Laukiama kol jūs priimsite kitame savo seanse…",
     "Start Verification": "Pradėti patvirtinimą",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifruotuose kambariuose jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
     "Verify User": "Patvirtinti vartotoją",
@@ -1224,13 +1224,13 @@
     "%(displayName)s cancelled verification.": "%(displayName)s atšaukė patvirtinimą.",
     "You cancelled verification.": "Jūs atšaukėte patvirtinimą.",
     "Verification cancelled": "Patvirtinimas atšauktas",
-    "Encryption enabled": "Šifravimas įgalintas",
+    "Encryption enabled": "Šifravimas įjungtas",
     "Encryption not enabled": "Šifravimas neįgalintas",
     "Display your community flair in rooms configured to show it.": "Rodyti savo bendruomenės ženkliukus kambariuose, kuriuose nustatytas jų rodymas.",
     "You're not currently a member of any communities.": "Jūs šiuo metu nesate jokios bendruomenės narys.",
     "More options": "Daugiau parinkčių",
     "Are you sure you want to remove <b>%(serverName)s</b>": "Ar tikrai norite pašalinti <b>%(serverName)s</b>",
-    "Enable end-to-end encryption": "Įgalinti visapusį šifravimą",
+    "Enable end-to-end encryption": "Įjungti visapusį šifravimą",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Jūs negalėsite vėliau to išjungti. Tiltai ir dauguma bot'ų dar nėra palaikomi.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Ar tikrai norite deaktyvuoti savo paskyrą? Tai yra negrįžtama.",
     "Verify session": "Patvirtinti seansą",
@@ -1240,7 +1240,7 @@
     "Are you sure you want to sign out?": "Ar tikrai norite atsijungti?",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Panaudoti šį seansą naujo patvirtinimui, suteikant jam prieigą prie šifruotų žinučių:",
     "If you didn’t sign in to this session, your account may be compromised.": "Jei jūs nesijungėte prie šios sesijos, jūsų paskyra gali būti sukompromituota.",
-    "This wasn't me": "Tai buvau ne aš",
+    "This wasn't me": "Tai ne aš",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jei jūs susidūrėte su klaidomis arba norėtumėte palikti atsiliepimą, praneškite mums GitHub'e.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Tam, kad būtų išvengta pasikartojančių problemų, pirmiausia <existingIssuesLink>peržiūrėkite esamas problemas</existingIssuesLink> (ir pridėkite +1) arba, jei nerandate, <newIssueLink>sukurkite naują svarstomą problemą</newIssueLink>.",
     "Report bugs & give feedback": "Pranešti apie klaidas ir palikti atsiliepimą",
@@ -1259,7 +1259,7 @@
     "You can now close this window or <a>log in</a> to your new account.": "Jūs galite uždaryti šį langą arba <a>prisijungti</a> į savo naują paskyrą.",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Patvirtinkite savo tapatybę verifikuodami šį prisijungimą viename iš kitų jūsų seansų, suteikdami jam prieigą prie šifruotų žinučių.",
     "This requires the latest Riot on your other devices:": "Tam reikia naujausios Riot versijos kituose jūsų įrenginiuose:",
-    "or another cross-signing capable Matrix client": "arba kitas kryžminį parašą palaikantis Matrix klientas",
+    "or another cross-signing capable Matrix client": "arba kitą kryžminį pasirašymą palaikantį Matrix klientą",
     "Use Recovery Passphrase or Key": "Naudoti atgavimo slaptafrazę arba raktą",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams.",
     "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieno Prisijungimo sistemą",
@@ -1308,12 +1308,163 @@
     "Room Topic": "Kambario Tema",
     "Your theme": "Jūsų tema",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Valdiklio ištrinimas pašalina jį visiems kambaryje esantiems vartotojams. Ar tikrai norite ištrinti šį valdiklį?",
-    "Enable 'Manage Integrations' in Settings to do this.": "Įgalinkite 'Valdyti integracijas' nustatymuose, kad tai atliktumėte.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Įjunkite 'Valdyti integracijas' nustatymuose, kad tai atliktumėte.",
     "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų Riot neleidžia jums naudoti integracijų valdiklio tam atlikti. Susisiekite su administratoriumi.",
     "Enter phone number (required on this homeserver)": "Įveskite telefono numerį (privaloma šiame serveryje)",
     "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
     "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
     "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
     "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas",
-    "Double check that your server supports the room version chosen and try again.": "Patikrinkite ar jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo."
+    "Double check that your server supports the room version chosen and try again.": "Dar kartą įsitikinkite, kad jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo.",
+    "Whether you're using Riot on a device where touch is the primary input mechanism": "Nesvarbu, ar naudojate „Riot“ įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
+    "Session already verified!": "Seansas jau patvirtintas!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Seansas jau patvirtintas, bet raktai NESUTAMPA!",
+    "Enable cross-signing to verify per-user instead of per-session": "Įjunkite kryžminį pasirašymą, kad patvirtintumėte vartotoją, o ne seansą",
+    "Enable Emoji suggestions while typing": "Įjungti emoji pasiūlymus rašant",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugų žinučių atgavimą šifruotuose kambariuose",
+    "Enable automatic language detection for syntax highlighting": "Įjungti automatinį kalbos aptikimą sintaksės paryškinimui",
+    "Enable big emoji in chat": "Įjungti didelius emoji pokalbiuose",
+    "Enable Community Filter Panel": "Įjungti bendruomenės filtrų skydelį",
+    "Enable message search in encrypted rooms": "Įjungti žinučių paiešką užšifruotuose kambariuose",
+    "Verified!": "Patvirtinta!",
+    "You've successfully verified this user.": "Jūs sėkmingai patvirtinote šį vartotoją.",
+    "Got It": "Supratau",
+    "Verify this session by completing one of the following:": "Patvirtinkite šį seansą atlikdami vieną iš šių veiksmų:",
+    "Scan this unique code": "Nuskaitykite šį unikalų kodą",
+    "Compare unique emoji": "Palyginkite unikalius emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Palyginkite unikalų emoji rinkinį, jei neturite fotoaparato nei viename įrenginyje",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Patvirtinkite, kad žemiau esantys emoji yra rodomi abiejuose seansuose, ta pačia tvarka:",
+    "Waiting for %(displayName)s to verify…": "Laukiama kol %(displayName)s patvirtins…",
+    "Cancelling…": "Atšaukiama…",
+    "They match": "Jie sutampa",
+    "They don't match": "Jie nesutampa",
+    "Dog": "Šuo",
+    "Cat": "Katė",
+    "Lion": "Liūtas",
+    "Horse": "Arklys",
+    "Unicorn": "Vienaragis",
+    "Pig": "Kiaulė",
+    "Elephant": "Dramblys",
+    "Rabbit": "Triušis",
+    "Panda": "Panda",
+    "Rooster": "Gaidys",
+    "Penguin": "Pingvinas",
+    "Turtle": "Vėžlys",
+    "Fish": "Žuvis",
+    "Octopus": "Aštunkojis",
+    "Butterfly": "Drugelis",
+    "Flower": "Gėlė",
+    "Tree": "Medis",
+    "Cactus": "Kaktusas",
+    "Mushroom": "Grybas",
+    "Globe": "Gaublys",
+    "Moon": "Mėnulis",
+    "Cloud": "Debesis",
+    "Fire": "Ugnis",
+    "Banana": "Bananas",
+    "Apple": "Obuolys",
+    "Strawberry": "Braškė",
+    "Corn": "Kukurūzas",
+    "Pizza": "Pica",
+    "Cake": "Tortas",
+    "Heart": "Širdis",
+    "Smiley": "Šypsenėlė",
+    "Robot": "Robotas",
+    "Hat": "Skrybėlė",
+    "Glasses": "Akiniai",
+    "Spanner": "Veržliaraktis",
+    "Santa": "Santa",
+    "Thumbs up": "Liuks",
+    "Umbrella": "Skėtis",
+    "Hourglass": "Smėlio laikrodis",
+    "Clock": "Laikrodis",
+    "Gift": "Dovana",
+    "Light bulb": "Lemputė",
+    "Book": "Knyga",
+    "Pencil": "Pieštukas",
+    "Paperclip": "Sąvaržėlė",
+    "Scissors": "Žirklės",
+    "Lock": "Spyna",
+    "Key": "Raktas",
+    "Hammer": "Plaktukas",
+    "Telephone": "Telefonas",
+    "Flag": "Vėliava",
+    "Train": "Traukinys",
+    "Bicycle": "Dviratis",
+    "Aeroplane": "Lėktuvas",
+    "Rocket": "Raketa",
+    "Trophy": "Trofėjus",
+    "Ball": "Kamuolys",
+    "Guitar": "Gitara",
+    "Trumpet": "Trimitas",
+    "Bell": "Varpas",
+    "Anchor": "Inkaras",
+    "Headphones": "Ausinės",
+    "Folder": "Aplankas",
+    "Pin": "Smeigtukas",
+    "Other users may not trust it": "Kiti vartotojai gali nepasitikėti",
+    "Upgrade": "Atnaujinti",
+    "From %(deviceName)s (%(deviceId)s)": "Iš %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Atsisakyti (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Sutikite su <policyLink />, kad tęstumėte:",
+    "Upload": "Įkelti",
+    "Your homeserver does not support cross-signing.": "Jūsų serveris nepalaiko kryžminio pasirašymo.",
+    "Cross-signing and secret storage are enabled.": "Kryžminis pasirašymas ir slapta saugykla yra įjungta.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Jūsų paskyra slaptoje saugykloje turi kryžminio pasirašymo tapatybę, bet šis seansas dar ja nepasitiki.",
+    "Cross-signing and secret storage are not yet set up.": "Kryžminis pasirašymas ir slapta saugykla dar nėra nustatyti.",
+    "Reset cross-signing and secret storage": "Atstatyti kryžminį pasirašymą ir slaptą saugyklą",
+    "Bootstrap cross-signing and secret storage": "Prikabinti kryžminį pasirašymą ir slaptą saugyklą",
+    "Cross-signing public keys:": "Kryžminio pasirašymo vieši raktai:",
+    "Cross-signing private keys:": "Kryžminio pasirašymo privatūs raktai:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individualiai patikrinkite kiekvieną vartotojo naudojamą seansą, kad pažymėtumėte jį kaip patikimą, nepasitikint kryžminiu pasirašymu patvirtintais įrenginiais.",
+    "Enable": "Įjungti",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> parašą iš <verify>patikrinto</verify> seanso <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> parašą iš <verify>nepatikrinto</verify> seanso <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> parašą iš <verify>patikrinto</verify> seanso <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> parašą iš <verify>nepatikrinto</verify> seanso <device></device>",
+    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Atsarginė rakto kopija saugoma slaptoje saugykloje, bet ši funkcija nėra įjungta šiame seanse. Įjunkite kryžminį pasirašymą Laboratorijose, kad galėtumėte keisti atsarginės rakto kopijos būseną.",
+    "Enable desktop notifications for this session": "Įjungti darbalaukio pranešimus šiam seansui",
+    "Enable audible notifications for this session": "Įjungti garsinius pranešimus šiam seansui",
+    "wait and try again later": "palaukite ir bandykite vėliau dar kartą",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Jei jūs nenorite naudoti <server /> radimui ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, žemiau įveskite kitą tapatybės serverį.",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Tapatybės serverio naudojimas yra pasirinktinis. Jei jūs pasirinksite jo nenaudoti, jūs nebūsite randamas kitų vartotojų ir neturėsite galimybės pakviesti kitų nurodydamas el. paštą ar telefoną.",
+    "Do not use an identity server": "Nenaudoti tapatybės serverio",
+    "Cross-signing": "Kryžminis pasirašymas",
+    "Error changing power level requirement": "Klaida keičiant galios lygio reikalavimą",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Keičiant kambario galios lygio reikalavimus įvyko klaida. Įsitikinkite, kad turite tam leidimą ir bandykite dar kartą.",
+    "Error changing power level": "Klaida keičiant galios lygį",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Keičiant vartotojo galios lygį įvyko klaida. Įsitikinkite, kad turite tam leidimą ir bandykite dar kartą.",
+    "Default role": "Numatytoji rolė",
+    "This user has not verified all of their sessions.": "Šis vartotojas nepatvirtino visų savo seansų.",
+    "You have not verified this user.": "Jūs nepatvirtinote šio vartotojo.",
+    "You have verified this user. This user has verified all of their sessions.": "Jūs patvirtinote šį vartotoją. Šis vartotojas patvirtino visus savo seansus.",
+    "Everyone in this room is verified": "Visi šiame kambaryje yra patvirtinti",
+    "Encrypted by a deleted session": "Užšifruota ištrintos sesijos",
+    "Use an identity server in Settings to receive invites directly in Riot.": "Nustatymuose naudokite tapatybės serverį, kad gautumėte pakvietimus tiesiai į Riot.",
+    "%(count)s verified sessions|one": "1 patvirtintas seansas",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Jei nuskaityti aukščiau esančio kodo negalite, patvirtinkite palygindami unikalius emoji.",
+    "You've successfully verified your device!": "Jūs sėkmingai patvirtinote savo įrenginį!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Jūs sėkmingai patvirtinote %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Jūs sėkmingai patvirtinote %(displayName)s!",
+    "Verified": "Patvirtinta",
+    "Got it": "Supratau",
+    "Start verification again from the notification.": "Pradėkite patvirtinimą iš naujo pranešime.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. <default>Naudokite numatytajį (%(defaultIdentityServerName)s)</default> arba tvarkykite <settings>Nustatymuose</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tvarkykite <settings>Nustatymuose</settings>.",
+    "Destroy cross-signing keys?": "Sunaikinti kryžminio pasirašymo raktus?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Kryžminio pasirašymo raktų ištrinimas yra neatšaukiamas. Visi, kurie buvo jais patvirtinti, matys saugumo įspėjimus. Jūs greičiausiai nenorite to daryti, nebent praradote visus įrenginius, iš kurių galite patvirtinti kryžminiu pasirašymu.",
+    "Clear cross-signing keys": "Valyti kryžminio pasirašymo raktus",
+    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Tam, kad patvirtintumėte šio seanso patikimumą, patikrinkite ar raktas, kurį matote Vartotojo Nustatymuose tame įrenginyje, sutampa su raktu esančiu žemiau:",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Patvirtinkite šį įrenginį, kad pažymėtumėte jį kaip patikimą. Pasitikėjimas šiuo įrenginiu suteikia jums ir kitiems vartotojams papildomos ramybės, kai naudojate visapusiškai užšifruotas žinutes.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Šio įrenginio patvirtinimas pažymės jį kaip patikimą ir vartotojai, kurie patvirtino su jumis, pasitikės šiuo įrenginiu.",
+    "a new cross-signing key signature": "naujas kryžminio pasirašymo rakto parašas",
+    "a device cross-signing signature": "įrenginio kryžminio pasirašymo parašas",
+    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Pasiekite savo saugių žinučių istoriją ir kryžminio pasirašymo tapatybę, naudojamą kitų seansų patvirtinimui, įvesdami savo atgavimo raktą.",
+    "Session verified": "Seansas patvirtintas",
+    "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>.": "Neįmanoma prisijungti prie serverio per HTTP, kai naršyklės juostoje yra HTTPS URL. Naudokite HTTPS arba <a>įjunkite nesaugias rašmenas</a>.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Jis turi prieigą prie jūsų šifruotų žinučių ir kiti vartotojai matys jį kaip patikimą.",
+    "Your new session is now verified. Other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Kiti vartotojai matys jį kaip patikimą.",
+    "NOT verified": "Nepatvirtinta",
+    "verified": "patvirtinta",
+    "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose."
 }

From cec8fa3595468d699994bbcac9d64c7cb18894ae Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Sat, 23 May 2020 16:58:41 +0000
Subject: [PATCH 3163/3235] Translated using Weblate (Ukrainian)

Currently translated at 27.9% (647 of 2322 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index bdef596b88..fb6657d6c1 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -77,7 +77,7 @@
     "Email": "е-пошта",
     "Email address": "Адреса е-пошти",
     "Failed to send email": "Помилка відправки  е-почти",
-    "Edit": "Редактувати",
+    "Edit": "Редагувати",
     "Unpin Message": "Відкріпити повідомлення",
     "Register": "Зареєструватися",
     "Rooms": "Кімнати",

From 457f4c82db9de47ce3b4d6449e6794e6385b1cdc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 14:59:03 +0100
Subject: [PATCH 3164/3235] Make some ARIA promises

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/emojipicker/Category.js  |  8 +++++-
 src/components/views/emojipicker/Emoji.js     | 11 +++++---
 src/components/views/emojipicker/Header.js    | 25 +++++++++++++------
 .../views/emojipicker/QuickReactions.js       |  2 +-
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/views/emojipicker/Category.js b/src/components/views/emojipicker/Category.js
index 3c4352105e..eb3f83dcdf 100644
--- a/src/components/views/emojipicker/Category.js
+++ b/src/components/views/emojipicker/Category.js
@@ -67,7 +67,13 @@ class Category extends React.PureComponent {
         const localScrollTop = Math.max(0, scrollTop - listTop);
 
         return (
-            <section className="mx_EmojiPicker_category" data-category-id={this.props.id}>
+            <section
+                id={`mx_EmojiPicker_category_${this.props.id}`}
+                className="mx_EmojiPicker_category"
+                data-category-id={this.props.id}
+                role="tabpanel"
+                aria-label={name}
+            >
                 <h2 className="mx_EmojiPicker_category_label">
                     {name}
                 </h2>
diff --git a/src/components/views/emojipicker/Emoji.js b/src/components/views/emojipicker/Emoji.js
index 75f23c5761..36aa4ff782 100644
--- a/src/components/views/emojipicker/Emoji.js
+++ b/src/components/views/emojipicker/Emoji.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {MenuItem} from "../../structures/ContextMenu";
 
 class Emoji extends React.PureComponent {
     static propTypes = {
@@ -30,14 +31,18 @@ class Emoji extends React.PureComponent {
         const { onClick, onMouseEnter, onMouseLeave, emoji, selectedEmojis } = this.props;
         const isSelected = selectedEmojis && selectedEmojis.has(emoji.unicode);
         return (
-            <li onClick={() => onClick(emoji)}
+            <MenuItem
+                element="li"
+                onClick={() => onClick(emoji)}
                 onMouseEnter={() => onMouseEnter(emoji)}
                 onMouseLeave={() => onMouseLeave(emoji)}
-                className="mx_EmojiPicker_item_wrapper">
+                className="mx_EmojiPicker_item_wrapper"
+                label={emoji.unicode}
+            >
                 <div className={`mx_EmojiPicker_item ${isSelected ? 'mx_EmojiPicker_item_selected' : ''}`}>
                     {emoji.unicode}
                 </div>
-            </li>
+            </MenuItem>
         );
     }
 }
diff --git a/src/components/views/emojipicker/Header.js b/src/components/views/emojipicker/Header.js
index b98e90e9b1..b3951c9ea5 100644
--- a/src/components/views/emojipicker/Header.js
+++ b/src/components/views/emojipicker/Header.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from "classnames";
 
 class Header extends React.PureComponent {
     static propTypes = {
@@ -26,13 +27,23 @@ class Header extends React.PureComponent {
 
     render() {
         return (
-            <nav className="mx_EmojiPicker_header">
-                {this.props.categories.map(category => (
-                    <button disabled={!category.enabled} key={category.id} ref={category.ref}
-                        className={`mx_EmojiPicker_anchor ${category.visible ? 'mx_EmojiPicker_anchor_visible' : ''}
-                            mx_EmojiPicker_anchor_${category.id}`}
-                        onClick={() => this.props.onAnchorClick(category.id)} title={category.name} />
-                ))}
+            <nav className="mx_EmojiPicker_header" role="tablist">
+                {this.props.categories.map(category => {
+                    const classes = classNames(`mx_EmojiPicker_anchor mx_EmojiPicker_anchor_${category.id}`, {
+                        mx_EmojiPicker_anchor_visible: category.visible,
+                    });
+                    return <button
+                        disabled={!category.enabled}
+                        key={category.id}
+                        ref={category.ref}
+                        className={classes}
+                        onClick={() => this.props.onAnchorClick(category.id)}
+                        title={category.name}
+                        role="tab"
+                        aria-selected={category.visible}
+                        aria-controls={`mx_EmojiPicker_category_${category.id}`}
+                    />;
+                })}
             </nav>
         );
     }
diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js
index 0bc799d356..8a20a4659b 100644
--- a/src/components/views/emojipicker/QuickReactions.js
+++ b/src/components/views/emojipicker/QuickReactions.js
@@ -72,7 +72,7 @@ class QuickReactions extends React.Component {
                         </React.Fragment>
                     }
                 </h2>
-                <ul className="mx_EmojiPicker_list">
+                <ul className="mx_EmojiPicker_list" aria-label={_t("Quick Reactions")}>
                     {QUICK_REACTIONS.map(emoji => <Emoji
                         key={emoji.hexcode} emoji={emoji} onClick={this.props.onClick}
                         onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}

From 6677a3f20e7e0ebea284184637559b0ff729188d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 15:46:44 +0100
Subject: [PATCH 3165/3235] Implement Tabs with Automatic Activation pattern
 for EmojiPicker header

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/emojipicker/EmojiPicker.js          |  4 ++
 src/components/views/emojipicker/Header.js    | 59 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index cacc15a5f9..16a0fc67e7 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -147,8 +147,12 @@ class EmojiPicker extends React.Component {
             // We update this here instead of through React to avoid re-render on scroll.
             if (cat.visible) {
                 cat.ref.current.classList.add("mx_EmojiPicker_anchor_visible");
+                cat.ref.current.setAttribute("aria-selected", true);
+                cat.ref.current.setAttribute("tabindex", 0);
             } else {
                 cat.ref.current.classList.remove("mx_EmojiPicker_anchor_visible");
+                cat.ref.current.setAttribute("aria-selected", false);
+                cat.ref.current.setAttribute("tabindex", -1);
             }
         }
     }
diff --git a/src/components/views/emojipicker/Header.js b/src/components/views/emojipicker/Header.js
index b3951c9ea5..c53437e02d 100644
--- a/src/components/views/emojipicker/Header.js
+++ b/src/components/views/emojipicker/Header.js
@@ -18,20 +18,74 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from "classnames";
 
+import {_t} from "../../../languageHandler";
+import {Key} from "../../../Keyboard";
+
 class Header extends React.PureComponent {
     static propTypes = {
         categories: PropTypes.arrayOf(PropTypes.object).isRequired,
         onAnchorClick: PropTypes.func.isRequired,
-        refs: PropTypes.object,
+    };
+
+    findNearestEnabled(index, delta) {
+        index += this.props.categories.length;
+        const cats = [...this.props.categories, ...this.props.categories, ...this.props.categories];
+
+        while (index < cats.length && index >= 0) {
+            if (cats[index].enabled) return index % this.props.categories.length;
+            index += delta > 0 ? 1 : -1;
+        }
+    }
+
+    changeCategoryRelative(delta) {
+        const current = this.props.categories.findIndex(c => c.visible);
+        this.changeCategoryAbsolute(current + delta, delta);
+    }
+
+    changeCategoryAbsolute(index, delta=1) {
+        const category = this.props.categories[this.findNearestEnabled(index, delta)];
+        if (category) {
+            this.props.onAnchorClick(category.id);
+            category.ref.current.focus();
+        }
+    }
+
+    // Implements ARIA Tabs with Automatic Activation pattern
+    // https://www.w3.org/TR/wai-aria-practices/examples/tabs/tabs-1/tabs.html
+    onKeyDown = (ev) => {
+        let handled = true;
+        switch (ev.key) {
+            case Key.ARROW_LEFT:
+                this.changeCategoryRelative(-1);
+                break;
+            case Key.ARROW_RIGHT:
+                this.changeCategoryRelative(1);
+                break;
+
+            case Key.HOME:
+                this.changeCategoryAbsolute(0);
+                break;
+            case Key.END:
+                this.changeCategoryAbsolute(this.props.categories.length - 1, -1);
+                break;
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            ev.preventDefault();
+            ev.stopPropagation();
+        }
     };
 
     render() {
         return (
-            <nav className="mx_EmojiPicker_header" role="tablist">
+            <nav className="mx_EmojiPicker_header" role="tablist" aria-label={_t("Categories")} onKeyDown={this.onKeyDown}>
                 {this.props.categories.map(category => {
                     const classes = classNames(`mx_EmojiPicker_anchor mx_EmojiPicker_anchor_${category.id}`, {
                         mx_EmojiPicker_anchor_visible: category.visible,
                     });
+                    // Properties of this button are also modified by EmojiPicker's updateVisibility in DOM.
                     return <button
                         disabled={!category.enabled}
                         key={category.id}
@@ -40,6 +94,7 @@ class Header extends React.PureComponent {
                         onClick={() => this.props.onAnchorClick(category.id)}
                         title={category.name}
                         role="tab"
+                        tabIndex={category.visible ? 0 : -1} // roving
                         aria-selected={category.visible}
                         aria-controls={`mx_EmojiPicker_category_${category.id}`}
                     />;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 96ccf1589d..7b4404ea40 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1408,6 +1408,7 @@
     "Objects": "Objects",
     "Symbols": "Symbols",
     "Flags": "Flags",
+    "Categories": "Categories",
     "Quick Reactions": "Quick Reactions",
     "Cancel search": "Cancel search",
     "Unknown Address": "Unknown Address",

From 1a47ceb3226345a918ee3ab945e51e7f3dfc57fe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 16:17:46 +0100
Subject: [PATCH 3166/3235] Fix event highlight with edits

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/EventTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 31797cffb4..ee0b40c0de 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -403,7 +403,7 @@ export default createReactClass({
     },
 
     shouldHighlight: function() {
-        const actions = this.context.getPushActionsForEvent(this.props.mxEvent);
+        const actions = this.context.getPushActionsForEvent(this.props.mxEvent.replacingEvent() || this.props.mxEvent);
         if (!actions || !actions.tweaks) { return false; }
 
         // don't show self-highlights from another of our clients

From 5c9398a6b1807456374b120c70c59eb2066ea07a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 16:47:57 +0100
Subject: [PATCH 3167/3235] Types exiliary files

---
 src/autocomplete/EmojiProvider.tsx            |   2 +-
 src/autocomplete/QueryMatcher.ts              |   7 +-
 src/components/views/auth/PassphraseField.tsx |   2 +-
 src/components/views/elements/Field.tsx       |  21 +-
 yarn.lock                                     | 840 +++++++++---------
 5 files changed, 449 insertions(+), 423 deletions(-)

diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index b67e26117b..3a3cec779e 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -69,7 +69,7 @@ export default class EmojiProvider extends AutocompleteProvider {
 
     constructor() {
         super(EMOJI_REGEX);
-        this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
+        this.matcher = new QueryMatcher<IEmojiShort>(EMOJI_SHORTNAMES, {
             keys: ['emoji.emoticon', 'shortname'],
             funcs: [
                 (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases
diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index 95bcfb25ef..8c37e63d88 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -45,7 +45,7 @@ interface IOptions<T extends {}> {
  * @param {function[]} options.funcs List of functions that when called with the
  *     object as an arg will return a string to use as an index
  */
-export default class QueryMatcher<T> {
+export default class QueryMatcher<T extends Object> {
     private _options: IOptions<T>;
     private _keys: IOptions<T>["keys"];
     private _funcs: Required<IOptions<T>["funcs"]>;
@@ -75,7 +75,10 @@ export default class QueryMatcher<T> {
         this._items = new Map();
 
         for (const object of objects) {
-            const keyValues = _at(object, this._keys);
+            // Need to use unsafe coerce here because the objects can have any
+            // type for their values. We assume that those values who's keys have
+            // been specified will be string.
+            const keyValues: (string)[] = _at<T>(object as any, this._keys) as any;
 
             for (const f of this._funcs) {
                 keyValues.push(f(object));
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index c1781406d9..f09791ce26 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -36,7 +36,7 @@ interface IProps {
     labelStrongPassword?: string;
     labelAllowedButUnsafe?: string;
 
-    onChange(ev: KeyboardEvent);
+    onChange(ev: React.FormEvent<HTMLElement>);
     onValidate(result: IValidationResult);
 }
 
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 100a6ebf56..4a3725fadf 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -17,7 +17,8 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
-import { debounce, Cancelable } from 'lodash';
+import { debounce } from 'lodash';
+import {IFieldState, IValidationResult} from "../elements/Validation";
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -28,7 +29,7 @@ function getId() {
     return `${BASE_ID}_${count++}`;
 }
 
-interface IProps extends React.HTMLAttributes<HTMLElement> {
+interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInputElement> {
     // The field's ID, which binds the input and label together. Immutable.
     id?: string,
     // The element to create. Defaults to "input".
@@ -53,9 +54,7 @@ interface IProps extends React.HTMLAttributes<HTMLElement> {
     // changes.  Returns an object with `valid` boolean field
     // and a `feedback` react component field to provide feedback
     // to the user.
-    onValidate?: (
-        args: {value: string, focused: boolean, allowEmpty: boolean}
-    ) => {valid: boolean, feedback: React.ReactNode},
+    onValidate?: (input: IFieldState) => Promise<IValidationResult>,
     // If specified, overrides the value returned by onValidate.
     flagInvalid?: boolean,
     // If specified, contents will appear as a tooltip on the element and
@@ -86,6 +85,11 @@ export default class Field extends React.PureComponent<IProps, IState> {
     private id: string;
     private input: HTMLInputElement;
 
+    static defaultProps = {
+        element: "input",
+        type: "text",
+    }
+
     /*
      * This was changed from throttle to debounce: this is more traditional for
      * form validation since it means that the validation doesn't happen at all
@@ -188,10 +192,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
             element, prefixComponent, postfixComponent, className, onValidate, children,
             tooltipContent, flagInvalid, tooltipClassName, list, ...inputProps} = this.props;
 
-        const inputElement = element || "input";
-
         // Set some defaults for the <input> element
-        inputProps.type = inputProps.type || "text";
         const ref = input => this.input = input;
         inputProps.placeholder = inputProps.placeholder || inputProps.label;
         inputProps.id = this.id; // this overwrites the id from props
@@ -203,7 +204,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
         // Appease typescript's inference
         const inputProps_ = {...inputProps, ref, list};
 
-        const fieldInput = React.createElement(inputElement, inputProps_, children);
+        const fieldInput = React.createElement(this.props.element, inputProps_, children);
 
         let prefixContainer = null;
         if (prefixComponent) {
@@ -215,7 +216,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
         }
 
         const hasValidationFlag = flagInvalid !== null && flagInvalid !== undefined;
-        const fieldClasses = classNames("mx_Field", `mx_Field_${inputElement}`, className, {
+        const fieldClasses = classNames("mx_Field", `mx_Field_${this.props.element}`, className, {
             // If we have a prefix element, leave the label always at the top left and
             // don't animate it, as it looks a bit clunky and would add complexity to do
             // properly.
diff --git a/yarn.lock b/yarn.lock
index 9253442b7c..f3b8e1cda9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,28 +25,28 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
-  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+"@babel/compat-data@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
+  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
   dependencies:
-    browserslist "^4.9.1"
+    browserslist "^4.11.1"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
+  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
+    "@babel/generator" "^7.9.6"
     "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
+    "@babel/helpers" "^7.9.6"
+    "@babel/parser" "^7.9.6"
     "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -56,12 +56,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
-  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
+  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
   dependencies:
-    "@babel/types" "^7.9.5"
+    "@babel/types" "^7.9.6"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -98,27 +98,27 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/types" "^7.9.0"
 
-"@babel/helper-compilation-targets@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
-  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+"@babel/helper-compilation-targets@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
+  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
   dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
+    "@babel/compat-data" "^7.9.6"
+    browserslist "^4.11.1"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
-  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
+"@babel/helper-create-class-features-plugin@^7.8.3", "@babel/helper-create-class-features-plugin@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897"
+  integrity sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==
   dependencies:
     "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-replace-supers" "^7.9.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
 
 "@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
@@ -227,15 +227,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6", "@babel/helper-replace-supers@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
+  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.8.3"
     "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -267,14 +267,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
-  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+"@babel/helpers@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
+  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
   dependencies:
     "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
 
 "@babel/highlight@^7.8.3":
   version "7.9.0"
@@ -285,10 +285,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -356,10 +356,10 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
-  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
+"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
+  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
@@ -615,34 +615,34 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
-  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
+"@babel/plugin-transform-modules-amd@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
+  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
   dependencies:
     "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
-  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+"@babel/plugin-transform-modules-commonjs@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
+  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-simple-access" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
-  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
+"@babel/plugin-transform-modules-systemjs@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
+  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
     "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-umd@^7.9.0":
   version "7.9.0"
@@ -746,9 +746,9 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-runtime@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
-  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
+  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -793,11 +793,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
-  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz#2248971416a506fc78278fc0c0ea3179224af1e9"
+  integrity sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.9.6"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-typescript" "^7.8.3"
 
@@ -810,12 +810,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/preset-env@^7.7.6":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
-  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
+  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
   dependencies:
-    "@babel/compat-data" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/compat-data" "^7.9.6"
+    "@babel/helper-compilation-targets" "^7.9.6"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
@@ -823,7 +823,7 @@
     "@babel/plugin-proposal-json-strings" "^7.8.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
     "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
     "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
     "@babel/plugin-proposal-optional-chaining" "^7.9.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
@@ -850,9 +850,9 @@
     "@babel/plugin-transform-function-name" "^7.8.3"
     "@babel/plugin-transform-literals" "^7.8.3"
     "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
+    "@babel/plugin-transform-modules-amd" "^7.9.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
     "@babel/plugin-transform-modules-umd" "^7.9.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
@@ -868,8 +868,8 @@
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.5"
-    browserslist "^4.9.1"
+    "@babel/types" "^7.9.6"
+    browserslist "^4.11.1"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
@@ -926,17 +926,17 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime-corejs3@^7.8.3":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"
-  integrity sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71"
+  integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
-  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
+  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -949,25 +949,25 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
-  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
+  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.5"
+    "@babel/generator" "^7.9.6"
     "@babel/helper-function-name" "^7.9.5"
     "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.5"
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
-  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
+  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.9.5"
     lodash "^4.17.13"
@@ -1142,12 +1142,14 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@peculiar/asn1-schema@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.5.tgz#aa5a2c51225d213d1d6a5499ada926da3f556ff5"
-  integrity sha512-rzzorGYnQNmVHleLvC8gJSbbdNYtg+EB9s075dHvwpxs10teXHYnRmTWhCVuWjbSVSofwdm7IYPtMTWTbcNUWA==
+"@peculiar/asn1-schema@^2.0.1", "@peculiar/asn1-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.3.tgz#c6c097e842ebb8a07d198b68cd49f2cf9f3571b5"
+  integrity sha512-STqC+Tfx2dTiIGRmokjsKOeqsfhoV6WaBwFr7BVicSfHLAVSPrZXiugyD8AELrjQdJ9INWpL3N7YSJyU5a1ZwA==
   dependencies:
+    "@types/asn1js" "^0.0.1"
     asn1js "^2.0.26"
+    pvtsutils "^1.0.10"
     tslib "^1.11.1"
 
 "@peculiar/json-schema@^1.1.10":
@@ -1158,23 +1160,30 @@
     tslib "^1.11.1"
 
 "@peculiar/webcrypto@^1.0.22":
-  version "1.0.27"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.27.tgz#f32c58656267c8f8419a6b574322573a1b83a683"
-  integrity sha512-sERMakD19gNhwBVXGGoJjBfc28bDbd2YWaio7/x8jKtvwMKNuljM7ANQ6LzEkEvqFAyjf3bhBZktJ6UXy/0Plg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.1.tgz#4c7498e4861878e299ef058bce1208a4d063d0ff"
+  integrity sha512-Bu2XgOvzirnLcojZYs4KQ8hOLf2ETpa0NL6btQt5NgsAwctI6yVkzgYP+EcG7Mm579RBP+V0LM5rXyMlTVx23A==
   dependencies:
-    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/asn1-schema" "^2.0.3"
     "@peculiar/json-schema" "^1.1.10"
     pvtsutils "^1.0.10"
-    tslib "^1.11.1"
-    webcrypto-core "^1.0.19-next.0"
+    tslib "^1.11.2"
+    webcrypto-core "^1.1.0"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
+  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
   dependencies:
     type-detect "4.0.8"
 
+"@types/asn1js@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@types/asn1js/-/asn1js-0.0.1.tgz#ef8b9f9708cb1632a1c3a9cd27717caabe793bc2"
+  integrity sha1-74uflwjLFjKhw6nNJ3F8qr55O8I=
+  dependencies:
+    "@types/pvutils" "*"
+
 "@types/babel__core@^7.1.0":
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
@@ -1202,9 +1211,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.10.tgz#d9a99f017317d9b3d1abc2ced45d3bca68df0daf"
-  integrity sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz#1ae3010e8bf8851d324878b42acec71986486d18"
+  integrity sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1241,9 +1250,9 @@
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
+  integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
 
 "@types/istanbul-lib-report@*":
   version "3.0.0"
@@ -1253,9 +1262,9 @@
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
@@ -1281,15 +1290,20 @@
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
 "@types/node@*":
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
-  integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
+  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
 
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
+"@types/pvutils@*":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@types/pvutils/-/pvutils-0.0.2.tgz#e21684962cfa58ac920fd576d90556032dc86009"
+  integrity sha512-CgQAm7pjyeF3Gnv78ty4RBVIfluB+Td+2DR8iPaU0prF18pkzptHHP+DoKPfpsJYknKsVZyVsJEu5AuGgAqQ5w==
+
 "@types/qrcode@^1.3.4":
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b"
@@ -1304,7 +1318,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*":
+"@types/react@*", "@types/react@16.9":
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
   integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
@@ -1312,14 +1326,6 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/react@16.9":
-  version "16.9.32"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
-  integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^2.2.0"
-
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1352,9 +1358,9 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.8"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
-  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1364,26 +1370,26 @@
   integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
 
 "@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
-  integrity sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==
+  version "2.34.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
+  integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.27.0"
+    "@typescript-eslint/typescript-estree" "2.34.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/typescript-estree@2.27.0":
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
-  integrity sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==
+"@typescript-eslint/typescript-estree@2.34.0":
+  version "2.34.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
+  integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
     glob "^7.1.6"
     is-glob "^4.0.1"
     lodash "^4.17.15"
-    semver "^6.3.0"
+    semver "^7.3.2"
     tsutils "^3.17.1"
 
 "@webassemblyjs/ast@1.9.0":
@@ -1569,7 +1575,7 @@ acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
@@ -1622,9 +1628,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
 ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1721,7 +1727,7 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-includes@^3.0.3, array-includes@^3.1.1:
+array-includes@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
   integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
@@ -1847,17 +1853,17 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.0.0:
-  version "9.7.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
-  integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
+  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
   dependencies:
-    browserslist "^4.11.1"
-    caniuse-lite "^1.0.30001039"
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001061"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.27"
-    postcss-value-parser "^4.0.3"
+    postcss "^7.0.30"
+    postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1865,9 +1871,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
 babel-eslint@^10.0.3:
   version "10.1.0"
@@ -1894,10 +1900,10 @@ babel-jest@^24.9.0:
     chalk "^2.4.2"
     slash "^2.0.0"
 
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
     object.assign "^4.1.0"
 
@@ -2004,14 +2010,19 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blueimp-canvas-to-blob@^3.5.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.18.0.tgz#15f67cd1469f0be4d90c4619a0499a76bb835f79"
-  integrity sha512-AkYW5KQ0kTMrmcXvSVi+2TsWDXVZwrJM3g4o7r2z6OA3IlMhlAnoBNWI1ow45jfRr/co7tNch4OdNyb3WU3Pxw==
+  version "3.27.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.27.0.tgz#a2bd5c43587b95dedf0f6998603452d1bfcc9b9e"
+  integrity sha512-AcIj+hCw6WquxzJuzC6KzgYmqxLFeTWe88KuY2BEIsW1zbEOfoinDAGlhyvFNGt+U3JElkVSK7anA1FaSdmmfA==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+
+bn.js@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
+  integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
 
 boolbase@~1.0.0:
   version "1.0.0"
@@ -2107,7 +2118,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0:
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
@@ -2116,17 +2127,19 @@ browserify-rsa@^4.0.0:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11"
+  integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==
   dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.2"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -2135,13 +2148,13 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.11.1, browserslist@^4.8.3, browserslist@^4.9.1:
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
-  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
+browserslist@^4.11.1, browserslist@^4.12.0, browserslist@^4.8.5:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
   dependencies:
-    caniuse-lite "^1.0.30001038"
-    electron-to-chromium "^1.3.390"
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
     node-releases "^1.1.53"
     pkg-up "^2.0.0"
 
@@ -2197,9 +2210,9 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.4.3:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce"
-  integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -2298,10 +2311,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039:
-  version "1.0.30001039"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe"
-  integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==
+caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
+  version "1.0.30001065"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001065.tgz#e8d7fef61cdfd8a7107493ad6bf551a4eb59c68f"
+  integrity sha512-DDxCLgJ266YnAHQv0jS1wdOaihRFF52Zgmlag39sQJVy2H46oROpJp4hITstqhdB8qnHSrKNoAEkQA9L/oYF9A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2385,10 +2398,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
-  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
+chokidar@^3.3.1, chokidar@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2396,7 +2409,7 @@ chokidar@^3.3.1:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.3.0"
+    readdirp "~3.4.0"
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -2448,9 +2461,9 @@ cli-cursor@^2.1.0:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
 cliui@^4.0.0:
   version "4.1.0"
@@ -2620,17 +2633,17 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.8.5"
     semver "7.0.0"
 
 core-js-pure@^3.0.0:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
-  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
+  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -2681,7 +2694,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -2692,7 +2705,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -2938,9 +2951,9 @@ diff-dom@^4.1.3:
     updates "^8.5.2"
 
 diff-match-patch@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
-  integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
+  integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
 
 diff-sequences@^24.9.0:
   version "24.9.0"
@@ -3061,9 +3074,9 @@ domutils@^1.5.1:
     domelementtype "1"
 
 domutils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz#15b8278e37bfa8468d157478c58c367718133c08"
-  integrity sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.1.0.tgz#7ade3201af43703fde154952e3a868eb4b635f16"
+  integrity sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==
   dependencies:
     dom-serializer "^0.2.1"
     domelementtype "^2.0.1"
@@ -3094,12 +3107,12 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.390:
-  version "1.3.398"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d"
-  integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==
+electron-to-chromium@^1.3.413:
+  version "1.3.451"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz#0c075af3e2f06d706670bde0279432802ca8c83f"
+  integrity sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==
 
-elliptic@^6.0.0:
+elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
   integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
@@ -3180,9 +3193,9 @@ entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
+  integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
 
 enzyme-adapter-react-16@^1.15.1:
   version "1.15.2"
@@ -3359,9 +3372,9 @@ eslint-plugin-flowtype@^2.30.0:
     lodash "^4.17.10"
 
 eslint-plugin-jest@^23.0.4:
-  version "23.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
-  integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
+  version "23.13.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.1.tgz#b2ce83f76064ad8ba1f1f26f322b86a86e44148e"
+  integrity sha512-TRLJH6M6EDvGocD98a7yVThrAOCK9WJfo9phuUb0MJptcrOYZeCKzC9aOzZCD93sxXCsiJVZywaTHdI/mAi0FQ==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
@@ -3371,9 +3384,9 @@ eslint-plugin-react-hooks@^2.0.1:
   integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g==
 
 eslint-plugin-react@^7.7.0:
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
-  integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
+  integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
   dependencies:
     array-includes "^3.1.1"
     doctrine "^2.1.0"
@@ -3384,7 +3397,6 @@ eslint-plugin-react@^7.7.0:
     object.values "^1.1.1"
     prop-types "^15.7.2"
     resolve "^1.15.1"
-    semver "^6.3.0"
     string.prototype.matchall "^4.0.2"
     xregexp "^4.3.0"
 
@@ -3485,11 +3497,11 @@ esprima@^4.0.0, esprima@^4.0.1:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe"
-  integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^5.0.0"
+    estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -3503,10 +3515,10 @@ estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22"
-  integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
 
 estree-walker@^0.5.0:
   version "0.5.2"
@@ -3877,10 +3889,10 @@ flux@2.1.1:
     fbjs "0.1.0-alpha.7"
     immutable "^3.7.4"
 
-focus-lock@^0.6.6:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.6.tgz#98119a755a38cfdbeda0280eaa77e307eee850c7"
-  integrity sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw==
+focus-lock@^0.6.7:
+  version "0.6.8"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.8.tgz#61985fadfa92f02f2ee1d90bc738efaf7f3c9f46"
+  integrity sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og==
 
 focus-visible@^5.0.2:
   version "5.1.0"
@@ -3947,17 +3959,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
-  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
 
 fsevents@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -4148,9 +4160,9 @@ gonzales-pe@^4.2.3:
     minimist "^1.2.5"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4224,12 +4236,13 @@ has@^1.0.1, has@^1.0.3:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
@@ -4294,9 +4307,9 @@ html-encoding-sniffer@^1.0.2:
     whatwg-encoding "^1.0.1"
 
 html-entities@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
+  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -4395,9 +4408,9 @@ ignore@^4.0.3, ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
+  integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
 
 immutable@^3.7.4:
   version "3.8.2"
@@ -4466,7 +4479,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4816,11 +4829,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
@@ -5345,9 +5353,9 @@ jest@^24.9.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.0, js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5449,11 +5457,11 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jsx-ast-utils@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
-  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6"
+  integrity sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     object.assign "^4.1.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
@@ -5651,9 +5659,9 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
     chalk "^2.0.1"
 
 loglevel@^1.6.4:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56"
-  integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
+  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
 
 lolex@^5.1.2:
   version "5.1.2"
@@ -5767,7 +5775,7 @@ mathml-tag-names@^2.0.1:
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "6.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ff0d91979bfa34775c9e8c6383ef31490c675041"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5895,17 +5903,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.26"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
   dependencies:
-    mime-db "1.43.0"
+    mime-db "1.44.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -6016,9 +6024,9 @@ mute-stream@0.0.7:
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6043,9 +6051,9 @@ natural-compare@^1.4.0:
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz#4af4006e16645ff800e9f993c3af039857d9dbdc"
-  integrity sha512-xq47GIUGXxU9vQg7g/y1o1xuKnkO7ev4nRWqftmQrLkfnE/FjRqDaGOUakM8XHPn/6pW3bGjU2wgoJyId90rqg==
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.3.tgz#ae3b040e27616b5348102c436d1719209476a5a1"
+  integrity sha512-FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==
   dependencies:
     commander "^2.19.0"
     moo "^0.5.0"
@@ -6131,9 +6139,9 @@ node-notifier@^5.4.2:
     which "^1.3.0"
 
 node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+  version "1.1.56"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.56.tgz#bc054a417d316e3adac90eafb7e1932802f28705"
+  integrity sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
@@ -6221,9 +6229,12 @@ object-inspect@^1.1.0, object-inspect@^1.7.0:
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
 object-is@^1.0.1, object-is@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
-  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
+  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
 
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
   version "1.1.1"
@@ -6248,13 +6259,12 @@ object.assign@^4.1.0:
     object-keys "^1.0.11"
 
 object.entries@^1.1.0, object.entries@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
-  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
+  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
     has "^1.0.3"
 
 object.fromentries@^2.0.2:
@@ -6430,7 +6440,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0:
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
   integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
@@ -6557,7 +6567,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.7:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -6685,11 +6695,11 @@ postcss-sass@^0.3.5:
     postcss "^7.0.1"
 
 postcss-scss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
-  integrity sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
+  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
   dependencies:
-    postcss "^7.0.0"
+    postcss "^7.0.6"
 
 postcss-selector-parser@^3.1.0:
   version "3.1.2"
@@ -6719,15 +6729,15 @@ postcss-value-parser@^3.3.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
-  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.7:
-  version "7.0.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
-  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.6, postcss@^7.0.7:
+  version "7.0.30"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
+  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -6910,9 +6920,9 @@ qrcode@^1.4.4:
     yargs "^13.2.4"
 
 qs@^6.5.2, qs@^6.6.0:
-  version "6.9.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
-  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+  version "6.9.4"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
+  integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
 
 qs@~6.5.2:
   version "6.5.2"
@@ -7018,12 +7028,12 @@ react-dom@^16.9.0:
     scheduler "^0.19.1"
 
 react-focus-lock@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.2.1.tgz#1d12887416925dc53481914b7cedd39494a3b24a"
-  integrity sha512-47g0xYcCTZccdzKRGufepY8oZ3W1Qg+2hn6u9SHZ0zUB6uz/4K4xJe7yYFNZ1qT6m+2JDm82F6QgKeBTbjW4PQ==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.3.1.tgz#9d5d85899773609c7eefa4fc54fff6a0f5f2fc47"
+  integrity sha512-j15cWLPzH0gOmRrUg01C09Peu8qbcdVqr6Bjyfxj80cNZmH+idk/bNBYEDSmkAtwkXI+xEYWSmHYqtaQhZ8iUQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.6.6"
+    focus-lock "^0.6.7"
     prop-types "^15.6.2"
     react-clientside-effect "^1.2.2"
     use-callback-ref "^1.2.1"
@@ -7127,7 +7137,7 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1:
+readable-stream@^3.1.1, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7145,12 +7155,12 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
-  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
+readdirp@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
+  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
   dependencies:
-    picomatch "^2.0.7"
+    picomatch "^2.2.1"
 
 realpath-native@^1.1.0:
   version "1.1.0"
@@ -7259,9 +7269,9 @@ registry-auth-token@4.0.0:
     safe-buffer "^5.0.1"
 
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
   version "0.6.4"
@@ -7443,9 +7453,9 @@ resolve@1.1.7:
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -7521,11 +7531,9 @@ rsvp@^4.8.4:
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
-  dependencies:
-    is-promise "^2.1.0"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -7541,10 +7549,10 @@ rxjs@^6.4.0, rxjs@^6.5.2:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -7579,9 +7587,9 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sanitize-html@^1.18.4:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz#5b36c92ab27917ddd2775396815c2bc1a6268310"
-  integrity sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.24.0.tgz#9cd42f236512bfcf6259424e958551148c165a7f"
+  integrity sha512-TAIFx39V/y06jDd4YUz7ntCdMUXN5Z28pSG7sTP2BCLXwHA9+ermacDpQs35Evo4p6YSgmaPdSbGiX4Fgptuuw==
   dependencies:
     chalk "^2.4.1"
     htmlparser2 "^4.1.0"
@@ -7621,7 +7629,7 @@ schema-utils@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+semver@6.3.0, semver@^6.0.0, semver@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -7631,6 +7639,11 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 serialize-javascript@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
@@ -7789,9 +7802,9 @@ source-map-resolve@^0.5.0:
     urix "^0.1.0"
 
 source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7817,22 +7830,22 @@ spawn-command@^0.0.2-1:
   integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -8016,9 +8029,9 @@ string.prototype.trim@^1.2.1:
     function-bind "^1.1.1"
 
 string.prototype.trimend@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
-  integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -8042,9 +8055,9 @@ string.prototype.trimright@^2.1.1:
     string.prototype.trimend "^1.0.0"
 
 string.prototype.trimstart@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2"
-  integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -8132,15 +8145,15 @@ stylelint-config-standard@^18.2.0:
     stylelint-config-recommended "^2.2.0"
 
 stylelint-scss@^3.9.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.16.0.tgz#6928fe57bcfc924110d09847c1f720472a9b7bd6"
-  integrity sha512-dAWs/gagdPYO3VDdvgRv5drRBMcWI4E//z3AXPAY1qYkSdXCEVJtEW+R9JtinG0U2rcJIu5XWaVddPQeaaufzw==
+  version "3.17.2"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.17.2.tgz#4d849a153f9241834396f5880db2c3c964def4e3"
+  integrity sha512-e0dmxqsofy/HZj4urcGSJw4S6yHDJxiQdT20/1ciCsd5lomisa7YM4+Qtt1EG4hsqEG1dbEeF855tec1UyqcSA==
   dependencies:
     lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.2"
+    postcss-value-parser "^4.1.0"
 
 stylelint@^9.10.1:
   version "9.10.1"
@@ -8269,9 +8282,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.2:
-  version "4.6.10"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2"
-  integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
+  integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -8421,10 +8434,10 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.11.2, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
 
 tslint@^5.20.1:
   version "5.20.1"
@@ -8494,9 +8507,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.7.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
+  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"
@@ -8512,9 +8525,9 @@ unherit@^1.0.4:
     xtend "^4.0.0"
 
 unhomoglyph@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.5.tgz#a68c6244f0ec140bfe58293a1f66a9bd2a244343"
-  integrity sha512-rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3"
+  integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -8677,9 +8690,9 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-callback-ref@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.1.tgz#898759ccb9e14be6c7a860abafa3ffbd826c89bb"
-  integrity sha512-C3nvxh0ZpaOxs9RCnWwAJ+7bJPwQI8LHF71LzbQ3BvzH5XkdtlkMadqElGevg5bYBDFip4sAnD4m06zAKebg1w==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.3.tgz#9f939dfb5740807bbf9dd79cdd4e99d27e827756"
+  integrity sha512-DPBPh1i2adCZoIArRlTuKRy7yue7QogtEnfv0AKrWsY+GA+4EKe37zhRDouNnyWMoNQFYZZRF+2dLHsWE4YvJA==
 
 use-sidecar@^1.0.1:
   version "1.0.2"
@@ -8811,25 +8824,34 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watchpack@^1.6.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
-  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
   dependencies:
     chokidar "^2.1.8"
+
+watchpack@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
+  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
+  dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.0"
+    watchpack-chokidar2 "^2.0.0"
 
-webcrypto-core@^1.0.19-next.0:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.19.tgz#521a0b082afecd914b8e968efb5dc381b8416c6f"
-  integrity sha512-6XHExtfMJrpkFDh9MiJ/y7ptX0dfZi0ogxFyelqxMu1eFowxivHfIp6DKzT+ZjU66xTuNfJkfkUk1bIB3tEOgA==
+webcrypto-core@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.1.1.tgz#c9cd26f8dea696d7b5f5c1b0598ff16e6bdcab7c"
+  integrity sha512-xK61sFRUyZdSAJG7+bJox36+Tnhxw1PaMbmrLLp30HNTJ4mffqsY2jUMlmGq6OOoej3WO/SsH5serzlzBMZ+jg==
   dependencies:
-    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/asn1-schema" "^2.0.1"
     "@peculiar/json-schema" "^1.1.10"
     asn1js "^2.0.26"
     pvtsutils "^1.0.10"
-    tslib "^1.11.1"
+    tslib "^1.11.2"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
@@ -8862,15 +8884,15 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.20.2:
-  version "4.42.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
-  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
+  version "4.43.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
+  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/wasm-edit" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.2.1"
+    acorn "^6.4.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
@@ -8887,13 +8909,13 @@ webpack@^4.20.2:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.0"
+    watchpack "^1.6.1"
     webpack-sources "^1.4.1"
 
 what-input@^5.2.6:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.7.tgz#81afbb6b82882cff8c43fa7ff1054aa46f288ffa"
-  integrity sha512-ruCP2skyygi0ZHnMicHuZP7vXnJh8uJXs9R7RX488HlWigSdzngdmKo5Ti11Iatp1dnYp55VfioP/WevPaK+xQ==
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.9.tgz#e484628c00404d2ad5d747ac2f0fb22008f7757a"
+  integrity sha512-/tuM/4ngvfYB1QF3yekJsmFpIhkiHEDKCl/VYDikyHZVxoFn3U/lNgiNt7aqC8RerkoPUMxc9ihKsW9KwAx2Rg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"

From d10d887996e4b0ac1eed86bb870363d439590233 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 16:53:09 +0100
Subject: [PATCH 3168/3235] Explain unsafe coerce

---
 src/autocomplete/QueryMatcher.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index 8c37e63d88..c5fe083d6b 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -77,7 +77,8 @@ export default class QueryMatcher<T extends Object> {
         for (const object of objects) {
             // Need to use unsafe coerce here because the objects can have any
             // type for their values. We assume that those values who's keys have
-            // been specified will be string.
+            // been specified will be string. Also, we cannot infer all the
+            // types of the keys of the objects at compile.
             const keyValues: (string)[] = _at<T>(object as any, this._keys) as any;
 
             for (const f of this._funcs) {

From 30e2b0102260c72724aace7404f27e996a0fd07c Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 17:08:37 +0100
Subject: [PATCH 3169/3235] unlock react types

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

diff --git a/package.json b/package.json
index 620957dd04..63ed9c9da6 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "@types/lodash": "^4.14.152",
     "@types/modernizr": "^3.5.3",
     "@types/qrcode": "^1.3.4",
-    "@types/react": "16.9",
+    "@types/react": "^16.9",
     "@types/react-dom": "^16.9.8",
     "@types/zxcvbn": "^4.4.0",
     "babel-eslint": "^10.0.3",

From f34413c6cee35a888ac4f38cae278fc7c236255b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 17:24:15 +0100
Subject: [PATCH 3170/3235] update yarn lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index f3b8e1cda9..79d0f1828b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1318,7 +1318,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16.9":
+"@types/react@*", "@types/react@^16.9":
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
   integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==

From 303691eb7294c44475f60bdc6e69a13389e21f6b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 17:37:07 +0100
Subject: [PATCH 3171/3235] Missing export

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

diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 753052717c..09874d6063 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -40,7 +40,7 @@ interface IProps {
         label: React.ReactNode,
 }
 
-class Tooltip extends React.Component<IProps> {
+export default class Tooltip extends React.Component<IProps> {
     private tooltipContainer: HTMLElement;
     private tooltip: void | Element | Component<Element, any, any>;
     private parent: Element;

From fc1f14f5aac4bd7cf1b59f5587a6e66207d2cb66 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 17:53:09 +0100
Subject: [PATCH 3172/3235] Appease the types

---
 src/components/views/elements/Tooltip.tsx | 6 +++---
 src/components/views/rooms/RoomTile2.tsx  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 09874d6063..340bcf4ec1 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,11 +31,11 @@ interface IProps {
         // Class applied to the element used to position the tooltip
         className: string,
         // Class applied to the tooltip itself
-        tooltipClassName: string,
+        tooltipClassName?: string,
         // Whether the tooltip is visible or hidden.
         // The hidden state allows animating the tooltip away via CSS.
         // Defaults to visible if unset.
-        visible: boolean,
+        visible?: boolean,
         // the react element to put into the tooltip
         label: React.ReactNode,
 }
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 8b1beee713..ae1802de49 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -214,7 +214,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         let tooltip = null;
         if (false) { // isCollapsed
             if (this.state.hover) {
-                tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto"/>
+                tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} />
             }
         }
 

From 035c4fae5063f681b5bdb6d19ccf441dd1984d60 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 18:11:55 +0100
Subject: [PATCH 3173/3235] Refactor Payloads

---
 src/dispatcher/actions.ts                     |  2 +-
 src/dispatcher/payloads/ViewTooltipPayload.ts | 35 +++++++++++++++++++
 src/dispatcher/payloads/ViewUserPayload.ts    | 17 ---------
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 src/dispatcher/payloads/ViewTooltipPayload.ts

diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 9cd9f7c9ba..8b1be1c54e 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -40,7 +40,7 @@ export enum Action {
     ViewUserSettings = "view_user_settings",
 
     /**
-     * Sets the current tooltip
+     * Sets the current tooltip. Should be use with ViewTooltipPayload.
      */
     ViewTooltip = "view_tooltip",
 }
diff --git a/src/dispatcher/payloads/ViewTooltipPayload.ts b/src/dispatcher/payloads/ViewTooltipPayload.ts
new file mode 100644
index 0000000000..8778287128
--- /dev/null
+++ b/src/dispatcher/payloads/ViewTooltipPayload.ts
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import { Component } from "react";
+
+export interface ViewTooltipPayload extends ActionPayload {
+    action: Action.ViewTooltip,
+
+    /*
+     * The tooltip to render. If it's null the tooltip will not be rendered
+     * We need the void type because of typescript headaches.
+     */
+    tooltip: null | void | Element | Component<Element, any, any>;
+
+    /*
+     * The parent under which to render the tooltip. Can be null to remove
+     * the parent type.
+     */
+    parent: null | Element
+}
\ No newline at end of file
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
index d1f6db8968..ed602d4e24 100644
--- a/src/dispatcher/payloads/ViewUserPayload.ts
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -17,7 +17,6 @@ limitations under the License.
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { ActionPayload } from "../payloads";
 import { Action } from "../actions";
-import { Component } from "react";
 
 export interface ViewUserPayload extends ActionPayload {
     action: Action.ViewUser,
@@ -28,19 +27,3 @@ export interface ViewUserPayload extends ActionPayload {
      */
     member?: RoomMember;
 }
-
-export interface ViewTooltipPayload extends ActionPayload {
-    action: Action.ViewTooltip,
-
-    /*
-     * The tooltip to render. If it's null the tooltip will not be rendered
-     * We need the void type because of typescript headaches.
-     */
-    tooltip: null | void | Element | Component<Element, any, any>;
-
-    /*
-     * The parent under which to render the tooltip. Can be null to remove
-     * the parent type.
-     */
-    parent: null | Element
-}

From dfc73626fa6f049095cfd987ba807f372dc5362b Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Mon, 25 May 2020 18:18:47 +0100
Subject: [PATCH 3174/3235] Fix import

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

diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 340bcf4ec1..650f09775d 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -22,7 +22,7 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
-import { ViewTooltipPayload } from '../../../dispatcher/payloads/ViewUserPayload';
+import { ViewTooltipPayload } from '../../../dispatcher/payloads/ViewTooltipPayload';
 import { Action } from '../../../dispatcher/actions';
 
 const MIN_TOOLTIP_HEIGHT = 25;

From 148f215d4eb9ce626b582992612092e1a643c7fd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 19:02:44 +0100
Subject: [PATCH 3175/3235] clean up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/avatars/BaseAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index d7a2aa14e5..4ece5baead 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -61,7 +61,7 @@ const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
         // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;
         if (reconnected) {
-            setIndex(i => i > 0 ? 0 : i);
+            setIndex(0);
         }
     }, []);
     useEventEmitter(cli, "sync", onClientSync);

From 0861b1fbec91d639be97424ca618991855eeefb5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 May 2020 19:05:02 +0100
Subject: [PATCH 3176/3235] remove redundant props

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/avatars/BaseAvatar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 4ece5baead..508691e5fd 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -26,7 +26,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {toPx} from "../../../utils/units";
 
-const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
+const useImageUrl = ({url, urls}) => {
     const [imageUrls, setUrls] = useState([]);
     const [urlsIndex, setIndex] = useState();
 
@@ -86,7 +86,7 @@ const BaseAvatar = (props) => {
         ...otherProps
     } = props;
 
-    const [imageUrl, onError] = useImageUrl({url, urls, idName, name, defaultToInitialLetter});
+    const [imageUrl, onError] = useImageUrl({url, urls});
 
     if (!imageUrl && defaultToInitialLetter) {
         const initialLetter = AvatarLogic.getInitialLetter(name);

From c8329a1acf6a876eb99e9ec2859cc112c8792d3c Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Mon, 25 May 2020 13:12:04 +0000
Subject: [PATCH 3177/3235] Translated using Weblate (Lithuanian)

Currently translated at 62.0% (1439 of 2322 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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index bb4f6cc7a4..750fff24ca 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1218,7 +1218,7 @@
     "Hide sessions": "Slėpti seansus",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> kambaryje %(roomName)s",
     "Security": "Saugumas",
-    "Verify by scanning": "Patvirtinti skenuojant",
+    "Verify by scanning": "Patvirtinti nuskaitant",
     "Verify all users in a room to ensure it's secure.": "Patvirtinkite visus vartotojus kambaryje, kad užtikrintumėte jo saugumą.",
     "You cancelled verification on your other session.": "Jūs atšaukėte patvirtinimą kitame savo seanse.",
     "%(displayName)s cancelled verification.": "%(displayName)s atšaukė patvirtinimą.",
@@ -1466,5 +1466,12 @@
     "Your new session is now verified. Other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Kiti vartotojai matys jį kaip patikimą.",
     "NOT verified": "Nepatvirtinta",
     "verified": "patvirtinta",
-    "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose."
+    "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose.",
+    "Done": "Atlikta",
+    "No media permissions": "Nėra medijos leidimų",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Seansas, kurį jūs bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba emoji patvirtinimo, kuriuos palaiko Riot. Bandykite su kitu klientu.",
+    "Almost there! Is your other session showing the same shield?": "Beveik atlikta! Ar jūsų kitas seansas rodo tokį patį skydą?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Beveik atlikta! Ar %(displayName)s rodo tokį patį skydą?",
+    "No": "Ne",
+    "Yes": "Taip"
 }

From 01cf6cacb30a8a1ef0fb3e15ddc20128b2cc694d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=2E=20K=C3=BCchel?= <devel@zukuul.de>
Date: Mon, 25 May 2020 20:16:00 +0000
Subject: [PATCH 3178/3235] Translated using Weblate (German)

Currently translated at 100.0% (2322 of 2322 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 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index eaefbdaa71..c5bd32e71f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1793,7 +1793,7 @@
     "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit „Single Sign-On“, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
-    "Confirm adding email": "Bestätige das Hinzfugen der Email-Addresse",
+    "Confirm adding email": "Bestätige das Hinzufügen der Email-Adresse",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnummer, indem du deine Identität mittels „Single Sign-On“ nachweist.",
     "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzufügen dieser Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
@@ -2375,5 +2375,15 @@
     "Confirm to continue": "Bestätige um fortzufahren",
     "Click the button below to confirm your identity.": "Klicke den Button unten um deine Identität zu bestätigen.",
     "Confirm encryption setup": "Bestätige die Einrichtung der Verschlüsselung",
-    "Click the button below to confirm setting up encryption.": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen."
+    "Click the button below to confirm setting up encryption.": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen.",
+    "Font scaling": "Schriftskalierung",
+    "Use the improved room list (in development - refresh to apply changes)": "Verwende die verbesserte Raumliste (in Entwicklung - neu laden um die Änderungen anzuwenden)",
+    "Use IRC layout": "Verwende das IRC Layout",
+    "Font size": "Schriftgröße",
+    "Custom font size": "Eigene Schriftgröße",
+    "IRC display name width": "Breite des IRC Anzeigenamens",
+    "Size must be a number": "Größe muss eine Zahl sein",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen  %(min)s pt und %(max)s pt sein",
+    "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen  %(min)s pt und %(max)s pt",
+    "Appearance": "Erscheinungsbild"
 }

From f15e111e9a192571a2c0432fc63df6517c0813d6 Mon Sep 17 00:00:00 2001
From: Kim Brose <kim.brose@rwth-aachen.de>
Date: Mon, 25 May 2020 20:21:43 +0000
Subject: [PATCH 3179/3235] Translated using Weblate (German)

Currently translated at 100.0% (2322 of 2322 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c5bd32e71f..fb02d734cf 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2385,5 +2385,8 @@
     "Size must be a number": "Größe muss eine Zahl sein",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen  %(min)s pt und %(max)s pt sein",
     "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen  %(min)s pt und %(max)s pt",
-    "Appearance": "Erscheinungsbild"
+    "Appearance": "Erscheinungsbild",
+    "Create room": "Raum erstellen",
+    "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
+    "Upload a file": "Eine Datei hochladen"
 }

From 3a4c65553c7d2bcfdf3518643cfab621c279706e Mon Sep 17 00:00:00 2001
From: toastbroot <r.malsky@googlemail.com>
Date: Mon, 25 May 2020 20:21:49 +0000
Subject: [PATCH 3180/3235] Translated using Weblate (German)

Currently translated at 100.0% (2322 of 2322 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, 5 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index fb02d734cf..f55d94f8fc 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1543,7 +1543,7 @@
     "View rules": "Regeln betrachten",
     "You are currently subscribed to:": "Du abonnierst momentan:",
     "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
-    "The version of Riot": "Die Version von Riot",
+    "The version of Riot": "Die Riot-Version",
     "Whether you're using Riot on a device where touch is the primary input mechanism": "Ob du Riot auf einem Gerät verwendest, bei dem Berührung der primäre Eingabemechanismus ist",
     "Whether you're using Riot as an installed Progressive Web App": "Ob Sie Riot als installierte progressive Web-App verwenden",
     "Your user agent": "Dein User-Agent",
@@ -1795,13 +1795,13 @@
     "Single Sign On": "Single Sign-On",
     "Confirm adding email": "Bestätige das Hinzufügen der Email-Adresse",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnummer, indem du deine Identität mittels „Single Sign-On“ nachweist.",
-    "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzufügen dieser Telefonnummer zu bestätigen.",
+    "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
     "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
     "Command failed": "Befehl fehlgeschlagen",
     "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
-    "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
+    "Click the button below to confirm adding this email address.": "Klicke unten auf die Schaltfläche, um die hinzugefügte E-Mail-Adresse zu bestätigen.",
     "Confirm adding phone number": "Bestätige das Hinzufügen der Telefonnummer",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
@@ -2388,5 +2388,6 @@
     "Appearance": "Erscheinungsbild",
     "Create room": "Raum erstellen",
     "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
-    "Upload a file": "Eine Datei hochladen"
+    "Upload a file": "Eine Datei hochladen",
+    "Dismiss read marker and jump to bottom": "Entferne Lesemarker und springe nach unten"
 }

From 982e81f9a38573c303b7989a29ea180d18b12acb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 15:43:21 -0600
Subject: [PATCH 3181/3235] Rename MatrixClientPeg to ts

---
 src/{MatrixClientPeg.js => MatrixClientPeg.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{MatrixClientPeg.js => MatrixClientPeg.ts} (100%)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.ts
similarity index 100%
rename from src/MatrixClientPeg.js
rename to src/MatrixClientPeg.ts

From bd2d13edd23aa341f14081e5b536f614b82eb2bf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 15:52:05 -0600
Subject: [PATCH 3182/3235] Convert the MatrixClientPeg to TypeScript

---
 src/MatrixClientPeg.ts | 90 +++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 21f05b9759..2c35129734 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
-
+import {MatrixClient} from 'matrix-js-sdk/src/client';
+import {MemoryStore} from 'matrix-js-sdk/src/store/memory';
 import * as utils from 'matrix-js-sdk/src/utils';
 import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
 import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set';
@@ -34,7 +34,7 @@ import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
-interface MatrixClientCreds {
+interface ICredentials {
     homeserverUrl: string,
     identityServerUrl: string,
     userId: string,
@@ -43,6 +43,13 @@ interface MatrixClientCreds {
     guest: boolean,
 }
 
+// TODO: Move this to the js-sdk
+interface IOpts {
+    initialSyncLimit?: number;
+    pendingEventOrdering?: "detached" | "chronological";
+    lazyLoadMembers?: boolean;
+}
+
 /**
  * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
  * Handles the creation/initialisation of client objects.
@@ -50,20 +57,22 @@ interface MatrixClientCreds {
  * Matrix Client object is available easily.
  */
 class _MatrixClientPeg {
-    constructor() {
-        this.matrixClient = null;
-        this._justRegisteredUserId = null;
+    private matrixClient: MatrixClient;
+    private justRegisteredUserId: string;
 
-        // These are the default options used when when the
-        // client is started in 'start'. These can be altered
-        // at any time up to after the 'will_start_client'
-        // event is finished processing.
-        this.opts = {
-            initialSyncLimit: 20,
-        };
-        // the credentials used to init the current client object.
-        // used if we tear it down & recreate it with a different store
-        this._currentClientCreds = null;
+    // These are the default options used when when the
+    // client is started in 'start'. These can be altered
+    // at any time up to after the 'will_start_client'
+    // event is finished processing.
+    private opts: IOpts = {
+        initialSyncLimit: 20,
+    };
+
+    // the credentials used to init the current client object.
+    // used if we tear it down & recreate it with a different store
+    private currentClientCreds: ICredentials;
+
+    constructor() {
     }
 
     /**
@@ -73,15 +82,15 @@ class _MatrixClientPeg {
      *
      * @param {string} script href to the script to be passed to the web worker
      */
-    setIndexedDbWorkerScript(script) {
+    public setIndexedDbWorkerScript(script: string): void {
         createMatrixClient.indexedDbWorkerScript = script;
     }
 
-    get(): MatrixClient {
+    public get(): MatrixClient {
         return this.matrixClient;
     }
 
-    unset() {
+    public unset(): void {
         this.matrixClient = null;
 
         MatrixActionCreators.stop();
@@ -95,8 +104,8 @@ class _MatrixClientPeg {
      *
      * @param {string} uid The user ID of the user we've just registered
      */
-    setJustRegisteredUserId(uid) {
-        this._justRegisteredUserId = uid;
+    public setJustRegisteredUserId(uid: string): void {
+        this.justRegisteredUserId = uid;
     }
 
     /**
@@ -105,23 +114,25 @@ class _MatrixClientPeg {
      *
      * @returns {bool} True if user has just been registered
      */
-    currentUserIsJustRegistered() {
+    public currentUserIsJustRegistered(): boolean {
         return (
             this.matrixClient &&
-            this.matrixClient.credentials.userId === this._justRegisteredUserId
+            this.matrixClient.credentials.userId === this.justRegisteredUserId
         );
     }
 
-    /*
+    /**
      * Replace this MatrixClientPeg's client with a client instance that has
      * homeserver / identity server URLs and active credentials
+     *
+     * @param {ICredentials} creds The new credentials to use.
      */
-    replaceUsingCreds(creds: MatrixClientCreds) {
-        this._currentClientCreds = creds;
+    public replaceUsingCreds(creds: ICredentials): void {
+        this.currentClientCreds = creds;
         this._createClient(creds);
     }
 
-    async assign() {
+    public async assign(): Promise<any> {
         for (const dbType of ['indexeddb', 'memory']) {
             try {
                 const promise = this.matrixClient.store.startup();
@@ -132,7 +143,7 @@ class _MatrixClientPeg {
                 if (dbType === 'indexeddb') {
                     console.error('Error starting matrixclient store - falling back to memory store', err);
                     this.matrixClient.store = new MemoryStore({
-                        localStorage: global.localStorage,
+                        localStorage: localStorage,
                     });
                 } else {
                     console.error('Failed to start memory store!', err);
@@ -179,7 +190,7 @@ class _MatrixClientPeg {
         return opts;
     }
 
-    async start() {
+    public async start(): Promise<any> {
         const opts = await this.assign();
 
         console.log(`MatrixClientPeg: really starting MatrixClient`);
@@ -187,7 +198,7 @@ class _MatrixClientPeg {
         console.log(`MatrixClientPeg: MatrixClient started`);
     }
 
-    getCredentials(): MatrixClientCreds {
+    public getCredentials(): ICredentials {
         return {
             homeserverUrl: this.matrixClient.baseUrl,
             identityServerUrl: this.matrixClient.idBaseUrl,
@@ -198,12 +209,14 @@ class _MatrixClientPeg {
         };
     }
 
-    /*
+    /**
      * Return the server name of the user's homeserver
      * Throws an error if unable to deduce the homeserver name
      * (eg. if the user is not logged in)
+     *
+     * @returns {string} The homeserver name, if present.
      */
-    getHomeserverName() {
+    public getHomeserverName(): string {
         const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
         if (matches === null || matches.length < 1) {
             throw new Error("Failed to derive homeserver name from user ID!");
@@ -211,7 +224,8 @@ class _MatrixClientPeg {
         return matches[1];
     }
 
-    _createClient(creds: MatrixClientCreds) {
+    private _createClient(creds: ICredentials): void {
+        // TODO: Make these opts typesafe with the js-sdk
         const opts = {
             baseUrl: creds.homeserverUrl,
             idBaseUrl: creds.identityServerUrl,
@@ -228,9 +242,9 @@ class _MatrixClientPeg {
             ],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
+            cryptoCallbacks: {},
         };
 
-        opts.cryptoCallbacks = {};
         // These are always installed regardless of the labs flag so that
         // cross-signing features can toggle on without reloading and also be
         // accessed immediately after login.
@@ -253,8 +267,10 @@ class _MatrixClientPeg {
     }
 }
 
-if (!global.mxMatrixClientPeg) {
-    global.mxMatrixClientPeg = new _MatrixClientPeg();
+const anyGlobal = <any>global;
+
+if (!anyGlobal.mxMatrixClientPeg) {
+    anyGlobal.mxMatrixClientPeg = new _MatrixClientPeg();
 }
 
-export const MatrixClientPeg = global.mxMatrixClientPeg;
+export const MatrixClientPeg = <_MatrixClientPeg>anyGlobal.mxMatrixClientPeg;

From 0cec74cc2b436ec3b1f7e7fd6e0d05b650263fcc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 15:59:15 -0600
Subject: [PATCH 3183/3235] Appease the linter (and the project)

Also export the interface that the project expects to be able to import :|
---
 src/MatrixClientPeg.ts                     | 20 ++++++++++----------
 src/components/structures/LoggedInView.tsx |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 2c35129734..2a89b05a39 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -34,7 +34,7 @@ import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
-interface ICredentials {
+export interface IMatrixClientCreds {
     homeserverUrl: string,
     identityServerUrl: string,
     userId: string,
@@ -57,20 +57,20 @@ interface IOpts {
  * Matrix Client object is available easily.
  */
 class _MatrixClientPeg {
-    private matrixClient: MatrixClient;
-    private justRegisteredUserId: string;
-
     // These are the default options used when when the
     // client is started in 'start'. These can be altered
     // at any time up to after the 'will_start_client'
     // event is finished processing.
-    private opts: IOpts = {
+    public opts: IOpts = {
         initialSyncLimit: 20,
     };
 
+    private matrixClient: MatrixClient;
+    private justRegisteredUserId: string;
+
     // the credentials used to init the current client object.
     // used if we tear it down & recreate it with a different store
-    private currentClientCreds: ICredentials;
+    private currentClientCreds: IMatrixClientCreds;
 
     constructor() {
     }
@@ -125,9 +125,9 @@ class _MatrixClientPeg {
      * Replace this MatrixClientPeg's client with a client instance that has
      * homeserver / identity server URLs and active credentials
      *
-     * @param {ICredentials} creds The new credentials to use.
+     * @param {IMatrixClientCreds} creds The new credentials to use.
      */
-    public replaceUsingCreds(creds: ICredentials): void {
+    public replaceUsingCreds(creds: IMatrixClientCreds): void {
         this.currentClientCreds = creds;
         this._createClient(creds);
     }
@@ -198,7 +198,7 @@ class _MatrixClientPeg {
         console.log(`MatrixClientPeg: MatrixClient started`);
     }
 
-    public getCredentials(): ICredentials {
+    public getCredentials(): IMatrixClientCreds {
         return {
             homeserverUrl: this.matrixClient.baseUrl,
             identityServerUrl: this.matrixClient.idBaseUrl,
@@ -224,7 +224,7 @@ class _MatrixClientPeg {
         return matches[1];
     }
 
-    private _createClient(creds: ICredentials): void {
+    private _createClient(creds: IMatrixClientCreds): void {
         // TODO: Make these opts typesafe with the js-sdk
         const opts = {
             baseUrl: creds.homeserverUrl,
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 148d10fe8d..f502b4da4b 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -29,7 +29,7 @@ import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
 import dis from '../../dispatcher/dispatcher';
 import sessionStore from '../../stores/SessionStore';
-import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
+import {MatrixClientPeg, IMatrixClientCreds} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 
 import TagOrderActions from '../../actions/TagOrderActions';
@@ -57,7 +57,7 @@ function canElementReceiveInput(el) {
 
 interface IProps {
     matrixClient: MatrixClient;
-    onRegistered: (credentials: MatrixClientCreds) => Promise<MatrixClient>;
+    onRegistered: (credentials: IMatrixClientCreds) => Promise<MatrixClient>;
     viaServers?: string[];
     hideToSRUsers: boolean;
     resizeNotifier: ResizeNotifier;

From e5c2d17015700ffae6ff676ea68360d6f02baf2f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 16:06:05 -0600
Subject: [PATCH 3184/3235] Move the instance definition to the Window

---
 src/@types/global.d.ts |   2 +
 src/MatrixClientPeg.ts | 101 ++++++++++++++++++++++++-----------------
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index e6e339d067..87e1e44341 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -15,10 +15,12 @@ limitations under the License.
 */
 
 import * as ModernizrStatic from "modernizr";
+import { IMatrixClientPeg } from "../MatrixClientPeg";
 
 declare global {
     interface Window {
         Modernizr: ModernizrStatic;
+        mxMatrixClientPeg: IMatrixClientPeg;
         Olm: {
             init: () => Promise<void>;
         };
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 2a89b05a39..ab19295263 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -44,19 +44,74 @@ export interface IMatrixClientCreds {
 }
 
 // TODO: Move this to the js-sdk
-interface IOpts {
+export interface IOpts {
     initialSyncLimit?: number;
     pendingEventOrdering?: "detached" | "chronological";
     lazyLoadMembers?: boolean;
 }
 
+export interface IMatrixClientPeg {
+    opts: IOpts;
+
+    /**
+     * Sets the script href passed to the IndexedDB web worker
+     * If set, a separate web worker will be started to run the IndexedDB
+     * queries on.
+     *
+     * @param {string} script href to the script to be passed to the web worker
+     */
+    setIndexedDbWorkerScript(script: string): void;
+
+    /**
+     * Return the server name of the user's homeserver
+     * Throws an error if unable to deduce the homeserver name
+     * (eg. if the user is not logged in)
+     *
+     * @returns {string} The homeserver name, if present.
+     */
+    getHomeserverName(): string;
+
+    get(): MatrixClient;
+    unset(): void;
+    assign(): Promise<any>;
+    start(): Promise<any>;
+
+    getCredentials(): IMatrixClientCreds;
+
+    /**
+     * If we've registered a user ID we set this to the ID of the
+     * user we've just registered. If they then go & log in, we
+     * can send them to the welcome user (obviously this doesn't
+     * guarentee they'll get a chat with the welcome user).
+     *
+     * @param {string} uid The user ID of the user we've just registered
+     */
+    setJustRegisteredUserId(uid: string): void;
+
+    /**
+     * Returns true if the current user has just been registered by this
+     * client as determined by setJustRegisteredUserId()
+     *
+     * @returns {bool} True if user has just been registered
+     */
+    currentUserIsJustRegistered(): boolean;
+
+    /**
+     * Replace this MatrixClientPeg's client with a client instance that has
+     * homeserver / identity server URLs and active credentials
+     *
+     * @param {IMatrixClientCreds} creds The new credentials to use.
+     */
+    replaceUsingCreds(creds: IMatrixClientCreds): void;
+}
+
 /**
  * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
  * Handles the creation/initialisation of client objects.
  * This module provides a singleton instance of this class so the 'current'
  * Matrix Client object is available easily.
  */
-class _MatrixClientPeg {
+class _MatrixClientPeg implements IMatrixClientPeg {
     // These are the default options used when when the
     // client is started in 'start'. These can be altered
     // at any time up to after the 'will_start_client'
@@ -75,13 +130,6 @@ class _MatrixClientPeg {
     constructor() {
     }
 
-    /**
-     * Sets the script href passed to the IndexedDB web worker
-     * If set, a separate web worker will be started to run the IndexedDB
-     * queries on.
-     *
-     * @param {string} script href to the script to be passed to the web worker
-     */
     public setIndexedDbWorkerScript(script: string): void {
         createMatrixClient.indexedDbWorkerScript = script;
     }
@@ -96,24 +144,10 @@ class _MatrixClientPeg {
         MatrixActionCreators.stop();
     }
 
-    /**
-     * If we've registered a user ID we set this to the ID of the
-     * user we've just registered. If they then go & log in, we
-     * can send them to the welcome user (obviously this doesn't
-     * guarentee they'll get a chat with the welcome user).
-     *
-     * @param {string} uid The user ID of the user we've just registered
-     */
     public setJustRegisteredUserId(uid: string): void {
         this.justRegisteredUserId = uid;
     }
 
-    /**
-     * Returns true if the current user has just been registered by this
-     * client as determined by setJustRegisteredUserId()
-     *
-     * @returns {bool} True if user has just been registered
-     */
     public currentUserIsJustRegistered(): boolean {
         return (
             this.matrixClient &&
@@ -121,12 +155,6 @@ class _MatrixClientPeg {
         );
     }
 
-    /**
-     * Replace this MatrixClientPeg's client with a client instance that has
-     * homeserver / identity server URLs and active credentials
-     *
-     * @param {IMatrixClientCreds} creds The new credentials to use.
-     */
     public replaceUsingCreds(creds: IMatrixClientCreds): void {
         this.currentClientCreds = creds;
         this._createClient(creds);
@@ -209,13 +237,6 @@ class _MatrixClientPeg {
         };
     }
 
-    /**
-     * Return the server name of the user's homeserver
-     * Throws an error if unable to deduce the homeserver name
-     * (eg. if the user is not logged in)
-     *
-     * @returns {string} The homeserver name, if present.
-     */
     public getHomeserverName(): string {
         const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
         if (matches === null || matches.length < 1) {
@@ -267,10 +288,8 @@ class _MatrixClientPeg {
     }
 }
 
-const anyGlobal = <any>global;
-
-if (!anyGlobal.mxMatrixClientPeg) {
-    anyGlobal.mxMatrixClientPeg = new _MatrixClientPeg();
+if (!window.mxMatrixClientPeg) {
+    window.mxMatrixClientPeg = new _MatrixClientPeg();
 }
 
-export const MatrixClientPeg = <_MatrixClientPeg>anyGlobal.mxMatrixClientPeg;
+export const MatrixClientPeg = window.mxMatrixClientPeg;

From 1c9b5eb42d99ddcc8ac04c9f8fed0ca1a5dd2a67 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 16:14:51 -0600
Subject: [PATCH 3185/3235] Appease the tests

---
 src/MatrixClientPeg.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index ab19295263..ff0750c501 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -120,7 +120,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         initialSyncLimit: 20,
     };
 
-    private matrixClient: MatrixClient;
+    private matrixClient: MatrixClient = null;
     private justRegisteredUserId: string;
 
     // the credentials used to init the current client object.
@@ -157,7 +157,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 
     public replaceUsingCreds(creds: IMatrixClientCreds): void {
         this.currentClientCreds = creds;
-        this._createClient(creds);
+        this.createClient(creds);
     }
 
     public async assign(): Promise<any> {
@@ -245,7 +245,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         return matches[1];
     }
 
-    private _createClient(creds: IMatrixClientCreds): void {
+    private createClient(creds: IMatrixClientCreds): void {
         // TODO: Make these opts typesafe with the js-sdk
         const opts = {
             baseUrl: creds.homeserverUrl,

From 9f4691cb77a4f40de5b5013e4f26a1a56c73be28 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Mon, 25 May 2020 23:48:47 +0000
Subject: [PATCH 3186/3235] Translated using Weblate (Lithuanian)

Currently translated at 64.3% (1494 of 2322 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 | 149 +++++++++++++++++++++++++++------------
 1 file changed, 102 insertions(+), 47 deletions(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 750fff24ca..d74589c553 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -41,16 +41,16 @@
     "Forget": "Pamiršti",
     "World readable": "Visiems skaitomas",
     "Mute": "Nutildyti",
-    "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio paveikslėlio. (%(code)s)",
+    "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio vaizdo. (%(code)s)",
     "Cancel Sending": "Atšaukti siuntimą",
     "Warning": "Įspėjimas",
     "This Room": "Šis pokalbių kambarys",
     "Resend": "Siųsti iš naujo",
     "Room not found": "Kambarys nerastas",
     "Downloading update...": "Atsiunčiamas atnaujinimas...",
-    "Messages in one-to-one chats": "Žinutės asmeniniuose pokalbiuose",
+    "Messages in one-to-one chats": "Žinutės privačiuose pokalbiuose",
     "Unavailable": "Neprieinamas",
-    "Error saving email notification preferences": "Klaida, įrašant pranešimų el. paštu nuostatas",
+    "Error saving email notification preferences": "Klaida išsaugant pranešimų el. paštu nuostatas",
     "View Decrypted Source": "Peržiūrėti iššifruotą šaltinį",
     "Failed to update keywords": "Nepavyko atnaujinti raktažodžių",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Pranešimai šiems raktažodžiams yra uždrausti taisyklėmis:",
@@ -75,13 +75,13 @@
     "Remove": "Pašalinti",
     "Invite to this community": "Pakviesti į šią bendruomenę",
     "Messages containing <span>keywords</span>": "Žinutės, kuriose yra <span>raktažodžiai</span>",
-    "When I'm invited to a room": "Kai aš esu pakviestas į pokalbių kambarį",
+    "When I'm invited to a room": "Kai mane pakviečia į kambarį",
     "Tuesday": "Antradienis",
     "Enter keywords separated by a comma:": "Įveskite kableliais atskirtus raktažodžius:",
     "Search…": "Paieška…",
     "You have successfully set a password and an email address!": "Jūs sėkmingai įrašėte slaptažodį ir el. pašto adresą!",
     "Remove %(name)s from the directory?": "Ar ištrinti %(name)s iš katalogo?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot naudoja daug išplėstinių naršyklės funkcionalumų, kai kurie iš jų yra neprieinami ar eksperimentinei Jūsų naršyklėje.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot naudoja daug išplėstinių naršyklės funkcijų, kai kurios iš jų yra neprieinamos arba eksperimentinės jūsų esamoje naršyklėje.",
     "Event sent!": "Įvykis išsiųstas!",
     "Unnamed room": "Kambarys be pavadinimo",
     "Dismiss": "Atmesti",
@@ -111,8 +111,8 @@
     "Send logs": "Siųsti žurnalus",
     "All messages": "Visos žinutės",
     "unknown error code": "nežinomas klaidos kodas",
-    "Call invitation": "Pakvietimas skambinant",
-    "Messages containing my display name": "Žinutės, kuriose paminėtas mano vardas",
+    "Call invitation": "Skambučio pakvietimas",
+    "Messages containing my display name": "Žinutės, kuriose yra mano rodomas vardas",
     "State Key": "Būklės raktas",
     "Failed to send custom event.": "Nepavyko išsiųsti pasirinktinio įvykio.",
     "What's new?": "Kas naujo?",
@@ -140,7 +140,7 @@
     "Low Priority": "Nesvarbūs",
     "Riot does not know how to join a room on this network": "Riot nežino kaip prisijungti prie kambario šiame tinkle",
     "Set Password": "Nustatyti slaptažodį",
-    "An error occurred whilst saving your email notification preferences.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.",
+    "An error occurred whilst saving your email notification preferences.": "Išsaugant pranešimų el. paštu nuostatas, įvyko klaida.",
     "Unable to join network": "Nepavyko prisijungti prie tinklo",
     "Register": "Registruotis",
     "Off": "Išjungta",
@@ -164,7 +164,7 @@
     "Thank you!": "Ačiū!",
     "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!": "Naudojant šią naršyklę aplikacija gali atrodyti ir reaguoti neteisingai. Kai kurios arba visos funkcijos gali neveikti. Jei vis tiek norite pabandyti gali tęsti, tačiau iškilusios problemos yra jūsų pačių reikalas!",
     "Checking for an update...": "Tikrinama ar yra atnaujinimų...",
-    "There are advanced notifications which are not shown here": "Yra išplėstinių pranešimų, kurie nėra čia rodomi",
+    "There are advanced notifications which are not shown here": "Yra išplėstinių pranešimų, kurie čia nėra rodomi",
     "e.g. %(exampleValue)s": "pvz., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "pvz., <CurrentPageURL>",
     "Your device resolution": "Jūsų įrenginio raiška",
@@ -239,24 +239,24 @@
     "Reason": "Priežastis",
     "%(targetName)s accepted an invitation.": "%(targetName)s priėmė pakvietimą.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pakvietė %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pakeitė savo vardą į %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nustatė savo vardą į %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo vardą (%(oldDisplayName)s).",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pakeitė savo rodomą vardą į %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nustatė savo rodomą vardą į %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo rodomą vardą (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s pašalino savo profilio paveikslą.",
     "%(senderName)s changed their profile picture.": "%(senderName)s pakeitė savo profilio paveikslą.",
     "%(senderName)s set a profile picture.": "%(senderName)s nustatė profilio paveikslą.",
     "%(targetName)s rejected the invitation.": "%(targetName)s atmetė pakvietimą.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s pakeitė temą į \"%(topic)s\".",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą į %(roomName)s.",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė paveikslą.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė vaizdą.",
     "Someone": "Kažkas",
     "%(senderName)s answered the call.": "%(senderName)s atsiliepė į skambutį.",
     "(unknown failure: %(reason)s)": "(nežinoma klaida: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s užbaigė skambutį.",
     "Send anyway": "Vis tiek siųsti",
     "Unnamed Room": "Bevardis kambarys",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymas 12 valandų formatu (pvz., 2:30pm)",
-    "Always show message timestamps": "Visada rodyti žinučių laiko žymas",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymes 12 valandų formatu (pvz. 2:30pm)",
+    "Always show message timestamps": "Visada rodyti žinučių laiko žymes",
     "Always show encryption icons": "Visada rodyti šifravimo piktogramas",
     "Room Colour": "Kambario spalva",
     "Decline": "Atmesti",
@@ -284,7 +284,7 @@
     "Drop File Here": "Vilkite failą čia",
     "Drop file here to upload": "Norėdami įkelti, vilkite failą čia",
     " (unsupported)": " (nepalaikoma)",
-    "%(senderName)s sent an image": "%(senderName)s išsiuntė paveikslą",
+    "%(senderName)s sent an image": "%(senderName)s išsiuntė vaizdą",
     "%(senderName)s sent a video": "%(senderName)s išsiuntė vaizdo įrašą",
     "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
     "Options": "Parinktys",
@@ -309,10 +309,10 @@
     "Loading...": "Įkeliama...",
     "Pinned Messages": "Prisegtos žinutės",
     "Unknown": "Nežinoma",
-    "Save": "Įrašyti",
+    "Save": "Išsaugoti",
     "(~%(count)s results)|other": "(~%(count)s rezultatų(-ai))",
     "(~%(count)s results)|one": "(~%(count)s rezultatas)",
-    "Upload avatar": "Įkelti avatarą",
+    "Upload avatar": "Įkelti pseudoportretą",
     "Settings": "Nustatymai",
     "Community Invites": "Bendruomenės pakvietimai",
     "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
@@ -337,7 +337,7 @@
     "Error decrypting attachment": "Klaida iššifruojant priedą",
     "Decrypt %(text)s": "Iššifruoti %(text)s",
     "Download %(text)s": "Atsisiųsti %(text)s",
-    "Error decrypting image": "Klaida iššifruojant paveikslą",
+    "Error decrypting image": "Klaida iššifruojant vaizdą",
     "Error decrypting video": "Klaida iššifruojant vaizdo įrašą",
     "Copied!": "Nukopijuota!",
     "Failed to copy": "Nepavyko nukopijuoti",
@@ -422,7 +422,7 @@
     "Send Reset Email": "Siųsti atstatymo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Atkreipkite dėmesį, kad jūs jungiatės prie %(hs)s serverio, o ne matrix.org.",
-    "Failed to fetch avatar URL": "Nepavyko gauti avataro URL",
+    "Failed to fetch avatar URL": "Nepavyko gauti pseudoportreto URL",
     "Commands": "Komandos",
     "Results from DuckDuckGo": "Rezultatai iš DuckDuckGo",
     "Notify the whole room": "Pranešti visam kambariui",
@@ -555,8 +555,8 @@
     "No results": "Jokių rezultatų",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s pasikeitė vardą",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s pasikeitė avatarą",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė avatarą",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s pasikeitė pseudoportretą",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė pseudoportretą",
     "collapse": "suskleisti",
     "expand": "išskleisti",
     "Room directory": "Kambarių katalogas",
@@ -612,15 +612,15 @@
     "Failed to unban": "Nepavyko atblokuoti",
     "not specified": "nenurodyta",
     "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.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūros pagal numatymą yra išjungtos, kad būtų užtikrinta, jog jūsų serveris (kur yra generuojamos peržiūros) negali rinkti informacijos apie jūsų šiame kambaryje peržiūrėtas nuorodas.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė %(roomName)s avatarą",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario avatarą.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario avatarą į <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė kambario %(roomName)s pseudoportretą",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario pseudoportretą.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario pseudoportretą į <img/>",
     "Removed or unknown message type": "Žinutė pašalinta arba yra nežinomo tipo",
     "Filter community members": "Filtruoti bendruomenės dalyvius",
     "Removing a room from the community will also remove it from the community page.": "Pašalinus kambarį iš bendruomenės, taip pat pašalins jį iš bendruomenės puslapio.",
     "Filter community rooms": "Filtruoti bendruomenės kambarius",
     "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Padėkite patobulinti Riot.im, siųsdami <UsageDataLink>anoniminius naudojimosi duomenis</UsageDataLink>. Tai panaudos slapuką (žiūrėkite mūsų <PolicyLink>Slapukų politiką</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Padėkite patobulinti Riot.im, siųsdami <UsageDataLink>anoniminius naudojimosi duomenis</UsageDataLink>. Tai panaudos slapuką.",
+    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Padėkite patobulinti Riot.im, siųsdami <UsageDataLink>anoniminius naudojimosi duomenis</UsageDataLink>. Tai naudos slapuką.",
     "Please <a>contact your service administrator</a> to get this limit increased.": "Norėdami padidinti šį limitą, <a>susisiekite su savo paslaugų administratoriumi</a>.",
     "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
     "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Šis namų serveris viršijo vieno iš savo išteklių limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
@@ -636,8 +636,8 @@
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s išėjo",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s pasikeitė vardus",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s pasikeitė vardą %(count)s kartų(-us)",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė avatarą %(count)s kartų(-us)",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė avatarą %(count)s kartų(-us)",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė pseudoportretus %(count)s kartų(-us)",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė pseudoportretą %(count)s kartų(-us)",
     "And %(count)s more...|other": "Ir dar %(count)s...",
     "Existing Call": "Esamas skambutis",
     "A call is already in progress!": "Skambutis jau vyksta!",
@@ -757,7 +757,7 @@
     "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
     "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo Matrix paskyros %(serverName)s serveryje",
     "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Nepriklausomai nuo to ar jūs naudojate 'duonos trupinių' funkciją (avatarai virš kambarių sąrašo)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Nepriklausomai nuo to ar jūs naudojate 'duonos trupinių' funkciją (pseudoportretai virš kambarių sąrašo)",
     "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 šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
     "The remote side failed to pick up": "Nuotolinėi pusėi nepavyko atsiliepti",
     "Call failed due to misconfigured server": "Skambutis nepavyko dėl neteisingai sukonfigūruoto serverio",
@@ -790,9 +790,9 @@
     "You do not have the required permissions to use this command.": "Jūs neturite reikalingų leidimų naudoti šią komandą.",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Įspėjimas</b>: Kambario atnaujinimas <i>automatiškai nemigruos kambario dalyvių į naują kambario versiją.</i> Mes paskelbsime nuorodą į naują kambarį senojoje kambario versijoje - kambario dalyviai turės ją paspausti, norėdami prisijungti prie naujo kambario.",
     "Changes your display nickname in the current room only": "Pakeičia jūsų rodomą slapyvardį tik esamame kambaryje",
-    "Changes the avatar of the current room": "Pakeičia esamo kambario avatarą",
-    "Changes your avatar in this current room only": "Pakeičia jūsų avatarą tik esamame kambaryje",
-    "Changes your avatar in all rooms": "Pakeičia jūsų avatarą visuose kambariuose",
+    "Changes the avatar of the current room": "Pakeičia esamo kambario pseudoportretą",
+    "Changes your avatar in this current room only": "Pakeičia jūsų pseudoportretą tik esamame kambaryje",
+    "Changes your avatar in all rooms": "Pakeičia jūsų pseudoportretą visuose kambariuose",
     "Gets or sets the room topic": "Gauna arba nustato kambario temą",
     "This room has no topic.": "Šis kambarys neturi temos.",
     "Sets the room name": "Nustato kambario pavadinimą",
@@ -899,7 +899,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prie jo vėl prisijungti be pakvietimo.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite išeiti iš kambario %(roomName)s?",
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
-    "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
+    "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašo.",
     "General failure": "Bendras triktis",
     "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas",
     "Set a new account password...": "Nustatyti naują paskyros slaptažodį...",
@@ -925,7 +925,7 @@
     "Create your account": "Sukurkite savo paskyrą",
     "Change identity server": "Pakeisti tapatybės serverį",
     "Change": "Keisti",
-    "Change room avatar": "Keisti kambario avatarą",
+    "Change room avatar": "Keisti kambario pseudoportretą",
     "Change room name": "Keisti kambario pavadinimą",
     "Change main address for the room": "Keisti pagrindinį kambario adresą",
     "Change history visibility": "Keisti istorijos matomumą",
@@ -1002,7 +1002,7 @@
     "Failed to set direct chat tag": "Nepavyko nustatyti privataus pokalbio žymos",
     "Navigation": "Navigacija",
     "Calls": "Skambučiai",
-    "Room List": "Kambarių sąrašas",
+    "Room List": "Kambarių Sąrašas",
     "Autocomplete": "Autorašymas",
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
@@ -1013,7 +1013,7 @@
     "If you cancel now, you won't complete verifying your other session.": "Jei atšauksite dabar, neužbaigsite kito seanso patvirtinimo.",
     "Verify this session": "Patvirtinti šį seansą",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą iš %(oldRoomName)s į %(newRoomName)s.",
-    "Show display name changes": "Rodyti vardo pakeitimus",
+    "Show display name changes": "Rodyti rodomo vardo pakeitimus",
     "Show read receipts sent by other users": "Rodyti kitų vartotojų siųstus perskaitymo kvitus",
     "Order rooms by name": "Rūšiuoti kambarius pagal pavadinimą",
     "The other party cancelled the verification.": "Kita šalis atšaukė patvirtinimą.",
@@ -1049,8 +1049,8 @@
     "Create a private room": "Sukurti privatų kambarį",
     "Name": "Pavadinimas",
     "Topic (optional)": "Tema (nebūtina)",
-    "Hide advanced": "Paslėpti sudėtingesnius nustatymus",
-    "Show advanced": "Rodyti sudėtingesnius nustatymus",
+    "Hide advanced": "Paslėpti išplėstinius",
+    "Show advanced": "Rodyti išplėstinius",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Neleisti kitų matrix serverių vartotojams prisijungti prie šio kambario (Šis nustatymas negali būti vėliau pakeistas!)",
     "Session name": "Seanso pavadinimas",
     "Session key": "Seanso raktas",
@@ -1187,7 +1187,7 @@
     "Restore from Backup": "Atkurti iš atsarginės kopijos",
     "Flair": "Ženkliukai",
     "Access Token:": "Prieigos talonas:",
-    "Preferences": "Parinktys",
+    "Preferences": "Nuostatos",
     "Cryptography": "Kriptografija",
     "Security & Privacy": "Saugumas ir Privatumas",
     "Voice & Video": "Garsas ir Vaizdas",
@@ -1320,10 +1320,10 @@
     "Session already verified!": "Seansas jau patvirtintas!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Seansas jau patvirtintas, bet raktai NESUTAMPA!",
     "Enable cross-signing to verify per-user instead of per-session": "Įjunkite kryžminį pasirašymą, kad patvirtintumėte vartotoją, o ne seansą",
-    "Enable Emoji suggestions while typing": "Įjungti emoji pasiūlymus rašant",
+    "Enable Emoji suggestions while typing": "Įjungti jaustukų pasiūlymus rašant",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugų žinučių atgavimą šifruotuose kambariuose",
     "Enable automatic language detection for syntax highlighting": "Įjungti automatinį kalbos aptikimą sintaksės paryškinimui",
-    "Enable big emoji in chat": "Įjungti didelius emoji pokalbiuose",
+    "Enable big emoji in chat": "Įjungti didelius jaustukus pokalbiuose",
     "Enable Community Filter Panel": "Įjungti bendruomenės filtrų skydelį",
     "Enable message search in encrypted rooms": "Įjungti žinučių paiešką užšifruotuose kambariuose",
     "Verified!": "Patvirtinta!",
@@ -1331,9 +1331,9 @@
     "Got It": "Supratau",
     "Verify this session by completing one of the following:": "Patvirtinkite šį seansą atlikdami vieną iš šių veiksmų:",
     "Scan this unique code": "Nuskaitykite šį unikalų kodą",
-    "Compare unique emoji": "Palyginkite unikalius emoji",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Palyginkite unikalų emoji rinkinį, jei neturite fotoaparato nei viename įrenginyje",
-    "Confirm the emoji below are displayed on both sessions, in the same order:": "Patvirtinkite, kad žemiau esantys emoji yra rodomi abiejuose seansuose, ta pačia tvarka:",
+    "Compare unique emoji": "Palyginkite unikalius jaustukus",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Palyginkite unikalų jaustukų rinkinį, jei neturite fotoaparato nei viename įrenginyje",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Patvirtinkite, kad žemiau esantys jaustukai yra rodomi abiejuose seansuose, ta pačia tvarka:",
     "Waiting for %(displayName)s to verify…": "Laukiama kol %(displayName)s patvirtins…",
     "Cancelling…": "Atšaukiama…",
     "They match": "Jie sutampa",
@@ -1442,7 +1442,7 @@
     "Encrypted by a deleted session": "Užšifruota ištrintos sesijos",
     "Use an identity server in Settings to receive invites directly in Riot.": "Nustatymuose naudokite tapatybės serverį, kad gautumėte pakvietimus tiesiai į Riot.",
     "%(count)s verified sessions|one": "1 patvirtintas seansas",
-    "If you can't scan the code above, verify by comparing unique emoji.": "Jei nuskaityti aukščiau esančio kodo negalite, patvirtinkite palygindami unikalius emoji.",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Jei nuskaityti aukščiau esančio kodo negalite, patvirtinkite palygindami unikalius jaustukus.",
     "You've successfully verified your device!": "Jūs sėkmingai patvirtinote savo įrenginį!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Jūs sėkmingai patvirtinote %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "Jūs sėkmingai patvirtinote %(displayName)s!",
@@ -1469,9 +1469,64 @@
     "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose.",
     "Done": "Atlikta",
     "No media permissions": "Nėra medijos leidimų",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Seansas, kurį jūs bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba emoji patvirtinimo, kuriuos palaiko Riot. Bandykite su kitu klientu.",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Seansas, kurį jūs bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba jaustukų patvirtinimo, kuriuos palaiko Riot. Bandykite su kitu klientu.",
     "Almost there! Is your other session showing the same shield?": "Beveik atlikta! Ar jūsų kitas seansas rodo tokį patį skydą?",
     "Almost there! Is %(displayName)s showing the same shield?": "Beveik atlikta! Ar %(displayName)s rodo tokį patį skydą?",
     "No": "Ne",
-    "Yes": "Taip"
+    "Yes": "Taip",
+    "Interactively verify by Emoji": "Patvirtinti interaktyviai, naudojant jaustukus",
+    "The message you are trying to send is too large.": "Žinutė, kurią jūs bandote siųsti, yra per didelė.",
+    "Use the improved room list (in development - refresh to apply changes)": "Naudoti patobulintą kambarių sąrašą (tobulinama - atnaujinkite, kad pritaikytumėte pakeitimus)",
+    "Show a placeholder for removed messages": "Rodyti pašalintų žinučių žymeklį",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Rodyti prisijungimo/išėjimo žinutes (pakvietimai/išmetimai/draudimai nepaveikti)",
+    "Show avatar changes": "Rodyti pseudoportretų pakeitimus",
+    "Show avatars in user and room mentions": "Rodyti pseudoportretus vartotojo ir kambario paminėjimuose",
+    "Send typing notifications": "Siųsti spausdinimo pranešimus",
+    "Automatically replace plain text Emoji": "Automatiškai pakeisti paprasto teksto jaustukus",
+    "Mirror local video feed": "Atkartoti lokalų video tiekimą",
+    "Allow Peer-to-Peer for 1:1 calls": "Leisti \"Peer-to-Peer\" 1:1 skambučiams",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Klausti prieš siunčiant pakvietimus galimai netinkamiems matrix ID",
+    "Show rooms with unread notifications first": "Pirmiausia rodyti kambarius su neskaitytais pranešimais",
+    "Show shortcuts to recently viewed rooms above the room list": "Rodyti neseniai peržiūrėtų kambarių nuorodas virš kambarių sąrašo",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Leisti atsarginį skambučių pagalbos serverį turn.matrix.org, kai jūsų serveris to neteikia (jūsų IP adresas bus bendrintas pokalbio metu)",
+    "Show previews/thumbnails for images": "Rodyti vaizdų peržiūras/miniatiūras",
+    "IRC display name width": "IRC rodomo vardo plotis",
+    "Encrypted messages in one-to-one chats": "Šifruotos žinutės privačiuose pokalbiuose",
+    "When rooms are upgraded": "Kai atnaujinami kambariai",
+    "My Ban List": "Mano Draudimų Sąrašas",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Tai jūsų užblokuotų vartotojų/serverių sąrašas - nepalikite kambario!",
+    "Verify this user by confirming the following emoji appear on their screen.": "Patvirtinkite šį vartotoją, įsitikindami, kad šie jaustukai rodomi jo ekrane.",
+    "⚠ These settings are meant for advanced users.": "⚠ Šie nustatymai yra skirti pažengusiems vartotojams.",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "Jūsų asmeniniame draudimų sąraše yra visi vartotojai/serveriai, iš kurių jūs asmeniškai nenorite matyti pranešimų. Po pirmojo jūsų vartotojo/serverio ignoravimo, jūsų kambarių sąraše pasirodys naujas kambarys pavadinimu 'Mano Draudimų Sąrašas' - likite šiame kambaryje, kad draudimų sąrašas veiktų.",
+    "Room ID or alias of ban list": "Kambario ID arba draudimų sąrašo slapyvardis",
+    "Room list": "Kambarių sąrašas",
+    "Composer": "Rašymas",
+    "Autocomplete delay (ms)": "Automatinio užbaigimo vėlinimas (ms)",
+    "Read Marker lifetime (ms)": "Skaitymo žymeklio veikimo laikas (ms)",
+    "Read Marker off-screen lifetime (ms)": "Skaitymo žymeklio ne ekraninis veikimo laikas (ms)",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Jūs galite naudoti <code>/help</code>, kad pamatytumėte galimų komandų sąrašą. Ar norėjote siųsti tai kaip žinutę?",
+    "Room avatar": "Kambario pseudoportretas",
+    "Verify by comparing unique emoji.": "Patvirtinkite palygindami unikalius jaustukus.",
+    "Verify by emoji": "Patvirtinti naudojant jaustukus",
+    "Compare emoji": "Palyginkite jaustukus",
+    "Show image": "Rodyti vaizdą",
+    "Your avatar URL": "Jūsų pseudoportreto URL",
+    "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Jei yra papildomo konteksto, kuris padėtų analizuojant šią problemą, tokio kaip ką jūs darėte tuo metu, kambarių ID, vartotojų ID ir t.t., įtraukite tuos dalykus čia.",
+    "Create a new room with the same name, description and avatar": "Sukurkite naują kambarį su tuo pačiu vardu, aprašymu ir pseudoportretu",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Kambario atnaujinimas yra sudėtingas veiksmas ir paprastai rekomenduojamas, kai kambarys nestabilus dėl klaidų, trūkstamų funkcijų ar saugos spragų.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Norėdami padėti mums išvengti to ateityje, <a>atsiųskite mums žurnalus</a>.",
+    "Failed to upload image": "Nepavyko įkelti vaizdo",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Pakeitimai atlikti jūsų bendruomenės <bold1>pavadinimui</bold1> ir <bold2>pseudoportretui</bold2> iki 30 minučių gali būti nematomi kitų vartotojų.",
+    "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.": "Norėdami nustatyti filtrą, vilkite bendruomenės pseudoportretą į filtrų skydelį, esantį kairėje ekrano pusėje. Jūs bet kada galite paspausti ant pseudoportreto filtrų skydelyje, kad pamatytumėte tik su ta bendruomene susijusius kambarius ir žmones.",
+    "Upload an avatar:": "Įkelti pseudoportretą:",
+    "Emoji": "Jaustukai",
+    "Emoji Autocomplete": "Jaustukų automatinis užbaigimas",
+    "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.": "Eksportuotas failas leis visiems, kurie gali jį perskaityti, iššifruoti visas užšifruotas žinutes, kurias jūs galite matyti, todėl turėtumėte būti atsargūs, kad jis būtų saugus. Tam padėti, jūs turėtumėte žemiau įvesti slaptafrazę, kuri bus naudojama eksportuotų duomenų užšifravimui. Duomenis bus galima importuoti tik naudojant tą pačią slaptafrazę.",
+    "Jump to start/end of the composer": "Peršokti į rašymo pradžią/pabaigą",
+    "Navigate composer history": "Naršyti rašymo istoriją",
+    "Navigate up/down in the room list": "Naršyti aukštyn/žemyn kambarių saraše",
+    "Select room from the room list": "Pasirinkite kambarį iš kambarių sąrašo",
+    "Collapse room list section": "Sutraukti kambarių sąrašo skyrių",
+    "Expand room list section": "Išplėsti kambarių sąrašo skyrių",
+    "Clear room list filter field": "Išvalyti kambarių sąrašo filtro lauką"
 }

From ba3fe850e0755f8d0e0c57a152b33bffbff11f04 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 26 May 2020 12:09:23 +0100
Subject: [PATCH 3187/3235] Implement review

- lint member order
- cleaner type coersion
- specify access modifiers everywhere
---
 src/autocomplete/QueryMatcher.ts          |  2 +-
 src/components/views/elements/Field.tsx   | 29 ++++++++++-------------
 src/components/views/elements/Tooltip.tsx | 10 ++++----
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index c5fe083d6b..2c1899d813 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -79,7 +79,7 @@ export default class QueryMatcher<T extends Object> {
             // type for their values. We assume that those values who's keys have
             // been specified will be string. Also, we cannot infer all the
             // types of the keys of the objects at compile.
-            const keyValues: (string)[] = _at<T>(object as any, this._keys) as any;
+            const keyValues = _at<string>(<any>object, this._keys);
 
             for (const f of this._funcs) {
                 keyValues.push(f(object));
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 4a3725fadf..39ed2df9f9 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -34,7 +34,7 @@ interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInput
     id?: string,
     // The element to create. Defaults to "input".
     // To define options for a select, use <Field><option ... /></Field>
-    element?: InputType,
+    element?: "input" | " select" | "textarea",
     // The field's type (when used as an <input>). Defaults to "text".
     type?: string,
     // id of a <datalist> element for suggestions
@@ -68,12 +68,6 @@ interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInput
     // All other props pass through to the <input>.
 }
 
-enum InputType {
-    INPUT = "input",
-    SELECT = "select",
-    TEXTAREA = "textarea",
-}
-
 interface IState {
     valid: boolean,
     feedback: React.ReactNode,
@@ -85,7 +79,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
     private id: string;
     private input: HTMLInputElement;
 
-    static defaultProps = {
+    private static defaultProps = {
         element: "input",
         type: "text",
     }
@@ -99,15 +93,12 @@ export default class Field extends React.PureComponent<IProps, IState> {
      * We may find that we actually want different behaviour for registration
      * fields, in which case we can add some options to control it.
      */
-    validateOnChange = debounce(() => {
+    private validateOnChange = debounce(() => {
         this.validate({
             focused: true,
         });
     }, VALIDATION_THROTTLE_MS);
 
-    focus() {
-        this.input.focus();
-    }
     constructor(props) {
         super(props);
         this.state = {
@@ -120,7 +111,11 @@ export default class Field extends React.PureComponent<IProps, IState> {
         this.id = this.props.id || getId();
     }
 
-    onFocus = (ev) => {
+    public focus() {
+        this.input.focus();
+    }
+
+    private onFocus = (ev) => {
         this.setState({
             focused: true,
         });
@@ -133,7 +128,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
         }
     };
 
-    onChange = (ev) => {
+    private onChange = (ev) => {
         this.validateOnChange();
         // Parent component may have supplied its own `onChange` as well
         if (this.props.onChange) {
@@ -141,7 +136,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
         }
     };
 
-    onBlur = (ev) => {
+    private onBlur = (ev) => {
         this.setState({
             focused: false,
         });
@@ -154,7 +149,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
         }
     };
 
-    async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
+    private async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
         if (!this.props.onValidate) {
             return;
         }
@@ -187,7 +182,7 @@ export default class Field extends React.PureComponent<IProps, IState> {
 
 
 
-    render() {
+    public render() {
         const {
             element, prefixComponent, postfixComponent, className, onValidate, children,
             tooltipContent, flagInvalid, tooltipClassName, list, ...inputProps} = this.props;
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 650f09775d..133b0ecf58 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -46,12 +46,12 @@ export default class Tooltip extends React.Component<IProps> {
     private parent: Element;
 
 
-    static defaultProps = {
+    public static readonly defaultProps = {
         visible: true,
     };
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
-    componentDidMount() {
+    public componentDidMount() {
         this.tooltipContainer = document.createElement("div");
         this.tooltipContainer.className = "mx_Tooltip_wrapper";
         document.body.appendChild(this.tooltipContainer);
@@ -62,12 +62,12 @@ export default class Tooltip extends React.Component<IProps> {
         this.renderTooltip();
     }
 
-    componentDidUpdate() {
+    public componentDidUpdate() {
         this.renderTooltip();
     }
 
     // Remove the wrapper element, as the tooltip has finished using it
-    componentWillUnmount() {
+    public componentWillUnmount() {
         dis.dispatch<ViewTooltipPayload>({
             action: Action.ViewTooltip,
             tooltip: null,
@@ -128,7 +128,7 @@ export default class Tooltip extends React.Component<IProps> {
         });
     }
 
-    render() {
+    public render() {
         // Render a placeholder
         return (
             <div className={this.props.className} >

From cce53d8ab9f7949b1f5da4cb4e1381bfa7aae65e Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 26 May 2020 14:11:36 +0200
Subject: [PATCH 3188/3235] revert default font size to 15px

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

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 8df75b2c8b..e6aa112c5f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -180,7 +180,7 @@ export const SETTINGS = {
     "fontSize": {
         displayName: _td("Font size"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: 16,
+        default: 15,
         controller: new FontSizeController(),
     },
     "useCustomFontSize": {

From f8d2124aa3429c98d616e5eb6c8460891c1e0ffa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 May 2020 13:33:47 +0100
Subject: [PATCH 3189/3235] MemberAvatar should not have its own letter
 fallback, it should use BaseAvatar's

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Avatar.js                                |  1 +
 src/components/views/avatars/MemberAvatar.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 8393ce02b2..2cb90eaea6 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -19,6 +19,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
+// Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(member, width, height, resizeMethod) {
     let url;
     if (member && member.getAvatarUrl) {
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index d28d80e62a..b763129dd8 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -18,10 +18,10 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import * as Avatar from '../../../Avatar';
 import * as sdk from "../../../index";
 import dis from "../../../dispatcher/dispatcher";
 import {Action} from "../../../dispatcher/actions";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
 export default createReactClass({
     displayName: 'MemberAvatar',
@@ -62,10 +62,14 @@ export default createReactClass({
             return {
                 name: props.member.name,
                 title: props.title || props.member.userId,
-                imageUrl: Avatar.avatarUrlForMember(props.member,
-                                             props.width,
-                                             props.height,
-                                             props.resizeMethod),
+                imageUrl: props.member.getAvatarUrl(
+                    MatrixClientPeg.get().getHomeserverUrl(),
+                    Math.floor(props.width * window.devicePixelRatio),
+                    Math.floor(props.height * window.devicePixelRatio),
+                    props.resizeMethod,
+                    false,
+                    false,
+                ),
             };
         } else if (props.fallbackUserId) {
             return {

From 7e45a71a8a852ca64e37e8b3175ca50a48a55fc4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 May 2020 13:37:57 +0100
Subject: [PATCH 3190/3235] Remove EncryptedEventDialog

https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.

Fixes https://github.com/vector-im/riot-web/issues/11752
---
 .../views/dialogs/EncryptedEventDialog.js     | 206 ------------------
 .../views/context_menus/MessageContextMenu.js |  15 --
 .../views/messages/MessageActionBar.js        |  15 +-
 3 files changed, 1 insertion(+), 235 deletions(-)
 delete mode 100644 src/async-components/views/dialogs/EncryptedEventDialog.js

diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
deleted file mode 100644
index 9eb4439816..0000000000
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ /dev/null
@@ -1,206 +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.
-*/
-
-import React from "react";
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {Key} from "../../../Keyboard";
-import * as sdk from "../../../index";
-
-// XXX: This component is not cross-signing aware.
-// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
-// component or taking it out to pasture.
-export default createReactClass({
-    displayName: 'EncryptedEventDialog',
-
-    propTypes: {
-        event: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    },
-
-    getInitialState: function() {
-        return { device: null };
-    },
-
-    componentDidMount: function() {
-        this._unmounted = false;
-        const client = MatrixClientPeg.get();
-
-        // first try to load the device from our store.
-        //
-        this.refreshDevice().then((dev) => {
-            if (dev) {
-                return dev;
-            }
-
-            // tell the client to try to refresh the device list for this user
-            return client.downloadKeys([this.props.event.getSender()], true).then(() => {
-                return this.refreshDevice();
-            });
-        }).then((dev) => {
-            if (this._unmounted) {
-                return;
-            }
-
-            this.setState({ device: dev });
-            client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        }, (err)=>{
-            console.log("Error downloading devices", err);
-        });
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-        const client = MatrixClientPeg.get();
-        if (client) {
-            client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        }
-    },
-
-    refreshDevice: function() {
-        // Promise.resolve to handle transition from static result to promise; can be removed
-        // in future
-        return Promise.resolve(MatrixClientPeg.get().getEventSenderDeviceInfo(this.props.event));
-    },
-
-    onDeviceVerificationChanged: function(userId, device) {
-        if (userId === this.props.event.getSender()) {
-            this.refreshDevice().then((dev) => {
-                this.setState({ device: dev });
-            });
-        }
-    },
-
-    onKeyDown: function(e) {
-        if (e.key === Key.ESCAPE) {
-            e.stopPropagation();
-            e.preventDefault();
-            this.props.onFinished(false);
-        }
-    },
-
-    _renderDeviceInfo: function() {
-        const device = this.state.device;
-        if (!device) {
-            return (<i>{ _t('unknown device') }</i>);
-        }
-
-        let verificationStatus = (<b>{ _t('NOT verified') }</b>);
-        if (device.isBlocked()) {
-            verificationStatus = (<b>{ _t('Blacklisted') }</b>);
-        } else if (device.isVerified()) {
-            verificationStatus = _t('verified');
-        }
-
-        return (
-            <table>
-                <tbody>
-                    <tr>
-                        <td>{ _t('Name') }</td>
-                        <td>{ device.getDisplayName() }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Device ID') }</td>
-                        <td><code>{ device.deviceId }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Verification') }</td>
-                        <td>{ verificationStatus }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Ed25519 fingerprint') }</td>
-                        <td><code>{ device.getFingerprint() }</code></td>
-                    </tr>
-                </tbody>
-            </table>
-        );
-    },
-
-    _renderEventInfo: function() {
-        const event = this.props.event;
-
-        return (
-            <table>
-                <tbody>
-                    <tr>
-                        <td>{ _t('User ID') }</td>
-                        <td>{ event.getSender() }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Curve25519 identity key') }</td>
-                        <td><code>{ event.getSenderKey() || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Claimed Ed25519 fingerprint key') }</td>
-                        <td><code>{ event.getKeysClaimed().ed25519 || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Algorithm') }</td>
-                        <td>{ event.getWireContent().algorithm || <i>{ _t('unencrypted') }</i> }</td>
-                    </tr>
-                {
-                    event.getContent().msgtype === 'm.bad.encrypted' ? (
-                    <tr>
-                        <td>{ _t('Decryption error') }</td>
-                        <td>{ event.getContent().body }</td>
-                    </tr>
-                    ) : null
-                }
-                    <tr>
-                        <td>{ _t('Session ID') }</td>
-                        <td><code>{ event.getWireContent().session_id || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                </tbody>
-            </table>
-        );
-    },
-
-    render: function() {
-        const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
-
-        let buttons = null;
-        if (this.state.device) {
-            buttons = (
-                <DeviceVerifyButtons device={this.state.device}
-                    userId={this.props.event.getSender()}
-                />
-            );
-        }
-
-        return (
-            <div className="mx_EncryptedEventDialog" onKeyDown={this.onKeyDown}>
-                <div className="mx_Dialog_title">
-                    { _t('End-to-end encryption information') }
-                </div>
-                <div className="mx_Dialog_content">
-                    <h4>{ _t('Event information') }</h4>
-                    { this._renderEventInfo() }
-
-                    <h4>{ _t('Sender session information') }</h4>
-                    { this._renderDeviceInfo() }
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={true}>
-                        { _t('OK') }
-                    </button>
-                    { buttons }
-                </div>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 2c835e6967..59e3d4c230 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -116,11 +116,6 @@ export default createReactClass({
         this.closeMenu();
     },
 
-    e2eInfoClicked: function() {
-        this.props.e2eInfoCallback();
-        this.closeMenu();
-    },
-
     onReportEventClick: function() {
         const ReportEventDialog = sdk.getComponent("dialogs.ReportEventDialog");
         Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
@@ -465,15 +460,6 @@ export default createReactClass({
             );
         }
 
-        let e2eInfo;
-        if (this.props.e2eInfoCallback) {
-            e2eInfo = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.e2eInfoClicked}>
-                    { _t('End-to-end encryption information') }
-                </MenuItem>
-            );
-        }
-
         let reportEventButton;
         if (mxEvent.getSender() !== me) {
             reportEventButton = (
@@ -500,7 +486,6 @@ export default createReactClass({
                 { quoteButton }
                 { externalURLButton }
                 { collapseReplyThread }
-                { e2eInfo }
                 { reportEventButton }
             </div>
         );
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 48b9c58cb8..3021b1a434 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,18 +41,6 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
         const tile = getTile && getTile();
         const replyThread = getReplyThread && getReplyThread();
 
-        const onCryptoClick = () => {
-            Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
-                import('../../../async-components/views/dialogs/EncryptedEventDialog'),
-                {event: mxEvent},
-            );
-        };
-
-        let e2eInfoCallback = null;
-        if (mxEvent.isEncrypted() && !SettingsStore.getValue("feature_cross_signing")) {
-            e2eInfoCallback = onCryptoClick;
-        }
-
         const buttonRect = button.current.getBoundingClientRect();
         contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu}>
             <MessageContextMenu
@@ -60,7 +48,6 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
                 permalinkCreator={permalinkCreator}
                 eventTileOps={tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined}
                 collapseReplyThread={replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined}
-                e2eInfoCallback={e2eInfoCallback}
                 onFinished={closeMenu}
             />
         </ContextMenu>;

From 352727906e708b17491cff1efe0c05c748bcf657 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 May 2020 13:40:36 +0100
Subject: [PATCH 3191/3235] i18n

---
 src/i18n/strings/en_EN.json | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 53a4aa58f1..c3ce05b932 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1856,7 +1856,6 @@
     "Share Message": "Share Message",
     "Source URL": "Source URL",
     "Collapse Reply Thread": "Collapse Reply Thread",
-    "End-to-end encryption information": "End-to-end encryption information",
     "Report Content": "Report Content",
     "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
@@ -2176,22 +2175,6 @@
     "Room Autocomplete": "Room Autocomplete",
     "Users": "Users",
     "User Autocomplete": "User Autocomplete",
-    "unknown device": "unknown device",
-    "NOT verified": "NOT verified",
-    "Blacklisted": "Blacklisted",
-    "verified": "verified",
-    "Device ID": "Device ID",
-    "Verification": "Verification",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
-    "User ID": "User ID",
-    "Curve25519 identity key": "Curve25519 identity key",
-    "none": "none",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
-    "Algorithm": "Algorithm",
-    "unencrypted": "unencrypted",
-    "Decryption error": "Decryption error",
-    "Event information": "Event information",
-    "Sender session information": "Sender session information",
     "Passphrases must match": "Passphrases must match",
     "Passphrase must not be empty": "Passphrase must not be empty",
     "Export room keys": "Export room keys",

From 563a36e0a1f758f79f00af697a928cda2fc18866 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 May 2020 13:42:00 +0100
Subject: [PATCH 3192/3235] Remove unused CSS too

---
 res/css/_components.scss                      |  1 -
 .../views/dialogs/_EncryptedEventDialog.scss  | 34 -------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 res/css/views/dialogs/_EncryptedEventDialog.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 3a6a3257a3..44c63b9df7 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -63,7 +63,6 @@
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DeviceVerifyDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
-@import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
diff --git a/res/css/views/dialogs/_EncryptedEventDialog.scss b/res/css/views/dialogs/_EncryptedEventDialog.scss
deleted file mode 100644
index ff73df509d..0000000000
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 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.
-*/
-
-.mx_EncryptedEventDialog .mx_DeviceVerifyButtons {
-    float: right;
-    padding: 0px;
-    margin-right: 42px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-}
-
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton {
-    @mixin mx_DialogButton;
-    background-color: $primary-bg-color;
-    color: $accent-color;
-}
-
-.mx_EncryptedEventDialog button {
-    margin-top: 0px;
-}

From d2fe4bcecdcb07258085a6265a4df890e17f73bc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 May 2020 13:46:47 +0100
Subject: [PATCH 3193/3235] Unused imports

---
 src/components/views/messages/MessageActionBar.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 3021b1a434..95eb37b588 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -22,11 +22,9 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
-import Modal from '../../../Modal';
 import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 import RoomContext from "../../../contexts/RoomContext";
-import SettingsStore from '../../../settings/SettingsStore';
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();

From fb73bac4cf7c847d088be2f02414c82c4eeee041 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 26 May 2020 13:53:28 +0100
Subject: [PATCH 3194/3235] Update UpdateToast's priority to 30

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/toasts/UpdateToast.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index 3d4b55a4ff..55c128e86a 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -81,7 +81,7 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
             onAccept,
         },
         component: GenericToast,
-        priority: 20,
+        priority: 30,
     });
 };
 

From f1282179fb2aa880b2dccfafef7c4a72abae9ed6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 26 May 2020 14:58:09 +0200
Subject: [PATCH 3195/3235] add logging when we fail to join a room

---
 src/stores/RoomViewStore.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 3d82d086d7..7fa1ef639f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -272,6 +272,7 @@ class RoomViewStore extends Store {
                 err: err,
             });
             let msg = err.message ? err.message : JSON.stringify(err);
+            console.log("Failed to join room:", msg);
             // XXX: We are relying on the error message returned by browsers here.
             // This isn't great, but it does generalize the error being shown to users.
             if (msg && msg.startsWith("CORS request rejected")) {

From cfe517323512273682702bfbb87357501a4de4d3 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 26 May 2020 15:20:58 +0200
Subject: [PATCH 3196/3235] use connection error to detect network problem

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

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 7fa1ef639f..612d786468 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -273,9 +273,7 @@ class RoomViewStore extends Store {
             });
             let msg = err.message ? err.message : JSON.stringify(err);
             console.log("Failed to join room:", msg);
-            // XXX: We are relying on the error message returned by browsers here.
-            // This isn't great, but it does generalize the error being shown to users.
-            if (msg && msg.startsWith("CORS request rejected")) {
+            if (err.name === "ConnectionError") {
                 msg = _t("There was an error joining the room");
             }
             if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {

From a496dafd417cdc8b784bab0eedd7faba74da8d6c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 May 2020 16:51:20 +0100
Subject: [PATCH 3197/3235] Remove the keyshare dialog

Fixes https://github.com/vector-im/riot-web/issues/11908
---
 src/KeyRequestHandler.js                      | 158 ----------------
 src/components/structures/MatrixChat.tsx      |  11 --
 .../views/dialogs/KeyShareDialog.js           | 178 ------------------
 src/i18n/strings/en_EN.json                   |   7 -
 4 files changed, 354 deletions(-)
 delete mode 100644 src/KeyRequestHandler.js
 delete mode 100644 src/components/views/dialogs/KeyShareDialog.js

diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
deleted file mode 100644
index ceaff0c54d..0000000000
--- a/src/KeyRequestHandler.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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 * as sdk from './index';
-import Modal from './Modal';
-import SettingsStore from './settings/SettingsStore';
-
-// TODO: We can remove this once cross-signing is the only way.
-// https://github.com/vector-im/riot-web/issues/11908
-export default class KeyRequestHandler {
-    constructor(matrixClient) {
-        this._matrixClient = matrixClient;
-
-        // the user/device for which we currently have a dialog open
-        this._currentUser = null;
-        this._currentDevice = null;
-
-        // userId -> deviceId -> [keyRequest]
-        this._pendingKeyRequests = Object.create(null);
-    }
-
-    handleKeyRequest(keyRequest) {
-        // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            return;
-        }
-
-        const userId = keyRequest.userId;
-        const deviceId = keyRequest.deviceId;
-        const requestId = keyRequest.requestId;
-
-        if (!this._pendingKeyRequests[userId]) {
-            this._pendingKeyRequests[userId] = Object.create(null);
-        }
-        if (!this._pendingKeyRequests[userId][deviceId]) {
-            this._pendingKeyRequests[userId][deviceId] = [];
-        }
-
-        // check if we already have this request
-        const requests = this._pendingKeyRequests[userId][deviceId];
-        if (requests.find((r) => r.requestId === requestId)) {
-            console.log("Already have this key request, ignoring");
-            return;
-        }
-
-        requests.push(keyRequest);
-
-        if (this._currentUser) {
-            // ignore for now
-            console.log("Key request, but we already have a dialog open");
-            return;
-        }
-
-        this._processNextRequest();
-    }
-
-    handleKeyRequestCancellation(cancellation) {
-        // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            return;
-        }
-
-        // see if we can find the request in the queue
-        const userId = cancellation.userId;
-        const deviceId = cancellation.deviceId;
-        const requestId = cancellation.requestId;
-
-        if (userId === this._currentUser && deviceId === this._currentDevice) {
-            console.log(
-                "room key request cancellation for the user we currently have a"
-                + " dialog open for",
-            );
-            // TODO: update the dialog. For now, we just ignore the
-            // cancellation.
-            return;
-        }
-
-        if (!this._pendingKeyRequests[userId]) {
-            return;
-        }
-        const requests = this._pendingKeyRequests[userId][deviceId];
-        if (!requests) {
-            return;
-        }
-        const idx = requests.findIndex((r) => r.requestId === requestId);
-        if (idx < 0) {
-            return;
-        }
-        console.log("Forgetting room key request");
-        requests.splice(idx, 1);
-        if (requests.length === 0) {
-            delete this._pendingKeyRequests[userId][deviceId];
-            if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
-                delete this._pendingKeyRequests[userId];
-            }
-        }
-    }
-
-    _processNextRequest() {
-        const userId = Object.keys(this._pendingKeyRequests)[0];
-        if (!userId) {
-            return;
-        }
-        const deviceId = Object.keys(this._pendingKeyRequests[userId])[0];
-        if (!deviceId) {
-            return;
-        }
-        console.log(`Starting KeyShareDialog for ${userId}:${deviceId}`);
-
-        const finished = (r) => {
-            this._currentUser = null;
-            this._currentDevice = null;
-
-            if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) {
-                // request was removed in the time the dialog was displayed
-                this._processNextRequest();
-                return;
-            }
-
-            if (r) {
-                for (const req of this._pendingKeyRequests[userId][deviceId]) {
-                    req.share();
-                }
-            }
-            delete this._pendingKeyRequests[userId][deviceId];
-            if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
-                delete this._pendingKeyRequests[userId];
-            }
-
-            this._processNextRequest();
-        };
-
-        const KeyShareDialog = sdk.getComponent("dialogs.KeyShareDialog");
-        Modal.appendTrackedDialog('Key Share', 'Process Next Request', KeyShareDialog, {
-            matrixClient: this._matrixClient,
-            userId: userId,
-            deviceId: deviceId,
-            onFinished: finished,
-        });
-        this._currentUser = userId;
-        this._currentDevice = deviceId;
-    }
-}
-
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f1992bbfcf..1200fcaf7a 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -49,7 +49,6 @@ import PageTypes from '../../PageTypes';
 import { getHomePageUrl } from '../../utils/pages';
 
 import createRoom from "../../createRoom";
-import KeyRequestHandler from '../../KeyRequestHandler';
 import { _t, getCurrentLanguage } from '../../languageHandler';
 import SettingsStore, { SettingLevel } from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
@@ -1471,16 +1470,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         cli.on("Session.logged_out", () => dft.stop());
         cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
 
-        // TODO: We can remove this once cross-signing is the only way.
-        // https://github.com/vector-im/riot-web/issues/11908
-        const krh = new KeyRequestHandler(cli);
-        cli.on("crypto.roomKeyRequest", (req) => {
-            krh.handleKeyRequest(req);
-        });
-        cli.on("crypto.roomKeyRequestCancellation", (req) => {
-            krh.handleKeyRequestCancellation(req);
-        });
-
         cli.on("Room", (room) => {
             if (MatrixClientPeg.get().isCryptoEnabled()) {
                 const blacklistEnabled = SettingsStore.getValueAt(
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
deleted file mode 100644
index 8ef36bb59f..0000000000
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-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.
-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 createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-
-import { _t, _td } from '../../../languageHandler';
-
-// TODO: We can remove this once cross-signing is the only way.
-// https://github.com/vector-im/riot-web/issues/11908
-
-/**
- * Dialog which asks the user whether they want to share their keys with
- * an unverified device.
- *
- * onFinished is called with `true` if the key should be shared, `false` if it
- * should not, and `undefined` if the dialog is cancelled. (In other words:
- * truthy: do the key share. falsy: don't share the keys).
- */
-export default createReactClass({
-    propTypes: {
-        matrixClient: PropTypes.object.isRequired,
-        userId: PropTypes.string.isRequired,
-        deviceId: PropTypes.string.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            deviceInfo: null,
-            wasNewDevice: false,
-        };
-    },
-
-    componentDidMount: function() {
-        this._unmounted = false;
-        const userId = this.props.userId;
-        const deviceId = this.props.deviceId;
-
-        // give the client a chance to refresh the device list
-        this.props.matrixClient.downloadKeys([userId], false).then((r) => {
-            if (this._unmounted) { return; }
-
-            const deviceInfo = r[userId][deviceId];
-
-            if (!deviceInfo) {
-                console.warn(`No details found for session ${userId}:${deviceId}`);
-
-                this.props.onFinished(false);
-                return;
-            }
-
-            const wasNewDevice = !deviceInfo.isKnown();
-
-            this.setState({
-                deviceInfo: deviceInfo,
-                wasNewDevice: wasNewDevice,
-            });
-
-            // if the device was new before, it's not any more.
-            if (wasNewDevice) {
-                this.props.matrixClient.setDeviceKnown(
-                    userId,
-                    deviceId,
-                    true,
-                );
-            }
-        });
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-    },
-
-
-    _onVerifyClicked: function() {
-        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-
-        console.log("KeyShareDialog: Starting verify dialog");
-        Modal.createTrackedDialog('Key Share', 'Starting dialog', DeviceVerifyDialog, {
-            userId: this.props.userId,
-            device: this.state.deviceInfo,
-            onFinished: (verified) => {
-                if (verified) {
-                    // can automatically share the keys now.
-                    this.props.onFinished(true);
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
-    },
-
-    _onShareClicked: function() {
-        console.log("KeyShareDialog: User clicked 'share'");
-        this.props.onFinished(true);
-    },
-
-    _onIgnoreClicked: function() {
-        console.log("KeyShareDialog: User clicked 'ignore'");
-        this.props.onFinished(false);
-    },
-
-    _renderContent: function() {
-        const displayName = this.state.deviceInfo.getDisplayName() ||
-            this.state.deviceInfo.deviceId;
-
-        let text;
-        if (this.state.wasNewDevice) {
-            text = _td("You added a new session '%(displayName)s', which is"
-                + " requesting encryption keys.");
-        } else {
-            text = _td("Your unverified session '%(displayName)s' is requesting"
-                + " encryption keys.");
-        }
-        text = _t(text, {displayName: displayName});
-
-        return (
-            <div id='mx_Dialog_content'>
-                <p>{ text }</p>
-
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this._onVerifyClicked} autoFocus="true">
-                        { _t('Start verification') }
-                    </button>
-                    <button onClick={this._onShareClicked}>
-                        { _t('Share without verifying') }
-                    </button>
-                    <button onClick={this._onIgnoreClicked}>
-                        { _t('Ignore request') }
-                    </button>
-                </div>
-            </div>
-        );
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-
-        let content;
-
-        if (this.state.deviceInfo) {
-            content = this._renderContent();
-        } else {
-            content = (
-                <div id='mx_Dialog_content'>
-                    <p>{ _t('Loading session info...') }</p>
-                    <Spinner />
-                </div>
-            );
-        }
-
-        return (
-            <BaseDialog className='mx_KeyShareRequestDialog'
-                onFinished={this.props.onFinished}
-                title={_t('Encryption key request')}
-                contentId='mx_Dialog_content'
-            >
-                { content }
-            </BaseDialog>
-        );
-    },
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7474af2ee7..dc583d8d9a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1669,13 +1669,6 @@
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
     "Go": "Go",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
-    "Start verification": "Start verification",
-    "Share without verifying": "Share without verifying",
-    "Ignore request": "Ignore request",
-    "Loading session info...": "Loading session info...",
-    "Encryption key request": "Encryption key request",
     "a new master key signature": "a new master key signature",
     "a new cross-signing key signature": "a new cross-signing key signature",
     "a device cross-signing signature": "a device cross-signing signature",

From d8836f0f4ba9707ac8690e58d64bd094a0eafb9e Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 26 May 2020 17:09:42 +0100
Subject: [PATCH 3198/3235] Fir sublist sizing regression

---
 res/css/views/rooms/_RoomTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 759dce5afa..7f93da0bbf 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -20,7 +20,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     cursor: pointer;
-    height: 32px;
+    height: 34px;
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;

From 792859b939ee0a0a1b92441a49c9898318ef70e3 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 26 May 2020 17:39:39 +0100
Subject: [PATCH 3199/3235] Fix lines overflowing room list width

---
 res/css/views/rooms/_IRCLayout.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 5f88473c5f..821a5214ec 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -63,6 +63,8 @@ $irc-line-height: $font-18px;
             flex-direction: column;
             order: 3;
             flex-grow: 1;
+            flex-shrink: 1;
+            min-width: 0;
         }
 
         > .mx_EventTile_avatar {

From 73213422a9997d7b5323695d8f725f921f20334a Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Tue, 26 May 2020 18:15:06 +0100
Subject: [PATCH 3200/3235] fix encryption icon missalignment

---
 res/css/views/rooms/_IRCLayout.scss     | 10 ++++++----
 src/components/views/rooms/EventTile.js |  8 ++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 5f88473c5f..cda55b0944 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -41,7 +41,7 @@ $irc-line-height: $font-18px;
         }
 
         > .mx_EventTile_msgOption {
-            order: 4;
+            order: 5;
             flex-shrink: 0;
         }
 
@@ -90,12 +90,14 @@ $irc-line-height: $font-18px;
             text-align: right;
         }
 
-        .mx_EventTile_e2eIcon {
+        > .mx_EventTile_e2eIcon {
             position: relative;
             right: unset;
             left: unset;
-            top: -2px;
             padding: 0;
+            order: 3;
+            flex-shrink: 0;
+            flex-grow: 0;
         }
 
         .mx_EventTile_line {
@@ -113,7 +115,7 @@ $irc-line-height: $font-18px;
         }
 
         .mx_EventTile_reply {
-            order: 3;
+            order: 4;
         }
 
         .mx_EditMessageComposer_buttons {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index ee0b40c0de..a822875a18 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -802,6 +802,8 @@ export default createReactClass({
 
         const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
         const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
+        const groupPadlock = !this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
+        const ircPadlock = this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
 
         switch (this.props.tileShape) {
             case 'notif': {
@@ -873,9 +875,10 @@ export default createReactClass({
                         { ircTimestamp }
                         { avatar }
                         { sender }
+                        { ircPadlock }
                         <div className="mx_EventTile_reply">
                             { groupTimestamp }
-                            { !isBubbleMessage && this._renderE2EPadlock() }
+                            { groupPadlock }
                             { thread }
                             <EventTileType ref={this._tile}
                                            mxEvent={this.props.mxEvent}
@@ -904,9 +907,10 @@ export default createReactClass({
                             { readAvatars }
                         </div>
                         { sender }
+                        { ircPadlock }
                         <div className="mx_EventTile_line">
                             { groupTimestamp }
-                            { !isBubbleMessage && this._renderE2EPadlock() }
+                            { groupPadlock }
                             { thread }
                             <EventTileType ref={this._tile}
                                            mxEvent={this.props.mxEvent}

From 403a64bcc648c8930a93f26f1c3407e00e4caa1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 May 2020 20:47:30 +0200
Subject: [PATCH 3201/3235] EventIndex: Print out the checkpoint if there was
 an error during a crawl.

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

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index d372c38405..a02e378d8e 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -405,7 +405,7 @@ export default class EventIndex extends EventEmitter {
                     continue;
                 }
 
-                console.log("EventIndex: Error crawling events:", e);
+                console.log("EventIndex: Error crawling using checkpoint:", checkpoint, ",", e);
                 this.crawlerCheckpoints.push(checkpoint);
                 continue;
             }

From 58f0814530b22b5a03f10e74ee18827ea60100a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Tue, 26 May 2020 21:27:45 +0200
Subject: [PATCH 3202/3235] EventIndex: Handle invalid m.room.redaction events
 correctly.

Clients might send invalid redaction events, such events will not have a
valid redacts field containing the event id of the associated event that
was redacted.

Skip such events instead of ending up looping over the checkpoint
forever.
---
 src/indexing/EventIndex.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a02e378d8e..b0dd811e0c 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -507,7 +507,14 @@ export default class EventIndex extends EventEmitter {
             try {
                 for (let i = 0; i < redactionEvents.length; i++) {
                     const ev = redactionEvents[i];
-                    await indexManager.deleteEvent(ev.getAssociatedId());
+                    const eventId = ev.getAssociatedId();
+
+                    if (eventId) {
+                        await indexManager.deleteEvent(eventId);
+                    } else {
+                        console.log("EventIndex: Redaction event doesn't contain a",
+                                    "valid associated event id", ev);
+                    }
                 }
 
                 const eventsAlreadyAdded = await indexManager.addHistoricEvents(

From 6c10cbc9032519a4a31373a84b5b3f8b8eb97459 Mon Sep 17 00:00:00 2001
From: poljar <poljar@termina.org.uk>
Date: Tue, 26 May 2020 21:48:10 +0200
Subject: [PATCH 3203/3235] EventIndex: Use a warning when redactions don't
 have an event id.

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/indexing/EventIndex.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index b0dd811e0c..fac7c92b65 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -512,8 +512,7 @@ export default class EventIndex extends EventEmitter {
                     if (eventId) {
                         await indexManager.deleteEvent(eventId);
                     } else {
-                        console.log("EventIndex: Redaction event doesn't contain a",
-                                    "valid associated event id", ev);
+                        console.warn("EventIndex: Redaction event doesn't contain a valid associated event id", ev);
                     }
                 }
 

From a9c54153eec696a86815ecb5a7047f30c72270f5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 May 2020 15:54:02 -0600
Subject: [PATCH 3204/3235] Update badge counts in new room list as needed

---
 src/components/views/rooms/RoomTile2.tsx | 21 +++++++++++++--
 src/stores/room-list/RoomListStore2.ts   | 14 ++++------
 src/utils/read-receipts.ts               | 34 ++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 src/utils/read-receipts.ts

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index ae1802de49..d9d1d39142 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -30,6 +30,8 @@ import * as RoomNotifs from '../../../RoomNotifs';
 import { EffectiveMembership, getEffectiveMembership } from "../../../stores/room-list/membership";
 import * as Unread from '../../../Unread';
 import * as FormattingUtils from "../../../utils/FormattingUtils";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 /*******************************************************************
  *   CAUTION                                                       *
@@ -86,10 +88,19 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             hover: false,
             notificationState: this.getNotificationState(),
         };
+
+        // TODO: We shouldn't have to listen to every room update
+        // We don't have a model which works in a better way though.
+        MatrixClientPeg.get().on("Room.receipt", this.tryUpdateIfRoomMatches);
+        MatrixClientPeg.get().on("Room.timeline", this.tryUpdateIfRoomMatches);
+        MatrixClientPeg.get().on("Event.decrypted", this.tryUpdateIfRoomMatches);
+        MatrixClientPeg.get().on("Room.redaction", this.tryUpdateIfRoomMatches);
     }
 
     public componentWillUnmount() {
-        // TODO: Listen for changes to the badge count and update as needed
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Room.receipt", this.tryUpdateIfRoomMatches);
+        }
     }
 
     // XXX: This is a bit of an awful-looking hack. We should probably be using state for
@@ -99,7 +110,13 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         return getEffectiveMembership(this.props.room.getMyMembership()) === EffectiveMembership.Invite;
     }
 
-    // TODO: Make use of this function when the notification state needs updating.
+    private tryUpdateIfRoomMatches = (event: MatrixEvent) => {
+        const roomId = event.getRoomId();
+        if (roomId !== this.props.room.roomId) return;
+
+        this.updateNotificationState();
+    };
+
     private updateNotificationState() {
         this.setState({notificationState: this.getNotificationState()});
     }
diff --git a/src/stores/room-list/RoomListStore2.ts b/src/stores/room-list/RoomListStore2.ts
index 881b8fd3cf..108922a598 100644
--- a/src/stores/room-list/RoomListStore2.ts
+++ b/src/stores/room-list/RoomListStore2.ts
@@ -26,6 +26,7 @@ import { ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorit
 import { getListAlgorithmInstance } from "./algorithms/list-ordering";
 import { ActionPayload } from "../../dispatcher/payloads";
 import defaultDispatcher from "../../dispatcher/dispatcher";
+import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -135,15 +136,10 @@ class _RoomListStore extends AsyncStore<ActionPayload> {
         if (payload.action === 'MatrixActions.Room.receipt') {
             // First see if the receipt event is for our own user. If it was, trigger
             // a room update (we probably read the room on a different device).
-            // noinspection JSObjectNullOrUndefined - this.matrixClient can't be null by this point in the lifecycle
-            const myUserId = this.matrixClient.getUserId();
-            for (const eventId of Object.keys(payload.event.getContent())) {
-                const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
-                if (receiptUsers.includes(myUserId)) {
-                    // TODO: Update room now that it's been read
-                    console.log(payload);
-                    return;
-                }
+            if (readReceiptChangeIsFor(payload.event, this.matrixClient)) {
+                // TODO: Update room now that it's been read
+                console.log(payload);
+                return;
             }
         } else if (payload.action === 'MatrixActions.Room.tags') {
             // TODO: Update room from tags
diff --git a/src/utils/read-receipts.ts b/src/utils/read-receipts.ts
new file mode 100644
index 0000000000..f05c3cc5f2
--- /dev/null
+++ b/src/utils/read-receipts.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+/**
+ * Determines if a read receipt update event includes the client's own user.
+ * @param event The event to check.
+ * @param client The client to check against.
+ * @returns True if the read receipt update includes the client, false otherwise.
+ */
+export function readReceiptChangeIsFor(event: MatrixEvent, client: MatrixClient): boolean {
+    const myUserId = client.getUserId();
+    for (const eventId of Object.keys(event.getContent())) {
+        const receiptUsers = Object.keys(event.getContent()[eventId]['m.read'] || {});
+        if (receiptUsers.includes(myUserId)) {
+            return true;
+        }
+    }
+}

From bf8a3d4419c66f0c5318d2a2d4f8b843e48ec3ea Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 26 May 2020 16:20:51 -0600
Subject: [PATCH 3205/3235] Bind to the room instead of the client

Also add the other missing deregister handlers
---
 src/components/views/rooms/RoomTile2.tsx | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index d9d1d39142..47ce001983 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -89,17 +89,18 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
             notificationState: this.getNotificationState(),
         };
 
-        // TODO: We shouldn't have to listen to every room update
-        // We don't have a model which works in a better way though.
-        MatrixClientPeg.get().on("Room.receipt", this.tryUpdateIfRoomMatches);
-        MatrixClientPeg.get().on("Room.timeline", this.tryUpdateIfRoomMatches);
-        MatrixClientPeg.get().on("Event.decrypted", this.tryUpdateIfRoomMatches);
-        MatrixClientPeg.get().on("Room.redaction", this.tryUpdateIfRoomMatches);
+        this.props.room.on("Room.receipt", this.handleRoomEventUpdate);
+        this.props.room.on("Room.timeline", this.handleRoomEventUpdate);
+        this.props.room.on("Event.decrypted", this.handleRoomEventUpdate);
+        this.props.room.on("Room.redaction", this.handleRoomEventUpdate);
     }
 
     public componentWillUnmount() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room.receipt", this.tryUpdateIfRoomMatches);
+        if (this.props.room) {
+            this.props.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
+            this.props.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
+            this.props.room.removeListener("Event.decrypted", this.handleRoomEventUpdate);
+            this.props.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
         }
     }
 
@@ -110,8 +111,10 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         return getEffectiveMembership(this.props.room.getMyMembership()) === EffectiveMembership.Invite;
     }
 
-    private tryUpdateIfRoomMatches = (event: MatrixEvent) => {
+    private handleRoomEventUpdate = (event: MatrixEvent) => {
         const roomId = event.getRoomId();
+
+        // Sanity check: should never happen
         if (roomId !== this.props.room.roomId) return;
 
         this.updateNotificationState();

From 8370fa8bb4485e7ac857fc045ebc09b3d864a3bb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 26 May 2020 19:56:56 -0600
Subject: [PATCH 3206/3235] Event.decrypted from the client

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

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 47ce001983..c95cd108dc 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -91,17 +91,19 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
 
         this.props.room.on("Room.receipt", this.handleRoomEventUpdate);
         this.props.room.on("Room.timeline", this.handleRoomEventUpdate);
-        this.props.room.on("Event.decrypted", this.handleRoomEventUpdate);
         this.props.room.on("Room.redaction", this.handleRoomEventUpdate);
+        MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
     }
 
     public componentWillUnmount() {
         if (this.props.room) {
             this.props.room.removeListener("Room.receipt", this.handleRoomEventUpdate);
             this.props.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
-            this.props.room.removeListener("Event.decrypted", this.handleRoomEventUpdate);
             this.props.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
         }
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
+        }
     }
 
     // XXX: This is a bit of an awful-looking hack. We should probably be using state for

From 254ed4b1b60c1bf8964a67febf2761a22773802b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 11:33:42 +0100
Subject: [PATCH 3207/3235] Add debug lined to figure out e2e test failure

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/ToastStore.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index e963ecd736..a26c5e0794 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -56,6 +56,7 @@ export default class ToastStore extends EventEmitter {
      * @param {object} newToast The new toast
      */
     addOrReplaceToast<C extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>>(newToast: IToast<C>) {
+        console.log("DEBUG addOrReplaceToast", newToast.key, JSON.stringify(newToast));
         const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
             let newIndex = this.toasts.length;
@@ -68,6 +69,7 @@ export default class ToastStore extends EventEmitter {
     }
 
     dismissToast(key) {
+        console.log("DEBUG dismissToast", key);
         const length = this.toasts.length;
         this.toasts = this.toasts.filter(t => t.key !== key);
         if (length !== this.toasts.length) {

From 3dade4e759bc4d01af126e1f3a5d64c4057b1d20 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 11:48:48 +0100
Subject: [PATCH 3208/3235] tweak

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/stores/ToastStore.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index a26c5e0794..2f5a1f74b0 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -70,13 +70,15 @@ export default class ToastStore extends EventEmitter {
 
     dismissToast(key) {
         console.log("DEBUG dismissToast", key);
+        if (this.toasts[0] && this.toasts[0].key === key) {
+            this.countSeen++;
+        }
+
         const length = this.toasts.length;
         this.toasts = this.toasts.filter(t => t.key !== key);
         if (length !== this.toasts.length) {
             if (this.toasts.length === 0) {
                 this.countSeen = 0;
-            } else {
-                this.countSeen++;
             }
 
             this.emit('update');

From efa47f1a8e948e2920aa640cccfad94caa9942b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 12:02:51 +0100
Subject: [PATCH 3209/3235] Change out debug

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 1 +
 src/stores/ToastStore.ts                 | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f2d7e81d85..f8c96ee393 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -624,6 +624,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_room_directory': {
+                console.log("DEBUG view_room_directory");
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
                     'mx_RoomDirectory_dialogWrapper', false, true);
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 2f5a1f74b0..55c48c3937 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -56,7 +56,6 @@ export default class ToastStore extends EventEmitter {
      * @param {object} newToast The new toast
      */
     addOrReplaceToast<C extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>>(newToast: IToast<C>) {
-        console.log("DEBUG addOrReplaceToast", newToast.key, JSON.stringify(newToast));
         const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
         if (oldIndex === -1) {
             let newIndex = this.toasts.length;
@@ -69,7 +68,6 @@ export default class ToastStore extends EventEmitter {
     }
 
     dismissToast(key) {
-        console.log("DEBUG dismissToast", key);
         if (this.toasts[0] && this.toasts[0].key === key) {
             this.countSeen++;
         }

From 48de17457663867359b511344210d5d962200d29 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 12:20:20 +0100
Subject: [PATCH 3210/3235] remove debug

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f8c96ee393..f2d7e81d85 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -624,7 +624,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_room_directory': {
-                console.log("DEBUG view_room_directory");
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
                     'mx_RoomDirectory_dialogWrapper', false, true);

From b7c688d3282d5156c74f9ac50e0780908c895965 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 12:40:38 +0100
Subject: [PATCH 3211/3235] test e2e tests workaround

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/usecases/join.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/end-to-end-tests/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
index 655c0be686..10a48bd71c 100644
--- a/test/end-to-end-tests/src/usecases/join.js
+++ b/test/end-to-end-tests/src/usecases/join.js
@@ -19,6 +19,15 @@ const {openRoomDirectory} = require('./create-room');
 
 module.exports = async function join(session, roomName) {
     session.log.step(`joins room "${roomName}"`);
+    while (true) {
+        try {
+            const toastDismissButton = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+            await toastDismissButton.click();
+        } catch (e) {
+            break;
+        }
+    }
+
     await openRoomDirectory(session);
     const roomInput = await session.query('.mx_DirectorySearchBox input');
     await session.replaceInputText(roomInput, roomName);

From 7b6d49c416f63576fcdf3be088b80cc2b87bde71 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 12:57:45 +0100
Subject: [PATCH 3212/3235] e2e test toasts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenario.js        |  2 +
 test/end-to-end-tests/src/scenarios/toast.js | 23 ++++++++++
 test/end-to-end-tests/src/usecases/join.js   |  9 ----
 test/end-to-end-tests/src/usecases/toasts.js | 45 ++++++++++++++++++++
 4 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 test/end-to-end-tests/src/scenarios/toast.js
 create mode 100644 test/end-to-end-tests/src/usecases/toasts.js

diff --git a/test/end-to-end-tests/src/scenario.js b/test/end-to-end-tests/src/scenario.js
index f575fb392e..2191d630ac 100644
--- a/test/end-to-end-tests/src/scenario.js
+++ b/test/end-to-end-tests/src/scenario.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 const {range} = require('./util');
 const signup = require('./usecases/signup');
+const toastScenarios = require('./scenarios/toast');
 const roomDirectoryScenarios = require('./scenarios/directory');
 const lazyLoadingScenarios = require('./scenarios/lazy-loading');
 const e2eEncryptionScenarios = require('./scenarios/e2e-encryption');
@@ -37,6 +38,7 @@ module.exports = async function scenario(createSession, restCreator) {
     const alice = await createUser("alice");
     const bob = await createUser("bob");
 
+    await toastScenarios(alice, bob);
     await roomDirectoryScenarios(alice, bob);
     await e2eEncryptionScenarios(alice, bob);
     console.log("create REST users:");
diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
new file mode 100644
index 0000000000..91c6ed750f
--- /dev/null
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+const {acceptToast} = require("../usecases/toasts");
+
+module.exports = async function toastScenarios(alice, bob) {
+    console.log(" checking and clearing all toasts:");
+    await acceptToast(alice, "Help us improve Riot");
+    await acceptToast(bob, "Help us improve Riot");
+};
diff --git a/test/end-to-end-tests/src/usecases/join.js b/test/end-to-end-tests/src/usecases/join.js
index 10a48bd71c..655c0be686 100644
--- a/test/end-to-end-tests/src/usecases/join.js
+++ b/test/end-to-end-tests/src/usecases/join.js
@@ -19,15 +19,6 @@ const {openRoomDirectory} = require('./create-room');
 
 module.exports = async function join(session, roomName) {
     session.log.step(`joins room "${roomName}"`);
-    while (true) {
-        try {
-            const toastDismissButton = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
-
     await openRoomDirectory(session);
     const roomInput = await session.query('.mx_DirectorySearchBox input');
     await session.replaceInputText(roomInput, roomName);
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
new file mode 100644
index 0000000000..663484ce6e
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+const assert = require('assert');
+
+async function assertToast(session, expectedTitle) {
+    const h2Element = await session.query('.mx_Toast_title h2');
+    const toastTitle = await session.innerText(h2Element);
+    assert(toastTitle, expectedTitle);
+}
+
+async function acceptToast(session, expectedTitle) {
+    const foundToast = await assertToast(session, expectedTitle);
+    if (!foundToast) {
+        throw new Error("could not find expected toast");
+    }
+
+    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_primary');
+    await btn.click();
+}
+
+async function rejectToast(session, expectedTitle) {
+    const foundToast = await assertToast(session, expectedTitle);
+    if (!foundToast) {
+        throw new Error("could not find expected toast");
+    }
+
+    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+    await btn.click();
+}
+
+module.exports = {assertToast, acceptToast, rejectToast};

From d9552c7f5c4296ee92258614c261cb3d01352d4f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 13:10:28 +0100
Subject: [PATCH 3213/3235] e2e test toasts v2

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 12 ++++++++++--
 test/end-to-end-tests/src/usecases/toasts.js | 12 ++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 91c6ed750f..9a0594cc31 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -14,10 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {acceptToast} = require("../usecases/toasts");
+const {acceptToast, rejectToast} = require("../usecases/toasts");
 
 module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing all toasts:");
+
+    alice.log.startGroup(`clears toasts`);
+    await acceptToast(alice, "Notifications");
     await acceptToast(alice, "Help us improve Riot");
-    await acceptToast(bob, "Help us improve Riot");
+    alice.log.endGroup();
+
+    bob.log.startGroup(`clears toasts`);
+    await rejectToast(bob, "Notifications");
+    await rejectToast(bob, "Help us improve Riot");
+    bob.log.endGroup();
 };
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 663484ce6e..991d3cc39c 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -23,21 +23,13 @@ async function assertToast(session, expectedTitle) {
 }
 
 async function acceptToast(session, expectedTitle) {
-    const foundToast = await assertToast(session, expectedTitle);
-    if (!foundToast) {
-        throw new Error("could not find expected toast");
-    }
-
+    await assertToast(session, expectedTitle);
     const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_primary');
     await btn.click();
 }
 
 async function rejectToast(session, expectedTitle) {
-    const foundToast = await assertToast(session, expectedTitle);
-    if (!foundToast) {
-        throw new Error("could not find expected toast");
-    }
-
+    await assertToast(session, expectedTitle);
     const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
     await btn.click();
 }

From 37c875b8635107eb966a692141deed915d14669e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 13:23:49 +0100
Subject: [PATCH 3214/3235] improve end to end tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 10 ++++++++--
 test/end-to-end-tests/src/usecases/toasts.js |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 9a0594cc31..b5b7fa4494 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -14,18 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {acceptToast, rejectToast} = require("../usecases/toasts");
+const {assertNoToasts, acceptToast, rejectToast} = require("../usecases/toasts");
 
 module.exports = async function toastScenarios(alice, bob) {
-    console.log(" checking and clearing all toasts:");
+    console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
+    alice.log.step(`accepts desktop notifications toast`);
     await acceptToast(alice, "Notifications");
+    alice.log.step(`accepts analytics toast`);
     await acceptToast(alice, "Help us improve Riot");
+    await assertNoToasts(alice);
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
+    alice.log.step(`reject desktop notifications toast`);
     await rejectToast(bob, "Notifications");
+    alice.log.step(`reject analytics toast`);
     await rejectToast(bob, "Help us improve Riot");
+    await assertNoToasts(bob);
     bob.log.endGroup();
 };
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 991d3cc39c..636714d66b 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -16,6 +16,11 @@ limitations under the License.
 
 const assert = require('assert');
 
+async function assertNoToasts(session) {
+    const toast = await session.query('.mx_Toast_toast');
+    assert(!toast, 'toast found when none expected');
+}
+
 async function assertToast(session, expectedTitle) {
     const h2Element = await session.query('.mx_Toast_title h2');
     const toastTitle = await session.innerText(h2Element);
@@ -34,4 +39,4 @@ async function rejectToast(session, expectedTitle) {
     await btn.click();
 }
 
-module.exports = {assertToast, acceptToast, rejectToast};
+module.exports = {assertNoToasts, assertToast, acceptToast, rejectToast};

From faaca43a75f5281ceb335ef1e9514836c0d8c396 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 13:35:15 +0100
Subject: [PATCH 3215/3235] more loggin'

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index b5b7fa4494..ee3f2954f3 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,18 +20,32 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
+
     alice.log.step(`accepts desktop notifications toast`);
     await acceptToast(alice, "Notifications");
+    alice.log.done();
+
     alice.log.step(`accepts analytics toast`);
     await acceptToast(alice, "Help us improve Riot");
+    alice.log.done();
+
+    alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
+    alice.log.done();
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    alice.log.step(`reject desktop notifications toast`);
+
+    bob.log.step(`reject desktop notifications toast`);
     await rejectToast(bob, "Notifications");
-    alice.log.step(`reject analytics toast`);
+    bob.log.done();
+
+    bob.log.step(`reject analytics toast`);
     await rejectToast(bob, "Help us improve Riot");
+    bob.log.done();
+
+    bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);
+    bob.log.done();
     bob.log.endGroup();
 };

From 841ce74ac2fde0201b1b698a0b096fd5f5158467 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 13:39:00 +0100
Subject: [PATCH 3216/3235] Fix assert vs assert.equal

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/usecases/dialog.js | 2 +-
 test/end-to-end-tests/src/usecases/toasts.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/dialog.js b/test/end-to-end-tests/src/usecases/dialog.js
index d4ae97dff9..15ac50bb18 100644
--- a/test/end-to-end-tests/src/usecases/dialog.js
+++ b/test/end-to-end-tests/src/usecases/dialog.js
@@ -20,7 +20,7 @@ const assert = require('assert');
 async function assertDialog(session, expectedTitle) {
     const titleElement = await session.query(".mx_Dialog .mx_Dialog_title");
     const dialogHeader = await session.innerText(titleElement);
-    assert(dialogHeader, expectedTitle);
+    assert.equal(dialogHeader, expectedTitle);
 }
 
 async function acceptDialog(session, expectedTitle) {
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 636714d66b..a82c910eea 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -24,7 +24,7 @@ async function assertNoToasts(session) {
 async function assertToast(session, expectedTitle) {
     const h2Element = await session.query('.mx_Toast_title h2');
     const toastTitle = await session.innerText(h2Element);
-    assert(toastTitle, expectedTitle);
+    assert.equal(toastTitle, expectedTitle);
 }
 
 async function acceptToast(session, expectedTitle) {

From 627b5685887d02ed31f8c1fbecc45f48d8edbbbe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 13:48:20 +0100
Subject: [PATCH 3217/3235] check if it is a race

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index ee3f2954f3..980ee4b33f 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -29,6 +29,7 @@ module.exports = async function toastScenarios(alice, bob) {
     await acceptToast(alice, "Help us improve Riot");
     alice.log.done();
 
+    await alice.delay(300);
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
     alice.log.done();
@@ -44,6 +45,7 @@ module.exports = async function toastScenarios(alice, bob) {
     await rejectToast(bob, "Help us improve Riot");
     bob.log.done();
 
+    await bob.delay(300);
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);
     bob.log.done();

From 61066b0c4c915285f2bb0e5bf8c123cadbcab1f6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 14:27:09 +0100
Subject: [PATCH 3218/3235] test it again

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 980ee4b33f..34b979f09a 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,7 +20,6 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-
     alice.log.step(`accepts desktop notifications toast`);
     await acceptToast(alice, "Notifications");
     alice.log.done();
@@ -29,14 +28,21 @@ module.exports = async function toastScenarios(alice, bob) {
     await acceptToast(alice, "Help us improve Riot");
     alice.log.done();
 
-    await alice.delay(300);
+    while (true) {
+        try {
+            const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+            await toastDismissButton.click();
+        } catch (e) {
+            break;
+        }
+    }
+
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
     alice.log.done();
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-
     bob.log.step(`reject desktop notifications toast`);
     await rejectToast(bob, "Notifications");
     bob.log.done();
@@ -45,7 +51,15 @@ module.exports = async function toastScenarios(alice, bob) {
     await rejectToast(bob, "Help us improve Riot");
     bob.log.done();
 
-    await bob.delay(300);
+    while (true) {
+        try {
+            const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+            await toastDismissButton.click();
+        } catch (e) {
+            break;
+        }
+    }
+
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);
     bob.log.done();

From 91811581bc9412d48842a7341c8f3c33a5623170 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 14:35:59 +0100
Subject: [PATCH 3219/3235] fix assertNoToasts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/usecases/toasts.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index a82c910eea..2e88677e4b 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -17,8 +17,12 @@ limitations under the License.
 const assert = require('assert');
 
 async function assertNoToasts(session) {
-    const toast = await session.query('.mx_Toast_toast');
-    assert(!toast, 'toast found when none expected');
+    try {
+        await session.query('.mx_Toast_toast');
+    } catch (e) {
+        return;
+    }
+    throw new Error('toast found when none expected');
 }
 
 async function assertToast(session, expectedTitle) {

From f3dfdbe74644f974b855a8d494ecbc4d205fd93b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 14:36:44 +0100
Subject: [PATCH 3220/3235] debug

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 34b979f09a..f528e993c3 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -30,6 +30,9 @@ module.exports = async function toastScenarios(alice, bob) {
 
     while (true) {
         try {
+            const h2Element = await alice.query('.mx_Toast_title h2');
+            const toastTitle = await alice.innerText(h2Element);
+            console.log("DEBUG closing", toastTitle);
             const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
             await toastDismissButton.click();
         } catch (e) {
@@ -53,6 +56,9 @@ module.exports = async function toastScenarios(alice, bob) {
 
     while (true) {
         try {
+            const h2Element = await bob.query('.mx_Toast_title h2');
+            const toastTitle = await bob.innerText(h2Element);
+            console.log("DEBUG closing", toastTitle);
             const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
             await toastDismissButton.click();
         } catch (e) {

From 63ac1cb4ab583de0eb2869be09f6fc76877f0f37 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 14:56:24 +0100
Subject: [PATCH 3221/3235] debug some more

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index f528e993c3..97b5caa14f 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,13 +20,13 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    alice.log.step(`accepts desktop notifications toast`);
-    await acceptToast(alice, "Notifications");
-    alice.log.done();
-
-    alice.log.step(`accepts analytics toast`);
-    await acceptToast(alice, "Help us improve Riot");
-    alice.log.done();
+    // alice.log.step(`accepts desktop notifications toast`);
+    // await acceptToast(alice, "Notifications");
+    // alice.log.done();
+    //
+    // alice.log.step(`accepts analytics toast`);
+    // await acceptToast(alice, "Help us improve Riot");
+    // alice.log.done();
 
     while (true) {
         try {
@@ -46,13 +46,13 @@ module.exports = async function toastScenarios(alice, bob) {
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    bob.log.step(`reject desktop notifications toast`);
-    await rejectToast(bob, "Notifications");
-    bob.log.done();
-
-    bob.log.step(`reject analytics toast`);
-    await rejectToast(bob, "Help us improve Riot");
-    bob.log.done();
+    // bob.log.step(`reject desktop notifications toast`);
+    // await rejectToast(bob, "Notifications");
+    // bob.log.done();
+    //
+    // bob.log.step(`reject analytics toast`);
+    // await rejectToast(bob, "Help us improve Riot");
+    // bob.log.done();
 
     while (true) {
         try {

From cb07fa53f4282ebfe8f12d63f93bba8344f62b9e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 15:05:40 +0100
Subject: [PATCH 3222/3235] test

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 48 +++++---------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 97b5caa14f..02496f398d 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,25 +20,13 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    // alice.log.step(`accepts desktop notifications toast`);
-    // await acceptToast(alice, "Notifications");
-    // alice.log.done();
-    //
-    // alice.log.step(`accepts analytics toast`);
-    // await acceptToast(alice, "Help us improve Riot");
-    // alice.log.done();
+    alice.log.step(`accepts desktop notifications toast`);
+    await acceptToast(alice, "Notifications");
+    alice.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await alice.query('.mx_Toast_title h2');
-            const toastTitle = await alice.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    alice.log.step(`rejects analytics toast`);
+    await rejectToast(alice, "Help us improve Riot");
+    alice.log.done();
 
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
@@ -46,25 +34,13 @@ module.exports = async function toastScenarios(alice, bob) {
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    // bob.log.step(`reject desktop notifications toast`);
-    // await rejectToast(bob, "Notifications");
-    // bob.log.done();
-    //
-    // bob.log.step(`reject analytics toast`);
-    // await rejectToast(bob, "Help us improve Riot");
-    // bob.log.done();
+    bob.log.step(`reject desktop notifications toast`);
+    await rejectToast(bob, "Notifications");
+    bob.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await bob.query('.mx_Toast_title h2');
-            const toastTitle = await bob.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    bob.log.step(`reject analytics toast`);
+    await rejectToast(bob, "Help us improve Riot");
+    bob.log.done();
 
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);

From e35c9d5bbf5eec8e55a6485b275559ef39d7625f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 15:18:43 +0100
Subject: [PATCH 3223/3235] more testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/toasts/AnalyticsToast.tsx                |  2 +
 test/end-to-end-tests/src/scenarios/toast.js | 48 +++++++++++++++-----
 test/end-to-end-tests/src/usecases/toasts.js |  5 +-
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index b186a65d9d..7cd59222dd 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -24,12 +24,14 @@ import GenericToast from "../components/views/toasts/GenericToast";
 import ToastStore from "../stores/ToastStore";
 
 const onAccept = () => {
+    console.log("DEBUG onAccept AnalyticsToast");
     dis.dispatch({
         action: 'accept_cookies',
     });
 };
 
 const onReject = () => {
+    console.log("DEBUG onReject AnalyticsToast");
     dis.dispatch({
         action: "reject_cookies",
     });
diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 02496f398d..97b5caa14f 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,13 +20,25 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    alice.log.step(`accepts desktop notifications toast`);
-    await acceptToast(alice, "Notifications");
-    alice.log.done();
+    // alice.log.step(`accepts desktop notifications toast`);
+    // await acceptToast(alice, "Notifications");
+    // alice.log.done();
+    //
+    // alice.log.step(`accepts analytics toast`);
+    // await acceptToast(alice, "Help us improve Riot");
+    // alice.log.done();
 
-    alice.log.step(`rejects analytics toast`);
-    await rejectToast(alice, "Help us improve Riot");
-    alice.log.done();
+    while (true) {
+        try {
+            const h2Element = await alice.query('.mx_Toast_title h2');
+            const toastTitle = await alice.innerText(h2Element);
+            console.log("DEBUG closing", toastTitle);
+            const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+            await toastDismissButton.click();
+        } catch (e) {
+            break;
+        }
+    }
 
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
@@ -34,13 +46,25 @@ module.exports = async function toastScenarios(alice, bob) {
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    bob.log.step(`reject desktop notifications toast`);
-    await rejectToast(bob, "Notifications");
-    bob.log.done();
+    // bob.log.step(`reject desktop notifications toast`);
+    // await rejectToast(bob, "Notifications");
+    // bob.log.done();
+    //
+    // bob.log.step(`reject analytics toast`);
+    // await rejectToast(bob, "Help us improve Riot");
+    // bob.log.done();
 
-    bob.log.step(`reject analytics toast`);
-    await rejectToast(bob, "Help us improve Riot");
-    bob.log.done();
+    while (true) {
+        try {
+            const h2Element = await bob.query('.mx_Toast_title h2');
+            const toastTitle = await bob.innerText(h2Element);
+            console.log("DEBUG closing", toastTitle);
+            const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+            await toastDismissButton.click();
+        } catch (e) {
+            break;
+        }
+    }
 
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 2e88677e4b..75142ed08f 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -22,7 +22,10 @@ async function assertNoToasts(session) {
     } catch (e) {
         return;
     }
-    throw new Error('toast found when none expected');
+
+    const h2Element = await session.query('.mx_Toast_title h2');
+    const toastTitle = await session.innerText(h2Element);
+    throw new Error(`"${toastTitle}" toast found when none expected`);
 }
 
 async function assertToast(session, expectedTitle) {

From 7486338efaa31e9e2657a5458e86388c2a9e5536 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 16:51:04 +0100
Subject: [PATCH 3224/3235] Fix.the.tests.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 48 +++++---------------
 test/end-to-end-tests/src/session.js         |  4 +-
 test/end-to-end-tests/src/usecases/toasts.js |  9 ++--
 3 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 97b5caa14f..1206ef40b0 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,25 +20,13 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    // alice.log.step(`accepts desktop notifications toast`);
-    // await acceptToast(alice, "Notifications");
-    // alice.log.done();
-    //
-    // alice.log.step(`accepts analytics toast`);
-    // await acceptToast(alice, "Help us improve Riot");
-    // alice.log.done();
+    alice.log.step(`reject desktop notifications toast`);
+    await rejectToast(alice, "Notifications");
+    alice.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await alice.query('.mx_Toast_title h2');
-            const toastTitle = await alice.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    alice.log.step(`accepts analytics toast`);
+    await acceptToast(alice, "Help us improve Riot");
+    alice.log.done();
 
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
@@ -46,25 +34,13 @@ module.exports = async function toastScenarios(alice, bob) {
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    // bob.log.step(`reject desktop notifications toast`);
-    // await rejectToast(bob, "Notifications");
-    // bob.log.done();
-    //
-    // bob.log.step(`reject analytics toast`);
-    // await rejectToast(bob, "Help us improve Riot");
-    // bob.log.done();
+    bob.log.step(`reject desktop notifications toast`);
+    await rejectToast(bob, "Notifications");
+    bob.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await bob.query('.mx_Toast_title h2');
-            const toastTitle = await bob.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    bob.log.step(`reject analytics toast`);
+    await rejectToast(bob, "Help us improve Riot");
+    bob.log.done();
 
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 55c2ed440c..907ee2fb8e 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -122,8 +122,8 @@ module.exports = class RiotSession {
         await input.type(text);
     }
 
-    query(selector, timeout = DEFAULT_TIMEOUT) {
-        return this.page.waitForSelector(selector, {visible: true, timeout});
+    query(selector, timeout = DEFAULT_TIMEOUT, hidden = false) {
+        return this.page.waitForSelector(selector, {visible: true, timeout, hidden});
     }
 
     async queryAll(selector) {
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 75142ed08f..204ed2b983 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -18,14 +18,13 @@ const assert = require('assert');
 
 async function assertNoToasts(session) {
     try {
-        await session.query('.mx_Toast_toast');
+        await session.query('.mx_Toast_toast', 1000, true);
     } catch (e) {
-        return;
+        const h2Element = await session.query('.mx_Toast_title h2', 1000);
+        const toastTitle = await session.innerText(h2Element);
+        throw new Error(`"${toastTitle}" toast found when none expected`);
     }
 
-    const h2Element = await session.query('.mx_Toast_title h2');
-    const toastTitle = await session.innerText(h2Element);
-    throw new Error(`"${toastTitle}" toast found when none expected`);
 }
 
 async function assertToast(session, expectedTitle) {

From 71108fcf393e4648d1dfc1fd17e0b50c8423ed12 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 17:02:32 +0100
Subject: [PATCH 3225/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/usecases/toasts.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
index 204ed2b983..db78352f2b 100644
--- a/test/end-to-end-tests/src/usecases/toasts.js
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -24,7 +24,6 @@ async function assertNoToasts(session) {
         const toastTitle = await session.innerText(h2Element);
         throw new Error(`"${toastTitle}" toast found when none expected`);
     }
-
 }
 
 async function assertToast(session, expectedTitle) {

From 73c35ff80e0a1d9a6323cbdd49df5a7fe4f83cbc Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 28 May 2020 00:05:45 -0400
Subject: [PATCH 3226/3235] set the client's pickle key if the platform can
 store one

---
 src/BasePlatform.js    | 31 +++++++++++++++++++++++++++++++
 src/Lifecycle.js       | 15 ++++++++++++---
 src/MatrixClientPeg.js |  1 +
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index 8a950dc2e3..f4fa43cb10 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -190,4 +190,35 @@ export default class BasePlatform {
     onKeyDown(ev: KeyboardEvent): boolean {
         return false; // no shortcuts implemented
     }
+
+    /**
+     * Get a previously stored pickle key.  The pickle key is used for
+     * encrypting libolm objects.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     * @returns {string|null} the previously stored pickle key, or null if no
+     *     pickle key has been stored.
+     */
+    async getPickleKey(userId: string, deviceId: string): string | null {
+        return null;
+    }
+
+    /**
+     * Create and store a pickle key for encrypting libolm objects.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     * @returns {string|null} the pickle key, or null if the platform does not
+     *     support storing pickle keys.
+     */
+    async createPickleKey(userId: string, deviceId: string): string | null {
+        return null;
+    }
+
+    /**
+     * Delete a previously stored pickle key from storage.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     */
+    async destroyPickleKey(userId: string, deviceId: string) {
+    }
 }
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 1baa6c8e0c..598624293b 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -298,6 +298,8 @@ async function _restoreFromLocalStorage(opts) {
             return false;
         }
 
+        const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
+
         console.log(`Restoring session for ${userId}`);
         await _doSetLoggedIn({
             userId: userId,
@@ -306,6 +308,7 @@ async function _restoreFromLocalStorage(opts) {
             homeserverUrl: hsUrl,
             identityServerUrl: isUrl,
             guest: isGuest,
+            pickleKey: pickleKey,
         }, false);
         return true;
     } else {
@@ -348,9 +351,13 @@ async function _handleLoadSessionFailure(e) {
  *
  * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
  */
-export function setLoggedIn(credentials) {
+export async function setLoggedIn(credentials) {
     stopMatrixClient();
-    return _doSetLoggedIn(credentials, true);
+    const pickleKey = credentials.userId && credentials.deviceId
+          ? await PlatformPeg.get().createPickleKey(credentials.userId, credentials.deviceId)
+          : null;
+
+    return _doSetLoggedIn(Object.assign({}, credentials, {pickleKey}), true);
 }
 
 /**
@@ -516,7 +523,9 @@ export function logout() {
     }
 
     _isLoggingOut = true;
-    MatrixClientPeg.get().logout().then(onLoggedOut,
+    const client = MatrixClientPeg.get();
+    PlatformPeg.get().destroyPickleKey(client.getUserId(), client.getDeviceId());
+    client.logout().then(onLoggedOut,
         (err) => {
             // Just throwing an error here is going to be very unhelpful
             // if you're trying to log out because your server's down and
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 21f05b9759..af43705227 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -218,6 +218,7 @@ class _MatrixClientPeg {
             accessToken: creds.accessToken,
             userId: creds.userId,
             deviceId: creds.deviceId,
+            pickleKey: creds.pickleKey,
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),

From 81922231ed638764083610889b7ffafc3a7467ad Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 28 May 2020 13:55:07 +0100
Subject: [PATCH 3227/3235] Move Appearance tab to ts

---
 src/components/structures/MatrixChat.tsx      |   4 +-
 src/components/views/elements/Field.tsx       |   2 +-
 ...gsTab.js => AppearanceUserSettingsTab.tsx} | 133 ++++++++++-------
 src/dispatcher/actions.ts                     |   5 +
 .../payloads/RecheckThemePayload.ts           |  27 ++++
 .../watchers/FontWatcher.ts}                  |  36 +++--
 src/settings/watchers/ThemeWatcher.ts         | 138 ++++++++++++++++++
 src/settings/watchers/Watcher.ts              |  20 +++
 src/theme.js                                  | 110 +-------------
 9 files changed, 295 insertions(+), 180 deletions(-)
 rename src/components/views/settings/tabs/user/{AppearanceUserSettingsTab.js => AppearanceUserSettingsTab.tsx} (73%)
 create mode 100644 src/dispatcher/payloads/RecheckThemePayload.ts
 rename src/{FontWatcher.js => settings/watchers/FontWatcher.ts} (51%)
 create mode 100644 src/settings/watchers/ThemeWatcher.ts
 create mode 100644 src/settings/watchers/Watcher.ts

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 1200fcaf7a..f6848feb03 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -58,8 +58,8 @@ import ResizeNotifier from "../../utils/ResizeNotifier";
 import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
 import DMRoomMap from '../../utils/DMRoomMap';
 import { countRoomsWithNotif } from '../../RoomNotifs';
-import { ThemeWatcher } from "../../theme";
-import { FontWatcher } from '../../FontWatcher';
+import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
+import { FontWatcher } from '../../settings/watchers/FontWatcher';
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
 import { defer, IDeferred } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 39ed2df9f9..771d2182ea 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -34,7 +34,7 @@ interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInput
     id?: string,
     // The element to create. Defaults to "input".
     // To define options for a select, use <Field><option ... /></Field>
-    element?: "input" | " select" | "textarea",
+    element?: "input" | "select" | "textarea",
     // The field's type (when used as an <input>). Defaults to "text".
     type?: string,
     // id of a <datalist> element for suggestions
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
similarity index 73%
rename from src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
rename to src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 5b49dd0abd..702fed7b4f 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -20,34 +20,61 @@ import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
 import * as sdk from "../../../../../index";
-import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
+import { enumerateThemes } from "../../../../../theme";
+import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
 import Field from "../../../elements/Field";
 import Slider from "../../../elements/Slider";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher/dispatcher";
-import { FontWatcher } from "../../../../../FontWatcher";
+import { FontWatcher } from "../../../../../settings/watchers/FontWatcher";
+import { RecheckThemePayload } from '../../../../../dispatcher/payloads/RecheckThemePayload';
+import { Action } from '../../../../../dispatcher/actions';
+import { IValidationResult, IFieldState } from '../../../elements/Validation';
 
-export default class AppearanceUserSettingsTab extends React.Component {
-    constructor() {
-        super();
+interface IProps {
+}
+
+interface IState extends IThemeState {
+    // String displaying the current selected fontSize.
+    // Needs to be string for things like '17.' without
+    // trailing 0s.
+    fontSize: string,
+    customThemeUrl: string,
+    customThemeMessage: CustomThemeMessage,
+    useCustomFontSize: boolean,
+}
+
+export type CustomThemeMessage = {isError: boolean, text: string};
+
+interface IThemeState {
+    theme: string,
+    useSystemTheme: boolean,
+}
+
+export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
+
+    private themeTimer: NodeJS.Timeout;
+
+    constructor(props: IProps) {
+        super(props);
 
         this.state = {
-            fontSize: SettingsStore.getValue("fontSize", null),
-            ...this._calculateThemeState(),
+            fontSize: SettingsStore.getValue("fontSize", null).toString(),
+            ...this.calculateThemeState(),
             customThemeUrl: "",
             customThemeMessage: {isError: false, text: ""},
             useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
         };
     }
 
-    _calculateThemeState() {
+    private calculateThemeState(): IThemeState {
         // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
         // show the right values for things.
 
-        const themeChoice = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme");
-        const systemThemeExplicit = SettingsStore.getValueAt(
+        const themeChoice: string = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme");
+        const systemThemeExplicit: boolean = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "use_system_theme", null, false, true);
-        const themeExplicit = SettingsStore.getValueAt(
+        const themeExplicit: string = SettingsStore.getValueAt(
             SettingLevel.DEVICE, "theme", null, false, true);
 
         // If the user has enabled system theme matching, use that.
@@ -73,15 +100,15 @@ export default class AppearanceUserSettingsTab extends React.Component {
         };
     }
 
-    _onThemeChange = (e) => {
+    private onThemeChange(e: React.ChangeEvent<HTMLSelectElement | HTMLInputElement>): void {
         const newTheme = e.target.value;
         if (this.state.theme === newTheme) return;
 
         // doing getValue in the .catch will still return the value we failed to set,
         // so remember what the value was before we tried to set it so we can revert
-        const oldTheme = SettingsStore.getValue('theme');
+        const oldTheme: string = SettingsStore.getValue('theme');
         SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme).catch(() => {
-            dis.dispatch({action: 'recheck_theme'});
+            dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
             this.setState({theme: oldTheme});
         });
         this.setState({theme: newTheme});
@@ -91,23 +118,21 @@ export default class AppearanceUserSettingsTab extends React.Component {
         // XXX: The local echoed value appears to be unreliable, in particular
         // when settings custom themes(!) so adding forceTheme to override
         // the value from settings.
-        dis.dispatch({action: 'recheck_theme', forceTheme: newTheme});
+        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme, forceTheme: newTheme});
     };
 
-    _onUseSystemThemeChanged = (checked) => {
+    private onUseSystemThemeChanged(checked: boolean) {
         this.setState({useSystemTheme: checked});
         SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
-        dis.dispatch({action: 'recheck_theme'});
+        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
     };
 
-    _onFontSizeChanged = (size) => {
-        this.setState({fontSize: size});
+    private onFontSizeChanged(size: number) {
+        this.setState({fontSize: size.toString()});
         SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, size);
     };
 
-    _onValidateFontSize = ({value}) => {
-        console.log({value});
-
+    private async onValidateFontSize({value}: Pick<IFieldState, "value">): Promise<IValidationResult> {
         const parsedSize = parseFloat(value);
         const min = FontWatcher.MIN_SIZE;
         const max = FontWatcher.MAX_SIZE;
@@ -127,17 +152,18 @@ export default class AppearanceUserSettingsTab extends React.Component {
         return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
     }
 
-    _onAddCustomTheme = async () => {
-        let currentThemes = SettingsStore.getValue("custom_themes");
+    private async onAddCustomTheme() {
+        let currentThemes: string[] = SettingsStore.getValue("custom_themes");
         if (!currentThemes) currentThemes = [];
         currentThemes = currentThemes.map(c => c); // cheap clone
 
-        if (this._themeTimer) {
-            clearTimeout(this._themeTimer);
+        if (this.themeTimer) {
+            clearTimeout(this.themeTimer);
         }
 
         try {
             const r = await fetch(this.state.customThemeUrl);
+            // XXX: need some schema for this
             const themeInfo = await r.json();
             if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
                 this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
@@ -153,42 +179,32 @@ export default class AppearanceUserSettingsTab extends React.Component {
         await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
         this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
 
-        this._themeTimer = setTimeout(() => {
+        this.themeTimer = setTimeout(() => {
             this.setState({customThemeMessage: {text: "", isError: false}});
         }, 3000);
     };
 
-    _onCustomThemeChange = (e) => {
+    private onCustomThemeChange(e: React.ChangeEvent<HTMLSelectElement | HTMLInputElement>) {
         this.setState({customThemeUrl: e.target.value});
     };
 
-    render() {
-        return (
-            <div className="mx_SettingsTab">
-                <div className="mx_SettingsTab_heading">{_t("Appearance")}</div>
-                {this._renderThemeSection()}
-                {SettingsStore.isFeatureEnabled("feature_font_scaling") ? this._renderFontSection() : null}
-            </div>
-        );
-    }
-
-    _renderThemeSection() {
+    private renderThemeSection() {
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
 
         const themeWatcher = new ThemeWatcher();
-        let systemThemeSection;
+        let systemThemeSection: JSX.Element;
         if (themeWatcher.isSystemThemeSupported()) {
             systemThemeSection = <div>
                 <LabelledToggleSwitch
                     value={this.state.useSystemTheme}
                     label={SettingsStore.getDisplayName("use_system_theme")}
-                    onChange={this._onUseSystemThemeChanged}
+                    onChange={this.onUseSystemThemeChanged}
                 />
             </div>;
         }
 
-        let customThemeForm;
+        let customThemeForm: JSX.Element;
         if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
             let messageElement = null;
             if (this.state.customThemeMessage.text) {
@@ -200,17 +216,17 @@ export default class AppearanceUserSettingsTab extends React.Component {
             }
             customThemeForm = (
                 <div className='mx_SettingsTab_section'>
-                    <form onSubmit={this._onAddCustomTheme}>
+                    <form onSubmit={this.onAddCustomTheme}>
                         <Field
                             label={_t("Custom theme URL")}
                             type='text'
                             id='mx_GeneralUserSettingsTab_customThemeInput'
                             autoComplete="off"
-                            onChange={this._onCustomThemeChange}
+                            onChange={this.onCustomThemeChange}
                             value={this.state.customThemeUrl}
                         />
                         <AccessibleButton
-                            onClick={this._onAddCustomTheme}
+                            onClick={this.onAddCustomTheme}
                             type="submit" kind="primary_sm"
                             disabled={!this.state.customThemeUrl.trim()}
                         >{_t("Add theme")}</AccessibleButton>
@@ -220,7 +236,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
             );
         }
 
-        const themes = Object.entries(enumerateThemes())
+        // XXX: replace any type here
+        const themes = Object.entries<any>(enumerateThemes())
             .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
         const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
         const customThemes = themes.filter(p => !builtInThemes.includes(p))
@@ -232,7 +249,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 {systemThemeSection}
                 <Field
                     id="theme" label={_t("Theme")} element="select"
-                    value={this.state.theme} onChange={this._onThemeChange}
+                    value={this.state.theme} onChange={this.onThemeChange}
                     disabled={this.state.useSystemTheme}
                 >
                     {orderedThemes.map(theme => {
@@ -245,7 +262,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
         );
     }
 
-    _renderFontSection() {
+    private renderFontSection() {
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
         return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
             <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
@@ -253,9 +270,9 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
                 <Slider
                     values={[13, 15, 16, 18, 20]}
-                    value={this.state.fontSize}
-                    onSelectionChange={this._onFontSizeChanged}
-                    displayFunc={value => {}}
+                    value={parseInt(this.state.fontSize, 10)}
+                    onSelectionChange={this.onFontSizeChanged}
+                    displayFunc={value => ""}
                     disabled={this.state.useCustomFontSize}
                 />
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
@@ -263,7 +280,7 @@ export default class AppearanceUserSettingsTab extends React.Component {
             <SettingsFlag
                 name="useCustomFontSize"
                 level={SettingLevel.ACCOUNT}
-                onChange={(checked)=> this.setState({useCustomFontSize: checked})}
+                onChange={(checked) => this.setState({useCustomFontSize: checked})}
             />
             <Field
                 type="text"
@@ -272,10 +289,20 @@ export default class AppearanceUserSettingsTab extends React.Component {
                 placeholder={this.state.fontSize.toString()}
                 value={this.state.fontSize.toString()}
                 id="font_size_field"
-                onValidate={this._onValidateFontSize}
+                onValidate={this.onValidateFontSize}
                 onChange={(value) => this.setState({fontSize: value.target.value})}
                 disabled={!this.state.useCustomFontSize}
             />
         </div>;
     }
+
+    render() {
+        return (
+            <div className="mx_SettingsTab">
+                <div className="mx_SettingsTab_heading">{_t("Appearance")}</div>
+                {this.renderThemeSection()}
+                {SettingsStore.isFeatureEnabled("feature_font_scaling") ? this.renderFontSection() : null}
+            </div>
+        );
+    }
 }
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 8b1be1c54e..ba72daa00d 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -43,5 +43,10 @@ export enum Action {
      * Sets the current tooltip. Should be use with ViewTooltipPayload.
      */
     ViewTooltip = "view_tooltip",
+
+    /**
+     *  Forces the theme to reload. No additional payload information required.
+     */
+    RecheckTheme = "recheck_theme",
 }
 
diff --git a/src/dispatcher/payloads/RecheckThemePayload.ts b/src/dispatcher/payloads/RecheckThemePayload.ts
new file mode 100644
index 0000000000..06f7012049
--- /dev/null
+++ b/src/dispatcher/payloads/RecheckThemePayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface RecheckThemePayload extends ActionPayload {
+    action: Action.RecheckTheme,
+
+    /**
+     * Optionally specify the exact theme which is to be loaded.
+     */
+    forceTheme?: string;
+}
diff --git a/src/FontWatcher.js b/src/settings/watchers/FontWatcher.ts
similarity index 51%
rename from src/FontWatcher.js
rename to src/settings/watchers/FontWatcher.ts
index 006df202ad..dce9e77e9e 100644
--- a/src/FontWatcher.js
+++ b/src/settings/watchers/FontWatcher.ts
@@ -14,38 +14,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from './dispatcher/dispatcher';
-import SettingsStore, {SettingLevel} from './settings/SettingsStore';
+import dis from '../../dispatcher/dispatcher';
+import SettingsStore, {SettingLevel} from '../SettingsStore';
+import IWatcher from "./Watcher";
+import { toPx } from '../../utils/units';
 
-export class FontWatcher {
-    static MIN_SIZE = 13;
-    static MAX_SIZE = 20;
+export class FontWatcher implements IWatcher {
+    public static readonly MIN_SIZE = 13;
+    public static readonly MAX_SIZE = 20;
+
+    private dispatcherRef: string;
 
     constructor() {
-        this._dispatcherRef = null;
+        this.dispatcherRef = null;
     }
 
-    start() {
-        this._setRootFontSize(SettingsStore.getValue("fontSize"));
-        this._dispatcherRef = dis.register(this._onAction);
+    public start() {
+        this.setRootFontSize(SettingsStore.getValue("fontSize"));
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
-    stop() {
-        dis.unregister(this._dispatcherRef);
+    public stop() {
+        dis.unregister(this.dispatcherRef);
     }
 
-    _onAction = (payload) => {
+    private onAction = (payload) => {
         if (payload.action === 'update-font-size') {
-            this._setRootFontSize(payload.size);
+            this.setRootFontSize(payload.size);
         }
     };
 
-    _setRootFontSize = (size) => {
+    private setRootFontSize = (size) => {
         const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
 
-        if (fontSize != size) {
+        if (fontSize !== size) {
             SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
         }
-        document.querySelector(":root").style.fontSize = fontSize + "px";
+        (<HTMLElement>document.querySelector(":root")).style.fontSize = toPx(fontSize);
     };
 }
diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts
new file mode 100644
index 0000000000..ce0db881c0
--- /dev/null
+++ b/src/settings/watchers/ThemeWatcher.ts
@@ -0,0 +1,138 @@
+/*
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+
+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 SettingsStore, { SettingLevel } from '../SettingsStore';
+import dis from '../../dispatcher/dispatcher';
+import { Action } from '../../dispatcher/actions';
+import ThemeController from "../controllers/ThemeController";
+import { setTheme } from "../../theme";
+import { ActionPayload } from '../../dispatcher/payloads';
+
+export default class ThemeWatcher {
+    // XXX: I think this is unused.
+    static _instance = null;
+
+    private themeWatchRef: string;
+    private systemThemeWatchRef: string;
+    private dispatcherRef: string;
+
+    private preferDark: MediaQueryList;
+    private preferLight: MediaQueryList;
+
+    private currentTheme: string;
+
+    constructor() {
+        this.themeWatchRef = null;
+        this.systemThemeWatchRef = null;
+        this.dispatcherRef = null;
+
+        // we have both here as each may either match or not match, so by having both
+        // we can get the tristate of dark/light/unsupported
+        this.preferDark = (<any>global).matchMedia("(prefers-color-scheme: dark)");
+        this.preferLight = (<any>global).matchMedia("(prefers-color-scheme: light)");
+
+        this.currentTheme = this.getEffectiveTheme();
+    }
+
+    public start() {
+        this.themeWatchRef = SettingsStore.watchSetting("theme", null, this.onChange);
+        this.systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this.onChange);
+        if (this.preferDark.addEventListener) {
+            this.preferDark.addEventListener('change', this.onChange);
+            this.preferLight.addEventListener('change', this.onChange);
+        }
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    public stop() {
+        if (this.preferDark.addEventListener) {
+            this.preferDark.removeEventListener('change', this.onChange);
+            this.preferLight.removeEventListener('change', this.onChange);
+        }
+        SettingsStore.unwatchSetting(this.systemThemeWatchRef);
+        SettingsStore.unwatchSetting(this.themeWatchRef);
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private onChange = () => {
+        this.recheck();
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === Action.RecheckTheme) {
+            // XXX forceTheme
+            this.recheck(payload.forceTheme);
+        }
+    };
+
+    // XXX: forceTheme param added here as local echo appears to be unreliable
+    // https://github.com/vector-im/riot-web/issues/11443
+    public recheck(forceTheme?: string) {
+        const oldTheme = this.currentTheme;
+        this.currentTheme = forceTheme === undefined ? this.getEffectiveTheme() : forceTheme;
+        if (oldTheme !== this.currentTheme) {
+            setTheme(this.currentTheme);
+        }
+    }
+
+    public getEffectiveTheme(): string {
+        // Dev note: Much of this logic is replicated in the AppearanceUserSettingsTab
+
+        // XXX: checking the isLight flag here makes checking it in the ThemeController
+        // itself completely redundant since we just override the result here and we're
+        // now effectively just using the ThemeController as a place to store the static
+        // variable. The system theme setting probably ought to have an equivalent
+        // controller that honours the same flag, although probablt better would be to
+        // have the theme logic in one place rather than split between however many
+        // different places.
+        if (ThemeController.isLogin) return 'light';
+
+        // If the user has specifically enabled the system matching option (excluding default),
+        // then use that over anything else. We pick the lowest possible level for the setting
+        // to ensure the ordering otherwise works.
+        const systemThemeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "use_system_theme", null, false, true);
+        if (systemThemeExplicit) {
+            console.log("returning explicit system theme");
+            if (this.preferDark.matches) return 'dark';
+            if (this.preferLight.matches) return 'light';
+        }
+
+        // If the user has specifically enabled the theme (without the system matching option being
+        // enabled specifically and excluding the default), use that theme. We pick the lowest possible
+        // level for the setting to ensure the ordering otherwise works.
+        const themeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "theme", null, false, true);
+        if (themeExplicit) {
+            console.log("returning explicit theme: " + themeExplicit);
+            return themeExplicit;
+        }
+
+        // If the user hasn't really made a preference in either direction, assume the defaults of the
+        // settings and use those.
+        if (SettingsStore.getValue('use_system_theme')) {
+            if (this.preferDark.matches) return 'dark';
+            if (this.preferLight.matches) return 'light';
+        }
+        console.log("returning theme value");
+        return SettingsStore.getValue('theme');
+    }
+
+    public isSystemThemeSupported() {
+        return this.preferDark.matches || this.preferLight.matches;
+    }
+}
diff --git a/src/settings/watchers/Watcher.ts b/src/settings/watchers/Watcher.ts
new file mode 100644
index 0000000000..a9f6f3f2c8
--- /dev/null
+++ b/src/settings/watchers/Watcher.ts
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+export default interface IWatcher {
+    start(): void
+    stop(): void
+}
\ No newline at end of file
diff --git a/src/theme.js b/src/theme.js
index 72b6e93443..ccb753d601 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -19,114 +19,8 @@ import {_t} from "./languageHandler";
 
 export const DEFAULT_THEME = "light";
 import Tinter from "./Tinter";
-import dis from "./dispatcher/dispatcher";
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
-import ThemeController from "./settings/controllers/ThemeController";
-
-export class ThemeWatcher {
-    static _instance = null;
-
-    constructor() {
-        this._themeWatchRef = null;
-        this._systemThemeWatchRef = null;
-        this._dispatcherRef = null;
-
-        // we have both here as each may either match or not match, so by having both
-        // we can get the tristate of dark/light/unsupported
-        this._preferDark = global.matchMedia("(prefers-color-scheme: dark)");
-        this._preferLight = global.matchMedia("(prefers-color-scheme: light)");
-
-        this._currentTheme = this.getEffectiveTheme();
-    }
-
-    start() {
-        this._themeWatchRef = SettingsStore.watchSetting("theme", null, this._onChange);
-        this._systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this._onChange);
-        if (this._preferDark.addEventListener) {
-            this._preferDark.addEventListener('change', this._onChange);
-            this._preferLight.addEventListener('change', this._onChange);
-        }
-        this._dispatcherRef = dis.register(this._onAction);
-    }
-
-    stop() {
-        if (this._preferDark.addEventListener) {
-            this._preferDark.removeEventListener('change', this._onChange);
-            this._preferLight.removeEventListener('change', this._onChange);
-        }
-        SettingsStore.unwatchSetting(this._systemThemeWatchRef);
-        SettingsStore.unwatchSetting(this._themeWatchRef);
-        dis.unregister(this._dispatcherRef);
-    }
-
-    _onChange = () => {
-        this.recheck();
-    };
-
-    _onAction = (payload) => {
-        if (payload.action === 'recheck_theme') {
-            // XXX forceTheme
-            this.recheck(payload.forceTheme);
-        }
-    };
-
-    // XXX: forceTheme param added here as local echo appears to be unreliable
-    // https://github.com/vector-im/riot-web/issues/11443
-    recheck(forceTheme) {
-        const oldTheme = this._currentTheme;
-        this._currentTheme = forceTheme === undefined ? this.getEffectiveTheme() : forceTheme;
-        if (oldTheme !== this._currentTheme) {
-            setTheme(this._currentTheme);
-        }
-    }
-
-    getEffectiveTheme() {
-        // Dev note: Much of this logic is replicated in the AppearanceUserSettingsTab
-
-        // XXX: checking the isLight flag here makes checking it in the ThemeController
-        // itself completely redundant since we just override the result here and we're
-        // now effectively just using the ThemeController as a place to store the static
-        // variable. The system theme setting probably ought to have an equivalent
-        // controller that honours the same flag, although probablt better would be to
-        // have the theme logic in one place rather than split between however many
-        // different places.
-        if (ThemeController.isLogin) return 'light';
-
-        // If the user has specifically enabled the system matching option (excluding default),
-        // then use that over anything else. We pick the lowest possible level for the setting
-        // to ensure the ordering otherwise works.
-        const systemThemeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "use_system_theme", null, false, true);
-        if (systemThemeExplicit) {
-            console.log("returning explicit system theme");
-            if (this._preferDark.matches) return 'dark';
-            if (this._preferLight.matches) return 'light';
-        }
-
-        // If the user has specifically enabled the theme (without the system matching option being
-        // enabled specifically and excluding the default), use that theme. We pick the lowest possible
-        // level for the setting to ensure the ordering otherwise works.
-        const themeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "theme", null, false, true);
-        if (themeExplicit) {
-            console.log("returning explicit theme: " + themeExplicit);
-            return themeExplicit;
-        }
-
-        // If the user hasn't really made a preference in either direction, assume the defaults of the
-        // settings and use those.
-        if (SettingsStore.getValue('use_system_theme')) {
-            if (this._preferDark.matches) return 'dark';
-            if (this._preferLight.matches) return 'light';
-        }
-        console.log("returning theme value");
-        return SettingsStore.getValue('theme');
-    }
-
-    isSystemThemeSupported() {
-        return this._preferDark.matches || this._preferLight.matches;
-    }
-}
+import SettingsStore from "./settings/SettingsStore";
+import ThemeWatcher from "./settings/watchers/ThemeWatcher";
 
 export function enumerateThemes() {
     const BUILTIN_THEMES = {

From c9d5ed4d00ea5044c78bce06d9e6eacc677210f4 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 28 May 2020 14:32:20 +0100
Subject: [PATCH 3228/3235] i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index dc583d8d9a..1f76f49adc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -758,10 +758,10 @@
     "Invalid theme schema.": "Invalid theme schema.",
     "Error downloading theme information.": "Error downloading theme information.",
     "Theme added!": "Theme added!",
-    "Appearance": "Appearance",
     "Custom theme URL": "Custom theme URL",
     "Add theme": "Add theme",
     "Theme": "Theme",
+    "Appearance": "Appearance",
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",

From 903488941432e29e43bb3937c06e25ba611babcd Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 28 May 2020 14:43:01 +0100
Subject: [PATCH 3229/3235] Reorder interfaces

---
 .../tabs/user/AppearanceUserSettingsTab.tsx     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 702fed7b4f..2fc9c3e6c4 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -34,6 +34,16 @@ import { IValidationResult, IFieldState } from '../../../elements/Validation';
 interface IProps {
 }
 
+interface IThemeState {
+    theme: string,
+    useSystemTheme: boolean,
+}
+
+export interface CustomThemeMessage {
+    isError: boolean,
+    text: string
+};
+
 interface IState extends IThemeState {
     // String displaying the current selected fontSize.
     // Needs to be string for things like '17.' without
@@ -44,13 +54,6 @@ interface IState extends IThemeState {
     useCustomFontSize: boolean,
 }
 
-export type CustomThemeMessage = {isError: boolean, text: string};
-
-interface IThemeState {
-    theme: string,
-    useSystemTheme: boolean,
-}
-
 export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
 
     private themeTimer: NodeJS.Timeout;

From 0859827910a250d9d72bf16523376a13a2375323 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 28 May 2020 11:56:48 -0400
Subject: [PATCH 3230/3235] fix types

---
 src/BasePlatform.ts    | 6 +++---
 src/MatrixClientPeg.ts | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 14682728d0..ed04c67803 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -189,7 +189,7 @@ export default abstract class BasePlatform {
      * @returns {string|null} the previously stored pickle key, or null if no
      *     pickle key has been stored.
      */
-    async getPickleKey(userId: string, deviceId: string): string | null {
+    async getPickleKey(userId: string, deviceId: string): Promise<string | null> {
         return null;
     }
 
@@ -200,7 +200,7 @@ export default abstract class BasePlatform {
      * @returns {string|null} the pickle key, or null if the platform does not
      *     support storing pickle keys.
      */
-    async createPickleKey(userId: string, deviceId: string): string | null {
+    async createPickleKey(userId: string, deviceId: string): Promise<string | null> {
         return null;
     }
 
@@ -209,6 +209,6 @@ export default abstract class BasePlatform {
      * @param {string} userId the user ID for the user that the pickle key is for.
      * @param {string} userId the device ID that the pickle key is for.
      */
-    async destroyPickleKey(userId: string, deviceId: string) {
+    async destroyPickleKey(userId: string, deviceId: string): Promise<void> {
     }
 }
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index ddeff39216..e875a053b5 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -41,6 +41,7 @@ export interface IMatrixClientCreds {
     deviceId: string,
     accessToken: string,
     guest: boolean,
+    pickleKey: string,
 }
 
 // TODO: Move this to the js-sdk

From dc4a2191c1b76b83ae4bb75f80d2de6a1c65557b Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Thu, 28 May 2020 12:04:32 -0400
Subject: [PATCH 3231/3235] really fix types

---
 src/MatrixClientPeg.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index e875a053b5..c6ee6c546f 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -41,7 +41,7 @@ export interface IMatrixClientCreds {
     deviceId: string,
     accessToken: string,
     guest: boolean,
-    pickleKey: string,
+    pickleKey?: string,
 }
 
 // TODO: Move this to the js-sdk

From c4d6367a178b2df35d628e4060028fd3aa2eb93d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 17:30:43 +0100
Subject: [PATCH 3232/3235] Swap priorities of Desktop Notifications and Update
 toasts

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/toasts/DesktopNotificationsToast.ts | 2 +-
 src/toasts/UpdateToast.tsx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/toasts/DesktopNotificationsToast.ts b/src/toasts/DesktopNotificationsToast.ts
index 02f0730759..413e82e20b 100644
--- a/src/toasts/DesktopNotificationsToast.ts
+++ b/src/toasts/DesktopNotificationsToast.ts
@@ -41,7 +41,7 @@ export const showToast = () => {
             onReject,
         },
         component: GenericToast,
-        priority: 20,
+        priority: 30,
     });
 };
 
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index 55c128e86a..3d4b55a4ff 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -81,7 +81,7 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
             onAccept,
         },
         component: GenericToast,
-        priority: 30,
+        priority: 20,
     });
 };
 

From 2530ec841947dacbc40db1ead96fe05041fc1219 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 19:03:42 +0100
Subject: [PATCH 3233/3235] Try and fix the Notifier race

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.js                          | 7 +------
 src/components/structures/MatrixChat.tsx | 5 +++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index cc804904e2..fac6f4e854 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -27,8 +27,7 @@ import { _t } from './languageHandler';
 import Modal from './Modal';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 import {
-    showToast as showNotificationsToast,
-    hideToast as hideNotificationsToast,
+    hideToast as hideNotificationsToast, showToast as showNotificationsToast,
 } from "./toasts/DesktopNotificationsToast";
 
 /*
@@ -188,10 +187,6 @@ const Notifier = {
         MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange);
         this.toolbarHidden = false;
         this.isSyncing = false;
-
-        if (this.shouldShowToolbar()) {
-            showNotificationsToast();
-        }
     },
 
     stop: function() {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index fe50b80140..b70d6ed3eb 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -71,6 +71,7 @@ import {
     showToast as showAnalyticsToast,
     hideToast as hideAnalyticsToast
 } from "../../toasts/AnalyticsToast";
+import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -1364,6 +1365,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.firstSyncComplete = true;
             this.firstSyncPromise.resolve();
 
+            if (Notifier.shouldShowToolbar()) {
+                showNotificationsToast();
+            }
+
             dis.dispatch({action: 'focus_composer'});
             this.setState({
                 ready: true,

From 227fc24d3aedba79a30eaf3963a9e9e8fefcba2a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 19:04:34 +0100
Subject: [PATCH 3234/3235] delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index fac6f4e854..cd328ba565 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -27,7 +27,7 @@ import { _t } from './languageHandler';
 import Modal from './Modal';
 import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
 import {
-    hideToast as hideNotificationsToast, showToast as showNotificationsToast,
+    hideToast as hideNotificationsToast,
 } from "./toasts/DesktopNotificationsToast";
 
 /*

From 1ab6f275353362faa0729cdaffffce3065f85775 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriksch@gmail.com>
Date: Thu, 28 May 2020 19:37:49 +0100
Subject: [PATCH 3235/3235] Stop copy icon repeating weirdly.

---
 res/css/views/dialogs/_ShareDialog.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index e08469ec6d..e3d2ae8306 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -55,6 +55,7 @@ limitations under the License.
     margin-left: 5px;
     width: 20px;
     height: 20px;
+    background-repeat: none;
 }
 
 .mx_ShareDialog_split {